Consolidate the duplicate stat level data files

This commit is contained in:
Rangi42 2024-06-12 13:11:33 -04:00
parent 8819f7b117
commit 4f57e96f31
4 changed files with 6 additions and 24 deletions

View File

@ -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%

View File

@ -1,20 +0,0 @@
; 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.asm.
; This one is used by ApplyStatLevelMultiplier.
StatLevelMultipliers_Applied:
db 25, 100 ; -6 = 25%
db 28, 100 ; -5 = 28%
db 33, 100 ; -4 = 33%
db 40, 100 ; -3 = 40%
db 50, 100 ; -2 = 50%
db 66, 100 ; -1 = 66%
db 1, 1 ; 0 = 100%
db 15, 10 ; +1 = 150%
db 2, 1 ; +2 = 200%
db 25, 10 ; +3 = 250%
db 3, 1 ; +4 = 300%
db 35, 10 ; +5 = 350%
db 4, 1 ; +6 = 400%

View File

@ -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

View File

@ -4622,6 +4622,7 @@ GetStatName:
INCLUDE "data/battle/stat_names.asm"
StatLevelMultipliers:
INCLUDE "data/battle/stat_multipliers.asm"
BattleCommand_AllStatsUp: