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,13 +1,13 @@
object_const_def ; object_event constants
object_const_def
const SAFFRONPOKECENTER1F_NURSE
const SAFFRONPOKECENTER1F_TEACHER
const SAFFRONPOKECENTER1F_FISHER
const SAFFRONPOKECENTER1F_YOUNGSTER
SaffronPokecenter1F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
SaffronPokecenter1FNurseScript:
jumpstd PokecenterNurseScript
@@ -112,16 +112,16 @@ SaffronPokecenter1FYoungsterText:
SaffronPokecenter1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
def_warp_events
warp_event 3, 7, SAFFRON_CITY, 4
warp_event 4, 7, SAFFRON_CITY, 4
warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 4 ; object events
def_object_events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FNurseScript, -1
object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FTeacherScript, -1
object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FFisherScript, -1