summaryrefslogtreecommitdiff
path: root/scripts/route23.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-07-18 08:17:29 -0700
committerYamaArashi <shadow962@live.com>2015-07-18 08:17:46 -0700
commitfc9af362ae65d24c66b39ea7759637cc9c1f9b0a (patch)
tree37074f79564b1e47b109566dfd9c3c454a4cc226 /scripts/route23.asm
parentb85d7c65f35e93534a871ed34b1950daf59ab189 (diff)
fix variable naming
Diffstat (limited to 'scripts/route23.asm')
-rwxr-xr-xscripts/route23.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/route23.asm b/scripts/route23.asm
index 5ed038c2..eeaf2a2b 100755
--- a/scripts/route23.asm
+++ b/scripts/route23.asm
@@ -49,9 +49,9 @@ Route23Script0: ; 51219 (14:5219)
ret nc
.asm_51237
ld a, e
- ld [$ff8c], a
+ ld [hSpriteIndexOrTextID], a
ld a, c
- ld [wWhichTrade], a
+ ld [wWhichBadge], a
ld b, $2
ld hl, wd7ed
predef FlagActionPredef
@@ -69,21 +69,21 @@ YCoordsData_51255: ; 51255 (14:5255)
Route23Script_5125d: ; 5125d (14:525d)
ld hl, BadgeTextPointers
- ld a, [wWhichTrade]
+ ld a, [wWhichBadge]
ld c, a
- ld b, $0
+ ld b, 0
add hl, bc
add hl, bc
ld a, [hli]
ld h, [hl]
ld l, a
ld de, wcd6d
-.asm_5126e
+.copyTextLoop
ld a, [hli]
ld [de], a
inc de
- cp $50
- jr nz, .asm_5126e
+ cp "@"
+ jr nz, .copyTextLoop
ret
BadgeTextPointers: ; 51276 (14:5276)
@@ -188,9 +188,9 @@ Route23Text7: ; 5133d (14:533d)
jp TextScriptEnd
Route23Script_51346: ; 51346 (14:5346)
- ld [wWhichTrade], a
+ ld [wWhichBadge], a
call Route23Script_5125d
- ld a, [wWhichTrade]
+ ld a, [wWhichBadge]
inc a
ld c, a
ld b, $2
@@ -208,7 +208,7 @@ Route23Script_51346: ; 51346 (14:5346)
.asm_5136e
ld hl, VictoryRoadGuardText2
call PrintText
- ld a, [wWhichTrade]
+ ld a, [wWhichBadge]
ld c, a
ld b, $1
ld hl, wd7ed