diff options
Diffstat (limited to 'maps')
126 files changed, 510 insertions, 507 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 86db44670..b119d9239 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -40,7 +40,7 @@ AzaleaGymBugsyScript: setevent EVENT_BEAT_BUG_CATCHER_AL setevent EVENT_BEAT_BUG_CATCHER_JOSH writetext BugsyText_HiveBadgeSpeech - buttonsound + promptbutton verbosegiveitem TM_FURY_CUTTER iffalse .NoRoomForFuryCutter setevent EVENT_GOT_TM49_FURY_CUTTER diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 85bf39cd7..6fdd2e1a4 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -157,10 +157,10 @@ AzaleaTownCelebiScene: applymovement PLAYER, AzaleaTownPlayerLeavesKurtsHouseMovement opentext writetext AzaleaTownKurtText1 - buttonsound + promptbutton turnobject AZALEATOWN_KURT_OUTSIDE, RIGHT writetext AzaleaTownKurtText2 - buttonsound + promptbutton writetext AzaleaTownKurtText3 waitbutton verbosegiveitem GS_BALL diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index b79f835d7..a405783ea 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -57,7 +57,7 @@ BattleTower1FReceptionistScript: ifequal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm opentext writetext Text_BattleTowerWelcomesYou - buttonsound + promptbutton setval BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags] special BattleTowerAction ifnotequal $0, Script_Menu_ChallengeExplanationCancel @@ -528,7 +528,7 @@ Text_PlayerGotFive: text_ram wStringBuffer4 text "!@" sound_item - text_waitbutton + text_promptbutton text_end Text_YourPackIsStuffedFull: diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 3f9c17f06..17939e77d 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -28,7 +28,7 @@ Script_BattleRoomLoop: applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksIn opentext battletowertext BATTLETOWERTEXT_INTRO - buttonsound + promptbutton closetext special BattleTowerBattle ; calls predef startbattle special FadeOutPalettes diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index 9ac4792cf..9dd90f668 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -17,7 +17,7 @@ BillScript: yesorno iffalse .Refused writetext BillImCountingOnYouText - buttonsound + promptbutton waitsfx readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, .NoRoom @@ -54,13 +54,13 @@ BillsMomScript: opentext checkevent EVENT_MET_BILL iffalse .HaventMetBill - writetext BillsPopText + writetext BillsMomText_BeforeEcruteak waitbutton closetext end .HaventMetBill: - writetext BillsMomText + writetext BillsMomText_AfterEcruteak waitbutton closetext end @@ -79,7 +79,7 @@ BillsSisterScript: writetext RecordedBillsNumberText playsound SFX_REGISTER_PHONE_NUMBER waitsfx - buttonsound + promptbutton .GotBillsNumber: writetext BillsSisterStorageSystemText waitbutton @@ -94,7 +94,7 @@ BillsSisterScript: .NoRoom: writetext BillsSisterPhoneFullText - buttonsound + promptbutton sjump .Refused BillsHouseBookshelf1: @@ -175,7 +175,7 @@ BillPopWontWorkText: line "a real headache…" done -BillsPopText: +BillsMomText_BeforeEcruteak: text "Oh, you collect" line "#MON? My son" cont "BILL is an expert." @@ -193,7 +193,7 @@ BillsPopText: line "being called…" done -BillsMomText: +BillsMomText_AfterEcruteak: text "My husband was" line "once known as a" diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 7a2d88837..61a81cc5d 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -16,7 +16,7 @@ BillsGrandpa: checkevent EVENT_MET_BILLS_GRANDPA iftrue .MetGrandpa writetext BillsGrandpaIntroText - buttonsound + promptbutton setevent EVENT_MET_BILLS_GRANDPA .MetGrandpa: checkevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA @@ -30,7 +30,7 @@ BillsGrandpa: checkevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA iftrue .ShowedLickitung writetext BillsGrandpaLickitungText - buttonsound + promptbutton writetext BillsGrandpaAskToSeeMonText yesorno iffalse .SaidNo @@ -44,7 +44,7 @@ BillsGrandpa: .GotEverstone: writetext BillsGrandpaOddishText - buttonsound + promptbutton writetext BillsGrandpaAskToSeeMonText yesorno iffalse .SaidNo @@ -58,7 +58,7 @@ BillsGrandpa: .GotLeafStone: writetext BillsGrandpaStaryuText - buttonsound + promptbutton writetext BillsGrandpaAskToSeeMonText yesorno iffalse .SaidNo @@ -74,7 +74,7 @@ BillsGrandpa: checkver iftrue .AskVulpix writetext BillsGrandpaGrowlitheText - buttonsound + promptbutton writetext BillsGrandpaAskToSeeMonText yesorno iffalse .SaidNo @@ -88,7 +88,7 @@ BillsGrandpa: .AskVulpix: writetext BillsGrandpaVulpixText - buttonsound + promptbutton writetext BillsGrandpaAskToSeeMonText yesorno iffalse .SaidNo @@ -102,7 +102,7 @@ BillsGrandpa: .GotFireStone: writetext BillsGrandpaPichuText - buttonsound + promptbutton writetext BillsGrandpaAskToSeeMonText yesorno iffalse .SaidNo @@ -168,7 +168,7 @@ BillsGrandpa: .ExcitedToSee: writetext BillsGrandpaExcitedToSeeText - buttonsound + promptbutton end .SaidNo: @@ -179,12 +179,12 @@ BillsGrandpa: .CorrectPokemon: writetext BillsGrandpaShownPokemonText - buttonsound + promptbutton end .ReceiveItem: writetext BillsGrandpaTokenOfAppreciationText - buttonsound + promptbutton end .JustShowedSomething: diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index b0df5b9c5..32e9e3ce4 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -95,11 +95,11 @@ SantosScript: checkevent EVENT_MET_SANTOS_OF_SATURDAY iftrue .MetSantos writetext MeetSantosText - buttonsound + promptbutton setevent EVENT_MET_SANTOS_OF_SATURDAY .MetSantos: writetext SantosGivesGiftText - buttonsound + promptbutton verbosegiveitem SPELL_TAG iffalse .Done setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 35c467ad5..1a9f6f2ae 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -65,7 +65,7 @@ BlackthornGymClairScript: checkevent EVENT_GOT_TM24_DRAGONBREATH iftrue .GotTM24 writetext BlackthornGymClairText_YouKeptMeWaiting - buttonsound + promptbutton giveitem TM_DRAGONBREATH iffalse .BagFull getitemname STRING_BUFFER_3, TM_DRAGONBREATH @@ -75,7 +75,7 @@ BlackthornGymClairScript: itemnotify setevent EVENT_GOT_TM24_DRAGONBREATH writetext BlackthornGymClairText_DescribeTM24 - buttonsound + promptbutton sjump .GotTM24 .BagFull: diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index a56f10fe3..56351efb7 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -39,7 +39,7 @@ DaisyScript: opentext writetext GroomedMonLooksContentText special PlayCurMonCry - buttonsound + promptbutton writetext DaisyAllDoneText waitbutton closetext diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 8795ed931..5d834b710 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -107,7 +107,7 @@ CeladonCafeTrashcan: opentext getitemname STRING_BUFFER_3, LEFTOVERS writetext FoundLeftoversText - buttonsound + promptbutton writetext NoRoomForLeftoversText waitbutton closetext diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index d488a39e5..f9f690703 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -67,7 +67,7 @@ CeladonDeptStore6FVendingMachine: pause 10 playsound SFX_ENTER_DOOR writetext CeladonClangText - buttonsound + promptbutton itemnotify sjump .Start diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 657a2ca7c..8465e2e44 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -53,7 +53,7 @@ CeladonGameCornerFisherScript: checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON iftrue .GotCoins writetext CeladonGameCornerFisherText1 - buttonsound + promptbutton checkitem COIN_CASE iffalse .NoCoinCase checkcoins MAX_COINS - 1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 7aabd24be..60a32e3bb 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -37,7 +37,7 @@ CeladonGymErikaScript: checkevent EVENT_GOT_TM19_GIGA_DRAIN iftrue .GotGigaDrain writetext ErikaExplainTMText - buttonsound + promptbutton verbosegiveitem TM_GIGA_DRAIN iffalse .GotGigaDrain setevent EVENT_GOT_TM19_GIGA_DRAIN diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 5e0c273c8..66711e99d 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -20,12 +20,12 @@ GameFreakGameDesignerScript: end .CompletedPokedex: - buttonsound + promptbutton writetext GameFreakGameDesignerCompletedPokedexText playsound SFX_DEX_FANFARE_230_PLUS waitsfx writetext GameFreakGameDesignerPauseForDiplomaText - buttonsound + promptbutton special Diploma writetext GameFreakGameDesignerAfterDiplomaText waitbutton diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 73c18f8bf..6b19b14d2 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -12,7 +12,7 @@ CeladonMansionRoofHousePharmacistScript: checkevent EVENT_GOT_TM03_CURSE iftrue .GotCurse writetext CeladonMansionRoofHousePharmacistIntroText - buttonsound + promptbutton checktime NITE iftrue .Night writetext CeladonMansionRoofHousePharmacistNotNightText @@ -22,7 +22,7 @@ CeladonMansionRoofHousePharmacistScript: .Night: writetext CeladonMansionRoofHousePharmacistStoryText - buttonsound + promptbutton verbosegiveitem TM_CURSE iffalse .NoRoom setevent EVENT_GOT_TM03_CURSE diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 8f0719d66..380f04fa5 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -26,7 +26,7 @@ CeladonEusine: faceplayer opentext writetext CeladonEusineText1 - buttonsound + promptbutton setval SUICUNE special MonCheck iffalse .NoSuicune diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 9db4ac573..69efe53d5 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -46,7 +46,7 @@ CharcoalKilnApprentice: .Thanks: writetext CharcoalKilnApprenticeText2 - buttonsound + promptbutton verbosegiveitem CHARCOAL iffalse .Done setevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index da8500eec..8acb76fbc 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -66,12 +66,12 @@ CherrygroveCityGuideGent: turnobject PLAYER, RIGHT opentext writetext GuideGentGiftText - buttonsound + promptbutton getstring STRING_BUFFER_4, .mapcardname scall .JumpstdReceiveItem setflag ENGINE_MAP_CARD writetext GotMapCardText - buttonsound + promptbutton writetext GuideGentPokegearText waitbutton closetext @@ -212,7 +212,7 @@ MysticWaterGuy: checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE iftrue .After writetext MysticWaterGuyTextBefore - buttonsound + promptbutton verbosegiveitem MYSTIC_WATER iffalse .Exit setevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 1feb8597c..1805d7a78 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -86,7 +86,7 @@ CianwoodCityChucksWife: checkevent EVENT_GOT_HM02_FLY iftrue .GotFly writetext ChucksWifeEasierToFlyText - buttonsound + promptbutton checkevent EVENT_BEAT_CHUCK iftrue .BeatChuck writetext ChucksWifeBeatChuckText @@ -96,12 +96,12 @@ CianwoodCityChucksWife: .BeatChuck: writetext ChucksWifeGiveHMText - buttonsound + promptbutton verbosegiveitem HM_FLY iffalse .Done setevent EVENT_GOT_HM02_FLY writetext ChucksWifeFlySpeechText - buttonsound + promptbutton .GotFly: writetext ChucksWifeChubbyText waitbutton diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 6fcaa55e1..f2dc1ec32 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -57,7 +57,7 @@ CianwoodGymChuckScript: setevent EVENT_BEAT_BLACKBELT_NOB setevent EVENT_BEAT_BLACKBELT_LUNG writetext ChuckExplainBadgeText - buttonsound + promptbutton verbosegiveitem TM_DYNAMICPUNCH iffalse .BagFull setevent EVENT_GOT_TM01_DYNAMICPUNCH diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 367586179..b55e3d07e 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -18,7 +18,7 @@ CianwoodPharmacist: checkevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS iffalse .Mart writetext PharmacistGiveSecretpotionText - buttonsound + promptbutton giveitem SECRETPOTION writetext ReceivedSecretpotionText playsound SFX_KEY_ITEM diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index a0ce78706..e3e1933e2 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -108,7 +108,7 @@ Copycat: .ReturnLostItem: opentext writetext CopycatText_GiveDoll - buttonsound + promptbutton takeitem LOST_ITEM setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT clearevent EVENT_COPYCATS_HOUSE_2F_DOLL @@ -118,7 +118,7 @@ Copycat: opentext .GivePass: writetext CopycatText_GivePass - buttonsound + promptbutton verbosegiveitem PASS iffalse .Cancel setevent EVENT_GOT_PASS_FROM_COPYCAT @@ -174,7 +174,7 @@ CopycatsDodrio: opentext writetext CopycatsDodrioText1 cry DODRIO - buttonsound + promptbutton writetext CopycatsDodrioText2 waitbutton closetext diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index f379488c6..a4ff53bd4 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -73,7 +73,7 @@ DanceTheaterSurfGuy: faceplayer opentext writetext SurfGuyNeverLeftAScratchText - buttonsound + promptbutton checkevent EVENT_GOT_HM03_SURF iftrue SurfGuyAlreadyGaveSurf checkevent EVENT_BEAT_KIMONO_GIRL_NAOKO @@ -104,7 +104,7 @@ DanceTheaterSurfGuy: .GetSurf: writetext SurfGuyLikeADanceText - buttonsound + promptbutton verbosegiveitem HM_SURF setevent EVENT_GOT_HM03_SURF writetext SurfGuySurfExplanationText diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index b100b89ca..196c352f7 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -14,7 +14,7 @@ DarkCaveBlackthornEntrancePharmacistScript: checkevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE iftrue .GotBlackglasses writetext DarkCaveBlackthornEntrancePharmacistText1 - buttonsound + promptbutton verbosegiveitem BLACKGLASSES iffalse .PackFull setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE diff --git a/maps/DayCare.asm b/maps/DayCare.asm index bb5cf8bfe..04458c37d 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -26,7 +26,7 @@ DayCareManScript_Inside: checkevent EVENT_GOT_ODD_EGG iftrue .AlreadyHaveOddEgg writetext DayCareManText_GiveOddEgg - buttonsound + promptbutton closetext readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, .PartyFull diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index b00feaad9..5bfcd111e 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -23,11 +23,11 @@ DragonShrine_MapScripts: applymovement DRAGONSHRINE_ELDER1, DragonShrineElderStepDownMovement opentext writetext DragonShrineElderGreetingText - buttonsound + promptbutton .Question1: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 writetext DragonShrineQuestion1Text - buttonsound + promptbutton loadmenu DragonShrineQuestion1_MenuHeader verticalmenu closewindow @@ -39,7 +39,7 @@ DragonShrine_MapScripts: .Question2: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 writetext DragonShrineQuestion2Text - buttonsound + promptbutton loadmenu DragonShrineQuestion2_MenuHeader verticalmenu closewindow @@ -49,7 +49,7 @@ DragonShrine_MapScripts: .Question3: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4 writetext DragonShrineQuestion3Text - buttonsound + promptbutton loadmenu DragonShrineQuestion3_MenuHeader verticalmenu closewindow @@ -59,7 +59,7 @@ DragonShrine_MapScripts: .Question4: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5 writetext DragonShrineQuestion4Text - buttonsound + promptbutton loadmenu DragonShrineQuestion4_MenuHeader verticalmenu closewindow @@ -69,7 +69,7 @@ DragonShrine_MapScripts: .Question5: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6 writetext DragonShrineQuestion5Text - buttonsound + promptbutton loadmenu DragonShrineQuestion5_MenuHeader verticalmenu closewindow @@ -80,7 +80,7 @@ DragonShrine_MapScripts: checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6 iftrue .PassedTheTest writetext DragonShrineRightAnswerText - buttonsound + promptbutton checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5 iftrue .Question5 checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4 @@ -166,7 +166,7 @@ DragonShrine_MapScripts: setscene SCENE_FINISHED setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM writetext DragonShrinePlayerReceivedRisingBadgeText - buttonsound + promptbutton writetext DragonShrineRisingBadgeExplanationText waitbutton closetext diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 6a64b9a09..bb35d8c74 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -52,7 +52,7 @@ DragonsDenB1F_ClairScene: applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksToYou opentext writetext ClairText_GiveDragonbreathDragonDen - buttonsound + promptbutton giveitem TM_DRAGONBREATH iffalse .BagFull getitemname STRING_BUFFER_3, TM_DRAGONBREATH @@ -62,7 +62,7 @@ DragonsDenB1F_ClairScene: itemnotify setevent EVENT_GOT_TM24_DRAGONBREATH writetext ClairText_DescribeDragonbreathDragonDen - buttonsound + promptbutton writetext ClairText_WhatsTheMatterDragonDen waitbutton closetext @@ -144,7 +144,7 @@ DragonsDenB1FDragonFangScript: opentext getitemname STRING_BUFFER_3, DRAGON_FANG writetext Text_FoundDragonFang - buttonsound + promptbutton writetext Text_NoRoomForDragonFang waitbutton closetext diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 5f8b16000..ede295834 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -52,7 +52,7 @@ EcruteakGymMortyScript: setevent EVENT_BEAT_MEDIUM_MARTHA setevent EVENT_BEAT_MEDIUM_GRACE writetext MortyText_FogBadgeSpeech - buttonsound + promptbutton verbosegiveitem TM_SHADOW_BALL iffalse .NoRoomForShadowBall setevent EVENT_GOT_TM30_SHADOW_BALL diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 9d61a244f..440d2d6ca 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -16,7 +16,7 @@ EcruteakItemfinderGuy: yesorno iffalse .no writetext EcruteakItemfinderTrueSpiritText - buttonsound + promptbutton verbosegiveitem ITEMFINDER setevent EVENT_GOT_ITEMFINDER .itemfinder: diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index c6f6b6da2..fd37aac6a 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -38,7 +38,7 @@ EcruteakPokecenter1F_MapScripts: pause 10 opentext writetext EcruteakPokecenter1F_BillText1 - buttonsound + promptbutton sjump .PointlessJump .PointlessJump: diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 9dda3c0b5..c8b84ccc6 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -58,7 +58,7 @@ ElmsLab_MapScripts: .ElmGetsEmail: writetext ElmText_Accepted - buttonsound + promptbutton writetext ElmText_ResearchAmbitions waitbutton closetext @@ -171,13 +171,13 @@ CyndaquilPokeBallScript: disappear ELMSLAB_POKE_BALL1 setevent EVENT_GOT_CYNDAQUIL_FROM_ELM writetext ChoseStarterText - buttonsound + promptbutton waitsfx getmonname STRING_BUFFER_3, CYNDAQUIL writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx - buttonsound + promptbutton givepoke CYNDAQUIL, 5, BERRY closetext readvar VAR_FACING @@ -201,13 +201,13 @@ TotodilePokeBallScript: disappear ELMSLAB_POKE_BALL2 setevent EVENT_GOT_TOTODILE_FROM_ELM writetext ChoseStarterText - buttonsound + promptbutton waitsfx getmonname STRING_BUFFER_3, TOTODILE writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx - buttonsound + promptbutton givepoke TOTODILE, 5, BERRY closetext applymovement PLAYER, AfterTotodileMovement @@ -229,13 +229,13 @@ ChikoritaPokeBallScript: disappear ELMSLAB_POKE_BALL3 setevent EVENT_GOT_CHIKORITA_FROM_ELM writetext ChoseStarterText - buttonsound + promptbutton waitsfx getmonname STRING_BUFFER_3, CHIKORITA writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx - buttonsound + promptbutton givepoke CHIKORITA, 5, BERRY closetext applymovement PLAYER, AfterChikoritaMovement @@ -325,7 +325,7 @@ ElmAfterTheftScript: writetext ElmAfterTheftText1 checkitem MYSTERY_EGG iffalse ElmAfterTheftDoneScript - buttonsound + promptbutton writetext ElmAfterTheftText2 waitbutton takeitem MYSTERY_EGG @@ -334,9 +334,9 @@ ElmAfterTheftScript: waitbutton scall ElmJumpBackScript2 writetext ElmAfterTheftText4 - buttonsound + promptbutton writetext ElmAfterTheftText5 - buttonsound + promptbutton setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setflag ENGINE_MAIN_MENU_MOBILE_CHOICES setmapscene ROUTE_29, SCENE_ROUTE29_CATCH_TUTORIAL @@ -374,12 +374,12 @@ ShowElmTogepiScript: setevent EVENT_SHOWED_TOGEPI_TO_ELM opentext writetext ShowElmTogepiText2 - buttonsound + promptbutton writetext ShowElmTogepiText3 - buttonsound + promptbutton ElmGiveEverstoneScript: writetext ElmGiveEverstoneText1 - buttonsound + promptbutton verbosegiveitem EVERSTONE iffalse ElmScript_NoRoomForEverstone writetext ElmGiveEverstoneText2 @@ -397,7 +397,7 @@ ElmScript_NoRoomForEverstone: ElmGiveMasterBallScript: writetext ElmGiveMasterBallText1 - buttonsound + promptbutton verbosegiveitem MASTER_BALL iffalse .notdone setevent EVENT_GOT_MASTER_BALL_FROM_ELM @@ -409,7 +409,7 @@ ElmGiveMasterBallScript: ElmGiveTicketScript: writetext ElmGiveTicketText1 - buttonsound + promptbutton verbosegiveitem S_S_TICKET setevent EVENT_GOT_SS_TICKET_FROM_ELM writetext ElmGiveTicketText2 @@ -472,7 +472,7 @@ AideScript_WalkPotion2: AideScript_GivePotion: opentext writetext AideText_GiveYouPotion - buttonsound + promptbutton verbosegiveitem POTION writetext AideText_AlwaysBusy waitbutton @@ -497,12 +497,12 @@ AideScript_WalkBalls2: AideScript_GiveYouBalls: opentext writetext AideText_GiveYouBalls - buttonsound + promptbutton getitemname STRING_BUFFER_4, POKE_BALL scall AideScript_ReceiveTheBalls giveitem POKE_BALL, 5 writetext AideText_ExplainBalls - buttonsound + promptbutton itemnotify closetext setscene SCENE_ELMSLAB_NOTHING @@ -553,7 +553,7 @@ CopScript: turnobject ELMSLAB_OFFICER, LEFT opentext writetext ElmsLabOfficerText1 - buttonsound + promptbutton special NameRival writetext ElmsLabOfficerText2 waitbutton diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index ba0d10e82..14bbdf6d3 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -79,7 +79,7 @@ FastShipB1FSailorScript: end .NotFoundGirl: - buttonsound + promptbutton writetext FastShipB1FOnDutySailorSawLittleGirlText waitbutton closetext diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index a21c8fbae..0d0a41cfc 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -77,7 +77,7 @@ SSAquaGranddaughterBefore: applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010 opentext writetext SSAquaEntertainedGranddaughterText - buttonsound + promptbutton setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY setmapscene FAST_SHIP_1F, SCENE_DEFAULT sjump SSAquaMetalCoatAndDocking @@ -97,7 +97,7 @@ SSAquaGrandpa: SSAquaMetalCoatAndDocking: writetext SSAquaGrandpaHaveThisText - buttonsound + promptbutton verbosegiveitem METAL_COAT iffalse .NoRoom setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA @@ -116,7 +116,7 @@ SSAquaMetalCoatAndDocking: SSAquaFoundGranddaughter: writetext SSAquaGrandpaHaveThisText - buttonsound + promptbutton verbosegiveitem METAL_COAT iffalse .NoRoom setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index cb60b9437..7b155c591 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -47,7 +47,7 @@ FuchsiaGymJanineScript: checkevent EVENT_GOT_TM06_TOXIC iftrue .AfterTM writetext JanineText_ToxicSpeech - buttonsound + promptbutton verbosegiveitem TM_TOXIC iffalse .AfterTM setevent EVENT_GOT_TM06_TOXIC diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 30505e399..c4a05e3fa 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -18,7 +18,7 @@ GoldenrodBikeShopClerkScript: yesorno iffalse .Refused writetext GoldenrodBikeShopClerkAgreedText - buttonsound + promptbutton waitsfx giveitem BICYCLE writetext BorrowedABicycleText diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index d9d916243..d18b818f6 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -73,21 +73,21 @@ MoveTutorScript: .Flamethrower: setval MOVETUTOR_FLAMETHROWER - writetext UnknownText_0x1991cf + writetext GoldenrodCityMoveTutorMoveText special MoveTutor ifequal FALSE, .TeachMove sjump .Incompatible .Thunderbolt: setval MOVETUTOR_THUNDERBOLT - writetext UnknownText_0x1991cf + writetext GoldenrodCityMoveTutorMoveText special MoveTutor ifequal FALSE, .TeachMove sjump .Incompatible .IceBeam: setval MOVETUTOR_ICE_BEAM - writetext UnknownText_0x1991cf + writetext GoldenrodCityMoveTutorMoveText special MoveTutor ifequal FALSE, .TeachMove sjump .Incompatible @@ -120,7 +120,7 @@ MoveTutorScript: .TeachMove: writetext GoldenrodCityMoveTutorIfYouUnderstandYouveMadeItText - buttonsound + promptbutton takecoins 4000 waitsfx playsound SFX_TRANSACTION @@ -205,7 +205,7 @@ GoldenrodCityGrampsScript: GoldenrodCityRocketScoutScript: opentext writetext GoldenrodCityRocketScoutText1 - buttonsound + promptbutton faceplayer writetext GoldenrodCityRocketScoutText2 waitbutton @@ -545,7 +545,7 @@ GoldenrodCityMoveTutorYouDontHaveEnoughCoinsText: line "enough coins here…" done -UnknownText_0x1991cf: +GoldenrodCityMoveTutorMoveText: text_start done diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 370286551..eda75e151 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -65,14 +65,14 @@ GoldenrodDeptStore5FReceptionistScript: iftrue .EventIsOver special GetFirstPokemonHappiness writetext GoldenrodDeptStore5FReceptionistOhYourMonDotDotDotText - buttonsound + promptbutton ifgreater 150 - 1, .VeryHappy ifgreater 50 - 1, .SomewhatHappy sjump .NotVeryHappy .VeryHappy: writetext GoldenrodDeptStore5FReceptionistThisMoveShouldBePerfectText - buttonsound + promptbutton verbosegiveitem TM_RETURN iffalse .Done setflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN @@ -87,7 +87,7 @@ GoldenrodDeptStore5FReceptionistScript: .NotVeryHappy: writetext GoldenrodDeptStore5FReceptionistItLooksEvilHowAboutThisTMText - buttonsound + promptbutton verbosegiveitem TM_FRUSTRATION iffalse .Done setflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index ecf3440b0..c8173e1d9 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -56,7 +56,7 @@ GoldenrodVendingMachine: pause 10 playsound SFX_ENTER_DOOR writetext GoldenrodClangText - buttonsound + promptbutton itemnotify sjump .Start diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 1fdfae059..ff49d255a 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -21,7 +21,7 @@ FlowerShopTeacherScript: faceplayer opentext writetext GoldenrodFlowerShopTeacherHeresTheSquirtbottleText - buttonsound + promptbutton verbosegiveitem SQUIRTBOTTLE setevent EVENT_GOT_SQUIRTBOTTLE closetext diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 8d4f55fc6..9c3872edc 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -53,7 +53,7 @@ GoldenrodGymWhitneyScript: checkflag ENGINE_PLAINBADGE iftrue .GotPlainBadge writetext WhitneyWhatDoYouWantText - buttonsound + promptbutton waitsfx writetext PlayerReceivedPlainBadgeText playsound SFX_GET_BADGE @@ -63,7 +63,7 @@ GoldenrodGymWhitneyScript: scall GoldenrodGymActivateRockets .GotPlainBadge: writetext WhitneyPlainBadgeText - buttonsound + promptbutton verbosegiveitem TM_ATTRACT iffalse .NoRoomForAttract setevent EVENT_GOT_TM45_ATTRACT diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index e28eef3e6..5958c1811 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -13,7 +13,7 @@ GoldenrodHappinessRaterTeacherScript: opentext special GetFirstPokemonHappiness writetext GoldenrodHappinessRaterTeacherText - buttonsound + promptbutton ifgreater 250 - 1, .LovesYouALot ifgreater 200 - 1, .ReallyTrustsYou ifgreater 150 - 1, .SortOfHappy diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index d26a04a98..f15bf977c 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -200,7 +200,7 @@ OlderHaircutBrotherScript: checkmoney YOUR_MONEY, GOLDENRODUNDERGROUND_OLDER_HAIRCUT_PRICE ifequal HAVE_LESS, .NotEnoughMoney writetext GoldenrodUndergroundOlderHaircutBrotherAskWhichMonText - buttonsound + promptbutton special OlderHaircutBrother ifequal $0, .Refused ifequal $1, .Refused @@ -283,7 +283,7 @@ YoungerHaircutBrotherScript: checkmoney YOUR_MONEY, GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_PRICE ifequal HAVE_LESS, .NotEnoughMoney writetext GoldenrodUndergroundYoungerHaircutBrotherAskWhichMonText - buttonsound + promptbutton special YoungerHaircutBrother ifequal $0, .Refused ifequal $1, .Refused diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 50b1b03cb..4365e0de7 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -273,7 +273,7 @@ TrainerGruntF3: Switch1Script: opentext writetext SwitchRoomText_Switch1 - buttonsound + promptbutton checkevent EVENT_SWITCH_1 iftrue .On writetext SwitchRoomText_OffTurnOn @@ -298,7 +298,7 @@ Switch1Script: Switch2Script: opentext writetext SwitchRoomText_Switch2 - buttonsound + promptbutton checkevent EVENT_SWITCH_2 iftrue .On writetext SwitchRoomText_OffTurnOn @@ -323,7 +323,7 @@ Switch2Script: Switch3Script: opentext writetext SwitchRoomText_Switch3 - buttonsound + promptbutton checkevent EVENT_SWITCH_3 iftrue .On writetext SwitchRoomText_OffTurnOn @@ -348,7 +348,7 @@ Switch3Script: EmergencySwitchScript: opentext writetext SwitchRoomText_Emergency - buttonsound + promptbutton checkevent EVENT_EMERGENCY_SWITCH iftrue .On writetext SwitchRoomText_OffTurnOn diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 2ab8d8f4c..10e508a90 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -72,14 +72,14 @@ GoldenrodUndergroundWarehouseDirectorScript: checkevent EVENT_RECEIVED_CARD_KEY iftrue .GotCardKey writetext DirectorIntroText - buttonsound + promptbutton verbosegiveitem CARD_KEY setevent EVENT_RECEIVED_CARD_KEY setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1 clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2 clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 writetext DirectorCardKeyText - buttonsound + promptbutton .GotCardKey: writetext DirectorAfterText waitbutton diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 6dd338726..cb41f0fc0 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -117,7 +117,7 @@ IlexForestFarfetchdScript: faceplayer opentext writetext Text_ItsTheMissingPokemon - buttonsound + promptbutton writetext Text_Kwaaaa cry FARFETCH_D waitbutton @@ -348,7 +348,7 @@ IlexForestCharcoalMasterScript: checkevent EVENT_GOT_HM01_CUT iftrue .AlreadyGotCut writetext Text_CharcoalMasterIntro - buttonsound + promptbutton verbosegiveitem HM_CUT setevent EVENT_GOT_HM01_CUT writetext Text_CharcoalMasterOutro @@ -374,7 +374,7 @@ IlexForestHeadbuttGuyScript: checkevent EVENT_GOT_TM02_HEADBUTT iftrue .AlreadyGotHeadbutt writetext Text_HeadbuttIntro - buttonsound + promptbutton verbosegiveitem TM_HEADBUTT iffalse .BagFull setevent EVENT_GOT_TM02_HEADBUTT diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index c430effcc..167a0c18f 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -67,7 +67,7 @@ Kurt1: .ClearedSlowpokeWell: writetext KurtsHouseKurtHonoredToMakeBallsText - buttonsound + promptbutton verbosegiveitem LURE_BALL iffalse .NoRoomForBall setevent EVENT_KURT_GAVE_YOU_LURE_BALL @@ -127,7 +127,7 @@ Kurt1: .AskApricorn: writetext KurtsHouseKurtAskYouHaveAnApricornText - buttonsound + promptbutton setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 special SelectApricornForKurt ifequal FALSE, .Cancel @@ -193,7 +193,7 @@ Kurt1: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript writetext KurtsHouseKurtJustFinishedYourBallText - buttonsound + promptbutton verbosegiveitemvar LEVEL_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_RED_APRICORN @@ -203,7 +203,7 @@ Kurt1: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript writetext KurtsHouseKurtJustFinishedYourBallText - buttonsound + promptbutton verbosegiveitemvar LURE_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_BLU_APRICORN @@ -213,7 +213,7 @@ Kurt1: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript writetext KurtsHouseKurtJustFinishedYourBallText - buttonsound + promptbutton verbosegiveitemvar MOON_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_YLW_APRICORN @@ -223,7 +223,7 @@ Kurt1: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript writetext KurtsHouseKurtJustFinishedYourBallText - buttonsound + promptbutton verbosegiveitemvar FRIEND_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_GRN_APRICORN @@ -233,7 +233,7 @@ Kurt1: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript writetext KurtsHouseKurtJustFinishedYourBallText - buttonsound + promptbutton verbosegiveitemvar FAST_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_WHT_APRICORN @@ -243,7 +243,7 @@ Kurt1: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript writetext KurtsHouseKurtJustFinishedYourBallText - buttonsound + promptbutton verbosegiveitemvar HEAVY_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_BLK_APRICORN @@ -253,7 +253,7 @@ Kurt1: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript writetext KurtsHouseKurtJustFinishedYourBallText - buttonsound + promptbutton verbosegiveitemvar LOVE_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_PNK_APRICORN diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 733d5e024..4905aa972 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -45,18 +45,18 @@ LakeOfRageLanceScript: checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE iftrue .AskAgainForHelp opentext - writetext UnknownText_0x70157 - buttonsound + writetext LakeOfRageLanceForcedToEvolveText + promptbutton faceplayer - writetext UnknownText_0x701b4 + writetext LakeOfRageLanceIntroText yesorno iffalse .RefusedToHelp .AgreedToHelp: - writetext UnknownText_0x702c6 + writetext LakeOfRageLanceRadioSignalText waitbutton closetext playsound SFX_WARP_TO - applymovement LAKEOFRAGE_LANCE, MovementData_0x70155 + applymovement LAKEOFRAGE_LANCE, LakeOfRageLanceTeleportIntoSkyMovement disappear LAKEOFRAGE_LANCE clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE @@ -64,7 +64,7 @@ LakeOfRageLanceScript: end .RefusedToHelp: - writetext UnknownText_0x70371 + writetext LakeOfRageLanceRefusedText waitbutton closetext setevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE @@ -73,14 +73,14 @@ LakeOfRageLanceScript: .AskAgainForHelp: faceplayer opentext - writetext UnknownText_0x703a5 + writetext LakeOfRageLanceAskHelpText yesorno iffalse .RefusedToHelp sjump .AgreedToHelp RedGyarados: opentext - writetext UnknownText_0x703cb + writetext LakeOfRageGyaradosCryText pause 15 cry GYARADOS closetext @@ -94,7 +94,7 @@ RedGyarados: opentext giveitem RED_SCALE waitsfx - writetext UnknownText_0x703df + writetext LakeOfRageGotRedScaleText playsound SFX_ITEM waitsfx itemnotify @@ -138,7 +138,7 @@ MagikarpHouseSignScript: end .MagikarpLengthRecord: - buttonsound + promptbutton special MagikarpHouseSign closetext end @@ -197,11 +197,11 @@ WesleyScript: checkevent EVENT_MET_WESLEY_OF_WEDNESDAY iftrue .MetWesley writetext MeetWesleyText - buttonsound + promptbutton setevent EVENT_MET_WESLEY_OF_WEDNESDAY .MetWesley: writetext WesleyGivesGiftText - buttonsound + promptbutton verbosegiveitem BLACKBELT iffalse WesleyDoneScript setevent EVENT_GOT_BLACKBELT_FROM_WESLEY @@ -238,11 +238,11 @@ LakeOfRageHiddenRareCandy: LakeOfRageHiddenMaxPotion: hiddenitem MAX_POTION, EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION -MovementData_0x70155: +LakeOfRageLanceTeleportIntoSkyMovement: teleport_from step_end -UnknownText_0x70157: +LakeOfRageLanceForcedToEvolveText: text "This lake is full" line "of GYARADOS but" cont "nothing else…" @@ -252,7 +252,7 @@ UnknownText_0x70157: cont "to evolve…" done -UnknownText_0x701b4: +LakeOfRageLanceIntroText: text "Did you come here" line "because of the" cont "rumors?" @@ -280,7 +280,7 @@ UnknownText_0x701b4: cont "investigate?" done -UnknownText_0x702c6: +LakeOfRageLanceRadioSignalText: text "LANCE: Excellent!" para "It seems that the" @@ -299,22 +299,22 @@ UnknownText_0x702c6: line "for you, <PLAY_G>." done -UnknownText_0x70371: +LakeOfRageLanceRefusedText: text "Oh… Well, if you" line "change your mind," cont "please help me." done -UnknownText_0x703a5: +LakeOfRageLanceAskHelpText: text "LANCE: Hm? Are you" line "going to help me?" done -UnknownText_0x703cb: +LakeOfRageGyaradosCryText: text "GYARADOS: Gyashaa!" done -UnknownText_0x703df: +LakeOfRageGotRedScaleText: text "<PLAYER> obtained a" line "RED SCALE." done diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index f8638064b..20e4a5601 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -12,7 +12,7 @@ HiddenPowerGuy: checkevent EVENT_GOT_TM10_HIDDEN_POWER iftrue .AlreadyGotItem writetext HiddenPowerGuyText1 - buttonsound + promptbutton verbosegiveitem TM_HIDDEN_POWER iffalse .Done setevent EVENT_GOT_TM10_HIDDEN_POWER diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index ab28fe24d..c7149281c 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -51,7 +51,7 @@ MagikarpLengthRaterScript: .GetReward: writetext MagikarpLengthRaterText_Memento - buttonsound + promptbutton verbosegiveitem ELIXER iffalse .NoRoom writetext MagikarpLengthRaterText_Bonus diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 7a47c37d1..e09c60763 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -80,7 +80,7 @@ LancesRoomLanceScript: appear LANCESROOM_MARY applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRushesIn opentext - writetext UnknownText_0x1811dd + writetext LancesRoomMaryOhNoOakText waitbutton closetext appear LANCESROOM_OAK @@ -91,19 +91,19 @@ LancesRoomLanceScript: turnobject LANCESROOM_OAK, UP turnobject LANCESROOM_LANCE, LEFT opentext - writetext UnknownText_0x18121b + writetext LancesRoomOakCongratulationsText waitbutton closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryInterviewChampion turnobject PLAYER, LEFT opentext - writetext UnknownText_0x18134b + writetext LancesRoomMaryInterviewText waitbutton closetext applymovement LANCESROOM_LANCE, LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway turnobject PLAYER, UP opentext - writetext UnknownText_0x18137b + writetext LancesRoomNoisyText waitbutton closetext follow LANCESROOM_LANCE, PLAYER @@ -119,7 +119,7 @@ LancesRoomLanceScript: applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryTriesToFollow showemote EMOTE_SHOCK, LANCESROOM_MARY, 15 opentext - writetext UnknownText_0x1813c5 + writetext LancesRoomMaryNoInterviewText pause 30 closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth @@ -273,7 +273,7 @@ LanceBattleAfterText: line "your #MON." done -UnknownText_0x1811dd: +LancesRoomMaryOhNoOakText: text "MARY: Oh, no!" line "It's all over!" @@ -281,7 +281,7 @@ UnknownText_0x1811dd: line "weren't so slow…" done -UnknownText_0x18121b: +LancesRoomOakCongratulationsText: text "PROF.OAK: Ah," line "<PLAY_G>!" @@ -314,13 +314,13 @@ UnknownText_0x18121b: line "<PLAY_G>!" done -UnknownText_0x18134b: +LancesRoomMaryInterviewText: text "MARY: Let's inter-" line "view the brand new" cont "CHAMPION!" done -UnknownText_0x18137b: +LancesRoomNoisyText: text "LANCE: This is" line "getting to be a" cont "bit too noisy…" @@ -329,7 +329,7 @@ UnknownText_0x18137b: line "come with me?" done -UnknownText_0x1813c5: +LancesRoomMaryNoInterviewText: text "MARY: Oh, wait!" line "We haven't done" cont "the interview!" diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 4a02115ec..1540fa444 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -33,7 +33,7 @@ LavRadioTower1FGentlemanScript: .ReturnedMachinePart: writetext LavRadioTower1FGentlemanText_ReturnedMachinePart - buttonsound + promptbutton getstring STRING_BUFFER_4, .expncardname scall .receiveitem setflag ENGINE_EXPN_CARD diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 2af44e820..cb49e16a6 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -41,7 +41,7 @@ MahoganyGymPryceScript: setevent EVENT_BEAT_BOARDER_BRAD setevent EVENT_BEAT_BOARDER_DOUGLAS writetext PryceText_GlacierBadgeSpeech - buttonsound + promptbutton verbosegiveitem TM_ICY_WIND iffalse MahoganyGym_NoRoomForIcyWind setevent EVENT_GOT_TM16_ICY_WIND diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index d63430709..5fcc85f21 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -2,7 +2,7 @@ const MAHOGANYMART1F_PHARMACIST const MAHOGANYMART1F_BLACK_BELT const MAHOGANYMART1F_LANCE - const MAHOGANYMART1F_DRAGON + const MAHOGANYMART1F_DRAGONITE const MAHOGANYMART1F_GRANNY MahoganyMart1F_MapScripts: @@ -29,7 +29,7 @@ MahoganyMart1F_MapScripts: changeblock 6, 2, $1e ; stairs return -MahogayMart1FPharmacistScript: +MahoganyMart1FPharmacistScript: faceplayer opentext checkevent EVENT_DECIDED_TO_HELP_LANCE @@ -39,23 +39,23 @@ MahogayMart1FPharmacistScript: end .LanceEntered: - writetext MahogayMart1FPharmacistText_LanceEntered + writetext MahoganyMart1FPharmacistText_LanceEntered waitbutton closetext end -MahogayMart1FBlackBeltScript: +MahoganyMart1FBlackBeltScript: faceplayer opentext checkevent EVENT_DECIDED_TO_HELP_LANCE iftrue .LanceEntered - writetext MahogayMart1FBlackBeltText + writetext MahoganyMart1FBlackBeltText waitbutton closetext end .LanceEntered: - writetext MahogayMart1FBlackBeltText_LanceEntered + writetext MahoganyMart1FBlackBeltText_LanceEntered waitbutton closetext end @@ -63,27 +63,27 @@ MahogayMart1FBlackBeltScript: MahoganyMart1FLanceUncoversStaircaseScript: pause 15 opentext - writetext UnknownText_0x6c52a + writetext MahoganyMart1FLanceDragoniteHyperBeamText pause 15 closetext playsound SFX_TACKLE - applymovement MAHOGANYMART1F_DRAGON, MovementData_0x6c3f6 - applymovement MAHOGANYMART1F_BLACK_BELT, MovementData_0x6c3fb + applymovement MAHOGANYMART1F_DRAGONITE, MahoganyMart1FDragoniteTackleMovement + applymovement MAHOGANYMART1F_BLACK_BELT, MahoganyMart1FBlackBeltKnockedBackMovement pause 15 - disappear MAHOGANYMART1F_DRAGON + disappear MAHOGANYMART1F_DRAGONITE pause 15 - applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c407 + applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceApproachPlayerMovement opentext - writetext UnknownText_0x6c549 + writetext MahoganyMart1FLanceRadioText waitbutton closetext follow MAHOGANYMART1F_LANCE, PLAYER - applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40a - applymovement MAHOGANYMART1F_PHARMACIST, MovementData_0x6c403 - applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40e + applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceApproachPharmacistMovement + applymovement MAHOGANYMART1F_PHARMACIST, MahoganyMart1FPharmacistShovedAsideMovement + applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceApproachHiddenStairsMovement stopfollow opentext - writetext UnknownText_0x6c59e + writetext MahoganyMart1FLanceStairsText waitbutton showemote EMOTE_SHOCK, MAHOGANYMART1F_PHARMACIST, 10 playsound SFX_FAINT @@ -93,31 +93,31 @@ MahoganyMart1FLanceUncoversStaircaseScript: setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART turnobject MAHOGANYMART1F_LANCE, LEFT opentext - writetext UnknownText_0x6c5ba + writetext MahoganyMart1FLanceSplitUpText waitbutton closetext - applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412 + applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceGoDownStairsMovement playsound SFX_EXIT_BUILDING disappear MAHOGANYMART1F_LANCE setscene SCENE_MAHOGANYMART1F_NOTHING waitsfx end -MahogayMart1FGrannyScript: +MahoganyMart1FGrannyScript: faceplayer opentext pokemart MARTTYPE_STANDARD, MART_MAHOGANY_2 closetext end -MovementData_0x6c3f6: +MahoganyMart1FDragoniteTackleMovement: fix_facing big_step LEFT big_step RIGHT remove_fixed_facing step_end -MovementData_0x6c3fb: +MahoganyMart1FBlackBeltKnockedBackMovement: fix_facing big_step LEFT remove_fixed_facing @@ -127,30 +127,30 @@ MovementData_0x6c3fb: turn_head RIGHT step_end -MovementData_0x6c403: +MahoganyMart1FPharmacistShovedAsideMovement: fix_facing big_step LEFT remove_fixed_facing step_end -MovementData_0x6c407: +MahoganyMart1FLanceApproachPlayerMovement: slow_step LEFT turn_head DOWN step_end -MovementData_0x6c40a: +MahoganyMart1FLanceApproachPharmacistMovement: slow_step RIGHT slow_step UP slow_step UP step_end -MovementData_0x6c40e: +MahoganyMart1FLanceApproachHiddenStairsMovement: slow_step UP slow_step RIGHT slow_step RIGHT step_end -MovementData_0x6c412: +MahoganyMart1FLanceGoDownStairsMovement: slow_step RIGHT step_end @@ -164,13 +164,13 @@ UnknownText_0x6c414: line "eat in MAHOGANY!" done -MahogayMart1FPharmacistText_LanceEntered: +MahoganyMart1FPharmacistText_LanceEntered: text "Arrgh… You found" line "the secret stair-" cont "way…" done -MahogayMart1FBlackBeltText: +MahoganyMart1FBlackBeltText: text "Heheh! The experi-" line "ment worked like a" cont "charm." @@ -182,19 +182,19 @@ MahogayMart1FBlackBeltText: line "moneymakers." done -MahogayMart1FBlackBeltText_LanceEntered: +MahoganyMart1FBlackBeltText_LanceEntered: text "Urrgh…" para "That guy's dragon" line "#MON are tough…" done -UnknownText_0x6c52a: +MahoganyMart1FLanceDragoniteHyperBeamText: text "LANCE: DRAGONITE," line "HYPER BEAM." done -UnknownText_0x6c549: +MahoganyMart1FLanceRadioText: text "What took you," line "<PLAY_G>?" @@ -205,12 +205,12 @@ UnknownText_0x6c549: line "from here." done -UnknownText_0x6c59e: +MahoganyMart1FLanceStairsText: text "The stairs are" line "right here." done -UnknownText_0x6c5ba: +MahoganyMart1FLanceSplitUpText: text "LANCE: <PLAY_G>, we" line "should split up to" @@ -231,8 +231,8 @@ MahoganyMart1F_MapEvents: db 0 ; bg events db 5 ; object events - object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FPharmacistScript, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FBlackBeltScript, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FPharmacistScript, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FBlackBeltScript, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE object_event 3, 6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE - object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FGrannyScript, EVENT_MAHOGANY_MART_OWNERS + object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FGrannyScript, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 830ecb884..233acd17e 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -19,7 +19,7 @@ ManiaScript: special GiveShuckle iffalse .partyfull writetext ManiaText_TakeCareOfShuckle - buttonsound + promptbutton waitsfx writetext ManiaText_GotShuckle playsound SFX_KEY_ITEM diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 25ffc862f..41e1b3be7 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -2,7 +2,7 @@ const MOUNTMORTARB1F_POKE_BALL1 const MOUNTMORTARB1F_POKE_BALL2 const MOUNTMORTARB1F_BOULDER - const MOUNTMORTARB1F_BLACK_BELT + const MOUNTMORTARB1F_KIYO const MOUNTMORTARB1F_POKE_BALL3 const MOUNTMORTARB1F_POKE_BALL4 const MOUNTMORTARB1F_POKE_BALL5 @@ -19,34 +19,34 @@ MountMortarB1FKiyoScript: iftrue .GotTyrogue checkevent EVENT_BEAT_BLACKBELT_KIYO iftrue .BeatKiyo - writetext UnknownText_0x7e24d + writetext MountMortarB1FKiyoIntroText waitbutton closetext - winlosstext UnknownText_0x7e2a9, 0 + winlosstext MountMortarB1FKiyoWinText, 0 loadtrainer BLACKBELT_T, KIYO startbattle reloadmapafterbattle setevent EVENT_BEAT_BLACKBELT_KIYO opentext .BeatKiyo: - writetext UnknownText_0x7e2c0 - buttonsound + writetext MountMortarB1FTyrogueRewardText + promptbutton waitsfx readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, .NoRoom - writetext UnknownText_0x7e355 + writetext MountMortarB1FReceiveMonText playsound SFX_CAUGHT_MON waitsfx givepoke TYROGUE, 10 setevent EVENT_GOT_TYROGUE_FROM_KIYO .GotTyrogue: - writetext UnknownText_0x7e36a + writetext MountMortarB1FKiyoGotTyrogueText waitbutton closetext end .NoRoom: - writetext UnknownText_0x7e3df + writetext MountMortarB1FKiyoFullPartyText waitbutton closetext end @@ -72,7 +72,7 @@ MountMortarB1FPPUp: MountMortarB1FHiddenMaxRevive: hiddenitem MAX_REVIVE, EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE -UnknownText_0x7e24d: +MountMortarB1FKiyoIntroText: text "Hey!" para "I am the KARATE" @@ -87,12 +87,12 @@ UnknownText_0x7e24d: para "Hwaaarggh!" done -UnknownText_0x7e2a9: +MountMortarB1FKiyoWinText: text "Waaaarggh!" line "I'm beaten!" done -UnknownText_0x7e2c0: +MountMortarB1FTyrogueRewardText: text "I… I'm crushed…" para "My training is" @@ -108,12 +108,12 @@ UnknownText_0x7e2c0: line "fighting #MON." done -UnknownText_0x7e355: +MountMortarB1FReceiveMonText: text "<PLAYER> received" line "TYROGUE." done -UnknownText_0x7e36a: +MountMortarB1FKiyoGotTyrogueText: text "TYROGUE is a" line "fighting-type." @@ -127,7 +127,7 @@ UnknownText_0x7e36a: para "Farewell!" done -UnknownText_0x7e3df: +MountMortarB1FKiyoFullPartyText: text "You have no room" line "in your party!" done diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index a0f9db039..3313a8238 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -26,7 +26,7 @@ MrPokemonsHouse_MapScripts: applymovement PLAYER, MrPokemonsHouse_PlayerWalksToMrPokemon opentext writetext MrPokemonIntroText2 - buttonsound + promptbutton waitsfx giveitem MYSTERY_EGG writetext MrPokemonsHouse_GotEggText @@ -36,10 +36,10 @@ MrPokemonsHouse_MapScripts: setevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON blackoutmod CHERRYGROVE_CITY writetext MrPokemonIntroText3 - buttonsound + promptbutton turnobject MRPOKEMONSHOUSE_GENTLEMAN, RIGHT writetext MrPokemonIntroText4 - buttonsound + promptbutton turnobject MRPOKEMONSHOUSE_GENTLEMAN, DOWN turnobject MRPOKEMONSHOUSE_OAK, LEFT writetext MrPokemonIntroText5 @@ -87,7 +87,7 @@ MrPokemonsHouse_OakScript: turnobject PLAYER, RIGHT opentext writetext MrPokemonsHouse_OakText1 - buttonsound + promptbutton waitsfx writetext MrPokemonsHouse_GetDexText playsound SFX_ITEM diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 754e6cca5..b1beec7fa 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -12,7 +12,7 @@ MrPsychic: checkevent EVENT_GOT_TM29_PSYCHIC iftrue .AlreadyGotItem writetext MrPsychicText1 - buttonsound + promptbutton verbosegiveitem TM_PSYCHIC_M iffalse .Done setevent EVENT_GOT_TM29_PSYCHIC diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index b4fc2aff8..33502ac89 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -31,7 +31,7 @@ NationalParkTeacher1Script: checkevent EVENT_GOT_QUICK_CLAW iftrue .GotQuickClaw writetext NationalParkTeacher1Text - buttonsound + promptbutton verbosegiveitem QUICK_CLAW iffalse .NoRoom setevent EVENT_GOT_QUICK_CLAW @@ -82,8 +82,8 @@ TrainerSchoolboyJack1: iftrue .NumberAccepted checkevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain - writetext UnknownText_0x5c4f3 - buttonsound + writetext SchoolboyJackTradeMonText + promptbutton setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .RequestNumber @@ -212,8 +212,8 @@ TrainerPokefanfBeverly1: iffalse .NoMarill checkevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain - writetext UnknownText_0x5c5bd - buttonsound + writetext PokefanBeverlyCuteMonText + promptbutton setevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .RequestNumber @@ -239,7 +239,7 @@ TrainerPokefanfBeverly1: sjump .PackFull .NoMarill: - writetext UnknownText_0x5c68a + writetext PokefanFBeverlyMarillFriendText waitbutton closetext end @@ -405,7 +405,7 @@ SchoolboyJack1BeatenText: text "Wha-wha-what?" done -UnknownText_0x5c4f3: +SchoolboyJackTradeMonText: text "There is a lot" line "to learn." @@ -432,7 +432,7 @@ PokefanfBeverly1BeatenText: line "pride, but…" done -UnknownText_0x5c5bd: +PokefanBeverlyCuteMonText: text "I must say, your" line "#MON are quite" cont "cute, too." @@ -459,7 +459,7 @@ PokefanmWilliamAfterBattleText: line "being most lovely." done -UnknownText_0x5c68a: +PokefanFBeverlyMarillFriendText: text "My friend keeps a" line "MARILL!" diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 18f09b030..199ccd5a4 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -20,7 +20,7 @@ Oak: checkevent EVENT_TALKED_TO_OAK_IN_KANTO iftrue .CheckBadges writetext OakWelcomeKantoText - buttonsound + promptbutton setevent EVENT_TALKED_TO_OAK_IN_KANTO .CheckBadges: readvar VAR_BADGES @@ -39,18 +39,18 @@ Oak: .OpenMtSilver: writetext OakOpenMtSilverText - buttonsound + promptbutton setevent EVENT_OPENED_MT_SILVER sjump .CheckPokedex .Complain: writetext OakNoKantoBadgesText - buttonsound + promptbutton sjump .CheckPokedex .AhGood: writetext OakYesKantoBadgesText - buttonsound + promptbutton sjump .CheckPokedex OaksAssistant1Script: diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 9659c0d58..3a2d34ae4 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -14,7 +14,7 @@ OlivineCafeStrengthSailorScript: checkevent EVENT_GOT_HM04_STRENGTH iftrue .GotStrength writetext OlivineCafeStrengthSailorText - buttonsound + promptbutton verbosegiveitem HM_STRENGTH setevent EVENT_GOT_HM04_STRENGTH .GotStrength: diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index bd7165e7b..33a57ec4e 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -15,7 +15,7 @@ GoodRodGuru: yesorno iffalse .DontWantIt writetext GiveGoodRodText - buttonsound + promptbutton verbosegiveitem GOOD_ROD writetext GaveGoodRodText waitbutton diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 7e120dba5..694aecd3c 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -31,7 +31,7 @@ OlivineGymJasmineScript: checkevent EVENT_GOT_TM23_IRON_TAIL iftrue .GotIronTail writetext Jasmine_BadgeSpeech - buttonsound + promptbutton verbosegiveitem TM_IRON_TAIL iffalse .NoRoomForIronTail setevent EVENT_GOT_TM23_IRON_TAIL diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 2eee5f962..94792f8bf 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -16,7 +16,7 @@ OlivineLighthouseJasmine: checkevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS iftrue .ExplainedSickness writetext JasmineCianwoodPharmacyText - buttonsound + promptbutton setevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS .ExplainedSickness: writetext JasmineGetSomeMedicineText @@ -29,7 +29,7 @@ OlivineLighthouseJasmine: yesorno iffalse .no writetext PlayerHandedSecretpotionText - buttonsound + promptbutton takeitem SECRETPOTION writetext JasmineDontBeOffendedText waitbutton @@ -41,7 +41,7 @@ OlivineLighthouseJasmine: playmusic MUSIC_HEAL writetext JasmineAmphyHowAreYouFeelingText pause 60 - buttonsound + promptbutton closetext special RestartMapMusic cry AMPHAROS @@ -109,7 +109,7 @@ OlivineLighthouseAmphy: writetext AmphyPalPalooText setval AMPHAROS special PlaySlowCry - buttonsound + promptbutton writetext AmphyBreathingLaboredText waitbutton closetext diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 1cb28288a..3847566d4 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -34,7 +34,7 @@ OlivinePortSailorAtGangwayScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue OlivinePortAlreadyRodeScript - writetext UnknownText_0x74a55 + writetext OlivinePortSailorGetOnBoardText waitbutton closetext turnobject OLIVINEPORT_SAILOR1, DOWN @@ -67,7 +67,7 @@ OlivinePortSailorAtGangwayScript: end OlivinePortAlreadyRodeScript: - writetext UnknownText_0x74a80 + writetext OlivinePortCantBoardText waitbutton closetext end @@ -89,14 +89,14 @@ OlivinePortWalkUpToShipScript: ifequal WEDNESDAY, .NextShipFriday ifequal THURSDAY, .NextShipFriday .FirstTime: - writetext UnknownText_0x74a9c + writetext OlivinePortAskBoardText yesorno iffalse OlivinePortNotRidingMoveAwayScript - writetext UnknownText_0x74ada - buttonsound + writetext OlivinePortAskTicketText + promptbutton checkitem S_S_TICKET iffalse .NoTicket - writetext UnknownText_0x74b11 + writetext OlivinePortFlashTicketText waitbutton closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 @@ -104,21 +104,21 @@ OlivinePortWalkUpToShipScript: sjump OlivinePortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74b41 + writetext OlivinePortNoTicketText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 end .NextShipMonday: - writetext UnknownText_0x74ba8 + writetext OlivinePortMondayShipText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 end .NextShipFriday: - writetext UnknownText_0x74bce + writetext OlivinePortFridayShipText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 @@ -128,13 +128,13 @@ OlivinePortWalkUpToShipScript: end OlivinePortNotRidingScript: - writetext UnknownText_0x74af6 + writetext OlivinePortComeAgainText waitbutton closetext end OlivinePortNotRidingMoveAwayScript: - writetext UnknownText_0x74af6 + writetext OlivinePortComeAgainText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 @@ -154,14 +154,14 @@ OlivinePortSailorAfterHOFScript: ifequal WEDNESDAY, .NextShipFriday ifequal THURSDAY, .NextShipFriday .FirstTime: - writetext UnknownText_0x74a9c + writetext OlivinePortAskBoardText yesorno iffalse OlivinePortNotRidingScript - writetext UnknownText_0x74ada - buttonsound + writetext OlivinePortAskTicketText + promptbutton checkitem S_S_TICKET iffalse .NoTicket - writetext UnknownText_0x74b11 + writetext OlivinePortFlashTicketText waitbutton closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 @@ -175,19 +175,19 @@ OlivinePortSailorAfterHOFScript: sjump OlivinePortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74b41 + writetext OlivinePortNoTicketText waitbutton closetext end .NextShipMonday: - writetext UnknownText_0x74ba8 + writetext OlivinePortMondayShipText waitbutton closetext end .NextShipFriday: - writetext UnknownText_0x74bce + writetext OlivinePortFridayShipText waitbutton closetext end @@ -283,18 +283,18 @@ MovementData_0x74a49: step DOWN step_end -UnknownText_0x74a55: +OlivinePortSailorGetOnBoardText: text "We're departing" line "soon. Please get" cont "on board." done -UnknownText_0x74a80: +OlivinePortCantBoardText: text "Sorry. You can't" line "board now." done -UnknownText_0x74a9c: +OlivinePortAskBoardText: text "Welcome to FAST" line "SHIP S.S.AQUA." @@ -302,17 +302,17 @@ UnknownText_0x74a9c: line "ing today?" done -UnknownText_0x74ada: +OlivinePortAskTicketText: text "May I see your" line "S.S.TICKET?" done -UnknownText_0x74af6: +OlivinePortComeAgainText: text "We hope to see you" line "again!" done -UnknownText_0x74b11: +OlivinePortFlashTicketText: text "<PLAYER> flashed" line "the S.S.TICKET." @@ -320,7 +320,7 @@ UnknownText_0x74b11: line "Thank you!" done -UnknownText_0x74b41: +OlivinePortNoTicketText: text "<PLAYER> tried to" line "show the S.S." cont "TICKET…" @@ -334,12 +334,12 @@ UnknownText_0x74b41: line "S.S.TICKET." done -UnknownText_0x74ba8: +OlivinePortMondayShipText: text "The FAST SHIP will" line "sail next Monday." done -UnknownText_0x74bce: +OlivinePortFridayShipText: text "The FAST SHIP will" line "sail next Friday." done diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 3afe7a5f3..7a7f05b89 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -27,7 +27,7 @@ PewterCityGrampsScript: checkevent EVENT_GOT_SILVER_WING iftrue .GotSilverWing writetext PewterCityGrampsText - buttonsound + promptbutton verbosegiveitem SILVER_WING setevent EVENT_GOT_SILVER_WING closetext diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index b77cc011e..a2ba16d80 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -35,8 +35,8 @@ MeetMomRightScript: MeetMomScript: opentext writetext ElmsLookingForYouText - buttonsound - getstring STRING_BUFFER_4, GearName + promptbutton + getstring STRING_BUFFER_4, PokegearName scall PlayersHouse1FReceiveItemStd setflag ENGINE_POKEGEAR setflag ENGINE_PHONE_CARD @@ -45,7 +45,7 @@ MeetMomScript: setevent EVENT_PLAYERS_HOUSE_MOM_1 clearevent EVENT_PLAYERS_HOUSE_MOM_2 writetext MomGivesPokegearText - buttonsound + promptbutton special SetDayOfWeek .SetDayOfWeek: writetext IsItDSTText @@ -68,12 +68,12 @@ MeetMomScript: .KnowPhone: writetext KnowTheInstructionsText - buttonsound + promptbutton sjump .FinishPhone .ExplainPhone: writetext DontKnowTheInstructionsText - buttonsound + promptbutton sjump .FinishPhone .FinishPhone: @@ -103,7 +103,7 @@ MeetMomTalkedScript: playmusic MUSIC_MOM sjump MeetMomScript -GearName: +PokegearName: db "#GEAR@" PlayersHouse1FReceiveItemStd: @@ -162,17 +162,17 @@ NeighborScript: .MornScript: writetext NeighborMornIntroText - buttonsound + promptbutton sjump .Main .DayScript: writetext NeighborDayIntroText - buttonsound + promptbutton sjump .Main .NiteScript: writetext NeighborNiteIntroText - buttonsound + promptbutton sjump .Main .Main: diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 632fa1a33..21a229351 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -44,7 +44,7 @@ BigDollScript: GameConsoleScript: describedecoration DECODESC_CONSOLE -PlayersHousePosterScript: +PosterScript: conditional_event EVENT_PLAYERS_ROOM_POSTER, .Script .Script: @@ -125,7 +125,7 @@ PlayersHouse2F_MapEvents: bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript - bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript + bg_event 6, 0, BGEVENT_IFSET, PosterScript db 4 ; object events object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 7dc6f32ac..018b36175 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -106,7 +106,7 @@ LinkReceptionistScript_Trade: .FriendNotReady: special WaitForOtherPlayerToExit - writetext Text_FriendNotReady + writetext YourFriendIsNotReadyText closetext end @@ -208,7 +208,7 @@ LinkReceptionistScript_Battle: .FriendNotReady: special WaitForOtherPlayerToExit - writetext Text_FriendNotReady + writetext YourFriendIsNotReadyText closetext end @@ -341,7 +341,7 @@ LinkReceptionistScript_TimeCapsule: .FriendNotReady: special WaitForOtherPlayerToExit - writetext Text_FriendNotReady + writetext YourFriendIsNotReadyText closetext end @@ -596,7 +596,7 @@ Pokecenter2FOfficerScript: yesorno iffalse .RefusedGift writetext Text_MysteryGiftDeliveryGuy_HereYouGo - buttonsound + promptbutton waitsfx special GetMysteryGiftItem iffalse .BagIsFull @@ -853,7 +853,7 @@ Text_TimeCapsuleReceptionistIntro: line "trade across time?" done -Text_FriendNotReady: +YourFriendIsNotReadyText: text "Your friend is not" line "ready." prompt diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index f6f698366..d3988ab90 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -22,10 +22,10 @@ PokemonFanClubChairmanScript: yesorno iffalse .NotListening writetext PokemonFanClubChairmanRapidashText - buttonsound + promptbutton .HeardSpeechButBagFull: writetext PokemonFanClubChairmanIWantYouToHaveThisText - buttonsound + promptbutton verbosegiveitem RARE_CANDY iffalse .BagFull setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT @@ -71,9 +71,9 @@ PokemonFanClubClefairyGuyScript: end .MetCopycat: - buttonsound + promptbutton writetext PokemonFanClubClefairyGuyTakeThisDollBackToGirlText - buttonsound + promptbutton waitsfx giveitem LOST_ITEM iffalse .NoRoom diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 614688f59..8b8e4ac2c 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -158,7 +158,7 @@ PowerPlantManager: .FoundMachinePart: writetext PowerPlantManagerThatsThePartText - buttonsound + promptbutton takeitem MACHINE_PART setevent EVENT_RETURNED_MACHINE_PART clearevent EVENT_SAFFRON_TRAIN_STATION_POPULATION @@ -170,7 +170,7 @@ PowerPlantManager: checkevent EVENT_GOT_TM07_ZAP_CANNON iftrue .GotZapCannon writetext PowerPlantManagerTakeThisTMText - buttonsound + promptbutton verbosegiveitem TM_ZAP_CANNON iffalse .NoRoom setevent EVENT_GOT_TM07_ZAP_CANNON diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 06977b28c..8e93e9161 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -31,7 +31,7 @@ RadioTower1FLuckyNumberManScript: faceplayer opentext writetext RadioTower1FLuckyNumberManAskToPlayText - buttonsound + promptbutton special CheckLuckyNumberShowFlag iffalse .skip special ResetLuckyNumberShowFlag @@ -40,17 +40,17 @@ RadioTower1FLuckyNumberManScript: checkflag ENGINE_LUCKY_NUMBER_SHOW iftrue .GameOver writetext RadioTower1FLuckyNumberManThisWeeksIdIsText - buttonsound + promptbutton closetext applymovement RADIOTOWER1F_LUCKYNUMBERMAN, RadioTower1FLuckyNumberManGoToPCMovement opentext writetext RadioTower1FLuckyNumberManCheckIfMatchText - buttonsound + promptbutton waitsfx writetext RadioTower1FLuckyNumberManDotDotDotText playsound SFX_DEX_FANFARE_20_49 waitsfx - buttonsound + promptbutton special CheckForLuckyNumberWinners closetext applymovement RADIOTOWER1F_LUCKYNUMBERMAN, RadioTower1FLuckyNumberManReturnToPlayerMovement @@ -70,7 +70,7 @@ RadioTower1FLuckyNumberManScript: writetext RadioTower1FLuckyNumberManPerfectMatchText playsound SFX_1ST_PLACE waitsfx - buttonsound + promptbutton giveitem MASTER_BALL iffalse .BagFull itemnotify @@ -81,7 +81,7 @@ RadioTower1FLuckyNumberManScript: writetext RadioTower1FLuckyNumberManOkayMatchText playsound SFX_2ND_PLACE waitsfx - buttonsound + promptbutton giveitem EXP_SHARE iffalse .BagFull itemnotify @@ -92,7 +92,7 @@ RadioTower1FLuckyNumberManScript: writetext RadioTower1FLuckyNumberManWeakMatchText playsound SFX_3RD_PLACE waitsfx - buttonsound + promptbutton giveitem PP_UP iffalse .BagFull itemnotify @@ -145,11 +145,11 @@ RadioTower1FRadioCardWomanScript: playsound SFX_ELEVATOR_END waitsfx writetext RadioTower1FRadioCardWomanYouWinText - buttonsound + promptbutton getstring STRING_BUFFER_4, .RadioCardText scall .ReceiveItem writetext RadioTower1FPokegearIsARadioText - buttonsound + promptbutton setflag ENGINE_RADIO_CARD .GotCard: writetext RadioTower1FRadioCardWomanTuneInText diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 95a84e387..12e57af07 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -161,7 +161,7 @@ Buena: .Introduction: writetext RadioTower2FBuenaShowIntroductionText - buttonsound + promptbutton setevent EVENT_MET_BUENA verbosegiveitem BLUE_CARD .TuneIn: @@ -285,7 +285,7 @@ Buena: writetext RadioTower2FRegisteredBuenasNumberText playsound SFX_REGISTER_PHONE_NUMBER waitsfx - buttonsound + promptbutton writetext RadioTower2FBuenaCallMeText waitbutton closetext @@ -314,14 +314,14 @@ RadioTowerBuenaPrizeReceptionist: checkitem BLUE_CARD iffalse .NoCard writetext RadioTower2FBuenaReceptionistPointsForPrizesText - buttonsound + promptbutton special BuenaPrize closetext end .NoCard: writetext RadioTower2FBuenaReceptionistNoCardText - buttonsound + promptbutton closetext end diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 35df92976..b61529caf 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -64,7 +64,7 @@ RadioTower3FCooltrainerFScript: .NoRockets: writetext RadioTower3FCooltrainerFYoureMyHeroText - buttonsound + promptbutton verbosegiveitem TM_SUNNY_DAY iffalse .NoRoom writetext RadioTower3FCooltrainerFItsSunnyDayText diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 2e7c944d8..3def3cc4f 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -29,7 +29,7 @@ RadioTower4FDJMaryScript: .ClearedRockets: writetext RadioTower4FDJMaryText_ClearedRockets - buttonsound + promptbutton verbosegiveitem PINK_BOW iffalse .NoRoom writetext RadioTower4FDJMaryText_GivePinkBow diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 7e85f7dbe..0a732e126 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -42,7 +42,7 @@ FakeDirectorScript: reloadmapafterbattle opentext writetext FakeDirectorTextAfter - buttonsound + promptbutton verbosegiveitem BASEMENT_KEY closetext setscene SCENE_RADIOTOWER5F_ROCKET_BOSS @@ -119,7 +119,7 @@ RadioTower5FRocketBossScene: turnobject PLAYER, RIGHT opentext writetext RadioTower5FDirectorThankYouText - buttonsound + promptbutton verbosegiveitem CLEAR_BELL writetext RadioTower5FDirectorDescribeClearBellText waitbutton diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 2e635edcd..23ff65c86 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -15,7 +15,7 @@ Route12SuperRodHouseFishingGuruScript: yesorno iffalse .Refused writetext GiveSuperRodText - buttonsound + promptbutton verbosegiveitem SUPER_ROD iffalse .NoRoom setevent EVENT_GOT_SUPER_ROD diff --git a/maps/Route24.asm b/maps/Route24.asm index ac18b7c8a..b4ceb8294 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -21,7 +21,7 @@ Route24RocketScript: playmusic MUSIC_ROCKET_ENCOUNTER opentext writetext Route24RocketAfterBattleText - buttonsound + promptbutton special FadeOutMusic writetext Route24RocketDisappearsText waitbutton diff --git a/maps/Route25.asm b/maps/Route25.asm index e68cf2a89..91126ef40 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -161,7 +161,7 @@ TrainerCooltrainermKevin: checkevent EVENT_CLEARED_NUGGET_BRIDGE iftrue .AfterNuggetBridge writetext CooltrainermKevinNuggetText - buttonsound + promptbutton verbosegiveitem NUGGET iffalse .NoRoomForNugget setevent EVENT_CLEARED_NUGGET_BRIDGE diff --git a/maps/Route26.asm b/maps/Route26.asm index 4dc261fff..17ac2cfdc 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -38,7 +38,7 @@ TrainerCooltrainermGaven3: checkevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext CooltrainermGavenAfterText - buttonsound + promptbutton setevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .AskForNumber @@ -142,7 +142,7 @@ TrainerCooltrainerfBeth1: checkevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext CooltrainerfBethAfterText - buttonsound + promptbutton setevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .AskForNumber diff --git a/maps/Route27.asm b/maps/Route27.asm index 6367ac15b..7d65decf8 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -36,7 +36,7 @@ FirstStepIntoKantoScene_Continue: turnobject PLAYER, RIGHT opentext writetext Route27FisherHeyText - buttonsound + promptbutton writetext Route27FisherText waitbutton closetext @@ -73,7 +73,7 @@ TrainerBirdKeeperJose2: checkevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext BirdKeeperJose2AfterBattleText - buttonsound + promptbutton setevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .AskForNumber @@ -206,7 +206,7 @@ TrainerCooltrainerfReena: checkevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext CooltrainerfReenaAfterBattleText - buttonsound + promptbutton setevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .AskForNumber diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 9670a7b2a..682663f08 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -13,13 +13,13 @@ SandstormHouseWoman: iftrue .AlreadyGotItem special GetFirstPokemonHappiness writetext SandstormHouseWomanText1 - buttonsound + promptbutton ifgreater 150 - 1, .Loyal sjump .Disloyal .Loyal: writetext SandstormHouseWomanLoyalText - buttonsound + promptbutton verbosegiveitem TM_SANDSTORM iffalse .Done setevent EVENT_GOT_TM37_SANDSTORM diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm index 1fbdcfde7..1d773b0a7 100644 --- a/maps/Route28SteelWingHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -17,7 +17,7 @@ Celebrity: checkevent EVENT_GOT_TM47_STEEL_WING iftrue .AlreadyGotItem writetext CelebrityText1 - buttonsound + promptbutton verbosegiveitem TM_STEEL_WING iffalse .Done setevent EVENT_GOT_TM47_STEEL_WING diff --git a/maps/Route29.asm b/maps/Route29.asm index 5b2a1ea9f..fe5a82576 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -174,11 +174,11 @@ TuscanyScript: checkevent EVENT_MET_TUSCANY_OF_TUESDAY iftrue .MetTuscany writetext MeetTuscanyText - buttonsound + promptbutton setevent EVENT_MET_TUSCANY_OF_TUESDAY .MetTuscany: writetext TuscanyGivesGiftText - buttonsound + promptbutton verbosegiveitem PINK_BOW iffalse TuscanyDoneScript setevent EVENT_GOT_PINK_BOW_FROM_TUSCANY diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index a20c313fe..775b2b732 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -12,7 +12,7 @@ Route2NuggetHouseFisherScript: checkevent EVENT_GOT_NUGGET_FROM_GUY iftrue .GotNugget writetext Route2NuggetHouseFisherText - buttonsound + promptbutton verbosegiveitem NUGGET iffalse .NoRoom setevent EVENT_GOT_NUGGET_FROM_GUY diff --git a/maps/Route30.asm b/maps/Route30.asm index 0aba37f93..2a3f2a12e 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -50,7 +50,7 @@ TrainerYoungsterJoey: checkevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext YoungsterJoey1AfterText - buttonsound + promptbutton setevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .RequestNumber diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm index 30d165ae2..81a115162 100644 --- a/maps/Route30BerryHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -12,7 +12,7 @@ Route30BerryHousePokefanMScript: checkevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE iftrue .GotBerry writetext Route30BerrySpeechHouseMonEatBerriesText - buttonsound + promptbutton verbosegiveitem BERRY iffalse .NoRoom setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE diff --git a/maps/Route31.asm b/maps/Route31.asm index c37a7137c..1b41db781 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -194,7 +194,7 @@ Route31MailRecipientScript: .TryGiveKenya: writetext Text_Route31SleepyManGotMail - buttonsound + promptbutton checkpokemail ReceivedSpearowMailText ifequal POKEMAIL_WRONG_MAIL, .WrongMail ifequal POKEMAIL_REFUSED, .Refused @@ -202,9 +202,9 @@ Route31MailRecipientScript: ifequal POKEMAIL_LAST_MON, .LastMon ; POKEMAIL_CORRECT writetext Text_Route31HandOverMailMon - buttonsound + promptbutton writetext Text_Route31ReadingMail - buttonsound + promptbutton setevent EVENT_GAVE_KENYA verbosegiveitem TM_NIGHTMARE iffalse .NoRoomForItems diff --git a/maps/Route32.asm b/maps/Route32.asm index 9995f5603..03ba6e078 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -65,7 +65,7 @@ Route32CooltrainerMContinueScene: .GiveMiracleSeed: writetext Route32CooltrainerMText_HaveThisSeed - buttonsound + promptbutton verbosegiveitem MIRACLE_SEED iffalse .BagFull setevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 @@ -106,7 +106,7 @@ Route32RoarTMGuyScript: checkevent EVENT_GOT_TM05_ROAR iftrue .AlreadyHaveRoar writetext Text_RoarIntro - buttonsound + promptbutton verbosegiveitem TM_ROAR iffalse .Finish setevent EVENT_GOT_TM05_ROAR @@ -179,7 +179,7 @@ TrainerFisherRalph1: checkevent EVENT_RALPH_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext FisherRalphAfterText - buttonsound + promptbutton setevent EVENT_RALPH_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .AskForNumber @@ -313,7 +313,7 @@ TrainerPicnickerLiz1: checkevent EVENT_LIZ_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext PicnickerLiz1AfterText - buttonsound + promptbutton setevent EVENT_LIZ_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .AskForNumber @@ -459,11 +459,11 @@ FriedaScript: checkevent EVENT_MET_FRIEDA_OF_FRIDAY iftrue .MetFrieda writetext MeetFriedaText - buttonsound + promptbutton setevent EVENT_MET_FRIEDA_OF_FRIDAY .MetFrieda: writetext FriedaGivesGiftText - buttonsound + promptbutton verbosegiveitem POISON_BARB iffalse .Done setevent EVENT_GOT_POISON_BARB_FROM_FRIEDA diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 418e411ec..1d8d59aba 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -20,7 +20,7 @@ Route32Pokecenter1FFishingGuruScript: yesorno iffalse .Refused writetext Route32Pokecenter1FFishingGuruText_Yes - buttonsound + promptbutton verbosegiveitem OLD_ROD writetext Route32Pokecenter1FFishingGuruText_GiveOldRod waitbutton diff --git a/maps/Route33.asm b/maps/Route33.asm index 5c8982f9b..4b06dbcc8 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -27,7 +27,7 @@ TrainerHikerAnthony: checkevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext HikerAnthony2AfterText - buttonsound + promptbutton setevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .AskForPhoneNumber diff --git a/maps/Route34.asm b/maps/Route34.asm index caac74912..49de65181 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -101,7 +101,7 @@ TrainerCamperTodd1: checkevent EVENT_TODD_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext CamperTodd1AfterText - buttonsound + promptbutton setevent EVENT_TODD_ASKED_FOR_PHONE_NUMBER scall .AskNumber sjump .FinishAsk @@ -226,7 +226,7 @@ TrainerPicnickerGina1: checkevent EVENT_GINA_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext PicnickerGina1AfterText - buttonsound + promptbutton setevent EVENT_GINA_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .FinishAsk @@ -459,7 +459,7 @@ TrainerCooltrainerfKate: checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue .GotSoftSand writetext CooltrainerfKateOfferSoftSandText - buttonsound + promptbutton verbosegiveitem SOFT_SAND iffalse .BagFull setevent EVENT_GOT_SOFT_SAND_FROM_KATE diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 2698a37dc..526a8c212 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -48,7 +48,7 @@ Route34IlexForestGateTeacherScript: checkevent EVENT_GOT_TM12_SWEET_SCENT iftrue .GotSweetScent writetext Route34IlexForestGateTeacherText - buttonsound + promptbutton verbosegiveitem TM_SWEET_SCENT iffalse .NoRoom setevent EVENT_GOT_TM12_SWEET_SCENT @@ -61,7 +61,7 @@ Route34IlexForestGateTeacherScript: .ForestIsRestless: writetext Route34IlexForestGateTeacher_ForestIsRestless - buttonsound + promptbutton closetext end diff --git a/maps/Route35.asm b/maps/Route35.asm index 44bffedd5..8e1dbde8f 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -39,7 +39,7 @@ TrainerJugglerIrwin: checkevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext JugglerIrwinAfterBattleText - buttonsound + promptbutton setevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER scall Route35AskNumber1M sjump .AskForNumber @@ -142,7 +142,7 @@ TrainerBugCatcherArnie: checkevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext BugCatcherArnieAfterBattleText - buttonsound + promptbutton setevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER scall Route35AskNumber1M sjump .AskForNumber diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 22b329ae6..b45970af2 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -21,7 +21,7 @@ RandyScript: yesorno iffalse .refused writetext Route35GoldenrodGateRandyThanksKidText - buttonsound + promptbutton waitsfx readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, .partyfull @@ -51,7 +51,7 @@ RandyScript: .questcomplete writetext Route35GoldenrodGateRandySomethingForYourTroubleText - buttonsound + promptbutton verbosegiveitem HP_UP iffalse .bagfull setevent EVENT_GOT_HP_UP_FROM_RANDY diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 38e1df404..3ab43b039 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -99,7 +99,7 @@ Route35NationalParkGate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic writetext Route35NationalParkGateOfficer1GiveParkBallsText - buttonsound + promptbutton writetext Route35NationalParkGatePlayerReceivedParkBallsText playsound SFX_ITEM waitsfx @@ -141,11 +141,11 @@ Route35NationalParkGate_LessThanFullParty: iftrue Route35NationalParkGate_FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext Route35NationalParkGateOfficer1WellHoldYourMonText - buttonsound + promptbutton writetext Route35NationalParkGatePlayersMonLeftWithHelperText playsound SFX_GOT_SAFARI_BALLS waitsfx - buttonsound + promptbutton sjump Route35NationalParkGate_OkayToProceed Route35NationalParkGate_DeclinedToParticipate: diff --git a/maps/Route36.asm b/maps/Route36.asm index 4604e8c5a..9b5310fd3 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -137,7 +137,7 @@ Route36RockSmashGuyScript: .ClearedSudowoodo: writetext RockSmashGuyText2 - buttonsound + promptbutton verbosegiveitem TM_ROCK_SMASH iffalse .NoRoomForTM setevent EVENT_GOT_TM08_ROCK_SMASH @@ -179,8 +179,8 @@ TrainerSchoolboyAlan1: iftrue .NumberAccepted checkevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER iftrue .AskAgainForPhoneNumber - writetext UnknownText_0x1947aa - buttonsound + writetext SchoolboyAlanBooksText + promptbutton setevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .ContinueAskForPhoneNumber @@ -323,11 +323,11 @@ ArthurScript: checkevent EVENT_MET_ARTHUR_OF_THURSDAY iftrue .MetArthur writetext MeetArthurText - buttonsound + promptbutton setevent EVENT_MET_ARTHUR_OF_THURSDAY .MetArthur: writetext ArthurGivesGiftText - buttonsound + promptbutton verbosegiveitem HARD_STONE iffalse .BagFull setevent EVENT_GOT_HARD_STONE_FROM_ARTHUR @@ -489,7 +489,7 @@ RockSmashGuyText2: cont "have this." done -UnknownText_0x19451a: +UnusedReceivedTM08Text: text "<PLAYER> received" line "TM08." done @@ -509,7 +509,7 @@ RockSmashGuyText3: cont "smash 'em up!" done -UnknownText_0x1945b8: +UnusedOddTreeText: text "An odd tree is" line "blocking the way" cont "to GOLDENROD CITY." @@ -570,7 +570,7 @@ SchoolboyAlan1BeatenText: line "error?" done -UnknownText_0x1947aa: +SchoolboyAlanBooksText: text "Darn. I study five" line "hours a day too." diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index f07a03d40..9f0270b5a 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -160,7 +160,7 @@ Route36OfficerScriptContest: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic writetext Route36NationalParkGateOfficer1GiveParkBallsText - buttonsound + promptbutton waitsfx writetext Route36NationalParkGatePlayerReceivedParkBallsText playsound SFX_ITEM @@ -193,11 +193,11 @@ Route36OfficerScriptContest: iftrue .FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext Route36NationalParkGateOfficer1WellHoldYourMonText - buttonsound + promptbutton writetext Route36NationalParkGatePlayersMonLeftWithHelperText playsound SFX_GOT_SAFARI_BALLS waitsfx - buttonsound + promptbutton sjump .ResumeStartingContest .DecidedNotToJoinContest: @@ -246,7 +246,7 @@ Route36Officer_ContestHasConcluded: .Sunstone: writetext Route36NationalParkGateOfficer1HeresThePrizeText - buttonsound + promptbutton verbosegiveitem SUN_STONE iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE @@ -255,7 +255,7 @@ Route36Officer_ContestHasConcluded: .Everstone: writetext Route36NationalParkGateOfficer1HeresThePrizeText - buttonsound + promptbutton verbosegiveitem EVERSTONE iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE @@ -264,7 +264,7 @@ Route36Officer_ContestHasConcluded: .GoldBerry: writetext Route36NationalParkGateOfficer1HeresThePrizeText - buttonsound + promptbutton verbosegiveitem GOLD_BERRY iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY @@ -273,7 +273,7 @@ Route36Officer_ContestHasConcluded: .Berry: writetext Route36NationalParkGateOfficer1HeresThePrizeText - buttonsound + promptbutton verbosegiveitem BERRY iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_BERRY diff --git a/maps/Route37.asm b/maps/Route37.asm index 701afbed3..0459da742 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -66,17 +66,17 @@ SunnyScript: checkevent EVENT_MET_SUNNY_OF_SUNDAY iftrue .MetSunny writetext MeetSunnyText - buttonsound + promptbutton setevent EVENT_MET_SUNNY_OF_SUNDAY .MetSunny: checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Kris writetext SunnyGivesGiftText1 - buttonsound + promptbutton sjump .next .Kris: writetext SunnyGivesGiftText2 - buttonsound + promptbutton .next verbosegiveitem MAGNET iffalse SunnyDoneScript diff --git a/maps/Route38.asm b/maps/Route38.asm index 427c12f0a..9c4cbde52 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -49,8 +49,8 @@ TrainerLassDana1: iftrue .NumberAccepted checkevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER iftrue .SecondTimeAsking - writetext UnknownText_0x1a20ec - buttonsound + writetext LassDanaMoomooMilkText + promptbutton setevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER scall .AskNumber1F sjump .AskForPhoneNumber @@ -185,8 +185,8 @@ TrainerSchoolboyChad1: iftrue .HaveChadsNumber checkevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER iftrue .SecondTimeAsking - writetext UnknownText_0x1a200e - buttonsound + writetext SchoolboyChadSoManyTestsText + promptbutton setevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER scall .AskPhoneNumber1 sjump .AskToRegisterNumber @@ -350,7 +350,7 @@ SchoolboyChad1BeatenText: line "enough, I guess." done -UnknownText_0x1a200e: +SchoolboyChadSoManyTestsText: text "I have to take so" line "many tests, I" @@ -376,7 +376,7 @@ LassDana1BeatenText: line "battle that way." done -UnknownText_0x1a20ec: +LassDanaMoomooMilkText: text "I know something" line "good!" diff --git a/maps/Route39.asm b/maps/Route39.asm index 69568f3f1..e3cdbce8b 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -39,7 +39,7 @@ TrainerPokefanmDerek: checkevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext PokefanMDerekText_NotBragging - buttonsound + promptbutton setevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .AskForNumber diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 2a80b477e..0bbfe0e59 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -51,7 +51,7 @@ MoomooScript: writetext MoomooWeakMooText setval MILTANK special PlaySlowCry - buttonsound + promptbutton writetext Route39BarnItsCryIsWeakText checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO iftrue .GiveBerry @@ -60,7 +60,7 @@ MoomooScript: end .GiveBerry: - buttonsound + promptbutton writetext Route39BarnAskGiveBerryText yesorno iffalse .Refused @@ -80,7 +80,7 @@ MoomooScript: .ThreeBerries: writetext Route39BarnGaveBerryText - buttonsound + promptbutton writetext Route39BarnLittleHealthierText waitbutton closetext @@ -88,7 +88,7 @@ MoomooScript: .FiveBerries: writetext Route39BarnGaveBerryText - buttonsound + promptbutton writetext Route39BarnQuiteHealthyText waitbutton closetext @@ -98,7 +98,7 @@ MoomooScript: playmusic MUSIC_HEAL writetext Route39BarnGaveBerryText pause 60 - buttonsound + promptbutton special RestartMapMusic writetext Route39BarnTotallyHealthyText waitbutton diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index dae261a62..76b294772 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -36,7 +36,7 @@ FarmerMScript_SellMilk: waitsfx playsound SFX_TRANSACTION writetext FarmerMText_GotMilk - buttonsound + promptbutton itemnotify closetext end @@ -79,7 +79,7 @@ PokefanF_SnoreFarmer: FarmerFScript_GiveSnore: writetext FarmerFText_HealedMiltank - buttonsound + promptbutton verbosegiveitem TM_SNORE iffalse FarmerFScript_NoRoomForSnore setevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM diff --git a/maps/Route40.asm b/maps/Route40.asm index ce02e91d1..e5d8258c9 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -100,11 +100,11 @@ MonicaScript: checkevent EVENT_MET_MONICA_OF_MONDAY iftrue .MetMonica writetext MeetMonicaText - buttonsound + promptbutton setevent EVENT_MET_MONICA_OF_MONDAY .MetMonica: writetext MonicaGivesGiftText - buttonsound + promptbutton verbosegiveitem SHARP_BEAK iffalse .done setevent EVENT_GOT_SHARP_BEAK_FROM_MONICA diff --git a/maps/Route42.asm b/maps/Route42.asm index 04a194925..3f9cf535e 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -50,7 +50,7 @@ TrainerFisherTully: checkevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext FisherTullyAfterBattleText - buttonsound + promptbutton setevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .AskForNumber diff --git a/maps/Route43.asm b/maps/Route43.asm index 5c5ea9f0a..220f47293 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -60,7 +60,7 @@ TrainerPokemaniacBrent: checkevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext PokemaniacBrentAfterBattleText - buttonsound + promptbutton setevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .AskForNumber @@ -191,7 +191,7 @@ TrainerPicnickerTiffany: checkevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext PicnickerTiffanyWantsPicnicText - buttonsound + promptbutton setevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 sjump .AskForNumber diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 168b62d5a..51cf10417 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -47,7 +47,7 @@ RocketScript_Southbound: applymovement ROUTE43GATE_ROCKET1, Rocket1Script_BlocksYouSouth opentext writetext RocketText_TollFee - buttonsound + promptbutton checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1 ifequal HAVE_MORE, RocketScript_TollSouth sjump RocketScript_YoureBrokeSouth @@ -63,7 +63,7 @@ RocketScript_YoureBrokeSouth: sjump RocketScript_ShakeDownSouth RocketScript_ShakeDownSouth: - buttonsound + promptbutton closetext applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth @@ -79,7 +79,7 @@ RocketScript_Northbound: applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouNorth opentext writetext RocketText_TollFee - buttonsound + promptbutton checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1 ifequal HAVE_MORE, RocketScript_TollNorth sjump RocketScript_YoureBrokeNorth @@ -95,7 +95,7 @@ RocketScript_YoureBrokeNorth: sjump RocketScript_ShakeDownNorth RocketScript_ShakeDownNorth: - buttonsound + promptbutton closetext applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth @@ -112,7 +112,7 @@ OfficerScript_GuardWithSludgeBomb: checkevent EVENT_GOT_TM36_SLUDGE_BOMB iftrue .GotSludgeBomb writetext OfficerText_FoundTM - buttonsound + promptbutton verbosegiveitem TM_SLUDGE_BOMB iffalse .NoRoomForSludgeBomb setevent EVENT_GOT_TM36_SLUDGE_BOMB diff --git a/maps/Route44.asm b/maps/Route44.asm index 7dbb7adfc..4f9d5cb55 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -30,7 +30,7 @@ TrainerBirdKeeperVance1: checkevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext BirdKeeperVanceLegendaryBirdsText - buttonsound + promptbutton setevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER scall Route44AskNumber1M sjump .AskForNumber @@ -174,7 +174,7 @@ TrainerFisherWilton1: checkevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext FisherWiltonHugePoliwagText - buttonsound + promptbutton setevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER scall Route44AskNumber1M sjump .AskForNumber diff --git a/maps/Route45.asm b/maps/Route45.asm index 947d70284..6806683cc 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -158,7 +158,7 @@ TrainerHikerParry: checkevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext HikerParryAfterBattleText - buttonsound + promptbutton setevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER scall Route45AskNumber1M sjump .AskForNumber diff --git a/maps/Route46.asm b/maps/Route46.asm index 532f643ce..6914048bb 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -36,7 +36,7 @@ TrainerPicnickerErin1: checkevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext PicnickerErinAfterBattleText - buttonsound + promptbutton setevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER scall Route46AskNumber1F sjump .AskForNumber diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm index a1be6374e..ab4cdc034 100644 --- a/maps/Route5CleanseTagHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -13,7 +13,7 @@ Route5CleanseTagHouseGrannyScript: checkevent EVENT_GOT_CLEANSE_TAG iftrue .GotCleanseTag writetext Route5CleanseTagHouseGrannyText1 - buttonsound + promptbutton verbosegiveitem CLEANSE_TAG iffalse .NoRoom setevent EVENT_GOT_CLEANSE_TAG diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index f93036396..5d899daed 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -89,17 +89,17 @@ RuinsOfAlphKabutoChamberScientistScript: iftrue .WallOpen checkevent EVENT_SOLVED_KABUTO_PUZZLE iffalse .PuzzleIncomplete - writetext UnknownText_0x589b8 - buttonsound + writetext RuinsOfAlphKabutoChamberScientistTremorText + promptbutton .PuzzleIncomplete: - writetext UnknownText_0x588f5 + writetext RuinsOfAlphKabutoChamberScientistCrypticText waitbutton closetext turnobject RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP end .WallOpen: - writetext UnknownText_0x5897c + writetext RuinsOfAlphKabutoChamberScientistHoleText waitbutton closetext end @@ -170,7 +170,7 @@ RuinsOfAlphKabutoChamberReceptionistText: line "patterns." done -UnknownText_0x588f5: +RuinsOfAlphKabutoChamberScientistCrypticText: text "Recently, strange," line "cryptic patterns" cont "have appeared." @@ -183,7 +183,7 @@ UnknownText_0x588f5: line "look at the walls." done -UnknownText_0x5897c: +RuinsOfAlphKabutoChamberScientistHoleText: text "Ah! Here's another" line "huge hole!" @@ -191,7 +191,7 @@ UnknownText_0x5897c: line "go through!" done -UnknownText_0x589b8: +RuinsOfAlphKabutoChamberScientistTremorText: text "That tremor was" line "pretty scary!" diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index df93a8c6a..d67d0424a 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -75,7 +75,7 @@ RuinsOfAlphOutsideFisherScript: iftrue .Next setevent EVENT_TALKED_TO_RUINS_COWARD writetext RuinsOfAlphOutsideFisherText1 - buttonsound + promptbutton .Next: writetext RuinsOfAlphOutsideFisherText2 waitbutton diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 9687071ec..2ede997a4 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -16,7 +16,7 @@ SilphCoOfficerScript: checkevent EVENT_GOT_UP_GRADE iftrue .GotUpGrade writetext SilphCoOfficerText - buttonsound + promptbutton verbosegiveitem UP_GRADE iffalse .NoRoom setevent EVENT_GOT_UP_GRADE diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index e56a86945..45acce4af 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -10,17 +10,17 @@ Red: special FadeOutMusic faceplayer opentext - writetext .Text1 + writetext RedSeenText waitbutton closetext - winlosstext .Text2, .Text2 + winlosstext RedWinLossText, RedWinLossText loadtrainer RED, RED1 startbattle dontrestartmapmusic reloadmapafterbattle special FadeOutMusic opentext - writetext .Text3 + writetext RedLeavesText waitbutton closetext special FadeBlackQuickly @@ -34,16 +34,16 @@ Red: credits end -.Text1: +RedSeenText: text "<……>" line "<……>" done -.Text2: +RedWinLossText: text "…" done -.Text3: +RedLeavesText: text "<……>" line "<……>" done diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 9ddcdfaed..9449b6091 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -13,7 +13,7 @@ SlowpokeWellB2FGymGuyScript: checkevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL iftrue .GotKingsRock writetext SlowpokeWellB2FGymGuyText - buttonsound + promptbutton verbosegiveitem KINGS_ROCK iffalse .NoRoom setevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 25255c740..0815a4289 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -75,7 +75,7 @@ SageLiScript: reloadmapafterbattle opentext writetext SageLiTakeThisFlashText - buttonsound + promptbutton verbosegiveitem HM_FLASH setevent EVENT_GOT_HM05_FLASH setevent EVENT_BEAT_SAGE_LI diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 64ea130af..1d1af2e4c 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -58,7 +58,7 @@ RocketBaseBossFScript: appear TEAMROCKETBASEB2F_ROCKET_GIRL appear TEAMROCKETBASEB2F_ROCKET1 opentext - writetext UnknownText_0x6d2ad + writetext RocketBaseExecutiveFHoldItText waitbutton closetext turnobject PLAYER, DOWN @@ -69,7 +69,7 @@ RocketBaseBossFScript: turnobject PLAYER, UP applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f opentext - writetext UnknownText_0x6d2c3 + writetext RocketBaseBossFThrashText waitbutton closetext cry DRAGONITE @@ -82,18 +82,18 @@ RocketBaseBossFScript: appear TEAMROCKETBASEB2F_LANCE applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d244 opentext - writetext UnknownText_0x6d38c + writetext RocketBaseLanceShareFunText waitbutton closetext turnobject PLAYER, RIGHT applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241 opentext - writetext UnknownText_0x6d3bd + writetext RocketBaseBossDontMeddleText waitbutton closetext applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24a applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d248 - winlosstext UnknownText_0x6d45c, 0 + winlosstext RocketBaseBossWinText, 0 setlasttalked TEAMROCKETBASEB2F_ROCKET_GIRL loadtrainer EXECUTIVEF, EXECUTIVEF_2 startbattle @@ -104,7 +104,7 @@ RocketBaseBossFScript: reloadmapafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2 opentext - writetext UnknownText_0x6d4c6 + writetext RocketBaseBossRetreatText waitbutton closetext special FadeBlackQuickly @@ -120,13 +120,13 @@ RocketBaseBossFScript: clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE turnobject TEAMROCKETBASEB2F_LANCE, DOWN opentext - writetext UnknownText_0x6d5d8 + writetext RocketBaseLancePostBattleText waitbutton closetext applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250 turnobject PLAYER, UP opentext - writetext UnknownText_0x6d64e + writetext RocketBaseLancePowerOffText waitbutton closetext follow TEAMROCKETBASEB2F_LANCE, PLAYER @@ -134,7 +134,7 @@ RocketBaseBossFScript: stopfollow applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d258 opentext - writetext UnknownText_0x6d6cf + writetext RockerBaseLanceElectrodeFaintText waitbutton closetext applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d267 @@ -146,7 +146,7 @@ RocketBaseCantLeaveScript: RocketBaseLancesSideScript: opentext - writetext UnknownText_0x6d7ea + writetext RocketBaseLancesSideText waitbutton closetext applymovement PLAYER, MovementData_0x6d278 @@ -283,16 +283,16 @@ RocketBaseElectrodeScript: applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a turnobject PLAYER, RIGHT opentext - writetext UnknownText_0x6d809 - buttonsound + writetext RocketBaseLanceElectrodeDoneText + promptbutton verbosegiveitem HM_WHIRLPOOL setevent EVENT_GOT_HM06_WHIRLPOOL - writetext UnknownText_0x6d8f8 + writetext RocketBaseLanceWhirlpoolText waitbutton closetext turnobject TEAMROCKETBASEB2F_LANCE, DOWN opentext - writetext UnknownText_0x6d994 + writetext RocketBaseLanceMonMasterText waitbutton closetext turnobject PLAYER, DOWN @@ -319,13 +319,13 @@ TeamRocketBaseB2FLockedDoor: opentext checkevent EVENT_LEARNED_HAIL_GIOVANNI iftrue .KnowsPassword - writetext UnknownText_0x6dd39 + writetext RocketBaseDoorNoPasswordText waitbutton closetext end .KnowsPassword: - writetext UnknownText_0x6dd6b + writetext RocketBaseDoorKnowPasswordText waitbutton playsound SFX_ENTER_DOOR changeblock 14, 12, $07 ; floor @@ -339,13 +339,13 @@ TeamRocketBaseB2FTransmitterScript: opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .Deactivated - writetext UnknownText_0x6dda7 + writetext RocketBaseB2FTransmitterText waitbutton closetext end .Deactivated: - writetext UnknownText_0x6de03 + writetext RocketBaseB2FDeactivateTransmitterText waitbutton closetext end @@ -557,12 +557,12 @@ MovementData_0x6d2a4: step RIGHT step_end -UnknownText_0x6d2ad: +RocketBaseExecutiveFHoldItText: text "Hold it right" line "there!" done -UnknownText_0x6d2c3: +RocketBaseBossFThrashText: text "We can't have a" line "brat like you on" cont "the loose." @@ -582,13 +582,13 @@ UnknownText_0x6d2c3: cont "thrashed." done -UnknownText_0x6d38c: +RocketBaseLanceShareFunText: text "Hey! Don't be so" line "selfish. Spread" cont "the fun around." done -UnknownText_0x6d3bd: +RocketBaseBossDontMeddleText: text "What? You had an" line "accomplice?" @@ -605,7 +605,7 @@ UnknownText_0x6d3bd: line "with TEAM ROCKET!" done -UnknownText_0x6d45c: +RocketBaseBossWinText: text "Tch, you really" line "are strong." @@ -618,7 +618,7 @@ UnknownText_0x6d45c: line "an EXECUTIVE." done -UnknownText_0x6d4c6: +RocketBaseBossRetreatText: text "…This hideout is" line "done for…" @@ -646,7 +646,7 @@ UnknownText_0x6d4c6: para "Fufufufu…" done -UnknownText_0x6d5d8: +RocketBaseLancePostBattleText: text "LANCE: That did" line "it. We defeated" @@ -660,7 +660,7 @@ UnknownText_0x6d5d8: line "the process…" done -UnknownText_0x6d64e: +RocketBaseLancePowerOffText: text "Sorry, <PLAY_G>." line "I saw how well you" @@ -674,7 +674,7 @@ UnknownText_0x6d64e: line "radio signal." done -UnknownText_0x6d6cf: +RockerBaseLanceElectrodeFaintText: text "It's this machine" line "that's causing all" cont "the problems." @@ -704,12 +704,12 @@ UnknownText_0x6d6cf: line "split the job." done -UnknownText_0x6d7ea: +RocketBaseLancesSideText: text "LANCE: Leave this" line "side to me." done -UnknownText_0x6d809: +RocketBaseLanceElectrodeDoneText: text "LANCE: That odd" line "signal has finally" cont "stopped." @@ -731,12 +731,13 @@ UnknownText_0x6d809: cont "any need for it." done +; unused UnknownText_0x6d8e6: text "<PLAYER> received" line "HM06." done -UnknownText_0x6d8f8: +RocketBaseLanceWhirlpoolText: text "That's WHIRLPOOL." line "Teach it to a" @@ -753,7 +754,7 @@ UnknownText_0x6d8f8: line "from MAHOGANY GYM." done -UnknownText_0x6d994: +RocketBaseLanceMonMasterText: text "<PLAY_G>…" para "The journey to be-" @@ -871,14 +872,14 @@ GruntM19AfterBattleText: cont "for yourself." done -UnknownText_0x6dd39: +RocketBaseDoorNoPasswordText: text "The door's closed…" para "It needs a pass-" line "word to open." done -UnknownText_0x6dd6b: +RocketBaseDoorKnowPasswordText: text "The door's closed…" para "<PLAYER> entered" @@ -887,7 +888,7 @@ UnknownText_0x6dd6b: para "The door opened!" done -UnknownText_0x6dda7: +RocketBaseB2FTransmitterText: text "It's the radio" line "transmitter that's" @@ -898,7 +899,7 @@ UnknownText_0x6dda7: line "full capacity." done -UnknownText_0x6de03: +RocketBaseB2FDeactivateTransmitterText: text "The radio trans-" line "mitter has finally" diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 9288e7dec..b9343b851 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -192,7 +192,7 @@ TinTower1FSage5Script: checkevent EVENT_GOT_RAINBOW_WING iftrue .GotRainbowWing writetext TinTower1FSage5Text1 - buttonsound + promptbutton verbosegiveitem RAINBOW_WING closetext refreshscreen diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index fc5942950..a17c9473b 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -17,7 +17,7 @@ TrainerHouseReceptionistScript: checkflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY iftrue .FoughtTooManyTimes writetext TrainerHouseB1FIntroText - buttonsound + promptbutton special TrainerHouse iffalse .GetCal3Name gettrainername STRING_BUFFER_3, CAL, CAL2 @@ -27,7 +27,7 @@ TrainerHouseReceptionistScript: gettrainername STRING_BUFFER_3, CAL, CAL3 .GotName: writetext TrainerHouseB1FYourOpponentIsText - buttonsound + promptbutton writetext TrainerHouseB1FAskWantToBattleText yesorno iffalse .Declined diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index d6d5fa6de..101f73b38 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -42,13 +42,13 @@ VermilionSnorlax: opentext special SnorlaxAwake iftrue .Awake - writetext UnknownText_0x1aab64 + writetext VermilionCitySnorlaxSleepingText waitbutton closetext end .Awake: - writetext UnknownText_0x1aab84 + writetext VermilionCityRadioNearSnorlaxText pause 15 cry SNORLAX closetext @@ -69,31 +69,31 @@ VermilionGymBadgeGuy: ifequal NUM_BADGES, .AllBadges ifgreater 13, .MostBadges ifgreater 9, .SomeBadges - writetext UnknownText_0x1aabc8 + writetext VermilionCityBadgeGuyTrainerText waitbutton closetext end .SomeBadges: - writetext UnknownText_0x1aac2b + writetext VermilionCityBadgeGuySomeBadgesText waitbutton closetext end .MostBadges: - writetext UnknownText_0x1aac88 + writetext VermilionCityBadgeGuyMostBadgesText waitbutton closetext end .AllBadges: - writetext UnknownText_0x1aacf3 - buttonsound + writetext VermilionCityBadgeGuyAllBadgesText + promptbutton verbosegiveitem HP_UP iffalse .Done setevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY .AlreadyGotItem: - writetext UnknownText_0x1aad4a + writetext VermilionCityBadgeGuyBattleEdgeText waitbutton .Done: closetext @@ -163,12 +163,12 @@ VermilionCitySuperNerdText: cont "#MON GYM." done -UnknownText_0x1aab64: +VermilionCitySnorlaxSleepingText: text "SNORLAX is snoring" line "peacefully…" done -UnknownText_0x1aab84: +VermilionCityRadioNearSnorlaxText: text "The #GEAR was" line "placed near the" cont "sleeping SNORLAX…" @@ -178,7 +178,7 @@ UnknownText_0x1aab84: para "SNORLAX woke up!" done -UnknownText_0x1aabc8: +VermilionCityBadgeGuyTrainerText: text "Skilled trainers" line "gather in KANTO." @@ -189,7 +189,7 @@ UnknownText_0x1aabc8: line "to defeat." done -UnknownText_0x1aac2b: +VermilionCityBadgeGuySomeBadgesText: text "You've started to" line "collect KANTO GYM" cont "BADGES?" @@ -199,7 +199,7 @@ UnknownText_0x1aac2b: cont "here are tough?" done -UnknownText_0x1aac88: +VermilionCityBadgeGuyMostBadgesText: text "I guess you'll be" line "finished with your" @@ -211,7 +211,7 @@ UnknownText_0x1aac88: cont "BADGES." done -UnknownText_0x1aacf3: +VermilionCityBadgeGuyAllBadgesText: text "Congratulations!" para "You got all the" @@ -221,7 +221,7 @@ UnknownText_0x1aacf3: line "for your efforts." done -UnknownText_0x1aad4a: +VermilionCityBadgeGuyBattleEdgeText: text "Having a variety" line "of #MON types" diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index bba156b39..f5a66b5dd 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -40,7 +40,7 @@ VermilionPortSailorAtGangwayScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue VermilionPortAlreadyRodeScript - writetext UnknownText_0x74f06 + writetext VermilionPortDepartingText waitbutton closetext turnobject VERMILIONPORT_SAILOR1, DOWN @@ -71,7 +71,7 @@ VermilionPortSailorAtGangwayScript: end VermilionPortAlreadyRodeScript: - writetext UnknownText_0x74f31 + writetext VermilionPortCantBoardText waitbutton closetext end @@ -90,11 +90,11 @@ VermilionPortWalkUpToShipScript: ifequal THURSDAY, .NextShipSunday ifequal FRIDAY, .NextShipSunday ifequal SATURDAY, .NextShipSunday - writetext UnknownText_0x74f4d + writetext VermilionPortAskBoardingText yesorno iffalse VermilionPortNotRidingMoveAwayScript - writetext UnknownText_0x74f8b - buttonsound + writetext VermilionPortAskTicketText + promptbutton checkitem S_S_TICKET iffalse .NoTicket writetext VermilionPortSSTicketText @@ -105,21 +105,21 @@ VermilionPortWalkUpToShipScript: sjump VermilionPortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74ff2 + writetext VermilionPortNoTicketText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 end .NextShipWednesday: - writetext UnknownText_0x75059 + writetext VermilionPortSailMondayText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 end .NextShipSunday: - writetext UnknownText_0x75080 + writetext VermilionPortSailSundayText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 @@ -129,13 +129,13 @@ VermilionPortWalkUpToShipScript: end VermilionPortNotRidingScript: - writetext UnknownText_0x74fa7 + writetext VermilionPortComeAgainText waitbutton closetext end VermilionPortNotRidingMoveAwayScript: - writetext UnknownText_0x74fa7 + writetext VermilionPortComeAgainText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 @@ -152,11 +152,11 @@ VermilionPortSailorScript: ifequal THURSDAY, .NextShipSunday ifequal FRIDAY, .NextShipSunday ifequal SATURDAY, .NextShipSunday - writetext UnknownText_0x74f4d + writetext VermilionPortAskBoardingText yesorno iffalse VermilionPortNotRidingScript - writetext UnknownText_0x74f8b - buttonsound + writetext VermilionPortAskTicketText + promptbutton checkitem S_S_TICKET iffalse .NoTicket writetext VermilionPortSSTicketText @@ -167,19 +167,19 @@ VermilionPortSailorScript: sjump VermilionPortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74ff2 + writetext VermilionPortNoTicketText waitbutton closetext end .NextShipWednesday: - writetext UnknownText_0x75059 + writetext VermilionPortSailMondayText waitbutton closetext end .NextShipSunday: - writetext UnknownText_0x75080 + writetext VermilionPortSailSundayText waitbutton closetext end @@ -187,7 +187,7 @@ VermilionPortSailorScript: VermilionPortSuperNerdScript: faceplayer opentext - writetext UnknownText_0x750a6 + writetext VermilionPortSuperNerdText waitbutton closetext end @@ -226,18 +226,18 @@ MovementData_0x74efe: step DOWN step_end -UnknownText_0x74f06: +VermilionPortDepartingText: text "We're departing" line "soon. Please get" cont "on board." done -UnknownText_0x74f31: +VermilionPortCantBoardText: text "Sorry. You can't" line "board now." done -UnknownText_0x74f4d: +VermilionPortAskBoardingText: text "Welcome to FAST" line "SHIP S.S.AQUA." @@ -245,12 +245,12 @@ UnknownText_0x74f4d: line "ing today?" done -UnknownText_0x74f8b: +VermilionPortAskTicketText: text "May I see your" line "S.S.TICKET?" done -UnknownText_0x74fa7: +VermilionPortComeAgainText: text "We hope to see you" line "again!" done @@ -263,7 +263,7 @@ VermilionPortSSTicketText: line "Thank you!" done -UnknownText_0x74ff2: +VermilionPortNoTicketText: text "<PLAYER> tried to" line "show the S.S." cont "TICKET…" @@ -277,17 +277,17 @@ UnknownText_0x74ff2: line "S.S.TICKET." done -UnknownText_0x75059: +VermilionPortSailMondayText: text "The FAST SHIP will" line "sail on Wednesday." done -UnknownText_0x75080: +VermilionPortSailSundayText: text "The FAST SHIP will" line "sail next Sunday." done -UnknownText_0x750a6: +VermilionPortSuperNerdText: text "You came from" line "JOHTO?" diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 1c2637a24..60465f375 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -25,7 +25,7 @@ VictoryRoadGateOfficerScript: VictoryRoadGateBadgeCheckScript: opentext writetext VictoryRoadGateOfficerText - buttonsound + promptbutton readvar VAR_BADGES ifgreater NUM_JOHTO_BADGES - 1, .AllEightBadges writetext VictoryRoadGateNotEnoughBadgesText diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 3a2912c37..4a84a1dce 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -37,7 +37,7 @@ VioletGymFalknerScript: setmapscene ELMS_LAB, SCENE_ELMSLAB_NOTHING specialphonecall SPECIALCALL_ASSISTANT writetext FalknerZephyrBadgeText - buttonsound + promptbutton verbosegiveitem TM_MUD_SLAP iffalse .NoRoomForMudSlap setevent EVENT_GOT_TM31_MUD_SLAP diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 2124cf27b..4558a4b47 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -3,7 +3,7 @@ const VIOLETPOKECENTER1F_GAMEBOY_KID const VIOLETPOKECENTER1F_GENTLEMAN const VIOLETPOKECENTER1F_YOUNGSTER - const VIOLETPOKECENTER1F_SCIENTIST + const VIOLETPOKECENTER1F_ELMS_AIDE VioletPokecenter1F_MapScripts: db 0 ; scene scripts @@ -18,7 +18,7 @@ VioletPokecenter1F_ElmsAideScript: opentext checkevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE iftrue .SecondTimeAsking - writetext UnknownText_0x69555 + writetext VioletPokecenterElmsAideFavorText .AskTakeEgg: yesorno iffalse .RefusedEgg @@ -31,24 +31,24 @@ VioletPokecenter1F_ElmsAideScript: clearevent EVENT_ELMS_AIDE_IN_LAB clearevent EVENT_TOGEPI_HATCHED setmapscene ROUTE_32, SCENE_ROUTE32_OFFER_SLOWPOKETAIL - writetext UnknownText_0x695c5 + writetext VioletPokecenterElmsAideGiveEggText waitbutton closetext readvar VAR_FACING ifequal UP, .AideWalksAroundPlayer turnobject PLAYER, DOWN - applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter + applymovement VIOLETPOKECENTER1F_ELMS_AIDE, MovementData_AideWalksStraightOutOfPokecenter playsound SFX_EXIT_BUILDING - disappear VIOLETPOKECENTER1F_SCIENTIST + disappear VIOLETPOKECENTER1F_ELMS_AIDE waitsfx end .AideWalksAroundPlayer: - applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksLeftToExitPokecenter + applymovement VIOLETPOKECENTER1F_ELMS_AIDE, MovementData_AideWalksLeftToExitPokecenter turnobject PLAYER, DOWN - applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideFinishesLeavingPokecenter + applymovement VIOLETPOKECENTER1F_ELMS_AIDE, MovementData_AideFinishesLeavingPokecenter playsound SFX_EXIT_BUILDING - disappear VIOLETPOKECENTER1F_SCIENTIST + disappear VIOLETPOKECENTER1F_ELMS_AIDE waitsfx end @@ -60,20 +60,20 @@ VioletPokecenter1F_ElmsAideScript: end .PartyFull: - writetext UnknownText_0x69693 + writetext VioletCityElmsAideFullPartyText waitbutton closetext end .RefusedEgg: - writetext UnknownText_0x696f2 + writetext VioletPokecenterElmsAideRefuseText waitbutton closetext setevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE end .SecondTimeAsking: - writetext UnknownText_0x69712 + writetext VioletPokecenterElmsAideAskEggText sjump .AskTakeEgg VioletPokecenter1FGameboyKidScript: @@ -103,7 +103,7 @@ MovementData_AideFinishesLeavingPokecenter: step DOWN step_end -UnknownText_0x69555: +VioletPokecenterElmsAideFavorText: text "<PLAY_G>, long" line "time, no see." @@ -117,7 +117,7 @@ UnknownText_0x69555: line "#MON EGG?" done -UnknownText_0x695c5: +VioletPokecenterElmsAideGiveEggText: text "We discovered that" line "a #MON will not" @@ -137,7 +137,7 @@ UnknownText_0x695c5: cont "hatches!" done -UnknownText_0x69693: +VioletCityElmsAideFullPartyText: text "Oh, no. You can't" line "carry any more" cont "#MON with you." @@ -147,17 +147,18 @@ UnknownText_0x69693: cont "room for the EGG." done -UnknownText_0x696f2: +VioletPokecenterElmsAideRefuseText: text "B-but… PROF.ELM" line "asked for you…" done -UnknownText_0x69712: +VioletPokecenterElmsAideAskEggText: text "<PLAY_G>, will you" line "take the EGG?" done -UnknownText_0x6972d: +; unused +VioletPokecenterFarawayLinkText: text "I've been thinking" line "it'd be great to" @@ -168,7 +169,8 @@ UnknownText_0x6972d: line "far away." done -UnknownText_0x69791: +; unused +VioletPokecenterMobileAdapterText: text "I just battled a" line "friend in CIANWOOD" cont "over a link." diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 2a8b0fbd9..47b51d7d6 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -53,7 +53,7 @@ ViridianCityDreamEaterFisher: checkevent EVENT_GOT_TM42_DREAM_EATER iftrue .GotDreamEater writetext ViridianCityDreamEaterFisherText - buttonsound + promptbutton verbosegiveitem TM_DREAM_EATER iffalse .NoRoomForDreamEater setevent EVENT_GOT_TM42_DREAM_EATER diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 30cdebdf8..61370613a 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -96,7 +96,7 @@ TrainerSageKoji: showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE6, 20 opentext writetext SageKojiAfterBattleQuestionText - buttonsound + promptbutton writetext SageKojiAfterBattleSpeechText waitbutton closetext |