aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/ceruleancity.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/ceruleancity.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/ceruleancity.asm')
-rwxr-xr-xscripts/ceruleancity.asm4
1 files changed, 2 insertions, 2 deletions
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