diff options
Diffstat (limited to 'maps/PalletTown.asm')
| -rw-r--r-- | maps/PalletTown.asm | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 8e18b6d08..0bc820103 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const PALLETTOWN_TEACHER const PALLETTOWN_FISHER PalletTown_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -70,26 +68,21 @@ BluesHouseSignText: done PalletTown_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 5, 5, 1, REDS_HOUSE_1F - warp_def 13, 5, 1, BLUES_HOUSE - warp_def 12, 11, 1, OAKS_LAB - -.CoordEvents: - db 0 - -.BGEvents: - db 4 - bg_event 7, 9, BGEVENT_READ, PalletTownSign - bg_event 3, 5, BGEVENT_READ, RedsHouseSign + db 0, 0 ; filler + + db 3 ; warp events + warp_event 5, 5, REDS_HOUSE_1F, 1 + warp_event 13, 5, BLUES_HOUSE, 1 + warp_event 12, 11, OAKS_LAB, 1 + + db 0 ; coord events + + db 4 ; bg events + bg_event 7, 9, BGEVENT_READ, PalletTownSign + bg_event 3, 5, BGEVENT_READ, RedsHouseSign bg_event 13, 13, BGEVENT_READ, OaksLabSign - bg_event 11, 5, BGEVENT_READ, BluesHouseSign + bg_event 11, 5, BGEVENT_READ, BluesHouseSign -.ObjectEvents: - db 2 - object_event 3, 8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1 + db 2 ; object events + object_event 3, 8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1 object_event 12, 14, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PalletTownFisherScript, -1 |