More battle data in data/battle/

14 files changed, 173 insertions, 2 deletions

diff --git a/data/battle/accuracy_multipliers.asm b/data/battle/accuracy_multipliers.asm
index a5a309bbd..4b52a0909 100644
--- a/data/battle/accuracy_multipliers.asm
+++ b/data/battle/accuracy_multipliers.asm
@@ -1,5 +1,5 @@
 ; Multiplier ratios for accuracy from modifier -6 to +6
-; (for other stats, see data/battle/stat_multipliers.asm)
+; (for other stats, see data/battle/stat_multipliers.asm).
 
 AccuracyLevelMultipliers:
 	db  33, 100 ; -6 =  33%
diff --git a/data/battle/badge_type_boosts.asm b/data/battle/badge_type_boosts.asm
new file mode 100644
index 000000000..b212ef22e
--- /dev/null
+++ b/data/battle/badge_type_boosts.asm
@@ -0,0 +1,21 @@
+BadgeTypeBoosts:
+; entries correspond to wJohtoBadges constants
+	db FLYING   ; ZEPHYRBADGE
+	db BUG      ; HIVEBADGE
+	db NORMAL   ; PLAINBADGE
+	db GHOST    ; FOGBADGE
+	db STEEL    ; MINERALBADGE
+	db FIGHTING ; STORMBADGE
+	db ICE      ; GLACIERBADGE
+	db DRAGON   ; RISINGBADGE
+	; fallthrough
+; entries correspond to wKantoBadges constants
+	db ROCK     ; BOULDERBADGE
+	db WATER    ; CASCADEBADGE
+	db ELECTRIC ; THUNDERBADGE
+	db GRASS    ; RAINBOWBADGE
+	db POISON   ; SOULBADGE
+	db PSYCHIC  ; MARSHBADGE
+	db FIRE     ; VOLCANOBADGE
+	db GROUND   ; EARTHBADGE
+	db -1 ; end
diff --git a/data/battle/flail_reversal_power.asm b/data/battle/flail_reversal_power.asm
new file mode 100644
index 000000000..fb915905e
--- /dev/null
+++ b/data/battle/flail_reversal_power.asm
@@ -0,0 +1,8 @@
+FlailReversalPower:
+	; hp bar pixels, power
+	db HP_BAR_LENGTH_PX / 48,   200
+	db HP_BAR_LENGTH_PX / 12,   150
+	db HP_BAR_LENGTH_PX / 5,    100
+	db HP_BAR_LENGTH_PX / 3,     80
+	db HP_BAR_LENGTH_PX * 2 / 3, 40
+	db HP_BAR_LENGTH_PX,         20
diff --git a/data/battle/held_consumables.asm b/data/battle/held_consumables.asm
new file mode 100644
index 000000000..c1b28822c
--- /dev/null
+++ b/data/battle/held_consumables.asm
@@ -0,0 +1,26 @@
+; Held item effects that are consumed on use
+
+ConsumableEffects: ; 271de
+	db HELD_BERRY
+	db HELD_2
+	db HELD_5
+	db HELD_HEAL_POISON
+	db HELD_HEAL_FREEZE
+	db HELD_HEAL_BURN
+	db HELD_HEAL_SLEEP
+	db HELD_HEAL_PARALYZE
+	db HELD_HEAL_STATUS
+	db HELD_30
+	db HELD_ATTACK_UP
+	db HELD_DEFENSE_UP
+	db HELD_SPEED_UP
+	db HELD_SP_ATTACK_UP
+	db HELD_SP_DEFENSE_UP
+	db HELD_ACCURACY_UP
+	db HELD_EVASION_UP
+	db HELD_38
+	db HELD_71
+	db HELD_ESCAPE
+	db HELD_CRITICAL_UP
+	db -1
+; 271f4
diff --git a/data/battle/held_heal_status.asm b/data/battle/held_heal_status.asm
new file mode 100644
index 000000000..b56335189
--- /dev/null
+++ b/data/battle/held_heal_status.asm
@@ -0,0 +1,11 @@
+; See also data/items/heal_status.asm
+
+HeldStatusHealingEffects: ; 3de44
+	db HELD_HEAL_POISON,   1 << PSN
+	db HELD_HEAL_FREEZE,   1 << FRZ
+	db HELD_HEAL_BURN,     1 << BRN
+	db HELD_HEAL_SLEEP,    SLP
+	db HELD_HEAL_PARALYZE, 1 << PAR
+	db HELD_HEAL_STATUS,   ALL_STATUS
+	db -1 ; end
+; 3de51
diff --git a/data/battle/held_stat_up.asm b/data/battle/held_stat_up.asm
new file mode 100644
index 000000000..a08aa1844
--- /dev/null
+++ b/data/battle/held_stat_up.asm
@@ -0,0 +1,10 @@
+HeldStatUpItems:
+	dbw HELD_ATTACK_UP,     BattleCommand_AttackUp
+	dbw HELD_DEFENSE_UP,    BattleCommand_DefenseUp
+	dbw HELD_SPEED_UP,      BattleCommand_SpeedUp
+	dbw HELD_SP_ATTACK_UP,  BattleCommand_SpecialAttackUp
+	dbw HELD_SP_DEFENSE_UP, BattleCommand_SpecialDefenseUp
+	dbw HELD_ACCURACY_UP,   BattleCommand_AccuracyUp
+	dbw HELD_EVASION_UP,    BattleCommand_EvasionUp
+	db -1 ; end
+; 3df12
diff --git a/data/battle/magnitude_power.asm b/data/battle/magnitude_power.asm
new file mode 100644
index 000000000..7359bdb10
--- /dev/null
+++ b/data/battle/magnitude_power.asm
@@ -0,0 +1,9 @@
+MagnitudePower:
+	; chance, power, magnitude #
+	db  13,  10,  4
+	db  38,  30,  5
+	db  89,  50,  6
+	db 166,  70,  7
+	db 217,  90,  8
+	db 242, 110,  9
+	db 255, 150, 10
diff --git a/data/battle/metronome_exception_moves.asm b/data/battle/metronome_exception_moves.asm
new file mode 100644
index 000000000..e9cd7f860
--- /dev/null
+++ b/data/battle/metronome_exception_moves.asm
@@ -0,0 +1,18 @@
+; Metronome cannot turn into these moves.
+
+MetronomeExcepts: ; 37454
+	db NO_MOVE
+	db METRONOME
+	db STRUGGLE
+	db SKETCH
+	db MIMIC
+	db COUNTER
+	db MIRROR_COAT
+	db PROTECT
+	db DETECT
+	db ENDURE
+	db DESTINY_BOND
+	db SLEEP_TALK
+	db THIEF
+	db -1
+; 37462
diff --git a/data/battle/present_power.asm b/data/battle/present_power.asm
new file mode 100644
index 000000000..885e9c692
--- /dev/null
+++ b/data/battle/present_power.asm
@@ -0,0 +1,6 @@
+PresentPower:
+	; chance, power
+	db 40 percent,     40 ; 40%
+	db 70 percent + 1, 80 ; 30%
+	db 80 percent,    120 ; 10%
+	db -1                 ; 20% chance to heal instead
diff --git a/data/battle/stat_multipliers.asm b/data/battle/stat_multipliers.asm
index e7cf8e472..1b9b08588 100644
--- a/data/battle/stat_multipliers.asm
+++ b/data/battle/stat_multipliers.asm
@@ -1,5 +1,8 @@
 ; Multiplier ratios for all stats from modifier -6 to +6
-; (except accuracy, see data/battle/accuracy_multipliers.asm)
+; (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.
 
 StatLevelMultipliers:
 	db  25, 100 ; -6 =  25%
diff --git a/data/battle/stat_multipliers_2.asm b/data/battle/stat_multipliers_2.asm
new file mode 100644
index 000000000..3f3dc2348
--- /dev/null
+++ b/data/battle/stat_multipliers_2.asm
@@ -0,0 +1,20 @@
+; 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%
diff --git a/data/battle/weather_modifiers.asm b/data/battle/weather_modifiers.asm
new file mode 100644
index 000000000..d0acdc25f
--- /dev/null
+++ b/data/battle/weather_modifiers.asm
@@ -0,0 +1,10 @@
+WeatherTypeModifiers:
+	db WEATHER_RAIN, WATER, MORE_EFFECTIVE
+	db WEATHER_RAIN, FIRE,  NOT_VERY_EFFECTIVE
+	db WEATHER_SUN,  FIRE,  MORE_EFFECTIVE
+	db WEATHER_SUN,  WATER, NOT_VERY_EFFECTIVE
+	db -1 ; end
+
+WeatherMoveModifiers:
+	db WEATHER_RAIN, EFFECT_SOLARBEAM, NOT_VERY_EFFECTIVE
+	db -1 ; end
diff --git a/data/battle/wobble_probabilities.asm b/data/battle/wobble_probabilities.asm
new file mode 100644
index 000000000..38e9a12c6
--- /dev/null
+++ b/data/battle/wobble_probabilities.asm
@@ -0,0 +1,27 @@
+WobbleProbabilities:
+; catch rate, chance of wobbling / 255
+; nLeft/255 = (nRight/255) ** 4
+	db   1,  63
+	db   2,  75
+	db   3,  84
+	db   4,  90
+	db   5,  95
+	db   7, 103
+	db  10, 113
+	db  15, 126
+	db  20, 134
+	db  30, 149
+	db  40, 160
+	db  50, 169
+	db  60, 177
+	db  80, 191
+	db 100, 201
+	db 120, 211
+	db 140, 220
+	db 160, 227
+	db 180, 234
+	db 200, 240
+	db 220, 246
+	db 240, 251
+	db 254, 253
+	db 255, 255
diff --git a/data/items/heal_status.asm b/data/items/heal_status.asm
index f0b0148bb..29bb872e1 100644
--- a/data/items/heal_status.asm
+++ b/data/items/heal_status.asm
@@ -1,3 +1,5 @@
+; See also data/battle/held_heal_status.asm
+
 StatusHealingActions: ; f071
 	;  item,         party menu action text, status
 	db ANTIDOTE,     PARTYMENUTEXT_HEAL_PSN, 1 << PSN