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,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const EARLSPOKEMONACADEMY_EARL
const EARLSPOKEMONACADEMY_YOUNGSTER1
const EARLSPOKEMONACADEMY_GAMEBOY_KID1
@@ -7,9 +7,9 @@
const EARLSPOKEMONACADEMY_POKEDEX
EarlsPokemonAcademy_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
AcademyEarl:
applymovement EARLSPOKEMONACADEMY_EARL, AcademyEarlSpinMovement
@@ -412,19 +412,19 @@ AcademyStickerMachineText:
EarlsPokemonAcademy_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 3, 15, VIOLET_CITY, 3
warp_event 4, 15, VIOLET_CITY, 3
db 0 ; coord events
def_coord_events
db 4 ; bg events
def_bg_events
bg_event 0, 1, BGEVENT_READ, AcademyBookshelf
bg_event 1, 1, BGEVENT_READ, AcademyBookshelf
bg_event 3, 0, BGEVENT_READ, AcademyBlackboard
bg_event 4, 0, BGEVENT_READ, AcademyBlackboard
db 6 ; object events
def_object_events
object_event 4, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1
object_event 3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1