pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08: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/EcruteakCity.asm
View File

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const ECRUTEAKCITY_GRAMPS1
const ECRUTEAKCITY_GRAMPS2
const ECRUTEAKCITY_LASS1
@@ -8,9 +8,9 @@
const ECRUTEAKCITY_GRAMPS3
EcruteakCity_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -260,7 +260,7 @@ BurnedTowerSignText:
EcruteakCity_MapEvents:
db 0, 0 ; filler
db 15 ; warp events
def_warp_events
warp_event 35, 26, ROUTE_42_ECRUTEAK_GATE, 1
warp_event 35, 27, ROUTE_42_ECRUTEAK_GATE, 2
warp_event 18, 11, ECRUTEAK_TIN_TOWER_ENTRANCE, 1
@@ -277,9 +277,9 @@ EcruteakCity_MapEvents:
warp_event 0, 18, ROUTE_38_ECRUTEAK_GATE, 3
warp_event 0, 19, ROUTE_38_ECRUTEAK_GATE, 4
db 0 ; coord events
def_coord_events
db 8 ; bg events
def_bg_events
bg_event 15, 21, BGEVENT_READ, EcruteakCitySign
bg_event 38, 10, BGEVENT_READ, TinTowerSign
bg_event 8, 28, BGEVENT_READ, EcruteakGymSign
@@ -289,7 +289,7 @@ EcruteakCity_MapEvents:
bg_event 30, 21, BGEVENT_READ, EcruteakCityMartSign
bg_event 23, 14, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion
db 7 ; object events
def_object_events
object_event 18, 15, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1
object_event 20, 21, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1
object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLass1Script, -1