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

@@ -1,14 +1,14 @@
object_const_def ; object_event constants
object_const_def
const SAFFRONMAGNETTRAINSTATION_OFFICER
const SAFFRONMAGNETTRAINSTATION_GYM_GUIDE
const SAFFRONMAGNETTRAINSTATION_TEACHER
const SAFFRONMAGNETTRAINSTATION_LASS
SaffronMagnetTrainStation_MapScripts:
db 1 ; scene scripts
def_scene_scripts
scene_script .DummyScene ; SCENE_DEFAULT
db 0 ; callbacks
def_callbacks
.DummyScene:
end
@@ -216,18 +216,18 @@ SaffronMagnetTrainStationLassText:
SaffronMagnetTrainStation_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 8, 17, SAFFRON_CITY, 6
warp_event 9, 17, SAFFRON_CITY, 6
warp_event 6, 5, GOLDENROD_MAGNET_TRAIN_STATION, 4
warp_event 11, 5, GOLDENROD_MAGNET_TRAIN_STATION, 3
db 1 ; coord events
def_coord_events
coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromGoldenrod
db 0 ; bg events
def_bg_events
db 4 ; object events
def_object_events
object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationOfficerScript, -1
object_event 10, 14, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationGymGuideScript, -1
object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION