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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const PEWTERCITY_COOLTRAINER_F
const PEWTERCITY_BUG_CATCHER
const PEWTERCITY_GRAMPS
@@ -6,9 +6,9 @@
const PEWTERCITY_FRUIT_TREE2
PewterCity_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -153,16 +153,16 @@ PewterCityWelcomeSignText:
PewterCity_MapEvents:
db 0, 0 ; filler
db 5 ; warp events
def_warp_events
warp_event 29, 13, PEWTER_NIDORAN_SPEECH_HOUSE, 1
warp_event 16, 17, PEWTER_GYM, 1
warp_event 23, 17, PEWTER_MART, 2
warp_event 13, 25, PEWTER_POKECENTER_1F, 1
warp_event 7, 29, PEWTER_SNOOZE_SPEECH_HOUSE, 1
db 0 ; coord events
def_coord_events
db 7 ; bg events
def_bg_events
bg_event 25, 23, BGEVENT_READ, PewterCitySign
bg_event 11, 17, BGEVENT_READ, PewterGymSign
bg_event 15, 9, BGEVENT_READ, PewterMuseumSign
@@ -171,7 +171,7 @@ PewterCity_MapEvents:
bg_event 14, 25, BGEVENT_READ, PewterCityPokecenterSign
bg_event 24, 17, BGEVENT_READ, PewterCityMartSign
db 5 ; object events
def_object_events
object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1
object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1
object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterCityGrampsScript, -1