diff options
Diffstat (limited to 'maps/Route2.asm')
| -rw-r--r-- | maps/Route2.asm | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/maps/Route2.asm b/maps/Route2.asm index 6b7a0e8ec..80f703b16 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -9,41 +9,41 @@ const_value set 2 const ROUTE2_FRUIT_TREE Route2_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerBug_catcherRob: - trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, Bug_catcherRobScript + trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, .Script -Bug_catcherRobScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ac34d + writetext Bug_catcherRobAfterBattleText waitbutton closetext end TrainerBug_catcherEd: - trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, Bug_catcherEdScript + trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, .Script -Bug_catcherEdScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ac3cf + writetext Bug_catcherEdAfterBattleText waitbutton closetext end TrainerBug_catcherDoug: - trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, Bug_catcherDougScript + trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, .Script -Bug_catcherDougScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ac423 + writetext Bug_catcherDougAfterBattleText waitbutton closetext end @@ -91,7 +91,7 @@ Bug_catcherRobBeatenText: text "I was whipped…" done -UnknownText_0x1ac34d: +Bug_catcherRobAfterBattleText: text "I'm going to look" line "for stronger bug" cont "#MON." @@ -109,7 +109,7 @@ Bug_catcherEdBeatenText: text "Ouch, ouch, ouch!" done -UnknownText_0x1ac3cf: +Bug_catcherEdAfterBattleText: text "They'll really" line "sting when you" cont "take a bath." @@ -124,7 +124,7 @@ Bug_catcherDougBeatenText: text "No good!" done -UnknownText_0x1ac423: +Bug_catcherDougAfterBattleText: text "Bug #MON squish" line "like plush toys" @@ -158,25 +158,25 @@ Route2_MapEventHeader: warp_def $1b, $11, 2, ROUTE_2_GATE warp_def $7, $c, 3, DIGLETTS_CAVE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 6 - signpost 51, 7, SIGNPOST_READ, Route2Sign - signpost 9, 11, SIGNPOST_READ, MapRoute2Signpost1Script - signpost 23, 7, SIGNPOST_ITEM, Route2HiddenMaxEther - signpost 14, 4, SIGNPOST_ITEM, Route2HiddenFullHeal - signpost 27, 4, SIGNPOST_ITEM, Route2HiddenFullRestore - signpost 30, 11, SIGNPOST_ITEM, Route2HiddenRevive - -.PersonEvents: + 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 + +.ObjectEvents: db 8 - person_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherRob, -1 - person_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherEd, -1 - person_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherDoug, -1 - person_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT - person_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION - person_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS - person_event SPRITE_POKE_BALL, 50, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER - person_event SPRITE_FRUIT_TREE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1 + object_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBug_catcherRob, -1 + object_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherEd, -1 + object_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherDoug, -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 |