diff options
Diffstat (limited to 'maps/LavenderTown.asm')
| -rw-r--r-- | maps/LavenderTown.asm | 59 |
1 files changed, 26 insertions, 33 deletions
diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 655acb3b3..9aeec7ab9 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const LAVENDERTOWN_POKEFAN_M const LAVENDERTOWN_TEACHER const LAVENDERTOWN_GRAMPS const LAVENDERTOWN_YOUNGSTER LavenderTown_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -106,34 +104,29 @@ SoulHouseSignText: done LavenderTown_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 7 - warp_def 5, 5, 1, LAVENDER_POKECENTER_1F - warp_def 5, 9, 1, MR_FUJIS_HOUSE - warp_def 3, 13, 1, LAVENDER_SPEECH_HOUSE - warp_def 7, 13, 1, LAVENDER_NAME_RATER - warp_def 1, 5, 2, LAVENDER_MART - warp_def 13, 11, 1, SOUL_HOUSE - warp_def 14, 5, 1, LAV_RADIO_TOWER_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 6 - bg_event 11, 3, BGEVENT_READ, LavenderTownSign - bg_event 15, 7, BGEVENT_READ, KantoRadioStationSign - bg_event 3, 9, BGEVENT_READ, VolunteerPokemonHouseSign + db 0, 0 ; filler + + db 7 ; warp events + warp_event 5, 5, LAVENDER_POKECENTER_1F, 1 + warp_event 5, 9, MR_FUJIS_HOUSE, 1 + warp_event 3, 13, LAVENDER_SPEECH_HOUSE, 1 + warp_event 7, 13, LAVENDER_NAME_RATER, 1 + warp_event 1, 5, LAVENDER_MART, 2 + warp_event 13, 11, SOUL_HOUSE, 1 + warp_event 14, 5, LAV_RADIO_TOWER_1F, 1 + + db 0 ; coord events + + db 6 ; bg events + bg_event 11, 3, BGEVENT_READ, LavenderTownSign + bg_event 15, 7, BGEVENT_READ, KantoRadioStationSign + bg_event 3, 9, BGEVENT_READ, VolunteerPokemonHouseSign bg_event 15, 13, BGEVENT_READ, SoulHouseSign - bg_event 6, 5, BGEVENT_READ, LavenderPokecenterSignText - bg_event 2, 5, BGEVENT_READ, LavenderMartSignText + bg_event 6, 5, BGEVENT_READ, LavenderPokecenterSignText + bg_event 2, 5, BGEVENT_READ, LavenderMartSignText -.ObjectEvents: - db 4 - object_event 12, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1 - object_event 2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1 + db 4 ; object events + object_event 12, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1 + object_event 2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1 object_event 14, 12, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1 - object_event 6, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1 + object_event 6, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1 |