summaryrefslogtreecommitdiff
path: root/maps/Route36.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route36.asm')
-rw-r--r--maps/Route36.asm38
1 files changed, 19 insertions, 19 deletions
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 86f7ca9fe..4076725b4 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -665,31 +665,31 @@ Route36_MapEventHeader:
.Warps:
db 4
- warp_def $8, $12, 3, ROUTE_36_NATIONAL_PARK_GATE
- warp_def $9, $12, 4, ROUTE_36_NATIONAL_PARK_GATE
- warp_def $d, $2f, 1, ROUTE_36_RUINS_OF_ALPH_GATE
- warp_def $d, $30, 2, ROUTE_36_RUINS_OF_ALPH_GATE
+ warp_def 18, 8, 3, ROUTE_36_NATIONAL_PARK_GATE
+ warp_def 18, 9, 4, ROUTE_36_NATIONAL_PARK_GATE
+ warp_def 47, 13, 1, ROUTE_36_RUINS_OF_ALPH_GATE
+ warp_def 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE
.CoordEvents:
db 2
- coord_event 1, $7, $14, Route36SuicuneScript
- coord_event 1, $7, $16, Route36SuicuneScript
+ coord_event 20, 7, 1, Route36SuicuneScript
+ coord_event 22, 7, 1, Route36SuicuneScript
.BGEvents:
db 4
- bg_event 1, 29, BGEVENT_READ, Route36TrainerTips2
- bg_event 11, 45, BGEVENT_READ, RuinsOfAlphNorthSign
- bg_event 7, 55, BGEVENT_READ, Route36Sign
- bg_event 7, 21, BGEVENT_READ, Route36TrainerTips1
+ bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2
+ bg_event 45, 11, BGEVENT_READ, RuinsOfAlphNorthSign
+ bg_event 55, 7, BGEVENT_READ, Route36Sign
+ bg_event 21, 7, BGEVENT_READ, Route36TrainerTips1
.ObjectEvents:
db 9
- object_event SPRITE_YOUNGSTER, 13, 20, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1
- object_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1
- object_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
- object_event SPRITE_LASS, 8, 51, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1
- object_event SPRITE_FISHER, 9, 44, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1
- object_event SPRITE_FRUIT_TREE, 4, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1
- object_event SPRITE_YOUNGSTER, 6, 46, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
- object_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO
- object_event SPRITE_SUICUNE, 6, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36
+ object_event 20, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1
+ object_event 31, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1
+ object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
+ object_event 51, 8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1
+ object_event 44, 9, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1
+ object_event 21, 4, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1
+ object_event 46, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
+ object_event 33, 12, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO
+ object_event 21, 6, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36