aboutsummaryrefslogtreecommitdiffstats
path: root/engine/oak_speech.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-08-30 21:38:41 -0500
committerdannye <corrnondacqb@yahoo.com>2015-08-30 21:38:41 -0500
commit38065a744de1065cc021a4cafe22476f8425448d (patch)
treea37a103d7c22f3cc5f62689e5062877961493caa /engine/oak_speech.asm
parentMerge pull request #116 from YamaArashi/master (diff)
downloadpokeyellow-38065a744de1065cc021a4cafe22476f8425448d.tar.gz
pokeyellow-38065a744de1065cc021a4cafe22476f8425448d.tar.xz
pokeyellow-38065a744de1065cc021a4cafe22476f8425448d.zip
No more W_
Diffstat (limited to 'engine/oak_speech.asm')
-rwxr-xr-xengine/oak_speech.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm
index 48e8da80..d5f13a7a 100755
--- a/engine/oak_speech.asm
+++ b/engine/oak_speech.asm
@@ -1,7 +1,7 @@
SetDefaultNames: ; 60ca (1:60ca)
ld a, [wLetterPrintingDelayFlags]
push af
- ld a, [W_OPTIONS]
+ ld a, [wOptions]
push af
ld a, [wd732]
push af
@@ -16,7 +16,7 @@ SetDefaultNames: ; 60ca (1:60ca)
pop af
ld [wd732], a
pop af
- ld [W_OPTIONS], a
+ ld [wOptions], a
pop af
ld [wLetterPrintingDelayFlags], a
ld a, [wOptionsInitialized]
@@ -27,7 +27,7 @@ SetDefaultNames: ; 60ca (1:60ca)
ld bc, NAME_LENGTH
call CopyData
ld hl, SonyText
- ld de, W_RIVALNAME
+ ld de, wRivalName
ld bc, NAME_LENGTH
jp CopyData