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

@@ -1,4 +1,4 @@
object_const_def ; object_event constants
object_const_def
const BURNEDTOWER1F_ROCK
const BURNEDTOWER1F_EUSINE
const BURNEDTOWER1F_SILVER
@@ -6,12 +6,12 @@
const BURNEDTOWER1F_POKE_BALL
BurnedTower1F_MapScripts:
db 3 ; scene scripts
def_scene_scripts
scene_script .EusineScene ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_RIVAL_BATTLE
scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_NOTHING
db 1 ; callbacks
def_callbacks
callback MAPCALLBACK_TILES, .HoleAndLadder
.EusineScene:
@@ -278,7 +278,7 @@ BurnedTower1FMortyText:
BurnedTower1F_MapEvents:
db 0, 0 ; filler
db 14 ; warp events
def_warp_events
warp_event 9, 15, ECRUTEAK_CITY, 13
warp_event 10, 15, ECRUTEAK_CITY, 13
warp_event 10, 9, BURNED_TOWER_B1F, 1
@@ -294,14 +294,14 @@ BurnedTower1F_MapEvents:
warp_event 15, 14, BURNED_TOWER_B1F, 5 ; inaccessible, left over from G/S
warp_event 7, 15, BURNED_TOWER_B1F, 6 ; inaccessible, left over from G/S
db 1 ; coord events
def_coord_events
coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript
db 2 ; bg events
def_bg_events
bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther
bg_event 13, 11, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall
db 5 ; object events
def_object_events
object_event 15, 4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
object_event 12, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE
object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER