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/Route16FlyHouse.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/Route16FlyHouse.asm')
| -rw-r--r-- | scripts/Route16FlyHouse.asm | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/scripts/Route16FlyHouse.asm b/scripts/Route16FlyHouse.asm index 3bb34b75..5929b623 100644 --- a/scripts/Route16FlyHouse.asm +++ b/scripts/Route16FlyHouse.asm @@ -2,54 +2,55 @@ Route16FlyHouse_Script: jp EnableAutoTextBoxDrawing Route16FlyHouse_TextPointers: - dw Route16HouseText1 - dw Route16HouseText2 + def_text_pointers + dw_const Route16FlyHouseBrunetteGirlText, TEXT_ROUTE16FLYHOUSE_BRUNETTE_GIRL + dw_const Route16FlyHouseFearowText, TEXT_ROUTE16FLYHOUSE_FEAROW -Route16HouseText1: +Route16FlyHouseBrunetteGirlText: text_asm CheckEvent EVENT_GOT_HM02 - ld hl, HM02ExplanationText + ld hl, .HM02ExplanationText jr nz, .got_item - ld hl, Route16HouseText3 + ld hl, .Text call PrintText lb bc, HM_FLY, 1 call GiveItem jr nc, .bag_full SetEvent EVENT_GOT_HM02 - ld hl, ReceivedHM02Text + ld hl, .ReceivedHM02Text jr .got_item .bag_full - ld hl, HM02NoRoomText + ld hl, .HM02NoRoomText .got_item call PrintText jp TextScriptEnd -Route16HouseText3: - text_far _Route16HouseText3 +.Text: + text_far _Route16FlyHouseBrunetteGirlText text_end -ReceivedHM02Text: - text_far _ReceivedHM02Text +.ReceivedHM02Text: + text_far _Route16FlyHouseBrunetteGirlReceivedHM02Text sound_get_key_item text_end -HM02ExplanationText: - text_far _HM02ExplanationText +.HM02ExplanationText: + text_far _Route16FlyHouseBrunetteGirlHM02ExplanationText text_end -HM02NoRoomText: - text_far _HM02NoRoomText +.HM02NoRoomText: + text_far _Route16FlyHouseBrunetteGirlHM02NoRoomText text_end -Route16HouseText2: +Route16FlyHouseFearowText: text_asm - ld hl, Route16HouseText_1e652 + ld hl, .Text call PrintText ld a, FEAROW call PlayCry call WaitForSoundToFinish jp TextScriptEnd -Route16HouseText_1e652: - text_far _Route16HouseText_1e652 +.Text: + text_far _Route16FlyHouseFearowText text_end |