diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
| commit | d24f1c71149b59c50dba57e500f30b223a54a25f (patch) | |
| tree | 140ad8c04b396af2e0d55f3218bfb3e428391f42 /maps/PalletTown.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/PalletTown.asm')
| -rw-r--r-- | maps/PalletTown.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index edf67d2a..9f075b97 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const PALLETTOWN_TEACHER const PALLETTOWN_FISHER PalletTown_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -70,19 +70,19 @@ BluesHouseSignText: PalletTown_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_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 + def_coord_events - db 4 ; bg events + def_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 - db 2 ; object events + def_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 |