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/SSAnne2F.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/SSAnne2F.asm')
| -rw-r--r-- | data/maps/objects/SSAnne2F.asm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm index cfd93189..283ca70f 100644 --- a/data/maps/objects/SSAnne2F.asm +++ b/data/maps/objects/SSAnne2F.asm @@ -1,3 +1,7 @@ + object_const_def + const SSANNE2F_WAITER + const SSANNE2F_RIVAL + SSAnne2F_Object: db $c ; border block @@ -15,7 +19,7 @@ SSAnne2F_Object: def_bg_events def_object_events - object_event 3, 7, SPRITE_WAITER, WALK, UP_DOWN, 1 ; person - object_event 36, 4, SPRITE_BLUE, STAY, DOWN, 2, OPP_RIVAL1, 1 + object_event 3, 7, SPRITE_WAITER, WALK, UP_DOWN, TEXT_SSANNE2F_WAITER + object_event 36, 4, SPRITE_BLUE, STAY, DOWN, TEXT_SSANNE2F_RIVAL, OPP_RIVAL1, 1 def_warps_to SS_ANNE_2F |