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/CinnabarMart.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/CinnabarMart.asm')
| -rw-r--r-- | data/maps/objects/CinnabarMart.asm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/data/maps/objects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm index e91d18b2..d6651e97 100644 --- a/data/maps/objects/CinnabarMart.asm +++ b/data/maps/objects/CinnabarMart.asm @@ -1,3 +1,8 @@ + object_const_def + const CINNABARMART_CLERK + const CINNABARMART_SILPH_WORKER_F + const CINNABARMART_SCIENTIST + CinnabarMart_Object: db $0 ; border block @@ -8,8 +13,8 @@ CinnabarMart_Object: def_bg_events def_object_events - object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person - object_event 6, 2, SPRITE_ERIKA, STAY, NONE, 2 ; person - object_event 3, 4, SPRITE_SCIENTIST, STAY, NONE, 3 ; person + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, TEXT_CINNABARMART_CLERK + object_event 6, 2, SPRITE_SILPH_WORKER_F, STAY, NONE, TEXT_CINNABARMART_SILPH_WORKER_F + object_event 3, 4, SPRITE_SCIENTIST, STAY, NONE, TEXT_CINNABARMART_SCIENTIST def_warps_to CINNABAR_MART |