From ac16a5291881321e8cf3d4c1380e0a614ebf2180 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 13 May 2024 13:19:37 -0400 Subject: [PATCH 01/11] Revert "Guillotine: Decapitalize everything (#3949)" (#4525) This reverts commit e2d70d440e6217ed8d16663010ea2678846c4e14, reversing changes made to 0d2b40095377e51576dcc8931c1d87066b039c31. # Conflicts: # gflib/text.c # include/config/decap.h # src/battle_message.c # src/item.c --- charmap.txt | 11 ---- data/text/pc_transfer.inc | 8 +-- data/text/save.inc | 6 +- gflib/characters.h | 7 --- gflib/string_util.c | 76 +----------------------- gflib/string_util.h | 1 - gflib/text.c | 112 +---------------------------------- gflib/text.h | 22 ------- include/config/decap.h | 35 ----------- include/constants/global.h | 1 - include/global.h | 5 -- ld_script.ld | 1 - ld_script_modern.ld | 1 - ld_script_test.ld | 1 - src/battle_message.c | 34 ++--------- src/easy_chat.c | 5 -- src/field_message_box.c | 10 +--- src/fonts.c | 10 ++-- src/item.c | 5 +- src/main.c | 9 +-- src/main_menu.c | 5 -- src/naming_screen.c | 15 +---- src/option_menu.c | 5 -- src/party_menu.c | 11 +--- src/pokemon.c | 4 -- src/pokemon_storage_system.c | 10 +--- src/pokemon_summary_screen.c | 5 +- src/region_map.c | 3 - src/start_menu.c | 4 -- src/strings.c | 15 ++--- test/test_runner_battle.c | 8 --- tools/preproc/asm_file.cpp | 2 - tools/preproc/asm_file.h | 1 - tools/preproc/c_file.cpp | 16 +---- tools/preproc/preproc.cpp | 10 ---- 35 files changed, 35 insertions(+), 439 deletions(-) delete mode 100644 include/config/decap.h diff --git a/charmap.txt b/charmap.txt index 7271c621ca..c26c07e78b 100644 --- a/charmap.txt +++ b/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 diff --git a/data/text/pc_transfer.inc b/data/text/pc_transfer.inc index 01fe80a426..3fa255340b 100644 --- a/data/text/pc_transfer.inc +++ b/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:: diff --git a/data/text/save.inc b/data/text/save.inc index 4c16fd2fe6..4d17327c9b 100644 --- a/data/text/save.inc +++ b/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.$" diff --git a/gflib/characters.h b/gflib/characters.h index 3b00fa1eea..8ed440e63a 100644 --- a/gflib/characters.h +++ b/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 diff --git a/gflib/string_util.c b/gflib/string_util.c index 6720299a82..0fde2cb861 100644 --- a/gflib/string_util.c +++ b/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; } diff --git a/gflib/string_util.h b/gflib/string_util.h index 75d2ada0a3..9e5dfffd57 100644 --- a/gflib/string_util.h +++ b/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); diff --git a/gflib/text.c b/gflib/text.c index cc6a6e90f2..20927e4f80 100644 --- a/gflib/text.c +++ b/gflib/text.c @@ -241,35 +241,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; @@ -297,11 +268,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; @@ -315,16 +281,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; @@ -975,30 +931,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; @@ -1026,12 +962,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) { @@ -1187,47 +1117,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) diff --git a/gflib/text.h b/gflib/text.h index 7e1d7bfb11..76d140d86c 100644 --- a/gflib/text.h +++ b/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, @@ -100,7 +92,6 @@ struct TextPrinter u8 scrollDistance; u8 minLetterSpacing; // 0x20 u8 japanese; - u8 lastChar; // used to determine whether to decap strings }; struct FontInfo @@ -144,19 +135,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)); diff --git a/include/config/decap.h b/include/config/decap.h deleted file mode 100644 index 60168d0a27..0000000000 --- a/include/config/decap.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef GUARD_CONFIG_DECAP_H -#define GUARD_CONFIG_DECAP_H - -/* -Enable automatic decapitalization of *all* text -Exceptions: -- Several bigrams: TV, TM, HP, HM, PC, PP, PM -- Player names, nicknames, box names -- Strings beginning with {FIXED_CASE} -- C strings that use `_C` or `__C` -- ASM strings that use `.fixstr` -- If mirroring enabled, string addresses passed through MirrorPtr -*/ -#define DECAP_ENABLED FALSE -// Enables signaling that a string's case should be preserved -// by *mirroring* its address: i.e 08xxxxxx to 0Axxxxxx -// Unless you are targeting a different platform than the GBA, -// there aren't many reasons to disable this -#define DECAP_MIRRORING TRUE - -// If TRUE, *all* Pokemon nicknames and player names will be decapitalized. -// Otherwise, their case will be preserved. Default FALSE -#define DECAP_NICKNAMES FALSE - -#define DECAP_MAIN_MENU TRUE // Main menu text. -#define DECAP_OPTION_MENU TRUE // Option menu text. -#define DECAP_START_MENU TRUE // Start menu options & Save menu text. -#define DECAP_PARTY_MENU TRUE // Party menu text. -#define DECAP_MAP_NAMES TRUE // Map and location names. -#define DECAP_EASY_CHAT TRUE // Easy Chat words and interface. -#define DECAP_FIELD_MSG TRUE // Field messages (including scripts!). -#define DECAP_SUMMARY TRUE // Summary interface text. -#define DECAP_ITEM_NAMES TRUE // Item names (obtained via ItemId_GetName). - -#endif // GUARD_CONFIG_DECAP_H diff --git a/include/constants/global.h b/include/constants/global.h index bcbf37e2d7..b6d553f8c9 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -7,7 +7,6 @@ #include "config/level_caps.h" #include "config/pokemon.h" #include "config/overworld.h" -#include "config/decap.h" // Invalid Versions show as "----------" in Gen 4 and Gen 5's summary screen. // In Gens 6 and 7, invalid versions instead show "a distant land" in the summary screen. diff --git a/include/global.h b/include/global.h index 83bff49c0c..7db040697d 100644 --- a/include/global.h +++ b/include/global.h @@ -32,9 +32,6 @@ // We define these when using certain IDEs to fool preproc #define _(x) {x} #define __(x) {x} -// Like the above, but prepends a fixed-case character -#define _C(x) {x} -#define __C(x) {x} #define INCBIN(...) {0} #define INCBIN_U8 INCBIN #define INCBIN_U16 INCBIN @@ -1094,6 +1091,4 @@ struct MapPosition s8 elevation; }; -extern u8 gStackBase[]; // Start of stack-allocated IWRAM - #endif // GUARD_GLOBAL_H diff --git a/ld_script.ld b/ld_script.ld index f54272499c..e9cbae8957 100644 --- a/ld_script.ld +++ b/ld_script.ld @@ -56,7 +56,6 @@ SECTIONS { /* COMMON starts at 0x30022A8 */ INCLUDE "sym_common.ld" *libc.a:sbrkr.o(COMMON); - gStackBase = .; } > IWRAM /* BEGIN ROM DATA */ diff --git a/ld_script_modern.ld b/ld_script_modern.ld index d5724ebf84..fd35a1ca31 100644 --- a/ld_script_modern.ld +++ b/ld_script_modern.ld @@ -52,7 +52,6 @@ SECTIONS { gflib/*.o(COMMON); *libc.a:*.o(COMMON); *libnosys.a:*.o(COMMON); - gStackBase = .; } > IWRAM /* BEGIN ROM DATA */ diff --git a/ld_script_test.ld b/ld_script_test.ld index e05971dfde..ec99609a7e 100644 --- a/ld_script_test.ld +++ b/ld_script_test.ld @@ -55,7 +55,6 @@ SECTIONS { data/*.o(COMMON); test/*.o(COMMON); *libc.a:sbrkr.o(COMMON); - gStackBase = .; /* .persistent starts at 0x3007F00 */ /* WARNING: This is the end of the IRQ stack, if there's too diff --git a/src/battle_message.c b/src/battle_message.c index a54aba645e..0da0cba0e7 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -3182,13 +3182,6 @@ static const u8 *BattleStringGetPlayerName(u8 *text, u8 battler) break; } - if (DECAP_ENABLED && !DECAP_NICKNAMES && toCpy != text && *toCpy != CHAR_FIXED_CASE) - { - *text = CHAR_FIXED_CASE; - StringCopyN(text+1, toCpy, PLAYER_NAME_LENGTH + 1); - toCpy = text; - } - return toCpy; } @@ -3245,7 +3238,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) if (*src == PLACEHOLDER_BEGIN) { src++; - switch (*src & ~PLACEHOLDER_FIXED_MASK) + switch (*src) { case B_TXT_BUFF1: if (gBattleTextBuff1[0] == B_BUFF_PLACEHOLDER_BEGIN) @@ -3620,28 +3613,11 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) if (toCpy != NULL) { - if (DECAP_ENABLED) + while (*toCpy != EOS) { - bool32 fixedCase = *src & PLACEHOLDER_FIXED_MASK; - - if (fixedCase) - dst[dstID++] = CHAR_FIXED_CASE; - - while (*toCpy != EOS) - { - if (*toCpy == CHAR_FIXED_CASE) - fixedCase = TRUE; - else if (*toCpy == CHAR_UNFIX_CASE) - fixedCase = FALSE; - dst[dstID++] = *toCpy++; - } - if (fixedCase) - dst[dstID++] = CHAR_UNFIX_CASE; - } - else - { - while (*toCpy != EOS) - dst[dstID++] = *toCpy++; + dst[dstID] = *toCpy; + dstID++; + toCpy++; } } diff --git a/src/easy_chat.c b/src/easy_chat.c index dbdd80be63..ce3b4fe907 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -3954,8 +3954,6 @@ static void PrintTitle(void) static void PrintEasyChatText(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16)) { - if (DECAP_ENABLED && DECAP_MIRRORING && !DECAP_EASY_CHAT) - str = MirrorPtr(str); AddTextPrinterParameterized(windowId, fontId, str, x, y, speed, callback); } @@ -5242,9 +5240,6 @@ u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows u16 i, j; u16 numColumns = columns - 1; - if (DECAP_ENABLED && !DECAP_EASY_CHAT) - *dest++ = CHAR_FIXED_CASE; - for (i = 0; i < rows; i++) { for (j = 0; j < numColumns; j++) diff --git a/src/field_message_box.c b/src/field_message_box.c index 46f0f2898d..b797e1d353 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -117,15 +117,7 @@ bool8 ShowFieldMessageFromBuffer(void) static void ExpandStringAndStartDrawFieldMessage(const u8 *str, bool32 allowSkippingDelayWithButtonPress) { - if (DECAP_ENABLED && DECAP_MIRRORING && !DECAP_FIELD_MSG) - { - gStringVar4[0] = CHAR_FIXED_CASE; - StringExpandPlaceholders(gStringVar4+1, str); - } - else - { - StringExpandPlaceholders(gStringVar4, str); - } + StringExpandPlaceholders(gStringVar4, str); AddTextPrinterForMessage(allowSkippingDelayWithButtonPress); CreateTask_DrawFieldMessage(); } diff --git a/src/fonts.c b/src/fonts.c index 72de054b73..381fd795e9 100644 --- a/src/fonts.c +++ b/src/fonts.c @@ -9,7 +9,7 @@ ALIGNED(4) const u8 gFontSmallNarrowLatinGlyphWidths[] = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 3, 8, 8, 8, 8, 8, 8, 8, 4, 5, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 3, 3, 3, 3, 3, 4, - 3, 3, 3, 3, 3, 3, 3, 5, 3, 8, 8, 8, 8, 0, 0, 3, + 3, 3, 3, 3, 3, 3, 3, 5, 3, 8, 8, 8, 8, 1, 2, 3, 4, 5, 6, 7, 5, 5, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 3, 5, 5, @@ -45,7 +45,7 @@ ALIGNED(4) const u8 gFontSmallLatinGlyphWidths[] = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 5, 8, 8, 8, 8, 8, 8, 8, 4, 7, 5, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 3, 3, 3, 3, 3, 4, - 3, 3, 3, 3, 3, 3, 3, 5, 3, 8, 8, 8, 8, 0, 0, 3, + 3, 3, 3, 3, 3, 3, 3, 5, 3, 8, 8, 8, 8, 1, 2, 3, 4, 5, 6, 7, 5, 7, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 8, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, @@ -81,7 +81,7 @@ ALIGNED(4) const u8 gFontNarrowLatinGlyphWidths[] = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 4, 8, 8, 8, 7, 8, 8, 4, 4, 6, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 3, 3, 3, 3, 3, 4, - 3, 3, 3, 3, 3, 3, 3, 5, 3, 7, 7, 7, 7, 0, 0, 3, + 3, 3, 3, 3, 3, 3, 3, 5, 3, 7, 7, 7, 7, 1, 2, 3, 4, 5, 6, 7, 5, 6, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 8, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 3, 5, 3, @@ -117,7 +117,7 @@ ALIGNED(4) const u8 gFontShortLatinGlyphWidths[] = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 6, 6, 6, 8, 8, 8, 8, 8, 8, 4, 6, 8, 5, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 6, - 3, 3, 3, 3, 3, 3, 3, 6, 3, 12, 12, 12, 12, 0, 0, 3, + 3, 3, 3, 3, 3, 3, 3, 6, 3, 12, 12, 12, 12, 1, 2, 3, 4, 5, 6, 7, 8, 8, 8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 5, @@ -153,7 +153,7 @@ ALIGNED(4) const u8 gFontNormalLatinGlyphWidths[] = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 6, 6, 4, 8, 8, 8, 7, 8, 8, 4, 6, 6, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 6, - 3, 3, 3, 3, 3, 3, 3, 6, 3, 7, 7, 7, 7, 0, 0, 3, + 3, 3, 3, 3, 3, 3, 3, 6, 3, 7, 7, 7, 7, 1, 2, 3, 4, 5, 6, 7, 6, 6, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 4, 6, 3, 6, 3, diff --git a/src/item.c b/src/item.c index c9318ee4a7..3fcafccc02 100644 --- a/src/item.c +++ b/src/item.c @@ -848,10 +848,7 @@ static u16 SanitizeItemId(u16 itemId) const u8 *ItemId_GetName(u16 itemId) { - if (DECAP_ENABLED && DECAP_MIRRORING && !DECAP_ITEM_NAMES) - return ROM_MIRROR_PTR(gItemsInfo[SanitizeItemId(itemId)].name); - else - return gItemsInfo[SanitizeItemId(itemId)].name; + return gItemsInfo[SanitizeItemId(itemId)].name; } u32 ItemId_GetPrice(u16 itemId) diff --git a/src/main.c b/src/main.c index 32e103b6e8..4bd9816398 100644 --- a/src/main.c +++ b/src/main.c @@ -93,14 +93,7 @@ void AgbMain() { *(vu16 *)BG_PLTT = RGB_WHITE; // Set the backdrop to white on startup InitGpuRegManager(); - // Setup waitstates for all ROM mirrors - if (DECAP_ENABLED && DECAP_MIRRORING) - REG_WAITCNT = WAITCNT_PREFETCH_ENABLE - | WAITCNT_WS0_S_1 | WAITCNT_WS0_N_3 - | WAITCNT_WS1_S_1 | WAITCNT_WS1_N_3 - | WAITCNT_WS2_S_1 | WAITCNT_WS2_N_3; - else - REG_WAITCNT = WAITCNT_PREFETCH_ENABLE | WAITCNT_WS0_S_1 | WAITCNT_WS0_N_3; + REG_WAITCNT = WAITCNT_PREFETCH_ENABLE | WAITCNT_WS0_S_1 | WAITCNT_WS0_N_3; InitKeys(); InitIntrHandlers(); m4aSoundInit(); diff --git a/src/main_menu.c b/src/main_menu.c index 6a225bf97d..c1f092b2ca 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -163,11 +163,6 @@ * - Destroys itself when done. */ -#if (DECAP_ENABLED) && (DECAP_MIRRORING) && !(DECAP_MAIN_MENU) -#define AddTextPrinterParameterized3(a, b, c, d, e, f, str) AddTextPrinterParameterized3(a, b, c, d, e, f, MirrorPtr(str)) -#endif - - #define OPTION_MENU_FLAG (1 << 15) // Static type declarations diff --git a/src/naming_screen.c b/src/naming_screen.c index 848e5b1a48..0f2e2dbb7f 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1856,18 +1856,7 @@ static void SaveInputText(void) { if (sNamingScreen->textBuffer[i] != CHAR_SPACE && sNamingScreen->textBuffer[i] != EOS) { - // If there is space, prepend fixed-case character - if (DECAP_ENABLED && !DECAP_NICKNAMES - && (sNamingScreen->templateNum == NAMING_SCREEN_PLAYER - || sNamingScreen->templateNum == NAMING_SCREEN_NICKNAME - || sNamingScreen->templateNum == NAMING_SCREEN_CAUGHT_MON) - && sNamingScreen->textBuffer[GetTextEntryPosition()] == EOS) - { - *sNamingScreen->destBuffer = CHAR_FIXED_CASE; - StringCopyN(sNamingScreen->destBuffer + 1, sNamingScreen->textBuffer, sNamingScreen->template->maxChars + 0); - } - else - StringCopyN(sNamingScreen->destBuffer, sNamingScreen->textBuffer, sNamingScreen->template->maxChars + 1); + StringCopyN(sNamingScreen->destBuffer, sNamingScreen->textBuffer, sNamingScreen->template->maxChars + 1); break; } } @@ -2595,3 +2584,5 @@ static const struct SpritePalette sSpritePalettes[] = {gNamingScreenMenu_Pal[4], PALTAG_OK_BUTTON}, {} }; + + diff --git a/src/option_menu.c b/src/option_menu.c index 273353c22b..fda3a24c47 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -24,11 +24,6 @@ #define tButtonMode data[5] #define tWindowFrameType data[6] -#if (DECAP_ENABLED) && (DECAP_MIRRORING) && !(DECAP_OPTION_MENU) -#define AddTextPrinterParameterized3(a, b, c, d, e, f, str) AddTextPrinterParameterized3(a, b, c, d, e, f, MirrorPtr(str)) -#define AddTextPrinterParameterized4(a, b, c, d, e, f, g, h, str) AddTextPrinterParameterized4(a, b, c, d, e, f, g, h, MirrorPtr(str)) -#endif - enum { MENUITEM_TEXTSPEED, diff --git a/src/party_menu.c b/src/party_menu.c index 6b5926bdc0..7a14d0fb72 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -75,12 +75,6 @@ #include "constants/rgb.h" #include "constants/songs.h" -#if (DECAP_ENABLED) && (DECAP_MIRRORING) && !(DECAP_PARTY_MENU) -#define gStringVar4 (MirrorPtr(gStringVar4)) -#define AddTextPrinterParameterized4(a, b, c, d, e, f, g, h, str) (AddTextPrinterParameterized4(a, b, c, d, e, f, g, h, MirrorPtr(str))) -#define AddTextPrinterParameterized3(a, b, c, d, e, f, str) AddTextPrinterParameterized3(a, b, c, d, e, f, MirrorPtr(str)) -#endif - enum { MENU_SUMMARY, MENU_SWITCH, @@ -2752,10 +2746,7 @@ static void PrintMessage(const u8 *text) { DrawStdFrameWithCustomTileAndPalette(WIN_MSG, FALSE, 0x4F, 13); gTextFlags.canABSpeedUpPrint = TRUE; - if (DECAP_ENABLED && DECAP_MIRRORING && !DECAP_PARTY_MENU) - AddTextPrinterParameterized2(WIN_MSG, FONT_NORMAL, MirrorPtr(text), GetPlayerTextSpeedDelay(), 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); - else - AddTextPrinterParameterized2(WIN_MSG, FONT_NORMAL, text, GetPlayerTextSpeedDelay(), 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(WIN_MSG, FONT_NORMAL, text, GetPlayerTextSpeedDelay(), 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } static void PartyMenuDisplayYesNoMenu(void) diff --git a/src/pokemon.c b/src/pokemon.c index e7db64cd9a..b02eb87d93 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2204,8 +2204,6 @@ u32 GetBoxMonData3(struct BoxPokemon *boxMon, s32 field, u8 *data) } else { - if (DECAP_ENABLED && !DECAP_NICKNAMES && IsStringAddrSafe(data, POKEMON_NAME_LENGTH)) - *data++ = CHAR_FIXED_CASE; retVal = 0; while (retVal < min(sizeof(boxMon->nickname), POKEMON_NAME_LENGTH)) { @@ -2574,8 +2572,6 @@ u32 GetBoxMonData3(struct BoxPokemon *boxMon, s32 field, u8 *data) break; case MON_DATA_OT_NAME: { - if (DECAP_ENABLED && !DECAP_NICKNAMES && IsStringAddrSafe(data, PLAYER_NAME_LENGTH)) - *data++ = CHAR_FIXED_CASE; retVal = 0; while (retVal < PLAYER_NAME_LENGTH) diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 8f981ed854..88a7dee20e 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -5548,10 +5548,7 @@ static void InitBoxTitle(u8 boxId) sStorage->wallpaperPalBits |= (1 << 16) << tagIndex; StringCopyPadded(sStorage->boxTitleText, GetBoxNamePtr(boxId), 0, BOX_NAME_LENGTH); - if (DECAP_ENABLED && DECAP_MIRRORING) - DrawTextWindowAndBufferTiles(MirrorPtr(sStorage->boxTitleText), sStorage->boxTitleTiles, 0, 0, 2); - else - DrawTextWindowAndBufferTiles(sStorage->boxTitleText, sStorage->boxTitleTiles, 0, 0, 2); + DrawTextWindowAndBufferTiles(sStorage->boxTitleText, sStorage->boxTitleTiles, 0, 0, 2); LoadSpriteSheet(&spriteSheet); x = GetBoxTitleBaseX(GetBoxNamePtr(boxId)); @@ -9609,10 +9606,7 @@ struct BoxPokemon *GetBoxedMonPtr(u8 boxId, u8 boxPosition) u8 *GetBoxNamePtr(u8 boxId) { if (boxId < TOTAL_BOXES_COUNT) - if (DECAP_ENABLED && DECAP_MIRRORING) - return MirrorPtr(gPokemonStoragePtr->boxNames[boxId]); - else - return gPokemonStoragePtr->boxNames[boxId]; + return gPokemonStoragePtr->boxNames[boxId]; else return NULL; } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index f5c2e7f6b7..d47d5d7f27 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2797,10 +2797,7 @@ static void ResetWindows(void) static void PrintTextOnWindow(u8 windowId, const u8 *string, u8 x, u8 y, u8 lineSpacing, u8 colorId) { - if (DECAP_ENABLED && DECAP_MIRRORING && !DECAP_SUMMARY) - AddTextPrinterParameterized4(windowId, FONT_NORMAL, x, y, 0, lineSpacing, sTextColors[colorId], 0, MirrorPtr(string)); - else - AddTextPrinterParameterized4(windowId, FONT_NORMAL, x, y, 0, lineSpacing, sTextColors[colorId], 0, string); + AddTextPrinterParameterized4(windowId, FONT_NORMAL, x, y, 0, lineSpacing, sTextColors[colorId], 0, string); } static void PrintMonInfo(void) diff --git a/src/region_map.c b/src/region_map.c index 36c6ae8fc6..8936e668ac 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1570,9 +1570,6 @@ u8 *GetMapName(u8 *dest, u16 regionMapId, u16 padLength) u8 *str; u16 i; - if (DECAP_ENABLED && !DECAP_MAP_NAMES) - *dest++ = CHAR_FIXED_CASE; - if (regionMapId == MAPSEC_SECRET_BASE) { str = GetSecretBaseMapName(dest); diff --git a/src/start_menu.c b/src/start_menu.c index 857eed168d..0525ccf70d 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -48,10 +48,6 @@ #include "constants/rgb.h" #include "constants/songs.h" -#if (DECAP_ENABLED) && (DECAP_MIRRORING) && !(DECAP_START_MENU) -#define AddTextPrinterParameterized (AddTextPrinterFixedCaseParameterized) -#endif - // Menu actions enum { diff --git a/src/strings.c b/src/strings.c index 4fde380240..ff1c3dbed4 100644 --- a/src/strings.c +++ b/src/strings.c @@ -2,7 +2,6 @@ #include "strings.h" #include "battle_pyramid_bag.h" #include "item_menu.h" -#include "text.h" ALIGNED(4) const u8 gText_ExpandedPlaceholder_Empty[] = _(""); @@ -176,7 +175,7 @@ const u8 gText_Number[] = _("No. "); const u8 gText_Level[] = _("Lv. "); const u8 gText_IdNumberSlash[] = _("IDNo. /"); // Unused const u8 gText_Name[] = _("NAME"); -const u8 gText_IDNumber[] = _C("IDNo."); +const u8 gText_IDNumber[] = _("IDNo."); const u8 gText_BirchInTrouble[] = _("PROF. BIRCH is in trouble!\nRelease a POKéMON and rescue him!"); const u8 gText_ConfirmStarterChoice[] = _("Do you choose this POKéMON?"); const u8 gText_Pokemon4[] = _("POKéMON"); // Unused @@ -504,7 +503,7 @@ const u8 gText_SpDef4[] = _("SP. DEF"); const u8 gText_Speed2[] = _("SPEED"); const u8 gText_HP4[] = _("HP"); const u8 gText_EmptyString8[] = _(""); // Unused -const u8 gText_OTSlash[] = _C("OT/"); +const u8 gText_OTSlash[] = _("OT/"); const u8 gText_RentalPkmn[] = _("RENTAL POKéMON"); const u8 gText_TypeSlash[] = _("TYPE/"); const u8 gText_Power[] = _("POWER"); @@ -521,7 +520,7 @@ const u8 gText_Switch[] = _("SWITCH"); const u8 gText_PkmnInfo[] = _("POKéMON INFO"); const u8 gText_PkmnSkills[] = _("POKéMON SKILLS"); const u8 gText_BattleMoves[] = _("BATTLE MOVES"); -const u8 gText_ContestMoves[] = _("CONTEST MOVES"); +const u8 gText_ContestMoves[] = _("C0NTEST MOVES"); const u8 gText_Info[] = _("INFO"); const u8 gText_EggWillTakeALongTime[] = _("It looks like this EGG will\ntake a long time to hatch."); const u8 gText_EggWillTakeSomeTime[] = _("What will hatch from this?\nIt will take some time."); @@ -1107,15 +1106,9 @@ const u8 gText_GamePlayCannotBeContinued[] = _("{COLOR RED}“Game play cannot b const u8 gText_CheckCompleted[] = _("Check completed.\nAttempting to save again.\nPlease wait."); const u8 gText_SaveCompleteGameCannotContinue[] = _("Save completed.\n{COLOR RED}“Game play cannot be continued.\nReturning to the title screen.”"); const u8 gText_SaveCompletePressA[] = _("Save completed.\n{COLOR RED}“Please press the A Button.”"); -#if (DECAP_ENABLED) && !(DECAP_MAP_NAMES) -const u8 gText_Ferry[] = _C("FERRY"); -const u8 gText_SecretBase[] = _C("SECRET BASE"); -const u8 gText_Hideout[] = _C("HIDEOUT"); -#else const u8 gText_Ferry[] = _("FERRY"); const u8 gText_SecretBase[] = _("SECRET BASE"); const u8 gText_Hideout[] = _("HIDEOUT"); -#endif const u8 gText_ResetRTCConfirmCancel[] = _("Reset RTC?\nA: Confirm, B: Cancel"); const u8 gText_PresentTime[] = _("Present time in game"); const u8 gText_PreviousTime[] = _("Previous time in game"); @@ -1213,7 +1206,7 @@ const u8 gText_PkmnFainted_FldPsn[] = _("{STR_VAR_1} survived the poisoning.\nTh #endif const u8 gText_Marco[] = _("MARCO"); const u8 gText_TrainerCardName[] = _("NAME: "); -const u8 gText_TrainerCardIDNo[] = _C("IDNo."); +const u8 gText_TrainerCardIDNo[] = _("IDNo."); const u8 gText_TrainerCardMoney[] = _("MONEY"); const u8 gText_PokeDollar[] = _("¥"); // Unused const u8 gText_TrainerCardPokedex[] = _("POKéDEX"); diff --git a/test/test_runner_battle.c b/test/test_runner_battle.c index b800f9099f..30183a6dc8 100644 --- a/test/test_runner_battle.c +++ b/test/test_runner_battle.c @@ -12,7 +12,6 @@ #include "random.h" #include "test/battle.h" #include "window.h" -#include "text.h" #include "constants/trainers.h" #if defined(__INTELLISENSE__) @@ -1186,13 +1185,6 @@ static s32 TryMessage(s32 i, s32 n, const u8 *string) if (string[j] == CHAR_PROMPT_CLEAR) j++; } - if (DECAP_ENABLED && (string[j] == CHAR_FIXED_CASE || string[j] == CHAR_UNFIX_CASE)) - { - // Ignores case-fixing characters in string - // k will be incremented in 'continue' - k--; - continue; - } if (string[j] != event->pattern[k]) { break; diff --git a/tools/preproc/asm_file.cpp b/tools/preproc/asm_file.cpp index 95655f6ac9..04a7410e00 100644 --- a/tools/preproc/asm_file.cpp +++ b/tools/preproc/asm_file.cpp @@ -170,8 +170,6 @@ Directive AsmFile::GetDirective() if (CheckForDirective(".include")) return Directive::Include; - else if (CheckForDirective(".fixstr")) - return Directive::FixedString; else if (CheckForDirective(".string")) return Directive::String; else if (CheckForDirective(".braille")) diff --git a/tools/preproc/asm_file.h b/tools/preproc/asm_file.h index 9659c7264f..29435f76a4 100644 --- a/tools/preproc/asm_file.h +++ b/tools/preproc/asm_file.h @@ -31,7 +31,6 @@ enum class Directive Include, String, Braille, - FixedString, Unknown }; diff --git a/tools/preproc/c_file.cpp b/tools/preproc/c_file.cpp index d400a75d04..508c628731 100644 --- a/tools/preproc/c_file.cpp +++ b/tools/preproc/c_file.cpp @@ -195,7 +195,6 @@ void CFile::TryConvertString() long oldPos = m_pos; long oldLineNum = m_lineNum; bool noTerminator = false; - bool fixedCase = false; if (m_buffer[m_pos] != '_' || (m_pos > 0 && IsIdentifierChar(m_buffer[m_pos - 1]))) return; @@ -208,13 +207,6 @@ void CFile::TryConvertString() m_pos++; } - // Fixed-case string - if (m_buffer[m_pos] == 'C') - { - fixedCase = true; - m_pos++; - } - SkipWhitespace(); if (m_buffer[m_pos] != '(') @@ -242,13 +234,7 @@ void CFile::TryConvertString() try { - if (fixedCase) { - s[0] = '\x7d'; // FIXED_CASE - m_pos += stringParser.ParseString(m_pos, s+1, length); - length++; - } else { - m_pos += stringParser.ParseString(m_pos, s, length); - } + m_pos += stringParser.ParseString(m_pos, s, length); } catch (std::runtime_error& e) { diff --git a/tools/preproc/preproc.cpp b/tools/preproc/preproc.cpp index 554482dfb1..eb2d4c8a23 100644 --- a/tools/preproc/preproc.cpp +++ b/tools/preproc/preproc.cpp @@ -76,16 +76,6 @@ void PreprocAsmFile(std::string filename) PrintAsmBytes(s, length); break; } - // Like String, but prepends FIXED_CASE char - case Directive::FixedString: - { - unsigned char s[kMaxStringLength]; - int length = 0; - s[length++] = '\x7d'; // FIXED_CASE - length += stack.top().ReadString(s+length); - PrintAsmBytes(s, length); - break; - } case Directive::Braille: { unsigned char s[kMaxStringLength]; From cd1f4a8e944dfc1ded9dfd39f51645600086fe66 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Mon, 13 May 2024 20:04:41 +0200 Subject: [PATCH 02/11] Fixed C0ntest (#4563) --- src/strings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/strings.c b/src/strings.c index ff1c3dbed4..46067a7fe8 100644 --- a/src/strings.c +++ b/src/strings.c @@ -520,7 +520,7 @@ const u8 gText_Switch[] = _("SWITCH"); const u8 gText_PkmnInfo[] = _("POKéMON INFO"); const u8 gText_PkmnSkills[] = _("POKéMON SKILLS"); const u8 gText_BattleMoves[] = _("BATTLE MOVES"); -const u8 gText_ContestMoves[] = _("C0NTEST MOVES"); +const u8 gText_ContestMoves[] = _("CONTEST MOVES"); const u8 gText_Info[] = _("INFO"); const u8 gText_EggWillTakeALongTime[] = _("It looks like this EGG will\ntake a long time to hatch."); const u8 gText_EggWillTakeSomeTime[] = _("What will hatch from this?\nIt will take some time."); From 23b880479058716cdc882611da2db2b1266eafd2 Mon Sep 17 00:00:00 2001 From: sneed <56992013+Sneed69@users.noreply.github.com> Date: Tue, 14 May 2024 14:09:26 +0300 Subject: [PATCH 03/11] Various AI switching logic fixes (#4571) --- src/battle_ai_switch_items.c | 96 +++++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 39 deletions(-) diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 273fb2c998..6e1cf45d64 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -1279,6 +1279,9 @@ static u32 GetSwitchinHazardsDamage(u32 battler, struct BattlePokemon *battleMon // Stealth Rock if ((hazardFlags & SIDE_STATUS_STEALTH_ROCK) && heldItemEffect != HOLD_EFFECT_HEAVY_DUTY_BOOTS) hazardDamage += GetStealthHazardDamageByTypesAndHP(gMovesInfo[MOVE_STEALTH_ROCK].type, defType1, defType2, battleMon->maxHP); + // G-Max Steelsurge + if ((hazardFlags & SIDE_STATUS_STEELSURGE) && heldItemEffect != HOLD_EFFECT_HEAVY_DUTY_BOOTS) + hazardDamage += GetStealthHazardDamageByTypesAndHP(gMovesInfo[MOVE_G_MAX_STEELSURGE].type, defType1, defType2, battleMon->maxHP); // Spikes if ((hazardFlags & SIDE_STATUS_SPIKES) && IsMonGrounded(heldItemEffect, ability, defType1, defType2)) { @@ -1323,40 +1326,46 @@ static u32 GetSwitchinHazardsDamage(u32 battler, struct BattlePokemon *battleMon // Gets damage / healing from weather static s32 GetSwitchinWeatherImpact(void) { - s32 weatherImpact = 0, maxHP = AI_DATA->switchinCandidate.battleMon.maxHP, ability = AI_DATA->switchinCandidate.battleMon.ability; - u16 item = AI_DATA->switchinCandidate.battleMon.item; + s32 weatherDamage = 0, maxHP = AI_DATA->switchinCandidate.battleMon.maxHP, ability = AI_DATA->switchinCandidate.battleMon.ability; + u32 holdEffect = gItemsInfo[AI_DATA->switchinCandidate.battleMon.item].holdEffect; if (WEATHER_HAS_EFFECT) { + s32 weatherImpact = 0; // Damage - if (item != ITEM_SAFETY_GOGGLES) + if (holdEffect != HOLD_EFFECT_SAFETY_GOGGLES && ability != ABILITY_MAGIC_GUARD && ability != ABILITY_OVERCOAT) { - if ((gBattleWeather & B_WEATHER_HAIL) && (AI_DATA->switchinCandidate.battleMon.type1 != TYPE_ICE || AI_DATA->switchinCandidate.battleMon.type2 != TYPE_ICE) - && ability != ABILITY_OVERCOAT && ability != ABILITY_SNOW_CLOAK && ability != ABILITY_ICE_BODY) + if ((gBattleWeather & B_WEATHER_HAIL) + && (AI_DATA->switchinCandidate.battleMon.type1 != TYPE_ICE || AI_DATA->switchinCandidate.battleMon.type2 != TYPE_ICE) + && ability != ABILITY_SNOW_CLOAK && ability != ABILITY_ICE_BODY) { weatherImpact = maxHP / 16; if (weatherImpact == 0) weatherImpact = 1; } - else if ((gBattleWeather & B_WEATHER_SANDSTORM) && (AI_DATA->switchinCandidate.battleMon.type1 != TYPE_GROUND && AI_DATA->switchinCandidate.battleMon.type2 != TYPE_GROUND + else if ((gBattleWeather & B_WEATHER_SANDSTORM) + && (AI_DATA->switchinCandidate.battleMon.type1 != TYPE_GROUND && AI_DATA->switchinCandidate.battleMon.type2 != TYPE_GROUND && AI_DATA->switchinCandidate.battleMon.type1 != TYPE_ROCK && AI_DATA->switchinCandidate.battleMon.type2 != TYPE_ROCK && AI_DATA->switchinCandidate.battleMon.type1 != TYPE_STEEL && AI_DATA->switchinCandidate.battleMon.type2 != TYPE_STEEL - && ability != ABILITY_OVERCOAT && ability != ABILITY_SAND_VEIL && ability != ABILITY_SAND_RUSH && ability != ABILITY_SAND_FORCE)) + && ability != ABILITY_SAND_VEIL && ability != ABILITY_SAND_RUSH && ability != ABILITY_SAND_FORCE)) { weatherImpact = maxHP / 16; if (weatherImpact == 0) weatherImpact = 1; } } - if ((gBattleWeather & B_WEATHER_SUN) && (ability == ABILITY_SOLAR_POWER || ability == ABILITY_DRY_SKIN)) + if ((gBattleWeather & B_WEATHER_SUN) && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA + && (ability == ABILITY_SOLAR_POWER || ability == ABILITY_DRY_SKIN)) { weatherImpact = maxHP / 8; if (weatherImpact == 0) weatherImpact = 1; } + weatherDamage += weatherImpact; + // Healing - if (gBattleWeather & B_WEATHER_RAIN) + if (gBattleWeather & B_WEATHER_RAIN && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA) { if (ability == ABILITY_DRY_SKIN) { @@ -1375,28 +1384,30 @@ static s32 GetSwitchinWeatherImpact(void) { weatherImpact = maxHP / 16; if (weatherImpact == 0) - weatherImpact =1; + weatherImpact = 1; } + + weatherDamage -= weatherImpact; } - return weatherImpact; + return weatherDamage; } // Gets one turn of recurring healing static u32 GetSwitchinRecurringHealing(void) { u32 recurringHealing = 0, maxHP = AI_DATA->switchinCandidate.battleMon.maxHP, ability = AI_DATA->switchinCandidate.battleMon.ability; - u16 item = AI_DATA->switchinCandidate.battleMon.item; + u32 holdEffect = gItemsInfo[AI_DATA->switchinCandidate.battleMon.item].holdEffect; // Items if (ability != ABILITY_KLUTZ) { - if (item == ITEM_BLACK_SLUDGE && (AI_DATA->switchinCandidate.battleMon.type1 == TYPE_POISON || AI_DATA->switchinCandidate.battleMon.type2 == TYPE_POISON)) + if (holdEffect == HOLD_EFFECT_BLACK_SLUDGE && (AI_DATA->switchinCandidate.battleMon.type1 == TYPE_POISON || AI_DATA->switchinCandidate.battleMon.type2 == TYPE_POISON)) { recurringHealing = maxHP / 16; if (recurringHealing == 0) recurringHealing = 1; } - else if (item == ITEM_LEFTOVERS) + else if (holdEffect == HOLD_EFFECT_LEFTOVERS) { recurringHealing = maxHP / 16; if (recurringHealing == 0) @@ -1407,9 +1418,10 @@ static u32 GetSwitchinRecurringHealing(void) // Abilities if (ability == ABILITY_POISON_HEAL && (AI_DATA->switchinCandidate.battleMon.status1 & STATUS1_POISON)) { - recurringHealing = maxHP / 8; - if (recurringHealing == 0) - recurringHealing = 1; + u32 healing = maxHP / 8; + if (healing == 0) + healing = 1; + recurringHealing += healing; } return recurringHealing; } @@ -1418,24 +1430,24 @@ static u32 GetSwitchinRecurringHealing(void) static u32 GetSwitchinRecurringDamage(void) { u32 passiveDamage = 0, maxHP = AI_DATA->switchinCandidate.battleMon.maxHP, ability = AI_DATA->switchinCandidate.battleMon.ability; - u16 item = AI_DATA->switchinCandidate.battleMon.item; + u32 holdEffect = gItemsInfo[AI_DATA->switchinCandidate.battleMon.item].holdEffect; // Items if (ability != ABILITY_MAGIC_GUARD && ability != ABILITY_KLUTZ) { - if (item == ITEM_BLACK_SLUDGE && AI_DATA->switchinCandidate.battleMon.type1 != TYPE_POISON && AI_DATA->switchinCandidate.battleMon.type2 != TYPE_POISON) + if (holdEffect == HOLD_EFFECT_BLACK_SLUDGE && AI_DATA->switchinCandidate.battleMon.type1 != TYPE_POISON && AI_DATA->switchinCandidate.battleMon.type2 != TYPE_POISON) { passiveDamage = maxHP / 8; if (passiveDamage == 0) passiveDamage = 1; } - else if (item == ITEM_LIFE_ORB && ability != ABILITY_SHEER_FORCE) + else if (holdEffect == HOLD_EFFECT_LIFE_ORB && ability != ABILITY_SHEER_FORCE) { passiveDamage = maxHP / 10; if (passiveDamage == 0) passiveDamage = 1; } - else if (item == ITEM_STICKY_BARB) + else if (holdEffect == HOLD_EFFECT_STICKY_BARB) { passiveDamage = maxHP / 8; if(passiveDamage == 0) @@ -1527,8 +1539,8 @@ static u32 GetSwitchinHitsToKO(s32 damageTaken, u32 battler) u32 recurringHealing = GetSwitchinRecurringHealing(); u32 statusDamage = GetSwitchinStatusDamage(battler); u32 hitsToKO = 0, singleUseItemHeal = 0; - u16 maxHP = AI_DATA->switchinCandidate.battleMon.maxHP, item = AI_DATA->switchinCandidate.battleMon.item, heldItemEffect = gItemsInfo[AI_DATA->switchinCandidate.battleMon.item].holdEffect; - u8 weatherDuration = gWishFutureKnock.weatherDuration, holdEffectParam = gItemsInfo[AI_DATA->switchinCandidate.battleMon.item].holdEffectParam; + u16 maxHP = AI_DATA->switchinCandidate.battleMon.maxHP, item = AI_DATA->switchinCandidate.battleMon.item, heldItemEffect = gItemsInfo[item].holdEffect; + u8 weatherDuration = gWishFutureKnock.weatherDuration, holdEffectParam = gItemsInfo[item].holdEffectParam; u32 opposingBattler = GetBattlerAtPosition(BATTLE_OPPOSITE(GetBattlerPosition(battler))); u32 opposingAbility = gBattleMons[opposingBattler].ability; bool32 usedSingleUseHealingItem = FALSE; @@ -1557,29 +1569,35 @@ static u32 GetSwitchinHitsToKO(s32 damageTaken, u32 battler) currentHP = currentHP + weatherImpact; // Check if we're at a single use healing item threshold - if (AI_DATA->switchinCandidate.battleMon.ability != ABILITY_KLUTZ && usedSingleUseHealingItem == FALSE) + if (AI_DATA->switchinCandidate.battleMon.ability != ABILITY_KLUTZ && usedSingleUseHealingItem == FALSE + && !(opposingAbility == ABILITY_UNNERVE && GetPocketByItemId(item) == POCKET_BERRIES)) { - if (currentHP < maxHP / 2) + switch (heldItemEffect) { - if (item == ITEM_BERRY_JUICE) - { + case HOLD_EFFECT_RESTORE_HP: + if (currentHP < maxHP / 2) singleUseItemHeal = holdEffectParam; - } - else if (opposingAbility != ABILITY_UNNERVE && heldItemEffect == HOLD_EFFECT_RESTORE_HP) + break; + case HOLD_EFFECT_RESTORE_PCT_HP: + if (currentHP < maxHP / 2) { - // By default, this should only encompass Oran Berry and Sitrus Berry. - singleUseItemHeal = holdEffectParam; + singleUseItemHeal = maxHP / holdEffectParam; if (singleUseItemHeal == 0) singleUseItemHeal = 1; } - } - else if (currentHP < maxHP / CONFUSE_BERRY_HP_FRACTION - && opposingAbility != ABILITY_UNNERVE - && (item == ITEM_AGUAV_BERRY || item == ITEM_FIGY_BERRY || item == ITEM_IAPAPA_BERRY || item == ITEM_MAGO_BERRY || item == ITEM_WIKI_BERRY)) - { - singleUseItemHeal = maxHP / CONFUSE_BERRY_HEAL_FRACTION; - if (singleUseItemHeal == 0) - singleUseItemHeal = 1; + break; + case HOLD_EFFECT_CONFUSE_SPICY: + case HOLD_EFFECT_CONFUSE_DRY: + case HOLD_EFFECT_CONFUSE_SWEET: + case HOLD_EFFECT_CONFUSE_BITTER: + case HOLD_EFFECT_CONFUSE_SOUR: + if (currentHP < maxHP / CONFUSE_BERRY_HP_FRACTION) + { + singleUseItemHeal = maxHP / holdEffectParam; + if (singleUseItemHeal == 0) + singleUseItemHeal = 1; + } + break; } // If we used one, apply it without overcapping our maxHP From 9cd3fbb232cf629e92f68569808d5f349dc46ef5 Mon Sep 17 00:00:00 2001 From: TheJamesLJ Date: Tue, 14 May 2024 12:28:10 +0100 Subject: [PATCH 04/11] Opponents Shaymin Sky form correctly reverts on frozen status (#4559) * Fixed Shaymin form change with incorrect status condition * Fixed Shaymin receiving damage again after changing form * PR feedback updates - fixed missing commas in battle script * Added Shaymin form change test by @AlexOn1ine --- data/battle_scripts_1.s | 12 +++++++---- src/data/pokemon/form_change_tables.h | 2 +- src/pokemon.c | 5 ++++- test/battle/form_change/status.c | 29 +++++++++++++++++++++++++-- 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 1f066d77a8..f20e13e8ae 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -6994,6 +6994,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 @@ -7001,10 +7008,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:: diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h index 8eb96e04b0..0b8eb485a9 100644 --- a/src/data/pokemon/form_change_tables.h +++ b/src/data/pokemon/form_change_tables.h @@ -627,7 +627,7 @@ static const struct FormChange sShayminFormChangeTable[] = { {FORM_CHANGE_ITEM_USE, SPECIES_SHAYMIN_SKY, ITEM_GRACIDEA, DAY}, {FORM_CHANGE_WITHDRAW, SPECIES_SHAYMIN_LAND}, {FORM_CHANGE_TIME_OF_DAY, SPECIES_SHAYMIN_LAND, NIGHT}, - {FORM_CHANGE_STATUS, SPECIES_SHAYMIN_LAND, (STATUS1_FREEZE | STATUS1_FROSTBITE)}, + {FORM_CHANGE_STATUS, SPECIES_SHAYMIN_LAND, STATUS1_FREEZE | STATUS1_FROSTBITE}, {FORM_CHANGE_TERMINATOR}, }; #endif //P_FAMILY_SHAYMIN diff --git a/src/pokemon.c b/src/pokemon.c index b02eb87d93..0d2e3c5fd3 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6226,9 +6226,12 @@ u16 GetFormChangeTargetSpeciesBoxMon(struct BoxPokemon *boxMon, u16 method, u32 break; case FORM_CHANGE_WITHDRAW: case FORM_CHANGE_FAINT: - case FORM_CHANGE_STATUS: targetSpecies = formChanges[i].targetSpecies; break; + case FORM_CHANGE_STATUS: + if (GetBoxMonData(boxMon, MON_DATA_STATUS, NULL) & formChanges[i].param1) + targetSpecies = formChanges[i].targetSpecies; + break; case FORM_CHANGE_TIME_OF_DAY: switch (formChanges[i].param1) { diff --git a/test/battle/form_change/status.c b/test/battle/form_change/status.c index b264ba3dd5..f0d5a9f3f0 100644 --- a/test/battle/form_change/status.c +++ b/test/battle/form_change/status.c @@ -3,13 +3,38 @@ SINGLE_BATTLE_TEST("Shaymin-Sky reverts to Shaymin-Land when frozen or frostbitten") { + u32 move; + + PARAMETRIZE { move = MOVE_POWDER_SNOW; } + PARAMETRIZE { move = MOVE_EMBER; } + PARAMETRIZE { move = MOVE_THUNDERSHOCK; } + PARAMETRIZE { move = MOVE_POISON_STING; } + PARAMETRIZE { move = MOVE_POISON_FANG; } + ASSUME(MoveHasAdditionalEffect(MOVE_POWDER_SNOW, MOVE_EFFECT_FREEZE_OR_FROSTBITE)); + ASSUME(MoveHasAdditionalEffect(MOVE_EMBER, MOVE_EFFECT_BURN)); + ASSUME(MoveHasAdditionalEffect(MOVE_THUNDERSHOCK, MOVE_EFFECT_PARALYSIS)); + ASSUME(MoveHasAdditionalEffect(MOVE_POISON_STING, MOVE_EFFECT_POISON)); + ASSUME(MoveHasAdditionalEffect(MOVE_POISON_FANG, MOVE_EFFECT_TOXIC)); GIVEN { PLAYER(SPECIES_SHAYMIN_SKY); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(opponent, MOVE_POWDER_SNOW); } + TURN { MOVE(opponent, move); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, move, opponent); + if (move == MOVE_POWDER_SNOW) { + STATUS_ICON(player, freeze: TRUE); + NOT HP_BAR(player); // Regression caused by Mimikyu form change + MESSAGE("Shaymin transformed!"); + } else { + NOT MESSAGE("Shaymin transformed!"); + } } THEN { - EXPECT_EQ(player->species, SPECIES_SHAYMIN_LAND); + if (move == MOVE_POWDER_SNOW) + EXPECT_EQ(player->species, SPECIES_SHAYMIN_LAND); + else + EXPECT_EQ(player->species, SPECIES_SHAYMIN_SKY); + } } From dd6e91eaf7bc9f37b938f6bdb9a1cb60a70f0dd0 Mon Sep 17 00:00:00 2001 From: Isaac Rivera <40581123+iriv24@users.noreply.github.com> Date: Tue, 14 May 2024 07:32:44 -0400 Subject: [PATCH 05/11] Add check for MULTI_HIT moves in IsMoveAffectedByParentalBond (#4570) --- src/battle_script_commands.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index be474cea8a..fda62541d7 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -15778,7 +15778,8 @@ bool32 IsMoveAffectedByParentalBond(u32 move, u32 battler) if (move != MOVE_NONE && move != MOVE_UNAVAILABLE && move != MOVE_STRUGGLE && !gMovesInfo[move].parentalBondBanned && gMovesInfo[move].category != DAMAGE_CATEGORY_STATUS - && gMovesInfo[move].strikeCount < 2) + && gMovesInfo[move].strikeCount < 2 + && gMovesInfo[move].effect != EFFECT_MULTI_HIT) { if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { From 5cc7330f33eb924b1227edfff4f3caac12adec1f Mon Sep 17 00:00:00 2001 From: PhallenTree <168426989+PhallenTree@users.noreply.github.com> Date: Tue, 14 May 2024 12:34:36 +0100 Subject: [PATCH 06/11] Fixes cries in move animations ignoring Illusion (#4564) * Fixes cries in move animations not taking into account the ability Illusion * Fixes cry for Link Battles --- src/battle_anim_sound_tasks.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index bd4638224f..c4ad988a0b 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -167,10 +167,7 @@ void SoundTask_PlayCryHighPitch(u8 taskId) return; } - if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) - species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); - else - species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); + species = (GetIllusionMonSpecies(battlerId) != SPECIES_NONE) ? GetIllusionMonSpecies(battlerId) : gAnimBattlerSpecies[battlerId]; } if (species != SPECIES_NONE) @@ -215,10 +212,7 @@ void SoundTask_PlayDoubleCry(u8 taskId) return; } - if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) - species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); - else - species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); + species = (GetIllusionMonSpecies(battlerId) != SPECIES_NONE) ? GetIllusionMonSpecies(battlerId) : gAnimBattlerSpecies[battlerId]; } gTasks[taskId].data[0] = gBattleAnimArgs[1]; @@ -285,7 +279,8 @@ void SoundTask_WaitForCry(u8 taskId) void SoundTask_PlayNormalCry(u8 taskId) { - PlayCry_ByMode(gBattleMons[gBattleAnimAttacker].species, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER), CRY_MODE_NORMAL); + u16 species = (GetIllusionMonSpecies(gBattleAnimAttacker) != SPECIES_NONE) ? GetIllusionMonSpecies(gBattleAnimAttacker) : gAnimBattlerSpecies[gBattleAnimAttacker]; + PlayCry_ByMode(species, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER), CRY_MODE_NORMAL); gTasks[taskId].func = SoundTask_WaitForCry; } @@ -305,7 +300,7 @@ void SoundTask_PlayCryWithEcho(u8 taskId) if (IsContest()) species = gContestResources->moveAnim->species; else - species = gAnimBattlerSpecies[gBattleAnimAttacker]; + species = (GetIllusionMonSpecies(gBattleAnimAttacker) != SPECIES_NONE) ? GetIllusionMonSpecies(gBattleAnimAttacker) : gAnimBattlerSpecies[gBattleAnimAttacker]; gTasks[taskId].tSpecies = species; gTasks[taskId].tPan = pan; From d71d5f7f1eaa4d5b00f4c41adb6e1943f43eb19d Mon Sep 17 00:00:00 2001 From: sneed <56992013+Sneed69@users.noreply.github.com> Date: Tue, 14 May 2024 14:44:46 +0300 Subject: [PATCH 07/11] fix incorrect usage of ANIM_PLAYER_LEFT and _RIGHT (#4560) --- data/battle_anim_scripts.s | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index becdadac1a..8861dc514d 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1876,8 +1876,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 @@ -2360,7 +2360,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 @@ -2677,7 +2677,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 @@ -2765,7 +2765,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 @@ -3198,7 +3198,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 @@ -3307,7 +3307,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 @@ -3936,8 +3936,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 @@ -4319,8 +4319,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 @@ -13067,7 +13067,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 @@ -16173,7 +16173,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 From 08bdc85359a2b6f0a608085f1ef48101cb40ce5d Mon Sep 17 00:00:00 2001 From: Isaac Rivera <40581123+iriv24@users.noreply.github.com> Date: Tue, 14 May 2024 11:28:14 -0400 Subject: [PATCH 08/11] Adds tests to verify Parental Bond doesn't affect EFFECT_MULTI_HIT moves (#4573) * Adds tests to verify that Parental Bond does not affect moves with EFFECT_MULTI_HIT * actually make kanga mega evolve in tests * add celebrate for opponent and "not animation" on 5th hit * update test strings --- test/battle/ability/parental_bond.c | 108 ++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/test/battle/ability/parental_bond.c b/test/battle/ability/parental_bond.c index 5ff56bcef2..46e71096de 100644 --- a/test/battle/ability/parental_bond.c +++ b/test/battle/ability/parental_bond.c @@ -131,6 +131,114 @@ SINGLE_BATTLE_TEST("Parental Bond-converted moves only hit once on Lightning Rod } } +SINGLE_BATTLE_TEST("Parental Bond has no affect on multi hit moves and they still hit twice 35% of the time") +{ + PASSES_RANDOMLY(35, 100, RNG_HITS); + + GIVEN { + ASSUME(B_MULTI_HIT_CHANCE >= GEN_5); + ASSUME(gMovesInfo[MOVE_COMET_PUNCH].category != DAMAGE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_COMET_PUNCH].effect == EFFECT_MULTI_HIT); + PLAYER(SPECIES_KANGASKHAN) { Item(ITEM_KANGASKHANITE); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_COMET_PUNCH, megaEvolve: TRUE); } + } SCENE { + MESSAGE("Kangaskhan's Kangaskhanite is reacting to 1's Mega Ring!"); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, player); + MESSAGE("Kangaskhan has Mega Evolved into Mega Kangaskhan!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + MESSAGE("Hit 2 time(s)!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, opponent); + } + THEN { + EXPECT_EQ(player->species, SPECIES_KANGASKHAN_MEGA); + } +} + +SINGLE_BATTLE_TEST("Parental Bond has no affect on multi hit moves and they still hit thrice 35% of the time") +{ + PASSES_RANDOMLY(35, 100, RNG_HITS); + + GIVEN { + ASSUME(B_MULTI_HIT_CHANCE >= GEN_5); + ASSUME(gMovesInfo[MOVE_COMET_PUNCH].category != DAMAGE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_COMET_PUNCH].effect == EFFECT_MULTI_HIT); + PLAYER(SPECIES_KANGASKHAN) { Item(ITEM_KANGASKHANITE); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_COMET_PUNCH, megaEvolve: TRUE); } + } SCENE { + MESSAGE("Kangaskhan's Kangaskhanite is reacting to 1's Mega Ring!"); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, player); + MESSAGE("Kangaskhan has Mega Evolved into Mega Kangaskhan!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + MESSAGE("Hit 3 time(s)!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, opponent); + } + THEN { + EXPECT_EQ(player->species, SPECIES_KANGASKHAN_MEGA); + } +} + +SINGLE_BATTLE_TEST("Parental Bond has no affect on multi hit moves and they still hit four times 15% of the time") +{ + PASSES_RANDOMLY(15, 100, RNG_HITS); + + GIVEN { + ASSUME(B_MULTI_HIT_CHANCE >= GEN_5); + ASSUME(gMovesInfo[MOVE_COMET_PUNCH].category != DAMAGE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_COMET_PUNCH].effect == EFFECT_MULTI_HIT); + PLAYER(SPECIES_KANGASKHAN) { Item(ITEM_KANGASKHANITE); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_COMET_PUNCH, megaEvolve: TRUE); } + } SCENE { + MESSAGE("Kangaskhan's Kangaskhanite is reacting to 1's Mega Ring!"); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, player); + MESSAGE("Kangaskhan has Mega Evolved into Mega Kangaskhan!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + MESSAGE("Hit 4 time(s)!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, opponent); + } + THEN { + EXPECT_EQ(player->species, SPECIES_KANGASKHAN_MEGA); + } +} + +SINGLE_BATTLE_TEST("Parental Bond has no affect on multi hit moves and they still hit five times 15% of the time") +{ + PASSES_RANDOMLY(15, 100, RNG_HITS); + + GIVEN { + ASSUME(B_MULTI_HIT_CHANCE >= GEN_5); + ASSUME(gMovesInfo[MOVE_COMET_PUNCH].category != DAMAGE_CATEGORY_STATUS); + ASSUME(gMovesInfo[MOVE_COMET_PUNCH].effect == EFFECT_MULTI_HIT); + PLAYER(SPECIES_KANGASKHAN) { Item(ITEM_KANGASKHANITE); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_COMET_PUNCH, megaEvolve: TRUE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_COMET_PUNCH, player); + MESSAGE("Hit 5 time(s)!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, opponent); + } + THEN { + EXPECT_EQ(player->species, SPECIES_KANGASKHAN_MEGA); + } +} + TO_DO_BATTLE_TEST("Parental Bond tests"); // Temporary TODO: Convert Bulbapedia description into tests. From 2e7c32019fe24af1e22203c3abc4404c8a99443a Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Tue, 14 May 2024 17:36:12 +0200 Subject: [PATCH 09/11] Update items.h (#4574) --- src/data/items.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 1a5ec7ff65..f35f10a16d 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1781,7 +1781,7 @@ const struct Item gItemsInfo[] = [ITEM_EXP_CANDY_XL] = { .name = _("Exp.Candy XL"), - .pluralName = _("Exp.Candies L"), + .pluralName = _("Exp.Candies XL"), .price = 10000, .holdEffectParam = EXP_30000, .description = COMPOUND_STRING( From 35362fbd24a8e6d64b4608b166fbb7633978c331 Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Tue, 14 May 2024 11:28:50 -0500 Subject: [PATCH 10/11] Update various sprites to ones from PokeCommunity (#4554) * Updated battle sprites * Update icon sprites * Revert appletun change --- graphics/pokemon/arctibax/back.png | Bin 555 -> 615 bytes graphics/pokemon/arctibax/front.png | Bin 755 -> 798 bytes graphics/pokemon/arctibax/normal.pal | 30 +++++----- graphics/pokemon/arctibax/shiny.pal | 30 +++++----- graphics/pokemon/arctovish/icon.png | Bin 448 -> 427 bytes graphics/pokemon/arctozolt/icon.png | Bin 439 -> 385 bytes graphics/pokemon/arrokuda/icon.png | Bin 319 -> 343 bytes graphics/pokemon/barraskewda/icon.png | Bin 379 -> 398 bytes graphics/pokemon/calyrex/ice_rider/icon.png | Bin 600 -> 496 bytes graphics/pokemon/calyrex/icon.png | Bin 338 -> 366 bytes .../pokemon/calyrex/shadow_rider/icon.png | Bin 534 -> 491 bytes .../darmanitan/zen_mode/galarian/icon.png | Bin 388 -> 461 bytes graphics/pokemon/decidueye/hisuian/back.png | Bin 850 -> 880 bytes graphics/pokemon/decidueye/hisuian/front.png | Bin 966 -> 974 bytes graphics/pokemon/decidueye/hisuian/normal.pal | 30 +++++----- graphics/pokemon/decidueye/hisuian/shiny.pal | 30 +++++----- graphics/pokemon/dialga/origin/back.png | Bin 623 -> 659 bytes graphics/pokemon/dialga/origin/front.png | Bin 1072 -> 1076 bytes graphics/pokemon/dialga/origin/normal.pal | 32 +++++----- graphics/pokemon/dialga/origin/shiny.pal | 32 +++++----- graphics/pokemon/dracovish/icon.png | Bin 487 -> 455 bytes graphics/pokemon/dracozolt/icon.png | Bin 486 -> 444 bytes graphics/pokemon/gholdengo/back.png | Bin 657 -> 720 bytes graphics/pokemon/gholdengo/front.png | Bin 798 -> 898 bytes graphics/pokemon/gholdengo/normal.pal | 28 +++++---- graphics/pokemon/gholdengo/shiny.pal | 28 +++++---- graphics/pokemon/gimmighoul/back.png | Bin 704 -> 440 bytes graphics/pokemon/gimmighoul/front.png | Bin 793 -> 738 bytes graphics/pokemon/gimmighoul/normal.pal | 32 +++++----- graphics/pokemon/gimmighoul/roaming/back.png | Bin 552 -> 476 bytes graphics/pokemon/gimmighoul/roaming/front.png | Bin 495 -> 376 bytes .../pokemon/gimmighoul/roaming/normal.pal | 29 +++++---- graphics/pokemon/gimmighoul/roaming/shiny.pal | 29 +++++---- graphics/pokemon/gimmighoul/shiny.pal | 32 +++++----- graphics/pokemon/glastrier/icon.png | Bin 366 -> 424 bytes graphics/pokemon/greavard/back.png | Bin 722 -> 738 bytes graphics/pokemon/greavard/front.png | Bin 856 -> 713 bytes graphics/pokemon/greavard/normal.pal | 30 +++++----- graphics/pokemon/greavard/shiny.pal | 26 ++++---- graphics/pokemon/greedent/icon.png | Bin 346 -> 479 bytes graphics/pokemon/houndstone/back.png | Bin 711 -> 572 bytes graphics/pokemon/houndstone/front.png | Bin 1030 -> 838 bytes graphics/pokemon/houndstone/normal.pal | 30 +++++----- graphics/pokemon/houndstone/shiny.pal | 30 +++++----- graphics/pokemon/iron_bundle/back.png | Bin 647 -> 678 bytes graphics/pokemon/iron_bundle/front.png | Bin 706 -> 722 bytes graphics/pokemon/iron_bundle/normal.pal | 28 ++++----- graphics/pokemon/iron_bundle/shiny.pal | 32 +++++----- graphics/pokemon/iron_hands/back.png | Bin 790 -> 737 bytes graphics/pokemon/iron_hands/front.png | Bin 959 -> 972 bytes graphics/pokemon/iron_hands/normal.pal | 26 ++++---- graphics/pokemon/iron_hands/shiny.pal | 28 ++++----- graphics/pokemon/iron_jugulis/back.png | Bin 897 -> 681 bytes graphics/pokemon/iron_jugulis/front.png | Bin 1132 -> 1036 bytes graphics/pokemon/iron_jugulis/normal.pal | 32 +++++----- graphics/pokemon/iron_jugulis/shiny.pal | 32 +++++----- graphics/pokemon/iron_leaves/back.png | Bin 597 -> 649 bytes graphics/pokemon/iron_leaves/front.png | Bin 867 -> 845 bytes graphics/pokemon/iron_leaves/normal.pal | 23 +++---- graphics/pokemon/iron_leaves/shiny.pal | 25 ++++---- graphics/pokemon/iron_moth/back.png | Bin 905 -> 879 bytes graphics/pokemon/iron_moth/front.png | Bin 908 -> 994 bytes graphics/pokemon/iron_moth/normal.pal | 32 +++++----- graphics/pokemon/iron_moth/shiny.pal | 32 +++++----- graphics/pokemon/iron_thorns/back.png | Bin 762 -> 883 bytes graphics/pokemon/iron_thorns/front.png | Bin 1202 -> 1109 bytes graphics/pokemon/iron_thorns/normal.pal | 30 +++++----- graphics/pokemon/iron_thorns/shiny.pal | 30 +++++----- graphics/pokemon/iron_treads/back.png | Bin 796 -> 610 bytes graphics/pokemon/iron_treads/front.png | Bin 1000 -> 834 bytes graphics/pokemon/iron_treads/normal.pal | 30 +++++----- graphics/pokemon/iron_treads/shiny.pal | 30 +++++----- graphics/pokemon/iron_valiant/back.png | Bin 838 -> 823 bytes graphics/pokemon/iron_valiant/front.png | Bin 1022 -> 941 bytes graphics/pokemon/iron_valiant/normal.pal | 30 +++++----- graphics/pokemon/iron_valiant/shiny.pal | 32 +++++----- graphics/pokemon/kubfu/icon.png | Bin 309 -> 389 bytes graphics/pokemon/overqwil/back.png | Bin 605 -> 619 bytes graphics/pokemon/overqwil/front.png | Bin 742 -> 862 bytes graphics/pokemon/overqwil/normal.pal | 30 +++++----- graphics/pokemon/overqwil/shiny.pal | 30 +++++----- graphics/pokemon/pincurchin/icon.png | Bin 270 -> 306 bytes graphics/pokemon/regidrago/icon.png | Bin 478 -> 473 bytes graphics/pokemon/regieleki/icon.png | Bin 478 -> 436 bytes graphics/pokemon/roaring_moon/back.png | Bin 733 -> 604 bytes graphics/pokemon/roaring_moon/front.png | Bin 1189 -> 1145 bytes graphics/pokemon/roaring_moon/normal.pal | 32 +++++----- graphics/pokemon/roaring_moon/shiny.pal | 32 +++++----- graphics/pokemon/skwovet/icon.png | Bin 342 -> 402 bytes graphics/pokemon/slowbro/galarian/icon.png | Bin 466 -> 449 bytes graphics/pokemon/slowking/galarian/icon.png | Bin 396 -> 448 bytes graphics/pokemon/slowpoke/galarian/icon.png | Bin 321 -> 395 bytes graphics/pokemon/sneasler/back.png | Bin 821 -> 738 bytes graphics/pokemon/sneasler/front.png | Bin 913 -> 845 bytes graphics/pokemon/sneasler/normal.pal | 30 +++++----- graphics/pokemon/sneasler/shiny.pal | 30 +++++----- graphics/pokemon/spectrier/icon.png | Bin 333 -> 425 bytes graphics/pokemon/ting_lu/back.png | Bin 830 -> 658 bytes graphics/pokemon/ting_lu/front.png | Bin 916 -> 1019 bytes graphics/pokemon/ting_lu/normal.pal | 32 +++++----- graphics/pokemon/ting_lu/shiny.pal | 32 +++++----- graphics/pokemon/toxel/icon.png | Bin 378 -> 364 bytes graphics/pokemon/ursaluna/back.png | Bin 564 -> 693 bytes graphics/pokemon/ursaluna/bloodmoon/back.png | Bin 719 -> 749 bytes graphics/pokemon/ursaluna/bloodmoon/front.png | Bin 1138 -> 1100 bytes .../pokemon/ursaluna/bloodmoon/normal.pal | 30 +++++----- graphics/pokemon/ursaluna/bloodmoon/shiny.pal | 30 +++++----- graphics/pokemon/ursaluna/front.png | Bin 996 -> 948 bytes graphics/pokemon/ursaluna/normal.pal | 32 +++++----- graphics/pokemon/ursaluna/shiny.pal | 32 +++++----- graphics/pokemon/urshifu/icon.png | Bin 401 -> 461 bytes graphics/pokemon/walking_wake/back.png | Bin 800 -> 903 bytes graphics/pokemon/walking_wake/front.png | Bin 1058 -> 1233 bytes graphics/pokemon/walking_wake/normal.pal | 30 +++++----- graphics/pokemon/walking_wake/shiny.pal | 30 +++++----- graphics/pokemon/wo_chien/back.png | Bin 979 -> 881 bytes graphics/pokemon/wo_chien/front.png | Bin 1321 -> 1137 bytes graphics/pokemon/wo_chien/normal.pal | 32 +++++----- graphics/pokemon/wo_chien/shiny.pal | 32 +++++----- graphics/pokemon/zarude/dada/icon.png | Bin 508 -> 518 bytes graphics/pokemon/zarude/icon.png | Bin 502 -> 516 bytes graphics/pokemon/zoroark/hisuian/back.png | Bin 1185 -> 869 bytes graphics/pokemon/zoroark/hisuian/front.png | Bin 1099 -> 1133 bytes graphics/pokemon/zoroark/hisuian/normal.pal | 30 +++++----- graphics/pokemon/zoroark/hisuian/shiny.pal | 30 +++++----- .../pokemon/species_info/gen_1_families.h | 4 +- .../pokemon/species_info/gen_2_families.h | 24 ++++---- .../pokemon/species_info/gen_5_families.h | 2 +- .../pokemon/species_info/gen_8_families.h | 4 +- .../pokemon/species_info/gen_9_families.h | 56 +++++++++--------- 130 files changed, 808 insertions(+), 788 deletions(-) diff --git a/graphics/pokemon/arctibax/back.png b/graphics/pokemon/arctibax/back.png index ff061dece40bff8df98c339665e758a8a26308fc..2e4bdd3fa3e78627a2a8f78748b90e31b5127b1d 100644 GIT binary patch delta 590 zcmV-U0O7A2H=cwr;F6Q|9|5aB(k8`rh8~F;ntb_ zpP*UOZM*BPyZ*SIQt!u$)O$wi@lrlN%S9rae6hvEm3&p9uTR})uEIjj-=!UJ=GzwL zT91Q>lFR~^0NTVS8wiyQ67q2sNOF9VC!rC!P%kQk>e!PZgk3XnXSpk}+ zqW}PK9Y4-$3djsNrfXkYN&zQ`0wX{NbC!g&Ie*+I;jt6oC!l4tvVD^%zavaN)Qsa6 zU|+hm;ec5nV4n_wPcZi(Jh014ZUJgxIz>0e2zY^kxqk&i4Eab10VO726c~twwwbs^ zfE89iLR#3)ndg=#@nS<2* z_Rr_DNbxPg+Ou$n$n6=pE|mTixF~G>2FO9uC86mjj1jL~M$^AAg=<24fN}sth^GNw zma07g^DM+!ffrZO&+|kQ;v~@YTYzaIsT%N7=S=0BgK>w8K z9mq~M3u1JF0V?c%2_d8iMX-f?z~DnF5y~!PZKw%OTYuQ?c0d*kkRKmlJO%{tLIyVB zIDj0&7QqBPZfb#}Ig}z`5nu)QTmZL+^j24Z%Ml(9LIt)62o+H3coK$s5Ba@%;BW_B zge=qn4tF3U_bV_AAOl;+>^omx4b=TZU>&zQYM=r54Dgb^dRmV9zg)so|G54Dp1dPd U2B(tr01E&B07*qoM6N<$f{qUHSpWb4 diff --git a/graphics/pokemon/arctibax/front.png b/graphics/pokemon/arctibax/front.png index 6b1350e892033c657a94b093d5804c273a968fd3..0446c45e6b7b7253f13c42310dcedcebda0e6af6 100644 GIT binary patch delta 774 zcmV+h1Nr>(1)c_wB!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1_QG7cMndH#=M?Ms8YQeBPig^4dUBWQNb&#w+yM5T*(q2W& z`xre8h++U6z(T0<5GWIeD?*IP zY(*$QfSE*R0Bd|8$p5N*KKBIkJlF^dV2#TwAV=2|Q3L4Y8=(Tuvw?j4 zL`%l%LYRUBvVQ|47AF8K0Fj%13s7ZlmlFU9Ks+ar2(V8V1<<0SR{*Ld&B&TT4j>1ZJX+Fj z0IJU_&Dvz`umLo^WP;0CZ3Sclfzycy$3f^^xho1xkY+yF`ty*!bXQG;*+klqGB14!9}ah_+Edg7&^ z129VHWF^TYTJXnNp4G{?TnEy380Acp^+YKE%zsLpt$f#fz6Q*-+H*woCwdD#03K@h zLa>|qgt>1ikF8|@-XOVeG1uPm!ja<+(C30#+nadf(>DMTNcp_NO0RR91 delta 731 zcmV<10wn#O2J;1wB!4haOjJdg(xhC2g+WDHyzls1Z;E}Ure>An4-XFj0095dO4^Yl zOM03*V}4{dAoP7Ns9-NVfpon9000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00Lr3 zL_t(oh3%H>a;q>5gpq6`Qk&%c-?l6H0%<8WhndqqRVLSZKYvz|kvmO)@qdDD>e<~S z{5pW?F2FhBJ9>W)z+M6V-wEvb8o+D382}*oQG)lghAn3@{Utz_YjAG=1{fjuO|JwF zPW3)iKo8*qWi1gE3rYaT-r?k&Q1wK(A{7fzRsg#&1W-A1u7aqv0Mt$=1Lz6*uq=;{ z2!c#vT6@t-o__<#d8m2j1%O8euv&0bo*e@KU=`1gg$rO7Zx#xqYrs)3056J5TZFZulcTf<<@d5Z1FHj&7=H)@0000?P=%ZT001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJc;oP&ddbG^O2|NsBJq(S!fDb->@_LM1$d;ele z&F*uY|Foo}#s6xooMK{HK|w)TsgPs<009a~L_t(YiS3j@4u8Tx2t`}jd=dipzpX$q zI^)npSDF;vw7mWjrg__T)u&}qXKfKtZV?kAQB}s8$i8I8n(%yPRf&)lV8l#H}A$&T>|Fl7RZP)3Y>zeEs9oP&DC3;;oJ_Tj^tPy9MW0AP>F0QgV+#tZ-z z;D3z$0niK?`+qTHyrKf+eP8B#JldkW&lqQNn}{ly!Z)G@ngGP(5*q+Tb3S)Nz94pZ z0CQzTJ{7?7Kp}Oz`|!@b$E$v=?A#!SK=#%k4}t8hA07f}h(RC=;12~7{x}s#8Kf0R z8Kf6T8Kf169R}$IQU>V-QiA9O(ir3^kj@}afpiA>Ru&+4V(uJ{s|joQ00000NkvXX Hu0mjf;qR>q delta 434 zcmV;j0Zsm^1Hc227=Hu<0001qplF={001yhOjJc+n1FzQaJaa*`1ts^pg{2OD9~U) z@Q^5oc=%vQ$mnpG_^_a$!1!pWm|$R7KtMp~WOLa700B!$L_t(|oYj&sio-AvMSTMu zW*QekIh-3Aj8derAY`wjz#t#OjRHn7xUnI`D`_OhDYw{#oqsORGh*iF6~(XBx~`wU z5$&EZIB+4xH+TY|-2sLNL}O1oaJvp@9&ez|J;#IbGc3+cz>iZ4p=C(`dfuYJktqUa z;Qa+9cI+#@vD5(I!624v?3l$F6lyDFT4olts!j_L8f;L%%JRr4C8qtv$~?&D&WNjzt=uAF*oBj} z1|M?x#&)6pqxwT(!s`)aVa6iqkcH`rC4nr=NJeeK=#!#{voO|eevmLOZ<~dYsbLdF zyR;h#;|6_iX@rF7xw*Gpx+MtHSN2iS|4qX5RW+_@Br6Itd63VI!c4FaqzgIjGK{mI cx&NfT0j4${IDPX8r2qf`07*qoM6N<$f^>Sxi2wiq diff --git a/graphics/pokemon/arctozolt/icon.png b/graphics/pokemon/arctozolt/icon.png index 73dbd1e67e95a755abb7392ac3b6a8a10e2e6b3e..c72633855980da2815ff132e3abc0ecb746b7bbf 100644 GIT binary patch delta 370 zcmV-&0ge8*1AzmO7=H)@0000?P=%ZT001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJc;oP&ddbG^O2|NsBJq(S!fDb->@_LM1$d;ele z&F*uY|Foo}#s6xooMK{HK|w)TsgPs<007`gL_t(YiS3k84}XF{41)<{$t}6G|Nr0G zVF(6p=!3==8sw$5u$_L>bZa2;jcvTj&|t_+<-;r^s1kH@OVt(b%G3=Rpw|st{iRn^ z$X@cg=qJ&`QSLztKzA&#BBFqNLp>^--Bt(za8 z^P>dF#*Y#p8$W7*Jo)iefE+_dfSmrJJ3yMu5g?eGK&p)a@yds4jQ{ZA0XJO|*q;J_ QrvLx|07*qoM6N<$f}fJ83IG5A delta 425 zcmV;a0apHj1GfW^7=Hu<0001qplF={001yhOjJc+n1FbAc(}N*`1ts6aLAyj@UVbb z=)j1;s3`F8DDYrVka)2j}hc{+~s(_#9HP~8fe35`TzArl)xg`f)JkR<9r#3DcG@P^9*JtsCB+zyIBz%>O2c0&^wEHt7g@wZL2nYJtJg0cUQ2!C5bK z1Q}q;*-*44$N*DL^dNKu&5MDL8VxYMw0tl&RjN2yfFcYqSP zDfVJglzYv^q|Lo4oMK{HK|w+3M6_Q3006d0L_t(YiS3lZ4u69%3`0pRH4=yT|NoXG zyA)c=Wt*m{Mx5-p5YXGUr9Tikw}^U|APU2`KEPBdo-ov|fvnZ4-=UH39@O@|hJfn{ z?yK>YfIvlr-MpXdR|JGA)+QMB>b()jVX9tzuQ#Nh$G3}OjK-sTi%Ps`|As)iUc%hR z&5mgO@FjTBQ7m{P_sWTya_&%A7gy9{J@~$`}{cJqvyvNA0vL87WGzsJmG=A aiH8F+a1LV0EBO5Y00001)~7=Hu<0001qplF={001yhOjJc+n1FbAc(}N*`1ts6aLAyj@UVbb z=)j1;s3`F8DDYrVka)9e>v_*RlZ=n#(;ESR~P9G#v z!7P(4m;x81@0(5fJmR7&c%ijO5a9dz#<_fXpk?=bB`7$cRI1LYiS13NPE6G_ArdT* zF~zPixMD5SDw9c*;v4NQlNyLGKGb@z=dH)$hw!5T@tP zDfVJglzYv^q|Lo4oMK{HK|w+3M6_Q3008YtL_t(YiS3lZ3V*~P3`DC!1P?R+|F;{H zx^1exEPL36hSG{NiBaj>wkQ5FNPlw-uez8b`my1{020#Q(%S6M)E=lsRL5lKI!v$n zfO|8+0IN`X%K zT40t`pt7BV33z%`JRAh}-stNqe&UIbWCFmHZPzQK=cFB3l^J{J6l_*n1*S3q6)ao)(xkMXMy!^Dq>kH8N)KLRELKbCkH d{P?y1n>ip7=H)@0000?P=%ZT001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJc;oP&ddbG^O2|NsBJq(S!fDb->@_LM1$d;ele z&F*uY|Foo}#s6xooMK{HK|w)TsgPs<00B=)L_t(YiS1O;Zhyou2y4O%NW}dA-_9g= zTGP=!P17_j?N#mBfy59W$2X6NydQA)yzeIuw*eb$B~AkWjV>k~^#Vu;&aUwYt_^%RDXm_BfWHR#XoXUtE>O=1Hu|Utk_3fv z3mkD#GI7x)h<_os$slJ&IB{2Z?Pe5$VpG!C37$jEx*)HCJp}QLVa8CBS_A{eMwl@s zE{n9|vJxz?CBe^q6QVht`R8O7gmU}74Su%XCW9qWmh&RStfV#-%{SMwEwdoGcIvKm z_rcPQ3o*Bb5_Gx-x^CV#?z$y@k0kRLaY${?13*xNuhDM|x5 zG0p}Op9ZoM3Io}W_ZI^>@N6KQf9i{ifxJB6*+4EWGute71G&~>s<8~@!5>}*@(2Cl Y1Nd$rjI-4VoB#j-07*qoM6N<$f_{ad5jhv@>Tg&7wjFNPqnuDN6} zcwQeMZM_VH%naY`Joowl${-4rtwJlZl$$vn+Zg*?TGMKz3?5HhaWR|du zS$^d1yF9amQANpJZj3@oz;I~^1HP!ZWfWATU=jalKt!T@{^P@?1p*SVXniM)FeI4I zb7!O{?La5&1@kfIPAZ$ng$)krmsQS=x9Q>>fsIe;Y)J@7lxiZ9;&6pA#~Pry16fB} zVNjER+C;e-J_|Ey?+wOu`@I$BZM67X`S9Ko7h&ocL@dyM7pC$>Pni0jLcM}3U(i4K Z@*8`#8v3$kEeQYs002ovPDHLkV1gI#6gB_= diff --git a/graphics/pokemon/calyrex/icon.png b/graphics/pokemon/calyrex/icon.png index d0a835fe0923af8e23929618a4851489aae31b2b..b90ca68e3636f04ebd7472be9226a6e3230768c3 100644 GIT binary patch delta 291 zcmV+;0o?x50`3Bk7&Qn30000?P=%ZT001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)+=AwPf3Nklvz0@4DI7zqRe0001qplF?uO+SALa7bBm000ie000ie0hKEb8vp@k}(RyFbqX~1JMh3@BtKPrY^}jJA|Gm(2^6#A?Z|T91~B4Qr85MSYErd)uxB^ zk>CmORRz}b{@I)vdDO?cvTN&sDjKMT1vyWo3u@g0pqPO!*GScoMv~bYGT~0*uHSP~ z!$@z;HXy_cl|mZ

21<4$E_F*y#ql69bpK9#}?o)4Js=<{FPUpBFerz=JHNI70wt zz<}_j-~}lVHU&Rhe=kh@%q$F9wi1Mi6mnh$VWJ%${FqWd5@9~^;|=!3ne2DAsDl6i N002ovPDHLkV1f@HZDIfb diff --git a/graphics/pokemon/calyrex/shadow_rider/icon.png b/graphics/pokemon/calyrex/shadow_rider/icon.png index e1747ccc62cf9e8e246513a3bfdf99239195eda7..593b7192e227cd0190054ecedf6456f4a93e7e35 100644 GIT binary patch delta 477 zcmV<30V4jE1nUEk7=H)@0000?P=%ZT001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJc;oP&ddbG^O2|NsBJq(S!fDb->@_LM1$d;ele z&F*uY|Foo}#s6xooMK{HK|w)TsgPs<00Bx#L_t(YiS1Ouu7ATI3?pzMQWO9G-_A*^ zwNO@R(!1?JRkheSV1Y{+8W7LthHZ=I1IWp?skz!(1`RMXZ*JiCN}{-Gl6j6 zJt);H+i2tk?|(`oxJ`;+AXH7b(

dMoR}qCFW#szNFWKLP$8IdEiPkb?V4)mZ4YP zgTWStoFX(ZMj-(!#rRFesevAKl~6LkeV`0yhT4eng8=^AtmO3Qa!#Ji(vZmN#|-pQ zCCQIo7<6O)7c2Hy|JY1fqYxR8TvNE1YfmY3%`?|^>wEqD4*#N;+;uauN zKnwx0-_UD7%mK3J!{toO0dmiWBS5ed-uZCd2Qqqa1W2M|07QVy`LGUfdcLZFXDP@4jbVHx^X%Q!{7&n+X%)$`kWHJ;lA$-gdNcH^r;N=WW| z-Y^Y>3qs;JtAC0+H5j)fCS~rs>&>Zedy^b!#`pYvsA(e}#f-Tedt#U@yq1TOJGiKi zj*J{k%d&QGf4b7`xvUeGS2Y@b<0|%JsC=BA^?g$by}|R-@?1C2UzLvgkiFhUPtCxx zPZ1Kl);X~APhsRL=A^Z`2YWQY?yW=2(4Co znU$6UQt@jbruDY{egIEE!NmYbc$8AwGT<6BBBEgHazkc)-wVQ*1VCbsHK8iI5K5(F z0QNq@wOL9aBJKdT0FTcWmbmfhGSxR2V3Ocw6Cm@zW$ta3>Bm7tMAv_3ry`D^lM-v4 zn_z(>YB;4@BdXfLSm0oRP@e?&LX0JX=VOgf4d)|Y7!TPE&J zH;y0WN8aU?AIktiONT^tfb{&h3y^ny+y+P|)&X+n$2uSIA0XQo1&BQah=?md1ZVkh i2FOi5pxwmZ%ZC>@85<1V9(|Ai0000kc{}f=4(V-2DeeXUGI&w$l>jN>A{ndu%WiGj_|(6?ei4VwJPs${%{&gPb{2jw N002ovPDHLkV1g`UfnERr diff --git a/graphics/pokemon/decidueye/hisuian/back.png b/graphics/pokemon/decidueye/hisuian/back.png index e977f88e25db16a1308fc0cc61256a8d2b00613e..615ced4d1fba591e6883051a1734ac33d6781510 100755 GIT binary patch delta 869 zcmV-r1DgEO2Ji-u7=H)@0001;w}I>c001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJdg)1@OH7%eU{9ycjMIxkC2T5)e|Fj_=Kfni}* zMX)mu`&=@8Z(6>-xeyQ#?Ck0QHFJ^x00PfRL_t(og`Jm+a({#%3`K3jC{Vfn|KBzb zKwy2XnXb0VJ-GzJPN(T2FkiiW5ZHt;zrtv8Y)ml9yW~jQET4A((WXs4F949lB9?e# zfG5D2Rs9lRO8J=+UI2IwX`WS{=C^?CA-;1kAzB4ve5V&e}cJ@f-pcpz?Sxvt*ArNXG=xa4`sNb_Mr{Rs`4`zXyz0)7V4hZmvlKcn8 zCm)1ekB(w@`~m}E>FZElQyECTo?}N4eG-t>WmFlAs()`0C==`SEG8=XTMkhM{LYmC zV^o5qo_0ODJE}gV`i9JGH;XcV-e<`9vFm3&pUNOfW@#Hh*6~hn^)dky8=$17gZ*rk zC?$oJ0I3O^XDQhyKp*BxATu(6NH02Q8qJSe3U&P!cvU9y(2MX-l`Q~e6}%`D@vhO! zM8}QTSAPQS*4NZ>%a))~(LrCpY+TK4XI@->B}I}@nY zKQOSj_CcH+hWCJShMXOzAAsQ?XHv??x4xk3YE>{C( z4h*;?$Tmr$Z`LgXQUQM<89GX>7db(Xn*9>8n7|W4A{2Y vN(X&fVljuqNN~kK0gM)QD?j>gkP`j@mXb~9M@s>j00000NkvXXu0mjfwgr8^ delta 839 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 delta 610 zcmV-o0-gPn1@8oq7=Hu<00013M{Ml?001yhOjJdf(4cU*m9^& zaBxVt$f$tGu<%eoK!EsAh;U%ApqQv|0000BDKKpS00H_*L_t(YiH($9mV+P+g*`oN zApLotVQ>L0_FXY9pw{evE0X{!R&a)gzU1THn*>``|3CWckAGVKC<8xI>up&=YB=)VAo6%6L_4u zIg&V6`hMM+V1FW^EwtsFk^=SuY_iT9asr!`gk8M7|N1r8uVJ;4T5~T*qaZs=GL8Er|e* zA8_(sKwDChO9a;IA%;k-8G68Kd%T261gg&?5=OQd1lk=S5>D471Pkl|mf$f7FiHy< wz^Cv43+N2sQ}}l&Gsx5{gr@dyp9K=&7u=4n_p#FB9{>OV07*qoM6N<$f&qI1JOBUy diff --git a/graphics/pokemon/dialga/origin/front.png b/graphics/pokemon/dialga/origin/front.png index 7e7c7aabb788c38f2805ee57746e796a531a3d01..a41eca77494a8ef7a687cd45a012949abbd8c047 100644 GIT binary patch delta 1067 zcmV+`1l0Sm2($>07=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-snbV~hLTfx< zdqhfC_EJF@T9i3^wMKQDW^jUAfv$0nq+_MVLWKVi5D=W!_W&+b5@KY2000BBNklN9Y#t-3fg}a<3;iGI z0L!F^t|GH%-!hp8Tp!ug8i@P}fJ*fnRttg;sZq!y;g4)mlA0u8LyVJJu)^4GvNDG> zzC07pw_F4Ou>xRa0K>Op83E=d2ycMwa?>k8#Fm*r8h;=>cs)O=fi5Q7&TfZK=9dAe zrO?!s@#66g1O`@){yRVl4#DyM34SnR{s3h*aUPznt zb~6BZ0$K=cz2?8N6`}!*4?&BKy8$ehCNaQUlAc2ZMj&fe-4Fm>WxXh|zs`zC{Az?F zi}ra`Cx1K5rc-=STL94#=72xzsOusC)m#3(ADhbZM?D_?JTx>`-`@5ouc=suWB)_U zB$Gpn!hrdwruUC>74EUfOda~%^d=Wta;aJt=q*aQ5FfRO{Fxk?l2SnM{m~Snp9)uHAZ1%Hgf(B*Rjo%R|sZ3B{>K)sqbdW&!D z+c>uID-qvxj(FyHfI{;tR3ZU+QV?IhB zqsTB%0q%A*6A?5p=Anycul-M&VZ#o z4o)}5E77{HX#0002E2%S>^00X;8L_t(YiG7v7ZyHGy$H!>y zXajLv+r!REr_kWVsfT5ND2h;S;BAVNi`!$LL}x|haHN>(B!818l@-N({sLM$%k>o} zMc1E@-0?Tun`K#c!DJ9C?|Yy5z8~`#GnTG{GJQ)=*uHh}^pvru-tk_5eEP&Y{Q+>Q z&phGmkKpNAuMGYD0{V#jpdN8?&BXD6egUU)4ql{#z$iht!a zw4)J!_rd73<$p2{ux44~ul~Bm;u;vISu{kgeJGqHz@;jFvcNc%;pLN81dv}R!0inQ zO*e5G`Wu!Vn~aTctBPL;_%Kat=9P{c5umLI0lqs7kBhe%Ai$_!a&(;KMe!DCg})4M zHdV9${1f48t*HYa5Tk&QFB_oH2Q7rAW}qtG{25^opnt&OF%@#L0*uCxx(R@ahX_&B z4nsu2#_KdFgbAYG=5whyMp4vjy9D6)YXWc#0bKG6P;EDedi5}H2^bC&Kn5V;x%J0D z&#Sv=fpwmIJ_GT5CdjXuA7Rh)F+u^PkVNoiVm>1`)uLjcjiE%!VvzJ{PU=!Zp9X^) zjOtXci+>>nQEOl(B*?xmG$Wwbjyvh50*v|6fB|Y1!3OHoNiZ~jIz0=fHP{FW28cQqvV2X!&(x4_vV1b@|zaeoLvphVMq;K1HFGz8C#?GJ{f zLjw9jqzZ+a1prFMPE;@;fU3-1B$X#|E1Ob=w!%`&K)y|}gfE(9Nyj4_DEr2A*=G1&DVo)lzb^unPy9t~oC!ldi680_M#o8Gd)jYC*?=<$$YU=$;w>CsO) z8>3)jwngtKv{p`ljkFCkq-;FCr2NPiXHf4{C)M+V-mfCmdaEYl>4)2s8(|NTAs z=X_iptpV1ZWPr=->0~*2`~C9nqqTM~Vr&CUM&qgOw*EbzevG$u<3O1ZOVwF+#xJiw zPbYC|F_1jtHBp@fC*XRz*az?hA6a13vDVeF>;T<|&QgyzR-XBjF~t;rpil0f-5}N? hmBkMMtHRWd^?&03RiTC17U=*0002ovPDHLkV1ns{_4fb( diff --git a/graphics/pokemon/dialga/origin/normal.pal b/graphics/pokemon/dialga/origin/normal.pal index e7f93264bb..94d3f8387e 100644 --- a/graphics/pokemon/dialga/origin/normal.pal +++ b/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 diff --git a/graphics/pokemon/dialga/origin/shiny.pal b/graphics/pokemon/dialga/origin/shiny.pal index 274c103f5a..4aa63ce006 100644 --- a/graphics/pokemon/dialga/origin/shiny.pal +++ b/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 diff --git a/graphics/pokemon/dracovish/icon.png b/graphics/pokemon/dracovish/icon.png index f998dea501bb62dcde5ad6339d87ed7f1ec5d79f..4415600910d9d7f5215f7a4cf44409699ae61db9 100644 GIT binary patch delta 441 zcmV;q0Y?7k1IGi97=H)@0000?P=%ZT001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJc;oP&ddbG^O2|NsBJq(S!fDb->@_LM1$d;ele z&F*uY|Foo}#s6xooMK{HK|w)TsgPs<00AaRL_t(YiS3lzYJbEq3`FAygx6T3|Nq;L z?9D=bNgrD1OUwqc%+bg)&K$?HhUIya9X>;-3H-fb{&}Rx%<%mI2ar#zq5f0)(f06ChVU jG;XPX@?jGo|CJA44+0v|`v6mb00000NkvXXu0mjfosz_Y delta 473 zcmV;~0Ve*(1Lp&f7=Hu<0001qplF={001yhOjJc+n1FzQaJaa*`1ts^pg{2OD9~U) z@Q^5oc=%vQ$mnpG_^_a$!1!pWm|$R7KtMp~WOLa700DAIL_t(|oYj)gYQjJehxZMJ zTzV+2d5A#qAo?s`a;PCbgiwNrkCDTIlwK8t;3bE_;8lnsLVpfw*Azj-q@Aucf3`jM z(9UJqkKgPvyB}k}Rz#$3frb_;1d<`Q94{`wq1xpZ>Se$%sxCTFkvMh4+CndC7ah|^ z9kF7HECRJFu*dBjpxB{D+p&3#fRFw}-jR$Sv!2u!=U~$Vcz~n-~dBF$Eaz6Wg{u*)>%=w0g z3edvYra0nK$L5~GSqY%^60NnK)D>ZR*sFP@2!s6{Ruo~_ z$=rFXpcDqCT9Z%_2K<%IPKF|koC_wMk5ZU4W+Xu=49Mq5&p(8rzb4El)|C-7)>jnD P00000NkvXXu0mjfnkwDa diff --git a/graphics/pokemon/dracozolt/icon.png b/graphics/pokemon/dracozolt/icon.png index 68c3fe7800721a57808fc1a6f411de4eaee657fc..41db6baa5ce81210eb1ad5aee713a5dbf251aaaf 100644 GIT binary patch delta 430 zcmV;f0a5l=i)( zTK48C_V%pR)oSKSDPm$;K|w)jIel9I00A3GL_t(YiS3lZZhylt3`2YHph$wL|Nq;G zcDj12oMDGyhgEQLAw$_p@@}_R{j?&!kv*gLaO4kZeDjd(idQ`>Nlse+Ljr3S0n0J_u3+L{38N0D}2@ zZviq0QUN3;Kn8=f00_r02{Q@uY{1EfNsz)|ARnCjtS137e*EME=h*7E{@}v~Ab-b) YcXgl~zjz^_>i_@%07*qoM6N<$g3hJB(f|Me delta 472 zcmV;}0Vn>v1Lgye7=Hu<0001qplF={001yhOjJc+n1FC_aJaa*`1tsEm`Iq&NRaSI z=x~_uknp&mSn%K|@bIY6&}iUDC}3b%KtMofSmaLt00D7HL_t(|oW;`5YJ)Hw2XNmY zFV(SQUq;aN&>Yv(b`%xt*$8^JIpkOhvZok0nb;f(c3PI@pMM%Xmck+)@+H6gV*FUv zor5jrfXt^>Pk_0mr~EP3^cl`DH7b%Y$N8R(MF8OhhnPS>b=D!2Buxuj_OAN>pco~X ze3e(qpsLvijvu+Ddv?U$fT1paiJV>ImW>Fy0Hr}(mv4UKI8g2x*PEvJsBmQ4VpEW1 z$22dBFh8zTUw?Yrd>?8bd-hr%?Ke6dD$Ez?^MhMm1a;`yL(rwg38grH(iI>GYTh~b zS4L39sb|~66?CkvVsd$g(-i_nC>SclXvIfeh9>g+_`Cfyu91(cyPXH@bvF+zw)}nn zFdijn0;2_uU`9b444@)Wf|vl)%0LSeV4$v%f&`eeoKY)53XCYxf+U!=43r=VM((Ku znP8+K6O0sOf{}un35*sr2g5s0V0ch+K?azPF)qje1FRMjx&T8T3g!>h$wBB+wQAJ> O0000keM;?3_1B?m02tm{W1FWjKHt^FC07YQcrqP`wfGzSl zfQ}ytYBQP)uzywl000H>LqQ1m%U<;ZKyn=bwM>Yn(N7KV#yeB=v=RgO&qOgbzz!UA z0Q!%8q$H1|i5?v|(aU1Rf@vl6)j&@KYs+GKjHDhec_%1edd5`1tKnpG)f-a)&W|&{ z$*~a6s0fhtf$L(WjkEmJ+LQHJZ&zlE(T)vR%=r|!t$%=9*aawo0f)H(Rw{}5UG#Sg@m#v*O21zL{+wMWAMMl1->2{%5ZV+r09_7yfbj1D{U(HenL`iQ$e{;p)gpXl!CU|@ z2{_WP0Dfm%MDUG}u6jnSylcyaayPJw&~bPLlzZw4k)OLcNcEzeT@qy+-?kvtFDHZ| zOJyu;xYT?-CR9LxGS6f%rlTVaUb(B`EUbgEB{7VuYMg=Q@L-`a&}Go%Ft<<*6j_r) e2iO{NALAF!NHD%IGdKAF00009krMGFC< z?0>_<%c<=~apFj$ew0zAPSkr$FuwTp`o-6WXgtvq5-tx2#DDfTPY`whE-1EVn0)aVBT`xu7z8k5S%`*!BuEC3AbL6Y3StLD3Au2HYQz9wnHPPbyyQ(l zJR?9Z+W;7qAb&f7P6=USJpk>QKSZVhAuydD-IpXvbU|;&p@ai+|0TL)tS>dQP)!B! z9Ukl34D_8#2iksKa@i(>`Z!&k6m=1+1g=K|xKQ*n0OCXfHQ^fobDsDx0dHEGPXK_j zi|HmH%$Gt-x4X!?7ONKW3_5+W_XBH8x!w$FM{0+&4u6ZVcO`d+0z#h74~M&G;~`xU zI{>62AIh#qD?|CwvZ$j4fZJ2KFG$V*7=RoFpsPB7nfpV%Pl1mF(1xQ;6SDDSn-U&p z^{w=2AJhUoS&;lTO%Q zp;7>^y>Tt*`1Y(Tuj{7akfsMp7nE83DfS*v;kMf4)IP17jZcEM5XmNfe3L-bzr#ty zrF6|9;(+&Ayb6#8u-`4>JdbX=M*x63MTniVS6_V_Y%|GBh00-=vczBfWBdV#@)k(1 SulV}_00002vh}00QAjL_t(oh1HhXa;q>9L_K4Kwg~?JZ+~ykXu}xFlKpg*a#ftr zM=j09!6Q5*f0TDR}U3Y*2fr}b?k-#D)$kK1OT}c zL&JJVb~&;FILqbBD1p4UBDclTpFdZNkrU546Fy1I288htwQi@8kxc!tS_0@q;oSmxV=0FTI2VX4C zH%KU_S@#uyM8qdf2e1Li1rGEB06mE)jsUKEHswngxPJm99p3|r0q%YF3g9pPc?4)z zLpfi^bM?{#-w>pIF&Y#>32D6R2%LN9$s5`M;c`IiTED=$3$%qi5V@ z95jNoHgzC9xepolP9R(QE)W3p;@py7YJnwV{6%qa zJ|`mOv)rY}0Z?BJ&}8I~_M*Sm9L+<->8bV;fO*wGeJC%vz&sZ^KyHmWv{5nCA=Y{V zIa0u!4+01jh5^-pJZ~uggQ6qNdL96*zNGR3%FSjB)!DIX9rwLFNZOnDqM}dwZQqwJ zUY3fGeI^$9Qw-wQ%OZOk2F3bM+w-ssCOUD@|0I)THY@XA30?${Y!KQ~nxIhhi(qVF1T>K%BXRx@YNJ^JmB{+SWJ2{B;Tt^H6OLq%;Ar zKRA$yHvXa)U4oM3IpN zA^-os-Cc1c=>&}9c9^22Dm$(-2gol$2~0t@GkxR6f*2mlstY{tiZZqU2)ecwe(!xiZG|VU{erY0YEhF z@6wkNjGmwkP+JHzP`nbL1s_6qBYe~U#SUDDCAqx!v)8Wy8YFH2E zP8M1WFj_MLtbZ1BJ?KFHXgSBsxWxb|sz{}jr`K9Z$~XXnHm`iNm*9rbUY0qi%3;sK zYgCia2|zoc3F~$M01EmC0|2O%_?nQ8hU938j<;&>4|f6C%sk~i2$KVQc`5ES)???w z(qNl{og4CMyF4RuX0?^TZtyBsqoIXH59%gL;!y^sR)5!MfdKmixMo~!sR`=i6QFia zeS?h?0H@?7K>Fc709BEIdJeFX1`@D0LK?ty@^Uqz@WIu<2f$tP0zK=DVA3BE?10sP z`uq1DVXC*(ZvYV@62PA@V!i<+_xc(^0%DqMPw4kiuglchLv{cO(9d(j6+xoSz#4%7 zlMs)`1%F@_$w2G|l+tMm=q~}jeIEMV0RG|tO!0Wkm*?*pF=y#+pm4AUUrWP!#+RQ0@|dx|>ppQ9po72}H~?oc=$KJtWV{)muXz?>p3c(9HW7ItEPrWa(c%jTb=wsqW=ddT*%oq=m)#b* z94!3WH;=8lT33Yh>pIH088DcHsfo9)&~6L90MWtu?S?Jj@02ha>$FUC>Un!FLi zr-SiV2jguAIYeu>10BOQJbH5Qeyh_oZo8?U;l5APKX!T*;`PR~^Z)<=07*qoM6N<$ Eg3a`D_W%F@ diff --git a/graphics/pokemon/gholdengo/normal.pal b/graphics/pokemon/gholdengo/normal.pal index cb9c6fdf7c..ba568f55af 100644 --- a/graphics/pokemon/gholdengo/normal.pal +++ b/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 diff --git a/graphics/pokemon/gholdengo/shiny.pal b/graphics/pokemon/gholdengo/shiny.pal index 4823e4a57d..96d66e80ec 100644 --- a/graphics/pokemon/gholdengo/shiny.pal +++ b/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 diff --git a/graphics/pokemon/gimmighoul/back.png b/graphics/pokemon/gimmighoul/back.png index c6a634240782867e071de1f5f27e8b795db5a5c3..1b996d71e4d4e2edb1b9daf88520e23a97aa20aa 100644 GIT binary patch delta 414 zcmV;P0b%~Y1-Ju{B!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1^WeBu6zPW+pXtT{t^EN>*!qqdZ8hkV)grL5h{8m94!H5D?kQ zgwfmM@cRG2q4$OW009?CL_t(oh3%BV4#OY}LzjeV9Qgn59e)ZGLP*-u+a!D%O8jJZ zw4cw`*4Eb6J0a`!95J%ImD_o2GB+O1gSR34-aKTXw^8R|7$;W!&10+!F=#@W2N@xy zgT)9ebM!*iIRl`m*~@7RFh%GA0KTl#Uru8H08$ZpfNEF%5s-H>!3F>oo&I_x2_VWu z7(1jD0EeV8!hZ?y{FF2xN4Nx(zi%W(3D?b};Xf3@Vcsf!K4-c$FRIQUZ zpr3)#&9|kJCxwfn!p6(N;feLD2{9zoPdL z?pDMb{upWSD^OS>xCszd0Qc7b_rC)GxBw`@0HFoIa|L675=eHDqXjxp``-qXA3g?%@a(Uf za0@_vz(M#J;DjDPzMKK`8Y+OU#u1fi-Hv z?Dj_&SPBqS8)16;nxFvB(*h=TArPSx_B=HJ=YEIK5uqjAup6WREY1$#@2>$KkCMhH zNb+Krrn~@ntZUdJ?b1WWH9}{C0183$w{6^8Wnh0MSN53q2#+Ilz(;UPPr5k5!Q0jQ^~2JjE{nlY&wF!6T) O0000*!qqdZ8hkV)grL1b}&m94!H5D?kQ zgq*O#%--m91C34q00KctL_t(oh3%HzcB?=Lg)IZgsH1uRw}0)1`B7txn4WXha?xem z*&lmY2zK3H{Lf&bpUI~wJ`=$7LV1Fod2`&D(T6B{PFfeZ;s0X3B_)8-RLLZvm zLtyn9?ue|{Cu(~2b!wpKrRj~S0C+jIpn3zyIF4C=r>YO(>(l~O{p~j1Zc_CMfc^>q z2F3!2&A>T84}U8_kp4D~spzW#AD|f+uN!zO!Dj~0u!sZ$$(}X_T!0+t;r8q{um-Hc zZ=g#!vJ18@c6AXf><}WA;4rX9*b7kzK7B^4}n->QNmlUF8@eN)Q=Tk6&9KzbiwNGsh^JdMJ9-hsXz@I5Ex$YG7(yLf0%uilve1 zeLvEqLw``a2;CbD03P?y2j48vC1`q#<6tNotjxg)(4j6_Z~Im6fPg-@Ud6l>Qq?zt z8(@U{Dl&k)H&_hfLiLFTS~lq~z~!~F75{*{d%$bVOS1Ho)4ERESKbpQYW07*qoM6N<$f)SxdZvX%Q delta 769 zcmV+c1OEKt1(^nrB!4haOjJdf(4aCjH;Q68T1P2VTWkN?S>3@Vcsf!K4-c$FRIQUZ zg^QxX#>%CVCxwfn!p6%dhx*O{000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00M|f zL_t(oh0T|Nj-xOPL`lpB6A1kO-=4=#pezRy#?5Qd@I6K(Ksew!HMFbv%M;}|!;#JlvTEVIUuL(l_&KPA}J ze@d{4<_92{AAq#^&j>cL`XTdIK)wXL_;K*dy70kIXJx1W_?K1GuZI9M4CDax;$0WK z831wvvX-g^Sbvu{K=p(0y$BgUGzRf6iw*|JF9A*gltl_yG(g_~`n?-Kj1p)OCniyD zfa;HY3dot^T_<^myvqZSBB+8DQI6mZp#F0}HE_S^mGl?@f+)QD8vwOD0o1EK>Pm=j zLJjC5fDqWczbI}?;S8W5a3{n{eAk}t)UP38;FJysc7FnZkc)|t!XRw_RKm5tB0}{l zgb~RIE&vdkBg~?Tz(8Jqh0G>f5~e$VF3cNY(;a`ulbVIY+ZJ~#K;eGwxd=fhH_eF3 zNeEnIM1*@G!W^Vt1-qLjm{CyF(hrz}T#u+?ucJa_EjWuvC|@Xg7A76wCojO(vk=5J z?f!zj-G2j!vcbp;m7DA`u>6#L0Qvb;@G7O$i$_iamqM8a2Oy?cqL|^A5jgt@zZal{ zl;m$p#**@7A3%B(+5!j+c@hpv1NZ=mep9kL>Lq|`L-r~9(EtvB^alsU8vr5XIDUw< zLA=}(8X(2tE5LCYW%6ePG#CK50(=4FTY%4FAbM?Zq?W#W@-afL9TIo0#e9e`RDk=2 ztPx)I0FYigi)>Aze@Ebm2>VuYHvpQolx2F|-a)ttz|PujT>&E9^g{s;D;3b)-V@vN zRs%dxdtiI&ZvffY9s;@${?6aoWABru;GgRcALA*b{DL!r00000NkvXXu0mjf_SO1(m|N02WALzM~xLqjtI!_R*}`XvKHsXhb4t9S+mtLY33;`x2LB?lQ8 z7z_e@LR@EFUg~bDTpDX(ZR@pmg6HEij$Koi2?z*Wy#4sYum3<*XdufWV?F}|qqV1t zV@O2n+o=aP9ai9QWp+IIzy70hKz(v;cf-t=%kH@zb3G?`VaxH2n>T;HtFZ4$aFe)& zvA|mH8Ml*V5s@q7H9fFh{=j)7=MRXZA>~X$fWACM3sd^Qoxw zxzHXa*Gw6A-G>{Qg&l78d@(a|c1WmE%Iod1t%x#U3~iixA%9Eog7wAw84s&J6kgHT zetzRWvmdM)^$aEN?RXAqD=hoYv|2{{z32U$B!4GROjJd3)}sK{pa9gL0000VEI6v8eusl*$L09s(YOD_0Ns25 z|DXVXIRIrVpxyug01b3fPE-H?|NsC0|NsC0|Ns9G>dgxP00E;(L_t(oh3%H%Zo?o9 zgd>@#!RGy+cQ(dA63EP|O`6pEfq-%!2c#t1_R&WlnL>cB&VK@x^>Hm)}v%k)oZPUyz zo32?J75@6t8Aq)c)f)6nEy9u)Ze!$G132y@&ga?2x!mk33 zzX9xT0-iVF@P7bugnhUB>;&*W%i<;?q!_Vd?4AG;0RY)dRzyQ^EDvDQ$x)SKL|F8* zuL%VKet`JtEG7KhUkK}dY%9qGkDmcp?bK}sIsq*JmIO6~kDvj{@licae}oK3RQ&{@ zG;sPJy{sVn%TvgHet+8|>4^Zk^sq)n0NRl5$+z4EkXU)en6eA3!9Z66b|oz^GrAs5@I677Pz%J+8U&s@xlXMW2(}hJ z2yonqfTole4wght)dSc%hg6{XQEo=>K^h|UO#v)LD5qEh$c4Z3wfJxJ1;zO*j-_Dv R%m4rY00>D%PDHLkV1nK*^S=N9 diff --git a/graphics/pokemon/gimmighoul/roaming/front.png b/graphics/pokemon/gimmighoul/roaming/front.png index c8f6f3a935ec0cb1d7e4a248d775044933c0c980..81ebb4897d3759565b9a50ab144d94a2ed31078b 100644 GIT binary patch delta 349 zcmaFQ{DWzNO1(m|N02WALzM~xLqjtI!_R*}`XvKHsXhb4t9S+mtLY33;`x2LB?lQ8 z7z_e@LR@EFUg~bDTpDX(ZR@pmg6HEijwyu=0s;baHXJ&0?*&j58qhlv9SRh>?&;zf z64Cm0ilNY90}hs6$A*9ZA2w{Lzg(<&_}me{;_Q}|b=eYai9h&tEc8w0p8w1&Vt#ct z^OCOW$fMuO($D>Ok!1|M_ua2~d1Kh=fXeTa%a2!`%zO4vbW7)-C^1`}ZlyM%E6gHC zgcdajXsGO%#}@JAYM#r2oy}`z#y2#m*w-3F{tXsrx}KoK#8JeR#G9GmP;f0SH>@YF zAbP@ai*Eth(u<~h#N9AGKC|_9yQQ#-KWo+<`Sv}`Z`K}Y5V~izis>-x&Z(9hrP`&I l&MkgHl65<-wkJybs$r1W$e!yET73)TZ%dgxP00C-AL_t(oh3%Eej)X7_ zM3KCZIQ;+jPGw^`byr4n7>SZ-ICMSAu|u}))vH&3FA=Rbm49`22W&iHyn6yj!gSvN z1mWg}401nFpUv`kli9u}$n-mcyuYNp`1l0&pcUP$o3xLQu1U{J$zXxzl>;ROo3h-I_Tmv%+lJM+; zNy!IQ!Acx6(bf6Mi1`6P505D6qO38%+z^tQ-S_D^)!Yl#IdIIWh(x3vs zE1S-*8LY{<0<>=5z8`Qj^$4851%TJxS_Dl__(y=z1Wt234rzxA6#x}@S36af08j2e8k+!*+&vH8krCGHD$dj>CnpFm1L9n`v-$g>NWFh>kSN~2w6%G-7DW%eP00000 LNkvXXu0mjfid)rf diff --git a/graphics/pokemon/gimmighoul/roaming/normal.pal b/graphics/pokemon/gimmighoul/roaming/normal.pal index 8c71fadd94..3cf9855118 100644 --- a/graphics/pokemon/gimmighoul/roaming/normal.pal +++ b/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 diff --git a/graphics/pokemon/gimmighoul/roaming/shiny.pal b/graphics/pokemon/gimmighoul/roaming/shiny.pal index 7ece225d51..8768489e9b 100644 --- a/graphics/pokemon/gimmighoul/roaming/shiny.pal +++ b/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 diff --git a/graphics/pokemon/gimmighoul/shiny.pal b/graphics/pokemon/gimmighoul/shiny.pal index ac31efc409..8cd737941d 100644 --- a/graphics/pokemon/gimmighoul/shiny.pal +++ b/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 diff --git a/graphics/pokemon/glastrier/icon.png b/graphics/pokemon/glastrier/icon.png index 98bfdc8b45c8638a7d2c399507d373839f79b8c6..fd32ad0db72cd4bd27f536c6daad5719154593e5 100644 GIT binary patch delta 410 zcmV;L0cHN~0;mI!7=H)@0000?P=%ZT001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJc;oP&ddbG^O2|NsBJq(S!fDb->@_LM1$d;ele z&F*uY|Foo}#s6xooMK{HK|w)TsgPs<009R{L_t(YiS3k83xC5f2!tDbF(A4B|8J*B z1~oM;d)+2%P`v8pvVF(#V}+-_J}909U>5)z70|df3{^hg1on~L8i;ZeQ*0*)yP!51 zCRQ)rXK{g#ur4v56;SJ|s8%wgU?%@U6sT7vvUk~=h$F0TnmXG)!UiG;`i#o&YAyEr zhC2Jj1@?@SpnnVl<7GR8nbmj<1qv0K28FQPzUKmxB0X$#m;@&NH$s-4iBw04M zHU*ybW`*ppvmaK5hrOaNzx`=qxBXwA)E5FI14IA_FMzlLBmg10eu2H?Db z1zoE{M|V)pYXr}ZSfk_>u4JvC#cL&Bt2!ZJVL2g@&A)8Rt$#kH-uL>a8vLt(yyAR{ z!<9`QjG+sgd}27auIL!BbuFv32P#~-;DMW?tUyz{9n%kEFM+jg+aMAx0hqJ7Of~LL zUIMgks`1b*9b~Kvh#C)e>7dTe6SrnJ$_~rxHDW*PA%2Uxud0n2v-81e4|ScLf1fVZ zx(pO^HgXE(PgtWbT?Rl^zHv_S1t0bLr}`fSr7jVae25@OK12{DA0p`CBMFK=lA!1# x35q^M(D6I^5JA7mhX~?_k3~@7V;1yQAAc&{x=DyyeB!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1_K2HDp>ck%2` zaz2iKfK1bGk98ddJO>Hu^S=}R0bm;=tj}c#AQ>z}79@jZ$bw|B3|Uy$ZP}KAc@)6L zBLF4vHrB_LSLR+dYA||_*r)d~iZ(|5=+u|!0wk$nd`}q?KyvWWcLCT|*AjMCQOb|e zCqQ2#nbp4p_J0q8x9HYSOiuK!7a&teDSB!sqL9=<S;KF91#kx&chtz4{S_k!}s(TRi~jB&d-a0Dnjat%*qIUaA2y@y#6A@`y=) zVgRbz#Pf9WuFIrNdfZO76{ll z;MqdNS`KIc>FQ&uT&1d2*;8JfEXeTrlxXM6&WE8ICY5}ki@B&~4vZL30qN{D59zl?CIA2c07*qoM6N<$g1y2vRR910 delta 698 zcmV;r0!97e1=0nOB!4haOjJdf(4c@kxUgvG(2$_`)F==T5RrjGWLh%O)zhS#i;#qv zy{TO3&SsdTuvjcGxL8mc3qEoH000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00Kct zL_t(oh255oZtEZng_9<>L5B4G-*&bk1kyC?;7WIzHLa_b^M7&t17w z#6G=uPPESHN2k6-7a&Ou<9o`G0Fr}uz6$`hx|XoBic)@bJ^}g~384NZuzwJ|MYnze zj-rpf0GUEg(SK7z5rw1<8b3y$h$_7zex#?c148H_kP7((FamtEw-LES1z-dqq7Mkf z+z?77<wUI3y}&uJ61Ls|f!m!ETV)+a!&YCaQh0hfBSz&oL_ z096L^BcpI7R||xNfENHWphcid1M(nUT4*yk0XXm_AX2e#yfS2f_r#Zac{Hu707rXX z$CfSt*t@msu~^7Oh}x@Emg-0lK$K@=^e<=8K{JqFG1@C1*~@FQ7a`_Hp_SEuD14n) g7ZuR|#`7oR3;8BHb__TcJOBUy07*qoM6N<$g2sY9*#H0l diff --git a/graphics/pokemon/greavard/front.png b/graphics/pokemon/greavard/front.png index 1fde607510172212980866a8fb1f29605ea340f1..b7420d8cb5a993edec92ff0b64a8256d57164783 100755 GIT binary patch delta 689 zcmV;i0#5zd2FV4GB!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1_K2HAYZZW^sSLT2lYjErUP0w`%H#lcS!cv(b^I5D*Z)yv4P} z)cpMX000050425n00JmUL_t(oh3%H%c7iYrg(Xo;OvC#>?tgAt$`H0%Pyg(k8QG2^ z_v=j>f|tuD{&LLoDBwOwnD1kR`TiIM+=eW`z-`C^4A^ZbhxuWTv28FL(lZ+|pU(E{ zmnGrvAmH?d9)xrx@IsvcOG}9-0I>Z4EFTa%`sybzUeEdFivm7dNUJQ zVozA4!@j!_nFnSCfWW0Hr<(o@aI_TI7=X?BdP@dt4tW;D9*x5x*Ch+MT$W!1TrM z3zU@eYzqm>pi0d?+?xp3VLi;O!#L`RjC%C>Vk(N}iA4pvdbU%(UHsOf4bCS%@gL#~ X_X#A*(IfKc00000NkvXXu0mjf$hSAP delta 833 zcmV-H1HSyp1=t3VB!4haOjJdf(4c@kxUgvG(2$_`)F==T5MXe4Ku}Ql{P?)Mz>tKP zfRLcD#L$?euvjcGxL8m+E{?+h000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00PHJ zL_t(oh3%H>a^o-vg`1{;wTSfn-*(SIvKz;8>>bbk*qNnCn}3VW2M8qk@$q-;cDoAr zyhylxUL)K-?^gj|mqI`QUzb8a0P=MyhudB5*UBJrMX#!2s>82N>8EKbzou!hSj$O0 z2xUaj$&LXs&9(u6eFjiwfQ*7WCP-oUWe;$QpaqYuo`iBL3Dgjk9DGB-DZ-BaTnG@m z`CcO(hM-z&^?zE;eS|m!XsT%-_@I*_j`S)W0YH5v7(R{h?zHb=0O%Y=eIZy?_kF!F z>S_cK;R67+_l>?f0&xER0o0bTHgkWIzhN;f6XHG9-vE-MSp9 z3;{laqS6RjLe!AcwvKgU=#2zWEYV&e7Th%3Hh*Y`@%7kdu#k~s&A$c*@0j3gdCd`> zNu!DYK#C_n)ff|g_5owTxHN005*C67UZfoTurnUSc@d}DnW~}uctA@FCDW)M9fnTe zH9~bR#V)Wv+B8EJ%sx-U{&-7;wnS~d;MzO`AR=sdl-5D;KO{K9j`W23Kx8dgj6n~q z2|Dm(3^OcS6DNA!vfPRTdGo|Td&qAy-bc`ph%w|7E)PKe?H{n;S>igKlW*c>3+sl+7$c8 zKxWQ*p2$u36ytjWDHk8iBb@*!13Kfe6ShYEOdE|c{MzIWz}4N{LiJlzzzOeyiInmp zW{LPNg%yo z-UL$o5d|{*pt*;aK*sxD{c#KA@@k}+;VF${)tgWQBGa2t2C zw|3~jjXIXW5S4W@9DpNqoZiGO04!`lzTVEPTixIfBW{qYUG WwJUWGS3f8K0000gwv;)2{#k z000000000#E{uWz00EmxL_t(oh3%Hnl7k=&MGHv4@&EsKfqw*+1f&`ty0g8PFF6j4p}<>-P5@iWV}WW69j_~a2^1wTUQH+^ygdFAYxx3Z5H2Bj^ne1s0C3tbi(KMG){M!hniz)u9x8f*?rL&tXpJfXGSmkovqP|-fu zi(_ekHUneY)wK|GQ>Zhn3g`seeSwuF%mpw(5w~&>3&ErSTfYsk6ilbkvJ$Fc-Xf~N z4gzm2l|Y86pcTMtu>D&I&cTu&1PPuoDl_||{V9f1TJZa}*+G@KkgFz^BLE^_MyAi9??iqOLFB-m@r zoXPhqgP}4?`=DmM*^gf@u0%7D$_bXz^s~~Y9KF_P*6nHNz z@+7z_xVOSGFMmC_dpTx&bCGTGoK*m(7QBB@Rbrc0!GRueKr)o!ek27+Pmfwv|Bkl)T%$V)&4 z0&>w7CP4wrSq@?vzFOCa&oPVu(9xFf81kLKfVAM|L4Z#15b6Px%JeEt^GNv}U>gaa zzgww4@9_Wt z000000001h^spfS00N~+L_t(oh3%KyVxuq&L@_o4PV)cXyMG$VcLQzN*C-@F+c~;e zGU>8>?Q1vY%OY2u1Og)MA;3lYw&MxG(X+f`ywBlsjTk^o z?;C)NSHD8ZAiAnwX`S9(#)g>8l>pZDMXLzO^Ex?<0VMhBbsXz&0E-LEq6CoTqR#}; z-vN*_&_b_AqklgRB*1kEG9d*35mk8tAlwgH0W?NsFgVNO!Ug+r~fM z^mVMCWF*=ZPV@i)k+Ue9;b8zC70}oS5Pg6Ik%mAbOn(Uz@bWWY?+G$mGQ?$wgn*;e zO`=x9o}~IQ0rD1532oW@ZpwV3wFI=%Wa!G~DJkA(K%5EK+m!u2Sr2f%SPtj^09c@a zkUro5S;-0DuK_xKfEJHpeJ*}RLIT+3*a%>6p{PZVZt0p3yuMC{v8Y9FRjfc4GU?6rV1UvCYeukt0B@n)FRjb?Wq#JCx}O#WH17r zGk^r2i?BCU}17?ImP24?hFqsILGE!2lk+>^>E6GRmohPJaLvv+W2TrZxa-4X*SBz>e^?3L*`9 zV9Bd+8bZ*nMDa)WAKpN2Fno17sY24TyES7Wcx!d(Rrc#V%cEQ~;CNAHA=@KW4mUkk zfGo5VTT&HwuU#m2>G6FLz9000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00VVN zL_t(og|(Lro1-cWg#`(?81?`E+j~v|wSLU@*4<6*bf(Xo*ME}$0f*tAM7DUYmtyf8 zAw>`+%R>b8G(b%F1AU=|CjjatLyVt~EMzYrAX zBXqM6|JbtDPH5%$gwR4=Q4+#dN^rth_c8fMKxj|_1bQOYaUJWL*5yJ-cau~(jL5!2 zlmJ|5Wi0Q2RBvZFx<~LJ1Tdwt6NvCZWm#_kf|=L>oqt0)T*S2_Y*g!=UN{f*pjHR0 z^^Nc&z^9SuuGU;aR+Af{c0!td)Vl?il4>?*x3HQ8C#-Rr;!Of=4hu&BoNQZL5w#-X zTHFHOw_QSf8gn9QwiVs_vMvr-0BGe{$15O1>H2N!w#uEWUcJW^9lt8@$ViW!VknJQlfM~omZ~+Vfer*umjwaZcP5%a{ z4RO&E(C1D6B~u>T7w>y2Ois6jcmhv(dX@tRV2!05=4; zV1EGh2M*;?*(~7x9l(riao>1|?6&$V*!Ei70Xm8UT&^~wqGfaHtyE9St*!0vaL<9w zSkkMmDq8VIe^D;Y2p^~8k3y_$uh^5d1BBlWO7~n`f<>dnE!49Ei<~!+jnmOmP_Zwu zQELet7yz(rEEl~&WHe{^2ZhIse$dXI3~8U>Sl0lD1Pqbg?$}qjG0of;pa-Bm@xc^` zxP%KV^9Z1WzS2GbxT)bPRuAoZ6Vp}D4@YN!XVr52H&h^V$K3wk!P|%8006e&y*+(& eXxKCNFUEg2pGSKO;dv4O00008A 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 diff --git a/graphics/pokemon/iron_hands/front.png b/graphics/pokemon/iron_hands/front.png index 1971bb88da36106044d070732acd0abb251411d3..f9fcfea713f7d7947943be196fc23a34733ad93e 100644 GIT binary patch delta 950 zcmV;n14;b92h0bMB!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1@{vGch?@QcX%iP;+cuXsUG*&Ylqb(iUlQkeZH>5D*Z{$;IvI z>izxw0001_$)YU)00S#YL_t(oh256hlA|yTL}MFYVgdjExqqvcWH8rdhL^2%rIIkA zkJ~NT%;)o8jTqxQ`8bX*2(hxh)?X7S)>_|K0AR$3na!|;?4cWY?+!9OEV-U2+N&_A_6*+S4#5CE!wLO|_0K%7PzyczI3 zh&J~g^eJ+5v3~>92!I5@PH3dM5aKjV2SkdRe_WSPNenvFfIm4+82_@Yyg0m zCw3IOOD;rQ_4%x|m?17;U_`Mby9xPDQ%a)*o!I^%f(-*zpEQlB^2B08l1E5p;1Zyf znwD~COH`4~Al$8>=@$cI-2mXBH*oO`;1*a7tN>YfP6|K~Ba%8HpaT?8xq?obfL05P zKpUiJ9e;f!RGYU3=L8U3H2_TTXJ!b(P|#kVa+N-|>G5)5bx^F0leOcaoiG8mYptqv zun{^!*7wFMbkK9sV@H78IR(s3zkJST`jV@5VFNgE0D?|DD`38uAHP=ZLZ=zxw1fp+ zcjsW=jD+$kpF?Z_Cx@I_SVlVQWkQ*40-TKo(0@ast0cd1A?c)-$@FufAf*5x+J>Os z!l@j`l1;&F z2!Gv6jo|&V9r-I=>YIh3Z2~38GO6i?rT^BNa`$r6(9hm5P*z+^w2Qc068T@4hq6X zfazByTmZ=j4S#x@d2@ggFc%P@dIDzsd9-<5f2nH#l;D6(Ef8P^c0k|E)~7nJ*-Wyo ztDM!-CvzWJ0V=Wrf*nc=%u+=3T~1g(1F{0pGD0@J*t`VD06|; zXbYt)!7|vkW?F4GU^L(a zA%6~Q+d>lZXRE|Z4*J4sRw@Ddi&#u1ol?}{Sj@4Zc1_L*l_}J6=rfL8*ssN) zf9_mN-+-X}(9f8x?vX&$Laqr=znUmz1Egbq7$KdRR~hA+fKs1ffts9}Tp#KoZG<*) zt&njAqr~nzF=uzb^Xc9QwiGIVcg%;sM(|Vc*ndO{m|zGk5MCST)CZw;@%dB%yS1_U z+4olqa`aZWk8l=VXd!C&9?&|&K1NagDpw0Ehp2vk&7qByi5tPcQr1w>a#lxMy#1{{ z0J`AX#HDTRQp(kW?iR}5=o>*Z)vZ*MrUBFw@Qjrp-*tM{scDOd| z@>y?pqw7?_p}z%i#nj!APyKR7uVt(Ie!0P*1ANxA_`2N(Xw!ebF7i%9!Z?tdc<}Wb z0QKeFIHtzV`bfZUrcu4QyZ!ISD?qI&;UcdAR^A^0Ji8z0|Ka!rt+6mU!a{JL00000 LNkvXXu0mjf_jAB@ diff --git a/graphics/pokemon/iron_hands/normal.pal b/graphics/pokemon/iron_hands/normal.pal index 265b3a66f6..b191fc604e 100644 --- a/graphics/pokemon/iron_hands/normal.pal +++ b/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 diff --git a/graphics/pokemon/iron_hands/shiny.pal b/graphics/pokemon/iron_hands/shiny.pal index ebe29a2267..9ea24dd824 100644 --- a/graphics/pokemon/iron_hands/shiny.pal +++ b/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 diff --git a/graphics/pokemon/iron_jugulis/back.png b/graphics/pokemon/iron_jugulis/back.png index cb6e05f26ecc3099e3a9e74a1256ec43a6ae2fcb..8102d2575a78069c5ebf26cdb85872e3e7617d88 100644 GIT binary patch delta 657 zcmV;C0&e|*2dM>+B!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1_crTP!RrmX?+rH*9nmUPMGh!NI|ggM%SQ!bg1nq8o?YE4u$? z;1CcH!oa`;-2oy100Ia}L_t(oh3%Hzj^i*0MoXy1YA)FKe}CKM$6)M`j*?!iw5l)K znIz}<1KUv_kMH;w1L#A(T^HmzZ}EwN_L+eB>w+|?@c4m1_*)h9NtM43xI=v8vsrPcqV}9n7IJPzc%&YrwRZ7aXP1+v}=SA zd#4D%v?QB^CV%jwN7$g(eiRtJ@_IWqJ`0))g4cWC_}mcC+x*#kAp*oh0HHgM0ILA0 zg|-j~(gMeIMcRCsnCpVzTgK1$xb6`=fPN2rDPRcVx<|lR3Y^BWC)Wy8fDMnyYrYUX z_y}o&Ykax`Fb?r=d=VhwM;_?)P5?4myn~MYL)!Pn0DmK!Y*dB^e+U80@B8zl1=I}A zCCmz-9}aLLpf)DQN#QiVL-s%W>-n4n6at-`h@d}StOLqJyUEj!Z2(}w(~(Mjo%54VV!bngSqx9`ZI9?pQtT!Bz|0P~0PJU38Ud-VL>2)IfCy r-Wsw%*YNx&1VI_$JHF$;7=Hn4vLLIJCxc4>015yANkvXXu0mjf{%9+? delta 874 zcmV-w1C{)#1%U^UB!4haOjJd*|BL@j&F<>%lqh?9d3zv4oDeKh|NsAUo$f(2L4&IH z2n+~0b>=B3DQbb$NDL`~Ujq7th4|G!;z>%tgpvbA~jJR}&1RWttE*Yv7D{|P-uZ#U2p%1VNj|FewR4n?mqE9AN!M?)20= zanFJvAh>1%YWr{@5dP#auPPZC7e>1%W$cgI`|+?t8)ls9bV&|TR^gb$u+xT4W$@WV ze)WlaON22SJhK3#uxyq#(qwL1Cj=uvv_@&ba9Rz+!={n9-P80{l8^}j#Qo~70|vVL zMLeq?`hSfsoB{CxMy`4S(4>s(L>Ps%Sz6wvgzdWlyPJGFMyI5thrFqDBP5KN+JgW# zoJA{HTL1&qy@ZRB2ZIA{M*-*pWi)-a-2%i~e9o-kLILIqB2S6vei@f>BzKdh3r7LB zmRxgH1Cn2PzSec+>5RkKjsnmE#uSnS*}T|KfPW&ug%cp#zT@{b4g|O=377?x=T?DM z|MENG!FgMQQ7%piWUIG;u49gl#5Y0CvYr6k+>2G`isotHJu7h-$mI_!?;NXYGu%eF za^E09H`jedKoc>(hu&g-mix9jYuiA$_z@KVTA-0M0lEO7h~KV%#?=AFv!ekX4?rw^ z^JDX=3DK&{lCJyT`?7r9|9Gs6`v(Fu)Wxj6C2fHK2Skfe;1wa(z2cp4$67ZY1vEi^ zCMW2#g4jB!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1@dLCoC*1H!U(8H*9nmUPMGhM@33HUXCG0!bg1nq8o?YE4u$? z;1CcHfUEynj|Zs$00V1DL_t(oh3%Hs|*oix&mN8(L-Id zhWQvr+X<6?+tAUD00R_2(wr(D%io~fc0jrSqyx&qPggVT@$A^FAQ=YQ^+=%TZ%4@< z*+*?=ifALZPDY31l_F+|>W8&$8cFj;I>7YZJAVNpVxHG^&CA^EY@;9mE_3al{D(h^PP2Tp4E|5&zm?` z^4~iEMn@lK!+~Ok@jUdr=n)wU}MB)7^b`Rh(@kQUx7yopYkI(_w zrI>+|0zX)An@o9+=-bG16ol09@Z!Gy9-A*hn15gt5QCVc&^v;B_{1R18hV*V0VFY) zC~k78Zn8kv{PE_32D9KfP0lpX{??=dekHf^v%_SN7dYt2+%8$fZ`3Sc7MQYIg9 z>oIQ&rskXj>q*BQG!T~6(P0Y7DFF;jRnBDUyxQ^2Epvy|Y%G_joefkj1c87rDU^-J z(SN+Oldwx}u@UASci(YK!MU_SpJpcukBhgBE{Gntkox~ZaHs_N7ZX;26tFC__v!rV zF9%We9U!}aMiw7INTelT;bR(}kAo;@KsKq{HUR|IS&%>ir~!KXF2!>fBoa^Id^R}? zA#jZlDMGC4&go*J>eKn`X$qlkFa@}fr*FFM<5_@SlD_~l^sWISPXhSdMFoy`mve9j zAjL4{_lt7*BZ}ZXfrx7IZx70l8h&t5ukByz_nyeF5!2kdN07*qoM6N<$f+F7C1poj5 delta 1111 zcmV-d1gQIr2%lqh?9d3zv4oDeKh|NsAUo$f(2L4&IH z2n+~0b>=B3DQbb$Na=c4>?tR_%2rxne6g}DJ{BwdTK&Zr{x!o^s*b^{PAb(1U2 zzSh9m5&MCLG=KHKmeRJTGO@xst0llH*zb+C5(pUibql0A%JNV$vv>%Rs(UYSw9Q=s zB;&<;{--oO(#9xNf`0+{LIT|l({inXv@8=}sd@u~ zdhjTq2vu1NStyT{&IE@v!Mc>R7$GtT3}wg2anBe;TLkl=EUi3(OjJ-pp@b1xWxX() z$YExsutnCw%(^2;vA{2r*_UO3TEX^Yc-(XJ{BET!hiRfL0SA-&f^O}nwAHHI4vTJjE!LPtvZM+q3q*u1mK3n zZW{&Z1>L@qS;`V*puGVw zmm)`Nku?xTn8I$z>?C;YN;3Oo)mNB*8hi6s!heEd>TV>kOz=Z$_MLhP*l^8$7~tY0 z_ki{bTFE4G2Ja4`j2M6|NrLVVt?Q6&b)tQi9ROKL*dOnxayhf)dX_?fBs++B+%lQe zmRJV_Urw}KPKPywRC_go(irCK4ZQ#?=W;rcW!6GBlvAkhb)L}-^USh7A1~IYBMC)! z&3`s)-$O0;69)u~V|P80xo|0O03?q9s{*Sf0ua3!63$`g<`{--0w3A-$_D`ZVJ7JL zydz*G&H+wL#*FO`4;Zxuz$lpU^Aqa|fQG?_skPk-cuET12Fhs~0h|qRAs_~W^=UB? z27nU)j4J?rLcmP>E5ODSI>588b_xTKB!BJzIC226br*ynZM7uHJh1L7K^dpl1ba53 zlKlh8%&rV=9_Y^!Xpg^#3N=D>LIpI!oevj#2PCn|CnH33<0}`;;8dZwd9Vho&&Cq@ zjrQr6C#?&>zR`t2DIvWHI1{*%Y(Kn1sA1S77+`oC&~jNnD}0d8?A?o|z@7LEfKVab zawg`1d=PkkyLNh^cZL74ym002ovPDHLkV1gs%5x4*V diff --git a/graphics/pokemon/iron_jugulis/normal.pal b/graphics/pokemon/iron_jugulis/normal.pal index e0a017d346..452a6383ac 100644 --- a/graphics/pokemon/iron_jugulis/normal.pal +++ b/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 diff --git a/graphics/pokemon/iron_jugulis/shiny.pal b/graphics/pokemon/iron_jugulis/shiny.pal index e0a017d346..1c3216bedd 100644 --- a/graphics/pokemon/iron_jugulis/shiny.pal +++ b/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 diff --git a/graphics/pokemon/iron_leaves/back.png b/graphics/pokemon/iron_leaves/back.png index a169e8f2230906cc38b1ade4cb8c58bf65966c5e..936b60f56bcc745f62a74a4b2e807f4d93a8897f 100644 GIT binary patch delta 624 zcmV-$0+0RG1c?QZB!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1^g6P;_^Nba#bDOIB)gd$Sx{|3!0;lAgiB$fc5;>g)0l5D?DF z#sA9R0001Des4Me00HPpL_t(oh3%Hnj)Wi#MJ2@w+RXod?tivW7*IxmdD>+9WH9%5 zTS{eFe({T`a4Dwc{s`fx5Lq4(;{XVHALE$t0MUC4@68M#>zR-M{Y7=I1URFMUefAA zK&hvw_X9;W28!<+%_`<|9MFkh2QZfX|tr zN+qzaf1zI%GJnN#@+dq^4iGN#LeG_{5W>)^dLLQ-BCqrTQ8N@&bp0vJwFgZD;k4d58eZTJmC8&)hjd3tGfymKId^7BehZ9qDP5oID4fZ*U! zo;`%4BZLaj*Mx+s7X)Mgm#4RhkuU)q@Py)73B)Vde+sZT1+>c6g@zh9Mm!oTfL&=2 zAc*i;&S^k$5J1l;tAmB?#LMM_DQ^5iBtG~?5Pxhmm_Y)#{9~Omzz&QSgLiZa5H?}w zPJlVU5&^uCycaWiYdHfR#nK5gdSl`hGBm@a{783<@jm*+zllFCq9{Qyr{!7z0000< KMNUMnLSTZuvkZ9v delta 572 zcmV-C0>k}@1=R$QB!4YXOjJdg(xiZZct}V{*x1<6$k4E;sIwef|3!2E=I{^@5T%lw z&dSAVb9+rqS0*Mc|BULS0000FbW%=J|NsC0|NsC0|NsC0|NsB_-ghhj00GEJL_t(o zh3%Hhu7fZPM3X297{veo?v3rdA>`3T7q{LZRh`3RFw+Y0n}4s239~HMJZp$3XT&@} zYW*2Odh;||t0h28(JTP)wh3UA|8U|gGS@?34nGs4l*;ap2GV1BCfG3eU1^F4fE;Pg zQ%foD2y3@(+cz9r%h^CYlE!o@1j%U}qn7&wick;{eHfPS9wBSF*9!qzDx9aJ!Ame8 z@A9Y@LKTQ&*?$>TY~Ni^h>B5zZgLK=WIP~DOI{gxv(cCbecQ&ke%Qt>fLR-D17nDH z0}X_QDDN8ZhzhXz57afJcLNQ;F$yRNcDEL<*EJ3(2=2`UHqZw6+Ib}4o81Rs?UW3d z1WBSi6F~O22sj5+A)$28yFC-E*CRp}fWalU4iOe80*r%>zXT2u2)-ET zG7fO(2nzuCgYF(COac(Wca5M)J&vpB1Q=|x8zXijtN~IZd=8lZM@InP&Mwil2#)gv zd>);*xHWCy^mD8c&;aYtH2|HT^tg@l08m&8yvkU}ODX*3U(6qatR6inZDKV50000< KMNUMnLSTZ}Y(b*sh-m)l#tfN?y@FIa95Xtt9qwd-^A`Pcn!J+b_uCTt*VKJpQ0u zzaXw-d?^9o;D{ZPBJ^)(2LMJ%J0xcTi}+2Co=qt5+=29SV#X+>S2GHT__{eh*RqfJ^{00^PO7K02d#Crk@n&JUq zTSe2V)n*Q01lXlxx-pGW)B%-y>JEe?%2)tcKxeX(Wj;7JD{RL~R1-4LIGbhx`rNQ# z@eb&r&%@18Mj3!v@EYV8j$uK)lCl6Z@SLp_D1RqtX3}BVe6l<{J4#S7qKJhxH>%Xi z)^zHmb7X7itKIJW`{o6J*hoTfc^$bMcfwk4ggn!rp1M2>GT4? zD+xD+1qj(S!0rGeoPd(QIFZvtB zE-x6UFX@_rEWn!R%d?ulIh#K3_79;KUiPo!69nlZgGC@Q{Qv*}07*qoM6N<$f`;aN A5dZ)H delta 844 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 IM6N<$f-A?KPyhe` diff --git a/graphics/pokemon/iron_moth/front.png b/graphics/pokemon/iron_moth/front.png index fc403250973e4e7ab1e217f118772881b320f6a6..89eddce0dfd4d257ad25b7c4e75066ee5c12c06f 100644 GIT binary patch delta 972 zcmV;-12g=L2jT~iB!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1@CDA1o{^L_|bdTxXU)1%@Rc*l-8aO-1vR1OCZcUx1~tw7d`y z5TnQ1`T6<{)@CjM00TiuL_t(oh3%K?lB6IEg`03mD+b>GZGZP9h}u1hZq2`~WiB<< zay|}_#LVmU4~-aq3z!}gVmw20CGQ(>5a|A&=qGM%b^AhX67C zJCR=ip!Dv0h!%V+U=*x41;(?27ow<+$Fr=63u{T=ww-7L4UBX^h9icZh=)+4e%0qCSD2E z!hkAHpn?#NPfu&%Q7tjb0s>VGF~G8~9V6o4njuy+I1mUB61n;TXpb$KPHQsgvrY(( z>QTP}B=%68t)zW1wu%M7Quna|B=RAjT3L)g2|XWqKSw@5|>=^g9?@X{zs>2dRu>k81HT$G?e_~!Gj=v41ita>Un zcfguGw~(B>0c;}ItPW(a$$9}pz4Nsh@cLb|9fH=z{$}EvK28C?14<>*Ey(^}0$^;x zQGf1HL~4NS7Cv6BLqKGgEeG@#OD<;M$Gdqzh%B((05FhqY1NF|3CxxULjY2#s(T%^ zmKI051)gYZK>?+$5BH^%&;EiZD@0>}Z{3N$SaR2|%@b=W8(Yvuk;U{>yZ?4LY-vo^ zM_$K5>jsrT<)~jnVV-WP?UPA&-rq zmvWR}8z8^~G36aVcJkQO?+DGpW}tjKZ}$LLgj3m=IV;BksB!?VGi9^fl;J>h>;TRc z{bdM^5TU1h(0?KDA_eX47GU!nBOoay62Pk7oMow7Yauw($4X!t7=M_%(*u!z%mDSU zpoE%#_WnW}zBDH7Mv=uL!Sw6sTWQJ~W7)ysWYkn8P)$$A6A+Wu){9jdKtoK=mT)0T3?x zUf9)&_bUh}LcLT#+9tX4WNe$=P0>Y61uQu!ofSj!q%7jYxyfp>LgT*7p)UShsepbEr z`t~iFu@E|ycrc(}ZUYP9X9e{3LIrRP9(zH^nr$7auiF4B9H<8Z>zH*>UjY#Mq4rej zNq7hd21tYF5XN-IDjor>ieSKV5t0^tK#BqGTYnmI)C^Gnek*~Q8Aa>x4xyFoy#XwU z3MhoKm0TC0k3~P&s~G@6*b7vD_gwh|sNVZU5$(a!e>CFJu3}RYkPr)6$o6n_-O~m3 zvM<>KLEb(AfFJ~J!T!^|G_^O?3R1mRlV2D_9#CBWh-QaG$OaH3;R@fs@PuOW&H<&I z@NNo#6`*FSemkUf0M;mFOJI68eLYBb2!ZydAbu-=wCP*dz5=v!_RAxG9Ls`@uuZ9q ztD}BtHJU$JI7H-gRtOho_1(`MFSRS3FZKM_#y3B>Zkyu&@i&fNU1>1Hk(%}`00000 LNkvXXu0mjfzrLne diff --git a/graphics/pokemon/iron_moth/normal.pal b/graphics/pokemon/iron_moth/normal.pal index cacbbf8276..02dd3b1f43 100644 --- a/graphics/pokemon/iron_moth/normal.pal +++ b/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 diff --git a/graphics/pokemon/iron_moth/shiny.pal b/graphics/pokemon/iron_moth/shiny.pal index 57377eda4e..f82c26e376 100644 --- a/graphics/pokemon/iron_moth/shiny.pal +++ b/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 diff --git a/graphics/pokemon/iron_thorns/back.png b/graphics/pokemon/iron_thorns/back.png index 3c33307446a80aedc94259cc0fdcd114e67402a2..2868c610adb0e2f728b78a6d0f727bc3c51eaa7a 100644 GIT binary patch delta 860 zcmV-i1Ec)<1@i`wB!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1@CDA1o{^T3lyCLqkMFL{LyrXlQ7UlAZ#lXTieA>g)0Z^Og`0 z5S#zk0002_f^J6u00PoUL_t(oh2@val7m19MN_hYR{a0Z9e-Z^6jO;=j*CoE6^t1W-${Ad$Z#0G4RLIsyKgphj*4>**T;l)VE?gHGXd z0_-_$at6^*TiRlM{&2`UxNi(~twshOjq~)khm8nt(uAxLOaR}HkOW`?$mb}TIsqizr+T6#1XO?mC=LQH`zXeqr+!Y1 z=ztoS%6Q=tD{B(C z-`us-)fCeoBb*TzKoxL6nL6r#8YC&8?r=+i#xOt~!H`K8AJrlrVx(>5jx!;9wo+|i z%8|O(I1_-AIHe|_6HayUY(oz<%JP_cj7(9M*?)-cvami0+Ze6@%b|l3K*WGwp#iWg zEjZ*{0kH<$a;VTS)1_Jioz_x&91b}YW5`D!tJ)=asjoEm9C8ALjp)+DD8ZkkK0?4& zZvg#6MOOO_z+EhzNd1sQEsE%n4ZjekW2mdhQw~KG3E(6()FNS2KyG6>I}tF&fCCPj z##I8~sRd)`zjykMYM8hO$ev7>a~OY|_{r(dA)qjjQSAP71Hd_!WeU~BeV1c|dHwwR mXk7zOmu9CF@ZInA`|A(U;!gh=cXx&W0000{? delta 738 zcmV<80v-MH2Koh%B!4PUOjJdg(xi}(kjTi$0002^`1nvzP(V010Ek~m;Ih;I|1c;h zSWr+my_CSfz;#6s{r~^~4s=pZQ~&?}|NsC0|NsC0|NsAJ!ZSqx00MDIL_t(oh3%Kw zZp0uAMQaQ=6Y~GxTQ5KsmPyjrx~fX0-ZR&DLH+spk8uFU;eVIsfZ)Bay5L_Rgiv%! zdrok!B3=@}2}2NO=LMl6f_p?L6+kEmar1x>O7221#B+inlpqL%hlElABS0oNA8r#M zU!M{}z;YkA3HFH&0JWTI;W0rK!MO@h)H4DE@BCi~s`oqKDM9L49LR+j0q)mAs(B!k zTHGd}*C=`yBY#?TZUW4}u6Ga>aoYl3^kP8}a1+oNFbi?f^1L!o(|8XErJgqc*k<4W z`P&-eJE3C$5Q9MO0D=ad0VwHX)TYL{9IS^3Tub!^cLi2vk5+eSh=GCbYxOxb#p3bnI859gJ~p z;*97R$b^MsD~DxaMiivh8a@}Kts6nk3T2zisF zb`B4KsyLA0x$t=m(*1P?nD4wiJD`<<)G{sH?yO8Q>UbZ=(JeV!dvJUkFDd U1D0HJpa1{>07*qoM6N<$f+LYlbN~PV diff --git a/graphics/pokemon/iron_thorns/front.png b/graphics/pokemon/iron_thorns/front.png index 98aade73deab2c474e0b5c3a01433c56c6dcf0dc..3e2718e145641d5f597f487de7706bf5f9b00f63 100644 GIT binary patch delta 1088 zcmV-G1i$;T3DpRYB!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1@CDA1o{^MqwXALqkMFL{LyrXlQ70nlb{WXROp&;r@OE^Og`0 z5S#zk0001EWUYVz00Xp1L_t(og`HOkl7lb|D=}%E5cB`%u76~QW9czKwzD&(NU>$v zfyd+X68ZAOsU;%S?jZv{)th(*?(nK+cPOL=Ttx51fXt^!ApqdF@mzr4DuUPoSG`Bz zZ~Uu)P`2t=h zG@$`KsYXHCB|Hk@Ue*qGhHLmr2Lw_g2QTDV6`|eK-6W+IR}uL0b`mKy2!zV7GM>%? zu<$c7pJyjfYZp|IGCKja4JQT1+iC4Usww06=8lClswZ8g;Dy}=w# z;L%B<>Q(6BE1L_Iu`}^=5DOjL%NQJ)L199Fkzm;23Gh=Pjs=Mv0o+Sa>zx4w?T7fglmDmxO4{by&e)b_|@^x;z6w zO%_DF`D3-k2s9Li9OJV*>>0@2r6rnp?Gx0k-+zrzBUOM?9`-6kaB+Obql8FGrF8;O zbp1V7YuI8RK>Ttj4ED$+asYlg9$avn%d$`4u~RwVMR=(69Kg{}7_Y%$FOLjc{l8eN zpGqal;CL_$5ytL`4d1YVGwcZjPIiLK-4}e0{as6obf_$6v}*Z}uPkMRzzjM*j@dXQ zjDH~R4TjbZ5+Z-WYcH><5jDEb%gFCc%LpbavJ>c zVqFWt>c^GfINyYwNd{Z(8x-DiTHW4V1Ap(%$8ni6u-FoHtIjbP4;s(8g@`QQr>A&6 z982_V7tA>l=Z25l-HS*)=PZbJ^9|D-Yp5u$)ZwhnmV*7Lh@i|{3 ze7;8HH~xH!`%$3C5PvscWf>d-u=@lEj$pe>5G4Hf?bkow!9E!?rlDN`0000aTBREoEdt zy<7)qDH%NVCiN#knR=5;A+*+Rk;A6H3Ro5(CZI0VU&;XhAT$XT&o4!;hVWPxbl|o` zFXsRN2%Kg`D1Yj|0J>6Mv9yA4sS_Fl=ngr{SF4*}>jV^`7VnjM5wF-u7yo)Y>U;vA z0LX#zicsvY07I-(7%jvfwR94&toLrFV&94Y{r10TAu`y={jNP1^aY80*6Tr^1A zRm7|6oqtd(>nmEb1LFB63@JQ0+AxVdd<_lV>&x>Cr!^g~EhBytPyKZDu@3~;OANCD zNoY&F%~5Z+Qvefy>p-B{M8(*yY|74(JKQ5GfKI~NIw8EBl$X|xrXR!}1>o#!^dYDUuMeb&(x3E=UQuy+Ao3>teKscQ`I21q?(@Nm#LPJwWEt<{PwSB-|#n$_yNLq{XP z1b-G})-}5i4dFT%kh2?}AOHbx42150*vBZO-F-M%g_C1D`Btn>I3j4Y9jWCsk9ZL0 z5TeympCQ;VbWf99SGTTNn>Rv50xP)dvQ9m#FbD)Ng#dKV5vy+@tPG&^$GUC19771F zZ`5;l^5pg!LR%v_j#7-%8z56ifaJ;T^?%^5tzmzrdB%mgp8yh&LFo70eM^D>#@~m7 zk!Rlb9G;nh$B_kLo_7L|v|?ju2*3-k?;&gfkiaLso3qj>Oydj{gB#b}8P9n_H z`$6L{DrsHDc;G92N5rRx6Qt+918$m!nY<No^q*Sj?SIXW zJ`zw6J*YK0L{#(0{8bMpk~~rg-a>5j_`y)Q-d6a=waq;dx3W{>Y?;%P;z5`Br z>{T#EIcNQ4gcU(DA&sH(R|GxEdF5$Ik6S|ZxO-H_<5~KmkH+OS$$D7(ePe5RpB+q% w=PYIO^ZQeM51EEOK8|(ZQ|9%L^%oM?A6f=1by`yZ0000007*qoM6N<$f_#G@x&QzG diff --git a/graphics/pokemon/iron_thorns/normal.pal b/graphics/pokemon/iron_thorns/normal.pal index b149804f85..d16244eeea 100644 --- a/graphics/pokemon/iron_thorns/normal.pal +++ b/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 diff --git a/graphics/pokemon/iron_thorns/shiny.pal b/graphics/pokemon/iron_thorns/shiny.pal index 6d5a3826d3..af1b74fa64 100644 --- a/graphics/pokemon/iron_thorns/shiny.pal +++ b/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 diff --git a/graphics/pokemon/iron_treads/back.png b/graphics/pokemon/iron_treads/back.png index 93c44eff7dd633476093cc1690375df33ba58ad8..22562ba43f782a02ee91c6cf741e9ae66224f6b8 100644 GIT binary patch delta 585 zcmV-P0=E5}2I2&eB!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1_KmVIUeJgNKcJ2n4XUyVKX&Q(I`p1pxm(JO6TTdxez{5D=@j zz|q&-0000UgL1I|00F^CL_t(oh3%Euj)O1^MQcR{XX*d{ZhyTcgh1!PeHw`?wVHwY zaJ|I5UXLC+_ zp>vQ}8jt7S+7-D-($ckrZD;~fKEmr>t0R=K8kmwlKy8YzLU4q<(C7j<$w1&QK?yei zBb1r)m2 zpdJ*f-RA%q*1cQI=+lDYz4w^}8xr=YeO3w&%-Fxdnjxd&)}EE53fa}f&r z@IwGsSou@mL4UFM2_Ry0y`L?Fh5xM}u7SrfqR;?V0RNZz?H)lhu7Sr^TLcXtqd9x< zWd&3#+bY4*iO`$jLCJIC-&DYtL(hIG<(35buS13sIu_{*Kw#MY2s6mL4HO)hzux7b zb$IA+Dqx>@BkYLq^C>*2#k-N;n+hTfczcb@?~pp{r+lY!Ga5tF&`J#h&kdK1o4&TlQ(m0T`+P zcZ3&c%Vs~tF!gE#^53?t?mr+R1Ml}u?Qwo9qwpI*=W4k{>%(ci+~G=`g7VZ$>S@yv zWL1u%xqqxjkC@I;Hxsx46i4@V5QY(RRj>eBr+co3(}%c!xkq~R zIs{(Z*1bYRtm`>$w*>q)$aoPZgUt}yGKnkUqIb#rbL28fPo)qf>;S(4_}A@ZZKKq* zGp-Skg{wX!A2Q*)135)vh(m%#zy(;>m4lQG<$ZyE-1ILMX!NVn(6Rxb|19=Sz5=dY z*nTAk0f2LygR;elHvoU?LP9)mkF5#V3FDqZY(0F+J|UTaNsracEq@_|rMw**RE2;8 zTIRu5Yq!TvxL*P_p`DA&Ez}gV06&y=o|?xeF7Xdn?k7uwCGo=m0000l+7aY`cNm~;Li!~d?+q&k9ukF)yoV+7Unq&b7)Z!~{=h>*;n zA)ggzNHl+_+DFmDsGpkhuv141a-L~M1Pb_yPH25FrAy@7#yRsyDW&#aewORhqI*skWd4XYG^klg}k}JKhF>M z1xGjIamISRU4+0r^;6T6fGBAAHsW}Dj#_a!&wA(^;e>&8ZX!ZF`@aJCdRqxmfz%(m zvWD?x^-JxQLajhP#hPaquIsj~yY&IBlI6I7@C?8~=zpETgGUN#9oyi+Hpw-FBJYc_ zrBIPV8-`)qmLCGbP(!YN>be7DJ=yXXK&l>d%d21};Hdz3#$7D=An+cq1R13PP{ufc zn3_Hvz?7Z=(DwlBgE$VB%T22$3HFf2x;T_Ed}6};Q!e> zi2xEXN~%5;-01;$TpQAAt}1|iSl9}j06vaO)P$EnS_pVCt5YlL*aI%D7dg%?od9Kh z0|27!A5HrhkM?(ct^mxWf|I;0<*<432#!sFT7NtN{Inijw;Ss?@*_waT~Yz-4)82= z09qFU3Q5}3h*|1|&;aFK4l99$gl2-{>n+(DtIYvR?+EOM+2?_;l)nM+3}JbDi;WOV z!3p*UH}CJ2ta=+1i`paHJ1AEJ?{R_^Vyf#$UJySodI03p8y_h p(Ine>f7TBAz1{4?uYK*`?GHoeE*m{OSt$Sj002ovPDHLkV1iBSdQSiV delta 978 zcmV;@11_E+MR66Bm0 zdF6!obNTbDWV0m~0{9_=(JetKMPeYLQa&b#ki(22dJ6?Vb3!D~FSVyAl_6eaQbQ~s zAP|bWt40z!Bt|Nf%uxRMj(|X=5V5n@JZ+?jw23wZ;R`9@}S5e@?yn z)&Qk14^@nX!>MhKePfz}+3Nq)`bz`gwmj5zU0J%Rm z2E-IbPk$~NzgN%oZXViLQ9jYP@{_d@7 z1J!{jfUch=z*}rxF9A~k;r|ABHxn0d1Q-E(1|@*S0^o$Yt`pvM)6X$DfQJT-05sj$ z0PhYsOM;Y>VY3#11K!C)uWt;w0E93BWP@y*fZPGqQ&Le75U^F@2!L@9q^>U{fR@Hf zfW`1^27gL$07`53Bq#v5>5qUR1>V6ry3PUh01yKD6cxF=*#JuV3vFdky#lHm&l^#@ zXz80s3dlA+sn-$F0WOyI+6^V_Jrq446U;J!x|Nc)uGN{{d*15@K*S&+S`$PNI@eknaT~pR^|)9 z1O09&R|`75&57qaUaD46dt?8u+|d?4o?~2M!Khb`0KygAH!)nV_SU)7XSbN07*qoM6N<$f`78d AEC2ui diff --git a/graphics/pokemon/iron_treads/normal.pal b/graphics/pokemon/iron_treads/normal.pal index f65e903d76..94406c95b8 100644 --- a/graphics/pokemon/iron_treads/normal.pal +++ b/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 diff --git a/graphics/pokemon/iron_treads/shiny.pal b/graphics/pokemon/iron_treads/shiny.pal index 3c2388187f..601c10ad25 100644 --- a/graphics/pokemon/iron_treads/shiny.pal +++ b/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 diff --git a/graphics/pokemon/iron_valiant/back.png b/graphics/pokemon/iron_valiant/back.png index 9251f2c7e4111384ecfa97e400934e422fc04493..08a93631233b34548ea0d77ffd01a8a3d542ce31 100644 GIT binary patch delta 800 zcmV+*1K<3{2Db)~B!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1@6BBV}QBLP0{aAX9^hps=;X-s0>3K8ayyfsvYu#T<1{P) zy6209@D3{k(SL^~13dvFECGlpG=Vg5HHSC_a0)az+b0)II;JJCqaSq#5#2v&=LPB2Du z7y_#PyAYO>1_)!lb-GyU{aQ$CSr>!Q3nRU608KAgG$MkBE9gQ4_*ytIBl*ikaS$uO z^$4Dr0T-kERs+ttbA*_O*;l}E0&qV|%E(*P#>{PH?sCxI&)Xz`qdNr9`Nb0Qwr%4j zPy!r8*MHqB4M0eNl2pZwFbe3dP)>v&^fTl!9s>gZ4UmaWWmBLiaRZQw0RRrkZw%-N zl7UWBaWJd_07vUm^{9a{Ah=-#s)H7QF~-4|&EQ2hD!{)0SwkEl-!@8lq7_OFt|F)b z?Zgch(iGqj3q*~96R^>&gUGo&tQsf;BLh*%lYanRf_hy5obbVbPyo(p@pCl*3U*ZJ z6W((p3+}Xl7jjYq=wl`Y&;o#TBNqcu0i^)^!CFq_fL;{)VnX!t?Sjz@upmP8*00009z delta 815 zcmV+~1JL}p2F3=EB!4haOjJdf(4#FmOJ!$qfr*M>%fx$000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00Om1 zL_t(oh1Hhpj_V){gafW6kX7FQan~LLA!$gm>5p?3wb`o8e192VFuN@O|B5kwCnx#> z5KR6BK=m5Hb3lk#j{#L5WB5}45U}c>0S5gez^MNk@XrnWO~6JU!|ylr7C^dwiP%P< z>n=j%17PBuWT>pasG5#t}6GbOS>UV4&0}6kvzcT|kHp zkSf6dAx;6NFDt-H;0}^I2zE=D9WHL?Q=-VNZp0arFTnSwdU`iNrz$qs_03Z)j#0pS-ZUi0xnS}|6 zizKoo%K`dK@uf^QIHhSddMi2r1oP}*ae$VSrg2mcrq9)aaoEo)1?Vn?t7#lgXaFU= za3k{I4*b-2#E}U^3xHdA)j*^I#KhLp?6({f9Dk5mU(^Am1Jqpx#qK$ZL-ja-iNSEo zRt3GcoTo2r>L1e>1#00Rt3L_t(og|(J}n&Kb~gj-rFQ3CJ(wtqL1(5k&H-Rd3d?#F89 zXA(kW82;M`A$$pV+`mHraKC>;Fu*s2e*<{j^<#iOsDFG103m!#P|rb#A8w{%^?O{F zi17&_KyUJef36ckaQ))rG9fGh`rD?z4v0&<-SBGqC~|2t0<|lE@=~vDrUUr9L{-SE zUJGIaKtF1&MSsVOfW-lejv0U=RpeS4!*VnKX-p#mD00yOcLDO~1`q*Ka8}Xt-h$~z z#rhTJAu5nv#JnRYGz9~#H87WvMV&gExd#lety%-f(Q^o(Mef~0R(Yh(yyrIAtyX9lUAAN#tC|b zfYPUXPiJ9E+XyEB96Xb=jWs=#qE4_hXulwZ$4AjugL>K!LBTde5_mf5bfRY+YOtQD z>p&iyV3pBp4B|_!`oP9EXnZGh08NhogvHzdjenqx(9@SS06WgsN%@`ROwW`Q9grTD-02;!R#z1esHaAGCdx9~K8EsuKu3DUKI4B$sNQT+*EiR@UAn#_PD z@Tucu2=0J{# zyMGoCLCZj8ws!#DI|;xVBO1L$ROlP%kf`|6c;Ff=s- zFMzmgsHFiqw^nTc9;5bFXa;!y<`ca1b??1?9$%i=t`&Ag!}lBZst1@;tEK~wSRnTS t87p+|_PSoW4j)L>%JK7Yy2Nh$0T1pr)DUJL5Fh{m002ovPDHLkV1nXCl-K|O delta 1000 zcmVVLWb000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00V7F zL_t(og~gZacH%G$gd>n+%NP3oZ@V*c5|V9_b?J}wDI5aKSATgdkHa+mJp|+1n?D)y zcszcGAmQ;Ff&>09L7q<%^cQ-J5WGFA=<41(}OzG+JILGjT{sH}idT0EY5a-8R z{~-W+vqevW4m*+a6y^wkrDz0%5Tj}uZU{*kfcaqyfD5T&C4WG$WEo>2IpHQ)Tn`V{09NU@8OT{&WU)@T1T1>%0f>7PHj+YE6A8?=TSD$? zL#_Q%vjGqc0Yie;m2lpUtG;#zaEUMjAP3C76O{RSMWA0$+hQQ~Sk26b=7sP^eBYF8 z9LbEZtsG6uFuv-9jyNSS{d9**YOCJNr`HMWDt}&|9F=;|17I7#i&+Viuge+Xpii*R z`p6pPNWkLWMAM>YpgF=5jfDCp_%U_cPK@&CrfSWe%WmXK;6ZtT*y}5LBBFm}N6;PM z48gAJ`pmXq^~%HfJ&PmZ?~W2%^~;giU-cTWnb2uX-+*rchc4OcJ0P-mWI=ryGVZzr zZ+|mcMT@@ERzhv<2-p*Pr%QLN9szZm&aQ;l8DO=%W{GbA{a;=lOL(0Em>qd5fQQNo z0HLEzA}hq|N-00=ztwPD-=Fr=l_7C`7_ZGe7Ey}w&d0AdROH&|gU zORZUI-(%<&uz&LkaCXi~EwvUoe%Ar14FM+I(tY<{t?d*r`WpaL*7fnP(6zA35B~r{ WzcvzHNm%;;0000l=i)( zTK48C_V%pR)oSKSDPm$;K|w)jIel9I0087kL_t(YiS3lZ4u8Wi2txxoRgv)j|Lq*o zO;c;S%d}m}p%*OTIP|r4mnwYfd#wOw-vfmNW`Mbw7egqpU~z^XLP7N2*|yL_5Y9d| z?7ImC`YN75CsHtv$WO>VEd(u08>U@4XGF)m2*z1~8Ne8r77GP@#2DG8QYd)QZDShy zC~0$+A<(o5MsLU)t_<`5&!>} zz7CL+BF(O;30Oh#*Kty#S&Kl7LxHQ4j<>Kx%@J4+)S9g8YdO51wui UyBe(%wEzGB07*qoM6N<$f0oneA1GNH>7=Hu<0001qplF={001yhOjJc+n1FC_aJaa*`1tsEm`Iq&NRaSI z=x~_uknp&mSn%K|@bIY6&}iUDC}3b%KtMofSmaLt006*AL_t(|oZXT!4udcZMRNly z93TO$KIYg@qXQsuCW5z8!z-8S}$}tADVh({loxwUT{qn@$Th zMvSWx9QV;-Z35v33;HTBb5E@j2Ijz1ZOI`JlT$M~3Pq@XobfXXq8t`j#usA5YJvCD zHJw@{$2gT#1A>*odUXPDB-HA-MNmiCEfda0J8VIH4+AUEN!V&l<}P(#V8CC1**84_ slQ%w4yaHz9!yk%HxAQ?d|Nr^;0v#5GImrnK2LJ#707*qoM6N<$f;cmObpQYW diff --git a/graphics/pokemon/overqwil/back.png b/graphics/pokemon/overqwil/back.png index 79670b0601dd47f35736c8ae2ed62d1b1fd91f8b..8ad685a5effa8f9313e00d666bf501512226915d 100644 GIT binary patch delta 606 zcmV-k0-^og1nUHl7=H)@0001;w}I>c001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJdg)1_HkYJ`NEd}cDPuDm@klB%C-glNWPRL6i` z@|T3rm524n!HN(N5Z~Xb`T6;LS4^7#00GKLL_t(oh3(Vru786d3{m%ktriw!6T7Q}_traZh*yaI=SZ0QY+Mv%u@G2m=G*!tweY z;L6_40J;RkFb~j=bL)OT1L#40!Peir?=6u2$~V!|`J}t?2vDx?18@(mpnw-#fZ@B| z9XWd69{?5wE{AfZSbh(j(TAXkkyX@NQ5c~u&zbO0RV<)yhg~^5)i@x zfB@3~7QqAxX%#@~3y>c&I1AjjULFDjfq@c$c259+O)ioHRImWZ0nkr+cLY}erM^|@ z0YnB;0FGEEAcu2v0${3&5e%>%QauZ#K!0Ehk!rx63x6$u3Z(1WVJl=p1W=&>ENEva z0RpG%CtnGvQlSOXR}_DZ{TVPp2^E-dfDT3h2x}L>2|Mqj&5pO!C4f)?j&=Z4kTC(& zIRv9}y?nwTz+xv5ji6cqA~}FN7{3Lw&-Izj0{3MSU|Dpd!jNzPz$AbO!=g3-pY>UN zFWB6%16RVV0}&3jX{as0Lw-@fvYK5y2dV%bu$h9nrxB>B5BbAw%(EWyG0cUC*vwV} sopzvSuNGbg{GF3^I>zt%uK&1x0P&6)jAa+gHUIzs07*qoM6N<$g1WE0002fi4=w)^pTPX`fKuXW zsnk;mIoEP;z!0!rDW&ckY;yF066tgTh|RU+Vcf{pZTqIwGo5^`G9S2W+ja+LlMd9Q zHGtbwuWSnL445-`eo?at2;W+sfx#M4sR2Y$#9vGGz<)Dh2dD)9DJf{15+>#v`wsL` zGfslpm&-(>yq&)=;QWdYik1SQ&=s``Z* zJk4gXajbd6M{99A_ki(Q{cr)5{2lxU{Ml~gqXpbNMfx!?c^iZlcs&HR2f(WbSTnqL zK#qjWvPnsY4c2=RA!d^Tn_;b^#R&9i1DZ}m7xdWIc6R%B%cnp^ufizN4CHQo`gk{> e(Eiu<_ltjCrfevLf*z^>0000Odb7=H)@0001;w}I>c001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJdg)1?y@B_t;}d{;6#K2v)lVXBd8X*Hy?K%Bu( zs)tF*!CBA9w2BZA5Z~3S`T6;ep=E6V00O;9L_t(og~gVOmVc@+3`Oaaf(`ut-_A+; zLTT}J*R^X#tFm{KG)1TBG@LuX_ttRBmxhDjvtZm(4Ic*63_lcP@Y8x$!=W7iO5mtX z$8Ht~nFQ+aNubWOZ&-B}DBXeFC4UqwstH^uRGSS1D+DmOWnGjm0ySsKJ>#cIuNYP< zJW>&;d7ddR|9^}Zfn|ZM0yU?Jdxf90m7(wt178l02$07Md@-=V5=P+_=kW?J0zR@O1=YC_BTmt_e$g=rIm&5>lh&x4|+I@qv22<&703ZtVy_ac6>tA7YQ*(SK-Q#xnGDgz&(e@znT zyAUY%WY*~i11rk)NMM6OheH)qZffRzjImb{qAD;f2*Ke6W+jJ6%tw#L@LdBd3s;57D0tB#VItzPX)h00%)77LGY~ zLcqZTO@C(d&TWn>;5!1(ct3~iaPD>s4z)Y+5evjzg!!C;>~h%2-T1!awmJ@iyor9q zLjXfS_<;_*H$^~IF*q8^hOiOex9$VT2FiE0@zGM!I#}p20h4(yQ^H3_({A@8`evY7 z=@Fir;mDWh@l0rt5m!^t6z}ksf27o7Pk613KYwmN5-`aiE&fCyXWblEm5E`+wiSaP z8ulG_gGKYFq#S002ovPDHLkV1j*_eq{gv delta 730 zcmV<00ww+42Id8j7=Hu<00013M{Ml?001yhOjJd9z^Hg2VDL!L5D*ZcNXTGdXt+3- zC@3&MKuCaqfLKsC(8#c`sCbBYSorw(0000ul3Q{B00MDIL_t(YiN(^rZ`wc<0PwRs zAX$nOlZd68iI}apbO5Gsv}(I0IVojJBe`9xh8lIH5!amzY=4p3ESwoCZ};fLQh|{w zWh=0>|48pJP4Nd_Hv=WV=7{VP zWY>dgP-x8wX#b!ZxU~RdbEVaIJj69q7PtsM*6;rnF)>Af=n04VlBt9UaA_1GKsBVu z?FJxoiu0kevVVjW%6R}91dA5*P#fw?AryO8rESL{L`{!{#qucAe9uX*&bVlTwv+D4X|P+y*yjaE$bX|u(dBH)eo8C786LuPgg_0b~qD?qnW*9qCzd6SU&X zw9jXJa(@>oZxrwo%PRRYrhE+jn^0bS1&^1(jhEPgp5|%R53ww+f;WnRsfSckoA&{@ zh05HIme>I~NdUxPP?yLTEaN~vBiTtW?2=MI+uS*VvV zDRRv}AUQNY4GhITlkedkAhrp}RyP6}>0p=!HVm;P;HCjJCI2t+8zMgrh1@Z|)Bpeg M07*qoM6N<$f>VJ`VgLXD diff --git a/graphics/pokemon/overqwil/normal.pal b/graphics/pokemon/overqwil/normal.pal index edf871d9a7..f0a9ca4dec 100644 --- a/graphics/pokemon/overqwil/normal.pal +++ b/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 diff --git a/graphics/pokemon/overqwil/shiny.pal b/graphics/pokemon/overqwil/shiny.pal index d791dac4eb..92aaa084e1 100644 --- a/graphics/pokemon/overqwil/shiny.pal +++ b/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 diff --git a/graphics/pokemon/pincurchin/icon.png b/graphics/pokemon/pincurchin/icon.png index 354d7d37d8d9e13b541d3929a3f646cc59b13e32..6b33be67149fcc167238616bfc8a4eed234ff174 100644 GIT binary patch delta 291 zcmV+;0o?wM0-7=H)@0000?P=%ZT001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJc;oP&FNd%eB1|NsAUbIqiz_Oydq?!}A6tSR>P zDfVJglzYv^q|Lo4oMK{HK|w+3M6_Q3005CmL_t(YiS3j-3V*~f5JRJG3}$ry+eVW$ zgvClyY!O(j!iDuL|3KTe^p^N5!2UoS06kRG>;kS*YMww12KX$OFQS+Uk;w!ShukJa z4p*{=P{2vRT!g2qus(%+`{@#*$%|HF+A}l>K}NzogaECM6r_BA4MybH{_;0U)>>Nf pS_SeK1yT|B1spQ!fj0&6l6I?k3~l2Z)n)(y002ovPDHLkV1mandei^_ delta 254 zcmVu#B9S}HY887d)xgv8(e&vz0_FQuQ8?RPxo*T94IRCCvw0<1^6ExPql{xI=_p5rVtiL_K`fFRI=z zy5X@zNETu+9oh)Q5q20B=%YJMBwrSpWb407*qoM6N<$ Ef;sAX6#xJL diff --git a/graphics/pokemon/regidrago/icon.png b/graphics/pokemon/regidrago/icon.png index 3b994684b44181a5581d21f9fabe786770c5d0f8..74804d4308904c2dfd62083f41b4dc7e9d1907c9 100644 GIT binary patch delta 400 zcmV;B0dM}^1K9(R7&Qn30000?P=%ZT001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)+=AwGWrI7vi7R7i>Klu44rAPfY}Md9E;{r|VELK3FgJlB~R zx^I;sODuU^zir_yPcMW6*kUL+)M(Z=1^dp6DUAA6i72C=6Q+4dK+ahN zghv9*b6t#Qf+J+nU*sbJEugvnYcm62&CFB_KAc#e{XvzQko$MR?xAGxNO| zc9WOEx`QF}kugf}tD8306ODa+NPl+y8{~%uF@Y@nVb9A1vh;@wV(*VSVtrW~f7q+x z+g$m>3=#ra_`}~r2xL(9hZ&>^Wb#Ky(gia6BMcIjoBYuX()2L;BMj2~F#015();1t uA8wGx4{LwKex!P&OMkR&J^JIRW#|X1u^X$VY4c-&v zcUXP_Jb*L>QBpLNkz08J&{>iOkjelEV;nM2CuYT+kzP)37<*$1r}rBo-XWBn^CW-Z z4k^oO9AUTssB(V!)uN6q2Qr=Sw|8_GfrX^z4+yz6#pCVQ+NDiLL0c)hu}0kh?ksJM z#h{n=vR6KgF;+rSD{56aj4io@RyE7-ym*f+liag%BupTrzmI`fl9$I%L!CL#3;XW_ zGoX1Q0WdI;fo2~DgXA^}B1)A}smOn`AaOECgaLj8q|;mKdPq}QE`9Wnrq0#X_7F&` z*-&?op$a2vhAW4m3bTD2Bd)>-xb_AZsxZ<;r>iMSQO6W8-E&*f!-!hV21R?Sen^PE zz>%9D@vaKZk2*7&Qn30000?P=%ZT001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)+=AwGWr6G=otR7i>KlWmIwAq<2C6IlBp^Z)N`^(ZYI z9BspP(avLZ6DOr_i~!;w0vS!LgMpoC7x+WYd_gf+O+X#+P!&GFs!u{|2#M75oC(tr z8=b^S7u)EE-CXpSSg|X>|87-QwWHXjAOvOxCJ+fVLrvR{z+uj^d?tT5_jT=vVp(J% zTyI1TgRmr7BfugTWAKC|*)II z6|<4(jmIboHxS=tTo}<lQesgzoc69dw?A(n&Jn8PB z|Ao7E=6!p2<5hQ$JL002ov JPDHLkV1lPdo0tFq delta 406 zcmV;H0crlU1KtCW7zqRe0001qplF?uO+J4B32;bRa{vGi!~g&e!~vBn4jTXf0aQsu zK~y-6#gegZ!ypibd4lpV#jEbdd}eJVAPYE=p+1*BA!d_BMryOlCk z3WIh0+#TlrkFh5$4)npbP|@}ZUJGZ8Hdibv)IJJ=gKJT!RwCub8vRlzrP`kBrHg-? zX|Lp)gVgryg~p@=cKcN7sJbx=U+3ddsgDt|5HhAypOks@J*Rh(t`+7)Jv&j?%b(WW z+%%1;%MxOOsBpYYXvLtDz;3%&a77!Ma9ILJT6_?LuW>^QygBSOMNz0Vv#pX6xGS}< zsDSZHKO2gzq8NRe1>5_6m>C7;#88(2yez$tbeH1st-KviuG>B(uGh8yvh4aLB+U9C-Fbn1I9mc@%maHY4yj zYy^4O_iMpQx@KL&FW8w)NdtCkwu4`0|1S(bYlYwBX00~_00000NkvXXu0jG}f(Wm- ALjV8( diff --git a/graphics/pokemon/roaring_moon/back.png b/graphics/pokemon/roaring_moon/back.png index 01813ff4f991a2c94a962e9de624da21a9ddde06..79f5909813a86d08c0a89c7ca0188d53661abc3e 100644 GIT binary patch delta 579 zcmV-J0=)g*1>6LXB!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1@~vGGP=TF z%*S|a=rrARm!t44K>kGND*cxF7XnonoFGBk&7~?rs_=DBLFz4|!G&ja2;=%%?8_0NS zLMg>Ax%ji-n{dn!&w2`XUY9eVN?z=b+v{wm>k-Om701iKZti`piWUz0&_g2$y%RC) z!=`9{Hn}OPLTRUHn^Ul!$3af*k`&qw(o;py=W{E!m&gLU}^|BTX-|jWtxc7 zKt3CY)I7UB3iw+87Jxgr-}F%fCw&lb3LpshpbtgxK_4=34lthKU3dLo{Qy_vC{&*= RD0%<@002ovPDHLkV1h@P`-=bo delta 709 zcmV;$0y_QN1l&Y45ZS@Pw+T|dK)8kA@w8{#r$PwCY=LtS;8}|(!4Yo3cXxpO zy^qVb7-Av>!2di00QAs&lOP&E_cuU;p90YSfws-!p9q`_cl3D#;5jpfOtU&j0Z3o~ z&UtCzGLohngnxi@5J>?ffNWQn=^F?qm<9dhA^_Frojwp2Nv)mW28!u(*#iPW^>(}3 zL?1T=yJN-@Cox*$Mb*uOYIQxFSkT@YH4Q)*qHp9V?DL(k%E zNdO24MKYbz0n8R#z1DRC8igiCM8GWms}r_~Gz3y-G=BrEClswHJdP~SK&b|0!mj?3 z0cmYYnpdgF13n8zTS z{)K1lFreqaLC;bYIE#E?AWeF9xu$qO$+H2P?$2$upT9Z5sool&5TCzuj47TE(l$6z z;SFKv%OQUpXExDk|9sW!?GJjHJuAy=1t2Qg4-YrL>t{^#AJUV40%wTGz8{NT95J| zP@f0$Qwe;@wslcF39idy3@8&!55n>V01vRpJpj`hJ=XXZ1nTU%r06fBnFW16CGz?P zaK|ClzIg?G4lNbu%{eQl1{ePkov#`}H$Tp_Hr6h_j4*kBH9`dT+>Q2%K$Vt=$29e$E zUbV(Jag=j^IOP){#>W98AHZfL1P&8Cs?Ui7i;sN>-d=mJ(d+sVVR2yEBCACGSd><= za!dTVv41HdXJR0uQ4b3M$f|&Sx(gD2$mX(`0TJ&x1LU=;esg;dAS}|98)+3lCa1ap zKnZc)x~?x6pnV9TmB%_%01_dL5b$T31_RO>$RKJfMOeF3Kpr&_9uJ=h@*;HyJw3=%{yL1|MRmNvYL7POuY4YWDCIla} z;y5bf$Wc(2Ld`;pD|)ZzG$1XK_1VQX-c22?*V`xvOCs`8QYeqF9GXqvXnTaoMQRF> zzz5*NU~{j1K+i^wS&vMIkjLW14h!J`qrzXWb*;_L_KW9w-~9@hs6~s_fv5zIdme{O z^nX~p#(~o=nvvJ562#hp4T-sTuGe|4xaiUMwIr#hc!?^MhCaDius{>c2>yAJjDbn2 z(((yb;n{+a&o9iT9|=~IY);v}Y@|l%WBQGdX`*`f0N5ohn9P*rddaH_7j{d~YIk$M zh08@ewO@AB74AF<;yC5c%h-@A0hcTAm4D#$`&LkLFm~Fj5Bh~qtcA~oQX@bk(fitB zP)geEzModPrtm}(wM|>+veGvTXN*GuY!jw(4)utLP;R36aGtDt3H@XXZS{CmGGFTr z5ENiOkN7}L&QCy82BRcB%0gSTUNYq{S@jE2FcQl0^@Qoy1-4ve13m&wJtk2X;$0+f zYOLJfz5whVoablH@21L@mgcab5oZzg=YlzFkuh%S=af+vrJ3Nq^vB_+i;Eo4(nn|3|RY z0rnkq_cj2P@Q+9=U%#fkEOSa<310!UwC@1qTfpDnUsx`Y+yij=!vDB@1(+SgtbYgK zn&4xs;=#Gg#1uTHsT=_S8o(8Z?9W=#w*{b_0pkdGVF2VTiChB;0gfXfyeojQ266|O zKmvR`1R=r*?|+Hd-&HM;rwZ^>63ufY(gDc6vQUZI*Vgv30j=Bv zI-%PKfwc%N7C<%%SSa^pBVgPK!9*k_RtYQMI)K50#Q3Egk0^TU#FVDEnw9#b~GWOMu$?cmVdxKU=3lczp`JfO&{2XrQD@Z zdj{i5P+tx1xdSX${|&H*w8`IuAouQNn)>)d8F(XD+7gyy6nlGap0E_MWpD;q$|pb* zT(e(gi~|XKz*^z8TUK)|4@h^v4$M?7bXZFn(8iHq zRiL~O5N;o@AUs}5A#?CEn8DuOeI16{j8z20l+yn7LOp(E zK3oLADo%OVj4cFIdjc}Eha@a`9~3~@lp!yzB!57dzjXo8f34veuq^{GW_Tk!UQc}B z1Z4V03*Z27NxnJO`a~AI5ET#mFwbCD#l|y$)|=}XYaP=wjU#XH$cCXYIt%*~VKdMo zD2Ld}{%KYm7WO;mu?-+5SWNeQP$v}H(b>D$tKShJu zA%6mCup@9uwcO2lV|YgGYO`Yo$4?ppxl!@cmOrJimMkgTYFou9s^p?lPH(hjqb_9K%Nr)gQ z{KrFtcwp2q^%$m80+y|LZ~=O2e%@+}8Gm!UBmymg;{}vz(+>1TK(6EWc?T&PF`mo` zIwW-%9sKk3iGQ8io9@2qk_eGl{??rc?e5AT@gdA{|vK>M3n16gp?m1!Vqc zw@3qI5$e$E<5*N90rTk+hwR(wG^52E4+Ky+Nq}&j&i&H?{dgP%h!D^L>VX!TN`HDm z*xiFYfLRy62)O}f43{B@u>yFi&_p+y)jy@erTd|Wz5z6sGq1GF#CcFu_qT*yK&EoB zqiYCr*LLUW+X_)s5LXCu?M}7$Pv%Q1LnAONt6ly(0dm*BwE2;Yp2qJ1#Par;>aK^s jsaOGhqida?*YzK0)HW3Wl8|Ho015yANkvXXu0mjfK1&_c diff --git a/graphics/pokemon/roaring_moon/normal.pal b/graphics/pokemon/roaring_moon/normal.pal index 2deb541050..073c9b74f4 100644 --- a/graphics/pokemon/roaring_moon/normal.pal +++ b/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 diff --git a/graphics/pokemon/roaring_moon/shiny.pal b/graphics/pokemon/roaring_moon/shiny.pal index 42fb2538d7..cff9724413 100644 --- a/graphics/pokemon/roaring_moon/shiny.pal +++ b/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 diff --git a/graphics/pokemon/skwovet/icon.png b/graphics/pokemon/skwovet/icon.png index e7fc809164ac86400b72fd71c3103390870dfe99..82fdd9977a74e2f3eb6cd1192682602aaf53388f 100644 GIT binary patch delta 387 zcmV-}0et?}0+Iue7=H)@0000?P=%ZT001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJc;oP&FNd%eB1|NsAUbIqiz_Oydq?!}A6tSR>P zDfVJglzYv^q|Lo4oMK{HK|w+3M6_Q3008kxL_t(YiS3lZ4u1k63`A);aO?d4-`atd zRa(}ICVQ~PXy_wMS$(DaYg0hMWnTpLi7-KiJQtnt3IxD41`tUJo?Rdl2ssYG*w+nU zP-8+>(KrbDx{^|UtVCaCfnQ~v6R6(vcf%NS-7eaiR#Lvz5T(A~v2t`db)8e)`)n*ZqIpu6}5c zxt1Gb3S?)HDUh8(ra*QEIR%2;Ag4fbgS-eNGe{7~GC~x{3akQ&hWV~Qaz9LgZ2jQr hZQRcGKaRWl;Q_Gf4mN4Thd=-T002ovPDHLkV1nE;skQ(B delta 327 zcmV-N0l5B>1J(kN7=Hu<0001qplF={001yhOjJc+n1FbAc(}N*`1ts6aLAyj@UVbb z=)j1;s3`F8DDYrVka)5?R8?&2CJb~ix@_%{z!!9ofzCKXb(?;sSAcz{6Lo!=WR>KBib>l0 zs(>2kU+BLxHb6)|3~GfL8Pp0hGN=_sv_YLP_#uok=q-#1i_C3w!T^&u$O+SsIO0cz Zc>y)vj&}H?Kl+mukAPhqrvPlg{&j0`I9M)-2g-*J< zkIk!%LjpS6cGpzyeyzjIuY7I>P_^Awjy(#y?YZHtYipM Wycw5UZFhPA0000l3liLxPybn`KVK01+Su~+Tio3T!k&QCR@Z*&Jxy1)9uR4IrPe-xelmYv zdK+7eE-sgT0K;D9gJ(iK^H(-Zu=W!R$&*YUFRLC1a%F}#aIBhZR(c3*&ktbNS4!y~ zfEl@_LM1$d;ele z&F*uY|Foo}#s6xooMK{HK|w)TsgPs<00AFKL_t(YiS3ljj(@{22u15hBp}M=|NnL_ zP9KZlcr%MpHAwBE9D}jz^LYHla9`wWy(8SQ017JZny^8gl&B5#WW0pUtDn4%2HJH*8xcgVtb{6fpFS zfgQ}7UH1?~@3u3L<>R(|+fHEmuO!3O`Bl7`)>bcPk^hqT7swX~#1{f_`3OWZKMZX= z1tK}2FM+T|Y7l=4WC$WL2p@L{gdf{egPa2Coqm`ZWGe^+@%qCL>2-|)H+~3#Ec_62 c{<hu!H>;s5{u07*qoM6N<$g7rhbm;e9( delta 381 zcmV-@0fPR(1B?TZ7=Hu<0001qplF={001yhOjJc+n1FbAc(}N*`1ts6aLAyj@UVbb z=)j1;s3`F8DDYrVka)ORGyR!6EDRRZ+`!|S5Dx0o-c?ma;$ z%?$Xofyr4$<#uD5y21#c-SWv=RI|raH&h>+z$bKUx1q7<>w&GVLS` ziy!nd31ha>GE_OLH+Y&`2D7bU!CyVx0i2cM1D{4eN*06Yn64*3B=s^0qy3@_LM1$d;ele z&F*uY|Foo}#s6xooMK{HK|w)TsgPs<008PqL_t(YiS3lZ4u8ZT2t;eZ3ns(=|LubA zZWXo3CVO-aO_~{j()h0H=;%S}+Bo%5T&t8atJ?rP0#C&N=LB$OPY7C}E`jVq=4_q_ zM2fxN39Fv12p8C4v4AC{tDxj{iM+VDFJVr#;e?b(zJV~J_Xk`H$p59cYcwnPXLH$ z#KQ;>yBh%yBS7l)9Pls#VW_Me*`^)?%ut7a(j8X zJj@vkzjy9A3Dg1SGw}a8^Z%hZk^s;n44=j88BhTK{|^kKfVu#Cf`QAz63lc001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJdg)1@39IYlKrH8xa5U$VM_8Qw2J_RL0gh~Rl& zF=azrsF6OKn5hsD5YE77@bLH-kR`7G00KctL_t(oh3%GIdw+u<3`VQexsWCO|NnOR z00gmUw`aR5cUwKj7YM}L?LFS(J^p+Uz52Y4>ThIt2@f_V$dm~1vO)1_as#`95czTh z#}^%U<_*3{8NZS3``WNtoby0Ii8RjwVqF4g-kdK{3ul!61Mp zc!=TW0$GIl@kPH8NQAGC=MnT6pCph7A2I$|pxZddd61w?;n3jx$s!IS2##^M3#Som z5k~iGBRDur8e+#cmv6m_$A<3xv@TO~e>a9s0sHMx z3~Uy$f`FNg*?0D~HT$lS1v?EuX93 z47EUZQ-YNaFFXc+02@A^U=?ta;FGK(lL7SY!GCQE6yTZQPM*&U79b~RiX-n^El7p9 zEs@nY;}LHHQByCdwrN{lM%)*t@=1UPd@^k6?oV`k0N(}VQb_FwW5J<2;OXRvpg9Gw z-zejO`mY^JkONewsCmYAiVt3Y^UEZR1Gqshnis#F-{arLH!LbXT1wH<>Hq)$07*qo IM6N<$f~0joga7~l delta 810 zcmV+_1J(TE1+@l{7=Hu<00013M{Ml?000McNliru=K>ZH1tsIKGyDJm02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1poj5Fi=cXMV!^7F)1-hN@7YmQhSTE5D*Zgy?@@MdpUbzz3#;^|NsC0 zAVFF|ga0Why(uY+7#K;8+baM700Cl4M??UK1szBL00LP_L_t(|ob8mqi_}0A$7ciS z9m9YM9!p3T+YoY{0mGYxgDvuF)WY2&8>hCjzQ4l1z~=q}vAe=XQV8h}<**TU{|4Vo zCc7aC_QDNhGk=@+;rqVx@?HpeSP$!eTp4}z&o~Ri;4$9w<$TnGZ znr}C6)A1<=05ti{moZ=u0pQQR-kw4%odTQNKi8)?R(Jw5&6B2=zGK_F)BtWT&@@e- zVjC1~h{45nPzMY*=9qTN;($iD+YJi^-`^SFISMerl$RfbSl-D5>*9+xdKqXBg#8@2 z+%%>P7k^=K&+aeOzida$>r_B55C(Cu4RjS3$_No1;2QyN@3c`%wFg`MSWAIf5@F(& z+{fWAU_@8S!KYT@i`*BkYXl??Q%F19&G7DWZF6n9dWAq3bbhQVi!4`nEV$mX&k%-n zC*UH$Jl&5dU`A^t_m>hxxA&y)lu%0DP>?J;0e>lL-eoJLeD4T>4*=9bDi_Nt!^;}X zfozbRrie*($`WvbJ&6GD{;gvd(P*s!cw-AtTe+{3bOzu!6DXnx@W~iJ4_u7|ih!)o z-;#U`pvbze&#heoWg1W|ZJxd6_3{k7q8Y`!D9|5_lsP9u1r5Le$VoZ`IHg@bCF7Yg oDI*wVW~%1m_?69iz@Ll%1$db1mlD^9lmGw#07*qoM6N<$f=Sg{s{jB1 diff --git a/graphics/pokemon/sneasler/front.png b/graphics/pokemon/sneasler/front.png index 67159da6bc9724e3fe59af098d0b58cdd4689236..ab8574407638bd28aade9032f8fc769a78e30099 100755 GIT binary patch delta 834 zcmV-I1HJr_2h9eM7=H)@0001;w}I>c001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJdg)1@{cJ~lFKQ#N9-btsM`Sl%x|>ot7rwkbhd zfofK>agV;6n5hsD5T3f;@bLJt87krc00OK@L_t(og`Jm+mVbjF3`7NVEnwjP|8_G0 z6#LL%Ry}J^=Q2bS=rn1=)KCjJJauyCAjeg&kFgO%=xV453@8MmPCh^Yz;nbzy`aPj-Pv;$iE@I_ew#^7UufnN(-1GM={2~w+R?xjXJ#apP9Q$NHUsQ6~BXbcAcb z5oi4)fbRhyoB?;8sk{O`APRwVr~~|%1CP&oW`Eqb#!m|Z;9v&b>%Re77Buo!N8cW# zHb4j+AdV7jz{bEHx8r~i!$DwP>K&;75_Z2$ouL5$Z<0DgY75(D3&9rEo1c4m-f}Jo z-X@>?sPs9P!@>ZaC!_-uea_gXo(!~ZH1uk@A>U01A02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1poj5Fi=cXMV!^7F)1-hN@7YmQhSTE5D*Zgy?@@MdpUbzz3#;^|NsC0 zAVFF|ga0Why(uY+7#K;8+baM700Cl4M??UK1szBL00Om1L_t(|oW+zeYuqpt$7KiY z5pF^jmtdTut5FEe<_1(SX6BIHQ(nP~8ol555CG7|38puHix0It} zyM%s^KIyIn+kf(0EjD^T{{Q#%ow*y6x@eL^viY-9zGzXA2tjKK zgdC0qOuFrW3#U*FmKL@uNvAk}56Lo1-&TbC_WE-obsan8#0G>2j0INePMScVi^yN@ z!OlQHr+-LKHtPNX4t+lAK}sb+n9>^HY!-n?aAW~5Ob$t79Gn6=B3%NmnW=iWJAm67 zc&C3gQ1jRXm=FWF`VSjd1DM`+5CEji$W%QXzNZ0!M!9i72`hjrU(J0jh0z{tuYl3P z!~*oRa42x3^0DRWI|sW<7y4W z^LLGdSl2+rV^%!{y70LHut`FD@Jv>L?@wMYb@W$_d4(hD_} zvVUg-DC@`ip;Xhkys&kf$PAAk0X3uQ%m$deG>}sD+6w4(JXiDC5vsJr=}kGG5d=QA z0K@&VOzDI6u>-sumioDE^`Pl6CHteVj}NU`O0ssle{*}*mL;yW5& cTQjh(KSxU6u$C2d?*IS*07*qoM6N<$f`)^E>;M1& diff --git a/graphics/pokemon/sneasler/normal.pal b/graphics/pokemon/sneasler/normal.pal index 5cc13df592..95b54726b8 100755 --- a/graphics/pokemon/sneasler/normal.pal +++ b/graphics/pokemon/sneasler/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 213 164 -49 41 49 -74 74 98 -74 57 82 -123 139 180 +153 211 165 +54 33 62 +54 50 109 +83 54 98 +176 117 40 +142 36 88 +222 47 65 +235 53 124 +236 182 41 +65 91 129 +106 86 179 +113 143 190 +155 152 169 16 16 16 -164 189 222 -164 123 57 -123 98 189 -238 197 49 -255 255 255 -255 32 65 -90 65 131 -255 41 41 -189 41 41 -139 24 24 +158 186 222 +240 240 248 diff --git a/graphics/pokemon/sneasler/shiny.pal b/graphics/pokemon/sneasler/shiny.pal index b3bc5103e3..8c1df6a506 100755 --- a/graphics/pokemon/sneasler/shiny.pal +++ b/graphics/pokemon/sneasler/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 213 164 -49 41 49 -106 90 41 -74 57 82 -156 148 82 +153 211 165 +28 30 57 +69 37 60 +53 54 84 +69 95 178 +186 130 25 +222 47 65 +246 204 70 +117 136 224 +121 95 49 +101 67 91 +168 145 62 +155 152 169 16 16 16 -238 213 131 -74 148 156 -106 74 98 -123 213 230 -255 255 255 -90 172 32 -74 49 74 -246 189 8 -213 148 24 -213 148 24 +206 192 103 +240 240 248 diff --git a/graphics/pokemon/spectrier/icon.png b/graphics/pokemon/spectrier/icon.png index 3cf118e295451b41588baab88e9956e3f537324a..41f73dc3157c5682bfad056f21e179cc82502507 100644 GIT binary patch delta 411 zcmV;M0c8Ho0;vO#7=H)@0000?P=%ZT001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJc;oP&ddbG^O2|NsBJq(S!fDb->@_LM1$d;ele z&F*uY|Foo}#s6xooMK{HK|w)TsgPs<009U|L_t(YiS3lj5`O|A3(sbTTByP+KfraxD*)kYmK=Kv{D*>hg&$SWEc_v`XBzA(x=o_ULA0<6jE9T!AYFJS2Z@Y**|6sekdtYzXw8`sDdqZH}_7{<_NWc>a5E26dQNKCT0GoPzbcS&;_pUj8<@ z?0b<5_mF4ta38PoZ*SW-3gk`@>@&E^Pl4pO0tt$_3M7w$SP3KuViHLEhmL}X0%?92 zP8tPr^}`{Mqr~Zl@f@t`;USQk&X3~)iGElMO(`)QSKA002ovPDHLk FV1lE^w4eY0 delta 318 zcmV-E0m1&M1I+@E7=Hu<0001qplF={001yhOjJc+n1FzQaJaa*`1ts^pg{2OD9~U) z@Q^5oc=%vQ$mnpG_^_a$!1!pWm|$R7KtMp~WOLa7007uYL_t(|oaK@+4#OY}MY(~+ z1&G>CnKNZcuGp2OK3kiefHHZB>n4x{x>i-Cvib49k?~jRYkz0*c@0%n0E=%R^T5>R zWNNHkOuSNPS^?GrU-}4YsfmLbqHn5^ECsDyA3+y-MAX`xW0S5q5sAb+#)VL)jeuF3 zd6m#`ccXYlR=iq_TL5nZFgh1z4?ZdsAUZ7r!=~|`q=B04J`u?!-1smt2sqR)TmDD+ z01C!-r3CwZdP%fK`zu$p!426pY z`GX?A|J&9#j3FdZ*Gf~RdQ#UUoR8xR*&dJY4}^CC^-aPD0Ds?a0n2|_00@#lSQz&t zz^eq`Q;ocCp(&s?zzqTK05=w}z+*&x~Xg8oZ;L^hJ@d|K3pvM!T0sQWz1=g2Z zK%)aNWTtz>B|Sg@^tf_xIRRKI8Vmr?6}3hNeXm6Usuw^-u$uxv@?tm2zyM)3?;1=% z)00s2!Yz%^D1WN1Fa<3|U`2tLe-CoUtHka>Ess#;HMAfEDN(%37ONltK|rdyXdH6C zq)VLD8o+vO?Ha%h(yG9Upa!Ij%h3@FS`N^k6@XsEXTvKqXa~;8Gr~mXD@!pB&fl1Sm_^__kGVcKe$k{9VM(^ zf@$BK;Nt_)h+9|!(zb0*AOl$wnvLjLS`io^h@^nh^`y=@0AMvpsvihV3~Z(W^t2z7 zXnH1W$#N#&YarRg9IgNqNe3_#FkXV3hk=k%)YEop1o%Pns{xQw4r;YvDR})M0;U`i zSID+@4t5JcE1&J}odYmy#3F3iEkGXv{=^xu)H@+oKz^g0x_AH6|HUtU@xgck9aAL= Ti$dqz00000NkvXXu0mjfGf@iz delta 807 zcmV+?1K9kM1-=H5B!4haOjJdf(4#0bF{ZSqN=iydXk&Agiw_SEU|3KPczDs))(}8Q zX>*T=kf^Y@xc?s-|K23$yX2Vw000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00ON^ zL_t(oh3%Hxa_b-rMI#RgOkDT>|F&D=ZUb?ruhmSOlf-MWC4aDcUa$We74si?+UWi% z(PJ}{-ELR1we;eVd1M#~$UtD88Ad%oV1HqlMnHE@47hG2c;3W#jK7Lt=Mf$mu#jBE z-NvVlcq%{yHtj4(BFJWB0j)&R1Fknz1lU@Jz!*yjmyYHFM1`Sg0ZlQb(}0A)tz8=A zf;J>s3 zyuW3JjGsi4tZnfwul|`gEGaf7s)7z*3uJk-nIeb{nNp-HEb!Dh%l3ihW^FC;4Fx(_ zoRKs)?6%Sud@dllk*OUV8mYK8_EA6uXB}KwT3pDAVI-9=Q^5A`<6s7+ym^IoHu6IUQXKbHO}}H$Q{?^tut%NISDZqNIt6b z;&|qIgSI!j6IqAAIlJQNrFNjtqsc*z&(5+{R5ra6ShqCv0xFUk0Gl-U+i^3HDfp!W zw>EGxFn^VOG`+w$8N>W`=J*I!!xh&%Dt`3gd633wZn%EWeE%Ph_r6nb?V?#c;LCuz zE$aQg?~Q`>IjlE!Y8}P{1sK0if8}?rcQs3^X$Trv-~%bo6R*x)4F0{}46g`g_Bh_a z{r3qYcJbsPFNRP?;*X{jKhJN)QN2LXchtODE`Rl3wG!=d6S_0;oghTK7{XUqhmW{a zS-%Sq5}plvxZ$p^{tPsHG4K+NLE%G) lCm;bS!gbs4hX49={Qw&;F5Oy}&zt}N002ovPDHLkV1k>ci6Q_1 diff --git a/graphics/pokemon/ting_lu/front.png b/graphics/pokemon/ting_lu/front.png index a94820cbf6b3b584320525462f483e681c374e09..1bab02d038037f0600fdf5a4d18dbfdd56fd78c3 100644 GIT binary patch delta 997 zcmV8iERgN7RI05F&8Me8T|p>g~Oms`%}omDi<2FMvTfuRCDVH2r) zYhb;DmO$pQgnv#bYA#iGZ}n3`1Kzj#c(DP@t^;KDSTA0m1BiwI zG^35sI@#O}K+`lpFxC!mgiqh*E&!rsnWhQuW!wXDj#0?CyUWw^9l&SLa<`u55QoKo zp?d)O;J9)1tz(r0(WYbxz#T#RuXVRhG$lPBLj+(N0e^e|W#VKcN}C1uwh}M^0|K_z z8DQ_->OzL)TSAk+cKP%d&(qRXnBY8?*qU$CUv;8ePojtO90UVQ(}hrNA7B8~-v!tK zoG<{q*y6Sg=$;LLxC5BGe7PJkY$L$kEjoZc8A3=Y#Vjgpruj#F27`G1&u4kC@rh5(3QUDqApOhEJCRzS=UJ3u$%5g^}BTN{1%@vaCI@z4l$4#QE0A?l3XF&Ha<>2g}kUIsn+}?hdbAH0Z&180D28JFk=5SXHcOBk#fE+jmv T@k;;x00000NkvXXu0mjfpnc9P delta 893 zcmV-@1A_ef2b2epB!4haOjJdf(4#0bF{ZSqN=iydXk&Agiw_SEUPdBZF(-^+KsX*9 zen&!;bzrZRhW{TL|K21u7g22h000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00RR_ zL_t(oh0T?TlAACPL@gp(@*vp%|J!tr#9?D#w@4*Xm5mM4Pk(cY$K(HAA>7n=zwQzK z03hCu;hzKgh`WT_fN+oS2V#f;w-A(vTTUSLSAcjnGNJGLixAYVhYd@8#6>T$+0Fpe z#|uE;(d?ZN+OvchuMP#u`}b;V2B-_k0aqg_LVPunPhE!~z3}HzDATlAeF&lJd*&9g z2RVFpkp>WvNPoaAr&tRtq06rT>bFFKDh4z)Td-^D_??0BWc8dqMn21DJsgnpIUp(T zv2y@6y9=!RYIXxqB$`dSH9&sD5YJ&vCUI`&$)P41*rFDQk2?rpjn9od(Ya@l%2 zHaDnGevA5224%sDjixLx8}A5I7s4irnEZpLt^iM?2)k-j0>Y+T2CXn$og6GJjS_&{_hyjO^@#vl3y^LkiduNCTk# zI08&5H#tk^hD}d`Ro#3&0!-QEsR9g88XZ8T>v-o7@Iam>PaR8dk}Ee!1SVu2XVA@K z0yX9teAw(MJc&rdkmegSI3iSmEXl!g1Ia700#099(BqBZQ4h}f|MtmYAn#^7zy)Dv zHFh^8z6-GQVrA(SVD?i$-T+MVX;*+&%jGYR7tWKnVm@o;Wk((1d37N3gw#0x0I)SO zALa(o>){IEuaGT(ODD4K@L8@+eh#4R)(Cn*Ism>-<+bx(ZLmZBaD8XnzrKD0X_+W? T`$C6i00000NkvXXu0mjfM}(#f diff --git a/graphics/pokemon/ting_lu/normal.pal b/graphics/pokemon/ting_lu/normal.pal index 008d4a094c..27f96c2ed8 100644 --- a/graphics/pokemon/ting_lu/normal.pal +++ b/graphics/pokemon/ting_lu/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 163 -40 51 49 -166 180 167 -74 74 74 -72 104 99 -115 149 139 -15 15 15 -94 70 34 -92 49 39 -140 97 64 -56 30 29 -126 71 66 -149 117 96 -175 149 134 -255 31 26 -255 222 36 +153 211 165 +48 29 24 +22 48 54 +89 29 29 +76 51 40 +23 79 79 +125 84 65 +143 49 39 +240 72 60 +130 90 66 +143 112 96 +78 138 126 +230 179 48 +189 134 94 +222 188 159 +16 16 16 diff --git a/graphics/pokemon/ting_lu/shiny.pal b/graphics/pokemon/ting_lu/shiny.pal index 5476b7d4e9..ab48521f5f 100644 --- a/graphics/pokemon/ting_lu/shiny.pal +++ b/graphics/pokemon/ting_lu/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 163 -40 51 49 -166 180 167 -74 74 74 -72 104 99 -115 149 139 -15 15 15 -96 88 80 -16 120 120 -209 214 214 -16 64 72 -105 115 143 -136 144 168 -176 184 184 -255 31 26 -255 222 36 +153 211 165 +33 38 26 +22 48 54 +40 68 74 +64 71 49 +23 79 79 +101 148 135 +64 109 109 +240 72 60 +107 112 85 +48 107 86 +78 138 126 +230 179 48 +166 201 187 +104 153 128 +16 16 16 diff --git a/graphics/pokemon/toxel/icon.png b/graphics/pokemon/toxel/icon.png index b1989e50c8ee9bf1f68c1e8229ca2b1b3594ae91..3a91b6de8881985093d0c297d69803aef4483e12 100644 GIT binary patch delta 349 zcmV-j0iyo;0_*~i7=H)@0000?P=%ZT001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJc;oP&FNd%eB1|NsAUbIqiz_Oydq?!}A6tSR>P zDfVJglzYv^q|Lo4oMK{HK|w+3M6_Q3007HLL_t(YiS3lj3V*{e3N^ zH59ULZ>5yzsmRH{Yq3>n7Jnb@dvC9 zVM#zeC%{w9RaRuC1X!Z79F^;kb8^r*#{S-H6TH-RQ)?8+E#2{JaSP=80+9xJ6^Jwl vumsYjL8c#0fplq*(+?EL^n;x9kNxlfIeiqvc3bl}00000NkvXXu0mjfWsjTD delta 363 zcmV-x0hIpi0{Q}w7=Hu<0001qplF={001yhOjJc+n1FbAc(}N*`1ts6aLAyj@UVbb z=)j1;s3`F8DDYrVka)Fd+MxacIYEp!_-<=o{-hcAxkL}ohocmLe?2#x~ zmP>H@ieUE22pUx;dwk45On@ zRAC&{`%ulmK4iRIJ{|hz4*+@Fz+ec001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJdg)1^%p7+_CCY#t(wEGe;6QJI2uAhXP^m1^tE ziM6Su5D*YQKR?Of*k){M|NsA*QZ2gx00Il7E9B422s4j*|C(-_3<^ zsZ@0L-%it+)>hBQ$p!7}^^I@*+W>&S$x}-3dk)JZVq`5b=OIHbCzObGBv$S-#5)v# z5U6~ln+Wk9BQy(oARj5-B2bjvBUB3&fL7Ecz;p;S0Q5c5I)UchEqnsttT&KiPkf?S407!BQF7--ay+t~9=m-!MeytaR z6tVA(|MFi6ot+qz)b$;0%HScmNCGp@A$Gq?5?^ z>X!oowSNdJKsF1$ok-O6Rw2K4j7fbe0DU`#L2ffbGzZA{EM=qa)=u=UH^wId$?m1@ z(Qr1vucZO4=UY2;d9dBQHgF<9S)Skd5e2sZjljJw?paGQ z)xRyeEj+FW&3%%`b#*{ZK4sLQQUIxYA$-!G5h8^UtbI;c|7-fjHy*?f*UK$8Q_e2+ P00000NkvXXu0mjfF*+aB delta 551 zcmV+?0@(ev1+)Z^7=Hu<00013M{Ml?001yhOjJd9z^GUd5HJV;m_RsqARuT^NT7gl zz_6$|FfedvU|(Diq|ho|~002ovPDHLkV1n#t{u}@R diff --git a/graphics/pokemon/ursaluna/bloodmoon/back.png b/graphics/pokemon/ursaluna/bloodmoon/back.png index 251eab99cf5edb94aef403fbe8479b013d700cf2..fc423e8651080682c8c7f0896514c42292e54f8b 100644 GIT binary patch delta 725 zcmV;`0xJE_1?>fpB!3`dNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__0P0@=06Lcd02gnL zEp)*E001yhOjJdg)1_e_9WEdsU{6G!GB15-O__pq)j46>TSWlB=(wYN|96hHsiY7P z5Xs=!|NsA%aDP4k00K-&L_t(oh3%GGj>8}fMQho^pce0cyMN;s#3W?Ws=u*XH7fYT z_hLvMk2~(T<0=5)I{?@E9fOGk@g0CZ033@|0KE$UI9B@!K+@|>K*Rxf!$~oGatyJx z#t;Cm83C)Mv71qq>2l`>U@4^)xkOL`XSNo*5EcZGJL{+PP)4k$qAh=IjT5Bsg3KF0 z5jIp=#!yK%k$)F9$lsPAC1yY=0Vo2ObOk)0Gr&z@%P*uF(IWuh0EwPI1GELyDm2Nq zpjIZ~P|*RFzXyP?AfwKsluyY^sLY@Qlk=QRgz5`Wkam%*5G%DCN{r-I;II`lAX~6` zsZu-PH3+_b;0BlqI^=F^0mY}(-$dY@U$jV%@@hCOR)7D#h6MEo^Sl+nN2Hy65VyT& zeTvhxl>!^mZYnqcxLGh2a88f{O7lTc0k%1O)6e;*Dx}gTc4`qQS{m*w%#E-nU<(2( zs&R;bL;i9hb&CH8!LGan;tq&DILqEBs2`o=0LU$SR(%Rl&uW5-$qL>D=)vMfiWLfg zDFOXh`G2AoxF21#Cm{It8~Fx+xLpLK zO+~v!>Vxo@3pfveAzn)(dj{xnLi+;Ff`@oh=1y-C+asDU3fKTHt$F};!Zjc?*enQu zUiB9+z5?_T3}AQG2a}v4L3jh;r>HL<_*eh_`c3wZJ4XBg%Oox&!-Ajh00000NkvXX Hu0mjf>diQ4 delta 695 zcmV;o0!aPs1w2<}j7_I;H9)_XB1Aj4xjq$olE|Nl--VSq|B z=7UP2dwGktu{YuX000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00JaQ zL_t(oh3%H>sskYmgbQs1gTeQI+cQbLb+vozuLBKb3+jAMqJOLVc>LlQzc>gY`VJr= ze8&(XARhM_01y+5+(jq=TA{%A2n}GF9LHqT0rq4$p`VO?0?=x0NcG%1q=y5f^&z3T zD1s&(=Lo1`t`SwslBg^O^o&@#b;PJH2mmtrfDm#0RFp=Tai9nrAi2+1w$O_K}be0eF$wUU>5>$Yyg041TKUaTM9_& zgkA&tAX6d49D51Q7^s9u1pqe=fNIeVS&VswA>G*O8~v5`2B8^>kYAW zAU?IaS3=h>40t`_2#5+82>otc8yNGjr&lTn>Wrs^Gk}_h0x(K{HdsGXLXa~6=0YgK z+ByM3i4T>KxNRK?(&TG~ez?poM?l!b%Ed0>zc9xi9|Usi&-B**0000EWmrjOO-%qQ d00008000000002eQBUU0A9C7pqX1ORi+z?a|Q)ztti z23*D`=_!3ekMSJLT5H9Ct5sArLr?Liyd(qgF@6n-R*2_R@)HcXme#D)rCBrURy_0q zB7tvqgV#6q9Dg1n!+-%sYijx`J#;d00`01yKg2hgp?&BhQfCsBF??u9^6}3D1<-lL zQ}{ygjF0M(v!YfM%>^Gmo+_|(0e;SXB?ueppHm+VB0s*qzCOypGpSYvE|GHr;>l2$ zfkhG~gDEAC8HNB5R14d_5s36Dg3|FfCg9#F8C00I0tXZH_tr-uqTdeaKV4&308}G2|Xlq4_bha2^?bqSpNBZfGv~QP=ZmaW;GpI;@Z7nl1do#d#MclYH+&LMebU=faTf_Z zfK=6Q?*zc7)F;h5pJmTlvnPJva~vr|5Jx2BRPL@Nk>J5@s{V@Ka`hgjn1Rk%3xPga zuYZ`KV_KN@4PEL8)4*T9;P|;Gh{t)y*Ib5x*)^vte#9giQsj!~J+A_=4q z1HfxppnU@tL60CK9TeQv@=;wH&H8c1G=F-`Z)dP{^x(etfPr~!OyEPo>S0`wRRaLMllsorM4Z002ovPDHLkV1k7%`FQ{U delta 1117 zcmV-j1fu)Q2=WM!B!4haOjJdj(xd>w2<}j7_I;H9)_XB1Aahkpq$olE|Nl--VM;hL zlyz#Pp`;KH5Z>P2dwGjus#ik*000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00YNK zL_t(og_T!{mZLBXo9)yg4jBLc->&2w98*f0x35DfQe@e&*?*s(PnO6>k6j{Up1-6Z z!i-mD8eehaJN#^mgF%;NvB1yv9RcysO@akqQPz4+4j??+8@p z7D30m?+GHkamrsWTWqET(*Y-e4guYaD+Xh!Ox$0&Pk+U4_2`?Kmkgk=N%4VTZA8$D zaz~(73MBti8gCs>1^rTYkz6s%tlv0GUSY9+b7M>9WjS^CssVZ;@IgRfuL-*7S;?z^FV;4+YCJZ1X*SFhrAo z(N|DK>VM*oN7m;PM(P0@gwbrHF9$Z+Bn&6A~#m}BsB%v7xe$f*Uc`7SAL)YlZ2I>+`Q z5mxabEws^&>PSSCqz_i9`<$AJ`B4BFTEWC0X>&EvO}@S8v9FouQqYZdc-B>EAnWkv z1ApH;7{^B7+1J7s8v3_+v*89l(^O_d57WU`U*SUX!zmvU#*&<^WP{vttYw6NoTsv` zyW2KQ*a#Ng^0ADT$#;|!Wz_X5bv?GCk#K1z$xxK3&9^9PKw*)vV-wGnr+$59l+{6rfBEJ#y?z0SbOK8F#RK=t*p=>2^LvV;!2dr;TmkqS|2Y5v01jnX jNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf8{Zdd diff --git a/graphics/pokemon/ursaluna/bloodmoon/normal.pal b/graphics/pokemon/ursaluna/bloodmoon/normal.pal index 8eab07de45..bf8e1e5074 100644 --- a/graphics/pokemon/ursaluna/bloodmoon/normal.pal +++ b/graphics/pokemon/ursaluna/bloodmoon/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -0 194 8 -238 80 106 -246 125 148 -255 214 123 -49 40 32 -115 85 74 -164 40 65 -255 255 255 -78 78 97 -74 56 49 -148 117 106 -164 161 164 +153 211 165 +63 43 31 +46 32 32 +63 63 63 +109 73 54 +117 98 60 +102 108 106 +213 57 97 +177 126 99 +62 219 108 +186 159 87 +255 119 142 +146 147 142 16 16 16 -222 222 222 -123 121 139 +201 224 216 +255 255 255 diff --git a/graphics/pokemon/ursaluna/bloodmoon/shiny.pal b/graphics/pokemon/ursaluna/bloodmoon/shiny.pal index d8a8e8ce56..2e5ac586b5 100644 --- a/graphics/pokemon/ursaluna/bloodmoon/shiny.pal +++ b/graphics/pokemon/ursaluna/bloodmoon/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -0 194 8 -238 80 106 -246 125 148 -255 214 123 -49 40 32 -195 99 59 -164 40 65 -255 255 255 -78 78 97 -128 74 52 -230 131 90 -164 161 164 +153 211 165 +97 31 29 +46 32 32 +96 79 68 +159 50 47 +125 104 77 +153 130 117 +213 57 97 +218 91 69 +0 191 232 +184 163 124 +255 119 142 +181 169 164 16 16 16 -222 222 222 -123 121 139 +201 224 216 +255 255 255 diff --git a/graphics/pokemon/ursaluna/front.png b/graphics/pokemon/ursaluna/front.png index 954e6b8020eb41ceb176a1378a3d02e0859ac6d2..f82224dd51061cafb9496e5ff89ac1aadf66630a 100644 GIT binary patch delta 938 zcmV;b16BOw2eb!}7=H)@0001;w}I>c001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJdg)1@vTAU{7pLoX~`L_Td@PiAatB(75Rzo-LR=VZ+c#Lv6#6Fre;5l+Ly06A&eAi#E`H(2ZI5eXRKu*y_e*{#jMhK_- zF@+-ftG6urav+csSlF1GRQ2FTUIrWe96;1zh;3REND z5$T$n0RW}QC7aBtJ+Di~2v%@bkYtg1d(NPwqKpy%naZZ8NPt^qDZvtO;i7Fz0g&gA zoIsqI`}~l9)_@BqLzG@3hMv^+7&|KhQIE@>pnom=H-c^)(wARG%&G$2R`u9#tTEb& zqe||8WI3X(1(aP8ZFwBu5<1(boVn|TDSi8PDi*i~`T!tt-9vT)>MyrWbzZ4gS`xHo zCnyA*pqBKd(-)>iXJ}jjh%pEN4)9ykmZo~C=V$?&FCh#I0T|mOk0+l1f~@VT_ALM& zlYiw2fOov#NzM}hqsRbA+2TTGMtfj-@v`alK<>BkQEil{_R-bscyurUWK8aU^t+G8 zLk=-vki|#D{OQ0K1M^(|gH

    Us4MGJm};?u!ORsZJJhv?1&I<+n)~;#KcfTi@MJ zKh#!eaTm)74_^iEG}U{^^7kR&VGMp1@gqso8Z=-(K5D!e`hTkZ0pylAZudO7M*si- M07*qoM6N<$g71{E`2YX_ delta 986 zcmV<0110>l2jmBk7=Hu<00013M{Ml?001yhOjJd9z^FJNARrhRU_dxfC@4rkFmPa4 zn23N_SWvLAum}hUxR5CLz(Dx;_>ho@0002=600VDHL_t(YiRF~BZrfHAhAANi z3{Jk1TmuXOSfZ^0Mi=qOi!({SMgVoGVUPxbwnI=I72FckynkXU_=mJ#1DZ|oDa%ss1hk;caS~uy{R+)e{v>R|EPzI=g<==X2ukub-Ln!Uxf2ABg%C;w4E#b#e7g5Dpxan^Tm@(o5f|ESpZfbM z$N&n_BAtkpq=ei+e4`NO9wm?+)}2Nt0iGb@DHedXlz*(-u$FjGV)UDc$61qd8+a$d zSz&;6^t(A=)Fg>5c3DveiH^Q(=78W9T9jhDqxzVxu$jlKRqsy;aHh3RkOF-SyM8uk z=YACZ2@FV)%6Nj|Y6esuNd&q_i~`V<3>@$J#t(g0J`Ywx|I#`f%?7( zc!>I8D1UpER4;?)Mwe~^2m($h!emX#aT>GSCWn2s$G|o;XaoevMgi#TT|}2&3T*Y! zcYP`4Mo-KKRSmz5qQ7`IX`%$6o)93%8DRhZ!^L~VE~`Qn_kZQU^8z6{=4s)XD(ko5+n^ z+K3)Ipl@-5p8>zoq^Hw!xxo(Ti#0AFtV#xq1?kiChIoAv1DXp6k>@mjo&It6oSs^| zQ4gs-UduUPnB#j>QAq*HAM2i<1BOYlioo)&pd(QL7Iy1#Vd|kj78Bw18CcE^ok2&y z;(rq2q_4#WotNa`eFm@xA-bLzB`??9!yN?VSSNs;DyP?h=lr_)g3TGSt^3bwz{}Cq3jz#nier6jB;UK>$JwVO zg*hA^4M#~eO~0qfmnwKS`;_*0cJ_93q*LdK7muF({EQ%cr)Tpyn~SqdH-=Y7bRE*G zWfry~|7+;s%Mo3(!lP^J>@AfT-L6xXS7-Xw?K&G4?f>)o2M?r+-6EnFVgLXD07*qo IM6N<$f@eX`+W-In diff --git a/graphics/pokemon/ursaluna/normal.pal b/graphics/pokemon/ursaluna/normal.pal index 91b0d2bb09..868c512b11 100644 --- a/graphics/pokemon/ursaluna/normal.pal +++ b/graphics/pokemon/ursaluna/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -120 192 168 -56 32 32 -32 24 24 -96 64 56 -80 40 40 -72 64 48 -112 96 88 -152 136 128 -88 88 80 -176 176 176 -8 8 8 -184 144 40 -248 192 64 -248 248 248 -144 144 136 -0 0 0 +153 211 165 +46 32 32 +63 63 63 +67 47 44 +92 68 62 +109 93 79 +102 108 106 +36 174 105 +186 159 87 +242 211 109 +146 147 142 +16 16 16 +210 207 218 +201 224 216 +244 243 245 +255 255 255 diff --git a/graphics/pokemon/ursaluna/shiny.pal b/graphics/pokemon/ursaluna/shiny.pal index e22b15d0e9..050bfd86b2 100644 --- a/graphics/pokemon/ursaluna/shiny.pal +++ b/graphics/pokemon/ursaluna/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -120 192 168 -88 16 16 -48 8 0 -152 64 56 -120 32 32 -104 80 72 -160 128 112 -192 176 168 -56 48 48 -112 104 96 -8 8 8 -192 152 88 -248 248 200 -248 248 248 -80 72 72 -0 0 0 +153 211 165 +77 23 24 +96 79 68 +108 30 34 +141 44 41 +177 84 81 +153 130 117 +32 179 204 +173 149 106 +235 204 137 +181 169 164 +16 16 16 +63 63 63 +201 224 216 +102 108 106 +255 255 255 diff --git a/graphics/pokemon/urshifu/icon.png b/graphics/pokemon/urshifu/icon.png index 28f64a50ff0b93a3e11f7d02adac40305f27ba65..a894c160b80e2d87d541b475f9e60779d6699e0a 100644 GIT binary patch delta 447 zcmV;w0YLtd1I+`F7=H)@0000?P=%ZT001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJc;oP&FNd%eB1|NsAUbIqiz_Oydq?!}A6tSR>P zDfVJglzYv^q|Lo4oMK{HK|w+3M6_Q300AsXL_t(YiS3lla(}}x2!st>#0B2}ZM%z{ zjBWjNdT6JIXq?y+)(b-9JC4u#;mYI}ZuKw|1VWLbs&fT`%Fil(q^Xr)nZm*%Xd}Ix zyD(ELUKVsoGrLGCHN!|Ga8RU!B(DzXsKC<1y2H8gi^N;HyJ*^2X6c(ZUMg(IF}%z^ zxi`mynmu}vO@Cd4iC>$sXL^(_p=h&&vDrh8gdkxZxF{I=&3(Z>LIcU*Fza^)yG^(7 zHaRi|;Goq=^@-qh+>zYw80W7T7@p;Ps;W*DvKpAH(O$8dsL%Sd^$!6ul=1|~ogYPz z8$h1?pyeGP13&fvp?U|9PLK^iIzcu7=>*vUqzLi`h&W8~(Cs@w=6HbQ1jqsp$LWAB p&Huj_J}hP?Yhb?NL;eCEz5vw~7yx-nabN%d002ovPDHLkV1mva%8~#8 delta 386 zcmV-|0e$|>1Caxe7=Hu<0001qplF={001yhOjJc+n1FbAc(}N*`1ts6aLAyj@UVbb z=)j1;s3`F8DDYrVka)z<_PLYMyGnomXsghWQmc7N>TS5<#^$W|680|usM zTLxOgZJF^T4Sy@?d+i)53PEzS)~;o&osT%)HMj=LRr(A}Mm|c0rEn9e?OLy?D_I(! z)zI#7knLs1b;PZUlYCr63pBl!G2<+5^?9z@#2$-q-Q3rlwjofX8}W5*o_(Ipa#DG} zpN5>qWNyL33;+NC07*qoM6N<$f)ty!6#xJL diff --git a/graphics/pokemon/walking_wake/back.png b/graphics/pokemon/walking_wake/back.png index 7fb2083cb903f067729f87f4ec5dd40408f12f92..5db0247c689da90c05df3bc6e054519c3927ed7c 100644 GIT binary patch delta 880 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 bPtR^Y`hQZsr^2Ww00000NkvXXu0mjf+AAf& delta 1037 zcmV+o1oHdQ38Dy)B!4haOjJdf(4a1rr*rDw8&+H=e0)+;Qum@#HNx8v5D@QOYo%wW zfk}Q@G->|UHvIhjy}i9$*o8&_000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00WUp zL_t(og{7B`cC;!CMP+~zC0E}6ZNHNQ7zVxSw5*P`mb3FiB7e-X^x@p{r{P{N{}+9D zz5YfR0P)v)r-b4Kb%zAU{ zfh=9nLWq%(58#e@z^(J~I?R|_vblnubBA6sar1GQy)QtQ(1B?Y!o2k~HN3Exl5P+~2 zDixrC(7bN#-rfq#Ui%&9Q?rYdYY0)VwB=Jk&mS}NV!kxLsp$=nw^lz@&mVe2lr+R` zfT~x*#`&#B;`2PXlre8wjVPV^*OqIwnjXoc1Al_WTx`3glzl0EDaioCY-}{tsz9uf zFs0hNQIU6#WG;;amb8^g}(o2skLAHyeX4QIi`+UPBbBQ~kV6Q;w z*<<7j(HHHvbAWfHIJ}%ILJ4@=CoceB+K8Gxxz4XQu_fCx0=EW0PLe!B2q2fi`KW%- zQGc(22q6oCRj(D?0b~Bp^%a10s(ruMVZ{~F@Z0oAM?EITPQYxIXBLyRLAgF|X`e@{ zQ}G&MWBKIFQwizd^E7Zmc{d82K;Gs0COADp-4J?NJEw2XnrZ(CfXwy@-T+i%YKMnA z7y2UU^ti~2up{-^&6k~n zq47gWI0wCc=6`(ZcR^swk~7;!8nsoeyDt_4$AevW-r^5gu+1NDw=}oW2$0G_{a^}B z)5I(#zYLUSK;P;z`xMnQ>7g3^a+aP&r1=KDA z&GC>LYPapbT|nzA`AsXOkM;M>4hZqF0kIF~`Ar!@_!@9RUq$3cdaFGEC!Sz^h*4iZ zQCloO4|pf$T|fXMu#%rYQCloO!?Ml%4eBHTQr^T;d9q%1z;A$j5Ddr!k`h4x+F3Y% zJ7^?b3)qkV@qZ|K2Hf}Rlt?cG0VLJn&vC@#C#%GrWefPdQnP%A9~(y*WbLR@f qZR6B{e4kFnf=z_{ zagw*^fZ6Z>zy`3h^vWM^B1PK}W&lBF0v1($769S_rE&Ge0B{yYfCZASkr{xFkm6{= zWEN~9c7F?%=rh0y(YIuvTnDon_)Mq}1}FiVmxX9s)_@wx!vMfUfUDedLVu9YM`vUJ2*Jr+FtBkSGiMCa?0srv&19(I@rO?(;-T(jq07*qoM6N<$f^0;0cmMzZ delta 957 zcmV;u148`q2Ga+SB!4haOjJdj(xm_Y|Nngew7$JTL@A_~W7x@#i2Wy*zohe|7ZcWbH2xMg9ix=6;`^is%ZcK;_9B@&pi7 z8FD(&e+$?jQhx$4U1s+H-?t~~8&ok)08tBs-2s4I?*O=b%mjI-qgKK@*`PmOaPjr9`j%Fi6l&u@`|RQc@p^s6o|6HS4<&}>}V{3D6@6cdu*#v=((4pC z8~{mzjelX0DhO8{vICfe5LYxFRcH&qhPx+T9`%Q~<77Ad7223jwWES^igNrmufqVe zYae#NNB|33vEM_8-`)Tx0-I?8P|X-}S14vF5a25z?F$eYH~<+ypqrPsY*D0~^QW%H zV+aAp`i~e?Kl!!g!z=^A_!q|=SPKDB1IDpeLaJl1@uyT=WFbOW1dcupO9EE?iI8Qu z6Ms(XAYdtjQyw#T*$k83@)Os?K$Sryb2XugU~7h*0IIviU87mSOr~3cb_E#eh-M7q zw>#ph*lIlh00YoTL_t(og{_u>mZLBTMU5sl&MN)?zkglcgJ=?CJA2ONbgW}} zS0I2+)901K7X#Wn8>RPe0PjbuU+LBC(e9Uk=SUs!B@rn--pQ_i@gu#T0aL&a{{+Y# zAnAHevIE{~!1Np zBJ#uh(|>-at^+FlKJTpq>auD^~i4nWbyv12#f6fM4;X#$$xfE6>X@jOFZu`*Q-kS4uA`&DIL+# zhrsKFyrA2ZFaj_Fo2nK=G=h{#WZVQ7)Q15;#Ub;A7yzOX2uL0q^dNNGpt2lNIFx_` zVNo~r%0eJFZAQ2O1Q}y52R0N_h^Le;@fO(muyH`YjnTW%7ydza<~j@ejwE^rH+|`5 z?|-Ole}%A~P6RE@F@VjO3m_Iim4&O7<{khs9_{vako`c2<*^0m9^L_ww$Z-K1&$aJ zqI7`17bw$4(piFG2877LmxT;!%o597nhnqrwC&K&SnNm9wTSPc<+5z%7%+)F8V#an zf<*g(&5S0NFvfuCdbZo+=|uqZh+J4ri+?-=I8nSAQLbow@d<5-bcC*92us+4Pa;eL z_P%f{4i_U0i&dfA+gX1K_F4r}89rh!j;w3NxZW7uE-cGyalk8F<4e3AnTQ(D*Ro)C zFMK_yRp000nlQchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00fvx zL_t(og@u-jnyVlTggsl(Pzt{P+n$+8P_*qX-Q`SAA>CyB>gjT>1-OOT&~?y6V$DF8l##tvw#Lu4|qN z1WYEhwtWLY4Ie-b#7U6;04#=Qnh2#7zZ5@O(;XU+W`Y3e^b4(gFc{_eq_9-~W&~s# z)Y&Wqi30|t(|-iIdLsb+2jN~xvqmyiwvj&v=snzq0bcW z{M%;$0s#U6R%;Mw*SKI?_%|BN_7(jsSlM}a}e?QH0!ECq- z09>8`rvV_%L14jf3yqsxS0zmvE|^m6G=PA82H4g!Lx1k_KtP)jh|>Uij`3pzZ-8Xm z*0)DO!es{}YWud0;CuA3xyXW)W&jp87?E;T&We$cTHBO6Zu?6R%4Y!cY{iY7TPKpx{R@?wX_>5uE zLI~KC2mf#(Aa4Lv5#{w+#6Ur;>O=6ADfXU2?mp#my6Ul172;_?Sk4)Nvem=bx&{*i z`O`aWdRhyY3=iGc3V--mq$_zs?RH1Tf$ z-^q=Tuwrb%q8^!0aOoEl(!C)tc}+fy3}Qw<1xQyh8U>7CJ>I;iC1HO)DjEP@d8J94 zRQe>`03|7FjOCEr1e640%BVXcMV+GkH4AVHP9bj0H zj(@Zj;a4l*@jx#Wb(0hgQMXc6VVG8Q;#D==Q!IcLZwlwh z1q<$nK%);!6u4O|O*J>JJ+$NDZhs#SfyUx22#6=o?x*#UOO46^d>)M{N%yuci6ahx z{iSy^sP0Z^I_!^Rwjpkx?Ehj@a00*|x@bXqx21goj9j*WT?Zc;!XSEf!7#^7AgE8(-PxrtKoj(`PFK@%{6kjLi4}#Cbj+HFd`9u64p=Wj62oJ!Ps{jB1 M07*qoM6N<$g4wTNDF6Tf diff --git a/graphics/pokemon/wo_chien/normal.pal b/graphics/pokemon/wo_chien/normal.pal index df9cd0fd2e..4192e4fb24 100644 --- a/graphics/pokemon/wo_chien/normal.pal +++ b/graphics/pokemon/wo_chien/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -255 255 255 -255 125 0 -180 190 189 -65 68 41 -82 129 57 -74 182 82 -139 153 156 -24 24 24 -82 72 49 -197 157 90 -123 113 82 -172 141 115 -41 48 41 -74 85 82 -139 97 90 +153 211 165 +17 43 18 +61 42 41 +47 59 51 +66 49 39 +51 87 44 +99 74 68 +90 105 93 +128 100 72 +100 148 72 +125 138 110 +245 138 44 +161 128 112 +201 160 104 +16 16 16 +217 227 194 diff --git a/graphics/pokemon/wo_chien/shiny.pal b/graphics/pokemon/wo_chien/shiny.pal index f2dddbf0ae..4db6959f2e 100644 --- a/graphics/pokemon/wo_chien/shiny.pal +++ b/graphics/pokemon/wo_chien/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -156 210 164 -255 255 255 -255 125 0 -180 190 189 -65 68 41 -164 151 99 -216 201 142 -139 153 156 -24 24 24 -82 72 49 -255 79 97 -213 61 84 -172 141 115 -41 48 41 -74 85 82 -139 97 90 +153 211 165 +64 55 28 +61 42 41 +47 59 51 +97 30 38 +115 105 69 +99 74 68 +90 105 93 +156 49 51 +163 158 100 +125 138 110 +245 138 44 +161 128 112 +219 79 63 +16 16 16 +217 227 194 diff --git a/graphics/pokemon/zarude/dada/icon.png b/graphics/pokemon/zarude/dada/icon.png index e3a39e36d4e1f3e37e9c77923e17fd02fea32ad5..0c3fc4c42b58c2741eb9d67d287be355e9e148e1 100644 GIT binary patch delta 504 zcmVl=i)( zTK48C_V%pR)oSKSDPm$;K|w)jIel9I00Cu5L_t(YiS3lZ5`Tjr3`Bv7dNKR|f7@&l z6rmn^?Ud;#m^IlTeJTCO0G?O=DC1#qdk7tR@i>Nf&fq136U=E~ArrYI54Lh)#B%6l z+aP%q6pQH%*!F!giXw$!Ucva(2@cI7IEs}pKVzTz^1(Q;yPKg6(efG=e;=VZd!b7z zMCcL4R66I{1%G&n=uc1zEUq~#1bk$I%BjVfi93OHT`98^Se6Q#+m=}deQ80MK&`g0 z4Y3T2FU)ZE5S4UNGE3>KiZn&*n$BrGn}#>EO^UAFGxdUWZ5Flub(&|1c>AV|!X0Sy zE=;!H(o94p_!BRM`B+8UcC1{PK98pSkFUocAg5vk$Z;f?05aB?0W!H90V21fI{}3J zxBwIXsvAJaj}tH?$OsVUhx7!w0mS)nRq#|jKstV$1nB|N@#7*$xORZ_unmF`OvVTE u+wmg^GVr12Mv%fAYWqy2}8}mi0G9YQY8Z|5?U425b#DRM10%X8t4&QL;GF57Urg%8MWVz zb*_GXHF!egTIS{M8EK-hri8vjdq641kdmP7&72N6jp%}t2pnier%89;gq0&FffbRP zc1AZJYYsBw`G3JV_NJ9#7A(JExnOSId&A9noeKx~TO>m+9%++j)AFKd6$NyutyEqv z_vj$E7EtyemjkiKG%#q8D~=Lm@AFEeobpaG9E^*NGK1IhxXzo`!m;`1=Vvh0#|WnS zs9;7P70k^?1yi?E!EC>Q+1-2;F!tu7fXO~ecLSK@gJ)8tfU(^@94XKUMts0}16fcI zFxkiDDI2>i1x)e*kDJm5F=roP^~z;9Eo%>V!Z07*qoM6N<$f~3IcRR910 diff --git a/graphics/pokemon/zarude/icon.png b/graphics/pokemon/zarude/icon.png index 58dfa077b403bbc2754af08ea528c0244d8e540d..cd17fa5f093952441ad507c249675db769af0cd1 100644 GIT binary patch delta 502 zcmVl=i)( zTK48C_V%pR)oSKSDPm$;K|w)jIel9I00Co3L_t(YiS3lZ5`Tjr3`7YPZ)X4hZ<|em zBGf~#oiZH_WDQHSuaqAd!1FAY1P_zjB5c?t@|f}>;6=ayYZ-XTMIn*NmQ-fEh6Sz3 zRKWz*b9RH}o6JU0wKB~s3oL?y!>TBb8b((I#2!AF2WmRL3)Hr^j0$QVH(E2eq(apT z)XD=}%y|g#Qh&9df-=jqW`lxDE@%ur&q`i>-*@YLl)$z%cFh&uY1EGM`Se0IRF3v07*qoM6N<$f_t9Vw*UYD delta 488 zcmVxff3OwH>XMlS|qe8syX0|QiwS1Z4LB@t)XFGuZ68?H%1M()VcZX z&B#T_wan|o3(`t0DWUJsjwm?{DGA!%Y-z-GL>HVyV5AL=t8UkXqa!DQBavHoMmHZP z4l?8A(K+^}m49IlEWcqmFgNeL;pTG6g@gPpk|7r-I_KH6yeL{l0bOb@aB zls(AhKxH$NrLQsUWt@b-bsdoWwB9a@LC?%dGlI0Hvjzm45s>6z*HX<%;KYh zx%;SK>UJs^{03%!_c4RH`zTxK58IFq&XY+U<4b47$?iH-o#YaS?%f`6)h&q#!%~c;c001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJdg)1^EkNjxJ-Uq@VFI(Ug%zMF5kx|`1S?rddQ zX0x-q&$-g00P8GL_t(og{7B?a(}BZ3`H4@W5!11|3CL> zv5n*fUWlfp3GqE#EirW4rUAjc2_@!B7l2P&9>S-@w**~Z6t!EycsNauONdvzi`;wz!V`9cn$LJa`^eNw>n(rC{!XDFCk zJx!}30IZngjem1T0GalKC+}QFUZx>qk9d$vV?4KuUxW#QFDmkFLj+k=)DwhELx(_7 zYm-1T&MpQ*kHFSqkmb1#mqfnl2kA$3Pe|*If>-_hO$l{CMgr-%o}Q5$;Gk%I8oNOY zQ8zHdNU0GH-PNGrQtI@w5>a+RYooj=@;ySFTc{$$Fn=M$7%Ko{JSGGq!48liYOp*q zfM%W;hr3l-K=`0<2u2gw+(euLkZvYVfRS*k_XLcMU;x+yz_oJ(Fd{Ai0YPqy4PgMm z=Q9G7Py@8H69XOqX#pS;peG&xu43#TJ*Odj24M;y%ZR;`N|+nyzsZwSD&ZRdj09Nd zw_$P?7JoWD&bqiJ02S6(aDM<$HNnc6=q6&{Z;MbGA`Iz^SaKtE5mo?YAlj7NMB#l7 zi<;Pp!Z!fhkZ&x!2ZS}CeH$>%wTZ=%4rxw!7)IXD1MlfM#oSFd{0AVBu0@^^?7ln_ zLaaTPzg!BpO~6%wc@>H{#L{^-5$$vb|LoXXD1Rz5Jc-nX&;vSx>aWo0rNpl+pnrOG zS$H`UxN2nKA`E~H(Gg6x^27T9Tc}B3p95|07a~-EO8K~H4%LF3>h$!GTo5J$2$1-| z7A*ir00e%xr|*A~DUgfs^@)rM;PDAq^`Xmwmh1lqz?(=jP*0U5sstPXAd7W*IOs@#?=!}#U?T1RxHYru?=smCp$bp8w_LY`$Rn-E9>Rvv_9v}t? kkU0Z4V0;RizFHT+KYWH(V?G%VQ~&?~07*qoM6N<$g0ok16aWAK delta 1177 zcmV;K1ZMl?2B8U%7=Hu<00013M{Ml?001yhOjJdf(4b&2cwksyuyD}$`1sI};1CcH zkWi?Qh>*arxHvF4(9qCWKv=M7xQKv=@aP~P$yjOt00b;aL_t(YiEWiZi`zyN$Hx~R zeA2L4E57V^FjLiM)A7N&nO!xILx~8;@*Xw_v#6(qg`!S;P=5)iM&px1!(xfzev6R9 zlJ8K;QX$HGfSmf?jMiQ|nS+h>e)_-vd-FU)h+dSM?@n2gZ!OB0COQS@UlSH-F=hye zkG%C!yhX^#Af7X3kxs_B=S{u_?3mh&O-Kg?JkL4;tX51(YwmbfVSr-^YDe&SVgT=3 zK#ZCv-pG|10)Nao&Y>%8U0k?QW+RWGUF^uQ*9*Rqu+9PKmuvEYAC=qUypVDkOrhd_ z=9ZkhhrlyFF61f{2@rkBKX8610RoVr$aoF}>$!X^4}jJ)odG%tL_F_hW3clyM~`C$ z$#LaV0MPI1i2%In;xh!sN!*8M@D%7}+!U#a+>WH&h<};fo0xHJp~)d{Be@bH*#m9a z06Nacx!ucUp6qk9GrlVV0crPu7PEIxfn5;@Kn^MMJuo{2hP`(P$V6IC0J(b1z=wU4 zBZ+r_JOJJ~J(FV^5o-_NMi>F=^m2+4cM(pk1~LF16^72~L^n;YY|8*81joBJ3?22d z0b1rC*MBixegu~3RV}%Gux@D&g)9t^nY~IsssddXkG+OTl6xW#tB+}c?Q#nPbT%fs z3@*z}HWp!he^ua~WzEDCo3|Jba7$OENW_2lS2gyw8M+Q^Ef7mnqsoHbo8@bRdhrfK~a zf4dm~Z8X>rE=rBqbEOsy;2Jf`n&)H&=gT z{C|QQ0AH4QNa1*cBkY_FqDs8^Qh&!sd@{sdhnl$c%wlYCR#ktw^$8zcO!_#GZ2?4n z%9y7GSbVmve!Hw~XXGK!sX;=Z1L_!oXpwGy`BJ@~0}eC0U6VEti`&yjfk-TBq11bu zd3a)OaX-SvwxT9Jh-o0yCRGcnZvYb3IDb`JrEcve-X&oQ5*0{jK&>%85L3KW;%Gjh zqze)PB?fTJx6?Jm|B3MgjpNAn;OgeGm82e zXfKq4G6Q%(wGG?yX*U3xc5OT%I%%cj!iT!hCIWWMoC%G61R$GOl<<-GF~c$tfPW+3 znb`BLjb#YviYhn4r!>Z8TWti`xqWR-E!@o%09D_?-32b%>R;mh& zzz%Sx-;=g315&)$6Oh*T!6b8DzcPT9h_4@RG!b=41F#=S189l(=7p-jXBS?hU7ceG rKp`mc?~O`mH%tg%CdVr>wf+Y)ITE9lA^G+c00000NkvXXu0mjfPf;4y diff --git a/graphics/pokemon/zoroark/hisuian/front.png b/graphics/pokemon/zoroark/hisuian/front.png index bf4e40c15f93ed019aee2a70057339cc895a2829..5a27fa4f55f80f7eca1064b636ed4204f99f98ff 100644 GIT binary patch delta 1124 zcmV-q1e^QI2<-@v7=H)@0001;w}I>c001CkNK#Dz0D2?<0Dyx40Qvp^0D$QL0Cg__ z0P0@=06Lcd02gnLEp)*E001yhOjJdg)1_Yk0!mF&Uq@V&Bq`N8KC?|!@N;(d?rf5c zmb0_F_pGiE5D?VX*8KeZ0000wNv0S800YcPL_t(og`Jm+dVhl;422sSb-}>{@olYD&u_>Ld^}zaX5NqZ<*oPfWm#OuJlXgbA?t!+I>^ZezP`}cS{;Fhs|$_s zjRCc0RRuxyJKHw^bjJ9X+zA)ucW#uNj|AZslwiH{M@lK@h z=OJS-3=*d?B1! zB_^Nm^bKI=O&wb)^Ohmh8XRGV$NE$Yfn`4Y%&nEq*qCq5o$ zJ(g>zSerTf+S?FBsp;?bO8_Wr4;hUBI5GBiW{%kZeA7|LpFNmB6Ayp~&5HELNVAk% z!hZmO$sOQfa3dBgAF(hX5+i|P!+<$7z~BO+5|6b9NUH!#1Re;~nu2yOlIgWsLR_p1 zA@{w0r2Sh`Yy?_%X9IxA6E*!5di0Kh0Ra` z+8a-@&w+L)@AHTpyer>F?~l6^E-!=;%j*)`tI|NDLPG=2e<(@8Lk{bd>e0000*arxHvdC(9qCWKv=MFaJay@@aP~vJcnff00Y)ZL_t(YiJg@}i`zyN$45QP z!6ysZ@u`6t=Nd3W?6Q>5U1p7wgCSWDg+gIm+p}7uH7pBOE`RkUMwytBQwZ_Ruw`Qu z(3dFqP(+Il&CMqpZ7^XzK@OeK#7?A%`>b*jtyCGhB!9O9in#OgRRSnyyIX<%oQxk# z9@OGa8`ZN2$mb65q&7(?fP!szk8)Ubu}}0)y% zGkc1*0`}l^*;*PE8Mo!@^}IKQjb|ozw{B}Tg$#bXKr(LkIG^-3P@J3NU5U0V8J;bT z9<$jcpS-4?DS?=mg@FX@-wboi05dtKeK9;YqeinK0FKX)=>R57{`?iZx_{+F`*l#r zhJQeXPctIm{Ivt#+!s5u4PCw6Iy5Ry=8f2R+*{NBCI+;PikfxQcP@rvErbMmAH2&5 zfQW`OtM<@P)P?v%1it0YcTK2YK9FIe+OA3g@BOS{%`MBPAl4`V7sFKr4Oi=cnNGu^ z7V~LlFBWIESPg7}Y7{^wSd{@Q0YJa+@_)X#8iwTz)fM)h#sJIj`OFhS`9B56LY^1M zd8`J;E@e(Jo-&%5g0_$@m_1J8DVS`_gkkMEaD z;Ws$u)Kz!#iH^Ag(gPkp`LqgWj`=Jpp;r5=Eg%(VtMAi*^_LL4U44;$cc5?0+&d^Q z^xPl~P^;%hYu4Pi<{&i~jF#Zsn!_Ew6N$;u&;Hs{a@(8#0M`GYd6sU1RR91007*qo IM6N<$f_B#ir2qf` diff --git a/graphics/pokemon/zoroark/hisuian/normal.pal b/graphics/pokemon/zoroark/hisuian/normal.pal index 16e1aed003..a95fbe674a 100644 --- a/graphics/pokemon/zoroark/hisuian/normal.pal +++ b/graphics/pokemon/zoroark/hisuian/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -144 24 32 -96 88 96 -216 88 80 -248 248 248 -224 144 144 +153 211 165 +95 0 2 +74 77 83 +95 71 92 +148 36 41 +213 58 62 +179 77 84 +240 115 118 +246 238 108 +146 141 150 +179 179 187 +247 172 174 16 16 16 -192 56 80 -144 136 144 -192 176 184 -56 56 56 -208 208 208 -88 64 88 -176 112 112 -184 192 184 -240 232 32 +212 214 214 +252 252 252 +0 0 0 diff --git a/graphics/pokemon/zoroark/hisuian/shiny.pal b/graphics/pokemon/zoroark/hisuian/shiny.pal index 5b3e2797a5..e6eaecfce8 100644 --- a/graphics/pokemon/zoroark/hisuian/shiny.pal +++ b/graphics/pokemon/zoroark/hisuian/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -96 48 120 -96 88 96 -176 112 208 -248 248 248 -208 144 224 +153 211 165 +60 35 73 +60 35 73 +95 71 92 +97 58 120 +137 90 190 +155 111 185 +186 155 206 +246 238 108 +101 89 102 +179 179 187 +207 185 221 16 16 16 -144 80 168 -144 136 144 -192 176 184 -56 48 56 -208 208 208 -88 64 88 -176 104 184 -136 128 136 -240 232 32 +134 128 134 +252 252 252 +0 0 0 diff --git a/src/data/pokemon/species_info/gen_1_families.h b/src/data/pokemon/species_info/gen_1_families.h index 6e8a4324f2..9a553fee5e 100644 --- a/src/data/pokemon/species_info/gen_1_families.h +++ b/src/data/pokemon/species_info/gen_1_families.h @@ -8071,7 +8071,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .palette = gMonPalette_SlowpokeGalarian, .shinyPalette = gMonShinyPalette_SlowpokeGalarian, .iconSprite = gMonIcon_SlowpokeGalarian, - .iconPalIndex = 1, + .iconPalIndex = 0, FOOTPRINT(Slowpoke) .isGalarianForm = TRUE, .levelUpLearnset = sSlowpokeGalarianLevelUpLearnset, @@ -8183,7 +8183,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .palette = gMonPalette_SlowkingGalarian, .shinyPalette = gMonShinyPalette_SlowkingGalarian, .iconSprite = gMonIcon_SlowkingGalarian, - .iconPalIndex = 2, + .iconPalIndex = 0, FOOTPRINT(Slowking) .isGalarianForm = TRUE, .levelUpLearnset = sSlowkingGalarianLevelUpLearnset, diff --git a/src/data/pokemon/species_info/gen_2_families.h b/src/data/pokemon/species_info/gen_2_families.h index 75fa9ac1e0..e9922c28ee 100644 --- a/src/data/pokemon/species_info/gen_2_families.h +++ b/src/data/pokemon/species_info/gen_2_families.h @@ -3886,12 +3886,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 8, .frontPic = gMonFrontPic_Overqwil, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 2, + .frontPicYOffset = 0, .frontAnimFrames = sAnims_Overqwil, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Overqwil, - .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 7, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Overqwil, .shinyPalette = gMonShinyPalette_Overqwil, @@ -4299,12 +4299,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Sneasler, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 1, + .frontPicYOffset = 0, .frontAnimFrames = sAnims_Sneasler, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Sneasler, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, + .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Sneasler, .shinyPalette = gMonShinyPalette_Sneasler, @@ -4465,13 +4465,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 369, .trainerOffset = 7, .frontPic = gMonFrontPic_Ursaluna, - .frontPicSize = MON_COORDS_SIZE(56, 56), - .frontPicYOffset = 2, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicYOffset = 3, .frontAnimFrames = sAnims_Ursaluna, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Ursaluna, - .backPicSize = MON_COORDS_SIZE(64, 40), - .backPicYOffset = 14, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Ursaluna, .shinyPalette = gMonShinyPalette_Ursaluna, @@ -4519,12 +4519,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 7, .frontPic = gMonFrontPic_UrsalunaBloodmoon, .frontPicSize = MON_COORDS_SIZE(64, 64), - //.frontPicYOffset = 0, + .frontPicYOffset = 0, .frontAnimFrames = sAnims_UrsalunaBloodmoon, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_UrsalunaBloodmoon, - .backPicSize = MON_COORDS_SIZE(64, 40), - .backPicYOffset = 3, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_UrsalunaBloodmoon, .shinyPalette = gMonShinyPalette_UrsalunaBloodmoon, diff --git a/src/data/pokemon/species_info/gen_5_families.h b/src/data/pokemon/species_info/gen_5_families.h index bdbff0e354..9de120bcd7 100644 --- a/src/data/pokemon/species_info/gen_5_families.h +++ b/src/data/pokemon/species_info/gen_5_families.h @@ -5189,7 +5189,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 1, .frontPic = gMonFrontPic_ZoroarkHisuian, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 0, + .frontPicYOffset = 1, .frontAnimFrames = sAnims_ZoroarkHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ZoroarkHisuian, diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h index bb9ff9c087..4a09a672ff 100644 --- a/src/data/pokemon/species_info/gen_8_families.h +++ b/src/data/pokemon/species_info/gen_8_families.h @@ -4350,7 +4350,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .palette = gMonPalette_Pincurchin, .shinyPalette = gMonShinyPalette_Pincurchin, .iconSprite = gMonIcon_Pincurchin, - .iconPalIndex = 0, + .iconPalIndex = 2, FOOTPRINT(Pincurchin) .levelUpLearnset = sPincurchinLevelUpLearnset, .teachableLearnset = sPincurchinTeachableLearnset, @@ -5116,7 +5116,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .palette = gMonPalette_Arctozolt, .shinyPalette = gMonShinyPalette_Arctozolt, .iconSprite = gMonIcon_Arctozolt, - .iconPalIndex = 2, + .iconPalIndex = 0, FOOTPRINT(Arctozolt) .levelUpLearnset = sArctozoltLevelUpLearnset, .teachableLearnset = sArctozoltTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h index 089d45cde1..cf072d44c9 100644 --- a/src/data/pokemon/species_info/gen_9_families.h +++ b/src/data/pokemon/species_info/gen_9_families.h @@ -3841,7 +3841,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Greavard, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 6, + .frontPicYOffset = 11, .frontAnimFrames = sAnims_Greavard, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Greavard, @@ -3894,12 +3894,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Houndstone, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 1, + .frontPicYOffset = 5, .frontAnimFrames = sAnims_Houndstone, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Houndstone, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 4, + .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Houndstone, .shinyPalette = gMonShinyPalette_Houndstone, @@ -4710,12 +4710,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_IronTreads, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 1, + .frontPicYOffset = 9, .frontAnimFrames = sAnims_IronTreads, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronTreads, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 4, + .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_IronTreads, .shinyPalette = gMonShinyPalette_IronTreads, @@ -4825,7 +4825,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronHands, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 10, + .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_IronHands, .shinyPalette = gMonShinyPalette_IronHands, @@ -4875,13 +4875,13 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_IronJugulis, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 2, + .frontPicYOffset = 3, .frontAnimFrames = sAnims_IronJugulis, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, .backPic = gMonBackPic_IronJugulis, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, + .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_IronJugulis, .shinyPalette = gMonShinyPalette_IronJugulis, @@ -4931,13 +4931,13 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_IronMoth, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 7, + .frontPicYOffset = 5, .frontAnimFrames = sAnims_IronMoth, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_IronMoth, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 4, + .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_IronMoth, .shinyPalette = gMonShinyPalette_IronMoth, @@ -4992,7 +4992,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronThorns, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, + .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_IronThorns, .shinyPalette = gMonShinyPalette_IronThorns, @@ -5095,12 +5095,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Arctibax, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 5, + .frontPicYOffset = 6, .frontAnimFrames = sAnims_Arctibax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Arctibax, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 8, + .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Arctibax, .shinyPalette = gMonShinyPalette_Arctibax, @@ -5202,12 +5202,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_GimmighoulChest, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 2, + .frontPicYOffset = 4, .frontAnimFrames = sAnims_Gimmighoul, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GimmighoulChest, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, + .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_GimmighoulChest, .shinyPalette = gMonShinyPalette_GimmighoulChest, @@ -5256,12 +5256,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_GimmighoulRoaming, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 11, + .frontPicYOffset = 17, .frontAnimFrames = sAnims_Gimmighoul, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GimmighoulRoaming, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 3, + .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_GimmighoulRoaming, .shinyPalette = gMonShinyPalette_GimmighoulRoaming, @@ -5310,12 +5310,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Gholdengo, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 0, + .frontPicYOffset = 1, .frontAnimFrames = sAnims_Gholdengo, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Gholdengo, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 6, + .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Gholdengo, .shinyPalette = gMonShinyPalette_Gholdengo, @@ -5364,12 +5364,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_WoChien, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 0, + .frontPicYOffset = 1, .frontAnimFrames = sAnims_WoChien, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_WoChien, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 10, + .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_WoChien, .shinyPalette = gMonShinyPalette_WoChien, @@ -5474,12 +5474,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_TingLu, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 2, + .frontPicYOffset = 0, .frontAnimFrames = sAnims_TingLu, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_TingLu, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 5, + .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_TingLu, .shinyPalette = gMonShinyPalette_TingLu, @@ -5588,10 +5588,10 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicYOffset = 0, .frontAnimFrames = sAnims_RoaringMoon, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .enemyMonElevation = 6, + .enemyMonElevation = 0, .backPic = gMonBackPic_RoaringMoon, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 7, + .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_RoaringMoon, .shinyPalette = gMonShinyPalette_RoaringMoon, @@ -5811,7 +5811,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_WalkingWake, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 3, + .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_WalkingWake, .shinyPalette = gMonShinyPalette_WalkingWake, @@ -5860,12 +5860,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, .frontPic = gMonFrontPic_IronLeaves, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 0, + .frontPicYOffset = 2, .frontAnimFrames = sAnims_IronLeaves, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronLeaves, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 8, + .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_IronLeaves, .shinyPalette = gMonShinyPalette_IronLeaves, From bbb6ade9e8a8a879468222150e9ca8bddb411fa3 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Wed, 15 May 2024 11:56:58 +0200 Subject: [PATCH 11/11] Fix debug ability u8 (#4576) --- src/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/debug.c b/src/debug.c index ea3ffbabb8..ba06cd522e 100644 --- a/src/debug.c +++ b/src/debug.c @@ -3404,7 +3404,7 @@ static void DebugAction_Give_Pokemon_SelectNature(u8 taskId) if (JOY_NEW(A_BUTTON)) { - u8 abilityId; + u16 abilityId; sDebugMonData->nature = gTasks[taskId].tInput; gTasks[taskId].tInput = 0; gTasks[taskId].tDigit = 0;