From a0cc4a33929f6aeb08a733c4a985c3bbb24ef55f Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 26 Jan 2018 11:01:15 -0500 Subject: Move power data belongs in data/moves/ --- data/battle/flail_reversal_power.asm | 8 -------- data/battle/magnitude_power.asm | 9 --------- data/battle/present_power.asm | 6 ------ data/moves/flail_reversal_power.asm | 8 ++++++++ data/moves/magnitude_power.asm | 9 +++++++++ data/moves/present_power.asm | 6 ++++++ engine/battle/effect_commands.asm | 4 ++-- engine/battle/effect_commands/present.asm | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 data/battle/flail_reversal_power.asm delete mode 100644 data/battle/magnitude_power.asm delete mode 100644 data/battle/present_power.asm create mode 100644 data/moves/flail_reversal_power.asm create mode 100644 data/moves/magnitude_power.asm create mode 100644 data/moves/present_power.asm diff --git a/data/battle/flail_reversal_power.asm b/data/battle/flail_reversal_power.asm deleted file mode 100644 index fb915905e..000000000 --- a/data/battle/flail_reversal_power.asm +++ /dev/null @@ -1,8 +0,0 @@ -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/magnitude_power.asm b/data/battle/magnitude_power.asm deleted file mode 100644 index 7359bdb10..000000000 --- a/data/battle/magnitude_power.asm +++ /dev/null @@ -1,9 +0,0 @@ -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/present_power.asm b/data/battle/present_power.asm deleted file mode 100644 index 885e9c692..000000000 --- a/data/battle/present_power.asm +++ /dev/null @@ -1,6 +0,0 @@ -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/moves/flail_reversal_power.asm b/data/moves/flail_reversal_power.asm new file mode 100644 index 000000000..fb915905e --- /dev/null +++ b/data/moves/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/moves/magnitude_power.asm b/data/moves/magnitude_power.asm new file mode 100644 index 000000000..7359bdb10 --- /dev/null +++ b/data/moves/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/moves/present_power.asm b/data/moves/present_power.asm new file mode 100644 index 000000000..885e9c692 --- /dev/null +++ b/data/moves/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/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 55d56734c..604d9f2d9 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -3803,7 +3803,7 @@ BattleCommand_ConstantDamage: ; 35726 ld [hl], 1 ret -INCLUDE "data/battle/flail_reversal_power.asm" +INCLUDE "data/moves/flail_reversal_power.asm" BattleCommand_Counter: ; 35813 @@ -8934,7 +8934,7 @@ BattleCommand_GetMagnitude: ; 37991 pop bc ret -INCLUDE "data/battle/magnitude_power.asm" +INCLUDE "data/moves/magnitude_power.asm" BattleCommand_BatonPass: ; 379c9 diff --git a/engine/battle/effect_commands/present.asm b/engine/battle/effect_commands/present.asm index 1af6b4b49..24db2a7fb 100755 --- a/engine/battle/effect_commands/present.asm +++ b/engine/battle/effect_commands/present.asm @@ -85,4 +85,4 @@ BattleCommand_Present: ; 37874 .do_animation jp EndMoveEffect -INCLUDE "data/battle/present_power.asm" +INCLUDE "data/moves/present_power.asm" -- cgit v1.2.3