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 GOLDENRODDEPTSTORE1F_RECEPTIONIST
const GOLDENRODDEPTSTORE1F_POKEFAN_F
const GOLDENRODDEPTSTORE1F_BUG_CATCHER
const GOLDENRODDEPTSTORE1F_GENTLEMAN
GoldenrodDeptStore1F_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
GoldenrodDeptStore1FReceptionistScript:
jumptextfaceplayer GoldenrodDeptStore1FReceptionistText
@@ -79,19 +79,19 @@ GoldenrodDeptStore1FDirectoryText:
GoldenrodDeptStore1F_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 7, 7, GOLDENROD_CITY, 9
warp_event 8, 7, GOLDENROD_CITY, 9
warp_event 15, 0, GOLDENROD_DEPT_STORE_2F, 2
warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore1FDirectory
bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton
db 4 ; object events
def_object_events
object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1
object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1
object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1