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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const ROUTE12_FISHER1
const ROUTE12_FISHER2
const ROUTE12_FISHER3
@@ -7,9 +7,9 @@
const ROUTE12_POKE_BALL2
Route12_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
TrainerFisherKyle:
trainer FISHER, KYLE, EVENT_BEAT_FISHER_KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script
@@ -167,17 +167,17 @@ FishingSpotSignText:
Route12_MapEvents:
db 0, 0 ; filler
db 1 ; warp events
def_warp_events
warp_event 11, 33, ROUTE_12_SUPER_ROD_HOUSE, 1
db 0 ; coord events
def_coord_events
db 3 ; bg events
def_bg_events
bg_event 11, 27, BGEVENT_READ, Route12Sign
bg_event 13, 9, BGEVENT_READ, FishingSpotSign
bg_event 14, 13, BGEVENT_ITEM, Route12HiddenElixer
db 6 ; object events
def_object_events
object_event 5, 13, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1
object_event 14, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherStephen, -1
object_event 10, 38, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerFisherBarney, -1