From a0cc4a33929f6aeb08a733c4a985c3bbb24ef55f Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 26 Jan 2018 11:01:15 -0500 Subject: [PATCH] Move power data belongs in data/moves/ --- data/{battle => moves}/flail_reversal_power.asm | 0 data/{battle => moves}/magnitude_power.asm | 0 data/{battle => moves}/present_power.asm | 0 engine/battle/effect_commands.asm | 4 ++-- engine/battle/effect_commands/present.asm | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename data/{battle => moves}/flail_reversal_power.asm (100%) rename data/{battle => moves}/magnitude_power.asm (100%) rename data/{battle => moves}/present_power.asm (100%) diff --git a/data/battle/flail_reversal_power.asm b/data/moves/flail_reversal_power.asm similarity index 100% rename from data/battle/flail_reversal_power.asm rename to data/moves/flail_reversal_power.asm diff --git a/data/battle/magnitude_power.asm b/data/moves/magnitude_power.asm similarity index 100% rename from data/battle/magnitude_power.asm rename to data/moves/magnitude_power.asm diff --git a/data/battle/present_power.asm b/data/moves/present_power.asm similarity index 100% rename from data/battle/present_power.asm rename to 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"