diff options
Diffstat (limited to 'maps/CeladonCity.asm')
| -rw-r--r-- | maps/CeladonCity.asm | 61 |
1 files changed, 27 insertions, 34 deletions
diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 8075a5343..16409b219 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CELADONCITY_FISHER const CELADONCITY_POLIWAG const CELADONCITY_TEACHER1 @@ -10,11 +10,9 @@ const_value set 2 const CELADONCITY_LASS CeladonCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -75,7 +73,7 @@ CeladonCityPokecenterSign: jumpstd pokecentersign CeladonCityHiddenPpUp: - hiddenitem EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP + hiddenitem PP_UP, EVENT_CELADON_CITY_HIDDEN_PP_UP CeladonCityFisherText: text "This POLIWRATH is" @@ -235,43 +233,38 @@ CeladonCityTrainerTipsText: done CeladonCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 4, 9, 1, CELADON_DEPT_STORE_1F - warp_def 16, 9, 1, CELADON_MANSION_1F - warp_def 16, 3, 3, CELADON_MANSION_1F - warp_def 17, 3, 3, CELADON_MANSION_1F - warp_def 29, 9, 1, CELADON_POKECENTER_1F - warp_def 18, 19, 1, CELADON_GAME_CORNER - warp_def 23, 19, 1, CELADON_GAME_CORNER_PRIZE_ROOM - warp_def 10, 29, 1, CELADON_GYM - warp_def 25, 29, 1, CELADON_CAFE - -.CoordEvents: - db 0 - -.BGEvents: - db 8 + db 0, 0 ; filler + + db 9 ; warp events + warp_event 4, 9, CELADON_DEPT_STORE_1F, 1 + warp_event 16, 9, CELADON_MANSION_1F, 1 + warp_event 16, 3, CELADON_MANSION_1F, 3 + warp_event 17, 3, CELADON_MANSION_1F, 3 + warp_event 29, 9, CELADON_POKECENTER_1F, 1 + warp_event 18, 19, CELADON_GAME_CORNER, 1 + warp_event 23, 19, CELADON_GAME_CORNER_PRIZE_ROOM, 1 + warp_event 10, 29, CELADON_GYM, 1 + warp_event 25, 29, CELADON_CAFE, 1 + + db 0 ; coord events + + db 8 ; bg events bg_event 23, 21, BGEVENT_READ, CeladonCitySign bg_event 11, 31, BGEVENT_READ, CeladonGymSign - bg_event 6, 9, BGEVENT_READ, CeladonCityDeptStoreSign - bg_event 13, 9, BGEVENT_READ, CeladonCityMansionSign + bg_event 6, 9, BGEVENT_READ, CeladonCityDeptStoreSign + bg_event 13, 9, BGEVENT_READ, CeladonCityMansionSign bg_event 19, 21, BGEVENT_READ, CeladonCityGameCornerSign bg_event 29, 21, BGEVENT_READ, CeladonCityTrainerTips - bg_event 30, 9, BGEVENT_READ, CeladonCityPokecenterSign + bg_event 30, 9, BGEVENT_READ, CeladonCityPokecenterSign bg_event 37, 21, BGEVENT_ITEM, CeladonCityHiddenPpUp -.ObjectEvents: - db 9 + db 9 ; object events object_event 26, 11, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityFisherScript, -1 object_event 27, 11, SPRITE_POLIWAG, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1 object_event 20, 24, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1 object_event 14, 16, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps1Script, -1 - object_event 8, 31, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1 + object_event 8, 31, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1 object_event 18, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster1Script, -1 object_event 24, 33, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1 - object_event 6, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1 - object_event 7, 22, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1 + object_event 6, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1 + object_event 7, 22, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1 |