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

@@ -1,12 +1,12 @@
object_const_def ; object_event constants
object_const_def
const ROUTE20_SWIMMER_GIRL1
const ROUTE20_SWIMMER_GIRL2
const ROUTE20_SWIMMER_GUY
Route20_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_NEWMAP, .ClearRocks
.ClearRocks:
@@ -113,15 +113,15 @@ CinnabarGymSignText:
Route20_MapEvents:
db 0, 0 ; filler
db 1 ; warp events
def_warp_events
warp_event 38, 7, SEAFOAM_GYM, 1
db 0 ; coord events
def_coord_events
db 1 ; bg events
def_bg_events
bg_event 37, 11, BGEVENT_READ, CinnabarGymSign
db 3 ; object events
def_object_events
object_event 52, 8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1
object_event 45, 13, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1
object_event 12, 13, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1