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/route16house.asm | |
| parent | 041c4f28a3c35e31329222769534942439b70f29 (diff) | |
| parent | 401d6e7f36e86aa246a2c0591195e1f0f01e879f (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'scripts/route16house.asm')
| -rwxr-xr-x | scripts/route16house.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/route16house.asm b/scripts/route16house.asm index ee23fd89..d8c9d5ed 100755 --- a/scripts/route16house.asm +++ b/scripts/route16house.asm @@ -1,11 +1,11 @@ -Route16HouseScript: ; 1e5f8 (7:65f8) +Route16HouseScript: jp EnableAutoTextBoxDrawing -Route16HouseTextPointers: ; 1e5fb (7:65fb) +Route16HouseTextPointers: dw Route16HouseText1 dw Route16HouseText2 -Route16HouseText1: ; 1e5ff (7:65ff) +Route16HouseText1: TX_ASM CheckEvent EVENT_GOT_HM02 ld hl, HM02ExplanationText @@ -24,23 +24,23 @@ Route16HouseText1: ; 1e5ff (7:65ff) call PrintText jp TextScriptEnd -Route16HouseText3: ; 1e62b (7:662b) +Route16HouseText3: TX_FAR _Route16HouseText3 db "@" -ReceivedHM02Text: ; 1e630 (7:6630) +ReceivedHM02Text: TX_FAR _ReceivedHM02Text db $11, "@" -HM02ExplanationText: ; 1e636 (7:6636) +HM02ExplanationText: TX_FAR _HM02ExplanationText db "@" -HM02NoRoomText: ; 1e63b (7:663b) +HM02NoRoomText: TX_FAR _HM02NoRoomText db "@" -Route16HouseText2: ; 1e640 (7:6640) +Route16HouseText2: TX_ASM ld hl, Route16HouseText_1e652 call PrintText @@ -49,6 +49,6 @@ Route16HouseText2: ; 1e640 (7:6640) call WaitForSoundToFinish jp TextScriptEnd -Route16HouseText_1e652: ; 1e652 (7:6652) +Route16HouseText_1e652: TX_FAR _Route16HouseText_1e652 db "@" |