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

@@ -1,12 +1,12 @@
object_const_def ; object_event constants
object_const_def
const ROUTE6_POKEFAN_M1
const ROUTE6_POKEFAN_M2
const ROUTE6_POKEFAN_M3
Route6_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
TrainerPokefanmRex:
trainer POKEFANM, REX, EVENT_BEAT_POKEFANM_REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script
@@ -92,16 +92,16 @@ PokefanmAllanAfterBattleText:
Route6_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 17, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 1
warp_event 6, 1, ROUTE_6_SAFFRON_GATE, 3
db 0 ; coord events
def_coord_events
db 1 ; bg events
def_bg_events
bg_event 19, 5, BGEVENT_READ, Route6UndergroundPathSign
db 3 ; object events
def_object_events
object_event 17, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
object_event 9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1
object_event 10, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1