aboutsummaryrefslogtreecommitdiffstats
path: root/data/battle
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-06-23 17:50:50 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-06-23 17:50:50 -0400
commit0a62d48df2d73c11ca13e4c3015d3d3abfa20292 (patch)
tree530f89782772bb76a76fbdd28247f1c6e3248483 /data/battle
parentMerge pull request #243 from Nog-Frog/rename-unused-cd40 (diff)
downloadpokeyellow-0a62d48df2d73c11ca13e4c3015d3d3abfa20292.tar.gz
pokeyellow-0a62d48df2d73c11ca13e4c3015d3d3abfa20292.tar.xz
pokeyellow-0a62d48df2d73c11ca13e4c3015d3d3abfa20292.zip
Move more tables from engine/ to data/
This also splits the end of engine/battle/core.asm into engine/battle/effects.asm.
Diffstat (limited to 'data/battle')
-rw-r--r--data/battle/always_happen_effects.asm13
-rw-r--r--data/battle/critical_hit_moves.asm6
-rw-r--r--data/battle/residual_effects_1.asm20
-rw-r--r--data/battle/residual_effects_2.asm32
-rw-r--r--data/battle/set_damage_effects.asm6
-rw-r--r--data/battle/special_effects.asm24
-rw-r--r--data/battle/stat_modifiers.asm15
-rw-r--r--data/battle/unused_critical_hit_moves.asm6
8 files changed, 122 insertions, 0 deletions
diff --git a/data/battle/always_happen_effects.asm b/data/battle/always_happen_effects.asm
new file mode 100644
index 00000000..4b6d466f
--- /dev/null
+++ b/data/battle/always_happen_effects.asm
@@ -0,0 +1,13 @@
+AlwaysHappenSideEffects:
+; Attacks that aren't finished after they faint the opponent.
+ db DRAIN_HP_EFFECT
+ db EXPLODE_EFFECT
+ db DREAM_EATER_EFFECT
+ db PAY_DAY_EFFECT
+ db TWO_TO_FIVE_ATTACKS_EFFECT
+ db $1E
+ db ATTACK_TWICE_EFFECT
+ db RECOIL_EFFECT
+ db TWINEEDLE_EFFECT
+ db RAGE_EFFECT
+ db -1
diff --git a/data/battle/critical_hit_moves.asm b/data/battle/critical_hit_moves.asm
new file mode 100644
index 00000000..ee7543e8
--- /dev/null
+++ b/data/battle/critical_hit_moves.asm
@@ -0,0 +1,6 @@
+HighCriticalMoves:
+ db KARATE_CHOP
+ db RAZOR_LEAF
+ db CRABHAMMER
+ db SLASH
+ db $FF
diff --git a/data/battle/residual_effects_1.asm b/data/battle/residual_effects_1.asm
new file mode 100644
index 00000000..36e28391
--- /dev/null
+++ b/data/battle/residual_effects_1.asm
@@ -0,0 +1,20 @@
+; These are move effects (second value from the Moves table in bank $E).
+ResidualEffects1:
+; most non-side effects
+ db CONVERSION_EFFECT
+ db HAZE_EFFECT
+ db SWITCH_AND_TELEPORT_EFFECT
+ db MIST_EFFECT
+ db FOCUS_ENERGY_EFFECT
+ db CONFUSION_EFFECT
+ db HEAL_EFFECT
+ db TRANSFORM_EFFECT
+ db LIGHT_SCREEN_EFFECT
+ db REFLECT_EFFECT
+ db POISON_EFFECT
+ db PARALYZE_EFFECT
+ db SUBSTITUTE_EFFECT
+ db MIMIC_EFFECT
+ db LEECH_SEED_EFFECT
+ db SPLASH_EFFECT
+ db -1
diff --git a/data/battle/residual_effects_2.asm b/data/battle/residual_effects_2.asm
new file mode 100644
index 00000000..cde55cc9
--- /dev/null
+++ b/data/battle/residual_effects_2.asm
@@ -0,0 +1,32 @@
+ResidualEffects2:
+; non-side effects not included in ResidualEffects1
+; stat-affecting moves, sleep-inflicting moves, and Bide
+; e.g., Meditate, Bide, Hypnosis
+ db $01
+ db ATTACK_UP1_EFFECT
+ db DEFENSE_UP1_EFFECT
+ db SPEED_UP1_EFFECT
+ db SPECIAL_UP1_EFFECT
+ db ACCURACY_UP1_EFFECT
+ db EVASION_UP1_EFFECT
+ db ATTACK_DOWN1_EFFECT
+ db DEFENSE_DOWN1_EFFECT
+ db SPEED_DOWN1_EFFECT
+ db SPECIAL_DOWN1_EFFECT
+ db ACCURACY_DOWN1_EFFECT
+ db EVASION_DOWN1_EFFECT
+ db BIDE_EFFECT
+ db SLEEP_EFFECT
+ db ATTACK_UP2_EFFECT
+ db DEFENSE_UP2_EFFECT
+ db SPEED_UP2_EFFECT
+ db SPECIAL_UP2_EFFECT
+ db ACCURACY_UP2_EFFECT
+ db EVASION_UP2_EFFECT
+ db ATTACK_DOWN2_EFFECT
+ db DEFENSE_DOWN2_EFFECT
+ db SPEED_DOWN2_EFFECT
+ db SPECIAL_DOWN2_EFFECT
+ db ACCURACY_DOWN2_EFFECT
+ db EVASION_DOWN2_EFFECT
+ db -1
diff --git a/data/battle/set_damage_effects.asm b/data/battle/set_damage_effects.asm
new file mode 100644
index 00000000..3fc75e41
--- /dev/null
+++ b/data/battle/set_damage_effects.asm
@@ -0,0 +1,6 @@
+SetDamageEffects:
+; moves that do damage but not through normal calculations
+; e.g., Super Fang, Psywave
+ db SUPER_FANG_EFFECT
+ db SPECIAL_DAMAGE_EFFECT
+ db -1
diff --git a/data/battle/special_effects.asm b/data/battle/special_effects.asm
new file mode 100644
index 00000000..0db05b9a
--- /dev/null
+++ b/data/battle/special_effects.asm
@@ -0,0 +1,24 @@
+SpecialEffects:
+; Effects from arrays 2, 4, and 5B, minus Twineedle and Rage.
+; Includes all effects that do not need to be called at the end of
+; ExecutePlayerMove (or ExecuteEnemyMove), because they have already been handled
+ db DRAIN_HP_EFFECT
+ db EXPLODE_EFFECT
+ db DREAM_EATER_EFFECT
+ db PAY_DAY_EFFECT
+ db SWIFT_EFFECT
+ db TWO_TO_FIVE_ATTACKS_EFFECT
+ db $1E
+ db CHARGE_EFFECT
+ db SUPER_FANG_EFFECT
+ db SPECIAL_DAMAGE_EFFECT
+ db FLY_EFFECT
+ db ATTACK_TWICE_EFFECT
+ db JUMP_KICK_EFFECT
+ db RECOIL_EFFECT
+ ; fallthrough to Next EffectsArray
+SpecialEffectsCont:
+; damaging moves whose effect is executed prior to damage calculation
+ db THRASH_PETAL_DANCE_EFFECT
+ db TRAPPING_EFFECT
+ db -1
diff --git a/data/battle/stat_modifiers.asm b/data/battle/stat_modifiers.asm
new file mode 100644
index 00000000..c0a6355a
--- /dev/null
+++ b/data/battle/stat_modifiers.asm
@@ -0,0 +1,15 @@
+StatModifierRatios:
+; first byte is numerator, second byte is denominator
+ db 25, 100 ; 0.25
+ db 28, 100 ; 0.28
+ db 33, 100 ; 0.33
+ db 40, 100 ; 0.40
+ db 50, 100 ; 0.50
+ db 66, 100 ; 0.66
+ db 1, 1 ; 1.00
+ db 15, 10 ; 1.50
+ db 2, 1 ; 2.00
+ db 25, 10 ; 2.50
+ db 3, 1 ; 3.00
+ db 35, 10 ; 3.50
+ db 4, 1 ; 4.00
diff --git a/data/battle/unused_critical_hit_moves.asm b/data/battle/unused_critical_hit_moves.asm
new file mode 100644
index 00000000..84cb65ce
--- /dev/null
+++ b/data/battle/unused_critical_hit_moves.asm
@@ -0,0 +1,6 @@
+UnusedHighCriticalMoves:
+ db KARATE_CHOP
+ db RAZOR_LEAF
+ db CRABHAMMER
+ db SLASH
+ db $FF