More battletexts

This commit is contained in:
yenatch 2013-03-27 17:07:00 -04:00
parent 62c621d5ad
commit b6ab385d3c
2 changed files with 189 additions and 130 deletions

View File

@ -1037,7 +1037,7 @@ IgnoreSleepOnly: ; 3451f
ret z ret z
; 'ignored orders…sleeping!' ; 'ignored orders…sleeping!'
ld hl, $4f7b ld hl, IgnoredSleepingText
call FarBattleTextBox call FarBattleTextBox
call EndMoveEffect call EndMoveEffect
@ -1182,10 +1182,10 @@ BattleCommand04: ; 34555
call IsInArray call IsInArray
; 'has no pp left for [move]' ; 'has no pp left for [move]'
ld hl, $4fba ld hl, HasNoPPLeftText
jr c, .print jr c, .print
; 'but no pp is left for the move' ; 'but no pp is left for the move'
ld hl, $4f99 ld hl, NoPPLeftText
.print .print
call FarBattleTextBox call FarBattleTextBox
ld b, $1 ld b, $1
@ -2425,7 +2425,7 @@ BattleCommand09: ; 34d32
call DelayFrames call DelayFrames
; 'protecting itself!' ; 'protecting itself!'
ld hl, BattleText_0x8167a ld hl, ProtectingItselfText
call FarBattleTextBox call FarBattleTextBox
ld c, 40 ld c, 40
@ -2882,7 +2882,7 @@ BattleCommand0c: ; 35004
BattleCommand0d: ; 35023 BattleCommand0d: ; 35023
; resulttext
ld a, [AttackMissed] ld a, [AttackMissed]
and a and a
ret z ret z
@ -2922,11 +2922,13 @@ BattleCommand0d: ; 35023
BattleCommand0e: ; 3505e BattleCommand0e: ; 3505e
; checkfaint
ld a, BATTLE_VARS_SUBSTATUS1_OPP ld a, BATTLE_VARS_SUBSTATUS1_OPP
call CleanGetBattleVarPair call CleanGetBattleVarPair
bit 5, a bit 5, a
jr z, .asm_35072 ; 35065 $b jr z, .asm_35072 ; 35065 $b
call $5c94 call BattleCommand4b
ld b, $0 ld b, $0
jr nc, .asm_3508b ; 3506c $1d jr nc, .asm_3508b ; 3506c $1d
ld b, $1 ld b, $1
@ -2941,7 +2943,7 @@ BattleCommand0e: ; 3505e
call FarBattleRNG call FarBattleRNG
cp c cp c
jr nc, .asm_3508b ; 35080 $9 jr nc, .asm_3508b ; 35080 $9
call $5c94 call BattleCommand4b
ld b, $0 ld b, $0
jr nc, .asm_3508b ; 35087 $2 jr nc, .asm_3508b ; 35087 $2
ld b, $2 ld b, $2
@ -2965,7 +2967,7 @@ BattleCommand0e: ; 3505e
ret z ret z
dec a dec a
jr nz, .asm_350ab ; 350a3 $6 jr nz, .asm_350ab ; 350a3 $6
ld hl, $4eb0 ld hl, EnduredText
jp FarBattleTextBox jp FarBattleTextBox
.asm_350ab .asm_350ab
@ -2973,7 +2975,8 @@ BattleCommand0e: ; 3505e
ld a, [hl] ld a, [hl]
ld [$d265], a ld [$d265], a
call $3468 call $3468
ld hl, $4e99
ld hl, HungOnText
jp FarBattleTextBox jp FarBattleTextBox
.asm_50bb .asm_50bb
@ -3009,23 +3012,23 @@ BattleCommand0e: ; 3505e
; 350e4 ; 350e4
ld hl, $5071 ld hl, DoesntAffectText
ld de, $5071 ld de, DoesntAffectText
ld a, [TypeModifier] ld a, [TypeModifier]
and $7f and $7f
jr z, .asm_35110 ; 0x350ef $1f jr z, .asm_35110 ; 0x350ef $1f
ld a, $d ld a, $d
call CleanGetBattleVarPair call CleanGetBattleVarPair
cp $94 cp $94
ld hl, $54f0 ld hl, ButItFailedText
ld de, $5500 ld de, ItFailedText
jr z, .asm_35110 ; 0x350fe $10 jr z, .asm_35110 ; 0x350fe $10
ld hl, $5020 ld hl, AttackMissedText
ld de, $5033 ld de, AttackMissed2Text
ld a, [CriticalHit] ld a, [CriticalHit]
cp $ff cp $ff
jr nz, .asm_35110 ; 0x3510b $3 jr nz, .asm_35110 ; 0x3510b $3
ld hl, $5061 ld hl, UnaffectedText
.asm_35110 .asm_35110
call Function0x35157 call Function0x35157
xor a xor a
@ -3054,7 +3057,7 @@ BattleCommand0e: ; 3505e
inc a inc a
ld [hl], a ld [hl], a
.asm_3513e .asm_3513e
ld hl, $5046 ld hl, CrashedText
call FarBattleTextBox call FarBattleTextBox
ld a, $1 ld a, $1
ld [$c689], a ld [$c689], a
@ -3117,8 +3120,8 @@ BattleCommand0f: ; 35175
jp DelayFrames jp DelayFrames
.ptrs .ptrs
dw BattleText_0x81086 ; 'critical hit' dw CriticalHitText ; 'critical hit'
dw BattleText_0x81097 ; 'one-hit ko' dw OneHitKOText ; 'one-hit ko'
; 35197 ; 35197
@ -3157,9 +3160,9 @@ BattleCommand10: ; 351ad
and $7f and $7f
cp 10 ; 1.0 cp 10 ; 1.0
ret z ret z
ld hl, BattleText_0x810aa ; 'super-effective' ld hl, SuperEffectiveText ; 'super-effective'
jr nc, .print jr nc, .print
ld hl, BattleText_0x810c1 ; 'not very effective' ld hl, NotVeryEffectiveText ; 'not very effective'
.print .print
jp FarBattleTextBox jp FarBattleTextBox
; 351c0 ; 351c0
@ -3186,7 +3189,7 @@ BattleCommand11: ; 351c0
bit 6, a bit 6, a
jr z, .asm_35231 jr z, .asm_35231
ld hl, $50da ld hl, TookDownWithItText
call FarBattleTextBox call FarBattleTextBox
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
@ -3279,7 +3282,7 @@ BattleCommand12: ; 35250
ld [de], a ld [de], a
call SwitchTurn call SwitchTurn
ld hl, $50f3 ld hl, RageBuildingText
call FarBattleTextBox call FarBattleTextBox
jp SwitchTurn jp SwitchTurn
; 3527b ; 3527b
@ -4452,8 +4455,10 @@ BattleCommand41: ; 35864
call GetMoveData call GetMoveData
.asm_3591a .asm_3591a
call Function0x37e01 call Function0x37e01
ld hl, $5109
ld hl, GotAnEncoreText
jp FarBattleTextBox jp FarBattleTextBox
.asm_35923 .asm_35923
jp PrintDidntAffect2 jp PrintDidntAffect2
; 35926 ; 35926
@ -4495,7 +4500,8 @@ BattleCommand42: ; 35926
ld a, $5e ld a, $5e
ld hl, $4000 ld hl, $4000
rst FarCall rst FarCall
ld hl, $511b
ld hl, SharedPainText
jp FarBattleTextBox jp FarBattleTextBox
.asm_3597d .asm_3597d
@ -4649,8 +4655,10 @@ BattleCommand45: ; 35a53
call GetBattleVarPair call GetBattleVarPair
set 5, [hl] set 5, [hl]
call Function0x37e01 call Function0x37e01
ld hl, $5136
ld hl, TookAimText
jp FarBattleTextBox jp FarBattleTextBox
.asm_35a6e .asm_35a6e
call Function0x37e77 call Function0x37e77
jp PrintDidntAffect jp PrintDidntAffect
@ -4750,8 +4758,10 @@ BattleCommand46: ; 35a74
.asm_35b04 .asm_35b04
call $34f8 call $34f8
call Function0x37e01 call Function0x37e01
ld hl, $5143
ld hl, SketchedText
jp FarBattleTextBox jp FarBattleTextBox
.asm_35b10 .asm_35b10
call Function0x37e77 call Function0x37e77
jp PrintDidntAffect jp PrintDidntAffect
@ -4942,7 +4952,7 @@ BattleCommand49: ; 35bff
call GetBattleVarPair call GetBattleVarPair
set 6, [hl] set 6, [hl]
call Function0x37e01 call Function0x37e01
ld hl, $5156 ld hl, DestinyBondEffectText
jp FarBattleTextBox jp FarBattleTextBox
; 35c0f ; 35c0f
@ -5027,7 +5037,7 @@ BattleCommand4a: ; 35c0f
pop de pop de
ld a, d ld a, d
ld [$d265], a ld [$d265], a
ld hl, $517f ld hl, SpiteEffectText
jp FarBattleTextBox jp FarBattleTextBox
.asm_35c91 .asm_35c91
jp PrintDidntAffect2 jp PrintDidntAffect2
@ -5096,16 +5106,18 @@ BattleCommand4c: ; 35cc9
ld [hl], a ld [hl], a
ld h, d ld h, d
ld l, e ld l, e
ld bc, $0030 ld bc, $30
ld d, $6 ld d, $6
.asm_35ce9 .asm_35ce9
ld [hl], a ld [hl], a
add hl, bc add hl, bc
dec d dec d
jr nz, .asm_35ce9 ; 35cec $fb jr nz, .asm_35ce9
call Function0x37e01 call Function0x37e01
ld hl, $51a0
ld hl, BellChimedText
call FarBattleTextBox call FarBattleTextBox
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jp z, Function0x365d7 jp z, Function0x365d7
@ -5260,8 +5272,10 @@ Function0x35d7e: ; 35d7e
Function0x35de0: ; 35de0 Function0x35de0: ; 35de0
ld hl, $53ad
ld hl, SubTookDamageText
call FarBattleTextBox call FarBattleTextBox
ld de, $c6e0 ld de, $c6e0
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
@ -5286,7 +5300,7 @@ Function0x35de0: ; 35de0
call GetBattleVarPair call GetBattleVarPair
res 4, [hl] res 4, [hl]
ld hl, $53d0 ld hl, SubFadedText
call FarBattleTextBox call FarBattleTextBox
call SwitchTurn call SwitchTurn
@ -5348,51 +5362,62 @@ BattleCommand14: ; 35e5c
ld a, [hl] ld a, [hl]
ld [$d265], a ld [$d265], a
call $3468 call $3468
ld hl, $55a9 ld hl, ProtectedByText
jr .asm_35ec6 ; 35e6e $56 jr .asm_35ec6
.asm_35e70 .asm_35e70
ld a, BATTLE_VARS_STATUS_OPP ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVarPair call GetBattleVarPair
ld d, h ld d, h
ld e, l ld e, l
ld a, [de] ld a, [de]
and $7 and 7
ld hl, $51c1 ld hl, AlreadyAsleepText
jr nz, .asm_35ec6 ; 35e7d $47 jr nz, .asm_35ec6
ld a, [AttackMissed] ld a, [AttackMissed]
and a and a
jp nz, PrintDidntAffect2 jp nz, PrintDidntAffect2
ld hl, $550c
ld hl, DidntAffect1Text
call Function0x35ece call Function0x35ece
jr c, .asm_35ec6 ; 35e8c $38 jr c, .asm_35ec6
ld a, [de] ld a, [de]
and a and a
jr nz, .asm_35ec6 ; 35e90 $34 jr nz, .asm_35ec6
call CheckSubstituteOpp call CheckSubstituteOpp
jr nz, .asm_35ec6 ; 35e95 $2f jr nz, .asm_35ec6
call Function0x37e01 call Function0x37e01
ld b, $7 ld b, $7
ld a, [$cfc0] ld a, [$cfc0]
and a and a
jr z, .asm_35ea4 ; 35ea0 $2 jr z, .asm_35ea4
ld b, $3 ld b, $3
.asm_35ea4 .asm_35ea4
call FarBattleRNG call FarBattleRNG
and b and b
jr z, .asm_35ea4 ; 35ea8 $fa jr z, .asm_35ea4
cp $7 cp 7
jr z, .asm_35ea4 ; 35eac $f6 jr z, .asm_35ea4
inc a inc a
ld [de], a ld [de], a
call $398e call $398e
call $39c9 call $39c9
ld hl, $51b1
ld hl, FellAsleepText
call FarBattleTextBox call FarBattleTextBox
ld a, $f ld a, $f
ld hl, $5de9 ld hl, $5de9
rst FarCall rst FarCall
jp z, $4216 jp z, $4216
ret ret
.asm_35ec6 .asm_35ec6
push hl push hl
call Function0x37e77 call Function0x37e77
@ -5459,8 +5484,10 @@ BattleCommand13: ; 35eee
ld de, $0106 ld de, $0106
call Function0x37e54 call Function0x37e54
call $39c9 call $39c9
ld hl, $51d5
ld hl, WasPoisonedText
call FarBattleTextBox call FarBattleTextBox
ld a, $f ld a, $f
ld hl, $5de9 ld hl, $5de9
rst FarCall rst FarCall
@ -5471,7 +5498,7 @@ BattleCommand13: ; 35eee
BattleCommand2f: ; 35f2c BattleCommand2f: ; 35f2c
; poison ; poison
ld hl, $5071 ld hl, DoesntAffectText
ld a, [TypeModifier] ld a, [TypeModifier]
and $7f and $7f
jp z, $5fb8 jp z, $5fb8
@ -5480,7 +5507,7 @@ BattleCommand2f: ; 35f2c
ld a, BATTLE_VARS_STATUS_OPP ld a, BATTLE_VARS_STATUS_OPP
call CleanGetBattleVarPair call CleanGetBattleVarPair
ld b, a ld b, a
ld hl, $51fa ld hl, AlreadyPoisonedText
and $8 and $8
jp nz, $5fb8 jp nz, $5fb8
call GetOpponentItem call GetOpponentItem
@ -5490,10 +5517,10 @@ BattleCommand2f: ; 35f2c
ld a, [hl] ld a, [hl]
ld [$d265], a ld [$d265], a
call $3468 call $3468
ld hl, $55a9 ld hl, ProtectedByText
jr .asm_35fb8 ; 35f5d $59 jr .asm_35fb8 ; 35f5d $59
.asm_35f5f .asm_35f5f
ld hl, $550c ld hl, DidntAffect1Text
ld a, BATTLE_VARS_STATUS_OPP ld a, BATTLE_VARS_STATUS_OPP
call CleanGetBattleVarPair call CleanGetBattleVarPair
and a and a
@ -5522,21 +5549,26 @@ BattleCommand2f: ; 35f2c
call Function0x35fc9 call Function0x35fc9
jr z, .asm_35fa4 ; 35f97 $b jr z, .asm_35fa4 ; 35f97 $b
call Function0x35fc0 call Function0x35fc0
ld hl, $51d5
ld hl, WasPoisonedText
call FarBattleTextBox call FarBattleTextBox
jr .asm_35fb1 ; 35fa2 $d jr .asm_35fb1 ; 35fa2 $d
.asm_35fa4 .asm_35fa4
set 0, [hl] set 0, [hl]
xor a xor a
ld [de], a ld [de], a
call Function0x35fc0 call Function0x35fc0
ld hl, $51e6
ld hl, BadlyPoisonedText
call FarBattleTextBox call FarBattleTextBox
.asm_35fb1 .asm_35fb1
ld a, $f ld a, $f
ld hl, $5de9 ld hl, $5de9
rst FarCall rst FarCall
ret ret
.asm_35fb8 .asm_35fb8
push hl push hl
call Function0x37e77 call Function0x37e77
@ -5594,15 +5626,17 @@ Function0x35ff5: ; 35ff5
BattleCommand15: ; 35fff BattleCommand15: ; 35fff
; draintarget
call Function0x36011 call Function0x36011
ld hl, $5210 ld hl, SuckedHealthText
jp FarBattleTextBox jp FarBattleTextBox
; 36008 ; 36008
BattleCommand16: ; 36008 BattleCommand16: ; 36008
; eatdream
call Function0x36011 call Function0x36011
ld hl, $5227 ld hl, DreamEatenText
jp FarBattleTextBox jp FarBattleTextBox
; 36011 ; 36011
@ -5724,8 +5758,10 @@ BattleCommand17: ; 3608c
ld de, $0105 ld de, $0105
call Function0x37e54 call Function0x37e54
call $39c9 call $39c9
ld hl, $523c
ld hl, WasBurnedText
call FarBattleTextBox call FarBattleTextBox
ld a, $f ld a, $f
ld hl, $5de9 ld hl, $5de9
rst FarCall rst FarCall
@ -5754,7 +5790,8 @@ Defrost: ; 360dd
xor a xor a
ld [hl], a ld [hl], a
call $398e call $398e
ld hl, $524b
ld hl, DefrostedOpponentText
jp FarBattleTextBox jp FarBattleTextBox
; 36102 ; 36102
@ -5794,8 +5831,10 @@ BattleCommand18: ; 36102
ld de, $0108 ld de, $0108
call Function0x37e54 call Function0x37e54
call $39c9 call $39c9
ld hl, $525d
ld hl, WasFrozenText
call FarBattleTextBox call FarBattleTextBox
ld a, $f ld a, $f
ld hl, $5de9 ld hl, $5de9
rst FarCall rst FarCall
@ -6346,7 +6385,7 @@ BattleCommand8e: ; 3644c
ld b, a ld b, a
inc b inc b
call $648f call $648f
ld hl, $5272 ld hl, WontRiseAnymoreText
jp FarBattleTextBox jp FarBattleTextBox
; 3646a ; 3646a
@ -6369,7 +6408,7 @@ BattleCommand8f: ; 3646a
ld b, a ld b, a
inc b inc b
call $648f call $648f
ld hl, $528f ld hl, WontDropAnymoreText
jp FarBattleTextBox jp FarBattleTextBox
; 3648f ; 3648f
@ -6714,8 +6753,10 @@ BattleCommand21: ; 36671
ld a, BATTLE_VARS_SUBSTATUS3 ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarPair call GetBattleVarPair
res 0, [hl] res 0, [hl]
ld hl, $4e84
ld hl, UnleashedEnergyText
call FarBattleTextBox call FarBattleTextBox
ld a, BATTLE_VARS_MOVE_POWER ld a, BATTLE_VARS_MOVE_POWER
call GetBattleVarPair call GetBattleVarPair
ld a, $1 ld a, $1
@ -6758,7 +6799,7 @@ BattleCommand21: ; 36671
jp SkipToBattleCommand jp SkipToBattleCommand
.asm_366dc .asm_366dc
ld hl, $4e6e ld hl, StoringEnergyText
call FarBattleTextBox call FarBattleTextBox
jp EndMoveEffect jp EndMoveEffect
; 366e5 ; 366e5
@ -6937,7 +6978,8 @@ BattleCommanda0: ; 36778
ld c, $14 ld c, $14
call DelayFrames call DelayFrames
call Function0x36804 call Function0x36804
ld hl, $52ac
ld hl, FledFromBattleText
jp FarBattleTextBox jp FarBattleTextBox
; 36804 ; 36804
@ -7042,10 +7084,13 @@ BattleCommand23: ; 3680f
ld hl, $54c3 ld hl, $54c3
ld a, $f ld a, $f
rst FarCall rst FarCall
ld hl, $5544
ld hl, DraggedOutText
call FarBattleTextBox call FarBattleTextBox
ld hl, $5c23 ld hl, $5c23
jp CallBankF jp CallBankF
.asm_368ca .asm_368ca
jp $6969 jp $6969
@ -7136,15 +7181,19 @@ BattleCommand23: ; 3680f
ld [CurPartyMon], a ld [CurPartyMon], a
ld hl, $5b32 ld hl, $5b32
call CallBankF call CallBankF
ld hl, $5544
ld hl, DraggedOutText
call FarBattleTextBox call FarBattleTextBox
ld hl, $5c23 ld hl, $5c23
jp CallBankF jp CallBankF
.asm_36969 .asm_36969
call BattleCommand0a call BattleCommand0a
call BattleCommandaa call BattleCommandaa
call BattleCommand0c call BattleCommand0c
jp $734e jp $734e
.asm_36975 .asm_36975
push af push af
call $6804 call $6804
@ -7154,11 +7203,11 @@ BattleCommand23: ; 3680f
ld c, $14 ld c, $14
call DelayFrames call DelayFrames
pop af pop af
ld hl, $52c1
ld hl, FledInFearText
cp $2e cp $2e
jr z, .asm_36991 jr z, .asm_36991
ld hl, BlownAwayText
ld hl, $52d2
.asm_36991 .asm_36991
jp FarBattleTextBox jp FarBattleTextBox
; 36994 ; 36994
@ -7284,19 +7333,22 @@ BattleCommand24: ; 369b6
ld a, BATTLE_VARS_SUBSTATUS3 ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarPair call GetBattleVarPair
res 2, [hl] res 2, [hl]
ld hl, $52e5
ld hl, PlayerHitTimesText
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_36a5a ; 36a55 $3 jr z, .asm_36a5a
ld hl, $52f8 ld hl, EnemyHitTimesText
.asm_36a5a .asm_36a5a
push bc push bc
ld a, BATTLE_VARS_MOVE_EFFECT ld a, BATTLE_VARS_MOVE_EFFECT
call CleanGetBattleVarPair call CleanGetBattleVarPair
cp $9a ; beat up cp $9a ; beat up
jr z, .asm_36a67 ; 36a62 $3 jr z, .asm_36a67
call FarBattleTextBox call FarBattleTextBox
.asm_36a67 .asm_36a67
pop bc pop bc
xor a xor a
ld [bc], a ld [bc], a
@ -7477,19 +7529,23 @@ BattleCommand39: ; 36b4d
ld a, BATTLE_VARS_STATUS ld a, BATTLE_VARS_STATUS
call CleanGetBattleVarPair call CleanGetBattleVarPair
and $7 and $7
jr z, .asm_36b65 ; 36b57 $c jr z, .asm_36b65
call BattleCommandaa call BattleCommandaa
call BattleCommand0c call BattleCommand0c
call $734e call $734e
jp EndMoveEffect jp EndMoveEffect
.asm_36b65 .asm_36b65
ld a, BATTLE_VARS_SUBSTATUS3 ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarPair call GetBattleVarPair
set 4, [hl] set 4, [hl]
ld hl, $5850
ld hl, IgnoredOrders2Text
ld a, [AlreadyDisobeyed] ld a, [AlreadyDisobeyed]
and a and a
call nz, FarBattleTextBox call nz, FarBattleTextBox
call BattleCommand0a call BattleCommand0a
xor a xor a
ld [$cfca], a ld [$cfca], a
@ -8740,32 +8796,35 @@ BattleCommand2e: ; 372fc
ld bc, PlayerLightScreenCount ld bc, PlayerLightScreenCount
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_3730d ; 37305 $6 jr z, .asm_3730d
ld hl, $c700 ld hl, $c700
ld bc, $c706 ld bc, $c706
.asm_3730d .asm_3730d
ld a, BATTLE_VARS_MOVE_EFFECT ld a, BATTLE_VARS_MOVE_EFFECT
call CleanGetBattleVarPair call CleanGetBattleVarPair
cp $23 cp $23
jr nz, .asm_37324 ; 37314 $e jr nz, .asm_37324
bit 3, [hl] bit 3, [hl]
jr nz, .asm_37337 ; 37318 $1d jr nz, .asm_37337
set 3, [hl] set 3, [hl]
ld a, $5 ld a, $5
ld [bc], a ld [bc], a
ld hl, $54b4 ld hl, LightScreenEffectText
jr .asm_37331 ; 37322 $d jr .asm_37331
.asm_37324 .asm_37324
bit 4, [hl] bit 4, [hl]
jr nz, .asm_37337 ; 37326 $f jr nz, .asm_37337
set 4, [hl] set 4, [hl]
inc bc inc bc
ld a, $5 ld a, $5
ld [bc], a ld [bc], a
ld hl, $54c7 ld hl, ReflectEffectText
.asm_37331 .asm_37331
call Function0x37e01 call Function0x37e01
jp FarBattleTextBox jp FarBattleTextBox
.asm_37337 .asm_37337
call Function0x37e77 call Function0x37e77
jp $734e jp $734e

View File

@ -9246,17 +9246,17 @@ ClampedByText: ; 0x80e59
db $5a, "!", $58 db $5a, "!", $58
; 0x80e6e ; 0x80e6e
BattleText_0x80e6e: ; 0x80e6e StoringEnergyText: ; 0x80e6e
db $0, $5a, $4f db $0, $5a, $4f
db "is storing energy!", $58 db "is storing energy!", $58
; 0x80e84 ; 0x80e84
BattleText_0x80e84: ; 0x80e84 UnleashedEnergyText: ; 0x80e84
db $0, $5a, $4f db $0, $5a, $4f
db "unleashed energy!", $58 db "unleashed energy!", $58
; 0x80e99 ; 0x80e99
BattleText_0x80e99: ; 0x80e99 HungOnText: ; 0x80e99
db $0, $59, $4f db $0, $59, $4f
db "hung on with", $55 db "hung on with", $55
db "@" db "@"
@ -9264,7 +9264,7 @@ BattleText_0x80e99: ; 0x80e99
db $0, "!", $58 db $0, "!", $58
; 0x80eb0 ; 0x80eb0
BattleText_0x80eb0: ; 0x80eb0 EnduredText: ; 0x80eb0
db $0, $59, $4f db $0, $59, $4f
db "ENDURED the hit!", $58 db "ENDURED the hit!", $58
; 0x80ec4 ; 0x80ec4
@ -9319,18 +9319,18 @@ IgnoredOrdersText: ; 0x80f66
db "orders!", $58 db "orders!", $58
; 0x80f7b ; 0x80f7b
BattleText_0x80f7b: ; 0x80f7b IgnoredSleepingText: ; 0x80f7b
text_from_ram $c621 text_from_ram $c621
db $0, " ignored", $4f db $0, " ignored", $4f
db "orders…sleeping!", $58 db "orders…sleeping!", $58
; 0x80f99 ; 0x80f99
BattleText_0x80f99: ; 0x80f99 NoPPLeftText: ; 0x80f99
db $0, "But no PP is left", $4f db $0, "But no PP is left", $4f
db "for the move!", $58 db "for the move!", $58
; 0x80fba ; 0x80fba
BattleText_0x80fba: ; 0x80fba HasNoPPLeftText: ; 0x80fba
db $0, $5a, $4f db $0, $5a, $4f
db "has no PP left for", $55 db "has no PP left for", $55
db "@" db "@"
@ -9354,23 +9354,23 @@ RegainedHealthText: ; 0x8100c
db "regained health!", $58 db "regained health!", $58
; 0x81020 ; 0x81020
BattleText_0x81020: ; 0x81020 AttackMissedText: ; 0x81020
db $0, $5a, "'s", $4f db $0, $5a, "'s", $4f
db "attack missed!", $58 db "attack missed!", $58
; 0x81033 ; 0x81033
BattleText_0x81033: ; 0x81033 AttackMissed2Text: ; 0x81033
db $0, $5a, "'s", $4f db $0, $5a, "'s", $4f
db "attack missed!", $58 db "attack missed!", $58
; 0x81046 ; 0x81046
BattleText_0x81046: ; 0x81046 CrashedText: ; 0x81046
db $0, $5a, $4f db $0, $5a, $4f
db "kept going and", $55 db "kept going and", $55
db "crashed!", $58 db "crashed!", $58
; 0x81061 ; 0x81061
BattleText_0x81061: ; 0x81061 UnaffectedText: ; 0x81061
db $0, $59, "'s", $4f db $0, $59, "'s", $4f
db "unaffected!", $58 db "unaffected!", $58
; 0x81071 ; 0x81071
@ -9380,51 +9380,51 @@ DoesntAffectText: ; 0x81071
db $59, "!", $58 db $59, "!", $58
; 0x81086 ; 0x81086
BattleText_0x81086: ; 0x81086 CriticalHitText: ; 0x81086
db $0, "A critical hit!", $58 db $0, "A critical hit!", $58
; 0x81097 ; 0x81097
BattleText_0x81097: ; 0x81097 OneHitKOText: ; 0x81097
db $0, "It's a one-hit KO!", $58 db $0, "It's a one-hit KO!", $58
; 0x810aa ; 0x810aa
BattleText_0x810aa: ; 0x810aa SuperEffectiveText: ; 0x810aa
db $0, "It's super-", $4f db $0, "It's super-", $4f
db "effective!", $58 db "effective!", $58
; 0x810c1 ; 0x810c1
BattleText_0x810c1: ; 0x810c1 NotVeryEffectiveText: ; 0x810c1
db $0, "It's not very", $4f db $0, "It's not very", $4f
db "effective…", $58 db "effective…", $58
; 0x810da ; 0x810da
BattleText_0x810da: ; 0x810da TookDownWithItText: ; 0x810da
db $0, $59, $4f db $0, $59, $4f
db "took down with it,", $55 db "took down with it,", $55
db $5a, "!", $58 db $5a, "!", $58
; 0x810f3 ; 0x810f3
BattleText_0x810f3: ; 0x810f3 RageBuildingText: ; 0x810f3
db $0, $5a, "'s", $4f db $0, $5a, "'s", $4f
db "RAGE is building!", $58 db "RAGE is building!", $58
; 0x81109 ; 0x81109
BattleText_0x81109: ; 0x81109 GotAnEncoreText: ; 0x81109
db $0, $59, $4f db $0, $59, $4f
db "got an ENCORE!", $58 db "got an ENCORE!", $58
; 0x8111b ; 0x8111b
BattleText_0x8111b: ; 0x8111b SharedPainText: ; 0x8111b
db $0, "The battlers", $4f db $0, "The battlers", $4f
db "shared pain!", $58 db "shared pain!", $58
; 0x81136 ; 0x81136
BattleText_0x81136: ; 0x81136 TookAimText: ; 0x81136
db $0, $5a, $4f db $0, $5a, $4f
db "took aim!", $58 db "took aim!", $58
; 0x81143 ; 0x81143
BattleText_0x81143: ; 0x81143 SketchedText: ; 0x81143
db $0, $5a, $4f db $0, $5a, $4f
db "SKETCHED", $55 db "SKETCHED", $55
db "@" db "@"
@ -9432,13 +9432,13 @@ BattleText_0x81143: ; 0x81143
db $0, "!", $58 db $0, "!", $58
; 0x81156 ; 0x81156
BattleText_0x81156: ; 0x81156 DestinyBondEffectText: ; 0x81156
db $0, $5a, "'s", $4f db $0, $5a, "'s", $4f
db "trying to take its", $55 db "trying to take its", $55
db "opponent with it!", $58 db "opponent with it!", $58
; 0x8117f ; 0x8117f
BattleText_0x8117f: ; 0x8117f SpiteEffectText: ; 0x8117f
db $0, $59, "'s", $4f db $0, $59, "'s", $4f
db "@" db "@"
text_from_ram $d073 text_from_ram $d073
@ -9448,57 +9448,57 @@ BattleText_0x8117f: ; 0x8117f
db $0, "!", $58 db $0, "!", $58
; 0x811a0 ; 0x811a0
BattleText_0x811a0: ; 0x811a0 BellChimedText: ; 0x811a0
db $0, "A bell chimed!", $4f db $0, "A bell chimed!", $4f
db $58 db $58
; 0x811b1 ; 0x811b1
BattleText_0x811b1: ; 0x811b1 FellAsleepText: ; 0x811b1
db $0, $59, $4f db $0, $59, $4f
db "fell asleep!", $58 db "fell asleep!", $58
; 0x811c1 ; 0x811c1
BattleText_0x811c1: ; 0x811c1 AlreadyAsleepText: ; 0x811c1
db $0, $59, "'s", $4f db $0, $59, "'s", $4f
db "already asleep!", $58 db "already asleep!", $58
; 0x811d5 ; 0x811d5
BattleText_0x811d5: ; 0x811d5 WasPoisonedText: ; 0x811d5
db $0, $59, $4f db $0, $59, $4f
db "was poisoned!", $58 db "was poisoned!", $58
; 0x811e6 ; 0x811e6
BattleText_0x811e6: ; 0x811e6 BadlyPoisonedText: ; 0x811e6
db $0, $59, "'s", $4f db $0, $59, "'s", $4f
db "badly poisoned!", $58 db "badly poisoned!", $58
; 0x811fa ; 0x811fa
BattleText_0x811fa: ; 0x811fa AlreadyPoisonedText: ; 0x811fa
db $0, $59, "'s", $4f db $0, $59, "'s", $4f
db "already poisoned!", $58 db "already poisoned!", $58
; 0x81210 ; 0x81210
BattleText_0x81210: ; 0x81210 SuckedHealthText: ; 0x81210
db $0, "Sucked health from", $4f db $0, "Sucked health from", $4f
db $59, "!", $58 db $59, "!", $58
; 0x81227 ; 0x81227
BattleText_0x81227: ; 0x81227 DreamEatenText: ; 0x81227
db $0, $59, "'s", $4f db $0, $59, "'s", $4f
db "dream was eaten!", $58 db "dream was eaten!", $58
; 0x8123c ; 0x8123c
BattleText_0x8123c: ; 0x8123c WasBurnedText: ; 0x8123c
db $0, $59, $4f db $0, $59, $4f
db "was burned!", $58 db "was burned!", $58
; 0x8124b ; 0x8124b
BattleText_0x8124b: ; 0x8124b DefrostedOpponentText: ; 0x8124b
db $0, $59, $4f db $0, $59, $4f
db "was defrosted!", $58 db "was defrosted!", $58
; 0x8125d ; 0x8125d
BattleText_0x8125d: ; 0x8125d WasFrozenText: ; 0x8125d
db $0, $59, $4f db $0, $59, $4f
db "was frozen solid!", $58 db "was frozen solid!", $58
; 0x81272 ; 0x81272
@ -9511,7 +9511,7 @@ WontRiseAnymoreText: ; 0x81272
db "rise anymore!", $58 db "rise anymore!", $58
; 0x8128f ; 0x8128f
BattleText_0x8128f: ; 0x8128f WontDropAnymoreText: ; 0x8128f
db $0, $59, "'s", $4f db $0, $59, "'s", $4f
db "@" db "@"
text_from_ram $d086 text_from_ram $d086
@ -9519,28 +9519,28 @@ BattleText_0x8128f: ; 0x8128f
db "drop anymore!", $58 db "drop anymore!", $58
; 0x812ac ; 0x812ac
BattleText_0x812ac: ; 0x812ac FledFromBattleText: ; 0x812ac
db $0, $5a, $4f db $0, $5a, $4f
db "fled from battle!", $58 db "fled from battle!", $58
; 0x812c1 ; 0x812c1
BattleText_0x812c1: ; 0x812c1 FledInFearText: ; 0x812c1
db $0, $59, $4f db $0, $59, $4f
db "fled in fear!", $58 db "fled in fear!", $58
; 0x812d2 ; 0x812d2
BattleText_0x812d2: ; 0x812d2 BlownAwayText: ; 0x812d2
db $0, $59, $4f db $0, $59, $4f
db "was blown away!", $58 db "was blown away!", $58
; 0x812e5 ; 0x812e5
BattleText_0x812e5: ; 0x812e5 PlayerHitTimesText: ; 0x812e5
db $0, "Hit @" db $0, "Hit @"
deciram $c682, $11 deciram $c682, $11
db $0, " times!", $58 db $0, " times!", $58
; 0x812f8 ; 0x812f8
BattleText_0x812f8: ; 0x812f8 EnemyHitTimesText: ; 0x812f8
db $0, "Hit @" db $0, "Hit @"
deciram $c684, $11 deciram $c684, $11
db $0, " times!", $58 db $0, " times!", $58
@ -9582,13 +9582,13 @@ TooWeakSubText: ; 0x8138d
db "a SUBSTITUTE!", $58 db "a SUBSTITUTE!", $58
; 0x813ad ; 0x813ad
BattleText_0x813ad: ; 0x813ad SubTookDamageText: ; 0x813ad
db $0, "The SUBSTITUTE", $4f db $0, "The SUBSTITUTE", $4f
db "took damage for", $55 db "took damage for", $55
db $59, "!", $58 db $59, "!", $58
; 0x813d0 ; 0x813d0
BattleText_0x813d0: ; 0x813d0 SubFadedText: ; 0x813d0
db $0, $59, "'s", $4f db $0, $59, "'s", $4f
db "SUBSTITUTE faded!", $58 db "SUBSTITUTE faded!", $58
; 0x813e6 ; 0x813e6
@ -9645,12 +9645,12 @@ TransformedText: ; 0x81499
db $0, "!", $58 db $0, "!", $58
; 0x814b4 ; 0x814b4
BattleText_0x814b4: ; 0x814b4 LightScreenEffectText: ; 0x814b4
db $0, $5a, "'s", $4f db $0, $5a, "'s", $4f
db "SPCL.DEF rose!", $58 db "SPCL.DEF rose!", $58
; 0x814c7 ; 0x814c7
BattleText_0x814c7: ; 0x814c7 ReflectEffectText: ; 0x814c7
db $0, $5a, "'s", $4f db $0, $5a, "'s", $4f
db "DEFENSE rose!", $58 db "DEFENSE rose!", $58
; 0x814d9 ; 0x814d9
@ -9683,7 +9683,7 @@ HPIsFullText: ; 0x81534
db "HP is full!", $58 db "HP is full!", $58
; 0x81544 ; 0x81544
BattleText_0x81544: ; 0x81544 DraggedOutText: ; 0x81544
db $0, $5a, $4f db $0, $5a, $4f
db "was dragged out!", $58 db "was dragged out!", $58
; 0x81558 ; 0x81558
@ -9752,7 +9752,7 @@ ProtectedItselfText: ; 0x81665
db "PROTECTED itself!", $58 db "PROTECTED itself!", $58
; 0x8167a ; 0x8167a
BattleText_0x8167a: ; 0x8167a ProtectingItselfText: ; 0x8167a
db $0, $59, "'s", $4f db $0, $59, "'s", $4f
db "PROTECTING itself!", $57 db "PROTECTING itself!", $57
; 0x81691 ; 0x81691
@ -9861,7 +9861,7 @@ RefusedGiftText: ; 0x8183b
db "refused the gift!", $58 db "refused the gift!", $58
; 0x81850 ; 0x81850
BattleText_0x81850: ; 0x81850 IgnoredOrders2Text: ; 0x81850
db $0, $5a, $4f db $0, $5a, $4f
db "ignored orders!", $58 db "ignored orders!", $58
; 0x81863 ; 0x81863