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/CeladonCity.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/CeladonCity.asm')
| -rw-r--r-- | data/maps/objects/CeladonCity.asm | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index 1644335b..bab78ab7 100644 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -1,3 +1,14 @@ + object_const_def + const_export CELADONCITY_LITTLE_GIRL + const_export CELADONCITY_GRAMPS1 + const_export CELADONCITY_GIRL + const_export CELADONCITY_GRAMPS2 + const_export CELADONCITY_GRAMPS3 + const_export CELADONCITY_FISHER + const_export CELADONCITY_POLIWRATH + const_export CELADONCITY_ROCKET1 + const_export CELADONCITY_ROCKET2 + CeladonCity_Object: db $f ; border block @@ -17,25 +28,25 @@ CeladonCity_Object: warp_event 43, 27, CELADON_HOTEL, 1 def_bg_events - bg_event 27, 15, 10 ; CeladonCityText10 - bg_event 19, 15, 11 ; CeladonCityText11 - bg_event 42, 9, 12 ; PokeCenterSignText - bg_event 13, 29, 13 ; CeladonCityText13 - bg_event 21, 9, 14 ; CeladonCityText14 - bg_event 12, 13, 15 ; CeladonCityText15 - bg_event 39, 21, 16 ; CeladonCityText16 - bg_event 33, 21, 17 ; CeladonCityText17 - bg_event 27, 21, 18 ; CeladonCityText18 + bg_event 27, 15, TEXT_CELADONCITY_TRAINER_TIPS1 + bg_event 19, 15, TEXT_CELADONCITY_SIGN + bg_event 42, 9, TEXT_CELADONCITY_POKECENTER_SIGN + bg_event 13, 29, TEXT_CELADONCITY_GYM_SIGN + bg_event 21, 9, TEXT_CELADONCITY_MANSION_SIGN + bg_event 12, 13, TEXT_CELADONCITY_DEPTSTORE_SIGN + bg_event 39, 21, TEXT_CELADONCITY_TRAINER_TIPS2 + bg_event 33, 21, TEXT_CELADONCITY_PRIZEEXCHANGE_SIGN + bg_event 27, 21, TEXT_CELADONCITY_GAMECORNER_SIGN def_object_events - object_event 8, 17, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person - object_event 11, 28, SPRITE_GRAMPS, STAY, UP, 2 ; person - object_event 14, 19, SPRITE_GIRL, WALK, UP_DOWN, 3 ; person - object_event 25, 22, SPRITE_GRAMPS, STAY, DOWN, 4 ; person - object_event 22, 16, SPRITE_GRAMPS, STAY, DOWN, 5 ; person - object_event 32, 12, SPRITE_FISHER, STAY, LEFT, 6 ; person - object_event 30, 12, SPRITE_MONSTER, STAY, RIGHT, 7 ; person - object_event 32, 29, SPRITE_ROCKET, WALK, LEFT_RIGHT, 8 ; person - object_event 42, 14, SPRITE_ROCKET, WALK, LEFT_RIGHT, 9 ; person + object_event 8, 17, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, TEXT_CELADONCITY_LITTLE_GIRL + object_event 11, 28, SPRITE_GRAMPS, STAY, UP, TEXT_CELADONCITY_GRAMPS1 + object_event 14, 19, SPRITE_GIRL, WALK, UP_DOWN, TEXT_CELADONCITY_GIRL + object_event 25, 22, SPRITE_GRAMPS, STAY, DOWN, TEXT_CELADONCITY_GRAMPS2 + object_event 22, 16, SPRITE_GRAMPS, STAY, DOWN, TEXT_CELADONCITY_GRAMPS3 + object_event 32, 12, SPRITE_FISHER, STAY, LEFT, TEXT_CELADONCITY_FISHER + object_event 30, 12, SPRITE_MONSTER, STAY, RIGHT, TEXT_CELADONCITY_POLIWRATH + object_event 32, 29, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_CELADONCITY_ROCKET1 + object_event 42, 14, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_CELADONCITY_ROCKET2 def_warps_to CELADON_CITY |