diff options
Diffstat (limited to 'maps/CherrygroveCity.asm')
| -rw-r--r-- | maps/CherrygroveCity.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index e68d3ee82..bbdb46452 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CHERRYGROVECITY_GRAMPS const CHERRYGROVECITY_SILVER const CHERRYGROVECITY_TEACHER @@ -6,11 +6,11 @@ const CHERRYGROVECITY_FISHER CherrygroveCity_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_NOTHING scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_MEET_RIVAL - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -547,24 +547,24 @@ GuideGentsHouseSignText: CherrygroveCity_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events warp_event 23, 3, CHERRYGROVE_MART, 2 warp_event 29, 3, CHERRYGROVE_POKECENTER_1F, 1 warp_event 17, 7, CHERRYGROVE_GYM_SPEECH_HOUSE, 1 warp_event 25, 9, GUIDE_GENTS_HOUSE, 1 warp_event 31, 11, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 1 - db 2 ; coord events + def_coord_events coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth coord_event 33, 7, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneSouth - db 4 ; bg events + def_bg_events bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign bg_event 23, 9, BGEVENT_READ, GuideGentsHouseSign bg_event 24, 3, BGEVENT_READ, CherrygroveCityMartSign bg_event 30, 3, BGEVENT_READ, CherrygroveCityPokecenterSign - db 5 ; object events + def_object_events object_event 32, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE object_event 39, 6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY object_event 27, 12, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1 |