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/CeladonMart1F.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/CeladonMart1F.asm')
| -rw-r--r-- | data/maps/objects/CeladonMart1F.asm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm index d7f8924f..6ec1e35d 100644 --- a/data/maps/objects/CeladonMart1F.asm +++ b/data/maps/objects/CeladonMart1F.asm @@ -1,3 +1,6 @@ + object_const_def + const CELADONMART1F_RECEPTIONIST + CeladonMart1F_Object: db $f ; border block @@ -10,10 +13,10 @@ CeladonMart1F_Object: warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events - bg_event 11, 4, 2 ; CeladonMart1Text2 - bg_event 14, 1, 3 ; CeladonMart1Text3 + bg_event 11, 4, TEXT_CELADONMART1F_DIRECTORY_SIGN + bg_event 14, 1, TEXT_CELADONMART1F_CURRENT_FLOOR_SIGN def_object_events - object_event 8, 3, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person + object_event 8, 3, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_CELADONMART1F_RECEPTIONIST def_warps_to CELADON_MART_1F |