diff options
Diffstat (limited to 'maps/BurnedTower1F.asm')
| -rw-r--r-- | maps/BurnedTower1F.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 71bab1aa6..9aea9e81f 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -279,31 +279,31 @@ BurnedTower1F_MapEvents: db 0, 0 ; filler db 14 ; warp events - warp_event 9, 15, ECRUTEAK_CITY, 13 + warp_event 9, 15, ECRUTEAK_CITY, 13 warp_event 10, 15, ECRUTEAK_CITY, 13 - warp_event 10, 9, BURNED_TOWER_B1F, 1 - warp_event 5, 5, BURNED_TOWER_B1F, 1 - warp_event 5, 6, BURNED_TOWER_B1F, 1 - warp_event 4, 6, BURNED_TOWER_B1F, 1 - warp_event 15, 4, BURNED_TOWER_B1F, 2 - warp_event 15, 5, BURNED_TOWER_B1F, 2 - warp_event 10, 7, BURNED_TOWER_B1F, 3 - warp_event 5, 14, BURNED_TOWER_B1F, 4 - warp_event 4, 14, BURNED_TOWER_B1F, 4 - warp_event 14, 14, BURNED_TOWER_B1F, 5 - warp_event 15, 14, BURNED_TOWER_B1F, 5 - warp_event 7, 15, BURNED_TOWER_B1F, 6 + warp_event 10, 9, BURNED_TOWER_B1F, 1 + warp_event 5, 5, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S + warp_event 5, 6, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S + warp_event 4, 6, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S + warp_event 15, 4, BURNED_TOWER_B1F, 2 ; inaccessible, left over from G/S + warp_event 15, 5, BURNED_TOWER_B1F, 2 ; inaccessible, left over from G/S + warp_event 10, 7, BURNED_TOWER_B1F, 3 ; inaccessible, left over from G/S + warp_event 5, 14, BURNED_TOWER_B1F, 4 ; inaccessible, left over from G/S + warp_event 4, 14, BURNED_TOWER_B1F, 4 ; inaccessible, left over from G/S + warp_event 14, 14, BURNED_TOWER_B1F, 5 ; inaccessible, left over from G/S + 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 - coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript + coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript db 2 ; bg events - bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther + bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther bg_event 13, 11, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall db 5 ; object events - object_event 15, 4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1 + 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 + object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER object_event 14, 14, SPRITE_MORTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY - object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP + object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP |