aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/museum2f.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/museum2f.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/museum2f.asm')
-rwxr-xr-xscripts/museum2f.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/museum2f.asm b/scripts/museum2f.asm
index 56d113ae..93a8396e 100755
--- a/scripts/museum2f.asm
+++ b/scripts/museum2f.asm
@@ -1,8 +1,8 @@
-Museum2FScript: ; 5c317 (17:4317)
+Museum2FScript:
call EnableAutoTextBoxDrawing
ret
-Museum2FTextPointers: ; 5c31a (17:431a)
+Museum2FTextPointers:
dw Museum2FText1
dw Museum2FText2
dw Museum2FText3
@@ -11,23 +11,23 @@ Museum2FTextPointers: ; 5c31a (17:431a)
dw Museum2FText6
dw Museum2FText7
-Museum2FText1: ; 5c328 (17:4328)
+Museum2FText1:
TX_FAR _Museum2FText1
db "@"
-Museum2FText2: ; 5c32d (17:432d)
+Museum2FText2:
TX_FAR _Museum2FText2
db "@"
-Museum2FText3: ; 5c332 (17:4332)
+Museum2FText3:
TX_FAR _Museum2FText3
db "@"
-Museum2FText4: ; 5c337 (17:4337)
+Museum2FText4:
TX_FAR _Museum2FText4
db "@"
-Museum2FText5: ; 5c33c (17:433c)
+Museum2FText5:
TX_ASM
ld a, [wd472]
bit 7, a
@@ -62,10 +62,10 @@ Museum2FText_5c218:
TX_FAR _Museum2FPikachuText2
db "@"
-Museum2FText6: ; 5c341 (17:4341)
+Museum2FText6:
TX_FAR _Museum2FText6
db "@"
-Museum2FText7: ; 5c346 (17:4346)
+Museum2FText7:
TX_FAR _Museum2FText7
db "@"