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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const ROUTE39_SAILOR
const ROUTE39_POKEFAN_M
const ROUTE39_POKEFAN_F1
@@ -11,9 +11,9 @@
const ROUTE39_POKEFAN_F2
Route39_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
Route39Miltank:
opentext
@@ -344,19 +344,19 @@ Route39TrainerTipsText:
Route39_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 1, 3, ROUTE_39_BARN, 1
warp_event 5, 3, ROUTE_39_FARMHOUSE, 1
db 0 ; coord events
def_coord_events
db 4 ; bg events
def_bg_events
bg_event 5, 31, BGEVENT_READ, Route39TrainerTips
bg_event 9, 5, BGEVENT_READ, MoomooFarmSign
bg_event 15, 7, BGEVENT_READ, Route39Sign
bg_event 5, 13, BGEVENT_ITEM, Route39HiddenNugget
db 10 ; object events
def_object_events
object_event 13, 29, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1
object_event 10, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek, -1
object_event 11, 19, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1