Merge branch 'master' into audio-macros

engine/battle/ai/items.asm

@@ -687,7 +687,7 @@ AI_Switch:
 	pop af
 
 	jr c, .skiptext
-	ld hl, TextJump_EnemyWithdrew
+	ld hl, EnemyWithdrewText
 	call PrintText
 
 .skiptext
@@ -707,8 +707,8 @@ AI_Switch:
 	scf
 	ret
 
-TextJump_EnemyWithdrew:
-	text_far Text_EnemyWithdrew
+EnemyWithdrewText:
+	text_far _EnemyWithdrewText
 	text_end
 
 Function384d5: ; This appears to be unused
@@ -725,10 +725,14 @@ AI_HealStatus:
 	xor a
 	ld [hl], a
 	ld [wEnemyMonStatus], a
-	; Bug: this should reset SUBSTATUS_NIGHTMARE too
-	; Uncomment the lines below to fix
+	; Bug: this should reset SUBSTATUS_NIGHTMARE
+	; Uncomment the 2 lines below to fix
 	; ld hl, wEnemySubStatus1
 	; res SUBSTATUS_NIGHTMARE, [hl]
+	; Bug: this should reset SUBSTATUS_CONFUSED
+	; Uncomment the 2 lines below to fix
+	; ld hl, wEnemySubStatus3
+	; res SUBSTATUS_CONFUSED, [hl]
 	ld hl, wEnemySubStatus5
 	res SUBSTATUS_TOXIC, [hl]
 	ret
@@ -824,9 +828,9 @@ PrintText_UsedItemOn:
 	ld de, wMonOrItemNameBuffer
 	ld bc, ITEM_NAME_LENGTH
 	call CopyBytes
-	ld hl, TextJump_EnemyUsedOn
+	ld hl, EnemyUsedOnText
 	jp PrintText
 
-TextJump_EnemyUsedOn:
-	text_far Text_EnemyUsedOn
+EnemyUsedOnText:
+	text_far _EnemyUsedOnText
 	text_end

engine/battle/core.asm

@@ -6758,12 +6758,12 @@ BadgeStatBoosts:
 ; depending on which badges have been obtained.
 
 ; Every other badge boosts a stat, starting from the first.
+; GlacierBadge also boosts Special Defense, although the relevant code is buggy (see below).
 
 ; 	ZephyrBadge:  Attack
 ; 	PlainBadge:   Speed
 ; 	MineralBadge: Defense
-; 	GlacierBadge: Special Attack
-; 	RisingBadge:  Special Defense
+; 	GlacierBadge: Special Attack and Special Defense
 
 ; The boosted stats are in order, except PlainBadge and MineralBadge's boosts are swapped.
 
@@ -6806,7 +6806,9 @@ BadgeStatBoosts:
 	srl b
 	dec c
 	jr nz, .CheckBadge
-; And the last one (RisingBadge) too.
+; Check GlacierBadge again for Special Defense.
+; This check is buggy because it assumes that a is set by the "ld a, b" in the above loop,
+; but it can actually be overwritten by the call to BoostStat.
 	srl a
 	call c, BoostStat
 	ret
@@ -7405,20 +7407,20 @@ BoostExp:
 Text_MonGainedExpPoint:
 	text_far Text_Gained
 	text_asm
-	ld hl, TextJump_StringBuffer2ExpPoints
+	ld hl, ExpPointsText
 	ld a, [wStringBuffer2 + 2] ; IsTradedMon
 	and a
 	ret z
 
-	ld hl, TextJump_ABoostedStringBuffer2ExpPoints
+	ld hl, BoostedExpPointsText
 	ret
 
-TextJump_ABoostedStringBuffer2ExpPoints:
-	text_far Text_ABoostedStringBuffer2ExpPoints
+BoostedExpPointsText:
+	text_far _BoostedExpPointsText
 	text_end
 
-TextJump_StringBuffer2ExpPoints:
-	text_far Text_StringBuffer2ExpPoints
+ExpPointsText:
+	text_far _ExpPointsText
 	text_end
 
 AnimateExpBar:
@@ -7687,11 +7689,11 @@ JumpText_YourFoesWeakGetmMon:
 	text_far Text_YourFoesWeakGetmMon
 	text_asm
 Function_TextJump_BattleMonNick01:
-	ld hl, TextJump_BattleMonNick01
+	ld hl, BattleMonNicknameText
 	ret
 
-TextJump_BattleMonNick01:
-	text_far Text_BattleMonNick01
+BattleMonNicknameText:
+	text_far _BattleMonNicknameText
 	text_end
 
 WithdrawMonText:
@@ -7734,40 +7736,40 @@ WithdrawMonText:
 	pop bc
 	pop de
 	ldh a, [hQuotient + 3]
-	ld hl, TextJump_ThatsEnoughComeBack
+	ld hl, ThatsEnoughComeBackText
 	and a
 	ret z
 
-	ld hl, TextJump_ComeBack
+	ld hl, ComeBackText
 	cp 30
 	ret c
 
-	ld hl, TextJump_OKComeBack
+	ld hl, OKComeBackText
 	cp 70
 	ret c
 
-	ld hl, TextJump_GoodComeBack
+	ld hl, GoodComeBackText
 	ret
 
-TextJump_ThatsEnoughComeBack:
-	text_far Text_ThatsEnoughComeBack
+ThatsEnoughComeBackText:
+	text_far _ThatsEnoughComeBackText
 	text_end
 
-TextJump_OKComeBack:
-	text_far Text_OKComeBack
+OKComeBackText:
+	text_far _OKComeBackText
 	text_end
 
-TextJump_GoodComeBack:
-	text_far Text_GoodComeBack
+GoodComeBackText:
+	text_far _GoodComeBackText
 	text_end
 
 Unreferenced_TextJump_ComeBack:
 ; this function doesn't seem to be used
-	ld hl, TextJump_ComeBack
+	ld hl, ComeBackText
 	ret
 
-TextJump_ComeBack:
-	text_far Text_ComeBack
+ComeBackText:
+	text_far _ComeBackText
 	text_end
 
 Unreferenced_HandleSafariAngerEatingStatus:

engine/battle/effect_commands.asm

@@ -4546,21 +4546,21 @@ BattleCommand_StatUpMessage:
 	jp BattleTextbox
 
 .stat
-	text_far UnknownText_0x1c0cc6
+	text_far Text_BattleEffectActivate
 	text_asm
-	ld hl, .up
+	ld hl, .BattleStatWentUpText
 	ld a, [wLoweredStat]
 	and $f0
 	ret z
-	ld hl, .wayup
+	ld hl, .BattleStatWentWayUpText
 	ret
 
-.wayup
-	text_far UnknownText_0x1c0cd0
+.BattleStatWentWayUpText:
+	text_far _BattleStatWentWayUpText
 	text_end
 
-.up
-	text_far UnknownText_0x1c0ce0
+.BattleStatWentUpText:
+	text_far _BattleStatWentUpText
 	text_end
 
 BattleCommand_StatDownMessage:
@@ -4576,21 +4576,21 @@ BattleCommand_StatDownMessage:
 	jp BattleTextbox
 
 .stat
-	text_far UnknownText_0x1c0ceb
+	text_far Text_BattleFoeEffectActivate
 	text_asm
-	ld hl, .fell
+	ld hl, .BattleStatFellText
 	ld a, [wLoweredStat]
 	and $f0
 	ret z
-	ld hl, .sharplyfell
+	ld hl, .BattleStatSharplyFellText
 	ret
 
-.sharplyfell
-	text_far UnknownText_0x1c0cf5
+.BattleStatSharplyFellText:
+	text_far _BattleStatSharplyFellText
 	text_end
 
-.fell
-	text_far UnknownText_0x1c0d06
+.BattleStatFellText:
+	text_far _BattleStatFellText
 	text_end
 
 TryLowerStat:
@@ -5641,64 +5641,58 @@ BattleCommand_Charge:
 	jp EndMoveEffect
 
 .UsedText:
-	text_far UnknownText_0x1c0d0e ; "<USER>"
+	text_far Text_BattleUser ; "<USER>"
 	text_asm
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
 	cp RAZOR_WIND
-	ld hl, .RazorWind
+	ld hl, .BattleMadeWhirlwindText
 	jr z, .done
 
 	cp SOLARBEAM
-	ld hl, .Solarbeam
+	ld hl, .BattleTookSunlightText
 	jr z, .done
 
 	cp SKULL_BASH
-	ld hl, .SkullBash
+	ld hl, .BattleLoweredHeadText
 	jr z, .done
 
 	cp SKY_ATTACK
-	ld hl, .SkyAttack
+	ld hl, .BattleGlowingText
 	jr z, .done
 
 	cp FLY
-	ld hl, .Fly
+	ld hl, .BattleFlewText
 	jr z, .done
 
 	cp DIG
-	ld hl, .Dig
+	ld hl, .BattleDugText
 
 .done
 	ret
 
-.RazorWind:
-; 'made a whirlwind!'
-	text_far UnknownText_0x1c0d12
+.BattleMadeWhirlwindText:
+	text_far _BattleMadeWhirlwindText
 	text_end
 
-.Solarbeam:
-; 'took in sunlight!'
-	text_far UnknownText_0x1c0d26
+.BattleTookSunlightText:
+	text_far _BattleTookSunlightText
 	text_end
 
-.SkullBash:
-; 'lowered its head!'
-	text_far UnknownText_0x1c0d3a
+.BattleLoweredHeadText:
+	text_far _BattleLoweredHeadText
 	text_end
 
-.SkyAttack:
-; 'is glowing!'
-	text_far UnknownText_0x1c0d4e
+.BattleGlowingText:
+	text_far _BattleGlowingText
 	text_end
 
-.Fly:
-; 'flew up high!'
-	text_far UnknownText_0x1c0d5c
+.BattleFlewText:
+	text_far _BattleFlewText
 	text_end
 
-.Dig:
-; 'dug a hole!'
-	text_far UnknownText_0x1c0d6c
+.BattleDugText:
+	text_far _BattleDugText
 	text_end
 
 BattleCommand3c:

engine/battle/move_effects/mimic.asm

@@ -43,7 +43,7 @@ BattleCommand_Mimic:
 	ld [hl], 5
 	call GetMoveName
 	call AnimateCurrentMove
-	ld hl, LearnedMoveText
+	ld hl, MimicLearnedMoveText
 	jp StdBattleTextbox
 
 .fail

engine/events/battle_tower/get_trainer_class.asm

@@ -21,7 +21,7 @@ GetMobileOTTrainerClass: ; mobile function
 
 .skip_male_trainers
 	ld a, [de]
-	cp $1
+	cp FEMALE
 	ld hl, MaleTrainers
 	jr nz, .finished
 

engine/events/battle_tower/rules.asm

@@ -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
 

engine/events/buena.asm

@@ -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:

engine/events/bug_contest/caught_mon.asm

@@ -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

engine/events/bug_contest/contest.asm

@@ -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

engine/events/bug_contest/display_stats.asm

@@ -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:

engine/events/bug_contest/judging.asm

@@ -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:

engine/events/daycare.asm

@@ -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_FROM_DAY_CARE_LADY
+	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
 

engine/events/diploma.asm

@@ -86,3 +86,5 @@ INCBIN "gfx/diploma/page1.tilemap"
 
 DiplomaPage2Tilemap:
 INCBIN "gfx/diploma/page2.tilemap"
+
+	ret ; unused

engine/events/elevator.asm

@@ -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:

engine/events/fish.asm

@@ -1,7 +1,7 @@
 Fish:
 ; Using a fishing rod.
 ; Fish for monsters with rod e in encounter group d.
-; Return monster e at level d.
+; Return monster d at level e.
 
 	push af
 	push bc
@@ -23,7 +23,7 @@ endr
 
 .Fish:
 ; Fish for monsters with rod b from encounter data in FishGroup at hl.
-; Return monster e at level d.
+; Return monster d at level e.
 
 	call Random
 	cp [hl]

engine/events/fruit_trees.asm

@@ -4,7 +4,7 @@ FruitTreeScript::
 	readmem wCurFruit
 	getitemname STRING_BUFFER_3, USE_SCRIPT_VAR
 	writetext FruitBearingTreeText
-	buttonsound
+	promptbutton
 	callasm TryResetFruitTrees
 	callasm CheckFruitTree
 	iffalse .fruit
@@ -17,7 +17,7 @@ FruitTreeScript::
 	readmem wCurFruit
 	giveitem ITEM_FROM_MEM
 	iffalse .packisfull
-	buttonsound
+	promptbutton
 	writetext ObtainedFruitText
 	callasm PickedFruitTree
 	specialsound
@@ -25,7 +25,7 @@ FruitTreeScript::
 	sjump .end
 
 .packisfull
-	buttonsound
+	promptbutton
 	writetext FruitPackIsFullText
 	waitbutton
 

engine/events/halloffame.asm

@@ -449,7 +449,7 @@ DisplayHOFMon:
 	ld bc, MON_NAME_LENGTH - 1
 	call CopyBytes
 	ld a, "@"
-	ld [wStringBuffer2 + 10], a
+	ld [wStringBuffer2 + MON_NAME_LENGTH - 1], a
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, " "

engine/events/itemfinder.asm

@@ -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

engine/events/kurt.asm

@@ -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