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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const LAKEOFRAGE_LANCE
const LAKEOFRAGE_GRAMPS
const LAKEOFRAGE_SUPER_NERD1
@@ -13,11 +13,11 @@
const LAKEOFRAGE_POKE_BALL2
LakeOfRage_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .DummyScene0 ; unusable
scene_script .DummyScene1 ; unusable
db 2 ; callbacks
def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
callback MAPCALLBACK_OBJECTS, .Wesley
@@ -494,20 +494,20 @@ FishingGurusHouseSignText:
LakeOfRage_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
def_warp_events
warp_event 7, 3, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 1
warp_event 27, 31, LAKE_OF_RAGE_MAGIKARP_HOUSE, 1
db 0 ; coord events
def_coord_events
db 5 ; bg events
def_bg_events
bg_event 21, 27, BGEVENT_READ, LakeOfRageSign
bg_event 25, 31, BGEVENT_READ, MagikarpHouseSignScript
bg_event 11, 28, BGEVENT_ITEM, LakeOfRageHiddenFullRestore
bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy
bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion
db 12 ; object events
def_object_events
object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageLanceScript, EVENT_LAKE_OF_RAGE_LANCE
object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageGrampsScript, -1
object_event 36, 13, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1