Consolidate the duplicate stat level data files

pret · Jun 12, 2024 · 4f57e96 · 4f57e96
1 parent 8819f7b
commit 4f57e96
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 24 deletions.
diff --git a/data/battle/stat_multipliers.asm b/data/battle/stat_multipliers.asm
@@ -1,10 +1,10 @@
 ; Multiplier ratios for all stats from modifier -6 to +6
 ; (except accuracy, see data/battle/accuracy_multipliers.asm).
 
-; This table is identical to data/battle/stat_multipliers_2.asm.
-; This one is used by CalcBattleStats.
+; This table is INCLUDEd twice in different ROM banks:
+; once for CalcBattleStats (see engine/battle/effect_commands.asm),
+; and once for ApplyStatLevelMultiplier (see engine/battle/core.asm).
 
-StatLevelMultipliers:
 	db  25, 100 ; -6 =  25%
 	db  28, 100 ; -5 =  28%
 	db  33, 100 ; -4 =  33%

diff --git a/data/battle/stat_multipliers_2.asm b/data/battle/stat_multipliers_2.asm
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
@@ -6756,7 +6756,8 @@ ApplyStatLevelMultiplier:
 	pop bc
 	ret
 
-INCLUDE "data/battle/stat_multipliers_2.asm"
+StatLevelMultipliers_Applied:
+INCLUDE "data/battle/stat_multipliers.asm"
 
 BadgeStatBoosts:
 ; Raise the stats of the battle mon in wBattleMon

diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
@@ -4622,6 +4622,7 @@ GetStatName:
 
 INCLUDE "data/battle/stat_names.asm"
 
+StatLevelMultipliers:
 INCLUDE "data/battle/stat_multipliers.asm"
 
 BattleCommand_AllStatsUp: