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 CELADONDEPTSTORE3F_CLERK
const CELADONDEPTSTORE3F_YOUNGSTER
const CELADONDEPTSTORE3F_GAMEBOY_KID1
@@ -6,9 +6,9 @@
const CELADONDEPTSTORE3F_SUPER_NERD
CeladonDeptStore3F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
CeladonDeptStore3FClerkScript:
faceplayer
@@ -95,18 +95,18 @@ CeladonDeptStore3FDirectoryText:
CeladonDeptStore3F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
def_warp_events
warp_event 12, 0, CELADON_DEPT_STORE_2F, 1
warp_event 15, 0, CELADON_DEPT_STORE_4F, 2
warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 14, 0, BGEVENT_READ, CeladonDeptStore3FDirectory
bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton
db 5 ; object events
def_object_events
object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FClerkScript, -1
object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1