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/CopycatsHouse2F.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/CopycatsHouse2F.asm')
| -rw-r--r-- | data/maps/objects/CopycatsHouse2F.asm | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm index 86449065..dbc9918d 100644 --- a/data/maps/objects/CopycatsHouse2F.asm +++ b/data/maps/objects/CopycatsHouse2F.asm @@ -1,3 +1,10 @@ + object_const_def + const COPYCATSHOUSE2F_COPYCAT + const COPYCATSHOUSE2F_DODUO + const COPYCATSHOUSE2F_MONSTER + const COPYCATSHOUSE2F_BIRD + const COPYCATSHOUSE2F_FAIRY + CopycatsHouse2F_Object: db $a ; border block @@ -5,14 +12,14 @@ CopycatsHouse2F_Object: warp_event 7, 1, COPYCATS_HOUSE_1F, 3 def_bg_events - bg_event 3, 5, 6 ; CopycatsHouse2FText6 - bg_event 0, 1, 7 ; CopycatsHouse2FText7 + bg_event 3, 5, TEXT_COPYCATSHOUSE2F_SNES + bg_event 0, 1, TEXT_COPYCATSHOUSE2F_PC def_object_events - object_event 4, 3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, 1 ; person - object_event 4, 6, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person - object_event 5, 1, SPRITE_MONSTER, STAY, DOWN, 3 ; person - object_event 2, 0, SPRITE_BIRD, STAY, DOWN, 4 ; person - object_event 1, 6, SPRITE_FAIRY, STAY, RIGHT, 5 ; person + object_event 4, 3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, TEXT_COPYCATSHOUSE2F_COPYCAT + object_event 4, 6, SPRITE_BIRD, WALK, LEFT_RIGHT, TEXT_COPYCATSHOUSE2F_DODUO + object_event 5, 1, SPRITE_MONSTER, STAY, DOWN, TEXT_COPYCATSHOUSE2F_MONSTER + object_event 2, 0, SPRITE_BIRD, STAY, DOWN, TEXT_COPYCATSHOUSE2F_BIRD + object_event 1, 6, SPRITE_FAIRY, STAY, RIGHT, TEXT_COPYCATSHOUSE2F_FAIRY def_warps_to COPYCATS_HOUSE_2F |