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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const GOLDENRODCITY_POKEFAN_M1
const GOLDENRODCITY_YOUNGSTER1
const GOLDENRODCITY_COOLTRAINER_F1
@@ -16,9 +16,9 @@
const GOLDENRODCITY_MOVETUTOR
GoldenrodCity_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 2 ; callbacks
def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPointAndFloria
callback MAPCALLBACK_OBJECTS, .MoveTutor
@@ -552,7 +552,7 @@ GoldenrodCityMoveTutorMoveText:
GoldenrodCity_MapEvents:
db 0, 0 ; filler
db 15 ; warp events
def_warp_events
warp_event 24, 7, GOLDENROD_GYM, 1
warp_event 29, 29, GOLDENROD_BIKE_SHOP, 1
warp_event 31, 21, GOLDENROD_HAPPINESS_RATER, 1
@@ -569,9 +569,9 @@ GoldenrodCity_MapEvents:
warp_event 11, 29, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 5
warp_event 15, 27, GOLDENROD_POKECENTER_1F, 1
db 0 ; coord events
def_coord_events
db 12 ; bg events
def_bg_events
bg_event 10, 14, BGEVENT_READ, GoldenrodCityStationSign
bg_event 4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign
bg_event 26, 27, BGEVENT_READ, GoldenrodDeptStoreSign
@@ -585,7 +585,7 @@ GoldenrodCity_MapEvents:
bg_event 16, 27, BGEVENT_UP, GoldenrodCityPokecenterSign
bg_event 30, 6, BGEVENT_READ, GoldenrodCityFlowerShopSign
db 15 ; object events
def_object_events
object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 30, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS
object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityCooltrainerF1Script, EVENT_GOLDENROD_CITY_CIVILIANS