aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/silphco7.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-08-10 00:00:12 -0500
committerdannye <corrnondacqb@yahoo.com>2015-08-10 00:00:12 -0500
commit66bc517605860c9f716a176ed467d34097985895 (patch)
tree4c126cbb3bbdb2b0a236375c2140e7a6c25260a6 /scripts/silphco7.asm
parentReplace some hardcoded data sizes (diff)
parentcommented audio code (diff)
downloadpokeyellow-66bc517605860c9f716a176ed467d34097985895.tar.gz
pokeyellow-66bc517605860c9f716a176ed467d34097985895.tar.xz
pokeyellow-66bc517605860c9f716a176ed467d34097985895.zip
Merge branch 'master' of https://github.com/YamaArashi/pokered
Diffstat (limited to 'scripts/silphco7.asm')
-rwxr-xr-xscripts/silphco7.asm4
1 files changed, 2 insertions, 2 deletions
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