ref: a0cc4a33929f6aeb08a733c4a985c3bbb24ef55f
parent: 662b3459f606ebe1018c21f4bde11bddb7eb1efd
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Fri Jan 26 06:01:15 EST 2018
Move power data belongs in data/moves/
--- a/data/battle/flail_reversal_power.asm
+++ /dev/null
@@ -1,8 +1,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
--- a/data/battle/magnitude_power.asm
+++ /dev/null
@@ -1,9 +1,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
--- a/data/battle/present_power.asm
+++ /dev/null
@@ -1,6 +1,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
--- /dev/null
+++ b/data/moves/flail_reversal_power.asm
@@ -1,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
--- /dev/null
+++ b/data/moves/magnitude_power.asm
@@ -1,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
--- /dev/null
+++ b/data/moves/present_power.asm
@@ -1,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
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -3803,7 +3803,7 @@
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 @@
pop bc
ret
-INCLUDE "data/battle/magnitude_power.asm"
+INCLUDE "data/moves/magnitude_power.asm"
BattleCommand_BatonPass: ; 379c9
--- a/engine/battle/effect_commands/present.asm
+++ b/engine/battle/effect_commands/present.asm
@@ -85,4 +85,4 @@
.do_animation
jp EndMoveEffect
-INCLUDE "data/battle/present_power.asm"
+INCLUDE "data/moves/present_power.asm"