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/CinnabarLabMetronomeRoom.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/CinnabarLabMetronomeRoom.asm')
| -rw-r--r-- | scripts/CinnabarLabMetronomeRoom.asm | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/scripts/CinnabarLabMetronomeRoom.asm b/scripts/CinnabarLabMetronomeRoom.asm index b43f98e2..8375eb39 100644 --- a/scripts/CinnabarLabMetronomeRoom.asm +++ b/scripts/CinnabarLabMetronomeRoom.asm @@ -2,61 +2,61 @@ CinnabarLabMetronomeRoom_Script: jp EnableAutoTextBoxDrawing CinnabarLabMetronomeRoom_TextPointers: - dw Lab3Text1 - dw Lab3Text2 - dw Lab3Text3 - dw Lab3Text4 - dw Lab3Text5 + def_text_pointers + dw_const CinnabarLabMetronomeRoomScientist1Text, TEXT_CINNABARLABMETRONOMEROOM_SCIENTIST1 + dw_const CinnabarLabMetronomeRoomScientist2Text, TEXT_CINNABARLABMETRONOMEROOM_SCIENTIST2 + dw_const CinnabarLabMetronomeRoomPCText, TEXT_CINNABARLABMETRONOMEROOM_PC_KEYBOARD + dw_const CinnabarLabMetronomeRoomPCText, TEXT_CINNABARLABMETRONOMEROOM_PC_MONITOR + dw_const CinnabarLabMetronomeRoomAmberPipeText, TEXT_CINNABARLABMETRONOMEROOM_AMBER_PIPE -Lab3Text1: +CinnabarLabMetronomeRoomScientist1Text: text_asm CheckEvent EVENT_GOT_TM35 jr nz, .got_item - ld hl, TM35PreReceiveText + ld hl, .Text call PrintText lb bc, TM_METRONOME, 1 call GiveItem jr nc, .bag_full - ld hl, ReceivedTM35Text + ld hl, .ReceivedTM35Text call PrintText SetEvent EVENT_GOT_TM35 jr .done .bag_full - ld hl, TM35NoRoomText + ld hl, .TM35NoRoomText call PrintText jr .done .got_item - ld hl, TM35ExplanationText + ld hl, .TM35ExplanationText call PrintText .done jp TextScriptEnd -TM35PreReceiveText: - text_far _TM35PreReceiveText +.Text: + text_far _CinnabarLabMetronomeRoomScientist1Text text_end -ReceivedTM35Text: - text_far _ReceivedTM35Text +.ReceivedTM35Text: + text_far _CinnabarLabMetronomeRoomScientist1ReceivedTM35Text sound_get_item_1 text_end -TM35ExplanationText: - text_far _TM35ExplanationText +.TM35ExplanationText: + text_far _CinnabarLabMetronomeRoomScientist1TM35ExplanationText text_end -TM35NoRoomText: - text_far _TM35NoRoomText +.TM35NoRoomText: + text_far _CinnabarLabMetronomeRoomScientist1TM35NoRoomText text_end -Lab3Text2: - text_far _Lab3Text2 +CinnabarLabMetronomeRoomScientist2Text: + text_far _CinnabarLabMetronomeRoomScientist2Text text_end -Lab3Text4: -Lab3Text3: - text_far _Lab3Text3 +CinnabarLabMetronomeRoomPCText: + text_far _CinnabarLabMetronomeRoomPCText text_end -Lab3Text5: - text_far _Lab3Text5 +CinnabarLabMetronomeRoomAmberPipeText: + text_far _CinnabarLabMetronomeRoomAmberPipeText text_end |