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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const SAFFRONCITY_LASS1
const SAFFRONCITY_POKEFAN_M
const SAFFRONCITY_COOLTRAINER_M
@@ -9,9 +9,9 @@
const SAFFRONCITY_LASS2
SaffronCity_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -266,7 +266,7 @@ SaffronCityMagnetTrainStationSignText:
SaffronCity_MapEvents:
db 0, 0 ; filler
db 15 ; warp events
def_warp_events
warp_event 26, 3, FIGHTING_DOJO, 1
warp_event 34, 3, SAFFRON_GYM, 1
warp_event 25, 11, SAFFRON_MART, 2
@@ -283,9 +283,9 @@ SaffronCity_MapEvents:
warp_event 39, 22, ROUTE_8_SAFFRON_GATE, 1
warp_event 39, 23, ROUTE_8_SAFFRON_GATE, 2
db 0 ; coord events
def_coord_events
db 8 ; bg events
def_bg_events
bg_event 21, 5, BGEVENT_READ, SaffronCitySign
bg_event 33, 5, BGEVENT_READ, SaffronGymSign
bg_event 25, 5, BGEVENT_READ, FightingDojoSign
@@ -295,7 +295,7 @@ SaffronCity_MapEvents:
bg_event 10, 29, BGEVENT_READ, SaffronCityPokecenterSign
bg_event 26, 11, BGEVENT_READ, SaffronCityMartSign
db 8 ; object events
def_object_events
object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityLass1Script, -1
object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronCityPokefanMScript, -1
object_event 32, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1