Merge pull request #1299 from LOuroboros/cacophony

Cacophony
This commit is contained in:
ghoulslash 2020-12-21 09:47:52 -07:00 committed by GitHub
commit a1e3700d10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -155,7 +155,7 @@ const u8 gAbilityNames[ABILITIES_COUNT][ABILITY_NAME_LENGTH + 1] =
[ABILITY_WHITE_SMOKE] = _("WHITE SMOKE"), [ABILITY_WHITE_SMOKE] = _("WHITE SMOKE"),
[ABILITY_PURE_POWER] = _("PURE POWER"), [ABILITY_PURE_POWER] = _("PURE POWER"),
[ABILITY_SHELL_ARMOR] = _("SHELL ARMOR"), [ABILITY_SHELL_ARMOR] = _("SHELL ARMOR"),
[ABILITY_CACOPHONY] = _("CACOPHONY"), // [ABILITY_CACOPHONY] = _("CACOPHONY"),
[ABILITY_AIR_LOCK] = _("AIR LOCK"), [ABILITY_AIR_LOCK] = _("AIR LOCK"),
}; };
@ -237,6 +237,6 @@ const u8 *const gAbilityDescriptionPointers[ABILITIES_COUNT] =
[ABILITY_WHITE_SMOKE] = sWhiteSmokeDescription, [ABILITY_WHITE_SMOKE] = sWhiteSmokeDescription,
[ABILITY_PURE_POWER] = sPurePowerDescription, [ABILITY_PURE_POWER] = sPurePowerDescription,
[ABILITY_SHELL_ARMOR] = sShellArmorDescription, [ABILITY_SHELL_ARMOR] = sShellArmorDescription,
[ABILITY_CACOPHONY] = sCacophonyDescription, // [ABILITY_CACOPHONY] = sCacophonyDescription,
[ABILITY_AIR_LOCK] = sAirLockDescription, [ABILITY_AIR_LOCK] = sAirLockDescription,
}; };