summaryrefslogtreecommitdiff
path: root/constants/music_constants.asm
diff options
context:
space:
mode:
Diffstat (limited to 'constants/music_constants.asm')
-rw-r--r--constants/music_constants.asm22
1 files changed, 19 insertions, 3 deletions
diff --git a/constants/music_constants.asm b/constants/music_constants.asm
index fcca9005..46955712 100644
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -45,7 +45,7 @@ ENDM
music_const MUSIC_BIKE_RIDING, Music_BikeRiding
music_const MUSIC_SURFING, Music_Surfing
music_const MUSIC_GAME_CORNER, Music_GameCorner
- music_const MUSIC_INTRO_BATTLE, Music_IntroBattle
+ music_const MUSIC_YELLOW_INTRO, Music_YellowIntro
music_const MUSIC_DUNGEON1, Music_Dungeon1
music_const MUSIC_DUNGEON2, Music_Dungeon2
music_const MUSIC_DUNGEON3, Music_Dungeon3
@@ -56,7 +56,13 @@ ENDM
music_const MUSIC_MEET_FEMALE_TRAINER, Music_MeetFemaleTrainer
music_const MUSIC_MEET_MALE_TRAINER, Music_MeetMaleTrainer
- ; AUDIO_1 AUDIO_2 AUDIO_3
+ ; AUDIO_4
+ music_const MUSIC_SURFING_PIKACHU, Music_SurfingPikachu
+ music_const MUSIC_MEET_JESSIE_JAMES, Music_MeetJessieJames
+ music_const MUSIC_YELLOW_UNUSED_SONG, Music_YellowUnusedSong
+ music_const MUSIC_GB_PRINTER, Music_GBPrinter
+
+ ; AUDIO_1 AUDIO_2 AUDIO_3 AUDIO_4
NOISE_INSTRUMENTS_START EQUS "SFX_NOISE_INSTRUMENT01"
music_const SFX_NOISE_INSTRUMENT01, SFX_Noise_Instrument01_1
music_const SFX_NOISE_INSTRUMENT02, SFX_Noise_Instrument02_1
@@ -127,9 +133,10 @@ CRY_SFX_END EQUS "SFX_CRY_25 + 3"
music_const SFX_START_MENU, SFX_Start_Menu_1
music_const SFX_PRESS_AB, SFX_Press_AB_1
- ; AUDIO_1 AUDIO_3
+ ; AUDIO_1 AUDIO_3 AUDIO_4
music_const SFX_GET_ITEM_1, SFX_Get_Item1_1
+ ; AUDIO_1 AUDIO_3
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
@@ -241,4 +248,13 @@ MAX_SFX_ID_2 EQUS "SFX_SILPH_SCOPE"
music_const SFX_SHOOTING_STAR, SFX_Shooting_Star
MAX_SFX_ID_3 EQUS "SFX_SHOOTING_STAR"
+ ; AUDIO_4
+ music_const SFX_SURFING_JUMP, SFX_Surfing_Jump
+ music_const SFX_SURFING_FLIP, SFX_Surfing_Flip
+ music_const SFX_SURFING_CRASH, SFX_Surfing_Crash
+ music_const SFX_UNKNOWN_802CC_4, SFX_802cc_4
+ music_const SFX_SURFING_LAND, SFX_Surfing_Land
+ music_const SFX_GET_ITEM2_4_2, SFX_Get_Item2_4_2
+MAX_SFX_ID_4 EQUS "SFX_GET_ITEM2_4_2 + 2"
+
SFX_STOP_ALL_MUSIC EQU $ff