diff options
Diffstat (limited to 'maps/Route30.asm')
| -rw-r--r-- | maps/Route30.asm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/Route30.asm b/maps/Route30.asm index df8b593d6..744846670 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -12,11 +12,9 @@ const_value set 2 const ROUTE30_POKE_BALL Route30_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks YoungsterJoey_ImportantBattleScript: waitsfx @@ -39,7 +37,7 @@ YoungsterJoey_ImportantBattleScript: end TrainerYoungsterJoey: - trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, .Script + trainer YOUNGSTER, JOEY1, EVENT_BEAT_YOUNGSTER_JOEY, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY @@ -186,7 +184,7 @@ TrainerYoungsterJoey: end TrainerYoungsterMikey: - trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script + trainer YOUNGSTER, MIKEY, EVENT_BEAT_YOUNGSTER_MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script .Script: end_if_just_battled @@ -197,7 +195,7 @@ TrainerYoungsterMikey: end TrainerBugCatcherDon: - trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, BugCatcherDonSeenText, BugCatcherDonBeatenText, 0, .Script + trainer BUG_CATCHER, DON, EVENT_BEAT_BUG_CATCHER_DON, BugCatcherDonSeenText, BugCatcherDonBeatenText, 0, .Script .Script: end_if_just_battled @@ -248,7 +246,7 @@ Route30FruitTree2: fruittree FRUITTREE_ROUTE_30_2 Route30HiddenPotion: - hiddenitem EVENT_ROUTE_30_HIDDEN_POTION, POTION + hiddenitem POTION, EVENT_ROUTE_30_HIDDEN_POTION Route30_JoeysRattataAttacksMovement: fix_facing @@ -407,27 +405,22 @@ YoungsterJoeyText_GiveHPUpAfterBattle: done Route30_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 7, 39, 1, ROUTE_30_BERRY_SPEECH_HOUSE - warp_def 17, 5, 1, MR_POKEMONS_HOUSE + db 2 ; warp events + warp_event 7, 39, 1, ROUTE_30_BERRY_HOUSE + warp_event 17, 5, 1, MR_POKEMONS_HOUSE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 5 + db 5 ; bg events bg_event 9, 43, BGEVENT_READ, Route30Sign bg_event 13, 29, BGEVENT_READ, MrPokemonsHouseDirectionsSign bg_event 15, 5, BGEVENT_READ, MrPokemonsHouseSign bg_event 3, 21, BGEVENT_READ, Route30TrainerTips bg_event 14, 9, BGEVENT_ITEM, Route30HiddenPotion -.ObjectEvents: - db 11 + db 11 ; object events object_event 5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE object_event 2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY object_event 5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 |