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/CeladonCafe.asm
View File

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const CELADONCAFE_SUPER_NERD
const CELADONCAFE_FISHER1
const CELADONCAFE_FISHER2
@@ -6,9 +6,9 @@
const CELADONCAFE_TEACHER
CeladonCafe_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
CeladonCafeChef:
faceplayer
@@ -208,17 +208,17 @@ NoRoomForLeftoversText:
CeladonCafe_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 6, 7, CELADON_CITY, 9
warp_event 7, 7, CELADON_CITY, 9
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 5, 0, BGEVENT_READ, EatathonContestPoster
bg_event 7, 1, BGEVENT_READ, CeladonCafeTrashcan
db 5 ; object events
def_object_events
object_event 9, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1
object_event 4, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1
object_event 1, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1