diff options
author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
---|---|---|
committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
commit | f5983c0f813d3d908b6016db3ed866e4ca9437dc (patch) | |
tree | d6888723f443557ce45c9a00d873caa5e7a8930e /scripts/silphco1.asm | |
parent | 041c4f28a3c35e31329222769534942439b70f29 (diff) | |
parent | 401d6e7f36e86aa246a2c0591195e1f0f01e879f (diff) |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'scripts/silphco1.asm')
-rwxr-xr-x | scripts/silphco1.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/silphco1.asm b/scripts/silphco1.asm index cfd51dc1..c0cb169b 100755 --- a/scripts/silphco1.asm +++ b/scripts/silphco1.asm @@ -1,4 +1,4 @@ -SilphCo1Script: ; 5d44e (17:544e) +SilphCo1Script: call EnableAutoTextBoxDrawing CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ret z @@ -8,9 +8,9 @@ SilphCo1Script: ; 5d44e (17:544e) ld [wMissableObjectIndex], a predef_jump ShowObject -SilphCo1TextPointers: ; 5d469 (17:5469) +SilphCo1TextPointers: dw SilphCo1Text1 -SilphCo1Text1: ; 5d46b (17:546b) +SilphCo1Text1: TX_FAR _SilphCo1Text1 db "@" |