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 PEWTERPOKECENTER1F_NURSE
const PEWTERPOKECENTER1F_TEACHER
const PEWTERPOKECENTER1F_JIGGLYPUFF
@@ -6,9 +6,9 @@
const PEWTERPOKECENTER1F_CHRIS
PewterPokecenter1F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
PewterPokecenter1FNurseScript:
jumpstd PokecenterNurseScript
@@ -68,16 +68,16 @@ PewterPokecenter1FBugCatcherText:
PewterPokecenter1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
def_warp_events
warp_event 3, 7, PEWTER_CITY, 4
warp_event 4, 7, PEWTER_CITY, 4
warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events
def_coord_events
db 0 ; bg events
def_bg_events
db 5 ; object events
def_object_events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FNurseScript, -1
object_event 8, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1
object_event 1, 3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1