ref: b6ab385d3c02f32986e3b61d7166c62263cec6a5
parent: 62c621d5ad47cc827d6a5b0579e4875222685f75
author: yenatch <yenatch@gmail.com>
date: Wed Mar 27 13:07:00 EDT 2013
More battletexts
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -1037,7 +1037,7 @@
ret z
; 'ignored orders…sleeping!'
- ld hl, $4f7b
+ ld hl, IgnoredSleepingText
call FarBattleTextBox
call EndMoveEffect
@@ -1182,10 +1182,10 @@
call IsInArray
; 'has no pp left for [move]'
- ld hl, $4fba
+ ld hl, HasNoPPLeftText
jr c, .print
; 'but no pp is left for the move'
- ld hl, $4f99
+ ld hl, NoPPLeftText
call FarBattleTextBox
ld b, $1
@@ -2425,7 +2425,7 @@
call DelayFrames
; 'protecting itself!'
- ld hl, BattleText_0x8167a
+ ld hl, ProtectingItselfText
call FarBattleTextBox
ld c, 40
@@ -2882,7 +2882,7 @@
BattleCommand0d: ; 35023
-
+; resulttext
ld a, [AttackMissed]
and a
ret z
@@ -2922,11 +2922,13 @@
BattleCommand0e: ; 3505e
+; checkfaint
+
ld a, BATTLE_VARS_SUBSTATUS1_OPP
call CleanGetBattleVarPair
bit 5, a
jr z, .asm_35072 ; 35065 $b
- call $5c94
+ call BattleCommand4b
ld b, $0
jr nc, .asm_3508b ; 3506c $1d
ld b, $1
@@ -2941,7 +2943,7 @@
call FarBattleRNG
cp c
jr nc, .asm_3508b ; 35080 $9
- call $5c94
+ call BattleCommand4b
ld b, $0
jr nc, .asm_3508b ; 35087 $2
ld b, $2
@@ -2965,7 +2967,7 @@
ret z
dec a
jr nz, .asm_350ab ; 350a3 $6
- ld hl, $4eb0
+ ld hl, EnduredText
jp FarBattleTextBox
.asm_350ab
@@ -2973,7 +2975,8 @@
ld a, [hl]
ld [$d265], a
call $3468
- ld hl, $4e99
+
+ ld hl, HungOnText
jp FarBattleTextBox
.asm_50bb
@@ -3009,8 +3012,8 @@
; 350e4
- ld hl, $5071
- ld de, $5071
+ ld hl, DoesntAffectText
+ ld de, DoesntAffectText
ld a, [TypeModifier]
and $7f
jr z, .asm_35110 ; 0x350ef $1f
@@ -3017,15 +3020,15 @@
ld a, $d
call CleanGetBattleVarPair
cp $94
- ld hl, $54f0
- ld de, $5500
+ ld hl, ButItFailedText
+ ld de, ItFailedText
jr z, .asm_35110 ; 0x350fe $10
- ld hl, $5020
- ld de, $5033
+ ld hl, AttackMissedText
+ ld de, AttackMissed2Text
ld a, [CriticalHit]
cp $ff
jr nz, .asm_35110 ; 0x3510b $3
- ld hl, $5061
+ ld hl, UnaffectedText
.asm_35110
call Function0x35157
xor a
@@ -3054,7 +3057,7 @@
inc a
ld [hl], a
.asm_3513e
- ld hl, $5046
+ ld hl, CrashedText
call FarBattleTextBox
ld a, $1
ld [$c689], a
@@ -3117,8 +3120,8 @@
jp DelayFrames
.ptrs
- dw BattleText_0x81086 ; 'critical hit'
- dw BattleText_0x81097 ; 'one-hit ko'
+ dw CriticalHitText ; 'critical hit'
+ dw OneHitKOText ; 'one-hit ko'
; 35197
@@ -3157,9 +3160,9 @@
and $7f
cp 10 ; 1.0
ret z
- ld hl, BattleText_0x810aa ; 'super-effective'
+ ld hl, SuperEffectiveText ; 'super-effective'
jr nc, .print
- ld hl, BattleText_0x810c1 ; 'not very effective'
+ ld hl, NotVeryEffectiveText ; 'not very effective'
jp FarBattleTextBox
; 351c0
@@ -3186,7 +3189,7 @@
bit 6, a
jr z, .asm_35231
- ld hl, $50da
+ ld hl, TookDownWithItText
call FarBattleTextBox
ld a, [hBattleTurn]
and a
@@ -3279,7 +3282,7 @@
ld [de], a
call SwitchTurn
- ld hl, $50f3
+ ld hl, RageBuildingText
call FarBattleTextBox
jp SwitchTurn
; 3527b
@@ -4452,8 +4455,10 @@
call GetMoveData
.asm_3591a
call Function0x37e01
- ld hl, $5109
+
+ ld hl, GotAnEncoreText
jp FarBattleTextBox
+
.asm_35923
jp PrintDidntAffect2
; 35926
@@ -4495,7 +4500,8 @@
ld a, $5e
ld hl, $4000
rst FarCall
- ld hl, $511b
+
+ ld hl, SharedPainText
jp FarBattleTextBox
.asm_3597d
@@ -4649,8 +4655,10 @@
call GetBattleVarPair
set 5, [hl]
call Function0x37e01
- ld hl, $5136
+
+ ld hl, TookAimText
jp FarBattleTextBox
+
.asm_35a6e
call Function0x37e77
jp PrintDidntAffect
@@ -4750,8 +4758,10 @@
.asm_35b04
call $34f8
call Function0x37e01
- ld hl, $5143
+
+ ld hl, SketchedText
jp FarBattleTextBox
+
.asm_35b10
call Function0x37e77
jp PrintDidntAffect
@@ -4942,7 +4952,7 @@
call GetBattleVarPair
set 6, [hl]
call Function0x37e01
- ld hl, $5156
+ ld hl, DestinyBondEffectText
jp FarBattleTextBox
; 35c0f
@@ -5027,7 +5037,7 @@
pop de
ld a, d
ld [$d265], a
- ld hl, $517f
+ ld hl, SpiteEffectText
jp FarBattleTextBox
.asm_35c91
jp PrintDidntAffect2
@@ -5096,16 +5106,18 @@
ld [hl], a
ld h, d
ld l, e
- ld bc, $0030
+ ld bc, $30
ld d, $6
.asm_35ce9
ld [hl], a
add hl, bc
dec d
- jr nz, .asm_35ce9 ; 35cec $fb
+ jr nz, .asm_35ce9
call Function0x37e01
- ld hl, $51a0
+
+ ld hl, BellChimedText
call FarBattleTextBox
+
ld a, [hBattleTurn]
and a
jp z, Function0x365d7
@@ -5260,8 +5272,10 @@
Function0x35de0: ; 35de0
- ld hl, $53ad
+
+ ld hl, SubTookDamageText
call FarBattleTextBox
+
ld de, $c6e0
ld a, [hBattleTurn]
and a
@@ -5286,7 +5300,7 @@
call GetBattleVarPair
res 4, [hl]
- ld hl, $53d0
+ ld hl, SubFadedText
call FarBattleTextBox
call SwitchTurn
@@ -5348,8 +5362,9 @@
ld a, [hl]
ld [$d265], a
call $3468
- ld hl, $55a9
- jr .asm_35ec6 ; 35e6e $56
+ ld hl, ProtectedByText
+ jr .asm_35ec6
+
.asm_35e70
ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVarPair
@@ -5356,43 +5371,53 @@
ld d, h
ld e, l
ld a, [de]
- and $7
- ld hl, $51c1
- jr nz, .asm_35ec6 ; 35e7d $47
+ and 7
+ ld hl, AlreadyAsleepText
+ jr nz, .asm_35ec6
+
ld a, [AttackMissed]
and a
jp nz, PrintDidntAffect2
- ld hl, $550c
+
+ ld hl, DidntAffect1Text
call Function0x35ece
- jr c, .asm_35ec6 ; 35e8c $38
+ jr c, .asm_35ec6
+
ld a, [de]
and a
- jr nz, .asm_35ec6 ; 35e90 $34
+ jr nz, .asm_35ec6
+
call CheckSubstituteOpp
- jr nz, .asm_35ec6 ; 35e95 $2f
+ jr nz, .asm_35ec6
+
call Function0x37e01
ld b, $7
ld a, [$cfc0]
and a
- jr z, .asm_35ea4 ; 35ea0 $2
+ jr z, .asm_35ea4
ld b, $3
+
.asm_35ea4
call FarBattleRNG
and b
- jr z, .asm_35ea4 ; 35ea8 $fa
- cp $7
- jr z, .asm_35ea4 ; 35eac $f6
+ jr z, .asm_35ea4
+ cp 7
+ jr z, .asm_35ea4
inc a
ld [de], a
call $398e
call $39c9
- ld hl, $51b1
+
+ ld hl, FellAsleepText
call FarBattleTextBox
+
ld a, $f
ld hl, $5de9
rst FarCall
+
jp z, $4216
ret
+
.asm_35ec6
push hl
call Function0x37e77
@@ -5459,8 +5484,10 @@
ld de, $0106
call Function0x37e54
call $39c9
- ld hl, $51d5
+
+ ld hl, WasPoisonedText
call FarBattleTextBox
+
ld a, $f
ld hl, $5de9
rst FarCall
@@ -5471,7 +5498,7 @@
BattleCommand2f: ; 35f2c
; poison
- ld hl, $5071
+ ld hl, DoesntAffectText
ld a, [TypeModifier]
and $7f
jp z, $5fb8
@@ -5480,7 +5507,7 @@
ld a, BATTLE_VARS_STATUS_OPP
call CleanGetBattleVarPair
ld b, a
- ld hl, $51fa
+ ld hl, AlreadyPoisonedText
and $8
jp nz, $5fb8
call GetOpponentItem
@@ -5490,10 +5517,10 @@
ld a, [hl]
ld [$d265], a
call $3468
- ld hl, $55a9
+ ld hl, ProtectedByText
jr .asm_35fb8 ; 35f5d $59
.asm_35f5f
- ld hl, $550c
+ ld hl, DidntAffect1Text
ld a, BATTLE_VARS_STATUS_OPP
call CleanGetBattleVarPair
and a
@@ -5522,8 +5549,10 @@
call Function0x35fc9
jr z, .asm_35fa4 ; 35f97 $b
call Function0x35fc0
- ld hl, $51d5
+
+ ld hl, WasPoisonedText
call FarBattleTextBox
+
jr .asm_35fb1 ; 35fa2 $d
.asm_35fa4
set 0, [hl]
@@ -5530,13 +5559,16 @@
xor a
ld [de], a
call Function0x35fc0
- ld hl, $51e6
+
+ ld hl, BadlyPoisonedText
call FarBattleTextBox
+
.asm_35fb1
ld a, $f
ld hl, $5de9
rst FarCall
ret
+
.asm_35fb8
push hl
call Function0x37e77
@@ -5594,15 +5626,17 @@
BattleCommand15: ; 35fff
+; draintarget
call Function0x36011
- ld hl, $5210
+ ld hl, SuckedHealthText
jp FarBattleTextBox
; 36008
BattleCommand16: ; 36008
+; eatdream
call Function0x36011
- ld hl, $5227
+ ld hl, DreamEatenText
jp FarBattleTextBox
; 36011
@@ -5724,8 +5758,10 @@
ld de, $0105
call Function0x37e54
call $39c9
- ld hl, $523c
+
+ ld hl, WasBurnedText
call FarBattleTextBox
+
ld a, $f
ld hl, $5de9
rst FarCall
@@ -5754,7 +5790,8 @@
xor a
ld [hl], a
call $398e
- ld hl, $524b
+
+ ld hl, DefrostedOpponentText
jp FarBattleTextBox
; 36102
@@ -5794,8 +5831,10 @@
ld de, $0108
call Function0x37e54
call $39c9
- ld hl, $525d
+
+ ld hl, WasFrozenText
call FarBattleTextBox
+
ld a, $f
ld hl, $5de9
rst FarCall
@@ -6346,7 +6385,7 @@
ld b, a
inc b
call $648f
- ld hl, $5272
+ ld hl, WontRiseAnymoreText
jp FarBattleTextBox
; 3646a
@@ -6369,7 +6408,7 @@
ld b, a
inc b
call $648f
- ld hl, $528f
+ ld hl, WontDropAnymoreText
jp FarBattleTextBox
; 3648f
@@ -6714,8 +6753,10 @@
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarPair
res 0, [hl]
- ld hl, $4e84
+
+ ld hl, UnleashedEnergyText
call FarBattleTextBox
+
ld a, BATTLE_VARS_MOVE_POWER
call GetBattleVarPair
ld a, $1
@@ -6758,7 +6799,7 @@
jp SkipToBattleCommand
.asm_366dc
- ld hl, $4e6e
+ ld hl, StoringEnergyText
call FarBattleTextBox
jp EndMoveEffect
; 366e5
@@ -6937,7 +6978,8 @@
ld c, $14
call DelayFrames
call Function0x36804
- ld hl, $52ac
+
+ ld hl, FledFromBattleText
jp FarBattleTextBox
; 36804
@@ -7042,10 +7084,13 @@
ld hl, $54c3
ld a, $f
rst FarCall
- ld hl, $5544
+
+ ld hl, DraggedOutText
call FarBattleTextBox
+
ld hl, $5c23
jp CallBankF
+
.asm_368ca
jp $6969
@@ -7136,15 +7181,19 @@
ld [CurPartyMon], a
ld hl, $5b32
call CallBankF
- ld hl, $5544
+
+ ld hl, DraggedOutText
call FarBattleTextBox
+
ld hl, $5c23
jp CallBankF
+
.asm_36969
call BattleCommand0a
call BattleCommandaa
call BattleCommand0c
jp $734e
+
.asm_36975
push af
call $6804
@@ -7154,11 +7203,11 @@
ld c, $14
call DelayFrames
pop af
- ld hl, $52c1
+
+ ld hl, FledInFearText
cp $2e
jr z, .asm_36991
-
- ld hl, $52d2
+ ld hl, BlownAwayText
.asm_36991
jp FarBattleTextBox
; 36994
@@ -7284,19 +7333,22 @@
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarPair
res 2, [hl]
- ld hl, $52e5
+
+ ld hl, PlayerHitTimesText
ld a, [hBattleTurn]
and a
- jr z, .asm_36a5a ; 36a55 $3
- ld hl, $52f8
+ jr z, .asm_36a5a
+ ld hl, EnemyHitTimesText
.asm_36a5a
+
push bc
ld a, BATTLE_VARS_MOVE_EFFECT
call CleanGetBattleVarPair
cp $9a ; beat up
- jr z, .asm_36a67 ; 36a62 $3
+ jr z, .asm_36a67
call FarBattleTextBox
.asm_36a67
+
pop bc
xor a
ld [bc], a
@@ -7477,19 +7529,23 @@
ld a, BATTLE_VARS_STATUS
call CleanGetBattleVarPair
and $7
- jr z, .asm_36b65 ; 36b57 $c
+ jr z, .asm_36b65
+
call BattleCommandaa
call BattleCommand0c
call $734e
jp EndMoveEffect
+
.asm_36b65
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarPair
set 4, [hl]
- ld hl, $5850
+
+ ld hl, IgnoredOrders2Text
ld a, [AlreadyDisobeyed]
and a
call nz, FarBattleTextBox
+
call BattleCommand0a
xor a
ld [$cfca], a
@@ -8740,7 +8796,7 @@
ld bc, PlayerLightScreenCount
ld a, [hBattleTurn]
and a
- jr z, .asm_3730d ; 37305 $6
+ jr z, .asm_3730d
ld hl, $c700
ld bc, $c706
.asm_3730d
@@ -8747,25 +8803,28 @@
ld a, BATTLE_VARS_MOVE_EFFECT
call CleanGetBattleVarPair
cp $23
- jr nz, .asm_37324 ; 37314 $e
+ jr nz, .asm_37324
bit 3, [hl]
- jr nz, .asm_37337 ; 37318 $1d
+ jr nz, .asm_37337
set 3, [hl]
ld a, $5
ld [bc], a
- ld hl, $54b4
- jr .asm_37331 ; 37322 $d
+ ld hl, LightScreenEffectText
+ jr .asm_37331
+
.asm_37324
bit 4, [hl]
- jr nz, .asm_37337 ; 37326 $f
+ jr nz, .asm_37337
set 4, [hl]
inc bc
ld a, $5
ld [bc], a
- ld hl, $54c7
+ ld hl, ReflectEffectText
+
.asm_37331
call Function0x37e01
jp FarBattleTextBox
+
.asm_37337
call Function0x37e77
jp $734e
--- a/main.asm
+++ b/main.asm
@@ -9246,17 +9246,17 @@
db $5a, "!", $58
; 0x80e6e
-BattleText_0x80e6e: ; 0x80e6e
+StoringEnergyText: ; 0x80e6e
db $0, $5a, $4f
db "is storing energy!", $58
; 0x80e84
-BattleText_0x80e84: ; 0x80e84
+UnleashedEnergyText: ; 0x80e84
db $0, $5a, $4f
db "unleashed energy!", $58
; 0x80e99
-BattleText_0x80e99: ; 0x80e99
+HungOnText: ; 0x80e99
db $0, $59, $4f
db "hung on with", $55
db "@"
@@ -9264,7 +9264,7 @@
db $0, "!", $58
; 0x80eb0
-BattleText_0x80eb0: ; 0x80eb0
+EnduredText: ; 0x80eb0
db $0, $59, $4f
db "ENDURED the hit!", $58
; 0x80ec4
@@ -9319,18 +9319,18 @@
db "orders!", $58
; 0x80f7b
-BattleText_0x80f7b: ; 0x80f7b
+IgnoredSleepingText: ; 0x80f7b
text_from_ram $c621
db $0, " ignored", $4f
db "orders…sleeping!", $58
; 0x80f99
-BattleText_0x80f99: ; 0x80f99
+NoPPLeftText: ; 0x80f99
db $0, "But no PP is left", $4f
db "for the move!", $58
; 0x80fba
-BattleText_0x80fba: ; 0x80fba
+HasNoPPLeftText: ; 0x80fba
db $0, $5a, $4f
db "has no PP left for", $55
db "@"
@@ -9354,23 +9354,23 @@
db "regained health!", $58
; 0x81020
-BattleText_0x81020: ; 0x81020
+AttackMissedText: ; 0x81020
db $0, $5a, "'s", $4f
db "attack missed!", $58
; 0x81033
-BattleText_0x81033: ; 0x81033
+AttackMissed2Text: ; 0x81033
db $0, $5a, "'s", $4f
db "attack missed!", $58
; 0x81046
-BattleText_0x81046: ; 0x81046
+CrashedText: ; 0x81046
db $0, $5a, $4f
db "kept going and", $55
db "crashed!", $58
; 0x81061
-BattleText_0x81061: ; 0x81061
+UnaffectedText: ; 0x81061
db $0, $59, "'s", $4f
db "unaffected!", $58
; 0x81071
@@ -9380,51 +9380,51 @@
db $59, "!", $58
; 0x81086
-BattleText_0x81086: ; 0x81086
+CriticalHitText: ; 0x81086
db $0, "A critical hit!", $58
; 0x81097
-BattleText_0x81097: ; 0x81097
+OneHitKOText: ; 0x81097
db $0, "It's a one-hit KO!", $58
; 0x810aa
-BattleText_0x810aa: ; 0x810aa
+SuperEffectiveText: ; 0x810aa
db $0, "It's super-", $4f
db "effective!", $58
; 0x810c1
-BattleText_0x810c1: ; 0x810c1
+NotVeryEffectiveText: ; 0x810c1
db $0, "It's not very", $4f
db "effective…", $58
; 0x810da
-BattleText_0x810da: ; 0x810da
+TookDownWithItText: ; 0x810da
db $0, $59, $4f
db "took down with it,", $55
db $5a, "!", $58
; 0x810f3
-BattleText_0x810f3: ; 0x810f3
+RageBuildingText: ; 0x810f3
db $0, $5a, "'s", $4f
db "RAGE is building!", $58
; 0x81109
-BattleText_0x81109: ; 0x81109
+GotAnEncoreText: ; 0x81109
db $0, $59, $4f
db "got an ENCORE!", $58
; 0x8111b
-BattleText_0x8111b: ; 0x8111b
+SharedPainText: ; 0x8111b
db $0, "The battlers", $4f
db "shared pain!", $58
; 0x81136
-BattleText_0x81136: ; 0x81136
+TookAimText: ; 0x81136
db $0, $5a, $4f
db "took aim!", $58
; 0x81143
-BattleText_0x81143: ; 0x81143
+SketchedText: ; 0x81143
db $0, $5a, $4f
db "SKETCHED", $55
db "@"
@@ -9432,13 +9432,13 @@
db $0, "!", $58
; 0x81156
-BattleText_0x81156: ; 0x81156
+DestinyBondEffectText: ; 0x81156
db $0, $5a, "'s", $4f
db "trying to take its", $55
db "opponent with it!", $58
; 0x8117f
-BattleText_0x8117f: ; 0x8117f
+SpiteEffectText: ; 0x8117f
db $0, $59, "'s", $4f
db "@"
text_from_ram $d073
@@ -9448,57 +9448,57 @@
db $0, "!", $58
; 0x811a0
-BattleText_0x811a0: ; 0x811a0
+BellChimedText: ; 0x811a0
db $0, "A bell chimed!", $4f
db $58
; 0x811b1
-BattleText_0x811b1: ; 0x811b1
+FellAsleepText: ; 0x811b1
db $0, $59, $4f
db "fell asleep!", $58
; 0x811c1
-BattleText_0x811c1: ; 0x811c1
+AlreadyAsleepText: ; 0x811c1
db $0, $59, "'s", $4f
db "already asleep!", $58
; 0x811d5
-BattleText_0x811d5: ; 0x811d5
+WasPoisonedText: ; 0x811d5
db $0, $59, $4f
db "was poisoned!", $58
; 0x811e6
-BattleText_0x811e6: ; 0x811e6
+BadlyPoisonedText: ; 0x811e6
db $0, $59, "'s", $4f
db "badly poisoned!", $58
; 0x811fa
-BattleText_0x811fa: ; 0x811fa
+AlreadyPoisonedText: ; 0x811fa
db $0, $59, "'s", $4f
db "already poisoned!", $58
; 0x81210
-BattleText_0x81210: ; 0x81210
+SuckedHealthText: ; 0x81210
db $0, "Sucked health from", $4f
db $59, "!", $58
; 0x81227
-BattleText_0x81227: ; 0x81227
+DreamEatenText: ; 0x81227
db $0, $59, "'s", $4f
db "dream was eaten!", $58
; 0x8123c
-BattleText_0x8123c: ; 0x8123c
+WasBurnedText: ; 0x8123c
db $0, $59, $4f
db "was burned!", $58
; 0x8124b
-BattleText_0x8124b: ; 0x8124b
+DefrostedOpponentText: ; 0x8124b
db $0, $59, $4f
db "was defrosted!", $58
; 0x8125d
-BattleText_0x8125d: ; 0x8125d
+WasFrozenText: ; 0x8125d
db $0, $59, $4f
db "was frozen solid!", $58
; 0x81272
@@ -9511,7 +9511,7 @@
db "rise anymore!", $58
; 0x8128f
-BattleText_0x8128f: ; 0x8128f
+WontDropAnymoreText: ; 0x8128f
db $0, $59, "'s", $4f
db "@"
text_from_ram $d086
@@ -9519,28 +9519,28 @@
db "drop anymore!", $58
; 0x812ac
-BattleText_0x812ac: ; 0x812ac
+FledFromBattleText: ; 0x812ac
db $0, $5a, $4f
db "fled from battle!", $58
; 0x812c1
-BattleText_0x812c1: ; 0x812c1
+FledInFearText: ; 0x812c1
db $0, $59, $4f
db "fled in fear!", $58
; 0x812d2
-BattleText_0x812d2: ; 0x812d2
+BlownAwayText: ; 0x812d2
db $0, $59, $4f
db "was blown away!", $58
; 0x812e5
-BattleText_0x812e5: ; 0x812e5
+PlayerHitTimesText: ; 0x812e5
db $0, "Hit @"
deciram $c682, $11
db $0, " times!", $58
; 0x812f8
-BattleText_0x812f8: ; 0x812f8
+EnemyHitTimesText: ; 0x812f8
db $0, "Hit @"
deciram $c684, $11
db $0, " times!", $58
@@ -9582,13 +9582,13 @@
db "a SUBSTITUTE!", $58
; 0x813ad
-BattleText_0x813ad: ; 0x813ad
+SubTookDamageText: ; 0x813ad
db $0, "The SUBSTITUTE", $4f
db "took damage for", $55
db $59, "!", $58
; 0x813d0
-BattleText_0x813d0: ; 0x813d0
+SubFadedText: ; 0x813d0
db $0, $59, "'s", $4f
db "SUBSTITUTE faded!", $58
; 0x813e6
@@ -9645,12 +9645,12 @@
db $0, "!", $58
; 0x814b4
-BattleText_0x814b4: ; 0x814b4
+LightScreenEffectText: ; 0x814b4
db $0, $5a, "'s", $4f
db "SPCL.DEF rose!", $58
; 0x814c7
-BattleText_0x814c7: ; 0x814c7
+ReflectEffectText: ; 0x814c7
db $0, $5a, "'s", $4f
db "DEFENSE rose!", $58
; 0x814d9
@@ -9683,7 +9683,7 @@
db "HP is full!", $58
; 0x81544
-BattleText_0x81544: ; 0x81544
+DraggedOutText: ; 0x81544
db $0, $5a, $4f
db "was dragged out!", $58
; 0x81558
@@ -9752,7 +9752,7 @@
db "PROTECTED itself!", $58
; 0x8167a
-BattleText_0x8167a: ; 0x8167a
+ProtectingItselfText: ; 0x8167a
db $0, $59, "'s", $4f
db "PROTECTING itself!", $57
; 0x81691
@@ -9861,7 +9861,7 @@
db "refused the gift!", $58
; 0x81850
-BattleText_0x81850: ; 0x81850
+IgnoredOrders2Text: ; 0x81850
db $0, $5a, $4f
db "ignored orders!", $58
; 0x81863
--
⑨