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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const ROUTE40_OLIVINE_RIVAL1
const ROUTE40_OLIVINE_RIVAL2
const ROUTE40_SWIMMER_GIRL1
@@ -13,9 +13,9 @@
const ROUTE40_STANDING_YOUNGSTER
Route40_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_OBJECTS, .MonicaCallback
.MonicaCallback:
@@ -338,16 +338,16 @@ Route40SignText:
Route40_MapEvents:
db 0, 0 ; filler
db 1 ; warp events
def_warp_events
warp_event 9, 5, ROUTE_40_BATTLE_TOWER_GATE, 1
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 14, 10, BGEVENT_READ, Route40Sign
bg_event 7, 8, BGEVENT_ITEM, Route40HiddenHyperPotion
db 12 ; object events
def_object_events
object_event 14, 15, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1
object_event 18, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1
object_event 3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1