diff options
Diffstat (limited to 'maps/Route42.asm')
| -rw-r--r-- | maps/Route42.asm | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/maps/Route42.asm b/maps/Route42.asm index c9d9ac30e..47d45c140 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -36,40 +36,40 @@ Route42SuicuneScript: setmapscene ROUTE_36, 1 end -TrainerFisherTully1: - trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, .Script +TrainerFisherTully: + trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTullySeenText, FisherTullyBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY end_if_just_battled opentext checkflag ENGINE_TULLY - iftrue UnknownScript_0x1a927f + iftrue .WantsBattle checkflag ENGINE_TULLY_HAS_WATER_STONE - iftrue UnknownScript_0x1a92dc + iftrue .HasWaterStone checkcellnum PHONE_FISHER_TULLY - iftrue UnknownScript_0x1a92fd + iftrue .NumberAccepted checkevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x1a9268 - writetext UnknownText_0x1a93ab + iftrue .AskedAlready + writetext FisherTullyAfterBattleText buttonsound setevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x1a92f1 - jump UnknownScript_0x1a926b + scall .AskNumber1 + jump .AskForNumber -UnknownScript_0x1a9268: - scall UnknownScript_0x1a92f5 -UnknownScript_0x1a926b: +.AskedAlready: + scall .AskNumber2 +.AskForNumber: askforphonenumber PHONE_FISHER_TULLY - if_equal PHONE_CONTACTS_FULL, UnknownScript_0x1a9305 - if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x1a9301 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext FISHER, TULLY1, MEM_BUFFER_0 - scall UnknownScript_0x1a92f9 - jump UnknownScript_0x1a92fd + scall .RegisteredNumber + jump .NumberAccepted -UnknownScript_0x1a927f: - scall UnknownScript_0x1a9309 - winlosstext FisherTully1BeatenText, 0 +.WantsBattle: + scall .Rematch + winlosstext FisherTullyBeatenText, 0 copybytetovar wTullyFightCount if_equal 3, .Fight3 if_equal 2, .Fight2 @@ -115,50 +115,50 @@ UnknownScript_0x1a927f: clearflag ENGINE_TULLY end -UnknownScript_0x1a92dc: - scall UnknownScript_0x1a930d +.HasWaterStone: + scall .Gift verbosegiveitem WATER_STONE - iffalse UnknownScript_0x1a92ee + iffalse .NoRoom clearflag ENGINE_TULLY_HAS_WATER_STONE setevent EVENT_TULLY_GAVE_WATER_STONE - jump UnknownScript_0x1a92fd + jump .NumberAccepted -UnknownScript_0x1a92ee: - jump UnknownScript_0x1a9311 +.NoRoom: + jump .PackFull -UnknownScript_0x1a92f1: +.AskNumber1: jumpstd asknumber1m end -UnknownScript_0x1a92f5: +.AskNumber2: jumpstd asknumber2m end -UnknownScript_0x1a92f9: +.RegisteredNumber: jumpstd registerednumberm end -UnknownScript_0x1a92fd: +.NumberAccepted: jumpstd numberacceptedm end -UnknownScript_0x1a9301: +.NumberDeclined: jumpstd numberdeclinedm end -UnknownScript_0x1a9305: +.PhoneFull: jumpstd phonefullm end -UnknownScript_0x1a9309: +.Rematch: jumpstd rematchm end -UnknownScript_0x1a930d: +.Gift: jumpstd giftm end -UnknownScript_0x1a9311: +.PackFull: jumpstd packfullm end @@ -225,18 +225,18 @@ MovementData_0x1a9356: remove_sliding step_end -FisherTully1SeenText: +FisherTullySeenText: text "Let me demonstrate" line "the power of the" cont "#MON I caught!" done -FisherTully1BeatenText: +FisherTullyBeatenText: text "What? That's not" line "right." done -UnknownText_0x1a93ab: +FisherTullyAfterBattleText: text "I want to become" line "the trainer CHAMP" @@ -344,7 +344,7 @@ Route42_MapEvents: .ObjectEvents: db 9 - object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully1, -1 + object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully, -1 object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 |