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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const ROUTE31_FISHER
const ROUTE31_YOUNGSTER
const ROUTE31_BUG_CATCHER
@@ -8,9 +8,9 @@
const ROUTE31_POKE_BALL2
Route31_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_NEWMAP, .CheckMomCall
.CheckMomCall:
@@ -418,18 +418,18 @@ DarkCaveSignText:
Route31_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
def_warp_events
warp_event 4, 6, ROUTE_31_VIOLET_GATE, 3
warp_event 4, 7, ROUTE_31_VIOLET_GATE, 4
warp_event 34, 5, DARK_CAVE_VIOLET_ENTRANCE, 1
db 0 ; coord events
def_coord_events
db 2 ; bg events
def_bg_events
bg_event 7, 5, BGEVENT_READ, Route31Sign
bg_event 31, 5, BGEVENT_READ, DarkCaveSign
db 7 ; object events
def_object_events
object_event 17, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1
object_event 9, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1
object_event 21, 13, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherWade1, -1