Use def_* macros for automatic map event counts

Resolves #742
This commit is contained in:
Rangi
2020-07-24 09:49:26 -04:00
parent 89c47f2170
commit dcb24bc724
392 changed files with 2750 additions and 2695 deletions

View File

@@ -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