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/CeruleanCity.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/CeruleanCity.asm')
| -rw-r--r-- | data/maps/objects/CeruleanCity.asm | 47 |
1 files changed, 30 insertions, 17 deletions
diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index a709cccd..6e0e54a1 100644 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -1,3 +1,16 @@ + object_const_def + const_export CERULEANCITY_RIVAL + const_export CERULEANCITY_ROCKET + const_export CERULEANCITY_COOLTRAINER_M + const_export CERULEANCITY_SUPER_NERD1 + const_export CERULEANCITY_SUPER_NERD2 + const_export CERULEANCITY_GUARD1 + const_export CERULEANCITY_COOLTRAINER_F1 + const_export CERULEANCITY_ELECTRODE + const_export CERULEANCITY_COOLTRAINER_F2 + const_export CERULEANCITY_SUPER_NERD3 + const_export CERULEANCITY_GUARD2 + CeruleanCity_Object: db $a ; border block @@ -14,24 +27,24 @@ CeruleanCity_Object: warp_event 9, 9, CERULEAN_BADGE_HOUSE, 1 def_bg_events - bg_event 23, 19, 12 ; CeruleanCityText12 - bg_event 17, 29, 13 ; CeruleanCityText13 - bg_event 26, 25, 14 ; MartSignText - bg_event 20, 17, 15 ; PokeCenterSignText - bg_event 11, 25, 16 ; CeruleanCityText16 - bg_event 27, 21, 17 ; CeruleanCityText17 + bg_event 23, 19, TEXT_CERULEANCITY_SIGN + bg_event 17, 29, TEXT_CERULEANCITY_TRAINER_TIPS + bg_event 26, 25, TEXT_CERULEANCITY_MART_SIGN + bg_event 20, 17, TEXT_CERULEANCITY_POKECENTER_SIGN + bg_event 11, 25, TEXT_CERULEANCITY_BIKESHOP_SIGN + bg_event 27, 21, TEXT_CERULEANCITY_GYM_SIGN def_object_events - object_event 20, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person - object_event 30, 8, SPRITE_ROCKET, STAY, NONE, 2, OPP_ROCKET, 5 - object_event 31, 20, SPRITE_COOLTRAINER_M, STAY, DOWN, 3 ; person - object_event 15, 18, SPRITE_SUPER_NERD, WALK, UP_DOWN, 4 ; person - object_event 9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 5 ; person - object_event 28, 12, SPRITE_OFFICER_JENNY, STAY, DOWN, 6 ; person - object_event 29, 26, SPRITE_COOLTRAINER_F, STAY, LEFT, 7 ; person - object_event 28, 26, SPRITE_POKE_BALL, STAY, DOWN, 8 ; person - object_event 9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 9 ; person - object_event 4, 12, SPRITE_SUPER_NERD, STAY, DOWN, 10 ; person - object_event 27, 12, SPRITE_OFFICER_JENNY, STAY, DOWN, 11 ; person + object_event 20, 2, SPRITE_BLUE, STAY, DOWN, TEXT_CERULEANCITY_RIVAL + object_event 30, 8, SPRITE_ROCKET, STAY, NONE, TEXT_CERULEANCITY_ROCKET, OPP_ROCKET, 5 + object_event 31, 20, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_CERULEANCITY_COOLTRAINER_M + object_event 15, 18, SPRITE_SUPER_NERD, WALK, UP_DOWN, TEXT_CERULEANCITY_SUPER_NERD1 + object_event 9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_CERULEANCITY_SUPER_NERD2 + object_event 28, 12, SPRITE_OFFICER_JENNY, STAY, DOWN, TEXT_CERULEANCITY_GUARD1 + object_event 29, 26, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_CERULEANCITY_COOLTRAINER_F1 + object_event 28, 26, SPRITE_POKE_BALL, STAY, DOWN, TEXT_CERULEANCITY_ELECTRODE + object_event 9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, TEXT_CERULEANCITY_COOLTRAINER_F2 + object_event 4, 12, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CERULEANCITY_SUPER_NERD3 + object_event 27, 12, SPRITE_OFFICER_JENNY, STAY, DOWN, TEXT_CERULEANCITY_GUARD2 def_warps_to CERULEAN_CITY |