pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues 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/Route46.asm
View File

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const ROUTE46_POKEFAN_M
const ROUTE46_YOUNGSTER
const ROUTE46_LASS
@@ -7,9 +7,9 @@
const ROUTE46_POKE_BALL
Route46_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
TrainerCamperTed:
trainer CAMPER, TED, EVENT_BEAT_CAMPER_TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script
@@ -251,17 +251,17 @@ Route46SignText:
Route46_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
def_warp_events
warp_event 7, 33, ROUTE_29_ROUTE_46_GATE, 1
warp_event 8, 33, ROUTE_29_ROUTE_46_GATE, 2
warp_event 14, 5, DARK_CAVE_VIOLET_ENTRANCE, 3
db 0 ; coord events
def_coord_events
db 1 ; bg events
def_bg_events
bg_event 9, 27, BGEVENT_READ, Route46Sign
db 6 ; object events
def_object_events
object_event 12, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1
object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1
object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1