From fc9b61e8ac9007221faa2f71377dd49c5880ab47 Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Fri, 3 Jul 2015 14:39:24 -0500 Subject: Rename/organize part 3 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github --- audio.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'audio.asm') diff --git a/audio.asm b/audio.asm index 8b2ee0e3..aaf4f8ed 100644 --- a/audio.asm +++ b/audio.asm @@ -443,7 +443,7 @@ Music_Cities1AlternateTempo:: ; 0x9b81 ld [wcfc9], a ld a, $ff ld [wMusicHeaderPointer], a - ld c, $64 + ld c, 100 call DelayFrames ld c, BANK(Music_Cities1) ld a, MUSIC_CITIES1 @@ -557,7 +557,7 @@ Music8_OverwriteChannelPointer: ; 2231d (8:631d) SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3] -Func_7d13b:: ; 7d13b (1f:513b) +PlayPokedexRatingSfx:: ; 7d13b (1f:513b) ld a, [$ffdc] ld c, $0 ld hl, OwnedMonValues -- cgit v1.3.1-sl0p From ea9cc86949cecc3508aeac06b807372b6b0134d8 Mon Sep 17 00:00:00 2001 From: dannye Date: Sun, 19 Jul 2015 03:46:12 -0500 Subject: Name sound effects --- audio.asm | 16 +- constants/music_constants.asm | 176 +++++++++++++++++ engine/battle/animations.asm | 350 ++++++++++++++++----------------- engine/battle/common_text.asm | 2 +- engine/battle/core.asm | 10 +- engine/battle/trainer_ai.asm | 2 +- engine/evolution.asm | 2 +- engine/evos_moves.asm | 2 +- engine/gamefreak.asm | 2 +- engine/hidden_object_functions17.asm | 8 +- engine/hidden_object_functions7.asm | 16 +- engine/intro.asm | 20 +- engine/items/items.asm | 24 +-- engine/learn_move.asm | 2 +- engine/menu/main_menu.asm | 2 +- engine/menu/naming_screen.asm | 2 +- engine/menu/pc.asm | 12 +- engine/menu/players_pc.asm | 8 +- engine/menu/start_menu.asm | 2 +- engine/menu/start_sub_menus.asm | 2 +- engine/menu/vending_machine.asm | 2 +- engine/oak_speech.asm | 2 +- engine/overworld/cable_club_npc.asm | 2 +- engine/overworld/card_key.asm | 2 +- engine/overworld/cut.asm | 2 +- engine/overworld/elevator.asm | 4 +- engine/overworld/healing_machine.asm | 2 +- engine/overworld/hidden_items.asm | 2 +- engine/overworld/ledges.asm | 2 +- engine/overworld/player_animations.asm | 12 +- engine/overworld/pokemart.asm | 2 +- engine/save.asm | 4 +- engine/slot_machine.asm | 10 +- engine/titlescreen.asm | 4 +- engine/town_map.asm | 6 +- engine/trade.asm | 4 +- home.asm | 6 +- home/overworld.asm | 12 +- home/text.asm | 14 +- main.asm | 8 +- scripts/celadongamecorner.asm | 4 +- scripts/cinnabargym.asm | 2 +- scripts/daycarem.asm | 2 +- scripts/lance.asm | 2 +- scripts/mansion1.asm | 2 +- scripts/mansion2.asm | 2 +- scripts/museum1f.asm | 2 +- scripts/rockethideout1.asm | 2 +- scripts/rockethideout2.asm | 2 +- scripts/rockethideout3.asm | 2 +- scripts/rockethideout4.asm | 2 +- scripts/route22gate.asm | 2 +- scripts/route23.asm | 2 +- scripts/vermiliondock.asm | 4 +- scripts/vermiliongym.asm | 2 +- scripts/viridiangym.asm | 2 +- 56 files changed, 487 insertions(+), 311 deletions(-) (limited to 'audio.asm') diff --git a/audio.asm b/audio.asm index aaf4f8ed..27570b93 100644 --- a/audio.asm +++ b/audio.asm @@ -538,7 +538,7 @@ INCLUDE "audio/engine_2.asm" Music_PokeFluteInBattle:: ; 22306 (8:6306) - ld a, (SFX_08_46 - SFX_Headers_08) / 3 ; PokeFlute outside of battle + ld a, SFX_BATTLE_06 ; PokeFlute outside of battle call PlaySoundWaitForCurrent ld hl, wc00e ld de, SFX_08_PokeFlute_Ch1 @@ -583,13 +583,13 @@ PlayPokedexRatingSfx:: ; 7d13b (1f:513b) jp PlayDefaultMusic PokedexRatingSfxPointers: ; 7d162 (1f:5162) - db (SFX_1f_51 - SFX_Headers_1f) / 3, BANK(SFX_1f_51) - db (SFX_02_41 - SFX_Headers_02) / 3, BANK(SFX_02_41) - db (SFX_02_3a - SFX_Headers_02) / 3, BANK(SFX_02_3a) - db (SFX_08_46 - SFX_Headers_08) / 3, BANK(SFX_08_46) - db (SFX_08_3a - SFX_Headers_08) / 3, BANK(SFX_08_3a) - db (SFX_02_42 - SFX_Headers_02) / 3, BANK(SFX_02_42) - db (SFX_02_3b - SFX_Headers_02) / 3, BANK(SFX_02_3b) + db SFX_DENIED, BANK(SFX_1f_51) + db SFX_POKEDEX_RATING, BANK(SFX_02_41) + db SFX_GET_ITEM_1, BANK(SFX_02_3a) + db SFX_BATTLE_06, BANK(SFX_08_46) + db SFX_LEVEL_UP, BANK(SFX_08_3a) + db SFX_GET_KEY_ITEM, BANK(SFX_02_42) + db SFX_GET_ITEM_2, BANK(SFX_02_3b) OwnedMonValues: ; 7d170 (1f:5170) db 10, 40, 60, 90, 120, 150, $ff diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 30d11543..260ccd39 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -4,6 +4,7 @@ music_const: MACRO \1 EQUS "((\2 - SFX_Headers_02) / 3)" ENDM + ; AUDIO_1 music_const MUSIC_PALLET_TOWN, Music_PalletTown music_const MUSIC_POKECENTER, Music_Pokecenter music_const MUSIC_GYM, Music_Gym @@ -25,6 +26,7 @@ ENDM music_const MUSIC_ROUTES4, Music_Routes4 music_const MUSIC_INDIGO_PLATEAU, Music_IndigoPlateau + ; AUDIO_2 music_const MUSIC_GYM_LEADER_BATTLE, Music_GymLeaderBattle music_const MUSIC_TRAINER_BATTLE, Music_TrainerBattle music_const MUSIC_WILD_BATTLE, Music_WildBattle @@ -33,6 +35,7 @@ ENDM music_const MUSIC_DEFEATED_WILD_MON, Music_DefeatedWildMon music_const MUSIC_DEFEATED_GYM_LEADER, Music_DefeatedGymLeader + ; AUDIO_3 music_const MUSIC_TITLE_SCREEN, Music_TitleScreen music_const MUSIC_CREDITS, Music_Credits music_const MUSIC_HALL_OF_FAME, Music_HallOfFame @@ -52,3 +55,176 @@ ENDM music_const MUSIC_MEET_FEMALE_TRAINER, Music_MeetFemaleTrainer music_const MUSIC_MEET_MALE_TRAINER, Music_MeetMaleTrainer + ; AUDIO_1 AUDIO_2 AUDIO_3 + music_const SFX_SNARE_1, SFX_02_01 + music_const SFX_SNARE_2, SFX_02_02 + music_const SFX_SNARE_3, SFX_02_03 + music_const SFX_SNARE_4, SFX_02_04 + music_const SFX_SNARE_5, SFX_02_05 + music_const SFX_TRIANGLE_1, SFX_02_06 + music_const SFX_TRIANGLE_2, SFX_02_07 + music_const SFX_SNARE_6, SFX_02_08 + music_const SFX_SNARE_7, SFX_02_09 + music_const SFX_SNARE_8, SFX_02_0a + music_const SFX_SNARE_9, SFX_02_0b + music_const SFX_CYMBAL_1, SFX_02_0c + music_const SFX_CYMBAL_2, SFX_02_0d + music_const SFX_CYMBAL_3, SFX_02_0e + music_const SFX_MUTED_SNARE_1, SFX_02_0f + music_const SFX_TRIANGLE_3, SFX_02_10 + music_const SFX_MUTED_SNARE_2, SFX_02_11 + music_const SFX_MUTED_SNARE_3, SFX_02_12 + music_const SFX_MUTED_SNARE_4, SFX_02_13 + music_const SFX_CRY_00, SFX_02_14 + music_const SFX_CRY_01, SFX_02_15 + music_const SFX_CRY_02, SFX_02_16 + music_const SFX_CRY_03, SFX_02_17 + music_const SFX_CRY_04, SFX_02_18 + music_const SFX_CRY_05, SFX_02_19 + music_const SFX_CRY_06, SFX_02_1a + music_const SFX_CRY_07, SFX_02_1b + music_const SFX_CRY_08, SFX_02_1c + music_const SFX_CRY_09, SFX_02_1d + music_const SFX_CRY_0A, SFX_02_1e + music_const SFX_CRY_0B, SFX_02_1f + music_const SFX_CRY_0C, SFX_02_20 + music_const SFX_CRY_0D, SFX_02_21 + music_const SFX_CRY_0E, SFX_02_22 + music_const SFX_CRY_0F, SFX_02_23 + music_const SFX_CRY_10, SFX_02_24 + music_const SFX_CRY_11, SFX_02_25 + music_const SFX_CRY_12, SFX_02_26 + music_const SFX_CRY_13, SFX_02_27 + music_const SFX_CRY_14, SFX_02_28 + music_const SFX_CRY_15, SFX_02_29 + music_const SFX_CRY_16, SFX_02_2a + music_const SFX_CRY_17, SFX_02_2b + music_const SFX_CRY_18, SFX_02_2c + music_const SFX_CRY_19, SFX_02_2d + music_const SFX_CRY_1A, SFX_02_2e + music_const SFX_CRY_1B, SFX_02_2f + music_const SFX_CRY_1C, SFX_02_30 + music_const SFX_CRY_1D, SFX_02_31 + music_const SFX_CRY_1E, SFX_02_32 + music_const SFX_CRY_1F, SFX_02_33 + music_const SFX_CRY_20, SFX_02_34 + music_const SFX_CRY_21, SFX_02_35 + music_const SFX_CRY_22, SFX_02_36 + music_const SFX_CRY_23, SFX_02_37 + music_const SFX_CRY_24, SFX_02_38 + music_const SFX_CRY_25, SFX_02_39 + + music_const SFX_GET_ITEM_2, SFX_02_3b + music_const SFX_TINK, SFX_02_3c + music_const SFX_HEAL_HP, SFX_02_3d + music_const SFX_HEAL_AILMENT, SFX_02_3e + music_const SFX_START_MENU, SFX_02_3f + music_const SFX_PRESS_AB, SFX_02_40 + + ; AUDIO_1 AUDIO_3 + music_const SFX_GET_ITEM_1, SFX_02_3a + + music_const SFX_POKEDEX_RATING, SFX_02_41 + music_const SFX_GET_KEY_ITEM, SFX_02_42 + music_const SFX_POISONED, SFX_02_43 + music_const SFX_TRADE_MACHINE, SFX_02_44 + music_const SFX_TURN_ON_PC, SFX_02_45 + music_const SFX_TURN_OFF_PC, SFX_02_46 + music_const SFX_ENTER_PC, SFX_02_47 + music_const SFX_SHRINK, SFX_02_48 + music_const SFX_SWITCH, SFX_02_49 + music_const SFX_HEALING_MACHINE, SFX_02_4a + music_const SFX_TELEPORT_1, SFX_02_4b + music_const SFX_TELEPORT_2, SFX_02_4c + music_const SFX_TELEPORT_3, SFX_02_4d + music_const SFX_LEDGE, SFX_02_4e + music_const SFX_FLY_1, SFX_02_4f + music_const SFX_FLY_2, SFX_02_50 + music_const SFX_DENIED, SFX_02_51 + music_const SFX_ARROW_TILES, SFX_02_52 + music_const SFX_PUSH_BOULDER, SFX_02_53 + music_const SFX_SS_ANNE_HORN, SFX_02_54 + music_const SFX_WITHDRAW_DEPOSIT, SFX_02_55 + music_const SFX_CUT, SFX_02_56 + music_const SFX_GO_INSIDE, SFX_02_57 + music_const SFX_SWAP, SFX_02_58 + music_const SFX_59, SFX_02_59 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL + music_const SFX_PURCHASE, SFX_02_5a + music_const SFX_COLLISION, SFX_02_5b + music_const SFX_GO_OUTSIDE, SFX_02_5c + music_const SFX_SAVE, SFX_02_5d + + ; AUDIO_1 + music_const SFX_POKEFLUE, SFX_02_5e + music_const SFX_SAFARI_ZONE_PA, SFX_02_5f + + ; AUDIO_2 + music_const SFX_LEVEL_UP, SFX_08_3a + + music_const SFX_BATTLE_01, SFX_08_41 + music_const SFX_BATTLE_02, SFX_08_42 + music_const SFX_BATTLE_03, SFX_08_43 + music_const SFX_BATTLE_04, SFX_08_44 + music_const SFX_BATTLE_05, SFX_08_45 + music_const SFX_BATTLE_06, SFX_08_46 + music_const SFX_BATTLE_07, SFX_08_47 + music_const SFX_BATTLE_08, SFX_08_48 + music_const SFX_BATTLE_09, SFX_08_49 + music_const SFX_BATTLE_0A, SFX_08_4a + music_const SFX_BATTLE_0B, SFX_08_4b + music_const SFX_BATTLE_0C, SFX_08_4c + music_const SFX_BATTLE_0D, SFX_08_4d + music_const SFX_BATTLE_0E, SFX_08_4e + music_const SFX_BATTLE_0F, SFX_08_4f + music_const SFX_BATTLE_10, SFX_08_50 + music_const SFX_BATTLE_11, SFX_08_51 + music_const SFX_BATTLE_12, SFX_08_52 + music_const SFX_BATTLE_13, SFX_08_53 + music_const SFX_BATTLE_14, SFX_08_54 + music_const SFX_BATTLE_15, SFX_08_55 + music_const SFX_BATTLE_16, SFX_08_56 ; unused? + music_const SFX_BATTLE_17, SFX_08_57 + music_const SFX_BATTLE_18, SFX_08_58 + music_const SFX_BATTLE_19, SFX_08_59 + music_const SFX_BATTLE_1A, SFX_08_5a + music_const SFX_BATTLE_1B, SFX_08_5b + music_const SFX_BATTLE_1C, SFX_08_5c + music_const SFX_BATTLE_1D, SFX_08_5d + music_const SFX_BATTLE_1E, SFX_08_5e + music_const SFX_BATTLE_1F, SFX_08_5f + music_const SFX_BATTLE_20, SFX_08_60 + music_const SFX_BATTLE_21, SFX_08_61 + music_const SFX_BATTLE_22, SFX_08_62 + music_const SFX_BATTLE_23, SFX_08_63 + music_const SFX_BATTLE_24, SFX_08_64 + music_const SFX_BATTLE_25, SFX_08_65 + music_const SFX_BATTLE_26, SFX_08_66 + music_const SFX_BATTLE_27, SFX_08_67 + music_const SFX_BATTLE_28, SFX_08_68 + music_const SFX_BATTLE_29, SFX_08_69 + music_const SFX_BATTLE_2A, SFX_08_6a + music_const SFX_BATTLE_2B, SFX_08_6b + music_const SFX_BATTLE_2C, SFX_08_6c + music_const SFX_BATTLE_2D, SFX_08_6d + music_const SFX_BATTLE_2E, SFX_08_6e + music_const SFX_BATTLE_2F, SFX_08_6f + music_const SFX_BATTLE_30, SFX_08_70 + music_const SFX_BATTLE_31, SFX_08_71 + music_const SFX_BATTLE_32, SFX_08_72 + music_const SFX_BATTLE_33, SFX_08_73 + music_const SFX_BATTLE_34, SFX_08_74 + music_const SFX_BATTLE_35, SFX_08_75 + music_const SFX_BATTLE_36, SFX_08_76 + music_const SFX_BATTLE_37, SFX_08_77 + + ; AUDIO_3 + music_const SFX_INTRO_LUNGE, SFX_1f_5e + music_const SFX_INTRO_HIP, SFX_1f_5f + music_const SFX_INTRO_HOP, SFX_1f_60 + music_const SFX_INTRO_RAISE, SFX_1f_61 + music_const SFX_INTRO_CRASH, SFX_1f_62 + music_const SFX_INTRO_WHOOSH, SFX_1f_63 + music_const SFX_SLOTS_STOP_WHEEL, SFX_1f_64 + music_const SFX_SLOTS_REWARD, SFX_1f_65 + music_const SFX_SLOTS_NEW_SPIN, SFX_1f_66 + music_const SFX_SHOOTING_STAR, SFX_1f_67 diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 6803c38b..19625b15 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -741,7 +741,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e) cp a,11 ; is it the beginning of the subanimation? jr nz,.skipPlayingSound ; if it is the beginning of the subanimation, play a sound - ld a,(SFX_08_41 - SFX_Headers_08) / 3 + ld a,SFX_BATTLE_01 call PlaySound .skipPlayingSound ld a,[W_ISINBATTLE] @@ -787,7 +787,7 @@ DoBallShakeSpecialEffects: ; 78f96 (1e:4f96) cp a,4 ; is it the beginning of a shake? jr nz,.skipPlayingSound ; if it is the beginning of a shake, play a sound and wait 2/3 of a second - ld a,(SFX_08_3c - SFX_Headers_08) / 3 + ld a,SFX_TINK call PlaySound ld c,40 call DelayFrames @@ -820,7 +820,7 @@ DoPoofSpecialEffects: ; 78fce (1e:4fce) ld a,[W_SUBANIMCOUNTER] cp a,5 ret nz - ld a,(SFX_08_42 - SFX_Headers_08) / 3 + ld a,SFX_BATTLE_02 jp PlaySound DoRockSlideSpecialEffects: ; 78fd9 (1e:4fd9) @@ -921,7 +921,7 @@ TradeShakePokeball: ; 7904c (1e:504c) jr .loop .done call AnimationCleanOAM - ld a,(SFX_02_44 - SFX_Headers_02) / 3 + ld a,SFX_TRADE_MACHINE jp PlaySound BallMoveDistances1: ; 79078 (1e:5078) @@ -952,7 +952,7 @@ TradeJumpPokeball: ; 507C cp a,$ff jr nz,.skipPlayingSound .playSound ; play sound if next move distance is 12 or this is the last one - ld a,(SFX_08_58 - SFX_Headers_08) / 3 + ld a,SFX_BATTLE_18 call PlaySound .skipPlayingSound push bc @@ -2329,172 +2329,172 @@ IsCryMove: ; 798ad (1e:58ad) ret MoveSoundTable: ; 798bc (1e:58bc) - db (SFX_08_4a - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_4c - SFX_Headers_08) / 3,$10,$80 - db (SFX_08_5d - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_4b - SFX_Headers_08) / 3,$01,$80 - db (SFX_08_4d - SFX_Headers_08) / 3,$00,$40 - db (SFX_08_77 - SFX_Headers_08) / 3,$00,$ff - db (SFX_08_4d - SFX_Headers_08) / 3,$10,$60 - db (SFX_08_4d - SFX_Headers_08) / 3,$20,$80 - db (SFX_08_4d - SFX_Headers_08) / 3,$00,$a0 - db (SFX_08_50 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_4f - SFX_Headers_08) / 3,$20,$40 - db (SFX_08_4f - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_4e - SFX_Headers_08) / 3,$00,$a0 - db (SFX_08_51 - SFX_Headers_08) / 3,$10,$c0 - db (SFX_08_51 - SFX_Headers_08) / 3,$00,$a0 - db (SFX_08_52 - SFX_Headers_08) / 3,$00,$c0 - db (SFX_08_52 - SFX_Headers_08) / 3,$10,$a0 - db (SFX_08_53 - SFX_Headers_08) / 3,$00,$e0 - db (SFX_08_51 - SFX_Headers_08) / 3,$20,$c0 - db (SFX_08_54 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_62 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_55 - SFX_Headers_08) / 3,$01,$80 - db (SFX_08_60 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_57 - SFX_Headers_08) / 3,$f0,$40 - db (SFX_08_5a - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_57 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_61 - SFX_Headers_08) / 3,$10,$80 - db (SFX_08_5b - SFX_Headers_08) / 3,$01,$a0 - db (SFX_08_58 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_5e - SFX_Headers_08) / 3,$00,$60 - db (SFX_08_5e - SFX_Headers_08) / 3,$01,$40 - db (SFX_08_5f - SFX_Headers_08) / 3,$00,$a0 - db (SFX_08_5a - SFX_Headers_08) / 3,$10,$a0 - db (SFX_08_60 - SFX_Headers_08) / 3,$00,$c0 - db (SFX_08_54 - SFX_Headers_08) / 3,$10,$60 - db (SFX_08_5a - SFX_Headers_08) / 3,$00,$a0 - db (SFX_08_62 - SFX_Headers_08) / 3,$11,$c0 - db (SFX_08_5a - SFX_Headers_08) / 3,$20,$c0 - db (SFX_08_61 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_5b - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_5b - SFX_Headers_08) / 3,$20,$c0 - db (SFX_08_59 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_71 - SFX_Headers_08) / 3,$ff,$40 - db (SFX_08_5e - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_4b - SFX_Headers_08) / 3,$00,$c0 - db (SFX_08_4b - SFX_Headers_08) / 3,$00,$40 - db (SFX_08_75 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_67 - SFX_Headers_08) / 3,$40,$60 - db (SFX_08_67 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_67 - SFX_Headers_08) / 3,$ff,$40 - db (SFX_08_6a - SFX_Headers_08) / 3,$80,$c0 - db (SFX_08_59 - SFX_Headers_08) / 3,$10,$a0 - db (SFX_08_59 - SFX_Headers_08) / 3,$21,$e0 - db (SFX_08_69 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_64 - SFX_Headers_08) / 3,$20,$60 - db (SFX_08_6a - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_6c - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_68 - SFX_Headers_08) / 3,$40,$80 - db (SFX_08_69 - SFX_Headers_08) / 3,$f0,$e0 - db (SFX_08_6d - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_6a - SFX_Headers_08) / 3,$f0,$60 - db (SFX_08_68 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_76 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_47 - SFX_Headers_08) / 3,$01,$a0 - db (SFX_08_53 - SFX_Headers_08) / 3,$f0,$20 - db (SFX_08_63 - SFX_Headers_08) / 3,$01,$c0 - db (SFX_08_63 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_5a - SFX_Headers_08) / 3,$00,$e0 - db (SFX_08_66 - SFX_Headers_08) / 3,$01,$60 - db (SFX_08_66 - SFX_Headers_08) / 3,$20,$40 - db (SFX_08_64 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_64 - SFX_Headers_08) / 3,$40,$c0 - db (SFX_08_5b - SFX_Headers_08) / 3,$03,$60 - db (SFX_08_65 - SFX_Headers_08) / 3,$11,$e0 - db (SFX_08_52 - SFX_Headers_08) / 3,$20,$e0 - db (SFX_08_6e - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_5c - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_5c - SFX_Headers_08) / 3,$11,$a0 - db (SFX_08_5c - SFX_Headers_08) / 3,$01,$c0 - db (SFX_08_53 - SFX_Headers_08) / 3,$14,$c0 - db (SFX_08_5b - SFX_Headers_08) / 3,$02,$a0 - db (SFX_08_69 - SFX_Headers_08) / 3,$f0,$80 - db (SFX_08_69 - SFX_Headers_08) / 3,$20,$c0 - db (SFX_08_6f - SFX_Headers_08) / 3,$00,$20 - db (SFX_08_6f - SFX_Headers_08) / 3,$20,$80 - db (SFX_08_6e - SFX_Headers_08) / 3,$12,$60 - db (SFX_08_66 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_54 - SFX_Headers_08) / 3,$01,$e0 - db (SFX_08_69 - SFX_Headers_08) / 3,$0f,$e0 - db (SFX_08_69 - SFX_Headers_08) / 3,$11,$20 - db (SFX_08_50 - SFX_Headers_08) / 3,$10,$40 - db (SFX_08_4f - SFX_Headers_08) / 3,$10,$c0 - db (SFX_08_54 - SFX_Headers_08) / 3,$00,$20 - db (SFX_08_70 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_75 - SFX_Headers_08) / 3,$11,$18 - db (SFX_08_49 - SFX_Headers_08) / 3,$20,$c0 - db (SFX_08_48 - SFX_Headers_08) / 3,$20,$c0 - db (SFX_08_65 - SFX_Headers_08) / 3,$00,$10 - db (SFX_08_66 - SFX_Headers_08) / 3,$f0,$20 - db (SFX_08_73 - SFX_Headers_08) / 3,$f0,$c0 - db (SFX_08_51 - SFX_Headers_08) / 3,$f0,$e0 - db (SFX_08_49 - SFX_Headers_08) / 3,$f0,$40 - db (SFX_08_71 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_73 - SFX_Headers_08) / 3,$80,$40 - db (SFX_08_73 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_54 - SFX_Headers_08) / 3,$11,$20 - db (SFX_08_54 - SFX_Headers_08) / 3,$22,$10 - db (SFX_08_5b - SFX_Headers_08) / 3,$f1,$ff - db (SFX_08_53 - SFX_Headers_08) / 3,$f1,$ff - db (SFX_08_54 - SFX_Headers_08) / 3,$33,$30 - db (SFX_08_72 - SFX_Headers_08) / 3,$40,$c0 - db (SFX_08_4e - SFX_Headers_08) / 3,$20,$20 - db (SFX_08_4e - SFX_Headers_08) / 3,$f0,$10 - db (SFX_08_4f - SFX_Headers_08) / 3,$f8,$10 - db (SFX_08_51 - SFX_Headers_08) / 3,$f0,$10 - db (SFX_08_65 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_58 - SFX_Headers_08) / 3,$00,$c0 - db (SFX_08_72 - SFX_Headers_08) / 3,$c0,$ff - db (SFX_08_49 - SFX_Headers_08) / 3,$f2,$20 - db (SFX_08_74 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_74 - SFX_Headers_08) / 3,$00,$40 - db (SFX_08_49 - SFX_Headers_08) / 3,$00,$40 - db (SFX_08_51 - SFX_Headers_08) / 3,$10,$ff - db (SFX_08_6a - SFX_Headers_08) / 3,$20,$20 - db (SFX_08_72 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_69 - SFX_Headers_08) / 3,$1f,$20 - db (SFX_08_65 - SFX_Headers_08) / 3,$2f,$80 - db (SFX_08_4f - SFX_Headers_08) / 3,$1f,$ff - db (SFX_08_6b - SFX_Headers_08) / 3,$1f,$60 - db (SFX_08_66 - SFX_Headers_08) / 3,$1e,$20 - db (SFX_08_66 - SFX_Headers_08) / 3,$1f,$18 - db (SFX_08_54 - SFX_Headers_08) / 3,$0f,$80 - db (SFX_08_49 - SFX_Headers_08) / 3,$f8,$10 - db (SFX_08_48 - SFX_Headers_08) / 3,$18,$20 - db (SFX_08_72 - SFX_Headers_08) / 3,$08,$40 - db (SFX_08_57 - SFX_Headers_08) / 3,$01,$e0 - db (SFX_08_51 - SFX_Headers_08) / 3,$09,$ff - db (SFX_08_75 - SFX_Headers_08) / 3,$42,$01 - db (SFX_08_5c - SFX_Headers_08) / 3,$00,$ff - db (SFX_08_72 - SFX_Headers_08) / 3,$08,$e0 - db (SFX_08_64 - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_49 - SFX_Headers_08) / 3,$88,$10 - db (SFX_08_65 - SFX_Headers_08) / 3,$48,$ff - db (SFX_08_48 - SFX_Headers_08) / 3,$ff,$ff - db (SFX_08_64 - SFX_Headers_08) / 3,$ff,$10 - db (SFX_08_48 - SFX_Headers_08) / 3,$ff,$04 - db (SFX_08_5c - SFX_Headers_08) / 3,$01,$ff - db (SFX_08_53 - SFX_Headers_08) / 3,$f8,$ff - db (SFX_08_4c - SFX_Headers_08) / 3,$f0,$f0 - db (SFX_08_4f - SFX_Headers_08) / 3,$08,$10 - db (SFX_08_4d - SFX_Headers_08) / 3,$f0,$ff - db (SFX_08_5a - SFX_Headers_08) / 3,$f0,$ff - db (SFX_08_74 - SFX_Headers_08) / 3,$10,$ff - db (SFX_08_4e - SFX_Headers_08) / 3,$f0,$20 - db (SFX_08_6b - SFX_Headers_08) / 3,$f0,$60 - db (SFX_08_61 - SFX_Headers_08) / 3,$12,$10 - db (SFX_08_76 - SFX_Headers_08) / 3,$f0,$20 - db (SFX_08_5e - SFX_Headers_08) / 3,$12,$ff - db (SFX_08_71 - SFX_Headers_08) / 3,$80,$04 - db (SFX_08_73 - SFX_Headers_08) / 3,$f0,$10 - db (SFX_08_69 - SFX_Headers_08) / 3,$f8,$ff - db (SFX_08_66 - SFX_Headers_08) / 3,$f0,$ff - db (SFX_08_51 - SFX_Headers_08) / 3,$01,$ff - db (SFX_08_6c - SFX_Headers_08) / 3,$d8,$04 - db (SFX_08_4b - SFX_Headers_08) / 3,$00,$80 - db (SFX_08_4b - SFX_Headers_08) / 3,$00,$80 + db SFX_BATTLE_0A,$00,$80 + db SFX_BATTLE_0C,$10,$80 + db SFX_BATTLE_1D,$00,$80 + db SFX_BATTLE_0B,$01,$80 + db SFX_BATTLE_0D,$00,$40 + db SFX_BATTLE_37,$00,$ff + db SFX_BATTLE_0D,$10,$60 + db SFX_BATTLE_0D,$20,$80 + db SFX_BATTLE_0D,$00,$a0 + db SFX_BATTLE_10,$00,$80 + db SFX_BATTLE_0F,$20,$40 + db SFX_BATTLE_0F,$00,$80 + db SFX_BATTLE_0E,$00,$a0 + db SFX_BATTLE_11,$10,$c0 + db SFX_BATTLE_11,$00,$a0 + db SFX_BATTLE_12,$00,$c0 + db SFX_BATTLE_12,$10,$a0 + db SFX_BATTLE_13,$00,$e0 + db SFX_BATTLE_11,$20,$c0 + db SFX_BATTLE_14,$00,$80 + db SFX_BATTLE_22,$00,$80 + db SFX_BATTLE_15,$01,$80 + db SFX_BATTLE_20,$00,$80 + db SFX_BATTLE_17,$f0,$40 + db SFX_BATTLE_1A,$00,$80 + db SFX_BATTLE_17,$00,$80 + db SFX_BATTLE_21,$10,$80 + db SFX_BATTLE_1B,$01,$a0 + db SFX_BATTLE_18,$00,$80 + db SFX_BATTLE_1E,$00,$60 + db SFX_BATTLE_1E,$01,$40 + db SFX_BATTLE_1F,$00,$a0 + db SFX_BATTLE_1A,$10,$a0 + db SFX_BATTLE_20,$00,$c0 + db SFX_BATTLE_14,$10,$60 + db SFX_BATTLE_1A,$00,$a0 + db SFX_BATTLE_22,$11,$c0 + db SFX_BATTLE_1A,$20,$c0 + db SFX_BATTLE_21,$00,$80 + db SFX_BATTLE_1B,$00,$80 + db SFX_BATTLE_1B,$20,$c0 + db SFX_BATTLE_19,$00,$80 + db SFX_BATTLE_31,$ff,$40 + db SFX_BATTLE_1E,$00,$80 + db SFX_BATTLE_0B,$00,$c0 + db SFX_BATTLE_0B,$00,$40 + db SFX_BATTLE_35,$00,$80 + db SFX_BATTLE_27,$40,$60 + db SFX_BATTLE_27,$00,$80 + db SFX_BATTLE_27,$ff,$40 + db SFX_BATTLE_2A,$80,$c0 + db SFX_BATTLE_19,$10,$a0 + db SFX_BATTLE_19,$21,$e0 + db SFX_BATTLE_29,$00,$80 + db SFX_BATTLE_24,$20,$60 + db SFX_BATTLE_2A,$00,$80 + db SFX_BATTLE_2C,$00,$80 + db SFX_BATTLE_28,$40,$80 + db SFX_BATTLE_29,$f0,$e0 + db SFX_BATTLE_2D,$00,$80 + db SFX_BATTLE_2A,$f0,$60 + db SFX_BATTLE_28,$00,$80 + db SFX_BATTLE_36,$00,$80 + db SFX_BATTLE_07,$01,$a0 + db SFX_BATTLE_13,$f0,$20 + db SFX_BATTLE_23,$01,$c0 + db SFX_BATTLE_23,$00,$80 + db SFX_BATTLE_1A,$00,$e0 + db SFX_BATTLE_26,$01,$60 + db SFX_BATTLE_26,$20,$40 + db SFX_BATTLE_24,$00,$80 + db SFX_BATTLE_24,$40,$c0 + db SFX_BATTLE_1B,$03,$60 + db SFX_BATTLE_25,$11,$e0 + db SFX_BATTLE_12,$20,$e0 + db SFX_BATTLE_2E,$00,$80 + db SFX_BATTLE_1C,$00,$80 + db SFX_BATTLE_1C,$11,$a0 + db SFX_BATTLE_1C,$01,$c0 + db SFX_BATTLE_13,$14,$c0 + db SFX_BATTLE_1B,$02,$a0 + db SFX_BATTLE_29,$f0,$80 + db SFX_BATTLE_29,$20,$c0 + db SFX_BATTLE_2F,$00,$20 + db SFX_BATTLE_2F,$20,$80 + db SFX_BATTLE_2E,$12,$60 + db SFX_BATTLE_26,$00,$80 + db SFX_BATTLE_14,$01,$e0 + db SFX_BATTLE_29,$0f,$e0 + db SFX_BATTLE_29,$11,$20 + db SFX_BATTLE_10,$10,$40 + db SFX_BATTLE_0F,$10,$c0 + db SFX_BATTLE_14,$00,$20 + db SFX_BATTLE_30,$00,$80 + db SFX_BATTLE_35,$11,$18 + db SFX_BATTLE_09,$20,$c0 + db SFX_BATTLE_08,$20,$c0 + db SFX_BATTLE_25,$00,$10 + db SFX_BATTLE_26,$f0,$20 + db SFX_BATTLE_33,$f0,$c0 + db SFX_BATTLE_11,$f0,$e0 + db SFX_BATTLE_09,$f0,$40 + db SFX_BATTLE_31,$00,$80 + db SFX_BATTLE_33,$80,$40 + db SFX_BATTLE_33,$00,$80 + db SFX_BATTLE_14,$11,$20 + db SFX_BATTLE_14,$22,$10 + db SFX_BATTLE_1B,$f1,$ff + db SFX_BATTLE_13,$f1,$ff + db SFX_BATTLE_14,$33,$30 + db SFX_BATTLE_32,$40,$c0 + db SFX_BATTLE_0E,$20,$20 + db SFX_BATTLE_0E,$f0,$10 + db SFX_BATTLE_0F,$f8,$10 + db SFX_BATTLE_11,$f0,$10 + db SFX_BATTLE_25,$00,$80 + db SFX_BATTLE_18,$00,$c0 + db SFX_BATTLE_32,$c0,$ff + db SFX_BATTLE_09,$f2,$20 + db SFX_BATTLE_34,$00,$80 + db SFX_BATTLE_34,$00,$40 + db SFX_BATTLE_09,$00,$40 + db SFX_BATTLE_11,$10,$ff + db SFX_BATTLE_2A,$20,$20 + db SFX_BATTLE_32,$00,$80 + db SFX_BATTLE_29,$1f,$20 + db SFX_BATTLE_25,$2f,$80 + db SFX_BATTLE_0F,$1f,$ff + db SFX_BATTLE_2B,$1f,$60 + db SFX_BATTLE_26,$1e,$20 + db SFX_BATTLE_26,$1f,$18 + db SFX_BATTLE_14,$0f,$80 + db SFX_BATTLE_09,$f8,$10 + db SFX_BATTLE_08,$18,$20 + db SFX_BATTLE_32,$08,$40 + db SFX_BATTLE_17,$01,$e0 + db SFX_BATTLE_11,$09,$ff + db SFX_BATTLE_35,$42,$01 + db SFX_BATTLE_1C,$00,$ff + db SFX_BATTLE_32,$08,$e0 + db SFX_BATTLE_24,$00,$80 + db SFX_BATTLE_09,$88,$10 + db SFX_BATTLE_25,$48,$ff + db SFX_BATTLE_08,$ff,$ff + db SFX_BATTLE_24,$ff,$10 + db SFX_BATTLE_08,$ff,$04 + db SFX_BATTLE_1C,$01,$ff + db SFX_BATTLE_13,$f8,$ff + db SFX_BATTLE_0C,$f0,$f0 + db SFX_BATTLE_0F,$08,$10 + db SFX_BATTLE_0D,$f0,$ff + db SFX_BATTLE_1A,$f0,$ff + db SFX_BATTLE_34,$10,$ff + db SFX_BATTLE_0E,$f0,$20 + db SFX_BATTLE_2B,$f0,$60 + db SFX_BATTLE_21,$12,$10 + db SFX_BATTLE_36,$f0,$20 + db SFX_BATTLE_1E,$12,$ff + db SFX_BATTLE_31,$80,$04 + db SFX_BATTLE_33,$f0,$10 + db SFX_BATTLE_29,$f8,$ff + db SFX_BATTLE_26,$f0,$ff + db SFX_BATTLE_11,$01,$ff + db SFX_BATTLE_2C,$d8,$04 + db SFX_BATTLE_0B,$00,$80 + db SFX_BATTLE_0B,$00,$80 CopyPicTiles: ; 79aae (1e:5aae) ld a, [H_WHOSETURN] @@ -2929,7 +2929,7 @@ TossBallAnimation: ; 79e16 (1e:5e16) ld a,TOSS_ANIM ld [W_ANIMATIONID],a call PlayAnimation - ld a,(SFX_08_43 - SFX_Headers_08) / 3 + ld a,SFX_BATTLE_03 call PlaySound ld a,BLOCKBALL_ANIM ld [W_ANIMATIONID],a @@ -2945,15 +2945,15 @@ PlayApplyingAttackSound: ; 79e6a (1e:5e6a) cp $a ld a, $20 ld b, $30 - ld c, (SFX_08_50 - SFX_Headers_08) / 3 + ld c, SFX_BATTLE_10 jr z, .asm_79e8b ld a, $e0 ld b, $ff - ld c, (SFX_08_5a - SFX_Headers_08) / 3 + ld c, SFX_BATTLE_1A jr nc, .asm_79e8b ld a, $50 ld b, $1 - ld c, (SFX_08_51 - SFX_Headers_08) / 3 + ld c, SFX_BATTLE_11 .asm_79e8b ld [wc0f1], a ld a, b diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 11309a86..41e402f3 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -64,7 +64,7 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) ld [wc0f1], a ld a, $80 ld [wc0f2], a - ld a, (SFX_08_77 - SFX_Headers_08) / 3 + ld a, SFX_BATTLE_37 call PlaySound jp WaitForSoundToFinish .done diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 5deeb4dc..30b62dea 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -355,7 +355,7 @@ EnemyRan: ; 3c202 (f:4202) ld hl, EnemyRanText .printText call PrintText - ld a, (SFX_08_44 - SFX_Headers_08) / 3 + ld a, SFX_BATTLE_04 call PlaySoundWaitForCurrent xor a ld [H_WHOSETURN], a @@ -864,13 +864,13 @@ FaintEnemyPokemon: ; 0x3c567 xor a ld [wc0f1], a ld [wc0f2], a - ld a, (SFX_08_48 - SFX_Headers_08) / 3 ; SFX_FALL? + ld a, SFX_BATTLE_08 ; SFX_FALL? call PlaySoundWaitForCurrent .sfxwait ld a, [wc02a] - cp (SFX_08_48 - SFX_Headers_08) / 3 + cp SFX_BATTLE_08 jr z, .sfxwait - ld a, (SFX_08_43 - SFX_Headers_08) / 3 ; SFX_DROP + ld a, SFX_BATTLE_03 ; SFX_DROP call PlaySound call WaitForSoundToFinish jr .sfxplayed @@ -1678,7 +1678,7 @@ TryRunningFromBattle: ; 3cab9 (f:4ab9) dec a .playSound ld [wBattleResult], a - ld a, (SFX_08_44 - SFX_Headers_08) / 3 + ld a, SFX_BATTLE_04 call PlaySoundWaitForCurrent ld hl, GotAwayText call PrintText diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index a53f00f6..c803a870 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -553,7 +553,7 @@ DecrementAICount: ; 3a695 (e:6695) ret AIPlayRestoringSFX: ; 3a69b (e:669b) - ld a,(SFX_08_3e - SFX_Headers_08) / 3 + ld a,SFX_HEAL_AILMENT jp PlaySoundWaitForCurrent AIUseFullRestore: ; 3a6a0 (e:66a0) diff --git a/engine/evolution.asm b/engine/evolution.asm index 9ed38c21..0f3a0d00 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -14,7 +14,7 @@ EvolveMon: ; 7bde9 (1e:7de9) call PlaySound ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a - ld a, (SFX_08_3c - SFX_Headers_08) / 3 + ld a, SFX_TINK call PlaySound call Delay3 xor a diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 4a253c68..9cdc617c 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -146,7 +146,7 @@ Evolution_PartyMonLoop: ; loop over party mons push hl ld hl, IntoText call Func_3c59 - ld a, (SFX_02_3b - SFX_Headers_02) / 3 + ld a, SFX_GET_ITEM_2 call PlaySoundWaitForCurrent call WaitForSoundToFinish ld c, 40 diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm index 38c66793..49c938f7 100755 --- a/engine/gamefreak.asm +++ b/engine/gamefreak.asm @@ -26,7 +26,7 @@ LoadShootingStarGraphics: ; 70000 (1c:4000) AnimateShootingStar: ; 70044 (1c:4044) call LoadShootingStarGraphics - ld a, (SFX_1f_67 - SFX_Headers_1f) / 3 + ld a, SFX_SHOOTING_STAR call PlaySound ; Move the big star down and left across the screen. diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 841929b8..b65ee2c8 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -423,7 +423,7 @@ VermilionGymTrashSuccesText1: ; 5dec8 (17:5ec8) TX_FAR _VermilionGymTrashSuccesText1 TX_ASM call WaitForSoundToFinish - ld a, (SFX_02_49 - SFX_Headers_02) / 3 + ld a, SFX_SWITCH call PlaySound call WaitForSoundToFinish jp TextScriptEnd @@ -437,7 +437,7 @@ VermilionGymTrashSuccesText2: ; 5dedb (17:5edb) VermilionGymTrashSuccesPlaySfx: ; 5dee0 (17:5ee0) TX_ASM call WaitForSoundToFinish - ld a, (SFX_02_49 - SFX_Headers_02) / 3 + ld a, SFX_SWITCH call PlaySound call WaitForSoundToFinish jp TextScriptEnd @@ -446,7 +446,7 @@ VermilionGymTrashSuccesText3: ; 5deef (17:5eef) TX_FAR _VermilionGymTrashSuccesText3 TX_ASM call WaitForSoundToFinish - ld a, (SFX_02_57 - SFX_Headers_02) / 3 + ld a, SFX_GO_INSIDE call PlaySound call WaitForSoundToFinish jp TextScriptEnd @@ -455,7 +455,7 @@ VermilionGymTrashFailText: ; 5df02 (17:5f02) TX_FAR _VermilionGymTrashFailText TX_ASM call WaitForSoundToFinish - ld a, (SFX_02_51 - SFX_Headers_02) / 3 + ld a, SFX_DENIED call PlaySound call WaitForSoundToFinish jp TextScriptEnd diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 31ae17a4..4c2ea816 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -68,7 +68,7 @@ SafariZoneGameOver: ; 1e9b0 (7:69b0) dec a call PlaySound ld c, BANK(SFX_02_5f) - ld a, (SFX_02_5f - SFX_Headers_02) / 3 + ld a, SFX_SAFARI_ZONE_PA call PlayMusic .asm_1e9c2 ld a, [wc02a] @@ -214,7 +214,7 @@ CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92) jp CinnabarGymQuiz_1eb0a .asm_1eab8 call WaitForSoundToFinish - ld a, (SFX_02_51 - SFX_Headers_02) / 3 + ld a, SFX_DENIED call PlaySound call WaitForSoundToFinish ld hl, CinnabarGymQuizIncorrectText @@ -247,7 +247,7 @@ CinnabarGymQuizCorrectText: ; 1eae3 (7:6ae3) and a jp nz, TextScriptEnd call WaitForSoundToFinish - ld a, (SFX_02_57 - SFX_Headers_02) / 3 + ld a, SFX_GO_INSIDE call PlaySound call WaitForSoundToFinish jp TextScriptEnd @@ -335,22 +335,22 @@ BillsHousePC: ; 1eb6e (7:6b6e) tx_pre BillsHouseInitiatedText ld c, 32 call DelayFrames - ld a, (SFX_02_3c - SFX_Headers_02) / 3 + ld a, SFX_TINK call PlaySound call WaitForSoundToFinish ld c, 80 call DelayFrames - ld a, (SFX_02_48 - SFX_Headers_02) / 3 + ld a, SFX_SHRINK call PlaySound call WaitForSoundToFinish ld c, 48 call DelayFrames - ld a, (SFX_02_3c - SFX_Headers_02) / 3 + ld a, SFX_TINK call PlaySound call WaitForSoundToFinish ld c, 32 call DelayFrames - ld a, (SFX_02_3a - SFX_Headers_02) / 3 + ld a, SFX_GET_ITEM_1 call PlaySound call WaitForSoundToFinish call PlayDefaultMusic @@ -376,7 +376,7 @@ BillsHouseInitiatedText: ; 1ebe2 (7:6be2) call PlaySound ld c, 16 call DelayFrames - ld a, (SFX_02_49 - SFX_Headers_02) / 3 + ld a, SFX_SWITCH call PlaySound call WaitForSoundToFinish ld c, 60 diff --git a/engine/intro.asm b/engine/intro.asm index 79cc2101..6b5c46c9 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -35,14 +35,14 @@ PlayIntroScene: ; 4169d (10:569d) ret c ; hip - ld a, (SFX_1f_5f - SFX_Headers_1f) / 3 + ld a, SFX_INTRO_HIP call PlaySound xor a ld [wd09f], a ld de, IntroNidorinoAnimation1 call AnimateIntroNidorino ; hop - ld a, (SFX_1f_60 - SFX_Headers_1f) / 3 + ld a, SFX_INTRO_HOP call PlaySound ld de, IntroNidorinoAnimation2 call AnimateIntroNidorino @@ -51,12 +51,12 @@ PlayIntroScene: ; 4169d (10:569d) ret c ; hip - ld a, (SFX_1f_5f - SFX_Headers_1f) / 3 + ld a, SFX_INTRO_HIP call PlaySound ld de, IntroNidorinoAnimation1 call AnimateIntroNidorino ; hop - ld a, (SFX_1f_60 - SFX_Headers_1f) / 3 + ld a, SFX_INTRO_HOP call PlaySound ld de, IntroNidorinoAnimation2 call AnimateIntroNidorino @@ -67,7 +67,7 @@ PlayIntroScene: ; 4169d (10:569d) ; raise ld b, $4 call IntroCopyTiles - ld a, (SFX_1f_61 - SFX_Headers_1f) / 3 + ld a, SFX_INTRO_RAISE call PlaySound ld de, $401 ; move Gengar left by 8 pixels call IntroMoveMon @@ -78,12 +78,12 @@ PlayIntroScene: ; 4169d (10:569d) ; slash ld b, $5 call IntroCopyTiles - ld a, (SFX_1f_62 - SFX_Headers_1f) / 3 + ld a, SFX_INTRO_CRASH call PlaySound ld de, $800 ; move Gengar right by 16 pixels call IntroMoveMon ; hip - ld a, (SFX_1f_5f - SFX_Headers_1f) / 3 + ld a, SFX_INTRO_HIP call PlaySound ld a, $24 ld [wd09f], a @@ -102,14 +102,14 @@ PlayIntroScene: ; 4169d (10:569d) ret c ; hip - ld a, (SFX_1f_5f - SFX_Headers_1f) / 3 + ld a, SFX_INTRO_HIP call PlaySound xor a ld [wd09f], a ld de, IntroNidorinoAnimation4 call AnimateIntroNidorino ; hop - ld a, (SFX_1f_60 - SFX_Headers_1f) / 3 + ld a, SFX_INTRO_HOP call PlaySound ld de, IntroNidorinoAnimation5 call AnimateIntroNidorino @@ -126,7 +126,7 @@ PlayIntroScene: ; 4169d (10:569d) ret c ; lunge - ld a, (SFX_1f_5e - SFX_Headers_1f) / 3 + ld a, SFX_INTRO_LUNGE call PlaySound ld a, $48 ld [wd09f], a diff --git a/engine/items/items.asm b/engine/items/items.asm index fe2d71c8..69e8b4bf 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -644,7 +644,7 @@ ItemUseEvoStone: ; da5b (3:5a5b) ld [wcf91],a ld a,$01 ld [wForceEvolution],a - ld a,(SFX_02_3e - SFX_Headers_02) / 3 + ld a,SFX_HEAL_AILMENT call PlaySoundWaitForCurrent call WaitForSoundToFinish callab TryEvolvingMon ; try to evolve pokemon @@ -917,7 +917,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld a,[wWhichPokemon] ld bc,2 * 20 call AddNTimes ; calculate coordinates of HP bar of pokemon that used Softboiled - ld a,(SFX_02_3d - SFX_Headers_02) / 3 + ld a,SFX_HEAL_HP call PlaySoundWaitForCurrent ld a,[hFlags_0xFFF6] set 0,a @@ -1067,7 +1067,7 @@ ItemUseMedicine: ; dabb (3:5abb) jr c,.playStatusAilmentCuringSound cp a,FULL_HEAL jr z,.playStatusAilmentCuringSound - ld a,(SFX_02_3d - SFX_Headers_02) / 3 ; HP healing sound + ld a,SFX_HEAL_HP call PlaySoundWaitForCurrent ld a,[hFlags_0xFFF6] set 0,a @@ -1089,7 +1089,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld [wPartyMenuTypeOrMessageID],a jr .showHealingItemMessage .playStatusAilmentCuringSound - ld a,(SFX_02_3e - SFX_Headers_02) / 3 ; status ailment curing sound + ld a,SFX_HEAL_AILMENT call PlaySoundWaitForCurrent .showHealingItemMessage xor a @@ -1178,7 +1178,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld de,wcf4b ld bc,10 call CopyData ; copy the stat's name to wcf4b - ld a,(SFX_02_3e - SFX_Headers_02) / 3 + ld a,SFX_HEAL_AILMENT call PlaySound ld hl,VitaminStatRoseText call PrintText @@ -1720,7 +1720,7 @@ PlayedFluteHadEffectText: ; e215 (3:6215) ; play out-of-battle pokeflute music ld a,$ff call PlaySound ; turn off music - ld a, (SFX_02_5e - SFX_Headers_02) / 3 + ld a, SFX_POKEFLUE ld c, BANK(SFX_02_5e) call PlayMusic .musicWaitLoop ; wait for music to finish playing @@ -1824,7 +1824,7 @@ FishingInit: ; e2b4 (3:62b4) call ItemUseReloadOverworldData ld hl,ItemUseText00 call PrintText - ld a,(SFX_02_3e - SFX_Headers_02) / 3 + ld a,SFX_HEAL_AILMENT call PlaySound ld c,80 call DelayFrames @@ -1847,9 +1847,9 @@ ItemUseItemfinder: ; e2e1 (3:62e1) jr nc,.printText ; if no hidden items ld c,4 .loop - ld a,(SFX_02_4a - SFX_Headers_02) / 3 + ld a,SFX_HEALING_MACHINE call PlaySoundWaitForCurrent - ld a,(SFX_02_5a - SFX_Headers_02) / 3 + ld a,SFX_PURCHASE call PlaySoundWaitForCurrent dec c jr nz,.loop @@ -1951,7 +1951,7 @@ ItemUsePPRestore: ; e31e (3:631e) ld bc,4 call CopyData ; copy party data to in-battle data .skipUpdatingInBattleData - ld a,(SFX_02_3e - SFX_Headers_02) / 3 + ld a,SFX_HEAL_AILMENT call PlaySound ld hl,PPRestoredText call PrintText @@ -2146,7 +2146,7 @@ ItemUseTMHM: ; e479 (3:6479) and a ; can the pokemon learn the move? jr nz,.checkIfAlreadyLearnedMove ; if the pokemon can't learn the move - ld a,(SFX_02_51 - SFX_Headers_02) / 3 + ld a,SFX_DENIED call PlaySoundWaitForCurrent ld hl,MonCannotLearnMachineMoveText call PrintText @@ -2186,7 +2186,7 @@ MonCannotLearnMachineMoveText: ; e55e (3:655e) PrintItemUseTextAndRemoveItem: ; e563 (3:6563) ld hl,ItemUseText00 call PrintText - ld a,(SFX_02_3e - SFX_Headers_02) / 3 + ld a,SFX_HEAL_AILMENT call PlaySound call WaitForTextScrollButtonPress ; wait for button press diff --git a/engine/learn_move.asm b/engine/learn_move.asm index 1c0e038c..abc3b7d4 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -207,7 +207,7 @@ OneTwoAndText: ; 6fc8 (1:6fc8) TX_FAR _OneTwoAndText db $a TX_ASM - ld a, (SFX_02_58 - SFX_Headers_02) / 3 + ld a, SFX_SWAP call PlaySoundWaitForCurrent ld hl, PoofText ret diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 9e160f81..dc936c97 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -481,7 +481,7 @@ DisplayOptionMenu: ; 5e8a (1:5e8a) cp a,16 ; is the cursor on Cancel? jr nz,.loop .exitMenu - ld a,(SFX_02_40 - SFX_Headers_02) / 3 + ld a,SFX_PRESS_AB call PlaySound ret .eraseOldMenuCursor diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 20deb834..9a608491 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -262,7 +262,7 @@ DisplayNamingScreen: ; 6596 (1:6596) ld a, [wHPBarNewHP] ld [hli], a ld [hl], $50 - ld a, (SFX_02_40 - SFX_Headers_02) / 3 + ld a, SFX_PRESS_AB call PlaySound ret .pressedB diff --git a/engine/menu/pc.asm b/engine/menu/pc.asm index 8ee40c7c..b5281964 100755 --- a/engine/menu/pc.asm +++ b/engine/menu/pc.asm @@ -1,6 +1,6 @@ ActivatePC: ; 17e2c (5:7e2c) call SaveScreenTilesToBuffer2 - ld a, (SFX_02_45 - SFX_Headers_02) / 3 + ld a, SFX_TURN_ON_PC call PlaySound ld hl, TurnedOnPC1Text call PrintText @@ -51,7 +51,7 @@ PCMainMenu: ; 17e48 (5:7e48) ld hl, wFlags_0xcd60 res 5, [hl] set 3, [hl] - ld a, (SFX_02_47 - SFX_Headers_02) / 3 + ld a, SFX_ENTER_PC call PlaySound call WaitForSoundToFinish ld hl, AccessedMyPCText @@ -59,19 +59,19 @@ PCMainMenu: ; 17e48 (5:7e48) callba PlayerPC jr ReloadMainMenu OaksPC: ; 17ec0 (5:7ec0) - ld a, (SFX_02_47 - SFX_Headers_02) / 3 + ld a, SFX_ENTER_PC call PlaySound call WaitForSoundToFinish callba OpenOaksPC jr ReloadMainMenu PKMNLeague: ; 17ed2 (5:7ed2) - ld a, (SFX_02_47 - SFX_Headers_02) / 3 + ld a, SFX_ENTER_PC call PlaySound call WaitForSoundToFinish callba PKMNLeaguePC jr ReloadMainMenu BillsPC: ; 17ee4 (5:7ee4) - ld a, (SFX_02_47 - SFX_Headers_02) / 3 + ld a, SFX_ENTER_PC call PlaySound call WaitForSoundToFinish ld a, [wd7f1] ;has to do with having met Bill @@ -91,7 +91,7 @@ ReloadMainMenu: ; 17f06 (5:7f06) call UpdateSprites jp PCMainMenu LogOff: ; 17f13 (5:7f13) - ld a, (SFX_02_46 - SFX_Headers_02) / 3 + ld a, SFX_TURN_OFF_PC call PlaySound call WaitForSoundToFinish ld hl, wFlags_0xcd60 diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm index 89974dd0..00889e93 100755 --- a/engine/menu/players_pc.asm +++ b/engine/menu/players_pc.asm @@ -11,7 +11,7 @@ PlayerPC: ; 78e6 (1:78e6) bit 3, a ; accessing player's PC through another PC? jr nz, PlayerPCMenu ; accessing it directly - ld a, (SFX_02_45 - SFX_Headers_02) / 3 + ld a, SFX_TURN_ON_PC call PlaySound ld hl, TurnedOnPC2Text call PrintText @@ -67,7 +67,7 @@ ExitPlayerPC: ; 796d (1:796d) bit 3, a ; accessing player's PC through another PC? jr nz, .next ; accessing it directly - ld a, (SFX_02_46 - SFX_Headers_02) / 3 + ld a, SFX_TURN_OFF_PC call PlaySound call WaitForSoundToFinish .next @@ -130,7 +130,7 @@ PlayerPCDeposit: ; 7995 (1:7995) ld hl, wNumBagItems call RemoveItemFromInventory call WaitForSoundToFinish - ld a, (SFX_02_55 - SFX_Headers_02) / 3 + ld a, SFX_WITHDRAW_DEPOSIT call PlaySound call WaitForSoundToFinish ld hl, ItemWasStoredText @@ -184,7 +184,7 @@ PlayerPCWithdraw: ; 7a12 (1:7a12) ld hl, wNumBoxItems call RemoveItemFromInventory call WaitForSoundToFinish - ld a, (SFX_02_55 - SFX_Headers_02) / 3 + ld a, SFX_WITHDRAW_DEPOSIT call PlaySound call WaitForSoundToFinish ld hl, WithdrewItemText diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index 7aa09df7..bd876f5b 100755 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -4,7 +4,7 @@ DisplayStartMenu:: ; 2acd (0:2acd) ld [MBC1RomBank],a ld a,[wWalkBikeSurfState] ; walking/biking/surfing ld [wWalkBikeSurfStateCopy],a - ld a, (SFX_02_3f - SFX_Headers_02) / 3 ; Start menu sound + ld a, SFX_START_MENU call PlaySound RedisplayStartMenu:: ; 2adf (0:2adf) diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 0036d66e..481c0fbe 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -734,7 +734,7 @@ SwitchPartyMon_ClearGfx: ; 13625 (4:7625) dec c jr nz, .clearMonOAMLoop call WaitForSoundToFinish - ld a, (SFX_02_58 - SFX_Headers_02) / 3 + ld a, SFX_SWAP jp PlaySound SwitchPartyMon_InitVarOrSwapData: ; 13653 (4:7653) diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index 0f6c6a13..8460889f 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -58,7 +58,7 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0) ld c, 2 call DelayFrames push bc - ld a, (SFX_02_53 - SFX_Headers_02) / 3 + ld a, SFX_PUSH_BOULDER call PlaySound pop bc dec b diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index c7b2f4d6..62b054df 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -106,7 +106,7 @@ OakSpeech: ; 6115 (1:6115) .next ld a,[H_LOADEDROMBANK] push af - ld a,(SFX_02_48 - SFX_Headers_02) / 3 + ld a,SFX_SHRINK call PlaySound pop af ld [H_LOADEDROMBANK],a diff --git a/engine/overworld/cable_club_npc.asm b/engine/overworld/cable_club_npc.asm index 86a7ab7d..b9e3102a 100755 --- a/engine/overworld/cable_club_npc.asm +++ b/engine/overworld/cable_club_npc.asm @@ -57,7 +57,7 @@ CableClubNPC: ; 71c5 (1:71c5) jr nz, .choseNo callab SaveSAVtoSRAM call WaitForSoundToFinish - ld a, (SFX_02_5d - SFX_Headers_02) / 3 + ld a, SFX_SAVE call PlaySoundWaitForCurrent ld hl, CableClubNPCPleaseWaitText call PrintText diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm index 94c1868c..746ea326 100755 --- a/engine/overworld/card_key.asm +++ b/engine/overworld/card_key.asm @@ -51,7 +51,7 @@ PrintCardKeyText: ; 52673 (14:6673) predef ReplaceTileBlock ld hl, wd126 set 5, [hl] - ld a, (SFX_1f_57 - SFX_Headers_1f) / 3 + ld a, SFX_GO_INSIDE jp PlaySound .noCardKey tx_pre_id CardKeyFailText diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index f7be269c..293daee7 100755 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -60,7 +60,7 @@ UsedCut: ; ef54 (3:6f54) callba Func_79e96 ld a, $1 ld [wUpdateSpritesEnabled], a - ld a, (SFX_02_56 - SFX_Headers_02) / 3 + ld a, SFX_CUT call PlaySound ld a, $90 ld [hWY], a diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index f5b1d14c..0c30ee59 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -19,7 +19,7 @@ ShakeElevator: ; 7bf15 (1e:7f15) ld [hSCY], a push bc ld c, BANK(SFX_02_5b) - ld a, (SFX_02_5b - SFX_Headers_02) / 3 + ld a, SFX_COLLISION call PlayMusic pop bc ld c, 2 @@ -31,7 +31,7 @@ ShakeElevator: ; 7bf15 (1e:7f15) ld a, $ff call PlaySound ld c, BANK(SFX_02_5f) - ld a, (SFX_02_5f - SFX_Headers_02) / 3 + ld a, SFX_SAFARI_ZONE_PA call PlayMusic .asm_7bf57 ld a, [wc02a] diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index d00bbc05..fce797d0 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -28,7 +28,7 @@ AnimateHealingMachine: ; 70433 (1c:4433) ld b, a .asm_7046e call Func_70503 - ld a, (SFX_02_4a - SFX_Headers_02) / 3 + ld a, SFX_HEALING_MACHINE call PlaySound ld c, 30 call DelayFrames diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index 910fcf04..94f20439 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -33,7 +33,7 @@ FoundHiddenItemText: ; 7675b (1d:675b) ld c, a ld b, $1 predef FlagActionPredef - ld a, (SFX_02_3b - SFX_Headers_02) / 3 + ld a, SFX_GET_ITEM_2 call PlaySoundWaitForCurrent call WaitForSoundToFinish jp TextScriptEnd diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index 3a183c0f..51819802 100755 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -50,7 +50,7 @@ HandleLedges: ; 1a672 (6:6672) ld a, $2 ld [wSimulatedJoypadStatesIndex], a call LoadHoppingShadowOAM - ld a, (SFX_02_4e - SFX_Headers_02) / 3 + ld a, SFX_LEDGE call PlaySound ret diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 98ea466d..5ce2b2a6 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -9,7 +9,7 @@ EnterMapAnim: ; 70510 (1c:4510) bit 7, [hl] ; used fly out of battle? res 7, [hl] jr nz, .flyAnimation - ld a, (SFX_02_4c - SFX_Headers_02) / 3 + ld a, SFX_TELEPORT_2 call PlaySound ld hl, wd732 bit 4, [hl] ; used dungeon warp? @@ -17,7 +17,7 @@ EnterMapAnim: ; 70510 (1c:4510) pop hl jr nz, .dungeonWarpAnimation call PlayerSpinWhileMovingDown - ld a, (SFX_02_4f - SFX_Headers_02) / 3 + ld a, SFX_FLY_1 call PlaySound call IsPlayerStandingOnWarpPadOrHole ld a, b @@ -50,7 +50,7 @@ EnterMapAnim: ; 70510 (1c:4510) ld bc, (BANK(BirdSprite) << 8) + $0c call CopyVideoData call LoadBirdSpriteGraphics - ld a, (SFX_02_50 - SFX_Headers_02) / 3 + ld a, SFX_FLY_2 call PlaySound ld hl, wFlyAnimUsingCoordList xor a ; is using coord list @@ -99,7 +99,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) dec a jp nz, LeaveMapThroughHoleAnim .spinWhileMovingUp - ld a, (SFX_02_4b - SFX_Headers_02) / 3 + ld a, SFX_TELEPORT_1 call PlaySound ld hl, wPlayerSpinWhileMovingUpOrDownAnimDeltaY ld a, -$10 @@ -133,7 +133,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayDelta xor a ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayEndValue - ld [hl], (SFX_02_4d - SFX_Headers_02) / 3 ; wPlayerSpinInPlaceAnimSoundID + ld [hl], SFX_TELEPORT_3 ; wPlayerSpinInPlaceAnimSoundID ld hl, wFacingDirectionList call PlayerSpinInPlace jr .spinWhileMovingUp @@ -146,7 +146,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) ld [hli], a ; wFlyAnimCounter ld [hl], $c ; wFlyAnimBirdSpriteImageIndex call DoFlyAnimation - ld a, (SFX_02_50 - SFX_Headers_02) / 3 + ld a, SFX_FLY_2 call PlaySound ld hl, wFlyAnimUsingCoordList xor a ; is using coord list diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm index ebc99eed..d59b2dc7 100755 --- a/engine/overworld/pokemart.asm +++ b/engine/overworld/pokemart.asm @@ -190,7 +190,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) ld a,1 ld [wBoughtOrSoldItemInMart],a .skipSettingFlag2 - ld a,(SFX_02_5a - SFX_Headers_02) / 3 + ld a,SFX_PURCHASE call PlaySoundWaitForCurrent call WaitForSoundToFinish ld hl,PokemartBoughtItemText diff --git a/engine/save.asm b/engine/save.asm index 56468595..d13a2aa7 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -161,7 +161,7 @@ SaveSAV: ; 7370a (1c:770a) call DelayFrames ld hl,GameSavedText call PrintText - ld a, (SFX_02_5d - SFX_Headers_02) / 3 ;sound for saved game + ld a, SFX_SAVE call PlaySoundWaitForCurrent call WaitForSoundToFinish ld c,30 @@ -375,7 +375,7 @@ ChangeBox:: ; 738a1 (1c:78a1) call SaveSAVtoSRAM ld hl, wChangeBoxSavedMapTextPointer call SetMapTextPointer - ld a, (SFX_02_5d - SFX_Headers_02) / 3 + ld a, SFX_SAVE call PlaySoundWaitForCurrent call WaitForSoundToFinish ret diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index ea1eb315..c7968c10 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -116,7 +116,7 @@ MainSlotMachineLoop: ; 37395 (d:7395) ld [hli], a ld [hl], a call WaitForSoundToFinish - ld a, (SFX_1f_66 - SFX_Headers_1f) / 3 + ld a, SFX_SLOTS_NEW_SPIN call PlaySound ld hl, StartSlotMachineText call PrintText @@ -584,7 +584,7 @@ SlotReward15Func: ; 376e5 (d:76e5) ret SlotReward100Func: ; 376f3 (d:76f3) - ld a, (SFX_1f_42 - SFX_Headers_1f) / 3 + ld a, SFX_GET_KEY_ITEM call PlaySound xor a ld [wSlotMachineFlags], a @@ -595,7 +595,7 @@ SlotReward100Func: ; 376f3 (d:76f3) SlotReward300Func: ; 37702 (d:7702) ld hl, YeahText call PrintText - ld a, (SFX_1f_3b - SFX_Headers_1f) / 3 + ld a, SFX_GET_ITEM_2 call PlaySound call Random cp $80 @@ -689,7 +689,7 @@ SlotMachine_PayCoinsToPlayer: ; 3776b (d:776b) predef AddBCDPredef call SlotMachine_PrintCreditCoins call SlotMachine_PrintPayoutCoins - ld a, (SFX_1f_65 - SFX_Headers_1f) / 3 + ld a, SFX_SLOTS_REWARD call PlaySound ld a, [wAnimCounter] dec a @@ -837,7 +837,7 @@ SlotMachine_HandleInputWhileWheelsSpin: ; 37882 (d:7882) jr z, .skip .loop inc [hl] - ld a, (SFX_1f_64 - SFX_Headers_1f) / 3 + ld a, SFX_SLOTS_STOP_WHEEL jp PlaySound .skip ld a, [de] diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 3a4e2e4c..c5f72aee 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -157,7 +157,7 @@ ENDC ld d, a cp -3 jr nz, .skipPlayingSound - ld a, (SFX_1f_62 - SFX_Headers_1f) / 3 + ld a, SFX_INTRO_CRASH call PlaySound .skipPlayingSound ld a, [hli] @@ -191,7 +191,7 @@ ENDC call LoadScreenTilesFromBuffer1 ld c, 36 call DelayFrames - ld a, (SFX_1f_63 - SFX_Headers_1f) / 3 + ld a, SFX_INTRO_WHOOSH call PlaySound ; scroll game version in from the right diff --git a/engine/town_map.asm b/engine/town_map.asm index 302efa0f..a90aa331 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -69,7 +69,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e) ld b, a and A_BUTTON | B_BUTTON | D_UP | D_DOWN jr z, .inputLoop - ld a, (SFX_02_3c - SFX_Headers_02) / 3 + ld a, SFX_TINK call PlaySound bit 6, b jr nz, .pressedUp @@ -193,7 +193,7 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) jr z, .inputLoop bit 0, b jr nz, .pressedA - ld a, (SFX_02_3c - SFX_Headers_02) / 3 + ld a, SFX_TINK call PlaySound bit 6, b jr nz, .pressedUp @@ -201,7 +201,7 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) jr nz, .pressedDown jr .pressedB .pressedA - ld a, (SFX_02_3e - SFX_Headers_02) / 3 + ld a, SFX_HEAL_AILMENT call PlaySound ld a, [hl] ld [wDestinationMap], a diff --git a/engine/trade.asm b/engine/trade.asm index 531085b9..68baaa16 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -287,7 +287,7 @@ Trade_DrawOpenEndOfLinkCable: ; 41298 (10:5298) ld b, $7 ; open end of link cable tile ID list index call CopyTileIDsFromList_ZeroBaseTileID call Trade_CopyTileMapToVRAM - ld a, (SFX_02_3d - SFX_Headers_02) / 3 + ld a, SFX_HEAL_HP call PlaySound ld c, 20 .loop @@ -332,7 +332,7 @@ Trade_AnimateBallEnteringLinkCable: ; 412d2 (10:52d2) ld c, a cp $a0 jr nc, .ballSpriteReachedEdgeOfScreen - ld a, (SFX_02_3c - SFX_Headers_02) / 3 + ld a, SFX_TINK call PlaySound jr .moveBallInsideLinkCableLoop .ballSpriteReachedEdgeOfScreen diff --git a/home.asm b/home.asm index 1b910054..cb4f7ad2 100644 --- a/home.asm +++ b/home.asm @@ -1330,7 +1330,7 @@ AddAmountSoldToMoney:: ; 2b9e (0:2b9e) ld a,MONEY_BOX ld [wTextBoxID],a call DisplayTextBoxID ; redraw money text box - ld a, (SFX_02_5a - SFX_Headers_02) / 3 + ld a, SFX_PURCHASE call PlaySoundWaitForCurrent jp WaitForSoundToFinish @@ -3490,7 +3490,7 @@ ManualTextScroll:: ; 3898 (0:3898) cp LINK_STATE_BATTLING jr z, .inLinkBattle call WaitForTextScrollButtonPress - ld a, (SFX_02_40 - SFX_Headers_02) / 3 + ld a, SFX_PRESS_AB jp PlaySound .inLinkBattle ld c, 65 @@ -4016,7 +4016,7 @@ HandleMenuInputPokemonSelection:: ; 3ac2 (0:3ac2) bit 5,[hl] pop hl jr nz,.skipPlayingSound - ld a,(SFX_02_40 - SFX_Headers_02) / 3 + ld a,SFX_PRESS_AB call PlaySound .skipPlayingSound pop af diff --git a/home/overworld.asm b/home/overworld.asm index 0485335a..814e8c54 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -674,10 +674,10 @@ PlayMapChangeSound:: ; 08c9 (0:08c9) aCoord 8, 8 ; upper left tile of the 4x4 square the player's sprite is standing on cp a,$0b ; door tile in tileset 0 jr nz,.didNotGoThroughDoor - ld a,(SFX_02_57 - SFX_Headers_02) / 3 + ld a,SFX_GO_INSIDE jr .playSound .didNotGoThroughDoor - ld a,(SFX_02_5c - SFX_Headers_02) / 3 + ld a,SFX_GO_OUTSIDE .playSound call PlaySound ld a,[wMapPalOffset] @@ -1227,9 +1227,9 @@ CollisionCheckOnLand:: ; 0bd1 (0:0bd1) jr nc,.noCollision .collision ld a,[wc02a] - cp a,(SFX_02_5b - SFX_Headers_02) / 3 ; check if collision sound is already playing + cp a,SFX_COLLISION ; check if collision sound is already playing jr z,.setCarry - ld a,(SFX_02_5b - SFX_Headers_02) / 3 + ld a,SFX_COLLISION call PlaySound ; play collision sound (if it's not already playing) .setCarry scf @@ -1930,9 +1930,9 @@ CollisionCheckOnWater:: ; 0fb7 (0:0fb7) jr .loop .collision ld a,[wc02a] - cp a,(SFX_02_5b - SFX_Headers_02) / 3 ; check if collision sound is already playing + cp a,SFX_COLLISION ; check if collision sound is already playing jr z,.setCarry - ld a,(SFX_02_5b - SFX_Headers_02) / 3 + ld a,SFX_COLLISION call PlaySound ; play collision sound (if it's not already playing) .setCarry scf diff --git a/home/text.asm b/home/text.asm index 7eb5148b..89708306 100644 --- a/home/text.asm +++ b/home/text.asm @@ -626,13 +626,13 @@ TextCommand0B:: ; 1c31 (0:1c31) ; format: text command ID, sound ID or cry ID TextCommandSounds:: ; 1c64 (0:1c64) - db $0B,(SFX_02_3a - SFX_Headers_02) / 3 - db $12,(SFX_08_46 - SFX_Headers_08) / 3 - db $0E,(SFX_02_41 - SFX_Headers_02) / 3 - db $0F,(SFX_02_3a - SFX_Headers_02) / 3 - db $10,(SFX_02_3b - SFX_Headers_02) / 3 - db $11,(SFX_02_42 - SFX_Headers_02) / 3 - db $13,(SFX_08_45 - SFX_Headers_08) / 3 + db $0B,SFX_GET_ITEM_1 + db $12,SFX_BATTLE_06 + db $0E,SFX_POKEDEX_RATING + db $0F,SFX_GET_ITEM_1 + db $10,SFX_GET_ITEM_2 + db $11,SFX_GET_KEY_ITEM + db $13,SFX_BATTLE_05 db $14,NIDORINA ; used in OakSpeech db $15,PIDGEOT ; used in SaffronCityText12 db $16,DEWGONG ; unused? diff --git a/main.asm b/main.asm index 08747a5a..a81e7d98 100755 --- a/main.asm +++ b/main.asm @@ -1605,7 +1605,7 @@ DisplayTwoOptionMenu: ; 7559 (1:7559) pop af pop hl ld [wFlags_0xcd60], a - ld a, (SFX_02_40 - SFX_Headers_02) / 3 + ld a, SFX_PRESS_AB call PlaySound jr .pressedAButton .notNoYesMenu @@ -2631,7 +2631,7 @@ ApplyOutOfBattlePoisonDamage: ; c69c (3:469c) jr z, .skipPoisonEffectAndSound ld b, $2 predef ChangeBGPalColor0_4Frames ; change BG white to dark grey for 4 frames - ld a, (SFX_02_43 - SFX_Headers_02) / 3 + ld a, SFX_POISONED call PlaySound .skipPoisonEffectAndSound predef AnyPartyAlive @@ -3512,7 +3512,7 @@ TryPushingBoulder: ; f225 (3:7225) ld de, PushBoulderRightMovementData .done call MoveSprite - ld a, (SFX_02_53 - SFX_Headers_02) / 3 + ld a, SFX_PUSH_BOULDER call PlaySound ld hl, wFlags_0xcd60 set 1, [hl] @@ -3543,7 +3543,7 @@ DoBoulderDustAnimation: ; f2b5 (3:72b5) ld [H_SPRITEINDEX], a call GetSpriteMovementByte2Pointer ld [hl], $10 - ld a, (SFX_02_56 - SFX_Headers_02) / 3 + ld a, SFX_CUT jp PlaySound ResetBoulderPushFlags: ; f2dd (3:72dd) diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 519c0c67..53e55872 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -454,7 +454,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd) ld hl, CeladonGameCornerText_48f09 call PrintText call WaitForSoundToFinish - ld a, (SFX_02_57 - SFX_Headers_02) / 3 + ld a, SFX_GO_INSIDE call PlaySound call WaitForSoundToFinish ld hl, wd77e @@ -468,7 +468,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd) CeladonGameCornerText_48f09: ; 48f09 (12:4f09) TX_FAR _CeladonGameCornerText_48f09 TX_ASM - ld a, (SFX_02_49 - SFX_Headers_02) / 3 + ld a, SFX_SWITCH call PlaySound call WaitForSoundToFinish jp TextScriptEnd diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index dbede0d3..9b308bd3 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -106,7 +106,7 @@ CinnabarGymScript2: ; 757f6 (1d:57f6) and a jr nz, .asm_7581b call WaitForSoundToFinish - ld a, (SFX_02_57 - SFX_Headers_02) / 3 + ld a, SFX_GO_INSIDE call PlaySound call WaitForSoundToFinish .asm_7581b diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index 330f2234..a9798f19 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -156,7 +156,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld de, wPlayerMoney + 2 ld c, $3 predef SubBCDPredef - ld a, (SFX_02_5a - SFX_Headers_02) / 3 + ld a, SFX_PURCHASE call PlaySoundWaitForCurrent ld a, MONEY_BOX ld [wTextBoxID], a diff --git a/scripts/lance.asm b/scripts/lance.asm index e335914b..f5095a69 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -75,7 +75,7 @@ LanceScript0: ; 5a305 (16:6305) ret nz ld hl, wd126 set 5, [hl] - ld a, (SFX_02_57 - SFX_Headers_02) / 3 + ld a, SFX_GO_INSIDE call PlaySound jp LanceScript_5a2c4 diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index 6673e03b..a9e2616a 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -111,7 +111,7 @@ Mansion1Text4: ; 4435a (11:435a) set 5, [hl] ld hl, MansionSwitchPressedText call PrintText - ld a, (SFX_02_57 - SFX_Headers_02) / 3 + ld a, SFX_GO_INSIDE call PlaySound ld hl, wd796 bit 0, [hl] diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index 27ccbdfb..1cacae02 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -117,7 +117,7 @@ Mansion2Text5: ; 52087 (14:6087) set 5, [hl] ld hl, Mansion2Text_520c7 call PrintText - ld a, (SFX_02_57 - SFX_Headers_02) / 3 + ld a, SFX_GO_INSIDE call PlaySound ld hl, wd796 bit 0, [hl] diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index 38c3f717..f41f05ff 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -107,7 +107,7 @@ Museum1FText1: ; 5c135 (17:4135) ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID - ld a, (SFX_02_5a - SFX_Headers_02) / 3 + ld a, SFX_PURCHASE call PlaySoundWaitForCurrent call WaitForSoundToFinish jr .asm_0b094 diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index 967ab77b..b798744d 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -21,7 +21,7 @@ RocketHideout1Script_44be0: ; 44be0 (11:4be0) ld a, $54 jr .asm_44c03 .asm_44bf7 - ld a, (SFX_02_57 - SFX_Headers_02) / 3 + ld a, SFX_GO_INSIDE call PlaySound ld hl, wd815 bit 7, [hl] diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index c2184bdb..ead69458 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -25,7 +25,7 @@ RocketHideout2Script0: ; 44e42 (11:4e42) ld hl, wd736 set 7, [hl] call StartSimulatingJoypadStates - ld a, (SFX_02_52 - SFX_Headers_02) / 3 + ld a, SFX_ARROW_TILES call PlaySound ld a, $ff ld [wJoyIgnore], a diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index b025acd0..2060c26c 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/rockethideout3.asm @@ -25,7 +25,7 @@ RocketHideout3Script0: ; 45240 (11:5240) ld hl, wd736 set 7, [hl] call StartSimulatingJoypadStates - ld a, (SFX_02_52 - SFX_Headers_02) / 3 + ld a, SFX_ARROW_TILES call PlaySound ld a, $ff ld [wJoyIgnore], a diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 635c6095..44536279 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -22,7 +22,7 @@ RocketHideout4Script_45473: ; 45473 (11:5473) ld a, $2d jr .asm_45498 .asm_4548c - ld a, (SFX_02_57 - SFX_Headers_02) / 3 + ld a, SFX_GO_INSIDE call PlaySound ld hl, wd81b set 5, [hl] diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index 8b24c820..95546a99 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -77,7 +77,7 @@ Route22GateText1: ; 1e6e1 (7:66e1) Route22GateText_1e704: ; 1e704 (7:6704) TX_FAR _Route22GateText_1e704 TX_ASM - ld a, (SFX_02_51 - SFX_Headers_02) / 3 + ld a, SFX_DENIED call PlaySoundWaitForCurrent call WaitForSoundToFinish ld hl, Route22GateText_1e715 diff --git a/scripts/route23.asm b/scripts/route23.asm index eeaf2a2b..a258b88a 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -224,7 +224,7 @@ Route23Script_51388: ; 51388 (14:5388) VictoryRoadGuardText1: ; 5138e (14:538e) TX_FAR _VictoryRoadGuardText1 TX_ASM - ld a, (SFX_02_51 - SFX_Headers_02) / 3 + ld a, SFX_DENIED call PlaySoundWaitForCurrent call WaitForSoundToFinish jp TextScriptEnd diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index a8cf3b8d..c65c7aea 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -72,7 +72,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) ld b, [hl] push bc push hl - ld a, (SFX_02_54 - SFX_Headers_02) / 3 + ld a, SFX_SS_ANNE_HORN call PlaySoundWaitForCurrent ld a, $ff ld [wUpdateSpritesEnabled], a @@ -193,7 +193,7 @@ VermilionDock_1dc94: ; 1dc94 (7:5c94) ld [hli], a ld [hli], a ld [hl], a - ld a, (SFX_02_54 - SFX_Headers_02) / 3 + ld a, SFX_SS_ANNE_HORN call PlaySound ld c, 120 call DelayFrames diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 193b3a06..614e0b4d 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -34,7 +34,7 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) ld a, $24 jr .asm_5ca7f .asm_5ca78 - ld a, (SFX_02_57 - SFX_Headers_02) / 3 + ld a, SFX_GO_INSIDE call PlaySound ld a, $5 .asm_5ca7f diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 9a0ce855..7a577095 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -41,7 +41,7 @@ ViridianGymScript0: ; 748eb (1d:48eb) call StartSimulatingJoypadStates ld hl, wd736 set 7, [hl] - ld a, (SFX_02_52 - SFX_Headers_02) / 3 + ld a, SFX_ARROW_TILES call PlaySound ld a, $ff ld [wJoyIgnore], a -- cgit v1.3.1-sl0p From 4d88812f40c4165e4b893a0631fa658e72d17874 Mon Sep 17 00:00:00 2001 From: dannye Date: Tue, 21 Jul 2015 20:58:19 -0500 Subject: Name some battle sound effects --- audio.asm | 6 +- constants/music_constants.asm | 324 +++++++++++++++++++-------------------- engine/HoF_room_pc.asm | 4 +- engine/battle/animations.asm | 346 +++++++++++++++++++++--------------------- engine/battle/common_text.asm | 2 +- engine/battle/core.asm | 10 +- engine/evos_moves.asm | 4 +- home.asm | 2 +- home/text.asm | 4 +- macros.asm | 16 +- 10 files changed, 360 insertions(+), 358 deletions(-) (limited to 'audio.asm') diff --git a/audio.asm b/audio.asm index 27570b93..563aee14 100644 --- a/audio.asm +++ b/audio.asm @@ -538,8 +538,10 @@ INCLUDE "audio/engine_2.asm" Music_PokeFluteInBattle:: ; 22306 (8:6306) - ld a, SFX_BATTLE_06 ; PokeFlute outside of battle + ; begin playing the "caught mon" sound effect + ld a, SFX_CAUGHT_MON call PlaySoundWaitForCurrent + ; then immediately overwrtie the channel pointers ld hl, wc00e ld de, SFX_08_PokeFlute_Ch1 call Music8_OverwriteChannelPointer @@ -586,7 +588,7 @@ PokedexRatingSfxPointers: ; 7d162 (1f:5162) db SFX_DENIED, BANK(SFX_1f_51) db SFX_POKEDEX_RATING, BANK(SFX_02_41) db SFX_GET_ITEM_1, BANK(SFX_02_3a) - db SFX_BATTLE_06, BANK(SFX_08_46) + db SFX_CAUGHT_MON, BANK(SFX_08_46) db SFX_LEVEL_UP, BANK(SFX_08_3a) db SFX_GET_KEY_ITEM, BANK(SFX_02_42) db SFX_GET_ITEM_2, BANK(SFX_02_3b) diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 260ccd39..6812e312 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -56,175 +56,175 @@ ENDM music_const MUSIC_MEET_MALE_TRAINER, Music_MeetMaleTrainer ; AUDIO_1 AUDIO_2 AUDIO_3 - music_const SFX_SNARE_1, SFX_02_01 - music_const SFX_SNARE_2, SFX_02_02 - music_const SFX_SNARE_3, SFX_02_03 - music_const SFX_SNARE_4, SFX_02_04 - music_const SFX_SNARE_5, SFX_02_05 - music_const SFX_TRIANGLE_1, SFX_02_06 - music_const SFX_TRIANGLE_2, SFX_02_07 - music_const SFX_SNARE_6, SFX_02_08 - music_const SFX_SNARE_7, SFX_02_09 - music_const SFX_SNARE_8, SFX_02_0a - music_const SFX_SNARE_9, SFX_02_0b - music_const SFX_CYMBAL_1, SFX_02_0c - music_const SFX_CYMBAL_2, SFX_02_0d - music_const SFX_CYMBAL_3, SFX_02_0e - music_const SFX_MUTED_SNARE_1, SFX_02_0f - music_const SFX_TRIANGLE_3, SFX_02_10 - music_const SFX_MUTED_SNARE_2, SFX_02_11 - music_const SFX_MUTED_SNARE_3, SFX_02_12 - music_const SFX_MUTED_SNARE_4, SFX_02_13 - music_const SFX_CRY_00, SFX_02_14 - music_const SFX_CRY_01, SFX_02_15 - music_const SFX_CRY_02, SFX_02_16 - music_const SFX_CRY_03, SFX_02_17 - music_const SFX_CRY_04, SFX_02_18 - music_const SFX_CRY_05, SFX_02_19 - music_const SFX_CRY_06, SFX_02_1a - music_const SFX_CRY_07, SFX_02_1b - music_const SFX_CRY_08, SFX_02_1c - music_const SFX_CRY_09, SFX_02_1d - music_const SFX_CRY_0A, SFX_02_1e - music_const SFX_CRY_0B, SFX_02_1f - music_const SFX_CRY_0C, SFX_02_20 - music_const SFX_CRY_0D, SFX_02_21 - music_const SFX_CRY_0E, SFX_02_22 - music_const SFX_CRY_0F, SFX_02_23 - music_const SFX_CRY_10, SFX_02_24 - music_const SFX_CRY_11, SFX_02_25 - music_const SFX_CRY_12, SFX_02_26 - music_const SFX_CRY_13, SFX_02_27 - music_const SFX_CRY_14, SFX_02_28 - music_const SFX_CRY_15, SFX_02_29 - music_const SFX_CRY_16, SFX_02_2a - music_const SFX_CRY_17, SFX_02_2b - music_const SFX_CRY_18, SFX_02_2c - music_const SFX_CRY_19, SFX_02_2d - music_const SFX_CRY_1A, SFX_02_2e - music_const SFX_CRY_1B, SFX_02_2f - music_const SFX_CRY_1C, SFX_02_30 - music_const SFX_CRY_1D, SFX_02_31 - music_const SFX_CRY_1E, SFX_02_32 - music_const SFX_CRY_1F, SFX_02_33 - music_const SFX_CRY_20, SFX_02_34 - music_const SFX_CRY_21, SFX_02_35 - music_const SFX_CRY_22, SFX_02_36 - music_const SFX_CRY_23, SFX_02_37 - music_const SFX_CRY_24, SFX_02_38 - music_const SFX_CRY_25, SFX_02_39 + music_const SFX_SNARE_1, SFX_02_01 + music_const SFX_SNARE_2, SFX_02_02 + music_const SFX_SNARE_3, SFX_02_03 + music_const SFX_SNARE_4, SFX_02_04 + music_const SFX_SNARE_5, SFX_02_05 + music_const SFX_TRIANGLE_1, SFX_02_06 + music_const SFX_TRIANGLE_2, SFX_02_07 + music_const SFX_SNARE_6, SFX_02_08 + music_const SFX_SNARE_7, SFX_02_09 + music_const SFX_SNARE_8, SFX_02_0a + music_const SFX_SNARE_9, SFX_02_0b + music_const SFX_CYMBAL_1, SFX_02_0c + music_const SFX_CYMBAL_2, SFX_02_0d + music_const SFX_CYMBAL_3, SFX_02_0e + music_const SFX_MUTED_SNARE_1, SFX_02_0f + music_const SFX_TRIANGLE_3, SFX_02_10 + music_const SFX_MUTED_SNARE_2, SFX_02_11 + music_const SFX_MUTED_SNARE_3, SFX_02_12 + music_const SFX_MUTED_SNARE_4, SFX_02_13 + music_const SFX_CRY_00, SFX_02_14 + music_const SFX_CRY_01, SFX_02_15 + music_const SFX_CRY_02, SFX_02_16 + music_const SFX_CRY_03, SFX_02_17 + music_const SFX_CRY_04, SFX_02_18 + music_const SFX_CRY_05, SFX_02_19 + music_const SFX_CRY_06, SFX_02_1a + music_const SFX_CRY_07, SFX_02_1b + music_const SFX_CRY_08, SFX_02_1c + music_const SFX_CRY_09, SFX_02_1d + music_const SFX_CRY_0A, SFX_02_1e + music_const SFX_CRY_0B, SFX_02_1f + music_const SFX_CRY_0C, SFX_02_20 + music_const SFX_CRY_0D, SFX_02_21 + music_const SFX_CRY_0E, SFX_02_22 + music_const SFX_CRY_0F, SFX_02_23 + music_const SFX_CRY_10, SFX_02_24 + music_const SFX_CRY_11, SFX_02_25 + music_const SFX_CRY_12, SFX_02_26 + music_const SFX_CRY_13, SFX_02_27 + music_const SFX_CRY_14, SFX_02_28 + music_const SFX_CRY_15, SFX_02_29 + music_const SFX_CRY_16, SFX_02_2a + music_const SFX_CRY_17, SFX_02_2b + music_const SFX_CRY_18, SFX_02_2c + music_const SFX_CRY_19, SFX_02_2d + music_const SFX_CRY_1A, SFX_02_2e + music_const SFX_CRY_1B, SFX_02_2f + music_const SFX_CRY_1C, SFX_02_30 + music_const SFX_CRY_1D, SFX_02_31 + music_const SFX_CRY_1E, SFX_02_32 + music_const SFX_CRY_1F, SFX_02_33 + music_const SFX_CRY_20, SFX_02_34 + music_const SFX_CRY_21, SFX_02_35 + music_const SFX_CRY_22, SFX_02_36 + music_const SFX_CRY_23, SFX_02_37 + music_const SFX_CRY_24, SFX_02_38 + music_const SFX_CRY_25, SFX_02_39 - music_const SFX_GET_ITEM_2, SFX_02_3b - music_const SFX_TINK, SFX_02_3c - music_const SFX_HEAL_HP, SFX_02_3d - music_const SFX_HEAL_AILMENT, SFX_02_3e - music_const SFX_START_MENU, SFX_02_3f - music_const SFX_PRESS_AB, SFX_02_40 + music_const SFX_GET_ITEM_2, SFX_02_3b + music_const SFX_TINK, SFX_02_3c + music_const SFX_HEAL_HP, SFX_02_3d + music_const SFX_HEAL_AILMENT, SFX_02_3e + music_const SFX_START_MENU, SFX_02_3f + music_const SFX_PRESS_AB, SFX_02_40 ; AUDIO_1 AUDIO_3 - music_const SFX_GET_ITEM_1, SFX_02_3a + music_const SFX_GET_ITEM_1, SFX_02_3a - music_const SFX_POKEDEX_RATING, SFX_02_41 - music_const SFX_GET_KEY_ITEM, SFX_02_42 - music_const SFX_POISONED, SFX_02_43 - music_const SFX_TRADE_MACHINE, SFX_02_44 - music_const SFX_TURN_ON_PC, SFX_02_45 - music_const SFX_TURN_OFF_PC, SFX_02_46 - music_const SFX_ENTER_PC, SFX_02_47 - music_const SFX_SHRINK, SFX_02_48 - music_const SFX_SWITCH, SFX_02_49 - music_const SFX_HEALING_MACHINE, SFX_02_4a - music_const SFX_TELEPORT_1, SFX_02_4b - music_const SFX_TELEPORT_2, SFX_02_4c - music_const SFX_TELEPORT_3, SFX_02_4d - music_const SFX_LEDGE, SFX_02_4e - music_const SFX_FLY_1, SFX_02_4f - music_const SFX_FLY_2, SFX_02_50 - music_const SFX_DENIED, SFX_02_51 - music_const SFX_ARROW_TILES, SFX_02_52 - music_const SFX_PUSH_BOULDER, SFX_02_53 - music_const SFX_SS_ANNE_HORN, SFX_02_54 - music_const SFX_WITHDRAW_DEPOSIT, SFX_02_55 - music_const SFX_CUT, SFX_02_56 - music_const SFX_GO_INSIDE, SFX_02_57 - music_const SFX_SWAP, SFX_02_58 - music_const SFX_59, SFX_02_59 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL - music_const SFX_PURCHASE, SFX_02_5a - music_const SFX_COLLISION, SFX_02_5b - music_const SFX_GO_OUTSIDE, SFX_02_5c - music_const SFX_SAVE, SFX_02_5d + music_const SFX_POKEDEX_RATING, SFX_02_41 + music_const SFX_GET_KEY_ITEM, SFX_02_42 + music_const SFX_POISONED, SFX_02_43 + music_const SFX_TRADE_MACHINE, SFX_02_44 + music_const SFX_TURN_ON_PC, SFX_02_45 + music_const SFX_TURN_OFF_PC, SFX_02_46 + music_const SFX_ENTER_PC, SFX_02_47 + music_const SFX_SHRINK, SFX_02_48 + music_const SFX_SWITCH, SFX_02_49 + music_const SFX_HEALING_MACHINE, SFX_02_4a + music_const SFX_TELEPORT_1, SFX_02_4b + music_const SFX_TELEPORT_2, SFX_02_4c + music_const SFX_TELEPORT_3, SFX_02_4d + music_const SFX_LEDGE, SFX_02_4e + music_const SFX_FLY_1, SFX_02_4f + music_const SFX_FLY_2, SFX_02_50 + music_const SFX_DENIED, SFX_02_51 + music_const SFX_ARROW_TILES, SFX_02_52 + music_const SFX_PUSH_BOULDER, SFX_02_53 + music_const SFX_SS_ANNE_HORN, SFX_02_54 + music_const SFX_WITHDRAW_DEPOSIT, SFX_02_55 + music_const SFX_CUT, SFX_02_56 + music_const SFX_GO_INSIDE, SFX_02_57 + music_const SFX_SWAP, SFX_02_58 + music_const SFX_59, SFX_02_59 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL + music_const SFX_PURCHASE, SFX_02_5a + music_const SFX_COLLISION, SFX_02_5b + music_const SFX_GO_OUTSIDE, SFX_02_5c + music_const SFX_SAVE, SFX_02_5d ; AUDIO_1 - music_const SFX_POKEFLUE, SFX_02_5e - music_const SFX_SAFARI_ZONE_PA, SFX_02_5f + music_const SFX_POKEFLUE, SFX_02_5e + music_const SFX_SAFARI_ZONE_PA, SFX_02_5f ; AUDIO_2 - music_const SFX_LEVEL_UP, SFX_08_3a - - music_const SFX_BATTLE_01, SFX_08_41 - music_const SFX_BATTLE_02, SFX_08_42 - music_const SFX_BATTLE_03, SFX_08_43 - music_const SFX_BATTLE_04, SFX_08_44 - music_const SFX_BATTLE_05, SFX_08_45 - music_const SFX_BATTLE_06, SFX_08_46 - music_const SFX_BATTLE_07, SFX_08_47 - music_const SFX_BATTLE_08, SFX_08_48 - music_const SFX_BATTLE_09, SFX_08_49 - music_const SFX_BATTLE_0A, SFX_08_4a - music_const SFX_BATTLE_0B, SFX_08_4b - music_const SFX_BATTLE_0C, SFX_08_4c - music_const SFX_BATTLE_0D, SFX_08_4d - music_const SFX_BATTLE_0E, SFX_08_4e - music_const SFX_BATTLE_0F, SFX_08_4f - music_const SFX_BATTLE_10, SFX_08_50 - music_const SFX_BATTLE_11, SFX_08_51 - music_const SFX_BATTLE_12, SFX_08_52 - music_const SFX_BATTLE_13, SFX_08_53 - music_const SFX_BATTLE_14, SFX_08_54 - music_const SFX_BATTLE_15, SFX_08_55 - music_const SFX_BATTLE_16, SFX_08_56 ; unused? - music_const SFX_BATTLE_17, SFX_08_57 - music_const SFX_BATTLE_18, SFX_08_58 - music_const SFX_BATTLE_19, SFX_08_59 - music_const SFX_BATTLE_1A, SFX_08_5a - music_const SFX_BATTLE_1B, SFX_08_5b - music_const SFX_BATTLE_1C, SFX_08_5c - music_const SFX_BATTLE_1D, SFX_08_5d - music_const SFX_BATTLE_1E, SFX_08_5e - music_const SFX_BATTLE_1F, SFX_08_5f - music_const SFX_BATTLE_20, SFX_08_60 - music_const SFX_BATTLE_21, SFX_08_61 - music_const SFX_BATTLE_22, SFX_08_62 - music_const SFX_BATTLE_23, SFX_08_63 - music_const SFX_BATTLE_24, SFX_08_64 - music_const SFX_BATTLE_25, SFX_08_65 - music_const SFX_BATTLE_26, SFX_08_66 - music_const SFX_BATTLE_27, SFX_08_67 - music_const SFX_BATTLE_28, SFX_08_68 - music_const SFX_BATTLE_29, SFX_08_69 - music_const SFX_BATTLE_2A, SFX_08_6a - music_const SFX_BATTLE_2B, SFX_08_6b - music_const SFX_BATTLE_2C, SFX_08_6c - music_const SFX_BATTLE_2D, SFX_08_6d - music_const SFX_BATTLE_2E, SFX_08_6e - music_const SFX_BATTLE_2F, SFX_08_6f - music_const SFX_BATTLE_30, SFX_08_70 - music_const SFX_BATTLE_31, SFX_08_71 - music_const SFX_BATTLE_32, SFX_08_72 - music_const SFX_BATTLE_33, SFX_08_73 - music_const SFX_BATTLE_34, SFX_08_74 - music_const SFX_BATTLE_35, SFX_08_75 - music_const SFX_BATTLE_36, SFX_08_76 - music_const SFX_BATTLE_37, SFX_08_77 + music_const SFX_LEVEL_UP, SFX_08_3a + + music_const SFX_BALL_TOSS, SFX_08_41 + music_const SFX_BALL_POOF, SFX_08_42 + music_const SFX_FAINT_THUD, SFX_08_43 + music_const SFX_RUN, SFX_08_44 + music_const SFX_DEX_PAGE_ADDED, SFX_08_45 + music_const SFX_CAUGHT_MON, SFX_08_46 + music_const SFX_PECK, SFX_08_47 + music_const SFX_FAINT_FALL, SFX_08_48 + music_const SFX_BATTLE_09, SFX_08_49 + music_const SFX_POUND, SFX_08_4a + music_const SFX_BATTLE_0B, SFX_08_4b + music_const SFX_BATTLE_0C, SFX_08_4c + music_const SFX_BATTLE_0D, SFX_08_4d + music_const SFX_BATTLE_0E, SFX_08_4e + music_const SFX_BATTLE_0F, SFX_08_4f + music_const SFX_DAMAGE, SFX_08_50 + music_const SFX_NOT_VERY_EFFECTIVE, SFX_08_51 + music_const SFX_BATTLE_12, SFX_08_52 + music_const SFX_BATTLE_13, SFX_08_53 + music_const SFX_BATTLE_14, SFX_08_54 + music_const SFX_VINE_WHIP, SFX_08_55 + music_const SFX_BATTLE_16, SFX_08_56 ; unused? + music_const SFX_BATTLE_17, SFX_08_57 + music_const SFX_BATTLE_18, SFX_08_58 + music_const SFX_BATTLE_19, SFX_08_59 + music_const SFX_SUPER_EFFECTIVE, SFX_08_5a + music_const SFX_BATTLE_1B, SFX_08_5b + music_const SFX_BATTLE_1C, SFX_08_5c + music_const SFX_DOUBLESLAP, SFX_08_5d + music_const SFX_BATTLE_1E, SFX_08_5e + music_const SFX_HORN_DRILL, SFX_08_5f + music_const SFX_BATTLE_20, SFX_08_60 + music_const SFX_BATTLE_21, SFX_08_61 + music_const SFX_BATTLE_22, SFX_08_62 + music_const SFX_BATTLE_23, SFX_08_63 + music_const SFX_BATTLE_24, SFX_08_64 + music_const SFX_BATTLE_25, SFX_08_65 + music_const SFX_BATTLE_26, SFX_08_66 + music_const SFX_BATTLE_27, SFX_08_67 + music_const SFX_BATTLE_28, SFX_08_68 + music_const SFX_BATTLE_29, SFX_08_69 + music_const SFX_BATTLE_2A, SFX_08_6a + music_const SFX_BATTLE_2B, SFX_08_6b + music_const SFX_BATTLE_2C, SFX_08_6c + music_const SFX_PSYBEAM, SFX_08_6d + music_const SFX_BATTLE_2E, SFX_08_6e + music_const SFX_BATTLE_2F, SFX_08_6f + music_const SFX_PSYCHIC_M, SFX_08_70 + music_const SFX_BATTLE_31, SFX_08_71 + music_const SFX_BATTLE_32, SFX_08_72 + music_const SFX_BATTLE_33, SFX_08_73 + music_const SFX_BATTLE_34, SFX_08_74 + music_const SFX_BATTLE_35, SFX_08_75 + music_const SFX_BATTLE_36, SFX_08_76 + music_const SFX_SILPH_SCOPE, SFX_08_77 ; AUDIO_3 - music_const SFX_INTRO_LUNGE, SFX_1f_5e - music_const SFX_INTRO_HIP, SFX_1f_5f - music_const SFX_INTRO_HOP, SFX_1f_60 - music_const SFX_INTRO_RAISE, SFX_1f_61 - music_const SFX_INTRO_CRASH, SFX_1f_62 - music_const SFX_INTRO_WHOOSH, SFX_1f_63 - music_const SFX_SLOTS_STOP_WHEEL, SFX_1f_64 - music_const SFX_SLOTS_REWARD, SFX_1f_65 - music_const SFX_SLOTS_NEW_SPIN, SFX_1f_66 - music_const SFX_SHOOTING_STAR, SFX_1f_67 + music_const SFX_INTRO_LUNGE, SFX_1f_5e + music_const SFX_INTRO_HIP, SFX_1f_5f + music_const SFX_INTRO_HOP, SFX_1f_60 + music_const SFX_INTRO_RAISE, SFX_1f_61 + music_const SFX_INTRO_CRASH, SFX_1f_62 + music_const SFX_INTRO_WHOOSH, SFX_1f_63 + music_const SFX_SLOTS_STOP_WHEEL, SFX_1f_64 + music_const SFX_SLOTS_REWARD, SFX_1f_65 + music_const SFX_SLOTS_NEW_SPIN, SFX_1f_66 + music_const SFX_SHOOTING_STAR, SFX_1f_67 diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 5e3ff37b..104d32ff 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -76,7 +76,7 @@ DisplayCreditsMon: ; 740cb (1d:40cb) ld hl,vBGMap1 call CopyTileMapToVRAM call FillMiddleOfScreenWithWhite - ld a,%11111100 ; make the mon a black silhouette + ld a,%11111100 ; make the mon a black silhouette ld [rBGP],a ; scroll the mon left by one tile 7 times @@ -88,7 +88,7 @@ DisplayCreditsMon: ; 740cb (1d:40cb) ; scroll the mon left by one tile 20 times ; This time, we have to move the window left too in order to hide the text that -; is wrapping around to the right side of the screen. +; is wrapping around to the right side of the screen. ld c,20 .scrollLoop2 call ScrollCreditsMonLeft diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index d9406257..73d152b8 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -741,7 +741,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e) cp a,11 ; is it the beginning of the subanimation? jr nz,.skipPlayingSound ; if it is the beginning of the subanimation, play a sound - ld a,SFX_BATTLE_01 + ld a,SFX_BALL_TOSS call PlaySound .skipPlayingSound ld a,[W_ISINBATTLE] @@ -820,7 +820,7 @@ DoPoofSpecialEffects: ; 78fce (1e:4fce) ld a,[W_SUBANIMCOUNTER] cp a,5 ret nz - ld a,SFX_BATTLE_02 + ld a,SFX_BALL_POOF jp PlaySound DoRockSlideSpecialEffects: ; 78fd9 (1e:4fd9) @@ -2274,7 +2274,7 @@ GetMoveSoundB: ; 79869 (1e:5869) ld b, a ret -; get the sound of the move id in a +; get the sound of the (move id - 1) in a GetMoveSound: ; 7986f (1e:586f) ld hl,MoveSoundTable ld e,a @@ -2329,172 +2329,172 @@ IsCryMove: ; 798ad (1e:58ad) ret MoveSoundTable: ; 798bc (1e:58bc) - db SFX_BATTLE_0A,$00,$80 - db SFX_BATTLE_0C,$10,$80 - db SFX_BATTLE_1D,$00,$80 - db SFX_BATTLE_0B,$01,$80 - db SFX_BATTLE_0D,$00,$40 - db SFX_BATTLE_37,$00,$ff - db SFX_BATTLE_0D,$10,$60 - db SFX_BATTLE_0D,$20,$80 - db SFX_BATTLE_0D,$00,$a0 - db SFX_BATTLE_10,$00,$80 - db SFX_BATTLE_0F,$20,$40 - db SFX_BATTLE_0F,$00,$80 - db SFX_BATTLE_0E,$00,$a0 - db SFX_BATTLE_11,$10,$c0 - db SFX_BATTLE_11,$00,$a0 - db SFX_BATTLE_12,$00,$c0 - db SFX_BATTLE_12,$10,$a0 - db SFX_BATTLE_13,$00,$e0 - db SFX_BATTLE_11,$20,$c0 - db SFX_BATTLE_14,$00,$80 - db SFX_BATTLE_22,$00,$80 - db SFX_BATTLE_15,$01,$80 - db SFX_BATTLE_20,$00,$80 - db SFX_BATTLE_17,$f0,$40 - db SFX_BATTLE_1A,$00,$80 - db SFX_BATTLE_17,$00,$80 - db SFX_BATTLE_21,$10,$80 - db SFX_BATTLE_1B,$01,$a0 - db SFX_BATTLE_18,$00,$80 - db SFX_BATTLE_1E,$00,$60 - db SFX_BATTLE_1E,$01,$40 - db SFX_BATTLE_1F,$00,$a0 - db SFX_BATTLE_1A,$10,$a0 - db SFX_BATTLE_20,$00,$c0 - db SFX_BATTLE_14,$10,$60 - db SFX_BATTLE_1A,$00,$a0 - db SFX_BATTLE_22,$11,$c0 - db SFX_BATTLE_1A,$20,$c0 - db SFX_BATTLE_21,$00,$80 - db SFX_BATTLE_1B,$00,$80 - db SFX_BATTLE_1B,$20,$c0 - db SFX_BATTLE_19,$00,$80 - db SFX_BATTLE_31,$ff,$40 - db SFX_BATTLE_1E,$00,$80 - db SFX_BATTLE_0B,$00,$c0 - db SFX_BATTLE_0B,$00,$40 - db SFX_BATTLE_35,$00,$80 - db SFX_BATTLE_27,$40,$60 - db SFX_BATTLE_27,$00,$80 - db SFX_BATTLE_27,$ff,$40 - db SFX_BATTLE_2A,$80,$c0 - db SFX_BATTLE_19,$10,$a0 - db SFX_BATTLE_19,$21,$e0 - db SFX_BATTLE_29,$00,$80 - db SFX_BATTLE_24,$20,$60 - db SFX_BATTLE_2A,$00,$80 - db SFX_BATTLE_2C,$00,$80 - db SFX_BATTLE_28,$40,$80 - db SFX_BATTLE_29,$f0,$e0 - db SFX_BATTLE_2D,$00,$80 - db SFX_BATTLE_2A,$f0,$60 - db SFX_BATTLE_28,$00,$80 - db SFX_BATTLE_36,$00,$80 - db SFX_BATTLE_07,$01,$a0 - db SFX_BATTLE_13,$f0,$20 - db SFX_BATTLE_23,$01,$c0 - db SFX_BATTLE_23,$00,$80 - db SFX_BATTLE_1A,$00,$e0 - db SFX_BATTLE_26,$01,$60 - db SFX_BATTLE_26,$20,$40 - db SFX_BATTLE_24,$00,$80 - db SFX_BATTLE_24,$40,$c0 - db SFX_BATTLE_1B,$03,$60 - db SFX_BATTLE_25,$11,$e0 - db SFX_BATTLE_12,$20,$e0 - db SFX_BATTLE_2E,$00,$80 - db SFX_BATTLE_1C,$00,$80 - db SFX_BATTLE_1C,$11,$a0 - db SFX_BATTLE_1C,$01,$c0 - db SFX_BATTLE_13,$14,$c0 - db SFX_BATTLE_1B,$02,$a0 - db SFX_BATTLE_29,$f0,$80 - db SFX_BATTLE_29,$20,$c0 - db SFX_BATTLE_2F,$00,$20 - db SFX_BATTLE_2F,$20,$80 - db SFX_BATTLE_2E,$12,$60 - db SFX_BATTLE_26,$00,$80 - db SFX_BATTLE_14,$01,$e0 - db SFX_BATTLE_29,$0f,$e0 - db SFX_BATTLE_29,$11,$20 - db SFX_BATTLE_10,$10,$40 - db SFX_BATTLE_0F,$10,$c0 - db SFX_BATTLE_14,$00,$20 - db SFX_BATTLE_30,$00,$80 - db SFX_BATTLE_35,$11,$18 - db SFX_BATTLE_09,$20,$c0 - db SFX_BATTLE_08,$20,$c0 - db SFX_BATTLE_25,$00,$10 - db SFX_BATTLE_26,$f0,$20 - db SFX_BATTLE_33,$f0,$c0 - db SFX_BATTLE_11,$f0,$e0 - db SFX_BATTLE_09,$f0,$40 - db SFX_BATTLE_31,$00,$80 - db SFX_BATTLE_33,$80,$40 - db SFX_BATTLE_33,$00,$80 - db SFX_BATTLE_14,$11,$20 - db SFX_BATTLE_14,$22,$10 - db SFX_BATTLE_1B,$f1,$ff - db SFX_BATTLE_13,$f1,$ff - db SFX_BATTLE_14,$33,$30 - db SFX_BATTLE_32,$40,$c0 - db SFX_BATTLE_0E,$20,$20 - db SFX_BATTLE_0E,$f0,$10 - db SFX_BATTLE_0F,$f8,$10 - db SFX_BATTLE_11,$f0,$10 - db SFX_BATTLE_25,$00,$80 - db SFX_BATTLE_18,$00,$c0 - db SFX_BATTLE_32,$c0,$ff - db SFX_BATTLE_09,$f2,$20 - db SFX_BATTLE_34,$00,$80 - db SFX_BATTLE_34,$00,$40 - db SFX_BATTLE_09,$00,$40 - db SFX_BATTLE_11,$10,$ff - db SFX_BATTLE_2A,$20,$20 - db SFX_BATTLE_32,$00,$80 - db SFX_BATTLE_29,$1f,$20 - db SFX_BATTLE_25,$2f,$80 - db SFX_BATTLE_0F,$1f,$ff - db SFX_BATTLE_2B,$1f,$60 - db SFX_BATTLE_26,$1e,$20 - db SFX_BATTLE_26,$1f,$18 - db SFX_BATTLE_14,$0f,$80 - db SFX_BATTLE_09,$f8,$10 - db SFX_BATTLE_08,$18,$20 - db SFX_BATTLE_32,$08,$40 - db SFX_BATTLE_17,$01,$e0 - db SFX_BATTLE_11,$09,$ff - db SFX_BATTLE_35,$42,$01 - db SFX_BATTLE_1C,$00,$ff - db SFX_BATTLE_32,$08,$e0 - db SFX_BATTLE_24,$00,$80 - db SFX_BATTLE_09,$88,$10 - db SFX_BATTLE_25,$48,$ff - db SFX_BATTLE_08,$ff,$ff - db SFX_BATTLE_24,$ff,$10 - db SFX_BATTLE_08,$ff,$04 - db SFX_BATTLE_1C,$01,$ff - db SFX_BATTLE_13,$f8,$ff - db SFX_BATTLE_0C,$f0,$f0 - db SFX_BATTLE_0F,$08,$10 - db SFX_BATTLE_0D,$f0,$ff - db SFX_BATTLE_1A,$f0,$ff - db SFX_BATTLE_34,$10,$ff - db SFX_BATTLE_0E,$f0,$20 - db SFX_BATTLE_2B,$f0,$60 - db SFX_BATTLE_21,$12,$10 - db SFX_BATTLE_36,$f0,$20 - db SFX_BATTLE_1E,$12,$ff - db SFX_BATTLE_31,$80,$04 - db SFX_BATTLE_33,$f0,$10 - db SFX_BATTLE_29,$f8,$ff - db SFX_BATTLE_26,$f0,$ff - db SFX_BATTLE_11,$01,$ff - db SFX_BATTLE_2C,$d8,$04 - db SFX_BATTLE_0B,$00,$80 - db SFX_BATTLE_0B,$00,$80 + db SFX_POUND, $00,$80 ; POUND + db SFX_BATTLE_0C, $10,$80 ; KARATE_CHOP + db SFX_DOUBLESLAP, $00,$80 ; DOUBLESLAP + db SFX_BATTLE_0B, $01,$80 ; COMET_PUNCH + db SFX_BATTLE_0D, $00,$40 ; MEGA_PUNCH + db SFX_SILPH_SCOPE, $00,$ff ; PAY_DAY + db SFX_BATTLE_0D, $10,$60 ; FIRE_PUNCH + db SFX_BATTLE_0D, $20,$80 ; ICE_PUNCH + db SFX_BATTLE_0D, $00,$a0 ; THUNDERPUNCH + db SFX_DAMAGE, $00,$80 ; SCRATCH + db SFX_BATTLE_0F, $20,$40 ; VICEGRIP + db SFX_BATTLE_0F, $00,$80 ; GUILLOTINE + db SFX_BATTLE_0E, $00,$a0 ; RAZOR_WIND + db SFX_NOT_VERY_EFFECTIVE,$10,$c0 ; SWORDS_DANCE + db SFX_NOT_VERY_EFFECTIVE,$00,$a0 ; CUT + db SFX_BATTLE_12, $00,$c0 ; GUST + db SFX_BATTLE_12, $10,$a0 ; WING_ATTACK + db SFX_BATTLE_13, $00,$e0 ; WHIRLWIND + db SFX_NOT_VERY_EFFECTIVE,$20,$c0 ; FLY + db SFX_BATTLE_14, $00,$80 ; BIND + db SFX_BATTLE_22, $00,$80 ; SLAM + db SFX_VINE_WHIP, $01,$80 ; VINE_WHIP + db SFX_BATTLE_20, $00,$80 ; STOMP + db SFX_BATTLE_17, $f0,$40 ; DOUBLE_KICK + db SFX_SUPER_EFFECTIVE, $00,$80 ; MEGA_KICK + db SFX_BATTLE_17, $00,$80 ; JUMP_KICK + db SFX_BATTLE_21, $10,$80 ; ROLLING_KICK + db SFX_BATTLE_1B, $01,$a0 ; SAND_ATTACK + db SFX_BATTLE_18, $00,$80 ; HEADBUTT + db SFX_BATTLE_1E, $00,$60 ; HORN_ATTACK + db SFX_BATTLE_1E, $01,$40 ; FURY_ATTACK + db SFX_HORN_DRILL, $00,$a0 ; HORN_DRILL + db SFX_SUPER_EFFECTIVE, $10,$a0 ; TACKLE + db SFX_BATTLE_20, $00,$c0 ; BODY_SLAM + db SFX_BATTLE_14, $10,$60 ; WRAP + db SFX_SUPER_EFFECTIVE, $00,$a0 ; TAKE_DOWN + db SFX_BATTLE_22, $11,$c0 ; THRASH + db SFX_SUPER_EFFECTIVE, $20,$c0 ; DOUBLE_EDGE + db SFX_BATTLE_21, $00,$80 ; TAIL_WHIP + db SFX_BATTLE_1B, $00,$80 ; POISON_STING + db SFX_BATTLE_1B, $20,$c0 ; TWINEEDLE + db SFX_BATTLE_19, $00,$80 ; PIN_MISSILE + db SFX_BATTLE_31, $ff,$40 ; LEER + db SFX_BATTLE_1E, $00,$80 ; BITE + db SFX_BATTLE_0B, $00,$c0 ; GROWL + db SFX_BATTLE_0B, $00,$40 ; ROAR + db SFX_BATTLE_35, $00,$80 ; SING + db SFX_BATTLE_27, $40,$60 ; SUPERSONIC + db SFX_BATTLE_27, $00,$80 ; SONICBOOM + db SFX_BATTLE_27, $ff,$40 ; DISABLE + db SFX_BATTLE_2A, $80,$c0 ; ACID + db SFX_BATTLE_19, $10,$a0 ; EMBER + db SFX_BATTLE_19, $21,$e0 ; FLAMETHROWER + db SFX_BATTLE_29, $00,$80 ; MIST + db SFX_BATTLE_24, $20,$60 ; WATER_GUN + db SFX_BATTLE_2A, $00,$80 ; HYDRO_PUMP + db SFX_BATTLE_2C, $00,$80 ; SURF + db SFX_BATTLE_28, $40,$80 ; ICE_BEAM + db SFX_BATTLE_29, $f0,$e0 ; BLIZZARD + db SFX_PSYBEAM, $00,$80 ; PSYBEAM + db SFX_BATTLE_2A, $f0,$60 ; BUBBLEBEAM + db SFX_BATTLE_28, $00,$80 ; AURORA_BEAM + db SFX_BATTLE_36, $00,$80 ; HYPER_BEAM + db SFX_PECK,$01, $a0 ; PECK + db SFX_BATTLE_13, $f0,$20 ; DRILL_PECK + db SFX_BATTLE_23, $01,$c0 ; SUBMISSION + db SFX_BATTLE_23, $00,$80 ; LOW_KICK + db SFX_SUPER_EFFECTIVE, $00,$e0 ; COUNTER + db SFX_BATTLE_26, $01,$60 ; SEISMIC_TOSS + db SFX_BATTLE_26, $20,$40 ; STRENGTH + db SFX_BATTLE_24, $00,$80 ; ABSORB + db SFX_BATTLE_24, $40,$c0 ; MEGA_DRAIN + db SFX_BATTLE_1B, $03,$60 ; LEECH_SEED + db SFX_BATTLE_25, $11,$e0 ; GROWTH + db SFX_BATTLE_12, $20,$e0 ; RAZOR_LEAF + db SFX_BATTLE_2E, $00,$80 ; SOLARBEAM + db SFX_BATTLE_1C, $00,$80 ; POISONPOWDER + db SFX_BATTLE_1C, $11,$a0 ; STUN_SPORE + db SFX_BATTLE_1C, $01,$c0 ; SLEEP_POWDER + db SFX_BATTLE_13, $14,$c0 ; PETAL_DANCE + db SFX_BATTLE_1B, $02,$a0 ; STRING_SHOT + db SFX_BATTLE_29, $f0,$80 ; DRAGON_RAGE + db SFX_BATTLE_29, $20,$c0 ; FIRE_SPIN + db SFX_BATTLE_2F, $00,$20 ; THUNDERSHOCK + db SFX_BATTLE_2F, $20,$80 ; THUNDERBOLT + db SFX_BATTLE_2E, $12,$60 ; THUNDER_WAVE + db SFX_BATTLE_26, $00,$80 ; THUNDER + db SFX_BATTLE_14, $01,$e0 ; ROCK_THROW + db SFX_BATTLE_29, $0f,$e0 ; EARTHQUAKE + db SFX_BATTLE_29, $11,$20 ; FISSURE + db SFX_DAMAGE, $10,$40 ; DIG + db SFX_BATTLE_0F, $10,$c0 ; TOXIC + db SFX_BATTLE_14, $00,$20 ; CONFUSION + db SFX_PSYCHIC_M, $00,$80 ; PSYCHIC_M + db SFX_BATTLE_35, $11,$18 ; HYPNOSIS + db SFX_BATTLE_09, $20,$c0 ; MEDITATE + db SFX_FAINT_FALL, $20,$c0 ; AGILITY + db SFX_BATTLE_25, $00,$10 ; QUICK_ATTACK + db SFX_BATTLE_26, $f0,$20 ; RAGE + db SFX_BATTLE_33, $f0,$c0 ; TELEPORT + db SFX_NOT_VERY_EFFECTIVE,$f0,$e0 ; NIGHT_SHADE + db SFX_BATTLE_09, $f0,$40 ; MIMIC + db SFX_BATTLE_31, $00,$80 ; SCREECH + db SFX_BATTLE_33, $80,$40 ; DOUBLE_TEAM + db SFX_BATTLE_33, $00,$80 ; RECOVER + db SFX_BATTLE_14, $11,$20 ; HARDEN + db SFX_BATTLE_14, $22,$10 ; MINIMIZE + db SFX_BATTLE_1B, $f1,$ff ; SMOKESCREEN + db SFX_BATTLE_13, $f1,$ff ; CONFUSE_RAY + db SFX_BATTLE_14, $33,$30 ; WITHDRAW + db SFX_BATTLE_32, $40,$c0 ; DEFENSE_CURL + db SFX_BATTLE_0E, $20,$20 ; BARRIER + db SFX_BATTLE_0E, $f0,$10 ; LIGHT_SCREEN + db SFX_BATTLE_0F, $f8,$10 ; HAZE + db SFX_NOT_VERY_EFFECTIVE,$f0,$10 ; REFLECT + db SFX_BATTLE_25, $00,$80 ; FOCUS_ENERGY + db SFX_BATTLE_18, $00,$c0 ; BIDE + db SFX_BATTLE_32, $c0,$ff ; METRONOME + db SFX_BATTLE_09, $f2,$20 ; MIRROR_MOVE + db SFX_BATTLE_34, $00,$80 ; SELFDESTRUCT + db SFX_BATTLE_34, $00,$40 ; EGG_BOMB + db SFX_BATTLE_09, $00,$40 ; LICK + db SFX_NOT_VERY_EFFECTIVE,$10,$ff ; SMOG + db SFX_BATTLE_2A, $20,$20 ; SLUDGE + db SFX_BATTLE_32, $00,$80 ; BONE_CLUB + db SFX_BATTLE_29, $1f,$20 ; FIRE_BLAST + db SFX_BATTLE_25, $2f,$80 ; WATERFALL + db SFX_BATTLE_0F, $1f,$ff ; CLAMP + db SFX_BATTLE_2B, $1f,$60 ; SWIFT + db SFX_BATTLE_26, $1e,$20 ; SKULL_BASH + db SFX_BATTLE_26, $1f,$18 ; SPIKE_CANNON + db SFX_BATTLE_14, $0f,$80 ; CONSTRICT + db SFX_BATTLE_09, $f8,$10 ; AMNESIA + db SFX_FAINT_FALL, $18,$20 ; KINESIS + db SFX_BATTLE_32, $08,$40 ; SOFTBOILED + db SFX_BATTLE_17, $01,$e0 ; HI_JUMP_KICK + db SFX_NOT_VERY_EFFECTIVE,$09,$ff ; GLARE + db SFX_BATTLE_35, $42,$01 ; DREAM_EATER + db SFX_BATTLE_1C, $00,$ff ; POISON_GAS + db SFX_BATTLE_32, $08,$e0 ; BARRAGE + db SFX_BATTLE_24, $00,$80 ; LEECH_LIFE + db SFX_BATTLE_09, $88,$10 ; LOVELY_KISS + db SFX_BATTLE_25, $48,$ff ; SKY_ATTACK + db SFX_FAINT_FALL, $ff,$ff ; TRANSFORM + db SFX_BATTLE_24, $ff,$10 ; BUBBLE + db SFX_FAINT_FALL, $ff,$04 ; DIZZY_PUNCH + db SFX_BATTLE_1C, $01,$ff ; SPORE + db SFX_BATTLE_13, $f8,$ff ; FLASH + db SFX_BATTLE_0C, $f0,$f0 ; PSYWAVE + db SFX_BATTLE_0F, $08,$10 ; SPLASH + db SFX_BATTLE_0D, $f0,$ff ; ACID_ARMOR + db SFX_SUPER_EFFECTIVE, $f0,$ff ; CRABHAMMER + db SFX_BATTLE_34, $10,$ff ; EXPLOSION + db SFX_BATTLE_0E, $f0,$20 ; FURY_SWIPES + db SFX_BATTLE_2B, $f0,$60 ; BONEMERANG + db SFX_BATTLE_21, $12,$10 ; REST + db SFX_BATTLE_36, $f0,$20 ; ROCK_SLIDE + db SFX_BATTLE_1E, $12,$ff ; HYPER_FANG + db SFX_BATTLE_31, $80,$04 ; SHARPEN + db SFX_BATTLE_33, $f0,$10 ; CONVERSION + db SFX_BATTLE_29, $f8,$ff ; TRI_ATTACK + db SFX_BATTLE_26, $f0,$ff ; SUPER_FANG + db SFX_NOT_VERY_EFFECTIVE,$01,$ff ; SLASH + db SFX_BATTLE_2C, $d8,$04 ; SUBSTITUTE + db SFX_BATTLE_0B, $00,$80 ; STRUGGLE + db SFX_BATTLE_0B, $00,$80 CopyPicTiles: ; 79aae (1e:5aae) ld a, [H_WHOSETURN] @@ -2929,7 +2929,7 @@ TossBallAnimation: ; 79e16 (1e:5e16) ld a,TOSS_ANIM ld [W_ANIMATIONID],a call PlayAnimation - ld a,SFX_BATTLE_03 + ld a,SFX_FAINT_THUD call PlaySound ld a,BLOCKBALL_ANIM ld [W_ANIMATIONID],a @@ -2945,15 +2945,15 @@ PlayApplyingAttackSound: ; 79e6a (1e:5e6a) cp $a ld a, $20 ld b, $30 - ld c, SFX_BATTLE_10 + ld c, SFX_DAMAGE jr z, .asm_79e8b ld a, $e0 ld b, $ff - ld c, SFX_BATTLE_1A + ld c, SFX_SUPER_EFFECTIVE jr nc, .asm_79e8b ld a, $50 ld b, $1 - ld c, SFX_BATTLE_11 + ld c, SFX_NOT_VERY_EFFECTIVE .asm_79e8b ld [wc0f1], a ld a, b diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 41e402f3..1acef280 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -64,7 +64,7 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) ld [wc0f1], a ld a, $80 ld [wc0f2], a - ld a, SFX_BATTLE_37 + ld a, SFX_SILPH_SCOPE call PlaySound jp WaitForSoundToFinish .done diff --git a/engine/battle/core.asm b/engine/battle/core.asm index a74e0a27..4c29e003 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -353,7 +353,7 @@ EnemyRan: ; 3c202 (f:4202) ld hl, EnemyRanText .printText call PrintText - ld a, SFX_BATTLE_04 + ld a, SFX_RUN call PlaySoundWaitForCurrent xor a ld [H_WHOSETURN], a @@ -860,13 +860,13 @@ FaintEnemyPokemon: ; 0x3c567 xor a ld [wc0f1], a ld [wc0f2], a - ld a, SFX_BATTLE_08 ; SFX_FALL? + ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent .sfxwait ld a, [wc02a] - cp SFX_BATTLE_08 + cp SFX_FAINT_FALL jr z, .sfxwait - ld a, SFX_BATTLE_03 ; SFX_DROP + ld a, SFX_FAINT_THUD call PlaySound call WaitForSoundToFinish jr .sfxplayed @@ -1672,7 +1672,7 @@ TryRunningFromBattle: ; 3cab9 (f:4ab9) dec a .playSound ld [wBattleResult], a - ld a, SFX_BATTLE_04 + ld a, SFX_RUN call PlaySoundWaitForCurrent ld hl, GotAwayText call PrintText diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 2c668d63..b9b4bb0f 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -443,7 +443,7 @@ WriteMonMoves: ; 3afb8 (e:6fb8) jr nz, .findEmptySlotLoop ; no empty move slots found - pop de + pop de push de push hl ld h, d @@ -472,7 +472,7 @@ WriteMonMoves: ; 3afb8 (e:6fb8) jr z, .nextMove ; write move PP value if learning moves from day care - push hl + push hl ld a, [hl] ld hl, wPartyMon1PP - wPartyMon1Moves add hl, de diff --git a/home.asm b/home.asm index 6bb54df2..a9fc70e6 100644 --- a/home.asm +++ b/home.asm @@ -1463,7 +1463,7 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53) ; pointless because both values are overwritten before they are read ld a,$01 ld [wMenuExitMethod],a - ld [wChosenMenuItem],a + ld [wChosenMenuItem],a xor a ld [wMenuWatchMovingOutOfBounds],a diff --git a/home/text.asm b/home/text.asm index 89708306..d57fc03f 100644 --- a/home/text.asm +++ b/home/text.asm @@ -627,12 +627,12 @@ TextCommand0B:: ; 1c31 (0:1c31) ; format: text command ID, sound ID or cry ID TextCommandSounds:: ; 1c64 (0:1c64) db $0B,SFX_GET_ITEM_1 - db $12,SFX_BATTLE_06 + db $12,SFX_CAUGHT_MON db $0E,SFX_POKEDEX_RATING db $0F,SFX_GET_ITEM_1 db $10,SFX_GET_ITEM_2 db $11,SFX_GET_KEY_ITEM - db $13,SFX_BATTLE_05 + db $13,SFX_DEX_PAGE_ADDED db $14,NIDORINA ; used in OakSpeech db $15,PIDGEOT ; used in SaffronCityText12 db $16,DEWGONG ; unused? diff --git a/macros.asm b/macros.asm index 659b0722..5223b9d8 100644 --- a/macros.asm +++ b/macros.asm @@ -66,15 +66,15 @@ jpab: MACRO ENDM bcd2: MACRO - dn ((\1) / 1000) % 10, ((\1) / 100) % 10 - dn ((\1) / 10) % 10, (\1) % 10 - ENDM + dn ((\1) / 1000) % 10, ((\1) / 100) % 10 + dn ((\1) / 10) % 10, (\1) % 10 + ENDM bcd3: MACRO - dn ((\1) / 100000) % 10, ((\1) / 10000) % 10 - dn ((\1) / 1000) % 10, ((\1) / 100) % 10 - dn ((\1) / 10) % 10, (\1) % 10 - ENDM + dn ((\1) / 100000) % 10, ((\1) / 10000) % 10 + dn ((\1) / 1000) % 10, ((\1) / 100) % 10 + dn ((\1) / 10) % 10, (\1) % 10 + ENDM coins equs "bcd2" money equs "bcd3" @@ -263,7 +263,7 @@ NONE EQU $FF ;\7 trainers only: trainer class/pokemon id ;\8 trainers only: trainer number/pokemon level object: MACRO - db \1 + db \1 db \3 + 4 db \2 + 4 db \4 -- cgit v1.3.1-sl0p From b4081e851ac4b7ce5cf1fa7c9fc83a490a4c83ec Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 22 Jul 2015 09:57:31 -0500 Subject: Rename sound effect files --- audio.asm | 648 +++++++++++++++--------------- audio/headers/sfxheaders02.asm | 560 +++++++++++++------------- audio/headers/sfxheaders08.asm | 704 ++++++++++++++++----------------- audio/headers/sfxheaders1f.asm | 594 ++++++++++++++-------------- audio/sfx/59_1.asm | 11 + audio/sfx/59_3.asm | 11 + audio/sfx/arrow_tiles_1.asm | 6 + audio/sfx/arrow_tiles_3.asm | 6 + audio/sfx/ball_poof.asm | 11 + audio/sfx/ball_toss.asm | 11 + audio/sfx/battle_09.asm | 6 + audio/sfx/battle_0b.asm | 3 + audio/sfx/battle_0c.asm | 5 + audio/sfx/battle_0d.asm | 5 + audio/sfx/battle_0e.asm | 4 + audio/sfx/battle_0f.asm | 6 + audio/sfx/battle_12.asm | 6 + audio/sfx/battle_13.asm | 6 + audio/sfx/battle_14.asm | 6 + audio/sfx/battle_16.asm | 5 + audio/sfx/battle_17.asm | 6 + audio/sfx/battle_18.asm | 4 + audio/sfx/battle_19.asm | 5 + audio/sfx/battle_1b.asm | 4 + audio/sfx/battle_1c.asm | 5 + audio/sfx/battle_1e.asm | 16 + audio/sfx/battle_20.asm | 4 + audio/sfx/battle_21.asm | 7 + audio/sfx/battle_22.asm | 4 + audio/sfx/battle_23.asm | 7 + audio/sfx/battle_24.asm | 12 + audio/sfx/battle_25.asm | 7 + audio/sfx/battle_26.asm | 9 + audio/sfx/battle_27.asm | 27 ++ audio/sfx/battle_28.asm | 21 + audio/sfx/battle_29.asm | 18 + audio/sfx/battle_2a.asm | 28 ++ audio/sfx/battle_2b.asm | 21 + audio/sfx/battle_2c.asm | 25 ++ audio/sfx/battle_2e.asm | 27 ++ audio/sfx/battle_2f.asm | 21 + audio/sfx/battle_31.asm | 18 + audio/sfx/battle_32.asm | 12 + audio/sfx/battle_33.asm | 18 + audio/sfx/battle_34.asm | 22 ++ audio/sfx/battle_35.asm | 29 ++ audio/sfx/battle_36.asm | 47 +++ audio/sfx/caught_mon.asm | 61 +++ audio/sfx/collision_1.asm | 6 + audio/sfx/collision_3.asm | 6 + audio/sfx/cry00_1.asm | 21 + audio/sfx/cry00_2.asm | 21 + audio/sfx/cry00_3.asm | 21 + audio/sfx/cry01_1.asm | 24 ++ audio/sfx/cry01_2.asm | 24 ++ audio/sfx/cry01_3.asm | 24 ++ audio/sfx/cry02_1.asm | 17 + audio/sfx/cry02_2.asm | 17 + audio/sfx/cry02_3.asm | 17 + audio/sfx/cry03_1.asm | 30 ++ audio/sfx/cry03_2.asm | 30 ++ audio/sfx/cry03_3.asm | 30 ++ audio/sfx/cry04_1.asm | 32 ++ audio/sfx/cry04_2.asm | 32 ++ audio/sfx/cry04_3.asm | 32 ++ audio/sfx/cry05_1.asm | 19 + audio/sfx/cry05_2.asm | 19 + audio/sfx/cry05_3.asm | 19 + audio/sfx/cry06_1.asm | 22 ++ audio/sfx/cry06_2.asm | 22 ++ audio/sfx/cry06_3.asm | 22 ++ audio/sfx/cry07_1.asm | 21 + audio/sfx/cry07_2.asm | 21 + audio/sfx/cry07_3.asm | 21 + audio/sfx/cry08_1.asm | 23 ++ audio/sfx/cry08_2.asm | 23 ++ audio/sfx/cry08_3.asm | 23 ++ audio/sfx/cry09_1.asm | 35 ++ audio/sfx/cry09_2.asm | 35 ++ audio/sfx/cry09_3.asm | 35 ++ audio/sfx/cry0a_1.asm | 35 ++ audio/sfx/cry0a_2.asm | 35 ++ audio/sfx/cry0a_3.asm | 35 ++ audio/sfx/cry0b_1.asm | 37 ++ audio/sfx/cry0b_2.asm | 37 ++ audio/sfx/cry0b_3.asm | 37 ++ audio/sfx/cry0c_1.asm | 29 ++ audio/sfx/cry0c_2.asm | 29 ++ audio/sfx/cry0c_3.asm | 29 ++ audio/sfx/cry0d_1.asm | 40 ++ audio/sfx/cry0d_2.asm | 40 ++ audio/sfx/cry0d_3.asm | 40 ++ audio/sfx/cry0e_1.asm | 23 ++ audio/sfx/cry0e_2.asm | 23 ++ audio/sfx/cry0e_3.asm | 23 ++ audio/sfx/cry0f_1.asm | 29 ++ audio/sfx/cry0f_2.asm | 29 ++ audio/sfx/cry0f_3.asm | 29 ++ audio/sfx/cry10_1.asm | 31 ++ audio/sfx/cry10_2.asm | 31 ++ audio/sfx/cry10_3.asm | 31 ++ audio/sfx/cry11_1.asm | 34 ++ audio/sfx/cry11_2.asm | 34 ++ audio/sfx/cry11_3.asm | 34 ++ audio/sfx/cry12_1.asm | 24 ++ audio/sfx/cry12_2.asm | 24 ++ audio/sfx/cry12_3.asm | 24 ++ audio/sfx/cry13_1.asm | 30 ++ audio/sfx/cry13_2.asm | 30 ++ audio/sfx/cry13_3.asm | 30 ++ audio/sfx/cry14_1.asm | 21 + audio/sfx/cry14_2.asm | 21 + audio/sfx/cry14_3.asm | 21 + audio/sfx/cry15_1.asm | 30 ++ audio/sfx/cry15_2.asm | 30 ++ audio/sfx/cry15_3.asm | 30 ++ audio/sfx/cry16_1.asm | 21 + audio/sfx/cry16_2.asm | 21 + audio/sfx/cry16_3.asm | 21 + audio/sfx/cry17_1.asm | 24 ++ audio/sfx/cry17_2.asm | 24 ++ audio/sfx/cry17_3.asm | 24 ++ audio/sfx/cry18_1.asm | 34 ++ audio/sfx/cry18_2.asm | 34 ++ audio/sfx/cry18_3.asm | 34 ++ audio/sfx/cry19_1.asm | 18 + audio/sfx/cry19_2.asm | 18 + audio/sfx/cry19_3.asm | 18 + audio/sfx/cry1a_1.asm | 30 ++ audio/sfx/cry1a_2.asm | 30 ++ audio/sfx/cry1a_3.asm | 30 ++ audio/sfx/cry1b_1.asm | 26 ++ audio/sfx/cry1b_2.asm | 26 ++ audio/sfx/cry1b_3.asm | 26 ++ audio/sfx/cry1c_1.asm | 31 ++ audio/sfx/cry1c_2.asm | 31 ++ audio/sfx/cry1c_3.asm | 31 ++ audio/sfx/cry1d_1.asm | 29 ++ audio/sfx/cry1d_2.asm | 29 ++ audio/sfx/cry1d_3.asm | 29 ++ audio/sfx/cry1e_1.asm | 38 ++ audio/sfx/cry1e_2.asm | 38 ++ audio/sfx/cry1e_3.asm | 38 ++ audio/sfx/cry1f_1.asm | 24 ++ audio/sfx/cry1f_2.asm | 24 ++ audio/sfx/cry1f_3.asm | 24 ++ audio/sfx/cry20_1.asm | 24 ++ audio/sfx/cry20_2.asm | 24 ++ audio/sfx/cry20_3.asm | 24 ++ audio/sfx/cry21_1.asm | 27 ++ audio/sfx/cry21_2.asm | 27 ++ audio/sfx/cry21_3.asm | 27 ++ audio/sfx/cry22_1.asm | 24 ++ audio/sfx/cry22_2.asm | 24 ++ audio/sfx/cry22_3.asm | 24 ++ audio/sfx/cry23_1.asm | 25 ++ audio/sfx/cry23_2.asm | 25 ++ audio/sfx/cry23_3.asm | 25 ++ audio/sfx/cry24_1.asm | 33 ++ audio/sfx/cry24_2.asm | 33 ++ audio/sfx/cry24_3.asm | 33 ++ audio/sfx/cry25_1.asm | 26 ++ audio/sfx/cry25_2.asm | 26 ++ audio/sfx/cry25_3.asm | 26 ++ audio/sfx/cut_1.asm | 7 + audio/sfx/cut_3.asm | 7 + audio/sfx/cymbal1_1.asm | 3 + audio/sfx/cymbal1_2.asm | 3 + audio/sfx/cymbal1_3.asm | 3 + audio/sfx/cymbal2_1.asm | 3 + audio/sfx/cymbal2_2.asm | 3 + audio/sfx/cymbal2_3.asm | 3 + audio/sfx/cymbal3_1.asm | 3 + audio/sfx/cymbal3_2.asm | 3 + audio/sfx/cymbal3_3.asm | 3 + audio/sfx/damage.asm | 5 + audio/sfx/denied_1.asm | 18 + audio/sfx/denied_3.asm | 18 + audio/sfx/dex_page_added.asm | 15 + audio/sfx/doubleslap.asm | 4 + audio/sfx/enter_pc_1.asm | 7 + audio/sfx/enter_pc_3.asm | 7 + audio/sfx/faint_fall.asm | 6 + audio/sfx/faint_thud.asm | 11 + audio/sfx/fly_1.asm | 18 + audio/sfx/fly_3.asm | 18 + audio/sfx/get_item1_1.asm | 47 +++ audio/sfx/get_item1_3.asm | 47 +++ audio/sfx/get_item2_1.asm | 69 ++++ audio/sfx/get_item2_2.asm | 69 ++++ audio/sfx/get_item2_3.asm | 69 ++++ audio/sfx/get_key_item_1.asm | 59 +++ audio/sfx/get_key_item_3.asm | 59 +++ audio/sfx/go_inside_1.asm | 4 + audio/sfx/go_inside_3.asm | 4 + audio/sfx/go_outside_1.asm | 7 + audio/sfx/go_outside_3.asm | 7 + audio/sfx/heal_ailment_1.asm | 9 + audio/sfx/heal_ailment_2.asm | 9 + audio/sfx/heal_ailment_3.asm | 9 + audio/sfx/heal_hp_1.asm | 7 + audio/sfx/heal_hp_2.asm | 7 + audio/sfx/heal_hp_3.asm | 7 + audio/sfx/healing_machine_1.asm | 9 + audio/sfx/healing_machine_3.asm | 9 + audio/sfx/horn_drill.asm | 6 + audio/sfx/intro_crash.asm | 4 + audio/sfx/intro_hip.asm | 6 + audio/sfx/intro_hop.asm | 6 + audio/sfx/intro_lunge.asm | 10 + audio/sfx/intro_raise.asm | 5 + audio/sfx/intro_whoosh.asm | 7 + audio/sfx/ledge_1.asm | 6 + audio/sfx/ledge_3.asm | 6 + audio/sfx/level_up.asm | 63 +++ audio/sfx/muted_snare1_1.asm | 4 + audio/sfx/muted_snare1_2.asm | 4 + audio/sfx/muted_snare1_3.asm | 4 + audio/sfx/muted_snare2_1.asm | 3 + audio/sfx/muted_snare2_2.asm | 3 + audio/sfx/muted_snare2_3.asm | 3 + audio/sfx/muted_snare3_1.asm | 3 + audio/sfx/muted_snare3_2.asm | 3 + audio/sfx/muted_snare3_3.asm | 3 + audio/sfx/muted_snare4_1.asm | 3 + audio/sfx/muted_snare4_2.asm | 3 + audio/sfx/muted_snare4_3.asm | 3 + audio/sfx/not_very_effective.asm | 6 + audio/sfx/peck.asm | 3 + audio/sfx/poisoned_1.asm | 8 + audio/sfx/poisoned_3.asm | 8 + audio/sfx/pokedex_rating_1.asm | 77 ++++ audio/sfx/pokedex_rating_3.asm | 77 ++++ audio/sfx/pokeflute.asm | 21 + audio/sfx/pound.asm | 3 + audio/sfx/press_ab_1.asm | 7 + audio/sfx/press_ab_2.asm | 7 + audio/sfx/press_ab_3.asm | 7 + audio/sfx/psybeam.asm | 25 ++ audio/sfx/psychic_m.asm | 32 ++ audio/sfx/purchase_1.asm | 13 + audio/sfx/purchase_3.asm | 13 + audio/sfx/push_boulder_1.asm | 10 + audio/sfx/push_boulder_3.asm | 10 + audio/sfx/run.asm | 13 + audio/sfx/safari_zone_pa.asm | 9 + audio/sfx/save_1.asm | 23 ++ audio/sfx/save_3.asm | 36 ++ audio/sfx/sfx_02_01.asm | 3 - audio/sfx/sfx_02_02.asm | 3 - audio/sfx/sfx_02_03.asm | 3 - audio/sfx/sfx_02_04.asm | 3 - audio/sfx/sfx_02_05.asm | 8 - audio/sfx/sfx_02_06.asm | 3 - audio/sfx/sfx_02_07.asm | 4 - audio/sfx/sfx_02_08.asm | 3 - audio/sfx/sfx_02_09.asm | 3 - audio/sfx/sfx_02_0a.asm | 3 - audio/sfx/sfx_02_0b.asm | 3 - audio/sfx/sfx_02_0c.asm | 3 - audio/sfx/sfx_02_0d.asm | 3 - audio/sfx/sfx_02_0e.asm | 3 - audio/sfx/sfx_02_0f.asm | 4 - audio/sfx/sfx_02_10.asm | 4 - audio/sfx/sfx_02_11.asm | 3 - audio/sfx/sfx_02_12.asm | 3 - audio/sfx/sfx_02_13.asm | 3 - audio/sfx/sfx_02_14.asm | 21 - audio/sfx/sfx_02_15.asm | 24 -- audio/sfx/sfx_02_16.asm | 17 - audio/sfx/sfx_02_17.asm | 30 -- audio/sfx/sfx_02_18.asm | 32 -- audio/sfx/sfx_02_19.asm | 19 - audio/sfx/sfx_02_1a.asm | 22 -- audio/sfx/sfx_02_1b.asm | 21 - audio/sfx/sfx_02_1c.asm | 23 -- audio/sfx/sfx_02_1d.asm | 35 -- audio/sfx/sfx_02_1e.asm | 35 -- audio/sfx/sfx_02_1f.asm | 37 -- audio/sfx/sfx_02_20.asm | 29 -- audio/sfx/sfx_02_21.asm | 40 -- audio/sfx/sfx_02_22.asm | 23 -- audio/sfx/sfx_02_23.asm | 29 -- audio/sfx/sfx_02_24.asm | 31 -- audio/sfx/sfx_02_25.asm | 34 -- audio/sfx/sfx_02_26.asm | 24 -- audio/sfx/sfx_02_27.asm | 30 -- audio/sfx/sfx_02_28.asm | 21 - audio/sfx/sfx_02_29.asm | 30 -- audio/sfx/sfx_02_2a.asm | 21 - audio/sfx/sfx_02_2b.asm | 24 -- audio/sfx/sfx_02_2c.asm | 34 -- audio/sfx/sfx_02_2d.asm | 18 - audio/sfx/sfx_02_2e.asm | 30 -- audio/sfx/sfx_02_2f.asm | 26 -- audio/sfx/sfx_02_30.asm | 31 -- audio/sfx/sfx_02_31.asm | 29 -- audio/sfx/sfx_02_32.asm | 38 -- audio/sfx/sfx_02_33.asm | 24 -- audio/sfx/sfx_02_34.asm | 24 -- audio/sfx/sfx_02_35.asm | 27 -- audio/sfx/sfx_02_36.asm | 24 -- audio/sfx/sfx_02_37.asm | 25 -- audio/sfx/sfx_02_38.asm | 33 -- audio/sfx/sfx_02_39.asm | 26 -- audio/sfx/sfx_02_3a.asm | 47 --- audio/sfx/sfx_02_3b.asm | 69 ---- audio/sfx/sfx_02_3c.asm | 8 - audio/sfx/sfx_02_3d.asm | 7 - audio/sfx/sfx_02_3e.asm | 9 - audio/sfx/sfx_02_3f.asm | 4 - audio/sfx/sfx_02_40.asm | 7 - audio/sfx/sfx_02_41.asm | 77 ---- audio/sfx/sfx_02_42.asm | 59 --- audio/sfx/sfx_02_43.asm | 8 - audio/sfx/sfx_02_44.asm | 7 - audio/sfx/sfx_02_45.asm | 13 - audio/sfx/sfx_02_46.asm | 7 - audio/sfx/sfx_02_47.asm | 7 - audio/sfx/sfx_02_48.asm | 10 - audio/sfx/sfx_02_49.asm | 8 - audio/sfx/sfx_02_4a.asm | 9 - audio/sfx/sfx_02_4b.asm | 10 - audio/sfx/sfx_02_4c.asm | 10 - audio/sfx/sfx_02_4d.asm | 6 - audio/sfx/sfx_02_4e.asm | 6 - audio/sfx/sfx_02_4f.asm | 6 - audio/sfx/sfx_02_50.asm | 18 - audio/sfx/sfx_02_51.asm | 18 - audio/sfx/sfx_02_52.asm | 6 - audio/sfx/sfx_02_53.asm | 10 - audio/sfx/sfx_02_54.asm | 22 -- audio/sfx/sfx_02_55.asm | 12 - audio/sfx/sfx_02_56.asm | 7 - audio/sfx/sfx_02_57.asm | 4 - audio/sfx/sfx_02_58.asm | 11 - audio/sfx/sfx_02_59.asm | 11 - audio/sfx/sfx_02_5a.asm | 13 - audio/sfx/sfx_02_5b.asm | 6 - audio/sfx/sfx_02_5c.asm | 7 - audio/sfx/sfx_02_5d.asm | 23 -- audio/sfx/sfx_02_5e.asm | 21 - audio/sfx/sfx_02_5f.asm | 9 - audio/sfx/sfx_08_01.asm | 3 - audio/sfx/sfx_08_02.asm | 3 - audio/sfx/sfx_08_03.asm | 3 - audio/sfx/sfx_08_04.asm | 3 - audio/sfx/sfx_08_05.asm | 8 - audio/sfx/sfx_08_06.asm | 3 - audio/sfx/sfx_08_07.asm | 4 - audio/sfx/sfx_08_08.asm | 3 - audio/sfx/sfx_08_09.asm | 3 - audio/sfx/sfx_08_0a.asm | 3 - audio/sfx/sfx_08_0b.asm | 3 - audio/sfx/sfx_08_0c.asm | 3 - audio/sfx/sfx_08_0d.asm | 3 - audio/sfx/sfx_08_0e.asm | 3 - audio/sfx/sfx_08_0f.asm | 4 - audio/sfx/sfx_08_10.asm | 4 - audio/sfx/sfx_08_11.asm | 3 - audio/sfx/sfx_08_12.asm | 3 - audio/sfx/sfx_08_13.asm | 3 - audio/sfx/sfx_08_14.asm | 21 - audio/sfx/sfx_08_15.asm | 24 -- audio/sfx/sfx_08_16.asm | 17 - audio/sfx/sfx_08_17.asm | 30 -- audio/sfx/sfx_08_18.asm | 32 -- audio/sfx/sfx_08_19.asm | 19 - audio/sfx/sfx_08_1a.asm | 22 -- audio/sfx/sfx_08_1b.asm | 21 - audio/sfx/sfx_08_1c.asm | 23 -- audio/sfx/sfx_08_1d.asm | 35 -- audio/sfx/sfx_08_1e.asm | 35 -- audio/sfx/sfx_08_1f.asm | 37 -- audio/sfx/sfx_08_20.asm | 29 -- audio/sfx/sfx_08_21.asm | 40 -- audio/sfx/sfx_08_22.asm | 23 -- audio/sfx/sfx_08_23.asm | 29 -- audio/sfx/sfx_08_24.asm | 31 -- audio/sfx/sfx_08_25.asm | 34 -- audio/sfx/sfx_08_26.asm | 24 -- audio/sfx/sfx_08_27.asm | 30 -- audio/sfx/sfx_08_28.asm | 21 - audio/sfx/sfx_08_29.asm | 30 -- audio/sfx/sfx_08_2a.asm | 21 - audio/sfx/sfx_08_2b.asm | 24 -- audio/sfx/sfx_08_2c.asm | 34 -- audio/sfx/sfx_08_2d.asm | 18 - audio/sfx/sfx_08_2e.asm | 30 -- audio/sfx/sfx_08_2f.asm | 26 -- audio/sfx/sfx_08_30.asm | 31 -- audio/sfx/sfx_08_31.asm | 29 -- audio/sfx/sfx_08_32.asm | 38 -- audio/sfx/sfx_08_33.asm | 24 -- audio/sfx/sfx_08_34.asm | 24 -- audio/sfx/sfx_08_35.asm | 27 -- audio/sfx/sfx_08_36.asm | 24 -- audio/sfx/sfx_08_37.asm | 25 -- audio/sfx/sfx_08_38.asm | 33 -- audio/sfx/sfx_08_39.asm | 26 -- audio/sfx/sfx_08_3a.asm | 63 --- audio/sfx/sfx_08_3b.asm | 69 ---- audio/sfx/sfx_08_3c.asm | 8 - audio/sfx/sfx_08_3d.asm | 7 - audio/sfx/sfx_08_3e.asm | 9 - audio/sfx/sfx_08_3f.asm | 4 - audio/sfx/sfx_08_40.asm | 7 - audio/sfx/sfx_08_41.asm | 11 - audio/sfx/sfx_08_42.asm | 11 - audio/sfx/sfx_08_43.asm | 11 - audio/sfx/sfx_08_44.asm | 13 - audio/sfx/sfx_08_45.asm | 15 - audio/sfx/sfx_08_46.asm | 61 --- audio/sfx/sfx_08_47.asm | 3 - audio/sfx/sfx_08_48.asm | 6 - audio/sfx/sfx_08_49.asm | 6 - audio/sfx/sfx_08_4a.asm | 3 - audio/sfx/sfx_08_4b.asm | 3 - audio/sfx/sfx_08_4c.asm | 5 - audio/sfx/sfx_08_4d.asm | 5 - audio/sfx/sfx_08_4e.asm | 4 - audio/sfx/sfx_08_4f.asm | 6 - audio/sfx/sfx_08_50.asm | 5 - audio/sfx/sfx_08_51.asm | 6 - audio/sfx/sfx_08_52.asm | 6 - audio/sfx/sfx_08_53.asm | 6 - audio/sfx/sfx_08_54.asm | 6 - audio/sfx/sfx_08_55.asm | 10 - audio/sfx/sfx_08_56.asm | 5 - audio/sfx/sfx_08_57.asm | 6 - audio/sfx/sfx_08_58.asm | 4 - audio/sfx/sfx_08_59.asm | 5 - audio/sfx/sfx_08_5a.asm | 4 - audio/sfx/sfx_08_5b.asm | 4 - audio/sfx/sfx_08_5c.asm | 5 - audio/sfx/sfx_08_5d.asm | 4 - audio/sfx/sfx_08_5e.asm | 16 - audio/sfx/sfx_08_5f.asm | 6 - audio/sfx/sfx_08_60.asm | 4 - audio/sfx/sfx_08_61.asm | 7 - audio/sfx/sfx_08_62.asm | 4 - audio/sfx/sfx_08_63.asm | 7 - audio/sfx/sfx_08_64.asm | 12 - audio/sfx/sfx_08_65.asm | 7 - audio/sfx/sfx_08_66.asm | 9 - audio/sfx/sfx_08_67.asm | 27 -- audio/sfx/sfx_08_68.asm | 21 - audio/sfx/sfx_08_69.asm | 18 - audio/sfx/sfx_08_6a.asm | 28 -- audio/sfx/sfx_08_6b.asm | 21 - audio/sfx/sfx_08_6c.asm | 25 -- audio/sfx/sfx_08_6d.asm | 25 -- audio/sfx/sfx_08_6e.asm | 27 -- audio/sfx/sfx_08_6f.asm | 21 - audio/sfx/sfx_08_70.asm | 32 -- audio/sfx/sfx_08_71.asm | 18 - audio/sfx/sfx_08_72.asm | 12 - audio/sfx/sfx_08_73.asm | 18 - audio/sfx/sfx_08_74.asm | 22 -- audio/sfx/sfx_08_75.asm | 29 -- audio/sfx/sfx_08_76.asm | 47 --- audio/sfx/sfx_08_77.asm | 9 - audio/sfx/sfx_1f_01.asm | 3 - audio/sfx/sfx_1f_02.asm | 3 - audio/sfx/sfx_1f_03.asm | 3 - audio/sfx/sfx_1f_04.asm | 3 - audio/sfx/sfx_1f_05.asm | 8 - audio/sfx/sfx_1f_06.asm | 3 - audio/sfx/sfx_1f_07.asm | 4 - audio/sfx/sfx_1f_08.asm | 3 - audio/sfx/sfx_1f_09.asm | 3 - audio/sfx/sfx_1f_0a.asm | 3 - audio/sfx/sfx_1f_0b.asm | 3 - audio/sfx/sfx_1f_0c.asm | 3 - audio/sfx/sfx_1f_0d.asm | 3 - audio/sfx/sfx_1f_0e.asm | 3 - audio/sfx/sfx_1f_0f.asm | 4 - audio/sfx/sfx_1f_10.asm | 4 - audio/sfx/sfx_1f_11.asm | 3 - audio/sfx/sfx_1f_12.asm | 3 - audio/sfx/sfx_1f_13.asm | 3 - audio/sfx/sfx_1f_14.asm | 21 - audio/sfx/sfx_1f_15.asm | 24 -- audio/sfx/sfx_1f_16.asm | 17 - audio/sfx/sfx_1f_17.asm | 30 -- audio/sfx/sfx_1f_18.asm | 32 -- audio/sfx/sfx_1f_19.asm | 19 - audio/sfx/sfx_1f_1a.asm | 22 -- audio/sfx/sfx_1f_1b.asm | 21 - audio/sfx/sfx_1f_1c.asm | 23 -- audio/sfx/sfx_1f_1d.asm | 35 -- audio/sfx/sfx_1f_1e.asm | 35 -- audio/sfx/sfx_1f_1f.asm | 37 -- audio/sfx/sfx_1f_20.asm | 29 -- audio/sfx/sfx_1f_21.asm | 40 -- audio/sfx/sfx_1f_22.asm | 23 -- audio/sfx/sfx_1f_23.asm | 29 -- audio/sfx/sfx_1f_24.asm | 31 -- audio/sfx/sfx_1f_25.asm | 34 -- audio/sfx/sfx_1f_26.asm | 24 -- audio/sfx/sfx_1f_27.asm | 30 -- audio/sfx/sfx_1f_28.asm | 21 - audio/sfx/sfx_1f_29.asm | 30 -- audio/sfx/sfx_1f_2a.asm | 21 - audio/sfx/sfx_1f_2b.asm | 24 -- audio/sfx/sfx_1f_2c.asm | 34 -- audio/sfx/sfx_1f_2d.asm | 18 - audio/sfx/sfx_1f_2e.asm | 30 -- audio/sfx/sfx_1f_2f.asm | 26 -- audio/sfx/sfx_1f_30.asm | 31 -- audio/sfx/sfx_1f_31.asm | 29 -- audio/sfx/sfx_1f_32.asm | 38 -- audio/sfx/sfx_1f_33.asm | 24 -- audio/sfx/sfx_1f_34.asm | 24 -- audio/sfx/sfx_1f_35.asm | 27 -- audio/sfx/sfx_1f_36.asm | 24 -- audio/sfx/sfx_1f_37.asm | 25 -- audio/sfx/sfx_1f_38.asm | 33 -- audio/sfx/sfx_1f_39.asm | 26 -- audio/sfx/sfx_1f_3a.asm | 47 --- audio/sfx/sfx_1f_3b.asm | 69 ---- audio/sfx/sfx_1f_3c.asm | 8 - audio/sfx/sfx_1f_3d.asm | 7 - audio/sfx/sfx_1f_3e.asm | 9 - audio/sfx/sfx_1f_3f.asm | 4 - audio/sfx/sfx_1f_40.asm | 7 - audio/sfx/sfx_1f_41.asm | 77 ---- audio/sfx/sfx_1f_42.asm | 59 --- audio/sfx/sfx_1f_43.asm | 8 - audio/sfx/sfx_1f_44.asm | 7 - audio/sfx/sfx_1f_45.asm | 14 - audio/sfx/sfx_1f_46.asm | 7 - audio/sfx/sfx_1f_47.asm | 7 - audio/sfx/sfx_1f_48.asm | 10 - audio/sfx/sfx_1f_49.asm | 8 - audio/sfx/sfx_1f_4a.asm | 9 - audio/sfx/sfx_1f_4b.asm | 10 - audio/sfx/sfx_1f_4c.asm | 10 - audio/sfx/sfx_1f_4d.asm | 6 - audio/sfx/sfx_1f_4e.asm | 6 - audio/sfx/sfx_1f_4f.asm | 6 - audio/sfx/sfx_1f_50.asm | 18 - audio/sfx/sfx_1f_51.asm | 18 - audio/sfx/sfx_1f_52.asm | 6 - audio/sfx/sfx_1f_53.asm | 10 - audio/sfx/sfx_1f_54.asm | 22 -- audio/sfx/sfx_1f_55.asm | 12 - audio/sfx/sfx_1f_56.asm | 7 - audio/sfx/sfx_1f_57.asm | 4 - audio/sfx/sfx_1f_58.asm | 11 - audio/sfx/sfx_1f_59.asm | 11 - audio/sfx/sfx_1f_5a.asm | 13 - audio/sfx/sfx_1f_5b.asm | 6 - audio/sfx/sfx_1f_5c.asm | 7 - audio/sfx/sfx_1f_5d.asm | 36 -- audio/sfx/sfx_1f_5e.asm | 10 - audio/sfx/sfx_1f_5f.asm | 6 - audio/sfx/sfx_1f_60.asm | 6 - audio/sfx/sfx_1f_61.asm | 5 - audio/sfx/sfx_1f_62.asm | 4 - audio/sfx/sfx_1f_63.asm | 7 - audio/sfx/sfx_1f_64.asm | 6 - audio/sfx/sfx_1f_65.asm | 5 - audio/sfx/sfx_1f_66.asm | 14 - audio/sfx/sfx_1f_67.asm | 14 - audio/sfx/shooting_star.asm | 14 + audio/sfx/shrink_1.asm | 10 + audio/sfx/shrink_3.asm | 10 + audio/sfx/silph_scope.asm | 9 + audio/sfx/slots_new_spin.asm | 14 + audio/sfx/slots_reward.asm | 5 + audio/sfx/slots_stop_wheel.asm | 6 + audio/sfx/snare1_1.asm | 3 + audio/sfx/snare1_2.asm | 3 + audio/sfx/snare1_3.asm | 3 + audio/sfx/snare2_1.asm | 3 + audio/sfx/snare2_2.asm | 3 + audio/sfx/snare2_3.asm | 3 + audio/sfx/snare3_1.asm | 3 + audio/sfx/snare3_2.asm | 3 + audio/sfx/snare3_3.asm | 3 + audio/sfx/snare4_1.asm | 3 + audio/sfx/snare4_2.asm | 3 + audio/sfx/snare4_3.asm | 3 + audio/sfx/snare5_1.asm | 8 + audio/sfx/snare5_2.asm | 8 + audio/sfx/snare5_3.asm | 8 + audio/sfx/snare6_1.asm | 3 + audio/sfx/snare6_2.asm | 3 + audio/sfx/snare6_3.asm | 3 + audio/sfx/snare7_1.asm | 3 + audio/sfx/snare7_2.asm | 3 + audio/sfx/snare7_3.asm | 3 + audio/sfx/snare8_1.asm | 3 + audio/sfx/snare8_2.asm | 3 + audio/sfx/snare8_3.asm | 3 + audio/sfx/snare9_1.asm | 3 + audio/sfx/snare9_2.asm | 3 + audio/sfx/snare9_3.asm | 3 + audio/sfx/ss_anne_horn_1.asm | 22 ++ audio/sfx/ss_anne_horn_3.asm | 22 ++ audio/sfx/start_menu_1.asm | 4 + audio/sfx/start_menu_2.asm | 4 + audio/sfx/start_menu_3.asm | 4 + audio/sfx/super_effective.asm | 4 + audio/sfx/swap_1.asm | 11 + audio/sfx/swap_3.asm | 11 + audio/sfx/switch_1.asm | 8 + audio/sfx/switch_3.asm | 8 + audio/sfx/teleport_enter1_1.asm | 10 + audio/sfx/teleport_enter1_3.asm | 10 + audio/sfx/teleport_enter2_1.asm | 6 + audio/sfx/teleport_enter2_3.asm | 6 + audio/sfx/teleport_exit1_1.asm | 10 + audio/sfx/teleport_exit1_3.asm | 10 + audio/sfx/teleport_exit2_1.asm | 6 + audio/sfx/teleport_exit2_3.asm | 6 + audio/sfx/tink_1.asm | 8 + audio/sfx/tink_2.asm | 8 + audio/sfx/tink_3.asm | 8 + audio/sfx/trade_machine_1.asm | 7 + audio/sfx/trade_machine_3.asm | 7 + audio/sfx/triangle1_1.asm | 3 + audio/sfx/triangle1_2.asm | 3 + audio/sfx/triangle1_3.asm | 3 + audio/sfx/triangle2_1.asm | 4 + audio/sfx/triangle2_2.asm | 4 + audio/sfx/triangle2_3.asm | 4 + audio/sfx/triangle3_1.asm | 4 + audio/sfx/triangle3_2.asm | 4 + audio/sfx/triangle3_3.asm | 4 + audio/sfx/turn_off_pc_1.asm | 7 + audio/sfx/turn_off_pc_3.asm | 7 + audio/sfx/turn_on_pc_1.asm | 13 + audio/sfx/turn_on_pc_3.asm | 14 + audio/sfx/vine_whip.asm | 10 + audio/sfx/withdraw_deposit_1.asm | 12 + audio/sfx/withdraw_deposit_3.asm | 12 + constants/music_constants.asm | 322 +++++++-------- engine/hidden_object_functions7.asm | 2 +- engine/items/items.asm | 2 +- engine/menu/pokedex.asm | 2 +- engine/overworld/elevator.asm | 4 +- engine/overworld/player_animations.asm | 12 +- home/init.asm | 2 +- 645 files changed, 6867 insertions(+), 6867 deletions(-) mode change 100755 => 100644 audio/headers/sfxheaders02.asm mode change 100755 => 100644 audio/headers/sfxheaders08.asm mode change 100755 => 100644 audio/headers/sfxheaders1f.asm create mode 100644 audio/sfx/59_1.asm create mode 100644 audio/sfx/59_3.asm create mode 100644 audio/sfx/arrow_tiles_1.asm create mode 100644 audio/sfx/arrow_tiles_3.asm create mode 100644 audio/sfx/ball_poof.asm create mode 100644 audio/sfx/ball_toss.asm create mode 100644 audio/sfx/battle_09.asm create mode 100644 audio/sfx/battle_0b.asm create mode 100644 audio/sfx/battle_0c.asm create mode 100644 audio/sfx/battle_0d.asm create mode 100644 audio/sfx/battle_0e.asm create mode 100644 audio/sfx/battle_0f.asm create mode 100644 audio/sfx/battle_12.asm create mode 100644 audio/sfx/battle_13.asm create mode 100644 audio/sfx/battle_14.asm create mode 100644 audio/sfx/battle_16.asm create mode 100644 audio/sfx/battle_17.asm create mode 100644 audio/sfx/battle_18.asm create mode 100644 audio/sfx/battle_19.asm create mode 100644 audio/sfx/battle_1b.asm create mode 100644 audio/sfx/battle_1c.asm create mode 100644 audio/sfx/battle_1e.asm create mode 100644 audio/sfx/battle_20.asm create mode 100644 audio/sfx/battle_21.asm create mode 100644 audio/sfx/battle_22.asm create mode 100644 audio/sfx/battle_23.asm create mode 100644 audio/sfx/battle_24.asm create mode 100644 audio/sfx/battle_25.asm create mode 100644 audio/sfx/battle_26.asm create mode 100644 audio/sfx/battle_27.asm create mode 100644 audio/sfx/battle_28.asm create mode 100644 audio/sfx/battle_29.asm create mode 100644 audio/sfx/battle_2a.asm create mode 100644 audio/sfx/battle_2b.asm create mode 100644 audio/sfx/battle_2c.asm create mode 100644 audio/sfx/battle_2e.asm create mode 100644 audio/sfx/battle_2f.asm create mode 100644 audio/sfx/battle_31.asm create mode 100644 audio/sfx/battle_32.asm create mode 100644 audio/sfx/battle_33.asm create mode 100644 audio/sfx/battle_34.asm create mode 100644 audio/sfx/battle_35.asm create mode 100644 audio/sfx/battle_36.asm create mode 100644 audio/sfx/caught_mon.asm create mode 100644 audio/sfx/collision_1.asm create mode 100644 audio/sfx/collision_3.asm create mode 100644 audio/sfx/cry00_1.asm create mode 100644 audio/sfx/cry00_2.asm create mode 100644 audio/sfx/cry00_3.asm create mode 100644 audio/sfx/cry01_1.asm create mode 100644 audio/sfx/cry01_2.asm create mode 100644 audio/sfx/cry01_3.asm create mode 100644 audio/sfx/cry02_1.asm create mode 100644 audio/sfx/cry02_2.asm create mode 100644 audio/sfx/cry02_3.asm create mode 100644 audio/sfx/cry03_1.asm create mode 100644 audio/sfx/cry03_2.asm create mode 100644 audio/sfx/cry03_3.asm create mode 100644 audio/sfx/cry04_1.asm create mode 100644 audio/sfx/cry04_2.asm create mode 100644 audio/sfx/cry04_3.asm create mode 100644 audio/sfx/cry05_1.asm create mode 100644 audio/sfx/cry05_2.asm create mode 100644 audio/sfx/cry05_3.asm create mode 100644 audio/sfx/cry06_1.asm create mode 100644 audio/sfx/cry06_2.asm create mode 100644 audio/sfx/cry06_3.asm create mode 100644 audio/sfx/cry07_1.asm create mode 100644 audio/sfx/cry07_2.asm create mode 100644 audio/sfx/cry07_3.asm create mode 100644 audio/sfx/cry08_1.asm create mode 100644 audio/sfx/cry08_2.asm create mode 100644 audio/sfx/cry08_3.asm create mode 100644 audio/sfx/cry09_1.asm create mode 100644 audio/sfx/cry09_2.asm create mode 100644 audio/sfx/cry09_3.asm create mode 100644 audio/sfx/cry0a_1.asm create mode 100644 audio/sfx/cry0a_2.asm create mode 100644 audio/sfx/cry0a_3.asm create mode 100644 audio/sfx/cry0b_1.asm create mode 100644 audio/sfx/cry0b_2.asm create mode 100644 audio/sfx/cry0b_3.asm create mode 100644 audio/sfx/cry0c_1.asm create mode 100644 audio/sfx/cry0c_2.asm create mode 100644 audio/sfx/cry0c_3.asm create mode 100644 audio/sfx/cry0d_1.asm create mode 100644 audio/sfx/cry0d_2.asm create mode 100644 audio/sfx/cry0d_3.asm create mode 100644 audio/sfx/cry0e_1.asm create mode 100644 audio/sfx/cry0e_2.asm create mode 100644 audio/sfx/cry0e_3.asm create mode 100644 audio/sfx/cry0f_1.asm create mode 100644 audio/sfx/cry0f_2.asm create mode 100644 audio/sfx/cry0f_3.asm create mode 100644 audio/sfx/cry10_1.asm create mode 100644 audio/sfx/cry10_2.asm create mode 100644 audio/sfx/cry10_3.asm create mode 100644 audio/sfx/cry11_1.asm create mode 100644 audio/sfx/cry11_2.asm create mode 100644 audio/sfx/cry11_3.asm create mode 100644 audio/sfx/cry12_1.asm create mode 100644 audio/sfx/cry12_2.asm create mode 100644 audio/sfx/cry12_3.asm create mode 100644 audio/sfx/cry13_1.asm create mode 100644 audio/sfx/cry13_2.asm create mode 100644 audio/sfx/cry13_3.asm create mode 100644 audio/sfx/cry14_1.asm create mode 100644 audio/sfx/cry14_2.asm create mode 100644 audio/sfx/cry14_3.asm create mode 100644 audio/sfx/cry15_1.asm create mode 100644 audio/sfx/cry15_2.asm create mode 100644 audio/sfx/cry15_3.asm create mode 100644 audio/sfx/cry16_1.asm create mode 100644 audio/sfx/cry16_2.asm create mode 100644 audio/sfx/cry16_3.asm create mode 100644 audio/sfx/cry17_1.asm create mode 100644 audio/sfx/cry17_2.asm create mode 100644 audio/sfx/cry17_3.asm create mode 100644 audio/sfx/cry18_1.asm create mode 100644 audio/sfx/cry18_2.asm create mode 100644 audio/sfx/cry18_3.asm create mode 100644 audio/sfx/cry19_1.asm create mode 100644 audio/sfx/cry19_2.asm create mode 100644 audio/sfx/cry19_3.asm create mode 100644 audio/sfx/cry1a_1.asm create mode 100644 audio/sfx/cry1a_2.asm create mode 100644 audio/sfx/cry1a_3.asm create mode 100644 audio/sfx/cry1b_1.asm create mode 100644 audio/sfx/cry1b_2.asm create mode 100644 audio/sfx/cry1b_3.asm create mode 100644 audio/sfx/cry1c_1.asm create mode 100644 audio/sfx/cry1c_2.asm create mode 100644 audio/sfx/cry1c_3.asm create mode 100644 audio/sfx/cry1d_1.asm create mode 100644 audio/sfx/cry1d_2.asm create mode 100644 audio/sfx/cry1d_3.asm create mode 100644 audio/sfx/cry1e_1.asm create mode 100644 audio/sfx/cry1e_2.asm create mode 100644 audio/sfx/cry1e_3.asm create mode 100644 audio/sfx/cry1f_1.asm create mode 100644 audio/sfx/cry1f_2.asm create mode 100644 audio/sfx/cry1f_3.asm create mode 100644 audio/sfx/cry20_1.asm create mode 100644 audio/sfx/cry20_2.asm create mode 100644 audio/sfx/cry20_3.asm create mode 100644 audio/sfx/cry21_1.asm create mode 100644 audio/sfx/cry21_2.asm create mode 100644 audio/sfx/cry21_3.asm create mode 100644 audio/sfx/cry22_1.asm create mode 100644 audio/sfx/cry22_2.asm create mode 100644 audio/sfx/cry22_3.asm create mode 100644 audio/sfx/cry23_1.asm create mode 100644 audio/sfx/cry23_2.asm create mode 100644 audio/sfx/cry23_3.asm create mode 100644 audio/sfx/cry24_1.asm create mode 100644 audio/sfx/cry24_2.asm create mode 100644 audio/sfx/cry24_3.asm create mode 100644 audio/sfx/cry25_1.asm create mode 100644 audio/sfx/cry25_2.asm create mode 100644 audio/sfx/cry25_3.asm create mode 100644 audio/sfx/cut_1.asm create mode 100644 audio/sfx/cut_3.asm create mode 100644 audio/sfx/cymbal1_1.asm create mode 100644 audio/sfx/cymbal1_2.asm create mode 100644 audio/sfx/cymbal1_3.asm create mode 100644 audio/sfx/cymbal2_1.asm create mode 100644 audio/sfx/cymbal2_2.asm create mode 100644 audio/sfx/cymbal2_3.asm create mode 100644 audio/sfx/cymbal3_1.asm create mode 100644 audio/sfx/cymbal3_2.asm create mode 100644 audio/sfx/cymbal3_3.asm create mode 100644 audio/sfx/damage.asm create mode 100644 audio/sfx/denied_1.asm create mode 100644 audio/sfx/denied_3.asm create mode 100644 audio/sfx/dex_page_added.asm create mode 100644 audio/sfx/doubleslap.asm create mode 100644 audio/sfx/enter_pc_1.asm create mode 100644 audio/sfx/enter_pc_3.asm create mode 100644 audio/sfx/faint_fall.asm create mode 100644 audio/sfx/faint_thud.asm create mode 100644 audio/sfx/fly_1.asm create mode 100644 audio/sfx/fly_3.asm create mode 100644 audio/sfx/get_item1_1.asm create mode 100644 audio/sfx/get_item1_3.asm create mode 100644 audio/sfx/get_item2_1.asm create mode 100644 audio/sfx/get_item2_2.asm create mode 100644 audio/sfx/get_item2_3.asm create mode 100644 audio/sfx/get_key_item_1.asm create mode 100644 audio/sfx/get_key_item_3.asm create mode 100644 audio/sfx/go_inside_1.asm create mode 100644 audio/sfx/go_inside_3.asm create mode 100644 audio/sfx/go_outside_1.asm create mode 100644 audio/sfx/go_outside_3.asm create mode 100644 audio/sfx/heal_ailment_1.asm create mode 100644 audio/sfx/heal_ailment_2.asm create mode 100644 audio/sfx/heal_ailment_3.asm create mode 100644 audio/sfx/heal_hp_1.asm create mode 100644 audio/sfx/heal_hp_2.asm create mode 100644 audio/sfx/heal_hp_3.asm create mode 100644 audio/sfx/healing_machine_1.asm create mode 100644 audio/sfx/healing_machine_3.asm create mode 100644 audio/sfx/horn_drill.asm create mode 100644 audio/sfx/intro_crash.asm create mode 100644 audio/sfx/intro_hip.asm create mode 100644 audio/sfx/intro_hop.asm create mode 100644 audio/sfx/intro_lunge.asm create mode 100644 audio/sfx/intro_raise.asm create mode 100644 audio/sfx/intro_whoosh.asm create mode 100644 audio/sfx/ledge_1.asm create mode 100644 audio/sfx/ledge_3.asm create mode 100644 audio/sfx/level_up.asm create mode 100644 audio/sfx/muted_snare1_1.asm create mode 100644 audio/sfx/muted_snare1_2.asm create mode 100644 audio/sfx/muted_snare1_3.asm create mode 100644 audio/sfx/muted_snare2_1.asm create mode 100644 audio/sfx/muted_snare2_2.asm create mode 100644 audio/sfx/muted_snare2_3.asm create mode 100644 audio/sfx/muted_snare3_1.asm create mode 100644 audio/sfx/muted_snare3_2.asm create mode 100644 audio/sfx/muted_snare3_3.asm create mode 100644 audio/sfx/muted_snare4_1.asm create mode 100644 audio/sfx/muted_snare4_2.asm create mode 100644 audio/sfx/muted_snare4_3.asm create mode 100644 audio/sfx/not_very_effective.asm create mode 100644 audio/sfx/peck.asm create mode 100644 audio/sfx/poisoned_1.asm create mode 100644 audio/sfx/poisoned_3.asm create mode 100644 audio/sfx/pokedex_rating_1.asm create mode 100644 audio/sfx/pokedex_rating_3.asm create mode 100644 audio/sfx/pokeflute.asm create mode 100644 audio/sfx/pound.asm create mode 100644 audio/sfx/press_ab_1.asm create mode 100644 audio/sfx/press_ab_2.asm create mode 100644 audio/sfx/press_ab_3.asm create mode 100644 audio/sfx/psybeam.asm create mode 100644 audio/sfx/psychic_m.asm create mode 100644 audio/sfx/purchase_1.asm create mode 100644 audio/sfx/purchase_3.asm create mode 100644 audio/sfx/push_boulder_1.asm create mode 100644 audio/sfx/push_boulder_3.asm create mode 100644 audio/sfx/run.asm create mode 100644 audio/sfx/safari_zone_pa.asm create mode 100644 audio/sfx/save_1.asm create mode 100644 audio/sfx/save_3.asm delete mode 100755 audio/sfx/sfx_02_01.asm delete mode 100755 audio/sfx/sfx_02_02.asm delete mode 100755 audio/sfx/sfx_02_03.asm delete mode 100755 audio/sfx/sfx_02_04.asm delete mode 100755 audio/sfx/sfx_02_05.asm delete mode 100755 audio/sfx/sfx_02_06.asm delete mode 100755 audio/sfx/sfx_02_07.asm delete mode 100755 audio/sfx/sfx_02_08.asm delete mode 100755 audio/sfx/sfx_02_09.asm delete mode 100755 audio/sfx/sfx_02_0a.asm delete mode 100755 audio/sfx/sfx_02_0b.asm delete mode 100755 audio/sfx/sfx_02_0c.asm delete mode 100755 audio/sfx/sfx_02_0d.asm delete mode 100755 audio/sfx/sfx_02_0e.asm delete mode 100755 audio/sfx/sfx_02_0f.asm delete mode 100755 audio/sfx/sfx_02_10.asm delete mode 100755 audio/sfx/sfx_02_11.asm delete mode 100755 audio/sfx/sfx_02_12.asm delete mode 100755 audio/sfx/sfx_02_13.asm delete mode 100755 audio/sfx/sfx_02_14.asm delete mode 100755 audio/sfx/sfx_02_15.asm delete mode 100755 audio/sfx/sfx_02_16.asm delete mode 100755 audio/sfx/sfx_02_17.asm delete mode 100755 audio/sfx/sfx_02_18.asm delete mode 100755 audio/sfx/sfx_02_19.asm delete mode 100755 audio/sfx/sfx_02_1a.asm delete mode 100755 audio/sfx/sfx_02_1b.asm delete mode 100755 audio/sfx/sfx_02_1c.asm delete mode 100755 audio/sfx/sfx_02_1d.asm delete mode 100755 audio/sfx/sfx_02_1e.asm delete mode 100755 audio/sfx/sfx_02_1f.asm delete mode 100755 audio/sfx/sfx_02_20.asm delete mode 100755 audio/sfx/sfx_02_21.asm delete mode 100755 audio/sfx/sfx_02_22.asm delete mode 100755 audio/sfx/sfx_02_23.asm delete mode 100755 audio/sfx/sfx_02_24.asm delete mode 100755 audio/sfx/sfx_02_25.asm delete mode 100755 audio/sfx/sfx_02_26.asm delete mode 100755 audio/sfx/sfx_02_27.asm delete mode 100755 audio/sfx/sfx_02_28.asm delete mode 100755 audio/sfx/sfx_02_29.asm delete mode 100755 audio/sfx/sfx_02_2a.asm delete mode 100755 audio/sfx/sfx_02_2b.asm delete mode 100755 audio/sfx/sfx_02_2c.asm delete mode 100755 audio/sfx/sfx_02_2d.asm delete mode 100755 audio/sfx/sfx_02_2e.asm delete mode 100755 audio/sfx/sfx_02_2f.asm delete mode 100755 audio/sfx/sfx_02_30.asm delete mode 100755 audio/sfx/sfx_02_31.asm delete mode 100755 audio/sfx/sfx_02_32.asm delete mode 100755 audio/sfx/sfx_02_33.asm delete mode 100755 audio/sfx/sfx_02_34.asm delete mode 100755 audio/sfx/sfx_02_35.asm delete mode 100755 audio/sfx/sfx_02_36.asm delete mode 100755 audio/sfx/sfx_02_37.asm delete mode 100755 audio/sfx/sfx_02_38.asm delete mode 100755 audio/sfx/sfx_02_39.asm delete mode 100755 audio/sfx/sfx_02_3a.asm delete mode 100755 audio/sfx/sfx_02_3b.asm delete mode 100755 audio/sfx/sfx_02_3c.asm delete mode 100755 audio/sfx/sfx_02_3d.asm delete mode 100755 audio/sfx/sfx_02_3e.asm delete mode 100755 audio/sfx/sfx_02_3f.asm delete mode 100755 audio/sfx/sfx_02_40.asm delete mode 100755 audio/sfx/sfx_02_41.asm delete mode 100755 audio/sfx/sfx_02_42.asm delete mode 100755 audio/sfx/sfx_02_43.asm delete mode 100755 audio/sfx/sfx_02_44.asm delete mode 100755 audio/sfx/sfx_02_45.asm delete mode 100755 audio/sfx/sfx_02_46.asm delete mode 100755 audio/sfx/sfx_02_47.asm delete mode 100755 audio/sfx/sfx_02_48.asm delete mode 100755 audio/sfx/sfx_02_49.asm delete mode 100755 audio/sfx/sfx_02_4a.asm delete mode 100755 audio/sfx/sfx_02_4b.asm delete mode 100755 audio/sfx/sfx_02_4c.asm delete mode 100755 audio/sfx/sfx_02_4d.asm delete mode 100755 audio/sfx/sfx_02_4e.asm delete mode 100755 audio/sfx/sfx_02_4f.asm delete mode 100755 audio/sfx/sfx_02_50.asm delete mode 100755 audio/sfx/sfx_02_51.asm delete mode 100755 audio/sfx/sfx_02_52.asm delete mode 100755 audio/sfx/sfx_02_53.asm delete mode 100755 audio/sfx/sfx_02_54.asm delete mode 100755 audio/sfx/sfx_02_55.asm delete mode 100755 audio/sfx/sfx_02_56.asm delete mode 100755 audio/sfx/sfx_02_57.asm delete mode 100755 audio/sfx/sfx_02_58.asm delete mode 100755 audio/sfx/sfx_02_59.asm delete mode 100755 audio/sfx/sfx_02_5a.asm delete mode 100755 audio/sfx/sfx_02_5b.asm delete mode 100755 audio/sfx/sfx_02_5c.asm delete mode 100755 audio/sfx/sfx_02_5d.asm delete mode 100755 audio/sfx/sfx_02_5e.asm delete mode 100755 audio/sfx/sfx_02_5f.asm delete mode 100755 audio/sfx/sfx_08_01.asm delete mode 100755 audio/sfx/sfx_08_02.asm delete mode 100755 audio/sfx/sfx_08_03.asm delete mode 100755 audio/sfx/sfx_08_04.asm delete mode 100755 audio/sfx/sfx_08_05.asm delete mode 100755 audio/sfx/sfx_08_06.asm delete mode 100755 audio/sfx/sfx_08_07.asm delete mode 100755 audio/sfx/sfx_08_08.asm delete mode 100755 audio/sfx/sfx_08_09.asm delete mode 100755 audio/sfx/sfx_08_0a.asm delete mode 100755 audio/sfx/sfx_08_0b.asm delete mode 100755 audio/sfx/sfx_08_0c.asm delete mode 100755 audio/sfx/sfx_08_0d.asm delete mode 100755 audio/sfx/sfx_08_0e.asm delete mode 100755 audio/sfx/sfx_08_0f.asm delete mode 100755 audio/sfx/sfx_08_10.asm delete mode 100755 audio/sfx/sfx_08_11.asm delete mode 100755 audio/sfx/sfx_08_12.asm delete mode 100755 audio/sfx/sfx_08_13.asm delete mode 100755 audio/sfx/sfx_08_14.asm delete mode 100755 audio/sfx/sfx_08_15.asm delete mode 100755 audio/sfx/sfx_08_16.asm delete mode 100755 audio/sfx/sfx_08_17.asm delete mode 100755 audio/sfx/sfx_08_18.asm delete mode 100755 audio/sfx/sfx_08_19.asm delete mode 100755 audio/sfx/sfx_08_1a.asm delete mode 100755 audio/sfx/sfx_08_1b.asm delete mode 100755 audio/sfx/sfx_08_1c.asm delete mode 100755 audio/sfx/sfx_08_1d.asm delete mode 100755 audio/sfx/sfx_08_1e.asm delete mode 100755 audio/sfx/sfx_08_1f.asm delete mode 100755 audio/sfx/sfx_08_20.asm delete mode 100755 audio/sfx/sfx_08_21.asm delete mode 100755 audio/sfx/sfx_08_22.asm delete mode 100755 audio/sfx/sfx_08_23.asm delete mode 100755 audio/sfx/sfx_08_24.asm delete mode 100755 audio/sfx/sfx_08_25.asm delete mode 100755 audio/sfx/sfx_08_26.asm delete mode 100755 audio/sfx/sfx_08_27.asm delete mode 100755 audio/sfx/sfx_08_28.asm delete mode 100755 audio/sfx/sfx_08_29.asm delete mode 100755 audio/sfx/sfx_08_2a.asm delete mode 100755 audio/sfx/sfx_08_2b.asm delete mode 100755 audio/sfx/sfx_08_2c.asm delete mode 100755 audio/sfx/sfx_08_2d.asm delete mode 100755 audio/sfx/sfx_08_2e.asm delete mode 100755 audio/sfx/sfx_08_2f.asm delete mode 100755 audio/sfx/sfx_08_30.asm delete mode 100755 audio/sfx/sfx_08_31.asm delete mode 100755 audio/sfx/sfx_08_32.asm delete mode 100755 audio/sfx/sfx_08_33.asm delete mode 100755 audio/sfx/sfx_08_34.asm delete mode 100755 audio/sfx/sfx_08_35.asm delete mode 100755 audio/sfx/sfx_08_36.asm delete mode 100755 audio/sfx/sfx_08_37.asm delete mode 100755 audio/sfx/sfx_08_38.asm delete mode 100755 audio/sfx/sfx_08_39.asm delete mode 100755 audio/sfx/sfx_08_3a.asm delete mode 100755 audio/sfx/sfx_08_3b.asm delete mode 100755 audio/sfx/sfx_08_3c.asm delete mode 100755 audio/sfx/sfx_08_3d.asm delete mode 100755 audio/sfx/sfx_08_3e.asm delete mode 100755 audio/sfx/sfx_08_3f.asm delete mode 100755 audio/sfx/sfx_08_40.asm delete mode 100755 audio/sfx/sfx_08_41.asm delete mode 100755 audio/sfx/sfx_08_42.asm delete mode 100755 audio/sfx/sfx_08_43.asm delete mode 100755 audio/sfx/sfx_08_44.asm delete mode 100755 audio/sfx/sfx_08_45.asm delete mode 100755 audio/sfx/sfx_08_46.asm delete mode 100755 audio/sfx/sfx_08_47.asm delete mode 100755 audio/sfx/sfx_08_48.asm delete mode 100755 audio/sfx/sfx_08_49.asm delete mode 100755 audio/sfx/sfx_08_4a.asm delete mode 100755 audio/sfx/sfx_08_4b.asm delete mode 100755 audio/sfx/sfx_08_4c.asm delete mode 100755 audio/sfx/sfx_08_4d.asm delete mode 100755 audio/sfx/sfx_08_4e.asm delete mode 100755 audio/sfx/sfx_08_4f.asm delete mode 100755 audio/sfx/sfx_08_50.asm delete mode 100755 audio/sfx/sfx_08_51.asm delete mode 100755 audio/sfx/sfx_08_52.asm delete mode 100755 audio/sfx/sfx_08_53.asm delete mode 100755 audio/sfx/sfx_08_54.asm delete mode 100755 audio/sfx/sfx_08_55.asm delete mode 100755 audio/sfx/sfx_08_56.asm delete mode 100755 audio/sfx/sfx_08_57.asm delete mode 100755 audio/sfx/sfx_08_58.asm delete mode 100755 audio/sfx/sfx_08_59.asm delete mode 100755 audio/sfx/sfx_08_5a.asm delete mode 100755 audio/sfx/sfx_08_5b.asm delete mode 100755 audio/sfx/sfx_08_5c.asm delete mode 100755 audio/sfx/sfx_08_5d.asm delete mode 100755 audio/sfx/sfx_08_5e.asm delete mode 100755 audio/sfx/sfx_08_5f.asm delete mode 100755 audio/sfx/sfx_08_60.asm delete mode 100755 audio/sfx/sfx_08_61.asm delete mode 100755 audio/sfx/sfx_08_62.asm delete mode 100755 audio/sfx/sfx_08_63.asm delete mode 100755 audio/sfx/sfx_08_64.asm delete mode 100755 audio/sfx/sfx_08_65.asm delete mode 100755 audio/sfx/sfx_08_66.asm delete mode 100755 audio/sfx/sfx_08_67.asm delete mode 100755 audio/sfx/sfx_08_68.asm delete mode 100755 audio/sfx/sfx_08_69.asm delete mode 100755 audio/sfx/sfx_08_6a.asm delete mode 100755 audio/sfx/sfx_08_6b.asm delete mode 100755 audio/sfx/sfx_08_6c.asm delete mode 100755 audio/sfx/sfx_08_6d.asm delete mode 100755 audio/sfx/sfx_08_6e.asm delete mode 100755 audio/sfx/sfx_08_6f.asm delete mode 100755 audio/sfx/sfx_08_70.asm delete mode 100755 audio/sfx/sfx_08_71.asm delete mode 100755 audio/sfx/sfx_08_72.asm delete mode 100755 audio/sfx/sfx_08_73.asm delete mode 100755 audio/sfx/sfx_08_74.asm delete mode 100755 audio/sfx/sfx_08_75.asm delete mode 100755 audio/sfx/sfx_08_76.asm delete mode 100755 audio/sfx/sfx_08_77.asm delete mode 100755 audio/sfx/sfx_1f_01.asm delete mode 100755 audio/sfx/sfx_1f_02.asm delete mode 100755 audio/sfx/sfx_1f_03.asm delete mode 100755 audio/sfx/sfx_1f_04.asm delete mode 100755 audio/sfx/sfx_1f_05.asm delete mode 100755 audio/sfx/sfx_1f_06.asm delete mode 100755 audio/sfx/sfx_1f_07.asm delete mode 100755 audio/sfx/sfx_1f_08.asm delete mode 100755 audio/sfx/sfx_1f_09.asm delete mode 100755 audio/sfx/sfx_1f_0a.asm delete mode 100755 audio/sfx/sfx_1f_0b.asm delete mode 100755 audio/sfx/sfx_1f_0c.asm delete mode 100755 audio/sfx/sfx_1f_0d.asm delete mode 100755 audio/sfx/sfx_1f_0e.asm delete mode 100755 audio/sfx/sfx_1f_0f.asm delete mode 100755 audio/sfx/sfx_1f_10.asm delete mode 100755 audio/sfx/sfx_1f_11.asm delete mode 100755 audio/sfx/sfx_1f_12.asm delete mode 100755 audio/sfx/sfx_1f_13.asm delete mode 100755 audio/sfx/sfx_1f_14.asm delete mode 100755 audio/sfx/sfx_1f_15.asm delete mode 100755 audio/sfx/sfx_1f_16.asm delete mode 100755 audio/sfx/sfx_1f_17.asm delete mode 100755 audio/sfx/sfx_1f_18.asm delete mode 100755 audio/sfx/sfx_1f_19.asm delete mode 100755 audio/sfx/sfx_1f_1a.asm delete mode 100755 audio/sfx/sfx_1f_1b.asm delete mode 100755 audio/sfx/sfx_1f_1c.asm delete mode 100755 audio/sfx/sfx_1f_1d.asm delete mode 100755 audio/sfx/sfx_1f_1e.asm delete mode 100755 audio/sfx/sfx_1f_1f.asm delete mode 100755 audio/sfx/sfx_1f_20.asm delete mode 100755 audio/sfx/sfx_1f_21.asm delete mode 100755 audio/sfx/sfx_1f_22.asm delete mode 100755 audio/sfx/sfx_1f_23.asm delete mode 100755 audio/sfx/sfx_1f_24.asm delete mode 100755 audio/sfx/sfx_1f_25.asm delete mode 100755 audio/sfx/sfx_1f_26.asm delete mode 100755 audio/sfx/sfx_1f_27.asm delete mode 100755 audio/sfx/sfx_1f_28.asm delete mode 100755 audio/sfx/sfx_1f_29.asm delete mode 100755 audio/sfx/sfx_1f_2a.asm delete mode 100755 audio/sfx/sfx_1f_2b.asm delete mode 100755 audio/sfx/sfx_1f_2c.asm delete mode 100755 audio/sfx/sfx_1f_2d.asm delete mode 100755 audio/sfx/sfx_1f_2e.asm delete mode 100755 audio/sfx/sfx_1f_2f.asm delete mode 100755 audio/sfx/sfx_1f_30.asm delete mode 100755 audio/sfx/sfx_1f_31.asm delete mode 100755 audio/sfx/sfx_1f_32.asm delete mode 100755 audio/sfx/sfx_1f_33.asm delete mode 100755 audio/sfx/sfx_1f_34.asm delete mode 100755 audio/sfx/sfx_1f_35.asm delete mode 100755 audio/sfx/sfx_1f_36.asm delete mode 100755 audio/sfx/sfx_1f_37.asm delete mode 100755 audio/sfx/sfx_1f_38.asm delete mode 100755 audio/sfx/sfx_1f_39.asm delete mode 100755 audio/sfx/sfx_1f_3a.asm delete mode 100755 audio/sfx/sfx_1f_3b.asm delete mode 100755 audio/sfx/sfx_1f_3c.asm delete mode 100755 audio/sfx/sfx_1f_3d.asm delete mode 100755 audio/sfx/sfx_1f_3e.asm delete mode 100755 audio/sfx/sfx_1f_3f.asm delete mode 100755 audio/sfx/sfx_1f_40.asm delete mode 100755 audio/sfx/sfx_1f_41.asm delete mode 100755 audio/sfx/sfx_1f_42.asm delete mode 100755 audio/sfx/sfx_1f_43.asm delete mode 100755 audio/sfx/sfx_1f_44.asm delete mode 100755 audio/sfx/sfx_1f_45.asm delete mode 100755 audio/sfx/sfx_1f_46.asm delete mode 100755 audio/sfx/sfx_1f_47.asm delete mode 100755 audio/sfx/sfx_1f_48.asm delete mode 100755 audio/sfx/sfx_1f_49.asm delete mode 100755 audio/sfx/sfx_1f_4a.asm delete mode 100755 audio/sfx/sfx_1f_4b.asm delete mode 100755 audio/sfx/sfx_1f_4c.asm delete mode 100755 audio/sfx/sfx_1f_4d.asm delete mode 100755 audio/sfx/sfx_1f_4e.asm delete mode 100755 audio/sfx/sfx_1f_4f.asm delete mode 100755 audio/sfx/sfx_1f_50.asm delete mode 100755 audio/sfx/sfx_1f_51.asm delete mode 100755 audio/sfx/sfx_1f_52.asm delete mode 100755 audio/sfx/sfx_1f_53.asm delete mode 100755 audio/sfx/sfx_1f_54.asm delete mode 100755 audio/sfx/sfx_1f_55.asm delete mode 100755 audio/sfx/sfx_1f_56.asm delete mode 100755 audio/sfx/sfx_1f_57.asm delete mode 100755 audio/sfx/sfx_1f_58.asm delete mode 100755 audio/sfx/sfx_1f_59.asm delete mode 100755 audio/sfx/sfx_1f_5a.asm delete mode 100755 audio/sfx/sfx_1f_5b.asm delete mode 100755 audio/sfx/sfx_1f_5c.asm delete mode 100755 audio/sfx/sfx_1f_5d.asm delete mode 100755 audio/sfx/sfx_1f_5e.asm delete mode 100755 audio/sfx/sfx_1f_5f.asm delete mode 100755 audio/sfx/sfx_1f_60.asm delete mode 100755 audio/sfx/sfx_1f_61.asm delete mode 100755 audio/sfx/sfx_1f_62.asm delete mode 100755 audio/sfx/sfx_1f_63.asm delete mode 100755 audio/sfx/sfx_1f_64.asm delete mode 100755 audio/sfx/sfx_1f_65.asm delete mode 100755 audio/sfx/sfx_1f_66.asm delete mode 100755 audio/sfx/sfx_1f_67.asm create mode 100644 audio/sfx/shooting_star.asm create mode 100644 audio/sfx/shrink_1.asm create mode 100644 audio/sfx/shrink_3.asm create mode 100644 audio/sfx/silph_scope.asm create mode 100644 audio/sfx/slots_new_spin.asm create mode 100644 audio/sfx/slots_reward.asm create mode 100644 audio/sfx/slots_stop_wheel.asm create mode 100644 audio/sfx/snare1_1.asm create mode 100644 audio/sfx/snare1_2.asm create mode 100644 audio/sfx/snare1_3.asm create mode 100644 audio/sfx/snare2_1.asm create mode 100644 audio/sfx/snare2_2.asm create mode 100644 audio/sfx/snare2_3.asm create mode 100644 audio/sfx/snare3_1.asm create mode 100644 audio/sfx/snare3_2.asm create mode 100644 audio/sfx/snare3_3.asm create mode 100644 audio/sfx/snare4_1.asm create mode 100644 audio/sfx/snare4_2.asm create mode 100644 audio/sfx/snare4_3.asm create mode 100644 audio/sfx/snare5_1.asm create mode 100644 audio/sfx/snare5_2.asm create mode 100644 audio/sfx/snare5_3.asm create mode 100644 audio/sfx/snare6_1.asm create mode 100644 audio/sfx/snare6_2.asm create mode 100644 audio/sfx/snare6_3.asm create mode 100644 audio/sfx/snare7_1.asm create mode 100644 audio/sfx/snare7_2.asm create mode 100644 audio/sfx/snare7_3.asm create mode 100644 audio/sfx/snare8_1.asm create mode 100644 audio/sfx/snare8_2.asm create mode 100644 audio/sfx/snare8_3.asm create mode 100644 audio/sfx/snare9_1.asm create mode 100644 audio/sfx/snare9_2.asm create mode 100644 audio/sfx/snare9_3.asm create mode 100644 audio/sfx/ss_anne_horn_1.asm create mode 100644 audio/sfx/ss_anne_horn_3.asm create mode 100644 audio/sfx/start_menu_1.asm create mode 100644 audio/sfx/start_menu_2.asm create mode 100644 audio/sfx/start_menu_3.asm create mode 100644 audio/sfx/super_effective.asm create mode 100644 audio/sfx/swap_1.asm create mode 100644 audio/sfx/swap_3.asm create mode 100644 audio/sfx/switch_1.asm create mode 100644 audio/sfx/switch_3.asm create mode 100644 audio/sfx/teleport_enter1_1.asm create mode 100644 audio/sfx/teleport_enter1_3.asm create mode 100644 audio/sfx/teleport_enter2_1.asm create mode 100644 audio/sfx/teleport_enter2_3.asm create mode 100644 audio/sfx/teleport_exit1_1.asm create mode 100644 audio/sfx/teleport_exit1_3.asm create mode 100644 audio/sfx/teleport_exit2_1.asm create mode 100644 audio/sfx/teleport_exit2_3.asm create mode 100644 audio/sfx/tink_1.asm create mode 100644 audio/sfx/tink_2.asm create mode 100644 audio/sfx/tink_3.asm create mode 100644 audio/sfx/trade_machine_1.asm create mode 100644 audio/sfx/trade_machine_3.asm create mode 100644 audio/sfx/triangle1_1.asm create mode 100644 audio/sfx/triangle1_2.asm create mode 100644 audio/sfx/triangle1_3.asm create mode 100644 audio/sfx/triangle2_1.asm create mode 100644 audio/sfx/triangle2_2.asm create mode 100644 audio/sfx/triangle2_3.asm create mode 100644 audio/sfx/triangle3_1.asm create mode 100644 audio/sfx/triangle3_2.asm create mode 100644 audio/sfx/triangle3_3.asm create mode 100644 audio/sfx/turn_off_pc_1.asm create mode 100644 audio/sfx/turn_off_pc_3.asm create mode 100644 audio/sfx/turn_on_pc_1.asm create mode 100644 audio/sfx/turn_on_pc_3.asm create mode 100644 audio/sfx/vine_whip.asm create mode 100644 audio/sfx/withdraw_deposit_1.asm create mode 100644 audio/sfx/withdraw_deposit_3.asm (limited to 'audio.asm') diff --git a/audio.asm b/audio.asm index 563aee14..8b83fcaf 100644 --- a/audio.asm +++ b/audio.asm @@ -30,333 +30,333 @@ INCLUDE "audio/headers/musicheaders1f.asm" SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1] -INCLUDE "audio/sfx/sfx_02_01.asm" -INCLUDE "audio/sfx/sfx_02_02.asm" -INCLUDE "audio/sfx/sfx_02_03.asm" -INCLUDE "audio/sfx/sfx_02_04.asm" -INCLUDE "audio/sfx/sfx_02_05.asm" -INCLUDE "audio/sfx/sfx_02_06.asm" -INCLUDE "audio/sfx/sfx_02_07.asm" -INCLUDE "audio/sfx/sfx_02_08.asm" -INCLUDE "audio/sfx/sfx_02_09.asm" -INCLUDE "audio/sfx/sfx_02_0a.asm" -INCLUDE "audio/sfx/sfx_02_0b.asm" -INCLUDE "audio/sfx/sfx_02_0c.asm" -INCLUDE "audio/sfx/sfx_02_0d.asm" -INCLUDE "audio/sfx/sfx_02_0e.asm" -INCLUDE "audio/sfx/sfx_02_0f.asm" -INCLUDE "audio/sfx/sfx_02_10.asm" -INCLUDE "audio/sfx/sfx_02_11.asm" -INCLUDE "audio/sfx/sfx_02_12.asm" -INCLUDE "audio/sfx/sfx_02_13.asm" +INCLUDE "audio/sfx/snare1_1.asm" +INCLUDE "audio/sfx/snare2_1.asm" +INCLUDE "audio/sfx/snare3_1.asm" +INCLUDE "audio/sfx/snare4_1.asm" +INCLUDE "audio/sfx/snare5_1.asm" +INCLUDE "audio/sfx/triangle1_1.asm" +INCLUDE "audio/sfx/triangle2_1.asm" +INCLUDE "audio/sfx/snare6_1.asm" +INCLUDE "audio/sfx/snare7_1.asm" +INCLUDE "audio/sfx/snare8_1.asm" +INCLUDE "audio/sfx/snare9_1.asm" +INCLUDE "audio/sfx/cymbal1_1.asm" +INCLUDE "audio/sfx/cymbal2_1.asm" +INCLUDE "audio/sfx/cymbal3_1.asm" +INCLUDE "audio/sfx/muted_snare1_1.asm" +INCLUDE "audio/sfx/triangle3_1.asm" +INCLUDE "audio/sfx/muted_snare2_1.asm" +INCLUDE "audio/sfx/muted_snare3_1.asm" +INCLUDE "audio/sfx/muted_snare4_1.asm" Music2_WavePointers: INCLUDE "audio/wave_instruments.asm" -INCLUDE "audio/sfx/sfx_02_3f.asm" -INCLUDE "audio/sfx/sfx_02_5e.asm" -INCLUDE "audio/sfx/sfx_02_56.asm" -INCLUDE "audio/sfx/sfx_02_57.asm" -INCLUDE "audio/sfx/sfx_02_58.asm" -INCLUDE "audio/sfx/sfx_02_3c.asm" -INCLUDE "audio/sfx/sfx_02_59.asm" -INCLUDE "audio/sfx/sfx_02_5a.asm" -INCLUDE "audio/sfx/sfx_02_5b.asm" -INCLUDE "audio/sfx/sfx_02_5c.asm" -INCLUDE "audio/sfx/sfx_02_40.asm" -INCLUDE "audio/sfx/sfx_02_5d.asm" -INCLUDE "audio/sfx/sfx_02_3d.asm" -INCLUDE "audio/sfx/sfx_02_43.asm" -INCLUDE "audio/sfx/sfx_02_3e.asm" -INCLUDE "audio/sfx/sfx_02_44.asm" -INCLUDE "audio/sfx/sfx_02_45.asm" -INCLUDE "audio/sfx/sfx_02_46.asm" -INCLUDE "audio/sfx/sfx_02_47.asm" -INCLUDE "audio/sfx/sfx_02_48.asm" -INCLUDE "audio/sfx/sfx_02_49.asm" -INCLUDE "audio/sfx/sfx_02_4a.asm" -INCLUDE "audio/sfx/sfx_02_4b.asm" -INCLUDE "audio/sfx/sfx_02_4c.asm" -INCLUDE "audio/sfx/sfx_02_4d.asm" -INCLUDE "audio/sfx/sfx_02_4e.asm" -INCLUDE "audio/sfx/sfx_02_4f.asm" -INCLUDE "audio/sfx/sfx_02_50.asm" -INCLUDE "audio/sfx/sfx_02_51.asm" -INCLUDE "audio/sfx/sfx_02_52.asm" -INCLUDE "audio/sfx/sfx_02_53.asm" -INCLUDE "audio/sfx/sfx_02_54.asm" -INCLUDE "audio/sfx/sfx_02_55.asm" -INCLUDE "audio/sfx/sfx_02_5f.asm" +INCLUDE "audio/sfx/start_menu_1.asm" +INCLUDE "audio/sfx/pokeflute.asm" +INCLUDE "audio/sfx/cut_1.asm" +INCLUDE "audio/sfx/go_inside_1.asm" +INCLUDE "audio/sfx/swap_1.asm" +INCLUDE "audio/sfx/tink_1.asm" +INCLUDE "audio/sfx/59_1.asm" +INCLUDE "audio/sfx/purchase_1.asm" +INCLUDE "audio/sfx/collision_1.asm" +INCLUDE "audio/sfx/go_outside_1.asm" +INCLUDE "audio/sfx/press_ab_1.asm" +INCLUDE "audio/sfx/save_1.asm" +INCLUDE "audio/sfx/heal_hp_1.asm" +INCLUDE "audio/sfx/poisoned_1.asm" +INCLUDE "audio/sfx/heal_ailment_1.asm" +INCLUDE "audio/sfx/trade_machine_1.asm" +INCLUDE "audio/sfx/turn_on_pc_1.asm" +INCLUDE "audio/sfx/turn_off_pc_1.asm" +INCLUDE "audio/sfx/enter_pc_1.asm" +INCLUDE "audio/sfx/shrink_1.asm" +INCLUDE "audio/sfx/switch_1.asm" +INCLUDE "audio/sfx/healing_machine_1.asm" +INCLUDE "audio/sfx/teleport_exit1_1.asm" +INCLUDE "audio/sfx/teleport_enter1_1.asm" +INCLUDE "audio/sfx/teleport_exit2_1.asm" +INCLUDE "audio/sfx/ledge_1.asm" +INCLUDE "audio/sfx/teleport_enter2_1.asm" +INCLUDE "audio/sfx/fly_1.asm" +INCLUDE "audio/sfx/denied_1.asm" +INCLUDE "audio/sfx/arrow_tiles_1.asm" +INCLUDE "audio/sfx/push_boulder_1.asm" +INCLUDE "audio/sfx/ss_anne_horn_1.asm" +INCLUDE "audio/sfx/withdraw_deposit_1.asm" +INCLUDE "audio/sfx/safari_zone_pa.asm" INCLUDE "audio/sfx/sfx_02_unused.asm" -INCLUDE "audio/sfx/sfx_02_1d.asm" -INCLUDE "audio/sfx/sfx_02_37.asm" -INCLUDE "audio/sfx/sfx_02_38.asm" -INCLUDE "audio/sfx/sfx_02_25.asm" -INCLUDE "audio/sfx/sfx_02_39.asm" -INCLUDE "audio/sfx/sfx_02_17.asm" -INCLUDE "audio/sfx/sfx_02_23.asm" -INCLUDE "audio/sfx/sfx_02_24.asm" -INCLUDE "audio/sfx/sfx_02_14.asm" -INCLUDE "audio/sfx/sfx_02_22.asm" -INCLUDE "audio/sfx/sfx_02_1a.asm" -INCLUDE "audio/sfx/sfx_02_1b.asm" -INCLUDE "audio/sfx/sfx_02_19.asm" -INCLUDE "audio/sfx/sfx_02_1f.asm" -INCLUDE "audio/sfx/sfx_02_20.asm" -INCLUDE "audio/sfx/sfx_02_16.asm" -INCLUDE "audio/sfx/sfx_02_21.asm" -INCLUDE "audio/sfx/sfx_02_15.asm" -INCLUDE "audio/sfx/sfx_02_1e.asm" -INCLUDE "audio/sfx/sfx_02_1c.asm" -INCLUDE "audio/sfx/sfx_02_18.asm" -INCLUDE "audio/sfx/sfx_02_2d.asm" -INCLUDE "audio/sfx/sfx_02_2a.asm" -INCLUDE "audio/sfx/sfx_02_2f.asm" -INCLUDE "audio/sfx/sfx_02_26.asm" -INCLUDE "audio/sfx/sfx_02_27.asm" -INCLUDE "audio/sfx/sfx_02_28.asm" -INCLUDE "audio/sfx/sfx_02_32.asm" -INCLUDE "audio/sfx/sfx_02_29.asm" -INCLUDE "audio/sfx/sfx_02_2b.asm" -INCLUDE "audio/sfx/sfx_02_30.asm" -INCLUDE "audio/sfx/sfx_02_2e.asm" -INCLUDE "audio/sfx/sfx_02_31.asm" -INCLUDE "audio/sfx/sfx_02_2c.asm" -INCLUDE "audio/sfx/sfx_02_33.asm" -INCLUDE "audio/sfx/sfx_02_34.asm" -INCLUDE "audio/sfx/sfx_02_35.asm" -INCLUDE "audio/sfx/sfx_02_36.asm" +INCLUDE "audio/sfx/cry09_1.asm" +INCLUDE "audio/sfx/cry23_1.asm" +INCLUDE "audio/sfx/cry24_1.asm" +INCLUDE "audio/sfx/cry11_1.asm" +INCLUDE "audio/sfx/cry25_1.asm" +INCLUDE "audio/sfx/cry03_1.asm" +INCLUDE "audio/sfx/cry0f_1.asm" +INCLUDE "audio/sfx/cry10_1.asm" +INCLUDE "audio/sfx/cry00_1.asm" +INCLUDE "audio/sfx/cry0e_1.asm" +INCLUDE "audio/sfx/cry06_1.asm" +INCLUDE "audio/sfx/cry07_1.asm" +INCLUDE "audio/sfx/cry05_1.asm" +INCLUDE "audio/sfx/cry0b_1.asm" +INCLUDE "audio/sfx/cry0c_1.asm" +INCLUDE "audio/sfx/cry02_1.asm" +INCLUDE "audio/sfx/cry0d_1.asm" +INCLUDE "audio/sfx/cry01_1.asm" +INCLUDE "audio/sfx/cry0a_1.asm" +INCLUDE "audio/sfx/cry08_1.asm" +INCLUDE "audio/sfx/cry04_1.asm" +INCLUDE "audio/sfx/cry19_1.asm" +INCLUDE "audio/sfx/cry16_1.asm" +INCLUDE "audio/sfx/cry1b_1.asm" +INCLUDE "audio/sfx/cry12_1.asm" +INCLUDE "audio/sfx/cry13_1.asm" +INCLUDE "audio/sfx/cry14_1.asm" +INCLUDE "audio/sfx/cry1e_1.asm" +INCLUDE "audio/sfx/cry15_1.asm" +INCLUDE "audio/sfx/cry17_1.asm" +INCLUDE "audio/sfx/cry1c_1.asm" +INCLUDE "audio/sfx/cry1a_1.asm" +INCLUDE "audio/sfx/cry1d_1.asm" +INCLUDE "audio/sfx/cry18_1.asm" +INCLUDE "audio/sfx/cry1f_1.asm" +INCLUDE "audio/sfx/cry20_1.asm" +INCLUDE "audio/sfx/cry21_1.asm" +INCLUDE "audio/sfx/cry22_1.asm" SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2] -INCLUDE "audio/sfx/sfx_08_01.asm" -INCLUDE "audio/sfx/sfx_08_02.asm" -INCLUDE "audio/sfx/sfx_08_03.asm" -INCLUDE "audio/sfx/sfx_08_04.asm" -INCLUDE "audio/sfx/sfx_08_05.asm" -INCLUDE "audio/sfx/sfx_08_06.asm" -INCLUDE "audio/sfx/sfx_08_07.asm" -INCLUDE "audio/sfx/sfx_08_08.asm" -INCLUDE "audio/sfx/sfx_08_09.asm" -INCLUDE "audio/sfx/sfx_08_0a.asm" -INCLUDE "audio/sfx/sfx_08_0b.asm" -INCLUDE "audio/sfx/sfx_08_0c.asm" -INCLUDE "audio/sfx/sfx_08_0d.asm" -INCLUDE "audio/sfx/sfx_08_0e.asm" -INCLUDE "audio/sfx/sfx_08_0f.asm" -INCLUDE "audio/sfx/sfx_08_10.asm" -INCLUDE "audio/sfx/sfx_08_11.asm" -INCLUDE "audio/sfx/sfx_08_12.asm" -INCLUDE "audio/sfx/sfx_08_13.asm" +INCLUDE "audio/sfx/snare1_2.asm" +INCLUDE "audio/sfx/snare2_2.asm" +INCLUDE "audio/sfx/snare3_2.asm" +INCLUDE "audio/sfx/snare4_2.asm" +INCLUDE "audio/sfx/snare5_2.asm" +INCLUDE "audio/sfx/triangle1_2.asm" +INCLUDE "audio/sfx/triangle2_2.asm" +INCLUDE "audio/sfx/snare6_2.asm" +INCLUDE "audio/sfx/snare7_2.asm" +INCLUDE "audio/sfx/snare8_2.asm" +INCLUDE "audio/sfx/snare9_2.asm" +INCLUDE "audio/sfx/cymbal1_2.asm" +INCLUDE "audio/sfx/cymbal2_2.asm" +INCLUDE "audio/sfx/cymbal3_2.asm" +INCLUDE "audio/sfx/muted_snare1_2.asm" +INCLUDE "audio/sfx/triangle3_2.asm" +INCLUDE "audio/sfx/muted_snare2_2.asm" +INCLUDE "audio/sfx/muted_snare3_2.asm" +INCLUDE "audio/sfx/muted_snare4_2.asm" Music8_WavePointers: INCLUDE "audio/wave_instruments.asm" -INCLUDE "audio/sfx/sfx_08_40.asm" -INCLUDE "audio/sfx/sfx_08_3f.asm" -INCLUDE "audio/sfx/sfx_08_3c.asm" -INCLUDE "audio/sfx/sfx_08_3d.asm" -INCLUDE "audio/sfx/sfx_08_3e.asm" -INCLUDE "audio/sfx/sfx_08_77.asm" -INCLUDE "audio/sfx/sfx_08_41.asm" -INCLUDE "audio/sfx/sfx_08_42.asm" -INCLUDE "audio/sfx/sfx_08_43.asm" -INCLUDE "audio/sfx/sfx_08_44.asm" -INCLUDE "audio/sfx/sfx_08_45.asm" +INCLUDE "audio/sfx/press_ab_2.asm" +INCLUDE "audio/sfx/start_menu_2.asm" +INCLUDE "audio/sfx/tink_2.asm" +INCLUDE "audio/sfx/heal_hp_2.asm" +INCLUDE "audio/sfx/heal_ailment_2.asm" +INCLUDE "audio/sfx/silph_scope.asm" +INCLUDE "audio/sfx/ball_toss.asm" +INCLUDE "audio/sfx/ball_poof.asm" +INCLUDE "audio/sfx/faint_thud.asm" +INCLUDE "audio/sfx/run.asm" +INCLUDE "audio/sfx/dex_page_added.asm" INCLUDE "audio/sfx/sfx_08_pokeflute_ch3.asm" -INCLUDE "audio/sfx/sfx_08_47.asm" -INCLUDE "audio/sfx/sfx_08_48.asm" -INCLUDE "audio/sfx/sfx_08_49.asm" -INCLUDE "audio/sfx/sfx_08_4a.asm" -INCLUDE "audio/sfx/sfx_08_4b.asm" -INCLUDE "audio/sfx/sfx_08_4c.asm" -INCLUDE "audio/sfx/sfx_08_4d.asm" -INCLUDE "audio/sfx/sfx_08_4e.asm" -INCLUDE "audio/sfx/sfx_08_4f.asm" -INCLUDE "audio/sfx/sfx_08_50.asm" -INCLUDE "audio/sfx/sfx_08_51.asm" -INCLUDE "audio/sfx/sfx_08_52.asm" -INCLUDE "audio/sfx/sfx_08_53.asm" -INCLUDE "audio/sfx/sfx_08_54.asm" -INCLUDE "audio/sfx/sfx_08_55.asm" -INCLUDE "audio/sfx/sfx_08_56.asm" -INCLUDE "audio/sfx/sfx_08_57.asm" -INCLUDE "audio/sfx/sfx_08_58.asm" -INCLUDE "audio/sfx/sfx_08_59.asm" -INCLUDE "audio/sfx/sfx_08_5a.asm" -INCLUDE "audio/sfx/sfx_08_5b.asm" -INCLUDE "audio/sfx/sfx_08_5c.asm" -INCLUDE "audio/sfx/sfx_08_5d.asm" -INCLUDE "audio/sfx/sfx_08_5e.asm" -INCLUDE "audio/sfx/sfx_08_5f.asm" -INCLUDE "audio/sfx/sfx_08_60.asm" -INCLUDE "audio/sfx/sfx_08_61.asm" -INCLUDE "audio/sfx/sfx_08_62.asm" -INCLUDE "audio/sfx/sfx_08_63.asm" -INCLUDE "audio/sfx/sfx_08_64.asm" -INCLUDE "audio/sfx/sfx_08_65.asm" -INCLUDE "audio/sfx/sfx_08_66.asm" -INCLUDE "audio/sfx/sfx_08_67.asm" -INCLUDE "audio/sfx/sfx_08_68.asm" -INCLUDE "audio/sfx/sfx_08_69.asm" -INCLUDE "audio/sfx/sfx_08_6a.asm" -INCLUDE "audio/sfx/sfx_08_6b.asm" -INCLUDE "audio/sfx/sfx_08_6c.asm" -INCLUDE "audio/sfx/sfx_08_6d.asm" -INCLUDE "audio/sfx/sfx_08_6e.asm" -INCLUDE "audio/sfx/sfx_08_6f.asm" -INCLUDE "audio/sfx/sfx_08_70.asm" -INCLUDE "audio/sfx/sfx_08_71.asm" -INCLUDE "audio/sfx/sfx_08_72.asm" -INCLUDE "audio/sfx/sfx_08_73.asm" -INCLUDE "audio/sfx/sfx_08_74.asm" -INCLUDE "audio/sfx/sfx_08_75.asm" -INCLUDE "audio/sfx/sfx_08_76.asm" +INCLUDE "audio/sfx/peck.asm" +INCLUDE "audio/sfx/faint_fall.asm" +INCLUDE "audio/sfx/battle_09.asm" +INCLUDE "audio/sfx/pound.asm" +INCLUDE "audio/sfx/battle_0b.asm" +INCLUDE "audio/sfx/battle_0c.asm" +INCLUDE "audio/sfx/battle_0d.asm" +INCLUDE "audio/sfx/battle_0e.asm" +INCLUDE "audio/sfx/battle_0f.asm" +INCLUDE "audio/sfx/damage.asm" +INCLUDE "audio/sfx/not_very_effective.asm" +INCLUDE "audio/sfx/battle_12.asm" +INCLUDE "audio/sfx/battle_13.asm" +INCLUDE "audio/sfx/battle_14.asm" +INCLUDE "audio/sfx/vine_whip.asm" +INCLUDE "audio/sfx/battle_16.asm" +INCLUDE "audio/sfx/battle_17.asm" +INCLUDE "audio/sfx/battle_18.asm" +INCLUDE "audio/sfx/battle_19.asm" +INCLUDE "audio/sfx/super_effective.asm" +INCLUDE "audio/sfx/battle_1b.asm" +INCLUDE "audio/sfx/battle_1c.asm" +INCLUDE "audio/sfx/doubleslap.asm" +INCLUDE "audio/sfx/battle_1e.asm" +INCLUDE "audio/sfx/horn_drill.asm" +INCLUDE "audio/sfx/battle_20.asm" +INCLUDE "audio/sfx/battle_21.asm" +INCLUDE "audio/sfx/battle_22.asm" +INCLUDE "audio/sfx/battle_23.asm" +INCLUDE "audio/sfx/battle_24.asm" +INCLUDE "audio/sfx/battle_25.asm" +INCLUDE "audio/sfx/battle_26.asm" +INCLUDE "audio/sfx/battle_27.asm" +INCLUDE "audio/sfx/battle_28.asm" +INCLUDE "audio/sfx/battle_29.asm" +INCLUDE "audio/sfx/battle_2a.asm" +INCLUDE "audio/sfx/battle_2b.asm" +INCLUDE "audio/sfx/battle_2c.asm" +INCLUDE "audio/sfx/psybeam.asm" +INCLUDE "audio/sfx/battle_2e.asm" +INCLUDE "audio/sfx/battle_2f.asm" +INCLUDE "audio/sfx/psychic_m.asm" +INCLUDE "audio/sfx/battle_31.asm" +INCLUDE "audio/sfx/battle_32.asm" +INCLUDE "audio/sfx/battle_33.asm" +INCLUDE "audio/sfx/battle_34.asm" +INCLUDE "audio/sfx/battle_35.asm" +INCLUDE "audio/sfx/battle_36.asm" INCLUDE "audio/sfx/sfx_08_unused.asm" -INCLUDE "audio/sfx/sfx_08_1d.asm" -INCLUDE "audio/sfx/sfx_08_37.asm" -INCLUDE "audio/sfx/sfx_08_38.asm" -INCLUDE "audio/sfx/sfx_08_25.asm" -INCLUDE "audio/sfx/sfx_08_39.asm" -INCLUDE "audio/sfx/sfx_08_17.asm" -INCLUDE "audio/sfx/sfx_08_23.asm" -INCLUDE "audio/sfx/sfx_08_24.asm" -INCLUDE "audio/sfx/sfx_08_14.asm" -INCLUDE "audio/sfx/sfx_08_22.asm" -INCLUDE "audio/sfx/sfx_08_1a.asm" -INCLUDE "audio/sfx/sfx_08_1b.asm" -INCLUDE "audio/sfx/sfx_08_19.asm" -INCLUDE "audio/sfx/sfx_08_1f.asm" -INCLUDE "audio/sfx/sfx_08_20.asm" -INCLUDE "audio/sfx/sfx_08_16.asm" -INCLUDE "audio/sfx/sfx_08_21.asm" -INCLUDE "audio/sfx/sfx_08_15.asm" -INCLUDE "audio/sfx/sfx_08_1e.asm" -INCLUDE "audio/sfx/sfx_08_1c.asm" -INCLUDE "audio/sfx/sfx_08_18.asm" -INCLUDE "audio/sfx/sfx_08_2d.asm" -INCLUDE "audio/sfx/sfx_08_2a.asm" -INCLUDE "audio/sfx/sfx_08_2f.asm" -INCLUDE "audio/sfx/sfx_08_26.asm" -INCLUDE "audio/sfx/sfx_08_27.asm" -INCLUDE "audio/sfx/sfx_08_28.asm" -INCLUDE "audio/sfx/sfx_08_32.asm" -INCLUDE "audio/sfx/sfx_08_29.asm" -INCLUDE "audio/sfx/sfx_08_2b.asm" -INCLUDE "audio/sfx/sfx_08_30.asm" -INCLUDE "audio/sfx/sfx_08_2e.asm" -INCLUDE "audio/sfx/sfx_08_31.asm" -INCLUDE "audio/sfx/sfx_08_2c.asm" -INCLUDE "audio/sfx/sfx_08_33.asm" -INCLUDE "audio/sfx/sfx_08_34.asm" -INCLUDE "audio/sfx/sfx_08_35.asm" -INCLUDE "audio/sfx/sfx_08_36.asm" +INCLUDE "audio/sfx/cry09_2.asm" +INCLUDE "audio/sfx/cry23_2.asm" +INCLUDE "audio/sfx/cry24_2.asm" +INCLUDE "audio/sfx/cry11_2.asm" +INCLUDE "audio/sfx/cry25_2.asm" +INCLUDE "audio/sfx/cry03_2.asm" +INCLUDE "audio/sfx/cry0f_2.asm" +INCLUDE "audio/sfx/cry10_2.asm" +INCLUDE "audio/sfx/cry00_2.asm" +INCLUDE "audio/sfx/cry0e_2.asm" +INCLUDE "audio/sfx/cry06_2.asm" +INCLUDE "audio/sfx/cry07_2.asm" +INCLUDE "audio/sfx/cry05_2.asm" +INCLUDE "audio/sfx/cry0b_2.asm" +INCLUDE "audio/sfx/cry0c_2.asm" +INCLUDE "audio/sfx/cry02_2.asm" +INCLUDE "audio/sfx/cry0d_2.asm" +INCLUDE "audio/sfx/cry01_2.asm" +INCLUDE "audio/sfx/cry0a_2.asm" +INCLUDE "audio/sfx/cry08_2.asm" +INCLUDE "audio/sfx/cry04_2.asm" +INCLUDE "audio/sfx/cry19_2.asm" +INCLUDE "audio/sfx/cry16_2.asm" +INCLUDE "audio/sfx/cry1b_2.asm" +INCLUDE "audio/sfx/cry12_2.asm" +INCLUDE "audio/sfx/cry13_2.asm" +INCLUDE "audio/sfx/cry14_2.asm" +INCLUDE "audio/sfx/cry1e_2.asm" +INCLUDE "audio/sfx/cry15_2.asm" +INCLUDE "audio/sfx/cry17_2.asm" +INCLUDE "audio/sfx/cry1c_2.asm" +INCLUDE "audio/sfx/cry1a_2.asm" +INCLUDE "audio/sfx/cry1d_2.asm" +INCLUDE "audio/sfx/cry18_2.asm" +INCLUDE "audio/sfx/cry1f_2.asm" +INCLUDE "audio/sfx/cry20_2.asm" +INCLUDE "audio/sfx/cry21_2.asm" +INCLUDE "audio/sfx/cry22_2.asm" SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3] -INCLUDE "audio/sfx/sfx_1f_01.asm" -INCLUDE "audio/sfx/sfx_1f_02.asm" -INCLUDE "audio/sfx/sfx_1f_03.asm" -INCLUDE "audio/sfx/sfx_1f_04.asm" -INCLUDE "audio/sfx/sfx_1f_05.asm" -INCLUDE "audio/sfx/sfx_1f_06.asm" -INCLUDE "audio/sfx/sfx_1f_07.asm" -INCLUDE "audio/sfx/sfx_1f_08.asm" -INCLUDE "audio/sfx/sfx_1f_09.asm" -INCLUDE "audio/sfx/sfx_1f_0a.asm" -INCLUDE "audio/sfx/sfx_1f_0b.asm" -INCLUDE "audio/sfx/sfx_1f_0c.asm" -INCLUDE "audio/sfx/sfx_1f_0d.asm" -INCLUDE "audio/sfx/sfx_1f_0e.asm" -INCLUDE "audio/sfx/sfx_1f_0f.asm" -INCLUDE "audio/sfx/sfx_1f_10.asm" -INCLUDE "audio/sfx/sfx_1f_11.asm" -INCLUDE "audio/sfx/sfx_1f_12.asm" -INCLUDE "audio/sfx/sfx_1f_13.asm" +INCLUDE "audio/sfx/snare1_3.asm" +INCLUDE "audio/sfx/snare2_3.asm" +INCLUDE "audio/sfx/snare3_3.asm" +INCLUDE "audio/sfx/snare4_3.asm" +INCLUDE "audio/sfx/snare5_3.asm" +INCLUDE "audio/sfx/triangle1_3.asm" +INCLUDE "audio/sfx/triangle2_3.asm" +INCLUDE "audio/sfx/snare6_3.asm" +INCLUDE "audio/sfx/snare7_3.asm" +INCLUDE "audio/sfx/snare8_3.asm" +INCLUDE "audio/sfx/snare9_3.asm" +INCLUDE "audio/sfx/cymbal1_3.asm" +INCLUDE "audio/sfx/cymbal2_3.asm" +INCLUDE "audio/sfx/cymbal3_3.asm" +INCLUDE "audio/sfx/muted_snare1_3.asm" +INCLUDE "audio/sfx/triangle3_3.asm" +INCLUDE "audio/sfx/muted_snare2_3.asm" +INCLUDE "audio/sfx/muted_snare3_3.asm" +INCLUDE "audio/sfx/muted_snare4_3.asm" Music1f_WavePointers: INCLUDE "audio/wave_instruments.asm" -INCLUDE "audio/sfx/sfx_1f_3f.asm" -INCLUDE "audio/sfx/sfx_1f_56.asm" -INCLUDE "audio/sfx/sfx_1f_57.asm" -INCLUDE "audio/sfx/sfx_1f_58.asm" -INCLUDE "audio/sfx/sfx_1f_3c.asm" -INCLUDE "audio/sfx/sfx_1f_59.asm" -INCLUDE "audio/sfx/sfx_1f_5a.asm" -INCLUDE "audio/sfx/sfx_1f_5b.asm" -INCLUDE "audio/sfx/sfx_1f_5c.asm" -INCLUDE "audio/sfx/sfx_1f_40.asm" -INCLUDE "audio/sfx/sfx_1f_5d.asm" -INCLUDE "audio/sfx/sfx_1f_3d.asm" -INCLUDE "audio/sfx/sfx_1f_43.asm" -INCLUDE "audio/sfx/sfx_1f_3e.asm" -INCLUDE "audio/sfx/sfx_1f_44.asm" -INCLUDE "audio/sfx/sfx_1f_45.asm" -INCLUDE "audio/sfx/sfx_1f_46.asm" -INCLUDE "audio/sfx/sfx_1f_47.asm" -INCLUDE "audio/sfx/sfx_1f_48.asm" -INCLUDE "audio/sfx/sfx_1f_49.asm" -INCLUDE "audio/sfx/sfx_1f_4a.asm" -INCLUDE "audio/sfx/sfx_1f_4b.asm" -INCLUDE "audio/sfx/sfx_1f_4c.asm" -INCLUDE "audio/sfx/sfx_1f_4d.asm" -INCLUDE "audio/sfx/sfx_1f_4e.asm" -INCLUDE "audio/sfx/sfx_1f_4f.asm" -INCLUDE "audio/sfx/sfx_1f_50.asm" -INCLUDE "audio/sfx/sfx_1f_51.asm" -INCLUDE "audio/sfx/sfx_1f_52.asm" -INCLUDE "audio/sfx/sfx_1f_53.asm" -INCLUDE "audio/sfx/sfx_1f_54.asm" -INCLUDE "audio/sfx/sfx_1f_55.asm" -INCLUDE "audio/sfx/sfx_1f_5e.asm" -INCLUDE "audio/sfx/sfx_1f_5f.asm" -INCLUDE "audio/sfx/sfx_1f_60.asm" -INCLUDE "audio/sfx/sfx_1f_61.asm" -INCLUDE "audio/sfx/sfx_1f_62.asm" -INCLUDE "audio/sfx/sfx_1f_63.asm" -INCLUDE "audio/sfx/sfx_1f_64.asm" -INCLUDE "audio/sfx/sfx_1f_65.asm" -INCLUDE "audio/sfx/sfx_1f_66.asm" -INCLUDE "audio/sfx/sfx_1f_67.asm" +INCLUDE "audio/sfx/start_menu_3.asm" +INCLUDE "audio/sfx/cut_3.asm" +INCLUDE "audio/sfx/go_inside_3.asm" +INCLUDE "audio/sfx/swap_3.asm" +INCLUDE "audio/sfx/tink_3.asm" +INCLUDE "audio/sfx/59_3.asm" +INCLUDE "audio/sfx/purchase_3.asm" +INCLUDE "audio/sfx/collision_3.asm" +INCLUDE "audio/sfx/go_outside_3.asm" +INCLUDE "audio/sfx/press_ab_3.asm" +INCLUDE "audio/sfx/save_3.asm" +INCLUDE "audio/sfx/heal_hp_3.asm" +INCLUDE "audio/sfx/poisoned_3.asm" +INCLUDE "audio/sfx/heal_ailment_3.asm" +INCLUDE "audio/sfx/trade_machine_3.asm" +INCLUDE "audio/sfx/turn_on_pc_3.asm" +INCLUDE "audio/sfx/turn_off_pc_3.asm" +INCLUDE "audio/sfx/enter_pc_3.asm" +INCLUDE "audio/sfx/shrink_3.asm" +INCLUDE "audio/sfx/switch_3.asm" +INCLUDE "audio/sfx/healing_machine_3.asm" +INCLUDE "audio/sfx/teleport_exit1_3.asm" +INCLUDE "audio/sfx/teleport_enter1_3.asm" +INCLUDE "audio/sfx/teleport_exit2_3.asm" +INCLUDE "audio/sfx/ledge_3.asm" +INCLUDE "audio/sfx/teleport_enter2_3.asm" +INCLUDE "audio/sfx/fly_3.asm" +INCLUDE "audio/sfx/denied_3.asm" +INCLUDE "audio/sfx/arrow_tiles_3.asm" +INCLUDE "audio/sfx/push_boulder_3.asm" +INCLUDE "audio/sfx/ss_anne_horn_3.asm" +INCLUDE "audio/sfx/withdraw_deposit_3.asm" +INCLUDE "audio/sfx/intro_lunge.asm" +INCLUDE "audio/sfx/intro_hip.asm" +INCLUDE "audio/sfx/intro_hop.asm" +INCLUDE "audio/sfx/intro_raise.asm" +INCLUDE "audio/sfx/intro_crash.asm" +INCLUDE "audio/sfx/intro_whoosh.asm" +INCLUDE "audio/sfx/slots_stop_wheel.asm" +INCLUDE "audio/sfx/slots_reward.asm" +INCLUDE "audio/sfx/slots_new_spin.asm" +INCLUDE "audio/sfx/shooting_star.asm" INCLUDE "audio/sfx/sfx_1f_unused.asm" -INCLUDE "audio/sfx/sfx_1f_1d.asm" -INCLUDE "audio/sfx/sfx_1f_37.asm" -INCLUDE "audio/sfx/sfx_1f_38.asm" -INCLUDE "audio/sfx/sfx_1f_25.asm" -INCLUDE "audio/sfx/sfx_1f_39.asm" -INCLUDE "audio/sfx/sfx_1f_17.asm" -INCLUDE "audio/sfx/sfx_1f_23.asm" -INCLUDE "audio/sfx/sfx_1f_24.asm" -INCLUDE "audio/sfx/sfx_1f_14.asm" -INCLUDE "audio/sfx/sfx_1f_22.asm" -INCLUDE "audio/sfx/sfx_1f_1a.asm" -INCLUDE "audio/sfx/sfx_1f_1b.asm" -INCLUDE "audio/sfx/sfx_1f_19.asm" -INCLUDE "audio/sfx/sfx_1f_1f.asm" -INCLUDE "audio/sfx/sfx_1f_20.asm" -INCLUDE "audio/sfx/sfx_1f_16.asm" -INCLUDE "audio/sfx/sfx_1f_21.asm" -INCLUDE "audio/sfx/sfx_1f_15.asm" -INCLUDE "audio/sfx/sfx_1f_1e.asm" -INCLUDE "audio/sfx/sfx_1f_1c.asm" -INCLUDE "audio/sfx/sfx_1f_18.asm" -INCLUDE "audio/sfx/sfx_1f_2d.asm" -INCLUDE "audio/sfx/sfx_1f_2a.asm" -INCLUDE "audio/sfx/sfx_1f_2f.asm" -INCLUDE "audio/sfx/sfx_1f_26.asm" -INCLUDE "audio/sfx/sfx_1f_27.asm" -INCLUDE "audio/sfx/sfx_1f_28.asm" -INCLUDE "audio/sfx/sfx_1f_32.asm" -INCLUDE "audio/sfx/sfx_1f_29.asm" -INCLUDE "audio/sfx/sfx_1f_2b.asm" -INCLUDE "audio/sfx/sfx_1f_30.asm" -INCLUDE "audio/sfx/sfx_1f_2e.asm" -INCLUDE "audio/sfx/sfx_1f_31.asm" -INCLUDE "audio/sfx/sfx_1f_2c.asm" -INCLUDE "audio/sfx/sfx_1f_33.asm" -INCLUDE "audio/sfx/sfx_1f_34.asm" -INCLUDE "audio/sfx/sfx_1f_35.asm" -INCLUDE "audio/sfx/sfx_1f_36.asm" +INCLUDE "audio/sfx/cry09_3.asm" +INCLUDE "audio/sfx/cry23_3.asm" +INCLUDE "audio/sfx/cry24_3.asm" +INCLUDE "audio/sfx/cry11_3.asm" +INCLUDE "audio/sfx/cry25_3.asm" +INCLUDE "audio/sfx/cry03_3.asm" +INCLUDE "audio/sfx/cry0f_3.asm" +INCLUDE "audio/sfx/cry10_3.asm" +INCLUDE "audio/sfx/cry00_3.asm" +INCLUDE "audio/sfx/cry0e_3.asm" +INCLUDE "audio/sfx/cry06_3.asm" +INCLUDE "audio/sfx/cry07_3.asm" +INCLUDE "audio/sfx/cry05_3.asm" +INCLUDE "audio/sfx/cry0b_3.asm" +INCLUDE "audio/sfx/cry0c_3.asm" +INCLUDE "audio/sfx/cry02_3.asm" +INCLUDE "audio/sfx/cry0d_3.asm" +INCLUDE "audio/sfx/cry01_3.asm" +INCLUDE "audio/sfx/cry0a_3.asm" +INCLUDE "audio/sfx/cry08_3.asm" +INCLUDE "audio/sfx/cry04_3.asm" +INCLUDE "audio/sfx/cry19_3.asm" +INCLUDE "audio/sfx/cry16_3.asm" +INCLUDE "audio/sfx/cry1b_3.asm" +INCLUDE "audio/sfx/cry12_3.asm" +INCLUDE "audio/sfx/cry13_3.asm" +INCLUDE "audio/sfx/cry14_3.asm" +INCLUDE "audio/sfx/cry1e_3.asm" +INCLUDE "audio/sfx/cry15_3.asm" +INCLUDE "audio/sfx/cry17_3.asm" +INCLUDE "audio/sfx/cry1c_3.asm" +INCLUDE "audio/sfx/cry1a_3.asm" +INCLUDE "audio/sfx/cry1d_3.asm" +INCLUDE "audio/sfx/cry18_3.asm" +INCLUDE "audio/sfx/cry1f_3.asm" +INCLUDE "audio/sfx/cry20_3.asm" +INCLUDE "audio/sfx/cry21_3.asm" +INCLUDE "audio/sfx/cry22_3.asm" @@ -585,13 +585,13 @@ PlayPokedexRatingSfx:: ; 7d13b (1f:513b) jp PlayDefaultMusic PokedexRatingSfxPointers: ; 7d162 (1f:5162) - db SFX_DENIED, BANK(SFX_1f_51) - db SFX_POKEDEX_RATING, BANK(SFX_02_41) - db SFX_GET_ITEM_1, BANK(SFX_02_3a) - db SFX_CAUGHT_MON, BANK(SFX_08_46) - db SFX_LEVEL_UP, BANK(SFX_08_3a) - db SFX_GET_KEY_ITEM, BANK(SFX_02_42) - db SFX_GET_ITEM_2, BANK(SFX_02_3b) + db SFX_DENIED, BANK(SFX_Denied_3) + db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1) + db SFX_GET_ITEM_1, BANK(SFX_Get_Item1_1) + db SFX_CAUGHT_MON, BANK(SFX_Caught_Mon) + db SFX_LEVEL_UP, BANK(SFX_Level_Up) + db SFX_GET_KEY_ITEM, BANK(SFX_Get_Key_Item_1) + db SFX_GET_ITEM_2, BANK(SFX_Get_Item2_1) OwnedMonValues: ; 7d170 (1f:5170) db 10, 40, 60, 90, 120, 150, $ff @@ -612,13 +612,13 @@ INCLUDE "audio/music/indigoplateau.asm" INCLUDE "audio/music/pallettown.asm" INCLUDE "audio/music/unusedsong.asm" INCLUDE "audio/music/cities1.asm" -INCLUDE "audio/sfx/sfx_02_3a.asm" +INCLUDE "audio/sfx/get_item1_1.asm" INCLUDE "audio/music/museumguy.asm" INCLUDE "audio/music/meetprofoak.asm" INCLUDE "audio/music/meetrival.asm" -INCLUDE "audio/sfx/sfx_02_41.asm" -INCLUDE "audio/sfx/sfx_02_3b.asm" -INCLUDE "audio/sfx/sfx_02_42.asm" +INCLUDE "audio/sfx/pokedex_rating_1.asm" +INCLUDE "audio/sfx/get_item2_1.asm" +INCLUDE "audio/sfx/get_key_item_1.asm" INCLUDE "audio/music/ssanne.asm" INCLUDE "audio/music/cities2.asm" INCLUDE "audio/music/celadon.asm" @@ -638,9 +638,9 @@ INCLUDE "audio/music/gymleaderbattle.asm" INCLUDE "audio/music/trainerbattle.asm" INCLUDE "audio/music/wildbattle.asm" INCLUDE "audio/music/finalbattle.asm" -INCLUDE "audio/sfx/sfx_08_3a.asm" -INCLUDE "audio/sfx/sfx_08_3b.asm" -INCLUDE "audio/sfx/sfx_08_46.asm" +INCLUDE "audio/sfx/level_up.asm" +INCLUDE "audio/sfx/get_item2_2.asm" +INCLUDE "audio/sfx/caught_mon.asm" INCLUDE "audio/music/defeatedtrainer.asm" INCLUDE "audio/music/defeatedwildmon.asm" INCLUDE "audio/music/defeatedgymleader.asm" @@ -652,13 +652,13 @@ INCLUDE "audio/music/bikeriding.asm" INCLUDE "audio/music/dungeon1.asm" INCLUDE "audio/music/gamecorner.asm" INCLUDE "audio/music/titlescreen.asm" -INCLUDE "audio/sfx/sfx_1f_3a.asm" +INCLUDE "audio/sfx/get_item1_3.asm" INCLUDE "audio/music/dungeon2.asm" INCLUDE "audio/music/dungeon3.asm" INCLUDE "audio/music/cinnabarmansion.asm" -INCLUDE "audio/sfx/sfx_1f_41.asm" -INCLUDE "audio/sfx/sfx_1f_3b.asm" -INCLUDE "audio/sfx/sfx_1f_42.asm" +INCLUDE "audio/sfx/pokedex_rating_3.asm" +INCLUDE "audio/sfx/get_item2_3.asm" +INCLUDE "audio/sfx/get_key_item_3.asm" INCLUDE "audio/music/oakslab.asm" INCLUDE "audio/music/pokemontower.asm" INCLUDE "audio/music/silphco.asm" diff --git a/audio/headers/sfxheaders02.asm b/audio/headers/sfxheaders02.asm old mode 100755 new mode 100644 index b5cff17a..86fca297 --- a/audio/headers/sfxheaders02.asm +++ b/audio/headers/sfxheaders02.asm @@ -1,562 +1,562 @@ SFX_Headers_02:: db $ff, $ff, $ff ; padding -SFX_02_01:: ; 8003 (2:4003) +SFX_Snare1_1:: ; 8003 (2:4003) db CH7 - dw SFX_02_01_Ch1 + dw SFX_Snare1_1_Ch1 -SFX_02_02:: ; 8006 (2:4006) +SFX_Snare2_1:: ; 8006 (2:4006) db CH7 - dw SFX_02_02_Ch1 + dw SFX_Snare2_1_Ch1 -SFX_02_03:: ; 8009 (2:4009) +SFX_Snare3_1:: ; 8009 (2:4009) db CH7 - dw SFX_02_03_Ch1 + dw SFX_Snare3_1_Ch1 -SFX_02_04:: ; 800c (2:400c) +SFX_Snare4_1:: ; 800c (2:400c) db CH7 - dw SFX_02_04_Ch1 + dw SFX_Snare4_1_Ch1 -SFX_02_05:: ; 800f (2:400f) +SFX_Snare5_1:: ; 800f (2:400f) db CH7 - dw SFX_02_05_Ch1 + dw SFX_Snare5_1_Ch1 -SFX_02_06:: ; 8012 (2:4012) +SFX_Triangle1_1:: ; 8012 (2:4012) db CH7 - dw SFX_02_06_Ch1 + dw SFX_Triangle1_1_Ch1 -SFX_02_07:: ; 8015 (2:4015) +SFX_Triangle2_1:: ; 8015 (2:4015) db CH7 - dw SFX_02_07_Ch1 + dw SFX_Triangle2_1_Ch1 -SFX_02_08:: ; 8018 (2:4018) +SFX_Snare6_1:: ; 8018 (2:4018) db CH7 - dw SFX_02_08_Ch1 + dw SFX_Snare6_1_Ch1 -SFX_02_09:: ; 801b (2:401b) +SFX_Snare7_1:: ; 801b (2:401b) db CH7 - dw SFX_02_09_Ch1 + dw SFX_Snare7_1_Ch1 -SFX_02_0a:: ; 801e (2:401e) +SFX_Snare8_1:: ; 801e (2:401e) db CH7 - dw SFX_02_0a_Ch1 + dw SFX_Snare8_1_Ch1 -SFX_02_0b:: ; 8021 (2:4021) +SFX_Snare9_1:: ; 8021 (2:4021) db CH7 - dw SFX_02_0b_Ch1 + dw SFX_Snare9_1_Ch1 -SFX_02_0c:: ; 8024 (2:4024) +SFX_Cymbal1_1:: ; 8024 (2:4024) db CH7 - dw SFX_02_0c_Ch1 + dw SFX_Cymbal1_1_Ch1 -SFX_02_0d:: ; 8027 (2:4027) +SFX_Cymbal2_1:: ; 8027 (2:4027) db CH7 - dw SFX_02_0d_Ch1 + dw SFX_Cymbal2_1_Ch1 -SFX_02_0e:: ; 802a (2:402a) +SFX_Cymbal3_1:: ; 802a (2:402a) db CH7 - dw SFX_02_0e_Ch1 + dw SFX_Cymbal3_1_Ch1 -SFX_02_0f:: ; 802d (2:402d) +SFX_Muted_Snare1_1:: ; 802d (2:402d) db CH7 - dw SFX_02_0f_Ch1 + dw SFX_Muted_Snare1_1_Ch1 -SFX_02_10:: ; 8030 (2:4030) +SFX_Triangle3_1:: ; 8030 (2:4030) db CH7 - dw SFX_02_10_Ch1 + dw SFX_Triangle3_1_Ch1 -SFX_02_11:: ; 8033 (2:4033) +SFX_Muted_Snare2_1:: ; 8033 (2:4033) db CH7 - dw SFX_02_11_Ch1 + dw SFX_Muted_Snare2_1_Ch1 -SFX_02_12:: ; 8036 (2:4036) +SFX_Muted_Snare3_1:: ; 8036 (2:4036) db CH7 - dw SFX_02_12_Ch1 + dw SFX_Muted_Snare3_1_Ch1 -SFX_02_13:: ; 8039 (2:4039) +SFX_Muted_Snare4_1:: ; 8039 (2:4039) db CH7 - dw SFX_02_13_Ch1 + dw SFX_Muted_Snare4_1_Ch1 -SFX_02_14:: ; 803c (2:403c) +SFX_Cry00_1:: ; 803c (2:403c) db ( $80 | CH4 ) - dw SFX_02_14_Ch1 + dw SFX_Cry00_1_Ch1 db CH5 - dw SFX_02_14_Ch2 + dw SFX_Cry00_1_Ch2 db CH7 - dw SFX_02_14_Ch3 + dw SFX_Cry00_1_Ch3 -SFX_02_15:: ; 8045 (2:4045) +SFX_Cry01_1:: ; 8045 (2:4045) db ( $80 | CH4 ) - dw SFX_02_15_Ch1 + dw SFX_Cry01_1_Ch1 db CH5 - dw SFX_02_15_Ch2 + dw SFX_Cry01_1_Ch2 db CH7 - dw SFX_02_15_Ch3 + dw SFX_Cry01_1_Ch3 -SFX_02_16:: ; 804e (2:404e) +SFX_Cry02_1:: ; 804e (2:404e) db ( $80 | CH4 ) - dw SFX_02_16_Ch1 + dw SFX_Cry02_1_Ch1 db CH5 - dw SFX_02_16_Ch2 + dw SFX_Cry02_1_Ch2 db CH7 - dw SFX_02_16_Ch3 + dw SFX_Cry02_1_Ch3 -SFX_02_17:: ; 8057 (2:4057) +SFX_Cry03_1:: ; 8057 (2:4057) db ( $80 | CH4 ) - dw SFX_02_17_Ch1 + dw SFX_Cry03_1_Ch1 db CH5 - dw SFX_02_17_Ch2 + dw SFX_Cry03_1_Ch2 db CH7 - dw SFX_02_17_Ch3 + dw SFX_Cry03_1_Ch3 -SFX_02_18:: ; 8060 (2:4060) +SFX_Cry04_1:: ; 8060 (2:4060) db ( $80 | CH4 ) - dw SFX_02_18_Ch1 + dw SFX_Cry04_1_Ch1 db CH5 - dw SFX_02_18_Ch2 + dw SFX_Cry04_1_Ch2 db CH7 - dw SFX_02_18_Ch3 + dw SFX_Cry04_1_Ch3 -SFX_02_19:: ; 8069 (2:4069) +SFX_Cry05_1:: ; 8069 (2:4069) db ( $80 | CH4 ) - dw SFX_02_19_Ch1 + dw SFX_Cry05_1_Ch1 db CH5 - dw SFX_02_19_Ch2 + dw SFX_Cry05_1_Ch2 db CH7 - dw SFX_02_19_Ch3 + dw SFX_Cry05_1_Ch3 -SFX_02_1a:: ; 8072 (2:4072) +SFX_Cry06_1:: ; 8072 (2:4072) db ( $80 | CH4 ) - dw SFX_02_1a_Ch1 + dw SFX_Cry06_1_Ch1 db CH5 - dw SFX_02_1a_Ch2 + dw SFX_Cry06_1_Ch2 db CH7 - dw SFX_02_1a_Ch3 + dw SFX_Cry06_1_Ch3 -SFX_02_1b:: ; 807b (2:407b) +SFX_Cry07_1:: ; 807b (2:407b) db ( $80 | CH4 ) - dw SFX_02_1b_Ch1 + dw SFX_Cry07_1_Ch1 db CH5 - dw SFX_02_1b_Ch2 + dw SFX_Cry07_1_Ch2 db CH7 - dw SFX_02_1b_Ch3 + dw SFX_Cry07_1_Ch3 -SFX_02_1c:: ; 8084 (2:4084) +SFX_Cry08_1:: ; 8084 (2:4084) db ( $80 | CH4 ) - dw SFX_02_1c_Ch1 + dw SFX_Cry08_1_Ch1 db CH5 - dw SFX_02_1c_Ch2 + dw SFX_Cry08_1_Ch2 db CH7 - dw SFX_02_1c_Ch3 + dw SFX_Cry08_1_Ch3 -SFX_02_1d:: ; 808d (2:408d) +SFX_Cry09_1:: ; 808d (2:408d) db ( $80 | CH4 ) - dw SFX_02_1d_Ch1 + dw SFX_Cry09_1_Ch1 db CH5 - dw SFX_02_1d_Ch2 + dw SFX_Cry09_1_Ch2 db CH7 - dw SFX_02_1d_Ch3 + dw SFX_Cry09_1_Ch3 -SFX_02_1e:: ; 8096 (2:4096) +SFX_Cry0A_1:: ; 8096 (2:4096) db ( $80 | CH4 ) - dw SFX_02_1e_Ch1 + dw SFX_Cry0A_1_Ch1 db CH5 - dw SFX_02_1e_Ch2 + dw SFX_Cry0A_1_Ch2 db CH7 - dw SFX_02_1e_Ch3 + dw SFX_Cry0A_1_Ch3 -SFX_02_1f:: ; 809f (2:409f) +SFX_Cry0B_1:: ; 809f (2:409f) db ( $80 | CH4 ) - dw SFX_02_1f_Ch1 + dw SFX_Cry0B_1_Ch1 db CH5 - dw SFX_02_1f_Ch2 + dw SFX_Cry0B_1_Ch2 db CH7 - dw SFX_02_1f_Ch3 + dw SFX_Cry0B_1_Ch3 -SFX_02_20:: ; 80a8 (2:40a8) +SFX_Cry0C_1:: ; 80a8 (2:40a8) db ( $80 | CH4 ) - dw SFX_02_20_Ch1 + dw SFX_Cry0C_1_Ch1 db CH5 - dw SFX_02_20_Ch2 + dw SFX_Cry0C_1_Ch2 db CH7 - dw SFX_02_20_Ch3 + dw SFX_Cry0C_1_Ch3 -SFX_02_21:: ; 80b1 (2:40b1) +SFX_Cry0D_1:: ; 80b1 (2:40b1) db ( $80 | CH4 ) - dw SFX_02_21_Ch1 + dw SFX_Cry0D_1_Ch1 db CH5 - dw SFX_02_21_Ch2 + dw SFX_Cry0D_1_Ch2 db CH7 - dw SFX_02_21_Ch3 + dw SFX_Cry0D_1_Ch3 -SFX_02_22:: ; 80ba (2:40ba) +SFX_Cry0E_1:: ; 80ba (2:40ba) db ( $80 | CH4 ) - dw SFX_02_22_Ch1 + dw SFX_Cry0E_1_Ch1 db CH5 - dw SFX_02_22_Ch2 + dw SFX_Cry0E_1_Ch2 db CH7 - dw SFX_02_22_Ch3 + dw SFX_Cry0E_1_Ch3 -SFX_02_23:: ; 80c3 (2:40c3) +SFX_Cry0F_1:: ; 80c3 (2:40c3) db ( $80 | CH4 ) - dw SFX_02_23_Ch1 + dw SFX_Cry0F_1_Ch1 db CH5 - dw SFX_02_23_Ch2 + dw SFX_Cry0F_1_Ch2 db CH7 - dw SFX_02_23_Ch3 + dw SFX_Cry0F_1_Ch3 -SFX_02_24:: ; 80cc (2:40cc) +SFX_Cry10_1:: ; 80cc (2:40cc) db ( $80 | CH4 ) - dw SFX_02_24_Ch1 + dw SFX_Cry10_1_Ch1 db CH5 - dw SFX_02_24_Ch2 + dw SFX_Cry10_1_Ch2 db CH7 - dw SFX_02_24_Ch3 + dw SFX_Cry10_1_Ch3 -SFX_02_25:: ; 80d5 (2:40d5) +SFX_Cry11_1:: ; 80d5 (2:40d5) db ( $80 | CH4 ) - dw SFX_02_25_Ch1 + dw SFX_Cry11_1_Ch1 db CH5 - dw SFX_02_25_Ch2 + dw SFX_Cry11_1_Ch2 db CH7 - dw SFX_02_25_Ch3 + dw SFX_Cry11_1_Ch3 -SFX_02_26:: ; 80de (2:40de) +SFX_Cry12_1:: ; 80de (2:40de) db ( $80 | CH4 ) - dw SFX_02_26_Ch1 + dw SFX_Cry12_1_Ch1 db CH5 - dw SFX_02_26_Ch2 + dw SFX_Cry12_1_Ch2 db CH7 - dw SFX_02_26_Ch3 + dw SFX_Cry12_1_Ch3 -SFX_02_27:: ; 80e7 (2:40e7) +SFX_Cry13_1:: ; 80e7 (2:40e7) db ( $80 | CH4 ) - dw SFX_02_27_Ch1 + dw SFX_Cry13_1_Ch1 db CH5 - dw SFX_02_27_Ch2 + dw SFX_Cry13_1_Ch2 db CH7 - dw SFX_02_27_Ch3 + dw SFX_Cry13_1_Ch3 -SFX_02_28:: ; 80f0 (2:40f0) +SFX_Cry14_1:: ; 80f0 (2:40f0) db ( $80 | CH4 ) - dw SFX_02_28_Ch1 + dw SFX_Cry14_1_Ch1 db CH5 - dw SFX_02_28_Ch2 + dw SFX_Cry14_1_Ch2 db CH7 - dw SFX_02_28_Ch3 + dw SFX_Cry14_1_Ch3 -SFX_02_29:: ; 80f9 (2:40f9) +SFX_Cry15_1:: ; 80f9 (2:40f9) db ( $80 | CH4 ) - dw SFX_02_29_Ch1 + dw SFX_Cry15_1_Ch1 db CH5 - dw SFX_02_29_Ch2 + dw SFX_Cry15_1_Ch2 db CH7 - dw SFX_02_29_Ch3 + dw SFX_Cry15_1_Ch3 -SFX_02_2a:: ; 8102 (2:4102) +SFX_Cry16_1:: ; 8102 (2:4102) db ( $80 | CH4 ) - dw SFX_02_2a_Ch1 + dw SFX_Cry16_1_Ch1 db CH5 - dw SFX_02_2a_Ch2 + dw SFX_Cry16_1_Ch2 db CH7 - dw SFX_02_2a_Ch3 + dw SFX_Cry16_1_Ch3 -SFX_02_2b:: ; 810b (2:410b) +SFX_Cry17_1:: ; 810b (2:410b) db ( $80 | CH4 ) - dw SFX_02_2b_Ch1 + dw SFX_Cry17_1_Ch1 db CH5 - dw SFX_02_2b_Ch2 + dw SFX_Cry17_1_Ch2 db CH7 - dw SFX_02_2b_Ch3 + dw SFX_Cry17_1_Ch3 -SFX_02_2c:: ; 8114 (2:4114) +SFX_Cry18_1:: ; 8114 (2:4114) db ( $80 | CH4 ) - dw SFX_02_2c_Ch1 + dw SFX_Cry18_1_Ch1 db CH5 - dw SFX_02_2c_Ch2 + dw SFX_Cry18_1_Ch2 db CH7 - dw SFX_02_2c_Ch3 + dw SFX_Cry18_1_Ch3 -SFX_02_2d:: ; 811d (2:411d) +SFX_Cry19_1:: ; 811d (2:411d) db ( $80 | CH4 ) - dw SFX_02_2d_Ch1 + dw SFX_Cry19_1_Ch1 db CH5 - dw SFX_02_2d_Ch2 + dw SFX_Cry19_1_Ch2 db CH7 - dw SFX_02_2d_Ch3 + dw SFX_Cry19_1_Ch3 -SFX_02_2e:: ; 8126 (2:4126) +SFX_Cry1A_1:: ; 8126 (2:4126) db ( $80 | CH4 ) - dw SFX_02_2e_Ch1 + dw SFX_Cry1A_1_Ch1 db CH5 - dw SFX_02_2e_Ch2 + dw SFX_Cry1A_1_Ch2 db CH7 - dw SFX_02_2e_Ch3 + dw SFX_Cry1A_1_Ch3 -SFX_02_2f:: ; 812f (2:412f) +SFX_Cry1B_1:: ; 812f (2:412f) db ( $80 | CH4 ) - dw SFX_02_2f_Ch1 + dw SFX_Cry1B_1_Ch1 db CH5 - dw SFX_02_2f_Ch2 + dw SFX_Cry1B_1_Ch2 db CH7 - dw SFX_02_2f_Ch3 + dw SFX_Cry1B_1_Ch3 -SFX_02_30:: ; 8138 (2:4138) +SFX_Cry1C_1:: ; 8138 (2:4138) db ( $80 | CH4 ) - dw SFX_02_30_Ch1 + dw SFX_Cry1C_1_Ch1 db CH5 - dw SFX_02_30_Ch2 + dw SFX_Cry1C_1_Ch2 db CH7 - dw SFX_02_30_Ch3 + dw SFX_Cry1C_1_Ch3 -SFX_02_31:: ; 8141 (2:4141) +SFX_Cry1D_1:: ; 8141 (2:4141) db ( $80 | CH4 ) - dw SFX_02_31_Ch1 + dw SFX_Cry1D_1_Ch1 db CH5 - dw SFX_02_31_Ch2 + dw SFX_Cry1D_1_Ch2 db CH7 - dw SFX_02_31_Ch3 + dw SFX_Cry1D_1_Ch3 -SFX_02_32:: ; 814a (2:414a) +SFX_Cry1E_1:: ; 814a (2:414a) db ( $80 | CH4 ) - dw SFX_02_32_Ch1 + dw SFX_Cry1E_1_Ch1 db CH5 - dw SFX_02_32_Ch2 + dw SFX_Cry1E_1_Ch2 db CH7 - dw SFX_02_32_Ch3 + dw SFX_Cry1E_1_Ch3 -SFX_02_33:: ; 8153 (2:4153) +SFX_Cry1F_1:: ; 8153 (2:4153) db ( $80 | CH4 ) - dw SFX_02_33_Ch1 + dw SFX_Cry1F_1_Ch1 db CH5 - dw SFX_02_33_Ch2 + dw SFX_Cry1F_1_Ch2 db CH7 - dw SFX_02_33_Ch3 + dw SFX_Cry1F_1_Ch3 -SFX_02_34:: ; 815c (2:415c) +SFX_Cry20_1:: ; 815c (2:415c) db ( $80 | CH4 ) - dw SFX_02_34_Ch1 + dw SFX_Cry20_1_Ch1 db CH5 - dw SFX_02_34_Ch2 + dw SFX_Cry20_1_Ch2 db CH7 - dw SFX_02_34_Ch3 + dw SFX_Cry20_1_Ch3 -SFX_02_35:: ; 8165 (2:4165) +SFX_Cry21_1:: ; 8165 (2:4165) db ( $80 | CH4 ) - dw SFX_02_35_Ch1 + dw SFX_Cry21_1_Ch1 db CH5 - dw SFX_02_35_Ch2 + dw SFX_Cry21_1_Ch2 db CH7 - dw SFX_02_35_Ch3 + dw SFX_Cry21_1_Ch3 -SFX_02_36:: ; 816e (2:416e) +SFX_Cry22_1:: ; 816e (2:416e) db ( $80 | CH4 ) - dw SFX_02_36_Ch1 + dw SFX_Cry22_1_Ch1 db CH5 - dw SFX_02_36_Ch2 + dw SFX_Cry22_1_Ch2 db CH7 - dw SFX_02_36_Ch3 + dw SFX_Cry22_1_Ch3 -SFX_02_37:: ; 8177 (2:4177) +SFX_Cry23_1:: ; 8177 (2:4177) db ( $80 | CH4 ) - dw SFX_02_37_Ch1 + dw SFX_Cry23_1_Ch1 db CH5 - dw SFX_02_37_Ch2 + dw SFX_Cry23_1_Ch2 db CH7 - dw SFX_02_37_Ch3 + dw SFX_Cry23_1_Ch3 -SFX_02_38:: ; 8180 (2:4180) +SFX_Cry24_1:: ; 8180 (2:4180) db ( $80 | CH4 ) - dw SFX_02_38_Ch1 + dw SFX_Cry24_1_Ch1 db CH5 - dw SFX_02_38_Ch2 + dw SFX_Cry24_1_Ch2 db CH7 - dw SFX_02_38_Ch3 + dw SFX_Cry24_1_Ch3 -SFX_02_39:: ; 8189 (2:4189) +SFX_Cry25_1:: ; 8189 (2:4189) db ( $80 | CH4 ) - dw SFX_02_39_Ch1 + dw SFX_Cry25_1_Ch1 db CH5 - dw SFX_02_39_Ch2 + dw SFX_Cry25_1_Ch2 db CH7 - dw SFX_02_39_Ch3 + dw SFX_Cry25_1_Ch3 -SFX_02_3a:: ; 8192 (2:4192) +SFX_Get_Item1_1:: ; 8192 (2:4192) db ( $80 | CH4 ) - dw SFX_02_3a_Ch1 + dw SFX_Get_Item1_1_Ch1 db CH5 - dw SFX_02_3a_Ch2 + dw SFX_Get_Item1_1_Ch2 db CH6 - dw SFX_02_3a_Ch3 + dw SFX_Get_Item1_1_Ch3 -SFX_02_3b:: ; 819b (2:419b) +SFX_Get_Item2_1:: ; 819b (2:419b) db ( $80 | CH4 ) - dw SFX_02_3b_Ch1 + dw SFX_Get_Item2_1_Ch1 db CH5 - dw SFX_02_3b_Ch2 + dw SFX_Get_Item2_1_Ch2 db CH6 - dw SFX_02_3b_Ch3 + dw SFX_Get_Item2_1_Ch3 -SFX_02_3c:: ; 81a4 (2:41a4) +SFX_Tink_1:: ; 81a4 (2:41a4) db CH4 - dw SFX_02_3c_Ch1 + dw SFX_Tink_1_Ch1 -SFX_02_3d:: ; 81a7 (2:41a7) +SFX_Heal_HP_1:: ; 81a7 (2:41a7) db CH4 - dw SFX_02_3d_Ch1 + dw SFX_Heal_HP_1_Ch1 -SFX_02_3e:: ; 81aa (2:41aa) +SFX_Heal_Ailment_1:: ; 81aa (2:41aa) db CH4 - dw SFX_02_3e_Ch1 + dw SFX_Heal_Ailment_1_Ch1 -SFX_02_3f:: ; 81ad (2:41ad) +SFX_Start_Menu_1:: ; 81ad (2:41ad) db CH7 - dw SFX_02_3f_Ch1 + dw SFX_Start_Menu_1_Ch1 -SFX_02_40:: ; 81b0 (2:41b0) +SFX_Press_AB_1:: ; 81b0 (2:41b0) db CH4 - dw SFX_02_40_Ch1 + dw SFX_Press_AB_1_Ch1 -SFX_02_41:: ; 81b3 (2:41b3) +SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3) db ( $80 | CH4 ) - dw SFX_02_41_Ch1 + dw SFX_Pokedex_Rating_1_Ch1 db CH5 - dw SFX_02_41_Ch2 + dw SFX_Pokedex_Rating_1_Ch2 db CH6 - dw SFX_02_41_Ch3 + dw SFX_Pokedex_Rating_1_Ch3 -SFX_02_42:: ; 81bc (2:41bc) +SFX_Get_Key_Item_1:: ; 81bc (2:41bc) db ( $80 | CH4 ) - dw SFX_02_42_Ch1 + dw SFX_Get_Key_Item_1_Ch1 db CH5 - dw SFX_02_42_Ch2 + dw SFX_Get_Key_Item_1_Ch2 db CH6 - dw SFX_02_42_Ch3 + dw SFX_Get_Key_Item_1_Ch3 -SFX_02_43:: ; 81c5 (2:41c5) +SFX_Poisoned_1:: ; 81c5 (2:41c5) db CH4 - dw SFX_02_43_Ch1 + dw SFX_Poisoned_1_Ch1 -SFX_02_44:: ; 81c8 (2:41c8) +SFX_Trade_Machine_1:: ; 81c8 (2:41c8) db CH4 - dw SFX_02_44_Ch1 + dw SFX_Trade_Machine_1_Ch1 -SFX_02_45:: ; 81cb (2:41cb) +SFX_Turn_On_PC_1:: ; 81cb (2:41cb) db CH4 - dw SFX_02_45_Ch1 + dw SFX_Turn_On_PC_1_Ch1 -SFX_02_46:: ; 81ce (2:41ce) +SFX_Turn_Off_PC_1:: ; 81ce (2:41ce) db CH4 - dw SFX_02_46_Ch1 + dw SFX_Turn_Off_PC_1_Ch1 -SFX_02_47:: ; 81d1 (2:41d1) +SFX_Enter_PC_1:: ; 81d1 (2:41d1) db CH4 - dw SFX_02_47_Ch1 + dw SFX_Enter_PC_1_Ch1 -SFX_02_48:: ; 81d4 (2:41d4) +SFX_Shrink_1:: ; 81d4 (2:41d4) db CH4 - dw SFX_02_48_Ch1 + dw SFX_Shrink_1_Ch1 -SFX_02_49:: ; 81d7 (2:41d7) +SFX_Switch_1:: ; 81d7 (2:41d7) db CH4 - dw SFX_02_49_Ch1 + dw SFX_Switch_1_Ch1 -SFX_02_4a:: ; 81da (2:41da) +SFX_Healing_Machine_1:: ; 81da (2:41da) db CH4 - dw SFX_02_4a_Ch1 + dw SFX_Healing_Machine_1_Ch1 -SFX_02_4b:: ; 81dd (2:41dd) +SFX_Teleport_Exit1_1:: ; 81dd (2:41dd) db CH4 - dw SFX_02_4b_Ch1 + dw SFX_Teleport_Exit1_1_Ch1 -SFX_02_4c:: ; 81e0 (2:41e0) +SFX_Teleport_Enter1_1:: ; 81e0 (2:41e0) db CH4 - dw SFX_02_4c_Ch1 + dw SFX_Teleport_Enter1_1_Ch1 -SFX_02_4d:: ; 81e3 (2:41e3) +SFX_Teleport_Exit2_1:: ; 81e3 (2:41e3) db CH4 - dw SFX_02_4d_Ch1 + dw SFX_Teleport_Exit2_1_Ch1 -SFX_02_4e:: ; 81e6 (2:41e6) +SFX_Ledge_1:: ; 81e6 (2:41e6) db CH4 - dw SFX_02_4e_Ch1 + dw SFX_Ledge_1_Ch1 -SFX_02_4f:: ; 81e9 (2:41e9) +SFX_Teleport_Enter2_1:: ; 81e9 (2:41e9) db CH7 - dw SFX_02_4f_Ch1 + dw SFX_Teleport_Enter2_1_Ch1 -SFX_02_50:: ; 81ec (2:41ec) +SFX_Fly_1:: ; 81ec (2:41ec) db CH7 - dw SFX_02_50_Ch1 + dw SFX_Fly_1_Ch1 -SFX_02_51:: ; 81ef (2:41ef) +SFX_Denied_1:: ; 81ef (2:41ef) db ( $40 | CH4 ) - dw SFX_02_51_Ch1 + dw SFX_Denied_1_Ch1 db CH5 - dw SFX_02_51_Ch2 + dw SFX_Denied_1_Ch2 -SFX_02_52:: ; 81f5 (2:41f5) +SFX_Arrow_Tiles_1:: ; 81f5 (2:41f5) db CH4 - dw SFX_02_52_Ch1 + dw SFX_Arrow_Tiles_1_Ch1 -SFX_02_53:: ; 81f8 (2:41f8) +SFX_Push_Boulder_1:: ; 81f8 (2:41f8) db CH7 - dw SFX_02_53_Ch1 + dw SFX_Push_Boulder_1_Ch1 -SFX_02_54:: ; 81fb (2:41fb) +SFX_SS_Anne_Horn_1:: ; 81fb (2:41fb) db ( $40 | CH4 ) - dw SFX_02_54_Ch1 + dw SFX_SS_Anne_Horn_1_Ch1 db CH5 - dw SFX_02_54_Ch2 + dw SFX_SS_Anne_Horn_1_Ch2 -SFX_02_55:: ; 8201 (2:4201) +SFX_Withdraw_Deposit_1:: ; 8201 (2:4201) db CH4 - dw SFX_02_55_Ch1 + dw SFX_Withdraw_Deposit_1_Ch1 -SFX_02_56:: ; 8204 (2:4204) +SFX_Cut_1:: ; 8204 (2:4204) db CH7 - dw SFX_02_56_Ch1 + dw SFX_Cut_1_Ch1 -SFX_02_57:: ; 8207 (2:4207) +SFX_Go_Inside_1:: ; 8207 (2:4207) db CH7 - dw SFX_02_57_Ch1 + dw SFX_Go_Inside_1_Ch1 -SFX_02_58:: ; 820a (2:420a) +SFX_Swap_1:: ; 820a (2:420a) db ( $40 | CH4 ) - dw SFX_02_58_Ch1 + dw SFX_Swap_1_Ch1 db CH5 - dw SFX_02_58_Ch2 + dw SFX_Swap_1_Ch2 -SFX_02_59:: ; 8210 (2:4210) +SFX_59_1:: ; 8210 (2:4210) db ( $40 | CH4 ) - dw SFX_02_59_Ch1 + dw SFX_59_1_Ch1 db CH5 - dw SFX_02_59_Ch2 + dw SFX_59_1_Ch2 -SFX_02_5a:: ; 8216 (2:4216) +SFX_Purchase_1:: ; 8216 (2:4216) db ( $40 | CH4 ) - dw SFX_02_5a_Ch1 + dw SFX_Purchase_1_Ch1 db CH5 - dw SFX_02_5a_Ch2 + dw SFX_Purchase_1_Ch2 -SFX_02_5b:: ; 821c (2:421c) +SFX_Collision_1:: ; 821c (2:421c) db CH4 - dw SFX_02_5b_Ch1 + dw SFX_Collision_1_Ch1 -SFX_02_5c:: ; 821f (2:421f) +SFX_Go_Outside_1:: ; 821f (2:421f) db CH7 - dw SFX_02_5c_Ch1 + dw SFX_Go_Outside_1_Ch1 -SFX_02_5d:: ; 8222 (2:4222) +SFX_Save_1:: ; 8222 (2:4222) db ( $40 | CH4 ) - dw SFX_02_5d_Ch1 + dw SFX_Save_1_Ch1 db CH5 - dw SFX_02_5d_Ch2 + dw SFX_Save_1_Ch2 -SFX_02_5e:: ; 8228 (2:4228) +SFX_Pokeflute:: ; 8228 (2:4228) db CH2 - dw SFX_02_5e_Ch1 + dw SFX_Pokeflute_Ch1 -SFX_02_5f:: ; 822b (2:422b) +SFX_Safari_Zone_PA:: ; 822b (2:422b) db CH4 - dw SFX_02_5f_Ch1 + dw SFX_Safari_Zone_PA_Ch1 diff --git a/audio/headers/sfxheaders08.asm b/audio/headers/sfxheaders08.asm old mode 100755 new mode 100644 index 311c2877..46491e67 --- a/audio/headers/sfxheaders08.asm +++ b/audio/headers/sfxheaders08.asm @@ -1,706 +1,706 @@ SFX_Headers_08:: db $ff, $ff, $ff ; padding -SFX_08_01:: ; 20003 (8:4003) +SFX_Snare1_2:: ; 20003 (8:4003) db CH7 - dw SFX_08_01_Ch1 + dw SFX_Snare1_2_Ch1 -SFX_08_02:: ; 20006 (8:4006) +SFX_Snare2_2:: ; 20006 (8:4006) db CH7 - dw SFX_08_02_Ch1 + dw SFX_Snare2_2_Ch1 -SFX_08_03:: ; 20009 (8:4009) +SFX_Snare3_2:: ; 20009 (8:4009) db CH7 - dw SFX_08_03_Ch1 + dw SFX_Snare3_2_Ch1 -SFX_08_04:: ; 2000c (8:400c) +SFX_Snare4_2:: ; 2000c (8:400c) db CH7 - dw SFX_08_04_Ch1 + dw SFX_Snare4_2_Ch1 -SFX_08_05:: ; 2000f (8:400f) +SFX_Snare5_2:: ; 2000f (8:400f) db CH7 - dw SFX_08_05_Ch1 + dw SFX_Snare5_2_Ch1 -SFX_08_06:: ; 20012 (8:4012) +SFX_Triangle1_2:: ; 20012 (8:4012) db CH7 - dw SFX_08_06_Ch1 + dw SFX_Triangle1_2_Ch1 -SFX_08_07:: ; 20015 (8:4015) +SFX_Triangle2_2:: ; 20015 (8:4015) db CH7 - dw SFX_08_07_Ch1 + dw SFX_Triangle2_2_Ch1 -SFX_08_08:: ; 20018 (8:4018) +SFX_Snare6_2:: ; 20018 (8:4018) db CH7 - dw SFX_08_08_Ch1 + dw SFX_Snare6_2_Ch1 -SFX_08_09:: ; 2001b (8:401b) +SFX_Snare7_2:: ; 2001b (8:401b) db CH7 - dw SFX_08_09_Ch1 + dw SFX_Snare7_2_Ch1 -SFX_08_0a:: ; 2001e (8:401e) +SFX_Snare8_2:: ; 2001e (8:401e) db CH7 - dw SFX_08_0a_Ch1 + dw SFX_Snare8_2_Ch1 -SFX_08_0b:: ; 20021 (8:4021) +SFX_Snare9_2:: ; 20021 (8:4021) db CH7 - dw SFX_08_0b_Ch1 + dw SFX_Snare9_2_Ch1 -SFX_08_0c:: ; 20024 (8:4024) +SFX_Cymbal1_2:: ; 20024 (8:4024) db CH7 - dw SFX_08_0c_Ch1 + dw SFX_Cymbal1_2_Ch1 -SFX_08_0d:: ; 20027 (8:4027) +SFX_Cymbal2_2:: ; 20027 (8:4027) db CH7 - dw SFX_08_0d_Ch1 + dw SFX_Cymbal2_2_Ch1 -SFX_08_0e:: ; 2002a (8:402a) +SFX_Cymbal3_2:: ; 2002a (8:402a) db CH7 - dw SFX_08_0e_Ch1 + dw SFX_Cymbal3_2_Ch1 -SFX_08_0f:: ; 2002d (8:402d) +SFX_Muted_Snare1_2:: ; 2002d (8:402d) db CH7 - dw SFX_08_0f_Ch1 + dw SFX_Muted_Snare1_2_Ch1 -SFX_08_10:: ; 20030 (8:4030) +SFX_Triangle3_2:: ; 20030 (8:4030) db CH7 - dw SFX_08_10_Ch1 + dw SFX_Triangle3_2_Ch1 -SFX_08_11:: ; 20033 (8:4033) +SFX_Muted_Snare2_2:: ; 20033 (8:4033) db CH7 - dw SFX_08_11_Ch1 + dw SFX_Muted_Snare2_2_Ch1 -SFX_08_12:: ; 20036 (8:4036) +SFX_Muted_Snare3_2:: ; 20036 (8:4036) db CH7 - dw SFX_08_12_Ch1 + dw SFX_Muted_Snare3_2_Ch1 -SFX_08_13:: ; 20039 (8:4039) +SFX_Muted_Snare4_2:: ; 20039 (8:4039) db CH7 - dw SFX_08_13_Ch1 + dw SFX_Muted_Snare4_2_Ch1 -SFX_08_14:: ; 2003c (8:403c) +SFX_Cry00_2:: ; 2003c (8:403c) db ( $80 | CH4 ) - dw SFX_08_14_Ch1 + dw SFX_Cry00_2_Ch1 db CH5 - dw SFX_08_14_Ch2 + dw SFX_Cry00_2_Ch2 db CH7 - dw SFX_08_14_Ch3 + dw SFX_Cry00_2_Ch3 -SFX_08_15:: ; 20045 (8:4045) +SFX_Cry01_2:: ; 20045 (8:4045) db ( $80 | CH4 ) - dw SFX_08_15_Ch1 + dw SFX_Cry01_2_Ch1 db CH5 - dw SFX_08_15_Ch2 + dw SFX_Cry01_2_Ch2 db CH7 - dw SFX_08_15_Ch3 + dw SFX_Cry01_2_Ch3 -SFX_08_16:: ; 2004e (8:404e) +SFX_Cry02_2:: ; 2004e (8:404e) db ( $80 | CH4 ) - dw SFX_08_16_Ch1 + dw SFX_Cry02_2_Ch1 db CH5 - dw SFX_08_16_Ch2 + dw SFX_Cry02_2_Ch2 db CH7 - dw SFX_08_16_Ch3 + dw SFX_Cry02_2_Ch3 -SFX_08_17:: ; 20057 (8:4057) +SFX_Cry03_2:: ; 20057 (8:4057) db ( $80 | CH4 ) - dw SFX_08_17_Ch1 + dw SFX_Cry03_2_Ch1 db CH5 - dw SFX_08_17_Ch2 + dw SFX_Cry03_2_Ch2 db CH7 - dw SFX_08_17_Ch3 + dw SFX_Cry03_2_Ch3 -SFX_08_18:: ; 20060 (8:4060) +SFX_Cry04_2:: ; 20060 (8:4060) db ( $80 | CH4 ) - dw SFX_08_18_Ch1 + dw SFX_Cry04_2_Ch1 db CH5 - dw SFX_08_18_Ch2 + dw SFX_Cry04_2_Ch2 db CH7 - dw SFX_08_18_Ch3 + dw SFX_Cry04_2_Ch3 -SFX_08_19:: ; 20069 (8:4069) +SFX_Cry05_2:: ; 20069 (8:4069) db ( $80 | CH4 ) - dw SFX_08_19_Ch1 + dw SFX_Cry05_2_Ch1 db CH5 - dw SFX_08_19_Ch2 + dw SFX_Cry05_2_Ch2 db CH7 - dw SFX_08_19_Ch3 + dw SFX_Cry05_2_Ch3 -SFX_08_1a:: ; 20072 (8:4072) +SFX_Cry06_2:: ; 20072 (8:4072) db ( $80 | CH4 ) - dw SFX_08_1a_Ch1 + dw SFX_Cry06_2_Ch1 db CH5 - dw SFX_08_1a_Ch2 + dw SFX_Cry06_2_Ch2 db CH7 - dw SFX_08_1a_Ch3 + dw SFX_Cry06_2_Ch3 -SFX_08_1b:: ; 2007b (8:407b) +SFX_Cry07_2:: ; 2007b (8:407b) db ( $80 | CH4 ) - dw SFX_08_1b_Ch1 + dw SFX_Cry07_2_Ch1 db CH5 - dw SFX_08_1b_Ch2 + dw SFX_Cry07_2_Ch2 db CH7 - dw SFX_08_1b_Ch3 + dw SFX_Cry07_2_Ch3 -SFX_08_1c:: ; 20084 (8:4084) +SFX_Cry08_2:: ; 20084 (8:4084) db ( $80 | CH4 ) - dw SFX_08_1c_Ch1 + dw SFX_Cry08_2_Ch1 db CH5 - dw SFX_08_1c_Ch2 + dw SFX_Cry08_2_Ch2 db CH7 - dw SFX_08_1c_Ch3 + dw SFX_Cry08_2_Ch3 -SFX_08_1d:: ; 2008d (8:408d) +SFX_Cry09_2:: ; 2008d (8:408d) db ( $80 | CH4 ) - dw SFX_08_1d_Ch1 + dw SFX_Cry09_2_Ch1 db CH5 - dw SFX_08_1d_Ch2 + dw SFX_Cry09_2_Ch2 db CH7 - dw SFX_08_1d_Ch3 + dw SFX_Cry09_2_Ch3 -SFX_08_1e:: ; 20096 (8:4096) +SFX_Cry0A_2:: ; 20096 (8:4096) db ( $80 | CH4 ) - dw SFX_08_1e_Ch1 + dw SFX_Cry0A_2_Ch1 db CH5 - dw SFX_08_1e_Ch2 + dw SFX_Cry0A_2_Ch2 db CH7 - dw SFX_08_1e_Ch3 + dw SFX_Cry0A_2_Ch3 -SFX_08_1f:: ; 2009f (8:409f) +SFX_Cry0B_2:: ; 2009f (8:409f) db ( $80 | CH4 ) - dw SFX_08_1f_Ch1 + dw SFX_Cry0B_2_Ch1 db CH5 - dw SFX_08_1f_Ch2 + dw SFX_Cry0B_2_Ch2 db CH7 - dw SFX_08_1f_Ch3 + dw SFX_Cry0B_2_Ch3 -SFX_08_20:: ; 200a8 (8:40a8) +SFX_Cry0C_2:: ; 200a8 (8:40a8) db ( $80 | CH4 ) - dw SFX_08_20_Ch1 + dw SFX_Cry0C_2_Ch1 db CH5 - dw SFX_08_20_Ch2 + dw SFX_Cry0C_2_Ch2 db CH7 - dw SFX_08_20_Ch3 + dw SFX_Cry0C_2_Ch3 -SFX_08_21:: ; 200b1 (8:40b1) +SFX_Cry0D_2:: ; 200b1 (8:40b1) db ( $80 | CH4 ) - dw SFX_08_21_Ch1 + dw SFX_Cry0D_2_Ch1 db CH5 - dw SFX_08_21_Ch2 + dw SFX_Cry0D_2_Ch2 db CH7 - dw SFX_08_21_Ch3 + dw SFX_Cry0D_2_Ch3 -SFX_08_22:: ; 200ba (8:40ba) +SFX_Cry0E_2:: ; 200ba (8:40ba) db ( $80 | CH4 ) - dw SFX_08_22_Ch1 + dw SFX_Cry0E_2_Ch1 db CH5 - dw SFX_08_22_Ch2 + dw SFX_Cry0E_2_Ch2 db CH7 - dw SFX_08_22_Ch3 + dw SFX_Cry0E_2_Ch3 -SFX_08_23:: ; 200c3 (8:40c3) +SFX_Cry0F_2:: ; 200c3 (8:40c3) db ( $80 | CH4 ) - dw SFX_08_23_Ch1 + dw SFX_Cry0F_2_Ch1 db CH5 - dw SFX_08_23_Ch2 + dw SFX_Cry0F_2_Ch2 db CH7 - dw SFX_08_23_Ch3 + dw SFX_Cry0F_2_Ch3 -SFX_08_24:: ; 200cc (8:40cc) +SFX_Cry10_2:: ; 200cc (8:40cc) db ( $80 | CH4 ) - dw SFX_08_24_Ch1 + dw SFX_Cry10_2_Ch1 db CH5 - dw SFX_08_24_Ch2 + dw SFX_Cry10_2_Ch2 db CH7 - dw SFX_08_24_Ch3 + dw SFX_Cry10_2_Ch3 -SFX_08_25:: ; 200d5 (8:40d5) +SFX_Cry11_2:: ; 200d5 (8:40d5) db ( $80 | CH4 ) - dw SFX_08_25_Ch1 + dw SFX_Cry11_2_Ch1 db CH5 - dw SFX_08_25_Ch2 + dw SFX_Cry11_2_Ch2 db CH7 - dw SFX_08_25_Ch3 + dw SFX_Cry11_2_Ch3 -SFX_08_26:: ; 200de (8:40de) +SFX_Cry12_2:: ; 200de (8:40de) db ( $80 | CH4 ) - dw SFX_08_26_Ch1 + dw SFX_Cry12_2_Ch1 db CH5 - dw SFX_08_26_Ch2 + dw SFX_Cry12_2_Ch2 db CH7 - dw SFX_08_26_Ch3 + dw SFX_Cry12_2_Ch3 -SFX_08_27:: ; 200e7 (8:40e7) +SFX_Cry13_2:: ; 200e7 (8:40e7) db ( $80 | CH4 ) - dw SFX_08_27_Ch1 + dw SFX_Cry13_2_Ch1 db CH5 - dw SFX_08_27_Ch2 + dw SFX_Cry13_2_Ch2 db CH7 - dw SFX_08_27_Ch3 + dw SFX_Cry13_2_Ch3 -SFX_08_28:: ; 200f0 (8:40f0) +SFX_Cry14_2:: ; 200f0 (8:40f0) db ( $80 | CH4 ) - dw SFX_08_28_Ch1 + dw SFX_Cry14_2_Ch1 db CH5 - dw SFX_08_28_Ch2 + dw SFX_Cry14_2_Ch2 db CH7 - dw SFX_08_28_Ch3 + dw SFX_Cry14_2_Ch3 -SFX_08_29:: ; 200f9 (8:40f9) +SFX_Cry15_2:: ; 200f9 (8:40f9) db ( $80 | CH4 ) - dw SFX_08_29_Ch1 + dw SFX_Cry15_2_Ch1 db CH5 - dw SFX_08_29_Ch2 + dw SFX_Cry15_2_Ch2 db CH7 - dw SFX_08_29_Ch3 + dw SFX_Cry15_2_Ch3 -SFX_08_2a:: ; 20102 (8:4102) +SFX_Cry16_2:: ; 20102 (8:4102) db ( $80 | CH4 ) - dw SFX_08_2a_Ch1 + dw SFX_Cry16_2_Ch1 db CH5 - dw SFX_08_2a_Ch2 + dw SFX_Cry16_2_Ch2 db CH7 - dw SFX_08_2a_Ch3 + dw SFX_Cry16_2_Ch3 -SFX_08_2b:: ; 2010b (8:410b) +SFX_Cry17_2:: ; 2010b (8:410b) db ( $80 | CH4 ) - dw SFX_08_2b_Ch1 + dw SFX_Cry17_2_Ch1 db CH5 - dw SFX_08_2b_Ch2 + dw SFX_Cry17_2_Ch2 db CH7 - dw SFX_08_2b_Ch3 + dw SFX_Cry17_2_Ch3 -SFX_08_2c:: ; 20114 (8:4114) +SFX_Cry18_2:: ; 20114 (8:4114) db ( $80 | CH4 ) - dw SFX_08_2c_Ch1 + dw SFX_Cry18_2_Ch1 db CH5 - dw SFX_08_2c_Ch2 + dw SFX_Cry18_2_Ch2 db CH7 - dw SFX_08_2c_Ch3 + dw SFX_Cry18_2_Ch3 -SFX_08_2d:: ; 2011d (8:411d) +SFX_Cry19_2:: ; 2011d (8:411d) db ( $80 | CH4 ) - dw SFX_08_2d_Ch1 + dw SFX_Cry19_2_Ch1 db CH5 - dw SFX_08_2d_Ch2 + dw SFX_Cry19_2_Ch2 db CH7 - dw SFX_08_2d_Ch3 + dw SFX_Cry19_2_Ch3 -SFX_08_2e:: ; 20126 (8:4126) +SFX_Cry1A_2:: ; 20126 (8:4126) db ( $80 | CH4 ) - dw SFX_08_2e_Ch1 + dw SFX_Cry1A_2_Ch1 db CH5 - dw SFX_08_2e_Ch2 + dw SFX_Cry1A_2_Ch2 db CH7 - dw SFX_08_2e_Ch3 + dw SFX_Cry1A_2_Ch3 -SFX_08_2f:: ; 2012f (8:412f) +SFX_Cry1B_2:: ; 2012f (8:412f) db ( $80 | CH4 ) - dw SFX_08_2f_Ch1 + dw SFX_Cry1B_2_Ch1 db CH5 - dw SFX_08_2f_Ch2 + dw SFX_Cry1B_2_Ch2 db CH7 - dw SFX_08_2f_Ch3 + dw SFX_Cry1B_2_Ch3 -SFX_08_30:: ; 20138 (8:4138) +SFX_Cry1C_2:: ; 20138 (8:4138) db ( $80 | CH4 ) - dw SFX_08_30_Ch1 + dw SFX_Cry1C_2_Ch1 db CH5 - dw SFX_08_30_Ch2 + dw SFX_Cry1C_2_Ch2 db CH7 - dw SFX_08_30_Ch3 + dw SFX_Cry1C_2_Ch3 -SFX_08_31:: ; 20141 (8:4141) +SFX_Cry1D_2:: ; 20141 (8:4141) db ( $80 | CH4 ) - dw SFX_08_31_Ch1 + dw SFX_Cry1D_2_Ch1 db CH5 - dw SFX_08_31_Ch2 + dw SFX_Cry1D_2_Ch2 db CH7 - dw SFX_08_31_Ch3 + dw SFX_Cry1D_2_Ch3 -SFX_08_32:: ; 2014a (8:414a) +SFX_Cry1E_2:: ; 2014a (8:414a) db ( $80 | CH4 ) - dw SFX_08_32_Ch1 + dw SFX_Cry1E_2_Ch1 db CH5 - dw SFX_08_32_Ch2 + dw SFX_Cry1E_2_Ch2 db CH7 - dw SFX_08_32_Ch3 + dw SFX_Cry1E_2_Ch3 -SFX_08_33:: ; 20153 (8:4153) +SFX_Cry1F_2:: ; 20153 (8:4153) db ( $80 | CH4 ) - dw SFX_08_33_Ch1 + dw SFX_Cry1F_2_Ch1 db CH5 - dw SFX_08_33_Ch2 + dw SFX_Cry1F_2_Ch2 db CH7 - dw SFX_08_33_Ch3 + dw SFX_Cry1F_2_Ch3 -SFX_08_34:: ; 2015c (8:415c) +SFX_Cry20_2:: ; 2015c (8:415c) db ( $80 | CH4 ) - dw SFX_08_34_Ch1 + dw SFX_Cry20_2_Ch1 db CH5 - dw SFX_08_34_Ch2 + dw SFX_Cry20_2_Ch2 db CH7 - dw SFX_08_34_Ch3 + dw SFX_Cry20_2_Ch3 -SFX_08_35:: ; 20165 (8:4165) +SFX_Cry21_2:: ; 20165 (8:4165) db ( $80 | CH4 ) - dw SFX_08_35_Ch1 + dw SFX_Cry21_2_Ch1 db CH5 - dw SFX_08_35_Ch2 + dw SFX_Cry21_2_Ch2 db CH7 - dw SFX_08_35_Ch3 + dw SFX_Cry21_2_Ch3 -SFX_08_36:: ; 2016e (8:416e) +SFX_Cry22_2:: ; 2016e (8:416e) db ( $80 | CH4 ) - dw SFX_08_36_Ch1 + dw SFX_Cry22_2_Ch1 db CH5 - dw SFX_08_36_Ch2 + dw SFX_Cry22_2_Ch2 db CH7 - dw SFX_08_36_Ch3 + dw SFX_Cry22_2_Ch3 -SFX_08_37:: ; 20177 (8:4177) +SFX_Cry23_2:: ; 20177 (8:4177) db ( $80 | CH4 ) - dw SFX_08_37_Ch1 + dw SFX_Cry23_2_Ch1 db CH5 - dw SFX_08_37_Ch2 + dw SFX_Cry23_2_Ch2 db CH7 - dw SFX_08_37_Ch3 + dw SFX_Cry23_2_Ch3 -SFX_08_38:: ; 20180 (8:4180) +SFX_Cry24_2:: ; 20180 (8:4180) db ( $80 | CH4 ) - dw SFX_08_38_Ch1 + dw SFX_Cry24_2_Ch1 db CH5 - dw SFX_08_38_Ch2 + dw SFX_Cry24_2_Ch2 db CH7 - dw SFX_08_38_Ch3 + dw SFX_Cry24_2_Ch3 -SFX_08_39:: ; 20189 (8:4189) +SFX_Cry25_2:: ; 20189 (8:4189) db ( $80 | CH4 ) - dw SFX_08_39_Ch1 + dw SFX_Cry25_2_Ch1 db CH5 - dw SFX_08_39_Ch2 + dw SFX_Cry25_2_Ch2 db CH7 - dw SFX_08_39_Ch3 + dw SFX_Cry25_2_Ch3 -SFX_08_3a:: ; 20192 (8:4192) +SFX_Level_Up:: ; 20192 (8:4192) db ( $80 | CH4 ) - dw SFX_08_3a_Ch1 + dw SFX_Level_Up_Ch1 db CH5 - dw SFX_08_3a_Ch2 + dw SFX_Level_Up_Ch2 db CH6 - dw SFX_08_3a_Ch3 + dw SFX_Level_Up_Ch3 -SFX_08_3b:: ; 2019b (8:419b) +SFX_Get_Item2_2:: ; 2019b (8:419b) db ( $80 | CH4 ) - dw SFX_08_3b_Ch1 + dw SFX_Get_Item2_2_Ch1 db CH5 - dw SFX_08_3b_Ch2 + dw SFX_Get_Item2_2_Ch2 db CH6 - dw SFX_08_3b_Ch3 + dw SFX_Get_Item2_2_Ch3 -SFX_08_3c:: ; 201a4 (8:41a4) +SFX_Tink_2:: ; 201a4 (8:41a4) db CH4 - dw SFX_08_3c_Ch1 + dw SFX_Tink_2_Ch1 -SFX_08_3d:: ; 201a7 (8:41a7) +SFX_Heal_HP_2:: ; 201a7 (8:41a7) db CH4 - dw SFX_08_3d_Ch1 + dw SFX_Heal_HP_2_Ch1 -SFX_08_3e:: ; 201aa (8:41aa) +SFX_Heal_Ailment_2:: ; 201aa (8:41aa) db CH4 - dw SFX_08_3e_Ch1 + dw SFX_Heal_Ailment_2_Ch1 -SFX_08_3f:: ; 201ad (8:41ad) +SFX_Start_Menu_2:: ; 201ad (8:41ad) db CH7 - dw SFX_08_3f_Ch1 + dw SFX_Start_Menu_2_Ch1 -SFX_08_40:: ; 201b0 (8:41b0) +SFX_Press_AB_2:: ; 201b0 (8:41b0) db CH4 - dw SFX_08_40_Ch1 + dw SFX_Press_AB_2_Ch1 -SFX_08_41:: ; 201b3 (8:41b3) +SFX_Ball_Toss:: ; 201b3 (8:41b3) db ( $40 | CH4 ) - dw SFX_08_41_Ch1 + dw SFX_Ball_Toss_Ch1 db CH5 - dw SFX_08_41_Ch2 + dw SFX_Ball_Toss_Ch2 -SFX_08_42:: ; 201b9 (8:41b9) +SFX_Ball_Poof:: ; 201b9 (8:41b9) db ( $40 | CH4 ) - dw SFX_08_42_Ch1 + dw SFX_Ball_Poof_Ch1 db CH7 - dw SFX_08_42_Ch2 + dw SFX_Ball_Poof_Ch2 -SFX_08_43:: ; 201bf (8:41bf) +SFX_Faint_Thud:: ; 201bf (8:41bf) db ( $40 | CH4 ) - dw SFX_08_43_Ch1 + dw SFX_Faint_Thud_Ch1 db CH7 - dw SFX_08_43_Ch2 + dw SFX_Faint_Thud_Ch2 -SFX_08_44:: ; 201c5 (8:41c5) +SFX_Run:: ; 201c5 (8:41c5) db CH7 - dw SFX_08_44_Ch1 + dw SFX_Run_Ch1 -SFX_08_45:: ; 201c8 (8:41c8) +SFX_Dex_Page_Added:: ; 201c8 (8:41c8) db ( $40 | CH4 ) - dw SFX_08_45_Ch1 + dw SFX_Dex_Page_Added_Ch1 db CH5 - dw SFX_08_45_Ch2 + dw SFX_Dex_Page_Added_Ch2 -SFX_08_46:: ; 201ce (8:41ce) +SFX_Caught_Mon:: ; 201ce (8:41ce) db ( $80 | CH4 ) - dw SFX_08_46_Ch1 + dw SFX_Caught_Mon_Ch1 db CH5 - dw SFX_08_46_Ch2 + dw SFX_Caught_Mon_Ch2 db CH6 - dw SFX_08_46_Ch3 + dw SFX_Caught_Mon_Ch3 -SFX_08_47:: ; 201d7 (8:41d7) +SFX_Peck:: ; 201d7 (8:41d7) db CH7 - dw SFX_08_47_Ch1 + dw SFX_Peck_Ch1 -SFX_08_48:: ; 201da (8:41da) +SFX_Faint_Fall:: ; 201da (8:41da) db CH4 - dw SFX_08_48_Ch1 + dw SFX_Faint_Fall_Ch1 -SFX_08_49:: ; 201dd (8:41dd) +SFX_Battle_09:: ; 201dd (8:41dd) db CH4 - dw SFX_08_49_Ch1 + dw SFX_Battle_09_Ch1 -SFX_08_4a:: ; 201e0 (8:41e0) +SFX_Pound:: ; 201e0 (8:41e0) db CH7 - dw SFX_08_4a_Ch1 + dw SFX_Pound_Ch1 -SFX_08_4b:: ; 201e3 (8:41e3) +SFX_Battle_0B:: ; 201e3 (8:41e3) db CH7 - dw SFX_08_4b_Ch1 + dw SFX_Battle_0B_Ch1 -SFX_08_4c:: ; 201e6 (8:41e6) +SFX_Battle_0C:: ; 201e6 (8:41e6) db CH7 - dw SFX_08_4c_Ch1 + dw SFX_Battle_0C_Ch1 -SFX_08_4d:: ; 201e9 (8:41e9) +SFX_Battle_0D:: ; 201e9 (8:41e9) db CH7 - dw SFX_08_4d_Ch1 + dw SFX_Battle_0D_Ch1 -SFX_08_4e:: ; 201ec (8:41ec) +SFX_Battle_0E:: ; 201ec (8:41ec) db CH7 - dw SFX_08_4e_Ch1 + dw SFX_Battle_0E_Ch1 -SFX_08_4f:: ; 201ef (8:41ef) +SFX_Battle_0F:: ; 201ef (8:41ef) db CH7 - dw SFX_08_4f_Ch1 + dw SFX_Battle_0F_Ch1 -SFX_08_50:: ; 201f2 (8:41f2) +SFX_Damage:: ; 201f2 (8:41f2) db CH7 - dw SFX_08_50_Ch1 + dw SFX_Damage_Ch1 -SFX_08_51:: ; 201f5 (8:41f5) +SFX_Not_Very_Effective:: ; 201f5 (8:41f5) db CH7 - dw SFX_08_51_Ch1 + dw SFX_Not_Very_Effective_Ch1 -SFX_08_52:: ; 201f8 (8:41f8) +SFX_Battle_12:: ; 201f8 (8:41f8) db CH7 - dw SFX_08_52_Ch1 + dw SFX_Battle_12_Ch1 -SFX_08_53:: ; 201fb (8:41fb) +SFX_Battle_13:: ; 201fb (8:41fb) db CH7 - dw SFX_08_53_Ch1 + dw SFX_Battle_13_Ch1 -SFX_08_54:: ; 201fe (8:41fe) +SFX_Battle_14:: ; 201fe (8:41fe) db CH7 - dw SFX_08_54_Ch1 + dw SFX_Battle_14_Ch1 -SFX_08_55:: ; 20201 (8:4201) +SFX_Vine_Whip:: ; 20201 (8:4201) db CH7 - dw SFX_08_55_Ch1 + dw SFX_Vine_Whip_Ch1 -SFX_08_56:: ; 20204 (8:4204) +SFX_Battle_16:: ; 20204 (8:4204) db CH7 - dw SFX_08_56_Ch1 + dw SFX_Battle_16_Ch1 -SFX_08_57:: ; 20207 (8:4207) +SFX_Battle_17:: ; 20207 (8:4207) db CH7 - dw SFX_08_57_Ch1 + dw SFX_Battle_17_Ch1 -SFX_08_58:: ; 2020a (8:420a) +SFX_Battle_18:: ; 2020a (8:420a) db CH7 - dw SFX_08_58_Ch1 + dw SFX_Battle_18_Ch1 -SFX_08_59:: ; 2020d (8:420d) +SFX_Battle_19:: ; 2020d (8:420d) db CH7 - dw SFX_08_59_Ch1 + dw SFX_Battle_19_Ch1 -SFX_08_5a:: ; 20210 (8:4210) +SFX_Super_Effective:: ; 20210 (8:4210) db CH7 - dw SFX_08_5a_Ch1 + dw SFX_Super_Effective_Ch1 -SFX_08_5b:: ; 20213 (8:4213) +SFX_Battle_1B:: ; 20213 (8:4213) db CH7 - dw SFX_08_5b_Ch1 + dw SFX_Battle_1B_Ch1 -SFX_08_5c:: ; 20216 (8:4216) +SFX_Battle_1C:: ; 20216 (8:4216) db CH7 - dw SFX_08_5c_Ch1 + dw SFX_Battle_1C_Ch1 -SFX_08_5d:: ; 20219 (8:4219) +SFX_Doubleslap:: ; 20219 (8:4219) db CH7 - dw SFX_08_5d_Ch1 + dw SFX_Doubleslap_Ch1 -SFX_08_5e:: ; 2021c (8:421c) +SFX_Battle_1E:: ; 2021c (8:421c) db ( $40 | CH4 ) - dw SFX_08_5e_Ch1 + dw SFX_Battle_1E_Ch1 db CH7 - dw SFX_08_5e_Ch2 + dw SFX_Battle_1E_Ch2 -SFX_08_5f:: ; 20222 (8:4222) +SFX_Horn_Drill:: ; 20222 (8:4222) db CH7 - dw SFX_08_5f_Ch1 + dw SFX_Horn_Drill_Ch1 -SFX_08_60:: ; 20225 (8:4225) +SFX_Battle_20:: ; 20225 (8:4225) db CH7 - dw SFX_08_60_Ch1 + dw SFX_Battle_20_Ch1 -SFX_08_61:: ; 20228 (8:4228) +SFX_Battle_21:: ; 20228 (8:4228) db CH7 - dw SFX_08_61_Ch1 + dw SFX_Battle_21_Ch1 -SFX_08_62:: ; 2022b (8:422b) +SFX_Battle_22:: ; 2022b (8:422b) db CH7 - dw SFX_08_62_Ch1 + dw SFX_Battle_22_Ch1 -SFX_08_63:: ; 2022e (8:422e) +SFX_Battle_23:: ; 2022e (8:422e) db CH7 - dw SFX_08_63_Ch1 + dw SFX_Battle_23_Ch1 -SFX_08_64:: ; 20231 (8:4231) +SFX_Battle_24:: ; 20231 (8:4231) db ( $40 | CH4 ) - dw SFX_08_64_Ch1 + dw SFX_Battle_24_Ch1 db CH7 - dw SFX_08_64_Ch2 + dw SFX_Battle_24_Ch2 -SFX_08_65:: ; 20237 (8:4237) +SFX_Battle_25:: ; 20237 (8:4237) db CH7 - dw SFX_08_65_Ch1 + dw SFX_Battle_25_Ch1 -SFX_08_66:: ; 2023a (8:423a) +SFX_Battle_26:: ; 2023a (8:423a) db CH7 - dw SFX_08_66_Ch1 + dw SFX_Battle_26_Ch1 -SFX_08_67:: ; 2023d (8:423d) +SFX_Battle_27:: ; 2023d (8:423d) db ( $80 | CH4 ) - dw SFX_08_67_Ch1 + dw SFX_Battle_27_Ch1 db CH5 - dw SFX_08_67_Ch2 + dw SFX_Battle_27_Ch2 db CH7 - dw SFX_08_67_Ch3 + dw SFX_Battle_27_Ch3 -SFX_08_68:: ; 20246 (8:4246) +SFX_Battle_28:: ; 20246 (8:4246) db ( $80 | CH4 ) - dw SFX_08_68_Ch1 + dw SFX_Battle_28_Ch1 db CH5 - dw SFX_08_68_Ch2 + dw SFX_Battle_28_Ch2 db CH7 - dw SFX_08_68_Ch3 + dw SFX_Battle_28_Ch3 -SFX_08_69:: ; 2024f (8:424f) +SFX_Battle_29:: ; 2024f (8:424f) db ( $40 | CH4 ) - dw SFX_08_69_Ch1 + dw SFX_Battle_29_Ch1 db CH7 - dw SFX_08_69_Ch2 + dw SFX_Battle_29_Ch2 -SFX_08_6a:: ; 20255 (8:4255) +SFX_Battle_2A:: ; 20255 (8:4255) db ( $80 | CH4 ) - dw SFX_08_6a_Ch1 + dw SFX_Battle_2A_Ch1 db CH5 - dw SFX_08_6a_Ch2 + dw SFX_Battle_2A_Ch2 db CH7 - dw SFX_08_6a_Ch3 + dw SFX_Battle_2A_Ch3 -SFX_08_6b:: ; 2025e (8:425e) +SFX_Battle_2B:: ; 2025e (8:425e) db ( $40 | CH4 ) - dw SFX_08_6b_Ch1 + dw SFX_Battle_2B_Ch1 db CH7 - dw SFX_08_6b_Ch2 + dw SFX_Battle_2B_Ch2 -SFX_08_6c:: ; 20264 (8:4264) +SFX_Battle_2C:: ; 20264 (8:4264) db ( $80 | CH4 ) - dw SFX_08_6c_Ch1 + dw SFX_Battle_2C_Ch1 db CH5 - dw SFX_08_6c_Ch2 + dw SFX_Battle_2C_Ch2 db CH7 - dw SFX_08_6c_Ch3 + dw SFX_Battle_2C_Ch3 -SFX_08_6d:: ; 2026d (8:426d) +SFX_Psybeam:: ; 2026d (8:426d) db ( $80 | CH4 ) - dw SFX_08_6d_Ch1 + dw SFX_Psybeam_Ch1 db CH5 - dw SFX_08_6d_Ch2 + dw SFX_Psybeam_Ch2 db CH7 - dw SFX_08_6d_Ch3 + dw SFX_Psybeam_Ch3 -SFX_08_6e:: ; 20276 (8:4276) +SFX_Battle_2E:: ; 20276 (8:4276) db ( $80 | CH4 ) - dw SFX_08_6e_Ch1 + dw SFX_Battle_2E_Ch1 db CH5 - dw SFX_08_6e_Ch2 + dw SFX_Battle_2E_Ch2 db CH7 - dw SFX_08_6e_Ch3 + dw SFX_Battle_2E_Ch3 -SFX_08_6f:: ; 2027f (8:427f) +SFX_Battle_2F:: ; 2027f (8:427f) db ( $80 | CH4 ) - dw SFX_08_6f_Ch1 + dw SFX_Battle_2F_Ch1 db CH5 - dw SFX_08_6f_Ch2 + dw SFX_Battle_2F_Ch2 db CH7 - dw SFX_08_6f_Ch3 + dw SFX_Battle_2F_Ch3 -SFX_08_70:: ; 20288 (8:4288) +SFX_Psychic_M:: ; 20288 (8:4288) db ( $80 | CH4 ) - dw SFX_08_70_Ch1 + dw SFX_Psychic_M_Ch1 db CH5 - dw SFX_08_70_Ch2 + dw SFX_Psychic_M_Ch2 db CH7 - dw SFX_08_70_Ch3 + dw SFX_Psychic_M_Ch3 -SFX_08_71:: ; 20291 (8:4291) +SFX_Battle_31:: ; 20291 (8:4291) db ( $40 | CH4 ) - dw SFX_08_71_Ch1 + dw SFX_Battle_31_Ch1 db CH5 - dw SFX_08_71_Ch2 + dw SFX_Battle_31_Ch2 -SFX_08_72:: ; 20297 (8:4297) +SFX_Battle_32:: ; 20297 (8:4297) db ( $40 | CH4 ) - dw SFX_08_72_Ch1 + dw SFX_Battle_32_Ch1 db CH5 - dw SFX_08_72_Ch2 + dw SFX_Battle_32_Ch2 -SFX_08_73:: ; 2029d (8:429d) +SFX_Battle_33:: ; 2029d (8:429d) db ( $40 | CH4 ) - dw SFX_08_73_Ch1 + dw SFX_Battle_33_Ch1 db CH5 - dw SFX_08_73_Ch2 + dw SFX_Battle_33_Ch2 -SFX_08_74:: ; 202a3 (8:42a3) +SFX_Battle_34:: ; 202a3 (8:42a3) db ( $80 | CH4 ) - dw SFX_08_74_Ch1 + dw SFX_Battle_34_Ch1 db CH5 - dw SFX_08_74_Ch2 + dw SFX_Battle_34_Ch2 db CH7 - dw SFX_08_74_Ch3 + dw SFX_Battle_34_Ch3 -SFX_08_75:: ; 202ac (8:42ac) +SFX_Battle_35:: ; 202ac (8:42ac) db ( $40 | CH4 ) - dw SFX_08_75_Ch1 + dw SFX_Battle_35_Ch1 db CH5 - dw SFX_08_75_Ch2 + dw SFX_Battle_35_Ch2 -SFX_08_76:: ; 202b2 (8:42b2) +SFX_Battle_36:: ; 202b2 (8:42b2) db ( $80 | CH4 ) - dw SFX_08_76_Ch1 + dw SFX_Battle_36_Ch1 db CH5 - dw SFX_08_76_Ch2 + dw SFX_Battle_36_Ch2 db CH7 - dw SFX_08_76_Ch3 + dw SFX_Battle_36_Ch3 -SFX_08_77:: ; 202bb (8:42bb) +SFX_Silph_Scope:: ; 202bb (8:42bb) db CH4 - dw SFX_08_77_Ch1 + dw SFX_Silph_Scope_Ch1 diff --git a/audio/headers/sfxheaders1f.asm b/audio/headers/sfxheaders1f.asm old mode 100755 new mode 100644 index 52766a76..7af4755f --- a/audio/headers/sfxheaders1f.asm +++ b/audio/headers/sfxheaders1f.asm @@ -1,596 +1,596 @@ SFX_Headers_1f:: db $ff, $ff, $ff ; padding -SFX_1f_01:: ; 7c003 (1f:4003) +SFX_Snare1_3:: ; 7c003 (1f:4003) db CH7 - dw SFX_1f_01_Ch1 + dw SFX_Snare1_3_Ch1 -SFX_1f_02:: ; 7c006 (1f:4006) +SFX_Snare2_3:: ; 7c006 (1f:4006) db CH7 - dw SFX_1f_02_Ch1 + dw SFX_Snare2_3_Ch1 -SFX_1f_03:: ; 7c009 (1f:4009) +SFX_Snare3_3:: ; 7c009 (1f:4009) db CH7 - dw SFX_1f_03_Ch1 + dw SFX_Snare3_3_Ch1 -SFX_1f_04:: ; 7c00c (1f:400c) +SFX_Snare4_3:: ; 7c00c (1f:400c) db CH7 - dw SFX_1f_04_Ch1 + dw SFX_Snare4_3_Ch1 -SFX_1f_05:: ; 7c00f (1f:400f) +SFX_Snare5_3:: ; 7c00f (1f:400f) db CH7 - dw SFX_1f_05_Ch1 + dw SFX_Snare5_3_Ch1 -SFX_1f_06:: ; 7c012 (1f:4012) +SFX_Triangle1_3:: ; 7c012 (1f:4012) db CH7 - dw SFX_1f_06_Ch1 + dw SFX_Triangle1_3_Ch1 -SFX_1f_07:: ; 7c015 (1f:4015) +SFX_Triangle2_3:: ; 7c015 (1f:4015) db CH7 - dw SFX_1f_07_Ch1 + dw SFX_Triangle2_3_Ch1 -SFX_1f_08:: ; 7c018 (1f:4018) +SFX_Snare6_3:: ; 7c018 (1f:4018) db CH7 - dw SFX_1f_08_Ch1 + dw SFX_Snare6_3_Ch1 -SFX_1f_09:: ; 7c01b (1f:401b) +SFX_Snare7_3:: ; 7c01b (1f:401b) db CH7 - dw SFX_1f_09_Ch1 + dw SFX_Snare7_3_Ch1 -SFX_1f_0a:: ; 7c01e (1f:401e) +SFX_Snare8_3:: ; 7c01e (1f:401e) db CH7 - dw SFX_1f_0a_Ch1 + dw SFX_Snare8_3_Ch1 -SFX_1f_0b:: ; 7c021 (1f:4021) +SFX_Snare9_3:: ; 7c021 (1f:4021) db CH7 - dw SFX_1f_0b_Ch1 + dw SFX_Snare9_3_Ch1 -SFX_1f_0c:: ; 7c024 (1f:4024) +SFX_Cymbal1_3:: ; 7c024 (1f:4024) db CH7 - dw SFX_1f_0c_Ch1 + dw SFX_Cymbal1_3_Ch1 -SFX_1f_0d:: ; 7c027 (1f:4027) +SFX_Cymbal2_3:: ; 7c027 (1f:4027) db CH7 - dw SFX_1f_0d_Ch1 + dw SFX_Cymbal2_3_Ch1 -SFX_1f_0e:: ; 7c02a (1f:402a) +SFX_Cymbal3_3:: ; 7c02a (1f:402a) db CH7 - dw SFX_1f_0e_Ch1 + dw SFX_Cymbal3_3_Ch1 -SFX_1f_0f:: ; 7c02d (1f:402d) +SFX_Muted_Snare1_3:: ; 7c02d (1f:402d) db CH7 - dw SFX_1f_0f_Ch1 + dw SFX_Muted_Snare1_3_Ch1 -SFX_1f_10:: ; 7c030 (1f:4030) +SFX_Triangle3_3:: ; 7c030 (1f:4030) db CH7 - dw SFX_1f_10_Ch1 + dw SFX_Triangle3_3_Ch1 -SFX_1f_11:: ; 7c033 (1f:4033) +SFX_Muted_Snare2_3:: ; 7c033 (1f:4033) db CH7 - dw SFX_1f_11_Ch1 + dw SFX_Muted_Snare2_3_Ch1 -SFX_1f_12:: ; 7c036 (1f:4036) +SFX_Muted_Snare3_3:: ; 7c036 (1f:4036) db CH7 - dw SFX_1f_12_Ch1 + dw SFX_Muted_Snare3_3_Ch1 -SFX_1f_13:: ; 7c039 (1f:4039) +SFX_Muted_Snare4_3:: ; 7c039 (1f:4039) db CH7 - dw SFX_1f_13_Ch1 + dw SFX_Muted_Snare4_3_Ch1 -SFX_1f_14:: ; 7c03c (1f:403c) +SFX_Cry00_3:: ; 7c03c (1f:403c) db ( $80 | CH4 ) - dw SFX_1f_14_Ch1 + dw SFX_Cry00_3_Ch1 db CH5 - dw SFX_1f_14_Ch2 + dw SFX_Cry00_3_Ch2 db CH7 - dw SFX_1f_14_Ch3 + dw SFX_Cry00_3_Ch3 -SFX_1f_15:: ; 7c045 (1f:4045) +SFX_Cry01_3:: ; 7c045 (1f:4045) db ( $80 | CH4 ) - dw SFX_1f_15_Ch1 + dw SFX_Cry01_3_Ch1 db CH5 - dw SFX_1f_15_Ch2 + dw SFX_Cry01_3_Ch2 db CH7 - dw SFX_1f_15_Ch3 + dw SFX_Cry01_3_Ch3 -SFX_1f_16:: ; 7c04e (1f:404e) +SFX_Cry02_3:: ; 7c04e (1f:404e) db ( $80 | CH4 ) - dw SFX_1f_16_Ch1 + dw SFX_Cry02_3_Ch1 db CH5 - dw SFX_1f_16_Ch2 + dw SFX_Cry02_3_Ch2 db CH7 - dw SFX_1f_16_Ch3 + dw SFX_Cry02_3_Ch3 -SFX_1f_17:: ; 7c057 (1f:4057) +SFX_Cry03_3:: ; 7c057 (1f:4057) db ( $80 | CH4 ) - dw SFX_1f_17_Ch1 + dw SFX_Cry03_3_Ch1 db CH5 - dw SFX_1f_17_Ch2 + dw SFX_Cry03_3_Ch2 db CH7 - dw SFX_1f_17_Ch3 + dw SFX_Cry03_3_Ch3 -SFX_1f_18:: ; 7c060 (1f:4060) +SFX_Cry04_3:: ; 7c060 (1f:4060) db ( $80 | CH4 ) - dw SFX_1f_18_Ch1 + dw SFX_Cry04_3_Ch1 db CH5 - dw SFX_1f_18_Ch2 + dw SFX_Cry04_3_Ch2 db CH7 - dw SFX_1f_18_Ch3 + dw SFX_Cry04_3_Ch3 -SFX_1f_19:: ; 7c069 (1f:4069) +SFX_Cry05_3:: ; 7c069 (1f:4069) db ( $80 | CH4 ) - dw SFX_1f_19_Ch1 + dw SFX_Cry05_3_Ch1 db CH5 - dw SFX_1f_19_Ch2 + dw SFX_Cry05_3_Ch2 db CH7 - dw SFX_1f_19_Ch3 + dw SFX_Cry05_3_Ch3 -SFX_1f_1a:: ; 7c072 (1f:4072) +SFX_Cry06_3:: ; 7c072 (1f:4072) db ( $80 | CH4 ) - dw SFX_1f_1a_Ch1 + dw SFX_Cry06_3_Ch1 db CH5 - dw SFX_1f_1a_Ch2 + dw SFX_Cry06_3_Ch2 db CH7 - dw SFX_1f_1a_Ch3 + dw SFX_Cry06_3_Ch3 -SFX_1f_1b:: ; 7c07b (1f:407b) +SFX_Cry07_3:: ; 7c07b (1f:407b) db ( $80 | CH4 ) - dw SFX_1f_1b_Ch1 + dw SFX_Cry07_3_Ch1 db CH5 - dw SFX_1f_1b_Ch2 + dw SFX_Cry07_3_Ch2 db CH7 - dw SFX_1f_1b_Ch3 + dw SFX_Cry07_3_Ch3 -SFX_1f_1c:: ; 7c084 (1f:4084) +SFX_Cry08_3:: ; 7c084 (1f:4084) db ( $80 | CH4 ) - dw SFX_1f_1c_Ch1 + dw SFX_Cry08_3_Ch1 db CH5 - dw SFX_1f_1c_Ch2 + dw SFX_Cry08_3_Ch2 db CH7 - dw SFX_1f_1c_Ch3 + dw SFX_Cry08_3_Ch3 -SFX_1f_1d:: ; 7c08d (1f:408d) +SFX_Cry09_3:: ; 7c08d (1f:408d) db ( $80 | CH4 ) - dw SFX_1f_1d_Ch1 + dw SFX_Cry09_3_Ch1 db CH5 - dw SFX_1f_1d_Ch2 + dw SFX_Cry09_3_Ch2 db CH7 - dw SFX_1f_1d_Ch3 + dw SFX_Cry09_3_Ch3 -SFX_1f_1e:: ; 7c096 (1f:4096) +SFX_Cry0A_3:: ; 7c096 (1f:4096) db ( $80 | CH4 ) - dw SFX_1f_1e_Ch1 + dw SFX_Cry0A_3_Ch1 db CH5 - dw SFX_1f_1e_Ch2 + dw SFX_Cry0A_3_Ch2 db CH7 - dw SFX_1f_1e_Ch3 + dw SFX_Cry0A_3_Ch3 -SFX_1f_1f:: ; 7c09f (1f:409f) +SFX_Cry0B_3:: ; 7c09f (1f:409f) db ( $80 | CH4 ) - dw SFX_1f_1f_Ch1 + dw SFX_Cry0B_3_Ch1 db CH5 - dw SFX_1f_1f_Ch2 + dw SFX_Cry0B_3_Ch2 db CH7 - dw SFX_1f_1f_Ch3 + dw SFX_Cry0B_3_Ch3 -SFX_1f_20:: ; 7c0a8 (1f:40a8) +SFX_Cry0C_3:: ; 7c0a8 (1f:40a8) db ( $80 | CH4 ) - dw SFX_1f_20_Ch1 + dw SFX_Cry0C_3_Ch1 db CH5 - dw SFX_1f_20_Ch2 + dw SFX_Cry0C_3_Ch2 db CH7 - dw SFX_1f_20_Ch3 + dw SFX_Cry0C_3_Ch3 -SFX_1f_21:: ; 7c0b1 (1f:40b1) +SFX_Cry0D_3:: ; 7c0b1 (1f:40b1) db ( $80 | CH4 ) - dw SFX_1f_21_Ch1 + dw SFX_Cry0D_3_Ch1 db CH5 - dw SFX_1f_21_Ch2 + dw SFX_Cry0D_3_Ch2 db CH7 - dw SFX_1f_21_Ch3 + dw SFX_Cry0D_3_Ch3 -SFX_1f_22:: ; 7c0ba (1f:40ba) +SFX_Cry0E_3:: ; 7c0ba (1f:40ba) db ( $80 | CH4 ) - dw SFX_1f_22_Ch1 + dw SFX_Cry0E_3_Ch1 db CH5 - dw SFX_1f_22_Ch2 + dw SFX_Cry0E_3_Ch2 db CH7 - dw SFX_1f_22_Ch3 + dw SFX_Cry0E_3_Ch3 -SFX_1f_23:: ; 7c0c3 (1f:40c3) +SFX_Cry0F_3:: ; 7c0c3 (1f:40c3) db ( $80 | CH4 ) - dw SFX_1f_23_Ch1 + dw SFX_Cry0F_3_Ch1 db CH5 - dw SFX_1f_23_Ch2 + dw SFX_Cry0F_3_Ch2 db CH7 - dw SFX_1f_23_Ch3 + dw SFX_Cry0F_3_Ch3 -SFX_1f_24:: ; 7c0cc (1f:40cc) +SFX_Cry10_3:: ; 7c0cc (1f:40cc) db ( $80 | CH4 ) - dw SFX_1f_24_Ch1 + dw SFX_Cry10_3_Ch1 db CH5 - dw SFX_1f_24_Ch2 + dw SFX_Cry10_3_Ch2 db CH7 - dw SFX_1f_24_Ch3 + dw SFX_Cry10_3_Ch3 -SFX_1f_25:: ; 7c0d5 (1f:40d5) +SFX_Cry11_3:: ; 7c0d5 (1f:40d5) db ( $80 | CH4 ) - dw SFX_1f_25_Ch1 + dw SFX_Cry11_3_Ch1 db CH5 - dw SFX_1f_25_Ch2 + dw SFX_Cry11_3_Ch2 db CH7 - dw SFX_1f_25_Ch3 + dw SFX_Cry11_3_Ch3 -SFX_1f_26:: ; 7c0de (1f:40de) +SFX_Cry12_3:: ; 7c0de (1f:40de) db ( $80 | CH4 ) - dw SFX_1f_26_Ch1 + dw SFX_Cry12_3_Ch1 db CH5 - dw SFX_1f_26_Ch2 + dw SFX_Cry12_3_Ch2 db CH7 - dw SFX_1f_26_Ch3 + dw SFX_Cry12_3_Ch3 -SFX_1f_27:: ; 7c0e7 (1f:40e7) +SFX_Cry13_3:: ; 7c0e7 (1f:40e7) db ( $80 | CH4 ) - dw SFX_1f_27_Ch1 + dw SFX_Cry13_3_Ch1 db CH5 - dw SFX_1f_27_Ch2 + dw SFX_Cry13_3_Ch2 db CH7 - dw SFX_1f_27_Ch3 + dw SFX_Cry13_3_Ch3 -SFX_1f_28:: ; 7c0f0 (1f:40f0) +SFX_Cry14_3:: ; 7c0f0 (1f:40f0) db ( $80 | CH4 ) - dw SFX_1f_28_Ch1 + dw SFX_Cry14_3_Ch1 db CH5 - dw SFX_1f_28_Ch2 + dw SFX_Cry14_3_Ch2 db CH7 - dw SFX_1f_28_Ch3 + dw SFX_Cry14_3_Ch3 -SFX_1f_29:: ; 7c0f9 (1f:40f9) +SFX_Cry15_3:: ; 7c0f9 (1f:40f9) db ( $80 | CH4 ) - dw SFX_1f_29_Ch1 + dw SFX_Cry15_3_Ch1 db CH5 - dw SFX_1f_29_Ch2 + dw SFX_Cry15_3_Ch2 db CH7 - dw SFX_1f_29_Ch3 + dw SFX_Cry15_3_Ch3 -SFX_1f_2a:: ; 7c102 (1f:4102) +SFX_Cry16_3:: ; 7c102 (1f:4102) db ( $80 | CH4 ) - dw SFX_1f_2a_Ch1 + dw SFX_Cry16_3_Ch1 db CH5 - dw SFX_1f_2a_Ch2 + dw SFX_Cry16_3_Ch2 db CH7 - dw SFX_1f_2a_Ch3 + dw SFX_Cry16_3_Ch3 -SFX_1f_2b:: ; 7c10b (1f:410b) +SFX_Cry17_3:: ; 7c10b (1f:410b) db ( $80 | CH4 ) - dw SFX_1f_2b_Ch1 + dw SFX_Cry17_3_Ch1 db CH5 - dw SFX_1f_2b_Ch2 + dw SFX_Cry17_3_Ch2 db CH7 - dw SFX_1f_2b_Ch3 + dw SFX_Cry17_3_Ch3 -SFX_1f_2c:: ; 7c114 (1f:4114) +SFX_Cry18_3:: ; 7c114 (1f:4114) db ( $80 | CH4 ) - dw SFX_1f_2c_Ch1 + dw SFX_Cry18_3_Ch1 db CH5 - dw SFX_1f_2c_Ch2 + dw SFX_Cry18_3_Ch2 db CH7 - dw SFX_1f_2c_Ch3 + dw SFX_Cry18_3_Ch3 -SFX_1f_2d:: ; 7c11d (1f:411d) +SFX_Cry19_3:: ; 7c11d (1f:411d) db ( $80 | CH4 ) - dw SFX_1f_2d_Ch1 + dw SFX_Cry19_3_Ch1 db CH5 - dw SFX_1f_2d_Ch2 + dw SFX_Cry19_3_Ch2 db CH7 - dw SFX_1f_2d_Ch3 + dw SFX_Cry19_3_Ch3 -SFX_1f_2e:: ; 7c126 (1f:4126) +SFX_Cry1A_3:: ; 7c126 (1f:4126) db ( $80 | CH4 ) - dw SFX_1f_2e_Ch1 + dw SFX_Cry1A_3_Ch1 db CH5 - dw SFX_1f_2e_Ch2 + dw SFX_Cry1A_3_Ch2 db CH7 - dw SFX_1f_2e_Ch3 + dw SFX_Cry1A_3_Ch3 -SFX_1f_2f:: ; 7c12f (1f:412f) +SFX_Cry1B_3:: ; 7c12f (1f:412f) db ( $80 | CH4 ) - dw SFX_1f_2f_Ch1 + dw SFX_Cry1B_3_Ch1 db CH5 - dw SFX_1f_2f_Ch2 + dw SFX_Cry1B_3_Ch2 db CH7 - dw SFX_1f_2f_Ch3 + dw SFX_Cry1B_3_Ch3 -SFX_1f_30:: ; 7c138 (1f:4138) +SFX_Cry1C_3:: ; 7c138 (1f:4138) db ( $80 | CH4 ) - dw SFX_1f_30_Ch1 + dw SFX_Cry1C_3_Ch1 db CH5 - dw SFX_1f_30_Ch2 + dw SFX_Cry1C_3_Ch2 db CH7 - dw SFX_1f_30_Ch3 + dw SFX_Cry1C_3_Ch3 -SFX_1f_31:: ; 7c141 (1f:4141) +SFX_Cry1D_3:: ; 7c141 (1f:4141) db ( $80 | CH4 ) - dw SFX_1f_31_Ch1 + dw SFX_Cry1D_3_Ch1 db CH5 - dw SFX_1f_31_Ch2 + dw SFX_Cry1D_3_Ch2 db CH7 - dw SFX_1f_31_Ch3 + dw SFX_Cry1D_3_Ch3 -SFX_1f_32:: ; 7c14a (1f:414a) +SFX_Cry1E_3:: ; 7c14a (1f:414a) db ( $80 | CH4 ) - dw SFX_1f_32_Ch1 + dw SFX_Cry1E_3_Ch1 db CH5 - dw SFX_1f_32_Ch2 + dw SFX_Cry1E_3_Ch2 db CH7 - dw SFX_1f_32_Ch3 + dw SFX_Cry1E_3_Ch3 -SFX_1f_33:: ; 7c153 (1f:4153) +SFX_Cry1F_3:: ; 7c153 (1f:4153) db ( $80 | CH4 ) - dw SFX_1f_33_Ch1 + dw SFX_Cry1F_3_Ch1 db CH5 - dw SFX_1f_33_Ch2 + dw SFX_Cry1F_3_Ch2 db CH7 - dw SFX_1f_33_Ch3 + dw SFX_Cry1F_3_Ch3 -SFX_1f_34:: ; 7c15c (1f:415c) +SFX_Cry20_3:: ; 7c15c (1f:415c) db ( $80 | CH4 ) - dw SFX_1f_34_Ch1 + dw SFX_Cry20_3_Ch1 db CH5 - dw SFX_1f_34_Ch2 + dw SFX_Cry20_3_Ch2 db CH7 - dw SFX_1f_34_Ch3 + dw SFX_Cry20_3_Ch3 -SFX_1f_35:: ; 7c165 (1f:4165) +SFX_Cry21_3:: ; 7c165 (1f:4165) db ( $80 | CH4 ) - dw SFX_1f_35_Ch1 + dw SFX_Cry21_3_Ch1 db CH5 - dw SFX_1f_35_Ch2 + dw SFX_Cry21_3_Ch2 db CH7 - dw SFX_1f_35_Ch3 + dw SFX_Cry21_3_Ch3 -SFX_1f_36:: ; 7c16e (1f:416e) +SFX_Cry22_3:: ; 7c16e (1f:416e) db ( $80 | CH4 ) - dw SFX_1f_36_Ch1 + dw SFX_Cry22_3_Ch1 db CH5 - dw SFX_1f_36_Ch2 + dw SFX_Cry22_3_Ch2 db CH7 - dw SFX_1f_36_Ch3 + dw SFX_Cry22_3_Ch3 -SFX_1f_37:: ; 7c177 (1f:4177) +SFX_Cry23_3:: ; 7c177 (1f:4177) db ( $80 | CH4 ) - dw SFX_1f_37_Ch1 + dw SFX_Cry23_3_Ch1 db CH5 - dw SFX_1f_37_Ch2 + dw SFX_Cry23_3_Ch2 db CH7 - dw SFX_1f_37_Ch3 + dw SFX_Cry23_3_Ch3 -SFX_1f_38:: ; 7c180 (1f:4180) +SFX_Cry24_3:: ; 7c180 (1f:4180) db ( $80 | CH4 ) - dw SFX_1f_38_Ch1 + dw SFX_Cry24_3_Ch1 db CH5 - dw SFX_1f_38_Ch2 + dw SFX_Cry24_3_Ch2 db CH7 - dw SFX_1f_38_Ch3 + dw SFX_Cry24_3_Ch3 -SFX_1f_39:: ; 7c189 (1f:4189) +SFX_Cry25_3:: ; 7c189 (1f:4189) db ( $80 | CH4 ) - dw SFX_1f_39_Ch1 + dw SFX_Cry25_3_Ch1 db CH5 - dw SFX_1f_39_Ch2 + dw SFX_Cry25_3_Ch2 db CH7 - dw SFX_1f_39_Ch3 + dw SFX_Cry25_3_Ch3 -SFX_1f_3a:: ; 7c192 (1f:4192) +SFX_Get_Item1_3:: ; 7c192 (1f:4192) db ( $80 | CH4 ) - dw SFX_1f_3a_Ch1 + dw SFX_Get_Item1_3_Ch1 db CH5 - dw SFX_1f_3a_Ch2 + dw SFX_Get_Item1_3_Ch2 db CH6 - dw SFX_1f_3a_Ch3 + dw SFX_Get_Item1_3_Ch3 -SFX_1f_3b:: ; 7c19b (1f:419b) +SFX_Get_Item2_3:: ; 7c19b (1f:419b) db ( $80 | CH4 ) - dw SFX_1f_3b_Ch1 + dw SFX_Get_Item2_3_Ch1 db CH5 - dw SFX_1f_3b_Ch2 + dw SFX_Get_Item2_3_Ch2 db CH6 - dw SFX_1f_3b_Ch3 + dw SFX_Get_Item2_3_Ch3 -SFX_1f_3c:: ; 7c1a4 (1f:41a4) +SFX_Tink_3:: ; 7c1a4 (1f:41a4) db CH4 - dw SFX_1f_3c_Ch1 + dw SFX_Tink_3_Ch1 -SFX_1f_3d:: ; 7c1a7 (1f:41a7) +SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7) db CH4 - dw SFX_1f_3d_Ch1 + dw SFX_Heal_HP_3_Ch1 -SFX_1f_3e:: ; 7c1aa (1f:41aa) +SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa) db CH4 - dw SFX_1f_3e_Ch1 + dw SFX_Heal_Ailment_3_Ch1 -SFX_1f_3f:: ; 7c1ad (1f:41ad) +SFX_Start_Menu_3:: ; 7c1ad (1f:41ad) db CH7 - dw SFX_1f_3f_Ch1 + dw SFX_Start_Menu_3_Ch1 -SFX_1f_40:: ; 7c1b0 (1f:41b0) +SFX_Press_AB_3:: ; 7c1b0 (1f:41b0) db CH4 - dw SFX_1f_40_Ch1 + dw SFX_Press_AB_3_Ch1 -SFX_1f_41:: ; 7c1b3 (1f:41b3) +SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3) db ( $80 | CH4 ) - dw SFX_1f_41_Ch1 + dw SFX_Pokedex_Rating_3_Ch1 db CH5 - dw SFX_1f_41_Ch2 + dw SFX_Pokedex_Rating_3_Ch2 db CH6 - dw SFX_1f_41_Ch3 + dw SFX_Pokedex_Rating_3_Ch3 -SFX_1f_42:: ; 7c1bc (1f:41bc) +SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc) db ( $80 | CH4 ) - dw SFX_1f_42_Ch1 + dw SFX_Get_Key_Item_3_Ch1 db CH5 - dw SFX_1f_42_Ch2 + dw SFX_Get_Key_Item_3_Ch2 db CH6 - dw SFX_1f_42_Ch3 + dw SFX_Get_Key_Item_3_Ch3 -SFX_1f_43:: ; 7c1c5 (1f:41c5) +SFX_Poisoned_3:: ; 7c1c5 (1f:41c5) db CH4 - dw SFX_1f_43_Ch1 + dw SFX_Poisoned_3_Ch1 -SFX_1f_44:: ; 7c1c8 (1f:41c8) +SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8) db CH4 - dw SFX_1f_44_Ch1 + dw SFX_Trade_Machine_3_Ch1 -SFX_1f_45:: ; 7c1cb (1f:41cb) +SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb) db CH4 - dw SFX_1f_45_Ch1 + dw SFX_Turn_On_PC_3_Ch1 -SFX_1f_46:: ; 7c1ce (1f:41ce) +SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce) db CH4 - dw SFX_1f_46_Ch1 + dw SFX_Turn_Off_PC_3_Ch1 -SFX_1f_47:: ; 7c1d1 (1f:41d1) +SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1) db CH4 - dw SFX_1f_47_Ch1 + dw SFX_Enter_PC_3_Ch1 -SFX_1f_48:: ; 7c1d4 (1f:41d4) +SFX_Shrink_3:: ; 7c1d4 (1f:41d4) db CH4 - dw SFX_1f_48_Ch1 + dw SFX_Shrink_3_Ch1 -SFX_1f_49:: ; 7c1d7 (1f:41d7) +SFX_Switch_3:: ; 7c1d7 (1f:41d7) db CH4 - dw SFX_1f_49_Ch1 + dw SFX_Switch_3_Ch1 -SFX_1f_4a:: ; 7c1da (1f:41da) +SFX_Healing_Machine_3:: ; 7c1da (1f:41da) db CH4 - dw SFX_1f_4a_Ch1 + dw SFX_Healing_Machine_3_Ch1 -SFX_1f_4b:: ; 7c1dd (1f:41dd) +SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd) db CH4 - dw SFX_1f_4b_Ch1 + dw SFX_Teleport_Exit1_3_Ch1 -SFX_1f_4c:: ; 7c1e0 (1f:41e0) +SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0) db CH4 - dw SFX_1f_4c_Ch1 + dw SFX_Teleport_Enter1_3_Ch1 -SFX_1f_4d:: ; 7c1e3 (1f:41e3) +SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3) db CH4 - dw SFX_1f_4d_Ch1 + dw SFX_Teleport_Exit2_3_Ch1 -SFX_1f_4e:: ; 7c1e6 (1f:41e6) +SFX_Ledge_3:: ; 7c1e6 (1f:41e6) db CH4 - dw SFX_1f_4e_Ch1 + dw SFX_Ledge_3_Ch1 -SFX_1f_4f:: ; 7c1e9 (1f:41e9) +SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9) db CH7 - dw SFX_1f_4f_Ch1 + dw SFX_Teleport_Enter2_3_Ch1 -SFX_1f_50:: ; 7c1ec (1f:41ec) +SFX_Fly_3:: ; 7c1ec (1f:41ec) db CH7 - dw SFX_1f_50_Ch1 + dw SFX_Fly_3_Ch1 -SFX_1f_51:: ; 7c1ef (1f:41ef) +SFX_Denied_3:: ; 7c1ef (1f:41ef) db ( $40 | CH4 ) - dw SFX_1f_51_Ch1 + dw SFX_Denied_3_Ch1 db CH5 - dw SFX_1f_51_Ch2 + dw SFX_Denied_3_Ch2 -SFX_1f_52:: ; 7c1f5 (1f:41f5) +SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5) db CH4 - dw SFX_1f_52_Ch1 + dw SFX_Arrow_Tiles_3_Ch1 -SFX_1f_53:: ; 7c1f8 (1f:41f8) +SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8) db CH7 - dw SFX_1f_53_Ch1 + dw SFX_Push_Boulder_3_Ch1 -SFX_1f_54:: ; 7c1fb (1f:41fb) +SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb) db ( $40 | CH4 ) - dw SFX_1f_54_Ch1 + dw SFX_SS_Anne_Horn_3_Ch1 db CH5 - dw SFX_1f_54_Ch2 + dw SFX_SS_Anne_Horn_3_Ch2 -SFX_1f_55:: ; 7c201 (1f:4201) +SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201) db CH4 - dw SFX_1f_55_Ch1 + dw SFX_Withdraw_Deposit_3_Ch1 -SFX_1f_56:: ; 7c204 (1f:4204) +SFX_Cut_3:: ; 7c204 (1f:4204) db CH7 - dw SFX_1f_56_Ch1 + dw SFX_Cut_3_Ch1 -SFX_1f_57:: ; 7c207 (1f:4207) +SFX_Go_Inside_3:: ; 7c207 (1f:4207) db CH7 - dw SFX_1f_57_Ch1 + dw SFX_Go_Inside_3_Ch1 -SFX_1f_58:: ; 7c20a (1f:420a) +SFX_Swap_3:: ; 7c20a (1f:420a) db ( $40 | CH4 ) - dw SFX_1f_58_Ch1 + dw SFX_Swap_3_Ch1 db CH5 - dw SFX_1f_58_Ch2 + dw SFX_Swap_3_Ch2 -SFX_1f_59:: ; 7c210 (1f:4210) +SFX_59_3:: ; 7c210 (1f:4210) db ( $40 | CH4 ) - dw SFX_1f_59_Ch1 + dw SFX_59_3_Ch1 db CH5 - dw SFX_1f_59_Ch2 + dw SFX_59_3_Ch2 -SFX_1f_5a:: ; 7c216 (1f:4216) +SFX_Purchase_3:: ; 7c216 (1f:4216) db ( $40 | CH4 ) - dw SFX_1f_5a_Ch1 + dw SFX_Purchase_3_Ch1 db CH5 - dw SFX_1f_5a_Ch2 + dw SFX_Purchase_3_Ch2 -SFX_1f_5b:: ; 7c21c (1f:421c) +SFX_Collision_3:: ; 7c21c (1f:421c) db CH4 - dw SFX_1f_5b_Ch1 + dw SFX_Collision_3_Ch1 -SFX_1f_5c:: ; 7c21f (1f:421f) +SFX_Go_Outside_3:: ; 7c21f (1f:421f) db CH7 - dw SFX_1f_5c_Ch1 + dw SFX_Go_Outside_3_Ch1 -SFX_1f_5d:: ; 7c222 (1f:4222) +SFX_Save_3:: ; 7c222 (1f:4222) db ( $40 | CH4 ) - dw SFX_1f_5d_Ch1 + dw SFX_Save_3_Ch1 db CH5 - dw SFX_1f_5d_Ch2 + dw SFX_Save_3_Ch2 -SFX_1f_5e:: ; 7c228 (1f:4228) +SFX_Intro_Lunge:: ; 7c228 (1f:4228) db CH7 - dw SFX_1f_5e_Ch1 + dw SFX_Intro_Lunge_Ch1 -SFX_1f_5f:: ; 7c22b (1f:422b) +SFX_Intro_Hip:: ; 7c22b (1f:422b) db CH4 - dw SFX_1f_5f_Ch1 + dw SFX_Intro_Hip_Ch1 -SFX_1f_60:: ; 7c22e (1f:422e) +SFX_Intro_Hop:: ; 7c22e (1f:422e) db CH4 - dw SFX_1f_60_Ch1 + dw SFX_Intro_Hop_Ch1 -SFX_1f_61:: ; 7c231 (1f:4231) +SFX_Intro_Raise:: ; 7c231 (1f:4231) db CH7 - dw SFX_1f_61_Ch1 + dw SFX_Intro_Raise_Ch1 -SFX_1f_62:: ; 7c234 (1f:4234) +SFX_Intro_Crash:: ; 7c234 (1f:4234) db CH7 - dw SFX_1f_62_Ch1 + dw SFX_Intro_Crash_Ch1 -SFX_1f_63:: ; 7c237 (1f:4237) +SFX_Intro_Whoosh:: ; 7c237 (1f:4237) db CH7 - dw SFX_1f_63_Ch1 + dw SFX_Intro_Whoosh_Ch1 -SFX_1f_64:: ; 7c23a (1f:423a) +SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a) db CH4 - dw SFX_1f_64_Ch1 + dw SFX_Slots_Stop_Wheel_Ch1 -SFX_1f_65:: ; 7c23d (1f:423d) +SFX_Slots_Reward:: ; 7c23d (1f:423d) db CH4 - dw SFX_1f_65_Ch1 + dw SFX_Slots_Reward_Ch1 -SFX_1f_66:: ; 7c240 (1f:4240) +SFX_Slots_New_Spin:: ; 7c240 (1f:4240) db ( $40 | CH4 ) - dw SFX_1f_66_Ch1 + dw SFX_Slots_New_Spin_Ch1 db CH5 - dw SFX_1f_66_Ch2 + dw SFX_Slots_New_Spin_Ch2 -SFX_1f_67:: ; 7c246 (1f:4246) +SFX_Shooting_Star:: ; 7c246 (1f:4246) db CH4 - dw SFX_1f_67_Ch1 + dw SFX_Shooting_Star_Ch1 diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm new file mode 100644 index 00000000..6cbfdb16 --- /dev/null +++ b/audio/sfx/59_1.asm @@ -0,0 +1,11 @@ +SFX_59_1_Ch1: ; 841b (2:441b) + duty 2 + unknownsfx0x20 4, 241, 128, 7 + endchannel + + +SFX_59_1_Ch2: ; 8422 (2:4422) + duty 2 + unknownsfx0x20 1, 8, 0, 0 + unknownsfx0x20 4, 161, 97, 7 + endchannel diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm new file mode 100644 index 00000000..9c808359 --- /dev/null +++ b/audio/sfx/59_3.asm @@ -0,0 +1,11 @@ +SFX_59_3_Ch1: ; 7c404 (1f:4404) + duty 2 + unknownsfx0x20 4, 241, 128, 7 + endchannel + + +SFX_59_3_Ch2: ; 7c40b (1f:440b) + duty 2 + unknownsfx0x20 1, 8, 0, 0 + unknownsfx0x20 4, 161, 97, 7 + endchannel diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm new file mode 100644 index 00000000..172907a8 --- /dev/null +++ b/audio/sfx/arrow_tiles_1.asm @@ -0,0 +1,6 @@ +SFX_Arrow_Tiles_1_Ch1: ; 8649 (2:4649) + duty 0 + unknownsfx0x10 23 + unknownsfx0x20 15, 210, 0, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm new file mode 100644 index 00000000..fd225a5f --- /dev/null +++ b/audio/sfx/arrow_tiles_3.asm @@ -0,0 +1,6 @@ +SFX_Arrow_Tiles_3_Ch1: ; 7c626 (1f:4626) + duty 0 + unknownsfx0x10 23 + unknownsfx0x20 15, 210, 0, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm new file mode 100644 index 00000000..46fb2a07 --- /dev/null +++ b/audio/sfx/ball_poof.asm @@ -0,0 +1,11 @@ +SFX_Ball_Poof_Ch1: ; 2043d (8:443d) + duty 2 + unknownsfx0x10 22 + unknownsfx0x20 15, 242, 0, 4 + unknownsfx0x10 8 + endchannel + + +SFX_Ball_Poof_Ch2: ; 20448 (8:4448) + unknownnoise0x20 15, 162, 34 + endchannel diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm new file mode 100644 index 00000000..fc9f81cc --- /dev/null +++ b/audio/sfx/ball_toss.asm @@ -0,0 +1,11 @@ +SFX_Ball_Toss_Ch1: ; 2042d (8:442d) + duty 2 + unknownsfx0x10 47 + unknownsfx0x20 15, 242, 128, 7 + endchannel + + +SFX_Ball_Toss_Ch2: ; 20436 (8:4436) + duty 2 + unknownsfx0x20 15, 194, 130, 7 + endchannel diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm new file mode 100644 index 00000000..19e9b9e7 --- /dev/null +++ b/audio/sfx/battle_09.asm @@ -0,0 +1,6 @@ +SFX_Battle_09_Ch1: ; 204b9 (8:44b9) + duty 1 + unknownsfx0x10 151 + unknownsfx0x20 15, 242, 0, 5 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm new file mode 100644 index 00000000..1a7e17ec --- /dev/null +++ b/audio/sfx/battle_0b.asm @@ -0,0 +1,3 @@ +SFX_Battle_0B_Ch1: ; 204c8 (8:44c8) + unknownnoise0x20 8, 241, 84 + endchannel diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm new file mode 100644 index 00000000..b2fdf455 --- /dev/null +++ b/audio/sfx/battle_0c.asm @@ -0,0 +1,5 @@ +SFX_Battle_0C_Ch1: ; 204cc (8:44cc) + unknownnoise0x20 15, 143, 17 + unknownnoise0x20 4, 255, 18 + unknownnoise0x20 10, 241, 85 + endchannel diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm new file mode 100644 index 00000000..c70b281d --- /dev/null +++ b/audio/sfx/battle_0d.asm @@ -0,0 +1,5 @@ +SFX_Battle_0D_Ch1: ; 204d6 (8:44d6) + unknownnoise0x20 15, 143, 52 + unknownnoise0x20 8, 242, 53 + unknownnoise0x20 10, 241, 85 + endchannel diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm new file mode 100644 index 00000000..20c20628 --- /dev/null +++ b/audio/sfx/battle_0e.asm @@ -0,0 +1,4 @@ +SFX_Battle_0E_Ch1: ; 204e0 (8:44e0) + unknownnoise0x20 15, 159, 35 + unknownnoise0x20 8, 241, 33 + endchannel diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm new file mode 100644 index 00000000..d84aed37 --- /dev/null +++ b/audio/sfx/battle_0f.asm @@ -0,0 +1,6 @@ +SFX_Battle_0F_Ch1: ; 204e7 (8:44e7) + unknownnoise0x20 2, 225, 75 + unknownnoise0x20 10, 241, 68 + unknownnoise0x20 2, 225, 58 + unknownnoise0x20 6, 241, 52 + endchannel diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm new file mode 100644 index 00000000..324ce9b9 --- /dev/null +++ b/audio/sfx/battle_12.asm @@ -0,0 +1,6 @@ +SFX_Battle_12_Ch1: ; 2050b (8:450b) + unknownnoise0x20 8, 79, 35 + unknownnoise0x20 4, 196, 34 + unknownnoise0x20 6, 242, 35 + loopchannel 4, SFX_Battle_12_Ch1 + endchannel diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm new file mode 100644 index 00000000..74349bb5 --- /dev/null +++ b/audio/sfx/battle_13.asm @@ -0,0 +1,6 @@ +SFX_Battle_13_Ch1: ; 20519 (8:4519) + unknownnoise0x20 8, 79, 51 + unknownnoise0x20 4, 196, 34 + unknownnoise0x20 6, 242, 35 + unknownnoise0x20 15, 242, 34 + endchannel diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm new file mode 100644 index 00000000..82234904 --- /dev/null +++ b/audio/sfx/battle_14.asm @@ -0,0 +1,6 @@ +SFX_Battle_14_Ch1: ; 20526 (8:4526) + unknownnoise0x20 8, 255, 50 + unknownnoise0x20 8, 244, 67 + unknownnoise0x20 8, 242, 84 + unknownnoise0x20 8, 241, 101 + endchannel diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm new file mode 100644 index 00000000..a2b5031e --- /dev/null +++ b/audio/sfx/battle_16.asm @@ -0,0 +1,5 @@ +SFX_Battle_16_Ch1: ; 2054c (8:454c) + unknownnoise0x20 1, 148, 35 + unknownnoise0x20 1, 180, 34 + unknownnoise0x20 8, 241, 68 + endchannel diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm new file mode 100644 index 00000000..4be1d96b --- /dev/null +++ b/audio/sfx/battle_17.asm @@ -0,0 +1,6 @@ +SFX_Battle_17_Ch1: ; 20556 (8:4556) + unknownnoise0x20 2, 148, 51 + unknownnoise0x20 4, 180, 34 + unknownnoise0x20 4, 241, 68 + unknownnoise0x20 8, 241, 85 + endchannel diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm new file mode 100644 index 00000000..6c201d38 --- /dev/null +++ b/audio/sfx/battle_18.asm @@ -0,0 +1,4 @@ +SFX_Battle_18_Ch1: ; 20563 (8:4563) + unknownnoise0x20 4, 255, 85 + unknownnoise0x20 8, 241, 101 + endchannel diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm new file mode 100644 index 00000000..6b54f8cd --- /dev/null +++ b/audio/sfx/battle_19.asm @@ -0,0 +1,5 @@ +SFX_Battle_19_Ch1: ; 2056a (8:456a) + unknownnoise0x20 2, 132, 67 + unknownnoise0x20 2, 196, 34 + unknownnoise0x20 8, 242, 52 + endchannel diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm new file mode 100644 index 00000000..3bb451d5 --- /dev/null +++ b/audio/sfx/battle_1b.asm @@ -0,0 +1,4 @@ +SFX_Battle_1B_Ch1: ; 2057b (8:457b) + unknownnoise0x20 2, 241, 34 + unknownnoise0x20 15, 242, 18 + endchannel diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm new file mode 100644 index 00000000..579e36cc --- /dev/null +++ b/audio/sfx/battle_1c.asm @@ -0,0 +1,5 @@ +SFX_Battle_1C_Ch1: ; 20582 (8:4582) + unknownnoise0x20 2, 194, 1 + unknownnoise0x20 15, 244, 1 + unknownnoise0x20 15, 242, 1 + endchannel diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm new file mode 100644 index 00000000..df556540 --- /dev/null +++ b/audio/sfx/battle_1e.asm @@ -0,0 +1,16 @@ +SFX_Battle_1E_Ch1: ; 20593 (8:4593) + duty 0 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 2 + unknownsfx0x10 34 + unknownsfx0x20 8, 226, 0, 2 + unknownsfx0x10 8 + endchannel + + +SFX_Battle_1E_Ch2: ; 205a4 (8:45a4) + unknownnoise0x20 0, 209, 66 + unknownnoise0x20 4, 161, 50 + unknownnoise0x20 0, 209, 34 + unknownnoise0x20 6, 161, 50 + endchannel diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm new file mode 100644 index 00000000..142030ee --- /dev/null +++ b/audio/sfx/battle_20.asm @@ -0,0 +1,4 @@ +SFX_Battle_20_Ch1: ; 205be (8:45be) + unknownnoise0x20 12, 241, 84 + unknownnoise0x20 8, 241, 100 + endchannel diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm new file mode 100644 index 00000000..10ad350e --- /dev/null +++ b/audio/sfx/battle_21.asm @@ -0,0 +1,7 @@ +SFX_Battle_21_Ch1: ; 205c5 (8:45c5) + unknownnoise0x20 2, 241, 51 + unknownnoise0x20 2, 193, 50 + unknownnoise0x20 2, 161, 49 + unknownnoise0x20 15, 130, 50 + unknownnoise0x20 8, 241, 52 + endchannel diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm new file mode 100644 index 00000000..c6b0d972 --- /dev/null +++ b/audio/sfx/battle_22.asm @@ -0,0 +1,4 @@ +SFX_Battle_22_Ch1: ; 205d5 (8:45d5) + unknownnoise0x20 2, 210, 50 + unknownnoise0x20 15, 242, 67 + endchannel diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm new file mode 100644 index 00000000..474e43b6 --- /dev/null +++ b/audio/sfx/battle_23.asm @@ -0,0 +1,7 @@ +SFX_Battle_23_Ch1: ; 205dc (8:45dc) + unknownnoise0x20 2, 242, 67 + unknownnoise0x20 4, 181, 50 + unknownnoise0x20 9, 134, 49 + unknownnoise0x20 7, 100, 0 + unknownnoise0x20 15, 242, 85 + endchannel diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm new file mode 100644 index 00000000..4fea9cf9 --- /dev/null +++ b/audio/sfx/battle_24.asm @@ -0,0 +1,12 @@ +SFX_Battle_24_Ch1: ; 205ec (8:45ec) + duty 1 + unknownsfx0x10 151 + unknownsfx0x20 15, 242, 0, 7 + unknownsfx0x10 8 + endchannel + + +SFX_Battle_24_Ch2: ; 205f7 (8:45f7) + unknownnoise0x20 15, 63, 34 + unknownnoise0x20 15, 242, 33 + endchannel diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm new file mode 100644 index 00000000..18a70f45 --- /dev/null +++ b/audio/sfx/battle_25.asm @@ -0,0 +1,7 @@ +SFX_Battle_25_Ch1: ; 205fe (8:45fe) + unknownnoise0x20 15, 79, 65 + unknownnoise0x20 8, 143, 65 + unknownnoise0x20 8, 207, 65 + unknownnoise0x20 8, 242, 66 + unknownnoise0x20 15, 242, 65 + endchannel diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm new file mode 100644 index 00000000..943078e1 --- /dev/null +++ b/audio/sfx/battle_26.asm @@ -0,0 +1,9 @@ +SFX_Battle_26_Ch1: ; 2060e (8:460e) + unknownnoise0x20 10, 255, 80 + unknownnoise0x20 15, 255, 81 + unknownnoise0x20 8, 242, 81 + unknownnoise0x20 6, 255, 82 + unknownnoise0x20 6, 255, 83 + unknownnoise0x20 8, 255, 84 + unknownnoise0x20 15, 242, 84 + endchannel diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm new file mode 100644 index 00000000..ddd4e452 --- /dev/null +++ b/audio/sfx/battle_27.asm @@ -0,0 +1,27 @@ +SFX_Battle_27_Ch1: ; 20624 (8:4624) + duty 2 + unknownsfx0x20 15, 63, 192, 7 + +SFX_Battle_27_branch_2062a: + unknownsfx0x20 15, 223, 192, 7 + loopchannel 4, SFX_Battle_27_branch_2062a + unknownsfx0x20 15, 209, 192, 7 + endchannel + + +SFX_Battle_27_Ch2: ; 20637 (8:4637) + dutycycle 179 + unknownsfx0x20 15, 47, 200, 7 + +SFX_Battle_27_branch_2063d: + unknownsfx0x20 15, 207, 199, 7 + loopchannel 4, SFX_Battle_27_branch_2063d + unknownsfx0x20 15, 193, 200, 7 + endchannel + + +SFX_Battle_27_Ch3: ; 2064a (8:464a) + unknownnoise0x20 3, 151, 18 + unknownnoise0x20 3, 161, 17 + loopchannel 10, SFX_Battle_27_Ch3 + endchannel diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm new file mode 100644 index 00000000..73855179 --- /dev/null +++ b/audio/sfx/battle_28.asm @@ -0,0 +1,21 @@ +SFX_Battle_28_Ch1: ; 20655 (8:4655) + duty 0 + unknownsfx0x20 0, 241, 192, 7 + unknownsfx0x20 0, 241, 0, 7 + loopchannel 12, SFX_Battle_28_Ch1 + endchannel + + +SFX_Battle_28_Ch2: ; 20664 (8:4664) + dutycycle 179 + unknownsfx0x20 0, 225, 193, 7 + unknownsfx0x20 0, 225, 1, 7 + loopchannel 12, SFX_Battle_28_Ch2 + endchannel + + +SFX_Battle_28_Ch3: ; 20673 (8:4673) + unknownnoise0x20 1, 209, 73 + unknownnoise0x20 1, 209, 41 + loopchannel 6, SFX_Battle_28_Ch3 + endchannel diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm new file mode 100644 index 00000000..e766a453 --- /dev/null +++ b/audio/sfx/battle_29.asm @@ -0,0 +1,18 @@ +SFX_Battle_29_Ch1: ; 2067e (8:467e) + dutycycle 201 + unknownsfx0x20 11, 243, 32, 1 + unknownsfx0x20 9, 211, 80, 1 + loopchannel 5, SFX_Battle_29_Ch1 + unknownsfx0x20 8, 227, 48, 1 + unknownsfx0x20 15, 194, 16, 1 + endchannel + + +SFX_Battle_29_Ch2: ; 20695 (8:4695) + unknownnoise0x20 10, 243, 53 + unknownnoise0x20 14, 246, 69 + loopchannel 4, SFX_Battle_29_Ch2 + unknownnoise0x20 12, 244, 188 + unknownnoise0x20 12, 245, 156 + unknownnoise0x20 15, 244, 172 + endchannel diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm new file mode 100644 index 00000000..d7334aae --- /dev/null +++ b/audio/sfx/battle_2a.asm @@ -0,0 +1,28 @@ +SFX_Battle_2A_Ch1: ; 206a9 (8:46a9) + dutycycle 57 + unknownsfx0x20 4, 244, 0, 6 + unknownsfx0x20 3, 196, 0, 5 + unknownsfx0x20 5, 181, 0, 6 + unknownsfx0x20 13, 226, 192, 6 + loopchannel 3, SFX_Battle_2A_Ch1 + unknownsfx0x20 8, 209, 0, 6 + endchannel + + +SFX_Battle_2A_Ch2: ; 206c4 (8:46c4) + dutycycle 141 + unknownsfx0x20 5, 228, 224, 5 + unknownsfx0x20 4, 180, 224, 4 + unknownsfx0x20 6, 165, 232, 5 + unknownsfx0x20 14, 209, 160, 6 + loopchannel 3, SFX_Battle_2A_Ch2 + endchannel + + +SFX_Battle_2A_Ch3: ; 206db (8:46db) + unknownnoise0x20 5, 195, 51 + unknownnoise0x20 3, 146, 67 + unknownnoise0x20 10, 181, 51 + unknownnoise0x20 15, 195, 50 + loopchannel 2, SFX_Battle_2A_Ch3 + endchannel diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm new file mode 100644 index 00000000..276627c3 --- /dev/null +++ b/audio/sfx/battle_2b.asm @@ -0,0 +1,21 @@ +SFX_Battle_2B_Ch1: ; 206ec (8:46ec) + dutycycle 210 + unknownsfx0x20 3, 129, 0, 3 + unknownsfx0x20 3, 193, 0, 4 + unknownsfx0x20 3, 241, 0, 5 + unknownsfx0x20 3, 177, 0, 4 + unknownsfx0x20 3, 113, 0, 3 + loopchannel 5, SFX_Battle_2B_Ch1 + unknownsfx0x20 8, 129, 0, 4 + endchannel + + +SFX_Battle_2B_Ch2: ; 2070b (8:470b) + unknownnoise0x20 3, 98, 34 + unknownnoise0x20 3, 162, 50 + unknownnoise0x20 3, 210, 51 + unknownnoise0x20 3, 146, 35 + unknownnoise0x20 3, 82, 18 + loopchannel 5, SFX_Battle_2B_Ch2 + unknownnoise0x20 8, 129, 18 + endchannel diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm new file mode 100644 index 00000000..22b902f1 --- /dev/null +++ b/audio/sfx/battle_2c.asm @@ -0,0 +1,25 @@ +SFX_Battle_2C_Ch1: ; 20722 (8:4722) + dutycycle 57 + unknownsfx0x20 15, 244, 0, 5 + unknownsfx0x20 15, 196, 0, 4 + unknownsfx0x20 15, 226, 192, 5 + loopchannel 3, SFX_Battle_2C_Ch1 + endchannel + + +SFX_Battle_2C_Ch2: ; 20735 (8:4735) + dutycycle 141 + unknownsfx0x20 7, 228, 48, 4 + unknownsfx0x20 15, 180, 48, 3 + unknownsfx0x20 15, 162, 56, 4 + loopchannel 4, SFX_Battle_2C_Ch2 + endchannel + + +SFX_Battle_2C_Ch3: ; 20748 (8:4748) + unknownnoise0x20 9, 244, 68 + unknownnoise0x20 9, 242, 67 + unknownnoise0x20 15, 244, 66 + unknownnoise0x20 15, 244, 65 + loopchannel 3, SFX_Battle_2C_Ch3 + endchannel diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm new file mode 100644 index 00000000..91dda605 --- /dev/null +++ b/audio/sfx/battle_2e.asm @@ -0,0 +1,27 @@ +SFX_Battle_2E_Ch1: ; 20792 (8:4792) + duty 0 + unknownsfx0x20 2, 241, 0, 2 + unknownsfx0x20 3, 241, 0, 7 + unknownsfx0x20 4, 241, 0, 5 + unknownsfx0x20 5, 241, 240, 7 + loopchannel 8, SFX_Battle_2E_Ch1 + endchannel + + +SFX_Battle_2E_Ch2: ; 207a9 (8:47a9) + dutycycle 179 + unknownsfx0x20 2, 225, 2, 3 + unknownsfx0x20 3, 225, 242, 7 + unknownsfx0x20 4, 225, 2, 6 + unknownsfx0x20 5, 225, 2, 7 + loopchannel 8, SFX_Battle_2E_Ch2 + endchannel + + +SFX_Battle_2E_Ch3: ; 207c0 (8:47c0) + unknownnoise0x20 2, 211, 16 + unknownnoise0x20 3, 211, 17 + unknownnoise0x20 2, 210, 16 + unknownnoise0x20 5, 210, 18 + loopchannel 9, SFX_Battle_2E_Ch3 + endchannel diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm new file mode 100644 index 00000000..4b1d9b2c --- /dev/null +++ b/audio/sfx/battle_2f.asm @@ -0,0 +1,21 @@ +SFX_Battle_2F_Ch1: ; 207d1 (8:47d1) + dutycycle 43 + unknownsfx0x20 3, 241, 240, 7 + unknownsfx0x20 4, 242, 0, 2 + loopchannel 8, SFX_Battle_2F_Ch1 + endchannel + + +SFX_Battle_2F_Ch2: ; 207e0 (8:47e0) + dutycycle 179 + unknownsfx0x20 4, 226, 2, 2 + unknownsfx0x20 4, 225, 226, 7 + loopchannel 9, SFX_Battle_2F_Ch2 + endchannel + + +SFX_Battle_2F_Ch3: ; 207ef (8:47ef) + unknownnoise0x20 4, 255, 67 + unknownnoise0x20 4, 242, 68 + loopchannel 9, SFX_Battle_2F_Ch3 + endchannel diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm new file mode 100644 index 00000000..5d3e2e40 --- /dev/null +++ b/audio/sfx/battle_31.asm @@ -0,0 +1,18 @@ +SFX_Battle_31_Ch1: ; 20847 (8:4847) + duty 2 + unknownsfx0x20 15, 255, 224, 7 + unknownsfx0x20 15, 255, 224, 7 + unknownsfx0x20 15, 255, 224, 7 + unknownsfx0x20 15, 255, 224, 7 + unknownsfx0x20 15, 242, 224, 7 + endchannel + + +SFX_Battle_31_Ch2: ; 2085e (8:485e) + duty 3 + unknownsfx0x20 15, 255, 226, 7 + unknownsfx0x20 15, 255, 225, 7 + unknownsfx0x20 15, 255, 226, 7 + unknownsfx0x20 15, 255, 225, 7 + unknownsfx0x20 15, 242, 226, 7 + endchannel diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm new file mode 100644 index 00000000..c949fb5b --- /dev/null +++ b/audio/sfx/battle_32.asm @@ -0,0 +1,12 @@ +SFX_Battle_32_Ch1: ; 20875 (8:4875) + duty 2 + unknownsfx0x10 175 + unknownsfx0x20 8, 241, 0, 7 + unknownsfx0x10 8 + endchannel + + +SFX_Battle_32_Ch2: ; 20880 (8:4880) + duty 3 + unknownsfx0x20 8, 241, 1, 7 + endchannel diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm new file mode 100644 index 00000000..8b2bd17d --- /dev/null +++ b/audio/sfx/battle_33.asm @@ -0,0 +1,18 @@ +SFX_Battle_33_Ch1: ; 20887 (8:4887) + duty 2 + unknownsfx0x20 6, 241, 0, 5 + unknownsfx0x20 6, 241, 128, 5 + unknownsfx0x20 6, 241, 0, 6 + unknownsfx0x20 6, 241, 128, 6 + unknownsfx0x20 8, 241, 0, 7 + endchannel + + +SFX_Battle_33_Ch2: ; 2089e (8:489e) + duty 3 + unknownsfx0x20 6, 225, 16, 5 + unknownsfx0x20 6, 225, 144, 5 + unknownsfx0x20 6, 225, 16, 6 + unknownsfx0x20 6, 225, 144, 6 + unknownsfx0x20 8, 225, 16, 7 + endchannel diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm new file mode 100644 index 00000000..ac80eeea --- /dev/null +++ b/audio/sfx/battle_34.asm @@ -0,0 +1,22 @@ +SFX_Battle_34_Ch1: ; 208b5 (8:48b5) + dutycycle 237 + unknownsfx0x20 8, 255, 248, 3 + unknownsfx0x20 15, 255, 0, 4 + unknownsfx0x20 15, 243, 0, 4 + endchannel + + +SFX_Battle_34_Ch2: ; 208c4 (8:48c4) + dutycycle 180 + unknownsfx0x20 8, 239, 192, 3 + unknownsfx0x20 15, 239, 192, 3 + unknownsfx0x20 15, 227, 192, 3 + endchannel + + +SFX_Battle_34_Ch3: ; 208d3 (8:48d3) + unknownnoise0x20 4, 255, 81 + unknownnoise0x20 8, 255, 84 + unknownnoise0x20 15, 255, 85 + unknownnoise0x20 15, 243, 86 + endchannel diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm new file mode 100644 index 00000000..7e64aca9 --- /dev/null +++ b/audio/sfx/battle_35.asm @@ -0,0 +1,29 @@ +SFX_Battle_35_Ch1: ; 208e0 (8:48e0) + executemusic + vibrato 10, 2, 4 + duty 2 + notetype 10, 8, 7 + octave 5 + G# 8 + octave 6 + F# 4 + E_ 4 + octave 5 + G# 8 + endchannel + + +SFX_Battle_35_Ch2: ; 208f0 (8:48f0) + executemusic + vibrato 10, 2, 3 + duty 2 + notetype 11, 6, 7 + octave 5 + G# 8 + notetype 10, 6, 7 + octave 6 + F# 4 + E_ 4 + octave 5 + G# 8 + endchannel diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm new file mode 100644 index 00000000..f878a1c8 --- /dev/null +++ b/audio/sfx/battle_36.asm @@ -0,0 +1,47 @@ +SFX_Battle_36_Ch1: ; 20902 (8:4902) + duty 0 + unknownsfx0x20 2, 241, 128, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 144, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 160, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 176, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 192, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 208, 7 + +SFX_Battle_36_branch_20930: + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 224, 7 + loopchannel 12, SFX_Battle_36_branch_20930 + unknownsfx0x20 15, 241, 0, 7 + endchannel + + +SFX_Battle_36_Ch2: ; 20941 (8:4941) + dutycycle 179 + unknownsfx0x20 2, 241, 129, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 145, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 161, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 177, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 193, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 209, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 225, 7 + loopchannel 12, SFX_Battle_36_branch_20930 + unknownsfx0x20 15, 241, 1, 7 + endchannel + + +SFX_Battle_36_Ch3: ; 20980 (8:4980) + unknownnoise0x20 1, 209, 73 + unknownnoise0x20 1, 209, 41 + loopchannel 26, SFX_Battle_36_Ch3 + endchannel diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm new file mode 100644 index 00000000..d841f57a --- /dev/null +++ b/audio/sfx/caught_mon.asm @@ -0,0 +1,61 @@ +SFX_Caught_Mon_Ch1: ; 23a13 (8:7a13) + executemusic + tempo 256 + volume 7, 7 + duty 3 + toggleperfectpitch + notetype 6, 11, 2 + octave 3 + E_ 2 + F# 2 + G# 2 + G# 1 + G# 1 + B_ 2 + octave 4 + C# 2 + D# 2 + D# 1 + D# 1 + notetype 6, 11, 5 + E_ 8 + endchannel + + +SFX_Caught_Mon_Ch2: ; 23a2e (8:7a2e) + executemusic + duty 2 + notetype 6, 12, 2 + octave 4 + G# 2 + G# 1 + G# 1 + E_ 2 + E_ 1 + E_ 1 + B_ 2 + B_ 1 + B_ 1 + A_ 2 + A_ 1 + A_ 1 + notetype 6, 12, 5 + G# 8 + endchannel + + +SFX_Caught_Mon_Ch3: ; 23a44 (8:7a44) + executemusic + notetype 6, 1, 0 + octave 4 + B_ 2 + rest 2 + octave 5 + C# 2 + rest 2 + D# 2 + rest 2 + F# 2 + G_ 2 + G# 4 + endchannel diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm new file mode 100644 index 00000000..4b9c4a7e --- /dev/null +++ b/audio/sfx/collision_1.asm @@ -0,0 +1,6 @@ +SFX_Collision_1_Ch1: ; 8447 (2:4447) + duty 2 + unknownsfx0x10 90 + unknownsfx0x20 15, 241, 0, 3 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm new file mode 100644 index 00000000..18806c1f --- /dev/null +++ b/audio/sfx/collision_3.asm @@ -0,0 +1,6 @@ +SFX_Collision_3_Ch1: ; 7c430 (1f:4430) + duty 2 + unknownsfx0x10 90 + unknownsfx0x20 15, 241, 0, 3 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm new file mode 100644 index 00000000..f29e29ab --- /dev/null +++ b/audio/sfx/cry00_1.asm @@ -0,0 +1,21 @@ +SFX_Cry00_1_Ch1: ; 8987 (2:4987) + dutycycle 245 + unknownsfx0x20 4, 243, 24, 7 + unknownsfx0x20 15, 229, 152, 7 + unknownsfx0x20 8, 145, 88, 7 + endchannel + + +SFX_Cry00_1_Ch2: ; 8996 (2:4996) + dutycycle 160 + unknownsfx0x20 5, 179, 8, 7 + unknownsfx0x20 15, 197, 136, 7 + unknownsfx0x20 8, 113, 72, 7 + endchannel + + +SFX_Cry00_1_Ch3: ; 89a5 (2:49a5) + unknownnoise0x20 3, 161, 28 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 8, 129, 28 + endchannel diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm new file mode 100644 index 00000000..fa069f18 --- /dev/null +++ b/audio/sfx/cry00_2.asm @@ -0,0 +1,21 @@ +SFX_Cry00_2_Ch1: ; 20c2f (8:4c2f) + dutycycle 245 + unknownsfx0x20 4, 243, 24, 7 + unknownsfx0x20 15, 229, 152, 7 + unknownsfx0x20 8, 145, 88, 7 + endchannel + + +SFX_Cry00_2_Ch2: ; 20c3e (8:4c3e) + dutycycle 160 + unknownsfx0x20 5, 179, 8, 7 + unknownsfx0x20 15, 197, 136, 7 + unknownsfx0x20 8, 113, 72, 7 + endchannel + + +SFX_Cry00_2_Ch3: ; 20c4d (8:4c4d) + unknownnoise0x20 3, 161, 28 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 8, 129, 28 + endchannel diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm new file mode 100644 index 00000000..bdeadab5 --- /dev/null +++ b/audio/sfx/cry00_3.asm @@ -0,0 +1,21 @@ +SFX_Cry00_3_Ch1: ; 7c9fc (1f:49fc) + dutycycle 245 + unknownsfx0x20 4, 243, 24, 7 + unknownsfx0x20 15, 229, 152, 7 + unknownsfx0x20 8, 145, 88, 7 + endchannel + + +SFX_Cry00_3_Ch2: ; 7ca0b (1f:4a0b) + dutycycle 160 + unknownsfx0x20 5, 179, 8, 7 + unknownsfx0x20 15, 197, 136, 7 + unknownsfx0x20 8, 113, 72, 7 + endchannel + + +SFX_Cry00_3_Ch3: ; 7ca1a (1f:4a1a) + unknownnoise0x20 3, 161, 28 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 8, 129, 28 + endchannel diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm new file mode 100644 index 00000000..835d41f7 --- /dev/null +++ b/audio/sfx/cry01_1.asm @@ -0,0 +1,24 @@ +SFX_Cry01_1_Ch1: ; 8b97 (2:4b97) + dutycycle 160 + unknownsfx0x20 4, 243, 0, 6 + unknownsfx0x20 8, 213, 96, 7 + unknownsfx0x20 3, 226, 32, 7 + unknownsfx0x20 8, 209, 16, 7 + endchannel + + +SFX_Cry01_1_Ch2: ; 8baa (2:4baa) + dutycycle 90 + unknownsfx0x20 5, 179, 241, 6 + unknownsfx0x20 7, 197, 82, 7 + unknownsfx0x20 3, 162, 17, 7 + unknownsfx0x20 8, 177, 1, 6 + endchannel + + +SFX_Cry01_1_Ch3: ; 8bbd (2:4bbd) + unknownnoise0x20 3, 162, 60 + unknownnoise0x20 12, 148, 44 + unknownnoise0x20 3, 130, 28 + unknownnoise0x20 8, 113, 44 + endchannel diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm new file mode 100644 index 00000000..bcafa873 --- /dev/null +++ b/audio/sfx/cry01_2.asm @@ -0,0 +1,24 @@ +SFX_Cry01_2_Ch1: ; 20e3f (8:4e3f) + dutycycle 160 + unknownsfx0x20 4, 243, 0, 6 + unknownsfx0x20 8, 213, 96, 7 + unknownsfx0x20 3, 226, 32, 7 + unknownsfx0x20 8, 209, 16, 7 + endchannel + + +SFX_Cry01_2_Ch2: ; 20e52 (8:4e52) + dutycycle 90 + unknownsfx0x20 5, 179, 241, 6 + unknownsfx0x20 7, 197, 82, 7 + unknownsfx0x20 3, 162, 17, 7 + unknownsfx0x20 8, 177, 1, 6 + endchannel + + +SFX_Cry01_2_Ch3: ; 20e65 (8:4e65) + unknownnoise0x20 3, 162, 60 + unknownnoise0x20 12, 148, 44 + unknownnoise0x20 3, 130, 28 + unknownnoise0x20 8, 113, 44 + endchannel diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm new file mode 100644 index 00000000..1a31c7ca --- /dev/null +++ b/audio/sfx/cry01_3.asm @@ -0,0 +1,24 @@ +SFX_Cry01_3_Ch1: ; 7cc0c (1f:4c0c) + dutycycle 160 + unknownsfx0x20 4, 243, 0, 6 + unknownsfx0x20 8, 213, 96, 7 + unknownsfx0x20 3, 226, 32, 7 + unknownsfx0x20 8, 209, 16, 7 + endchannel + + +SFX_Cry01_3_Ch2: ; 7cc1f (1f:4c1f) + dutycycle 90 + unknownsfx0x20 5, 179, 241, 6 + unknownsfx0x20 7, 197, 82, 7 + unknownsfx0x20 3, 162, 17, 7 + unknownsfx0x20 8, 177, 1, 6 + endchannel + + +SFX_Cry01_3_Ch3: ; 7cc32 (1f:4c32) + unknownnoise0x20 3, 162, 60 + unknownnoise0x20 12, 148, 44 + unknownnoise0x20 3, 130, 28 + unknownnoise0x20 8, 113, 44 + endchannel diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm new file mode 100644 index 00000000..97cff95e --- /dev/null +++ b/audio/sfx/cry02_1.asm @@ -0,0 +1,17 @@ +SFX_Cry02_1_Ch1: ; 8b0c (2:4b0c) + duty 0 + unknownsfx0x20 8, 245, 128, 4 + unknownsfx0x20 2, 225, 224, 5 + unknownsfx0x20 8, 209, 220, 5 + endchannel + + +SFX_Cry02_1_Ch2: ; 8b1b (2:4b1b) + dutycycle 165 + unknownsfx0x20 7, 149, 65, 4 + unknownsfx0x20 2, 129, 33, 5 + unknownsfx0x20 8, 97, 26, 5 + + +SFX_Cry02_1_Ch3: ; 8b29 (2:4b29) + endchannel diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm new file mode 100644 index 00000000..7d67fc4a --- /dev/null +++ b/audio/sfx/cry02_2.asm @@ -0,0 +1,17 @@ +SFX_Cry02_2_Ch1: ; 20db4 (8:4db4) + duty 0 + unknownsfx0x20 8, 245, 128, 4 + unknownsfx0x20 2, 225, 224, 5 + unknownsfx0x20 8, 209, 220, 5 + endchannel + + +SFX_Cry02_2_Ch2: ; 20dc3 (8:4dc3) + dutycycle 165 + unknownsfx0x20 7, 149, 65, 4 + unknownsfx0x20 2, 129, 33, 5 + unknownsfx0x20 8, 97, 26, 5 + + +SFX_Cry02_2_Ch3: ; 20dd1 (8:4dd1) + endchannel diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm new file mode 100644 index 00000000..604d084a --- /dev/null +++ b/audio/sfx/cry02_3.asm @@ -0,0 +1,17 @@ +SFX_Cry02_3_Ch1: ; 7cb81 (1f:4b81) + duty 0 + unknownsfx0x20 8, 245, 128, 4 + unknownsfx0x20 2, 225, 224, 5 + unknownsfx0x20 8, 209, 220, 5 + endchannel + + +SFX_Cry02_3_Ch2: ; 7cb90 (1f:4b90) + dutycycle 165 + unknownsfx0x20 7, 149, 65, 4 + unknownsfx0x20 2, 129, 33, 5 + unknownsfx0x20 8, 97, 26, 5 + + +SFX_Cry02_3_Ch3: ; 7cb9e (1f:4b9e) + endchannel diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm new file mode 100644 index 00000000..42f2c5d3 --- /dev/null +++ b/audio/sfx/cry03_1.asm @@ -0,0 +1,30 @@ +SFX_Cry03_1_Ch1: ; 88a6 (2:48a6) + dutycycle 240 + unknownsfx0x20 4, 247, 8, 6 + unknownsfx0x20 6, 230, 0, 6 + unknownsfx0x20 6, 215, 240, 5 + unknownsfx0x20 6, 196, 224, 5 + unknownsfx0x20 5, 211, 192, 5 + unknownsfx0x20 4, 211, 160, 5 + unknownsfx0x20 8, 225, 128, 5 + endchannel + + +SFX_Cry03_1_Ch2: ; 88c5 (2:48c5) + dutycycle 10 + unknownsfx0x20 4, 199, 4, 5 + unknownsfx0x20 6, 166, 2, 5 + unknownsfx0x20 6, 151, 241, 4 + unknownsfx0x20 4, 180, 225, 4 + unknownsfx0x20 5, 163, 194, 4 + unknownsfx0x20 4, 179, 163, 4 + unknownsfx0x20 8, 193, 130, 4 + endchannel + + +SFX_Cry03_1_Ch3: ; 88e4 (2:48e4) + unknownnoise0x20 12, 228, 76 + unknownnoise0x20 10, 199, 92 + unknownnoise0x20 12, 182, 76 + unknownnoise0x20 15, 162, 92 + endchannel diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm new file mode 100644 index 00000000..92dab482 --- /dev/null +++ b/audio/sfx/cry03_2.asm @@ -0,0 +1,30 @@ +SFX_Cry03_2_Ch1: ; 20b4e (8:4b4e) + dutycycle 240 + unknownsfx0x20 4, 247, 8, 6 + unknownsfx0x20 6, 230, 0, 6 + unknownsfx0x20 6, 215, 240, 5 + unknownsfx0x20 6, 196, 224, 5 + unknownsfx0x20 5, 211, 192, 5 + unknownsfx0x20 4, 211, 160, 5 + unknownsfx0x20 8, 225, 128, 5 + endchannel + + +SFX_Cry03_2_Ch2: ; 20b6d (8:4b6d) + dutycycle 10 + unknownsfx0x20 4, 199, 4, 5 + unknownsfx0x20 6, 166, 2, 5 + unknownsfx0x20 6, 151, 241, 4 + unknownsfx0x20 4, 180, 225, 4 + unknownsfx0x20 5, 163, 194, 4 + unknownsfx0x20 4, 179, 163, 4 + unknownsfx0x20 8, 193, 130, 4 + endchannel + + +SFX_Cry03_2_Ch3: ; 20b8c (8:4b8c) + unknownnoise0x20 12, 228, 76 + unknownnoise0x20 10, 199, 92 + unknownnoise0x20 12, 182, 76 + unknownnoise0x20 15, 162, 92 + endchannel diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm new file mode 100644 index 00000000..0161b820 --- /dev/null +++ b/audio/sfx/cry03_3.asm @@ -0,0 +1,30 @@ +SFX_Cry03_3_Ch1: ; 7c91b (1f:491b) + dutycycle 240 + unknownsfx0x20 4, 247, 8, 6 + unknownsfx0x20 6, 230, 0, 6 + unknownsfx0x20 6, 215, 240, 5 + unknownsfx0x20 6, 196, 224, 5 + unknownsfx0x20 5, 211, 192, 5 + unknownsfx0x20 4, 211, 160, 5 + unknownsfx0x20 8, 225, 128, 5 + endchannel + + +SFX_Cry03_3_Ch2: ; 7c93a (1f:493a) + dutycycle 10 + unknownsfx0x20 4, 199, 4, 5 + unknownsfx0x20 6, 166, 2, 5 + unknownsfx0x20 6, 151, 241, 4 + unknownsfx0x20 4, 180, 225, 4 + unknownsfx0x20 5, 163, 194, 4 + unknownsfx0x20 4, 179, 163, 4 + unknownsfx0x20 8, 193, 130, 4 + endchannel + + +SFX_Cry03_3_Ch3: ; 7c959 (1f:4959) + unknownnoise0x20 12, 228, 76 + unknownnoise0x20 10, 199, 92 + unknownnoise0x20 12, 182, 76 + unknownnoise0x20 15, 162, 92 + endchannel diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm new file mode 100644 index 00000000..c80a6bd9 --- /dev/null +++ b/audio/sfx/cry04_1.asm @@ -0,0 +1,32 @@ +SFX_Cry04_1_Ch1: ; 8c55 (2:4c55) + dutycycle 240 + unknownsfx0x20 4, 247, 160, 6 + unknownsfx0x20 8, 230, 164, 6 + unknownsfx0x20 4, 214, 160, 6 + unknownsfx0x20 12, 211, 32, 6 + unknownsfx0x20 8, 195, 36, 6 + unknownsfx0x20 4, 194, 32, 6 + unknownsfx0x20 8, 177, 16, 6 + endchannel + + +SFX_Cry04_1_Ch2: ; 8c74 (2:4c74) + dutycycle 90 + unknownsfx0x20 4, 231, 1, 6 + unknownsfx0x20 8, 214, 3, 6 + unknownsfx0x20 4, 198, 1, 6 + unknownsfx0x20 12, 195, 129, 5 + unknownsfx0x20 8, 179, 131, 5 + unknownsfx0x20 4, 178, 130, 5 + unknownsfx0x20 8, 161, 113, 5 + endchannel + + +SFX_Cry04_1_Ch3: ; 8c93 (2:4c93) + unknownnoise0x20 7, 214, 92 + unknownnoise0x20 8, 230, 76 + unknownnoise0x20 4, 212, 92 + unknownnoise0x20 4, 212, 76 + unknownnoise0x20 7, 195, 76 + unknownnoise0x20 8, 161, 92 + endchannel diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm new file mode 100644 index 00000000..dcd866da --- /dev/null +++ b/audio/sfx/cry04_2.asm @@ -0,0 +1,32 @@ +SFX_Cry04_2_Ch1: ; 20efd (8:4efd) + dutycycle 240 + unknownsfx0x20 4, 247, 160, 6 + unknownsfx0x20 8, 230, 164, 6 + unknownsfx0x20 4, 214, 160, 6 + unknownsfx0x20 12, 211, 32, 6 + unknownsfx0x20 8, 195, 36, 6 + unknownsfx0x20 4, 194, 32, 6 + unknownsfx0x20 8, 177, 16, 6 + endchannel + + +SFX_Cry04_2_Ch2: ; 20f1c (8:4f1c) + dutycycle 90 + unknownsfx0x20 4, 231, 1, 6 + unknownsfx0x20 8, 214, 3, 6 + unknownsfx0x20 4, 198, 1, 6 + unknownsfx0x20 12, 195, 129, 5 + unknownsfx0x20 8, 179, 131, 5 + unknownsfx0x20 4, 178, 130, 5 + unknownsfx0x20 8, 161, 113, 5 + endchannel + + +SFX_Cry04_2_Ch3: ; 20f3b (8:4f3b) + unknownnoise0x20 7, 214, 92 + unknownnoise0x20 8, 230, 76 + unknownnoise0x20 4, 212, 92 + unknownnoise0x20 4, 212, 76 + unknownnoise0x20 7, 195, 76 + unknownnoise0x20 8, 161, 92 + endchannel diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm new file mode 100644 index 00000000..5d8c6df9 --- /dev/null +++ b/audio/sfx/cry04_3.asm @@ -0,0 +1,32 @@ +SFX_Cry04_3_Ch1: ; 7ccca (1f:4cca) + dutycycle 240 + unknownsfx0x20 4, 247, 160, 6 + unknownsfx0x20 8, 230, 164, 6 + unknownsfx0x20 4, 214, 160, 6 + unknownsfx0x20 12, 211, 32, 6 + unknownsfx0x20 8, 195, 36, 6 + unknownsfx0x20 4, 194, 32, 6 + unknownsfx0x20 8, 177, 16, 6 + endchannel + + +SFX_Cry04_3_Ch2: ; 7cce9 (1f:4ce9) + dutycycle 90 + unknownsfx0x20 4, 231, 1, 6 + unknownsfx0x20 8, 214, 3, 6 + unknownsfx0x20 4, 198, 1, 6 + unknownsfx0x20 12, 195, 129, 5 + unknownsfx0x20 8, 179, 131, 5 + unknownsfx0x20 4, 178, 130, 5 + unknownsfx0x20 8, 161, 113, 5 + endchannel + + +SFX_Cry04_3_Ch3: ; 7cd08 (1f:4d08) + unknownnoise0x20 7, 214, 92 + unknownnoise0x20 8, 230, 76 + unknownnoise0x20 4, 212, 92 + unknownnoise0x20 4, 212, 76 + unknownnoise0x20 7, 195, 76 + unknownnoise0x20 8, 161, 92 + endchannel diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm new file mode 100644 index 00000000..891cc50e --- /dev/null +++ b/audio/sfx/cry05_1.asm @@ -0,0 +1,19 @@ +SFX_Cry05_1_Ch1: ; 8a35 (2:4a35) + dutycycle 10 + unknownsfx0x20 6, 226, 0, 5 + unknownsfx0x20 6, 227, 128, 5 + unknownsfx0x20 6, 211, 112, 5 + unknownsfx0x20 8, 161, 96, 5 + endchannel + + +SFX_Cry05_1_Ch2: ; 8a48 (2:4a48) + dutycycle 245 + unknownsfx0x20 6, 226, 130, 4 + unknownsfx0x20 6, 211, 1, 5 + unknownsfx0x20 6, 178, 226, 4 + unknownsfx0x20 8, 129, 193, 4 + + +SFX_Cry05_1_Ch3: ; 8a5a (2:4a5a) + endchannel diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm new file mode 100644 index 00000000..98df4c1d --- /dev/null +++ b/audio/sfx/cry05_2.asm @@ -0,0 +1,19 @@ +SFX_Cry05_2_Ch1: ; 20cdd (8:4cdd) + dutycycle 10 + unknownsfx0x20 6, 226, 0, 5 + unknownsfx0x20 6, 227, 128, 5 + unknownsfx0x20 6, 211, 112, 5 + unknownsfx0x20 8, 161, 96, 5 + endchannel + + +SFX_Cry05_2_Ch2: ; 20cf0 (8:4cf0) + dutycycle 245 + unknownsfx0x20 6, 226, 130, 4 + unknownsfx0x20 6, 211, 1, 5 + unknownsfx0x20 6, 178, 226, 4 + unknownsfx0x20 8, 129, 193, 4 + + +SFX_Cry05_2_Ch3: ; 20d02 (8:4d02) + endchannel diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm new file mode 100644 index 00000000..a7f88abf --- /dev/null +++ b/audio/sfx/cry05_3.asm @@ -0,0 +1,19 @@ +SFX_Cry05_3_Ch1: ; 7caaa (1f:4aaa) + dutycycle 10 + unknownsfx0x20 6, 226, 0, 5 + unknownsfx0x20 6, 227, 128, 5 + unknownsfx0x20 6, 211, 112, 5 + unknownsfx0x20 8, 161, 96, 5 + endchannel + + +SFX_Cry05_3_Ch2: ; 7cabd (1f:4abd) + dutycycle 245 + unknownsfx0x20 6, 226, 130, 4 + unknownsfx0x20 6, 211, 1, 5 + unknownsfx0x20 6, 178, 226, 4 + unknownsfx0x20 8, 129, 193, 4 + + +SFX_Cry05_3_Ch3: ; 7cacf (1f:4acf) + endchannel diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm new file mode 100644 index 00000000..b26004e2 --- /dev/null +++ b/audio/sfx/cry06_1.asm @@ -0,0 +1,22 @@ +SFX_Cry06_1_Ch1: ; 89df (2:49df) + dutycycle 250 + unknownsfx0x20 6, 131, 71, 2 + unknownsfx0x20 15, 98, 38, 2 + unknownsfx0x20 4, 82, 69, 2 + unknownsfx0x20 9, 99, 6, 2 + unknownsfx0x20 15, 130, 37, 2 + unknownsfx0x20 15, 66, 7, 2 + + +SFX_Cry06_1_Ch2: ; 89f9 (2:49f9) + endchannel + + +SFX_Cry06_1_Ch3: ; 89fa (2:49fa) + unknownnoise0x20 8, 212, 140 + unknownnoise0x20 4, 226, 156 + unknownnoise0x20 15, 198, 140 + unknownnoise0x20 8, 228, 172 + unknownnoise0x20 15, 215, 156 + unknownnoise0x20 15, 242, 172 + endchannel diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm new file mode 100644 index 00000000..283c1360 --- /dev/null +++ b/audio/sfx/cry06_2.asm @@ -0,0 +1,22 @@ +SFX_Cry06_2_Ch1: ; 20c87 (8:4c87) + dutycycle 250 + unknownsfx0x20 6, 131, 71, 2 + unknownsfx0x20 15, 98, 38, 2 + unknownsfx0x20 4, 82, 69, 2 + unknownsfx0x20 9, 99, 6, 2 + unknownsfx0x20 15, 130, 37, 2 + unknownsfx0x20 15, 66, 7, 2 + + +SFX_Cry06_2_Ch2: ; 20ca1 (8:4ca1) + endchannel + + +SFX_Cry06_2_Ch3: ; 20ca2 (8:4ca2) + unknownnoise0x20 8, 212, 140 + unknownnoise0x20 4, 226, 156 + unknownnoise0x20 15, 198, 140 + unknownnoise0x20 8, 228, 172 + unknownnoise0x20 15, 215, 156 + unknownnoise0x20 15, 242, 172 + endchannel diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm new file mode 100644 index 00000000..9feecc3b --- /dev/null +++ b/audio/sfx/cry06_3.asm @@ -0,0 +1,22 @@ +SFX_Cry06_3_Ch1: ; 7ca54 (1f:4a54) + dutycycle 250 + unknownsfx0x20 6, 131, 71, 2 + unknownsfx0x20 15, 98, 38, 2 + unknownsfx0x20 4, 82, 69, 2 + unknownsfx0x20 9, 99, 6, 2 + unknownsfx0x20 15, 130, 37, 2 + unknownsfx0x20 15, 66, 7, 2 + + +SFX_Cry06_3_Ch2: ; 7ca6e (1f:4a6e) + endchannel + + +SFX_Cry06_3_Ch3: ; 7ca6f (1f:4a6f) + unknownnoise0x20 8, 212, 140 + unknownnoise0x20 4, 226, 156 + unknownnoise0x20 15, 198, 140 + unknownnoise0x20 8, 228, 172 + unknownnoise0x20 15, 215, 156 + unknownnoise0x20 15, 242, 172 + endchannel diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm new file mode 100644 index 00000000..b1346b94 --- /dev/null +++ b/audio/sfx/cry07_1.asm @@ -0,0 +1,21 @@ +SFX_Cry07_1_Ch1: ; 8a0d (2:4a0d) + dutycycle 240 + unknownsfx0x20 4, 243, 224, 6 + unknownsfx0x20 15, 228, 64, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + + +SFX_Cry07_1_Ch2: ; 8a1c (2:4a1c) + dutycycle 10 + unknownsfx0x20 3, 195, 131, 6 + unknownsfx0x20 14, 180, 2, 6 + unknownsfx0x20 8, 161, 1, 6 + endchannel + + +SFX_Cry07_1_Ch3: ; 8a2b (2:4a2b) + unknownnoise0x20 4, 211, 92 + unknownnoise0x20 15, 230, 76 + unknownnoise0x20 8, 177, 92 + endchannel diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm new file mode 100644 index 00000000..075b7139 --- /dev/null +++ b/audio/sfx/cry07_2.asm @@ -0,0 +1,21 @@ +SFX_Cry07_2_Ch1: ; 20cb5 (8:4cb5) + dutycycle 240 + unknownsfx0x20 4, 243, 224, 6 + unknownsfx0x20 15, 228, 64, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + + +SFX_Cry07_2_Ch2: ; 20cc4 (8:4cc4) + dutycycle 10 + unknownsfx0x20 3, 195, 131, 6 + unknownsfx0x20 14, 180, 2, 6 + unknownsfx0x20 8, 161, 1, 6 + endchannel + + +SFX_Cry07_2_Ch3: ; 20cd3 (8:4cd3) + unknownnoise0x20 4, 211, 92 + unknownnoise0x20 15, 230, 76 + unknownnoise0x20 8, 177, 92 + endchannel diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm new file mode 100644 index 00000000..4955e115 --- /dev/null +++ b/audio/sfx/cry07_3.asm @@ -0,0 +1,21 @@ +SFX_Cry07_3_Ch1: ; 7ca82 (1f:4a82) + dutycycle 240 + unknownsfx0x20 4, 243, 224, 6 + unknownsfx0x20 15, 228, 64, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + + +SFX_Cry07_3_Ch2: ; 7ca91 (1f:4a91) + dutycycle 10 + unknownsfx0x20 3, 195, 131, 6 + unknownsfx0x20 14, 180, 2, 6 + unknownsfx0x20 8, 161, 1, 6 + endchannel + + +SFX_Cry07_3_Ch3: ; 7caa0 (1f:4aa0) + unknownnoise0x20 4, 211, 92 + unknownnoise0x20 15, 230, 76 + unknownnoise0x20 8, 177, 92 + endchannel diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm new file mode 100644 index 00000000..65131766 --- /dev/null +++ b/audio/sfx/cry08_1.asm @@ -0,0 +1,23 @@ +SFX_Cry08_1_Ch1: ; 8c25 (2:4c25) + dutycycle 240 + unknownsfx0x20 15, 246, 101, 5 + unknownsfx0x20 10, 228, 124, 5 + unknownsfx0x20 3, 194, 92, 5 + unknownsfx0x20 15, 178, 60, 5 + endchannel + + +SFX_Cry08_1_Ch2: ; 8c38 (2:4c38) + dutycycle 90 + unknownsfx0x20 14, 214, 3, 5 + unknownsfx0x20 9, 180, 27, 5 + unknownsfx0x20 4, 146, 250, 4 + unknownsfx0x20 15, 162, 219, 4 + endchannel + + +SFX_Cry08_1_Ch3: ; 8c4b (2:4c4b) + unknownnoise0x20 12, 230, 76 + unknownnoise0x20 11, 215, 92 + unknownnoise0x20 15, 194, 76 + endchannel diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm new file mode 100644 index 00000000..71a0e205 --- /dev/null +++ b/audio/sfx/cry08_2.asm @@ -0,0 +1,23 @@ +SFX_Cry08_2_Ch1: ; 20ecd (8:4ecd) + dutycycle 240 + unknownsfx0x20 15, 246, 101, 5 + unknownsfx0x20 10, 228, 124, 5 + unknownsfx0x20 3, 194, 92, 5 + unknownsfx0x20 15, 178, 60, 5 + endchannel + + +SFX_Cry08_2_Ch2: ; 20ee0 (8:4ee0) + dutycycle 90 + unknownsfx0x20 14, 214, 3, 5 + unknownsfx0x20 9, 180, 27, 5 + unknownsfx0x20 4, 146, 250, 4 + unknownsfx0x20 15, 162, 219, 4 + endchannel + + +SFX_Cry08_2_Ch3: ; 20ef3 (8:4ef3) + unknownnoise0x20 12, 230, 76 + unknownnoise0x20 11, 215, 92 + unknownnoise0x20 15, 194, 76 + endchannel diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm new file mode 100644 index 00000000..bfda8c3d --- /dev/null +++ b/audio/sfx/cry08_3.asm @@ -0,0 +1,23 @@ +SFX_Cry08_3_Ch1: ; 7cc9a (1f:4c9a) + dutycycle 240 + unknownsfx0x20 15, 246, 101, 5 + unknownsfx0x20 10, 228, 124, 5 + unknownsfx0x20 3, 194, 92, 5 + unknownsfx0x20 15, 178, 60, 5 + endchannel + + +SFX_Cry08_3_Ch2: ; 7ccad (1f:4cad) + dutycycle 90 + unknownsfx0x20 14, 214, 3, 5 + unknownsfx0x20 9, 180, 27, 5 + unknownsfx0x20 4, 146, 250, 4 + unknownsfx0x20 15, 162, 219, 4 + endchannel + + +SFX_Cry08_3_Ch3: ; 7ccc0 (1f:4cc0) + unknownnoise0x20 12, 230, 76 + unknownnoise0x20 11, 215, 92 + unknownnoise0x20 15, 194, 76 + endchannel diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm new file mode 100644 index 00000000..29dffdb6 --- /dev/null +++ b/audio/sfx/cry09_1.asm @@ -0,0 +1,35 @@ +SFX_Cry09_1_Ch1: ; 872f (2:472f) + dutycycle 240 + unknownsfx0x20 15, 247, 160, 7 + unknownsfx0x20 6, 230, 163, 7 + unknownsfx0x20 10, 244, 160, 7 + dutycycle 165 + unknownsfx0x20 10, 246, 216, 7 + unknownsfx0x20 4, 227, 215, 7 + unknownsfx0x20 15, 242, 216, 7 + endchannel + + +SFX_Cry09_1_Ch2: ; 874c (2:474c) + dutycycle 5 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 15, 167, 161, 6 + unknownsfx0x20 6, 134, 162, 6 + unknownsfx0x20 10, 116, 161, 6 + dutycycle 95 + unknownsfx0x20 10, 118, 214, 6 + unknownsfx0x20 4, 131, 217, 6 + unknownsfx0x20 15, 162, 215, 6 + endchannel + + +SFX_Cry09_1_Ch3: ; 876d (2:476d) + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 6, 197, 59 + unknownnoise0x20 6, 228, 61 + unknownnoise0x20 8, 182, 60 + unknownnoise0x20 6, 212, 61 + unknownnoise0x20 8, 193, 59 + endchannel diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm new file mode 100644 index 00000000..c0e61ec7 --- /dev/null +++ b/audio/sfx/cry09_2.asm @@ -0,0 +1,35 @@ +SFX_Cry09_2_Ch1: ; 209d7 (8:49d7) + dutycycle 240 + unknownsfx0x20 15, 247, 160, 7 + unknownsfx0x20 6, 230, 163, 7 + unknownsfx0x20 10, 244, 160, 7 + dutycycle 165 + unknownsfx0x20 10, 246, 216, 7 + unknownsfx0x20 4, 227, 215, 7 + unknownsfx0x20 15, 242, 216, 7 + endchannel + + +SFX_Cry09_2_Ch2: ; 209f4 (8:49f4) + dutycycle 5 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 15, 167, 161, 6 + unknownsfx0x20 6, 134, 162, 6 + unknownsfx0x20 10, 116, 161, 6 + dutycycle 95 + unknownsfx0x20 10, 118, 214, 6 + unknownsfx0x20 4, 131, 217, 6 + unknownsfx0x20 15, 162, 215, 6 + endchannel + + +SFX_Cry09_2_Ch3: ; 20a15 (8:4a15) + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 6, 197, 59 + unknownnoise0x20 6, 228, 61 + unknownnoise0x20 8, 182, 60 + unknownnoise0x20 6, 212, 61 + unknownnoise0x20 8, 193, 59 + endchannel diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm new file mode 100644 index 00000000..c5c0f599 --- /dev/null +++ b/audio/sfx/cry09_3.asm @@ -0,0 +1,35 @@ +SFX_Cry09_3_Ch1: ; 7c7a4 (1f:47a4) + dutycycle 240 + unknownsfx0x20 15, 247, 160, 7 + unknownsfx0x20 6, 230, 163, 7 + unknownsfx0x20 10, 244, 160, 7 + dutycycle 165 + unknownsfx0x20 10, 246, 216, 7 + unknownsfx0x20 4, 227, 215, 7 + unknownsfx0x20 15, 242, 216, 7 + endchannel + + +SFX_Cry09_3_Ch2: ; 7c7c1 (1f:47c1) + dutycycle 5 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 15, 167, 161, 6 + unknownsfx0x20 6, 134, 162, 6 + unknownsfx0x20 10, 116, 161, 6 + dutycycle 95 + unknownsfx0x20 10, 118, 214, 6 + unknownsfx0x20 4, 131, 217, 6 + unknownsfx0x20 15, 162, 215, 6 + endchannel + + +SFX_Cry09_3_Ch3: ; 7c7e2 (1f:47e2) + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 6, 197, 59 + unknownnoise0x20 6, 228, 61 + unknownnoise0x20 8, 182, 60 + unknownnoise0x20 6, 212, 61 + unknownnoise0x20 8, 193, 59 + endchannel diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm new file mode 100644 index 00000000..9a8e616b --- /dev/null +++ b/audio/sfx/cry0a_1.asm @@ -0,0 +1,35 @@ +SFX_Cry0A_1_Ch1: ; 8bca (2:4bca) + dutycycle 240 + unknownsfx0x20 8, 247, 224, 6 + unknownsfx0x20 6, 230, 229, 6 + unknownsfx0x20 3, 244, 224, 6 + unknownsfx0x20 3, 246, 208, 6 + unknownsfx0x20 3, 227, 192, 6 + unknownsfx0x20 4, 242, 176, 6 + unknownsfx0x20 15, 162, 200, 6 + endchannel + + +SFX_Cry0A_1_Ch2: ; 8be9 (2:4be9) + dutycycle 5 + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 8, 167, 161, 6 + unknownsfx0x20 6, 134, 163, 6 + unknownsfx0x20 3, 116, 161, 6 + unknownsfx0x20 3, 118, 145, 6 + unknownsfx0x20 3, 131, 130, 6 + unknownsfx0x20 4, 162, 113, 6 + unknownsfx0x20 15, 114, 137, 6 + endchannel + + +SFX_Cry0A_1_Ch3: ; 8c0c (2:4c0c) + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 8, 215, 60 + unknownnoise0x20 5, 197, 59 + unknownnoise0x20 3, 212, 44 + unknownnoise0x20 2, 182, 60 + unknownnoise0x20 3, 164, 44 + unknownnoise0x20 8, 145, 60 + endchannel diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm new file mode 100644 index 00000000..0386099d --- /dev/null +++ b/audio/sfx/cry0a_2.asm @@ -0,0 +1,35 @@ +SFX_Cry0A_2_Ch1: ; 20e72 (8:4e72) + dutycycle 240 + unknownsfx0x20 8, 247, 224, 6 + unknownsfx0x20 6, 230, 229, 6 + unknownsfx0x20 3, 244, 224, 6 + unknownsfx0x20 3, 246, 208, 6 + unknownsfx0x20 3, 227, 192, 6 + unknownsfx0x20 4, 242, 176, 6 + unknownsfx0x20 15, 162, 200, 6 + endchannel + + +SFX_Cry0A_2_Ch2: ; 20e91 (8:4e91) + dutycycle 5 + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 8, 167, 161, 6 + unknownsfx0x20 6, 134, 163, 6 + unknownsfx0x20 3, 116, 161, 6 + unknownsfx0x20 3, 118, 145, 6 + unknownsfx0x20 3, 131, 130, 6 + unknownsfx0x20 4, 162, 113, 6 + unknownsfx0x20 15, 114, 137, 6 + endchannel + + +SFX_Cry0A_2_Ch3: ; 20eb4 (8:4eb4) + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 8, 215, 60 + unknownnoise0x20 5, 197, 59 + unknownnoise0x20 3, 212, 44 + unknownnoise0x20 2, 182, 60 + unknownnoise0x20 3, 164, 44 + unknownnoise0x20 8, 145, 60 + endchannel diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm new file mode 100644 index 00000000..4cf59333 --- /dev/null +++ b/audio/sfx/cry0a_3.asm @@ -0,0 +1,35 @@ +SFX_Cry0A_3_Ch1: ; 7cc3f (1f:4c3f) + dutycycle 240 + unknownsfx0x20 8, 247, 224, 6 + unknownsfx0x20 6, 230, 229, 6 + unknownsfx0x20 3, 244, 224, 6 + unknownsfx0x20 3, 246, 208, 6 + unknownsfx0x20 3, 227, 192, 6 + unknownsfx0x20 4, 242, 176, 6 + unknownsfx0x20 15, 162, 200, 6 + endchannel + + +SFX_Cry0A_3_Ch2: ; 7cc5e (1f:4c5e) + dutycycle 5 + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 8, 167, 161, 6 + unknownsfx0x20 6, 134, 163, 6 + unknownsfx0x20 3, 116, 161, 6 + unknownsfx0x20 3, 118, 145, 6 + unknownsfx0x20 3, 131, 130, 6 + unknownsfx0x20 4, 162, 113, 6 + unknownsfx0x20 15, 114, 137, 6 + endchannel + + +SFX_Cry0A_3_Ch3: ; 7cc81 (1f:4c81) + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 8, 215, 60 + unknownnoise0x20 5, 197, 59 + unknownnoise0x20 3, 212, 44 + unknownnoise0x20 2, 182, 60 + unknownnoise0x20 3, 164, 44 + unknownnoise0x20 8, 145, 60 + endchannel diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm new file mode 100644 index 00000000..0f0edca7 --- /dev/null +++ b/audio/sfx/cry0b_1.asm @@ -0,0 +1,37 @@ +SFX_Cry0B_1_Ch1: ; 8a5b (2:4a5b) + dutycycle 204 + unknownsfx0x20 4, 241, 0, 7 + unknownsfx0x20 4, 225, 128, 7 + unknownsfx0x20 4, 209, 64, 7 + unknownsfx0x20 4, 225, 64, 7 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 209, 0, 7 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 209, 130, 7 + unknownsfx0x20 4, 193, 66, 7 + unknownsfx0x20 8, 177, 65, 7 + endchannel + + +SFX_Cry0B_1_Ch2: ; 8a86 (2:4a86) + dutycycle 68 + unknownsfx0x20 12, 8, 0, 0 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 225, 130, 7 + unknownsfx0x20 4, 209, 65, 7 + unknownsfx0x20 4, 225, 65, 7 + unknownsfx0x20 4, 241, 130, 7 + unknownsfx0x20 8, 209, 1, 7 + endchannel + + +SFX_Cry0B_1_Ch3: ; 8aa5 (2:4aa5) + unknownnoise0x20 15, 8, 0 + unknownnoise0x20 4, 8, 0 + unknownnoise0x20 4, 209, 76 + unknownnoise0x20 4, 177, 44 + unknownnoise0x20 4, 209, 60 + unknownnoise0x20 4, 177, 60 + unknownnoise0x20 4, 193, 44 + unknownnoise0x20 8, 161, 76 + endchannel diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm new file mode 100644 index 00000000..071cd9b1 --- /dev/null +++ b/audio/sfx/cry0b_2.asm @@ -0,0 +1,37 @@ +SFX_Cry0B_2_Ch1: ; 20d03 (8:4d03) + dutycycle 204 + unknownsfx0x20 4, 241, 0, 7 + unknownsfx0x20 4, 225, 128, 7 + unknownsfx0x20 4, 209, 64, 7 + unknownsfx0x20 4, 225, 64, 7 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 209, 0, 7 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 209, 130, 7 + unknownsfx0x20 4, 193, 66, 7 + unknownsfx0x20 8, 177, 65, 7 + endchannel + + +SFX_Cry0B_2_Ch2: ; 20d2e (8:4d2e) + dutycycle 68 + unknownsfx0x20 12, 8, 0, 0 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 225, 130, 7 + unknownsfx0x20 4, 209, 65, 7 + unknownsfx0x20 4, 225, 65, 7 + unknownsfx0x20 4, 241, 130, 7 + unknownsfx0x20 8, 209, 1, 7 + endchannel + + +SFX_Cry0B_2_Ch3: ; 20d4d (8:4d4d) + unknownnoise0x20 15, 8, 0 + unknownnoise0x20 4, 8, 0 + unknownnoise0x20 4, 209, 76 + unknownnoise0x20 4, 177, 44 + unknownnoise0x20 4, 209, 60 + unknownnoise0x20 4, 177, 60 + unknownnoise0x20 4, 193, 44 + unknownnoise0x20 8, 161, 76 + endchannel diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm new file mode 100644 index 00000000..c2bd1809 --- /dev/null +++ b/audio/sfx/cry0b_3.asm @@ -0,0 +1,37 @@ +SFX_Cry0B_3_Ch1: ; 7cad0 (1f:4ad0) + dutycycle 204 + unknownsfx0x20 4, 241, 0, 7 + unknownsfx0x20 4, 225, 128, 7 + unknownsfx0x20 4, 209, 64, 7 + unknownsfx0x20 4, 225, 64, 7 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 209, 0, 7 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 209, 130, 7 + unknownsfx0x20 4, 193, 66, 7 + unknownsfx0x20 8, 177, 65, 7 + endchannel + + +SFX_Cry0B_3_Ch2: ; 7cafb (1f:4afb) + dutycycle 68 + unknownsfx0x20 12, 8, 0, 0 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 225, 130, 7 + unknownsfx0x20 4, 209, 65, 7 + unknownsfx0x20 4, 225, 65, 7 + unknownsfx0x20 4, 241, 130, 7 + unknownsfx0x20 8, 209, 1, 7 + endchannel + + +SFX_Cry0B_3_Ch3: ; 7cb1a (1f:4b1a) + unknownnoise0x20 15, 8, 0 + unknownnoise0x20 4, 8, 0 + unknownnoise0x20 4, 209, 76 + unknownnoise0x20 4, 177, 44 + unknownnoise0x20 4, 209, 60 + unknownnoise0x20 4, 177, 60 + unknownnoise0x20 4, 193, 44 + unknownnoise0x20 8, 161, 76 + endchannel diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm new file mode 100644 index 00000000..1c0f9f65 --- /dev/null +++ b/audio/sfx/cry0c_1.asm @@ -0,0 +1,29 @@ +SFX_Cry0C_1_Ch1: ; 8abe (2:4abe) + dutycycle 204 + unknownsfx0x20 8, 245, 0, 6 + unknownsfx0x20 2, 210, 56, 6 + unknownsfx0x20 2, 194, 48, 6 + unknownsfx0x20 2, 194, 40, 6 + unknownsfx0x20 2, 178, 32, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 2, 162, 24, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + + +SFX_Cry0C_1_Ch2: ; 8ae5 (2:4ae5) + dutycycle 68 + unknownsfx0x20 12, 195, 192, 5 + unknownsfx0x20 3, 177, 249, 5 + unknownsfx0x20 2, 161, 241, 5 + unknownsfx0x20 2, 161, 233, 5 + unknownsfx0x20 2, 145, 225, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 2, 129, 209, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 8, 145, 225, 5 + + +SFX_Cry0C_1_Ch3: ; 8b0b (2:4b0b) + endchannel diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm new file mode 100644 index 00000000..ef598b3e --- /dev/null +++ b/audio/sfx/cry0c_2.asm @@ -0,0 +1,29 @@ +SFX_Cry0C_2_Ch1: ; 20d66 (8:4d66) + dutycycle 204 + unknownsfx0x20 8, 245, 0, 6 + unknownsfx0x20 2, 210, 56, 6 + unknownsfx0x20 2, 194, 48, 6 + unknownsfx0x20 2, 194, 40, 6 + unknownsfx0x20 2, 178, 32, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 2, 162, 24, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + + +SFX_Cry0C_2_Ch2: ; 20d8d (8:4d8d) + dutycycle 68 + unknownsfx0x20 12, 195, 192, 5 + unknownsfx0x20 3, 177, 249, 5 + unknownsfx0x20 2, 161, 241, 5 + unknownsfx0x20 2, 161, 233, 5 + unknownsfx0x20 2, 145, 225, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 2, 129, 209, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 8, 145, 225, 5 + + +SFX_Cry0C_2_Ch3: ; 20db3 (8:4db3) + endchannel diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm new file mode 100644 index 00000000..4075ac51 --- /dev/null +++ b/audio/sfx/cry0c_3.asm @@ -0,0 +1,29 @@ +SFX_Cry0C_3_Ch1: ; 7cb33 (1f:4b33) + dutycycle 204 + unknownsfx0x20 8, 245, 0, 6 + unknownsfx0x20 2, 210, 56, 6 + unknownsfx0x20 2, 194, 48, 6 + unknownsfx0x20 2, 194, 40, 6 + unknownsfx0x20 2, 178, 32, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 2, 162, 24, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + + +SFX_Cry0C_3_Ch2: ; 7cb5a (1f:4b5a) + dutycycle 68 + unknownsfx0x20 12, 195, 192, 5 + unknownsfx0x20 3, 177, 249, 5 + unknownsfx0x20 2, 161, 241, 5 + unknownsfx0x20 2, 161, 233, 5 + unknownsfx0x20 2, 145, 225, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 2, 129, 209, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 8, 145, 225, 5 + + +SFX_Cry0C_3_Ch3: ; 7cb80 (1f:4b80) + endchannel diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm new file mode 100644 index 00000000..591bf58e --- /dev/null +++ b/audio/sfx/cry0d_1.asm @@ -0,0 +1,40 @@ +SFX_Cry0D_1_Ch1: ; 8b2a (2:4b2a) + dutycycle 136 + unknownsfx0x20 5, 242, 80, 6 + unknownsfx0x20 9, 209, 96, 6 + unknownsfx0x20 5, 226, 18, 6 + unknownsfx0x20 9, 193, 34, 6 + unknownsfx0x20 5, 242, 16, 6 + unknownsfx0x20 6, 209, 32, 6 + loopchannel 2, SFX_Cry0D_1_Ch1 + endchannel + + +SFX_Cry0D_1_Ch2: ; 8b49 (2:4b49) + dutycycle 64 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 5, 242, 81, 6 + unknownsfx0x20 9, 209, 97, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 12, 209, 33, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 4, 209, 33, 6 + endchannel + + +SFX_Cry0D_1_Ch3: ; 8b78 (2:4b78) + unknownnoise0x20 6, 210, 28 + unknownnoise0x20 9, 177, 44 + unknownnoise0x20 8, 194, 44 + unknownnoise0x20 9, 177, 60 + unknownnoise0x20 6, 194, 44 + unknownnoise0x20 9, 162, 60 + unknownnoise0x20 7, 194, 44 + unknownnoise0x20 5, 161, 60 + unknownnoise0x20 9, 194, 44 + unknownnoise0x20 4, 161, 60 + endchannel diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm new file mode 100644 index 00000000..a7ca34f1 --- /dev/null +++ b/audio/sfx/cry0d_2.asm @@ -0,0 +1,40 @@ +SFX_Cry0D_2_Ch1: ; 20dd2 (8:4dd2) + dutycycle 136 + unknownsfx0x20 5, 242, 80, 6 + unknownsfx0x20 9, 209, 96, 6 + unknownsfx0x20 5, 226, 18, 6 + unknownsfx0x20 9, 193, 34, 6 + unknownsfx0x20 5, 242, 16, 6 + unknownsfx0x20 6, 209, 32, 6 + loopchannel 2, SFX_Cry0D_2_Ch1 + endchannel + + +SFX_Cry0D_2_Ch2: ; 20df1 (8:4df1) + dutycycle 64 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 5, 242, 81, 6 + unknownsfx0x20 9, 209, 97, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 12, 209, 33, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 4, 209, 33, 6 + endchannel + + +SFX_Cry0D_2_Ch3: ; 20e20 (8:4e20) + unknownnoise0x20 6, 210, 28 + unknownnoise0x20 9, 177, 44 + unknownnoise0x20 8, 194, 44 + unknownnoise0x20 9, 177, 60 + unknownnoise0x20 6, 194, 44 + unknownnoise0x20 9, 162, 60 + unknownnoise0x20 7, 194, 44 + unknownnoise0x20 5, 161, 60 + unknownnoise0x20 9, 194, 44 + unknownnoise0x20 4, 161, 60 + endchannel diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm new file mode 100644 index 00000000..a9187dc8 --- /dev/null +++ b/audio/sfx/cry0d_3.asm @@ -0,0 +1,40 @@ +SFX_Cry0D_3_Ch1: ; 7cb9f (1f:4b9f) + dutycycle 136 + unknownsfx0x20 5, 242, 80, 6 + unknownsfx0x20 9, 209, 96, 6 + unknownsfx0x20 5, 226, 18, 6 + unknownsfx0x20 9, 193, 34, 6 + unknownsfx0x20 5, 242, 16, 6 + unknownsfx0x20 6, 209, 32, 6 + loopchannel 2, SFX_Cry0D_3_Ch1 + endchannel + + +SFX_Cry0D_3_Ch2: ; 7cbbe (1f:4bbe) + dutycycle 64 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 5, 242, 81, 6 + unknownsfx0x20 9, 209, 97, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 12, 209, 33, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 4, 209, 33, 6 + endchannel + + +SFX_Cry0D_3_Ch3: ; 7cbed (1f:4bed) + unknownnoise0x20 6, 210, 28 + unknownnoise0x20 9, 177, 44 + unknownnoise0x20 8, 194, 44 + unknownnoise0x20 9, 177, 60 + unknownnoise0x20 6, 194, 44 + unknownnoise0x20 9, 162, 60 + unknownnoise0x20 7, 194, 44 + unknownnoise0x20 5, 161, 60 + unknownnoise0x20 9, 194, 44 + unknownnoise0x20 4, 161, 60 + endchannel diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm new file mode 100644 index 00000000..1e778dea --- /dev/null +++ b/audio/sfx/cry0e_1.asm @@ -0,0 +1,23 @@ +SFX_Cry0E_1_Ch1: ; 89af (2:49af) + dutycycle 165 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 4, 242, 128, 7 + unknownsfx0x20 2, 146, 64, 7 + unknownsfx0x20 8, 225, 0, 6 + endchannel + + +SFX_Cry0E_1_Ch2: ; 89c2 (2:49c2) + dutycycle 10 + unknownsfx0x20 4, 177, 225, 6 + unknownsfx0x20 3, 194, 225, 6 + unknownsfx0x20 3, 98, 129, 6 + unknownsfx0x20 8, 177, 225, 5 + endchannel + + +SFX_Cry0E_1_Ch3: ; 89d5 (2:49d5) + unknownnoise0x20 2, 97, 50 + unknownnoise0x20 2, 97, 33 + unknownnoise0x20 8, 97, 17 + endchannel diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm new file mode 100644 index 00000000..bab74449 --- /dev/null +++ b/audio/sfx/cry0e_2.asm @@ -0,0 +1,23 @@ +SFX_Cry0E_2_Ch1: ; 20c57 (8:4c57) + dutycycle 165 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 4, 242, 128, 7 + unknownsfx0x20 2, 146, 64, 7 + unknownsfx0x20 8, 225, 0, 6 + endchannel + + +SFX_Cry0E_2_Ch2: ; 20c6a (8:4c6a) + dutycycle 10 + unknownsfx0x20 4, 177, 225, 6 + unknownsfx0x20 3, 194, 225, 6 + unknownsfx0x20 3, 98, 129, 6 + unknownsfx0x20 8, 177, 225, 5 + endchannel + + +SFX_Cry0E_2_Ch3: ; 20c7d (8:4c7d) + unknownnoise0x20 2, 97, 50 + unknownnoise0x20 2, 97, 33 + unknownnoise0x20 8, 97, 17 + endchannel diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm new file mode 100644 index 00000000..da14b3a7 --- /dev/null +++ b/audio/sfx/cry0e_3.asm @@ -0,0 +1,23 @@ +SFX_Cry0E_3_Ch1: ; 7ca24 (1f:4a24) + dutycycle 165 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 4, 242, 128, 7 + unknownsfx0x20 2, 146, 64, 7 + unknownsfx0x20 8, 225, 0, 6 + endchannel + + +SFX_Cry0E_3_Ch2: ; 7ca37 (1f:4a37) + dutycycle 10 + unknownsfx0x20 4, 177, 225, 6 + unknownsfx0x20 3, 194, 225, 6 + unknownsfx0x20 3, 98, 129, 6 + unknownsfx0x20 8, 177, 225, 5 + endchannel + + +SFX_Cry0E_3_Ch3: ; 7ca4a (1f:4a4a) + unknownnoise0x20 2, 97, 50 + unknownnoise0x20 2, 97, 33 + unknownnoise0x20 8, 97, 17 + endchannel diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm new file mode 100644 index 00000000..84563293 --- /dev/null +++ b/audio/sfx/cry0f_1.asm @@ -0,0 +1,29 @@ +SFX_Cry0F_1_Ch1: ; 88f1 (2:48f1) + dutycycle 241 + unknownsfx0x20 4, 247, 192, 7 + unknownsfx0x20 12, 230, 194, 7 + unknownsfx0x20 6, 181, 128, 6 + unknownsfx0x20 4, 196, 112, 6 + unknownsfx0x20 4, 181, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + + +SFX_Cry0F_1_Ch2: ; 890c (2:490c) + dutycycle 204 + unknownsfx0x20 3, 199, 129, 7 + unknownsfx0x20 12, 182, 128, 7 + unknownsfx0x20 6, 165, 65, 6 + unknownsfx0x20 4, 196, 50, 6 + unknownsfx0x20 6, 181, 33, 6 + unknownsfx0x20 8, 161, 2, 6 + endchannel + + +SFX_Cry0F_1_Ch3: ; 8927 (2:4927) + unknownnoise0x20 3, 228, 60 + unknownnoise0x20 12, 214, 44 + unknownnoise0x20 4, 228, 60 + unknownnoise0x20 8, 183, 92 + unknownnoise0x20 15, 194, 93 + endchannel diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm new file mode 100644 index 00000000..0fbaeb7a --- /dev/null +++ b/audio/sfx/cry0f_2.asm @@ -0,0 +1,29 @@ +SFX_Cry0F_2_Ch1: ; 20b99 (8:4b99) + dutycycle 241 + unknownsfx0x20 4, 247, 192, 7 + unknownsfx0x20 12, 230, 194, 7 + unknownsfx0x20 6, 181, 128, 6 + unknownsfx0x20 4, 196, 112, 6 + unknownsfx0x20 4, 181, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + + +SFX_Cry0F_2_Ch2: ; 20bb4 (8:4bb4) + dutycycle 204 + unknownsfx0x20 3, 199, 129, 7 + unknownsfx0x20 12, 182, 128, 7 + unknownsfx0x20 6, 165, 65, 6 + unknownsfx0x20 4, 196, 50, 6 + unknownsfx0x20 6, 181, 33, 6 + unknownsfx0x20 8, 161, 2, 6 + endchannel + + +SFX_Cry0F_2_Ch3: ; 20bcf (8:4bcf) + unknownnoise0x20 3, 228, 60 + unknownnoise0x20 12, 214, 44 + unknownnoise0x20 4, 228, 60 + unknownnoise0x20 8, 183, 92 + unknownnoise0x20 15, 194, 93 + endchannel diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm new file mode 100644 index 00000000..810ab949 --- /dev/null +++ b/audio/sfx/cry0f_3.asm @@ -0,0 +1,29 @@ +SFX_Cry0F_3_Ch1: ; 7c966 (1f:4966) + dutycycle 241 + unknownsfx0x20 4, 247, 192, 7 + unknownsfx0x20 12, 230, 194, 7 + unknownsfx0x20 6, 181, 128, 6 + unknownsfx0x20 4, 196, 112, 6 + unknownsfx0x20 4, 181, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + + +SFX_Cry0F_3_Ch2: ; 7c981 (1f:4981) + dutycycle 204 + unknownsfx0x20 3, 199, 129, 7 + unknownsfx0x20 12, 182, 128, 7 + unknownsfx0x20 6, 165, 65, 6 + unknownsfx0x20 4, 196, 50, 6 + unknownsfx0x20 6, 181, 33, 6 + unknownsfx0x20 8, 161, 2, 6 + endchannel + + +SFX_Cry0F_3_Ch3: ; 7c99c (1f:499c) + unknownnoise0x20 3, 228, 60 + unknownnoise0x20 12, 214, 44 + unknownnoise0x20 4, 228, 60 + unknownnoise0x20 8, 183, 92 + unknownnoise0x20 15, 194, 93 + endchannel diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm new file mode 100644 index 00000000..956fc910 --- /dev/null +++ b/audio/sfx/cry10_1.asm @@ -0,0 +1,31 @@ +SFX_Cry10_1_Ch1: ; 8937 (2:4937) + dutycycle 201 + unknownsfx0x20 8, 247, 128, 6 + unknownsfx0x20 2, 247, 96, 6 + unknownsfx0x20 1, 231, 64, 6 + unknownsfx0x20 1, 231, 32, 6 + unknownsfx0x20 15, 209, 0, 6 + unknownsfx0x20 4, 199, 64, 7 + unknownsfx0x20 4, 167, 48, 7 + unknownsfx0x20 15, 145, 32, 7 + endchannel + + +SFX_Cry10_1_Ch2: ; 895a (2:495a) + dutycycle 121 + unknownsfx0x20 10, 231, 130, 6 + unknownsfx0x20 2, 231, 98, 6 + unknownsfx0x20 1, 215, 66, 6 + unknownsfx0x20 1, 215, 34, 6 + unknownsfx0x20 15, 193, 2, 6 + unknownsfx0x20 4, 183, 66, 7 + unknownsfx0x20 2, 151, 50, 7 + unknownsfx0x20 15, 129, 34, 7 + endchannel + + +SFX_Cry10_1_Ch3: ; 897d (2:497d) + unknownnoise0x20 4, 116, 33 + unknownnoise0x20 4, 116, 16 + unknownnoise0x20 4, 113, 32 + endchannel diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm new file mode 100644 index 00000000..5d4cc3aa --- /dev/null +++ b/audio/sfx/cry10_2.asm @@ -0,0 +1,31 @@ +SFX_Cry10_2_Ch1: ; 20bdf (8:4bdf) + dutycycle 201 + unknownsfx0x20 8, 247, 128, 6 + unknownsfx0x20 2, 247, 96, 6 + unknownsfx0x20 1, 231, 64, 6 + unknownsfx0x20 1, 231, 32, 6 + unknownsfx0x20 15, 209, 0, 6 + unknownsfx0x20 4, 199, 64, 7 + unknownsfx0x20 4, 167, 48, 7 + unknownsfx0x20 15, 145, 32, 7 + endchannel + + +SFX_Cry10_2_Ch2: ; 20c02 (8:4c02) + dutycycle 121 + unknownsfx0x20 10, 231, 130, 6 + unknownsfx0x20 2, 231, 98, 6 + unknownsfx0x20 1, 215, 66, 6 + unknownsfx0x20 1, 215, 34, 6 + unknownsfx0x20 15, 193, 2, 6 + unknownsfx0x20 4, 183, 66, 7 + unknownsfx0x20 2, 151, 50, 7 + unknownsfx0x20 15, 129, 34, 7 + endchannel + + +SFX_Cry10_2_Ch3: ; 20c25 (8:4c25) + unknownnoise0x20 4, 116, 33 + unknownnoise0x20 4, 116, 16 + unknownnoise0x20 4, 113, 32 + endchannel diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm new file mode 100644 index 00000000..2d5df465 --- /dev/null +++ b/audio/sfx/cry10_3.asm @@ -0,0 +1,31 @@ +SFX_Cry10_3_Ch1: ; 7c9ac (1f:49ac) + dutycycle 201 + unknownsfx0x20 8, 247, 128, 6 + unknownsfx0x20 2, 247, 96, 6 + unknownsfx0x20 1, 231, 64, 6 + unknownsfx0x20 1, 231, 32, 6 + unknownsfx0x20 15, 209, 0, 6 + unknownsfx0x20 4, 199, 64, 7 + unknownsfx0x20 4, 167, 48, 7 + unknownsfx0x20 15, 145, 32, 7 + endchannel + + +SFX_Cry10_3_Ch2: ; 7c9cf (1f:49cf) + dutycycle 121 + unknownsfx0x20 10, 231, 130, 6 + unknownsfx0x20 2, 231, 98, 6 + unknownsfx0x20 1, 215, 66, 6 + unknownsfx0x20 1, 215, 34, 6 + unknownsfx0x20 15, 193, 2, 6 + unknownsfx0x20 4, 183, 66, 7 + unknownsfx0x20 2, 151, 50, 7 + unknownsfx0x20 15, 129, 34, 7 + endchannel + + +SFX_Cry10_3_Ch3: ; 7c9f2 (1f:49f2) + unknownnoise0x20 4, 116, 33 + unknownnoise0x20 4, 116, 16 + unknownnoise0x20 4, 113, 32 + endchannel diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm new file mode 100644 index 00000000..dd354c90 --- /dev/null +++ b/audio/sfx/cry11_1.asm @@ -0,0 +1,34 @@ +SFX_Cry11_1_Ch1: ; 8813 (2:4813) + dutycycle 240 + unknownsfx0x20 6, 247, 160, 7 + unknownsfx0x20 8, 230, 164, 7 + unknownsfx0x20 4, 214, 160, 7 + unknownsfx0x20 15, 211, 32, 7 + unknownsfx0x20 8, 195, 35, 7 + unknownsfx0x20 2, 194, 40, 7 + unknownsfx0x20 8, 177, 48, 7 + endchannel + + +SFX_Cry11_1_Ch2: ; 8832 (2:4832) + dutycycle 10 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 6, 167, 65, 7 + unknownsfx0x20 8, 134, 67, 7 + unknownsfx0x20 4, 118, 65, 7 + unknownsfx0x20 13, 131, 194, 6 + unknownsfx0x20 7, 115, 193, 6 + unknownsfx0x20 3, 130, 204, 6 + unknownsfx0x20 8, 113, 216, 6 + endchannel + + +SFX_Cry11_1_Ch3: ; 8855 (2:4855) + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 230, 58 + unknownnoise0x20 4, 215, 58 + unknownnoise0x20 6, 214, 44 + unknownnoise0x20 8, 229, 60 + unknownnoise0x20 12, 210, 61 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm new file mode 100644 index 00000000..37546fe1 --- /dev/null +++ b/audio/sfx/cry11_2.asm @@ -0,0 +1,34 @@ +SFX_Cry11_2_Ch1: ; 20abb (8:4abb) + dutycycle 240 + unknownsfx0x20 6, 247, 160, 7 + unknownsfx0x20 8, 230, 164, 7 + unknownsfx0x20 4, 214, 160, 7 + unknownsfx0x20 15, 211, 32, 7 + unknownsfx0x20 8, 195, 35, 7 + unknownsfx0x20 2, 194, 40, 7 + unknownsfx0x20 8, 177, 48, 7 + endchannel + + +SFX_Cry11_2_Ch2: ; 20ada (8:4ada) + dutycycle 10 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 6, 167, 65, 7 + unknownsfx0x20 8, 134, 67, 7 + unknownsfx0x20 4, 118, 65, 7 + unknownsfx0x20 13, 131, 194, 6 + unknownsfx0x20 7, 115, 193, 6 + unknownsfx0x20 3, 130, 204, 6 + unknownsfx0x20 8, 113, 216, 6 + endchannel + + +SFX_Cry11_2_Ch3: ; 20afd (8:4afd) + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 230, 58 + unknownnoise0x20 4, 215, 58 + unknownnoise0x20 6, 214, 44 + unknownnoise0x20 8, 229, 60 + unknownnoise0x20 12, 210, 61 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm new file mode 100644 index 00000000..75b9a861 --- /dev/null +++ b/audio/sfx/cry11_3.asm @@ -0,0 +1,34 @@ +SFX_Cry11_3_Ch1: ; 7c888 (1f:4888) + dutycycle 240 + unknownsfx0x20 6, 247, 160, 7 + unknownsfx0x20 8, 230, 164, 7 + unknownsfx0x20 4, 214, 160, 7 + unknownsfx0x20 15, 211, 32, 7 + unknownsfx0x20 8, 195, 35, 7 + unknownsfx0x20 2, 194, 40, 7 + unknownsfx0x20 8, 177, 48, 7 + endchannel + + +SFX_Cry11_3_Ch2: ; 7c8a7 (1f:48a7) + dutycycle 10 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 6, 167, 65, 7 + unknownsfx0x20 8, 134, 67, 7 + unknownsfx0x20 4, 118, 65, 7 + unknownsfx0x20 13, 131, 194, 6 + unknownsfx0x20 7, 115, 193, 6 + unknownsfx0x20 3, 130, 204, 6 + unknownsfx0x20 8, 113, 216, 6 + endchannel + + +SFX_Cry11_3_Ch3: ; 7c8ca (1f:48ca) + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 230, 58 + unknownnoise0x20 4, 215, 58 + unknownnoise0x20 6, 214, 44 + unknownnoise0x20 8, 229, 60 + unknownnoise0x20 12, 210, 61 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm new file mode 100644 index 00000000..a6b1a0f8 --- /dev/null +++ b/audio/sfx/cry12_1.asm @@ -0,0 +1,24 @@ +SFX_Cry12_1_Ch1: ; 8d2b (2:4d2b) + dutycycle 165 + unknownsfx0x20 12, 242, 64, 4 + unknownsfx0x20 15, 227, 160, 4 + unknownsfx0x20 4, 210, 144, 4 + unknownsfx0x20 8, 209, 128, 4 + endchannel + + +SFX_Cry12_1_Ch2: ; 8d3e (2:4d3e) + dutycycle 238 + unknownsfx0x20 11, 210, 56, 4 + unknownsfx0x20 14, 198, 152, 4 + unknownsfx0x20 3, 178, 136, 4 + unknownsfx0x20 8, 177, 120, 4 + endchannel + + +SFX_Cry12_1_Ch3: ; 8d51 (2:4d51) + unknownnoise0x20 10, 230, 108 + unknownnoise0x20 15, 210, 92 + unknownnoise0x20 3, 194, 108 + unknownnoise0x20 8, 209, 92 + endchannel diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm new file mode 100644 index 00000000..e2b29de7 --- /dev/null +++ b/audio/sfx/cry12_2.asm @@ -0,0 +1,24 @@ +SFX_Cry12_2_Ch1: ; 20fd3 (8:4fd3) + dutycycle 165 + unknownsfx0x20 12, 242, 64, 4 + unknownsfx0x20 15, 227, 160, 4 + unknownsfx0x20 4, 210, 144, 4 + unknownsfx0x20 8, 209, 128, 4 + endchannel + + +SFX_Cry12_2_Ch2: ; 20fe6 (8:4fe6) + dutycycle 238 + unknownsfx0x20 11, 210, 56, 4 + unknownsfx0x20 14, 198, 152, 4 + unknownsfx0x20 3, 178, 136, 4 + unknownsfx0x20 8, 177, 120, 4 + endchannel + + +SFX_Cry12_2_Ch3: ; 20ff9 (8:4ff9) + unknownnoise0x20 10, 230, 108 + unknownnoise0x20 15, 210, 92 + unknownnoise0x20 3, 194, 108 + unknownnoise0x20 8, 209, 92 + endchannel diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm new file mode 100644 index 00000000..143f8045 --- /dev/null +++ b/audio/sfx/cry12_3.asm @@ -0,0 +1,24 @@ +SFX_Cry12_3_Ch1: ; 7cda0 (1f:4da0) + dutycycle 165 + unknownsfx0x20 12, 242, 64, 4 + unknownsfx0x20 15, 227, 160, 4 + unknownsfx0x20 4, 210, 144, 4 + unknownsfx0x20 8, 209, 128, 4 + endchannel + + +SFX_Cry12_3_Ch2: ; 7cdb3 (1f:4db3) + dutycycle 238 + unknownsfx0x20 11, 210, 56, 4 + unknownsfx0x20 14, 198, 152, 4 + unknownsfx0x20 3, 178, 136, 4 + unknownsfx0x20 8, 177, 120, 4 + endchannel + + +SFX_Cry12_3_Ch3: ; 7cdc6 (1f:4dc6) + unknownnoise0x20 10, 230, 108 + unknownnoise0x20 15, 210, 92 + unknownnoise0x20 3, 194, 108 + unknownnoise0x20 8, 209, 92 + endchannel diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm new file mode 100644 index 00000000..c2f1002f --- /dev/null +++ b/audio/sfx/cry13_1.asm @@ -0,0 +1,30 @@ +SFX_Cry13_1_Ch1: ; 8d5e (2:4d5e) + dutycycle 51 + unknownsfx0x20 15, 246, 192, 5 + unknownsfx0x20 8, 227, 188, 5 + unknownsfx0x20 6, 210, 208, 5 + unknownsfx0x20 6, 178, 224, 5 + unknownsfx0x20 6, 194, 240, 5 + unknownsfx0x20 8, 177, 0, 6 + endchannel + + +SFX_Cry13_1_Ch2: ; 8d79 (2:4d79) + dutycycle 153 + unknownsfx0x20 14, 198, 177, 4 + unknownsfx0x20 7, 195, 173, 4 + unknownsfx0x20 5, 178, 193, 4 + unknownsfx0x20 8, 146, 209, 4 + unknownsfx0x20 6, 162, 225, 4 + unknownsfx0x20 8, 145, 241, 4 + endchannel + + +SFX_Cry13_1_Ch3: ; 8d94 (2:4d94) + unknownnoise0x20 10, 230, 92 + unknownnoise0x20 10, 214, 108 + unknownnoise0x20 4, 194, 76 + unknownnoise0x20 6, 211, 92 + unknownnoise0x20 8, 179, 76 + unknownnoise0x20 8, 161, 92 + endchannel diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm new file mode 100644 index 00000000..b072fb07 --- /dev/null +++ b/audio/sfx/cry13_2.asm @@ -0,0 +1,30 @@ +SFX_Cry13_2_Ch1: ; 21006 (8:5006) + dutycycle 51 + unknownsfx0x20 15, 246, 192, 5 + unknownsfx0x20 8, 227, 188, 5 + unknownsfx0x20 6, 210, 208, 5 + unknownsfx0x20 6, 178, 224, 5 + unknownsfx0x20 6, 194, 240, 5 + unknownsfx0x20 8, 177, 0, 6 + endchannel + + +SFX_Cry13_2_Ch2: ; 21021 (8:5021) + dutycycle 153 + unknownsfx0x20 14, 198, 177, 4 + unknownsfx0x20 7, 195, 173, 4 + unknownsfx0x20 5, 178, 193, 4 + unknownsfx0x20 8, 146, 209, 4 + unknownsfx0x20 6, 162, 225, 4 + unknownsfx0x20 8, 145, 241, 4 + endchannel + + +SFX_Cry13_2_Ch3: ; 2103c (8:503c) + unknownnoise0x20 10, 230, 92 + unknownnoise0x20 10, 214, 108 + unknownnoise0x20 4, 194, 76 + unknownnoise0x20 6, 211, 92 + unknownnoise0x20 8, 179, 76 + unknownnoise0x20 8, 161, 92 + endchannel diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm new file mode 100644 index 00000000..f2c110b8 --- /dev/null +++ b/audio/sfx/cry13_3.asm @@ -0,0 +1,30 @@ +SFX_Cry13_3_Ch1: ; 7cdd3 (1f:4dd3) + dutycycle 51 + unknownsfx0x20 15, 246, 192, 5 + unknownsfx0x20 8, 227, 188, 5 + unknownsfx0x20 6, 210, 208, 5 + unknownsfx0x20 6, 178, 224, 5 + unknownsfx0x20 6, 194, 240, 5 + unknownsfx0x20 8, 177, 0, 6 + endchannel + + +SFX_Cry13_3_Ch2: ; 7cdee (1f:4dee) + dutycycle 153 + unknownsfx0x20 14, 198, 177, 4 + unknownsfx0x20 7, 195, 173, 4 + unknownsfx0x20 5, 178, 193, 4 + unknownsfx0x20 8, 146, 209, 4 + unknownsfx0x20 6, 162, 225, 4 + unknownsfx0x20 8, 145, 241, 4 + endchannel + + +SFX_Cry13_3_Ch3: ; 7ce09 (1f:4e09) + unknownnoise0x20 10, 230, 92 + unknownnoise0x20 10, 214, 108 + unknownnoise0x20 4, 194, 76 + unknownnoise0x20 6, 211, 92 + unknownnoise0x20 8, 179, 76 + unknownnoise0x20 8, 161, 92 + endchannel diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm new file mode 100644 index 00000000..125fe86e --- /dev/null +++ b/audio/sfx/cry14_1.asm @@ -0,0 +1,21 @@ +SFX_Cry14_1_Ch1: ; 8da7 (2:4da7) + dutycycle 240 + unknownsfx0x20 8, 228, 144, 7 + unknownsfx0x20 15, 245, 192, 7 + unknownsfx0x20 8, 209, 216, 7 + endchannel + + +SFX_Cry14_1_Ch2: ; 8db6 (2:4db6) + dutycycle 165 + unknownsfx0x20 10, 196, 113, 7 + unknownsfx0x20 15, 182, 162, 7 + unknownsfx0x20 8, 161, 183, 7 + endchannel + + +SFX_Cry14_1_Ch3: ; 8dc5 (2:4dc5) + unknownnoise0x20 8, 228, 76 + unknownnoise0x20 14, 196, 60 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm new file mode 100644 index 00000000..3ba2ac26 --- /dev/null +++ b/audio/sfx/cry14_2.asm @@ -0,0 +1,21 @@ +SFX_Cry14_2_Ch1: ; 2104f (8:504f) + dutycycle 240 + unknownsfx0x20 8, 228, 144, 7 + unknownsfx0x20 15, 245, 192, 7 + unknownsfx0x20 8, 209, 216, 7 + endchannel + + +SFX_Cry14_2_Ch2: ; 2105e (8:505e) + dutycycle 165 + unknownsfx0x20 10, 196, 113, 7 + unknownsfx0x20 15, 182, 162, 7 + unknownsfx0x20 8, 161, 183, 7 + endchannel + + +SFX_Cry14_2_Ch3: ; 2106d (8:506d) + unknownnoise0x20 8, 228, 76 + unknownnoise0x20 14, 196, 60 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm new file mode 100644 index 00000000..fe2cd1e8 --- /dev/null +++ b/audio/sfx/cry14_3.asm @@ -0,0 +1,21 @@ +SFX_Cry14_3_Ch1: ; 7ce1c (1f:4e1c) + dutycycle 240 + unknownsfx0x20 8, 228, 144, 7 + unknownsfx0x20 15, 245, 192, 7 + unknownsfx0x20 8, 209, 216, 7 + endchannel + + +SFX_Cry14_3_Ch2: ; 7ce2b (1f:4e2b) + dutycycle 165 + unknownsfx0x20 10, 196, 113, 7 + unknownsfx0x20 15, 182, 162, 7 + unknownsfx0x20 8, 161, 183, 7 + endchannel + + +SFX_Cry14_3_Ch3: ; 7ce3a (1f:4e3a) + unknownnoise0x20 8, 228, 76 + unknownnoise0x20 14, 196, 60 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm new file mode 100644 index 00000000..54f94deb --- /dev/null +++ b/audio/sfx/cry15_1.asm @@ -0,0 +1,30 @@ +SFX_Cry15_1_Ch1: ; 8e35 (2:4e35) + dutycycle 240 + unknownsfx0x20 4, 243, 128, 7 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 8, 211, 16, 7 + unknownsfx0x20 4, 194, 0, 7 + unknownsfx0x20 4, 210, 240, 6 + unknownsfx0x20 8, 193, 224, 6 + endchannel + + +SFX_Cry15_1_Ch2: ; 8e50 (2:4e50) + dutycycle 90 + unknownsfx0x20 6, 195, 1, 7 + unknownsfx0x20 14, 183, 129, 6 + unknownsfx0x20 7, 179, 146, 6 + unknownsfx0x20 3, 162, 129, 6 + unknownsfx0x20 4, 178, 114, 6 + unknownsfx0x20 8, 161, 97, 6 + endchannel + + +SFX_Cry15_1_Ch3: ; 8e6b (2:4e6b) + unknownnoise0x20 6, 227, 92 + unknownnoise0x20 14, 214, 76 + unknownnoise0x20 6, 198, 60 + unknownnoise0x20 3, 179, 76 + unknownnoise0x20 3, 162, 92 + unknownnoise0x20 8, 177, 108 + endchannel diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm new file mode 100644 index 00000000..14b1af72 --- /dev/null +++ b/audio/sfx/cry15_2.asm @@ -0,0 +1,30 @@ +SFX_Cry15_2_Ch1: ; 210dd (8:50dd) + dutycycle 240 + unknownsfx0x20 4, 243, 128, 7 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 8, 211, 16, 7 + unknownsfx0x20 4, 194, 0, 7 + unknownsfx0x20 4, 210, 240, 6 + unknownsfx0x20 8, 193, 224, 6 + endchannel + + +SFX_Cry15_2_Ch2: ; 210f8 (8:50f8) + dutycycle 90 + unknownsfx0x20 6, 195, 1, 7 + unknownsfx0x20 14, 183, 129, 6 + unknownsfx0x20 7, 179, 146, 6 + unknownsfx0x20 3, 162, 129, 6 + unknownsfx0x20 4, 178, 114, 6 + unknownsfx0x20 8, 161, 97, 6 + endchannel + + +SFX_Cry15_2_Ch3: ; 21113 (8:5113) + unknownnoise0x20 6, 227, 92 + unknownnoise0x20 14, 214, 76 + unknownnoise0x20 6, 198, 60 + unknownnoise0x20 3, 179, 76 + unknownnoise0x20 3, 162, 92 + unknownnoise0x20 8, 177, 108 + endchannel diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm new file mode 100644 index 00000000..36951439 --- /dev/null +++ b/audio/sfx/cry15_3.asm @@ -0,0 +1,30 @@ +SFX_Cry15_3_Ch1: ; 7ceaa (1f:4eaa) + dutycycle 240 + unknownsfx0x20 4, 243, 128, 7 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 8, 211, 16, 7 + unknownsfx0x20 4, 194, 0, 7 + unknownsfx0x20 4, 210, 240, 6 + unknownsfx0x20 8, 193, 224, 6 + endchannel + + +SFX_Cry15_3_Ch2: ; 7cec5 (1f:4ec5) + dutycycle 90 + unknownsfx0x20 6, 195, 1, 7 + unknownsfx0x20 14, 183, 129, 6 + unknownsfx0x20 7, 179, 146, 6 + unknownsfx0x20 3, 162, 129, 6 + unknownsfx0x20 4, 178, 114, 6 + unknownsfx0x20 8, 161, 97, 6 + endchannel + + +SFX_Cry15_3_Ch3: ; 7cee0 (1f:4ee0) + unknownnoise0x20 6, 227, 92 + unknownnoise0x20 14, 214, 76 + unknownnoise0x20 6, 198, 60 + unknownnoise0x20 3, 179, 76 + unknownnoise0x20 3, 162, 92 + unknownnoise0x20 8, 177, 108 + endchannel diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm new file mode 100644 index 00000000..91fa2596 --- /dev/null +++ b/audio/sfx/cry16_1.asm @@ -0,0 +1,21 @@ +SFX_Cry16_1_Ch1: ; 8cc8 (2:4cc8) + dutycycle 240 + unknownsfx0x20 15, 215, 128, 7 + unknownsfx0x20 4, 230, 160, 7 + unknownsfx0x20 15, 210, 64, 7 + endchannel + + +SFX_Cry16_1_Ch2: ; 8cd7 (2:4cd7) + dutycycle 90 + unknownsfx0x20 15, 199, 83, 7 + unknownsfx0x20 5, 182, 114, 7 + unknownsfx0x20 15, 194, 17, 7 + endchannel + + +SFX_Cry16_1_Ch3: ; 8ce6 (2:4ce6) + unknownnoise0x20 13, 246, 76 + unknownnoise0x20 4, 230, 60 + unknownnoise0x20 15, 242, 76 + endchannel diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm new file mode 100644 index 00000000..5e29eba8 --- /dev/null +++ b/audio/sfx/cry16_2.asm @@ -0,0 +1,21 @@ +SFX_Cry16_2_Ch1: ; 20f70 (8:4f70) + dutycycle 240 + unknownsfx0x20 15, 215, 128, 7 + unknownsfx0x20 4, 230, 160, 7 + unknownsfx0x20 15, 210, 64, 7 + endchannel + + +SFX_Cry16_2_Ch2: ; 20f7f (8:4f7f) + dutycycle 90 + unknownsfx0x20 15, 199, 83, 7 + unknownsfx0x20 5, 182, 114, 7 + unknownsfx0x20 15, 194, 17, 7 + endchannel + + +SFX_Cry16_2_Ch3: ; 20f8e (8:4f8e) + unknownnoise0x20 13, 246, 76 + unknownnoise0x20 4, 230, 60 + unknownnoise0x20 15, 242, 76 + endchannel diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm new file mode 100644 index 00000000..af32e9ef --- /dev/null +++ b/audio/sfx/cry16_3.asm @@ -0,0 +1,21 @@ +SFX_Cry16_3_Ch1: ; 7cd3d (1f:4d3d) + dutycycle 240 + unknownsfx0x20 15, 215, 128, 7 + unknownsfx0x20 4, 230, 160, 7 + unknownsfx0x20 15, 210, 64, 7 + endchannel + + +SFX_Cry16_3_Ch2: ; 7cd4c (1f:4d4c) + dutycycle 90 + unknownsfx0x20 15, 199, 83, 7 + unknownsfx0x20 5, 182, 114, 7 + unknownsfx0x20 15, 194, 17, 7 + endchannel + + +SFX_Cry16_3_Ch3: ; 7cd5b (1f:4d5b) + unknownnoise0x20 13, 246, 76 + unknownnoise0x20 4, 230, 60 + unknownnoise0x20 15, 242, 76 + endchannel diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm new file mode 100644 index 00000000..2f2cde11 --- /dev/null +++ b/audio/sfx/cry17_1.asm @@ -0,0 +1,24 @@ +SFX_Cry17_1_Ch1: ; 8e7e (2:4e7e) + dutycycle 15 + unknownsfx0x20 15, 247, 0, 5 + unknownsfx0x20 15, 231, 8, 5 + unknownsfx0x20 8, 180, 128, 4 + unknownsfx0x20 15, 162, 96, 4 + endchannel + + +SFX_Cry17_1_Ch2: ; 8e91 (2:4e91) + dutycycle 68 + unknownsfx0x20 14, 215, 129, 4 + unknownsfx0x20 14, 199, 137, 4 + unknownsfx0x20 10, 180, 1, 4 + unknownsfx0x20 15, 194, 225, 3 + endchannel + + +SFX_Cry17_1_Ch3: ; 8ea4 (2:4ea4) + unknownnoise0x20 14, 247, 124 + unknownnoise0x20 12, 246, 108 + unknownnoise0x20 9, 228, 124 + unknownnoise0x20 15, 226, 108 + endchannel diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm new file mode 100644 index 00000000..cca78ae2 --- /dev/null +++ b/audio/sfx/cry17_2.asm @@ -0,0 +1,24 @@ +SFX_Cry17_2_Ch1: ; 21126 (8:5126) + dutycycle 15 + unknownsfx0x20 15, 247, 0, 5 + unknownsfx0x20 15, 231, 8, 5 + unknownsfx0x20 8, 180, 128, 4 + unknownsfx0x20 15, 162, 96, 4 + endchannel + + +SFX_Cry17_2_Ch2: ; 21139 (8:5139) + dutycycle 68 + unknownsfx0x20 14, 215, 129, 4 + unknownsfx0x20 14, 199, 137, 4 + unknownsfx0x20 10, 180, 1, 4 + unknownsfx0x20 15, 194, 225, 3 + endchannel + + +SFX_Cry17_2_Ch3: ; 2114c (8:514c) + unknownnoise0x20 14, 247, 124 + unknownnoise0x20 12, 246, 108 + unknownnoise0x20 9, 228, 124 + unknownnoise0x20 15, 226, 108 + endchannel diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm new file mode 100644 index 00000000..6aad35d0 --- /dev/null +++ b/audio/sfx/cry17_3.asm @@ -0,0 +1,24 @@ +SFX_Cry17_3_Ch1: ; 7cef3 (1f:4ef3) + dutycycle 15 + unknownsfx0x20 15, 247, 0, 5 + unknownsfx0x20 15, 231, 8, 5 + unknownsfx0x20 8, 180, 128, 4 + unknownsfx0x20 15, 162, 96, 4 + endchannel + + +SFX_Cry17_3_Ch2: ; 7cf06 (1f:4f06) + dutycycle 68 + unknownsfx0x20 14, 215, 129, 4 + unknownsfx0x20 14, 199, 137, 4 + unknownsfx0x20 10, 180, 1, 4 + unknownsfx0x20 15, 194, 225, 3 + endchannel + + +SFX_Cry17_3_Ch3: ; 7cf19 (1f:4f19) + unknownnoise0x20 14, 247, 124 + unknownnoise0x20 12, 246, 108 + unknownnoise0x20 9, 228, 124 + unknownnoise0x20 15, 226, 108 + endchannel diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm new file mode 100644 index 00000000..576ea693 --- /dev/null +++ b/audio/sfx/cry18_1.asm @@ -0,0 +1,34 @@ +SFX_Cry18_1_Ch1: ; 8f8e (2:4f8e) + dutycycle 80 + unknownsfx0x20 10, 245, 128, 6 + unknownsfx0x20 3, 226, 160, 6 + unknownsfx0x20 3, 242, 192, 6 + unknownsfx0x20 3, 226, 224, 6 + unknownsfx0x20 3, 210, 0, 7 + unknownsfx0x20 3, 194, 224, 6 + unknownsfx0x20 3, 210, 192, 6 + unknownsfx0x20 8, 193, 160, 6 + endchannel + + +SFX_Cry18_1_Ch2: ; 8fb1 (2:4fb1) + dutycycle 15 + unknownsfx0x20 9, 213, 49, 6 + unknownsfx0x20 3, 210, 82, 6 + unknownsfx0x20 3, 226, 113, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 178, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 113, 6 + unknownsfx0x20 8, 177, 81, 6 + endchannel + + +SFX_Cry18_1_Ch3: ; 8fd4 (2:4fd4) + unknownnoise0x20 6, 227, 76 + unknownnoise0x20 4, 195, 60 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 4, 196, 44 + unknownnoise0x20 6, 180, 60 + unknownnoise0x20 8, 193, 44 + endchannel diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm new file mode 100644 index 00000000..333ddb9e --- /dev/null +++ b/audio/sfx/cry18_2.asm @@ -0,0 +1,34 @@ +SFX_Cry18_2_Ch1: ; 21236 (8:5236) + dutycycle 80 + unknownsfx0x20 10, 245, 128, 6 + unknownsfx0x20 3, 226, 160, 6 + unknownsfx0x20 3, 242, 192, 6 + unknownsfx0x20 3, 226, 224, 6 + unknownsfx0x20 3, 210, 0, 7 + unknownsfx0x20 3, 194, 224, 6 + unknownsfx0x20 3, 210, 192, 6 + unknownsfx0x20 8, 193, 160, 6 + endchannel + + +SFX_Cry18_2_Ch2: ; 21259 (8:5259) + dutycycle 15 + unknownsfx0x20 9, 213, 49, 6 + unknownsfx0x20 3, 210, 82, 6 + unknownsfx0x20 3, 226, 113, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 178, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 113, 6 + unknownsfx0x20 8, 177, 81, 6 + endchannel + + +SFX_Cry18_2_Ch3: ; 2127c (8:527c) + unknownnoise0x20 6, 227, 76 + unknownnoise0x20 4, 195, 60 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 4, 196, 44 + unknownnoise0x20 6, 180, 60 + unknownnoise0x20 8, 193, 44 + endchannel diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm new file mode 100644 index 00000000..3c7b1a99 --- /dev/null +++ b/audio/sfx/cry18_3.asm @@ -0,0 +1,34 @@ +SFX_Cry18_3_Ch1: ; 7d003 (1f:5003) + dutycycle 80 + unknownsfx0x20 10, 245, 128, 6 + unknownsfx0x20 3, 226, 160, 6 + unknownsfx0x20 3, 242, 192, 6 + unknownsfx0x20 3, 226, 224, 6 + unknownsfx0x20 3, 210, 0, 7 + unknownsfx0x20 3, 194, 224, 6 + unknownsfx0x20 3, 210, 192, 6 + unknownsfx0x20 8, 193, 160, 6 + endchannel + + +SFX_Cry18_3_Ch2: ; 7d026 (1f:5026) + dutycycle 15 + unknownsfx0x20 9, 213, 49, 6 + unknownsfx0x20 3, 210, 82, 6 + unknownsfx0x20 3, 226, 113, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 178, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 113, 6 + unknownsfx0x20 8, 177, 81, 6 + endchannel + + +SFX_Cry18_3_Ch3: ; 7d049 (1f:5049) + unknownnoise0x20 6, 227, 76 + unknownnoise0x20 4, 195, 60 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 4, 196, 44 + unknownnoise0x20 6, 180, 60 + unknownnoise0x20 8, 193, 44 + endchannel diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm new file mode 100644 index 00000000..94607b9b --- /dev/null +++ b/audio/sfx/cry19_1.asm @@ -0,0 +1,18 @@ +SFX_Cry19_1_Ch1: ; 8ca6 (2:4ca6) + dutycycle 27 + unknownsfx0x20 7, 210, 64, 7 + unknownsfx0x20 15, 229, 96, 7 + unknownsfx0x20 15, 193, 48, 7 + endchannel + + +SFX_Cry19_1_Ch2: ; 8cb5 (2:4cb5) + dutycycle 129 + unknownsfx0x20 2, 194, 1, 7 + unknownsfx0x20 4, 194, 8, 7 + unknownsfx0x20 15, 215, 65, 7 + unknownsfx0x20 15, 162, 1, 7 + + +SFX_Cry19_1_Ch3: ; 8cc7 (2:4cc7) + endchannel diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm new file mode 100644 index 00000000..717a5d2b --- /dev/null +++ b/audio/sfx/cry19_2.asm @@ -0,0 +1,18 @@ +SFX_Cry19_2_Ch1: ; 20f4e (8:4f4e) + dutycycle 27 + unknownsfx0x20 7, 210, 64, 7 + unknownsfx0x20 15, 229, 96, 7 + unknownsfx0x20 15, 193, 48, 7 + endchannel + + +SFX_Cry19_2_Ch2: ; 20f5d (8:4f5d) + dutycycle 129 + unknownsfx0x20 2, 194, 1, 7 + unknownsfx0x20 4, 194, 8, 7 + unknownsfx0x20 15, 215, 65, 7 + unknownsfx0x20 15, 162, 1, 7 + + +SFX_Cry19_2_Ch3: ; 20f6f (8:4f6f) + endchannel diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm new file mode 100644 index 00000000..535be2b6 --- /dev/null +++ b/audio/sfx/cry19_3.asm @@ -0,0 +1,18 @@ +SFX_Cry19_3_Ch1: ; 7cd1b (1f:4d1b) + dutycycle 27 + unknownsfx0x20 7, 210, 64, 7 + unknownsfx0x20 15, 229, 96, 7 + unknownsfx0x20 15, 193, 48, 7 + endchannel + + +SFX_Cry19_3_Ch2: ; 7cd2a (1f:4d2a) + dutycycle 129 + unknownsfx0x20 2, 194, 1, 7 + unknownsfx0x20 4, 194, 8, 7 + unknownsfx0x20 15, 215, 65, 7 + unknownsfx0x20 15, 162, 1, 7 + + +SFX_Cry19_3_Ch3: ; 7cd3c (1f:4d3c) + endchannel diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm new file mode 100644 index 00000000..0217deef --- /dev/null +++ b/audio/sfx/cry1a_1.asm @@ -0,0 +1,30 @@ +SFX_Cry1A_1_Ch1: ; 8eff (2:4eff) + dutycycle 240 + unknownsfx0x20 6, 247, 64, 7 + unknownsfx0x20 12, 230, 68, 7 + unknownsfx0x20 6, 213, 80, 7 + unknownsfx0x20 4, 195, 96, 7 + unknownsfx0x20 3, 195, 128, 7 + unknownsfx0x20 8, 209, 160, 7 + endchannel + + +SFX_Cry1A_1_Ch2: ; 8f1a (2:4f1a) + dutycycle 10 + unknownsfx0x20 6, 199, 1, 7 + unknownsfx0x20 11, 182, 2, 7 + unknownsfx0x20 6, 165, 17, 7 + unknownsfx0x20 4, 147, 33, 7 + unknownsfx0x20 3, 163, 65, 7 + unknownsfx0x20 8, 145, 98, 7 + endchannel + + +SFX_Cry1A_1_Ch3: ; 8f35 (2:4f35) + unknownnoise0x20 3, 226, 60 + unknownnoise0x20 8, 214, 76 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 12, 199, 76 + unknownnoise0x20 2, 226, 60 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm new file mode 100644 index 00000000..c94fc657 --- /dev/null +++ b/audio/sfx/cry1a_2.asm @@ -0,0 +1,30 @@ +SFX_Cry1A_2_Ch1: ; 211a7 (8:51a7) + dutycycle 240 + unknownsfx0x20 6, 247, 64, 7 + unknownsfx0x20 12, 230, 68, 7 + unknownsfx0x20 6, 213, 80, 7 + unknownsfx0x20 4, 195, 96, 7 + unknownsfx0x20 3, 195, 128, 7 + unknownsfx0x20 8, 209, 160, 7 + endchannel + + +SFX_Cry1A_2_Ch2: ; 211c2 (8:51c2) + dutycycle 10 + unknownsfx0x20 6, 199, 1, 7 + unknownsfx0x20 11, 182, 2, 7 + unknownsfx0x20 6, 165, 17, 7 + unknownsfx0x20 4, 147, 33, 7 + unknownsfx0x20 3, 163, 65, 7 + unknownsfx0x20 8, 145, 98, 7 + endchannel + + +SFX_Cry1A_2_Ch3: ; 211dd (8:51dd) + unknownnoise0x20 3, 226, 60 + unknownnoise0x20 8, 214, 76 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 12, 199, 76 + unknownnoise0x20 2, 226, 60 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm new file mode 100644 index 00000000..29ff2ec0 --- /dev/null +++ b/audio/sfx/cry1a_3.asm @@ -0,0 +1,30 @@ +SFX_Cry1A_3_Ch1: ; 7cf74 (1f:4f74) + dutycycle 240 + unknownsfx0x20 6, 247, 64, 7 + unknownsfx0x20 12, 230, 68, 7 + unknownsfx0x20 6, 213, 80, 7 + unknownsfx0x20 4, 195, 96, 7 + unknownsfx0x20 3, 195, 128, 7 + unknownsfx0x20 8, 209, 160, 7 + endchannel + + +SFX_Cry1A_3_Ch2: ; 7cf8f (1f:4f8f) + dutycycle 10 + unknownsfx0x20 6, 199, 1, 7 + unknownsfx0x20 11, 182, 2, 7 + unknownsfx0x20 6, 165, 17, 7 + unknownsfx0x20 4, 147, 33, 7 + unknownsfx0x20 3, 163, 65, 7 + unknownsfx0x20 8, 145, 98, 7 + endchannel + + +SFX_Cry1A_3_Ch3: ; 7cfaa (1f:4faa) + unknownnoise0x20 3, 226, 60 + unknownnoise0x20 8, 214, 76 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 12, 199, 76 + unknownnoise0x20 2, 226, 60 + unknownnoise0x20 8, 209, 44 + endchannel diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm new file mode 100644 index 00000000..858d724a --- /dev/null +++ b/audio/sfx/cry1b_1.asm @@ -0,0 +1,26 @@ +SFX_Cry1B_1_Ch1: ; 8cf0 (2:4cf0) + dutycycle 240 + unknownsfx0x20 6, 247, 192, 6 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 4, 244, 240, 6 + unknownsfx0x20 4, 228, 224, 6 + unknownsfx0x20 8, 209, 208, 6 + endchannel + + +SFX_Cry1B_1_Ch2: ; 8d07 (2:4d07) + dutycycle 10 + unknownsfx0x20 7, 230, 129, 6 + unknownsfx0x20 14, 213, 193, 6 + unknownsfx0x20 4, 196, 177, 6 + unknownsfx0x20 4, 212, 161, 6 + unknownsfx0x20 8, 193, 145, 6 + endchannel + + +SFX_Cry1B_1_Ch3: ; 8d1e (2:4d1e) + unknownnoise0x20 10, 166, 60 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 5, 163, 60 + unknownnoise0x20 8, 145, 44 + endchannel diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm new file mode 100644 index 00000000..423258ee --- /dev/null +++ b/audio/sfx/cry1b_2.asm @@ -0,0 +1,26 @@ +SFX_Cry1B_2_Ch1: ; 20f98 (8:4f98) + dutycycle 240 + unknownsfx0x20 6, 247, 192, 6 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 4, 244, 240, 6 + unknownsfx0x20 4, 228, 224, 6 + unknownsfx0x20 8, 209, 208, 6 + endchannel + + +SFX_Cry1B_2_Ch2: ; 20faf (8:4faf) + dutycycle 10 + unknownsfx0x20 7, 230, 129, 6 + unknownsfx0x20 14, 213, 193, 6 + unknownsfx0x20 4, 196, 177, 6 + unknownsfx0x20 4, 212, 161, 6 + unknownsfx0x20 8, 193, 145, 6 + endchannel + + +SFX_Cry1B_2_Ch3: ; 20fc6 (8:4fc6) + unknownnoise0x20 10, 166, 60 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 5, 163, 60 + unknownnoise0x20 8, 145, 44 + endchannel diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm new file mode 100644 index 00000000..7fe6019f --- /dev/null +++ b/audio/sfx/cry1b_3.asm @@ -0,0 +1,26 @@ +SFX_Cry1B_3_Ch1: ; 7cd65 (1f:4d65) + dutycycle 240 + unknownsfx0x20 6, 247, 192, 6 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 4, 244, 240, 6 + unknownsfx0x20 4, 228, 224, 6 + unknownsfx0x20 8, 209, 208, 6 + endchannel + + +SFX_Cry1B_3_Ch2: ; 7cd7c (1f:4d7c) + dutycycle 10 + unknownsfx0x20 7, 230, 129, 6 + unknownsfx0x20 14, 213, 193, 6 + unknownsfx0x20 4, 196, 177, 6 + unknownsfx0x20 4, 212, 161, 6 + unknownsfx0x20 8, 193, 145, 6 + endchannel + + +SFX_Cry1B_3_Ch3: ; 7cd93 (1f:4d93) + unknownnoise0x20 10, 166, 60 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 5, 163, 60 + unknownnoise0x20 8, 145, 44 + endchannel diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm new file mode 100644 index 00000000..f7e66dfb --- /dev/null +++ b/audio/sfx/cry1c_1.asm @@ -0,0 +1,31 @@ +SFX_Cry1C_1_Ch1: ; 8eb1 (2:4eb1) + dutycycle 245 + unknownsfx0x20 7, 214, 225, 7 + unknownsfx0x20 6, 198, 226, 7 + unknownsfx0x20 9, 214, 225, 7 + unknownsfx0x20 7, 198, 224, 7 + unknownsfx0x20 5, 182, 226, 7 + unknownsfx0x20 7, 198, 225, 7 + unknownsfx0x20 6, 182, 224, 7 + unknownsfx0x20 8, 161, 223, 7 + endchannel + + +SFX_Cry1C_1_Ch2: ; 8ed4 (2:4ed4) + dutycycle 68 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 6, 179, 199, 7 + unknownsfx0x20 10, 196, 195, 7 + unknownsfx0x20 8, 180, 199, 7 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 15, 162, 197, 7 + endchannel + + +SFX_Cry1C_1_Ch3: ; 8eef (2:4eef) + unknownnoise0x20 13, 25, 124 + unknownnoise0x20 13, 247, 140 + unknownnoise0x20 12, 214, 124 + unknownnoise0x20 8, 196, 108 + unknownnoise0x20 15, 179, 92 + endchannel diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm new file mode 100644 index 00000000..8037fc96 --- /dev/null +++ b/audio/sfx/cry1c_2.asm @@ -0,0 +1,31 @@ +SFX_Cry1C_2_Ch1: ; 21159 (8:5159) + dutycycle 245 + unknownsfx0x20 7, 214, 225, 7 + unknownsfx0x20 6, 198, 226, 7 + unknownsfx0x20 9, 214, 225, 7 + unknownsfx0x20 7, 198, 224, 7 + unknownsfx0x20 5, 182, 226, 7 + unknownsfx0x20 7, 198, 225, 7 + unknownsfx0x20 6, 182, 224, 7 + unknownsfx0x20 8, 161, 223, 7 + endchannel + + +SFX_Cry1C_2_Ch2: ; 2117c (8:517c) + dutycycle 68 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 6, 179, 199, 7 + unknownsfx0x20 10, 196, 195, 7 + unknownsfx0x20 8, 180, 199, 7 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 15, 162, 197, 7 + endchannel + + +SFX_Cry1C_2_Ch3: ; 21197 (8:5197) + unknownnoise0x20 13, 25, 124 + unknownnoise0x20 13, 247, 140 + unknownnoise0x20 12, 214, 124 + unknownnoise0x20 8, 196, 108 + unknownnoise0x20 15, 179, 92 + endchannel diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm new file mode 100644 index 00000000..853eb1c6 --- /dev/null +++ b/audio/sfx/cry1c_3.asm @@ -0,0 +1,31 @@ +SFX_Cry1C_3_Ch1: ; 7cf26 (1f:4f26) + dutycycle 245 + unknownsfx0x20 7, 214, 225, 7 + unknownsfx0x20 6, 198, 226, 7 + unknownsfx0x20 9, 214, 225, 7 + unknownsfx0x20 7, 198, 224, 7 + unknownsfx0x20 5, 182, 226, 7 + unknownsfx0x20 7, 198, 225, 7 + unknownsfx0x20 6, 182, 224, 7 + unknownsfx0x20 8, 161, 223, 7 + endchannel + + +SFX_Cry1C_3_Ch2: ; 7cf49 (1f:4f49) + dutycycle 68 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 6, 179, 199, 7 + unknownsfx0x20 10, 196, 195, 7 + unknownsfx0x20 8, 180, 199, 7 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 15, 162, 197, 7 + endchannel + + +SFX_Cry1C_3_Ch3: ; 7cf64 (1f:4f64) + unknownnoise0x20 13, 25, 124 + unknownnoise0x20 13, 247, 140 + unknownnoise0x20 12, 214, 124 + unknownnoise0x20 8, 196, 108 + unknownnoise0x20 15, 179, 92 + endchannel diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm new file mode 100644 index 00000000..6e2818c1 --- /dev/null +++ b/audio/sfx/cry1d_1.asm @@ -0,0 +1,29 @@ +SFX_Cry1D_1_Ch1: ; 8f48 (2:4f48) + dutycycle 244 + unknownsfx0x20 15, 240, 5, 7 + unknownsfx0x20 10, 224, 0, 7 + unknownsfx0x20 6, 180, 16, 7 + unknownsfx0x20 4, 211, 0, 7 + unknownsfx0x20 6, 178, 32, 6 + unknownsfx0x20 8, 161, 36, 6 + endchannel + + +SFX_Cry1D_1_Ch2: ; 8f63 (2:4f63) + dutycycle 34 + unknownsfx0x20 15, 176, 195, 6 + unknownsfx0x20 10, 160, 193, 6 + unknownsfx0x20 6, 132, 210, 6 + unknownsfx0x20 4, 147, 193, 6 + unknownsfx0x20 6, 130, 225, 5 + unknownsfx0x20 8, 97, 232, 5 + endchannel + + +SFX_Cry1D_1_Ch3: ; 8f7e (2:4f7e) + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 15, 214, 60 + unknownnoise0x20 10, 197, 74 + unknownnoise0x20 1, 178, 91 + unknownnoise0x20 15, 194, 76 + endchannel diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm new file mode 100644 index 00000000..c7a2c512 --- /dev/null +++ b/audio/sfx/cry1d_2.asm @@ -0,0 +1,29 @@ +SFX_Cry1D_2_Ch1: ; 211f0 (8:51f0) + dutycycle 244 + unknownsfx0x20 15, 240, 5, 7 + unknownsfx0x20 10, 224, 0, 7 + unknownsfx0x20 6, 180, 16, 7 + unknownsfx0x20 4, 211, 0, 7 + unknownsfx0x20 6, 178, 32, 6 + unknownsfx0x20 8, 161, 36, 6 + endchannel + + +SFX_Cry1D_2_Ch2: ; 2120b (8:520b) + dutycycle 34 + unknownsfx0x20 15, 176, 195, 6 + unknownsfx0x20 10, 160, 193, 6 + unknownsfx0x20 6, 132, 210, 6 + unknownsfx0x20 4, 147, 193, 6 + unknownsfx0x20 6, 130, 225, 5 + unknownsfx0x20 8, 97, 232, 5 + endchannel + + +SFX_Cry1D_2_Ch3: ; 21226 (8:5226) + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 15, 214, 60 + unknownnoise0x20 10, 197, 74 + unknownnoise0x20 1, 178, 91 + unknownnoise0x20 15, 194, 76 + endchannel diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm new file mode 100644 index 00000000..7210406c --- /dev/null +++ b/audio/sfx/cry1d_3.asm @@ -0,0 +1,29 @@ +SFX_Cry1D_3_Ch1: ; 7cfbd (1f:4fbd) + dutycycle 244 + unknownsfx0x20 15, 240, 5, 7 + unknownsfx0x20 10, 224, 0, 7 + unknownsfx0x20 6, 180, 16, 7 + unknownsfx0x20 4, 211, 0, 7 + unknownsfx0x20 6, 178, 32, 6 + unknownsfx0x20 8, 161, 36, 6 + endchannel + + +SFX_Cry1D_3_Ch2: ; 7cfd8 (1f:4fd8) + dutycycle 34 + unknownsfx0x20 15, 176, 195, 6 + unknownsfx0x20 10, 160, 193, 6 + unknownsfx0x20 6, 132, 210, 6 + unknownsfx0x20 4, 147, 193, 6 + unknownsfx0x20 6, 130, 225, 5 + unknownsfx0x20 8, 97, 232, 5 + endchannel + + +SFX_Cry1D_3_Ch3: ; 7cff3 (1f:4ff3) + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 15, 214, 60 + unknownnoise0x20 10, 197, 74 + unknownnoise0x20 1, 178, 91 + unknownnoise0x20 15, 194, 76 + endchannel diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm new file mode 100644 index 00000000..e445fdd7 --- /dev/null +++ b/audio/sfx/cry1e_1.asm @@ -0,0 +1,38 @@ +SFX_Cry1E_1_Ch1: ; 8dcf (2:4dcf) + dutycycle 240 + unknownsfx0x20 6, 242, 0, 6 + unknownsfx0x20 6, 226, 64, 6 + unknownsfx0x20 6, 210, 128, 6 + unknownsfx0x20 6, 226, 192, 6 + unknownsfx0x20 6, 210, 0, 7 + unknownsfx0x20 6, 194, 64, 7 + unknownsfx0x20 6, 178, 128, 7 + unknownsfx0x20 8, 161, 192, 7 + endchannel + + +SFX_Cry1E_1_Ch2: ; 8df2 (2:4df2) + dutycycle 17 + unknownsfx0x20 3, 8, 1, 0 + unknownsfx0x20 6, 194, 193, 5 + unknownsfx0x20 6, 178, 2, 6 + unknownsfx0x20 6, 162, 65, 6 + unknownsfx0x20 6, 178, 130, 6 + unknownsfx0x20 6, 162, 194, 6 + unknownsfx0x20 6, 146, 1, 7 + unknownsfx0x20 6, 162, 66, 7 + unknownsfx0x20 8, 129, 129, 7 + endchannel + + +SFX_Cry1E_1_Ch3: ; 8e19 (2:4e19) + unknownnoise0x20 6, 8, 1 + unknownnoise0x20 5, 226, 92 + unknownnoise0x20 5, 194, 76 + unknownnoise0x20 5, 210, 60 + unknownnoise0x20 5, 178, 44 + unknownnoise0x20 5, 194, 28 + unknownnoise0x20 5, 162, 27 + unknownnoise0x20 5, 146, 26 + unknownnoise0x20 8, 129, 24 + endchannel diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm new file mode 100644 index 00000000..59c9985f --- /dev/null +++ b/audio/sfx/cry1e_2.asm @@ -0,0 +1,38 @@ +SFX_Cry1E_2_Ch1: ; 21077 (8:5077) + dutycycle 240 + unknownsfx0x20 6, 242, 0, 6 + unknownsfx0x20 6, 226, 64, 6 + unknownsfx0x20 6, 210, 128, 6 + unknownsfx0x20 6, 226, 192, 6 + unknownsfx0x20 6, 210, 0, 7 + unknownsfx0x20 6, 194, 64, 7 + unknownsfx0x20 6, 178, 128, 7 + unknownsfx0x20 8, 161, 192, 7 + endchannel + + +SFX_Cry1E_2_Ch2: ; 2109a (8:509a) + dutycycle 17 + unknownsfx0x20 3, 8, 1, 0 + unknownsfx0x20 6, 194, 193, 5 + unknownsfx0x20 6, 178, 2, 6 + unknownsfx0x20 6, 162, 65, 6 + unknownsfx0x20 6, 178, 130, 6 + unknownsfx0x20 6, 162, 194, 6 + unknownsfx0x20 6, 146, 1, 7 + unknownsfx0x20 6, 162, 66, 7 + unknownsfx0x20 8, 129, 129, 7 + endchannel + + +SFX_Cry1E_2_Ch3: ; 210c1 (8:50c1) + unknownnoise0x20 6, 8, 1 + unknownnoise0x20 5, 226, 92 + unknownnoise0x20 5, 194, 76 + unknownnoise0x20 5, 210, 60 + unknownnoise0x20 5, 178, 44 + unknownnoise0x20 5, 194, 28 + unknownnoise0x20 5, 162, 27 + unknownnoise0x20 5, 146, 26 + unknownnoise0x20 8, 129, 24 + endchannel diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm new file mode 100644 index 00000000..1c50d4b8 --- /dev/null +++ b/audio/sfx/cry1e_3.asm @@ -0,0 +1,38 @@ +SFX_Cry1E_3_Ch1: ; 7ce44 (1f:4e44) + dutycycle 240 + unknownsfx0x20 6, 242, 0, 6 + unknownsfx0x20 6, 226, 64, 6 + unknownsfx0x20 6, 210, 128, 6 + unknownsfx0x20 6, 226, 192, 6 + unknownsfx0x20 6, 210, 0, 7 + unknownsfx0x20 6, 194, 64, 7 + unknownsfx0x20 6, 178, 128, 7 + unknownsfx0x20 8, 161, 192, 7 + endchannel + + +SFX_Cry1E_3_Ch2: ; 7ce67 (1f:4e67) + dutycycle 17 + unknownsfx0x20 3, 8, 1, 0 + unknownsfx0x20 6, 194, 193, 5 + unknownsfx0x20 6, 178, 2, 6 + unknownsfx0x20 6, 162, 65, 6 + unknownsfx0x20 6, 178, 130, 6 + unknownsfx0x20 6, 162, 194, 6 + unknownsfx0x20 6, 146, 1, 7 + unknownsfx0x20 6, 162, 66, 7 + unknownsfx0x20 8, 129, 129, 7 + endchannel + + +SFX_Cry1E_3_Ch3: ; 7ce8e (1f:4e8e) + unknownnoise0x20 6, 8, 1 + unknownnoise0x20 5, 226, 92 + unknownnoise0x20 5, 194, 76 + unknownnoise0x20 5, 210, 60 + unknownnoise0x20 5, 178, 44 + unknownnoise0x20 5, 194, 28 + unknownnoise0x20 5, 162, 27 + unknownnoise0x20 5, 146, 26 + unknownnoise0x20 8, 129, 24 + endchannel diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm new file mode 100644 index 00000000..52be80df --- /dev/null +++ b/audio/sfx/cry1f_1.asm @@ -0,0 +1,24 @@ +SFX_Cry1F_1_Ch1: ; 8fe7 (2:4fe7) + dutycycle 165 + unknownsfx0x20 3, 244, 65, 6 + unknownsfx0x20 13, 214, 33, 7 + unknownsfx0x20 8, 244, 25, 7 + unknownsfx0x20 8, 193, 26, 7 + endchannel + + +SFX_Cry1F_1_Ch2: ; 8ffa (2:4ffa) + dutycycle 204 + unknownsfx0x20 4, 244, 128, 5 + unknownsfx0x20 14, 230, 224, 6 + unknownsfx0x20 8, 213, 216, 6 + unknownsfx0x20 8, 209, 220, 6 + endchannel + + +SFX_Cry1F_1_Ch3: ; 900d (2:500d) + unknownnoise0x20 5, 196, 70 + unknownnoise0x20 13, 165, 68 + unknownnoise0x20 8, 196, 69 + unknownnoise0x20 8, 177, 68 + endchannel diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm new file mode 100644 index 00000000..da7df61a --- /dev/null +++ b/audio/sfx/cry1f_2.asm @@ -0,0 +1,24 @@ +SFX_Cry1F_2_Ch1: ; 2128f (8:528f) + dutycycle 165 + unknownsfx0x20 3, 244, 65, 6 + unknownsfx0x20 13, 214, 33, 7 + unknownsfx0x20 8, 244, 25, 7 + unknownsfx0x20 8, 193, 26, 7 + endchannel + + +SFX_Cry1F_2_Ch2: ; 212a2 (8:52a2) + dutycycle 204 + unknownsfx0x20 4, 244, 128, 5 + unknownsfx0x20 14, 230, 224, 6 + unknownsfx0x20 8, 213, 216, 6 + unknownsfx0x20 8, 209, 220, 6 + endchannel + + +SFX_Cry1F_2_Ch3: ; 212b5 (8:52b5) + unknownnoise0x20 5, 196, 70 + unknownnoise0x20 13, 165, 68 + unknownnoise0x20 8, 196, 69 + unknownnoise0x20 8, 177, 68 + endchannel diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm new file mode 100644 index 00000000..2f6c1eda --- /dev/null +++ b/audio/sfx/cry1f_3.asm @@ -0,0 +1,24 @@ +SFX_Cry1F_3_Ch1: ; 7d05c (1f:505c) + dutycycle 165 + unknownsfx0x20 3, 244, 65, 6 + unknownsfx0x20 13, 214, 33, 7 + unknownsfx0x20 8, 244, 25, 7 + unknownsfx0x20 8, 193, 26, 7 + endchannel + + +SFX_Cry1F_3_Ch2: ; 7d06f (1f:506f) + dutycycle 204 + unknownsfx0x20 4, 244, 128, 5 + unknownsfx0x20 14, 230, 224, 6 + unknownsfx0x20 8, 213, 216, 6 + unknownsfx0x20 8, 209, 220, 6 + endchannel + + +SFX_Cry1F_3_Ch3: ; 7d082 (1f:5082) + unknownnoise0x20 5, 196, 70 + unknownnoise0x20 13, 165, 68 + unknownnoise0x20 8, 196, 69 + unknownnoise0x20 8, 177, 68 + endchannel diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm new file mode 100644 index 00000000..d6586bdd --- /dev/null +++ b/audio/sfx/cry20_1.asm @@ -0,0 +1,24 @@ +SFX_Cry20_1_Ch1: ; 901a (2:501a) + dutycycle 240 + unknownsfx0x20 13, 241, 17, 5 + unknownsfx0x20 13, 225, 21, 5 + unknownsfx0x20 13, 225, 17, 5 + unknownsfx0x20 8, 209, 17, 5 + endchannel + + +SFX_Cry20_1_Ch2: ; 902d (2:502d) + dutycycle 21 + unknownsfx0x20 12, 225, 12, 5 + unknownsfx0x20 12, 209, 16, 5 + unknownsfx0x20 14, 193, 12, 5 + unknownsfx0x20 8, 193, 10, 5 + endchannel + + +SFX_Cry20_1_Ch3: ; 9040 (2:5040) + unknownnoise0x20 14, 242, 101 + unknownnoise0x20 13, 226, 85 + unknownnoise0x20 14, 210, 86 + unknownnoise0x20 8, 209, 102 + endchannel diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm new file mode 100644 index 00000000..b345eba5 --- /dev/null +++ b/audio/sfx/cry20_2.asm @@ -0,0 +1,24 @@ +SFX_Cry20_2_Ch1: ; 212c2 (8:52c2) + dutycycle 240 + unknownsfx0x20 13, 241, 17, 5 + unknownsfx0x20 13, 225, 21, 5 + unknownsfx0x20 13, 225, 17, 5 + unknownsfx0x20 8, 209, 17, 5 + endchannel + + +SFX_Cry20_2_Ch2: ; 212d5 (8:52d5) + dutycycle 21 + unknownsfx0x20 12, 225, 12, 5 + unknownsfx0x20 12, 209, 16, 5 + unknownsfx0x20 14, 193, 12, 5 + unknownsfx0x20 8, 193, 10, 5 + endchannel + + +SFX_Cry20_2_Ch3: ; 212e8 (8:52e8) + unknownnoise0x20 14, 242, 101 + unknownnoise0x20 13, 226, 85 + unknownnoise0x20 14, 210, 86 + unknownnoise0x20 8, 209, 102 + endchannel diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm new file mode 100644 index 00000000..5bcdf3df --- /dev/null +++ b/audio/sfx/cry20_3.asm @@ -0,0 +1,24 @@ +SFX_Cry20_3_Ch1: ; 7d08f (1f:508f) + dutycycle 240 + unknownsfx0x20 13, 241, 17, 5 + unknownsfx0x20 13, 225, 21, 5 + unknownsfx0x20 13, 225, 17, 5 + unknownsfx0x20 8, 209, 17, 5 + endchannel + + +SFX_Cry20_3_Ch2: ; 7d0a2 (1f:50a2) + dutycycle 21 + unknownsfx0x20 12, 225, 12, 5 + unknownsfx0x20 12, 209, 16, 5 + unknownsfx0x20 14, 193, 12, 5 + unknownsfx0x20 8, 193, 10, 5 + endchannel + + +SFX_Cry20_3_Ch3: ; 7d0b5 (1f:50b5) + unknownnoise0x20 14, 242, 101 + unknownnoise0x20 13, 226, 85 + unknownnoise0x20 14, 210, 86 + unknownnoise0x20 8, 209, 102 + endchannel diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm new file mode 100644 index 00000000..9b81e2a3 --- /dev/null +++ b/audio/sfx/cry21_1.asm @@ -0,0 +1,27 @@ +SFX_Cry21_1_Ch1: ; 904d (2:504d) + dutycycle 27 + unknownsfx0x20 3, 243, 100, 5 + unknownsfx0x20 2, 226, 68, 5 + unknownsfx0x20 5, 209, 34, 5 + unknownsfx0x20 2, 178, 132, 4 + unknownsfx0x20 8, 209, 162, 4 + unknownsfx0x20 3, 243, 36, 5 + unknownsfx0x20 4, 228, 228, 4 + unknownsfx0x20 8, 209, 2, 5 + endchannel + + +SFX_Cry21_1_Ch2: ; 9070 (2:5070) + dutycycle 204 + unknownsfx0x20 3, 211, 96, 5 + unknownsfx0x20 2, 194, 64, 5 + unknownsfx0x20 5, 193, 32, 5 + unknownsfx0x20 2, 146, 128, 4 + unknownsfx0x20 8, 193, 160, 4 + unknownsfx0x20 3, 211, 32, 5 + unknownsfx0x20 3, 196, 224, 4 + unknownsfx0x20 8, 193, 0, 5 + + +SFX_Cry21_1_Ch3: ; 9092 (2:5092) + endchannel diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm new file mode 100644 index 00000000..f5571642 --- /dev/null +++ b/audio/sfx/cry21_2.asm @@ -0,0 +1,27 @@ +SFX_Cry21_2_Ch1: ; 212f5 (8:52f5) + dutycycle 27 + unknownsfx0x20 3, 243, 100, 5 + unknownsfx0x20 2, 226, 68, 5 + unknownsfx0x20 5, 209, 34, 5 + unknownsfx0x20 2, 178, 132, 4 + unknownsfx0x20 8, 209, 162, 4 + unknownsfx0x20 3, 243, 36, 5 + unknownsfx0x20 4, 228, 228, 4 + unknownsfx0x20 8, 209, 2, 5 + endchannel + + +SFX_Cry21_2_Ch2: ; 21318 (8:5318) + dutycycle 204 + unknownsfx0x20 3, 211, 96, 5 + unknownsfx0x20 2, 194, 64, 5 + unknownsfx0x20 5, 193, 32, 5 + unknownsfx0x20 2, 146, 128, 4 + unknownsfx0x20 8, 193, 160, 4 + unknownsfx0x20 3, 211, 32, 5 + unknownsfx0x20 3, 196, 224, 4 + unknownsfx0x20 8, 193, 0, 5 + + +SFX_Cry21_2_Ch3: ; 2133a (8:533a) + endchannel diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm new file mode 100644 index 00000000..d91177b8 --- /dev/null +++ b/audio/sfx/cry21_3.asm @@ -0,0 +1,27 @@ +SFX_Cry21_3_Ch1: ; 7d0c2 (1f:50c2) + dutycycle 27 + unknownsfx0x20 3, 243, 100, 5 + unknownsfx0x20 2, 226, 68, 5 + unknownsfx0x20 5, 209, 34, 5 + unknownsfx0x20 2, 178, 132, 4 + unknownsfx0x20 8, 209, 162, 4 + unknownsfx0x20 3, 243, 36, 5 + unknownsfx0x20 4, 228, 228, 4 + unknownsfx0x20 8, 209, 2, 5 + endchannel + + +SFX_Cry21_3_Ch2: ; 7d0e5 (1f:50e5) + dutycycle 204 + unknownsfx0x20 3, 211, 96, 5 + unknownsfx0x20 2, 194, 64, 5 + unknownsfx0x20 5, 193, 32, 5 + unknownsfx0x20 2, 146, 128, 4 + unknownsfx0x20 8, 193, 160, 4 + unknownsfx0x20 3, 211, 32, 5 + unknownsfx0x20 3, 196, 224, 4 + unknownsfx0x20 8, 193, 0, 5 + + +SFX_Cry21_3_Ch3: ; 7d107 (1f:5107) + endchannel diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm new file mode 100644 index 00000000..90961298 --- /dev/null +++ b/audio/sfx/cry22_1.asm @@ -0,0 +1,24 @@ +SFX_Cry22_1_Ch1: ; 9093 (2:5093) + dutycycle 17 + unknownsfx0x20 2, 61, 129, 3 + unknownsfx0x20 7, 245, 1, 6 + unknownsfx0x20 1, 194, 129, 4 + unknownsfx0x20 8, 145, 129, 3 + endchannel + + +SFX_Cry22_1_Ch2: ; 90a6 (2:50a6) + dutycycle 238 + unknownsfx0x20 2, 62, 176, 5 + unknownsfx0x20 7, 213, 93, 7 + unknownsfx0x20 1, 178, 176, 6 + unknownsfx0x20 8, 97, 176, 5 + endchannel + + +SFX_Cry22_1_Ch3: ; 90b9 (2:50b9) + unknownnoise0x20 2, 146, 73 + unknownnoise0x20 7, 181, 41 + unknownnoise0x20 1, 162, 57 + unknownnoise0x20 8, 145, 73 + endchannel diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm new file mode 100644 index 00000000..861c3bfb --- /dev/null +++ b/audio/sfx/cry22_2.asm @@ -0,0 +1,24 @@ +SFX_Cry22_2_Ch1: ; 2133b (8:533b) + dutycycle 17 + unknownsfx0x20 2, 61, 129, 3 + unknownsfx0x20 7, 245, 1, 6 + unknownsfx0x20 1, 194, 129, 4 + unknownsfx0x20 8, 145, 129, 3 + endchannel + + +SFX_Cry22_2_Ch2: ; 2134e (8:534e) + dutycycle 238 + unknownsfx0x20 2, 62, 176, 5 + unknownsfx0x20 7, 213, 93, 7 + unknownsfx0x20 1, 178, 176, 6 + unknownsfx0x20 8, 97, 176, 5 + endchannel + + +SFX_Cry22_2_Ch3: ; 21361 (8:5361) + unknownnoise0x20 2, 146, 73 + unknownnoise0x20 7, 181, 41 + unknownnoise0x20 1, 162, 57 + unknownnoise0x20 8, 145, 73 + endchannel diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm new file mode 100644 index 00000000..42b3039c --- /dev/null +++ b/audio/sfx/cry22_3.asm @@ -0,0 +1,24 @@ +SFX_Cry22_3_Ch1: ; 7d108 (1f:5108) + dutycycle 17 + unknownsfx0x20 2, 61, 129, 3 + unknownsfx0x20 7, 245, 1, 6 + unknownsfx0x20 1, 194, 129, 4 + unknownsfx0x20 8, 145, 129, 3 + endchannel + + +SFX_Cry22_3_Ch2: ; 7d11b (1f:511b) + dutycycle 238 + unknownsfx0x20 2, 62, 176, 5 + unknownsfx0x20 7, 213, 93, 7 + unknownsfx0x20 1, 178, 176, 6 + unknownsfx0x20 8, 97, 176, 5 + endchannel + + +SFX_Cry22_3_Ch3: ; 7d12e (1f:512e) + unknownnoise0x20 2, 146, 73 + unknownnoise0x20 7, 181, 41 + unknownnoise0x20 1, 162, 57 + unknownnoise0x20 8, 145, 73 + endchannel diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm new file mode 100644 index 00000000..02868042 --- /dev/null +++ b/audio/sfx/cry23_1.asm @@ -0,0 +1,25 @@ +SFX_Cry23_1_Ch1: ; 8786 (2:4786) + dutycycle 240 + unknownsfx0x20 15, 247, 192, 7 + unknownsfx0x20 6, 228, 193, 7 + unknownsfx0x20 10, 246, 192, 7 + unknownsfx0x20 4, 211, 194, 7 + unknownsfx0x20 8, 193, 192, 7 + endchannel + + +SFX_Cry23_1_Ch2: ; 879d (2:479d) + dutycycle 95 + unknownsfx0x20 15, 151, 129, 7 + unknownsfx0x20 6, 132, 128, 7 + unknownsfx0x20 10, 150, 129, 7 + unknownsfx0x20 15, 131, 129, 7 + endchannel + + +SFX_Cry23_1_Ch3: ; 87b0 (2:47b0) + unknownnoise0x20 3, 242, 60 + unknownnoise0x20 13, 230, 44 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 8, 193, 44 + endchannel diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm new file mode 100644 index 00000000..089a233c --- /dev/null +++ b/audio/sfx/cry23_2.asm @@ -0,0 +1,25 @@ +SFX_Cry23_2_Ch1: ; 20a2e (8:4a2e) + dutycycle 240 + unknownsfx0x20 15, 247, 192, 7 + unknownsfx0x20 6, 228, 193, 7 + unknownsfx0x20 10, 246, 192, 7 + unknownsfx0x20 4, 211, 194, 7 + unknownsfx0x20 8, 193, 192, 7 + endchannel + + +SFX_Cry23_2_Ch2: ; 20a45 (8:4a45) + dutycycle 95 + unknownsfx0x20 15, 151, 129, 7 + unknownsfx0x20 6, 132, 128, 7 + unknownsfx0x20 10, 150, 129, 7 + unknownsfx0x20 15, 131, 129, 7 + endchannel + + +SFX_Cry23_2_Ch3: ; 20a58 (8:4a58) + unknownnoise0x20 3, 242, 60 + unknownnoise0x20 13, 230, 44 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 8, 193, 44 + endchannel diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm new file mode 100644 index 00000000..31ba3743 --- /dev/null +++ b/audio/sfx/cry23_3.asm @@ -0,0 +1,25 @@ +SFX_Cry23_3_Ch1: ; 7c7fb (1f:47fb) + dutycycle 240 + unknownsfx0x20 15, 247, 192, 7 + unknownsfx0x20 6, 228, 193, 7 + unknownsfx0x20 10, 246, 192, 7 + unknownsfx0x20 4, 211, 194, 7 + unknownsfx0x20 8, 193, 192, 7 + endchannel + + +SFX_Cry23_3_Ch2: ; 7c812 (1f:4812) + dutycycle 95 + unknownsfx0x20 15, 151, 129, 7 + unknownsfx0x20 6, 132, 128, 7 + unknownsfx0x20 10, 150, 129, 7 + unknownsfx0x20 15, 131, 129, 7 + endchannel + + +SFX_Cry23_3_Ch3: ; 7c825 (1f:4825) + unknownnoise0x20 3, 242, 60 + unknownnoise0x20 13, 230, 44 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 8, 193, 44 + endchannel diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm new file mode 100644 index 00000000..061ed65a --- /dev/null +++ b/audio/sfx/cry24_1.asm @@ -0,0 +1,33 @@ +SFX_Cry24_1_Ch1: ; 87bd (2:47bd) + dutycycle 240 + unknownsfx0x20 15, 247, 128, 6 + unknownsfx0x20 10, 230, 132, 6 + unknownsfx0x20 15, 215, 144, 6 + unknownsfx0x20 8, 213, 144, 6 + unknownsfx0x20 6, 196, 136, 6 + unknownsfx0x20 5, 211, 112, 6 + unknownsfx0x20 4, 211, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + + +SFX_Cry24_1_Ch2: ; 87e0 (2:47e0) + dutycycle 5 + unknownsfx0x20 15, 183, 65, 6 + unknownsfx0x20 10, 150, 66, 6 + unknownsfx0x20 15, 167, 81, 6 + unknownsfx0x20 8, 165, 81, 6 + unknownsfx0x20 6, 148, 71, 6 + unknownsfx0x20 5, 163, 49, 6 + unknownsfx0x20 4, 147, 34, 6 + unknownsfx0x20 8, 113, 1, 6 + endchannel + + +SFX_Cry24_1_Ch3: ; 8803 (2:4803) + unknownnoise0x20 15, 228, 60 + unknownnoise0x20 10, 199, 76 + unknownnoise0x20 10, 199, 60 + unknownnoise0x20 12, 183, 76 + unknownnoise0x20 15, 162, 92 + endchannel diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm new file mode 100644 index 00000000..52986829 --- /dev/null +++ b/audio/sfx/cry24_2.asm @@ -0,0 +1,33 @@ +SFX_Cry24_2_Ch1: ; 20a65 (8:4a65) + dutycycle 240 + unknownsfx0x20 15, 247, 128, 6 + unknownsfx0x20 10, 230, 132, 6 + unknownsfx0x20 15, 215, 144, 6 + unknownsfx0x20 8, 213, 144, 6 + unknownsfx0x20 6, 196, 136, 6 + unknownsfx0x20 5, 211, 112, 6 + unknownsfx0x20 4, 211, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + + +SFX_Cry24_2_Ch2: ; 20a88 (8:4a88) + dutycycle 5 + unknownsfx0x20 15, 183, 65, 6 + unknownsfx0x20 10, 150, 66, 6 + unknownsfx0x20 15, 167, 81, 6 + unknownsfx0x20 8, 165, 81, 6 + unknownsfx0x20 6, 148, 71, 6 + unknownsfx0x20 5, 163, 49, 6 + unknownsfx0x20 4, 147, 34, 6 + unknownsfx0x20 8, 113, 1, 6 + endchannel + + +SFX_Cry24_2_Ch3: ; 20aab (8:4aab) + unknownnoise0x20 15, 228, 60 + unknownnoise0x20 10, 199, 76 + unknownnoise0x20 10, 199, 60 + unknownnoise0x20 12, 183, 76 + unknownnoise0x20 15, 162, 92 + endchannel diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm new file mode 100644 index 00000000..8c9cfc81 --- /dev/null +++ b/audio/sfx/cry24_3.asm @@ -0,0 +1,33 @@ +SFX_Cry24_3_Ch1: ; 7c832 (1f:4832) + dutycycle 240 + unknownsfx0x20 15, 247, 128, 6 + unknownsfx0x20 10, 230, 132, 6 + unknownsfx0x20 15, 215, 144, 6 + unknownsfx0x20 8, 213, 144, 6 + unknownsfx0x20 6, 196, 136, 6 + unknownsfx0x20 5, 211, 112, 6 + unknownsfx0x20 4, 211, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + + +SFX_Cry24_3_Ch2: ; 7c855 (1f:4855) + dutycycle 5 + unknownsfx0x20 15, 183, 65, 6 + unknownsfx0x20 10, 150, 66, 6 + unknownsfx0x20 15, 167, 81, 6 + unknownsfx0x20 8, 165, 81, 6 + unknownsfx0x20 6, 148, 71, 6 + unknownsfx0x20 5, 163, 49, 6 + unknownsfx0x20 4, 147, 34, 6 + unknownsfx0x20 8, 113, 1, 6 + endchannel + + +SFX_Cry24_3_Ch3: ; 7c878 (1f:4878) + unknownnoise0x20 15, 228, 60 + unknownnoise0x20 10, 199, 76 + unknownnoise0x20 10, 199, 60 + unknownnoise0x20 12, 183, 76 + unknownnoise0x20 15, 162, 92 + endchannel diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm new file mode 100644 index 00000000..ce238db2 --- /dev/null +++ b/audio/sfx/cry25_1.asm @@ -0,0 +1,26 @@ +SFX_Cry25_1_Ch1: ; 886b (2:486b) + dutycycle 165 + unknownsfx0x20 6, 244, 64, 7 + unknownsfx0x20 15, 227, 48, 7 + unknownsfx0x20 4, 244, 64, 7 + unknownsfx0x20 5, 179, 72, 7 + unknownsfx0x20 8, 209, 80, 7 + endchannel + + +SFX_Cry25_1_Ch2: ; 8882 (2:4882) + dutycycle 119 + unknownsfx0x20 6, 195, 18, 7 + unknownsfx0x20 15, 179, 4, 7 + unknownsfx0x20 3, 195, 18, 7 + unknownsfx0x20 4, 195, 33, 7 + unknownsfx0x20 8, 177, 50, 7 + endchannel + + +SFX_Cry25_1_Ch3: ; 8899 (2:4899) + unknownnoise0x20 8, 214, 44 + unknownnoise0x20 12, 198, 60 + unknownnoise0x20 10, 182, 44 + unknownnoise0x20 8, 145, 28 + endchannel diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm new file mode 100644 index 00000000..b00210a9 --- /dev/null +++ b/audio/sfx/cry25_2.asm @@ -0,0 +1,26 @@ +SFX_Cry25_2_Ch1: ; 20b13 (8:4b13) + dutycycle 165 + unknownsfx0x20 6, 244, 64, 7 + unknownsfx0x20 15, 227, 48, 7 + unknownsfx0x20 4, 244, 64, 7 + unknownsfx0x20 5, 179, 72, 7 + unknownsfx0x20 8, 209, 80, 7 + endchannel + + +SFX_Cry25_2_Ch2: ; 20b2a (8:4b2a) + dutycycle 119 + unknownsfx0x20 6, 195, 18, 7 + unknownsfx0x20 15, 179, 4, 7 + unknownsfx0x20 3, 195, 18, 7 + unknownsfx0x20 4, 195, 33, 7 + unknownsfx0x20 8, 177, 50, 7 + endchannel + + +SFX_Cry25_2_Ch3: ; 20b41 (8:4b41) + unknownnoise0x20 8, 214, 44 + unknownnoise0x20 12, 198, 60 + unknownnoise0x20 10, 182, 44 + unknownnoise0x20 8, 145, 28 + endchannel diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm new file mode 100644 index 00000000..7c93b0e6 --- /dev/null +++ b/audio/sfx/cry25_3.asm @@ -0,0 +1,26 @@ +SFX_Cry25_3_Ch1: ; 7c8e0 (1f:48e0) + dutycycle 165 + unknownsfx0x20 6, 244, 64, 7 + unknownsfx0x20 15, 227, 48, 7 + unknownsfx0x20 4, 244, 64, 7 + unknownsfx0x20 5, 179, 72, 7 + unknownsfx0x20 8, 209, 80, 7 + endchannel + + +SFX_Cry25_3_Ch2: ; 7c8f7 (1f:48f7) + dutycycle 119 + unknownsfx0x20 6, 195, 18, 7 + unknownsfx0x20 15, 179, 4, 7 + unknownsfx0x20 3, 195, 18, 7 + unknownsfx0x20 4, 195, 33, 7 + unknownsfx0x20 8, 177, 50, 7 + endchannel + + +SFX_Cry25_3_Ch3: ; 7c90e (1f:490e) + unknownnoise0x20 8, 214, 44 + unknownnoise0x20 12, 198, 60 + unknownnoise0x20 10, 182, 44 + unknownnoise0x20 8, 145, 28 + endchannel diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm new file mode 100644 index 00000000..c1b763e0 --- /dev/null +++ b/audio/sfx/cut_1.asm @@ -0,0 +1,7 @@ +SFX_Cut_1_Ch1: ; 83e1 (2:43e1) + unknownnoise0x20 2, 247, 36 + unknownnoise0x20 2, 247, 52 + unknownnoise0x20 4, 247, 68 + unknownnoise0x20 8, 244, 85 + unknownnoise0x20 8, 241, 68 + endchannel diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm new file mode 100644 index 00000000..4ad5551d --- /dev/null +++ b/audio/sfx/cut_3.asm @@ -0,0 +1,7 @@ +SFX_Cut_3_Ch1: ; 7c3ca (1f:43ca) + unknownnoise0x20 2, 247, 36 + unknownnoise0x20 2, 247, 52 + unknownnoise0x20 4, 247, 68 + unknownnoise0x20 8, 244, 85 + unknownnoise0x20 8, 241, 68 + endchannel diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm new file mode 100644 index 00000000..d001b750 --- /dev/null +++ b/audio/sfx/cymbal1_1.asm @@ -0,0 +1,3 @@ +SFX_Cymbal1_1_Ch1: ; 833b (2:433b) + unknownnoise0x20 0, 161, 16 + endchannel diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm new file mode 100644 index 00000000..8987d85f --- /dev/null +++ b/audio/sfx/cymbal1_2.asm @@ -0,0 +1,3 @@ +SFX_Cymbal1_2_Ch1: ; 2033b (8:433b) + unknownnoise0x20 0, 161, 16 + endchannel diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm new file mode 100644 index 00000000..597a8b61 --- /dev/null +++ b/audio/sfx/cymbal1_3.asm @@ -0,0 +1,3 @@ +SFX_Cymbal1_3_Ch1: ; 7c33b (1f:433b) + unknownnoise0x20 0, 161, 16 + endchannel diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm new file mode 100644 index 00000000..3f50299a --- /dev/null +++ b/audio/sfx/cymbal2_1.asm @@ -0,0 +1,3 @@ +SFX_Cymbal2_1_Ch1: ; 833f (2:433f) + unknownnoise0x20 0, 162, 17 + endchannel diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm new file mode 100644 index 00000000..5224a20d --- /dev/null +++ b/audio/sfx/cymbal2_2.asm @@ -0,0 +1,3 @@ +SFX_Cymbal2_2_Ch1: ; 2033f (8:433f) + unknownnoise0x20 0, 162, 17 + endchannel diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm new file mode 100644 index 00000000..dd3a4fc9 --- /dev/null +++ b/audio/sfx/cymbal2_3.asm @@ -0,0 +1,3 @@ +SFX_Cymbal2_3_Ch1: ; 7c33f (1f:433f) + unknownnoise0x20 0, 162, 17 + endchannel diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm new file mode 100644 index 00000000..8aa5ebe5 --- /dev/null +++ b/audio/sfx/cymbal3_1.asm @@ -0,0 +1,3 @@ +SFX_Cymbal3_1_Ch1: ; 8343 (2:4343) + unknownnoise0x20 0, 162, 80 + endchannel diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm new file mode 100644 index 00000000..d1fd3b90 --- /dev/null +++ b/audio/sfx/cymbal3_2.asm @@ -0,0 +1,3 @@ +SFX_Cymbal3_2_Ch1: ; 20343 (8:4343) + unknownnoise0x20 0, 162, 80 + endchannel diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm new file mode 100644 index 00000000..45e41c15 --- /dev/null +++ b/audio/sfx/cymbal3_3.asm @@ -0,0 +1,3 @@ +SFX_Cymbal3_3_Ch1: ; 7c343 (1f:4343) + unknownnoise0x20 0, 162, 80 + endchannel diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm new file mode 100644 index 00000000..4022fcbf --- /dev/null +++ b/audio/sfx/damage.asm @@ -0,0 +1,5 @@ +SFX_Damage_Ch1: ; 204f4 (8:44f4) + unknownnoise0x20 2, 244, 68 + unknownnoise0x20 2, 244, 20 + unknownnoise0x20 15, 241, 50 + endchannel diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm new file mode 100644 index 00000000..46520151 --- /dev/null +++ b/audio/sfx/denied_1.asm @@ -0,0 +1,18 @@ +SFX_Denied_1_Ch1: ; 861f (2:461f) + duty 3 + unknownsfx0x10 90 + unknownsfx0x20 4, 240, 0, 5 + unknownsfx0x10 8 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 1, 0, 0, 0 + endchannel + + +SFX_Denied_1_Ch2: ; 8636 (2:4636) + duty 3 + unknownsfx0x20 4, 240, 1, 4 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 1, 4 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm new file mode 100644 index 00000000..2cebd766 --- /dev/null +++ b/audio/sfx/denied_3.asm @@ -0,0 +1,18 @@ +SFX_Denied_3_Ch1: ; 7c5fc (1f:45fc) + duty 3 + unknownsfx0x10 90 + unknownsfx0x20 4, 240, 0, 5 + unknownsfx0x10 8 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 1, 0, 0, 0 + endchannel + + +SFX_Denied_3_Ch2: ; 7c613 (1f:4613) + duty 3 + unknownsfx0x20 4, 240, 1, 4 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 1, 4 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm new file mode 100644 index 00000000..dac55ed9 --- /dev/null +++ b/audio/sfx/dex_page_added.asm @@ -0,0 +1,15 @@ +SFX_Dex_Page_Added_Ch1: ; 2047f (8:447f) + duty 2 + unknownsfx0x10 68 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x10 23 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 + endchannel + + +SFX_Dex_Page_Added_Ch2: ; 20490 (8:4490) + duty 2 + unknownsfx0x20 15, 146, 0, 6 + unknownsfx0x20 15, 146, 130, 7 + endchannel diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm new file mode 100644 index 00000000..0918238a --- /dev/null +++ b/audio/sfx/doubleslap.asm @@ -0,0 +1,4 @@ +SFX_Doubleslap_Ch1: ; 2058c (8:458c) + unknownnoise0x20 8, 241, 50 + unknownnoise0x20 8, 241, 51 + endchannel diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm new file mode 100644 index 00000000..5c1a189a --- /dev/null +++ b/audio/sfx/enter_pc_1.asm @@ -0,0 +1,7 @@ +SFX_Enter_PC_1_Ch1: ; 853b (2:453b) + duty 2 + unknownsfx0x20 6, 240, 0, 7 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 6, 240, 0, 7 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm new file mode 100644 index 00000000..5907a7e5 --- /dev/null +++ b/audio/sfx/enter_pc_3.asm @@ -0,0 +1,7 @@ +SFX_Enter_PC_3_Ch1: ; 7c518 (1f:4518) + duty 2 + unknownsfx0x20 4, 240, 0, 7 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 4, 240, 0, 7 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm new file mode 100644 index 00000000..c252b93a --- /dev/null +++ b/audio/sfx/faint_fall.asm @@ -0,0 +1,6 @@ +SFX_Faint_Fall_Ch1: ; 204ae (8:44ae) + duty 1 + unknownsfx0x10 175 + unknownsfx0x20 15, 242, 128, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm new file mode 100644 index 00000000..5ef100c5 --- /dev/null +++ b/audio/sfx/faint_thud.asm @@ -0,0 +1,11 @@ +SFX_Faint_Thud_Ch1: ; 2044c (8:444c) + unknownsfx0x20 15, 209, 0, 2 + unknownsfx0x10 8 + endchannel + + +SFX_Faint_Thud_Ch2: ; 20453 (8:4453) + unknownnoise0x20 4, 245, 51 + unknownnoise0x20 8, 244, 34 + unknownnoise0x20 15, 242, 33 + endchannel diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm new file mode 100644 index 00000000..c2ecf435 --- /dev/null +++ b/audio/sfx/fly_1.asm @@ -0,0 +1,18 @@ +SFX_Fly_1_Ch1: ; 85ee (2:45ee) + unknownnoise0x20 2, 241, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 161, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 209, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 129, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 177, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 97, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 145, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 65, 18 + unknownnoise0x20 2, 0, 0 + endchannel diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm new file mode 100644 index 00000000..043d4b51 --- /dev/null +++ b/audio/sfx/fly_3.asm @@ -0,0 +1,18 @@ +SFX_Fly_3_Ch1: ; 7c5cb (1f:45cb) + unknownnoise0x20 2, 241, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 161, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 209, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 129, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 177, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 97, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 145, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 65, 18 + unknownnoise0x20 2, 0, 0 + endchannel diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm new file mode 100644 index 00000000..471124d7 --- /dev/null +++ b/audio/sfx/get_item1_1.asm @@ -0,0 +1,47 @@ +SFX_Get_Item1_1_Ch1: ; ad77 (2:6d77) + executemusic + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty 2 + toggleperfectpitch + notetype 4, 11, 1 + octave 3 + G# 2 + G# 2 + G# 2 + notetype 12, 11, 3 + octave 4 + E_ 4 + endchannel + + +SFX_Get_Item1_1_Ch2: ; ad8e (2:6d8e) + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 4, 12, 1 + octave 4 + E_ 2 + E_ 2 + E_ 2 + notetype 12, 12, 3 + B_ 4 + endchannel + + +SFX_Get_Item1_1_Ch3: ; ad9e (2:6d9e) + executemusic + notetype 4, 1, 0 + octave 4 + B_ 1 + rest 1 + B_ 1 + rest 1 + B_ 1 + rest 1 + notetype 12, 1, 0 + octave 4 + B_ 2 + rest 2 + endchannel diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm new file mode 100644 index 00000000..6a7ebabc --- /dev/null +++ b/audio/sfx/get_item1_3.asm @@ -0,0 +1,47 @@ +SFX_Get_Item1_3_Ch1: ; 7e850 (1f:6850) + executemusic + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty 2 + toggleperfectpitch + notetype 4, 11, 1 + octave 3 + G# 2 + G# 2 + G# 2 + notetype 12, 11, 3 + octave 4 + E_ 4 + endchannel + + +SFX_Get_Item1_3_Ch2: ; 7e867 (1f:6867) + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 4, 12, 1 + octave 4 + E_ 2 + E_ 2 + E_ 2 + notetype 12, 12, 3 + B_ 4 + endchannel + + +SFX_Get_Item1_3_Ch3: ; 7e877 (1f:6877) + executemusic + notetype 4, 1, 0 + octave 4 + B_ 1 + rest 1 + B_ 1 + rest 1 + B_ 1 + rest 1 + notetype 12, 1, 0 + octave 4 + B_ 2 + rest 2 + endchannel diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm new file mode 100644 index 00000000..6fda3404 --- /dev/null +++ b/audio/sfx/get_item2_1.asm @@ -0,0 +1,69 @@ +SFX_Get_Item2_1_Ch1: ; b316 (2:7316) + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 5, 11, 4 + octave 4 + D_ 4 + C_ 4 + octave 3 + A_ 8 + notetype 5, 11, 2 + octave 4 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 + octave 3 + A# 2 + notetype 5, 11, 4 + octave 4 + C_ 8 + endchannel + + +SFX_Get_Item2_1_Ch2: ; b335 (2:7335) + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 5, 12, 5 + octave 4 + A_ 4 + F_ 4 + C_ 8 + notetype 5, 12, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 + notetype 5, 12, 4 + A_ 8 + endchannel + + +SFX_Get_Item2_1_Ch3: ; b34d (2:734d) + executemusic + notetype 5, 1, 0 + octave 5 + F_ 4 + D# 4 + C_ 8 + D# 1 + rest 1 + D# 1 + rest 1 + E_ 1 + rest 1 + F_ 1 + rest 1 + F_ 1 + rest 1 + G_ 1 + rest 1 + A_ 8 + endchannel diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm new file mode 100644 index 00000000..25e40744 --- /dev/null +++ b/audio/sfx/get_item2_2.asm @@ -0,0 +1,69 @@ +SFX_Get_Item2_2_Ch1: ; 239c7 (8:79c7) + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 5, 11, 4 + octave 4 + D_ 4 + C_ 4 + octave 3 + A_ 8 + notetype 5, 11, 2 + octave 4 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 + octave 3 + A# 2 + notetype 5, 11, 4 + octave 4 + C_ 8 + endchannel + + +SFX_Get_Item2_2_Ch2: ; 239e6 (8:79e6) + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 5, 12, 5 + octave 4 + A_ 4 + F_ 4 + C_ 8 + notetype 5, 12, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 + notetype 5, 12, 4 + A_ 8 + endchannel + + +SFX_Get_Item2_2_Ch3: ; 239fe (8:79fe) + executemusic + notetype 5, 1, 0 + octave 5 + F_ 4 + D# 4 + C_ 8 + D# 1 + rest 1 + D# 1 + rest 1 + E_ 1 + rest 1 + F_ 1 + rest 1 + F_ 1 + rest 1 + G_ 1 + rest 1 + A_ 8 + endchannel diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm new file mode 100644 index 00000000..20a0ee04 --- /dev/null +++ b/audio/sfx/get_item2_3.asm @@ -0,0 +1,69 @@ +SFX_Get_Item2_3_Ch1: ; 7ee28 (1f:6e28) + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 5, 11, 4 + octave 4 + D_ 4 + C_ 4 + octave 3 + A_ 8 + notetype 5, 11, 2 + octave 4 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 + octave 3 + A# 2 + notetype 5, 11, 4 + octave 4 + C_ 8 + endchannel + + +SFX_Get_Item2_3_Ch2: ; 7ee47 (1f:6e47) + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 5, 12, 5 + octave 4 + A_ 4 + F_ 4 + C_ 8 + notetype 5, 12, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 + notetype 5, 12, 4 + A_ 8 + endchannel + + +SFX_Get_Item2_3_Ch3: ; 7ee5f (1f:6e5f) + executemusic + notetype 5, 1, 0 + octave 5 + F_ 4 + D# 4 + C_ 8 + D# 1 + rest 1 + D# 1 + rest 1 + E_ 1 + rest 1 + F_ 1 + rest 1 + F_ 1 + rest 1 + G_ 1 + rest 1 + A_ 8 + endchannel diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm new file mode 100644 index 00000000..233ea01b --- /dev/null +++ b/audio/sfx/get_key_item_1.asm @@ -0,0 +1,59 @@ +SFX_Get_Key_Item_1_Ch1: ; b362 (2:7362) + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 5, 10, 4 + octave 3 + A# 4 + notetype 5, 11, 1 + octave 4 + C_ 2 + C_ 1 + C_ 1 + notetype 5, 10, 4 + D# 4 + notetype 5, 11, 1 + F_ 2 + F_ 1 + F_ 1 + notetype 5, 11, 4 + A# 8 + endchannel + + +SFX_Get_Key_Item_1_Ch2: ; b381 (2:7381) + executemusic + vibrato 4, 2, 3 + duty 2 + notetype 5, 13, 1 + octave 4 + G_ 2 + G_ 1 + G_ 1 + notetype 5, 12, 4 + D# 4 + notetype 5, 13, 1 + G# 2 + G# 1 + G# 1 + A# 2 + A# 1 + A# 1 + notetype 5, 12, 4 + octave 5 + D# 8 + endchannel + + +SFX_Get_Key_Item_1_Ch3: ; b39d (2:739d) + executemusic + notetype 5, 1, 0 + octave 4 + D# 4 + G# 4 + G_ 4 + F_ 4 + D# 8 + endchannel diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm new file mode 100644 index 00000000..f918e1bf --- /dev/null +++ b/audio/sfx/get_key_item_3.asm @@ -0,0 +1,59 @@ +SFX_Get_Key_Item_3_Ch1: ; 7ee74 (1f:6e74) + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 5, 10, 4 + octave 3 + A# 4 + notetype 5, 11, 1 + octave 4 + C_ 2 + C_ 1 + C_ 1 + notetype 5, 10, 4 + D# 4 + notetype 5, 11, 1 + F_ 2 + F_ 1 + F_ 1 + notetype 5, 11, 4 + A# 8 + endchannel + + +SFX_Get_Key_Item_3_Ch2: ; 7ee93 (1f:6e93) + executemusic + vibrato 4, 2, 3 + duty 2 + notetype 5, 13, 1 + octave 4 + G_ 2 + G_ 1 + G_ 1 + notetype 5, 12, 4 + D# 4 + notetype 5, 13, 1 + G# 2 + G# 1 + G# 1 + A# 2 + A# 1 + A# 1 + notetype 5, 12, 4 + octave 5 + D# 8 + endchannel + + +SFX_Get_Key_Item_3_Ch3: ; 7eeaf (1f:6eaf) + executemusic + notetype 5, 1, 0 + octave 4 + D# 4 + G# 4 + G_ 4 + F_ 4 + D# 8 + endchannel diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm new file mode 100644 index 00000000..1eb1e2ca --- /dev/null +++ b/audio/sfx/go_inside_1.asm @@ -0,0 +1,4 @@ +SFX_Go_Inside_1_Ch1: ; 83f1 (2:43f1) + unknownnoise0x20 9, 241, 68 + unknownnoise0x20 8, 209, 67 + endchannel diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm new file mode 100644 index 00000000..d8e18b7d --- /dev/null +++ b/audio/sfx/go_inside_3.asm @@ -0,0 +1,4 @@ +SFX_Go_Inside_3_Ch1: ; 7c3da (1f:43da) + unknownnoise0x20 9, 241, 68 + unknownnoise0x20 8, 209, 67 + endchannel diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm new file mode 100644 index 00000000..2e8a8b31 --- /dev/null +++ b/audio/sfx/go_outside_1.asm @@ -0,0 +1,7 @@ +SFX_Go_Outside_1_Ch1: ; 8452 (2:4452) + unknownnoise0x20 2, 241, 84 + unknownnoise0x20 12, 113, 35 + unknownnoise0x20 2, 177, 84 + unknownnoise0x20 12, 97, 35 + unknownnoise0x20 6, 65, 84 + endchannel diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm new file mode 100644 index 00000000..2dc4242d --- /dev/null +++ b/audio/sfx/go_outside_3.asm @@ -0,0 +1,7 @@ +SFX_Go_Outside_3_Ch1: ; 7c43b (1f:443b) + unknownnoise0x20 2, 241, 84 + unknownnoise0x20 12, 113, 35 + unknownnoise0x20 2, 177, 84 + unknownnoise0x20 12, 97, 35 + unknownnoise0x20 6, 65, 84 + endchannel diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm new file mode 100644 index 00000000..5937f3a2 --- /dev/null +++ b/audio/sfx/heal_ailment_1.asm @@ -0,0 +1,9 @@ +SFX_Heal_Ailment_1_Ch1: ; 84d9 (2:44d9) + duty 2 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x10 23 + unknownsfx0x20 15, 242, 0, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm new file mode 100644 index 00000000..4b39895a --- /dev/null +++ b/audio/sfx/heal_ailment_2.asm @@ -0,0 +1,9 @@ +SFX_Heal_Ailment_2_Ch1: ; 203fd (8:43fd) + duty 2 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x10 23 + unknownsfx0x20 15, 242, 0, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm new file mode 100644 index 00000000..b2805f3d --- /dev/null +++ b/audio/sfx/heal_ailment_3.asm @@ -0,0 +1,9 @@ +SFX_Heal_Ailment_3_Ch1: ; 7c4b2 (1f:44b2) + duty 2 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x10 23 + unknownsfx0x20 15, 242, 0, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm new file mode 100644 index 00000000..eb8063f7 --- /dev/null +++ b/audio/sfx/heal_hp_1.asm @@ -0,0 +1,7 @@ +SFX_Heal_HP_1_Ch1: ; 84b7 (2:44b7) + duty 2 + unknownsfx0x10 23 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm new file mode 100644 index 00000000..890a2151 --- /dev/null +++ b/audio/sfx/heal_hp_2.asm @@ -0,0 +1,7 @@ +SFX_Heal_HP_2_Ch1: ; 203ee (8:43ee) + duty 2 + unknownsfx0x10 23 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm new file mode 100644 index 00000000..da80d48f --- /dev/null +++ b/audio/sfx/heal_hp_3.asm @@ -0,0 +1,7 @@ +SFX_Heal_HP_3_Ch1: ; 7c490 (1f:4490) + duty 2 + unknownsfx0x10 23 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm new file mode 100644 index 00000000..4babf6b0 --- /dev/null +++ b/audio/sfx/healing_machine_1.asm @@ -0,0 +1,9 @@ +SFX_Healing_Machine_1_Ch1: ; 8580 (2:4580) + duty 2 + unknownsfx0x10 44 + unknownsfx0x20 4, 242, 0, 5 + unknownsfx0x10 34 + unknownsfx0x20 2, 241, 0, 5 + unknownsfx0x10 8 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm new file mode 100644 index 00000000..c72f7905 --- /dev/null +++ b/audio/sfx/healing_machine_3.asm @@ -0,0 +1,9 @@ +SFX_Healing_Machine_3_Ch1: ; 7c55d (1f:455d) + duty 2 + unknownsfx0x10 44 + unknownsfx0x20 4, 242, 0, 5 + unknownsfx0x10 34 + unknownsfx0x20 2, 241, 0, 5 + unknownsfx0x10 8 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm new file mode 100644 index 00000000..e68e5834 --- /dev/null +++ b/audio/sfx/horn_drill.asm @@ -0,0 +1,6 @@ +SFX_Horn_Drill_Ch1: ; 205b1 (8:45b1) + unknownnoise0x20 3, 146, 49 + unknownnoise0x20 3, 178, 50 + unknownnoise0x20 3, 194, 51 + unknownnoise0x20 8, 241, 84 + endchannel diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm new file mode 100644 index 00000000..65e475f8 --- /dev/null +++ b/audio/sfx/intro_crash.asm @@ -0,0 +1,4 @@ +SFX_Intro_Crash_Ch1: ; 7c6de (1f:46de) + unknownnoise0x20 2, 210, 50 + unknownnoise0x20 15, 242, 67 + endchannel diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm new file mode 100644 index 00000000..70d0f8b1 --- /dev/null +++ b/audio/sfx/intro_hip.asm @@ -0,0 +1,6 @@ +SFX_Intro_Hip_Ch1: ; 7c6be (1f:46be) + duty 2 + unknownsfx0x10 38 + unknownsfx0x20 12, 194, 64, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm new file mode 100644 index 00000000..223c7f25 --- /dev/null +++ b/audio/sfx/intro_hop.asm @@ -0,0 +1,6 @@ +SFX_Intro_Hop_Ch1: ; 7c6c9 (1f:46c9) + duty 2 + unknownsfx0x10 38 + unknownsfx0x20 12, 194, 128, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm new file mode 100644 index 00000000..ad00f56f --- /dev/null +++ b/audio/sfx/intro_lunge.asm @@ -0,0 +1,10 @@ +SFX_Intro_Lunge_Ch1: ; 7c6a5 (1f:46a5) + unknownnoise0x20 6, 32, 16 + unknownnoise0x20 6, 47, 64 + unknownnoise0x20 6, 79, 65 + unknownnoise0x20 6, 143, 65 + unknownnoise0x20 6, 207, 66 + unknownnoise0x20 8, 215, 66 + unknownnoise0x20 15, 231, 67 + unknownnoise0x20 15, 242, 67 + endchannel diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm new file mode 100644 index 00000000..d6ee1430 --- /dev/null +++ b/audio/sfx/intro_raise.asm @@ -0,0 +1,5 @@ +SFX_Intro_Raise_Ch1: ; 7c6d4 (1f:46d4) + unknownnoise0x20 2, 111, 33 + unknownnoise0x20 2, 175, 49 + unknownnoise0x20 15, 242, 65 + endchannel diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm new file mode 100644 index 00000000..903b7252 --- /dev/null +++ b/audio/sfx/intro_whoosh.asm @@ -0,0 +1,7 @@ +SFX_Intro_Whoosh_Ch1: ; 7c6e5 (1f:46e5) + unknownnoise0x20 4, 44, 32 + unknownnoise0x20 3, 160, 32 + unknownnoise0x20 3, 176, 33 + unknownnoise0x20 3, 192, 34 + unknownnoise0x20 15, 210, 36 + endchannel diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm new file mode 100644 index 00000000..dfd7c819 --- /dev/null +++ b/audio/sfx/ledge_1.asm @@ -0,0 +1,6 @@ +SFX_Ledge_1_Ch1: ; 85d6 (2:45d6) + duty 2 + unknownsfx0x10 149 + unknownsfx0x20 15, 242, 0, 4 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm new file mode 100644 index 00000000..2bf172e7 --- /dev/null +++ b/audio/sfx/ledge_3.asm @@ -0,0 +1,6 @@ +SFX_Ledge_3_Ch1: ; 7c5b3 (1f:45b3) + duty 2 + unknownsfx0x10 149 + unknownsfx0x20 15, 242, 0, 4 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm new file mode 100644 index 00000000..03e077ec --- /dev/null +++ b/audio/sfx/level_up.asm @@ -0,0 +1,63 @@ +SFX_Level_Up_Ch1: ; 2397d (8:797d) + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 6, 11, 4 + octave 4 + F_ 4 + notetype 4, 11, 2 + C_ 2 + F_ 2 + C_ 2 + notetype 6, 11, 3 + D# 2 + D# 2 + E_ 2 + notetype 6, 11, 4 + F_ 8 + endchannel + + +SFX_Level_Up_Ch2: ; 23998 (8:7998) + executemusic + vibrato 4, 2, 2 + duty 2 + notetype 6, 12, 4 + octave 4 + A_ 4 + notetype 4, 12, 2 + A_ 2 + A_ 2 + A_ 2 + notetype 6, 12, 4 + A# 2 + A# 2 + A# 2 + notetype 6, 12, 4 + A_ 8 + endchannel + + +SFX_Level_Up_Ch3: ; 239b0 (8:79b0) + executemusic + notetype 6, 1, 0 + octave 5 + A_ 4 + notetype 4, 1, 0 + F_ 1 + rest 1 + F_ 1 + rest 1 + F_ 1 + rest 1 + notetype 6, 1, 0 + G_ 1 + rest 1 + D# 1 + rest 1 + G_ 1 + rest 1 + A_ 8 + endchannel diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm new file mode 100644 index 00000000..5d10ecc1 --- /dev/null +++ b/audio/sfx/muted_snare1_1.asm @@ -0,0 +1,4 @@ +SFX_Muted_Snare1_1_Ch1: ; 8347 (2:4347) + unknownnoise0x20 0, 161, 24 + unknownnoise0x20 0, 49, 51 + endchannel diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm new file mode 100644 index 00000000..ea3cfc8c --- /dev/null +++ b/audio/sfx/muted_snare1_2.asm @@ -0,0 +1,4 @@ +SFX_Muted_Snare1_2_Ch1: ; 20347 (8:4347) + unknownnoise0x20 0, 161, 24 + unknownnoise0x20 0, 49, 51 + endchannel diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm new file mode 100644 index 00000000..27caa37b --- /dev/null +++ b/audio/sfx/muted_snare1_3.asm @@ -0,0 +1,4 @@ +SFX_Muted_Snare1_3_Ch1: ; 7c347 (1f:4347) + unknownnoise0x20 0, 161, 24 + unknownnoise0x20 0, 49, 51 + endchannel diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm new file mode 100644 index 00000000..7ab6252b --- /dev/null +++ b/audio/sfx/muted_snare2_1.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare2_1_Ch1: ; 8355 (2:4355) + unknownnoise0x20 0, 145, 34 + endchannel diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm new file mode 100644 index 00000000..a9359226 --- /dev/null +++ b/audio/sfx/muted_snare2_2.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare2_2_Ch1: ; 20355 (8:4355) + unknownnoise0x20 0, 145, 34 + endchannel diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm new file mode 100644 index 00000000..7ac9705d --- /dev/null +++ b/audio/sfx/muted_snare2_3.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare2_3_Ch1: ; 7c355 (1f:4355) + unknownnoise0x20 0, 145, 34 + endchannel diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm new file mode 100644 index 00000000..1cd27319 --- /dev/null +++ b/audio/sfx/muted_snare3_1.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare3_1_Ch1: ; 8359 (2:4359) + unknownnoise0x20 0, 113, 34 + endchannel diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm new file mode 100644 index 00000000..1606b6d5 --- /dev/null +++ b/audio/sfx/muted_snare3_2.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare3_2_Ch1: ; 20359 (8:4359) + unknownnoise0x20 0, 113, 34 + endchannel diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm new file mode 100644 index 00000000..c0fe7efb --- /dev/null +++ b/audio/sfx/muted_snare3_3.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare3_3_Ch1: ; 7c359 (1f:4359) + unknownnoise0x20 0, 113, 34 + endchannel diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm new file mode 100644 index 00000000..bcac6440 --- /dev/null +++ b/audio/sfx/muted_snare4_1.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare4_1_Ch1: ; 835d (2:435d) + unknownnoise0x20 0, 97, 34 + endchannel diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm new file mode 100644 index 00000000..6910c20d --- /dev/null +++ b/audio/sfx/muted_snare4_2.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare4_2_Ch1: ; 2035d (8:435d) + unknownnoise0x20 0, 97, 34 + endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm new file mode 100644 index 00000000..52f14f21 --- /dev/null +++ b/audio/sfx/muted_snare4_3.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare4_3_Ch1: ; 7c35d (1f:435d) + unknownnoise0x20 0, 97, 34 + endchannel diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm new file mode 100644 index 00000000..959f33e3 --- /dev/null +++ b/audio/sfx/not_very_effective.asm @@ -0,0 +1,6 @@ +SFX_Not_Very_Effective_Ch1: ; 204fe (8:44fe) + unknownnoise0x20 4, 143, 85 + unknownnoise0x20 2, 244, 68 + unknownnoise0x20 8, 244, 34 + unknownnoise0x20 15, 242, 33 + endchannel diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm new file mode 100644 index 00000000..e4632281 --- /dev/null +++ b/audio/sfx/peck.asm @@ -0,0 +1,3 @@ +SFX_Peck_Ch1: ; 204aa (8:44aa) + unknownnoise0x20 2, 161, 18 + endchannel diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm new file mode 100644 index 00000000..4760696d --- /dev/null +++ b/audio/sfx/poisoned_1.asm @@ -0,0 +1,8 @@ +SFX_Poisoned_1_Ch1: ; 84c6 (2:44c6) + duty 0 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + loopchannel 4, SFX_Poisoned_1_Ch1 + unknownsfx0x20 15, 243, 0, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm new file mode 100644 index 00000000..b6d69dc6 --- /dev/null +++ b/audio/sfx/poisoned_3.asm @@ -0,0 +1,8 @@ +SFX_Poisoned_3_Ch1: ; 7c49f (1f:449f) + duty 0 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + loopchannel 4, SFX_Poisoned_3_Ch1 + unknownsfx0x20 15, 243, 0, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm new file mode 100644 index 00000000..21503d16 --- /dev/null +++ b/audio/sfx/pokedex_rating_1.asm @@ -0,0 +1,77 @@ +SFX_Pokedex_Rating_1_Ch1: ; b2c8 (2:72c8) + executemusic + tempo 256 + volume 7, 7 + duty 2 + notetype 5, 11, 1 + octave 3 + A_ 2 + A_ 2 + G_ 2 + G_ 2 + F_ 2 + E_ 2 + F_ 2 + A_ 2 + octave 4 + C_ 4 + E_ 4 + octave 3 + F_ 4 + endchannel + + +SFX_Pokedex_Rating_1_Ch2: ; b2e1 (2:72e1) + executemusic + duty 2 + notetype 5, 12, 2 + octave 5 + F_ 2 + E_ 1 + rest 1 + D_ 2 + C_ 1 + rest 1 + octave 4 + A# 2 + octave 5 + C_ 2 + D_ 2 + E_ 2 + F_ 4 + G_ 4 + F_ 4 + endchannel + + +SFX_Pokedex_Rating_1_Ch3: ; b2f7 (2:72f7) + executemusic + notetype 5, 1, 0 + octave 5 + C_ 1 + rest 1 + octave 4 + F_ 2 + octave 5 + C_ 1 + rest 1 + octave 4 + A# 1 + rest 1 + A_ 1 + rest 1 + G_ 1 + rest 1 + F_ 1 + rest 1 + E_ 1 + rest 1 + octave 5 + F_ 1 + rest 3 + C_ 1 + rest 3 + octave 4 + F_ 2 + rest 2 + endchannel diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm new file mode 100644 index 00000000..a9ea1c75 --- /dev/null +++ b/audio/sfx/pokedex_rating_3.asm @@ -0,0 +1,77 @@ +SFX_Pokedex_Rating_3_Ch1: ; 7edda (1f:6dda) + executemusic + tempo 256 + volume 7, 7 + duty 2 + notetype 5, 11, 1 + octave 3 + A_ 2 + A_ 2 + G_ 2 + G_ 2 + F_ 2 + E_ 2 + F_ 2 + A_ 2 + octave 4 + C_ 4 + E_ 4 + octave 3 + F_ 4 + endchannel + + +SFX_Pokedex_Rating_3_Ch2: ; 7edf3 (1f:6df3) + executemusic + duty 2 + notetype 5, 12, 2 + octave 5 + F_ 2 + E_ 1 + rest 1 + D_ 2 + C_ 1 + rest 1 + octave 4 + A# 2 + octave 5 + C_ 2 + D_ 2 + E_ 2 + F_ 4 + G_ 4 + F_ 4 + endchannel + + +SFX_Pokedex_Rating_3_Ch3: ; 7ee09 (1f:6e09) + executemusic + notetype 5, 1, 0 + octave 5 + C_ 1 + rest 1 + octave 4 + F_ 2 + octave 5 + C_ 1 + rest 1 + octave 4 + A# 1 + rest 1 + A_ 1 + rest 1 + G_ 1 + rest 1 + F_ 1 + rest 1 + E_ 1 + rest 1 + octave 5 + F_ 1 + rest 3 + C_ 1 + rest 3 + octave 4 + F_ 2 + rest 2 + endchannel diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm new file mode 100644 index 00000000..4abf1713 --- /dev/null +++ b/audio/sfx/pokeflute.asm @@ -0,0 +1,21 @@ +SFX_Pokeflute_Ch1: ; 83ca (2:43ca) + vibrato 16, 1, 4 + notetype 12, 1, 0 + octave 5 + E_ 2 + F_ 2 + G_ 4 + A_ 2 + G_ 2 + octave 6 + C_ 4 + C_ 2 + D_ 2 + C_ 2 + octave 5 + G_ 2 + A_ 2 + F_ 2 + G_ 8 + rest 12 + endchannel diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm new file mode 100644 index 00000000..102d7d6d --- /dev/null +++ b/audio/sfx/pound.asm @@ -0,0 +1,3 @@ +SFX_Pound_Ch1: ; 204c4 (8:44c4) + unknownnoise0x20 2, 161, 34 + endchannel diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm new file mode 100644 index 00000000..5925b788 --- /dev/null +++ b/audio/sfx/press_ab_1.asm @@ -0,0 +1,7 @@ +SFX_Press_AB_1_Ch1: ; 8462 (2:4462) + duty 2 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 0, 129, 208, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 12, 161, 208, 7 + endchannel diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm new file mode 100644 index 00000000..e15dadc4 --- /dev/null +++ b/audio/sfx/press_ab_2.asm @@ -0,0 +1,7 @@ +SFX_Press_AB_2_Ch1: ; 203c3 (8:43c3) + duty 2 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 0, 129, 208, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 12, 161, 208, 7 + endchannel diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm new file mode 100644 index 00000000..8af4a335 --- /dev/null +++ b/audio/sfx/press_ab_3.asm @@ -0,0 +1,7 @@ +SFX_Press_AB_3_Ch1: ; 7c44b (1f:444b) + duty 2 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 0, 129, 208, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 12, 161, 208, 7 + endchannel diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm new file mode 100644 index 00000000..65fcc229 --- /dev/null +++ b/audio/sfx/psybeam.asm @@ -0,0 +1,25 @@ +SFX_Psybeam_Ch1: ; 20759 (8:4759) + dutycycle 161 + unknownsfx0x20 10, 241, 64, 6 + unknownsfx0x20 10, 243, 128, 6 + unknownsfx0x20 10, 242, 32, 6 + loopchannel 4, SFX_Psybeam_Ch1 + unknownsfx0x20 10, 241, 64, 6 + endchannel + + +SFX_Psybeam_Ch2: ; 20770 (8:4770) + dutycycle 179 + unknownsfx0x20 10, 243, 113, 5 + unknownsfx0x20 7, 227, 49, 5 + unknownsfx0x20 10, 241, 81, 5 + loopchannel 4, SFX_Psybeam_Ch2 + unknownsfx0x20 10, 241, 113, 5 + endchannel + + +SFX_Psybeam_Ch3: ; 20787 (8:4787) + unknownnoise0x20 2, 209, 74 + unknownnoise0x20 2, 210, 42 + loopchannel 21, SFX_Psybeam_Ch3 + endchannel diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm new file mode 100644 index 00000000..e734b7ac --- /dev/null +++ b/audio/sfx/psychic_m.asm @@ -0,0 +1,32 @@ +SFX_Psychic_M_Ch1: ; 207fa (8:47fa) + duty 2 + unknownsfx0x10 247 + unknownsfx0x20 8, 196, 189, 7 + unknownsfx0x20 8, 196, 190, 7 + unknownsfx0x20 8, 196, 191, 7 + unknownsfx0x20 8, 196, 192, 7 + unknownsfx0x20 15, 196, 193, 7 + unknownsfx0x20 15, 242, 192, 7 + unknownsfx0x10 8 + endchannel + + +SFX_Psychic_M_Ch2: ; 20819 (8:4819) + duty 2 + unknownsfx0x20 8, 196, 112, 7 + unknownsfx0x20 8, 196, 97, 7 + unknownsfx0x20 8, 196, 98, 7 + unknownsfx0x20 8, 196, 99, 7 + unknownsfx0x20 15, 196, 100, 7 + unknownsfx0x20 15, 242, 100, 7 + endchannel + + +SFX_Psychic_M_Ch3: ; 20834 (8:4834) + unknownnoise0x20 15, 63, 20 + unknownnoise0x20 15, 207, 19 + unknownnoise0x20 15, 207, 18 + unknownnoise0x20 15, 207, 17 + unknownnoise0x20 15, 207, 16 + unknownnoise0x20 15, 194, 16 + endchannel diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm new file mode 100644 index 00000000..fc0cecb5 --- /dev/null +++ b/audio/sfx/purchase_1.asm @@ -0,0 +1,13 @@ +SFX_Purchase_1_Ch1: ; 842d (2:442d) + duty 2 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 8, 242, 224, 7 + endchannel + + +SFX_Purchase_1_Ch2: ; 8438 (2:4438) + duty 2 + unknownsfx0x20 1, 8, 0, 0 + unknownsfx0x20 4, 145, 193, 6 + unknownsfx0x20 8, 162, 161, 7 + endchannel diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm new file mode 100644 index 00000000..5d649958 --- /dev/null +++ b/audio/sfx/purchase_3.asm @@ -0,0 +1,13 @@ +SFX_Purchase_3_Ch1: ; 7c416 (1f:4416) + duty 2 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 8, 242, 224, 7 + endchannel + + +SFX_Purchase_3_Ch2: ; 7c421 (1f:4421) + duty 2 + unknownsfx0x20 1, 8, 0, 0 + unknownsfx0x20 4, 145, 193, 6 + unknownsfx0x20 8, 162, 161, 7 + endchannel diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm new file mode 100644 index 00000000..31096861 --- /dev/null +++ b/audio/sfx/push_boulder_1.asm @@ -0,0 +1,10 @@ +SFX_Push_Boulder_1_Ch1: ; 8654 (2:4654) + unknownnoise0x20 4, 162, 35 + unknownnoise0x20 8, 241, 52 + unknownnoise0x20 15, 0, 0 + unknownnoise0x20 2, 247, 36 + unknownnoise0x20 2, 247, 52 + unknownnoise0x20 4, 247, 68 + unknownnoise0x20 8, 244, 85 + unknownnoise0x20 8, 241, 68 + endchannel diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm new file mode 100644 index 00000000..ca7d2cd1 --- /dev/null +++ b/audio/sfx/push_boulder_3.asm @@ -0,0 +1,10 @@ +SFX_Push_Boulder_3_Ch1: ; 7c631 (1f:4631) + unknownnoise0x20 4, 162, 35 + unknownnoise0x20 8, 241, 52 + unknownnoise0x20 15, 0, 0 + unknownnoise0x20 2, 247, 36 + unknownnoise0x20 2, 247, 52 + unknownnoise0x20 4, 247, 68 + unknownnoise0x20 8, 244, 85 + unknownnoise0x20 8, 241, 68 + endchannel diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm new file mode 100644 index 00000000..653b0f6b --- /dev/null +++ b/audio/sfx/run.asm @@ -0,0 +1,13 @@ +SFX_Run_Ch1: ; 2045d (8:445d) + unknownnoise0x20 2, 97, 35 + unknownnoise0x20 2, 161, 51 + unknownnoise0x20 2, 193, 51 + unknownnoise0x20 2, 81, 17 + unknownnoise0x20 2, 241, 51 + unknownnoise0x20 2, 65, 17 + unknownnoise0x20 2, 193, 51 + unknownnoise0x20 2, 49, 17 + unknownnoise0x20 2, 129, 51 + unknownnoise0x20 2, 49, 17 + unknownnoise0x20 8, 65, 51 + endchannel diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm new file mode 100644 index 00000000..fb8c4d1f --- /dev/null +++ b/audio/sfx/safari_zone_pa.asm @@ -0,0 +1,9 @@ +SFX_Safari_Zone_PA_Ch1: ; 86c8 (2:46c8) + duty 2 + unknownsfx0x20 15, 243, 48, 7 + unknownsfx0x20 8, 101, 48, 7 + unknownsfx0x20 15, 244, 0, 7 + unknownsfx0x20 15, 116, 0, 7 + unknownsfx0x20 15, 68, 0, 7 + unknownsfx0x20 15, 36, 0, 7 + endchannel diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm new file mode 100644 index 00000000..2e6c1f2b --- /dev/null +++ b/audio/sfx/save_1.asm @@ -0,0 +1,23 @@ +SFX_Save_1_Ch1: ; 8475 (2:4475) + duty 2 + unknownsfx0x20 4, 244, 0, 7 + unknownsfx0x20 2, 228, 0, 6 + unknownsfx0x20 2, 228, 128, 6 + unknownsfx0x20 2, 228, 192, 6 + unknownsfx0x20 2, 228, 0, 7 + unknownsfx0x20 2, 228, 160, 7 + unknownsfx0x20 15, 242, 224, 7 + endchannel + + +SFX_Save_1_Ch2: ; 8494 (2:4494) + duty 2 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 2, 212, 1, 7 + unknownsfx0x20 2, 196, 1, 6 + unknownsfx0x20 2, 196, 129, 6 + unknownsfx0x20 2, 196, 193, 6 + unknownsfx0x20 2, 196, 1, 7 + unknownsfx0x20 2, 196, 161, 7 + unknownsfx0x20 15, 210, 225, 7 + endchannel diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm new file mode 100644 index 00000000..47142bb4 --- /dev/null +++ b/audio/sfx/save_3.asm @@ -0,0 +1,36 @@ +SFX_Save_3_Ch1: ; 7c45e (1f:445e) + duty 2 +IF DEF(_RED) + unknownsfx0x20 4, 244, 0, 7 + unknownsfx0x20 3, 228, 128, 6 + unknownsfx0x20 3, 228, 192, 6 + unknownsfx0x20 3, 228, 0, 7 + unknownsfx0x20 2, 228, 160, 7 +ELSE + unknownsfx0x20 3, 228, 0, 6 + unknownsfx0x20 3, 228, 128, 6 + unknownsfx0x20 3, 228, 192, 6 + unknownsfx0x20 3, 228, 0, 7 + unknownsfx0x20 15, 242, 224, 7 +ENDC + endchannel + + +SFX_Save_3_Ch2: ; 7c475 (1f:4475) + duty 2 +IF DEF(_RED) + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 3, 212, 1, 7 + unknownsfx0x20 3, 196, 129, 6 + unknownsfx0x20 3, 196, 193, 6 + unknownsfx0x20 3, 196, 1, 7 + unknownsfx0x20 2, 196, 161, 7 +ELSE + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 3, 196, 1, 6 + unknownsfx0x20 3, 196, 129, 6 + unknownsfx0x20 3, 196, 193, 6 + unknownsfx0x20 3, 196, 1, 7 + unknownsfx0x20 15, 210, 225, 7 +ENDC + endchannel diff --git a/audio/sfx/sfx_02_01.asm b/audio/sfx/sfx_02_01.asm deleted file mode 100755 index 0de37099..00000000 --- a/audio/sfx/sfx_02_01.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_01_Ch1: ; 82fd (2:42fd) - unknownnoise0x20 0, 193, 51 - endchannel diff --git a/audio/sfx/sfx_02_02.asm b/audio/sfx/sfx_02_02.asm deleted file mode 100755 index ce8efcf0..00000000 --- a/audio/sfx/sfx_02_02.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_02_Ch1: ; 8301 (2:4301) - unknownnoise0x20 0, 177, 51 - endchannel diff --git a/audio/sfx/sfx_02_03.asm b/audio/sfx/sfx_02_03.asm deleted file mode 100755 index 3fc19143..00000000 --- a/audio/sfx/sfx_02_03.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_03_Ch1: ; 8305 (2:4305) - unknownnoise0x20 0, 161, 51 - endchannel diff --git a/audio/sfx/sfx_02_04.asm b/audio/sfx/sfx_02_04.asm deleted file mode 100755 index 35abd908..00000000 --- a/audio/sfx/sfx_02_04.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_04_Ch1: ; 8309 (2:4309) - unknownnoise0x20 0, 129, 51 - endchannel diff --git a/audio/sfx/sfx_02_05.asm b/audio/sfx/sfx_02_05.asm deleted file mode 100755 index 5aca7085..00000000 --- a/audio/sfx/sfx_02_05.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_02_05_Ch1: ; 830d (2:430d) - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 - endchannel diff --git a/audio/sfx/sfx_02_06.asm b/audio/sfx/sfx_02_06.asm deleted file mode 100755 index f2031c3f..00000000 --- a/audio/sfx/sfx_02_06.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_06_Ch1: ; 8320 (2:4320) - unknownnoise0x20 0, 81, 42 - endchannel diff --git a/audio/sfx/sfx_02_07.asm b/audio/sfx/sfx_02_07.asm deleted file mode 100755 index 58ae12fd..00000000 --- a/audio/sfx/sfx_02_07.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_02_07_Ch1: ; 8324 (2:4324) - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 - endchannel diff --git a/audio/sfx/sfx_02_08.asm b/audio/sfx/sfx_02_08.asm deleted file mode 100755 index 5a172e25..00000000 --- a/audio/sfx/sfx_02_08.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_08_Ch1: ; 832b (2:432b) - unknownnoise0x20 0, 129, 16 - endchannel diff --git a/audio/sfx/sfx_02_09.asm b/audio/sfx/sfx_02_09.asm deleted file mode 100755 index 47f85e16..00000000 --- a/audio/sfx/sfx_02_09.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_09_Ch1: ; 832f (2:432f) - unknownnoise0x20 0, 130, 35 - endchannel diff --git a/audio/sfx/sfx_02_0a.asm b/audio/sfx/sfx_02_0a.asm deleted file mode 100755 index 3d43afa9..00000000 --- a/audio/sfx/sfx_02_0a.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_0a_Ch1: ; 8333 (2:4333) - unknownnoise0x20 0, 130, 37 - endchannel diff --git a/audio/sfx/sfx_02_0b.asm b/audio/sfx/sfx_02_0b.asm deleted file mode 100755 index 9c8d38ca..00000000 --- a/audio/sfx/sfx_02_0b.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_0b_Ch1: ; 8337 (2:4337) - unknownnoise0x20 0, 130, 38 - endchannel diff --git a/audio/sfx/sfx_02_0c.asm b/audio/sfx/sfx_02_0c.asm deleted file mode 100755 index 4f3568e1..00000000 --- a/audio/sfx/sfx_02_0c.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_0c_Ch1: ; 833b (2:433b) - unknownnoise0x20 0, 161, 16 - endchannel diff --git a/audio/sfx/sfx_02_0d.asm b/audio/sfx/sfx_02_0d.asm deleted file mode 100755 index 154b5c1e..00000000 --- a/audio/sfx/sfx_02_0d.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_0d_Ch1: ; 833f (2:433f) - unknownnoise0x20 0, 162, 17 - endchannel diff --git a/audio/sfx/sfx_02_0e.asm b/audio/sfx/sfx_02_0e.asm deleted file mode 100755 index d1333575..00000000 --- a/audio/sfx/sfx_02_0e.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_0e_Ch1: ; 8343 (2:4343) - unknownnoise0x20 0, 162, 80 - endchannel diff --git a/audio/sfx/sfx_02_0f.asm b/audio/sfx/sfx_02_0f.asm deleted file mode 100755 index 32156d7d..00000000 --- a/audio/sfx/sfx_02_0f.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_02_0f_Ch1: ; 8347 (2:4347) - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 - endchannel diff --git a/audio/sfx/sfx_02_10.asm b/audio/sfx/sfx_02_10.asm deleted file mode 100755 index 61d57b01..00000000 --- a/audio/sfx/sfx_02_10.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_02_10_Ch1: ; 834e (2:434e) - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 - endchannel diff --git a/audio/sfx/sfx_02_11.asm b/audio/sfx/sfx_02_11.asm deleted file mode 100755 index f4bde465..00000000 --- a/audio/sfx/sfx_02_11.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_11_Ch1: ; 8355 (2:4355) - unknownnoise0x20 0, 145, 34 - endchannel diff --git a/audio/sfx/sfx_02_12.asm b/audio/sfx/sfx_02_12.asm deleted file mode 100755 index 908c3fb2..00000000 --- a/audio/sfx/sfx_02_12.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_12_Ch1: ; 8359 (2:4359) - unknownnoise0x20 0, 113, 34 - endchannel diff --git a/audio/sfx/sfx_02_13.asm b/audio/sfx/sfx_02_13.asm deleted file mode 100755 index bd985ab4..00000000 --- a/audio/sfx/sfx_02_13.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_02_13_Ch1: ; 835d (2:435d) - unknownnoise0x20 0, 97, 34 - endchannel diff --git a/audio/sfx/sfx_02_14.asm b/audio/sfx/sfx_02_14.asm deleted file mode 100755 index 3a289882..00000000 --- a/audio/sfx/sfx_02_14.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_02_14_Ch1: ; 8987 (2:4987) - dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 - endchannel - - -SFX_02_14_Ch2: ; 8996 (2:4996) - dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 - endchannel - - -SFX_02_14_Ch3: ; 89a5 (2:49a5) - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 - endchannel diff --git a/audio/sfx/sfx_02_15.asm b/audio/sfx/sfx_02_15.asm deleted file mode 100755 index 91b6c951..00000000 --- a/audio/sfx/sfx_02_15.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_02_15_Ch1: ; 8b97 (2:4b97) - dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 - endchannel - - -SFX_02_15_Ch2: ; 8baa (2:4baa) - dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 - endchannel - - -SFX_02_15_Ch3: ; 8bbd (2:4bbd) - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 - endchannel diff --git a/audio/sfx/sfx_02_16.asm b/audio/sfx/sfx_02_16.asm deleted file mode 100755 index fe15f6b6..00000000 --- a/audio/sfx/sfx_02_16.asm +++ /dev/null @@ -1,17 +0,0 @@ -SFX_02_16_Ch1: ; 8b0c (2:4b0c) - duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 - endchannel - - -SFX_02_16_Ch2: ; 8b1b (2:4b1b) - dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 - - -SFX_02_16_Ch3: ; 8b29 (2:4b29) - endchannel diff --git a/audio/sfx/sfx_02_17.asm b/audio/sfx/sfx_02_17.asm deleted file mode 100755 index ecc34899..00000000 --- a/audio/sfx/sfx_02_17.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_02_17_Ch1: ; 88a6 (2:48a6) - dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 - endchannel - - -SFX_02_17_Ch2: ; 88c5 (2:48c5) - dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 - endchannel - - -SFX_02_17_Ch3: ; 88e4 (2:48e4) - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/sfx_02_18.asm b/audio/sfx/sfx_02_18.asm deleted file mode 100755 index 73f8f41e..00000000 --- a/audio/sfx/sfx_02_18.asm +++ /dev/null @@ -1,32 +0,0 @@ -SFX_02_18_Ch1: ; 8c55 (2:4c55) - dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 - endchannel - - -SFX_02_18_Ch2: ; 8c74 (2:4c74) - dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 - endchannel - - -SFX_02_18_Ch3: ; 8c93 (2:4c93) - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/sfx_02_19.asm b/audio/sfx/sfx_02_19.asm deleted file mode 100755 index d78b66b4..00000000 --- a/audio/sfx/sfx_02_19.asm +++ /dev/null @@ -1,19 +0,0 @@ -SFX_02_19_Ch1: ; 8a35 (2:4a35) - dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 - endchannel - - -SFX_02_19_Ch2: ; 8a48 (2:4a48) - dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 - - -SFX_02_19_Ch3: ; 8a5a (2:4a5a) - endchannel diff --git a/audio/sfx/sfx_02_1a.asm b/audio/sfx/sfx_02_1a.asm deleted file mode 100755 index 036703b5..00000000 --- a/audio/sfx/sfx_02_1a.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_02_1a_Ch1: ; 89df (2:49df) - dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 - - -SFX_02_1a_Ch2: ; 89f9 (2:49f9) - endchannel - - -SFX_02_1a_Ch3: ; 89fa (2:49fa) - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 - endchannel diff --git a/audio/sfx/sfx_02_1b.asm b/audio/sfx/sfx_02_1b.asm deleted file mode 100755 index 0e1112f6..00000000 --- a/audio/sfx/sfx_02_1b.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_02_1b_Ch1: ; 8a0d (2:4a0d) - dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_02_1b_Ch2: ; 8a1c (2:4a1c) - dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 - endchannel - - -SFX_02_1b_Ch3: ; 8a2b (2:4a2b) - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 - endchannel diff --git a/audio/sfx/sfx_02_1c.asm b/audio/sfx/sfx_02_1c.asm deleted file mode 100755 index 3a06819f..00000000 --- a/audio/sfx/sfx_02_1c.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_02_1c_Ch1: ; 8c25 (2:4c25) - dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 - endchannel - - -SFX_02_1c_Ch2: ; 8c38 (2:4c38) - dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 - endchannel - - -SFX_02_1c_Ch3: ; 8c4b (2:4c4b) - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/sfx_02_1d.asm b/audio/sfx/sfx_02_1d.asm deleted file mode 100755 index 1501e2ab..00000000 --- a/audio/sfx/sfx_02_1d.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_02_1d_Ch1: ; 872f (2:472f) - dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 - dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 - endchannel - - -SFX_02_1d_Ch2: ; 874c (2:474c) - dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 - dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 - endchannel - - -SFX_02_1d_Ch3: ; 876d (2:476d) - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 - endchannel diff --git a/audio/sfx/sfx_02_1e.asm b/audio/sfx/sfx_02_1e.asm deleted file mode 100755 index 1036f953..00000000 --- a/audio/sfx/sfx_02_1e.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_02_1e_Ch1: ; 8bca (2:4bca) - dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 - endchannel - - -SFX_02_1e_Ch2: ; 8be9 (2:4be9) - dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 - endchannel - - -SFX_02_1e_Ch3: ; 8c0c (2:4c0c) - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 - endchannel diff --git a/audio/sfx/sfx_02_1f.asm b/audio/sfx/sfx_02_1f.asm deleted file mode 100755 index 8f603856..00000000 --- a/audio/sfx/sfx_02_1f.asm +++ /dev/null @@ -1,37 +0,0 @@ -SFX_02_1f_Ch1: ; 8a5b (2:4a5b) - dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 - endchannel - - -SFX_02_1f_Ch2: ; 8a86 (2:4a86) - dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 - endchannel - - -SFX_02_1f_Ch3: ; 8aa5 (2:4aa5) - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 - endchannel diff --git a/audio/sfx/sfx_02_20.asm b/audio/sfx/sfx_02_20.asm deleted file mode 100755 index 741ae0e8..00000000 --- a/audio/sfx/sfx_02_20.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_02_20_Ch1: ; 8abe (2:4abe) - dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_02_20_Ch2: ; 8ae5 (2:4ae5) - dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 - - -SFX_02_20_Ch3: ; 8b0b (2:4b0b) - endchannel diff --git a/audio/sfx/sfx_02_21.asm b/audio/sfx/sfx_02_21.asm deleted file mode 100755 index 4c7bebee..00000000 --- a/audio/sfx/sfx_02_21.asm +++ /dev/null @@ -1,40 +0,0 @@ -SFX_02_21_Ch1: ; 8b2a (2:4b2a) - dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_02_21_Ch1 - endchannel - - -SFX_02_21_Ch2: ; 8b49 (2:4b49) - dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 - endchannel - - -SFX_02_21_Ch3: ; 8b78 (2:4b78) - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 - endchannel diff --git a/audio/sfx/sfx_02_22.asm b/audio/sfx/sfx_02_22.asm deleted file mode 100755 index 6d4a8f7d..00000000 --- a/audio/sfx/sfx_02_22.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_02_22_Ch1: ; 89af (2:49af) - dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 - endchannel - - -SFX_02_22_Ch2: ; 89c2 (2:49c2) - dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 - endchannel - - -SFX_02_22_Ch3: ; 89d5 (2:49d5) - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 - endchannel diff --git a/audio/sfx/sfx_02_23.asm b/audio/sfx/sfx_02_23.asm deleted file mode 100755 index fb0ff58c..00000000 --- a/audio/sfx/sfx_02_23.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_02_23_Ch1: ; 88f1 (2:48f1) - dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_02_23_Ch2: ; 890c (2:490c) - dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 - endchannel - - -SFX_02_23_Ch3: ; 8927 (2:4927) - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 - endchannel diff --git a/audio/sfx/sfx_02_24.asm b/audio/sfx/sfx_02_24.asm deleted file mode 100755 index c1ff6fcc..00000000 --- a/audio/sfx/sfx_02_24.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_02_24_Ch1: ; 8937 (2:4937) - dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 - endchannel - - -SFX_02_24_Ch2: ; 895a (2:495a) - dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 - endchannel - - -SFX_02_24_Ch3: ; 897d (2:497d) - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 - endchannel diff --git a/audio/sfx/sfx_02_25.asm b/audio/sfx/sfx_02_25.asm deleted file mode 100755 index f324be84..00000000 --- a/audio/sfx/sfx_02_25.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_02_25_Ch1: ; 8813 (2:4813) - dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 - endchannel - - -SFX_02_25_Ch2: ; 8832 (2:4832) - dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 - endchannel - - -SFX_02_25_Ch3: ; 8855 (2:4855) - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_02_26.asm b/audio/sfx/sfx_02_26.asm deleted file mode 100755 index 6ecd820f..00000000 --- a/audio/sfx/sfx_02_26.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_02_26_Ch1: ; 8d2b (2:4d2b) - dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 - endchannel - - -SFX_02_26_Ch2: ; 8d3e (2:4d3e) - dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 - endchannel - - -SFX_02_26_Ch3: ; 8d51 (2:4d51) - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 - endchannel diff --git a/audio/sfx/sfx_02_27.asm b/audio/sfx/sfx_02_27.asm deleted file mode 100755 index 2449cf89..00000000 --- a/audio/sfx/sfx_02_27.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_02_27_Ch1: ; 8d5e (2:4d5e) - dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 - endchannel - - -SFX_02_27_Ch2: ; 8d79 (2:4d79) - dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 - endchannel - - -SFX_02_27_Ch3: ; 8d94 (2:4d94) - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/sfx_02_28.asm b/audio/sfx/sfx_02_28.asm deleted file mode 100755 index bb872795..00000000 --- a/audio/sfx/sfx_02_28.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_02_28_Ch1: ; 8da7 (2:4da7) - dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 - endchannel - - -SFX_02_28_Ch2: ; 8db6 (2:4db6) - dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 - endchannel - - -SFX_02_28_Ch3: ; 8dc5 (2:4dc5) - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_02_29.asm b/audio/sfx/sfx_02_29.asm deleted file mode 100755 index 466a8bc8..00000000 --- a/audio/sfx/sfx_02_29.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_02_29_Ch1: ; 8e35 (2:4e35) - dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 - endchannel - - -SFX_02_29_Ch2: ; 8e50 (2:4e50) - dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 - endchannel - - -SFX_02_29_Ch3: ; 8e6b (2:4e6b) - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 - endchannel diff --git a/audio/sfx/sfx_02_2a.asm b/audio/sfx/sfx_02_2a.asm deleted file mode 100755 index 13356384..00000000 --- a/audio/sfx/sfx_02_2a.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_02_2a_Ch1: ; 8cc8 (2:4cc8) - dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 - endchannel - - -SFX_02_2a_Ch2: ; 8cd7 (2:4cd7) - dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 - endchannel - - -SFX_02_2a_Ch3: ; 8ce6 (2:4ce6) - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 - endchannel diff --git a/audio/sfx/sfx_02_2b.asm b/audio/sfx/sfx_02_2b.asm deleted file mode 100755 index 5aa42f68..00000000 --- a/audio/sfx/sfx_02_2b.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_02_2b_Ch1: ; 8e7e (2:4e7e) - dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 - endchannel - - -SFX_02_2b_Ch2: ; 8e91 (2:4e91) - dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 - endchannel - - -SFX_02_2b_Ch3: ; 8ea4 (2:4ea4) - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 - endchannel diff --git a/audio/sfx/sfx_02_2c.asm b/audio/sfx/sfx_02_2c.asm deleted file mode 100755 index 39f2a7da..00000000 --- a/audio/sfx/sfx_02_2c.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_02_2c_Ch1: ; 8f8e (2:4f8e) - dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 - endchannel - - -SFX_02_2c_Ch2: ; 8fb1 (2:4fb1) - dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 - endchannel - - -SFX_02_2c_Ch3: ; 8fd4 (2:4fd4) - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/sfx_02_2d.asm b/audio/sfx/sfx_02_2d.asm deleted file mode 100755 index 1e9ef3e5..00000000 --- a/audio/sfx/sfx_02_2d.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_02_2d_Ch1: ; 8ca6 (2:4ca6) - dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 - endchannel - - -SFX_02_2d_Ch2: ; 8cb5 (2:4cb5) - dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 - - -SFX_02_2d_Ch3: ; 8cc7 (2:4cc7) - endchannel diff --git a/audio/sfx/sfx_02_2e.asm b/audio/sfx/sfx_02_2e.asm deleted file mode 100755 index d0c25b47..00000000 --- a/audio/sfx/sfx_02_2e.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_02_2e_Ch1: ; 8eff (2:4eff) - dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 - endchannel - - -SFX_02_2e_Ch2: ; 8f1a (2:4f1a) - dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 - endchannel - - -SFX_02_2e_Ch3: ; 8f35 (2:4f35) - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_02_2f.asm b/audio/sfx/sfx_02_2f.asm deleted file mode 100755 index ba0ecd23..00000000 --- a/audio/sfx/sfx_02_2f.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_02_2f_Ch1: ; 8cf0 (2:4cf0) - dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 - endchannel - - -SFX_02_2f_Ch2: ; 8d07 (2:4d07) - dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 - endchannel - - -SFX_02_2f_Ch3: ; 8d1e (2:4d1e) - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 - endchannel diff --git a/audio/sfx/sfx_02_30.asm b/audio/sfx/sfx_02_30.asm deleted file mode 100755 index 41a18486..00000000 --- a/audio/sfx/sfx_02_30.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_02_30_Ch1: ; 8eb1 (2:4eb1) - dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 - endchannel - - -SFX_02_30_Ch2: ; 8ed4 (2:4ed4) - dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 - endchannel - - -SFX_02_30_Ch3: ; 8eef (2:4eef) - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 - endchannel diff --git a/audio/sfx/sfx_02_31.asm b/audio/sfx/sfx_02_31.asm deleted file mode 100755 index 331413d3..00000000 --- a/audio/sfx/sfx_02_31.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_02_31_Ch1: ; 8f48 (2:4f48) - dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 - endchannel - - -SFX_02_31_Ch2: ; 8f63 (2:4f63) - dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 - endchannel - - -SFX_02_31_Ch3: ; 8f7e (2:4f7e) - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/sfx_02_32.asm b/audio/sfx/sfx_02_32.asm deleted file mode 100755 index a38da7fd..00000000 --- a/audio/sfx/sfx_02_32.asm +++ /dev/null @@ -1,38 +0,0 @@ -SFX_02_32_Ch1: ; 8dcf (2:4dcf) - dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 - endchannel - - -SFX_02_32_Ch2: ; 8df2 (2:4df2) - dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 - endchannel - - -SFX_02_32_Ch3: ; 8e19 (2:4e19) - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 - endchannel diff --git a/audio/sfx/sfx_02_33.asm b/audio/sfx/sfx_02_33.asm deleted file mode 100755 index 555f9b14..00000000 --- a/audio/sfx/sfx_02_33.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_02_33_Ch1: ; 8fe7 (2:4fe7) - dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 - endchannel - - -SFX_02_33_Ch2: ; 8ffa (2:4ffa) - dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 - endchannel - - -SFX_02_33_Ch3: ; 900d (2:500d) - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 - endchannel diff --git a/audio/sfx/sfx_02_34.asm b/audio/sfx/sfx_02_34.asm deleted file mode 100755 index a8b21680..00000000 --- a/audio/sfx/sfx_02_34.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_02_34_Ch1: ; 901a (2:501a) - dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 - endchannel - - -SFX_02_34_Ch2: ; 902d (2:502d) - dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 - endchannel - - -SFX_02_34_Ch3: ; 9040 (2:5040) - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 - endchannel diff --git a/audio/sfx/sfx_02_35.asm b/audio/sfx/sfx_02_35.asm deleted file mode 100755 index 61b2a5ac..00000000 --- a/audio/sfx/sfx_02_35.asm +++ /dev/null @@ -1,27 +0,0 @@ -SFX_02_35_Ch1: ; 904d (2:504d) - dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 - endchannel - - -SFX_02_35_Ch2: ; 9070 (2:5070) - dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 - - -SFX_02_35_Ch3: ; 9092 (2:5092) - endchannel diff --git a/audio/sfx/sfx_02_36.asm b/audio/sfx/sfx_02_36.asm deleted file mode 100755 index 972f87a6..00000000 --- a/audio/sfx/sfx_02_36.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_02_36_Ch1: ; 9093 (2:5093) - dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 - endchannel - - -SFX_02_36_Ch2: ; 90a6 (2:50a6) - dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 - endchannel - - -SFX_02_36_Ch3: ; 90b9 (2:50b9) - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 - endchannel diff --git a/audio/sfx/sfx_02_37.asm b/audio/sfx/sfx_02_37.asm deleted file mode 100755 index c286b018..00000000 --- a/audio/sfx/sfx_02_37.asm +++ /dev/null @@ -1,25 +0,0 @@ -SFX_02_37_Ch1: ; 8786 (2:4786) - dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 - endchannel - - -SFX_02_37_Ch2: ; 879d (2:479d) - dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 - endchannel - - -SFX_02_37_Ch3: ; 87b0 (2:47b0) - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/sfx_02_38.asm b/audio/sfx/sfx_02_38.asm deleted file mode 100755 index 9b6ba80f..00000000 --- a/audio/sfx/sfx_02_38.asm +++ /dev/null @@ -1,33 +0,0 @@ -SFX_02_38_Ch1: ; 87bd (2:47bd) - dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_02_38_Ch2: ; 87e0 (2:47e0) - dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 - endchannel - - -SFX_02_38_Ch3: ; 8803 (2:4803) - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/sfx_02_39.asm b/audio/sfx/sfx_02_39.asm deleted file mode 100755 index 3d50aef5..00000000 --- a/audio/sfx/sfx_02_39.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_02_39_Ch1: ; 886b (2:486b) - dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 - endchannel - - -SFX_02_39_Ch2: ; 8882 (2:4882) - dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 - endchannel - - -SFX_02_39_Ch3: ; 8899 (2:4899) - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 - endchannel diff --git a/audio/sfx/sfx_02_3a.asm b/audio/sfx/sfx_02_3a.asm deleted file mode 100755 index 96c93702..00000000 --- a/audio/sfx/sfx_02_3a.asm +++ /dev/null @@ -1,47 +0,0 @@ -SFX_02_3a_Ch1: ; ad77 (2:6d77) - executemusic - tempo 256 - volume 7, 7 - vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 - octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 - octave 4 - E_ 4 - endchannel - - -SFX_02_3a_Ch2: ; ad8e (2:6d8e) - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 - octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel - - -SFX_02_3a_Ch3: ; ad9e (2:6d9e) - executemusic - notetype 4, 1, 0 - octave 4 - B_ 1 - rest 1 - B_ 1 - rest 1 - B_ 1 - rest 1 - notetype 12, 1, 0 - octave 4 - B_ 2 - rest 2 - endchannel diff --git a/audio/sfx/sfx_02_3b.asm b/audio/sfx/sfx_02_3b.asm deleted file mode 100755 index 190b1299..00000000 --- a/audio/sfx/sfx_02_3b.asm +++ /dev/null @@ -1,69 +0,0 @@ -SFX_02_3b_Ch1: ; b316 (2:7316) - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 - octave 4 - D_ 4 - C_ 4 - octave 3 - A_ 8 - notetype 5, 11, 2 - octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 - octave 3 - A# 2 - notetype 5, 11, 4 - octave 4 - C_ 8 - endchannel - - -SFX_02_3b_Ch2: ; b335 (2:7335) - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 - octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel - - -SFX_02_3b_Ch3: ; b34d (2:734d) - executemusic - notetype 5, 1, 0 - octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 - rest 1 - D# 1 - rest 1 - E_ 1 - rest 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - G_ 1 - rest 1 - A_ 8 - endchannel diff --git a/audio/sfx/sfx_02_3c.asm b/audio/sfx/sfx_02_3c.asm deleted file mode 100755 index 95e2029d..00000000 --- a/audio/sfx/sfx_02_3c.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_02_3c_Ch1: ; 840a (2:440a) - duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_3d.asm b/audio/sfx/sfx_02_3d.asm deleted file mode 100755 index 469776a4..00000000 --- a/audio/sfx/sfx_02_3d.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_02_3d_Ch1: ; 84b7 (2:44b7) - duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_3e.asm b/audio/sfx/sfx_02_3e.asm deleted file mode 100755 index 36824962..00000000 --- a/audio/sfx/sfx_02_3e.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_02_3e_Ch1: ; 84d9 (2:44d9) - duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_3f.asm b/audio/sfx/sfx_02_3f.asm deleted file mode 100755 index dffd99cb..00000000 --- a/audio/sfx/sfx_02_3f.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_02_3f_Ch1: ; 83c3 (2:43c3) - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 - endchannel diff --git a/audio/sfx/sfx_02_40.asm b/audio/sfx/sfx_02_40.asm deleted file mode 100755 index 2aa521b4..00000000 --- a/audio/sfx/sfx_02_40.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_02_40_Ch1: ; 8462 (2:4462) - duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 - endchannel diff --git a/audio/sfx/sfx_02_41.asm b/audio/sfx/sfx_02_41.asm deleted file mode 100755 index a21595f3..00000000 --- a/audio/sfx/sfx_02_41.asm +++ /dev/null @@ -1,77 +0,0 @@ -SFX_02_41_Ch1: ; b2c8 (2:72c8) - executemusic - tempo 256 - volume 7, 7 - duty 2 - notetype 5, 11, 1 - octave 3 - A_ 2 - A_ 2 - G_ 2 - G_ 2 - F_ 2 - E_ 2 - F_ 2 - A_ 2 - octave 4 - C_ 4 - E_ 4 - octave 3 - F_ 4 - endchannel - - -SFX_02_41_Ch2: ; b2e1 (2:72e1) - executemusic - duty 2 - notetype 5, 12, 2 - octave 5 - F_ 2 - E_ 1 - rest 1 - D_ 2 - C_ 1 - rest 1 - octave 4 - A# 2 - octave 5 - C_ 2 - D_ 2 - E_ 2 - F_ 4 - G_ 4 - F_ 4 - endchannel - - -SFX_02_41_Ch3: ; b2f7 (2:72f7) - executemusic - notetype 5, 1, 0 - octave 5 - C_ 1 - rest 1 - octave 4 - F_ 2 - octave 5 - C_ 1 - rest 1 - octave 4 - A# 1 - rest 1 - A_ 1 - rest 1 - G_ 1 - rest 1 - F_ 1 - rest 1 - E_ 1 - rest 1 - octave 5 - F_ 1 - rest 3 - C_ 1 - rest 3 - octave 4 - F_ 2 - rest 2 - endchannel diff --git a/audio/sfx/sfx_02_42.asm b/audio/sfx/sfx_02_42.asm deleted file mode 100755 index 9f997b36..00000000 --- a/audio/sfx/sfx_02_42.asm +++ /dev/null @@ -1,59 +0,0 @@ -SFX_02_42_Ch1: ; b362 (2:7362) - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 10, 4 - octave 3 - A# 4 - notetype 5, 11, 1 - octave 4 - C_ 2 - C_ 1 - C_ 1 - notetype 5, 10, 4 - D# 4 - notetype 5, 11, 1 - F_ 2 - F_ 1 - F_ 1 - notetype 5, 11, 4 - A# 8 - endchannel - - -SFX_02_42_Ch2: ; b381 (2:7381) - executemusic - vibrato 4, 2, 3 - duty 2 - notetype 5, 13, 1 - octave 4 - G_ 2 - G_ 1 - G_ 1 - notetype 5, 12, 4 - D# 4 - notetype 5, 13, 1 - G# 2 - G# 1 - G# 1 - A# 2 - A# 1 - A# 1 - notetype 5, 12, 4 - octave 5 - D# 8 - endchannel - - -SFX_02_42_Ch3: ; b39d (2:739d) - executemusic - notetype 5, 1, 0 - octave 4 - D# 4 - G# 4 - G_ 4 - F_ 4 - D# 8 - endchannel diff --git a/audio/sfx/sfx_02_43.asm b/audio/sfx/sfx_02_43.asm deleted file mode 100755 index 3bb6f7ed..00000000 --- a/audio/sfx/sfx_02_43.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_02_43_Ch1: ; 84c6 (2:44c6) - duty 0 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_02_43_Ch1 - unknownsfx0x20 15, 243, 0, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_44.asm b/audio/sfx/sfx_02_44.asm deleted file mode 100755 index c03155d1..00000000 --- a/audio/sfx/sfx_02_44.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_02_44_Ch1: ; 84ee (2:44ee) - duty 2 - unknownsfx0x10 21 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_45.asm b/audio/sfx/sfx_02_45.asm deleted file mode 100755 index a2b9f83d..00000000 --- a/audio/sfx/sfx_02_45.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_02_45_Ch1: ; 84fd (2:44fd) - duty 2 - unknownsfx0x20 15, 242, 192, 7 - unknownsfx0x20 15, 0, 0, 0 - unknownsfx0x20 3, 161, 128, 7 - unknownsfx0x20 3, 161, 0, 7 - unknownsfx0x20 3, 161, 64, 7 - unknownsfx0x20 3, 161, 0, 7 - unknownsfx0x20 3, 161, 128, 7 - unknownsfx0x20 3, 161, 0, 7 - unknownsfx0x20 3, 161, 192, 7 - unknownsfx0x20 8, 161, 0, 7 - endchannel diff --git a/audio/sfx/sfx_02_46.asm b/audio/sfx/sfx_02_46.asm deleted file mode 100755 index b75ef176..00000000 --- a/audio/sfx/sfx_02_46.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_02_46_Ch1: ; 8528 (2:4528) - duty 2 - unknownsfx0x20 4, 240, 0, 6 - unknownsfx0x20 4, 240, 0, 4 - unknownsfx0x20 4, 240, 0, 2 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_02_47.asm b/audio/sfx/sfx_02_47.asm deleted file mode 100755 index f498077c..00000000 --- a/audio/sfx/sfx_02_47.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_02_47_Ch1: ; 853b (2:453b) - duty 2 - unknownsfx0x20 6, 240, 0, 7 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 6, 240, 0, 7 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_02_48.asm b/audio/sfx/sfx_02_48.asm deleted file mode 100755 index e22443cc..00000000 --- a/audio/sfx/sfx_02_48.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_02_48_Ch1: ; 854e (2:454e) - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 6 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 5 - unknownsfx0x20 15, 71, 128, 4 - unknownsfx0x20 15, 23, 0, 4 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_49.asm b/audio/sfx/sfx_02_49.asm deleted file mode 100755 index 6cf3e647..00000000 --- a/audio/sfx/sfx_02_49.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_02_49_Ch1: ; 8569 (2:4569) - duty 2 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 2, 241, 128, 6 - unknownsfx0x20 1, 0, 0, 0 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_02_4a.asm b/audio/sfx/sfx_02_4a.asm deleted file mode 100755 index 1cb0e857..00000000 --- a/audio/sfx/sfx_02_4a.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_02_4a_Ch1: ; 8580 (2:4580) - duty 2 - unknownsfx0x10 44 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 2, 241, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_02_4b.asm b/audio/sfx/sfx_02_4b.asm deleted file mode 100755 index 173a6c9d..00000000 --- a/audio/sfx/sfx_02_4b.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_02_4b_Ch1: ; 8595 (2:4595) - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 5 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 6 - unknownsfx0x20 15, 23, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_4c.asm b/audio/sfx/sfx_02_4c.asm deleted file mode 100755 index a52fefcf..00000000 --- a/audio/sfx/sfx_02_4c.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_02_4c_Ch1: ; 85b0 (2:45b0) - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 7 - unknownsfx0x20 15, 183, 128, 6 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 5 - unknownsfx0x20 15, 23, 0, 5 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_4d.asm b/audio/sfx/sfx_02_4d.asm deleted file mode 100755 index c7063722..00000000 --- a/audio/sfx/sfx_02_4d.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_02_4d_Ch1: ; 85cb (2:45cb) - duty 1 - unknownsfx0x10 22 - unknownsfx0x20 15, 210, 0, 5 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_4e.asm b/audio/sfx/sfx_02_4e.asm deleted file mode 100755 index 78b64198..00000000 --- a/audio/sfx/sfx_02_4e.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_02_4e_Ch1: ; 85d6 (2:45d6) - duty 2 - unknownsfx0x10 149 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_4f.asm b/audio/sfx/sfx_02_4f.asm deleted file mode 100755 index 53e523d0..00000000 --- a/audio/sfx/sfx_02_4f.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_02_4f_Ch1: ; 85e1 (2:45e1) - unknownnoise0x20 2, 241, 50 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 1, 0, 0 - endchannel diff --git a/audio/sfx/sfx_02_50.asm b/audio/sfx/sfx_02_50.asm deleted file mode 100755 index 5a5cd2b6..00000000 --- a/audio/sfx/sfx_02_50.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_02_50_Ch1: ; 85ee (2:45ee) - unknownnoise0x20 2, 241, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 161, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 209, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 129, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 177, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 97, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 145, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 65, 18 - unknownnoise0x20 2, 0, 0 - endchannel diff --git a/audio/sfx/sfx_02_51.asm b/audio/sfx/sfx_02_51.asm deleted file mode 100755 index cb55b512..00000000 --- a/audio/sfx/sfx_02_51.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_02_51_Ch1: ; 861f (2:461f) - duty 3 - unknownsfx0x10 90 - unknownsfx0x20 4, 240, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 1, 0, 0, 0 - endchannel - - -SFX_02_51_Ch2: ; 8636 (2:4636) - duty 3 - unknownsfx0x20 4, 240, 1, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 1, 4 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_02_52.asm b/audio/sfx/sfx_02_52.asm deleted file mode 100755 index 22b72929..00000000 --- a/audio/sfx/sfx_02_52.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_02_52_Ch1: ; 8649 (2:4649) - duty 0 - unknownsfx0x10 23 - unknownsfx0x20 15, 210, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_53.asm b/audio/sfx/sfx_02_53.asm deleted file mode 100755 index e81724b0..00000000 --- a/audio/sfx/sfx_02_53.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_02_53_Ch1: ; 8654 (2:4654) - unknownnoise0x20 4, 162, 35 - unknownnoise0x20 8, 241, 52 - unknownnoise0x20 15, 0, 0 - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 - endchannel diff --git a/audio/sfx/sfx_02_54.asm b/audio/sfx/sfx_02_54.asm deleted file mode 100755 index 72f79c78..00000000 --- a/audio/sfx/sfx_02_54.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_02_54_Ch1: ; 866d (2:466d) - duty 2 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 242, 0, 5 - endchannel - - -SFX_02_54_Ch2: ; 868c (2:468c) - duty 3 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 242, 130, 4 - endchannel diff --git a/audio/sfx/sfx_02_55.asm b/audio/sfx/sfx_02_55.asm deleted file mode 100755 index 57182f34..00000000 --- a/audio/sfx/sfx_02_55.asm +++ /dev/null @@ -1,12 +0,0 @@ -SFX_02_55_Ch1: ; 86ab (2:46ab) - duty 1 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 4, 226, 0, 5 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 7 - unknownsfx0x10 34 - unknownsfx0x20 15, 226, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_56.asm b/audio/sfx/sfx_02_56.asm deleted file mode 100755 index d27fba19..00000000 --- a/audio/sfx/sfx_02_56.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_02_56_Ch1: ; 83e1 (2:43e1) - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 - endchannel diff --git a/audio/sfx/sfx_02_57.asm b/audio/sfx/sfx_02_57.asm deleted file mode 100755 index 8f8d06e2..00000000 --- a/audio/sfx/sfx_02_57.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_02_57_Ch1: ; 83f1 (2:43f1) - unknownnoise0x20 9, 241, 68 - unknownnoise0x20 8, 209, 67 - endchannel diff --git a/audio/sfx/sfx_02_58.asm b/audio/sfx/sfx_02_58.asm deleted file mode 100755 index 3a9836fb..00000000 --- a/audio/sfx/sfx_02_58.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_02_58_Ch1: ; 83f8 (2:43f8) - duty 2 - unknownsfx0x20 8, 225, 64, 7 - endchannel - - -SFX_02_58_Ch2: ; 83ff (2:43ff) - duty 2 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 8, 177, 65, 7 - endchannel diff --git a/audio/sfx/sfx_02_59.asm b/audio/sfx/sfx_02_59.asm deleted file mode 100755 index c4ea93f7..00000000 --- a/audio/sfx/sfx_02_59.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_02_59_Ch1: ; 841b (2:441b) - duty 2 - unknownsfx0x20 4, 241, 128, 7 - endchannel - - -SFX_02_59_Ch2: ; 8422 (2:4422) - duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 161, 97, 7 - endchannel diff --git a/audio/sfx/sfx_02_5a.asm b/audio/sfx/sfx_02_5a.asm deleted file mode 100755 index d0d6f875..00000000 --- a/audio/sfx/sfx_02_5a.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_02_5a_Ch1: ; 842d (2:442d) - duty 2 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 8, 242, 224, 7 - endchannel - - -SFX_02_5a_Ch2: ; 8438 (2:4438) - duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 145, 193, 6 - unknownsfx0x20 8, 162, 161, 7 - endchannel diff --git a/audio/sfx/sfx_02_5b.asm b/audio/sfx/sfx_02_5b.asm deleted file mode 100755 index b09369db..00000000 --- a/audio/sfx/sfx_02_5b.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_02_5b_Ch1: ; 8447 (2:4447) - duty 2 - unknownsfx0x10 90 - unknownsfx0x20 15, 241, 0, 3 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_02_5c.asm b/audio/sfx/sfx_02_5c.asm deleted file mode 100755 index 477fd03b..00000000 --- a/audio/sfx/sfx_02_5c.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_02_5c_Ch1: ; 8452 (2:4452) - unknownnoise0x20 2, 241, 84 - unknownnoise0x20 12, 113, 35 - unknownnoise0x20 2, 177, 84 - unknownnoise0x20 12, 97, 35 - unknownnoise0x20 6, 65, 84 - endchannel diff --git a/audio/sfx/sfx_02_5d.asm b/audio/sfx/sfx_02_5d.asm deleted file mode 100755 index 2411c9ee..00000000 --- a/audio/sfx/sfx_02_5d.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_02_5d_Ch1: ; 8475 (2:4475) - duty 2 - unknownsfx0x20 4, 244, 0, 7 - unknownsfx0x20 2, 228, 0, 6 - unknownsfx0x20 2, 228, 128, 6 - unknownsfx0x20 2, 228, 192, 6 - unknownsfx0x20 2, 228, 0, 7 - unknownsfx0x20 2, 228, 160, 7 - unknownsfx0x20 15, 242, 224, 7 - endchannel - - -SFX_02_5d_Ch2: ; 8494 (2:4494) - duty 2 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 2, 212, 1, 7 - unknownsfx0x20 2, 196, 1, 6 - unknownsfx0x20 2, 196, 129, 6 - unknownsfx0x20 2, 196, 193, 6 - unknownsfx0x20 2, 196, 1, 7 - unknownsfx0x20 2, 196, 161, 7 - unknownsfx0x20 15, 210, 225, 7 - endchannel diff --git a/audio/sfx/sfx_02_5e.asm b/audio/sfx/sfx_02_5e.asm deleted file mode 100755 index 5f631c2d..00000000 --- a/audio/sfx/sfx_02_5e.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_02_5e_Ch1: ; 83ca (2:43ca) - vibrato 16, 1, 4 - notetype 12, 1, 0 - octave 5 - E_ 2 - F_ 2 - G_ 4 - A_ 2 - G_ 2 - octave 6 - C_ 4 - C_ 2 - D_ 2 - C_ 2 - octave 5 - G_ 2 - A_ 2 - F_ 2 - G_ 8 - rest 12 - endchannel diff --git a/audio/sfx/sfx_02_5f.asm b/audio/sfx/sfx_02_5f.asm deleted file mode 100755 index c4fe674c..00000000 --- a/audio/sfx/sfx_02_5f.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_02_5f_Ch1: ; 86c8 (2:46c8) - duty 2 - unknownsfx0x20 15, 243, 48, 7 - unknownsfx0x20 8, 101, 48, 7 - unknownsfx0x20 15, 244, 0, 7 - unknownsfx0x20 15, 116, 0, 7 - unknownsfx0x20 15, 68, 0, 7 - unknownsfx0x20 15, 36, 0, 7 - endchannel diff --git a/audio/sfx/sfx_08_01.asm b/audio/sfx/sfx_08_01.asm deleted file mode 100755 index 7d86e4ad..00000000 --- a/audio/sfx/sfx_08_01.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_01_Ch1: ; 202fd (8:42fd) - unknownnoise0x20 0, 193, 51 - endchannel diff --git a/audio/sfx/sfx_08_02.asm b/audio/sfx/sfx_08_02.asm deleted file mode 100755 index 1fe0d185..00000000 --- a/audio/sfx/sfx_08_02.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_02_Ch1: ; 20301 (8:4301) - unknownnoise0x20 0, 177, 51 - endchannel diff --git a/audio/sfx/sfx_08_03.asm b/audio/sfx/sfx_08_03.asm deleted file mode 100755 index 141c4e5b..00000000 --- a/audio/sfx/sfx_08_03.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_03_Ch1: ; 20305 (8:4305) - unknownnoise0x20 0, 161, 51 - endchannel diff --git a/audio/sfx/sfx_08_04.asm b/audio/sfx/sfx_08_04.asm deleted file mode 100755 index 923fd349..00000000 --- a/audio/sfx/sfx_08_04.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_04_Ch1: ; 20309 (8:4309) - unknownnoise0x20 0, 129, 51 - endchannel diff --git a/audio/sfx/sfx_08_05.asm b/audio/sfx/sfx_08_05.asm deleted file mode 100755 index 54745d1f..00000000 --- a/audio/sfx/sfx_08_05.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_08_05_Ch1: ; 2030d (8:430d) - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 - endchannel diff --git a/audio/sfx/sfx_08_06.asm b/audio/sfx/sfx_08_06.asm deleted file mode 100755 index ecd2b191..00000000 --- a/audio/sfx/sfx_08_06.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_06_Ch1: ; 20320 (8:4320) - unknownnoise0x20 0, 81, 42 - endchannel diff --git a/audio/sfx/sfx_08_07.asm b/audio/sfx/sfx_08_07.asm deleted file mode 100755 index a520de0d..00000000 --- a/audio/sfx/sfx_08_07.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_07_Ch1: ; 20324 (8:4324) - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 - endchannel diff --git a/audio/sfx/sfx_08_08.asm b/audio/sfx/sfx_08_08.asm deleted file mode 100755 index 6def0c55..00000000 --- a/audio/sfx/sfx_08_08.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_08_Ch1: ; 2032b (8:432b) - unknownnoise0x20 0, 129, 16 - endchannel diff --git a/audio/sfx/sfx_08_09.asm b/audio/sfx/sfx_08_09.asm deleted file mode 100755 index c49c5cb7..00000000 --- a/audio/sfx/sfx_08_09.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_09_Ch1: ; 2032f (8:432f) - unknownnoise0x20 0, 130, 35 - endchannel diff --git a/audio/sfx/sfx_08_0a.asm b/audio/sfx/sfx_08_0a.asm deleted file mode 100755 index f5f2ab3c..00000000 --- a/audio/sfx/sfx_08_0a.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_0a_Ch1: ; 20333 (8:4333) - unknownnoise0x20 0, 130, 37 - endchannel diff --git a/audio/sfx/sfx_08_0b.asm b/audio/sfx/sfx_08_0b.asm deleted file mode 100755 index 2d45ef7e..00000000 --- a/audio/sfx/sfx_08_0b.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_0b_Ch1: ; 20337 (8:4337) - unknownnoise0x20 0, 130, 38 - endchannel diff --git a/audio/sfx/sfx_08_0c.asm b/audio/sfx/sfx_08_0c.asm deleted file mode 100755 index 782ecf90..00000000 --- a/audio/sfx/sfx_08_0c.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_0c_Ch1: ; 2033b (8:433b) - unknownnoise0x20 0, 161, 16 - endchannel diff --git a/audio/sfx/sfx_08_0d.asm b/audio/sfx/sfx_08_0d.asm deleted file mode 100755 index d9ef41d0..00000000 --- a/audio/sfx/sfx_08_0d.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_0d_Ch1: ; 2033f (8:433f) - unknownnoise0x20 0, 162, 17 - endchannel diff --git a/audio/sfx/sfx_08_0e.asm b/audio/sfx/sfx_08_0e.asm deleted file mode 100755 index 885225ea..00000000 --- a/audio/sfx/sfx_08_0e.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_0e_Ch1: ; 20343 (8:4343) - unknownnoise0x20 0, 162, 80 - endchannel diff --git a/audio/sfx/sfx_08_0f.asm b/audio/sfx/sfx_08_0f.asm deleted file mode 100755 index 64f1cbe4..00000000 --- a/audio/sfx/sfx_08_0f.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_0f_Ch1: ; 20347 (8:4347) - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 - endchannel diff --git a/audio/sfx/sfx_08_10.asm b/audio/sfx/sfx_08_10.asm deleted file mode 100755 index 3643a769..00000000 --- a/audio/sfx/sfx_08_10.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_10_Ch1: ; 2034e (8:434e) - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 - endchannel diff --git a/audio/sfx/sfx_08_11.asm b/audio/sfx/sfx_08_11.asm deleted file mode 100755 index bec0220f..00000000 --- a/audio/sfx/sfx_08_11.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_11_Ch1: ; 20355 (8:4355) - unknownnoise0x20 0, 145, 34 - endchannel diff --git a/audio/sfx/sfx_08_12.asm b/audio/sfx/sfx_08_12.asm deleted file mode 100755 index 7e93326b..00000000 --- a/audio/sfx/sfx_08_12.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_12_Ch1: ; 20359 (8:4359) - unknownnoise0x20 0, 113, 34 - endchannel diff --git a/audio/sfx/sfx_08_13.asm b/audio/sfx/sfx_08_13.asm deleted file mode 100755 index 7feb8deb..00000000 --- a/audio/sfx/sfx_08_13.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_13_Ch1: ; 2035d (8:435d) - unknownnoise0x20 0, 97, 34 - endchannel diff --git a/audio/sfx/sfx_08_14.asm b/audio/sfx/sfx_08_14.asm deleted file mode 100755 index 83837768..00000000 --- a/audio/sfx/sfx_08_14.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_08_14_Ch1: ; 20c2f (8:4c2f) - dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 - endchannel - - -SFX_08_14_Ch2: ; 20c3e (8:4c3e) - dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 - endchannel - - -SFX_08_14_Ch3: ; 20c4d (8:4c4d) - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 - endchannel diff --git a/audio/sfx/sfx_08_15.asm b/audio/sfx/sfx_08_15.asm deleted file mode 100755 index 94705f71..00000000 --- a/audio/sfx/sfx_08_15.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_08_15_Ch1: ; 20e3f (8:4e3f) - dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 - endchannel - - -SFX_08_15_Ch2: ; 20e52 (8:4e52) - dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 - endchannel - - -SFX_08_15_Ch3: ; 20e65 (8:4e65) - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 - endchannel diff --git a/audio/sfx/sfx_08_16.asm b/audio/sfx/sfx_08_16.asm deleted file mode 100755 index e2109f2b..00000000 --- a/audio/sfx/sfx_08_16.asm +++ /dev/null @@ -1,17 +0,0 @@ -SFX_08_16_Ch1: ; 20db4 (8:4db4) - duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 - endchannel - - -SFX_08_16_Ch2: ; 20dc3 (8:4dc3) - dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 - - -SFX_08_16_Ch3: ; 20dd1 (8:4dd1) - endchannel diff --git a/audio/sfx/sfx_08_17.asm b/audio/sfx/sfx_08_17.asm deleted file mode 100755 index c8efc25f..00000000 --- a/audio/sfx/sfx_08_17.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_08_17_Ch1: ; 20b4e (8:4b4e) - dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 - endchannel - - -SFX_08_17_Ch2: ; 20b6d (8:4b6d) - dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 - endchannel - - -SFX_08_17_Ch3: ; 20b8c (8:4b8c) - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/sfx_08_18.asm b/audio/sfx/sfx_08_18.asm deleted file mode 100755 index fce2f3e8..00000000 --- a/audio/sfx/sfx_08_18.asm +++ /dev/null @@ -1,32 +0,0 @@ -SFX_08_18_Ch1: ; 20efd (8:4efd) - dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 - endchannel - - -SFX_08_18_Ch2: ; 20f1c (8:4f1c) - dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 - endchannel - - -SFX_08_18_Ch3: ; 20f3b (8:4f3b) - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/sfx_08_19.asm b/audio/sfx/sfx_08_19.asm deleted file mode 100755 index ad3a22ad..00000000 --- a/audio/sfx/sfx_08_19.asm +++ /dev/null @@ -1,19 +0,0 @@ -SFX_08_19_Ch1: ; 20cdd (8:4cdd) - dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 - endchannel - - -SFX_08_19_Ch2: ; 20cf0 (8:4cf0) - dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 - - -SFX_08_19_Ch3: ; 20d02 (8:4d02) - endchannel diff --git a/audio/sfx/sfx_08_1a.asm b/audio/sfx/sfx_08_1a.asm deleted file mode 100755 index 96df0f42..00000000 --- a/audio/sfx/sfx_08_1a.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_08_1a_Ch1: ; 20c87 (8:4c87) - dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 - - -SFX_08_1a_Ch2: ; 20ca1 (8:4ca1) - endchannel - - -SFX_08_1a_Ch3: ; 20ca2 (8:4ca2) - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 - endchannel diff --git a/audio/sfx/sfx_08_1b.asm b/audio/sfx/sfx_08_1b.asm deleted file mode 100755 index bd7e288f..00000000 --- a/audio/sfx/sfx_08_1b.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_08_1b_Ch1: ; 20cb5 (8:4cb5) - dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_08_1b_Ch2: ; 20cc4 (8:4cc4) - dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 - endchannel - - -SFX_08_1b_Ch3: ; 20cd3 (8:4cd3) - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 - endchannel diff --git a/audio/sfx/sfx_08_1c.asm b/audio/sfx/sfx_08_1c.asm deleted file mode 100755 index e3b904b0..00000000 --- a/audio/sfx/sfx_08_1c.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_08_1c_Ch1: ; 20ecd (8:4ecd) - dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 - endchannel - - -SFX_08_1c_Ch2: ; 20ee0 (8:4ee0) - dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 - endchannel - - -SFX_08_1c_Ch3: ; 20ef3 (8:4ef3) - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/sfx_08_1d.asm b/audio/sfx/sfx_08_1d.asm deleted file mode 100755 index a6f82cf2..00000000 --- a/audio/sfx/sfx_08_1d.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_08_1d_Ch1: ; 209d7 (8:49d7) - dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 - dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 - endchannel - - -SFX_08_1d_Ch2: ; 209f4 (8:49f4) - dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 - dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 - endchannel - - -SFX_08_1d_Ch3: ; 20a15 (8:4a15) - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 - endchannel diff --git a/audio/sfx/sfx_08_1e.asm b/audio/sfx/sfx_08_1e.asm deleted file mode 100755 index 1312f6f2..00000000 --- a/audio/sfx/sfx_08_1e.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_08_1e_Ch1: ; 20e72 (8:4e72) - dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 - endchannel - - -SFX_08_1e_Ch2: ; 20e91 (8:4e91) - dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 - endchannel - - -SFX_08_1e_Ch3: ; 20eb4 (8:4eb4) - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 - endchannel diff --git a/audio/sfx/sfx_08_1f.asm b/audio/sfx/sfx_08_1f.asm deleted file mode 100755 index ab708929..00000000 --- a/audio/sfx/sfx_08_1f.asm +++ /dev/null @@ -1,37 +0,0 @@ -SFX_08_1f_Ch1: ; 20d03 (8:4d03) - dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 - endchannel - - -SFX_08_1f_Ch2: ; 20d2e (8:4d2e) - dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 - endchannel - - -SFX_08_1f_Ch3: ; 20d4d (8:4d4d) - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 - endchannel diff --git a/audio/sfx/sfx_08_20.asm b/audio/sfx/sfx_08_20.asm deleted file mode 100755 index 633276a8..00000000 --- a/audio/sfx/sfx_08_20.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_08_20_Ch1: ; 20d66 (8:4d66) - dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_08_20_Ch2: ; 20d8d (8:4d8d) - dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 - - -SFX_08_20_Ch3: ; 20db3 (8:4db3) - endchannel diff --git a/audio/sfx/sfx_08_21.asm b/audio/sfx/sfx_08_21.asm deleted file mode 100755 index 5279435a..00000000 --- a/audio/sfx/sfx_08_21.asm +++ /dev/null @@ -1,40 +0,0 @@ -SFX_08_21_Ch1: ; 20dd2 (8:4dd2) - dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_08_21_Ch1 - endchannel - - -SFX_08_21_Ch2: ; 20df1 (8:4df1) - dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 - endchannel - - -SFX_08_21_Ch3: ; 20e20 (8:4e20) - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 - endchannel diff --git a/audio/sfx/sfx_08_22.asm b/audio/sfx/sfx_08_22.asm deleted file mode 100755 index 6a54311f..00000000 --- a/audio/sfx/sfx_08_22.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_08_22_Ch1: ; 20c57 (8:4c57) - dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 - endchannel - - -SFX_08_22_Ch2: ; 20c6a (8:4c6a) - dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 - endchannel - - -SFX_08_22_Ch3: ; 20c7d (8:4c7d) - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 - endchannel diff --git a/audio/sfx/sfx_08_23.asm b/audio/sfx/sfx_08_23.asm deleted file mode 100755 index 03b63546..00000000 --- a/audio/sfx/sfx_08_23.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_08_23_Ch1: ; 20b99 (8:4b99) - dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_08_23_Ch2: ; 20bb4 (8:4bb4) - dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 - endchannel - - -SFX_08_23_Ch3: ; 20bcf (8:4bcf) - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 - endchannel diff --git a/audio/sfx/sfx_08_24.asm b/audio/sfx/sfx_08_24.asm deleted file mode 100755 index f94e2535..00000000 --- a/audio/sfx/sfx_08_24.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_08_24_Ch1: ; 20bdf (8:4bdf) - dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 - endchannel - - -SFX_08_24_Ch2: ; 20c02 (8:4c02) - dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 - endchannel - - -SFX_08_24_Ch3: ; 20c25 (8:4c25) - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 - endchannel diff --git a/audio/sfx/sfx_08_25.asm b/audio/sfx/sfx_08_25.asm deleted file mode 100755 index 55954029..00000000 --- a/audio/sfx/sfx_08_25.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_08_25_Ch1: ; 20abb (8:4abb) - dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 - endchannel - - -SFX_08_25_Ch2: ; 20ada (8:4ada) - dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 - endchannel - - -SFX_08_25_Ch3: ; 20afd (8:4afd) - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_08_26.asm b/audio/sfx/sfx_08_26.asm deleted file mode 100755 index c166605b..00000000 --- a/audio/sfx/sfx_08_26.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_08_26_Ch1: ; 20fd3 (8:4fd3) - dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 - endchannel - - -SFX_08_26_Ch2: ; 20fe6 (8:4fe6) - dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 - endchannel - - -SFX_08_26_Ch3: ; 20ff9 (8:4ff9) - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 - endchannel diff --git a/audio/sfx/sfx_08_27.asm b/audio/sfx/sfx_08_27.asm deleted file mode 100755 index 9443379c..00000000 --- a/audio/sfx/sfx_08_27.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_08_27_Ch1: ; 21006 (8:5006) - dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 - endchannel - - -SFX_08_27_Ch2: ; 21021 (8:5021) - dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 - endchannel - - -SFX_08_27_Ch3: ; 2103c (8:503c) - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/sfx_08_28.asm b/audio/sfx/sfx_08_28.asm deleted file mode 100755 index 178ce5de..00000000 --- a/audio/sfx/sfx_08_28.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_08_28_Ch1: ; 2104f (8:504f) - dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 - endchannel - - -SFX_08_28_Ch2: ; 2105e (8:505e) - dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 - endchannel - - -SFX_08_28_Ch3: ; 2106d (8:506d) - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_08_29.asm b/audio/sfx/sfx_08_29.asm deleted file mode 100755 index ff22501f..00000000 --- a/audio/sfx/sfx_08_29.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_08_29_Ch1: ; 210dd (8:50dd) - dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 - endchannel - - -SFX_08_29_Ch2: ; 210f8 (8:50f8) - dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 - endchannel - - -SFX_08_29_Ch3: ; 21113 (8:5113) - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 - endchannel diff --git a/audio/sfx/sfx_08_2a.asm b/audio/sfx/sfx_08_2a.asm deleted file mode 100755 index 8b9aeeaf..00000000 --- a/audio/sfx/sfx_08_2a.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_08_2a_Ch1: ; 20f70 (8:4f70) - dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 - endchannel - - -SFX_08_2a_Ch2: ; 20f7f (8:4f7f) - dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 - endchannel - - -SFX_08_2a_Ch3: ; 20f8e (8:4f8e) - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 - endchannel diff --git a/audio/sfx/sfx_08_2b.asm b/audio/sfx/sfx_08_2b.asm deleted file mode 100755 index b35755a4..00000000 --- a/audio/sfx/sfx_08_2b.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_08_2b_Ch1: ; 21126 (8:5126) - dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 - endchannel - - -SFX_08_2b_Ch2: ; 21139 (8:5139) - dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 - endchannel - - -SFX_08_2b_Ch3: ; 2114c (8:514c) - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 - endchannel diff --git a/audio/sfx/sfx_08_2c.asm b/audio/sfx/sfx_08_2c.asm deleted file mode 100755 index b2dbc764..00000000 --- a/audio/sfx/sfx_08_2c.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_08_2c_Ch1: ; 21236 (8:5236) - dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 - endchannel - - -SFX_08_2c_Ch2: ; 21259 (8:5259) - dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 - endchannel - - -SFX_08_2c_Ch3: ; 2127c (8:527c) - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/sfx_08_2d.asm b/audio/sfx/sfx_08_2d.asm deleted file mode 100755 index 4f7f5422..00000000 --- a/audio/sfx/sfx_08_2d.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_08_2d_Ch1: ; 20f4e (8:4f4e) - dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 - endchannel - - -SFX_08_2d_Ch2: ; 20f5d (8:4f5d) - dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 - - -SFX_08_2d_Ch3: ; 20f6f (8:4f6f) - endchannel diff --git a/audio/sfx/sfx_08_2e.asm b/audio/sfx/sfx_08_2e.asm deleted file mode 100755 index 7a6e9257..00000000 --- a/audio/sfx/sfx_08_2e.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_08_2e_Ch1: ; 211a7 (8:51a7) - dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 - endchannel - - -SFX_08_2e_Ch2: ; 211c2 (8:51c2) - dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 - endchannel - - -SFX_08_2e_Ch3: ; 211dd (8:51dd) - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_08_2f.asm b/audio/sfx/sfx_08_2f.asm deleted file mode 100755 index d26e86c0..00000000 --- a/audio/sfx/sfx_08_2f.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_08_2f_Ch1: ; 20f98 (8:4f98) - dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 - endchannel - - -SFX_08_2f_Ch2: ; 20faf (8:4faf) - dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 - endchannel - - -SFX_08_2f_Ch3: ; 20fc6 (8:4fc6) - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 - endchannel diff --git a/audio/sfx/sfx_08_30.asm b/audio/sfx/sfx_08_30.asm deleted file mode 100755 index 08e7da69..00000000 --- a/audio/sfx/sfx_08_30.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_08_30_Ch1: ; 21159 (8:5159) - dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 - endchannel - - -SFX_08_30_Ch2: ; 2117c (8:517c) - dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 - endchannel - - -SFX_08_30_Ch3: ; 21197 (8:5197) - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 - endchannel diff --git a/audio/sfx/sfx_08_31.asm b/audio/sfx/sfx_08_31.asm deleted file mode 100755 index 4c06c624..00000000 --- a/audio/sfx/sfx_08_31.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_08_31_Ch1: ; 211f0 (8:51f0) - dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 - endchannel - - -SFX_08_31_Ch2: ; 2120b (8:520b) - dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 - endchannel - - -SFX_08_31_Ch3: ; 21226 (8:5226) - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/sfx_08_32.asm b/audio/sfx/sfx_08_32.asm deleted file mode 100755 index 255d24c7..00000000 --- a/audio/sfx/sfx_08_32.asm +++ /dev/null @@ -1,38 +0,0 @@ -SFX_08_32_Ch1: ; 21077 (8:5077) - dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 - endchannel - - -SFX_08_32_Ch2: ; 2109a (8:509a) - dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 - endchannel - - -SFX_08_32_Ch3: ; 210c1 (8:50c1) - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 - endchannel diff --git a/audio/sfx/sfx_08_33.asm b/audio/sfx/sfx_08_33.asm deleted file mode 100755 index 55b09fb1..00000000 --- a/audio/sfx/sfx_08_33.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_08_33_Ch1: ; 2128f (8:528f) - dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 - endchannel - - -SFX_08_33_Ch2: ; 212a2 (8:52a2) - dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 - endchannel - - -SFX_08_33_Ch3: ; 212b5 (8:52b5) - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 - endchannel diff --git a/audio/sfx/sfx_08_34.asm b/audio/sfx/sfx_08_34.asm deleted file mode 100755 index cabd1ebe..00000000 --- a/audio/sfx/sfx_08_34.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_08_34_Ch1: ; 212c2 (8:52c2) - dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 - endchannel - - -SFX_08_34_Ch2: ; 212d5 (8:52d5) - dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 - endchannel - - -SFX_08_34_Ch3: ; 212e8 (8:52e8) - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 - endchannel diff --git a/audio/sfx/sfx_08_35.asm b/audio/sfx/sfx_08_35.asm deleted file mode 100755 index 732f7a1e..00000000 --- a/audio/sfx/sfx_08_35.asm +++ /dev/null @@ -1,27 +0,0 @@ -SFX_08_35_Ch1: ; 212f5 (8:52f5) - dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 - endchannel - - -SFX_08_35_Ch2: ; 21318 (8:5318) - dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 - - -SFX_08_35_Ch3: ; 2133a (8:533a) - endchannel diff --git a/audio/sfx/sfx_08_36.asm b/audio/sfx/sfx_08_36.asm deleted file mode 100755 index 47d08af1..00000000 --- a/audio/sfx/sfx_08_36.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_08_36_Ch1: ; 2133b (8:533b) - dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 - endchannel - - -SFX_08_36_Ch2: ; 2134e (8:534e) - dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 - endchannel - - -SFX_08_36_Ch3: ; 21361 (8:5361) - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 - endchannel diff --git a/audio/sfx/sfx_08_37.asm b/audio/sfx/sfx_08_37.asm deleted file mode 100755 index 8df47703..00000000 --- a/audio/sfx/sfx_08_37.asm +++ /dev/null @@ -1,25 +0,0 @@ -SFX_08_37_Ch1: ; 20a2e (8:4a2e) - dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 - endchannel - - -SFX_08_37_Ch2: ; 20a45 (8:4a45) - dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 - endchannel - - -SFX_08_37_Ch3: ; 20a58 (8:4a58) - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/sfx_08_38.asm b/audio/sfx/sfx_08_38.asm deleted file mode 100755 index 77df04e1..00000000 --- a/audio/sfx/sfx_08_38.asm +++ /dev/null @@ -1,33 +0,0 @@ -SFX_08_38_Ch1: ; 20a65 (8:4a65) - dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_08_38_Ch2: ; 20a88 (8:4a88) - dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 - endchannel - - -SFX_08_38_Ch3: ; 20aab (8:4aab) - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/sfx_08_39.asm b/audio/sfx/sfx_08_39.asm deleted file mode 100755 index a4d0e0a4..00000000 --- a/audio/sfx/sfx_08_39.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_08_39_Ch1: ; 20b13 (8:4b13) - dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 - endchannel - - -SFX_08_39_Ch2: ; 20b2a (8:4b2a) - dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 - endchannel - - -SFX_08_39_Ch3: ; 20b41 (8:4b41) - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 - endchannel diff --git a/audio/sfx/sfx_08_3a.asm b/audio/sfx/sfx_08_3a.asm deleted file mode 100755 index afbc50d4..00000000 --- a/audio/sfx/sfx_08_3a.asm +++ /dev/null @@ -1,63 +0,0 @@ -SFX_08_3a_Ch1: ; 2397d (8:797d) - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 6, 11, 4 - octave 4 - F_ 4 - notetype 4, 11, 2 - C_ 2 - F_ 2 - C_ 2 - notetype 6, 11, 3 - D# 2 - D# 2 - E_ 2 - notetype 6, 11, 4 - F_ 8 - endchannel - - -SFX_08_3a_Ch2: ; 23998 (8:7998) - executemusic - vibrato 4, 2, 2 - duty 2 - notetype 6, 12, 4 - octave 4 - A_ 4 - notetype 4, 12, 2 - A_ 2 - A_ 2 - A_ 2 - notetype 6, 12, 4 - A# 2 - A# 2 - A# 2 - notetype 6, 12, 4 - A_ 8 - endchannel - - -SFX_08_3a_Ch3: ; 239b0 (8:79b0) - executemusic - notetype 6, 1, 0 - octave 5 - A_ 4 - notetype 4, 1, 0 - F_ 1 - rest 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - notetype 6, 1, 0 - G_ 1 - rest 1 - D# 1 - rest 1 - G_ 1 - rest 1 - A_ 8 - endchannel diff --git a/audio/sfx/sfx_08_3b.asm b/audio/sfx/sfx_08_3b.asm deleted file mode 100755 index cb7c9a52..00000000 --- a/audio/sfx/sfx_08_3b.asm +++ /dev/null @@ -1,69 +0,0 @@ -SFX_08_3b_Ch1: ; 239c7 (8:79c7) - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 - octave 4 - D_ 4 - C_ 4 - octave 3 - A_ 8 - notetype 5, 11, 2 - octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 - octave 3 - A# 2 - notetype 5, 11, 4 - octave 4 - C_ 8 - endchannel - - -SFX_08_3b_Ch2: ; 239e6 (8:79e6) - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 - octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel - - -SFX_08_3b_Ch3: ; 239fe (8:79fe) - executemusic - notetype 5, 1, 0 - octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 - rest 1 - D# 1 - rest 1 - E_ 1 - rest 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - G_ 1 - rest 1 - A_ 8 - endchannel diff --git a/audio/sfx/sfx_08_3c.asm b/audio/sfx/sfx_08_3c.asm deleted file mode 100755 index 0ac2343c..00000000 --- a/audio/sfx/sfx_08_3c.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_08_3c_Ch1: ; 203dd (8:43dd) - duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_08_3d.asm b/audio/sfx/sfx_08_3d.asm deleted file mode 100755 index aa9867a1..00000000 --- a/audio/sfx/sfx_08_3d.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_08_3d_Ch1: ; 203ee (8:43ee) - duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_08_3e.asm b/audio/sfx/sfx_08_3e.asm deleted file mode 100755 index 30aefce4..00000000 --- a/audio/sfx/sfx_08_3e.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_08_3e_Ch1: ; 203fd (8:43fd) - duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_08_3f.asm b/audio/sfx/sfx_08_3f.asm deleted file mode 100755 index 800684d3..00000000 --- a/audio/sfx/sfx_08_3f.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_3f_Ch1: ; 203d6 (8:43d6) - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 - endchannel diff --git a/audio/sfx/sfx_08_40.asm b/audio/sfx/sfx_08_40.asm deleted file mode 100755 index 7dfae9a7..00000000 --- a/audio/sfx/sfx_08_40.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_08_40_Ch1: ; 203c3 (8:43c3) - duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 - endchannel diff --git a/audio/sfx/sfx_08_41.asm b/audio/sfx/sfx_08_41.asm deleted file mode 100755 index ef5998cd..00000000 --- a/audio/sfx/sfx_08_41.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_08_41_Ch1: ; 2042d (8:442d) - duty 2 - unknownsfx0x10 47 - unknownsfx0x20 15, 242, 128, 7 - endchannel - - -SFX_08_41_Ch2: ; 20436 (8:4436) - duty 2 - unknownsfx0x20 15, 194, 130, 7 - endchannel diff --git a/audio/sfx/sfx_08_42.asm b/audio/sfx/sfx_08_42.asm deleted file mode 100755 index 247a68f3..00000000 --- a/audio/sfx/sfx_08_42.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_08_42_Ch1: ; 2043d (8:443d) - duty 2 - unknownsfx0x10 22 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 - endchannel - - -SFX_08_42_Ch2: ; 20448 (8:4448) - unknownnoise0x20 15, 162, 34 - endchannel diff --git a/audio/sfx/sfx_08_43.asm b/audio/sfx/sfx_08_43.asm deleted file mode 100755 index 23e3b5f0..00000000 --- a/audio/sfx/sfx_08_43.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_08_43_Ch1: ; 2044c (8:444c) - unknownsfx0x20 15, 209, 0, 2 - unknownsfx0x10 8 - endchannel - - -SFX_08_43_Ch2: ; 20453 (8:4453) - unknownnoise0x20 4, 245, 51 - unknownnoise0x20 8, 244, 34 - unknownnoise0x20 15, 242, 33 - endchannel diff --git a/audio/sfx/sfx_08_44.asm b/audio/sfx/sfx_08_44.asm deleted file mode 100755 index d626f3a1..00000000 --- a/audio/sfx/sfx_08_44.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_08_44_Ch1: ; 2045d (8:445d) - unknownnoise0x20 2, 97, 35 - unknownnoise0x20 2, 161, 51 - unknownnoise0x20 2, 193, 51 - unknownnoise0x20 2, 81, 17 - unknownnoise0x20 2, 241, 51 - unknownnoise0x20 2, 65, 17 - unknownnoise0x20 2, 193, 51 - unknownnoise0x20 2, 49, 17 - unknownnoise0x20 2, 129, 51 - unknownnoise0x20 2, 49, 17 - unknownnoise0x20 8, 65, 51 - endchannel diff --git a/audio/sfx/sfx_08_45.asm b/audio/sfx/sfx_08_45.asm deleted file mode 100755 index 00e5a659..00000000 --- a/audio/sfx/sfx_08_45.asm +++ /dev/null @@ -1,15 +0,0 @@ -SFX_08_45_Ch1: ; 2047f (8:447f) - duty 2 - unknownsfx0x10 68 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel - - -SFX_08_45_Ch2: ; 20490 (8:4490) - duty 2 - unknownsfx0x20 15, 146, 0, 6 - unknownsfx0x20 15, 146, 130, 7 - endchannel diff --git a/audio/sfx/sfx_08_46.asm b/audio/sfx/sfx_08_46.asm deleted file mode 100755 index de64873a..00000000 --- a/audio/sfx/sfx_08_46.asm +++ /dev/null @@ -1,61 +0,0 @@ -SFX_08_46_Ch1: ; 23a13 (8:7a13) - executemusic - tempo 256 - volume 7, 7 - duty 3 - toggleperfectpitch - notetype 6, 11, 2 - octave 3 - E_ 2 - F# 2 - G# 2 - G# 1 - G# 1 - B_ 2 - octave 4 - C# 2 - D# 2 - D# 1 - D# 1 - notetype 6, 11, 5 - E_ 8 - endchannel - - -SFX_08_46_Ch2: ; 23a2e (8:7a2e) - executemusic - duty 2 - notetype 6, 12, 2 - octave 4 - G# 2 - G# 1 - G# 1 - E_ 2 - E_ 1 - E_ 1 - B_ 2 - B_ 1 - B_ 1 - A_ 2 - A_ 1 - A_ 1 - notetype 6, 12, 5 - G# 8 - endchannel - - -SFX_08_46_Ch3: ; 23a44 (8:7a44) - executemusic - notetype 6, 1, 0 - octave 4 - B_ 2 - rest 2 - octave 5 - C# 2 - rest 2 - D# 2 - rest 2 - F# 2 - G_ 2 - G# 4 - endchannel diff --git a/audio/sfx/sfx_08_47.asm b/audio/sfx/sfx_08_47.asm deleted file mode 100755 index 6ca2e38c..00000000 --- a/audio/sfx/sfx_08_47.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_47_Ch1: ; 204aa (8:44aa) - unknownnoise0x20 2, 161, 18 - endchannel diff --git a/audio/sfx/sfx_08_48.asm b/audio/sfx/sfx_08_48.asm deleted file mode 100755 index f974a6f9..00000000 --- a/audio/sfx/sfx_08_48.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_48_Ch1: ; 204ae (8:44ae) - duty 1 - unknownsfx0x10 175 - unknownsfx0x20 15, 242, 128, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_08_49.asm b/audio/sfx/sfx_08_49.asm deleted file mode 100755 index 0d4ef5e7..00000000 --- a/audio/sfx/sfx_08_49.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_49_Ch1: ; 204b9 (8:44b9) - duty 1 - unknownsfx0x10 151 - unknownsfx0x20 15, 242, 0, 5 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_08_4a.asm b/audio/sfx/sfx_08_4a.asm deleted file mode 100755 index d79cef4e..00000000 --- a/audio/sfx/sfx_08_4a.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_4a_Ch1: ; 204c4 (8:44c4) - unknownnoise0x20 2, 161, 34 - endchannel diff --git a/audio/sfx/sfx_08_4b.asm b/audio/sfx/sfx_08_4b.asm deleted file mode 100755 index 5b654931..00000000 --- a/audio/sfx/sfx_08_4b.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_08_4b_Ch1: ; 204c8 (8:44c8) - unknownnoise0x20 8, 241, 84 - endchannel diff --git a/audio/sfx/sfx_08_4c.asm b/audio/sfx/sfx_08_4c.asm deleted file mode 100755 index b80af081..00000000 --- a/audio/sfx/sfx_08_4c.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_08_4c_Ch1: ; 204cc (8:44cc) - unknownnoise0x20 15, 143, 17 - unknownnoise0x20 4, 255, 18 - unknownnoise0x20 10, 241, 85 - endchannel diff --git a/audio/sfx/sfx_08_4d.asm b/audio/sfx/sfx_08_4d.asm deleted file mode 100755 index 3dc43ae0..00000000 --- a/audio/sfx/sfx_08_4d.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_08_4d_Ch1: ; 204d6 (8:44d6) - unknownnoise0x20 15, 143, 52 - unknownnoise0x20 8, 242, 53 - unknownnoise0x20 10, 241, 85 - endchannel diff --git a/audio/sfx/sfx_08_4e.asm b/audio/sfx/sfx_08_4e.asm deleted file mode 100755 index db621af9..00000000 --- a/audio/sfx/sfx_08_4e.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_4e_Ch1: ; 204e0 (8:44e0) - unknownnoise0x20 15, 159, 35 - unknownnoise0x20 8, 241, 33 - endchannel diff --git a/audio/sfx/sfx_08_4f.asm b/audio/sfx/sfx_08_4f.asm deleted file mode 100755 index 74337020..00000000 --- a/audio/sfx/sfx_08_4f.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_4f_Ch1: ; 204e7 (8:44e7) - unknownnoise0x20 2, 225, 75 - unknownnoise0x20 10, 241, 68 - unknownnoise0x20 2, 225, 58 - unknownnoise0x20 6, 241, 52 - endchannel diff --git a/audio/sfx/sfx_08_50.asm b/audio/sfx/sfx_08_50.asm deleted file mode 100755 index ae3f9974..00000000 --- a/audio/sfx/sfx_08_50.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_08_50_Ch1: ; 204f4 (8:44f4) - unknownnoise0x20 2, 244, 68 - unknownnoise0x20 2, 244, 20 - unknownnoise0x20 15, 241, 50 - endchannel diff --git a/audio/sfx/sfx_08_51.asm b/audio/sfx/sfx_08_51.asm deleted file mode 100755 index bd4f3b24..00000000 --- a/audio/sfx/sfx_08_51.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_51_Ch1: ; 204fe (8:44fe) - unknownnoise0x20 4, 143, 85 - unknownnoise0x20 2, 244, 68 - unknownnoise0x20 8, 244, 34 - unknownnoise0x20 15, 242, 33 - endchannel diff --git a/audio/sfx/sfx_08_52.asm b/audio/sfx/sfx_08_52.asm deleted file mode 100755 index 9bf7c91d..00000000 --- a/audio/sfx/sfx_08_52.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_52_Ch1: ; 2050b (8:450b) - unknownnoise0x20 8, 79, 35 - unknownnoise0x20 4, 196, 34 - unknownnoise0x20 6, 242, 35 - loopchannel 4, SFX_08_52_Ch1 - endchannel diff --git a/audio/sfx/sfx_08_53.asm b/audio/sfx/sfx_08_53.asm deleted file mode 100755 index c61465e9..00000000 --- a/audio/sfx/sfx_08_53.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_53_Ch1: ; 20519 (8:4519) - unknownnoise0x20 8, 79, 51 - unknownnoise0x20 4, 196, 34 - unknownnoise0x20 6, 242, 35 - unknownnoise0x20 15, 242, 34 - endchannel diff --git a/audio/sfx/sfx_08_54.asm b/audio/sfx/sfx_08_54.asm deleted file mode 100755 index 25a2c4fd..00000000 --- a/audio/sfx/sfx_08_54.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_54_Ch1: ; 20526 (8:4526) - unknownnoise0x20 8, 255, 50 - unknownnoise0x20 8, 244, 67 - unknownnoise0x20 8, 242, 84 - unknownnoise0x20 8, 241, 101 - endchannel diff --git a/audio/sfx/sfx_08_55.asm b/audio/sfx/sfx_08_55.asm deleted file mode 100755 index caecb7ce..00000000 --- a/audio/sfx/sfx_08_55.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_08_55_Ch1: ; 20533 (8:4533) - unknownnoise0x20 1, 194, 51 - unknownnoise0x20 2, 242, 33 - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 1, 194, 50 - unknownnoise0x20 1, 146, 18 - unknownnoise0x20 1, 178, 49 - unknownnoise0x20 12, 145, 16 - unknownnoise0x20 8, 242, 65 - endchannel diff --git a/audio/sfx/sfx_08_56.asm b/audio/sfx/sfx_08_56.asm deleted file mode 100755 index d5653379..00000000 --- a/audio/sfx/sfx_08_56.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_08_56_Ch1: ; 2054c (8:454c) - unknownnoise0x20 1, 148, 35 - unknownnoise0x20 1, 180, 34 - unknownnoise0x20 8, 241, 68 - endchannel diff --git a/audio/sfx/sfx_08_57.asm b/audio/sfx/sfx_08_57.asm deleted file mode 100755 index 40e0ea8f..00000000 --- a/audio/sfx/sfx_08_57.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_57_Ch1: ; 20556 (8:4556) - unknownnoise0x20 2, 148, 51 - unknownnoise0x20 4, 180, 34 - unknownnoise0x20 4, 241, 68 - unknownnoise0x20 8, 241, 85 - endchannel diff --git a/audio/sfx/sfx_08_58.asm b/audio/sfx/sfx_08_58.asm deleted file mode 100755 index 3cb23fb0..00000000 --- a/audio/sfx/sfx_08_58.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_58_Ch1: ; 20563 (8:4563) - unknownnoise0x20 4, 255, 85 - unknownnoise0x20 8, 241, 101 - endchannel diff --git a/audio/sfx/sfx_08_59.asm b/audio/sfx/sfx_08_59.asm deleted file mode 100755 index c42f6127..00000000 --- a/audio/sfx/sfx_08_59.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_08_59_Ch1: ; 2056a (8:456a) - unknownnoise0x20 2, 132, 67 - unknownnoise0x20 2, 196, 34 - unknownnoise0x20 8, 242, 52 - endchannel diff --git a/audio/sfx/sfx_08_5a.asm b/audio/sfx/sfx_08_5a.asm deleted file mode 100755 index 282fea80..00000000 --- a/audio/sfx/sfx_08_5a.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_5a_Ch1: ; 20574 (8:4574) - unknownnoise0x20 4, 241, 52 - unknownnoise0x20 15, 242, 100 - endchannel diff --git a/audio/sfx/sfx_08_5b.asm b/audio/sfx/sfx_08_5b.asm deleted file mode 100755 index 7bf3e2c8..00000000 --- a/audio/sfx/sfx_08_5b.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_5b_Ch1: ; 2057b (8:457b) - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 15, 242, 18 - endchannel diff --git a/audio/sfx/sfx_08_5c.asm b/audio/sfx/sfx_08_5c.asm deleted file mode 100755 index 25618291..00000000 --- a/audio/sfx/sfx_08_5c.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_08_5c_Ch1: ; 20582 (8:4582) - unknownnoise0x20 2, 194, 1 - unknownnoise0x20 15, 244, 1 - unknownnoise0x20 15, 242, 1 - endchannel diff --git a/audio/sfx/sfx_08_5d.asm b/audio/sfx/sfx_08_5d.asm deleted file mode 100755 index 9bd39269..00000000 --- a/audio/sfx/sfx_08_5d.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_5d_Ch1: ; 2058c (8:458c) - unknownnoise0x20 8, 241, 50 - unknownnoise0x20 8, 241, 51 - endchannel diff --git a/audio/sfx/sfx_08_5e.asm b/audio/sfx/sfx_08_5e.asm deleted file mode 100755 index a765d263..00000000 --- a/audio/sfx/sfx_08_5e.asm +++ /dev/null @@ -1,16 +0,0 @@ -SFX_08_5e_Ch1: ; 20593 (8:4593) - duty 0 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel - - -SFX_08_5e_Ch2: ; 205a4 (8:45a4) - unknownnoise0x20 0, 209, 66 - unknownnoise0x20 4, 161, 50 - unknownnoise0x20 0, 209, 34 - unknownnoise0x20 6, 161, 50 - endchannel diff --git a/audio/sfx/sfx_08_5f.asm b/audio/sfx/sfx_08_5f.asm deleted file mode 100755 index 0cb02ba3..00000000 --- a/audio/sfx/sfx_08_5f.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_08_5f_Ch1: ; 205b1 (8:45b1) - unknownnoise0x20 3, 146, 49 - unknownnoise0x20 3, 178, 50 - unknownnoise0x20 3, 194, 51 - unknownnoise0x20 8, 241, 84 - endchannel diff --git a/audio/sfx/sfx_08_60.asm b/audio/sfx/sfx_08_60.asm deleted file mode 100755 index 7aa37833..00000000 --- a/audio/sfx/sfx_08_60.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_60_Ch1: ; 205be (8:45be) - unknownnoise0x20 12, 241, 84 - unknownnoise0x20 8, 241, 100 - endchannel diff --git a/audio/sfx/sfx_08_61.asm b/audio/sfx/sfx_08_61.asm deleted file mode 100755 index 343a5c0c..00000000 --- a/audio/sfx/sfx_08_61.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_08_61_Ch1: ; 205c5 (8:45c5) - unknownnoise0x20 2, 241, 51 - unknownnoise0x20 2, 193, 50 - unknownnoise0x20 2, 161, 49 - unknownnoise0x20 15, 130, 50 - unknownnoise0x20 8, 241, 52 - endchannel diff --git a/audio/sfx/sfx_08_62.asm b/audio/sfx/sfx_08_62.asm deleted file mode 100755 index a7cfed2d..00000000 --- a/audio/sfx/sfx_08_62.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_62_Ch1: ; 205d5 (8:45d5) - unknownnoise0x20 2, 210, 50 - unknownnoise0x20 15, 242, 67 - endchannel diff --git a/audio/sfx/sfx_08_63.asm b/audio/sfx/sfx_08_63.asm deleted file mode 100755 index 432d088c..00000000 --- a/audio/sfx/sfx_08_63.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_08_63_Ch1: ; 205dc (8:45dc) - unknownnoise0x20 2, 242, 67 - unknownnoise0x20 4, 181, 50 - unknownnoise0x20 9, 134, 49 - unknownnoise0x20 7, 100, 0 - unknownnoise0x20 15, 242, 85 - endchannel diff --git a/audio/sfx/sfx_08_64.asm b/audio/sfx/sfx_08_64.asm deleted file mode 100755 index c34d64ce..00000000 --- a/audio/sfx/sfx_08_64.asm +++ /dev/null @@ -1,12 +0,0 @@ -SFX_08_64_Ch1: ; 205ec (8:45ec) - duty 1 - unknownsfx0x10 151 - unknownsfx0x20 15, 242, 0, 7 - unknownsfx0x10 8 - endchannel - - -SFX_08_64_Ch2: ; 205f7 (8:45f7) - unknownnoise0x20 15, 63, 34 - unknownnoise0x20 15, 242, 33 - endchannel diff --git a/audio/sfx/sfx_08_65.asm b/audio/sfx/sfx_08_65.asm deleted file mode 100755 index a92539c3..00000000 --- a/audio/sfx/sfx_08_65.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_08_65_Ch1: ; 205fe (8:45fe) - unknownnoise0x20 15, 79, 65 - unknownnoise0x20 8, 143, 65 - unknownnoise0x20 8, 207, 65 - unknownnoise0x20 8, 242, 66 - unknownnoise0x20 15, 242, 65 - endchannel diff --git a/audio/sfx/sfx_08_66.asm b/audio/sfx/sfx_08_66.asm deleted file mode 100755 index d72b0349..00000000 --- a/audio/sfx/sfx_08_66.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_08_66_Ch1: ; 2060e (8:460e) - unknownnoise0x20 10, 255, 80 - unknownnoise0x20 15, 255, 81 - unknownnoise0x20 8, 242, 81 - unknownnoise0x20 6, 255, 82 - unknownnoise0x20 6, 255, 83 - unknownnoise0x20 8, 255, 84 - unknownnoise0x20 15, 242, 84 - endchannel diff --git a/audio/sfx/sfx_08_67.asm b/audio/sfx/sfx_08_67.asm deleted file mode 100755 index 6e94addf..00000000 --- a/audio/sfx/sfx_08_67.asm +++ /dev/null @@ -1,27 +0,0 @@ -SFX_08_67_Ch1: ; 20624 (8:4624) - duty 2 - unknownsfx0x20 15, 63, 192, 7 - -SFX_08_67_branch_2062a: - unknownsfx0x20 15, 223, 192, 7 - loopchannel 4, SFX_08_67_branch_2062a - unknownsfx0x20 15, 209, 192, 7 - endchannel - - -SFX_08_67_Ch2: ; 20637 (8:4637) - dutycycle 179 - unknownsfx0x20 15, 47, 200, 7 - -SFX_08_67_branch_2063d: - unknownsfx0x20 15, 207, 199, 7 - loopchannel 4, SFX_08_67_branch_2063d - unknownsfx0x20 15, 193, 200, 7 - endchannel - - -SFX_08_67_Ch3: ; 2064a (8:464a) - unknownnoise0x20 3, 151, 18 - unknownnoise0x20 3, 161, 17 - loopchannel 10, SFX_08_67_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_68.asm b/audio/sfx/sfx_08_68.asm deleted file mode 100755 index 691b9b1f..00000000 --- a/audio/sfx/sfx_08_68.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_08_68_Ch1: ; 20655 (8:4655) - duty 0 - unknownsfx0x20 0, 241, 192, 7 - unknownsfx0x20 0, 241, 0, 7 - loopchannel 12, SFX_08_68_Ch1 - endchannel - - -SFX_08_68_Ch2: ; 20664 (8:4664) - dutycycle 179 - unknownsfx0x20 0, 225, 193, 7 - unknownsfx0x20 0, 225, 1, 7 - loopchannel 12, SFX_08_68_Ch2 - endchannel - - -SFX_08_68_Ch3: ; 20673 (8:4673) - unknownnoise0x20 1, 209, 73 - unknownnoise0x20 1, 209, 41 - loopchannel 6, SFX_08_68_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_69.asm b/audio/sfx/sfx_08_69.asm deleted file mode 100755 index f202a156..00000000 --- a/audio/sfx/sfx_08_69.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_08_69_Ch1: ; 2067e (8:467e) - dutycycle 201 - unknownsfx0x20 11, 243, 32, 1 - unknownsfx0x20 9, 211, 80, 1 - loopchannel 5, SFX_08_69_Ch1 - unknownsfx0x20 8, 227, 48, 1 - unknownsfx0x20 15, 194, 16, 1 - endchannel - - -SFX_08_69_Ch2: ; 20695 (8:4695) - unknownnoise0x20 10, 243, 53 - unknownnoise0x20 14, 246, 69 - loopchannel 4, SFX_08_69_Ch2 - unknownnoise0x20 12, 244, 188 - unknownnoise0x20 12, 245, 156 - unknownnoise0x20 15, 244, 172 - endchannel diff --git a/audio/sfx/sfx_08_6a.asm b/audio/sfx/sfx_08_6a.asm deleted file mode 100755 index 3076956a..00000000 --- a/audio/sfx/sfx_08_6a.asm +++ /dev/null @@ -1,28 +0,0 @@ -SFX_08_6a_Ch1: ; 206a9 (8:46a9) - dutycycle 57 - unknownsfx0x20 4, 244, 0, 6 - unknownsfx0x20 3, 196, 0, 5 - unknownsfx0x20 5, 181, 0, 6 - unknownsfx0x20 13, 226, 192, 6 - loopchannel 3, SFX_08_6a_Ch1 - unknownsfx0x20 8, 209, 0, 6 - endchannel - - -SFX_08_6a_Ch2: ; 206c4 (8:46c4) - dutycycle 141 - unknownsfx0x20 5, 228, 224, 5 - unknownsfx0x20 4, 180, 224, 4 - unknownsfx0x20 6, 165, 232, 5 - unknownsfx0x20 14, 209, 160, 6 - loopchannel 3, SFX_08_6a_Ch2 - endchannel - - -SFX_08_6a_Ch3: ; 206db (8:46db) - unknownnoise0x20 5, 195, 51 - unknownnoise0x20 3, 146, 67 - unknownnoise0x20 10, 181, 51 - unknownnoise0x20 15, 195, 50 - loopchannel 2, SFX_08_6a_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_6b.asm b/audio/sfx/sfx_08_6b.asm deleted file mode 100755 index 60783be6..00000000 --- a/audio/sfx/sfx_08_6b.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_08_6b_Ch1: ; 206ec (8:46ec) - dutycycle 210 - unknownsfx0x20 3, 129, 0, 3 - unknownsfx0x20 3, 193, 0, 4 - unknownsfx0x20 3, 241, 0, 5 - unknownsfx0x20 3, 177, 0, 4 - unknownsfx0x20 3, 113, 0, 3 - loopchannel 5, SFX_08_6b_Ch1 - unknownsfx0x20 8, 129, 0, 4 - endchannel - - -SFX_08_6b_Ch2: ; 2070b (8:470b) - unknownnoise0x20 3, 98, 34 - unknownnoise0x20 3, 162, 50 - unknownnoise0x20 3, 210, 51 - unknownnoise0x20 3, 146, 35 - unknownnoise0x20 3, 82, 18 - loopchannel 5, SFX_08_6b_Ch2 - unknownnoise0x20 8, 129, 18 - endchannel diff --git a/audio/sfx/sfx_08_6c.asm b/audio/sfx/sfx_08_6c.asm deleted file mode 100755 index cf83608d..00000000 --- a/audio/sfx/sfx_08_6c.asm +++ /dev/null @@ -1,25 +0,0 @@ -SFX_08_6c_Ch1: ; 20722 (8:4722) - dutycycle 57 - unknownsfx0x20 15, 244, 0, 5 - unknownsfx0x20 15, 196, 0, 4 - unknownsfx0x20 15, 226, 192, 5 - loopchannel 3, SFX_08_6c_Ch1 - endchannel - - -SFX_08_6c_Ch2: ; 20735 (8:4735) - dutycycle 141 - unknownsfx0x20 7, 228, 48, 4 - unknownsfx0x20 15, 180, 48, 3 - unknownsfx0x20 15, 162, 56, 4 - loopchannel 4, SFX_08_6c_Ch2 - endchannel - - -SFX_08_6c_Ch3: ; 20748 (8:4748) - unknownnoise0x20 9, 244, 68 - unknownnoise0x20 9, 242, 67 - unknownnoise0x20 15, 244, 66 - unknownnoise0x20 15, 244, 65 - loopchannel 3, SFX_08_6c_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_6d.asm b/audio/sfx/sfx_08_6d.asm deleted file mode 100755 index 6971a30e..00000000 --- a/audio/sfx/sfx_08_6d.asm +++ /dev/null @@ -1,25 +0,0 @@ -SFX_08_6d_Ch1: ; 20759 (8:4759) - dutycycle 161 - unknownsfx0x20 10, 241, 64, 6 - unknownsfx0x20 10, 243, 128, 6 - unknownsfx0x20 10, 242, 32, 6 - loopchannel 4, SFX_08_6d_Ch1 - unknownsfx0x20 10, 241, 64, 6 - endchannel - - -SFX_08_6d_Ch2: ; 20770 (8:4770) - dutycycle 179 - unknownsfx0x20 10, 243, 113, 5 - unknownsfx0x20 7, 227, 49, 5 - unknownsfx0x20 10, 241, 81, 5 - loopchannel 4, SFX_08_6d_Ch2 - unknownsfx0x20 10, 241, 113, 5 - endchannel - - -SFX_08_6d_Ch3: ; 20787 (8:4787) - unknownnoise0x20 2, 209, 74 - unknownnoise0x20 2, 210, 42 - loopchannel 21, SFX_08_6d_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_6e.asm b/audio/sfx/sfx_08_6e.asm deleted file mode 100755 index 00b2c148..00000000 --- a/audio/sfx/sfx_08_6e.asm +++ /dev/null @@ -1,27 +0,0 @@ -SFX_08_6e_Ch1: ; 20792 (8:4792) - duty 0 - unknownsfx0x20 2, 241, 0, 2 - unknownsfx0x20 3, 241, 0, 7 - unknownsfx0x20 4, 241, 0, 5 - unknownsfx0x20 5, 241, 240, 7 - loopchannel 8, SFX_08_6e_Ch1 - endchannel - - -SFX_08_6e_Ch2: ; 207a9 (8:47a9) - dutycycle 179 - unknownsfx0x20 2, 225, 2, 3 - unknownsfx0x20 3, 225, 242, 7 - unknownsfx0x20 4, 225, 2, 6 - unknownsfx0x20 5, 225, 2, 7 - loopchannel 8, SFX_08_6e_Ch2 - endchannel - - -SFX_08_6e_Ch3: ; 207c0 (8:47c0) - unknownnoise0x20 2, 211, 16 - unknownnoise0x20 3, 211, 17 - unknownnoise0x20 2, 210, 16 - unknownnoise0x20 5, 210, 18 - loopchannel 9, SFX_08_6e_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_6f.asm b/audio/sfx/sfx_08_6f.asm deleted file mode 100755 index 69b85d33..00000000 --- a/audio/sfx/sfx_08_6f.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_08_6f_Ch1: ; 207d1 (8:47d1) - dutycycle 43 - unknownsfx0x20 3, 241, 240, 7 - unknownsfx0x20 4, 242, 0, 2 - loopchannel 8, SFX_08_6f_Ch1 - endchannel - - -SFX_08_6f_Ch2: ; 207e0 (8:47e0) - dutycycle 179 - unknownsfx0x20 4, 226, 2, 2 - unknownsfx0x20 4, 225, 226, 7 - loopchannel 9, SFX_08_6f_Ch2 - endchannel - - -SFX_08_6f_Ch3: ; 207ef (8:47ef) - unknownnoise0x20 4, 255, 67 - unknownnoise0x20 4, 242, 68 - loopchannel 9, SFX_08_6f_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_70.asm b/audio/sfx/sfx_08_70.asm deleted file mode 100755 index 7a07b340..00000000 --- a/audio/sfx/sfx_08_70.asm +++ /dev/null @@ -1,32 +0,0 @@ -SFX_08_70_Ch1: ; 207fa (8:47fa) - duty 2 - unknownsfx0x10 247 - unknownsfx0x20 8, 196, 189, 7 - unknownsfx0x20 8, 196, 190, 7 - unknownsfx0x20 8, 196, 191, 7 - unknownsfx0x20 8, 196, 192, 7 - unknownsfx0x20 15, 196, 193, 7 - unknownsfx0x20 15, 242, 192, 7 - unknownsfx0x10 8 - endchannel - - -SFX_08_70_Ch2: ; 20819 (8:4819) - duty 2 - unknownsfx0x20 8, 196, 112, 7 - unknownsfx0x20 8, 196, 97, 7 - unknownsfx0x20 8, 196, 98, 7 - unknownsfx0x20 8, 196, 99, 7 - unknownsfx0x20 15, 196, 100, 7 - unknownsfx0x20 15, 242, 100, 7 - endchannel - - -SFX_08_70_Ch3: ; 20834 (8:4834) - unknownnoise0x20 15, 63, 20 - unknownnoise0x20 15, 207, 19 - unknownnoise0x20 15, 207, 18 - unknownnoise0x20 15, 207, 17 - unknownnoise0x20 15, 207, 16 - unknownnoise0x20 15, 194, 16 - endchannel diff --git a/audio/sfx/sfx_08_71.asm b/audio/sfx/sfx_08_71.asm deleted file mode 100755 index 7b306557..00000000 --- a/audio/sfx/sfx_08_71.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_08_71_Ch1: ; 20847 (8:4847) - duty 2 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 242, 224, 7 - endchannel - - -SFX_08_71_Ch2: ; 2085e (8:485e) - duty 3 - unknownsfx0x20 15, 255, 226, 7 - unknownsfx0x20 15, 255, 225, 7 - unknownsfx0x20 15, 255, 226, 7 - unknownsfx0x20 15, 255, 225, 7 - unknownsfx0x20 15, 242, 226, 7 - endchannel diff --git a/audio/sfx/sfx_08_72.asm b/audio/sfx/sfx_08_72.asm deleted file mode 100755 index 13000d01..00000000 --- a/audio/sfx/sfx_08_72.asm +++ /dev/null @@ -1,12 +0,0 @@ -SFX_08_72_Ch1: ; 20875 (8:4875) - duty 2 - unknownsfx0x10 175 - unknownsfx0x20 8, 241, 0, 7 - unknownsfx0x10 8 - endchannel - - -SFX_08_72_Ch2: ; 20880 (8:4880) - duty 3 - unknownsfx0x20 8, 241, 1, 7 - endchannel diff --git a/audio/sfx/sfx_08_73.asm b/audio/sfx/sfx_08_73.asm deleted file mode 100755 index 7829fbcd..00000000 --- a/audio/sfx/sfx_08_73.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_08_73_Ch1: ; 20887 (8:4887) - duty 2 - unknownsfx0x20 6, 241, 0, 5 - unknownsfx0x20 6, 241, 128, 5 - unknownsfx0x20 6, 241, 0, 6 - unknownsfx0x20 6, 241, 128, 6 - unknownsfx0x20 8, 241, 0, 7 - endchannel - - -SFX_08_73_Ch2: ; 2089e (8:489e) - duty 3 - unknownsfx0x20 6, 225, 16, 5 - unknownsfx0x20 6, 225, 144, 5 - unknownsfx0x20 6, 225, 16, 6 - unknownsfx0x20 6, 225, 144, 6 - unknownsfx0x20 8, 225, 16, 7 - endchannel diff --git a/audio/sfx/sfx_08_74.asm b/audio/sfx/sfx_08_74.asm deleted file mode 100755 index f8144908..00000000 --- a/audio/sfx/sfx_08_74.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_08_74_Ch1: ; 208b5 (8:48b5) - dutycycle 237 - unknownsfx0x20 8, 255, 248, 3 - unknownsfx0x20 15, 255, 0, 4 - unknownsfx0x20 15, 243, 0, 4 - endchannel - - -SFX_08_74_Ch2: ; 208c4 (8:48c4) - dutycycle 180 - unknownsfx0x20 8, 239, 192, 3 - unknownsfx0x20 15, 239, 192, 3 - unknownsfx0x20 15, 227, 192, 3 - endchannel - - -SFX_08_74_Ch3: ; 208d3 (8:48d3) - unknownnoise0x20 4, 255, 81 - unknownnoise0x20 8, 255, 84 - unknownnoise0x20 15, 255, 85 - unknownnoise0x20 15, 243, 86 - endchannel diff --git a/audio/sfx/sfx_08_75.asm b/audio/sfx/sfx_08_75.asm deleted file mode 100755 index cda1c65f..00000000 --- a/audio/sfx/sfx_08_75.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_08_75_Ch1: ; 208e0 (8:48e0) - executemusic - vibrato 10, 2, 4 - duty 2 - notetype 10, 8, 7 - octave 5 - G# 8 - octave 6 - F# 4 - E_ 4 - octave 5 - G# 8 - endchannel - - -SFX_08_75_Ch2: ; 208f0 (8:48f0) - executemusic - vibrato 10, 2, 3 - duty 2 - notetype 11, 6, 7 - octave 5 - G# 8 - notetype 10, 6, 7 - octave 6 - F# 4 - E_ 4 - octave 5 - G# 8 - endchannel diff --git a/audio/sfx/sfx_08_76.asm b/audio/sfx/sfx_08_76.asm deleted file mode 100755 index b60e51aa..00000000 --- a/audio/sfx/sfx_08_76.asm +++ /dev/null @@ -1,47 +0,0 @@ -SFX_08_76_Ch1: ; 20902 (8:4902) - duty 0 - unknownsfx0x20 2, 241, 128, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 144, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 160, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 176, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 192, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 208, 7 - -SFX_08_76_branch_20930: - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 224, 7 - loopchannel 12, SFX_08_76_branch_20930 - unknownsfx0x20 15, 241, 0, 7 - endchannel - - -SFX_08_76_Ch2: ; 20941 (8:4941) - dutycycle 179 - unknownsfx0x20 2, 241, 129, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 145, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 161, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 177, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 193, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 209, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 225, 7 - loopchannel 12, SFX_08_76_branch_20930 - unknownsfx0x20 15, 241, 1, 7 - endchannel - - -SFX_08_76_Ch3: ; 20980 (8:4980) - unknownnoise0x20 1, 209, 73 - unknownnoise0x20 1, 209, 41 - loopchannel 26, SFX_08_76_Ch3 - endchannel diff --git a/audio/sfx/sfx_08_77.asm b/audio/sfx/sfx_08_77.asm deleted file mode 100755 index 840a0ea5..00000000 --- a/audio/sfx/sfx_08_77.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_08_77_Ch1: ; 20412 (8:4412) - duty 0 - unknownsfx0x20 0, 210, 0, 7 - unknownsfx0x20 0, 210, 64, 7 - unknownsfx0x20 0, 210, 128, 7 - unknownsfx0x20 0, 210, 192, 7 - unknownsfx0x20 10, 225, 224, 7 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_01.asm b/audio/sfx/sfx_1f_01.asm deleted file mode 100755 index bd3a2efe..00000000 --- a/audio/sfx/sfx_1f_01.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_01_Ch1: ; 7c2fd (1f:42fd) - unknownnoise0x20 0, 193, 51 - endchannel diff --git a/audio/sfx/sfx_1f_02.asm b/audio/sfx/sfx_1f_02.asm deleted file mode 100755 index 9ee8923b..00000000 --- a/audio/sfx/sfx_1f_02.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_02_Ch1: ; 7c301 (1f:4301) - unknownnoise0x20 0, 177, 51 - endchannel diff --git a/audio/sfx/sfx_1f_03.asm b/audio/sfx/sfx_1f_03.asm deleted file mode 100755 index 55d249a7..00000000 --- a/audio/sfx/sfx_1f_03.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_03_Ch1: ; 7c305 (1f:4305) - unknownnoise0x20 0, 161, 51 - endchannel diff --git a/audio/sfx/sfx_1f_04.asm b/audio/sfx/sfx_1f_04.asm deleted file mode 100755 index 8906de66..00000000 --- a/audio/sfx/sfx_1f_04.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_04_Ch1: ; 7c309 (1f:4309) - unknownnoise0x20 0, 129, 51 - endchannel diff --git a/audio/sfx/sfx_1f_05.asm b/audio/sfx/sfx_1f_05.asm deleted file mode 100755 index 9c0e679b..00000000 --- a/audio/sfx/sfx_1f_05.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_1f_05_Ch1: ; 7c30d (1f:430d) - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 - endchannel diff --git a/audio/sfx/sfx_1f_06.asm b/audio/sfx/sfx_1f_06.asm deleted file mode 100755 index 429f18ff..00000000 --- a/audio/sfx/sfx_1f_06.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_06_Ch1: ; 7c320 (1f:4320) - unknownnoise0x20 0, 81, 42 - endchannel diff --git a/audio/sfx/sfx_1f_07.asm b/audio/sfx/sfx_1f_07.asm deleted file mode 100755 index 1dd80c9e..00000000 --- a/audio/sfx/sfx_1f_07.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_07_Ch1: ; 7c324 (1f:4324) - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 - endchannel diff --git a/audio/sfx/sfx_1f_08.asm b/audio/sfx/sfx_1f_08.asm deleted file mode 100755 index f741bdf1..00000000 --- a/audio/sfx/sfx_1f_08.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_08_Ch1: ; 7c32b (1f:432b) - unknownnoise0x20 0, 129, 16 - endchannel diff --git a/audio/sfx/sfx_1f_09.asm b/audio/sfx/sfx_1f_09.asm deleted file mode 100755 index 73ed88fa..00000000 --- a/audio/sfx/sfx_1f_09.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_09_Ch1: ; 7c32f (1f:432f) - unknownnoise0x20 0, 130, 35 - endchannel diff --git a/audio/sfx/sfx_1f_0a.asm b/audio/sfx/sfx_1f_0a.asm deleted file mode 100755 index fb2f620f..00000000 --- a/audio/sfx/sfx_1f_0a.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_0a_Ch1: ; 7c333 (1f:4333) - unknownnoise0x20 0, 130, 37 - endchannel diff --git a/audio/sfx/sfx_1f_0b.asm b/audio/sfx/sfx_1f_0b.asm deleted file mode 100755 index 46adb73d..00000000 --- a/audio/sfx/sfx_1f_0b.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_0b_Ch1: ; 7c337 (1f:4337) - unknownnoise0x20 0, 130, 38 - endchannel diff --git a/audio/sfx/sfx_1f_0c.asm b/audio/sfx/sfx_1f_0c.asm deleted file mode 100755 index bd3fb373..00000000 --- a/audio/sfx/sfx_1f_0c.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_0c_Ch1: ; 7c33b (1f:433b) - unknownnoise0x20 0, 161, 16 - endchannel diff --git a/audio/sfx/sfx_1f_0d.asm b/audio/sfx/sfx_1f_0d.asm deleted file mode 100755 index 2f48df5b..00000000 --- a/audio/sfx/sfx_1f_0d.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_0d_Ch1: ; 7c33f (1f:433f) - unknownnoise0x20 0, 162, 17 - endchannel diff --git a/audio/sfx/sfx_1f_0e.asm b/audio/sfx/sfx_1f_0e.asm deleted file mode 100755 index 88ba9d30..00000000 --- a/audio/sfx/sfx_1f_0e.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_0e_Ch1: ; 7c343 (1f:4343) - unknownnoise0x20 0, 162, 80 - endchannel diff --git a/audio/sfx/sfx_1f_0f.asm b/audio/sfx/sfx_1f_0f.asm deleted file mode 100755 index e314bae2..00000000 --- a/audio/sfx/sfx_1f_0f.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_0f_Ch1: ; 7c347 (1f:4347) - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 - endchannel diff --git a/audio/sfx/sfx_1f_10.asm b/audio/sfx/sfx_1f_10.asm deleted file mode 100755 index 7c22724d..00000000 --- a/audio/sfx/sfx_1f_10.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_10_Ch1: ; 7c34e (1f:434e) - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 - endchannel diff --git a/audio/sfx/sfx_1f_11.asm b/audio/sfx/sfx_1f_11.asm deleted file mode 100755 index b36fd06b..00000000 --- a/audio/sfx/sfx_1f_11.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_11_Ch1: ; 7c355 (1f:4355) - unknownnoise0x20 0, 145, 34 - endchannel diff --git a/audio/sfx/sfx_1f_12.asm b/audio/sfx/sfx_1f_12.asm deleted file mode 100755 index 21913c25..00000000 --- a/audio/sfx/sfx_1f_12.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_12_Ch1: ; 7c359 (1f:4359) - unknownnoise0x20 0, 113, 34 - endchannel diff --git a/audio/sfx/sfx_1f_13.asm b/audio/sfx/sfx_1f_13.asm deleted file mode 100755 index d9294eaa..00000000 --- a/audio/sfx/sfx_1f_13.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_1f_13_Ch1: ; 7c35d (1f:435d) - unknownnoise0x20 0, 97, 34 - endchannel diff --git a/audio/sfx/sfx_1f_14.asm b/audio/sfx/sfx_1f_14.asm deleted file mode 100755 index 4f52b842..00000000 --- a/audio/sfx/sfx_1f_14.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_1f_14_Ch1: ; 7c9fc (1f:49fc) - dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 - endchannel - - -SFX_1f_14_Ch2: ; 7ca0b (1f:4a0b) - dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 - endchannel - - -SFX_1f_14_Ch3: ; 7ca1a (1f:4a1a) - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 - endchannel diff --git a/audio/sfx/sfx_1f_15.asm b/audio/sfx/sfx_1f_15.asm deleted file mode 100755 index 0f16cb0e..00000000 --- a/audio/sfx/sfx_1f_15.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_1f_15_Ch1: ; 7cc0c (1f:4c0c) - dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 - endchannel - - -SFX_1f_15_Ch2: ; 7cc1f (1f:4c1f) - dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 - endchannel - - -SFX_1f_15_Ch3: ; 7cc32 (1f:4c32) - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 - endchannel diff --git a/audio/sfx/sfx_1f_16.asm b/audio/sfx/sfx_1f_16.asm deleted file mode 100755 index 450403b4..00000000 --- a/audio/sfx/sfx_1f_16.asm +++ /dev/null @@ -1,17 +0,0 @@ -SFX_1f_16_Ch1: ; 7cb81 (1f:4b81) - duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 - endchannel - - -SFX_1f_16_Ch2: ; 7cb90 (1f:4b90) - dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 - - -SFX_1f_16_Ch3: ; 7cb9e (1f:4b9e) - endchannel diff --git a/audio/sfx/sfx_1f_17.asm b/audio/sfx/sfx_1f_17.asm deleted file mode 100755 index 7f0d0fad..00000000 --- a/audio/sfx/sfx_1f_17.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_1f_17_Ch1: ; 7c91b (1f:491b) - dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 - endchannel - - -SFX_1f_17_Ch2: ; 7c93a (1f:493a) - dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 - endchannel - - -SFX_1f_17_Ch3: ; 7c959 (1f:4959) - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/sfx_1f_18.asm b/audio/sfx/sfx_1f_18.asm deleted file mode 100755 index 066128bb..00000000 --- a/audio/sfx/sfx_1f_18.asm +++ /dev/null @@ -1,32 +0,0 @@ -SFX_1f_18_Ch1: ; 7ccca (1f:4cca) - dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 - endchannel - - -SFX_1f_18_Ch2: ; 7cce9 (1f:4ce9) - dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 - endchannel - - -SFX_1f_18_Ch3: ; 7cd08 (1f:4d08) - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/sfx_1f_19.asm b/audio/sfx/sfx_1f_19.asm deleted file mode 100755 index 119a5f9f..00000000 --- a/audio/sfx/sfx_1f_19.asm +++ /dev/null @@ -1,19 +0,0 @@ -SFX_1f_19_Ch1: ; 7caaa (1f:4aaa) - dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 - endchannel - - -SFX_1f_19_Ch2: ; 7cabd (1f:4abd) - dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 - - -SFX_1f_19_Ch3: ; 7cacf (1f:4acf) - endchannel diff --git a/audio/sfx/sfx_1f_1a.asm b/audio/sfx/sfx_1f_1a.asm deleted file mode 100755 index 38a6df2a..00000000 --- a/audio/sfx/sfx_1f_1a.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_1f_1a_Ch1: ; 7ca54 (1f:4a54) - dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 - - -SFX_1f_1a_Ch2: ; 7ca6e (1f:4a6e) - endchannel - - -SFX_1f_1a_Ch3: ; 7ca6f (1f:4a6f) - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 - endchannel diff --git a/audio/sfx/sfx_1f_1b.asm b/audio/sfx/sfx_1f_1b.asm deleted file mode 100755 index 12c4a66b..00000000 --- a/audio/sfx/sfx_1f_1b.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_1f_1b_Ch1: ; 7ca82 (1f:4a82) - dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_1f_1b_Ch2: ; 7ca91 (1f:4a91) - dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 - endchannel - - -SFX_1f_1b_Ch3: ; 7caa0 (1f:4aa0) - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 - endchannel diff --git a/audio/sfx/sfx_1f_1c.asm b/audio/sfx/sfx_1f_1c.asm deleted file mode 100755 index 4ed5efc6..00000000 --- a/audio/sfx/sfx_1f_1c.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_1f_1c_Ch1: ; 7cc9a (1f:4c9a) - dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 - endchannel - - -SFX_1f_1c_Ch2: ; 7ccad (1f:4cad) - dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 - endchannel - - -SFX_1f_1c_Ch3: ; 7ccc0 (1f:4cc0) - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/sfx_1f_1d.asm b/audio/sfx/sfx_1f_1d.asm deleted file mode 100755 index ce7f4b4c..00000000 --- a/audio/sfx/sfx_1f_1d.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_1f_1d_Ch1: ; 7c7a4 (1f:47a4) - dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 - dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 - endchannel - - -SFX_1f_1d_Ch2: ; 7c7c1 (1f:47c1) - dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 - dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 - endchannel - - -SFX_1f_1d_Ch3: ; 7c7e2 (1f:47e2) - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 - endchannel diff --git a/audio/sfx/sfx_1f_1e.asm b/audio/sfx/sfx_1f_1e.asm deleted file mode 100755 index 86f88f54..00000000 --- a/audio/sfx/sfx_1f_1e.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_1f_1e_Ch1: ; 7cc3f (1f:4c3f) - dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 - endchannel - - -SFX_1f_1e_Ch2: ; 7cc5e (1f:4c5e) - dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 - endchannel - - -SFX_1f_1e_Ch3: ; 7cc81 (1f:4c81) - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 - endchannel diff --git a/audio/sfx/sfx_1f_1f.asm b/audio/sfx/sfx_1f_1f.asm deleted file mode 100755 index 2733036b..00000000 --- a/audio/sfx/sfx_1f_1f.asm +++ /dev/null @@ -1,37 +0,0 @@ -SFX_1f_1f_Ch1: ; 7cad0 (1f:4ad0) - dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 - endchannel - - -SFX_1f_1f_Ch2: ; 7cafb (1f:4afb) - dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 - endchannel - - -SFX_1f_1f_Ch3: ; 7cb1a (1f:4b1a) - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 - endchannel diff --git a/audio/sfx/sfx_1f_20.asm b/audio/sfx/sfx_1f_20.asm deleted file mode 100755 index 8449e4db..00000000 --- a/audio/sfx/sfx_1f_20.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_1f_20_Ch1: ; 7cb33 (1f:4b33) - dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a) - dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 - - -SFX_1f_20_Ch3: ; 7cb80 (1f:4b80) - endchannel diff --git a/audio/sfx/sfx_1f_21.asm b/audio/sfx/sfx_1f_21.asm deleted file mode 100755 index faf056f2..00000000 --- a/audio/sfx/sfx_1f_21.asm +++ /dev/null @@ -1,40 +0,0 @@ -SFX_1f_21_Ch1: ; 7cb9f (1f:4b9f) - dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_1f_21_Ch1 - endchannel - - -SFX_1f_21_Ch2: ; 7cbbe (1f:4bbe) - dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 - endchannel - - -SFX_1f_21_Ch3: ; 7cbed (1f:4bed) - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 - endchannel diff --git a/audio/sfx/sfx_1f_22.asm b/audio/sfx/sfx_1f_22.asm deleted file mode 100755 index bc9c9690..00000000 --- a/audio/sfx/sfx_1f_22.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_1f_22_Ch1: ; 7ca24 (1f:4a24) - dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 - endchannel - - -SFX_1f_22_Ch2: ; 7ca37 (1f:4a37) - dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 - endchannel - - -SFX_1f_22_Ch3: ; 7ca4a (1f:4a4a) - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 - endchannel diff --git a/audio/sfx/sfx_1f_23.asm b/audio/sfx/sfx_1f_23.asm deleted file mode 100755 index 51066146..00000000 --- a/audio/sfx/sfx_1f_23.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_1f_23_Ch1: ; 7c966 (1f:4966) - dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_1f_23_Ch2: ; 7c981 (1f:4981) - dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 - endchannel - - -SFX_1f_23_Ch3: ; 7c99c (1f:499c) - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 - endchannel diff --git a/audio/sfx/sfx_1f_24.asm b/audio/sfx/sfx_1f_24.asm deleted file mode 100755 index f4d4e4de..00000000 --- a/audio/sfx/sfx_1f_24.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_1f_24_Ch1: ; 7c9ac (1f:49ac) - dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 - endchannel - - -SFX_1f_24_Ch2: ; 7c9cf (1f:49cf) - dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 - endchannel - - -SFX_1f_24_Ch3: ; 7c9f2 (1f:49f2) - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 - endchannel diff --git a/audio/sfx/sfx_1f_25.asm b/audio/sfx/sfx_1f_25.asm deleted file mode 100755 index 4b137a75..00000000 --- a/audio/sfx/sfx_1f_25.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_1f_25_Ch1: ; 7c888 (1f:4888) - dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 - endchannel - - -SFX_1f_25_Ch2: ; 7c8a7 (1f:48a7) - dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 - endchannel - - -SFX_1f_25_Ch3: ; 7c8ca (1f:48ca) - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_1f_26.asm b/audio/sfx/sfx_1f_26.asm deleted file mode 100755 index f3613315..00000000 --- a/audio/sfx/sfx_1f_26.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_1f_26_Ch1: ; 7cda0 (1f:4da0) - dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 - endchannel - - -SFX_1f_26_Ch2: ; 7cdb3 (1f:4db3) - dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 - endchannel - - -SFX_1f_26_Ch3: ; 7cdc6 (1f:4dc6) - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 - endchannel diff --git a/audio/sfx/sfx_1f_27.asm b/audio/sfx/sfx_1f_27.asm deleted file mode 100755 index 81ec2ab1..00000000 --- a/audio/sfx/sfx_1f_27.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_1f_27_Ch1: ; 7cdd3 (1f:4dd3) - dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 - endchannel - - -SFX_1f_27_Ch2: ; 7cdee (1f:4dee) - dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 - endchannel - - -SFX_1f_27_Ch3: ; 7ce09 (1f:4e09) - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/sfx_1f_28.asm b/audio/sfx/sfx_1f_28.asm deleted file mode 100755 index 2a510f48..00000000 --- a/audio/sfx/sfx_1f_28.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_1f_28_Ch1: ; 7ce1c (1f:4e1c) - dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 - endchannel - - -SFX_1f_28_Ch2: ; 7ce2b (1f:4e2b) - dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 - endchannel - - -SFX_1f_28_Ch3: ; 7ce3a (1f:4e3a) - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_1f_29.asm b/audio/sfx/sfx_1f_29.asm deleted file mode 100755 index cb7b5b0c..00000000 --- a/audio/sfx/sfx_1f_29.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_1f_29_Ch1: ; 7ceaa (1f:4eaa) - dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 - endchannel - - -SFX_1f_29_Ch2: ; 7cec5 (1f:4ec5) - dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 - endchannel - - -SFX_1f_29_Ch3: ; 7cee0 (1f:4ee0) - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 - endchannel diff --git a/audio/sfx/sfx_1f_2a.asm b/audio/sfx/sfx_1f_2a.asm deleted file mode 100755 index fb0d330f..00000000 --- a/audio/sfx/sfx_1f_2a.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_1f_2a_Ch1: ; 7cd3d (1f:4d3d) - dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 - endchannel - - -SFX_1f_2a_Ch2: ; 7cd4c (1f:4d4c) - dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 - endchannel - - -SFX_1f_2a_Ch3: ; 7cd5b (1f:4d5b) - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 - endchannel diff --git a/audio/sfx/sfx_1f_2b.asm b/audio/sfx/sfx_1f_2b.asm deleted file mode 100755 index 1b588221..00000000 --- a/audio/sfx/sfx_1f_2b.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_1f_2b_Ch1: ; 7cef3 (1f:4ef3) - dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 - endchannel - - -SFX_1f_2b_Ch2: ; 7cf06 (1f:4f06) - dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 - endchannel - - -SFX_1f_2b_Ch3: ; 7cf19 (1f:4f19) - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 - endchannel diff --git a/audio/sfx/sfx_1f_2c.asm b/audio/sfx/sfx_1f_2c.asm deleted file mode 100755 index 9c051799..00000000 --- a/audio/sfx/sfx_1f_2c.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_1f_2c_Ch1: ; 7d003 (1f:5003) - dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 - endchannel - - -SFX_1f_2c_Ch2: ; 7d026 (1f:5026) - dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 - endchannel - - -SFX_1f_2c_Ch3: ; 7d049 (1f:5049) - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/sfx_1f_2d.asm b/audio/sfx/sfx_1f_2d.asm deleted file mode 100755 index c46af9f2..00000000 --- a/audio/sfx/sfx_1f_2d.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_1f_2d_Ch1: ; 7cd1b (1f:4d1b) - dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 - endchannel - - -SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a) - dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 - - -SFX_1f_2d_Ch3: ; 7cd3c (1f:4d3c) - endchannel diff --git a/audio/sfx/sfx_1f_2e.asm b/audio/sfx/sfx_1f_2e.asm deleted file mode 100755 index 50f9f172..00000000 --- a/audio/sfx/sfx_1f_2e.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_1f_2e_Ch1: ; 7cf74 (1f:4f74) - dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 - endchannel - - -SFX_1f_2e_Ch2: ; 7cf8f (1f:4f8f) - dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 - endchannel - - -SFX_1f_2e_Ch3: ; 7cfaa (1f:4faa) - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/sfx_1f_2f.asm b/audio/sfx/sfx_1f_2f.asm deleted file mode 100755 index 10b6698c..00000000 --- a/audio/sfx/sfx_1f_2f.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_1f_2f_Ch1: ; 7cd65 (1f:4d65) - dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 - endchannel - - -SFX_1f_2f_Ch2: ; 7cd7c (1f:4d7c) - dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 - endchannel - - -SFX_1f_2f_Ch3: ; 7cd93 (1f:4d93) - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 - endchannel diff --git a/audio/sfx/sfx_1f_30.asm b/audio/sfx/sfx_1f_30.asm deleted file mode 100755 index 8862b34c..00000000 --- a/audio/sfx/sfx_1f_30.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_1f_30_Ch1: ; 7cf26 (1f:4f26) - dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 - endchannel - - -SFX_1f_30_Ch2: ; 7cf49 (1f:4f49) - dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 - endchannel - - -SFX_1f_30_Ch3: ; 7cf64 (1f:4f64) - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 - endchannel diff --git a/audio/sfx/sfx_1f_31.asm b/audio/sfx/sfx_1f_31.asm deleted file mode 100755 index 018a0298..00000000 --- a/audio/sfx/sfx_1f_31.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_1f_31_Ch1: ; 7cfbd (1f:4fbd) - dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 - endchannel - - -SFX_1f_31_Ch2: ; 7cfd8 (1f:4fd8) - dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 - endchannel - - -SFX_1f_31_Ch3: ; 7cff3 (1f:4ff3) - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/sfx_1f_32.asm b/audio/sfx/sfx_1f_32.asm deleted file mode 100755 index 853b9da3..00000000 --- a/audio/sfx/sfx_1f_32.asm +++ /dev/null @@ -1,38 +0,0 @@ -SFX_1f_32_Ch1: ; 7ce44 (1f:4e44) - dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 - endchannel - - -SFX_1f_32_Ch2: ; 7ce67 (1f:4e67) - dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 - endchannel - - -SFX_1f_32_Ch3: ; 7ce8e (1f:4e8e) - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 - endchannel diff --git a/audio/sfx/sfx_1f_33.asm b/audio/sfx/sfx_1f_33.asm deleted file mode 100755 index a15fb1d6..00000000 --- a/audio/sfx/sfx_1f_33.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_1f_33_Ch1: ; 7d05c (1f:505c) - dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 - endchannel - - -SFX_1f_33_Ch2: ; 7d06f (1f:506f) - dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 - endchannel - - -SFX_1f_33_Ch3: ; 7d082 (1f:5082) - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 - endchannel diff --git a/audio/sfx/sfx_1f_34.asm b/audio/sfx/sfx_1f_34.asm deleted file mode 100755 index 1bd919ec..00000000 --- a/audio/sfx/sfx_1f_34.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_1f_34_Ch1: ; 7d08f (1f:508f) - dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 - endchannel - - -SFX_1f_34_Ch2: ; 7d0a2 (1f:50a2) - dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 - endchannel - - -SFX_1f_34_Ch3: ; 7d0b5 (1f:50b5) - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 - endchannel diff --git a/audio/sfx/sfx_1f_35.asm b/audio/sfx/sfx_1f_35.asm deleted file mode 100755 index befa3e39..00000000 --- a/audio/sfx/sfx_1f_35.asm +++ /dev/null @@ -1,27 +0,0 @@ -SFX_1f_35_Ch1: ; 7d0c2 (1f:50c2) - dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 - endchannel - - -SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5) - dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 - - -SFX_1f_35_Ch3: ; 7d107 (1f:5107) - endchannel diff --git a/audio/sfx/sfx_1f_36.asm b/audio/sfx/sfx_1f_36.asm deleted file mode 100755 index 9382bb60..00000000 --- a/audio/sfx/sfx_1f_36.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_1f_36_Ch1: ; 7d108 (1f:5108) - dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 - endchannel - - -SFX_1f_36_Ch2: ; 7d11b (1f:511b) - dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 - endchannel - - -SFX_1f_36_Ch3: ; 7d12e (1f:512e) - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 - endchannel diff --git a/audio/sfx/sfx_1f_37.asm b/audio/sfx/sfx_1f_37.asm deleted file mode 100755 index b8812f2a..00000000 --- a/audio/sfx/sfx_1f_37.asm +++ /dev/null @@ -1,25 +0,0 @@ -SFX_1f_37_Ch1: ; 7c7fb (1f:47fb) - dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 - endchannel - - -SFX_1f_37_Ch2: ; 7c812 (1f:4812) - dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 - endchannel - - -SFX_1f_37_Ch3: ; 7c825 (1f:4825) - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/sfx_1f_38.asm b/audio/sfx/sfx_1f_38.asm deleted file mode 100755 index 62bd652c..00000000 --- a/audio/sfx/sfx_1f_38.asm +++ /dev/null @@ -1,33 +0,0 @@ -SFX_1f_38_Ch1: ; 7c832 (1f:4832) - dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_1f_38_Ch2: ; 7c855 (1f:4855) - dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 - endchannel - - -SFX_1f_38_Ch3: ; 7c878 (1f:4878) - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/sfx_1f_39.asm b/audio/sfx/sfx_1f_39.asm deleted file mode 100755 index 30703f3a..00000000 --- a/audio/sfx/sfx_1f_39.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_1f_39_Ch1: ; 7c8e0 (1f:48e0) - dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 - endchannel - - -SFX_1f_39_Ch2: ; 7c8f7 (1f:48f7) - dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 - endchannel - - -SFX_1f_39_Ch3: ; 7c90e (1f:490e) - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 - endchannel diff --git a/audio/sfx/sfx_1f_3a.asm b/audio/sfx/sfx_1f_3a.asm deleted file mode 100755 index f39fe5f6..00000000 --- a/audio/sfx/sfx_1f_3a.asm +++ /dev/null @@ -1,47 +0,0 @@ -SFX_1f_3a_Ch1: ; 7e850 (1f:6850) - executemusic - tempo 256 - volume 7, 7 - vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 - octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 - octave 4 - E_ 4 - endchannel - - -SFX_1f_3a_Ch2: ; 7e867 (1f:6867) - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 - octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel - - -SFX_1f_3a_Ch3: ; 7e877 (1f:6877) - executemusic - notetype 4, 1, 0 - octave 4 - B_ 1 - rest 1 - B_ 1 - rest 1 - B_ 1 - rest 1 - notetype 12, 1, 0 - octave 4 - B_ 2 - rest 2 - endchannel diff --git a/audio/sfx/sfx_1f_3b.asm b/audio/sfx/sfx_1f_3b.asm deleted file mode 100755 index 66e3ba03..00000000 --- a/audio/sfx/sfx_1f_3b.asm +++ /dev/null @@ -1,69 +0,0 @@ -SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28) - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 - octave 4 - D_ 4 - C_ 4 - octave 3 - A_ 8 - notetype 5, 11, 2 - octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 - octave 3 - A# 2 - notetype 5, 11, 4 - octave 4 - C_ 8 - endchannel - - -SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47) - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 - octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel - - -SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f) - executemusic - notetype 5, 1, 0 - octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 - rest 1 - D# 1 - rest 1 - E_ 1 - rest 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - G_ 1 - rest 1 - A_ 8 - endchannel diff --git a/audio/sfx/sfx_1f_3c.asm b/audio/sfx/sfx_1f_3c.asm deleted file mode 100755 index 688e89d2..00000000 --- a/audio/sfx/sfx_1f_3c.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_1f_3c_Ch1: ; 7c3f3 (1f:43f3) - duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_3d.asm b/audio/sfx/sfx_1f_3d.asm deleted file mode 100755 index f5eb6afa..00000000 --- a/audio/sfx/sfx_1f_3d.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_3d_Ch1: ; 7c490 (1f:4490) - duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_3e.asm b/audio/sfx/sfx_1f_3e.asm deleted file mode 100755 index 604e553b..00000000 --- a/audio/sfx/sfx_1f_3e.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_1f_3e_Ch1: ; 7c4b2 (1f:44b2) - duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_3f.asm b/audio/sfx/sfx_1f_3f.asm deleted file mode 100755 index 68ab34d5..00000000 --- a/audio/sfx/sfx_1f_3f.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_3f_Ch1: ; 7c3c3 (1f:43c3) - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 - endchannel diff --git a/audio/sfx/sfx_1f_40.asm b/audio/sfx/sfx_1f_40.asm deleted file mode 100755 index 04f89afb..00000000 --- a/audio/sfx/sfx_1f_40.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_40_Ch1: ; 7c44b (1f:444b) - duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 - endchannel diff --git a/audio/sfx/sfx_1f_41.asm b/audio/sfx/sfx_1f_41.asm deleted file mode 100755 index 415d43d5..00000000 --- a/audio/sfx/sfx_1f_41.asm +++ /dev/null @@ -1,77 +0,0 @@ -SFX_1f_41_Ch1: ; 7edda (1f:6dda) - executemusic - tempo 256 - volume 7, 7 - duty 2 - notetype 5, 11, 1 - octave 3 - A_ 2 - A_ 2 - G_ 2 - G_ 2 - F_ 2 - E_ 2 - F_ 2 - A_ 2 - octave 4 - C_ 4 - E_ 4 - octave 3 - F_ 4 - endchannel - - -SFX_1f_41_Ch2: ; 7edf3 (1f:6df3) - executemusic - duty 2 - notetype 5, 12, 2 - octave 5 - F_ 2 - E_ 1 - rest 1 - D_ 2 - C_ 1 - rest 1 - octave 4 - A# 2 - octave 5 - C_ 2 - D_ 2 - E_ 2 - F_ 4 - G_ 4 - F_ 4 - endchannel - - -SFX_1f_41_Ch3: ; 7ee09 (1f:6e09) - executemusic - notetype 5, 1, 0 - octave 5 - C_ 1 - rest 1 - octave 4 - F_ 2 - octave 5 - C_ 1 - rest 1 - octave 4 - A# 1 - rest 1 - A_ 1 - rest 1 - G_ 1 - rest 1 - F_ 1 - rest 1 - E_ 1 - rest 1 - octave 5 - F_ 1 - rest 3 - C_ 1 - rest 3 - octave 4 - F_ 2 - rest 2 - endchannel diff --git a/audio/sfx/sfx_1f_42.asm b/audio/sfx/sfx_1f_42.asm deleted file mode 100755 index 103b01c6..00000000 --- a/audio/sfx/sfx_1f_42.asm +++ /dev/null @@ -1,59 +0,0 @@ -SFX_1f_42_Ch1: ; 7ee74 (1f:6e74) - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 10, 4 - octave 3 - A# 4 - notetype 5, 11, 1 - octave 4 - C_ 2 - C_ 1 - C_ 1 - notetype 5, 10, 4 - D# 4 - notetype 5, 11, 1 - F_ 2 - F_ 1 - F_ 1 - notetype 5, 11, 4 - A# 8 - endchannel - - -SFX_1f_42_Ch2: ; 7ee93 (1f:6e93) - executemusic - vibrato 4, 2, 3 - duty 2 - notetype 5, 13, 1 - octave 4 - G_ 2 - G_ 1 - G_ 1 - notetype 5, 12, 4 - D# 4 - notetype 5, 13, 1 - G# 2 - G# 1 - G# 1 - A# 2 - A# 1 - A# 1 - notetype 5, 12, 4 - octave 5 - D# 8 - endchannel - - -SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf) - executemusic - notetype 5, 1, 0 - octave 4 - D# 4 - G# 4 - G_ 4 - F_ 4 - D# 8 - endchannel diff --git a/audio/sfx/sfx_1f_43.asm b/audio/sfx/sfx_1f_43.asm deleted file mode 100755 index 1f238fb0..00000000 --- a/audio/sfx/sfx_1f_43.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_1f_43_Ch1: ; 7c49f (1f:449f) - duty 0 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_1f_43_Ch1 - unknownsfx0x20 15, 243, 0, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_44.asm b/audio/sfx/sfx_1f_44.asm deleted file mode 100755 index fc404eab..00000000 --- a/audio/sfx/sfx_1f_44.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_44_Ch1: ; 7c4c7 (1f:44c7) - duty 2 - unknownsfx0x10 21 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_45.asm b/audio/sfx/sfx_1f_45.asm deleted file mode 100755 index f6548431..00000000 --- a/audio/sfx/sfx_1f_45.asm +++ /dev/null @@ -1,14 +0,0 @@ -SFX_1f_45_Ch1: ; 7c4d6 (1f:44d6) - duty 2 - unknownsfx0x20 15, 242, 192, 7 - unknownsfx0x20 15, 0, 0, 0 - unknownsfx0x20 15, 0, 0, 0 - unknownsfx0x20 3, 129, 128, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 64, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 128, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 192, 7 - unknownsfx0x20 3, 129, 0, 7 - endchannel diff --git a/audio/sfx/sfx_1f_46.asm b/audio/sfx/sfx_1f_46.asm deleted file mode 100755 index 3cd98880..00000000 --- a/audio/sfx/sfx_1f_46.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_46_Ch1: ; 7c505 (1f:4505) - duty 2 - unknownsfx0x20 4, 240, 0, 6 - unknownsfx0x20 4, 240, 0, 4 - unknownsfx0x20 4, 240, 0, 2 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_47.asm b/audio/sfx/sfx_1f_47.asm deleted file mode 100755 index 729369e8..00000000 --- a/audio/sfx/sfx_1f_47.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_47_Ch1: ; 7c518 (1f:4518) - duty 2 - unknownsfx0x20 4, 240, 0, 7 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 4, 240, 0, 7 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_48.asm b/audio/sfx/sfx_1f_48.asm deleted file mode 100755 index 35aa7ad5..00000000 --- a/audio/sfx/sfx_1f_48.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_1f_48_Ch1: ; 7c52b (1f:452b) - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 6 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 5 - unknownsfx0x20 15, 71, 128, 4 - unknownsfx0x20 15, 23, 0, 4 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_49.asm b/audio/sfx/sfx_1f_49.asm deleted file mode 100755 index 160979ac..00000000 --- a/audio/sfx/sfx_1f_49.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_1f_49_Ch1: ; 7c546 (1f:4546) - duty 2 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 2, 241, 128, 6 - unknownsfx0x20 1, 0, 0, 0 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_4a.asm b/audio/sfx/sfx_1f_4a.asm deleted file mode 100755 index 187e9b10..00000000 --- a/audio/sfx/sfx_1f_4a.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_1f_4a_Ch1: ; 7c55d (1f:455d) - duty 2 - unknownsfx0x10 44 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 2, 241, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_4b.asm b/audio/sfx/sfx_1f_4b.asm deleted file mode 100755 index b3065b2f..00000000 --- a/audio/sfx/sfx_1f_4b.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_1f_4b_Ch1: ; 7c572 (1f:4572) - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 5 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 6 - unknownsfx0x20 15, 23, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_4c.asm b/audio/sfx/sfx_1f_4c.asm deleted file mode 100755 index 56004e05..00000000 --- a/audio/sfx/sfx_1f_4c.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_1f_4c_Ch1: ; 7c58d (1f:458d) - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 7 - unknownsfx0x20 15, 183, 128, 6 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 5 - unknownsfx0x20 15, 23, 0, 5 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_4d.asm b/audio/sfx/sfx_1f_4d.asm deleted file mode 100755 index c57299c0..00000000 --- a/audio/sfx/sfx_1f_4d.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_4d_Ch1: ; 7c5a8 (1f:45a8) - duty 1 - unknownsfx0x10 22 - unknownsfx0x20 15, 210, 0, 5 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_4e.asm b/audio/sfx/sfx_1f_4e.asm deleted file mode 100755 index 624c2137..00000000 --- a/audio/sfx/sfx_1f_4e.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_4e_Ch1: ; 7c5b3 (1f:45b3) - duty 2 - unknownsfx0x10 149 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_4f.asm b/audio/sfx/sfx_1f_4f.asm deleted file mode 100755 index 91394f9f..00000000 --- a/audio/sfx/sfx_1f_4f.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_4f_Ch1: ; 7c5be (1f:45be) - unknownnoise0x20 2, 241, 50 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 1, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_50.asm b/audio/sfx/sfx_1f_50.asm deleted file mode 100755 index 50cc4ee7..00000000 --- a/audio/sfx/sfx_1f_50.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_1f_50_Ch1: ; 7c5cb (1f:45cb) - unknownnoise0x20 2, 241, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 161, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 209, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 129, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 177, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 97, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 145, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 65, 18 - unknownnoise0x20 2, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_51.asm b/audio/sfx/sfx_1f_51.asm deleted file mode 100755 index 438877f1..00000000 --- a/audio/sfx/sfx_1f_51.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_1f_51_Ch1: ; 7c5fc (1f:45fc) - duty 3 - unknownsfx0x10 90 - unknownsfx0x20 4, 240, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 1, 0, 0, 0 - endchannel - - -SFX_1f_51_Ch2: ; 7c613 (1f:4613) - duty 3 - unknownsfx0x20 4, 240, 1, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 1, 4 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/sfx_1f_52.asm b/audio/sfx/sfx_1f_52.asm deleted file mode 100755 index 98ef0d30..00000000 --- a/audio/sfx/sfx_1f_52.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_52_Ch1: ; 7c626 (1f:4626) - duty 0 - unknownsfx0x10 23 - unknownsfx0x20 15, 210, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_53.asm b/audio/sfx/sfx_1f_53.asm deleted file mode 100755 index 04415233..00000000 --- a/audio/sfx/sfx_1f_53.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_1f_53_Ch1: ; 7c631 (1f:4631) - unknownnoise0x20 4, 162, 35 - unknownnoise0x20 8, 241, 52 - unknownnoise0x20 15, 0, 0 - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 - endchannel diff --git a/audio/sfx/sfx_1f_54.asm b/audio/sfx/sfx_1f_54.asm deleted file mode 100755 index faf5304e..00000000 --- a/audio/sfx/sfx_1f_54.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_1f_54_Ch1: ; 7c64a (1f:464a) - duty 2 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 242, 0, 5 - endchannel - - -SFX_1f_54_Ch2: ; 7c669 (1f:4669) - duty 3 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 242, 130, 4 - endchannel diff --git a/audio/sfx/sfx_1f_55.asm b/audio/sfx/sfx_1f_55.asm deleted file mode 100755 index e2fbffae..00000000 --- a/audio/sfx/sfx_1f_55.asm +++ /dev/null @@ -1,12 +0,0 @@ -SFX_1f_55_Ch1: ; 7c688 (1f:4688) - duty 1 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 4, 226, 0, 5 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 7 - unknownsfx0x10 34 - unknownsfx0x20 15, 226, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_56.asm b/audio/sfx/sfx_1f_56.asm deleted file mode 100755 index 30de8cd2..00000000 --- a/audio/sfx/sfx_1f_56.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_56_Ch1: ; 7c3ca (1f:43ca) - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 - endchannel diff --git a/audio/sfx/sfx_1f_57.asm b/audio/sfx/sfx_1f_57.asm deleted file mode 100755 index b73bb687..00000000 --- a/audio/sfx/sfx_1f_57.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_57_Ch1: ; 7c3da (1f:43da) - unknownnoise0x20 9, 241, 68 - unknownnoise0x20 8, 209, 67 - endchannel diff --git a/audio/sfx/sfx_1f_58.asm b/audio/sfx/sfx_1f_58.asm deleted file mode 100755 index f5844495..00000000 --- a/audio/sfx/sfx_1f_58.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_1f_58_Ch1: ; 7c3e1 (1f:43e1) - duty 2 - unknownsfx0x20 8, 225, 64, 7 - endchannel - - -SFX_1f_58_Ch2: ; 7c3e8 (1f:43e8) - duty 2 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 8, 177, 65, 7 - endchannel diff --git a/audio/sfx/sfx_1f_59.asm b/audio/sfx/sfx_1f_59.asm deleted file mode 100755 index 9c17156f..00000000 --- a/audio/sfx/sfx_1f_59.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_1f_59_Ch1: ; 7c404 (1f:4404) - duty 2 - unknownsfx0x20 4, 241, 128, 7 - endchannel - - -SFX_1f_59_Ch2: ; 7c40b (1f:440b) - duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 161, 97, 7 - endchannel diff --git a/audio/sfx/sfx_1f_5a.asm b/audio/sfx/sfx_1f_5a.asm deleted file mode 100755 index 29b947b7..00000000 --- a/audio/sfx/sfx_1f_5a.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_1f_5a_Ch1: ; 7c416 (1f:4416) - duty 2 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 8, 242, 224, 7 - endchannel - - -SFX_1f_5a_Ch2: ; 7c421 (1f:4421) - duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 145, 193, 6 - unknownsfx0x20 8, 162, 161, 7 - endchannel diff --git a/audio/sfx/sfx_1f_5b.asm b/audio/sfx/sfx_1f_5b.asm deleted file mode 100755 index bc2e6fef..00000000 --- a/audio/sfx/sfx_1f_5b.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_5b_Ch1: ; 7c430 (1f:4430) - duty 2 - unknownsfx0x10 90 - unknownsfx0x20 15, 241, 0, 3 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_5c.asm b/audio/sfx/sfx_1f_5c.asm deleted file mode 100755 index 8671002c..00000000 --- a/audio/sfx/sfx_1f_5c.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_5c_Ch1: ; 7c43b (1f:443b) - unknownnoise0x20 2, 241, 84 - unknownnoise0x20 12, 113, 35 - unknownnoise0x20 2, 177, 84 - unknownnoise0x20 12, 97, 35 - unknownnoise0x20 6, 65, 84 - endchannel diff --git a/audio/sfx/sfx_1f_5d.asm b/audio/sfx/sfx_1f_5d.asm deleted file mode 100755 index 3a325f27..00000000 --- a/audio/sfx/sfx_1f_5d.asm +++ /dev/null @@ -1,36 +0,0 @@ -SFX_1f_5d_Ch1: ; 7c45e (1f:445e) - duty 2 -IF DEF(_RED) - unknownsfx0x20 4, 244, 0, 7 - unknownsfx0x20 3, 228, 128, 6 - unknownsfx0x20 3, 228, 192, 6 - unknownsfx0x20 3, 228, 0, 7 - unknownsfx0x20 2, 228, 160, 7 -ELSE - unknownsfx0x20 3, 228, 0, 6 - unknownsfx0x20 3, 228, 128, 6 - unknownsfx0x20 3, 228, 192, 6 - unknownsfx0x20 3, 228, 0, 7 - unknownsfx0x20 15, 242, 224, 7 -ENDC - endchannel - - -SFX_1f_5d_Ch2: ; 7c475 (1f:4475) - duty 2 -IF DEF(_RED) - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 3, 212, 1, 7 - unknownsfx0x20 3, 196, 129, 6 - unknownsfx0x20 3, 196, 193, 6 - unknownsfx0x20 3, 196, 1, 7 - unknownsfx0x20 2, 196, 161, 7 -ELSE - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 3, 196, 1, 6 - unknownsfx0x20 3, 196, 129, 6 - unknownsfx0x20 3, 196, 193, 6 - unknownsfx0x20 3, 196, 1, 7 - unknownsfx0x20 15, 210, 225, 7 -ENDC - endchannel diff --git a/audio/sfx/sfx_1f_5e.asm b/audio/sfx/sfx_1f_5e.asm deleted file mode 100755 index 6adbb979..00000000 --- a/audio/sfx/sfx_1f_5e.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_1f_5e_Ch1: ; 7c6a5 (1f:46a5) - unknownnoise0x20 6, 32, 16 - unknownnoise0x20 6, 47, 64 - unknownnoise0x20 6, 79, 65 - unknownnoise0x20 6, 143, 65 - unknownnoise0x20 6, 207, 66 - unknownnoise0x20 8, 215, 66 - unknownnoise0x20 15, 231, 67 - unknownnoise0x20 15, 242, 67 - endchannel diff --git a/audio/sfx/sfx_1f_5f.asm b/audio/sfx/sfx_1f_5f.asm deleted file mode 100755 index efc1a5e3..00000000 --- a/audio/sfx/sfx_1f_5f.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_5f_Ch1: ; 7c6be (1f:46be) - duty 2 - unknownsfx0x10 38 - unknownsfx0x20 12, 194, 64, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_60.asm b/audio/sfx/sfx_1f_60.asm deleted file mode 100755 index 907aa79f..00000000 --- a/audio/sfx/sfx_1f_60.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_60_Ch1: ; 7c6c9 (1f:46c9) - duty 2 - unknownsfx0x10 38 - unknownsfx0x20 12, 194, 128, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/sfx_1f_61.asm b/audio/sfx/sfx_1f_61.asm deleted file mode 100755 index 0afe5055..00000000 --- a/audio/sfx/sfx_1f_61.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_1f_61_Ch1: ; 7c6d4 (1f:46d4) - unknownnoise0x20 2, 111, 33 - unknownnoise0x20 2, 175, 49 - unknownnoise0x20 15, 242, 65 - endchannel diff --git a/audio/sfx/sfx_1f_62.asm b/audio/sfx/sfx_1f_62.asm deleted file mode 100755 index 8029ff02..00000000 --- a/audio/sfx/sfx_1f_62.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_62_Ch1: ; 7c6de (1f:46de) - unknownnoise0x20 2, 210, 50 - unknownnoise0x20 15, 242, 67 - endchannel diff --git a/audio/sfx/sfx_1f_63.asm b/audio/sfx/sfx_1f_63.asm deleted file mode 100755 index 2114130a..00000000 --- a/audio/sfx/sfx_1f_63.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_1f_63_Ch1: ; 7c6e5 (1f:46e5) - unknownnoise0x20 4, 44, 32 - unknownnoise0x20 3, 160, 32 - unknownnoise0x20 3, 176, 33 - unknownnoise0x20 3, 192, 34 - unknownnoise0x20 15, 210, 36 - endchannel diff --git a/audio/sfx/sfx_1f_64.asm b/audio/sfx/sfx_1f_64.asm deleted file mode 100755 index ab5a4c04..00000000 --- a/audio/sfx/sfx_1f_64.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_1f_64_Ch1: ; 7c6f5 (1f:46f5) - duty 2 - unknownsfx0x20 1, 242, 160, 6 - unknownsfx0x20 1, 242, 224, 6 - unknownsfx0x20 8, 241, 0, 7 - endchannel diff --git a/audio/sfx/sfx_1f_65.asm b/audio/sfx/sfx_1f_65.asm deleted file mode 100755 index dc564910..00000000 --- a/audio/sfx/sfx_1f_65.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_1f_65_Ch1: ; 7c704 (1f:4704) - duty 2 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 8, 129, 224, 7 - endchannel diff --git a/audio/sfx/sfx_1f_66.asm b/audio/sfx/sfx_1f_66.asm deleted file mode 100755 index 068917bb..00000000 --- a/audio/sfx/sfx_1f_66.asm +++ /dev/null @@ -1,14 +0,0 @@ -SFX_1f_66_Ch1: ; 7c70f (1f:470f) - duty 3 - unknownsfx0x20 5, 225, 0, 7 - unknownsfx0x20 2, 225, 128, 7 - unknownsfx0x20 15, 241, 192, 7 - endchannel - - -SFX_1f_66_Ch2: ; 7c71e (1f:471e) - duty 2 - unknownsfx0x20 4, 193, 193, 6 - unknownsfx0x20 2, 193, 65, 7 - unknownsfx0x20 15, 209, 129, 7 - endchannel diff --git a/audio/sfx/sfx_1f_67.asm b/audio/sfx/sfx_1f_67.asm deleted file mode 100755 index a81d47bf..00000000 --- a/audio/sfx/sfx_1f_67.asm +++ /dev/null @@ -1,14 +0,0 @@ -SFX_1f_67_Ch1: ; 7c72d (1f:472d) - dutycycle 228 - unknownsfx0x10 47 - unknownsfx0x20 4, 64, 224, 7 - unknownsfx0x20 4, 96, 224, 7 - unknownsfx0x20 4, 128, 224, 7 - unknownsfx0x20 8, 160, 224, 7 - unknownsfx0x20 8, 160, 224, 7 - unknownsfx0x20 8, 128, 224, 7 - unknownsfx0x20 8, 96, 224, 7 - unknownsfx0x20 8, 48, 224, 7 - unknownsfx0x20 15, 18, 224, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm new file mode 100644 index 00000000..2cb831c8 --- /dev/null +++ b/audio/sfx/shooting_star.asm @@ -0,0 +1,14 @@ +SFX_Shooting_Star_Ch1: ; 7c72d (1f:472d) + dutycycle 228 + unknownsfx0x10 47 + unknownsfx0x20 4, 64, 224, 7 + unknownsfx0x20 4, 96, 224, 7 + unknownsfx0x20 4, 128, 224, 7 + unknownsfx0x20 8, 160, 224, 7 + unknownsfx0x20 8, 160, 224, 7 + unknownsfx0x20 8, 128, 224, 7 + unknownsfx0x20 8, 96, 224, 7 + unknownsfx0x20 8, 48, 224, 7 + unknownsfx0x20 15, 18, 224, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm new file mode 100644 index 00000000..61ca1933 --- /dev/null +++ b/audio/sfx/shrink_1.asm @@ -0,0 +1,10 @@ +SFX_Shrink_1_Ch1: ; 854e (2:454e) + duty 1 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 6 + unknownsfx0x20 15, 183, 128, 5 + unknownsfx0x20 15, 135, 0, 5 + unknownsfx0x20 15, 71, 128, 4 + unknownsfx0x20 15, 23, 0, 4 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm new file mode 100644 index 00000000..59fe1556 --- /dev/null +++ b/audio/sfx/shrink_3.asm @@ -0,0 +1,10 @@ +SFX_Shrink_3_Ch1: ; 7c52b (1f:452b) + duty 1 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 6 + unknownsfx0x20 15, 183, 128, 5 + unknownsfx0x20 15, 135, 0, 5 + unknownsfx0x20 15, 71, 128, 4 + unknownsfx0x20 15, 23, 0, 4 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm new file mode 100644 index 00000000..66e4fe95 --- /dev/null +++ b/audio/sfx/silph_scope.asm @@ -0,0 +1,9 @@ +SFX_Silph_Scope_Ch1: ; 20412 (8:4412) + duty 0 + unknownsfx0x20 0, 210, 0, 7 + unknownsfx0x20 0, 210, 64, 7 + unknownsfx0x20 0, 210, 128, 7 + unknownsfx0x20 0, 210, 192, 7 + unknownsfx0x20 10, 225, 224, 7 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm new file mode 100644 index 00000000..d122517d --- /dev/null +++ b/audio/sfx/slots_new_spin.asm @@ -0,0 +1,14 @@ +SFX_Slots_New_Spin_Ch1: ; 7c70f (1f:470f) + duty 3 + unknownsfx0x20 5, 225, 0, 7 + unknownsfx0x20 2, 225, 128, 7 + unknownsfx0x20 15, 241, 192, 7 + endchannel + + +SFX_Slots_New_Spin_Ch2: ; 7c71e (1f:471e) + duty 2 + unknownsfx0x20 4, 193, 193, 6 + unknownsfx0x20 2, 193, 65, 7 + unknownsfx0x20 15, 209, 129, 7 + endchannel diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm new file mode 100644 index 00000000..2400c0df --- /dev/null +++ b/audio/sfx/slots_reward.asm @@ -0,0 +1,5 @@ +SFX_Slots_Reward_Ch1: ; 7c704 (1f:4704) + duty 2 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 8, 129, 224, 7 + endchannel diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm new file mode 100644 index 00000000..e67af4c4 --- /dev/null +++ b/audio/sfx/slots_stop_wheel.asm @@ -0,0 +1,6 @@ +SFX_Slots_Stop_Wheel_Ch1: ; 7c6f5 (1f:46f5) + duty 2 + unknownsfx0x20 1, 242, 160, 6 + unknownsfx0x20 1, 242, 224, 6 + unknownsfx0x20 8, 241, 0, 7 + endchannel diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm new file mode 100644 index 00000000..3aa0f74e --- /dev/null +++ b/audio/sfx/snare1_1.asm @@ -0,0 +1,3 @@ +SFX_Snare1_1_Ch1: ; 82fd (2:42fd) + unknownnoise0x20 0, 193, 51 + endchannel diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm new file mode 100644 index 00000000..7d0c3413 --- /dev/null +++ b/audio/sfx/snare1_2.asm @@ -0,0 +1,3 @@ +SFX_Snare1_2_Ch1: ; 202fd (8:42fd) + unknownnoise0x20 0, 193, 51 + endchannel diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm new file mode 100644 index 00000000..8d92bff6 --- /dev/null +++ b/audio/sfx/snare1_3.asm @@ -0,0 +1,3 @@ +SFX_Snare1_3_Ch1: ; 7c2fd (1f:42fd) + unknownnoise0x20 0, 193, 51 + endchannel diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm new file mode 100644 index 00000000..7636a4f3 --- /dev/null +++ b/audio/sfx/snare2_1.asm @@ -0,0 +1,3 @@ +SFX_Snare2_1_Ch1: ; 8301 (2:4301) + unknownnoise0x20 0, 177, 51 + endchannel diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm new file mode 100644 index 00000000..4c34e91a --- /dev/null +++ b/audio/sfx/snare2_2.asm @@ -0,0 +1,3 @@ +SFX_Snare2_2_Ch1: ; 20301 (8:4301) + unknownnoise0x20 0, 177, 51 + endchannel diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm new file mode 100644 index 00000000..eb816f54 --- /dev/null +++ b/audio/sfx/snare2_3.asm @@ -0,0 +1,3 @@ +SFX_Snare2_3_Ch1: ; 7c301 (1f:4301) + unknownnoise0x20 0, 177, 51 + endchannel diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm new file mode 100644 index 00000000..b7e319b2 --- /dev/null +++ b/audio/sfx/snare3_1.asm @@ -0,0 +1,3 @@ +SFX_Snare3_1_Ch1: ; 8305 (2:4305) + unknownnoise0x20 0, 161, 51 + endchannel diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm new file mode 100644 index 00000000..ce889e55 --- /dev/null +++ b/audio/sfx/snare3_2.asm @@ -0,0 +1,3 @@ +SFX_Snare3_2_Ch1: ; 20305 (8:4305) + unknownnoise0x20 0, 161, 51 + endchannel diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm new file mode 100644 index 00000000..c94f436f --- /dev/null +++ b/audio/sfx/snare3_3.asm @@ -0,0 +1,3 @@ +SFX_Snare3_3_Ch1: ; 7c305 (1f:4305) + unknownnoise0x20 0, 161, 51 + endchannel diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm new file mode 100644 index 00000000..20c62731 --- /dev/null +++ b/audio/sfx/snare4_1.asm @@ -0,0 +1,3 @@ +SFX_Snare4_1_Ch1: ; 8309 (2:4309) + unknownnoise0x20 0, 129, 51 + endchannel diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm new file mode 100644 index 00000000..da38dd62 --- /dev/null +++ b/audio/sfx/snare4_2.asm @@ -0,0 +1,3 @@ +SFX_Snare4_2_Ch1: ; 20309 (8:4309) + unknownnoise0x20 0, 129, 51 + endchannel diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm new file mode 100644 index 00000000..4496260b --- /dev/null +++ b/audio/sfx/snare4_3.asm @@ -0,0 +1,3 @@ +SFX_Snare4_3_Ch1: ; 7c309 (1f:4309) + unknownnoise0x20 0, 129, 51 + endchannel diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm new file mode 100644 index 00000000..e0ae8b4c --- /dev/null +++ b/audio/sfx/snare5_1.asm @@ -0,0 +1,8 @@ +SFX_Snare5_1_Ch1: ; 830d (2:430d) + unknownnoise0x20 7, 132, 55 + unknownnoise0x20 6, 132, 54 + unknownnoise0x20 5, 131, 53 + unknownnoise0x20 4, 131, 52 + unknownnoise0x20 3, 130, 51 + unknownnoise0x20 2, 129, 50 + endchannel diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm new file mode 100644 index 00000000..649463cc --- /dev/null +++ b/audio/sfx/snare5_2.asm @@ -0,0 +1,8 @@ +SFX_Snare5_2_Ch1: ; 2030d (8:430d) + unknownnoise0x20 7, 132, 55 + unknownnoise0x20 6, 132, 54 + unknownnoise0x20 5, 131, 53 + unknownnoise0x20 4, 131, 52 + unknownnoise0x20 3, 130, 51 + unknownnoise0x20 2, 129, 50 + endchannel diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm new file mode 100644 index 00000000..33a169b9 --- /dev/null +++ b/audio/sfx/snare5_3.asm @@ -0,0 +1,8 @@ +SFX_Snare5_3_Ch1: ; 7c30d (1f:430d) + unknownnoise0x20 7, 132, 55 + unknownnoise0x20 6, 132, 54 + unknownnoise0x20 5, 131, 53 + unknownnoise0x20 4, 131, 52 + unknownnoise0x20 3, 130, 51 + unknownnoise0x20 2, 129, 50 + endchannel diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm new file mode 100644 index 00000000..4779226f --- /dev/null +++ b/audio/sfx/snare6_1.asm @@ -0,0 +1,3 @@ +SFX_Snare6_1_Ch1: ; 832b (2:432b) + unknownnoise0x20 0, 129, 16 + endchannel diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm new file mode 100644 index 00000000..36359d02 --- /dev/null +++ b/audio/sfx/snare6_2.asm @@ -0,0 +1,3 @@ +SFX_Snare6_2_Ch1: ; 2032b (8:432b) + unknownnoise0x20 0, 129, 16 + endchannel diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm new file mode 100644 index 00000000..d4807ff6 --- /dev/null +++ b/audio/sfx/snare6_3.asm @@ -0,0 +1,3 @@ +SFX_Snare6_3_Ch1: ; 7c32b (1f:432b) + unknownnoise0x20 0, 129, 16 + endchannel diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm new file mode 100644 index 00000000..c53642ed --- /dev/null +++ b/audio/sfx/snare7_1.asm @@ -0,0 +1,3 @@ +SFX_Snare7_1_Ch1: ; 832f (2:432f) + unknownnoise0x20 0, 130, 35 + endchannel diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm new file mode 100644 index 00000000..066aaa53 --- /dev/null +++ b/audio/sfx/snare7_2.asm @@ -0,0 +1,3 @@ +SFX_Snare7_2_Ch1: ; 2032f (8:432f) + unknownnoise0x20 0, 130, 35 + endchannel diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm new file mode 100644 index 00000000..1b058a9b --- /dev/null +++ b/audio/sfx/snare7_3.asm @@ -0,0 +1,3 @@ +SFX_Snare7_3_Ch1: ; 7c32f (1f:432f) + unknownnoise0x20 0, 130, 35 + endchannel diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm new file mode 100644 index 00000000..6269c7dc --- /dev/null +++ b/audio/sfx/snare8_1.asm @@ -0,0 +1,3 @@ +SFX_Snare8_1_Ch1: ; 8333 (2:4333) + unknownnoise0x20 0, 130, 37 + endchannel diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm new file mode 100644 index 00000000..4c5bb18e --- /dev/null +++ b/audio/sfx/snare8_2.asm @@ -0,0 +1,3 @@ +SFX_Snare8_2_Ch1: ; 20333 (8:4333) + unknownnoise0x20 0, 130, 37 + endchannel diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm new file mode 100644 index 00000000..d1f0edc0 --- /dev/null +++ b/audio/sfx/snare8_3.asm @@ -0,0 +1,3 @@ +SFX_Snare8_3_Ch1: ; 7c333 (1f:4333) + unknownnoise0x20 0, 130, 37 + endchannel diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm new file mode 100644 index 00000000..44b2e8c7 --- /dev/null +++ b/audio/sfx/snare9_1.asm @@ -0,0 +1,3 @@ +SFX_Snare9_1_Ch1: ; 8337 (2:4337) + unknownnoise0x20 0, 130, 38 + endchannel diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm new file mode 100644 index 00000000..1d20de2d --- /dev/null +++ b/audio/sfx/snare9_2.asm @@ -0,0 +1,3 @@ +SFX_Snare9_2_Ch1: ; 20337 (8:4337) + unknownnoise0x20 0, 130, 38 + endchannel diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm new file mode 100644 index 00000000..849f4404 --- /dev/null +++ b/audio/sfx/snare9_3.asm @@ -0,0 +1,3 @@ +SFX_Snare9_3_Ch1: ; 7c337 (1f:4337) + unknownnoise0x20 0, 130, 38 + endchannel diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm new file mode 100644 index 00000000..3989c148 --- /dev/null +++ b/audio/sfx/ss_anne_horn_1.asm @@ -0,0 +1,22 @@ +SFX_SS_Anne_Horn_1_Ch1: ; 866d (2:466d) + duty 2 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 242, 0, 5 + endchannel + + +SFX_SS_Anne_Horn_1_Ch2: ; 868c (2:468c) + duty 3 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 242, 130, 4 + endchannel diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm new file mode 100644 index 00000000..c671b6cb --- /dev/null +++ b/audio/sfx/ss_anne_horn_3.asm @@ -0,0 +1,22 @@ +SFX_SS_Anne_Horn_3_Ch1: ; 7c64a (1f:464a) + duty 2 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 242, 0, 5 + endchannel + + +SFX_SS_Anne_Horn_3_Ch2: ; 7c669 (1f:4669) + duty 3 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 242, 130, 4 + endchannel diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm new file mode 100644 index 00000000..350b08ce --- /dev/null +++ b/audio/sfx/start_menu_1.asm @@ -0,0 +1,4 @@ +SFX_Start_Menu_1_Ch1: ; 83c3 (2:43c3) + unknownnoise0x20 1, 226, 51 + unknownnoise0x20 8, 225, 34 + endchannel diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm new file mode 100644 index 00000000..aabd41ce --- /dev/null +++ b/audio/sfx/start_menu_2.asm @@ -0,0 +1,4 @@ +SFX_Start_Menu_2_Ch1: ; 203d6 (8:43d6) + unknownnoise0x20 1, 226, 51 + unknownnoise0x20 8, 225, 34 + endchannel diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm new file mode 100644 index 00000000..566f11f4 --- /dev/null +++ b/audio/sfx/start_menu_3.asm @@ -0,0 +1,4 @@ +SFX_Start_Menu_3_Ch1: ; 7c3c3 (1f:43c3) + unknownnoise0x20 1, 226, 51 + unknownnoise0x20 8, 225, 34 + endchannel diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm new file mode 100644 index 00000000..6759ef6a --- /dev/null +++ b/audio/sfx/super_effective.asm @@ -0,0 +1,4 @@ +SFX_Super_Effective_Ch1: ; 20574 (8:4574) + unknownnoise0x20 4, 241, 52 + unknownnoise0x20 15, 242, 100 + endchannel diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm new file mode 100644 index 00000000..c96d8522 --- /dev/null +++ b/audio/sfx/swap_1.asm @@ -0,0 +1,11 @@ +SFX_Swap_1_Ch1: ; 83f8 (2:43f8) + duty 2 + unknownsfx0x20 8, 225, 64, 7 + endchannel + + +SFX_Swap_1_Ch2: ; 83ff (2:43ff) + duty 2 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 8, 177, 65, 7 + endchannel diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm new file mode 100644 index 00000000..95aa3f19 --- /dev/null +++ b/audio/sfx/swap_3.asm @@ -0,0 +1,11 @@ +SFX_Swap_3_Ch1: ; 7c3e1 (1f:43e1) + duty 2 + unknownsfx0x20 8, 225, 64, 7 + endchannel + + +SFX_Swap_3_Ch2: ; 7c3e8 (1f:43e8) + duty 2 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 8, 177, 65, 7 + endchannel diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm new file mode 100644 index 00000000..040e95aa --- /dev/null +++ b/audio/sfx/switch_1.asm @@ -0,0 +1,8 @@ +SFX_Switch_1_Ch1: ; 8569 (2:4569) + duty 2 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 2, 241, 128, 6 + unknownsfx0x20 1, 0, 0, 0 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 0, 0, 0 + endchannel diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm new file mode 100644 index 00000000..cbe6c8b2 --- /dev/null +++ b/audio/sfx/switch_3.asm @@ -0,0 +1,8 @@ +SFX_Switch_3_Ch1: ; 7c546 (1f:4546) + duty 2 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 2, 241, 128, 6 + unknownsfx0x20 1, 0, 0, 0 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 0, 0, 0 + endchannel diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm new file mode 100644 index 00000000..f9fc5ee2 --- /dev/null +++ b/audio/sfx/teleport_enter1_1.asm @@ -0,0 +1,10 @@ +SFX_Teleport_Enter1_1_Ch1: ; 85b0 (2:45b0) + duty 1 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 7 + unknownsfx0x20 15, 183, 128, 6 + unknownsfx0x20 15, 135, 0, 6 + unknownsfx0x20 15, 71, 128, 5 + unknownsfx0x20 15, 23, 0, 5 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm new file mode 100644 index 00000000..24220173 --- /dev/null +++ b/audio/sfx/teleport_enter1_3.asm @@ -0,0 +1,10 @@ +SFX_Teleport_Enter1_3_Ch1: ; 7c58d (1f:458d) + duty 1 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 7 + unknownsfx0x20 15, 183, 128, 6 + unknownsfx0x20 15, 135, 0, 6 + unknownsfx0x20 15, 71, 128, 5 + unknownsfx0x20 15, 23, 0, 5 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm new file mode 100644 index 00000000..c3c593b2 --- /dev/null +++ b/audio/sfx/teleport_enter2_1.asm @@ -0,0 +1,6 @@ +SFX_Teleport_Enter2_1_Ch1: ; 85e1 (2:45e1) + unknownnoise0x20 2, 241, 50 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 241, 34 + unknownnoise0x20 1, 0, 0 + endchannel diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm new file mode 100644 index 00000000..628bb9fa --- /dev/null +++ b/audio/sfx/teleport_enter2_3.asm @@ -0,0 +1,6 @@ +SFX_Teleport_Enter2_3_Ch1: ; 7c5be (1f:45be) + unknownnoise0x20 2, 241, 50 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 241, 34 + unknownnoise0x20 1, 0, 0 + endchannel diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm new file mode 100644 index 00000000..46ba29cf --- /dev/null +++ b/audio/sfx/teleport_exit1_1.asm @@ -0,0 +1,10 @@ +SFX_Teleport_Exit1_1_Ch1: ; 8595 (2:4595) + duty 1 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 5 + unknownsfx0x20 15, 183, 128, 5 + unknownsfx0x20 15, 135, 0, 6 + unknownsfx0x20 15, 71, 128, 6 + unknownsfx0x20 15, 23, 0, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm new file mode 100644 index 00000000..8d203212 --- /dev/null +++ b/audio/sfx/teleport_exit1_3.asm @@ -0,0 +1,10 @@ +SFX_Teleport_Exit1_3_Ch1: ; 7c572 (1f:4572) + duty 1 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 5 + unknownsfx0x20 15, 183, 128, 5 + unknownsfx0x20 15, 135, 0, 6 + unknownsfx0x20 15, 71, 128, 6 + unknownsfx0x20 15, 23, 0, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm new file mode 100644 index 00000000..37159083 --- /dev/null +++ b/audio/sfx/teleport_exit2_1.asm @@ -0,0 +1,6 @@ +SFX_Teleport_Exit2_1_Ch1: ; 85cb (2:45cb) + duty 1 + unknownsfx0x10 22 + unknownsfx0x20 15, 210, 0, 5 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm new file mode 100644 index 00000000..c7ad054b --- /dev/null +++ b/audio/sfx/teleport_exit2_3.asm @@ -0,0 +1,6 @@ +SFX_Teleport_Exit2_3_Ch1: ; 7c5a8 (1f:45a8) + duty 1 + unknownsfx0x10 22 + unknownsfx0x20 15, 210, 0, 5 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm new file mode 100644 index 00000000..a8099ae1 --- /dev/null +++ b/audio/sfx/tink_1.asm @@ -0,0 +1,8 @@ +SFX_Tink_1_Ch1: ; 840a (2:440a) + duty 2 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 2 + unknownsfx0x10 34 + unknownsfx0x20 8, 226, 0, 2 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm new file mode 100644 index 00000000..cca37381 --- /dev/null +++ b/audio/sfx/tink_2.asm @@ -0,0 +1,8 @@ +SFX_Tink_2_Ch1: ; 203dd (8:43dd) + duty 2 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 2 + unknownsfx0x10 34 + unknownsfx0x20 8, 226, 0, 2 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm new file mode 100644 index 00000000..7299b7ae --- /dev/null +++ b/audio/sfx/tink_3.asm @@ -0,0 +1,8 @@ +SFX_Tink_3_Ch1: ; 7c3f3 (1f:43f3) + duty 2 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 2 + unknownsfx0x10 34 + unknownsfx0x20 8, 226, 0, 2 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm new file mode 100644 index 00000000..ce2bbc0a --- /dev/null +++ b/audio/sfx/trade_machine_1.asm @@ -0,0 +1,7 @@ +SFX_Trade_Machine_1_Ch1: ; 84ee (2:44ee) + duty 2 + unknownsfx0x10 21 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm new file mode 100644 index 00000000..f7515ffb --- /dev/null +++ b/audio/sfx/trade_machine_3.asm @@ -0,0 +1,7 @@ +SFX_Trade_Machine_3_Ch1: ; 7c4c7 (1f:44c7) + duty 2 + unknownsfx0x10 21 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm new file mode 100644 index 00000000..fded5b94 --- /dev/null +++ b/audio/sfx/triangle1_1.asm @@ -0,0 +1,3 @@ +SFX_Triangle1_1_Ch1: ; 8320 (2:4320) + unknownnoise0x20 0, 81, 42 + endchannel diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm new file mode 100644 index 00000000..4f4474ee --- /dev/null +++ b/audio/sfx/triangle1_2.asm @@ -0,0 +1,3 @@ +SFX_Triangle1_2_Ch1: ; 20320 (8:4320) + unknownnoise0x20 0, 81, 42 + endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm new file mode 100644 index 00000000..d1ad9390 --- /dev/null +++ b/audio/sfx/triangle1_3.asm @@ -0,0 +1,3 @@ +SFX_Triangle1_3_Ch1: ; 7c320 (1f:4320) + unknownnoise0x20 0, 81, 42 + endchannel diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm new file mode 100644 index 00000000..f9c4bc6a --- /dev/null +++ b/audio/sfx/triangle2_1.asm @@ -0,0 +1,4 @@ +SFX_Triangle2_1_Ch1: ; 8324 (2:4324) + unknownnoise0x20 1, 65, 43 + unknownnoise0x20 0, 97, 42 + endchannel diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm new file mode 100644 index 00000000..feddf1af --- /dev/null +++ b/audio/sfx/triangle2_2.asm @@ -0,0 +1,4 @@ +SFX_Triangle2_2_Ch1: ; 20324 (8:4324) + unknownnoise0x20 1, 65, 43 + unknownnoise0x20 0, 97, 42 + endchannel diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm new file mode 100644 index 00000000..a4acff1b --- /dev/null +++ b/audio/sfx/triangle2_3.asm @@ -0,0 +1,4 @@ +SFX_Triangle2_3_Ch1: ; 7c324 (1f:4324) + unknownnoise0x20 1, 65, 43 + unknownnoise0x20 0, 97, 42 + endchannel diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm new file mode 100644 index 00000000..e4c3c919 --- /dev/null +++ b/audio/sfx/triangle3_1.asm @@ -0,0 +1,4 @@ +SFX_Triangle3_1_Ch1: ; 834e (2:434e) + unknownnoise0x20 2, 145, 40 + unknownnoise0x20 0, 113, 24 + endchannel diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm new file mode 100644 index 00000000..7a642878 --- /dev/null +++ b/audio/sfx/triangle3_2.asm @@ -0,0 +1,4 @@ +SFX_Triangle3_2_Ch1: ; 2034e (8:434e) + unknownnoise0x20 2, 145, 40 + unknownnoise0x20 0, 113, 24 + endchannel diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm new file mode 100644 index 00000000..73ad42ce --- /dev/null +++ b/audio/sfx/triangle3_3.asm @@ -0,0 +1,4 @@ +SFX_Triangle3_3_Ch1: ; 7c34e (1f:434e) + unknownnoise0x20 2, 145, 40 + unknownnoise0x20 0, 113, 24 + endchannel diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm new file mode 100644 index 00000000..7b4e999d --- /dev/null +++ b/audio/sfx/turn_off_pc_1.asm @@ -0,0 +1,7 @@ +SFX_Turn_Off_PC_1_Ch1: ; 8528 (2:4528) + duty 2 + unknownsfx0x20 4, 240, 0, 6 + unknownsfx0x20 4, 240, 0, 4 + unknownsfx0x20 4, 240, 0, 2 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm new file mode 100644 index 00000000..057ab9a4 --- /dev/null +++ b/audio/sfx/turn_off_pc_3.asm @@ -0,0 +1,7 @@ +SFX_Turn_Off_PC_3_Ch1: ; 7c505 (1f:4505) + duty 2 + unknownsfx0x20 4, 240, 0, 6 + unknownsfx0x20 4, 240, 0, 4 + unknownsfx0x20 4, 240, 0, 2 + unknownsfx0x20 1, 0, 0, 0 + endchannel diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm new file mode 100644 index 00000000..b537791c --- /dev/null +++ b/audio/sfx/turn_on_pc_1.asm @@ -0,0 +1,13 @@ +SFX_Turn_On_PC_1_Ch1: ; 84fd (2:44fd) + duty 2 + unknownsfx0x20 15, 242, 192, 7 + unknownsfx0x20 15, 0, 0, 0 + unknownsfx0x20 3, 161, 128, 7 + unknownsfx0x20 3, 161, 0, 7 + unknownsfx0x20 3, 161, 64, 7 + unknownsfx0x20 3, 161, 0, 7 + unknownsfx0x20 3, 161, 128, 7 + unknownsfx0x20 3, 161, 0, 7 + unknownsfx0x20 3, 161, 192, 7 + unknownsfx0x20 8, 161, 0, 7 + endchannel diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm new file mode 100644 index 00000000..df654cfa --- /dev/null +++ b/audio/sfx/turn_on_pc_3.asm @@ -0,0 +1,14 @@ +SFX_Turn_On_PC_3_Ch1: ; 7c4d6 (1f:44d6) + duty 2 + unknownsfx0x20 15, 242, 192, 7 + unknownsfx0x20 15, 0, 0, 0 + unknownsfx0x20 15, 0, 0, 0 + unknownsfx0x20 3, 129, 128, 7 + unknownsfx0x20 3, 129, 0, 7 + unknownsfx0x20 3, 129, 64, 7 + unknownsfx0x20 3, 129, 0, 7 + unknownsfx0x20 3, 129, 128, 7 + unknownsfx0x20 3, 129, 0, 7 + unknownsfx0x20 3, 129, 192, 7 + unknownsfx0x20 3, 129, 0, 7 + endchannel diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm new file mode 100644 index 00000000..c1e610b6 --- /dev/null +++ b/audio/sfx/vine_whip.asm @@ -0,0 +1,10 @@ +SFX_Vine_Whip_Ch1: ; 20533 (8:4533) + unknownnoise0x20 1, 194, 51 + unknownnoise0x20 2, 242, 33 + unknownnoise0x20 1, 226, 51 + unknownnoise0x20 1, 194, 50 + unknownnoise0x20 1, 146, 18 + unknownnoise0x20 1, 178, 49 + unknownnoise0x20 12, 145, 16 + unknownnoise0x20 8, 242, 65 + endchannel diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm new file mode 100644 index 00000000..bb7a8d6e --- /dev/null +++ b/audio/sfx/withdraw_deposit_1.asm @@ -0,0 +1,12 @@ +SFX_Withdraw_Deposit_1_Ch1: ; 86ab (2:46ab) + duty 1 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 5 + unknownsfx0x10 34 + unknownsfx0x20 4, 226, 0, 5 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 7 + unknownsfx0x10 34 + unknownsfx0x20 15, 226, 0, 7 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm new file mode 100644 index 00000000..99e47fee --- /dev/null +++ b/audio/sfx/withdraw_deposit_3.asm @@ -0,0 +1,12 @@ +SFX_Withdraw_Deposit_3_Ch1: ; 7c688 (1f:4688) + duty 1 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 5 + unknownsfx0x10 34 + unknownsfx0x20 4, 226, 0, 5 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 7 + unknownsfx0x10 34 + unknownsfx0x20 15, 226, 0, 7 + unknownsfx0x10 8 + endchannel diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 6812e312..d8c62dda 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -56,175 +56,175 @@ ENDM music_const MUSIC_MEET_MALE_TRAINER, Music_MeetMaleTrainer ; AUDIO_1 AUDIO_2 AUDIO_3 - music_const SFX_SNARE_1, SFX_02_01 - music_const SFX_SNARE_2, SFX_02_02 - music_const SFX_SNARE_3, SFX_02_03 - music_const SFX_SNARE_4, SFX_02_04 - music_const SFX_SNARE_5, SFX_02_05 - music_const SFX_TRIANGLE_1, SFX_02_06 - music_const SFX_TRIANGLE_2, SFX_02_07 - music_const SFX_SNARE_6, SFX_02_08 - music_const SFX_SNARE_7, SFX_02_09 - music_const SFX_SNARE_8, SFX_02_0a - music_const SFX_SNARE_9, SFX_02_0b - music_const SFX_CYMBAL_1, SFX_02_0c - music_const SFX_CYMBAL_2, SFX_02_0d - music_const SFX_CYMBAL_3, SFX_02_0e - music_const SFX_MUTED_SNARE_1, SFX_02_0f - music_const SFX_TRIANGLE_3, SFX_02_10 - music_const SFX_MUTED_SNARE_2, SFX_02_11 - music_const SFX_MUTED_SNARE_3, SFX_02_12 - music_const SFX_MUTED_SNARE_4, SFX_02_13 - music_const SFX_CRY_00, SFX_02_14 - music_const SFX_CRY_01, SFX_02_15 - music_const SFX_CRY_02, SFX_02_16 - music_const SFX_CRY_03, SFX_02_17 - music_const SFX_CRY_04, SFX_02_18 - music_const SFX_CRY_05, SFX_02_19 - music_const SFX_CRY_06, SFX_02_1a - music_const SFX_CRY_07, SFX_02_1b - music_const SFX_CRY_08, SFX_02_1c - music_const SFX_CRY_09, SFX_02_1d - music_const SFX_CRY_0A, SFX_02_1e - music_const SFX_CRY_0B, SFX_02_1f - music_const SFX_CRY_0C, SFX_02_20 - music_const SFX_CRY_0D, SFX_02_21 - music_const SFX_CRY_0E, SFX_02_22 - music_const SFX_CRY_0F, SFX_02_23 - music_const SFX_CRY_10, SFX_02_24 - music_const SFX_CRY_11, SFX_02_25 - music_const SFX_CRY_12, SFX_02_26 - music_const SFX_CRY_13, SFX_02_27 - music_const SFX_CRY_14, SFX_02_28 - music_const SFX_CRY_15, SFX_02_29 - music_const SFX_CRY_16, SFX_02_2a - music_const SFX_CRY_17, SFX_02_2b - music_const SFX_CRY_18, SFX_02_2c - music_const SFX_CRY_19, SFX_02_2d - music_const SFX_CRY_1A, SFX_02_2e - music_const SFX_CRY_1B, SFX_02_2f - music_const SFX_CRY_1C, SFX_02_30 - music_const SFX_CRY_1D, SFX_02_31 - music_const SFX_CRY_1E, SFX_02_32 - music_const SFX_CRY_1F, SFX_02_33 - music_const SFX_CRY_20, SFX_02_34 - music_const SFX_CRY_21, SFX_02_35 - music_const SFX_CRY_22, SFX_02_36 - music_const SFX_CRY_23, SFX_02_37 - music_const SFX_CRY_24, SFX_02_38 - music_const SFX_CRY_25, SFX_02_39 + music_const SFX_SNARE_1, SFX_Snare1_1 + music_const SFX_SNARE_2, SFX_Snare2_1 + music_const SFX_SNARE_3, SFX_Snare3_1 + music_const SFX_SNARE_4, SFX_Snare4_1 + music_const SFX_SNARE_5, SFX_Snare5_1 + music_const SFX_TRIANGLE_1, SFX_Triangle1_1 + music_const SFX_TRIANGLE_2, SFX_Triangle2_1 + music_const SFX_SNARE_6, SFX_Snare6_1 + music_const SFX_SNARE_7, SFX_Snare7_1 + music_const SFX_SNARE_8, SFX_Snare8_1 + music_const SFX_SNARE_9, SFX_Snare9_1 + music_const SFX_CYMBAL_1, SFX_Cymbal1_1 + music_const SFX_CYMBAL_2, SFX_Cymbal2_1 + music_const SFX_CYMBAL_3, SFX_Cymbal3_1 + music_const SFX_MUTED_SNARE_1, SFX_Muted_Snare1_1 + music_const SFX_TRIANGLE_3, SFX_Triangle3_1 + music_const SFX_MUTED_SNARE_2, SFX_Muted_Snare2_1 + music_const SFX_MUTED_SNARE_3, SFX_Muted_Snare3_1 + music_const SFX_MUTED_SNARE_4, SFX_Muted_Snare4_1 + music_const SFX_CRY_00, SFX_Cry00_1 + music_const SFX_CRY_01, SFX_Cry01_1 + music_const SFX_CRY_02, SFX_Cry02_1 + music_const SFX_CRY_03, SFX_Cry03_1 + music_const SFX_CRY_04, SFX_Cry04_1 + music_const SFX_CRY_05, SFX_Cry05_1 + music_const SFX_CRY_06, SFX_Cry06_1 + music_const SFX_CRY_07, SFX_Cry07_1 + music_const SFX_CRY_08, SFX_Cry08_1 + music_const SFX_CRY_09, SFX_Cry09_1 + music_const SFX_CRY_0A, SFX_Cry0A_1 + music_const SFX_CRY_0B, SFX_Cry0B_1 + music_const SFX_CRY_0C, SFX_Cry0C_1 + music_const SFX_CRY_0D, SFX_Cry0D_1 + music_const SFX_CRY_0E, SFX_Cry0E_1 + music_const SFX_CRY_0F, SFX_Cry0F_1 + music_const SFX_CRY_10, SFX_Cry10_1 + music_const SFX_CRY_11, SFX_Cry11_1 + music_const SFX_CRY_12, SFX_Cry12_1 + music_const SFX_CRY_13, SFX_Cry13_1 + music_const SFX_CRY_14, SFX_Cry14_1 + music_const SFX_CRY_15, SFX_Cry15_1 + music_const SFX_CRY_16, SFX_Cry16_1 + music_const SFX_CRY_17, SFX_Cry17_1 + music_const SFX_CRY_18, SFX_Cry18_1 + music_const SFX_CRY_19, SFX_Cry19_1 + music_const SFX_CRY_1A, SFX_Cry1A_1 + music_const SFX_CRY_1B, SFX_Cry1B_1 + music_const SFX_CRY_1C, SFX_Cry1C_1 + music_const SFX_CRY_1D, SFX_Cry1D_1 + music_const SFX_CRY_1E, SFX_Cry1E_1 + music_const SFX_CRY_1F, SFX_Cry1F_1 + music_const SFX_CRY_20, SFX_Cry20_1 + music_const SFX_CRY_21, SFX_Cry21_1 + music_const SFX_CRY_22, SFX_Cry22_1 + music_const SFX_CRY_23, SFX_Cry23_1 + music_const SFX_CRY_24, SFX_Cry24_1 + music_const SFX_CRY_25, SFX_Cry25_1 - music_const SFX_GET_ITEM_2, SFX_02_3b - music_const SFX_TINK, SFX_02_3c - music_const SFX_HEAL_HP, SFX_02_3d - music_const SFX_HEAL_AILMENT, SFX_02_3e - music_const SFX_START_MENU, SFX_02_3f - music_const SFX_PRESS_AB, SFX_02_40 + music_const SFX_GET_ITEM_2, SFX_Get_Item2_1 + music_const SFX_TINK, SFX_Tink_1 + music_const SFX_HEAL_HP, SFX_Heal_HP_1 + music_const SFX_HEAL_AILMENT, SFX_Heal_Ailment_1 + music_const SFX_START_MENU, SFX_Start_Menu_1 + music_const SFX_PRESS_AB, SFX_Press_AB_1 ; AUDIO_1 AUDIO_3 - music_const SFX_GET_ITEM_1, SFX_02_3a + music_const SFX_GET_ITEM_1, SFX_Get_Item1_1 - music_const SFX_POKEDEX_RATING, SFX_02_41 - music_const SFX_GET_KEY_ITEM, SFX_02_42 - music_const SFX_POISONED, SFX_02_43 - music_const SFX_TRADE_MACHINE, SFX_02_44 - music_const SFX_TURN_ON_PC, SFX_02_45 - music_const SFX_TURN_OFF_PC, SFX_02_46 - music_const SFX_ENTER_PC, SFX_02_47 - music_const SFX_SHRINK, SFX_02_48 - music_const SFX_SWITCH, SFX_02_49 - music_const SFX_HEALING_MACHINE, SFX_02_4a - music_const SFX_TELEPORT_1, SFX_02_4b - music_const SFX_TELEPORT_2, SFX_02_4c - music_const SFX_TELEPORT_3, SFX_02_4d - music_const SFX_LEDGE, SFX_02_4e - music_const SFX_FLY_1, SFX_02_4f - music_const SFX_FLY_2, SFX_02_50 - music_const SFX_DENIED, SFX_02_51 - music_const SFX_ARROW_TILES, SFX_02_52 - music_const SFX_PUSH_BOULDER, SFX_02_53 - music_const SFX_SS_ANNE_HORN, SFX_02_54 - music_const SFX_WITHDRAW_DEPOSIT, SFX_02_55 - music_const SFX_CUT, SFX_02_56 - music_const SFX_GO_INSIDE, SFX_02_57 - music_const SFX_SWAP, SFX_02_58 - music_const SFX_59, SFX_02_59 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL - music_const SFX_PURCHASE, SFX_02_5a - music_const SFX_COLLISION, SFX_02_5b - music_const SFX_GO_OUTSIDE, SFX_02_5c - music_const SFX_SAVE, SFX_02_5d + music_const SFX_POKEDEX_RATING, SFX_Pokedex_Rating_1 + music_const SFX_GET_KEY_ITEM, SFX_Get_Key_Item_1 + music_const SFX_POISONED, SFX_Poisoned_1 + music_const SFX_TRADE_MACHINE, SFX_Trade_Machine_1 + music_const SFX_TURN_ON_PC, SFX_Turn_On_PC_1 + music_const SFX_TURN_OFF_PC, SFX_Turn_Off_PC_1 + music_const SFX_ENTER_PC, SFX_Enter_PC_1 + music_const SFX_SHRINK, SFX_Shrink_1 + music_const SFX_SWITCH, SFX_Switch_1 + music_const SFX_HEALING_MACHINE, SFX_Healing_Machine_1 + music_const SFX_TELEPORT_EXIT_1, SFX_Teleport_Exit1_1 + music_const SFX_TELEPORT_ENTER_1, SFX_Teleport_Enter1_1 + music_const SFX_TELEPORT_EXIT_2, SFX_Teleport_Exit2_1 + music_const SFX_LEDGE, SFX_Ledge_1 + music_const SFX_TELEPORT_ENTER_2, SFX_Teleport_Enter2_1 + music_const SFX_FLY, SFX_Fly_1 + music_const SFX_DENIED, SFX_Denied_1 + music_const SFX_ARROW_TILES, SFX_Arrow_Tiles_1 + music_const SFX_PUSH_BOULDER, SFX_Push_Boulder_1 + music_const SFX_SS_ANNE_HORN, SFX_SS_Anne_Horn_1 + music_const SFX_WITHDRAW_DEPOSIT, SFX_Withdraw_Deposit_1 + music_const SFX_CUT, SFX_Cut_1 + music_const SFX_GO_INSIDE, SFX_Go_Inside_1 + music_const SFX_SWAP, SFX_Swap_1 + music_const SFX_59, SFX_59_1 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL + music_const SFX_PURCHASE, SFX_Purchase_1 + music_const SFX_COLLISION, SFX_Collision_1 + music_const SFX_GO_OUTSIDE, SFX_Go_Outside_1 + music_const SFX_SAVE, SFX_Save_1 ; AUDIO_1 - music_const SFX_POKEFLUE, SFX_02_5e - music_const SFX_SAFARI_ZONE_PA, SFX_02_5f + music_const SFX_POKEFLUE, SFX_Pokeflute + music_const SFX_SAFARI_ZONE_PA, SFX_Safari_Zone_PA ; AUDIO_2 - music_const SFX_LEVEL_UP, SFX_08_3a + music_const SFX_LEVEL_UP, SFX_Level_Up - music_const SFX_BALL_TOSS, SFX_08_41 - music_const SFX_BALL_POOF, SFX_08_42 - music_const SFX_FAINT_THUD, SFX_08_43 - music_const SFX_RUN, SFX_08_44 - music_const SFX_DEX_PAGE_ADDED, SFX_08_45 - music_const SFX_CAUGHT_MON, SFX_08_46 - music_const SFX_PECK, SFX_08_47 - music_const SFX_FAINT_FALL, SFX_08_48 - music_const SFX_BATTLE_09, SFX_08_49 - music_const SFX_POUND, SFX_08_4a - music_const SFX_BATTLE_0B, SFX_08_4b - music_const SFX_BATTLE_0C, SFX_08_4c - music_const SFX_BATTLE_0D, SFX_08_4d - music_const SFX_BATTLE_0E, SFX_08_4e - music_const SFX_BATTLE_0F, SFX_08_4f - music_const SFX_DAMAGE, SFX_08_50 - music_const SFX_NOT_VERY_EFFECTIVE, SFX_08_51 - music_const SFX_BATTLE_12, SFX_08_52 - music_const SFX_BATTLE_13, SFX_08_53 - music_const SFX_BATTLE_14, SFX_08_54 - music_const SFX_VINE_WHIP, SFX_08_55 - music_const SFX_BATTLE_16, SFX_08_56 ; unused? - music_const SFX_BATTLE_17, SFX_08_57 - music_const SFX_BATTLE_18, SFX_08_58 - music_const SFX_BATTLE_19, SFX_08_59 - music_const SFX_SUPER_EFFECTIVE, SFX_08_5a - music_const SFX_BATTLE_1B, SFX_08_5b - music_const SFX_BATTLE_1C, SFX_08_5c - music_const SFX_DOUBLESLAP, SFX_08_5d - music_const SFX_BATTLE_1E, SFX_08_5e - music_const SFX_HORN_DRILL, SFX_08_5f - music_const SFX_BATTLE_20, SFX_08_60 - music_const SFX_BATTLE_21, SFX_08_61 - music_const SFX_BATTLE_22, SFX_08_62 - music_const SFX_BATTLE_23, SFX_08_63 - music_const SFX_BATTLE_24, SFX_08_64 - music_const SFX_BATTLE_25, SFX_08_65 - music_const SFX_BATTLE_26, SFX_08_66 - music_const SFX_BATTLE_27, SFX_08_67 - music_const SFX_BATTLE_28, SFX_08_68 - music_const SFX_BATTLE_29, SFX_08_69 - music_const SFX_BATTLE_2A, SFX_08_6a - music_const SFX_BATTLE_2B, SFX_08_6b - music_const SFX_BATTLE_2C, SFX_08_6c - music_const SFX_PSYBEAM, SFX_08_6d - music_const SFX_BATTLE_2E, SFX_08_6e - music_const SFX_BATTLE_2F, SFX_08_6f - music_const SFX_PSYCHIC_M, SFX_08_70 - music_const SFX_BATTLE_31, SFX_08_71 - music_const SFX_BATTLE_32, SFX_08_72 - music_const SFX_BATTLE_33, SFX_08_73 - music_const SFX_BATTLE_34, SFX_08_74 - music_const SFX_BATTLE_35, SFX_08_75 - music_const SFX_BATTLE_36, SFX_08_76 - music_const SFX_SILPH_SCOPE, SFX_08_77 + music_const SFX_BALL_TOSS, SFX_Ball_Toss + music_const SFX_BALL_POOF, SFX_Ball_Poof + music_const SFX_FAINT_THUD, SFX_Faint_Thud + music_const SFX_RUN, SFX_Run + music_const SFX_DEX_PAGE_ADDED, SFX_Dex_Page_Added + music_const SFX_CAUGHT_MON, SFX_Caught_Mon + music_const SFX_PECK, SFX_Peck + music_const SFX_FAINT_FALL, SFX_Faint_Fall + music_const SFX_BATTLE_09, SFX_Battle_09 + music_const SFX_POUND, SFX_Pound + music_const SFX_BATTLE_0B, SFX_Battle_0B + music_const SFX_BATTLE_0C, SFX_Battle_0C + music_const SFX_BATTLE_0D, SFX_Battle_0D + music_const SFX_BATTLE_0E, SFX_Battle_0E + music_const SFX_BATTLE_0F, SFX_Battle_0F + music_const SFX_DAMAGE, SFX_Damage + music_const SFX_NOT_VERY_EFFECTIVE, SFX_Not_Very_Effective + music_const SFX_BATTLE_12, SFX_Battle_12 + music_const SFX_BATTLE_13, SFX_Battle_13 + music_const SFX_BATTLE_14, SFX_Battle_14 + music_const SFX_VINE_WHIP, SFX_Vine_Whip + music_const SFX_BATTLE_16, SFX_Battle_16 ; unused? + music_const SFX_BATTLE_17, SFX_Battle_17 + music_const SFX_BATTLE_18, SFX_Battle_18 + music_const SFX_BATTLE_19, SFX_Battle_19 + music_const SFX_SUPER_EFFECTIVE, SFX_Super_Effective + music_const SFX_BATTLE_1B, SFX_Battle_1B + music_const SFX_BATTLE_1C, SFX_Battle_1C + music_const SFX_DOUBLESLAP, SFX_Doubleslap + music_const SFX_BATTLE_1E, SFX_Battle_1E + music_const SFX_HORN_DRILL, SFX_Horn_Drill + music_const SFX_BATTLE_20, SFX_Battle_20 + music_const SFX_BATTLE_21, SFX_Battle_21 + music_const SFX_BATTLE_22, SFX_Battle_22 + music_const SFX_BATTLE_23, SFX_Battle_23 + music_const SFX_BATTLE_24, SFX_Battle_24 + music_const SFX_BATTLE_25, SFX_Battle_25 + music_const SFX_BATTLE_26, SFX_Battle_26 + music_const SFX_BATTLE_27, SFX_Battle_27 + music_const SFX_BATTLE_28, SFX_Battle_28 + music_const SFX_BATTLE_29, SFX_Battle_29 + music_const SFX_BATTLE_2A, SFX_Battle_2A + music_const SFX_BATTLE_2B, SFX_Battle_2B + music_const SFX_BATTLE_2C, SFX_Battle_2C + music_const SFX_PSYBEAM, SFX_Psybeam + music_const SFX_BATTLE_2E, SFX_Battle_2E + music_const SFX_BATTLE_2F, SFX_Battle_2F + music_const SFX_PSYCHIC_M, SFX_Psychic_M + music_const SFX_BATTLE_31, SFX_Battle_31 + music_const SFX_BATTLE_32, SFX_Battle_32 + music_const SFX_BATTLE_33, SFX_Battle_33 + music_const SFX_BATTLE_34, SFX_Battle_34 + music_const SFX_BATTLE_35, SFX_Battle_35 + music_const SFX_BATTLE_36, SFX_Battle_36 + music_const SFX_SILPH_SCOPE, SFX_Silph_Scope ; AUDIO_3 - music_const SFX_INTRO_LUNGE, SFX_1f_5e - music_const SFX_INTRO_HIP, SFX_1f_5f - music_const SFX_INTRO_HOP, SFX_1f_60 - music_const SFX_INTRO_RAISE, SFX_1f_61 - music_const SFX_INTRO_CRASH, SFX_1f_62 - music_const SFX_INTRO_WHOOSH, SFX_1f_63 - music_const SFX_SLOTS_STOP_WHEEL, SFX_1f_64 - music_const SFX_SLOTS_REWARD, SFX_1f_65 - music_const SFX_SLOTS_NEW_SPIN, SFX_1f_66 - music_const SFX_SHOOTING_STAR, SFX_1f_67 + music_const SFX_INTRO_LUNGE, SFX_Intro_Lunge + music_const SFX_INTRO_HIP, SFX_Intro_Hip + music_const SFX_INTRO_HOP, SFX_Intro_Hop + music_const SFX_INTRO_RAISE, SFX_Intro_Raise + music_const SFX_INTRO_CRASH, SFX_Intro_Crash + music_const SFX_INTRO_WHOOSH, SFX_Intro_Whoosh + music_const SFX_SLOTS_STOP_WHEEL, SFX_Slots_Stop_Wheel + music_const SFX_SLOTS_REWARD, SFX_Slots_Reward + music_const SFX_SLOTS_NEW_SPIN, SFX_Slots_New_Spin + music_const SFX_SHOOTING_STAR, SFX_Shooting_Star diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 8893e496..34d7f64d 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -67,7 +67,7 @@ SafariZoneGameOver: ; 1e9b0 (7:69b0) ld [wMusicHeaderPointer], a dec a call PlaySound - ld c, BANK(SFX_02_5f) + ld c, BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA call PlayMusic .asm_1e9c2 diff --git a/engine/items/items.asm b/engine/items/items.asm index f2c41ef6..a62f75d2 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1719,7 +1719,7 @@ PlayedFluteHadEffectText: ; e215 (3:6215) ld a,$ff call PlaySound ; turn off music ld a, SFX_POKEFLUE - ld c, BANK(SFX_02_5e) + ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing ld a,[wc028] diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 2f22f78e..76eb7450 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -139,7 +139,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) ; play pokemon cry .choseCry ld a,[wd11e] - call GetCryData ; get cry data + call GetCryData call PlaySound jr .handleMenuInput .choseArea diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index 09a38012..eb62fee7 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -17,7 +17,7 @@ ShakeElevator: ; 7bf15 (1e:7f15) add d ld [hSCY], a push bc - ld c, BANK(SFX_02_5b) + ld c, BANK(SFX_Collision_1) ld a, SFX_COLLISION call PlayMusic pop bc @@ -29,7 +29,7 @@ ShakeElevator: ; 7bf15 (1e:7f15) ld [hSCY], a ld a, $ff call PlaySound - ld c, BANK(SFX_02_5f) + ld c, BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA call PlayMusic .musicLoop diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 5ce2b2a6..a9aa2cf2 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -9,7 +9,7 @@ EnterMapAnim: ; 70510 (1c:4510) bit 7, [hl] ; used fly out of battle? res 7, [hl] jr nz, .flyAnimation - ld a, SFX_TELEPORT_2 + ld a, SFX_TELEPORT_ENTER_1 call PlaySound ld hl, wd732 bit 4, [hl] ; used dungeon warp? @@ -17,7 +17,7 @@ EnterMapAnim: ; 70510 (1c:4510) pop hl jr nz, .dungeonWarpAnimation call PlayerSpinWhileMovingDown - ld a, SFX_FLY_1 + ld a, SFX_TELEPORT_ENTER_2 call PlaySound call IsPlayerStandingOnWarpPadOrHole ld a, b @@ -50,7 +50,7 @@ EnterMapAnim: ; 70510 (1c:4510) ld bc, (BANK(BirdSprite) << 8) + $0c call CopyVideoData call LoadBirdSpriteGraphics - ld a, SFX_FLY_2 + ld a, SFX_FLY call PlaySound ld hl, wFlyAnimUsingCoordList xor a ; is using coord list @@ -99,7 +99,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) dec a jp nz, LeaveMapThroughHoleAnim .spinWhileMovingUp - ld a, SFX_TELEPORT_1 + ld a, SFX_TELEPORT_EXIT_1 call PlaySound ld hl, wPlayerSpinWhileMovingUpOrDownAnimDeltaY ld a, -$10 @@ -133,7 +133,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayDelta xor a ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayEndValue - ld [hl], SFX_TELEPORT_3 ; wPlayerSpinInPlaceAnimSoundID + ld [hl], SFX_TELEPORT_EXIT_2 ; wPlayerSpinInPlaceAnimSoundID ld hl, wFacingDirectionList call PlayerSpinInPlace jr .spinWhileMovingUp @@ -146,7 +146,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) ld [hli], a ; wFlyAnimCounter ld [hl], $c ; wFlyAnimBirdSpriteImageIndex call DoFlyAnimation - ld a, SFX_FLY_2 + ld a, SFX_FLY call PlaySound ld hl, wFlyAnimUsingCoordList xor a ; is using coord list diff --git a/home/init.asm b/home/init.asm index 3e8d1d2b..848a81a3 100644 --- a/home/init.asm +++ b/home/init.asm @@ -97,7 +97,7 @@ rLCDC_DEFAULT EQU %11100011 predef LoadSGB - ld a, BANK(SFX_1f_67) + ld a, BANK(SFX_Shooting_Star) ld [wc0ef], a ld [wc0f0], a ld a, $9c -- cgit v1.3.1-sl0p From a6f04b434980f2176cb275a7c3ba50d5cbcd6ace Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 22 Jul 2015 10:22:46 -0500 Subject: Unify audio bank references 2→1 8→2 1f→3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- audio.asm | 48 +-- audio/engine_1.asm | 372 +++++++++--------- audio/engine_2.asm | 380 +++++++++---------- audio/engine_3.asm | 372 +++++++++--------- audio/headers/musicheaders02.asm | 184 --------- audio/headers/musicheaders08.asm | 57 --- audio/headers/musicheaders1.asm | 184 +++++++++ audio/headers/musicheaders1f.asm | 158 -------- audio/headers/musicheaders2.asm | 57 +++ audio/headers/musicheaders3.asm | 158 ++++++++ audio/headers/sfxheaders02.asm | 562 ---------------------------- audio/headers/sfxheaders08.asm | 706 ----------------------------------- audio/headers/sfxheaders1.asm | 562 ++++++++++++++++++++++++++++ audio/headers/sfxheaders1f.asm | 596 ----------------------------- audio/headers/sfxheaders2.asm | 706 +++++++++++++++++++++++++++++++++++ audio/headers/sfxheaders3.asm | 596 +++++++++++++++++++++++++++++ audio/sfx/pokeflute_ch1_ch2.asm | 14 + audio/sfx/pokeflute_ch3.asm | 13 + audio/sfx/sfx_02_unused.asm | 31 -- audio/sfx/sfx_08_pokeflute.asm | 14 - audio/sfx/sfx_08_pokeflute_ch3.asm | 13 - audio/sfx/sfx_08_unused.asm | 31 -- audio/sfx/sfx_08_unused2.asm | 56 --- audio/sfx/sfx_1f_unused.asm | 31 -- audio/sfx/unused2_2.asm | 56 +++ audio/sfx/unused_1.asm | 31 ++ audio/sfx/unused_2.asm | 31 ++ audio/sfx/unused_3.asm | 31 ++ constants/music_constants.asm | 2 +- engine/overworld/healing_machine.asm | 2 +- home/audio.asm | 44 +-- home/init.asm | 2 +- home/vblank.asm | 22 +- scripts/ssanne7.asm | 2 +- 34 files changed, 3062 insertions(+), 3062 deletions(-) delete mode 100755 audio/headers/musicheaders02.asm delete mode 100755 audio/headers/musicheaders08.asm create mode 100755 audio/headers/musicheaders1.asm delete mode 100755 audio/headers/musicheaders1f.asm create mode 100755 audio/headers/musicheaders2.asm create mode 100755 audio/headers/musicheaders3.asm delete mode 100644 audio/headers/sfxheaders02.asm delete mode 100644 audio/headers/sfxheaders08.asm create mode 100644 audio/headers/sfxheaders1.asm delete mode 100644 audio/headers/sfxheaders1f.asm create mode 100644 audio/headers/sfxheaders2.asm create mode 100644 audio/headers/sfxheaders3.asm create mode 100755 audio/sfx/pokeflute_ch1_ch2.asm create mode 100755 audio/sfx/pokeflute_ch3.asm delete mode 100755 audio/sfx/sfx_02_unused.asm delete mode 100755 audio/sfx/sfx_08_pokeflute.asm delete mode 100755 audio/sfx/sfx_08_pokeflute_ch3.asm delete mode 100755 audio/sfx/sfx_08_unused.asm delete mode 100755 audio/sfx/sfx_08_unused2.asm delete mode 100755 audio/sfx/sfx_1f_unused.asm create mode 100755 audio/sfx/unused2_2.asm create mode 100755 audio/sfx/unused_1.asm create mode 100755 audio/sfx/unused_2.asm create mode 100755 audio/sfx/unused_3.asm (limited to 'audio.asm') diff --git a/audio.asm b/audio.asm index 8b83fcaf..286dc7ed 100644 --- a/audio.asm +++ b/audio.asm @@ -7,24 +7,24 @@ INCLUDE "constants.asm" SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1] -INCLUDE "audio/headers/sfxheaders02.asm" +INCLUDE "audio/headers/sfxheaders1.asm" SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2] -INCLUDE "audio/headers/sfxheaders08.asm" +INCLUDE "audio/headers/sfxheaders2.asm" SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3] -INCLUDE "audio/headers/sfxheaders1f.asm" +INCLUDE "audio/headers/sfxheaders3.asm" SECTION "Music Headers 1", ROMX, BANK[AUDIO_1] -INCLUDE "audio/headers/musicheaders02.asm" +INCLUDE "audio/headers/musicheaders1.asm" SECTION "Music Headers 2", ROMX, BANK[AUDIO_2] -INCLUDE "audio/headers/musicheaders08.asm" +INCLUDE "audio/headers/musicheaders2.asm" SECTION "Music Headers 3", ROMX, BANK[AUDIO_3] -INCLUDE "audio/headers/musicheaders1f.asm" +INCLUDE "audio/headers/musicheaders3.asm" @@ -50,7 +50,7 @@ INCLUDE "audio/sfx/muted_snare2_1.asm" INCLUDE "audio/sfx/muted_snare3_1.asm" INCLUDE "audio/sfx/muted_snare4_1.asm" -Music2_WavePointers: INCLUDE "audio/wave_instruments.asm" +Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm" INCLUDE "audio/sfx/start_menu_1.asm" INCLUDE "audio/sfx/pokeflute.asm" @@ -86,7 +86,7 @@ INCLUDE "audio/sfx/push_boulder_1.asm" INCLUDE "audio/sfx/ss_anne_horn_1.asm" INCLUDE "audio/sfx/withdraw_deposit_1.asm" INCLUDE "audio/sfx/safari_zone_pa.asm" -INCLUDE "audio/sfx/sfx_02_unused.asm" +INCLUDE "audio/sfx/unused_1.asm" INCLUDE "audio/sfx/cry09_1.asm" INCLUDE "audio/sfx/cry23_1.asm" INCLUDE "audio/sfx/cry24_1.asm" @@ -149,7 +149,7 @@ INCLUDE "audio/sfx/muted_snare2_2.asm" INCLUDE "audio/sfx/muted_snare3_2.asm" INCLUDE "audio/sfx/muted_snare4_2.asm" -Music8_WavePointers: INCLUDE "audio/wave_instruments.asm" +Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm" INCLUDE "audio/sfx/press_ab_2.asm" INCLUDE "audio/sfx/start_menu_2.asm" @@ -162,7 +162,7 @@ INCLUDE "audio/sfx/ball_poof.asm" INCLUDE "audio/sfx/faint_thud.asm" INCLUDE "audio/sfx/run.asm" INCLUDE "audio/sfx/dex_page_added.asm" -INCLUDE "audio/sfx/sfx_08_pokeflute_ch3.asm" +INCLUDE "audio/sfx/pokeflute_ch3.asm" INCLUDE "audio/sfx/peck.asm" INCLUDE "audio/sfx/faint_fall.asm" INCLUDE "audio/sfx/battle_09.asm" @@ -211,7 +211,7 @@ INCLUDE "audio/sfx/battle_33.asm" INCLUDE "audio/sfx/battle_34.asm" INCLUDE "audio/sfx/battle_35.asm" INCLUDE "audio/sfx/battle_36.asm" -INCLUDE "audio/sfx/sfx_08_unused.asm" +INCLUDE "audio/sfx/unused_2.asm" INCLUDE "audio/sfx/cry09_2.asm" INCLUDE "audio/sfx/cry23_2.asm" INCLUDE "audio/sfx/cry24_2.asm" @@ -274,7 +274,7 @@ INCLUDE "audio/sfx/muted_snare2_3.asm" INCLUDE "audio/sfx/muted_snare3_3.asm" INCLUDE "audio/sfx/muted_snare4_3.asm" -Music1f_WavePointers: INCLUDE "audio/wave_instruments.asm" +Audio3_WavePointers: INCLUDE "audio/wave_instruments.asm" INCLUDE "audio/sfx/start_menu_3.asm" INCLUDE "audio/sfx/cut_3.asm" @@ -318,7 +318,7 @@ INCLUDE "audio/sfx/slots_stop_wheel.asm" INCLUDE "audio/sfx/slots_reward.asm" INCLUDE "audio/sfx/slots_new_spin.asm" INCLUDE "audio/sfx/shooting_star.asm" -INCLUDE "audio/sfx/sfx_1f_unused.asm" +INCLUDE "audio/sfx/unused_3.asm" INCLUDE "audio/sfx/cry09_3.asm" INCLUDE "audio/sfx/cry23_3.asm" INCLUDE "audio/sfx/cry24_3.asm" @@ -408,12 +408,12 @@ Music_RivalAlternateStart:: ; 0x9b47 call PlayMusic ld hl, wc006 ld de, Music_MeetRival_branch_b1a2 - call Music2_OverwriteChannelPointer + call Audio1_OverwriteChannelPointer ld de, Music_MeetRival_branch_b21d - call Music2_OverwriteChannelPointer + call Audio1_OverwriteChannelPointer ld de, Music_MeetRival_branch_b2b5 -Music2_OverwriteChannelPointer: ; 0x9b60 +Audio1_OverwriteChannelPointer: ; 0x9b60 ld a, e ld [hli], a ld a, d @@ -427,14 +427,14 @@ Music_RivalAlternateTempo:: ; 0x9b65 call PlayMusic ld hl, wc006 ld de, Music_MeetRival_branch_b119 - jp Music2_OverwriteChannelPointer + jp Audio1_OverwriteChannelPointer ; applies both the alternate start and alternate tempo Music_RivalAlternateStartAndTempo:: ; 0x9b75 call Music_RivalAlternateStart ld hl, wc006 ld de, Music_MeetRival_branch_b19b - jp Music2_OverwriteChannelPointer + jp Audio1_OverwriteChannelPointer ; an alternate tempo for Cities1 which is used for the Hall of Fame room Music_Cities1AlternateTempo:: ; 0x9b81 @@ -450,7 +450,7 @@ Music_Cities1AlternateTempo:: ; 0x9b81 call PlayMusic ld hl, wc006 ld de, Music_Cities1_branch_aa6f - jp Music2_OverwriteChannelPointer + jp Audio1_OverwriteChannelPointer SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2] @@ -544,12 +544,12 @@ Music_PokeFluteInBattle:: ; 22306 (8:6306) ; then immediately overwrtie the channel pointers ld hl, wc00e ld de, SFX_08_PokeFlute_Ch1 - call Music8_OverwriteChannelPointer + call Audio2_OverwriteChannelPointer ld de, SFX_08_PokeFlute_Ch2 - call Music8_OverwriteChannelPointer + call Audio2_OverwriteChannelPointer ld de, SFX_08_PokeFlute_Ch3 -Music8_OverwriteChannelPointer: ; 2231d (8:631d) +Audio2_OverwriteChannelPointer: ; 2231d (8:631d) ld a, e ld [hli], a ld a, d @@ -632,8 +632,8 @@ INCLUDE "audio/music/pokecenter.asm" SECTION "Music 2", ROMX, BANK[AUDIO_2] -INCLUDE "audio/sfx/sfx_08_pokeflute.asm" -INCLUDE "audio/sfx/sfx_08_unused2.asm" +INCLUDE "audio/sfx/pokeflute_ch1_ch2.asm" +INCLUDE "audio/sfx/unused2_2.asm" INCLUDE "audio/music/gymleaderbattle.asm" INCLUDE "audio/music/trainerbattle.asm" INCLUDE "audio/music/wildbattle.asm" diff --git a/audio/engine_1.asm b/audio/engine_1.asm index fd74b16d..9a302ef3 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -1,6 +1,6 @@ ; The first of three duplicated sound engines. -Music2_UpdateMusic:: ; 0x9103 +Audio1_UpdateMusic:: ; 0x9103 ld c, CH0 .loop ld b, $0 @@ -26,7 +26,7 @@ Music2_UpdateMusic:: ; 0x9103 ld [$ff1a], a jr .nextChannel .asm_912e - call Music2_ApplyMusicAffects + call Audio1_ApplyMusicAffects .nextChannel ld a, c inc c ; inc channel number @@ -42,13 +42,13 @@ Music2_UpdateMusic:: ; 0x9103 ; 3: a toggle used only by this routine for vibrato ; 4: pitchbend flag ; 6: dutycycle flag -Music2_ApplyMusicAffects: ; 0x9138 +Audio1_ApplyMusicAffects: ; 0x9138 ld b, $0 ld hl, wc0b6 ; delay until next note add hl, bc ld a, [hl] cp $1 ; if the delay is 1, play next note - jp z, Music2_PlayNextNote + jp z, Audio1_PlayNextNote dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c @@ -65,7 +65,7 @@ Music2_ApplyMusicAffects: ; 0x9138 add hl, bc bit 6, [hl] ; dutycycle jr z, .checkForExecuteMusic - call Music2_ApplyDutyCycle + call Audio1_ApplyDutyCycle .checkForExecuteMusic ld b, $0 ld hl, wc036 @@ -81,7 +81,7 @@ Music2_ApplyMusicAffects: ; 0x9138 add hl, bc bit 4, [hl] ; pitchbend jr z, .checkVibratoDelay - jp Music2_ApplyPitchBend + jp Audio1_ApplyPitchBend .checkVibratoDelay ld hl, wc04e ; vibrato delay add hl, bc @@ -141,14 +141,14 @@ Music2_ApplyMusicAffects: ; 0x9138 .done ld d, a ld b, $3 - call Music2_9838 + call Audio1_9838 ld [hl], d ret ; this routine executes all music commands that take up no time, ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached -Music2_PlayNextNote: ; 0x91d0 +Audio1_PlayNextNote: ; 0x91d0 ld hl, wc06e add hl, bc ld a, [hl] @@ -159,14 +159,14 @@ Music2_PlayNextNote: ; 0x91d0 add hl, bc res 4, [hl] res 5, [hl] - call Music2_endchannel + call Audio1_endchannel ret -Music2_endchannel: ; 0x91e6 - call Music2_GetNextMusicByte +Audio1_endchannel: ; 0x91e6 + call Audio1_GetNextMusicByte ld d, a cp $ff ; is this command an endchannel? - jp nz, Music2_callchannel ; no + jp nz, Audio1_callchannel ; no ld b, $0 ; yes ld hl, wc02e add hl, bc @@ -216,7 +216,7 @@ Music2_endchannel: ; 0x91e6 inc de ld a, [de] ld [hl], a ; loads channel address to return to - jp Music2_endchannel + jp Audio1_endchannel .asm_923f ld hl, Unknown_9b1f add hl, bc @@ -238,7 +238,7 @@ Music2_endchannel: ; 0x91e6 ld a, c cp CH4 jr z, .asm_9265 - call Music2_96c7 + call Audio1_96c7 ret c .asm_9265 ld a, [wc005] @@ -251,12 +251,12 @@ Music2_endchannel: ; 0x91e6 ld [hl], b ret -Music2_callchannel: ; 0x9274 +Audio1_callchannel: ; 0x9274 cp $fd ; is this command a callchannel? - jp nz, Music2_loopchannel ; no - call Music2_GetNextMusicByte ; yes + jp nz, Audio1_loopchannel ; no + call Audio1_GetNextMusicByte ; yes push af - call Music2_GetNextMusicByte + call Audio1_GetNextMusicByte ld d, a pop af ld e, a @@ -286,12 +286,12 @@ Music2_callchannel: ; 0x9274 ld hl, wc02e add hl, bc set 1, [hl] ; set the call flag - jp Music2_endchannel + jp Audio1_endchannel -Music2_loopchannel: ; 0x92a9 +Audio1_loopchannel: ; 0x92a9 cp $fe ; is this command a loopchannel? - jp nz, Music2_notetype ; no - call Music2_GetNextMusicByte ; yes + jp nz, Audio1_notetype ; no + call Audio1_GetNextMusicByte ; yes ld e, a and a jr z, .infiniteLoop @@ -303,17 +303,17 @@ Music2_loopchannel: ; 0x92a9 jr nz, .loopAgain ld a, $1 ; if no more loops to make, ld [hl], a - call Music2_GetNextMusicByte ; skip pointer - call Music2_GetNextMusicByte - jp Music2_endchannel + call Audio1_GetNextMusicByte ; skip pointer + call Audio1_GetNextMusicByte + jp Audio1_endchannel .loopAgain ; inc loop count inc a ld [hl], a ; fall through .infiniteLoop ; overwrite current address with pointer - call Music2_GetNextMusicByte + call Audio1_GetNextMusicByte push af - call Music2_GetNextMusicByte + call Audio1_GetNextMusicByte ld b, a ld d, $0 ld a, c @@ -324,12 +324,12 @@ Music2_loopchannel: ; 0x92a9 pop af ld [hli], a ld [hl], b - jp Music2_endchannel + jp Audio1_endchannel -Music2_notetype: ; 0x92e4 +Audio1_notetype: ; 0x92e4 and $f0 cp $d0 ; is this command a notetype? - jp nz, Music2_toggleperfectpitch ; no + jp nz, Audio1_toggleperfectpitch ; no ld a, d ; yes and $f ld b, $0 @@ -339,7 +339,7 @@ Music2_notetype: ; 0x92e4 ld a, c cp CH3 jr z, .noiseChannel ; noise channel has 0 params - call Music2_GetNextMusicByte + call Audio1_GetNextMusicByte ld d, a ld a, c cp CH2 @@ -368,24 +368,24 @@ Music2_notetype: ; 0x92e4 add hl, bc ld [hl], d .noiseChannel - jp Music2_endchannel + jp Audio1_endchannel -Music2_toggleperfectpitch: ; 0x9323 +Audio1_toggleperfectpitch: ; 0x9323 ld a, d cp $e8 ; is this command a toggleperfectpitch? - jr nz, Music2_vibrato ; no + jr nz, Audio1_vibrato ; no ld b, $0 ; yes ld hl, wc02e add hl, bc ld a, [hl] xor $1 ld [hl], a ; flip bit 0 of wc02e - jp Music2_endchannel + jp Audio1_endchannel -Music2_vibrato: ; 0x9335 +Audio1_vibrato: ; 0x9335 cp $ea ; is this command a vibrato? - jr nz, Music2_pitchbend ; no - call Music2_GetNextMusicByte ; yes + jr nz, Audio1_pitchbend ; no + call Audio1_GetNextMusicByte ; yes ld b, $0 ld hl, wc04e add hl, bc @@ -393,7 +393,7 @@ Music2_vibrato: ; 0x9335 ld hl, wc06e add hl, bc ld [hl], a ; store delay - call Music2_GetNextMusicByte + call Audio1_GetNextMusicByte ld d, a and $f0 swap a @@ -414,24 +414,24 @@ Music2_vibrato: ; 0x9335 swap a or d ld [hl], a ; store depth as both high and low nibbles - jp Music2_endchannel + jp Audio1_endchannel -Music2_pitchbend: ; 0x936d +Audio1_pitchbend: ; 0x936d cp $eb ; is this command a pitchbend? - jr nz, Music2_duty ; no - call Music2_GetNextMusicByte ; yes + jr nz, Audio1_duty ; no + call Audio1_GetNextMusicByte ; yes ld b, $0 ld hl, wc076 add hl, bc ld [hl], a ; store first param - call Music2_GetNextMusicByte + call Audio1_GetNextMusicByte ld d, a and $f0 swap a ld b, a ld a, d and $f - call Music2_9858 + call Audio1_9858 ld b, $0 ld hl, wc0a6 add hl, bc @@ -443,14 +443,14 @@ Music2_pitchbend: ; 0x936d ld hl, wc02e add hl, bc set 4, [hl] ; set pitchbend flag - call Music2_GetNextMusicByte + call Audio1_GetNextMusicByte ld d, a - jp Music2_notelength + jp Audio1_notelength -Music2_duty: ; 0x93a5 +Audio1_duty: ; 0x93a5 cp $ec ; is this command a duty? - jr nz, Music2_tempo ; no - call Music2_GetNextMusicByte ; yes + jr nz, Audio1_tempo ; no + call Audio1_GetNextMusicByte ; yes rrca rrca and $c0 @@ -458,17 +458,17 @@ Music2_duty: ; 0x93a5 ld hl, wc03e add hl, bc ld [hl], a ; store duty - jp Music2_endchannel + jp Audio1_endchannel -Music2_tempo: ; 0x93ba +Audio1_tempo: ; 0x93ba cp $ed ; is this command a tempo? - jr nz, Music2_stereopanning ; no + jr nz, Audio1_stereopanning ; no ld a, c ; yes cp CH4 jr nc, .sfxChannel - call Music2_GetNextMusicByte + call Audio1_GetNextMusicByte ld [wc0e8], a ; store first param - call Music2_GetNextMusicByte + call Audio1_GetNextMusicByte ld [wc0e9], a ; store second param xor a ld [wc0ce], a ; clear RAM @@ -477,9 +477,9 @@ Music2_tempo: ; 0x93ba ld [wc0d1], a jr .musicChannelDone .sfxChannel - call Music2_GetNextMusicByte + call Audio1_GetNextMusicByte ld [wc0ea], a ; store first param - call Music2_GetNextMusicByte + call Audio1_GetNextMusicByte ld [wc0eb], a ; store second param xor a ld [wc0d2], a ; clear RAM @@ -487,22 +487,22 @@ Music2_tempo: ; 0x93ba ld [wc0d4], a ld [wc0d5], a .musicChannelDone - jp Music2_endchannel + jp Audio1_endchannel -Music2_stereopanning: ; 0x93fa +Audio1_stereopanning: ; 0x93fa cp $ee ; is this command a stereopanning? - jr nz, Music2_unknownmusic0xef ; no - call Music2_GetNextMusicByte ; yes + jr nz, Audio1_unknownmusic0xef ; no + call Audio1_GetNextMusicByte ; yes ld [wc004], a ; store panning - jp Music2_endchannel + jp Audio1_endchannel ; this appears to never be used -Music2_unknownmusic0xef: ; 0x9407 +Audio1_unknownmusic0xef: ; 0x9407 cp $ef ; is this command an unknownmusic0xef? - jr nz, Music2_dutycycle ; no - call Music2_GetNextMusicByte ; yes + jr nz, Audio1_dutycycle ; no + call Audio1_GetNextMusicByte ; yes push bc - call Music2_9876 + call Audio1_9876 pop bc ld a, [wc003] and a @@ -512,12 +512,12 @@ Music2_unknownmusic0xef: ; 0x9407 xor a ld [wc02d], a .skip - jp Music2_endchannel + jp Audio1_endchannel -Music2_dutycycle: ; 0x9426 +Audio1_dutycycle: ; 0x9426 cp $fc ; is this command a dutycycle? - jr nz, Music2_volume ; no - call Music2_GetNextMusicByte ; yes + jr nz, Audio1_volume ; no + call Audio1_GetNextMusicByte ; yes ld b, $0 ld hl, wc046 add hl, bc @@ -529,48 +529,48 @@ Music2_dutycycle: ; 0x9426 ld hl, wc02e add hl, bc set 6, [hl] ; set dutycycle flag - jp Music2_endchannel + jp Audio1_endchannel -Music2_volume: ; 0x9444 +Audio1_volume: ; 0x9444 cp $f0 ; is this command a volume? - jr nz, Music2_executemusic ; no - call Music2_GetNextMusicByte ; yes + jr nz, Audio1_executemusic ; no + call Audio1_GetNextMusicByte ; yes ld [$ff24], a ; store volume - jp Music2_endchannel + jp Audio1_endchannel -Music2_executemusic: ; 0x9450 +Audio1_executemusic: ; 0x9450 cp $f8 ; is this command an executemusic? - jr nz, Music2_octave ; no + jr nz, Audio1_octave ; no ld b, $0 ; yes ld hl, wc036 add hl, bc set 0, [hl] - jp Music2_endchannel + jp Audio1_endchannel -Music2_octave: ; 0x945f +Audio1_octave: ; 0x945f and $f0 cp $e0 ; is this command an octave? - jr nz, Music2_unknownsfx0x20 ; no + jr nz, Audio1_unknownsfx0x20 ; no ld hl, wc0d6 ; yes ld b, $0 add hl, bc ld a, d and $f ld [hl], a ; store low nibble as octave - jp Music2_endchannel + jp Audio1_endchannel -Music2_unknownsfx0x20: ; 0x9472 +Audio1_unknownsfx0x20: ; 0x9472 cp $20 ; is this command an unknownsfx0x20? - jr nz, Music2_unknownsfx0x10 ; no + jr nz, Audio1_unknownsfx0x10 ; no ld a, c cp CH3 ; is this a noise or sfx channel? - jr c, Music2_unknownsfx0x10 ; no + jr c, Audio1_unknownsfx0x10 ; no ld b, $0 ld hl, wc036 add hl, bc bit 0, [hl] - jr nz, Music2_unknownsfx0x10 ; no - call Music2_notelength ; yes + jr nz, Audio1_unknownsfx0x10 ; no + call Audio1_notelength ; yes ld d, a ld b, $0 ld hl, wc03e @@ -579,56 +579,56 @@ Music2_unknownsfx0x20: ; 0x9472 or d ld d, a ld b, $1 - call Music2_9838 + call Audio1_9838 ld [hl], d - call Music2_GetNextMusicByte + call Audio1_GetNextMusicByte ld d, a ld b, $2 - call Music2_9838 + call Audio1_9838 ld [hl], d - call Music2_GetNextMusicByte + call Audio1_GetNextMusicByte ld e, a ld a, c cp CH7 ld a, $0 jr z, .sfxNoiseChannel ; only two params for noise channel push de - call Music2_GetNextMusicByte + call Audio1_GetNextMusicByte pop de .sfxNoiseChannel ld d, a push de - call Music2_9629 - call Music2_95f8 + call Audio1_9629 + call Audio1_95f8 pop de - call Music2_964b + call Audio1_964b ret -Music2_unknownsfx0x10: +Audio1_unknownsfx0x10: ld a, c cp CH4 - jr c, Music2_note ; if not a sfx + jr c, Audio1_note ; if not a sfx ld a, d cp $10 ; is this command a unknownsfx0x10? - jr nz, Music2_note ; no + jr nz, Audio1_note ; no ld b, $0 ld hl, wc036 add hl, bc bit 0, [hl] - jr nz, Music2_note ; no - call Music2_GetNextMusicByte ; yes + jr nz, Audio1_note ; no + call Audio1_GetNextMusicByte ; yes ld [$ff10], a - jp Music2_endchannel + jp Audio1_endchannel -Music2_note: +Audio1_note: ld a, c cp CH3 - jr nz, Music2_notelength ; if not noise channel + jr nz, Audio1_notelength ; if not noise channel ld a, d and $f0 cp $b0 ; is this command a dnote? - jr z, Music2_dnote ; yes - jr nc, Music2_notelength ; no + jr z, Audio1_dnote ; yes + jr nc, Audio1_notelength ; no swap a ld b, a ld a, d @@ -639,24 +639,24 @@ Music2_note: push bc jr asm_94fd -Music2_dnote: +Audio1_dnote: ld a, d and $f push af push bc - call Music2_GetNextMusicByte ; get dnote instrument + call Audio1_GetNextMusicByte ; get dnote instrument asm_94fd ld d, a ld a, [wc003] and a jr nz, .asm_9508 ld a, d - call Music2_9876 + call Audio1_9876 .asm_9508 pop bc pop de -Music2_notelength: ; 0x950a +Audio1_notelength: ; 0x950a ld a, d push af and $f @@ -668,7 +668,7 @@ Music2_notelength: ; 0x950a add hl, bc ld a, [hl] ld l, b - call Music2_9847 + call Audio1_9847 ld a, c cp CH4 jr nc, .sfxChannel @@ -682,7 +682,7 @@ Music2_notelength: ; 0x950a ld e, $0 cp CH7 jr z, .skip ; if noise channel - call Music2_9693 + call Audio1_9693 ld a, [wc0ea] ld d, a ld a, [wc0eb] @@ -693,7 +693,7 @@ Music2_notelength: ; 0x950a ld hl, wc0ce add hl, bc ld l, [hl] - call Music2_9847 + call Audio1_9847 ld e, l ld d, h ld hl, wc0ce @@ -706,15 +706,15 @@ Music2_notelength: ; 0x950a ld hl, wc036 add hl, bc bit 0, [hl] - jr nz, Music2_notepitch + jr nz, Audio1_notepitch ld hl, wc02e add hl, bc bit 2, [hl] - jr z, Music2_notepitch + jr z, Audio1_notepitch pop hl ret -Music2_notepitch: ; 0x9568 +Audio1_notepitch: ; 0x9568 pop af and $f0 cp $c0 ; compare to rest @@ -744,7 +744,7 @@ Music2_notepitch: ; 0x9568 jr .done .notSfxChannel3 ld b, $2 - call Music2_9838 + call Audio1_9838 ld a, $8 ld [hli], a inc hl @@ -758,13 +758,13 @@ Music2_notepitch: ; 0x9568 ld hl, wc0d6 add hl, bc ld b, [hl] - call Music2_9858 + call Audio1_9858 ld b, $0 ld hl, wc02e add hl, bc bit 4, [hl] jr z, .asm_95b8 - call Music2_978f + call Audio1_978f .asm_95b8 push de ld a, c @@ -787,10 +787,10 @@ Music2_notepitch: ; 0x9568 add hl, bc ld d, [hl] ld b, $2 - call Music2_9838 + call Audio1_9838 ld [hl], d - call Music2_9629 - call Music2_95f8 + call Audio1_9629 + call Audio1_95f8 pop de ld b, $0 ld hl, wc02e @@ -804,10 +804,10 @@ Music2_notepitch: ; 0x9568 ld hl, wc066 add hl, bc ld [hl], e - call Music2_964b + call Audio1_964b ret -Music2_95f8: ; 0x95f8 +Audio1_95f8: ; 0x95f8 ld b, $0 ld hl, Unknown_9b27 add hl, bc @@ -841,7 +841,7 @@ Music2_95f8: ; 0x95f8 ld [$ff25], a ret -Music2_9629: ; 0x9629 +Audio1_9629: ; 0x9629 ld b, $0 ld hl, wc0b6 add hl, bc @@ -861,11 +861,11 @@ Music2_9629: ; 0x9629 ld d, a .channel3 ld b, $1 - call Music2_9838 + call Audio1_9838 ld [hl], d ret -Music2_964b: ; 0x964b +Audio1_964b: ; 0x964b ld a, c cp CH2 jr z, .channel3 @@ -883,7 +883,7 @@ Music2_964b: ; 0x964b add a ld d, $0 ld e, a - ld hl, Music2_WavePointers + ld hl, Audio1_WavePointers add hl, de ld e, [hl] inc hl @@ -909,15 +909,15 @@ Music2_964b: ; 0x964b and $c7 ld d, a ld b, $3 - call Music2_9838 + call Audio1_9838 ld [hl], e inc hl ld [hl], d - call Music2_96b5 + call Audio1_96b5 ret -Music2_9693: ; 0x9693 - call Music2_96e5 +Audio1_9693: ; 0x9693 + call Audio1_96e5 jr nc, .asm_96ab ld d, $0 ld a, [wc0f2] @@ -937,8 +937,8 @@ Music2_9693: ; 0x9693 .asm_96b4 ret -Music2_96b5: ; 0x96b5 - call Music2_96e5 +Audio1_96b5: ; 0x96b5 + call Audio1_96e5 jr nc, .asm_96c6 ld a, [wc0f1] add e @@ -953,8 +953,8 @@ Music2_96b5: ; 0x96b5 .asm_96c6 ret -Music2_96c7: ; 0x96c7 - call Music2_96e5 +Audio1_96c7: ; 0x96c7 + call Audio1_96e5 jr nc, .asm_96e2 ld hl, wc006 ld e, c @@ -976,7 +976,7 @@ Music2_96c7: ; 0x96c7 ccf ret -Music2_96e5: ; 0x96e5 +Audio1_96e5: ; 0x96e5 ld a, [wc02a] cp $14 jr nc, .asm_96ee @@ -993,7 +993,7 @@ Music2_96e5: ; 0x96e5 scf ret -Music2_ApplyPitchBend: ; 0x96f9 +Audio1_ApplyPitchBend: ; 0x96f9 ld hl, wc02e add hl, bc bit 5, [hl] @@ -1083,7 +1083,7 @@ Music2_ApplyPitchBend: ; 0x96f9 add hl, bc ld [hl], d ld b, $3 - call Music2_9838 + call Audio1_9838 ld a, e ld [hli], a ld [hl], d @@ -1095,7 +1095,7 @@ Music2_ApplyPitchBend: ; 0x96f9 res 5, [hl] ret -Music2_978f: ; 0x978f +Audio1_978f: ; 0x978f ld hl, wc096 add hl, bc ld [hl], d @@ -1184,7 +1184,7 @@ Music2_978f: ; 0x978f ld [hl], a ret -Music2_ApplyDutyCycle: ; 0x980d +Audio1_ApplyDutyCycle: ; 0x980d ld b, $0 ld hl, wc046 add hl, bc @@ -1195,14 +1195,14 @@ Music2_ApplyDutyCycle: ; 0x980d and $c0 ld d, a ld b, $1 - call Music2_9838 + call Audio1_9838 ld a, [hl] and $3f or d ld [hl], a ret -Music2_GetNextMusicByte: ; 0x9825 +Audio1_GetNextMusicByte: ; 0x9825 ld d, $0 ld a, c add a @@ -1220,7 +1220,7 @@ Music2_GetNextMusicByte: ; 0x9825 ld [hl], d ret -Music2_9838: ; 0x9838 +Audio1_9838: ; 0x9838 ld a, c ld hl, Unknown_9b17 add l @@ -1234,7 +1234,7 @@ Music2_9838: ; 0x9838 ld h, $ff ret -Music2_9847: ; 0x9847 +Audio1_9847: ; 0x9847 ld h, $0 .loop srl a @@ -1249,13 +1249,13 @@ Music2_9847: ; 0x9847 .done ret -Music2_9858: ; 0x9858 +Audio1_9858: ; 0x9858 ld h, $0 ld l, a add hl, hl ld d, h ld e, l - ld hl, Music2_Pitches + ld hl, Audio1_Pitches add hl, de ld e, [hl] inc hl @@ -1274,16 +1274,16 @@ Music2_9858: ; 0x9858 ld d, a ret -Music2_9876:: ; 0x9876 +Audio1_9876:: ; 0x9876 ld [wc001], a cp $ff - jp z, Music2_9a34 + jp z, Audio1_9a34 cp $b9 - jp z, Music2_994e - jp c, Music2_994e + jp z, Audio1_994e + jp c, Audio1_994e cp $fe jr z, .asm_988d - jp nc, Music2_994e + jp nc, Audio1_994e .asm_988d xor a ld [wc000], a @@ -1293,53 +1293,53 @@ Music2_9876:: ; 0x9876 ld [wc0e7], a ld d, $8 ld hl, wc016 - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc006 - call FillMusicRAM2 + call FillAudioRAM1 ld d, $4 ld hl, wc026 - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc02e - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc03e - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc046 - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc04e - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc056 - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc05e - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc066 - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc06e - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc036 - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc076 - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc07e - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc086 - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc08e - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc096 - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc09e - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc0a6 - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc0ae - call FillMusicRAM2 + call FillAudioRAM1 ld a, $1 ld hl, wc0be - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc0b6 - call FillMusicRAM2 + call FillAudioRAM1 ld hl, wc0c6 - call FillMusicRAM2 + call FillAudioRAM1 ld [wc0e8], a ld a, $ff ld [wc004], a @@ -1355,16 +1355,16 @@ Music2_9876:: ; 0x9876 ld [$ff1a], a ld a, $77 ld [$ff24], a - jp Music2_9a8f + jp Audio1_9a8f -Music2_994e: ; 0x994e +Audio1_994e: ; 0x994e ld l, a ld e, a ld h, $0 ld d, h add hl, hl add hl, de - ld de, SFX_Headers_02 + ld de, SFX_Headers_1 add hl, de ld a, h ld [wc0ec], a @@ -1504,11 +1504,11 @@ Music2_994e: ; 0x994e .asm_9a2b ld a, c and a - jp z, Music2_9a8f + jp z, Audio1_9a8f dec c jp .asm_9967 -Music2_9a34: ; 0x9a34 +Audio1_9a34: ; 0x9a34 ld a, $80 ld [$ff26], a ld [$ff1a], a @@ -1536,11 +1536,11 @@ Music2_9a34: ; 0x9a34 ld [wc0e7], a ld d, $a0 ld hl, wc006 - call FillMusicRAM2 + call FillAudioRAM1 ld a, $1 ld d, $18 ld hl, wc0b6 - call FillMusicRAM2 + call FillAudioRAM1 ld [wc0e8], a ld [wc0ea], a ld a, $ff @@ -1548,7 +1548,7 @@ Music2_9a34: ; 0x9a34 ret ; fills d bytes at hl with a -FillMusicRAM2: ; 0x9a89 +FillAudioRAM1: ; 0x9a89 ld b, d .loop ld [hli], a @@ -1556,7 +1556,7 @@ FillMusicRAM2: ; 0x9a89 jr nz, .loop ret -Music2_9a8f: ; 0x9a8f +Audio1_9a8f: ; 0x9a8f ld a, [wc001] ld l, a ld e, a @@ -1564,7 +1564,7 @@ Music2_9a8f: ; 0x9a8f ld d, h add hl, hl add hl, de - ld de, SFX_Headers_02 + ld de, SFX_Headers_1 add hl, de ld e, l ld d, h @@ -1637,7 +1637,7 @@ Music2_9a8f: ; 0x9a8f ld [hli], a ld [hl], a ld hl, wc012 ; sfx noise channel pointer - ld de, Noise2_endchannel + ld de, Noise1_endchannel ld [hl], e inc hl ld [hl], d ; overwrite pointer to point to endchannel @@ -1651,7 +1651,7 @@ Music2_9a8f: ; 0x9a8f .asm_9b15 ret -Noise2_endchannel: ; 0x9b16 +Noise1_endchannel: ; 0x9b16 endchannel Unknown_9b17: ; 0x9b17 @@ -1666,7 +1666,7 @@ Unknown_9b27: ; 0x9b27 db $11, $22, $44, $88 ; channels 0-3 db $11, $22, $44, $88 ; channels 4-7 -Music2_Pitches: ; 0x9b2f +Audio1_Pitches: ; 0x9b2f dw $F82C ; C_ dw $F89D ; C# dw $F907 ; D_ diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 5940b55a..62b82cec 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1,6 +1,6 @@ ; The second of three duplicated sound engines. -Music8_UpdateMusic:: ; 21879 (8:5879) +Audio2_UpdateMusic:: ; 21879 (8:5879) ld c, CH0 .loop ld b, $0 @@ -26,7 +26,7 @@ Music8_UpdateMusic:: ; 21879 (8:5879) ld [$ff1a], a jr .nextChannel .applyAffects - call Music8_ApplyMusicAffects + call Audio2_ApplyMusicAffects .nextChannel ld a, c inc c @@ -42,13 +42,13 @@ Music8_UpdateMusic:: ; 21879 (8:5879) ; 3: a toggle used only by this routine for vibrato ; 4: pitchbend flag ; 6: dutycycle flag -Music8_ApplyMusicAffects: ; 218ae (8:58ae) +Audio2_ApplyMusicAffects: ; 218ae (8:58ae) ld b, $0 ld hl, wc0b6 ; delay until next note add hl, bc ld a, [hl] cp $1 ; if the delay is 1, play next note - jp z, Music8_PlayNextNote + jp z, Audio2_PlayNextNote dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c @@ -65,7 +65,7 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae) add hl, bc bit 6, [hl] ; dutycycle jr z, .checkForExecuteMusic - call Music8_ApplyDutyCycle + call Audio2_ApplyDutyCycle .checkForExecuteMusic ld b, $0 ld hl, wc036 @@ -81,7 +81,7 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae) add hl, bc bit 4, [hl] ; pitchbend jr z, .checkVibratoDelay - jp Music8_ApplyPitchBend + jp Audio2_ApplyPitchBend .checkVibratoDelay ld hl, wc04e ; vibrato delay add hl, bc @@ -141,14 +141,14 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae) .done ld d, a ld b, $3 - call Music8_21ff7 + call Audio2_21ff7 ld [hl], d ret ; this routine executes all music commands that take up no time, ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached -Music8_PlayNextNote: ; 21946 (8:5946) +Audio2_PlayNextNote: ; 21946 (8:5946) ld hl, wc06e add hl, bc ld a, [hl] @@ -166,14 +166,14 @@ Music8_PlayNextNote: ; 21946 (8:5946) bit 7, a ret nz .beginChecks - call Music8_endchannel + call Audio2_endchannel ret -Music8_endchannel: ; 21967 (8:5967) - call Music8_GetNextMusicByte +Audio2_endchannel: ; 21967 (8:5967) + call Audio2_GetNextMusicByte ld d, a cp $ff ; is this command an endchannel? - jp nz, Music8_callchannel ; no + jp nz, Audio2_callchannel ; no ld b, $0 ; yes ld hl, wc02e add hl, bc @@ -223,7 +223,7 @@ Music8_endchannel: ; 21967 (8:5967) inc de ld a, [de] ld [hl], a ; loads channel address to return to - jp Music8_endchannel + jp Audio2_endchannel .asm_219c0 ld hl, Unknown_222de add hl, bc @@ -245,7 +245,7 @@ Music8_endchannel: ; 21967 (8:5967) ld a, c cp CH4 jr z, .asm_219e6 - call Music8_21e6d + call Audio2_21e6d ret c .asm_219e6 ld a, [wc005] @@ -258,12 +258,12 @@ Music8_endchannel: ; 21967 (8:5967) ld [hl], b ret -Music8_callchannel: ; 219f5 (8:59f5) +Audio2_callchannel: ; 219f5 (8:59f5) cp $fd ; is this command a callchannel? - jp nz, Music8_loopchannel ; no - call Music8_GetNextMusicByte ; yes + jp nz, Audio2_loopchannel ; no + call Audio2_GetNextMusicByte ; yes push af - call Music8_GetNextMusicByte + call Audio2_GetNextMusicByte ld d, a pop af ld e, a @@ -293,12 +293,12 @@ Music8_callchannel: ; 219f5 (8:59f5) ld hl, wc02e add hl, bc set 1, [hl] ; set the call flag - jp Music8_endchannel + jp Audio2_endchannel -Music8_loopchannel: ; 21a2a (8:5a2a) +Audio2_loopchannel: ; 21a2a (8:5a2a) cp $fe ; is this command a loopchannel? - jp nz, Music8_notetype ; no - call Music8_GetNextMusicByte ; yes + jp nz, Audio2_notetype ; no + call Audio2_GetNextMusicByte ; yes ld e, a and a jr z, .infiniteLoop @@ -310,17 +310,17 @@ Music8_loopchannel: ; 21a2a (8:5a2a) jr nz, .loopAgain ld a, $1 ; if no more loops to make, ld [hl], a - call Music8_GetNextMusicByte ; skip pointer - call Music8_GetNextMusicByte - jp Music8_endchannel + call Audio2_GetNextMusicByte ; skip pointer + call Audio2_GetNextMusicByte + jp Audio2_endchannel .loopAgain ; inc loop count inc a ld [hl], a ; fall through .infiniteLoop ; overwrite current address with pointer - call Music8_GetNextMusicByte + call Audio2_GetNextMusicByte push af - call Music8_GetNextMusicByte + call Audio2_GetNextMusicByte ld b, a ld d, $0 ld a, c @@ -331,12 +331,12 @@ Music8_loopchannel: ; 21a2a (8:5a2a) pop af ld [hli], a ld [hl], b - jp Music8_endchannel + jp Audio2_endchannel -Music8_notetype: ; 21a65 (8:5a65) +Audio2_notetype: ; 21a65 (8:5a65) and $f0 cp $d0 ; is this command a notetype? - jp nz, Music8_toggleperfectpitch ; no + jp nz, Audio2_toggleperfectpitch ; no ld a, d ; yes and $f ld b, $0 @@ -346,7 +346,7 @@ Music8_notetype: ; 21a65 (8:5a65) ld a, c cp CH3 jr z, .noiseChannel ; noise channel has 0 params - call Music8_GetNextMusicByte + call Audio2_GetNextMusicByte ld d, a ld a, c cp CH2 @@ -375,24 +375,24 @@ Music8_notetype: ; 21a65 (8:5a65) add hl, bc ld [hl], d .noiseChannel - jp Music8_endchannel + jp Audio2_endchannel -Music8_toggleperfectpitch: ; 21aa4 (8:5aa4) +Audio2_toggleperfectpitch: ; 21aa4 (8:5aa4) ld a, d cp $e8 ; is this command a toggleperfectpitch? - jr nz, Music8_vibrato ; no + jr nz, Audio2_vibrato ; no ld b, $0 ; yes ld hl, wc02e add hl, bc ld a, [hl] xor $1 ld [hl], a ; flip bit 0 of wc02e - jp Music8_endchannel + jp Audio2_endchannel -Music8_vibrato: ; 21ab6 (8:5ab6) +Audio2_vibrato: ; 21ab6 (8:5ab6) cp $ea ; is this command a vibrato? - jr nz, Music8_pitchbend ; no - call Music8_GetNextMusicByte ; yes + jr nz, Audio2_pitchbend ; no + call Audio2_GetNextMusicByte ; yes ld b, $0 ld hl, wc04e add hl, bc @@ -400,7 +400,7 @@ Music8_vibrato: ; 21ab6 (8:5ab6) ld hl, wc06e add hl, bc ld [hl], a ; store delay - call Music8_GetNextMusicByte + call Audio2_GetNextMusicByte ld d, a and $f0 swap a @@ -421,24 +421,24 @@ Music8_vibrato: ; 21ab6 (8:5ab6) swap a or d ld [hl], a ; store depth as both high and low nibbles - jp Music8_endchannel + jp Audio2_endchannel -Music8_pitchbend: ; 21aee (8:5aee) +Audio2_pitchbend: ; 21aee (8:5aee) cp $eb ; is this command a pitchbend? - jr nz, Music8_duty ; no - call Music8_GetNextMusicByte ; yes + jr nz, Audio2_duty ; no + call Audio2_GetNextMusicByte ; yes ld b, $0 ld hl, wc076 add hl, bc ld [hl], a ; store first param - call Music8_GetNextMusicByte + call Audio2_GetNextMusicByte ld d, a and $f0 swap a ld b, a ld a, d and $f - call Music8_22017 + call Audio2_22017 ld b, $0 ld hl, wc0a6 add hl, bc @@ -450,14 +450,14 @@ Music8_pitchbend: ; 21aee (8:5aee) ld hl, wc02e add hl, bc set 4, [hl] ; set pitchbend flag - call Music8_GetNextMusicByte + call Audio2_GetNextMusicByte ld d, a - jp Music8_notelength + jp Audio2_notelength -Music8_duty: ; 21b26 (8:5b26) +Audio2_duty: ; 21b26 (8:5b26) cp $ec ; is this command a duty? - jr nz, Music8_tempo ; no - call Music8_GetNextMusicByte ; yes + jr nz, Audio2_tempo ; no + call Audio2_GetNextMusicByte ; yes rrca rrca and $c0 @@ -465,17 +465,17 @@ Music8_duty: ; 21b26 (8:5b26) ld hl, wc03e add hl, bc ld [hl], a ; store duty - jp Music8_endchannel + jp Audio2_endchannel -Music8_tempo: ; 21b3b (8:5b3b) +Audio2_tempo: ; 21b3b (8:5b3b) cp $ed ; is this command a tempo? - jr nz, Music8_stereopanning ; no + jr nz, Audio2_stereopanning ; no ld a, c ; yes cp CH4 jr nc, .sfxChannel - call Music8_GetNextMusicByte + call Audio2_GetNextMusicByte ld [wc0e8], a ; store first param - call Music8_GetNextMusicByte + call Audio2_GetNextMusicByte ld [wc0e9], a ; store second param xor a ld [wc0ce], a ; clear RAM @@ -484,9 +484,9 @@ Music8_tempo: ; 21b3b (8:5b3b) ld [wc0d1], a jr .musicChannelDone .sfxChannel - call Music8_GetNextMusicByte + call Audio2_GetNextMusicByte ld [wc0ea], a ; store first param - call Music8_GetNextMusicByte + call Audio2_GetNextMusicByte ld [wc0eb], a ; store second param xor a ld [wc0d2], a ; clear RAM @@ -494,22 +494,22 @@ Music8_tempo: ; 21b3b (8:5b3b) ld [wc0d4], a ld [wc0d5], a .musicChannelDone - jp Music8_endchannel + jp Audio2_endchannel -Music8_stereopanning: ; 21b7b (8:5b7b) +Audio2_stereopanning: ; 21b7b (8:5b7b) cp $ee ; is this command a stereopanning? - jr nz, Music8_unknownmusic0xef ; no - call Music8_GetNextMusicByte ; yes + jr nz, Audio2_unknownmusic0xef ; no + call Audio2_GetNextMusicByte ; yes ld [wc004], a ; store panning - jp Music8_endchannel + jp Audio2_endchannel ; this appears to never be used -Music8_unknownmusic0xef: ; 21b88 (8:5b88) +Audio2_unknownmusic0xef: ; 21b88 (8:5b88) cp $ef ; is this command an unknownmusic0xef? - jr nz, Music8_dutycycle ; no - call Music8_GetNextMusicByte ; yes + jr nz, Audio2_dutycycle ; no + call Audio2_GetNextMusicByte ; yes push bc - call Music8_22035 + call Audio2_22035 pop bc ld a, [wc003] and a @@ -519,12 +519,12 @@ Music8_unknownmusic0xef: ; 21b88 (8:5b88) xor a ld [wc02d], a .skip - jp Music8_endchannel + jp Audio2_endchannel -Music8_dutycycle: ; 21ba7 (8:5ba7) +Audio2_dutycycle: ; 21ba7 (8:5ba7) cp $fc ; is this command a dutycycle? - jr nz, Music8_volume ; no - call Music8_GetNextMusicByte ; yes + jr nz, Audio2_volume ; no + call Audio2_GetNextMusicByte ; yes ld b, $0 ld hl, wc046 add hl, bc @@ -536,48 +536,48 @@ Music8_dutycycle: ; 21ba7 (8:5ba7) ld hl, wc02e add hl, bc set 6, [hl] ; set dutycycle flag - jp Music8_endchannel + jp Audio2_endchannel -Music8_volume: ; 21bc5 (8:5bc5) +Audio2_volume: ; 21bc5 (8:5bc5) cp $f0 ; is this command a volume? - jr nz, Music8_executemusic ; no - call Music8_GetNextMusicByte ; yes + jr nz, Audio2_executemusic ; no + call Audio2_GetNextMusicByte ; yes ld [$ff24], a ; store volume - jp Music8_endchannel + jp Audio2_endchannel -Music8_executemusic: ; 21bd1 (8:5bd1) +Audio2_executemusic: ; 21bd1 (8:5bd1) cp $f8 ; is this command an executemusic? - jr nz, Music8_octave ; no + jr nz, Audio2_octave ; no ld b, $0 ; yes ld hl, wc036 add hl, bc set 0, [hl] - jp Music8_endchannel + jp Audio2_endchannel -Music8_octave: ; 21be0 (8:5be0) +Audio2_octave: ; 21be0 (8:5be0) and $f0 cp $e0 ; is this command an octave? - jr nz, Music8_unknownsfx0x20 ; no + jr nz, Audio2_unknownsfx0x20 ; no ld hl, wc0d6 ; yes ld b, $0 add hl, bc ld a, d and $f ld [hl], a ; store low nibble as octave - jp Music8_endchannel + jp Audio2_endchannel -Music8_unknownsfx0x20: ; 21bf3 +Audio2_unknownsfx0x20: ; 21bf3 cp $20 ; is this command an unknownsfx0x20? - jr nz, Music8_unknownsfx0x10 ; no + jr nz, Audio2_unknownsfx0x10 ; no ld a, c cp CH3 ; is this a noise or sfx channel? - jr c, Music8_unknownsfx0x10 ; no + jr c, Audio2_unknownsfx0x10 ; no ld b, $0 ld hl, wc036 add hl, bc bit 0, [hl] - jr nz, Music8_unknownsfx0x10 ; no - call Music8_notelength + jr nz, Audio2_unknownsfx0x10 ; no + call Audio2_notelength ld d, a ld b, $0 ld hl, wc03e @@ -586,56 +586,56 @@ Music8_unknownsfx0x20: ; 21bf3 or d ld d, a ld b, $1 - call Music8_21ff7 + call Audio2_21ff7 ld [hl], d - call Music8_GetNextMusicByte + call Audio2_GetNextMusicByte ld d, a ld b, $2 - call Music8_21ff7 + call Audio2_21ff7 ld [hl], d - call Music8_GetNextMusicByte + call Audio2_GetNextMusicByte ld e, a ld a, c cp CH7 ld a, $0 jr z, .sfxNoiseChannel ; only two params for noise channel push de - call Music8_GetNextMusicByte + call Audio2_GetNextMusicByte pop de .sfxNoiseChannel ld d, a push de - call Music8_21daa - call Music8_21d79 + call Audio2_21daa + call Audio2_21d79 pop de - call Music8_21dcc + call Audio2_21dcc ret -Music8_unknownsfx0x10: ; 21c40 (8:5c40) +Audio2_unknownsfx0x10: ; 21c40 (8:5c40) ld a, c cp CH4 - jr c, Music8_note ; if not a sfx + jr c, Audio2_note ; if not a sfx ld a, d cp $10 ; is this command a unknownsfx0x10? - jr nz, Music8_note ; no + jr nz, Audio2_note ; no ld b, $0 ld hl, wc036 add hl, bc bit 0, [hl] - jr nz, Music8_note ; no - call Music8_GetNextMusicByte ; yes + jr nz, Audio2_note ; no + call Audio2_GetNextMusicByte ; yes ld [$ff10], a - jp Music8_endchannel + jp Audio2_endchannel -Music8_note: ; 21c5c (8:5c5c) +Audio2_note: ; 21c5c (8:5c5c) ld a, c cp CH3 - jr nz, Music8_notelength ; if not noise channel + jr nz, Audio2_notelength ; if not noise channel ld a, d and $f0 cp $b0 ; is this command a dnote? - jr z, Music8_dnote ; yes - jr nc, Music8_notelength ; no + jr z, Audio2_dnote ; yes + jr nc, Audio2_notelength ; no swap a ld b, a ld a, d @@ -646,24 +646,24 @@ Music8_note: ; 21c5c (8:5c5c) push bc jr asm_21c7e -Music8_dnote: ; 21c76 (8:5c76) +Audio2_dnote: ; 21c76 (8:5c76) ld a, d and $f push af push bc - call Music8_GetNextMusicByte ; get dnote instrument + call Audio2_GetNextMusicByte ; get dnote instrument asm_21c7e ld d, a ld a, [wc003] and a jr nz, .asm_21c89 ld a, d - call Music8_22035 + call Audio2_22035 .asm_21c89 pop bc pop de -Music8_notelength: ; 21c8b (8:5c8b) +Audio2_notelength: ; 21c8b (8:5c8b) ld a, d push af and $f @@ -675,7 +675,7 @@ Music8_notelength: ; 21c8b (8:5c8b) add hl, bc ld a, [hl] ld l, b - call Music8_22006 + call Audio2_22006 ld a, c cp CH4 jr nc, .sfxChannel @@ -689,7 +689,7 @@ Music8_notelength: ; 21c8b (8:5c8b) ld e, $0 cp CH7 jr z, .skip ; if noise channel - call Music8_21e2f + call Audio2_21e2f ld a, [wc0ea] ld d, a ld a, [wc0eb] @@ -700,7 +700,7 @@ Music8_notelength: ; 21c8b (8:5c8b) ld hl, wc0ce add hl, bc ld l, [hl] - call Music8_22006 + call Audio2_22006 ld e, l ld d, h ld hl, wc0ce @@ -713,15 +713,15 @@ Music8_notelength: ; 21c8b (8:5c8b) ld hl, wc036 add hl, bc bit 0, [hl] - jr nz, Music8_notepitch + jr nz, Audio2_notepitch ld hl, wc02e add hl, bc bit 2, [hl] - jr z, Music8_notepitch + jr z, Audio2_notepitch pop hl ret -Music8_notepitch: ; 21ce9 (8:5ce9) +Audio2_notepitch: ; 21ce9 (8:5ce9) pop af and $f0 cp $c0 ; compare to rest @@ -751,7 +751,7 @@ Music8_notepitch: ; 21ce9 (8:5ce9) jr .done .notSfxChannel3 ld b, $2 - call Music8_21ff7 + call Audio2_21ff7 ld a, $8 ld [hli], a inc hl @@ -765,13 +765,13 @@ Music8_notepitch: ; 21ce9 (8:5ce9) ld hl, wc0d6 add hl, bc ld b, [hl] - call Music8_22017 + call Audio2_22017 ld b, $0 ld hl, wc02e add hl, bc bit 4, [hl] jr z, .asm_21d39 - call Music8_21f4e + call Audio2_21f4e .asm_21d39 push de ld a, c @@ -794,10 +794,10 @@ Music8_notepitch: ; 21ce9 (8:5ce9) add hl, bc ld d, [hl] ld b, $2 - call Music8_21ff7 + call Audio2_21ff7 ld [hl], d - call Music8_21daa - call Music8_21d79 + call Audio2_21daa + call Audio2_21d79 pop de ld b, $0 ld hl, wc02e @@ -811,10 +811,10 @@ Music8_notepitch: ; 21ce9 (8:5ce9) ld hl, wc066 add hl, bc ld [hl], e - call Music8_21dcc + call Audio2_21dcc ret -Music8_21d79: ; 21d79 (8:5d79) +Audio2_21d79: ; 21d79 (8:5d79) ld b, $0 ld hl, Unknown_222e6 add hl, bc @@ -848,7 +848,7 @@ Music8_21d79: ; 21d79 (8:5d79) ld [$ff25], a ret -Music8_21daa: ; 21daa (8:5daa) +Audio2_21daa: ; 21daa (8:5daa) ld b, $0 ld hl, wc0b6 add hl, bc @@ -868,11 +868,11 @@ Music8_21daa: ; 21daa (8:5daa) ld d, a .channel3 ld b, $1 - call Music8_21ff7 + call Audio2_21ff7 ld [hl], d ret -Music8_21dcc: ; 21dcc (8:5dcc) +Audio2_21dcc: ; 21dcc (8:5dcc) ld a, c cp CH2 jr z, .channel3 @@ -890,7 +890,7 @@ Music8_21dcc: ; 21dcc (8:5dcc) add a ld d, $0 ld e, a - ld hl, Music8_WavePointers + ld hl, Audio2_WavePointers add hl, de ld e, [hl] inc hl @@ -916,18 +916,18 @@ Music8_21dcc: ; 21dcc (8:5dcc) and $c7 ld d, a ld b, $3 - call Music8_21ff7 + call Audio2_21ff7 ld [hl], e inc hl ld [hl], d ld a, c cp CH4 jr c, .musicChannel - call Music8_21e56 + call Audio2_21e56 .musicChannel ret -Music8_21e19: ; 21e19 (8:5e19) +Audio2_21e19: ; 21e19 (8:5e19) ld a, c cp CH4 jr nz, .asm_21e2e @@ -941,10 +941,10 @@ Music8_21e19: ; 21e19 (8:5e19) .asm_21e2e ret -Music8_21e2f: ; 21e2f (8:5e2f) - call Music8_21e8b +Audio2_21e2f: ; 21e2f (8:5e2f) + call Audio2_21e8b jr c, .asm_21e39 - call Music8_21e9f + call Audio2_21e9f jr nc, .asm_21e4c .asm_21e39 ld d, $0 @@ -965,10 +965,10 @@ Music8_21e2f: ; 21e2f (8:5e2f) .asm_21e55 ret -Music8_21e56: ; 21e56 (8:5e56) - call Music8_21e8b +Audio2_21e56: ; 21e56 (8:5e56) + call Audio2_21e8b jr c, .asm_21e60 - call Music8_21e9f + call Audio2_21e9f jr nc, .asm_21e6c .asm_21e60 ld a, [wc0f1] @@ -984,8 +984,8 @@ Music8_21e56: ; 21e56 (8:5e56) .asm_21e6c ret -Music8_21e6d: ; 21e6d (8:5e6d) - call Music8_21e8b +Audio2_21e6d: ; 21e6d (8:5e6d) + call Audio2_21e8b jr nc, .asm_21e88 ld hl, wc006 ld e, c @@ -1007,7 +1007,7 @@ Music8_21e6d: ; 21e6d (8:5e6d) ccf ret -Music8_21e8b: ; 21e8b (8:5e8b) +Audio2_21e8b: ; 21e8b (8:5e8b) ld a, [wc02a] cp $14 jr nc, .asm_21e94 @@ -1024,7 +1024,7 @@ Music8_21e8b: ; 21e8b (8:5e8b) scf ret -Music8_21e9f: ; 21e9f (8:5e9f) +Audio2_21e9f: ; 21e9f (8:5e9f) ld a, [wc02d] ld b, a ld a, [wc02a] @@ -1044,7 +1044,7 @@ Music8_21e9f: ; 21e9f (8:5e9f) scf ret -Music8_ApplyPitchBend: ; 21eb8 (8:5eb8) +Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8) ld hl, wc02e add hl, bc bit 5, [hl] @@ -1134,7 +1134,7 @@ Music8_ApplyPitchBend: ; 21eb8 (8:5eb8) add hl, bc ld [hl], d ld b, $3 - call Music8_21ff7 + call Audio2_21ff7 ld a, e ld [hli], a ld [hl], d @@ -1146,7 +1146,7 @@ Music8_ApplyPitchBend: ; 21eb8 (8:5eb8) res 5, [hl] ret -Music8_21f4e: ; 21f4e (8:5f4e) +Audio2_21f4e: ; 21f4e (8:5f4e) ld hl, wc096 add hl, bc ld [hl], d @@ -1235,7 +1235,7 @@ Music8_21f4e: ; 21f4e (8:5f4e) ld [hl], a ret -Music8_ApplyDutyCycle: ; 21fcc (8:5fcc) +Audio2_ApplyDutyCycle: ; 21fcc (8:5fcc) ld b, $0 ld hl, wc046 add hl, bc @@ -1246,14 +1246,14 @@ Music8_ApplyDutyCycle: ; 21fcc (8:5fcc) and $c0 ld d, a ld b, $1 - call Music8_21ff7 + call Audio2_21ff7 ld a, [hl] and $3f or d ld [hl], a ret -Music8_GetNextMusicByte: ; 21fe4 (8:5fe4) +Audio2_GetNextMusicByte: ; 21fe4 (8:5fe4) ld d, $0 ld a, c add a @@ -1271,7 +1271,7 @@ Music8_GetNextMusicByte: ; 21fe4 (8:5fe4) ld [hl], d ret -Music8_21ff7: ; 21ff7 (8:5ff7) +Audio2_21ff7: ; 21ff7 (8:5ff7) ld a, c ld hl, Unknown_222d6 add l @@ -1285,7 +1285,7 @@ Music8_21ff7: ; 21ff7 (8:5ff7) ld h, $ff ret -Music8_22006: ; 22006 (8:6006) +Audio2_22006: ; 22006 (8:6006) ld h, $0 .loop srl a @@ -1300,13 +1300,13 @@ Music8_22006: ; 22006 (8:6006) .done ret -Music8_22017: ; 22017 (8:6017) +Audio2_22017: ; 22017 (8:6017) ld h, $0 ld l, a add hl, hl ld d, h ld e, l - ld hl, Music8_Pitches + ld hl, Audio2_Pitches add hl, de ld e, [hl] inc hl @@ -1325,16 +1325,16 @@ Music8_22017: ; 22017 (8:6017) ld d, a ret -Music8_22035:: ; 22035 (8:6035) +Audio2_22035:: ; 22035 (8:6035) ld [wc001], a cp $ff - jp z, Music8_221f3 + jp z, Audio2_221f3 cp $e9 - jp z, Music8_2210d - jp c, Music8_2210d + jp z, Audio2_2210d + jp c, Audio2_2210d cp $fe jr z, .asm_2204c - jp nc, Music8_2210d + jp nc, Audio2_2210d .asm_2204c xor a ld [wc000], a @@ -1344,53 +1344,53 @@ Music8_22035:: ; 22035 (8:6035) ld [wc0e7], a ld d, $8 ld hl, wc016 - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc006 - call FillMusicRAM8 + call FillAudioRAM2 ld d, $4 ld hl, wc026 - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc02e - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc03e - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc046 - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc04e - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc056 - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc05e - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc066 - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc06e - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc036 - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc076 - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc07e - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc086 - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc08e - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc096 - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc09e - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc0a6 - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc0ae - call FillMusicRAM8 + call FillAudioRAM2 ld a, $1 ld hl, wc0be - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc0b6 - call FillMusicRAM8 + call FillAudioRAM2 ld hl, wc0c6 - call FillMusicRAM8 + call FillAudioRAM2 ld [wc0e8], a ld a, $ff ld [wc004], a @@ -1406,16 +1406,16 @@ Music8_22035:: ; 22035 (8:6035) ld [$ff1a], a ld a, $77 ld [$ff24], a - jp Music8_2224e + jp Audio2_2224e -Music8_2210d: ; 2210d (8:610d) +Audio2_2210d: ; 2210d (8:610d) ld l, a ld e, a ld h, $0 ld d, h add hl, hl add hl, de - ld de, SFX_Headers_08 + ld de, SFX_Headers_2 add hl, de ld a, h ld [wc0ec], a @@ -1555,11 +1555,11 @@ Music8_2210d: ; 2210d (8:610d) .asm_221ea ld a, c and a - jp z, Music8_2224e + jp z, Audio2_2224e dec c jp .asm_22126 -Music8_221f3: ; 221f3 (8:61f3) +Audio2_221f3: ; 221f3 (8:61f3) ld a, $80 ld [$ff26], a ld [$ff1a], a @@ -1587,11 +1587,11 @@ Music8_221f3: ; 221f3 (8:61f3) ld [wc0e7], a ld d, $a0 ld hl, wc006 - call FillMusicRAM8 + call FillAudioRAM2 ld a, $1 ld d, $18 ld hl, wc0b6 - call FillMusicRAM8 + call FillAudioRAM2 ld [wc0e8], a ld [wc0ea], a ld a, $ff @@ -1599,7 +1599,7 @@ Music8_221f3: ; 221f3 (8:61f3) ret ; fills d bytes at hl with a -FillMusicRAM8: ; 22248 (8:6248) +FillAudioRAM2: ; 22248 (8:6248) ld b, d .loop ld [hli], a @@ -1607,7 +1607,7 @@ FillMusicRAM8: ; 22248 (8:6248) jr nz, .loop ret -Music8_2224e: ; 2224e (8:624e) +Audio2_2224e: ; 2224e (8:624e) ld a, [wc001] ld l, a ld e, a @@ -1615,7 +1615,7 @@ Music8_2224e: ; 2224e (8:624e) ld d, h add hl, hl add hl, de - ld de, SFX_Headers_08 + ld de, SFX_Headers_2 add hl, de ld e, l ld d, h @@ -1688,7 +1688,7 @@ Music8_2224e: ; 2224e (8:624e) ld [hli], a ld [hl], a ld hl, wc012 ; sfx noise channel pointer - ld de, Noise8_endchannel + ld de, Noise2_endchannel ld [hl], e inc hl ld [hl], d ; overwrite pointer to point to endchannel @@ -1702,7 +1702,7 @@ Music8_2224e: ; 2224e (8:624e) .asm_222d4 ret -Noise8_endchannel: ; 222d5 (8:62d5) +Noise2_endchannel: ; 222d5 (8:62d5) endchannel Unknown_222d6: ; 222d6 (8:62d6) @@ -1717,7 +1717,7 @@ Unknown_222e6: ; 222e6 (8:62e6) db $11, $22, $44, $88 ; channels 0-3 db $11, $22, $44, $88 ; channels 4-7 -Music8_Pitches: ; 222ee (8:62ee) +Audio2_Pitches: ; 222ee (8:62ee) dw $F82C ; C_ dw $F89D ; C# dw $F907 ; D_ diff --git a/audio/engine_3.asm b/audio/engine_3.asm index 718b6016..93fa62aa 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -1,6 +1,6 @@ ; The third of three duplicated sound engines. -Music1f_UpdateMusic:: ; 7d177 (1f:5177) +Audio3_UpdateMusic:: ; 7d177 (1f:5177) ld c, CH0 .loop ld b, $0 @@ -26,7 +26,7 @@ Music1f_UpdateMusic:: ; 7d177 (1f:5177) ld [$ff1a], a jr .nextChannel .applyAffects - call Music1f_ApplyMusicAffects + call Audio3_ApplyMusicAffects .nextChannel ld a, c inc c ; inc channel number @@ -42,13 +42,13 @@ Music1f_UpdateMusic:: ; 7d177 (1f:5177) ; 3: a toggle used only by this routine for vibrato ; 4: pitchbend flag ; 6: dutycycle flag -Music1f_ApplyMusicAffects: ; 7d1ac (1f:51ac) +Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) ld b, $0 ld hl, wc0b6 ; delay until next note add hl, bc ld a, [hl] cp $1 ; if delay is 1, play next note - jp z, Music1f_PlayNextNote + jp z, Audio3_PlayNextNote dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c @@ -65,7 +65,7 @@ Music1f_ApplyMusicAffects: ; 7d1ac (1f:51ac) add hl, bc bit 6, [hl] ; dutycycle jr z, .checkForExecuteMusic - call Music1f_ApplyDutyCycle + call Audio3_ApplyDutyCycle .checkForExecuteMusic ld b, $0 ld hl, wc036 @@ -81,7 +81,7 @@ Music1f_ApplyMusicAffects: ; 7d1ac (1f:51ac) add hl, bc bit 4, [hl] ; pitchbend jr z, .checkVibratoDelay - jp Music1f_ApplyPitchBend + jp Audio3_ApplyPitchBend .checkVibratoDelay ld hl, wc04e ; vibrato delay add hl, bc @@ -141,14 +141,14 @@ Music1f_ApplyMusicAffects: ; 7d1ac (1f:51ac) .done ld d, a ld b, $3 - call Music1f_7d8ac + call Audio3_7d8ac ld [hl], d ret ; this routine executes all music commands that take up no time, ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached -Music1f_PlayNextNote: ; 7d244 (1f:5244) +Audio3_PlayNextNote: ; 7d244 (1f:5244) ld hl, wc06e add hl, bc ld a, [hl] @@ -159,14 +159,14 @@ Music1f_PlayNextNote: ; 7d244 (1f:5244) add hl, bc res 4, [hl] res 5, [hl] - call Music1f_endchannel + call Audio3_endchannel ret -Music1f_endchannel: ; 7d25a (1f:525a) - call Music1f_GetNextMusicByte +Audio3_endchannel: ; 7d25a (1f:525a) + call Audio3_GetNextMusicByte ld d, a cp $ff ; is this command an endchannel? - jp nz, Music1f_callchannel ; no + jp nz, Audio3_callchannel ; no ld b, $0 ; yes ld hl, wc02e add hl, bc @@ -216,7 +216,7 @@ Music1f_endchannel: ; 7d25a (1f:525a) inc de ld a, [de] ld [hl], a ; loads channel address to return to - jp Music1f_endchannel + jp Audio3_endchannel .asm_7d2b3 ld hl, Unknown_7db93 add hl, bc @@ -238,7 +238,7 @@ Music1f_endchannel: ; 7d25a (1f:525a) ld a, c cp CH4 jr z, .asm_7d2d9 - call Music1f_7d73b + call Audio3_7d73b ret c .asm_7d2d9 ld a, [wc005] @@ -251,12 +251,12 @@ Music1f_endchannel: ; 7d25a (1f:525a) ld [hl], b ret -Music1f_callchannel: ; 7d2e8 (1f:52e8) +Audio3_callchannel: ; 7d2e8 (1f:52e8) cp $fd ; is this command a callchannel? - jp nz, Music1f_loopchannel ; no - call Music1f_GetNextMusicByte ; yes + jp nz, Audio3_loopchannel ; no + call Audio3_GetNextMusicByte ; yes push af - call Music1f_GetNextMusicByte + call Audio3_GetNextMusicByte ld d, a pop af ld e, a @@ -286,12 +286,12 @@ Music1f_callchannel: ; 7d2e8 (1f:52e8) ld hl, wc02e add hl, bc set 1, [hl] ; set the call flag - jp Music1f_endchannel + jp Audio3_endchannel -Music1f_loopchannel: ; 7d31d (1f:531d) +Audio3_loopchannel: ; 7d31d (1f:531d) cp $fe ; is this command a loopchannel? - jp nz, Music1f_notetype ; no - call Music1f_GetNextMusicByte ; yes + jp nz, Audio3_notetype ; no + call Audio3_GetNextMusicByte ; yes ld e, a and a jr z, .infiniteLoop @@ -303,17 +303,17 @@ Music1f_loopchannel: ; 7d31d (1f:531d) jr nz, .loopAgain ld a, $1 ; if no more loops to make ld [hl], a - call Music1f_GetNextMusicByte ; skip pointer - call Music1f_GetNextMusicByte - jp Music1f_endchannel + call Audio3_GetNextMusicByte ; skip pointer + call Audio3_GetNextMusicByte + jp Audio3_endchannel .loopAgain ; inc loop count inc a ld [hl], a ; fall through .infiniteLoop ; overwrite current address with pointer - call Music1f_GetNextMusicByte + call Audio3_GetNextMusicByte push af - call Music1f_GetNextMusicByte + call Audio3_GetNextMusicByte ld b, a ld d, $0 ld a, c @@ -324,12 +324,12 @@ Music1f_loopchannel: ; 7d31d (1f:531d) pop af ld [hli], a ld [hl], b - jp Music1f_endchannel + jp Audio3_endchannel -Music1f_notetype: ; 7d358 (1f:5358) +Audio3_notetype: ; 7d358 (1f:5358) and $f0 cp $d0 ; is this command a notetype? - jp nz, Music1f_toggleperfectpitch ; no + jp nz, Audio3_toggleperfectpitch ; no ld a, d ; yes and $f ld b, $0 @@ -339,7 +339,7 @@ Music1f_notetype: ; 7d358 (1f:5358) ld a, c cp CH3 jr z, .noiseChannel ; noise channel has 0 params - call Music1f_GetNextMusicByte + call Audio3_GetNextMusicByte ld d, a ld a, c cp CH2 @@ -368,24 +368,24 @@ Music1f_notetype: ; 7d358 (1f:5358) add hl, bc ld [hl], d .noiseChannel - jp Music1f_endchannel + jp Audio3_endchannel -Music1f_toggleperfectpitch: ; 7d397 (1f:5397) +Audio3_toggleperfectpitch: ; 7d397 (1f:5397) ld a, d cp $e8 ; is this command a toggleperfectpitch? - jr nz, Music1f_vibrato ; no + jr nz, Audio3_vibrato ; no ld b, $0 ; yes ld hl, wc02e add hl, bc ld a, [hl] xor $1 ld [hl], a ; flip bit 0 of wc02e - jp Music1f_endchannel + jp Audio3_endchannel -Music1f_vibrato: ; 7d3a9 (1f:53a9) +Audio3_vibrato: ; 7d3a9 (1f:53a9) cp $ea ; is this command a vibrato? - jr nz, Music1f_pitchbend ; no - call Music1f_GetNextMusicByte ; yes + jr nz, Audio3_pitchbend ; no + call Audio3_GetNextMusicByte ; yes ld b, $0 ld hl, wc04e add hl, bc @@ -393,7 +393,7 @@ Music1f_vibrato: ; 7d3a9 (1f:53a9) ld hl, wc06e add hl, bc ld [hl], a ; store delay - call Music1f_GetNextMusicByte + call Audio3_GetNextMusicByte ld d, a and $f0 swap a @@ -414,24 +414,24 @@ Music1f_vibrato: ; 7d3a9 (1f:53a9) swap a or d ld [hl], a ; store depth as both high and low nibbles - jp Music1f_endchannel + jp Audio3_endchannel -Music1f_pitchbend: ; 7d3e1 (1f:53e1) +Audio3_pitchbend: ; 7d3e1 (1f:53e1) cp $eb ; is this command a pitchbend? - jr nz, Music1f_duty ; no - call Music1f_GetNextMusicByte ; yes + jr nz, Audio3_duty ; no + call Audio3_GetNextMusicByte ; yes ld b, $0 ld hl, wc076 add hl, bc ld [hl], a ; store first param - call Music1f_GetNextMusicByte + call Audio3_GetNextMusicByte ld d, a and $f0 swap a ld b, a ld a, d and $f - call Music1f_7d8cc + call Audio3_7d8cc ld b, $0 ld hl, wc0a6 add hl, bc @@ -443,14 +443,14 @@ Music1f_pitchbend: ; 7d3e1 (1f:53e1) ld hl, wc02e add hl, bc set 4, [hl] ; set pitchbend flag - call Music1f_GetNextMusicByte + call Audio3_GetNextMusicByte ld d, a - jp Music1f_notelength + jp Audio3_notelength -Music1f_duty: ; 7d419 (1f:5419) +Audio3_duty: ; 7d419 (1f:5419) cp $ec ; is this command a duty? - jr nz, Music1f_tempo ; no - call Music1f_GetNextMusicByte ; yes + jr nz, Audio3_tempo ; no + call Audio3_GetNextMusicByte ; yes rrca rrca and $c0 @@ -458,17 +458,17 @@ Music1f_duty: ; 7d419 (1f:5419) ld hl, wc03e add hl, bc ld [hl], a ; store duty - jp Music1f_endchannel + jp Audio3_endchannel -Music1f_tempo: ; 7d42e (1f:542e) +Audio3_tempo: ; 7d42e (1f:542e) cp $ed ; is this command a tempo? - jr nz, Music1f_stereopanning ; no + jr nz, Audio3_stereopanning ; no ld a, c ; yes cp CH4 jr nc, .sfxChannel - call Music1f_GetNextMusicByte + call Audio3_GetNextMusicByte ld [wc0e8], a ; store first param - call Music1f_GetNextMusicByte + call Audio3_GetNextMusicByte ld [wc0e9], a ; store second param xor a ld [wc0ce], a ; clear RAM @@ -477,9 +477,9 @@ Music1f_tempo: ; 7d42e (1f:542e) ld [wc0d1], a jr .musicChannelDone .sfxChannel - call Music1f_GetNextMusicByte + call Audio3_GetNextMusicByte ld [wc0ea], a ; store first param - call Music1f_GetNextMusicByte + call Audio3_GetNextMusicByte ld [wc0eb], a ; store second param xor a ld [wc0d2], a ; clear RAM @@ -487,22 +487,22 @@ Music1f_tempo: ; 7d42e (1f:542e) ld [wc0d4], a ld [wc0d5], a .musicChannelDone - jp Music1f_endchannel + jp Audio3_endchannel -Music1f_stereopanning: ; 7d46e (1f:546e) +Audio3_stereopanning: ; 7d46e (1f:546e) cp $ee ; is this command a stereopanning? - jr nz, Music1f_unknownmusic0xef ; no - call Music1f_GetNextMusicByte ; yes + jr nz, Audio3_unknownmusic0xef ; no + call Audio3_GetNextMusicByte ; yes ld [wc004], a ; store panning - jp Music1f_endchannel + jp Audio3_endchannel ; this appears to never be used -Music1f_unknownmusic0xef: ; 7d47b (1f:547b) +Audio3_unknownmusic0xef: ; 7d47b (1f:547b) cp $ef ; is this command an unknownmusic0xef? - jr nz, Music1f_dutycycle ; no - call Music1f_GetNextMusicByte ; yes + jr nz, Audio3_dutycycle ; no + call Audio3_GetNextMusicByte ; yes push bc - call Music1f_7d8ea + call Audio3_7d8ea pop bc ld a, [wc003] and a @@ -512,12 +512,12 @@ Music1f_unknownmusic0xef: ; 7d47b (1f:547b) xor a ld [wc02d], a .skip - jp Music1f_endchannel + jp Audio3_endchannel -Music1f_dutycycle: ; 7d49a (1f:549a) +Audio3_dutycycle: ; 7d49a (1f:549a) cp $fc ; is this command a dutycycle? - jr nz, Music1f_volume ; no - call Music1f_GetNextMusicByte ; yes + jr nz, Audio3_volume ; no + call Audio3_GetNextMusicByte ; yes ld b, $0 ld hl, wc046 add hl, bc @@ -529,48 +529,48 @@ Music1f_dutycycle: ; 7d49a (1f:549a) ld hl, wc02e add hl, bc set 6, [hl] ; set duty flag - jp Music1f_endchannel + jp Audio3_endchannel -Music1f_volume: ; 7d4b8 (1f:54b8) +Audio3_volume: ; 7d4b8 (1f:54b8) cp $f0 ; is this command a volume? - jr nz, Music1f_executemusic ; no - call Music1f_GetNextMusicByte ; yes + jr nz, Audio3_executemusic ; no + call Audio3_GetNextMusicByte ; yes ld [$ff24], a ; store volume - jp Music1f_endchannel + jp Audio3_endchannel -Music1f_executemusic: ; 7d4c4 (1f:54c4) +Audio3_executemusic: ; 7d4c4 (1f:54c4) cp $f8 ; is this command an executemusic? - jr nz, Music1f_octave ; no + jr nz, Audio3_octave ; no ld b, $0 ; yes ld hl, wc036 add hl, bc set 0, [hl] - jp Music1f_endchannel + jp Audio3_endchannel -Music1f_octave: ; 7d4d3 (1f:54d3) +Audio3_octave: ; 7d4d3 (1f:54d3) and $f0 cp $e0 ; is this command an octave? - jr nz, Music1f_unknownsfx0x20 ; no + jr nz, Audio3_unknownsfx0x20 ; no ld hl, wc0d6 ; yes ld b, $0 add hl, bc ld a, d and $f ld [hl], a ; store low nibble as octave - jp Music1f_endchannel + jp Audio3_endchannel -Music1f_unknownsfx0x20: ; 7d4e6 (1f:54e6) +Audio3_unknownsfx0x20: ; 7d4e6 (1f:54e6) cp $20 ; is this command an unknownsfx0x20? - jr nz, Music1f_unknownsfx0x10 ; no + jr nz, Audio3_unknownsfx0x10 ; no ld a, c cp CH3 ; is this a noise or sfx channel? - jr c, Music1f_unknownsfx0x10 ; no + jr c, Audio3_unknownsfx0x10 ; no ld b, $0 ld hl, wc036 add hl, bc bit 0, [hl] - jr nz, Music1f_unknownsfx0x10 ; no - call Music1f_notelength ; yes + jr nz, Audio3_unknownsfx0x10 ; no + call Audio3_notelength ; yes ld d, a ld b, $0 ld hl, wc03e @@ -579,56 +579,56 @@ Music1f_unknownsfx0x20: ; 7d4e6 (1f:54e6) or d ld d, a ld b, $1 - call Music1f_7d8ac + call Audio3_7d8ac ld [hl], d - call Music1f_GetNextMusicByte + call Audio3_GetNextMusicByte ld d, a ld b, $2 - call Music1f_7d8ac + call Audio3_7d8ac ld [hl], d - call Music1f_GetNextMusicByte + call Audio3_GetNextMusicByte ld e, a ld a, c cp CH7 ld a, $0 jr z, .sfxNoiseChannel ; only two params for noise channel push de - call Music1f_GetNextMusicByte + call Audio3_GetNextMusicByte pop de .sfxNoiseChannel ld d, a push de - call Music1f_7d69d - call Music1f_7d66c + call Audio3_7d69d + call Audio3_7d66c pop de - call Music1f_7d6bf + call Audio3_7d6bf ret -Music1f_unknownsfx0x10: ; 7d533 (1f:5533) +Audio3_unknownsfx0x10: ; 7d533 (1f:5533) ld a, c cp CH4 - jr c, Music1f_note ; if not a sfx + jr c, Audio3_note ; if not a sfx ld a, d cp $10 ; is this command an unknownsfx0x10? - jr nz, Music1f_note ; no + jr nz, Audio3_note ; no ld b, $0 ld hl, wc036 add hl, bc bit 0, [hl] - jr nz, Music1f_note ; no - call Music1f_GetNextMusicByte ; yes + jr nz, Audio3_note ; no + call Audio3_GetNextMusicByte ; yes ld [$ff10], a - jp Music1f_endchannel + jp Audio3_endchannel -Music1f_note: ; 7d54f (1f:554f) +Audio3_note: ; 7d54f (1f:554f) ld a, c cp CH3 - jr nz, Music1f_notelength ; if not noise channel + jr nz, Audio3_notelength ; if not noise channel ld a, d and $f0 cp $b0 ; is this command a dnote? - jr z, Music1f_dnote ; yes - jr nc, Music1f_notelength ; no + jr z, Audio3_dnote ; yes + jr nc, Audio3_notelength ; no swap a ld b, a ld a, d @@ -639,24 +639,24 @@ Music1f_note: ; 7d54f (1f:554f) push bc jr asm_7d571 -Music1f_dnote: ; 7d569 (1f:5569) +Audio3_dnote: ; 7d569 (1f:5569) ld a, d and $f push af push bc - call Music1f_GetNextMusicByte ; get dnote instrument + call Audio3_GetNextMusicByte ; get dnote instrument asm_7d571 ld d, a ld a, [wc003] and a jr nz, .asm_7d57c ld a, d - call Music1f_7d8ea + call Audio3_7d8ea .asm_7d57c pop bc pop de -Music1f_notelength: ; 7d57e (1f:557e) +Audio3_notelength: ; 7d57e (1f:557e) ld a, d push af and $f @@ -668,7 +668,7 @@ Music1f_notelength: ; 7d57e (1f:557e) add hl, bc ld a, [hl] ld l, b - call Music1f_7d8bb + call Audio3_7d8bb ld a, c cp CH4 jr nc, .sfxChannel @@ -682,7 +682,7 @@ Music1f_notelength: ; 7d57e (1f:557e) ld e, $0 cp CH7 jr z, .skip ; if noise channel - call Music1f_7d707 + call Audio3_7d707 ld a, [wc0ea] ld d, a ld a, [wc0eb] @@ -693,7 +693,7 @@ Music1f_notelength: ; 7d57e (1f:557e) ld hl, wc0ce add hl, bc ld l, [hl] - call Music1f_7d8bb + call Audio3_7d8bb ld e, l ld d, h ld hl, wc0ce @@ -706,15 +706,15 @@ Music1f_notelength: ; 7d57e (1f:557e) ld hl, wc036 add hl, bc bit 0, [hl] - jr nz, Music1f_notepitch + jr nz, Audio3_notepitch ld hl, wc02e add hl, bc bit 2, [hl] - jr z, Music1f_notepitch + jr z, Audio3_notepitch pop hl ret -Music1f_notepitch: ; 7d5dc (1f:55dc) +Audio3_notepitch: ; 7d5dc (1f:55dc) pop af and $f0 cp $c0 ; compare to rest @@ -744,7 +744,7 @@ Music1f_notepitch: ; 7d5dc (1f:55dc) jr .quit .notSfxChannel3 ld b, $2 - call Music1f_7d8ac + call Audio3_7d8ac ld a, $8 ld [hli], a inc hl @@ -758,13 +758,13 @@ Music1f_notepitch: ; 7d5dc (1f:55dc) ld hl, wc0d6 add hl, bc ld b, [hl] - call Music1f_7d8cc + call Audio3_7d8cc ld b, $0 ld hl, wc02e add hl, bc bit 4, [hl] jr z, .asm_7d62c - call Music1f_7d803 + call Audio3_7d803 .asm_7d62c push de ld a, c @@ -787,10 +787,10 @@ Music1f_notepitch: ; 7d5dc (1f:55dc) add hl, bc ld d, [hl] ld b, $2 - call Music1f_7d8ac + call Audio3_7d8ac ld [hl], d - call Music1f_7d69d - call Music1f_7d66c + call Audio3_7d69d + call Audio3_7d66c pop de ld b, $0 ld hl, wc02e @@ -804,10 +804,10 @@ Music1f_notepitch: ; 7d5dc (1f:55dc) ld hl, wc066 add hl, bc ld [hl], e - call Music1f_7d6bf + call Audio3_7d6bf ret -Music1f_7d66c: ; 7d66c (1f:566c) +Audio3_7d66c: ; 7d66c (1f:566c) ld b, $0 ld hl, Unknown_7db9b add hl, bc @@ -841,7 +841,7 @@ Music1f_7d66c: ; 7d66c (1f:566c) ld [$ff25], a ret -Music1f_7d69d: ; 7d69d (1f:569d) +Audio3_7d69d: ; 7d69d (1f:569d) ld b, $0 ld hl, wc0b6 add hl, bc @@ -861,11 +861,11 @@ Music1f_7d69d: ; 7d69d (1f:569d) ld d, a .channel3 ld b, $1 - call Music1f_7d8ac + call Audio3_7d8ac ld [hl], d ret -Music1f_7d6bf: ; 7d6bf (1f:56bf) +Audio3_7d6bf: ; 7d6bf (1f:56bf) ld a, c cp CH2 jr z, .channel3 @@ -883,7 +883,7 @@ Music1f_7d6bf: ; 7d6bf (1f:56bf) add a ld d, $0 ld e, a - ld hl, Music1f_WavePointers + ld hl, Audio3_WavePointers add hl, de ld e, [hl] inc hl @@ -909,15 +909,15 @@ Music1f_7d6bf: ; 7d6bf (1f:56bf) and $c7 ld d, a ld b, $3 - call Music1f_7d8ac + call Audio3_7d8ac ld [hl], e inc hl ld [hl], d - call Music1f_7d729 + call Audio3_7d729 ret -Music1f_7d707: ; 7d707 (1f:5707) - call Music1f_7d759 +Audio3_7d707: ; 7d707 (1f:5707) + call Audio3_7d759 jr nc, .asm_7d71f ld d, $0 ld a, [wc0f2] @@ -937,8 +937,8 @@ Music1f_7d707: ; 7d707 (1f:5707) .asm_7d728 ret -Music1f_7d729: ; 7d729 (1f:5729) - call Music1f_7d759 +Audio3_7d729: ; 7d729 (1f:5729) + call Audio3_7d759 jr nc, .asm_7d73a ld a, [wc0f1] add e @@ -953,8 +953,8 @@ Music1f_7d729: ; 7d729 (1f:5729) .asm_7d73a ret -Music1f_7d73b: ; 7d73b (1f:573b) - call Music1f_7d759 +Audio3_7d73b: ; 7d73b (1f:573b) + call Audio3_7d759 jr nc, .asm_7d756 ld hl, wc006 ld e, c @@ -976,7 +976,7 @@ Music1f_7d73b: ; 7d73b (1f:573b) ccf ret -Music1f_7d759: ; 7d759 (1f:5759) +Audio3_7d759: ; 7d759 (1f:5759) ld a, [wc02a] cp $14 jr nc, .asm_7d762 @@ -993,7 +993,7 @@ Music1f_7d759: ; 7d759 (1f:5759) scf ret -Music1f_ApplyPitchBend: ; 7d76d (1f:576d) +Audio3_ApplyPitchBend: ; 7d76d (1f:576d) ld hl, wc02e add hl, bc bit 5, [hl] @@ -1083,7 +1083,7 @@ Music1f_ApplyPitchBend: ; 7d76d (1f:576d) add hl, bc ld [hl], d ld b, $3 - call Music1f_7d8ac + call Audio3_7d8ac ld a, e ld [hli], a ld [hl], d @@ -1095,7 +1095,7 @@ Music1f_ApplyPitchBend: ; 7d76d (1f:576d) res 5, [hl] ret -Music1f_7d803: ; 7d803 (1f:5803) +Audio3_7d803: ; 7d803 (1f:5803) ld hl, wc096 add hl, bc ld [hl], d @@ -1184,7 +1184,7 @@ Music1f_7d803: ; 7d803 (1f:5803) ld [hl], a ret -Music1f_ApplyDutyCycle: ; 7d881 (1f:5881) +Audio3_ApplyDutyCycle: ; 7d881 (1f:5881) ld b, $0 ld hl, wc046 add hl, bc @@ -1195,14 +1195,14 @@ Music1f_ApplyDutyCycle: ; 7d881 (1f:5881) and $c0 ld d, a ld b, $1 - call Music1f_7d8ac + call Audio3_7d8ac ld a, [hl] and $3f or d ld [hl], a ret -Music1f_GetNextMusicByte: ; 7d899 (1f:5899) +Audio3_GetNextMusicByte: ; 7d899 (1f:5899) ld d, $0 ld a, c add a @@ -1220,7 +1220,7 @@ Music1f_GetNextMusicByte: ; 7d899 (1f:5899) ld [hl], d ret -Music1f_7d8ac: ; 7d8ac (1f:58ac) +Audio3_7d8ac: ; 7d8ac (1f:58ac) ld a, c ld hl, Unknown_7db8b add l @@ -1234,7 +1234,7 @@ Music1f_7d8ac: ; 7d8ac (1f:58ac) ld h, $ff ret -Music1f_7d8bb: ; 7d8bb (1f:58bb) +Audio3_7d8bb: ; 7d8bb (1f:58bb) ld h, $0 .loop srl a @@ -1249,13 +1249,13 @@ Music1f_7d8bb: ; 7d8bb (1f:58bb) .done ret -Music1f_7d8cc: ; 7d8cc (1f:58cc) +Audio3_7d8cc: ; 7d8cc (1f:58cc) ld h, $0 ld l, a add hl, hl ld d, h ld e, l - ld hl, Music1f_Pitches + ld hl, Audio3_Pitches add hl, de ld e, [hl] inc hl @@ -1274,16 +1274,16 @@ Music1f_7d8cc: ; 7d8cc (1f:58cc) ld d, a ret -Music1f_7d8ea:: ; 7d8ea (1f:58ea) +Audio3_7d8ea:: ; 7d8ea (1f:58ea) ld [wc001], a cp $ff - jp z, Music1f_7daa8 + jp z, Audio3_7daa8 cp $c2 - jp z, Music1f_7d9c2 - jp c, Music1f_7d9c2 + jp z, Audio3_7d9c2 + jp c, Audio3_7d9c2 cp $fe jr z, .asm_7d901 - jp nc, Music1f_7d9c2 + jp nc, Audio3_7d9c2 .asm_7d901 xor a ld [wc000], a @@ -1293,53 +1293,53 @@ Music1f_7d8ea:: ; 7d8ea (1f:58ea) ld [wc0e7], a ld d, $8 ld hl, wc016 - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc006 - call FillMusicRAM1f + call FillAudioRAM3 ld d, $4 ld hl, wc026 - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc02e - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc03e - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc046 - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc04e - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc056 - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc05e - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc066 - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc06e - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc036 - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc076 - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc07e - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc086 - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc08e - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc096 - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc09e - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc0a6 - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc0ae - call FillMusicRAM1f + call FillAudioRAM3 ld a, $1 ld hl, wc0be - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc0b6 - call FillMusicRAM1f + call FillAudioRAM3 ld hl, wc0c6 - call FillMusicRAM1f + call FillAudioRAM3 ld [wc0e8], a ld a, $ff ld [wc004], a @@ -1355,16 +1355,16 @@ Music1f_7d8ea:: ; 7d8ea (1f:58ea) ld [$ff1a], a ld a, $77 ld [$ff24], a - jp Music1f_7db03 + jp Audio3_7db03 -Music1f_7d9c2: ; 7d9c2 (1f:59c2) +Audio3_7d9c2: ; 7d9c2 (1f:59c2) ld l, a ld e, a ld h, $0 ld d, h add hl, hl add hl, de - ld de, SFX_Headers_1f + ld de, SFX_Headers_3 add hl, de ld a, h ld [wc0ec], a @@ -1504,11 +1504,11 @@ Music1f_7d9c2: ; 7d9c2 (1f:59c2) .asm_7da9f ld a, c and a - jp z, Music1f_7db03 + jp z, Audio3_7db03 dec c jp .asm_7d9db -Music1f_7daa8: ; 7daa8 (1f:5aa8) +Audio3_7daa8: ; 7daa8 (1f:5aa8) ld a, $80 ld [$ff26], a ld [$ff1a], a @@ -1536,11 +1536,11 @@ Music1f_7daa8: ; 7daa8 (1f:5aa8) ld [wc0e7], a ld d, $a0 ld hl, wc006 - call FillMusicRAM1f + call FillAudioRAM3 ld a, $1 ld d, $18 ld hl, wc0b6 - call FillMusicRAM1f + call FillAudioRAM3 ld [wc0e8], a ld [wc0ea], a ld a, $ff @@ -1548,7 +1548,7 @@ Music1f_7daa8: ; 7daa8 (1f:5aa8) ret ; fills d bytes at hl with a -FillMusicRAM1f: ; 7dafd (1f:5afd) +FillAudioRAM3: ; 7dafd (1f:5afd) ld b, d .loop ld [hli], a @@ -1556,7 +1556,7 @@ FillMusicRAM1f: ; 7dafd (1f:5afd) jr nz, .loop ret -Music1f_7db03: ; 7db03 (1f:5b03) +Audio3_7db03: ; 7db03 (1f:5b03) ld a, [wc001] ld l, a ld e, a @@ -1564,7 +1564,7 @@ Music1f_7db03: ; 7db03 (1f:5b03) ld d, h add hl, hl add hl, de - ld de, SFX_Headers_1f + ld de, SFX_Headers_3 add hl, de ld e, l ld d, h @@ -1637,7 +1637,7 @@ Music1f_7db03: ; 7db03 (1f:5b03) ld [hli], a ld [hl], a ld hl, wc012 ; sfx noise channel pointer - ld de, Noise1f_endchannel + ld de, Noise3_endchannel ld [hl], e inc hl ld [hl], d ; overwrite pointer to point to endchannel @@ -1651,7 +1651,7 @@ Music1f_7db03: ; 7db03 (1f:5b03) .asm_7db89 ret -Noise1f_endchannel: ; 7db8a (1f:5b8a) +Noise3_endchannel: ; 7db8a (1f:5b8a) endchannel Unknown_7db8b: ; 7db8b (1f:5b8b) @@ -1666,7 +1666,7 @@ Unknown_7db9b: ; 7db9b (1f:5b9b) db $11, $22, $44, $88 ; channels 0-3 db $11, $22, $44, $88 ; channels 4-7 -Music1f_Pitches: ; 7dba3 (1f:5ba3) +Audio3_Pitches: ; 7dba3 (1f:5ba3) dw $F82C ; C_ dw $F89D ; C# dw $F907 ; D_ diff --git a/audio/headers/musicheaders02.asm b/audio/headers/musicheaders02.asm deleted file mode 100755 index a6449436..00000000 --- a/audio/headers/musicheaders02.asm +++ /dev/null @@ -1,184 +0,0 @@ -Music_PalletTown:: ; 822e (2:422e) - db ( $80 | CH0 ) - dw Music_PalletTown_Ch1 - db CH1 - dw Music_PalletTown_Ch2 - db CH2 - dw Music_PalletTown_Ch3 - -Music_Pokecenter:: ; 8237 (2:4237) - db ( $80 | CH0 ) - dw Music_Pokecenter_Ch1 - db CH1 - dw Music_Pokecenter_Ch2 - db CH2 - dw Music_Pokecenter_Ch3 - -Music_Gym:: ; 8240 (2:4240) - db ( $80 | CH0 ) - dw Music_Gym_Ch1 - db CH1 - dw Music_Gym_Ch2 - db CH2 - dw Music_Gym_Ch3 - -; Viridian City, Pewter City, Saffron City -Music_Cities1:: ; 8249 (2:4249) - db ( $C0 | CH0 ) - dw Music_Cities1_Ch1 - db CH1 - dw Music_Cities1_Ch2 - db CH2 - dw Music_Cities1_Ch3 - db CH3 - dw Music_Cities1_Ch4 - -; Cerulean City, Fuchsia City -Music_Cities2:: ; 8255 (2:4255) - db ( $80 | CH0 ) - dw Music_Cities2_Ch1 - db CH1 - dw Music_Cities2_Ch2 - db CH2 - dw Music_Cities2_Ch3 - -Music_Celadon:: ; 825e (2:425e) - db ( $80 | CH0 ) - dw Music_Celadon_Ch1 - db CH1 - dw Music_Celadon_Ch2 - db CH2 - dw Music_Celadon_Ch3 - -Music_Cinnabar:: ; 8267 (2:4267) - db ( $80 | CH0 ) - dw Music_Cinnabar_Ch1 - db CH1 - dw Music_Cinnabar_Ch2 - db CH2 - dw Music_Cinnabar_Ch3 - -Music_Vermilion:: ; 8270 (2:4270) - db ( $C0 | CH0 ) - dw Music_Vermilion_Ch1 - db CH1 - dw Music_Vermilion_Ch2 - db CH2 - dw Music_Vermilion_Ch3 - db CH3 - dw Music_Vermilion_Ch4 - -Music_Lavender:: ; 827c (2:427c) - db ( $C0 | CH0 ) - dw Music_Lavender_Ch1 - db CH1 - dw Music_Lavender_Ch2 - db CH2 - dw Music_Lavender_Ch3 - db CH3 - dw Music_Lavender_Ch4 - -Music_SSAnne:: ; 8288 (2:4288) - db ( $80 | CH0 ) - dw Music_SSAnne_Ch1 - db CH1 - dw Music_SSAnne_Ch2 - db CH2 - dw Music_SSAnne_Ch3 - -Music_MeetProfOak:: ; 8291 (2:4291) - db ( $80 | CH0 ) - dw Music_MeetProfOak_Ch1 - db CH1 - dw Music_MeetProfOak_Ch2 - db CH2 - dw Music_MeetProfOak_Ch3 - -Music_MeetRival:: ; 829a (2:429a) - db ( $80 | CH0 ) - dw Music_MeetRival_Ch1 - db CH1 - dw Music_MeetRival_Ch2 - db CH2 - dw Music_MeetRival_Ch3 - -Music_MuseumGuy:: ; 82a3 (2:42a3) - db ( $C0 | CH0 ) - dw Music_MuseumGuy_Ch1 - db CH1 - dw Music_MuseumGuy_Ch2 - db CH2 - dw Music_MuseumGuy_Ch3 - db CH3 - dw Music_MuseumGuy_Ch4 - -Music_SafariZone:: ; 82af (2:42af) - db ( $80 | CH0 ) - dw Music_SafariZone_Ch1 - db CH1 - dw Music_SafariZone_Ch2 - db CH2 - dw Music_SafariZone_Ch3 - -Music_PkmnHealed:: ; 82b8 (2:42b8) - db ( $80 | CH0 ) - dw Music_PkmnHealed_Ch1 - db CH1 - dw Music_PkmnHealed_Ch2 - db CH2 - dw Music_PkmnHealed_Ch3 - -; Routes 1 and 2 -Music_Routes1:: ; 82c1 (2:42c1) - db ( $C0 | CH0 ) - dw Music_Routes1_Ch1 - db CH1 - dw Music_Routes1_Ch2 - db CH2 - dw Music_Routes1_Ch3 - db CH3 - dw Music_Routes1_Ch4 - -; Routes 24 and 25 -Music_Routes2:: ; 82cd (2:42cd) - db ( $C0 | CH0 ) - dw Music_Routes2_Ch1 - db CH1 - dw Music_Routes2_Ch2 - db CH2 - dw Music_Routes2_Ch3 - db CH3 - dw Music_Routes2_Ch4 - -; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 -Music_Routes3:: ; 82d9 (2:42d9) - db ( $C0 | CH0 ) - dw Music_Routes3_Ch1 - db CH1 - dw Music_Routes3_Ch2 - db CH2 - dw Music_Routes3_Ch3 - db CH3 - dw Music_Routes3_Ch4 - -; Routes 11, 12, 13, 14, 15 -Music_Routes4:: ; 82d5 (2:42d5) - db ( $C0 | CH0 ) - dw Music_Routes4_Ch1 - db CH1 - dw Music_Routes4_Ch2 - db CH2 - dw Music_Routes4_Ch3 - db CH3 - dw Music_Routes4_Ch4 - -; Route 23, Indigo Plateau -Music_IndigoPlateau:: ; 82f1 (2:42f1) - db ( $C0 | CH0 ) - dw Music_IndigoPlateau_Ch1 - db CH1 - dw Music_IndigoPlateau_Ch2 - db CH2 - dw Music_IndigoPlateau_Ch3 - db CH3 - dw Music_IndigoPlateau_Ch4 diff --git a/audio/headers/musicheaders08.asm b/audio/headers/musicheaders08.asm deleted file mode 100755 index 85cf2825..00000000 --- a/audio/headers/musicheaders08.asm +++ /dev/null @@ -1,57 +0,0 @@ -Music_GymLeaderBattle:: ; 202be (8:42be) - db ( $80 | CH0 ) - dw Music_GymLeaderBattle_Ch1 - db CH1 - dw Music_GymLeaderBattle_Ch2 - db CH2 - dw Music_GymLeaderBattle_Ch3 - -Music_TrainerBattle:: ; 202c7 (8:42c7) - db ( $80 | CH0 ) - dw Music_TrainerBattle_Ch1 - db CH1 - dw Music_TrainerBattle_Ch2 - db CH2 - dw Music_TrainerBattle_Ch3 - -Music_WildBattle:: ; 202d0 (8:42d0) - db ( $80 | CH0 ) - dw Music_WildBattle_Ch1 - db CH1 - dw Music_WildBattle_Ch2 - db CH2 - dw Music_WildBattle_Ch3 - -Music_FinalBattle:: ; 202d9 (8:42d9) - db ( $80 | CH0 ) - dw Music_FinalBattle_Ch1 - db CH1 - dw Music_FinalBattle_Ch2 - db CH2 - dw Music_FinalBattle_Ch3 - -Music_DefeatedTrainer:: ; 202e2 (8:42e2) - db ( $80 | CH0 ) - dw Music_DefeatedTrainer_Ch1 - db CH1 - dw Music_DefeatedTrainer_Ch2 - db CH2 - dw Music_DefeatedTrainer_Ch3 - -Music_DefeatedWildMon:: ; 202eb (8:42eb) - db ( $80 | CH0 ) - dw Music_DefeatedWildMon_Ch1 - db CH1 - dw Music_DefeatedWildMon_Ch2 - db CH2 - dw Music_DefeatedWildMon_Ch3 - -Music_DefeatedGymLeader:: ; 202f4 (8:42f4) - db ( $80 | CH0 ) - dw Music_DefeatedGymLeader_Ch1 - db CH1 - dw Music_DefeatedGymLeader_Ch2 - db CH2 - dw Music_DefeatedGymLeader_Ch3 - -; 202fd diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm new file mode 100755 index 00000000..a6449436 --- /dev/null +++ b/audio/headers/musicheaders1.asm @@ -0,0 +1,184 @@ +Music_PalletTown:: ; 822e (2:422e) + db ( $80 | CH0 ) + dw Music_PalletTown_Ch1 + db CH1 + dw Music_PalletTown_Ch2 + db CH2 + dw Music_PalletTown_Ch3 + +Music_Pokecenter:: ; 8237 (2:4237) + db ( $80 | CH0 ) + dw Music_Pokecenter_Ch1 + db CH1 + dw Music_Pokecenter_Ch2 + db CH2 + dw Music_Pokecenter_Ch3 + +Music_Gym:: ; 8240 (2:4240) + db ( $80 | CH0 ) + dw Music_Gym_Ch1 + db CH1 + dw Music_Gym_Ch2 + db CH2 + dw Music_Gym_Ch3 + +; Viridian City, Pewter City, Saffron City +Music_Cities1:: ; 8249 (2:4249) + db ( $C0 | CH0 ) + dw Music_Cities1_Ch1 + db CH1 + dw Music_Cities1_Ch2 + db CH2 + dw Music_Cities1_Ch3 + db CH3 + dw Music_Cities1_Ch4 + +; Cerulean City, Fuchsia City +Music_Cities2:: ; 8255 (2:4255) + db ( $80 | CH0 ) + dw Music_Cities2_Ch1 + db CH1 + dw Music_Cities2_Ch2 + db CH2 + dw Music_Cities2_Ch3 + +Music_Celadon:: ; 825e (2:425e) + db ( $80 | CH0 ) + dw Music_Celadon_Ch1 + db CH1 + dw Music_Celadon_Ch2 + db CH2 + dw Music_Celadon_Ch3 + +Music_Cinnabar:: ; 8267 (2:4267) + db ( $80 | CH0 ) + dw Music_Cinnabar_Ch1 + db CH1 + dw Music_Cinnabar_Ch2 + db CH2 + dw Music_Cinnabar_Ch3 + +Music_Vermilion:: ; 8270 (2:4270) + db ( $C0 | CH0 ) + dw Music_Vermilion_Ch1 + db CH1 + dw Music_Vermilion_Ch2 + db CH2 + dw Music_Vermilion_Ch3 + db CH3 + dw Music_Vermilion_Ch4 + +Music_Lavender:: ; 827c (2:427c) + db ( $C0 | CH0 ) + dw Music_Lavender_Ch1 + db CH1 + dw Music_Lavender_Ch2 + db CH2 + dw Music_Lavender_Ch3 + db CH3 + dw Music_Lavender_Ch4 + +Music_SSAnne:: ; 8288 (2:4288) + db ( $80 | CH0 ) + dw Music_SSAnne_Ch1 + db CH1 + dw Music_SSAnne_Ch2 + db CH2 + dw Music_SSAnne_Ch3 + +Music_MeetProfOak:: ; 8291 (2:4291) + db ( $80 | CH0 ) + dw Music_MeetProfOak_Ch1 + db CH1 + dw Music_MeetProfOak_Ch2 + db CH2 + dw Music_MeetProfOak_Ch3 + +Music_MeetRival:: ; 829a (2:429a) + db ( $80 | CH0 ) + dw Music_MeetRival_Ch1 + db CH1 + dw Music_MeetRival_Ch2 + db CH2 + dw Music_MeetRival_Ch3 + +Music_MuseumGuy:: ; 82a3 (2:42a3) + db ( $C0 | CH0 ) + dw Music_MuseumGuy_Ch1 + db CH1 + dw Music_MuseumGuy_Ch2 + db CH2 + dw Music_MuseumGuy_Ch3 + db CH3 + dw Music_MuseumGuy_Ch4 + +Music_SafariZone:: ; 82af (2:42af) + db ( $80 | CH0 ) + dw Music_SafariZone_Ch1 + db CH1 + dw Music_SafariZone_Ch2 + db CH2 + dw Music_SafariZone_Ch3 + +Music_PkmnHealed:: ; 82b8 (2:42b8) + db ( $80 | CH0 ) + dw Music_PkmnHealed_Ch1 + db CH1 + dw Music_PkmnHealed_Ch2 + db CH2 + dw Music_PkmnHealed_Ch3 + +; Routes 1 and 2 +Music_Routes1:: ; 82c1 (2:42c1) + db ( $C0 | CH0 ) + dw Music_Routes1_Ch1 + db CH1 + dw Music_Routes1_Ch2 + db CH2 + dw Music_Routes1_Ch3 + db CH3 + dw Music_Routes1_Ch4 + +; Routes 24 and 25 +Music_Routes2:: ; 82cd (2:42cd) + db ( $C0 | CH0 ) + dw Music_Routes2_Ch1 + db CH1 + dw Music_Routes2_Ch2 + db CH2 + dw Music_Routes2_Ch3 + db CH3 + dw Music_Routes2_Ch4 + +; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 +Music_Routes3:: ; 82d9 (2:42d9) + db ( $C0 | CH0 ) + dw Music_Routes3_Ch1 + db CH1 + dw Music_Routes3_Ch2 + db CH2 + dw Music_Routes3_Ch3 + db CH3 + dw Music_Routes3_Ch4 + +; Routes 11, 12, 13, 14, 15 +Music_Routes4:: ; 82d5 (2:42d5) + db ( $C0 | CH0 ) + dw Music_Routes4_Ch1 + db CH1 + dw Music_Routes4_Ch2 + db CH2 + dw Music_Routes4_Ch3 + db CH3 + dw Music_Routes4_Ch4 + +; Route 23, Indigo Plateau +Music_IndigoPlateau:: ; 82f1 (2:42f1) + db ( $C0 | CH0 ) + dw Music_IndigoPlateau_Ch1 + db CH1 + dw Music_IndigoPlateau_Ch2 + db CH2 + dw Music_IndigoPlateau_Ch3 + db CH3 + dw Music_IndigoPlateau_Ch4 diff --git a/audio/headers/musicheaders1f.asm b/audio/headers/musicheaders1f.asm deleted file mode 100755 index 7846e48f..00000000 --- a/audio/headers/musicheaders1f.asm +++ /dev/null @@ -1,158 +0,0 @@ -Music_TitleScreen:: ; 7c249 (1f:4249) - db ( $C0 | CH0 ) - dw Music_TitleScreen_Ch1 - db CH1 - dw Music_TitleScreen_Ch2 - db CH2 - dw Music_TitleScreen_Ch3 - db CH3 - dw Music_TitleScreen_Ch4 - -Music_Credits:: ; 7c255 (1f:4255) - db ( $80 | CH0 ) - dw Music_Credits_Ch1 - db CH1 - dw Music_Credits_Ch2 - db CH2 - dw Music_Credits_Ch3 - -Music_HallOfFame:: ; 7c25e (1f:425e) - db ( $80 | CH0 ) - dw Music_HallOfFame_Ch1 - db CH1 - dw Music_HallOfFame_Ch2 - db CH2 - dw Music_HallOfFame_Ch3 - -Music_OaksLab:: ; 7c267 (1f:4267) - db ( $80 | CH0 ) - dw Music_OaksLab_Ch1 - db CH1 - dw Music_OaksLab_Ch2 - db CH2 - dw Music_OaksLab_Ch3 - -Music_JigglypuffSong:: ; 7c270 (1f:4270) - db $40 - dw Music_JigglypuffSong_Ch1 - db CH1 - dw Music_JigglypuffSong_Ch2 - -Music_BikeRiding:: ; 7c276 (1f:4276) - db ( $C0 | CH0 ) - dw Music_BikeRiding_Ch1 - db CH1 - dw Music_BikeRiding_Ch2 - db CH2 - dw Music_BikeRiding_Ch3 - db CH3 - dw Music_BikeRiding_Ch4 - -Music_Surfing:: ; 7c282 (1f:4282) - db ( $80 | CH0 ) - dw Music_Surfing_Ch1 - db CH1 - dw Music_Surfing_Ch2 - db CH2 - dw Music_Surfing_Ch3 - -Music_GameCorner:: ; 7c28b (1f:428b) - db ( $80 | CH0 ) - dw Music_GameCorner_Ch1 - db CH1 - dw Music_GameCorner_Ch2 - db CH2 - dw Music_GameCorner_Ch3 - -Music_IntroBattle:: ; 7c294 (1f:4294) - db ( $C0 | CH0 ) - dw Music_IntroBattle_Ch1 - db CH1 - dw Music_IntroBattle_Ch2 - db CH2 - dw Music_IntroBattle_Ch3 - db CH3 - dw Music_IntroBattle_Ch4 - -; Power Plant, Unknown Dungeon, Rocket HQ -Music_Dungeon1:: ; 7c2a0 (1f:42a0) - db ( $C0 | CH0 ) - dw Music_Dungeon1_Ch1 - db CH1 - dw Music_Dungeon1_Ch2 - db CH2 - dw Music_Dungeon1_Ch3 - db CH3 - dw Music_Dungeon1_Ch4 - -; Viridian Forest, Seafoam Islands -Music_Dungeon2:: ; 7c2ac (1f:42ac) - db ( $C0 | CH0 ) - dw Music_Dungeon2_Ch1 - db CH1 - dw Music_Dungeon2_Ch2 - db CH2 - dw Music_Dungeon2_Ch3 - db CH3 - dw Music_Dungeon2_Ch4 - -; Mt. Moon, Rock Tunnel, Victory Road -Music_Dungeon3:: ; 7c2b8 (1f:42b8) - db ( $C0 | CH0 ) - dw Music_Dungeon3_Ch1 - db CH1 - dw Music_Dungeon3_Ch2 - db CH2 - dw Music_Dungeon3_Ch3 - db CH3 - dw Music_Dungeon3_Ch4 - -Music_CinnabarMansion:: ; 7c2c4 (1f:42c4) - db ( $C0 | CH0 ) - dw Music_CinnabarMansion_Ch1 - db CH1 - dw Music_CinnabarMansion_Ch2 - db CH2 - dw Music_CinnabarMansion_Ch3 - db CH3 - dw Music_CinnabarMansion_Ch4 - -Music_PokemonTower:: ; 7c2d0 (1f:42d0) - db ( $80 | CH0 ) - dw Music_PokemonTower_Ch1 - db CH1 - dw Music_PokemonTower_Ch2 - db CH2 - dw Music_PokemonTower_Ch3 - -Music_SilphCo:: ; 7c2d9 (1f:42d9) - db ( $80 | CH0 ) - dw Music_SilphCo_Ch1 - db CH1 - dw Music_SilphCo_Ch2 - db CH2 - dw Music_SilphCo_Ch3 - -Music_MeetEvilTrainer:: ; 7c2e2 (1f:42e2) - db ( $80 | CH0 ) - dw Music_MeetEvilTrainer_Ch1 - db CH1 - dw Music_MeetEvilTrainer_Ch2 - db CH2 - dw Music_MeetEvilTrainer_Ch3 - -Music_MeetFemaleTrainer:: ; 7c2eb (1f:42eb) - db ( $80 | CH0 ) - dw Music_MeetFemaleTrainer_Ch1 - db CH1 - dw Music_MeetFemaleTrainer_Ch2 - db CH2 - dw Music_MeetFemaleTrainer_Ch3 - -Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4) - db ( $80 | CH0 ) - dw Music_MeetMaleTrainer_Ch1 - db CH1 - dw Music_MeetMaleTrainer_Ch2 - db CH2 - dw Music_MeetMaleTrainer_Ch3 diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm new file mode 100755 index 00000000..85cf2825 --- /dev/null +++ b/audio/headers/musicheaders2.asm @@ -0,0 +1,57 @@ +Music_GymLeaderBattle:: ; 202be (8:42be) + db ( $80 | CH0 ) + dw Music_GymLeaderBattle_Ch1 + db CH1 + dw Music_GymLeaderBattle_Ch2 + db CH2 + dw Music_GymLeaderBattle_Ch3 + +Music_TrainerBattle:: ; 202c7 (8:42c7) + db ( $80 | CH0 ) + dw Music_TrainerBattle_Ch1 + db CH1 + dw Music_TrainerBattle_Ch2 + db CH2 + dw Music_TrainerBattle_Ch3 + +Music_WildBattle:: ; 202d0 (8:42d0) + db ( $80 | CH0 ) + dw Music_WildBattle_Ch1 + db CH1 + dw Music_WildBattle_Ch2 + db CH2 + dw Music_WildBattle_Ch3 + +Music_FinalBattle:: ; 202d9 (8:42d9) + db ( $80 | CH0 ) + dw Music_FinalBattle_Ch1 + db CH1 + dw Music_FinalBattle_Ch2 + db CH2 + dw Music_FinalBattle_Ch3 + +Music_DefeatedTrainer:: ; 202e2 (8:42e2) + db ( $80 | CH0 ) + dw Music_DefeatedTrainer_Ch1 + db CH1 + dw Music_DefeatedTrainer_Ch2 + db CH2 + dw Music_DefeatedTrainer_Ch3 + +Music_DefeatedWildMon:: ; 202eb (8:42eb) + db ( $80 | CH0 ) + dw Music_DefeatedWildMon_Ch1 + db CH1 + dw Music_DefeatedWildMon_Ch2 + db CH2 + dw Music_DefeatedWildMon_Ch3 + +Music_DefeatedGymLeader:: ; 202f4 (8:42f4) + db ( $80 | CH0 ) + dw Music_DefeatedGymLeader_Ch1 + db CH1 + dw Music_DefeatedGymLeader_Ch2 + db CH2 + dw Music_DefeatedGymLeader_Ch3 + +; 202fd diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm new file mode 100755 index 00000000..7846e48f --- /dev/null +++ b/audio/headers/musicheaders3.asm @@ -0,0 +1,158 @@ +Music_TitleScreen:: ; 7c249 (1f:4249) + db ( $C0 | CH0 ) + dw Music_TitleScreen_Ch1 + db CH1 + dw Music_TitleScreen_Ch2 + db CH2 + dw Music_TitleScreen_Ch3 + db CH3 + dw Music_TitleScreen_Ch4 + +Music_Credits:: ; 7c255 (1f:4255) + db ( $80 | CH0 ) + dw Music_Credits_Ch1 + db CH1 + dw Music_Credits_Ch2 + db CH2 + dw Music_Credits_Ch3 + +Music_HallOfFame:: ; 7c25e (1f:425e) + db ( $80 | CH0 ) + dw Music_HallOfFame_Ch1 + db CH1 + dw Music_HallOfFame_Ch2 + db CH2 + dw Music_HallOfFame_Ch3 + +Music_OaksLab:: ; 7c267 (1f:4267) + db ( $80 | CH0 ) + dw Music_OaksLab_Ch1 + db CH1 + dw Music_OaksLab_Ch2 + db CH2 + dw Music_OaksLab_Ch3 + +Music_JigglypuffSong:: ; 7c270 (1f:4270) + db $40 + dw Music_JigglypuffSong_Ch1 + db CH1 + dw Music_JigglypuffSong_Ch2 + +Music_BikeRiding:: ; 7c276 (1f:4276) + db ( $C0 | CH0 ) + dw Music_BikeRiding_Ch1 + db CH1 + dw Music_BikeRiding_Ch2 + db CH2 + dw Music_BikeRiding_Ch3 + db CH3 + dw Music_BikeRiding_Ch4 + +Music_Surfing:: ; 7c282 (1f:4282) + db ( $80 | CH0 ) + dw Music_Surfing_Ch1 + db CH1 + dw Music_Surfing_Ch2 + db CH2 + dw Music_Surfing_Ch3 + +Music_GameCorner:: ; 7c28b (1f:428b) + db ( $80 | CH0 ) + dw Music_GameCorner_Ch1 + db CH1 + dw Music_GameCorner_Ch2 + db CH2 + dw Music_GameCorner_Ch3 + +Music_IntroBattle:: ; 7c294 (1f:4294) + db ( $C0 | CH0 ) + dw Music_IntroBattle_Ch1 + db CH1 + dw Music_IntroBattle_Ch2 + db CH2 + dw Music_IntroBattle_Ch3 + db CH3 + dw Music_IntroBattle_Ch4 + +; Power Plant, Unknown Dungeon, Rocket HQ +Music_Dungeon1:: ; 7c2a0 (1f:42a0) + db ( $C0 | CH0 ) + dw Music_Dungeon1_Ch1 + db CH1 + dw Music_Dungeon1_Ch2 + db CH2 + dw Music_Dungeon1_Ch3 + db CH3 + dw Music_Dungeon1_Ch4 + +; Viridian Forest, Seafoam Islands +Music_Dungeon2:: ; 7c2ac (1f:42ac) + db ( $C0 | CH0 ) + dw Music_Dungeon2_Ch1 + db CH1 + dw Music_Dungeon2_Ch2 + db CH2 + dw Music_Dungeon2_Ch3 + db CH3 + dw Music_Dungeon2_Ch4 + +; Mt. Moon, Rock Tunnel, Victory Road +Music_Dungeon3:: ; 7c2b8 (1f:42b8) + db ( $C0 | CH0 ) + dw Music_Dungeon3_Ch1 + db CH1 + dw Music_Dungeon3_Ch2 + db CH2 + dw Music_Dungeon3_Ch3 + db CH3 + dw Music_Dungeon3_Ch4 + +Music_CinnabarMansion:: ; 7c2c4 (1f:42c4) + db ( $C0 | CH0 ) + dw Music_CinnabarMansion_Ch1 + db CH1 + dw Music_CinnabarMansion_Ch2 + db CH2 + dw Music_CinnabarMansion_Ch3 + db CH3 + dw Music_CinnabarMansion_Ch4 + +Music_PokemonTower:: ; 7c2d0 (1f:42d0) + db ( $80 | CH0 ) + dw Music_PokemonTower_Ch1 + db CH1 + dw Music_PokemonTower_Ch2 + db CH2 + dw Music_PokemonTower_Ch3 + +Music_SilphCo:: ; 7c2d9 (1f:42d9) + db ( $80 | CH0 ) + dw Music_SilphCo_Ch1 + db CH1 + dw Music_SilphCo_Ch2 + db CH2 + dw Music_SilphCo_Ch3 + +Music_MeetEvilTrainer:: ; 7c2e2 (1f:42e2) + db ( $80 | CH0 ) + dw Music_MeetEvilTrainer_Ch1 + db CH1 + dw Music_MeetEvilTrainer_Ch2 + db CH2 + dw Music_MeetEvilTrainer_Ch3 + +Music_MeetFemaleTrainer:: ; 7c2eb (1f:42eb) + db ( $80 | CH0 ) + dw Music_MeetFemaleTrainer_Ch1 + db CH1 + dw Music_MeetFemaleTrainer_Ch2 + db CH2 + dw Music_MeetFemaleTrainer_Ch3 + +Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4) + db ( $80 | CH0 ) + dw Music_MeetMaleTrainer_Ch1 + db CH1 + dw Music_MeetMaleTrainer_Ch2 + db CH2 + dw Music_MeetMaleTrainer_Ch3 diff --git a/audio/headers/sfxheaders02.asm b/audio/headers/sfxheaders02.asm deleted file mode 100644 index 86fca297..00000000 --- a/audio/headers/sfxheaders02.asm +++ /dev/null @@ -1,562 +0,0 @@ -SFX_Headers_02:: - db $ff, $ff, $ff ; padding - -SFX_Snare1_1:: ; 8003 (2:4003) - db CH7 - dw SFX_Snare1_1_Ch1 - -SFX_Snare2_1:: ; 8006 (2:4006) - db CH7 - dw SFX_Snare2_1_Ch1 - -SFX_Snare3_1:: ; 8009 (2:4009) - db CH7 - dw SFX_Snare3_1_Ch1 - -SFX_Snare4_1:: ; 800c (2:400c) - db CH7 - dw SFX_Snare4_1_Ch1 - -SFX_Snare5_1:: ; 800f (2:400f) - db CH7 - dw SFX_Snare5_1_Ch1 - -SFX_Triangle1_1:: ; 8012 (2:4012) - db CH7 - dw SFX_Triangle1_1_Ch1 - -SFX_Triangle2_1:: ; 8015 (2:4015) - db CH7 - dw SFX_Triangle2_1_Ch1 - -SFX_Snare6_1:: ; 8018 (2:4018) - db CH7 - dw SFX_Snare6_1_Ch1 - -SFX_Snare7_1:: ; 801b (2:401b) - db CH7 - dw SFX_Snare7_1_Ch1 - -SFX_Snare8_1:: ; 801e (2:401e) - db CH7 - dw SFX_Snare8_1_Ch1 - -SFX_Snare9_1:: ; 8021 (2:4021) - db CH7 - dw SFX_Snare9_1_Ch1 - -SFX_Cymbal1_1:: ; 8024 (2:4024) - db CH7 - dw SFX_Cymbal1_1_Ch1 - -SFX_Cymbal2_1:: ; 8027 (2:4027) - db CH7 - dw SFX_Cymbal2_1_Ch1 - -SFX_Cymbal3_1:: ; 802a (2:402a) - db CH7 - dw SFX_Cymbal3_1_Ch1 - -SFX_Muted_Snare1_1:: ; 802d (2:402d) - db CH7 - dw SFX_Muted_Snare1_1_Ch1 - -SFX_Triangle3_1:: ; 8030 (2:4030) - db CH7 - dw SFX_Triangle3_1_Ch1 - -SFX_Muted_Snare2_1:: ; 8033 (2:4033) - db CH7 - dw SFX_Muted_Snare2_1_Ch1 - -SFX_Muted_Snare3_1:: ; 8036 (2:4036) - db CH7 - dw SFX_Muted_Snare3_1_Ch1 - -SFX_Muted_Snare4_1:: ; 8039 (2:4039) - db CH7 - dw SFX_Muted_Snare4_1_Ch1 - -SFX_Cry00_1:: ; 803c (2:403c) - db ( $80 | CH4 ) - dw SFX_Cry00_1_Ch1 - db CH5 - dw SFX_Cry00_1_Ch2 - db CH7 - dw SFX_Cry00_1_Ch3 - -SFX_Cry01_1:: ; 8045 (2:4045) - db ( $80 | CH4 ) - dw SFX_Cry01_1_Ch1 - db CH5 - dw SFX_Cry01_1_Ch2 - db CH7 - dw SFX_Cry01_1_Ch3 - -SFX_Cry02_1:: ; 804e (2:404e) - db ( $80 | CH4 ) - dw SFX_Cry02_1_Ch1 - db CH5 - dw SFX_Cry02_1_Ch2 - db CH7 - dw SFX_Cry02_1_Ch3 - -SFX_Cry03_1:: ; 8057 (2:4057) - db ( $80 | CH4 ) - dw SFX_Cry03_1_Ch1 - db CH5 - dw SFX_Cry03_1_Ch2 - db CH7 - dw SFX_Cry03_1_Ch3 - -SFX_Cry04_1:: ; 8060 (2:4060) - db ( $80 | CH4 ) - dw SFX_Cry04_1_Ch1 - db CH5 - dw SFX_Cry04_1_Ch2 - db CH7 - dw SFX_Cry04_1_Ch3 - -SFX_Cry05_1:: ; 8069 (2:4069) - db ( $80 | CH4 ) - dw SFX_Cry05_1_Ch1 - db CH5 - dw SFX_Cry05_1_Ch2 - db CH7 - dw SFX_Cry05_1_Ch3 - -SFX_Cry06_1:: ; 8072 (2:4072) - db ( $80 | CH4 ) - dw SFX_Cry06_1_Ch1 - db CH5 - dw SFX_Cry06_1_Ch2 - db CH7 - dw SFX_Cry06_1_Ch3 - -SFX_Cry07_1:: ; 807b (2:407b) - db ( $80 | CH4 ) - dw SFX_Cry07_1_Ch1 - db CH5 - dw SFX_Cry07_1_Ch2 - db CH7 - dw SFX_Cry07_1_Ch3 - -SFX_Cry08_1:: ; 8084 (2:4084) - db ( $80 | CH4 ) - dw SFX_Cry08_1_Ch1 - db CH5 - dw SFX_Cry08_1_Ch2 - db CH7 - dw SFX_Cry08_1_Ch3 - -SFX_Cry09_1:: ; 808d (2:408d) - db ( $80 | CH4 ) - dw SFX_Cry09_1_Ch1 - db CH5 - dw SFX_Cry09_1_Ch2 - db CH7 - dw SFX_Cry09_1_Ch3 - -SFX_Cry0A_1:: ; 8096 (2:4096) - db ( $80 | CH4 ) - dw SFX_Cry0A_1_Ch1 - db CH5 - dw SFX_Cry0A_1_Ch2 - db CH7 - dw SFX_Cry0A_1_Ch3 - -SFX_Cry0B_1:: ; 809f (2:409f) - db ( $80 | CH4 ) - dw SFX_Cry0B_1_Ch1 - db CH5 - dw SFX_Cry0B_1_Ch2 - db CH7 - dw SFX_Cry0B_1_Ch3 - -SFX_Cry0C_1:: ; 80a8 (2:40a8) - db ( $80 | CH4 ) - dw SFX_Cry0C_1_Ch1 - db CH5 - dw SFX_Cry0C_1_Ch2 - db CH7 - dw SFX_Cry0C_1_Ch3 - -SFX_Cry0D_1:: ; 80b1 (2:40b1) - db ( $80 | CH4 ) - dw SFX_Cry0D_1_Ch1 - db CH5 - dw SFX_Cry0D_1_Ch2 - db CH7 - dw SFX_Cry0D_1_Ch3 - -SFX_Cry0E_1:: ; 80ba (2:40ba) - db ( $80 | CH4 ) - dw SFX_Cry0E_1_Ch1 - db CH5 - dw SFX_Cry0E_1_Ch2 - db CH7 - dw SFX_Cry0E_1_Ch3 - -SFX_Cry0F_1:: ; 80c3 (2:40c3) - db ( $80 | CH4 ) - dw SFX_Cry0F_1_Ch1 - db CH5 - dw SFX_Cry0F_1_Ch2 - db CH7 - dw SFX_Cry0F_1_Ch3 - -SFX_Cry10_1:: ; 80cc (2:40cc) - db ( $80 | CH4 ) - dw SFX_Cry10_1_Ch1 - db CH5 - dw SFX_Cry10_1_Ch2 - db CH7 - dw SFX_Cry10_1_Ch3 - -SFX_Cry11_1:: ; 80d5 (2:40d5) - db ( $80 | CH4 ) - dw SFX_Cry11_1_Ch1 - db CH5 - dw SFX_Cry11_1_Ch2 - db CH7 - dw SFX_Cry11_1_Ch3 - -SFX_Cry12_1:: ; 80de (2:40de) - db ( $80 | CH4 ) - dw SFX_Cry12_1_Ch1 - db CH5 - dw SFX_Cry12_1_Ch2 - db CH7 - dw SFX_Cry12_1_Ch3 - -SFX_Cry13_1:: ; 80e7 (2:40e7) - db ( $80 | CH4 ) - dw SFX_Cry13_1_Ch1 - db CH5 - dw SFX_Cry13_1_Ch2 - db CH7 - dw SFX_Cry13_1_Ch3 - -SFX_Cry14_1:: ; 80f0 (2:40f0) - db ( $80 | CH4 ) - dw SFX_Cry14_1_Ch1 - db CH5 - dw SFX_Cry14_1_Ch2 - db CH7 - dw SFX_Cry14_1_Ch3 - -SFX_Cry15_1:: ; 80f9 (2:40f9) - db ( $80 | CH4 ) - dw SFX_Cry15_1_Ch1 - db CH5 - dw SFX_Cry15_1_Ch2 - db CH7 - dw SFX_Cry15_1_Ch3 - -SFX_Cry16_1:: ; 8102 (2:4102) - db ( $80 | CH4 ) - dw SFX_Cry16_1_Ch1 - db CH5 - dw SFX_Cry16_1_Ch2 - db CH7 - dw SFX_Cry16_1_Ch3 - -SFX_Cry17_1:: ; 810b (2:410b) - db ( $80 | CH4 ) - dw SFX_Cry17_1_Ch1 - db CH5 - dw SFX_Cry17_1_Ch2 - db CH7 - dw SFX_Cry17_1_Ch3 - -SFX_Cry18_1:: ; 8114 (2:4114) - db ( $80 | CH4 ) - dw SFX_Cry18_1_Ch1 - db CH5 - dw SFX_Cry18_1_Ch2 - db CH7 - dw SFX_Cry18_1_Ch3 - -SFX_Cry19_1:: ; 811d (2:411d) - db ( $80 | CH4 ) - dw SFX_Cry19_1_Ch1 - db CH5 - dw SFX_Cry19_1_Ch2 - db CH7 - dw SFX_Cry19_1_Ch3 - -SFX_Cry1A_1:: ; 8126 (2:4126) - db ( $80 | CH4 ) - dw SFX_Cry1A_1_Ch1 - db CH5 - dw SFX_Cry1A_1_Ch2 - db CH7 - dw SFX_Cry1A_1_Ch3 - -SFX_Cry1B_1:: ; 812f (2:412f) - db ( $80 | CH4 ) - dw SFX_Cry1B_1_Ch1 - db CH5 - dw SFX_Cry1B_1_Ch2 - db CH7 - dw SFX_Cry1B_1_Ch3 - -SFX_Cry1C_1:: ; 8138 (2:4138) - db ( $80 | CH4 ) - dw SFX_Cry1C_1_Ch1 - db CH5 - dw SFX_Cry1C_1_Ch2 - db CH7 - dw SFX_Cry1C_1_Ch3 - -SFX_Cry1D_1:: ; 8141 (2:4141) - db ( $80 | CH4 ) - dw SFX_Cry1D_1_Ch1 - db CH5 - dw SFX_Cry1D_1_Ch2 - db CH7 - dw SFX_Cry1D_1_Ch3 - -SFX_Cry1E_1:: ; 814a (2:414a) - db ( $80 | CH4 ) - dw SFX_Cry1E_1_Ch1 - db CH5 - dw SFX_Cry1E_1_Ch2 - db CH7 - dw SFX_Cry1E_1_Ch3 - -SFX_Cry1F_1:: ; 8153 (2:4153) - db ( $80 | CH4 ) - dw SFX_Cry1F_1_Ch1 - db CH5 - dw SFX_Cry1F_1_Ch2 - db CH7 - dw SFX_Cry1F_1_Ch3 - -SFX_Cry20_1:: ; 815c (2:415c) - db ( $80 | CH4 ) - dw SFX_Cry20_1_Ch1 - db CH5 - dw SFX_Cry20_1_Ch2 - db CH7 - dw SFX_Cry20_1_Ch3 - -SFX_Cry21_1:: ; 8165 (2:4165) - db ( $80 | CH4 ) - dw SFX_Cry21_1_Ch1 - db CH5 - dw SFX_Cry21_1_Ch2 - db CH7 - dw SFX_Cry21_1_Ch3 - -SFX_Cry22_1:: ; 816e (2:416e) - db ( $80 | CH4 ) - dw SFX_Cry22_1_Ch1 - db CH5 - dw SFX_Cry22_1_Ch2 - db CH7 - dw SFX_Cry22_1_Ch3 - -SFX_Cry23_1:: ; 8177 (2:4177) - db ( $80 | CH4 ) - dw SFX_Cry23_1_Ch1 - db CH5 - dw SFX_Cry23_1_Ch2 - db CH7 - dw SFX_Cry23_1_Ch3 - -SFX_Cry24_1:: ; 8180 (2:4180) - db ( $80 | CH4 ) - dw SFX_Cry24_1_Ch1 - db CH5 - dw SFX_Cry24_1_Ch2 - db CH7 - dw SFX_Cry24_1_Ch3 - -SFX_Cry25_1:: ; 8189 (2:4189) - db ( $80 | CH4 ) - dw SFX_Cry25_1_Ch1 - db CH5 - dw SFX_Cry25_1_Ch2 - db CH7 - dw SFX_Cry25_1_Ch3 - -SFX_Get_Item1_1:: ; 8192 (2:4192) - db ( $80 | CH4 ) - dw SFX_Get_Item1_1_Ch1 - db CH5 - dw SFX_Get_Item1_1_Ch2 - db CH6 - dw SFX_Get_Item1_1_Ch3 - -SFX_Get_Item2_1:: ; 819b (2:419b) - db ( $80 | CH4 ) - dw SFX_Get_Item2_1_Ch1 - db CH5 - dw SFX_Get_Item2_1_Ch2 - db CH6 - dw SFX_Get_Item2_1_Ch3 - -SFX_Tink_1:: ; 81a4 (2:41a4) - db CH4 - dw SFX_Tink_1_Ch1 - -SFX_Heal_HP_1:: ; 81a7 (2:41a7) - db CH4 - dw SFX_Heal_HP_1_Ch1 - -SFX_Heal_Ailment_1:: ; 81aa (2:41aa) - db CH4 - dw SFX_Heal_Ailment_1_Ch1 - -SFX_Start_Menu_1:: ; 81ad (2:41ad) - db CH7 - dw SFX_Start_Menu_1_Ch1 - -SFX_Press_AB_1:: ; 81b0 (2:41b0) - db CH4 - dw SFX_Press_AB_1_Ch1 - -SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3) - db ( $80 | CH4 ) - dw SFX_Pokedex_Rating_1_Ch1 - db CH5 - dw SFX_Pokedex_Rating_1_Ch2 - db CH6 - dw SFX_Pokedex_Rating_1_Ch3 - -SFX_Get_Key_Item_1:: ; 81bc (2:41bc) - db ( $80 | CH4 ) - dw SFX_Get_Key_Item_1_Ch1 - db CH5 - dw SFX_Get_Key_Item_1_Ch2 - db CH6 - dw SFX_Get_Key_Item_1_Ch3 - -SFX_Poisoned_1:: ; 81c5 (2:41c5) - db CH4 - dw SFX_Poisoned_1_Ch1 - -SFX_Trade_Machine_1:: ; 81c8 (2:41c8) - db CH4 - dw SFX_Trade_Machine_1_Ch1 - -SFX_Turn_On_PC_1:: ; 81cb (2:41cb) - db CH4 - dw SFX_Turn_On_PC_1_Ch1 - -SFX_Turn_Off_PC_1:: ; 81ce (2:41ce) - db CH4 - dw SFX_Turn_Off_PC_1_Ch1 - -SFX_Enter_PC_1:: ; 81d1 (2:41d1) - db CH4 - dw SFX_Enter_PC_1_Ch1 - -SFX_Shrink_1:: ; 81d4 (2:41d4) - db CH4 - dw SFX_Shrink_1_Ch1 - -SFX_Switch_1:: ; 81d7 (2:41d7) - db CH4 - dw SFX_Switch_1_Ch1 - -SFX_Healing_Machine_1:: ; 81da (2:41da) - db CH4 - dw SFX_Healing_Machine_1_Ch1 - -SFX_Teleport_Exit1_1:: ; 81dd (2:41dd) - db CH4 - dw SFX_Teleport_Exit1_1_Ch1 - -SFX_Teleport_Enter1_1:: ; 81e0 (2:41e0) - db CH4 - dw SFX_Teleport_Enter1_1_Ch1 - -SFX_Teleport_Exit2_1:: ; 81e3 (2:41e3) - db CH4 - dw SFX_Teleport_Exit2_1_Ch1 - -SFX_Ledge_1:: ; 81e6 (2:41e6) - db CH4 - dw SFX_Ledge_1_Ch1 - -SFX_Teleport_Enter2_1:: ; 81e9 (2:41e9) - db CH7 - dw SFX_Teleport_Enter2_1_Ch1 - -SFX_Fly_1:: ; 81ec (2:41ec) - db CH7 - dw SFX_Fly_1_Ch1 - -SFX_Denied_1:: ; 81ef (2:41ef) - db ( $40 | CH4 ) - dw SFX_Denied_1_Ch1 - db CH5 - dw SFX_Denied_1_Ch2 - -SFX_Arrow_Tiles_1:: ; 81f5 (2:41f5) - db CH4 - dw SFX_Arrow_Tiles_1_Ch1 - -SFX_Push_Boulder_1:: ; 81f8 (2:41f8) - db CH7 - dw SFX_Push_Boulder_1_Ch1 - -SFX_SS_Anne_Horn_1:: ; 81fb (2:41fb) - db ( $40 | CH4 ) - dw SFX_SS_Anne_Horn_1_Ch1 - db CH5 - dw SFX_SS_Anne_Horn_1_Ch2 - -SFX_Withdraw_Deposit_1:: ; 8201 (2:4201) - db CH4 - dw SFX_Withdraw_Deposit_1_Ch1 - -SFX_Cut_1:: ; 8204 (2:4204) - db CH7 - dw SFX_Cut_1_Ch1 - -SFX_Go_Inside_1:: ; 8207 (2:4207) - db CH7 - dw SFX_Go_Inside_1_Ch1 - -SFX_Swap_1:: ; 820a (2:420a) - db ( $40 | CH4 ) - dw SFX_Swap_1_Ch1 - db CH5 - dw SFX_Swap_1_Ch2 - -SFX_59_1:: ; 8210 (2:4210) - db ( $40 | CH4 ) - dw SFX_59_1_Ch1 - db CH5 - dw SFX_59_1_Ch2 - -SFX_Purchase_1:: ; 8216 (2:4216) - db ( $40 | CH4 ) - dw SFX_Purchase_1_Ch1 - db CH5 - dw SFX_Purchase_1_Ch2 - -SFX_Collision_1:: ; 821c (2:421c) - db CH4 - dw SFX_Collision_1_Ch1 - -SFX_Go_Outside_1:: ; 821f (2:421f) - db CH7 - dw SFX_Go_Outside_1_Ch1 - -SFX_Save_1:: ; 8222 (2:4222) - db ( $40 | CH4 ) - dw SFX_Save_1_Ch1 - db CH5 - dw SFX_Save_1_Ch2 - -SFX_Pokeflute:: ; 8228 (2:4228) - db CH2 - dw SFX_Pokeflute_Ch1 - -SFX_Safari_Zone_PA:: ; 822b (2:422b) - db CH4 - dw SFX_Safari_Zone_PA_Ch1 diff --git a/audio/headers/sfxheaders08.asm b/audio/headers/sfxheaders08.asm deleted file mode 100644 index 46491e67..00000000 --- a/audio/headers/sfxheaders08.asm +++ /dev/null @@ -1,706 +0,0 @@ -SFX_Headers_08:: - db $ff, $ff, $ff ; padding - -SFX_Snare1_2:: ; 20003 (8:4003) - db CH7 - dw SFX_Snare1_2_Ch1 - -SFX_Snare2_2:: ; 20006 (8:4006) - db CH7 - dw SFX_Snare2_2_Ch1 - -SFX_Snare3_2:: ; 20009 (8:4009) - db CH7 - dw SFX_Snare3_2_Ch1 - -SFX_Snare4_2:: ; 2000c (8:400c) - db CH7 - dw SFX_Snare4_2_Ch1 - -SFX_Snare5_2:: ; 2000f (8:400f) - db CH7 - dw SFX_Snare5_2_Ch1 - -SFX_Triangle1_2:: ; 20012 (8:4012) - db CH7 - dw SFX_Triangle1_2_Ch1 - -SFX_Triangle2_2:: ; 20015 (8:4015) - db CH7 - dw SFX_Triangle2_2_Ch1 - -SFX_Snare6_2:: ; 20018 (8:4018) - db CH7 - dw SFX_Snare6_2_Ch1 - -SFX_Snare7_2:: ; 2001b (8:401b) - db CH7 - dw SFX_Snare7_2_Ch1 - -SFX_Snare8_2:: ; 2001e (8:401e) - db CH7 - dw SFX_Snare8_2_Ch1 - -SFX_Snare9_2:: ; 20021 (8:4021) - db CH7 - dw SFX_Snare9_2_Ch1 - -SFX_Cymbal1_2:: ; 20024 (8:4024) - db CH7 - dw SFX_Cymbal1_2_Ch1 - -SFX_Cymbal2_2:: ; 20027 (8:4027) - db CH7 - dw SFX_Cymbal2_2_Ch1 - -SFX_Cymbal3_2:: ; 2002a (8:402a) - db CH7 - dw SFX_Cymbal3_2_Ch1 - -SFX_Muted_Snare1_2:: ; 2002d (8:402d) - db CH7 - dw SFX_Muted_Snare1_2_Ch1 - -SFX_Triangle3_2:: ; 20030 (8:4030) - db CH7 - dw SFX_Triangle3_2_Ch1 - -SFX_Muted_Snare2_2:: ; 20033 (8:4033) - db CH7 - dw SFX_Muted_Snare2_2_Ch1 - -SFX_Muted_Snare3_2:: ; 20036 (8:4036) - db CH7 - dw SFX_Muted_Snare3_2_Ch1 - -SFX_Muted_Snare4_2:: ; 20039 (8:4039) - db CH7 - dw SFX_Muted_Snare4_2_Ch1 - -SFX_Cry00_2:: ; 2003c (8:403c) - db ( $80 | CH4 ) - dw SFX_Cry00_2_Ch1 - db CH5 - dw SFX_Cry00_2_Ch2 - db CH7 - dw SFX_Cry00_2_Ch3 - -SFX_Cry01_2:: ; 20045 (8:4045) - db ( $80 | CH4 ) - dw SFX_Cry01_2_Ch1 - db CH5 - dw SFX_Cry01_2_Ch2 - db CH7 - dw SFX_Cry01_2_Ch3 - -SFX_Cry02_2:: ; 2004e (8:404e) - db ( $80 | CH4 ) - dw SFX_Cry02_2_Ch1 - db CH5 - dw SFX_Cry02_2_Ch2 - db CH7 - dw SFX_Cry02_2_Ch3 - -SFX_Cry03_2:: ; 20057 (8:4057) - db ( $80 | CH4 ) - dw SFX_Cry03_2_Ch1 - db CH5 - dw SFX_Cry03_2_Ch2 - db CH7 - dw SFX_Cry03_2_Ch3 - -SFX_Cry04_2:: ; 20060 (8:4060) - db ( $80 | CH4 ) - dw SFX_Cry04_2_Ch1 - db CH5 - dw SFX_Cry04_2_Ch2 - db CH7 - dw SFX_Cry04_2_Ch3 - -SFX_Cry05_2:: ; 20069 (8:4069) - db ( $80 | CH4 ) - dw SFX_Cry05_2_Ch1 - db CH5 - dw SFX_Cry05_2_Ch2 - db CH7 - dw SFX_Cry05_2_Ch3 - -SFX_Cry06_2:: ; 20072 (8:4072) - db ( $80 | CH4 ) - dw SFX_Cry06_2_Ch1 - db CH5 - dw SFX_Cry06_2_Ch2 - db CH7 - dw SFX_Cry06_2_Ch3 - -SFX_Cry07_2:: ; 2007b (8:407b) - db ( $80 | CH4 ) - dw SFX_Cry07_2_Ch1 - db CH5 - dw SFX_Cry07_2_Ch2 - db CH7 - dw SFX_Cry07_2_Ch3 - -SFX_Cry08_2:: ; 20084 (8:4084) - db ( $80 | CH4 ) - dw SFX_Cry08_2_Ch1 - db CH5 - dw SFX_Cry08_2_Ch2 - db CH7 - dw SFX_Cry08_2_Ch3 - -SFX_Cry09_2:: ; 2008d (8:408d) - db ( $80 | CH4 ) - dw SFX_Cry09_2_Ch1 - db CH5 - dw SFX_Cry09_2_Ch2 - db CH7 - dw SFX_Cry09_2_Ch3 - -SFX_Cry0A_2:: ; 20096 (8:4096) - db ( $80 | CH4 ) - dw SFX_Cry0A_2_Ch1 - db CH5 - dw SFX_Cry0A_2_Ch2 - db CH7 - dw SFX_Cry0A_2_Ch3 - -SFX_Cry0B_2:: ; 2009f (8:409f) - db ( $80 | CH4 ) - dw SFX_Cry0B_2_Ch1 - db CH5 - dw SFX_Cry0B_2_Ch2 - db CH7 - dw SFX_Cry0B_2_Ch3 - -SFX_Cry0C_2:: ; 200a8 (8:40a8) - db ( $80 | CH4 ) - dw SFX_Cry0C_2_Ch1 - db CH5 - dw SFX_Cry0C_2_Ch2 - db CH7 - dw SFX_Cry0C_2_Ch3 - -SFX_Cry0D_2:: ; 200b1 (8:40b1) - db ( $80 | CH4 ) - dw SFX_Cry0D_2_Ch1 - db CH5 - dw SFX_Cry0D_2_Ch2 - db CH7 - dw SFX_Cry0D_2_Ch3 - -SFX_Cry0E_2:: ; 200ba (8:40ba) - db ( $80 | CH4 ) - dw SFX_Cry0E_2_Ch1 - db CH5 - dw SFX_Cry0E_2_Ch2 - db CH7 - dw SFX_Cry0E_2_Ch3 - -SFX_Cry0F_2:: ; 200c3 (8:40c3) - db ( $80 | CH4 ) - dw SFX_Cry0F_2_Ch1 - db CH5 - dw SFX_Cry0F_2_Ch2 - db CH7 - dw SFX_Cry0F_2_Ch3 - -SFX_Cry10_2:: ; 200cc (8:40cc) - db ( $80 | CH4 ) - dw SFX_Cry10_2_Ch1 - db CH5 - dw SFX_Cry10_2_Ch2 - db CH7 - dw SFX_Cry10_2_Ch3 - -SFX_Cry11_2:: ; 200d5 (8:40d5) - db ( $80 | CH4 ) - dw SFX_Cry11_2_Ch1 - db CH5 - dw SFX_Cry11_2_Ch2 - db CH7 - dw SFX_Cry11_2_Ch3 - -SFX_Cry12_2:: ; 200de (8:40de) - db ( $80 | CH4 ) - dw SFX_Cry12_2_Ch1 - db CH5 - dw SFX_Cry12_2_Ch2 - db CH7 - dw SFX_Cry12_2_Ch3 - -SFX_Cry13_2:: ; 200e7 (8:40e7) - db ( $80 | CH4 ) - dw SFX_Cry13_2_Ch1 - db CH5 - dw SFX_Cry13_2_Ch2 - db CH7 - dw SFX_Cry13_2_Ch3 - -SFX_Cry14_2:: ; 200f0 (8:40f0) - db ( $80 | CH4 ) - dw SFX_Cry14_2_Ch1 - db CH5 - dw SFX_Cry14_2_Ch2 - db CH7 - dw SFX_Cry14_2_Ch3 - -SFX_Cry15_2:: ; 200f9 (8:40f9) - db ( $80 | CH4 ) - dw SFX_Cry15_2_Ch1 - db CH5 - dw SFX_Cry15_2_Ch2 - db CH7 - dw SFX_Cry15_2_Ch3 - -SFX_Cry16_2:: ; 20102 (8:4102) - db ( $80 | CH4 ) - dw SFX_Cry16_2_Ch1 - db CH5 - dw SFX_Cry16_2_Ch2 - db CH7 - dw SFX_Cry16_2_Ch3 - -SFX_Cry17_2:: ; 2010b (8:410b) - db ( $80 | CH4 ) - dw SFX_Cry17_2_Ch1 - db CH5 - dw SFX_Cry17_2_Ch2 - db CH7 - dw SFX_Cry17_2_Ch3 - -SFX_Cry18_2:: ; 20114 (8:4114) - db ( $80 | CH4 ) - dw SFX_Cry18_2_Ch1 - db CH5 - dw SFX_Cry18_2_Ch2 - db CH7 - dw SFX_Cry18_2_Ch3 - -SFX_Cry19_2:: ; 2011d (8:411d) - db ( $80 | CH4 ) - dw SFX_Cry19_2_Ch1 - db CH5 - dw SFX_Cry19_2_Ch2 - db CH7 - dw SFX_Cry19_2_Ch3 - -SFX_Cry1A_2:: ; 20126 (8:4126) - db ( $80 | CH4 ) - dw SFX_Cry1A_2_Ch1 - db CH5 - dw SFX_Cry1A_2_Ch2 - db CH7 - dw SFX_Cry1A_2_Ch3 - -SFX_Cry1B_2:: ; 2012f (8:412f) - db ( $80 | CH4 ) - dw SFX_Cry1B_2_Ch1 - db CH5 - dw SFX_Cry1B_2_Ch2 - db CH7 - dw SFX_Cry1B_2_Ch3 - -SFX_Cry1C_2:: ; 20138 (8:4138) - db ( $80 | CH4 ) - dw SFX_Cry1C_2_Ch1 - db CH5 - dw SFX_Cry1C_2_Ch2 - db CH7 - dw SFX_Cry1C_2_Ch3 - -SFX_Cry1D_2:: ; 20141 (8:4141) - db ( $80 | CH4 ) - dw SFX_Cry1D_2_Ch1 - db CH5 - dw SFX_Cry1D_2_Ch2 - db CH7 - dw SFX_Cry1D_2_Ch3 - -SFX_Cry1E_2:: ; 2014a (8:414a) - db ( $80 | CH4 ) - dw SFX_Cry1E_2_Ch1 - db CH5 - dw SFX_Cry1E_2_Ch2 - db CH7 - dw SFX_Cry1E_2_Ch3 - -SFX_Cry1F_2:: ; 20153 (8:4153) - db ( $80 | CH4 ) - dw SFX_Cry1F_2_Ch1 - db CH5 - dw SFX_Cry1F_2_Ch2 - db CH7 - dw SFX_Cry1F_2_Ch3 - -SFX_Cry20_2:: ; 2015c (8:415c) - db ( $80 | CH4 ) - dw SFX_Cry20_2_Ch1 - db CH5 - dw SFX_Cry20_2_Ch2 - db CH7 - dw SFX_Cry20_2_Ch3 - -SFX_Cry21_2:: ; 20165 (8:4165) - db ( $80 | CH4 ) - dw SFX_Cry21_2_Ch1 - db CH5 - dw SFX_Cry21_2_Ch2 - db CH7 - dw SFX_Cry21_2_Ch3 - -SFX_Cry22_2:: ; 2016e (8:416e) - db ( $80 | CH4 ) - dw SFX_Cry22_2_Ch1 - db CH5 - dw SFX_Cry22_2_Ch2 - db CH7 - dw SFX_Cry22_2_Ch3 - -SFX_Cry23_2:: ; 20177 (8:4177) - db ( $80 | CH4 ) - dw SFX_Cry23_2_Ch1 - db CH5 - dw SFX_Cry23_2_Ch2 - db CH7 - dw SFX_Cry23_2_Ch3 - -SFX_Cry24_2:: ; 20180 (8:4180) - db ( $80 | CH4 ) - dw SFX_Cry24_2_Ch1 - db CH5 - dw SFX_Cry24_2_Ch2 - db CH7 - dw SFX_Cry24_2_Ch3 - -SFX_Cry25_2:: ; 20189 (8:4189) - db ( $80 | CH4 ) - dw SFX_Cry25_2_Ch1 - db CH5 - dw SFX_Cry25_2_Ch2 - db CH7 - dw SFX_Cry25_2_Ch3 - -SFX_Level_Up:: ; 20192 (8:4192) - db ( $80 | CH4 ) - dw SFX_Level_Up_Ch1 - db CH5 - dw SFX_Level_Up_Ch2 - db CH6 - dw SFX_Level_Up_Ch3 - -SFX_Get_Item2_2:: ; 2019b (8:419b) - db ( $80 | CH4 ) - dw SFX_Get_Item2_2_Ch1 - db CH5 - dw SFX_Get_Item2_2_Ch2 - db CH6 - dw SFX_Get_Item2_2_Ch3 - -SFX_Tink_2:: ; 201a4 (8:41a4) - db CH4 - dw SFX_Tink_2_Ch1 - -SFX_Heal_HP_2:: ; 201a7 (8:41a7) - db CH4 - dw SFX_Heal_HP_2_Ch1 - -SFX_Heal_Ailment_2:: ; 201aa (8:41aa) - db CH4 - dw SFX_Heal_Ailment_2_Ch1 - -SFX_Start_Menu_2:: ; 201ad (8:41ad) - db CH7 - dw SFX_Start_Menu_2_Ch1 - -SFX_Press_AB_2:: ; 201b0 (8:41b0) - db CH4 - dw SFX_Press_AB_2_Ch1 - -SFX_Ball_Toss:: ; 201b3 (8:41b3) - db ( $40 | CH4 ) - dw SFX_Ball_Toss_Ch1 - db CH5 - dw SFX_Ball_Toss_Ch2 - -SFX_Ball_Poof:: ; 201b9 (8:41b9) - db ( $40 | CH4 ) - dw SFX_Ball_Poof_Ch1 - db CH7 - dw SFX_Ball_Poof_Ch2 - -SFX_Faint_Thud:: ; 201bf (8:41bf) - db ( $40 | CH4 ) - dw SFX_Faint_Thud_Ch1 - db CH7 - dw SFX_Faint_Thud_Ch2 - -SFX_Run:: ; 201c5 (8:41c5) - db CH7 - dw SFX_Run_Ch1 - -SFX_Dex_Page_Added:: ; 201c8 (8:41c8) - db ( $40 | CH4 ) - dw SFX_Dex_Page_Added_Ch1 - db CH5 - dw SFX_Dex_Page_Added_Ch2 - -SFX_Caught_Mon:: ; 201ce (8:41ce) - db ( $80 | CH4 ) - dw SFX_Caught_Mon_Ch1 - db CH5 - dw SFX_Caught_Mon_Ch2 - db CH6 - dw SFX_Caught_Mon_Ch3 - -SFX_Peck:: ; 201d7 (8:41d7) - db CH7 - dw SFX_Peck_Ch1 - -SFX_Faint_Fall:: ; 201da (8:41da) - db CH4 - dw SFX_Faint_Fall_Ch1 - -SFX_Battle_09:: ; 201dd (8:41dd) - db CH4 - dw SFX_Battle_09_Ch1 - -SFX_Pound:: ; 201e0 (8:41e0) - db CH7 - dw SFX_Pound_Ch1 - -SFX_Battle_0B:: ; 201e3 (8:41e3) - db CH7 - dw SFX_Battle_0B_Ch1 - -SFX_Battle_0C:: ; 201e6 (8:41e6) - db CH7 - dw SFX_Battle_0C_Ch1 - -SFX_Battle_0D:: ; 201e9 (8:41e9) - db CH7 - dw SFX_Battle_0D_Ch1 - -SFX_Battle_0E:: ; 201ec (8:41ec) - db CH7 - dw SFX_Battle_0E_Ch1 - -SFX_Battle_0F:: ; 201ef (8:41ef) - db CH7 - dw SFX_Battle_0F_Ch1 - -SFX_Damage:: ; 201f2 (8:41f2) - db CH7 - dw SFX_Damage_Ch1 - -SFX_Not_Very_Effective:: ; 201f5 (8:41f5) - db CH7 - dw SFX_Not_Very_Effective_Ch1 - -SFX_Battle_12:: ; 201f8 (8:41f8) - db CH7 - dw SFX_Battle_12_Ch1 - -SFX_Battle_13:: ; 201fb (8:41fb) - db CH7 - dw SFX_Battle_13_Ch1 - -SFX_Battle_14:: ; 201fe (8:41fe) - db CH7 - dw SFX_Battle_14_Ch1 - -SFX_Vine_Whip:: ; 20201 (8:4201) - db CH7 - dw SFX_Vine_Whip_Ch1 - -SFX_Battle_16:: ; 20204 (8:4204) - db CH7 - dw SFX_Battle_16_Ch1 - -SFX_Battle_17:: ; 20207 (8:4207) - db CH7 - dw SFX_Battle_17_Ch1 - -SFX_Battle_18:: ; 2020a (8:420a) - db CH7 - dw SFX_Battle_18_Ch1 - -SFX_Battle_19:: ; 2020d (8:420d) - db CH7 - dw SFX_Battle_19_Ch1 - -SFX_Super_Effective:: ; 20210 (8:4210) - db CH7 - dw SFX_Super_Effective_Ch1 - -SFX_Battle_1B:: ; 20213 (8:4213) - db CH7 - dw SFX_Battle_1B_Ch1 - -SFX_Battle_1C:: ; 20216 (8:4216) - db CH7 - dw SFX_Battle_1C_Ch1 - -SFX_Doubleslap:: ; 20219 (8:4219) - db CH7 - dw SFX_Doubleslap_Ch1 - -SFX_Battle_1E:: ; 2021c (8:421c) - db ( $40 | CH4 ) - dw SFX_Battle_1E_Ch1 - db CH7 - dw SFX_Battle_1E_Ch2 - -SFX_Horn_Drill:: ; 20222 (8:4222) - db CH7 - dw SFX_Horn_Drill_Ch1 - -SFX_Battle_20:: ; 20225 (8:4225) - db CH7 - dw SFX_Battle_20_Ch1 - -SFX_Battle_21:: ; 20228 (8:4228) - db CH7 - dw SFX_Battle_21_Ch1 - -SFX_Battle_22:: ; 2022b (8:422b) - db CH7 - dw SFX_Battle_22_Ch1 - -SFX_Battle_23:: ; 2022e (8:422e) - db CH7 - dw SFX_Battle_23_Ch1 - -SFX_Battle_24:: ; 20231 (8:4231) - db ( $40 | CH4 ) - dw SFX_Battle_24_Ch1 - db CH7 - dw SFX_Battle_24_Ch2 - -SFX_Battle_25:: ; 20237 (8:4237) - db CH7 - dw SFX_Battle_25_Ch1 - -SFX_Battle_26:: ; 2023a (8:423a) - db CH7 - dw SFX_Battle_26_Ch1 - -SFX_Battle_27:: ; 2023d (8:423d) - db ( $80 | CH4 ) - dw SFX_Battle_27_Ch1 - db CH5 - dw SFX_Battle_27_Ch2 - db CH7 - dw SFX_Battle_27_Ch3 - -SFX_Battle_28:: ; 20246 (8:4246) - db ( $80 | CH4 ) - dw SFX_Battle_28_Ch1 - db CH5 - dw SFX_Battle_28_Ch2 - db CH7 - dw SFX_Battle_28_Ch3 - -SFX_Battle_29:: ; 2024f (8:424f) - db ( $40 | CH4 ) - dw SFX_Battle_29_Ch1 - db CH7 - dw SFX_Battle_29_Ch2 - -SFX_Battle_2A:: ; 20255 (8:4255) - db ( $80 | CH4 ) - dw SFX_Battle_2A_Ch1 - db CH5 - dw SFX_Battle_2A_Ch2 - db CH7 - dw SFX_Battle_2A_Ch3 - -SFX_Battle_2B:: ; 2025e (8:425e) - db ( $40 | CH4 ) - dw SFX_Battle_2B_Ch1 - db CH7 - dw SFX_Battle_2B_Ch2 - -SFX_Battle_2C:: ; 20264 (8:4264) - db ( $80 | CH4 ) - dw SFX_Battle_2C_Ch1 - db CH5 - dw SFX_Battle_2C_Ch2 - db CH7 - dw SFX_Battle_2C_Ch3 - -SFX_Psybeam:: ; 2026d (8:426d) - db ( $80 | CH4 ) - dw SFX_Psybeam_Ch1 - db CH5 - dw SFX_Psybeam_Ch2 - db CH7 - dw SFX_Psybeam_Ch3 - -SFX_Battle_2E:: ; 20276 (8:4276) - db ( $80 | CH4 ) - dw SFX_Battle_2E_Ch1 - db CH5 - dw SFX_Battle_2E_Ch2 - db CH7 - dw SFX_Battle_2E_Ch3 - -SFX_Battle_2F:: ; 2027f (8:427f) - db ( $80 | CH4 ) - dw SFX_Battle_2F_Ch1 - db CH5 - dw SFX_Battle_2F_Ch2 - db CH7 - dw SFX_Battle_2F_Ch3 - -SFX_Psychic_M:: ; 20288 (8:4288) - db ( $80 | CH4 ) - dw SFX_Psychic_M_Ch1 - db CH5 - dw SFX_Psychic_M_Ch2 - db CH7 - dw SFX_Psychic_M_Ch3 - -SFX_Battle_31:: ; 20291 (8:4291) - db ( $40 | CH4 ) - dw SFX_Battle_31_Ch1 - db CH5 - dw SFX_Battle_31_Ch2 - -SFX_Battle_32:: ; 20297 (8:4297) - db ( $40 | CH4 ) - dw SFX_Battle_32_Ch1 - db CH5 - dw SFX_Battle_32_Ch2 - -SFX_Battle_33:: ; 2029d (8:429d) - db ( $40 | CH4 ) - dw SFX_Battle_33_Ch1 - db CH5 - dw SFX_Battle_33_Ch2 - -SFX_Battle_34:: ; 202a3 (8:42a3) - db ( $80 | CH4 ) - dw SFX_Battle_34_Ch1 - db CH5 - dw SFX_Battle_34_Ch2 - db CH7 - dw SFX_Battle_34_Ch3 - -SFX_Battle_35:: ; 202ac (8:42ac) - db ( $40 | CH4 ) - dw SFX_Battle_35_Ch1 - db CH5 - dw SFX_Battle_35_Ch2 - -SFX_Battle_36:: ; 202b2 (8:42b2) - db ( $80 | CH4 ) - dw SFX_Battle_36_Ch1 - db CH5 - dw SFX_Battle_36_Ch2 - db CH7 - dw SFX_Battle_36_Ch3 - -SFX_Silph_Scope:: ; 202bb (8:42bb) - db CH4 - dw SFX_Silph_Scope_Ch1 diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm new file mode 100644 index 00000000..49370aa4 --- /dev/null +++ b/audio/headers/sfxheaders1.asm @@ -0,0 +1,562 @@ +SFX_Headers_1:: + db $ff, $ff, $ff ; padding + +SFX_Snare1_1:: ; 8003 (2:4003) + db CH7 + dw SFX_Snare1_1_Ch1 + +SFX_Snare2_1:: ; 8006 (2:4006) + db CH7 + dw SFX_Snare2_1_Ch1 + +SFX_Snare3_1:: ; 8009 (2:4009) + db CH7 + dw SFX_Snare3_1_Ch1 + +SFX_Snare4_1:: ; 800c (2:400c) + db CH7 + dw SFX_Snare4_1_Ch1 + +SFX_Snare5_1:: ; 800f (2:400f) + db CH7 + dw SFX_Snare5_1_Ch1 + +SFX_Triangle1_1:: ; 8012 (2:4012) + db CH7 + dw SFX_Triangle1_1_Ch1 + +SFX_Triangle2_1:: ; 8015 (2:4015) + db CH7 + dw SFX_Triangle2_1_Ch1 + +SFX_Snare6_1:: ; 8018 (2:4018) + db CH7 + dw SFX_Snare6_1_Ch1 + +SFX_Snare7_1:: ; 801b (2:401b) + db CH7 + dw SFX_Snare7_1_Ch1 + +SFX_Snare8_1:: ; 801e (2:401e) + db CH7 + dw SFX_Snare8_1_Ch1 + +SFX_Snare9_1:: ; 8021 (2:4021) + db CH7 + dw SFX_Snare9_1_Ch1 + +SFX_Cymbal1_1:: ; 8024 (2:4024) + db CH7 + dw SFX_Cymbal1_1_Ch1 + +SFX_Cymbal2_1:: ; 8027 (2:4027) + db CH7 + dw SFX_Cymbal2_1_Ch1 + +SFX_Cymbal3_1:: ; 802a (2:402a) + db CH7 + dw SFX_Cymbal3_1_Ch1 + +SFX_Muted_Snare1_1:: ; 802d (2:402d) + db CH7 + dw SFX_Muted_Snare1_1_Ch1 + +SFX_Triangle3_1:: ; 8030 (2:4030) + db CH7 + dw SFX_Triangle3_1_Ch1 + +SFX_Muted_Snare2_1:: ; 8033 (2:4033) + db CH7 + dw SFX_Muted_Snare2_1_Ch1 + +SFX_Muted_Snare3_1:: ; 8036 (2:4036) + db CH7 + dw SFX_Muted_Snare3_1_Ch1 + +SFX_Muted_Snare4_1:: ; 8039 (2:4039) + db CH7 + dw SFX_Muted_Snare4_1_Ch1 + +SFX_Cry00_1:: ; 803c (2:403c) + db ( $80 | CH4 ) + dw SFX_Cry00_1_Ch1 + db CH5 + dw SFX_Cry00_1_Ch2 + db CH7 + dw SFX_Cry00_1_Ch3 + +SFX_Cry01_1:: ; 8045 (2:4045) + db ( $80 | CH4 ) + dw SFX_Cry01_1_Ch1 + db CH5 + dw SFX_Cry01_1_Ch2 + db CH7 + dw SFX_Cry01_1_Ch3 + +SFX_Cry02_1:: ; 804e (2:404e) + db ( $80 | CH4 ) + dw SFX_Cry02_1_Ch1 + db CH5 + dw SFX_Cry02_1_Ch2 + db CH7 + dw SFX_Cry02_1_Ch3 + +SFX_Cry03_1:: ; 8057 (2:4057) + db ( $80 | CH4 ) + dw SFX_Cry03_1_Ch1 + db CH5 + dw SFX_Cry03_1_Ch2 + db CH7 + dw SFX_Cry03_1_Ch3 + +SFX_Cry04_1:: ; 8060 (2:4060) + db ( $80 | CH4 ) + dw SFX_Cry04_1_Ch1 + db CH5 + dw SFX_Cry04_1_Ch2 + db CH7 + dw SFX_Cry04_1_Ch3 + +SFX_Cry05_1:: ; 8069 (2:4069) + db ( $80 | CH4 ) + dw SFX_Cry05_1_Ch1 + db CH5 + dw SFX_Cry05_1_Ch2 + db CH7 + dw SFX_Cry05_1_Ch3 + +SFX_Cry06_1:: ; 8072 (2:4072) + db ( $80 | CH4 ) + dw SFX_Cry06_1_Ch1 + db CH5 + dw SFX_Cry06_1_Ch2 + db CH7 + dw SFX_Cry06_1_Ch3 + +SFX_Cry07_1:: ; 807b (2:407b) + db ( $80 | CH4 ) + dw SFX_Cry07_1_Ch1 + db CH5 + dw SFX_Cry07_1_Ch2 + db CH7 + dw SFX_Cry07_1_Ch3 + +SFX_Cry08_1:: ; 8084 (2:4084) + db ( $80 | CH4 ) + dw SFX_Cry08_1_Ch1 + db CH5 + dw SFX_Cry08_1_Ch2 + db CH7 + dw SFX_Cry08_1_Ch3 + +SFX_Cry09_1:: ; 808d (2:408d) + db ( $80 | CH4 ) + dw SFX_Cry09_1_Ch1 + db CH5 + dw SFX_Cry09_1_Ch2 + db CH7 + dw SFX_Cry09_1_Ch3 + +SFX_Cry0A_1:: ; 8096 (2:4096) + db ( $80 | CH4 ) + dw SFX_Cry0A_1_Ch1 + db CH5 + dw SFX_Cry0A_1_Ch2 + db CH7 + dw SFX_Cry0A_1_Ch3 + +SFX_Cry0B_1:: ; 809f (2:409f) + db ( $80 | CH4 ) + dw SFX_Cry0B_1_Ch1 + db CH5 + dw SFX_Cry0B_1_Ch2 + db CH7 + dw SFX_Cry0B_1_Ch3 + +SFX_Cry0C_1:: ; 80a8 (2:40a8) + db ( $80 | CH4 ) + dw SFX_Cry0C_1_Ch1 + db CH5 + dw SFX_Cry0C_1_Ch2 + db CH7 + dw SFX_Cry0C_1_Ch3 + +SFX_Cry0D_1:: ; 80b1 (2:40b1) + db ( $80 | CH4 ) + dw SFX_Cry0D_1_Ch1 + db CH5 + dw SFX_Cry0D_1_Ch2 + db CH7 + dw SFX_Cry0D_1_Ch3 + +SFX_Cry0E_1:: ; 80ba (2:40ba) + db ( $80 | CH4 ) + dw SFX_Cry0E_1_Ch1 + db CH5 + dw SFX_Cry0E_1_Ch2 + db CH7 + dw SFX_Cry0E_1_Ch3 + +SFX_Cry0F_1:: ; 80c3 (2:40c3) + db ( $80 | CH4 ) + dw SFX_Cry0F_1_Ch1 + db CH5 + dw SFX_Cry0F_1_Ch2 + db CH7 + dw SFX_Cry0F_1_Ch3 + +SFX_Cry10_1:: ; 80cc (2:40cc) + db ( $80 | CH4 ) + dw SFX_Cry10_1_Ch1 + db CH5 + dw SFX_Cry10_1_Ch2 + db CH7 + dw SFX_Cry10_1_Ch3 + +SFX_Cry11_1:: ; 80d5 (2:40d5) + db ( $80 | CH4 ) + dw SFX_Cry11_1_Ch1 + db CH5 + dw SFX_Cry11_1_Ch2 + db CH7 + dw SFX_Cry11_1_Ch3 + +SFX_Cry12_1:: ; 80de (2:40de) + db ( $80 | CH4 ) + dw SFX_Cry12_1_Ch1 + db CH5 + dw SFX_Cry12_1_Ch2 + db CH7 + dw SFX_Cry12_1_Ch3 + +SFX_Cry13_1:: ; 80e7 (2:40e7) + db ( $80 | CH4 ) + dw SFX_Cry13_1_Ch1 + db CH5 + dw SFX_Cry13_1_Ch2 + db CH7 + dw SFX_Cry13_1_Ch3 + +SFX_Cry14_1:: ; 80f0 (2:40f0) + db ( $80 | CH4 ) + dw SFX_Cry14_1_Ch1 + db CH5 + dw SFX_Cry14_1_Ch2 + db CH7 + dw SFX_Cry14_1_Ch3 + +SFX_Cry15_1:: ; 80f9 (2:40f9) + db ( $80 | CH4 ) + dw SFX_Cry15_1_Ch1 + db CH5 + dw SFX_Cry15_1_Ch2 + db CH7 + dw SFX_Cry15_1_Ch3 + +SFX_Cry16_1:: ; 8102 (2:4102) + db ( $80 | CH4 ) + dw SFX_Cry16_1_Ch1 + db CH5 + dw SFX_Cry16_1_Ch2 + db CH7 + dw SFX_Cry16_1_Ch3 + +SFX_Cry17_1:: ; 810b (2:410b) + db ( $80 | CH4 ) + dw SFX_Cry17_1_Ch1 + db CH5 + dw SFX_Cry17_1_Ch2 + db CH7 + dw SFX_Cry17_1_Ch3 + +SFX_Cry18_1:: ; 8114 (2:4114) + db ( $80 | CH4 ) + dw SFX_Cry18_1_Ch1 + db CH5 + dw SFX_Cry18_1_Ch2 + db CH7 + dw SFX_Cry18_1_Ch3 + +SFX_Cry19_1:: ; 811d (2:411d) + db ( $80 | CH4 ) + dw SFX_Cry19_1_Ch1 + db CH5 + dw SFX_Cry19_1_Ch2 + db CH7 + dw SFX_Cry19_1_Ch3 + +SFX_Cry1A_1:: ; 8126 (2:4126) + db ( $80 | CH4 ) + dw SFX_Cry1A_1_Ch1 + db CH5 + dw SFX_Cry1A_1_Ch2 + db CH7 + dw SFX_Cry1A_1_Ch3 + +SFX_Cry1B_1:: ; 812f (2:412f) + db ( $80 | CH4 ) + dw SFX_Cry1B_1_Ch1 + db CH5 + dw SFX_Cry1B_1_Ch2 + db CH7 + dw SFX_Cry1B_1_Ch3 + +SFX_Cry1C_1:: ; 8138 (2:4138) + db ( $80 | CH4 ) + dw SFX_Cry1C_1_Ch1 + db CH5 + dw SFX_Cry1C_1_Ch2 + db CH7 + dw SFX_Cry1C_1_Ch3 + +SFX_Cry1D_1:: ; 8141 (2:4141) + db ( $80 | CH4 ) + dw SFX_Cry1D_1_Ch1 + db CH5 + dw SFX_Cry1D_1_Ch2 + db CH7 + dw SFX_Cry1D_1_Ch3 + +SFX_Cry1E_1:: ; 814a (2:414a) + db ( $80 | CH4 ) + dw SFX_Cry1E_1_Ch1 + db CH5 + dw SFX_Cry1E_1_Ch2 + db CH7 + dw SFX_Cry1E_1_Ch3 + +SFX_Cry1F_1:: ; 8153 (2:4153) + db ( $80 | CH4 ) + dw SFX_Cry1F_1_Ch1 + db CH5 + dw SFX_Cry1F_1_Ch2 + db CH7 + dw SFX_Cry1F_1_Ch3 + +SFX_Cry20_1:: ; 815c (2:415c) + db ( $80 | CH4 ) + dw SFX_Cry20_1_Ch1 + db CH5 + dw SFX_Cry20_1_Ch2 + db CH7 + dw SFX_Cry20_1_Ch3 + +SFX_Cry21_1:: ; 8165 (2:4165) + db ( $80 | CH4 ) + dw SFX_Cry21_1_Ch1 + db CH5 + dw SFX_Cry21_1_Ch2 + db CH7 + dw SFX_Cry21_1_Ch3 + +SFX_Cry22_1:: ; 816e (2:416e) + db ( $80 | CH4 ) + dw SFX_Cry22_1_Ch1 + db CH5 + dw SFX_Cry22_1_Ch2 + db CH7 + dw SFX_Cry22_1_Ch3 + +SFX_Cry23_1:: ; 8177 (2:4177) + db ( $80 | CH4 ) + dw SFX_Cry23_1_Ch1 + db CH5 + dw SFX_Cry23_1_Ch2 + db CH7 + dw SFX_Cry23_1_Ch3 + +SFX_Cry24_1:: ; 8180 (2:4180) + db ( $80 | CH4 ) + dw SFX_Cry24_1_Ch1 + db CH5 + dw SFX_Cry24_1_Ch2 + db CH7 + dw SFX_Cry24_1_Ch3 + +SFX_Cry25_1:: ; 8189 (2:4189) + db ( $80 | CH4 ) + dw SFX_Cry25_1_Ch1 + db CH5 + dw SFX_Cry25_1_Ch2 + db CH7 + dw SFX_Cry25_1_Ch3 + +SFX_Get_Item1_1:: ; 8192 (2:4192) + db ( $80 | CH4 ) + dw SFX_Get_Item1_1_Ch1 + db CH5 + dw SFX_Get_Item1_1_Ch2 + db CH6 + dw SFX_Get_Item1_1_Ch3 + +SFX_Get_Item2_1:: ; 819b (2:419b) + db ( $80 | CH4 ) + dw SFX_Get_Item2_1_Ch1 + db CH5 + dw SFX_Get_Item2_1_Ch2 + db CH6 + dw SFX_Get_Item2_1_Ch3 + +SFX_Tink_1:: ; 81a4 (2:41a4) + db CH4 + dw SFX_Tink_1_Ch1 + +SFX_Heal_HP_1:: ; 81a7 (2:41a7) + db CH4 + dw SFX_Heal_HP_1_Ch1 + +SFX_Heal_Ailment_1:: ; 81aa (2:41aa) + db CH4 + dw SFX_Heal_Ailment_1_Ch1 + +SFX_Start_Menu_1:: ; 81ad (2:41ad) + db CH7 + dw SFX_Start_Menu_1_Ch1 + +SFX_Press_AB_1:: ; 81b0 (2:41b0) + db CH4 + dw SFX_Press_AB_1_Ch1 + +SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3) + db ( $80 | CH4 ) + dw SFX_Pokedex_Rating_1_Ch1 + db CH5 + dw SFX_Pokedex_Rating_1_Ch2 + db CH6 + dw SFX_Pokedex_Rating_1_Ch3 + +SFX_Get_Key_Item_1:: ; 81bc (2:41bc) + db ( $80 | CH4 ) + dw SFX_Get_Key_Item_1_Ch1 + db CH5 + dw SFX_Get_Key_Item_1_Ch2 + db CH6 + dw SFX_Get_Key_Item_1_Ch3 + +SFX_Poisoned_1:: ; 81c5 (2:41c5) + db CH4 + dw SFX_Poisoned_1_Ch1 + +SFX_Trade_Machine_1:: ; 81c8 (2:41c8) + db CH4 + dw SFX_Trade_Machine_1_Ch1 + +SFX_Turn_On_PC_1:: ; 81cb (2:41cb) + db CH4 + dw SFX_Turn_On_PC_1_Ch1 + +SFX_Turn_Off_PC_1:: ; 81ce (2:41ce) + db CH4 + dw SFX_Turn_Off_PC_1_Ch1 + +SFX_Enter_PC_1:: ; 81d1 (2:41d1) + db CH4 + dw SFX_Enter_PC_1_Ch1 + +SFX_Shrink_1:: ; 81d4 (2:41d4) + db CH4 + dw SFX_Shrink_1_Ch1 + +SFX_Switch_1:: ; 81d7 (2:41d7) + db CH4 + dw SFX_Switch_1_Ch1 + +SFX_Healing_Machine_1:: ; 81da (2:41da) + db CH4 + dw SFX_Healing_Machine_1_Ch1 + +SFX_Teleport_Exit1_1:: ; 81dd (2:41dd) + db CH4 + dw SFX_Teleport_Exit1_1_Ch1 + +SFX_Teleport_Enter1_1:: ; 81e0 (2:41e0) + db CH4 + dw SFX_Teleport_Enter1_1_Ch1 + +SFX_Teleport_Exit2_1:: ; 81e3 (2:41e3) + db CH4 + dw SFX_Teleport_Exit2_1_Ch1 + +SFX_Ledge_1:: ; 81e6 (2:41e6) + db CH4 + dw SFX_Ledge_1_Ch1 + +SFX_Teleport_Enter2_1:: ; 81e9 (2:41e9) + db CH7 + dw SFX_Teleport_Enter2_1_Ch1 + +SFX_Fly_1:: ; 81ec (2:41ec) + db CH7 + dw SFX_Fly_1_Ch1 + +SFX_Denied_1:: ; 81ef (2:41ef) + db ( $40 | CH4 ) + dw SFX_Denied_1_Ch1 + db CH5 + dw SFX_Denied_1_Ch2 + +SFX_Arrow_Tiles_1:: ; 81f5 (2:41f5) + db CH4 + dw SFX_Arrow_Tiles_1_Ch1 + +SFX_Push_Boulder_1:: ; 81f8 (2:41f8) + db CH7 + dw SFX_Push_Boulder_1_Ch1 + +SFX_SS_Anne_Horn_1:: ; 81fb (2:41fb) + db ( $40 | CH4 ) + dw SFX_SS_Anne_Horn_1_Ch1 + db CH5 + dw SFX_SS_Anne_Horn_1_Ch2 + +SFX_Withdraw_Deposit_1:: ; 8201 (2:4201) + db CH4 + dw SFX_Withdraw_Deposit_1_Ch1 + +SFX_Cut_1:: ; 8204 (2:4204) + db CH7 + dw SFX_Cut_1_Ch1 + +SFX_Go_Inside_1:: ; 8207 (2:4207) + db CH7 + dw SFX_Go_Inside_1_Ch1 + +SFX_Swap_1:: ; 820a (2:420a) + db ( $40 | CH4 ) + dw SFX_Swap_1_Ch1 + db CH5 + dw SFX_Swap_1_Ch2 + +SFX_59_1:: ; 8210 (2:4210) + db ( $40 | CH4 ) + dw SFX_59_1_Ch1 + db CH5 + dw SFX_59_1_Ch2 + +SFX_Purchase_1:: ; 8216 (2:4216) + db ( $40 | CH4 ) + dw SFX_Purchase_1_Ch1 + db CH5 + dw SFX_Purchase_1_Ch2 + +SFX_Collision_1:: ; 821c (2:421c) + db CH4 + dw SFX_Collision_1_Ch1 + +SFX_Go_Outside_1:: ; 821f (2:421f) + db CH7 + dw SFX_Go_Outside_1_Ch1 + +SFX_Save_1:: ; 8222 (2:4222) + db ( $40 | CH4 ) + dw SFX_Save_1_Ch1 + db CH5 + dw SFX_Save_1_Ch2 + +SFX_Pokeflute:: ; 8228 (2:4228) + db CH2 + dw SFX_Pokeflute_Ch1 + +SFX_Safari_Zone_PA:: ; 822b (2:422b) + db CH4 + dw SFX_Safari_Zone_PA_Ch1 diff --git a/audio/headers/sfxheaders1f.asm b/audio/headers/sfxheaders1f.asm deleted file mode 100644 index 7af4755f..00000000 --- a/audio/headers/sfxheaders1f.asm +++ /dev/null @@ -1,596 +0,0 @@ -SFX_Headers_1f:: - db $ff, $ff, $ff ; padding - -SFX_Snare1_3:: ; 7c003 (1f:4003) - db CH7 - dw SFX_Snare1_3_Ch1 - -SFX_Snare2_3:: ; 7c006 (1f:4006) - db CH7 - dw SFX_Snare2_3_Ch1 - -SFX_Snare3_3:: ; 7c009 (1f:4009) - db CH7 - dw SFX_Snare3_3_Ch1 - -SFX_Snare4_3:: ; 7c00c (1f:400c) - db CH7 - dw SFX_Snare4_3_Ch1 - -SFX_Snare5_3:: ; 7c00f (1f:400f) - db CH7 - dw SFX_Snare5_3_Ch1 - -SFX_Triangle1_3:: ; 7c012 (1f:4012) - db CH7 - dw SFX_Triangle1_3_Ch1 - -SFX_Triangle2_3:: ; 7c015 (1f:4015) - db CH7 - dw SFX_Triangle2_3_Ch1 - -SFX_Snare6_3:: ; 7c018 (1f:4018) - db CH7 - dw SFX_Snare6_3_Ch1 - -SFX_Snare7_3:: ; 7c01b (1f:401b) - db CH7 - dw SFX_Snare7_3_Ch1 - -SFX_Snare8_3:: ; 7c01e (1f:401e) - db CH7 - dw SFX_Snare8_3_Ch1 - -SFX_Snare9_3:: ; 7c021 (1f:4021) - db CH7 - dw SFX_Snare9_3_Ch1 - -SFX_Cymbal1_3:: ; 7c024 (1f:4024) - db CH7 - dw SFX_Cymbal1_3_Ch1 - -SFX_Cymbal2_3:: ; 7c027 (1f:4027) - db CH7 - dw SFX_Cymbal2_3_Ch1 - -SFX_Cymbal3_3:: ; 7c02a (1f:402a) - db CH7 - dw SFX_Cymbal3_3_Ch1 - -SFX_Muted_Snare1_3:: ; 7c02d (1f:402d) - db CH7 - dw SFX_Muted_Snare1_3_Ch1 - -SFX_Triangle3_3:: ; 7c030 (1f:4030) - db CH7 - dw SFX_Triangle3_3_Ch1 - -SFX_Muted_Snare2_3:: ; 7c033 (1f:4033) - db CH7 - dw SFX_Muted_Snare2_3_Ch1 - -SFX_Muted_Snare3_3:: ; 7c036 (1f:4036) - db CH7 - dw SFX_Muted_Snare3_3_Ch1 - -SFX_Muted_Snare4_3:: ; 7c039 (1f:4039) - db CH7 - dw SFX_Muted_Snare4_3_Ch1 - -SFX_Cry00_3:: ; 7c03c (1f:403c) - db ( $80 | CH4 ) - dw SFX_Cry00_3_Ch1 - db CH5 - dw SFX_Cry00_3_Ch2 - db CH7 - dw SFX_Cry00_3_Ch3 - -SFX_Cry01_3:: ; 7c045 (1f:4045) - db ( $80 | CH4 ) - dw SFX_Cry01_3_Ch1 - db CH5 - dw SFX_Cry01_3_Ch2 - db CH7 - dw SFX_Cry01_3_Ch3 - -SFX_Cry02_3:: ; 7c04e (1f:404e) - db ( $80 | CH4 ) - dw SFX_Cry02_3_Ch1 - db CH5 - dw SFX_Cry02_3_Ch2 - db CH7 - dw SFX_Cry02_3_Ch3 - -SFX_Cry03_3:: ; 7c057 (1f:4057) - db ( $80 | CH4 ) - dw SFX_Cry03_3_Ch1 - db CH5 - dw SFX_Cry03_3_Ch2 - db CH7 - dw SFX_Cry03_3_Ch3 - -SFX_Cry04_3:: ; 7c060 (1f:4060) - db ( $80 | CH4 ) - dw SFX_Cry04_3_Ch1 - db CH5 - dw SFX_Cry04_3_Ch2 - db CH7 - dw SFX_Cry04_3_Ch3 - -SFX_Cry05_3:: ; 7c069 (1f:4069) - db ( $80 | CH4 ) - dw SFX_Cry05_3_Ch1 - db CH5 - dw SFX_Cry05_3_Ch2 - db CH7 - dw SFX_Cry05_3_Ch3 - -SFX_Cry06_3:: ; 7c072 (1f:4072) - db ( $80 | CH4 ) - dw SFX_Cry06_3_Ch1 - db CH5 - dw SFX_Cry06_3_Ch2 - db CH7 - dw SFX_Cry06_3_Ch3 - -SFX_Cry07_3:: ; 7c07b (1f:407b) - db ( $80 | CH4 ) - dw SFX_Cry07_3_Ch1 - db CH5 - dw SFX_Cry07_3_Ch2 - db CH7 - dw SFX_Cry07_3_Ch3 - -SFX_Cry08_3:: ; 7c084 (1f:4084) - db ( $80 | CH4 ) - dw SFX_Cry08_3_Ch1 - db CH5 - dw SFX_Cry08_3_Ch2 - db CH7 - dw SFX_Cry08_3_Ch3 - -SFX_Cry09_3:: ; 7c08d (1f:408d) - db ( $80 | CH4 ) - dw SFX_Cry09_3_Ch1 - db CH5 - dw SFX_Cry09_3_Ch2 - db CH7 - dw SFX_Cry09_3_Ch3 - -SFX_Cry0A_3:: ; 7c096 (1f:4096) - db ( $80 | CH4 ) - dw SFX_Cry0A_3_Ch1 - db CH5 - dw SFX_Cry0A_3_Ch2 - db CH7 - dw SFX_Cry0A_3_Ch3 - -SFX_Cry0B_3:: ; 7c09f (1f:409f) - db ( $80 | CH4 ) - dw SFX_Cry0B_3_Ch1 - db CH5 - dw SFX_Cry0B_3_Ch2 - db CH7 - dw SFX_Cry0B_3_Ch3 - -SFX_Cry0C_3:: ; 7c0a8 (1f:40a8) - db ( $80 | CH4 ) - dw SFX_Cry0C_3_Ch1 - db CH5 - dw SFX_Cry0C_3_Ch2 - db CH7 - dw SFX_Cry0C_3_Ch3 - -SFX_Cry0D_3:: ; 7c0b1 (1f:40b1) - db ( $80 | CH4 ) - dw SFX_Cry0D_3_Ch1 - db CH5 - dw SFX_Cry0D_3_Ch2 - db CH7 - dw SFX_Cry0D_3_Ch3 - -SFX_Cry0E_3:: ; 7c0ba (1f:40ba) - db ( $80 | CH4 ) - dw SFX_Cry0E_3_Ch1 - db CH5 - dw SFX_Cry0E_3_Ch2 - db CH7 - dw SFX_Cry0E_3_Ch3 - -SFX_Cry0F_3:: ; 7c0c3 (1f:40c3) - db ( $80 | CH4 ) - dw SFX_Cry0F_3_Ch1 - db CH5 - dw SFX_Cry0F_3_Ch2 - db CH7 - dw SFX_Cry0F_3_Ch3 - -SFX_Cry10_3:: ; 7c0cc (1f:40cc) - db ( $80 | CH4 ) - dw SFX_Cry10_3_Ch1 - db CH5 - dw SFX_Cry10_3_Ch2 - db CH7 - dw SFX_Cry10_3_Ch3 - -SFX_Cry11_3:: ; 7c0d5 (1f:40d5) - db ( $80 | CH4 ) - dw SFX_Cry11_3_Ch1 - db CH5 - dw SFX_Cry11_3_Ch2 - db CH7 - dw SFX_Cry11_3_Ch3 - -SFX_Cry12_3:: ; 7c0de (1f:40de) - db ( $80 | CH4 ) - dw SFX_Cry12_3_Ch1 - db CH5 - dw SFX_Cry12_3_Ch2 - db CH7 - dw SFX_Cry12_3_Ch3 - -SFX_Cry13_3:: ; 7c0e7 (1f:40e7) - db ( $80 | CH4 ) - dw SFX_Cry13_3_Ch1 - db CH5 - dw SFX_Cry13_3_Ch2 - db CH7 - dw SFX_Cry13_3_Ch3 - -SFX_Cry14_3:: ; 7c0f0 (1f:40f0) - db ( $80 | CH4 ) - dw SFX_Cry14_3_Ch1 - db CH5 - dw SFX_Cry14_3_Ch2 - db CH7 - dw SFX_Cry14_3_Ch3 - -SFX_Cry15_3:: ; 7c0f9 (1f:40f9) - db ( $80 | CH4 ) - dw SFX_Cry15_3_Ch1 - db CH5 - dw SFX_Cry15_3_Ch2 - db CH7 - dw SFX_Cry15_3_Ch3 - -SFX_Cry16_3:: ; 7c102 (1f:4102) - db ( $80 | CH4 ) - dw SFX_Cry16_3_Ch1 - db CH5 - dw SFX_Cry16_3_Ch2 - db CH7 - dw SFX_Cry16_3_Ch3 - -SFX_Cry17_3:: ; 7c10b (1f:410b) - db ( $80 | CH4 ) - dw SFX_Cry17_3_Ch1 - db CH5 - dw SFX_Cry17_3_Ch2 - db CH7 - dw SFX_Cry17_3_Ch3 - -SFX_Cry18_3:: ; 7c114 (1f:4114) - db ( $80 | CH4 ) - dw SFX_Cry18_3_Ch1 - db CH5 - dw SFX_Cry18_3_Ch2 - db CH7 - dw SFX_Cry18_3_Ch3 - -SFX_Cry19_3:: ; 7c11d (1f:411d) - db ( $80 | CH4 ) - dw SFX_Cry19_3_Ch1 - db CH5 - dw SFX_Cry19_3_Ch2 - db CH7 - dw SFX_Cry19_3_Ch3 - -SFX_Cry1A_3:: ; 7c126 (1f:4126) - db ( $80 | CH4 ) - dw SFX_Cry1A_3_Ch1 - db CH5 - dw SFX_Cry1A_3_Ch2 - db CH7 - dw SFX_Cry1A_3_Ch3 - -SFX_Cry1B_3:: ; 7c12f (1f:412f) - db ( $80 | CH4 ) - dw SFX_Cry1B_3_Ch1 - db CH5 - dw SFX_Cry1B_3_Ch2 - db CH7 - dw SFX_Cry1B_3_Ch3 - -SFX_Cry1C_3:: ; 7c138 (1f:4138) - db ( $80 | CH4 ) - dw SFX_Cry1C_3_Ch1 - db CH5 - dw SFX_Cry1C_3_Ch2 - db CH7 - dw SFX_Cry1C_3_Ch3 - -SFX_Cry1D_3:: ; 7c141 (1f:4141) - db ( $80 | CH4 ) - dw SFX_Cry1D_3_Ch1 - db CH5 - dw SFX_Cry1D_3_Ch2 - db CH7 - dw SFX_Cry1D_3_Ch3 - -SFX_Cry1E_3:: ; 7c14a (1f:414a) - db ( $80 | CH4 ) - dw SFX_Cry1E_3_Ch1 - db CH5 - dw SFX_Cry1E_3_Ch2 - db CH7 - dw SFX_Cry1E_3_Ch3 - -SFX_Cry1F_3:: ; 7c153 (1f:4153) - db ( $80 | CH4 ) - dw SFX_Cry1F_3_Ch1 - db CH5 - dw SFX_Cry1F_3_Ch2 - db CH7 - dw SFX_Cry1F_3_Ch3 - -SFX_Cry20_3:: ; 7c15c (1f:415c) - db ( $80 | CH4 ) - dw SFX_Cry20_3_Ch1 - db CH5 - dw SFX_Cry20_3_Ch2 - db CH7 - dw SFX_Cry20_3_Ch3 - -SFX_Cry21_3:: ; 7c165 (1f:4165) - db ( $80 | CH4 ) - dw SFX_Cry21_3_Ch1 - db CH5 - dw SFX_Cry21_3_Ch2 - db CH7 - dw SFX_Cry21_3_Ch3 - -SFX_Cry22_3:: ; 7c16e (1f:416e) - db ( $80 | CH4 ) - dw SFX_Cry22_3_Ch1 - db CH5 - dw SFX_Cry22_3_Ch2 - db CH7 - dw SFX_Cry22_3_Ch3 - -SFX_Cry23_3:: ; 7c177 (1f:4177) - db ( $80 | CH4 ) - dw SFX_Cry23_3_Ch1 - db CH5 - dw SFX_Cry23_3_Ch2 - db CH7 - dw SFX_Cry23_3_Ch3 - -SFX_Cry24_3:: ; 7c180 (1f:4180) - db ( $80 | CH4 ) - dw SFX_Cry24_3_Ch1 - db CH5 - dw SFX_Cry24_3_Ch2 - db CH7 - dw SFX_Cry24_3_Ch3 - -SFX_Cry25_3:: ; 7c189 (1f:4189) - db ( $80 | CH4 ) - dw SFX_Cry25_3_Ch1 - db CH5 - dw SFX_Cry25_3_Ch2 - db CH7 - dw SFX_Cry25_3_Ch3 - -SFX_Get_Item1_3:: ; 7c192 (1f:4192) - db ( $80 | CH4 ) - dw SFX_Get_Item1_3_Ch1 - db CH5 - dw SFX_Get_Item1_3_Ch2 - db CH6 - dw SFX_Get_Item1_3_Ch3 - -SFX_Get_Item2_3:: ; 7c19b (1f:419b) - db ( $80 | CH4 ) - dw SFX_Get_Item2_3_Ch1 - db CH5 - dw SFX_Get_Item2_3_Ch2 - db CH6 - dw SFX_Get_Item2_3_Ch3 - -SFX_Tink_3:: ; 7c1a4 (1f:41a4) - db CH4 - dw SFX_Tink_3_Ch1 - -SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7) - db CH4 - dw SFX_Heal_HP_3_Ch1 - -SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa) - db CH4 - dw SFX_Heal_Ailment_3_Ch1 - -SFX_Start_Menu_3:: ; 7c1ad (1f:41ad) - db CH7 - dw SFX_Start_Menu_3_Ch1 - -SFX_Press_AB_3:: ; 7c1b0 (1f:41b0) - db CH4 - dw SFX_Press_AB_3_Ch1 - -SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3) - db ( $80 | CH4 ) - dw SFX_Pokedex_Rating_3_Ch1 - db CH5 - dw SFX_Pokedex_Rating_3_Ch2 - db CH6 - dw SFX_Pokedex_Rating_3_Ch3 - -SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc) - db ( $80 | CH4 ) - dw SFX_Get_Key_Item_3_Ch1 - db CH5 - dw SFX_Get_Key_Item_3_Ch2 - db CH6 - dw SFX_Get_Key_Item_3_Ch3 - -SFX_Poisoned_3:: ; 7c1c5 (1f:41c5) - db CH4 - dw SFX_Poisoned_3_Ch1 - -SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8) - db CH4 - dw SFX_Trade_Machine_3_Ch1 - -SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb) - db CH4 - dw SFX_Turn_On_PC_3_Ch1 - -SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce) - db CH4 - dw SFX_Turn_Off_PC_3_Ch1 - -SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1) - db CH4 - dw SFX_Enter_PC_3_Ch1 - -SFX_Shrink_3:: ; 7c1d4 (1f:41d4) - db CH4 - dw SFX_Shrink_3_Ch1 - -SFX_Switch_3:: ; 7c1d7 (1f:41d7) - db CH4 - dw SFX_Switch_3_Ch1 - -SFX_Healing_Machine_3:: ; 7c1da (1f:41da) - db CH4 - dw SFX_Healing_Machine_3_Ch1 - -SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd) - db CH4 - dw SFX_Teleport_Exit1_3_Ch1 - -SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0) - db CH4 - dw SFX_Teleport_Enter1_3_Ch1 - -SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3) - db CH4 - dw SFX_Teleport_Exit2_3_Ch1 - -SFX_Ledge_3:: ; 7c1e6 (1f:41e6) - db CH4 - dw SFX_Ledge_3_Ch1 - -SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9) - db CH7 - dw SFX_Teleport_Enter2_3_Ch1 - -SFX_Fly_3:: ; 7c1ec (1f:41ec) - db CH7 - dw SFX_Fly_3_Ch1 - -SFX_Denied_3:: ; 7c1ef (1f:41ef) - db ( $40 | CH4 ) - dw SFX_Denied_3_Ch1 - db CH5 - dw SFX_Denied_3_Ch2 - -SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5) - db CH4 - dw SFX_Arrow_Tiles_3_Ch1 - -SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8) - db CH7 - dw SFX_Push_Boulder_3_Ch1 - -SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb) - db ( $40 | CH4 ) - dw SFX_SS_Anne_Horn_3_Ch1 - db CH5 - dw SFX_SS_Anne_Horn_3_Ch2 - -SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201) - db CH4 - dw SFX_Withdraw_Deposit_3_Ch1 - -SFX_Cut_3:: ; 7c204 (1f:4204) - db CH7 - dw SFX_Cut_3_Ch1 - -SFX_Go_Inside_3:: ; 7c207 (1f:4207) - db CH7 - dw SFX_Go_Inside_3_Ch1 - -SFX_Swap_3:: ; 7c20a (1f:420a) - db ( $40 | CH4 ) - dw SFX_Swap_3_Ch1 - db CH5 - dw SFX_Swap_3_Ch2 - -SFX_59_3:: ; 7c210 (1f:4210) - db ( $40 | CH4 ) - dw SFX_59_3_Ch1 - db CH5 - dw SFX_59_3_Ch2 - -SFX_Purchase_3:: ; 7c216 (1f:4216) - db ( $40 | CH4 ) - dw SFX_Purchase_3_Ch1 - db CH5 - dw SFX_Purchase_3_Ch2 - -SFX_Collision_3:: ; 7c21c (1f:421c) - db CH4 - dw SFX_Collision_3_Ch1 - -SFX_Go_Outside_3:: ; 7c21f (1f:421f) - db CH7 - dw SFX_Go_Outside_3_Ch1 - -SFX_Save_3:: ; 7c222 (1f:4222) - db ( $40 | CH4 ) - dw SFX_Save_3_Ch1 - db CH5 - dw SFX_Save_3_Ch2 - -SFX_Intro_Lunge:: ; 7c228 (1f:4228) - db CH7 - dw SFX_Intro_Lunge_Ch1 - -SFX_Intro_Hip:: ; 7c22b (1f:422b) - db CH4 - dw SFX_Intro_Hip_Ch1 - -SFX_Intro_Hop:: ; 7c22e (1f:422e) - db CH4 - dw SFX_Intro_Hop_Ch1 - -SFX_Intro_Raise:: ; 7c231 (1f:4231) - db CH7 - dw SFX_Intro_Raise_Ch1 - -SFX_Intro_Crash:: ; 7c234 (1f:4234) - db CH7 - dw SFX_Intro_Crash_Ch1 - -SFX_Intro_Whoosh:: ; 7c237 (1f:4237) - db CH7 - dw SFX_Intro_Whoosh_Ch1 - -SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a) - db CH4 - dw SFX_Slots_Stop_Wheel_Ch1 - -SFX_Slots_Reward:: ; 7c23d (1f:423d) - db CH4 - dw SFX_Slots_Reward_Ch1 - -SFX_Slots_New_Spin:: ; 7c240 (1f:4240) - db ( $40 | CH4 ) - dw SFX_Slots_New_Spin_Ch1 - db CH5 - dw SFX_Slots_New_Spin_Ch2 - -SFX_Shooting_Star:: ; 7c246 (1f:4246) - db CH4 - dw SFX_Shooting_Star_Ch1 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm new file mode 100644 index 00000000..1b30f5cc --- /dev/null +++ b/audio/headers/sfxheaders2.asm @@ -0,0 +1,706 @@ +SFX_Headers_2:: + db $ff, $ff, $ff ; padding + +SFX_Snare1_2:: ; 20003 (8:4003) + db CH7 + dw SFX_Snare1_2_Ch1 + +SFX_Snare2_2:: ; 20006 (8:4006) + db CH7 + dw SFX_Snare2_2_Ch1 + +SFX_Snare3_2:: ; 20009 (8:4009) + db CH7 + dw SFX_Snare3_2_Ch1 + +SFX_Snare4_2:: ; 2000c (8:400c) + db CH7 + dw SFX_Snare4_2_Ch1 + +SFX_Snare5_2:: ; 2000f (8:400f) + db CH7 + dw SFX_Snare5_2_Ch1 + +SFX_Triangle1_2:: ; 20012 (8:4012) + db CH7 + dw SFX_Triangle1_2_Ch1 + +SFX_Triangle2_2:: ; 20015 (8:4015) + db CH7 + dw SFX_Triangle2_2_Ch1 + +SFX_Snare6_2:: ; 20018 (8:4018) + db CH7 + dw SFX_Snare6_2_Ch1 + +SFX_Snare7_2:: ; 2001b (8:401b) + db CH7 + dw SFX_Snare7_2_Ch1 + +SFX_Snare8_2:: ; 2001e (8:401e) + db CH7 + dw SFX_Snare8_2_Ch1 + +SFX_Snare9_2:: ; 20021 (8:4021) + db CH7 + dw SFX_Snare9_2_Ch1 + +SFX_Cymbal1_2:: ; 20024 (8:4024) + db CH7 + dw SFX_Cymbal1_2_Ch1 + +SFX_Cymbal2_2:: ; 20027 (8:4027) + db CH7 + dw SFX_Cymbal2_2_Ch1 + +SFX_Cymbal3_2:: ; 2002a (8:402a) + db CH7 + dw SFX_Cymbal3_2_Ch1 + +SFX_Muted_Snare1_2:: ; 2002d (8:402d) + db CH7 + dw SFX_Muted_Snare1_2_Ch1 + +SFX_Triangle3_2:: ; 20030 (8:4030) + db CH7 + dw SFX_Triangle3_2_Ch1 + +SFX_Muted_Snare2_2:: ; 20033 (8:4033) + db CH7 + dw SFX_Muted_Snare2_2_Ch1 + +SFX_Muted_Snare3_2:: ; 20036 (8:4036) + db CH7 + dw SFX_Muted_Snare3_2_Ch1 + +SFX_Muted_Snare4_2:: ; 20039 (8:4039) + db CH7 + dw SFX_Muted_Snare4_2_Ch1 + +SFX_Cry00_2:: ; 2003c (8:403c) + db ( $80 | CH4 ) + dw SFX_Cry00_2_Ch1 + db CH5 + dw SFX_Cry00_2_Ch2 + db CH7 + dw SFX_Cry00_2_Ch3 + +SFX_Cry01_2:: ; 20045 (8:4045) + db ( $80 | CH4 ) + dw SFX_Cry01_2_Ch1 + db CH5 + dw SFX_Cry01_2_Ch2 + db CH7 + dw SFX_Cry01_2_Ch3 + +SFX_Cry02_2:: ; 2004e (8:404e) + db ( $80 | CH4 ) + dw SFX_Cry02_2_Ch1 + db CH5 + dw SFX_Cry02_2_Ch2 + db CH7 + dw SFX_Cry02_2_Ch3 + +SFX_Cry03_2:: ; 20057 (8:4057) + db ( $80 | CH4 ) + dw SFX_Cry03_2_Ch1 + db CH5 + dw SFX_Cry03_2_Ch2 + db CH7 + dw SFX_Cry03_2_Ch3 + +SFX_Cry04_2:: ; 20060 (8:4060) + db ( $80 | CH4 ) + dw SFX_Cry04_2_Ch1 + db CH5 + dw SFX_Cry04_2_Ch2 + db CH7 + dw SFX_Cry04_2_Ch3 + +SFX_Cry05_2:: ; 20069 (8:4069) + db ( $80 | CH4 ) + dw SFX_Cry05_2_Ch1 + db CH5 + dw SFX_Cry05_2_Ch2 + db CH7 + dw SFX_Cry05_2_Ch3 + +SFX_Cry06_2:: ; 20072 (8:4072) + db ( $80 | CH4 ) + dw SFX_Cry06_2_Ch1 + db CH5 + dw SFX_Cry06_2_Ch2 + db CH7 + dw SFX_Cry06_2_Ch3 + +SFX_Cry07_2:: ; 2007b (8:407b) + db ( $80 | CH4 ) + dw SFX_Cry07_2_Ch1 + db CH5 + dw SFX_Cry07_2_Ch2 + db CH7 + dw SFX_Cry07_2_Ch3 + +SFX_Cry08_2:: ; 20084 (8:4084) + db ( $80 | CH4 ) + dw SFX_Cry08_2_Ch1 + db CH5 + dw SFX_Cry08_2_Ch2 + db CH7 + dw SFX_Cry08_2_Ch3 + +SFX_Cry09_2:: ; 2008d (8:408d) + db ( $80 | CH4 ) + dw SFX_Cry09_2_Ch1 + db CH5 + dw SFX_Cry09_2_Ch2 + db CH7 + dw SFX_Cry09_2_Ch3 + +SFX_Cry0A_2:: ; 20096 (8:4096) + db ( $80 | CH4 ) + dw SFX_Cry0A_2_Ch1 + db CH5 + dw SFX_Cry0A_2_Ch2 + db CH7 + dw SFX_Cry0A_2_Ch3 + +SFX_Cry0B_2:: ; 2009f (8:409f) + db ( $80 | CH4 ) + dw SFX_Cry0B_2_Ch1 + db CH5 + dw SFX_Cry0B_2_Ch2 + db CH7 + dw SFX_Cry0B_2_Ch3 + +SFX_Cry0C_2:: ; 200a8 (8:40a8) + db ( $80 | CH4 ) + dw SFX_Cry0C_2_Ch1 + db CH5 + dw SFX_Cry0C_2_Ch2 + db CH7 + dw SFX_Cry0C_2_Ch3 + +SFX_Cry0D_2:: ; 200b1 (8:40b1) + db ( $80 | CH4 ) + dw SFX_Cry0D_2_Ch1 + db CH5 + dw SFX_Cry0D_2_Ch2 + db CH7 + dw SFX_Cry0D_2_Ch3 + +SFX_Cry0E_2:: ; 200ba (8:40ba) + db ( $80 | CH4 ) + dw SFX_Cry0E_2_Ch1 + db CH5 + dw SFX_Cry0E_2_Ch2 + db CH7 + dw SFX_Cry0E_2_Ch3 + +SFX_Cry0F_2:: ; 200c3 (8:40c3) + db ( $80 | CH4 ) + dw SFX_Cry0F_2_Ch1 + db CH5 + dw SFX_Cry0F_2_Ch2 + db CH7 + dw SFX_Cry0F_2_Ch3 + +SFX_Cry10_2:: ; 200cc (8:40cc) + db ( $80 | CH4 ) + dw SFX_Cry10_2_Ch1 + db CH5 + dw SFX_Cry10_2_Ch2 + db CH7 + dw SFX_Cry10_2_Ch3 + +SFX_Cry11_2:: ; 200d5 (8:40d5) + db ( $80 | CH4 ) + dw SFX_Cry11_2_Ch1 + db CH5 + dw SFX_Cry11_2_Ch2 + db CH7 + dw SFX_Cry11_2_Ch3 + +SFX_Cry12_2:: ; 200de (8:40de) + db ( $80 | CH4 ) + dw SFX_Cry12_2_Ch1 + db CH5 + dw SFX_Cry12_2_Ch2 + db CH7 + dw SFX_Cry12_2_Ch3 + +SFX_Cry13_2:: ; 200e7 (8:40e7) + db ( $80 | CH4 ) + dw SFX_Cry13_2_Ch1 + db CH5 + dw SFX_Cry13_2_Ch2 + db CH7 + dw SFX_Cry13_2_Ch3 + +SFX_Cry14_2:: ; 200f0 (8:40f0) + db ( $80 | CH4 ) + dw SFX_Cry14_2_Ch1 + db CH5 + dw SFX_Cry14_2_Ch2 + db CH7 + dw SFX_Cry14_2_Ch3 + +SFX_Cry15_2:: ; 200f9 (8:40f9) + db ( $80 | CH4 ) + dw SFX_Cry15_2_Ch1 + db CH5 + dw SFX_Cry15_2_Ch2 + db CH7 + dw SFX_Cry15_2_Ch3 + +SFX_Cry16_2:: ; 20102 (8:4102) + db ( $80 | CH4 ) + dw SFX_Cry16_2_Ch1 + db CH5 + dw SFX_Cry16_2_Ch2 + db CH7 + dw SFX_Cry16_2_Ch3 + +SFX_Cry17_2:: ; 2010b (8:410b) + db ( $80 | CH4 ) + dw SFX_Cry17_2_Ch1 + db CH5 + dw SFX_Cry17_2_Ch2 + db CH7 + dw SFX_Cry17_2_Ch3 + +SFX_Cry18_2:: ; 20114 (8:4114) + db ( $80 | CH4 ) + dw SFX_Cry18_2_Ch1 + db CH5 + dw SFX_Cry18_2_Ch2 + db CH7 + dw SFX_Cry18_2_Ch3 + +SFX_Cry19_2:: ; 2011d (8:411d) + db ( $80 | CH4 ) + dw SFX_Cry19_2_Ch1 + db CH5 + dw SFX_Cry19_2_Ch2 + db CH7 + dw SFX_Cry19_2_Ch3 + +SFX_Cry1A_2:: ; 20126 (8:4126) + db ( $80 | CH4 ) + dw SFX_Cry1A_2_Ch1 + db CH5 + dw SFX_Cry1A_2_Ch2 + db CH7 + dw SFX_Cry1A_2_Ch3 + +SFX_Cry1B_2:: ; 2012f (8:412f) + db ( $80 | CH4 ) + dw SFX_Cry1B_2_Ch1 + db CH5 + dw SFX_Cry1B_2_Ch2 + db CH7 + dw SFX_Cry1B_2_Ch3 + +SFX_Cry1C_2:: ; 20138 (8:4138) + db ( $80 | CH4 ) + dw SFX_Cry1C_2_Ch1 + db CH5 + dw SFX_Cry1C_2_Ch2 + db CH7 + dw SFX_Cry1C_2_Ch3 + +SFX_Cry1D_2:: ; 20141 (8:4141) + db ( $80 | CH4 ) + dw SFX_Cry1D_2_Ch1 + db CH5 + dw SFX_Cry1D_2_Ch2 + db CH7 + dw SFX_Cry1D_2_Ch3 + +SFX_Cry1E_2:: ; 2014a (8:414a) + db ( $80 | CH4 ) + dw SFX_Cry1E_2_Ch1 + db CH5 + dw SFX_Cry1E_2_Ch2 + db CH7 + dw SFX_Cry1E_2_Ch3 + +SFX_Cry1F_2:: ; 20153 (8:4153) + db ( $80 | CH4 ) + dw SFX_Cry1F_2_Ch1 + db CH5 + dw SFX_Cry1F_2_Ch2 + db CH7 + dw SFX_Cry1F_2_Ch3 + +SFX_Cry20_2:: ; 2015c (8:415c) + db ( $80 | CH4 ) + dw SFX_Cry20_2_Ch1 + db CH5 + dw SFX_Cry20_2_Ch2 + db CH7 + dw SFX_Cry20_2_Ch3 + +SFX_Cry21_2:: ; 20165 (8:4165) + db ( $80 | CH4 ) + dw SFX_Cry21_2_Ch1 + db CH5 + dw SFX_Cry21_2_Ch2 + db CH7 + dw SFX_Cry21_2_Ch3 + +SFX_Cry22_2:: ; 2016e (8:416e) + db ( $80 | CH4 ) + dw SFX_Cry22_2_Ch1 + db CH5 + dw SFX_Cry22_2_Ch2 + db CH7 + dw SFX_Cry22_2_Ch3 + +SFX_Cry23_2:: ; 20177 (8:4177) + db ( $80 | CH4 ) + dw SFX_Cry23_2_Ch1 + db CH5 + dw SFX_Cry23_2_Ch2 + db CH7 + dw SFX_Cry23_2_Ch3 + +SFX_Cry24_2:: ; 20180 (8:4180) + db ( $80 | CH4 ) + dw SFX_Cry24_2_Ch1 + db CH5 + dw SFX_Cry24_2_Ch2 + db CH7 + dw SFX_Cry24_2_Ch3 + +SFX_Cry25_2:: ; 20189 (8:4189) + db ( $80 | CH4 ) + dw SFX_Cry25_2_Ch1 + db CH5 + dw SFX_Cry25_2_Ch2 + db CH7 + dw SFX_Cry25_2_Ch3 + +SFX_Level_Up:: ; 20192 (8:4192) + db ( $80 | CH4 ) + dw SFX_Level_Up_Ch1 + db CH5 + dw SFX_Level_Up_Ch2 + db CH6 + dw SFX_Level_Up_Ch3 + +SFX_Get_Item2_2:: ; 2019b (8:419b) + db ( $80 | CH4 ) + dw SFX_Get_Item2_2_Ch1 + db CH5 + dw SFX_Get_Item2_2_Ch2 + db CH6 + dw SFX_Get_Item2_2_Ch3 + +SFX_Tink_2:: ; 201a4 (8:41a4) + db CH4 + dw SFX_Tink_2_Ch1 + +SFX_Heal_HP_2:: ; 201a7 (8:41a7) + db CH4 + dw SFX_Heal_HP_2_Ch1 + +SFX_Heal_Ailment_2:: ; 201aa (8:41aa) + db CH4 + dw SFX_Heal_Ailment_2_Ch1 + +SFX_Start_Menu_2:: ; 201ad (8:41ad) + db CH7 + dw SFX_Start_Menu_2_Ch1 + +SFX_Press_AB_2:: ; 201b0 (8:41b0) + db CH4 + dw SFX_Press_AB_2_Ch1 + +SFX_Ball_Toss:: ; 201b3 (8:41b3) + db ( $40 | CH4 ) + dw SFX_Ball_Toss_Ch1 + db CH5 + dw SFX_Ball_Toss_Ch2 + +SFX_Ball_Poof:: ; 201b9 (8:41b9) + db ( $40 | CH4 ) + dw SFX_Ball_Poof_Ch1 + db CH7 + dw SFX_Ball_Poof_Ch2 + +SFX_Faint_Thud:: ; 201bf (8:41bf) + db ( $40 | CH4 ) + dw SFX_Faint_Thud_Ch1 + db CH7 + dw SFX_Faint_Thud_Ch2 + +SFX_Run:: ; 201c5 (8:41c5) + db CH7 + dw SFX_Run_Ch1 + +SFX_Dex_Page_Added:: ; 201c8 (8:41c8) + db ( $40 | CH4 ) + dw SFX_Dex_Page_Added_Ch1 + db CH5 + dw SFX_Dex_Page_Added_Ch2 + +SFX_Caught_Mon:: ; 201ce (8:41ce) + db ( $80 | CH4 ) + dw SFX_Caught_Mon_Ch1 + db CH5 + dw SFX_Caught_Mon_Ch2 + db CH6 + dw SFX_Caught_Mon_Ch3 + +SFX_Peck:: ; 201d7 (8:41d7) + db CH7 + dw SFX_Peck_Ch1 + +SFX_Faint_Fall:: ; 201da (8:41da) + db CH4 + dw SFX_Faint_Fall_Ch1 + +SFX_Battle_09:: ; 201dd (8:41dd) + db CH4 + dw SFX_Battle_09_Ch1 + +SFX_Pound:: ; 201e0 (8:41e0) + db CH7 + dw SFX_Pound_Ch1 + +SFX_Battle_0B:: ; 201e3 (8:41e3) + db CH7 + dw SFX_Battle_0B_Ch1 + +SFX_Battle_0C:: ; 201e6 (8:41e6) + db CH7 + dw SFX_Battle_0C_Ch1 + +SFX_Battle_0D:: ; 201e9 (8:41e9) + db CH7 + dw SFX_Battle_0D_Ch1 + +SFX_Battle_0E:: ; 201ec (8:41ec) + db CH7 + dw SFX_Battle_0E_Ch1 + +SFX_Battle_0F:: ; 201ef (8:41ef) + db CH7 + dw SFX_Battle_0F_Ch1 + +SFX_Damage:: ; 201f2 (8:41f2) + db CH7 + dw SFX_Damage_Ch1 + +SFX_Not_Very_Effective:: ; 201f5 (8:41f5) + db CH7 + dw SFX_Not_Very_Effective_Ch1 + +SFX_Battle_12:: ; 201f8 (8:41f8) + db CH7 + dw SFX_Battle_12_Ch1 + +SFX_Battle_13:: ; 201fb (8:41fb) + db CH7 + dw SFX_Battle_13_Ch1 + +SFX_Battle_14:: ; 201fe (8:41fe) + db CH7 + dw SFX_Battle_14_Ch1 + +SFX_Vine_Whip:: ; 20201 (8:4201) + db CH7 + dw SFX_Vine_Whip_Ch1 + +SFX_Battle_16:: ; 20204 (8:4204) + db CH7 + dw SFX_Battle_16_Ch1 + +SFX_Battle_17:: ; 20207 (8:4207) + db CH7 + dw SFX_Battle_17_Ch1 + +SFX_Battle_18:: ; 2020a (8:420a) + db CH7 + dw SFX_Battle_18_Ch1 + +SFX_Battle_19:: ; 2020d (8:420d) + db CH7 + dw SFX_Battle_19_Ch1 + +SFX_Super_Effective:: ; 20210 (8:4210) + db CH7 + dw SFX_Super_Effective_Ch1 + +SFX_Battle_1B:: ; 20213 (8:4213) + db CH7 + dw SFX_Battle_1B_Ch1 + +SFX_Battle_1C:: ; 20216 (8:4216) + db CH7 + dw SFX_Battle_1C_Ch1 + +SFX_Doubleslap:: ; 20219 (8:4219) + db CH7 + dw SFX_Doubleslap_Ch1 + +SFX_Battle_1E:: ; 2021c (8:421c) + db ( $40 | CH4 ) + dw SFX_Battle_1E_Ch1 + db CH7 + dw SFX_Battle_1E_Ch2 + +SFX_Horn_Drill:: ; 20222 (8:4222) + db CH7 + dw SFX_Horn_Drill_Ch1 + +SFX_Battle_20:: ; 20225 (8:4225) + db CH7 + dw SFX_Battle_20_Ch1 + +SFX_Battle_21:: ; 20228 (8:4228) + db CH7 + dw SFX_Battle_21_Ch1 + +SFX_Battle_22:: ; 2022b (8:422b) + db CH7 + dw SFX_Battle_22_Ch1 + +SFX_Battle_23:: ; 2022e (8:422e) + db CH7 + dw SFX_Battle_23_Ch1 + +SFX_Battle_24:: ; 20231 (8:4231) + db ( $40 | CH4 ) + dw SFX_Battle_24_Ch1 + db CH7 + dw SFX_Battle_24_Ch2 + +SFX_Battle_25:: ; 20237 (8:4237) + db CH7 + dw SFX_Battle_25_Ch1 + +SFX_Battle_26:: ; 2023a (8:423a) + db CH7 + dw SFX_Battle_26_Ch1 + +SFX_Battle_27:: ; 2023d (8:423d) + db ( $80 | CH4 ) + dw SFX_Battle_27_Ch1 + db CH5 + dw SFX_Battle_27_Ch2 + db CH7 + dw SFX_Battle_27_Ch3 + +SFX_Battle_28:: ; 20246 (8:4246) + db ( $80 | CH4 ) + dw SFX_Battle_28_Ch1 + db CH5 + dw SFX_Battle_28_Ch2 + db CH7 + dw SFX_Battle_28_Ch3 + +SFX_Battle_29:: ; 2024f (8:424f) + db ( $40 | CH4 ) + dw SFX_Battle_29_Ch1 + db CH7 + dw SFX_Battle_29_Ch2 + +SFX_Battle_2A:: ; 20255 (8:4255) + db ( $80 | CH4 ) + dw SFX_Battle_2A_Ch1 + db CH5 + dw SFX_Battle_2A_Ch2 + db CH7 + dw SFX_Battle_2A_Ch3 + +SFX_Battle_2B:: ; 2025e (8:425e) + db ( $40 | CH4 ) + dw SFX_Battle_2B_Ch1 + db CH7 + dw SFX_Battle_2B_Ch2 + +SFX_Battle_2C:: ; 20264 (8:4264) + db ( $80 | CH4 ) + dw SFX_Battle_2C_Ch1 + db CH5 + dw SFX_Battle_2C_Ch2 + db CH7 + dw SFX_Battle_2C_Ch3 + +SFX_Psybeam:: ; 2026d (8:426d) + db ( $80 | CH4 ) + dw SFX_Psybeam_Ch1 + db CH5 + dw SFX_Psybeam_Ch2 + db CH7 + dw SFX_Psybeam_Ch3 + +SFX_Battle_2E:: ; 20276 (8:4276) + db ( $80 | CH4 ) + dw SFX_Battle_2E_Ch1 + db CH5 + dw SFX_Battle_2E_Ch2 + db CH7 + dw SFX_Battle_2E_Ch3 + +SFX_Battle_2F:: ; 2027f (8:427f) + db ( $80 | CH4 ) + dw SFX_Battle_2F_Ch1 + db CH5 + dw SFX_Battle_2F_Ch2 + db CH7 + dw SFX_Battle_2F_Ch3 + +SFX_Psychic_M:: ; 20288 (8:4288) + db ( $80 | CH4 ) + dw SFX_Psychic_M_Ch1 + db CH5 + dw SFX_Psychic_M_Ch2 + db CH7 + dw SFX_Psychic_M_Ch3 + +SFX_Battle_31:: ; 20291 (8:4291) + db ( $40 | CH4 ) + dw SFX_Battle_31_Ch1 + db CH5 + dw SFX_Battle_31_Ch2 + +SFX_Battle_32:: ; 20297 (8:4297) + db ( $40 | CH4 ) + dw SFX_Battle_32_Ch1 + db CH5 + dw SFX_Battle_32_Ch2 + +SFX_Battle_33:: ; 2029d (8:429d) + db ( $40 | CH4 ) + dw SFX_Battle_33_Ch1 + db CH5 + dw SFX_Battle_33_Ch2 + +SFX_Battle_34:: ; 202a3 (8:42a3) + db ( $80 | CH4 ) + dw SFX_Battle_34_Ch1 + db CH5 + dw SFX_Battle_34_Ch2 + db CH7 + dw SFX_Battle_34_Ch3 + +SFX_Battle_35:: ; 202ac (8:42ac) + db ( $40 | CH4 ) + dw SFX_Battle_35_Ch1 + db CH5 + dw SFX_Battle_35_Ch2 + +SFX_Battle_36:: ; 202b2 (8:42b2) + db ( $80 | CH4 ) + dw SFX_Battle_36_Ch1 + db CH5 + dw SFX_Battle_36_Ch2 + db CH7 + dw SFX_Battle_36_Ch3 + +SFX_Silph_Scope:: ; 202bb (8:42bb) + db CH4 + dw SFX_Silph_Scope_Ch1 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm new file mode 100644 index 00000000..321a33f5 --- /dev/null +++ b/audio/headers/sfxheaders3.asm @@ -0,0 +1,596 @@ +SFX_Headers_3:: + db $ff, $ff, $ff ; padding + +SFX_Snare1_3:: ; 7c003 (1f:4003) + db CH7 + dw SFX_Snare1_3_Ch1 + +SFX_Snare2_3:: ; 7c006 (1f:4006) + db CH7 + dw SFX_Snare2_3_Ch1 + +SFX_Snare3_3:: ; 7c009 (1f:4009) + db CH7 + dw SFX_Snare3_3_Ch1 + +SFX_Snare4_3:: ; 7c00c (1f:400c) + db CH7 + dw SFX_Snare4_3_Ch1 + +SFX_Snare5_3:: ; 7c00f (1f:400f) + db CH7 + dw SFX_Snare5_3_Ch1 + +SFX_Triangle1_3:: ; 7c012 (1f:4012) + db CH7 + dw SFX_Triangle1_3_Ch1 + +SFX_Triangle2_3:: ; 7c015 (1f:4015) + db CH7 + dw SFX_Triangle2_3_Ch1 + +SFX_Snare6_3:: ; 7c018 (1f:4018) + db CH7 + dw SFX_Snare6_3_Ch1 + +SFX_Snare7_3:: ; 7c01b (1f:401b) + db CH7 + dw SFX_Snare7_3_Ch1 + +SFX_Snare8_3:: ; 7c01e (1f:401e) + db CH7 + dw SFX_Snare8_3_Ch1 + +SFX_Snare9_3:: ; 7c021 (1f:4021) + db CH7 + dw SFX_Snare9_3_Ch1 + +SFX_Cymbal1_3:: ; 7c024 (1f:4024) + db CH7 + dw SFX_Cymbal1_3_Ch1 + +SFX_Cymbal2_3:: ; 7c027 (1f:4027) + db CH7 + dw SFX_Cymbal2_3_Ch1 + +SFX_Cymbal3_3:: ; 7c02a (1f:402a) + db CH7 + dw SFX_Cymbal3_3_Ch1 + +SFX_Muted_Snare1_3:: ; 7c02d (1f:402d) + db CH7 + dw SFX_Muted_Snare1_3_Ch1 + +SFX_Triangle3_3:: ; 7c030 (1f:4030) + db CH7 + dw SFX_Triangle3_3_Ch1 + +SFX_Muted_Snare2_3:: ; 7c033 (1f:4033) + db CH7 + dw SFX_Muted_Snare2_3_Ch1 + +SFX_Muted_Snare3_3:: ; 7c036 (1f:4036) + db CH7 + dw SFX_Muted_Snare3_3_Ch1 + +SFX_Muted_Snare4_3:: ; 7c039 (1f:4039) + db CH7 + dw SFX_Muted_Snare4_3_Ch1 + +SFX_Cry00_3:: ; 7c03c (1f:403c) + db ( $80 | CH4 ) + dw SFX_Cry00_3_Ch1 + db CH5 + dw SFX_Cry00_3_Ch2 + db CH7 + dw SFX_Cry00_3_Ch3 + +SFX_Cry01_3:: ; 7c045 (1f:4045) + db ( $80 | CH4 ) + dw SFX_Cry01_3_Ch1 + db CH5 + dw SFX_Cry01_3_Ch2 + db CH7 + dw SFX_Cry01_3_Ch3 + +SFX_Cry02_3:: ; 7c04e (1f:404e) + db ( $80 | CH4 ) + dw SFX_Cry02_3_Ch1 + db CH5 + dw SFX_Cry02_3_Ch2 + db CH7 + dw SFX_Cry02_3_Ch3 + +SFX_Cry03_3:: ; 7c057 (1f:4057) + db ( $80 | CH4 ) + dw SFX_Cry03_3_Ch1 + db CH5 + dw SFX_Cry03_3_Ch2 + db CH7 + dw SFX_Cry03_3_Ch3 + +SFX_Cry04_3:: ; 7c060 (1f:4060) + db ( $80 | CH4 ) + dw SFX_Cry04_3_Ch1 + db CH5 + dw SFX_Cry04_3_Ch2 + db CH7 + dw SFX_Cry04_3_Ch3 + +SFX_Cry05_3:: ; 7c069 (1f:4069) + db ( $80 | CH4 ) + dw SFX_Cry05_3_Ch1 + db CH5 + dw SFX_Cry05_3_Ch2 + db CH7 + dw SFX_Cry05_3_Ch3 + +SFX_Cry06_3:: ; 7c072 (1f:4072) + db ( $80 | CH4 ) + dw SFX_Cry06_3_Ch1 + db CH5 + dw SFX_Cry06_3_Ch2 + db CH7 + dw SFX_Cry06_3_Ch3 + +SFX_Cry07_3:: ; 7c07b (1f:407b) + db ( $80 | CH4 ) + dw SFX_Cry07_3_Ch1 + db CH5 + dw SFX_Cry07_3_Ch2 + db CH7 + dw SFX_Cry07_3_Ch3 + +SFX_Cry08_3:: ; 7c084 (1f:4084) + db ( $80 | CH4 ) + dw SFX_Cry08_3_Ch1 + db CH5 + dw SFX_Cry08_3_Ch2 + db CH7 + dw SFX_Cry08_3_Ch3 + +SFX_Cry09_3:: ; 7c08d (1f:408d) + db ( $80 | CH4 ) + dw SFX_Cry09_3_Ch1 + db CH5 + dw SFX_Cry09_3_Ch2 + db CH7 + dw SFX_Cry09_3_Ch3 + +SFX_Cry0A_3:: ; 7c096 (1f:4096) + db ( $80 | CH4 ) + dw SFX_Cry0A_3_Ch1 + db CH5 + dw SFX_Cry0A_3_Ch2 + db CH7 + dw SFX_Cry0A_3_Ch3 + +SFX_Cry0B_3:: ; 7c09f (1f:409f) + db ( $80 | CH4 ) + dw SFX_Cry0B_3_Ch1 + db CH5 + dw SFX_Cry0B_3_Ch2 + db CH7 + dw SFX_Cry0B_3_Ch3 + +SFX_Cry0C_3:: ; 7c0a8 (1f:40a8) + db ( $80 | CH4 ) + dw SFX_Cry0C_3_Ch1 + db CH5 + dw SFX_Cry0C_3_Ch2 + db CH7 + dw SFX_Cry0C_3_Ch3 + +SFX_Cry0D_3:: ; 7c0b1 (1f:40b1) + db ( $80 | CH4 ) + dw SFX_Cry0D_3_Ch1 + db CH5 + dw SFX_Cry0D_3_Ch2 + db CH7 + dw SFX_Cry0D_3_Ch3 + +SFX_Cry0E_3:: ; 7c0ba (1f:40ba) + db ( $80 | CH4 ) + dw SFX_Cry0E_3_Ch1 + db CH5 + dw SFX_Cry0E_3_Ch2 + db CH7 + dw SFX_Cry0E_3_Ch3 + +SFX_Cry0F_3:: ; 7c0c3 (1f:40c3) + db ( $80 | CH4 ) + dw SFX_Cry0F_3_Ch1 + db CH5 + dw SFX_Cry0F_3_Ch2 + db CH7 + dw SFX_Cry0F_3_Ch3 + +SFX_Cry10_3:: ; 7c0cc (1f:40cc) + db ( $80 | CH4 ) + dw SFX_Cry10_3_Ch1 + db CH5 + dw SFX_Cry10_3_Ch2 + db CH7 + dw SFX_Cry10_3_Ch3 + +SFX_Cry11_3:: ; 7c0d5 (1f:40d5) + db ( $80 | CH4 ) + dw SFX_Cry11_3_Ch1 + db CH5 + dw SFX_Cry11_3_Ch2 + db CH7 + dw SFX_Cry11_3_Ch3 + +SFX_Cry12_3:: ; 7c0de (1f:40de) + db ( $80 | CH4 ) + dw SFX_Cry12_3_Ch1 + db CH5 + dw SFX_Cry12_3_Ch2 + db CH7 + dw SFX_Cry12_3_Ch3 + +SFX_Cry13_3:: ; 7c0e7 (1f:40e7) + db ( $80 | CH4 ) + dw SFX_Cry13_3_Ch1 + db CH5 + dw SFX_Cry13_3_Ch2 + db CH7 + dw SFX_Cry13_3_Ch3 + +SFX_Cry14_3:: ; 7c0f0 (1f:40f0) + db ( $80 | CH4 ) + dw SFX_Cry14_3_Ch1 + db CH5 + dw SFX_Cry14_3_Ch2 + db CH7 + dw SFX_Cry14_3_Ch3 + +SFX_Cry15_3:: ; 7c0f9 (1f:40f9) + db ( $80 | CH4 ) + dw SFX_Cry15_3_Ch1 + db CH5 + dw SFX_Cry15_3_Ch2 + db CH7 + dw SFX_Cry15_3_Ch3 + +SFX_Cry16_3:: ; 7c102 (1f:4102) + db ( $80 | CH4 ) + dw SFX_Cry16_3_Ch1 + db CH5 + dw SFX_Cry16_3_Ch2 + db CH7 + dw SFX_Cry16_3_Ch3 + +SFX_Cry17_3:: ; 7c10b (1f:410b) + db ( $80 | CH4 ) + dw SFX_Cry17_3_Ch1 + db CH5 + dw SFX_Cry17_3_Ch2 + db CH7 + dw SFX_Cry17_3_Ch3 + +SFX_Cry18_3:: ; 7c114 (1f:4114) + db ( $80 | CH4 ) + dw SFX_Cry18_3_Ch1 + db CH5 + dw SFX_Cry18_3_Ch2 + db CH7 + dw SFX_Cry18_3_Ch3 + +SFX_Cry19_3:: ; 7c11d (1f:411d) + db ( $80 | CH4 ) + dw SFX_Cry19_3_Ch1 + db CH5 + dw SFX_Cry19_3_Ch2 + db CH7 + dw SFX_Cry19_3_Ch3 + +SFX_Cry1A_3:: ; 7c126 (1f:4126) + db ( $80 | CH4 ) + dw SFX_Cry1A_3_Ch1 + db CH5 + dw SFX_Cry1A_3_Ch2 + db CH7 + dw SFX_Cry1A_3_Ch3 + +SFX_Cry1B_3:: ; 7c12f (1f:412f) + db ( $80 | CH4 ) + dw SFX_Cry1B_3_Ch1 + db CH5 + dw SFX_Cry1B_3_Ch2 + db CH7 + dw SFX_Cry1B_3_Ch3 + +SFX_Cry1C_3:: ; 7c138 (1f:4138) + db ( $80 | CH4 ) + dw SFX_Cry1C_3_Ch1 + db CH5 + dw SFX_Cry1C_3_Ch2 + db CH7 + dw SFX_Cry1C_3_Ch3 + +SFX_Cry1D_3:: ; 7c141 (1f:4141) + db ( $80 | CH4 ) + dw SFX_Cry1D_3_Ch1 + db CH5 + dw SFX_Cry1D_3_Ch2 + db CH7 + dw SFX_Cry1D_3_Ch3 + +SFX_Cry1E_3:: ; 7c14a (1f:414a) + db ( $80 | CH4 ) + dw SFX_Cry1E_3_Ch1 + db CH5 + dw SFX_Cry1E_3_Ch2 + db CH7 + dw SFX_Cry1E_3_Ch3 + +SFX_Cry1F_3:: ; 7c153 (1f:4153) + db ( $80 | CH4 ) + dw SFX_Cry1F_3_Ch1 + db CH5 + dw SFX_Cry1F_3_Ch2 + db CH7 + dw SFX_Cry1F_3_Ch3 + +SFX_Cry20_3:: ; 7c15c (1f:415c) + db ( $80 | CH4 ) + dw SFX_Cry20_3_Ch1 + db CH5 + dw SFX_Cry20_3_Ch2 + db CH7 + dw SFX_Cry20_3_Ch3 + +SFX_Cry21_3:: ; 7c165 (1f:4165) + db ( $80 | CH4 ) + dw SFX_Cry21_3_Ch1 + db CH5 + dw SFX_Cry21_3_Ch2 + db CH7 + dw SFX_Cry21_3_Ch3 + +SFX_Cry22_3:: ; 7c16e (1f:416e) + db ( $80 | CH4 ) + dw SFX_Cry22_3_Ch1 + db CH5 + dw SFX_Cry22_3_Ch2 + db CH7 + dw SFX_Cry22_3_Ch3 + +SFX_Cry23_3:: ; 7c177 (1f:4177) + db ( $80 | CH4 ) + dw SFX_Cry23_3_Ch1 + db CH5 + dw SFX_Cry23_3_Ch2 + db CH7 + dw SFX_Cry23_3_Ch3 + +SFX_Cry24_3:: ; 7c180 (1f:4180) + db ( $80 | CH4 ) + dw SFX_Cry24_3_Ch1 + db CH5 + dw SFX_Cry24_3_Ch2 + db CH7 + dw SFX_Cry24_3_Ch3 + +SFX_Cry25_3:: ; 7c189 (1f:4189) + db ( $80 | CH4 ) + dw SFX_Cry25_3_Ch1 + db CH5 + dw SFX_Cry25_3_Ch2 + db CH7 + dw SFX_Cry25_3_Ch3 + +SFX_Get_Item1_3:: ; 7c192 (1f:4192) + db ( $80 | CH4 ) + dw SFX_Get_Item1_3_Ch1 + db CH5 + dw SFX_Get_Item1_3_Ch2 + db CH6 + dw SFX_Get_Item1_3_Ch3 + +SFX_Get_Item2_3:: ; 7c19b (1f:419b) + db ( $80 | CH4 ) + dw SFX_Get_Item2_3_Ch1 + db CH5 + dw SFX_Get_Item2_3_Ch2 + db CH6 + dw SFX_Get_Item2_3_Ch3 + +SFX_Tink_3:: ; 7c1a4 (1f:41a4) + db CH4 + dw SFX_Tink_3_Ch1 + +SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7) + db CH4 + dw SFX_Heal_HP_3_Ch1 + +SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa) + db CH4 + dw SFX_Heal_Ailment_3_Ch1 + +SFX_Start_Menu_3:: ; 7c1ad (1f:41ad) + db CH7 + dw SFX_Start_Menu_3_Ch1 + +SFX_Press_AB_3:: ; 7c1b0 (1f:41b0) + db CH4 + dw SFX_Press_AB_3_Ch1 + +SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3) + db ( $80 | CH4 ) + dw SFX_Pokedex_Rating_3_Ch1 + db CH5 + dw SFX_Pokedex_Rating_3_Ch2 + db CH6 + dw SFX_Pokedex_Rating_3_Ch3 + +SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc) + db ( $80 | CH4 ) + dw SFX_Get_Key_Item_3_Ch1 + db CH5 + dw SFX_Get_Key_Item_3_Ch2 + db CH6 + dw SFX_Get_Key_Item_3_Ch3 + +SFX_Poisoned_3:: ; 7c1c5 (1f:41c5) + db CH4 + dw SFX_Poisoned_3_Ch1 + +SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8) + db CH4 + dw SFX_Trade_Machine_3_Ch1 + +SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb) + db CH4 + dw SFX_Turn_On_PC_3_Ch1 + +SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce) + db CH4 + dw SFX_Turn_Off_PC_3_Ch1 + +SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1) + db CH4 + dw SFX_Enter_PC_3_Ch1 + +SFX_Shrink_3:: ; 7c1d4 (1f:41d4) + db CH4 + dw SFX_Shrink_3_Ch1 + +SFX_Switch_3:: ; 7c1d7 (1f:41d7) + db CH4 + dw SFX_Switch_3_Ch1 + +SFX_Healing_Machine_3:: ; 7c1da (1f:41da) + db CH4 + dw SFX_Healing_Machine_3_Ch1 + +SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd) + db CH4 + dw SFX_Teleport_Exit1_3_Ch1 + +SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0) + db CH4 + dw SFX_Teleport_Enter1_3_Ch1 + +SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3) + db CH4 + dw SFX_Teleport_Exit2_3_Ch1 + +SFX_Ledge_3:: ; 7c1e6 (1f:41e6) + db CH4 + dw SFX_Ledge_3_Ch1 + +SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9) + db CH7 + dw SFX_Teleport_Enter2_3_Ch1 + +SFX_Fly_3:: ; 7c1ec (1f:41ec) + db CH7 + dw SFX_Fly_3_Ch1 + +SFX_Denied_3:: ; 7c1ef (1f:41ef) + db ( $40 | CH4 ) + dw SFX_Denied_3_Ch1 + db CH5 + dw SFX_Denied_3_Ch2 + +SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5) + db CH4 + dw SFX_Arrow_Tiles_3_Ch1 + +SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8) + db CH7 + dw SFX_Push_Boulder_3_Ch1 + +SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb) + db ( $40 | CH4 ) + dw SFX_SS_Anne_Horn_3_Ch1 + db CH5 + dw SFX_SS_Anne_Horn_3_Ch2 + +SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201) + db CH4 + dw SFX_Withdraw_Deposit_3_Ch1 + +SFX_Cut_3:: ; 7c204 (1f:4204) + db CH7 + dw SFX_Cut_3_Ch1 + +SFX_Go_Inside_3:: ; 7c207 (1f:4207) + db CH7 + dw SFX_Go_Inside_3_Ch1 + +SFX_Swap_3:: ; 7c20a (1f:420a) + db ( $40 | CH4 ) + dw SFX_Swap_3_Ch1 + db CH5 + dw SFX_Swap_3_Ch2 + +SFX_59_3:: ; 7c210 (1f:4210) + db ( $40 | CH4 ) + dw SFX_59_3_Ch1 + db CH5 + dw SFX_59_3_Ch2 + +SFX_Purchase_3:: ; 7c216 (1f:4216) + db ( $40 | CH4 ) + dw SFX_Purchase_3_Ch1 + db CH5 + dw SFX_Purchase_3_Ch2 + +SFX_Collision_3:: ; 7c21c (1f:421c) + db CH4 + dw SFX_Collision_3_Ch1 + +SFX_Go_Outside_3:: ; 7c21f (1f:421f) + db CH7 + dw SFX_Go_Outside_3_Ch1 + +SFX_Save_3:: ; 7c222 (1f:4222) + db ( $40 | CH4 ) + dw SFX_Save_3_Ch1 + db CH5 + dw SFX_Save_3_Ch2 + +SFX_Intro_Lunge:: ; 7c228 (1f:4228) + db CH7 + dw SFX_Intro_Lunge_Ch1 + +SFX_Intro_Hip:: ; 7c22b (1f:422b) + db CH4 + dw SFX_Intro_Hip_Ch1 + +SFX_Intro_Hop:: ; 7c22e (1f:422e) + db CH4 + dw SFX_Intro_Hop_Ch1 + +SFX_Intro_Raise:: ; 7c231 (1f:4231) + db CH7 + dw SFX_Intro_Raise_Ch1 + +SFX_Intro_Crash:: ; 7c234 (1f:4234) + db CH7 + dw SFX_Intro_Crash_Ch1 + +SFX_Intro_Whoosh:: ; 7c237 (1f:4237) + db CH7 + dw SFX_Intro_Whoosh_Ch1 + +SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a) + db CH4 + dw SFX_Slots_Stop_Wheel_Ch1 + +SFX_Slots_Reward:: ; 7c23d (1f:423d) + db CH4 + dw SFX_Slots_Reward_Ch1 + +SFX_Slots_New_Spin:: ; 7c240 (1f:4240) + db ( $40 | CH4 ) + dw SFX_Slots_New_Spin_Ch1 + db CH5 + dw SFX_Slots_New_Spin_Ch2 + +SFX_Shooting_Star:: ; 7c246 (1f:4246) + db CH4 + dw SFX_Shooting_Star_Ch1 diff --git a/audio/sfx/pokeflute_ch1_ch2.asm b/audio/sfx/pokeflute_ch1_ch2.asm new file mode 100755 index 00000000..4ccf89d8 --- /dev/null +++ b/audio/sfx/pokeflute_ch1_ch2.asm @@ -0,0 +1,14 @@ +SFX_08_PokeFlute_Ch1: ; 22322 (8:6322) + tempo 256 + + +SFX_08_PokeFlute_Ch2: ; 22325 (8:6325) + executemusic + notetype 8, 0, 0 + rest 5 + rest 7 + rest 5 + rest 5 + rest 5 + rest 5 + endchannel diff --git a/audio/sfx/pokeflute_ch3.asm b/audio/sfx/pokeflute_ch3.asm new file mode 100755 index 00000000..0652e673 --- /dev/null +++ b/audio/sfx/pokeflute_ch3.asm @@ -0,0 +1,13 @@ +SFX_08_PokeFlute_Ch3: ; 2049b (8:449b) + executemusic + vibrato 16, 1, 4 + notetype 8, 1, 0 + octave 5 + E_ 3 + F_ 3 + G_ 7 + A_ 3 + G_ 3 + octave 6 + C_ 13 + endchannel diff --git a/audio/sfx/sfx_02_unused.asm b/audio/sfx/sfx_02_unused.asm deleted file mode 100755 index bd9bdfb3..00000000 --- a/audio/sfx/sfx_02_unused.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_02_unused_Ch1: ; 86e3 (2:46e3) - dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 - endchannel - - -SFX_02_unused_Ch2: ; 86fe (2:46fe) - dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 - endchannel - - -SFX_02_unused_Ch3: ; 8719 (2:4719) - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 - endchannel diff --git a/audio/sfx/sfx_08_pokeflute.asm b/audio/sfx/sfx_08_pokeflute.asm deleted file mode 100755 index 4ccf89d8..00000000 --- a/audio/sfx/sfx_08_pokeflute.asm +++ /dev/null @@ -1,14 +0,0 @@ -SFX_08_PokeFlute_Ch1: ; 22322 (8:6322) - tempo 256 - - -SFX_08_PokeFlute_Ch2: ; 22325 (8:6325) - executemusic - notetype 8, 0, 0 - rest 5 - rest 7 - rest 5 - rest 5 - rest 5 - rest 5 - endchannel diff --git a/audio/sfx/sfx_08_pokeflute_ch3.asm b/audio/sfx/sfx_08_pokeflute_ch3.asm deleted file mode 100755 index 0652e673..00000000 --- a/audio/sfx/sfx_08_pokeflute_ch3.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_08_PokeFlute_Ch3: ; 2049b (8:449b) - executemusic - vibrato 16, 1, 4 - notetype 8, 1, 0 - octave 5 - E_ 3 - F_ 3 - G_ 7 - A_ 3 - G_ 3 - octave 6 - C_ 13 - endchannel diff --git a/audio/sfx/sfx_08_unused.asm b/audio/sfx/sfx_08_unused.asm deleted file mode 100755 index 25e4840c..00000000 --- a/audio/sfx/sfx_08_unused.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_08_unused_Ch1: ; 2098b (8:498b) - dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 - endchannel - - -SFX_08_unused_Ch2: ; 209a6 (8:49a6) - dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 - endchannel - - -SFX_08_unused_Ch3: ; 209c1 (8:49c1) - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 - endchannel diff --git a/audio/sfx/sfx_08_unused2.asm b/audio/sfx/sfx_08_unused2.asm deleted file mode 100755 index 1eca4432..00000000 --- a/audio/sfx/sfx_08_unused2.asm +++ /dev/null @@ -1,56 +0,0 @@ -SFX_08_unused2_Ch1: ; 2232f (8:632f) - executemusic - tempo 256 - volume 7, 7 - vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 6, 11, 1 - octave 3 - G# 2 - G# 2 - notetype 6, 11, 3 - G# 2 - B_ 2 - octave 4 - E_ 8 - endchannel - - -SFX_08_unused2_Ch2: ; 22347 (8:6347) - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 6, 12, 1 - octave 4 - E_ 2 - E_ 1 - E_ 1 - notetype 6, 12, 3 - E_ 2 - G# 2 - B_ 8 - endchannel - - -SFX_08_unused2_Ch3: ; 22359 (8:6359) - executemusic - notetype 6, 1, 0 - octave 4 - B_ 1 - rest 1 - notetype 3, 1, 0 - B_ 1 - rest 1 - B_ 1 - rest 1 - notetype 6, 1, 0 - B_ 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - B_ 4 - rest 4 - endchannel diff --git a/audio/sfx/sfx_1f_unused.asm b/audio/sfx/sfx_1f_unused.asm deleted file mode 100755 index dfb16ee1..00000000 --- a/audio/sfx/sfx_1f_unused.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_1f_unused_Ch1: ; 7c758 (1f:4758) - dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 - endchannel - - -SFX_1f_unused_Ch2: ; 7c773 (1f:4773) - dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 - endchannel - - -SFX_1f_unused_Ch3: ; 7c78e (1f:478e) - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 - endchannel diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm new file mode 100755 index 00000000..1eca4432 --- /dev/null +++ b/audio/sfx/unused2_2.asm @@ -0,0 +1,56 @@ +SFX_08_unused2_Ch1: ; 2232f (8:632f) + executemusic + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty 2 + toggleperfectpitch + notetype 6, 11, 1 + octave 3 + G# 2 + G# 2 + notetype 6, 11, 3 + G# 2 + B_ 2 + octave 4 + E_ 8 + endchannel + + +SFX_08_unused2_Ch2: ; 22347 (8:6347) + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 6, 12, 1 + octave 4 + E_ 2 + E_ 1 + E_ 1 + notetype 6, 12, 3 + E_ 2 + G# 2 + B_ 8 + endchannel + + +SFX_08_unused2_Ch3: ; 22359 (8:6359) + executemusic + notetype 6, 1, 0 + octave 4 + B_ 1 + rest 1 + notetype 3, 1, 0 + B_ 1 + rest 1 + B_ 1 + rest 1 + notetype 6, 1, 0 + B_ 1 + rest 1 + octave 5 + E_ 1 + rest 1 + octave 4 + B_ 4 + rest 4 + endchannel diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm new file mode 100755 index 00000000..bd9bdfb3 --- /dev/null +++ b/audio/sfx/unused_1.asm @@ -0,0 +1,31 @@ +SFX_02_unused_Ch1: ; 86e3 (2:46e3) + dutycycle 240 + unknownsfx0x20 15, 224, 128, 7 + unknownsfx0x20 15, 240, 132, 7 + unknownsfx0x20 15, 195, 224, 5 + unknownsfx0x20 15, 196, 0, 6 + unknownsfx0x20 10, 108, 128, 7 + unknownsfx0x20 8, 113, 132, 7 + endchannel + + +SFX_02_unused_Ch2: ; 86fe (2:46fe) + dutycycle 5 + unknownsfx0x20 15, 160, 65, 7 + unknownsfx0x20 15, 176, 67, 7 + unknownsfx0x20 15, 147, 177, 5 + unknownsfx0x20 15, 148, 193, 5 + unknownsfx0x20 10, 76, 65, 7 + unknownsfx0x20 8, 49, 70, 7 + endchannel + + +SFX_02_unused_Ch3: ; 8719 (2:4719) + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 224, 58 + unknownnoise0x20 15, 208, 58 + unknownnoise0x20 8, 208, 44 + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 12, 125, 76 + unknownnoise0x20 15, 211, 76 + endchannel diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm new file mode 100755 index 00000000..25e4840c --- /dev/null +++ b/audio/sfx/unused_2.asm @@ -0,0 +1,31 @@ +SFX_08_unused_Ch1: ; 2098b (8:498b) + dutycycle 240 + unknownsfx0x20 15, 224, 128, 7 + unknownsfx0x20 15, 240, 132, 7 + unknownsfx0x20 15, 195, 224, 5 + unknownsfx0x20 15, 196, 0, 6 + unknownsfx0x20 10, 108, 128, 7 + unknownsfx0x20 8, 113, 132, 7 + endchannel + + +SFX_08_unused_Ch2: ; 209a6 (8:49a6) + dutycycle 5 + unknownsfx0x20 15, 160, 65, 7 + unknownsfx0x20 15, 176, 67, 7 + unknownsfx0x20 15, 147, 177, 5 + unknownsfx0x20 15, 148, 193, 5 + unknownsfx0x20 10, 76, 65, 7 + unknownsfx0x20 8, 49, 70, 7 + endchannel + + +SFX_08_unused_Ch3: ; 209c1 (8:49c1) + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 224, 58 + unknownnoise0x20 15, 208, 58 + unknownnoise0x20 8, 208, 44 + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 12, 125, 76 + unknownnoise0x20 15, 211, 76 + endchannel diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm new file mode 100755 index 00000000..dfb16ee1 --- /dev/null +++ b/audio/sfx/unused_3.asm @@ -0,0 +1,31 @@ +SFX_1f_unused_Ch1: ; 7c758 (1f:4758) + dutycycle 240 + unknownsfx0x20 15, 224, 128, 7 + unknownsfx0x20 15, 240, 132, 7 + unknownsfx0x20 15, 195, 224, 5 + unknownsfx0x20 15, 196, 0, 6 + unknownsfx0x20 10, 108, 128, 7 + unknownsfx0x20 8, 113, 132, 7 + endchannel + + +SFX_1f_unused_Ch2: ; 7c773 (1f:4773) + dutycycle 5 + unknownsfx0x20 15, 160, 65, 7 + unknownsfx0x20 15, 176, 67, 7 + unknownsfx0x20 15, 147, 177, 5 + unknownsfx0x20 15, 148, 193, 5 + unknownsfx0x20 10, 76, 65, 7 + unknownsfx0x20 8, 49, 70, 7 + endchannel + + +SFX_1f_unused_Ch3: ; 7c78e (1f:478e) + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 224, 58 + unknownnoise0x20 15, 208, 58 + unknownnoise0x20 8, 208, 44 + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 12, 125, 76 + unknownnoise0x20 15, 211, 76 + endchannel diff --git a/constants/music_constants.asm b/constants/music_constants.asm index d8c62dda..f239acea 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -1,7 +1,7 @@ ; Song ids are calculated by address to save space. music_const: MACRO -\1 EQUS "((\2 - SFX_Headers_02) / 3)" +\1 EQUS "((\2 - SFX_Headers_1) / 3)" ENDM ; AUDIO_1 diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index f9dcc3a5..b123f33f 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -35,7 +35,7 @@ AnimateHealingMachine: ; 70433 (1c:4433) dec b jr nz, .asm_7046e ld a, [wc0ef] - cp BANK(Music1f_UpdateMusic) + cp BANK(Audio3_UpdateMusic) ld [wc0f0], a jr nz, .asm_70495 ld a, $ff diff --git a/home/audio.asm b/home/audio.asm index 1301550c..033f4067 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -56,19 +56,19 @@ Func_2324:: ; 2324 (0:2324) Func_235f:: ; 235f (0:235f) ld a, [wc0ef] ld b, a - cp BANK(Music2_UpdateMusic) - jr nz, .checkForBank08 -.bank02 - ld hl, Music2_UpdateMusic + cp BANK(Audio1_UpdateMusic) + jr nz, .checkForAudio2 +.audio1 + ld hl, Audio1_UpdateMusic jr .asm_2378 -.checkForBank08 - cp BANK(Music8_UpdateMusic) - jr nz, .bank1F -.bank08 - ld hl, Music8_UpdateMusic +.checkForAudio2 + cp BANK(Audio2_UpdateMusic) + jr nz, .audio3 +.audio2 + ld hl, Audio2_UpdateMusic jr .asm_2378 -.bank1F - ld hl, Music1f_UpdateMusic +.audio3 + ld hl, Audio3_UpdateMusic .asm_2378 ld c, $6 .asm_237a @@ -147,22 +147,22 @@ PlaySound:: ; 23b1 (0:23b1) ld a, [wc0ef] ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a - cp BANK(Music2_9876) - jr nz, .checkForBank08 -.bank02 + cp BANK(Audio1_9876) + jr nz, .checkForAudio2 +.audio1 ld a, b - call Music2_9876 + call Audio1_9876 jr .asm_240b -.checkForBank08 - cp BANK(Music8_22035) - jr nz, .bank1F -.bank08 +.checkForAudio2 + cp BANK(Audio2_22035) + jr nz, .audio3 +.audio2 ld a, b - call Music8_22035 + call Audio2_22035 jr .asm_240b -.bank1F +.audio3 ld a, b - call Music1f_7d8ea + call Audio3_7d8ea .asm_240b ld a, [$ffb9] ld [H_LOADEDROMBANK], a diff --git a/home/init.asm b/home/init.asm index 848a81a3..624a4d6a 100644 --- a/home/init.asm +++ b/home/init.asm @@ -126,7 +126,7 @@ ClearVram: StopAllSounds:: - ld a, BANK(Music2_UpdateMusic) + ld a, BANK(Audio1_UpdateMusic) ld [wc0ef], a ld [wc0f0], a xor a diff --git a/home/vblank.asm b/home/vblank.asm index 9adf537c..05b01a3d 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -56,20 +56,20 @@ VBlank:: ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a - cp BANK(Music2_UpdateMusic) - jr nz, .notbank2 -.bank2 - call Music2_UpdateMusic + cp BANK(Audio1_UpdateMusic) + jr nz, .checkForAudio2 +.audio1 + call Audio1_UpdateMusic jr .afterMusic -.notbank2 - cp BANK(Music8_UpdateMusic) - jr nz, .bank1F -.bank8 +.checkForAudio2 + cp BANK(Audio2_UpdateMusic) + jr nz, .audio3 +.audio2 call Music_DoLowHealthAlarm - call Music8_UpdateMusic + call Audio2_UpdateMusic jr .afterMusic -.bank1F - call Music1f_UpdateMusic +.audio3 + call Audio3_UpdateMusic .afterMusic callba TrackPlayTime ; keep track of time played diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm index a1fd791a..f1eabc29 100755 --- a/scripts/ssanne7.asm +++ b/scripts/ssanne7.asm @@ -48,7 +48,7 @@ SSAnne7RubText: ; 618ec (18:58ec) TX_FAR _SSAnne7RubText TX_ASM ld a, [wc0ef] - cp BANK(Music1f_UpdateMusic) + cp BANK(Audio3_UpdateMusic) ld [wc0f0], a jr nz, .asm_61908 ld a, $ff -- cgit v1.3.1-sl0p From 2b018159997e3b580efd114ff4e3548a0de3cbc5 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 8 Aug 2015 22:32:44 -0700 Subject: commented audio code --- audio.asm | 32 +- audio/engine_1.asm | 1277 ++++++++++++++++++---------------- audio/engine_2.asm | 540 +++++++------- audio/engine_3.asm | 532 +++++++------- constants/hardware_constants.asm | 1 - constants/music_constants.asm | 39 ++ engine/battle/animations.asm | 18 +- engine/battle/common_text.asm | 4 +- engine/battle/core.asm | 16 +- engine/battle/end_of_battle.asm | 2 +- engine/cable_club.asm | 16 +- engine/evolution.asm | 6 +- engine/hall_of_fame.asm | 8 +- engine/hidden_object_functions7.asm | 6 +- engine/intro.asm | 6 +- engine/items/items.asm | 8 +- engine/menu/pokedex.asm | 4 +- engine/menu/status_screen.asm | 4 +- engine/oak_speech.asm | 10 +- engine/overworld/elevator.asm | 2 +- engine/overworld/healing_machine.asm | 40 +- engine/overworld/npc_movement.asm | 12 +- engine/overworld/pokecenter.asm | 12 +- engine/slot_machine.asm | 4 +- engine/titlescreen.asm | 6 +- home.asm | 52 +- home/audio.asm | 233 ++++--- home/init.asm | 14 +- home/overworld.asm | 22 +- home/vblank.asm | 12 +- hram.asm | 4 +- scripts/ceruleancity.asm | 4 +- scripts/oakslab.asm | 4 +- scripts/pewterpokecenter.asm | 4 +- scripts/pokemontower2.asm | 4 +- scripts/redshouse1f.asm | 8 +- scripts/route22.asm | 10 +- scripts/silphco7.asm | 4 +- scripts/ssanne2.asm | 4 +- scripts/ssanne7.asm | 12 +- scripts/vermiliondock.asm | 2 +- wram.asm | 239 +++++-- 42 files changed, 1731 insertions(+), 1506 deletions(-) (limited to 'audio.asm') diff --git a/audio.asm b/audio.asm index 286dc7ed..037145d8 100644 --- a/audio.asm +++ b/audio.asm @@ -364,10 +364,10 @@ SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] PlayBattleMusic:: ; 0x90c6 xor a - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a ld [wLowHealthAlarm], a dec a - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ; stop music call DelayFrame ld c, BANK(Music_GymLeaderBattle) @@ -406,7 +406,7 @@ Music_RivalAlternateStart:: ; 0x9b47 ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic - ld hl, wc006 + ld hl, wChannelCommandPointers ld de, Music_MeetRival_branch_b1a2 call Audio1_OverwriteChannelPointer ld de, Music_MeetRival_branch_b21d @@ -425,30 +425,30 @@ Music_RivalAlternateTempo:: ; 0x9b65 ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic - ld hl, wc006 + ld hl, wChannelCommandPointers ld de, Music_MeetRival_branch_b119 jp Audio1_OverwriteChannelPointer ; applies both the alternate start and alternate tempo Music_RivalAlternateStartAndTempo:: ; 0x9b75 call Music_RivalAlternateStart - ld hl, wc006 + ld hl, wChannelCommandPointers ld de, Music_MeetRival_branch_b19b jp Audio1_OverwriteChannelPointer ; an alternate tempo for Cities1 which is used for the Hall of Fame room Music_Cities1AlternateTempo:: ; 0x9b81 - ld a, $a - ld [wcfc8], a - ld [wcfc9], a - ld a, $ff - ld [wMusicHeaderPointer], a + ld a, 10 + ld [wAudioFadeOutCounterReloadValue], a + ld [wAudioFadeOutCounter], a + ld a, $ff ; stop playing music after the fade-out is finished + ld [wAudioFadeOutControl], a ld c, 100 - call DelayFrames + call DelayFrames ; wait for the fade-out to finish ld c, BANK(Music_Cities1) ld a, MUSIC_CITIES1 call PlayMusic - ld hl, wc006 + ld hl, wChannelCommandPointers ld de, Music_Cities1_branch_aa6f jp Audio1_OverwriteChannelPointer @@ -477,7 +477,7 @@ Music_DoLowHealthAlarm:: ; 2136e (8:536e) .asm_2138a ld a, $86 - ld [wc02a], a ;disable sound channel? + ld [wChannelSoundIDs + CH4], a ;disable sound channel? ld a, [wLowHealthAlarm] and $7f ;decrement alarm timer. dec a @@ -491,7 +491,7 @@ Music_DoLowHealthAlarm:: ; 2136e (8:536e) .disableAlarm xor a ld [wLowHealthAlarm], a ;disable alarm - ld [wc02a], a ;re-enable sound channel? + ld [wChannelSoundIDs + CH4], a ;re-enable sound channel? ld de, .toneDataSilence jr .playTone @@ -542,7 +542,7 @@ Music_PokeFluteInBattle:: ; 22306 (8:6306) ld a, SFX_CAUGHT_MON call PlaySoundWaitForCurrent ; then immediately overwrtie the channel pointers - ld hl, wc00e + ld hl, wChannelCommandPointers + CH4 * 2 ld de, SFX_08_PokeFlute_Ch1 call Audio2_OverwriteChannelPointer ld de, SFX_08_PokeFlute_Ch2 @@ -572,7 +572,7 @@ PlayPokedexRatingSfx:: ; 7d13b (1f:513b) .gotSfxPointer push bc ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySoundWaitForCurrent pop bc ld b, $0 diff --git a/audio/engine_1.asm b/audio/engine_1.asm index 9a302ef3..c729fa7e 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -3,29 +3,29 @@ Audio1_UpdateMusic:: ; 0x9103 ld c, CH0 .loop - ld b, $0 - ld hl, wc026 + ld b, 0 + ld hl, wChannelSoundIDs add hl, bc ld a, [hl] and a jr z, .nextChannel ld a, c cp CH4 - jr nc, .asm_912e ; if sfx channel - ld a, [wc002] + jr nc, .applyAffects ; if sfx channel + ld a, [wMuteAudioAndPauseMusic] and a - jr z, .asm_912e + jr z, .applyAffects bit 7, a jr nz, .nextChannel set 7, a - ld [wc002], a - xor a - ld [$ff25], a - ld [$ff1a], a + ld [wMuteAudioAndPauseMusic], a + xor a ; disable all channels' output + ld [rNR51], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a jr .nextChannel -.asm_912e +.applyAffects call Audio1_ApplyMusicAffects .nextChannel ld a, c @@ -36,15 +36,9 @@ Audio1_UpdateMusic:: ; 0x9103 ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -; known flags for wc02e: -; 0: toggleperfectpitch has been used -; 1: call has been used -; 3: a toggle used only by this routine for vibrato -; 4: pitchbend flag -; 6: dutycycle flag Audio1_ApplyMusicAffects: ; 0x9138 ld b, $0 - ld hl, wc0b6 ; delay until next note + ld hl, wChannelNoteDelayCounters ; delay until next note add hl, bc ld a, [hl] cp $1 ; if the delay is 1, play next note @@ -54,45 +48,45 @@ Audio1_ApplyMusicAffects: ; 0x9138 ld a, c cp CH4 jr nc, .startChecks ; if a sfx channel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a jr z, .startChecks ret .startChecks - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - bit 6, [hl] ; dutycycle + bit BIT_ROTATE_DUTY, [hl] jr z, .checkForExecuteMusic call Audio1_ApplyDutyCycle .checkForExecuteMusic - ld b, $0 - ld hl, wc036 + ld b, 0 + ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] + bit BIT_EXECUTE_MUSIC, [hl] jr nz, .checkForPitchBend - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - bit 2, [hl] - jr nz, .disablePitchBendVibrato + bit BIT_NOISE_OR_SFX, [hl] + jr nz, .skipPitchBendVibrato .checkForPitchBend - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - bit 4, [hl] ; pitchbend + bit BIT_PITCH_BEND_ON, [hl] jr z, .checkVibratoDelay jp Audio1_ApplyPitchBend .checkVibratoDelay - ld hl, wc04e ; vibrato delay + ld hl, wChannelVibratoDelayCounters add hl, bc ld a, [hl] and a ; check if delay is over jr z, .checkForVibrato dec [hl] ; otherwise, dec delay -.disablePitchBendVibrato +.skipPitchBendVibrato ret .checkForVibrato - ld hl, wc056 ; vibrato rate + ld hl, wChannelVibratoExtents add hl, bc ld a, [hl] and a @@ -100,38 +94,40 @@ Audio1_ApplyMusicAffects: ; 0x9138 ret ; no vibrato .vibrato ld d, a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, bc ld a, [hl] and $f and a - jr z, .vibratoAlreadyDone - dec [hl] ; apply vibrato pitch change + jr z, .applyVibrato + dec [hl] ; decrement counter ret -.vibratoAlreadyDone +.applyVibrato ld a, [hl] swap [hl] or [hl] - ld [hl], a ; reset the vibrato value and start again - ld hl, wc066 + ld [hl], a ; reload the counter + ld hl, wChannelFrequencyLowBytes add hl, bc ld e, [hl] ; get note pitch - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - bit 3, [hl] ; this is the only code that sets/resets bit three so - jr z, .unset ; it continuously alternates which path it takes - res 3, [hl] +; This is the only code that sets/resets the vibrato direction bit, so it +; continuously alternates which path it takes. + bit BIT_VIBRATO_DIRECTION, [hl] + jr z, .unset + res BIT_VIBRATO_DIRECTION, [hl] ld a, d and $f ld d, a ld a, e sub d jr nc, .noCarry - ld a, $0 + ld a, 0 .noCarry jr .done .unset - set 3, [hl] + set BIT_VIBRATO_DIRECTION, [hl] ld a, d and $f0 swap a @@ -140,8 +136,8 @@ Audio1_ApplyMusicAffects: ; 0x9138 ld a, $ff .done ld d, a - ld b, $3 - call Audio1_9838 + ld b, REG_FREQUENCY_LO + call Audio1_GetRegisterPointer ld [hl], d ret @@ -149,16 +145,18 @@ Audio1_ApplyMusicAffects: ; 0x9138 ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached Audio1_PlayNextNote: ; 0x91d0 - ld hl, wc06e +; reload the vibrato delay counter + ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld a, [hl] - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a - ld hl, wc02e + + ld hl, wChannelFlags1 add hl, bc - res 4, [hl] - res 5, [hl] + res BIT_PITCH_BEND_ON, [hl] + res BIT_PITCH_BEND_DECREASING, [hl] call Audio1_endchannel ret @@ -167,34 +165,35 @@ Audio1_endchannel: ; 0x91e6 ld d, a cp $ff ; is this command an endchannel? jp nz, Audio1_callchannel ; no - ld b, $0 ; yes - ld hl, wc02e + ld b, 0 + ld hl, wChannelFlags1 add hl, bc - bit 1, [hl] + bit BIT_CHANNEL_CALL, [hl] jr nz, .returnFromCall ld a, c cp CH3 jr nc, .noiseOrSfxChannel - jr .asm_923f + jr .disableChannelOutput .noiseOrSfxChannel - res 2, [hl] - ld hl, wc036 + res BIT_NOISE_OR_SFX, [hl] + ld hl, wChannelFlags2 add hl, bc - res 0, [hl] + res BIT_EXECUTE_MUSIC, [hl] cp CH6 - jr nz, .notSfxChannel3 + jr nz, .skipSfxChannel3 +; restart hardware channel 3 (wave channel) output ld a, $0 - ld [$ff1a], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a -.notSfxChannel3 + ld [rNR30], a +.skipSfxChannel3 jr nz, .asm_9222 - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr z, .asm_9222 xor a - ld [wc003], a - jr .asm_923f + ld [wDisableChannelOutputWhenSfxEnds], a + jr .disableChannelOutput .asm_9222 jr .asm_9248 .returnFromCall @@ -203,10 +202,10 @@ Audio1_endchannel: ; 0x91e6 ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de push hl ; store current channel address - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld e, l ld d, h @@ -217,36 +216,36 @@ Audio1_endchannel: ; 0x91e6 ld a, [de] ld [hl], a ; loads channel address to return to jp Audio1_endchannel -.asm_923f - ld hl, Unknown_9b1f +.disableChannelOutput + ld hl, Audio1_HWChannelDisableMasks add hl, bc - ld a, [$ff25] + ld a, [rNR51] and [hl] - ld [$ff25], a + ld [rNR51], a .asm_9248 - ld a, [wc02a] - cp $14 + ld a, [wChannelSoundIDs + CH4] + cp CRY_SFX_START jr nc, .asm_9251 - jr .asm_926e + jr .skipCry .asm_9251 - ld a, [wc02a] - cp $86 - jr z, .asm_926e - jr c, .asm_925c - jr .asm_926e -.asm_925c + ld a, [wChannelSoundIDs + CH4] + cp CRY_SFX_END + jr z, .skipCry + jr c, .cry + jr .skipCry +.cry ld a, c cp CH4 jr z, .asm_9265 - call Audio1_96c7 + call Audio1_GoBackOneCommandIfCry ret c .asm_9265 - ld a, [wc005] - ld [$ff24], a + ld a, [wSavedVolume] + ld [rNR50], a xor a - ld [wc005], a -.asm_926e - ld hl, wc026 + ld [wSavedVolume], a +.skipCry + ld hl, wChannelSoundIDs add hl, bc ld [hl], b ret @@ -254,7 +253,7 @@ Audio1_endchannel: ; 0x91e6 Audio1_callchannel: ; 0x9274 cp $fd ; is this command a callchannel? jp nz, Audio1_loopchannel ; no - call Audio1_GetNextMusicByte ; yes + call Audio1_GetNextMusicByte push af call Audio1_GetNextMusicByte ld d, a @@ -265,10 +264,10 @@ Audio1_callchannel: ; 0x9274 ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de push hl - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld e, l ld d, h @@ -283,20 +282,20 @@ Audio1_callchannel: ; 0x9274 inc hl ld [hl], d ; overwrite current address with pointer ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - set 1, [hl] ; set the call flag + set BIT_CHANNEL_CALL, [hl] ; set the call flag jp Audio1_endchannel Audio1_loopchannel: ; 0x92a9 cp $fe ; is this command a loopchannel? jp nz, Audio1_notetype ; no - call Audio1_GetNextMusicByte ; yes + call Audio1_GetNextMusicByte ld e, a and a jr z, .infiniteLoop - ld b, $0 - ld hl, wc0be + ld b, 0 + ld hl, wChannelLoopCounters add hl, bc ld a, [hl] cp e @@ -319,7 +318,7 @@ Audio1_loopchannel: ; 0x92a9 ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de pop af ld [hli], a @@ -330,10 +329,10 @@ Audio1_notetype: ; 0x92e4 and $f0 cp $d0 ; is this command a notetype? jp nz, Audio1_toggleperfectpitch ; no - ld a, d ; yes + ld a, d and $f ld b, $0 - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, bc ld [hl], a ; store low nibble as speed ld a, c @@ -345,15 +344,15 @@ Audio1_notetype: ; 0x92e4 cp CH2 jr z, .musicChannel3 cp CH6 - jr nz, .notChannel3 - ld hl, wc0e7 - jr .sfxChannel3 + jr nz, .skipChannel3 + ld hl, wSfxWaveInstrument + jr .channel3 .musicChannel3 - ld hl, wc0e6 -.sfxChannel3 + ld hl, wMusicWaveInstrument +.channel3 ld a, d and $f - ld [hl], a ; store low nibble of param as duty + ld [hl], a ; store low nibble of param as wave instrument ld a, d and $30 sla a @@ -362,9 +361,9 @@ Audio1_notetype: ; 0x92e4 ; if channel 3, store high nibble as volume ; else, store volume (high nibble) and fade (low nibble) -.notChannel3 - ld b, $0 - ld hl, wc0de +.skipChannel3 + ld b, 0 + ld hl, wChannelVolumes add hl, bc ld [hl], d .noiseChannel @@ -374,56 +373,70 @@ Audio1_toggleperfectpitch: ; 0x9323 ld a, d cp $e8 ; is this command a toggleperfectpitch? jr nz, Audio1_vibrato ; no - ld b, $0 ; yes - ld hl, wc02e + ld b, 0 + ld hl, wChannelFlags1 add hl, bc ld a, [hl] xor $1 - ld [hl], a ; flip bit 0 of wc02e + ld [hl], a ; flip bit 0 of wChannelFlags1 jp Audio1_endchannel Audio1_vibrato: ; 0x9335 cp $ea ; is this command a vibrato? jr nz, Audio1_pitchbend ; no - call Audio1_GetNextMusicByte ; yes - ld b, $0 - ld hl, wc04e + call Audio1_GetNextMusicByte + ld b, 0 + ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a ; store delay - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld [hl], a ; store delay call Audio1_GetNextMusicByte ld d, a + +; The high nybble of the command byte is the extent of the vibrato. +; Let n be the extent. +; The upper nybble of the channel's byte in the wChannelVibratoExtents +; array will store the extent above the note: (n / 2) + (n % 2). +; The lower nybble will store the extent below the note: (n / 2). +; These two values add to the total extent, n. and $f0 swap a - ld b, $0 - ld hl, wc056 + ld b, 0 + ld hl, wChannelVibratoExtents add hl, bc srl a ld e, a adc b swap a or e - ld [hl], a ; store rate as both high and low nibbles + ld [hl], a + +; The low nybble of the command byte is the rate of the vibrato. +; The high and low nybbles of the channel's byte in the wChannelVibratoRates +; array are both initialised to this value because the high nybble is the +; counter reload value and the low nybble is the counter itself, which should +; start at its value upon reload. ld a, d and $f ld d, a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, bc swap a or d - ld [hl], a ; store depth as both high and low nibbles + ld [hl], a + jp Audio1_endchannel Audio1_pitchbend: ; 0x936d cp $eb ; is this command a pitchbend? jr nz, Audio1_duty ; no - call Audio1_GetNextMusicByte ; yes - ld b, $0 - ld hl, wc076 + call Audio1_GetNextMusicByte + ld b, 0 + ld hl, wChannelPitchBendLengthModifiers add hl, bc - ld [hl], a ; store first param + ld [hl], a call Audio1_GetNextMusicByte ld d, a and $f0 @@ -431,18 +444,18 @@ Audio1_pitchbend: ; 0x936d ld b, a ld a, d and $f - call Audio1_9858 - ld b, $0 - ld hl, wc0a6 + call Audio1_CalculateFrequency + ld b, 0 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc - ld [hl], d ; store unknown part of second param - ld hl, wc0ae + ld [hl], d + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc - ld [hl], e ; store unknown part of second param - ld b, $0 - ld hl, wc02e + ld [hl], e + ld b, 0 + ld hl, wChannelFlags1 add hl, bc - set 4, [hl] ; set pitchbend flag + set BIT_PITCH_BEND_ON, [hl] call Audio1_GetNextMusicByte ld d, a jp Audio1_notelength @@ -450,12 +463,12 @@ Audio1_pitchbend: ; 0x936d Audio1_duty: ; 0x93a5 cp $ec ; is this command a duty? jr nz, Audio1_tempo ; no - call Audio1_GetNextMusicByte ; yes + call Audio1_GetNextMusicByte rrca rrca and $c0 - ld b, $0 - ld hl, wc03e + ld b, 0 + ld hl, wChannelDuties add hl, bc ld [hl], a ; store duty jp Audio1_endchannel @@ -463,96 +476,96 @@ Audio1_duty: ; 0x93a5 Audio1_tempo: ; 0x93ba cp $ed ; is this command a tempo? jr nz, Audio1_stereopanning ; no - ld a, c ; yes + ld a, c cp CH4 jr nc, .sfxChannel call Audio1_GetNextMusicByte - ld [wc0e8], a ; store first param + ld [wMusicTempo], a ; store first param call Audio1_GetNextMusicByte - ld [wc0e9], a ; store second param + ld [wMusicTempo + 1], a ; store second param xor a - ld [wc0ce], a ; clear RAM - ld [wc0cf], a - ld [wc0d0], a - ld [wc0d1], a + ld [wChannelNoteDelayCountersFractionalPart], a ; clear RAM + ld [wChannelNoteDelayCountersFractionalPart + 1], a + ld [wChannelNoteDelayCountersFractionalPart + 2], a + ld [wChannelNoteDelayCountersFractionalPart + 3], a jr .musicChannelDone .sfxChannel call Audio1_GetNextMusicByte - ld [wc0ea], a ; store first param + ld [wSfxTempo], a ; store first param call Audio1_GetNextMusicByte - ld [wc0eb], a ; store second param + ld [wSfxTempo + 1], a ; store second param xor a - ld [wc0d2], a ; clear RAM - ld [wc0d3], a - ld [wc0d4], a - ld [wc0d5], a + ld [wChannelNoteDelayCountersFractionalPart + 4], a ; clear RAM + ld [wChannelNoteDelayCountersFractionalPart + 5], a + ld [wChannelNoteDelayCountersFractionalPart + 6], a + ld [wChannelNoteDelayCountersFractionalPart + 7], a .musicChannelDone jp Audio1_endchannel Audio1_stereopanning: ; 0x93fa cp $ee ; is this command a stereopanning? jr nz, Audio1_unknownmusic0xef ; no - call Audio1_GetNextMusicByte ; yes - ld [wc004], a ; store panning + call Audio1_GetNextMusicByte + ld [wStereoPanning], a ; store panning jp Audio1_endchannel ; this appears to never be used Audio1_unknownmusic0xef: ; 0x9407 cp $ef ; is this command an unknownmusic0xef? jr nz, Audio1_dutycycle ; no - call Audio1_GetNextMusicByte ; yes + call Audio1_GetNextMusicByte push bc - call Audio1_9876 + call Audio1_PlaySound pop bc - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wc02d] - ld [wc003], a + ld a, [wChannelSoundIDs + CH7] + ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wc02d], a + ld [wChannelSoundIDs + CH7], a .skip jp Audio1_endchannel Audio1_dutycycle: ; 0x9426 cp $fc ; is this command a dutycycle? jr nz, Audio1_volume ; no - call Audio1_GetNextMusicByte ; yes - ld b, $0 - ld hl, wc046 + call Audio1_GetNextMusicByte + ld b, 0 + ld hl, wChannelDutyCycles add hl, bc ld [hl], a ; store full cycle and $c0 - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld [hl], a ; store first duty - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - set 6, [hl] ; set dutycycle flag + set BIT_ROTATE_DUTY, [hl] jp Audio1_endchannel Audio1_volume: ; 0x9444 cp $f0 ; is this command a volume? jr nz, Audio1_executemusic ; no - call Audio1_GetNextMusicByte ; yes - ld [$ff24], a ; store volume + call Audio1_GetNextMusicByte + ld [rNR50], a ; store volume jp Audio1_endchannel Audio1_executemusic: ; 0x9450 cp $f8 ; is this command an executemusic? jr nz, Audio1_octave ; no - ld b, $0 ; yes - ld hl, wc036 + ld b, $0 + ld hl, wChannelFlags2 add hl, bc - set 0, [hl] + set BIT_EXECUTE_MUSIC, [hl] jp Audio1_endchannel Audio1_octave: ; 0x945f and $f0 cp $e0 ; is this command an octave? jr nz, Audio1_unknownsfx0x20 ; no - ld hl, wc0d6 ; yes - ld b, $0 + ld hl, wChannelOctaves + ld b, 0 add hl, bc ld a, d and $f @@ -561,47 +574,54 @@ Audio1_octave: ; 0x945f Audio1_unknownsfx0x20: ; 0x9472 cp $20 ; is this command an unknownsfx0x20? - jr nz, Audio1_unknownsfx0x10 ; no + jr nz, Audio1_unknownsfx0x10 ld a, c cp CH3 ; is this a noise or sfx channel? jr c, Audio1_unknownsfx0x10 ; no - ld b, $0 - ld hl, wc036 + ld b, 0 + ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] - jr nz, Audio1_unknownsfx0x10 ; no - call Audio1_notelength ; yes + bit BIT_EXECUTE_MUSIC, [hl] ; is executemusic being used? + jr nz, Audio1_unknownsfx0x10 ; yes + call Audio1_notelength + +; This code seems to do the same thing as what Audio1_ApplyDutyAndSoundLength +; does below. ld d, a - ld b, $0 - ld hl, wc03e + ld b, 0 + ld hl, wChannelDuties add hl, bc ld a, [hl] or d ld d, a - ld b, $1 - call Audio1_9838 + ld b, REG_DUTY_SOUND_LEN + call Audio1_GetRegisterPointer ld [hl], d + call Audio1_GetNextMusicByte ld d, a - ld b, $2 - call Audio1_9838 + ld b, REG_VOLUME_ENVELOPE + call Audio1_GetRegisterPointer ld [hl], d call Audio1_GetNextMusicByte ld e, a ld a, c cp CH7 - ld a, $0 - jr z, .sfxNoiseChannel ; only two params for noise channel + ld a, 0 + jr z, .skip +; Channels 1 through 3 have 2 registers that control frequency, but the noise +; channel a single register (the polynomial counter) that controls frequency, +; so this command has one less byte on the noise channel. push de call Audio1_GetNextMusicByte pop de -.sfxNoiseChannel +.skip ld d, a push de - call Audio1_9629 - call Audio1_95f8 + call Audio1_ApplyDutyAndSoundLength + call Audio1_EnableChannelOutput pop de - call Audio1_964b + call Audio1_ApplyWavePatternAndFrequency ret Audio1_unknownsfx0x10: @@ -612,12 +632,12 @@ Audio1_unknownsfx0x10: cp $10 ; is this command a unknownsfx0x10? jr nz, Audio1_note ; no ld b, $0 - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] + bit BIT_EXECUTE_MUSIC, [hl] jr nz, Audio1_note ; no - call Audio1_GetNextMusicByte ; yes - ld [$ff10], a + call Audio1_GetNextMusicByte + ld [rNR10], a jp Audio1_endchannel Audio1_note: @@ -627,7 +647,7 @@ Audio1_note: ld a, d and $f0 cp $b0 ; is this command a dnote? - jr z, Audio1_dnote ; yes + jr z, Audio1_dnote jr nc, Audio1_notelength ; no swap a ld b, a @@ -647,11 +667,11 @@ Audio1_dnote: call Audio1_GetNextMusicByte ; get dnote instrument asm_94fd ld d, a - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .asm_9508 ld a, d - call Audio1_9876 + call Audio1_PlaySound .asm_9508 pop bc pop de @@ -661,20 +681,20 @@ Audio1_notelength: ; 0x950a push af and $f inc a - ld b, $0 + ld b, 0 ld e, a ; store note length (in 16ths) ld d, b - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, bc ld a, [hl] ld l, b - call Audio1_9847 + call Audio1_MultiplyAdd ld a, c cp CH4 jr nc, .sfxChannel - ld a, [wc0e8] + ld a, [wMusicTempo] ld d, a - ld a, [wc0e9] + ld a, [wMusicTempo + 1] ld e, a jr .skip .sfxChannel @@ -682,34 +702,34 @@ Audio1_notelength: ; 0x950a ld e, $0 cp CH7 jr z, .skip ; if noise channel - call Audio1_9693 - ld a, [wc0ea] + call Audio1_SetSfxTempo + ld a, [wSfxTempo] ld d, a - ld a, [wc0eb] + ld a, [wSfxTempo + 1] ld e, a .skip - ld a, l - ld b, $0 - ld hl, wc0ce + ld a, l ; a = note_length * note_speed + ld b, 0 + ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld l, [hl] - call Audio1_9847 + call Audio1_MultiplyAdd ld e, l - ld d, h - ld hl, wc0ce + ld d, h ; de = note_delay_frac_part + (note_length * note_speed * tempo) + ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld [hl], e ld a, d - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld [hl], a - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] + bit BIT_EXECUTE_MUSIC, [hl] jr nz, Audio1_notepitch - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - bit 2, [hl] + bit BIT_NOISE_OR_SFX, [hl] jr z, Audio1_notepitch pop hl ret @@ -721,177 +741,183 @@ Audio1_notepitch: ; 0x9568 jr nz, .notRest ld a, c cp CH4 - jr nc, .sfxChannel - ld hl, wc02a + jr nc, .next +; If this isn't an SFX channel, try the corresponding SFX channel. + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a jr nz, .done ; fall through -.sfxChannel +.next ld a, c cp CH2 - jr z, .musicChannel3 + jr z, .channel3 cp CH6 - jr nz, .notSfxChannel3 -.musicChannel3 - ld b, $0 - ld hl, Unknown_9b1f + jr nz, .notChannel3 +.channel3 + ld b, 0 + ld hl, Audio1_HWChannelDisableMasks add hl, bc - ld a, [$ff25] + ld a, [rNR51] and [hl] - ld [$ff25], a + ld [rNR51], a ; disable hardware channel 3's output jr .done -.notSfxChannel3 - ld b, $2 - call Audio1_9838 - ld a, $8 +.notChannel3 + ld b, REG_VOLUME_ENVELOPE + call Audio1_GetRegisterPointer + ld a, $8 ; fade in sound ld [hli], a inc hl - ld a, $80 + ld a, $80 ; restart sound ld [hl], a .done ret .notRest swap a - ld b, $0 - ld hl, wc0d6 + ld b, 0 + ld hl, wChannelOctaves add hl, bc ld b, [hl] - call Audio1_9858 - ld b, $0 - ld hl, wc02e - add hl, bc - bit 4, [hl] - jr z, .asm_95b8 - call Audio1_978f -.asm_95b8 + call Audio1_CalculateFrequency + ld b, 0 + ld hl, wChannelFlags1 + add hl, bc + bit BIT_PITCH_BEND_ON, [hl] + jr z, .skipPitchBend + call Audio1_InitPitchBendVars +.skipPitchBend push de ld a, c cp CH4 - jr nc, .skip ; if sfx channel - ld hl, wc02a - ld d, $0 + jr nc, .sfxChannel ; if sfx channel +; If this isn't an SFX channel, try the corresponding SFX channel. + ld hl, wChannelSoundIDs + CH4 + ld d, 0 ld e, a add hl, de ld a, [hl] and a - jr nz, .asm_95cb - jr .skip -.asm_95cb + jr nz, .noSfx + jr .sfxChannel +.noSfx pop de ret -.skip - ld b, $0 - ld hl, wc0de +.sfxChannel + ld b, 0 + ld hl, wChannelVolumes add hl, bc ld d, [hl] - ld b, $2 - call Audio1_9838 + ld b, REG_VOLUME_ENVELOPE + call Audio1_GetRegisterPointer ld [hl], d - call Audio1_9629 - call Audio1_95f8 + call Audio1_ApplyDutyAndSoundLength + call Audio1_EnableChannelOutput pop de ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - bit 0, [hl] ; has toggleperfectpitch been used? - jr z, .skip2 - inc e ; if yes, increment the pitch by 1 - jr nc, .skip2 + bit BIT_PERFECT_PITCH, [hl] ; has toggleperfectpitch been used? + jr z, .skipFrequencyInc + inc e ; if yes, increment the frequency by 1 + jr nc, .skipFrequencyInc inc d -.skip2 - ld hl, wc066 +.skipFrequencyInc + ld hl, wChannelFrequencyLowBytes add hl, bc ld [hl], e - call Audio1_964b + call Audio1_ApplyWavePatternAndFrequency ret -Audio1_95f8: ; 0x95f8 - ld b, $0 - ld hl, Unknown_9b27 +Audio1_EnableChannelOutput: ; 0x95f8 + ld b, 0 + ld hl, Audio1_HWChannelEnableMasks add hl, bc - ld a, [$ff25] - or [hl] + ld a, [rNR51] + or [hl] ; set this channel's bits ld d, a ld a, c cp CH7 - jr z, .sfxNoiseChannel + jr z, .noiseChannelOrNoSfx cp CH4 jr nc, .skip ; if sfx channel - ld hl, wc02a +; If this isn't an SFX channel, try the corresponding SFX channel. + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a jr nz, .skip -.sfxNoiseChannel - ld a, [wc004] - ld hl, Unknown_9b27 +.noiseChannelOrNoSfx +; If this is the SFX noise channel or a music channel whose corresponding +; SFX channel is off, apply stereo panning. + ld a, [wStereoPanning] + ld hl, Audio1_HWChannelEnableMasks add hl, bc and [hl] ld d, a - ld a, [$ff25] - ld hl, Unknown_9b1f + ld a, [rNR51] + ld hl, Audio1_HWChannelDisableMasks add hl, bc - and [hl] - or d + and [hl] ; reset this channel's output bits + or d ; set this channel's output bits that enabled in [wStereoPanning] ld d, a .skip ld a, d - ld [$ff25], a + ld [rNR51], a ret -Audio1_9629: ; 0x9629 - ld b, $0 - ld hl, wc0b6 +Audio1_ApplyDutyAndSoundLength: ; 0x9629 + ld b, 0 + ld hl, wChannelNoteDelayCounters ; use the note delay as sound length add hl, bc ld d, [hl] ld a, c cp CH2 - jr z, .channel3 ; if music channel 3 + jr z, .skipDuty ; if music channel 3 cp CH6 - jr z, .channel3 ; if sfx channel 3 + jr z, .skipDuty ; if sfx channel 3 +; include duty (except on channel 3 which doesn't have it) ld a, d and $3f ld d, a - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld a, [hl] or d ld d, a -.channel3 - ld b, $1 - call Audio1_9838 +.skipDuty + ld b, REG_DUTY_SOUND_LEN + call Audio1_GetRegisterPointer ld [hl], d ret -Audio1_964b: ; 0x964b +Audio1_ApplyWavePatternAndFrequency: ; 0x964b ld a, c cp CH2 jr z, .channel3 cp CH6 - jr nz, .notSfxChannel3 + jr nz, .notChannel3 ; fall through .channel3 push de - ld de, wc0e6 + ld de, wMusicWaveInstrument cp CH2 - jr z, .musicChannel3 - ld de, wc0e7 -.musicChannel3 + jr z, .next + ld de, wSfxWaveInstrument +.next ld a, [de] add a - ld d, $0 + ld d, 0 ld e, a ld hl, Audio1_WavePointers add hl, de ld e, [hl] inc hl ld d, [hl] - ld hl, $ff30 + ld hl, $ff30 ; wave pattern RAM ld b, $f - ld a, $0 - ld [$ff1a], a + ld a, $0 ; stop hardware channel 3 + ld [rNR30], a .loop ld a, [de] inc de @@ -900,152 +926,155 @@ Audio1_964b: ; 0x964b dec b and a jr nz, .loop - ld a, $80 - ld [$ff1a], a + ld a, $80 ; start hardware channel 3 + ld [rNR30], a pop de -.notSfxChannel3 +.notChannel3 ld a, d - or $80 - and $c7 + or $80 ; use counter mode (i.e. disable output when the counter reaches 0) + and $c7 ; zero the unused bits in the register ld d, a - ld b, $3 - call Audio1_9838 - ld [hl], e + ld b, REG_FREQUENCY_LO + call Audio1_GetRegisterPointer + ld [hl], e ; store frequency low byte inc hl - ld [hl], d - call Audio1_96b5 + ld [hl], d ; store frequency high byte + call Audio1_ApplyFrequencyModifier ret -Audio1_9693: ; 0x9693 - call Audio1_96e5 - jr nc, .asm_96ab - ld d, $0 - ld a, [wc0f2] +Audio1_SetSfxTempo: ; 0x9693 + call Audio1_IsCry + jr nc, .notCry + ld d, 0 + ld a, [wTempoModifier] add $80 - jr nc, .asm_96a2 + jr nc, .next inc d -.asm_96a2 - ld [wc0eb], a +.next + ld [wSfxTempo + 1], a ld a, d - ld [wc0ea], a - jr .asm_96b4 -.asm_96ab + ld [wSfxTempo], a + jr .done +.notCry xor a - ld [wc0eb], a + ld [wSfxTempo + 1], a ld a, $1 - ld [wc0ea], a -.asm_96b4 + ld [wSfxTempo], a +.done ret -Audio1_96b5: ; 0x96b5 - call Audio1_96e5 - jr nc, .asm_96c6 - ld a, [wc0f1] +Audio1_ApplyFrequencyModifier: ; 0x96b5 + call Audio1_IsCry + jr nc, .done +; if playing a cry, add the cry's frequency modifier + ld a, [wFrequencyModifier] add e - jr nc, .asm_96c1 + jr nc, .noCarry inc d -.asm_96c1 +.noCarry dec hl ld e, a ld [hl], e inc hl ld [hl], d -.asm_96c6 +.done ret -Audio1_96c7: ; 0x96c7 - call Audio1_96e5 - jr nc, .asm_96e2 - ld hl, wc006 +Audio1_GoBackOneCommandIfCry: ; 0x96c7 + call Audio1_IsCry + jr nc, .done + ld hl, wChannelCommandPointers ld e, c - ld d, $0 + ld d, 0 sla e rl d add hl, de ld a, [hl] - sub $1 + sub 1 ld [hl], a inc hl ld a, [hl] - sbc $0 + sbc 0 ld [hl], a scf ret -.asm_96e2 +.done scf ccf ret -Audio1_96e5: ; 0x96e5 - ld a, [wc02a] - cp $14 - jr nc, .asm_96ee - jr .asm_96f4 -.asm_96ee - cp $86 - jr z, .asm_96f4 - jr c, .asm_96f7 -.asm_96f4 +Audio1_IsCry: ; 0x96e5 +; Returns whether the currently playing audio is a cry in carry. + ld a, [wChannelSoundIDs + CH4] + cp CRY_SFX_START + jr nc, .next + jr .no +.next + cp CRY_SFX_END + jr z, .no + jr c, .yes +.no scf ccf ret -.asm_96f7 +.yes scf ret Audio1_ApplyPitchBend: ; 0x96f9 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc - bit 5, [hl] - jp nz, .asm_9740 - ld hl, wc09e + bit BIT_PITCH_BEND_DECREASING, [hl] + jp nz, .frequencyDecreasing +; frequency increasing + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, bc push hl - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld a, [hl] pop hl add [hl] ld [hl], a - ld a, $0 + ld a, 0 adc e ld e, a - ld a, $0 + ld a, 0 adc d ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, [hl] cp d - jp c, .asm_9786 - jr nz, .asm_9773 - ld hl, wc0ae + jp c, .reachedTargetFrequency + jr nz, .applyUpdatedFrequency + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, [hl] cp e - jp c, .asm_9786 - jr .asm_9773 -.asm_9740 - ld hl, wc09e + jp c, .reachedTargetFrequency + jr .applyUpdatedFrequency +.frequencyDecreasing + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld a, [hl] - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld e, [hl] sub e @@ -1053,7 +1082,7 @@ Audio1_ApplyPitchBend: ; 0x96f9 ld a, d sbc b ld d, a - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld a, [hl] add a @@ -1064,129 +1093,140 @@ Audio1_ApplyPitchBend: ; 0x96f9 ld a, d sbc b ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, d cp [hl] - jr c, .asm_9786 - jr nz, .asm_9773 - ld hl, wc0ae + jr c, .reachedTargetFrequency + jr nz, .applyUpdatedFrequency + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, e cp [hl] - jr c, .asm_9786 -.asm_9773 - ld hl, wc09e + jr c, .reachedTargetFrequency +.applyUpdatedFrequency + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld b, $3 - call Audio1_9838 + ld b, REG_FREQUENCY_LO + call Audio1_GetRegisterPointer ld a, e ld [hli], a ld [hl], d ret -.asm_9786 - ld hl, wc02e +.reachedTargetFrequency +; Turn off pitch bend when the target frequency has been reached. + ld hl, wChannelFlags1 add hl, bc - res 4, [hl] - res 5, [hl] + res BIT_PITCH_BEND_ON, [hl] + res BIT_PITCH_BEND_DECREASING, [hl] ret -Audio1_978f: ; 0x978f - ld hl, wc096 +Audio1_InitPitchBendVars: ; 0x978f + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld a, [hl] - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, bc sub [hl] - jr nc, .asm_97a7 - ld a, $1 -.asm_97a7 + jr nc, .next + ld a, 1 +.next ld [hl], a - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc sub [hl] - jr c, .asm_97c3 + jr c, .targetFrequencyGreater ld d, a - ld b, $0 - ld hl, wc02e + ld b, 0 + ld hl, wChannelFlags1 add hl, bc - set 5, [hl] - jr .asm_97e6 -.asm_97c3 - ld hl, wc096 + set BIT_PITCH_BEND_DECREASING, [hl] + jr .next2 +.targetFrequencyGreater +; If the target frequency is greater, subtract the current frequency from +; the target frequency to get the absolute difference. + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, [hl] sub e ld e, a + +; Bug. Instead of borrowing from the high byte of the target frequency as it +; should, it borrows from the high byte of the current frequency instead. +; This means that the result will be 0x200 greater than it should be if the +; low byte of the current frequency is greater than the low byte of the +; target frequency. ld a, d sbc b ld d, a - ld hl, wc0a6 + + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, [hl] sub d ld d, a - ld b, $0 - ld hl, wc02e + ld b, 0 + ld hl, wChannelFlags1 add hl, bc - res 5, [hl] -.asm_97e6 - ld hl, wc076 + res BIT_PITCH_BEND_DECREASING, [hl] + +.next2 + ld hl, wChannelPitchBendLengthModifiers add hl, bc -.asm_97ea +.divideLoop inc b ld a, e sub [hl] ld e, a - jr nc, .asm_97ea + jr nc, .divideLoop ld a, d and a - jr z, .asm_97f8 + jr z, .doneDividing dec a ld d, a - jr .asm_97ea -.asm_97f8 - ld a, e + jr .divideLoop +.doneDividing + ld a, e ; a = remainder - dividend add [hl] - ld d, b - ld b, $0 - ld hl, wc07e + ld d, b ; d = quotient + 1 + ld b, 0 + ld hl, wChannelPitchBendFrequencySteps add hl, bc - ld [hl], d - ld hl, wc086 + ld [hl], d ; store quotient + 1 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc - ld [hl], a - ld hl, wc08e + ld [hl], a ; store remainder - dividend + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, bc - ld [hl], a + ld [hl], a ; store remainder - dividend ret Audio1_ApplyDutyCycle: ; 0x980d - ld b, $0 - ld hl, wc046 + ld b, 0 + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] rlca @@ -1194,8 +1234,8 @@ Audio1_ApplyDutyCycle: ; 0x980d ld [hl], a and $c0 ld d, a - ld b, $1 - call Audio1_9838 + ld b, REG_DUTY_SOUND_LEN + call Audio1_GetRegisterPointer ld a, [hl] and $3f or d @@ -1203,11 +1243,11 @@ Audio1_ApplyDutyCycle: ; 0x980d ret Audio1_GetNextMusicByte: ; 0x9825 - ld d, $0 + ld d, 0 ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de ld a, [hli] ld e, a @@ -1220,9 +1260,10 @@ Audio1_GetNextMusicByte: ; 0x9825 ld [hl], d ret -Audio1_9838: ; 0x9838 +Audio1_GetRegisterPointer: ; 0x9838 +; hl = address of hardware sound register b for software channel c ld a, c - ld hl, Unknown_9b17 + ld hl, Audio1_HWChannelBaseAddresses add l jr nc, .noCarry inc h @@ -1234,13 +1275,14 @@ Audio1_9838: ; 0x9838 ld h, $ff ret -Audio1_9847: ; 0x9847 - ld h, $0 +Audio1_MultiplyAdd: ; 0x9847 +; hl = l + (a * de) + ld h, 0 .loop srl a - jr nc, .noCarry + jr nc, .skipAdd add hl, de -.noCarry +.skipAdd sla e rl d and a @@ -1249,8 +1291,9 @@ Audio1_9847: ; 0x9847 .done ret -Audio1_9858: ; 0x9858 - ld h, $0 +Audio1_CalculateFrequency: ; 0x9858 +; return the frequency for note a, octave b in de + ld h, 0 ld l, a add hl, hl ld d, h @@ -1262,137 +1305,138 @@ Audio1_9858: ; 0x9858 ld d, [hl] ld a, b .loop - cp $7 + cp 7 jr z, .done sra d rr e inc a jr .loop .done - ld a, $8 + ld a, 8 add d ld d, a ret -Audio1_9876:: ; 0x9876 - ld [wc001], a +Audio1_PlaySound:: ; 0x9876 + ld [wSoundID], a cp $ff - jp z, Audio1_9a34 - cp $b9 - jp z, Audio1_994e - jp c, Audio1_994e + jp z, .stopAllAudio + cp MAX_SFX_ID + jp z, .playSfx + jp c, .playSfx cp $fe - jr z, .asm_988d - jp nc, Audio1_994e -.asm_988d + jr z, .playMusic + jp nc, .playSfx + +.playMusic xor a - ld [wc000], a - ld [wc003], a - ld [wc0e9], a - ld [wc0e6], a - ld [wc0e7], a + ld [wUnusedC000], a + ld [wDisableChannelOutputWhenSfxEnds], a + ld [wMusicTempo + 1], a + ld [wMusicWaveInstrument], a + ld [wSfxWaveInstrument], a ld d, $8 - ld hl, wc016 - call FillAudioRAM1 - ld hl, wc006 - call FillAudioRAM1 + ld hl, wChannelReturnAddresses + call .FillMem + ld hl, wChannelCommandPointers + call .FillMem ld d, $4 - ld hl, wc026 - call FillAudioRAM1 - ld hl, wc02e - call FillAudioRAM1 - ld hl, wc03e - call FillAudioRAM1 - ld hl, wc046 - call FillAudioRAM1 - ld hl, wc04e - call FillAudioRAM1 - ld hl, wc056 - call FillAudioRAM1 - ld hl, wc05e - call FillAudioRAM1 - ld hl, wc066 - call FillAudioRAM1 - ld hl, wc06e - call FillAudioRAM1 - ld hl, wc036 - call FillAudioRAM1 - ld hl, wc076 - call FillAudioRAM1 - ld hl, wc07e - call FillAudioRAM1 - ld hl, wc086 - call FillAudioRAM1 - ld hl, wc08e - call FillAudioRAM1 - ld hl, wc096 - call FillAudioRAM1 - ld hl, wc09e - call FillAudioRAM1 - ld hl, wc0a6 - call FillAudioRAM1 - ld hl, wc0ae - call FillAudioRAM1 + ld hl, wChannelSoundIDs + call .FillMem + ld hl, wChannelFlags1 + call .FillMem + ld hl, wChannelDuties + call .FillMem + ld hl, wChannelDutyCycles + call .FillMem + ld hl, wChannelVibratoDelayCounters + call .FillMem + ld hl, wChannelVibratoExtents + call .FillMem + ld hl, wChannelVibratoRates + call .FillMem + ld hl, wChannelFrequencyLowBytes + call .FillMem + ld hl, wChannelVibratoDelayCounterReloadValues + call .FillMem + ld hl, wChannelFlags2 + call .FillMem + ld hl, wChannelPitchBendLengthModifiers + call .FillMem + ld hl, wChannelPitchBendFrequencySteps + call .FillMem + ld hl, wChannelPitchBendFrequencyStepsFractionalPart + call .FillMem + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + call .FillMem + ld hl, wChannelPitchBendCurrentFrequencyHighBytes + call .FillMem + ld hl, wChannelPitchBendCurrentFrequencyLowBytes + call .FillMem + ld hl, wChannelPitchBendTargetFrequencyHighBytes + call .FillMem + ld hl, wChannelPitchBendTargetFrequencyLowBytes + call .FillMem ld a, $1 - ld hl, wc0be - call FillAudioRAM1 - ld hl, wc0b6 - call FillAudioRAM1 - ld hl, wc0c6 - call FillAudioRAM1 - ld [wc0e8], a + ld hl, wChannelLoopCounters + call .FillMem + ld hl, wChannelNoteDelayCounters + call .FillMem + ld hl, wChannelNoteSpeeds + call .FillMem + ld [wMusicTempo], a ld a, $ff - ld [wc004], a + ld [wStereoPanning], a xor a - ld [$ff24], a + ld [rNR50], a ld a, $8 - ld [$ff10], a - ld a, $0 - ld [$ff25], a + ld [rNR10], a + ld a, 0 + ld [rNR51], a xor a - ld [$ff1a], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a ld a, $77 - ld [$ff24], a - jp Audio1_9a8f + ld [rNR50], a + jp .playSoundCommon -Audio1_994e: ; 0x994e +.playSfx ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de ld de, SFX_Headers_1 add hl, de ld a, h - ld [wc0ec], a + ld [wSfxHeaderPointer], a ld a, l - ld [wc0ed], a + ld [wSfxHeaderPointer + 1], a ld a, [hl] and $c0 rlca rlca ld c, a -.asm_9967 +.sfxChannelLoop ld d, c ld a, c add a add c ld c, a - ld b, $0 - ld a, [wc0ec] + ld b, 0 + ld a, [wSfxHeaderPointer] ld h, a - ld a, [wc0ed] + ld a, [wSfxHeaderPointer + 1] ld l, a add hl, bc ld c, d ld a, [hl] and $f - ld e, a - ld d, $0 - ld hl, wc026 + ld e, a ; software channel ID + ld d, 0 + ld hl, wChannelSoundIDs add hl, de ld a, [hl] and a @@ -1400,7 +1444,7 @@ Audio1_994e: ; 0x994e ld a, e cp $7 jr nz, .asm_999a - ld a, [wc001] + ld a, [wSoundID] cp $14 jr nc, .asm_9993 ret @@ -1410,7 +1454,7 @@ Audio1_994e: ; 0x994e jr z, .asm_99a3 jr c, .asm_99a3 .asm_999a - ld a, [wc001] + ld a, [wSoundID] cp [hl] jr z, .asm_99a3 jr c, .asm_99a3 @@ -1423,132 +1467,132 @@ Audio1_994e: ; 0x994e add hl, hl ld d, h ld e, l - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld [hli], a ld [hl], a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de ld [hli], a ld [hl], a pop de - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, de ld [hl], a - ld hl, wc02e + ld hl, wChannelFlags1 add hl, de ld [hl], a - ld hl, wc03e + ld hl, wChannelDuties add hl, de ld [hl], a - ld hl, wc046 + ld hl, wChannelDutyCycles add hl, de ld [hl], a - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, de ld [hl], a - ld hl, wc056 + ld hl, wChannelVibratoExtents add hl, de ld [hl], a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, de ld [hl], a - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, de ld [hl], a - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, de ld [hl], a - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, de ld [hl], a - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, de ld [hl], a - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, de ld [hl], a - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, de ld [hl], a - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, de ld [hl], a - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc036 + ld hl, wChannelFlags2 add hl, de ld [hl], a ld a, $1 - ld hl, wc0be + ld hl, wChannelLoopCounters add hl, de ld [hl], a - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, de ld [hl], a - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, de ld [hl], a ld a, e - cp $4 + cp CH4 jr nz, .asm_9a2b ld a, $8 - ld [$ff10], a + ld [rNR10], a ; sweep off .asm_9a2b ld a, c and a - jp z, Audio1_9a8f + jp z, .playSoundCommon dec c - jp .asm_9967 + jp .sfxChannelLoop -Audio1_9a34: ; 0x9a34 +.stopAllAudio ld a, $80 - ld [$ff26], a - ld [$ff1a], a + ld [rNR52], a ; sound hardware on + ld [rNR30], a ; wave playback on xor a - ld [$ff25], a - ld [$ff1c], a + ld [rNR51], a ; no sound output + ld [rNR32], a ; mute channel 3 (wave channel) ld a, $8 - ld [$ff10], a - ld [$ff12], a - ld [$ff17], a - ld [$ff21], a + ld [rNR10], a ; sweep off + ld [rNR12], a ; mute channel 1 (pulse channel 1) + ld [rNR22], a ; mute channel 2 (pulse channel 2) + ld [rNR42], a ; mute channel 4 (noise channel) ld a, $40 - ld [$ff14], a - ld [$ff19], a - ld [$ff23], a + ld [rNR14], a ; counter mode + ld [rNR24], a + ld [rNR44], a ld a, $77 - ld [$ff24], a + ld [rNR50], a ; full volume xor a - ld [wc000], a - ld [wc003], a - ld [wc002], a - ld [wc0e9], a - ld [wc0eb], a - ld [wc0e6], a - ld [wc0e7], a + ld [wUnusedC000], a + ld [wDisableChannelOutputWhenSfxEnds], a + ld [wMuteAudioAndPauseMusic], a + ld [wMusicTempo + 1], a + ld [wSfxTempo + 1], a + ld [wMusicWaveInstrument], a + ld [wSfxWaveInstrument], a ld d, $a0 - ld hl, wc006 - call FillAudioRAM1 + ld hl, wChannelCommandPointers + call .FillMem ld a, $1 ld d, $18 - ld hl, wc0b6 - call FillAudioRAM1 - ld [wc0e8], a - ld [wc0ea], a + ld hl, wChannelNoteDelayCounters + call .FillMem + ld [wMusicTempo], a + ld [wSfxTempo], a ld a, $ff - ld [wc004], a + ld [wStereoPanning], a ret ; fills d bytes at hl with a -FillAudioRAM1: ; 0x9a89 +.FillMem ld b, d .loop ld [hli], a @@ -1556,11 +1600,11 @@ FillAudioRAM1: ; 0x9a89 jr nz, .loop ret -Audio1_9a8f: ; 0x9a8f - ld a, [wc001] +.playSoundCommon + ld a, [wSoundID] ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de @@ -1568,7 +1612,7 @@ Audio1_9a8f: ; 0x9a8f add hl, de ld e, l ld d, h - ld hl, wc006 + ld hl, wChannelCommandPointers ld a, [de] ; get channel number ld b, a rlca @@ -1580,31 +1624,31 @@ Audio1_9a8f: ; 0x9a8f ld b, c inc b inc de - ld c, $0 -.asm_9ab1 + ld c, 0 +.commandPointerLoop cp c - jr z, .asm_9ab9 + jr z, .next inc c inc hl inc hl - jr .asm_9ab1 -.asm_9ab9 + jr .commandPointerLoop +.next push hl push bc push af - ld b, $0 + ld b, 0 ld c, a - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, bc - ld a, [wc001] + ld a, [wSoundID] ld [hl], a pop af - cp $3 - jr c, .asm_9ad2 - ld hl, wc02e + cp CH3 + jr c, .skipSettingFlag + ld hl, wChannelFlags1 add hl, bc - set 2, [hl] -.asm_9ad2 + set BIT_NOISE_OR_SFX, [hl] +.skipSettingFlag pop bc pop hl ld a, [de] ; get channel pointer @@ -1619,52 +1663,53 @@ Audio1_9a8f: ; 0x9a8f and a ld a, [de] inc de - jr nz, .asm_9ab1 - ld a, [wc001] - cp $14 + jr nz, .commandPointerLoop + ld a, [wSoundID] + cp CRY_SFX_START jr nc, .asm_9aeb - jr .asm_9b15 + jr .done .asm_9aeb - ld a, [wc001] - cp $86 - jr z, .asm_9b15 - jr c, .asm_9af6 - jr .asm_9b15 -.asm_9af6 - ld hl, wc02a + ld a, [wSoundID] + cp CRY_SFX_END + jr z, .done + jr c, .cry + jr .done +.cry + ld hl, wChannelSoundIDs + CH4 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wc012 ; sfx noise channel pointer - ld de, Noise1_endchannel + ld hl, wChannelCommandPointers + CH6 * 2 ; sfx wave channel pointer + ld de, Audio1_CryEndchannel ld [hl], e inc hl ld [hl], d ; overwrite pointer to point to endchannel - ld a, [wc005] + ld a, [wSavedVolume] and a - jr nz, .asm_9b15 - ld a, [$ff24] - ld [wc005], a + jr nz, .done + ld a, [rNR50] + ld [wSavedVolume], a ld a, $77 - ld [$ff24], a -.asm_9b15 + ld [rNR50], a ; full volume +.done ret -Noise1_endchannel: ; 0x9b16 +Audio1_CryEndchannel: ; 0x9b16 endchannel -Unknown_9b17: ; 0x9b17 - db $10, $15, $1A, $1F ; channels 0-3 - db $10, $15, $1A, $1F ; channels 4-7 +Audio1_HWChannelBaseAddresses: ; 0x9b17 +; the low bytes of each HW channel's base address + db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 0-3 + db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 4-7 -Unknown_9b1f: ; 0x9b1f - db $EE, $DD, $BB, $77 ; channels 0-3 - db $EE, $DD, $BB, $77 ; channels 4-7 +Audio1_HWChannelDisableMasks: ; 0x9b1f + db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 0-3 + db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 4-7 -Unknown_9b27: ; 0x9b27 - db $11, $22, $44, $88 ; channels 0-3 - db $11, $22, $44, $88 ; channels 4-7 +Audio1_HWChannelEnableMasks: ; 0x9b27 + db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3 + db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 Audio1_Pitches: ; 0x9b2f dw $F82C ; C_ diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 62b82cec..e70a305f 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -4,7 +4,7 @@ Audio2_UpdateMusic:: ; 21879 (8:5879) ld c, CH0 .loop ld b, $0 - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, bc ld a, [hl] and a @@ -12,18 +12,18 @@ Audio2_UpdateMusic:: ; 21879 (8:5879) ld a, c cp CH4 jr nc, .applyAffects ; if sfx channel - ld a, [wc002] + ld a, [wMuteAudioAndPauseMusic] and a jr z, .applyAffects bit 7, a jr nz, .nextChannel set 7, a - ld [wc002], a + ld [wMuteAudioAndPauseMusic], a xor a - ld [$ff25], a - ld [$ff1a], a + ld [rNR51], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a jr .nextChannel .applyAffects call Audio2_ApplyMusicAffects @@ -36,7 +36,7 @@ Audio2_UpdateMusic:: ; 21879 (8:5879) ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -; known flags for wc02e: +; known flags for wChannelFlags1: ; 0: toggleperfectpitch has been used ; 1: call has been used ; 3: a toggle used only by this routine for vibrato @@ -44,7 +44,7 @@ Audio2_UpdateMusic:: ; 21879 (8:5879) ; 6: dutycycle flag Audio2_ApplyMusicAffects: ; 218ae (8:58ae) ld b, $0 - ld hl, wc0b6 ; delay until next note + ld hl, wChannelNoteDelayCounters ; delay until next note add hl, bc ld a, [hl] cp $1 ; if the delay is 1, play next note @@ -54,36 +54,36 @@ Audio2_ApplyMusicAffects: ; 218ae (8:58ae) ld a, c cp CH4 jr nc, .startChecks ; if a sfx channel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a jr z, .startChecks ret .startChecks - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 6, [hl] ; dutycycle jr z, .checkForExecuteMusic call Audio2_ApplyDutyCycle .checkForExecuteMusic ld b, $0 - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, .checkForPitchBend - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 2, [hl] jr nz, .disablePitchBendVibrato .checkForPitchBend - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 4, [hl] ; pitchbend jr z, .checkVibratoDelay jp Audio2_ApplyPitchBend .checkVibratoDelay - ld hl, wc04e ; vibrato delay + ld hl, wChannelVibratoDelayCounters ; vibrato delay add hl, bc ld a, [hl] and a ; check if delay is over @@ -92,7 +92,7 @@ Audio2_ApplyMusicAffects: ; 218ae (8:58ae) .disablePitchBendVibrato ret .checkForVibrato - ld hl, wc056 ; vibrato rate + ld hl, wChannelVibratoExtents ; vibrato rate add hl, bc ld a, [hl] and a @@ -100,7 +100,7 @@ Audio2_ApplyMusicAffects: ; 218ae (8:58ae) ret ; no vibrato .vibrato ld d, a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, bc ld a, [hl] and $f @@ -113,10 +113,10 @@ Audio2_ApplyMusicAffects: ; 218ae (8:58ae) swap [hl] or [hl] ld [hl], a ; reset the vibrato value and start again - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes add hl, bc ld e, [hl] ; get note pitch - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 3, [hl] ; this is the only code that sets/resets bit three so jr z, .unset ; it continuously alternates which path it takes @@ -149,13 +149,13 @@ Audio2_ApplyMusicAffects: ; 218ae (8:58ae) ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached Audio2_PlayNextNote: ; 21946 (8:5946) - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld a, [hl] - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc res 4, [hl] res 5, [hl] @@ -175,7 +175,7 @@ Audio2_endchannel: ; 21967 (8:5967) cp $ff ; is this command an endchannel? jp nz, Audio2_callchannel ; no ld b, $0 ; yes - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 1, [hl] jr nz, .returnFromCall @@ -185,22 +185,22 @@ Audio2_endchannel: ; 21967 (8:5967) jr .asm_219c0 .noiseOrSfxChannel res 2, [hl] - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc res 0, [hl] cp CH6 jr nz, .notSfxChannel3 ld a, $0 - ld [$ff1a], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a .notSfxChannel3 jr nz, .asm_219a3 - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr z, .asm_219a3 xor a - ld [wc003], a + ld [wDisableChannelOutputWhenSfxEnds], a jr .asm_219c0 .asm_219a3 jr .asm_219c9 @@ -210,10 +210,10 @@ Audio2_endchannel: ; 21967 (8:5967) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de push hl ; store current channel address - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld e, l ld d, h @@ -227,16 +227,16 @@ Audio2_endchannel: ; 21967 (8:5967) .asm_219c0 ld hl, Unknown_222de add hl, bc - ld a, [$ff25] + ld a, [rNR51] and [hl] - ld [$ff25], a + ld [rNR51], a .asm_219c9 - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $14 jr nc, .asm_219d2 jr .asm_219ef .asm_219d2 - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $86 jr z, .asm_219ef jr c, .asm_219dd @@ -248,12 +248,12 @@ Audio2_endchannel: ; 21967 (8:5967) call Audio2_21e6d ret c .asm_219e6 - ld a, [wc005] - ld [$ff24], a + ld a, [wSavedVolume] + ld [rNR50], a xor a - ld [wc005], a + ld [wSavedVolume], a .asm_219ef - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, bc ld [hl], b ret @@ -272,10 +272,10 @@ Audio2_callchannel: ; 219f5 (8:59f5) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de push hl - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld e, l ld d, h @@ -290,7 +290,7 @@ Audio2_callchannel: ; 219f5 (8:59f5) inc hl ld [hl], d ; overwrite current address with pointer ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 1, [hl] ; set the call flag jp Audio2_endchannel @@ -303,7 +303,7 @@ Audio2_loopchannel: ; 21a2a (8:5a2a) and a jr z, .infiniteLoop ld b, $0 - ld hl, wc0be + ld hl, wChannelLoopCounters add hl, bc ld a, [hl] cp e @@ -326,7 +326,7 @@ Audio2_loopchannel: ; 21a2a (8:5a2a) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de pop af ld [hli], a @@ -340,7 +340,7 @@ Audio2_notetype: ; 21a65 (8:5a65) ld a, d ; yes and $f ld b, $0 - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, bc ld [hl], a ; store low nibble as speed ld a, c @@ -353,10 +353,10 @@ Audio2_notetype: ; 21a65 (8:5a65) jr z, .musicChannel3 cp CH6 jr nz, .notChannel3 - ld hl, wc0e7 + ld hl, wSfxWaveInstrument jr .sfxChannel3 .musicChannel3 - ld hl, wc0e6 + ld hl, wMusicWaveInstrument .sfxChannel3 ld a, d and $f @@ -371,7 +371,7 @@ Audio2_notetype: ; 21a65 (8:5a65) ; else, store volume (high nibble) and fade (low nibble) .notChannel3 ld b, $0 - ld hl, wc0de + ld hl, wChannelVolumes add hl, bc ld [hl], d .noiseChannel @@ -382,11 +382,11 @@ Audio2_toggleperfectpitch: ; 21aa4 (8:5aa4) cp $e8 ; is this command a toggleperfectpitch? jr nz, Audio2_vibrato ; no ld b, $0 ; yes - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc ld a, [hl] xor $1 - ld [hl], a ; flip bit 0 of wc02e + ld [hl], a ; flip bit 0 of wChannelFlags1 jp Audio2_endchannel Audio2_vibrato: ; 21ab6 (8:5ab6) @@ -394,10 +394,10 @@ Audio2_vibrato: ; 21ab6 (8:5ab6) jr nz, Audio2_pitchbend ; no call Audio2_GetNextMusicByte ; yes ld b, $0 - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a ; store delay - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld [hl], a ; store delay call Audio2_GetNextMusicByte @@ -405,7 +405,7 @@ Audio2_vibrato: ; 21ab6 (8:5ab6) and $f0 swap a ld b, $0 - ld hl, wc056 + ld hl, wChannelVibratoExtents add hl, bc srl a ld e, a @@ -416,7 +416,7 @@ Audio2_vibrato: ; 21ab6 (8:5ab6) ld a, d and $f ld d, a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, bc swap a or d @@ -428,7 +428,7 @@ Audio2_pitchbend: ; 21aee (8:5aee) jr nz, Audio2_duty ; no call Audio2_GetNextMusicByte ; yes ld b, $0 - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, bc ld [hl], a ; store first param call Audio2_GetNextMusicByte @@ -440,14 +440,14 @@ Audio2_pitchbend: ; 21aee (8:5aee) and $f call Audio2_22017 ld b, $0 - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld [hl], d ; store unknown part of second param - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld [hl], e ; store unknown part of second param ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 4, [hl] ; set pitchbend flag call Audio2_GetNextMusicByte @@ -462,7 +462,7 @@ Audio2_duty: ; 21b26 (8:5b26) rrca and $c0 ld b, $0 - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld [hl], a ; store duty jp Audio2_endchannel @@ -474,25 +474,25 @@ Audio2_tempo: ; 21b3b (8:5b3b) cp CH4 jr nc, .sfxChannel call Audio2_GetNextMusicByte - ld [wc0e8], a ; store first param + ld [wMusicTempo], a ; store first param call Audio2_GetNextMusicByte - ld [wc0e9], a ; store second param + ld [wMusicTempo + 1], a ; store second param xor a - ld [wc0ce], a ; clear RAM - ld [wc0cf], a - ld [wc0d0], a - ld [wc0d1], a + ld [wChannelNoteDelayCountersFractionalPart], a ; clear RAM + ld [wChannelNoteDelayCountersFractionalPart + 1], a + ld [wChannelNoteDelayCountersFractionalPart + 2], a + ld [wChannelNoteDelayCountersFractionalPart + 3], a jr .musicChannelDone .sfxChannel call Audio2_GetNextMusicByte - ld [wc0ea], a ; store first param + ld [wSfxTempo], a ; store first param call Audio2_GetNextMusicByte - ld [wc0eb], a ; store second param + ld [wSfxTempo + 1], a ; store second param xor a - ld [wc0d2], a ; clear RAM - ld [wc0d3], a - ld [wc0d4], a - ld [wc0d5], a + ld [wChannelNoteDelayCountersFractionalPart + 4], a ; clear RAM + ld [wChannelNoteDelayCountersFractionalPart + 5], a + ld [wChannelNoteDelayCountersFractionalPart + 6], a + ld [wChannelNoteDelayCountersFractionalPart + 7], a .musicChannelDone jp Audio2_endchannel @@ -500,7 +500,7 @@ Audio2_stereopanning: ; 21b7b (8:5b7b) cp $ee ; is this command a stereopanning? jr nz, Audio2_unknownmusic0xef ; no call Audio2_GetNextMusicByte ; yes - ld [wc004], a ; store panning + ld [wStereoPanning], a ; store panning jp Audio2_endchannel ; this appears to never be used @@ -509,15 +509,15 @@ Audio2_unknownmusic0xef: ; 21b88 (8:5b88) jr nz, Audio2_dutycycle ; no call Audio2_GetNextMusicByte ; yes push bc - call Audio2_22035 + call Audio2_PlaySound pop bc - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wc02d] - ld [wc003], a + ld a, [wChannelSoundIDs + CH7] + ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wc02d], a + ld [wChannelSoundIDs + CH7], a .skip jp Audio2_endchannel @@ -526,14 +526,14 @@ Audio2_dutycycle: ; 21ba7 (8:5ba7) jr nz, Audio2_volume ; no call Audio2_GetNextMusicByte ; yes ld b, $0 - ld hl, wc046 + ld hl, wChannelDutyCycles add hl, bc ld [hl], a ; store full cycle and $c0 - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld [hl], a ; store first duty - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 6, [hl] ; set dutycycle flag jp Audio2_endchannel @@ -542,14 +542,14 @@ Audio2_volume: ; 21bc5 (8:5bc5) cp $f0 ; is this command a volume? jr nz, Audio2_executemusic ; no call Audio2_GetNextMusicByte ; yes - ld [$ff24], a ; store volume + ld [rNR50], a ; store volume jp Audio2_endchannel Audio2_executemusic: ; 21bd1 (8:5bd1) cp $f8 ; is this command an executemusic? jr nz, Audio2_octave ; no ld b, $0 ; yes - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc set 0, [hl] jp Audio2_endchannel @@ -558,7 +558,7 @@ Audio2_octave: ; 21be0 (8:5be0) and $f0 cp $e0 ; is this command an octave? jr nz, Audio2_unknownsfx0x20 ; no - ld hl, wc0d6 ; yes + ld hl, wChannelOctaves ; yes ld b, $0 add hl, bc ld a, d @@ -573,14 +573,14 @@ Audio2_unknownsfx0x20: ; 21bf3 cp CH3 ; is this a noise or sfx channel? jr c, Audio2_unknownsfx0x10 ; no ld b, $0 - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, Audio2_unknownsfx0x10 ; no call Audio2_notelength ld d, a ld b, $0 - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld a, [hl] or d @@ -619,12 +619,12 @@ Audio2_unknownsfx0x10: ; 21c40 (8:5c40) cp $10 ; is this command a unknownsfx0x10? jr nz, Audio2_note ; no ld b, $0 - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, Audio2_note ; no call Audio2_GetNextMusicByte ; yes - ld [$ff10], a + ld [rNR10], a jp Audio2_endchannel Audio2_note: ; 21c5c (8:5c5c) @@ -654,11 +654,11 @@ Audio2_dnote: ; 21c76 (8:5c76) call Audio2_GetNextMusicByte ; get dnote instrument asm_21c7e ld d, a - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .asm_21c89 ld a, d - call Audio2_22035 + call Audio2_PlaySound .asm_21c89 pop bc pop de @@ -671,7 +671,7 @@ Audio2_notelength: ; 21c8b (8:5c8b) ld b, $0 ld e, a ; store note length (in 16ths) ld d, b - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, bc ld a, [hl] ld l, b @@ -679,9 +679,9 @@ Audio2_notelength: ; 21c8b (8:5c8b) ld a, c cp CH4 jr nc, .sfxChannel - ld a, [wc0e8] + ld a, [wMusicTempo] ld d, a - ld a, [wc0e9] + ld a, [wMusicTempo + 1] ld e, a jr .skip .sfxChannel @@ -690,31 +690,31 @@ Audio2_notelength: ; 21c8b (8:5c8b) cp CH7 jr z, .skip ; if noise channel call Audio2_21e2f - ld a, [wc0ea] + ld a, [wSfxTempo] ld d, a - ld a, [wc0eb] + ld a, [wSfxTempo + 1] ld e, a .skip ld a, l ld b, $0 - ld hl, wc0ce + ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld l, [hl] call Audio2_22006 ld e, l ld d, h - ld hl, wc0ce + ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld [hl], e ld a, d - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld [hl], a - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, Audio2_notepitch - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 2, [hl] jr z, Audio2_notepitch @@ -729,7 +729,7 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) ld a, c cp CH4 jr nc, .sfxChannel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a @@ -745,9 +745,9 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) ld b, $0 ld hl, Unknown_222de add hl, bc - ld a, [$ff25] + ld a, [rNR51] and [hl] - ld [$ff25], a + ld [rNR51], a jr .done .notSfxChannel3 ld b, $2 @@ -762,12 +762,12 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) .notRest swap a ld b, $0 - ld hl, wc0d6 + ld hl, wChannelOctaves add hl, bc ld b, [hl] call Audio2_22017 ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 4, [hl] jr z, .asm_21d39 @@ -777,7 +777,7 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) ld a, c cp CH4 jr nc, .skip ; if sfx channel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 ld d, $0 ld e, a add hl, de @@ -790,7 +790,7 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) ret .skip ld b, $0 - ld hl, wc0de + ld hl, wChannelVolumes add hl, bc ld d, [hl] ld b, $2 @@ -800,7 +800,7 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) call Audio2_21d79 pop de ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 0, [hl] ; has toggleperfectpitch been used? jr z, .skip2 @@ -808,7 +808,7 @@ Audio2_notepitch: ; 21ce9 (8:5ce9) jr nc, .skip2 inc d .skip2 - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes add hl, bc ld [hl], e call Audio2_21dcc @@ -818,7 +818,7 @@ Audio2_21d79: ; 21d79 (8:5d79) ld b, $0 ld hl, Unknown_222e6 add hl, bc - ld a, [$ff25] + ld a, [rNR51] or [hl] ld d, a ld a, c @@ -826,18 +826,18 @@ Audio2_21d79: ; 21d79 (8:5d79) jr z, .sfxNoiseChannel cp CH4 jr nc, .skip ; if sfx channel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a jr nz, .skip .sfxNoiseChannel - ld a, [wc004] + ld a, [wStereoPanning] ld hl, Unknown_222e6 add hl, bc and [hl] ld d, a - ld a, [$ff25] + ld a, [rNR51] ld hl, Unknown_222de add hl, bc and [hl] @@ -845,12 +845,12 @@ Audio2_21d79: ; 21d79 (8:5d79) ld d, a .skip ld a, d - ld [$ff25], a + ld [rNR51], a ret Audio2_21daa: ; 21daa (8:5daa) ld b, $0 - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld d, [hl] ld a, c @@ -861,7 +861,7 @@ Audio2_21daa: ; 21daa (8:5daa) ld a, d and $3f ld d, a - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld a, [hl] or d @@ -881,10 +881,10 @@ Audio2_21dcc: ; 21dcc (8:5dcc) ; fall through .channel3 push de - ld de, wc0e6 + ld de, wMusicWaveInstrument cp CH2 jr z, .musicChannel3 - ld de, wc0e7 + ld de, wSfxWaveInstrument .musicChannel3 ld a, [de] add a @@ -898,7 +898,7 @@ Audio2_21dcc: ; 21dcc (8:5dcc) ld hl, $ff30 ld b, $f ld a, $0 - ld [$ff1a], a + ld [rNR30], a .loop ld a, [de] inc de @@ -908,7 +908,7 @@ Audio2_21dcc: ; 21dcc (8:5dcc) and a jr nz, .loop ld a, $80 - ld [$ff1a], a + ld [rNR30], a pop de .notSfxChannel3 ld a, d @@ -935,9 +935,9 @@ Audio2_21e19: ; 21e19 (8:5e19) bit 7, a jr z, .asm_21e2e xor a - ld [wc0f1], a + ld [wFrequencyModifier], a ld a, $80 - ld [wc0f2], a + ld [wTempoModifier], a .asm_21e2e ret @@ -948,20 +948,20 @@ Audio2_21e2f: ; 21e2f (8:5e2f) jr nc, .asm_21e4c .asm_21e39 ld d, $0 - ld a, [wc0f2] + ld a, [wTempoModifier] add $80 jr nc, .asm_21e43 inc d .asm_21e43 - ld [wc0eb], a + ld [wSfxTempo + 1], a ld a, d - ld [wc0ea], a + ld [wSfxTempo], a jr .asm_21e55 .asm_21e4c xor a - ld [wc0eb], a + ld [wSfxTempo + 1], a ld a, $1 - ld [wc0ea], a + ld [wSfxTempo], a .asm_21e55 ret @@ -971,7 +971,7 @@ Audio2_21e56: ; 21e56 (8:5e56) call Audio2_21e9f jr nc, .asm_21e6c .asm_21e60 - ld a, [wc0f1] + ld a, [wFrequencyModifier] add e jr nc, .asm_21e67 inc d @@ -987,7 +987,7 @@ Audio2_21e56: ; 21e56 (8:5e56) Audio2_21e6d: ; 21e6d (8:5e6d) call Audio2_21e8b jr nc, .asm_21e88 - ld hl, wc006 + ld hl, wChannelCommandPointers ld e, c ld d, $0 sla e @@ -1008,7 +1008,7 @@ Audio2_21e6d: ; 21e6d (8:5e6d) ret Audio2_21e8b: ; 21e8b (8:5e8b) - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $14 jr nc, .asm_21e94 jr .asm_21e9a @@ -1025,9 +1025,9 @@ Audio2_21e8b: ; 21e8b (8:5e8b) ret Audio2_21e9f: ; 21e9f (8:5e9f) - ld a, [wc02d] + ld a, [wChannelSoundIDs + CH7] ld b, a - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] or b cp $9d jr nc, .asm_21ead @@ -1045,27 +1045,27 @@ Audio2_21e9f: ; 21e9f (8:5e9f) ret Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8) - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 5, [hl] jp nz, .asm_21eff - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, bc push hl - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld a, [hl] pop hl @@ -1077,26 +1077,26 @@ Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8) ld a, $0 adc d ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, [hl] cp d jp c, .asm_21f45 jr nz, .asm_21f32 - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, [hl] cp e jp c, .asm_21f45 jr .asm_21f32 .asm_21eff - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld a, [hl] - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld e, [hl] sub e @@ -1104,7 +1104,7 @@ Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8) ld a, d sbc b ld d, a - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld a, [hl] add a @@ -1115,22 +1115,22 @@ Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8) ld a, d sbc b ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, d cp [hl] jr c, .asm_21f45 jr nz, .asm_21f32 - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, e cp [hl] jr c, .asm_21f45 .asm_21f32 - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d ld b, $3 @@ -1140,54 +1140,54 @@ Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8) ld [hl], d ret .asm_21f45 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc res 4, [hl] res 5, [hl] ret Audio2_21f4e: ; 21f4e (8:5f4e) - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld a, [hl] - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, bc sub [hl] jr nc, .asm_21f66 ld a, $1 .asm_21f66 ld [hl], a - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc sub [hl] jr c, .asm_21f82 ld d, a ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 5, [hl] jr .asm_21fa5 .asm_21f82 - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, [hl] sub e @@ -1195,17 +1195,17 @@ Audio2_21f4e: ; 21f4e (8:5f4e) ld a, d sbc b ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, [hl] sub d ld d, a ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc res 5, [hl] .asm_21fa5 - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, bc .asm_21fa9 inc b @@ -1224,20 +1224,20 @@ Audio2_21f4e: ; 21f4e (8:5f4e) add [hl] ld d, b ld b, $0 - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld [hl], d - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld [hl], a - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, bc ld [hl], a ret Audio2_ApplyDutyCycle: ; 21fcc (8:5fcc) ld b, $0 - ld hl, wc046 + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] rlca @@ -1258,7 +1258,7 @@ Audio2_GetNextMusicByte: ; 21fe4 (8:5fe4) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de ld a, [hli] ld e, a @@ -1325,8 +1325,8 @@ Audio2_22017: ; 22017 (8:6017) ld d, a ret -Audio2_22035:: ; 22035 (8:6035) - ld [wc001], a +Audio2_PlaySound:: ; 22035 (8:6035) + ld [wSoundID], a cp $ff jp z, Audio2_221f3 cp $e9 @@ -1337,75 +1337,75 @@ Audio2_22035:: ; 22035 (8:6035) jp nc, Audio2_2210d .asm_2204c xor a - ld [wc000], a - ld [wc003], a - ld [wc0e9], a - ld [wc0e6], a - ld [wc0e7], a + ld [wUnusedC000], a + ld [wDisableChannelOutputWhenSfxEnds], a + ld [wMusicTempo + 1], a + ld [wMusicWaveInstrument], a + ld [wSfxWaveInstrument], a ld d, $8 - ld hl, wc016 + ld hl, wChannelReturnAddresses call FillAudioRAM2 - ld hl, wc006 + ld hl, wChannelCommandPointers call FillAudioRAM2 ld d, $4 - ld hl, wc026 + ld hl, wChannelSoundIDs call FillAudioRAM2 - ld hl, wc02e + ld hl, wChannelFlags1 call FillAudioRAM2 - ld hl, wc03e + ld hl, wChannelDuties call FillAudioRAM2 - ld hl, wc046 + ld hl, wChannelDutyCycles call FillAudioRAM2 - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters call FillAudioRAM2 - ld hl, wc056 + ld hl, wChannelVibratoExtents call FillAudioRAM2 - ld hl, wc05e + ld hl, wChannelVibratoRates call FillAudioRAM2 - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes call FillAudioRAM2 - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues call FillAudioRAM2 - ld hl, wc036 + ld hl, wChannelFlags2 call FillAudioRAM2 - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers call FillAudioRAM2 - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps call FillAudioRAM2 - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart call FillAudioRAM2 - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart call FillAudioRAM2 - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes call FillAudioRAM2 - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes call FillAudioRAM2 - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes call FillAudioRAM2 - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes call FillAudioRAM2 ld a, $1 - ld hl, wc0be + ld hl, wChannelLoopCounters call FillAudioRAM2 - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters call FillAudioRAM2 - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds call FillAudioRAM2 - ld [wc0e8], a + ld [wMusicTempo], a ld a, $ff - ld [wc004], a + ld [wStereoPanning], a xor a - ld [$ff24], a + ld [rNR50], a ld a, $8 - ld [$ff10], a + ld [rNR10], a ld a, $0 - ld [$ff25], a + ld [rNR51], a xor a - ld [$ff1a], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a ld a, $77 - ld [$ff24], a + ld [rNR50], a jp Audio2_2224e Audio2_2210d: ; 2210d (8:610d) @@ -1418,9 +1418,9 @@ Audio2_2210d: ; 2210d (8:610d) ld de, SFX_Headers_2 add hl, de ld a, h - ld [wc0ec], a + ld [wSfxHeaderPointer], a ld a, l - ld [wc0ed], a + ld [wSfxHeaderPointer + 1], a ld a, [hl] and $c0 rlca @@ -1433,9 +1433,9 @@ Audio2_2210d: ; 2210d (8:610d) add c ld c, a ld b, $0 - ld a, [wc0ec] + ld a, [wSfxHeaderPointer] ld h, a - ld a, [wc0ed] + ld a, [wSfxHeaderPointer + 1] ld l, a add hl, bc ld c, d @@ -1443,7 +1443,7 @@ Audio2_2210d: ; 2210d (8:610d) and $f ld e, a ld d, $0 - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, de ld a, [hl] and a @@ -1451,7 +1451,7 @@ Audio2_2210d: ; 2210d (8:610d) ld a, e cp $7 jr nz, .asm_22159 - ld a, [wc001] + ld a, [wSoundID] cp $14 jr nc, .asm_22152 ret @@ -1461,7 +1461,7 @@ Audio2_2210d: ; 2210d (8:610d) jr z, .asm_22162 jr c, .asm_22162 .asm_22159 - ld a, [wc001] + ld a, [wSoundID] cp [hl] jr z, .asm_22162 jr c, .asm_22162 @@ -1474,84 +1474,84 @@ Audio2_2210d: ; 2210d (8:610d) add hl, hl ld d, h ld e, l - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld [hli], a ld [hl], a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de ld [hli], a ld [hl], a pop de - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, de ld [hl], a - ld hl, wc02e + ld hl, wChannelFlags1 add hl, de ld [hl], a - ld hl, wc03e + ld hl, wChannelDuties add hl, de ld [hl], a - ld hl, wc046 + ld hl, wChannelDutyCycles add hl, de ld [hl], a - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, de ld [hl], a - ld hl, wc056 + ld hl, wChannelVibratoExtents add hl, de ld [hl], a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, de ld [hl], a - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, de ld [hl], a - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, de ld [hl], a - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, de ld [hl], a - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, de ld [hl], a - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, de ld [hl], a - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, de ld [hl], a - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, de ld [hl], a - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc036 + ld hl, wChannelFlags2 add hl, de ld [hl], a ld a, $1 - ld hl, wc0be + ld hl, wChannelLoopCounters add hl, de ld [hl], a - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, de ld [hl], a - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, de ld [hl], a ld a, e cp $4 jr nz, .asm_221ea ld a, $8 - ld [$ff10], a + ld [rNR10], a .asm_221ea ld a, c and a @@ -1561,41 +1561,41 @@ Audio2_2210d: ; 2210d (8:610d) Audio2_221f3: ; 221f3 (8:61f3) ld a, $80 - ld [$ff26], a - ld [$ff1a], a + ld [rNR52], a + ld [rNR30], a xor a - ld [$ff25], a - ld [$ff1c], a + ld [rNR51], a + ld [rNR32], a ld a, $8 - ld [$ff10], a - ld [$ff12], a - ld [$ff17], a - ld [$ff21], a + ld [rNR10], a + ld [rNR12], a + ld [rNR22], a + ld [rNR42], a ld a, $40 - ld [$ff14], a - ld [$ff19], a - ld [$ff23], a + ld [rNR14], a + ld [rNR24], a + ld [rNR44], a ld a, $77 - ld [$ff24], a + ld [rNR50], a xor a - ld [wc000], a - ld [wc003], a - ld [wc002], a - ld [wc0e9], a - ld [wc0eb], a - ld [wc0e6], a - ld [wc0e7], a + ld [wUnusedC000], a + ld [wDisableChannelOutputWhenSfxEnds], a + ld [wMuteAudioAndPauseMusic], a + ld [wMusicTempo + 1], a + ld [wSfxTempo + 1], a + ld [wMusicWaveInstrument], a + ld [wSfxWaveInstrument], a ld d, $a0 - ld hl, wc006 + ld hl, wChannelCommandPointers call FillAudioRAM2 ld a, $1 ld d, $18 - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters call FillAudioRAM2 - ld [wc0e8], a - ld [wc0ea], a + ld [wMusicTempo], a + ld [wSfxTempo], a ld a, $ff - ld [wc004], a + ld [wStereoPanning], a ret ; fills d bytes at hl with a @@ -1608,7 +1608,7 @@ FillAudioRAM2: ; 22248 (8:6248) ret Audio2_2224e: ; 2224e (8:624e) - ld a, [wc001] + ld a, [wSoundID] ld l, a ld e, a ld h, $0 @@ -1619,7 +1619,7 @@ Audio2_2224e: ; 2224e (8:624e) add hl, de ld e, l ld d, h - ld hl, wc006 + ld hl, wChannelCommandPointers ld a, [de] ; get channel number ld b, a rlca @@ -1645,14 +1645,14 @@ Audio2_2224e: ; 2224e (8:624e) push af ld b, $0 ld c, a - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, bc - ld a, [wc001] + ld a, [wSoundID] ld [hl], a pop af cp $3 jr c, .asm_22291 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 2, [hl] .asm_22291 @@ -1671,34 +1671,34 @@ Audio2_2224e: ; 2224e (8:624e) ld a, [de] inc de jr nz, .asm_22270 - ld a, [wc001] + ld a, [wSoundID] cp $14 jr nc, .asm_222aa jr .asm_222d4 .asm_222aa - ld a, [wc001] + ld a, [wSoundID] cp $86 jr z, .asm_222d4 jr c, .asm_222b5 jr .asm_222d4 .asm_222b5 - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wc012 ; sfx noise channel pointer + ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer ld de, Noise2_endchannel ld [hl], e inc hl ld [hl], d ; overwrite pointer to point to endchannel - ld a, [wc005] + ld a, [wSavedVolume] and a jr nz, .asm_222d4 - ld a, [$ff24] - ld [wc005], a + ld a, [rNR50] + ld [wSavedVolume], a ld a, $77 - ld [$ff24], a + ld [rNR50], a .asm_222d4 ret diff --git a/audio/engine_3.asm b/audio/engine_3.asm index 93fa62aa..c7254405 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -4,7 +4,7 @@ Audio3_UpdateMusic:: ; 7d177 (1f:5177) ld c, CH0 .loop ld b, $0 - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, bc ld a, [hl] and a @@ -12,18 +12,18 @@ Audio3_UpdateMusic:: ; 7d177 (1f:5177) ld a, c cp CH4 jr nc, .applyAffects ; if sfx channel - ld a, [wc002] + ld a, [wMuteAudioAndPauseMusic] and a jr z, .applyAffects bit 7, a jr nz, .nextChannel set 7, a - ld [wc002], a + ld [wMuteAudioAndPauseMusic], a xor a - ld [$ff25], a - ld [$ff1a], a + ld [rNR51], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a jr .nextChannel .applyAffects call Audio3_ApplyMusicAffects @@ -36,7 +36,7 @@ Audio3_UpdateMusic:: ; 7d177 (1f:5177) ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -; known flags for wc02e: +; known flags for wChannelFlags1: ; 0: toggleperfectpitch has been used ; 1: call has been used ; 3: a toggle used only by this routine for vibrato @@ -44,7 +44,7 @@ Audio3_UpdateMusic:: ; 7d177 (1f:5177) ; 6: dutycycle flag Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) ld b, $0 - ld hl, wc0b6 ; delay until next note + ld hl, wChannelNoteDelayCounters ; delay until next note add hl, bc ld a, [hl] cp $1 ; if delay is 1, play next note @@ -54,36 +54,36 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) ld a, c cp CH4 jr nc, .startChecks ; if a sfx channel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a jr z, .startChecks ret .startChecks - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 6, [hl] ; dutycycle jr z, .checkForExecuteMusic call Audio3_ApplyDutyCycle .checkForExecuteMusic ld b, $0 - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, .checkForPitchBend - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 2, [hl] jr nz, .disablePitchBendVibrato .checkForPitchBend - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 4, [hl] ; pitchbend jr z, .checkVibratoDelay jp Audio3_ApplyPitchBend .checkVibratoDelay - ld hl, wc04e ; vibrato delay + ld hl, wChannelVibratoDelayCounters ; vibrato delay add hl, bc ld a, [hl] and a ; check if delay is over @@ -92,7 +92,7 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) .disablePitchBendVibrato ret .checkForVibrato - ld hl, wc056 ; vibrato rate + ld hl, wChannelVibratoExtents ; vibrato rate add hl, bc ld a, [hl] and a @@ -100,7 +100,7 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) ret ; no vibrato .vibrato ld d, a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, bc ld a, [hl] and $f @@ -113,10 +113,10 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) swap [hl] or [hl] ld [hl], a ; reset the vibrato value and start again - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes add hl, bc ld e, [hl] ; get note pitch - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 3, [hl] ; this is the only code that sets/resets bit three so jr z, .unset ; it continuously alternates which path it takes @@ -149,13 +149,13 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac) ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached Audio3_PlayNextNote: ; 7d244 (1f:5244) - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld a, [hl] - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc res 4, [hl] res 5, [hl] @@ -168,7 +168,7 @@ Audio3_endchannel: ; 7d25a (1f:525a) cp $ff ; is this command an endchannel? jp nz, Audio3_callchannel ; no ld b, $0 ; yes - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 1, [hl] jr nz, .returnFromCall @@ -178,22 +178,22 @@ Audio3_endchannel: ; 7d25a (1f:525a) jr .asm_7d2b3 .noiseOrSfxChannel res 2, [hl] - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc res 0, [hl] cp CH6 jr nz, .notSfxChannel3 ld a, $0 - ld [$ff1a], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a .notSfxChannel3 jr nz, .asm_7d296 - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr z, .asm_7d296 xor a - ld [wc003], a + ld [wDisableChannelOutputWhenSfxEnds], a jr .asm_7d2b3 .asm_7d296 jr .asm_7d2bc @@ -203,10 +203,10 @@ Audio3_endchannel: ; 7d25a (1f:525a) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de push hl ; store current channel address - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld e, l ld d, h @@ -220,16 +220,16 @@ Audio3_endchannel: ; 7d25a (1f:525a) .asm_7d2b3 ld hl, Unknown_7db93 add hl, bc - ld a, [$ff25] + ld a, [rNR51] and [hl] - ld [$ff25], a + ld [rNR51], a .asm_7d2bc - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $14 jr nc, .asm_7d2c5 jr .asm_7d2e2 .asm_7d2c5 - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $86 jr z, .asm_7d2e2 jr c, .asm_7d2d0 @@ -241,12 +241,12 @@ Audio3_endchannel: ; 7d25a (1f:525a) call Audio3_7d73b ret c .asm_7d2d9 - ld a, [wc005] - ld [$ff24], a + ld a, [wSavedVolume] + ld [rNR50], a xor a - ld [wc005], a + ld [wSavedVolume], a .asm_7d2e2 - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, bc ld [hl], b ret @@ -265,10 +265,10 @@ Audio3_callchannel: ; 7d2e8 (1f:52e8) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de push hl - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld e, l ld d, h @@ -283,7 +283,7 @@ Audio3_callchannel: ; 7d2e8 (1f:52e8) inc hl ld [hl], d ; overwrite current address with pointer ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 1, [hl] ; set the call flag jp Audio3_endchannel @@ -296,7 +296,7 @@ Audio3_loopchannel: ; 7d31d (1f:531d) and a jr z, .infiniteLoop ld b, $0 - ld hl, wc0be + ld hl, wChannelLoopCounters add hl, bc ld a, [hl] cp e @@ -319,7 +319,7 @@ Audio3_loopchannel: ; 7d31d (1f:531d) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de pop af ld [hli], a @@ -333,7 +333,7 @@ Audio3_notetype: ; 7d358 (1f:5358) ld a, d ; yes and $f ld b, $0 - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, bc ld [hl], a ; store low nibble as speed ld a, c @@ -346,10 +346,10 @@ Audio3_notetype: ; 7d358 (1f:5358) jr z, .musicChannel3 cp CH6 jr nz, .notChannel3 - ld hl, wc0e7 + ld hl, wSfxWaveInstrument jr .sfxChannel3 .musicChannel3 - ld hl, wc0e6 + ld hl, wMusicWaveInstrument .sfxChannel3 ld a, d and $f @@ -364,7 +364,7 @@ Audio3_notetype: ; 7d358 (1f:5358) ; else, store volume (high nibble) and fade (low nibble) .notChannel3 ld b, $0 - ld hl, wc0de + ld hl, wChannelVolumes add hl, bc ld [hl], d .noiseChannel @@ -375,11 +375,11 @@ Audio3_toggleperfectpitch: ; 7d397 (1f:5397) cp $e8 ; is this command a toggleperfectpitch? jr nz, Audio3_vibrato ; no ld b, $0 ; yes - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc ld a, [hl] xor $1 - ld [hl], a ; flip bit 0 of wc02e + ld [hl], a ; flip bit 0 of wChannelFlags1 jp Audio3_endchannel Audio3_vibrato: ; 7d3a9 (1f:53a9) @@ -387,10 +387,10 @@ Audio3_vibrato: ; 7d3a9 (1f:53a9) jr nz, Audio3_pitchbend ; no call Audio3_GetNextMusicByte ; yes ld b, $0 - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a ; store delay - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld [hl], a ; store delay call Audio3_GetNextMusicByte @@ -398,7 +398,7 @@ Audio3_vibrato: ; 7d3a9 (1f:53a9) and $f0 swap a ld b, $0 - ld hl, wc056 + ld hl, wChannelVibratoExtents add hl, bc srl a ld e, a @@ -409,7 +409,7 @@ Audio3_vibrato: ; 7d3a9 (1f:53a9) ld a, d and $f ld d, a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, bc swap a or d @@ -421,7 +421,7 @@ Audio3_pitchbend: ; 7d3e1 (1f:53e1) jr nz, Audio3_duty ; no call Audio3_GetNextMusicByte ; yes ld b, $0 - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, bc ld [hl], a ; store first param call Audio3_GetNextMusicByte @@ -433,14 +433,14 @@ Audio3_pitchbend: ; 7d3e1 (1f:53e1) and $f call Audio3_7d8cc ld b, $0 - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld [hl], d ; store unknown part of second param - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld [hl], e ; store unknown part of second param ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 4, [hl] ; set pitchbend flag call Audio3_GetNextMusicByte @@ -455,7 +455,7 @@ Audio3_duty: ; 7d419 (1f:5419) rrca and $c0 ld b, $0 - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld [hl], a ; store duty jp Audio3_endchannel @@ -467,25 +467,25 @@ Audio3_tempo: ; 7d42e (1f:542e) cp CH4 jr nc, .sfxChannel call Audio3_GetNextMusicByte - ld [wc0e8], a ; store first param + ld [wMusicTempo], a ; store first param call Audio3_GetNextMusicByte - ld [wc0e9], a ; store second param + ld [wMusicTempo + 1], a ; store second param xor a - ld [wc0ce], a ; clear RAM - ld [wc0cf], a - ld [wc0d0], a - ld [wc0d1], a + ld [wChannelNoteDelayCountersFractionalPart], a ; clear RAM + ld [wChannelNoteDelayCountersFractionalPart + 1], a + ld [wChannelNoteDelayCountersFractionalPart + 2], a + ld [wChannelNoteDelayCountersFractionalPart + 3], a jr .musicChannelDone .sfxChannel call Audio3_GetNextMusicByte - ld [wc0ea], a ; store first param + ld [wSfxTempo], a ; store first param call Audio3_GetNextMusicByte - ld [wc0eb], a ; store second param + ld [wSfxTempo + 1], a ; store second param xor a - ld [wc0d2], a ; clear RAM - ld [wc0d3], a - ld [wc0d4], a - ld [wc0d5], a + ld [wChannelNoteDelayCountersFractionalPart + 4], a ; clear RAM + ld [wChannelNoteDelayCountersFractionalPart + 5], a + ld [wChannelNoteDelayCountersFractionalPart + 6], a + ld [wChannelNoteDelayCountersFractionalPart + 7], a .musicChannelDone jp Audio3_endchannel @@ -493,7 +493,7 @@ Audio3_stereopanning: ; 7d46e (1f:546e) cp $ee ; is this command a stereopanning? jr nz, Audio3_unknownmusic0xef ; no call Audio3_GetNextMusicByte ; yes - ld [wc004], a ; store panning + ld [wStereoPanning], a ; store panning jp Audio3_endchannel ; this appears to never be used @@ -502,15 +502,15 @@ Audio3_unknownmusic0xef: ; 7d47b (1f:547b) jr nz, Audio3_dutycycle ; no call Audio3_GetNextMusicByte ; yes push bc - call Audio3_7d8ea + call Audio3_PlaySound pop bc - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wc02d] - ld [wc003], a + ld a, [wChannelSoundIDs + CH7] + ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wc02d], a + ld [wChannelSoundIDs + CH7], a .skip jp Audio3_endchannel @@ -519,14 +519,14 @@ Audio3_dutycycle: ; 7d49a (1f:549a) jr nz, Audio3_volume ; no call Audio3_GetNextMusicByte ; yes ld b, $0 - ld hl, wc046 + ld hl, wChannelDutyCycles add hl, bc ld [hl], a ; store full cycle and $c0 - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld [hl], a ; store first duty - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 6, [hl] ; set duty flag jp Audio3_endchannel @@ -535,14 +535,14 @@ Audio3_volume: ; 7d4b8 (1f:54b8) cp $f0 ; is this command a volume? jr nz, Audio3_executemusic ; no call Audio3_GetNextMusicByte ; yes - ld [$ff24], a ; store volume + ld [rNR50], a ; store volume jp Audio3_endchannel Audio3_executemusic: ; 7d4c4 (1f:54c4) cp $f8 ; is this command an executemusic? jr nz, Audio3_octave ; no ld b, $0 ; yes - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc set 0, [hl] jp Audio3_endchannel @@ -551,7 +551,7 @@ Audio3_octave: ; 7d4d3 (1f:54d3) and $f0 cp $e0 ; is this command an octave? jr nz, Audio3_unknownsfx0x20 ; no - ld hl, wc0d6 ; yes + ld hl, wChannelOctaves ; yes ld b, $0 add hl, bc ld a, d @@ -566,14 +566,14 @@ Audio3_unknownsfx0x20: ; 7d4e6 (1f:54e6) cp CH3 ; is this a noise or sfx channel? jr c, Audio3_unknownsfx0x10 ; no ld b, $0 - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, Audio3_unknownsfx0x10 ; no call Audio3_notelength ; yes ld d, a ld b, $0 - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld a, [hl] or d @@ -612,12 +612,12 @@ Audio3_unknownsfx0x10: ; 7d533 (1f:5533) cp $10 ; is this command an unknownsfx0x10? jr nz, Audio3_note ; no ld b, $0 - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, Audio3_note ; no call Audio3_GetNextMusicByte ; yes - ld [$ff10], a + ld [rNR10], a jp Audio3_endchannel Audio3_note: ; 7d54f (1f:554f) @@ -647,11 +647,11 @@ Audio3_dnote: ; 7d569 (1f:5569) call Audio3_GetNextMusicByte ; get dnote instrument asm_7d571 ld d, a - ld a, [wc003] + ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .asm_7d57c ld a, d - call Audio3_7d8ea + call Audio3_PlaySound .asm_7d57c pop bc pop de @@ -664,7 +664,7 @@ Audio3_notelength: ; 7d57e (1f:557e) ld b, $0 ld e, a ; store note length (in 16ths) ld d, b - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, bc ld a, [hl] ld l, b @@ -672,9 +672,9 @@ Audio3_notelength: ; 7d57e (1f:557e) ld a, c cp CH4 jr nc, .sfxChannel - ld a, [wc0e8] + ld a, [wMusicTempo] ld d, a - ld a, [wc0e9] + ld a, [wMusicTempo + 1] ld e, a jr .skip .sfxChannel @@ -683,31 +683,31 @@ Audio3_notelength: ; 7d57e (1f:557e) cp CH7 jr z, .skip ; if noise channel call Audio3_7d707 - ld a, [wc0ea] + ld a, [wSfxTempo] ld d, a - ld a, [wc0eb] + ld a, [wSfxTempo + 1] ld e, a .skip ld a, l ld b, $0 - ld hl, wc0ce + ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld l, [hl] call Audio3_7d8bb ld e, l ld d, h - ld hl, wc0ce + ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld [hl], e ld a, d - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld [hl], a - ld hl, wc036 + ld hl, wChannelFlags2 add hl, bc bit 0, [hl] jr nz, Audio3_notepitch - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 2, [hl] jr z, Audio3_notepitch @@ -722,7 +722,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) ld a, c cp CH4 jr nc, .sfxChannel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a @@ -738,9 +738,9 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) ld b, $0 ld hl, Unknown_7db93 add hl, bc - ld a, [$ff25] + ld a, [rNR51] and [hl] - ld [$ff25], a + ld [rNR51], a jr .quit .notSfxChannel3 ld b, $2 @@ -755,12 +755,12 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) .notRest swap a ld b, $0 - ld hl, wc0d6 + ld hl, wChannelOctaves add hl, bc ld b, [hl] call Audio3_7d8cc ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 4, [hl] jr z, .asm_7d62c @@ -770,7 +770,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) ld a, c cp CH4 jr nc, .skip ; if sfx Channel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 ld d, $0 ld e, a add hl, de @@ -783,7 +783,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) ret .skip ld b, $0 - ld hl, wc0de + ld hl, wChannelVolumes add hl, bc ld d, [hl] ld b, $2 @@ -793,7 +793,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) call Audio3_7d66c pop de ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 0, [hl] ; has toggleperfectpitch been used? jr z, .skip2 @@ -801,7 +801,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc) jr nc, .skip2 inc d .skip2 - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes add hl, bc ld [hl], e call Audio3_7d6bf @@ -811,7 +811,7 @@ Audio3_7d66c: ; 7d66c (1f:566c) ld b, $0 ld hl, Unknown_7db9b add hl, bc - ld a, [$ff25] + ld a, [rNR51] or [hl] ld d, a ld a, c @@ -819,18 +819,18 @@ Audio3_7d66c: ; 7d66c (1f:566c) jr z, .sfxNoiseChannel cp CH4 jr nc, .skip ; if sfx channel - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 add hl, bc ld a, [hl] and a jr nz, .skip .sfxNoiseChannel - ld a, [wc004] + ld a, [wStereoPanning] ld hl, Unknown_7db9b add hl, bc and [hl] ld d, a - ld a, [$ff25] + ld a, [rNR51] ld hl, Unknown_7db93 add hl, bc and [hl] @@ -838,12 +838,12 @@ Audio3_7d66c: ; 7d66c (1f:566c) ld d, a .skip ld a, d - ld [$ff25], a + ld [rNR51], a ret Audio3_7d69d: ; 7d69d (1f:569d) ld b, $0 - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld d, [hl] ld a, c @@ -854,7 +854,7 @@ Audio3_7d69d: ; 7d69d (1f:569d) ld a, d and $3f ld d, a - ld hl, wc03e + ld hl, wChannelDuties add hl, bc ld a, [hl] or d @@ -874,10 +874,10 @@ Audio3_7d6bf: ; 7d6bf (1f:56bf) ; fall through .channel3 push de - ld de, wc0e6 + ld de, wMusicWaveInstrument cp CH2 jr z, .musicChannel3 - ld de, wc0e7 + ld de, wSfxWaveInstrument .musicChannel3 ld a, [de] add a @@ -891,7 +891,7 @@ Audio3_7d6bf: ; 7d6bf (1f:56bf) ld hl, $ff30 ld b, $f ld a, $0 - ld [$ff1a], a + ld [rNR30], a .loop ld a, [de] inc de @@ -901,7 +901,7 @@ Audio3_7d6bf: ; 7d6bf (1f:56bf) and a jr nz, .loop ld a, $80 - ld [$ff1a], a + ld [rNR30], a pop de .notSfxChannel3 ld a, d @@ -920,27 +920,27 @@ Audio3_7d707: ; 7d707 (1f:5707) call Audio3_7d759 jr nc, .asm_7d71f ld d, $0 - ld a, [wc0f2] + ld a, [wTempoModifier] add $80 jr nc, .asm_7d716 inc d .asm_7d716 - ld [wc0eb], a + ld [wSfxTempo + 1], a ld a, d - ld [wc0ea], a + ld [wSfxTempo], a jr .asm_7d728 .asm_7d71f xor a - ld [wc0eb], a + ld [wSfxTempo + 1], a ld a, $1 - ld [wc0ea], a + ld [wSfxTempo], a .asm_7d728 ret Audio3_7d729: ; 7d729 (1f:5729) call Audio3_7d759 jr nc, .asm_7d73a - ld a, [wc0f1] + ld a, [wFrequencyModifier] add e jr nc, .asm_7d735 inc d @@ -956,7 +956,7 @@ Audio3_7d729: ; 7d729 (1f:5729) Audio3_7d73b: ; 7d73b (1f:573b) call Audio3_7d759 jr nc, .asm_7d756 - ld hl, wc006 + ld hl, wChannelCommandPointers ld e, c ld d, $0 sla e @@ -977,7 +977,7 @@ Audio3_7d73b: ; 7d73b (1f:573b) ret Audio3_7d759: ; 7d759 (1f:5759) - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $14 jr nc, .asm_7d762 jr .asm_7d768 @@ -994,27 +994,27 @@ Audio3_7d759: ; 7d759 (1f:5759) ret Audio3_ApplyPitchBend: ; 7d76d (1f:576d) - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc bit 5, [hl] jp nz, .asm_7d7b4 - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, bc push hl - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld a, [hl] pop hl @@ -1026,26 +1026,26 @@ Audio3_ApplyPitchBend: ; 7d76d (1f:576d) ld a, $0 adc d ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, [hl] cp d jp c, .asm_7d7fa jr nz, .asm_7d7e7 - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, [hl] cp e jp c, .asm_7d7fa jr .asm_7d7e7 .asm_7d7b4 - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld a, [hl] - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld e, [hl] sub e @@ -1053,7 +1053,7 @@ Audio3_ApplyPitchBend: ; 7d76d (1f:576d) ld a, d sbc b ld d, a - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld a, [hl] add a @@ -1064,22 +1064,22 @@ Audio3_ApplyPitchBend: ; 7d76d (1f:576d) ld a, d sbc b ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, d cp [hl] jr c, .asm_7d7fa jr nz, .asm_7d7e7 - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, e cp [hl] jr c, .asm_7d7fa .asm_7d7e7 - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d ld b, $3 @@ -1089,54 +1089,54 @@ Audio3_ApplyPitchBend: ; 7d76d (1f:576d) ld [hl], d ret .asm_7d7fa - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc res 4, [hl] res 5, [hl] ret Audio3_7d803: ; 7d803 (1f:5803) - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, bc ld a, [hl] - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, bc sub [hl] jr nc, .asm_7d81b ld a, $1 .asm_7d81b ld [hl], a - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc sub [hl] jr c, .asm_7d837 ld d, a ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 5, [hl] jr .asm_7d85a .asm_7d837 - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, bc ld a, [hl] sub e @@ -1144,17 +1144,17 @@ Audio3_7d803: ; 7d803 (1f:5803) ld a, d sbc b ld d, a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, bc ld a, [hl] sub d ld d, a ld b, $0 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc res 5, [hl] .asm_7d85a - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, bc .asm_7d85e inc b @@ -1173,20 +1173,20 @@ Audio3_7d803: ; 7d803 (1f:5803) add [hl] ld d, b ld b, $0 - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, bc ld [hl], d - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, bc ld [hl], a - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, bc ld [hl], a ret Audio3_ApplyDutyCycle: ; 7d881 (1f:5881) ld b, $0 - ld hl, wc046 + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] rlca @@ -1207,7 +1207,7 @@ Audio3_GetNextMusicByte: ; 7d899 (1f:5899) ld a, c add a ld e, a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de ld a, [hli] ld e, a @@ -1274,8 +1274,8 @@ Audio3_7d8cc: ; 7d8cc (1f:58cc) ld d, a ret -Audio3_7d8ea:: ; 7d8ea (1f:58ea) - ld [wc001], a +Audio3_PlaySound:: ; 7d8ea (1f:58ea) + ld [wSoundID], a cp $ff jp z, Audio3_7daa8 cp $c2 @@ -1286,75 +1286,75 @@ Audio3_7d8ea:: ; 7d8ea (1f:58ea) jp nc, Audio3_7d9c2 .asm_7d901 xor a - ld [wc000], a - ld [wc003], a - ld [wc0e9], a - ld [wc0e6], a - ld [wc0e7], a + ld [wUnusedC000], a + ld [wDisableChannelOutputWhenSfxEnds], a + ld [wMusicTempo + 1], a + ld [wMusicWaveInstrument], a + ld [wSfxWaveInstrument], a ld d, $8 - ld hl, wc016 + ld hl, wChannelReturnAddresses call FillAudioRAM3 - ld hl, wc006 + ld hl, wChannelCommandPointers call FillAudioRAM3 ld d, $4 - ld hl, wc026 + ld hl, wChannelSoundIDs call FillAudioRAM3 - ld hl, wc02e + ld hl, wChannelFlags1 call FillAudioRAM3 - ld hl, wc03e + ld hl, wChannelDuties call FillAudioRAM3 - ld hl, wc046 + ld hl, wChannelDutyCycles call FillAudioRAM3 - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters call FillAudioRAM3 - ld hl, wc056 + ld hl, wChannelVibratoExtents call FillAudioRAM3 - ld hl, wc05e + ld hl, wChannelVibratoRates call FillAudioRAM3 - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes call FillAudioRAM3 - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues call FillAudioRAM3 - ld hl, wc036 + ld hl, wChannelFlags2 call FillAudioRAM3 - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers call FillAudioRAM3 - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps call FillAudioRAM3 - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart call FillAudioRAM3 - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart call FillAudioRAM3 - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes call FillAudioRAM3 - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes call FillAudioRAM3 - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes call FillAudioRAM3 - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes call FillAudioRAM3 ld a, $1 - ld hl, wc0be + ld hl, wChannelLoopCounters call FillAudioRAM3 - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters call FillAudioRAM3 - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds call FillAudioRAM3 - ld [wc0e8], a + ld [wMusicTempo], a ld a, $ff - ld [wc004], a + ld [wStereoPanning], a xor a - ld [$ff24], a + ld [rNR50], a ld a, $8 - ld [$ff10], a + ld [rNR10], a ld a, $0 - ld [$ff25], a + ld [rNR51], a xor a - ld [$ff1a], a + ld [rNR30], a ld a, $80 - ld [$ff1a], a + ld [rNR30], a ld a, $77 - ld [$ff24], a + ld [rNR50], a jp Audio3_7db03 Audio3_7d9c2: ; 7d9c2 (1f:59c2) @@ -1367,9 +1367,9 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) ld de, SFX_Headers_3 add hl, de ld a, h - ld [wc0ec], a + ld [wSfxHeaderPointer], a ld a, l - ld [wc0ed], a + ld [wSfxHeaderPointer + 1], a ld a, [hl] and $c0 rlca @@ -1382,9 +1382,9 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) add c ld c, a ld b, $0 - ld a, [wc0ec] + ld a, [wSfxHeaderPointer] ld h, a - ld a, [wc0ed] + ld a, [wSfxHeaderPointer + 1] ld l, a add hl, bc ld c, d @@ -1392,7 +1392,7 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) and $f ld e, a ld d, $0 - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, de ld a, [hl] and a @@ -1400,7 +1400,7 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) ld a, e cp $7 jr nz, .asm_7da0e - ld a, [wc001] + ld a, [wSoundID] cp $14 jr nc, .asm_7da07 ret @@ -1410,7 +1410,7 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) jr z, .asm_7da17 jr c, .asm_7da17 .asm_7da0e - ld a, [wc001] + ld a, [wSoundID] cp [hl] jr z, .asm_7da17 jr c, .asm_7da17 @@ -1423,84 +1423,84 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) add hl, hl ld d, h ld e, l - ld hl, wc016 + ld hl, wChannelReturnAddresses add hl, de ld [hli], a ld [hl], a - ld hl, wc006 + ld hl, wChannelCommandPointers add hl, de ld [hli], a ld [hl], a pop de - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, de ld [hl], a - ld hl, wc02e + ld hl, wChannelFlags1 add hl, de ld [hl], a - ld hl, wc03e + ld hl, wChannelDuties add hl, de ld [hl], a - ld hl, wc046 + ld hl, wChannelDutyCycles add hl, de ld [hl], a - ld hl, wc04e + ld hl, wChannelVibratoDelayCounters add hl, de ld [hl], a - ld hl, wc056 + ld hl, wChannelVibratoExtents add hl, de ld [hl], a - ld hl, wc05e + ld hl, wChannelVibratoRates add hl, de ld [hl], a - ld hl, wc066 + ld hl, wChannelFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc06e + ld hl, wChannelVibratoDelayCounterReloadValues add hl, de ld [hl], a - ld hl, wc076 + ld hl, wChannelPitchBendLengthModifiers add hl, de ld [hl], a - ld hl, wc07e + ld hl, wChannelPitchBendFrequencySteps add hl, de ld [hl], a - ld hl, wc086 + ld hl, wChannelPitchBendFrequencyStepsFractionalPart add hl, de ld [hl], a - ld hl, wc08e + ld hl, wChannelPitchBendCurrentFrequencyFractionalPart add hl, de ld [hl], a - ld hl, wc096 + ld hl, wChannelPitchBendCurrentFrequencyHighBytes add hl, de ld [hl], a - ld hl, wc09e + ld hl, wChannelPitchBendCurrentFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc0a6 + ld hl, wChannelPitchBendTargetFrequencyHighBytes add hl, de ld [hl], a - ld hl, wc0ae + ld hl, wChannelPitchBendTargetFrequencyLowBytes add hl, de ld [hl], a - ld hl, wc036 + ld hl, wChannelFlags2 add hl, de ld [hl], a ld a, $1 - ld hl, wc0be + ld hl, wChannelLoopCounters add hl, de ld [hl], a - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters add hl, de ld [hl], a - ld hl, wc0c6 + ld hl, wChannelNoteSpeeds add hl, de ld [hl], a ld a, e cp $4 jr nz, .asm_7da9f ld a, $8 - ld [$ff10], a + ld [rNR10], a .asm_7da9f ld a, c and a @@ -1510,41 +1510,41 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2) Audio3_7daa8: ; 7daa8 (1f:5aa8) ld a, $80 - ld [$ff26], a - ld [$ff1a], a + ld [rNR52], a + ld [rNR30], a xor a - ld [$ff25], a - ld [$ff1c], a + ld [rNR51], a + ld [rNR32], a ld a, $8 - ld [$ff10], a - ld [$ff12], a - ld [$ff17], a - ld [$ff21], a + ld [rNR10], a + ld [rNR12], a + ld [rNR22], a + ld [rNR42], a ld a, $40 - ld [$ff14], a - ld [$ff19], a - ld [$ff23], a + ld [rNR14], a + ld [rNR24], a + ld [rNR44], a ld a, $77 - ld [$ff24], a + ld [rNR50], a xor a - ld [wc000], a - ld [wc003], a - ld [wc002], a - ld [wc0e9], a - ld [wc0eb], a - ld [wc0e6], a - ld [wc0e7], a + ld [wUnusedC000], a + ld [wDisableChannelOutputWhenSfxEnds], a + ld [wMuteAudioAndPauseMusic], a + ld [wMusicTempo + 1], a + ld [wSfxTempo + 1], a + ld [wMusicWaveInstrument], a + ld [wSfxWaveInstrument], a ld d, $a0 - ld hl, wc006 + ld hl, wChannelCommandPointers call FillAudioRAM3 ld a, $1 ld d, $18 - ld hl, wc0b6 + ld hl, wChannelNoteDelayCounters call FillAudioRAM3 - ld [wc0e8], a - ld [wc0ea], a + ld [wMusicTempo], a + ld [wSfxTempo], a ld a, $ff - ld [wc004], a + ld [wStereoPanning], a ret ; fills d bytes at hl with a @@ -1557,7 +1557,7 @@ FillAudioRAM3: ; 7dafd (1f:5afd) ret Audio3_7db03: ; 7db03 (1f:5b03) - ld a, [wc001] + ld a, [wSoundID] ld l, a ld e, a ld h, $0 @@ -1568,7 +1568,7 @@ Audio3_7db03: ; 7db03 (1f:5b03) add hl, de ld e, l ld d, h - ld hl, wc006 + ld hl, wChannelCommandPointers ld a, [de] ; get channel number ld b, a rlca @@ -1594,14 +1594,14 @@ Audio3_7db03: ; 7db03 (1f:5b03) push af ld b, $0 ld c, a - ld hl, wc026 + ld hl, wChannelSoundIDs add hl, bc - ld a, [wc001] + ld a, [wSoundID] ld [hl], a pop af cp $3 jr c, .asm_7db46 - ld hl, wc02e + ld hl, wChannelFlags1 add hl, bc set 2, [hl] .asm_7db46 @@ -1620,34 +1620,34 @@ Audio3_7db03: ; 7db03 (1f:5b03) ld a, [de] inc de jr nz, .asm_7db25 - ld a, [wc001] + ld a, [wSoundID] cp $14 jr nc, .asm_7db5f jr .asm_7db89 .asm_7db5f - ld a, [wc001] + ld a, [wSoundID] cp $86 jr z, .asm_7db89 jr c, .asm_7db6a jr .asm_7db89 .asm_7db6a - ld hl, wc02a + ld hl, wChannelSoundIDs + CH4 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wc012 ; sfx noise channel pointer + ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer ld de, Noise3_endchannel ld [hl], e inc hl ld [hl], d ; overwrite pointer to point to endchannel - ld a, [wc005] + ld a, [wSavedVolume] and a jr nz, .asm_7db89 - ld a, [$ff24] - ld [wc005], a + ld a, [rNR50] + ld [wSavedVolume], a ld a, $77 - ld [$ff24], a + ld [rNR50], a .asm_7db89 ret diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm index f9e3fe19..21a3ad93 100644 --- a/constants/hardware_constants.asm +++ b/constants/hardware_constants.asm @@ -107,4 +107,3 @@ rUNKNOWN5 EQU $ff75 ; (8Fh) - Bit 4-6 (Read/Write) rUNKNOWN6 EQU $ff76 ; (00h) - Always 00h (Read Only) rUNKNOWN7 EQU $ff77 ; (00h) - Always 00h (Read Only) rIE EQU $ffff ; Interrupt Enable (R/W) - diff --git a/constants/music_constants.asm b/constants/music_constants.asm index f239acea..57ad230d 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -1,3 +1,42 @@ +; HW sound channel register base addresses +HW_CH1_BASE EQU (rNR10 % $100) +HW_CH2_BASE EQU ((rNR21 % $100) - 1) +HW_CH3_BASE EQU (rNR30 % $100) +HW_CH4_BASE EQU ((rNR41 % $100) - 1) + +; HW sound channel enable bit masks +HW_CH1_ENABLE_MASK EQU %00010001 +HW_CH2_ENABLE_MASK EQU %00100010 +HW_CH3_ENABLE_MASK EQU %01000100 +HW_CH4_ENABLE_MASK EQU %10001000 + +; HW sound channel disable bit masks +HW_CH1_DISABLE_MASK EQU (~HW_CH1_ENABLE_MASK & $ff) +HW_CH2_DISABLE_MASK EQU (~HW_CH2_ENABLE_MASK & $ff) +HW_CH3_DISABLE_MASK EQU (~HW_CH3_ENABLE_MASK & $ff) +HW_CH4_DISABLE_MASK EQU (~HW_CH4_ENABLE_MASK & $ff) + +REG_DUTY_SOUND_LEN EQU 1 +REG_VOLUME_ENVELOPE EQU 2 +REG_FREQUENCY_LO EQU 3 + +MAX_SFX_ID EQU $B9 + +CRY_SFX_START EQU $14 +CRY_SFX_END EQU $86 + +; wChannelFlags1 constants +BIT_PERFECT_PITCH EQU 0 ; controlled by toggleperfectpitch command +BIT_CHANNEL_CALL EQU 1 ; if in channel call +BIT_NOISE_OR_SFX EQU 2 ; if channel is the music noise channel or an SFX channel +BIT_VIBRATO_DIRECTION EQU 3 ; if the pitch is above or below normal (cycles) +BIT_PITCH_BEND_ON EQU 4 ; if pitch bend is active +BIT_PITCH_BEND_DECREASING EQU 5 ; if the pitch bend frequency is decreasing (instead of increasing) +BIT_ROTATE_DUTY EQU 6 ; if rotating duty + +; wChannelFlags2 constant (only has one flag) +BIT_EXECUTE_MUSIC EQU 0 ; if in execute music + ; Song ids are calculated by address to save space. music_const: MACRO diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index b46842ec..1bd48988 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -772,7 +772,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e) dec b jr nz,.loop ld a,%00001000 - ld [$ff10],a ; Channel 1 sweep register + ld [rNR10],a ; Channel 1 sweep register ret .isTrainerBattle ; if it's a trainer battle, shorten the animation by one frame ld a,[W_SUBANIMCOUNTER] @@ -2335,19 +2335,19 @@ GetMoveSound: ; 7986f (1e:586f) call GetCryData ld b,a pop hl - ld a,[wc0f1] + ld a,[wFrequencyModifier] add [hl] - ld [wc0f1],a + ld [wFrequencyModifier],a inc hl - ld a,[wc0f2] + ld a,[wTempoModifier] add [hl] - ld [wc0f2],a + ld [wTempoModifier],a jr .done .NotCryMove ld a,[hli] - ld [wc0f1],a + ld [wFrequencyModifier],a ld a,[hli] - ld [wc0f2],a + ld [wTempoModifier],a .done ld a,b ret @@ -3029,8 +3029,8 @@ PlayApplyingAttackSound: ; 79e6a (1e:5e6a) ld b, $1 ld c, SFX_NOT_VERY_EFFECTIVE .playSound - ld [wc0f1], a + ld [wFrequencyModifier], a ld a, b - ld [wc0f2], a + ld [wTempoModifier], a ld a, c jp PlaySound diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index a00e9d59..a1afcb75 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -61,9 +61,9 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) .playSFX xor a - ld [wc0f1], a + ld [wFrequencyModifier], a ld a, $80 - ld [wc0f2], a + ld [wTempoModifier], a ld a, SFX_SILPH_SCOPE call PlaySound jp WaitForSoundToFinish diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 004859da..22a47908 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -867,12 +867,12 @@ FaintEnemyPokemon: ; 0x3c567 dec a jr z, .wild_win xor a - ld [wc0f1], a - ld [wc0f2], a + ld [wFrequencyModifier], a + ld [wTempoModifier], a ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent .sfxwait - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp SFX_FAINT_FALL jr z, .sfxwait ld a, SFX_FAINT_THUD @@ -952,7 +952,7 @@ EnemyMonFaintedText: ; 0x3c63e EndLowHealthAlarm: ; 3c643 (f:4643) xor a ld [wLowHealthAlarm], a ;disable low health alarm - ld [wc02a], a + ld [wChannelSoundIDs + CH4], a inc a ld [wccf6], a ret @@ -1045,7 +1045,7 @@ TrainerDefeatedText: ; 3c6e9 (f:46e9) PlayBattleVictoryMusic: ; 3c6ee (f:46ee) push af ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySoundWaitForCurrent ld c, BANK(Music_DefeatedTrainer) pop af @@ -1944,7 +1944,7 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) ld [hl], $0 ret z xor a - ld [wc02a], a + ld [wChannelSoundIDs + CH4], a ret .asm_3cde6 ld hl, wLowHealthAlarm @@ -6993,8 +6993,8 @@ _LoadTrainerPic: ; 3f04b (f:704b) ; unreferenced ResetCryModifiers: ; 3f069 (f:7069) xor a - ld [wc0f1], a - ld [wc0f2], a + ld [wFrequencyModifier], a + ld [wTempoModifier], a jp PlaySound ; animates the mon "growing" out of the pokeball diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index c642d206..f1de313c 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -46,7 +46,7 @@ EndOfBattle: ; 137aa (4:77aa) .resetVariables xor a ld [wLowHealthAlarm], a ;disable low health alarm - ld [wc02a], a + ld [wChannelSoundIDs + CH4], a ld [W_ISINBATTLE], a ld [W_BATTLETYPE], a ld [W_MOVEMISSED], a diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 078ae5c2..dec18fe3 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -824,12 +824,12 @@ TradeCenter_Trade: add hl, bc ld a, [hl] ld [wTradedEnemyMonSpecies], a - ld a, $a - ld [wMusicHeaderPointer], a + ld a, 10 + ld [wAudioFadeOutControl], a ld a, $2 - ld [wc0f0], a + ld [wAudioSavedROMBank], a ld a, MUSIC_SAFARI_ZONE - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld c, 100 call DelayFrames @@ -915,12 +915,12 @@ CableClub_Run: ; 5a5f (1:5a5f) inc a ; LINK_STATE_IN_CABLE_CLUB ld [wLinkState], a ld [$ffb5], a - ld a, $a - ld [wMusicHeaderPointer], a + ld a, 10 + ld [wAudioFadeOutControl], a ld a, BANK(Music_Celadon) - ld [wc0f0], a + ld [wAudioSavedROMBank], a ld a, MUSIC_CELADON - ld [wc0ee], a + ld [wNewSoundID], a jp PlaySound EmptyFunc3: ; 5aaf (1:5aaf) diff --git a/engine/evolution.asm b/engine/evolution.asm index 720e77cd..8fbf568a 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -8,9 +8,9 @@ EvolveMon: ; 7bde9 (1e:7de9) push af xor a ld [wLowHealthAlarm], a - ld [wc02a], a + ld [wChannelSoundIDs + CH4], a dec a - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -68,7 +68,7 @@ EvolveMon: ; 7bde9 (1e:7de9) .done ld [wcf1d], a ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld a, [wcf1d] call PlayCry diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index ce1430e3..293c756f 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -280,9 +280,9 @@ HoFRecordMonInfo: ; 70404 (1c:4404) jp CopyData HoFFadeOutScreenAndMusic: ; 70423 (1c:4423) - ld a, $a - ld [wcfc8], a - ld [wcfc9], a + ld a, 10 + ld [wAudioFadeOutCounterReloadValue], a + ld [wAudioFadeOutCounter], a ld a, $ff - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a jp GBFadeOutToWhite diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 0753531e..67e75301 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -63,14 +63,14 @@ SafariZoneGameStillGoing: ; 1e9ab (7:69ab) SafariZoneGameOver: ; 1e9b0 (7:69b0) call EnableAutoTextBoxDrawing xor a - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a dec a call PlaySound ld c, BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA call PlayMusic .asm_1e9c2 - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $b9 jr nz, .asm_1e9c2 ld a, TEXT_SAFARI_GAME_OVER @@ -374,7 +374,7 @@ BillsHouseInitiatedText: ; 1ebe2 (7:6be2) db $06 TX_ASM ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld c, 16 call DelayFrames diff --git a/engine/intro.asm b/engine/intro.asm index 154c41fd..572d51fa 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -325,10 +325,10 @@ PlayShootingStar: ; 4188a (10:588a) call DelayFrames .next ld a, BANK(Music_IntroBattle) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a ld a, MUSIC_INTRO_BATTLE - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound call IntroClearMiddleOfScreen call ClearSprites diff --git a/engine/items/items.asm b/engine/items/items.asm index a45b9185..84490521 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -856,7 +856,7 @@ ItemUseMedicine: ; dabb (3:5abb) .notFullHP ; if the pokemon's current HP doesn't equal its max HP xor a ld [wLowHealthAlarm],a ;disable low health alarm - ld [wc02a],a + ld [wChannelSoundIDs + CH4],a push hl push de ld bc,32 @@ -1643,7 +1643,7 @@ ItemUsePokeflute: ; e140 (3:6140) call WaitForSoundToFinish ; wait for sound to end callba Music_PokeFluteInBattle ; play in-battle pokeflute music .musicWaitLoop ; wait for music to finish playing - ld a,[wc02c] + ld a,[wChannelSoundIDs + CH6] and a ; music off? jr nz,.musicWaitLoop .skipMusic @@ -1716,8 +1716,8 @@ PlayedFluteHadEffectText: ; e215 (3:6215) ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing - ld a,[wc028] - cp a,$b8 + ld a,[wChannelSoundIDs + CH2] + cp a, SFX_POKEFLUE jr z,.musicWaitLoop call PlayDefaultMusic ; start playing normal music again .done diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index b5ebd83e..fd8a928d 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -397,7 +397,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld hl,wd72c set 1,[hl] ld a,$33 ; 3/7 volume - ld [$ff24],a + ld [rNR50],a call GBPalWhiteOut ; zero all palettes call ClearScreen ld a,[wd11e] ; pokemon ID @@ -566,7 +566,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld hl,wd72c res 1,[hl] ld a,$77 ; max volume - ld [$ff24],a + ld [rNR50],a ret HeightWeightText: ; 40448 (10:4448) diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index c13d7c85..bc58ba21 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -80,7 +80,7 @@ StatusScreen: ; 12953 (4:6953) ld hl, wd72c set 1, [hl] ld a, $33 - ld [$ff24], a ; Reduce the volume + ld [rNR50], a ; Reduce the volume call GBPalWhiteOutWithDelay3 call ClearScreen call UpdateSprites @@ -430,7 +430,7 @@ StatusScreen2: ; 12b57 (4:6b57) ld hl, wd72c res 1, [hl] ld a, $77 - ld [$ff24], a + ld [rNR50], a call GBPalWhiteOut jp ClearScreen diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 98499d7f..566bd880 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -129,12 +129,12 @@ OakSpeech: ; 6115 (1:6115) ld a,[H_LOADEDROMBANK] push af ld a, BANK(Music_PalletTown) - ld [wc0ef],a - ld [wc0f0],a - ld a,$A - ld [wMusicHeaderPointer],a + ld [wAudioROMBank],a + ld [wAudioSavedROMBank],a + ld a, 10 + ld [wAudioFadeOutControl],a ld a,$FF - ld [wc0ee],a + ld [wNewSoundID],a call PlaySound ; stop music pop af ld [H_LOADEDROMBANK],a diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index eb62fee7..05a9cc4e 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -33,7 +33,7 @@ ShakeElevator: ; 7bf15 (1e:7f15) ld a, SFX_SAFARI_ZONE_PA call PlayMusic .musicLoop - ld a, [wc02a] + ld a, [wChannelSoundIDs + CH4] cp $b9 jr z, .musicLoop call UpdateSprites diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index d3513b0d..0c04ff0e 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -15,44 +15,44 @@ AnimateHealingMachine: ; 70433 (1c:4433) ld hl, wOAMBuffer + $84 ld de, PokeCenterOAMData call CopyHealingMachineOAM - ld a, $4 - ld [wMusicHeaderPointer], a + ld a, 4 + ld [wAudioFadeOutControl], a ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound -.asm_70464 - ld a, [wMusicHeaderPointer] - and a - jr nz, .asm_70464 +.waitLoop + ld a, [wAudioFadeOutControl] + and a ; is fade-out finished? + jr nz, .waitLoop ; if not, check again ld a, [wPartyCount] ld b, a -.asm_7046e +.partyLoop call CopyHealingMachineOAM ld a, SFX_HEALING_MACHINE call PlaySound ld c, 30 call DelayFrames dec b - jr nz, .asm_7046e - ld a, [wc0ef] + jr nz, .partyLoop + ld a, [wAudioROMBank] cp BANK(Audio3_UpdateMusic) - ld [wc0f0], a - jr nz, .asm_70495 + ld [wAudioSavedROMBank], a + jr nz, .next ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld a, BANK(Music_PkmnHealed) - ld [wc0ef], a -.asm_70495 + ld [wAudioROMBank], a +.next ld a, MUSIC_PKMN_HEALED - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld d, $28 call FlashSprite8Times -.asm_704a2 - ld a, [wc026] - cp MUSIC_PKMN_HEALED - jr z, .asm_704a2 +.waitLoop2 + ld a, [wChannelSoundIDs] + cp MUSIC_PKMN_HEALED ; is the healed music still playing? + jr z, .waitLoop2 ; if so, check gain ld c, 32 call DelayFrames pop af diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 0c01e38c..fa5ac222 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -163,10 +163,10 @@ PewterMuseumGuyMovementScriptPointerTable: ; 1a510 (6:6510) PewterMovementScript_WalkToMuseum: ; 1a514 (6:6514) ld a, BANK(Music_MuseumGuy) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a ld a, MUSIC_MUSEUM_GUY - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld a, [wSpriteIndex] swap a @@ -219,10 +219,10 @@ PewterGymGuyMovementScriptPointerTable: ; 1a57d (6:657d) PewterMovementScript_WalkToGym: ; 1a581 (6:6581) ld a, BANK(Music_MuseumGuy) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a ld a, MUSIC_MUSEUM_GUY - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld a, [wSpriteIndex] swap a diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm index 5b2e4cbb..f302d994 100755 --- a/engine/overworld/pokecenter.asm +++ b/engine/overworld/pokecenter.asm @@ -24,12 +24,12 @@ DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6) predef HealParty callba AnimateHealingMachine ; do the healing machine animation xor a - ld [wMusicHeaderPointer], a - ld a, [wc0f0] - ld [wc0ef], a - ld a, [wd35b] - ld [wcfca], a - ld [wc0ee], a + ld [wAudioFadeOutControl], a + ld a, [wAudioSavedROMBank] + ld [wAudioROMBank], a + ld a, [wMapMusicSoundID] + ld [wLastMusicSoundID], a + ld [wNewSoundID], a call PlaySound ld hl, PokemonFightingFitText call PrintText diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 3b392dde..b68b9294 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -411,7 +411,7 @@ SlotMachine_CheckForMatches: ; 37588 (d:7588) call PrintText .done xor a - ld [wc002], a + ld [wMuteAudioAndPauseMusic], a ret .rollWheel3DownByOneSymbol call SlotMachine_AnimWheel3 @@ -654,7 +654,7 @@ SlotMachine_PrintPayoutCoins: ; 3775f (d:775f) SlotMachine_PayCoinsToPlayer: ; 3776b (d:776b) ld a, $1 - ld [wc002], a + ld [wMuteAudioAndPauseMusic], a call WaitForSoundToFinish ; Put 1 in the temp coins variable. This value is added to the player's coins diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index df47275b..17609786 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -18,8 +18,8 @@ SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7) ld [hli], a ld [hl], a ld a, BANK(Music_TitleScreen) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a DisplayTitleScreen: ; 42dd (1:42dd) call GBPalWhiteOut @@ -219,7 +219,7 @@ ENDC call Delay3 call WaitForSoundToFinish ld a, MUSIC_TITLE_SCREEN - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound xor a ld [wcc5b], a diff --git a/home.asm b/home.asm index b18a4ec3..e850c858 100644 --- a/home.asm +++ b/home.asm @@ -332,9 +332,9 @@ GetCryData:: ; 13d9 (0:13d9) ld a, [hli] ld b, a ; cry id ld a, [hli] - ld [wc0f1], a + ld [wFrequencyModifier], a ld a, [hl] - ld [wc0f2], a + ld [wTempoModifier], a call BankswitchBack ; Cry headers have 3 channels, @@ -998,27 +998,27 @@ ResetPlayerSpriteData_ClearSpriteData:: ; 28c4 (0:28c4) xor a jp FillMemory -Func_28cb:: ; 28cb (0:28cb) - ld a, [wMusicHeaderPointer] +FadeOutAudio:: ; 28cb (0:28cb) + ld a, [wAudioFadeOutControl] and a jr nz, .asm_28dc ld a, [wd72c] bit 1, a ret nz ld a, $77 - ld [$ff24], a + ld [rNR50], a ret .asm_28dc - ld a, [wcfc9] + ld a, [wAudioFadeOutCounter] and a - jr z, .asm_28e7 + jr z, .counterReachedZero dec a - ld [wcfc9], a + ld [wAudioFadeOutCounter], a ret -.asm_28e7 - ld a, [wcfc8] - ld [wcfc9], a - ld a, [$ff24] +.counterReachedZero + ld a, [wAudioFadeOutCounterReloadValue] + ld [wAudioFadeOutCounter], a + ld a, [rNR50] and a jr z, .asm_2903 ld b, a @@ -1031,20 +1031,20 @@ Func_28cb:: ; 28cb (0:28cb) dec a swap a or c - ld [$ff24], a + ld [rNR50], a ret .asm_2903 - ld a, [wMusicHeaderPointer] + ld a, [wAudioFadeOutControl] ld b, a xor a - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound - ld a, [wc0f0] - ld [wc0ef], a + ld a, [wAudioSavedROMBank] + ld [wAudioROMBank], a ld a, b - ld [wc0ee], a + ld [wNewSoundID], a jp PlaySound ; this function is used to display sign messages, sprite dialog, etc. @@ -2604,12 +2604,12 @@ PlayTrainerMusic:: ; 33e8 (0:33e8) and a ret nz xor a - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a ld a, $ff call PlaySound ld a, BANK(Music_MeetEvilTrainer) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a ld a, [wEngagedTrainerClass] ld b, a ld hl, EvilTrainerList @@ -2634,7 +2634,7 @@ PlayTrainerMusic:: ; 33e8 (0:33e8) .maleTrainer ld a, MUSIC_MEET_MALE_TRAINER .PlaySound - ld [wc0ee], a + ld [wNewSoundID], a jp PlaySound INCLUDE "data/trainer_types.asm" @@ -3217,8 +3217,8 @@ WaitForSoundToFinish:: ; 3748 (0:3748) and $80 ret nz push hl -.asm_374f - ld hl, wc02a +.waitLoop + ld hl, wChannelSoundIDs + CH4 xor a or [hl] inc hl @@ -3226,7 +3226,7 @@ WaitForSoundToFinish:: ; 3748 (0:3748) inc hl inc hl or [hl] - jr nz, .asm_374f + jr nz, .waitLoop pop hl ret diff --git a/home/audio.asm b/home/audio.asm index 033f4067..2c46ec7a 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -3,112 +3,139 @@ PlayDefaultMusic:: ; 2307 (0:2307) xor a ld c, a ld d, a - ld [wcfca], a - jr Func_2324 + ld [wLastMusicSoundID], a + jr PlayDefaultMusicCommon -Func_2312:: ; 2312 (0:2312) - ld c, $a - ld d, $0 +PlayDefaultMusicFadeOutCurrent:: ; 2312 (0:2312) +; Fade out the current music and then play the default music. + ld c, 10 + ld d, 0 ld a, [wd72e] - bit 5, a - jr z, Func_2324 + bit 5, a ; has a battle just ended? + jr z, PlayDefaultMusicCommon xor a - ld [wcfca], a - ld c, $8 + ld [wLastMusicSoundID], a + ld c, 8 ld d, c -Func_2324:: ; 2324 (0:2324) + +PlayDefaultMusicCommon:: ; 2324 (0:2324) ld a, [wWalkBikeSurfState] and a - jr z, .asm_2343 + jr z, .walking cp $2 - jr z, .asm_2332 + jr z, .surfing ld a, MUSIC_BIKE_RIDING - jr .asm_2334 -.asm_2332 + jr .next + +.surfing ld a, MUSIC_SURFING -.asm_2334 + +.next ld b, a ld a, d - and a + and a ; should current music be faded out first? ld a, BANK(Music_BikeRiding) - jr nz, .asm_233e - ld [wc0ef], a -.asm_233e - ld [wc0f0], a - jr .asm_234c -.asm_2343 - ld a, [wd35b] + jr nz, .next2 + +; Only change the audio ROM bank if the current music isn't going to be faded +; out before the default music begins. + ld [wAudioROMBank], a + +.next2 +; [wAudioSavedROMBank] will be copied to [wAudioROMBank] after fading out the +; current music (if the current music is faded out). + ld [wAudioSavedROMBank], a + jr .next3 + +.walking + ld a, [wMapMusicSoundID] ld b, a - call Func_2385 - jr c, .asm_2351 -.asm_234c - ld a, [wcfca] - cp b - ret z -.asm_2351 + call CompareMapMusicBankWithCurrentBank + jr c, .next4 + +.next3 + ld a, [wLastMusicSoundID] + cp b ; is the default music already playing? + ret z ; if so, do nothing + +.next4 ld a, c - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a ld a, b - ld [wcfca], a - ld [wc0ee], a + ld [wLastMusicSoundID], a + ld [wNewSoundID], a jp PlaySound -Func_235f:: ; 235f (0:235f) - ld a, [wc0ef] +UpdateMusic6Times:: ; 235f (0:235f) +; This is called when entering a map, before fading out the current music and +; playing the default music (i.e. the map's music or biking/surfing music). + ld a, [wAudioROMBank] ld b, a cp BANK(Audio1_UpdateMusic) jr nz, .checkForAudio2 -.audio1 + +; audio 1 ld hl, Audio1_UpdateMusic - jr .asm_2378 + jr .next + .checkForAudio2 cp BANK(Audio2_UpdateMusic) jr nz, .audio3 -.audio2 + +; audio 2 ld hl, Audio2_UpdateMusic - jr .asm_2378 + jr .next + .audio3 ld hl, Audio3_UpdateMusic -.asm_2378 - ld c, $6 -.asm_237a + +.next + ld c, 6 +.loop push bc push hl call Bankswitch pop hl pop bc dec c - jr nz, .asm_237a + jr nz, .loop ret -Func_2385:: ; 2385 (0:2385) - ld a, [wd35c] +CompareMapMusicBankWithCurrentBank:: ; 2385 (0:2385) +; Compares the map music's audio ROM bank with the current audio ROM bank +; and updates the audio ROM bank variables. +; Returns whether the banks are different in carry. + ld a, [wMapMusicROMBank] ld e, a - ld a, [wc0ef] + ld a, [wAudioROMBank] cp e - jr nz, .asm_2394 - ld [wc0f0], a + jr nz, .differentBanks + ld [wAudioSavedROMBank], a and a ret -.asm_2394 - ld a, c +.differentBanks + ld a, c ; this is a fade-out counter value and it's always non-zero and a ld a, e - jr nz, .asm_239c - ld [wc0ef], a -.asm_239c - ld [wc0f0], a + jr nz, .next +; If the fade-counter is non-zero, we don't change the audio ROM bank because +; it's needed to keep playing the music as it fades out. The FadeOutAudio +; routine will take care of copying [wAudioSavedROMBank] to [wAudioROMBank] +; when the music has faded out. + ld [wAudioROMBank], a +.next + ld [wAudioSavedROMBank], a scf ret PlayMusic:: ; 23a1 (0:23a1) ld b, a - ld [wc0ee], a + ld [wNewSoundID], a xor a - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a ld a, c - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a ld a, b ; plays music specified by a. If value is $ff, music is stopped @@ -117,66 +144,74 @@ PlaySound:: ; 23b1 (0:23b1) push de push bc ld b, a - ld a, [wc0ee] + ld a, [wNewSoundID] and a - jr z, .asm_23c8 + jr z, .next xor a - ld [wc02a], a - ld [wc02b], a - ld [wc02c], a - ld [wc02d], a -.asm_23c8 - ld a, [wMusicHeaderPointer] - and a - jr z, .asm_23e3 - ld a, [wc0ee] - and a - jr z, .asm_2425 + ld [wChannelSoundIDs + CH4], a + ld [wChannelSoundIDs + CH5], a + ld [wChannelSoundIDs + CH6], a + ld [wChannelSoundIDs + CH7], a +.next + ld a, [wAudioFadeOutControl] + and a ; has a fade-out length been specified? + jr z, .noFadeOut + ld a, [wNewSoundID] + and a ; is the new sound ID 0? + jr z, .done ; if so, do nothing xor a - ld [wc0ee], a - ld a, [wcfca] - cp $ff - jr nz, .asm_2414 + ld [wNewSoundID], a + ld a, [wLastMusicSoundID] + cp $ff ; has the music been stopped? + jr nz, .fadeOut ; if not, fade out the current music +; If it has been stopped, start playing the new music immediately. xor a - ld [wMusicHeaderPointer], a -.asm_23e3 + ld [wAudioFadeOutControl], a +.noFadeOut xor a - ld [wc0ee], a + ld [wNewSoundID], a ld a, [H_LOADEDROMBANK] - ld [$ffb9], a - ld a, [wc0ef] + ld [hSavedROMBank], a + ld a, [wAudioROMBank] ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a - cp BANK(Audio1_9876) + cp BANK(Audio1_PlaySound) jr nz, .checkForAudio2 -.audio1 + +; audio 1 ld a, b - call Audio1_9876 - jr .asm_240b + call Audio1_PlaySound + jr .next2 + .checkForAudio2 - cp BANK(Audio2_22035) + cp BANK(Audio2_PlaySound) jr nz, .audio3 -.audio2 + +; audio 2 ld a, b - call Audio2_22035 - jr .asm_240b + call Audio2_PlaySound + jr .next2 + .audio3 ld a, b - call Audio3_7d8ea -.asm_240b - ld a, [$ffb9] + call Audio3_PlaySound + +.next2 + ld a, [hSavedROMBank] ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a - jr .asm_2425 -.asm_2414 + jr .done + +.fadeOut ld a, b - ld [wcfca], a - ld a, [wMusicHeaderPointer] - ld [wcfc8], a - ld [wcfc9], a + ld [wLastMusicSoundID], a + ld a, [wAudioFadeOutControl] + ld [wAudioFadeOutCounterReloadValue], a + ld [wAudioFadeOutCounter], a ld a, b - ld [wMusicHeaderPointer], a -.asm_2425 + ld [wAudioFadeOutControl], a + +.done pop bc pop de pop hl diff --git a/home/init.asm b/home/init.asm index 624a4d6a..cb5c6583 100644 --- a/home/init.asm +++ b/home/init.asm @@ -98,8 +98,8 @@ rLCDC_DEFAULT EQU %11100011 predef LoadSGB ld a, BANK(SFX_Shooting_Star) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a ld a, $9c ld [H_AUTOBGTRANSFERDEST + 1], a xor a @@ -127,11 +127,11 @@ ClearVram: StopAllSounds:: ld a, BANK(Audio1_UpdateMusic) - ld [wc0ef], a - ld [wc0f0], a + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a xor a - ld [wMusicHeaderPointer], a - ld [wc0ee], a - ld [wcfca], a + ld [wAudioFadeOutControl], a + ld [wNewSoundID], a + ld [wLastMusicSoundID], a dec a jp PlaySound diff --git a/home/overworld.asm b/home/overworld.asm index f8d6e7e1..eba47df2 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -658,7 +658,7 @@ CheckMapConnections:: ; 07ba (0:07ba) ld [wCurrentTileBlockMapViewPointer + 1],a .loadNewMap ; load the connected map that was entered call LoadMapHeader - call Func_2312 ; music + call PlayDefaultMusicFadeOutCurrent ld b,$09 call GoPAL_SET ; Since the sprite set shouldn't change, this will just update VRAM slots at @@ -750,16 +750,16 @@ HandleBlackOut:: ld [MBC1RomBank], a call ResetStatusAndHalveMoneyOnBlackout call SpecialWarpIn - call Func_2312 + call PlayDefaultMusicFadeOutCurrent jp SpecialEnterMap StopMusic:: - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound .wait - ld a, [wMusicHeaderPointer] + ld a, [wAudioFadeOutControl] and a jr nz, .wait jp StopAllSounds @@ -1224,7 +1224,7 @@ CollisionCheckOnLand:: ; 0bd1 (0:0bd1) call CheckTilePassable jr nc,.noCollision .collision - ld a,[wc02a] + ld a,[wChannelSoundIDs + CH4] cp a,SFX_COLLISION ; check if collision sound is already playing jr z,.setCarry ld a,SFX_COLLISION @@ -1927,7 +1927,7 @@ CollisionCheckOnWater:: ; 0fb7 (0:0fb7) jr z,.stopSurfing ; stop surfing if the tile is passable jr .loop .collision - ld a,[wc02a] + ld a,[wChannelSoundIDs + CH4] cp a,SFX_COLLISION ; check if collision sound is already playing jr z,.setCarry ld a,SFX_COLLISION @@ -2279,9 +2279,9 @@ LoadMapHeader:: ; 107c (0:107c) add hl,bc add hl,bc ld a,[hli] - ld [wd35b],a ; music 1 + ld [wMapMusicSoundID],a ; music 1 ld a,[hl] - ld [wd35c],a ; music 2 + ld [wMapMusicROMBank],a ; music 2 pop af ld [H_LOADEDROMBANK],a ld [MBC1RomBank],a @@ -2352,8 +2352,8 @@ LoadMapData:: ; 1241 (0:1241) ld a,[W_FLAGS_D733] bit 1,a jr nz,.restoreRomBank - call Func_235f ; music related - call Func_2312 ; music related + call UpdateMusic6Times + call PlayDefaultMusicFadeOutCurrent .restoreRomBank pop af ld [H_LOADEDROMBANK],a diff --git a/home/vblank.asm b/home/vblank.asm index 6abc3756..3bdbe7cb 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -38,21 +38,21 @@ VBlank:: ld a, [H_VBLANKOCCURRED] and a - jr z, .vblanked + jr z, .skipZeroing xor a ld [H_VBLANKOCCURRED], a -.vblanked +.skipZeroing ld a, [H_FRAMECOUNTER] and a - jr z, .decced + jr z, .skipDec dec a ld [H_FRAMECOUNTER], a -.decced - call Func_28cb +.skipDec + call FadeOutAudio - ld a, [wc0ef] ; music ROM bank + ld a, [wAudioROMBank] ; music ROM bank ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a diff --git a/hram.asm b/hram.asm index 2f70b91a..3f331cfb 100644 --- a/hram.asm +++ b/hram.asm @@ -182,7 +182,9 @@ hJoy5 EQU $FFB5 hJoy6 EQU $FFB6 hJoy7 EQU $FFB7 -H_LOADEDROMBANK EQU $FFB8 +H_LOADEDROMBANK EQU $FFB8 + +hSavedROMBank EQU $FFB9 ; is automatic background transfer during V-blank enabled? ; if nonzero, yes diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 158a683d..d5aa57c1 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -65,7 +65,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) and a jr z, .asm_19512 ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound .asm_19512 ld c, BANK(Music_MeetRival) @@ -172,7 +172,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld a, $1 diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index c52f00cf..db6fa696 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -511,7 +511,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0) ld [hJoyHeld], a call EnableAutoTextBoxDrawing ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld a, $15 @@ -612,7 +612,7 @@ OaksLabScript16: ; 1cf12 (7:4f12) call FillMemory ld [hl], $ff ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld a, $1 diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 584878eb..25c07be6 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -59,9 +59,9 @@ PewterPokecenterText3: ; 5c59b (17:459b) ld c, 24 call DelayFrames - ld a, [wc026] + ld a, [wChannelSoundIDs] ld b, a - ld a, [wc027] + ld a, [wChannelSoundIDs + CH1] or b jr nz, .loop diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index a569b60b..5422d887 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -23,7 +23,7 @@ PokemonTower2Script0: ; 6050f (18:450f) call ArePlayerCoordsInArray ret nc ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL @@ -77,7 +77,7 @@ PokemonTower2Script1: ; 60563 (18:4563) ld [H_SPRITEINDEX], a call MoveSprite ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld a, $2 diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm index 09ce97dc..f9c7193f 100755 --- a/scripts/redshouse1f.asm +++ b/scripts/redshouse1f.asm @@ -29,14 +29,14 @@ MomHealPokemon: ; 4818a (12:418a) call ReloadMapData predef HealParty ld a, MUSIC_PKMN_HEALED - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound .next - ld a, [wc026] + ld a, [wChannelSoundIDs] cp MUSIC_PKMN_HEALED jr z, .next - ld a, [wd35b] - ld [wc0ee], a + ld a, [wMapMusicSoundID] + ld [wNewSoundID], a call PlaySound call GBFadeInFromWhite ld hl, MomHealText2 diff --git a/scripts/route22.asm b/scripts/route22.asm index 041f75e6..f6f6778e 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -89,7 +89,7 @@ Route22Script0: ; 50f00 (14:4f00) and a jr z, .asm_50f4e ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound .asm_50f4e ld c, BANK(Music_MeetRival) @@ -168,7 +168,7 @@ Route22Script2: ; 50fb5 (14:4fb5) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld a, [wcf0d] @@ -242,11 +242,11 @@ Route22Script_5104e: ; 5104e (14:504e) and a jr z, .skipYVisibilityTesta ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound .skipYVisibilityTesta ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateTempo ld a, $2 @@ -327,7 +327,7 @@ Route22Script5: ; 510df (14:50df) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStartAndTempo ld a, [wcf0d] diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 525405c7..0de4b324 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -131,7 +131,7 @@ SilphCo7Script0: ; 51c23 (14:5c23) ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL @@ -220,7 +220,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld de, MovementData_51d1d diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index b95c5723..c4afd9d0 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -25,7 +25,7 @@ SSAnne2Script0: ; 613be (18:53be) call ArePlayerCoordsInArray ret nc ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL @@ -146,7 +146,7 @@ SSAnne2Script2: ; 6146d (18:546d) ld [H_SPRITEINDEX], a call MoveSprite ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld a, $3 diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm index b99f5bb2..911dac7f 100755 --- a/scripts/ssanne7.asm +++ b/scripts/ssanne7.asm @@ -44,21 +44,21 @@ SSAnne7Text1: ; 618ad (18:58ad) SSAnne7RubText: ; 618ec (18:58ec) TX_FAR _SSAnne7RubText TX_ASM - ld a, [wc0ef] + ld a, [wAudioROMBank] cp BANK(Audio3_UpdateMusic) - ld [wc0f0], a + ld [wAudioSavedROMBank], a jr nz, .asm_61908 ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld a, Bank(Music_PkmnHealed) - ld [wc0ef], a + ld [wAudioROMBank], a .asm_61908 ld a, MUSIC_PKMN_HEALED - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound .asm_61910 - ld a, [wc026] + ld a, [wChannelSoundIDs] cp MUSIC_PKMN_HEALED jr z, .asm_61910 call PlayDefaultMusic diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index a65b3603..8c2173cc 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -40,7 +40,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) SetEventForceReuseHL EVENT_SS_ANNE_LEFT ld a, $ff ld [wJoyIgnore], a - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound ld c, BANK(Music_Surfing) ld a, MUSIC_SURFING diff --git a/wram.asm b/wram.asm index 872d1e8e..2fc94e8d 100755 --- a/wram.asm +++ b/wram.asm @@ -61,66 +61,146 @@ ENDM SECTION "WRAM Bank 0", WRAM0 -wc000:: ds 1 -wc001:: ds 1 -wc002:: ds 1 -wc003:: ds 1 -wc004:: ds 1 -wc005:: ds 1 -wc006:: ds 8 -wc00e:: ds 4 -wc012:: ds 4 -wc016:: ds 16 -wc026:: ds 1 -wc027:: ds 1 -wc028:: ds 2 -wc02a:: ds 1 -wc02b:: ds 1 -wc02c:: ds 1 -wc02d:: ds 1 -wc02e:: ds 8 -wc036:: ds 8 -wc03e:: ds 8 -wc046:: ds 8 -wc04e:: ds 8 -wc056:: ds 8 -wc05e:: ds 8 -wc066:: ds 8 -wc06e:: ds 8 -wc076:: ds 8 -wc07e:: ds 8 -wc086:: ds 8 -wc08e:: ds 8 -wc096:: ds 8 -wc09e:: ds 8 -wc0a6:: ds 8 -wc0ae:: ds 8 -wc0b6:: ds 8 -wc0be:: ds 8 -wc0c6:: ds 8 -wc0ce:: ds 1 -wc0cf:: ds 1 -wc0d0:: ds 1 -wc0d1:: ds 1 -wc0d2:: ds 1 -wc0d3:: ds 1 -wc0d4:: ds 1 -wc0d5:: ds 1 -wc0d6:: ds 8 -wc0de:: ds 8 -wc0e6:: ds 1 -wc0e7:: ds 1 -wc0e8:: ds 1 -wc0e9:: ds 1 -wc0ea:: ds 1 -wc0eb:: ds 1 -wc0ec:: ds 1 -wc0ed:: ds 1 -wc0ee:: ds 1 -wc0ef:: ds 1 -wc0f0:: ds 1 -wc0f1:: ds 1 -wc0f2:: ds 14 +wUnusedC000:: ; c000 + ds 1 + +wSoundID:: ; c001 + ds 1 + +wMuteAudioAndPauseMusic:: ; c002 +; bit 7: whether sound has been muted +; all bits: whether the effective is active +; Store 1 to activate effect (any value in the range [1, 127] works). +; All audio is muted and music is paused. Sfx continues playing until it +; ends normally. +; Store 0 to resume music. + ds 1 + +wDisableChannelOutputWhenSfxEnds:: ; c003 + ds 1 + +wStereoPanning:: ; c004 + ds 1 + +wSavedVolume:: ; c005 + ds 1 + +wChannelCommandPointers:: ; c006 + ds 16 + +wChannelReturnAddresses:: ; c016 + ds 16 + +wChannelSoundIDs:: ; c026 + ds 8 + +wChannelFlags1:: ; c02e + ds 8 + +wChannelFlags2:: ; c036 + ds 8 + +wChannelDuties:: ; c03e + ds 8 + +wChannelDutyCycles:: ; c046 + ds 8 + +wChannelVibratoDelayCounters:: ; c04e +; reloaded at the beginning of a note. counts down until the vibrato begins. + ds 8 + +wChannelVibratoExtents:: ; c056 + ds 8 + +wChannelVibratoRates:: ; c05e +; high nybble is rate (counter reload value) and low nybble is counter. +; time between applications of vibrato. + ds 8 + +wChannelFrequencyLowBytes:: ; c066 + ds 8 + +wChannelVibratoDelayCounterReloadValues:: ; c06e +; delay of the beginning of the vibrato from the start of the note + ds 8 + +wChannelPitchBendLengthModifiers:: ; c076 + ds 8 + +wChannelPitchBendFrequencySteps:: ; c07e + ds 8 + +wChannelPitchBendFrequencyStepsFractionalPart:: ; c086 + ds 8 + +wChannelPitchBendCurrentFrequencyFractionalPart:: ; c08e + ds 8 + +wChannelPitchBendCurrentFrequencyHighBytes:: ; c096 + ds 8 + +wChannelPitchBendCurrentFrequencyLowBytes:: ; c09e + ds 8 + +wChannelPitchBendTargetFrequencyHighBytes:: ; c0a6 + ds 8 + +wChannelPitchBendTargetFrequencyLowBytes:: ; c0ae + ds 8 + +wChannelNoteDelayCounters:: ; c0b6 +; Note delays are stored as 16-bit fixed-point numbers where the integer part +; is 8 bits and the fractional part is 8 bits. + ds 8 + +wChannelLoopCounters:: ; c0be + ds 8 + +wChannelNoteSpeeds:: ; c0c6 + ds 8 + +wChannelNoteDelayCountersFractionalPart:: ; c0ce + ds 8 + +wChannelOctaves:: ; c0d6 + ds 8 + +wChannelVolumes:: ; c0de +; also includes fade for hardware channels that support it + ds 8 + +wMusicWaveInstrument:: + ds 1 + +wSfxWaveInstrument:: + ds 1 + +wMusicTempo:: ; c0e8 + ds 2 + +wSfxTempo:: ; c0ea + ds 2 + +wSfxHeaderPointer:: ; c0ec + ds 2 + +wNewSoundID:: ; c0ee + ds 1 + +wAudioROMBank:: ; c0ef + ds 1 + +wAudioSavedROMBank:: ; c0f0 + ds 1 + +wFrequencyModifier:: ; c0f1 + ds 1 + +wTempoModifier:: ; c0f2 + ds 1 + + ds 13 SECTION "Sprite State Data", WRAM0[$c100] @@ -1289,13 +1369,35 @@ wTileInFrontOfPlayer:: ; cfc6 ; background tile number in front of the player (either 1 or 2 steps ahead) ds 1 -wMusicHeaderPointer:: ; cfc7 -; (the current music channel address - $4000) / 3 +wAudioFadeOutControl:: ; cfc7 +; The desired fade counter reload value is stored here prior to calling +; PlaySound in order to cause the current music to fade out before the new +; music begins playing. Storing 0 causes no fade out to occur and the new music +; to begin immediately. +; This variable has another use related to fade-out, as well. PlaySound stores +; the sound ID of the music that should be played after the fade-out is finished +; in this variable. FadeOutAudio checks if it's non-zero every V-Blank and +; fades out the current audio if it is. Once it has finished fading out the +; audio, it zeroes this variable and starts playing the sound ID stored in it. ds 1 -wcfc8:: ds 1 ; used with audio -wcfc9:: ds 1 ; also used with audio -wcfca:: ds 1 ; also used with audio too +wAudioFadeOutCounterReloadValue:: ; cfc8 + ds 1 + +wAudioFadeOutCounter:: ; cfc9 + ds 1 + +wLastMusicSoundID:: ; cfca +; This is used to determine whether the default music is already playing when +; attempting to play the default music (in order to avoid restarting the same +; music) and whether the music has already been stopped when attempting to +; fade out the current music (so that the new music can be begin immediately +; instead of waiting). +; It sometimes contains the sound ID of the last music played, but it may also +; contain $ff (if the music has been stopped) or 0 (because some routines zero +; it in order to prevent assumptions from being made about the current state of +; the music). + ds 1 wUpdateSpritesEnabled:: ; cfcb ; $00 = causes sprites to be hidden and the value to change to $ff @@ -2126,8 +2228,11 @@ wLetterPrintingDelayFlags:: ; d358 wPlayerID:: ; d359 ds 2 -wd35b:: ds 1 ; used with audio stuff -wd35c:: ds 1 ; storage for audio bank for current map? +wMapMusicSoundID:: ; d35b + ds 1 + +wMapMusicROMBank:: ; d35c + ds 1 wMapPalOffset:: ; d35d ; offset subtracted from FadePal4 to get the background and object palettes for the current map -- cgit v1.3.1-sl0p From dfc152d667e3695f83eb0fbabb839b0fad275ceb Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 10 Aug 2015 11:09:16 -0500 Subject: No more $C8 Use OPP_ constants separate from trainer constants since valid opponents can be all Pokemon and trainers --- audio.asm | 6 +- constants/trainer_constants.asm | 101 ++++++++++++++++++---------------- data/mapObjects/agatha.asm | 2 +- data/mapObjects/bruno.asm | 2 +- data/mapObjects/celadongamecorner.asm | 2 +- data/mapObjects/celadongym.asm | 16 +++--- data/mapObjects/ceruleancity.asm | 2 +- data/mapObjects/ceruleangym.asm | 6 +- data/mapObjects/cinnabargym.asm | 16 +++--- data/mapObjects/fightingdojo.asm | 10 ++-- data/mapObjects/fuchsiagym.asm | 14 ++--- data/mapObjects/lance.asm | 2 +- data/mapObjects/lorelei.asm | 2 +- data/mapObjects/mansion1.asm | 2 +- data/mapObjects/mansion2.asm | 2 +- data/mapObjects/mansion3.asm | 4 +- data/mapObjects/mansion4.asm | 4 +- data/mapObjects/mtmoon1.asm | 14 ++--- data/mapObjects/mtmoon3.asm | 10 ++-- data/mapObjects/oakslab.asm | 2 +- data/mapObjects/pewtergym.asm | 4 +- data/mapObjects/pokemontower3.asm | 6 +- data/mapObjects/pokemontower4.asm | 6 +- data/mapObjects/pokemontower5.asm | 8 +-- data/mapObjects/pokemontower6.asm | 6 +- data/mapObjects/pokemontower7.asm | 6 +- data/mapObjects/rockethideout1.asm | 10 ++-- data/mapObjects/rockethideout2.asm | 2 +- data/mapObjects/rockethideout3.asm | 4 +- data/mapObjects/rockethideout4.asm | 8 +-- data/mapObjects/rocktunnel1.asm | 14 ++--- data/mapObjects/rocktunnel2.asm | 16 +++--- data/mapObjects/route10.asm | 12 ++-- data/mapObjects/route11.asm | 20 +++---- data/mapObjects/route12.asm | 14 ++--- data/mapObjects/route13.asm | 20 +++---- data/mapObjects/route14.asm | 20 +++---- data/mapObjects/route15.asm | 20 +++---- data/mapObjects/route16.asm | 12 ++-- data/mapObjects/route17.asm | 20 +++---- data/mapObjects/route18.asm | 6 +- data/mapObjects/route19.asm | 26 ++++----- data/mapObjects/route20.asm | 20 +++---- data/mapObjects/route21.asm | 18 +++--- data/mapObjects/route24.asm | 14 ++--- data/mapObjects/route25.asm | 18 +++--- data/mapObjects/route3.asm | 16 +++--- data/mapObjects/route4.asm | 2 +- data/mapObjects/route6.asm | 12 ++-- data/mapObjects/route8.asm | 18 +++--- data/mapObjects/route9.asm | 18 +++--- data/mapObjects/saffrongym.asm | 16 +++--- data/mapObjects/silphco10.asm | 4 +- data/mapObjects/silphco11.asm | 6 +- data/mapObjects/silphco2.asm | 8 +-- data/mapObjects/silphco3.asm | 4 +- data/mapObjects/silphco4.asm | 6 +- data/mapObjects/silphco5.asm | 8 +-- data/mapObjects/silphco6.asm | 6 +- data/mapObjects/silphco7.asm | 8 +-- data/mapObjects/silphco8.asm | 6 +- data/mapObjects/silphco9.asm | 6 +- data/mapObjects/ssanne10.asm | 12 ++-- data/mapObjects/ssanne2.asm | 2 +- data/mapObjects/ssanne5.asm | 4 +- data/mapObjects/ssanne8.asm | 8 +-- data/mapObjects/ssanne9.asm | 8 +-- data/mapObjects/vermiliongym.asm | 8 +-- data/mapObjects/victoryroad1.asm | 4 +- data/mapObjects/victoryroad2.asm | 10 ++-- data/mapObjects/victoryroad3.asm | 8 +-- data/mapObjects/viridianforest.asm | 6 +- data/mapObjects/viridiangym.asm | 18 +++--- data/trainer_types.asm | 24 ++++---- engine/battle/battle_transitions.asm | 2 +- engine/battle/core.asm | 4 +- engine/battle/read_trainer_party.asm | 2 +- engine/cable_club.asm | 2 +- engine/overworld/npc_movement.asm | 6 +- home.asm | 10 ++-- scripts/ceruleancity.asm | 2 +- scripts/gary.asm | 2 +- scripts/oakslab.asm | 2 +- scripts/pokemontower2.asm | 2 +- scripts/route22.asm | 4 +- scripts/silphco7.asm | 2 +- scripts/ssanne2.asm | 2 +- wram.asm | 4 +- 88 files changed, 428 insertions(+), 423 deletions(-) (limited to 'audio.asm') diff --git a/audio.asm b/audio.asm index 037145d8..55bf4a1b 100644 --- a/audio.asm +++ b/audio.asm @@ -378,11 +378,11 @@ PlayBattleMusic:: ; 0x90c6 jr .playSong .notGymLeaderBattle ld a, [W_CUROPPONENT] - cp $c8 + cp 200 jr c, .wildBattle - cp SONY3 + $c8 + cp OPP_SONY3 jr z, .finalBattle - cp LANCE + $c8 + cp OPP_LANCE jr nz, .normalTrainerBattle ld a, MUSIC_GYM_LEADER_BATTLE ; lance also plays gym leader theme jr .playSong diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 7df95bb5..0f6be1e8 100755 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -1,50 +1,55 @@ -; sometimes it's necessary to add $C8 to these values +trainer_const: MACRO +\1 EQU const_value +OPP_\1 EQU const_value + 200 +const_value = const_value + 1 +ENDM + const_value = 1 - const YOUNGSTER ; $01 - const BUG_CATCHER ; $02 - const LASS ; $03 - const SAILOR ; $04 - const JR__TRAINER_M ; $05 - const JR__TRAINER_F ; $06 - const POKEMANIAC ; $07 - const SUPER_NERD ; $08 - const HIKER ; $09 - const BIKER ; $0A - const BURGLAR ; $0B - const ENGINEER ; $0C - const JUGGLER_X ; $0D - const FISHER ; $0E - const SWIMMER ; $0F - const CUE_BALL ; $10 - const GAMBLER ; $11 - const BEAUTY ; $12 - const PSYCHIC_TR ; $13 - const ROCKER ; $14 - const JUGGLER ; $15 - const TAMER ; $16 - const BIRD_KEEPER ; $17 - const BLACKBELT ; $18 - const SONY1 ; $19 - const PROF_OAK ; $1A - const CHIEF ; $1B - const SCIENTIST ; $1C - const GIOVANNI ; $1D - const ROCKET ; $1E - const COOLTRAINER_M ; $1F - const COOLTRAINER_F ; $20 - const BRUNO ; $21 - const BROCK ; $22 - const MISTY ; $23 - const LT__SURGE ; $24 - const ERIKA ; $25 - const KOGA ; $26 - const BLAINE ; $27 - const SABRINA ; $28 - const GENTLEMAN ; $29 - const SONY2 ; $2A - const SONY3 ; $2B - const LORELEI ; $2C - const CHANNELER ; $2D - const AGATHA ; $2E - const LANCE ; $2F + trainer_const YOUNGSTER ; $01 + trainer_const BUG_CATCHER ; $02 + trainer_const LASS ; $03 + trainer_const SAILOR ; $04 + trainer_const JR__TRAINER_M ; $05 + trainer_const JR__TRAINER_F ; $06 + trainer_const POKEMANIAC ; $07 + trainer_const SUPER_NERD ; $08 + trainer_const HIKER ; $09 + trainer_const BIKER ; $0A + trainer_const BURGLAR ; $0B + trainer_const ENGINEER ; $0C + trainer_const JUGGLER_X ; $0D + trainer_const FISHER ; $0E + trainer_const SWIMMER ; $0F + trainer_const CUE_BALL ; $10 + trainer_const GAMBLER ; $11 + trainer_const BEAUTY ; $12 + trainer_const PSYCHIC_TR ; $13 + trainer_const ROCKER ; $14 + trainer_const JUGGLER ; $15 + trainer_const TAMER ; $16 + trainer_const BIRD_KEEPER ; $17 + trainer_const BLACKBELT ; $18 + trainer_const SONY1 ; $19 + trainer_const PROF_OAK ; $1A + trainer_const CHIEF ; $1B + trainer_const SCIENTIST ; $1C + trainer_const GIOVANNI ; $1D + trainer_const ROCKET ; $1E + trainer_const COOLTRAINER_M ; $1F + trainer_const COOLTRAINER_F ; $20 + trainer_const BRUNO ; $21 + trainer_const BROCK ; $22 + trainer_const MISTY ; $23 + trainer_const LT__SURGE ; $24 + trainer_const ERIKA ; $25 + trainer_const KOGA ; $26 + trainer_const BLAINE ; $27 + trainer_const SABRINA ; $28 + trainer_const GENTLEMAN ; $29 + trainer_const SONY2 ; $2A + trainer_const SONY3 ; $2B + trainer_const LORELEI ; $2C + trainer_const CHANNELER ; $2D + trainer_const AGATHA ; $2E + trainer_const LANCE ; $2F diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm index f755df83..e33172ae 100755 --- a/data/mapObjects/agatha.asm +++ b/data/mapObjects/agatha.asm @@ -10,7 +10,7 @@ AgathaObject: ; 0x76534 (size=44) db $0 ; signs db $1 ; objects - object SPRITE_AGATHA, $5, $2, STAY, DOWN, $1, AGATHA + $C8, $1 + object SPRITE_AGATHA, $5, $2, STAY, DOWN, $1, OPP_AGATHA, $1 ; warp-to EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $4 ; BRUNOS_ROOM diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index 805f3302..8d55461f 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -10,7 +10,7 @@ BrunoObject: ; 0x763d7 (size=44) db $0 ; signs db $1 ; objects - object SPRITE_BRUNO, $5, $2, STAY, DOWN, $1, BRUNO + $C8, $1 + object SPRITE_BRUNO, $5, $2, STAY, DOWN, $1, OPP_BRUNO, $1 ; warp-to EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $4 ; LORELEIS_ROOM diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index c0af5920..1169e1da 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/celadongamecorner.asm @@ -20,7 +20,7 @@ CeladonGameCornerObject: ; 0x48fa0 (size=99) object SPRITE_GAMBLER, $b, $f, STAY, RIGHT, $8 ; person object SPRITE_MART_GUY, $e, $b, STAY, LEFT, $9 ; person object SPRITE_GENTLEMAN, $11, $d, STAY, RIGHT, $a ; person - object SPRITE_ROCKET, $9, $5, STAY, UP, $b, ROCKET + $C8, $7 + object SPRITE_ROCKET, $9, $5, STAY, UP, $b, OPP_ROCKET, $7 ; warp-to EVENT_DISP GAME_CORNER_WIDTH, $11, $f diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index 795f7efa..f9c20c90 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/celadongym.asm @@ -8,14 +8,14 @@ CeladonGymObject: ; 0x48b30 (size=84) db $0 ; signs db $8 ; objects - object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, ERIKA + $C8, $1 - object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, LASS + $C8, $11 - object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, BEAUTY + $C8, $1 - object SPRITE_LASS, $9, $5, STAY, DOWN, $4, JR__TRAINER_F + $C8, $b - object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, BEAUTY + $C8, $2 - object SPRITE_LASS, $6, $3, STAY, DOWN, $6, LASS + $C8, $12 - object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, BEAUTY + $C8, $3 - object SPRITE_LASS, $5, $3, STAY, DOWN, $8, COOLTRAINER_F + $C8, $1 + object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, OPP_ERIKA, $1 + object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, OPP_LASS, $11 + object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, OPP_BEAUTY, $1 + object SPRITE_LASS, $9, $5, STAY, DOWN, $4, OPP_JR__TRAINER_F, $b + object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, OPP_BEAUTY, $2 + object SPRITE_LASS, $6, $3, STAY, DOWN, $6, OPP_LASS, $12 + object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, OPP_BEAUTY, $3 + object SPRITE_LASS, $5, $3, STAY, DOWN, $8, OPP_COOLTRAINER_F, $1 ; warp-to EVENT_DISP CELADON_GYM_WIDTH, $11, $4 diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index 0be79c17..8c429695 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -23,7 +23,7 @@ CeruleanCityObject: ; 0x18786 (size=170) db $b ; objects object SPRITE_BLUE, $14, $2, STAY, DOWN, $1 ; person - object SPRITE_ROCKET, $1e, $8, STAY, NONE, $2, ROCKET + $C8, $5 + object SPRITE_ROCKET, $1e, $8, STAY, NONE, $2, OPP_ROCKET, $5 object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, STAY, DOWN, $3 ; person object SPRITE_BLACK_HAIR_BOY_2, $f, $12, WALK, $1, $4 ; person object SPRITE_BLACK_HAIR_BOY_2, $9, $15, WALK, $2, $5 ; person diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index 23d06d53..d87c9c20 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/ceruleangym.asm @@ -8,9 +8,9 @@ CeruleanGymObject: ; 0x5c834 (size=50) db $0 ; signs db $4 ; objects - object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, MISTY + $C8, $1 - object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, JR__TRAINER_F + $C8, $1 - object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, SWIMMER + $C8, $1 + object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, OPP_MISTY, $1 + object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, OPP_JR__TRAINER_F, $1 + object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, OPP_SWIMMER, $1 object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $4 ; person ; warp-to diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index 21afcbdf..d9b69192 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -8,14 +8,14 @@ CinnabarGymObject: ; 0x75acc (size=90) db $0 ; signs db $9 ; objects - object SPRITE_FAT_BALD_GUY, $3, $3, STAY, DOWN, $1, BLAINE + $C8, $1 - object SPRITE_BLACK_HAIR_BOY_2, $11, $2, STAY, DOWN, $2, SUPER_NERD + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $11, $8, STAY, DOWN, $3, BURGLAR + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_2, $b, $4, STAY, DOWN, $4, SUPER_NERD + $C8, $a - object SPRITE_BLACK_HAIR_BOY_2, $b, $8, STAY, DOWN, $5, BURGLAR + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_2, $b, $e, STAY, DOWN, $6, SUPER_NERD + $C8, $b - object SPRITE_BLACK_HAIR_BOY_2, $3, $e, STAY, DOWN, $7, BURGLAR + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, DOWN, $8, SUPER_NERD + $C8, $c + object SPRITE_FAT_BALD_GUY, $3, $3, STAY, DOWN, $1, OPP_BLAINE, $1 + object SPRITE_BLACK_HAIR_BOY_2, $11, $2, STAY, DOWN, $2, OPP_SUPER_NERD, $9 + object SPRITE_BLACK_HAIR_BOY_2, $11, $8, STAY, DOWN, $3, OPP_BURGLAR, $4 + object SPRITE_BLACK_HAIR_BOY_2, $b, $4, STAY, DOWN, $4, OPP_SUPER_NERD, $a + object SPRITE_BLACK_HAIR_BOY_2, $b, $8, STAY, DOWN, $5, OPP_BURGLAR, $5 + object SPRITE_BLACK_HAIR_BOY_2, $b, $e, STAY, DOWN, $6, OPP_SUPER_NERD, $b + object SPRITE_BLACK_HAIR_BOY_2, $3, $e, STAY, DOWN, $7, OPP_BURGLAR, $6 + object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, DOWN, $8, OPP_SUPER_NERD, $c object SPRITE_GYM_HELPER, $10, $d, STAY, DOWN, $9 ; person ; warp-to diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm index 042791e1..aa9c0bd7 100755 --- a/data/mapObjects/fightingdojo.asm +++ b/data/mapObjects/fightingdojo.asm @@ -8,11 +8,11 @@ FightingDojoObject: ; 0x5cf9b (size=72) db $0 ; signs db $7 ; objects - object SPRITE_HIKER, $5, $3, STAY, DOWN, $1, BLACKBELT + $C8, $1 - object SPRITE_HIKER, $3, $4, STAY, RIGHT, $2, BLACKBELT + $C8, $2 - object SPRITE_HIKER, $3, $6, STAY, RIGHT, $3, BLACKBELT + $C8, $3 - object SPRITE_HIKER, $5, $5, STAY, LEFT, $4, BLACKBELT + $C8, $4 - object SPRITE_HIKER, $5, $7, STAY, LEFT, $5, BLACKBELT + $C8, $5 + object SPRITE_HIKER, $5, $3, STAY, DOWN, $1, OPP_BLACKBELT, $1 + object SPRITE_HIKER, $3, $4, STAY, RIGHT, $2, OPP_BLACKBELT, $2 + object SPRITE_HIKER, $3, $6, STAY, RIGHT, $3, OPP_BLACKBELT, $3 + object SPRITE_HIKER, $5, $5, STAY, LEFT, $4, OPP_BLACKBELT, $4 + object SPRITE_HIKER, $5, $7, STAY, LEFT, $5, OPP_BLACKBELT, $5 object SPRITE_BALL, $4, $1, STAY, NONE, $6 ; person object SPRITE_BALL, $5, $1, STAY, NONE, $7 ; person diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index 1d082f62..ded17031 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/fuchsiagym.asm @@ -8,13 +8,13 @@ FuchsiaGymObject: ; 0x75658 (size=82) db $0 ; signs db $8 ; objects - object SPRITE_BLACKBELT, $4, $a, STAY, DOWN, $1, KOGA + $C8, $1 - object SPRITE_ROCKER, $8, $d, STAY, DOWN, $2, JUGGLER + $C8, $7 - object SPRITE_ROCKER, $7, $8, STAY, RIGHT, $3, JUGGLER + $C8, $3 - object SPRITE_ROCKER, $1, $c, STAY, DOWN, $4, JUGGLER + $C8, $8 - object SPRITE_ROCKER, $3, $5, STAY, UP, $5, TAMER + $C8, $1 - object SPRITE_ROCKER, $8, $2, STAY, DOWN, $6, TAMER + $C8, $2 - object SPRITE_ROCKER, $2, $7, STAY, LEFT, $7, JUGGLER + $C8, $4 + object SPRITE_BLACKBELT, $4, $a, STAY, DOWN, $1, OPP_KOGA, $1 + object SPRITE_ROCKER, $8, $d, STAY, DOWN, $2, OPP_JUGGLER, $7 + object SPRITE_ROCKER, $7, $8, STAY, RIGHT, $3, OPP_JUGGLER, $3 + object SPRITE_ROCKER, $1, $c, STAY, DOWN, $4, OPP_JUGGLER, $8 + object SPRITE_ROCKER, $3, $5, STAY, UP, $5, OPP_TAMER, $1 + object SPRITE_ROCKER, $8, $2, STAY, DOWN, $6, OPP_TAMER, $2 + object SPRITE_ROCKER, $2, $7, STAY, LEFT, $7, OPP_JUGGLER, $4 object SPRITE_GYM_HELPER, $7, $f, STAY, DOWN, $8 ; person ; warp-to diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index 42a3e83b..cdfbc7a6 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -9,7 +9,7 @@ LanceObject: ; 0x5a3c5 (size=36) db $0 ; signs db $1 ; objects - object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, LANCE + $C8, $1 + object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, OPP_LANCE, $1 ; warp-to EVENT_DISP LANCES_ROOM_WIDTH, $10, $18 ; AGATHAS_ROOM diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index dc318326..4ce080f7 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/lorelei.asm @@ -10,7 +10,7 @@ LoreleiObject: ; 0x76280 (size=44) db $0 ; signs db $1 ; objects - object SPRITE_LORELEI, $5, $2, STAY, DOWN, $1, LORELEI + $C8, $1 + object SPRITE_LORELEI, $5, $2, STAY, DOWN, $1, OPP_LORELEI, $1 ; warp-to EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $4 ; INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index 30b79433..0bb168bb 100755 --- a/data/mapObjects/mansion1.asm +++ b/data/mapObjects/mansion1.asm @@ -14,7 +14,7 @@ Mansion1Object: ; 0x443a4 (size=90) db $0 ; signs db $3 ; objects - object SPRITE_OAK_AIDE, $11, $11, STAY, LEFT, $1, SCIENTIST + $C8, $4 + object SPRITE_OAK_AIDE, $11, $11, STAY, LEFT, $1, OPP_SCIENTIST, $4 object SPRITE_BALL, $e, $3, STAY, NONE, $2, ESCAPE_ROPE object SPRITE_BALL, $12, $15, STAY, NONE, $3, CARBOS diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index b9a7b551..2cb45879 100755 --- a/data/mapObjects/mansion2.asm +++ b/data/mapObjects/mansion2.asm @@ -10,7 +10,7 @@ Mansion2Object: ; 0x520d1 (size=63) db $0 ; signs db $4 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $3, $11, WALK, $2, $1, BURGLAR + $C8, $7 + object SPRITE_BLACK_HAIR_BOY_2, $3, $11, WALK, $2, $1, OPP_BURGLAR, $7 object SPRITE_BALL, $1c, $7, STAY, NONE, $2, CALCIUM object SPRITE_BOOK_MAP_DEX, $12, $2, STAY, NONE, $3 ; person object SPRITE_BOOK_MAP_DEX, $3, $16, STAY, NONE, $4 ; person diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm index 52b46327..288b4753 100755 --- a/data/mapObjects/mansion3.asm +++ b/data/mapObjects/mansion3.asm @@ -9,8 +9,8 @@ Mansion3Object: ; 0x522e6 (size=64) db $0 ; signs db $5 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $5, $b, WALK, $2, $1, BURGLAR + $C8, $8 - object SPRITE_OAK_AIDE, $14, $b, STAY, LEFT, $2, SCIENTIST + $C8, $c + object SPRITE_BLACK_HAIR_BOY_2, $5, $b, WALK, $2, $1, OPP_BURGLAR, $8 + object SPRITE_OAK_AIDE, $14, $b, STAY, LEFT, $2, OPP_SCIENTIST, $c object SPRITE_BALL, $1, $10, STAY, NONE, $3, MAX_POTION object SPRITE_BALL, $19, $5, STAY, NONE, $4, IRON object SPRITE_BOOK_MAP_DEX, $6, $c, STAY, NONE, $5 ; person diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index 6d5cac47..eddbda8e 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/mansion4.asm @@ -7,8 +7,8 @@ Mansion4Object: ; 0x52498 (size=69) db $0 ; signs db $8 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $10, $17, STAY, NONE, $1, BURGLAR + $C8, $9 - object SPRITE_OAK_AIDE, $1b, $b, STAY, DOWN, $2, SCIENTIST + $C8, $d + object SPRITE_BLACK_HAIR_BOY_2, $10, $17, STAY, NONE, $1, OPP_BURGLAR, $9 + object SPRITE_OAK_AIDE, $1b, $b, STAY, DOWN, $2, OPP_SCIENTIST, $d object SPRITE_BALL, $a, $2, STAY, NONE, $3, RARE_CANDY object SPRITE_BALL, $1, $16, STAY, NONE, $4, FULL_RESTORE object SPRITE_BALL, $13, $19, STAY, NONE, $5, TM_14 diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm index 3c9bcc80..a59f2a20 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/mtmoon1.asm @@ -12,13 +12,13 @@ MtMoon1Object: ; 0x49b06 (size=145) db $17, $f, $e ; MtMoon1Text14 db $d ; objects - object SPRITE_HIKER, $5, $6, STAY, DOWN, $1, HIKER + $C8, $1 - object SPRITE_BUG_CATCHER, $c, $10, STAY, RIGHT, $2, YOUNGSTER + $C8, $3 - object SPRITE_LASS, $1e, $4, STAY, DOWN, $3, LASS + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, STAY, UP, $4, SUPER_NERD + $C8, $1 - object SPRITE_LASS, $10, $17, STAY, DOWN, $5, LASS + $C8, $6 - object SPRITE_BUG_CATCHER, $7, $16, STAY, DOWN, $6, BUG_CATCHER + $C8, $7 - object SPRITE_BUG_CATCHER, $1e, $1b, STAY, RIGHT, $7, BUG_CATCHER + $C8, $8 + object SPRITE_HIKER, $5, $6, STAY, DOWN, $1, OPP_HIKER, $1 + object SPRITE_BUG_CATCHER, $c, $10, STAY, RIGHT, $2, OPP_YOUNGSTER, $3 + object SPRITE_LASS, $1e, $4, STAY, DOWN, $3, OPP_LASS, $5 + object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, STAY, UP, $4, OPP_SUPER_NERD, $1 + object SPRITE_LASS, $10, $17, STAY, DOWN, $5, OPP_LASS, $6 + object SPRITE_BUG_CATCHER, $7, $16, STAY, DOWN, $6, OPP_BUG_CATCHER, $7 + object SPRITE_BUG_CATCHER, $1e, $1b, STAY, RIGHT, $7, OPP_BUG_CATCHER, $8 object SPRITE_BALL, $2, $14, STAY, NONE, $8, POTION object SPRITE_BALL, $2, $2, STAY, NONE, $9, MOON_STONE object SPRITE_BALL, $23, $1f, STAY, NONE, $a, RARE_CANDY diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index 3bcfe40f..4f8f911c 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -10,11 +10,11 @@ MtMoon3Object: ; 0x49fdb (size=102) db $0 ; signs db $9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, SUPER_NERD + $C8, $2 - object SPRITE_ROCKET, $b, $10, STAY, DOWN, $2, ROCKET + $C8, $1 - object SPRITE_ROCKET, $f, $16, STAY, DOWN, $3, ROCKET + $C8, $2 - object SPRITE_ROCKET, $1d, $b, STAY, UP, $4, ROCKET + $C8, $3 - object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, ROCKET + $C8, $4 + object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, OPP_SUPER_NERD, $2 + object SPRITE_ROCKET, $b, $10, STAY, DOWN, $2, OPP_ROCKET, $1 + object SPRITE_ROCKET, $f, $16, STAY, DOWN, $3, OPP_ROCKET, $2 + object SPRITE_ROCKET, $1d, $b, STAY, UP, $4, OPP_ROCKET, $3 + object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, OPP_ROCKET, $4 object SPRITE_OMANYTE, $c, $6, STAY, NONE, $6 ; person object SPRITE_OMANYTE, $d, $6, STAY, NONE, $7 ; person object SPRITE_BALL, $19, $15, STAY, NONE, $8, HP_UP diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index 0cfe9328..53d6b85b 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -8,7 +8,7 @@ OaksLabObject: ; 0x1d40a (size=88) db $0 ; signs db $b ; objects - object SPRITE_BLUE, $4, $3, STAY, NONE, $1, SONY1 + $C8, $1 + object SPRITE_BLUE, $4, $3, STAY, NONE, $1, OPP_SONY1, $1 object SPRITE_BALL, $6, $3, STAY, NONE, $2 ; person object SPRITE_BALL, $7, $3, STAY, NONE, $3 ; person object SPRITE_BALL, $8, $3, STAY, NONE, $4 ; person diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index 13909781..69196193 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/pewtergym.asm @@ -8,8 +8,8 @@ PewterGymObject: ; 0x5c52e (size=42) db $0 ; signs db $3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, BROCK + $C8, $1 - object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, JR__TRAINER_M + $C8, $1 + object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, OPP_BROCK, $1 + object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR__TRAINER_M, $1 object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person ; warp-to diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm index a3580e23..4591cbe3 100755 --- a/data/mapObjects/pokemontower3.asm +++ b/data/mapObjects/pokemontower3.asm @@ -8,9 +8,9 @@ PokemonTower3Object: ; 0x6075d (size=51) db $0 ; signs db $4 ; objects - object SPRITE_MEDIUM, $c, $3, STAY, LEFT, $1, CHANNELER + $C8, $5 - object SPRITE_MEDIUM, $9, $8, STAY, DOWN, $2, CHANNELER + $C8, $6 - object SPRITE_MEDIUM, $a, $d, STAY, DOWN, $3, CHANNELER + $C8, $8 + object SPRITE_MEDIUM, $c, $3, STAY, LEFT, $1, OPP_CHANNELER, $5 + object SPRITE_MEDIUM, $9, $8, STAY, DOWN, $2, OPP_CHANNELER, $6 + object SPRITE_MEDIUM, $a, $d, STAY, DOWN, $3, OPP_CHANNELER, $8 object SPRITE_BALL, $c, $1, STAY, NONE, $4, ESCAPE_ROPE ; warp-to diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm index de95d1b0..722f6e08 100755 --- a/data/mapObjects/pokemontower4.asm +++ b/data/mapObjects/pokemontower4.asm @@ -8,9 +8,9 @@ PokemonTower4Object: ; 0x6088b (size=65) db $0 ; signs db $6 ; objects - object SPRITE_MEDIUM, $5, $a, STAY, RIGHT, $1, CHANNELER + $C8, $9 - object SPRITE_MEDIUM, $f, $7, STAY, DOWN, $2, CHANNELER + $C8, $a - object SPRITE_MEDIUM, $e, $c, STAY, LEFT, $3, CHANNELER + $C8, $c + object SPRITE_MEDIUM, $5, $a, STAY, RIGHT, $1, OPP_CHANNELER, $9 + object SPRITE_MEDIUM, $f, $7, STAY, DOWN, $2, OPP_CHANNELER, $a + object SPRITE_MEDIUM, $e, $c, STAY, LEFT, $3, OPP_CHANNELER, $c object SPRITE_BALL, $c, $a, STAY, NONE, $4, ELIXER object SPRITE_BALL, $9, $a, STAY, NONE, $5, AWAKENING object SPRITE_BALL, $c, $10, STAY, NONE, $6, HP_UP diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm index bb3f1882..1d23abbf 100755 --- a/data/mapObjects/pokemontower5.asm +++ b/data/mapObjects/pokemontower5.asm @@ -9,10 +9,10 @@ PokemonTower5Object: ; 0x60a48 (size=65) db $6 ; objects object SPRITE_MEDIUM, $c, $8, STAY, NONE, $1 ; person - object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $2, CHANNELER + $C8, $e - object SPRITE_MEDIUM, $e, $3, STAY, LEFT, $3, CHANNELER + $C8, $10 - object SPRITE_MEDIUM, $6, $a, STAY, RIGHT, $4, CHANNELER + $C8, $11 - object SPRITE_MEDIUM, $9, $10, STAY, RIGHT, $5, CHANNELER + $C8, $12 + object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $2, OPP_CHANNELER, $e + object SPRITE_MEDIUM, $e, $3, STAY, LEFT, $3, OPP_CHANNELER, $10 + object SPRITE_MEDIUM, $6, $a, STAY, RIGHT, $4, OPP_CHANNELER, $11 + object SPRITE_MEDIUM, $9, $10, STAY, RIGHT, $5, OPP_CHANNELER, $12 object SPRITE_BALL, $6, $e, STAY, NONE, $6, NUGGET ; warp-to diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index 56dcc404..cd7453d8 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/pokemontower6.asm @@ -8,9 +8,9 @@ PokemonTower6Object: ; 0x60c5b (size=58) db $0 ; signs db $5 ; objects - object SPRITE_MEDIUM, $c, $a, STAY, RIGHT, $1, CHANNELER + $C8, $13 - object SPRITE_MEDIUM, $9, $5, STAY, DOWN, $2, CHANNELER + $C8, $14 - object SPRITE_MEDIUM, $10, $5, STAY, LEFT, $3, CHANNELER + $C8, $15 + object SPRITE_MEDIUM, $c, $a, STAY, RIGHT, $1, OPP_CHANNELER, $13 + object SPRITE_MEDIUM, $9, $5, STAY, DOWN, $2, OPP_CHANNELER, $14 + object SPRITE_MEDIUM, $10, $5, STAY, LEFT, $3, OPP_CHANNELER, $15 object SPRITE_BALL, $6, $8, STAY, NONE, $4, RARE_CANDY object SPRITE_BALL, $e, $e, STAY, NONE, $5, X_ACCURACY diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index 270f3aa7..fd1fc884 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -13,9 +13,9 @@ IF DEF(_YELLOW) object SPRITE_MR_FUJI, $a, 3, STAY, DOWN, 3 ELSE db $4 ; objects - object SPRITE_ROCKET, $9, $b, STAY, RIGHT, $1, ROCKET + $C8, $13 - object SPRITE_ROCKET, $c, $9, STAY, LEFT, $2, ROCKET + $C8, $14 - object SPRITE_ROCKET, $9, $7, STAY, RIGHT, $3, ROCKET + $C8, $15 + object SPRITE_ROCKET, $9, $b, STAY, RIGHT, $1, OPP_ROCKET, $13 + object SPRITE_ROCKET, $c, $9, STAY, LEFT, $2, OPP_ROCKET, $14 + object SPRITE_ROCKET, $9, $7, STAY, RIGHT, $3, OPP_ROCKET, $15 object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $4 ; person ENDC diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm index a1a87350..55c0c101 100755 --- a/data/mapObjects/rockethideout1.asm +++ b/data/mapObjects/rockethideout1.asm @@ -11,11 +11,11 @@ RocketHideout1Object: ; 0x44ce7 (size=98) db $0 ; signs db $7 ; objects - object SPRITE_ROCKET, $1a, $8, STAY, LEFT, $1, ROCKET + $C8, $8 - object SPRITE_ROCKET, $c, $6, STAY, RIGHT, $2, ROCKET + $C8, $9 - object SPRITE_ROCKET, $12, $11, STAY, DOWN, $3, ROCKET + $C8, $a - object SPRITE_ROCKET, $f, $19, STAY, RIGHT, $4, ROCKET + $C8, $b - object SPRITE_ROCKET, $1c, $12, STAY, LEFT, $5, ROCKET + $C8, $c + object SPRITE_ROCKET, $1a, $8, STAY, LEFT, $1, OPP_ROCKET, $8 + object SPRITE_ROCKET, $c, $6, STAY, RIGHT, $2, OPP_ROCKET, $9 + object SPRITE_ROCKET, $12, $11, STAY, DOWN, $3, OPP_ROCKET, $a + object SPRITE_ROCKET, $f, $19, STAY, RIGHT, $4, OPP_ROCKET, $b + object SPRITE_ROCKET, $1c, $12, STAY, LEFT, $5, OPP_ROCKET, $c object SPRITE_BALL, $b, $e, STAY, NONE, $6, ESCAPE_ROPE object SPRITE_BALL, $9, $11, STAY, NONE, $7, HYPER_POTION diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm index 40e19895..b14dc0e6 100755 --- a/data/mapObjects/rockethideout2.asm +++ b/data/mapObjects/rockethideout2.asm @@ -11,7 +11,7 @@ RocketHideout2Object: ; 0x450f7 (size=80) db $0 ; signs db $5 ; objects - object SPRITE_ROCKET, $14, $c, STAY, DOWN, $1, ROCKET + $C8, $d + object SPRITE_ROCKET, $14, $c, STAY, DOWN, $1, OPP_ROCKET, $d object SPRITE_BALL, $1, $b, STAY, NONE, $2, MOON_STONE object SPRITE_BALL, $10, $8, STAY, NONE, $3, NUGGET object SPRITE_BALL, $6, $c, STAY, NONE, $4, TM_07 diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index 3001be76..d7933ddf 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/rockethideout3.asm @@ -8,8 +8,8 @@ RocketHideout3Object: ; 0x4534d (size=50) db $0 ; signs db $4 ; objects - object SPRITE_ROCKET, $a, $16, STAY, RIGHT, $1, ROCKET + $C8, $e - object SPRITE_ROCKET, $1a, $c, STAY, UP, $2, ROCKET + $C8, $f + object SPRITE_ROCKET, $a, $16, STAY, RIGHT, $1, OPP_ROCKET, $e + object SPRITE_ROCKET, $1a, $c, STAY, UP, $2, OPP_ROCKET, $f object SPRITE_BALL, $1a, $11, STAY, NONE, $3, TM_10 object SPRITE_BALL, $14, $e, STAY, NONE, $4, RARE_CANDY diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index e11133fd..5441f9cd 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -9,10 +9,10 @@ RocketHideout4Object: ; 0x455f1 (size=95) db $0 ; signs db $9 ; objects - object SPRITE_GIOVANNI, $19, $3, STAY, DOWN, $1, GIOVANNI + $C8, $1 - object SPRITE_ROCKET, $17, $c, STAY, DOWN, $2, ROCKET + $C8, $10 - object SPRITE_ROCKET, $1a, $c, STAY, DOWN, $3, ROCKET + $C8, $11 - object SPRITE_ROCKET, $b, $2, STAY, DOWN, $4, ROCKET + $C8, $12 + object SPRITE_GIOVANNI, $19, $3, STAY, DOWN, $1, OPP_GIOVANNI, $1 + object SPRITE_ROCKET, $17, $c, STAY, DOWN, $2, OPP_ROCKET, $10 + object SPRITE_ROCKET, $1a, $c, STAY, DOWN, $3, OPP_ROCKET, $11 + object SPRITE_ROCKET, $b, $2, STAY, DOWN, $4, OPP_ROCKET, $12 object SPRITE_BALL, $a, $c, STAY, NONE, $5, HP_UP object SPRITE_BALL, $9, $4, STAY, NONE, $6, TM_02 object SPRITE_BALL, $c, $14, STAY, NONE, $7, IRON diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index 348e9e50..b4001df9 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/rocktunnel1.asm @@ -15,13 +15,13 @@ RockTunnel1Object: ; 0x445f6 (size=127) db $1d, $b, $8 ; RockTunnel1Text8 db $7 ; objects - object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, HIKER + $C8, $c - object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, HIKER + $C8, $d - object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, HIKER + $C8, $e - object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, POKEMANIAC + $C8, $7 - object SPRITE_LASS, $25, $15, STAY, LEFT, $5, JR__TRAINER_F + $C8, $11 - object SPRITE_LASS, $16, $18, STAY, DOWN, $6, JR__TRAINER_F + $C8, $12 - object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, JR__TRAINER_F + $C8, $13 + object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, OPP_HIKER, $c + object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, OPP_HIKER, $d + object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, OPP_HIKER, $e + object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, OPP_POKEMANIAC, $7 + object SPRITE_LASS, $25, $15, STAY, LEFT, $5, OPP_JR__TRAINER_F, $11 + object SPRITE_LASS, $16, $18, STAY, DOWN, $6, OPP_JR__TRAINER_F, $12 + object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR__TRAINER_F, $13 ; warp-to EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index 7da2c3d1..dfc36cac 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -10,14 +10,14 @@ RockTunnel2Object: ; 0x4613d (size=100) db $0 ; signs db $8 ; objects - object SPRITE_LASS, $b, $d, STAY, DOWN, $1, JR__TRAINER_F + $C8, $9 - object SPRITE_HIKER, $6, $a, STAY, DOWN, $2, HIKER + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, DOWN, $3, POKEMANIAC + $C8, $3 - object SPRITE_BLACK_HAIR_BOY_2, $14, $15, STAY, RIGHT, $4, POKEMANIAC + $C8, $4 - object SPRITE_HIKER, $1e, $a, STAY, DOWN, $5, HIKER + $C8, $a - object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, JR__TRAINER_F + $C8, $a - object SPRITE_HIKER, $21, $5, STAY, RIGHT, $7, HIKER + $C8, $b - object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, POKEMANIAC + $C8, $5 + object SPRITE_LASS, $b, $d, STAY, DOWN, $1, OPP_JR__TRAINER_F, $9 + object SPRITE_HIKER, $6, $a, STAY, DOWN, $2, OPP_HIKER, $9 + object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, DOWN, $3, OPP_POKEMANIAC, $3 + object SPRITE_BLACK_HAIR_BOY_2, $14, $15, STAY, RIGHT, $4, OPP_POKEMANIAC, $4 + object SPRITE_HIKER, $1e, $a, STAY, DOWN, $5, OPP_HIKER, $a + object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, OPP_JR__TRAINER_F, $a + object SPRITE_HIKER, $21, $5, STAY, RIGHT, $7, OPP_HIKER, $b + object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, OPP_POKEMANIAC, $5 ; warp-to EVENT_DISP ROCK_TUNNEL_2_WIDTH, $19, $21 ; ROCK_TUNNEL_1 diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm index b9b0cd25..e324a348 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/route10.asm @@ -14,12 +14,12 @@ Route10Object: ; 0x582f6 (size=96) db $29, $5, $a ; Route10Text10 db $6 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, POKEMANIAC + $C8, $1 - object SPRITE_HIKER, $3, $39, STAY, UP, $2, HIKER + $C8, $7 - object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, POKEMANIAC + $C8, $2 - object SPRITE_LASS, $7, $19, STAY, LEFT, $4, JR__TRAINER_F + $C8, $7 - object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, HIKER + $C8, $8 - object SPRITE_LASS, $7, $36, STAY, DOWN, $6, JR__TRAINER_F + $C8, $8 + object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, OPP_POKEMANIAC, $1 + object SPRITE_HIKER, $3, $39, STAY, UP, $2, OPP_HIKER, $7 + object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, OPP_POKEMANIAC, $2 + object SPRITE_LASS, $7, $19, STAY, LEFT, $4, OPP_JR__TRAINER_F, $7 + object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, OPP_HIKER, $8 + object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR__TRAINER_F, $8 ; warp-to EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index ccbd1af2..4e196b20 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -12,16 +12,16 @@ Route11Object: ; 0x584e0 (size=127) db $5, $1, $b ; Route11Text11 db $a ; objects - object SPRITE_GAMBLER, $a, $e, STAY, DOWN, $1, GAMBLER + $C8, $1 - object SPRITE_GAMBLER, $1a, $9, STAY, DOWN, $2, GAMBLER + $C8, $2 - object SPRITE_BUG_CATCHER, $d, $5, STAY, LEFT, $3, YOUNGSTER + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $24, $b, STAY, DOWN, $4, ENGINEER + $C8, $2 - object SPRITE_BUG_CATCHER, $16, $4, STAY, UP, $5, YOUNGSTER + $C8, $a - object SPRITE_GAMBLER, $2d, $7, STAY, DOWN, $6, GAMBLER + $C8, $3 - object SPRITE_GAMBLER, $21, $3, STAY, UP, $7, GAMBLER + $C8, $4 - object SPRITE_BUG_CATCHER, $2b, $5, STAY, RIGHT, $8, YOUNGSTER + $C8, $b - object SPRITE_BLACK_HAIR_BOY_2, $2d, $10, STAY, LEFT, $9, ENGINEER + $C8, $3 - object SPRITE_BUG_CATCHER, $16, $c, STAY, UP, $a, YOUNGSTER + $C8, $c + object SPRITE_GAMBLER, $a, $e, STAY, DOWN, $1, OPP_GAMBLER, $1 + object SPRITE_GAMBLER, $1a, $9, STAY, DOWN, $2, OPP_GAMBLER, $2 + object SPRITE_BUG_CATCHER, $d, $5, STAY, LEFT, $3, OPP_YOUNGSTER, $9 + object SPRITE_BLACK_HAIR_BOY_2, $24, $b, STAY, DOWN, $4, OPP_ENGINEER, $2 + object SPRITE_BUG_CATCHER, $16, $4, STAY, UP, $5, OPP_YOUNGSTER, $a + object SPRITE_GAMBLER, $2d, $7, STAY, DOWN, $6, OPP_GAMBLER, $3 + object SPRITE_GAMBLER, $21, $3, STAY, UP, $7, OPP_GAMBLER, $4 + object SPRITE_BUG_CATCHER, $2b, $5, STAY, RIGHT, $8, OPP_YOUNGSTER, $b + object SPRITE_BLACK_HAIR_BOY_2, $2d, $10, STAY, LEFT, $9, OPP_ENGINEER, $3 + object SPRITE_BUG_CATCHER, $16, $c, STAY, UP, $a, OPP_YOUNGSTER, $c ; warp-to EVENT_DISP ROUTE_11_WIDTH, $8, $31 ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index 82c36313..0d0ef1c0 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -13,13 +13,13 @@ Route12Object: ; 0x5869a (size=118) db $a ; objects object SPRITE_SNORLAX, $a, $3e, STAY, DOWN, $1 ; person - object SPRITE_FISHER2, $e, $1f, STAY, LEFT, $2, FISHER + $C8, $3 - object SPRITE_FISHER2, $5, $27, STAY, UP, $3, FISHER + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, JR__TRAINER_M + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, STAY, UP, $5, ROCKER + $C8, $2 - object SPRITE_FISHER2, $c, $28, STAY, LEFT, $6, FISHER + $C8, $5 - object SPRITE_FISHER2, $9, $34, STAY, RIGHT, $7, FISHER + $C8, $6 - object SPRITE_FISHER2, $6, $57, STAY, DOWN, $8, FISHER + $C8, $b + object SPRITE_FISHER2, $e, $1f, STAY, LEFT, $2, OPP_FISHER, $3 + object SPRITE_FISHER2, $5, $27, STAY, UP, $3, OPP_FISHER, $4 + object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, OPP_JR__TRAINER_M, $9 + object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, STAY, UP, $5, OPP_ROCKER, $2 + object SPRITE_FISHER2, $c, $28, STAY, LEFT, $6, OPP_FISHER, $5 + object SPRITE_FISHER2, $9, $34, STAY, RIGHT, $7, OPP_FISHER, $6 + object SPRITE_FISHER2, $6, $57, STAY, DOWN, $8, OPP_FISHER, $b object SPRITE_BALL, $e, $23, STAY, NONE, $9, TM_16 object SPRITE_BALL, $5, $59, STAY, NONE, $a, IRON diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm index 3b2c6b87..1512ce3a 100755 --- a/data/mapObjects/route13.asm +++ b/data/mapObjects/route13.asm @@ -9,13 +9,13 @@ Route13Object: ; 0x5482e (size=93) db $b, $1f, $d ; Route13Text13 db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, BIRD_KEEPER + $C8, $1 - object SPRITE_LASS, $30, $a, STAY, DOWN, $2, JR__TRAINER_F + $C8, $c - object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, JR__TRAINER_F + $C8, $d - object SPRITE_LASS, $17, $a, STAY, LEFT, $4, JR__TRAINER_F + $C8, $e - object SPRITE_LASS, $32, $5, STAY, DOWN, $5, JR__TRAINER_F + $C8, $f - object SPRITE_BLACK_HAIR_BOY_1, $c, $4, STAY, RIGHT, $6, BIRD_KEEPER + $C8, $2 - object SPRITE_FOULARD_WOMAN, $21, $6, STAY, DOWN, $7, BEAUTY + $C8, $4 - object SPRITE_FOULARD_WOMAN, $20, $6, STAY, DOWN, $8, BEAUTY + $C8, $5 - object SPRITE_BIKER, $a, $7, STAY, UP, $9, BIKER + $C8, $1 - object SPRITE_BLACK_HAIR_BOY_1, $7, $d, STAY, UP, $a, BIRD_KEEPER + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $1 + object SPRITE_LASS, $30, $a, STAY, DOWN, $2, OPP_JR__TRAINER_F, $c + object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, OPP_JR__TRAINER_F, $d + object SPRITE_LASS, $17, $a, STAY, LEFT, $4, OPP_JR__TRAINER_F, $e + object SPRITE_LASS, $32, $5, STAY, DOWN, $5, OPP_JR__TRAINER_F, $f + object SPRITE_BLACK_HAIR_BOY_1, $c, $4, STAY, RIGHT, $6, OPP_BIRD_KEEPER, $2 + object SPRITE_FOULARD_WOMAN, $21, $6, STAY, DOWN, $7, OPP_BEAUTY, $4 + object SPRITE_FOULARD_WOMAN, $20, $6, STAY, DOWN, $8, OPP_BEAUTY, $5 + object SPRITE_BIKER, $a, $7, STAY, UP, $9, OPP_BIKER, $1 + object SPRITE_BLACK_HAIR_BOY_1, $7, $d, STAY, UP, $a, OPP_BIRD_KEEPER, $3 diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm index 6b8dcd40..ce6d52b0 100755 --- a/data/mapObjects/route14.asm +++ b/data/mapObjects/route14.asm @@ -7,13 +7,13 @@ Route14Object: ; 0x549bb (size=87) db $d, $11, $b ; Route14Text11 db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $4, $4, STAY, DOWN, $1, BIRD_KEEPER + $C8, $e - object SPRITE_BLACK_HAIR_BOY_1, $f, $6, STAY, DOWN, $2, BIRD_KEEPER + $C8, $f - object SPRITE_BLACK_HAIR_BOY_1, $c, $b, STAY, DOWN, $3, BIRD_KEEPER + $C8, $10 - object SPRITE_BLACK_HAIR_BOY_1, $e, $f, STAY, UP, $4, BIRD_KEEPER + $C8, $11 - object SPRITE_BLACK_HAIR_BOY_1, $f, $1f, STAY, LEFT, $5, BIRD_KEEPER + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_1, $6, $31, STAY, UP, $6, BIRD_KEEPER + $C8, $5 - object SPRITE_BIKER, $5, $27, STAY, DOWN, $7, BIKER + $C8, $d - object SPRITE_BIKER, $4, $1e, STAY, RIGHT, $8, BIKER + $C8, $e - object SPRITE_BIKER, $f, $1e, STAY, LEFT, $9, BIKER + $C8, $f - object SPRITE_BIKER, $4, $1f, STAY, RIGHT, $a, BIKER + $C8, $2 + object SPRITE_BLACK_HAIR_BOY_1, $4, $4, STAY, DOWN, $1, OPP_BIRD_KEEPER, $e + object SPRITE_BLACK_HAIR_BOY_1, $f, $6, STAY, DOWN, $2, OPP_BIRD_KEEPER, $f + object SPRITE_BLACK_HAIR_BOY_1, $c, $b, STAY, DOWN, $3, OPP_BIRD_KEEPER, $10 + object SPRITE_BLACK_HAIR_BOY_1, $e, $f, STAY, UP, $4, OPP_BIRD_KEEPER, $11 + object SPRITE_BLACK_HAIR_BOY_1, $f, $1f, STAY, LEFT, $5, OPP_BIRD_KEEPER, $4 + object SPRITE_BLACK_HAIR_BOY_1, $6, $31, STAY, UP, $6, OPP_BIRD_KEEPER, $5 + object SPRITE_BIKER, $5, $27, STAY, DOWN, $7, OPP_BIKER, $d + object SPRITE_BIKER, $4, $1e, STAY, RIGHT, $8, OPP_BIKER, $e + object SPRITE_BIKER, $f, $1e, STAY, LEFT, $9, OPP_BIKER, $f + object SPRITE_BIKER, $4, $1f, STAY, RIGHT, $a, OPP_BIKER, $2 diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index 32ec8d8a..95016038 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -11,16 +11,16 @@ Route15Object: ; 0x5894e (size=126) db $9, $27, $c ; Route15Text12 db $b ; objects - object SPRITE_LASS, $29, $b, STAY, DOWN, $1, JR__TRAINER_F + $C8, $14 - object SPRITE_LASS, $35, $a, STAY, LEFT, $2, JR__TRAINER_F + $C8, $15 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, BIRD_KEEPER + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, BIRD_KEEPER + $C8, $7 - object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, BEAUTY + $C8, $9 - object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, BEAUTY + $C8, $a - object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, BIKER + $C8, $3 - object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, BIKER + $C8, $4 - object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, JR__TRAINER_F + $C8, $16 - object SPRITE_LASS, $12, $d, STAY, UP, $a, JR__TRAINER_F + $C8, $17 + object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR__TRAINER_F, $14 + object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR__TRAINER_F, $15 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, OPP_BIRD_KEEPER, $6 + object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, OPP_BIRD_KEEPER, $7 + object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, OPP_BEAUTY, $9 + object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, OPP_BEAUTY, $a + object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, OPP_BIKER, $3 + object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, OPP_BIKER, $4 + object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR__TRAINER_F, $16 + object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR__TRAINER_F, $17 object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20 ; warp-to diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index 94adaf96..600dbbf1 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -17,12 +17,12 @@ Route16Object: ; 0x58afc (size=136) db $11, $5, $9 ; Route16Text9 db $7 ; objects - object SPRITE_BIKER, $11, $c, STAY, LEFT, $1, BIKER + $C8, $5 - object SPRITE_BIKER, $e, $d, STAY, RIGHT, $2, CUE_BALL + $C8, $1 - object SPRITE_BIKER, $b, $c, STAY, UP, $3, CUE_BALL + $C8, $2 - object SPRITE_BIKER, $9, $b, STAY, LEFT, $4, BIKER + $C8, $6 - object SPRITE_BIKER, $6, $a, STAY, RIGHT, $5, CUE_BALL + $C8, $3 - object SPRITE_BIKER, $3, $c, STAY, RIGHT, $6, BIKER + $C8, $7 + object SPRITE_BIKER, $11, $c, STAY, LEFT, $1, OPP_BIKER, $5 + object SPRITE_BIKER, $e, $d, STAY, RIGHT, $2, OPP_CUE_BALL, $1 + object SPRITE_BIKER, $b, $c, STAY, UP, $3, OPP_CUE_BALL, $2 + object SPRITE_BIKER, $9, $b, STAY, LEFT, $4, OPP_BIKER, $6 + object SPRITE_BIKER, $6, $a, STAY, RIGHT, $5, OPP_CUE_BALL, $3 + object SPRITE_BIKER, $3, $c, STAY, RIGHT, $6, OPP_BIKER, $7 object SPRITE_SNORLAX, $1a, $a, STAY, DOWN, $7 ; person ; warp-to diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm index b0f22cde..c496373e 100755 --- a/data/mapObjects/route17.asm +++ b/data/mapObjects/route17.asm @@ -12,13 +12,13 @@ Route17Object: ; 0x54b42 (size=102) db $8d, $9, $10 ; Route17Text16 db $a ; objects - object SPRITE_BIKER, $c, $13, STAY, LEFT, $1, CUE_BALL + $C8, $4 - object SPRITE_BIKER, $b, $10, STAY, RIGHT, $2, CUE_BALL + $C8, $5 - object SPRITE_BIKER, $4, $12, STAY, UP, $3, BIKER + $C8, $8 - object SPRITE_BIKER, $7, $20, STAY, LEFT, $4, BIKER + $C8, $9 - object SPRITE_BIKER, $e, $22, STAY, RIGHT, $5, BIKER + $C8, $a - object SPRITE_BIKER, $11, $3a, STAY, LEFT, $6, CUE_BALL + $C8, $6 - object SPRITE_BIKER, $2, $44, STAY, RIGHT, $7, CUE_BALL + $C8, $7 - object SPRITE_BIKER, $e, $62, STAY, RIGHT, $8, CUE_BALL + $C8, $8 - object SPRITE_BIKER, $5, $62, STAY, LEFT, $9, BIKER + $C8, $b - object SPRITE_BIKER, $a, $76, STAY, DOWN, $a, BIKER + $C8, $c + object SPRITE_BIKER, $c, $13, STAY, LEFT, $1, OPP_CUE_BALL, $4 + object SPRITE_BIKER, $b, $10, STAY, RIGHT, $2, OPP_CUE_BALL, $5 + object SPRITE_BIKER, $4, $12, STAY, UP, $3, OPP_BIKER, $8 + object SPRITE_BIKER, $7, $20, STAY, LEFT, $4, OPP_BIKER, $9 + object SPRITE_BIKER, $e, $22, STAY, RIGHT, $5, OPP_BIKER, $a + object SPRITE_BIKER, $11, $3a, STAY, LEFT, $6, OPP_CUE_BALL, $6 + object SPRITE_BIKER, $2, $44, STAY, RIGHT, $7, OPP_CUE_BALL, $7 + object SPRITE_BIKER, $e, $62, STAY, RIGHT, $8, OPP_CUE_BALL, $8 + object SPRITE_BIKER, $5, $62, STAY, LEFT, $9, OPP_BIKER, $b + object SPRITE_BIKER, $a, $76, STAY, DOWN, $a, OPP_BIKER, $c diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index 7fd24383..88547941 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -12,9 +12,9 @@ Route18Object: ; 0x58c5a (size=66) db $5, $21, $5 ; Route18Text5 db $3 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $24, $b, STAY, RIGHT, $1, BIRD_KEEPER + $C8, $8 - object SPRITE_BLACK_HAIR_BOY_1, $28, $f, STAY, LEFT, $2, BIRD_KEEPER + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, STAY, LEFT, $3, BIRD_KEEPER + $C8, $a + object SPRITE_BLACK_HAIR_BOY_1, $24, $b, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $8 + object SPRITE_BLACK_HAIR_BOY_1, $28, $f, STAY, LEFT, $2, OPP_BIRD_KEEPER, $9 + object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, STAY, LEFT, $3, OPP_BIRD_KEEPER, $a ; warp-to EVENT_DISP ROUTE_18_WIDTH, $8, $21 ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index f86a114a..ee55a069 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -17,24 +17,24 @@ ENDC db $a ; objects IF DEF(_OPTION_BEACH_HOUSE) - object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, SWIMMER + $C8, 2 - object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, SWIMMER + $C8, 3 + object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, OPP_SWIMMER, 2 + object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, OPP_SWIMMER, 3 ELSE - object SPRITE_BLACK_HAIR_BOY_1, $8, $7, STAY, LEFT, 1, SWIMMER + $C8, 2 - object SPRITE_BLACK_HAIR_BOY_1, $d, $7, STAY, LEFT, 2, SWIMMER + $C8, 3 + object SPRITE_BLACK_HAIR_BOY_1, $8, $7, STAY, LEFT, 1, OPP_SWIMMER, 2 + object SPRITE_BLACK_HAIR_BOY_1, $d, $7, STAY, LEFT, 2, OPP_SWIMMER, 3 ENDC - object SPRITE_SWIMMER, $d, $19, STAY, LEFT, $3, SWIMMER + $C8, $4 - object SPRITE_SWIMMER, $4, $1b, STAY, RIGHT, $4, SWIMMER + $C8, $5 - object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, SWIMMER + $C8, $6 + object SPRITE_SWIMMER, $d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4 + object SPRITE_SWIMMER, $4, $1b, STAY, RIGHT, $4, OPP_SWIMMER, $5 + object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, OPP_SWIMMER, $6 IF DEF(_OPTION_BEACH_HOUSE) - object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, SWIMMER + $C8, $7 + object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, OPP_SWIMMER, $7 ELSE - object SPRITE_SWIMMER, $9, $b, STAY, DOWN, $6, SWIMMER + $C8, $7 + object SPRITE_SWIMMER, $9, $b, STAY, DOWN, $6, OPP_SWIMMER, $7 ENDC - object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, BEAUTY + $C8, $c - object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, BEAUTY + $C8, $d - object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, SWIMMER + $C8, $8 - object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, BEAUTY + $C8, $e + object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c + object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d + object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, OPP_SWIMMER, $8 + object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e ; warp-to IF DEF(_OPTION_BEACH_HOUSE) diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index 00aa4684..8e6b5a78 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/route20.asm @@ -10,16 +10,16 @@ Route20Object: ; 0x50113 (size=106) db $b, $39, $c ; Route20Text12 db $a ; objects - object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, SWIMMER + $C8, $9 - object SPRITE_SWIMMER, $44, $b, STAY, UP, $2, BEAUTY + $C8, $f - object SPRITE_SWIMMER, $2d, $a, STAY, DOWN, $3, BEAUTY + $C8, $6 - object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, JR__TRAINER_F + $C8, $18 - object SPRITE_SWIMMER, $26, $d, STAY, DOWN, $5, SWIMMER + $C8, $a - object SPRITE_SWIMMER, $57, $d, STAY, UP, $6, SWIMMER + $C8, $b - object SPRITE_BLACK_HAIR_BOY_1, $22, $9, STAY, UP, $7, BIRD_KEEPER + $C8, $b - object SPRITE_SWIMMER, $19, $7, STAY, UP, $8, BEAUTY + $C8, $7 - object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, JR__TRAINER_F + $C8, $10 - object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, BEAUTY + $C8, $8 + object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, OPP_SWIMMER, $9 + object SPRITE_SWIMMER, $44, $b, STAY, UP, $2, OPP_BEAUTY, $f + object SPRITE_SWIMMER, $2d, $a, STAY, DOWN, $3, OPP_BEAUTY, $6 + object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, OPP_JR__TRAINER_F, $18 + object SPRITE_SWIMMER, $26, $d, STAY, DOWN, $5, OPP_SWIMMER, $a + object SPRITE_SWIMMER, $57, $d, STAY, UP, $6, OPP_SWIMMER, $b + object SPRITE_BLACK_HAIR_BOY_1, $22, $9, STAY, UP, $7, OPP_BIRD_KEEPER, $b + object SPRITE_SWIMMER, $19, $7, STAY, UP, $8, OPP_BEAUTY, $7 + object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, OPP_JR__TRAINER_F, $10 + object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, OPP_BEAUTY, $8 ; warp-to EVENT_DISP ROUTE_20_WIDTH, $5, $30 ; SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm index 68e4c630..e98c8425 100755 --- a/data/mapObjects/route21.asm +++ b/data/mapObjects/route21.asm @@ -6,12 +6,12 @@ Route21Object: ; 0x55021 (size=76) db $0 ; signs db $9 ; objects - object SPRITE_FISHER2, $4, $18, STAY, LEFT, $1, FISHER + $C8, $7 - object SPRITE_FISHER2, $6, $19, STAY, DOWN, $2, FISHER + $C8, $9 - object SPRITE_SWIMMER, $a, $1f, STAY, UP, $3, SWIMMER + $C8, $c - object SPRITE_SWIMMER, $c, $1e, STAY, RIGHT, $4, CUE_BALL + $C8, $9 - object SPRITE_SWIMMER, $10, $3f, STAY, DOWN, $5, SWIMMER + $C8, $d - object SPRITE_SWIMMER, $5, $47, STAY, RIGHT, $6, SWIMMER + $C8, $e - object SPRITE_SWIMMER, $f, $47, STAY, LEFT, $7, SWIMMER + $C8, $f - object SPRITE_FISHER2, $e, $38, STAY, LEFT, $8, FISHER + $C8, $8 - object SPRITE_FISHER2, $11, $39, STAY, RIGHT, $9, FISHER + $C8, $a + object SPRITE_FISHER2, $4, $18, STAY, LEFT, $1, OPP_FISHER, $7 + object SPRITE_FISHER2, $6, $19, STAY, DOWN, $2, OPP_FISHER, $9 + object SPRITE_SWIMMER, $a, $1f, STAY, UP, $3, OPP_SWIMMER, $c + object SPRITE_SWIMMER, $c, $1e, STAY, RIGHT, $4, OPP_CUE_BALL, $9 + object SPRITE_SWIMMER, $10, $3f, STAY, DOWN, $5, OPP_SWIMMER, $d + object SPRITE_SWIMMER, $5, $47, STAY, RIGHT, $6, OPP_SWIMMER, $e + object SPRITE_SWIMMER, $f, $47, STAY, LEFT, $7, OPP_SWIMMER, $f + object SPRITE_FISHER2, $e, $38, STAY, LEFT, $8, OPP_FISHER, $8 + object SPRITE_FISHER2, $11, $39, STAY, RIGHT, $9, OPP_FISHER, $a diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm index 95ee726c..b61ff713 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/route24.asm @@ -6,11 +6,11 @@ Route24Object: ; 0x506a4 (size=67) db $0 ; signs db $8 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, ROCKET + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, JR__TRAINER_M + $C8, $2 - object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, JR__TRAINER_M + $C8, $3 - object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, LASS + $C8, $7 - object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, YOUNGSTER + $C8, $4 - object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, LASS + $C8, $8 - object SPRITE_BUG_CATCHER, $b, $1f, STAY, LEFT, $7, BUG_CATCHER + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, OPP_ROCKET, $6 + object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR__TRAINER_M, $2 + object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR__TRAINER_M, $3 + object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, OPP_LASS, $7 + object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, OPP_YOUNGSTER, $4 + object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, OPP_LASS, $8 + object SPRITE_BUG_CATCHER, $b, $1f, STAY, LEFT, $7, OPP_BUG_CATCHER, $9 object SPRITE_BALL, $a, $5, STAY, NONE, $8, TM_45 diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm index aa9bfe74..62fa8e77 100755 --- a/data/mapObjects/route25.asm +++ b/data/mapObjects/route25.asm @@ -8,15 +8,15 @@ Route25Object: ; 0x507b2 (size=94) db $3, $2b, $b ; Route25Text11 db $a ; objects - object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, YOUNGSTER + $C8, $5 - object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, YOUNGSTER + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, JR__TRAINER_M + $C8, $2 - object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, LASS + $C8, $9 - object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, YOUNGSTER + $C8, $7 - object SPRITE_LASS, $25, $4, STAY, DOWN, $6, LASS + $C8, $a - object SPRITE_HIKER, $8, $4, STAY, RIGHT, $7, HIKER + $C8, $2 - object SPRITE_HIKER, $17, $9, STAY, UP, $8, HIKER + $C8, $3 - object SPRITE_HIKER, $d, $7, STAY, RIGHT, $9, HIKER + $C8, $4 + object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, OPP_YOUNGSTER, $5 + object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, OPP_YOUNGSTER, $6 + object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, OPP_JR__TRAINER_M, $2 + object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, OPP_LASS, $9 + object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, OPP_YOUNGSTER, $7 + object SPRITE_LASS, $25, $4, STAY, DOWN, $6, OPP_LASS, $a + object SPRITE_HIKER, $8, $4, STAY, RIGHT, $7, OPP_HIKER, $2 + object SPRITE_HIKER, $17, $9, STAY, UP, $8, OPP_HIKER, $3 + object SPRITE_HIKER, $d, $7, STAY, RIGHT, $9, OPP_HIKER, $4 object SPRITE_BALL, $16, $2, STAY, NONE, $a, TM_19 ; warp-to diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm index 29a6307b..a2df6925 100755 --- a/data/mapObjects/route3.asm +++ b/data/mapObjects/route3.asm @@ -8,11 +8,11 @@ Route3Object: ; 0x54208 (size=77) db $9 ; objects object SPRITE_BLACK_HAIR_BOY_2, $39, $b, STAY, NONE, $1 ; person - object SPRITE_BUG_CATCHER, $a, $6, STAY, RIGHT, $2, BUG_CATCHER + $C8, $4 - object SPRITE_BUG_CATCHER, $e, $4, STAY, DOWN, $3, YOUNGSTER + $C8, $1 - object SPRITE_LASS, $10, $9, STAY, LEFT, $4, LASS + $C8, $1 - object SPRITE_BUG_CATCHER, $13, $5, STAY, DOWN, $5, BUG_CATCHER + $C8, $5 - object SPRITE_LASS, $17, $4, STAY, LEFT, $6, LASS + $C8, $2 - object SPRITE_BUG_CATCHER, $16, $9, STAY, LEFT, $7, YOUNGSTER + $C8, $2 - object SPRITE_BUG_CATCHER, $18, $6, STAY, RIGHT, $8, BUG_CATCHER + $C8, $6 - object SPRITE_LASS, $21, $a, STAY, UP, $9, LASS + $C8, $3 + object SPRITE_BUG_CATCHER, $a, $6, STAY, RIGHT, $2, OPP_BUG_CATCHER, $4 + object SPRITE_BUG_CATCHER, $e, $4, STAY, DOWN, $3, OPP_YOUNGSTER, $1 + object SPRITE_LASS, $10, $9, STAY, LEFT, $4, OPP_LASS, $1 + object SPRITE_BUG_CATCHER, $13, $5, STAY, DOWN, $5, OPP_BUG_CATCHER, $5 + object SPRITE_LASS, $17, $4, STAY, LEFT, $6, OPP_LASS, $2 + object SPRITE_BUG_CATCHER, $16, $9, STAY, LEFT, $7, OPP_YOUNGSTER, $2 + object SPRITE_BUG_CATCHER, $18, $6, STAY, RIGHT, $8, OPP_BUG_CATCHER, $6 + object SPRITE_LASS, $21, $a, STAY, UP, $9, OPP_LASS, $3 diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm index e91b0301..14e59684 100755 --- a/data/mapObjects/route4.asm +++ b/data/mapObjects/route4.asm @@ -13,7 +13,7 @@ Route4Object: ; 0x543b2 (size=58) db $3 ; objects object SPRITE_LASS, $9, $8, WALK, $0, $1 ; person - object SPRITE_LASS, $3f, $3, STAY, RIGHT, $2, LASS + $C8, $4 + object SPRITE_LASS, $3f, $3, STAY, RIGHT, $2, OPP_LASS, $4 object SPRITE_BALL, $39, $3, STAY, NONE, $3, TM_04 ; warp-to diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index f1702acc..d901e865 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -11,12 +11,12 @@ Route6Object: ; 0x58022 (size=87) db $f, $13, $7 ; Route6Text7 db $6 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, JR__TRAINER_M + $C8, $4 - object SPRITE_LASS, $b, $15, STAY, LEFT, $2, JR__TRAINER_F + $C8, $2 - object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, BUG_CATCHER + $C8, $a - object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, JR__TRAINER_M + $C8, $5 - object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, JR__TRAINER_F + $C8, $3 - object SPRITE_BUG_CATCHER, $13, $1a, STAY, LEFT, $6, BUG_CATCHER + $C8, $b + object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR__TRAINER_M, $4 + object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR__TRAINER_F, $2 + object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, OPP_BUG_CATCHER, $a + object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR__TRAINER_M, $5 + object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR__TRAINER_F, $3 + object SPRITE_BUG_CATCHER, $13, $1a, STAY, LEFT, $6, OPP_BUG_CATCHER, $b ; warp-to EVENT_DISP ROUTE_6_WIDTH, $1, $9 ; ROUTE_6_GATE diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 2687c596..5863129b 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -12,15 +12,15 @@ Route8Object: ; 0x5814f (size=119) db $3, $11, $a ; Route8Text10 db $9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $8, $5, STAY, RIGHT, $1, SUPER_NERD + $C8, $3 - object SPRITE_GAMBLER, $d, $9, STAY, UP, $2, GAMBLER + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_2, $2a, $6, STAY, UP, $3, SUPER_NERD + $C8, $4 - object SPRITE_LASS, $1a, $3, STAY, LEFT, $4, LASS + $C8, $d - object SPRITE_BLACK_HAIR_BOY_2, $1a, $4, STAY, RIGHT, $5, SUPER_NERD + $C8, $5 - object SPRITE_LASS, $1a, $5, STAY, LEFT, $6, LASS + $C8, $e - object SPRITE_LASS, $1a, $6, STAY, RIGHT, $7, LASS + $C8, $f - object SPRITE_GAMBLER, $2e, $d, STAY, DOWN, $8, GAMBLER + $C8, $7 - object SPRITE_LASS, $33, $c, STAY, LEFT, $9, LASS + $C8, $10 + object SPRITE_BLACK_HAIR_BOY_2, $8, $5, STAY, RIGHT, $1, OPP_SUPER_NERD, $3 + object SPRITE_GAMBLER, $d, $9, STAY, UP, $2, OPP_GAMBLER, $5 + object SPRITE_BLACK_HAIR_BOY_2, $2a, $6, STAY, UP, $3, OPP_SUPER_NERD, $4 + object SPRITE_LASS, $1a, $3, STAY, LEFT, $4, OPP_LASS, $d + object SPRITE_BLACK_HAIR_BOY_2, $1a, $4, STAY, RIGHT, $5, OPP_SUPER_NERD, $5 + object SPRITE_LASS, $1a, $5, STAY, LEFT, $6, OPP_LASS, $e + object SPRITE_LASS, $1a, $6, STAY, RIGHT, $7, OPP_LASS, $f + object SPRITE_GAMBLER, $2e, $d, STAY, DOWN, $8, OPP_GAMBLER, $7 + object SPRITE_LASS, $33, $c, STAY, LEFT, $9, OPP_LASS, $10 ; warp-to EVENT_DISP ROUTE_8_WIDTH, $9, $1 ; ROUTE_8_GATE diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 6871c73a..a70b208f 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -7,13 +7,13 @@ Route9Object: ; 0x546a8 (size=86) db $7, $19, $b ; Route9Text11 db $a ; objects - object SPRITE_LASS, $d, $a, STAY, LEFT, $1, JR__TRAINER_F + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, JR__TRAINER_M + $C8, $7 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, JR__TRAINER_M + $C8, $8 - object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, JR__TRAINER_F + $C8, $6 - object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, HIKER + $C8, $b - object SPRITE_HIKER, $2b, $3, STAY, LEFT, $6, HIKER + $C8, $6 - object SPRITE_BUG_CATCHER, $16, $2, STAY, DOWN, $7, BUG_CATCHER + $C8, $d - object SPRITE_HIKER, $2d, $f, STAY, RIGHT, $8, HIKER + $C8, $5 - object SPRITE_BUG_CATCHER, $28, $8, STAY, RIGHT, $9, BUG_CATCHER + $C8, $e + object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR__TRAINER_F, $5 + object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR__TRAINER_M, $7 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR__TRAINER_M, $8 + object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR__TRAINER_F, $6 + object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, OPP_HIKER, $b + object SPRITE_HIKER, $2b, $3, STAY, LEFT, $6, OPP_HIKER, $6 + object SPRITE_BUG_CATCHER, $16, $2, STAY, DOWN, $7, OPP_BUG_CATCHER, $d + object SPRITE_HIKER, $2d, $f, STAY, RIGHT, $8, OPP_HIKER, $5 + object SPRITE_BUG_CATCHER, $28, $8, STAY, RIGHT, $9, OPP_BUG_CATCHER, $e object SPRITE_BALL, $a, $f, STAY, NONE, $a, TM_30 diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index 3e11e006..63676905 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/saffrongym.asm @@ -38,14 +38,14 @@ SaffronGymObject: ; 0x5d259 (size=330) db $0 ; signs db $9 ; objects - object SPRITE_GIRL, $9, $8, STAY, DOWN, $1, SABRINA + $C8, $1 - object SPRITE_MEDIUM, $a, $1, STAY, DOWN, $2, CHANNELER + $C8, $16 - object SPRITE_BUG_CATCHER, $11, $1, STAY, DOWN, $3, PSYCHIC_TR + $C8, $1 - object SPRITE_MEDIUM, $3, $7, STAY, DOWN, $4, CHANNELER + $C8, $17 - object SPRITE_BUG_CATCHER, $11, $7, STAY, DOWN, $5, PSYCHIC_TR + $C8, $2 - object SPRITE_MEDIUM, $3, $d, STAY, DOWN, $6, CHANNELER + $C8, $18 - object SPRITE_BUG_CATCHER, $11, $d, STAY, DOWN, $7, PSYCHIC_TR + $C8, $3 - object SPRITE_BUG_CATCHER, $3, $1, STAY, DOWN, $8, PSYCHIC_TR + $C8, $4 + object SPRITE_GIRL, $9, $8, STAY, DOWN, $1, OPP_SABRINA, $1 + object SPRITE_MEDIUM, $a, $1, STAY, DOWN, $2, OPP_CHANNELER, $16 + object SPRITE_BUG_CATCHER, $11, $1, STAY, DOWN, $3, OPP_PSYCHIC_TR, $1 + object SPRITE_MEDIUM, $3, $7, STAY, DOWN, $4, OPP_CHANNELER, $17 + object SPRITE_BUG_CATCHER, $11, $7, STAY, DOWN, $5, OPP_PSYCHIC_TR, $2 + object SPRITE_MEDIUM, $3, $d, STAY, DOWN, $6, OPP_CHANNELER, $18 + object SPRITE_BUG_CATCHER, $11, $d, STAY, DOWN, $7, OPP_PSYCHIC_TR, $3 + object SPRITE_BUG_CATCHER, $3, $1, STAY, DOWN, $8, OPP_PSYCHIC_TR, $4 object SPRITE_GYM_HELPER, $a, $f, STAY, DOWN, $9 ; person ; warp-to diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm index e48a4284..cc608e64 100755 --- a/data/mapObjects/silphco10.asm +++ b/data/mapObjects/silphco10.asm @@ -12,8 +12,8 @@ SilphCo10Object: ; 0x5a1fb (size=95) db $0 ; signs db $6 ; objects - object SPRITE_ROCKET, $1, $9, STAY, RIGHT, $1, ROCKET + $C8, $27 - object SPRITE_OAK_AIDE, $a, $2, STAY, LEFT, $2, SCIENTIST + $C8, $b + object SPRITE_ROCKET, $1, $9, STAY, RIGHT, $1, OPP_ROCKET, $27 + object SPRITE_OAK_AIDE, $a, $2, STAY, LEFT, $2, OPP_SCIENTIST, $b object SPRITE_ERIKA, $9, $f, WALK, $0, $3 ; person object SPRITE_BALL, $2, $c, STAY, NONE, $4, TM_26 object SPRITE_BALL, $4, $e, STAY, NONE, $5, RARE_CANDY diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index e1a7a568..8cba618e 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -12,9 +12,9 @@ SilphCo11Object: ; 0x62380 (size=72) db $5 ; objects object SPRITE_MR_MASTERBALL, $7, $5, STAY, DOWN, $1 ; person object SPRITE_FOULARD_WOMAN, $a, $5, STAY, DOWN, $2 ; person - object SPRITE_GIOVANNI, $6, $9, STAY, DOWN, $3, GIOVANNI + $C8, $2 - object SPRITE_ROCKET, $3, $10, STAY, UP, $4, ROCKET + $C8, $29 - object SPRITE_ROCKET, $f, $9, STAY, UP, $5, ROCKET + $C8, $28 + object SPRITE_GIOVANNI, $6, $9, STAY, DOWN, $3, OPP_GIOVANNI, $2 + object SPRITE_ROCKET, $3, $10, STAY, UP, $4, OPP_ROCKET, $29 + object SPRITE_ROCKET, $f, $9, STAY, UP, $5, OPP_ROCKET, $28 ; warp-to EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm index cd4f8be5..44271d70 100755 --- a/data/mapObjects/silphco2.asm +++ b/data/mapObjects/silphco2.asm @@ -14,10 +14,10 @@ SilphCo2Object: ; 0x59e66 (size=98) db $5 ; objects object SPRITE_ERIKA, $a, $1, STAY, UP, $1 ; person - object SPRITE_OAK_AIDE, $5, $c, STAY, DOWN, $2, SCIENTIST + $C8, $2 - object SPRITE_OAK_AIDE, $18, $d, STAY, LEFT, $3, SCIENTIST + $C8, $3 - object SPRITE_ROCKET, $10, $b, STAY, UP, $4, ROCKET + $C8, $17 - object SPRITE_ROCKET, $18, $7, STAY, UP, $5, ROCKET + $C8, $18 + object SPRITE_OAK_AIDE, $5, $c, STAY, DOWN, $2, OPP_SCIENTIST, $2 + object SPRITE_OAK_AIDE, $18, $d, STAY, LEFT, $3, OPP_SCIENTIST, $3 + object SPRITE_ROCKET, $10, $b, STAY, UP, $4, OPP_ROCKET, $17 + object SPRITE_ROCKET, $18, $7, STAY, UP, $5, OPP_ROCKET, $18 ; warp-to EVENT_DISP SILPH_CO_2F_WIDTH, $0, $18 ; SILPH_CO_1F diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm index a293593a..48bb8c1a 100755 --- a/data/mapObjects/silphco3.asm +++ b/data/mapObjects/silphco3.asm @@ -17,8 +17,8 @@ SilphCo3Object: ; 0x5a035 (size=113) db $4 ; objects object SPRITE_LAPRAS_GIVER, $18, $8, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $14, $7, STAY, LEFT, $2, ROCKET + $C8, $19 - object SPRITE_OAK_AIDE, $7, $9, STAY, DOWN, $3, SCIENTIST + $C8, $4 + object SPRITE_ROCKET, $14, $7, STAY, LEFT, $2, OPP_ROCKET, $19 + object SPRITE_OAK_AIDE, $7, $9, STAY, DOWN, $3, OPP_SCIENTIST, $4 object SPRITE_BALL, $8, $5, STAY, NONE, $4, HYPER_POTION ; warp-to diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm index f9974ccb..762ca7f8 100755 --- a/data/mapObjects/silphco4.asm +++ b/data/mapObjects/silphco4.asm @@ -14,9 +14,9 @@ SilphCo4Object: ; 0x19e35 (size=111) db $7 ; objects object SPRITE_LAPRAS_GIVER, $6, $2, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $9, $e, STAY, RIGHT, $2, ROCKET + $C8, $1a - object SPRITE_OAK_AIDE, $e, $6, STAY, LEFT, $3, SCIENTIST + $C8, $5 - object SPRITE_ROCKET, $1a, $a, STAY, UP, $4, ROCKET + $C8, $1b + object SPRITE_ROCKET, $9, $e, STAY, RIGHT, $2, OPP_ROCKET, $1a + object SPRITE_OAK_AIDE, $e, $6, STAY, LEFT, $3, OPP_SCIENTIST, $5 + object SPRITE_ROCKET, $1a, $a, STAY, UP, $4, OPP_ROCKET, $1b object SPRITE_BALL, $3, $9, STAY, NONE, $5, FULL_HEAL object SPRITE_BALL, $4, $7, STAY, NONE, $6, MAX_REVIVE object SPRITE_BALL, $5, $8, STAY, NONE, $7, ESCAPE_ROPE diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm index bb7bf68e..0c956cd3 100755 --- a/data/mapObjects/silphco5.asm +++ b/data/mapObjects/silphco5.asm @@ -14,10 +14,10 @@ SilphCo5Object: ; 0x1a08d (size=137) db $b ; objects object SPRITE_LAPRAS_GIVER, $d, $9, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $8, $10, STAY, RIGHT, $2, ROCKET + $C8, $1c - object SPRITE_OAK_AIDE, $8, $3, STAY, RIGHT, $3, SCIENTIST + $C8, $6 - object SPRITE_ROCKER, $12, $a, STAY, UP, $4, JUGGLER + $C8, $1 - object SPRITE_ROCKET, $1c, $4, STAY, UP, $5, ROCKET + $C8, $1d + object SPRITE_ROCKET, $8, $10, STAY, RIGHT, $2, OPP_ROCKET, $1c + object SPRITE_OAK_AIDE, $8, $3, STAY, RIGHT, $3, OPP_SCIENTIST, $6 + object SPRITE_ROCKER, $12, $a, STAY, UP, $4, OPP_JUGGLER, $1 + object SPRITE_ROCKET, $1c, $4, STAY, UP, $5, OPP_ROCKET, $1d object SPRITE_BALL, $2, $d, STAY, NONE, $6, TM_09 object SPRITE_BALL, $4, $6, STAY, NONE, $7, PROTEIN object SPRITE_BALL, $15, $10, STAY, NONE, $8, CARD_KEY diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index c1cdebd0..66372f57 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/silphco6.asm @@ -16,9 +16,9 @@ SilphCo6Object: ; 0x1a2fb (size=112) object SPRITE_ERIKA, $15, $6, STAY, DOWN, $3 ; person object SPRITE_ERIKA, $b, $a, STAY, RIGHT, $4 ; person object SPRITE_LAPRAS_GIVER, $12, $d, STAY, UP, $5 ; person - object SPRITE_ROCKET, $11, $3, STAY, RIGHT, $6, ROCKET + $C8, $1e - object SPRITE_OAK_AIDE, $7, $8, STAY, DOWN, $7, SCIENTIST + $C8, $7 - object SPRITE_ROCKET, $e, $f, STAY, LEFT, $8, ROCKET + $C8, $1f + object SPRITE_ROCKET, $11, $3, STAY, RIGHT, $6, OPP_ROCKET, $1e + object SPRITE_OAK_AIDE, $7, $8, STAY, DOWN, $7, OPP_SCIENTIST, $7 + object SPRITE_ROCKET, $e, $f, STAY, LEFT, $8, OPP_ROCKET, $1f object SPRITE_BALL, $3, $c, STAY, NONE, $9, HP_UP object SPRITE_BALL, $2, $f, STAY, NONE, $a, X_ACCURACY diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm index 42a84faa..ef665ac0 100755 --- a/data/mapObjects/silphco7.asm +++ b/data/mapObjects/silphco7.asm @@ -16,10 +16,10 @@ SilphCo7Object: ; 0x51ed7 (size=128) object SPRITE_LAPRAS_GIVER, $d, $d, STAY, UP, $2 ; person object SPRITE_LAPRAS_GIVER, $7, $a, STAY, NONE, $3 ; person object SPRITE_ERIKA, $a, $8, STAY, NONE, $4 ; person - object SPRITE_ROCKET, $d, $1, STAY, DOWN, $5, ROCKET + $C8, $20 - object SPRITE_OAK_AIDE, $2, $d, STAY, DOWN, $6, SCIENTIST + $C8, $8 - object SPRITE_ROCKET, $14, $2, STAY, LEFT, $7, ROCKET + $C8, $21 - object SPRITE_ROCKET, $13, $e, STAY, RIGHT, $8, ROCKET + $C8, $22 + object SPRITE_ROCKET, $d, $1, STAY, DOWN, $5, OPP_ROCKET, $20 + object SPRITE_OAK_AIDE, $2, $d, STAY, DOWN, $6, OPP_SCIENTIST, $8 + object SPRITE_ROCKET, $14, $2, STAY, LEFT, $7, OPP_ROCKET, $21 + object SPRITE_ROCKET, $13, $e, STAY, RIGHT, $8, OPP_ROCKET, $22 object SPRITE_BLUE, $3, $7, STAY, UP, $9 ; person object SPRITE_BALL, $1, $9, STAY, NONE, $a, CALCIUM object SPRITE_BALL, $18, $b, STAY, NONE, $b, TM_03 diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index 6b7541ad..a4b97a91 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -14,9 +14,9 @@ SilphCo8Object: ; 0x56613 (size=90) db $4 ; objects object SPRITE_LAPRAS_GIVER, $4, $2, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $13, $2, STAY, LEFT, $2, ROCKET + $C8, $23 - object SPRITE_OAK_AIDE, $a, $2, STAY, DOWN, $3, SCIENTIST + $C8, $9 - object SPRITE_ROCKET, $c, $f, STAY, RIGHT, $4, ROCKET + $C8, $24 + object SPRITE_ROCKET, $13, $2, STAY, LEFT, $2, OPP_ROCKET, $23 + object SPRITE_OAK_AIDE, $a, $2, STAY, DOWN, $3, OPP_SCIENTIST, $9 + object SPRITE_ROCKET, $c, $f, STAY, RIGHT, $4, OPP_ROCKET, $24 ; warp-to EVENT_DISP SILPH_CO_8F_WIDTH, $0, $10 ; SILPH_CO_9F diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index 5fb1db79..204f0d1d 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/silphco9.asm @@ -12,9 +12,9 @@ SilphCo9Object: ; 0x5d93f (size=74) db $4 ; objects object SPRITE_NURSE, $3, $e, STAY, DOWN, $1 ; person - object SPRITE_ROCKET, $2, $4, STAY, UP, $2, ROCKET + $C8, $25 - object SPRITE_OAK_AIDE, $15, $d, STAY, DOWN, $3, SCIENTIST + $C8, $a - object SPRITE_ROCKET, $d, $10, STAY, UP, $4, ROCKET + $C8, $26 + object SPRITE_ROCKET, $2, $4, STAY, UP, $2, OPP_ROCKET, $25 + object SPRITE_OAK_AIDE, $15, $d, STAY, DOWN, $3, OPP_SCIENTIST, $a + object SPRITE_ROCKET, $d, $10, STAY, UP, $4, OPP_ROCKET, $26 ; warp-to EVENT_DISP SILPH_CO_9F_WIDTH, $0, $e ; SILPH_CO_10F diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm index 8001c043..c57925f1 100755 --- a/data/mapObjects/ssanne10.asm +++ b/data/mapObjects/ssanne10.asm @@ -16,12 +16,12 @@ SSAnne10Object: ; 0x61e75 (size=165) db $0 ; signs db $b ; objects - object SPRITE_SAILOR, $0, $d, STAY, DOWN, $1, SAILOR + $C8, $3 - object SPRITE_SAILOR, $2, $b, STAY, DOWN, $2, SAILOR + $C8, $4 - object SPRITE_SAILOR, $c, $3, STAY, LEFT, $3, SAILOR + $C8, $5 - object SPRITE_SAILOR, $16, $2, STAY, DOWN, $4, SAILOR + $C8, $6 - object SPRITE_SAILOR, $0, $2, STAY, RIGHT, $5, SAILOR + $C8, $7 - object SPRITE_FISHER2, $0, $4, STAY, RIGHT, $6, FISHER + $C8, $2 + object SPRITE_SAILOR, $0, $d, STAY, DOWN, $1, OPP_SAILOR, $3 + object SPRITE_SAILOR, $2, $b, STAY, DOWN, $2, OPP_SAILOR, $4 + object SPRITE_SAILOR, $c, $3, STAY, LEFT, $3, OPP_SAILOR, $5 + object SPRITE_SAILOR, $16, $2, STAY, DOWN, $4, OPP_SAILOR, $6 + object SPRITE_SAILOR, $0, $2, STAY, RIGHT, $5, OPP_SAILOR, $7 + object SPRITE_FISHER2, $0, $4, STAY, RIGHT, $6, OPP_FISHER, $2 object SPRITE_BLACK_HAIR_BOY_2, $a, $d, STAY, RIGHT, $7 ; person object SPRITE_SLOWBRO, $b, $c, STAY, NONE, $8 ; person object SPRITE_BALL, $14, $2, STAY, NONE, $9, ETHER diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm index 80e54683..9f3691cf 100755 --- a/data/mapObjects/ssanne2.asm +++ b/data/mapObjects/ssanne2.asm @@ -16,7 +16,7 @@ SSAnne2Object: ; 0x61514 (size=90) db $2 ; objects object SPRITE_WAITER, $3, $7, WALK, $1, $1 ; person - object SPRITE_BLUE, $24, $4, STAY, DOWN, $2, SONY1 + $C8, $1 + object SPRITE_BLUE, $24, $4, STAY, DOWN, $2, OPP_SONY1, $1 ; warp-to EVENT_DISP SS_ANNE_2_WIDTH, $b, $9 ; SS_ANNE_9 diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm index e8a48417..e18f1074 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/ssanne5.asm @@ -11,8 +11,8 @@ SSAnne5Object: ; 0x6172b (size=54) object SPRITE_BLACK_HAIR_BOY_2, $5, $2, STAY, UP, $1 ; person object SPRITE_SAILOR, $4, $9, STAY, NONE, $2 ; person object SPRITE_BLACK_HAIR_BOY_1, $7, $b, STAY, NONE, $3 ; person - object SPRITE_SAILOR, $4, $4, STAY, DOWN, $4, SAILOR + $C8, $1 - object SPRITE_SAILOR, $a, $8, STAY, UP, $5, SAILOR + $C8, $2 + object SPRITE_SAILOR, $4, $4, STAY, DOWN, $4, OPP_SAILOR, $1 + object SPRITE_SAILOR, $a, $8, STAY, UP, $5, OPP_SAILOR, $2 ; warp-to EVENT_DISP SS_ANNE_5_WIDTH, $6, $d ; SS_ANNE_3 diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm index e9c2aa71..992230d8 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/ssanne8.asm @@ -12,10 +12,10 @@ SSAnne8Object: ; 0x61a60 (size=127) db $0 ; signs db $b ; objects - object SPRITE_GENTLEMAN, $2, $3, STAY, LEFT, $1, GENTLEMAN + $C8, $1 - object SPRITE_GENTLEMAN, $b, $4, STAY, UP, $2, GENTLEMAN + $C8, $2 - object SPRITE_BUG_CATCHER, $b, $e, STAY, UP, $3, YOUNGSTER + $C8, $8 - object SPRITE_LASS, $d, $b, STAY, LEFT, $4, LASS + $C8, $b + object SPRITE_GENTLEMAN, $2, $3, STAY, LEFT, $1, OPP_GENTLEMAN, $1 + object SPRITE_GENTLEMAN, $b, $4, STAY, UP, $2, OPP_GENTLEMAN, $2 + object SPRITE_BUG_CATCHER, $b, $e, STAY, UP, $3, OPP_YOUNGSTER, $8 + object SPRITE_LASS, $d, $b, STAY, LEFT, $4, OPP_LASS, $b object SPRITE_GIRL, $16, $3, WALK, $1, $5 ; person object SPRITE_FAT_BALD_GUY, $0, $e, STAY, NONE, $6 ; person object SPRITE_LITTLE_GIRL, $2, $b, STAY, DOWN, $7 ; person diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm index a9bccafa..7fddc058 100755 --- a/data/mapObjects/ssanne9.asm +++ b/data/mapObjects/ssanne9.asm @@ -18,10 +18,10 @@ SSAnne9Object: ; 0x61c8d (size=188) db $0 ; signs db $d ; objects - object SPRITE_GENTLEMAN, $a, $2, STAY, RIGHT, $1, GENTLEMAN + $C8, $3 - object SPRITE_FISHER2, $d, $4, STAY, LEFT, $2, FISHER + $C8, $1 - object SPRITE_GENTLEMAN, $0, $e, STAY, RIGHT, $3, GENTLEMAN + $C8, $5 - object SPRITE_LASS, $2, $b, STAY, DOWN, $4, LASS + $C8, $c + object SPRITE_GENTLEMAN, $a, $2, STAY, RIGHT, $1, OPP_GENTLEMAN, $3 + object SPRITE_FISHER2, $d, $4, STAY, LEFT, $2, OPP_FISHER, $1 + object SPRITE_GENTLEMAN, $0, $e, STAY, RIGHT, $3, OPP_GENTLEMAN, $5 + object SPRITE_LASS, $2, $b, STAY, DOWN, $4, OPP_LASS, $c object SPRITE_GENTLEMAN, $1, $2, STAY, DOWN, $5 ; person object SPRITE_BALL, $c, $1, STAY, NONE, $6, MAX_ETHER object SPRITE_GENTLEMAN, $15, $2, STAY, DOWN, $7 ; person diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm index df3da382..830af62c 100755 --- a/data/mapObjects/vermiliongym.asm +++ b/data/mapObjects/vermiliongym.asm @@ -8,10 +8,10 @@ VermilionGymObject: ; 0x5cbfe (size=58) db $0 ; signs db $5 ; objects - object SPRITE_ROCKER, $5, $1, STAY, DOWN, $1, LT__SURGE + $C8, $1 - object SPRITE_GENTLEMAN, $9, $6, STAY, LEFT, $2, GENTLEMAN + $C8, $3 - object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, LEFT, $3, ROCKER + $C8, $1 - object SPRITE_SAILOR, $0, $a, STAY, RIGHT, $4, SAILOR + $C8, $8 + object SPRITE_ROCKER, $5, $1, STAY, DOWN, $1, OPP_LT__SURGE, $1 + object SPRITE_GENTLEMAN, $9, $6, STAY, LEFT, $2, OPP_GENTLEMAN, $3 + object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, LEFT, $3, OPP_ROCKER, $1 + object SPRITE_SAILOR, $0, $a, STAY, RIGHT, $4, OPP_SAILOR, $8 object SPRITE_GYM_HELPER, $4, $e, STAY, DOWN, $5 ; person ; warp-to diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm index 75552f36..9e66e95b 100755 --- a/data/mapObjects/victoryroad1.asm +++ b/data/mapObjects/victoryroad1.asm @@ -9,8 +9,8 @@ VictoryRoad1Object: ; 0x5dab8 (size=76) db $0 ; signs db $7 ; objects - object SPRITE_LASS, $7, $5, STAY, RIGHT, $1, COOLTRAINER_F + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_1, $3, $2, STAY, DOWN, $2, COOLTRAINER_M + $C8, $5 + object SPRITE_LASS, $7, $5, STAY, RIGHT, $1, OPP_COOLTRAINER_F, $5 + object SPRITE_BLACK_HAIR_BOY_1, $3, $2, STAY, DOWN, $2, OPP_COOLTRAINER_M, $5 object SPRITE_BALL, $b, $0, STAY, NONE, $3, TM_43 object SPRITE_BALL, $9, $2, STAY, NONE, $4, RARE_CANDY object SPRITE_BOULDER, $5, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $5 ; person diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 3d6cd633..29c0f303 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/victoryroad2.asm @@ -13,11 +13,11 @@ VictoryRoad2Object: ; 0x51915 (size=154) db $0 ; signs db $d ; objects - object SPRITE_HIKER, $c, $9, STAY, LEFT, $1, BLACKBELT + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $15, $d, STAY, LEFT, $2, JUGGLER + $C8, $2 - object SPRITE_BLACK_HAIR_BOY_1, $13, $8, STAY, DOWN, $3, TAMER + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_2, $4, $2, STAY, DOWN, $4, POKEMANIAC + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_2, $1a, $3, STAY, LEFT, $5, JUGGLER + $C8, $5 + object SPRITE_HIKER, $c, $9, STAY, LEFT, $1, OPP_BLACKBELT, $9 + object SPRITE_BLACK_HAIR_BOY_2, $15, $d, STAY, LEFT, $2, OPP_JUGGLER, $2 + object SPRITE_BLACK_HAIR_BOY_1, $13, $8, STAY, DOWN, $3, OPP_TAMER, $5 + object SPRITE_BLACK_HAIR_BOY_2, $4, $2, STAY, DOWN, $4, OPP_POKEMANIAC, $6 + object SPRITE_BLACK_HAIR_BOY_2, $1a, $3, STAY, LEFT, $5, OPP_JUGGLER, $5 object SPRITE_BIRD, $b, $5, STAY, UP, $6, MOLTRES, 50 object SPRITE_BALL, $1b, $5, STAY, NONE, $7, TM_17 object SPRITE_BALL, $12, $9, STAY, NONE, $8, FULL_HEAL diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm index 843b388f..19a06c65 100755 --- a/data/mapObjects/victoryroad3.asm +++ b/data/mapObjects/victoryroad3.asm @@ -10,10 +10,10 @@ VictoryRoad3Object: ; 0x44acd (size=106) db $0 ; signs db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $1c, $5, STAY, LEFT, $1, COOLTRAINER_M + $C8, $2 - object SPRITE_LASS, $7, $d, STAY, RIGHT, $2, COOLTRAINER_F + $C8, $2 - object SPRITE_BLACK_HAIR_BOY_1, $6, $e, STAY, LEFT, $3, COOLTRAINER_M + $C8, $3 - object SPRITE_LASS, $d, $3, STAY, RIGHT, $4, COOLTRAINER_F + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_1, $1c, $5, STAY, LEFT, $1, OPP_COOLTRAINER_M, $2 + object SPRITE_LASS, $7, $d, STAY, RIGHT, $2, OPP_COOLTRAINER_F, $2 + object SPRITE_BLACK_HAIR_BOY_1, $6, $e, STAY, LEFT, $3, OPP_COOLTRAINER_M, $3 + object SPRITE_LASS, $d, $3, STAY, RIGHT, $4, OPP_COOLTRAINER_F, $3 object SPRITE_BALL, $1a, $5, STAY, NONE, $5, MAX_REVIVE object SPRITE_BALL, $7, $7, STAY, NONE, $6, TM_47 object SPRITE_BOULDER, $16, $3, STAY, BOULDER_MOVEMENT_BYTE_2, $7 ; person diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm index 1ae1d1e2..a1d52cfe 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/viridianforest.asm @@ -19,9 +19,9 @@ ViridianForestObject: ; 0x611da (size=127) db $8 ; objects object SPRITE_BUG_CATCHER, $10, $2b, STAY, NONE, $1 ; person - object SPRITE_BUG_CATCHER, $1e, $21, STAY, LEFT, $2, BUG_CATCHER + $C8, $1 - object SPRITE_BUG_CATCHER, $1e, $13, STAY, LEFT, $3, BUG_CATCHER + $C8, $2 - object SPRITE_BUG_CATCHER, $2, $12, STAY, LEFT, $4, BUG_CATCHER + $C8, $3 + object SPRITE_BUG_CATCHER, $1e, $21, STAY, LEFT, $2, OPP_BUG_CATCHER, $1 + object SPRITE_BUG_CATCHER, $1e, $13, STAY, LEFT, $3, OPP_BUG_CATCHER, $2 + object SPRITE_BUG_CATCHER, $2, $12, STAY, LEFT, $4, OPP_BUG_CATCHER, $3 object SPRITE_BALL, $19, $b, STAY, NONE, $5, ANTIDOTE object SPRITE_BALL, $c, $1d, STAY, NONE, $6, POTION object SPRITE_BALL, $1, $1f, STAY, NONE, $7, POKE_BALL diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index fb81788d..468b9022 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/viridiangym.asm @@ -8,15 +8,15 @@ ViridianGymObject: ; 0x74bde (size=105) db $0 ; signs db $b ; objects - object SPRITE_GIOVANNI, $2, $1, STAY, DOWN, $1, GIOVANNI + $C8, $3 - object SPRITE_BLACK_HAIR_BOY_1, $c, $7, STAY, DOWN, $2, COOLTRAINER_M + $C8, $9 - object SPRITE_HIKER, $b, $b, STAY, UP, $3, BLACKBELT + $C8, $6 - object SPRITE_ROCKER, $a, $7, STAY, DOWN, $4, TAMER + $C8, $3 - object SPRITE_HIKER, $3, $7, STAY, LEFT, $5, BLACKBELT + $C8, $7 - object SPRITE_BLACK_HAIR_BOY_1, $d, $5, STAY, RIGHT, $6, COOLTRAINER_M + $C8, $a - object SPRITE_HIKER, $a, $1, STAY, DOWN, $7, BLACKBELT + $C8, $8 - object SPRITE_ROCKER, $2, $10, STAY, RIGHT, $8, TAMER + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_1, $6, $5, STAY, DOWN, $9, COOLTRAINER_M + $C8, $1 + object SPRITE_GIOVANNI, $2, $1, STAY, DOWN, $1, OPP_GIOVANNI, $3 + object SPRITE_BLACK_HAIR_BOY_1, $c, $7, STAY, DOWN, $2, OPP_COOLTRAINER_M, $9 + object SPRITE_HIKER, $b, $b, STAY, UP, $3, OPP_BLACKBELT, $6 + object SPRITE_ROCKER, $a, $7, STAY, DOWN, $4, OPP_TAMER, $3 + object SPRITE_HIKER, $3, $7, STAY, LEFT, $5, OPP_BLACKBELT, $7 + object SPRITE_BLACK_HAIR_BOY_1, $d, $5, STAY, RIGHT, $6, OPP_COOLTRAINER_M, $a + object SPRITE_HIKER, $a, $1, STAY, DOWN, $7, OPP_BLACKBELT, $8 + object SPRITE_ROCKER, $2, $10, STAY, RIGHT, $8, OPP_TAMER, $4 + object SPRITE_BLACK_HAIR_BOY_1, $6, $5, STAY, DOWN, $9, OPP_COOLTRAINER_M, $1 object SPRITE_GYM_HELPER, $10, $f, STAY, DOWN, $a ; person object SPRITE_BALL, $10, $9, STAY, NONE, $b, REVIVE diff --git a/data/trainer_types.asm b/data/trainer_types.asm index 5ad1dbd0..659eb2ac 100755 --- a/data/trainer_types.asm +++ b/data/trainer_types.asm @@ -1,17 +1,17 @@ FemaleTrainerList:: ; 3434 (0:3434) - db $c8+LASS - db $c8+JR__TRAINER_F - db $c8+BEAUTY - db $c8+COOLTRAINER_F + db OPP_LASS + db OPP_JR__TRAINER_F + db OPP_BEAUTY + db OPP_COOLTRAINER_F db $FF EvilTrainerList:: ; 3439 (0:3439) - db $c8+JUGGLER_X - db $c8+GAMBLER - db $c8+ROCKER - db $c8+JUGGLER - db $c8+CHIEF - db $c8+SCIENTIST - db $c8+GIOVANNI - db $c8+ROCKET + db OPP_JUGGLER_X + db OPP_GAMBLER + db OPP_ROCKER + db OPP_JUGGLER + db OPP_CHIEF + db OPP_SCIENTIST + db OPP_GIOVANNI + db OPP_ROCKET db $FF diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 8f57777c..9a5f62b1 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -82,7 +82,7 @@ BattleTransitions: ; 709d2 (1c:49d2) GetBattleTransitionID_WildOrTrainer: ; 709e2 (1c:49e2) ld a, [W_CUROPPONENT] - cp $c8 + cp 200 jr nc, .trainer res 0, c ret diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 418447ba..feadcd82 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1214,7 +1214,7 @@ HandlePlayerBlackOut: ; 3c837 (f:4837) cp LINK_STATE_BATTLING jr z, .notSony1Battle ld a, [W_CUROPPONENT] - cp $c8 + SONY1 + cp OPP_SONY1 jr nz, .notSony1Battle coord hl, 0, 0 ; sony 1 battle lb bc, 8, 21 @@ -6861,7 +6861,7 @@ InitBattleCommon: ; 3ef3d (f:6f3d) res 1, [hl] callab InitBattleVariables ld a, [wEnemyMonSpecies2] - sub $c8 + sub 200 jp c, InitWildBattle ld [W_TRAINERCLASS], a call GetTrainerInformation diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index 0976c7c7..37a45476 100755 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -101,7 +101,7 @@ ReadTrainer: ; 39c53 (e:5c53) ; get trainer class number ld a,[W_CUROPPONENT] - sub $C8 + sub 200 ld b,a ld hl,TeamMoves diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 31eee481..503f3062 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -274,7 +274,7 @@ CableClub_DoBattleOrTradeAgain: ; 5345 jr nz, .asm_5506 ld a, LINK_STATE_BATTLING ld [wLinkState], a - ld a, SONY1 + $c8 + ld a, OPP_SONY1 ld [W_CUROPPONENT], a call ClearScreen call Delay3 diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index fa5ac222..098be875 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -286,7 +286,7 @@ FreezeEnemyTrainerSprite: ; 1a5e7 (6:65e7) jp SetSpriteMovementBytesToFF RivalIDs: ; 1a605 (6:6605) - db SONY1 + $c8 - db SONY2 + $c8 - db SONY3 + $c8 + db OPP_SONY1 + db OPP_SONY2 + db OPP_SONY3 db $ff diff --git a/home.asm b/home.asm index 41d25238..2d64833f 100644 --- a/home.asm +++ b/home.asm @@ -2396,7 +2396,7 @@ EndTrainerBattle:: ; 3275 (0:3275) ld b, FLAG_SET call TrainerFlagAction ; flag trainer as fought ld a, [W_ENEMYMONORTRAINERCLASS] - cp $c8 + cp 200 jr nc, .skipRemoveSprite ; test if trainer was fought (in that case skip removing the corresponding sprite) ld hl, W_MISSABLEOBJECTLIST ld de, $2 @@ -2430,7 +2430,7 @@ InitBattleEnemyParameters:: ; 32d7 (0:32d7) ld a, [wEngagedTrainerClass] ld [W_CUROPPONENT], a ld [W_ENEMYMONORTRAINERCLASS], a - cp $c8 + cp 200 ld a, [wEngagedTrainerSet] jr c, .noTrainer ld [W_TRAINERNO], a @@ -2594,11 +2594,11 @@ CheckIfAlreadyEngaged:: ; 33dd (0:33dd) PlayTrainerMusic:: ; 33e8 (0:33e8) ld a, [wEngagedTrainerClass] - cp $c8 + SONY1 + cp OPP_SONY1 ret z - cp $c8 + SONY2 + cp OPP_SONY2 ret z - cp $c8 + SONY3 + cp OPP_SONY3 ret z ld a, [W_GYMLEADERNO] and a diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index d5aa57c1..e0444a1c 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -134,7 +134,7 @@ CeruleanCityScript1: ; 19567 (6:5567) ld hl, CeruleanCityText_1966d ld de, CeruleanCityText_19672 call SaveEndBattleTextPointers - ld a, SONY1 + $c8 + ld a, OPP_SONY1 ld [W_CUROPPONENT], a ; select which team to use during the encounter diff --git a/scripts/gary.asm b/scripts/gary.asm index 9a3b1582..3215a04f 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -64,7 +64,7 @@ GaryScript2: ; 75f6a (1d:5f6a) ld hl, GaryText_760f9 ld de, GaryText_760fe call SaveEndBattleTextPointers - ld a, SONY3 + $c8 + ld a, OPP_SONY3 ld [W_CUROPPONENT], a ; select which team to use during the encounter diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index db6fa696..9d3cd7b1 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -381,7 +381,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9) ret nz ; define which team rival uses, and fight it - ld a, SONY1 + $C8 + ld a, OPP_SONY1 ld [W_CUROPPONENT], a ld a, [W_RIVALSTARTER] cp STARTER2 diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index 5422d887..bee2b3b2 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -142,7 +142,7 @@ PokemonTower2Text1: ; 605df (18:45df) ld hl, PokemonTower2Text_60632 ld de, PokemonTower2Text_60637 call SaveEndBattleTextPointers - ld a, SONY2 + $c8 + ld a, OPP_SONY2 ld [W_CUROPPONENT], a ; select which team to use during the encounter diff --git a/scripts/route22.asm b/scripts/route22.asm index f6f6778e..1244f0ff 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -131,7 +131,7 @@ Route22Script1: ; 50f62 (14:4f62) ld hl, Route22RivalDefeatedText1 ld de, Route22Text_511bc call SaveEndBattleTextPointers - ld a, SONY1 + $c8 + ld a, OPP_SONY1 ld [W_CUROPPONENT], a ld hl, StarterMons_50faf call Route22Script_50ed6 @@ -287,7 +287,7 @@ Route22Script4: ; 51087 (14:5087) ld hl, Route22RivalDefeatedText2 ld de, Route22Text_511d0 call SaveEndBattleTextPointers - ld a, SONY2 + $c8 + ld a, OPP_SONY2 ld [W_CUROPPONENT], a ld hl, StarterMons_510d9 call Route22Script_50ed6 diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 0de4b324..5333e07f 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -183,7 +183,7 @@ SilphCo7Script3: ; 51c82 (14:5c82) ld hl, SilphCo7Text14 ld de, SilphCo7Text_51ecd call SaveEndBattleTextPointers - ld a, SONY2 + $c8 + ld a, OPP_SONY2 ld [W_CUROPPONENT], a ld a, [W_RIVALSTARTER] cp STARTER2 diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index c4afd9d0..8bcc2b17 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -97,7 +97,7 @@ SSAnne2Script1: ; 61430 (18:5430) ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 - ld a, SONY2 + $c8 + ld a, OPP_SONY2 ld [W_CUROPPONENT], a ; select which team to use during the encounter diff --git a/wram.asm b/wram.asm index dfec60d6..c88ba8e0 100755 --- a/wram.asm +++ b/wram.asm @@ -1518,7 +1518,7 @@ wPartyGainExpFlags:: ; d058 W_CUROPPONENT:: ; d059 ; in a wild battle, this is the species of pokemon -; in a trainer battle, this is the trainer class + $C8 +; in a trainer battle, this is the trainer class + 200 ds 1 W_BATTLETYPE:: ; d05a @@ -2789,7 +2789,7 @@ W_FOSSILMON:: ; d710 ds 2 W_ENEMYMONORTRAINERCLASS:: ; d713 -; trainer classes start at $c8 +; trainer classes start at 200 ds 1 wPlayerJumpingYScreenCoordsIndex:: ; d714 -- cgit v1.3.1-sl0p