Skip to content

Commit 6bed19b

Browse files
author
jojobear13
committed
removing redundant text
1 parent c9f5650 commit 6bed19b

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

‎engine/battle/core.asm‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4275,7 +4275,10 @@ PrintMoveFailureText:
42754275
and $7f
42764276
jr z, .gotTextToPrint ;0 for damage multipliers means defender is immune
42774277
4278-
ld hl, UnaffectedText
4278+
;joenote - Replace UnaffectedText with IsUnaffectedText
4279+
;It's the same thing in english, but it sounds better grammatically.
4280+
;UnaffectedText can then be commented out.
4281+
ld hl, IsUnaffectedText
42794282
ld a, [wCriticalHitOrOHKO]
42804283
cp $ff
42814284
jr z, .gotTextToPrint ;defender is unaffected if the attack was a failed OHKO move
@@ -4345,9 +4348,10 @@ KeptGoingAndCrashedText:
43454348
TX_FAR _KeptGoingAndCrashedText
43464349
db "@"
43474350

4348-
UnaffectedText:
4349-
TX_FAR _UnaffectedText
4350-
db "@"
4351+
;joenote - Redundant, so it can be commented out
4352+
;UnaffectedText:
4353+
; TX_FAR _UnaffectedText
4354+
; db "@"
43514355

43524356
PrintDoesntAffectText:
43534357
ld hl, DoesntAffectMonText

‎text.asm‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,10 +1357,11 @@ _KeptGoingAndCrashedText::
13571357
cont "crashed!"
13581358
prompt
13591359

1360-
_UnaffectedText::
1361-
text "<TARGET>'s"
1362-
line "unaffected!"
1363-
prompt
1360+
;joenote - the same in english as _IsUnaffectedText, so it's redundant
1361+
;_UnaffectedText::
1362+
; text "<TARGET>'s"
1363+
; line "unaffected!"
1364+
; prompt
13641365

13651366
_DoesntAffectMonText::
13661367
text "It doesn't affect"

0 commit comments

Comments
 (0)