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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const VERMILIONCITY_TEACHER
const VERMILIONCITY_GRAMPS
const VERMILIONCITY_MACHOP
@@ -7,9 +7,9 @@
const VERMILIONCITY_POKEFAN_M
VermilionCity_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -268,7 +268,7 @@ VermilionCityPortSignText:
VermilionCity_MapEvents:
db 0, 0 ; filler
db 10 ; warp events
def_warp_events
warp_event 5, 5, VERMILION_FISHING_SPEECH_HOUSE, 1
warp_event 9, 5, VERMILION_POKECENTER_1F, 1
warp_event 7, 13, POKEMON_FAN_CLUB, 1
@@ -280,9 +280,9 @@ VermilionCity_MapEvents:
warp_event 20, 31, VERMILION_PORT_PASSAGE, 2
warp_event 34, 7, DIGLETTS_CAVE, 1
db 0 ; coord events
def_coord_events
db 8 ; bg events
def_bg_events
bg_event 25, 3, BGEVENT_READ, VermilionCitySign
bg_event 5, 19, BGEVENT_READ, VermilionGymSign
bg_event 5, 13, BGEVENT_READ, PokemonFanClubSign
@@ -292,7 +292,7 @@ VermilionCity_MapEvents:
bg_event 22, 13, BGEVENT_READ, VermilionCityMartSign
bg_event 12, 19, BGEVENT_ITEM, VermilionCityHiddenFullHeal
db 6 ; object events
def_object_events
object_event 18, 9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1
object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1
object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1