diff options
author | Bryan Bishop <kanzure@gmail.com> | 2013-08-26 11:50:30 -0500 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-26 11:50:30 -0500 |
commit | c61b3d42ad4e88b32e9c321b7fcc559ec0220e64 (patch) | |
tree | eba145aa3ec6cc1216604b953dfe2bdce6e94dd2 /constants | |
parent | 5098ed740d35d4f2a2d5414f309bf25e754e189c (diff) | |
parent | 76fe7c5aa1b93a6d03280ad54f411e351dd0abc2 (diff) |
Merge remote-tracking branch 'yenatch/merge-kanzure-again' into master
Diffstat (limited to 'constants')
-rw-r--r-- | constants/music_constants.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/constants/music_constants.asm b/constants/music_constants.asm index b4e65b5c5..69eae952f 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -149,7 +149,7 @@ SFX_POKEFLUTE EQU $26 SFX_ELEVATOR_END EQU $27 SFX_THROW_BALL EQU $28 SFX_BALL_POOF EQU $29 -SFX_UNKNOWN_3A EQU $2a +SFX_UNKNOWN_2A EQU $2a SFX_RUN EQU $2b SFX_SLOT_MACHINE_START EQU $2c SFX_FANFARE EQU $2d @@ -254,7 +254,7 @@ SFX_MORNING_SUN EQU $8f SFX_LEVEL_UP EQU $90 SFX_KEY_ITEM EQU $91 SFX_FANFARE_2 EQU $92 -SFX_REGISTER_PHONE_# EQU $93 +SFX_REGISTER_PHONE_NUMBER EQU $93 SFX_3RD_PLACE EQU $94 SFX_GET_EGG_FROM_DAYCARE_MAN EQU $95 SFX_GET_EGG_FROM_DAYCARE_LADY EQU $96 |