summaryrefslogtreecommitdiff
path: root/maps/SproutTower2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/SproutTower2F.asm')
-rw-r--r--maps/SproutTower2F.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm
index 4c202eb80..bf3611ead 100644
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -90,20 +90,20 @@ SproutTower2F_MapEventHeader:
.Warps:
db 4
- warp_def $4, $6, 3, SPROUT_TOWER_1F
- warp_def $6, $2, 4, SPROUT_TOWER_1F
- warp_def $3, $11, 5, SPROUT_TOWER_1F
- warp_def $e, $a, 1, SPROUT_TOWER_3F
+ warp_def 6, 4, 3, SPROUT_TOWER_1F
+ warp_def 2, 6, 4, SPROUT_TOWER_1F
+ warp_def 17, 3, 5, SPROUT_TOWER_1F
+ warp_def 10, 14, 1, SPROUT_TOWER_3F
.CoordEvents:
db 0
.BGEvents:
db 1
- bg_event 15, 12, BGEVENT_READ, MapSproutTower2FSignpost0Script
+ bg_event 12, 15, BGEVENT_READ, MapSproutTower2FSignpost0Script
.ObjectEvents:
db 3
- object_event SPRITE_SAGE, 3, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1
- object_event SPRITE_SAGE, 14, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1
- object_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY
+ object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1
+ object_event 9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1
+ object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY