aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/ceruleanhouse1.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/ceruleanhouse1.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/ceruleanhouse1.asm')
-rwxr-xr-xscripts/ceruleanhouse1.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/ceruleanhouse1.asm b/scripts/ceruleanhouse1.asm
index 4b6a240a..e703d830 100755
--- a/scripts/ceruleanhouse1.asm
+++ b/scripts/ceruleanhouse1.asm
@@ -10,7 +10,7 @@ CeruleanHouse1Text1: ; 1d6fd (7:56fd)
db "@"
CeruleanHouse1Text2: ; 1d702 (7:5702)
- db $08 ; asm
+ TX_ASM
ld a, $6
ld [wWhichTrade], a
predef DoInGameTradeDialogue