diff options
| author | vulcandth <vulcandth@gmail.com> | 2023-07-13 20:27:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 21:27:56 -0400 |
| commit | d001ced41b53271373753de835a9c3b3413dc318 (patch) | |
| tree | ff2db7f403bddfcdeb12e50def8411cafedcdd5e /scripts/SafariZoneSecretHouse.asm | |
| parent | Make wCurrentBoxNum a byte instead of word (#414) (diff) | |
| download | pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.gz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.xz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.zip | |
Add macros, constants, and labels for map scripts and text (#367)
This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
Diffstat (limited to 'scripts/SafariZoneSecretHouse.asm')
| -rw-r--r-- | scripts/SafariZoneSecretHouse.asm | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/scripts/SafariZoneSecretHouse.asm b/scripts/SafariZoneSecretHouse.asm index 6eeff8ad..f8058641 100644 --- a/scripts/SafariZoneSecretHouse.asm +++ b/scripts/SafariZoneSecretHouse.asm @@ -2,44 +2,45 @@ SafariZoneSecretHouse_Script: jp EnableAutoTextBoxDrawing SafariZoneSecretHouse_TextPointers: - dw SafariZoneSecretHouseText1 + def_text_pointers + dw_const SafariZoneSecretHouseFishingGuruText, TEXT_SAFARIZONESECRETHOUSE_FISHING_GURU -SafariZoneSecretHouseText1: +SafariZoneSecretHouseFishingGuruText: text_asm CheckEvent EVENT_GOT_HM03 jr nz, .got_item - ld hl, SafariZoneSecretHouseText_4a350 + ld hl, .YouHaveWonText call PrintText lb bc, HM_SURF, 1 call GiveItem jr nc, .bag_full - ld hl, ReceivedHM03Text + ld hl, .ReceivedHM03Text call PrintText SetEvent EVENT_GOT_HM03 jr .done .bag_full - ld hl, HM03NoRoomText + ld hl, .HM03NoRoomText call PrintText jr .done .got_item - ld hl, HM03ExplanationText + ld hl, .HM03ExplanationText call PrintText .done jp TextScriptEnd -SafariZoneSecretHouseText_4a350: - text_far _SecretHouseText_4a350 +.YouHaveWonText: + text_far _SafariZoneSecretHouseFishingGuruYouHaveWonText text_end -ReceivedHM03Text: - text_far _ReceivedHM03Text +.ReceivedHM03Text: + text_far _SafariZoneSecretHouseFishingGuruReceivedHM03Text sound_get_item_1 text_end -HM03ExplanationText: - text_far _HM03ExplanationText +.HM03ExplanationText: + text_far _SafariZoneSecretHouseFishingGuruHM03ExplanationText text_end -HM03NoRoomText: - text_far _HM03NoRoomText +.HM03NoRoomText: + text_far _SafariZoneSecretHouseFishingGuruHM03NoRoomText text_end |