diff options
Diffstat (limited to 'maps/Route2.asm')
| -rw-r--r-- | maps/Route2.asm | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/maps/Route2.asm b/maps/Route2.asm index 09b885df3..27f3e0c8b 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -9,14 +9,12 @@ const_value set 2 const ROUTE2_FRUIT_TREE Route2_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBugCatcherRob: - trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script + trainer BUG_CATCHER, ROB, EVENT_BEAT_BUG_CATCHER_ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script .Script: end_if_just_battled @@ -27,7 +25,7 @@ TrainerBugCatcherRob: end TrainerBugCatcherEd: - trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script + trainer BUG_CATCHER, ED, EVENT_BEAT_BUG_CATCHER_ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script .Script: end_if_just_battled @@ -38,7 +36,7 @@ TrainerBugCatcherEd: end TrainerBugCatcherDoug: - trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script + trainer BUG_CATCHER, DOUG, EVENT_BEAT_BUG_CATCHER_DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script .Script: end_if_just_battled @@ -70,16 +68,16 @@ FruitTreeScript_0x1ac306: fruittree FRUITTREE_ROUTE_2 Route2HiddenMaxEther: - hiddenitem EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem MAX_ETHER, EVENT_ROUTE_2_HIDDEN_MAX_ETHER Route2HiddenFullHeal: - hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_ROUTE_2_HIDDEN_FULL_HEAL Route2HiddenFullRestore: - hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_ROUTE_2_HIDDEN_FULL_RESTORE Route2HiddenRevive: - hiddenitem EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_ROUTE_2_HIDDEN_REVIVE BugCatcherRobSeenText: text "My bug #MON are" @@ -147,22 +145,18 @@ UnknownText_0x1ac49f: done Route2_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - 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 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 15, 15, 1, ROUTE_2_NUGGET_HOUSE + warp_event 15, 31, 3, ROUTE_2_GATE + warp_event 16, 27, 1, ROUTE_2_GATE + warp_event 17, 27, 2, ROUTE_2_GATE + warp_event 12, 7, 3, DIGLETTS_CAVE + + db 0 ; coord events + + db 6 ; bg events bg_event 7, 51, BGEVENT_READ, Route2Sign bg_event 11, 9, BGEVENT_READ, MapRoute2Signpost1Script bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther @@ -170,8 +164,7 @@ Route2_MapEvents: bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore bg_event 11, 30, BGEVENT_ITEM, Route2HiddenRevive -.ObjectEvents: - db 8 + db 8 ; object events 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 |