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/SaffronCity.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/SaffronCity.asm')
| -rw-r--r-- | data/maps/objects/SaffronCity.asm | 67 |
1 files changed, 42 insertions, 25 deletions
diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index 2fddfd5e..181b5c07 100644 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -1,3 +1,20 @@ + object_const_def + const SAFFRONCITY_ROCKET1 + const SAFFRONCITY_ROCKET2 + const SAFFRONCITY_ROCKET3 + const SAFFRONCITY_ROCKET4 + const SAFFRONCITY_ROCKET5 + const SAFFRONCITY_ROCKET6 + const SAFFRONCITY_ROCKET7 + const SAFFRONCTIY_SCIENTIST + const SAFFRONCITY_SILPH_WORKER_M + const SAFFRONCITY_SILPH_WORKER_F + const SAFFRONCITY_GENTLEMAN + const SAFFRONCITY_PIDGEOT + const SAFFRONCITY_ROCKER + const SAFFRONCITY_ROCKET8 + const SAFFRONCITY_ROCKET9 + SaffronCity_Object: db $f ; border block @@ -12,32 +29,32 @@ SaffronCity_Object: warp_event 29, 29, MR_PSYCHICS_HOUSE, 1 def_bg_events - bg_event 17, 5, 16 ; SaffronCityText16 - bg_event 27, 5, 17 ; SaffronCityText17 - bg_event 35, 5, 18 ; SaffronCityText18 - bg_event 26, 11, 19 ; MartSignText - bg_event 39, 19, 20 ; SaffronCityText20 - bg_event 5, 21, 21 ; SaffronCityText21 - bg_event 15, 21, 22 ; SaffronCityText22 - bg_event 10, 29, 23 ; PokeCenterSignText - bg_event 27, 29, 24 ; SaffronCityText24 - bg_event 1, 19, 25 ; SaffronCityText25 + bg_event 17, 5, TEXT_SAFFRONCITY_SIGN + bg_event 27, 5, TEXT_SAFFRONCITY_FIGHTING_DOJO_SIGN + bg_event 35, 5, TEXT_SAFFRONCITY_GYM_SIGN + bg_event 26, 11, TEXT_SAFFRONCITY_MART_SIGN + bg_event 39, 19, TEXT_SAFFRONCITY_TRAINER_TIPS1 + bg_event 5, 21, TEXT_SAFFRONCITY_TRAINER_TIPS2 + bg_event 15, 21, TEXT_SAFFRONCITY_SILPH_CO_SIGN + bg_event 10, 29, TEXT_SAFFRONCITY_POKECENTER_SIGN + bg_event 27, 29, TEXT_SAFFRONCITY_MR_PSYCHICS_HOUSE_SIGN + bg_event 1, 19, TEXT_SAFFRONCITY_SILPH_CO_LATEST_PRODUCT_SIGN def_object_events - object_event 7, 6, SPRITE_ROCKET, STAY, NONE, 1 ; person - object_event 20, 8, SPRITE_ROCKET, WALK, LEFT_RIGHT, 2 ; person - object_event 34, 4, SPRITE_ROCKET, STAY, NONE, 3 ; person - object_event 13, 12, SPRITE_ROCKET, STAY, NONE, 4 ; person - object_event 11, 25, SPRITE_ROCKET, WALK, LEFT_RIGHT, 5 ; person - object_event 32, 13, SPRITE_ROCKET, WALK, LEFT_RIGHT, 6 ; person - object_event 18, 30, SPRITE_ROCKET, WALK, LEFT_RIGHT, 7 ; person - object_event 8, 14, SPRITE_SCIENTIST, WALK, ANY_DIR, 8 ; person - object_event 23, 23, SPRITE_SILPH_WORKER, STAY, NONE, 9 ; person - object_event 17, 30, SPRITE_ERIKA, WALK, LEFT_RIGHT, 10 ; person - object_event 30, 12, SPRITE_GENTLEMAN, STAY, DOWN, 11 ; person - object_event 31, 12, SPRITE_BIRD, STAY, DOWN, 12 ; person - object_event 18, 8, SPRITE_ROCKER, STAY, UP, 13 ; person - object_event 18, 22, SPRITE_ROCKET, STAY, DOWN, 14 ; person - object_event 19, 22, SPRITE_ROCKET, STAY, DOWN, 15 ; person + object_event 7, 6, SPRITE_ROCKET, STAY, NONE, TEXT_SAFFRONCITY_ROCKET1 + object_event 20, 8, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_ROCKET2 + object_event 34, 4, SPRITE_ROCKET, STAY, NONE, TEXT_SAFFRONCITY_ROCKET3 + object_event 13, 12, SPRITE_ROCKET, STAY, NONE, TEXT_SAFFRONCITY_ROCKET4 + object_event 11, 25, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_ROCKET5 + object_event 32, 13, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_ROCKET6 + object_event 18, 30, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_ROCKET7 + object_event 8, 14, SPRITE_SCIENTIST, WALK, ANY_DIR, TEXT_SAFFRONCITY_SCIENTIST + object_event 23, 23, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SAFFRONCITY_SILPH_WORKER_M + object_event 17, 30, SPRITE_SILPH_WORKER_F, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_SILPH_WORKER_F + object_event 30, 12, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_SAFFRONCITY_GENTLEMAN + object_event 31, 12, SPRITE_BIRD, STAY, DOWN, TEXT_SAFFRONCITY_PIDGEOT + object_event 18, 8, SPRITE_ROCKER, STAY, UP, TEXT_SAFFRONCITY_ROCKER + object_event 18, 22, SPRITE_ROCKET, STAY, DOWN, TEXT_SAFFRONCITY_ROCKET8 + object_event 19, 22, SPRITE_ROCKET, STAY, DOWN, TEXT_SAFFRONCITY_ROCKET9 def_warps_to SAFFRON_CITY |