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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const BURNEDTOWERB1F_BOULDER
const BURNEDTOWERB1F_RAIKOU1
const BURNEDTOWERB1F_ENTEI1
@@ -10,11 +10,11 @@
const BURNEDTOWERB1F_EUSINE
BurnedTowerB1F_MapScripts:
db 2 ; scene scripts
def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_FINISHED
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_TILES, .LadderCallback
.DummyScene0:
@@ -237,7 +237,7 @@ BurnedTowerB1FEusineText:
BurnedTowerB1F_MapEvents:
db 0, 0 ; filler
db 6 ; warp events
def_warp_events
warp_event 10, 9, BURNED_TOWER_1F, 3
warp_event 17, 7, BURNED_TOWER_1F, 7
warp_event 10, 8, BURNED_TOWER_1F, 9
@@ -245,12 +245,12 @@ BurnedTowerB1F_MapEvents:
warp_event 17, 14, BURNED_TOWER_1F, 12
warp_event 7, 15, BURNED_TOWER_1F, 14
db 1 ; coord events
def_coord_events
coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts
db 0 ; bg events
def_bg_events
db 9 ; object events
def_object_events
object_event 17, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1
object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1