diff options
Diffstat (limited to 'maps/CherrygroveCity.asm')
| -rw-r--r-- | maps/CherrygroveCity.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 0b6f01283..d87d52165 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -552,28 +552,28 @@ CherrygroveCity_MapEventHeader: .Warps: db 5 - warp_def $3, $17, 2, CHERRYGROVE_MART - warp_def $3, $1d, 1, CHERRYGROVE_POKECENTER_1F - warp_def $7, $11, 1, CHERRYGROVE_GYM_SPEECH_HOUSE - warp_def $9, $19, 1, GUIDE_GENTS_HOUSE - warp_def $b, $1f, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE + warp_def 23, 3, 2, CHERRYGROVE_MART + warp_def 29, 3, 1, CHERRYGROVE_POKECENTER_1F + warp_def 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE + warp_def 25, 9, 1, GUIDE_GENTS_HOUSE + warp_def 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE .CoordEvents: db 2 - coord_event 1, $6, $21, CherrygroveSilverSceneNorth - coord_event 1, $7, $21, CherrygroveSilverSceneSouth + coord_event 33, 6, 1, CherrygroveSilverSceneNorth + coord_event 33, 7, 1, CherrygroveSilverSceneSouth .BGEvents: db 4 - bg_event 8, 30, BGEVENT_READ, CherrygroveCitySign - bg_event 9, 23, BGEVENT_READ, GuideGentsHouseSign - bg_event 3, 24, BGEVENT_READ, CherrygroveCityMartSign - bg_event 3, 30, BGEVENT_READ, CherrygroveCityPokecenterSign + 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 .ObjectEvents: db 5 - object_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE - object_event SPRITE_SILVER, 6, 39, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY - object_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1 - object_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1 - object_event SPRITE_FISHER, 12, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1 + 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 + object_event 23, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1 + object_event 7, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1 |