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

@@ -1,11 +1,11 @@
object_const_def ; object_event constants
object_const_def
const ELMSHOUSE_ELMS_WIFE
const ELMSHOUSE_ELMS_SON
ElmsHouse_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
ElmsWife:
jumptextfaceplayer ElmsWifeText
@@ -84,17 +84,17 @@ ElmsHousePCText:
ElmsHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 2, 7, NEW_BARK_TOWN, 4
warp_event 3, 7, NEW_BARK_TOWN, 4
db 0 ; coord events
def_coord_events
db 3 ; bg events
def_bg_events
bg_event 0, 1, BGEVENT_READ, ElmsHousePC
bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf
bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf
db 2 ; object events
def_object_events
object_event 1, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1
object_event 5, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1