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/Museum2F.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/Museum2F.asm')
| -rw-r--r-- | data/maps/objects/Museum2F.asm | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm index 061833ca..e3c27117 100644 --- a/data/maps/objects/Museum2F.asm +++ b/data/maps/objects/Museum2F.asm @@ -1,3 +1,10 @@ + object_const_def + const MUSEUM2F_YOUNGSTER + const MUSEUM2F_GRAMPS + const MUSEUM2F_SCIENTIST + const MUSEUM2F_BRUNETTE_GIRL + const MUSEUM2F_HIKER + Museum2F_Object: db $a ; border block @@ -5,14 +12,14 @@ Museum2F_Object: warp_event 7, 7, MUSEUM_1F, 5 def_bg_events - bg_event 11, 2, 6 ; Museum2FText6 - bg_event 2, 5, 7 ; Museum2FText7 + bg_event 11, 2, TEXT_MUSEUM2F_SPACE_SHUTTLE_SIGN + bg_event 2, 5, TEXT_MUSEUM2F_MOON_STONE_SIGN def_object_events - object_event 1, 7, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person - object_event 0, 5, SPRITE_GRAMPS, STAY, DOWN, 2 ; person - object_event 7, 5, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person - object_event 11, 5, SPRITE_BRUNETTE_GIRL, STAY, NONE, 4 ; person - object_event 12, 5, SPRITE_HIKER, STAY, DOWN, 5 ; person + object_event 1, 7, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_MUSEUM2F_YOUNGSTER + object_event 0, 5, SPRITE_GRAMPS, STAY, DOWN, TEXT_MUSEUM2F_GRAMPS + object_event 7, 5, SPRITE_SCIENTIST, STAY, DOWN, TEXT_MUSEUM2F_SCIENTIST + object_event 11, 5, SPRITE_BRUNETTE_GIRL, STAY, NONE, TEXT_MUSEUM2F_BRUNETTE_GIRL + object_event 12, 5, SPRITE_HIKER, STAY, DOWN, TEXT_MUSEUM2F_HIKER def_warps_to MUSEUM_2F |