diff options
Diffstat (limited to 'maps/Route30.asm')
| -rw-r--r-- | maps/Route30.asm | 89 |
1 files changed, 41 insertions, 48 deletions
diff --git a/maps/Route30.asm b/maps/Route30.asm index df8b593d6..5f20a239d 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE30_YOUNGSTER1 const ROUTE30_YOUNGSTER2 const ROUTE30_YOUNGSTER3 @@ -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 @@ -31,7 +29,7 @@ YoungsterJoey_ImportantBattleScript: faceplayer writetext Text_ThisIsABigBattle waitbutton - spriteface ROUTE30_YOUNGSTER1, UP + objectface ROUTE30_YOUNGSTER1, UP closetext playsound SFX_TACKLE applymovement ROUTE30_MONSTER1, Route30_MikeysRattataAttacksMovement @@ -39,11 +37,11 @@ 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 - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_JOEY iftrue .Rematch @@ -61,8 +59,8 @@ TrainerYoungsterJoey: scall .AskNumber2 .RequestNumber: askforphonenumber PHONE_YOUNGSTER_JOEY - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -71,11 +69,11 @@ TrainerYoungsterJoey: scall .RematchStd winlosstext YoungsterJoey1BeatenText, 0 copybytetovar wJoeyFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight4 @@ -186,10 +184,10 @@ 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 + endifjustbattled opentext writetext YoungsterMikeyAfterText waitbutton @@ -197,10 +195,10 @@ 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 + endifjustbattled opentext writetext BugCatcherDonAfterText waitbutton @@ -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,35 +405,30 @@ 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, ROUTE_30_BERRY_HOUSE, 1 + warp_event 17, 5, MR_POKEMONS_HOUSE, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 5 - bg_event 9, 43, BGEVENT_READ, Route30Sign + 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 - 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 - object_event 1, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDon, -1 - object_event 7, 30, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1 - object_event 5, 24, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE - object_event 5, 25, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE - object_event 5, 39, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1 - object_event 11, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1 - object_event 2, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1 - object_event 8, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE + bg_event 15, 5, BGEVENT_READ, MrPokemonsHouseSign + bg_event 3, 21, BGEVENT_READ, Route30TrainerTips + bg_event 14, 9, BGEVENT_ITEM, Route30HiddenPotion + + 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 + object_event 1, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDon, -1 + object_event 7, 30, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1 + object_event 5, 24, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + object_event 5, 25, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + object_event 5, 39, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1 + object_event 11, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1 + object_event 2, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1 + object_event 8, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE |