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 /data/maps/objects/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 'data/maps/objects/CinnabarLabMetronomeRoom.asm')
| -rw-r--r-- | data/maps/objects/CinnabarLabMetronomeRoom.asm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm index ceadc217..926e9024 100644 --- a/data/maps/objects/CinnabarLabMetronomeRoom.asm +++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm @@ -1,3 +1,7 @@ + object_const_def + const CINNABARLABMETRONOMEROOM_SCIENTIST1 + const CINNABARLABMETRONOMEROOM_SCIENTIST2 + CinnabarLabMetronomeRoom_Object: db $17 ; border block @@ -6,12 +10,12 @@ CinnabarLabMetronomeRoom_Object: warp_event 3, 7, CINNABAR_LAB, 4 def_bg_events - bg_event 0, 4, 3 ; Lab3Text3 - bg_event 1, 4, 4 ; Lab3Text4 - bg_event 2, 1, 5 ; Lab3Text5 + bg_event 0, 4, TEXT_CINNABARLABMETRONOMEROOM_PC_KEYBOARD + bg_event 1, 4, TEXT_CINNABARLABMETRONOMEROOM_PC_MONITOR + bg_event 2, 1, TEXT_CINNABARLABMETRONOMEROOM_AMBER_PIPE def_object_events - object_event 7, 2, SPRITE_SCIENTIST, STAY, DOWN, 1 ; person - object_event 2, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 2 ; person + object_event 7, 2, SPRITE_SCIENTIST, STAY, DOWN, TEXT_CINNABARLABMETRONOMEROOM_SCIENTIST1 + object_event 2, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, TEXT_CINNABARLABMETRONOMEROOM_SCIENTIST2 def_warps_to CINNABAR_LAB_METRONOME_ROOM |