Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use def_* macros for automatic map event counts

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

14
maps/CeladonGameCorner.asm
View File

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const CELADONGAMECORNER_CLERK
const CELADONGAMECORNER_RECEPTIONIST
const CELADONGAMECORNER_POKEFAN_M
@@ -10,9 +10,9 @@
const CELADONGAMECORNER_GRAMPS
CeladonGameCorner_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
CeladonGameCornerClerkScript:
jumpstd GameCornerCoinVendorScript
@@ -324,13 +324,13 @@ CeladonGameCornerSodaCanText:
CeladonGameCorner_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 14, 13, CELADON_CITY, 6
warp_event 15, 13, CELADON_CITY, 6
db 0 ; coord events
def_coord_events
db 38 ; bg events
def_bg_events
bg_event 1, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
bg_event 1, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript
bg_event 1, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript
@@ -370,7 +370,7 @@ CeladonGameCorner_MapEvents:
bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script
bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script
db 9 ; object events
def_object_events
object_event 5, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1
object_event 3, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1
object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1