Merge branch '_RHH/master' into _RHH/upcoming

# Conflicts:
#	src/data/items.h
#	src/pokemon_summary_screen.c

charmap.txt

@@ -61,13 +61,6 @@ UP_ARROW    = 79
 DOWN_ARROW  = 7A
 LEFT_ARROW  = 7B
 RIGHT_ARROW = 7C
-@ Case-fixing/unfixing chars
-@ These are 1-2 pixel spaces in vanilla.
-@ 7D collides with 'ヲ' in JP,
-@ but that kana is practically unused in JP text.
-FIXED_CASE  = 7D
-UNFIX_CASE  = 7E
-
 SUPER_E     = 84
 '<'         = 85
 '>'         = 86
@@ -354,10 +347,6 @@ ARCHIE         = FD 0A
 MAXIE          = FD 0B
 KYOGRE         = FD 0C
 GROUDON        = FD 0D
-@ Like STR_VAR_X, but prepends CHAR_FIXED_CASE
-STR_VAR_1_FIXED  = FD 82
-STR_VAR_2_FIXED  = FD 83
-STR_VAR_3_FIXED  = FD 84
 
 @ battle string placeholders
 

data/battle_anim_scripts.s

@@ -1879,8 +1879,8 @@ Move_LAST_RESORT:
 	waitforvisualfinish
 	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 4, 8, -256, ANIM_ATTACKER, 0
 	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 4, 8, -256, ANIM_TARGET, 0
-	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_PLAYER_RIGHT, 0, 4, 0, 12, 1
-	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_PLAYER_RIGHT, 1, 4, 0, 12, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
 	createsprite gSimplePaletteBlendSpriteTemplate, 2, 5, 1, 2, 16, 0, RGB_WHITE
 	waitforvisualfinish
 	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 4, 8, -256, ANIM_ATTACKER, 1
@@ -2363,7 +2363,7 @@ Move_AQUA_TAIL:
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 5, 1, -12, 10, 0, 3
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 3, 0, 0, 5
 	delay 3
-	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_PLAYER_RIGHT, 1, 0, 3, 6, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1
 	delay 5
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 3, 1, 0, 6
 	delay 10
@@ -2680,7 +2680,7 @@ Move_BRAVE_BIRD:
 Move_EARTH_POWER:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	loadspritegfx ANIM_TAG_FIRE_PLUME
-	createvisualtask AnimTask_HorizontalShake, 3, ANIM_PLAYER_RIGHT, 10, 50
+	createvisualtask AnimTask_HorizontalShake, 3, ANIM_DEF_PARTNER, 10, 50
 	createvisualtask AnimTask_HorizontalShake, 3, ANIM_TARGET, 10, 50
 	playsewithpan SE_M_EARTHQUAKE, SOUND_PAN_TARGET
 	delay 40
@@ -2768,7 +2768,7 @@ GigaImpactContinuity:
 	delay 1
 	createsprite gSlideMonToOffsetSpriteTemplate 2, 5, 1, -16, 0, 0, 4
 	waitforvisualfinish
-	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_PLAYER_RIGHT, 1, 4, 0, 12, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
 	waitforvisualfinish
 	delay 2
 	createsprite gSlideMonToOriginalPosSpriteTemplate 2, 3, 0, 0, 5
@@ -3201,7 +3201,7 @@ Move_ZEN_HEADBUTT:
 	delay 2
 	createsprite gBowMonSpriteTemplate, 2, 1, 1
 	waitforvisualfinish
-	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_PLAYER_RIGHT, 0, 2, 0, 4, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
 	createsprite gBowMonSpriteTemplate, 2, 1, 2
 	createsprite gAquaTailHitSpriteTemplate, 131, 4, 0, 0, 1, 1
@@ -3310,7 +3310,7 @@ Move_ROCK_CLIMB:
 	createsprite gBasicHitSplatSpriteTemplate, 131, 4, 5, -52, 1, 1
 	createsprite gSlideMonToOffsetSpriteTemplate, 2, 5, 1, -25, 16, 1, 4
 	delay 4
-	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_PLAYER_RIGHT, 1, 0, 3, 6, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1
 	delay 30
 	createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 3, 0, 0, 6
 	delay 4
@@ -3939,8 +3939,8 @@ Move_STONE_EDGE:
 	delay 2
 	createsprite gBasicHitSplatSpriteTemplate, 131, 4, -32, -16, 1, 3
 	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
-	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_PLAYER_RIGHT, 1, 3, 0, 12, 1
-	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_PLAYER_RIGHT, 3, 3, 0, 12, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1
 	delay 4
 	createsprite gRandomPosHitSplatSpriteTemplate, 131, 2, 1, 3
 	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
@@ -4322,8 +4322,8 @@ Move_ATTACK_ORDER:
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate 131, 4, -32, -16, 1, 3
 	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
-	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_PLAYER_RIGHT, 1, 3, 0, 12, 1
-	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_PLAYER_RIGHT, 1, 3, 0, 12, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
+	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
 	delay 4
 	createsprite gRandomPosHitSplatSpriteTemplate 131, 2, 1, 3
 	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
@@ -13070,7 +13070,7 @@ Move_SUNSTEEL_STRIKE::
 	setalpha 12, 8
 	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
 	createsprite gSunsteelStrikeBlackFlyBallTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150
-	createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 1, 26
+	createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATK_PARTNER, 1, 20
 	delay 0x18
 	createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0x0, 0x0     @The rock particles mess up the fly animation
 	createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0x0, 0x1
@@ -16176,7 +16176,7 @@ Move_CHLOROBLAST::
 	delay 0x10
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 74, 1
 	createsoundtask SoundTask_LoopSEAdjustPanning, 0xf0, 0xFF00 | SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x1, 0x17, 0x0, 0x5
-	createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 1, 67
+	createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATTACKER, 1, 67
 	call ChloroblastShot
 	call ChloroblastShot
 	call ChloroblastShot

data/battle_scripts_1.s

@@ -7055,6 +7055,13 @@ BattleScript_CudChewActivates::
 	setbyte sBERRY_OVERRIDE, 0
 	end3
 
+BattleScript_ApplyDisguiseFormChangeHPLoss::
+.if B_DISGUISE_HP_LOSS >= GEN_8
+	healthbarupdate BS_SCRIPTING
+	datahpupdate BS_SCRIPTING
+.endif
+	return
+
 BattleScript_TargetFormChangeNoPopup:
 	flushtextbox
 	handleformchange BS_SCRIPTING, 0
@@ -7062,10 +7069,7 @@ BattleScript_TargetFormChangeNoPopup:
 	playanimation BS_TARGET, B_ANIM_FORM_CHANGE
 	waitanimation
 	handleformchange BS_SCRIPTING, 2
-.if B_DISGUISE_HP_LOSS >= GEN_8
-	healthbarupdate BS_SCRIPTING
-	datahpupdate BS_SCRIPTING
-.endif
+	jumpifability BS_TARGET, ABILITY_DISGUISE, BattleScript_ApplyDisguiseFormChangeHPLoss
 	return
 
 BattleScript_TargetFormChange::

data/text/pc_transfer.inc

@@ -1,11 +1,11 @@
 gText_PkmnTransferredSomeonesPC::
-	.string "{STR_VAR_2_FIXED} was transferred to\n"
+	.string "{STR_VAR_2} was transferred to\n"
 	.string "SOMEONE'S PC.\p"
 	.string "It was placed in \n"
 	.string "BOX “{STR_VAR_1}.”$"
 
 gText_PkmnTransferredLanettesPC::
-	.string "{STR_VAR_2_FIXED} was transferred to\n"
+	.string "{STR_VAR_2} was transferred to\n"
 	.string "LANETTE'S PC.\p"
 	.string "It was placed in \n"
 	.string "BOX “{STR_VAR_1}.”$"
@@ -13,13 +13,13 @@ gText_PkmnTransferredLanettesPC::
 gText_PkmnTransferredSomeonesPCBoxFull::
 	.string "BOX “{STR_VAR_3}” on\n"
 	.string "SOMEONE'S PC was full.\p"
-	.string "{STR_VAR_2_FIXED} was transferred to\n"
+	.string "{STR_VAR_2} was transferred to\n"
 	.string "BOX “{STR_VAR_1}.”$"
 
 gText_PkmnTransferredLanettesPCBoxFull::
 	.string "BOX “{STR_VAR_3}” on\n"
 	.string "LANETTE'S PC was full.\p"
-	.string "{STR_VAR_2_FIXED} was transferred to\n"
+	.string "{STR_VAR_2} was transferred to\n"
 	.string "BOX “{STR_VAR_1}.”$"
 
 gText_NoMoreRoomForPokemon::

data/text/save.inc

@@ -7,14 +7,14 @@ gText_AlreadySavedFile::
 	.string "Is it okay to overwrite it?$"
 
 gText_SavingDontTurnOff::
-	.fixstr "SAVING…\n"
+	.string "SAVING…\n"
 	.string "DON'T TURN OFF THE POWER.$"
 
 gText_PlayerSavedGame::
 	.string "{PLAYER} saved the game.$"
 
 gText_DifferentSaveFile::
-	.string "{FIXED_CASE}WARNING!{UNFIX_CASE}\p"
+	.string "WARNING!\p"
 	.string "There is a different game file that\n"
 	.string "is already saved.\p"
 	.string "If you save now, the other file's\n"
@@ -29,5 +29,5 @@ gText_SaveError::
 	.string "backup memory.$"
 
 gText_SavingDontTurnOffPower::
-	.fixstr "SAVING…\n"
+	.string "SAVING…\n"
 	.string "DON'T TURN OFF THE POWER.$"

gflib/characters.h

@@ -77,9 +77,6 @@
 #define CHAR_DOWN_ARROW        0x7A
 #define CHAR_LEFT_ARROW        0x7B
 #define CHAR_RIGHT_ARROW       0x7C
-// Case-fixing characters
-#define CHAR_FIXED_CASE        0x7D
-#define CHAR_UNFIX_CASE        0x7E
 //
 #define CHAR_SUPER_E           0x84
 #define CHAR_LESS_THAN         0x85
@@ -265,10 +262,6 @@
 #define PLACEHOLDER_ID_MAXIE         0xB
 #define PLACEHOLDER_ID_KYOGRE        0xC
 #define PLACEHOLDER_ID_GROUDON       0xD
-// Fixed-case placeholders
-// These behave the same as their (id & 0x7F),
-// but prepend CHAR_FIXED_CASE
-#define PLACEHOLDER_FIXED_MASK       0x80
 
 // battle placeholders are located in battle_message.h
 

gflib/string_util.c

@@ -26,29 +26,11 @@ static const s32 sPowersOfTen[] =
     1000000000,
 };
 
-// Tries to determine whether `str` is safe to prepend a ctrl char to
-// gStringVarX are always safe, as well as stack allocated IWRAM
-// (if `length mod 4` is 1 or 2)
-bool32 IsStringAddrSafe(u8 *str, u32 length)
-{
-    if (((u32)str) >> 24 == 3)
-        return (str >= gStackBase && (length & 3) && (length & 3) <= 2);
-    return (str >= gStringVar1 && str < sUnknownStringVar);
-}
-
 u8 *StringCopy_Nickname(u8 *dest, const u8 *src)
 {
-    u32 i;
+    u8 i;
     u32 limit = POKEMON_NAME_LENGTH;
 
-    if (DECAP_ENABLED && !DECAP_NICKNAMES)
-    {
-        if (IsStringAddrSafe(dest, limit) && *src != CHAR_FIXED_CASE)
-            *dest++ = CHAR_FIXED_CASE;
-        else if (*src == CHAR_FIXED_CASE)
-            *dest++ = *src++;
-    }
-
     for (i = 0; i < limit; i++)
     {
         dest[i] = src[i];
@@ -66,9 +48,6 @@ u8 *StringGet_Nickname(u8 *str)
     u32 i;
     u32 limit = POKEMON_NAME_LENGTH;
 
-    if (DECAP_ENABLED && !DECAP_NICKNAMES && *str == CHAR_FIXED_CASE)
-        str++;
-
     for (i = 0; i < limit; i++)
         if (str[i] == EOS)
             return &str[i];
@@ -82,9 +61,6 @@ u8 *StringCopy_PlayerName(u8 *dest, const u8 *src)
     s32 i;
     s32 limit = PLAYER_NAME_LENGTH;
 
-    if (DECAP_ENABLED && !DECAP_NICKNAMES && IsStringAddrSafe(dest, limit) && *src != CHAR_FIXED_CASE)
-        *dest++ = CHAR_FIXED_CASE;
-
     for (i = 0; i < limit; i++)
     {
         dest[i] = src[i];
@@ -99,10 +75,6 @@ u8 *StringCopy_PlayerName(u8 *dest, const u8 *src)
 
 u8 *StringCopy(u8 *dest, const u8 *src)
 {
-    // If `src` is mirrored, prepend fixed-case char
-    if (DECAP_ENABLED && DECAP_MIRRORING && IsMirrorPtr(src) && *src != CHAR_FIXED_CASE)
-        *dest++ = CHAR_FIXED_CASE;
-
     while (*src != EOS)
     {
         *dest = *src;
@@ -152,14 +124,6 @@ u16 StringLength(const u8 *str)
 
 s32 StringCompare(const u8 *str1, const u8 *str2)
 {
-    // Ignore leading fixed-case char
-    if (DECAP_ENABLED)
-    {
-        if (*str1 == CHAR_FIXED_CASE)
-            str1++;
-        if (*str2 == CHAR_FIXED_CASE)
-            str2++;
-    }
     while (*str1 == *str2)
     {
         if (*str1 == EOS)
@@ -173,14 +137,6 @@ s32 StringCompare(const u8 *str1, const u8 *str2)
 
 s32 StringCompareN(const u8 *str1, const u8 *str2, u32 n)
 {
-    // Ignore leading fixed-case char
-    if (DECAP_ENABLED)
-    {
-        if (*str1 == CHAR_FIXED_CASE)
-            str1++;
-        if (*str2 == CHAR_FIXED_CASE)
-            str2++;
-    }
     while (*str1 == *str2)
     {
         if (*str1 == EOS)
@@ -379,7 +335,6 @@ u8 *ConvertIntToHexStringN(u8 *dest, s32 value, enum StringConvertMode mode, u8
 
 u8 *StringExpandPlaceholders(u8 *dest, const u8 *src)
 {
-    bool32 fixedCase = FALSE;
     for (;;)
     {
         u8 c = *src++;
@@ -390,20 +345,7 @@ u8 *StringExpandPlaceholders(u8 *dest, const u8 *src)
         {
         case PLACEHOLDER_BEGIN:
             placeholderId = *src++;
-            if (DECAP_ENABLED)
-            {
-                // Handle fixed-case versions of placeholders
-                if (!fixedCase && (placeholderId & PLACEHOLDER_FIXED_MASK || placeholderId == PLACEHOLDER_ID_PLAYER))
-                {
-                    *dest++ = CHAR_FIXED_CASE;
-                    expandedString = GetExpandedPlaceholder(placeholderId & ~PLACEHOLDER_FIXED_MASK);
-                    dest = StringExpandPlaceholders(dest, expandedString);
-                    *dest++ = CHAR_UNFIX_CASE;
-                    *dest = EOS;
-                    break;
-                }
-            }
-            expandedString = GetExpandedPlaceholder(placeholderId & ~PLACEHOLDER_FIXED_MASK);
+            expandedString = GetExpandedPlaceholder(placeholderId);
             dest = StringExpandPlaceholders(dest, expandedString);
             break;
         case EXT_CTRL_CODE_BEGIN:
@@ -430,19 +372,8 @@ u8 *StringExpandPlaceholders(u8 *dest, const u8 *src)
             }
             break;
         case EOS:
-            if (DECAP_ENABLED && fixedCase)
-                *dest++ = CHAR_UNFIX_CASE;
             *dest = EOS;
             return dest;
-        #if DECAP_ENABLED
-        case CHAR_UNFIX_CASE:
-            fixedCase = FALSE;
-            *dest++ = c;
-            break;
-        case CHAR_FIXED_CASE:
-            fixedCase = TRUE;
-        // fallthrough
-        #endif
         case CHAR_PROMPT_SCROLL:
         case CHAR_PROMPT_CLEAR:
         case CHAR_NEWLINE:
@@ -769,9 +700,6 @@ static const u8 *SkipExtCtrlCode(const u8 *s)
         s += GetExtCtrlCodeLength(*s);
     }
 
-    while (DECAP_ENABLED && (*s == CHAR_FIXED_CASE || *s == CHAR_UNFIX_CASE))
-        s++;
-
     return s;
 }
 

gflib/string_util.h

@@ -13,7 +13,6 @@ enum StringConvertMode
     STR_CONV_MODE_LEADING_ZEROS
 };
 
-bool32 IsStringAddrSafe(u8 *ptr, u32 length);
 u8 *StringCopy_Nickname(u8 *dest, const u8 *src);
 u8 *StringGet_Nickname(u8 *str);
 u8 *StringCopy_PlayerName(u8 *dest, const u8 *src);

gflib/text.c

@@ -286,35 +286,6 @@ static void SetFontsPointer(const struct FontInfo *fonts)
     gFonts = fonts;
 }
 
-// Any ROM address must have bit 27 set (0x8000000)
-// so this is used to check if a pointer points to ROM
-#define IS_ROM_PTR(ptr) (((u32)ptr) >> 27)
-
-void * MirrorPtr(const void *ptr)
-{
-    if (IS_ROM_PTR(ptr)) // ROM
-        return ROM_MIRROR_PTR(ptr);
-    else // RAM
-        return RAM_MIRROR_PTR(ptr);
-}
-
-void * UnmirrorPtr(const void *ptr)
-{
-    u32 value = (u32) ptr;
-    if (IS_ROM_PTR(ptr)) // ROM
-        return (void*)(value & ~ROM_MIRROR_MASK);
-    else // RAM
-        return (void*)(value & ~RAM_MIRROR_MASK);
-}
-
-bool32 IsMirrorPtr(const void *ptr)
-{
-    if (IS_ROM_PTR(ptr))
-        return ((u32)ptr) & ROM_MIRROR_MASK;
-    else
-        return ((u32)ptr) & RAM_MIRROR_MASK;
-}
-
 void DeactivateAllTextPrinters(void)
 {
     int printer;
@@ -342,11 +313,6 @@ u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8
     return AddTextPrinter(&printerTemplate, speed, callback);
 }
 
-u16 AddTextPrinterFixedCaseParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16))
-{
-    return AddTextPrinterParameterized(windowId, fontId, MirrorPtr(str), x, y, speed, callback);
-}
-
 bool32 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16))
 {
     int i;
@@ -360,16 +326,6 @@ bool32 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u8 speed, voi
     sTempTextPrinter.textSpeed = speed;
     sTempTextPrinter.delayCounter = 0;
     sTempTextPrinter.scrollDistance = 0;
-    if (DECAP_ENABLED)
-    {
-        // string address is mirrored; treat it as a fixed-case string
-        // Technically, unmirroring isn't necessary;
-        // but older emulators may not support mirroring
-        // printerTemplate->currentChar = UnmirrorPtr(printerTemplate->currentChar);
-        if (DECAP_MIRRORING && IsMirrorPtr(printerTemplate->currentChar))
-            sTempTextPrinter.lastChar = CHAR_FIXED_CASE;
-        sTempTextPrinter.lastChar = 0;
-    }
 
     for (i = 0; i < (int)ARRAY_COUNT(sTempTextPrinter.subStructFields); i++)
         sTempTextPrinter.subStructFields[i] = 0;
@@ -1056,30 +1012,10 @@ void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool32 drawArrow, u8 *
     }
 }
 
-// if table[char] & 0xFF == 0, character is not uppercase
-const u16 gLowercaseDiffTable[] = {
-    // English
-    [CHAR_SPACE]                            = 0,
-    [CHAR_SPACER]                           = 0,
-    [CHAR_A ... CHAR_Z]                     = CHAR_a - CHAR_A,
-    // é treated as uppercase so POKéDEX, POKéMON, etc. decapped
-    [CHAR_e_ACUTE]                          = 0 | MARK_UPPER_FLAG,
-    [CHAR_SGL_QUOTE_RIGHT]                  = 0 | MARK_UPPER_FLAG,
-    // International
-    [CHAR_A_GRAVE ... CHAR_A_ACUTE]         = CHAR_a_GRAVE - CHAR_A_GRAVE,
-    [CHAR_A_CIRCUMFLEX]                     = CHAR_a_CIRCUMFLEX,
-    [CHAR_C_CEDILLA ... CHAR_I_GRAVE]       = CHAR_c_CEDILLA - CHAR_C_CEDILLA,
-    [CHAR_I_ACUTE]                          = CHAR_i_ACUTE,
-    [CHAR_I_CIRCUMFLEX ... CHAR_N_TILDE]    = CHAR_i_CIRCUMFLEX - CHAR_I_CIRCUMFLEX,
-    [CHAR_A_DIAERESIS ... CHAR_U_DIAERESIS] = CHAR_a_DIAERESIS - CHAR_A_DIAERESIS,
-    [EOS]                                   = 0,
-};
-
 static u16 RenderText(struct TextPrinter *textPrinter)
 {
     struct TextPrinterSubStruct *subStruct = (struct TextPrinterSubStruct *)(&textPrinter->subStructFields);
-    u32 currChar;
-    u32 lastChar;
+    u16 currChar;
     s32 width;
     s32 widthHelper;
 
@@ -1107,12 +1043,6 @@ static u16 RenderText(struct TextPrinter *textPrinter)
 
         currChar = *textPrinter->printerTemplate.currentChar;
         textPrinter->printerTemplate.currentChar++;
-        if (DECAP_ENABLED)
-        {
-            lastChar = textPrinter->lastChar;
-            if (lastChar != CHAR_FIXED_CASE)
-                textPrinter->lastChar = currChar;
-        }
 
         switch (currChar)
         {
@@ -1268,47 +1198,7 @@ static u16 RenderText(struct TextPrinter *textPrinter)
             textPrinter->printerTemplate.currentX += gCurGlyph.width + textPrinter->printerTemplate.letterSpacing;
             return RENDER_PRINT;
         case EOS:
-            if (DECAP_ENABLED)
-                // Clear fixed case
-                textPrinter->lastChar = currChar;
             return RENDER_FINISH;
-    #if DECAP_ENABLED
-        // Disable/enable decapitalization
-        // In vanilla these are 1-2 pixel spaces
-        case CHAR_FIXED_CASE:
-        case CHAR_UNFIX_CASE:
-            textPrinter->lastChar = currChar;
-            if (!textPrinter->japanese)
-                return RENDER_REPEAT;
-            break;
-        // common decap exceptions
-        case CHAR_V:
-            if (lastChar == CHAR_T) // TV
-                lastChar = 0;
-            break;
-        case CHAR_M:
-            if (lastChar == CHAR_T) { // TM
-                lastChar = 0;
-                break;
-            }
-        case CHAR_P:
-            if (lastChar == CHAR_H) { // HP, HM
-                lastChar = 0;
-                break;
-            }
-        case CHAR_C:
-            if (lastChar == CHAR_P) // PC, PP, PM
-                lastChar = 0;
-            break;
-    #endif
-        }
-
-        // If not Japanese or fixed case, try to decap
-        if (DECAP_ENABLED && !textPrinter->japanese && lastChar != CHAR_FIXED_CASE)
-        {
-            // Two consecutive uppercase chars; lowercase this one
-            if (IS_UPPER(currChar) && IS_UPPER(lastChar))
-                currChar = TO_LOWER(currChar);
         }
 
         switch (subStruct->fontId)

gflib/text.h

@@ -7,14 +7,6 @@
 // loaded at once but not copied to vram yet.
 #define TEXT_SKIP_DRAW 0xFF
 
-// See include/config/decap.h for decap configuration
-#if DECAP_MIRRORING
-#define ROM_MIRROR_MASK (0x02000000)
-#define RAM_MIRROR_MASK (0x00800000)
-#define ROM_MIRROR_PTR(x) ((void*)(((u32)(x)) | ROM_MIRROR_MASK))
-#define RAM_MIRROR_PTR(x) ((void*)(((u32)(x)) | RAM_MIRROR_MASK))
-#endif
-
 enum {
     FONT_SMALL,
     FONT_NORMAL,
@@ -103,7 +95,6 @@ struct TextPrinter
     u8 scrollDistance;
     u8 minLetterSpacing;  // 0x20
     u8 japanese;
-    u8 lastChar; // used to determine whether to decap strings
 };
 
 struct FontInfo
@@ -147,19 +138,6 @@ extern TextFlags gTextFlags;
 extern u8 gDisableTextPrinters;
 extern struct TextGlyph gCurGlyph;
 
-extern const u16 gLowercaseDiffTable[];
-// in gLowercaseDiffTable, 0x100 represents a character treated as uppercase,
-// but that maps to itself; only the lower 8 bits are used for mapping
-#define MARK_UPPER_FLAG 0x100
-#define LOWERCASE_DIFF_MASK 0xFF
-#define IS_UPPER(x) (gLowercaseDiffTable[(x) & LOWERCASE_DIFF_MASK])
-#define TO_LOWER(x) (((x) + gLowercaseDiffTable[(x)]) & LOWERCASE_DIFF_MASK)
-
-void * UnmirrorPtr(const void * ptr);
-void * MirrorPtr(const void * ptr);
-bool32 IsMirrorPtr(const void *ptr);
-u16 AddTextPrinterFixedCaseParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16));
-
 void DeactivateAllTextPrinters(void);
 u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16));
 bool32 AddTextPrinter(struct TextPrinterTemplate *template, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16));

graphics/pokemon/arctibax/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-92 131 133
-65 69 90
-188 239 248
-91 111 138
-125 166 166
-102 149 227
-15 15 15
+153 211 165
+92 58 23
+46 53 87
+55 59 92
+40 70 110
+90 96 124
+222 160 46
+242 218 64
+82 100 140
+87 137 173
+120 152 199
+16 16 16
+174 202 230
+166 232 247
+235 253 255
 0 0 0
-255 209 74
-218 145 35
-75 122 154
-58 99 126
-100 54 32
-244 125 47
-168 96 47

graphics/pokemon/arctibax/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-74 168 123
-65 69 90
-227 255 253
-78 133 139
-140 221 192
-134 249 249
-15 15 15
+153 211 165
+100 46 105
+29 66 79
+30 52 61
+40 70 110
+63 97 102
+210 129 206
+242 218 64
+65 127 140
+87 137 173
+93 188 201
+16 16 16
+147 237 231
+166 232 247
+235 253 255
 0 0 0
-255 209 74
-218 145 35
-67 194 175
-63 152 138
-137 39 73
-252 142 179
-201 100 144

graphics/pokemon/decidueye/hisuian/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-156 213 164
-115 106 106
+153 211 165
+52 34 22
+45 46 51
+105 31 40
+90 60 39
+75 77 90
+113 111 108
+149 34 43
+206 55 47
+154 105 56
+189 105 43
+238 154 62
+197 158 85
+190 190 185
 16 16 16
-238 238 238
-189 189 189
-238 156 57
-65 41 32
-106 24 41
-189 106 41
-205 49 41
-148 32 41
-41 41 49
-213 148 98
-74 74 90
-172 106 74
-115 65 57
+236 236 234

graphics/pokemon/decidueye/hisuian/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-156 213 164
-115 106 106
+153 211 165
+35 31 24
+45 46 51
+30 55 41
+66 58 47
+75 77 90
+113 111 108
+48 90 68
+69 129 97
+97 86 69
+176 51 15
+251 92 50
+125 111 90
+190 190 185
 16 16 16
-238 238 238
-189 189 189
-238 82 57
-65 41 32
-16 57 41
-172 41 41
-32 131 98
-24 90 65
-41 41 49
-172 139 106
-74 74 90
-131 106 90
-90 65 57
+236 236 234

graphics/pokemon/dialga/origin/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-96 160 192
-24 64 104
-152 208 240
-8 8 8
-24 88 144
-56 120 176
-64 72 80
-112 136 160
-88 128 168
-240 80 64
-64 128 248
-56 88 120
-64 112 152
-96 112 128
-0 0 0
+153 211 165
+24 66 107
+60 95 123
+68 74 87
+246 82 65
+24 90 148
+57 123 181
+70 117 155
+102 112 130
+91 129 174
+113 143 164
+99 165 198
+66 132 255
+16 16 16
+156 214 247
+0 46 84

graphics/pokemon/dialga/origin/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-112 184 152
-8 104 120
-152 240 144
-8 8 8
-8 144 152
-24 200 200
-112 112 72
-184 200 168
-128 200 176
-240 80 64
-64 128 248
-80 136 112
-96 176 160
-152 168 112
-0 0 0
+153 211 165
+8 106 123
+82 139 119
+115 115 74
+246 82 65
+8 148 156
+24 205 205
+99 177 164
+156 172 115
+134 205 176
+189 205 172
+115 189 156
+66 132 255
+16 16 16
+156 246 148
+0 68 80

graphics/pokemon/gholdengo/normal.pal

@@ -1,15 +1,19 @@
 JASC-PAL
 0100
-12
-153 210 164
-112 92 40
-252 210 82
+16
+153 211 165
+89 31 20
+120 59 37
+102 38 53
+59 61 74
+143 55 33
+138 75 43
+190 92 46
+178 117 58
+245 135 61
+219 175 66
+255 227 74
+126 142 158
+16 16 16
+191 201 207
 255 255 255
-207 129 60
-197 154 66
-0 0 0
-134 120 80
-37 37 45
-189 166 99
-66 73 74
-181 194 222

graphics/pokemon/gholdengo/shiny.pal

@@ -1,15 +1,19 @@
 JASC-PAL
 0100
-12
-153 210 164
-112 92 40
-252 210 82
+16
+153 211 165
+89 31 20
+120 59 37
+102 38 53
+59 61 74
+89 95 130
+138 75 43
+115 121 148
+178 117 58
+175 182 201
+219 175 66
+255 227 74
+126 142 158
+16 16 16
+191 201 207
 255 255 255
-127 147 167
-197 154 66
-0 0 0
-134 120 80
-37 37 45
-189 166 99
-66 73 74
-181 194 222

graphics/pokemon/gimmighoul/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-50 52 55
-138 98 57
-90 71 41
-84 91 107
-255 218 89
-221 193 38
-120 58 82
-15 15 15
-172 68 84
-173 147 56
-133 139 162
-194 198 202
-165 146 39
-133 139 163
-194 198 203
+153 211 165
+66 23 36
+71 53 35
+102 38 53
+117 93 56
+59 61 74
+86 107 125
+163 60 72
+173 144 73
+227 204 65
+100 113 128
+149 173 189
+16 16 16
+217 202 132
+156 176 194
+204 222 232

graphics/pokemon/gimmighoul/roaming/normal.pal

@@ -1,16 +1,19 @@
 JASC-PAL
 0100
-13
-114 214 163
-0 214 160
-0 212 159
+16
+153 211 165
+71 53 35
+117 93 56
+59 61 74
+173 144 73
+227 204 65
+100 113 128
+16 16 16
+156 176 194
+204 222 232
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
 0 0 0
-31 44 56
-132 153 195
-65 108 140
-199 229 248
-161 200 224
-255 197 0
-221 124 0
-255 160 0
-128 57 0

graphics/pokemon/gimmighoul/roaming/shiny.pal

@@ -1,16 +1,19 @@
 JASC-PAL
 0100
-13
-114 214 163
-0 214 160
-0 212 159
+16
+153 211 165
+71 53 35
+117 93 56
+59 61 74
+173 144 73
+227 204 65
+138 149 166
+16 16 16
+209 219 227
+240 250 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
 0 0 0
-31 44 56
-170 163 126
-135 131 102
-199 229 248
-228 209 183
-255 197 0
-221 124 0
-255 160 0
-128 57 0

graphics/pokemon/gimmighoul/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-50 52 55
-138 98 57
-90 71 41
-84 91 107
-255 218 89
-221 193 38
-120 58 82
-15 15 15
-172 68 84
-173 147 56
-160 159 129
-210 205 183
-165 146 39
-133 139 163
-194 198 203
+153 211 165
+66 23 36
+71 53 35
+102 38 53
+117 93 56
+59 61 74
+86 107 125
+163 60 72
+173 144 73
+227 204 65
+138 149 166
+149 173 189
+16 16 16
+217 202 132
+209 219 227
+240 250 255

graphics/pokemon/greavard/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-128 60 184
-176 104 232
-208 144 160
-248 212 40
+153 211 165
+90 46 53
+70 80 87
+102 113 127
+189 90 82
+255 213 45
+131 63 186
+183 106 234
+135 147 163
+158 165 179
+209 145 165
 16 16 16
-96 112 120
-64 80 80
-248 252 248
-184 188 192
-144 132 152
-128 144 160
-176 196 208
-152 164 176
-88 44 48
-184 88 80
+190 188 197
+181 197 212
+252 252 252
+0 0 0

graphics/pokemon/greavard/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-128 60 184
-176 104 232
-208 144 160
-248 212 40
-16 16 16
-145 129 66
+153 211 165
+90 46 53
 100 90 50
-209 213 211
-164 155 139
-144 132 152
+145 129 66
+189 90 82
+255 213 45
+131 63 186
+183 106 234
 189 169 92
+164 155 139
+209 145 165
+16 16 16
+190 188 197
 233 206 102
-152 164 176
-88 44 48
-184 88 80
+252 252 252
+0 0 0

graphics/pokemon/houndstone/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-156 210 164
-65 72 74
-98 85 106
-139 149 164
-131 113 139
-123 121 123
-90 93 90
-156 157 156
-189 190 197
+153 211 165
+84 89 95
+106 100 143
+122 124 135
+148 149 150
+139 131 190
+16 16 16
+185 189 196
+182 179 223
+203 203 203
+204 199 231
+234 234 234
+237 239 241
+0 0 0
+0 0 0
 0 0 0
-172 174 189
-246 246 246
-8 12 8
-197 198 205
-255 250 255
-197 198 197

graphics/pokemon/houndstone/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-156 210 164
-65 72 74
-111 84 55
-169 118 61
-173 107 75
-123 121 123
-90 93 90
-156 157 156
-207 162 120
+153 211 165
+84 89 95
+95 67 47
+132 120 83
+148 149 150
+136 106 86
+16 16 16
+186 165 133
+161 138 111
+203 203 203
+183 164 137
+234 234 234
+220 211 175
+0 0 0
+0 0 0
 0 0 0
-207 162 120
-246 246 246
-8 12 8
-222 201 114
-242 233 168
-197 198 197

graphics/pokemon/iron_bundle/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-154 212 167
+153 211 165
+51 51 51
+102 35 20
 110 110 110
-210 210 210
-161 161 161
-8 8 8
+140 41 28
+193 57 38
+216 95 86
+164 128 74
+255 224 114
+50 109 163
+90 193 255
+160 160 160
+16 16 16
+176 227 255
+209 209 209
 245 245 245
-141 36 22
-194 54 33
-217 95 85
-46 109 165
-90 194 255
-166 129 73
-255 225 115
-178 228 255
-102 30 12
-48 48 48

graphics/pokemon/iron_bundle/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-154 212 167
-80 89 98
-166 174 182
-116 130 141
-8 8 8
-218 221 224
-116 130 141
-166 174 182
-218 221 224
-46 109 165
-90 194 255
-109 116 132
-181 183 192
-178 228 255
-80 89 98
-48 48 48
+153 211 165
+51 51 51
+81 89 98
+81 89 98
+115 129 140
+164 172 181
+217 220 223
+109 115 131
+179 182 191
+50 109 163
+90 193 255
+115 129 140
+16 16 16
+176 227 255
+164 172 181
+217 220 223

graphics/pokemon/iron_hands/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-82 81 80
-49 55 88
+153 211 165
+54 52 51
+49 57 90
+82 77 74
+66 80 115
+108 93 104
+170 117 18
+206 158 16
+252 210 22
+105 114 144
+154 142 145
 16 16 16
 203 201 197
-123 134 165
-66 78 115
-154 142 145
-147 118 17
-252 210 22
-118 105 108
-60 51 49
-206 158 16
-255 255 255
-41 38 41
+237 233 234
+253 253 253
 0 0 0

graphics/pokemon/iron_hands/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-82 81 80
-100 103 113
-16 16 16
-168 170 176
-213 213 213
-168 170 176
-100 103 113
-147 118 17
-252 210 22
-118 105 108
-60 51 49
+153 211 165
+54 52 51
+150 139 141
+82 77 74
+198 197 189
+108 93 104
+170 117 18
 206 158 16
-255 255 255
-60 51 49
+252 210 22
+233 227 227
+154 142 145
+16 16 16
+203 201 197
+237 233 234
+253 253 253
 0 0 0

graphics/pokemon/iron_jugulis/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-180 255 139
-255 76 205
-238 234 238
-148 40 123
-123 121 123
-32 68 156
-16 44 82
-255 255 255
-115 157 238
-65 52 65
-131 170 246
-8 12 8
-57 117 230
-41 40 41
-106 129 213
-74 64 74
+153 211 165
+40 30 39
+44 44 44
+55 45 50
+28 55 108
+116 24 94
+68 68 68
+71 69 74
+58 94 142
+33 71 194
+71 124 255
+162 27 135
+220 43 186
+255 102 224
+16 16 16
+128 171 255

graphics/pokemon/iron_jugulis/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-180 255 139
-255 76 205
-238 234 238
-148 40 123
-123 121 123
-32 68 156
-16 44 82
-255 255 255
-115 157 238
-65 52 65
-131 170 246
-8 12 8
-57 117 230
-41 40 41
-106 129 213
-74 64 74
+153 211 165
+96 91 91
+44 44 44
+150 150 150
+28 55 108
+116 24 94
+68 68 68
+193 193 193
+143 131 131
+33 71 194
+71 124 255
+162 27 135
+220 43 186
+255 102 224
+16 16 16
+194 192 192

graphics/pokemon/iron_leaves/normal.pal

@@ -1,18 +1,19 @@
 JASC-PAL
 0100
-15
-153 210 164
-68 112 63
+16
+153 211 165
 33 66 28
-148 215 148
-85 174 88
-86 141 80
+74 107 51
+68 112 63
+70 75 86
+106 115 123
 179 28 91
 255 69 115
-255 230 240
-16 16 16
+86 141 80
+85 174 88
 165 146 156
+148 215 148
+16 16 16
 206 202 197
-106 115 123
-77 77 87
-38 38 45
+255 202 223
+0 0 0

graphics/pokemon/iron_leaves/shiny.pal

@@ -1,18 +1,19 @@
 JASC-PAL
 0100
-15
-153 210 164
-128 128 120
-72 72 72
-216 216 216
-208 200 208
-176 168 168
+16
+153 211 165
+69 71 80
+116 119 133
+116 119 133
+70 75 86
+106 115 123
 179 28 91
 255 69 115
-255 230 240
-16 16 16
+143 146 158
+193 194 200
 165 146 156
+234 235 242
+16 16 16
 206 202 197
-106 115 123
-77 77 87
-38 38 45
+255 202 223
+0 0 0

graphics/pokemon/iron_moth/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-156 210 164
-197 121 41
-74 68 65
-213 44 65
-255 157 41
-131 133 131
-32 32 24
-197 230 238
-148 174 172
-139 28 41
-139 72 32
-255 255 255
-92 93 90
-0 0 0
-189 190 189
-90 16 24
+153 211 165
+31 31 31
+44 44 44
+68 68 68
+90 92 103
+150 63 5
+134 37 32
+216 112 7
+211 77 69
+243 148 3
+254 201 90
+95 128 165
+177 180 188
+16 16 16
+163 199 218
+249 249 250

graphics/pokemon/iron_moth/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-156 210 164
-197 121 41
-74 68 65
-168 170 176
-255 157 41
-131 133 131
-32 32 24
-168 170 176
-100 103 113
-100 103 113
-139 72 32
-255 255 255
-92 93 90
-0 0 0
-189 190 189
-51 51 51
+153 211 165
+31 31 31
+44 44 44
+68 68 68
+90 92 103
+150 63 5
+125 123 149
+216 112 7
+187 186 201
+243 148 3
+254 201 90
+137 139 163
+177 180 188
+16 16 16
+199 201 207
+249 249 250

graphics/pokemon/iron_thorns/normal.pal

@@ -1,17 +1,19 @@
 JASC-PAL
 0100
-14
-153 210 164
-112 168 48
-152 208 72
+16
+153 211 165
+31 31 31
+44 44 44
+70 97 31
+67 67 67
+68 68 68
+80 80 80
+104 104 104
+113 154 50
+2 166 103
+172 212 89
+225 254 126
+4 243 150
+16 16 16
+155 255 215
 0 0 0
-208 248 128
-56 96 32
-64 56 56
-0 136 95
-72 224 138
-211 255 255
-48 40 40
-88 80 80
-55 189 122
-192 192 192

graphics/pokemon/iron_thorns/shiny.pal

@@ -1,17 +1,19 @@
 JASC-PAL
 0100
-14
-153 210 164
-144 144 144
-200 200 200
-0 0 0
-248 248 248
+16
+153 211 165
+31 31 31
+44 44 44
+90 92 103
+67 67 67
+68 68 68
 80 80 80
-64 56 56
-0 136 95
-72 224 178
-211 255 255
-48 40 40
-88 80 80
-55 189 148
-192 192 192
+104 104 104
+143 146 158
+2 166 103
+193 194 200
+234 235 242
+4 243 150
+16 16 16
+155 255 215
+0 0 0

graphics/pokemon/iron_treads/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-106 62 71
-88 31 42
-255 56 57
-255 180 183
-33 4 15
-133 105 122
-171 133 147
-255 0 0
-241 12 17
-0 0 0
-148 119 127
-142 169 173
-28 38 44
-205 205 207
+153 211 165
+33 26 31
+32 26 34
+51 42 49
+122 8 4
+69 62 67
+87 80 85
+83 91 104
+198 5 0
+255 62 59
+255 114 111
+123 133 149
+16 16 16
+171 182 192
+209 215 220
 0 0 0

graphics/pokemon/iron_treads/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-142 152 163
-68 82 94
-255 56 57
-255 180 183
-33 4 15
-217 217 217
-239 239 239
-255 0 0
-241 12 17
-0 0 0
-148 119 127
-142 169 173
-28 38 44
-205 205 207
+153 211 165
+90 92 97
+32 26 34
+131 135 141
+122 8 4
+176 182 187
+211 215 218
+83 91 104
+198 5 0
+255 62 59
+255 114 111
+123 133 149
+16 16 16
+171 182 192
+209 215 220
 0 0 0

graphics/pokemon/iron_valiant/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 163
-45 56 74
-75 131 131
-109 176 180
-15 15 15
-38 77 36
-90 180 106
+153 211 165
+29 31 35
+57 82 82
+66 65 66
+179 32 83
 65 131 90
-252 252 252
-175 171 206
-89 95 106
-174 32 96
-128 136 155
-255 81 151
-238 176 220
-112 146 190
+115 186 99
+138 208 121
+255 62 137
+115 131 172
+115 148 164
+123 197 180
+252 129 177
+16 16 16
+164 180 205
+245 245 245

graphics/pokemon/iron_valiant/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 163
-45 57 75
-101 103 113
-129 137 155
-15 15 15
-51 53 57
-129 137 155
-101 103 113
-252 252 252
-213 213 213
-101 103 113
-174 32 96
-129 137 155
-255 81 151
-238 176 220
-129 137 155
+153 211 165
+29 31 35
+101 97 118
+66 65 66
+179 32 83
+131 137 160
+176 181 196
+222 226 235
+255 62 137
+97 104 129
+145 154 155
+190 201 201
+252 129 177
+16 16 16
+152 158 177
+210 215 227

graphics/pokemon/overqwil/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-120 192 168
-120 32 96
-240 72 208
+153 211 165
+19 22 37
+36 39 56
+124 87 50
+57 62 83
+123 34 97
+170 145 106
+105 53 164
+179 64 156
+193 79 170
+135 73 201
+193 89 207
+200 180 138
 16 16 16
-160 72 200
-96 96 104
-184 56 152
-40 40 48
-64 64 72
-128 128 128
-88 80 56
-208 200 176
-176 168 120
-136 120 88
-248 248 248
-0 0 0
+223 213 171
+249 249 249

graphics/pokemon/overqwil/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-120 192 168
-40 48 128
-80 96 224
+153 211 165
+89 91 106
+132 132 154
+124 102 50
+174 174 188
+61 48 146
+170 159 106
+132 104 198
+101 84 199
+128 94 242
+151 132 208
+149 135 245
+200 193 138
 16 16 16
-96 136 216
-168 184 208
-64 64 200
-80 80 96
-136 136 152
-208 224 240
-64 64 48
-200 192 184
-168 160 136
-112 112 96
-248 248 248
-0 0 0
+223 223 170
+249 249 249

graphics/pokemon/roaring_moon/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-39 88 94
-96 231 236
-60 137 171
-0 0 0
-185 107 230
-105 17 39
-214 38 82
-162 27 60
-129 100 179
-105 105 105
-171 171 171
-247 247 247
-247 165 42
-251 236 49
-52 49 49
+153 211 165
+55 51 50
+108 37 53
+22 94 114
+90 90 90
+159 50 71
+202 71 94
+237 214 46
+187 104 223
+80 162 175
+73 163 188
+159 142 142
+16 16 16
+135 201 219
+128 227 222
+232 232 224

graphics/pokemon/roaring_moon/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-62 125 78
-151 235 188
-86 180 117
-0 0 0
-223 213 113
-105 17 39
-245 62 68
-181 36 39
-174 162 85
-105 105 105
-171 171 171
-247 247 247
-247 165 42
-251 236 49
-52 49 49
+153 211 165
+55 51 50
+97 20 32
+49 89 89
+90 90 90
+167 35 55
+242 30 67
+237 214 46
+247 130 23
+207 187 71
+61 173 137
+159 142 142
+16 16 16
+107 226 170
+240 248 148
+232 232 224