diff options
author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-05-18 13:01:42 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-18 13:01:42 -0400 |
commit | 7db6c5921185f139a78f1c290ffb1a2a538b1b01 (patch) | |
tree | 0ca3680a092b8d7315ec86a373c2f571eeeb63dd | |
parent | 7890fae995bad840d10071c60a2abd901d8f4e1a (diff) | |
parent | 80e89b553951aaf2fa1bf530807aa10082d9abcb (diff) |
Merge pull request #628 from DeeDeeG/renaming-placeholder-labels
Renaming placeholder labels in maps folder
-rw-r--r-- | maps/GoldenrodCity.asm | 44 | ||||
-rw-r--r-- | maps/GoldenrodDeptStore5F.asm | 28 | ||||
-rw-r--r-- | maps/GoldenrodFlowerShop.asm | 32 | ||||
-rw-r--r-- | maps/GoldenrodMagnetTrainStation.asm | 42 | ||||
-rw-r--r-- | maps/GoldenrodPokecenter1F.asm | 56 | ||||
-rw-r--r-- | maps/GoldenrodUnderground.asm | 104 | ||||
-rw-r--r-- | maps/PokemonFanClub.asm | 64 | ||||
-rw-r--r-- | maps/PowerPlant.asm | 88 | ||||
-rw-r--r-- | maps/Route35GoldenrodGate.asm | 34 | ||||
-rw-r--r-- | maps/SaffronMagnetTrainStation.asm | 42 |
10 files changed, 267 insertions, 267 deletions
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index ac4f23c17..d9d916243 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -53,16 +53,16 @@ GoldenrodCity_MapScripts: MoveTutorScript: faceplayer opentext - writetext UnknownText_0x199042 + writetext GoldenrodCityMoveTutorAskTeachAMoveText yesorno iffalse .Refused special DisplayCoinCaseBalance - writetext UnknownText_0x199090 + writetext GoldenrodCityMoveTutorAsk4000CoinsOkayText yesorno iffalse .Refused2 checkcoins 4000 ifequal HAVE_LESS, .NotEnoughMoney - writetext UnknownText_0x1990ce + writetext GoldenrodCityMoveTutorWhichMoveShouldITeachText loadmenu .MoveMenuHeader verticalmenu closewindow @@ -107,34 +107,34 @@ MoveTutorScript: db "CANCEL@" .Refused: - writetext UnknownText_0x1990b4 + writetext GoldenrodCityMoveTutorAwwButTheyreAmazingText waitbutton closetext end .Refused2: - writetext UnknownText_0x199107 + writetext GoldenrodCityMoveTutorHmTooBadText waitbutton closetext end .TeachMove: - writetext UnknownText_0x19913a + writetext GoldenrodCityMoveTutorIfYouUnderstandYouveMadeItText buttonsound takecoins 4000 waitsfx playsound SFX_TRANSACTION special DisplayCoinCaseBalance - writetext UnknownText_0x19918b + writetext GoldenrodCityMoveTutorFarewellKidText waitbutton closetext readvar VAR_FACING ifequal LEFT, .WalkAroundPlayer - applymovement GOLDENRODCITY_MOVETUTOR, MovementData_0x198a5f + applymovement GOLDENRODCITY_MOVETUTOR, GoldenrodCityMoveTutorEnterGameCornerMovement sjump .GoInside .WalkAroundPlayer: - applymovement GOLDENRODCITY_MOVETUTOR, MovementData_0x198a63 + applymovement GOLDENRODCITY_MOVETUTOR, GoldenrodCityMoveTutorWalkAroundPlayerThenEnterGameCornerMovement .GoInside: playsound SFX_ENTER_DOOR disappear GOLDENRODCITY_MOVETUTOR @@ -144,13 +144,13 @@ MoveTutorScript: end .Incompatible: - writetext UnknownText_0x1991a4 + writetext GoldenrodCityMoveTutorBButText waitbutton closetext end .NotEnoughMoney: - writetext UnknownText_0x1991ac + writetext GoldenrodCityMoveTutorYouDontHaveEnoughCoinsText waitbutton closetext end @@ -267,13 +267,13 @@ GoldenrodCityPokecenterSign: GoldenrodCityFlowerShopSign: jumptext GoldenrodCityFlowerShopSignText -MovementData_0x198a5f: +GoldenrodCityMoveTutorEnterGameCornerMovement: step RIGHT step RIGHT step UP step_end -MovementData_0x198a63: +GoldenrodCityMoveTutorWalkAroundPlayerThenEnterGameCornerMovement: step DOWN step RIGHT step RIGHT @@ -487,7 +487,7 @@ GoldenrodCityFlowerShopSignText: line "FLOWER SHOP" done -UnknownText_0x199042: +GoldenrodCityMoveTutorAskTeachAMoveText: text "I can teach your" line "#MON amazing" @@ -498,17 +498,17 @@ UnknownText_0x199042: line "new move?" done -UnknownText_0x199090: +GoldenrodCityMoveTutorAsk4000CoinsOkayText: text "It will cost you" line "4000 coins. Okay?" done -UnknownText_0x1990b4: +GoldenrodCityMoveTutorAwwButTheyreAmazingText: text "Aww… But they're" line "amazing…" done -UnknownText_0x1990ce: +GoldenrodCityMoveTutorWhichMoveShouldITeachText: text "Wahahah! You won't" line "regret it!" @@ -516,13 +516,13 @@ UnknownText_0x1990ce: line "I teach?" done -UnknownText_0x199107: +GoldenrodCityMoveTutorHmTooBadText: text "Hm, too bad. I'll" line "have to get some" cont "cash from home…" done -UnknownText_0x19913a: +GoldenrodCityMoveTutorIfYouUnderstandYouveMadeItText: text "If you understand" line "what's so amazing" @@ -531,16 +531,16 @@ UnknownText_0x19913a: cont "a trainer." done -UnknownText_0x19918b: +GoldenrodCityMoveTutorFarewellKidText: text "Wahahah!" line "Farewell, kid!" done -UnknownText_0x1991a4: +GoldenrodCityMoveTutorBButText: text "B-but…" done -UnknownText_0x1991ac: +GoldenrodCityMoveTutorYouDontHaveEnoughCoinsText: text "…You don't have" line "enough coins here…" done diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 0c7ca9b1d..370286551 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -64,14 +64,14 @@ GoldenrodDeptStore5FReceptionistScript: checkflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN iftrue .EventIsOver special GetFirstPokemonHappiness - writetext UnknownText_0x56143 + writetext GoldenrodDeptStore5FReceptionistOhYourMonDotDotDotText buttonsound ifgreater 150 - 1, .VeryHappy ifgreater 50 - 1, .SomewhatHappy sjump .NotVeryHappy .VeryHappy: - writetext UnknownText_0x5615a + writetext GoldenrodDeptStore5FReceptionistThisMoveShouldBePerfectText buttonsound verbosegiveitem TM_RETURN iffalse .Done @@ -80,13 +80,13 @@ GoldenrodDeptStore5FReceptionistScript: end .SomewhatHappy: - writetext UnknownText_0x561a6 + writetext GoldenrodDeptStore5FReceptionistItsAdorableText waitbutton closetext end .NotVeryHappy: - writetext UnknownText_0x561d8 + writetext GoldenrodDeptStore5FReceptionistItLooksEvilHowAboutThisTMText buttonsound verbosegiveitem TM_FRUSTRATION iffalse .Done @@ -95,7 +95,7 @@ GoldenrodDeptStore5FReceptionistScript: end .EventIsOver: - writetext UnknownText_0x56202 + writetext GoldenrodDeptStore5FReceptionistThereAreTMsPerfectForMonText waitbutton .Done: closetext @@ -106,14 +106,14 @@ Carrie: opentext special GameboyCheck ifnotequal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver - writetext UnknownText_0x56241 + writetext GoldenrodDeptStore5FCarrieMysteryGiftExplanationText waitbutton closetext special UnlockMysteryGift end .NotGBC: - writetext UnknownText_0x56279 + writetext GoldenrodDeptStore5FCarrieMysteryGiftRequiresGBCText waitbutton closetext end @@ -138,12 +138,12 @@ GoldenrodDeptStore5FDirectory: GoldenrodDeptStore5FElevatorButton: jumpstd elevatorbutton -UnknownText_0x56143: +GoldenrodDeptStore5FReceptionistOhYourMonDotDotDotText: text "Hello. Oh, your" line "#MON…" done -UnknownText_0x5615a: +GoldenrodDeptStore5FReceptionistThisMoveShouldBePerfectText: text "It's very attached" line "to you." @@ -152,20 +152,20 @@ UnknownText_0x5615a: cont "pair like you." done -UnknownText_0x561a6: +GoldenrodDeptStore5FReceptionistItsAdorableText: text "It's adorable!" para "You should teach" line "it good TM moves." done -UnknownText_0x561d8: +GoldenrodDeptStore5FReceptionistItLooksEvilHowAboutThisTMText: text "It looks evil. How" line "about this TM for" cont "it?" done -UnknownText_0x56202: +GoldenrodDeptStore5FReceptionistThereAreTMsPerfectForMonText: text "There are sure to" line "be TMs that are" @@ -173,7 +173,7 @@ UnknownText_0x56202: line "your #MON." done -UnknownText_0x56241: +GoldenrodDeptStore5FCarrieMysteryGiftExplanationText: text "MYSTERY GIFT." para "With just a" @@ -181,7 +181,7 @@ UnknownText_0x56241: cont "get a gift." done -UnknownText_0x56279: +GoldenrodDeptStore5FCarrieMysteryGiftRequiresGBCText: text "The MYSTERY GIFT" line "option requires a" cont "Game Boy Color." diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 107db9e2d..1fdfae059 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -20,7 +20,7 @@ FlowerShopTeacherScript: iffalse .NoPlainBadge faceplayer opentext - writetext UnknownText_0x554c2 + writetext GoldenrodFlowerShopTeacherHeresTheSquirtbottleText buttonsound verbosegiveitem SQUIRTBOTTLE setevent EVENT_GOT_SQUIRTBOTTLE @@ -32,19 +32,19 @@ FlowerShopTeacherScript: .Lalala: turnobject GOLDENRODFLOWERSHOP_TEACHER, LEFT opentext - writetext UnknownText_0x5552e + writetext GoldenrodFlowerShopTeacherLalalaHavePlentyOfWaterText waitbutton closetext end .GotSquirtbottle: - jumptextfaceplayer UnknownText_0x5550d + jumptextfaceplayer GoldenrodFlowerShopTeacherDontDoAnythingDangerousText .NoPlainBadge: - jumptextfaceplayer UnknownText_0x55463 + jumptextfaceplayer GoldenrodFlowerShopTeacherAskWantToBorrowWaterBottleText .HaventMetFloria: - jumptextfaceplayer UnknownText_0x553d4 + jumptextfaceplayer GoldenrodFlowerShopTeacherMySisterWentToSeeWigglyTreeRoute36Text FlowerShopFloriaScript: faceplayer @@ -53,7 +53,7 @@ FlowerShopFloriaScript: iftrue .FoughtSudowoodo checkevent EVENT_GOT_SQUIRTBOTTLE iftrue .GotSquirtbottle - writetext UnknownText_0x55561 + writetext GoldenrodFlowerShopFloriaWonderIfSisWillLendWaterBottleText waitbutton closetext setevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP @@ -62,13 +62,13 @@ FlowerShopFloriaScript: end .GotSquirtbottle: - writetext UnknownText_0x555e6 + writetext GoldenrodFlowerShopFloriaYouBeatWhitneyText waitbutton closetext end .FoughtSudowoodo: - writetext UnknownText_0x55604 + writetext GoldenrodFlowerShopFloriaItReallyWasAMonText waitbutton closetext end @@ -85,7 +85,7 @@ FlowerShopRadio: ; unused jumpstd radio2 -UnknownText_0x553d4: +GoldenrodFlowerShopTeacherMySisterWentToSeeWigglyTreeRoute36Text: text "Have you seen that" line "wiggly tree that's" @@ -102,7 +102,7 @@ UnknownText_0x553d4: line "it dangerous?" done -UnknownText_0x55463: +GoldenrodFlowerShopTeacherAskWantToBorrowWaterBottleText: text "Do you want to" line "borrow the water" @@ -113,7 +113,7 @@ UnknownText_0x55463: line "dangerous with it." done -UnknownText_0x554c2: +GoldenrodFlowerShopTeacherHeresTheSquirtbottleText: text "Oh, you're better" line "than WHITNEY…" @@ -122,18 +122,18 @@ UnknownText_0x554c2: cont "SQUIRTBOTTLE!" done -UnknownText_0x5550d: +GoldenrodFlowerShopTeacherDontDoAnythingDangerousText: text "Don't do anything" line "too dangerous!" done -UnknownText_0x5552e: +GoldenrodFlowerShopTeacherLalalaHavePlentyOfWaterText: text "Lalala lalalala." line "Have plenty of" cont "water, my lovely!" done -UnknownText_0x55561: +GoldenrodFlowerShopFloriaWonderIfSisWillLendWaterBottleText: text "When I told my sis" line "about the jiggly" @@ -147,12 +147,12 @@ UnknownText_0x55561: line "bottle…" done -UnknownText_0x555e6: +GoldenrodFlowerShopFloriaYouBeatWhitneyText: text "Wow, you beat" line "WHITNEY? Cool!" done -UnknownText_0x55604: +GoldenrodFlowerShopFloriaItReallyWasAMonText: text "So it really was a" line "#MON!" done diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index b5b578d2b..550e308e4 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -16,22 +16,22 @@ GoldenrodMagnetTrainStationOfficerScript: opentext checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .MagnetTrainToSaffron - writetext UnknownText_0x55160 + writetext GoldenrodMagnetTrainStationOfficerTheTrainHasntComeInText waitbutton closetext end .MagnetTrainToSaffron: - writetext UnknownText_0x551b7 + writetext GoldenrodMagnetTrainStationOfficerAreYouComingAboardText yesorno iffalse .DecidedNotToRide checkitem PASS iffalse .PassNotInBag - writetext UnknownText_0x551ed + writetext GoldenrodMagnetTrainStationOfficerRightThisWayText waitbutton closetext - applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 - applymovement PLAYER, MovementData_0x5514f + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, GoldenrodMagnetTrainStationOfficerApproachTrainDoorMovement + applymovement PLAYER, GoldenrodMagnetTrainStationPlayerApproachAndEnterTrainMovement setval FALSE special MagnetTrain warpcheck @@ -45,23 +45,23 @@ GoldenrodMagnetTrainStationOfficerScript: step_end .PassNotInBag: - writetext UnknownText_0x5522c + writetext GoldenrodMagnetTrainStationOfficerYouDontHaveARailPassText waitbutton closetext end .DecidedNotToRide: - writetext UnknownText_0x5524f + writetext GoldenrodMagnetTrainStationOfficerHopeToSeeYouAgainText waitbutton closetext end Script_ArriveFromSaffron: - applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 - applymovement PLAYER, MovementData_0x55158 - applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x5514b + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, GoldenrodMagnetTrainStationOfficerApproachTrainDoorMovement + applymovement PLAYER, GoldenrodMagnetTrainStationPlayerLeaveTrainAndEnterStationMovement + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, GoldenrodMagnetTrainStationOfficerReturnToBoardingGateMovement opentext - writetext UnknownText_0x5526a + writetext GoldenrodMagnetTrainStationOfficerArrivedInGoldenrodText waitbutton closetext end @@ -69,20 +69,20 @@ Script_ArriveFromSaffron: GoldenrodMagnetTrainStationGentlemanScript: jumptextfaceplayer GoldenrodMagnetTrainStationGentlemanText -MovementData_0x55146: +GoldenrodMagnetTrainStationOfficerApproachTrainDoorMovement: step UP step UP step RIGHT turn_head LEFT step_end -MovementData_0x5514b: +GoldenrodMagnetTrainStationOfficerReturnToBoardingGateMovement: step LEFT step DOWN step DOWN step_end -MovementData_0x5514f: +GoldenrodMagnetTrainStationPlayerApproachAndEnterTrainMovement: step UP step UP step UP @@ -93,7 +93,7 @@ MovementData_0x5514f: step UP step_end -MovementData_0x55158: +GoldenrodMagnetTrainStationPlayerLeaveTrainAndEnterStationMovement: step LEFT step LEFT step DOWN @@ -103,7 +103,7 @@ MovementData_0x55158: turn_head UP step_end -UnknownText_0x55160: +GoldenrodMagnetTrainStationOfficerTheTrainHasntComeInText: text "The train hasn't" line "come in…" @@ -114,7 +114,7 @@ UnknownText_0x55160: para "That won't work." done -UnknownText_0x551b7: +GoldenrodMagnetTrainStationOfficerAreYouComingAboardText: text "We'll soon depart" line "for SAFFRON." @@ -122,7 +122,7 @@ UnknownText_0x551b7: line "aboard?" done -UnknownText_0x551ed: +GoldenrodMagnetTrainStationOfficerRightThisWayText: text "May I see your" line "rail PASS, please?" @@ -130,17 +130,17 @@ UnknownText_0x551ed: line "way, please." done -UnknownText_0x5522c: +GoldenrodMagnetTrainStationOfficerYouDontHaveARailPassText: text "Sorry. You don't" line "have a rail PASS." done -UnknownText_0x5524f: +GoldenrodMagnetTrainStationOfficerHopeToSeeYouAgainText: text "We hope to see you" line "again!" done -UnknownText_0x5526a: +GoldenrodMagnetTrainStationOfficerArrivedInGoldenrodText: text "We have arrived in" line "GOLDENROD." diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index dc77dd57a..da0b1f7fc 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -27,18 +27,18 @@ GoldenrodPokecenter1F_GSBallSceneLeft: disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND - applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x6105a + applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, GoldenrodPokeCenter1FLinkReceptionistApproachPlayerAtLeftDoorwayTileMovement turnobject PLAYER, UP opentext - writetext UnknownText_0x622f0 + writetext GoldenrodPokeCenter1FLinkReceptionistPleaseAcceptGSBallText waitbutton verbosegiveitem GS_BALL setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT - writetext UnknownText_0x62359 + writetext GoldenrodPokeCenter1FLinkReceptionistPleaseDoComeAgainText waitbutton closetext - applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x61060 + applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, GoldenrodPokeCenter1FLinkReceptionistWalkToStairsFromLeftDoorwayTileMovement special RestartMapMusic disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playsound SFX_EXIT_BUILDING @@ -59,18 +59,18 @@ GoldenrodPokecenter1F_GSBallSceneRight: disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND - applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x61065 + applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, GoldenrodPokeCenter1FLinkReceptionistApproachPlayerAtRightDoorwayTileMovement turnobject PLAYER, UP opentext - writetext UnknownText_0x622f0 + writetext GoldenrodPokeCenter1FLinkReceptionistPleaseAcceptGSBallText waitbutton verbosegiveitem GS_BALL setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT - writetext UnknownText_0x62359 + writetext GoldenrodPokeCenter1FLinkReceptionistPleaseDoComeAgainText waitbutton closetext - applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x6106c + applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, GoldenrodPokeCenter1FLinkReceptionistWalkToStairsFromRightDoorwayTileMovement special RestartMapMusic disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playsound SFX_EXIT_BUILDING @@ -86,38 +86,38 @@ GoldenrodPokecenter1FLassScript: GoldenrodPokecenter1FPokefanF: faceplayer opentext - writetext UnknownText_0x623fb + writetext GoldenrodPokecenter1FPokefanFDoYouHaveEonMailText waitbutton - writetext UnknownText_0x6248c + writetext GoldenrodPokecenter1FAskGiveAwayAnEonMailText yesorno iffalse .NoEonMail takeitem EON_MAIL iffalse .NoEonMail - writetext UnknownText_0x62549 + writetext GoldenrodPokecenter1FPlayerGaveAwayTheEonMailText waitbutton - writetext UnknownText_0x624a4 + writetext GoldenrodPokecenter1FPokefanFThisIsForYouText waitbutton verbosegiveitem REVIVE iffalse .NoRoom - writetext UnknownText_0x624e9 + writetext GoldenrodPokecenter1FPokefanFDaughterWillBeDelightedText waitbutton closetext end .NoEonMail: - writetext UnknownText_0x62509 + writetext GoldenrodPokecenter1FPokefanFTooBadText waitbutton closetext end .NoRoom: giveitem EON_MAIL - writetext UnknownText_0x6252a + writetext GoldenrodPokecenter1FPokefanFAnotherTimeThenText waitbutton closetext end -MovementData_0x6105a: +GoldenrodPokeCenter1FLinkReceptionistApproachPlayerAtLeftDoorwayTileMovement: step UP step RIGHT step RIGHT @@ -125,14 +125,14 @@ MovementData_0x6105a: turn_head DOWN step_end -MovementData_0x61060: +GoldenrodPokeCenter1FLinkReceptionistWalkToStairsFromLeftDoorwayTileMovement: step LEFT step LEFT step LEFT step DOWN step_end -MovementData_0x61065: +GoldenrodPokeCenter1FLinkReceptionistApproachPlayerAtRightDoorwayTileMovement: step UP step RIGHT step RIGHT @@ -141,7 +141,7 @@ MovementData_0x61065: turn_head DOWN step_end -MovementData_0x6106c: +GoldenrodPokeCenter1FLinkReceptionistWalkToStairsFromRightDoorwayTileMovement: step LEFT step LEFT step LEFT @@ -715,7 +715,7 @@ GoldenrodPokecenter1FLassText: line "the toughest." done -UnknownText_0x622f0: +GoldenrodPokeCenter1FLinkReceptionistPleaseAcceptGSBallText: text "<PLAYER>, isn't it?" para "Congratulations!" @@ -727,7 +727,7 @@ UnknownText_0x622f0: para "Please accept it!" done -UnknownText_0x62359: +GoldenrodPokeCenter1FLinkReceptionistPleaseDoComeAgainText: text "Please do come" line "again!" done @@ -754,7 +754,7 @@ UnknownText_0x623c7: line "operation yet…" done -UnknownText_0x623fb: +GoldenrodPokecenter1FPokefanFDoYouHaveEonMailText: text "Oh my, your pack" line "looks so heavy!" @@ -769,12 +769,12 @@ UnknownText_0x623fb: line "one, can't you?" done -UnknownText_0x6248c: +GoldenrodPokecenter1FAskGiveAwayAnEonMailText: text "Give away an EON" line "MAIL?" done -UnknownText_0x624a4: +GoldenrodPokecenter1FPokefanFThisIsForYouText: text "Oh, that's great!" line "Thank you, honey!" @@ -782,22 +782,22 @@ UnknownText_0x624a4: line "you in return!" done -UnknownText_0x624e9: +GoldenrodPokecenter1FPokefanFDaughterWillBeDelightedText: text "My daughter will" line "be delighted!" done -UnknownText_0x62509: +GoldenrodPokecenter1FPokefanFTooBadText: text "Oh? You don't have" line "one? Too bad." done -UnknownText_0x6252a: +GoldenrodPokecenter1FPokefanFAnotherTimeThenText: text "Oh… Well, another" line "time, then." done -UnknownText_0x62549: +GoldenrodPokecenter1FPlayerGaveAwayTheEonMailText: text "<PLAYER> gave away" line "the EON MAIL." done diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 8cb5ea4f8..75520028c 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -8,8 +8,8 @@ GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_PRICE EQU 300 const GOLDENRODUNDERGROUND_SUPER_NERD4 const GOLDENRODUNDERGROUND_POKE_BALL const GOLDENRODUNDERGROUND_GRAMPS - const GOLDENRODUNDERGROUND_SUPER_NERD5 - const GOLDENRODUNDERGROUND_SUPER_NERD6 + const GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER + const GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER const GOLDENRODUNDERGROUND_GRANNY GoldenrodUnderground_MapScripts: @@ -60,8 +60,8 @@ GoldenrodUnderground_MapScripts: .Sunday: disappear GOLDENRODUNDERGROUND_GRAMPS - disappear GOLDENRODUNDERGROUND_SUPER_NERD5 - appear GOLDENRODUNDERGROUND_SUPER_NERD6 + disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER + appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER appear GOLDENRODUNDERGROUND_GRANNY return @@ -71,43 +71,43 @@ GoldenrodUnderground_MapScripts: iffalse .NotMondayMorning appear GOLDENRODUNDERGROUND_GRAMPS .NotMondayMorning: - disappear GOLDENRODUNDERGROUND_SUPER_NERD5 - disappear GOLDENRODUNDERGROUND_SUPER_NERD6 + disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER + disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_GRANNY return .Tuesday: disappear GOLDENRODUNDERGROUND_GRAMPS - appear GOLDENRODUNDERGROUND_SUPER_NERD5 - disappear GOLDENRODUNDERGROUND_SUPER_NERD6 + appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER + disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_GRANNY return .Wednesday: disappear GOLDENRODUNDERGROUND_GRAMPS - disappear GOLDENRODUNDERGROUND_SUPER_NERD5 - appear GOLDENRODUNDERGROUND_SUPER_NERD6 + disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER + appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_GRANNY return .Thursday: disappear GOLDENRODUNDERGROUND_GRAMPS - appear GOLDENRODUNDERGROUND_SUPER_NERD5 - disappear GOLDENRODUNDERGROUND_SUPER_NERD6 + appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER + disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_GRANNY return .Friday: disappear GOLDENRODUNDERGROUND_GRAMPS - disappear GOLDENRODUNDERGROUND_SUPER_NERD5 - appear GOLDENRODUNDERGROUND_SUPER_NERD6 + disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER + appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_GRANNY return .Saturday: disappear GOLDENRODUNDERGROUND_GRAMPS - appear GOLDENRODUNDERGROUND_SUPER_NERD5 - disappear GOLDENRODUNDERGROUND_SUPER_NERD6 + appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER + disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER appear GOLDENRODUNDERGROUND_GRANNY return @@ -194,12 +194,12 @@ OlderHaircutBrotherScript: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut special PlaceMoneyTopRight - writetext UnknownText_0x7c5f9 + writetext GoldenrodUndergroundOlderHaircutBrotherOfferHaircutText yesorno iffalse .Refused checkmoney YOUR_MONEY, GOLDENRODUNDERGROUND_OLDER_HAIRCUT_PRICE ifequal HAVE_LESS, .NotEnoughMoney - writetext UnknownText_0x7c69a + writetext GoldenrodUndergroundOlderHaircutBrotherAskWhichMonText buttonsound special YoungerHaircutBrother ifequal $0, .Refused @@ -230,7 +230,7 @@ OlderHaircutBrotherScript: .then takemoney YOUR_MONEY, GOLDENRODUNDERGROUND_OLDER_HAIRCUT_PRICE special PlaceMoneyTopRight - writetext UnknownText_0x7c6b8 + writetext GoldenrodUndergroundOlderHaircutBrotherWatchItBecomeBeautifulText waitbutton closetext special FadeOutPalettes @@ -239,7 +239,7 @@ OlderHaircutBrotherScript: special FadeInPalettes special RestartMapMusic opentext - writetext UnknownText_0x7c6d8 + writetext GoldenrodUndergroundOlderHaircutBrotherAllDoneText waitbutton checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue EitherHaircutBrotherScript_SlightlyHappier @@ -248,19 +248,19 @@ OlderHaircutBrotherScript: sjump EitherHaircutBrotherScript_MuchHappier .Refused: - writetext UnknownText_0x7c6ea + writetext GoldenrodUndergroundOlderHaircutBrotherThatsAShameText waitbutton closetext end .NotEnoughMoney: - writetext UnknownText_0x7c709 + writetext GoldenrodUndergroundOlderHaircutBrotherYoullNeedMoreMoneyText waitbutton closetext end .AlreadyGotHaircut: - writetext UnknownText_0x7c72b + writetext GoldenrodUndergroundOlderHaircutBrotherOneHaircutADayText waitbutton closetext end @@ -277,12 +277,12 @@ YoungerHaircutBrotherScript: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut special PlaceMoneyTopRight - writetext UnknownText_0x7c75c + writetext GoldenrodUndergroundYoungerHaircutBrotherOfferHaircutText yesorno iffalse .Refused checkmoney YOUR_MONEY, GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_PRICE ifequal HAVE_LESS, .NotEnoughMoney - writetext UnknownText_0x7c7f1 + writetext GoldenrodUndergroundYoungerHaircutBrotherAskWhichMonText buttonsound special OlderHaircutBrother ifequal $0, .Refused @@ -313,7 +313,7 @@ YoungerHaircutBrotherScript: .then takemoney YOUR_MONEY, GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_PRICE special PlaceMoneyTopRight - writetext UnknownText_0x7c80e + writetext GoldenrodUndergroundYoungerHaircutBrotherIllMakeItLookCoolText waitbutton closetext special FadeOutPalettes @@ -322,7 +322,7 @@ YoungerHaircutBrotherScript: special FadeInPalettes special RestartMapMusic opentext - writetext UnknownText_0x7c82a + writetext GoldenrodUndergroundYoungerHaircutBrotherAllDoneText waitbutton checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue EitherHaircutBrotherScript_SlightlyHappier @@ -331,19 +331,19 @@ YoungerHaircutBrotherScript: sjump EitherHaircutBrotherScript_MuchHappier .Refused: - writetext UnknownText_0x7c842 + writetext GoldenrodUndergroundYoungerHaircutBrotherHowDisappointingText waitbutton closetext end .NotEnoughMoney: - writetext UnknownText_0x7c85b + writetext GoldenrodUndergroundYoungerHaircutBrotherShortOnFundsText waitbutton closetext end .AlreadyGotHaircut: - writetext UnknownText_0x7c87b + writetext GoldenrodUndergroundYoungerHaircutBrotherOneHaircutADayText waitbutton closetext end @@ -375,14 +375,14 @@ BasementDoorScript:: iftrue .Open checkitem BASEMENT_KEY iftrue .Unlock - writetext UnknownText_0x7c5b0 + writetext GoldenrodUndergroundTheDoorsLockedText waitbutton closetext end .Unlock: playsound SFX_TRANSACTION - writetext UnknownText_0x7c5d6 + writetext GoldenrodUndergroundBasementKeyOpenedDoorText waitbutton closetext changeblock 18, 6, $2e ; unlocked door @@ -392,13 +392,13 @@ BasementDoorScript:: end .Open: - writetext UnknownText_0x7c5c3 + writetext GoldenrodUndergroundTheDoorIsOpenText waitbutton closetext end GoldenrodUndergroundScript_ShopClosed: - writetext UnknownText_0x7c904 + writetext GoldenrodUndergroundWeAreNotOpenTodayText waitbutton closetext end @@ -509,20 +509,20 @@ PokemaniacDonaldAfterBattleText: cont "#MON." done -UnknownText_0x7c5b0: +GoldenrodUndergroundTheDoorsLockedText: text "The door's locked…" done -UnknownText_0x7c5c3: +GoldenrodUndergroundTheDoorIsOpenText: text "The door is open." done -UnknownText_0x7c5d6: +GoldenrodUndergroundBasementKeyOpenedDoorText: text "The BASEMENT KEY" line "opened the door." done -UnknownText_0x7c5f9: +GoldenrodUndergroundOlderHaircutBrotherOfferHaircutText: text "Welcome!" para "I run the #MON" @@ -540,37 +540,37 @@ UnknownText_0x7c5f9: line "to do that?" done -UnknownText_0x7c69a: +GoldenrodUndergroundOlderHaircutBrotherAskWhichMonText: text "Which #MON" line "should I work on?" done -UnknownText_0x7c6b8: +GoldenrodUndergroundOlderHaircutBrotherWatchItBecomeBeautifulText: text "OK! Watch it" line "become beautiful!" done -UnknownText_0x7c6d8: +GoldenrodUndergroundOlderHaircutBrotherAllDoneText: text "There! All done!" done -UnknownText_0x7c6ea: +GoldenrodUndergroundOlderHaircutBrotherThatsAShameText: text "Is that right?" line "That's a shame!" done -UnknownText_0x7c709: +GoldenrodUndergroundOlderHaircutBrotherYoullNeedMoreMoneyText: text "You'll need more" line "money than that." done -UnknownText_0x7c72b: +GoldenrodUndergroundOlderHaircutBrotherOneHaircutADayText: text "I do only one" line "haircut a day. I'm" cont "done for today." done -UnknownText_0x7c75c: +GoldenrodUndergroundYoungerHaircutBrotherOfferHaircutText: text "Welcome to the" line "#MON SALON!" @@ -586,32 +586,32 @@ UnknownText_0x7c75c: para "So? How about it?" done -UnknownText_0x7c7f1: +GoldenrodUndergroundYoungerHaircutBrotherAskWhichMonText: text "OK, which #MON" line "should I do?" done -UnknownText_0x7c80e: +GoldenrodUndergroundYoungerHaircutBrotherIllMakeItLookCoolText: text "OK! I'll make it" line "look cool!" done -UnknownText_0x7c82a: +GoldenrodUndergroundYoungerHaircutBrotherAllDoneText: text "There we go!" line "All done!" done -UnknownText_0x7c842: +GoldenrodUndergroundYoungerHaircutBrotherHowDisappointingText: text "No? " line "How disappointing!" done -UnknownText_0x7c85b: +GoldenrodUndergroundYoungerHaircutBrotherShortOnFundsText: text "You're a little" line "short on funds." done -UnknownText_0x7c87b: +GoldenrodUndergroundYoungerHaircutBrotherOneHaircutADayText: text "I can do only one" line "haircut a day." @@ -637,7 +637,7 @@ HaircutBrosText_MuchHappier: line "delighted!" done -UnknownText_0x7c904: +GoldenrodUndergroundWeAreNotOpenTodayText: text "We're not open" line "today." done diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 343f9bb35..f6f698366 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -1,7 +1,7 @@ object_const_def ; object_event constants - const POKEMONFANCLUB_GENTLEMAN + const POKEMONFANCLUB_CHAIRMAN const POKEMONFANCLUB_RECEPTIONIST - const POKEMONFANCLUB_FISHER + const POKEMONFANCLUB_CLEFAIRY_GUY const POKEMONFANCLUB_TEACHER const POKEMONFANCLUB_FAIRY const POKEMONFANCLUB_ODDISH @@ -11,37 +11,37 @@ PokemonFanClub_MapScripts: db 0 ; callbacks -PokemonFanClubPresidentScript: +PokemonFanClubChairmanScript: faceplayer opentext checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT iftrue .HeardSpeech checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL iftrue .HeardSpeechButBagFull - writetext UnknownText_0x191881 + writetext PokemonFanClubChairmanDidYouVisitToHearAboutMyMonText yesorno iffalse .NotListening - writetext UnknownText_0x191911 + writetext PokemonFanClubChairmanRapidashText buttonsound .HeardSpeechButBagFull: - writetext UnknownText_0x191a3d + writetext PokemonFanClubChairmanIWantYouToHaveThisText buttonsound verbosegiveitem RARE_CANDY iffalse .BagFull setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT - writetext UnknownText_0x191a72 + writetext PokemonFanClubChairmanItsARareCandyText waitbutton closetext end .HeardSpeech: - writetext UnknownText_0x191ae0 + writetext PokemonFanClubChairmanMoreTalesToTellText waitbutton closetext end .NotListening: - writetext UnknownText_0x191b38 + writetext PokemonFanClubChairmanHowDisappointingText waitbutton .BagFull: closetext @@ -57,13 +57,13 @@ PokemonFanClubClefairyGuyScript: iftrue .GotLostItem checkevent EVENT_RETURNED_MACHINE_PART iftrue .FoundClefairyDoll - writetext UnknownText_0x191ba0 + writetext PokemonFanClubClefairyGuyClefairyIsSoAdorableText waitbutton closetext end .FoundClefairyDoll: - writetext UnknownText_0x191bff + writetext PokemonFanClubClefairyGuyMakingDoWithADollIFoundText checkevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM iftrue .MetCopycat waitbutton @@ -72,13 +72,13 @@ PokemonFanClubClefairyGuyScript: .MetCopycat: buttonsound - writetext UnknownText_0x191c5a + writetext PokemonFanClubClefairyGuyTakeThisDollBackToGirlText buttonsound waitsfx giveitem LOST_ITEM iffalse .NoRoom disappear POKEMONFANCLUB_FAIRY - writetext UnknownText_0x191d0a + writetext PokemonFanClubPlayerReceivedDollText playsound SFX_KEY_ITEM waitsfx itemnotify @@ -87,13 +87,13 @@ PokemonFanClubClefairyGuyScript: end .GotLostItem: - writetext UnknownText_0x191d1e + writetext PokemonFanClubClefairyGuyGoingToGetARealClefairyText waitbutton closetext end .NoRoom: - writetext UnknownText_0x191d58 + writetext PokemonFanClubClefairyGuyPackIsJammedFullText waitbutton closetext end @@ -102,11 +102,11 @@ PokemonFanClubTeacherScript: jumptextfaceplayer PokemonFanClubTeacherText PokemonFanClubClefairyDollScript: - jumptext ClefairyDollText + jumptext PokemonFanClubClefairyDollText PokemonFanClubBayleefScript: opentext - writetext FanClubBayleefText + writetext PokemonFanClubBayleefText cry BAYLEEF waitbutton closetext @@ -118,7 +118,7 @@ PokemonFanClubListenSign: PokemonFanClubBraggingSign: jumptext PokemonFanClubBraggingSignText -UnknownText_0x191881: +PokemonFanClubChairmanDidYouVisitToHearAboutMyMonText: text "I'm the CHAIRMAN" line "of the #MON FAN" cont "CLUB." @@ -135,7 +135,7 @@ UnknownText_0x191881: cont "#MON?" done -UnknownText_0x191911: +PokemonFanClubChairmanRapidashText: text "Good!" line "Then listen up!" @@ -161,13 +161,13 @@ UnknownText_0x191911: cont "you too long!" done -UnknownText_0x191a3d: +PokemonFanClubChairmanIWantYouToHaveThisText: text "Thanks for hearing" line "me out. I want you" cont "to have this!" done -UnknownText_0x191a72: +PokemonFanClubChairmanItsARareCandyText: text "It's a RARE CANDY" line "that makes #MON" cont "stronger." @@ -179,7 +179,7 @@ UnknownText_0x191a72: line "you can have it." done -UnknownText_0x191ae0: +PokemonFanClubChairmanMoreTalesToTellText: text "Hello, <PLAY_G>!" para "Did you come see" @@ -190,7 +190,7 @@ UnknownText_0x191ae0: line "tales to tell…" done -UnknownText_0x191b38: +PokemonFanClubChairmanHowDisappointingText: text "How disappointing…" para "Come back if you" @@ -203,7 +203,7 @@ PokemonFanClubReceptionistText: cont "comes to #MON…" done -UnknownText_0x191ba0: +PokemonFanClubClefairyGuyClefairyIsSoAdorableText: text "I love the way" line "CLEFAIRY waggles" @@ -214,7 +214,7 @@ UnknownText_0x191ba0: line "It's so adorable!" done -UnknownText_0x191bff: +PokemonFanClubClefairyGuyMakingDoWithADollIFoundText: text "I love CLEFAIRY," line "but I could never" @@ -225,7 +225,7 @@ UnknownText_0x191bff: line "found." done -UnknownText_0x191c5a: +PokemonFanClubClefairyGuyTakeThisDollBackToGirlText: text "Oh, I see now. The" line "girl who lost this" @@ -244,12 +244,12 @@ UnknownText_0x191c5a: line "No worries!" done -UnknownText_0x191d0a: +PokemonFanClubPlayerReceivedDollText: text "<PLAYER> received" line "# DOLL." done -UnknownText_0x191d1e: +PokemonFanClubClefairyGuyGoingToGetARealClefairyText: text "You watch. I'm" line "going to get a" @@ -257,7 +257,7 @@ UnknownText_0x191d1e: line "my friend." done -UnknownText_0x191d58: +PokemonFanClubClefairyGuyPackIsJammedFullText: text "Your PACK is" line "jammed full." done @@ -270,7 +270,7 @@ PokemonFanClubTeacherText: line "head is so cute!" done -ClefairyDollText: +PokemonFanClubClefairyDollText: text "It's a CLEFAIRY!" line "Huh?" @@ -279,7 +279,7 @@ ClefairyDollText: cont "DOLL." done -FanClubBayleefText: +PokemonFanClubBayleefText: text "BAYLEEF: Li liif!" done @@ -308,7 +308,7 @@ PokemonFanClub_MapEvents: bg_event 9, 0, BGEVENT_READ, PokemonFanClubBraggingSign db 6 ; object events - object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubPresidentScript, -1 + object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubChairmanScript, -1 object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubClefairyGuyScript, -1 object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index f5cb0d80c..614688f59 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -4,7 +4,7 @@ const POWERPLANT_GYM_GUY2 const POWERPLANT_OFFICER2 const POWERPLANT_GYM_GUY3 - const POWERPLANT_FISHER + const POWERPLANT_MANAGER const POWERPLANT_FOREST PowerPlant_MapScripts: @@ -25,21 +25,21 @@ PowerPlantGuardPhoneScript: showemote EMOTE_SHOCK, POWERPLANT_OFFICER1, 15 waitsfx pause 30 - applymovement POWERPLANT_OFFICER1, MovementData_0x188ed5 + applymovement POWERPLANT_OFFICER1, PowerPlantOfficer1ApproachGymGuy2Movement turnobject POWERPLANT_GYM_GUY1, DOWN turnobject POWERPLANT_GYM_GUY2, DOWN opentext - writetext UnknownText_0x188f22 + writetext PowerPlantOfficer1CeruleanShadyCharacterText waitbutton closetext turnobject POWERPLANT_OFFICER1, LEFT turnobject PLAYER, RIGHT opentext - writetext UnknownText_0x188f7f + writetext PowerPlantOfficer1CouldIAskForYourCooperationText waitbutton closetext turnobject PLAYER, DOWN - applymovement POWERPLANT_OFFICER1, MovementData_0x188eda + applymovement POWERPLANT_OFFICER1, PowerPlantOfficer1ReturnToPostMovement setscene SCENE_POWERPLANT_NOTHING end @@ -50,19 +50,19 @@ PowerPlantOfficerScript: iftrue .ReturnedMachinePart checkevent EVENT_MET_MANAGER_AT_POWER_PLANT iftrue .MetManager - writetext UnknownText_0x188ee0 + writetext PowerPlantOfficer1AThiefBrokeInText waitbutton closetext end .MetManager: - writetext UnknownText_0x188f7f + writetext PowerPlantOfficer1CouldIAskForYourCooperationText waitbutton closetext end .ReturnedMachinePart: - writetext UnknownText_0x188fa2 + writetext PowerPlantOfficer1HaveToBeefUpSecurityText waitbutton closetext end @@ -72,13 +72,13 @@ PowerPlantGymGuy1Script: opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue .ReturnedMachinePart - writetext UnknownText_0x188fcf + writetext PowerPlantGymGuy1SomeoneStoleAPartText waitbutton closetext end .ReturnedMachinePart: - writetext UnknownText_0x189038 + writetext PowerPlantGymGuy1GeneratorUpAndRunningText waitbutton closetext end @@ -88,29 +88,29 @@ PowerPlantGymGuy2Script: opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue .ReturnedMachinePart - writetext UnknownText_0x189079 + writetext PowerPlantGymGuy2PowerPlantUpAndRunningText waitbutton closetext end .ReturnedMachinePart: - writetext UnknownText_0x1890ef + writetext PowerPlantGymGuy2GeneratorIsRunningAgainText waitbutton closetext end -PowerPlantGymGuy3Script: +PowerPlantOfficer2Script: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue .ReturnedMachinePart - writetext UnknownText_0x18910e + writetext PowerPlantOfficer2ManagerHasBeenSadAndFuriousText waitbutton closetext end .ReturnedMachinePart: - writetext UnknownText_0x18917f + writetext PowerPlantOfficer2ManagerHasBeenCheerfulText waitbutton closetext end @@ -120,13 +120,13 @@ PowerPlantGymGuy4Script: opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue .ReturnedMachinePart - writetext UnknownText_0x1891c2 + writetext PowerPlantGymGuy4MagnetTrainConsumesElectricityText waitbutton closetext end .ReturnedMachinePart: - writetext UnknownText_0x189225 + writetext PowerPlantGymGuy4WeCanGetMagnetTrainRunningText waitbutton closetext end @@ -140,7 +140,7 @@ PowerPlantManager: iftrue .FoundMachinePart checkevent EVENT_MET_MANAGER_AT_POWER_PLANT iftrue .MetManager - writetext UnknownText_0x189264 + writetext PowerPlantManagerWhoWouldRuinMyGeneratorText waitbutton closetext setevent EVENT_MET_MANAGER_AT_POWER_PLANT @@ -151,13 +151,13 @@ PowerPlantManager: end .MetManager: - writetext UnknownText_0x189308 + writetext PowerPlantManagerIWontForgiveCulpritText waitbutton closetext end .FoundMachinePart: - writetext UnknownText_0x18936e + writetext PowerPlantManagerThatsThePartText buttonsound takeitem MACHINE_PART setevent EVENT_RETURNED_MACHINE_PART @@ -169,19 +169,19 @@ PowerPlantManager: .ReturnedMachinePart: checkevent EVENT_GOT_TM07_ZAP_CANNON iftrue .GotZapCannon - writetext UnknownText_0x1893c4 + writetext PowerPlantManagerTakeThisTMText buttonsound verbosegiveitem TM_ZAP_CANNON iffalse .NoRoom setevent EVENT_GOT_TM07_ZAP_CANNON - writetext UnknownText_0x1893f4 + writetext PowerPlantManagerTM07IsZapCannonText waitbutton .NoRoom: closetext end .GotZapCannon: - writetext UnknownText_0x189475 + writetext PowerPlantManagerMyBelovedGeneratorText waitbutton closetext end @@ -197,14 +197,14 @@ Forest: PowerPlantBookshelf: jumpstd difficultbookshelf -MovementData_0x188ed5: +PowerPlantOfficer1ApproachGymGuy2Movement: step RIGHT step RIGHT step UP step UP step_end -MovementData_0x188eda: +PowerPlantOfficer1ReturnToPostMovement: step DOWN step DOWN step LEFT @@ -212,7 +212,7 @@ MovementData_0x188eda: turn_head DOWN step_end -UnknownText_0x188ee0: +PowerPlantOfficer1AThiefBrokeInText: text "A thief broke into" line "the POWER PLANT…" @@ -220,7 +220,7 @@ UnknownText_0x188ee0: line "coming to?" done -UnknownText_0x188f22: +PowerPlantOfficer1CeruleanShadyCharacterText: text "I just got word" line "from CERULEAN." @@ -231,18 +231,18 @@ UnknownText_0x188f22: line "around." done -UnknownText_0x188f7f: +PowerPlantOfficer1CouldIAskForYourCooperationText: text "Could I ask for" line "your cooperation?" done -UnknownText_0x188fa2: +PowerPlantOfficer1HaveToBeefUpSecurityText: text "We'll have to beef" line "up our security" cont "presence." done -UnknownText_0x188fcf: +PowerPlantGymGuy1SomeoneStoleAPartText: text "Someone made off" line "with a part that's" @@ -254,7 +254,7 @@ UnknownText_0x188fcf: cont "useless!" done -UnknownText_0x189038: +PowerPlantGymGuy1GeneratorUpAndRunningText: text "The generator's up" line "and running. It's" @@ -262,7 +262,7 @@ UnknownText_0x189038: line "to spare." done -UnknownText_0x189079: +PowerPlantGymGuy2PowerPlantUpAndRunningText: text "This POWER PLANT" line "had been abandoned" cont "in the past." @@ -274,12 +274,12 @@ UnknownText_0x189079: line "the MAGNET TRAIN." done -UnknownText_0x1890ef: +PowerPlantGymGuy2GeneratorIsRunningAgainText: text "The generator's" line "running again!" done -UnknownText_0x18910e: +PowerPlantOfficer2ManagerHasBeenSadAndFuriousText: text "The POWER PLANT's" line "MANAGER is up" cont "ahead." @@ -291,7 +291,7 @@ UnknownText_0x18910e: cont "furious…" done -UnknownText_0x18917f: +PowerPlantOfficer2ManagerHasBeenCheerfulText: text "Since the gener-" line "ator's been fixed," @@ -299,7 +299,7 @@ UnknownText_0x18917f: line "been cheerful." done -UnknownText_0x1891c2: +PowerPlantGymGuy4MagnetTrainConsumesElectricityText: text "The MAGNET TRAIN" line "consumes a lot of" cont "electricity." @@ -309,7 +309,7 @@ UnknownText_0x1891c2: cont "isn't operating." done -UnknownText_0x189225: +PowerPlantGymGuy4WeCanGetMagnetTrainRunningText: text "All right! We can" line "finally get the" @@ -317,7 +317,7 @@ UnknownText_0x189225: line "running again." done -UnknownText_0x189264: +PowerPlantManagerWhoWouldRuinMyGeneratorText: text "MANAGER: I, I, I'm" line "ready to blast" cont "someone!" @@ -335,7 +335,7 @@ UnknownText_0x189264: line "CANNON!" done -UnknownText_0x189308: +PowerPlantManagerIWontForgiveCulpritText: text "MANAGER: I won't" line "forgive him!" @@ -348,7 +348,7 @@ UnknownText_0x189308: para "Gahahahah!" done -UnknownText_0x18936e: +PowerPlantManagerThatsThePartText: text "MANAGER: Ah! Yeah!" para "That's the missing" @@ -357,14 +357,14 @@ UnknownText_0x18936e: cont "You found it?" done -UnknownText_0x1893c4: +PowerPlantManagerTakeThisTMText: text "Wahah! Thanks!" para "Here! Take this TM" line "as a reward!" done -UnknownText_0x1893f4: +PowerPlantManagerTM07IsZapCannonText: text "MANAGER: TM07 is" line "my ZAP CANNON." @@ -378,7 +378,7 @@ UnknownText_0x1893f4: line "packs a wallop!" done -UnknownText_0x189475: +PowerPlantManagerMyBelovedGeneratorText: text "MANAGER: My be-" line "loved generator!" @@ -404,7 +404,7 @@ PowerPlant_MapEvents: object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantOfficerScript, -1 object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy1Script, -1 object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy2Script, -1 - object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy3Script, -1 + object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantOfficer2Script, -1 object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy4Script, -1 object_event 14, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PowerPlantManager, -1 object_event 5, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1 diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 34f76ffb0..22b329ae6 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -1,5 +1,5 @@ object_const_def ; object_event constants - const ROUTE35GOLDENRODGATE_OFFICER + const ROUTE35GOLDENRODGATE_RANDY const ROUTE35GOLDENRODGATE_POKEFAN_F const ROUTE35GOLDENRODGATE_FISHER @@ -17,46 +17,46 @@ RandyScript: iftrue .questcomplete checkevent EVENT_GOT_KENYA iftrue .alreadyhavekenya - writetext UnknownText_0x69ddd + writetext Route35GoldenrodGateRandyAskTakeThisMonToMyFriendText yesorno iffalse .refused - writetext UnknownText_0x69e48 + writetext Route35GoldenrodGateRandyThanksKidText buttonsound waitsfx readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, .partyfull - writetext UnknownText_0x69eb8 + writetext Route35GoldenrodGatePlayerReceivedAMonWithMailText playsound SFX_KEY_ITEM waitsfx givepoke SPEAROW, 10, NO_ITEM, TRUE, GiftSpearowName, GiftSpearowOTName givepokemail GiftSpearowMail setevent EVENT_GOT_KENYA .alreadyhavekenya - writetext UnknownText_0x69ed6 + writetext Route35GoldenrodGateRandyWeirdTreeBlockingRoadText waitbutton closetext end .partyfull - writetext UnknownText_0x69f56 + writetext Route35GoldenrodGateRandyCantCarryAnotherMonText waitbutton closetext end .refused - writetext UnknownText_0x69f74 + writetext Route35GoldenrodGateRandyOhNeverMindThenText waitbutton closetext end .questcomplete - writetext UnknownText_0x69f8b + writetext Route35GoldenrodGateRandySomethingForYourTroubleText buttonsound verbosegiveitem HP_UP iffalse .bagfull setevent EVENT_GOT_HP_UP_FROM_RANDY .gothpup - writetext UnknownText_0x69fd9 + writetext Route35GoldenrodGateRandyMyPalWasSnoozingRightText waitbutton .bagfull closetext @@ -94,7 +94,7 @@ Route35GoldenrodGatePokefanFScript: Route35GoldenrodGateFisherScript: jumptextfaceplayer Route35GoldenrodGateFisherText -UnknownText_0x69ddd: +Route35GoldenrodGateRandyAskTakeThisMonToMyFriendText: text "Excuse me, kid!" line "Can you do a guy" cont "a favor?" @@ -106,7 +106,7 @@ UnknownText_0x69ddd: para "He's on ROUTE 31." done -UnknownText_0x69e48: +Route35GoldenrodGateRandyThanksKidText: text "You will? Perfect!" line "Thanks, kid!" @@ -118,12 +118,12 @@ UnknownText_0x69e48: line "him right away!" done -UnknownText_0x69eb8: +Route35GoldenrodGatePlayerReceivedAMonWithMailText: text "<PLAYER> received a" line "#MON with MAIL." done -UnknownText_0x69ed6: +Route35GoldenrodGateRandyWeirdTreeBlockingRoadText: text "You can read it," line "but don't lose it!" cont "ROUTE 31!" @@ -136,17 +136,17 @@ UnknownText_0x69ed6: line "been cleared?" done -UnknownText_0x69f56: +Route35GoldenrodGateRandyCantCarryAnotherMonText: text "You can't carry" line "another #MON…" done -UnknownText_0x69f74: +Route35GoldenrodGateRandyOhNeverMindThenText: text "Oh… Never mind," line "then…" done -UnknownText_0x69f8b: +Route35GoldenrodGateRandySomethingForYourTroubleText: text "Thanks, kid! You" line "made the delivery" cont "for me!" @@ -155,7 +155,7 @@ UnknownText_0x69f8b: line "for your trouble!" done -UnknownText_0x69fd9: +Route35GoldenrodGateRandyMyPalWasSnoozingRightText: text "My pal was snooz-" line "ing, right? Heh," cont "what'd I say?" diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index ccefa7d07..72dff39e5 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -18,22 +18,22 @@ SaffronMagnetTrainStationOfficerScript: opentext checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .MagnetTrainToGoldenrod - writetext UnknownText_0x18a8a9 + writetext SaffronMagnetTrainStationOfficerTrainIsntOperatingText waitbutton closetext end .MagnetTrainToGoldenrod: - writetext UnknownText_0x18a8dd + writetext SaffronMagnetTrainStationOfficerAreYouComingOnBoardText yesorno iffalse .DecidedNotToRide checkitem PASS iffalse .PassNotInBag - writetext UnknownText_0x18a917 + writetext SaffronMagnetTrainStationOfficerRightThisWayText waitbutton closetext - applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f - applymovement PLAYER, MovementData_0x18a898 + applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, SaffronMagnetTrainStationOfficerApproachTrainDoorMovement + applymovement PLAYER, SaffronMagnetTrainStationPlayerApproachAndEnterTrainMovement setval TRUE special MagnetTrain warpcheck @@ -47,23 +47,23 @@ SaffronMagnetTrainStationOfficerScript: step_end .PassNotInBag: - writetext UnknownText_0x18a956 + writetext SaffronMagnetTrainStationOfficerYouDontHaveAPassText waitbutton closetext end .DecidedNotToRide: - writetext UnknownText_0x18a978 + writetext SaffronMagnetTrainStationOfficerHopeToSeeYouAgainText waitbutton closetext end Script_ArriveFromGoldenrod: - applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f - applymovement PLAYER, MovementData_0x18a8a1 - applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a894 + applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, SaffronMagnetTrainStationOfficerApproachTrainDoorMovement + applymovement PLAYER, SaffronMagnetTrainStationPlayerLeaveTrainAndEnterStationMovement + applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, SaffronMagnetTrainStationOfficerReturnToBoardingGateMovement opentext - writetext UnknownText_0x18a993 + writetext SaffronMagnetTrainStationOfficerArrivedInSaffronText waitbutton closetext end @@ -90,20 +90,20 @@ SaffronMagnetTrainStationTeacherScript: SaffronMagnetTrainStationLassScript: jumptextfaceplayer SaffronMagnetTrainStationLassText -MovementData_0x18a88f: +SaffronMagnetTrainStationOfficerApproachTrainDoorMovement: step UP step UP step RIGHT turn_head LEFT step_end -MovementData_0x18a894: +SaffronMagnetTrainStationOfficerReturnToBoardingGateMovement: step LEFT step DOWN step DOWN step_end -MovementData_0x18a898: +SaffronMagnetTrainStationPlayerApproachAndEnterTrainMovement: step UP step UP step UP @@ -114,7 +114,7 @@ MovementData_0x18a898: step UP step_end -MovementData_0x18a8a1: +SaffronMagnetTrainStationPlayerLeaveTrainAndEnterStationMovement: step LEFT step LEFT step DOWN @@ -124,13 +124,13 @@ MovementData_0x18a8a1: turn_head UP step_end -UnknownText_0x18a8a9: +SaffronMagnetTrainStationOfficerTrainIsntOperatingText: text "I'm sorry, but the" line "MAGNET TRAIN isn't" cont "operating now." done -UnknownText_0x18a8dd: +SaffronMagnetTrainStationOfficerAreYouComingOnBoardText: text "We'll soon depart" line "for GOLDENROD." @@ -138,7 +138,7 @@ UnknownText_0x18a8dd: line "board?" done -UnknownText_0x18a917: +SaffronMagnetTrainStationOfficerRightThisWayText: text "May I see your" line "rail PASS, please?" @@ -146,17 +146,17 @@ UnknownText_0x18a917: line "way, please." done -UnknownText_0x18a956: +SaffronMagnetTrainStationOfficerYouDontHaveAPassText: text "Sorry, but you" line "don't have a PASS." done -UnknownText_0x18a978: +SaffronMagnetTrainStationOfficerHopeToSeeYouAgainText: text "We hope to see you" line "again." done -UnknownText_0x18a993: +SaffronMagnetTrainStationOfficerArrivedInSaffronText: text "We have arrived in" line "SAFFRON." |