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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const ROUTE44_FISHER1
const ROUTE44_FISHER2
const ROUTE44_YOUNGSTER1
@@ -12,9 +12,9 @@
const ROUTE44_POKE_BALL3
Route44_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
TrainerBirdKeeperVance1:
trainer BIRD_KEEPER, VANCE1, EVENT_BEAT_BIRD_KEEPER_VANCE, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script
@@ -507,17 +507,17 @@ Route44Sign2Text:
Route44_MapEvents:
db 0, 0 ; filler
db 1 ; warp events
def_warp_events
warp_event 56, 7, ICE_PATH_1F, 1
db 0 ; coord events
def_coord_events
db 3 ; bg events
def_bg_events
bg_event 53, 7, BGEVENT_READ, Route44Sign1
bg_event 6, 10, BGEVENT_READ, Route44Sign2
bg_event 32, 9, BGEVENT_ITEM, Route44HiddenElixer
db 11 ; object events
def_object_events
object_event 35, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1
object_event 19, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1
object_event 10, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1