ref: 2acccc3ea5d5ebdd54cddc6cb7a3c888428be286
parent: b333b18dbde658cd7e4299f8206d1d52c532b87a
author: yenatch <[email protected]>
date: Fri Aug 30 23:54:02 EDT 2013
rename FarBattleTextBox to StdBattleTextBox that's it for bad Far usage
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -154,7 +154,7 @@
; 'must recharge!'
ld hl, MustRechargeText
- call FarBattleTextBox
+ call StdBattleTextBox
call CantMove
jp Function0x34385
@@ -179,7 +179,7 @@
.WokeUp
; 'woke up!'
ld hl, WokeUpText
- call FarBattleTextBox
+ call StdBattleTextBox
call CantMove
call UpdateBattleMonInParty
@@ -195,7 +195,7 @@
.FastAsleep
; 'fast asleep!'
ld hl, FastAsleepText
- call FarBattleTextBox
+ call StdBattleTextBox
; Snore and Sleep Talk bypass sleep.
ld a, [CurPlayerMove]
@@ -221,7 +221,7 @@
; 'frozen solid!'
ld hl, FrozenSolidText
- call FarBattleTextBox
+ call StdBattleTextBox
call CantMove
jp Function0x34385
@@ -236,7 +236,7 @@
; 'flinched!'
ld hl, FlinchedText
- call FarBattleTextBox
+ call StdBattleTextBox
call CantMove
jp Function0x34385
@@ -256,7 +256,7 @@
; 'disabled no more!'
ld hl, DisabledNoMoreText
- call FarBattleTextBox
+ call StdBattleTextBox
.CheckConfused
@@ -272,7 +272,7 @@
; 'confused no more!'
ld hl, ConfusedNoMoreText
- call FarBattleTextBox
+ call StdBattleTextBox
jr .CheckAttract
@@ -280,7 +280,7 @@
.Confused
; 'confused!'
ld hl, IsConfusedText
- call FarBattleTextBox
+ call StdBattleTextBox
xor a
ld [$cfca], a
@@ -310,7 +310,7 @@
; 'in love with'
ld hl, InLoveWithText
- call FarBattleTextBox
+ call StdBattleTextBox
xor a
ld [$cfca], a
@@ -325,7 +325,7 @@
; 'infatuation kept it from attacking!'
ld hl, InfatuationText
- call FarBattleTextBox
+ call StdBattleTextBox
call CantMove
jp Function0x34385
@@ -359,7 +359,7 @@
; 'fully paralyzed!'
ld hl, FullyParalyzedText
- call FarBattleTextBox
+ call StdBattleTextBox
call CantMove
jp Function0x34385
; 341f0
@@ -412,7 +412,7 @@
; 'must recharge!'
ld hl, MustRechargeText
- call FarBattleTextBox
+ call StdBattleTextBox
call CantMove
jp Function0x34385
@@ -429,7 +429,7 @@
; 'fast asleep!'
ld hl, FastAsleepText
- call FarBattleTextBox
+ call StdBattleTextBox
xor a
ld [$cfca], a
ld de, ANIM_SLEEP
@@ -440,7 +440,7 @@
.WokeUp
; 'woke up!'
ld hl, WokeUpText
- call FarBattleTextBox
+ call StdBattleTextBox
call CantMove
call UpdateEnemyMonInParty
ld hl, $6036
@@ -475,7 +475,7 @@
; 'frozen solid!'
ld hl, FrozenSolidText
- call FarBattleTextBox
+ call StdBattleTextBox
call CantMove
jp Function0x34385
@@ -489,7 +489,7 @@
; 'flinched!'
ld hl, FlinchedText
- call FarBattleTextBox
+ call StdBattleTextBox
call CantMove
jp Function0x34385
@@ -511,7 +511,7 @@
; 'disabled no more!'
ld hl, DisabledNoMoreText
- call FarBattleTextBox
+ call StdBattleTextBox
.CheckConfused
@@ -528,7 +528,7 @@
; 'confused no more!'
ld hl, ConfusedNoMoreText
- call FarBattleTextBox
+ call StdBattleTextBox
jr .CheckAttract
@@ -536,7 +536,7 @@
.Confused
; 'confused!'
ld hl, IsConfusedText
- call FarBattleTextBox
+ call StdBattleTextBox
xor a
ld [$cfca], a
@@ -555,7 +555,7 @@
; 'hurt itself in its confusion!'
ld hl, HurtItselfText
- call FarBattleTextBox
+ call StdBattleTextBox
call Function0x355dd
@@ -589,7 +589,7 @@
; 'in love with'
ld hl, InLoveWithText
- call FarBattleTextBox
+ call StdBattleTextBox
xor a
ld [$cfca], a
@@ -604,7 +604,7 @@
; 'infatuation kept it from attacking!'
ld hl, InfatuationText
- call FarBattleTextBox
+ call StdBattleTextBox
call CantMove
jp Function0x34385
@@ -639,7 +639,7 @@
; 'fully paralyzed!'
ld hl, FullyParalyzedText
- call FarBattleTextBox
+ call StdBattleTextBox
call CantMove
@@ -668,7 +668,7 @@
; 'disabled!'
ld hl, DisabledMoveText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 343a5
@@ -676,7 +676,7 @@
; 'hurt itself in its confusion!'
ld hl, HurtItselfText
- call FarBattleTextBox
+ call StdBattleTextBox
xor a
ld [CriticalHit], a
@@ -854,7 +854,7 @@
; 'won't obey!'
ld hl, WontObeyText
- call FarBattleTextBox
+ call StdBattleTextBox
call HitConfusion
@@ -898,7 +898,7 @@
ld hl, IgnoredOrdersText
- call FarBattleTextBox
+ call StdBattleTextBox
jp Function0x3450c
@@ -1043,7 +1043,7 @@
; 'ignored orders…sleeping!'
ld hl, IgnoredSleepingText
- call FarBattleTextBox
+ call StdBattleTextBox
call EndMoveEffect
@@ -1192,7 +1192,7 @@
; 'but no pp is left for the move'
ld hl, NoPPLeftText
- call FarBattleTextBox
+ call StdBattleTextBox
ld b, 1
ret
; 34602
@@ -2471,7 +2471,7 @@
; 'protecting itself!'
ld hl, ProtectingItselfText
- call FarBattleTextBox
+ call StdBattleTextBox
ld c, 40
call DelayFrames
@@ -3014,7 +3014,7 @@
dec a
jr nz, .asm_350ab ; 350a3 $6
ld hl, EnduredText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_350ab
call GetOpponentItem
@@ -3023,7 +3023,7 @@
call GetItemName
ld hl, HungOnText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_50bb
ld a, BATTLE_VARS_SUBSTATUS4_OPP
@@ -3105,7 +3105,7 @@
ld [hl], a
.asm_3513e
ld hl, CrashedText
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, $1
ld [$c689], a
call Function0x37e36
@@ -3123,7 +3123,7 @@
ld h, d
ld l, e
.asm_35162
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 35165
@@ -3157,7 +3157,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- call FarBattleTextBox
+ call StdBattleTextBox
xor a
ld [CriticalHit], a
@@ -3211,7 +3211,7 @@
jr nc, .print
ld hl, NotVeryEffectiveText ; 'not very effective'
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 351c0
@@ -3237,7 +3237,7 @@
jr z, .asm_35231
ld hl, TookDownWithItText
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, [hBattleTurn]
and a
@@ -3332,7 +3332,7 @@
call SwitchTurn
ld hl, RageBuildingText
- call FarBattleTextBox
+ call StdBattleTextBox
jp SwitchTurn
; 3527b
@@ -3822,7 +3822,7 @@
ld a, $1
ld [$c72d], a
ld hl, BeatUpAttackText
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, [EnemyMonSpecies]
ld [CurSpecies], a
call $3856
@@ -3923,11 +3923,11 @@
ld [$d265], a
call $343b
ld hl, BeatUpAttackText
- call FarBattleTextBox
+ call StdBattleTextBox
jp EnemyAttackDamage
.asm_3557d
ld hl, BeatUpAttackText
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, [BattleMonSpecies]
ld [CurSpecies], a
call GetBaseData
@@ -4626,7 +4626,7 @@
call Function0x37e01
ld hl, GotAnEncoreText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 35923
@@ -4673,7 +4673,7 @@
rst FarCall
ld hl, SharedPainText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_3597d
ld a, [hld]
@@ -4815,7 +4815,7 @@
ld a, $29
call Predef
ld hl, $5452
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_35a50
jp Function0x37354
; 35a53
@@ -4835,7 +4835,7 @@
call Function0x37e01
ld hl, TookAimText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_35a6e
call Function0x37e77
@@ -4938,7 +4938,7 @@
call Function0x37e01
ld hl, SketchedText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_35b10
call Function0x37e77
@@ -5131,7 +5131,7 @@
set 6, [hl]
call Function0x37e01
ld hl, DestinyBondEffectText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 35c0f
@@ -5216,7 +5216,7 @@
ld a, d
ld [$d265], a
ld hl, SpiteEffectText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_35c91
jp PrintDidntAffect2
; 35c94
@@ -5294,7 +5294,7 @@
call Function0x37e01
ld hl, BellChimedText
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, [hBattleTurn]
and a
@@ -5452,7 +5452,7 @@
Function0x35de0: ; 35de0
ld hl, SubTookDamageText
- call FarBattleTextBox
+ call StdBattleTextBox
ld de, $c6e0
ld a, [hBattleTurn]
@@ -5479,7 +5479,7 @@
res 4, [hl]
ld hl, SubFadedText
- call FarBattleTextBox
+ call StdBattleTextBox
call SwitchTurn
call BattleCommanda7
@@ -5587,7 +5587,7 @@
call RefreshBattleHuds
ld hl, FellAsleepText
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, $f
ld hl, $5de9
@@ -5600,7 +5600,7 @@
push hl
call Function0x37e77
pop hl
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 35ece
@@ -5664,7 +5664,7 @@
call RefreshBattleHuds
ld hl, WasPoisonedText
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, $f
ld hl, $5de9
@@ -5729,7 +5729,7 @@
call Function0x35fc0
ld hl, WasPoisonedText
- call FarBattleTextBox
+ call StdBattleTextBox
jr .asm_35fb1 ; 35fa2 $d
.asm_35fa4
@@ -5739,7 +5739,7 @@
call Function0x35fc0
ld hl, BadlyPoisonedText
- call FarBattleTextBox
+ call StdBattleTextBox
.asm_35fb1
ld a, $f
@@ -5751,7 +5751,7 @@
push hl
call Function0x37e77
pop hl
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 35fc0
@@ -5807,7 +5807,7 @@
; draintarget
call Function0x36011
ld hl, SuckedHealthText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 36008
@@ -5815,7 +5815,7 @@
; eatdream
call Function0x36011
ld hl, DreamEatenText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 36011
@@ -5938,7 +5938,7 @@
call RefreshBattleHuds
ld hl, WasBurnedText
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, $f
ld hl, $5de9
@@ -5970,7 +5970,7 @@
call UpdateOpponentInParty
ld hl, DefrostedOpponentText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 36102
@@ -6011,7 +6011,7 @@
call RefreshBattleHuds
ld hl, WasFrozenText
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, $f
ld hl, $5de9
@@ -6596,7 +6596,7 @@
inc b
call GetStatName
ld hl, WontRiseAnymoreText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3646a
@@ -6612,7 +6612,7 @@
jp z, TryPrintButItFailed
dec a
ld hl, ProtectedByMistText
- jp z, FarBattleTextBox
+ jp z, StdBattleTextBox
ld a, [LoweredStat]
and $f
ld b, a
@@ -6619,7 +6619,7 @@
inc b
call GetStatName
ld hl, WontDropAnymoreText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3648f
@@ -6972,7 +6972,7 @@
res 0, [hl]
ld hl, UnleashedEnergyText
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, BATTLE_VARS_MOVE_POWER
call GetBattleVarPair
@@ -7018,7 +7018,7 @@
.asm_366dc
ld hl, StoringEnergyText
- call FarBattleTextBox
+ call StdBattleTextBox
jp EndMoveEffect
; 366e5
@@ -7199,7 +7199,7 @@
call Function0x36804
ld hl, FledFromBattleText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 36804
@@ -7305,7 +7305,7 @@
rst FarCall
ld hl, DraggedOutText
- call FarBattleTextBox
+ call StdBattleTextBox
ld hl, $5c23
jp CallBankF
@@ -7402,7 +7402,7 @@
call CallBankF
ld hl, DraggedOutText
- call FarBattleTextBox
+ call StdBattleTextBox
ld hl, $5c23
jp CallBankF
@@ -7428,7 +7428,7 @@
jr z, .asm_36991
ld hl, BlownAwayText
.asm_36991
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 36994
@@ -7569,7 +7569,7 @@
call CleanGetBattleVarPair
cp EFFECT_BEAT_UP
jr z, .asm_36a67
- call FarBattleTextBox
+ call StdBattleTextBox
.asm_36a67
pop bc
@@ -7767,7 +7767,7 @@
ld hl, IgnoredOrders2Text
ld a, [AlreadyDisobeyed]
and a
- call nz, FarBattleTextBox
+ call nz, StdBattleTextBox
call BattleCommand0a
xor a
@@ -7941,7 +7941,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp FarBattleTextBox
+ jp StdBattleTextBox
.Traps
dbw BIND, UsedBindText ; 'used BIND on'
@@ -7962,7 +7962,7 @@
set 1, [hl]
call Function0x37e01
ld hl, MistText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_36c92
call Function0x37e77
jp PrintButItFailed
@@ -7979,7 +7979,7 @@
set 2, [hl]
call Function0x37e01
ld hl, GettingPumpedText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_36cac
call Function0x37e77
jp PrintButItFailed
@@ -8048,7 +8048,7 @@
call Predef
call RefreshBattleHuds
ld hl, RecoilText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 36d1d
@@ -8085,7 +8085,7 @@
call GetItemName
call Function0x37e77
ld hl, ProtectedByText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_36d53
ld a, BATTLE_VARS_SUBSTATUS3_OPP
@@ -8094,7 +8094,7 @@
jr z, .asm_36d65
call Function0x37e77
ld hl, AlreadyConfusedText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_36d65
call CheckSubstituteOpp
@@ -8137,7 +8137,7 @@
call Function0x37e54
ld hl, BecameConfusedText
- call FarBattleTextBox
+ call StdBattleTextBox
call GetOpponentItem
ld a, b
@@ -8182,7 +8182,7 @@
call GetItemName
call Function0x37e77
ld hl, ProtectedByText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_36def
ld a, [hBattleTurn]
and a
@@ -8227,7 +8227,7 @@
.asm_36e49
call Function0x37e77
ld hl, AlreadyParalyzedText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_36e52
jp PrintDidntAffect2
.asm_36e55
@@ -8338,7 +8338,7 @@
call BattleCommanda6
.asm_36eeb
ld hl, MadeSubstituteText
- call FarBattleTextBox
+ call StdBattleTextBox
jp RefreshBattleHuds
.asm_36ef4
call Function0x34548
@@ -8350,7 +8350,7 @@
call nz, BattleCommand0c
ld hl, TooWeakSubText
.asm_36f08
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 36f0b
BattleCommand32: ; 36f0b
@@ -8463,7 +8463,7 @@
call GetMoveName
call Function0x37e01
ld hl, LearnedMoveText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_36f9a
jp Function0x37357
; 36f9d
@@ -8496,7 +8496,7 @@
set 7, [hl]
call Function0x37e01
ld hl, WasSeededText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_36fd2
call Function0x37e77
jp PrintDoesntAffect
@@ -8503,7 +8503,7 @@
.asm_36fd8
call Function0x37e77
ld hl, EvadedText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 36fe1
@@ -8579,7 +8579,7 @@
ld [$d265], a
call GetMoveName
ld hl, WasDisabledText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_37059
jp Function0x37354
; 3705c
@@ -8608,7 +8608,7 @@
inc [hl]
.asm_37079
ld hl, CoinsScatteredText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3707f
@@ -8706,7 +8706,7 @@
rst FarCall
call Function0x37e01
ld hl, TransformedTypeText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3710e
@@ -8733,7 +8733,7 @@
call Function0x37e01
ld hl, EliminatedStatsText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.Fill
ld b, PlayerStatLevelsEnd - PlayerStatLevels
@@ -8787,7 +8787,7 @@
jr z, .asm_37186 ; 37181 $3
ld hl, RestedText
.asm_37186
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, [hBattleTurn]
and a
jr nz, .asm_37193 ; 3718c $5
@@ -8816,12 +8816,12 @@
call UpdateUserInParty
call RefreshBattleHuds
ld hl, RegainedHealthText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_371c4
call Function0x37e77
ld hl, HPIsFullText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 371cd
@@ -8958,7 +8958,7 @@
ld a, $a4
call nz, Function0x37e44
ld hl, TransformedText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 372c6
@@ -9056,7 +9056,7 @@
.asm_37331
call Function0x37e01
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_37337
call Function0x37e77
@@ -9067,7 +9067,7 @@
PrintDoesntAffect: ; 3733d
; 'it doesn't affect'
ld hl, DoesntAffectText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 37343
@@ -9074,7 +9074,7 @@
PrintNothingHappened: ; 37343
; 'but nothing happened!'
ld hl, NothingHappenedText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 37349
@@ -9090,7 +9090,7 @@
PrintButItFailed: ; 3734e
; 'but it failed!'
ld hl, ButItFailedText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 37354
@@ -9109,7 +9109,7 @@
PrintDidntAffect: ; 37360
; 'it didn't affect'
ld hl, DidntAffect1Text
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 37366
@@ -9124,7 +9124,7 @@
PrintParalyze: ; 37372
; 'paralyzed! maybe it can't attack!'
ld hl, ParalyzedText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 37378
@@ -9189,7 +9189,7 @@
.asm_373de
call Function0x37e77
ld hl, MirrorMoveFailedText
- call FarBattleTextBox
+ call StdBattleTextBox
jp EndMoveEffect
.asm_373ea
ld a, b
@@ -9391,7 +9391,7 @@
.asm_374f8
call GetItemName
ld hl, StoleText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_37501
ld a, 1
@@ -9422,7 +9422,7 @@
set 7, [hl]
call Function0x37e01
ld hl, CantEscapeNowText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_37530
call Function0x37e77
jp PrintButItFailed
@@ -9447,7 +9447,7 @@
set 0, [hl]
call Function0x37e01
ld hl, StartedNightmareText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_3755d
call Function0x37e77
jp PrintButItFailed
@@ -9475,7 +9475,7 @@
.asm_3757f
call RefreshBattleHuds
ld hl, WasDefrostedText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 37588
@@ -9536,7 +9536,7 @@
call CallBankF
call UpdateUserInParty
ld hl, PutACurseText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_37604
call Function0x37e77
jp PrintButItFailed
@@ -9545,7 +9545,7 @@
call GetStatName
call Function0x37e77
ld hl, WontRiseAnymoreText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 37618
@@ -9559,7 +9559,7 @@
set 2, [hl]
call Function0x37e01
ld hl, ProtectedItselfText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3762c
@@ -9631,7 +9631,7 @@
set SUBSTATUS_ENDURE, [hl]
call Function0x37e01
ld hl, BracedItselfText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 37683
@@ -9651,7 +9651,7 @@
set 0, [hl]
call Function0x37e01
ld hl, SpikesText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.failed
jp Function0x37354
@@ -9673,7 +9673,7 @@
set SUBSTATUS_IDENTIFIED, [hl]
call Function0x37e01
ld hl, IdentifiedText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_376bf
jp Function0x37354
; 376c2
@@ -9706,7 +9706,7 @@
.asm_376e9
call Function0x37e01
ld hl, StartPerishText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_376f2
call Function0x37e77
jp PrintButItFailed
@@ -9725,7 +9725,7 @@
ld [WeatherCount], a
call Function0x37e01
ld hl, SandstormBrewedText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_37712
call Function0x37e77
jp PrintButItFailed
@@ -9911,7 +9911,7 @@
; 'fell in love!'
ld hl, FellInLoveText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_377f2
jp Function0x37354
@@ -10071,7 +10071,7 @@
call CallBankF
call SwitchTurn
ld hl, RegainedHealthText
- call FarBattleTextBox
+ call StdBattleTextBox
call SwitchTurn
call UpdateOpponentInParty
jr .asm_37904 ; 378f1 $11
@@ -10081,7 +10081,7 @@
jr nc, .asm_37904 ; 378f9 $9
call Function0x37e77
ld hl, RefusedGiftText
- call FarBattleTextBox
+ call StdBattleTextBox
.asm_37904
jp EndMoveEffect
@@ -10141,7 +10141,7 @@
ld [de], a
call Function0x37e01
ld hl, CoveredByVeilText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_3795c
call Function0x37e77
jp PrintButItFailed
@@ -10177,7 +10177,7 @@
ld [AttackMissed], a
call BattleCommandaa
ld hl, SafeguardProtectText
- call FarBattleTextBox
+ call StdBattleTextBox
jp EndMoveEffect
; 37991
@@ -10204,7 +10204,7 @@
ld [$d265], a
call BattleCommandaa
ld hl, MagnitudeText
- call FarBattleTextBox
+ call StdBattleTextBox
pop de
pop bc
ret
@@ -10485,7 +10485,7 @@
jr z, .asm_37b4a ; 37b40 $8
res 7, [hl]
ld hl, ShedLeechSeedText
- call FarBattleTextBox
+ call StdBattleTextBox
.asm_37b4a
ld hl, PlayerScreens
ld de, $c730
@@ -10500,7 +10500,7 @@
res 0, [hl]
ld hl, BlewSpikesText
push de
- call FarBattleTextBox
+ call StdBattleTextBox
pop de
.asm_37b69
ld a, [de]
@@ -10509,7 +10509,7 @@
xor a
ld [de], a
ld hl, ReleasedByText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 37b74
@@ -10600,7 +10600,7 @@
; 'regained health!'
ld hl, RegainedHealthText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.Full
call Function0x37e77
@@ -10607,7 +10607,7 @@
; 'hp is full!'
ld hl, HPIsFullText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.Multipliers
dw GetEighthMaxHP
@@ -10636,7 +10636,7 @@
ld [WeatherCount], a
call Function0x37e01
ld hl, DownpourText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 37c07
@@ -10648,7 +10648,7 @@
ld [WeatherCount], a
call Function0x37e01
ld hl, SunGotBrightText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 37c1a
@@ -10685,7 +10685,7 @@
jr nz, .asm_37c41 ; 37c47 $f8
ld hl, BellyDrumText
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_37c4f
call Function0x37e77
jp PrintButItFailed
@@ -10735,7 +10735,7 @@
.asm_37c8c
call Function0x37e01
ld hl, CopiedStatsText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 37c95
@@ -10884,7 +10884,7 @@
call BattleCommand0a
call BattleCommandaa
ld hl, ForesawAttackText
- call FarBattleTextBox
+ call StdBattleTextBox
call BattleCommand0c
ld de, $c727
ld a, [hBattleTurn]
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -1212,7 +1212,7 @@
call $7789
ld hl, $4d81
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, $0
--- a/main.asm
+++ b/main.asm
@@ -8178,11 +8178,12 @@
BattleTextBox: ; 3ac3
+; Open a textbox and print text at hl.
push hl
call SpeechTextBox
call MobileTextBorder
- call Function1ad2 ; UpdateSprites
- call Function321c ; refresh?
+ call Function1ad2
+ call Function321c
pop hl
call PrintTextBoxText
ret
@@ -8189,13 +8190,13 @@
; 3ad5
-FarBattleTextBox: ; 3ad5
-; Open a textbox and print text at 20:hl.
+StdBattleTextBox: ; 3ad5
+; Open a textbox and print battle text at 20:hl.
ld a, [hROMBank]
push af
- ld a, $20
+ ld a, BANK(BattleText)
rst Bankswitch
call BattleTextBox
@@ -36361,7 +36362,7 @@
ld hl, $5863
.asm_3c115
- call FarBattleTextBox
+ call StdBattleTextBox
.asm_3c118
call Function3ceec
@@ -36624,7 +36625,7 @@
ld [hl], a
call GetItemName
ld hl, $4bde
- call FarBattleTextBox
+ call StdBattleTextBox
callab BattleCommand8c
pop af
bit 7, a
@@ -36635,7 +36636,7 @@
call Function3ee0f
call Function3c8e4
ld hl, $4d97
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3c300
Function3c300: ; 3c300
@@ -36945,7 +36946,7 @@
res 4, [hl]
call SetEnemyTurn
ld hl, $4c8a
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_3c518
ld hl, EnemySubStatus5
@@ -36969,7 +36970,7 @@
res 4, [hl]
call SetPlayerTurn
ld hl, $4c8a
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3c543
@@ -37278,7 +37279,7 @@
.asm_3c733
push de
- call FarBattleTextBox
+ call StdBattleTextBox
pop de
xor a
ld [$cfca], a
@@ -37332,7 +37333,7 @@
ld [hBGMapMode], a
call Function3ccef
ld hl, $480e
- call FarBattleTextBox
+ call StdBattleTextBox
.asm_3c7a1
call Function3c706
@@ -37348,7 +37349,7 @@
call GetQuarterMaxHP
call Function3cc3f
ld hl, $4822
- call FarBattleTextBox
+ call StdBattleTextBox
.asm_3c7c5
call Function3c706
@@ -37364,7 +37365,7 @@
call GetQuarterMaxHP
call Function3cc3f
ld hl, $4836
- call FarBattleTextBox
+ call StdBattleTextBox
.asm_3c7e9
ld hl, BattleMonHP
@@ -37415,7 +37416,7 @@
ld [$d265], a
push af
ld hl, $4864
- call FarBattleTextBox
+ call StdBattleTextBox
pop af
ret nz
ld a, $0
@@ -37510,7 +37511,7 @@
ld hl, $4df5
.asm_3c8e1
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3c8e4
Function3c8e4: ; 3c8e4
@@ -37563,7 +37564,7 @@
call Function3c8e4
call Function3ccef
ld hl, $4880
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3c93c
Function3c93c: ; 3c93c
@@ -37702,7 +37703,7 @@
call Function3ddc8
call Function3c8e4
ld hl, $4899
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3ca26
Function3ca26: ; 3ca26
@@ -37733,7 +37734,7 @@
cp $1
ret nz
ld hl, $48b6
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, $10
call GetBattleVarPair
push af
@@ -37784,7 +37785,7 @@
call UpdateBattleHuds
call SetEnemyTurn
ld hl, $524b
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_3cac9
ld a, [EnemyMonStatus]
@@ -37810,7 +37811,7 @@
call UpdateBattleHuds
call SetPlayerTurn
ld hl, $524b
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3cafb
Function3cafb: ; 3cafb
@@ -37847,7 +37848,7 @@
.asm_3cb2e
ld [hBattleTurn], a
ld hl, $48d2
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3cb36
@@ -37904,7 +37905,7 @@
push hl
push de
ld hl, BattleText_0x808e7
- call FarBattleTextBox
+ call StdBattleTextBox
pop de
pop hl
ret
@@ -37918,7 +37919,7 @@
ret nz
res SCREENS_REFLECT, [hl]
ld hl, BattleText_0x80905
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3cb9e
HandleWeather: ; 3cb9e
@@ -37991,7 +37992,7 @@
call Function3cc3f
ld hl, BattleText_0x8084d
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_3cc13
ld hl, .WeatherEndedMessages
@@ -38010,7 +38011,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3cc2d
.WeatherMessages
@@ -38521,7 +38522,7 @@
ld bc, $050b
call ClearBox
ld hl, BattleText_0x80a75
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3cf14
Function3cf14: ; 3cf14
@@ -38535,7 +38536,7 @@
ld bc, $040a
call ClearBox
ld hl, BattleText_0x809a8
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3cf35
Function3cf35: ; 3cf35
@@ -38620,7 +38621,7 @@
call z, Function3d0ea
callab Function39939
ld hl, BattleText_0x809da
- call FarBattleTextBox
+ call StdBattleTextBox
call Function3d2f1
jr z, .asm_3cff5
ld a, [InLinkBattle]
@@ -38729,11 +38730,11 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp FarBattleTextBox
+ jp StdBattleTextBox
.asm_3d07b
ld hl, BattleText_0x809be
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3d081
Function3d081: ; 3d081
@@ -39013,7 +39014,7 @@
dec a
ret nz
ld hl, BattleText_0x80a83
- call FarBattleTextBox
+ call StdBattleTextBox
.asm_3d20a
ld bc, $0107
call Function1dd2
@@ -39188,7 +39189,7 @@
cp [hl]
jr nz, .asm_3d360
ld hl, BattleText_0x80c0d
- call FarBattleTextBox
+ call StdBattleTextBox
scf
ret
@@ -39309,7 +39310,7 @@
jr z, .asm_3d417
.asm_3d412
- call FarBattleTextBox
+ call StdBattleTextBox
.end
scf
@@ -39827,7 +39828,7 @@
push af
callab Function39939
ld hl, BattleText_0x80aca
- call FarBattleTextBox
+ call StdBattleTextBox
ld bc, $0107
call Function1dd2
ld a, [$cfa9]
@@ -39878,7 +39879,7 @@
Function3d7b8: ; 3d7b8
callab Function39939
ld hl, BattleText_0x80af8
- call FarBattleTextBox
+ call StdBattleTextBox
jp WaitBGMap
; 3d7c7
@@ -40009,7 +40010,7 @@
ld hl, BattleText_0x80b0b
.asm_3d8ae
- call FarBattleTextBox
+ call StdBattleTextBox
.asm_3d8b1
xor a
@@ -40063,7 +40064,7 @@
call SetPlayerTurn
call GetItemName
ld hl, BattleText_0x80b89
- call FarBattleTextBox
+ call StdBattleTextBox
jp .asm_3d9a2
.asm_3d916
@@ -40140,7 +40141,7 @@
ld hl, BattleText_0x80b49
.asm_3d995
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, $1
ld [$d266], a
call Function309d
@@ -40183,7 +40184,7 @@
pop de
call WaitSFX
ld hl, BattleText_0x80b77
- call FarBattleTextBox
+ call StdBattleTextBox
call WaitSFX
call Function309d
scf
@@ -40195,7 +40196,7 @@
bit 4, [hl]
jr nz, .asm_3da05
ld hl, BattleText_0x81863
- call FarBattleTextBox
+ call StdBattleTextBox
.asm_3da05
call WaitSFX
@@ -40488,7 +40489,7 @@
ret z
push bc
ld hl, BattleText_0x80bae
- call FarBattleTextBox
+ call StdBattleTextBox
call GetEighthMaxHP
call Function3cc39
pop hl
@@ -40565,7 +40566,7 @@
ld hl, BattleText_0x809a8
.asm_3dcdf
- call FarBattleTextBox
+ call StdBattleTextBox
scf
ret
@@ -40701,7 +40702,7 @@
ld a, $9
rst FarCall
ld hl, RecoveredUsingText
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3ddc8
@@ -40812,7 +40813,7 @@
call GetItemName
call Function3ddc8
ld hl, BattleText_0x80dab
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, [hBattleTurn]
and a
jr nz, .asm_3de90
@@ -40892,7 +40893,7 @@
ld [de], a
call GetItemName
ld hl, BattleText_0x80bde
- call FarBattleTextBox
+ call StdBattleTextBox
callab BattleCommand8c
ret
@@ -41328,7 +41329,7 @@
bit 4, [hl]
jr nz, .asm_3e1c5
ld hl, $5863
- call FarBattleTextBox
+ call StdBattleTextBox
ld c, $3c
call DelayFrames
@@ -41391,7 +41392,7 @@
Function3e22b: ; 3e22b
ld hl, BattleText_0x80bf3
- call FarBattleTextBox
+ call StdBattleTextBox
jp Function3e139
; 3e234
@@ -41546,7 +41547,7 @@
cp d
jr nz, .asm_3e36b
ld hl, BattleText_0x80c0d
- call FarBattleTextBox
+ call StdBattleTextBox
jp $6299
.asm_3e36b
@@ -41559,7 +41560,7 @@
.asm_3e378
ld hl, BattleText_0x80c22
- call FarBattleTextBox
+ call StdBattleTextBox
jp $6299
.asm_3e381
@@ -41919,7 +41920,7 @@
ld hl, Function3cc39
.asm_3e613
- call FarBattleTextBox
+ call StdBattleTextBox
call Function30b4
jp Function3e4bc
; 3e61c
@@ -42168,7 +42169,7 @@
.asm_3e7b4
ld hl, BattleText_0x80c72
- call FarBattleTextBox
+ call StdBattleTextBox
ld c, $3c
call DelayFrames
xor a
@@ -43811,7 +43812,7 @@
call StartSFX
call WaitSFX
ld hl, BattleText_0x80c9c
- call FarBattleTextBox
+ call StdBattleTextBox
call Function309d
.asm_3f057
@@ -44064,7 +44065,7 @@
rst FarCall
call WaitSFX
ld hl, BattleText_0x80c9c
- call FarBattleTextBox
+ call StdBattleTextBox
pop de
inc e
ld b, $0
@@ -44353,7 +44354,7 @@
push hl
call Function30b4
pop hl
- jp FarBattleTextBox
+ jp StdBattleTextBox
; 3f390
@@ -44912,7 +44913,7 @@
ld de, $d850
call Function3d0be
ld hl, BattleText_0x80730
- call FarBattleTextBox
+ call StdBattleTextBox
ld a, [$cfc0]
bit 0, a
ret z
@@ -45752,7 +45753,7 @@
ld hl, $4000
rst FarCall
pop hl
- call FarBattleTextBox
+ call StdBattleTextBox
call Function3f830
ret nz
@@ -54111,6 +54112,7 @@
INCBIN "baserom.gbc", $80648, $80730-$80648
+BattleText:
INCLUDE "text/battle.asm"
INCBIN "baserom.gbc", $818ac, $81fe3-$818ac
@@ -68010,7 +68012,7 @@
ld hl, $4c39
.asm_100c6b
- call FarBattleTextBox
+ call StdBattleTextBox
call Function30b4
jp Function100bc2
; 100c74