summaryrefslogtreecommitdiff
path: root/maps/Route6.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route6.asm')
-rw-r--r--maps/Route6.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route6.asm b/maps/Route6.asm
index 884470930..d19033031 100644
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -97,18 +97,18 @@ Route6_MapEventHeader:
.Warps:
db 2
- warp_def $3, $11, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
- warp_def $1, $6, 3, ROUTE_6_SAFFRON_GATE
+ warp_def 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
+ warp_def 6, 1, 3, ROUTE_6_SAFFRON_GATE
.CoordEvents:
db 0
.BGEvents:
db 1
- bg_event 5, 19, BGEVENT_READ, Route6UndergroundPathSign
+ bg_event 19, 5, BGEVENT_READ, Route6UndergroundPathSign
.ObjectEvents:
db 3
- object_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
- object_event SPRITE_POKEFAN_M, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1
- object_event SPRITE_POKEFAN_M, 12, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1
+ object_event 17, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
+ object_event 9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1
+ object_event 10, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1