diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-26 11:01:15 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-26 11:01:15 -0500 |
| commit | a0cc4a33929f6aeb08a733c4a985c3bbb24ef55f (patch) | |
| tree | 5bc7b5bc64310f9da231b89528d0802a7414df5e | |
| parent | 662b3459f606ebe1018c21f4bde11bddb7eb1efd (diff) | |
Move power data belongs in data/moves/
| -rw-r--r-- | data/moves/flail_reversal_power.asm (renamed from data/battle/flail_reversal_power.asm) | 0 | ||||
| -rw-r--r-- | data/moves/magnitude_power.asm (renamed from data/battle/magnitude_power.asm) | 0 | ||||
| -rw-r--r-- | data/moves/present_power.asm (renamed from data/battle/present_power.asm) | 0 | ||||
| -rw-r--r-- | engine/battle/effect_commands.asm | 4 | ||||
| -rwxr-xr-x | engine/battle/effect_commands/present.asm | 2 |
5 files changed, 3 insertions, 3 deletions
diff --git a/data/battle/flail_reversal_power.asm b/data/moves/flail_reversal_power.asm index fb915905e..fb915905e 100644 --- a/data/battle/flail_reversal_power.asm +++ b/data/moves/flail_reversal_power.asm diff --git a/data/battle/magnitude_power.asm b/data/moves/magnitude_power.asm index 7359bdb10..7359bdb10 100644 --- a/data/battle/magnitude_power.asm +++ b/data/moves/magnitude_power.asm diff --git a/data/battle/present_power.asm b/data/moves/present_power.asm index 885e9c692..885e9c692 100644 --- a/data/battle/present_power.asm +++ b/data/moves/present_power.asm 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" |