diff options
Diffstat (limited to 'engine')
143 files changed, 3468 insertions, 4009 deletions
diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm index b7a6de644..a7443d165 100644 --- a/engine/battle/ai/items.asm +++ b/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 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 38abbb51f..4e62a4a91 100644 --- a/engine/battle/core.asm +++ b/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: diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index eefb1debe..266a5073f 100644 --- a/engine/battle/effect_commands.asm +++ b/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: diff --git a/engine/battle/move_effects/mimic.asm b/engine/battle/move_effects/mimic.asm index e4b99377f..71eb72c63 100644 --- a/engine/battle/move_effects/mimic.asm +++ b/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 diff --git a/engine/events/battle_tower/get_trainer_class.asm b/engine/events/battle_tower/get_trainer_class.asm index 3b94b4d35..f3dd713e9 100644 --- a/engine/events/battle_tower/get_trainer_class.asm +++ b/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 diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm index 3162ef38e..54910c37d 100644 --- a/engine/events/battle_tower/rules.asm +++ b/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 diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm index 6d06e2eec..6ff9c5b3e 100644 --- a/engine/events/battle_tower/trainer_text.asm +++ b/engine/events/battle_tower/trainer_text.asm @@ -94,85 +94,85 @@ BTMaleTrainerTexts: dw .PlayerWon .Greetings: - dw BTGreetingM1 - dw BTGreetingM2 - dw BTGreetingM3 - dw BTGreetingM4 - dw BTGreetingM5 - dw BTGreetingM6 - dw BTGreetingM7 - dw BTGreetingM8 - dw BTGreetingM9 - dw BTGreetingM10 - dw BTGreetingM11 - dw BTGreetingM12 - dw BTGreetingM13 - dw BTGreetingM14 - dw BTGreetingM15 - dw BTGreetingM16 - dw BTGreetingM17 - dw BTGreetingM18 - dw BTGreetingM19 - dw BTGreetingM20 - dw BTGreetingM21 - dw BTGreetingM22 - dw BTGreetingM23 - dw BTGreetingM24 - dw BTGreetingM25 + dw BTGreetingM1Text + dw BTGreetingM2Text + dw BTGreetingM3Text + dw BTGreetingM4Text + dw BTGreetingM5Text + dw BTGreetingM6Text + dw BTGreetingM7Text + dw BTGreetingM8Text + dw BTGreetingM9Text + dw BTGreetingM10Text + dw BTGreetingM11Text + dw BTGreetingM12Text + dw BTGreetingM13Text + dw BTGreetingM14Text + dw BTGreetingM15Text + dw BTGreetingM16Text + dw BTGreetingM17Text + dw BTGreetingM18Text + dw BTGreetingM19Text + dw BTGreetingM20Text + dw BTGreetingM21Text + dw BTGreetingM22Text + dw BTGreetingM23Text + dw BTGreetingM24Text + dw BTGreetingM25Text .PlayerLost: - dw BTLossM1 - dw BTLossM2 - dw BTLossM3 - dw BTLossM4 - dw BTLossM5 - dw BTLossM6 - dw BTLossM7 - dw BTLossM8 - dw BTLossM9 - dw BTLossM10 - dw BTLossM11 - dw BTLossM12 - dw BTLossM13 - dw BTLossM14 - dw BTLossM15 - dw BTLossM16 - dw BTLossM17 - dw BTLossM18 - dw BTLossM19 - dw BTLossM20 - dw BTLossM21 - dw BTLossM22 - dw BTLossM23 - dw BTLossM24 - dw BTLossM25 + dw BTLossM1Text + dw BTLossM2Text + dw BTLossM3Text + dw BTLossM4Text + dw BTLossM5Text + dw BTLossM6Text + dw BTLossM7Text + dw BTLossM8Text + dw BTLossM9Text + dw BTLossM10Text + dw BTLossM11Text + dw BTLossM12Text + dw BTLossM13Text + dw BTLossM14Text + dw BTLossM15Text + dw BTLossM16Text + dw BTLossM17Text + dw BTLossM18Text + dw BTLossM19Text + dw BTLossM20Text + dw BTLossM21Text + dw BTLossM22Text + dw BTLossM23Text + dw BTLossM24Text + dw BTLossM25Text .PlayerWon: - dw BTWinM1 - dw BTWinM2 - dw BTWinM3 - dw BTWinM4 - dw BTWinM5 - dw BTWinM6 - dw BTWinM7 - dw BTWinM8 - dw BTWinM9 - dw BTWinM10 - dw BTWinM11 - dw BTWinM12 - dw BTWinM13 - dw BTWinM14 - dw BTWinM15 - dw BTWinM16 - dw BTWinM17 - dw BTWinM18 - dw BTWinM19 - dw BTWinM20 - dw BTWinM21 - dw BTWinM22 - dw BTWinM23 - dw BTWinM24 - dw BTWinM25 + dw BTWinM1Text + dw BTWinM2Text + dw BTWinM3Text + dw BTWinM4Text + dw BTWinM5Text + dw BTWinM6Text + dw BTWinM7Text + dw BTWinM8Text + dw BTWinM9Text + dw BTWinM10Text + dw BTWinM11Text + dw BTWinM12Text + dw BTWinM13Text + dw BTWinM14Text + dw BTWinM15Text + dw BTWinM16Text + dw BTWinM17Text + dw BTWinM18Text + dw BTWinM19Text + dw BTWinM20Text + dw BTWinM21Text + dw BTWinM22Text + dw BTWinM23Text + dw BTWinM24Text + dw BTWinM25Text BTFemaleTrainerTexts: dw .Greetings @@ -180,532 +180,532 @@ BTFemaleTrainerTexts: dw .PlayerWon .Greetings: - dw BTGreetingF1 - dw BTGreetingF2 - dw BTGreetingF3 - dw BTGreetingF4 - dw BTGreetingF5 - dw BTGreetingF6 - dw BTGreetingF7 - dw BTGreetingF8 - dw BTGreetingF9 - dw BTGreetingF10 - dw BTGreetingF11 - dw BTGreetingF12 - dw BTGreetingF13 - dw BTGreetingF14 - dw BTGreetingF15 + dw BTGreetingF1Text + dw BTGreetingF2Text + dw BTGreetingF3Text + dw BTGreetingF4Text + dw BTGreetingF5Text + dw BTGreetingF6Text + dw BTGreetingF7Text + dw BTGreetingF8Text + dw BTGreetingF9Text + dw BTGreetingF10Text + dw BTGreetingF11Text + dw BTGreetingF12Text + dw BTGreetingF13Text + dw BTGreetingF14Text + dw BTGreetingF15Text .PlayerLost: - dw BTLossF1 - dw BTLossF2 - dw BTLossF3 - dw BTLossF4 - dw BTLossF5 - dw BTLossF6 - dw BTLossF7 - dw BTLossF8 - dw BTLossF9 - dw BTLossF10 - dw BTLossF11 - dw BTLossF12 - dw BTLossF13 - dw BTLossF14 - dw BTLossF15 + dw BTLossF1Text + dw BTLossF2Text + dw BTLossF3Text + dw BTLossF4Text + dw BTLossF5Text + dw BTLossF6Text + dw BTLossF7Text + dw BTLossF8Text + dw BTLossF9Text + dw BTLossF10Text + dw BTLossF11Text + dw BTLossF12Text + dw BTLossF13Text + dw BTLossF14Text + dw BTLossF15Text .PlayerWon: - dw BTWinF1 - dw BTWinF2 - dw BTWinF3 - dw BTWinF4 - dw BTWinF5 - dw BTWinF6 - dw BTWinF7 - dw BTWinF8 - dw BTWinF9 - dw BTWinF10 - dw BTWinF11 - dw BTWinF12 - dw BTWinF13 - dw BTWinF14 - dw BTWinF15 + dw BTWinF1Text + dw BTWinF2Text + dw BTWinF3Text + dw BTWinF4Text + dw BTWinF5Text + dw BTWinF6Text + dw BTWinF7Text + dw BTWinF8Text + dw BTWinF9Text + dw BTWinF10Text + dw BTWinF11Text + dw BTWinF12Text + dw BTWinF13Text + dw BTWinF14Text + dw BTWinF15Text -BTGreetingM1: - text_far BattleTowerText_0x1ec000 +BTGreetingM1Text: + text_far _BTGreetingM1Text text_end -BTLossM1: - text_far BattleTowerText_0x1ec03b +BTLossM1Text: + text_far _BTLossM1Text text_end -BTWinM1: - text_far UnknownText_0x1ec060 +BTWinM1Text: + text_far _BTWinM1Text text_end -BTGreetingM2: - text_far BattleTowerText_0x1ec080 +BTGreetingM2Text: + text_far _BTGreetingM2Text text_end -BTLossM2: - text_far UnknownText_0x1ec0a3 +BTLossM2Text: + text_far _BTLossM2Text text_end -BTWinM2: - text_far UnknownText_0x1ec0c4 +BTWinM2Text: + text_far _BTWinM2Text text_end -BTGreetingM3: - text_far UnknownText_0x1ec0e1 +BTGreetingM3Text: + text_far _BTGreetingM3Text text_end -BTLossM3: - text_far UnknownText_0x1ec108 +BTLossM3Text: + text_far _BTLossM3Text text_end -BTWinM3: - text_far UnknownText_0x1ec12a +BTWinM3Text: + text_far _BTWinM3Text text_end -BTGreetingM4: - text_far UnknownText_0x1ec14d +BTGreetingM4Text: + text_far _BTGreetingM4Text text_end -BTLossM4: - text_far UnknownText_0x1ec16f +BTLossM4Text: + text_far _BTLossM4Text text_end -BTWinM4: - text_far UnknownText_0x1ec190 +BTWinM4Text: + text_far _BTWinM4Text text_end -BTGreetingM5: - text_far UnknownText_0x1ec1ae +BTGreetingM5Text: + text_far _BTGreetingM5Text text_end -BTLossM5: - text_far UnknownText_0x1ec1d0 +BTLossM5Text: + text_far _BTLossM5Text text_end -BTWinM5: - text_far UnknownText_0x1ec1f4 +BTWinM5Text: + text_far _BTWinM5Text text_end -BTGreetingM6: - text_far UnknownText_0x1ec216 +BTGreetingM6Text: + text_far _BTGreetingM6Text text_end -BTLossM6: - text_far UnknownText_0x1ec238 +BTLossM6Text: + text_far _BTLossM6Text text_end -BTWinM6: - text_far UnknownText_0x1ec259 +BTWinM6Text: + text_far _BTWinM6Text text_end -BTGreetingM7: - text_far UnknownText_0x1ec27b +BTGreetingM7Text: + text_far _BTGreetingM7Text text_end -BTLossM7: - text_far UnknownText_0x1ec2a0 +BTLossM7Text: + text_far _BTLossM7Text text_end -BTWinM7: - text_far UnknownText_0x1ec2c0 +BTWinM7Text: + text_far _BTWinM7Text text_end -BTGreetingM8: - text_far UnknownText_0x1ec2d9 +BTGreetingM8Text: + text_far _BTGreetingM8Text text_end -BTLossM8: - text_far UnknownText_0x1ec2fe +BTLossM8Text: + text_far _BTLossM8Text text_end -BTWinM8: - text_far UnknownText_0x1ec320 +BTWinM8Text: + text_far _BTWinM8Text text_end -BTGreetingM9: - text_far UnknownText_0x1ec33f +BTGreetingM9Text: + text_far _BTGreetingM9Text text_end -BTLossM9: - text_far UnknownText_0x1ec36c +BTLossM9Text: + text_far _BTLossM9Text text_end -BTWinM9: - text_far UnknownText_0x1ec389 +BTWinM9Text: + text_far _BTWinM9Text text_end -BTGreetingM10: - text_far UnknownText_0x1ec3ad +BTGreetingM10Text: + text_far _BTGreetingM10Text text_end -BTLossM10: - text_far UnknownText_0x1ec3c5 +BTLossM10Text: + text_far _BTLossM10Text text_end -BTWinM10: - text_far UnknownText_0x1ec3e5 +BTWinM10Text: + text_far _BTWinM10Text text_end -BTGreetingM11: - text_far UnknownText_0x1ec402 +BTGreetingM11Text: + text_far _BTGreetingM11Text text_end -BTLossM11: - text_far UnknownText_0x1ec411 +BTLossM11Text: + text_far _BTLossM11Text text_end -BTWinM11: - text_far UnknownText_0x1ec41f +BTWinM11Text: + text_far _BTWinM11Text text_end -BTGreetingM12: - text_far UnknownText_0x1ec42e +BTGreetingM12Text: + text_far _BTGreetingM12Text text_end -BTLossM12: - text_far UnknownText_0x1ec461 +BTLossM12Text: + text_far _BTLossM12Text text_end -BTWinM12: - text_far UnknownText_0x1ec4a0 +BTWinM12Text: + text_far _BTWinM12Text text_end -BTGreetingM13: - text_far UnknownText_0x1ec4d6 +BTGreetingM13Text: + text_far _BTGreetingM13Text text_end -BTLossM13: - text_far UnknownText_0x1ec4f5 +BTLossM13Text: + text_far _BTLossM13Text text_end -BTWinM13: - text_far UnknownText_0x1ec512 +BTWinM13Text: + text_far _BTWinM13Text text_end -BTGreetingM14: - text_far UnknownText_0x1ec532 +BTGreetingM14Text: + text_far _BTGreetingM14Text text_end -BTLossM14: - text_far UnknownText_0x1ec54b +BTLossM14Text: + text_far _BTLossM14Text text_end -BTWinM14: - text_far UnknownText_0x1ec565 +BTWinM14Text: + text_far _BTWinM14Text text_end -BTGreetingM15: - text_far UnknownText_0x1ec580 +BTGreetingM15Text: + text_far _BTGreetingM15Text text_end -BTLossM15: - text_far UnknownText_0x1ec59d +BTLossM15Text: + text_far _BTLossM15Text text_end -BTWinM15: - text_far UnknownText_0x1ec5b5 +BTWinM15Text: + text_far _BTWinM15Text text_end -BTGreetingM16: - text_far UnknownText_0x1ec5d3 +BTGreetingM16Text: + text_far _BTGreetingM16Text text_end -BTLossM16: - text_far UnknownText_0x1ec5ee +BTLossM16Text: + text_far _BTLossM16Text text_end -BTWinM16: - text_far UnknownText_0x1ec60d +BTWinM16Text: + text_far _BTWinM16Text text_end -BTGreetingM17: - text_far UnknownText_0x1ec631 +BTGreetingM17Text: + text_far _BTGreetingM17Text text_end -BTLossM17: - text_far UnknownText_0x1ec651 +BTLossM17Text: + text_far _BTLossM17Text text_end -BTWinM17: - text_far UnknownText_0x1ec68f +BTWinM17Text: + text_far _BTWinM17Text text_end -BTGreetingM18: - text_far UnknownText_0x1ec6b1 +BTGreetingM18Text: + text_far _BTGreetingM18Text text_end -BTLossM18: - text_far UnknownText_0x1ec6d0 +BTLossM18Text: + text_far _BTLossM18Text text_end -BTWinM18: - text_far UnknownText_0x1ec708 +BTWinM18Text: + text_far _BTWinM18Text text_end -BTGreetingM19: - text_far UnknownText_0x1ec720 +BTGreetingM19Text: + text_far _BTGreetingM19Text text_end -BTLossM19: - text_far UnknownText_0x1ec73e +BTLossM19Text: + text_far _BTLossM19Text text_end -BTWinM19: - text_far UnknownText_0x1ec75b +BTWinM19Text: + text_far _BTWinM19Text text_end -BTGreetingM20: - text_far UnknownText_0x1ec77f +BTGreetingM20Text: + text_far _BTGreetingM20Text text_end -BTLossM20: - text_far UnknownText_0x1ec798 +BTLossM20Text: + text_far _BTLossM20Text text_end -BTWinM20: - text_far UnknownText_0x1ec7bb +BTWinM20Text: + text_far _BTWinM20Text text_end -BTGreetingM21: - text_far UnknownText_0x1ec7d8 +BTGreetingM21Text: + text_far _BTGreetingM21Text text_end -BTLossM21: - text_far UnknownText_0x1ec818 +BTLossM21Text: + text_far _BTLossM21Text text_end -BTWinM21: - text_far UnknownText_0x1ec837 +BTWinM21Text: + text_far _BTWinM21Text text_end -BTGreetingM22: - text_far UnknownText_0x1ec858 +BTGreetingM22Text: + text_far _BTGreetingM22Text text_end -BTLossM22: - text_far UnknownText_0x1ec876 +BTLossM22Text: + text_far _BTLossM22Text text_end -BTWinM22: - text_far UnknownText_0x1ec898 +BTWinM22Text: + text_far _BTWinM22Text text_end -BTGreetingM23: - text_far UnknownText_0x1ec8b1 +BTGreetingM23Text: + text_far _BTGreetingM23Text text_end -BTLossM23: - text_far UnknownText_0x1ec8d5 +BTLossM23Text: + text_far _BTLossM23Text text_end -BTWinM23: - text_far UnknownText_0x1ec8f0 +BTWinM23Text: + text_far _BTWinM23Text text_end -BTGreetingM24: - text_far UnknownText_0x1ec911 +BTGreetingM24Text: + text_far _BTGreetingM24Text text_end -BTLossM24: - text_far UnknownText_0x1ec928 +BTLossM24Text: + text_far _BTLossM24Text text_end -BTWinM24: - text_far UnknownText_0x1ec949 +BTWinM24Text: + text_far _BTWinM24Text text_end -BTGreetingM25: - text_far UnknownText_0x1ec969 +BTGreetingM25Text: + text_far _BTGreetingM25Text text_end -BTLossM25: - text_far UnknownText_0x1ec986 +BTLossM25Text: + text_far _BTLossM25Text text_end -BTWinM25: - text_far UnknownText_0x1ec99b +BTWinM25Text: + text_far _BTWinM25Text text_end -BTGreetingF1: - text_far UnknownText_0x1ec9bd +BTGreetingF1Text: + text_far _BTGreetingF1Text text_end -BTLossF1: - text_far UnknownText_0x1ec9d9 +BTLossF1Text: + text_far _BTLossF1Text text_end -BTWinF1: - text_far UnknownText_0x1ec9f7 +BTWinF1Text: + text_far _BTWinF1Text text_end -BTGreetingF2: - text_far UnknownText_0x1eca0a +BTGreetingF2Text: + text_far _BTGreetingF2Text text_end -BTLossF2: - text_far UnknownText_0x1eca2a +BTLossF2Text: + text_far _BTLossF2Text text_end -BTWinF2: - text_far UnknownText_0x1eca47 +BTWinF2Text: + text_far _BTWinF2Text text_end -BTGreetingF3: - text_far UnknownText_0x1eca64 +BTGreetingF3Text: + text_far _BTGreetingF3Text text_end -BTLossF3: - text_far UnknownText_0x1eca82 +BTLossF3Text: + text_far _BTLossF3Text text_end -BTWinF3: - text_far UnknownText_0x1eca9d +BTWinF3Text: + text_far _BTWinF3Text text_end -BTGreetingF4: - text_far UnknownText_0x1ecabf +BTGreetingF4Text: + text_far _BTGreetingF4Text text_end -BTLossF4: - text_far UnknownText_0x1ecade +BTLossF4Text: + text_far _BTLossF4Text text_end -BTWinF4: - text_far UnknownText_0x1ecafa +BTWinF4Text: + text_far _BTWinF4Text text_end -BTGreetingF5: - text_far UnknownText_0x1ecb19 +BTGreetingF5Text: + text_far _BTGreetingF5Text text_end -BTLossF5: - text_far UnknownText_0x1ecb37 +BTLossF5Text: + text_far _BTLossF5Text text_end -BTWinF5: - text_far UnknownText_0x1ecb55 +BTWinF5Text: + text_far _BTWinF5Text text_end -BTGreetingF6: - text_far UnknownText_0x1ecb70 +BTGreetingF6Text: + text_far _BTGreetingF6Text text_end -BTLossF6: - text_far UnknownText_0x1ecb92 +BTLossF6Text: + text_far _BTLossF6Text text_end -BTWinF6: - text_far UnknownText_0x1ecbb6 +BTWinF6Text: + text_far _BTWinF6Text text_end -BTGreetingF7: - text_far UnknownText_0x1ecbd9 +BTGreetingF7Text: + text_far _BTGreetingF7Text text_end -BTLossF7: - text_far UnknownText_0x1ecbf3 +BTLossF7Text: + text_far _BTLossF7Text text_end -BTWinF7: - text_far UnknownText_0x1ecc15 +BTWinF7Text: + text_far _BTWinF7Text text_end -BTGreetingF8: - text_far UnknownText_0x1ecc39 +BTGreetingF8Text: + text_far _BTGreetingF8Text text_end -BTLossF8: - text_far UnknownText_0x1ecc55 +BTLossF8Text: + text_far _BTLossF8Text text_end -BTWinF8: - text_far UnknownText_0x1ecc75 +BTWinF8Text: + text_far _BTWinF8Text text_end -BTGreetingF9: - text_far UnknownText_0x1ecc92 +BTGreetingF9Text: + text_far _BTGreetingF9Text text_end -BTLossF9: - text_far UnknownText_0x1ecca7 +BTLossF9Text: + text_far _BTLossF9Text text_end -BTWinF9: - text_far UnknownText_0x1eccc1 +BTWinF9Text: + text_far _BTWinF9Text text_end -BTGreetingF10: - text_far UnknownText_0x1eccd7 +BTGreetingF10Text: + text_far _BTGreetingF10Text text_end -BTLossF10: - text_far UnknownText_0x1eccef +BTLossF10Text: + text_far _BTLossF10Text text_end -BTWinF10: - text_far UnknownText_0x1ecd0e +BTWinF10Text: + text_far _BTWinF10Text text_end -BTGreetingF11: - text_far UnknownText_0x1ecd2b +BTGreetingF11Text: + text_far _BTGreetingF11Text text_end -BTLossF11: - text_far UnknownText_0x1ecd4d +BTLossF11Text: + text_far _BTLossF11Text text_end -BTWinF11: - text_far UnknownText_0x1ecd6b +BTWinF11Text: + text_far _BTWinF11Text text_end -BTGreetingF12: - text_far UnknownText_0x1ecd8d +BTGreetingF12Text: + text_far _BTGreetingF12Text text_end -BTLossF12: - text_far UnknownText_0x1ecdaf +BTLossF12Text: + text_far _BTLossF12Text text_end -BTWinF12: - text_far UnknownText_0x1ecdcf +BTWinF12Text: + text_far _BTWinF12Text text_end -BTGreetingF13: - text_far UnknownText_0x1ecded +BTGreetingF13Text: + text_far _BTGreetingF13Text text_end -BTLossF13: - text_far UnknownText_0x1ece0d +BTLossF13Text: + text_far _BTLossF13Text text_end -BTWinF13: - text_far UnknownText_0x1ece2a +BTWinF13Text: + text_far _BTWinF13Text text_end -BTGreetingF14: - text_far UnknownText_0x1ece4b +BTGreetingF14Text: + text_far _BTGreetingF14Text text_end -BTLossF14: - text_far UnknownText_0x1ece70 +BTLossF14Text: + text_far _BTLossF14Text text_end -BTWinF14: - text_far UnknownText_0x1ece8a +BTWinF14Text: + text_far _BTWinF14Text text_end -BTGreetingF15: - text_far UnknownText_0x1ecea8 +BTGreetingF15Text: + text_far _BTGreetingF15Text text_end -BTLossF15: - text_far UnknownText_0x1ecec9 +BTLossF15Text: + text_far _BTLossF15Text text_end -BTWinF15: - text_far UnknownText_0x1ecee8 +BTWinF15Text: + text_far _BTWinF15Text text_end diff --git a/engine/events/buena.asm b/engine/events/buena.asm index 3e78dfa91..ef8c70bfc 100644 --- a/engine/events/buena.asm +++ b/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: diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm index 71e6f1f62..b2cc044aa 100644 --- a/engine/events/bug_contest/caught_mon.asm +++ b/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 diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index 3e8800739..6a3f77994 100644 --- a/engine/events/bug_contest/contest.asm +++ b/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 diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index 6969bc893..dc5518594 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/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: diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index a166269d5..9f8c0c5c2 100644 --- a/engine/events/bug_contest/judging.asm +++ b/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: diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index 94b90d171..a3c1ccfd1 100644 --- a/engine/events/daycare.asm +++ b/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 - -.DayCareManIntro: - ; I'm the DAY-CARE MAN. Want me to raise a #MON? + 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 + +.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 diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm index aa4755e4f..099598f81 100644 --- a/engine/events/diploma.asm +++ b/engine/events/diploma.asm @@ -86,3 +86,5 @@ INCBIN "gfx/diploma/page1.tilemap" DiplomaPage2Tilemap: INCBIN "gfx/diploma/page2.tilemap" + + ret ; unused diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 8394cf442..e51b6be15 100644 --- a/engine/events/elevator.asm +++ b/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: diff --git a/engine/events/fish.asm b/engine/events/fish.asm index c1dde87d8..df8d80a63 100644 --- a/engine/events/fish.asm +++ b/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] diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm index 5401f76f9..eba4d998e 100644 --- a/engine/events/fruit_trees.asm +++ b/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 diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index a4350c2f7..06b6b9390 100644 --- a/engine/events/halloffame.asm +++ b/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, " " diff --git a/engine/events/itemfinder.asm b/engine/events/itemfinder.asm index 4d9c9c814..3665187c8 100644 --- a/engine/events/itemfinder.asm +++ b/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 diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index 3dd700dbb..3da57db2b 100644 --- a/engine/events/kurt.asm +++ b/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 diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 928556d6c..6b1d4d8a9 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -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 @@ -148,7 +148,7 @@ CheckForLuckyNumberWinners: .done pop hl push hl - ld de, -6 + ld de, MON_SPECIES - MON_ID add hl, de ld a, [hl] pop hl @@ -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: diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 0c41713dd..3b71ee594 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -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: @@ -90,12 +89,12 @@ PrintMagikarpLength: call Magikarp_LoadFeetInchesChars ld hl, wStringBuffer1 ld de, wMagikarpLength - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + lb bc, PRINTNUM_LEFTALIGN | 1, 2 call PrintNum ld [hl], "′" inc hl ld de, wMagikarpLength + 1 - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + lb bc, PRINTNUM_LEFTALIGN | 1, 2 call PrintNum ld [hl], "″" inc hl @@ -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 diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm index 6162378a9..b2edcb990 100644 --- a/engine/events/map_name_sign.asm +++ b/engine/events/map_name_sign.asm @@ -1,6 +1,6 @@ MAP_NAME_SIGN_START EQU $60 -ReturnFromMapSetupScript:: +InitMapNameSign:: xor a ldh [hBGMapMode], a farcall .inefficient_farcall ; this is a waste of 6 ROM bytes and 6 stack bytes @@ -15,13 +15,13 @@ ReturnFromMapSetupScript:: call GetWorldMapLocation ld [wCurLandmark], a call .CheckNationalParkGate - jr z, .nationalparkgate + jr z, .gate call GetMapEnvironment cp GATE jr nz, .not_gate -.nationalparkgate +.gate ld a, -1 ld [wCurLandmark], a @@ -70,7 +70,7 @@ ReturnFromMapSetupScript:: ; These landmarks do not get pop-up signs. cp -1 ret z - cp SPECIAL_MAP + cp SPECIAL_MAP ; redundant check ret z cp RADIO_TOWER ret z @@ -105,11 +105,11 @@ PlaceMapNameSign:: cp 60 ret z cp 59 - jr nz, .skip2 + jr nz, .already_initialized call InitMapNameFrame call PlaceMapNameCenterAlign farcall HDMATransfer_OnlyTopFourRows -.skip2 +.already_initialized ld a, $80 ld a, $70 ldh [rWY], a diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm index 653a9eb35..e90063327 100644 --- a/engine/events/misc_scripts.asm +++ b/engine/events/misc_scripts.asm @@ -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: diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm index 36e4172a7..3d01c3250 100644 --- a/engine/events/misc_scripts_2.asm +++ b/engine/events/misc_scripts_2.asm @@ -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 @@ -23,21 +22,19 @@ HiddenItemScript:: sjump .finish .bag_full - buttonsound - writetext .no_room_text + promptbutton + 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 diff --git a/engine/events/mom.asm b/engine/events/mom.asm index 9a3c107e0..5d62a1693 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -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: diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm index 052082395..aa26fd5c0 100644 --- a/engine/events/mom_phone.asm +++ b/engine/events/mom_phone.asm @@ -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 diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index 7860ab3ae..f9f83fab6 100644 --- a/engine/events/move_deleter.asm +++ b/engine/events/move_deleter.asm @@ -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: diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index 681dc6adc..8f1640a4f 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -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 diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm index f3a443de4..e2b24c4c7 100644 --- a/engine/events/name_rater.asm +++ b/engine/events/name_rater.asm @@ -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 diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index 19ed72a4b..a14a102cf 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -34,7 +34,7 @@ NPCTrade:: ld b, SET_FLAG call TradeFlagAction - ld hl, ConnectLinkCableText + ld hl, NPCTradeCableText call PrintText call DoNPCTrade @@ -405,39 +405,38 @@ PrintTradeText: TradeTexts: ; entries correspond to TRADE_DIALOG_* × TRADE_DIALOGSET_* constants ; TRADE_DIALOG_INTRO - dw TradeIntroText1 - dw TradeIntroText2 - dw TradeIntroText3 - dw TradeIntroText4 + dw NPCTradeIntroText1 + dw NPCTradeIntroText2 + dw NPCTradeIntroText2 + dw NPCTradeIntroText3 ; TRADE_DIALOG_CANCEL - dw TradeCancelText1 - dw TradeCancelText2 - dw TradeCancelText3 - dw TradeCancelText4 + dw NPCTradeCancelText1 + dw NPCTradeCancelText2 + dw NPCTradeCancelText2 + dw NPCTradeCancelText3 ; TRADE_DIALOG_WRONG - dw TradeWrongText1 - dw TradeWrongText2 - dw TradeWrongText3 - dw TradeWrongText4 + dw NPCTradeWrongText1 + dw NPCTradeWrongText2 + dw NPCTradeWrongText2 + dw NPCTradeWrongText3 ; TRADE_DIALOG_COMPLETE - dw TradeCompleteText1 - dw TradeCompleteText2 - dw TradeCompleteText3 - dw TradeCompleteText4 + dw NPCTradeCompleteText1 + dw NPCTradeCompleteText2 + dw NPCTradeCompleteText4 + dw NPCTradeCompleteText3 ; TRADE_DIALOG_AFTER - dw TradeAfterText1 - dw TradeAfterText2 - dw TradeAfterText3 - dw TradeAfterText4 - -ConnectLinkCableText: - ; OK, connect the Game Link Cable. - text_far UnknownText_0x1bd407 + dw NPCTradeAfterText1 + dw NPCTradeAfterText2 + dw NPCTradeAfterText4 + dw NPCTradeAfterText3 + +NPCTradeCableText: + text_far _NPCTradeCableText text_end TradedForText: ; traded givemon for getmon - text_far UnknownText_0x1bd429 + text_far Text_NPCTraded text_asm ld de, MUSIC_NONE call PlayMusic @@ -446,95 +445,73 @@ TradedForText: ret .done - ; sound_dex_fanfare_80_109 - ; text_pause - text_far UnknownText_0x1bd445 + text_far _NPCTradeFanfareText text_end -TradeIntroText1: - ; I collect #MON. Do you have @ ? Want to trade it for my @ ? +NPCTradeIntroText1: text_far _NPCTradeIntroText1 text_end -TradeCancelText1: - ; You don't want to trade? Aww… +NPCTradeCancelText1: text_far _NPCTradeCancelText1 text_end -TradeWrongText1: - ; Huh? That's not @ . What a letdown… +NPCTradeWrongText1: text_far _NPCTradeWrongText1 text_end -TradeCompleteText1: - ; Yay! I got myself @ ! Thanks! +NPCTradeCompleteText1: text_far _NPCTradeCompleteText1 text_end -TradeAfterText1: - ; Hi, how's my old @ doing? - text_far _NPCTradeAFterText1 +NPCTradeAfterText1: + text_far _NPCTradeAfterText1 text_end -TradeIntroText2: -TradeIntroText3: - ; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ? +NPCTradeIntroText2: text_far _NPCTradeIntroText2 text_end -TradeCancelText2: -TradeCancelText3: - ; You don't have one either? Gee, that's really disappointing… +NPCTradeCancelText2: text_far _NPCTradeCancelText2 text_end -TradeWrongText2: -TradeWrongText3: - ; You don't have @ ? That's too bad, then. +NPCTradeWrongText2: text_far _NPCTradeWrongText2 text_end -TradeCompleteText2: - ; Great! Thank you! I finally got @ . +NPCTradeCompleteText2: text_far _NPCTradeCompleteText2 text_end -TradeAfterText2: - ; Hi! The @ you traded me is doing great! +NPCTradeAfterText2: text_far _NPCTradeAfterText2 text_end -TradeIntroText4: - ; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ? +NPCTradeIntroText3: text_far _NPCTradeIntroText3 text_end -TradeCancelText4: - ; You don't want to trade? Oh, darn… +NPCTradeCancelText3: text_far _NPCTradeCancelText3 text_end -TradeWrongText4: - ; That's not @ . Please trade with me if you get one. +NPCTradeWrongText3: text_far _NPCTradeWrongText3 text_end -TradeCompleteText4: - ; Wow! Thank you! I always wanted @ ! +NPCTradeCompleteText3: text_far _NPCTradeCompleteText3 text_end -TradeAfterText4: - ; How is that @ I traded you doing? Your @ 's so cute! +NPCTradeAfterText3: text_far _NPCTradeAfterText3 text_end -TradeCompleteText3: - ; Uh? What happened? +NPCTradeCompleteText4: text_far _NPCTradeCompleteText4 text_end -TradeAfterText3: - ; Trading is so odd… I still have a lot to learn about it. +NPCTradeAfterText4: text_far _NPCTradeAfterText4 text_end diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index e74bdf0aa..cf393ca92 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -58,8 +58,6 @@ CheckBadge: ret .BadgeRequiredText: - ; Sorry! A new BADGE - ; is required. text_far _BadgeRequiredText text_end @@ -108,13 +106,12 @@ CheckPartyMove: ret FieldMoveFailed: - ld hl, .CantUseHere + ld hl, .CantUseItemText call MenuTextboxBackup ret -.CantUseHere: - ; Can't use that here. - text_far UnknownText_0x1c05c8 +.CantUseItemText: + text_far _CantUseItemText text_end CutFunction: @@ -156,19 +153,17 @@ CutFunction: ret .FailCut: - ld hl, Text_NothingToCut + ld hl, CutNothingText call MenuTextboxBackup ld a, $80 ret -Text_UsedCut: - ; used CUT! - text_far UnknownText_0x1c05dd +UseCutText: + text_far _UseCutText text_end -Text_NothingToCut: - ; There's nothing to CUT here. - text_far UnknownText_0x1c05ec +CutNothingText: + text_far _CutNothingText text_end CheckMapForSomethingToCut: @@ -212,7 +207,7 @@ Script_CutFromMenu: Script_Cut: callasm GetPartyNick - writetext Text_UsedCut + writetext UseCutText reloadmappart callasm CutDownTreeOrGrass closetext @@ -317,13 +312,13 @@ UseFlash: Script_UseFlash: reloadmappart special UpdateTimePals - writetext UnknownText_0xc8f3 + writetext UseFlashTextScript callasm BlindingFlash closetext end -UnknownText_0xc8f3: - text_far UnknownText_0x1c0609 +UseFlashTextScript: + text_far _BlindingFlashText text_asm call WaitSFX ld de, SFX_FLASH @@ -545,7 +540,6 @@ AskSurfScript: end AskSurfText: - ; The water is calm. Want to SURF? text_far _AskSurfText text_end @@ -623,7 +617,7 @@ FlyFunction: callasm FlyFromAnim farscall Script_AbortBugContest special WarpToSpawnPoint - callasm DelayLoadingNewSprites + callasm SkipUpdateMapSprites loadvar VAR_MOVEMENT, PLAYER_NORMAL newloadmap MAPSETUP_FLY callasm FlyToAnim @@ -683,7 +677,7 @@ Script_WaterfallFromMenu: Script_UsedWaterfall: callasm GetPartyNick - writetext .Text_UsedWaterfall + writetext .UseWaterfallText waitbutton closetext playsound SFX_BUBBLEBEAM @@ -708,9 +702,8 @@ Script_UsedWaterfall: turn_waterfall UP step_end -.Text_UsedWaterfall: - ; used WATERFALL! - text_far UnknownText_0x1c068e +.UseWaterfallText: + text_far _UseWaterfallText text_end TryWaterfallOW:: @@ -736,24 +729,22 @@ TryWaterfallOW:: ret Script_CantDoWaterfall: - jumptext .Text_CantDoWaterfall + jumptext .HugeWaterfallText -.Text_CantDoWaterfall: - ; Wow, it's a huge waterfall. - text_far UnknownText_0x1c06a3 +.HugeWaterfallText: + text_far _HugeWaterfallText text_end Script_AskWaterfall: opentext - writetext .AskUseWaterfall + writetext .AskWaterfallText yesorno iftrue Script_UsedWaterfall closetext end -.AskUseWaterfall: - ; Do you want to use WATERFALL? - text_far UnknownText_0x1c06bf +.AskWaterfallText: + text_far _AskWaterfallText text_end EscapeRopeFunction: @@ -829,7 +820,7 @@ dig_incave ld a, [wBuffer2] cp $2 jr nz, .failescaperope - ld hl, .Text_CantUseHere + ld hl, .CantUseDigText call MenuTextbox call WaitPressAorB_BlinkCursor call CloseWindow @@ -838,31 +829,28 @@ dig_incave ld a, $80 ret -.Text_UsedDig: - ; used DIG! - text_far UnknownText_0x1c06de +.UseDigText: + text_far _UseDigText text_end -.Text_UsedEscapeRope: - ; used an ESCAPE ROPE. - text_far UnknownText_0x1c06ed +.UseEscapeRopeText: + text_far _UseEscapeRopeText text_end -.Text_CantUseHere: - ; Can't use that here. - text_far UnknownText_0x1c0705 +.CantUseDigText: + text_far _CantUseDigText text_end .UsedEscapeRopeScript: reloadmappart special UpdateTimePals - writetext .Text_UsedEscapeRope + writetext .UseEscapeRopeText sjump .UsedDigOrEscapeRopeScript .UsedDigScript: reloadmappart special UpdateTimePals - writetext .Text_UsedDig + writetext .UseDigText .UsedDigOrEscapeRopeScript: waitbutton @@ -932,25 +920,23 @@ TeleportFunction: ret .FailTeleport: - ld hl, .Text_CantUseHere + ld hl, .CantUseTeleportText call MenuTextboxBackup ld a, $80 ret -.Text_ReturnToLastMonCenter: - ; Return to the last #MON CENTER. - text_far UnknownText_0x1c071a +.TeleportReturnText: + text_far _TeleportReturnText text_end -.Text_CantUseHere: - ; Can't use that here. - text_far UnknownText_0x1c073b +.CantUseTeleportText: + text_far _CantUseTeleportText text_end .TeleportScript: reloadmappart special UpdateTimePals - writetext .Text_ReturnToLastMonCenter + writetext .TeleportReturnText pause 60 reloadmappart closetext @@ -986,13 +972,13 @@ StrengthFunction: jr .UseStrength .Unreferenced_AlreadyUsing: - ld hl, .JumpText + ld hl, .AlreadyUsingStrengthText call MenuTextboxBackup ld a, $80 ret -.JumpText: - text_far UnknownText_0x1c0751 +.AlreadyUsingStrengthText: + text_far _AlreadyUsingStrengthText text_end .Failed: @@ -1024,20 +1010,20 @@ Script_StrengthFromMenu: Script_UsedStrength: callasm SetStrengthFlag - writetext .UsedStrength + writetext .UseStrengthText readmem wBuffer6 cry 0 pause 3 - writetext .StrengthAllowedItToMoveBoulders + writetext .MoveBoulderText closetext end -.UsedStrength: - text_far UnknownText_0x1c0774 +.UseStrengthText: + text_far _UseStrengthText text_end -.StrengthAllowedItToMoveBoulders: - text_far UnknownText_0x1c0788 +.MoveBoulderText: + text_far _MoveBoulderText text_end AskStrengthScript: @@ -1047,32 +1033,29 @@ AskStrengthScript: sjump .AlreadyUsedStrength .DontMeetRequirements: - jumptext UnknownText_0xcd73 + jumptext BouldersMayMoveText .AlreadyUsedStrength: - jumptext UnknownText_0xcd6e + jumptext BouldersMoveText .AskStrength: opentext - writetext UnknownText_0xcd69 + writetext AskStrengthText yesorno iftrue Script_UsedStrength closetext end -UnknownText_0xcd69: - ; A #MON may be able to move this. Want to use STRENGTH? - text_far UnknownText_0x1c07a0 +AskStrengthText: + text_far _AskStrengthText text_end -UnknownText_0xcd6e: - ; Boulders may now be moved! - text_far UnknownText_0x1c07d8 +BouldersMoveText: + text_far _BouldersMoveText text_end -UnknownText_0xcd73: - ; A #MON may be able to move this. - text_far UnknownText_0x1c07f4 +BouldersMayMoveText: + text_far _BouldersMayMoveText text_end TryStrengthOW: @@ -1146,9 +1129,8 @@ Jumptable_cdae: ld a, $80 ret -Text_UsedWhirlpool: - ; used WHIRLPOOL! - text_far UnknownText_0x1c0816 +UseWhirlpoolText: + text_far _UseWhirlpoolText text_end TryWhirlpoolMenu: @@ -1186,7 +1168,7 @@ Script_WhirlpoolFromMenu: Script_UsedWhirlpool: callasm GetPartyNick - writetext Text_UsedWhirlpool + writetext UseWhirlpoolText reloadmappart callasm DisappearWhirlpool closetext @@ -1232,22 +1214,22 @@ TryWhirlpoolOW:: ret Script_MightyWhirlpool: - jumptext .MightyWhirlpoolText + jumptext .MayPassWhirlpoolText -.MightyWhirlpoolText: - text_far UnknownText_0x1c082b +.MayPassWhirlpoolText: + text_far _MayPassWhirlpoolText text_end Script_AskWhirlpoolOW: opentext - writetext UnknownText_0xce78 + writetext AskWhirlpoolText yesorno iftrue Script_UsedWhirlpool closetext end -UnknownText_0xce78: - text_far UnknownText_0x1c0864 +AskWhirlpoolText: + text_far _AskWhirlpoolText text_end HeadbuttFunction: @@ -1271,14 +1253,12 @@ TryHeadbuttFromMenu: ld a, $80 ret -UnknownText_0xce9d: - ; did a HEADBUTT! - text_far UnknownText_0x1c0897 +UseHeadbuttText: + text_far _UseHeadbuttText text_end -UnknownText_0xcea2: - ; Nope. Nothing… - text_far UnknownText_0x1c08ac +HeadbuttNothingText: + text_far _HeadbuttNothingText text_end HeadbuttFromMenuScript: @@ -1287,7 +1267,7 @@ HeadbuttFromMenuScript: HeadbuttScript: callasm GetPartyNick - writetext UnknownText_0xce9d + writetext UseHeadbuttText reloadmappart callasm ShakeHeadbuttTree @@ -1301,7 +1281,7 @@ HeadbuttScript: end .no_battle - writetext UnknownText_0xcea2 + writetext HeadbuttNothingText waitbutton closetext end @@ -1323,15 +1303,14 @@ TryHeadbuttOW:: AskHeadbuttScript: opentext - writetext UnknownText_0xcee6 + writetext AskHeadbuttText yesorno iftrue HeadbuttScript closetext end -UnknownText_0xcee6: - ; A #MON could be in this tree. Want to HEADBUTT it? - text_far UnknownText_0x1c08bc +AskHeadbuttText: + text_far _AskHeadbuttText text_end RockSmashFunction: @@ -1385,7 +1364,7 @@ RockSmashFromMenuScript: RockSmashScript: callasm GetPartyNick - writetext UnknownText_0xcf58 + writetext UseRockSmashText closetext special WaitSFX playsound SFX_STRENGTH @@ -1406,8 +1385,8 @@ MovementData_0xcf55: rock_smash 10 step_end -UnknownText_0xcf58: - text_far UnknownText_0x1c08f0 +UseRockSmashText: + text_far _UseRockSmashText text_end AskRockSmashScript: @@ -1415,22 +1394,20 @@ AskRockSmashScript: ifequal 1, .no opentext - writetext UnknownText_0xcf77 + writetext AskRockSmashText yesorno iftrue RockSmashScript closetext end .no - jumptext UnknownText_0xcf72 + jumptext MaySmashText -UnknownText_0xcf72: - ; Maybe a #MON can break this. - text_far UnknownText_0x1c0906 +MaySmashText: + text_far _MaySmashText text_end -UnknownText_0xcf77: - ; This rock looks breakable. Want to use ROCK SMASH? - text_far UnknownText_0x1c0924 +AskRockSmashText: + text_far _AskRockSmashText text_end HasRockSmash: @@ -1539,12 +1516,12 @@ FishFunction: Script_NotEvenANibble: scall Script_FishCastRod - writetext UnknownText_0xd0a9 + writetext RodNothingText sjump Script_NotEvenANibble_FallThrough Script_NotEvenANibble2: scall Script_FishCastRod - writetext UnknownText_0xd0a9 + writetext RodNothingText Script_NotEvenANibble_FallThrough: loademote EMOTE_SHADOW @@ -1565,7 +1542,7 @@ Script_GotABite: .FightTheHookedPokemon: pause 40 applymovement PLAYER, .Movement_RestoreRod - writetext UnknownText_0xd0a4 + writetext RodBiteText callasm PutTheRodAway closetext randomwildmon @@ -1631,19 +1608,16 @@ PutTheRodAway: call ReplaceKrisSprite ret -UnknownText_0xd0a4: - ; Oh! A bite! - text_far UnknownText_0x1c0958 +RodBiteText: + text_far _RodBiteText text_end -UnknownText_0xd0a9: - ; Not even a nibble! - text_far UnknownText_0x1c0965 +RodNothingText: + text_far _RodNothingText text_end -UnknownText_0xd0ae: ; unused - ; Looks like there's nothing here. - text_far UnknownText_0x1c0979 +UnusedNothingHereText: ; unused + text_far _UnusedNothingHereText text_end BikeFunction: @@ -1736,7 +1710,7 @@ Script_GetOnBike: reloadmappart special UpdateTimePals loadvar VAR_MOVEMENT, PLAYER_BIKE - writetext GotOnTheBikeText + writetext GotOnBikeText waitbutton closetext special ReplaceKrisSprite @@ -1756,7 +1730,7 @@ Script_GetOffBike: reloadmappart special UpdateTimePals loadvar VAR_MOVEMENT, PLAYER_NORMAL - writetext GotOffTheBikeText + writetext GotOffBikeText waitbutton FinishGettingOffBike: @@ -1776,18 +1750,15 @@ Script_CantGetOffBike: end .CantGetOffBikeText: - ; You can't get off here! - text_far UnknownText_0x1c099a + text_far _CantGetOffBikeText text_end -GotOnTheBikeText: - ; got on the @ . - text_far UnknownText_0x1c09b2 +GotOnBikeText: + text_far _GotOnBikeText text_end -GotOffTheBikeText: - ; got off the @ . - text_far UnknownText_0x1c09c7 +GotOffBikeText: + text_far _GotOffBikeText text_end TryCutOW:: @@ -1814,7 +1785,7 @@ TryCutOW:: AskCutScript: opentext - writetext UnknownText_0xd1c8 + writetext AskCutText yesorno iffalse .script_d1b8 callasm .CheckMap @@ -1832,13 +1803,13 @@ AskCutScript: ld [wScriptVar], a ret -UnknownText_0xd1c8: - text_far UnknownText_0x1c09dd +AskCutText: + text_far _AskCutText text_end CantCutScript: - jumptext UnknownText_0xd1d0 + jumptext CanCutText -UnknownText_0xd1d0: - text_far UnknownText_0x1c0a05 +CanCutText: + text_far _CanCutText text_end diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index 70da92f13..98a6e25a1 100644 --- a/engine/events/poisonstep.asm +++ b/engine/events/poisonstep.asm @@ -146,9 +146,9 @@ DoPoisonStep:: ret .PoisonFaintText: - text_far UnknownText_0x1c0acc + text_far _PoisonFaintText text_end -.PoisonWhiteOutText: - text_far UnknownText_0x1c0ada +.PoisonWhiteoutText: + text_far _PoisonWhiteoutText text_end diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index db8d2beab..9bca9d169 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -164,7 +164,7 @@ GetCaughtLevel: ld [wSeerCaughtLevel], a ld hl, wSeerCaughtLevelString ld de, wSeerCaughtLevel - lb bc, PRINTNUM_RIGHTALIGN | 1, 3 + lb bc, PRINTNUM_LEFTALIGN | 1, 3 call PrintNum ret @@ -287,53 +287,45 @@ PrintSeerText: ret SeerTexts: - dw SeerIntroText - dw SeerCantTellText - dw SeerMetAtText + dw SeerSeeAllText + dw SeerCantTellAThingText + dw SeerNameLocationText dw SeerTimeLevelText - dw SeerTradedText - dw SeerCancelText + dw SeerTradeText + dw SeerDoNothingText dw SeerEggText - dw SeerLevelOnlyText + dw SeerNoLocationText -SeerIntroText: - ; I see all. I know all… Certainly, I know of your #MON! - text_far UnknownText_0x1c475f +SeerSeeAllText: + text_far _SeerSeeAllText text_end -SeerCantTellText: - ; Whaaaat? I can't tell a thing! How could I not know of this? - text_far UnknownText_0x1c4797 +SeerCantTellAThingText: + text_far _SeerCantTellAThingText text_end -SeerMetAtText: - ; Hm… I see you met @ here: @ ! - text_far UnknownText_0x1c47d4 +SeerNameLocationText: + text_far _SeerNameLocationText text_end SeerTimeLevelText: - ; The time was @ ! Its level was @ ! Am I good or what? - text_far UnknownText_0x1c47fa + text_far _SeerTimeLevelText text_end -SeerTradedText: - ; Hm… @ came from @ in a trade? @ was where @ met @ ! - text_far UnknownText_0x1c4837 +SeerTradeText: + text_far _SeerTradeText text_end -SeerLevelOnlyText: - ; What!? Incredible! I don't understand how, but it is incredible! You are special. I can't tell where you met it, but it was at level @ . Am I good or what? - text_far UnknownText_0x1c487f +SeerNoLocationText: + text_far _SeerNoLocationText text_end SeerEggText: - ; Hey! That's an EGG! You can't say that you've met it yet… - text_far UnknownText_0x1c491d + text_far _SeerEggText text_end -SeerCancelText: - ; Fufufu! I saw that you'd do nothing! - text_far UnknownText_0x1c4955 +SeerDoNothingText: + text_far _SeerDoNothingText text_end SeerAdvice: @@ -364,36 +356,31 @@ SeerAdvice: SeerAdviceTexts: ; level, text - dbw 9, SeerAdvice1 - dbw 29, SeerAdvice2 - dbw 59, SeerAdvice3 - dbw 89, SeerAdvice4 - dbw 100, SeerAdvice5 - dbw 255, SeerAdvice1 - -SeerAdvice1: - ; Incidentally… It would be wise to raise your #MON with a little more care. - text_far UnknownText_0x1c497a + dbw 9, SeerMoreCareText + dbw 29, SeerMoreConfidentText + dbw 59, SeerMuchStrengthText + dbw 89, SeerMightyText + dbw 100, SeerImpressedText + dbw 255, SeerMoreCareText + +SeerMoreCareText: + text_far _SeerMoreCareText text_end -SeerAdvice2: - ; Incidentally… It seems to have grown a little. @ seems to be becoming more confident. - text_far UnknownText_0x1c49c6 +SeerMoreConfidentText: + text_far _SeerMoreConfidentText text_end -SeerAdvice3: - ; Incidentally… @ has grown. It's gained much strength. - text_far UnknownText_0x1c4a21 +SeerMuchStrengthText: + text_far _SeerMuchStrengthText text_end -SeerAdvice4: - ; Incidentally… It certainly has grown mighty! This @ must have come through numerous #MON battles. It looks brimming with confidence. - text_far UnknownText_0x1c4a5b +SeerMightyText: + text_far _SeerMightyText text_end -SeerAdvice5: - ; Incidentally… I'm impressed by your dedication. It's been a long time since I've seen a #MON as mighty as this @ . I'm sure that seeing @ in battle would excite anyone. - text_far UnknownText_0x1c4ae5 +SeerImpressedText: + text_far _SeerImpressedText text_end GetCaughtGender: diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index fa06d971e..e22a2ffc4 100644 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -2,9 +2,9 @@ PokemonCenterPC: call PC_CheckPartyForPokemon ret c call PC_PlayBootSound - ld hl, PokecenterPCText_BootedUpPC + ld hl, PokecenterPCTurnOnText call PC_DisplayText - ld hl, PokecenterPCText_AccessWhosePC + ld hl, PokecenterPCWhoseText call PC_DisplayTextWaitMenu ld hl, .TopMenu call LoadMenuHeader @@ -104,19 +104,18 @@ PC_CheckPartyForPokemon: ret nz ld de, SFX_CHOOSE_PC_OPTION call PlaySFX - ld hl, .MustHavePokemonToUse + ld hl, .PokecenterPCCantUseText call PC_DisplayText scf ret -.MustHavePokemonToUse: - ; Bzzzzt! You must have a #MON to use this! - text_far UnknownText_0x1c1328 +.PokecenterPCCantUseText: + text_far _PokecenterPCCantUseText text_end BillsPC: call PC_PlayChoosePCSound - ld hl, PokecenterPCText_AccessedBillsPC + ld hl, PokecenterBillsPCText call PC_DisplayText farcall _BillsPC and a @@ -124,7 +123,7 @@ BillsPC: PlayersPC: call PC_PlayChoosePCSound - ld hl, PokecenterPCText_AccessedOwnPC + ld hl, PokecenterPlayersPCText call PC_DisplayText ld b, $0 call _PlayersPC @@ -133,7 +132,7 @@ PlayersPC: OaksPC: call PC_PlayChoosePCSound - ld hl, PokecenterPCText_AccessedOaksPC + ld hl, PokecenterOaksPCText call PC_DisplayText farcall ProfOaksPC and a @@ -148,7 +147,7 @@ HallOfFamePC: ret TurnOffPC: - ld hl, PokecenterPCText_LinkClosed + ld hl, PokecenterPCOaksClosedText call PrintText scf ret @@ -181,7 +180,7 @@ PC_WaitPlaySFX: _PlayersHousePC: call PC_PlayBootSound - ld hl, UnknownText_0x156ff + ld hl, PlayersPCTurnOnText call PC_DisplayText ld b, $1 call _PlayersPC @@ -199,15 +198,14 @@ _PlayersHousePC: ld c, $1 ret -UnknownText_0x156ff: - ; turned on the PC. - text_far UnknownText_0x1c1353 +PlayersPCTurnOnText: + text_far _PlayersPCTurnOnText text_end _PlayersPC: ld a, b ld [wWhichIndexSet], a - ld hl, UnknownText_0x157cc + ld hl, PlayersPCAskWhatDoText call PC_DisplayTextWaitMenu call Function15715 call ExitMenu @@ -302,9 +300,8 @@ PC_DisplayTextWaitMenu: ld [wOptions], a ret -UnknownText_0x157cc: - ; What do you want to do? - text_far UnknownText_0x1c1368 +PlayersPCAskWhatDoText: + text_far _PlayersPCAskWhatDoText text_end PlayerWithdrawItemMenu: @@ -334,7 +331,7 @@ PlayerWithdrawItemMenu: jr .withdraw .askquantity - ld hl, .HowManyText + ld hl, .PlayersPCHowManyWithdrawText call MenuTextbox farcall SelectQuantityToToss call ExitMenu @@ -356,7 +353,7 @@ PlayerWithdrawItemMenu: ld hl, wNumPCItems call TossItem predef PartyMonItemName - ld hl, .WithdrewText + ld hl, .PlayersPCWithdrewItemsText call MenuTextbox xor a ldh [hBGMapMode], a @@ -364,22 +361,22 @@ PlayerWithdrawItemMenu: ret .PackFull: - ld hl, .NoRoomText + ld hl, .PlayersPCNoRoomWithdrawText call MenuTextboxBackup ret .done ret -.HowManyText: +.PlayersPCHowManyWithdrawText: text_far _PlayersPCHowManyWithdrawText text_end -.WithdrewText: +.PlayersPCWithdrewItemsText: text_far _PlayersPCWithdrewItemsText text_end -.NoRoomText: +.PlayersPCNoRoomWithdrawText: text_far _PlayersPCNoRoomWithdrawText text_end @@ -436,14 +433,13 @@ PlayerDepositItemMenu: .CheckItemsInBag: farcall HasNoItems ret nc - ld hl, .NoItemsInBag + ld hl, .PlayersPCNoItemsText call MenuTextboxBackup scf ret -.NoItemsInBag: - ; No items here! - text_far UnknownText_0x1c13df +.PlayersPCNoItemsText: + text_far _PlayersPCNoItemsText text_end .TryDepositItem: @@ -494,7 +490,7 @@ PlayerDepositItemMenu: jr .ContinueDeposit .AskQuantity: - ld hl, .HowManyText + ld hl, .PlayersPCHowManyDepositText call MenuTextbox farcall SelectQuantityToToss push af @@ -518,12 +514,12 @@ PlayerDepositItemMenu: ld hl, wNumItems call TossItem predef PartyMonItemName - ld hl, .DepositText + ld hl, .PlayersPCDepositItemsText call PrintText ret .NoRoomInPC: - ld hl, .NoRoomText + ld hl, .PlayersPCNoRoomDepositText call PrintText ret @@ -531,15 +527,15 @@ PlayerDepositItemMenu: and a ret -.HowManyText: +.PlayersPCHowManyDepositText: text_far _PlayersPCHowManyDepositText text_end -.DepositText: +.PlayersPCDepositItemsText: text_far _PlayersPCDepositItemsText text_end -.NoRoomText: +.PlayersPCNoRoomDepositText: text_far _PlayersPCNoRoomDepositText text_end @@ -637,32 +633,26 @@ PC_DisplayText: call ExitMenu ret -PokecenterPCText_BootedUpPC: - ; turned on the PC. - text_far UnknownText_0x1c144d +PokecenterPCTurnOnText: + text_far _PokecenterPCTurnOnText text_end -PokecenterPCText_AccessWhosePC: - ; Access whose PC? - text_far UnknownText_0x1c1462 +PokecenterPCWhoseText: + text_far _PokecenterPCWhoseText text_end -PokecenterPCText_AccessedBillsPC: - ; BILL's PC accessed. #MON Storage System opened. - text_far UnknownText_0x1c1474 +PokecenterBillsPCText: + text_far _PokecenterBillsPCText text_end -PokecenterPCText_AccessedOwnPC: - ; Accessed own PC. Item Storage System opened. - text_far UnknownText_0x1c14a4 +PokecenterPlayersPCText: + text_far _PokecenterPlayersPCText text_end -PokecenterPCText_AccessedOaksPC: - ; PROF.OAK's PC accessed. #DEX Rating System opened. - text_far UnknownText_0x1c14d2 +PokecenterOaksPCText: + text_far _PokecenterOaksPCText text_end -PokecenterPCText_LinkClosed: - ; … Link closed… - text_far UnknownText_0x1c1505 +PokecenterPCOaksClosedText: + text_far _PokecenterPCOaksClosedText text_end diff --git a/engine/events/print_photo.asm b/engine/events/print_photo.asm index 0194b0072..056788b94 100644 --- a/engine/events/print_photo.asm +++ b/engine/events/print_photo.asm @@ -1,5 +1,5 @@ PhotoStudio: - ld hl, .Text_AskWhichMon + ld hl, .WhichMonPhotoText call PrintText farcall SelectMonFromParty jr c, .cancel @@ -7,7 +7,7 @@ PhotoStudio: cp EGG jr z, .egg - ld hl, .Text_HoldStill + ld hl, .HoldStillText call PrintText call DisableSpriteUpdates farcall PrintPartymon @@ -15,41 +15,36 @@ PhotoStudio: ldh a, [hPrinter] and a jr nz, .cancel - ld hl, .Text_Presto + ld hl, .PrestoAllDoneText jr .print_text .cancel - ld hl, .Text_NoPicture + ld hl, .NoPhotoText jr .print_text .egg - ld hl, .Text_Egg + ld hl, .EggPhotoText .print_text call PrintText ret -.Text_AskWhichMon: - ; Which #MON should I photo- graph? +.WhichMonPhotoText: text_far _WhichMonPhotoText text_end -.Text_HoldStill: - ; All righty. Hold still for a bit. - text_far _HoldOnText +.HoldStillText: + text_far _HoldStillText text_end -.Text_Presto: - ; Presto! All done. Come again, OK? +.PrestoAllDoneText: text_far _PrestoAllDoneText text_end -.Text_NoPicture: - ; Oh, no picture? Come again, OK? - text_far UnknownText_0x1c0000 +.NoPhotoText: + text_far _NoPhotoText text_end -.Text_Egg: - ; An EGG? My talent is worth more… - text_far UnknownText_0x1c0021 +.EggPhotoText: + text_far _EggPhotoText text_end diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm index 7954963e6..1be775a4c 100644 --- a/engine/events/prof_oaks_pc.asm +++ b/engine/events/prof_oaks_pc.asm @@ -70,7 +70,7 @@ Rate: ld bc, ITEM_NAME_LENGTH call ByteFill pop hl - lb bc, PRINTNUM_RIGHTALIGN | 1, 3 + lb bc, PRINTNUM_LEFTALIGN | 1, 3 call PrintNum ret diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm index b7553f919..d105b2fb7 100644 --- a/engine/events/sacred_ash.asm +++ b/engine/events/sacred_ash.asm @@ -1,4 +1,3 @@ - _SacredAsh: ld a, $0 ld [wItemEffectSucceeded], a @@ -57,14 +56,13 @@ SacredAshScript: special FadeOutPalettes special FadeInPalettes waitsfx - writetext UnknownText_0x50845 + writetext .UseSacredAshText playsound SFX_CAUGHT_MON waitsfx waitbutton closetext end -UnknownText_0x50845: - ; 's #MON were all healed! - text_far UnknownText_0x1c0b65 +.UseSacredAshText: + text_far _UseSacredAshText text_end diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm index ca8985591..85bcce629 100644 --- a/engine/events/shuckle.asm +++ b/engine/events/shuckle.asm @@ -2,7 +2,7 @@ MANIA_OT_ID EQU 00518 GiveShuckle: ; Adding to the party. - xor a + xor a ; PARTYMON ld [wMonType], a ; Level 15 Shuckle. diff --git a/engine/events/specials.asm b/engine/events/specials.asm index ef5286dff..d133dd68f 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -168,7 +168,6 @@ GetMysteryGiftItem: ret .ReceiveItemText: - ; received item text_far _ReceiveItemText text_end @@ -256,12 +255,10 @@ CheckCoinsAndCoinCase: ret .NoCoinsText: - ; You have no coins. text_far _NoCoinsText text_end .NoCoinCaseText: - ; You don't have a COIN CASE. text_far _NoCoinCaseText text_end diff --git a/engine/events/squirtbottle.asm b/engine/events/squirtbottle.asm index a5b7fd866..411b5c2e2 100644 --- a/engine/events/squirtbottle.asm +++ b/engine/events/squirtbottle.asm @@ -9,15 +9,14 @@ _Squirtbottle: reloadmappart special UpdateTimePals callasm .CheckCanUseSquirtbottle - iffalse .NothingHappenedScript + iffalse .SquirtbottleNothingScript farsjump WateredWeirdTreeScript -.NothingHappenedScript: - jumptext .NothingHappenedText +.SquirtbottleNothingScript: + jumptext .SquirtbottleNothingText -.NothingHappenedText: - ; sprinkled water. But nothing happened… - text_far UnknownText_0x1c0b3b +.SquirtbottleNothingText: + text_far _SquirtbottleNothingText text_end .CheckCanUseSquirtbottle: diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 39241d71c..b7426caec 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -69,33 +69,33 @@ PokecenterNurseScript: checkevent EVENT_WELCOMED_TO_POKECOM_CENTER iftrue .morn_comcenter farwritetext NurseMornText - buttonsound + promptbutton sjump .ok .morn_comcenter farwritetext PokeComNurseMornText - buttonsound + promptbutton sjump .ok .day checkevent EVENT_WELCOMED_TO_POKECOM_CENTER iftrue .day_comcenter farwritetext NurseDayText - buttonsound + promptbutton sjump .ok .day_comcenter farwritetext PokeComNurseDayText - buttonsound + promptbutton sjump .ok .nite checkevent EVENT_WELCOMED_TO_POKECOM_CENTER iftrue .nite_comcenter farwritetext NurseNiteText - buttonsound + promptbutton sjump .ok .nite_comcenter farwritetext PokeComNurseNiteText - buttonsound + promptbutton sjump .ok .ok @@ -182,7 +182,7 @@ MerchandiseShelfScript: TownMapScript: opentext - farwritetext TownMapText + farwritetext LookTownMapText waitbutton special OverworldTownMap closetext @@ -326,19 +326,19 @@ BugContestResultsScript: ifequal 2, BugContestResults_SecondPlace ifequal 3, BugContestResults_ThirdPlace farwritetext ContestResults_ConsolationPrizeText - buttonsound + promptbutton waitsfx verbosegiveitem BERRY iffalse BugContestResults_NoRoomForBerry BugContestResults_DidNotWin: farwritetext ContestResults_DidNotWinText - buttonsound + promptbutton sjump BugContestResults_FinishUp BugContestResults_ReturnAfterWinnersPrize: farwritetext ContestResults_JoinUsNextTimeText - buttonsound + promptbutton BugContestResults_FinishUp: checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER @@ -408,25 +408,25 @@ BugContestResults_ThirdPlace: BugContestResults_NoRoomForSunStone: farwritetext BugContestPrizeNoRoomText - buttonsound + promptbutton setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE sjump BugContestResults_ReturnAfterWinnersPrize BugContestResults_NoRoomForEverstone: farwritetext BugContestPrizeNoRoomText - buttonsound + promptbutton setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE sjump BugContestResults_ReturnAfterWinnersPrize BugContestResults_NoRoomForGoldBerry: farwritetext BugContestPrizeNoRoomText - buttonsound + promptbutton setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY sjump BugContestResults_ReturnAfterWinnersPrize BugContestResults_NoRoomForBerry: farwritetext BugContestPrizeNoRoomText - buttonsound + promptbutton setevent EVENT_CONTEST_OFFICER_HAS_BERRY sjump BugContestResults_DidNotWin @@ -786,7 +786,7 @@ RegisteredNumberMScript: farwritetext RegisteredNumber1Text playsound SFX_REGISTER_PHONE_NUMBER waitsfx - buttonsound + promptbutton end NumberAcceptedMScript: @@ -1279,31 +1279,31 @@ GiftMScript: .Jose: farwritetext JoseGiftText - buttonsound + promptbutton end .Wade: farwritetext WadeGiftText - buttonsound + promptbutton end .Alan: farwritetext AlanGiftText - buttonsound + promptbutton end .Derek: farwritetext DerekGiftText - buttonsound + promptbutton end .Tully: farwritetext TullyGiftText - buttonsound + promptbutton end .Wilton: farwritetext WiltonGiftText - buttonsound + promptbutton end .Kenji: farwritetext KenjiGiftText - buttonsound + promptbutton end PackFullMScript: @@ -1386,19 +1386,19 @@ RematchGiftMScript: .Huey: farwritetext HueyRematchGiftText - buttonsound + promptbutton end .Joey: farwritetext JoeyRematchGiftText - buttonsound + promptbutton end .Vance: farwritetext VanceRematchGiftText - buttonsound + promptbutton end .Parry: farwritetext ParryRematchGiftText - buttonsound + promptbutton end AskNumber1FScript: @@ -1477,7 +1477,7 @@ RegisteredNumberFScript: farwritetext RegisteredNumber2Text playsound SFX_REGISTER_PHONE_NUMBER waitsfx - buttonsound + promptbutton end NumberAcceptedFScript: @@ -1691,19 +1691,19 @@ GiftFScript: .Beverly: farwritetext BeverlyGiftText - buttonsound + promptbutton end .Gina: farwritetext GinaGiftText - buttonsound + promptbutton end .Dana: farwritetext DanaGiftText - buttonsound + promptbutton end .Tiffany: farwritetext TiffanyGiftText - buttonsound + promptbutton end PackFullFScript: @@ -1747,7 +1747,7 @@ RematchGiftFScript: .Erin: opentext farwritetext ErinRematchGiftText - buttonsound + promptbutton end GymStatue1Script: @@ -1762,7 +1762,7 @@ GymStatue2Script: getcurlandmarkname STRING_BUFFER_3 opentext farwritetext GymStatue_CityGymText - buttonsound + promptbutton farwritetext GymStatue_WinningTrainersText waitbutton closetext @@ -1778,7 +1778,7 @@ ReceiveItemScript: ReceiveTogepiEggScript: waitsfx farwritetext ReceivedItemText - playsound SFX_GET_EGG_FROM_DAY_CARE_LADY + playsound SFX_GET_EGG waitsfx end @@ -1786,7 +1786,7 @@ GameCornerCoinVendorScript: faceplayer opentext farwritetext CoinVendor_WelcomeText - buttonsound + promptbutton checkitem COIN_CASE iftrue CoinVendor_IntroScript farwritetext CoinVendor_NoCoinCaseText diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm index 92060ea3f..c81aa9c3a 100644 --- a/engine/events/sweet_scent.asm +++ b/engine/events/sweet_scent.asm @@ -9,7 +9,7 @@ SweetScentFromMenu: reloadmappart special UpdateTimePals callasm GetPartyNick - writetext UnknownText_0x50726 + writetext UseSweetScentText waitbutton callasm SweetScentEncounter iffalse SweetScentNothing @@ -24,7 +24,7 @@ SweetScentFromMenu: farsjump BugCatchingContestBattleScript SweetScentNothing: - writetext UnknownText_0x5072b + writetext SweetScentNothingText waitbutton closetext end @@ -57,12 +57,10 @@ SweetScentEncounter: ld [wBattleType], a ret -UnknownText_0x50726: - ; used SWEET SCENT! - text_far UnknownText_0x1c0b03 +UseSweetScentText: + text_far _UseSweetScentText text_end -UnknownText_0x5072b: - ; Looks like there's nothing here… - text_far UnknownText_0x1c0b1a +SweetScentNothingText: + text_far _SweetScentNothingText text_end diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 4b3c3773a..c9141ac2a 100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -25,8 +25,7 @@ Script_Whiteout: jumpstd bugcontestresultswarp .WhitedOutText: - ; is out of useable #MON! whited out! - text_far UnknownText_0x1c0a4e + text_far _WhitedOutText text_end OverworldBGMap: diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index 17fd2d493..54d729dfa 100644 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -102,7 +102,7 @@ _CardFlip: ret .AskPlayWithThree: - ld hl, .PlayWithThreeCoinsText + ld hl, .CardFlipPlayWithThreeCoinsText call CardFlip_UpdateCoinBalanceDisplay call YesNoBox jr c, .SaidNo @@ -115,9 +115,8 @@ _CardFlip: ld [wJumptableIndex], a ret -.PlayWithThreeCoinsText: - ; Play with three coins? - text_far UnknownText_0x1c5793 +.CardFlipPlayWithThreeCoinsText: + text_far _CardFlipPlayWithThreeCoinsText text_end .DeductCoins: @@ -131,7 +130,7 @@ _CardFlip: ld a, l cp 3 jr nc, .deduct ; You have at least 3 coins. - ld hl, .NotEnoughCoinsText + ld hl, .CardFlipNotEnoughCoinsText call CardFlip_UpdateCoinBalanceDisplay ld a, 7 ld [wJumptableIndex], a @@ -155,9 +154,8 @@ _CardFlip: call .Increment ret -.NotEnoughCoinsText: - ; Not enough coins… - text_far UnknownText_0x1c57ab +.CardFlipNotEnoughCoinsText: + text_far _CardFlipNotEnoughCoinsText text_end .ChooseACard: @@ -184,7 +182,7 @@ _CardFlip: hlcoord 2, 6 call PlaceCardFaceDown call WaitBGMap - ld hl, .ChooseACardText + ld hl, .CardFlipChooseACardText call CardFlip_UpdateCoinBalanceDisplay xor a ld [wCardFlipWhichCard], a @@ -232,13 +230,12 @@ _CardFlip: call .Increment ret -.ChooseACardText: - ; Choose a card. - text_far UnknownText_0x1c57be +.CardFlipChooseACardText: + text_far _CardFlipChooseACardText text_end .PlaceYourBet: - ld hl, .PlaceYourBetText + ld hl, .CardFlipPlaceYourBetText call CardFlip_UpdateCoinBalanceDisplay .betloop call JoyTextDelay @@ -254,9 +251,8 @@ _CardFlip: call .Increment ret -.PlaceYourBetText: - ; Place your bet. - text_far UnknownText_0x1c57ce +.CardFlipPlaceYourBetText: + text_far _CardFlipPlaceYourBetText text_end .CheckTheCard: @@ -296,7 +292,7 @@ _CardFlip: .PlayAgain: call ClearSprites - ld hl, .PlayAgainText + ld hl, .CardFlipPlayAgainText call CardFlip_UpdateCoinBalanceDisplay call YesNoBox jr nc, .Continue @@ -313,7 +309,7 @@ _CardFlip: ld a, $1 ldh [hBGMapMode], a call CardFlip_ShuffleDeck - ld hl, .CardsShuffledText + ld hl, .CardFlipShuffledText call PrintText jr .LoopAround @@ -325,14 +321,12 @@ _CardFlip: ld [wJumptableIndex], a ret -.PlayAgainText: - ; Want to play again? - text_far UnknownText_0x1c57df +.CardFlipPlayAgainText: + text_far _CardFlipPlayAgainText text_end -.CardsShuffledText: - ; The cards have been shuffled. - text_far UnknownText_0x1c57f4 +.CardFlipShuffledText: + text_far _CardFlipShuffledText text_end .Quit: @@ -1085,7 +1079,7 @@ CardFlip_CheckWinCondition: .Lose: ld de, SFX_WRONG call PlaySFX - ld hl, .Text_Darn + ld hl, .CardFlipDarnText call CardFlip_UpdateCoinBalanceDisplay call WaitSFX ret @@ -1093,7 +1087,7 @@ CardFlip_CheckWinCondition: .Payout: push bc push de - ld hl, .Text_Yeah + ld hl, .CardFlipYeahText call CardFlip_UpdateCoinBalanceDisplay pop de call PlaySFX @@ -1114,14 +1108,12 @@ CardFlip_CheckWinCondition: jr nz, .loop ret -.Text_Yeah: - ; Yeah! - text_far UnknownText_0x1c5813 +.CardFlipYeahText: + text_far _CardFlipYeahText text_end -.Text_Darn: - ; Darn… - text_far UnknownText_0x1c581a +.CardFlipDarnText: + text_far _CardFlipDarnText text_end .AddCoinPlaySFX: diff --git a/engine/games/dummy_game.asm b/engine/games/dummy_game.asm index 582ae67f6..6e435191b 100644 --- a/engine/games/dummy_game.asm +++ b/engine/games/dummy_game.asm @@ -304,7 +304,7 @@ DummyGame_CheckMatch: call DummyGame_Card2Coord call DummyGame_PlaceCard - ld hl, DummyGameText_Darn + ld hl, DummyGameDarnText call PrintText ret @@ -313,21 +313,19 @@ DummyGame_CheckMatch: push bc hlcoord 2, 13 call DummyGame_PlaceCard - ld hl, DummyGameText_Yeah + ld hl, DummyGameYeahText pop bc inc bc inc bc inc bc ret -DummyGameText_Yeah: - ; , yeah! - text_far UnknownText_0x1c1a5b +DummyGameYeahText: + text_far _DummyGameYeahText text_end -DummyGameText_Darn: - ; Darn… - text_far UnknownText_0x1c1a65 +DummyGameDarnText: + text_far _DummyGameDarnText text_end DummyGame_InitBoard: diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 202aca20b..25f9166ee 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -1707,7 +1707,7 @@ Slots_TurnLightsOnOrOff: Slots_AskBet: .loop - ld hl, .Text_BetHowManyCoins + ld hl, .SlotsBetHowManyCoinsText call PrintText ld hl, .MenuHeader call LoadMenuHeader @@ -1727,7 +1727,7 @@ Slots_AskBet: ld a, [hl] cp c jr nc, .Start - ld hl, .Text_NotEnoughCoins + ld hl, .SlotsNotEnoughCoinsText call PrintText jr .loop @@ -1742,24 +1742,21 @@ Slots_AskBet: call WaitSFX ld de, SFX_PAY_DAY call PlaySFX - ld hl, .Text_Start + ld hl, .SlotsStartText call PrintText and a ret -.Text_BetHowManyCoins: - ; Bet how many coins? - text_far UnknownText_0x1c5049 +.SlotsBetHowManyCoinsText: + text_far _SlotsBetHowManyCoinsText text_end -.Text_Start: - ; Start! - text_far UnknownText_0x1c505e +.SlotsStartText: + text_far _SlotsStartText text_end -.Text_NotEnoughCoins: - ; Not enough coins. - text_far UnknownText_0x1c5066 +.SlotsNotEnoughCoinsText: + text_far _SlotsNotEnoughCoinsText text_end .MenuHeader: @@ -1780,14 +1777,14 @@ Slots_AskPlayAgain: ld a, [hli] or [hl] jr nz, .you_have_coins - ld hl, .Text_OutOfCoins + ld hl, .SlotsRanOutOfCoinsText call PrintText ld c, 60 call DelayFrames jr .exit_slots .you_have_coins - ld hl, .Text_PlayAgain + ld hl, .SlotsPlayAgainText call PrintText call LoadMenuTextbox lb bc, 14, 12 @@ -1804,12 +1801,12 @@ Slots_AskPlayAgain: scf ret -.Text_OutOfCoins: - text_far UnknownText_0x1c5079 +.SlotsRanOutOfCoinsText: + text_far _SlotsRanOutOfCoinsText text_end -.Text_PlayAgain: - text_far UnknownText_0x1c5092 +.SlotsPlayAgainText: + text_far _SlotsPlayAgainText text_end Slots_GetPayout: @@ -1849,7 +1846,7 @@ Slots_PayoutText: ld a, [wSlotMatched] cp SLOTS_NO_MATCH jr nz, .MatchedSomething - ld hl, .Text_Darn + ld hl, .SlotsDarnText call PrintText farcall StubbedTrainerRankings_EndSlotsWinStreak ret @@ -1899,20 +1896,18 @@ Slots_PayoutText: ldcoord_a 3, 14 hlcoord 18, 17 ld [hl], "▼" - ld hl, .Text_LinedUpWonCoins + ld hl, .SlotsLinedUpText rept 4 inc bc endr ret -.Text_LinedUpWonCoins: - ; lined up! Won @ coins! - text_far UnknownText_0x1c509f +.SlotsLinedUpText: + text_far _SlotsLinedUpText text_end -.Text_Darn: - ; Darn! - text_far UnknownText_0x1c50bb +.SlotsDarnText: + text_far _SlotsDarnText text_end .LinedUpSevens: diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index ec500e85f..2426eba78 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -1075,21 +1075,21 @@ SGBBorder_MorePalPushing: ld a, $e4 ldh [rBGP], a ld de, vTiles1 - ld bc, 20 tiles + ld bc, (6 + SCREEN_WIDTH + 6) * 5 * 2 call CopyData - ld b, 18 + ld b, SCREEN_HEIGHT .loop push bc - ld bc, $c + ld bc, 6 * 2 call CopyData - ld bc, $28 + ld bc, SCREEN_WIDTH * 2 call ClearBytes - ld bc, $c + ld bc, 6 * 2 call CopyData pop bc dec b jr nz, .loop - ld bc, $140 + ld bc, (6 + SCREEN_WIDTH + 6) * 5 * 2 call CopyData ld bc, $100 call ClearBytes @@ -1195,6 +1195,7 @@ SGBBorderMap: INCBIN "gfx/sgb/sgb_border.bin" SGBBorderPalettes: +; assumed to come after SGBBorderMap INCLUDE "gfx/sgb/sgb_border.pal" SGBBorder: diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 35c20db70..96e0e0047 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -218,7 +218,7 @@ PokeBallEffect: ld hl, wOptions res NO_TEXT_SCROLL, [hl] - ld hl, UsedItemText + ld hl, ItemUsedText call PrintText ld a, [wEnemyMonCatchRate] @@ -399,16 +399,16 @@ PokeBallEffect: jr nz, .caught ld a, [wBuffer2] cp $1 - ld hl, Text_NoShake + ld hl, BallBrokeFreeText jp z, .shake_and_break_free cp $2 - ld hl, Text_OneShake + ld hl, BallAppearedCaughtText jp z, .shake_and_break_free cp $3 - ld hl, Text_TwoShakes + ld hl, BallAlmostHadItText jp z, .shake_and_break_free cp $4 - ld hl, Text_ThreeShakes + ld hl, BallSoCloseText jp z, .shake_and_break_free .caught @@ -517,7 +517,7 @@ PokeBallEffect: call CheckReceivedDex jr z, .skip_pokedex - ld hl, Text_AddedToPokedex + ld hl, NewDexDataText call PrintText call ClearSprites @@ -562,7 +562,7 @@ PokeBallEffect: ld [hl], a .SkipPartyMonFriendBall: - ld hl, Text_AskNicknameNewlyCaughtMon + ld hl, AskGiveNicknameText call PrintText ld a, [wCurPartySpecies] @@ -622,7 +622,7 @@ PokeBallEffect: .SkipBoxMonFriendBall: call CloseSRAM - ld hl, Text_AskNicknameNewlyCaughtMon + ld hl, AskGiveNicknameText call PrintText ld a, [wCurPartySpecies] @@ -665,7 +665,7 @@ PokeBallEffect: call CloseSRAM - ld hl, Text_SentToBillsPC + ld hl, BallSentToPCText call PrintText call RotateThreePalettesRight @@ -1061,39 +1061,33 @@ LevelBallMultiplier: ; These two texts were carried over from gen 1. ; They are not used in gen 2, and are dummied out. -Text_RBY_CatchMarowak: - ; It dodged the thrown BALL! This #MON can't be caught! - text_far UnknownText_0x1c5a5a +BallDodgedText: + text_far _BallDodgedText text_end -Text_RBY_NoShake: - ; You missed the #MON! - text_far UnknownText_0x1c5a90 +BallMissedText: + text_far _BallMissedText text_end -Text_NoShake: - ; Oh no! The #MON broke free! - text_far UnknownText_0x1c5aa6 +BallBrokeFreeText: + text_far _BallBrokeFreeText text_end -Text_OneShake: - ; Aww! It appeared to be caught! - text_far UnknownText_0x1c5ac3 +BallAppearedCaughtText: + text_far _BallAppearedCaughtText text_end -Text_TwoShakes: - ; Aargh! Almost had it! - text_far UnknownText_0x1c5ae3 +BallAlmostHadItText: + text_far _BallAlmostHadItText text_end -Text_ThreeShakes: - ; Shoot! It was so close too! - text_far UnknownText_0x1c5afa +BallSoCloseText: + text_far _BallSoCloseText text_end Text_GotchaMonWasCaught: ; Gotcha! @ was caught!@ @ - text_far UnknownText_0x1c5b17 + text_far Text_BallCaught text_asm call WaitSFX push bc @@ -1103,27 +1097,23 @@ Text_GotchaMonWasCaught: ld de, MUSIC_CAPTURE call PlayMusic pop bc - ld hl, TextJump_Waitbutton + ld hl, WaitButtonText ret -TextJump_Waitbutton: - ; @ - text_far Text_Waitbutton_2 +WaitButtonText: + text_far _WaitButtonText text_end -Text_SentToBillsPC: - ; was sent to BILL's PC. - text_far UnknownText_0x1c5b38 +BallSentToPCText: + text_far _BallSentToPCText text_end -Text_AddedToPokedex: - ; 's data was newly added to the #DEX.@ @ - text_far UnknownText_0x1c5b53 +NewDexDataText: + text_far _NewDexDataText text_end -Text_AskNicknameNewlyCaughtMon: - ; Give a nickname to @ ? - text_far UnknownText_0x1c5b7f +AskGiveNicknameText: + text_far _AskGiveNicknameText text_end ReturnToBattle_UseBall: @@ -1204,7 +1194,7 @@ VitaminEffect: call Play_SFX_FULL_HEAL - ld hl, Text_StatRose + ld hl, ItemStatRoseText call PrintText ld c, HAPPINESS_USEDITEM @@ -1213,7 +1203,7 @@ VitaminEffect: jp UseDisposableItem NoEffectMessage: - ld hl, WontHaveAnyEffectText + ld hl, ItemWontHaveEffectText call PrintText jp ClearPalettes @@ -1232,9 +1222,8 @@ RareCandy_StatBooster_ExitMenu: ld [wItemEffectSucceeded], a jp ClearPalettes -Text_StatRose: - ; 's @ rose. - text_far UnknownText_0x1c5b9a +ItemStatRoseText: + text_far _ItemStatRoseText text_end StatStrings: @@ -2055,14 +2044,13 @@ Softboiled_MilkDrinkFunction: .cant_use push bc - ld hl, .Text_CantBeUsed + ld hl, .ItemCantUseOnMonText call MenuTextboxBackup pop bc jr .loop -.Text_CantBeUsed: - ; That can't be used on this #MON. - text_far UnknownText_0x1c5bac +.ItemCantUseOnMonText: + text_far _ItemCantUseOnMonText text_end EscapeRopeEffect: @@ -2089,16 +2077,15 @@ RepelEffect: UseRepel: ld a, [wRepelEffect] and a - ld hl, TextJump_RepelUsedEarlierIsStillInEffect + ld hl, RepelUsedEarlierIsStillInEffectText jp nz, PrintText ld a, b ld [wRepelEffect], a jp UseItemText -TextJump_RepelUsedEarlierIsStillInEffect: - ; The REPEL used earlier is still in effect. - text_far Text_RepelUsedEarlierIsStillInEffect +RepelUsedEarlierIsStillInEffectText: + text_far _RepelUsedEarlierIsStillInEffectText text_end XAccuracyEffect: @@ -2205,7 +2192,7 @@ PokeFluteEffect: ld a, [wd002] and a - ld hl, .CatchyTune + ld hl, .PlayedFluteText jp z, PrintText ld hl, .PlayedTheFlute call PrintText @@ -2214,7 +2201,7 @@ PokeFluteEffect: and 1 << DANGER_ON_F jr nz, .dummy2 .dummy2 - ld hl, .AllSleepingMonWokeUp + ld hl, .FluteWakeUpText jp PrintText .CureSleep: @@ -2237,19 +2224,17 @@ PokeFluteEffect: jr nz, .loop ret -.CatchyTune: - ; Played the # FLUTE. Now, that's a catchy tune! - text_far UnknownText_0x1c5bf9 +.PlayedFluteText: + text_far _PlayedFluteText text_end -.AllSleepingMonWokeUp: - ; All sleeping #MON woke up. - text_far UnknownText_0x1c5c28 +.FluteWakeUpText: + text_far _FluteWakeUpText text_end .PlayedTheFlute: ; played the # FLUTE.@ @ - text_far UnknownText_0x1c5c44 + text_far Text_PlayedPokeFlute text_asm ld a, [wBattleMode] and a @@ -2265,19 +2250,19 @@ PokeFluteEffect: jp PokeFluteTerminatorCharacter BlueCardEffect: - ld hl, .bluecardtext + ld hl, .BlueCardBalanceText jp MenuTextboxWaitButton -.bluecardtext - text_far UnknownText_0x1c5c5e +.BlueCardBalanceText: + text_far _BlueCardBalanceText text_end CoinCaseEffect: - ld hl, .coincasetext + ld hl, .CoinCaseCountText jp MenuTextboxWaitButton -.coincasetext - text_far UnknownText_0x1c5c7b +.CoinCaseCountText: + text_far _CoinCaseCountText text_end OldRodEffect: @@ -2317,11 +2302,11 @@ RestorePPEffect: cp ELIXER jp z, Elixer_RestorePPofAllMoves - ld hl, TextJump_RaiseThePPOfWhichMove + ld hl, RaiseThePPOfWhichMoveText ld a, [wd002] cp PP_UP jr z, .ppup - ld hl, TextJump_RestoreThePPOfWhichMove + ld hl, RestoreThePPOfWhichMoveText .ppup call PrintText @@ -2365,7 +2350,7 @@ RestorePPEffect: .CantUsePPUpOnSketch: .pp_is_maxed_out - ld hl, TextJump_PPIsMaxedOut + ld hl, PPIsMaxedOutText call PrintText jr .loop2 @@ -2378,7 +2363,7 @@ RestorePPEffect: call ApplyPPUp call Play_SFX_FULL_HEAL - ld hl, TextJump_PPsIncreased + ld hl, PPsIncreasedText call PrintText FinishPPRestore: @@ -2401,7 +2386,7 @@ BattleRestorePP: .not_in_battle call Play_SFX_FULL_HEAL - ld hl, UnknownText_0xf739 + ld hl, PPRestoredText call PrintText jr FinishPPRestore @@ -2530,29 +2515,24 @@ RestorePP: xor a ret -TextJump_RaiseThePPOfWhichMove: - ; Raise the PP of which move? - text_far Text_RaiseThePPOfWhichMove +RaiseThePPOfWhichMoveText: + text_far _RaiseThePPOfWhichMoveText text_end -TextJump_RestoreThePPOfWhichMove: - ; Restore the PP of which move? - text_far Text_RestoreThePPOfWhichMove +RestoreThePPOfWhichMoveText: + text_far _RestoreThePPOfWhichMoveText text_end -TextJump_PPIsMaxedOut: - ; 's PP is maxed out. - text_far Text_PPIsMaxedOut +PPIsMaxedOutText: + text_far _PPIsMaxedOutText text_end -TextJump_PPsIncreased: - ; 's PP increased. - text_far Text_PPsIncreased +PPsIncreasedText: + text_far _PPsIncreasedText text_end -UnknownText_0xf739: - ; PP was restored. - text_far UnknownText_0x1c5cf1 +PPRestoredText: + text_far _PPRestoredText text_end SquirtbottleEffect: @@ -2584,14 +2564,13 @@ GorgeousBoxEffect: OpenBox: farcall SetSpecificDecorationFlag - ld hl, .text + ld hl, .SentTrophyHomeText call PrintText jp UseDisposableItem -.text - ; There was a trophy inside! - text_far UnknownText_0x1c5d03 +.SentTrophyHomeText: + text_far _SentTrophyHomeText text_end NoEffect: @@ -2605,7 +2584,7 @@ Play_SFX_FULL_HEAL: ret UseItemText: - ld hl, UsedItemText + ld hl, ItemUsedText call PrintText call Play_SFX_FULL_HEAL call WaitPressAorB_BlinkCursor @@ -2627,14 +2606,14 @@ UseBallInTrainerBattle: ldh [hBattleTurn], a ld [wNumHits], a predef PlayBattleAnim - ld hl, BlockedTheBallText + ld hl, BallBlockedText call PrintText - ld hl, DontBeAThiefText + ld hl, BallDontBeAThiefText call PrintText jr UseDisposableItem WontHaveAnyEffect_NotUsedMessage: - ld hl, WontHaveAnyEffectText + ld hl, ItemWontHaveEffectText call PrintText ; Item wasn't used. @@ -2643,11 +2622,11 @@ WontHaveAnyEffect_NotUsedMessage: ret LooksBitterMessage: - ld hl, LooksBitterText + ld hl, ItemLooksBitterText jp PrintText Ball_BoxIsFullMessage: - ld hl, Ball_BoxIsFullText + ld hl, BallBoxFullText call PrintText ; Item wasn't used. @@ -2656,27 +2635,27 @@ Ball_BoxIsFullMessage: ret CantUseOnEggMessage: - ld hl, CantUseOnEggText + ld hl, ItemCantUseOnEggText jr CantUseItemMessage IsntTheTimeMessage: - ld hl, IsntTheTimeText + ld hl, ItemOakWarningText jr CantUseItemMessage WontHaveAnyEffectMessage: - ld hl, WontHaveAnyEffectText + ld hl, ItemWontHaveEffectText jr CantUseItemMessage BelongsToSomeoneElseMessage: - ld hl, BelongsToSomeoneElseText + ld hl, ItemBelongsToSomeoneElseText jr CantUseItemMessage CyclingIsntAllowedMessage: - ld hl, CyclingIsntAllowedText + ld hl, NoCyclingText jr CantUseItemMessage CantGetOnYourBikeMessage: - ld hl, CantGetOnYourBikeText + ld hl, ItemCantGetOnText CantUseItemMessage: ; Item couldn't be used. @@ -2684,69 +2663,56 @@ CantUseItemMessage: ld [wItemEffectSucceeded], a jp PrintText -LooksBitterText: - ; It looks bitter… - text_far UnknownText_0x1c5d3e +ItemLooksBitterText: + text_far _ItemLooksBitterText text_end -CantUseOnEggText: - ; That can't be used on an EGG. - text_far UnknownText_0x1c5d50 +ItemCantUseOnEggText: + text_far _ItemCantUseOnEggText text_end -IsntTheTimeText: - ; OAK: ! This isn't the time to use that! - text_far UnknownText_0x1c5d6e +ItemOakWarningText: + text_far _ItemOakWarningText text_end -BelongsToSomeoneElseText: - ; That belongs to someone else! - text_far UnknownText_0x1c5d97 +ItemBelongsToSomeoneElseText: + text_far _ItemBelongsToSomeoneElseText text_end -WontHaveAnyEffectText: - ; It won't have any effect. - text_far UnknownText_0x1c5db6 +ItemWontHaveEffectText: + text_far _ItemWontHaveEffectText text_end -BlockedTheBallText: - ; The trainer blocked the BALL! - text_far UnknownText_0x1c5dd0 +BallBlockedText: + text_far _BallBlockedText text_end -DontBeAThiefText: - ; Don't be a thief! - text_far UnknownText_0x1c5def +BallDontBeAThiefText: + text_far _BallDontBeAThiefText text_end -CyclingIsntAllowedText: - ; Cycling isn't allowed here. - text_far UnknownText_0x1c5e01 +NoCyclingText: + text_far _NoCyclingText text_end -CantGetOnYourBikeText: - ; Can't get on your @ now. - text_far UnknownText_0x1c5e1d +ItemCantGetOnText: + text_far _ItemCantGetOnText text_end -Ball_BoxIsFullText: - ; The #MON BOX is full. That can't be used now. - text_far UnknownText_0x1c5e3a +BallBoxFullText: + text_far _BallBoxFullText text_end -UsedItemText: - ; used the@ . - text_far UnknownText_0x1c5e68 +ItemUsedText: + text_far _ItemUsedText text_end -GotOnTheItemText: - ; got on the@ . - text_far UnknownText_0x1c5e7b +ItemGotOnText: + text_far _ItemGotOnText text_end -GotOffTheItemText: - ; got off@ the @ . - text_far UnknownText_0x1c5e90 +ItemGotOffText: + text_far _ItemGotOffText text_end ApplyPPUp: diff --git a/engine/items/mart.asm b/engine/items/mart.asm index 0209aac23..98bb8324c 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -34,10 +34,10 @@ MartDialog: HerbShop: call FarReadMart call LoadStandardMenuHeader - ld hl, Text_HerbShop_Intro + ld hl, HerbShopLadyIntroText call MartTextbox call BuyMenu - ld hl, Text_HerbShop_ComeAgain + ld hl, HerbalLadyComeAgainText call MartTextbox ret @@ -47,7 +47,7 @@ BargainShop: call LoadMartPointer call ReadMart call LoadStandardMenuHeader - ld hl, Text_BargainShop_Intro + ld hl, BargainShopIntroText call MartTextbox call BuyMenu ld hl, wBargainShopFlags @@ -58,17 +58,17 @@ BargainShop: set DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F, [hl] .skip_set - ld hl, Text_BargainShop_ComeAgain + ld hl, BargainShopComeAgainText call MartTextbox ret Pharmacist: call FarReadMart call LoadStandardMenuHeader - ld hl, Text_Pharmacist_Intro + ld hl, PharmacyIntroText call MartTextbox call BuyMenu - ld hl, Text_Pharmacist_ComeAgain + ld hl, PharmacyComeAgainText call MartTextbox ret @@ -85,10 +85,10 @@ RooftopSale: call LoadMartPointer call ReadMart call LoadStandardMenuHeader - ld hl, Text_Mart_HowMayIHelpYou + ld hl, MartWelcomeText call MartTextbox call BuyMenu - ld hl, Text_Mart_ComeAgain + ld hl, MartComeAgainText call MartTextbox ret @@ -161,7 +161,7 @@ StandardMart: .HowMayIHelpYou: call LoadStandardMenuHeader - ld hl, Text_Mart_HowMayIHelpYou + ld hl, MartWelcomeText call PrintText ld a, STANDARDMART_TOPMENU ret @@ -202,14 +202,14 @@ StandardMart: .Quit: call ExitMenu - ld hl, Text_Mart_ComeAgain + ld hl, MartComeAgainText call MartTextbox ld a, STANDARDMART_EXIT ret .AnythingElse: call LoadStandardMenuHeader - ld hl, Text_Mart_AnythingElse + ld hl, MartAskMoreText call PrintText ld a, STANDARDMART_TOPMENU ret @@ -395,35 +395,35 @@ GetMartDialogGroup: dwb .StandardMartPointers, 2 .StandardMartPointers: - dw Text_Mart_HowMany - dw Text_Mart_CostsThisMuch - dw Text_Mart_InsufficientFunds - dw Text_Mart_BagFull - dw Text_Mart_HereYouGo + dw MartHowManyText + dw MartFinalPriceText + dw MartNoMoneyText + dw MartPackFullText + dw MartThanksText dw BuyMenuLoop .HerbShopPointers: - dw Text_HerbShop_HowMany - dw Text_HerbShop_CostsThisMuch - dw Text_HerbShop_InsufficientFunds - dw Text_HerbShop_BagFull - dw Text_HerbShop_HereYouGo + dw HerbalLadyHowManyText + dw HerbalLadyFinalPriceText + dw HerbalLadyNoMoneyText + dw HerbalLadyPackFullText + dw HerbalLadyThanksText dw BuyMenuLoop .BargainShopPointers: dw BuyMenuLoop - dw Text_BargainShop_CostsThisMuch - dw Text_BargainShop_InsufficientFunds - dw Text_BargainShop_BagFull - dw Text_BargainShop_HereYouGo - dw Text_BargainShop_SoldOut + dw BargainShopFinalPriceText + dw BargainShopNoFundsText + dw BargainShopPackFullText + dw BargainShopThanksText + dw BargainShopSoldOutText .PharmacyPointers: - dw Text_Pharmacy_HowMany - dw Text_Pharmacy_CostsThisMuch - dw Text_Pharmacy_InsufficientFunds - dw Text_Pharmacy_BagFull - dw Text_Pharmacy_HereYouGo + dw PharmacyHowManyText + dw PharmacyFinalPriceText + dw PharmacyNoMoneyText + dw PharmacyPackFullText + dw PharmacyThanksText dw BuyMenuLoop BuyMenuLoop: @@ -581,14 +581,12 @@ RooftopSaleAskPurchaseQuantity: ld d, [hl] ret -Text_Mart_HowMany: - ; How many? - text_far UnknownText_0x1c4bfd +MartHowManyText: + text_far _MartHowManyText text_end -Text_Mart_CostsThisMuch: - ; @ (S) will be ¥@ . - text_far UnknownText_0x1c4c08 +MartFinalPriceText: + text_far _MartFinalPriceText text_end MenuHeader_Buy: @@ -624,109 +622,88 @@ MenuHeader_Buy: call PrintBCDNumber ret -Text_HerbShop_Intro: - ; Hello, dear. I sell inexpensive herbal medicine. They're good, but a trifle bitter. Your #MON may not like them. Hehehehe… - text_far UnknownText_0x1c4c28 +HerbShopLadyIntroText: + text_far _HerbShopLadyIntroText text_end -Text_HerbShop_HowMany: - ; How many? - text_far UnknownText_0x1c4ca3 +HerbalLadyHowManyText: + text_far _HerbalLadyHowManyText text_end -Text_HerbShop_CostsThisMuch: - ; @ (S) will be ¥@ . - text_far UnknownText_0x1c4cae +HerbalLadyFinalPriceText: + text_far _HerbalLadyFinalPriceText text_end -Text_HerbShop_HereYouGo: - ; Thank you, dear. Hehehehe… - text_far UnknownText_0x1c4cce +HerbalLadyThanksText: + text_far _HerbalLadyThanksText text_end -Text_HerbShop_BagFull: - ; Oh? Your PACK is full, dear. - text_far UnknownText_0x1c4cea +HerbalLadyPackFullText: + text_far _HerbalLadyPackFullText text_end -Text_HerbShop_InsufficientFunds: - ; Hehehe… You don't have the money. - text_far UnknownText_0x1c4d08 +HerbalLadyNoMoneyText: + text_far _HerbalLadyNoMoneyText text_end -Text_HerbShop_ComeAgain: - ; Come again, dear. Hehehehe… - text_far UnknownText_0x1c4d2a +HerbalLadyComeAgainText: + text_far _HerbalLadyComeAgainText text_end -Text_BargainShop_Intro: - ; Hiya! Care to see some bargains? I sell rare items that nobody else carries--but only one of each item. - text_far UnknownText_0x1c4d47 +BargainShopIntroText: + text_far _BargainShopIntroText text_end -Text_BargainShop_CostsThisMuch: - ; costs ¥@ . Want it? - text_far UnknownText_0x1c4db0 +BargainShopFinalPriceText: + text_far _BargainShopFinalPriceText text_end -Text_BargainShop_HereYouGo: - ; Thanks. - text_far UnknownText_0x1c4dcd +BargainShopThanksText: + text_far _BargainShopThanksText text_end -Text_BargainShop_BagFull: - ; Uh-oh, your PACK is chock-full. - text_far UnknownText_0x1c4dd6 +BargainShopPackFullText: + text_far _BargainShopPackFullText text_end -Text_BargainShop_SoldOut: - ; You bought that already. I'm all sold out of it. - text_far UnknownText_0x1c4df7 +BargainShopSoldOutText: + text_far _BargainShopSoldOutText text_end -Text_BargainShop_InsufficientFunds: - ; Uh-oh, you're short on funds. - text_far UnknownText_0x1c4e28 +BargainShopNoFundsText: + text_far _BargainShopNoFundsText text_end -Text_BargainShop_ComeAgain: - ; Come by again sometime. - text_far UnknownText_0x1c4e46 +BargainShopComeAgainText: + text_far _BargainShopComeAgainText text_end -Text_Pharmacist_Intro: - ; What's up? Need some medicine? - text_far UnknownText_0x1c4e5f +PharmacyIntroText: + text_far _PharmacyIntroText text_end -Text_Pharmacy_HowMany: - ; How many? - text_far UnknownText_0x1c4e7e +PharmacyHowManyText: + text_far _PharmacyHowManyText text_end -Text_Pharmacy_CostsThisMuch: - ; @ (S) will cost ¥@ . - text_far UnknownText_0x1c4e89 +PharmacyFinalPriceText: + text_far _PharmacyFinalPriceText text_end -Text_Pharmacy_HereYouGo: - ; Thanks much! - text_far UnknownText_0x1c4eab +PharmacyThanksText: + text_far _PharmacyThanksText text_end -Text_Pharmacy_BagFull: - ; You don't have any more space. - text_far UnknownText_0x1c4eb9 +PharmacyPackFullText: + text_far _PharmacyPackFullText text_end -Text_Pharmacy_InsufficientFunds: - ; Huh? That's not enough money. - text_far UnknownText_0x1c4ed8 +PharmacyNoMoneyText: + text_far _PharmacyNoMoneyText text_end -Text_Pharmacist_ComeAgain: - ; All right. See you around. - text_far UnknownText_0x1c4ef6 +PharmacyComeAgainText: + text_far _PharmacyComeAgainText text_end SellMenu: @@ -752,8 +729,7 @@ SellMenu: ret .NothingToSellText: - ; You don't have anything to sell. - text_far UnknownText_0x1c4f12 + text_far _NothingToSellText text_end .TryToSellItem: @@ -780,13 +756,13 @@ SellMenu: ld a, [wItemAttributeParamBuffer] and a jr z, .okay_to_sell - ld hl, TextMart_CantBuyFromYou + ld hl, MartCantBuyText call PrintText and a ret .okay_to_sell - ld hl, Text_Mart_SellHowMany + ld hl, MartSellHowManyText call PrintText farcall PlaceMoneyAtTopLeftOfTextbox farcall SelectQuantityToSell @@ -795,7 +771,7 @@ SellMenu: hlcoord 1, 14 lb bc, 3, 18 call ClearBox - ld hl, Text_Mart_ICanPayThisMuch + ld hl, MartSellPriceText call PrintTextboxText call YesNoBox jr c, .declined @@ -809,7 +785,7 @@ SellMenu: hlcoord 1, 14 lb bc, 3, 18 call ClearBox - ld hl, Text_Mart_SoldForAmount + ld hl, MartBoughtText call PrintTextboxText call PlayTransactionSound farcall PlaceMoneyBottomLeft @@ -820,22 +796,19 @@ SellMenu: and a ret -Text_Mart_SellHowMany: - ; How many? - text_far UnknownText_0x1c4f33 +MartSellHowManyText: + text_far _MartSellHowManyText text_end -Text_Mart_ICanPayThisMuch: - ; I can pay you ¥@ . Is that OK? - text_far UnknownText_0x1c4f3e +MartSellPriceText: + text_far _MartSellPriceText text_end .UnusedString15f7d: db "！ダミー！@" -Text_Mart_HowMayIHelpYou: - ; Welcome! How may I help you? - text_far UnknownText_0x1c4f62 +MartWelcomeText: + text_far _MartWelcomeText text_end MenuHeader_BuySell: @@ -851,37 +824,32 @@ MenuHeader_BuySell: db "SELL@" db "QUIT@" -Text_Mart_HereYouGo: - ; Here you are. Thank you! - text_far UnknownText_0x1c4f80 +MartThanksText: + text_far _MartThanksText text_end -Text_Mart_InsufficientFunds: - ; You don't have enough money. - text_far UnknownText_0x1c4f9a +MartNoMoneyText: + text_far _MartNoMoneyText text_end -Text_Mart_BagFull: - ; You can't carry any more items. - text_far UnknownText_0x1c4fb7 +MartPackFullText: + text_far _MartPackFullText text_end -TextMart_CantBuyFromYou: - ; Sorry, I can't buy that from you. - text_far UnknownText_0x1c4fd7 +MartCantBuyText: + text_far _MartCantBuyText text_end -Text_Mart_ComeAgain: - ; Please come again! - text_far UnknownText_0x1c4ff9 +MartComeAgainText: + text_far _MartComeAgainText text_end -Text_Mart_AnythingElse: - text_far UnknownText_0x1c500d +MartAskMoreText: + text_far _MartAskMoreText text_end -Text_Mart_SoldForAmount: - text_far UnknownText_0x1c502e +MartBoughtText: + text_far _MartBoughtText text_end PlayTransactionSound: diff --git a/engine/items/pack.asm b/engine/items/pack.asm index d5d331720..f19539b88 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -440,7 +440,7 @@ UseItem: dw .Field ; ITEMMENU_CLOSE .Oak: - ld hl, Text_ThisIsntTheTime + ld hl, OakThisIsntTheTimeText call Pack_PrintTextNoScroll ret @@ -461,7 +461,7 @@ UseItem: ret .NoPokemon: - ld hl, TextJump_YouDontHaveAMon + ld hl, YouDontHaveAMonText call Pack_PrintTextNoScroll ret @@ -475,7 +475,7 @@ UseItem: ret TossMenu: - ld hl, Text_ThrowAwayHowMany + ld hl, AskThrowAwayText call Pack_PrintTextNoScroll farcall SelectQuantityToToss push af @@ -483,7 +483,7 @@ TossMenu: pop af jr c, .finish call Pack_GetItemName - ld hl, Text_ConfirmThrowAway + ld hl, AskQuantityThrowAwayText call MenuTextbox call YesNoBox push af @@ -494,7 +494,7 @@ TossMenu: ld a, [wCurItemQuantity] call TossItem call Pack_GetItemName - ld hl, Text_ThrewAway + ld hl, ThrewAwayText call Pack_PrintTextNoScroll .finish ret @@ -547,12 +547,12 @@ RegisterItem: call Pack_GetItemName ld de, SFX_FULL_HEAL call WaitPlaySFX - ld hl, Text_RegisteredItem + ld hl, RegisteredItemText call Pack_PrintTextNoScroll ret .cant_register - ld hl, Text_CantRegister + ld hl, CantRegisterText call Pack_PrintTextNoScroll ret @@ -581,7 +581,7 @@ GiveItem: ld a, [wCurPartySpecies] cp EGG jr nz, .give - ld hl, .Egg + ld hl, .AnEggCantHoldAnItemText call PrintText jr .loop @@ -611,12 +611,11 @@ GiveItem: ret .NoPokemon: - ld hl, TextJump_YouDontHaveAMon + ld hl, YouDontHaveAMonText call Pack_PrintTextNoScroll ret -.Egg: - ; An EGG can't hold an item. - text_far Text_AnEGGCantHoldAnItem +.AnEggCantHoldAnItemText: + text_far _AnEggCantHoldAnItemText text_end QuitItemSubmenu: @@ -735,7 +734,7 @@ BattlePack: xor a ldh [hBGMapMode], a call WaitBGMap_DrawPackGFX - ld hl, Text_PackEmptyString + ld hl, PackEmptyText call Pack_PrintTextNoScroll call Pack_JumptableNext ret @@ -851,7 +850,7 @@ TMHMSubmenu: dw .BattleOnly ; ITEMMENU_CLOSE .Oak: - ld hl, Text_ThisIsntTheTime + ld hl, OakThisIsntTheTimeText call Pack_PrintTextNoScroll ret @@ -1298,7 +1297,7 @@ Pack_InterpretJoypad: .select farcall SwitchItemsInBag - ld hl, Text_MoveItemWhere + ld hl, AskItemMoveText call Pack_PrintTextNoScroll scf ret @@ -1546,60 +1545,48 @@ PC_Mart_BallsPocketMenuHeader: dba PlaceMenuItemQuantity dba UpdateItemDescription -Text_PackNoItems: - ; No items. - text_far UnknownText_0x1c0b9a +PackNoItemText: + text_far _PackNoItemText text_end -Text_ThrowAwayHowMany: - ; Throw away how many? - text_far UnknownText_0x1c0ba5 +AskThrowAwayText: + text_far _AskThrowAwayText text_end -Text_ConfirmThrowAway: - ; Throw away @ @ (S)? - text_far UnknownText_0x1c0bbb +AskQuantityThrowAwayText: + text_far _AskQuantityThrowAwayText text_end -Text_ThrewAway: - ; Threw away @ (S). - text_far UnknownText_0x1c0bd8 +ThrewAwayText: + text_far _ThrewAwayText text_end -Text_ThisIsntTheTime: - ; OAK: ! This isn't the time to use that! - text_far UnknownText_0x1c0bee +OakThisIsntTheTimeText: + text_far _OakThisIsntTheTimeText text_end -TextJump_YouDontHaveAMon: - ; You don't have a #MON! - text_far Text_YouDontHaveAMon +YouDontHaveAMonText: + text_far _YouDontHaveAMonText text_end -Text_RegisteredItem: - ; Registered the @ . - text_far UnknownText_0x1c0c2e +RegisteredItemText: + text_far _RegisteredItemText text_end -Text_CantRegister: - ; You can't register that item. - text_far UnknownText_0x1c0c45 +CantRegisterText: + text_far _CantRegisterText text_end -Text_MoveItemWhere: - ; Where should this be moved to? - text_far UnknownText_0x1c0c63 +AskItemMoveText: + text_far _AskItemMoveText text_end -Text_PackEmptyString: - ; - text_far UnknownText_0x1c0c83 +PackEmptyText: + text_far _PackEmptyText text_end -TextJump_YouCantUseItInABattle: - ; Doesn't seem to be used anywhere - ; "You can't use it in a battle." - text_far Text_YouCantUseItInABattle +YouCantUseItInABattleText: + text_far _YouCantUseItInABattleText text_end PackMenuGFX: diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index d82b5829e..736f00cdb 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -54,14 +54,14 @@ AskTeachTMHM: ld [wPutativeTMHMMove], a call GetMoveName call CopyName1 - ld hl, Text_BootedTM ; Booted up a TM + ld hl, BootedTMText ; Booted up a TM ld a, [wCurItem] cp HM01 jr c, .TM - ld hl, Text_BootedHM ; Booted up an HM + ld hl, BootedHMText ; Booted up an HM .TM: call PrintText - ld hl, Text_ItContained + ld hl, ContainedMoveText call PrintText call YesNoBox .NotTMHM: @@ -132,7 +132,7 @@ TeachTMHM: ld de, SFX_WRONG call PlaySFX pop de - ld hl, Text_TMHMNotCompatible + ld hl, TMHMNotCompatibleText call PrintText jr .nope @@ -166,24 +166,20 @@ TeachTMHM: scf ret -Text_BootedTM: - ; Booted up a TM. - text_far UnknownText_0x1c0373 +BootedTMText: + text_far _BootedTMText text_end -Text_BootedHM: - ; Booted up an HM. - text_far UnknownText_0x1c0384 +BootedHMText: + text_far _BootedHMText text_end -Text_ItContained: - ; It contained @ . Teach @ to a #MON? - text_far UnknownText_0x1c0396 +ContainedMoveText: + text_far _ContainedMoveText text_end -Text_TMHMNotCompatible: - ; is not compatible with @ . It can't learn @ . - text_far UnknownText_0x1c03c2 +TMHMNotCompatibleText: + text_far _TMHMNotCompatibleText text_end TMHM_PocketLoop: @@ -375,7 +371,7 @@ TMHM_DisplayPocketItems: ld [hl], "H" inc hl ld de, wTempTMHM - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + lb bc, PRINTNUM_LEFTALIGN | 1, 2 call PrintNum pop af ld [wTempTMHM], a @@ -491,20 +487,18 @@ TMHM_PlaySFX_ReadText2: Unreferenced_Function2cadf: call ConvertCurItemIntoCurTMHM call .CheckHaveRoomForTMHM - ld hl, .NoRoomText + ld hl, .NoRoomTMHMText jr nc, .print - ld hl, .ReceivedText + ld hl, .ReceivedTMHMText .print jp PrintText -.NoRoomText: - ; You have no room for any more @ S. - text_far UnknownText_0x1c03fa +.NoRoomTMHMText: + text_far _NoRoomTMHMText text_end -.ReceivedText: - ; You received @ ! - text_far UnknownText_0x1c0421 +.ReceivedTMHMText: + text_far _ReceivedTMHMText text_end .CheckHaveRoomForTMHM: diff --git a/engine/link/link.asm b/engine/link/link.asm index 9cb29801c..077b3a9f0 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -371,13 +371,13 @@ Gen2ToGen2LinkComms: jr z, .next sub $3 jr nc, .skip - farcall DeutenEnglischenPost + farcall ConvertEnglishMailToFrenchGerman jr .next .skip cp $2 jr nc, .next - farcall HandleSpanishItalianMail + farcall ConvertEnglishMailToSpanishItalian .next pop de @@ -475,7 +475,7 @@ Gen2ToGen2LinkComms: jp InitTradeMenuDisplay LinkTimeout: - ld de, .TooMuchTimeHasElapsed + ld de, .LinkTimeoutText ld b, 10 .loop call DelayFrame @@ -505,9 +505,8 @@ LinkTimeout: call WaitBGMap2 ret -.TooMuchTimeHasElapsed: - ; Too much time has elapsed. Please try again. - text_far UnknownText_0x1c4183 +.LinkTimeoutText: + text_far _LinkTimeoutText text_end ExchangeBytes: @@ -876,13 +875,13 @@ Link_PrepPartyData_Gen2: jr z, .next sub $3 jr nc, .italian_spanish - farcall HandleFrenchGermanMail + farcall ConvertFrenchGermanMailToEnglish jr .next .italian_spanish cp $2 jr nc, .next - farcall HandleSpanishItalianMail + farcall ConvertSpanishItalianMailToEnglish .next pop de @@ -1446,7 +1445,7 @@ Function28926: ld c, 18 call LinkTextboxAtHL farcall Link_WaitBGMap - ld hl, .Text_CantTradeLastMon + ld hl, .LinkTradeCantBattleText bccoord 1, 14 call PlaceHLTextAtBC jr .cancel_trade @@ -1468,7 +1467,7 @@ Function28926: ld c, 18 call LinkTextboxAtHL farcall Link_WaitBGMap - ld hl, .Text_Abnormal + ld hl, .LinkAbnormalMonText bccoord 1, 14 call PlaceHLTextAtBC @@ -1487,17 +1486,15 @@ Function28926: call DelayFrames jp InitTradeMenuDisplay -.Text_CantTradeLastMon: - ; If you trade that #MON, you won't be able to battle. - text_far UnknownText_0x1c41b1 +.LinkTradeCantBattleText: + text_far _LinkTradeCantBattleText text_end .String_Stats_Trade: db "STATS TRADE@" -.Text_Abnormal: - ; Your friend's @ appears to be abnormal! - text_far UnknownText_0x1c41e6 +.LinkAbnormalMonText: + text_far _LinkAbnormalMonText text_end Function28ac9: @@ -1633,7 +1630,7 @@ LinkTrade: ld a, [hl] ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, UnknownText_0x28eb8 + ld hl, LinkAskTradeForText bccoord 1, 14 call PlaceHLTextAtBC call LoadStandardMenuHeader @@ -1948,9 +1945,8 @@ String28eab: db "TRADE" next "CANCEL@" -UnknownText_0x28eb8: - ; Trade @ for @ ? - text_far UnknownText_0x1c4212 +LinkAskTradeForText: + text_far _LinkAskTradeForText text_end String28ebd: @@ -2092,7 +2088,7 @@ EnterTimeCapsule: call DelayFrames xor a ldh [hVBlank], a - inc a + inc a ; LINK_TIMECAPSULE ld [wLinkMode], a ret diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 041127abe..7c6ce7d7b 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -33,7 +33,7 @@ DoMysteryGift: pop de hlcoord 2, 8 ld a, d - ld de, .Text_LinkCanceled ; Link has been canceled + ld de, .MysteryGiftCanceledText ; Link has been canceled cp $10 jp z, .LinkCanceled cp $6c @@ -42,10 +42,10 @@ DoMysteryGift: cp 3 jr z, .skip_checks call .CheckAlreadyGotFiveGiftsToday - ld hl, .Text_MaxFiveGifts ; Only 5 gifts a day + ld hl, .MysteryGiftFiveADayText ; Only 5 gifts a day jp nc, .PrintTextAndExit call .CheckAlreadyGotAGiftFromThatPerson - ld hl, .Text_MaxOneGiftPerPerson ; Only one gift a day per person + ld hl, .MysteryGiftOneADayText ; Only one gift a day per person jp c, .PrintTextAndExit .skip_checks ld a, [wMysteryGiftPlayerBackupItem] @@ -82,7 +82,7 @@ DoMysteryGift: ld de, wStringBuffer1 ld bc, ITEM_NAME_LENGTH call CopyBytes - ld hl, .Text_SentToHome ; sent decoration to home + ld hl, .MysteryGiftSentHomeText ; sent decoration to home jr .PrintTextAndExit .item @@ -95,24 +95,24 @@ DoMysteryGift: ld [wNamedObjectIndexBuffer], a call CloseSRAM call GetItemName - ld hl, .Text_Sent ; sent item + ld hl, .MysteryGiftSentText ; sent item jr .PrintTextAndExit .LinkCanceled: - ld hl, .Text_LinkCanceled ; Link has been canceled + ld hl, .MysteryGiftCanceledText ; Link has been canceled jr .PrintTextAndExit .CommunicationError: - ld hl, .Text_CommunicationError ; Communication error + ld hl, .MysteryGiftCommErrorText ; Communication error call PrintText jp DoMysteryGift .GiftWaiting: - ld hl, .Text_ReceiveGiftAtCounter ; receive gift at counter + ld hl, .RetrieveMysteryGiftText ; receive gift at counter jr .PrintTextAndExit .FriendNotReady: - ld hl, .Text_FriendNotReady ; friend not ready + ld hl, .YourFriendIsNotReadyText ; friend not ready .PrintTextAndExit: call PrintText @@ -127,36 +127,36 @@ DoMysteryGift: next "cancel it." db "@" -.Text_LinkCanceled: - text_far UnknownText_0x1c0436 +.MysteryGiftCanceledText: + text_far _MysteryGiftCanceledText text_end -.Text_CommunicationError: - text_far UnknownText_0x1c0454 +.MysteryGiftCommErrorText: + text_far _MysteryGiftCommErrorText text_end -.Text_ReceiveGiftAtCounter: - text_far UnknownText_0x1c046a +.RetrieveMysteryGiftText: + text_far _RetrieveMysteryGiftText text_end -.Text_FriendNotReady: - text_far UnknownText_0x1c048e +.YourFriendIsNotReadyText: + text_far _YourFriendIsNotReadyText text_end -.Text_MaxFiveGifts: - text_far UnknownText_0x1c04a7 +.MysteryGiftFiveADayText: + text_far _MysteryGiftFiveADayText text_end -.Text_MaxOneGiftPerPerson: - text_far UnknownText_0x1c04c6 +.MysteryGiftOneADayText: + text_far _MysteryGiftOneADayText text_end -.Text_Sent: - text_far UnknownText_0x1c04e9 +.MysteryGiftSentText: + text_far _MysteryGiftSentText text_end -.Text_SentToHome: - text_far UnknownText_0x1c04fa +.MysteryGiftSentHomeText: + text_far _MysteryGiftSentHomeText text_end .CheckAlreadyGotFiveGiftsToday: @@ -1425,15 +1425,15 @@ Function105688: ld c, 60 call DelayFrames call Function105777 - ld hl, Text_ReceivedCard + ld hl, MysteryGiftReceivedCardText call PrintText ld de, wMysteryGiftTrainerData farcall Function8ac70 ld a, c ld [wDeciramBuffer], a - ld hl, Text_CardNotRegistered + ld hl, MysteryGiftNotRegisteredCardText jr c, PrintTextAndExit_JP - ld hl, Text_ListedCardAsNumber + ld hl, MysteryGiftListedCardText jr PrintTextAndExit_JP Function1056eb: @@ -1467,12 +1467,12 @@ endr Function105712: call Function105777 - ld hl, Text_MGLinkCanceled + ld hl, MysteryGiftLinkCancelledText jr PrintTextAndExit_JP Function10571a: call Function105777 - ld hl, Text_MGCommError + ld hl, MysteryGiftLinkCommErrorText call PrintText jp Function105688 @@ -1489,24 +1489,24 @@ String_PressAToLink_BToCancel_JP: next "つうしん<WO>ちゅうし します" db "@" -Text_ReceivedCard: - text_far UnknownText_0x1c051a +MysteryGiftReceivedCardText: + text_far _MysteryGiftReceivedCardText text_end -Text_ListedCardAsNumber: - text_far UnknownText_0x1c0531 +MysteryGiftListedCardText: + text_far _MysteryGiftListedCardText text_end -Text_CardNotRegistered: - text_far UnknownText_0x1c0555 +MysteryGiftNotRegisteredCardText: + text_far _MysteryGiftNotRegisteredCardText text_end -Text_MGLinkCanceled: - text_far UnknownText_0x1c0573 +MysteryGiftLinkCancelledText: + text_far _MysteryGiftLinkCancelledText text_end -Text_MGCommError: - text_far UnknownText_0x1c0591 +MysteryGiftLinkCommErrorText: + text_far _MysteryGiftLinkCommErrorText text_end Function105777: diff --git a/engine/math/print_num.asm b/engine/math/print_num.asm index 62ef97fb3..409379257 100644 --- a/engine/math/print_num.asm +++ b/engine/math/print_num.asm @@ -6,7 +6,7 @@ _PrintNum:: ; digits will be in front of the decimal point. ; Some extra flags can be given in bits 5-7 of b. ; Bit 5: money if set (unless left-aligned without leading zeros) -; Bit 6: right-aligned if set +; Bit 6: left-aligned if set ; Bit 7: print leading zeros if set push bc diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm index 85b25e54b..97b27ac2d 100644 --- a/engine/menus/delete_save.asm +++ b/engine/menus/delete_save.asm @@ -6,7 +6,7 @@ _DeleteSaveData: call LoadFontsExtra ld de, MUSIC_MAIN_MENU call PlayMusic - ld hl, .Text_ClearAllSaveData + ld hl, .ClearAllSaveDataText call PrintText ld hl, .NoYesMenuHeader call CopyMenuHeader @@ -18,9 +18,8 @@ _DeleteSaveData: farcall EmptyAllSRAMBanks ret -.Text_ClearAllSaveData: - ; Clear all save data? - text_far UnknownText_0x1c564a +.ClearAllSaveDataText: + text_far _ClearAllSaveDataText text_end .NoYesMenuHeader: diff --git a/engine/menus/init_gender.asm b/engine/menus/init_gender.asm index 4c1f3a8f9..c5cc95bf3 100644 --- a/engine/menus/init_gender.asm +++ b/engine/menus/init_gender.asm @@ -27,7 +27,7 @@ InitGender: call LoadGenderScreenLightBlueTile call WaitBGMap2 call SetPalettes - ld hl, TextJump_AreYouABoyOrAreYouAGirl + ld hl, AreYouABoyOrAreYouAGirlText call PrintText ld hl, .MenuHeader call LoadMenuHeader @@ -53,9 +53,8 @@ InitGender: db "Boy@" db "Girl@" -TextJump_AreYouABoyOrAreYouAGirl: - ; Are you a boy? Or are you a girl? - text_far Text_AreYouABoyOrAreYouAGirl +AreYouABoyOrAreYouAGirlText: + text_far _AreYouABoyOrAreYouAGirlText text_end InitGenderScreen: diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index c7c3058d1..33c6ce759 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -957,6 +957,8 @@ CrystalIntroSequence: jr c, StartTitleScreen farcall CrystalIntro + ; fallthrough + StartTitleScreen: ldh a, [rSVBK] push af diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 281000352..9274694da 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -280,9 +280,8 @@ MainMenu_PrintCurrentTimeAndDay: .TimeNotSet: db "TIME NOT SET@" -.UnusedText: - ; Clock time unknown - text_far UnknownText_0x1c5182 +.MainMenuTimeUnknownText: + text_far _MainMenuTimeUnknownText text_end .PlaceCurrentDay: diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm index f9f395329..544f4ade8 100644 --- a/engine/menus/menu.asm +++ b/engine/menus/menu.asm @@ -725,14 +725,14 @@ Unreferenced_Function24423: ret Error_Cant_ExitMenu: - ld hl, .Text_NoWindowsAvailableForPopping + ld hl, .WindowPoppingErrorText call PrintText call WaitBGMap -.InfiniteLoop: - jr .InfiniteLoop +.infinite_loop + jr .infinite_loop -.Text_NoWindowsAvailableForPopping: - text_far UnknownText_0x1c46b7 +.WindowPoppingErrorText: + text_far _WindowPoppingErrorText text_end _InitVerticalMenuCursor:: diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm index 0a398d259..67a93c74f 100644 --- a/engine/menus/menu_2.asm +++ b/engine/menus/menu_2.asm @@ -161,7 +161,7 @@ StartMenu_PrintBugContestStatus: call PlaceString hlcoord 8, 5 ld de, wParkBallsRemaining - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + lb bc, PRINTNUM_LEFTALIGN | 1, 2 call PrintNum hlcoord 1, 1 ld de, .CAUGHT @@ -187,7 +187,7 @@ StartMenu_PrintBugContestStatus: ld l, c inc hl ld c, 3 - call Print8BitNumRightAlign + call Print8BitNumLeftAlign .skip_level pop af diff --git a/engine/menus/save.asm b/engine/menus/save.asm index e7dcb026a..5d2138044 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -4,7 +4,7 @@ SaveMenu: call SpeechTextbox call UpdateSprites farcall SaveMenu_CopyTilemapAtOnce - ld hl, Text_WouldYouLikeToSaveTheGame + ld hl, WouldYouLikeToSaveTheGameText call SaveTheGame_yesorno jr nz, .refused call AskOverwriteSaveFile @@ -38,7 +38,7 @@ SaveAfterLinkTrade: ChangeBoxSaveGame: push de - ld hl, Text_SaveOnBoxSwitch + ld hl, ChangeBoxSaveText call MenuTextbox call YesNoBox call ExitMenu @@ -115,7 +115,7 @@ MoveMonWOMail_InsertMon_SaveGame: ret StartMoveMonWOMail_SaveGame: - ld hl, Text_SaveOnMoveMonWOMail + ld hl, MoveMonWOMailSaveText call MenuTextbox call YesNoBox call ExitMenu @@ -173,13 +173,13 @@ AskOverwriteSaveFile: jr z, .erase call CompareLoadedAndSavedPlayerID jr z, .yoursavefile - ld hl, Text_AnotherSaveFile + ld hl, AnotherSaveFileText call SaveTheGame_yesorno jr nz, .refused jr .erase .yoursavefile - ld hl, Text_AlreadyASaveFile + ld hl, AlreadyASaveFileText call SaveTheGame_yesorno jr nz, .refused jr .ok @@ -196,7 +196,7 @@ AskOverwriteSaveFile: ret SaveTheGame_yesorno: - ld b, BANK(Text_WouldYouLikeToSaveTheGame) + ld b, BANK(WouldYouLikeToSaveTheGameText) call MapTextbox call LoadMenuTextbox lb bc, 0, 7 @@ -239,7 +239,7 @@ SavedTheGame: ld a, TEXT_DELAY_MED ld [wOptions], a ; <PLAYER> saved the game! - ld hl, Text_PlayerSavedTheGame + ld hl, SavedTheGameText call PrintText ; restore the original text speed setting pop af @@ -336,7 +336,7 @@ SavingDontTurnOffThePower: ld a, TEXT_DELAY_MED ld [wOptions], a ; SAVING... DON'T TURN OFF THE POWER. - ld hl, Text_SavingDontTurnOffThePower + ld hl, SavingDontTurnOffThePowerText call PrintText ; Restore the text speed setting pop af @@ -391,11 +391,10 @@ EraseHallOfFame: jp CloseSRAM Unreferenced_Function14d18: -; copy .Data to SRA4:a007 - ld a, 4 ; MBC30 bank used by JP Crystal; inaccessible by MBC3 + ld a, BANK(s4_a007) call GetSRAMBank ld hl, .Data - ld de, $a007 ; address of MBC30 bank + ld de, s4_a007 ld bc, .DataEnd - .Data call CopyBytes jp CloseSRAM @@ -619,7 +618,7 @@ TryLoadSaveFile: push af set NO_TEXT_SCROLL, a ld [wOptions], a - ld hl, Text_SaveFileCorrupted + ld hl, SaveFileCorruptedText call PrintText pop af ld [wOptions], a @@ -833,9 +832,9 @@ _SaveData: ld hl, wd479 ld a, [hli] - ld [$a60e + 0], a + ld [s4_a60e + 0], a ld a, [hli] - ld [$a60e + 1], a + ld [s4_a60e + 1], a jp CloseSRAM @@ -851,9 +850,9 @@ _LoadData: ; (harmlessly) writes the aforementioned wEventFlags to the unused wd479. ld hl, wd479 - ld a, [$a60e + 0] + ld a, [s4_a60e + 0] ld [hli], a - ld a, [$a60e + 1] + ld a, [s4_a60e + 1] ld [hli], a jp CloseSRAM @@ -1095,42 +1094,34 @@ Checksum: jr nz, .loop ret -Text_WouldYouLikeToSaveTheGame: - ; Would you like to save the game? - text_far UnknownText_0x1c454b +WouldYouLikeToSaveTheGameText: + text_far _WouldYouLikeToSaveTheGameText text_end -Text_SavingDontTurnOffThePower: - ; SAVING… DON'T TURN OFF THE POWER. - text_far UnknownText_0x1c456d +SavingDontTurnOffThePowerText: + text_far _SavingDontTurnOffThePowerText text_end -Text_PlayerSavedTheGame: - ; saved the game. - text_far UnknownText_0x1c4590 +SavedTheGameText: + text_far _SavedTheGameText text_end -Text_AlreadyASaveFile: - ; There is already a save file. Is it OK to overwrite? - text_far UnknownText_0x1c45a3 +AlreadyASaveFileText: + text_far _AlreadyASaveFileText text_end -Text_AnotherSaveFile: - ; There is another save file. Is it OK to overwrite? - text_far UnknownText_0x1c45d9 +AnotherSaveFileText: + text_far _AnotherSaveFileText text_end -Text_SaveFileCorrupted: - ; The save file is corrupted! - text_far UnknownText_0x1c460d +SaveFileCorruptedText: + text_far _SaveFileCorruptedText text_end -Text_SaveOnBoxSwitch: - ; When you change a #MON BOX, data will be saved. OK? - text_far UnknownText_0x1c462a +ChangeBoxSaveText: + text_far _ChangeBoxSaveText text_end -Text_SaveOnMoveMonWOMail: - ; Each time you move a #MON, data will be saved. OK? - text_far UnknownText_0x1c465f +MoveMonWOMailSaveText: + text_far _MoveMonWOMailSaveText text_end diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index ab7b98ea2..69b1f73bf 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -411,7 +411,7 @@ StartMenu_Exit: StartMenu_Quit: ; Retire from the bug catching contest. - ld hl, .EndTheContestText + ld hl, .StartMenuContestEndText call StartMenuYesNo jr c, .DontEndContest ld a, BANK(BugCatchingContestReturnToGateScript) @@ -424,8 +424,8 @@ StartMenu_Quit: ld a, 0 ret -.EndTheContestText: - text_far UnknownText_0x1c1a6c +.StartMenuContestEndText: + text_far _StartMenuContestEndText text_end StartMenu_Save: diff --git a/engine/movie/crystal_intro.asm b/engine/movie/crystal_intro.asm index 5c4f38151..29808c86b 100644 --- a/engine/movie/crystal_intro.asm +++ b/engine/movie/crystal_intro.asm @@ -445,7 +445,7 @@ IntroScene1: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap001 + ld hl, IntroUnownAAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -456,18 +456,18 @@ IntroScene1: ld hl, IntroPulseGFX ld de, vTiles0 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap002 + ld hl, IntroUnownATilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -521,7 +521,7 @@ IntroScene3: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap003 + ld hl, IntroBackgroundAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -529,18 +529,18 @@ IntroScene3: ld hl, IntroBackgroundGFX ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap004 + ld hl, IntroBackgroundTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -584,7 +584,7 @@ IntroScene5: ldh [hLCDCPointer], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap005 + ld hl, IntroUnownHIAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -595,18 +595,18 @@ IntroScene5: ld hl, IntroPulseGFX ld de, vTiles0 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap006 + ld hl, IntroUnownHITilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -682,7 +682,7 @@ IntroScene7: ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap003 + ld hl, IntroBackgroundAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles @@ -700,7 +700,7 @@ IntroScene7: ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap004 + ld hl, IntroBackgroundTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles @@ -709,12 +709,12 @@ IntroScene7: ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -852,7 +852,7 @@ IntroScene11: ldh [hLCDCPointer], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap007 + ld hl, IntroUnownsAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -860,18 +860,18 @@ IntroScene11: ld hl, IntroUnownsGFX ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap008 + ld hl, IntroUnownsTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -975,7 +975,7 @@ IntroScene13: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap003 + ld hl, IntroBackgroundAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -986,18 +986,18 @@ IntroScene13: ld hl, IntroBackgroundGFX ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap004 + ld hl, IntroBackgroundTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -1079,7 +1079,7 @@ IntroScene15: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap009 + ld hl, IntroSuicuneJumpAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -1094,7 +1094,7 @@ IntroScene15: ld hl, vTiles1 tile $00 lb bc, BANK(IntroGrass4GFX), 1 call Request2bpp - ld hl, IntroTilemap010 + ld hl, IntroSuicuneJumpTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles call Intro_LoadTilemap @@ -1102,11 +1102,11 @@ IntroScene15: push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette5 + ld hl, IntroSuicunePalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette5 + ld hl, IntroSuicunePalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -1161,7 +1161,7 @@ IntroScene17: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap011 + ld hl, IntroSuicuneCloseAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -1169,18 +1169,18 @@ IntroScene17: ld hl, IntroSuicuneCloseGFX ld de, vTiles1 tile $00 call Intro_DecompressRequest2bpp_255Tiles - ld hl, IntroTilemap012 + ld hl, IntroSuicuneCloseTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette4 + ld hl, IntroSuicuneClosePalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette4 + ld hl, IntroSuicuneClosePalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -1227,7 +1227,7 @@ IntroScene19: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap013 + ld hl, IntroSuicuneBackAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -1242,7 +1242,7 @@ IntroScene19: ld hl, vTiles1 tile $7f lb bc, BANK(IntroGrass4GFX), 1 call Request2bpp - ld hl, IntroTilemap014 + ld hl, IntroSuicuneBackTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles call Intro_LoadTilemap @@ -1250,11 +1250,11 @@ IntroScene19: push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette5 + ld hl, IntroSuicunePalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette5 + ld hl, IntroSuicunePalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -1404,7 +1404,7 @@ IntroScene26: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap015 + ld hl, IntroCrystalUnownsAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -1412,18 +1412,18 @@ IntroScene26: ld hl, IntroCrystalUnownsGFX ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap017 + ld hl, IntroCrystalUnownsTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette3 + ld hl, IntroCrystalUnownsPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette3 + ld hl, IntroCrystalUnownsPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -2038,14 +2038,14 @@ INCBIN "gfx/intro/pichu_wooper.2bpp.lz" IntroBackgroundGFX: INCBIN "gfx/intro/background.2bpp.lz" -IntroTilemap004: -INCBIN "gfx/intro/004.tilemap.lz" +IntroBackgroundTilemap: +INCBIN "gfx/intro/background.tilemap.lz" -IntroTilemap003: -INCBIN "gfx/intro/003.tilemap.lz" +IntroBackgroundAttrmap: +INCBIN "gfx/intro/background.attrmap.lz" -IntroPalette1: -INCLUDE "gfx/intro/intro_1.pal" +IntroBackgroundPalette: +INCLUDE "gfx/intro/background.pal" IntroUnownsGFX: INCBIN "gfx/intro/unowns.2bpp.lz" @@ -2053,50 +2053,50 @@ INCBIN "gfx/intro/unowns.2bpp.lz" IntroPulseGFX: INCBIN "gfx/intro/pulse.2bpp.lz" -IntroTilemap002: -INCBIN "gfx/intro/002.tilemap.lz" +IntroUnownATilemap: +INCBIN "gfx/intro/unown_a.tilemap.lz" -IntroTilemap001: -INCBIN "gfx/intro/001.tilemap.lz" +IntroUnownAAttrmap: +INCBIN "gfx/intro/unown_a.attrmap.lz" -IntroTilemap006: -INCBIN "gfx/intro/006.tilemap.lz" +IntroUnownHITilemap: +INCBIN "gfx/intro/unown_hi.tilemap.lz" -IntroTilemap005: -INCBIN "gfx/intro/005.tilemap.lz" +IntroUnownHIAttrmap: +INCBIN "gfx/intro/unown_hi.attrmap.lz" -IntroTilemap008: -INCBIN "gfx/intro/008.tilemap.lz" +IntroUnownsTilemap: +INCBIN "gfx/intro/unowns.tilemap.lz" -IntroTilemap007: -INCBIN "gfx/intro/007.tilemap.lz" +IntroUnownsAttrmap: +INCBIN "gfx/intro/unowns.attrmap.lz" -IntroPalette2: -INCLUDE "gfx/intro/intro_2.pal" +IntroUnownsPalette: +INCLUDE "gfx/intro/unowns.pal" IntroCrystalUnownsGFX: INCBIN "gfx/intro/crystal_unowns.2bpp.lz" -IntroTilemap017: -INCBIN "gfx/intro/017.tilemap.lz" +IntroCrystalUnownsTilemap: +INCBIN "gfx/intro/crystal_unowns.tilemap.lz" -IntroTilemap015: -INCBIN "gfx/intro/015.tilemap.lz" +IntroCrystalUnownsAttrmap: +INCBIN "gfx/intro/crystal_unowns.attrmap.lz" -IntroPalette3: -INCLUDE "gfx/intro/intro_3.pal" +IntroCrystalUnownsPalette: +INCLUDE "gfx/intro/crystal_unowns.pal" IntroSuicuneCloseGFX: INCBIN "gfx/intro/suicune_close.2bpp.lz" -IntroTilemap012: -INCBIN "gfx/intro/012.tilemap.lz" +IntroSuicuneCloseTilemap: +INCBIN "gfx/intro/suicune_close.tilemap.lz" -IntroTilemap011: -INCBIN "gfx/intro/011.tilemap.lz" +IntroSuicuneCloseAttrmap: +INCBIN "gfx/intro/suicune_close.attrmap.lz" -IntroPalette4: -INCLUDE "gfx/intro/intro_4.pal" +IntroSuicuneClosePalette: +INCLUDE "gfx/intro/suicune_close.pal" IntroSuicuneJumpGFX: INCBIN "gfx/intro/suicune_jump.2bpp.lz" @@ -2104,20 +2104,20 @@ INCBIN "gfx/intro/suicune_jump.2bpp.lz" IntroSuicuneBackGFX: INCBIN "gfx/intro/suicune_back.2bpp.lz" -IntroTilemap010: -INCBIN "gfx/intro/010.tilemap.lz" +IntroSuicuneJumpTilemap: +INCBIN "gfx/intro/suicune_jump.tilemap.lz" -IntroTilemap009: -INCBIN "gfx/intro/009.tilemap.lz" +IntroSuicuneJumpAttrmap: +INCBIN "gfx/intro/suicune_jump.attrmap.lz" -IntroTilemap014: -INCBIN "gfx/intro/014.tilemap.lz" +IntroSuicuneBackTilemap: +INCBIN "gfx/intro/suicune_back.tilemap.lz" -IntroTilemap013: -INCBIN "gfx/intro/013.tilemap.lz" +IntroSuicuneBackAttrmap: +INCBIN "gfx/intro/suicune_back.attrmap.lz" -IntroPalette5: -INCLUDE "gfx/intro/intro_5.pal" +IntroSuicunePalette: +INCLUDE "gfx/intro/suicune.pal" IntroUnownBackGFX: INCBIN "gfx/intro/unown_back.2bpp.lz" diff --git a/engine/movie/init_hof_credits.asm b/engine/movie/init_hof_credits.asm index 0a02919ed..7dc31ef24 100644 --- a/engine/movie/init_hof_credits.asm +++ b/engine/movie/init_hof_credits.asm @@ -17,14 +17,13 @@ InitDisplayForHallOfFame: ldh [hSCY], a ldh [hSCX], a call EnableLCD - ld hl, .SavingRecordDontTurnOff + ld hl, .SavingRecordText call PrintText call WaitBGMap2 call SetPalettes ret -.SavingRecordDontTurnOff: - ; SAVING RECORD… DON'T TURN OFF! +.SavingRecordText: text_far _SavingRecordText text_end diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 065ba9e18..7868fe33e 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -1170,11 +1170,11 @@ TradeAnim_SentToOTText: ld a, [wLinkMode] cp LINK_TIMECAPSULE jr z, .time_capsule - ld hl, .Text_MonName + ld hl, .MonNameSentToText call PrintText ld c, 189 call DelayFrames - ld hl, .Text_WasSentTo + ld hl, .MonWasSentToText call PrintText call TradeAnim_Wait80Frames ld c, 128 @@ -1183,40 +1183,36 @@ TradeAnim_SentToOTText: ret .time_capsule - ld hl, .Text_WasSentTo + ld hl, .MonWasSentToText call PrintText call TradeAnim_Wait80Frames call TradeAnim_AdvanceScriptPointer ret -.Text_WasSentTo: - ; was sent to @ . - text_far _TradingText1 +.MonWasSentToText: + text_far _MonWasSentToText text_end -.Text_MonName: - ; - text_far _TradingText2 +.MonNameSentToText: + text_far _MonNameSentToText text_end TradeAnim_OTBidsFarewell: - ld hl, .Text_BidsFarewellToMon + ld hl, .BidsFarewellToMonText call PrintText call TradeAnim_Wait80Frames - ld hl, .Text_MonName + ld hl, .MonNameBidsFarewellText call PrintText call TradeAnim_Wait80Frames call TradeAnim_AdvanceScriptPointer ret -.Text_BidsFarewellToMon: - ; bids farewell to - text_far _TradingText3 +.BidsFarewellToMonText: + text_far _BidsFarewellToMonText text_end -.Text_MonName: - ; . - text_far _TradingText4 +.MonNameBidsFarewellText: + text_far _MonNameBidsFarewellText text_end TradeAnim_TakeCareOfText: @@ -1226,22 +1222,21 @@ TradeAnim_TakeCareOfText: ld a, " " call ByteFill call WaitBGMap - ld hl, .Text_TakeGoodCareOfMon + ld hl, .TakeGoodCareOfMonText call PrintText call TradeAnim_Wait80Frames call TradeAnim_AdvanceScriptPointer ret -.Text_TakeGoodCareOfMon: - ; Take good care of @ . - text_far _TradingText5 +.TakeGoodCareOfMonText: + text_far _TakeGoodCareOfMonText text_end TradeAnim_OTSendsText1: - ld hl, .Text_ForYourMon + ld hl, .ForYourMonSendsText call PrintText call TradeAnim_Wait80Frames - ld hl, .Text_OTSends + ld hl, .OTSendsText call PrintText call TradeAnim_Wait80Frames ld c, 14 @@ -1249,21 +1244,19 @@ TradeAnim_OTSendsText1: call TradeAnim_AdvanceScriptPointer ret -.Text_ForYourMon: - ; For @ 's @ , - text_far _TradingText6 +.ForYourMonSendsText: + text_far _ForYourMonSendsText text_end -.Text_OTSends: - ; sends @ . - text_far _TradingText7 +.OTSendsText: + text_far _OTSendsText text_end TradeAnim_OTSendsText2: - ld hl, .Text_WillTrade + ld hl, .WillTradeText call PrintText call TradeAnim_Wait80Frames - ld hl, .Text_ForYourMon + ld hl, .ForYourMonWillTradeText call PrintText call TradeAnim_Wait80Frames ld c, 14 @@ -1271,14 +1264,12 @@ TradeAnim_OTSendsText2: call TradeAnim_AdvanceScriptPointer ret -.Text_WillTrade: - ; will trade @ @ - text_far _TradingText8 +.WillTradeText: + text_far _WillTradeText text_end -.Text_ForYourMon: - ; for @ 's @ . - text_far _TradingText9 +.ForYourMonWillTradeText: + text_far _ForYourMonWillTradeText text_end TradeAnim_Wait80Frames: diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm index 3b40641f3..67a07e5db 100644 --- a/engine/overworld/decorations.asm +++ b/engine/overworld/decorations.asm @@ -378,12 +378,11 @@ PopulateDecoCategoryMenu: ret .empty - ld hl, .Text_nothing_to_choose + ld hl, .NothingToChooseText call MenuTextboxBackup ret -.Text_nothing_to_choose: - ; There's nothing to choose. +.NothingToChooseText: text_far _NothingToChooseText text_end @@ -674,7 +673,7 @@ DecoAction_SetItUp: ld a, [wBuffer1] ld hl, wStringBuffer3 call GetDecorationName - ld hl, DecoText_PutAwayAndSetUp + ld hl, PutAwayAndSetUpText call MenuTextboxBackup xor a ret @@ -683,13 +682,13 @@ DecoAction_SetItUp: ld a, [wMenuSelection] ld hl, wStringBuffer3 call GetDecorationName - ld hl, DecoText_SetUpTheDeco + ld hl, SetUpTheDecoText call MenuTextboxBackup xor a ret .alreadythere - ld hl, DecoText_AlreadySetUp + ld hl, AlreadySetUpText call MenuTextboxBackup scf ret @@ -710,19 +709,19 @@ DecoAction_TryPutItAway: ld [wMenuSelection], a ld hl, wStringBuffer3 call GetDecorationName - ld hl, DecoText_PutAwayTheDeco + ld hl, PutAwayTheDecoText call MenuTextboxBackup xor a ret .nothingthere - ld hl, DecoText_NothingToPutAway + ld hl, NothingToPutAwayText call MenuTextboxBackup xor a ret DecoAction_setupornament: - ld hl, UnknownText_0x26e41 + ld hl, WhichSidePutOnText call DecoAction_AskWhichSide jr c, .cancel call DecoAction_SetItUp_Ornament @@ -736,7 +735,7 @@ DecoAction_setupornament: ret DecoAction_putawayornament: - ld hl, DecoText_WhichSide + ld hl, WhichSidePutAwayText call DecoAction_AskWhichSide jr nc, .incave xor a @@ -771,7 +770,7 @@ DecoAction_SetItUp_Ornament: ld a, [wMenuSelection] ld [wSelectedDecoration], a call .getwhichside - ld hl, DecoText_PutAwayAndSetUp + ld hl, PutAwayAndSetUpText call MenuTextboxBackup xor a ret @@ -783,13 +782,13 @@ DecoAction_SetItUp_Ornament: ld a, [wMenuSelection] ld hl, wStringBuffer3 call GetDecorationName - ld hl, DecoText_SetUpTheDeco + ld hl, SetUpTheDecoText call MenuTextboxBackup xor a ret .failed - ld hl, DecoText_AlreadySetUp + ld hl, AlreadySetUpText call MenuTextboxBackup scf ret @@ -804,8 +803,7 @@ DecoAction_SetItUp_Ornament: ld [wOtherDecoration], a ret -UnknownText_0x26e41: - ; Which side do you want to put it on? +WhichSidePutOnText: text_far _WhichSidePutOnText text_end @@ -819,19 +817,18 @@ DecoAction_PutItAway_Ornament: ld [wBuffer5], a xor a ld [wSelectedDecoration], a - ld hl, DecoText_PutAwayTheDeco + ld hl, PutAwayTheDecoText call MenuTextboxBackup xor a ret .nothingthere - ld hl, DecoText_NothingToPutAway + ld hl, NothingToPutAwayText call MenuTextboxBackup xor a ret -DecoText_WhichSide: - ; Which side do you want to put away? +WhichSidePutAwayText: text_far _WhichSidePutAwayText text_end @@ -883,28 +880,23 @@ MenuData_0x26eb3: db "LEFT SIDE@" db "CANCEL@" -DecoText_PutAwayTheDeco: - ; Put away the @ . +PutAwayTheDecoText: text_far _PutAwayTheDecoText text_end -DecoText_NothingToPutAway: - ; There's nothing to put away. +NothingToPutAwayText: text_far _NothingToPutAwayText text_end -DecoText_SetUpTheDeco: - ; Set up the @ . +SetUpTheDecoText: text_far _SetUpTheDecoText text_end -DecoText_PutAwayAndSetUp: - ; Put away the @ and set up the @ . +PutAwayAndSetUpText: text_far _PutAwayAndSetUpText text_end -DecoText_AlreadySetUp: - ; That's already set up. +AlreadySetUpText: text_far _AlreadySetUpText text_end @@ -1005,38 +997,34 @@ DecorationDesc_PosterPointers: DecorationDesc_TownMapPoster: opentext - writetext .TownMapText + writetext .LookTownMapText waitbutton special OverworldTownMap closetext end -.TownMapText: - ; It's the TOWN MAP. +.LookTownMapText: text_far _LookTownMapText text_end DecorationDesc_PikachuPoster: - jumptext .PikaPosterText + jumptext .LookPikachuPosterText -.PikaPosterText: - ; It's a poster of a cute PIKACHU. +.LookPikachuPosterText: text_far _LookPikachuPosterText text_end DecorationDesc_ClefairyPoster: - jumptext .ClefairyPosterText + jumptext .LookClefairyPosterText -.ClefairyPosterText: - ; It's a poster of a cute CLEFAIRY. +.LookClefairyPosterText: text_far _LookClefairyPosterText text_end DecorationDesc_JigglypuffPoster: - jumptext .JigglypuffPosterText + jumptext .LookJigglypuffPosterText -.JigglypuffPosterText: - ; It's a poster of a cute JIGGLYPUFF. +.LookJigglypuffPosterText: text_far _LookJigglypuffPosterText text_end @@ -1064,10 +1052,9 @@ DecorationDesc_OrnamentOrConsole: ret .OrnamentConsoleScript: - jumptext .OrnamentConsoleText + jumptext .LookAdorableDecoText -.OrnamentConsoleText: - ; It's an adorable @ . +.LookAdorableDecoText: text_far _LookAdorableDecoText text_end @@ -1077,10 +1064,9 @@ DecorationDesc_GiantOrnament: ret .BigDollScript: - jumptext .BigDollText + jumptext .LookGiantDecoText -.BigDollText: - ; A giant doll! It's fluffy and cuddly. +.LookGiantDecoText: text_far _LookGiantDecoText text_end diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index 178a889a3..d4c6ec0bf 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -759,40 +759,41 @@ PlayerMovement: ret .pointers - dw .zero - dw .one - dw .two - dw .three - dw .four - dw .five - dw .six - dw .seven - -.zero -.four +; entries correspond to PLAYERMOVEMENT_* constants + dw .normal + dw .warp + dw .turn + dw .force_turn + dw .finish + dw .continue + dw .exit_water + dw .jump + +.normal: +.finish: xor a ld c, a ret -.seven +.jump: call ret_968d7 ; mobile xor a ld c, a ret -.one - ld a, 5 +.warp: + ld a, PLAYEREVENT_WARP ld c, a scf ret -.two - ld a, 9 +.turn: + ld a, PLAYEREVENT_JOYCHANGEFACING ld c, a scf ret -.three +.force_turn: ; force the player to move in some direction ld a, BANK(Script_ForcedMovement) ld hl, Script_ForcedMovement @@ -802,8 +803,8 @@ PlayerMovement: scf ret -.five -.six +.continue: +.exit_water: ld a, -1 ld c, a and a @@ -923,13 +924,13 @@ CountStep: ret .hatch - ld a, 8 + ld a, PLAYEREVENT_HATCH scf ret ; unused .unreferenced - ld a, 7 + ld a, PLAYEREVENT_WHITEOUT scf ret @@ -1626,7 +1627,7 @@ CmdQueue_StoneTable: jr c, .fall_down_hole .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, de ld d, h ld e, l diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index cf532fea6..16562213b 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -10,7 +10,7 @@ DeleteMapObject:: push af ld h, b ld l, c - ld bc, OBJECT_STRUCT_LENGTH + ld bc, OBJECT_LENGTH xor a call ByteFill pop af @@ -430,7 +430,7 @@ RestoreDefaultMovement: ret .ok - ld a, SPRITEMOVEFN_STANDING + ld a, SPRITEMOVEDATA_STANDING_DOWN ret ClearObjectMovementByteIndex: @@ -2082,11 +2082,11 @@ DespawnEmote: jr z, .next push bc xor a - ld bc, OBJECT_STRUCT_LENGTH + ld bc, OBJECT_LENGTH call ByteFill pop bc .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, de ld d, h ld e, l @@ -2149,7 +2149,7 @@ Function55e0:: jr z, .ok call Function565c .ok - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2205,7 +2205,7 @@ Function5645: .loop ldh [hMapObjectIndexBuffer], a call SetFacing_Standing - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2421,7 +2421,7 @@ HandleNPCStep:: jr z, .next call Function437b .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2466,7 +2466,7 @@ RefreshPlayerSprite: jr ContinueSpawnFacing SpawnInFacingDown: - ld a, 0 + ld a, DOWN ContinueSpawnFacing: ld bc, wPlayerStruct call SetSpriteDirection @@ -2582,7 +2582,7 @@ Function587a: add hl, bc set OBJ_FLAGS2_5, [hl] .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2625,7 +2625,7 @@ Function58b9:: add hl, bc res OBJ_FLAGS2_5, [hl] .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2750,7 +2750,7 @@ ApplyBGMapAnchorToObjects: add e ld [hl], a .skip - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2809,7 +2809,7 @@ InitSprites: jr .add .skip - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -2817,7 +2817,7 @@ InitSprites: jr .next .add - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l diff --git a/engine/overworld/map_objects_2.asm b/engine/overworld/map_objects_2.asm index f055e0fd9..d89d95fc0 100644 --- a/engine/overworld/map_objects_2.asm +++ b/engine/overworld/map_objects_2.asm @@ -19,7 +19,7 @@ LoadObjectMasks: ld [de], a inc de pop bc - ld hl, OBJECT_LENGTH + ld hl, MAPOBJECT_LENGTH add hl, bc ld b, h ld c, l diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm index 98b2d90de..1c84f049a 100644 --- a/engine/overworld/map_setup.asm +++ b/engine/overworld/map_setup.asm @@ -18,7 +18,7 @@ INCLUDE "data/maps/setup_scripts.asm" ReadMapSetupScript: .loop ld a, [hli] - cp -1 + cp map_end ret z push hl @@ -62,52 +62,52 @@ MapSetupCommands: ; entries correspond to command indexes in constants/map_setup_constants.asm dba EnableLCD ; 00 dba DisableLCD ; 01 - dba MapSetup_Sound_Off ; 02 + dba InitSound ; 02 dba PlayMapMusic ; 03 dba RestartMapMusic ; 04 dba FadeToMapMusic ; 05 - dba RotatePalettesRightMapAndMusic ; 06 - dba EnterMapMusic ; 07 + dba FadeMapMusicAndPalettes ; 06 + dba PlayMapMusicBike ; 07 dba ForceMapMusic ; 08 dba FadeInMusic ; 09 dba LoadBlockData ; 0a (callback 1) - dba LoadNeighboringBlockData ; 0b + dba LoadConnectionBlockData ; 0b dba SaveScreen ; 0c dba BufferScreen ; 0d - dba LoadGraphics ; 0e - dba LoadTileset ; 0f + dba LoadMapGraphics ; 0e + dba LoadMapTileset ; 0f dba LoadMapTimeOfDay ; 10 dba LoadMapPalettes ; 11 dba LoadWildMonData ; 12 dba RefreshMapSprites ; 13 dba HandleNewMap ; 14 - dba InitCommandQueue ; 15 - dba LoadObjectsRunCallback_02 ; 16 - dba LoadSpawnPoint ; 17 + dba HandleContinueMap ; 15 + dba LoadMapObjects ; 16 + dba EnterMapSpawnPoint ; 17 dba EnterMapConnection ; 18 - dba LoadWarpData ; 19 + dba EnterMapWarp ; 19 dba LoadMapAttributes ; 1a - dba LoadMapAttributes_SkipPeople ; 1b + dba LoadMapAttributes_SkipObjects ; 1b dba ClearBGPalettes ; 1c dba FadeOutPalettes ; 1d dba FadeInPalettes ; 1e - dba GetCoordOfUpperLeftCorner ; 1f - dba RestoreFacingAfterWarp ; 20 + dba GetMapScreenCoords ; 1f + dba GetWarpDestCoords ; 20 dba SpawnInFacingDown ; 21 dba SpawnPlayer ; 22 dba RefreshPlayerCoords ; 23 - dba DelayClearingOldSprites ; 24 - dba DelayLoadingNewSprites ; 25 + dba ResetPlayerObjectAction ; 24 + dba SkipUpdateMapSprites ; 25 dba UpdateRoamMons ; 26 dba JumpRoamMons ; 27 - dba FadeOldMapMusic ; 28 + dba FadeOutMapMusic ; 28 dba ActivateMapAnims ; 29 dba SuspendMapAnims ; 2a - dba RetainOldPalettes ; 2b - dba DontScrollText ; 2c - dba ReturnFromMapSetupScript ; 2d + dba ApplyMapPalettes ; 2b + dba EnableTextAcceleration ; 2c + dba InitMapNameSign ; 2d -DontScrollText: +EnableTextAcceleration: xor a ld [wDisableTextAcceleration], a ret @@ -122,7 +122,7 @@ SuspendMapAnims: ldh [hMapAnims], a ret -LoadObjectsRunCallback_02: +LoadMapObjects: ld a, MAPCALLBACK_OBJECTS call RunMapCallback farcall LoadObjectMasks @@ -132,12 +132,12 @@ LoadObjectsRunCallback_02: ; unused ret -DelayClearingOldSprites: +ResetPlayerObjectAction: ld hl, wPlayerSpriteSetupFlags set PLAYERSPRITESETUP_RESET_ACTION_F, [hl] ret -DelayLoadingNewSprites: +SkipUpdateMapSprites: ld hl, wPlayerSpriteSetupFlags set PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl] ret @@ -178,13 +178,13 @@ CheckReplaceKrisSprite: jr z, .surfing call GetMapEnvironment cp INDOOR - jr z, .checkbiking + jr z, .no_biking cp ENVIRONMENT_5 - jr z, .checkbiking + jr z, .no_biking cp DUNGEON - jr z, .checkbiking + jr z, .no_biking jr .nope -.checkbiking +.no_biking ld a, [wPlayerState] cp PLAYER_BIKE jr nz, .nope @@ -200,31 +200,32 @@ CheckReplaceKrisSprite: .CheckSurfing: call CheckOnWater - jr nz, .ret_nc + jr nz, .nope2 ld a, [wPlayerState] cp PLAYER_SURF - jr z, ._surfing + jr z, .is_surfing cp PLAYER_SURF_PIKA - jr z, ._surfing + jr z, .is_surfing ld a, PLAYER_SURF ld [wPlayerState], a -._surfing +.is_surfing scf ret -.ret_nc + +.nope2 and a ret -FadeOldMapMusic: +FadeOutMapMusic: ld a, 6 call SkipMusic ret -RetainOldPalettes: +ApplyMapPalettes: farcall _UpdateTimePals ret -RotatePalettesRightMapAndMusic: +FadeMapMusicAndPalettes: ld e, 0 ld a, [wMusicFadeID] ld d, 0 diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index d249d2fd4..f4c730247 100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -369,7 +369,7 @@ IsNPCAtCoord: jr nz, .setcarry .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -523,7 +523,7 @@ Unreferenced_Function7113: jr .yes .next - ld hl, OBJECT_STRUCT_LENGTH + ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm index e47645f2c..814f608f7 100644 --- a/engine/overworld/overworld.asm +++ b/engine/overworld/overworld.asm @@ -109,7 +109,7 @@ AddIndoorSprites: push af ld a, [hl] call AddSpriteGFX - ld de, OBJECT_LENGTH + ld de, MAPOBJECT_LENGTH add hl, de pop af inc a diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index 09d6b47de..9f372640b 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -120,7 +120,7 @@ DoPlayerMovement:: ld c, a call CheckWhirlpoolTile jr c, .not_whirlpool - ld a, 3 + ld a, PLAYERMOVEMENT_FORCE_TURN scf ret @@ -222,7 +222,7 @@ DoPlayerMovement:: .continue_walk ld a, STEP_WALK call .DoStep - ld a, 5 + ld a, PLAYERMOVEMENT_CONTINUE scf ret @@ -247,7 +247,7 @@ DoPlayerMovement:: ld a, STEP_TURN call .DoStep - ld a, 2 + ld a, PLAYERMOVEMENT_TURN scf ret @@ -345,7 +345,7 @@ DoPlayerMovement:: call PlayMapMusic ld a, STEP_WALK call .DoStep - ld a, 6 + ld a, PLAYERMOVEMENT_EXIT_WATER scf ret @@ -374,7 +374,7 @@ DoPlayerMovement:: call PlaySFX ld a, STEP_LEDGE call .DoStep - ld a, 7 + ld a, PLAYERMOVEMENT_JUMP scf ret @@ -428,11 +428,11 @@ DoPlayerMovement:: call .StandInPlace scf - ld a, 1 + ld a, PLAYERMOVEMENT_WARP ret .not_warp - xor a + xor a ; PLAYERMOVEMENT_NORMAL ret .EdgeWarps: @@ -465,7 +465,7 @@ DoPlayerMovement:: ld a, [hl] ld [wPlayerTurningDirection], a - ld a, 4 + ld a, PLAYERMOVEMENT_FINISH ret .Steps: diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 9f1b13dd9..478c8f6c6 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -132,9 +132,9 @@ CopyObjectStruct:: and a ret nz ; masked - ld hl, wObjectStructs + OBJECT_STRUCT_LENGTH * 1 + ld hl, wObjectStructs + OBJECT_LENGTH * 1 ld a, 1 - ld de, OBJECT_STRUCT_LENGTH + ld de, OBJECT_LENGTH .loop ldh [hObjectStructIndexBuffer], a ld a, [hl] @@ -224,7 +224,7 @@ CopyMapObjectToObjectStruct: ret InitializeVisibleSprites: - ld bc, wMapObjects + OBJECT_LENGTH + ld bc, wMapObjects + MAPOBJECT_LENGTH ld a, 1 .loop ldh [hMapObjectIndexBuffer], a @@ -271,7 +271,7 @@ InitializeVisibleSprites: jp c, .ret .next - ld hl, OBJECT_LENGTH + ld hl, MAPOBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -311,7 +311,7 @@ CheckObjectEnteringVisibleRange:: ld d, a ld a, [wXCoord] ld e, a - ld bc, wMapObjects + OBJECT_LENGTH + ld bc, wMapObjects + MAPOBJECT_LENGTH ld a, 1 .loop_v ldh [hMapObjectIndexBuffer], a @@ -345,7 +345,7 @@ CheckObjectEnteringVisibleRange:: pop de .next_v - ld hl, OBJECT_LENGTH + ld hl, MAPOBJECT_LENGTH add hl, bc ld b, h ld c, l @@ -367,7 +367,7 @@ CheckObjectEnteringVisibleRange:: ld e, a ld a, [wYCoord] ld d, a - ld bc, wMapObjects + OBJECT_LENGTH + ld bc, wMapObjects + MAPOBJECT_LENGTH ld a, 1 .loop_h ldh [hMapObjectIndexBuffer], a @@ -401,7 +401,7 @@ CheckObjectEnteringVisibleRange:: pop de .next_h - ld hl, OBJECT_LENGTH + ld hl, MAPOBJECT_LENGTH add hl, bc ld b, h ld c, l diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 7496b82bd..245d8e763 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -148,7 +148,7 @@ ScriptCommandTable: dw Script_farjumptext ; 52 dw Script_jumptext ; 53 dw Script_waitbutton ; 54 - dw Script_buttonsound ; 55 + dw Script_promptbutton ; 55 dw Script_pokepic ; 56 dw Script_closepokepic ; 57 dw Script__2dmenu ; 58 @@ -398,7 +398,7 @@ Script_waitbutton: jp WaitButton -Script_buttonsound: +Script_promptbutton: ; script command 0x55 ldh a, [hOAMUpdate] @@ -406,7 +406,7 @@ Script_buttonsound: ld a, $1 ldh [hOAMUpdate], a call WaitBGMap - call ButtonSound + call PromptButton pop af ldh [hOAMUpdate], a ret @@ -525,12 +525,12 @@ GiveItemScript: end .Full: - buttonsound + promptbutton pocketisfull end ReceivedItemText: - text_far UnknownText_0x1c4719 + text_far _ReceivedItemText text_end Script_verbosegiveitemvar: @@ -622,11 +622,11 @@ CurItemName: ret PutItemInPocketText: - text_far UnknownText_0x1c472c + text_far _PutItemInPocketText text_end PocketIsFullText: - text_far UnknownText_0x1c474b + text_far _PocketIsFullText text_end Script_pokemart: @@ -1952,7 +1952,7 @@ Script_getmoney: call ResetStringBuffer1 call GetMoneyAccount ld hl, wStringBuffer1 - lb bc, PRINTNUM_RIGHTALIGN | 3, 6 + lb bc, PRINTNUM_LEFTALIGN | 3, 6 call PrintNum ld de, wStringBuffer1 jp GetStringBuffer @@ -1964,7 +1964,7 @@ Script_getcoins: call ResetStringBuffer1 ld hl, wStringBuffer1 ld de, wCoins - lb bc, PRINTNUM_RIGHTALIGN | 2, 6 + lb bc, PRINTNUM_LEFTALIGN | 2, 6 call PrintNum ld de, wStringBuffer1 jp GetStringBuffer @@ -1976,7 +1976,7 @@ Script_getnum: call ResetStringBuffer1 ld de, wScriptVar ld hl, wStringBuffer1 - lb bc, PRINTNUM_RIGHTALIGN | 1, 3 + lb bc, PRINTNUM_LEFTALIGN | 1, 3 call PrintNum ld de, wStringBuffer1 jp GetStringBuffer diff --git a/engine/overworld/select_menu.asm b/engine/overworld/select_menu.asm index 9cc2ba149..18532edae 100644 --- a/engine/overworld/select_menu.asm +++ b/engine/overworld/select_menu.asm @@ -5,14 +5,14 @@ SelectMenu:: .NotRegistered: call OpenText - ld b, BANK(ItemMayBeRegisteredText) - ld hl, ItemMayBeRegisteredText + ld b, BANK(MayRegisterItemText) + ld hl, MayRegisterItemText call MapTextbox call WaitButton jp CloseText -ItemMayBeRegisteredText: - text_far UnknownText_0x1c1cf3 +MayRegisterItemText: + text_far _MayRegisterItemText text_end CheckRegisteredItem: diff --git a/engine/overworld/spawn_points.asm b/engine/overworld/spawn_points.asm index 6b4476f2b..33e4c96b3 100644 --- a/engine/overworld/spawn_points.asm +++ b/engine/overworld/spawn_points.asm @@ -1,6 +1,6 @@ INCLUDE "data/maps/spawn_points.asm" -LoadSpawnPoint: +EnterMapSpawnPoint: ; loads the spawn point in wDefaultSpawnpoint push hl push de diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm index 2b36d1e42..ed3b26ef5 100644 --- a/engine/overworld/warp_connection.asm +++ b/engine/overworld/warp_connection.asm @@ -1,4 +1,3 @@ - HandleNewMap: call ClearUnusedMapBuffer call ResetMapBufferEventFlags @@ -7,7 +6,7 @@ HandleNewMap: call ResetBikeFlags ld a, MAPCALLBACK_NEWMAP call RunMapCallback -InitCommandQueue: +HandleContinueMap: farcall ClearCmdQueue ld a, MAPCALLBACK_CMDQUEUE call RunMapCallback @@ -150,7 +149,7 @@ EnterMapConnection: scf ret -LoadWarpData: +EnterMapWarp: call .SaveDigWarp call .SetSpawn ld a, [wNextWarp] @@ -296,8 +295,8 @@ LoadMapTimeOfDay: ldh [rVBK], a ret -LoadGraphics: - call LoadTileset +LoadMapGraphics: + call LoadMapTileset call LoadTilesetGFX xor a ldh [hMapAnims], a @@ -314,7 +313,7 @@ LoadMapPalettes: RefreshMapSprites: call ClearSprites - farcall ReturnFromMapSetupScript + farcall InitMapNameSign call GetMovementPermissions farcall RefreshPlayerSprite farcall CheckReplaceKrisSprite @@ -326,7 +325,7 @@ RefreshMapSprites: call SafeUpdateSprites .skip ld a, [wPlayerSpriteSetupFlags] - and %00011100 + and (1 << PLAYERSPRITESETUP_FEMALE_TO_MALE_F) | (1 << 3) | (1 << 4) ld [wPlayerSpriteSetupFlags], a ret @@ -387,7 +386,7 @@ CheckMovingOffEdgeOfMap:: scf ret -GetCoordOfUpperLeftCorner:: +GetMapScreenCoords:: ld hl, wOverworldMapBlocks ld a, [wXCoord] bit 0, a diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index a384915b6..61ef89b18 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -821,7 +821,7 @@ RandomUnseenWildMon: ld a, c ld [wNamedObjectIndexBuffer], a call GetPokemonName - ld hl, .SawRareMonText + ld hl, .JustSawSomeRareMonText call PrintText xor a ld [wScriptVar], a @@ -832,8 +832,7 @@ RandomUnseenWildMon: ld [wScriptVar], a ret -.SawRareMonText: - ; I just saw some rare @ in @ . I'll call you if I see another rare #MON, OK? +.JustSawSomeRareMonText: text_far _JustSawSomeRareMonText text_end diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 8a2b022dc..a62312d10 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -361,8 +361,8 @@ Function90199: jr .DoPhoneCall .OutOfArea: - ld b, BANK(UnknownScript_0x90209) - ld de, UnknownScript_0x90209 + ld b, BANK(LoadOutOfAreaScript) + ld de, LoadOutOfAreaScript call ExecuteCallbackScript ret @@ -373,17 +373,17 @@ Function90199: ld [wPhoneCaller], a ld a, h ld [wPhoneCaller + 1], a - ld b, BANK(UnknownScript_0x90205) - ld de, UnknownScript_0x90205 + ld b, BANK(LoadPhoneScriptBank) + ld de, LoadPhoneScriptBank call ExecuteCallbackScript ret -UnknownScript_0x90205: +LoadPhoneScriptBank: memcall wPhoneScriptBank return -UnknownScript_0x90209: - scall UnknownScript_0x90657 +LoadOutOfAreaScript: + scall PhoneOutOfAreaScript return LoadCallerScript: @@ -413,11 +413,10 @@ WrongNumber: db TRAINER_NONE, PHONE_00 dba .script .script - writetext .text + writetext .PhoneWrongNumberText end -.text - ; Huh? Sorry, wrong number! - text_far UnknownText_0x1c5565 +.PhoneWrongNumberText: + text_far _PhoneWrongNumberText text_end Script_ReceivePhoneCall: @@ -438,7 +437,7 @@ Script_SpecialBillCall:: ld e, PHONE_BILL jp LoadCallerScript -UnknownScript_0x90261: +LoadElmCallScript: callasm .LoadElmScript pause 30 sjump Script_ReceivePhoneCall @@ -535,23 +534,23 @@ Function90316: ret HangUp_Beep: - ld hl, UnknownText_0x9032a + ld hl, PhoneClickText call PrintText ld de, SFX_HANG_UP call PlaySFX ret -UnknownText_0x9032a: - text_far UnknownText_0x1c5580 +PhoneClickText: + text_far _PhoneClickText text_end HangUp_BoopOn: - ld hl, UnknownText_0x90336 + ld hl, PhoneEllipseText call PrintText ret -UnknownText_0x90336: - text_far UnknownText_0x1c5588 +PhoneEllipseText: + text_far _PhoneEllipseText text_end HangUp_BoopOff: @@ -705,29 +704,26 @@ INCLUDE "data/phone/phone_contacts.asm" INCLUDE "data/phone/special_calls.asm" -UnknownScript_0x90657: - writetext UnknownText_0x9065b +PhoneOutOfAreaScript: + writetext PhoneOutOfAreaText end -UnknownText_0x9065b: - ; That number is out of the area. - text_far UnknownText_0x1c558b +PhoneOutOfAreaText: + text_far _PhoneOutOfAreaText text_end PhoneScript_JustTalkToThem: - writetext UnknownText_0x90664 + writetext PhoneJustTalkToThemText end -UnknownText_0x90664: - ; Just go talk to that person! - text_far UnknownText_0x1c55ac +PhoneJustTalkToThemText: + text_far _PhoneJustTalkToThemText text_end -UnknownScript_0x90669: - writetext UnknownText_0x9066d +PhoneThankYouTextScript: + writetext PhoneThankYouText end -UnknownText_0x9066d: - ; Thank you! - text_far UnknownText_0x1c55ca +PhoneThankYouText: + text_far _PhoneThankYouText text_end diff --git a/engine/phone/scripts/alan.asm b/engine/phone/scripts/alan.asm index ad020f0ba..0f42e8558 100644 --- a/engine/phone/scripts/alan.asm +++ b/engine/phone/scripts/alan.asm @@ -13,15 +13,15 @@ AlanPhoneCalleeScript: iftrue AlanWednesdayDay .NotWednesday: - farsjump UnknownScript_0xa0970 + farsjump AlanHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_36 - farsjump UnknownScript_0xa0a73 + farsjump AlanReminderScript .FireStone: getlandmarkname STRING_BUFFER_5, ROUTE_36 - farsjump UnknownScript_0xa0ac5 + farsjump AlanComePickUpScript AlanPhoneCallerScript: gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1 diff --git a/engine/phone/scripts/anthony.asm b/engine/phone/scripts/anthony.asm index 4bd3278c3..55afd47f5 100644 --- a/engine/phone/scripts/anthony.asm +++ b/engine/phone/scripts/anthony.asm @@ -13,15 +13,15 @@ AnthonyPhoneCalleeScript: .NotFriday: checkflag ENGINE_DUNSPARCE_SWARM iftrue .AlreadySwarming - farsjump UnknownScript_0xa0950 + farsjump AnthonyHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_33 - farsjump UnknownScript_0xa0a5f + farsjump AnthonyReminderScript .AlreadySwarming: getlandmarkname STRING_BUFFER_5, ROUTE_33 - farsjump UnknownScript_0xa0afa + farsjump AnthonyHurryScript AnthonyPhoneCallerScript: gettrainername STRING_BUFFER_3, HIKER, ANTHONY2 @@ -55,7 +55,7 @@ AnthonyTriesDunsparceSwarm: getmonname STRING_BUFFER_4, DUNSPARCE swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE getlandmarkname STRING_BUFFER_5, DARK_CAVE - farsjump UnknownScript_0xa05de + farsjump AnthonySwarmScript .Generic: farsjump Phone_GenericCall_Male diff --git a/engine/phone/scripts/arnie.asm b/engine/phone/scripts/arnie.asm index fda846e18..a768d8b70 100644 --- a/engine/phone/scripts/arnie.asm +++ b/engine/phone/scripts/arnie.asm @@ -13,15 +13,15 @@ ArniePhoneCalleeScript: .NotTuesday: checkflag ENGINE_YANMA_SWARM iftrue .AlreadySwarming - farsjump UnknownScript_0xa0968 + farsjump ArnieHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_35 - farsjump UnknownScript_0xa0a6e + farsjump ArnieReminderScript .AlreadySwarming: getlandmarkname STRING_BUFFER_5, ROUTE_35 - farsjump UnknownScript_0xa0aff + farsjump ArnieHurryScript ArniePhoneCallerScript: gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1 @@ -55,7 +55,7 @@ ArnieYanmaSwarm: ; start swarm getmonname STRING_BUFFER_4, YANMA swarm SWARM_YANMA, ROUTE_35 getlandmarkname STRING_BUFFER_5, ROUTE_35 - farsjump UnknownScript_0xa05ce + farsjump ArnieSwarmScript ArnieFoundRare: farsjump Phone_CheckIfUnseenRare_Male diff --git a/engine/phone/scripts/beth.asm b/engine/phone/scripts/beth.asm index d4a15a8bd..c5854c747 100644 --- a/engine/phone/scripts/beth.asm +++ b/engine/phone/scripts/beth.asm @@ -11,7 +11,7 @@ BethPhoneCalleeScript: iftrue BethFridayAfternoon .NotFriday: - farsjump UnknownScript_0xa0918 + farsjump BethHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_26 diff --git a/engine/phone/scripts/beverly.asm b/engine/phone/scripts/beverly.asm index 35db64918..77daa5d4b 100644 --- a/engine/phone/scripts/beverly.asm +++ b/engine/phone/scripts/beverly.asm @@ -3,11 +3,11 @@ BeverlyPhoneCalleeScript: farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_BEVERLY_HAS_NUGGET iftrue .HasNugget - farsjump UnknownScript_0xa0900 + farsjump BeverlyHangUpScript .HasNugget: getlandmarkname STRING_BUFFER_5, NATIONAL_PARK - farsjump UnknownScript_0xa0aa5 + farsjump BeverlyComePickUpScript BeverlyPhoneCallerScript: gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1 diff --git a/engine/phone/scripts/bike_shop.asm b/engine/phone/scripts/bike_shop.asm index 8b32be888..2761774f2 100644 --- a/engine/phone/scripts/bike_shop.asm +++ b/engine/phone/scripts/bike_shop.asm @@ -1,5 +1,5 @@ BikeShopPhoneCallerScript: - farwritetext UnknownText_0x174000 + farwritetext BikeShopPhoneCallerText clearflag ENGINE_BIKE_SHOP_CALL_ENABLED specialphonecall SPECIALCALL_NONE end diff --git a/engine/phone/scripts/bill.asm b/engine/phone/scripts/bill.asm index ccc74dd73..96e2f406d 100644 --- a/engine/phone/scripts/bill.asm +++ b/engine/phone/scripts/bill.asm @@ -4,22 +4,22 @@ BillPhoneCalleeScript: checktime NITE iftrue .nitegreet farwritetext BillPhoneMornGreetingText - buttonsound + promptbutton sjump .main .daygreet farwritetext BillPhoneDayGreetingText - buttonsound + promptbutton sjump .main .nitegreet farwritetext BillPhoneNiteGreetingText - buttonsound + promptbutton sjump .main .main farwritetext BillPhoneGenericText - buttonsound + promptbutton readvar VAR_BOXSPACE getnum STRING_BUFFER_3 ifequal 0, .full diff --git a/engine/phone/scripts/brent.asm b/engine/phone/scripts/brent.asm index 9fbdfde7d..7187befee 100644 --- a/engine/phone/scripts/brent.asm +++ b/engine/phone/scripts/brent.asm @@ -11,11 +11,11 @@ BrentPhoneCalleeScript: iftrue BrentMondayMorning .NotMonday: - farsjump UnknownScript_0xa0998 + farsjump BrentHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_43 - farsjump UnknownScript_0xa0a87 + farsjump BrentReminderScript BrentPhoneCallerScript: gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1 diff --git a/engine/phone/scripts/brent_gossip.asm b/engine/phone/scripts/brent_gossip.asm index 90054d0eb..76fb1c156 100644 --- a/engine/phone/scripts/brent_gossip.asm +++ b/engine/phone/scripts/brent_gossip.asm @@ -12,51 +12,51 @@ BrentBillTriviaScript: ifequal 9, .KimonoGirl .Father: - farwritetext UnknownText_0x662bc - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext BrentFatherGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .Grandpa: - farwritetext UnknownText_0x662fc - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext BrentGrandpaGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .Goldenrod: - farwritetext UnknownText_0x66335 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext BrentGoldenrodGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .Route25: - farwritetext UnknownText_0x66366 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext BrentRoute25GossipText + promptbutton + sjump PhoneScript_HangUpText_Male .Abra: - farwritetext UnknownText_0x663a1 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext BrentAbraGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .Sister: - farwritetext UnknownText_0x663e6 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext BrentSisterGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .Milk: - farwritetext UnknownText_0x66421 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext BrentMilkGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .Battling: - farwritetext UnknownText_0x6645f - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext BrentBattlingGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .FlowerShop: - farwritetext UnknownText_0x6649b - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext BrentFlowerShopGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .KimonoGirl: - farwritetext UnknownText_0x664dd - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext BrentKimonoGirlGossipText + promptbutton + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/buena.asm b/engine/phone/scripts/buena.asm index 86c2a3243..02a6c0a97 100644 --- a/engine/phone/scripts/buena.asm +++ b/engine/phone/scripts/buena.asm @@ -2,70 +2,70 @@ BuenaPhoneCalleeScript: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue BuenaPhoneScript_Rocket readvar VAR_HOUR - ifgreater 17, BuenaPhoneScript_AfterMidnight1 - scall BuenaPhoneScript_CheckTimeOfDay1 - sjump BuenaPhoneScript_Random1 + ifgreater 17, BuenaPhoneScript_AfterMidnightCallee + scall BuenaPhoneScript_CheckTimeOfDayCallee + sjump BuenaPhoneScript_RandomCallee BuenaPhoneCallerScript: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue BuenaPhoneScript_Rocket - scall BuenaPhoneScript_CheckTimeOfDay2 - sjump BuenaPhoneScript_Random2 + scall BuenaPhoneScript_CheckTimeOfDayCaller + sjump BuenaPhoneScript_RandomCaller -BuenaPhoneScript_CheckTimeOfDay1: +BuenaPhoneScript_CheckTimeOfDayCallee: checktime MORN iftrue .morn checktime DAY iftrue .day - writetext UnknownText_0xa0d42 - buttonsound + writetext BuenaPhoneNiteAnswerText + promptbutton end .morn - writetext UnknownText_0xa0c28 - buttonsound + writetext BuenaPhoneMorningAnswerText + promptbutton end .day - writetext UnknownText_0xa0c72 - buttonsound + writetext BuenaPhoneDayAnswerText + promptbutton end -BuenaPhoneScript_AfterMidnight1: - writetext UnknownText_0xa0caf +BuenaPhoneScript_AfterMidnightCallee: + writetext BuenaPhoneMidnightAnswerText end -BuenaPhoneScript_CheckTimeOfDay2: +BuenaPhoneScript_CheckTimeOfDayCaller: readvar VAR_HOUR - ifgreater 17, BuenaPhoneScript_AfterMidnight2 + ifgreater 17, BuenaPhoneScript_AfterMidnightCaller checktime MORN iftrue .morn checktime DAY iftrue .day - writetext UnknownText_0xa0e29 - buttonsound + writetext BuenaPhoneNiteText + promptbutton end .morn - writetext UnknownText_0xa0d96 - buttonsound + writetext BuenaPhoneMorningText + promptbutton end .day - writetext UnknownText_0xa0dcf - buttonsound + writetext BuenaPhoneDayText + promptbutton end -BuenaPhoneScript_AfterMidnight2: - writetext UnknownText_0xa0e01 - buttonsound +BuenaPhoneScript_AfterMidnightCaller: + writetext BuenaPhoneMidnightText + promptbutton end BuenaPhoneScript_Rocket: - writetext UnknownText_0xa0e5e + writetext BuenaPhoneRocketText end -BuenaPhoneScript_Random2: +BuenaPhoneScript_RandomCaller: checkevent EVENT_BEAT_ELITE_FOUR iftrue .PostE4 random 11 @@ -91,79 +91,79 @@ BuenaPhoneScript_Random2: ifequal 13, .thirteen .zero - writetext UnknownText_0xa0efb + writetext BuenaPhoneWentOutWithBenText sjump .finish .one - writetext UnknownText_0xa0fcf + writetext BuenaPhoneReceptionistText sjump .finish .two - writetext UnknownText_0xa109d + writetext BuenaPhoneLuckyNumberShowText sjump .finish .three - writetext UnknownText_0xa1143 + writetext BuenaPhoneStressedFromWorkText sjump .finish .four - writetext UnknownText_0xa1244 + writetext BuenaPhoneProfessorOakText sjump .finish .five - writetext UnknownText_0xa1318 + writetext BuenaPhoneGotAColdText sjump .finish .six - writetext UnknownText_0xa13d8 + writetext BuenaPhoneRadioCardQuestionsText sjump .finish .seven - writetext UnknownText_0xa1488 + writetext BuenaPhonePikachuFanClubText sjump .finish .eight - writetext UnknownText_0xa15de + writetext BuenaPhoneRadioTowerDirectorText sjump .finish .nine - writetext UnknownText_0xa1717 + writetext BuenaPhoneWhenDoYouRelaxText sjump .finish .ten - writetext UnknownText_0xa183d + writetext BuenaPhoneStarterPokemonText sjump .finish .eleven - writetext UnknownText_0xa19b1 + writetext BuenaPhoneCompanyVacationText sjump .finish .twelve - writetext UnknownText_0xa1ac0 + writetext BuenaPhoneBenAndFernText sjump .finish .thirteen - writetext UnknownText_0xa1bed + writetext BuenaPhoneGoingShoppingText .finish end -BuenaPhoneScript_Random1: +BuenaPhoneScript_RandomCallee: random 3 ifequal 0, .zero ifequal 1, .one ifequal 2, .two .zero - writetext UnknownText_0xa1c88 + writetext BuenaPhoneFavoriteSlotMachineAnswerText end .one - writetext UnknownText_0xa1d5f + writetext BuenaPhonePokegearAnswerText end .two - writetext UnknownText_0xa1e2f + writetext BuenaPhoneCoopedUpInRadioTowerAnswerText end INCLUDE "data/phone/text/buena.asm" diff --git a/engine/phone/scripts/chad.asm b/engine/phone/scripts/chad.asm index cd36bae37..8af8e6eee 100644 --- a/engine/phone/scripts/chad.asm +++ b/engine/phone/scripts/chad.asm @@ -11,11 +11,11 @@ ChadPhoneCalleeScript: iftrue ChadFridayMorning .NotFriday: - farsjump UnknownScript_0xa0980 + farsjump ChadHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_38 - farsjump UnknownScript_0xa0a7d + farsjump ChadReminderScript ChadPhoneCallerScript: gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1 diff --git a/engine/phone/scripts/chad_gossip.asm b/engine/phone/scripts/chad_gossip.asm index e72fcd628..58192232c 100644 --- a/engine/phone/scripts/chad_gossip.asm +++ b/engine/phone/scripts/chad_gossip.asm @@ -13,50 +13,50 @@ ChadOakGossipScript: .Blue: farwritetext ChadBlueGossipText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .Daisy: farwritetext ChadDaisyGossipText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .ProfElm: farwritetext ChadProfElmGossipText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .Dream: - farwritetext ChadDreamGossipText - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext ChadProfOaksDreamGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .Kurt: farwritetext ChadKurtGossipText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .League: farwritetext ChadLeagueGossipText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .RadioShow: - farwritetext ChadRadioShowGossipText - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext ChadPokemonTalkGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .Battling: - farwritetext ChadBattlingGossipText - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext ChadProfOakTrainerGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .DaisyTea: farwritetext ChadDaisyTeaGossipText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .Traveled: - farwritetext ChadTravelGossipText - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext ChadProfOakTravelingGossipText + promptbutton + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/dana.asm b/engine/phone/scripts/dana.asm index ca2613ef4..c00607f41 100644 --- a/engine/phone/scripts/dana.asm +++ b/engine/phone/scripts/dana.asm @@ -13,15 +13,15 @@ DanaPhoneCalleeScript: iftrue DanaThursdayNight .NotThursday: - farsjump UnknownScript_0xa0978 + farsjump DanaHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_38 - farsjump UnknownScript_0xa0a78 + farsjump DanaReminderScript .HasThunderstone: getlandmarkname STRING_BUFFER_5, ROUTE_38 - farsjump UnknownScript_0xa0acd + farsjump DanaComePickUpScript DanaPhoneCallerScript: gettrainername STRING_BUFFER_3, LASS, DANA1 diff --git a/engine/phone/scripts/derek.asm b/engine/phone/scripts/derek.asm index 817f2e13e..9a69e7701 100644 --- a/engine/phone/scripts/derek.asm +++ b/engine/phone/scripts/derek.asm @@ -13,14 +13,14 @@ DerekPhoneCalleeScript: ifequal SATURDAY, .ContestToday .NoContest: - farsjump UnknownScript_0xa0988 + farsjump DerekHangUpScript .ContestToday: farsjump PhoneScript_BugCatchingContest .Nugget: getlandmarkname STRING_BUFFER_5, ROUTE_39 - farsjump UnknownScript_0xa0ad5 + farsjump DerekComePickUpScript DerekPhoneCallerScript: gettrainername STRING_BUFFER_3, POKEFANM, DEREK1 diff --git a/engine/phone/scripts/elm.asm b/engine/phone/scripts/elm.asm index d1b54905d..4760d8505 100644 --- a/engine/phone/scripts/elm.asm +++ b/engine/phone/scripts/elm.asm @@ -18,7 +18,7 @@ ElmPhoneCalleeScript: iftrue .stolen checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON iftrue .sawmrpokemon - farwritetext ElmPhoneStartText + farwritetext ElmPhoneHealYourMonText end .sawmrpokemon @@ -30,7 +30,7 @@ ElmPhoneCalleeScript: end .checkingegg - farwritetext ElmPhoneCheckingEggText + farwritetext ElmPhoneCheckingTheEggText end .assistant @@ -38,7 +38,7 @@ ElmPhoneCalleeScript: end .eggunhatched - farwritetext ElmPhoneEggUnhatchedText + farwritetext ElmPhoneHowIsTheEggText end .egghatched @@ -49,15 +49,15 @@ ElmPhoneCalleeScript: .discovery random 2 ifequal 0, .nextdiscovery - farwritetext ElmPhoneDiscovery1Text + farwritetext ElmPhoneDiscoveredHatchTimeText end .nextdiscovery - farwritetext ElmPhoneDiscovery2Text + farwritetext ElmPhoneInvestigatingEggMovesText end .pokerus - farwritetext ElmPhonePokerusText + farwritetext ElmPhoneDiscoveredPokerusText specialphonecall SPECIALCALL_NONE end @@ -68,7 +68,7 @@ ElmPhoneCallerScript: ifequal SPECIALCALL_WEIRDBROADCAST, .rocket ifequal SPECIALCALL_SSTICKET, .gift ifequal SPECIALCALL_MASTERBALL, .gift - farwritetext ElmPhonePokerusText + farwritetext ElmPhoneDiscoveredPokerusText specialphonecall SPECIALCALL_NONE end @@ -86,7 +86,7 @@ ElmPhoneCallerScript: end .rocket - farwritetext ElmPhoneRocketText + farwritetext ElmPhoneRadioTowerRocketTakeoverText specialphonecall SPECIALCALL_NONE end @@ -96,6 +96,6 @@ ElmPhoneCallerScript: end .unused - farwritetext ElmPhoneUnusedText + farwritetext ElmPhoneGotAholdOfSomethingNeatText specialphonecall SPECIALCALL_NONE end diff --git a/engine/phone/scripts/gaven.asm b/engine/phone/scripts/gaven.asm index 1c610e69d..32e20db91 100644 --- a/engine/phone/scripts/gaven.asm +++ b/engine/phone/scripts/gaven.asm @@ -8,14 +8,14 @@ GavenPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal THURSDAY, .NotThursday checktime MORN - iftrue GavenThursdayMorning + iftrue GavenThursdayMorningScript .NotThursday: - farsjump UnknownScript_0xa0910 + farsjump GavenHangUpNotThursdayScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_26 - farsjump UnknownScript_0xa0a37 + farsjump GavenReminderScript GavenPhoneCallerScript: gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3 @@ -32,7 +32,7 @@ GavenPhoneCallerScript: ifequal 0, GavenFoundRare farsjump Phone_GenericCall_Male -GavenThursdayMorning: +GavenThursdayMorningScript: setflag ENGINE_GAVEN_THURSDAY_MORNING GavenWantsRematch: diff --git a/engine/phone/scripts/generic_callee.asm b/engine/phone/scripts/generic_callee.asm index 6afce4abe..f8a5f7394 100644 --- a/engine/phone/scripts/generic_callee.asm +++ b/engine/phone/scripts/generic_callee.asm @@ -46,103 +46,103 @@ PhoneScript_AnswerPhone_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4dc5 - buttonsound + farwritetext JackAnswerPhoneText + promptbutton end .Huey: - farwritetext UnknownText_0x1b5073 - buttonsound + farwritetext HueyAnswerPhoneText + promptbutton end .Gaven: - farwritetext UnknownText_0x1b5270 - buttonsound + farwritetext GavenAnswerPhoneText + promptbutton end .Jose: - farwritetext UnknownText_0x1b55ae - buttonsound + farwritetext JoseAnswerPhoneText + promptbutton end .Joey: - farwritetext UnknownText_0x1b589a - buttonsound + farwritetext JoeyAnswerPhoneText + promptbutton end .Wade: - farwritetext UnknownText_0x1b5a3b - buttonsound + farwritetext WadeAnswerPhoneText + promptbutton end .Ralph: - farwritetext UnknownText_0x1b5c10 - buttonsound + farwritetext RalphAnswerPhoneText + promptbutton end .Anthony: - farwritetext UnknownText_0x1b5f7a - buttonsound + farwritetext AnthonyAnswerPhoneText + promptbutton end .Todd: - farwritetext UnknownText_0x1b60f5 - buttonsound + farwritetext ToddAnswerPhoneText + promptbutton end .Irwin: - farwritetext UnknownText_0x1b638c - buttonsound + farwritetext IrwinAnswerPhoneText + promptbutton end .Arnie: - farwritetext UnknownText_0x1b6454 - buttonsound + farwritetext ArnieAnswerPhoneText + promptbutton end .Alan: - farwritetext UnknownText_0x1b659d - buttonsound + farwritetext AlanAnswerPhoneText + promptbutton end .Chad: - farwritetext UnknownText_0x1b67e2 - buttonsound + farwritetext ChadAnswerPhoneText + promptbutton end .Derek: - farwritetext UnknownText_0x1b69a8 - buttonsound + farwritetext DerekAnswerPhoneText + promptbutton end .Tully: - farwritetext UnknownText_0x1b6b39 - buttonsound + farwritetext TullyAnswerPhoneText + promptbutton end .Brent: - farwritetext UnknownText_0x1b6c96 - buttonsound + farwritetext BrentAnswerPhoneText + promptbutton end .Vance: - farwritetext UnknownText_0x1b7019 - buttonsound + farwritetext VanceAnswerPhoneText + promptbutton end .Wilton: - farwritetext UnknownText_0x1b71d5 - buttonsound + farwritetext WiltonAnswerPhoneText + promptbutton end .Kenji: - farwritetext UnknownText_0x1b730b - buttonsound + farwritetext KenjiAnswerPhoneText + promptbutton end .Parry: - farwritetext UnknownText_0x1b73c7 - buttonsound + farwritetext ParryAnswerPhoneText + promptbutton end PhoneScript_AnswerPhone_Male_Day: @@ -169,103 +169,103 @@ PhoneScript_AnswerPhone_Male_Day: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4ded - buttonsound + farwritetext JackAnswerPhoneDayText + promptbutton end .Huey: - farwritetext UnknownText_0x1b509b - buttonsound + farwritetext HueyAnswerPhoneDayText + promptbutton end .Gaven: - farwritetext UnknownText_0x1b52a5 - buttonsound + farwritetext GavenAnswerPhoneDayText + promptbutton end .Jose: - farwritetext UnknownText_0x1b55da - buttonsound + farwritetext JoseAnswerPhoneDayText + promptbutton end .Joey: - farwritetext UnknownText_0x1b58c2 - buttonsound + farwritetext JoeyAnswerPhoneDayText + promptbutton end .Wade: - farwritetext UnknownText_0x1b5a74 - buttonsound + farwritetext WadeAnswerPhoneDayText + promptbutton end .Ralph: - farwritetext UnknownText_0x1b5c63 - buttonsound + farwritetext RalphAnswerPhoneDayText + promptbutton end .Anthony: - farwritetext UnknownText_0x1b5f9e - buttonsound + farwritetext AnthonyAnswerPhoneDayText + promptbutton end .Todd: - farwritetext UnknownText_0x1b611b - buttonsound + farwritetext ToddAnswerPhoneDayText + promptbutton end .Irwin: - farwritetext UnknownText_0x1b63a8 - buttonsound + farwritetext IrwinAnswerPhoneDayText + promptbutton end .Arnie: - farwritetext UnknownText_0x1b647e - buttonsound + farwritetext ArnieAnswerPhoneDayText + promptbutton end .Alan: - farwritetext UnknownText_0x1b65c7 - buttonsound + farwritetext AlanAnswerPhoneDayText + promptbutton end .Chad: - farwritetext UnknownText_0x1b680e - buttonsound + farwritetext ChadAnswerPhoneDayText + promptbutton end .Derek: - farwritetext UnknownText_0x1b69d2 - buttonsound + farwritetext DerekAnswerPhoneDayText + promptbutton end .Tully: - farwritetext UnknownText_0x1b6b65 - buttonsound + farwritetext TullyAnswerPhoneDayText + promptbutton end .Brent: - farwritetext UnknownText_0x1b6cc6 - buttonsound + farwritetext BrentAnswerPhoneDayText + promptbutton end .Vance: - farwritetext UnknownText_0x1b7057 - buttonsound + farwritetext VanceAnswerPhoneDayText + promptbutton end .Wilton: - farwritetext UnknownText_0x1b71fc - buttonsound + farwritetext WiltonAnswerPhoneDayText + promptbutton end .Kenji: - farwritetext UnknownText_0x1b7331 - buttonsound + farwritetext KenjiAnswerPhoneDayText + promptbutton end .Parry: - farwritetext UnknownText_0x1b73ef - buttonsound + farwritetext ParryAnswerPhoneDayText + promptbutton end PhoneScript_AnswerPhone_Male_Nite: @@ -292,103 +292,103 @@ PhoneScript_AnswerPhone_Male_Nite: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4e16 - buttonsound + farwritetext JackAnswerPhoneNiteText + promptbutton end .Huey: - farwritetext UnknownText_0x1b50c2 - buttonsound + farwritetext HueyAnswerPhoneNiteText + promptbutton end .Gaven: - farwritetext UnknownText_0x1b52cc - buttonsound + farwritetext GavenAnswerPhoneNiteText + promptbutton end .Jose: - farwritetext UnknownText_0x1b55fc - buttonsound + farwritetext JoseAnswerPhoneNiteText + promptbutton end .Joey: - farwritetext UnknownText_0x1b58ea - buttonsound + farwritetext JoeyAnswerPhoneNiteText + promptbutton end .Wade: - farwritetext UnknownText_0x1b5a9f - buttonsound + farwritetext WadeAnswerPhoneNiteText + promptbutton end .Ralph: - farwritetext UnknownText_0x1b5cb6 - buttonsound + farwritetext RalphAnswerPhoneNiteText + promptbutton end .Anthony: - farwritetext UnknownText_0x1b5fc9 - buttonsound + farwritetext AnthonyAnswerPhoneNiteText + promptbutton end .Todd: - farwritetext UnknownText_0x1b6149 - buttonsound + farwritetext ToddAnswerPhoneNiteText + promptbutton end .Irwin: - farwritetext UnknownText_0x1b63c4 - buttonsound + farwritetext IrwinAnswerPhoneNiteText + promptbutton end .Arnie: - farwritetext UnknownText_0x1b64a8 - buttonsound + farwritetext ArnieAnswerPhoneNiteText + promptbutton end .Alan: - farwritetext UnknownText_0x1b65e3 - buttonsound + farwritetext AlanAnswerPhoneNiteText + promptbutton end .Chad: - farwritetext UnknownText_0x1b6836 - buttonsound + farwritetext ChadAnswerPhoneNiteText + promptbutton end .Derek: - farwritetext UnknownText_0x1b69f8 - buttonsound + farwritetext DerekAnswerPhoneNiteText + promptbutton end .Tully: - farwritetext UnknownText_0x1b6b92 - buttonsound + farwritetext TullyAnswerPhoneNiteText + promptbutton end .Brent: - farwritetext UnknownText_0x1b6cf6 - buttonsound + farwritetext BrentAnswerPhoneNiteText + promptbutton end .Vance: - farwritetext UnknownText_0x1b7092 - buttonsound + farwritetext VanceAnswerPhoneNiteText + promptbutton end .Wilton: - farwritetext UnknownText_0x1b722a - buttonsound + farwritetext WiltonAnswerPhoneNiteText + promptbutton end .Kenji: - farwritetext UnknownText_0x1b7357 - buttonsound + farwritetext KenjiAnswerPhoneNiteText + promptbutton end .Parry: - farwritetext UnknownText_0x1b7417 - buttonsound + farwritetext ParryAnswerPhoneNiteText + promptbutton end PhoneScript_AnswerPhone_Female: @@ -407,43 +407,43 @@ PhoneScript_AnswerPhone_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4f21 - buttonsound + farwritetext BeverlyAnswerPhoneText + promptbutton end .Beth: - farwritetext UnknownText_0x1b53f7 - buttonsound + farwritetext BethAnswerPhoneText + promptbutton end .Reena: - farwritetext UnknownText_0x1b5702 - buttonsound + farwritetext ReenaAnswerPhoneText + promptbutton end .Liz: - farwritetext UnknownText_0x1b5d9f - buttonsound + farwritetext LizAnswerPhoneText + promptbutton end .Gina: - farwritetext UnknownText_0x1b626a - buttonsound + farwritetext GinaAnswerPhoneText + promptbutton end .Dana: - farwritetext UnknownText_0x1b66c8 - buttonsound + farwritetext DanaAnswerPhoneText + promptbutton end .Tiffany: - farwritetext UnknownText_0x1b6e7c - buttonsound + farwritetext TiffanyAnswerPhoneText + promptbutton end .Erin: - farwritetext UnknownText_0x1b751a - buttonsound + farwritetext ErinAnswerPhoneText + promptbutton end PhoneScript_AnswerPhone_Female_Day: @@ -458,43 +458,43 @@ PhoneScript_AnswerPhone_Female_Day: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4f4d - buttonsound + farwritetext BeverlyAnswerPhoneDayText + promptbutton end .Beth: - farwritetext UnknownText_0x1b5424 - buttonsound + farwritetext BethAnswerPhoneDayText + promptbutton end .Reena: - farwritetext UnknownText_0x1b572e - buttonsound + farwritetext ReenaAnswerPhoneDayText + promptbutton end .Liz: - farwritetext UnknownText_0x1b5dcc - buttonsound + farwritetext LizAnswerPhoneDayText + promptbutton end .Gina: - farwritetext UnknownText_0x1b6296 - buttonsound + farwritetext GinaAnswerPhoneDayText + promptbutton end .Dana: - farwritetext UnknownText_0x1b66ec - buttonsound + farwritetext DanaAnswerPhoneDayText + promptbutton end .Tiffany: - farwritetext UnknownText_0x1b6ea6 - buttonsound + farwritetext TiffanyAnswerPhoneDayText + promptbutton end .Erin: - farwritetext UnknownText_0x1b7548 - buttonsound + farwritetext ErinAnswerPhoneDayText + promptbutton end PhoneScript_AnswerPhone_Female_Nite: @@ -509,43 +509,43 @@ PhoneScript_AnswerPhone_Female_Nite: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4f75 - buttonsound + farwritetext BeverlyAnswerPhoneNiteText + promptbutton end .Beth: - farwritetext UnknownText_0x1b5446 - buttonsound + farwritetext BethAnswerPhoneNiteText + promptbutton end .Reena: - farwritetext UnknownText_0x1b575a - buttonsound + farwritetext ReenaAnswerPhoneNiteText + promptbutton end .Liz: - farwritetext UnknownText_0x1b5df8 - buttonsound + farwritetext LizAnswerPhoneNiteText + promptbutton end .Gina: - farwritetext UnknownText_0x1b62c5 - buttonsound + farwritetext GinaAnswerPhoneNiteText + promptbutton end .Dana: - farwritetext UnknownText_0x1b6713 - buttonsound + farwritetext DanaAnswerPhoneNiteText + promptbutton end .Tiffany: - farwritetext UnknownText_0x1b6ec9 - buttonsound + farwritetext TiffanyAnswerPhoneNiteText + promptbutton end .Erin: - farwritetext UnknownText_0x1b756f - buttonsound + farwritetext ErinAnswerPhoneNiteText + promptbutton end PhoneScript_GreetPhone_Male: @@ -576,103 +576,103 @@ PhoneScript_GreetPhone_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4e3e - buttonsound + farwritetext JackGreetText + promptbutton end .Huey: - farwritetext UnknownText_0x1b50e9 - buttonsound + farwritetext HueyGreetText + promptbutton end .Gaven: - farwritetext UnknownText_0x1b5301 - buttonsound + farwritetext GavenGreetText + promptbutton end .Jose: - farwritetext UnknownText_0x1b5628 - buttonsound + farwritetext JoseGreetText + promptbutton end .Joey: - farwritetext UnknownText_0x1b5912 - buttonsound + farwritetext JoeyGreetText + promptbutton end .Wade: - farwritetext UnknownText_0x1b5ad8 - buttonsound + farwritetext WadeGreetText + promptbutton end .Ralph: - farwritetext UnknownText_0x1b5d09 - buttonsound + farwritetext RalphGreetText + promptbutton end .Anthony: - farwritetext UnknownText_0x1b5ff6 - buttonsound + farwritetext AnthonyGreetText + promptbutton end .Todd: - farwritetext UnknownText_0x1b616e - buttonsound + farwritetext ToddGreetText + promptbutton end .Irwin: - farwritetext UnknownText_0x1b63e3 - buttonsound + farwritetext IrwinGreetText + promptbutton end .Arnie: - farwritetext UnknownText_0x1b64d2 - buttonsound + farwritetext ArnieGreetText + promptbutton end .Alan: - farwritetext UnknownText_0x1b660d - buttonsound + farwritetext AlanGreetText + promptbutton end .Chad: - farwritetext UnknownText_0x1b6862 - buttonsound + farwritetext ChadGreetText + promptbutton end .Derek: - farwritetext UnknownText_0x1b6a22 - buttonsound + farwritetext DerekGreetText + promptbutton end .Tully: - farwritetext UnknownText_0x1b6bb9 - buttonsound + farwritetext TullyGreetText + promptbutton end .Brent: - farwritetext UnknownText_0x1b6d26 - buttonsound + farwritetext BrentGreetText + promptbutton end .Vance: - farwritetext UnknownText_0x1b70e7 - buttonsound + farwritetext VanceGreetText + promptbutton end .Wilton: - farwritetext UnknownText_0x1b725c - buttonsound + farwritetext WiltonGreetText + promptbutton end .Kenji: - farwritetext UnknownText_0x1b737f - buttonsound + farwritetext KenjiGreetText + promptbutton end .Parry: - farwritetext UnknownText_0x1b743f - buttonsound + farwritetext ParryGreetText + promptbutton end PhoneScript_GreetPhone_Male_Day: @@ -699,103 +699,103 @@ PhoneScript_GreetPhone_Male_Day: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4e72 - buttonsound + farwritetext JackGreetDayText + promptbutton end .Huey: - farwritetext UnknownText_0x1b511a - buttonsound + farwritetext HueyGreetDayText + promptbutton end .Gaven: - farwritetext UnknownText_0x1b5335 - buttonsound + farwritetext GavenGreetDayText + promptbutton end .Jose: - farwritetext UnknownText_0x1b564c - buttonsound + farwritetext JoseGreetDayText + promptbutton end .Joey: - farwritetext UnknownText_0x1b5948 - buttonsound + farwritetext JoeyGreetDayText + promptbutton end .Wade: - farwritetext UnknownText_0x1b5b0b - buttonsound + farwritetext WadeGreetDayText + promptbutton end .Ralph: - farwritetext UnknownText_0x1b5d21 - buttonsound + farwritetext RalphGreetDayText + promptbutton end .Anthony: - farwritetext UnknownText_0x1b6017 - buttonsound + farwritetext AnthonyGreetDayText + promptbutton end .Todd: - farwritetext UnknownText_0x1b618f - buttonsound + farwritetext ToddGreetDayText + promptbutton end .Irwin: - farwritetext UnknownText_0x1b6407 - buttonsound + farwritetext IrwinGreetDayText + promptbutton end .Arnie: - farwritetext UnknownText_0x1b6506 - buttonsound + farwritetext ArnieGreetDayText + promptbutton end .Alan: - farwritetext UnknownText_0x1b6624 - buttonsound + farwritetext AlanGreetDayText + promptbutton end .Chad: - farwritetext UnknownText_0x1b6890 - buttonsound + farwritetext ChadGreetDayText + promptbutton end .Derek: - farwritetext UnknownText_0x1b6a56 - buttonsound + farwritetext DerekGreetDayText + promptbutton end .Tully: - farwritetext UnknownText_0x1b6bef - buttonsound + farwritetext TullyGreetDayText + promptbutton end .Brent: - farwritetext UnknownText_0x1b6d57 - buttonsound + farwritetext BrentGreetDayText + promptbutton end .Vance: - farwritetext UnknownText_0x1b7112 - buttonsound + farwritetext VanceGreetDayText + promptbutton end .Wilton: - farwritetext UnknownText_0x1b7283 - buttonsound + farwritetext WiltonGreetDayText + promptbutton end .Kenji: - farwritetext UnknownText_0x1b7397 - buttonsound + farwritetext KenjiGreetDayText + promptbutton end .Parry: - farwritetext UnknownText_0x1b746f - buttonsound + farwritetext ParryGreetDayText + promptbutton end PhoneScript_GreetPhone_Male_Nite: @@ -822,103 +822,103 @@ PhoneScript_GreetPhone_Male_Nite: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4e9e - buttonsound + farwritetext JackGreetNiteText + promptbutton end .Huey: - farwritetext UnknownText_0x1b5154 - buttonsound + farwritetext HueyGreetNiteText + promptbutton end .Gaven: - farwritetext UnknownText_0x1b535f - buttonsound + farwritetext GavenGreetNiteText + promptbutton end .Jose: - farwritetext UnknownText_0x1b5670 - buttonsound + farwritetext JoseGreetNiteText + promptbutton end .Joey: - farwritetext UnknownText_0x1b597c - buttonsound + farwritetext JoeyGreetNiteText + promptbutton end .Wade: - farwritetext UnknownText_0x1b5b37 - buttonsound + farwritetext WadeGreetNiteText + promptbutton end .Ralph: - farwritetext UnknownText_0x1b5d39 - buttonsound + farwritetext RalphGreetNiteText + promptbutton end .Anthony: - farwritetext UnknownText_0x1b6041 - buttonsound + farwritetext AnthonyGreetNiteText + promptbutton end .Todd: - farwritetext UnknownText_0x1b61bd - buttonsound + farwritetext ToddGreetNiteText + promptbutton end .Irwin: - farwritetext UnknownText_0x1b642c - buttonsound + farwritetext IrwinGreetNiteText + promptbutton end .Arnie: - farwritetext UnknownText_0x1b6539 - buttonsound + farwritetext ArnieGreetNiteText + promptbutton end .Alan: - farwritetext UnknownText_0x1b663b - buttonsound + farwritetext AlanGreetNiteText + promptbutton end .Chad: - farwritetext UnknownText_0x1b68ba - buttonsound + farwritetext ChadGreetNiteText + promptbutton end .Derek: - farwritetext UnknownText_0x1b6a8b - buttonsound + farwritetext DerekGreetNiteText + promptbutton end .Tully: - farwritetext UnknownText_0x1b6c23 - buttonsound + farwritetext TullyGreetNiteText + promptbutton end .Brent: - farwritetext UnknownText_0x1b6d88 - buttonsound + farwritetext BrentGreetNiteText + promptbutton end .Vance: - farwritetext UnknownText_0x1b7132 - buttonsound + farwritetext VanceGreetNiteText + promptbutton end .Wilton: - farwritetext UnknownText_0x1b72a5 - buttonsound + farwritetext WiltonGreetNiteText + promptbutton end .Kenji: - farwritetext UnknownText_0x1b73af - buttonsound + farwritetext KenjiGreetNiteText + promptbutton end .Parry: - farwritetext UnknownText_0x1b749b - buttonsound + farwritetext ParryGreetNiteText + promptbutton end PhoneScript_GreetPhone_Female: @@ -937,43 +937,43 @@ PhoneScript_GreetPhone_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4fa1 - buttonsound + farwritetext BeverlyGreetText + promptbutton end .Beth: - farwritetext UnknownText_0x1b5472 - buttonsound + farwritetext BethGreetText + promptbutton end .Reena: - farwritetext UnknownText_0x1b5786 - buttonsound + farwritetext ReenaGreetText + promptbutton end .Liz: - farwritetext UnknownText_0x1b5e25 - buttonsound + farwritetext LizGreetText + promptbutton end .Gina: - farwritetext UnknownText_0x1b62f1 - buttonsound + farwritetext GinaGreetText + promptbutton end .Dana: - farwritetext UnknownText_0x1b6738 - buttonsound + farwritetext DanaGreetText + promptbutton end .Tiffany: - farwritetext UnknownText_0x1b6ef3 - buttonsound + farwritetext TiffanyGreetText + promptbutton end .Erin: - farwritetext UnknownText_0x1b758f - buttonsound + farwritetext ErinGreetText + promptbutton end PhoneScript_GreetPhone_Female_Day: @@ -988,43 +988,43 @@ PhoneScript_GreetPhone_Female_Day: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4fda - buttonsound + farwritetext BeverlyGreetDayText + promptbutton end .Beth: - farwritetext UnknownText_0x1b54a6 - buttonsound + farwritetext BethGreetDayText + promptbutton end .Reena: - farwritetext UnknownText_0x1b57b7 - buttonsound + farwritetext ReenaGreetDayText + promptbutton end .Liz: - farwritetext UnknownText_0x1b5e59 - buttonsound + farwritetext LizGreetDayText + promptbutton end .Gina: - farwritetext UnknownText_0x1b630e - buttonsound + farwritetext GinaGreetDayText + promptbutton end .Dana: - farwritetext UnknownText_0x1b6757 - buttonsound + farwritetext DanaGreetDayText + promptbutton end .Tiffany: - farwritetext UnknownText_0x1b6f1c - buttonsound + farwritetext TiffanyGreetDayText + promptbutton end .Erin: - farwritetext UnknownText_0x1b75ac - buttonsound + farwritetext ErinGreetDayText + promptbutton end PhoneScript_GreetPhone_Female_Nite: @@ -1039,43 +1039,43 @@ PhoneScript_GreetPhone_Female_Nite: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b5004 - buttonsound + farwritetext BeverlyGreetNiteText + promptbutton end .Beth: - farwritetext UnknownText_0x1b54d4 - buttonsound + farwritetext BethGreetNiteText + promptbutton end .Reena: - farwritetext UnknownText_0x1b57e8 - buttonsound + farwritetext ReenaGreetNiteText + promptbutton end .Liz: - farwritetext UnknownText_0x1b5e8e - buttonsound + farwritetext LizGreetNiteText + promptbutton end .Gina: - farwritetext UnknownText_0x1b6331 - buttonsound + farwritetext GinaGreetNiteText + promptbutton end .Dana: - farwritetext UnknownText_0x1b6776 - buttonsound + farwritetext DanaGreetNiteText + promptbutton end .Tiffany: - farwritetext UnknownText_0x1b6f37 - buttonsound + farwritetext TiffanyGreetNiteText + promptbutton end .Erin: - farwritetext UnknownText_0x1b75c9 - buttonsound + farwritetext ErinGreetNiteText + promptbutton end PhoneScript_Generic_Male: @@ -1099,93 +1099,93 @@ PhoneScript_Generic_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4ecd - buttonsound + farwritetext JackGenericText + promptbutton end .Unknown: - farwritetext UnknownText_0x1b518b - buttonsound + farwritetext UnknownGenericText + promptbutton end .Gaven: - farwritetext UnknownText_0x1b5393 - buttonsound + farwritetext GavenGenericText + promptbutton end .Jose: - farwritetext UnknownText_0x1b5694 - buttonsound + farwritetext JoseGenericText + promptbutton end .Joey: - farwritetext UnknownText_0x1b59b2 - buttonsound + farwritetext JoeyGenericText + promptbutton end .Wade: - farwritetext UnknownText_0x1b5b68 - buttonsound + farwritetext WadeGenericText + promptbutton end .Ralph: - farwritetext UnknownText_0x1b5d51 - buttonsound + farwritetext RalphGenericText + promptbutton end .Anthony: - farwritetext UnknownText_0x1b606f - buttonsound + farwritetext AnthonyGenericText + promptbutton end .Todd: - farwritetext UnknownText_0x1b61f2 - buttonsound + farwritetext ToddGenericText + promptbutton end .Arnie: - farwritetext UnknownText_0x1b656c - buttonsound + farwritetext ArnieGenericText + promptbutton end .Alan: - farwritetext UnknownText_0x1b6652 - buttonsound + farwritetext AlanGenericText + promptbutton end .Chad: - farwritetext UnknownText_0x1b68e8 - buttonsound + farwritetext ChadGenericText + promptbutton end .Derek: - farwritetext UnknownText_0x1b6ac2 - buttonsound + farwritetext DerekGenericText + promptbutton end .Tully: - farwritetext UnknownText_0x1b6c56 - buttonsound + farwritetext TullyGenericText + promptbutton end .Brent: - farwritetext UnknownText_0x1b6db9 - buttonsound + farwritetext BrentGenericText + promptbutton end .Vance: - farwritetext UnknownText_0x1b7161 - buttonsound + farwritetext VanceGenericText + promptbutton end .Wilton: - farwritetext UnknownText_0x1b72d0 - buttonsound + farwritetext WiltonGenericText + promptbutton end .Parry: - farwritetext UnknownText_0x1b74c8 - buttonsound + farwritetext ParryGenericText + promptbutton end PhoneScript_Generic_Female: @@ -1200,60 +1200,60 @@ PhoneScript_Generic_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b502b - buttonsound + farwritetext BeverlyGenericText + promptbutton end .Beth: - farwritetext UnknownText_0x1b5510 - buttonsound + farwritetext BethGenericText + promptbutton end .Reena: - farwritetext UnknownText_0x1b5819 - buttonsound + farwritetext ReenaGenericText + promptbutton end .Liz: - farwritetext UnknownText_0x1b5ebe - buttonsound + farwritetext LizGenericText + promptbutton end .Gina: - farwritetext UnknownText_0x1b6352 - buttonsound + farwritetext GinaGenericText + promptbutton end .Dana: - farwritetext UnknownText_0x1b6795 - buttonsound + farwritetext DanaGenericText + promptbutton end .Tiffany: - farwritetext UnknownText_0x1b6f60 - buttonsound + farwritetext TiffanyGenericText + promptbutton end .Erin: - farwritetext UnknownText_0x1b75e5 - buttonsound + farwritetext ErinGenericText + promptbutton end PhoneScript_MonFlavorText: special RandomPhoneMon farscall PhoneScript_Random2 ifequal $0, .TooEnergetic - farwritetext UnknownText_0x1b518b - buttonsound - farsjump PhoneScript_HangupText_Male + farwritetext UnknownGenericText + promptbutton + farsjump PhoneScript_HangUpText_Male .TooEnergetic: farsjump .unnecessary .unnecessary - farwritetext UnknownText_0x1b522b - buttonsound - farsjump PhoneScript_HangupText_Male + farwritetext UnknownTougherThanEverText + promptbutton + farsjump PhoneScript_HangUpText_Male GrandmaString: db "Grandma@" GrandpaString: db "Grandpa@" diff --git a/engine/phone/scripts/generic_caller.asm b/engine/phone/scripts/generic_caller.asm index 636b7ab81..5dff5654b 100644 --- a/engine/phone/scripts/generic_caller.asm +++ b/engine/phone/scripts/generic_caller.asm @@ -31,7 +31,7 @@ Phone_FoundAMon_Male: farscall PhoneScript_Random2 ifequal 0, .GotAway farscall Phone_WhoDefeatedMon_Male - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male .GotAway: farsjump Phone_GotAwayCall_Male @@ -41,18 +41,18 @@ Phone_FoundAMon_Female: farscall PhoneScript_Random2 ifequal 0, .GotAway farscall Phone_WhoDefeatedMon_Female - farsjump PhoneScript_HangupText_Female + farsjump PhoneScript_HangUpText_Female .GotAway: farsjump Phone_GotAwayCall_Female Phone_GotAwayCall_Male: farscall Phone_WhoLostAMon_Male - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male Phone_GotAwayCall_Female: farscall Phone_WhoLostAMon_Female - farsjump PhoneScript_HangupText_Female + farsjump PhoneScript_HangUpText_Female Phone_WhosBragging_Male: readvar VAR_CALLERID @@ -75,88 +75,88 @@ Phone_WhosBragging_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext JackIntelligenceText - buttonsound + farwritetext JackIntelligenceKeepsRisingText + promptbutton end .Gaven: - farwritetext GavenGreaterText - buttonsound + farwritetext GavenMonGreaterThanImaginedText + promptbutton end .Jose: - farwritetext JoseAromaText - buttonsound + farwritetext JoseMonsStickHasADeliciousAromaText + promptbutton end .Joey: - farwritetext JoeySharperText - buttonsound + farwritetext JoeyMonLookingSharperText + promptbutton end .Wade: - farwritetext WadeAreYouGrowingText - buttonsound + farwritetext WadeAreYourMonGrowingText + promptbutton end .Ralph: farwritetext RalphNeglectingKidsText - buttonsound + promptbutton end .Anthony: - farwritetext AnthonyAteBerriesText - buttonsound + farwritetext AnthonyMonAteSomeBerriesText + promptbutton end .Todd: farwritetext ToddLooksCuteLikeMeText - buttonsound + promptbutton end .Arnie: - farwritetext ArnieLovesTheCuteText - buttonsound + farwritetext ArnieMonIsSoCuteText + promptbutton end .Alan: farwritetext AlanGettingStrongerText - buttonsound + promptbutton end .Chad: farwritetext ChadObservingWildText - buttonsound + promptbutton end .Derek: - farwritetext DerekCheekPincherText - buttonsound + farwritetext DerekCheekPinchingText + promptbutton end .Tully: - farwritetext TullyGrownText - buttonsound + farwritetext TullyMonHasGrownText + promptbutton end .Brent: farwritetext BrentRareTradeText - buttonsound + promptbutton end .Vance: - farwritetext VanceLiftoffText - buttonsound + farwritetext VanceMonHasBecomeTougherText + promptbutton end .Wilton: - farwritetext WiltonGrownText - buttonsound + farwritetext WiltonMonHasGrownText + promptbutton end .Parry: - farwritetext ParryNoMatchText - buttonsound + farwritetext ParryNothingCanMatchText + promptbutton end Phone_WhosBragging_Female: @@ -171,43 +171,43 @@ Phone_WhosBragging_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x174688 - buttonsound + farwritetext BeverlyMadeMonEvenCuterText + promptbutton end .Beth: - farwritetext UnknownText_0x174c7f - buttonsound + farwritetext BethExhilaratingRideText + promptbutton end .Reena: - farwritetext UnknownText_0x1752f5 - buttonsound + farwritetext ReenaMonsIsAPerfectMatchText + promptbutton end .Liz: - farwritetext UnknownText_0x175fda - buttonsound + farwritetext LizMonAlwaysWantsToNuzzleText + promptbutton end .Gina: - farwritetext UnknownText_0x1771fd - buttonsound + farwritetext GinaGettingInSyncWithMonText + promptbutton end .Dana: - farwritetext UnknownText_0x64f74 - buttonsound + farwritetext DanaTakingPhotosText + promptbutton end .Tiffany: - farwritetext UnknownText_0x665ad - buttonsound + farwritetext TiffanyMonIsAdorableText + promptbutton end .Erin: - farwritetext UnknownText_0x6717a - buttonsound + farwritetext ErinMonIsMuchStrongerText + promptbutton end Phone_WhoDefeatedMon_Male: @@ -232,87 +232,87 @@ Phone_WhoDefeatedMon_Male: .Jack: farwritetext JackDefeatedMonText - buttonsound + promptbutton end .Gaven: - farwritetext UnknownText_0x174a80 - buttonsound + farwritetext GavenDefeatedMonText + promptbutton end .Jose: - farwritetext UnknownText_0x174f90 - buttonsound + farwritetext JoseDefeatedMonText + promptbutton end .Joey: - farwritetext UnknownText_0x175591 - buttonsound + farwritetext JoeyDefeatedMonText + promptbutton end .Wade: - farwritetext UnknownText_0x175869 - buttonsound + farwritetext WadeDefeatedMonText + promptbutton end .Ralph: - farwritetext UnknownText_0x175c24 - buttonsound + farwritetext RalphDefeatedMonText + promptbutton end .Anthony: - farwritetext UnknownText_0x176aef - buttonsound + farwritetext AnthonyDefeatedMonText + promptbutton end .Todd: - farwritetext UnknownText_0x176e9c - buttonsound + farwritetext ToddDefeatedMonText + promptbutton end .Arnie: - farwritetext UnknownText_0x64a13 - buttonsound + farwritetext ArnieDefeatedMonText + promptbutton end .Alan: - farwritetext UnknownText_0x64cf3 - buttonsound + farwritetext AlanDefeatedMonText + promptbutton end .Chad: - farwritetext UnknownText_0x65318 - buttonsound + farwritetext ChadDefeatedMonText + promptbutton end .Derek: - farwritetext UnknownText_0x65b29 - buttonsound + farwritetext DerekDefeatedMonText + promptbutton end .Tully: - farwritetext UnknownText_0x65e42 - buttonsound + farwritetext TullyDefeatedMonText + promptbutton end .Brent: - farwritetext UnknownText_0x6613c - buttonsound + farwritetext BrentDefeatedMonText + promptbutton end .Vance: - farwritetext UnknownText_0x669b2 - buttonsound + farwritetext VanceDefeatedMonText + promptbutton end .Wilton: - farwritetext UnknownText_0x66b3e - buttonsound + farwritetext WiltonDefeatedMonText + promptbutton end .Parry: - farwritetext UnknownText_0x66fc0 - buttonsound + farwritetext ParryDefeatedMonText + promptbutton end Phone_WhoDefeatedMon_Female: @@ -327,43 +327,43 @@ Phone_WhoDefeatedMon_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1746c3 - buttonsound + farwritetext BeverlyDefeatedMonText + promptbutton end .Beth: - farwritetext UnknownText_0x174cf6 - buttonsound + farwritetext BethDefeatedMonText + promptbutton end .Reena: - farwritetext UnknownText_0x17536b - buttonsound + farwritetext ReenaDefeatedMonText + promptbutton end .Liz: - farwritetext UnknownText_0x17602d - buttonsound + farwritetext LizDefeatedMonText + promptbutton end .Gina: - farwritetext UnknownText_0x177237 - buttonsound + farwritetext GinaDefeatedMonText + promptbutton end .Dana: - farwritetext UnknownText_0x64fb2 - buttonsound + farwritetext DanaDefeatedMonText + promptbutton end .Tiffany: - farwritetext UnknownText_0x66605 - buttonsound + farwritetext TiffanyDefeatedMonText + promptbutton end .Erin: - farwritetext UnknownText_0x671a4 - buttonsound + farwritetext ErinDefeatedMonText + promptbutton end Phone_WhoLostAMon_Male: @@ -387,88 +387,88 @@ Phone_WhoLostAMon_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x174165 - buttonsound + farwritetext JackLostAMonText + promptbutton end .Gaven: - farwritetext UnknownText_0x174b2d - buttonsound + farwritetext GavenLostAMonText + promptbutton end .Jose: - farwritetext UnknownText_0x174ffd - buttonsound + farwritetext JoseLostAMonText + promptbutton end .Joey: - farwritetext UnknownText_0x175611 - buttonsound + farwritetext JoeyLostAMonText + promptbutton end .Wade: - farwritetext UnknownText_0x1758e4 - buttonsound + farwritetext WadeLostAMonText + promptbutton end .Ralph: - farwritetext UnknownText_0x175c9f - buttonsound + farwritetext RalphLostAMonText + promptbutton end .Anthony: - farwritetext UnknownText_0x176b45 - buttonsound + farwritetext AnthonyLostAMonText + promptbutton end .Todd: - farwritetext UnknownText_0x176eee - buttonsound + farwritetext ToddLostAMonText + promptbutton end .Arnie: - farwritetext UnknownText_0x64a71 - buttonsound + farwritetext ArnieLostAMonText + promptbutton end .Alan: - farwritetext UnknownText_0x64d4f - buttonsound + farwritetext AlanLostAMonText + promptbutton end .Chad: - farwritetext UnknownText_0x65399 - buttonsound + farwritetext ChadLostAMonText + promptbutton end .Derek: - farwritetext UnknownText_0x65bc8 - buttonsound + farwritetext DerekLostAMonText + promptbutton end .Tully: - farwritetext UnknownText_0x65eac - buttonsound + farwritetext TullyLostAMonText + promptbutton end .Brent: - farwritetext UnknownText_0x6618c - buttonsound + farwritetext BrentLostAMonText + promptbutton end .Vance: - farwritetext UnknownText_0x669ed - buttonsound + farwritetext VanceLostAMonText + promptbutton end .Wilton: - farwritetext UnknownText_0x66b8f - buttonsound + farwritetext WiltonLostAMonText + promptbutton end .Parry: - farwritetext UnknownText_0x67001 - buttonsound + farwritetext ParryLostAMonText + promptbutton end Phone_WhoLostAMon_Female: @@ -483,52 +483,52 @@ Phone_WhoLostAMon_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x174734 - buttonsound + farwritetext BeverlyLostAMonText + promptbutton end .Beth: - farwritetext UnknownText_0x174d86 - buttonsound + farwritetext BethLostAMonText + promptbutton end .Reena: - farwritetext UnknownText_0x1753c5 - buttonsound + farwritetext ReenaLostAMonText + promptbutton end .Liz: - farwritetext UnknownText_0x176095 - buttonsound + farwritetext LizLostAMonText + promptbutton end .Gina: - farwritetext UnknownText_0x177297 - buttonsound + farwritetext GinaLostAMonText + promptbutton end .Dana: - farwritetext UnknownText_0x6501c - buttonsound + farwritetext DanaLostAMonText + promptbutton end .Tiffany: - farwritetext UnknownText_0x66688 - buttonsound + farwritetext TiffanyLostAMonText + promptbutton end .Erin: - farwritetext UnknownText_0x671eb - buttonsound + farwritetext ErinLostAMonText + promptbutton end PhoneScript_WantsToBattle_Male: farscall PhoneScript_RematchText_Male - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male PhoneScript_WantsToBattle_Female: farscall PhoneScript_RematchText_Female - farsjump PhoneScript_HangupText_Female + farsjump PhoneScript_HangUpText_Female PhoneScript_RematchText_Male: readvar VAR_CALLERID @@ -551,88 +551,88 @@ PhoneScript_RematchText_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1741e1 - buttonsound + farwritetext JackBattleRematchText + promptbutton end .Huey: - farwritetext UnknownText_0x1748ea - buttonsound + farwritetext HueyBattleRematchText + promptbutton end .Gaven: - farwritetext UnknownText_0x174bc5 - buttonsound + farwritetext GavenBattleRematchText + promptbutton end .Jose: - farwritetext UnknownText_0x17507d - buttonsound + farwritetext JoseBattleRematchText + promptbutton end .Joey: - farwritetext UnknownText_0x175693 - buttonsound + farwritetext JoeyBattleRematchText + promptbutton end .Wade: - farwritetext UnknownText_0x175976 - buttonsound + farwritetext WadeBattleRematchText + promptbutton end .Ralph: - farwritetext UnknownText_0x175d40 - buttonsound + farwritetext RalphBattleRematchText + promptbutton end .Anthony: - farwritetext UnknownText_0x176bee - buttonsound + farwritetext AnthonyBattleRematchText + promptbutton end .Todd: - farwritetext UnknownText_0x176f60 - buttonsound + farwritetext ToddBattleRematchText + promptbutton end .Arnie: - farwritetext UnknownText_0x64ada - buttonsound + farwritetext ArnieBattleRematchText + promptbutton end .Alan: - farwritetext UnknownText_0x64da4 - buttonsound + farwritetext AlanBattleRematchText + promptbutton end .Chad: - farwritetext UnknownText_0x65419 - buttonsound + farwritetext ChadBattleRematchText + promptbutton end .Tully: - farwritetext UnknownText_0x65f17 - buttonsound + farwritetext TullyBattleRematchText + promptbutton end .Brent: - farwritetext UnknownText_0x66214 - buttonsound + farwritetext BrentBattleRematchText + promptbutton end .Vance: - farwritetext UnknownText_0x66a3a - buttonsound + farwritetext VanceBattleRematchText + promptbutton end .Wilton: - farwritetext UnknownText_0x66bf3 - buttonsound + farwritetext WiltonBattleRematchText + promptbutton end .Parry: - farwritetext UnknownText_0x67096 - buttonsound + farwritetext ParryBattleRematchText + promptbutton end PhoneScript_RematchText_Female: @@ -646,49 +646,49 @@ PhoneScript_RematchText_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beth: - farwritetext UnknownText_0x174e4e - buttonsound + farwritetext BethBattleRematchText + promptbutton end .Reena: - farwritetext UnknownText_0x17543a - buttonsound + farwritetext ReenaBattleRematchText + promptbutton end .Liz: - farwritetext UnknownText_0x17610a - buttonsound + farwritetext LizBattleRematchText + promptbutton end .Gina: - farwritetext UnknownText_0x1772e2 - buttonsound + farwritetext GinaBattleRematchText + promptbutton end .Dana: - farwritetext UnknownText_0x65091 - buttonsound + farwritetext DanaBattleRematchText + promptbutton end .Tiffany: - farwritetext UnknownText_0x66730 - buttonsound + farwritetext TiffanyBattleRematchText + promptbutton end .Erin: - farwritetext UnknownText_0x6722e - buttonsound + farwritetext ErinBattleRematchText + promptbutton end LizWrongNumberScript: - farwritetext LizHiTaniaText + farwritetext LizWrongNumberText end TiffanyItsAwful: farwritetext TiffanyItsAwfulText end -PhoneScript_HangupText_Male: +PhoneScript_HangUpText_Male: readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_SAILOR_HUEY, .Huey @@ -712,86 +712,86 @@ PhoneScript_HangupText_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x174251 + farwritetext JackHangUpText end .Huey: - farwritetext UnknownText_0x174962 + farwritetext HueyHangUpText end .Gaven: - farwritetext UnknownText_0x174c0e + farwritetext GavenHangUpText end .Jose: - farwritetext UnknownText_0x175106 + farwritetext JoseHangUpText end .Joey: - farwritetext UnknownText_0x17570a + farwritetext JoeyHangUpText end .Wade: - farwritetext UnknownText_0x1759e7 + farwritetext WadeHangUpText end .Ralph: - farwritetext UnknownText_0x175db7 + farwritetext RalphHangUpText end .Anthony: - farwritetext UnknownText_0x176c47 + farwritetext AnthonyHangUpText end .Todd: - farwritetext UnknownText_0x176fdb + farwritetext ToddHangUpText end .Irwin: - farwritetext UnknownText_0x64000 + farwritetext IrwinHangUpText end .Arnie: - farwritetext UnknownText_0x64b48 + farwritetext ArnieHangUpText end .Alan: - farwritetext UnknownText_0x64e1f + farwritetext AlanHangUpText end .Chad: - farwritetext UnknownText_0x65471 + farwritetext ChadHangUpText end .Derek: - farwritetext UnknownText_0x65c4e + farwritetext DerekHangUpText end .Tully: - farwritetext UnknownText_0x65f6e + farwritetext TullyHangUpText end .Brent: - farwritetext UnknownText_0x662a9 + farwritetext BrentHangUpText end .Vance: - farwritetext UnknownText_0x66a93 + farwritetext VanceHangUpText end .Wilton: - farwritetext UnknownText_0x66c58 + farwritetext WiltonHangUpText end .Kenji: - farwritetext UnknownText_0x66dab + farwritetext KenjiHangUpText end .Parry: - farwritetext UnknownText_0x670eb + farwritetext ParryHangUpText end -PhoneScript_HangupText_Female: +PhoneScript_HangUpText_Female: readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth @@ -803,35 +803,35 @@ PhoneScript_HangupText_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1747ac + farwritetext BeverlyHangUpText end .Beth: - farwritetext UnknownText_0x174eb7 + farwritetext BethHangUpText end .Reena: - farwritetext UnknownText_0x175488 + farwritetext ReenaHangUpText end .Liz: - farwritetext UnknownText_0x17620a + farwritetext LizHangUpText end .Gina: - farwritetext UnknownText_0x177361 + farwritetext GinaHangUpText end .Dana: - farwritetext UnknownText_0x650e2 + farwritetext DanaHangUpText end .Tiffany: - farwritetext UnknownText_0x667f7 + farwritetext TiffanyHangUpText end .Erin: - farwritetext UnknownText_0x67281 + farwritetext ErinHangUpText end Phone_CheckIfUnseenRare_Male: @@ -840,7 +840,7 @@ Phone_CheckIfUnseenRare_Male: farsjump Phone_GenericCall_Male .HangUp: - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male Phone_CheckIfUnseenRare_Female: scall PhoneScriptRareWildMon @@ -848,7 +848,7 @@ Phone_CheckIfUnseenRare_Female: farsjump Phone_GenericCall_Female .HangUp: - farsjump PhoneScript_HangupText_Female + farsjump PhoneScript_HangUpText_Female PhoneScriptRareWildMon: special RandomUnseenWildMon @@ -861,38 +861,38 @@ PhoneScript_BugCatchingContest: .Wade: farwritetext WadeBugCatchingContestText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .Derek: farwritetext DerekBugCatchingContestText - buttonsound - sjump PhoneScript_HangupText_Male - -IrwinRocketRumor: - farwritetext UnknownText_0x64032 - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa05c6: - farwritetext UnknownText_0x177378 - buttonsound - sjump PhoneScript_HangupText_Female - -UnknownScript_0xa05ce: - farwritetext UnknownText_0x64b5f - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa05d6: - farwritetext UnknownText_0x175dd9 - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa05de: - farwritetext UnknownText_0x176c61 - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male + +IrwinRocketRumorScript: + farwritetext IrwinRocketTakeoverRumorText + promptbutton + sjump PhoneScript_HangUpText_Male + +GinaRocketRumorScript: + farwritetext GinaRocketTakeoverRumorText + promptbutton + sjump PhoneScript_HangUpText_Female + +ArnieSwarmScript: + farwritetext ArnieSwarmText + promptbutton + sjump PhoneScript_HangUpText_Male + +RalphItemScript: + farwritetext RalphItemText + promptbutton + sjump PhoneScript_HangUpText_Male + +AnthonySwarmScript: + farwritetext AnthonySwarmText + promptbutton + sjump PhoneScript_HangUpText_Male PhoneScript_FoundItem_Male: readvar VAR_CALLERID @@ -904,27 +904,27 @@ PhoneScript_FoundItem_Male: ifequal PHONE_FISHER_WILTON, .Wilton .Jose: - farwritetext JoseFoundSomethingText + farwritetext JoseFoundItemText end .Wade: - farwritetext WadeFoundBerryText + farwritetext WadeFoundItemText end .Alan: - farwritetext UnknownText_0x64e2f + farwritetext AlanFoundItemText end .Derek: - farwritetext UnknownText_0x65cf9 + farwritetext DerekFoundItemText end .Tully: - farwritetext UnknownText_0x65f88 + farwritetext TullyFoundItemText end .Wilton: - farwritetext UnknownText_0x66c6b + farwritetext WiltonFoundItemText end PhoneScript_FoundItem_Female: @@ -935,27 +935,27 @@ PhoneScript_FoundItem_Female: ifequal PHONE_PICNICKER_TIFFANY, .Tiffany .Beverly: - farwritetext BeverlyFoundNuggetText + farwritetext BeverlyFoundItemText end .Gina: - farwritetext UnknownText_0x1773e7 + farwritetext GinaFoundItemText end .Dana: - farwritetext UnknownText_0x650ec + farwritetext DanaFoundItemText end .Tiffany: - farwritetext UnknownText_0x66801 + farwritetext TiffanyFoundItemText end -UnknownScript_0xa0644: - farwritetext UnknownText_0x176feb - buttonsound - sjump PhoneScript_HangupText_Male +ToddItemScript: + farwritetext ToddDepartmentStoreBargainSaleText + promptbutton + sjump PhoneScript_HangUpText_Male KenjiCallingPhoneScript: - farwritetext UnknownText_0x66dc5 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext KenjiRemainDedicatedText + promptbutton + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/gina.asm b/engine/phone/scripts/gina.asm index d1953d3f7..3b9da6090 100644 --- a/engine/phone/scripts/gina.asm +++ b/engine/phone/scripts/gina.asm @@ -15,18 +15,18 @@ GinaPhoneCalleeScript: .NotSunday: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue .Rockets - farsjump UnknownScript_0xa0960 + farsjump GinaHangUpScript .Rockets: - farsjump UnknownScript_0xa05c6 + farsjump GinaRocketRumorScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_34 - farsjump UnknownScript_0xa0a69 + farsjump GinaReminderScript .HasLeafStone: getlandmarkname STRING_BUFFER_5, ROUTE_34 - farsjump UnknownScript_0xa0abd + farsjump GinaComePickUpScript GinaPhoneCallerScript: gettrainername STRING_BUFFER_3, PICNICKER, GINA1 @@ -64,7 +64,7 @@ GinaWantsBattle: farsjump PhoneScript_WantsToBattle_Female GinaRockets: - farsjump UnknownScript_0xa05c6 + farsjump GinaRocketRumorScript GinaHasLeafStone: setflag ENGINE_GINA_HAS_LEAF_STONE diff --git a/engine/phone/scripts/hangups.asm b/engine/phone/scripts/hangups.asm index 55d2f8144..7ca1db51c 100644 --- a/engine/phone/scripts/hangups.asm +++ b/engine/phone/scripts/hangups.asm @@ -1,166 +1,166 @@ -JackPhoneTips: - farwritetext UnknownText_0x1745c2 - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0900: - farwritetext UnknownText_0x17485b - buttonsound - sjump PhoneScript_HangupText_Female - -UnknownScript_0xa0908: - farwritetext UnknownText_0x17496b - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0910: - farwritetext UnknownText_0x174c29 - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0918: - farwritetext UnknownText_0x174ec5 - buttonsound - sjump PhoneScript_HangupText_Female - -UnknownScript_0xa0920: - farwritetext UnknownText_0x17519b - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0928: - farwritetext UnknownText_0x17549b - buttonsound - sjump PhoneScript_HangupText_Female - -UnknownScript_0xa0930: - farwritetext UnknownText_0x17571d - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0938: - farwritetext UnknownText_0x175abe - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0940: - farwritetext UnknownText_0x175eaf - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0948: - farwritetext UnknownText_0x1768b0 - buttonsound - sjump PhoneScript_HangupText_Female - -UnknownScript_0xa0950: - farwritetext UnknownText_0x176d32 - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0958: - farwritetext UnknownText_0x1770fb - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0960: - farwritetext UnknownText_0x177465 - buttonsound - sjump PhoneScript_HangupText_Female - -UnknownScript_0xa0968: - farwritetext UnknownText_0x64bc6 - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0970: - farwritetext UnknownText_0x64e90 - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0978: - farwritetext UnknownText_0x65161 - buttonsound - sjump PhoneScript_HangupText_Female - -UnknownScript_0xa0980: - farwritetext UnknownText_0x65a23 - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0988: - farwritetext UnknownText_0x65d5c - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0990: - farwritetext UnknownText_0x65ff2 - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0998: - farwritetext UnknownText_0x6651e - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa09a0: - farwritetext UnknownText_0x66882 - buttonsound - sjump PhoneScript_HangupText_Female - -VanceLookingForward: +JackPhoneTipsScript: + farwritetext JackHeardSomeGreatTipsText + promptbutton + sjump PhoneScript_HangUpText_Male + +BeverlyHangUpScript: + farwritetext BeverlyLetsChatAboutMonAgainText + promptbutton + sjump PhoneScript_HangUpText_Female + +HueyHangUpScript: + farwritetext HueyWeHaveToBattleAgainSometimeText + promptbutton + sjump PhoneScript_HangUpText_Male + +GavenHangUpNotThursdayScript: + farwritetext GavenHangUpNotThursdayText + promptbutton + sjump PhoneScript_HangUpText_Male + +BethHangUpScript: + farwritetext BethLetsBattleAgainSometimeText + promptbutton + sjump PhoneScript_HangUpText_Female + +JoseHangUpScript: + farwritetext JoseHaventGottenItemYetText + promptbutton + sjump PhoneScript_HangUpText_Male + +ReenaForwardScript: + farwritetext ReenaForwardText + promptbutton + sjump PhoneScript_HangUpText_Female + +JoeyHangUpScript: + farwritetext JoeyDevisingStrategiesText + promptbutton + sjump PhoneScript_HangUpText_Male + +WadeNoBerriesScript: + farwritetext WadeNoBerriesText + promptbutton + sjump PhoneScript_HangUpText_Male + +RalphNoItemScript: + farwritetext RalphNoItemText + promptbutton + sjump PhoneScript_HangUpText_Male + +LizHangUpScript: + farwritetext LizFawningOverMonText + promptbutton + sjump PhoneScript_HangUpText_Female + +AnthonyHangUpScript: + farwritetext AnthonyWasntPayingAttentionText + promptbutton + sjump PhoneScript_HangUpText_Male + +ToddNoItemScript: + farwritetext ToddSavingUpForBargainSaleText + promptbutton + sjump PhoneScript_HangUpText_Male + +GinaHangUpScript: + farwritetext GinaHaventFoundAnythingYetText + promptbutton + sjump PhoneScript_HangUpText_Female + +ArnieHangUpScript: + farwritetext ArnieHaventSeenRareMonText + promptbutton + sjump PhoneScript_HangUpText_Male + +AlanHangUpScript: + farwritetext AlanHaventPickedUpAnythingText + promptbutton + sjump PhoneScript_HangUpText_Male + +DanaHangUpScript: + farwritetext DanaCanYouWaitABitLongerText + promptbutton + sjump PhoneScript_HangUpText_Female + +ChadHangUpScript: + farwritetext ChadGoingToStudyHardText + promptbutton + sjump PhoneScript_HangUpText_Male + +DerekHangUpScript: + farwritetext DerekLetsGetTogetherText + promptbutton + sjump PhoneScript_HangUpText_Male + +TullyNoItemScript: + farwritetext TullyNoItemText + promptbutton + sjump PhoneScript_HangUpText_Male + +BrentHangUpScript: + farwritetext BrentSorryImTooBusyText + promptbutton + sjump PhoneScript_HangUpText_Male + +TiffanyNoItemScript: + farwritetext TiffanyNoItemText + promptbutton + sjump PhoneScript_HangUpText_Female + +VanceLookingForwardScript: farwritetext VanceLookingForwardText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male -WiltonHaventFoundAnything: +WiltonHaventFoundAnythingScript: farwritetext WiltonHaventFoundAnythingText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male -ParryBattleWithMe: +ParryBattleWithMeScript: farwritetext ParryBattleWithMeText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male ErinWorkingHardScript: farwritetext ErinWorkingHardText - buttonsound - sjump PhoneScript_HangupText_Female + promptbutton + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa09c8: +IrwinRandomTextScript: random 3 - ifequal 0, UnknownScript_0xa09d6 - ifequal 1, UnknownScript_0xa09de - ifequal 2, UnknownScript_0xa09e6 + ifequal 0, IrwinEscapadeScript + ifequal 1, IrwinGoodMatchScript + ifequal 2, IrwinSoMuchToChatAboutScript -UnknownScript_0xa09d6: - farwritetext UnknownText_0x64846 - buttonsound - sjump PhoneScript_HangupText_Male +IrwinEscapadeScript: + farwritetext IrwinYourEscapadesRockText + promptbutton + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa09de: - farwritetext UnknownText_0x64881 - buttonsound - sjump PhoneScript_HangupText_Male +IrwinGoodMatchScript: + farwritetext IrwinGoodMatchText + promptbutton + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa09e6: - farwritetext UnknownText_0x648dc - buttonsound - sjump PhoneScript_HangupText_Male +IrwinSoMuchToChatAboutScript: + farwritetext IrwinSoMuchToChatAboutText + promptbutton + sjump PhoneScript_HangUpText_Male KenjiAnswerPhoneScript: readvar VAR_KENJI_BREAK ifequal 2, .Training ifequal 1, .OnBreak - farwritetext UnknownText_0x66e17 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext KenjiCallMeBackAnotherTimeText + promptbutton + sjump PhoneScript_HangUpText_Male .Training: - farwritetext UnknownText_0x66e67 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext KenjiIllHaveTimeToChatTomorrowText + promptbutton + sjump PhoneScript_HangUpText_Male .OnBreak: checktime MORN @@ -168,16 +168,16 @@ KenjiAnswerPhoneScript: checktime NITE iftrue .Night setevent EVENT_KENJI_ON_BREAK - farwritetext KenjiBreakText - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext KenjiTakingABreakText + promptbutton + sjump PhoneScript_HangUpText_Male .Morning: - farwritetext UnknownText_0x66ed3 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext KenjiHangUpMorningText + promptbutton + sjump PhoneScript_HangUpText_Male .Night: - farwritetext UnknownText_0x66f52 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext KenjiHangUpNightText + promptbutton + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/hangups_2.asm b/engine/phone/scripts/hangups_2.asm index 4518b2d99..aad10df21 100644 --- a/engine/phone/scripts/hangups_2.asm +++ b/engine/phone/scripts/hangups_2.asm @@ -1,49 +1,49 @@ -UnknownScript_0xa0aa5: - farwritetext UnknownText_0x174895 - buttonsound - sjump PhoneScript_HangupText_Female - -UnknownScript_0xa0aad: - farwritetext UnknownText_0x17529c - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0ab5: - farwritetext UnknownText_0x175b6d - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0abd: - farwritetext UnknownText_0x17750e - buttonsound - sjump PhoneScript_HangupText_Female - -UnknownScript_0xa0ac5: - farwritetext UnknownText_0x64f1a - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0acd: - farwritetext UnknownText_0x6520f - buttonsound - sjump PhoneScript_HangupText_Female - -UnknownScript_0xa0ad5: - farwritetext UnknownText_0x65da6 - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0add: - farwritetext UnknownText_0x66087 - buttonsound - sjump PhoneScript_HangupText_Male - -UnknownScript_0xa0ae5: - farwritetext UnknownText_0x6691d - buttonsound - sjump PhoneScript_HangupText_Female - -WiltonWantThis: +BeverlyComePickUpScript: + farwritetext BeverlyComePickUpText + promptbutton + sjump PhoneScript_HangUpText_Female + +JoseComePickUpScript: + farwritetext JoseComePickUpText + promptbutton + sjump PhoneScript_HangUpText_Male + +WadeComeQuickScript: + farwritetext WadeComeQuickText + promptbutton + sjump PhoneScript_HangUpText_Male + +GinaComePickUpScript: + farwritetext GinaComePickUpText + promptbutton + sjump PhoneScript_HangUpText_Female + +AlanComePickUpScript: + farwritetext AlanComePickUpGiftText + promptbutton + sjump PhoneScript_HangUpText_Male + +DanaComePickUpScript: + farwritetext DanaComePickUpText + promptbutton + sjump PhoneScript_HangUpText_Female + +DerekComePickUpScript: + farwritetext DerekComePickUpText + promptbutton + sjump PhoneScript_HangUpText_Male + +TullyHurryScript: + farwritetext TullyHurryText + promptbutton + sjump PhoneScript_HangUpText_Male + +TiffanyHurryScript: + farwritetext TiffanyHurryText + promptbutton + sjump PhoneScript_HangUpText_Female + +WiltonWantThisScript: farwritetext WiltonWantThisText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/huey.asm b/engine/phone/scripts/huey.asm index b5bf21b5b..cac966682 100644 --- a/engine/phone/scripts/huey.asm +++ b/engine/phone/scripts/huey.asm @@ -12,7 +12,7 @@ HueyPhoneCalleeScript: .NotWednesday: special RandomPhoneMon - farsjump UnknownScript_0xa0908 + farsjump HueyHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, LIGHTHOUSE diff --git a/engine/phone/scripts/irwin.asm b/engine/phone/scripts/irwin.asm index c859aecf5..b7a7b1112 100644 --- a/engine/phone/scripts/irwin.asm +++ b/engine/phone/scripts/irwin.asm @@ -3,10 +3,10 @@ IrwinPhoneCalleeScript: farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue .Rockets - farsjump UnknownScript_0xa09c8 + farsjump IrwinRandomTextScript .Rockets: - farsjump IrwinRocketRumor + farsjump IrwinRocketRumorScript IrwinPhoneCallerScript: gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1 @@ -16,4 +16,4 @@ IrwinPhoneCallerScript: farsjump IrwinRumorScript .Rockets: - farsjump IrwinRocketRumor + farsjump IrwinRocketRumorScript diff --git a/engine/phone/scripts/irwin_gossip.asm b/engine/phone/scripts/irwin_gossip.asm index 038f094d6..2a377e243 100644 --- a/engine/phone/scripts/irwin_gossip.asm +++ b/engine/phone/scripts/irwin_gossip.asm @@ -24,65 +24,65 @@ IrwinRumorScript: checkflag ENGINE_PLAINBADGE iftrue .PlainBadge farwritetext IrwinCalledRightAwayText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .PlainBadge: - farwritetext UnknownText_0x64099 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext IrwinPlainBadgeGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .JasmineReturned: - farwritetext UnknownText_0x640e6 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext IrwinJasmineReturnedGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .RocketHideout: - farwritetext UnknownText_0x6416d - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext IrwinRocketHideoutGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .RadioTower: - farwritetext UnknownText_0x641e8 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext IrwinRadioTowerGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .RisingBadge: - farwritetext UnknownText_0x64247 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext IrwinRisingBadgeGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .EliteFour: - farwritetext UnknownText_0x642bb - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext IrwinEliteFourGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .VermilionCity: - farwritetext UnknownText_0x643d4 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext IrwinVermilionCityGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .TrainPass: - farwritetext UnknownText_0x64448 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext IrwinTrainPassGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .Snorlax: - farwritetext UnknownText_0x6455b - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext IrwinSnorlaxGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .MtSilver: - farwritetext UnknownText_0x645ff - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext IrwinMtSilverGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .FogBadge: - farwritetext UnknownText_0x646df - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext IrwinFogBadgeGossipText + promptbutton + sjump PhoneScript_HangUpText_Male .MarshBadge: - farwritetext UnknownText_0x647d8 - buttonsound - sjump PhoneScript_HangupText_Male + farwritetext IrwinMarshBadgeGossipText + promptbutton + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/jack.asm b/engine/phone/scripts/jack.asm index 27287f310..f2de3689c 100644 --- a/engine/phone/scripts/jack.asm +++ b/engine/phone/scripts/jack.asm @@ -11,7 +11,7 @@ JackPhoneCalleeScript: iftrue JackMondayMorning .NotMonday: - farsjump JackPhoneTips + farsjump JackPhoneTipsScript .WantsBattle: getlandmarkname STRING_BUFFER_5, NATIONAL_PARK diff --git a/engine/phone/scripts/jack_gossip.asm b/engine/phone/scripts/jack_gossip.asm index 72c0d71e1..0ebdf3a1b 100644 --- a/engine/phone/scripts/jack_gossip.asm +++ b/engine/phone/scripts/jack_gossip.asm @@ -14,55 +14,55 @@ JackTriviaScript: .Thunder: farwritetext JackThunderTriviaText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .Rollout: farwritetext JackRolloutTriviaText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .Solarbeam: farwritetext JackSolarbeamTriviaText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .Stomp: farwritetext JackStompTriviaText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .Gust: farwritetext JackGustTriviaText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .Twister: farwritetext JackTwisterTriviaText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .Earthquake: farwritetext JackEarthquakeTriviaText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .Magnitude: farwritetext JackMagnitudeTriviaText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .Sandstorm: farwritetext JackSandstormTriviaText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .SunnyDay: farwritetext JackSunnyDayTriviaText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male .RainDance: farwritetext JackRainDanceTriviaText - buttonsound - sjump PhoneScript_HangupText_Male + promptbutton + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/joey.asm b/engine/phone/scripts/joey.asm index 7a7fae956..8b15b55cb 100644 --- a/engine/phone/scripts/joey.asm +++ b/engine/phone/scripts/joey.asm @@ -12,11 +12,11 @@ JoeyPhoneCalleeScript: .NotMonday: special RandomPhoneMon - farsjump UnknownScript_0xa0930 + farsjump JoeyHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_30 - farsjump UnknownScript_0xa0a4b + farsjump JoeyReminderScript JoeyPhoneCallerScript: gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1 diff --git a/engine/phone/scripts/jose.asm b/engine/phone/scripts/jose.asm index 4dcf0f4de..acf2e3bbc 100644 --- a/engine/phone/scripts/jose.asm +++ b/engine/phone/scripts/jose.asm @@ -13,15 +13,15 @@ JosePhoneCalleeScript: iftrue JoseSaturdayNight .NotSaturday: - farsjump UnknownScript_0xa0920 + farsjump JoseHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_27 - farsjump UnknownScript_0xa0a41 + farsjump JoseReminderScript .HasItem: getlandmarkname STRING_BUFFER_5, ROUTE_27 - farsjump UnknownScript_0xa0a41 + farsjump JoseReminderScript JosePhoneCallerScript: gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2 diff --git a/engine/phone/scripts/liz.asm b/engine/phone/scripts/liz.asm index 64719bb16..a2e5320cb 100644 --- a/engine/phone/scripts/liz.asm +++ b/engine/phone/scripts/liz.asm @@ -12,11 +12,11 @@ LizPhoneCalleeScript: .NotThursday: special RandomPhoneMon - farsjump UnknownScript_0xa0948 + farsjump LizHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_32 - farsjump UnknownScript_0xa0a5a + farsjump LizReminderScript LizPhoneCallerScript: gettrainername STRING_BUFFER_3, PICNICKER, LIZ1 @@ -99,4 +99,4 @@ LizGossip: sjump LizGossipScript LizGossipScript: - farsjump UnknownScript_0xa06da + farsjump LizGossipRandomScript diff --git a/engine/phone/scripts/liz_gossip.asm b/engine/phone/scripts/liz_gossip.asm index 738b61235..cbd8206e5 100644 --- a/engine/phone/scripts/liz_gossip.asm +++ b/engine/phone/scripts/liz_gossip.asm @@ -1,4 +1,4 @@ -UnknownScript_0xa06da: +LizGossipRandomScript: random 10 ifequal 0, .RuinsOfAlph ifequal 1, .Falkner @@ -12,51 +12,51 @@ UnknownScript_0xa06da: ifequal 9, .Forgot .RuinsOfAlph: - farwritetext UnknownText_0x176223 - buttonsound - sjump PhoneScript_HangupText_Female + farwritetext LizRuinsOfAlphGossipText + promptbutton + sjump PhoneScript_HangUpText_Female .Falkner: - farwritetext UnknownText_0x1762c3 - buttonsound - sjump PhoneScript_HangupText_Female + farwritetext LizFalknerGossipText + promptbutton + sjump PhoneScript_HangUpText_Female .Earl: - farwritetext UnknownText_0x17638a - buttonsound - sjump PhoneScript_HangupText_Female + farwritetext LizEarlGossipText + promptbutton + sjump PhoneScript_HangUpText_Female .SurfPikachu: - farwritetext UnknownText_0x176424 - buttonsound - sjump PhoneScript_HangupText_Female + farwritetext LizSurfPikachuGossipText + promptbutton + sjump PhoneScript_HangUpText_Female .MooMooMilk: - farwritetext UnknownText_0x1764eb - buttonsound - sjump PhoneScript_HangupText_Female + farwritetext LizMooMooMilkGossipText + promptbutton + sjump PhoneScript_HangUpText_Female .Salon: - farwritetext UnknownText_0x176599 - buttonsound - sjump PhoneScript_HangupText_Female + farwritetext LizSalonGossipText + promptbutton + sjump PhoneScript_HangUpText_Female .Whitney: - farwritetext UnknownText_0x1766ac - buttonsound - sjump PhoneScript_HangupText_Female + farwritetext LizWhitneyGossipText + promptbutton + sjump PhoneScript_HangUpText_Female .BugCatchingContest: - farwritetext UnknownText_0x17674f - buttonsound - sjump PhoneScript_HangupText_Female + farwritetext LizBugCatchingContestGossipText + promptbutton + sjump PhoneScript_HangUpText_Female .BeautifulMon: - farwritetext UnknownText_0x176816 - buttonsound - sjump PhoneScript_HangupText_Female + farwritetext LizBeautifulMonGossipText + promptbutton + sjump PhoneScript_HangUpText_Female .Forgot: - farwritetext UnknownText_0x17686d - buttonsound - sjump PhoneScript_HangupText_Female + farwritetext LizForgotGossipText + promptbutton + sjump PhoneScript_HangUpText_Female diff --git a/engine/phone/scripts/mom.asm b/engine/phone/scripts/mom.asm index 5b5ca7982..900e48be6 100644 --- a/engine/phone/scripts/mom.asm +++ b/engine/phone/scripts/mom.asm @@ -13,7 +13,7 @@ MomPhoneCalleeScript: checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 iftrue MomPhoneHangUpScript farwritetext MomPhoneGreetingText - buttonsound + promptbutton getcurlandmarkname STRING_BUFFER_3 readvar VAR_ROOFPALETTE ifequal 1, MomPhonePalette1 @@ -22,7 +22,7 @@ MomPhoneCalleeScript: MomPhoneLandmark: farwritetext MomPhoneLandmarkText - buttonsound + promptbutton sjump MomSavingMoney MomPhonePalette1: @@ -33,17 +33,17 @@ MomPhonePalette1: ifequal GROUP_AZALEA_TOWN, .azalea ifequal GROUP_GOLDENROD_CITY, .goldenrod farwritetext MomPhoneGenericAreaText - buttonsound + promptbutton sjump MomSavingMoney .newbark farwritetext MomPhoneNewBarkText - buttonsound + promptbutton sjump MomSavingMoney .cherrygrove farwritetext MomPhoneCherrygroveText - buttonsound + promptbutton sjump MomSavingMoney .violet @@ -58,12 +58,12 @@ MomPhonePalette1: MomPhonePalette2: farwritetext MomOtherAreaText - buttonsound + promptbutton sjump MomSavingMoney MomPhoneOther: farwritetext MomDeterminedText - buttonsound + promptbutton sjump MomSavingMoney MomSavingMoney: @@ -107,13 +107,13 @@ MomSavingMoney: MomPhoneSaveMoneyScript: setflag ENGINE_MOM_SAVING_MONEY farwritetext MomOKIllSaveText - buttonsound + promptbutton sjump MomPhoneHangUpScript MomPhoneWontSaveMoneyScript: clearflag ENGINE_MOM_SAVING_MONEY farwritetext MomPhoneWontSaveMoneyText - buttonsound + promptbutton sjump MomPhoneHangUpScript MomPhoneHangUpScript: diff --git a/engine/phone/scripts/parry.asm b/engine/phone/scripts/parry.asm index 48a1aa1af..e8628bcfd 100644 --- a/engine/phone/scripts/parry.asm +++ b/engine/phone/scripts/parry.asm @@ -11,11 +11,11 @@ ParryPhoneCalleeScript: iftrue ParryFridayDay .WantsRematch: - farsjump ParryBattleWithMe + farsjump ParryBattleWithMeScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_45 - farsjump ParryHaventYouGottenTo + farsjump ParryHaventYouGottenToScript ParryPhoneCallerScript: gettrainername STRING_BUFFER_3, HIKER, PARRY1 diff --git a/engine/phone/scripts/ralph.asm b/engine/phone/scripts/ralph.asm index c85e988db..245cce175 100644 --- a/engine/phone/scripts/ralph.asm +++ b/engine/phone/scripts/ralph.asm @@ -12,15 +12,15 @@ RalphPhoneCalleeScript: .CheckSwarm: checkflag ENGINE_FISH_SWARM iftrue .ReportSwarm - farsjump UnknownScript_0xa0940 + farsjump RalphNoItemScript .Rematch: getlandmarkname STRING_BUFFER_5, ROUTE_32 - farsjump UnknownScript_0xa0a55 + farsjump RalphReminderScript .ReportSwarm: getlandmarkname STRING_BUFFER_5, ROUTE_32 - farsjump UnknownScript_0xa0af5 + farsjump RalphHurryScript RalphPhoneCallerScript: gettrainername STRING_BUFFER_3, FISHER, RALPH1 @@ -53,7 +53,7 @@ Ralph_SetUpSwarm: getlandmarkname STRING_BUFFER_5, ROUTE_32 setval FISHSWARM_QWILFISH special ActivateFishingSwarm - farsjump UnknownScript_0xa05d6 + farsjump RalphItemScript .Generic: farsjump Phone_GenericCall_Male diff --git a/engine/phone/scripts/reena.asm b/engine/phone/scripts/reena.asm index 5b2a06afe..4800eb441 100644 --- a/engine/phone/scripts/reena.asm +++ b/engine/phone/scripts/reena.asm @@ -11,11 +11,11 @@ ReenaPhoneCalleeScript: iftrue ReenaSundayMorning .NotSunday: - farsjump UnknownScript_0xa0928 + farsjump ReenaForwardScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_27 - farsjump UnknownScript_0xa0a46 + farsjump ReenaHurryScript ReenaPhoneCallerScript: gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1 diff --git a/engine/phone/scripts/reminders.asm b/engine/phone/scripts/reminders.asm index d93418d36..b2676d3d4 100644 --- a/engine/phone/scripts/reminders.asm +++ b/engine/phone/scripts/reminders.asm @@ -1,92 +1,92 @@ JackWantsBattleScript: - farwritetext UnknownText_0x174638 + farwritetext JackReminderText end HueyWantsBattleScript: - farwritetext UnknownText_0x1749c7 + farwritetext HueyReminderText end -UnknownScript_0xa0a37: - farwritetext UnknownText_0x174c49 +GavenReminderScript: + farwritetext GavenReminderText end BethBattleReminderScript: - farwritetext BethForgetDealText + farwritetext BethReminderText end -UnknownScript_0xa0a41: - farwritetext UnknownText_0x17520a +JoseReminderScript: + farwritetext JoseReminderText end -UnknownScript_0xa0a46: - farwritetext UnknownText_0x1754e5 +ReenaHurryScript: + farwritetext ReenaHurryText end -UnknownScript_0xa0a4b: - farwritetext UnknownText_0x175786 +JoeyReminderScript: + farwritetext JoeyReminderText end -UnknownScript_0xa0a50: - farwritetext UnknownText_0x175b1e +WadeQuickBattleScript: + farwritetext WadeQuickBattleText end -UnknownScript_0xa0a55: - farwritetext UnknownText_0x175f11 +RalphReminderScript: + farwritetext RalphReminderText end -UnknownScript_0xa0a5a: - farwritetext UnknownText_0x1769da +LizReminderScript: + farwritetext LizReminderText end -UnknownScript_0xa0a5f: - farwritetext UnknownText_0x176d85 +AnthonyReminderScript: + farwritetext AnthonyReminderText end -UnknownScript_0xa0a64: - farwritetext UnknownText_0x177138 +ToddForwardScript: + farwritetext ToddLookingForwardToBattleText end -UnknownScript_0xa0a69: - farwritetext UnknownText_0x1774c1 +GinaReminderScript: + farwritetext GinaReminderText end -UnknownScript_0xa0a6e: - farwritetext UnknownText_0x64c13 +ArnieReminderScript: + farwritetext ArnieReminderText end -UnknownScript_0xa0a73: - farwritetext UnknownText_0x64ed4 +AlanReminderScript: + farwritetext AlanReminderText end -UnknownScript_0xa0a78: - farwritetext UnknownText_0x651bf +DanaReminderScript: + farwritetext DanaReminderText end -UnknownScript_0xa0a7d: - farwritetext UnknownText_0x65a63 +ChadReminderScript: + farwritetext ChadReminderText end -UnknownScript_0xa0a82: - farwritetext UnknownText_0x66043 +TullyForwardScript: + farwritetext TullyForwardText end -UnknownScript_0xa0a87: - farwritetext UnknownText_0x66579 +BrentReminderScript: + farwritetext BrentReminderText end -UnknownScript_0xa0a8c: - farwritetext UnknownText_0x668a3 +TiffanyAsleepScript: + farwritetext TiffanyAsleepText end -VanceHurryHurry: +VanceHurryHurryScript: farwritetext VanceHurryHurryText end -WiltonNotBiting: +WiltonNotBitingScript: farwritetext WiltonNotBitingText end -ParryHaventYouGottenTo: +ParryHaventYouGottenToScript: farwritetext ParryHaventYouGottenToText end diff --git a/engine/phone/scripts/reminders_2.asm b/engine/phone/scripts/reminders_2.asm index 9cbc5cfd7..54f54494c 100644 --- a/engine/phone/scripts/reminders_2.asm +++ b/engine/phone/scripts/reminders_2.asm @@ -1,15 +1,15 @@ -UnknownScript_0xa0af5: - farwritetext UnknownText_0x175f70 +RalphHurryScript: + farwritetext RalphHurryText end -UnknownScript_0xa0afa: - farwritetext UnknownText_0x176dd1 +AnthonyHurryScript: + farwritetext AnthonyHurryText end -UnknownScript_0xa0aff: - farwritetext UnknownText_0x64c5a +ArnieHurryScript: + farwritetext ArnieHurryText end -UnknownScript_0xa0b04: - farwritetext UnknownText_0x17717c +ToddHurryScript: + farwritetext ToddHaveYouGoneToDepartmentStoreText end diff --git a/engine/phone/scripts/tiffany.asm b/engine/phone/scripts/tiffany.asm index 6225f98c9..394361999 100644 --- a/engine/phone/scripts/tiffany.asm +++ b/engine/phone/scripts/tiffany.asm @@ -13,15 +13,15 @@ TiffanyPhoneCalleeScript: iftrue TiffanyTuesdayAfternoon .NotTuesday: - farsjump UnknownScript_0xa09a0 + farsjump TiffanyNoItemScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_43 - farsjump UnknownScript_0xa0a8c + farsjump TiffanyAsleepScript .HasItem: getlandmarkname STRING_BUFFER_5, ROUTE_43 - farsjump UnknownScript_0xa0ae5 + farsjump TiffanyHurryScript TiffanyPhoneCallerScript: gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3 diff --git a/engine/phone/scripts/todd.asm b/engine/phone/scripts/todd.asm index 1493aca34..5f73c97d6 100644 --- a/engine/phone/scripts/todd.asm +++ b/engine/phone/scripts/todd.asm @@ -13,14 +13,14 @@ ToddPhoneCalleeScript: .NotSaturday: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON iftrue .SaleOn - farsjump UnknownScript_0xa0958 + farsjump ToddNoItemScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_34 - farsjump UnknownScript_0xa0a64 + farsjump ToddForwardScript .SaleOn: - farsjump UnknownScript_0xa0b04 + farsjump ToddHurryScript ToddPhoneCallerScript: gettrainername STRING_BUFFER_3, CAMPER, TODD1 @@ -56,4 +56,4 @@ ToddFoundRare: ToddDeptStoreSale: setflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON - farsjump UnknownScript_0xa0644 + farsjump ToddItemScript diff --git a/engine/phone/scripts/tully.asm b/engine/phone/scripts/tully.asm index 4b5f138ee..c02931831 100644 --- a/engine/phone/scripts/tully.asm +++ b/engine/phone/scripts/tully.asm @@ -13,15 +13,15 @@ TullyPhoneCalleeScript: iftrue TullySundayNight .NotSunday: - farsjump UnknownScript_0xa0990 + farsjump TullyNoItemScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_42 - farsjump UnknownScript_0xa0a82 + farsjump TullyForwardScript .WaterStone: getlandmarkname STRING_BUFFER_5, ROUTE_42 - farsjump UnknownScript_0xa0add + farsjump TullyHurryScript TullyPhoneCallerScript: gettrainername STRING_BUFFER_3, FISHER, TULLY1 diff --git a/engine/phone/scripts/vance.asm b/engine/phone/scripts/vance.asm index 0de527673..7f01f27d6 100644 --- a/engine/phone/scripts/vance.asm +++ b/engine/phone/scripts/vance.asm @@ -11,11 +11,11 @@ VancePhoneCalleeScript: iftrue VanceWednesdayNight .NotWednesday: - farsjump VanceLookingForward + farsjump VanceLookingForwardScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_44 - farsjump VanceHurryHurry + farsjump VanceHurryHurryScript VancePhoneCallerScript: gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1 diff --git a/engine/phone/scripts/wade.asm b/engine/phone/scripts/wade.asm index 44d82ec01..298468de1 100644 --- a/engine/phone/scripts/wade.asm +++ b/engine/phone/scripts/wade.asm @@ -23,18 +23,18 @@ WadePhoneCalleeScript: ifequal SATURDAY, .ContestToday .NoContest: - farsjump UnknownScript_0xa0938 + farsjump WadeNoBerriesScript .ContestToday: farsjump PhoneScript_BugCatchingContest .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_31 - farsjump UnknownScript_0xa0a50 + farsjump WadeQuickBattleScript .HasItem: getlandmarkname STRING_BUFFER_5, ROUTE_31 - farsjump UnknownScript_0xa0ab5 + farsjump WadeComeQuickScript WadePhoneCallerScript: gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1 diff --git a/engine/phone/scripts/wilton.asm b/engine/phone/scripts/wilton.asm index 4605589f5..b9e014ecb 100644 --- a/engine/phone/scripts/wilton.asm +++ b/engine/phone/scripts/wilton.asm @@ -13,15 +13,15 @@ WiltonPhoneCalleeScript: iftrue WiltonThursdayMorning .NotThursday: - farsjump WiltonHaventFoundAnything + farsjump WiltonHaventFoundAnythingScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_44 - farsjump WiltonNotBiting + farsjump WiltonNotBitingScript .HasItem: getlandmarkname STRING_BUFFER_5, ROUTE_44 - farsjump WiltonWantThis + farsjump WiltonWantThisScript WiltonPhoneCallerScript: gettrainername STRING_BUFFER_3, FISHER, WILTON1 diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index d0e7e8ca0..a4262bf02 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -459,7 +459,7 @@ PokegearJumptable: PokegearClock_Init: call InitPokegearTilemap - ld hl, PokegearText_PressAnyButtonToExit + ld hl, PokegearPressButtonText call PrintText ld hl, wJumptableIndex inc [hl] @@ -523,7 +523,7 @@ Pokegear_UpdateClock: ld c, a decoord 6, 8 farcall PrintHoursMins - ld hl, .DayText + ld hl, .GearTodayText bccoord 6, 6 call PlaceHLTextAtBC ret @@ -531,8 +531,8 @@ Pokegear_UpdateClock: db "ごぜん@" db "ごご@" -.DayText: - text_far UnknownText_0x1c5821 +.GearTodayText: + text_far _GearTodayText text_end PokegearMap_CheckRegion: @@ -812,7 +812,7 @@ PokegearPhone_Init: ld [wPokegearPhoneSelectedPerson], a call InitPokegearTilemap call ExitPokegearRadio_HandleMusic - ld hl, PokegearText_WhomToCall + ld hl, PokegearAskWhoCallText call PrintText ret @@ -902,12 +902,12 @@ PokegearPhone_MakePhoneCall: ldh [hInMenu], a ld de, SFX_CALL call PlaySFX - ld hl, .dotdotdot + ld hl, .GearEllipseText call PrintText call WaitSFX ld de, SFX_CALL call PlaySFX - ld hl, .dotdotdot + ld hl, .GearEllipseText call PrintText call WaitSFX ld a, [wPokegearPhoneSelectedPerson] @@ -926,22 +926,20 @@ PokegearPhone_MakePhoneCall: .no_service farcall Phone_NoSignal - ld hl, .OutOfServiceArea + ld hl, .GearOutOfServiceText call PrintText ld a, POKEGEARSTATE_PHONEJOYPAD ld [wJumptableIndex], a - ld hl, PokegearText_WhomToCall + ld hl, PokegearAskWhoCallText call PrintText ret -.dotdotdot - ; - text_far UnknownText_0x1c5824 +.GearEllipseText: + text_far _GearEllipseText text_end -.OutOfServiceArea: - ; You're out of the service area. - text_far UnknownText_0x1c5827 +.GearOutOfServiceText: + text_far _GearOutOfServiceText text_end PokegearPhone_FinishPhoneCall: @@ -951,7 +949,7 @@ PokegearPhone_FinishPhoneCall: farcall HangUp ld a, POKEGEARSTATE_PHONEJOYPAD ld [wJumptableIndex], a - ld hl, PokegearText_WhomToCall + ld hl, PokegearAskWhoCallText call PrintText ret @@ -1206,13 +1204,13 @@ PokegearPhoneContactSubmenu: jp hl .Cancel: - ld hl, PokegearText_WhomToCall + ld hl, PokegearAskWhoCallText call PrintText scf ret .Delete: - ld hl, PokegearText_DeleteStoredNumber + ld hl, PokegearAskDeleteText call MenuTextbox call YesNoBox call ExitMenu @@ -1221,7 +1219,7 @@ PokegearPhoneContactSubmenu: xor a ldh [hBGMapMode], a call PokegearPhone_UpdateDisplayList - ld hl, PokegearText_WhomToCall + ld hl, PokegearAskWhoCallText call PrintText call WaitBGMap .CancelDelete: @@ -1311,7 +1309,7 @@ ExitPokegearRadio_HandleMusic: cp RESTART_MAP_MUSIC jr z, .restart_map_music cp ENTER_MAP_MUSIC - call z, EnterMapMusic + call z, PlayMapMusicBike xor a ld [wPokegearRadioMusicPlaying], a ret @@ -1351,19 +1349,16 @@ Pokegear_LoadTilemapRLE: jr nz, .load jr .loop -PokegearText_WhomToCall: - ; Whom do you want to call? - text_far UnknownText_0x1c5847 +PokegearAskWhoCallText: + text_far _PokegearAskWhoCallText text_end -PokegearText_PressAnyButtonToExit: - ; Press any button to exit. - text_far UnknownText_0x1c5862 +PokegearPressButtonText: + text_far _PokegearPressButtonText text_end -PokegearText_DeleteStoredNumber: - ; Delete this stored phone number? - text_far UnknownText_0x1c587d +PokegearAskDeleteText: + text_far _PokegearAskDeleteText text_end PokegearSpritesGFX: diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index 2e1dccf67..570278f03 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -304,32 +304,26 @@ OaksPKMNTalk6: jp NextRadioLine OPT_IntroText1: - ; MARY: PROF.OAK'S text_far _OPT_IntroText1 text_end OPT_IntroText2: - ; #MON TALK! text_far _OPT_IntroText2 text_end OPT_IntroText3: - ; With me, MARY! text_far _OPT_IntroText3 text_end OPT_OakText1: - ; OAK: @ @ text_far _OPT_OakText1 text_end OPT_OakText2: - ; may be seen around text_far _OPT_OakText2 text_end OPT_OakText3: - ; @ . text_far _OPT_OakText3 text_end @@ -342,7 +336,6 @@ OaksPKMNTalk7: jp NextRadioLine OPT_MaryText1: - ; MARY: @ 's text_far _OPT_MaryText1 text_end @@ -364,101 +357,85 @@ OaksPKMNTalk8: .Adverbs: ; there are NUM_OAKS_POKEMON_TALK_ADVERBS entries - dw .sweetadorably - dw .wigglyslickly - dw .aptlynamed - dw .undeniablykindof - dw .unbearably - dw .wowimpressively - dw .almostpoisonously - dw .sensually - dw .mischievously - dw .topically - dw .addictively - dw .looksinwater - dw .evolutionmustbe - dw .provocatively - dw .flippedout - dw .heartmeltingly + dw .OPT_SweetAdorablyText + dw .OPT_WigglySlicklyText + dw .OPT_AptlyNamedText + dw .OPT_UndeniablyKindOfText + dw .OPT_UnbearablyText + dw .OPT_WowImpressivelyText + dw .OPT_AlmostPoisonouslyText + dw .OPT_SensuallyText + dw .OPT_MischievouslyText + dw .OPT_TopicallyText + dw .OPT_AddictivelyText + dw .OPT_LooksInWaterText + dw .OPT_EvolutionMustBeText + dw .OPT_ProvocativelyText + dw .OPT_FlippedOutText + dw .OPT_HeartMeltinglyText -.sweetadorably - ; sweet and adorably - text_far OPT_SweetAdorably +.OPT_SweetAdorablyText: + text_far _OPT_SweetAdorablyText text_end -.wigglyslickly - ; wiggly and slickly - text_far OPT_WigglySlickly +.OPT_WigglySlicklyText: + text_far _OPT_WigglySlicklyText text_end -.aptlynamed - ; aptly named and - text_far OPT_AptlyNamed +.OPT_AptlyNamedText: + text_far _OPT_AptlyNamedText text_end -.undeniablykindof - ; undeniably kind of - text_far OPT_UndeniablyKindOf +.OPT_UndeniablyKindOfText: + text_far _OPT_UndeniablyKindOfText text_end -.unbearably - ; so, so unbearably - text_far OPT_Unbearably +.OPT_UnbearablyText: + text_far _OPT_UnbearablyText text_end -.wowimpressively - ; wow, impressively - text_far OPT_WowImpressively +.OPT_WowImpressivelyText: + text_far _OPT_WowImpressivelyText text_end -.almostpoisonously - ; almost poisonously - text_far OPT_AlmostPoisonously +.OPT_AlmostPoisonouslyText: + text_far _OPT_AlmostPoisonouslyText text_end -.sensually - ; ooh, so sensually - text_far OPT_Sensually +.OPT_SensuallyText: + text_far _OPT_SensuallyText text_end -.mischievously - ; so mischievously - text_far OPT_Mischievously +.OPT_MischievouslyText: + text_far _OPT_MischievouslyText text_end -.topically - ; so very topically - text_far OPT_Topically +.OPT_TopicallyText: + text_far _OPT_TopicallyText text_end -.addictively - ; sure addictively - text_far OPT_Addictively +.OPT_AddictivelyText: + text_far _OPT_AddictivelyText text_end -.looksinwater - ; looks in water is - text_far OPT_LooksInWater +.OPT_LooksInWaterText: + text_far _OPT_LooksInWaterText text_end -.evolutionmustbe - ; evolution must be - text_far OPT_EvolutionMustBe +.OPT_EvolutionMustBeText: + text_far _OPT_EvolutionMustBeText text_end -.provocatively - ; provocatively - text_far OPT_Provocatively +.OPT_ProvocativelyText: + text_far _OPT_ProvocativelyText text_end -.flippedout - ; so flipped out and - text_far OPT_FlippedOut +.OPT_FlippedOutText: + text_far _OPT_FlippedOutText text_end -.heartmeltingly - ; heart-meltingly - text_far OPT_HeartMeltingly +.OPT_HeartMeltinglyText: + text_far _OPT_HeartMeltinglyText text_end OaksPKMNTalk9: @@ -487,101 +464,85 @@ OaksPKMNTalk9: .Adjectives: ; there are NUM_OAKS_POKEMON_TALK_ADJECTIVES entries - dw .cute - dw .weird - dw .pleasant - dw .boldsortof - dw .frightening - dw .suavedebonair - dw .powerful - dw .exciting - dw .groovy - dw .inspiring - dw .friendly - dw .hothothot - dw .stimulating - dw .guarded - dw .lovely - dw .speedy + dw .OPT_CuteText + dw .OPT_WeirdText + dw .OPT_PleasantText + dw .OPT_BoldSortOfText + dw .OPT_FrighteningText + dw .OPT_SuaveDebonairText + dw .OPT_PowerfulText + dw .OPT_ExcitingText + dw .OPT_GroovyText + dw .OPT_InspiringText + dw .OPT_FriendlyText + dw .OPT_HotHotHotText + dw .OPT_StimulatingText + dw .OPT_GuardedText + dw .OPT_LovelyText + dw .OPT_SpeedyText -.cute - ; cute. - text_far OPT_Cute +.OPT_CuteText: + text_far _OPT_CuteText text_end -.weird - ; weird. - text_far OPT_Weird +.OPT_WeirdText: + text_far _OPT_WeirdText text_end -.pleasant - ; pleasant. - text_far OPT_Pleasant +.OPT_PleasantText: + text_far _OPT_PleasantText text_end -.boldsortof - ; bold, sort of. - text_far OPT_BoldSortOf +.OPT_BoldSortOfText: + text_far _OPT_BoldSortOfText text_end -.frightening - ; frightening. - text_far OPT_Frightening +.OPT_FrighteningText: + text_far _OPT_FrighteningText text_end -.suavedebonair - ; suave & debonair! - text_far OPT_SuaveDebonair +.OPT_SuaveDebonairText: + text_far _OPT_SuaveDebonairText text_end -.powerful - ; powerful. - text_far OPT_Powerful +.OPT_PowerfulText: + text_far _OPT_PowerfulText text_end -.exciting - ; exciting. - text_far OPT_Exciting +.OPT_ExcitingText: + text_far _OPT_ExcitingText text_end -.groovy - ; groovy! - text_far OPT_Groovy +.OPT_GroovyText: + text_far _OPT_GroovyText text_end -.inspiring - ; inspiring. - text_far OPT_Inspiring +.OPT_InspiringText: + text_far _OPT_InspiringText text_end -.friendly - ; friendly. - text_far OPT_Friendly +.OPT_FriendlyText: + text_far _OPT_FriendlyText text_end -.hothothot - ; hot, hot, hot! - text_far OPT_HotHotHot +.OPT_HotHotHotText: + text_far _OPT_HotHotHotText text_end -.stimulating - ; stimulating. - text_far OPT_Stimulating +.OPT_StimulatingText: + text_far _OPT_StimulatingText text_end -.guarded - ; guarded. - text_far OPT_Guarded +.OPT_GuardedText: + text_far _OPT_GuardedText text_end -.lovely - ; lovely. - text_far OPT_Lovely +.OPT_LovelyText: + text_far _OPT_LovelyText text_end -.speedy - ; speedy. - text_far OPT_Speedy +.OPT_SpeedyText: + text_far _OPT_SpeedyText text_end OaksPKMNTalk10: @@ -598,7 +559,6 @@ OaksPKMNTalk10: ret OPT_PokemonChannelText: - ; #MON text_far _OPT_PokemonChannelText text_end @@ -848,7 +808,6 @@ CopyDexEntryPart2: ret PokedexShowText: - ; @ @ text_far _PokedexShowText text_end @@ -875,7 +834,7 @@ FernMonMusic1: jp NextRadioLine FernMonMusic2: - ld hl, FernIntroMusic2 + ld hl, FernIntroText2 ld a, POKEMON_MUSIC_4 jp NextRadioLine @@ -920,52 +879,42 @@ StartPokemonMusicChannel: ret BenIntroText1: - ; BEN: #MON MUSIC text_far _BenIntroText1 text_end BenIntroText2: - ; CHANNEL! text_far _BenIntroText2 text_end BenIntroText3: - ; It's me, DJ BEN! text_far _BenIntroText3 text_end FernIntroText1: - ; FERN: #MUSIC! text_far _FernIntroText1 text_end -FernIntroMusic2: - ; With DJ FERN! +FernIntroText2: text_far _FernIntroText2 text_end BenFernText1: - ; Today's @ , text_far _BenFernText1 text_end BenFernText2A: - ; so let us jam to text_far _BenFernText2A text_end BenFernText2B: - ; so chill out to text_far _BenFernText2B text_end BenFernText3A: - ; #MON March! text_far _BenFernText3A text_end BenFernText3B: - ; #MON Lullaby! text_far _BenFernText3B text_end @@ -1061,67 +1010,54 @@ LuckyNumberShow15: jp NextRadioLine LC_Text1: - ; REED: Yeehaw! How text_far _LC_Text1 text_end LC_Text2: - ; y'all doin' now? text_far _LC_Text2 text_end LC_Text3: - ; Whether you're up text_far _LC_Text3 text_end LC_Text4: - ; or way down low, text_far _LC_Text4 text_end LC_Text5: - ; don't you miss the text_far _LC_Text5 text_end LC_Text6: - ; LUCKY NUMBER SHOW! text_far _LC_Text6 text_end LC_Text7: - ; This week's Lucky text_far _LC_Text7 text_end LC_Text8: - ; Number is @ ! text_far _LC_Text8 text_end LC_Text9: - ; I'll repeat that! text_far _LC_Text9 text_end LC_Text10: - ; Match it and go to text_far _LC_Text10 text_end LC_Text11: - ; the RADIO TOWER! text_far _LC_Text11 text_end LC_DragText1: - ; …Repeating myself text_far _LC_DragText1 text_end LC_DragText2: - ; gets to be a drag… text_far _LC_DragText2 text_end @@ -1147,17 +1083,14 @@ PeoplePlaces3: jp NextRadioLine PnP_Text1: - ; PLACES AND PEOPLE! text_far _PnP_Text1 text_end PnP_Text2: - ; Brought to you by text_far _PnP_Text2 text_end PnP_Text3: - ; me, DJ LILY! text_far _PnP_Text3 text_end @@ -1199,7 +1132,6 @@ PeoplePlaces4: ; People INCLUDE "data/radio/pnp_hidden_people.asm" PnP_Text4: - ; @ @ @ text_far _PnP_Text4 text_end @@ -1230,101 +1162,85 @@ PeoplePlaces5: .Adjectives: ; there are NUM_PNP_PEOPLE_ADJECTIVES entries - dw PnP_cute - dw PnP_lazy - dw PnP_happy - dw PnP_noisy - dw PnP_precocious - dw PnP_bold - dw PnP_picky - dw PnP_sortofok - dw PnP_soso - dw PnP_great - dw PnP_mytype - dw PnP_cool - dw PnP_inspiring - dw PnP_weird - dw PnP_rightforme - dw PnP_odd + dw PnP_CuteText + dw PnP_LazyText + dw PnP_HappyText + dw PnP_NoisyText + dw PnP_PrecociousText + dw PnP_BoldText + dw PnP_PickyText + dw PnP_SortOfOKText + dw PnP_SoSoText + dw PnP_GreatText + dw PnP_MyTypeText + dw PnP_CoolText + dw PnP_InspiringText + dw PnP_WeirdText + dw PnP_RightForMeText + dw PnP_OddText -PnP_cute: - ; is cute. - text_far _PnP_cute +PnP_CuteText: + text_far _PnP_CuteText text_end -PnP_lazy: - ; is sort of lazy. - text_far _PnP_lazy +PnP_LazyText: + text_far _PnP_LazyText text_end -PnP_happy: - ; is always happy. - text_far _PnP_happy +PnP_HappyText: + text_far _PnP_HappyText text_end -PnP_noisy: - ; is quite noisy. - text_far _PnP_noisy +PnP_NoisyText: + text_far _PnP_NoisyText text_end -PnP_precocious: - ; is precocious. - text_far _PnP_precocious +PnP_PrecociousText: + text_far _PnP_PrecociousText text_end -PnP_bold: - ; is somewhat bold. - text_far _PnP_bold +PnP_BoldText: + text_far _PnP_BoldText text_end -PnP_picky: - ; is too picky! - text_far _PnP_picky +PnP_PickyText: + text_far _PnP_PickyText text_end -PnP_sortofok: - ; is sort of OK. - text_far _PnP_sortofok +PnP_SortOfOKText: + text_far _PnP_SortOfOKText text_end -PnP_soso: - ; is just so-so. - text_far _PnP_soso +PnP_SoSoText: + text_far _PnP_SoSoText text_end -PnP_great: - ; is actually great. - text_far _PnP_great +PnP_GreatText: + text_far _PnP_GreatText text_end -PnP_mytype: - ; is just my type. - text_far _PnP_mytype +PnP_MyTypeText: + text_far _PnP_MyTypeText text_end -PnP_cool: - ; is so cool, no? - text_far _PnP_cool +PnP_CoolText: + text_far _PnP_CoolText text_end -PnP_inspiring: - ; is inspiring! - text_far _PnP_inspiring +PnP_InspiringText: + text_far _PnP_InspiringText text_end -PnP_weird: - ; is kind of weird. - text_far _PnP_weird +PnP_WeirdText: + text_far _PnP_WeirdText text_end -PnP_rightforme: - ; is right for me? - text_far _PnP_rightforme +PnP_RightForMeText: + text_far _PnP_RightForMeText text_end -PnP_odd: - ; is definitely odd! - text_far _PnP_odd +PnP_OddText: + text_far _PnP_OddText text_end PeoplePlaces6: ; Places @@ -1349,7 +1265,6 @@ PeoplePlaces6: ; Places INCLUDE "data/radio/pnp_hidden_places.asm" PnP_Text5: - ; @ @ text_far _PnP_Text5 text_end @@ -1381,22 +1296,22 @@ PeoplePlaces7: .Adjectives: ; there are NUM_PNP_PLACES_ADJECTIVES entries - dw PnP_cute - dw PnP_lazy - dw PnP_happy - dw PnP_noisy - dw PnP_precocious - dw PnP_bold - dw PnP_picky - dw PnP_sortofok - dw PnP_soso - dw PnP_great - dw PnP_mytype - dw PnP_cool - dw PnP_inspiring - dw PnP_weird - dw PnP_rightforme - dw PnP_odd + dw PnP_CuteText + dw PnP_LazyText + dw PnP_HappyText + dw PnP_NoisyText + dw PnP_PrecociousText + dw PnP_BoldText + dw PnP_PickyText + dw PnP_SortOfOKText + dw PnP_SoSoText + dw PnP_GreatText + dw PnP_MyTypeText + dw PnP_CoolText + dw PnP_InspiringText + dw PnP_WeirdText + dw PnP_RightForMeText + dw PnP_OddText RocketRadio1: call StartRadioStation @@ -1450,52 +1365,42 @@ RocketRadio10: jp NextRadioLine RocketRadioText1: - ; … …Ahem, we are text_far _RocketRadioText1 text_end RocketRadioText2: - ; TEAM ROCKET! text_far _RocketRadioText2 text_end RocketRadioText3: - ; After three years text_far _RocketRadioText3 text_end RocketRadioText4: - ; of preparation, we text_far _RocketRadioText4 text_end RocketRadioText5: - ; have risen again text_far _RocketRadioText5 text_end RocketRadioText6: - ; from the ashes! text_far _RocketRadioText6 text_end RocketRadioText7: - ; GIOVANNI! @ Can you text_far _RocketRadioText7 text_end RocketRadioText8: - ; hear?@ We did it! text_far _RocketRadioText8 text_end RocketRadioText9: - ; @ Where is our boss? text_far _RocketRadioText9 text_end RocketRadioText10: - ; @ Is he listening? text_far _RocketRadioText10 text_end @@ -1807,92 +1712,74 @@ BuenasPasswordChannelName: db "BUENA'S PASSWORD@" BuenaRadioText1: - ; BUENA: BUENA here! text_far _BuenaRadioText1 text_end BuenaRadioText2: - ; Today's password! text_far _BuenaRadioText2 text_end BuenaRadioText3: - ; Let me think… It's text_far _BuenaRadioText3 text_end BuenaRadioText4: - ; @ ! text_far _BuenaRadioText4 text_end BuenaRadioText5: - ; Don't forget it! text_far _BuenaRadioText5 text_end BuenaRadioText6: - ; I'm in GOLDENROD's text_far _BuenaRadioText6 text_end BuenaRadioText7: - ; RADIO TOWER! text_far _BuenaRadioText7 text_end BuenaRadioMidnightText1: - ; BUENA: Oh my… text_far _BuenaRadioMidnightText1 text_end BuenaRadioMidnightText2: - ; It's midnight! I text_far _BuenaRadioMidnightText2 text_end BuenaRadioMidnightText3: - ; have to shut down! text_far _BuenaRadioMidnightText3 text_end BuenaRadioMidnightText4: - ; Thanks for tuning text_far _BuenaRadioMidnightText4 text_end BuenaRadioMidnightText5: - ; in to the end! But text_far _BuenaRadioMidnightText5 text_end BuenaRadioMidnightText6: - ; don't stay up too text_far _BuenaRadioMidnightText6 text_end BuenaRadioMidnightText7: - ; late! Presented to text_far _BuenaRadioMidnightText7 text_end BuenaRadioMidnightText8: - ; you by DJ BUENA! text_far _BuenaRadioMidnightText8 text_end BuenaRadioMidnightText9: - ; I'm outta here! text_far _BuenaRadioMidnightText9 text_end BuenaRadioMidnightText10: - ; … text_far _BuenaRadioMidnightText10 text_end BuenaOffTheAirText: - ; text_far _BuenaOffTheAirText text_end diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index 700c59d35..3883d89c3 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -9,14 +9,13 @@ _BillsPC: ld a, [wPartyCount] and a ret nz - ld hl, .Text_GottaHavePokemon + ld hl, .PCGottaHavePokemonText call MenuTextboxBackup scf ret -.Text_GottaHavePokemon: - ; You gotta have #MON to call! - text_far UnknownText_0x1c1006 +.PCGottaHavePokemonText: + text_far _PCGottaHavePokemonText text_end .LogIn: @@ -28,16 +27,15 @@ _BillsPC: ld a, [hl] push af set NO_TEXT_SCROLL, [hl] - ld hl, .Text_What + ld hl, .PCWhatText call PrintText pop af ld [wOptions], a call LoadFontsBattleExtra ret -.Text_What: - ; What? - text_far UnknownText_0x1c1024 +.PCWhatText: + text_far _PCWhatText text_end .LogOut: @@ -112,7 +110,7 @@ BillsPC_MovePKMNMenu: call LoadStandardMenuHeader farcall IsAnyMonHoldingMail jr nc, .no_mail - ld hl, .Text_MonHoldingMail + ld hl, .PCMonHoldingMailText call PrintText jr .quit @@ -128,9 +126,8 @@ BillsPC_MovePKMNMenu: and a ret -.Text_MonHoldingMail: - ; There is a #MON holding MAIL. Please remove the MAIL. - text_far UnknownText_0x1c102b +.PCMonHoldingMailText: + text_far _PCMonHoldingMailText text_end BillsPC_DepositMenu: @@ -152,25 +149,23 @@ Unreferenced_Functione512: ret .no_mon - ld hl, .Text_NoMon + ld hl, .PCNoSingleMonText call MenuTextboxBackup scf ret .only_one_mon - ld hl, .Text_ItsYourLastMon + ld hl, .PCCantDepositLastMonText call MenuTextboxBackup scf ret -.Text_NoMon: - ; You don't have a single #MON! - text_far UnknownText_0x1c1062 +.PCNoSingleMonText: + text_far _PCNoSingleMonText text_end -.Text_ItsYourLastMon: - ; You can't deposit your last #MON! - text_far UnknownText_0x1c1080 +.PCCantDepositLastMonText: + text_far _PCCantDepositLastMonText text_end CheckCurPartyMonFainted: @@ -219,14 +214,13 @@ Unreferenced_Functione56d: ret .asm_e576 - ld hl, UnknownText_0xe57e + ld hl, PCCantTakeText call MenuTextboxBackup scf ret -UnknownText_0xe57e: - ; You can't take any more #MON. - text_far UnknownText_0x1c10a2 +PCCantTakeText: + text_far _PCCantTakeText text_end BillsPC_ChangeBoxMenu: @@ -267,7 +261,7 @@ CopyBoxmonToTempMon: call CloseSRAM ret -Unreferenced_Functione5d9: +Unreferenced_LoadBoxMonListing: ld a, [wCurBox] cp b jr z, .same_box @@ -290,11 +284,11 @@ Unreferenced_Functione5d9: .okay call GetSRAMBank ld a, [hl] - ld bc, 1 + MONS_PER_BOX + 1 + ld bc, sBoxMons - sBox add hl, bc ld b, a ld c, $0 - ld de, wc608 + ld de, wBoxPartialData ld a, b and a jr z, .empty_box @@ -302,7 +296,7 @@ Unreferenced_Functione5d9: push hl push bc ld a, c - ld bc, 0 + ld bc, sBoxMon1Species - sBoxMons add hl, bc ld bc, BOXMON_STRUCT_LENGTH call AddNTimes @@ -317,7 +311,7 @@ Unreferenced_Functione5d9: push hl push bc ld a, c - ld bc, MONS_PER_BOX * (BOXMON_STRUCT_LENGTH + NAME_LENGTH) + ld bc, sBoxMonNicknames - sBoxMons add hl, bc call SkipNames call CopyBytes diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index 66d227ce5..9751a90cf 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -319,7 +319,7 @@ HatchEggs: ld d, h ld e, l push de - ld hl, .Text_NicknameHatchling + ld hl, .BreedAskNicknameText call PrintText call YesNoBox pop de @@ -356,7 +356,7 @@ HatchEggs: .Text_HatchEgg: ; Huh? @ @ - text_far UnknownText_0x1c0db0 + text_far Text_BreedHuh text_asm ld hl, wVramState res 0, [hl] @@ -366,29 +366,26 @@ HatchEggs: ld a, [wCurPartySpecies] push af call EggHatch_AnimationSequence - ld hl, .ClearTextbox + ld hl, .BreedClearboxText call PrintText pop af ld [wCurPartySpecies], a pop bc pop de pop hl - ld hl, .CameOutOfItsEgg + ld hl, .BreedEggHatchText ret -.ClearTextbox: - ; - text_far UnknownText_0x1c0db8 +.BreedClearboxText: + text_far _BreedClearboxText text_end -.CameOutOfItsEgg: - ; came out of its EGG!@ @ - text_far UnknownText_0x1c0dba +.BreedEggHatchText: + text_far _BreedEggHatchText text_end -.Text_NicknameHatchling: - ; Give a nickname to @ ? - text_far UnknownText_0x1c0dd8 +.BreedAskNicknameText: + text_far _BreedAskNicknameText text_end InitEggMoves: @@ -865,27 +862,27 @@ Hatch_ShellFragmentLoop: ret DayCareMon1: - ld hl, DayCareMon1Text + ld hl, LeftWithDayCareManText call PrintText ld a, [wBreedMon1Species] call PlayMonCry ld a, [wDayCareLady] bit DAYCARELADY_HAS_MON_F, a jr z, DayCareMonCursor - call ButtonSound + call PromptButton ld hl, wBreedMon2Nick call DayCareMonCompatibilityText jp PrintText DayCareMon2: - ld hl, DayCareMon2Text + ld hl, LeftWithDayCareLadyText call PrintText ld a, [wBreedMon2Species] call PlayMonCry ld a, [wDayCareMan] bit DAYCAREMAN_HAS_MON_F, a jr z, DayCareMonCursor - call ButtonSound + call PromptButton ld hl, wBreedMon1Nick call DayCareMonCompatibilityText jp PrintText @@ -893,14 +890,12 @@ DayCareMon2: DayCareMonCursor: jp WaitPressAorB_BlinkCursor -DayCareMon2Text: - ; It's @ that was left with the DAY-CARE LADY. - text_far UnknownText_0x1c0df3 +LeftWithDayCareLadyText: + text_far _LeftWithDayCareLadyText text_end -DayCareMon1Text: - ; It's @ that was left with the DAY-CARE MAN. - text_far UnknownText_0x1c0e24 +LeftWithDayCareManText: + text_far _LeftWithDayCareManText text_end DayCareMonCompatibilityText: @@ -911,46 +906,41 @@ DayCareMonCompatibilityText: call CheckBreedmonCompatibility pop bc ld a, [wBreedingCompatibility] - ld hl, .AllAlone + ld hl, .BreedBrimmingWithEnergyText cp -1 jr z, .done - ld hl, .Incompatible + ld hl, .BreedNoInterestText and a jr z, .done - ld hl, .HighCompatibility + ld hl, .BreedAppearsToCareForText cp 230 jr nc, .done cp 70 - ld hl, .ModerateCompatibility + ld hl, .BreedFriendlyText jr nc, .done - ld hl, .SlightCompatibility + ld hl, .BreedShowsInterestText .done ret -.AllAlone: - ; It's brimming with energy. - text_far UnknownText_0x1c0e54 +.BreedBrimmingWithEnergyText: + text_far _BreedBrimmingWithEnergyText text_end -.Incompatible: - ; It has no interest in @ . - text_far UnknownText_0x1c0e6f +.BreedNoInterestText: + text_far _BreedNoInterestText text_end -.HighCompatibility: - ; It appears to care for @ . - text_far UnknownText_0x1c0e8d +.BreedAppearsToCareForText: + text_far _BreedAppearsToCareForText text_end -.ModerateCompatibility: - ; It's friendly with @ . - text_far UnknownText_0x1c0eac +.BreedFriendlyText: + text_far _BreedFriendlyText text_end -.SlightCompatibility: - ; It shows interest in @ . - text_far UnknownText_0x1c0ec6 +.BreedShowsInterestText: + text_far _BreedShowsInterestText text_end Unreferenced_DayCareMonPrintEmptyString: diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm index fe34f197d..0633b8e9a 100644 --- a/engine/pokemon/caught_data.asm +++ b/engine/pokemon/caught_data.asm @@ -152,13 +152,12 @@ CheckPartyFullAfterContest: ret GiveANickname_YesNo: - ld hl, TextJump_GiveANickname + ld hl, CaughtAskNicknameText call PrintText jp YesNoBox -TextJump_GiveANickname: - ; Give a nickname to the @ you received? - text_far UnknownText_0x1c12fc +CaughtAskNicknameText: + text_far _CaughtAskNicknameText text_end SetCaughtData: diff --git a/engine/pokemon/european_mail.asm b/engine/pokemon/european_mail.asm index 38c542d35..eb9b7d5d9 100644 --- a/engine/pokemon/european_mail.asm +++ b/engine/pokemon/european_mail.asm @@ -38,15 +38,15 @@ INCBIN "gfx/font/french_german.1bpp" SpanishItalianFont: INCBIN "gfx/font/spanish_italian.1bpp" -HandleFrenchGermanMail: -; called if mail is french or german -; fix 's 't 'v +ConvertFrenchGermanMailToEnglish: +; Called if mail is French or German +; Converts 's 't 'v from French/German character set to English ld b, sPartyMon1MailAuthor - sPartyMon1Mail ld h, d ld l, e .loop ld a, [hl] - cp $dc ; 's in french/german font + cp $dc ; 's in French/German font jr nz, .check_intermediate_chars ld a, "'s" jr .replace @@ -67,12 +67,9 @@ HandleFrenchGermanMail: jr nz, .loop ret -LireLeCourrierAnglais: -DeutenEnglischenPost: -; Cette fonction convertit certains des caractères anglais pour -; leur équivalent dans le jeu de caractères français. -; Diese Funktion wandelt bestimmte englische Zeichen, um ihre -; Entsprechung in der Deutschen-Zeichensatz. +ConvertEnglishMailToFrenchGerman: +; Called if mail is English and game is French or German +; Converts 's 't 'v from English character set to French/German ld b, sPartyMon1MailAuthor - sPartyMon1Mail ld h, d ld l, e @@ -80,7 +77,7 @@ DeutenEnglischenPost: ld a, [hl] cp "'s" jr nz, .check_intermediate_chars - ld a, $dc + ld a, $dc ; 's in French/German font jr .replace .check_intermediate_chars @@ -99,15 +96,12 @@ DeutenEnglischenPost: jr nz, .loop ret -HandleSpanishItalianMail: -LeerCorreosIngleses: -LeggiPostaInglese: -; This function converts certain characters between -; the English and Spanish/Italian character sets. -; Esta función convierte ciertos caracteres entre -; el juego de caracteres Inglés y Español. -; Questa funzione converte alcuni caratteri tra -; l'inglese e il set di caratteri italiani. +ConvertSpanishItalianMailToEnglish: +; Called if mail is Spanish or Italian +; Converts 'd 'l 'm 'r 's 't 'v from Spanish/Italian character set to English +ConvertEnglishMailToSpanishItalian: +; Called if mail is English and game is Spanish or Italian +; Converts 'd 'l 'm 'r 's 't 'v from English character set to Spanish/Italian ld b, sPartyMon1MailAuthor - sPartyMon1Mail ld h, d ld l, e diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 0ee10eac8..51c47c0d6 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -204,7 +204,7 @@ EvolveAfterBattle_MasterLoop: ld hl, wPartyMonNicknames call GetNick call CopyName1 - ld hl, Text_WhatEvolving + ld hl, EvolvingText call PrintText ld c, 50 @@ -227,7 +227,7 @@ EvolveAfterBattle_MasterLoop: pop af jp c, CancelEvolution - ld hl, Text_CongratulationsYourPokemon + ld hl, CongratulationsYourPokemonText call PrintText pop hl @@ -240,7 +240,7 @@ EvolveAfterBattle_MasterLoop: call GetPokemonName push hl - ld hl, Text_EvolvedIntoPKMN + ld hl, EvolvedIntoText call PrintTextboxText farcall StubbedTrainerRankings_MonsEvolved @@ -377,7 +377,7 @@ UpdateSpeciesNameIfNotNicknamed: jp CopyBytes CancelEvolution: - ld hl, Text_StoppedEvolving + ld hl, StoppedEvolvingText call PrintText call ClearTileMap pop hl @@ -394,24 +394,20 @@ IsMonHoldingEverstone: pop hl ret -Text_CongratulationsYourPokemon: - ; Congratulations! Your @ @ - text_far UnknownText_0x1c4b92 +CongratulationsYourPokemonText: + text_far _CongratulationsYourPokemonText text_end -Text_EvolvedIntoPKMN: - ; evolved into @ ! - text_far UnknownText_0x1c4baf +EvolvedIntoText: + text_far _EvolvedIntoText text_end -Text_StoppedEvolving: - ; Huh? @ stopped evolving! - text_far UnknownText_0x1c4bc5 +StoppedEvolvingText: + text_far _StoppedEvolvingText text_end -Text_WhatEvolving: - ; What? @ is evolving! - text_far UnknownText_0x1c4be3 +EvolvingText: + text_far _EvolvingText text_end LearnLevelMoves: diff --git a/engine/pokemon/knows_move.asm b/engine/pokemon/knows_move.asm index 523d13968..9fe0f6ace 100644 --- a/engine/pokemon/knows_move.asm +++ b/engine/pokemon/knows_move.asm @@ -14,12 +14,11 @@ KnowsMove: ret .knows_move - ld hl, .Text_knows + ld hl, .KnowsMoveText call PrintText scf ret -.Text_knows: - ; knows @ . - text_far UnknownText_0x1c5ea8 +.KnowsMoveText: + text_far _KnowsMoveText text_end diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index d73dd7094..6722c4fe1 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -102,25 +102,25 @@ LearnMove: jp .learned .cancel - ld hl, Text_StopLearning ; Stop learning <MOVE>? + ld hl, StopLearningMoveText call PrintText call YesNoBox jp c, .loop - ld hl, Text_DidNotLearn ; <MON> did not learn <MOVE>. + ld hl, DidNotLearnMoveText call PrintText ld b, 0 ret .learned - ld hl, Text_LearnedMove ; <MON> learned <MOVE>! + ld hl, LearnedMoveText call PrintText ld b, 1 ret ForgetMove: push hl - ld hl, Text_TryingToLearn + ld hl, AskForgetMoveText call PrintText call YesNoBox pop hl @@ -134,7 +134,7 @@ ForgetMove: pop hl .loop push hl - ld hl, Text_ForgetWhich + ld hl, MoveAskForgetText call PrintText hlcoord 5, 2 ld b, NUM_MOVES * 2 @@ -191,7 +191,7 @@ ForgetMove: ret .hmmove - ld hl, Text_CantForgetHM + ld hl, MoveCantForgetHMText call PrintText pop hl jr .loop @@ -200,48 +200,40 @@ ForgetMove: scf ret -Text_LearnedMove: -; <MON> learned <MOVE>! - text_far UnknownText_0x1c5660 +LearnedMoveText: + text_far _LearnedMoveText text_end -Text_ForgetWhich: -; Which move should be forgotten? - text_far UnknownText_0x1c5678 +MoveAskForgetText: + text_far _MoveAskForgetText text_end -Text_StopLearning: -; Stop learning <MOVE>? - text_far UnknownText_0x1c5699 +StopLearningMoveText: + text_far _StopLearningMoveText text_end -Text_DidNotLearn: -; <MON> did not learn <MOVE>. - text_far UnknownText_0x1c56af +DidNotLearnMoveText: + text_far _DidNotLearnMoveText text_end -Text_TryingToLearn: -; <MON> is trying to learn <MOVE>. But <MON> can't learn more than -; four moves. Delete an older move to make room for <MOVE>? - text_far UnknownText_0x1c56c9 +AskForgetMoveText: + text_far _AskForgetMoveText text_end Text_1_2_and_Poof: - text_far UnknownText_0x1c5740 ; 1, 2 and… + text_far Text_MoveForgetCount ; 1, 2 and… text_asm push de ld de, SFX_SWITCH_POKEMON call PlaySFX pop de - ld hl, .PoofForgot + ld hl, .MoveForgotText ret -.PoofForgot: -; Poof! <MON> forgot <MOVE>. And… - text_far UnknownText_0x1c574e +.MoveForgotText: + text_far _MoveForgotText text_end -Text_CantForgetHM: -; HM moves can't be forgotten now. - text_far UnknownText_0x1c5772 +MoveCantForgetHMText: + text_far _MoveCantForgetHMText text_end diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index f89a51944..fa3955003 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -428,7 +428,7 @@ MailboxPC: jp CloseSubmenu .PutInPack: - ld hl, .MessageLostText + ld hl, .MailMessageLostText call MenuTextbox call YesNoBox call ExitMenu @@ -441,7 +441,7 @@ MailboxPC: ld hl, wNumItems call ReceiveItem jr c, .put_in_bag - ld hl, .PackFullText + ld hl, .MailPackFullText jp MenuTextboxBackup .put_in_bag @@ -449,19 +449,19 @@ MailboxPC: dec a ld b, a call DeleteMailFromPC - ld hl, .PutAwayText + ld hl, .MailClearedPutAwayText jp MenuTextboxBackup -.PutAwayText: - text_far ClearedMailPutAwayText +.MailClearedPutAwayText: + text_far _MailClearedPutAwayText text_end -.PackFullText: - text_far MailPackFullText +.MailPackFullText: + text_far _MailPackFullText text_end -.MessageLostText: - text_far MailMessageLostText +.MailMessageLostText: + text_far _MailMessageLostText text_end .GetMailType: @@ -500,12 +500,12 @@ MailboxPC: ld a, [hl] and a jr z, .attach_mail - ld hl, .HoldingMailText + ld hl, .MailAlreadyHoldingItemText call PrintText jr .try_again .egg - ld hl, .EggText + ld hl, .MailEggText call PrintText jr .try_again @@ -514,22 +514,22 @@ MailboxPC: dec a ld b, a call MoveMailFromPCToParty - ld hl, .MailMovedText + ld hl, .MailMovedFromBoxText call PrintText .exit2 jp CloseSubmenu -.HoldingMailText: - text_far MailAlreadyHoldingItemText +.MailAlreadyHoldingItemText: + text_far _MailAlreadyHoldingItemText text_end -.EggText: - text_far MailEggText +.MailEggText: + text_far _MailEggText text_end -.MailMovedText: - text_far MailMovedFromBoxText +.MailMovedFromBoxText: + text_far _MailMovedFromBoxText text_end .Cancel: diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 624a7c964..f6fee4b9c 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -29,7 +29,7 @@ TossItemFromPC: ld a, [wItemAttributeParamBuffer] and a jr nz, .key_item - ld hl, .TossHowMany + ld hl, .ItemsTossOutHowManyText call MenuTextbox farcall SelectQuantityToToss push af @@ -37,7 +37,7 @@ TossItemFromPC: call ExitMenu pop af jr c, .quit - ld hl, .ConfirmToss + ld hl, .ItemsThrowAwayText call MenuTextbox call YesNoBox push af @@ -48,7 +48,7 @@ TossItemFromPC: ld a, [wCurItemQuantity] call TossItem call PartyMonItemName - ld hl, .TossedThisMany + ld hl, .ItemsDiscardedText call MenuTextbox call ExitMenu and a @@ -61,38 +61,34 @@ TossItemFromPC: scf ret -.TossHowMany: - ; Toss out how many @ (S)? - text_far UnknownText_0x1c1a90 +.ItemsTossOutHowManyText: + text_far _ItemsTossOutHowManyText text_end -.ConfirmToss: - ; Throw away @ @ (S)? - text_far UnknownText_0x1c1aad +.ItemsThrowAwayText: + text_far _ItemsThrowAwayText text_end -.TossedThisMany: - ; Discarded @ (S). - text_far UnknownText_0x1c1aca +.ItemsDiscardedText: + text_far _ItemsDiscardedText text_end .CantToss: - ld hl, .TooImportantToToss + ld hl, .ItemsTooImportantText call MenuTextboxBackup ret -.TooImportantToToss: - ; That's too impor- tant to toss out! - text_far UnknownText_0x1c1adf +.ItemsTooImportantText: + text_far _ItemsTooImportantText text_end CantUseItem: - ld hl, CantUseItemText + ld hl, ItemsOakWarningText call MenuTextboxWaitButton ret -CantUseItemText: - text_far UnknownText_0x1c1b03 +ItemsOakWarningText: + text_far _ItemsOakWarningText text_end PartyMonItemName: @@ -264,7 +260,7 @@ GiveTakePartyMonItem: jr .quit .next - ld hl, CantBeHeldText + ld hl, ItemCantHeldText call MenuTextboxBackup jr .loop @@ -289,20 +285,20 @@ TryGiveItemToPartymon: .give_item_to_mon call GiveItemToPokemon - ld hl, MadeHoldText + ld hl, PokemonHoldItemText call MenuTextboxBackup call GivePartyItem ret .please_remove_mail - ld hl, PleaseRemoveMailText + ld hl, PokemonRemoveMailText call MenuTextboxBackup ret .already_holding_item ld [wNamedObjectIndexBuffer], a call GetItemName - ld hl, SwitchAlreadyHoldingText + ld hl, PokemonAskSwapItemText call StartMenuYesNo jr c, .abort @@ -316,7 +312,7 @@ TryGiveItemToPartymon: call ReceiveItemFromPokemon jr nc, .bag_full - ld hl, TookAndMadeHoldText + ld hl, PokemonSwapItemText call MenuTextboxBackup ld a, [wNamedObjectIndexBuffer] ld [wCurItem], a @@ -327,7 +323,7 @@ TryGiveItemToPartymon: ld a, [wNamedObjectIndexBuffer] ld [wCurItem], a call ReceiveItemFromPokemon - ld hl, ItemStorageIsFullText + ld hl, ItemStorageFullText call MenuTextboxBackup .abort @@ -362,17 +358,17 @@ TakePartyItem: ld [wNamedObjectIndexBuffer], a ld [hl], NO_ITEM call GetItemName - ld hl, TookFromText + ld hl, PokemonTookItemText call MenuTextboxBackup jr .asm_12c9a .asm_12c8c - ld hl, IsntHoldingAnythingText + ld hl, PokemonNotHoldingText call MenuTextboxBackup jr .asm_12c9a .asm_12c94 - ld hl, ItemStorageIsFullText + ld hl, ItemStorageFullText call MenuTextboxBackup .asm_12c9a @@ -390,36 +386,36 @@ GiveTakeItemMenuData: db "GIVE@" db "TAKE@" -TookAndMadeHoldText: - text_far UnknownText_0x1c1b2c +PokemonSwapItemText: + text_far _PokemonSwapItemText text_end -MadeHoldText: - text_far UnknownText_0x1c1b57 +PokemonHoldItemText: + text_far _PokemonHoldItemText text_end -PleaseRemoveMailText: - text_far UnknownText_0x1c1b6f +PokemonRemoveMailText: + text_far _PokemonRemoveMailText text_end -IsntHoldingAnythingText: - text_far UnknownText_0x1c1b8e +PokemonNotHoldingText: + text_far _PokemonNotHoldingText text_end -ItemStorageIsFullText: - text_far UnknownText_0x1c1baa +ItemStorageFullText: + text_far _ItemStorageFullText text_end -TookFromText: - text_far UnknownText_0x1c1bc4 +PokemonTookItemText: + text_far _PokemonTookItemText text_end -SwitchAlreadyHoldingText: - text_far UnknownText_0x1c1bdc +PokemonAskSwapItemText: + text_far _PokemonAskSwapItemText text_end -CantBeHeldText: - text_far UnknownText_0x1c1c09 +ItemCantHeldText: + text_far _ItemCantHeldText text_end GetPartyItemLocation: @@ -506,24 +502,24 @@ MonMailAction: ret .take - ld hl, .sendmailtopctext + ld hl, .MailAskSendToPCText call StartMenuYesNo jr c, .RemoveMailToBag ld a, [wCurPartyMon] ld b, a farcall SendMailToPC jr c, .MailboxFull - ld hl, .sentmailtopctext + ld hl, .MailSentToPCText call MenuTextboxBackup jr .done .MailboxFull: - ld hl, .mailboxfulltext + ld hl, .MailboxFullText call MenuTextboxBackup jr .done .RemoveMailToBag: - ld hl, .mailwilllosemessagetext + ld hl, .MailLoseMessageText call StartMenuYesNo jr c, .done call GetPartyItemLocation @@ -534,12 +530,12 @@ MonMailAction: call GetPartyItemLocation ld [hl], $0 call GetCurNick - ld hl, .tookmailfrommontext + ld hl, .MailDetachedText call MenuTextboxBackup jr .done .BagIsFull: - ld hl, .bagfulltext + ld hl, .MailNoSpaceText call MenuTextboxBackup jr .done @@ -560,34 +556,28 @@ MonMailAction: db "TAKE@" db "QUIT@" -.mailwilllosemessagetext -; The MAIL will lose its message. OK? - text_far UnknownText_0x1c1c22 +.MailLoseMessageText: + text_far _MailLoseMessageText text_end -.tookmailfrommontext -; MAIL detached from <POKEMON>. - text_far UnknownText_0x1c1c47 +.MailDetachedText: + text_far _MailDetachedText text_end -.bagfulltext -; There's no space for removing MAIL. - text_far UnknownText_0x1c1c62 +.MailNoSpaceText: + text_far _MailNoSpaceText text_end -.sendmailtopctext -; Send the removed MAIL to your PC? - text_far UnknownText_0x1c1c86 +.MailAskSendToPCText: + text_far _MailAskSendToPCText text_end -.mailboxfulltext -; Your PC's MAILBOX is full. - text_far UnknownText_0x1c1ca9 +.MailboxFullText: + text_far _MailboxFullText text_end -.sentmailtopctext -; The MAIL was sent to your PC. - text_far UnknownText_0x1c1cc4 +.MailSentToPCText: + text_far _MailSentToPCText text_end OpenPartyStats: @@ -738,7 +728,7 @@ MonMenu_Softboiled_MilkDrink: jr .finish .NotEnoughHP: - ld hl, .Text_NotEnoughHP + ld hl, .PokemonNotEnoughHPText call PrintText .finish @@ -747,9 +737,8 @@ MonMenu_Softboiled_MilkDrink: ld a, $3 ret -.Text_NotEnoughHP: - ; Not enough HP! - text_far UnknownText_0x1c1ce3 +.PokemonNotEnoughHPText: + text_far _PokemonNotEnoughHPText text_end .CheckMonHasEnoughHP: @@ -888,7 +877,7 @@ MoveScreenLoop: inc a ld [wPartyMenuCursor], a call SetUpMoveScreenBG - call Function132d3 + call PlaceMoveScreenArrows ld de, MoveScreenAttributes call SetMenuAttributes .loop @@ -1239,12 +1228,12 @@ String_MoveAtk: String_MoveNoPower: db "---@" -Function132d3: - call Function132da - call Function132fe +PlaceMoveScreenArrows: + call PlaceMoveScreenLeftArrow + call PlaceMoveScreenRightArrow ret -Function132da: +PlaceMoveScreenLeftArrow: ld a, [wCurPartyMon] and a ret z @@ -1273,7 +1262,7 @@ Function132da: ld [hl], "◀" ret -Function132fe: +PlaceMoveScreenRightArrow: ld a, [wCurPartyMon] inc a ld c, a diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index eaa05f84a..8133e2671 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -132,7 +132,7 @@ rept NUM_MOVES + -1 ld [hli], a endr ld [hl], a - ld [wBuffer1], a + ld [wEvolutionOldSpecies], a predef FillMoves .next @@ -1782,7 +1782,7 @@ GivePoke:: ld a, b and a ret z - ld hl, TextJump_WasSentToBillsPC + ld hl, WasSentToBillsPCText call PrintText ld a, BANK(sBoxMonNicknames) call GetSRAMBank @@ -1800,9 +1800,8 @@ GivePoke:: ld b, $2 ret -TextJump_WasSentToBillsPC: - ; was sent to BILL's PC. - text_far Text_WasSentToBillsPC +WasSentToBillsPCText: + text_far _WasSentToBillsPCText text_end InitNickname: diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index f8a6b0a5e..12036497d 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -246,10 +246,10 @@ PlacePartyMonLevel: jr nc, .ThreeDigits ld a, "<LV>" ld [hli], a - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + lb bc, PRINTNUM_LEFTALIGN | 1, 2 ; jr .okay .ThreeDigits: - lb bc, PRINTNUM_RIGHTALIGN | 1, 3 + lb bc, PRINTNUM_LEFTALIGN | 1, 3 ; .okay call PrintNum @@ -792,64 +792,54 @@ PrintPartyMenuActionText: .MenuActionTexts: ; entries correspond to PARTYMENUTEXT_* constants - dw .Text_CuredOfPoison - dw .Text_BurnWasHealed - dw .Text_Defrosted - dw .Text_WokeUp - dw .Text_RidOfParalysis - dw .Text_RecoveredSomeHP - dw .Text_HealthReturned - dw .Text_Revitalized - dw .Text_GrewToLevel - dw .Text_CameToItsSenses - -.Text_RecoveredSomeHP: - ; recovered @ HP! + dw .CuredOfPoisonText + dw .BurnWasHealedText + dw .WasDefrostedText + dw .WokeUpText + dw .RidOfParalysisText + dw .RecoveredSomeHPText + dw .HealthReturnedText + dw .RevitalizedText + dw .GrewToLevelText + dw .CameToItsSensesText + +.RecoveredSomeHPText: text_far _RecoveredSomeHPText text_end -.Text_CuredOfPoison: - ; 's cured of poison. +.CuredOfPoisonText: text_far _CuredOfPoisonText text_end -.Text_RidOfParalysis: - ; 's rid of paralysis. +.RidOfParalysisText: text_far _RidOfParalysisText text_end -.Text_BurnWasHealed: - ; 's burn was healed. +.BurnWasHealedText: text_far _BurnWasHealedText text_end -.Text_Defrosted: - ; was defrosted. +.WasDefrostedText: text_far _WasDefrostedText text_end -.Text_WokeUp: - ; woke up. +.WokeUpText: text_far _WokeUpText text_end -.Text_HealthReturned: - ; 's health returned. +.HealthReturnedText: text_far _HealthReturnedText text_end -.Text_Revitalized: - ; is revitalized. +.RevitalizedText: text_far _RevitalizedText text_end -.Text_GrewToLevel: - ; grew to level @ !@ @ +.GrewToLevelText: text_far _GrewToLevelText text_end -.Text_CameToItsSenses: - ; came to its senses. +.CameToItsSensesText: text_far _CameToItsSensesText text_end diff --git a/engine/pokemon/search.asm b/engine/pokemon/search.asm index c8d4439df..2ea1beacf 100644 --- a/engine/pokemon/search.asm +++ b/engine/pokemon/search.asm @@ -113,7 +113,7 @@ CheckOwnMonAnywhere: jr z, .loopbox ; Load the box. - ld hl, BoxAddressTable1 + ld hl, BoxAddressTable ld b, 0 add hl, bc add hl, bc @@ -244,7 +244,7 @@ endr scf ret -BoxAddressTable1: +BoxAddressTable: dba sBox1 dba sBox2 dba sBox3 diff --git a/engine/pokemon/search2.asm b/engine/pokemon/search2.asm index 7af93282e..c33d84edf 100644 --- a/engine/pokemon/search2.asm +++ b/engine/pokemon/search2.asm @@ -117,7 +117,7 @@ FindThatSpecies: ret RetroactivelyIgnoreEggs: - ld e, -2 + ld e, %11111110 ld hl, wPartySpecies .loop ld a, [hli] diff --git a/engine/rtc/reset_password.asm b/engine/rtc/reset_password.asm index 0992f0bca..6fd7b3e15 100644 --- a/engine/rtc/reset_password.asm +++ b/engine/rtc/reset_password.asm @@ -6,7 +6,7 @@ _ResetClock: call LoadFontsExtra ld de, MUSIC_MAIN_MENU call PlayMusic - ld hl, .text_askreset + ld hl, .PasswordAskResetClockText call PrintText ld hl, .NoYes_MenuHeader call CopyMenuHeader @@ -22,28 +22,25 @@ _ResetClock: ld a, $80 ld [sRTCStatusFlags], a call CloseSRAM - ld hl, .text_okay + ld hl, .PasswordAskResetText call PrintText ret .wrongpassword - ld hl, .text_wrong + ld hl, .PasswordWrongText call PrintText ret -.text_okay - ; Password OK. Select CONTINUE & reset settings. - text_far UnknownText_0x1c55db +.PasswordAskResetText: + text_far _PasswordAskResetText text_end -.text_wrong - ; Wrong password! - text_far UnknownText_0x1c560b +.PasswordWrongText: + text_far _PasswordWrongText text_end -.text_askreset - ; Reset the clock? - text_far UnknownText_0x1c561c +.PasswordAskResetClockText: + text_far _PasswordAskResetClockText text_end .NoYes_MenuHeader: @@ -67,7 +64,7 @@ ClockResetPassword: call ByteFill ld a, $4 ld [wStringBuffer2 + 5], a - ld hl, .pleaseenterpasswordtext + ld hl, .PasswordAskEnterText call PrintText .loop call .updateIDdisplay @@ -101,9 +98,8 @@ ClockResetPassword: scf ret -.pleaseenterpasswordtext - ; Please enter the password. - text_far UnknownText_0x1c562e +.PasswordAskEnterText: + text_far _PasswordAskEnterText text_end .updateIDdisplay diff --git a/engine/rtc/restart_clock.asm b/engine/rtc/restart_clock.asm index 16f25cddd..357e69667 100644 --- a/engine/rtc/restart_clock.asm +++ b/engine/rtc/restart_clock.asm @@ -29,7 +29,7 @@ endr RestartClock: ; If we're here, we had an RTC overflow. - ld hl, .Text_ClockTimeMayBeWrong + ld hl, .ClockTimeMayBeWrongText call PrintText ld hl, wOptions ld a, [hl] @@ -37,7 +37,7 @@ RestartClock: set NO_TEXT_SCROLL, [hl] call LoadStandardMenuHeader call ClearTileMap - ld hl, .Text_SetWithControlPad + ld hl, .ClockSetWithControlPadText call PrintText call .SetClock call ExitMenu @@ -47,14 +47,12 @@ RestartClock: ld c, a ret -.Text_ClockTimeMayBeWrong: - ; The clock's time may be wrong. Please reset the time. - text_far UnknownText_0x1c40e6 +.ClockTimeMayBeWrongText: + text_far _ClockTimeMayBeWrongText text_end -.Text_SetWithControlPad: - ; Set with the Control Pad. Confirm: A Button Cancel: B Button - text_far UnknownText_0x1c411c +.ClockSetWithControlPadText: + text_far _ClockSetWithControlPadText text_end .SetClock: @@ -77,7 +75,7 @@ RestartClock: and a ret nz call .PrintTime - ld hl, .Text_IsThisOK + ld hl, .ClockIsThisOKText call PrintText call YesNoBox jr c, .cancel @@ -91,7 +89,7 @@ RestartClock: ld [wStringBuffer2 + 3], a call InitTime call .PrintTime - ld hl, .Text_ClockReset + ld hl, .ClockHasResetText call PrintText call WaitPressAorB_BlinkCursor xor a @@ -101,14 +99,12 @@ RestartClock: ld a, $1 ret -.Text_IsThisOK: - ; Is this OK? - text_far UnknownText_0x1c415b +.ClockIsThisOKText: + text_far _ClockIsThisOKText text_end -.Text_ClockReset: - ; The clock has been reset. - text_far UnknownText_0x1c4168 +.ClockHasResetText: + text_far _ClockHasResetText text_end .joy_loop diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index 146adc072..da1012ff8 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -41,7 +41,7 @@ InitClock: call .ClearScreen call WaitBGMap call RotateFourPalettesRight - ld hl, Text_WokeUpOak + ld hl, OakTimeWokeUpText call PrintText ld hl, wTimeSetBuffer ld bc, wTimeSetBufferEnd - wTimeSetBuffer @@ -51,7 +51,7 @@ InitClock: ld [wInitHourBuffer], a .loop - ld hl, Text_WhatTimeIsIt + ld hl, OakTimeWhatTimeIsItText call PrintText hlcoord 3, 7 ld b, 2 @@ -74,7 +74,7 @@ InitClock: ld a, [wInitHourBuffer] ld [wStringBuffer2 + 1], a call .ClearScreen - ld hl, Text_WhatHrs + ld hl, OakTimeWhatHoursText call PrintText call YesNoBox jr nc, .HourIsSet @@ -82,7 +82,7 @@ InitClock: jr .loop .HourIsSet: - ld hl, Text_HowManyMinutes + ld hl, OakTimeHowManyMinutesText call PrintText hlcoord 11, 7 lb bc, 2, 7 @@ -104,7 +104,7 @@ InitClock: ld a, [wInitMinuteBuffer] ld [wStringBuffer2 + 2], a call .ClearScreen - ld hl, Text_WhoaMins + ld hl, OakTimeWhoaMinutesText call PrintText call YesNoBox jr nc, .MinutesAreSet @@ -273,69 +273,64 @@ SetMinutes: DisplayMinutesWithMinString: ld de, wInitMinuteBuffer - call PrintTwoDigitNumberRightAlign + call PrintTwoDigitNumberLeftAlign inc hl ld de, String_min call PlaceString ret -PrintTwoDigitNumberRightAlign: +PrintTwoDigitNumberLeftAlign: push hl ld a, " " ld [hli], a ld [hl], a pop hl - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + lb bc, PRINTNUM_LEFTALIGN | 1, 2 call PrintNum ret -Text_WokeUpOak: - ; Zzz… Hm? Wha…? You woke me up! Will you check the clock for me? - text_far _OakTimeText1 +OakTimeWokeUpText: + text_far _OakTimeWokeUpText text_end -Text_WhatTimeIsIt: - ; What time is it? - text_far _OakTimeText2 +OakTimeWhatTimeIsItText: + text_far _OakTimeWhatTimeIsItText text_end String_oclock: db "o'clock@" -Text_WhatHrs: +OakTimeWhatHoursText: ; What?@ @ - text_far _OakTimeText3 + text_far _OakTimeWhatHoursText text_asm hlcoord 1, 16 call DisplayHourOClock - ld hl, .QuestionMark + ld hl, .OakTimeHoursQuestionMarkText ret -.QuestionMark: - ; ? - text_far _OakTimeText4 +.OakTimeHoursQuestionMarkText: + text_far _OakTimeHoursQuestionMarkText text_end -Text_HowManyMinutes: - ; How many minutes? - text_far _OakTimeText5 +OakTimeHowManyMinutesText: + text_far _OakTimeHowManyMinutesText text_end String_min: db "min.@" -Text_WhoaMins: +OakTimeWhoaMinutesText: ; Whoa!@ @ - text_far _OakTimeText6 + text_far _OakTimeWhoaMinutesText text_asm hlcoord 7, 14 call DisplayMinutesWithMinString - ld hl, .QuestionMark + ld hl, .OakTimeMinutesQuestionMarkText ret -.QuestionMark: - ; ? - text_far _OakTimeText7 +.OakTimeMinutesQuestionMarkText: + text_far _OakTimeMinutesQuestionMarkText text_end OakText_ResponseToSetTime: @@ -358,29 +353,26 @@ OakText_ResponseToSetTime: jr c, .morn cp NITE_HOUR jr c, .day -.nite: - ld hl, .sodark +.nite + ld hl, .OakTimeSoDarkText ret -.morn: - ld hl, .overslept +.morn + ld hl, .OakTimeOversleptText ret -.day: - ld hl, .yikes +.day + ld hl, .OakTimeYikesText ret -.overslept - ; ! I overslept! - text_far _OakTimeText8 +.OakTimeOversleptText: + text_far _OakTimeOversleptText text_end -.yikes - ; ! Yikes! I over- slept! - text_far _OakTimeText11 +.OakTimeYikesText: + text_far _OakTimeYikesText text_end -.sodark - ; ! No wonder it's so dark! - text_far _OakTimeText12 +.OakTimeSoDarkText: + text_far _OakTimeSoDarkText text_end TimeSetBackgroundGFX: @@ -410,7 +402,7 @@ SetDayOfWeek: lb bc, 4, 18 call Textbox call LoadStandardMenuHeader - ld hl, .WhatDayIsItText + ld hl, .OakTimeWhatDayIsItText call PrintText hlcoord 9, 3 ld b, 2 @@ -532,21 +524,19 @@ SetDayOfWeek: .Friday: db " FRIDAY@" .Saturday: db "SATURDAY@" -.WhatDayIsItText: - ; What day is it? - text_far _OakTimeText13 +.OakTimeWhatDayIsItText: + text_far _OakTimeWhatDayIsItText text_end .ConfirmWeekdayText: text_asm hlcoord 1, 14 call .PlaceWeekdayString - ld hl, .IsIt + ld hl, .OakTimeIsItText ret -.IsIt: - ; , is it? - text_far _OakTimeText14 +.OakTimeIsItText: + text_far _OakTimeIsItText text_end InitialSetDSTFlag: @@ -569,12 +559,11 @@ InitialSetDSTFlag: ld c, a decoord 1, 14 farcall PrintHoursMins - ld hl, .DSTIsThatOK + ld hl, .DSTIsThatOKText ret -.DSTIsThatOK: - ; DST, is that OK? - text_far Text_DSTIsThatOK +.DSTIsThatOKText: + text_far _DSTIsThatOKText text_end InitialClearDSTFlag: @@ -597,12 +586,11 @@ InitialClearDSTFlag: ld c, a decoord 1, 14 farcall PrintHoursMins - ld hl, .IsThatOK + ld hl, .TimeAskOkayText ret -.IsThatOK: - ; , is that OK? - text_far UnknownText_0x1c5ff1 +.TimeAskOkayText: + text_far _TimeAskOkayText text_end DebugDisplayTime: @@ -696,7 +684,7 @@ PrintHour: call AdjustHourForAMorPM ld [wDeciramBuffer], a ld de, wDeciramBuffer - call PrintTwoDigitNumberRightAlign + call PrintTwoDigitNumberLeftAlign ret GetTimeOfDayString: diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm index d596849d2..f8869b59b 100644 --- a/engine/tilesets/tileset_anims.asm +++ b/engine/tilesets/tileset_anims.asm @@ -259,7 +259,7 @@ TilesetChampionsRoomAnim: TilesetLighthouseAnim: TilesetPlayersRoomAnim: TilesetPokeComCenterAnim: -TilesetBattleTowerAnim: +TilesetBattleTowerInsideAnim: TilesetRuinsOfAlphAnim: TilesetRadioTowerAnim: TilesetUndergroundAnim: diff --git a/engine/tilesets/tileset_palettes.asm b/engine/tilesets/tileset_palettes.asm index 459cd74c2..994102238 100644 --- a/engine/tilesets/tileset_palettes.asm +++ b/engine/tilesets/tileset_palettes.asm @@ -2,8 +2,8 @@ LoadSpecialMapPalette: ld a, [wMapTileset] cp TILESET_POKECOM_CENTER jr z, .pokecom_2f - cp TILESET_BATTLE_TOWER - jr z, .battle_tower + cp TILESET_BATTLE_TOWER_INSIDE + jr z, .battle_tower_inside cp TILESET_ICE_PATH jr z, .ice_path cp TILESET_HOUSE @@ -19,8 +19,8 @@ LoadSpecialMapPalette: scf ret -.battle_tower - call LoadBattleTowerPalette +.battle_tower_inside + call LoadBattleTowerInsidePalette scf ret @@ -63,16 +63,16 @@ LoadPokeComPalette: PokeComPalette: INCLUDE "gfx/tilesets/pokecom_center.pal" -LoadBattleTowerPalette: +LoadBattleTowerInsidePalette: ld a, BANK(wBGPals1) ld de, wBGPals1 - ld hl, BattleTowerPalette + ld hl, BattleTowerInsidePalette ld bc, 8 palettes call FarCopyWRAM ret -BattleTowerPalette: -INCLUDE "gfx/tilesets/battle_tower.pal" +BattleTowerInsidePalette: +INCLUDE "gfx/tilesets/battle_tower_inside.pal" LoadIcePathPalette: ld a, BANK(wBGPals1) |