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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const ROUTE30_YOUNGSTER1
const ROUTE30_YOUNGSTER2
const ROUTE30_YOUNGSTER3
@@ -12,9 +12,9 @@
const ROUTE30_POKE_BALL
Route30_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
YoungsterJoey_ImportantBattleScript:
waitsfx
@@ -407,20 +407,20 @@ YoungsterJoeyText_GiveHPUpAfterBattle:
Route30_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 7, 39, ROUTE_30_BERRY_HOUSE, 1
warp_event 17, 5, MR_POKEMONS_HOUSE, 1
db 0 ; coord events
def_coord_events
db 5 ; bg events
def_bg_events
bg_event 9, 43, BGEVENT_READ, Route30Sign
bg_event 13, 29, BGEVENT_READ, MrPokemonsHouseDirectionsSign
bg_event 15, 5, BGEVENT_READ, MrPokemonsHouseSign
bg_event 3, 21, BGEVENT_READ, Route30TrainerTips
bg_event 14, 9, BGEVENT_ITEM, Route30HiddenPotion
db 11 ; object events
def_object_events
object_event 5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE
object_event 2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY
object_event 5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1