summaryrefslogtreecommitdiff
path: root/include/data
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-07-16 13:35:17 -0700
committerGitHub <noreply@github.com>2018-07-16 13:35:17 -0700
commit06b3ce408f774c7192202308e783cc22bb8e7643 (patch)
tree68390ab7335854c9c0721192ec4b8d563d0a48fe /include/data
parent07ef76277021d5cddf14004e37e785c31fcea69b (diff)
parent118fa3afcee68deb3eeb2bc876a9afd02a45677c (diff)
Merge pull request #272 from DizzyEggg/final_battle_files_touches
Thoroughly document and label battle files
Diffstat (limited to 'include/data')
-rw-r--r--include/data/battle_moves.h2
-rw-r--r--include/data/text/abilities.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/data/battle_moves.h b/include/data/battle_moves.h
index 6489fe07f..00a6f7fdb 100644
--- a/include/data/battle_moves.h
+++ b/include/data/battle_moves.h
@@ -1,7 +1,7 @@
#ifndef GUARD_DATA_BATTLE_MOVES
#define GUARD_DATA_BATTLE_MOVES
-const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
+const struct BattleMove gBattleMoves[MOVES_COUNT] =
{
{ // MOVE_NONE
.effect = EFFECT_HIT,
diff --git a/include/data/text/abilities.h b/include/data/text/abilities.h
index 2efd76afc..3a1e989d2 100644
--- a/include/data/text/abilities.h
+++ b/include/data/text/abilities.h
@@ -80,7 +80,7 @@ static const u8 gShellArmorAbilityDescription[] = _("Blocks critical hits.");
static const u8 gCacophonyAbilityDescription[] = _("Avoids sound-based moves.");
static const u8 gAirLockAbilityDescription[] = _("Negates weather effects.");
-const u8 gAbilityNames[][ABILITY_NAME_LENGTH + 1] =
+const u8 gAbilityNames[ABILITIES_COUNT][ABILITY_NAME_LENGTH + 1] =
{
_("-------"),
_("STENCH"),
@@ -162,7 +162,7 @@ const u8 gAbilityNames[][ABILITY_NAME_LENGTH + 1] =
_("AIR LOCK"),
};
-const u8 *const gAbilityDescriptionPointers[] =
+const u8 *const gAbilityDescriptionPointers[ABILITIES_COUNT] =
{
gNoneAbilityDescription,
gStenchAbilityDescription,