aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/lavendertown.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 17:55:02 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 17:55:02 -0400
commitd2ed7674f499b1fd6c4059da40b8b42c6bf96995 (patch)
treef581489b522fc647477d7b36dee072d553c44fd1 /scripts/lavendertown.asm
parentMake pokeyellow build to baserom. (diff)
parentMerge pull request #114 from YamaArashi/master (diff)
downloadpokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.tar.gz
pokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.tar.xz
pokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.zip
Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
Diffstat (limited to 'scripts/lavendertown.asm')
-rwxr-xr-xscripts/lavendertown.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lavendertown.asm b/scripts/lavendertown.asm
index a4f1f200..30c6d4e5 100755
--- a/scripts/lavendertown.asm
+++ b/scripts/lavendertown.asm
@@ -13,16 +13,16 @@ LavenderTownTextPointers: ; 4410e (11:410e)
dw LavenderTownText9
LavenderTownText1: ; 44120 (11:4120)
- db $08 ; asm
+ TX_ASM
ld hl, LavenderTownText_4413c
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
ld hl, LavenderTownText_44146
- jr nz, .asm_40831 ; 0x44131
+ jr nz, .asm_40831
ld hl, LavenderTownText_44141
-.asm_40831 ; 0x44136
+.asm_40831
call PrintText
jp TextScriptEnd