diff options
Diffstat (limited to 'maps/Route42.asm')
| -rw-r--r-- | maps/Route42.asm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/maps/Route42.asm b/maps/Route42.asm index 40feaa927..ccf174b17 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -325,32 +325,32 @@ Route42_MapEventHeader: .Warps: db 5 - warp_def $8, $0, 3, ROUTE_42_ECRUTEAK_GATE - warp_def $9, $0, 4, ROUTE_42_ECRUTEAK_GATE - warp_def $5, $a, 1, MOUNT_MORTAR_1F_OUTSIDE - warp_def $9, $1c, 2, MOUNT_MORTAR_1F_OUTSIDE - warp_def $7, $2e, 3, MOUNT_MORTAR_1F_OUTSIDE + warp_def 0, 8, 3, ROUTE_42_ECRUTEAK_GATE + warp_def 0, 9, 4, ROUTE_42_ECRUTEAK_GATE + warp_def 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE + warp_def 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE + warp_def 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE .CoordEvents: db 1 - coord_event 1, $e, $18, Route42SuicuneScript + coord_event 24, 14, 1, Route42SuicuneScript .BGEvents: db 5 - bg_event 10, 4, BGEVENT_READ, Route42Sign1 - bg_event 5, 7, BGEVENT_READ, MtMortarSign1 - bg_event 9, 45, BGEVENT_READ, MtMortarSign2 - bg_event 8, 54, BGEVENT_READ, Route42Sign2 - bg_event 11, 16, BGEVENT_ITEM, Route42HiddenMaxPotion + bg_event 4, 10, BGEVENT_READ, Route42Sign1 + bg_event 7, 5, BGEVENT_READ, MtMortarSign1 + bg_event 45, 9, BGEVENT_READ, MtMortarSign2 + bg_event 54, 8, BGEVENT_READ, Route42Sign2 + bg_event 16, 11, BGEVENT_ITEM, Route42HiddenMaxPotion .ObjectEvents: db 9 - object_event SPRITE_FISHER, 10, 40, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully1, -1 - object_event SPRITE_POKEFAN_M, 9, 51, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 - object_event SPRITE_SUPER_NERD, 8, 47, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 - object_event SPRITE_FRUIT_TREE, 16, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 - object_event SPRITE_FRUIT_TREE, 16, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 - object_event SPRITE_FRUIT_TREE, 16, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 - object_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL - object_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION - object_event SPRITE_SUICUNE, 16, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 + object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully1, -1 + object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 + object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 + object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 + object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 + object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 + object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL + object_event 33, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION + object_event 26, 16, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 |