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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const SAFFRONGYM_SABRINA
const SAFFRONGYM_GRANNY1
const SAFFRONGYM_YOUNGSTER1
@@ -7,9 +7,9 @@
const SAFFRONGYM_GYM_GUIDE
SaffronGym_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
SaffronGymSabrinaScript:
faceplayer
@@ -291,7 +291,7 @@ SaffronGymGuideWinText:
SaffronGym_MapEvents:
db 0, 0 ; filler
db 32 ; warp events
def_warp_events
warp_event 8, 17, SAFFRON_CITY, 2
warp_event 9, 17, SAFFRON_CITY, 2
warp_event 11, 15, SAFFRON_GYM, 18
@@ -325,12 +325,12 @@ SaffronGym_MapEvents:
warp_event 1, 3, SAFFRON_GYM, 16
warp_event 11, 9, SAFFRON_GYM, 17
db 0 ; coord events
def_coord_events
db 1 ; bg events
def_bg_events
bg_event 8, 15, BGEVENT_READ, SaffronGymStatue
db 6 ; object events
def_object_events
object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronGymSabrinaScript, -1
object_event 17, 16, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1
object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1