aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/vermilionhouse1.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-06-11 16:16:56 -0500
committerdannye <corrnondacqb@yahoo.com>2016-06-11 16:16:56 -0500
commitc979b3bb03b121dd03a800df74144cd69a74601a (patch)
tree0d6bb48125efe6f6215347967383ba4c3b7da391 /scripts/vermilionhouse1.asm
parentSync with pokered (diff)
parentPart 1 of syncing with pokered. (diff)
downloadpokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.tar.gz
pokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.tar.xz
pokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.zip
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'scripts/vermilionhouse1.asm')
-rwxr-xr-xscripts/vermilionhouse1.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/vermilionhouse1.asm b/scripts/vermilionhouse1.asm
index bfb3da5f..d2dac4ca 100755
--- a/scripts/vermilionhouse1.asm
+++ b/scripts/vermilionhouse1.asm
@@ -1,17 +1,17 @@
-VermilionHouse1Script: ; 1dafc (7:5afc)
+VermilionHouse1Script:
call EnableAutoTextBoxDrawing
ret
-VermilionHouse1TextPointers: ; 1db00 (7:5b00)
+VermilionHouse1TextPointers:
dw VermilionHouse1Text1
dw VermilionHouse1Text2
dw VermilionHouse1Text3
-VermilionHouse1Text1: ; 1db06 (7:5b06)
+VermilionHouse1Text1:
TX_FAR _VermilionHouse1Text1
db "@"
-VermilionHouse1Text2: ; 1db0b (7:5b0b)
+VermilionHouse1Text2:
TX_FAR _VermilionHouse1Text2
TX_ASM
ld a, PIDGEY
@@ -19,6 +19,6 @@ VermilionHouse1Text2: ; 1db0b (7:5b0b)
call WaitForSoundToFinish
jp TextScriptEnd
-VermilionHouse1Text3: ; 1db1b (7:5b1b)
+VermilionHouse1Text3:
TX_FAR _VermilionHouse1Text3
db "@"