diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-20 19:07:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 19:07:42 -0400 |
| commit | 7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f (patch) | |
| tree | ddda1118461d6151597a4bf9eefcb0eddc835da1 /data/maps/objects/CeladonCity.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/CeladonCity.asm')
| -rwxr-xr-x | data/maps/objects/CeladonCity.asm | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index bf4cbc84..cce4464d 100755 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -1,7 +1,7 @@ CeladonCity_Object: db $f ; border block - db 13 ; warps + def_warps warp 8, 13, 0, CELADON_MART_1F warp 10, 13, 2, CELADON_MART_1F warp 24, 9, 0, CELADON_MANSION_1F @@ -16,7 +16,7 @@ CeladonCity_Object: warp 35, 27, 0, CELADON_CHIEF_HOUSE warp 43, 27, 0, CELADON_HOTEL - db 9 ; signs + def_signs sign 27, 15, 10 ; CeladonCityText10 sign 19, 15, 11 ; CeladonCityText11 sign 42, 9, 12 ; PokeCenterSignText @@ -27,7 +27,7 @@ CeladonCity_Object: sign 33, 21, 17 ; CeladonCityText17 sign 27, 21, 18 ; CeladonCityText18 - db 9 ; objects + def_objects object SPRITE_LITTLE_GIRL, 8, 17, WALK, ANY_DIR, 1 ; person object SPRITE_GRAMPS, 11, 28, STAY, UP, 2 ; person object SPRITE_GIRL, 14, 19, WALK, UP_DOWN, 3 ; person @@ -38,17 +38,4 @@ CeladonCity_Object: object SPRITE_ROCKET, 32, 29, WALK, LEFT_RIGHT, 8 ; person object SPRITE_ROCKET, 42, 14, WALK, LEFT_RIGHT, 9 ; person - ; warp-to - warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F - warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F - warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1F - warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F - warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F - warp_to 41, 9, CELADON_CITY_WIDTH ; CELADON_POKECENTER - warp_to 12, 27, CELADON_CITY_WIDTH ; CELADON_GYM - warp_to 28, 19, CELADON_CITY_WIDTH ; GAME_CORNER - warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5F - warp_to 33, 19, CELADON_CITY_WIDTH ; GAME_CORNER_PRIZE_ROOM - warp_to 31, 27, CELADON_CITY_WIDTH ; CELADON_DINER - warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_CHIEF_HOUSE - warp_to 43, 27, CELADON_CITY_WIDTH ; CELADON_HOTEL + def_warps_to CELADON_CITY |