summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIdain <luiscarlosholguinperez@outlook.com>2021-09-13 22:47:46 -0400
committerIdain <luiscarlosholguinperez@outlook.com>2021-09-13 22:47:46 -0400
commitb917c7e134e6ab7bfdd53ce573a5740c3432ce2f (patch)
treec56a61ce1db0b4dd634ff32e9679193aa98f368f
parent2ffd53830d10404a071d2d9726a38fae910f7a9e (diff)
Adding some improvements
-rw-r--r--Make-new-battle-text-to-distinguish-status-move-misses-and-fails.md27
1 files changed, 14 insertions, 13 deletions
diff --git a/Make-new-battle-text-to-distinguish-status-move-misses-and-fails.md b/Make-new-battle-text-to-distinguish-status-move-misses-and-fails.md
index 9968cff..1666d4e 100644
--- a/Make-new-battle-text-to-distinguish-status-move-misses-and-fails.md
+++ b/Make-new-battle-text-to-distinguish-status-move-misses-and-fails.md
@@ -48,9 +48,9 @@ BattleCommand_Poison:
PrintDidntAffect2:
call AnimateFailedMove
- ld hl, DidntAffect1Text ; 'it didn't affect'
-+ ld hl, AvoidStatusText ; 'it didn't affect'
- ld de, DidntAffect2Text ; 'it didn't affect'
-+ ld de, ProtectingItselfText ; Protect Text
++ ld hl, AvoidStatusText ; 'it didn't affect'
++ ld de, ProtectingItselfText ; 'protecting itself'
jp FailText_CheckOpponentProtect
```
@@ -65,15 +65,16 @@ First, edit [data/text/battle.asm](../blob/master/data/text/battle.asm) again:
+AlreadyBurnedText:
+ text "<TARGET>'s"
+ line "already burned!"
-+ done
++ prompt
+
+AlreadyFrozenText:
+ text "<TARGET>'s"
+ line "already frozen!"
-+ done
++ prompt
```
-The frozen and burn status are added to prompt the player that the enemy has a status so they won't try inflicting status conditions again.
+**NOTE**: The frozen and burn status are added to prompt the player that the enemy already has a status so they won't try inflicting another one again.
+
Next, edit [engine/battle/effect_commands.asm](../blob/master/engine/battle/effect_commands.asm):
@@ -98,9 +99,9 @@ UpdateMoveData:
+CheckForStatusIfAlreadyHasAny:
+ ld a, BATTLE_VARS_STATUS_OPP
-+ call GetBattleVarAddr
-+ ld d, h
-+ ld e, l
++ call GetBattleVarAddr
++ ld d, h
++ ld e, l
+ and SLP
+ ld hl, AlreadyAsleepText
+ ret nz
@@ -130,10 +131,10 @@ BattleCommand_SleepTarget:
+ call CheckForStatusIfAlreadyHasAny
+ jr nz, .fail
- ld a, BATTLE_VARS_STATUS_OPP
- call GetBattleVarAddr
- ld d, h
- ld e, l
+- ld a, BATTLE_VARS_STATUS_OPP
+- call GetBattleVarAddr
+- ld d, h
+- ld e, l
- ld a, [de]
- and SLP
- ld hl, AlreadyAsleepText
@@ -186,7 +187,7 @@ BattleCommand_Paralyze:
- bit PAR, a
- jr nz, .paralyzed
+ call CheckForStatusIfAlreadyHasAny
- jr nz, .hasstatus
++ jr nz, .hasstatus
...