aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/vermilionhouse2.asm
diff options
context:
space:
mode:
authorDaniel Harding <corrnondacqb@yahoo.com>2015-07-03 16:03:10 -0500
committerDaniel Harding <corrnondacqb@yahoo.com>2015-07-03 16:03:10 -0500
commitec4c53559379f3bf7bd332905ba144e1d998f38b (patch)
treef8ee8f2d9c8042b55edb1a4761833511ab1695b1 /scripts/vermilionhouse2.asm
parentMerge pull request #96 from dannye/master (diff)
parentNo more ldh (diff)
downloadpokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.gz
pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.xz
pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.zip
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'scripts/vermilionhouse2.asm')
-rwxr-xr-xscripts/vermilionhouse2.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/vermilionhouse2.asm b/scripts/vermilionhouse2.asm
index 7c06c6e9..775c32bb 100755
--- a/scripts/vermilionhouse2.asm
+++ b/scripts/vermilionhouse2.asm
@@ -5,7 +5,7 @@ VermilionHouse2TextPointers: ; 56073 (15:6073)
dw VermilionHouse2Text1
VermilionHouse2Text1: ; 56075 (15:6075)
- db $08 ; asm
+ TX_ASM
ld a, [wd728]
bit 3, a
jr nz, .asm_03ef5
@@ -39,9 +39,9 @@ VermilionHouse2Text_560b1: ; 560b1 (15:60b1)
db "@"
VermilionHouse2Text_560b6: ; 560b6 (15:60b6)
- TX_FAR _VermilionHouse2Text_560b6 ; 0x9c554
+ TX_FAR _VermilionHouse2Text_560b6
db $0B
- TX_FAR _VermilionHouse2Text_560bb ; 0x9c5a4
+ TX_FAR _VermilionHouse2Text_560bb
db "@"
VermilionHouse2Text_560c0: ; 560c0 (15:60c0)