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

@@ -1,12 +1,12 @@
object_const_def ; object_event constants
object_const_def
const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST1
const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST2
const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST3
PokecomCenterAdminOfficeMobile_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
PokecomCenterAdminOfficeMobileScientist1Script:
jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist1Text
@@ -263,18 +263,18 @@ PokecomCenterAdminOfficeMobileComputer3Text:
PokecomCenterAdminOfficeMobile_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 0, 31, GOLDENROD_POKECENTER_1F, 3
warp_event 1, 31, GOLDENROD_POKECENTER_1F, 3
db 0 ; coord events
def_coord_events
db 3 ; bg events
def_bg_events
bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer1
bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer2
bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer3
db 3 ; object events
def_object_events
object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist1Script, -1
object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist2Script, -1
object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist3Script, -1