summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2018-11-23 23:03:27 +0100
committermid-kid <esteve.varela@gmail.com>2018-11-23 23:03:27 +0100
commit5dfe652ff60008dd5f1ca6dd49322b2826d5fd52 (patch)
tree7894a02e56ccd619fc49006d2200bb8e587b83b2
parent41f39211ca3448ee79a6c65757bd703f247442fd (diff)
CalcStats -> CalcBattleStats
Confusingly ambiguous name
-rw-r--r--data/battle/stat_multipliers.asm2
-rw-r--r--engine/battle/effect_commands.asm6
2 files changed, 4 insertions, 4 deletions
diff --git a/data/battle/stat_multipliers.asm b/data/battle/stat_multipliers.asm
index 1b9b08588..bbb1cadd6 100644
--- a/data/battle/stat_multipliers.asm
+++ b/data/battle/stat_multipliers.asm
@@ -2,7 +2,7 @@
; (except accuracy, see data/battle/accuracy_multipliers.asm).
; This table is identical to data/battle/stat_multipliers_2.asm.
-; This one is used by CalcStats.
+; This one is used by CalcBattleStats.
StatLevelMultipliers:
db 25, 100 ; -6 = 25%
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
index f257b025c..8125115e8 100644
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -4853,7 +4853,7 @@ CalcPlayerStats:
ld bc, wBattleMonAttack
ld a, 5
- call CalcStats
+ call CalcBattleStats
ld hl, BadgeStatBoosts
call CallBattleCore
@@ -4874,7 +4874,7 @@ CalcEnemyStats:
ld bc, wEnemyMonAttack
ld a, 5
- call CalcStats
+ call CalcBattleStats
call BattleCommand_SwitchTurn
@@ -4886,7 +4886,7 @@ CalcEnemyStats:
jp BattleCommand_SwitchTurn
-CalcStats:
+CalcBattleStats:
.loop
push af
ld a, [hli]