diff options
Diffstat (limited to 'maps/Route2.asm')
| -rw-r--r-- | maps/Route2.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/maps/Route2.asm b/maps/Route2.asm index cceac50f7..47abdc9f5 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -152,31 +152,31 @@ Route2_MapEventHeader: .Warps: db 5 - warp_def $f, $f, 1, ROUTE_2_NUGGET_SPEECH_HOUSE - warp_def $1f, $f, 3, ROUTE_2_GATE - warp_def $1b, $10, 1, ROUTE_2_GATE - warp_def $1b, $11, 2, ROUTE_2_GATE - warp_def $7, $c, 3, DIGLETTS_CAVE + warp_def 15, 15, 1, ROUTE_2_NUGGET_SPEECH_HOUSE + warp_def 15, 31, 3, ROUTE_2_GATE + warp_def 16, 27, 1, ROUTE_2_GATE + warp_def 17, 27, 2, ROUTE_2_GATE + warp_def 12, 7, 3, DIGLETTS_CAVE .CoordEvents: db 0 .BGEvents: db 6 - bg_event 51, 7, BGEVENT_READ, Route2Sign - bg_event 9, 11, BGEVENT_READ, MapRoute2Signpost1Script - bg_event 23, 7, BGEVENT_ITEM, Route2HiddenMaxEther - bg_event 14, 4, BGEVENT_ITEM, Route2HiddenFullHeal - bg_event 27, 4, BGEVENT_ITEM, Route2HiddenFullRestore - bg_event 30, 11, BGEVENT_ITEM, Route2HiddenRevive + bg_event 7, 51, BGEVENT_READ, Route2Sign + bg_event 11, 9, BGEVENT_READ, MapRoute2Signpost1Script + bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther + bg_event 4, 14, BGEVENT_ITEM, Route2HiddenFullHeal + bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore + bg_event 11, 30, BGEVENT_ITEM, Route2HiddenRevive .ObjectEvents: db 8 - object_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1 - object_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1 - object_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1 - object_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT - object_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION - object_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS - object_event SPRITE_POKE_BALL, 50, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER - object_event SPRITE_FRUIT_TREE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1 + object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1 + object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1 + object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1 + object_event 0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT + object_event 2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION + object_event 19, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS + object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER + object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1 |