#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
This commit is contained in:
mid-kid
2019-10-20 22:24:17 +00:00
committed by Rangi
parent 3fc2ba41f7
commit e3e0bcd653
203 changed files with 4077 additions and 4598 deletions

View File

@@ -16,13 +16,12 @@ CheckForMobileBattleRules:
dw BattleTower_CheckPartyHasThreeMonsThatAreNotEggs
.TextPointers:
dw .ExcuseMeText
dw .BTExcuseMeText
dw NeedAtLeastThreeMonText
dw EggDoesNotQualifyText
.ExcuseMeText:
; Excuse me!
text_far UnknownText_0x1c5937
.BTExcuseMeText:
text_far _BTExcuseMeText
text_end
_CheckForBattleTowerRules:
@@ -49,54 +48,46 @@ _CheckForBattleTowerRules:
dw Function_HasPartyAnEgg
.TextPointers:
dw JumpText_ExcuseMeYoureNotReady
dw ExcuseMeYoureNotReadyText
dw OnlyThreeMonMayBeEnteredText
dw TheMonMustAllBeDifferentKindsText
dw TheMonMustNotHoldTheSameItemsText
dw YouCantTakeAnEggText
JumpText_ExcuseMeYoureNotReady:
; Excuse me. You're not ready.
text_far Text_ExcuseMeYoureNotReady
ExcuseMeYoureNotReadyText:
text_far _ExcuseMeYoureNotReadyText
text_end
BattleTower_PleaseReturnWhenReady:
ld hl, .PleaseReturnWhenReady
ld hl, .BattleTowerReturnWhenReadyText
call PrintText
ret
.PleaseReturnWhenReady:
; Please return when you're ready.
text_far UnknownText_0x1c5962
.BattleTowerReturnWhenReadyText:
text_far _BattleTowerReturnWhenReadyText
text_end
NeedAtLeastThreeMonText:
; You need at least three #MON.
text_far _NeedAtLeastThreeMonText
text_end
EggDoesNotQualifyText:
; Sorry, an EGG doesn't qualify.
text_far _EggDoesNotQualifyText
text_end
OnlyThreeMonMayBeEnteredText:
; Only three #MON may be entered.
text_far _OnlyThreeMonMayBeEnteredText
text_end
TheMonMustAllBeDifferentKindsText:
; The @ #MON must all be different kinds.
text_far _TheMonMustAllBeDifferentKindsText
text_end
TheMonMustNotHoldTheSameItemsText:
; The @ #MON must not hold the same items.
text_far _TheMonMustNotHoldTheSameItemsText
text_end
YouCantTakeAnEggText:
; You can't take an EGG!
text_far _YouCantTakeAnEggText
text_end

File diff suppressed because it is too large Load Diff

View File

@@ -70,12 +70,12 @@ BuenaPrize:
ld [wMenuSelection], a
call Buena_PlacePrizeMenuBox
call Buena_DisplayBlueCardBalance
ld hl, .Text_AskWhichPrize
ld hl, .BuenaAskWhichPrizeText
call PrintText
jr .okay
.loop
ld hl, .Text_AskWhichPrize
ld hl, .BuenaAskWhichPrizeText
call BuenaPrintText
.okay
@@ -89,7 +89,7 @@ BuenaPrize:
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
call GetItemName
ld hl, .Text_IsThatRight
ld hl, .BuenaIsThatRightText
call BuenaPrintText
call YesNoBox
jr c, .loop
@@ -121,17 +121,17 @@ BuenaPrize:
jr .Purchase
.InsufficientBalance:
ld hl, .Text_NotEnoughPoints
ld hl, .BuenaNotEnoughPointsText
jr .print
.BagFull:
ld hl, .Text_NoRoom
ld hl, .BuenaNoRoomText
jr .print
.Purchase:
ld de, SFX_TRANSACTION
call PlaySFX
ld hl, .Text_HereYouGo
ld hl, .BuenaHereYouGoText
.print
call BuenaPrintText
@@ -140,40 +140,34 @@ BuenaPrize:
.done
call CloseWindow
call CloseWindow
ld hl, .Text_PleaseComeBackAgain
ld hl, .BuenaComeAgainText
call PrintText
call JoyWaitAorB
call PlayClickSFX
ret
.Text_AskWhichPrize:
; Which prize would you like?
text_far UnknownText_0x1c589f
.BuenaAskWhichPrizeText:
text_far _BuenaAskWhichPrizeText
text_end
.Text_IsThatRight:
; ? Is that right?
text_far UnknownText_0x1c58bc
.BuenaIsThatRightText:
text_far _BuenaIsThatRightText
text_end
.Text_HereYouGo:
; Here you go!
text_far UnknownText_0x1c58d1
.BuenaHereYouGoText:
text_far _BuenaHereYouGoText
text_end
.Text_NotEnoughPoints:
; You don't have enough points.
text_far UnknownText_0x1c58e0
.BuenaNotEnoughPointsText:
text_far _BuenaNotEnoughPointsText
text_end
.Text_NoRoom:
; You have no room for it.
text_far UnknownText_0x1c58ff
.BuenaNoRoomText:
text_far _BuenaNoRoomText
text_end
.Text_PleaseComeBackAgain:
; Oh. Please come back again!
text_far UnknownText_0x1c591a
.BuenaComeAgainText:
text_far _BuenaComeAgainText
text_end
Buena_DisplayBlueCardBalance:

View File

@@ -14,7 +14,7 @@ BugContest_SetCaughtContestMon:
ld a, [wTempEnemyMonSpecies]
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, .caughttext
ld hl, .ContestCaughtMonText
call PrintText
ret
@@ -32,7 +32,6 @@ BugContest_SetCaughtContestMon:
ld hl, wContestMon
jp GeneratePartyMonStats
.caughttext
; Caught @ !
text_far UnknownText_0x1c10c0
.ContestCaughtMonText:
text_far _ContestCaughtMonText
text_end

View File

@@ -18,26 +18,24 @@ BugCatchingContestBattleScript::
BugCatchingContestOverScript::
playsound SFX_ELEVATOR_END
opentext
writetext BugCatchingContestText_BeeepTimesUp
writetext BugCatchingContestTimeUpText
waitbutton
sjump BugCatchingContestReturnToGateScript
BugCatchingContestOutOfBallsScript:
playsound SFX_ELEVATOR_END
opentext
writetext BugCatchingContestText_ContestIsOver
writetext BugCatchingContestIsOverText
waitbutton
BugCatchingContestReturnToGateScript:
closetext
jumpstd bugcontestresultswarp
BugCatchingContestText_BeeepTimesUp:
; ANNOUNCER: BEEEP! Time's up!
text_far UnknownText_0x1bd2ca
BugCatchingContestTimeUpText:
text_far _BugCatchingContestTimeUpText
text_end
BugCatchingContestText_ContestIsOver:
; ANNOUNCER: The Contest is over!
text_far UnknownText_0x1bd2e7
BugCatchingContestIsOverText:
text_far _BugCatchingContestIsOverText
text_end

View File

@@ -67,7 +67,7 @@ DisplayCaughtContestMonStats:
ld de, wEnemyMonMaxHP
call PrintNum
ld hl, SwitchMonText
ld hl, ContestAskSwitchText
call PrintText
pop af
@@ -86,19 +86,17 @@ DisplayCaughtContestMonStats:
.This:
db " THIS <PKMN> @"
SwitchMonText:
; Switch #MON?
text_far UnknownText_0x1c10cf
ContestAskSwitchText:
text_far _ContestAskSwitchText
text_end
DisplayAlreadyCaughtText:
call GetPokemonName
ld hl, .AlreadyCaughtText
ld hl, .ContestAlreadyCaughtText
jp PrintText
.AlreadyCaughtText:
; You already caught a @ .
text_far UnknownText_0x1c10dd
.ContestAlreadyCaughtText:
text_far _ContestAlreadyCaughtText
text_end
DummyPredef2F:

View File

@@ -7,66 +7,63 @@ _BugContestJudging:
ld a, [wBugContestThirdPlaceMon]
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, BugContest_ThirdPlaceText
ld hl, ContestJudging_ThirdPlaceText
call PrintText
ld a, [wBugContestSecondPlaceWinnerID]
call LoadContestantName
ld a, [wBugContestSecondPlaceMon]
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, BugContest_SecondPlaceText
ld hl, ContestJudging_SecondPlaceText
call PrintText
ld a, [wBugContestFirstPlaceWinnerID]
call LoadContestantName
ld a, [wBugContestFirstPlaceMon]
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, BugContest_FirstPlaceText
ld hl, ContestJudging_FirstPlaceText
call PrintText
jp BugContest_GetPlayersResult
BugContest_FirstPlaceText:
text_far ContestJudging_FirstPlaceText
ContestJudging_FirstPlaceText:
text_far _ContestJudging_FirstPlaceText
text_asm
ld de, SFX_1ST_PLACE
call PlaySFX
call WaitSFX
ld hl, BugContest_FirstPlaceScoreText
ld hl, ContestJudging_FirstPlaceScoreText
ret
BugContest_FirstPlaceScoreText:
; The winning score was @ points!
text_far ContestJudging_FirstPlaceScoreText
ContestJudging_FirstPlaceScoreText:
text_far _ContestJudging_FirstPlaceScoreText
text_end
BugContest_SecondPlaceText:
ContestJudging_SecondPlaceText:
; Placing second was @ , who caught a @ !@ @
text_far ContestJudging_SecondPlaceText
text_far _ContestJudging_SecondPlaceText
text_asm
ld de, SFX_2ND_PLACE
call PlaySFX
call WaitSFX
ld hl, BugContest_SecondPlaceScoreText
ld hl, ContestJudging_SecondPlaceScoreText
ret
BugContest_SecondPlaceScoreText:
; The score was @ points!
text_far ContestJudging_SecondPlaceScoreText
ContestJudging_SecondPlaceScoreText:
text_far _ContestJudging_SecondPlaceScoreText
text_end
BugContest_ThirdPlaceText:
ContestJudging_ThirdPlaceText:
; Placing third was @ , who caught a @ !@ @
text_far ContestJudging_ThirdPlaceText
text_far _ContestJudging_ThirdPlaceText
text_asm
ld de, SFX_3RD_PLACE
call PlaySFX
call WaitSFX
ld hl, BugContest_ThirdPlaceScoreText
ld hl, ContestJudging_ThirdPlaceScoreText
ret
BugContest_ThirdPlaceScoreText:
; The score was @ points!
text_far ContestJudging_ThirdPlaceScoreText
ContestJudging_ThirdPlaceScoreText:
text_far _ContestJudging_ThirdPlaceScoreText
text_end
LoadContestantName:

View File

@@ -166,8 +166,7 @@ DayCareAskDepositPokemon:
scf
ret
.DummyText:
;
.DaycareDummyText:
text_far _DaycareDummyText
text_end
@@ -207,7 +206,7 @@ DayCare_AskWithdrawBreedMon:
jr c, .not_enough_money
ld a, [wPartyCount]
cp PARTY_LENGTH
jr nc, .PartyFull
jr nc, .party_full
and a
ret
@@ -221,7 +220,7 @@ DayCare_AskWithdrawBreedMon:
scf
ret
.PartyFull:
.party_full
ld a, DAYCARETEXT_PARTY_FULL
scf
ret
@@ -274,124 +273,104 @@ PrintDayCareText:
.TextTable:
; entries correspond to DAYCARETEXT_* constants
dw .DayCareManIntro ; 00
dw .DayCareManOddEgg ; 01
dw .DayCareLadyIntro ; 02
dw .DayCareLadyOddEgg ; 03
dw .WhichOne ; 04
dw .OkayIllRaiseYourMon ; 05
dw .CantAcceptEgg ; 06
dw .JustOneMon ; 07
dw .LastHealthyMon ; 08
dw .ComeBackForItLater ; 09
dw .RemoveMail ; 0a
dw .AreWeGeniusesOrWhat ; 0b
dw .AskRetrieveMon ; 0c
dw .PerfectHeresYourMon ; 0d
dw .GotBackMon ; 0e
dw .ImmediatelyWithdrawMon ; 0f
dw .PartyFull ; 10
dw .NotEnoughMoney ; 11
dw .OhFineThen ; 12
dw .ComeAgain ; 13
dw .DayCareManIntroText ; 00
dw .DayCareManOddEggText ; 01
dw .DayCareLadyIntroText ; 02
dw .DayCareLadyOddEggText ; 03
dw .WhatShouldIRaiseText ; 04
dw .IllRaiseYourMonText ; 05
dw .CantAcceptEggText ; 06
dw .OnlyOneMonText ; 07
dw .LastHealthyMonText ; 08
dw .ComeBackLaterText ; 09
dw .RemoveMailText ; 0a
dw .AreWeGeniusesText ; 0b
dw .YourMonHasGrownText ; 0c
dw .PerfectHeresYourMonText ; 0d
dw .GotBackMonText ; 0e
dw .BackAlreadyText ; 0f
dw .HaveNoRoomText ; 10
dw .NotEnoughMoneyText ; 11
dw .OhFineThenText ; 12
dw .ComeAgainText ; 13
.DayCareManIntro:
; I'm the DAY-CARE MAN. Want me to raise a #MON?
.DayCareManIntroText:
text_far _DayCareManIntroText
text_end
.DayCareManOddEgg:
; I'm the DAY-CARE MAN. Do you know about EGGS? I was raising #MON with my wife, you see. We were shocked to find an EGG! How incredible is that? So, want me to raise a #MON?
.DayCareManOddEggText:
text_far _DayCareManOddEggText
text_end
.DayCareLadyIntro:
; I'm the DAY-CARE LADY. Should I raise a #MON for you?
.DayCareLadyIntroText:
text_far _DayCareLadyIntroText
text_end
.DayCareLadyOddEgg:
; I'm the DAY-CARE LADY. Do you know about EGGS? My husband and I were raising some #MON, you see. We were shocked to find an EGG! How incredible could that be? Should I raise a #MON for you?
.DayCareLadyOddEggText:
text_far _DayCareLadyOddEggText
text_end
.WhichOne:
; What should I raise for you?
.WhatShouldIRaiseText:
text_far _WhatShouldIRaiseText
text_end
.JustOneMon:
; Oh? But you have just one #MON.
.OnlyOneMonText:
text_far _OnlyOneMonText
text_end
.CantAcceptEgg:
; Sorry, but I can't accept an EGG.
text_far _CantRaiseEggText
.CantAcceptEggText:
text_far _CantAcceptEggText
text_end
.RemoveMail:
; Remove MAIL before you come see me.
.RemoveMailText:
text_far _RemoveMailText
text_end
.LastHealthyMon:
; If you give me that, what will you battle with?
.LastHealthyMonText:
text_far _LastHealthyMonText
text_end
.OkayIllRaiseYourMon:
; OK. I'll raise your @ .
.IllRaiseYourMonText:
text_far _IllRaiseYourMonText
text_end
.ComeBackForItLater:
; Come back for it later.
.ComeBackLaterText:
text_far _ComeBackLaterText
text_end
.AreWeGeniusesOrWhat:
; Are we geniuses or what? Want to see your @ ?
.AreWeGeniusesText:
text_far _AreWeGeniusesText
text_end
.AskRetrieveMon:
; Your @ has grown a lot. By level, it's grown by @ . If you want your #MON back, it will cost ¥@ .
.YourMonHasGrownText:
text_far _YourMonHasGrownText
text_end
.PerfectHeresYourMon:
; Perfect! Here's your #MON.
.PerfectHeresYourMonText:
text_far _PerfectHeresYourMonText
text_end
.GotBackMon:
; got back @ .
.GotBackMonText:
text_far _GotBackMonText
text_end
.ImmediatelyWithdrawMon:
; Huh? Back already? Your @ needs a little more time with us. If you want your #MON back, it will cost ¥100.
.BackAlreadyText:
text_far _BackAlreadyText
text_end
.PartyFull:
; You have no room for it.
.HaveNoRoomText:
text_far _HaveNoRoomText
text_end
.NotEnoughMoney:
; You don't have enough money.
text_far _DCNotEnoughMoneyText
.NotEnoughMoneyText:
text_far _NotEnoughMoneyText
text_end
.OhFineThen:
; Oh, fine then.
.OhFineThenText:
text_far _OhFineThenText
text_end
.ComeAgain:
; Come again.
.ComeAgainText:
text_far _ComeAgainText
text_end
@@ -399,17 +378,16 @@ DayCareManOutside:
ld hl, wDayCareMan
bit DAYCAREMAN_HAS_EGG_F, [hl]
jr nz, .AskGiveEgg
ld hl, .NotYet
ld hl, .NotYetText
call PrintText
ret
.NotYet:
; Not yet…
.NotYetText:
text_far _NotYetText
text_end
.AskGiveEgg:
ld hl, .IntroText
ld hl, .FoundAnEggText
call PrintText
call YesNoBox
jr c, .Declined
@@ -420,13 +398,13 @@ DayCareManOutside:
ld hl, wDayCareMan
res DAYCAREMAN_HAS_EGG_F, [hl]
call DayCare_InitBreeding
ld hl, .GotEggText
ld hl, .ReceivedEggText
call PrintText
ld de, SFX_GET_EGG
call PlaySFX
ld c, 120
call DelayFrames
ld hl, .TakeGoodCareOfItText
ld hl, .TakeGoodCareOfEggText
jr .Load0
.Declined:
@@ -439,34 +417,29 @@ DayCareManOutside:
ret
.PartyFull:
ld hl, .PartyFullText
ld hl, .NoRoomForEggText
call PrintText
ld a, TRUE
ld [wScriptVar], a
ret
.IntroText:
; Ah, it's you! We were raising your #MON, and my goodness, were we surprised! Your #MON had an EGG! We don't know how it got there, but your #MON had it. You want it?
.FoundAnEggText:
text_far _FoundAnEggText
text_end
.GotEggText:
; received the EGG!
.ReceivedEggText:
text_far _ReceivedEggText
text_end
.TakeGoodCareOfItText:
; Take good care of it.
.TakeGoodCareOfEggText:
text_far _TakeGoodCareOfEggText
text_end
.IllKeepItThanksText:
; Well then, I'll keep it. Thanks!
text_far _RefuseEggText
text_far _IllKeepItThanksText
text_end
.PartyFullText:
; You have no room in your party. Come back later.
.NoRoomForEggText:
text_far _NoRoomForEggText
text_end

View File

@@ -115,7 +115,7 @@ Elevator_GoToFloor:
Elevator_AskWhichFloor:
call LoadStandardMenuHeader
ld hl, Elevator_WhichFloorText
ld hl, AskFloorElevatorText
call PrintText
call Elevator_GetCurrentFloorText
ld hl, Elevator_MenuHeader
@@ -137,9 +137,8 @@ Elevator_AskWhichFloor:
scf
ret
Elevator_WhichFloorText:
; Which floor?
text_far UnknownText_0x1bd2bc
AskFloorElevatorText:
text_far _AskFloorElevatorText
text_end
Elevator_GetCurrentFloorText:

View File

@@ -30,23 +30,21 @@ ItemFinder:
reloadmappart
special UpdateTimePals
callasm .ItemfinderSound
writetext .Text_FoundSomething
writetext .ItemfinderItemNearbyText
closetext
end
.Script_FoundNothing:
reloadmappart
special UpdateTimePals
writetext .Text_FoundNothing
writetext .ItemfinderNopeText
closetext
end
.Text_FoundSomething:
; Yes! ITEMFINDER indicates there's an item nearby.
text_far UnknownText_0x1c0a77
.ItemfinderItemNearbyText:
text_far _ItemfinderItemNearbyText
text_end
.Text_FoundNothing:
; Nope! ITEMFINDER isn't responding.
text_far UnknownText_0x1c0aa9
.ItemfinderNopeText:
text_far _ItemfinderNopeText
text_end

View File

@@ -1,20 +1,18 @@
Kurt_PrintTextWhichApricorn:
ld hl, .Text
ld hl, .WhichApricornText
call PrintText
ret
.Text:
; Which APRICORN should I use?
.WhichApricornText:
text_far _WhichApricornText
text_end
Kurt_PrintTextHowMany:
ld hl, .Text
ld hl, .HowManyShouldIMakeText
call PrintText
ret
.Text:
; How many should I make?
.HowManyShouldIMakeText:
text_far _HowManyShouldIMakeText
text_end

View File

@@ -110,10 +110,10 @@ CheckForLuckyNumberWinners:
ld a, [wCurPartySpecies]
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, .FoundPartymonText
ld hl, .LuckyNumberMatchPartyText
pop af
jr z, .print
ld hl, .FoundBoxmonText
ld hl, .LuckyNumberMatchPCText
.print
jp PrintText
@@ -206,14 +206,12 @@ CheckForLuckyNumberWinners:
dba sBox13
dba sBox14
.FoundPartymonText:
; Congratulations! We have a match with the ID number of @ in your party.
text_far UnknownText_0x1c1261
.LuckyNumberMatchPartyText:
text_far _LuckyNumberMatchPartyText
text_end
.FoundBoxmonText:
; Congratulations! We have a match with the ID number of @ in your PC BOX.
text_far UnknownText_0x1c12ae
.LuckyNumberMatchPCText:
text_far _LuckyNumberMatchPCText
text_end
PrintTodaysLuckyNumber:

View File

@@ -29,7 +29,7 @@ CheckMagikarpLength:
call CalcMagikarpLength
call PrintMagikarpLength
farcall StubbedTrainerRankings_MagikarpLength
ld hl, .MeasureItText
ld hl, .MagikarpGuruMeasureText
call PrintText
; Did we beat the record?
@@ -71,9 +71,8 @@ CheckMagikarpLength:
ld [wScriptVar], a
ret
.MeasureItText:
; Let me measure that MAGIKARP. …Hm, it measures @ .
text_far UnknownText_0x1c1203
.MagikarpGuruMeasureText:
text_far _MagikarpGuruMeasureText
text_end
Magikarp_LoadFeetInchesChars:
@@ -307,11 +306,10 @@ MagikarpHouseSign:
ld a, [wBestMagikarpLengthInches]
ld [wMagikarpLength + 1], a
call PrintMagikarpLength
ld hl, .CurrentRecordtext
ld hl, .KarpGuruRecordText
call PrintText
ret
.CurrentRecordtext:
; "CURRENT RECORD"
text_far UnknownText_0x1c123a
.KarpGuruRecordText:
text_far _KarpGuruRecordText
text_end

View File

@@ -11,7 +11,7 @@ FindItemInBallScript::
iffalse .no_room
disappear LAST_TALKED
opentext
writetext .text_found
writetext .FoundItemText
playsound SFX_ITEM
pause 60
itemnotify
@@ -20,21 +20,19 @@ FindItemInBallScript::
.no_room
opentext
writetext .text_found
writetext .FoundItemText
waitbutton
writetext .text_bag_full
writetext .CantCarryItemText
waitbutton
closetext
end
.text_found
; found @ !
text_far UnknownText_0x1c0a1c
.FoundItemText:
text_far _FoundItemText
text_end
.text_bag_full
; But can't carry any more items.
text_far UnknownText_0x1c0a2c
.CantCarryItemText:
text_far _CantCarryItemText
text_end
.TryReceiveItem:

View File

@@ -1,12 +1,11 @@
RepelWoreOffScript::
opentext
writetext .text
writetext .RepelWoreOffText
waitbutton
closetext
end
.text
; REPEL's effect wore off.
.RepelWoreOffText:
text_far _RepelWoreOffText
text_end
@@ -14,7 +13,7 @@ HiddenItemScript::
opentext
readmem wHiddenItemID
getitemname STRING_BUFFER_3, USE_SCRIPT_VAR
writetext .found_text
writetext .PlayerFoundItemText
giveitem ITEM_FROM_MEM
iffalse .bag_full
callasm SetMemEvent
@@ -24,20 +23,18 @@ HiddenItemScript::
.bag_full
buttonsound
writetext .no_room_text
writetext .ButNoSpaceText
waitbutton
.finish
closetext
end
.found_text
; found @ !
.PlayerFoundItemText:
text_far _PlayerFoundItemText
text_end
.no_room_text
; But has no space left…
.ButNoSpaceText:
text_far _ButNoSpaceText
text_end

View File

@@ -38,8 +38,8 @@ BankOfMom:
dw .StoreMoney
dw .TakeMoney
dw .StopOrStartSavingMoney
dw .AskDST
dw .JustDoWhatYouCan
dw .AskDST
.CheckIfBankInitialized:
ld a, [wMomSavingMoney]
@@ -58,11 +58,11 @@ BankOfMom:
ret
.InitializeBank:
ld hl, UnknownText_0x16649
ld hl, MomLeavingText1
call PrintText
call YesNoBox
jr c, .DontSaveMoney
ld hl, UnknownText_0x1664e
ld hl, MomLeavingText2
call PrintText
ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F)
jr .done_1
@@ -72,14 +72,14 @@ BankOfMom:
.done_1
ld [wMomSavingMoney], a
ld hl, UnknownText_0x16653
ld hl, MomLeavingText3
call PrintText
ld a, $8
ld [wJumptableIndex], a
ret
.IsThisAboutYourMoney:
ld hl, UnknownText_0x16658
ld hl, MomIsThisAboutYourMoneyText
call PrintText
call YesNoBox
jr c, .nope
@@ -95,7 +95,7 @@ BankOfMom:
ret
.AccessBankOfMom:
ld hl, UnknownText_0x1665d
ld hl, MomBankWhatDoYouWantToDoText
call PrintText
call LoadStandardMenuHeader
ld hl, MenuHeader_0x166b5
@@ -131,7 +131,7 @@ BankOfMom:
ret
.StoreMoney:
ld hl, UnknownText_0x16662
ld hl, MomStoreMoneyText
call PrintText
xor a
ld hl, wStringBuffer2
@@ -155,7 +155,7 @@ BankOfMom:
ld de, wMoney
ld bc, wStringBuffer2
farcall CompareMoney
jr c, .DontHaveThatMuchToDeposit
jr c, .InsufficientFundsInWallet
ld hl, wStringBuffer2
ld de, wStringBuffer2 + 3
ld bc, 3
@@ -163,7 +163,7 @@ BankOfMom:
ld bc, wMomsMoney
ld de, wStringBuffer2
farcall GiveMoney
jr c, .CantDepositThatMuch
jr c, .NotEnoughRoomInBank
ld bc, wStringBuffer2 + 3
ld de, wMoney
farcall TakeMoney
@@ -174,18 +174,18 @@ BankOfMom:
ld de, SFX_TRANSACTION
call PlaySFX
call WaitSFX
ld hl, UnknownText_0x1668a
ld hl, MomStoredMoneyText
call PrintText
ld a, $8
jr .done_4
.DontHaveThatMuchToDeposit:
ld hl, UnknownText_0x1667b
.InsufficientFundsInWallet:
ld hl, MomInsufficientFundsInWalletText
call PrintText
ret
.CantDepositThatMuch:
ld hl, UnknownText_0x16680
.NotEnoughRoomInBank:
ld hl, MomNotEnoughRoomInBankText
call PrintText
ret
@@ -197,7 +197,7 @@ BankOfMom:
ret
.TakeMoney:
ld hl, UnknownText_0x16667
ld hl, MomTakeMoneyText
call PrintText
xor a
ld hl, wStringBuffer2
@@ -240,18 +240,18 @@ BankOfMom:
ld de, SFX_TRANSACTION
call PlaySFX
call WaitSFX
ld hl, UnknownText_0x1668f
ld hl, MomTakenMoneyText
call PrintText
ld a, $8
jr .done_5
.InsufficientFundsInBank:
ld hl, UnknownText_0x16671
ld hl, MomHaventSavedThatMuchText
call PrintText
ret
.NotEnoughRoomInWallet:
ld hl, UnknownText_0x16676
ld hl, MomNotEnoughRoomInWalletText
call PrintText
ret
@@ -263,13 +263,13 @@ BankOfMom:
ret
.StopOrStartSavingMoney:
ld hl, UnknownText_0x1666c
ld hl, MomSaveMoneyText
call PrintText
call YesNoBox
jr c, .StopSavingMoney
ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F)
ld [wMomSavingMoney], a
ld hl, UnknownText_0x16685
ld hl, MomStartSavingMoneyText
call PrintText
ld a, $8
ld [wJumptableIndex], a
@@ -282,11 +282,11 @@ BankOfMom:
ld [wJumptableIndex], a
ret
.AskDST:
ld hl, UnknownText_0x16694
.JustDoWhatYouCan:
ld hl, MomJustDoWhatYouCanText
call PrintText
.JustDoWhatYouCan:
.AskDST:
ld hl, wJumptableIndex
set 7, [hl]
ret
@@ -309,13 +309,13 @@ DSTChecks:
.LostBooklet:
call .ClearBox
bccoord 1, 14
ld hl, .Text_AdjustClock
ld hl, .TimesetAskAdjustDSTText
call PlaceHLTextAtBC
call YesNoBox
ret c
call .ClearBox
bccoord 1, 14
ld hl, .Text_LostInstructionBooklet
ld hl, .MomLostGearBookletText
call PlaceHLTextAtBC
ret
@@ -325,7 +325,7 @@ DSTChecks:
ld a, [wDST]
bit 7, a
jr z, .SetDST
ld hl, .Text_IsDSTOver
ld hl, .TimesetAskNotDSTText
call PlaceHLTextAtBC
call YesNoBox
ret c
@@ -335,12 +335,12 @@ DSTChecks:
call .SetClockBack
call .ClearBox
bccoord 1, 14
ld hl, .Text_SetClockBack
ld hl, .TimesetNotDSTText
call PlaceHLTextAtBC
ret
.SetDST:
ld hl, .Text_SwitchToDST
ld hl, .TimesetAskDSTText
call PlaceHLTextAtBC
call YesNoBox
ret c
@@ -350,7 +350,7 @@ DSTChecks:
call .SetClockForward
call .ClearBox
bccoord 1, 14
ld hl, .Text_SetClockForward
ld hl, .TimesetDSTText
call PlaceHLTextAtBC
ret
@@ -389,35 +389,28 @@ DSTChecks:
call ClearBox
ret
.Text_AdjustClock:
; Do you want to adjust your clock for Daylight Saving Time?
text_far UnknownText_0x1c6095
.TimesetAskAdjustDSTText:
text_far _TimesetAskAdjustDSTText
text_end
.Text_LostInstructionBooklet:
; I lost the instruction booklet for the POKéGEAR.
; Come back again in a while.
text_far UnknownText_0x1c60d1
.MomLostGearBookletText:
text_far _MomLostGearBookletText
text_end
.Text_SwitchToDST:
; Do you want to switch to Daylight Saving Time?
text_far UnknownText_0x1c6000
.TimesetAskDSTText:
text_far _TimesetAskDSTText
text_end
.Text_SetClockForward:
; I set the clock forward by one hour.
text_far UnknownText_0x1c6030
.TimesetDSTText:
text_far _TimesetDSTText
text_end
.Text_IsDSTOver:
; Is Daylight Saving Time over?
text_far UnknownText_0x1c6056
.TimesetAskNotDSTText:
text_far _TimesetAskNotDSTText
text_end
.Text_SetClockBack:
; I put the clock back one hour.
text_far UnknownText_0x1c6075
.TimesetNotDSTText:
text_far _TimesetNotDSTText
text_end
Mom_SetUpWithdrawMenu:
@@ -590,84 +583,68 @@ Mom_WithdrawDepositMenuJoypad:
dt 90
dt 9
UnknownText_0x16649:
; Wow, that's a cute #MON. Where did you get it? … So, you're leaving on an adventure… OK! I'll help too. But what can I do for you? I know! I'll save money for you. On a long journey, money's important. Do you want me to save your money?
MomLeavingText1:
text_far _MomLeavingText1
text_end
UnknownText_0x1664e:
; OK, I'll take care of your money.
MomLeavingText2:
text_far _MomLeavingText2
text_end
UnknownText_0x16653:
; Be careful. #MON are your friends. You need to work as a team. Now, go on!
MomLeavingText3:
text_far _MomLeavingText3
text_end
UnknownText_0x16658:
; Hi! Welcome home! You're trying very hard, I see. I've kept your room tidy. Or is this about your money?
text_far _MomVisitingText1
MomIsThisAboutYourMoneyText:
text_far _MomIsThisAboutYourMoneyText
text_end
UnknownText_0x1665d:
; What do you want to do?
text_far _MomVisitingText2
MomBankWhatDoYouWantToDoText:
text_far _MomBankWhatDoYouWantToDoText
text_end
UnknownText_0x16662:
; How much do you want to save?
text_far _MomVisitingText3
MomStoreMoneyText:
text_far _MomStoreMoneyText
text_end
UnknownText_0x16667:
; How much do you want to take?
text_far _MomVisitingText4
MomTakeMoneyText:
text_far _MomTakeMoneyText
text_end
UnknownText_0x1666c:
; Do you want to save some money?
text_far _MomVisitingText5
MomSaveMoneyText:
text_far _MomSaveMoneyText
text_end
UnknownText_0x16671:
; You haven't saved that much.
text_far _MomVisitingText6
MomHaventSavedThatMuchText:
text_far _MomHaventSavedThatMuchText
text_end
UnknownText_0x16676:
; You can't take that much.
text_far _MomVisitingText7
MomNotEnoughRoomInWalletText:
text_far _MomNotEnoughRoomInWalletText
text_end
UnknownText_0x1667b:
; You don't have that much.
text_far _MomVisitingText8
MomInsufficientFundsInWalletText:
text_far _MomInsufficientFundsInWalletText
text_end
UnknownText_0x16680:
; You can't save that much.
text_far _MomVisitingText9
MomNotEnoughRoomInBankText:
text_far _MomNotEnoughRoomInBankText
text_end
UnknownText_0x16685:
; OK, I'll save your money. Trust me! , stick with it!
text_far _MomVisitingText10
MomStartSavingMoneyText:
text_far _MomStartSavingMoneyText
text_end
UnknownText_0x1668a:
; Your money's safe here! Get going!
text_far _MomVisitingText11
MomStoredMoneyText:
text_far _MomStoredMoneyText
text_end
UnknownText_0x1668f:
; , don't give up!
text_far _MomVisitingText12
MomTakenMoneyText:
text_far _MomTakenMoneyText
text_end
UnknownText_0x16694:
; Just do what you can.
text_far _MomVisitingText13
MomJustDoWhatYouCanText:
text_far _MomJustDoWhatYouCanText
text_end
Mom_SavedString:

View File

@@ -163,17 +163,17 @@ Mom_GetScriptPointer:
ret
.ItemScript:
writetext _MomText_HiHowAreYou
writetext _MomText_FoundAnItem
writetext _MomText_BoughtWithYourMoney
writetext _MomText_ItsInPC
writetext MomHiHowAreYouText
writetext MomFoundAnItemText
writetext MomBoughtWithYourMoneyText
writetext MomItsInPCText
end
.DollScript:
writetext _MomText_HiHowAreYou
writetext _MomText_FoundADoll
writetext _MomText_BoughtWithYourMoney
writetext _MomText_ItsInRoom
writetext MomHiHowAreYouText
writetext MomFoundADollText
writetext MomBoughtWithYourMoneyText
writetext MomItsInYourRoomText
end
GetItemFromMom:
@@ -206,34 +206,28 @@ INCLUDE "data/items/mom_phone.asm"
db 0, 0, 0 ; unused
_MomText_HiHowAreYou:
; Hi, ! How are you?
text_far _MomShoppingText1
MomHiHowAreYouText:
text_far _MomHiHowAreYouText
text_end
_MomText_FoundAnItem:
; I found a useful item shopping, so
text_far _MomShoppingText2
MomFoundAnItemText:
text_far _MomFoundAnItemText
text_end
_MomText_BoughtWithYourMoney:
; I bought it with your money. Sorry!
text_far _MomShoppingText3
MomBoughtWithYourMoneyText:
text_far _MomBoughtWithYourMoneyText
text_end
_MomText_ItsInPC:
; It's in your PC. You'll like it!
text_far _MomShoppingText4
MomItsInPCText:
text_far _MomItsInPCText
text_end
_MomText_FoundADoll:
; While shopping today, I saw this adorable doll, so
text_far _MomShoppingText5
MomFoundADollText:
text_far _MomFoundADollText
text_end
_MomText_ItsInRoom:
; It's in your room. You'll love it!
text_far _MomShoppingText6
MomItsInYourRoomText:
text_far _MomItsInYourRoomText
text_end
db 0 ; unused

View File

@@ -1,9 +1,9 @@
MoveDeletion:
ld hl, .IntroText
ld hl, .DeleterIntroText
call PrintText
call YesNoBox
jr c, .declined
ld hl, .AskWhichMonText
ld hl, .DeleterAskWhichMonText
call PrintText
farcall SelectMonFromParty
jr c, .declined
@@ -17,7 +17,7 @@ MoveDeletion:
ld a, [hl]
and a
jr z, .onlyonemove
ld hl, .AskWhichMoveText
ld hl, .DeleterAskWhichMoveText
call PrintText
call LoadStandardMenuHeader
farcall ChooseMoveToDelete
@@ -30,7 +30,7 @@ MoveDeletion:
ld a, [wCurSpecies]
ld [wNamedObjectIndexBuffer], a
call GetMoveName
ld hl, .ConfirmDeleteText
ld hl, .AskDeleteMoveText
call PrintText
call YesNoBox
pop bc
@@ -40,63 +40,55 @@ MoveDeletion:
ld de, SFX_MOVE_DELETED
call PlaySFX
call WaitSFX
ld hl, .MoveDeletedText
ld hl, .DeleterForgotMoveText
call PrintText
ret
.egg
ld hl, .EggText
ld hl, .MailEggText
call PrintText
ret
.declined
ld hl, .DeclinedDeletionText
ld hl, .DeleterNoComeAgainText
call PrintText
ret
.onlyonemove
ld hl, .OnlyOneMoveText
ld hl, .MoveKnowsOneText
call PrintText
ret
.OnlyOneMoveText:
; That #MON knows only one move.
text_far UnknownText_0x1c5eba
.MoveKnowsOneText:
text_far _MoveKnowsOneText
text_end
.ConfirmDeleteText:
; Oh, make it forget @ ?
text_far UnknownText_0x1c5eda
.AskDeleteMoveText:
text_far _AskDeleteMoveText
text_end
.MoveDeletedText:
; Done! Your #MON forgot the move.
text_far UnknownText_0x1c5ef5
.DeleterForgotMoveText:
text_far _DeleterForgotMoveText
text_end
.EggText:
; An EGG doesn't know any moves!
text_far UnknownText_0x1c5f17
.MailEggText:
text_far _DeleterEggText
text_end
.DeclinedDeletionText:
; No? Come visit me again.
text_far UnknownText_0x1c5f36
.DeleterNoComeAgainText:
text_far _DeleterNoComeAgainText
text_end
.AskWhichMoveText:
; Which move should it forget, then?
text_far UnknownText_0x1c5f50
.DeleterAskWhichMoveText:
text_far _DeleterAskWhichMoveText
text_end
.IntroText:
; Um… Oh, yes, I'm the MOVE DELETER. I can make #MON forget moves. Shall I make a #MON forget?
text_far UnknownText_0x1c5f74
.DeleterIntroText:
text_far _DeleterIntroText
text_end
.AskWhichMonText:
; Which #MON?
text_far UnknownText_0x1c5fd1
.DeleterAskWhichMonText:
text_far _DeleterAskWhichMonText
text_end
.DeleteMove:

View File

@@ -70,8 +70,8 @@ CheckCanLearnMoveTutorMove:
ld de, SFX_WRONG
call PlaySFX
pop de
ld a, BANK(Text_TMHMNotCompatible)
ld hl, Text_TMHMNotCompatible
ld a, BANK(TMHMNotCompatibleText)
ld hl, TMHMNotCompatibleText
call FarPrintText
jr .didnt_learn

View File

@@ -1,6 +1,6 @@
_NameRater:
; Introduce himself
ld hl, NameRaterIntroText
ld hl, NameRaterHelloText
call PrintText
call YesNoBox
jp c, .cancel
@@ -18,12 +18,12 @@ _NameRater:
call CheckIfMonIsYourOT
jr c, .traded
; This name is good, but we can do better. How about it?
ld hl, NameRaterIsGoodText
ld hl, NameRaterBetterNameText
call PrintText
call YesNoBox
jr c, .cancel
; What name shall I give it then?
ld hl, NameRaterWhichNameText
ld hl, NameRaterWhatNameText
call PrintText
; Load the new nickname into wStringBuffer2
xor a ; PARTYMON
@@ -37,11 +37,11 @@ _NameRater:
farcall _NamingScreen
; If the new name is empty, treat it as unchanged.
call IsNewNameEmpty
ld hl, NameRaterSameAsBeforeText
ld hl, NameRaterSameNameText
jr c, .samename
; If the new name is the same as the old name, treat it as unchanged.
call CompareNewToOld
ld hl, NameRaterSameAsBeforeText
ld hl, NameRaterSameNameText
jr c, .samename
; Copy the new name from wStringBuffer2
ld hl, wPartyMonNicknames
@@ -53,22 +53,22 @@ _NameRater:
ld hl, wStringBuffer2
ld bc, MON_NAME_LENGTH
call CopyBytes
ld hl, NameRaterEvenBetterText
ld hl, NameRaterFinishedText
.samename
push hl
call GetCurNick
ld hl, NameRaterDoneText
ld hl, NameRaterNamedText
call PrintText
pop hl
jr .done
.traded
ld hl, NameRaterTradedText
ld hl, NameRaterPerfectNameText
jr .done
.cancel
ld hl, NameRaterCancelText
ld hl, NameRaterComeAgainText
jr .done
.egg
@@ -178,58 +178,42 @@ GetNicknameLength:
jr nz, .loop
ret
NameRaterIntroText:
; Hello, hello! I'm the NAME RATER.
; I rate the names of #MON.
; Would you like me to rate names?
text_far UnknownText_0x1c0043
NameRaterHelloText:
text_far _NameRaterHelloText
text_end
NameRaterWhichMonText:
; Which #MON's nickname should I rate for you?
text_far UnknownText_0x1c00a0
text_far _NameRaterWhichMonText
text_end
NameRaterIsGoodText:
; Hm… @ … That's a fairly decent name.
; But, how about a slightly better nickname?
; Want me to give it a better name?
text_far UnknownText_0x1c00cd
NameRaterBetterNameText:
text_far _NameRaterBetterNameText
text_end
NameRaterWhichNameText:
; All right. What name should we give it, then?
text_far UnknownText_0x1c0142
NameRaterWhatNameText:
text_far _NameRaterWhatNameText
text_end
NameRaterEvenBetterText:
; That's a better name than before! Well done!
text_far UnknownText_0x1c0171
NameRaterFinishedText:
text_far _NameRaterFinishedText
text_end
NameRaterCancelText:
; OK, then. Come again sometime.
text_far UnknownText_0x1c019e
NameRaterComeAgainText:
text_far _NameRaterComeAgainText
text_end
NameRaterTradedText:
; Hm… @ ? What a great name! It's perfect.
; Treat @ with loving care.
text_far UnknownText_0x1c01be
NameRaterPerfectNameText:
text_far _NameRaterPerfectNameText
text_end
NameRaterEggText:
; Whoa… That's just an EGG.
text_far UnknownText_0x1c0208
text_far _NameRaterEggText
text_end
NameRaterSameAsBeforeText:
; It might look the different as before,
; but this new name is much better! Well done!
text_far UnknownText_0x1c0222
NameRaterSameNameText:
text_far _NameRaterSameNameText
text_end
NameRaterDoneText:
; All right. This #MON is now named @ .
text_far UnknownText_0x1c0272
NameRaterNamedText:
text_far _NameRaterNamedText
text_end

Some files were not shown because too many files have changed in this diff Show More