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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const ROUTE35_YOUNGSTER1
const ROUTE35_YOUNGSTER2
const ROUTE35_LASS1
@@ -12,9 +12,9 @@
const ROUTE35_POKE_BALL
Route35_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
TrainerBirdKeeperBryan:
trainer BIRD_KEEPER, BRYAN, EVENT_BEAT_BIRD_KEEPER_BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script
@@ -463,18 +463,18 @@ Route35SignText:
Route35_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
def_warp_events
warp_event 9, 33, ROUTE_35_GOLDENROD_GATE, 1
warp_event 10, 33, ROUTE_35_GOLDENROD_GATE, 2
warp_event 3, 5, ROUTE_35_NATIONAL_PARK_GATE, 3
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 1, 7, BGEVENT_READ, Route35Sign
bg_event 11, 31, BGEVENT_READ, Route35Sign
db 11 ; object events
def_object_events
object_event 4, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1
object_event 8, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1
object_event 7, 20, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1