diff options
Diffstat (limited to 'maps/ViridianCity.asm')
| -rw-r--r-- | maps/ViridianCity.asm | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 54899e2a4..70c0b8ced 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const VIRIDIANCITY_GRAMPS1 const VIRIDIANCITY_GRAMPS2 const VIRIDIANCITY_FISHER const VIRIDIANCITY_YOUNGSTER ViridianCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -216,32 +214,27 @@ TrainerHouseSignText: done ViridianCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 32, 7, 1, VIRIDIAN_GYM - warp_def 21, 9, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE - warp_def 23, 15, 1, TRAINER_HOUSE_1F - warp_def 29, 19, 2, VIRIDIAN_MART - warp_def 23, 25, 1, VIRIDIAN_POKECENTER_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 6 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 32, 7, VIRIDIAN_GYM, 1 + warp_event 21, 9, VIRIDIAN_NICKNAME_SPEECH_HOUSE, 1 + warp_event 23, 15, TRAINER_HOUSE_1F, 1 + warp_event 29, 19, VIRIDIAN_MART, 2 + warp_event 23, 25, VIRIDIAN_POKECENTER_1F, 1 + + db 0 ; coord events + + db 6 ; bg events bg_event 17, 17, BGEVENT_READ, ViridianCitySign - bg_event 27, 7, BGEVENT_READ, ViridianGymSign - bg_event 19, 1, BGEVENT_READ, ViridianCityWelcomeSign + bg_event 27, 7, BGEVENT_READ, ViridianGymSign + bg_event 19, 1, BGEVENT_READ, ViridianCityWelcomeSign bg_event 21, 15, BGEVENT_READ, TrainerHouseSign bg_event 24, 25, BGEVENT_READ, ViridianCityPokecenterSign bg_event 30, 19, BGEVENT_READ, ViridianCityMartSign -.ObjectEvents: - db 4 - object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1 - object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1 - object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1 + db 4 ; object events + object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1 + object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1 + object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1 object_event 17, 21, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1 |