diff options
Diffstat (limited to 'maps/Route45.asm')
| -rw-r--r-- | maps/Route45.asm | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/maps/Route45.asm b/maps/Route45.asm index 156d06957..339eed39c 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -14,14 +14,12 @@ const_value set 2 const ROUTE45_YOUNGSTER Route45_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBlackbeltKenji: - trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script + trainer BLACKBELT_T, KENJI3, EVENT_BEAT_BLACKBELT_KENJI, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI @@ -31,7 +29,7 @@ TrainerBlackbeltKenji: iftrue .Registered checkevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready - special Special_SampleKenjiBreakCountdown + special SampleKenjiBreakCountdown writetext BlackbeltKenjiAfterBattleText waitbutton setevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER @@ -61,7 +59,7 @@ TrainerBlackbeltKenji: verbosegiveitem PP_UP iffalse .NoRoom clearevent EVENT_KENJI_ON_BREAK - special Special_SampleKenjiBreakCountdown + special SampleKenjiBreakCountdown jump Route45NumberAcceptedM .Morning: @@ -125,7 +123,7 @@ Route45RematchGiftM: end TrainerHikerErik: - trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script + trainer HIKER, ERIK, EVENT_BEAT_HIKER_ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script .Script: end_if_just_battled @@ -136,7 +134,7 @@ TrainerHikerErik: end TrainerHikerMichael: - trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script + trainer HIKER, MICHAEL, EVENT_BEAT_HIKER_MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script .Script: end_if_just_battled @@ -147,7 +145,7 @@ TrainerHikerMichael: end TrainerHikerParry: - trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, 0, .Script + trainer HIKER, PARRY3, EVENT_BEAT_HIKER_PARRY, HikerParry3SeenText, HikerParry3BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_HIKER_PARRY @@ -233,7 +231,7 @@ TrainerHikerParry: jump Route45NumberAcceptedM TrainerHikerTimothy: - trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script + trainer HIKER, TIMOTHY, EVENT_BEAT_HIKER_TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script .Script: end_if_just_battled @@ -244,7 +242,7 @@ TrainerHikerTimothy: end TrainerCooltrainermRyan: - trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script + trainer COOLTRAINERM, RYAN, EVENT_BEAT_COOLTRAINERM_RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script .Script: end_if_just_battled @@ -255,7 +253,7 @@ TrainerCooltrainermRyan: end TrainerCooltrainerfKelly: - trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script + trainer COOLTRAINERF, KELLY, EVENT_BEAT_COOLTRAINERF_KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script .Script: end_if_just_battled @@ -312,7 +310,7 @@ Route45MaxPotion: itemball MAX_POTION Route45HiddenPpUp: - hiddenitem EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP + hiddenitem PP_UP, EVENT_ROUTE_45_HIDDEN_PP_UP HikerErikSeenText: text "Be prepared for" @@ -532,23 +530,18 @@ Route45SignText: done Route45_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE + db 1 ; warp events + warp_event 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 10, 4, BGEVENT_READ, Route45Sign bg_event 13, 80, BGEVENT_ITEM, Route45HiddenPpUp -.ObjectEvents: - db 13 + db 13 ; object events object_event 10, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerErik, -1 object_event 15, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerMichael, -1 object_event 5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1 |