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

@@ -1,12 +1,12 @@
object_const_def ; object_event constants
object_const_def
const SILVERCAVEROOM2_POKE_BALL1
const SILVERCAVEROOM2_POKE_BALL2
const SILVERCAVEROOM2_POKE_BALL3
SilverCaveRoom2_MapScripts:
db 0 ; scene scripts
def_scene_scripts
db 0 ; callbacks
def_callbacks
SilverCaveRoom2Calcium:
itemball CALCIUM
@@ -23,18 +23,18 @@ SilverCaveRoom2HiddenMaxPotion:
SilverCaveRoom2_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
def_warp_events
warp_event 17, 31, SILVER_CAVE_ROOM_1, 2
warp_event 11, 5, SILVER_CAVE_ROOM_3, 1
warp_event 13, 21, SILVER_CAVE_ITEM_ROOMS, 1
warp_event 23, 3, SILVER_CAVE_ITEM_ROOMS, 2
db 0 ; coord events
def_coord_events
db 1 ; bg events
def_bg_events
bg_event 14, 31, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion
db 3 ; object events
def_object_events
object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP