diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /data/maps/objects/PewterCity.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/PewterCity.asm')
| -rw-r--r-- | data/maps/objects/PewterCity.asm | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm index 4a8e2323..e2eaced9 100644 --- a/data/maps/objects/PewterCity.asm +++ b/data/maps/objects/PewterCity.asm @@ -1,3 +1,10 @@ + object_const_def + const_export PEWTERCITY_COOLTRAINER_F + const_export PEWTERCITY_COOLTRAINER_M + const_export PEWTERCITY_SUPER_NERD1 + const_export PEWTERCITY_SUPER_NERD2 + const_export PEWTERCITY_YOUNGSTER + PewterCity_Object: db $a ; border block @@ -11,19 +18,19 @@ PewterCity_Object: warp_event 13, 25, PEWTER_POKECENTER, 1 def_bg_events - bg_event 19, 29, 6 ; PewterCityText6 - bg_event 33, 19, 7 ; PewterCityText7 - bg_event 24, 17, 8 ; MartSignText - bg_event 14, 25, 9 ; PokeCenterSignText - bg_event 15, 9, 10 ; PewterCityText10 - bg_event 11, 17, 11 ; PewterCityText11 - bg_event 25, 23, 12 ; PewterCityText12 + bg_event 19, 29, TEXT_PEWTERCITY_TRAINER_TIPS + bg_event 33, 19, TEXT_PEWTERCITY_POLICE_NOTICE_SIGN + bg_event 24, 17, TEXT_PEWTERCITY_MART_SIGN + bg_event 14, 25, TEXT_PEWTERCITY_POKECENTER_SIGN + bg_event 15, 9, TEXT_PEWTERCITY_MUSEUM_SIGN + bg_event 11, 17, TEXT_PEWTERCITY_GYM_SIGN + bg_event 25, 23, TEXT_PEWTERCITY_SIGN def_object_events - object_event 8, 15, SPRITE_COOLTRAINER_F, STAY, NONE, 1 ; person - object_event 17, 25, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person - object_event 27, 17, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person - object_event 26, 25, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 4 ; person - object_event 35, 16, SPRITE_YOUNGSTER, STAY, DOWN, 5 ; person + object_event 8, 15, SPRITE_COOLTRAINER_F, STAY, NONE, TEXT_PEWTERCITY_COOLTRAINER_F + object_event 17, 25, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_PEWTERCITY_COOLTRAINER_M + object_event 27, 17, SPRITE_SUPER_NERD, STAY, NONE, TEXT_PEWTERCITY_SUPER_NERD1 + object_event 26, 25, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_PEWTERCITY_SUPER_NERD2 + object_event 35, 16, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_PEWTERCITY_YOUNGSTER def_warps_to PEWTER_CITY |