diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
| commit | c979b3bb03b121dd03a800df74144cd69a74601a (patch) | |
| tree | 0d6bb48125efe6f6215347967383ba4c3b7da391 /scripts/safarizonesecrethouse.asm | |
| parent | Sync with pokered (diff) | |
| parent | Part 1 of syncing with pokered. (diff) | |
| download | pokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.tar.gz pokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.tar.xz pokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.zip | |
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'scripts/safarizonesecrethouse.asm')
| -rwxr-xr-x | scripts/safarizonesecrethouse.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/safarizonesecrethouse.asm b/scripts/safarizonesecrethouse.asm index 8881472b..37013b3b 100755 --- a/scripts/safarizonesecrethouse.asm +++ b/scripts/safarizonesecrethouse.asm @@ -1,10 +1,10 @@ -SafariZoneSecretHouseScript: ; 4a317 (12:6317) +SafariZoneSecretHouseScript: jp EnableAutoTextBoxDrawing -SafariZoneSecretHouseTextPointers: ; 4a31a (12:631a) +SafariZoneSecretHouseTextPointers: dw SafariZoneSecretHouseText1 -SafariZoneSecretHouseText1: ; 4a31c (12:631c) +SafariZoneSecretHouseText1: TX_ASM CheckEvent EVENT_GOT_HM03 jr nz, .asm_20a9b @@ -27,18 +27,18 @@ SafariZoneSecretHouseText1: ; 4a31c (12:631c) .asm_8f1fc jp TextScriptEnd -SafariZoneSecretHouseText_4a350: ; 4a350 (12:6350) +SafariZoneSecretHouseText_4a350: TX_FAR _SecretHouseText_4a350 db "@" -ReceivedHM03Text: ; 4a355 (12:6355) +ReceivedHM03Text: TX_FAR _ReceivedHM03Text db $0B, "@" -HM03ExplanationText: ; 4a35b (12:635b) +HM03ExplanationText: TX_FAR _HM03ExplanationText db "@" -HM03NoRoomText: ; 4a360 (12:6360) +HM03NoRoomText: TX_FAR _HM03NoRoomText db "@" |