summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmain.asm248
-rw-r--r--text.asm20
2 files changed, 135 insertions, 133 deletions
diff --git a/main.asm b/main.asm
index ca541cc4..47f921e1 100755
--- a/main.asm
+++ b/main.asm
@@ -17679,10 +17679,10 @@ FieldMoveDisplayData: ; 7823 (1:7823)
db $ff ; list terminator
-Func_783f: ; 783f (1:783f)
+DrainHPEffect_: ; 783f (1:783f)
ld hl, W_DAMAGE ; $d0d7
ld a, [hl]
- srl a
+ srl a ; divide damage by 2
ld [hli], a
ld a, [hl]
rr a
@@ -17764,25 +17764,25 @@ Func_7861: ; 7861 (1:7861)
ld a, $49
call Predef ; indirect jump to Func_3cdec (3cdec (f:4dec))
callab ReadPlayerMonCurHPAndStatus
- ld hl, UnnamedText_78dc ; $78dc
+ ld hl, SuckedHealthText ; $78dc
ld a, [H_WHOSETURN] ; $fff3
and a
ld a, [W_PLAYERMOVEEFFECT] ; $cfd3
jr z, .asm_78d2
ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
.asm_78d2
- cp $8
+ cp DREAM_EATER_EFFECT
jr nz, .asm_78d9
- ld hl, UnnamedText_78e1 ; $78e1
+ ld hl, DreamEatenText ; $78e1
.asm_78d9
jp PrintText
-UnnamedText_78dc: ; 78dc (1:78dc)
- TX_FAR _UnnamedText_78dc
+SuckedHealthText: ; 78dc (1:78dc)
+ TX_FAR _SuckedHealthText
db "@"
-UnnamedText_78e1: ; 78e1 (1:78e1)
- TX_FAR _UnnamedText_78e1
+DreamEatenText: ; 78e1 (1:78e1)
+ TX_FAR _DreamEatenText
db "@"
Func_78e6: ; 78e6 (1:78e6)
@@ -31775,7 +31775,7 @@ Func_139a3: ; 139a3 (4:79a3)
.asm_139b8
bit 6, a
- jr nz, Func_139d2
+ jr nz, PrintButItFailedText
ld a, [hli]
ld [de], a
inc de
@@ -31790,10 +31790,10 @@ UnnamedText_139cd: ; 139cd (4:79cd)
TX_FAR _UnnamedText_139cd
db "@"
-Func_139d2: ; 139d2 (4:79d2)
- ld hl, Func_3fb53
+PrintButItFailedText: ; 139d2 (4:79d2)
+ ld hl, PrintButItFailedText_
Func_139d5: ; 139d5 (4:79d5)
- ld b, BANK(Func_3fb53)
+ ld b, BANK(PrintButItFailedText_)
jp Bankswitch
Func_139da: ; 139da (4:79da)
@@ -42511,8 +42511,8 @@ Func_27f86: ; 27f86 (9:7f86)
.asm_27fa5
ld c, $32
call DelayFrames
- ld hl, Func_3fb53
- ld b, BANK(Func_3fb53)
+ ld hl, PrintButItFailedText_
+ ld b, BANK(PrintButItFailedText_)
jp Bankswitch
UnnamedText_27fb3: ; 27fb3 (9:7fb3)
@@ -43187,8 +43187,8 @@ Func_33f2b: ; 33f2b (c:7f2b)
ld hl, UnnamedText_33f52
jp PrintText
.asm_33f4a
- ld hl, Func_3fb53
- ld b, BANK(Func_3fb53)
+ ld hl, PrintButItFailedText_
+ ld b, BANK(PrintButItFailedText_)
jp Bankswitch
UnnamedText_33f52: ; 33f52 (c:7f52)
@@ -55814,7 +55814,7 @@ Func_3b9ec: ; 3b9ec (e:79ec)
Func_3ba97: ; 3ba97 (e:7a97)
ld c, $32
call DelayFrames
- ld hl, Func_3fb53
+ ld hl, PrintButItFailedText_
jp BankswitchEtoF
UnnamedText_3baa2: ; 3baa2 (e:7aa2)
@@ -55961,14 +55961,14 @@ Func_3bb7d: ; 3bb7d (e:7b7d)
jp CopyData
Func_3bb8c: ; 3bb8c (e:7b8c)
- ld hl, Func_3fb53 ; $7b53
+ ld hl, PrintButItFailedText_ ; $7b53
jp BankswitchEtoF
UnnamedText_3bb92: ; 3bb92 (e:7b92)
TX_FAR _UnnamedText_3bb92
db "@"
-Func_3bb97: ; 3bb97 (e:7b97)
+ReflectLightScreenEffect_: ; 3bb97 (e:7b97)
ld hl, W_PLAYERBATTSTATUS3 ; $d064
ld de, W_PLAYERMOVEEFFECT ; $cfd3
ld a, [H_WHOSETURN] ; $fff3
@@ -55978,36 +55978,36 @@ Func_3bb97: ; 3bb97 (e:7b97)
ld de, W_ENEMYMOVEEFFECT ; $cfcd
.asm_3bba8
ld a, [de]
- cp $40
- jr nz, .asm_3bbb8
- bit 1, [hl]
- jr nz, .asm_3bbcc
- set 1, [hl]
- ld hl, UnnamedText_3bbd7 ; $7bd7
+ cp LIGHT_SCREEN_EFFECT
+ jr nz, .reflect
+ bit 1, [hl] ; is mon already protected by light screen?
+ jr nz, .moveFailed
+ set 1, [hl] ; mon is now protected by light screen
+ ld hl, LightScreenProtectedText ; $7bd7
jr .asm_3bbc1
-.asm_3bbb8
- bit 2, [hl]
- jr nz, .asm_3bbcc
- set 2, [hl]
- ld hl, UnnamedText_3bbdc ; $7bdc
+.reflect
+ bit 2, [hl] ; is mon already protected by reflect?
+ jr nz, .moveFailed
+ set 2, [hl] ; mon is now protected by reflect
+ ld hl, ReflectGainedArmorText ; $7bdc
.asm_3bbc1
push hl
ld hl, Func_3fba8 ; $7ba8
call BankswitchEtoF
pop hl
jp PrintText
-.asm_3bbcc
+.moveFailed
ld c, $32
call DelayFrames
- ld hl, Func_3fb53 ; $7b53
+ ld hl, PrintButItFailedText_ ; $7b53
jp BankswitchEtoF
-UnnamedText_3bbd7: ; 3bbd7 (e:7bd7)
- TX_FAR _UnnamedText_3bbd7
+LightScreenProtectedText: ; 3bbd7 (e:7bd7)
+ TX_FAR _LightScreenProtectedText
db "@"
-UnnamedText_3bbdc: ; 3bbdc (e:7bdc)
- TX_FAR _UnnamedText_3bbdc
+ReflectGainedArmorText: ; 3bbdc (e:7bdc)
+ TX_FAR _ReflectGainedArmorText
db "@"
BankswitchEtoF: ; 3bbe1 (e:7be1)
@@ -56102,7 +56102,7 @@ EffectsArray5: ; 3c03b (f:403b)
db ATTACK_TWICE_EFFECT
db JUMP_KICK_EFFECT
db RECOIL_EFFECT
- ; fallthrough
+ ; fallthrough to Next EffectsArray
EffectsArray5B: ; 3c049 (f:4049)
; moves that prevent the player from switching moves?
db THRASH_PETAL_DANCE_EFFECT
@@ -59121,9 +59121,9 @@ Func_3d65e: ; 3d65e (f:565e)
Func_3d69a: ; 3d69a (f:569a)
ld a, [W_PLAYERMOVEEFFECT] ; $cfd3
- cp $27
+ cp CHARGE_EFFECT
jp z, Func_3f132
- cp $2b
+ cp FLY_EFFECT
jp z, Func_3f132
jr asm_3d6b0
@@ -59850,15 +59850,15 @@ Func_3dbe2: ; 3dbe2 (f:5be2)
jr z, .asm_3dbed
ld de, W_ENEMYMOVEEFFECT ; $cfcd
.asm_3dbed
- ld hl, UnnamedText_3dc57 ; $5c57
+ ld hl, DoesntAffectMonText ; $5c57
ld a, [$d05b]
and $7f
jr z, .asm_3dc04
- ld hl, UnnamedText_3dc42 ; $5c42
+ ld hl, AttackMissedText ; $5c42
ld a, [$d05e]
cp $ff
jr nz, .asm_3dc04
- ld hl, UnnamedText_3dc4c ; $5c4c
+ ld hl, UnaffectedText ; $5c4c
.asm_3dc04
push de
call PrintText
@@ -59866,8 +59866,10 @@ Func_3dbe2: ; 3dbe2 (f:5be2)
ld [$d05e], a
pop de
ld a, [de]
- cp $2d
+ cp JUMP_KICK_EFFECT
ret nz
+
+ ; if you get here, the mon used hi jump kick and missed
ld hl, W_DAMAGE ; $d0d7
ld a, [hli]
ld b, [hl]
@@ -59885,7 +59887,7 @@ Func_3dbe2: ; 3dbe2 (f:5be2)
inc a
ld [hl], a
.asm_3dc2a
- ld hl, UnnamedText_3dc47 ; $5c47
+ ld hl, KeptGoingAndCrashedText ; $5c47
call PrintText
ld b, $4
ld a, $24
@@ -59897,24 +59899,24 @@ Func_3dbe2: ; 3dbe2 (f:5be2)
.asm_3dc3f
jp ApplyDamageToEnemyPokemon
-UnnamedText_3dc42: ; 3dc42 (f:5c42)
- TX_FAR _UnnamedText_3dc42
+AttackMissedText: ; 3dc42 (f:5c42)
+ TX_FAR _AttackMissedText
db "@"
-UnnamedText_3dc47: ; 3dc47 (f:5c47)
- TX_FAR _UnnamedText_3dc47
+KeptGoingAndCrashedText: ; 3dc47 (f:5c47)
+ TX_FAR _KeptGoingAndCrashedText
db "@"
-UnnamedText_3dc4c: ; 3dc4c (f:5c4c)
- TX_FAR _UnnamedText_3dc4c
+UnaffectedText: ; 3dc4c (f:5c4c)
+ TX_FAR _UnaffectedText
db "@"
Func_3dc51: ; 3dc51 (f:5c51)
- ld hl, UnnamedText_3dc57 ; $5c57
+ ld hl, DoesntAffectMonText ; $5c57
jp PrintText
-UnnamedText_3dc57: ; 3dc57 (f:5c57)
- TX_FAR _UnnamedText_3dc57
+DoesntAffectMonText: ; 3dc57 (f:5c57)
+ TX_FAR _DoesntAffectMonText
db "@"
Func_3dc5c: ; 3dc5c (f:5c5c)
@@ -61432,13 +61434,13 @@ MoveHitTest: ; 3e56b (f:656b)
.playerTurn
; this checks if the move effect is disallowed by mist
ld a,[W_PLAYERMOVEEFFECT]
- cp a,$12
+ cp a,ATTACK_DOWN1_EFFECT
jr c,.skipEnemyMistCheck
- cp a,$1a
+ cp a,BIDE_EFFECT
jr c,.enemyMistCheck
cp a,$3a
jr c,.skipEnemyMistCheck
- cp a,$42
+ cp a,POISON_EFFECT
jr c,.enemyMistCheck
jr .skipEnemyMistCheck
.enemyMistCheck
@@ -61450,7 +61452,7 @@ MoveHitTest: ; 3e56b (f:656b)
; function is not called when those moves are used
; XXX are there are any others like those three?
ld a,[W_ENEMYBATTSTATUS2]
- bit 1,a
+ bit 1,a ; is mon protected by mist?
jp nz,.moveMissed
.skipEnemyMistCheck
ld a,[W_PLAYERBATTSTATUS2]
@@ -61459,19 +61461,19 @@ MoveHitTest: ; 3e56b (f:656b)
jr .calcHitChance
.enemyTurn
ld a,[W_ENEMYMOVEEFFECT]
- cp a,$12
+ cp a,ATTACK_DOWN1_EFFECT
jr c,.skipPlayerMistCheck
- cp a,$1a
+ cp a,BIDE_EFFECT
jr c,.playerMistCheck
cp a,$3a
jr c,.skipPlayerMistCheck
- cp a,$42
+ cp a,POISON_EFFECT
jr c,.playerMistCheck
jr .skipPlayerMistCheck
.playerMistCheck
; similar to enemy mist check
ld a,[W_PLAYERBATTSTATUS2]
- bit 1,a
+ bit 1,a ; is mon protected by mist?
jp nz,.moveMissed
.skipPlayerMistCheck
ld a,[W_ENEMYBATTSTATUS2]
@@ -61649,15 +61651,15 @@ Func_3e6bc: ; 3e6bc (f:66bc)
Func_3e6fc: ; 3e6fc (f:66fc)
ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
- cp $27
+ cp CHARGE_EFFECT
jp z, Func_3f132
- cp $2b
+ cp FLY_EFFECT
jp z, Func_3f132
jr asm_3e72b
asm_3e70b: ; 3e70b (f:670b)
ld hl, W_ENEMYBATTSTATUS1 ; $d067
- res 4, [hl]
- res 6, [hl]
+ res 4, [hl] ; no longer charging up for attack
+ res 6, [hl] ; no longer invulnerable to typcial attacks
ld a, [W_ENEMYMOVENUM] ; $cfcc
ld [$d0b5], a
ld a, $2c
@@ -61706,7 +61708,7 @@ asm_3e782: ; 3e782 (f:6782)
and a
jr z, .asm_3e791
ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
- cp $7
+ cp EXPLODE_EFFECT
jr z, asm_3e7a0
jr Func_3e7d1
.asm_3e791
@@ -61725,7 +61727,7 @@ asm_3e7a0: ; 3e7a0 (f:67a0)
asm_3e7a4: ; 3e7a4 (f:67a4)
push af
ld a, [W_ENEMYBATTSTATUS2] ; $d068
- bit 4, a
+ bit 4, a ; does mon have a substitute?
ld hl, Func_79747
ld b, BANK(Func_79747)
call nz, Bankswitch
@@ -61736,10 +61738,10 @@ asm_3e7a4: ; 3e7a4 (f:67a4)
call Func_3eed3
call Func_3cdec
ld a, [W_ENEMYBATTSTATUS2] ; $d068
- bit 4, a
+ bit 4, a ; does mon have a substitute?
ld hl, Func_79771
ld b, BANK(Func_79771)
- call nz, Bankswitch
+ call nz, Bankswitch ; slide the substitute's sprite out
jr asm_3e7ef
Func_3e7d1: ; 3e7d1 (f:67d1)
@@ -61747,9 +61749,9 @@ Func_3e7d1: ; 3e7d1 (f:67d1)
ld c, $1e
call DelayFrames
ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
- cp $2b
+ cp FLY_EFFECT
jr z, .asm_3e7e6
- cp $27
+ cp CHARGE_EFFECT
jr z, .asm_3e7e6
jr asm_3e7ef
.asm_3e7e6
@@ -61759,17 +61761,17 @@ Func_3e7d1: ; 3e7d1 (f:67d1)
call PlayMoveAnimation
asm_3e7ef: ; 3e7ef (f:67ef)
ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
- cp $9
- jr nz, .asm_3e7ff
+ cp MIRROR_MOVE_EFFECT
+ jr nz, .notMirrorMoveEffect
call MirrorMoveCopyMove
jp z, Func_3e88c
jp Func_3e6fc
-.asm_3e7ff
- cp $53
- jr nz, .asm_3e809
+.notMirrorMoveEffect
+ cp METRONOME_EFFECT
+ jr nz, .notMetronomeEffect
call MetronomePickMove
jp Func_3e6fc
-.asm_3e809
+.notMetronomeEffect
ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
ld hl, EffectsArray3 ; $4014
ld de, $1
@@ -61780,7 +61782,7 @@ asm_3e7ef: ; 3e7ef (f:67ef)
jr z, .asm_3e82b
call Func_3dbe2
ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
- cp $7
+ cp EXPLODE_EFFECT
jr z, .asm_3e83e
jp Func_3e88c
.asm_3e82b
@@ -61802,15 +61804,15 @@ asm_3e7ef: ; 3e7ef (f:67ef)
ret z
call HandleBuildingRage
ld hl, W_ENEMYBATTSTATUS1 ; $d067
- bit 2, [hl]
+ bit 2, [hl] ; is mon hitting multiple times? (example: double kick)
jr z, .asm_3e873
push hl
ld hl, $d06f
dec [hl]
pop hl
jp nz, Func_3e794
- res 2, [hl]
- ld hl, UnnamedText_3e887 ; $6887
+ res 2, [hl] ; mon is no longer hitting multiple times
+ ld hl, HitXTimesText ; $6887
call PrintText
xor a
ld [$cd05], a
@@ -61824,8 +61826,8 @@ asm_3e7ef: ; 3e7ef (f:67ef)
call nc, Func_3f132
jr Func_3e88c
-UnnamedText_3e887: ; 3e887 (f:6887)
- TX_FAR _UnnamedText_3e887
+HitXTimesText: ; 3e887 (f:6887)
+ TX_FAR _HitXTimesText
db "@"
Func_3e88c: ; 3e88c (f:688c)
@@ -61999,9 +62001,9 @@ asm_3e9d3: ; 3e9d3 (f:69d3)
and $cc
ld [hl], a
ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
- cp $2b
+ cp FLY_EFFECT
jr z, .asm_3e9e7
- cp $27
+ cp CHARGE_EFFECT
jr z, .asm_3e9e7
jr .asm_3e9f0
.asm_3e9e7
@@ -62014,7 +62016,7 @@ asm_3e9d3: ; 3e9d3 (f:69d3)
jp Func_3eab8
asm_3e9f6: ; 3e9f6 (f:69f6)
ld hl, W_ENEMYBATTSTATUS1 ; $d067
- bit 0, [hl]
+ bit 0, [hl] ; is mon using bide?
jr z, .asm_3ea54
xor a
ld [W_ENEMYMOVENUM], a ; $cfcc
@@ -62063,7 +62065,7 @@ asm_3e9f6: ; 3e9f6 (f:69f6)
ld hl, asm_3e782 ; $6782
jp Func_3eab8
.asm_3ea54
- bit 1, [hl]
+ bit 1, [hl] ; is mon using thrash or petal dance?
jr z, .asm_3ea83
ld a, THRASH
ld [W_ENEMYMOVENUM], a ; $cfcc
@@ -62075,8 +62077,8 @@ asm_3e9f6: ; 3e9f6 (f:69f6)
jp nz, Func_3eab8
push hl
ld hl, W_ENEMYBATTSTATUS1 ; $d067
- res 1, [hl]
- set 7, [hl]
+ res 1, [hl] ; mon is no longer using thrash or petal dance
+ set 7, [hl] ; mon is now confused
call GenRandomInBattle
and $3
inc a
@@ -62085,7 +62087,7 @@ asm_3e9f6: ; 3e9f6 (f:69f6)
pop hl
jp Func_3eab8
.asm_3ea83
- bit 5, [hl]
+ bit 5, [hl] ; is mon using multi-turn move?
jp z, Func_3ea9b
ld hl, AttackContinuesText ; $5a7e
call PrintText
@@ -62097,7 +62099,7 @@ asm_3e9f6: ; 3e9f6 (f:69f6)
Func_3ea9b: ; 3ea9b (f:6a9b)
ld a, [W_ENEMYBATTSTATUS2] ; $d068
- bit 6, a
+ bit 6, a ; is mon using rage?
jp z, Func_3eaba
ld a, RAGE
ld [$d11e], a
@@ -63074,14 +63076,14 @@ JumpMoveEffect: ; 3f138 (f:7138)
jp [hl] ;jump to special effect handler
MoveEffectPointerTable: ; 3f150 (f:7150)
- dw Func_3f1fc
+ dw Func_3f1fc ;
dw Func_3f24f
- dw Func_3f2e9
+ dw DrainHPEffect
dw FreezeBurnParalyzeEffect
dw FreezeBurnParalyzeEffect
dw FreezeBurnParalyzeEffect
- dw Func_3f2f1
- dw Func_3f2e9
+ dw ExplodeEffect
+ dw DrainHPEffect
dw $0000
dw Func_3f428
dw Func_3f428
@@ -63137,8 +63139,8 @@ MoveEffectPointerTable: ; 3f150 (f:7150)
dw Func_3f54c
dw Func_3f54c
dw Func_3f54c
- dw Func_3fb36
- dw Func_3fb36
+ dw ReflectLightScreenEffect
+ dw ReflectLightScreenEffect
dw Func_3f24f
dw Func_3f9b1
dw Func_3f54c
@@ -63172,8 +63174,8 @@ Func_3f1fc: ; 3f1fc (f:71fc)
Func_3f20e: ; 3f20e (f:720e)
ld a, [bc]
- bit 5, a
- res 5, a
+ bit 5, a ; does the mon need to recharge? (hyper beam)
+ res 5, a ; mon no longer needs to recharge
ld [bc], a
jr nz, .asm_3f231
ld a, [de]
@@ -63305,12 +63307,12 @@ UnnamedText_3f2e4: ; 3f2e4 (f:72e4)
TX_FAR _UnnamedText_3f2e4
db "@"
-Func_3f2e9: ; 3f2e9 (f:72e9)
- ld hl, Func_783f
- ld b, BANK(Func_783f)
+DrainHPEffect: ; 3f2e9 (f:72e9)
+ ld hl, DrainHPEffect_
+ ld b, BANK(DrainHPEffect_)
jp Bankswitch
-Func_3f2f1: ; 3f2f1 (f:72f1)
+ExplodeEffect: ; 3f2f1 (f:72f1)
ld hl, W_PLAYERMONCURHP ; $d015
ld de, W_PLAYERBATTSTATUS2 ; $d063
ld a, [H_WHOSETURN] ; $fff3
@@ -63320,12 +63322,12 @@ Func_3f2f1: ; 3f2f1 (f:72f1)
ld de, W_ENEMYBATTSTATUS2 ; $d068
.asm_3f302
xor a
- ld [hli], a
+ ld [hli], a ; set the mon's HP to 0
ld [hli], a
inc hl
- ld [hl], a
+ ld [hl], a ; set mon's status to 0
ld a, [de]
- res 7, a
+ res 7, a ; clear mon's leech seed status
ld [de], a
ret
@@ -63682,13 +63684,13 @@ Func_3f54c: ; 3f54c (f:754c)
call CheckTargetSubstitute
jp nz, Func_3f65a
ld a, [de]
- cp $44
+ cp ATTACK_DOWN_SIDE_EFFECT
jr c, .asm_3f58a
call GenRandomInBattle
- cp $55
+ cp SPLASH_EFFECT
jp nc, Func_3f650
ld a, [de]
- sub $44
+ sub ATTACK_DOWN_SIDE_EFFECT
jr .asm_3f5a9
.asm_3f58a
push hl
@@ -63823,7 +63825,7 @@ Func_3f64d: ; 3f64d (f:764d)
Func_3f650: ; 3f650 (f:7650)
ld a, [de]
- cp $44
+ cp ATTACK_DOWN_SIDE_EFFECT
ret nc
ld hl, UnnamedText_3fb3e ; $7b3e
jp PrintText
@@ -63973,7 +63975,7 @@ Func_3f739: ; 3f739 (f:7739)
ld a, [W_PLAYERMOVENUM] ; $cfd2
cp $64
jp nz, Func_3fb5e
- jp Func_3fb53
+ jp PrintButItFailedText_
.asm_3f76e
call ReadPlayerMonCurHPAndStatus
xor a
@@ -63989,7 +63991,7 @@ Func_3f739: ; 3f739 (f:7739)
ld a, [W_PLAYERMOVENUM] ; $cfd2
cp $64
jp nz, PrintText
- jp Func_3fb53
+ jp PrintButItFailedText_
.asm_3f791
ld a, [W_ISINBATTLE] ; $d057
dec a
@@ -64015,7 +64017,7 @@ Func_3f739: ; 3f739 (f:7739)
ld a, [W_ENEMYMOVENUM] ; $cfcc
cp TELEPORT
jp nz, Func_3fb5e
- jp Func_3fb53
+ jp PrintButItFailedText_
.asm_3f7c1
call ReadPlayerMonCurHPAndStatus
xor a
@@ -64417,7 +64419,7 @@ Func_3f9ed: ; 3f9ed (f:79ed)
ld hl, UnnamedText_3fa77
jp PrintText
.asm_3fa74
- jp Func_3fb53
+ jp PrintButItFailedText_
UnnamedText_3fa77: ; 3fa77 (f:7a77)
TX_FAR _UnnamedText_3fa77
@@ -64510,7 +64512,7 @@ Func_3fa8a: ; 3fa8a (f:7a8a)
.asm_3fb05
pop hl
.asm_3fb06
- jp Func_3fb53
+ jp PrintButItFailedText_
UnnamedText_3fb09: ; 3fb09 (f:7b09)
TX_FAR _UnnamedText_3fb09
@@ -64541,9 +64543,9 @@ Func_3fb2e: ; 3fb2e (f:7b2e)
ld b, BANK(Func_3bab1)
jp Bankswitch
-Func_3fb36: ; 3fb36 (f:7b36)
- ld hl, Func_3bb97
- ld b, BANK(Func_3bb97)
+ReflectLightScreenEffect: ; 3fb36 (f:7b36)
+ ld hl, ReflectLightScreenEffect_
+ ld b, BANK(ReflectLightScreenEffect_)
jp Bankswitch
UnnamedText_3fb3e: ; 3fb3e (f:7b3e)
@@ -64563,12 +64565,12 @@ Func_3fb4e: ; 3fb4e (f:7b4e)
and a
ret nz
-Func_3fb53: ; 3fb53 (f:7b53)
- ld hl, UnnamedText_3fb59 ; $7b59
+PrintButItFailedText_: ; 3fb53 (f:7b53)
+ ld hl, ButItFailedText ; $7b59
jp PrintText
-UnnamedText_3fb59: ; 3fb59 (f:7b59)
- TX_FAR _UnnamedText_3fb59
+ButItFailedText: ; 3fb59 (f:7b59)
+ TX_FAR _ButItFailedText
db "@"
Func_3fb5e: ; 3fb5e (f:7b5e)
diff --git a/text.asm b/text.asm
index 5ae15d39..8cf6e3f4 100644
--- a/text.asm
+++ b/text.asm
@@ -1340,23 +1340,23 @@ _UnnamedText_3db80:: ; 89a73 (22:5a73)
text "!"
done
-_UnnamedText_3dc42:: ; 89a76 (22:5a76)
+_AttackMissedText:: ; 89a76 (22:5a76)
text $5a, "'s"
line "attack missed!"
prompt
-_UnnamedText_3dc47:: ; 89a89 (22:5a89)
+_KeptGoingAndCrashedText:: ; 89a89 (22:5a89)
text $5a
line "kept going and"
cont "crashed!"
prompt
-_UnnamedText_3dc4c:: ; 89aa4 (22:5aa4)
+_UnaffectedText:: ; 89aa4 (22:5aa4)
text $59, "'s"
line "unaffected!"
prompt
-_UnnamedText_3dc57:: ; 89ab4 (22:5ab4)
+_DoesntAffectMonText:: ; 89ab4 (22:5ab4)
text "It doesn't affect"
line $59, "!"
prompt
@@ -1420,7 +1420,7 @@ _MirrorMoveFailedText:: ; 89b96 (22:5b96)
next "failed!"
prompt
-_UnnamedText_3e887:: ; 89baf (22:5baf)
+_HitXTimesText:: ; 89baf (22:5baf)
text "Hit @"
TX_NUM $cd05, 1, 1
text " times!"
@@ -2207,7 +2207,7 @@ _UnnamedText_3fb49:: ; 948c9 (25:48c9)
text "No effect!"
prompt
-_UnnamedText_3fb59:: ; 948d5 (25:48d5)
+_ButItFailedText:: ; 948d5 (25:48d5)
text "But, it failed! "
prompt
@@ -2301,13 +2301,13 @@ _UnnamedText_3bb92:: ; 94a6c (25:4a6c)
text "!"
prompt
-_UnnamedText_3bbd7:: ; 94a87 (25:4a87)
+_LightScreenProtectedText:: ; 94a87 (25:4a87)
text $5a, "'s"
line "protected against"
cont "special attacks!"
prompt
-_UnnamedText_3bbdc:: ; 94aae (25:4aae)
+_ReflectGainedArmorText:: ; 94aae (25:4aae)
text $5a
line "gained armor!"
prompt
@@ -2317,12 +2317,12 @@ _UnnamedText_33f52:: ; 94abf (25:4abf)
line "shrouded in mist!"
prompt
-_UnnamedText_78dc:: ; 94ad5 (25:4ad5)
+_SuckedHealthText:: ; 94ad5 (25:4ad5)
text "Sucked health from"
line $59, "!"
prompt
-_UnnamedText_78e1:: ; 94aec (25:4aec)
+_DreamEatenText:: ; 94aec (25:4aec)
text $59, "'s"
line "dream was eaten!"
prompt