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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const NATIONALPARKBUGCONTEST_YOUNGSTER1
const NATIONALPARKBUGCONTEST_YOUNGSTER2
const NATIONALPARKBUGCONTEST_ROCKER
@@ -13,9 +13,9 @@
const NATIONALPARKBUGCONTEST_POKE_BALL2
NationalParkBugContest_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
BugCatchingContestant1AScript:
faceplayer
@@ -221,21 +221,21 @@ NationalParkBugContestTrainerTipsText:
NationalParkBugContest_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 33, 18, ROUTE_36_NATIONAL_PARK_GATE, 1
warp_event 33, 19, ROUTE_36_NATIONAL_PARK_GATE, 1
warp_event 10, 47, ROUTE_35_NATIONAL_PARK_GATE, 1
warp_event 11, 47, ROUTE_35_NATIONAL_PARK_GATE, 1
db 0 ; coord events
def_coord_events
db 4 ; bg events
def_bg_events
bg_event 14, 44, BGEVENT_READ, NationalParkBugContestRelaxationSquareSign
bg_event 27, 31, BGEVENT_READ, NationalParkBugContestBattleNoticeSign
bg_event 6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal
bg_event 12, 4, BGEVENT_READ, NationalParkBugContestTrainerTipsSign
db 12 ; object events
def_object_events
object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant1AScript, EVENT_BUG_CATCHING_CONTESTANT_1A
object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant2AScript, EVENT_BUG_CATCHING_CONTESTANT_2A
object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant3AScript, EVENT_BUG_CATCHING_CONTESTANT_3A