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

@@ -1,12 +1,12 @@
object_const_def ; object_event constants
object_const_def
const ROUTE33_POKEFAN_M
const ROUTE33_LASS
const ROUTE33_FRUIT_TREE
Route33_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
Route33LassScript:
jumptextfaceplayer Route33LassText
@@ -195,15 +195,15 @@ Route33SignText:
Route33_MapEvents:
db 0, 0 ; filler
db 1 ; warp events
def_warp_events
warp_event 11, 9, UNION_CAVE_1F, 3
db 0 ; coord events
def_coord_events
db 1 ; bg events
def_bg_events
bg_event 11, 11, BGEVENT_READ, Route33Sign
db 3 ; object events
def_object_events
object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1
object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1
object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTree, -1