From 77871c5edaaacf7b039f3a0becf9a8b76686c8e0 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 14 Dec 2020 16:25:58 -0300 Subject: [PATCH] Dealt with Cacophony By copy-pasting back in the BE's include/constants/abilities.h and commenting out the 2 instances where ABILITY_CACOPHONY is normally used in this branch. --- src/data/text/abilities.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/text/abilities.h b/src/data/text/abilities.h index 093119726d..aa6f829062 100644 --- a/src/data/text/abilities.h +++ b/src/data/text/abilities.h @@ -155,7 +155,7 @@ const u8 gAbilityNames[ABILITIES_COUNT][ABILITY_NAME_LENGTH + 1] = [ABILITY_WHITE_SMOKE] = _("WHITE SMOKE"), [ABILITY_PURE_POWER] = _("PURE POWER"), [ABILITY_SHELL_ARMOR] = _("SHELL ARMOR"), - [ABILITY_CACOPHONY] = _("CACOPHONY"), +// [ABILITY_CACOPHONY] = _("CACOPHONY"), [ABILITY_AIR_LOCK] = _("AIR LOCK"), }; @@ -237,6 +237,6 @@ const u8 *const gAbilityDescriptionPointers[ABILITIES_COUNT] = [ABILITY_WHITE_SMOKE] = sWhiteSmokeDescription, [ABILITY_PURE_POWER] = sPurePowerDescription, [ABILITY_SHELL_ARMOR] = sShellArmorDescription, - [ABILITY_CACOPHONY] = sCacophonyDescription, +// [ABILITY_CACOPHONY] = sCacophonyDescription, [ABILITY_AIR_LOCK] = sAirLockDescription, };