From e0088adb3f692e03e695f912bb0c4bf2e8189e75 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Wed, 10 Jan 2018 17:49:19 -0500
Subject: [PATCH] Other files belong in data/battle/

---
 data/{ => battle}/battle_text.asm                  |  0
 data/battle/critical_hits.asm                      | 14 +++++++-------
 .../effect_command_pointers.asm}                   |  0
 data/battle/stat_names.asm                         |  2 +-
 docs/move_effect_commands.md                       |  2 +-
 macros/scripts/battle_commands.asm                 |  2 +-
 main.asm                                           |  4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename data/{ => battle}/battle_text.asm (100%)
 rename data/{battle_command_pointers.asm => battle/effect_command_pointers.asm} (100%)

diff --git a/data/battle_text.asm b/data/battle/battle_text.asm
similarity index 100%
rename from data/battle_text.asm
rename to data/battle/battle_text.asm
diff --git a/data/battle/critical_hits.asm b/data/battle/critical_hits.asm
index dcbfa36fa..5800d57f4 100644
--- a/data/battle/critical_hits.asm
+++ b/data/battle/critical_hits.asm
@@ -9,10 +9,10 @@ CriticalHitMoves:
 	db -1
 
 CriticalHitChances:
-	db  7 percent     ; 0
-	db 12 percent + 2 ; 1
-	db 25 percent + 1 ; 2
-	db 33 percent + 1 ; 3
-	db 50 percent + 1 ; 4
-	db 50 percent + 1 ; 5
-	db 50 percent + 1 ; 6
+	db  7 percent     ;  0
+	db 12 percent + 2 ; +1
+	db 25 percent + 1 ; +2
+	db 33 percent + 1 ; +3
+	db 50 percent + 1 ; +4
+	db 50 percent + 1 ; +5
+	db 50 percent + 1 ; +6
diff --git a/data/battle_command_pointers.asm b/data/battle/effect_command_pointers.asm
similarity index 100%
rename from data/battle_command_pointers.asm
rename to data/battle/effect_command_pointers.asm
diff --git a/data/battle/stat_names.asm b/data/battle/stat_names.asm
index 86164ceb4..a144a225f 100644
--- a/data/battle/stat_names.asm
+++ b/data/battle/stat_names.asm
@@ -7,4 +7,4 @@ StatNames:
 	db "SPCL.DEF@"
 	db "ACCURACY@"
 	db "EVASION@"
-	db "ABILITY@"
+	db "ABILITY@" ; used for BattleCommand_Curse
diff --git a/docs/move_effect_commands.md b/docs/move_effect_commands.md
index b8b09c5c2..a7a779123 100644
--- a/docs/move_effect_commands.md
+++ b/docs/move_effect_commands.md
@@ -1,6 +1,6 @@
 # Move Effect Commands
 
-Defined in [macros/scripts/battle_commands.asm](/macros/scripts/battle_commands.asm) and [data/battle_command_pointers.asm:BattleCommandPointers](/data/battle_command_pointers.asm).
+Defined in [macros/scripts/battle_commands.asm](/macros/scripts/battle_commands.asm) and [data/battle/effect_command_pointers.asm:BattleCommandPointers](/data/battle/effect_command_pointers.asm).
 
 
 ## `$01`: `checkturn`
diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm
index 5933740f0..4ae8dbaf4 100644
--- a/macros/scripts/battle_commands.asm
+++ b/macros/scripts/battle_commands.asm
@@ -3,7 +3,7 @@ command: MACRO
 \1 EQUS "db \1_command"
 ENDM
 
-; BattleCommandPointers indexes (see data/battle_command_pointers.asm)
+; BattleCommandPointers indexes (see data/battle/effect_command_pointers.asm)
 	enum_start 1
 	command checkturn               ; 01
 	command checkobedience          ; 02
diff --git a/main.asm b/main.asm
index 5aedf7bd3..6a6344152 100644
--- a/main.asm
+++ b/main.asm
@@ -170,7 +170,7 @@ INCLUDE "data/trainers/parties.asm"
 SECTION "Battle Core", ROMX
 
 INCLUDE "engine/battle/core.asm"
-INCLUDE "data/battle_command_pointers.asm"
+INCLUDE "data/battle/effect_command_pointers.asm"
 
 
 SECTION "bank10", ROMX
@@ -300,7 +300,7 @@ SECTION "bank20", ROMX
 INCLUDE "engine/player_movement.asm"
 INCLUDE "engine/engine_flags.asm"
 INCLUDE "engine/variables.asm"
-INCLUDE "data/battle_text.asm"
+INCLUDE "data/battle/battle_text.asm"
 INCLUDE "engine/debug.asm"