From 569fa0a60a49fd7794af53c9a77a2fb1fb074200 Mon Sep 17 00:00:00 2001 From: sbird Date: Sun, 15 Jan 2023 13:41:10 +0100 Subject: [PATCH 01/82] [script-command] add dynmultichoice * supports variable length arguments * automatically scrolls * supports building list menus from a stack --- asm/macros/event.inc | 25 +++++ data/script_cmd_table.inc | 2 + include/field_specials.h | 1 + include/script.h | 1 + include/script_menu.h | 26 +++++ src/field_specials.c | 9 +- src/scrcmd.c | 87 ++++++++++++++ src/script.c | 9 ++ src/script_menu.c | 231 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 387 insertions(+), 4 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 6c0c3856b9..069477485a 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1729,6 +1729,31 @@ .2byte \quantity .endm + @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. + @ Lists of options are provided in argv. + @ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. + .macro dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req argv:vararg + .byte 0xe3 + .byte \left + .byte \top + .byte \ignoreBPress + .byte \maxBeforeScroll + .byte (.Ldynmultichoice_\@_2 - .Ldynmultichoice_\@_1) / 4 +.Ldynmultichoice_\@_1: + .4byte \argv +.Ldynmultichoice_\@_2: + .endm + + .macro dynmultipush name:req, id:req + .byte 0xe4 + .4byte \name + .byte \id + .endm + + .macro dynmultistack left:req, top:req, ignoreBPress:req, maxBeforeScroll:req + dynmultichoice \left, \top, \ignoreBPress, \maxBeforeScroll, NULL + .endm + @ Supplementary diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 51b7f966e4..537a5126c7 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -227,6 +227,8 @@ gScriptCmdTable:: .4byte ScrCmd_warpwhitefade @ 0xe0 .4byte ScrCmd_buffercontestname @ 0xe1 .4byte ScrCmd_bufferitemnameplural @ 0xe2 + .4byte ScrCmd_dynmultichoice @ 0xe3 + .4byte ScrCmd_dynmultipush @ 0xe4 gScriptCmdTableEnd:: .4byte ScrCmd_nop diff --git a/include/field_specials.h b/include/field_specials.h index faf71e9c08..9b28b1d26b 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -3,6 +3,7 @@ extern bool8 gBikeCyclingChallenge; extern u8 gBikeCollisions; +extern u16 gScrollableMultichoice_ScrollOffset; u8 GetLeadMonIndex(void); u8 IsDestinationBoxFull(void); diff --git a/include/script.h b/include/script.h index 7c180e961b..4dc30ca74c 100644 --- a/include/script.h +++ b/include/script.h @@ -31,6 +31,7 @@ void ScriptCall(struct ScriptContext *ctx, const u8 *ptr); void ScriptReturn(struct ScriptContext *ctx); u16 ScriptReadHalfword(struct ScriptContext *ctx); u32 ScriptReadWord(struct ScriptContext *ctx); +u32 ScriptPeekWord(struct ScriptContext *ctx); void LockPlayerFieldControls(void); void UnlockPlayerFieldControls(void); bool8 ArePlayerFieldControlsLocked(void); diff --git a/include/script_menu.h b/include/script_menu.h index 36b66bf987..e4e4836097 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -1,8 +1,34 @@ #ifndef GUARD_SCRIPT_MENU_H #define GUARD_SCRIPT_MENU_H +#include "list_menu.h" + +// The default size the stack for dynamic multichoice is initialized to +// If you try to push an element when the stack is full, it will be reallocated +// With increasing capacity of MULTICHOICE_DYNAMIC_STACK_INC + +#define MULTICHOICE_DYNAMIC_STACK_SIZE 5 +#define MULTICHOICE_DYNAMIC_STACK_INC 5 + extern const u8 *const gStdStrings[]; +struct DynamicMultichoiceStack +{ + s32 top; + u32 capacity; + struct ListMenuItem *elements; +}; + +void MultichoiceDynamic_InitStack(u32 capacity); +void MultichoiceDynamic_ReallocStack(u32 newCapacity); +bool32 MultichoiceDynamic_StackFull(void); +bool32 MultichoiceDynamic_StackEmpty(void); +u32 MultichoiceDynamic_StackSize(void); +void MultichoiceDynamic_PushElement(struct ListMenuItem item); +struct ListMenuItem *MultichoiceDynamic_PopElement(void); +struct ListMenuItem *MultichoiceDynamic_PeekElement(void); +void MultichoiceDynamic_DestroyStack(void); +bool8 ScriptMenu_MultichoiceDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u8 maxBeforeScroll); bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress); bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress, u8 defaultChoice); bool8 ScriptMenu_YesNo(u8 left, u8 top); diff --git a/src/field_specials.c b/src/field_specials.c index 5c7d079163..2f09c0f0f2 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -75,7 +75,7 @@ static EWRAM_DATA u8 sTutorMoveAndElevatorWindowId = 0; static EWRAM_DATA u16 sLilycoveDeptStore_NeverRead = 0; static EWRAM_DATA u16 sLilycoveDeptStore_DefaultFloorChoice = 0; static EWRAM_DATA struct ListMenuItem *sScrollableMultichoice_ListMenuItem = NULL; -static EWRAM_DATA u16 sScrollableMultichoice_ScrollOffset = 0; + static EWRAM_DATA u16 sFrontierExchangeCorner_NeverRead = 0; static EWRAM_DATA u8 sScrollableMultichoice_ItemSpriteId = 0; static EWRAM_DATA u8 sBattlePointsWindowId = 0; @@ -84,6 +84,7 @@ static EWRAM_DATA u8 sPCBoxToSendMon = 0; static EWRAM_DATA u32 sBattleTowerMultiBattleTypeFlags = 0; struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate; +EWRAM_DATA u16 gScrollableMultichoice_ScrollOffset = 0; void TryLoseFansFromPlayTime(void); void SetPlayerGotFirstFans(void); @@ -2477,7 +2478,7 @@ static void Task_ShowScrollableMultichoice(u8 taskId) struct Task *task = &gTasks[taskId]; LockPlayerFieldControls(); - sScrollableMultichoice_ScrollOffset = 0; + gScrollableMultichoice_ScrollOffset = 0; sScrollableMultichoice_ItemSpriteId = MAX_SPRITES; FillFrontierExchangeCornerWindowAndItemIcon(task->tScrollMultiId, 0); ShowBattleFrontierTutorWindow(task->tScrollMultiId, 0); @@ -2551,7 +2552,7 @@ static void ScrollableMultichoice_MoveCursor(s32 itemIndex, bool8 onInit, struct u16 selection; struct Task *task = &gTasks[taskId]; ListMenuGetScrollAndRow(task->tListTaskId, &selection, NULL); - sScrollableMultichoice_ScrollOffset = selection; + gScrollableMultichoice_ScrollOffset = selection; ListMenuGetCurrentItemArrayId(task->tListTaskId, &selection); HideFrontierExchangeCornerItemIcon(task->tScrollMultiId, sFrontierExchangeCorner_NeverRead); FillFrontierExchangeCornerWindowAndItemIcon(task->tScrollMultiId, selection); @@ -2672,7 +2673,7 @@ static void ScrollableMultichoice_UpdateScrollArrows(u8 taskId) template.secondY = task->tHeight * 8 + 10; template.fullyUpThreshold = 0; template.fullyDownThreshold = task->data[1] - task->tMaxItemsOnScreen; - task->tScrollArrowId = AddScrollIndicatorArrowPair(&template, &sScrollableMultichoice_ScrollOffset); + task->tScrollArrowId = AddScrollIndicatorArrowPair(&template, &gScrollableMultichoice_ScrollOffset); } } diff --git a/src/scrcmd.c b/src/scrcmd.c index 01e1a8f09a..177c27277b 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -48,6 +48,8 @@ #include "trainer_see.h" #include "tv.h" #include "window.h" +#include "list_menu.h" +#include "malloc.h" #include "constants/event_objects.h" typedef u16 (*SpecialFunc)(void); @@ -68,6 +70,7 @@ extern const u8 *gStdScripts[]; extern const u8 *gStdScripts_End[]; static void CloseBrailleWindow(void); +static void DynamicMultichoiceSortList(struct ListMenuItem *items, u32 count); // This is defined in here so the optimizer can't see its value when compiling // script.c. @@ -1350,6 +1353,90 @@ bool8 ScrCmd_yesnobox(struct ScriptContext *ctx) } } +static void DynamicMultichoiceSortList(struct ListMenuItem *items, u32 count) +{ + u32 i,j; + struct ListMenuItem tmp; + for (i = 0; i < count - 1; ++i) + { + for (j = 0; j < count - i - 1; ++j) + { + if (items[j].id > items[j+1].id) + { + tmp = items[j]; + items[j] = items[j+1]; + items[j+1] = tmp; + } + } + } +} + +#define DYN_MULTICHOICE_DEFAULT_MAX_BEFORE_SCROLL 6 + +bool8 ScrCmd_dynmultichoice(struct ScriptContext *ctx) +{ + u32 i; + u8 left = ScriptReadByte(ctx); + u8 top = ScriptReadByte(ctx); + bool8 ignoreBPress = ScriptReadByte(ctx); + u8 maxBeforeScroll = ScriptReadByte(ctx); + // Read vararg + u8 argc = ScriptReadByte(ctx); + struct ListMenuItem *items; + + if (argc == 0) + return; + + if (maxBeforeScroll == 0xFF) + maxBeforeScroll = DYN_MULTICHOICE_DEFAULT_MAX_BEFORE_SCROLL; + + if ((const u8*) ScriptPeekWord(ctx) != NULL) + { + items = AllocZeroed(sizeof(struct ListMenuItem) * argc); + for (i = 0; i < argc; ++i) + { + u8 *nameBuffer = Alloc(100); + const u8 *arg = (const u8 *) ScriptReadWord(ctx); + StringExpandPlaceholders(nameBuffer, arg); + items[i].name = nameBuffer; + items[i].id = i; + } + } + else + { + argc = MultichoiceDynamic_StackSize(); + items = AllocZeroed(sizeof(struct ListMenuItem) * argc); + for (i = 0; i < argc; ++i) + { + u8 *nameBuffer = Alloc(100); + struct ListMenuItem *currentItem = MultichoiceDynamic_PopElement(); + StringExpandPlaceholders(nameBuffer, currentItem->name); + items[i].name = nameBuffer; + items[i].id = currentItem->id; + } + DynamicMultichoiceSortList(items, argc); + MultichoiceDynamic_DestroyStack(); + } + + if (ScriptMenu_MultichoiceDynamic(left, top, argc, items, ignoreBPress, maxBeforeScroll)) + { + ScriptContext_Stop(); + return TRUE; + } + else + { + return FALSE; + } +} + +bool8 ScrCmd_dynmultipush(struct ScriptContext *ctx) +{ + const u8 *name = (const u8*) ScriptReadWord(ctx); + u32 id = ScriptReadByte(ctx); + struct ListMenuItem item = {.name = name, .id = id}; + MultichoiceDynamic_PushElement(item); +} + bool8 ScrCmd_multichoice(struct ScriptContext *ctx) { u8 left = ScriptReadByte(ctx); diff --git a/src/script.c b/src/script.c index c252c95f04..b14d33d4b3 100644 --- a/src/script.c +++ b/src/script.c @@ -179,6 +179,15 @@ u32 ScriptReadWord(struct ScriptContext *ctx) return (((((value3 << 8) + value2) << 8) + value1) << 8) + value0; } +u32 ScriptPeekWord(struct ScriptContext *ctx) +{ + u32 value0 = *(ctx->scriptPtr); + u32 value1 = *(ctx->scriptPtr + 1); + u32 value2 = *(ctx->scriptPtr + 2); + u32 value3 = *(ctx->scriptPtr + 3); + return (((((value3 << 8) + value2) << 8) + value1) << 8) + value0; +} + void LockPlayerFieldControls(void) { sLockFieldControls = TRUE; diff --git a/src/script_menu.c b/src/script_menu.c index 6633332f3f..ce0b378193 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -13,6 +13,9 @@ #include "strings.h" #include "task.h" #include "text.h" +#include "list_menu.h" +#include "malloc.h" +#include "util.h" #include "constants/field_specials.h" #include "constants/items.h" #include "constants/script_menu.h" @@ -21,12 +24,16 @@ #include "data/script_menu.h" static EWRAM_DATA u8 sProcessInputDelay = 0; +static EWRAM_DATA struct DynamicMultichoiceStack *sDynamicMultiChoiceStack = NULL; static u8 sLilycoveSSTidalSelections[SSTIDAL_SELECTION_COUNT]; +static void FreeListMenuItems(struct ListMenuItem *items, u32 count); +static void Task_HandleScrollingMultichoiceInput(u8 taskId); static void Task_HandleMultichoiceInput(u8 taskId); static void Task_HandleYesNoInput(u8 taskId); static void Task_HandleMultichoiceGridInput(u8 taskId); +static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u8 cursorPos, u8 maxBeforeScroll); static void DrawMultichoiceMenu(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress, u8 cursorPos); static void InitMultichoiceCheckWrap(bool8 ignoreBPress, u8 count, u8 windowId, u8 multichoiceId); static void DrawLinkServicesMultichoiceMenu(u8 multichoiceId); @@ -36,6 +43,33 @@ static bool8 IsPicboxClosed(void); static void CreateStartMenuForPokenavTutorial(void); static void InitMultichoiceNoWrap(bool8 ignoreBPress, u8 unusedCount, u8 windowId, u8 multichoiceId); +static const struct ListMenuTemplate sScriptableListMenuTemplate = +{ + .item_X = 8, + .upText_Y = 1, + .cursorPal = 2, + .fillValue = 1, + .cursorShadowPal = 3, + .lettersSpacing = 1, + .scrollMultiple = LIST_NO_MULTIPLE_SCROLL, + .fontId = FONT_NORMAL, +}; + +bool8 ScriptMenu_MultichoiceDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u8 maxBeforeScroll) +{ + if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE) + { + FreeListMenuItems(items, argc); + return FALSE; + } + else + { + gSpecialVar_Result = 0xFF; + DrawMultichoiceMenuDynamic(left, top, argc, items, ignoreBPress, 0, maxBeforeScroll); + return TRUE; + } +} + bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress) { if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE) @@ -64,6 +98,17 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8 } } +static void FreeListMenuItems(struct ListMenuItem *items, u32 count) +{ + u32 i; + for (i = 0; i < count; ++i) + { + // All items were dynamically allocated, so items[i].name is not actually constant. + Free((void *)items[i].name); + } + Free(items); +} + // Unused static u16 GetLengthWithExpandedPlayerName(const u8 *str) { @@ -90,6 +135,148 @@ static u16 GetLengthWithExpandedPlayerName(const u8 *str) return length; } +void MultichoiceDynamic_InitStack(u32 capacity) +{ + AGB_ASSERT(sDynamicMultiChoiceStack == NULL); + sDynamicMultiChoiceStack = AllocZeroed(sizeof(*sDynamicMultiChoiceStack)); + AGB_ASSERT(sDynamicMultiChoiceStack != NULL); + sDynamicMultiChoiceStack->capacity = capacity; + sDynamicMultiChoiceStack->top = -1; + sDynamicMultiChoiceStack->elements = AllocZeroed(capacity * sizeof(struct ListMenuItem)); +} + +void MultichoiceDynamic_ReallocStack(u32 newCapacity) +{ + struct ListMenuItem *newElements; + AGB_ASSERT(sDynamicMultiChoiceStack != NULL); + AGB_ASSERT(sDynamicMultiChoiceStack->capacity < newCapacity); + newElements = AllocZeroed(newCapacity * sizeof(struct ListMenuItem)); + AGB_ASSERT(newElements != NULL); + memcpy(newElements, sDynamicMultiChoiceStack->elements, sDynamicMultiChoiceStack->capacity * sizeof(struct ListMenuItem)); + Free(sDynamicMultiChoiceStack->elements); + sDynamicMultiChoiceStack->elements = newElements; + sDynamicMultiChoiceStack->capacity = newCapacity; +} + +bool32 MultichoiceDynamic_StackFull(void) +{ + AGB_ASSERT(sDynamicMultiChoiceStack != NULL); + return sDynamicMultiChoiceStack->top == sDynamicMultiChoiceStack->capacity - 1; +} + +bool32 MultichoiceDynamic_StackEmpty(void) +{ + AGB_ASSERT(sDynamicMultiChoiceStack != NULL); + return sDynamicMultiChoiceStack->top == -1; +} + +u32 MultichoiceDynamic_StackSize(void) +{ + AGB_ASSERT(sDynamicMultiChoiceStack != NULL); + return sDynamicMultiChoiceStack->top + 1; +} + +void MultichoiceDynamic_PushElement(struct ListMenuItem item) +{ + if (sDynamicMultiChoiceStack == NULL) + MultichoiceDynamic_InitStack(MULTICHOICE_DYNAMIC_STACK_SIZE); + if (MultichoiceDynamic_StackFull()) + MultichoiceDynamic_ReallocStack(sDynamicMultiChoiceStack->capacity + MULTICHOICE_DYNAMIC_STACK_INC); + sDynamicMultiChoiceStack->elements[++sDynamicMultiChoiceStack->top] = item; +} + +struct ListMenuItem *MultichoiceDynamic_PopElement(void) +{ + if (sDynamicMultiChoiceStack == NULL) + return NULL; + if (MultichoiceDynamic_StackEmpty()) + return NULL; + return &sDynamicMultiChoiceStack->elements[sDynamicMultiChoiceStack->top--]; +} + +struct ListMenuItem *MultichoiceDynamic_PeekElement(void) +{ + if (sDynamicMultiChoiceStack == NULL) + return NULL; + if (MultichoiceDynamic_StackEmpty()) + return NULL; + return &sDynamicMultiChoiceStack->elements[sDynamicMultiChoiceStack->top]; +} + +void MultichoiceDynamic_DestroyStack(void) +{ + TRY_FREE_AND_SET_NULL(sDynamicMultiChoiceStack->elements); + TRY_FREE_AND_SET_NULL(sDynamicMultiChoiceStack); +} + +static void MultichoiceDynamic_MoveCursor(s32 itemIndex, bool8 onInit, struct ListMenu *list) +{ + u8 taskId; + PlaySE(SE_SELECT); + taskId = FindTaskIdByFunc(Task_HandleScrollingMultichoiceInput); + if (taskId != TASK_NONE) + { + u16 scrollOffset; + ListMenuGetScrollAndRow(gTasks[taskId].data[0], &scrollOffset, NULL); + gScrollableMultichoice_ScrollOffset = scrollOffset; + } +} + +static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u8 cursorPos, u8 maxBeforeScroll) +{ + u32 i; + u8 windowId; + s32 width = 0; + u8 newWidth; + u8 taskId; + u32 windowHeight; + + for (i = 0; i < argc; ++i) + { + width = DisplayTextAndGetWidth(items[i].name, width); + } + windowHeight = (argc < maxBeforeScroll) ? argc * 2 : maxBeforeScroll * 2; + newWidth = ConvertPixelWidthToTileWidth(width); + left = ScriptMenu_AdjustLeftCoordFromWidth(left, newWidth); + windowId = CreateWindowFromRect(left, top, newWidth, windowHeight); + SetStandardWindowBorderStyle(windowId, FALSE); + CopyWindowToVram(windowId, COPYWIN_FULL); + + gMultiuseListMenuTemplate = sScriptableListMenuTemplate; + gMultiuseListMenuTemplate.windowId = windowId; + gMultiuseListMenuTemplate.items = items; + gMultiuseListMenuTemplate.totalItems = argc; + gMultiuseListMenuTemplate.maxShowed = maxBeforeScroll; + gMultiuseListMenuTemplate.moveCursorFunc = MultichoiceDynamic_MoveCursor; + + taskId = CreateTask(Task_HandleScrollingMultichoiceInput, 80); + gTasks[taskId].data[0] = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); + gTasks[taskId].data[1] = ignoreBPress; + gTasks[taskId].data[2] = windowId; + gTasks[taskId].data[5] = argc; + gTasks[taskId].data[7] = maxBeforeScroll; + StoreWordInTwoHalfwords(&gTasks[taskId].data[3], (u32) items); + + if (argc > maxBeforeScroll) + { + // Create Scrolling Arrows + struct ScrollArrowsTemplate template; + template.firstX = (newWidth / 2) * 8 + 12 + (left) * 8; + template.firstY = top * 8 + 5; + template.secondX = template.firstX; + template.secondY = windowHeight * 8 + 12; + template.fullyUpThreshold = 0; + template.fullyDownThreshold = argc - maxBeforeScroll; + template.firstArrowType = SCROLL_ARROW_UP; + template.secondArrowType = SCROLL_ARROW_DOWN; + template.tileTag = 2000; + template.palTag = 100, + template.palNum = 0; + + gTasks[taskId].data[6] = AddScrollIndicatorArrowPair(&template, &gScrollableMultichoice_ScrollOffset); + } +} + static void DrawMultichoiceMenu(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress, u8 cursorPos) { int i; @@ -152,6 +339,50 @@ static void InitMultichoiceCheckWrap(bool8 ignoreBPress, u8 count, u8 windowId, DrawLinkServicesMultichoiceMenu(multichoiceId); } +static void Task_HandleScrollingMultichoiceInput(u8 taskId) +{ + bool32 done = FALSE; + s32 input = ListMenu_ProcessInput(gTasks[taskId].data[0]); + + switch (input) + { + case LIST_HEADER: + case LIST_NOTHING_CHOSEN: + break; + case LIST_CANCEL: + if (gTasks[taskId].data[1]) + { + gSpecialVar_Result = 0x7F; + done = TRUE; + } + break; + default: + gSpecialVar_Result = input; + done = TRUE; + break; + } + + if (done) + { + struct ListMenuItem *items; + + PlaySE(SE_SELECT); + if (gTasks[taskId].data[5] > gTasks[taskId].data[7]) + { + RemoveScrollIndicatorArrowPair(gTasks[taskId].data[6]); + } + + LoadWordFromTwoHalfwords(&gTasks[taskId].data[3], (u32* )(&items)); + FreeListMenuItems(items, gTasks[taskId].data[5]); + + DestroyListMenuTask(gTasks[taskId].data[0], NULL, NULL); + ClearStdWindowAndFrame(gTasks[taskId].data[2], TRUE); + RemoveWindow(gTasks[taskId].data[2]); + ScriptContext_Enable(); + DestroyTask(taskId); + } +} + static void Task_HandleMultichoiceInput(u8 taskId) { s8 selection; From 276ce62d95789b21fe8d2d5f078c104af4c2e8b0 Mon Sep 17 00:00:00 2001 From: sbird Date: Mon, 16 Jan 2023 22:40:36 +0100 Subject: [PATCH 02/82] [script-command, dynmultichoice] add shouldSort, initialSelected arguments. read pushed arguments front to back --- asm/macros/event.inc | 18 ++++++++++++------ include/list_menu.h | 2 ++ include/script_menu.h | 3 ++- src/list_menu.c | 16 +++++++++++----- src/scrcmd.c | 24 ++++++++++++++++-------- src/script_menu.c | 26 ++++++++++++++++++-------- 6 files changed, 61 insertions(+), 28 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 069477485a..4e9ab1855b 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1729,29 +1729,35 @@ .2byte \quantity .endm - @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. - @ Lists of options are provided in argv. - @ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. - .macro dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req argv:vararg + .macro _dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req argv:vararg .byte 0xe3 .byte \left .byte \top .byte \ignoreBPress .byte \maxBeforeScroll + .byte \shouldSort + .2byte \initialSelected .byte (.Ldynmultichoice_\@_2 - .Ldynmultichoice_\@_1) / 4 .Ldynmultichoice_\@_1: .4byte \argv .Ldynmultichoice_\@_2: .endm + @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. + @ Lists of options are provided in argv. + @ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. + .macro dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req argv:vararg + _dynamicmultichoice \left, \top, \ignoreBPress, \maxBeforeScroll, FALSE, \initialSelected, \argv + .endm + .macro dynmultipush name:req, id:req .byte 0xe4 .4byte \name .byte \id .endm - .macro dynmultistack left:req, top:req, ignoreBPress:req, maxBeforeScroll:req - dynmultichoice \left, \top, \ignoreBPress, \maxBeforeScroll, NULL + .macro dynmultistack left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req + _dynmultichoice \left, \top, \ignoreBPress, \maxBeforeScroll, \shouldSort, \initialSelected, NULL .endm diff --git a/include/list_menu.h b/include/list_menu.h index 9299ede6c8..23caaf4b4c 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -126,5 +126,7 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16 u8 AddScrollIndicatorArrowPairParameterized(u32 arrowType, s32 commonPos, s32 firstPos, s32 secondPos, s32 fullyDownThreshold, s32 tileTag, s32 palTag, u16 *currItemPtr); void RemoveScrollIndicatorArrowPair(u8 taskId); void Task_ScrollIndicatorArrowPairOnMainMenu(u8 taskId); +bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown); +bool8 ListMenuChangeSelectionFull(struct ListMenu *list, bool32 updateCursor, bool32 callCallback, u8 count, bool8 movingDown); #endif //GUARD_LIST_MENU_H diff --git a/include/script_menu.h b/include/script_menu.h index e4e4836097..c37b3603dd 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -27,8 +27,9 @@ u32 MultichoiceDynamic_StackSize(void); void MultichoiceDynamic_PushElement(struct ListMenuItem item); struct ListMenuItem *MultichoiceDynamic_PopElement(void); struct ListMenuItem *MultichoiceDynamic_PeekElement(void); +struct ListMenuItem *MultichoiceDynamic_PeekElementAt(u32 index); void MultichoiceDynamic_DestroyStack(void); -bool8 ScriptMenu_MultichoiceDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u8 maxBeforeScroll); +bool8 ScriptMenu_MultichoiceDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u8 maxBeforeScroll, u32 initialRow); bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress); bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress, u8 defaultChoice); bool8 ScriptMenu_YesNo(u8 left, u8 top); diff --git a/src/list_menu.c b/src/list_menu.c index c240564c65..4f631188bb 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -70,7 +70,6 @@ struct RedArrowCursor // this file's functions static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow); -static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown); static void ListMenuPrintEntries(struct ListMenu *list, u16 startIndex, u16 yOffset, u16 count); static void ListMenuDrawCursor(struct ListMenu *list); static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 onInit); @@ -837,7 +836,7 @@ static void ListMenuScroll(struct ListMenu *list, u8 count, bool8 movingDown) } } -static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown) +bool8 ListMenuChangeSelectionFull(struct ListMenu *list, bool32 updateCursor, bool32 callCallback, u8 count, bool8 movingDown) { u16 oldSelectedRow; u8 selectionChange, i, cursorCount; @@ -857,7 +856,7 @@ static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAn } while (list->template.items[list->scrollOffset + list->selectedRow].id == LIST_HEADER); } - if (updateCursorAndCallCallback) + if (updateCursor) { switch (selectionChange) { @@ -867,7 +866,8 @@ static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAn case 1: ListMenuErasePrintedCursor(list, oldSelectedRow); ListMenuDrawCursor(list); - ListMenuCallSelectionChangedCallback(list, FALSE); + if (callCallback) + ListMenuCallSelectionChangedCallback(list, FALSE); CopyWindowToVram(list->template.windowId, COPYWIN_GFX); break; case 2: @@ -875,7 +875,8 @@ static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAn ListMenuErasePrintedCursor(list, oldSelectedRow); ListMenuScroll(list, cursorCount, movingDown); ListMenuDrawCursor(list); - ListMenuCallSelectionChangedCallback(list, FALSE); + if (callCallback) + ListMenuCallSelectionChangedCallback(list, FALSE); CopyWindowToVram(list->template.windowId, COPYWIN_GFX); break; } @@ -884,6 +885,11 @@ static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAn return FALSE; } +bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown) +{ + ListMenuChangeSelectionFull(list, updateCursorAndCallCallback, updateCursorAndCallCallback, count, movingDown); +} + static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 onInit) { if (list->template.moveCursorFunc != NULL) diff --git a/src/scrcmd.c b/src/scrcmd.c index 177c27277b..e11528ccca 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1376,12 +1376,15 @@ static void DynamicMultichoiceSortList(struct ListMenuItem *items, u32 count) bool8 ScrCmd_dynmultichoice(struct ScriptContext *ctx) { u32 i; - u8 left = ScriptReadByte(ctx); - u8 top = ScriptReadByte(ctx); - bool8 ignoreBPress = ScriptReadByte(ctx); - u8 maxBeforeScroll = ScriptReadByte(ctx); + u32 left = ScriptReadByte(ctx); + u32 top = ScriptReadByte(ctx); + bool32 ignoreBPress = ScriptReadByte(ctx); + u32 maxBeforeScroll = ScriptReadByte(ctx); + bool32 shouldSort = ScriptReadByte(ctx); + u32 initialSelected = VarGet(ScriptReadHalfword(ctx)); + u32 initialRow = 0; // Read vararg - u8 argc = ScriptReadByte(ctx); + u32 argc = ScriptReadByte(ctx); struct ListMenuItem *items; if (argc == 0) @@ -1400,6 +1403,8 @@ bool8 ScrCmd_dynmultichoice(struct ScriptContext *ctx) StringExpandPlaceholders(nameBuffer, arg); items[i].name = nameBuffer; items[i].id = i; + if (i == initialSelected) + initialRow = i; } } else @@ -1409,16 +1414,19 @@ bool8 ScrCmd_dynmultichoice(struct ScriptContext *ctx) for (i = 0; i < argc; ++i) { u8 *nameBuffer = Alloc(100); - struct ListMenuItem *currentItem = MultichoiceDynamic_PopElement(); + struct ListMenuItem *currentItem = MultichoiceDynamic_PeekElementAt(i); StringExpandPlaceholders(nameBuffer, currentItem->name); items[i].name = nameBuffer; items[i].id = currentItem->id; + if (currentItem->id == initialSelected) + initialRow = i; } - DynamicMultichoiceSortList(items, argc); + if (shouldSort) + DynamicMultichoiceSortList(items, argc); MultichoiceDynamic_DestroyStack(); } - if (ScriptMenu_MultichoiceDynamic(left, top, argc, items, ignoreBPress, maxBeforeScroll)) + if (ScriptMenu_MultichoiceDynamic(left, top, argc, items, ignoreBPress, maxBeforeScroll, initialRow)) { ScriptContext_Stop(); return TRUE; diff --git a/src/script_menu.c b/src/script_menu.c index ce0b378193..e4d6162074 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -33,7 +33,7 @@ static void Task_HandleScrollingMultichoiceInput(u8 taskId); static void Task_HandleMultichoiceInput(u8 taskId); static void Task_HandleYesNoInput(u8 taskId); static void Task_HandleMultichoiceGridInput(u8 taskId); -static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u8 cursorPos, u8 maxBeforeScroll); +static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u32 initialRow, u8 maxBeforeScroll); static void DrawMultichoiceMenu(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress, u8 cursorPos); static void InitMultichoiceCheckWrap(bool8 ignoreBPress, u8 count, u8 windowId, u8 multichoiceId); static void DrawLinkServicesMultichoiceMenu(u8 multichoiceId); @@ -55,7 +55,7 @@ static const struct ListMenuTemplate sScriptableListMenuTemplate = .fontId = FONT_NORMAL, }; -bool8 ScriptMenu_MultichoiceDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u8 maxBeforeScroll) +bool8 ScriptMenu_MultichoiceDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u8 maxBeforeScroll, u32 initialRow) { if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE) { @@ -65,7 +65,7 @@ bool8 ScriptMenu_MultichoiceDynamic(u8 left, u8 top, u8 argc, struct ListMenuIte else { gSpecialVar_Result = 0xFF; - DrawMultichoiceMenuDynamic(left, top, argc, items, ignoreBPress, 0, maxBeforeScroll); + DrawMultichoiceMenuDynamic(left, top, argc, items, ignoreBPress, initialRow, maxBeforeScroll); return TRUE; } } @@ -203,6 +203,15 @@ struct ListMenuItem *MultichoiceDynamic_PeekElement(void) return &sDynamicMultiChoiceStack->elements[sDynamicMultiChoiceStack->top]; } +struct ListMenuItem *MultichoiceDynamic_PeekElementAt(u32 index) +{ + if (sDynamicMultiChoiceStack == NULL) + return NULL; + if (sDynamicMultiChoiceStack->top < index) + return NULL; + return &sDynamicMultiChoiceStack->elements[index]; +} + void MultichoiceDynamic_DestroyStack(void) { TRY_FREE_AND_SET_NULL(sDynamicMultiChoiceStack->elements); @@ -216,13 +225,11 @@ static void MultichoiceDynamic_MoveCursor(s32 itemIndex, bool8 onInit, struct Li taskId = FindTaskIdByFunc(Task_HandleScrollingMultichoiceInput); if (taskId != TASK_NONE) { - u16 scrollOffset; - ListMenuGetScrollAndRow(gTasks[taskId].data[0], &scrollOffset, NULL); - gScrollableMultichoice_ScrollOffset = scrollOffset; + ListMenuGetScrollAndRow(gTasks[taskId].data[0], &gScrollableMultichoice_ScrollOffset, NULL); } } -static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u8 cursorPos, u8 maxBeforeScroll) +static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u32 initialRow, u8 maxBeforeScroll) { u32 i; u8 windowId; @@ -230,6 +237,7 @@ static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenu u8 newWidth; u8 taskId; u32 windowHeight; + struct ListMenu *list; for (i = 0; i < argc; ++i) { @@ -256,7 +264,9 @@ static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenu gTasks[taskId].data[5] = argc; gTasks[taskId].data[7] = maxBeforeScroll; StoreWordInTwoHalfwords(&gTasks[taskId].data[3], (u32) items); - + list = (void *) gTasks[gTasks[taskId].data[0]].data; + ListMenuChangeSelectionFull(list, TRUE, FALSE, initialRow, TRUE); + ListMenuGetScrollAndRow(gTasks[taskId].data[0], &gScrollableMultichoice_ScrollOffset, NULL); if (argc > maxBeforeScroll) { // Create Scrolling Arrows From a7cd4ca592ff6f85186174002fca6b11e4c61eb1 Mon Sep 17 00:00:00 2001 From: sbird Date: Tue, 17 Jan 2023 21:21:07 +0100 Subject: [PATCH 03/82] [script-command, dynmultichoice] implement event handler --- asm/macros/event.inc | 13 +-- include/constants/script_menu.h | 6 ++ include/script_menu.h | 2 +- src/scrcmd.c | 5 +- src/script_menu.c | 149 ++++++++++++++++++++++++++++++-- 5 files changed, 161 insertions(+), 14 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 4e9ab1855b..d4a3159233 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1729,7 +1729,7 @@ .2byte \quantity .endm - .macro _dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req argv:vararg + .macro _dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req, callbacks:req argv:vararg .byte 0xe3 .byte \left .byte \top @@ -1737,6 +1737,7 @@ .byte \maxBeforeScroll .byte \shouldSort .2byte \initialSelected + .byte \callbacks .byte (.Ldynmultichoice_\@_2 - .Ldynmultichoice_\@_1) / 4 .Ldynmultichoice_\@_1: .4byte \argv @@ -1746,18 +1747,18 @@ @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. @ Lists of options are provided in argv. @ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. - .macro dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req argv:vararg - _dynamicmultichoice \left, \top, \ignoreBPress, \maxBeforeScroll, FALSE, \initialSelected, \argv + .macro dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, initialSelected:req, callbacks:req argv:vararg + _dynmultichoice \left, \top, \ignoreBPress, \maxBeforeScroll, FALSE, \initialSelected, \callbacks, \argv .endm .macro dynmultipush name:req, id:req .byte 0xe4 .4byte \name - .byte \id + .2byte \id .endm - .macro dynmultistack left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req - _dynmultichoice \left, \top, \ignoreBPress, \maxBeforeScroll, \shouldSort, \initialSelected, NULL + .macro dynmultistack left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req, callbacks:req + _dynmultichoice \left, \top, \ignoreBPress, \maxBeforeScroll, \shouldSort, \initialSelected, \callbacks, NULL .endm diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h index c58df7335f..e9dc39d058 100644 --- a/include/constants/script_menu.h +++ b/include/constants/script_menu.h @@ -165,4 +165,10 @@ #define STDSTRING_BATTLE_PIKE 28 #define STDSTRING_BATTLE_PYRAMID 29 +// Dynamic Multichoice Callbacks + +#define DYN_MULTICHOICE_CB_DEBUG 0 +#define DYN_MULTICHOICE_CB_SHOW_ITEM 1 +#define DYN_MULTICHOICE_CB_NONE 255 + #endif //GUARD_SCRIPT_MENU_CONSTANTS_H diff --git a/include/script_menu.h b/include/script_menu.h index c37b3603dd..a138548c2e 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -29,7 +29,7 @@ struct ListMenuItem *MultichoiceDynamic_PopElement(void); struct ListMenuItem *MultichoiceDynamic_PeekElement(void); struct ListMenuItem *MultichoiceDynamic_PeekElementAt(u32 index); void MultichoiceDynamic_DestroyStack(void); -bool8 ScriptMenu_MultichoiceDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u8 maxBeforeScroll, u32 initialRow); +bool8 ScriptMenu_MultichoiceDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u8 maxBeforeScroll, u32 initialRow, u32 callbackSet); bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress); bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress, u8 defaultChoice); bool8 ScriptMenu_YesNo(u8 left, u8 top); diff --git a/src/scrcmd.c b/src/scrcmd.c index e11528ccca..bb253a20c5 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1382,6 +1382,7 @@ bool8 ScrCmd_dynmultichoice(struct ScriptContext *ctx) u32 maxBeforeScroll = ScriptReadByte(ctx); bool32 shouldSort = ScriptReadByte(ctx); u32 initialSelected = VarGet(ScriptReadHalfword(ctx)); + u32 callbackSet = ScriptReadByte(ctx); u32 initialRow = 0; // Read vararg u32 argc = ScriptReadByte(ctx); @@ -1426,7 +1427,7 @@ bool8 ScrCmd_dynmultichoice(struct ScriptContext *ctx) MultichoiceDynamic_DestroyStack(); } - if (ScriptMenu_MultichoiceDynamic(left, top, argc, items, ignoreBPress, maxBeforeScroll, initialRow)) + if (ScriptMenu_MultichoiceDynamic(left, top, argc, items, ignoreBPress, maxBeforeScroll, initialRow, callbackSet)) { ScriptContext_Stop(); return TRUE; @@ -1440,7 +1441,7 @@ bool8 ScrCmd_dynmultichoice(struct ScriptContext *ctx) bool8 ScrCmd_dynmultipush(struct ScriptContext *ctx) { const u8 *name = (const u8*) ScriptReadWord(ctx); - u32 id = ScriptReadByte(ctx); + u32 id = VarGet(ScriptReadHalfword(ctx)); struct ListMenuItem item = {.name = name, .id = id}; MultichoiceDynamic_PushElement(item); } diff --git a/src/script_menu.c b/src/script_menu.c index e4d6162074..43c8d7a621 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -16,6 +16,7 @@ #include "list_menu.h" #include "malloc.h" #include "util.h" +#include "item_icon.h" #include "constants/field_specials.h" #include "constants/items.h" #include "constants/script_menu.h" @@ -23,8 +24,26 @@ #include "data/script_menu.h" +struct DynamicListMenuEventArgs +{ + struct ListMenuTemplate *list; + u16 selectedItem; + u8 windowId; +}; + +typedef void (*DynamicListCallback)(struct DynamicListMenuEventArgs *eventArgs); + +struct DynamicListMenuEventCollection +{ + DynamicListCallback OnInit; + DynamicListCallback OnSelectionChanged; + DynamicListCallback OnDestroy; +}; + static EWRAM_DATA u8 sProcessInputDelay = 0; +static EWRAM_DATA u8 sDynamicMenuEventId = 0; static EWRAM_DATA struct DynamicMultichoiceStack *sDynamicMultiChoiceStack = NULL; +static EWRAM_DATA u16 *sDynamicMenuEventScratchPad = NULL; static u8 sLilycoveSSTidalSelections[SSTIDAL_SELECTION_COUNT]; @@ -33,7 +52,7 @@ static void Task_HandleScrollingMultichoiceInput(u8 taskId); static void Task_HandleMultichoiceInput(u8 taskId); static void Task_HandleYesNoInput(u8 taskId); static void Task_HandleMultichoiceGridInput(u8 taskId); -static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u32 initialRow, u8 maxBeforeScroll); +static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u32 initialRow, u8 maxBeforeScroll, u32 callbackSet); static void DrawMultichoiceMenu(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress, u8 cursorPos); static void InitMultichoiceCheckWrap(bool8 ignoreBPress, u8 count, u8 windowId, u8 multichoiceId); static void DrawLinkServicesMultichoiceMenu(u8 multichoiceId); @@ -42,6 +61,28 @@ static void CreateLilycoveSSTidalMultichoice(void); static bool8 IsPicboxClosed(void); static void CreateStartMenuForPokenavTutorial(void); static void InitMultichoiceNoWrap(bool8 ignoreBPress, u8 unusedCount, u8 windowId, u8 multichoiceId); +static void MultichoiceDynamicEventDebug_OnInit(struct DynamicListMenuEventArgs *eventArgs); +static void MultichoiceDynamicEventDebug_OnSelectionChanged(struct DynamicListMenuEventArgs *eventArgs); +static void MultichoiceDynamicEventDebug_OnDestroy(struct DynamicListMenuEventArgs *eventArgs); +static void MultichoiceDynamicEventShowItem_OnInit(struct DynamicListMenuEventArgs *eventArgs); +static void MultichoiceDynamicEventShowItem_OnSelectionChanged(struct DynamicListMenuEventArgs *eventArgs); +static void MultichoiceDynamicEventShowItem_OnDestroy(struct DynamicListMenuEventArgs *eventArgs); + +static const struct DynamicListMenuEventCollection sDynamicListMenuEventCollections[] = +{ + [DYN_MULTICHOICE_CB_DEBUG] = + { + .OnInit = MultichoiceDynamicEventDebug_OnInit, + .OnSelectionChanged = MultichoiceDynamicEventDebug_OnSelectionChanged, + .OnDestroy = MultichoiceDynamicEventDebug_OnDestroy + }, + [DYN_MULTICHOICE_CB_SHOW_ITEM] = + { + .OnInit = MultichoiceDynamicEventShowItem_OnInit, + .OnSelectionChanged = MultichoiceDynamicEventShowItem_OnSelectionChanged, + .OnDestroy = MultichoiceDynamicEventShowItem_OnDestroy + } +}; static const struct ListMenuTemplate sScriptableListMenuTemplate = { @@ -55,7 +96,7 @@ static const struct ListMenuTemplate sScriptableListMenuTemplate = .fontId = FONT_NORMAL, }; -bool8 ScriptMenu_MultichoiceDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u8 maxBeforeScroll, u32 initialRow) +bool8 ScriptMenu_MultichoiceDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u8 maxBeforeScroll, u32 initialRow, u32 callbackSet) { if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE) { @@ -65,7 +106,7 @@ bool8 ScriptMenu_MultichoiceDynamic(u8 left, u8 top, u8 argc, struct ListMenuIte else { gSpecialVar_Result = 0xFF; - DrawMultichoiceMenuDynamic(left, top, argc, items, ignoreBPress, initialRow, maxBeforeScroll); + DrawMultichoiceMenuDynamic(left, top, argc, items, ignoreBPress, initialRow, maxBeforeScroll, callbackSet); return TRUE; } } @@ -98,6 +139,74 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8 } } +static void MultichoiceDynamicEventDebug_OnInit(struct DynamicListMenuEventArgs *eventArgs) +{ + DebugPrintf("OnInit: %d", eventArgs->windowId); +} + +static void MultichoiceDynamicEventDebug_OnSelectionChanged(struct DynamicListMenuEventArgs *eventArgs) +{ + DebugPrintf("OnSelectionChanged: %d", eventArgs->selectedItem); +} + +static void MultichoiceDynamicEventDebug_OnDestroy(struct DynamicListMenuEventArgs *eventArgs) +{ + DebugPrintf("OnDestroy: %d", eventArgs->windowId); +} + +#define sAuxWindowId sDynamicMenuEventScratchPad[0] +#define sItemSpriteId sDynamicMenuEventScratchPad[1] +#define TAG_CB_ITEM_ICON 3000 + +static void MultichoiceDynamicEventShowItem_OnInit(struct DynamicListMenuEventArgs *eventArgs) +{ + struct WindowTemplate *template = &gWindows[eventArgs->windowId].window; + u32 baseBlock = template->baseBlock + template->width * template->height; + struct WindowTemplate auxTemplate = CreateWindowTemplate(0, template->tilemapLeft + template->width + 2, template->tilemapTop, 4, 4, 15, baseBlock); + u32 auxWindowId = AddWindow(&auxTemplate); + SetStandardWindowBorderStyle(auxWindowId, FALSE); + FillWindowPixelBuffer(auxWindowId, 0x11); + CopyWindowToVram(auxWindowId, COPYWIN_FULL); + sAuxWindowId = auxWindowId; + sItemSpriteId = MAX_SPRITES; +} + +static void MultichoiceDynamicEventShowItem_OnSelectionChanged(struct DynamicListMenuEventArgs *eventArgs) +{ + struct WindowTemplate *template = &gWindows[eventArgs->windowId].window; + u32 x = template->tilemapLeft * 8 + template->width * 8 + 36; + u32 y = template->tilemapTop * 8 + 20; + + if (sItemSpriteId != MAX_SPRITES) + { + FreeSpriteTilesByTag(TAG_CB_ITEM_ICON); + FreeSpritePaletteByTag(TAG_CB_ITEM_ICON); + DestroySprite(&gSprites[sItemSpriteId]); + } + + sItemSpriteId = AddItemIconSprite(TAG_CB_ITEM_ICON, TAG_CB_ITEM_ICON, eventArgs->selectedItem); + gSprites[sItemSpriteId].oam.priority = 0; + gSprites[sItemSpriteId].x = x; + gSprites[sItemSpriteId].y = y; +} + +static void MultichoiceDynamicEventShowItem_OnDestroy(struct DynamicListMenuEventArgs *eventArgs) +{ + ClearStdWindowAndFrame(sAuxWindowId, TRUE); + RemoveWindow(sAuxWindowId); + + if (sItemSpriteId != MAX_SPRITES) + { + FreeSpriteTilesByTag(TAG_CB_ITEM_ICON); + FreeSpritePaletteByTag(TAG_CB_ITEM_ICON); + DestroySprite(&gSprites[sItemSpriteId]); + } +} + +#undef sAuxWindowId +#undef sItemSpriteId +#undef TAG_CB_ITEM_ICON + static void FreeListMenuItems(struct ListMenuItem *items, u32 count) { u32 i; @@ -226,10 +335,15 @@ static void MultichoiceDynamic_MoveCursor(s32 itemIndex, bool8 onInit, struct Li if (taskId != TASK_NONE) { ListMenuGetScrollAndRow(gTasks[taskId].data[0], &gScrollableMultichoice_ScrollOffset, NULL); + if (sDynamicMenuEventId != DYN_MULTICHOICE_CB_NONE && sDynamicListMenuEventCollections[sDynamicMenuEventId].OnSelectionChanged && !onInit) + { + struct DynamicListMenuEventArgs eventArgs = {.selectedItem = itemIndex, .windowId = list->template.windowId, .list = &list->template}; + sDynamicListMenuEventCollections[sDynamicMenuEventId].OnSelectionChanged(&eventArgs); + } } } -static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u32 initialRow, u8 maxBeforeScroll) +static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenuItem *items, bool8 ignoreBPress, u32 initialRow, u8 maxBeforeScroll, u32 callbackSet) { u32 i; u8 windowId; @@ -250,6 +364,16 @@ static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenu SetStandardWindowBorderStyle(windowId, FALSE); CopyWindowToVram(windowId, COPYWIN_FULL); + // I don't like this being global either, but I could not come up with another solution that + // does not invade the whole ListMenu infrastructure. + sDynamicMenuEventId = callbackSet; + sDynamicMenuEventScratchPad = AllocZeroed(100 * sizeof(u16)); + if (sDynamicMenuEventId != DYN_MULTICHOICE_CB_NONE && sDynamicListMenuEventCollections[sDynamicMenuEventId].OnInit) + { + struct DynamicListMenuEventArgs eventArgs = {.selectedItem = initialRow, .windowId = windowId, .list = NULL}; + sDynamicListMenuEventCollections[sDynamicMenuEventId].OnInit(&eventArgs); + } + gMultiuseListMenuTemplate = sScriptableListMenuTemplate; gMultiuseListMenuTemplate.windowId = windowId; gMultiuseListMenuTemplate.items = items; @@ -266,6 +390,12 @@ static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenu StoreWordInTwoHalfwords(&gTasks[taskId].data[3], (u32) items); list = (void *) gTasks[gTasks[taskId].data[0]].data; ListMenuChangeSelectionFull(list, TRUE, FALSE, initialRow, TRUE); + + if (sDynamicMenuEventId != DYN_MULTICHOICE_CB_NONE && sDynamicListMenuEventCollections[sDynamicMenuEventId].OnSelectionChanged) + { + struct DynamicListMenuEventArgs eventArgs = {.selectedItem = items[initialRow].id, .windowId = windowId, .list = &gMultiuseListMenuTemplate}; + sDynamicListMenuEventCollections[sDynamicMenuEventId].OnSelectionChanged(&eventArgs); + } ListMenuGetScrollAndRow(gTasks[taskId].data[0], &gScrollableMultichoice_ScrollOffset, NULL); if (argc > maxBeforeScroll) { @@ -377,6 +507,15 @@ static void Task_HandleScrollingMultichoiceInput(u8 taskId) struct ListMenuItem *items; PlaySE(SE_SELECT); + + if (sDynamicMenuEventId != DYN_MULTICHOICE_CB_NONE && sDynamicListMenuEventCollections[sDynamicMenuEventId].OnDestroy) + { + struct DynamicListMenuEventArgs eventArgs = {.selectedItem = input, .windowId = gTasks[taskId].data[2], .list = NULL}; + sDynamicListMenuEventCollections[sDynamicMenuEventId].OnDestroy(&eventArgs); + } + + sDynamicMenuEventId = DYN_MULTICHOICE_CB_NONE; + if (gTasks[taskId].data[5] > gTasks[taskId].data[7]) { RemoveScrollIndicatorArrowPair(gTasks[taskId].data[6]); @@ -384,7 +523,7 @@ static void Task_HandleScrollingMultichoiceInput(u8 taskId) LoadWordFromTwoHalfwords(&gTasks[taskId].data[3], (u32* )(&items)); FreeListMenuItems(items, gTasks[taskId].data[5]); - + TRY_FREE_AND_SET_NULL(sDynamicMenuEventScratchPad); DestroyListMenuTask(gTasks[taskId].data[0], NULL, NULL); ClearStdWindowAndFrame(gTasks[taskId].data[2], TRUE); RemoveWindow(gTasks[taskId].data[2]); From 4fad6b3e125a184d421d1a005380956974cc14fd Mon Sep 17 00:00:00 2001 From: sbird Date: Wed, 18 Jan 2023 23:25:19 +0100 Subject: [PATCH 04/82] [script-command, dynmultichoice] load message box and border gfx --- src/script_menu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/script_menu.c b/src/script_menu.c index 43c8d7a621..8e9cd5296c 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -357,6 +357,7 @@ static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenu { width = DisplayTextAndGetWidth(items[i].name, width); } + LoadMessageBoxAndBorderGfx(); windowHeight = (argc < maxBeforeScroll) ? argc * 2 : maxBeforeScroll * 2; newWidth = ConvertPixelWidthToTileWidth(width); left = ScriptMenu_AdjustLeftCoordFromWidth(left, newWidth); From bfc6619c03b460f7c2d5d96f39d17c2a4428f360 Mon Sep 17 00:00:00 2001 From: sbird Date: Wed, 18 Jan 2023 23:34:27 +0100 Subject: [PATCH 05/82] [script-command, dynmultichoice] early expand placeholders --- src/scrcmd.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/scrcmd.c b/src/scrcmd.c index bb253a20c5..4599bc8bb4 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1414,11 +1414,8 @@ bool8 ScrCmd_dynmultichoice(struct ScriptContext *ctx) items = AllocZeroed(sizeof(struct ListMenuItem) * argc); for (i = 0; i < argc; ++i) { - u8 *nameBuffer = Alloc(100); struct ListMenuItem *currentItem = MultichoiceDynamic_PeekElementAt(i); - StringExpandPlaceholders(nameBuffer, currentItem->name); - items[i].name = nameBuffer; - items[i].id = currentItem->id; + items[i] = *currentItem; if (currentItem->id == initialSelected) initialRow = i; } @@ -1440,9 +1437,13 @@ bool8 ScrCmd_dynmultichoice(struct ScriptContext *ctx) bool8 ScrCmd_dynmultipush(struct ScriptContext *ctx) { + u8 *nameBuffer = Alloc(100); const u8 *name = (const u8*) ScriptReadWord(ctx); u32 id = VarGet(ScriptReadHalfword(ctx)); - struct ListMenuItem item = {.name = name, .id = id}; + struct ListMenuItem item; + StringExpandPlaceholders(nameBuffer, name); + item.name = nameBuffer; + item.id = id; MultichoiceDynamic_PushElement(item); } From a2dfc7c88700c37ccca188bd12fade9646e4975d Mon Sep 17 00:00:00 2001 From: sbird Date: Mon, 24 Apr 2023 19:13:39 +0200 Subject: [PATCH 06/82] [dynmulti] fix second scroll arrow y offset --- src/script_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script_menu.c b/src/script_menu.c index 8e9cd5296c..e639c68378 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -405,7 +405,7 @@ static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenu template.firstX = (newWidth / 2) * 8 + 12 + (left) * 8; template.firstY = top * 8 + 5; template.secondX = template.firstX; - template.secondY = windowHeight * 8 + 12; + template.secondY = top * 8 + windowHeight * 8 + 12; template.fullyUpThreshold = 0; template.fullyDownThreshold = argc - maxBeforeScroll; template.firstArrowType = SCROLL_ARROW_UP; From 47f71a1b62dd054b1318f9f8d1fc8da4fc9d6aa7 Mon Sep 17 00:00:00 2001 From: sbird Date: Wed, 26 Apr 2023 03:53:52 +0200 Subject: [PATCH 07/82] [dynmulti] fix ignoreBPress semantics --- src/script_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script_menu.c b/src/script_menu.c index e639c68378..01c7a4aaf9 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -491,7 +491,7 @@ static void Task_HandleScrollingMultichoiceInput(u8 taskId) case LIST_NOTHING_CHOSEN: break; case LIST_CANCEL: - if (gTasks[taskId].data[1]) + if (!gTasks[taskId].data[1]) { gSpecialVar_Result = 0x7F; done = TRUE; From 693f7509bb29427f68bfbe46cce0b154fc0cd056 Mon Sep 17 00:00:00 2001 From: Jaizu Date: Wed, 16 Aug 2023 14:49:44 +0200 Subject: [PATCH 08/82] Make use of MULTI_B_PRESSED constant. (#4) --- src/script_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script_menu.c b/src/script_menu.c index 01c7a4aaf9..53e31be9a0 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -493,7 +493,7 @@ static void Task_HandleScrollingMultichoiceInput(u8 taskId) case LIST_CANCEL: if (!gTasks[taskId].data[1]) { - gSpecialVar_Result = 0x7F; + gSpecialVar_Result = MULTI_B_PRESSED; done = TRUE; } break; From cefb05bdec70f424c840e022e4cd4540ae4dcc41 Mon Sep 17 00:00:00 2001 From: sbird Date: Wed, 29 Nov 2023 13:19:37 +0100 Subject: [PATCH 09/82] [dynmulti] left/top read from variables --- asm/macros/event.inc | 4 ++-- src/scrcmd.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index bc29334894..c78c3140aa 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1731,8 +1731,8 @@ .macro _dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req, callbacks:req argv:vararg .byte 0xe3 - .byte \left - .byte \top + .2byte \left + .2byte \top .byte \ignoreBPress .byte \maxBeforeScroll .byte \shouldSort diff --git a/src/scrcmd.c b/src/scrcmd.c index 7a094c7bee..47d7d1b7eb 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1376,8 +1376,8 @@ static void DynamicMultichoiceSortList(struct ListMenuItem *items, u32 count) bool8 ScrCmd_dynmultichoice(struct ScriptContext *ctx) { u32 i; - u32 left = ScriptReadByte(ctx); - u32 top = ScriptReadByte(ctx); + u32 left = VarGet(ScriptReadHalfword(ctx)); + u32 top = VarGet(ScriptReadHalfword(ctx)); bool32 ignoreBPress = ScriptReadByte(ctx); u32 maxBeforeScroll = ScriptReadByte(ctx); bool32 shouldSort = ScriptReadByte(ctx); From a517e14c064e83f053a972ecf1b1660a2baf47b5 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Wed, 29 Nov 2023 13:26:43 +0100 Subject: [PATCH 10/82] Berry Mutations --- data/scripts/berry_tree.inc | 76 ++++++++++++++++++++- include/config/overworld.h | 3 + include/global.berry.h | 16 +++-- src/berry.c | 132 +++++++++++++++++++++++++++++++++++- 4 files changed, 221 insertions(+), 6 deletions(-) diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 8ad300df52..c302f07eb0 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -103,13 +103,25 @@ BerryTree_EventScript_CheckBerryFullyGrown:: lock faceplayer special ObjectEventInteractionGetBerryCountString +.if OW_BERRY_MUTATIONS == TRUE + goto_if_eq VAR_RESULT, TRUE, BerryTree_EventScript_CheckBerryFullyGrown_Mutation +.endif msgbox BerryTree_Text_WantToPick, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, BerryTree_EventScript_PickBerry goto_if_eq VAR_RESULT, NO, BerryTree_EventScript_CancelPickingBerry +.set BERRY_NORMAL_BAG_FULL, 0 +.set BERRY_NORMAL_SPACE_IN_BAG, 1 +.set BERRY_MUTATION_BAG_FULL, 2 +.set BERRY_MUTATION_SPACE_IN_BAG, 3 + BerryTree_EventScript_PickBerry:: special ObjectEventInteractionPickBerryTree - goto_if_eq VAR_0x8004, 0, BerryTree_EventScript_BerryPocketFull + goto_if_eq VAR_0x8004, BERRY_NORMAL_BAG_FULL, BerryTree_EventScript_BerryPocketFull +.if OW_BERRY_MUTATIONS == TRUE + goto_if_eq VAR_0x8004, BERRY_MUTATION_BAG_FULL, BerryTree_EventScript_BerryPocketFull_Mutation + goto_if_eq VAR_0x8004, BERRY_MUTATION_SPACE_IN_BAG, BerryTree_EventScript_PickBerry_Mutation +.endif special IncrementDailyPickedBerries special ObjectEventInteractionRemoveBerryTree message BerryTree_Text_PickedTheBerry @@ -249,3 +261,65 @@ BerryTree_Text_PlantIsDelighted: BerryTree_Text_ExclamationPoint: .string "!$" + +.if OW_BERRY_MUTATIONS == TRUE +BerryTree_EventScript_CheckBerryFullyGrown_Mutation: + msgbox BerryTree_Text_WantToPick_Mutation, MSGBOX_YESNO + goto_if_eq VAR_RESULT, YES, BerryTree_EventScript_PickBerry + goto_if_eq VAR_RESULT, NO, BerryTree_EventScript_CancelPickingBerry_Mutation + +BerryTree_EventScript_CancelPickingBerry_Mutation:: + message BerryTree_Text_BerryLeftUnpicked_Mutation + waitmessage + waitbuttonpress + release + end + +BerryTree_EventScript_BerryPocketFull_Mutation:: + message BerryTree_Text_BerryPocketFull_Mutation + waitmessage + waitbuttonpress + release + end + +BerryTree_EventScript_PickBerry_Mutation:: + @ add items + special IncrementDailyPickedBerries + special ObjectEventInteractionRemoveBerryTree + message BerryTree_Text_PickedTheBerry_Mutation + playfanfare MUS_OBTAIN_BERRY + waitmessage + waitfanfare + waitbuttonpress + message BerryTree_Text_PutAwayBerry_Mutation + waitmessage + waitbuttonpress + release + end + +BerryTree_Text_WantToPick_Mutation: + .string "You found {STR_VAR_2} {STR_VAR_1}\n" + .string "and 1 {STR_VAR_3}!\p" + .string "Do you want to pick them?$" + +BerryTree_Text_BerryLeftUnpicked_Mutation: + .string "{PLAYER} left the {STR_VAR_1}\n" + .string "and the {STR_VAR_3} unpicked.$" + +BerryTree_Text_BerryPocketFull_Mutation: + .string "The BAG's BERRIES POCKET is full.\p" + .string "The {STR_VAR_1} and the\n" + .string "{STR_VAR_3} couldn't be taken.$" + +BerryTree_Text_PickedTheBerry_Mutation: + .string "{PLAYER} picked the {STR_VAR_2} {STR_VAR_1}\n" + .string "and the {STR_VAR_3}.$" + +BerryTree_Text_PutAwayBerry_Mutation: + .string "{PLAYER} put away the {STR_VAR_1}\n" + .string "and the {STR_VAR_3} in the BAG's\l" + .string "BERRIES POCKET.\p" + .string "The soil returned to its soft and\n" + .string "loamy state.$" + +.endif diff --git a/include/config/overworld.h b/include/config/overworld.h index 3488064421..fb24c680b0 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -12,6 +12,9 @@ #define OW_PC_PRESS_B GEN_LATEST // In Gen4, pressing B when holding a Pokémon is equivalent to placing it. In Gen3, it gives the "You're holding a Pokémon!" error. #define OW_PC_JAPAN_WALDA_ICONS TRUE // In the US release of Emerald, the Cross, Bolt, and Plusle icons for Walda's wallpapers were left blank from the Japan release. Setting this to TRUE will restore them. +// Berry settings +#define OW_BERRY_MUTATIONS FALSE // If enabled, Berry plants can mutate based on berries planted next to them. + // Out-of-battle Ability effects #define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8, if a Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same Nature, as opposed to 50% previously. Stationary Pokémon are excluded in Gen3. In Gen6, all No Eggs Discovered gift Pokémon will have the same Nature, while in Gen7 all gift Pokémon will, regardless of Egg Group - In Gen 8, no gift Pokémon are affected. In Gen9, this ability has no out-of-battle effect. #define OW_COMPOUND_EYES GEN_LATEST // Prior to Gen9, if a Pokémon with Compound Eyes is leading the party, the wild held item rate is increased to 60%/20%. diff --git a/include/global.berry.h b/include/global.berry.h index 29f1cfe14a..cd6e18e7fb 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -62,16 +62,24 @@ struct BattleEnigmaBerry struct BerryTree { - u8 berry; - u8 stage:7; + u8 berry:7; + u8 weeds:1; + u8 stage:3; + u8 mulch:4; u8 stopGrowth:1; - u16 minutesUntilNextStage; - u8 berryYield; + u16 minutesUntilNextStage:14; + u16 mutationA:2; + u8 berryYield:5; + u8 pests:1; + u8 mutationB:2; u8 regrowthCount:4; u8 watered1:1; u8 watered2:1; u8 watered3:1; u8 watered4:1; + u16 moistureLevel:7; + u16 moistureClock:6; + u16 mutationC:3; }; #endif // GUARD_GLOBAL_BERRY_H diff --git a/src/berry.c b/src/berry.c index 88a5d0f9f3..c2698295ec 100644 --- a/src/berry.c +++ b/src/berry.c @@ -23,6 +23,8 @@ static u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water); static u8 CalcBerryYield(struct BerryTree *tree); static u8 GetBerryCountByBerryTreeId(u8 id); static u16 GetStageDurationByBerryType(u8); +static void SetTreeMutations(u8 id, u8 berry); +static u8 GetTreeMutationValue(u8 id); //.rodata static const u8 sBerryDescriptionPart1_Cheri[] = _("Blooms with delicate pretty flowers."); @@ -1627,6 +1629,8 @@ void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 allowGrowth) // allowGrowth is always true for berry trees the player has planted if (!allowGrowth) tree->stopGrowth = TRUE; + + SetTreeMutations(id, berry); } void RemoveBerryTree(u8 id) @@ -1787,6 +1791,15 @@ void ObjectEventInteractionGetBerryCountString(void) u8 berry = GetBerryTypeByBerryTreeId(treeId); u8 count = GetBerryCountByBerryTreeId(treeId); GetBerryCountStringByBerryType(berry, gStringVar1, count); + berry = GetTreeMutationValue(treeId); + if (berry > 0) + { + count = 1; + GetBerryCountStringByBerryType(berry, gStringVar3, count); + gSpecialVar_Result = TRUE; + } + else + gSpecialVar_Result = FALSE; } void Bag_ChooseBerry(void) @@ -1806,8 +1819,19 @@ void ObjectEventInteractionPickBerryTree(void) { u8 id = GetObjectEventBerryTreeId(gSelectedObjectEvent); u8 berry = GetBerryTypeByBerryTreeId(id); + u8 mutation = GetTreeMutationValue(id); - gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id)); + if (!OW_BERRY_MUTATIONS || mutation == 0) + { + gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id)); + return; + } + gSpecialVar_0x8004 = (CheckBagHasSpace(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id)) && CheckBagHasSpace(BerryTypeToItemId(mutation), 1)) + 2; + if (gSpecialVar_0x8004 == 3) + { + AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id)); + AddBagItem(BerryTypeToItemId(mutation), 1); + } } void ObjectEventInteractionRemoveBerryTree(void) @@ -1849,3 +1873,109 @@ void SetBerryTreesSeen(void) } } } + +// Berry mutations +#if OW_BERRY_MUTATIONS == TRUE +#define BERRY_MUTATION_CHANCE 25 + +static const u8 sBerryMutations[][3] = { + {ITEM_TO_BERRY(ITEM_IAPAPA_BERRY), ITEM_TO_BERRY(ITEM_MAGO_BERRY), ITEM_TO_BERRY(ITEM_POMEG_BERRY)}, + {ITEM_TO_BERRY(ITEM_CHESTO_BERRY), ITEM_TO_BERRY(ITEM_PERSIM_BERRY), ITEM_TO_BERRY(ITEM_KELPSY_BERRY)}, + {ITEM_TO_BERRY(ITEM_ORAN_BERRY), ITEM_TO_BERRY(ITEM_PECHA_BERRY), ITEM_TO_BERRY(ITEM_QUALOT_BERRY)}, + {ITEM_TO_BERRY(ITEM_CHESTO_BERRY), ITEM_TO_BERRY(ITEM_PERSIM_BERRY), ITEM_TO_BERRY(ITEM_KELPSY_BERRY)}, + {ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), ITEM_TO_BERRY(ITEM_LEPPA_BERRY), ITEM_TO_BERRY(ITEM_HONDEW_BERRY)}, + {ITEM_TO_BERRY(ITEM_AGUAV_BERRY), ITEM_TO_BERRY(ITEM_FIGY_BERRY), ITEM_TO_BERRY(ITEM_GREPA_BERRY)}, + {ITEM_TO_BERRY(ITEM_LUM_BERRY), ITEM_TO_BERRY(ITEM_SITRUS_BERRY), ITEM_TO_BERRY(ITEM_TAMATO_BERRY)}, + {ITEM_TO_BERRY(ITEM_HONDEW_BERRY), ITEM_TO_BERRY(ITEM_YACHE_BERRY), ITEM_TO_BERRY(ITEM_LIECHI_BERRY)}, + {ITEM_TO_BERRY(ITEM_QUALOT_BERRY), ITEM_TO_BERRY(ITEM_TANGA_BERRY), ITEM_TO_BERRY(ITEM_GANLON_BERRY)}, + {ITEM_TO_BERRY(ITEM_GREPA_BERRY), ITEM_TO_BERRY(ITEM_ROSELI_BERRY), ITEM_TO_BERRY(ITEM_SALAC_BERRY)}, + {ITEM_TO_BERRY(ITEM_POMEG_BERRY), ITEM_TO_BERRY(ITEM_KASIB_BERRY), ITEM_TO_BERRY(ITEM_PETAYA_BERRY)}, + {ITEM_TO_BERRY(ITEM_KELPSY_BERRY), ITEM_TO_BERRY(ITEM_WACAN_BERRY), ITEM_TO_BERRY(ITEM_APICOT_BERRY)}, + {ITEM_TO_BERRY(ITEM_GANLON_BERRY), ITEM_TO_BERRY(ITEM_LIECHI_BERRY), ITEM_TO_BERRY(ITEM_KEE_BERRY)}, + {ITEM_TO_BERRY(ITEM_SALAC_BERRY), ITEM_TO_BERRY(ITEM_PETAYA_BERRY), ITEM_TO_BERRY(ITEM_MARANGA_BERRY)}, +}; + +static u8 GetMutationOutcome(u8 berry1, u8 berry2) +{ + u8 i; + for(i = 0; i < ARRAY_COUNT(sBerryMutations); i++) + { + if ((sBerryMutations[i][0] == berry1 && sBerryMutations[i][1] == berry2) + ||(sBerryMutations[i][0] == berry2 && sBerryMutations[i][1] == berry1)) + return sBerryMutations[i][2]; + } + return 0; +} + +static u8 TryForMutation(u8 berryTreeId, u8 berry) +{ + u8 i, j; + s16 x1, x2, y1, y2; + + // Get location of current tree + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + { + if (gObjectEvents[i].trainerRange_berryTreeId == berryTreeId && gObjectEvents[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) + break; + } + if (i == OBJECT_EVENTS_COUNT) + return 0; + + x1 = gObjectEvents[i].currentCoords.x; + y1 = gObjectEvents[i].currentCoords.y; + + // Try mutation for each adjacent tree + for (j = 0; j < OBJECT_EVENTS_COUNT; j++) + { + if (gObjectEvents[j].active && gObjectEvents[j].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH && GetStageByBerryTreeId(GetObjectEventBerryTreeId(j)) != BERRY_STAGE_NO_BERRY && j != i) + { + x2 = gObjectEvents[j].currentCoords.x; + y2 = gObjectEvents[j].currentCoords.y; + if (Random() % 100 < BERRY_MUTATION_CHANCE && ( + (x1 == x2 && y1 == y2 - 1) || + (x1 == x2 && y1 == y2 + 1) || + (x1 == x2 - 1 && y1 == y2) || + (x1 == x2 + 1 && y1 == y2))) + return GetMutationOutcome(berry, gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(j)].berry); + } + } + return 0; +} +#endif + +struct TreeMutationBitfield { + u8 a: 2; + u8 b: 2; + u8 c: 3; + u8 unused: 1; +}; + +union TreeMutation { + u8 value; + struct TreeMutationBitfield asField; +}; + +static u8 GetTreeMutationValue(u8 id) +{ + struct BerryTree *tree = GetBerryTreeInfo(id); + union TreeMutation myMutation; + if (!OW_BERRY_MUTATIONS || tree->stopGrowth) // Pre-generated trees shouldn't have mutations + return 0; + myMutation.asField.a = tree->mutationA; + myMutation.asField.b = tree->mutationB; + myMutation.asField.c = tree->mutationC; + return myMutation.value; +} + +static void SetTreeMutations(u8 id, u8 berry) +{ +#if OW_BERRY_MUTATIONS == TRUE + struct BerryTree *tree = GetBerryTreeInfo(id); + union TreeMutation myMutation; + + myMutation.value = TryForMutation(id, berry); + tree->mutationA = myMutation.asField.a; + tree->mutationB = myMutation.asField.b; + tree->mutationC = myMutation.asField.c; +#endif +} From 4628af3d55a2a2a3a751288c70d869451ac30554 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 30 Nov 2023 13:34:33 +0100 Subject: [PATCH 11/82] Non-watering mulch effects --- include/constants/items.h | 1 + src/berry.c | 38 +++++++++++++++++++++++++++++--------- src/data/items.h | 24 ++++++++++++++++-------- 3 files changed, 46 insertions(+), 17 deletions(-) diff --git a/include/constants/items.h b/include/constants/items.h index 074dcd9fc5..44147443eb 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -1015,6 +1015,7 @@ #define ITEM_TO_BERRY(itemId)(((itemId) - FIRST_BERRY_INDEX) + 1) #define ITEM_TO_MAIL(itemId)((itemId) - FIRST_MAIL_INDEX) #define MAIL_NONE 0xFF +#define ITEM_TO_MULCH(itemId)(((itemId) - ITEM_GROWTH_MULCH) + 1) #define NUM_TECHNICAL_MACHINES 100 #define NUM_HIDDEN_MACHINES 8 diff --git a/src/berry.c b/src/berry.c index c2698295ec..93b1e1e21a 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1566,13 +1566,24 @@ static bool32 BerryTreeGrow(struct BerryTree *tree) tree->watered4 = 0; tree->berryYield = 0; tree->stage = BERRY_STAGE_SPROUTED; - if (++tree->regrowthCount == 10) + if (++tree->regrowthCount == ((tree->mulch == ITEM_TO_MULCH(ITEM_GOOEY_MULCH)) ? 15 : 10)) *tree = gBlankBerryTree; break; } return TRUE; } +static u16 GetMulchAffectedGrowthRate(u16 berryDuration, u8 mulch, u8 stage) +{ + if (stage == BERRY_STAGE_BERRIES) + return berryDuration; + if (mulch == ITEM_TO_MULCH(ITEM_GROWTH_MULCH)) + return berryDuration / 4 * 3; + if (mulch == ITEM_TO_MULCH(ITEM_DAMP_MULCH)) + return berryDuration / 2 * 3; + return berryDuration; +} + void BerryTreeTimeUpdate(s32 minutes) { int i; @@ -1600,11 +1611,11 @@ void BerryTreeTimeUpdate(s32 minutes) break; } time -= tree->minutesUntilNextStage; - tree->minutesUntilNextStage = GetStageDurationByBerryType(tree->berry); + tree->minutesUntilNextStage = GetMulchAffectedGrowthRate(GetStageDurationByBerryType(tree->berry), tree->mulch, tree->stage); if (!BerryTreeGrow(tree)) break; if (tree->stage == BERRY_STAGE_BERRIES) - tree->minutesUntilNextStage *= 4; + tree->minutesUntilNextStage *= ((tree->mulch == ITEM_TO_MULCH(ITEM_STABLE_MULCH)) ? 6 : 4); } } } @@ -1615,14 +1626,13 @@ void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 allowGrowth) { struct BerryTree *tree = GetBerryTreeInfo(id); - *tree = gBlankBerryTree; tree->berry = berry; - tree->minutesUntilNextStage = GetStageDurationByBerryType(berry); + tree->minutesUntilNextStage = GetMulchAffectedGrowthRate(GetStageDurationByBerryType(berry), tree->mulch, stage); tree->stage = stage; if (stage == BERRY_STAGE_BERRIES) { tree->berryYield = CalcBerryYield(tree); - tree->minutesUntilNextStage *= 4; + tree->minutesUntilNextStage *= ((tree->mulch == ITEM_TO_MULCH(ITEM_STABLE_MULCH)) ? 6 : 4); } // Stop growth, to keep tree at this stage until the player has seen it @@ -1648,6 +1658,11 @@ u8 GetStageByBerryTreeId(u8 id) return gSaveBlock1Ptr->berryTrees[id].stage; } +u8 GetMulchByBerryTreeId(u8 id) +{ + return gSaveBlock1Ptr->berryTrees[id].mulch; +} + u8 ItemIdToBerryType(u16 item) { u16 berry = item - FIRST_BERRY_INDEX; @@ -1742,8 +1757,11 @@ static u8 CalcBerryYield(struct BerryTree *tree) const struct Berry *berry = GetBerryInfo(tree->berry); u8 min = berry->minYield; u8 max = berry->maxYield; + u8 result = CalcBerryYieldInternal(max, min, BerryTreeGetNumStagesWatered(tree)); + if (tree->mulch == ITEM_TO_MULCH(ITEM_RICH_MULCH) || tree->mulch == ITEM_TO_MULCH(ITEM_AMAZE_MULCH)) + result += 2; - return CalcBerryYieldInternal(max, min, BerryTreeGetNumStagesWatered(tree)); + return result; } static u8 GetBerryCountByBerryTreeId(u8 id) @@ -1909,7 +1927,7 @@ static u8 GetMutationOutcome(u8 berry1, u8 berry2) static u8 TryForMutation(u8 berryTreeId, u8 berry) { - u8 i, j; + u8 i, j, mulch; s16 x1, x2, y1, y2; // Get location of current tree @@ -1924,6 +1942,8 @@ static u8 TryForMutation(u8 berryTreeId, u8 berry) x1 = gObjectEvents[i].currentCoords.x; y1 = gObjectEvents[i].currentCoords.y; + mulch = GetMulchByBerryTreeId(GetObjectEventBerryTreeId(i)); + // Try mutation for each adjacent tree for (j = 0; j < OBJECT_EVENTS_COUNT; j++) { @@ -1931,7 +1951,7 @@ static u8 TryForMutation(u8 berryTreeId, u8 berry) { x2 = gObjectEvents[j].currentCoords.x; y2 = gObjectEvents[j].currentCoords.y; - if (Random() % 100 < BERRY_MUTATION_CHANCE && ( + if (Random() % 100 < (BERRY_MUTATION_CHANCE * (mulch == ITEM_TO_MULCH(ITEM_SURPRISE_MULCH) || mulch == ITEM_TO_MULCH(ITEM_AMAZE_MULCH))) && ( (x1 == x2 && y1 == y2 - 1) || (x1 == x2 && y1 == y2 + 1) || (x1 == x2 - 1 && y1 == y2) || diff --git a/src/data/items.h b/src/data/items.h index 670d7dd2e5..74c8ac014d 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2167,7 +2167,8 @@ const struct Item gItems[] = .description = sGrowthMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = ITEM_TO_MULCH(ITEM_GROWTH_MULCH), .flingPower = 30, }, @@ -2178,7 +2179,8 @@ const struct Item gItems[] = .description = sDampMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = ITEM_TO_MULCH(ITEM_DAMP_MULCH), .flingPower = 30, }, @@ -2189,7 +2191,8 @@ const struct Item gItems[] = .description = sStableMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = ITEM_TO_MULCH(ITEM_STABLE_MULCH), .flingPower = 30, }, @@ -2200,7 +2203,8 @@ const struct Item gItems[] = .description = sGooeyMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = ITEM_TO_MULCH(ITEM_GOOEY_MULCH), .flingPower = 30, }, @@ -2211,7 +2215,8 @@ const struct Item gItems[] = .description = sRichMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = ITEM_TO_MULCH(ITEM_RICH_MULCH), .flingPower = 30, }, @@ -2222,7 +2227,8 @@ const struct Item gItems[] = .description = sSurpriseMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = ITEM_TO_MULCH(ITEM_SURPRISE_MULCH), .flingPower = 30, }, @@ -2233,7 +2239,8 @@ const struct Item gItems[] = .description = sBoostMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = ITEM_TO_MULCH(ITEM_BOOST_MULCH), .flingPower = 30, }, @@ -2244,7 +2251,8 @@ const struct Item gItems[] = .description = sAmazeMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = ITEM_TO_MULCH(ITEM_AMAZE_MULCH), .flingPower = 30, }, From b02b3d074f7d5f33be0093170906de33ad4ef3c5 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sun, 3 Dec 2023 13:17:34 +0100 Subject: [PATCH 12/82] Add Mulch effects --- data/scripts/berry_tree.inc | 44 +++++++++++++++++++++++++++++++++ data/specials.inc | 3 +++ include/berry.h | 2 ++ include/constants/script_menu.h | 1 + include/item_menu.h | 2 ++ include/item_use.h | 1 + include/strings.h | 3 +++ src/berry.c | 34 +++++++++++++++++++++++++ src/data/script_menu.h | 8 ++++++ src/item_menu.c | 31 +++++++++++++++++++++-- src/item_use.c | 2 +- src/strings.c | 5 +++- 12 files changed, 132 insertions(+), 4 deletions(-) diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index c302f07eb0..f1ff5ba5a8 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -23,6 +23,8 @@ BerryTree_EventScript_CheckSoil:: faceplayer specialvar VAR_RESULT, PlayerHasBerries goto_if_eq VAR_RESULT, TRUE, BerryTree_EventScript_WantToPlant + specialvar VAR_RESULT, PlayerHasMulch + goto_if_eq VAR_RESULT, TRUE, BerryTree_EventScript_WantToMulch message BerryTree_Text_ItsSoftLoamySoil waitmessage waitbuttonpress @@ -30,11 +32,29 @@ BerryTree_EventScript_CheckSoil:: end BerryTree_EventScript_WantToPlant:: + specialvar VAR_RESULT, PlayerHasMulch + goto_if_eq VAR_RESULT, TRUE, BerryTree_EventScript_WantToPlantMulch msgbox BerryTree_Text_WantToPlant, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, BerryTree_EventScript_ChooseBerryToPlant goto_if_eq VAR_RESULT, NO, BerryTree_EventScript_CancelPlanting end +BerryTree_EventScript_WantToMulch:: + msgbox BerryTree_Text_WantToMulch, MSGBOX_YESNO + goto_if_eq VAR_RESULT, YES, BerryTree_EventScript_ChooseMulchToUse + goto_if_eq VAR_RESULT, NO, BerryTree_EventScript_CancelPlanting + end + +BerryTree_EventScript_WantToPlantMulch:: + message BerryTree_Text_ItsSoftLoamySoil + waitmessage + multichoice 0, 0, MULTI_BERRY_PLOT, FALSE + switch VAR_RESULT + case 0, BerryTree_EventScript_ChooseMulchToUse + case 1, BerryTree_EventScript_ChooseBerryToPlant + case 2, BerryTree_EventScript_CancelPlanting + case MULTI_B_PRESSED, BerryTree_EventScript_CancelPlanting + BerryTree_EventScript_ChooseBerryToPlant:: fadescreen FADE_TO_BLACK closemessage @@ -44,6 +64,15 @@ BerryTree_EventScript_ChooseBerryToPlant:: removeitem VAR_ITEM_ID call BerryTree_EventScript_PlantBerry +BerryTree_EventScript_ChooseMulchToUse:: + fadescreen FADE_TO_BLACK + closemessage + special Bag_ChooseMulch + waitstate + goto_if_eq VAR_ITEM_ID, 0, BerryTree_EventScript_CancelPlanting + removeitem VAR_ITEM_ID + call BerryTree_EventScript_UseMulch + BerryTree_EventScript_CancelPlanting:: release end @@ -194,6 +223,13 @@ BerryTree_EventScript_PlantBerry:: waitbuttonpress return +BerryTree_EventScript_UseMulch:: + special ObjectEventInteractionApplyMulch + message BerryTree_Text_ScatteredMulch + waitmessage + waitbuttonpress + return + BerryTree_Text_ItsSoftLoamySoil: .string "It's soft, loamy soil.$" @@ -201,10 +237,18 @@ BerryTree_Text_WantToPlant: .string "It's soft, loamy soil.\n" .string "Want to plant a BERRY?$" +BerryTree_Text_WantToMulch: + .string "It's soft, loamy soil.\n" + .string "Put down some fertilizer?$" + BerryTree_Text_PlantedOneBerry: .string "{PLAYER} planted one {STR_VAR_1} in\n" .string "the soft, loamy soil.$" +BerryTree_Text_ScatteredMulch: + .string "{PLAYER} scattered the {STR_VAR_1}\n" + .string "on the soft, loamy soil.$" + BerryTree_Text_BerryGrowthStage1: .string "One {STR_VAR_1} was planted here.$" diff --git a/data/specials.inc b/data/specials.inc index 34e86cad29..d001e44549 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -540,3 +540,6 @@ gSpecials:: def_special GetSprayId def_special GetLastUsedSprayType def_special TrySkyBattle + def_special PlayerHasMulch + def_special Bag_ChooseMulch + def_special ObjectEventInteractionApplyMulch diff --git a/include/berry.h b/include/berry.h index 22b9158ee2..68ac171370 100644 --- a/include/berry.h +++ b/include/berry.h @@ -19,10 +19,12 @@ u8 ItemIdToBerryType(u16 item); void GetBerryNameByBerryType(u8 berry, u8 *string); void ResetBerryTreeSparkleFlag(u8 id); void Bag_ChooseBerry(void); +void Bag_ChooseMulch(void); void ObjectEventInteractionGetBerryTreeData(void); void ObjectEventInteractionPlantBerryTree(void); void ObjectEventInteractionPickBerryTree(void); void ObjectEventInteractionRemoveBerryTree(void); +void ObjectEventInteractionApplyMulch(void); bool8 PlayerHasBerries(void); void SetBerryTreesSeen(void); diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h index c58df7335f..d341a65403 100644 --- a/include/constants/script_menu.h +++ b/include/constants/script_menu.h @@ -122,6 +122,7 @@ #define MULTI_SLATEPORT_TENT_RULES 111 #define MULTI_FALLARBOR_TENT_RULES 112 #define MULTI_TAG_MATCH_TYPE 113 +#define MULTI_BERRY_PLOT 114 // Lilycove SS Tidal Multichoice Selections #define SSTIDAL_SELECTION_SLATEPORT 0 diff --git a/include/item_menu.h b/include/item_menu.h index d4ae5a4c5f..75912eca62 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -17,6 +17,7 @@ enum { ITEMMENULOCATION_APPRENTICE, ITEMMENULOCATION_WALLY, ITEMMENULOCATION_PCBOX, + ITEMMENULOCATION_BERRY_TREE_MULCH, ITEMMENULOCATION_LAST, }; @@ -101,6 +102,7 @@ void DoWallyTutorialBagMenu(void); void ResetBagScrollPositions(void); void ChooseBerryForMachine(void (*exitCallback)(void)); void CB2_ChooseBerry(void); +void CB2_ChooseMulch(void); void Task_FadeAndCloseBagMenu(u8 taskId); void BagMenu_YesNo(u8 taskId, u8 windowType, const struct YesNoFuncTable* funcTable); void UpdatePocketItemList(u8 pocketId); diff --git a/include/item_use.h b/include/item_use.h index 5abe87f057..22833f299d 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -41,6 +41,7 @@ void ItemUseInBattle_PartyMenuChooseMove(u8 taskId); void Task_UseDigEscapeRopeOnField(u8 taskId); u8 CanUseDigOrEscapeRopeOnCurMap(void); u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId); +void DisplayDadsAdviceCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField); enum { BALL_THROW_UNABLE_TWO_MONS, diff --git a/include/strings.h b/include/strings.h index 9184b4663a..8a26819c5a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -3055,4 +3055,7 @@ extern const u8 gText_ExpShareOff[]; extern const u8 gText_BasePointsResetToZero[]; +extern const u8 gText_Fertilize[]; +extern const u8 gText_PlantBerry[]; + #endif // GUARD_STRINGS_H diff --git a/src/berry.c b/src/berry.c index 93b1e1e21a..98f9cc3b17 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1825,6 +1825,11 @@ void Bag_ChooseBerry(void) SetMainCallback2(CB2_ChooseBerry); } +void Bag_ChooseMulch(void) +{ + SetMainCallback2(CB2_ChooseMulch); +} + void ObjectEventInteractionPlantBerryTree(void) { u8 berry = ItemIdToBerryType(gSpecialVar_ItemId); @@ -1833,6 +1838,14 @@ void ObjectEventInteractionPlantBerryTree(void) ObjectEventInteractionGetBerryTreeData(); } +void ObjectEventInteractionApplyMulch(void) +{ + u8 mulch = ITEM_TO_MULCH(gSpecialVar_ItemId); + + gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(gSelectedObjectEvent)].mulch = mulch; + StringExpandPlaceholders(gStringVar1, gItems[gSpecialVar_ItemId].name); +} + void ObjectEventInteractionPickBerryTree(void) { u8 id = GetObjectEventBerryTreeId(gSelectedObjectEvent); @@ -1892,6 +1905,27 @@ void SetBerryTreesSeen(void) } } +bool8 PlayerHasMulch(void) +{ + if (CheckBagHasItem(ITEM_GROWTH_MULCH, 1)) + return TRUE; + if (CheckBagHasItem(ITEM_DAMP_MULCH, 1)) + return TRUE; + if (CheckBagHasItem(ITEM_STABLE_MULCH, 1)) + return TRUE; + if (CheckBagHasItem(ITEM_GOOEY_MULCH, 1)) + return TRUE; + if (CheckBagHasItem(ITEM_RICH_MULCH, 1)) + return TRUE; + if (CheckBagHasItem(ITEM_SURPRISE_MULCH, 1)) + return TRUE; + if (CheckBagHasItem(ITEM_BOOST_MULCH, 1)) + return TRUE; + if (CheckBagHasItem(ITEM_AMAZE_MULCH, 1)) + return TRUE; + return FALSE; +} + // Berry mutations #if OW_BERRY_MUTATIONS == TRUE #define BERRY_MUTATION_CHANCE 25 diff --git a/src/data/script_menu.h b/src/data/script_menu.h index 79355748c7..c5afa87043 100644 --- a/src/data/script_menu.h +++ b/src/data/script_menu.h @@ -771,6 +771,13 @@ static const struct MenuAction MultichoiceList_TagMatchType[] = {gText_Exit}, }; +static const struct MenuAction MultichoiceList_BerryPlot[] = +{ + {gText_Fertilize}, + {gText_PlantBerry}, + {gText_Exit}, +}; + static const struct MenuAction MultichoiceList_Exit[] = { {gText_Exit}, @@ -898,6 +905,7 @@ static const struct MultichoiceListStruct sMultichoiceLists[] = [MULTI_SLATEPORT_TENT_RULES] = MULTICHOICE(MultichoiceList_SlateportTentRules), [MULTI_FALLARBOR_TENT_RULES] = MULTICHOICE(MultichoiceList_FallarborTentRules), [MULTI_TAG_MATCH_TYPE] = MULTICHOICE(MultichoiceList_TagMatchType), + [MULTI_BERRY_PLOT] = MULTICHOICE(MultichoiceList_BerryPlot), }; const u8 *const gStdStrings[] = diff --git a/src/item_menu.c b/src/item_menu.c index 8067742579..3753e4f2dc 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -210,6 +210,7 @@ static void ConfirmToss(u8); static void CancelToss(u8); static void ConfirmSell(u8); static void CancelSell(u8); +static void Task_FadeAndCloseBagMenuIfMulch(u8 taskId); static const struct BgTemplate sBgTemplates_ItemMenu[] = { @@ -351,7 +352,8 @@ static const TaskFunc sContextMenuFuncs[] = { [ITEMMENULOCATION_QUIZ_LADY] = Task_ItemContext_Normal, [ITEMMENULOCATION_APPRENTICE] = Task_ItemContext_Normal, [ITEMMENULOCATION_WALLY] = NULL, - [ITEMMENULOCATION_PCBOX] = Task_ItemContext_GiveToPC + [ITEMMENULOCATION_PCBOX] = Task_ItemContext_GiveToPC, + [ITEMMENULOCATION_BERRY_TREE_MULCH] = Task_FadeAndCloseBagMenuIfMulch, }; static const struct YesNoFuncTable sYesNoTossFunctions = {ConfirmToss, CancelToss}; @@ -577,6 +579,12 @@ void CB2_ChooseBerry(void) GoToBagMenu(ITEMMENULOCATION_BERRY_TREE, BERRIES_POCKET, CB2_ReturnToFieldContinueScript); } +// Choosing mulch to use +void CB2_ChooseMulch(void) +{ + GoToBagMenu(ITEMMENULOCATION_BERRY_TREE_MULCH, ITEMS_POCKET, CB2_ReturnToFieldContinueScript); +} + // Choosing berry for Berry Blender or Berry Crush void ChooseBerryForMachine(void (*exitCallback)(void)) { @@ -629,7 +637,8 @@ void GoToBagMenu(u8 location, u8 pocket, void ( *exitCallback)()) if (pocket < POCKETS_COUNT) gBagPosition.pocket = pocket; if (gBagPosition.location == ITEMMENULOCATION_BERRY_TREE || - gBagPosition.location == ITEMMENULOCATION_BERRY_BLENDER_CRUSH) + gBagPosition.location == ITEMMENULOCATION_BERRY_BLENDER_CRUSH || + gBagPosition.location == ITEMMENULOCATION_BERRY_TREE_MULCH) gBagMenu->pocketSwitchDisabled = TRUE; gBagMenu->newScreenCallback = NULL; gBagMenu->toSwapPos = NOT_SWAPPING; @@ -1078,6 +1087,23 @@ void Task_FadeAndCloseBagMenu(u8 taskId) gTasks[taskId].func = Task_CloseBagMenu; } +static void Task_FadeAndCloseBagMenuIfMulch(u8 taskId) +{ + if (gSpecialVar_ItemId == ITEM_GROWTH_MULCH || + gSpecialVar_ItemId == ITEM_DAMP_MULCH || + gSpecialVar_ItemId == ITEM_STABLE_MULCH || + gSpecialVar_ItemId == ITEM_GOOEY_MULCH || + gSpecialVar_ItemId == ITEM_RICH_MULCH || + gSpecialVar_ItemId == ITEM_SURPRISE_MULCH || + gSpecialVar_ItemId == ITEM_BOOST_MULCH || + gSpecialVar_ItemId == ITEM_AMAZE_MULCH) + { + Task_FadeAndCloseBagMenu(taskId); + return; + } + DisplayDadsAdviceCannotUseItemMessage(taskId, FALSE); +} + static void Task_CloseBagMenu(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -1588,6 +1614,7 @@ static void OpenContextMenu(u8 taskId) case ITEMMENULOCATION_SHOP: case ITEMMENULOCATION_BERRY_TREE: case ITEMMENULOCATION_ITEMPC: + case ITEMMENULOCATION_BERRY_TREE_MULCH: default: if (MenuHelpers_IsLinkActive() == TRUE || InUnionRoom() == TRUE) { diff --git a/src/item_use.c b/src/item_use.c index 11d92e7427..25b5b988fb 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -158,7 +158,7 @@ static void DisplayCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyIte DisplayItemMessageOnField(taskId, gStringVar4, Task_CloseCantUseKeyItemMessage); } -static void DisplayDadsAdviceCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField) +void DisplayDadsAdviceCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField) { DisplayCannotUseItemMessage(taskId, isUsingRegisteredKeyItemOnField, gText_DadsAdvice); } diff --git a/src/strings.c b/src/strings.c index f23ad3fca5..565f0a8f62 100644 --- a/src/strings.c +++ b/src/strings.c @@ -267,7 +267,8 @@ const u8 *const gBagMenu_ReturnToStrings[] = [ITEMMENULOCATION_QUIZ_LADY] = gText_TheField, [ITEMMENULOCATION_APPRENTICE] = gText_TheField, [ITEMMENULOCATION_WALLY] = gText_TheBattle, - [ITEMMENULOCATION_PCBOX] = gText_ThePC + [ITEMMENULOCATION_PCBOX] = gText_ThePC, + [ITEMMENULOCATION_BERRY_TREE_MULCH] = gText_TheField, }; const u8 *const gPyramidBagMenu_ReturnToStrings[] = @@ -1843,3 +1844,5 @@ const u8 gText_Berries[] = _("BERRIES"); const u8 gText_ExpShareOn[] = _("The Exp. Share has been turned on.{PAUSE_UNTIL_PRESS}"); const u8 gText_ExpShareOff[] = _("The Exp. Share has been turned off.{PAUSE_UNTIL_PRESS}"); const u8 gText_BasePointsResetToZero[] = _("{STR_VAR_1}'s base points\nwere all reset to zero!{PAUSE_UNTIL_PRESS}"); +const u8 gText_Fertilize[] = _("FERTILIZE"); +const u8 gText_PlantBerry[] = _("PLANT BERRY"); From 45e19d22fad96e87532bc184e4dd5ddb2df58045 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sun, 3 Dec 2023 13:22:58 +0100 Subject: [PATCH 13/82] Remove lost comment --- data/scripts/berry_tree.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index f1ff5ba5a8..ac68dc4b96 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -327,7 +327,6 @@ BerryTree_EventScript_BerryPocketFull_Mutation:: end BerryTree_EventScript_PickBerry_Mutation:: - @ add items special IncrementDailyPickedBerries special ObjectEventInteractionRemoveBerryTree message BerryTree_Text_PickedTheBerry_Mutation From bd354f28e310893539dc9bb2e86648f9bbddd5be Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Mon, 4 Dec 2023 00:17:41 +0100 Subject: [PATCH 14/82] Allow for storing bonus Berries in Berry Yield --- src/berry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/berry.c b/src/berry.c index 98f9cc3b17..0f2091c775 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1553,7 +1553,7 @@ static bool32 BerryTreeGrow(struct BerryTree *tree) case BERRY_STAGE_NO_BERRY: return FALSE; case BERRY_STAGE_FLOWERING: - tree->berryYield = CalcBerryYield(tree); + tree->berryYield = tree->berryYield + CalcBerryYield(tree); case BERRY_STAGE_PLANTED: case BERRY_STAGE_SPROUTED: case BERRY_STAGE_TALLER: @@ -1631,7 +1631,7 @@ void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 allowGrowth) tree->stage = stage; if (stage == BERRY_STAGE_BERRIES) { - tree->berryYield = CalcBerryYield(tree); + tree->berryYield = tree->berryYield + CalcBerryYield(tree); tree->minutesUntilNextStage *= ((tree->mulch == ITEM_TO_MULCH(ITEM_STABLE_MULCH)) ? 6 : 4); } From 0d70d9951da2aeca123e1f0376ab48b914f0001b Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Mon, 4 Dec 2023 00:33:25 +0100 Subject: [PATCH 15/82] Put Mulch behind config --- data/scripts/berry_tree.inc | 55 +++++++++++++++++-------------- include/config/overworld.h | 1 + src/berry.c | 4 ++- src/data/items.h | 16 ++++----- src/data/text/item_descriptions.h | 5 +++ 5 files changed, 47 insertions(+), 34 deletions(-) diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index ac68dc4b96..bea246fde3 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -40,12 +40,15 @@ BerryTree_EventScript_WantToPlant:: end BerryTree_EventScript_WantToMulch:: +.if OW_MULCH_USAGE == TRUE msgbox BerryTree_Text_WantToMulch, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, BerryTree_EventScript_ChooseMulchToUse goto_if_eq VAR_RESULT, NO, BerryTree_EventScript_CancelPlanting +.endif end BerryTree_EventScript_WantToPlantMulch:: +.if OW_MULCH_USAGE == TRUE message BerryTree_Text_ItsSoftLoamySoil waitmessage multichoice 0, 0, MULTI_BERRY_PLOT, FALSE @@ -55,15 +58,6 @@ BerryTree_EventScript_WantToPlantMulch:: case 2, BerryTree_EventScript_CancelPlanting case MULTI_B_PRESSED, BerryTree_EventScript_CancelPlanting -BerryTree_EventScript_ChooseBerryToPlant:: - fadescreen FADE_TO_BLACK - closemessage - special Bag_ChooseBerry - waitstate - goto_if_eq VAR_ITEM_ID, 0, BerryTree_EventScript_CancelPlanting - removeitem VAR_ITEM_ID - call BerryTree_EventScript_PlantBerry - BerryTree_EventScript_ChooseMulchToUse:: fadescreen FADE_TO_BLACK closemessage @@ -72,6 +66,16 @@ BerryTree_EventScript_ChooseMulchToUse:: goto_if_eq VAR_ITEM_ID, 0, BerryTree_EventScript_CancelPlanting removeitem VAR_ITEM_ID call BerryTree_EventScript_UseMulch +.endif + +BerryTree_EventScript_ChooseBerryToPlant:: + fadescreen FADE_TO_BLACK + closemessage + special Bag_ChooseBerry + waitstate + goto_if_eq VAR_ITEM_ID, 0, BerryTree_EventScript_CancelPlanting + removeitem VAR_ITEM_ID + call BerryTree_EventScript_PlantBerry BerryTree_EventScript_CancelPlanting:: release @@ -223,13 +227,6 @@ BerryTree_EventScript_PlantBerry:: waitbuttonpress return -BerryTree_EventScript_UseMulch:: - special ObjectEventInteractionApplyMulch - message BerryTree_Text_ScatteredMulch - waitmessage - waitbuttonpress - return - BerryTree_Text_ItsSoftLoamySoil: .string "It's soft, loamy soil.$" @@ -237,18 +234,10 @@ BerryTree_Text_WantToPlant: .string "It's soft, loamy soil.\n" .string "Want to plant a BERRY?$" -BerryTree_Text_WantToMulch: - .string "It's soft, loamy soil.\n" - .string "Put down some fertilizer?$" - BerryTree_Text_PlantedOneBerry: .string "{PLAYER} planted one {STR_VAR_1} in\n" .string "the soft, loamy soil.$" -BerryTree_Text_ScatteredMulch: - .string "{PLAYER} scattered the {STR_VAR_1}\n" - .string "on the soft, loamy soil.$" - BerryTree_Text_BerryGrowthStage1: .string "One {STR_VAR_1} was planted here.$" @@ -364,5 +353,21 @@ BerryTree_Text_PutAwayBerry_Mutation: .string "BERRIES POCKET.\p" .string "The soil returned to its soft and\n" .string "loamy state.$" - +.endif + +.if OW_MULCH_USAGE == TRUE +BerryTree_EventScript_UseMulch:: + special ObjectEventInteractionApplyMulch + message BerryTree_Text_ScatteredMulch + waitmessage + waitbuttonpress + return + +BerryTree_Text_WantToMulch: + .string "It's soft, loamy soil.\n" + .string "Put down some fertilizer?$" + +BerryTree_Text_ScatteredMulch: + .string "{PLAYER} scattered the {STR_VAR_1}\n" + .string "on the soft, loamy soil.$" .endif diff --git a/include/config/overworld.h b/include/config/overworld.h index fb24c680b0..b15e6c3560 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -14,6 +14,7 @@ // Berry settings #define OW_BERRY_MUTATIONS FALSE // If enabled, Berry plants can mutate based on berries planted next to them. +#define OW_MULCH_USAGE TRUE // If enabled, Mulch can be used on soil to fertilize it. Otherwise, it is considered unusable. // Out-of-battle Ability effects #define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8, if a Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same Nature, as opposed to 50% previously. Stationary Pokémon are excluded in Gen3. In Gen6, all No Eggs Discovered gift Pokémon will have the same Nature, while in Gen7 all gift Pokémon will, regardless of Egg Group - In Gen 8, no gift Pokémon are affected. In Gen9, this ability has no out-of-battle effect. diff --git a/src/berry.c b/src/berry.c index 0f2091c775..79109984b6 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1758,7 +1758,7 @@ static u8 CalcBerryYield(struct BerryTree *tree) u8 min = berry->minYield; u8 max = berry->maxYield; u8 result = CalcBerryYieldInternal(max, min, BerryTreeGetNumStagesWatered(tree)); - if (tree->mulch == ITEM_TO_MULCH(ITEM_RICH_MULCH) || tree->mulch == ITEM_TO_MULCH(ITEM_AMAZE_MULCH)) + if (OW_MULCH_USAGE && (tree->mulch == ITEM_TO_MULCH(ITEM_RICH_MULCH) || tree->mulch == ITEM_TO_MULCH(ITEM_AMAZE_MULCH))) result += 2; return result; @@ -1907,6 +1907,8 @@ void SetBerryTreesSeen(void) bool8 PlayerHasMulch(void) { + if (!OW_MULCH_USAGE) + return FALSE; if (CheckBagHasItem(ITEM_GROWTH_MULCH, 1)) return TRUE; if (CheckBagHasItem(ITEM_DAMP_MULCH, 1)) diff --git a/src/data/items.h b/src/data/items.h index 74c8ac014d..f1cf2c95a5 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2164,7 +2164,7 @@ const struct Item gItems[] = { .name = _("Growth Mulch"), .price = 200, - .description = sGrowthMulchDesc, + .description = OW_MULCH_USAGE ? sGrowthMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2176,7 +2176,7 @@ const struct Item gItems[] = { .name = _("Damp Mulch"), .price = 200, - .description = sDampMulchDesc, + .description = OW_MULCH_USAGE ? sDampMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2188,7 +2188,7 @@ const struct Item gItems[] = { .name = _("Stable Mulch"), .price = 200, - .description = sStableMulchDesc, + .description = OW_MULCH_USAGE ? sStableMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2200,7 +2200,7 @@ const struct Item gItems[] = { .name = _("Gooey Mulch"), .price = 200, - .description = sGooeyMulchDesc, + .description = OW_MULCH_USAGE ? sGooeyMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2212,7 +2212,7 @@ const struct Item gItems[] = { .name = _("Rich Mulch"), .price = 200, - .description = sRichMulchDesc, + .description = OW_MULCH_USAGE ? sRichMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2224,7 +2224,7 @@ const struct Item gItems[] = { .name = _("SurprseMulch"), .price = 200, - .description = sSurpriseMulchDesc, + .description = OW_MULCH_USAGE ? sSurpriseMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2236,7 +2236,7 @@ const struct Item gItems[] = { .name = _("Boost Mulch"), .price = 200, - .description = sBoostMulchDesc, + .description = OW_MULCH_USAGE ? sBoostMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2248,7 +2248,7 @@ const struct Item gItems[] = { .name = _("Amaze Mulch"), .price = 200, - .description = sAmazeMulchDesc, + .description = OW_MULCH_USAGE ? sAmazeMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 422549a186..c129597f95 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -1008,6 +1008,11 @@ static const u8 sAmazeMulchDesc[] = _( "Surprising and\n" "Boosting as well."); +static const u8 sGenericMulchDesc[] = _( + "A fertilizer that\n" + "is unsuitable for\n" + "local soil."); + // Apricorns static const u8 sRedApricornDesc[] = _( "A red apricorn.\n" From 6da03e6cf00947e6c38327381e0e6a3f472a95d7 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Tue, 5 Dec 2023 02:16:22 +0100 Subject: [PATCH 16/82] Add Berry color and drain rate --- data/scripts/berry_tree.inc | 6 +- include/config/overworld.h | 8 +- include/constants/berry.h | 7 ++ include/global.berry.h | 9 +- src/berry.c | 169 +++++++++++++++++++++++++++++++++++- src/data/items.h | 16 ++-- 6 files changed, 197 insertions(+), 18 deletions(-) diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index bea246fde3..88d795532d 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -40,7 +40,7 @@ BerryTree_EventScript_WantToPlant:: end BerryTree_EventScript_WantToMulch:: -.if OW_MULCH_USAGE == TRUE +.if OW_BERRY_MULCH_USAGE == TRUE msgbox BerryTree_Text_WantToMulch, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, BerryTree_EventScript_ChooseMulchToUse goto_if_eq VAR_RESULT, NO, BerryTree_EventScript_CancelPlanting @@ -48,7 +48,7 @@ BerryTree_EventScript_WantToMulch:: end BerryTree_EventScript_WantToPlantMulch:: -.if OW_MULCH_USAGE == TRUE +.if OW_BERRY_MULCH_USAGE == TRUE message BerryTree_Text_ItsSoftLoamySoil waitmessage multichoice 0, 0, MULTI_BERRY_PLOT, FALSE @@ -355,7 +355,7 @@ BerryTree_Text_PutAwayBerry_Mutation: .string "loamy state.$" .endif -.if OW_MULCH_USAGE == TRUE +.if OW_BERRY_MULCH_USAGE == TRUE BerryTree_EventScript_UseMulch:: special ObjectEventInteractionApplyMulch message BerryTree_Text_ScatteredMulch diff --git a/include/config/overworld.h b/include/config/overworld.h index b15e6c3560..9d181a3174 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -13,8 +13,12 @@ #define OW_PC_JAPAN_WALDA_ICONS TRUE // In the US release of Emerald, the Cross, Bolt, and Plusle icons for Walda's wallpapers were left blank from the Japan release. Setting this to TRUE will restore them. // Berry settings -#define OW_BERRY_MUTATIONS FALSE // If enabled, Berry plants can mutate based on berries planted next to them. -#define OW_MULCH_USAGE TRUE // If enabled, Mulch can be used on soil to fertilize it. Otherwise, it is considered unusable. +#define OW_BERRY_MUTATIONS FALSE // If enabled, Berry plants can mutate based on berries planted next to them. +#define OW_BERRY_MULCH_USAGE TRUE // If enabled, Mulch can be used on soil to fertilize it. Otherwise, it is considered unusable. +#define OW_BERRY_WEEDS FALSE // If enabled, weeds may grow on Berry plants that the player needs to take care of. +#define OW_BERRY_PESTS FALSE // If enabled, pests may approach Berry plants that the player needs to take care of. +#define OW_BERRY_MOISTURE FALSE // If enabled, Berry watering is not a matter of watering it once per stage, but rather of keeping the soil moist. +#define OW_BERRY_VARIABLE_DRAIN_RATE FALSE // If moisture is enabled, this setting uses the Gen4 drain rates for different berries // Out-of-battle Ability effects #define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8, if a Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same Nature, as opposed to 50% previously. Stationary Pokémon are excluded in Gen3. In Gen6, all No Eggs Discovered gift Pokémon will have the same Nature, while in Gen7 all gift Pokémon will, regardless of Egg Group - In Gen 8, no gift Pokémon are affected. In Gen9, this ability has no out-of-battle effect. diff --git a/include/constants/berry.h b/include/constants/berry.h index 3ba59c0f5e..0385e57447 100644 --- a/include/constants/berry.h +++ b/include/constants/berry.h @@ -10,6 +10,13 @@ #define BERRY_FIRMNESS_VERY_HARD 4 #define BERRY_FIRMNESS_SUPER_HARD 5 +#define BERRY_COLOR_RED 0 +#define BERRY_COLOR_BLUE 1 +#define BERRY_COLOR_PURPLE 2 +#define BERRY_COLOR_GREEN 3 +#define BERRY_COLOR_YELLOW 4 +#define BERRY_COLOR_PINK 5 + #define FLAVOR_SPICY 0 #define FLAVOR_DRY 1 #define FLAVOR_SWEET 2 diff --git a/include/global.berry.h b/include/global.berry.h index cd6e18e7fb..621340ed2a 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -7,7 +7,8 @@ struct Berry { const u8 name[BERRY_NAME_LENGTH + 1]; - u8 firmness; + u8 firmness:4; + u8 color:4; u16 size; u8 maxYield; u8 minYield; @@ -20,6 +21,7 @@ struct Berry u8 bitter; u8 sour; u8 smoothness; + u8 drainRate; }; // with no const fields @@ -27,7 +29,8 @@ struct Berry struct Berry2 { u8 name[BERRY_NAME_LENGTH + 1]; - u8 firmness; + u8 firmness:4; + u8 color:4; u16 size; u8 maxYield; u8 minYield; @@ -40,7 +43,7 @@ struct Berry2 u8 bitter; u8 sour; u8 smoothness; - //u8 padding; + u8 drainRate; }; struct EnigmaBerry diff --git a/src/berry.c b/src/berry.c index 79109984b6..31d23538d3 100644 --- a/src/berry.c +++ b/src/berry.c @@ -168,6 +168,7 @@ const struct Berry gBerries[] = { .name = _("Cheri"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_RED, .size = 20, .maxYield = 3, .minYield = 2, @@ -180,12 +181,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 25, + .drainRate = 15, }, [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = { .name = _("Chesto"), .firmness = BERRY_FIRMNESS_SUPER_HARD, + .color = BERRY_COLOR_PURPLE, .size = 80, .maxYield = 3, .minYield = 2, @@ -198,12 +201,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 25, + .drainRate = 15, }, [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Pecha"), .firmness = BERRY_FIRMNESS_VERY_SOFT, + .color = BERRY_COLOR_PINK, .size = 40, .maxYield = 3, .minYield = 2, @@ -216,12 +221,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 25, + .drainRate = 15, }, [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = { .name = _("Rawst"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_GREEN, .size = 32, .maxYield = 3, .minYield = 2, @@ -234,12 +241,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 0, .smoothness = 25, + .drainRate = 15, }, [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = { .name = _("Aspear"), .firmness = BERRY_FIRMNESS_SUPER_HARD, + .color = BERRY_COLOR_YELLOW, .size = 50, .maxYield = 3, .minYield = 2, @@ -252,12 +261,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 10, .smoothness = 25, + .drainRate = 15, }, [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Leppa"), .firmness = BERRY_FIRMNESS_VERY_HARD, + .color = BERRY_COLOR_RED, .size = 28, .maxYield = 3, .minYield = 2, @@ -270,12 +281,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 10, .smoothness = 20, + .drainRate = 15, }, [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = { .name = _("Oran"), .firmness = BERRY_FIRMNESS_SUPER_HARD, + .color = BERRY_COLOR_BLUE, .size = 35, .maxYield = 3, .minYield = 2, @@ -288,12 +301,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 10, .smoothness = 20, + .drainRate = 15, }, [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = { .name = _("Persim"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_PINK, .size = 47, .maxYield = 3, .minYield = 2, @@ -306,12 +321,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 10, .smoothness = 20, + .drainRate = 15, }, [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = { .name = _("Lum"), .firmness = BERRY_FIRMNESS_SUPER_HARD, + .color = BERRY_COLOR_GREEN, .size = 34, .maxYield = 2, .minYield = 1, @@ -324,12 +341,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 10, .smoothness = 20, + .drainRate = 8, }, [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = { .name = _("Sitrus"), .firmness = BERRY_FIRMNESS_VERY_HARD, + .color = BERRY_COLOR_YELLOW, .size = 95, .maxYield = 3, .minYield = 2, @@ -342,12 +361,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 10, .smoothness = 20, + .drainRate = 7, }, [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = { .name = _("Figy"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_RED, .size = 100, .maxYield = 3, .minYield = 2, @@ -360,12 +381,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 25, + .drainRate = 10, }, [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = { .name = _("Wiki"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_PURPLE, .size = 115, .maxYield = 3, .minYield = 2, @@ -378,12 +401,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 25, + .drainRate = 10, }, [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = { .name = _("Mago"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_PINK, .size = 126, .maxYield = 3, .minYield = 2, @@ -396,12 +421,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 25, + .drainRate = 10, }, [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = { .name = _("Aguav"), .firmness = BERRY_FIRMNESS_SUPER_HARD, + .color = BERRY_COLOR_GREEN, .size = 64, .maxYield = 3, .minYield = 2, @@ -414,12 +441,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 0, .smoothness = 25, + .drainRate = 10, }, [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Iapapa"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_YELLOW, .size = 223, .maxYield = 3, .minYield = 2, @@ -432,12 +461,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 10, .smoothness = 25, + .drainRate = 10, }, [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = { .name = _("Razz"), .firmness = BERRY_FIRMNESS_VERY_HARD, + .color = BERRY_COLOR_RED, .size = 120, .maxYield = 6, .minYield = 3, @@ -450,12 +481,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 20, + .drainRate = 35, }, [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = { .name = _("Bluk"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_PURPLE, .size = 108, .maxYield = 6, .minYield = 3, @@ -468,12 +501,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 20, + .drainRate = 35, }, [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = { .name = _("Nanab"), .firmness = BERRY_FIRMNESS_VERY_HARD, + .color = BERRY_COLOR_PINK, .size = 77, .maxYield = 6, .minYield = 3, @@ -486,12 +521,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 0, .smoothness = 20, + .drainRate = 35, }, [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = { .name = _("Wepear"), .firmness = BERRY_FIRMNESS_SUPER_HARD, + .color = BERRY_COLOR_GREEN, .size = 74, .maxYield = 6, .minYield = 3, @@ -504,12 +541,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 10, .smoothness = 20, + .drainRate = 35, }, [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = { .name = _("Pinap"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_YELLOW, .size = 80, .maxYield = 6, .minYield = 3, @@ -522,12 +561,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 10, .smoothness = 20, + .drainRate = 35, }, [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = { .name = _("Pomeg"), .firmness = BERRY_FIRMNESS_VERY_HARD, + .color = BERRY_COLOR_RED, .size = 135, .maxYield = 6, .minYield = 2, @@ -540,12 +581,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 0, .smoothness = 20, + .drainRate = 8, }, [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = { .name = _("Kelpsy"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_BLUE, .size = 150, .maxYield = 6, .minYield = 2, @@ -558,12 +601,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 10, .smoothness = 20, + .drainRate = 8, }, [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = { .name = _("Qualot"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_YELLOW, .size = 110, .maxYield = 6, .minYield = 2, @@ -576,12 +621,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 10, .smoothness = 20, + .drainRate = 8, }, [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = { .name = _("Hondew"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_GREEN, .size = 162, .maxYield = 6, .minYield = 2, @@ -594,12 +641,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 0, .smoothness = 20, + .drainRate = 8, }, [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Grepa"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_YELLOW, .size = 149, .maxYield = 6, .minYield = 2, @@ -612,12 +661,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 10, .smoothness = 20, + .drainRate = 8, }, [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = { .name = _("Tamato"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_RED, .size = 200, .maxYield = 4, .minYield = 2, @@ -630,12 +681,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 30, + .drainRate = 8, }, [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = { .name = _("Cornn"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_PURPLE, .size = 75, .maxYield = 4, .minYield = 2, @@ -648,12 +701,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 30, + .drainRate = 10, }, [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = { .name = _("Magost"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_PINK, .size = 140, .maxYield = 4, .minYield = 2, @@ -666,12 +721,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 0, .smoothness = 30, + .drainRate = 10, }, [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Rabuta"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_GREEN, .size = 226, .maxYield = 4, .minYield = 2, @@ -684,12 +741,14 @@ const struct Berry gBerries[] = .bitter = 20, .sour = 10, .smoothness = 30, + .drainRate = 10, }, [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = { .name = _("Nomel"), .firmness = BERRY_FIRMNESS_SUPER_HARD, + .color = BERRY_COLOR_YELLOW, .size = 285, .maxYield = 4, .minYield = 2, @@ -702,12 +761,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 20, .smoothness = 30, + .drainRate = 10, }, [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = { .name = _("Spelon"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_RED, .size = 133, .maxYield = 2, .minYield = 1, @@ -720,12 +781,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 70, + .drainRate = 8, }, [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = { .name = _("Pamtre"), .firmness = BERRY_FIRMNESS_VERY_SOFT, + .color = BERRY_COLOR_PURPLE, .size = 244, .maxYield = 2, .minYield = 1, @@ -738,12 +801,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 70, + .drainRate = 8, }, [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = { .name = _("Watmel"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_PINK, .size = 250, .maxYield = 2, .minYield = 1, @@ -756,12 +821,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 0, .smoothness = 70, + .drainRate = 8, }, [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = { .name = _("Durin"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_GREEN, .size = 280, .maxYield = 2, .minYield = 1, @@ -774,12 +841,14 @@ const struct Berry gBerries[] = .bitter = 40, .sour = 10, .smoothness = 70, + .drainRate = 8, }, [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = { .name = _("Belue"), .firmness = BERRY_FIRMNESS_VERY_SOFT, + .color = BERRY_COLOR_PURPLE, .size = 300, .maxYield = 2, .minYield = 1, @@ -792,12 +861,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 40, .smoothness = 70, + .drainRate = 8, }, [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = { .name = _("Chilan"), .firmness = BERRY_FIRMNESS_VERY_SOFT, + .color = BERRY_COLOR_YELLOW, .size = 34, .maxYield = 5, .minYield = 2, @@ -810,12 +881,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 35, + .drainRate = 6, }, [ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Occa"), .firmness = BERRY_FIRMNESS_SUPER_HARD, + .color = BERRY_COLOR_RED, .size = 90, .maxYield = 5, .minYield = 2, @@ -828,12 +901,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 30, + .drainRate = 6, }, [ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = { .name = _("Passho"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_BLUE, .size = 33, .maxYield = 5, .minYield = 2, @@ -846,12 +921,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 0, .smoothness = 30, + .drainRate = 6, }, [ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = { .name = _("Wacan"), .firmness = BERRY_FIRMNESS_VERY_SOFT, + .color = BERRY_COLOR_YELLOW, .size = 250, .maxYield = 5, .minYield = 2, @@ -864,12 +941,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 10, .smoothness = 30, + .drainRate = 6, }, [ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] = { .name = _("Rindo"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_GREEN, .size = 156, .maxYield = 5, .minYield = 2, @@ -882,12 +961,14 @@ const struct Berry gBerries[] = .bitter = 15, .sour = 0, .smoothness = 30, + .drainRate = 6, }, [ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] = { .name = _("Yache"), .firmness = BERRY_FIRMNESS_VERY_HARD, + .color = BERRY_COLOR_BLUE, .size = 135, .maxYield = 5, .minYield = 2, @@ -900,12 +981,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 15, .smoothness = 30, + .drainRate = 6, }, [ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] = { .name = _("Chople"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_RED, .size = 77, .maxYield = 5, .minYield = 2, @@ -918,12 +1001,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 0, .smoothness = 30, + .drainRate = 6, }, [ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Kebia"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_GREEN, .size = 90, .maxYield = 5, .minYield = 2, @@ -936,12 +1021,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 10, .smoothness = 30, + .drainRate = 6, }, [ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Shuca"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_YELLOW, .size = 42, .maxYield = 5, .minYield = 2, @@ -954,12 +1041,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 30, + .drainRate = 6, }, [ITEM_COBA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Coba"), .firmness = BERRY_FIRMNESS_VERY_HARD, + .color = BERRY_COLOR_BLUE, .size = 278, .maxYield = 5, .minYield = 2, @@ -972,12 +1061,14 @@ const struct Berry gBerries[] = .bitter = 15, .sour = 0, .smoothness = 30, + .drainRate = 6, }, [ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Payapa"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_PURPLE, .size = 252, .maxYield = 5, .minYield = 2, @@ -990,12 +1081,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 15, .smoothness = 30, + .drainRate = 6, }, [ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Tanga"), .firmness = BERRY_FIRMNESS_VERY_SOFT, + .color = BERRY_COLOR_GREEN, .size = 42, .maxYield = 5, .minYield = 2, @@ -1008,12 +1101,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 10, .smoothness = 35, + .drainRate = 6, }, [ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] = { .name = _("Charti"), .firmness = BERRY_FIRMNESS_VERY_SOFT, + .color = BERRY_COLOR_YELLOW, .size = 28, .maxYield = 5, .minYield = 2, @@ -1026,12 +1121,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 35, + .drainRate = 6, }, [ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] = { .name = _("Kasib"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_PURPLE, .size = 144, .maxYield = 5, .minYield = 2, @@ -1044,12 +1141,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 35, + .drainRate = 6, }, [ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = { .name = _("Haban"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_RED, .size = 23, .maxYield = 5, .minYield = 2, @@ -1062,12 +1161,14 @@ const struct Berry gBerries[] = .bitter = 20, .sour = 0, .smoothness = 35, + .drainRate = 6, }, [ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = { .name = _("Colbur"), .firmness = BERRY_FIRMNESS_SUPER_HARD, + .color = BERRY_COLOR_PURPLE, .size = 39, .maxYield = 5, .minYield = 2, @@ -1080,12 +1181,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 20, .smoothness = 35, + .drainRate = 6, }, [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = { .name = _("Babiri"), .firmness = BERRY_FIRMNESS_SUPER_HARD, + .color = BERRY_COLOR_GREEN, .size = 265, .maxYield = 5, .minYield = 2, @@ -1098,12 +1201,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 35, + .drainRate = 6, }, [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = { .name = _("Roseli"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_PINK, .size = 35, .maxYield = 5, .minYield = 2, @@ -1116,12 +1221,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 0, .smoothness = 35, + .drainRate = 6, }, [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = { .name = _("Liechi"), .firmness = BERRY_FIRMNESS_VERY_HARD, + .color = BERRY_COLOR_RED, .size = 111, .maxYield = 2, .minYield = 1, @@ -1134,12 +1241,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 10, .smoothness = 80, + .drainRate = 4, }, [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = { .name = _("Ganlon"), .firmness = BERRY_FIRMNESS_VERY_HARD, + .color = BERRY_COLOR_PURPLE, .size = 33, .maxYield = 2, .minYield = 1, @@ -1152,12 +1261,14 @@ const struct Berry gBerries[] = .bitter = 40, .sour = 0, .smoothness = 80, + .drainRate = 4, }, [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = { .name = _("Salac"), .firmness = BERRY_FIRMNESS_VERY_HARD, + .color = BERRY_COLOR_GREEN, .size = 95, .maxYield = 2, .minYield = 1, @@ -1170,12 +1281,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 40, .smoothness = 80, + .drainRate = 4, }, [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Petaya"), .firmness = BERRY_FIRMNESS_VERY_HARD, + .color = BERRY_COLOR_PINK, .size = 237, .maxYield = 2, .minYield = 1, @@ -1188,12 +1301,14 @@ const struct Berry gBerries[] = .bitter = 40, .sour = 0, .smoothness = 80, + .drainRate = 4, }, [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = { .name = _("Apicot"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_BLUE, .size = 75, .maxYield = 2, .minYield = 1, @@ -1206,12 +1321,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 40, .smoothness = 80, + .drainRate = 4, }, [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = { .name = _("Lansat"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_RED, .size = 97, .maxYield = 2, .minYield = 1, @@ -1224,12 +1341,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 10, .smoothness = 30, + .drainRate = 4, }, [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = { .name = _("Starf"), .firmness = BERRY_FIRMNESS_SUPER_HARD, + .color = BERRY_COLOR_GREEN, .size = 153, .maxYield = 2, .minYield = 1, @@ -1242,12 +1361,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 10, .smoothness = 30, + .drainRate = 4, }, [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Enigma"), .firmness = BERRY_FIRMNESS_HARD, + .color = BERRY_COLOR_PURPLE, .size = 155, .maxYield = 5, .minYield = 2, @@ -1260,12 +1381,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 60, + .drainRate = 7, }, [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = { .name = _("Micle"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_GREEN, .size = 41, .maxYield = 5, .minYield = 2, @@ -1278,12 +1401,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 0, .smoothness = 60, + .drainRate = 7, }, [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = { .name = _("Custap"), .firmness = BERRY_FIRMNESS_SUPER_HARD, + .color = BERRY_COLOR_RED, .size = 267, .maxYield = 5, .minYield = 2, @@ -1296,12 +1421,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 0, .smoothness = 60, + .drainRate = 7, }, [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Jaboca"), .firmness = BERRY_FIRMNESS_SOFT, + .color = BERRY_COLOR_YELLOW, .size = 33, .maxYield = 5, .minYield = 2, @@ -1314,12 +1441,14 @@ const struct Berry gBerries[] = .bitter = 40, .sour = 10, .smoothness = 60, + .drainRate = 7, }, [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = { .name = _("Rowap"), .firmness = BERRY_FIRMNESS_VERY_SOFT, + .color = BERRY_COLOR_BLUE, .size = 52, .maxYield = 5, .minYield = 2, @@ -1332,12 +1461,14 @@ const struct Berry gBerries[] = .bitter = 0, .sour = 40, .smoothness = 60, + .drainRate = 7, }, [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = { .name = _("Kee"), .firmness = BERRY_FIRMNESS_UNKNOWN, + .color = BERRY_COLOR_YELLOW, .size = 0, .maxYield = 5, .minYield = 2, @@ -1350,12 +1481,14 @@ const struct Berry gBerries[] = .bitter = 10, .sour = 10, .smoothness = 60, + .drainRate = 7, }, [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = { .name = _("Marnga"), // "Maranga" is too long .firmness = BERRY_FIRMNESS_UNKNOWN, + .color = BERRY_COLOR_BLUE, .size = 0, .maxYield = 5, .minYield = 2, @@ -1368,12 +1501,14 @@ const struct Berry gBerries[] = .bitter = 30, .sour = 10, .smoothness = 60, + .drainRate = 7, }, [ITEM_ENIGMA_BERRY_E_READER - FIRST_BERRY_INDEX] = { .name = _("Enigma"), .firmness = BERRY_FIRMNESS_UNKNOWN, + .color = BERRY_COLOR_PURPLE, .size = 0, .maxYield = 2, .minYield = 1, @@ -1386,6 +1521,7 @@ const struct Berry gBerries[] = .bitter = 40, .sour = 40, .smoothness = 40, + .drainRate = 7, }, }; @@ -1758,7 +1894,7 @@ static u8 CalcBerryYield(struct BerryTree *tree) u8 min = berry->minYield; u8 max = berry->maxYield; u8 result = CalcBerryYieldInternal(max, min, BerryTreeGetNumStagesWatered(tree)); - if (OW_MULCH_USAGE && (tree->mulch == ITEM_TO_MULCH(ITEM_RICH_MULCH) || tree->mulch == ITEM_TO_MULCH(ITEM_AMAZE_MULCH))) + if (OW_BERRY_MULCH_USAGE && (tree->mulch == ITEM_TO_MULCH(ITEM_RICH_MULCH) || tree->mulch == ITEM_TO_MULCH(ITEM_AMAZE_MULCH))) result += 2; return result; @@ -1907,7 +2043,7 @@ void SetBerryTreesSeen(void) bool8 PlayerHasMulch(void) { - if (!OW_MULCH_USAGE) + if (!OW_BERRY_MULCH_USAGE) return FALSE; if (CheckBagHasItem(ITEM_GROWTH_MULCH, 1)) return TRUE; @@ -2035,3 +2171,32 @@ static void SetTreeMutations(u8 id, u8 berry) tree->mutationC = myMutation.asField.c; #endif } + +#if OW_BERRY_PESTS == TRUE +static u16 GetBerryPestSpecies(u8 berryId) +{ + const struct Berry *berry = GetBerryInfo(berryId); + switch(berry->color) + { + case BERRY_COLOR_RED: + return SPECIES_LEDYBA; + break; + case BERRY_COLOR_BLUE: + return SPECIES_VOLBEAT; + break; + case BERRY_COLOR_PURPLE: + return SPECIES_ILLUMISE; + break; + case BERRY_COLOR_GREEN: + return SPECIES_BURMY_PLANT_CLOAK; + break; + case BERRY_COLOR_YELLOW: + return SPECIES_COMBEE; + break; + case BERRY_COLOR_PINK: + return SPECIES_SPEWPA; + break; + } + return SPECIES_NONE; +} +#endif diff --git a/src/data/items.h b/src/data/items.h index f1cf2c95a5..62fd6a6484 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2164,7 +2164,7 @@ const struct Item gItems[] = { .name = _("Growth Mulch"), .price = 200, - .description = OW_MULCH_USAGE ? sGrowthMulchDesc : sGenericMulchDesc, + .description = OW_BERRY_MULCH_USAGE ? sGrowthMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2176,7 +2176,7 @@ const struct Item gItems[] = { .name = _("Damp Mulch"), .price = 200, - .description = OW_MULCH_USAGE ? sDampMulchDesc : sGenericMulchDesc, + .description = OW_BERRY_MULCH_USAGE ? sDampMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2188,7 +2188,7 @@ const struct Item gItems[] = { .name = _("Stable Mulch"), .price = 200, - .description = OW_MULCH_USAGE ? sStableMulchDesc : sGenericMulchDesc, + .description = OW_BERRY_MULCH_USAGE ? sStableMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2200,7 +2200,7 @@ const struct Item gItems[] = { .name = _("Gooey Mulch"), .price = 200, - .description = OW_MULCH_USAGE ? sGooeyMulchDesc : sGenericMulchDesc, + .description = OW_BERRY_MULCH_USAGE ? sGooeyMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2212,7 +2212,7 @@ const struct Item gItems[] = { .name = _("Rich Mulch"), .price = 200, - .description = OW_MULCH_USAGE ? sRichMulchDesc : sGenericMulchDesc, + .description = OW_BERRY_MULCH_USAGE ? sRichMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2224,7 +2224,7 @@ const struct Item gItems[] = { .name = _("SurprseMulch"), .price = 200, - .description = OW_MULCH_USAGE ? sSurpriseMulchDesc : sGenericMulchDesc, + .description = OW_BERRY_MULCH_USAGE ? sSurpriseMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2236,7 +2236,7 @@ const struct Item gItems[] = { .name = _("Boost Mulch"), .price = 200, - .description = OW_MULCH_USAGE ? sBoostMulchDesc : sGenericMulchDesc, + .description = OW_BERRY_MULCH_USAGE ? sBoostMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2248,7 +2248,7 @@ const struct Item gItems[] = { .name = _("Amaze Mulch"), .price = 200, - .description = OW_MULCH_USAGE ? sAmazeMulchDesc : sGenericMulchDesc, + .description = OW_BERRY_MULCH_USAGE ? sAmazeMulchDesc : sGenericMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, From ddcd0dbb7823eba0a9d5cb629b41254c19159da2 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Tue, 5 Dec 2023 20:02:11 +0100 Subject: [PATCH 17/82] Weeds and Pests strings --- data/scripts/berry_tree.inc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 88d795532d..b3b85abab6 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -371,3 +371,17 @@ BerryTree_Text_ScatteredMulch: .string "{PLAYER} scattered the {STR_VAR_1}\n" .string "on the soft, loamy soil.$" .endif + +.if OW_BERRY_WEEDS == TRUE +BerryTree_Text_WeedIsGrowing: + .string "A weed is growing here.\n" + .string "Do you want to pull it out?$" + +BerryTree_Text_PulledOutTheWeed: + .string "{PLAYER} pulled out the weed!$" +.endif + +.if OW_BERRY_PESTS == TRUE +BerryTree_Text_APokemonAppeared: + .string "A Pokémon appeared!$" +.endif From e4fd7845ee88007d40e0d217db5da49d2be46be0 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Tue, 5 Dec 2023 20:07:00 +0100 Subject: [PATCH 18/82] Store mutation as mutation id instead of berry id --- include/global.berry.h | 2 +- src/berry.c | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/global.berry.h b/include/global.berry.h index 621340ed2a..643adff7e6 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -82,7 +82,7 @@ struct BerryTree u8 watered4:1; u16 moistureLevel:7; u16 moistureClock:6; - u16 mutationC:3; + u16 padding:3; }; #endif // GUARD_GLOBAL_BERRY_H diff --git a/src/berry.c b/src/berry.c index 31d23538d3..bfbaf56951 100644 --- a/src/berry.c +++ b/src/berry.c @@ -2083,6 +2083,7 @@ static const u8 sBerryMutations[][3] = { {ITEM_TO_BERRY(ITEM_KELPSY_BERRY), ITEM_TO_BERRY(ITEM_WACAN_BERRY), ITEM_TO_BERRY(ITEM_APICOT_BERRY)}, {ITEM_TO_BERRY(ITEM_GANLON_BERRY), ITEM_TO_BERRY(ITEM_LIECHI_BERRY), ITEM_TO_BERRY(ITEM_KEE_BERRY)}, {ITEM_TO_BERRY(ITEM_SALAC_BERRY), ITEM_TO_BERRY(ITEM_PETAYA_BERRY), ITEM_TO_BERRY(ITEM_MARANGA_BERRY)}, + // Up to one more Mutation can be added here for a total of 15 (only 4 bits are allocated) }; static u8 GetMutationOutcome(u8 berry1, u8 berry2) @@ -2092,7 +2093,7 @@ static u8 GetMutationOutcome(u8 berry1, u8 berry2) { if ((sBerryMutations[i][0] == berry1 && sBerryMutations[i][1] == berry2) ||(sBerryMutations[i][0] == berry2 && sBerryMutations[i][1] == berry1)) - return sBerryMutations[i][2]; + return (i + 1); } return 0; } @@ -2138,8 +2139,7 @@ static u8 TryForMutation(u8 berryTreeId, u8 berry) struct TreeMutationBitfield { u8 a: 2; u8 b: 2; - u8 c: 3; - u8 unused: 1; + u8 unused: 4; }; union TreeMutation { @@ -2149,14 +2149,17 @@ union TreeMutation { static u8 GetTreeMutationValue(u8 id) { +#if OW_BERRY_MUTATIONS struct BerryTree *tree = GetBerryTreeInfo(id); union TreeMutation myMutation; - if (!OW_BERRY_MUTATIONS || tree->stopGrowth) // Pre-generated trees shouldn't have mutations + if (tree->stopGrowth) // Pre-generated trees shouldn't have mutations return 0; myMutation.asField.a = tree->mutationA; myMutation.asField.b = tree->mutationB; - myMutation.asField.c = tree->mutationC; - return myMutation.value; + return sBerryMutations[myMutation.value - 1][2]; +#else + return 0; +#endif } static void SetTreeMutations(u8 id, u8 berry) @@ -2168,7 +2171,6 @@ static void SetTreeMutations(u8 id, u8 berry) myMutation.value = TryForMutation(id, berry); tree->mutationA = myMutation.asField.a; tree->mutationB = myMutation.asField.b; - tree->mutationC = myMutation.asField.c; #endif } From 5f2c8dfb0b551eb6470fb48a403e0ce49968129b Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Tue, 5 Dec 2023 20:24:03 +0100 Subject: [PATCH 19/82] Replace watered bits with a single equivalent field --- include/global.berry.h | 5 +---- src/berry.c | 21 +++++++++------------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/include/global.berry.h b/include/global.berry.h index 643adff7e6..0fca1b1613 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -76,10 +76,7 @@ struct BerryTree u8 pests:1; u8 mutationB:2; u8 regrowthCount:4; - u8 watered1:1; - u8 watered2:1; - u8 watered3:1; - u8 watered4:1; + u8 watered:4; u16 moistureLevel:7; u16 moistureClock:6; u16 padding:3; diff --git a/src/berry.c b/src/berry.c index bfbaf56951..25b7e2118d 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1637,16 +1637,16 @@ bool32 ObjectEventInteractionWaterBerryTree(void) switch (tree->stage) { case BERRY_STAGE_PLANTED: - tree->watered1 = TRUE; + tree->watered |= (1 << 0); break; case BERRY_STAGE_SPROUTED: - tree->watered2 = TRUE; + tree->watered |= (1 << 1); break; case BERRY_STAGE_TALLER: - tree->watered3 = TRUE; + tree->watered |= (1 << 2); break; case BERRY_STAGE_FLOWERING: - tree->watered4 = TRUE; + tree->watered |= (1 << 3); break; default: return FALSE; @@ -1696,10 +1696,7 @@ static bool32 BerryTreeGrow(struct BerryTree *tree) tree->stage++; break; case BERRY_STAGE_BERRIES: - tree->watered1 = 0; - tree->watered2 = 0; - tree->watered3 = 0; - tree->watered4 = 0; + tree->watered = 0; tree->berryYield = 0; tree->stage = BERRY_STAGE_SPROUTED; if (++tree->regrowthCount == ((tree->mulch == ITEM_TO_MULCH(ITEM_GOOEY_MULCH)) ? 15 : 10)) @@ -1839,13 +1836,13 @@ static u8 BerryTreeGetNumStagesWatered(struct BerryTree *tree) { u8 count = 0; - if (tree->watered1) + if (tree->watered & (1 << 0)) count++; - if (tree->watered2) + if (tree->watered & (1 << 1)) count++; - if (tree->watered3) + if (tree->watered & (1 << 2)) count++; - if (tree->watered4) + if (tree->watered & (1 << 3)) count++; return count; } From 36befdcdf8ccd67fc1d3a804f492aa98fdca5693 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Tue, 5 Dec 2023 21:54:17 +0100 Subject: [PATCH 20/82] Add moisture clock, weeds and pest generation --- data/scripts/berry_tree.inc | 12 ++++++ data/specials.inc | 2 + include/global.berry.h | 6 +-- src/berry.c | 80 ++++++++++++++++++++++++++++++++++++- 4 files changed, 95 insertions(+), 5 deletions(-) diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index b3b85abab6..af8b20decb 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -373,6 +373,18 @@ BerryTree_Text_ScatteredMulch: .endif .if OW_BERRY_WEEDS == TRUE +BerryTree_EventScript_WeedIsGrowing:: + msgbox BerryTree_Text_WeedIsGrowing, MSGBOX_YESNO + goto_if_eq VAR_RESULT, YES, BerryTree_EventScript_PullOutWeed + return + +BerryTree_EventScript_PullOutWeed:: + special ObjectEventInteractionPullBerryWeed + message BerryTree_Text_PulledOutTheWeed + waitmessage + waitbuttonpress + return + BerryTree_Text_WeedIsGrowing: .string "A weed is growing here.\n" .string "Do you want to pull it out?$" diff --git a/data/specials.inc b/data/specials.inc index d001e44549..dcab52251c 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -543,3 +543,5 @@ gSpecials:: def_special PlayerHasMulch def_special Bag_ChooseMulch def_special ObjectEventInteractionApplyMulch + def_special ObjectEventInteractionPullBerryWeed + def_special ObjectEventInteractionClearBerryPests diff --git a/include/global.berry.h b/include/global.berry.h index 0fca1b1613..bd2f6d24ee 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -76,10 +76,10 @@ struct BerryTree u8 pests:1; u8 mutationB:2; u8 regrowthCount:4; - u8 watered:4; + u8 watered:4; // Used to keep track of yield lost to drought in case of Gen4 watering u16 moistureLevel:7; - u16 moistureClock:6; - u16 padding:3; + u16 moistureClock:7; + u16 padding:2; }; #endif // GUARD_GLOBAL_BERRY_H diff --git a/src/berry.c b/src/berry.c index 25b7e2118d..8960d50530 100644 --- a/src/berry.c +++ b/src/berry.c @@ -23,8 +23,11 @@ static u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water); static u8 CalcBerryYield(struct BerryTree *tree); static u8 GetBerryCountByBerryTreeId(u8 id); static u16 GetStageDurationByBerryType(u8); +static u16 GetDrainRateByBerryType(u8); static void SetTreeMutations(u8 id, u8 berry); static u8 GetTreeMutationValue(u8 id); +static void TryForWeeds(struct BerryTree *tree); +static void TryForPests(struct BerryTree *tree); //.rodata static const u8 sBerryDescriptionPart1_Cheri[] = _("Blooms with delicate pretty flowers."); @@ -1633,7 +1636,10 @@ struct BerryTree *GetBerryTreeInfo(u8 id) bool32 ObjectEventInteractionWaterBerryTree(void) { struct BerryTree *tree = GetBerryTreeInfo(GetObjectEventBerryTreeId(gSelectedObjectEvent)); - +#if OW_BERRY_MOISTURE == TRUE + tree->moistureLevel = 100; + return TRUE; +#else switch (tree->stage) { case BERRY_STAGE_PLANTED: @@ -1652,6 +1658,7 @@ bool32 ObjectEventInteractionWaterBerryTree(void) return FALSE; } return TRUE; +#endif } bool8 IsPlayerFacingEmptyBerryTreePatch(void) @@ -1699,6 +1706,7 @@ static bool32 BerryTreeGrow(struct BerryTree *tree) tree->watered = 0; tree->berryYield = 0; tree->stage = BERRY_STAGE_SPROUTED; + tree->moistureLevel = 100; if (++tree->regrowthCount == ((tree->mulch == ITEM_TO_MULCH(ITEM_GOOEY_MULCH)) ? 15 : 10)) *tree = gBlankBerryTree; break; @@ -1720,6 +1728,7 @@ static u16 GetMulchAffectedGrowthRate(u16 berryDuration, u8 mulch, u8 stage) void BerryTreeTimeUpdate(s32 minutes) { int i; + u8 drainVal; struct BerryTree *tree; for (i = 0; i < BERRY_TREES_COUNT; i++) @@ -1736,6 +1745,35 @@ void BerryTreeTimeUpdate(s32 minutes) { s32 time = minutes; + // Check moisture gradient, pests and weeds + while (time > 0) + { + tree->moistureClock += 1; + time -= 1; + if (tree->moistureClock % 60 == 0) + { + if (OW_BERRY_MOISTURE == TRUE) + { + drainVal = OW_BERRY_VARIABLE_DRAIN_RATE ? GetDrainRateByBerryType(tree->berry) : 4; + if (tree->moistureLevel == 0 || (!OW_BERRY_VARIABLE_DRAIN_RATE && tree->moistureLevel == 4)) // Without variable drain rate, this needs to trigger after 24 hours, hence the extra check + tree->watered++; + else if (tree->moistureLevel <= drainVal) + tree->moistureLevel = 0; + else + tree->moistureLevel -= drainVal; + } + if (tree->moistureClock == 120) + { + TryForWeeds(tree); + TryForPests(tree); + tree->moistureClock = 0; + } + } + } + + // Check Berry growth + time = minutes; + while (time != 0) { if (tree->minutesUntilNextStage > time) @@ -1762,6 +1800,7 @@ void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 allowGrowth) tree->berry = berry; tree->minutesUntilNextStage = GetMulchAffectedGrowthRate(GetStageDurationByBerryType(berry), tree->mulch, stage); tree->stage = stage; + tree->moistureLevel = 100; if (stage == BERRY_STAGE_BERRIES) { tree->berryYield = tree->berryYield + CalcBerryYield(tree); @@ -1907,6 +1946,11 @@ static u16 GetStageDurationByBerryType(u8 berry) return GetBerryInfo(berry)->stageDuration * 60; } +static u16 GetDrainRateByBerryType(u8 berry) +{ + return GetBerryInfo(berry)->drainRate; +} + void ObjectEventInteractionGetBerryTreeData(void) { u8 id; @@ -2004,6 +2048,16 @@ void ObjectEventInteractionRemoveBerryTree(void) SetBerryTreeJustPicked(gSpecialVar_LastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } +void ObjectEventInteractionPullBerryWeed(void) +{ + gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(gSelectedObjectEvent)].weeds = FALSE; +} + +void ObjectEventInteractionClearBerryPests(void) +{ + gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(gSelectedObjectEvent)].pests = FALSE; +} + bool8 PlayerHasBerries(void) { return IsBagPocketNonEmpty(POCKET_BERRIES); @@ -2061,7 +2115,6 @@ bool8 PlayerHasMulch(void) return FALSE; } -// Berry mutations #if OW_BERRY_MUTATIONS == TRUE #define BERRY_MUTATION_CHANCE 25 @@ -2199,3 +2252,26 @@ static u16 GetBerryPestSpecies(u8 berryId) return SPECIES_NONE; } #endif + +#define BERRY_WEEDS_CHANCE 15 +#define BERRY_PESTS_CHANCE 15 + +static void TryForWeeds(struct BerryTree *tree) +{ + if (!OW_BERRY_WEEDS) + return; + if (tree->weeds == TRUE) + return; + if (Random() % 100 < BERRY_WEEDS_CHANCE) + tree->weeds = TRUE; +} + +static void TryForPests(struct BerryTree *tree) +{ + if (!OW_BERRY_WEEDS) + return; + if (tree->pests == TRUE) + return; + if (Random() % 100 < BERRY_PESTS_CHANCE && tree->stage > BERRY_STAGE_PLANTED) + tree->pests = TRUE; +} From 3e1c04cc26057b897588b3bec624498987e8463e Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Tue, 5 Dec 2023 22:13:21 +0100 Subject: [PATCH 21/82] Allow pests and weeds interaction --- data/scripts/berry_tree.inc | 23 +++++++++++++++++++++++ data/specials.inc | 2 ++ src/berry.c | 26 +++++++++++++++++++++++--- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index af8b20decb..37e247e4a6 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -190,6 +190,12 @@ BerryTree_EventScript_ItemUsePlantBerry:: end BerryTree_EventScript_WantToWater:: +.if OW_BERRY_PESTS == TRUE + call BerryTree_EventScript_CheckForPests +.endif +.if OW_BERRY_WEEDS == TRUE + call BerryTree_EventScript_CheckForWeed +.endif checkitem ITEM_WAILMER_PAIL goto_if_eq VAR_RESULT, FALSE, BerryTree_EventScript_DontWater special ObjectEventInteractionGetBerryName @@ -373,6 +379,11 @@ BerryTree_Text_ScatteredMulch: .endif .if OW_BERRY_WEEDS == TRUE +BerryTree_EventScript_CheckForWeed:: + specialvar VAR_RESULT, ObjectEventInteractionBerryHasWeed + call_if_eq VAR_RESULT, TRUE, BerryTree_EventScript_WeedIsGrowing + return + BerryTree_EventScript_WeedIsGrowing:: msgbox BerryTree_Text_WeedIsGrowing, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, BerryTree_EventScript_PullOutWeed @@ -394,6 +405,18 @@ BerryTree_Text_PulledOutTheWeed: .endif .if OW_BERRY_PESTS == TRUE +BerryTree_EventScript_CheckForPests:: + specialvar VAR_RESULT, ObjectEventInteractionBerryHasPests + call_if_eq VAR_RESULT, TRUE, BerryTree_EventScript_EncounterPests + return + +BerryTree_EventScript_EncounterPests:: + message BerryTree_Text_APokemonAppeared + waitmessage + waitbuttonpress + dowildbattle + return + BerryTree_Text_APokemonAppeared: .string "A Pokémon appeared!$" .endif diff --git a/data/specials.inc b/data/specials.inc index dcab52251c..5b01a13d01 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -545,3 +545,5 @@ gSpecials:: def_special ObjectEventInteractionApplyMulch def_special ObjectEventInteractionPullBerryWeed def_special ObjectEventInteractionClearBerryPests + def_special ObjectEventInteractionBerryHasWeed + def_special ObjectEventInteractionBerryHasPests diff --git a/src/berry.c b/src/berry.c index 8960d50530..5d751bdd67 100644 --- a/src/berry.c +++ b/src/berry.c @@ -9,6 +9,7 @@ #include "item_menu.h" #include "main.h" #include "random.h" +#include "script_pokemon_util.h" #include "string_util.h" #include "text.h" #include "constants/event_object_movement.h" @@ -26,6 +27,7 @@ static u16 GetStageDurationByBerryType(u8); static u16 GetDrainRateByBerryType(u8); static void SetTreeMutations(u8 id, u8 berry); static u8 GetTreeMutationValue(u8 id); +static u16 GetBerryPestSpecies(u8 berryId); static void TryForWeeds(struct BerryTree *tree); static void TryForPests(struct BerryTree *tree); @@ -1746,7 +1748,7 @@ void BerryTreeTimeUpdate(s32 minutes) s32 time = minutes; // Check moisture gradient, pests and weeds - while (time > 0) + while (time > 0 && tree->stage != BERRY_STAGE_BERRIES) { tree->moistureClock += 1; time -= 1; @@ -2063,6 +2065,24 @@ bool8 PlayerHasBerries(void) return IsBagPocketNonEmpty(POCKET_BERRIES); } +bool8 ObjectEventInteractionBerryHasWeed(void) +{ + return gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(gSelectedObjectEvent)].weeds; +} + +bool8 ObjectEventInteractionBerryHasPests(void) +{ + u16 species; + if (!OW_BERRY_PESTS || !gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(gSelectedObjectEvent)].pests) + return FALSE; + species = GetBerryPestSpecies(gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(gSelectedObjectEvent)].berry); + if (species == SPECIES_NONE) + return FALSE; + CreateScriptedWildMon(species, 14 + Random() % 3, ITEM_NONE); + gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(gSelectedObjectEvent)].pests = FALSE; + return TRUE; +} + // Berry tree growth is frozen at their initial stage (usually, fully grown) until the player has seen the tree // For all berry trees on screen, allow normal growth void SetBerryTreesSeen(void) @@ -2224,9 +2244,9 @@ static void SetTreeMutations(u8 id, u8 berry) #endif } -#if OW_BERRY_PESTS == TRUE static u16 GetBerryPestSpecies(u8 berryId) { +#if OW_BERRY_PESTS == TRUE const struct Berry *berry = GetBerryInfo(berryId); switch(berry->color) { @@ -2249,9 +2269,9 @@ static u16 GetBerryPestSpecies(u8 berryId) return SPECIES_SPEWPA; break; } +#endif return SPECIES_NONE; } -#endif #define BERRY_WEEDS_CHANCE 15 #define BERRY_PESTS_CHANCE 15 From 8e43b7d6968bf31516af81fe6493880c9af49a57 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Wed, 6 Dec 2023 21:08:09 +0100 Subject: [PATCH 22/82] Debug Berry functions --- data/scripts/debug.inc | 18 ++++ include/berry.h | 1 + src/berry.c | 5 +- src/debug.c | 232 ++++++++++++++++++++++++++++++++++------- 4 files changed, 218 insertions(+), 38 deletions(-) diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc index 573b60d457..231f156ea7 100644 --- a/data/scripts/debug.inc +++ b/data/scripts/debug.inc @@ -228,4 +228,22 @@ Debug_ShowExpansionVersion:: Debug_ExpansionVersion: .string "pokeemerald-expansion {STR_VAR_1}$" +Debug_BerryPestsDisabled:: + msgbox DebugText_BerryPestsDisabled, MSGBOX_DEFAULT + release + end + +DebugText_BerryPestsDisabled: + .string "OW_BERRY_PESTS is disabled.\n" + .string "Unable to force pests onto berry trees.$" + +Debug_BerryWeedsDisabled:: + msgbox DebugText_BerryWeedsDisabled, MSGBOX_DEFAULT + release + end + +DebugText_BerryWeedsDisabled: + .string "OW_BERRY_WEEDS is disabled.\n" + .string "Unable to force weeds onto berry trees.$" + .endif diff --git a/include/berry.h b/include/berry.h index 68ac171370..13cf77d4dd 100644 --- a/include/berry.h +++ b/include/berry.h @@ -27,6 +27,7 @@ void ObjectEventInteractionRemoveBerryTree(void); void ObjectEventInteractionApplyMulch(void); bool8 PlayerHasBerries(void); void SetBerryTreesSeen(void); +bool32 BerryTreeGrow(struct BerryTree *tree); extern const struct Berry gBerries[]; diff --git a/src/berry.c b/src/berry.c index 5d751bdd67..e4b8cb428f 100644 --- a/src/berry.c +++ b/src/berry.c @@ -16,7 +16,6 @@ #include "constants/items.h" static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry); -static bool32 BerryTreeGrow(struct BerryTree *tree); static u16 BerryTypeToItemId(u16 berry); static u8 BerryTreeGetNumStagesWatered(struct BerryTree *tree); static u8 GetNumStagesWateredByBerryTreeId(u8 id); @@ -1688,7 +1687,7 @@ void ClearBerryTrees(void) gSaveBlock1Ptr->berryTrees[i] = gBlankBerryTree; } -static bool32 BerryTreeGrow(struct BerryTree *tree) +bool32 BerryTreeGrow(struct BerryTree *tree) { if (tree->stopGrowth) return FALSE; @@ -2177,7 +2176,7 @@ static u8 TryForMutation(u8 berryTreeId, u8 berry) for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { if (gObjectEvents[i].trainerRange_berryTreeId == berryTreeId && gObjectEvents[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) - break; + break; } if (i == OBJECT_EVENTS_COUNT) return 0; diff --git a/src/debug.c b/src/debug.c index 23c21f76f0..7eb4d41eba 100644 --- a/src/debug.c +++ b/src/debug.c @@ -6,9 +6,11 @@ //AsparagusEduardo: https://github.com/AsparagusEduardo/pokeemerald/tree/InfusedEmerald_v2 //Ghoulslash: https://github.com/ghoulslash/pokeemerald //Jaizu: https://jaizu.moe/ +//AND OTHER RHH POKEEMERALD-EXPANSION CONTRIBUTORS #include "global.h" #include "battle.h" #include "battle_setup.h" +#include "berry.h" #include "clock.h" #include "coins.h" #include "credits.h" @@ -100,6 +102,7 @@ enum UtilMenu DEBUG_UTIL_MENU_ITEM_CHEAT, DEBUG_UTIL_MENU_ITEM_HATCH_AN_EGG, DEBUG_UTIL_MENU_ITEM_EXPANSION_VER, + DEBUG_UTIL_MENU_ITEM_BERRY_FUNCTIONS, }; enum ScriptMenu @@ -211,6 +214,14 @@ enum SoundMenu DEBUG_SOUND_MENU_ITEM_MUS, }; +enum BerryFunctionsMenu +{ + DEBUG_BERRY_FUNCTIONS_MENU_CLEAR_ALL, + DEBUG_BERRY_FUNCTIONS_MENU_READY, + DEBUG_BERRY_FUNCTIONS_MENU_WEEDS, + DEBUG_BERRY_FUNCTIONS_MENU_PESTS, +}; + // ******************************* // Constants #define DEBUG_MENU_FONT FONT_NORMAL @@ -320,6 +331,7 @@ static void DebugTask_HandleMenuInput_Battle(u8 taskId); static void DebugTask_HandleMenuInput_Give(u8 taskId); static void DebugTask_HandleMenuInput_Fill(u8 taskId); static void DebugTask_HandleMenuInput_Sound(u8 taskId); +static void DebugTask_HandleMenuInput_BerryFunctions(u8 taskId); static void DebugAction_Util_HealParty(u8 taskId); static void DebugAction_Util_Fly(u8 taskId); @@ -343,6 +355,7 @@ static void DebugAction_Util_Clear_Boxes(u8 taskId); static void DebugAction_Util_CheatStart(u8 taskId); static void DebugAction_Util_HatchAnEgg(u8 taskId); static void DebugAction_Util_ExpansionVersion(u8 taskId); +static void DebugAction_Util_BerryFunctions(u8 taskId); static void DebugAction_FlagsVars_Flags(u8 taskId); static void DebugAction_FlagsVars_FlagsSelect(u8 taskId); @@ -399,6 +412,10 @@ static void DebugAction_Sound_SE_SelectId(u8 taskId); static void DebugAction_Sound_MUS(u8 taskId); static void DebugAction_Sound_MUS_SelectId(u8 taskId); +static void DebugAction_BerryFunctions_ClearAll(u8 taskId); +static void DebugAction_BerryFunctions_Ready(u8 taskId); +static void DebugAction_BerryFunctions_Pests(u8 taskId); +static void DebugAction_BerryFunctions_Weeds(u8 taskId); extern const u8 Debug_FlagsNotSetOverworldConfigMessage[]; extern const u8 Debug_FlagsNotSetBattleConfigMessage[]; @@ -425,6 +442,9 @@ extern const u8 Debug_CheckROMSpace[]; extern const u8 Debug_BoxFilledMessage[]; extern const u8 Debug_ShowExpansionVersion[]; +extern const u8 Debug_BerryPestsDisabled[]; +extern const u8 Debug_BerryWeedsDisabled[]; + #include "data/map_group_count.h" // Text @@ -478,6 +498,7 @@ static const u8 sDebugText_Util_Clear_Boxes[] = _("Clear Storage Bo static const u8 sDebugText_Util_CheatStart[] = _("CHEAT Start"); static const u8 sDebugText_Util_HatchAnEgg[] = _("Hatch an Egg"); static const u8 sDebugText_Util_ExpansionVersion[] = _("Expansion Version"); +static const u8 sDebugText_Util_BerryFunctions[] = _("Berry Functions…{CLEAR_TO 110}{RIGHT_ARROW}"); // Flags/Vars Menu static const u8 sDebugText_FlagsVars_Flags[] = _("Set Flag XYZ…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_FlagsVars_Flag[] = _("Flag: {STR_VAR_1}{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}\n{STR_VAR_3}"); @@ -576,6 +597,11 @@ static const u8 sDebugText_Sound_SFX[] = _("SFX…{CLEAR_TO 110}{ static const u8 sDebugText_Sound_SFX_ID[] = _("SFX Id: {STR_VAR_3} {START_BUTTON} Stop\n{STR_VAR_1} \n{STR_VAR_2}"); static const u8 sDebugText_Sound_Music[] = _("Music…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Sound_Music_ID[] = _("Music Id: {STR_VAR_3} {START_BUTTON} Stop\n{STR_VAR_1} \n{STR_VAR_2}"); +// Berry Function Menu +static const u8 sDebugText_BerryFunctions_ClearAll[] = _("Clear map trees"); +static const u8 sDebugText_BerryFunctions_Ready[] = _("Ready map trees"); +static const u8 sDebugText_BerryFunctions_Pests[] = _("Give map trees pests"); +static const u8 sDebugText_BerryFunctions_Weeds[] = _("Give map trees weeds"); static const u8 sDebugText_Digit_1[] = _("{LEFT_ARROW}+1{RIGHT_ARROW} "); static const u8 sDebugText_Digit_10[] = _("{LEFT_ARROW}+10{RIGHT_ARROW} "); @@ -628,23 +654,24 @@ static const struct ListMenuItem sDebugMenu_Items_Main[] = static const struct ListMenuItem sDebugMenu_Items_Utilities[] = { - [DEBUG_UTIL_MENU_ITEM_HEAL_PARTY] = {sDebugText_Util_HealParty, DEBUG_UTIL_MENU_ITEM_HEAL_PARTY}, - [DEBUG_UTIL_MENU_ITEM_FLY] = {sDebugText_Util_FlyToMap, DEBUG_UTIL_MENU_ITEM_FLY}, - [DEBUG_UTIL_MENU_ITEM_WARP] = {sDebugText_Util_WarpToMap, DEBUG_UTIL_MENU_ITEM_WARP}, - [DEBUG_UTIL_MENU_ITEM_POISON_MONS] = {sDebugText_Util_PoisonParty, DEBUG_UTIL_MENU_ITEM_POISON_MONS}, - [DEBUG_UTIL_MENU_ITEM_SAVEBLOCK] = {sDebugText_Util_SaveBlockSpace, DEBUG_UTIL_MENU_ITEM_SAVEBLOCK}, - [DEBUG_UTIL_MENU_ITEM_ROM_SPACE] = {sDebugText_Util_ROMSpace, DEBUG_UTIL_MENU_ITEM_ROM_SPACE}, - [DEBUG_UTIL_MENU_ITEM_WEATHER] = {sDebugText_Util_Weather, DEBUG_UTIL_MENU_ITEM_WEATHER}, - [DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK] = {sDebugText_Util_CheckWallClock, DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK}, - [DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK] = {sDebugText_Util_SetWallClock, DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK}, - [DEBUG_UTIL_MENU_ITEM_WATCHCREDITS] = {sDebugText_Util_WatchCredits, DEBUG_UTIL_MENU_ITEM_WATCHCREDITS}, - [DEBUG_UTIL_MENU_ITEM_PLAYER_NAME] = {sDebugText_Util_Player_Name, DEBUG_UTIL_MENU_ITEM_PLAYER_NAME}, - [DEBUG_UTIL_MENU_ITEM_PLAYER_GENDER] = {sDebugText_Util_Player_Gender, DEBUG_UTIL_MENU_ITEM_PLAYER_GENDER}, - [DEBUG_UTIL_MENU_ITEM_PLAYER_ID] = {sDebugText_Util_Player_Id, DEBUG_UTIL_MENU_ITEM_PLAYER_ID}, - [DEBUG_UTIL_MENU_ITEM_CLEAR_BOXES] = {sDebugText_Util_Clear_Boxes, DEBUG_UTIL_MENU_ITEM_CLEAR_BOXES}, - [DEBUG_UTIL_MENU_ITEM_CHEAT] = {sDebugText_Util_CheatStart, DEBUG_UTIL_MENU_ITEM_CHEAT}, - [DEBUG_UTIL_MENU_ITEM_HATCH_AN_EGG] = {sDebugText_Util_HatchAnEgg, DEBUG_UTIL_MENU_ITEM_HATCH_AN_EGG}, - [DEBUG_UTIL_MENU_ITEM_EXPANSION_VER] = {sDebugText_Util_ExpansionVersion,DEBUG_UTIL_MENU_ITEM_EXPANSION_VER}, + [DEBUG_UTIL_MENU_ITEM_HEAL_PARTY] = {sDebugText_Util_HealParty, DEBUG_UTIL_MENU_ITEM_HEAL_PARTY}, + [DEBUG_UTIL_MENU_ITEM_FLY] = {sDebugText_Util_FlyToMap, DEBUG_UTIL_MENU_ITEM_FLY}, + [DEBUG_UTIL_MENU_ITEM_WARP] = {sDebugText_Util_WarpToMap, DEBUG_UTIL_MENU_ITEM_WARP}, + [DEBUG_UTIL_MENU_ITEM_POISON_MONS] = {sDebugText_Util_PoisonParty, DEBUG_UTIL_MENU_ITEM_POISON_MONS}, + [DEBUG_UTIL_MENU_ITEM_SAVEBLOCK] = {sDebugText_Util_SaveBlockSpace, DEBUG_UTIL_MENU_ITEM_SAVEBLOCK}, + [DEBUG_UTIL_MENU_ITEM_ROM_SPACE] = {sDebugText_Util_ROMSpace, DEBUG_UTIL_MENU_ITEM_ROM_SPACE}, + [DEBUG_UTIL_MENU_ITEM_WEATHER] = {sDebugText_Util_Weather, DEBUG_UTIL_MENU_ITEM_WEATHER}, + [DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK] = {sDebugText_Util_CheckWallClock, DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK}, + [DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK] = {sDebugText_Util_SetWallClock, DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK}, + [DEBUG_UTIL_MENU_ITEM_WATCHCREDITS] = {sDebugText_Util_WatchCredits, DEBUG_UTIL_MENU_ITEM_WATCHCREDITS}, + [DEBUG_UTIL_MENU_ITEM_PLAYER_NAME] = {sDebugText_Util_Player_Name, DEBUG_UTIL_MENU_ITEM_PLAYER_NAME}, + [DEBUG_UTIL_MENU_ITEM_PLAYER_GENDER] = {sDebugText_Util_Player_Gender, DEBUG_UTIL_MENU_ITEM_PLAYER_GENDER}, + [DEBUG_UTIL_MENU_ITEM_PLAYER_ID] = {sDebugText_Util_Player_Id, DEBUG_UTIL_MENU_ITEM_PLAYER_ID}, + [DEBUG_UTIL_MENU_ITEM_CLEAR_BOXES] = {sDebugText_Util_Clear_Boxes, DEBUG_UTIL_MENU_ITEM_CLEAR_BOXES}, + [DEBUG_UTIL_MENU_ITEM_CHEAT] = {sDebugText_Util_CheatStart, DEBUG_UTIL_MENU_ITEM_CHEAT}, + [DEBUG_UTIL_MENU_ITEM_HATCH_AN_EGG] = {sDebugText_Util_HatchAnEgg, DEBUG_UTIL_MENU_ITEM_HATCH_AN_EGG}, + [DEBUG_UTIL_MENU_ITEM_EXPANSION_VER] = {sDebugText_Util_ExpansionVersion, DEBUG_UTIL_MENU_ITEM_EXPANSION_VER}, + [DEBUG_UTIL_MENU_ITEM_BERRY_FUNCTIONS] = {sDebugText_Util_BerryFunctions, DEBUG_UTIL_MENU_ITEM_BERRY_FUNCTIONS}, }; static const struct ListMenuItem sDebugMenu_Items_Scripts[] = @@ -756,6 +783,14 @@ static const struct ListMenuItem sDebugMenu_Items_Sound[] = [DEBUG_SOUND_MENU_ITEM_MUS] = {sDebugText_Sound_Music, DEBUG_SOUND_MENU_ITEM_MUS}, }; +static const struct ListMenuItem sDebugMenu_Items_BerryFunctions[] = +{ + [DEBUG_BERRY_FUNCTIONS_MENU_CLEAR_ALL] = {sDebugText_BerryFunctions_ClearAll, DEBUG_BERRY_FUNCTIONS_MENU_CLEAR_ALL}, + [DEBUG_BERRY_FUNCTIONS_MENU_READY] = {sDebugText_BerryFunctions_Ready, DEBUG_BERRY_FUNCTIONS_MENU_READY}, + [DEBUG_BERRY_FUNCTIONS_MENU_PESTS] = {sDebugText_BerryFunctions_Pests, DEBUG_BERRY_FUNCTIONS_MENU_PESTS}, + [DEBUG_BERRY_FUNCTIONS_MENU_WEEDS] = {sDebugText_BerryFunctions_Weeds, DEBUG_BERRY_FUNCTIONS_MENU_WEEDS}, +}; + // ******************************* // Menu Actions static void (*const sDebugMenu_Actions_Main[])(u8) = @@ -770,25 +805,27 @@ static void (*const sDebugMenu_Actions_Main[])(u8) = [DEBUG_MENU_ITEM_ACCESS_PC] = DebugAction_AccessPC, [DEBUG_MENU_ITEM_CANCEL] = DebugAction_Cancel }; + static void (*const sDebugMenu_Actions_Utilities[])(u8) = { - [DEBUG_UTIL_MENU_ITEM_HEAL_PARTY] = DebugAction_Util_HealParty, - [DEBUG_UTIL_MENU_ITEM_FLY] = DebugAction_Util_Fly, - [DEBUG_UTIL_MENU_ITEM_WARP] = DebugAction_Util_Warp_Warp, - [DEBUG_UTIL_MENU_ITEM_POISON_MONS] = DebugAction_Util_PoisonMons, - [DEBUG_UTIL_MENU_ITEM_SAVEBLOCK] = DebugAction_Util_CheckSaveBlock, - [DEBUG_UTIL_MENU_ITEM_ROM_SPACE] = DebugAction_Util_CheckROMSpace, - [DEBUG_UTIL_MENU_ITEM_WEATHER] = DebugAction_Util_Weather, - [DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK] = DebugAction_Util_CheckWallClock, - [DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK] = DebugAction_Util_SetWallClock, - [DEBUG_UTIL_MENU_ITEM_WATCHCREDITS] = DebugAction_Util_WatchCredits, - [DEBUG_UTIL_MENU_ITEM_PLAYER_NAME] = DebugAction_Util_Player_Name, - [DEBUG_UTIL_MENU_ITEM_PLAYER_GENDER] = DebugAction_Util_Player_Gender, - [DEBUG_UTIL_MENU_ITEM_PLAYER_ID] = DebugAction_Util_Player_Id, - [DEBUG_UTIL_MENU_ITEM_CLEAR_BOXES] = DebugAction_Util_Clear_Boxes, - [DEBUG_UTIL_MENU_ITEM_CHEAT] = DebugAction_Util_CheatStart, - [DEBUG_UTIL_MENU_ITEM_HATCH_AN_EGG] = DebugAction_Util_HatchAnEgg, - [DEBUG_UTIL_MENU_ITEM_EXPANSION_VER] = DebugAction_Util_ExpansionVersion, + [DEBUG_UTIL_MENU_ITEM_HEAL_PARTY] = DebugAction_Util_HealParty, + [DEBUG_UTIL_MENU_ITEM_FLY] = DebugAction_Util_Fly, + [DEBUG_UTIL_MENU_ITEM_WARP] = DebugAction_Util_Warp_Warp, + [DEBUG_UTIL_MENU_ITEM_POISON_MONS] = DebugAction_Util_PoisonMons, + [DEBUG_UTIL_MENU_ITEM_SAVEBLOCK] = DebugAction_Util_CheckSaveBlock, + [DEBUG_UTIL_MENU_ITEM_ROM_SPACE] = DebugAction_Util_CheckROMSpace, + [DEBUG_UTIL_MENU_ITEM_WEATHER] = DebugAction_Util_Weather, + [DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK] = DebugAction_Util_CheckWallClock, + [DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK] = DebugAction_Util_SetWallClock, + [DEBUG_UTIL_MENU_ITEM_WATCHCREDITS] = DebugAction_Util_WatchCredits, + [DEBUG_UTIL_MENU_ITEM_PLAYER_NAME] = DebugAction_Util_Player_Name, + [DEBUG_UTIL_MENU_ITEM_PLAYER_GENDER] = DebugAction_Util_Player_Gender, + [DEBUG_UTIL_MENU_ITEM_PLAYER_ID] = DebugAction_Util_Player_Id, + [DEBUG_UTIL_MENU_ITEM_CLEAR_BOXES] = DebugAction_Util_Clear_Boxes, + [DEBUG_UTIL_MENU_ITEM_CHEAT] = DebugAction_Util_CheatStart, + [DEBUG_UTIL_MENU_ITEM_HATCH_AN_EGG] = DebugAction_Util_HatchAnEgg, + [DEBUG_UTIL_MENU_ITEM_EXPANSION_VER] = DebugAction_Util_ExpansionVersion, + [DEBUG_UTIL_MENU_ITEM_BERRY_FUNCTIONS] = DebugAction_Util_BerryFunctions, }; static void (*const sDebugMenu_Actions_Scripts[])(u8) = @@ -853,6 +890,14 @@ static void (*const sDebugMenu_Actions_Sound[])(u8) = [DEBUG_SOUND_MENU_ITEM_MUS] = DebugAction_Sound_MUS, }; +static void (*const sDebugMenu_Actions_BerryFunctions[])(u8) = +{ + [DEBUG_BERRY_FUNCTIONS_MENU_CLEAR_ALL] = DebugAction_BerryFunctions_ClearAll, + [DEBUG_BERRY_FUNCTIONS_MENU_READY] = DebugAction_BerryFunctions_Ready, + [DEBUG_BERRY_FUNCTIONS_MENU_PESTS] = DebugAction_BerryFunctions_Pests, + [DEBUG_BERRY_FUNCTIONS_MENU_WEEDS] = DebugAction_BerryFunctions_Weeds, +}; + // ******************************* // Windows static const struct WindowTemplate sDebugMenuWindowTemplateMain = @@ -982,6 +1027,12 @@ static const struct ListMenuTemplate sDebugMenu_ListTemplate_Sound = .totalItems = ARRAY_COUNT(sDebugMenu_Items_Sound), }; +static const struct ListMenuTemplate sDebugMenu_ListTemplate_BerryFunctions = +{ + .items = sDebugMenu_Items_BerryFunctions, + .moveCursorFunc = ListMenuDefaultCursorMoveFunc, + .totalItems = ARRAY_COUNT(sDebugMenu_Items_BerryFunctions), +}; // ******************************* // Functions universal @@ -1614,6 +1665,25 @@ static void DebugTask_HandleMenuInput_Sound(u8 taskId) } } +static void DebugTask_HandleMenuInput_BerryFunctions(u8 taskId) +{ + void (*func)(u8); + u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuTaskId); + + if (JOY_NEW(A_BUTTON)) + { + PlaySE(SE_SELECT); + if ((func = sDebugMenu_Actions_BerryFunctions[input]) != NULL) + func(taskId); + } + else if (JOY_NEW(B_BUTTON)) + { + PlaySE(SE_SELECT); + Debug_DestroyMenu(taskId); + Debug_ReShowMainMenu(); + } +} + // ******************************* // Open sub-menus static void DebugAction_OpenUtilitiesMenu(u8 taskId) @@ -1635,7 +1705,6 @@ static void DebugAction_OpenFlagsVarsMenu(u8 taskId) Debug_ShowMenu(DebugTask_HandleMenuInput_FlagsVars, gMultiuseListMenuTemplate); } - static void DebugAction_OpenGiveMenu(u8 taskId) { Debug_DestroyMenu(taskId); @@ -1654,6 +1723,12 @@ static void DebugAction_OpenSoundMenu(u8 taskId) Debug_ShowMenu(DebugTask_HandleMenuInput_Sound, sDebugMenu_ListTemplate_Sound); } +static void DebugAction_Util_BerryFunctions(u8 taskId) +{ + Debug_DestroyMenu(taskId); + Debug_ShowMenu(DebugTask_HandleMenuInput_BerryFunctions, sDebugMenu_ListTemplate_BerryFunctions); +} + // ******************************* // Actions Utilities static void DebugAction_Util_HealParty(u8 taskId) @@ -4587,6 +4662,93 @@ SOUND_LIST_SE }; #undef X +// ******************************* +// Actions BerryFunctions + +static void DebugAction_BerryFunctions_ClearAll(u8 taskId) +{ + u8 i; + + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + { + if (gObjectEvents[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) + { + RemoveBerryTree(GetObjectEventBerryTreeId(i)); + SetBerryTreeJustPicked(gObjectEvents[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + } + } + + ScriptContext_Enable(); + Debug_DestroyMenu_Full(taskId); +} + +static void DebugAction_BerryFunctions_Ready(u8 taskId) +{ + u8 i; + struct BerryTree *tree; + + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + { + if (gObjectEvents[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) + { + tree = &gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(i)]; + if (tree->stage != BERRY_STAGE_NO_BERRY) + { + tree->stage = BERRY_STAGE_FLOWERING; + BerryTreeGrow(tree); + } + } + } + + ScriptContext_Enable(); + Debug_DestroyMenu_Full(taskId); +} + +static void DebugAction_BerryFunctions_Pests(u8 taskId) +{ + u8 i; + + if (!OW_BERRY_PESTS) + { + Debug_DestroyMenu_Full_Script(taskId, Debug_BerryPestsDisabled); + return; + } + + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + { + if (gObjectEvents[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) + { + if (gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(i)].stage != BERRY_STAGE_PLANTED) + gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(i)].pests = TRUE; + } + } + + ScriptContext_Enable(); + Debug_DestroyMenu_Full(taskId); +} + +static void DebugAction_BerryFunctions_Weeds(u8 taskId) +{ + u8 i; + + if (!OW_BERRY_WEEDS) + { + Debug_DestroyMenu_Full_Script(taskId, Debug_BerryWeedsDisabled); + return; + } + + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + { + if (gObjectEvents[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) + { + gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(i)].weeds = TRUE; + } + } + + ScriptContext_Enable(); + Debug_DestroyMenu_Full(taskId); +} + // ******************************* // Actions Other From 6ba4ec744b89455693b142e95b8f0509ffe432ba Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 7 Dec 2023 11:46:44 +0100 Subject: [PATCH 23/82] Small change to debug script for clarity --- src/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/debug.c b/src/debug.c index 7eb4d41eba..4599d64a72 100644 --- a/src/debug.c +++ b/src/debug.c @@ -4694,7 +4694,7 @@ static void DebugAction_BerryFunctions_Ready(u8 taskId) tree = &gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(i)]; if (tree->stage != BERRY_STAGE_NO_BERRY) { - tree->stage = BERRY_STAGE_FLOWERING; + tree->stage = BERRY_STAGE_BERRIES - 1; BerryTreeGrow(tree); } } From 9fa811dd7183fafbe89aa3b3f78c85ea7bfae2a1 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 7 Dec 2023 11:54:07 +0100 Subject: [PATCH 24/82] Mulches affect gradient watering --- src/berry.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/berry.c b/src/berry.c index e4b8cb428f..ef82bcc4f6 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1756,7 +1756,16 @@ void BerryTreeTimeUpdate(s32 minutes) if (OW_BERRY_MOISTURE == TRUE) { drainVal = OW_BERRY_VARIABLE_DRAIN_RATE ? GetDrainRateByBerryType(tree->berry) : 4; - if (tree->moistureLevel == 0 || (!OW_BERRY_VARIABLE_DRAIN_RATE && tree->moistureLevel == 4)) // Without variable drain rate, this needs to trigger after 24 hours, hence the extra check + if (OW_BERRY_MULCH_USAGE) + { + if (tree->mulch == ITEM_TO_MULCH(ITEM_GROWTH_MULCH)) + drainVal *= 2; + if (tree->mulch == ITEM_TO_MULCH(ITEM_DAMP_MULCH)) + drainVal /= 2; + if (tree->mulch == ITEM_TO_MULCH(ITEM_BOOST_MULCH) || tree->mulch == ITEM_TO_MULCH(ITEM_AMAZE_MULCH)) + drainVal = 25; + } + if (tree->moistureLevel == 0 || (!OW_BERRY_VARIABLE_DRAIN_RATE && tree->moistureLevel == 4)) // Without variable drain rate (and without mulches), this needs to trigger after 24 hours, hence the extra check tree->watered++; else if (tree->moistureLevel <= drainVal) tree->moistureLevel = 0; From 9be5d4fba16778c295b7b3157e5c64c92944b207 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 7 Dec 2023 12:05:12 +0100 Subject: [PATCH 25/82] Add single stage growth to debug menu --- include/config/overworld.h | 2 +- src/debug.c | 39 ++++++++++++++++++++++++++++++-------- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/include/config/overworld.h b/include/config/overworld.h index 9d181a3174..ca122b782d 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -14,7 +14,7 @@ // Berry settings #define OW_BERRY_MUTATIONS FALSE // If enabled, Berry plants can mutate based on berries planted next to them. -#define OW_BERRY_MULCH_USAGE TRUE // If enabled, Mulch can be used on soil to fertilize it. Otherwise, it is considered unusable. +#define OW_BERRY_MULCH_USAGE FALSE // If enabled, Mulch can be used on soil to fertilize it. Otherwise, it is considered unusable. Note that moisture effects only work with OW_BERRY_MOISTURE enabled! #define OW_BERRY_WEEDS FALSE // If enabled, weeds may grow on Berry plants that the player needs to take care of. #define OW_BERRY_PESTS FALSE // If enabled, pests may approach Berry plants that the player needs to take care of. #define OW_BERRY_MOISTURE FALSE // If enabled, Berry watering is not a matter of watering it once per stage, but rather of keeping the soil moist. diff --git a/src/debug.c b/src/debug.c index 4599d64a72..0fa79f56b9 100644 --- a/src/debug.c +++ b/src/debug.c @@ -218,6 +218,7 @@ enum BerryFunctionsMenu { DEBUG_BERRY_FUNCTIONS_MENU_CLEAR_ALL, DEBUG_BERRY_FUNCTIONS_MENU_READY, + DEBUG_BERRY_FUNCTIONS_MENU_NEXT_STAGE, DEBUG_BERRY_FUNCTIONS_MENU_WEEDS, DEBUG_BERRY_FUNCTIONS_MENU_PESTS, }; @@ -414,6 +415,7 @@ static void DebugAction_Sound_MUS_SelectId(u8 taskId); static void DebugAction_BerryFunctions_ClearAll(u8 taskId); static void DebugAction_BerryFunctions_Ready(u8 taskId); +static void DebugAction_BerryFunctions_NextStage(u8 taskId); static void DebugAction_BerryFunctions_Pests(u8 taskId); static void DebugAction_BerryFunctions_Weeds(u8 taskId); @@ -600,6 +602,7 @@ static const u8 sDebugText_Sound_Music_ID[] = _("Music Id: {STR_VAR_3} // Berry Function Menu static const u8 sDebugText_BerryFunctions_ClearAll[] = _("Clear map trees"); static const u8 sDebugText_BerryFunctions_Ready[] = _("Ready map trees"); +static const u8 sDebugText_BerryFunctions_NextStage[] = _("Grow map trees"); static const u8 sDebugText_BerryFunctions_Pests[] = _("Give map trees pests"); static const u8 sDebugText_BerryFunctions_Weeds[] = _("Give map trees weeds"); @@ -785,10 +788,11 @@ static const struct ListMenuItem sDebugMenu_Items_Sound[] = static const struct ListMenuItem sDebugMenu_Items_BerryFunctions[] = { - [DEBUG_BERRY_FUNCTIONS_MENU_CLEAR_ALL] = {sDebugText_BerryFunctions_ClearAll, DEBUG_BERRY_FUNCTIONS_MENU_CLEAR_ALL}, - [DEBUG_BERRY_FUNCTIONS_MENU_READY] = {sDebugText_BerryFunctions_Ready, DEBUG_BERRY_FUNCTIONS_MENU_READY}, - [DEBUG_BERRY_FUNCTIONS_MENU_PESTS] = {sDebugText_BerryFunctions_Pests, DEBUG_BERRY_FUNCTIONS_MENU_PESTS}, - [DEBUG_BERRY_FUNCTIONS_MENU_WEEDS] = {sDebugText_BerryFunctions_Weeds, DEBUG_BERRY_FUNCTIONS_MENU_WEEDS}, + [DEBUG_BERRY_FUNCTIONS_MENU_CLEAR_ALL] = {sDebugText_BerryFunctions_ClearAll, DEBUG_BERRY_FUNCTIONS_MENU_CLEAR_ALL}, + [DEBUG_BERRY_FUNCTIONS_MENU_READY] = {sDebugText_BerryFunctions_Ready, DEBUG_BERRY_FUNCTIONS_MENU_READY}, + [DEBUG_BERRY_FUNCTIONS_MENU_NEXT_STAGE] = {sDebugText_BerryFunctions_NextStage, DEBUG_BERRY_FUNCTIONS_MENU_NEXT_STAGE}, + [DEBUG_BERRY_FUNCTIONS_MENU_PESTS] = {sDebugText_BerryFunctions_Pests, DEBUG_BERRY_FUNCTIONS_MENU_PESTS}, + [DEBUG_BERRY_FUNCTIONS_MENU_WEEDS] = {sDebugText_BerryFunctions_Weeds, DEBUG_BERRY_FUNCTIONS_MENU_WEEDS}, }; // ******************************* @@ -892,10 +896,11 @@ static void (*const sDebugMenu_Actions_Sound[])(u8) = static void (*const sDebugMenu_Actions_BerryFunctions[])(u8) = { - [DEBUG_BERRY_FUNCTIONS_MENU_CLEAR_ALL] = DebugAction_BerryFunctions_ClearAll, - [DEBUG_BERRY_FUNCTIONS_MENU_READY] = DebugAction_BerryFunctions_Ready, - [DEBUG_BERRY_FUNCTIONS_MENU_PESTS] = DebugAction_BerryFunctions_Pests, - [DEBUG_BERRY_FUNCTIONS_MENU_WEEDS] = DebugAction_BerryFunctions_Weeds, + [DEBUG_BERRY_FUNCTIONS_MENU_CLEAR_ALL] = DebugAction_BerryFunctions_ClearAll, + [DEBUG_BERRY_FUNCTIONS_MENU_READY] = DebugAction_BerryFunctions_Ready, + [DEBUG_BERRY_FUNCTIONS_MENU_NEXT_STAGE] = DebugAction_BerryFunctions_NextStage, + [DEBUG_BERRY_FUNCTIONS_MENU_PESTS] = DebugAction_BerryFunctions_Pests, + [DEBUG_BERRY_FUNCTIONS_MENU_WEEDS] = DebugAction_BerryFunctions_Weeds, }; // ******************************* @@ -4704,6 +4709,24 @@ static void DebugAction_BerryFunctions_Ready(u8 taskId) Debug_DestroyMenu_Full(taskId); } +static void DebugAction_BerryFunctions_NextStage(u8 taskId) +{ + u8 i; + struct BerryTree *tree; + + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + { + if (gObjectEvents[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) + { + tree = &gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(i)]; + BerryTreeGrow(tree); + } + } + + ScriptContext_Enable(); + Debug_DestroyMenu_Full(taskId); +} + static void DebugAction_BerryFunctions_Pests(u8 taskId) { u8 i; From 9d09b367a0b7bc9fe2d37dfa3ecafec075737a69 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 7 Dec 2023 13:22:01 +0100 Subject: [PATCH 26/82] Refactor growth time and add six stage toggle --- data/scripts/berry_tree.inc | 40 ++++++ include/config/overworld.h | 3 +- include/constants/berry.h | 2 + include/global.berry.h | 4 +- src/berry.c | 151 +++++++++++--------- src/data/object_events/object_event_anims.h | 2 + 6 files changed, 128 insertions(+), 74 deletions(-) diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 37e247e4a6..10376d4c58 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -6,6 +6,8 @@ BerryTreeScript:: case BERRY_STAGE_PLANTED, BerryTree_EventScript_CheckBerryStage1 case BERRY_STAGE_SPROUTED, BerryTree_EventScript_CheckBerryStage2 case BERRY_STAGE_TALLER, BerryTree_EventScript_CheckBerryStage3 + case BERRY_STAGE_TRUNK, BerryTree_EventScript_CheckBerryStageTrunk + case BERRY_STAGE_BUDDING, BerryTree_EventScript_CheckBerryStageBudding case BERRY_STAGE_FLOWERING, BerryTree_EventScript_CheckBerryStage4 case BERRY_STAGE_BERRIES, BerryTree_EventScript_CheckBerryFullyGrown end @@ -105,6 +107,22 @@ BerryTree_EventScript_CheckBerryStage3:: waitbuttonpress goto BerryTree_EventScript_WantToWater +BerryTree_EventScript_CheckBerryStageTrunk:: + lockall + special ObjectEventInteractionGetBerryName + message BerryTree_Text_BerryGrowthStageTrunk + waitmessage + waitbuttonpress + goto BerryTree_EventScript_WantToWater + +BerryTree_EventScript_CheckBerryStageBudding:: + lockall + special ObjectEventInteractionGetBerryName + message BerryTree_Text_BerryGrowthStageBudding + waitmessage + waitbuttonpress + goto BerryTree_EventScript_WantToWater + BerryTree_EventScript_CheckBerryStage4:: call BerryTree_EventScript_GetCareAdverb lockall @@ -245,17 +263,39 @@ BerryTree_Text_PlantedOneBerry: .string "the soft, loamy soil.$" BerryTree_Text_BerryGrowthStage1: +.if OW_BERRY_SIX_STAGES == TRUE + .string "This is where you planted the\n{STR_VAR_1} BERRY!$" +.else .string "One {STR_VAR_1} was planted here.$" +.endif BerryTree_Text_BerryGrowthStage2: +.if OW_BERRY_SIX_STAGES == TRUE + .string "The {STR_VAR_1} is sprouting!$" +.else .string "{STR_VAR_1} has sprouted.$" +.endif BerryTree_Text_BerryGrowthStage3: +.if OW_BERRY_SIX_STAGES == TRUE + .string "The {STR_VAR_1}'s seedling is growing well!$" +.else .string "This {STR_VAR_1} plant is growing taller.$" +.endif + +BerryTree_Text_BerryGrowthStageTrunk: + .string "The {STR_VAR_1}'s trunk is getting bigger!$" + +BerryTree_Text_BerryGrowthStageBudding: + .string "The {STR_VAR_1} tree has buds!$" BerryTree_Text_BerryGrowthStage4: +.if OW_BERRY_SIX_STAGES == TRUE + .string "The {STR_VAR_1} tree is in bloom!$" +.else .string "These {STR_VAR_1} flowers are blooming\n" .string "{STR_VAR_2}.$" +.endif BerryTree_Text_CareAdverbGreat: .string "very beautifully$" diff --git a/include/config/overworld.h b/include/config/overworld.h index ca122b782d..a9c00b748e 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -18,7 +18,8 @@ #define OW_BERRY_WEEDS FALSE // If enabled, weeds may grow on Berry plants that the player needs to take care of. #define OW_BERRY_PESTS FALSE // If enabled, pests may approach Berry plants that the player needs to take care of. #define OW_BERRY_MOISTURE FALSE // If enabled, Berry watering is not a matter of watering it once per stage, but rather of keeping the soil moist. -#define OW_BERRY_VARIABLE_DRAIN_RATE FALSE // If moisture is enabled, this setting uses the Gen4 drain rates for different berries +#define OW_BERRY_VARIABLE_DRAIN_RATE FALSE // If moisture is enabled, this setting uses the Gen4 drain rates for different berries. +#define OW_BERRY_SIX_STAGES FALSE // In XY, Berries go through six stages instead of four. This toggle does not affect the time it takes for a tree to be ready for harvest. Without OW_BERRY_MOISTURE, the two extra stages count as BERRY_STAGE_TALLER for watering purposes. // Out-of-battle Ability effects #define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8, if a Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same Nature, as opposed to 50% previously. Stationary Pokémon are excluded in Gen3. In Gen6, all No Eggs Discovered gift Pokémon will have the same Nature, while in Gen7 all gift Pokémon will, regardless of Egg Group - In Gen 8, no gift Pokémon are affected. In Gen9, this ability has no out-of-battle effect. diff --git a/include/constants/berry.h b/include/constants/berry.h index 0385e57447..bc86f44ce6 100644 --- a/include/constants/berry.h +++ b/include/constants/berry.h @@ -30,6 +30,8 @@ #define BERRY_STAGE_TALLER 3 #define BERRY_STAGE_FLOWERING 4 #define BERRY_STAGE_BERRIES 5 +#define BERRY_STAGE_TRUNK 6 // These follow BERRY_STAGE_BERRIES to preserve save compatibility +#define BERRY_STAGE_BUDDING 7 #define BERRY_STAGE_SPARKLING 255 // Berries can be watered in the following stages: diff --git a/include/global.berry.h b/include/global.berry.h index bd2f6d24ee..1fb98e56b2 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -14,7 +14,7 @@ struct Berry u8 minYield; const u8 *description1; const u8 *description2; - u8 stageDuration; + u8 growthDuration; u8 spicy; u8 dry; u8 sweet; @@ -36,7 +36,7 @@ struct Berry2 u8 minYield; u8 *description1; u8 *description2; - u8 stageDuration; + u8 growthDuration; u8 spicy; u8 dry; u8 sweet; diff --git a/src/berry.c b/src/berry.c index ef82bcc4f6..74a272673f 100644 --- a/src/berry.c +++ b/src/berry.c @@ -178,7 +178,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Cheri, .description2 = sBerryDescriptionPart2_Cheri, - .stageDuration = 3, + .growthDuration = 12, .spicy = 10, .dry = 0, .sweet = 0, @@ -198,7 +198,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Chesto, .description2 = sBerryDescriptionPart2_Chesto, - .stageDuration = 3, + .growthDuration = 12, .spicy = 0, .dry = 10, .sweet = 0, @@ -218,7 +218,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Pecha, .description2 = sBerryDescriptionPart2_Pecha, - .stageDuration = 3, + .growthDuration = 12, .spicy = 0, .dry = 0, .sweet = 10, @@ -238,7 +238,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Rawst, .description2 = sBerryDescriptionPart2_Rawst, - .stageDuration = 3, + .growthDuration = 12, .spicy = 0, .dry = 0, .sweet = 0, @@ -258,7 +258,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Aspear, .description2 = sBerryDescriptionPart2_Aspear, - .stageDuration = 3, + .growthDuration = 12, .spicy = 0, .dry = 0, .sweet = 0, @@ -278,7 +278,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Leppa, .description2 = sBerryDescriptionPart2_Leppa, - .stageDuration = 4, + .growthDuration = 16, .spicy = 10, .dry = 0, .sweet = 10, @@ -298,7 +298,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Oran, .description2 = sBerryDescriptionPart2_Oran, - .stageDuration = 3, + .growthDuration = 12, .spicy = 10, .dry = 10, .sweet = 10, @@ -318,7 +318,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Persim, .description2 = sBerryDescriptionPart2_Persim, - .stageDuration = 3, + .growthDuration = 12, .spicy = 10, .dry = 10, .sweet = 10, @@ -338,7 +338,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Lum, .description2 = sBerryDescriptionPart2_Lum, - .stageDuration = 12, + .growthDuration = 48, .spicy = 10, .dry = 10, .sweet = 10, @@ -358,7 +358,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Sitrus, .description2 = sBerryDescriptionPart2_Sitrus, - .stageDuration = 6, + .growthDuration = 24, .spicy = 10, .dry = 10, .sweet = 10, @@ -378,7 +378,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Figy, .description2 = sBerryDescriptionPart2_Figy, - .stageDuration = 6, + .growthDuration = 24, .spicy = 10, .dry = 0, .sweet = 0, @@ -398,7 +398,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Wiki, .description2 = sBerryDescriptionPart2_Wiki, - .stageDuration = 6, + .growthDuration = 24, .spicy = 0, .dry = 10, .sweet = 0, @@ -418,7 +418,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Mago, .description2 = sBerryDescriptionPart2_Mago, - .stageDuration = 6, + .growthDuration = 24, .spicy = 0, .dry = 0, .sweet = 10, @@ -438,7 +438,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Aguav, .description2 = sBerryDescriptionPart2_Aguav, - .stageDuration = 6, + .growthDuration = 24, .spicy = 0, .dry = 0, .sweet = 0, @@ -458,7 +458,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Iapapa, .description2 = sBerryDescriptionPart2_Iapapa, - .stageDuration = 6, + .growthDuration = 24, .spicy = 0, .dry = 0, .sweet = 0, @@ -478,7 +478,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Razz, .description2 = sBerryDescriptionPart2_Razz, - .stageDuration = 1, + .growthDuration = 4, .spicy = 10, .dry = 10, .sweet = 0, @@ -498,7 +498,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Bluk, .description2 = sBerryDescriptionPart2_Bluk, - .stageDuration = 1, + .growthDuration = 4, .spicy = 0, .dry = 10, .sweet = 10, @@ -518,7 +518,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Nanab, .description2 = sBerryDescriptionPart2_Nanab, - .stageDuration = 1, + .growthDuration = 4, .spicy = 0, .dry = 0, .sweet = 10, @@ -538,7 +538,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Wepear, .description2 = sBerryDescriptionPart2_Wepear, - .stageDuration = 1, + .growthDuration = 4, .spicy = 0, .dry = 0, .sweet = 0, @@ -558,7 +558,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Pinap, .description2 = sBerryDescriptionPart2_Pinap, - .stageDuration = 1, + .growthDuration = 4, .spicy = 10, .dry = 0, .sweet = 0, @@ -578,7 +578,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Pomeg, .description2 = sBerryDescriptionPart2_Pomeg, - .stageDuration = 3, + .growthDuration = 12, .spicy = 10, .dry = 0, .sweet = 10, @@ -598,7 +598,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Kelpsy, .description2 = sBerryDescriptionPart2_Kelpsy, - .stageDuration = 3, + .growthDuration = 12, .spicy = 0, .dry = 10, .sweet = 0, @@ -618,7 +618,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Qualot, .description2 = sBerryDescriptionPart2_Qualot, - .stageDuration = 3, + .growthDuration = 12, .spicy = 10, .dry = 0, .sweet = 10, @@ -638,7 +638,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Hondew, .description2 = sBerryDescriptionPart2_Hondew, - .stageDuration = 3, + .growthDuration = 12, .spicy = 10, .dry = 10, .sweet = 0, @@ -658,7 +658,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Grepa, .description2 = sBerryDescriptionPart2_Grepa, - .stageDuration = 3, + .growthDuration = 12, .spicy = 0, .dry = 10, .sweet = 10, @@ -678,7 +678,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Tamato, .description2 = sBerryDescriptionPart2_Tamato, - .stageDuration = 6, + .growthDuration = 24, .spicy = 20, .dry = 10, .sweet = 0, @@ -698,7 +698,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Cornn, .description2 = sBerryDescriptionPart2_Cornn, - .stageDuration = 6, + .growthDuration = 24, .spicy = 0, .dry = 20, .sweet = 10, @@ -718,7 +718,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Magost, .description2 = sBerryDescriptionPart2_Magost, - .stageDuration = 6, + .growthDuration = 24, .spicy = 0, .dry = 0, .sweet = 20, @@ -738,7 +738,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Rabuta, .description2 = sBerryDescriptionPart2_Rabuta, - .stageDuration = 6, + .growthDuration = 24, .spicy = 0, .dry = 0, .sweet = 0, @@ -758,7 +758,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Nomel, .description2 = sBerryDescriptionPart2_Nomel, - .stageDuration = 6, + .growthDuration = 24, .spicy = 10, .dry = 0, .sweet = 0, @@ -778,7 +778,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Spelon, .description2 = sBerryDescriptionPart2_Spelon, - .stageDuration = 18, + .growthDuration = 72, .spicy = 40, .dry = 10, .sweet = 0, @@ -798,7 +798,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Pamtre, .description2 = sBerryDescriptionPart2_Pamtre, - .stageDuration = 18, + .growthDuration = 72, .spicy = 0, .dry = 40, .sweet = 10, @@ -818,7 +818,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Watmel, .description2 = sBerryDescriptionPart2_Watmel, - .stageDuration = 18, + .growthDuration = 72, .spicy = 0, .dry = 0, .sweet = 40, @@ -838,7 +838,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Durin, .description2 = sBerryDescriptionPart2_Durin, - .stageDuration = 18, + .growthDuration = 72, .spicy = 0, .dry = 0, .sweet = 0, @@ -858,7 +858,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Belue, .description2 = sBerryDescriptionPart2_Belue, - .stageDuration = 18, + .growthDuration = 72, .spicy = 10, .dry = 0, .sweet = 0, @@ -878,7 +878,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Chilan, .description2 = sBerryDescriptionPart2_Chilan, - .stageDuration = 18, + .growthDuration = 72, .spicy = 0, .dry = 25, .sweet = 10, @@ -898,7 +898,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Occa, .description2 = sBerryDescriptionPart2_Occa, - .stageDuration = 18, + .growthDuration = 72, .spicy = 15, .dry = 0, .sweet = 10, @@ -918,7 +918,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Passho, .description2 = sBerryDescriptionPart2_Passho, - .stageDuration = 18, + .growthDuration = 72, .spicy = 0, .dry = 15, .sweet = 0, @@ -938,7 +938,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Wacan, .description2 = sBerryDescriptionPart2_Wacan, - .stageDuration = 18, + .growthDuration = 72, .spicy = 0, .dry = 0, .sweet = 15, @@ -958,7 +958,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Rindo, .description2 = sBerryDescriptionPart2_Rindo, - .stageDuration = 18, + .growthDuration = 72, .spicy = 10, .dry = 0, .sweet = 0, @@ -978,7 +978,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Yache, .description2 = sBerryDescriptionPart2_Yache, - .stageDuration = 18, + .growthDuration = 72, .spicy = 0, .dry = 10, .sweet = 0, @@ -998,7 +998,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Chople, .description2 = sBerryDescriptionPart2_Chople, - .stageDuration = 18, + .growthDuration = 72, .spicy = 15, .dry = 0, .sweet = 0, @@ -1018,7 +1018,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Kebia, .description2 = sBerryDescriptionPart2_Kebia, - .stageDuration = 18, + .growthDuration = 72, .spicy = 0, .dry = 15, .sweet = 0, @@ -1038,7 +1038,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Shuca, .description2 = sBerryDescriptionPart2_Shuca, - .stageDuration = 18, + .growthDuration = 72, .spicy = 10, .dry = 0, .sweet = 15, @@ -1058,7 +1058,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Coba, .description2 = sBerryDescriptionPart2_Coba, - .stageDuration = 18, + .growthDuration = 72, .spicy = 0, .dry = 10, .sweet = 0, @@ -1078,7 +1078,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Payapa, .description2 = sBerryDescriptionPart2_Payapa, - .stageDuration = 18, + .growthDuration = 72, .spicy = 0, .dry = 0, .sweet = 10, @@ -1098,7 +1098,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Tanga, .description2 = sBerryDescriptionPart2_Tanga, - .stageDuration = 18, + .growthDuration = 72, .spicy = 20, .dry = 0, .sweet = 0, @@ -1118,7 +1118,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Charti, .description2 = sBerryDescriptionPart2_Charti, - .stageDuration = 18, + .growthDuration = 72, .spicy = 10, .dry = 20, .sweet = 0, @@ -1138,7 +1138,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Kasib, .description2 = sBerryDescriptionPart2_Kasib, - .stageDuration = 18, + .growthDuration = 72, .spicy = 0, .dry = 10, .sweet = 20, @@ -1158,7 +1158,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Haban, .description2 = sBerryDescriptionPart2_Haban, - .stageDuration = 18, + .growthDuration = 72, .spicy = 0, .dry = 0, .sweet = 10, @@ -1178,7 +1178,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Colbur, .description2 = sBerryDescriptionPart2_Colbur, - .stageDuration = 18, + .growthDuration = 72, .spicy = 0, .dry = 0, .sweet = 0, @@ -1198,7 +1198,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Babiri, .description2 = sBerryDescriptionPart2_Babiri, - .stageDuration = 18, + .growthDuration = 72, .spicy = 25, .dry = 10, .sweet = 0, @@ -1218,7 +1218,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Roseli, .description2 = sBerryDescriptionPart2_Roseli, - .stageDuration = 18, + .growthDuration = 72, .spicy = 0, .dry = 0, .sweet = 25, @@ -1238,7 +1238,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Liechi, .description2 = sBerryDescriptionPart2_Liechi, - .stageDuration = 24, + .growthDuration = 96, .spicy = 40, .dry = 0, .sweet = 40, @@ -1258,7 +1258,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Ganlon, .description2 = sBerryDescriptionPart2_Ganlon, - .stageDuration = 24, + .growthDuration = 96, .spicy = 0, .dry = 40, .sweet = 0, @@ -1278,7 +1278,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Salac, .description2 = sBerryDescriptionPart2_Salac, - .stageDuration = 24, + .growthDuration = 96, .spicy = 0, .dry = 0, .sweet = 40, @@ -1298,7 +1298,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Petaya, .description2 = sBerryDescriptionPart2_Petaya, - .stageDuration = 24, + .growthDuration = 96, .spicy = 40, .dry = 0, .sweet = 0, @@ -1318,7 +1318,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Apicot, .description2 = sBerryDescriptionPart2_Apicot, - .stageDuration = 24, + .growthDuration = 96, .spicy = 0, .dry = 40, .sweet = 0, @@ -1338,7 +1338,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Lansat, .description2 = sBerryDescriptionPart2_Lansat, - .stageDuration = 24, + .growthDuration = 96, .spicy = 10, .dry = 10, .sweet = 10, @@ -1358,7 +1358,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Starf, .description2 = sBerryDescriptionPart2_Starf, - .stageDuration = 24, + .growthDuration = 96, .spicy = 10, .dry = 10, .sweet = 10, @@ -1378,7 +1378,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Enigma, .description2 = sBerryDescriptionPart2_Enigma, - .stageDuration = 24, + .growthDuration = 96, .spicy = 40, .dry = 10, .sweet = 0, @@ -1398,7 +1398,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Micle, .description2 = sBerryDescriptionPart2_Micle, - .stageDuration = 24, + .growthDuration = 96, .spicy = 0, .dry = 40, .sweet = 10, @@ -1418,7 +1418,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Custap, .description2 = sBerryDescriptionPart2_Custap, - .stageDuration = 24, + .growthDuration = 96, .spicy = 0, .dry = 0, .sweet = 40, @@ -1438,7 +1438,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Jaboca, .description2 = sBerryDescriptionPart2_Jaboca, - .stageDuration = 24, + .growthDuration = 96, .spicy = 0, .dry = 0, .sweet = 0, @@ -1458,7 +1458,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Rowap, .description2 = sBerryDescriptionPart2_Rowap, - .stageDuration = 24, + .growthDuration = 96, .spicy = 10, .dry = 0, .sweet = 0, @@ -1478,7 +1478,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Kee, .description2 = sBerryDescriptionPart2_Kee, - .stageDuration = 24, + .growthDuration = 96, .spicy = 30, .dry = 30, .sweet = 10, @@ -1498,7 +1498,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Maranga, .description2 = sBerryDescriptionPart2_Maranga, - .stageDuration = 24, + .growthDuration = 96, .spicy = 10, .dry = 10, .sweet = 30, @@ -1518,7 +1518,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Enigma, .description2 = sBerryDescriptionPart2_Enigma, - .stageDuration = 24, + .growthDuration = 96, .spicy = 40, .dry = 40, .sweet = 40, @@ -1608,7 +1608,7 @@ static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry) bool32 IsEnigmaBerryValid(void) { - if (!gSaveBlock1Ptr->enigmaBerry.berry.stageDuration) + if (!gSaveBlock1Ptr->enigmaBerry.berry.growthDuration) return FALSE; if (!gSaveBlock1Ptr->enigmaBerry.berry.maxYield) return FALSE; @@ -1650,6 +1650,8 @@ bool32 ObjectEventInteractionWaterBerryTree(void) tree->watered |= (1 << 1); break; case BERRY_STAGE_TALLER: + case BERRY_STAGE_TRUNK: + case BERRY_STAGE_BUDDING: tree->watered |= (1 << 2); break; case BERRY_STAGE_FLOWERING: @@ -1700,9 +1702,16 @@ bool32 BerryTreeGrow(struct BerryTree *tree) tree->berryYield = tree->berryYield + CalcBerryYield(tree); case BERRY_STAGE_PLANTED: case BERRY_STAGE_SPROUTED: - case BERRY_STAGE_TALLER: + case BERRY_STAGE_TRUNK: + case BERRY_STAGE_BUDDING: tree->stage++; break; + case BERRY_STAGE_TALLER: + if (OW_BERRY_SIX_STAGES) + tree->stage = BERRY_STAGE_TRUNK; + else + tree->stage++; + break; case BERRY_STAGE_BERRIES: tree->watered = 0; tree->berryYield = 0; @@ -1953,7 +1962,7 @@ static u8 GetBerryCountByBerryTreeId(u8 id) static u16 GetStageDurationByBerryType(u8 berry) { - return GetBerryInfo(berry)->stageDuration * 60; + return GetBerryInfo(berry)->growthDuration * 60 / (OW_BERRY_SIX_STAGES ? 6 : 4); } static u16 GetDrainRateByBerryType(u8 berry) diff --git a/src/data/object_events/object_event_anims.h b/src/data/object_events/object_event_anims.h index f96e52de53..e68910d159 100755 --- a/src/data/object_events/object_event_anims.h +++ b/src/data/object_events/object_event_anims.h @@ -1105,6 +1105,8 @@ static const union AnimCmd *const sAnimTable_BerryTree[] = { [BERRY_STAGE_PLANTED - 1] = sAnim_BerryTreeStage0, [BERRY_STAGE_SPROUTED - 1] = sAnim_BerryTreeStage1, [BERRY_STAGE_TALLER - 1] = sAnim_BerryTreeStage2, + [BERRY_STAGE_TRUNK - 1] = sAnim_BerryTreeStage2, + [BERRY_STAGE_BUDDING - 1] = sAnim_BerryTreeStage2, [BERRY_STAGE_FLOWERING - 1] = sAnim_BerryTreeStage3, [BERRY_STAGE_BERRIES - 1] = sAnim_BerryTreeStage4, }; From ccb0e11235871f9a8e24a17cf29c5b697c4fbd1a Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 7 Dec 2023 14:18:54 +0100 Subject: [PATCH 27/82] Add generation-based growth rate config --- include/config/overworld.h | 6 ++ src/berry.c | 144 +++++++++++++++++++------------------ 2 files changed, 81 insertions(+), 69 deletions(-) diff --git a/include/config/overworld.h b/include/config/overworld.h index a9c00b748e..dab8f6b153 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -13,6 +13,10 @@ #define OW_PC_JAPAN_WALDA_ICONS TRUE // In the US release of Emerald, the Cross, Bolt, and Plusle icons for Walda's wallpapers were left blank from the Japan release. Setting this to TRUE will restore them. // Berry settings +// These generational defines only make a distinction for Berries! +#define GEN_6_XY GEN_6 +#define GEN_6_ORAS (GEN_6 + 0.5) + #define OW_BERRY_MUTATIONS FALSE // If enabled, Berry plants can mutate based on berries planted next to them. #define OW_BERRY_MULCH_USAGE FALSE // If enabled, Mulch can be used on soil to fertilize it. Otherwise, it is considered unusable. Note that moisture effects only work with OW_BERRY_MOISTURE enabled! #define OW_BERRY_WEEDS FALSE // If enabled, weeds may grow on Berry plants that the player needs to take care of. @@ -21,6 +25,8 @@ #define OW_BERRY_VARIABLE_DRAIN_RATE FALSE // If moisture is enabled, this setting uses the Gen4 drain rates for different berries. #define OW_BERRY_SIX_STAGES FALSE // In XY, Berries go through six stages instead of four. This toggle does not affect the time it takes for a tree to be ready for harvest. Without OW_BERRY_MOISTURE, the two extra stages count as BERRY_STAGE_TALLER for watering purposes. +#define OW_BERRY_GROWTH_RATE GEN_3 // Presets for how long each Berry plant takes to grow. + // Out-of-battle Ability effects #define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8, if a Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same Nature, as opposed to 50% previously. Stationary Pokémon are excluded in Gen3. In Gen6, all No Eggs Discovered gift Pokémon will have the same Nature, while in Gen7 all gift Pokémon will, regardless of Egg Group - In Gen 8, no gift Pokémon are affected. In Gen9, this ability has no out-of-battle effect. #define OW_COMPOUND_EYES GEN_LATEST // Prior to Gen9, if a Pokémon with Compound Eyes is leading the party, the wild held item rate is increased to 60%/20%. diff --git a/src/berry.c b/src/berry.c index 74a272673f..a9522fb9b0 100644 --- a/src/berry.c +++ b/src/berry.c @@ -166,6 +166,12 @@ static const u8 sBerryDescriptionPart2_Kee[] = _("first, then extremely bitter." static const u8 sBerryDescriptionPart1_Maranga[] = _("Its outside is very bitter, but its"); static const u8 sBerryDescriptionPart2_Maranga[] = _("inside tastes like a sweet drink."); +#if OW_BERRY_GROWTH_RATE < GEN_3 || OW_BERRY_GROWTH_RATE > GEN_7 +#error "OW_BERRY_GROWTH_RATE must be between GEN_3 and GEN_7!" +#endif + +#define GROWTH_DURATION(g3, g4, g5, xy, oras, g7) OW_BERRY_GROWTH_RATE == GEN_3 ? g3 : OW_BERRY_GROWTH_RATE == GEN_4 ? g4 : OW_BERRY_GROWTH_RATE == GEN_5 ? g5 : OW_BERRY_GROWTH_RATE == GEN_6_XY ? xy : OW_BERRY_GROWTH_RATE == GEN_6_ORAS ? oras : g7 + const struct Berry gBerries[] = { [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = @@ -178,7 +184,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Cheri, .description2 = sBerryDescriptionPart2_Cheri, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 10, .dry = 0, .sweet = 0, @@ -198,7 +204,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Chesto, .description2 = sBerryDescriptionPart2_Chesto, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 10, .sweet = 0, @@ -218,7 +224,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Pecha, .description2 = sBerryDescriptionPart2_Pecha, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 10, @@ -238,7 +244,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Rawst, .description2 = sBerryDescriptionPart2_Rawst, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 0, @@ -258,7 +264,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Aspear, .description2 = sBerryDescriptionPart2_Aspear, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 0, @@ -278,7 +284,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Leppa, .description2 = sBerryDescriptionPart2_Leppa, - .growthDuration = 16, + .growthDuration = GROWTH_DURATION(16, 16, 24, 24, 16, 24), .spicy = 10, .dry = 0, .sweet = 10, @@ -298,7 +304,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Oran, .description2 = sBerryDescriptionPart2_Oran, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 16, 24, 24, 16, 24), .spicy = 10, .dry = 10, .sweet = 10, @@ -318,7 +324,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Persim, .description2 = sBerryDescriptionPart2_Persim, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 16, 24, 24, 16, 24), .spicy = 10, .dry = 10, .sweet = 10, @@ -338,7 +344,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Lum, .description2 = sBerryDescriptionPart2_Lum, - .growthDuration = 48, + .growthDuration = GROWTH_DURATION(48, 48, 72, 48, 32, 48), .spicy = 10, .dry = 10, .sweet = 10, @@ -358,7 +364,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Sitrus, .description2 = sBerryDescriptionPart2_Sitrus, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 32, 48, 48, 32, 48), .spicy = 10, .dry = 10, .sweet = 10, @@ -378,7 +384,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Figy, .description2 = sBerryDescriptionPart2_Figy, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 10, .dry = 0, .sweet = 0, @@ -398,7 +404,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Wiki, .description2 = sBerryDescriptionPart2_Wiki, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 10, .sweet = 0, @@ -418,7 +424,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Mago, .description2 = sBerryDescriptionPart2_Mago, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 10, @@ -438,7 +444,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Aguav, .description2 = sBerryDescriptionPart2_Aguav, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 0, @@ -458,7 +464,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Iapapa, .description2 = sBerryDescriptionPart2_Iapapa, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 0, @@ -478,7 +484,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Razz, .description2 = sBerryDescriptionPart2_Razz, - .growthDuration = 4, + .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 10, .dry = 10, .sweet = 0, @@ -498,7 +504,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Bluk, .description2 = sBerryDescriptionPart2_Bluk, - .growthDuration = 4, + .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 0, .dry = 10, .sweet = 10, @@ -518,7 +524,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Nanab, .description2 = sBerryDescriptionPart2_Nanab, - .growthDuration = 4, + .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 10, @@ -538,7 +544,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Wepear, .description2 = sBerryDescriptionPart2_Wepear, - .growthDuration = 4, + .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 0, @@ -558,7 +564,7 @@ const struct Berry gBerries[] = .minYield = 3, .description1 = sBerryDescriptionPart1_Pinap, .description2 = sBerryDescriptionPart2_Pinap, - .growthDuration = 4, + .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 10, .dry = 0, .sweet = 0, @@ -578,7 +584,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Pomeg, .description2 = sBerryDescriptionPart2_Pomeg, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 10, .dry = 0, .sweet = 10, @@ -598,7 +604,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Kelpsy, .description2 = sBerryDescriptionPart2_Kelpsy, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 0, .dry = 10, .sweet = 0, @@ -618,7 +624,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Qualot, .description2 = sBerryDescriptionPart2_Qualot, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 10, .dry = 0, .sweet = 10, @@ -638,7 +644,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Hondew, .description2 = sBerryDescriptionPart2_Hondew, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 10, .dry = 10, .sweet = 0, @@ -658,7 +664,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Grepa, .description2 = sBerryDescriptionPart2_Grepa, - .growthDuration = 12, + .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 0, .dry = 10, .sweet = 10, @@ -678,7 +684,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Tamato, .description2 = sBerryDescriptionPart2_Tamato, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 32, 48, 48, 32, 48), .spicy = 20, .dry = 10, .sweet = 0, @@ -698,7 +704,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Cornn, .description2 = sBerryDescriptionPart2_Cornn, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), .spicy = 0, .dry = 20, .sweet = 10, @@ -718,7 +724,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Magost, .description2 = sBerryDescriptionPart2_Magost, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 20, @@ -738,7 +744,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Rabuta, .description2 = sBerryDescriptionPart2_Rabuta, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 0, @@ -758,7 +764,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Nomel, .description2 = sBerryDescriptionPart2_Nomel, - .growthDuration = 24, + .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), .spicy = 10, .dry = 0, .sweet = 0, @@ -778,7 +784,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Spelon, .description2 = sBerryDescriptionPart2_Spelon, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 40, .dry = 10, .sweet = 0, @@ -798,7 +804,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Pamtre, .description2 = sBerryDescriptionPart2_Pamtre, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 0, .dry = 40, .sweet = 10, @@ -818,7 +824,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Watmel, .description2 = sBerryDescriptionPart2_Watmel, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 40, @@ -838,7 +844,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Durin, .description2 = sBerryDescriptionPart2_Durin, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 0, .dry = 0, .sweet = 0, @@ -858,7 +864,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Belue, .description2 = sBerryDescriptionPart2_Belue, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 10, .dry = 0, .sweet = 0, @@ -878,7 +884,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Chilan, .description2 = sBerryDescriptionPart2_Chilan, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 25, .sweet = 10, @@ -898,7 +904,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Occa, .description2 = sBerryDescriptionPart2_Occa, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 15, .dry = 0, .sweet = 10, @@ -918,7 +924,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Passho, .description2 = sBerryDescriptionPart2_Passho, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 15, .sweet = 0, @@ -938,7 +944,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Wacan, .description2 = sBerryDescriptionPart2_Wacan, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, .sweet = 15, @@ -958,7 +964,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Rindo, .description2 = sBerryDescriptionPart2_Rindo, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 10, .dry = 0, .sweet = 0, @@ -978,7 +984,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Yache, .description2 = sBerryDescriptionPart2_Yache, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 10, .sweet = 0, @@ -998,7 +1004,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Chople, .description2 = sBerryDescriptionPart2_Chople, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 15, .dry = 0, .sweet = 0, @@ -1018,7 +1024,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Kebia, .description2 = sBerryDescriptionPart2_Kebia, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 15, .sweet = 0, @@ -1038,7 +1044,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Shuca, .description2 = sBerryDescriptionPart2_Shuca, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 10, .dry = 0, .sweet = 15, @@ -1058,7 +1064,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Coba, .description2 = sBerryDescriptionPart2_Coba, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 10, .sweet = 0, @@ -1078,7 +1084,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Payapa, .description2 = sBerryDescriptionPart2_Payapa, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, .sweet = 10, @@ -1098,7 +1104,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Tanga, .description2 = sBerryDescriptionPart2_Tanga, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 20, .dry = 0, .sweet = 0, @@ -1118,7 +1124,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Charti, .description2 = sBerryDescriptionPart2_Charti, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 10, .dry = 20, .sweet = 0, @@ -1138,7 +1144,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Kasib, .description2 = sBerryDescriptionPart2_Kasib, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 10, .sweet = 20, @@ -1158,7 +1164,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Haban, .description2 = sBerryDescriptionPart2_Haban, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, .sweet = 10, @@ -1178,7 +1184,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Colbur, .description2 = sBerryDescriptionPart2_Colbur, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, .sweet = 0, @@ -1198,7 +1204,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Babiri, .description2 = sBerryDescriptionPart2_Babiri, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 25, .dry = 10, .sweet = 0, @@ -1218,7 +1224,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Roseli, .description2 = sBerryDescriptionPart2_Roseli, - .growthDuration = 72, + .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, .sweet = 25, @@ -1238,7 +1244,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Liechi, .description2 = sBerryDescriptionPart2_Liechi, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 40, .dry = 0, .sweet = 40, @@ -1258,7 +1264,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Ganlon, .description2 = sBerryDescriptionPart2_Ganlon, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 0, .dry = 40, .sweet = 0, @@ -1278,7 +1284,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Salac, .description2 = sBerryDescriptionPart2_Salac, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 0, .dry = 0, .sweet = 40, @@ -1298,7 +1304,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Petaya, .description2 = sBerryDescriptionPart2_Petaya, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 40, .dry = 0, .sweet = 0, @@ -1318,7 +1324,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Apicot, .description2 = sBerryDescriptionPart2_Apicot, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 0, .dry = 40, .sweet = 0, @@ -1338,7 +1344,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Lansat, .description2 = sBerryDescriptionPart2_Lansat, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 120, 48, 72), .spicy = 10, .dry = 10, .sweet = 10, @@ -1358,7 +1364,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Starf, .description2 = sBerryDescriptionPart2_Starf, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 120, 48, 72), .spicy = 10, .dry = 10, .sweet = 10, @@ -1378,7 +1384,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Enigma, .description2 = sBerryDescriptionPart2_Enigma, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 40, .dry = 10, .sweet = 0, @@ -1398,7 +1404,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Micle, .description2 = sBerryDescriptionPart2_Micle, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 0, .dry = 40, .sweet = 10, @@ -1418,7 +1424,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Custap, .description2 = sBerryDescriptionPart2_Custap, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 0, .dry = 0, .sweet = 40, @@ -1438,7 +1444,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Jaboca, .description2 = sBerryDescriptionPart2_Jaboca, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 0, .dry = 0, .sweet = 0, @@ -1458,7 +1464,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Rowap, .description2 = sBerryDescriptionPart2_Rowap, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 10, .dry = 0, .sweet = 0, @@ -1478,7 +1484,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Kee, .description2 = sBerryDescriptionPart2_Kee, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 30, .dry = 30, .sweet = 10, @@ -1498,7 +1504,7 @@ const struct Berry gBerries[] = .minYield = 2, .description1 = sBerryDescriptionPart1_Maranga, .description2 = sBerryDescriptionPart2_Maranga, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 10, .dry = 10, .sweet = 30, @@ -1518,7 +1524,7 @@ const struct Berry gBerries[] = .minYield = 1, .description1 = sBerryDescriptionPart1_Enigma, .description2 = sBerryDescriptionPart2_Enigma, - .growthDuration = 96, + .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 40, .dry = 40, .sweet = 40, @@ -1805,7 +1811,7 @@ void BerryTreeTimeUpdate(s32 minutes) if (!BerryTreeGrow(tree)) break; if (tree->stage == BERRY_STAGE_BERRIES) - tree->minutesUntilNextStage *= ((tree->mulch == ITEM_TO_MULCH(ITEM_STABLE_MULCH)) ? 6 : 4); + tree->minutesUntilNextStage = GetStageDurationByBerryType(tree->berry) * ((tree->mulch == ITEM_TO_MULCH(ITEM_STABLE_MULCH)) ? 6 : 4); } } } From d7959879f18b87f6bddab70e713ed79b0b02bffe Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 7 Dec 2023 18:06:20 +0100 Subject: [PATCH 28/82] Preset yield config --- include/config/overworld.h | 1 + src/berry.c | 279 +++++++++++++++++++------------------ 2 files changed, 144 insertions(+), 136 deletions(-) diff --git a/include/config/overworld.h b/include/config/overworld.h index dab8f6b153..dc4c600e21 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -26,6 +26,7 @@ #define OW_BERRY_SIX_STAGES FALSE // In XY, Berries go through six stages instead of four. This toggle does not affect the time it takes for a tree to be ready for harvest. Without OW_BERRY_MOISTURE, the two extra stages count as BERRY_STAGE_TALLER for watering purposes. #define OW_BERRY_GROWTH_RATE GEN_3 // Presets for how long each Berry plant takes to grow. +#define OW_BERRY_YIELD_RATE GEN_3 // Presets for how many Berries each plant can yield. // Out-of-battle Ability effects #define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8, if a Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same Nature, as opposed to 50% previously. Stationary Pokémon are excluded in Gen3. In Gen6, all No Eggs Discovered gift Pokémon will have the same Nature, while in Gen7 all gift Pokémon will, regardless of Egg Group - In Gen 8, no gift Pokémon are affected. In Gen9, this ability has no out-of-battle effect. diff --git a/src/berry.c b/src/berry.c index a9522fb9b0..4e65e5be5b 100644 --- a/src/berry.c +++ b/src/berry.c @@ -170,7 +170,14 @@ static const u8 sBerryDescriptionPart2_Maranga[] = _("inside tastes like a sweet #error "OW_BERRY_GROWTH_RATE must be between GEN_3 and GEN_7!" #endif +#if OW_BERRY_YIELD_RATE < GEN_3 || OW_BERRY_YIELD_RATE > GEN_6 +#error "OW_BERRY_YIELD_RATE must be between GEN_3 and GEN_6!" +#elif OW_BERRY_YIELD_RATE == GEN_5 +#error "OW_BERRY_YIELD_RATE can not be GEN_5!" +#endif + #define GROWTH_DURATION(g3, g4, g5, xy, oras, g7) OW_BERRY_GROWTH_RATE == GEN_3 ? g3 : OW_BERRY_GROWTH_RATE == GEN_4 ? g4 : OW_BERRY_GROWTH_RATE == GEN_5 ? g5 : OW_BERRY_GROWTH_RATE == GEN_6_XY ? xy : OW_BERRY_GROWTH_RATE == GEN_6_ORAS ? oras : g7 +#define YIELD_RATE(g3, g4, xy, oras) GROWTH_DURATION(g3, g4, 0, xy, oras, 0) const struct Berry gBerries[] = { @@ -180,8 +187,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_RED, .size = 20, - .maxYield = 3, - .minYield = 2, + .maxYield = YIELD_RATE(3, 5, 15, 20), + .minYield = YIELD_RATE(2, 2, 4, 4), .description1 = sBerryDescriptionPart1_Cheri, .description2 = sBerryDescriptionPart2_Cheri, .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), @@ -200,8 +207,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_PURPLE, .size = 80, - .maxYield = 3, - .minYield = 2, + .maxYield = YIELD_RATE(3, 5, 15, 20), + .minYield = YIELD_RATE(2, 2, 4, 4), .description1 = sBerryDescriptionPart1_Chesto, .description2 = sBerryDescriptionPart2_Chesto, .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), @@ -220,8 +227,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_PINK, .size = 40, - .maxYield = 3, - .minYield = 2, + .maxYield = YIELD_RATE(3, 5, 15, 20), + .minYield = YIELD_RATE(2, 2, 4, 4), .description1 = sBerryDescriptionPart1_Pecha, .description2 = sBerryDescriptionPart2_Pecha, .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), @@ -240,8 +247,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_GREEN, .size = 32, - .maxYield = 3, - .minYield = 2, + .maxYield = YIELD_RATE(3, 5, 15, 20), + .minYield = YIELD_RATE(2, 2, 4, 4), .description1 = sBerryDescriptionPart1_Rawst, .description2 = sBerryDescriptionPart2_Rawst, .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), @@ -260,8 +267,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_YELLOW, .size = 50, - .maxYield = 3, - .minYield = 2, + .maxYield = YIELD_RATE(3, 5, 15, 20), + .minYield = YIELD_RATE(2, 2, 4, 4), .description1 = sBerryDescriptionPart1_Aspear, .description2 = sBerryDescriptionPart2_Aspear, .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), @@ -280,8 +287,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_RED, .size = 28, - .maxYield = 3, - .minYield = 2, + .maxYield = YIELD_RATE(3, 5, 15, 22), + .minYield = YIELD_RATE(2, 2, 2, 2), .description1 = sBerryDescriptionPart1_Leppa, .description2 = sBerryDescriptionPart2_Leppa, .growthDuration = GROWTH_DURATION(16, 16, 24, 24, 16, 24), @@ -300,8 +307,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_BLUE, .size = 35, - .maxYield = 3, - .minYield = 2, + .maxYield = YIELD_RATE(3, 5, 15, 20), + .minYield = YIELD_RATE(2, 2, 4, 4), .description1 = sBerryDescriptionPart1_Oran, .description2 = sBerryDescriptionPart2_Oran, .growthDuration = GROWTH_DURATION(12, 16, 24, 24, 16, 24), @@ -320,8 +327,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PINK, .size = 47, - .maxYield = 3, - .minYield = 2, + .maxYield = YIELD_RATE(3, 5, 15, 20), + .minYield = YIELD_RATE(2, 2, 4, 4), .description1 = sBerryDescriptionPart1_Persim, .description2 = sBerryDescriptionPart2_Persim, .growthDuration = GROWTH_DURATION(12, 16, 24, 24, 16, 24), @@ -340,8 +347,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_GREEN, .size = 34, - .maxYield = 2, - .minYield = 1, + .maxYield = YIELD_RATE(2, 5, 20, 18), + .minYield = YIELD_RATE(1, 2, 3, 2), .description1 = sBerryDescriptionPart1_Lum, .description2 = sBerryDescriptionPart2_Lum, .growthDuration = GROWTH_DURATION(48, 48, 72, 48, 32, 48), @@ -360,8 +367,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_YELLOW, .size = 95, - .maxYield = 3, - .minYield = 2, + .maxYield = YIELD_RATE(3, 5, 20, 27), + .minYield = YIELD_RATE(2, 2, 3, 3), .description1 = sBerryDescriptionPart1_Sitrus, .description2 = sBerryDescriptionPart2_Sitrus, .growthDuration = GROWTH_DURATION(24, 32, 48, 48, 32, 48), @@ -380,8 +387,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_RED, .size = 100, - .maxYield = 3, - .minYield = 2, + .maxYield = YIELD_RATE(3, 5, 15, 15), + .minYield = YIELD_RATE(2, 1, 3, 3), .description1 = sBerryDescriptionPart1_Figy, .description2 = sBerryDescriptionPart2_Figy, .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), @@ -400,8 +407,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PURPLE, .size = 115, - .maxYield = 3, - .minYield = 2, + .maxYield = YIELD_RATE(3, 5, 15, 15), + .minYield = YIELD_RATE(2, 1, 3, 3), .description1 = sBerryDescriptionPart1_Wiki, .description2 = sBerryDescriptionPart2_Wiki, .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), @@ -420,8 +427,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PINK, .size = 126, - .maxYield = 3, - .minYield = 2, + .maxYield = YIELD_RATE(3, 5, 15, 15), + .minYield = YIELD_RATE(2, 1, 3, 3), .description1 = sBerryDescriptionPart1_Mago, .description2 = sBerryDescriptionPart2_Mago, .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), @@ -440,8 +447,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_GREEN, .size = 64, - .maxYield = 3, - .minYield = 2, + .maxYield = YIELD_RATE(3, 5, 15, 15), + .minYield = YIELD_RATE(2, 1, 3, 3), .description1 = sBerryDescriptionPart1_Aguav, .description2 = sBerryDescriptionPart2_Aguav, .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), @@ -460,8 +467,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_YELLOW, .size = 223, - .maxYield = 3, - .minYield = 2, + .maxYield = YIELD_RATE(3, 5, 15, 15), + .minYield = YIELD_RATE(2, 1, 3, 3), .description1 = sBerryDescriptionPart1_Iapapa, .description2 = sBerryDescriptionPart2_Iapapa, .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), @@ -480,8 +487,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_RED, .size = 120, - .maxYield = 6, - .minYield = 3, + .maxYield = YIELD_RATE(6, 10, 15, 20), + .minYield = YIELD_RATE(3, 2, 3, 4), .description1 = sBerryDescriptionPart1_Razz, .description2 = sBerryDescriptionPart2_Razz, .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), @@ -500,8 +507,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_PURPLE, .size = 108, - .maxYield = 6, - .minYield = 3, + .maxYield = YIELD_RATE(6, 10, 15, 20), + .minYield = YIELD_RATE(3, 2, 3, 4), .description1 = sBerryDescriptionPart1_Bluk, .description2 = sBerryDescriptionPart2_Bluk, .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), @@ -520,8 +527,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_PINK, .size = 77, - .maxYield = 6, - .minYield = 3, + .maxYield = YIELD_RATE(6, 10, 15, 20), + .minYield = YIELD_RATE(3, 2, 3, 4), .description1 = sBerryDescriptionPart1_Nanab, .description2 = sBerryDescriptionPart2_Nanab, .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), @@ -540,8 +547,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_GREEN, .size = 74, - .maxYield = 6, - .minYield = 3, + .maxYield = YIELD_RATE(6, 10, 15, 20), + .minYield = YIELD_RATE(3, 2, 3, 4), .description1 = sBerryDescriptionPart1_Wepear, .description2 = sBerryDescriptionPart2_Wepear, .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), @@ -560,8 +567,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_YELLOW, .size = 80, - .maxYield = 6, - .minYield = 3, + .maxYield = YIELD_RATE(6, 10, 15, 20), + .minYield = YIELD_RATE(3, 2, 3, 4), .description1 = sBerryDescriptionPart1_Pinap, .description2 = sBerryDescriptionPart2_Pinap, .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), @@ -580,8 +587,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_RED, .size = 135, - .maxYield = 6, - .minYield = 2, + .maxYield = YIELD_RATE(6, 5, 20, 26), + .minYield = YIELD_RATE(2, 1, 1, 2), .description1 = sBerryDescriptionPart1_Pomeg, .description2 = sBerryDescriptionPart2_Pomeg, .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), @@ -600,8 +607,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_BLUE, .size = 150, - .maxYield = 6, - .minYield = 2, + .maxYield = YIELD_RATE(6, 5, 20, 26), + .minYield = YIELD_RATE(2, 1, 1, 2), .description1 = sBerryDescriptionPart1_Kelpsy, .description2 = sBerryDescriptionPart2_Kelpsy, .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), @@ -620,8 +627,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_YELLOW, .size = 110, - .maxYield = 6, - .minYield = 2, + .maxYield = YIELD_RATE(6, 5, 20, 26), + .minYield = YIELD_RATE(2, 1, 1, 2), .description1 = sBerryDescriptionPart1_Qualot, .description2 = sBerryDescriptionPart2_Qualot, .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), @@ -640,8 +647,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_GREEN, .size = 162, - .maxYield = 6, - .minYield = 2, + .maxYield = YIELD_RATE(6, 5, 20, 26), + .minYield = YIELD_RATE(2, 1, 1, 2), .description1 = sBerryDescriptionPart1_Hondew, .description2 = sBerryDescriptionPart2_Hondew, .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), @@ -660,8 +667,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_YELLOW, .size = 149, - .maxYield = 6, - .minYield = 2, + .maxYield = YIELD_RATE(6, 5, 20, 26), + .minYield = YIELD_RATE(2, 1, 1, 2), .description1 = sBerryDescriptionPart1_Grepa, .description2 = sBerryDescriptionPart2_Grepa, .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), @@ -680,8 +687,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_RED, .size = 200, - .maxYield = 4, - .minYield = 2, + .maxYield = YIELD_RATE(4, 5, 20, 26), + .minYield = YIELD_RATE(2, 1, 1, 2), .description1 = sBerryDescriptionPart1_Tamato, .description2 = sBerryDescriptionPart2_Tamato, .growthDuration = GROWTH_DURATION(24, 32, 48, 48, 32, 48), @@ -700,8 +707,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PURPLE, .size = 75, - .maxYield = 4, - .minYield = 2, + .maxYield = YIELD_RATE(4, 10, 15, 15), + .minYield = YIELD_RATE(2, 2, 3, 3), .description1 = sBerryDescriptionPart1_Cornn, .description2 = sBerryDescriptionPart2_Cornn, .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), @@ -720,8 +727,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PINK, .size = 140, - .maxYield = 4, - .minYield = 2, + .maxYield = YIELD_RATE(4, 10, 15, 15), + .minYield = YIELD_RATE(2, 2, 3, 3), .description1 = sBerryDescriptionPart1_Magost, .description2 = sBerryDescriptionPart2_Magost, .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), @@ -740,8 +747,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_GREEN, .size = 226, - .maxYield = 4, - .minYield = 2, + .maxYield = YIELD_RATE(4, 10, 15, 15), + .minYield = YIELD_RATE(2, 2, 3, 3), .description1 = sBerryDescriptionPart1_Rabuta, .description2 = sBerryDescriptionPart2_Rabuta, .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), @@ -760,8 +767,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_YELLOW, .size = 285, - .maxYield = 4, - .minYield = 2, + .maxYield = YIELD_RATE(4, 10, 15, 15), + .minYield = YIELD_RATE(2, 2, 3, 3), .description1 = sBerryDescriptionPart1_Nomel, .description2 = sBerryDescriptionPart2_Nomel, .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), @@ -780,8 +787,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_RED, .size = 133, - .maxYield = 2, - .minYield = 1, + .maxYield = YIELD_RATE(2, 15, 15, 15), + .minYield = YIELD_RATE(1, 2, 3, 3), .description1 = sBerryDescriptionPart1_Spelon, .description2 = sBerryDescriptionPart2_Spelon, .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), @@ -800,8 +807,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_PURPLE, .size = 244, - .maxYield = 2, - .minYield = 1, + .maxYield = YIELD_RATE(2, 15, 15, 15), + .minYield = YIELD_RATE(1, 3, 3, 3), .description1 = sBerryDescriptionPart1_Pamtre, .description2 = sBerryDescriptionPart2_Pamtre, .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), @@ -820,8 +827,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_PINK, .size = 250, - .maxYield = 2, - .minYield = 1, + .maxYield = YIELD_RATE(2, 15, 15, 15), + .minYield = YIELD_RATE(1, 2, 3, 3), .description1 = sBerryDescriptionPart1_Watmel, .description2 = sBerryDescriptionPart2_Watmel, .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), @@ -840,8 +847,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_GREEN, .size = 280, - .maxYield = 2, - .minYield = 1, + .maxYield = YIELD_RATE(2, 15, 15, 15), + .minYield = YIELD_RATE(1, 3, 3, 3), .description1 = sBerryDescriptionPart1_Durin, .description2 = sBerryDescriptionPart2_Durin, .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), @@ -860,8 +867,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_PURPLE, .size = 300, - .maxYield = 2, - .minYield = 1, + .maxYield = YIELD_RATE(2, 15, 15, 15), + .minYield = YIELD_RATE(1, 2, 3, 3), .description1 = sBerryDescriptionPart1_Belue, .description2 = sBerryDescriptionPart2_Belue, .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), @@ -880,8 +887,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_YELLOW, .size = 34, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Chilan, .description2 = sBerryDescriptionPart2_Chilan, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -900,8 +907,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_RED, .size = 90, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Occa, .description2 = sBerryDescriptionPart2_Occa, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -920,8 +927,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_BLUE, .size = 33, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Passho, .description2 = sBerryDescriptionPart2_Passho, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -940,8 +947,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_YELLOW, .size = 250, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Wacan, .description2 = sBerryDescriptionPart2_Wacan, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -960,8 +967,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_GREEN, .size = 156, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Rindo, .description2 = sBerryDescriptionPart2_Rindo, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -980,8 +987,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_BLUE, .size = 135, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Yache, .description2 = sBerryDescriptionPart2_Yache, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -1000,8 +1007,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_RED, .size = 77, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Chople, .description2 = sBerryDescriptionPart2_Chople, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -1020,8 +1027,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_GREEN, .size = 90, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Kebia, .description2 = sBerryDescriptionPart2_Kebia, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -1040,8 +1047,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_YELLOW, .size = 42, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Shuca, .description2 = sBerryDescriptionPart2_Shuca, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -1060,8 +1067,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_BLUE, .size = 278, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Coba, .description2 = sBerryDescriptionPart2_Coba, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -1080,8 +1087,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_PURPLE, .size = 252, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Payapa, .description2 = sBerryDescriptionPart2_Payapa, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -1100,8 +1107,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_GREEN, .size = 42, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Tanga, .description2 = sBerryDescriptionPart2_Tanga, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -1120,8 +1127,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_YELLOW, .size = 28, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Charti, .description2 = sBerryDescriptionPart2_Charti, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -1140,8 +1147,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PURPLE, .size = 144, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Kasib, .description2 = sBerryDescriptionPart2_Kasib, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -1160,8 +1167,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_RED, .size = 23, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Haban, .description2 = sBerryDescriptionPart2_Haban, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -1180,8 +1187,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_PURPLE, .size = 39, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Colbur, .description2 = sBerryDescriptionPart2_Colbur, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -1200,8 +1207,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_GREEN, .size = 265, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Babiri, .description2 = sBerryDescriptionPart2_Babiri, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -1220,8 +1227,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PINK, .size = 35, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(5, 5, 20, 10), + .minYield = YIELD_RATE(2, 1, 3, 2), .description1 = sBerryDescriptionPart1_Roseli, .description2 = sBerryDescriptionPart2_Roseli, .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), @@ -1240,8 +1247,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_RED, .size = 111, - .maxYield = 2, - .minYield = 1, + .maxYield = YIELD_RATE(2, 5, 10, 13), + .minYield = YIELD_RATE(1, 1, 1, 2), .description1 = sBerryDescriptionPart1_Liechi, .description2 = sBerryDescriptionPart2_Liechi, .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), @@ -1260,8 +1267,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_PURPLE, .size = 33, - .maxYield = 2, - .minYield = 1, + .maxYield = YIELD_RATE(2, 5, 10, 13), + .minYield = YIELD_RATE(1, 1, 1, 2), .description1 = sBerryDescriptionPart1_Ganlon, .description2 = sBerryDescriptionPart2_Ganlon, .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), @@ -1280,8 +1287,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_GREEN, .size = 95, - .maxYield = 2, - .minYield = 1, + .maxYield = YIELD_RATE(2, 5, 10, 13), + .minYield = YIELD_RATE(1, 1, 1, 2), .description1 = sBerryDescriptionPart1_Salac, .description2 = sBerryDescriptionPart2_Salac, .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), @@ -1300,8 +1307,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_PINK, .size = 237, - .maxYield = 2, - .minYield = 1, + .maxYield = YIELD_RATE(2, 5, 10, 13), + .minYield = YIELD_RATE(1, 1, 1, 2), .description1 = sBerryDescriptionPart1_Petaya, .description2 = sBerryDescriptionPart2_Petaya, .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), @@ -1320,8 +1327,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_BLUE, .size = 75, - .maxYield = 2, - .minYield = 1, + .maxYield = YIELD_RATE(2, 5, 10, 13), + .minYield = YIELD_RATE(1, 1, 1, 2), .description1 = sBerryDescriptionPart1_Apicot, .description2 = sBerryDescriptionPart2_Apicot, .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), @@ -1340,8 +1347,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_RED, .size = 97, - .maxYield = 2, - .minYield = 1, + .maxYield = YIELD_RATE(2, 5, 5, 7), + .minYield = YIELD_RATE(1, 1, 1, 1), .description1 = sBerryDescriptionPart1_Lansat, .description2 = sBerryDescriptionPart2_Lansat, .growthDuration = GROWTH_DURATION(96, 96, 144, 120, 48, 72), @@ -1360,8 +1367,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_GREEN, .size = 153, - .maxYield = 2, - .minYield = 1, + .maxYield = YIELD_RATE(2, 5, 5, 7), + .minYield = YIELD_RATE(1, 1, 1, 1), .description1 = sBerryDescriptionPart1_Starf, .description2 = sBerryDescriptionPart2_Starf, .growthDuration = GROWTH_DURATION(96, 96, 144, 120, 48, 72), @@ -1380,8 +1387,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PURPLE, .size = 155, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(2, 5, 5, 13), + .minYield = YIELD_RATE(1, 1, 1, 1), .description1 = sBerryDescriptionPart1_Enigma, .description2 = sBerryDescriptionPart2_Enigma, .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), @@ -1400,8 +1407,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_GREEN, .size = 41, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(2, 5, 5, 13), + .minYield = YIELD_RATE(1, 1, 1, 1), .description1 = sBerryDescriptionPart1_Micle, .description2 = sBerryDescriptionPart2_Micle, .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), @@ -1420,8 +1427,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_RED, .size = 267, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(2, 5, 5, 13), + .minYield = YIELD_RATE(1, 1, 1, 1), .description1 = sBerryDescriptionPart1_Custap, .description2 = sBerryDescriptionPart2_Custap, .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), @@ -1440,8 +1447,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_YELLOW, .size = 33, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(2, 5, 5, 13), + .minYield = YIELD_RATE(1, 1, 1, 1), .description1 = sBerryDescriptionPart1_Jaboca, .description2 = sBerryDescriptionPart2_Jaboca, .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), @@ -1460,8 +1467,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_BLUE, .size = 52, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(2, 5, 5, 13), + .minYield = YIELD_RATE(1, 1, 1, 1), .description1 = sBerryDescriptionPart1_Rowap, .description2 = sBerryDescriptionPart2_Rowap, .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), @@ -1480,8 +1487,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_UNKNOWN, .color = BERRY_COLOR_YELLOW, .size = 0, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(2, 5, 10, 13), + .minYield = YIELD_RATE(1, 1, 1, 2), .description1 = sBerryDescriptionPart1_Kee, .description2 = sBerryDescriptionPart2_Kee, .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), @@ -1500,8 +1507,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_UNKNOWN, .color = BERRY_COLOR_BLUE, .size = 0, - .maxYield = 5, - .minYield = 2, + .maxYield = YIELD_RATE(2, 5, 10, 13), + .minYield = YIELD_RATE(1, 1, 1, 2), .description1 = sBerryDescriptionPart1_Maranga, .description2 = sBerryDescriptionPart2_Maranga, .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), @@ -1520,8 +1527,8 @@ const struct Berry gBerries[] = .firmness = BERRY_FIRMNESS_UNKNOWN, .color = BERRY_COLOR_PURPLE, .size = 0, - .maxYield = 2, - .minYield = 1, + .maxYield = YIELD_RATE(2, 5, 5, 13), + .minYield = YIELD_RATE(1, 1, 1, 1), .description1 = sBerryDescriptionPart1_Enigma, .description2 = sBerryDescriptionPart2_Enigma, .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), From 2b711870008ef02e0e3992c184b013b6bb95063c Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 7 Dec 2023 23:50:08 +0100 Subject: [PATCH 29/82] Add caretaking bonuses to berry data --- include/global.berry.h | 18 +++- src/berry.c | 228 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 240 insertions(+), 6 deletions(-) diff --git a/include/global.berry.h b/include/global.berry.h index 1fb98e56b2..18b48d191b 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -4,14 +4,21 @@ #define BERRY_NAME_LENGTH 6 #define BERRY_ITEM_EFFECT_COUNT 18 +// water up to 15 (4 bits) +// weeds up to 7 * 0.5 (3 bits), 0 => 0.1 +// pests up to 7 * 0.5 (3 bits), 0 => 0.2 + struct Berry { const u8 name[BERRY_NAME_LENGTH + 1]; u8 firmness:4; u8 color:4; - u16 size; + u16 size:10; + u16 weedsBonus:3; + u16 pestsBonus:3; u8 maxYield; - u8 minYield; + u8 minYield:4; + u8 waterBonus:4; const u8 *description1; const u8 *description2; u8 growthDuration; @@ -31,9 +38,12 @@ struct Berry2 u8 name[BERRY_NAME_LENGTH + 1]; u8 firmness:4; u8 color:4; - u16 size; + u16 size:10; + u16 weedsBonus:3; + u16 pestsBonus:3; u8 maxYield; - u8 minYield; + u8 minYield:4; + u8 waterBonus:4; u8 *description1; u8 *description2; u8 growthDuration; diff --git a/src/berry.c b/src/berry.c index 4e65e5be5b..6a95d1d6a2 100644 --- a/src/berry.c +++ b/src/berry.c @@ -23,7 +23,10 @@ static u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water); static u8 CalcBerryYield(struct BerryTree *tree); static u8 GetBerryCountByBerryTreeId(u8 id); static u16 GetStageDurationByBerryType(u8); -static u16 GetDrainRateByBerryType(u8); +static u8 GetDrainRateByBerryType(u8); +static u8 GetWaterBonusByBerryType(u8); +static u8 GetWeedingBonusByBerryType(u8); +static u8 GetPestsBonusByBerryType(u8); static void SetTreeMutations(u8 id, u8 berry); static u8 GetTreeMutationValue(u8 id); static u16 GetBerryPestSpecies(u8 berryId); @@ -199,6 +202,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, .drainRate = 15, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = @@ -219,6 +225,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, .drainRate = 15, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = @@ -239,6 +248,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, .drainRate = 15, + .waterBonus = 10, + .weedsBonus = 4, + .pestsBonus = 6, }, [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = @@ -259,6 +271,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, .drainRate = 15, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = @@ -279,6 +294,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 25, .drainRate = 15, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = @@ -299,6 +317,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, .drainRate = 15, + .waterBonus = 15, + .weedsBonus = 3, + .pestsBonus = 6, }, [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = @@ -319,6 +340,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, .drainRate = 15, + .waterBonus = 10, + .weedsBonus = 4, + .pestsBonus = 6, }, [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = @@ -339,6 +363,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, .drainRate = 15, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = @@ -359,6 +386,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, .drainRate = 8, + .waterBonus = 12, + .weedsBonus = 1, + .pestsBonus = 6, }, [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = @@ -379,6 +409,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, .drainRate = 7, + .waterBonus = 12, + .weedsBonus = 1, + .pestsBonus = 6, }, [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = @@ -399,6 +432,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, .drainRate = 10, + .waterBonus = 15, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = @@ -419,6 +455,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, .drainRate = 10, + .waterBonus = 15, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = @@ -439,6 +478,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, .drainRate = 10, + .waterBonus = 15, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = @@ -459,6 +501,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, .drainRate = 10, + .waterBonus = 15, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = @@ -479,6 +524,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 25, .drainRate = 10, + .waterBonus = 15, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = @@ -499,6 +547,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 20, .drainRate = 35, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = @@ -519,6 +570,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 20, .drainRate = 35, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = @@ -539,6 +593,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 20, .drainRate = 35, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = @@ -559,6 +616,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, .drainRate = 35, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = @@ -579,6 +639,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, .drainRate = 35, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = @@ -599,6 +662,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 20, .drainRate = 8, + .waterBonus = 5, + .weedsBonus = 3, + .pestsBonus = 6, }, [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = @@ -619,6 +685,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, .drainRate = 8, + .waterBonus = 5, + .weedsBonus = 3, + .pestsBonus = 6, }, [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = @@ -639,6 +708,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, .drainRate = 8, + .waterBonus = 5, + .weedsBonus = 3, + .pestsBonus = 6, }, [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = @@ -659,6 +731,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 20, .drainRate = 8, + .waterBonus = 5, + .weedsBonus = 3, + .pestsBonus = 6, }, [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = @@ -679,6 +754,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, .drainRate = 8, + .waterBonus = 5, + .weedsBonus = 3, + .pestsBonus = 6, }, [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = @@ -699,6 +777,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 30, .drainRate = 8, + .waterBonus = 5, + .weedsBonus = 3, + .pestsBonus = 6, }, [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = @@ -719,6 +800,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 30, .drainRate = 10, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = @@ -739,6 +823,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 30, .drainRate = 10, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = @@ -759,6 +846,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 30, .drainRate = 10, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = @@ -779,6 +869,9 @@ const struct Berry gBerries[] = .sour = 20, .smoothness = 30, .drainRate = 10, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = @@ -799,6 +892,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 70, .drainRate = 8, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = @@ -819,6 +915,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 70, .drainRate = 8, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = @@ -839,6 +938,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 70, .drainRate = 8, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = @@ -859,6 +961,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 70, .drainRate = 8, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = @@ -879,6 +984,9 @@ const struct Berry gBerries[] = .sour = 40, .smoothness = 70, .drainRate = 8, + .waterBonus = 10, + .weedsBonus = 2, + .pestsBonus = 6, }, [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = @@ -899,6 +1007,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 35, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = @@ -919,6 +1030,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 30, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = @@ -939,6 +1053,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 30, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = @@ -959,6 +1076,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 30, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] = @@ -979,6 +1099,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 30, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] = @@ -999,6 +1122,9 @@ const struct Berry gBerries[] = .sour = 15, .smoothness = 30, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] = @@ -1019,6 +1145,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 30, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] = @@ -1039,6 +1168,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 30, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] = @@ -1059,6 +1191,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 30, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_COBA_BERRY - FIRST_BERRY_INDEX] = @@ -1079,6 +1214,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 30, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] = @@ -1099,6 +1237,9 @@ const struct Berry gBerries[] = .sour = 15, .smoothness = 30, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] = @@ -1119,6 +1260,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 35, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] = @@ -1139,6 +1283,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 35, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] = @@ -1159,6 +1306,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 35, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = @@ -1179,6 +1329,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 35, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = @@ -1199,6 +1352,9 @@ const struct Berry gBerries[] = .sour = 20, .smoothness = 35, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = @@ -1219,6 +1375,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 35, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = @@ -1239,6 +1398,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 35, .drainRate = 6, + .waterBonus = 10, + .weedsBonus = 1, + .pestsBonus = 4, }, [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = @@ -1259,6 +1421,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 80, .drainRate = 4, + .waterBonus = 2, + .weedsBonus = 0, + .pestsBonus = 2, }, [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = @@ -1279,6 +1444,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 80, .drainRate = 4, + .waterBonus = 2, + .weedsBonus = 0, + .pestsBonus = 2, }, [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = @@ -1299,6 +1467,9 @@ const struct Berry gBerries[] = .sour = 40, .smoothness = 80, .drainRate = 4, + .waterBonus = 2, + .weedsBonus = 0, + .pestsBonus = 2, }, [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = @@ -1319,6 +1490,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 80, .drainRate = 4, + .waterBonus = 2, + .weedsBonus = 0, + .pestsBonus = 2, }, [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = @@ -1339,6 +1513,9 @@ const struct Berry gBerries[] = .sour = 40, .smoothness = 80, .drainRate = 4, + .waterBonus = 2, + .weedsBonus = 0, + .pestsBonus = 2, }, [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = @@ -1359,6 +1536,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 30, .drainRate = 4, + .waterBonus = 1, + .weedsBonus = 0, + .pestsBonus = 1, }, [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = @@ -1379,6 +1559,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 30, .drainRate = 4, + .waterBonus = 1, + .weedsBonus = 0, + .pestsBonus = 1, }, [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = @@ -1399,6 +1582,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 60, .drainRate = 7, + .waterBonus = 2, + .weedsBonus = 0, + .pestsBonus = 0, }, [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = @@ -1419,6 +1605,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 60, .drainRate = 7, + .waterBonus = 2, + .weedsBonus = 0, + .pestsBonus = 0, }, [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = @@ -1439,6 +1628,9 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 60, .drainRate = 7, + .waterBonus = 2, + .weedsBonus = 0, + .pestsBonus = 0, }, [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = @@ -1459,6 +1651,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 60, .drainRate = 7, + .waterBonus = 2, + .weedsBonus = 0, + .pestsBonus = 0, }, [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = @@ -1479,6 +1674,9 @@ const struct Berry gBerries[] = .sour = 40, .smoothness = 60, .drainRate = 7, + .waterBonus = 2, + .weedsBonus = 0, + .pestsBonus = 0, }, [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = @@ -1499,6 +1697,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 60, .drainRate = 7, + .waterBonus = 2, + .weedsBonus = 0, + .pestsBonus = 2, }, [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = @@ -1519,6 +1720,9 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 60, .drainRate = 7, + .waterBonus = 2, + .weedsBonus = 0, + .pestsBonus = 2, }, [ITEM_ENIGMA_BERRY_E_READER - FIRST_BERRY_INDEX] = @@ -1539,6 +1743,9 @@ const struct Berry gBerries[] = .sour = 40, .smoothness = 40, .drainRate = 7, + .waterBonus = 2, + .weedsBonus = 0, + .pestsBonus = 0, }, }; @@ -1978,11 +2185,28 @@ static u16 GetStageDurationByBerryType(u8 berry) return GetBerryInfo(berry)->growthDuration * 60 / (OW_BERRY_SIX_STAGES ? 6 : 4); } -static u16 GetDrainRateByBerryType(u8 berry) +static u8 GetDrainRateByBerryType(u8 berry) { return GetBerryInfo(berry)->drainRate; } +static u8 GetWaterBonusByBerryType(u8 berry) +{ + return GetBerryInfo(berry)->waterBonus; +} + +static u8 GetWeedingBonusByBerryType(u8 berry) +{ + u8 bonus = GetBerryInfo(berry)->weedsBonus; + return (bonus == 0) ? 1 : bonus * 5; +} + +static u8 GetPestsBonusByBerryType(u8 berry) +{ + u8 bonus = GetBerryInfo(berry)->pestsBonus; + return (bonus == 0) ? 2 : bonus * 5; +} + void ObjectEventInteractionGetBerryTreeData(void) { u8 id; From 061e56a5648c0eaf9f52ca8df5bcdc4f1b2b63a7 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 8 Dec 2023 00:22:12 +0100 Subject: [PATCH 30/82] Make weeds and pests affect yield --- include/config/overworld.h | 18 +++++++-------- include/global.berry.h | 2 +- src/berry.c | 46 ++++++++++++++++++++++++++++++++------ 3 files changed, 49 insertions(+), 17 deletions(-) diff --git a/include/config/overworld.h b/include/config/overworld.h index dc4c600e21..8e8a0a27a8 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -17,16 +17,16 @@ #define GEN_6_XY GEN_6 #define GEN_6_ORAS (GEN_6 + 0.5) -#define OW_BERRY_MUTATIONS FALSE // If enabled, Berry plants can mutate based on berries planted next to them. -#define OW_BERRY_MULCH_USAGE FALSE // If enabled, Mulch can be used on soil to fertilize it. Otherwise, it is considered unusable. Note that moisture effects only work with OW_BERRY_MOISTURE enabled! -#define OW_BERRY_WEEDS FALSE // If enabled, weeds may grow on Berry plants that the player needs to take care of. -#define OW_BERRY_PESTS FALSE // If enabled, pests may approach Berry plants that the player needs to take care of. -#define OW_BERRY_MOISTURE FALSE // If enabled, Berry watering is not a matter of watering it once per stage, but rather of keeping the soil moist. -#define OW_BERRY_VARIABLE_DRAIN_RATE FALSE // If moisture is enabled, this setting uses the Gen4 drain rates for different berries. -#define OW_BERRY_SIX_STAGES FALSE // In XY, Berries go through six stages instead of four. This toggle does not affect the time it takes for a tree to be ready for harvest. Without OW_BERRY_MOISTURE, the two extra stages count as BERRY_STAGE_TALLER for watering purposes. +#define OW_BERRY_MUTATIONS FALSE // If enabled, Berry plants can mutate based on berries planted next to them. +#define OW_BERRY_MOISTURE FALSE // If enabled, Berry watering is not a matter of watering it once per stage, but rather of keeping the soil moist. +#define OW_BERRY_VARIABLE_DRAIN_RATE FALSE // If moisture is enabled, this setting uses the Gen4 drain rates for different berries. +#define OW_BERRY_MULCH_USAGE FALSE // If enabled, Mulch can be used on soil to fertilize it. Otherwise, it is considered unusable. Note that moisture effects only work with OW_BERRY_MOISTURE enabled! +#define OW_BERRY_WEEDS FALSE // If enabled, weeds may grow on Berry plants that the player needs to take care of. Without OW_BERRY_MOISTURE, weeding bonuses are rounded down. +#define OW_BERRY_PESTS FALSE // If enabled, pests may approach Berry plants that the player needs to take care of. Without OW_BERRY_MOISTURE, pest bonuses are rounded down. +#define OW_BERRY_SIX_STAGES FALSE // In XY, Berries go through six stages instead of four. This toggle does not affect the time it takes for a tree to be ready for harvest. Without OW_BERRY_MOISTURE, the two extra stages count as BERRY_STAGE_TALLER for watering purposes. -#define OW_BERRY_GROWTH_RATE GEN_3 // Presets for how long each Berry plant takes to grow. -#define OW_BERRY_YIELD_RATE GEN_3 // Presets for how many Berries each plant can yield. +#define OW_BERRY_GROWTH_RATE GEN_3 // Presets for how long each Berry plant takes to grow. +#define OW_BERRY_YIELD_RATE GEN_3 // Presets for how many Berries each plant can yield. // Out-of-battle Ability effects #define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8, if a Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same Nature, as opposed to 50% previously. Stationary Pokémon are excluded in Gen3. In Gen6, all No Eggs Discovered gift Pokémon will have the same Nature, while in Gen7 all gift Pokémon will, regardless of Egg Group - In Gen 8, no gift Pokémon are affected. In Gen9, this ability has no out-of-battle effect. diff --git a/include/global.berry.h b/include/global.berry.h index 18b48d191b..f5967d4839 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -86,7 +86,7 @@ struct BerryTree u8 pests:1; u8 mutationB:2; u8 regrowthCount:4; - u8 watered:4; // Used to keep track of yield lost to drought in case of Gen4 watering + u8 watered:4; // Used to keep track of bonuses in case of gradient watering u16 moistureLevel:7; u16 moistureClock:7; u16 padding:2; diff --git a/src/berry.c b/src/berry.c index 6a95d1d6a2..3d709fc88f 100644 --- a/src/berry.c +++ b/src/berry.c @@ -32,6 +32,7 @@ static u8 GetTreeMutationValue(u8 id); static u16 GetBerryPestSpecies(u8 berryId); static void TryForWeeds(struct BerryTree *tree); static void TryForPests(struct BerryTree *tree); +static void AddTreeBonus(struct BerryTree *tree, u8 bonus); //.rodata static const u8 sBerryDescriptionPart1_Cheri[] = _("Blooms with delicate pretty flowers."); @@ -1919,7 +1920,7 @@ bool32 BerryTreeGrow(struct BerryTree *tree) case BERRY_STAGE_NO_BERRY: return FALSE; case BERRY_STAGE_FLOWERING: - tree->berryYield = tree->berryYield + CalcBerryYield(tree); + tree->berryYield = CalcBerryYield(tree); case BERRY_STAGE_PLANTED: case BERRY_STAGE_SPROUTED: case BERRY_STAGE_TRUNK: @@ -2042,7 +2043,7 @@ void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 allowGrowth) tree->moistureLevel = 100; if (stage == BERRY_STAGE_BERRIES) { - tree->berryYield = tree->berryYield + CalcBerryYield(tree); + tree->berryYield = CalcBerryYield(tree); tree->minutesUntilNextStage *= ((tree->mulch == ITEM_TO_MULCH(ITEM_STABLE_MULCH)) ? 6 : 4); } @@ -2166,11 +2167,15 @@ static u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water) static u8 CalcBerryYield(struct BerryTree *tree) { const struct Berry *berry = GetBerryInfo(tree->berry); - u8 min = berry->minYield; + u8 min = berry->minYield + tree->berryYield; u8 max = berry->maxYield; - u8 result = CalcBerryYieldInternal(max, min, BerryTreeGetNumStagesWatered(tree)); + u8 result; if (OW_BERRY_MULCH_USAGE && (tree->mulch == ITEM_TO_MULCH(ITEM_RICH_MULCH) || tree->mulch == ITEM_TO_MULCH(ITEM_AMAZE_MULCH))) - result += 2; + min += 2; + if (min >= max) + result = max; + else + result = CalcBerryYieldInternal(max, min, BerryTreeGetNumStagesWatered(tree)); return result; } @@ -2306,12 +2311,16 @@ void ObjectEventInteractionRemoveBerryTree(void) void ObjectEventInteractionPullBerryWeed(void) { - gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(gSelectedObjectEvent)].weeds = FALSE; + struct BerryTree *tree = GetBerryTreeInfo(GetObjectEventBerryTreeId(gSelectedObjectEvent)); + tree->weeds = FALSE; + AddTreeBonus(tree, GetWeedingBonusByBerryType(tree->berry)); } void ObjectEventInteractionClearBerryPests(void) { - gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(gSelectedObjectEvent)].pests = FALSE; + struct BerryTree *tree = GetBerryTreeInfo(GetObjectEventBerryTreeId(gSelectedObjectEvent)); + tree->pests = FALSE; + AddTreeBonus(tree, GetPestsBonusByBerryType(tree->berry)); } bool8 PlayerHasBerries(void) @@ -2549,3 +2558,26 @@ static void TryForPests(struct BerryTree *tree) if (Random() % 100 < BERRY_PESTS_CHANCE && tree->stage > BERRY_STAGE_PLANTED) tree->pests = TRUE; } + +static void AddTreeBonus(struct BerryTree *tree, u8 bonus) +{ + if (OW_BERRY_MOISTURE) // use watered field to save track of intermediate bonuses + { + tree->watered += bonus; + while (tree->watered > 10) + { + tree->watered -= 10; + bonus = tree->berryYield + 1; + if (bonus > GetBerryInfo(tree->berry)->maxYield) + bonus = GetBerryInfo(tree->berry)->maxYield; + tree->berryYield = bonus; + } + } + else + { + bonus = tree->berryYield + bonus / 10; + if (bonus > GetBerryInfo(tree->berry)->maxYield) + bonus = GetBerryInfo(tree->berry)->maxYield; + tree->berryYield = bonus; + } +} From 6173f9b81d43f7339f26655155ccb37822ca9f26 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 8 Dec 2023 01:01:01 +0100 Subject: [PATCH 31/82] Add soil moisturing config --- include/config/overworld.h | 3 ++- src/berry.c | 37 +++++++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/include/config/overworld.h b/include/config/overworld.h index 8e8a0a27a8..8df6a4646a 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -19,7 +19,8 @@ #define OW_BERRY_MUTATIONS FALSE // If enabled, Berry plants can mutate based on berries planted next to them. #define OW_BERRY_MOISTURE FALSE // If enabled, Berry watering is not a matter of watering it once per stage, but rather of keeping the soil moist. -#define OW_BERRY_VARIABLE_DRAIN_RATE FALSE // If moisture is enabled, this setting uses the Gen4 drain rates for different berries. +#define OW_BERRY_ALWAYS_WATERABLE FALSE // If OW_BERRY_MOISTURE is enabled, this setting allows the player to continuously water soil; dry soil will cause a decrease in Berry Yield (like Gen4). When off, soil can only be watered when dry and watering increases yield (like Gen6). +#define OW_BERRY_VARIABLE_DRAIN_RATE FALSE // If OW_BERRY_MOISTURE is enabled, this setting uses the Gen4 drain rates for different berries. #define OW_BERRY_MULCH_USAGE FALSE // If enabled, Mulch can be used on soil to fertilize it. Otherwise, it is considered unusable. Note that moisture effects only work with OW_BERRY_MOISTURE enabled! #define OW_BERRY_WEEDS FALSE // If enabled, weeds may grow on Berry plants that the player needs to take care of. Without OW_BERRY_MOISTURE, weeding bonuses are rounded down. #define OW_BERRY_PESTS FALSE // If enabled, pests may approach Berry plants that the player needs to take care of. Without OW_BERRY_MOISTURE, pest bonuses are rounded down. diff --git a/src/berry.c b/src/berry.c index 3d709fc88f..68c32db822 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1858,10 +1858,17 @@ struct BerryTree *GetBerryTreeInfo(u8 id) bool32 ObjectEventInteractionWaterBerryTree(void) { struct BerryTree *tree = GetBerryTreeInfo(GetObjectEventBerryTreeId(gSelectedObjectEvent)); -#if OW_BERRY_MOISTURE == TRUE - tree->moistureLevel = 100; - return TRUE; -#else + + if (OW_BERRY_MOISTURE) + { + tree->moistureLevel = 100; + if (OW_BERRY_ALWAYS_WATERABLE) + { + return TRUE; + } + AddTreeBonus(tree, GetWaterBonusByBerryType(tree->berry)); + } + switch (tree->stage) { case BERRY_STAGE_PLANTED: @@ -1882,7 +1889,6 @@ bool32 ObjectEventInteractionWaterBerryTree(void) return FALSE; } return TRUE; -#endif } bool8 IsPlayerFacingEmptyBerryTreePatch(void) @@ -1983,7 +1989,7 @@ void BerryTreeTimeUpdate(s32 minutes) time -= 1; if (tree->moistureClock % 60 == 0) { - if (OW_BERRY_MOISTURE == TRUE) + if (OW_BERRY_MOISTURE) { drainVal = OW_BERRY_VARIABLE_DRAIN_RATE ? GetDrainRateByBerryType(tree->berry) : 4; if (OW_BERRY_MULCH_USAGE) @@ -1995,12 +2001,19 @@ void BerryTreeTimeUpdate(s32 minutes) if (tree->mulch == ITEM_TO_MULCH(ITEM_BOOST_MULCH) || tree->mulch == ITEM_TO_MULCH(ITEM_AMAZE_MULCH)) drainVal = 25; } - if (tree->moistureLevel == 0 || (!OW_BERRY_VARIABLE_DRAIN_RATE && tree->moistureLevel == 4)) // Without variable drain rate (and without mulches), this needs to trigger after 24 hours, hence the extra check - tree->watered++; + if (OW_BERRY_ALWAYS_WATERABLE && tree->moistureLevel == 0) + { + if (tree->berryYield > GetBerryInfo(tree->berry)->minYield + GetBerryInfo(tree->berry)->maxYield / 5) + tree->berryYield -= GetBerryInfo(tree->berry)->maxYield / 5; + else + tree->berryYield = GetBerryInfo(tree->berry)->minYield; + } else if (tree->moistureLevel <= drainVal) tree->moistureLevel = 0; else tree->moistureLevel -= drainVal; + if (!OW_BERRY_VARIABLE_DRAIN_RATE && tree->moistureLevel <= 4) // Without variable drain rate (and without mulches), this needs to trigger after 24 hours, hence the extra check + tree->moistureLevel = 0; } if (tree->moistureClock == 120) { @@ -2041,6 +2054,8 @@ void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 allowGrowth) tree->minutesUntilNextStage = GetMulchAffectedGrowthRate(GetStageDurationByBerryType(berry), tree->mulch, stage); tree->stage = stage; tree->moistureLevel = 100; + if (OW_BERRY_ALWAYS_WATERABLE) + tree->berryYield = GetBerryInfo(berry)->maxYield; if (stage == BERRY_STAGE_BERRIES) { tree->berryYield = CalcBerryYield(tree); @@ -2147,7 +2162,7 @@ static u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water) u32 rand; u32 extraYield; - if (water == 0) + if (water == 0 || OW_BERRY_MOISTURE) return min; else { @@ -2167,11 +2182,13 @@ static u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water) static u8 CalcBerryYield(struct BerryTree *tree) { const struct Berry *berry = GetBerryInfo(tree->berry); - u8 min = berry->minYield + tree->berryYield; + u8 min = tree->berryYield; u8 max = berry->maxYield; u8 result; if (OW_BERRY_MULCH_USAGE && (tree->mulch == ITEM_TO_MULCH(ITEM_RICH_MULCH) || tree->mulch == ITEM_TO_MULCH(ITEM_AMAZE_MULCH))) min += 2; + if (!(OW_BERRY_MOISTURE && OW_BERRY_ALWAYS_WATERABLE)) + min += berry->minYield; if (min >= max) result = max; else From 1e0b895ecba86d43a4cd71d9fa1540d07256cb45 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 8 Dec 2023 01:05:54 +0100 Subject: [PATCH 32/82] Add missing check to prevents water grinding --- data/scripts/berry_tree.inc | 2 ++ data/specials.inc | 1 + src/berry.c | 7 +++++++ 3 files changed, 10 insertions(+) diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 10376d4c58..99768d5457 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -216,6 +216,8 @@ BerryTree_EventScript_WantToWater:: .endif checkitem ITEM_WAILMER_PAIL goto_if_eq VAR_RESULT, FALSE, BerryTree_EventScript_DontWater + specialvar VAR_RESULT, CanWaterBerryPlot + goto_if_eq VAR_RESULT, FALSE, BerryTree_EventScript_DontWater special ObjectEventInteractionGetBerryName msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, BerryTree_EventScript_WaterBerry diff --git a/data/specials.inc b/data/specials.inc index 717970767c..d5e659e1f9 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -549,3 +549,4 @@ gSpecials:: def_special ObjectEventInteractionClearBerryPests def_special ObjectEventInteractionBerryHasWeed def_special ObjectEventInteractionBerryHasPests + def_special CanWaterBerryPlot diff --git a/src/berry.c b/src/berry.c index 68c32db822..ac8dab7e16 100644 --- a/src/berry.c +++ b/src/berry.c @@ -2229,6 +2229,13 @@ static u8 GetPestsBonusByBerryType(u8 berry) return (bonus == 0) ? 2 : bonus * 5; } +bool8 CanWaterBerryPlot(void) +{ + if (!OW_BERRY_MOISTURE || OW_BERRY_ALWAYS_WATERABLE) + return TRUE; + return (gSaveBlock1Ptr->berryTrees[GetObjectEventBerryTreeId(gSelectedObjectEvent)].moistureLevel == 0); +} + void ObjectEventInteractionGetBerryTreeData(void) { u8 id; From ffb16c0dd5f198a1c50db35bce4493f1a002e1d1 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 8 Dec 2023 12:03:16 +0100 Subject: [PATCH 33/82] ORAS drain rate --- include/config/overworld.h | 4 ++-- src/berry.c | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/include/config/overworld.h b/include/config/overworld.h index 8df6a4646a..238e254c68 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -15,12 +15,11 @@ // Berry settings // These generational defines only make a distinction for Berries! #define GEN_6_XY GEN_6 -#define GEN_6_ORAS (GEN_6 + 0.5) +#define GEN_6_ORAS GEN_LATEST + 1 #define OW_BERRY_MUTATIONS FALSE // If enabled, Berry plants can mutate based on berries planted next to them. #define OW_BERRY_MOISTURE FALSE // If enabled, Berry watering is not a matter of watering it once per stage, but rather of keeping the soil moist. #define OW_BERRY_ALWAYS_WATERABLE FALSE // If OW_BERRY_MOISTURE is enabled, this setting allows the player to continuously water soil; dry soil will cause a decrease in Berry Yield (like Gen4). When off, soil can only be watered when dry and watering increases yield (like Gen6). -#define OW_BERRY_VARIABLE_DRAIN_RATE FALSE // If OW_BERRY_MOISTURE is enabled, this setting uses the Gen4 drain rates for different berries. #define OW_BERRY_MULCH_USAGE FALSE // If enabled, Mulch can be used on soil to fertilize it. Otherwise, it is considered unusable. Note that moisture effects only work with OW_BERRY_MOISTURE enabled! #define OW_BERRY_WEEDS FALSE // If enabled, weeds may grow on Berry plants that the player needs to take care of. Without OW_BERRY_MOISTURE, weeding bonuses are rounded down. #define OW_BERRY_PESTS FALSE // If enabled, pests may approach Berry plants that the player needs to take care of. Without OW_BERRY_MOISTURE, pest bonuses are rounded down. @@ -28,6 +27,7 @@ #define OW_BERRY_GROWTH_RATE GEN_3 // Presets for how long each Berry plant takes to grow. #define OW_BERRY_YIELD_RATE GEN_3 // Presets for how many Berries each plant can yield. +#define OW_BERRY_DRAIN_RATE GEN_6_ORAS // If OW_BERRY_MOISTURE is enabled, this setting changes how fast the soil dries out. GEN_4 uses a Berry-dependent drain rate, GEN_6_XY dries out in 24 hours (4 hours with the relevant Mulch) and GEN_6_ORAS dries out in 4 hours. Other values are illegal. // Out-of-battle Ability effects #define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8, if a Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same Nature, as opposed to 50% previously. Stationary Pokémon are excluded in Gen3. In Gen6, all No Eggs Discovered gift Pokémon will have the same Nature, while in Gen7 all gift Pokémon will, regardless of Egg Group - In Gen 8, no gift Pokémon are affected. In Gen9, this ability has no out-of-battle effect. diff --git a/src/berry.c b/src/berry.c index ac8dab7e16..bd4daaeb54 100644 --- a/src/berry.c +++ b/src/berry.c @@ -170,16 +170,21 @@ static const u8 sBerryDescriptionPart2_Kee[] = _("first, then extremely bitter." static const u8 sBerryDescriptionPart1_Maranga[] = _("Its outside is very bitter, but its"); static const u8 sBerryDescriptionPart2_Maranga[] = _("inside tastes like a sweet drink."); -#if OW_BERRY_GROWTH_RATE < GEN_3 || OW_BERRY_GROWTH_RATE > GEN_7 +// Check include/config/overworld.h configs and throw an error if illegal +#if OW_BERRY_GROWTH_RATE < GEN_3 || (OW_BERRY_GROWTH_RATE > GEN_7 && OW_BERRY_GROWTH_RATE != GEN_6_ORAS) #error "OW_BERRY_GROWTH_RATE must be between GEN_3 and GEN_7!" #endif -#if OW_BERRY_YIELD_RATE < GEN_3 || OW_BERRY_YIELD_RATE > GEN_6 +#if OW_BERRY_YIELD_RATE < GEN_3 || (OW_BERRY_YIELD_RATE > GEN_6 && OW_BERRY_GROWTH_RATE != GEN_6_ORAS) #error "OW_BERRY_YIELD_RATE must be between GEN_3 and GEN_6!" #elif OW_BERRY_YIELD_RATE == GEN_5 #error "OW_BERRY_YIELD_RATE can not be GEN_5!" #endif +#if OW_BERRY_MOISTURE && OW_BERRY_DRAIN_RATE != GEN_4 && OW_BERRY_DRAIN_RATE != GEN_6_XY && OW_BERRY_DRAIN_RATE != GEN_6_ORAS +#error "OW_BERRY_DRAIN_RATE must be GEN_5, GEN_6_XY or GEN_6_ORAS!" +#endif + #define GROWTH_DURATION(g3, g4, g5, xy, oras, g7) OW_BERRY_GROWTH_RATE == GEN_3 ? g3 : OW_BERRY_GROWTH_RATE == GEN_4 ? g4 : OW_BERRY_GROWTH_RATE == GEN_5 ? g5 : OW_BERRY_GROWTH_RATE == GEN_6_XY ? xy : OW_BERRY_GROWTH_RATE == GEN_6_ORAS ? oras : g7 #define YIELD_RATE(g3, g4, xy, oras) GROWTH_DURATION(g3, g4, 0, xy, oras, 0) @@ -1991,7 +1996,7 @@ void BerryTreeTimeUpdate(s32 minutes) { if (OW_BERRY_MOISTURE) { - drainVal = OW_BERRY_VARIABLE_DRAIN_RATE ? GetDrainRateByBerryType(tree->berry) : 4; + drainVal = (OW_BERRY_DRAIN_RATE == GEN_4) ? GetDrainRateByBerryType(tree->berry) : (OW_BERRY_DRAIN_RATE == GEN_6_XY) ? 4 : 25; if (OW_BERRY_MULCH_USAGE) { if (tree->mulch == ITEM_TO_MULCH(ITEM_GROWTH_MULCH)) @@ -2012,7 +2017,7 @@ void BerryTreeTimeUpdate(s32 minutes) tree->moistureLevel = 0; else tree->moistureLevel -= drainVal; - if (!OW_BERRY_VARIABLE_DRAIN_RATE && tree->moistureLevel <= 4) // Without variable drain rate (and without mulches), this needs to trigger after 24 hours, hence the extra check + if (OW_BERRY_DRAIN_RATE == GEN_6_XY && tree->moistureLevel <= 4) // Without variable drain rate (and without mulches), this needs to trigger after 24 hours, hence the extra check tree->moistureLevel = 0; } if (tree->moistureClock == 120) From 662939d5f9d09bd50ba6d7b4a9b9fa145141b4c6 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sat, 23 Dec 2023 00:41:47 +0100 Subject: [PATCH 34/82] Add family defines --- src/berry.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/berry.c b/src/berry.c index bd4daaeb54..f1f567e180 100644 --- a/src/berry.c +++ b/src/berry.c @@ -2543,22 +2543,22 @@ static u16 GetBerryPestSpecies(u8 berryId) switch(berry->color) { case BERRY_COLOR_RED: - return SPECIES_LEDYBA; + return P_FAMILY_LEDYBA ? SPECIES_LEDYBA : SPECIES_NONE; break; case BERRY_COLOR_BLUE: - return SPECIES_VOLBEAT; + return P_FAMILY_VOLBEAT_ILLUMISE ? SPECIES_VOLBEAT : SPECIES_NONE; break; case BERRY_COLOR_PURPLE: - return SPECIES_ILLUMISE; + return P_FAMILY_VOLBEAT_ILLUMISE ? SPECIES_ILLUMISE : SPECIES_NONE; break; case BERRY_COLOR_GREEN: - return SPECIES_BURMY_PLANT_CLOAK; + return P_FAMILY_BURMY ? SPECIES_BURMY_PLANT_CLOAK : SPECIES_NONE; break; case BERRY_COLOR_YELLOW: - return SPECIES_COMBEE; + return P_FAMILY_COMBEE ? SPECIES_COMBEE : SPECIES_NONE; break; case BERRY_COLOR_PINK: - return SPECIES_SPEWPA; + return P_FAMILY_SCATTERBUG ? SPECIES_SPEWPA : SPECIES_NONE; break; } #endif From 9be8fed52c5cc4ee67f439c30937e11a8c06ca70 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sun, 24 Dec 2023 22:59:43 +0100 Subject: [PATCH 35/82] Fix string with duplicate berry berry --- data/scripts/berry_tree.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 99768d5457..4f4f723f1c 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -266,7 +266,7 @@ BerryTree_Text_PlantedOneBerry: BerryTree_Text_BerryGrowthStage1: .if OW_BERRY_SIX_STAGES == TRUE - .string "This is where you planted the\n{STR_VAR_1} BERRY!$" + .string "This is where you planted the\n{STR_VAR_1}!$" .else .string "One {STR_VAR_1} was planted here.$" .endif From c115649349f9b8447e492a4beb46a15c20ae216a Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sun, 24 Dec 2023 23:08:15 +0100 Subject: [PATCH 36/82] Fix 6 stage Berry trees not growing properly --- include/config/overworld.h | 2 +- src/berry.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/config/overworld.h b/include/config/overworld.h index 238e254c68..41ea797546 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -23,7 +23,7 @@ #define OW_BERRY_MULCH_USAGE FALSE // If enabled, Mulch can be used on soil to fertilize it. Otherwise, it is considered unusable. Note that moisture effects only work with OW_BERRY_MOISTURE enabled! #define OW_BERRY_WEEDS FALSE // If enabled, weeds may grow on Berry plants that the player needs to take care of. Without OW_BERRY_MOISTURE, weeding bonuses are rounded down. #define OW_BERRY_PESTS FALSE // If enabled, pests may approach Berry plants that the player needs to take care of. Without OW_BERRY_MOISTURE, pest bonuses are rounded down. -#define OW_BERRY_SIX_STAGES FALSE // In XY, Berries go through six stages instead of four. This toggle does not affect the time it takes for a tree to be ready for harvest. Without OW_BERRY_MOISTURE, the two extra stages count as BERRY_STAGE_TALLER for watering purposes. +#define OW_BERRY_SIX_STAGES TRUE // In XY, Berries go through six stages instead of four. This toggle does not affect the time it takes for a tree to be ready for harvest. Without OW_BERRY_MOISTURE, the two extra stages count as BERRY_STAGE_TALLER for watering purposes. #define OW_BERRY_GROWTH_RATE GEN_3 // Presets for how long each Berry plant takes to grow. #define OW_BERRY_YIELD_RATE GEN_3 // Presets for how many Berries each plant can yield. diff --git a/src/berry.c b/src/berry.c index f1f567e180..60776af2c6 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1935,7 +1935,6 @@ bool32 BerryTreeGrow(struct BerryTree *tree) case BERRY_STAGE_PLANTED: case BERRY_STAGE_SPROUTED: case BERRY_STAGE_TRUNK: - case BERRY_STAGE_BUDDING: tree->stage++; break; case BERRY_STAGE_TALLER: @@ -1944,6 +1943,10 @@ bool32 BerryTreeGrow(struct BerryTree *tree) else tree->stage++; break; + case BERRY_STAGE_BUDDING: + tree->berryYield = CalcBerryYield(tree); + tree->stage = BERRY_STAGE_BERRIES; + break; case BERRY_STAGE_BERRIES: tree->watered = 0; tree->berryYield = 0; From c2a5b71d46aa53f619ddbcf84a5acc68682d9519 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sun, 24 Dec 2023 23:17:05 +0100 Subject: [PATCH 37/82] Fix six stage berry graphical issues --- src/data/object_events/berry_tree_graphics_tables.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/object_events/berry_tree_graphics_tables.h b/src/data/object_events/berry_tree_graphics_tables.h index 2969b6a78e..63559a326c 100755 --- a/src/data/object_events/berry_tree_graphics_tables.h +++ b/src/data/object_events/berry_tree_graphics_tables.h @@ -628,9 +628,9 @@ const struct SpriteFrameImage sPicTable_RowapBerryTree[] = { const u8 gBerryTreePaletteSlotTable_Rowap[] = {3, 4, 5, 5, 5}; -const u8 gDeadBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES}; +const u8 gDeadBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES}; -const u8 gBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES}; +const u8 gBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES}; const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = sPicTable_CheriBerryTree, From 7f3264c151a88be3f3b90ffd884fa185f4555cac Mon Sep 17 00:00:00 2001 From: sbird Date: Tue, 26 Dec 2023 14:26:07 +0100 Subject: [PATCH 38/82] [dynamic multichoice] fix -Wall warnings / errors --- src/list_menu.c | 2 +- src/scrcmd.c | 3 ++- src/script_menu.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/list_menu.c b/src/list_menu.c index f4148e5fd9..e83f325161 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -887,7 +887,7 @@ bool8 ListMenuChangeSelectionFull(struct ListMenu *list, bool32 updateCursor, bo bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown) { - ListMenuChangeSelectionFull(list, updateCursorAndCallCallback, updateCursorAndCallCallback, count, movingDown); + return ListMenuChangeSelectionFull(list, updateCursorAndCallCallback, updateCursorAndCallCallback, count, movingDown); } static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 onInit) diff --git a/src/scrcmd.c b/src/scrcmd.c index 0716d46b9b..11ae5f3d75 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1390,7 +1390,7 @@ bool8 ScrCmd_dynmultichoice(struct ScriptContext *ctx) struct ListMenuItem *items; if (argc == 0) - return; + return FALSE; if (maxBeforeScroll == 0xFF) maxBeforeScroll = DYN_MULTICHOICE_DEFAULT_MAX_BEFORE_SCROLL; @@ -1446,6 +1446,7 @@ bool8 ScrCmd_dynmultipush(struct ScriptContext *ctx) item.name = nameBuffer; item.id = id; MultichoiceDynamic_PushElement(item); + return FALSE; } bool8 ScrCmd_multichoice(struct ScriptContext *ctx) diff --git a/src/script_menu.c b/src/script_menu.c index a650306821..021f23053c 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -387,7 +387,7 @@ static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenu gTasks[taskId].data[2] = windowId; gTasks[taskId].data[5] = argc; gTasks[taskId].data[7] = maxBeforeScroll; - StoreWordInTwoHalfwords(&gTasks[taskId].data[3], (u32) items); + StoreWordInTwoHalfwords((u16*) &gTasks[taskId].data[3], (u32) items); list = (void *) gTasks[gTasks[taskId].data[0]].data; ListMenuChangeSelectionFull(list, TRUE, FALSE, initialRow, TRUE); @@ -524,7 +524,7 @@ static void Task_HandleScrollingMultichoiceInput(u8 taskId) RemoveScrollIndicatorArrowPair(gTasks[taskId].data[6]); } - LoadWordFromTwoHalfwords(&gTasks[taskId].data[3], (u32* )(&items)); + LoadWordFromTwoHalfwords((u16*) &gTasks[taskId].data[3], (u32* )(&items)); FreeListMenuItems(items, gTasks[taskId].data[5]); TRY_FREE_AND_SET_NULL(sDynamicMenuEventScratchPad); DestroyListMenuTask(gTasks[taskId].data[0], NULL, NULL); From 515aa367bfeb542e1cfa888ebf4b86351e9946e9 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Sat, 30 Dec 2023 10:10:21 +0000 Subject: [PATCH 39/82] VSync BENCHMARKs and avoid AdvanceRandom in tests (#3867) --- include/test/test.h | 3 +++ src/main.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/test/test.h b/include/test/test.h index 918d00399b..72bc36ee77 100644 --- a/include/test/test.h +++ b/include/test/test.h @@ -165,6 +165,9 @@ struct Benchmark { s32 ticks; }; static inline void BenchmarkStart(void) { gTestRunnerState.inBenchmark = TRUE; + // Wait for a v-blank so that comparing two benchmarks is not affected + // by the v-count (different numbers of IRQs may run). + VBlankIntrWait(); REG_TM3CNT = (TIMER_ENABLE | TIMER_64CLK) << 16; } diff --git a/src/main.c b/src/main.c index d850bc27bc..1f2b712750 100644 --- a/src/main.c +++ b/src/main.c @@ -23,6 +23,7 @@ #include "intro.h" #include "main.h" #include "trainer_hill.h" +#include "test_runner.h" #include "constants/rgb.h" static void VBlankIntr(void); @@ -372,7 +373,7 @@ static void VBlankIntr(void) m4aSoundMain(); TryReceiveLinkBattleData(); - if (!gMain.inBattle || !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_RECORDED))) + if (!gTestRunnerEnabled && (!gMain.inBattle || !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_RECORDED)))) Random(); UpdateWirelessStatusIndicatorSprite(); From 00e7038061b823c6aba314f7f05cd38777a9c9af Mon Sep 17 00:00:00 2001 From: Katy Date: Sat, 30 Dec 2023 15:29:32 -0600 Subject: [PATCH 40/82] Pokemon GFX Upgrades/Fixes (#3805) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Tyrantrum GFX Upgrade * Duraludon Pal Fixes * Zigzagoon Sprite fixes * Linoone Sprite Fixes * Togepi Icon Fix missing pixel * Gen 9 Pokemon Icons For #3553 Did a bunch of research (looking at how old icons generally look) to help decide specific icons to choose from. Generally icons are more 'chibi' like, with large heads (exceptions being 'scary' fully evolved pokemon) and the animations usually move up and down with some character. Some touches as well. * Litwick Front Fix Missing Pixel * Krookodile Front Fix Stray pixel * Switch to Shiny pal Switch to shiny pal on Tyrantrum’s back sprite png --------- Co-authored-by: Bassoonian --- graphics/pokemon/annihilape/icon.png | Bin 624 -> 475 bytes graphics/pokemon/arctibax/icon.png | Bin 412 -> 408 bytes graphics/pokemon/armarouge/icon.png | Bin 455 -> 476 bytes graphics/pokemon/baxcalibur/icon.png | Bin 567 -> 501 bytes graphics/pokemon/bellibolt/icon.png | Bin 383 -> 326 bytes graphics/pokemon/brambleghast/icon.png | Bin 502 -> 350 bytes graphics/pokemon/bramblin/icon.png | Bin 338 -> 323 bytes graphics/pokemon/ceruledge/icon.png | Bin 413 -> 458 bytes graphics/pokemon/cetitan/icon.png | Bin 416 -> 456 bytes graphics/pokemon/cetoddle/icon.png | Bin 369 -> 327 bytes graphics/pokemon/charcadet/icon.png | Bin 332 -> 319 bytes graphics/pokemon/chi_yu/icon.png | Bin 531 -> 388 bytes graphics/pokemon/chien_pao/icon.png | Bin 511 -> 463 bytes graphics/pokemon/clodsire/icon.png | Bin 468 -> 361 bytes graphics/pokemon/crocalor/icon.png | Bin 418 -> 375 bytes graphics/pokemon/dolliv/icon.png | Bin 364 -> 343 bytes graphics/pokemon/dudunsparce/icon.png | Bin 494 -> 423 bytes graphics/pokemon/duraludon/back.png | Bin 642 -> 600 bytes graphics/pokemon/duraludon/front.png | Bin 951 -> 891 bytes graphics/pokemon/duraludon/normal.pal | 4 ++-- graphics/pokemon/duraludon/shiny.pal | 4 ++-- graphics/pokemon/espathra/icon.png | Bin 533 -> 466 bytes graphics/pokemon/krookodile/anim_front.png | Bin 1618 -> 1626 bytes graphics/pokemon/linoone/anim_front.png | Bin 1001 -> 999 bytes graphics/pokemon/linoone/back.png | Bin 507 -> 463 bytes graphics/pokemon/linoone/normal.pal | 6 +++--- graphics/pokemon/linoone/shiny.pal | 14 +++++++------- graphics/pokemon/litwick/anim_front.png | Bin 597 -> 476 bytes graphics/pokemon/togepi/icon.png | Bin 337 -> 353 bytes graphics/pokemon/tyrantrum/anim_front.png | Bin 1823 -> 1774 bytes graphics/pokemon/tyrantrum/back.png | Bin 625 -> 811 bytes graphics/pokemon/zigzagoon/anim_front.png | Bin 989 -> 999 bytes graphics/pokemon/zigzagoon/back.png | Bin 679 -> 619 bytes src/data/pokemon/species_info/gen_6.h | 2 +- src/data/pokemon/species_info/gen_8.h | 2 +- 35 files changed, 16 insertions(+), 16 deletions(-) diff --git a/graphics/pokemon/annihilape/icon.png b/graphics/pokemon/annihilape/icon.png index a516d2d5e92c9c6eeaae7cbcf78db5b93798e6b1..561a4afedd2003b1b1b6ee3e3941a15adca8ebc0 100755 GIT binary patch delta 390 zcmV;10eSxL1lt3UBnkm@Qb$4nuFf3kks&^R0a-~zK~zYI%~Zjz!ypW65{Uzc0kxUnlV=w&sUePk zyK_gIhH-gNy~?>A0P`y8wAd``=%A^eJH$_C2Y!$m6!pEZVyZ#d{|P9^PC~+xwtzqk zv*L1~({M}}D5Ta3xD+R&20b+bKdcs9UB~&C1_g+YT582Al+d3q zLVR&}t*sCxJtgK(0;arvGVP{p!7==Cgx#R#ul{U=*v&ThOnq#@uZ~X##Bt|ClKS0z z$av0&6d;>?7@O;LJ~X+P`M?kP0LDW;93RPtsr`5PklTOBhfVvZe8}y;=0k4(ln+b$ kFZqz$f6a$9emNih0QjySnyVIJuJ|J$X(C}^^~W6dN{pg|K(DgPWmz8^DmpXj~B#pQ;sGw9V8 zZSA)61~bw;9LC}bwT0eVGad9j6IX!7p*PpTEYUSJ)*UD_V#0P{f2+gZfMY+M`*a)V zw3Sh~iaUWl^gRQHp-qpN;Z8kLc#d@DGul%in|%{2Lqp3Iaua43{zNpr9t-j&G(^OH z*JW=^BZ6Hti5l#BN!7b#0YR4wpU>yQu5Yjs;a6C zO*X_G>ikaCF5tg;e>_WMU5uLa8k(;F> zcv}1BZkcv({lN!>n8*htKBQbzAn;)WNLigR`QQkO?VDPAe`H)Td~O>b4#ND#hw{jW zDDc3C)Vw(P(6$#!kHm-LMVZ6mgC5I95Cg>GgJntz`jJIG^!!CyY~lm9Px=o&uoE8m z5CKBjgAc0+n@HvZi4hPpI%)9%&XlkV>(s>uiq`0Xzz0u}@sRjnu*rBh`LN;Pfe$+# hp7~H-#&>-96#>i7EuMx0K#*eL+SI%a!U##u;iCi>3)-^#K?Xz%;5NB$}ukrm+@f zRjE({&5{Nzcc4)Tzz=NZLrDPk3@8Bu0bvV>i0uJ&V4klWL=g3T3rI{rL3~;{yeOJ~ zf35ywpEvm<(0nvP6*XyKJej-VlR$QYT_+37cY^GMIqDGKSqAuq?Q#+0i=v)g3%@XI zHBIAtQ-=5IuOHEe^I>cMJRes3r}?nA|4BZq_K$oxxBopK2KMjyFtC5*!_ofB#{Q{$ zu`Em2KhFpEb=cqQ*$EH(3r+yHfA8ZiL~j4chgez$lzToD4~S7dL_iGv|KeV~uN#QYuJ7mD)GI5p?yXCz9 z|D%uT1s1Q4$h^;BA39g~{;YFvzpZU7-?dNi8iPb=_-sxN<+#HfCp=o#y~=E9h+P^2CquG2K`ftfIZ|jqO#n=TgT+ zr(Otm5SVlCm#FEkoIpwOUzN!l-hE`*9=^(Z!T-MfKm7mvS@^ZRZbPg60_L>(7y9<^ zz8`HN7YSuTXU1o2? YxK~`}dTQLGJO&`}boFyt=akR{0E8Ty0ssI2 diff --git a/graphics/pokemon/armarouge/icon.png b/graphics/pokemon/armarouge/icon.png index a1b9e9b90fc897537e646e1e689f0abf32d5c02f..2a348cab51a130f8eec2bfa789c5fe4b4066eac0 100755 GIT binary patch delta 391 zcmV;20eJq$1Kb0UBnkm@Qb$4nuFf3kks&^R0a{5!K~zYI&6L5i!ypJnYZTdZxc~pR z1x#Znf_th{8RO$L~J?`#5voDKx%UpqpY_LKQ@5BY;RJCewuBuAhk35D66M zML!J-!b2eCFoj(rYyotbfTbtbgdBy$YIKPzz+&P8X;FuoOr?xA!+2{WouAr9krYi~f_@c;kq8Jc^T0_nDglTJD&wNveYLx_*#g8;C{&1}bjn+@-iaQ%qr zb6kuLr#^Q>Fe(ZHF~xzQS|kbh9G(oQE(DmL4EGTj3c{)UF_LgBe zN23ss1m>W&G3>NXIw|3$hmDJZvCB%pu_tN0bW+|J6^(1G7(8%*> z=h4h_CcRNEG$X_uKU~eF}&g{k?dIOoXI|F&wAHD&NEgEOT SS`a1x0000yTQty{j=M_ifuhTZXmNi%3~GEQzG_Y=EAy=*iLaQrI0)D+XP@MHB{n z9xdj2(J$z3NHq3h_&d&k7ZYg`njIw-(W0mT1KvnRhYI@!zBDpy#;NP166oG&*IC1V z0>)E>wiW$d;yzKhfrnAmDZcH6^;RV$Ek&c-}m z8-8+~(M!%p)~U^;jJw3bB(qLBZczO)pc8H_(07!^v@r~CMW;F1PJR$Kz~RT32W|CH zGOkBmJ-fToyu+@{*Q)B`~yA=@elZLiGRq4A^rg$YW#CcXUvDq z)9_0^aL5P0hco>=7ijT+@qtG^)c9ZcK-0C>V0AvU__w-43ylvg{&ojQpJwMnjsF0U z8y`IWJn9(b$p=!`1Ax5wz_acEQMvG80g#vv9Uu!nyfX0zeE0!mmLFdR;PQnG00000 LNkvXXu0mjfU&6~1 delta 485 zcmVD)u)_BL|7~ZuYz%u*^VWx=sERt1u`zI#<@d`BAN;x0vslg=uN)?# zIcK?a7?YJ>$FO(tkjxHQ6G>uU6je-V_;N(ozag=g9X zL~9XiP#txSNT{QQ7t<_!#}G7NPESB2*w7Q5k?P)t1_C8OamtEMw2 zai8-p63;4AERLZA$jB{*=13MkEno!E={=$x89nyaw?fy%S(heNw~dFzj;aHCtO?A3 z41=X4Edt-eZm4tGe>VI|+?=q*PYDYsiju>9!2kCWC=S^N@GKA^)cZJXGUS{T6==w{ zPMRhu*a_cFn`b%J!0RD}RG*%m=~Zz%x_p4tAMtUg4`E-fe?BZbAKrI- zz)i0D86R->H<7LC=X@9da>9oZASVePAXj{_TRtrJd>}viTl;T@Ft#xBA^DqQl`rM- zIy|@$5g?8a6%XyF&EWvj@!$zV!Z|)PJbVb#XV6O&Jn*f`a27{CjD{0F$aG;2e3%Q6Bnkm@Qb$4nuFf3kks&{S#7RU!R7i>Kl+g}@APhwXa`C~m{r|sR z3plq?aapotSvarvP(<`D%j6S88HU@o<}*cNWX%oNkO(GPS2DbfBr<_2j1)UV7$y`4 zg5(J{UM)~Uas;v`P*fl{XJUnRq+73P2;r_cLJWnb@UtPdz8d}rDf59QurKK0n!(*# z7HS-VkzdbQM;v)4lo9O|-T)PHdk+Qg!u5)o2l+0EoP02k);OR12D3jd`s2L002ovPDHLkV1lUQWhwvw delta 299 zcmX@c^q*;h%0xq(dV!K4zu^C9;H=`NDGUq@?>t=`Lp(a)PPxl<*nq=rwwtnv%D(@% z{bF}doi+ci=r+#1zxcA8s-`_S~ z+HLWjybKQ<*T_9s@K{iAO2!jc|C6cf3shD3>!b9KFrJSQ?3UJ5alXNsw{?Pzn@K~o z^A_d=3kLh<*O{ELSM@gvUuE;qukWim)p@653d_nee#HQV^69@ga=z6iUjNe@y7J%V z;Io%*k&VqV%ldjF^_w0OpPlYp7bB-bSO{|2xxSOSNPHCz_6U@;5vs2 rHGyhgXT?StfqvGc(>^Rk&GK?PLd7pE{O5iU=ywKBS3j3^P6v*1Kt9VBnkm@Qb$4nuFf3kks&{S+(|@1R7i>Kl+6xl19FCJ1L&lr1kuJ0y(0zKmF`W2h@J?u zb=_LoRB$3_O&dU}sE~nB5yON7Gy<3iLO|Gi_a7EPch5pNQe2J16A;%~hEW8px!RO+ zBQO){wtkLUYBFNoTgE-r!HR?>;p@Zqm(?I#743|s!R2JYdJ}GJDsp`%e0}EM+sgWp zt2>mr&&&t?u5aq<{9h3NNcbONihsz3Ee0OrAM_D!-Q)ka>HqQYKLFUd8=RD#rwIT6 N002ovPDHLkV1l$HeEa|a delta 419 zcmV;U0bKsx0`>!tB#|*Ze-Lz1PE-H?|NsC0|NsC0|NsC0|NqS)vXlS-0cA-KRnPGcCf6UDQFDGkCN@D^H zR|2d8#YH0^2=)jz;|~=Nt2^CjyXIJOF21Za@+MBP4dC2moCR zhKyh|$go60J~CKu5d>oYs7H4l1fW4gqfE%PWb9!Jg8hl+G33eF_=k`{ZbGum`UJ!^ zg699}v5Q;1g+zBuf8mKNE=_A1Iaa`m{vY2TKk-8z|8qa29zO9y)kE{c{rN}T;~G>y z+yub~WAPrEA211`-SN&37z9!EfYA@=1(ABdc83Bnkm@Qb$4nuFf3kks&{S!AV3xR7i>Kl+g;qAPhzGX0(v||9`vO zq_8ogZ0w;h8d@#A2dx&5$X)+gIPYcNkvA3?y1@t>#45lJBjAM11mHP5;t0m>9q_l2 zMZ@QUz&SR%iGaTvOmc`m5d<_w7`~eFD}9OxG=Me(t(i4W;cG2c!EI>TNU&XOl$vK( zs*5}c^=p-LJJn3F{iE2%cir_x;iWC}I7}OZ&>tcjgU}C>XRaF(0ZM9&L|FT(yDH+S=-M;9+7VCK<(dfm` zQ@#$R6V}KuEnqZQ(I*yXrnQ5W>D2k3N-S}X#Xpkn95=O4m>?{{d&x=QWSrZpxlEUi z$O}7cyYTpt+0C4f48~dt|BtKuJhkSl`ajL8$7lOp?B9ik$9#RW>DHVC>yA~G_V<#@ y%R4{++#r4Cx%0YgTlpd*ooCEnXY!XHmsa~PoOEr5{#l@J7(8A5T-G@yGywpS41RI| diff --git a/graphics/pokemon/ceruledge/icon.png b/graphics/pokemon/ceruledge/icon.png index 7687030bd74c1065957a884595b998c5feafda6c..329d5ede3174a7e2deb717d8d220458e3b56b175 100755 GIT binary patch delta 373 zcmV-*0gC>e1Ih!CBnkm@Qb$4nuFf3kks&^R0Z2(iK~zYI?Uc=K!!Qhkn@Kv!5a0i8 zOL@g&FS2v!2JA4O3izvj=#Y=cFC5?wXnO*F1CY>77x0*wE(kzFBTN?nlz$G@ShRq< zTSP4DD}m6gu_zGXs-9g+0MWuDyYwNh3<2eRR?#pi0A6!KcWzqU_a)dxAtvR0Zow6Q z8-Z$z9Et>G6f1Rtq|9*~YPrdUfMtCoL8(~@({}@iXg*LDaSBQ~F${{<#7wAPe`)2L zQHm4bz2#>>BG`zfQ*tovlG#m%p$EK*v@mwoU8y| zf*ShIlK4~&)AVJTzkXJ;pTMpC+f9jJZ9e?R!@Kd2cG|~-U>gtV{%`Scb^ja>h5P4t zDBM5C!(i^yKXW`3%VviU8Z(_;n)@psdfrsl9r9se?jau*<{t84b8rj%Y(6{zu8AD* TLKDsq00000NkvXXu0mjfYq_dU delta 330 zcmX@bJePTb%0xr!dIo`#Aiv=MXyB~krYQ^zj69w$jv*eMZ>Jp0J7U1$k}T<`@a+Hp zGWJQ^-l=W5l$YPDtU9rx$1u72cAP}oe#U=#2Y3A8S&`x1kbK)knn6NY8TFG{nxRr?Ek|Z@7sUZ0g3uTdm9Gb Wy|Nd*mNQl`0D-5gpUXO@geCwfG?{7u diff --git a/graphics/pokemon/cetitan/icon.png b/graphics/pokemon/cetitan/icon.png index 81cf0a3e246e355c96c88e3122a61aaf9a81f28f..2a0db87041a92b6a36fa69c4337226477f14a598 100755 GIT binary patch delta 371 zcmV-(0gV2j1IPoABnkm@Qb$4nuFf3kks&^R0Y*tgK~zYI?Uli@!ypJn6?TpT|NpnW zfF@C6+UerGO_@nM>AgW9dYaNNhERQHpzcuF7)aIAC?Ae%S`}dgJj|j^#=U>Xa}k6~ zu$((xPg-l-LGdgkg_KJv+*W`?vg=h`7ow}~j_kS{ED?D*XMwrmhnlndV6Zx`4X8bT z0zKE#O66f}O17{Wa zWljJYfkwSkX>Vjm;4e|p0^7wgq%?(!IV>vLy;Rq1j?RQHd|F*qc-Ewk0#ydPe>E`mJ`PkccPT-dxn9GY0T=RlEVwTE?wftel?*x zQRV1`VDrQ`2Wk)GwreJ-h9pbBYxJFT^lapl%m-&$+4lDDK4vLsb#Tjuh<}E%Kc)Zm z&+j-co94V>M(g1ovCRcDP9}-*8AqKtl&IFd)A~$`VR^gbpGAj{l($c8jN$uy(7~_0 b@}5JSmWJ5OrdqcP3_#%N>gTe~DWM4fg~Fa% diff --git a/graphics/pokemon/cetoddle/icon.png b/graphics/pokemon/cetoddle/icon.png index 330b5c56d24fc839754d4f1557d77b40774877b1..b123bf1f8159ac12e4c5b3266a7608cb5c99af86 100755 GIT binary patch delta 240 zcmV=W7Bnkm@Qb$4nuFf3kks&{S#Ysd#R7i>Kl(7y2F$hC1cw;dC|F;Fw zlX``uV=MK%+JS)dIF4KYDobsAf&i8g6AHu=VzXHBK?y$+7M0!u3QuGJRF&#;nyQhg zzKPApnPB|@VHhL&L!15*6SzHmNT`%ROhxx2gB+#Vg{8r$#YJL>iymp$kbN?Oxyb5U z&#zef_8Qvzw{D&Kb^PrE{to{Z|Dbz|zjp}yRZsjIx=h^H!6*MM-0JNUf3$FWiD(k| qv&Y|mDkBeoE%1N24=a7=JUjsXj|@=UQa?EW0000wM@Y3t*{8{+HcGxBT*RbtJEeX7A?%XCHX!9)hZ+y;HM>#he@ z9l4`)WFz09e@5LF8}0jRwzf3r?A5)(8c_1Kev^9A=IOQvzI$B!mYHGNu5e4Q+mp@l zwhkB56plB=r9y)CrzhNweICp`s$yK#}^lWYYtBo(yRi%t3&#e3@fzOP?B6-u0!IAo|zNSVj- e$1)~Bnkm@Qb$4nuFf3kks&{Sy-7qtR7i>KR5236FbE6IzuD7qPG(`%0?G>i*8&5{VafXJsj!R-{DUGY4S?HO!qVWSf~4w{*VIJo-X5m7;`_g i>Hcj$H1WUces}=Xa1ObVnidNH000035N delta 247 zcmdnbbcShy%0xq(dV!K4zu^C9;H=`NDGUq@yFFbTLp(a)PT45bY{283DPa@&>;L|v zX5Q^y2Gin7bE-OJi?3~~UD?2Ge_4?sOl(pA`mG7;R{Wm*BWF{KQV8QQj!X4hCoFt5 z-y!Y7PhCfW(*L{)CI-)6vzjnST9-~YUMj1Z`{y0gf{*6|FaP>0ZE_$bW$H!UDY6&m z=WS|NiMMp+DvS-A{V=Xl>E8d>vE`o*%Dt~Ccy0gl0aFUc#{2sx@h3K|{ qQ2{&07@IR&a&3ISBnkm@Qb$4nuFf3kks&^R0Rl-xK~zYI?UdV!!!Qg)4F(xRGV}j` zyCdh)u5W$WrBJE|2Rvg*w!%s28~+sKV;$fA+2I1X1#Q1a^kgkr%c3kI_^_tfM zw8P?4sI4cg*#&ciD}{e-*z}?t$3L~o6TlTIv39=DCl<_e=}6|yH2z<;MJ-x!zeYw zDvbK1eQXRtSq7jIAny!Cv!^DSGMMHDa|ogh4$T>oe+juwpLg-(f6SZ}Mj`h$gI*V8 z(>Z7RMKbA_aRZxbI-Fes(-D(JgxS)IJ0FLho>L^Hjd$+xL0 zR%&dbTSV!e)k*3}fAARQXd6NQF}z#&OFXorb=*UEOA%l?G|!Z3IRlG>{ryh;ukjN? zG<_EY^SZ2am5a7BlsmiE3nCm4y8sOk8$>lgEch@0BJg1eh(5v!5Q9DeqUXaJ5P={o zKtzD70MQvXfOs+tfS~FA+m#D|potGFKnxg0hyaMd2Qy$@HxUq_6+noBI|UH<8~NZ! r=m3FbM?Q>%IQGY~P44*c8-(}(*!L!oHOen@00000NkvXXu0mjfB$dqI diff --git a/graphics/pokemon/chien_pao/icon.png b/graphics/pokemon/chien_pao/icon.png index 02d7bbe93d9e55aecc0d6c7157d9379b06038add..eaad400548515f66f40c5f88b2440400036f8e76 100755 GIT binary patch delta 378 zcmV-=0fqkm1J47HBnkm@Qb$4nuFf3kks&^R0ZmCnK~zYI?Ucc?!ypJn18i6*{Quwf zqP0=9?Yi@xlgT7rxPp%7y8hB||DrRy&q3>7=qggmYc?iqj&Hi+#eLS5d3^VY0$oH% zhJ`zi@Axs1(3#ex5v|5h#q8133sdizPP@({!24OLC%tmlWo-799DLT_4KG|i1{|FK$1jY0ZuuAk z5Q!j(FaX4KbvD9;J88>;KYXjNOaRuPkcZ?>-PQq_8;cM Y12J0)V(8msm-H|)v%Dwcp)RJLXjtAQ3r!l#uXe^>&k^S!s=WrVy~ z3Rr#Mra#0UFc(4pyjh8tCWAtQ#Z$Zqz@@3;A?QV**e1wudz)ajVfbJw6G$}$+yraX z_0S9#1-k7kA-X$r4dxK%ump;%=_zZoq@L%L?#6J%(p-8v_1ti)%eCFp-d{ag;tFcd zxSc%czG>n@-q9^?f8SH{oh=2P;<~^|r=2%5p}6*@fRNDex9FcF#qgg^hpdQWY{IaY z>r>EY{ow04mn4DB(%SIkhT!FH{=)dP{0Ia|`Eemg#*avloF9Q8Z~R!-|CJv>k@F)6 zHb3rbRNVLx0Wt{^_;CfuAjsrLTZ$V%5`NqO^2U!1kjRgBBY-GBJ^%#AKR{L;KLN-W Xy#yiGGeR-_00000NkvXXu0mjfR6N;` diff --git a/graphics/pokemon/clodsire/icon.png b/graphics/pokemon/clodsire/icon.png index 09fa007c68146e54add8b59c716533258a0e50e7..bcc0e34e5047df603c7fc74c7cd3ae5ce1c71c5e 100755 GIT binary patch delta 274 zcmV+t0qy?O1L*>gBnkm@Qb$4nuFf3kks&{S=Sf6CR7i>KRm&2CKnN2&z<414|F?zh zT3uwF-r9qi(Sr%Fk4apX2Y(6#?nq;1s}%q-lR22HKCRXjw5~1zTk6yKCg9cBh?0P) z(ScAn1_fvUhrn(GQBO&LQJ|{h2=%YxFYNqf7veB+R>iATMDsSyq``tUf6__8hqkqS zdv})=Hv&X!jYAgA<-4TU-CXE{2j2rbW^}XvG#|RXr}=QUf0YlgkNxX>7_3|5LvsH$ zA3)juDIX3Nbw1$j+o*H<7x@6&-st|m<^#6vkd*mwQcUszeHA`nk`G6KO!MLPSMXE3 Y0ESBuNTHPSSpWb407*qoM6N<$g0K37HUIzs delta 384 zcmV-`0e}AK0@MSLB#|*Ze-Lz1PE-H?|NsC0|NsC0|NsC0|NqS)vXlS-0YgbdK~zYI z?Nq_8gD?yOCMD9OIsgB+OPaJv3+%MZo}Le^)UFGx_O|^bL}VE(GytiCWic9Zu&^w5$wipdGLT4f!u%ueFY;F1X6?n$ykT60U?it zDyJvobWeqZMy-9D^&qs1g9xi&IaMa0dp^8A@c;N4Zu+7B12_E;b#U7c5nkN&LkVx` zhfM#6@Va6aoclp$cJ|y4r*s#P$G?U*@;&!M3GWDa?T0D6wAX}rKQNvO4=)Of9zaq0 zrBEBaOcC9>;5C5W52Zk)@Zn$~E(P*5cND($Ll(%WnDPXmS|Gh+toJSo!Wv-|$Ynv) e0@?m(LA(KI0w7B=JZKlu-}DFbIU#(ZWL$?*IQ= zfxS4&W@6%#BSsVN+dn$HT=ZmPOQG3L4lRsTKQy)f{_XltS^^kSK4 zts!h`J^nE91~gk*0VMRP-_{fVHU0~b;-9y+#6MjSYy6=Jc#D6;PjBKMvn=bf_T=^! n|BL&<9yI^^`+@%Ves}?J;}h#up7O{H00000NkvXXu0mjfZYqjQ delta 334 zcmey)w1|0v%0xq(dV!K4zu^C9;H=`NDGUsZf}SppAs(Gir`+yqHsEoYZLv{a>+GNZ z_ur|6gr01D_jr-1Ld&xUEKJWo{>WynIhnmzWlFq|i|J|wbHnb2sM0v0HA_Xb^p~#V z*!sTZQ&70e{*CFW*PXU6?q!~GR;7U_l;v7~{lPiCx0K9wZe6r9I#y7ZU)ErID)%lS z<|8)Amz{*SocYsZUQqWk$8fXz4@3V?Hq-RJE<4C)ar-EPii)nQ*TH+KXG~kn89Z&P zrfV+W{W|$Y<&OUOtga?U{xXD}c76M3!nV^NXRUdq6h8fkx5J6YR{z;c%k8J+*B!|J zd*JtP#dCEo67vrow)<zr-TA#0fUEu!PC{xWt~$(696G)q9p(T diff --git a/graphics/pokemon/dolliv/icon.png b/graphics/pokemon/dolliv/icon.png index 37bd0eb19f1d51fa3d4c440150b6d3c5642c160b..932b6e62ebc351543ed626aecb3dd60b00a100c2 100755 GIT binary patch delta 256 zcmV+b0ssE&0@nhNBnkm@Qb$4nuFf3kks&{S)k#D_R7i>KlerE9F$hE*EkeQ|=KudT zL$+8c@lkA(VrhBi7(A^#@f83XR{7p76$Os-)_YG?KocVdW|k>RCXe2K2?QHRMOLp7 z!MF8ZgsnzE1M@~m#a?NH3e3Ap0cnFg0de;zBFCE|4ia2MCvw3+;E2qbp73x-#9VJ{ zY7sG-@7g0|TK}9vZ8~CIQBoEaP{*RsIyrY8BPo;2b!d>%aUp{Q$5;&c`D-|0L7db& z|HL-1v46Syru}1Mf0o$TzdiQ9_PA&Nzw!Ul{`J}Z(*AG!%@UrR=l|gV0000|it delta 280 zcmcc4^oD7I%0xq(dV!K4zu^C9;H=`NDGUq@w>@1PLp(a)PC3hU#DJrPTidC_;{E?^ z)=}Tu!!}R9w~ejpM2%sZR^ILTtPNZ9p8eRMKI2!x(RF;r)M*M{FRhr&$S?FK!r38l z;=!1uo{s$L{pD7xL+<&j@4DY*(&bmm>GV8l(Jr@-JC$E#r%d%M2@B#%$huy8hu!~w z*14rs$5{){w{NdI-@Zoh^iPJLv-nLPuK%g9Vr|#Qh8J8yrN58r6*-u!uPDs^`KyBI Z9H)42#$mo6&Onbcc)I$ztaD0e0st+jhP40y diff --git a/graphics/pokemon/dudunsparce/icon.png b/graphics/pokemon/dudunsparce/icon.png index e2a375ebf8fe99c2b03ad1417085699dd2246748..cf9c3501fec3e85400f755c75c0209d4cafef313 100755 GIT binary patch delta 338 zcmV-Y0j>V-1E&L!Bnkm@Qb$4nuFf3kks&^R0VPR9K~zYI?Ud1ugFpyH8(|U>$>sn5 zc7d_&Ds+79COeOE1O_}l9^ZTHF0O0BRM&(-u>uTZj1^(*0JnfyJhs8iqX%f4#OUKe zkZ17(B|ei!gCa@{yAsdjI}xd1^Gr>0e;){hCVnB{dBqDj!YE@fqY>jl6adN?Og-&? zNQ9yRTmU1TaaAX1D{&y-9*!yETnp?v<8cQ?9h2!R!S0)G#yE04NeGuA2EqOf1tIcb z&EkM}z}=d%huD!HH1!kkEht1qy82JXJkN~|ckwSfe_HNo;6m=hz=hn0-t1=KV~1h4 zyHkMU=aP1#lXq5s+1-2_Sv~Czvzj?Qr2a>NYWG|J{JSjmhs#~#zxD6pXZ;(yFZ$OR kob_*Rc-Ftf|MkB=Kcn;(!pX~ttpET307*qoM6N<$f;?-W_y7O^ delta 412 zcmV;N0b~BB1MUNmB#|*Ye*h44QchF<|NsC0|NsC0|NsC0|NsBZA+nSJ00CV|L_t(Y ziS1O;Zp1JMt3r?>EyDl*w=<+^>0Os@d%nC>iVY4>ylwwKc*6Udfxaf7wYFj~zW26D z0kggmfvTFVB-GCx0~olOsTFx+K#EgfwN?|!ggumZ#Tm7th$M{}f9g@-2fzh)#L8g6 z*k#I(i$oX!yeG#KUGOtS3?byNxVJ7kyF3!TtVm& z?~%a3kzm0b2^JujGa!T`fq*N7W5ApOVH=Jv z;Oj6o2pG@SfjW<{BV+)BfAv5DeTVvw!{P@eKqUY%fL5^HV_pFjAbz*BwHXB%l$x01cptkOD9O8Gu!wjB$fz1$ux6ZJvh~c)uM>e}i}j?*V0u=Q{x2 zfgB)?MQI(l$MPBM0uK$|fxE#rPy+a;6}$p5K+~WD{L3Hq(qIU@TnIIQ1fWfz1JcQV z00P_`r~$SB*$_w35ZYud7W|^`7@yZK=9## zRW=Z>?GCMv&wW>Lt|w%G2>?lOju+V&1E604{aT*q6z(>L0eS#Pi0_{idR|F}7Knm# dkXw|M{s6Z_N|wWZMf3mw002ovPDHLkV1f`u;c)-} delta 582 zcmV-M0=fOz1cC*SBn~i8OjJcfcerhr%$(Askv}JYuPpQJ0000GbW%=J|NsC0|NsC0 z|NsC0|NsC0%^|Xs0005;NklVZm;Ipz*RJ31Hx*{UR2TxF=fVKE0G$2?I5!u@!0p^;Kz{|?F+elC8PIqP z_yEp-eFrQb9{@`~_uUib0N2xw=m}kb_hIP3p+DOPo_d6VFaywC7D%AKP+SfXxbP3( z05t)K4kSSWE^9H4fEplx1nlhy89;afFcl8o5la9EcmN+@8$gI7h#fqDuo4ph4uDt> zzPt#5$T0fY{q03@LWiU0*5Mo@Kq z0w4mg3#2mcpcuhAK!sPVhZ2w;M^)9^G`VI3i$E&l`U-$K5Cix!FYN=lES|wBAapPX zatFsi3SgxXOaULD=%50u^ub;OT-gJ}jiAc<8h|pv8W2v}00fvZ@B}yl-W~LTwg(Y^ zi1k~56yO-(-{BN0Ko~*>@@*4P1sDQ3Kz{@bw1NQS4%UHUaOc3Q18IhS2F)@gAO(1J zumQX}7>t0QM$)-os zXG}q;GQa?UAQ;1g%tjxmM?n7;>p6ujNrvhNr~x3s-#;kyzQV>j;00qKc9BN<57c;D U9v=moIsgCw07*qoM6N<$g7nDqi2wiq diff --git a/graphics/pokemon/duraludon/front.png b/graphics/pokemon/duraludon/front.png index 39e39798e9df2408897e2aed2729b5f9ba53fe1f..fd22d471ee530a6cc3ac9d62a2a6720402842cde 100644 GIT binary patch delta 833 zcmV-H1HSyX2m1z)BpU&9Qb$4nuFf3k0000mP)t-soYJIXg{(1Mi;*%Xe^*ygfB*mj z`AI}UR9J;M1ub|srQA)&?5Ovxm$4|y#K`t@}dx7+RX{BQ9i zKR5jlkUs%10oy(xFafhq07$?_Q&3U8DUV|*sEMVFW41AZnkC%aHkvR1fHWfWpfU{D z0+6o~dOckn1#GlYvt9;-e?D)?gaE`<08@AUHvrhq5khAE|Aqm!`TD=L6d3^^1*l+O znW4847kFE^@A?sdyP&zql57ybR?3oWu|a}J63>4bP62uXNEib!2pA-M4%ixiCS0#2 z)M5qrHl)ibcn>1#K3-2jx6PhYxCk)oO;FVJ9|-ENs1ooCnMvP=sivOgQ?pHj|i zSWqb)2q zQIRXRNalDRqpmst?GZQtib$3>t&MZyvyh-^CBciLj+87+e?xqcCymYbDm+l8X)U$3 zbDfG<`xN@K!Qk&@D)T&fZC8LTkfVg90p1eSUu!Y|BzS260QC}0B$m$!8czTxpe`6- z;D@C)VT|Xu0AGO5Vwqb^)8u>b1b9to3FK4>@RB=UO4+By89?_tuv4Vgjm!5@ahk#% zkW)p3TJEpDe`kPBpKHH*v~v;Ld%&t4|Ec2-fOI6FU-b^i4}k7jzlHk6bBf)(d)#bz zOdwSNXKs21+~>(2^0rQCb`~2su_jW^cU# zya^Dv#s;7Z*Zz@GAB&~EwxZ+ZQUY9>4+x)!hZX*r8}St$J^uV3xSdPawhZhr00000 LNkvXXu0mjfY$AR~ delta 893 zcmV-@1A_ef2Db;0Bn~i8OjJcNU5jFcten!Mkv}JYc};s60000GbW%=J|NsC0|NsC0 z|NsC0|NsC0%^|Xs0009fNkl8I~PU(A(6M(^~Qw(K$JAv zmGy>yFa&7C!!=nD9snRM#&!{U3`hmQ7lczlueT^Z1*FKPmLCI(o>NpZ0PLp#bKUiS z0MK|zINw5IHvj)V259pA|B;;O2>>oYh4AG7yeaP> z4xooAdoIkKCId~9)>v0=f2#T?vjTS#Kx!q$06=O%J zF_^GcG^VGfk5tmQWRr&+IzXfiuuM4wf|V8!ibby_ECApM(Dwi=b^tTGp`2ra*qPn} zUxKh?BjhkOfaUX8iAz}Zh<;*^;tBwNAx{~Ph&F0wO`%ZTCp?+EYk7&jz0rL{^&;Zt84(?0lKq36}6lIY^E{q z2z!7NeBxnL#v@>xC#%tZ2XTpHHH!FbZ}1IJ0!E#>t9Oqt_81)ytzRX6Or)Me`xC4H zLIbe%)&MXt5NwYPU{N@n3*P{srrK*OI-X7{@ydvNK=?e|@9>)dXS_;`_J98adA3}Z TllNqo00000NkvXXu0mjfx$2TN diff --git a/graphics/pokemon/duraludon/normal.pal b/graphics/pokemon/duraludon/normal.pal index 3b8dca287f..1324d92ad2 100644 --- a/graphics/pokemon/duraludon/normal.pal +++ b/graphics/pokemon/duraludon/normal.pal @@ -1,9 +1,9 @@ JASC-PAL 0100 16 -49 93 139 -98 133 172 156 210 164 +98 133 172 +49 93 139 106 52 57 16 16 16 123 129 148 diff --git a/graphics/pokemon/duraludon/shiny.pal b/graphics/pokemon/duraludon/shiny.pal index 583a51f2a4..19e7323e31 100644 --- a/graphics/pokemon/duraludon/shiny.pal +++ b/graphics/pokemon/duraludon/shiny.pal @@ -1,9 +1,9 @@ JASC-PAL 0100 16 -67 119 184 -109 151 204 156 210 164 +109 151 204 +67 119 184 112 105 107 16 16 16 81 96 101 diff --git a/graphics/pokemon/espathra/icon.png b/graphics/pokemon/espathra/icon.png index b82af0c6e2dbe7117c2da5a339c65ecb331fe908..cdca05731167ba390d13d370a03dd9899488c2ff 100755 GIT binary patch delta 381 zcmV-@0fPRO1kwYLBnkm@Qb$4nuFf3kks&^R0Z>UqK~zYI?Ucci#2^Sn9XwcS0ssHE z+n~uLkz{XEbC^D*iWUg+OzEei6nczP&h+5W?7DT>d6VS`OCdqeFBnL*wYFN!K*;hU zX|BLQ*$nCi5xFK&Bw b_dfgqsnyg{ zXZ~1%2A-BYhM@!^bc@nf=rYit?FzTUZ4(=|V2)}Ljnt-K7uiYunuZwDuutfD)?3Hs zM@dP>&LfL?*zg#mf3W6guo-Mtl$a96mTLyoe`ZK2xqE|pA1#ksyn*#`<@rpXp^oA0 z{WW>sE${j-;=ceS{{WC2@+&~{1(1oM2gnRDJwO~{27t%}F?LlhfRG>#F>3k-$VCv3 z7#)8I;t=Bq;t>PgYeNu^7<;xW#5jUX5Hk?OEpi};M@&bMIm(#fpjv_`e>^~Xf=mGN t5M%+6h9Fabv;>&~q$kMy8U6`Dz5w00D6;`ZH2nYo002ovPDHLkV1f*Z(Cq*K diff --git a/graphics/pokemon/krookodile/anim_front.png b/graphics/pokemon/krookodile/anim_front.png index 530488b9b250777d61cfbde3b94bb92fc7826b94..7b8e76e56da75962110dedf78672b8811f5b9564 100644 GIT binary patch delta 1562 zcmV+#2IcwE4B8Bk7#0Wv0001tU!Pb20004VQb$4nuFf3kks&^R1=vYMK~!jg?U;?S z<0cG+Z6L^@*M9%UT^&ha{_HsIbh_=7PVTx6=Zh=^hO;bPTb=&v(e%=}zSB($t9K%Q zy<&_ab*~qF18|-eA73vaL`SS&Pe6|97T_E!RUad>;tBAK`~*M zdEDM_G6H@OAy^7m1292@@|%opAHX{qz()yTjpdK(0pKtl$`c@3sHzQ4ZNm64!aD%| zAd~6^0G<#gF1SiC5>yWj2c{3`qC*Ij0dhg|!wlFqzTohGWhAJKjhFjg5{ViLCM}R? zfJB^JkLXhakkGh(<*qjZDoKByuQc+77JK|9@kmn0ge~zS#hBi5+i^OHtP=HtB!FBm zxIiU@3P2cQ9$gGC=}eG8Fi7I?2ub(2ms1x)sZjitpOm%4vA~`_h#W{4LLj|;0zx&( zlpv{FmYh9*h<;qcuLoRHtsekP&J|wFkGZ8i1D}2q?ftzXb0( zzyhJ9P5x>C4A>38LlDmXC@JpKO$r@88$+J~OyH#!4-%Fd5F27akS!(L-}C?=1gazE zp`8L2t(F$BGa$48c>;;D3&2%+03rj90|{Y7^$0G1NTzxKVbHRkm){>QP}UzZC?377 zKNkiv?ngjQA?mpRq$n{KflNR_hC0uYIszq#o=X6F^gJXe0E9qVMTn{gh!7K)UyBNW zoSOoa;3T1QfFlWkWDWyxSi_hZKt~`*t@f`e@|Hx*07=1d5`s=CuOk>Q0K7Iy4iG?! z69DUftW@QH`zn&vM;pEC0CFvGc?4T){0y+j?3D?OmA(QT8IUKfp95q%kUZ&3@0=}H zQD*s6k73iNZ1e!g&co*#x(0xNHt6k*iA07g0BPlQO^T+xaw7!=O!SV9k$@Zfe(HrV z55VbjPhyw>X8P!QWziq8Cdg}gqQ3(i9bl|~LYV~nT)*RshA`-zO{2Mf-#fsV0GlEc zz@7mW;Zh%up0Jlz0NBONGXTJ`Pt}Fs^}i9|3t-R5m~Nfc|SUyncuao_(JM$>xx;7kJxP79=VFh;;diRbL` zX_KEmQE@Ojz&r$M91O1pMs_eh0xW4YKz9VumbMe%#D7o#XQo1bj1~x4 z-XfhIh}j2fKuBt{Vq$?%K8(@nfsBB%)DISj=!5QPRFC7U?zGgwh`Lz062J%u#W6Dg z*#=inX+Z!|l%s=@ZK~D;A>HKZQJ>3!%od(F7!)NXy$K?K>|g+(W@N|?Mh568(P)C~ zwSyrullMVb_ge?UmQWf^kiBw$FeJHZ3%l4l7-EMSpfy3t;ll#Uws7ZQsIM#=kIn=+ z&n}S~TexvB%vYA{)&!{zKe4riW94AfzH(=R)Q2x@L}hxe7>Rf~7`3mwv?fTcU&R*Y zL^2=&P#lcfR~A4qK^i?*i8=tD*0j|QM(rzWNm6e=^ajMXhU!otzVfnp*xvUm10n-7 z{o*TsWkBS$zM7KX84%-<;5!3iVgST{w*iq)@Bg3yary^Sbs=0D5ZOQYvj&9v2YMBOghLA0dBv zyN3T6TO*{lLKd|vODlwJz+i=Z@#A9Pnp?lWaTf-|ji&6^*De5^RoDOk=dJ>r!8}0i z1jFFp?`yyhF95CtV1r7a4*MlgX9`#XUjjd9AeihJz=1UhTmuJ@`(M$a{4F>xf!n(Z zppJvc_msw1F!)EptjEExKIWu!RnC8rBG9P=uw7^uQ#hC+;H*>Hr^^^`vQB+}z!*R% z^b{Wa4vcix=^q&VG(v!FPGZ(s-4CNs6~umapfk8fg?v1siOn|0PgvWU>_n=deVg6h z?YQ?ast`b6>af5%*1*+CY=1enSh7wN5VV;DjID$Y1muW}D2{RUXb+B$$Z&re2&_UR zFl4S=n~>}fu7GLX5iMfjR!}ODXB`pNDaiS8wW=XWpua-e&u{__5L0`|y&IG&U|nq- zv7p}+Btn3DFQ17K_agPE0Z2mWvXCY4tygX4%0F{}>OHj(zzS%CZ`m>HGDnX&1lrMod-6iIJqXD>Qj*W=1M7H(PP2Y5TOf4a) zbt(YvNe-l4o&$CVbLL@d#laEWt(QTX^*Pr=d>)lR+(v*U?yKM=qqNrzF}1~`Wo7_5 zM;9b;O21=W4+EA*soWP0tOnpGzUyqC((B-NJsy$~$6N+Td?#>P2+)7)*_q$vBd^Ay zD$s@`2yEARoMqV=a0IZ1^#(5h%f(5y*_Hw_1iYB7Lcanq8~h=A1O}iUE)3^pp@s~b z`%56>awV8pUk2!wKrP1jBS!~i0yGmsC!qXWoM3-Ic@?m51vA}FX-~e#FhZc5LL2v}h=2B4eQN^Fx@8eKx=C?v z0M{f~9b{!oZz%v`)-nlT7C6fRGeQD`6B9pAZ)SQ7GeQk_>Q@8`u%H5*OF)eg zka7fozbf(cL;{WzR)OrK$e*e)d~61gFHM%7n6LyK$Eg&7-_U>aw9>Xye4dr-WMeN) zZ&m@O4v?t=J71@-OW^IBMZnvk0fzQ0Kx98SPL8TutWelt=bT5BrsufRK@lmp>dn=dx9RD>FY_9UmUf0T$A};3ae<42r*roxUK4why|L+vO)}pe?mXO?e`=;# z`0vBE4{jg}fLQ~%2+SGCBA{v@i+~veSp>`&2qC{+0ICMEpv@S_B4EZq76CH`VlK-v zUYjwH0*K1+H4F2M+kFA z5vei|;h}#vmj+@%BP<*xRR-dEsLdm3AQGrEygCX;NtJ=PNpSpxjdH=jvlrSBE32+97W&m541KX+Ca2d=Z>O* zf5v;P-JI+y1JPc+mOF~R`97ICB4{4(Dg)78jevf1l*hSXj8OBUBW)nstK|tU{Gt$y zpL!ZN+9UW)zCzV4y#| zTQKBR{(gd?{lTpW#$tb{2*zT6s0hZT{!j?U|IQ!&1%Qu6gxg!uKmY&$07*qoM6N<$ Ef|`}PBme*a diff --git a/graphics/pokemon/linoone/anim_front.png b/graphics/pokemon/linoone/anim_front.png index f2882dd048416982d3e184a50bc1e0427c141635..5ec89b95c056ed8806189c63c51efdfde9ffc2ed 100644 GIT binary patch delta 967 zcmV;&133KY2j>Tn7#0Wv0001tU!Pb20004VQb$4nuFf3kks%s?PCzmk7#NU%crbXF zXt3D$`1o*ea9~e900000008?8;^Y7T17%4>K~!jg?U?Iw>mUq-BM?zioA-a+vyuQq z5?^xqt23ybwqvuOg)FCD-EK2x%$PCbF9aci$FIa8GJgr##F3K*Yg}bOouaAJ5X!jU z4}?boZ9c^#;hj+;<_dWZTJqd&Hx5QX%9p$Z-ow+r~}F zBtrtsJ%DSevUP)RAiiGL2@pMa3lY&<7^5xEmIL}H=uLdKF4C1~trESSQFUe5m85JT zMCjx5`6HpFiaTUl0ft7s70seGK~()BKe_D`AhCQOKuAXz`oHR}9Qi3vs#k{wRb!Y5j=XNx%`BHfm=2 z+v)(-cMr>fzP1wx`f#jvFXYzOd0|>k^eE=)*AVN3ezh#Loa>i0=^C*H99IkUa-s*o z*5KDVd{p?!Q@JhjJl2KR3(I#Y%aUaMZ~g6Jwlijb%$PA_#*Duczx>xuboM57q8BzB zMAZ4YFGAnXq_~;*Jw#Ni-c3E78;`FTc*SUrXI1i8ab$fKIP z4RQftwk;0AF3u5Re!usO?*o8CeM$A%R}YY$6AuvXncTH~Hm>&izE2Q_Wy?!``i zCh!4&0VmD1!SSXzQi>1tBz6gkP}i2Y8g-IZ0d^7}1238HX%Ps%%lYIh%jn?viNVsp_(u31$HOmAxhEo-GwC~AW1_Tm%59WH?W zcEa$mBUk#3vLr&BbQ|R|9ycl}1N?u%hS<|B;w|3rJjD6rJ%Zpgtdds6rXF#ZC&J(p z3C|A?L3cw9w#sV>wx8euDfrk!<2VGv(F|@FUxWaF(=eC1m+xDyUh!*J7taT)7yay%H#M5MgH#0KA#pD-CQif zk)amj%Uag5UTd)z@Iq65((d%EUO-NC>{>`KEHd#}K3t%5jZnB3LC{18W)AQef>cxkd0F=aKIjHA+wlPPV#%C@00 r15LAL^Fxj>n;&vDCqFD}S!w+T$W%8kMDhHs00000NkvXXu0mjf9l6QE diff --git a/graphics/pokemon/linoone/back.png b/graphics/pokemon/linoone/back.png index c0c30a69d2f3f96aa3b0d22de440fb945b714929..1c8f19af26ae4d0f29c45ed1b29d6f67c5a7ff79 100644 GIT binary patch delta 449 zcmV;y0Y3iw1J47H7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!g?F(J-l zA>M>B#if+q&b6F602mk;n0Rp5m;m_TF!=cRaBy(FP7MG600000>z{2@0003^NklxvgO_O<8GjiW`5yuBqmH}7Oh8qz zaKFHK$_4;f`V9=lAcot)DSZ_zEGT62n~T-c;jjwKGa|~eP?FhM5%sacaOX`xR17-n zV}tydpz}n`=DadB?}oNBhTm;4$E@ar<<)1^m><9~M9-9v<>lfO|ai z5dKK`vH&KHUE{*{6~L^a4IdXc@>GUpGR7pfZRDVdv?UO-HgFqC9(FJa6 zLVJL5qF7cJKsgQ^Hy08xtLNEw`gO=t=DY%8+JDtjyAii7*E%+T;`@hoCx;hlnsl7r zKWp0Cg5ggcC#oe@_5u%S`e<{Kz_u6A=k^Mr5KVx^bLV*!LI~zB*8Nhs0Ybvzy$x7s z&d1_32!NuqQ5dc~0sH{F0Q;E3vyjWY3$V}VuK{QSvSwaD(_nViOA5jhQau7F7ORybHIn10Yd jf?8x4{r;!9+62Kbg-)gCj0rq>00000NkvXXu0mjfxT)5n diff --git a/graphics/pokemon/linoone/normal.pal b/graphics/pokemon/linoone/normal.pal index 4f2dce5d15..11578944ae 100644 --- a/graphics/pokemon/linoone/normal.pal +++ b/graphics/pokemon/linoone/normal.pal @@ -7,13 +7,13 @@ JASC-PAL 160 136 120 184 160 144 216 200 184 -88 72 56 -24 24 24 +59 48 38 +13 13 13 144 128 120 48 120 152 104 176 216 248 248 248 112 112 112 -0 0 0 +96 79 62 0 0 0 0 0 0 diff --git a/graphics/pokemon/linoone/shiny.pal b/graphics/pokemon/linoone/shiny.pal index 37008b1e53..367107a3bb 100644 --- a/graphics/pokemon/linoone/shiny.pal +++ b/graphics/pokemon/linoone/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 72 56 -200 104 48 -216 136 72 -192 160 144 -216 200 176 -152 72 24 +66 49 33 +206 99 33 +222 132 49 +197 165 148 +222 206 181 +156 58 0 24 24 24 152 120 112 216 152 0 248 224 48 248 248 248 112 112 112 -0 0 0 +189 78 13 0 0 0 0 0 0 diff --git a/graphics/pokemon/litwick/anim_front.png b/graphics/pokemon/litwick/anim_front.png index 10189cd52b71a2a07b0097757dc80f10f99431ce..7de1f01b5de4ee5ed63a8b37d96161ca1af80ef5 100644 GIT binary patch delta 402 zcmV;D0d4-(1l$9V7#0Wv0001tU!Pb20004VQb$4nuFf3kks&{ST1iAfRA_ zAPhuR*Z}SS|8GeU>(xFGGo7(_vM>7J9z#lTHq+#CxxTI0>R)Vxd0A`(23QEY9Q4Im`|R{@~`V!VV9LJ)ry=^5)jSOG{`NkE)sFE@V$q@p5#U30gy zUq>LsogjW4AOV|yyV+C9<82^*9!;sMXaNUR|1jX}ufJlp0Fa>rloOy4h5>m;DBY~- zVST>z#)AA))nIJmQMY6(XGA1yjN6KWUe(z_3o zYo9ik%jI&pZmD0N0Nh~!z!Lz|03g`&yDh#4E5Mxp*9pY+{2#*N`QP)u=YP-tTiX0z w`CkV(<$vA$;GF-p^MmO_{`dKT%jLSeUj6|eF;&@vasU7T07*qoM6N<$f*yUf$^ZZW delta 524 zcmV+n0`vXc1JwkO7zqRe0000V4e5JlNysl$pK0Fx6S zE&%bSrogPrGz8}W$k3%R8t5Z90!nU>TrRUVAc`5gNGKxhZ~xmFvoiaCtJUbA>Mr4D zy#!E*#E3$~M`S|8M`U6U2MX~R-%$ve1mZgo7>oN!3>c0@x8#XT^anjDpA-)Wfk1z` z;$}=cqSr;hzSDj#We0s(*)=_4F1?iHfQ3T4MBlC)<+rU>N>%9F0|%V61`=4D{R-m1 z(lNm6830WKW*_#W4dl->utyu+4^Yn(kV7q}ci+bixgr1>YJl8v1u%!u=)W1jGq^eB zd%(d4nAZ??%sjwcn6|@n# zgMYkHqeeGVmI8`I{AY>y|BHUmPxXW0@A?65NC6KBu+i=T>?krq6#ap~^q#XHx&q$= z0u}cq&PRpl)bY=Rduu93wO?AMK(wd69+VXeENjB&Kb<)XyTpDF;+Fx=I*@q4r9UiJ zbgW$ftr=i{1{?!y!+x|i-CfGPrav^grG5aykqQHq6r7C! O0000Kl*!~7AkVvZQf zYEB8K1WZjGg0kg+DC=M}2fT-OVJA#70O+O~?Z2Ci zu-gTj+bvhx?eWy^m;OFJ2g2^5zg7A#C;bb%5B&?f&-xe3eCwa)U(g>K|MHpsam+!L cz(M`Eo<8vne9Bf#UjP6A07*qoM6N<$f=rEoDgXcg delta 262 zcmV+h0r~#n0?`7H7zqRe0001qplF?uE!w7$ze& zZp1FI+5x*jB8iXUJ29ES;FB0e21%qYCY%rkf4ey7V(j>(z3bioG4|_+*A_78E24l* ziVtKVg95H_eNFC-1dwH#q5?p;O0)*RjES;DL6a&@v*WWU->k=amqXEZxj2_4cA0Vt zPlyYEy?+v32tT{IzHkWIw(emz$LSj7OrS)+4hrmz5c{KJ4NIJAL|l?osg-{7Y5K-W zUsbVA0I;^xAx9lXOVR0o>GwKd`hyP8WzYe`eXoO2mJYn;+b{a@0F5DS`ZA+OIRF3v M07*qoM6N<$f=vK+@&Et; diff --git a/graphics/pokemon/tyrantrum/anim_front.png b/graphics/pokemon/tyrantrum/anim_front.png index 22f83b3bcb1a43ae6acf77a5386d15edf84d2ced..1031b510f4f02dbfe81bec93b55b6f77dcadf19d 100644 GIT binary patch delta 1712 zcmV;h22c5)4(<(*7#0Wv0001tU!Pb20004VQb$4nuFf3kks&^R25d=0K~!jgt(k$E zqbdxA3z3@W?DqZN_U0sjs1-h-?1kSu(hZ2roJS-v7{{RTTf|x2q1^hA! zuX_W8r@axPN&s-k^DweD+J&0~rZgx=fa!)5P<=)~t^vdVy#uCco^Jq< z+Xqb{y;x#Uy#Z8zextW85D`=zC~57)i$pO1s=o(l3}C2|=0rrx0sy_=Wb%8xc;^Yt zG>fpxS7j)`^>+Y~B?LwUEGA!MQh+F7NYDK9qoRc&wIb7`gbH}y1)zFaw!#^(2peIl z(p5ut(aRiv004ow1zgGjV5?d|5rQyR zfTC{YAPA-c%^1f1ypEq1(3jg1@UQ7L@3vLio z`>u5ODq*j`L!`IW>$PhKCM6v7K=c4strh49uxV>vpxsGO=96SAS$uF(LFR6MBLWic1k8p1E-JGHG zZ#D6%V+oVQ0kMfXVBNb0U>(zOOay%;#K0}!It1tw+1jxtU65$u+=ki<6l>Z#%keO! ztWP9*QJLsSn3_EU>H5##3G14u=oLT&$hK6FXHLd{tCepMd&y z@PS7)8*4YVdGBuTShfcnU`oQ{`Yp}w2_>)*fIZA@BPOY%e`NDpo~AOZ8^YM;StLKK zGkXvCx&&MYf!S6vk~|1t*Ng*l7;qvy2gnY8Ap8{Y`U<#Du~uy5mNsbYeZ_8fGr^yZ z_(ZAiO>B+94U1x5t%+b|URSJtH2~dUL92;Aa(9z~w1Sl#$)W86vVW8Qhu%_Wqhx6T zKYM@!SNoQ5AJC&6To!&46~Njd(4o}tk?xQs*H!PdUWag1oV8};I`AqVADWN)e{c|g zLOH+x(m}Aw|HVPb$M0+aJQiE!u^I@E`_hi@aWfDex1zcS2Ls{}AvQ5+K;sq$V<)Up zi+d0R{~+pxUKp`3Shpb9i3QAimFwuw2E>?!p?W)dqk232+w5`wV93JYlK+F9{$U^F z6MS4?VbG0*!THF%@3~i@{dkbTKOaJ@gCyfCMgB#o72(ZJ$t%c#+=cR7t+yfA^ z50()N!@Z-RBiS}`I9ostz)}o^zJ&n~E_ftlGwGAee=rAQ%)+pPAPj)d=Mx%$FppUn zT9R()p#OaIPK7XPVYpsCx#(at1LA>&;rhQ?RG&0};$Vzg7|{RqqJVh=j9M6f3UImB zPGpDqM;1m2K;<(&U-W%M1wfu=1Dy0d3qv(Y9FVdNlJ#8+qgl8?u##OE%8o|Y!e|%n zR2>|ACbKbm7RCtx8>f0WsGO*H7;a&llV#ZDuVl@w-bJ=SKq2=JPI<-_@Eu?(E>1O3 zXtLGS&+kXV34qPHwR!77np~TI2|EDAy$xY+2rYl%SZ%||ZVdnqL<_L}>!DxB4^4j3 zAPYd2?15mZBeyVcTC&;Tws zU|tgy|G`5jdDk3>n-d@(5C0RovHAy#4TRo~pHKF|o}hr60|T7^Q=-j*xRWcuw@f?2 zHh4zPzonbM6Gpbbg+Skb2t)hlI#%ce7~Fqvgp8=!VRQq(Jzg@}vk=ZLe$WTDavU6t z7mYgz?j6Lqb4_$9WjF|ot4kpN!wk87umSWN!Cx^sb`1o|i)uaoS3o}c-<<#Pg#8>0 z2sZ%e)<9_V$>%J+o&hfWgS=R08-Y4axGbJ{GxF4n{{dORWfBGt4r;Fe00007zqRe0000jYj#aRW<08&LIixn*6EOc=P zMgNmSP=Jsz&SlYD6Cu4V0tz%46RdTYHk)Y9c_8+o6#5uvjI1^+*v+}SNgyTTZf4CO zY*;8a?>b@+2z9YsSX=9R!;h@I?IeGJ{^2t2?)N?R`s2`VIf)+9FHc$EF~)}ay{W*$ z=ON=Q0D$$%&M&&I|1=H^1_K`Vf;U@w1pwYAl7!)ab#wNXzD`5HLK9 zI2w4~aBx(1e&B#>C*o+KyPA87*Bqx)3IQ<=yP=bDGLZRMmC$m_d3GWanGS!v?Kt)m zo&e^-5sACumvy%7_q1$>zu!#)H3#0a?Pl#sm|%wxVQ1CsP20B1HX&uZwIfCmnzya8 zy=_;UFoJEO(ftI_ESk1qmsQ{_3hh<=b(cM;NU|Q3%g_w~J<8$~mqkF}zlaWaoIGX+ zurANT1VWYcHf-|buXW}#cC>#K%^#Tn2EL_}Dy)2k9W6(|M6oU~wWRCE0}@nNG>Dsc z99XC@RoCyC>n7oAUzC^RoBh49L7W)=768VES>b>WrRviCSC?_=*eE{wqTjpKFc_nB zpJ{tao{mk~al=55&Y;!avtSS7zE79OrVN1MyVS27s9P+MWf>pv@WFr8vK+%16a(H1 zjG@ppO5Lj=phYOpTO81LX!mGE!94&bCvp$>Iq-G2H#lW1KhUT<5l7xi?mh=P>n}g? zD$;}m=~K_wIp6@`c>o9r(w|sR;za#%a0*rEX~Mor2OQAvpXs~s3;rfo5&+l*E>yLC zXE&;Jabu?W0&qZo$WMO?CX4_@6TTag1GVDszEjy?>9Ckfbk|3(ISwG$q$uhy%M+Y z2t)?1|LX(-j=bvy0>Rx4elWX(6dXCLxHwZVlvS_;@PnCx!S&%f!9ctRo+3B>JLvP2 z{96`h2+rXpR7HQHfu#Qo_Ob<>Q4KB_b5_DYyw9ghQ4V(6g!{v$l`s$rr@>(%f3OSn zJ6w5Vi3S3N&&!z&d3~?5gM@*k*;N}>n4d6^bm$f%V93e|!GKdc;0GV`hOestv=V@f zGYa!6LI1U0Wj(hg8b~UYg)BtLeQWAqAZ{yRAYiMjxr={)LtveTfM^Kj?(K_<+yB+J z^lAu*@%eiH0@_-w1ON;&VHoD_ALr*6-&DKA9j29tqk8}R{QRG9Z97twokU60-=3fU zt&*Busz!z(5c9ilA>M9xtdXKP#U#*f*E?2}AYmZ$&O-p|ASsZ*cF1@KQ9ah%rdbCI zDuZEwDUE-fad9oxxdU}No0bJhCQj-Ym~U|jvI!)xt$pepj#8xJVyoFLt{+@dh+V0$ z!%+8dMlsI2 zG*7b_rX-$L$uJ4m165Ux0E0>8A^Qu6k7h(Nj1&jRSG5ux%JPk)@N&GGbjc_xpz7K#G zS`J?@N~anGzw@FL+H?hx;3>IEG3C_OMnrXnqwo|iCx|v32uH!M&@k7OE~HV{($q1e zWH~kvv_4fJz#ecU7!uy^=DT?z1tFAVmm^Jp6mmEBgd>8$rZwZSfk3E+J9+y{rfQ7* z0sMfNA^>5P17Y52z_>pkl}IKb>P&y&rA$!xAGZGi6W~Mg4`*D100000NkvXXu0mjf D){Q#V diff --git a/graphics/pokemon/tyrantrum/back.png b/graphics/pokemon/tyrantrum/back.png index f857bfbfd1657320c9c45c67f71b9a701a99edfa..0500b874af0fd5f5e2ef3e7a2c0cbc4e25580f2e 100644 GIT binary patch delta 741 zcmVc0004VQb$4nuFf3kks&^R0;x$vK~z|U?bq9G zgdh+G;ML!WKr-+Dx}5`Z65MU}rWYk?yGc8rKO>-hz5d5v8H8^E#&-lUb0Z9auzdtH z0&yo`e=8VJtEhg~t7HGI(98(iCSNK%PsD+%s+o}hTLvCuWFS|SJb(i#yqQQRRA5sf z1KUS{31vcFtts|@T_^IeSPG!R0+0x^41}9d=HngE@0$VB2zeQ=0C*z}mB6NUe@Sg$@K8n!Xkr6mG#7!7~BlLg>_9GbJ!bs2~5M#JT zlnAGQV+gM}Y8!h&2Emo+;}&9wa06t=g#0nd2r9(*F+h6EUVsWANs5&2!W1CiEhvo$ z$q^HDwLSq%RHSA|y?n(ahmPS`00%W|O0O0A5%u8oUt<~J0&vLCMX)u3rU$PY*aKQm z>?br@APXOV0c>Xk{IJ3WTp4uEv$fO)P{95icF>ncXs%{HeLMh1ZkjmFf`*o#-BDCWi$+$n_TEeNlIIm6lJ43wR|VpKx_h0_O(3gI1Z}6zQBL5qyk7d5 zCqS;EZu7!tb-;I?ZD0YQ-}3dNJUNn_dgc7+b|G@DR}Bu(Lm9TJT1*;OSYE>T?=rbG8Ih+@(l_- zW$#EywpmHux+FIU6z|jj|Ky3W=UCC|8jxHAU`_({BbbvweFSDCB3Lt?%t>&u;>mw> ziY4QaAP`S}pG6?J;FBI4)&LyRNsoxyfWVYQ1dX*8VwjY$k8Ru9Czz0kU0-XHj$c+R z1QOZpk^(mmmexns64{LbGZ*2SL=Ma!5Sqh@)fDZ?I)0oHBr~ycfww%WW z0y>2ZNh;O!5>E!-GR%(|bh^xRUtNFPg>k$C8ofQ1MF4c~DbT`f%5vBBJBx+ZmNb-D z(zC?sL-YcTaVD7<0BbcKTlE4)EAR2P1FHNkh2Q4=suR#2Pzg$J2-r#aMZEdu=C<%| z?m^Z)ATud{5n!p&_@fU%nM*1M(5CvR17PQfdT`Jo;7sKG7@z{6I0w`QI0-5B`_0oLg}zuTn7#0Wv0001tU!Pb20004VQb$4nuFf3kks&^R17%4>K~!jg?U;#f z<1h?FE$VXE^#6Z%Ii%#PlI3iH1r`w76uD;1p=H;8%Q9=$tXcoC935YI??01!7Y+vA zhv1%znHDDsF(9HMztwYnB3(PTaAZ;mk-Ffy=zTW@N7AjzW=R_77^4`Z1R*}*l!CkK z0tRX#YLP_eBBd06spw-&!K#-+zCtjN+(<4qF-6tOE86v;BWD=EgQ3yBougtPFH%hM z9lYNj0w;uyY7^AMg2W`HG4QGHr;rhuT>nDBtfHvH^n{O1?Ok&U;-K=FEIC{xgp)T^ zFAxYq&g`pDXeguw9BA^0MHXRM@_1FdULCf|Eu(zkNf z5LGTkO#`V6{hma#OE2WrVUu_D=1{825|PPD2kjA5gQJ5EoD#XJuOXVtK$435#pb|- zqe%`Xk!8~}4ky+CKO?Lwf~WP1iQidQpENF=JKZjoxrr@ta~G^RubB21!JzDL+8d`m zxtKH@5FXQiet+@17?jDuL7z4Tf60K#?@jOhw$Hk|{xn3Zobz$T$qcAWW8@%vOJr+# zlpd%Y0fgzbR?pR8)gNtuwh`)sc_3E@(J~&;`)!0s@IE9F)8u@$uQm+PP&6+i9)~s3oLw!sSmJ@&YkRF(3=MO`A(A@maABObcN6EFN z-}%Fs9vn8i@e93R(;Ke`^k4%Z7k&{g`VKuf0+1j4qVR`XdawhK7Qc8v4^9B2!7t!& zOAju80OZ0iaN#!H4i~F0fJ^m!2OBR07*qoM6N;t FV1mx=#e4t& delta 921 zcmV;K17`f^2i*sd7zqRe0000(G0unLjZxrno7>UImszZ0 zOsc{w8P4dG=TcT@C}Tuu-{o>Rd)BhS1{`VOX;uqhQ_m@^ks zW1(YDo_X1Pf^?Kzm6*u0nChA##>;;*T{1zINGUTB$`NA9j8!U6N+l=rEMZU{jM&>%7 zMM|nbgoV!YUBSz$s;+cCr*4+brcpI7-s!FO~->IMs z^n75fZxc_}N`3l$O@F1u30j2UtvivLUwqh{y&2FTofcuJ*7Ttk5nYDT0caHr%GGM6 zQ~`R%Q29>hb`RIZx=@Zjzp8%(#ybTAeSyOwn7INFiGE3+QP4&@&k)7Tu?U_dfHtUv0XNqyAmN;r4CX-=JRUt5bM*YZ<_C zdp*W6{)6b{18pS_@quEN)cF=4_IESj9X>Pw5jY3*JAANq02yflboqavg>nxNM8Cs_ zjZp3Zg2}Yahgv8NK)QU`2&DlCPFsA~3I(?S5mB2DJE7nfAZL$p=#?TY&8I!4%2{AT2(aLa70w=QsIa z3S|Qjwtpj-La71Lez||`2_>qBY;~yeMkw@hhqgdWp%6fP2CcXAy-*5Q)Bx%7pj0b; zfj3Ax1P~s64ynWmwgBn+;Tdz*;{rASIphZolu|hf&B)=9AKZk50wqG951yaCx55de vqVN4~Q`c0004VQb$4nuFf3kkv=|u0qIFZK~z|U?Uvnc zgD?z*D~H&~in{lI+u2S?OiCbZ7rPj~psLFGdi)c^>-EGFPyEl|-|F!W0nvQ{z7K%t z2%u6%1MnmTq9XtjD**KhS5h?h0%!zKE$W4E0w7AcEf#|Ez|@6u2~a`_CdpZOfHfv+ zpa5W&501>NBnP;EHedv;p^5P)0E)Q;QN@@I-N?ZDuTIN5c{JH4)q5G7;Yu$`lo-G*GmUU80hte@GfAir(Ak7A)*QhVGkJOzcsF|0RX3W ziH!8MXk8;JtT{Tl|aPHzQ meJgsdTl;C|x%|Xm#5ajc9ldX{Yj6Mn002ovPDHK)LSTX=G3?v` delta 608 zcmV-m0-ycs1g8a%7$yV*00013M{Ml?0004VQb$4nuFf3k00004XF*Lt006O%3;baP zkuE-e010qNS#tmY4#NNd4#NS*Z>VGd00IC>L_t(Y$L-RwYTQ5&0MJE^#eGGX^C?24 zl2W)nZ*f%$!(o&1ie5JnLfGLf^c7*@bj#q6NR@!OugG_#@XTtBC9O>AfTu9{ z=4p0jcEx+VhY;mI^06KNedGQ{<(pu3>3|h~wH5K$DYJ72_GOJ_{b88JA7ZxT5)oR& z2MoaOE6$eZVuDePh;;}iONxujSYbv0Z5e{IYImV4r5rF}i@P&rD`npX-&RU#wQf|( zpbGM_Qi)PqrPPW+(4(Mi`U-3aqD0Xd94ngBj4U!rbi?^I&zWg4BDSso@+R>%ED_g# zEm(7pc=#FSX$3TA3-(Wc1Ar#oTy5PMh>yQM1)HcVDKnoZkgf)kR+OK=2Mz>QyTO;cg z*j)21fGbgW(CvWd<7>VfM{H4(P!(%z+2FFI;43 znl5lh@LM1NEr3M#3%C_4ya(%m$)hd+fX@WzU_b}*X)e+Zh;UlS(;Ur5YypukZi^x# uK)=B>V*vb5@2Ny+{AWBqU;zI65aJn$95~C&s$Vt$0000 Date: Sat, 30 Dec 2023 22:53:46 +0100 Subject: [PATCH 41/82] Fix weird stat drop anim (#3870) * Fix weird stat drop anim * PACKED define --- include/gba/defines.h | 1 + include/gba/types.h | 2 +- src/battle_intro.c | 28 ++++++++++++++-------------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/include/gba/defines.h b/include/gba/defines.h index fbe0a60706..0601f1b47e 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -17,6 +17,7 @@ #endif #define ALIGNED(n) __attribute__((aligned(n))) +#define PACKED __attribute__((packed)) #define SOUND_INFO_PTR (*(struct SoundInfo **)0x3007FF0) #define INTR_CHECK (*(u16 *)0x3007FF8) diff --git a/include/gba/types.h b/include/gba/types.h index 2e92bbe86e..4acaee2d23 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -41,7 +41,7 @@ struct BgCnt u16 screenBaseBlock:5; u16 areaOverflowMode:1; u16 screenSize:2; -}; +} PACKED; typedef volatile struct BgCnt vBgCnt; struct PlttData diff --git a/src/battle_intro.c b/src/battle_intro.c index 90ff736f00..2166421787 100644 --- a/src/battle_intro.c +++ b/src/battle_intro.c @@ -42,25 +42,25 @@ void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value) switch (attributeId) { case BG_ANIM_SCREEN_SIZE: - ((struct BgCnt *)&bgCnt)->screenSize = value; + ((vBgCnt *)&bgCnt)->screenSize = value; break; case BG_ANIM_AREA_OVERFLOW_MODE: - ((struct BgCnt *)&bgCnt)->areaOverflowMode = value; + ((vBgCnt *)&bgCnt)->areaOverflowMode = value; break; case BG_ANIM_MOSAIC: - ((struct BgCnt *)&bgCnt)->mosaic = value; + ((vBgCnt *)&bgCnt)->mosaic = value; break; case BG_ANIM_CHAR_BASE_BLOCK: - ((struct BgCnt *)&bgCnt)->charBaseBlock = value; + ((vBgCnt *)&bgCnt)->charBaseBlock = value; break; case BG_ANIM_PRIORITY: - ((struct BgCnt *)&bgCnt)->priority = value; + ((vBgCnt *)&bgCnt)->priority = value; break; case BG_ANIM_PALETTES_MODE: - ((struct BgCnt *)&bgCnt)->palettes = value; + ((vBgCnt *)&bgCnt)->palettes = value; break; case BG_ANIM_SCREEN_BASE_BLOCK: - ((struct BgCnt *)&bgCnt)->screenBaseBlock = value; + ((vBgCnt *)&bgCnt)->screenBaseBlock = value; break; } @@ -78,19 +78,19 @@ int GetAnimBgAttribute(u8 bgId, u8 attributeId) switch (attributeId) { case BG_ANIM_SCREEN_SIZE: - return ((struct BgCnt *)&bgCnt)->screenSize; + return ((vBgCnt *)&bgCnt)->screenSize; case BG_ANIM_AREA_OVERFLOW_MODE: - return ((struct BgCnt *)&bgCnt)->areaOverflowMode; + return ((vBgCnt *)&bgCnt)->areaOverflowMode; case BG_ANIM_MOSAIC: - return ((struct BgCnt *)&bgCnt)->mosaic; + return ((vBgCnt *)&bgCnt)->mosaic; case BG_ANIM_CHAR_BASE_BLOCK: - return ((struct BgCnt *)&bgCnt)->charBaseBlock; + return ((vBgCnt *)&bgCnt)->charBaseBlock; case BG_ANIM_PRIORITY: - return ((struct BgCnt *)&bgCnt)->priority; + return ((vBgCnt *)&bgCnt)->priority; case BG_ANIM_PALETTES_MODE: - return ((struct BgCnt *)&bgCnt)->palettes; + return ((vBgCnt *)&bgCnt)->palettes; case BG_ANIM_SCREEN_BASE_BLOCK: - return ((struct BgCnt *)&bgCnt)->screenBaseBlock; + return ((vBgCnt *)&bgCnt)->screenBaseBlock; } } From a3c25114b7e1671f309164eb1db0d8a2e303d01f Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sat, 30 Dec 2023 23:08:17 +0100 Subject: [PATCH 42/82] Fixes small ai bulldoze effect bug (#3872) Co-authored-by: DizzyEggg Co-authored-by: Bassoonian --- src/battle_ai_util.c | 1 + test/battle/ai.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 37abe521a9..14016684dd 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -926,6 +926,7 @@ static bool32 AI_IsMoveEffectInPlus(u32 battlerAtk, u32 battlerDef, u32 move, s3 if (ShouldLowerStat(battlerDef, abilityDef, STAT_DEF) && noOfHitsToKo != 1) return TRUE; break; + case EFFECT_BULLDOZE: case EFFECT_SPEED_DOWN_HIT: if (ShouldLowerStat(battlerDef, abilityDef, STAT_SPEED) && noOfHitsToKo != 1) return TRUE; diff --git a/test/battle/ai.c b/test/battle/ai.c index 88e516fe3e..953cf639f7 100644 --- a/test/battle/ai.c +++ b/test/battle/ai.c @@ -466,6 +466,21 @@ AI_DOUBLE_BATTLE_TEST("AI without any flags chooses moves at random - doubles") } } +AI_SINGLE_BATTLE_TEST("AI will choose either Rock Tomb or Bulldoze if Stat drop effect will activate and they kill with the same number of hits") +{ + GIVEN { + AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); + PLAYER(SPECIES_WOBBUFFET) { HP(46); Speed(20); } + PLAYER(SPECIES_WYNAUT) { Speed(20); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(10); Moves(MOVE_BULLDOZE, MOVE_ROCK_TOMB); } + } WHEN { + TURN { EXPECT_MOVES(opponent, MOVE_BULLDOZE, MOVE_ROCK_TOMB); } + TURN { EXPECT_MOVES(opponent, MOVE_BULLDOZE, MOVE_ROCK_TOMB); SEND_OUT(player, 1); } + } SCENE { + MESSAGE("Wobbuffet fainted!"); + } +} + AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_MON_CHOICES: AI will not switch in a Pokemon which is slower and gets 1HKOed after fainting") { bool32 alakazamFirst; From c50777d88ba8be9aa43fb745586ee6ea39ece558 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Sun, 31 Dec 2023 21:21:03 -0300 Subject: [PATCH 43/82] Fixed Egg graphical data not being properly read. (#3879) --- src/pokemon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokemon.c b/src/pokemon.c index c6b1c0dae6..f46a443389 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5985,7 +5985,7 @@ u16 SanitizeSpeciesId(u16 species) bool32 IsSpeciesEnabled(u16 species) { - return gSpeciesInfo[species].baseHP > 0; + return gSpeciesInfo[species].baseHP > 0 || species == SPECIES_EGG; } void TryToSetBattleFormChangeMoves(struct Pokemon *mon, u16 method) From 281cd0e20d939ebfed16aaafc00cfac2b939ec2f Mon Sep 17 00:00:00 2001 From: Damon Murdoch Date: Mon, 1 Jan 2024 19:07:04 +1100 Subject: [PATCH 44/82] Removed battle frontier z-move usage restriction (#3883) Removed battle frontier z-move usage restriction --- src/battle_z_move.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/battle_z_move.c b/src/battle_z_move.c index 7069d17386..346fac3a08 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -171,7 +171,8 @@ bool32 IsViableZMove(u8 battler, u16 move) if (gBattleStruct->zmove.used[battler]) return FALSE; - if (gBattleTypeFlags & (BATTLE_TYPE_SAFARI | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_FRONTIER)) + // Add '| BATTLE_TYPE_FRONTIER' to below if issues occur + if (gBattleTypeFlags & (BATTLE_TYPE_SAFARI | BATTLE_TYPE_WALLY_TUTORIAL)) return FALSE; if ((GetBattlerPosition(battler) == B_POSITION_PLAYER_LEFT || (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && GetBattlerPosition(battler) == B_POSITION_PLAYER_RIGHT)) && !CheckBagHasItem(ITEM_Z_POWER_RING, 1)) From 9191c22c6388c1ff09f2382a75586a05987a30a3 Mon Sep 17 00:00:00 2001 From: Damon Murdoch Date: Mon, 1 Jan 2024 21:28:52 +1100 Subject: [PATCH 45/82] Fixed genie signature moves (#3884) * Fixed genie signature moves Fixed genie signature moves * Condensed rain move checks into a single 'if' Condensed rain move checks into a single 'if' --- src/battle_script_commands.c | 6 ++++-- src/data/battle_moves.h | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 0bcde61666..fdf3da1912 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1586,9 +1586,11 @@ static bool32 AccuracyCalcHelper(u16 move) if (WEATHER_HAS_EFFECT) { - if ((IsBattlerWeatherAffected(gBattlerTarget, B_WEATHER_RAIN) && (gBattleMoves[move].effect == EFFECT_THUNDER || gBattleMoves[move].effect == EFFECT_HURRICANE))) + if (IsBattlerWeatherAffected(gBattlerTarget, B_WEATHER_RAIN) && + (gBattleMoves[move].effect == EFFECT_THUNDER || gBattleMoves[move].effect == EFFECT_HURRICANE || + move == MOVE_BLEAKWIND_STORM || move == MOVE_WILDBOLT_STORM || move == MOVE_SANDSEAR_STORM)) { - // thunder/hurricane ignore acc checks in rain unless target is holding utility umbrella + // thunder/hurricane/genie moves ignore acc checks in rain unless target is holding utility umbrella JumpIfMoveFailed(7, move); return TRUE; } diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 1fb2923c53..3675234b8e 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -13466,7 +13466,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_FLYING, .accuracy = 80, .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, + .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, @@ -13487,7 +13487,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_ELECTRIC, .accuracy = 80, .secondaryEffectChance = 20, - .target = MOVE_TARGET_SELECTED, + .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, @@ -13508,7 +13508,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .type = TYPE_GROUND, .accuracy = 80, .secondaryEffectChance = 20, - .target = MOVE_TARGET_SELECTED, + .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, From ab75ad6d0289fe6f4e7eb30e3ef36d9136b5e9b5 Mon Sep 17 00:00:00 2001 From: Nephrite Date: Mon, 1 Jan 2024 14:03:34 +0000 Subject: [PATCH 46/82] Ability flags update (#3886) * Added five ability flags Omitted duplicate flags that are basically "can't copy" (Role Play, Receiver, Entrainment, Skill Swap), didn't bother adding Neutralizing Gas flag, * Mold Breaker and Trace * Gastro Acid, Simple Beam, Worry Seed Decided to keep the Simple Beam/Worry Seed functions * Entrainment done * Skill Swap * Doodle/Role Play + flag descriptions Also adjusted Doodle test * Wandering Spirit, Mummy, Neutralizing Gas Neutralizing Gas really only needs to check for other mons with Neutralizing Gas, otherwise unsuppressable abilities are handled separately. * Renamed flags --- include/battle_util.h | 10 - include/config/battle.h | 3 + include/pokemon.h | 7 + src/battle_ai_main.c | 21 +- src/battle_script_commands.c | 21 +- src/battle_util.c | 539 ++----------------------------- src/data/abilities.h | 224 +++++++++++++ test/battle/move_effect/doodle.c | 8 +- 8 files changed, 294 insertions(+), 539 deletions(-) diff --git a/include/battle_util.h b/include/battle_util.h index 18b27eed2c..575d18edf8 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -222,16 +222,6 @@ void RecalcBattlerStats(u32 battler, struct Pokemon *mon); bool32 IsAlly(u32 battlerAtk, u32 battlerDef); bool32 IsGen6ExpShareEnabled(void); -// Ability checks -bool32 IsSkillSwapBannedAbility(u16 ability); -bool32 IsRolePlayDoodleBannedAbility(u16 ability); -bool32 IsRolePlayDoodleBannedAbilityAttacker(u16 ability); -bool32 IsWorrySeedBannedAbility(u16 ability); -bool32 IsGastroAcidBannedAbility(u16 ability); -bool32 IsEntrainmentBannedAbility(u16 ability); -bool32 IsEntrainmentBannedAbilityAttacker(u16 ability); -bool32 IsSimpleBeamBannedAbility(u16 ability); - bool32 CanSleep(u32 battler); bool32 CanBePoisoned(u32 battlerAttacker, u32 battlerTarget); bool32 CanBeBurned(u32 battler); diff --git a/include/config/battle.h b/include/config/battle.h index acce0ac124..e963dc775b 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -71,6 +71,9 @@ #define B_PP_REDUCED_BY_SPITE GEN_LATEST // In Gen4+, Spite reduces the foe's last move's PP by 4, instead of 2 to 5. #define B_EXTRAPOLATED_MOVE_FLAGS TRUE // Adds move flags to moves that they don't officially have but would likely have if they were in the latest core series game. +// Ability data settings +#define B_UPDATED_ABILITY_DATA GEN_LATEST // Affects flags + // Move accuracy settings #define B_TOXIC_NEVER_MISS GEN_LATEST // In Gen6+, if Toxic is used by a Poison-type Pokémon, it will never miss. #define B_MINIMIZE_DMG_ACC GEN_LATEST // In Gen6+, moves that causes double damage to minimized Pokémon will also skip accuracy checks. diff --git a/include/pokemon.h b/include/pokemon.h index c95ecbf940..87d74b766c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -514,6 +514,13 @@ struct Ability u8 name[ABILITY_NAME_LENGTH + 1]; const u8 *description; s8 aiRating; + u8 cantBeCopied:1; // cannot be copied by Role Play or Doodle + u8 cantBeSwapped:1; // cannot be swapped with Skill Swap or Wandering Spirit + u8 cantBeTraced:1; // cannot be copied by Trace - same as cantBeCopied except for Wonder Guard + u8 cantBeSuppressed:1; // cannot be negated by Gastro Acid or Neutralizing Gas + u8 cantBeOverwritten:1; // cannot be overwritten by Entrainment, Worry Seed or Simple Beam (but can be by Mummy) - same as cantBeSuppressed except for Truant + u8 breakable:1; // can be bypassed by Mold Breaker and clones + u8 failsOnImposter:1; // doesn't work on an Imposter mon; when can we actually use this? }; #define SPINDA_SPOT_WIDTH 16 diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 6aa8374b6f..ae06cdfb51 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -2153,8 +2153,8 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case EFFECT_ROLE_PLAY: if (aiData->abilities[battlerAtk] == aiData->abilities[battlerDef] || aiData->abilities[battlerDef] == ABILITY_NONE - || IsRolePlayDoodleBannedAbilityAttacker(aiData->abilities[battlerAtk]) - || IsRolePlayDoodleBannedAbility(aiData->abilities[battlerDef])) + || gAbilities[aiData->abilities[battlerAtk]].cantBeSuppressed + || gAbilities[aiData->abilities[battlerDef]].cantBeCopied) ADJUST_SCORE(-10); else if (IsAbilityOfRating(aiData->abilities[battlerAtk], 5)) ADJUST_SCORE(-4); @@ -2183,25 +2183,26 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case EFFECT_SKILL_SWAP: if (aiData->abilities[battlerAtk] == ABILITY_NONE || aiData->abilities[battlerDef] == ABILITY_NONE - || IsSkillSwapBannedAbility(aiData->abilities[battlerAtk]) || IsSkillSwapBannedAbility(aiData->abilities[battlerDef]) + || gAbilities[aiData->abilities[battlerAtk]].cantBeSwapped + || gAbilities[aiData->abilities[battlerDef]].cantBeSwapped || aiData->holdEffects[battlerDef] == HOLD_EFFECT_ABILITY_SHIELD) ADJUST_SCORE(-10); break; case EFFECT_WORRY_SEED: if (aiData->abilities[battlerDef] == ABILITY_INSOMNIA - || IsWorrySeedBannedAbility(aiData->abilities[battlerDef]) + || gAbilities[aiData->abilities[battlerDef]].cantBeOverwritten || aiData->holdEffects[battlerDef] == HOLD_EFFECT_ABILITY_SHIELD) ADJUST_SCORE(-10); break; case EFFECT_GASTRO_ACID: if (gStatuses3[battlerDef] & STATUS3_GASTRO_ACID - || IsGastroAcidBannedAbility(aiData->abilities[battlerDef])) + || gAbilities[aiData->abilities[battlerDef]].cantBeSuppressed) ADJUST_SCORE(-10); break; case EFFECT_ENTRAINMENT: if (aiData->abilities[battlerAtk] == ABILITY_NONE - || IsEntrainmentBannedAbilityAttacker(aiData->abilities[battlerAtk]) - || IsEntrainmentBannedAbility(aiData->abilities[battlerDef]) + || gAbilities[aiData->abilities[battlerAtk]].cantBeCopied + || gAbilities[aiData->abilities[battlerDef]].cantBeOverwritten || aiData->holdEffects[battlerAtk] == HOLD_EFFECT_ABILITY_SHIELD) ADJUST_SCORE(-10); break; @@ -2209,7 +2210,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case EFFECT_SIMPLE_BEAM: if (aiData->abilities[battlerDef] == ABILITY_SIMPLE - || IsSimpleBeamBannedAbility(aiData->abilities[battlerDef]) + || gAbilities[aiData->abilities[battlerDef]].cantBeOverwritten || aiData->holdEffects[battlerDef] == HOLD_EFFECT_ABILITY_SHIELD) ADJUST_SCORE(-10); break; @@ -4377,8 +4378,8 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score } break; case EFFECT_ROLE_PLAY: - if (!IsRolePlayDoodleBannedAbilityAttacker(aiData->abilities[battlerAtk]) - && !IsRolePlayDoodleBannedAbility(aiData->abilities[battlerDef]) + if (!gAbilities[aiData->abilities[battlerAtk]].cantBeSuppressed + && !gAbilities[aiData->abilities[battlerDef]].cantBeCopied && !IsAbilityOfRating(aiData->abilities[battlerAtk], 5) && IsAbilityOfRating(aiData->abilities[battlerDef], 5)) ADJUST_SCORE(2); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index efa31669e1..6cc177769f 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -9329,7 +9329,7 @@ static void Cmd_various(void) case VARIOUS_SET_SIMPLE_BEAM: { VARIOUS_ARGS(const u8 *failInstr); - if (IsSimpleBeamBannedAbility(gBattleMons[gBattlerTarget].ability) + if (gAbilities[gBattleMons[gBattlerTarget].ability].cantBeOverwritten || gBattleMons[gBattlerTarget].ability == ABILITY_SIMPLE) { RecordAbilityBattle(gBattlerTarget, gBattleMons[gBattlerTarget].ability); @@ -9353,8 +9353,8 @@ static void Cmd_various(void) case VARIOUS_TRY_ENTRAINMENT: { VARIOUS_ARGS(const u8 *failInstr); - if (IsEntrainmentBannedAbilityAttacker(gBattleMons[gBattlerAttacker].ability) - || IsEntrainmentBannedAbility(gBattleMons[gBattlerTarget].ability)) + if (gAbilities[gBattleMons[gBattlerAttacker].ability].cantBeCopied + || gAbilities[gBattleMons[gBattlerTarget].ability].cantBeOverwritten) { RecordAbilityBattle(gBattlerTarget, gBattleMons[gBattlerTarget].ability); gBattlescriptCurrInstr = cmd->failInstr; @@ -13951,9 +13951,9 @@ static void Cmd_trycopyability(void) if (gBattleMons[battler].ability == defAbility || defAbility == ABILITY_NONE - || IsRolePlayDoodleBannedAbilityAttacker(gBattleMons[battler].ability) - || IsRolePlayDoodleBannedAbilityAttacker(gBattleMons[BATTLE_PARTNER(battler)].ability) - || IsRolePlayDoodleBannedAbility(defAbility)) + || gAbilities[gBattleMons[battler].ability].cantBeSuppressed + || gAbilities[gBattleMons[BATTLE_PARTNER(battler)].ability].cantBeSuppressed + || gAbilities[defAbility].cantBeCopied) { gBattlescriptCurrInstr = cmd->failInstr; } @@ -14029,7 +14029,7 @@ static void Cmd_setgastroacid(void) { CMD_ARGS(const u8 *failInstr); - if (IsGastroAcidBannedAbility(gBattleMons[gBattlerTarget].ability)) + if (gAbilities[gBattleMons[gBattlerTarget].ability].cantBeSuppressed) { gBattlescriptCurrInstr = cmd->failInstr; } @@ -14129,8 +14129,8 @@ static void Cmd_tryswapabilities(void) { CMD_ARGS(const u8 *failInstr); - if (IsSkillSwapBannedAbility(gBattleMons[gBattlerAttacker].ability) - || IsSkillSwapBannedAbility(gBattleMons[gBattlerTarget].ability)) + if (gAbilities[gBattleMons[gBattlerAttacker].ability].cantBeSwapped + || gAbilities[gBattleMons[gBattlerTarget].ability].cantBeSwapped) { RecordAbilityBattle(gBattlerTarget, gBattleMons[gBattlerTarget].ability); gBattlescriptCurrInstr = cmd->failInstr; @@ -15489,7 +15489,8 @@ static void Cmd_tryworryseed(void) { CMD_ARGS(const u8 *failInstr); - if (IsWorrySeedBannedAbility(gBattleMons[gBattlerTarget].ability)) + if (gAbilities[gBattleMons[gBattlerTarget].ability].cantBeOverwritten + || gBattleMons[gBattlerTarget].ability == ABILITY_INSOMNIA) { RecordAbilityBattle(gBattlerTarget, gBattleMons[gBattlerTarget].ability); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); diff --git a/src/battle_util.c b/src/battle_util.c index 86e616140a..04ba26ed86 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -94,224 +94,6 @@ static const u8 sPkblToEscapeFactor[][3] = { static const u8 sGoNearCounterToCatchFactor[] = {4, 3, 2, 1}; static const u8 sGoNearCounterToEscapeFactor[] = {4, 4, 4, 4}; -static const u16 sSkillSwapBannedAbilities[] = -{ - ABILITY_AS_ONE_ICE_RIDER, - ABILITY_AS_ONE_SHADOW_RIDER, - ABILITY_BATTLE_BOND, - ABILITY_COMATOSE, - ABILITY_COMMANDER, - ABILITY_DISGUISE, - ABILITY_GULP_MISSILE, - ABILITY_HADRON_ENGINE, - ABILITY_HUNGER_SWITCH, - ABILITY_ICE_FACE, - ABILITY_ILLUSION, - ABILITY_MULTITYPE, - ABILITY_NEUTRALIZING_GAS, - ABILITY_ORICHALCUM_PULSE, - ABILITY_POWER_CONSTRUCT, - ABILITY_PROTOSYNTHESIS, - ABILITY_QUARK_DRIVE, - ABILITY_RKS_SYSTEM, - ABILITY_SCHOOLING, - ABILITY_SHIELDS_DOWN, - ABILITY_STANCE_CHANGE, - ABILITY_WONDER_GUARD, - ABILITY_ZEN_MODE, - ABILITY_ZERO_TO_HERO, -}; - -static const u16 sRolePlayDoodleBannedAbilities[] = -{ - ABILITY_AS_ONE_ICE_RIDER, - ABILITY_AS_ONE_SHADOW_RIDER, - ABILITY_BATTLE_BOND, - ABILITY_COMATOSE, - ABILITY_COMMANDER, - ABILITY_DISGUISE, - ABILITY_FLOWER_GIFT, - ABILITY_FORECAST, - ABILITY_GULP_MISSILE, - ABILITY_HADRON_ENGINE, - ABILITY_HUNGER_SWITCH, - ABILITY_ICE_FACE, - ABILITY_ILLUSION, - ABILITY_IMPOSTER, - ABILITY_MULTITYPE, - ABILITY_NEUTRALIZING_GAS, - ABILITY_ORICHALCUM_PULSE, - ABILITY_POWER_CONSTRUCT, - ABILITY_POWER_OF_ALCHEMY, - ABILITY_PROTOSYNTHESIS, - ABILITY_QUARK_DRIVE, - ABILITY_RECEIVER, - ABILITY_RKS_SYSTEM, - ABILITY_SCHOOLING, - ABILITY_SHIELDS_DOWN, - ABILITY_STANCE_CHANGE, - ABILITY_TRACE, - ABILITY_WONDER_GUARD, - ABILITY_ZEN_MODE, - ABILITY_ZERO_TO_HERO, -}; - -static const u16 sRolePlayDoodleBannedAttackerAbilities[] = -{ - ABILITY_AS_ONE_ICE_RIDER, - ABILITY_AS_ONE_SHADOW_RIDER, - ABILITY_BATTLE_BOND, - ABILITY_COMATOSE, - ABILITY_COMMANDER, - ABILITY_DISGUISE, - ABILITY_GULP_MISSILE, - ABILITY_HADRON_ENGINE, - ABILITY_ICE_FACE, - ABILITY_MULTITYPE, - ABILITY_ORICHALCUM_PULSE, - ABILITY_POWER_CONSTRUCT, - ABILITY_PROTOSYNTHESIS, - ABILITY_QUARK_DRIVE, - ABILITY_RKS_SYSTEM, - ABILITY_SCHOOLING, - ABILITY_SHIELDS_DOWN, - ABILITY_STANCE_CHANGE, - ABILITY_ZEN_MODE, - ABILITY_ZERO_TO_HERO, -}; - -static const u16 sWorrySeedBannedAbilities[] = -{ - ABILITY_AS_ONE_ICE_RIDER, - ABILITY_AS_ONE_SHADOW_RIDER, - ABILITY_BATTLE_BOND, - ABILITY_COMATOSE, - ABILITY_COMMANDER, - ABILITY_DISGUISE, - ABILITY_GULP_MISSILE, - ABILITY_HADRON_ENGINE, - ABILITY_ICE_FACE, - ABILITY_INSOMNIA, - ABILITY_MULTITYPE, - ABILITY_ORICHALCUM_PULSE, - ABILITY_POWER_CONSTRUCT, - ABILITY_PROTOSYNTHESIS, - ABILITY_QUARK_DRIVE, - ABILITY_RKS_SYSTEM, - ABILITY_SCHOOLING, - ABILITY_SHIELDS_DOWN, - ABILITY_STANCE_CHANGE, - ABILITY_TRUANT, - ABILITY_ZEN_MODE, - ABILITY_ZERO_TO_HERO, -}; - -static const u16 sGastroAcidBannedAbilities[] = -{ - ABILITY_AS_ONE_ICE_RIDER, - ABILITY_AS_ONE_SHADOW_RIDER, - ABILITY_BATTLE_BOND, - ABILITY_COMATOSE, - ABILITY_COMMANDER, - ABILITY_DISGUISE, - ABILITY_GULP_MISSILE, - ABILITY_HADRON_ENGINE, - ABILITY_ICE_FACE, - ABILITY_MULTITYPE, - ABILITY_ORICHALCUM_PULSE, - ABILITY_POWER_CONSTRUCT, - ABILITY_RKS_SYSTEM, - ABILITY_SCHOOLING, - ABILITY_SHIELDS_DOWN, - ABILITY_STANCE_CHANGE, - ABILITY_ZEN_MODE, - ABILITY_ZERO_TO_HERO, -}; - -static const u16 sEntrainmentBannedAbilities[] = -{ - ABILITY_AS_ONE_ICE_RIDER, - ABILITY_AS_ONE_SHADOW_RIDER, - ABILITY_BATTLE_BOND, - ABILITY_COMATOSE, - ABILITY_COMMANDER, - ABILITY_DISGUISE, - ABILITY_GULP_MISSILE, - ABILITY_HADRON_ENGINE, - ABILITY_ICE_FACE, - ABILITY_MULTITYPE, - ABILITY_ORICHALCUM_PULSE, - ABILITY_POWER_CONSTRUCT, - ABILITY_PROTOSYNTHESIS, - ABILITY_QUARK_DRIVE, - ABILITY_RKS_SYSTEM, - ABILITY_SCHOOLING, - ABILITY_SHIELDS_DOWN, - ABILITY_STANCE_CHANGE, - ABILITY_TRUANT, - ABILITY_ZEN_MODE, - ABILITY_ZERO_TO_HERO, -}; - -static const u16 sEntrainmentBannedAttackerAbilities[] = -{ - ABILITY_AS_ONE_ICE_RIDER, - ABILITY_AS_ONE_SHADOW_RIDER, - ABILITY_BATTLE_BOND, - ABILITY_COMATOSE, - ABILITY_COMMANDER, - ABILITY_DISGUISE, - ABILITY_FLOWER_GIFT, - ABILITY_FORECAST, - ABILITY_GULP_MISSILE, - ABILITY_HADRON_ENGINE, - ABILITY_HUNGER_SWITCH, - ABILITY_ICE_FACE, - ABILITY_ILLUSION, - ABILITY_IMPOSTER, - ABILITY_MULTITYPE, - ABILITY_NEUTRALIZING_GAS, - ABILITY_ORICHALCUM_PULSE, - ABILITY_POWER_CONSTRUCT, - ABILITY_POWER_OF_ALCHEMY, - ABILITY_PROTOSYNTHESIS, - ABILITY_QUARK_DRIVE, - ABILITY_RECEIVER, - ABILITY_RKS_SYSTEM, - ABILITY_SCHOOLING, - ABILITY_SHIELDS_DOWN, - ABILITY_STANCE_CHANGE, - ABILITY_TRACE, - ABILITY_ZEN_MODE, - ABILITY_ZERO_TO_HERO, -}; - -static const u16 sSimpleBeamBannedAbilities[] = -{ - ABILITY_AS_ONE_ICE_RIDER, - ABILITY_AS_ONE_SHADOW_RIDER, - ABILITY_BATTLE_BOND, - ABILITY_COMATOSE, - ABILITY_COMMANDER, - ABILITY_DISGUISE, - ABILITY_GULP_MISSILE, - ABILITY_HADRON_ENGINE, - ABILITY_ICE_FACE, - ABILITY_MULTITYPE, - ABILITY_ORICHALCUM_PULSE, - ABILITY_POWER_CONSTRUCT, - ABILITY_PROTOSYNTHESIS, - ABILITY_QUARK_DRIVE, - ABILITY_RKS_SYSTEM, - ABILITY_SCHOOLING, - ABILITY_SHIELDS_DOWN, - ABILITY_SIMPLE, - ABILITY_STANCE_CHANGE, - ABILITY_TRUANT, - ABILITY_ZEN_MODE, - ABILITY_ZERO_TO_HERO, -}; - static u8 CalcBeatUpPower(void) { u8 basePower; @@ -985,114 +767,6 @@ void HandleAction_ActionFinished(void) } } -static const u8 sAbilitiesAffectedByMoldBreaker[] = -{ - [ABILITY_BATTLE_ARMOR] = 1, - [ABILITY_CLEAR_BODY] = 1, - [ABILITY_DAMP] = 1, - [ABILITY_DRY_SKIN] = 1, - [ABILITY_FILTER] = 1, - [ABILITY_FLASH_FIRE] = 1, - [ABILITY_FLOWER_GIFT] = 1, - [ABILITY_HEATPROOF] = 1, - [ABILITY_HYPER_CUTTER] = 1, - [ABILITY_IMMUNITY] = 1, - [ABILITY_INNER_FOCUS] = 1, - [ABILITY_INSOMNIA] = 1, - [ABILITY_KEEN_EYE] = 1, - [ABILITY_LEAF_GUARD] = 1, - [ABILITY_LEVITATE] = 1, - [ABILITY_LIGHTNING_ROD] = 1, - [ABILITY_LIMBER] = 1, - [ABILITY_MAGMA_ARMOR] = 1, - [ABILITY_MARVEL_SCALE] = 1, - [ABILITY_MOTOR_DRIVE] = 1, - [ABILITY_OBLIVIOUS] = 1, - [ABILITY_OWN_TEMPO] = 1, - [ABILITY_SAND_VEIL] = 1, - [ABILITY_SHELL_ARMOR] = 1, - [ABILITY_SHIELD_DUST] = 1, - [ABILITY_SIMPLE] = 1, - [ABILITY_SNOW_CLOAK] = 1, - [ABILITY_SOLID_ROCK] = 1, - [ABILITY_SOUNDPROOF] = 1, - [ABILITY_STICKY_HOLD] = 1, - [ABILITY_STORM_DRAIN] = 1, - [ABILITY_STURDY] = 1, - [ABILITY_SUCTION_CUPS] = 1, - [ABILITY_TANGLED_FEET] = 1, - [ABILITY_THICK_FAT] = 1, - [ABILITY_UNAWARE] = 1, - [ABILITY_VITAL_SPIRIT] = 1, - [ABILITY_VOLT_ABSORB] = 1, - [ABILITY_WATER_ABSORB] = 1, - [ABILITY_WATER_VEIL] = 1, - [ABILITY_WHITE_SMOKE] = 1, - [ABILITY_WONDER_GUARD] = 1, - [ABILITY_BIG_PECKS] = 1, - [ABILITY_CONTRARY] = 1, - [ABILITY_FRIEND_GUARD] = 1, - [ABILITY_HEAVY_METAL] = 1, - [ABILITY_LIGHT_METAL] = 1, - [ABILITY_MAGIC_BOUNCE] = 1, - [ABILITY_MULTISCALE] = 1, - [ABILITY_SAP_SIPPER] = 1, - [ABILITY_TELEPATHY] = 1, - [ABILITY_WONDER_SKIN] = 1, - [ABILITY_AROMA_VEIL] = 1, - [ABILITY_BULLETPROOF] = 1, - [ABILITY_FLOWER_VEIL] = 1, - [ABILITY_FUR_COAT] = 1, - [ABILITY_OVERCOAT] = 1, - [ABILITY_SWEET_VEIL] = 1, - [ABILITY_DAZZLING] = 1, - [ABILITY_DISGUISE] = 1, - [ABILITY_FLUFFY] = 1, - [ABILITY_QUEENLY_MAJESTY] = 1, - [ABILITY_WATER_BUBBLE] = 1, - [ABILITY_MIRROR_ARMOR] = 1, - [ABILITY_PUNK_ROCK] = 1, - [ABILITY_ICE_SCALES] = 1, - [ABILITY_ICE_FACE] = 1, - [ABILITY_PASTEL_VEIL] = 1, - [ABILITY_ARMOR_TAIL] = 1, - [ABILITY_EARTH_EATER] = 1, - [ABILITY_GOOD_AS_GOLD] = 1, - [ABILITY_PURIFYING_SALT] = 1, - [ABILITY_WELL_BAKED_BODY] = 1, - [ABILITY_MINDS_EYE] = 1, - [ABILITY_ILLUMINATE] = 1, -}; - -static const u8 sAbilitiesNotTraced[ABILITIES_COUNT] = -{ - [ABILITY_AS_ONE_ICE_RIDER] = 1, - [ABILITY_AS_ONE_SHADOW_RIDER] = 1, - [ABILITY_BATTLE_BOND] = 1, - [ABILITY_COMATOSE] = 1, - [ABILITY_DISGUISE] = 1, - [ABILITY_FLOWER_GIFT] = 1, - [ABILITY_FORECAST] = 1, - [ABILITY_GULP_MISSILE] = 1, - [ABILITY_HUNGER_SWITCH] = 1, - [ABILITY_ICE_FACE] = 1, - [ABILITY_ILLUSION] = 1, - [ABILITY_IMPOSTER] = 1, - [ABILITY_MULTITYPE] = 1, - [ABILITY_NEUTRALIZING_GAS] = 1, - [ABILITY_NONE] = 1, - [ABILITY_POWER_CONSTRUCT] = 1, - [ABILITY_POWER_OF_ALCHEMY] = 1, - [ABILITY_RECEIVER] = 1, - [ABILITY_RKS_SYSTEM] = 1, - [ABILITY_SCHOOLING] = 1, - [ABILITY_SHIELDS_DOWN] = 1, - [ABILITY_STANCE_CHANGE] = 1, - [ABILITY_TRACE] = 1, - [ABILITY_ZEN_MODE] = 1, - [ABILITY_ZERO_TO_HERO] = 1, -}; - static const u8 sHoldEffectToType[][2] = { {HOLD_EFFECT_BUG_POWER, TYPE_BUG}, @@ -5459,34 +5133,22 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 && IsBattlerAlive(gBattlerAttacker) && TARGET_TURN_DAMAGED && IsMoveMakingContact(move, gBattlerAttacker) - && gBattleStruct->overwrittenAbilities[gBattlerAttacker] != GetBattlerAbility(gBattlerTarget)) + && gBattleStruct->overwrittenAbilities[gBattlerAttacker] != GetBattlerAbility(gBattlerTarget) + && gBattleMons[gBattlerTarget].ability != ABILITY_MUMMY + && gBattleMons[gBattlerTarget].ability != ABILITY_LINGERING_AROMA + && !gAbilities[gBattleMons[gBattlerTarget].ability].cantBeSuppressed) { - switch (gBattleMons[gBattlerAttacker].ability) + if (GetBattlerHoldEffect(gBattlerAttacker, TRUE) == HOLD_EFFECT_ABILITY_SHIELD) { - case ABILITY_MUMMY: - case ABILITY_BATTLE_BOND: - case ABILITY_COMATOSE: - case ABILITY_DISGUISE: - case ABILITY_MULTITYPE: - case ABILITY_POWER_CONSTRUCT: - case ABILITY_RKS_SYSTEM: - case ABILITY_SCHOOLING: - case ABILITY_SHIELDS_DOWN: - case ABILITY_STANCE_CHANGE: - break; - default: - if (GetBattlerHoldEffect(gBattlerAttacker, TRUE) == HOLD_EFFECT_ABILITY_SHIELD) - { - RecordItemEffectBattle(gBattlerAttacker, HOLD_EFFECT_ABILITY_SHIELD); - break; - } - - gLastUsedAbility = gBattleMons[gBattlerAttacker].ability = gBattleStruct->overwrittenAbilities[gBattlerAttacker] = gBattleMons[gBattlerTarget].ability; - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_MummyActivates; - effect++; + RecordItemEffectBattle(gBattlerAttacker, HOLD_EFFECT_ABILITY_SHIELD); break; } + + gLastUsedAbility = gBattleMons[gBattlerAttacker].ability = gBattleStruct->overwrittenAbilities[gBattlerAttacker] = gBattleMons[gBattlerTarget].ability; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_MummyActivates; + effect++; + break; } break; case ABILITY_WANDERING_SPIRIT: @@ -5494,40 +5156,22 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 && IsBattlerAlive(gBattlerAttacker) && TARGET_TURN_DAMAGED && IsMoveMakingContact(move, gBattlerAttacker) - && !IsDynamaxed(gBattlerTarget)) + && !IsDynamaxed(gBattlerTarget) + && !gAbilities[gBattleMons[gBattlerAttacker].ability].cantBeSwapped) { - switch (gBattleMons[gBattlerAttacker].ability) + if (GetBattlerHoldEffect(gBattlerAttacker, TRUE) == HOLD_EFFECT_ABILITY_SHIELD) { - case ABILITY_DISGUISE: - case ABILITY_FLOWER_GIFT: - case ABILITY_GULP_MISSILE: - case ABILITY_HUNGER_SWITCH: - case ABILITY_ICE_FACE: - case ABILITY_ILLUSION: - case ABILITY_IMPOSTER: - case ABILITY_RECEIVER: - case ABILITY_RKS_SYSTEM: - case ABILITY_SCHOOLING: - case ABILITY_STANCE_CHANGE: - case ABILITY_WONDER_GUARD: - case ABILITY_ZEN_MODE: - case ABILITY_ZERO_TO_HERO: - break; - default: - if (GetBattlerHoldEffect(gBattlerAttacker, TRUE) == HOLD_EFFECT_ABILITY_SHIELD) - { - RecordItemEffectBattle(gBattlerAttacker, HOLD_EFFECT_ABILITY_SHIELD); - break; - } - - gLastUsedAbility = gBattleMons[gBattlerAttacker].ability; - gBattleMons[gBattlerAttacker].ability = gBattleStruct->overwrittenAbilities[gBattlerAttacker] = gBattleMons[gBattlerTarget].ability; - gBattleMons[gBattlerTarget].ability = gBattleStruct->overwrittenAbilities[gBattlerTarget] = gLastUsedAbility; - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_WanderingSpiritActivates; - effect++; + RecordItemEffectBattle(gBattlerAttacker, HOLD_EFFECT_ABILITY_SHIELD); break; } + + gLastUsedAbility = gBattleMons[gBattlerAttacker].ability; + gBattleMons[gBattlerAttacker].ability = gBattleStruct->overwrittenAbilities[gBattlerAttacker] = gBattleMons[gBattlerTarget].ability; + gBattleMons[gBattlerTarget].ability = gBattleStruct->overwrittenAbilities[gBattlerTarget] = gLastUsedAbility; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_WanderingSpiritActivates; + effect++; + break; } break; case ABILITY_ANGER_POINT: @@ -6152,17 +5796,17 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - if (!sAbilitiesNotTraced[gBattleMons[target1].ability] && gBattleMons[target1].hp != 0 - && !sAbilitiesNotTraced[gBattleMons[target2].ability] && gBattleMons[target2].hp != 0) + if (!gAbilities[gBattleMons[target1].ability].cantBeTraced && gBattleMons[target1].hp != 0 + && !gAbilities[gBattleMons[target2].ability].cantBeTraced && gBattleMons[target2].hp != 0) chosenTarget = GetBattlerAtPosition((RandomPercentage(RNG_TRACE, 50) * 2) | side), effect++; - else if (!sAbilitiesNotTraced[gBattleMons[target1].ability] && gBattleMons[target1].hp != 0) + else if (!gAbilities[gBattleMons[target1].ability].cantBeTraced && gBattleMons[target1].hp != 0) chosenTarget = target1, effect++; - else if (!sAbilitiesNotTraced[gBattleMons[target2].ability] && gBattleMons[target2].hp != 0) + else if (!gAbilities[gBattleMons[target2].ability].cantBeTraced && gBattleMons[target2].hp != 0) chosenTarget = target2, effect++; } else { - if (!sAbilitiesNotTraced[gBattleMons[target1].ability] && gBattleMons[target1].hp != 0) + if (!gAbilities[gBattleMons[target1].ability].cantBeTraced && gBattleMons[target1].hp != 0) chosenTarget = target1, effect++; } @@ -6324,35 +5968,6 @@ bool32 TryPrimalReversion(u32 battler) return FALSE; } -static const u16 sNeutralizingGasBannedAbilities[] = -{ - ABILITY_AS_ONE_ICE_RIDER, - ABILITY_AS_ONE_SHADOW_RIDER, - ABILITY_COMATOSE, - ABILITY_DISGUISE, - ABILITY_GULP_MISSILE, - ABILITY_ICE_FACE, - ABILITY_MULTITYPE, - ABILITY_POWER_CONSTRUCT, - ABILITY_RKS_SYSTEM, - ABILITY_SCHOOLING, - ABILITY_SHIELDS_DOWN, - ABILITY_STANCE_CHANGE, - ABILITY_ZEN_MODE, - ABILITY_ZERO_TO_HERO, -}; - -bool32 IsNeutralizingGasBannedAbility(u16 ability) -{ - u32 i; - for (i = 0; i < ARRAY_COUNT(sNeutralizingGasBannedAbilities); i++) - { - if (ability == sNeutralizingGasBannedAbilities[i]) - return TRUE; - } - return FALSE; -} - bool32 IsNeutralizingGasOnField(void) { u32 i; @@ -6386,10 +6001,13 @@ bool32 IsMoldBreakerTypeAbility(u32 ability) u32 GetBattlerAbility(u32 battler) { + if (gAbilities[gBattleMons[battler].ability].cantBeSuppressed) + return gBattleMons[battler].ability; + if (gStatuses3[battler] & STATUS3_GASTRO_ACID) return ABILITY_NONE; - if (IsNeutralizingGasOnField() && !IsNeutralizingGasBannedAbility(gBattleMons[battler].ability)) + if (IsNeutralizingGasOnField() && gBattleMons[battler].ability != ABILITY_NEUTRALIZING_GAS) return ABILITY_NONE; if (IsMyceliumMightOnField()) @@ -6398,7 +6016,7 @@ u32 GetBattlerAbility(u32 battler) if (((IsMoldBreakerTypeAbility(gBattleMons[gBattlerAttacker].ability) && !(gStatuses3[gBattlerAttacker] & STATUS3_GASTRO_ACID)) || gBattleMoves[gCurrentMove].ignoresTargetAbility) - && sAbilitiesAffectedByMoldBreaker[gBattleMons[battler].ability] + && gAbilities[gBattleMons[battler].ability].breakable && gBattlerByTurnOrder[gCurrentTurnActionNumber] == gBattlerAttacker && gActionsByTurnOrder[gBattlerByTurnOrder[gBattlerAttacker]] == B_ACTION_USE_MOVE && gCurrentTurnActionNumber < gBattlersCount) @@ -10953,95 +10571,6 @@ bool32 CanFling(u32 battler) return TRUE; } -// Ability checks -bool32 IsSkillSwapBannedAbility(u16 ability) -{ - u32 i; - for (i = 0; i < ARRAY_COUNT(sSkillSwapBannedAbilities); i++) - { - if (ability == sSkillSwapBannedAbilities[i]) - return TRUE; - } - return FALSE; -} - -bool32 IsRolePlayDoodleBannedAbility(u16 ability) -{ - u32 i; - for (i = 0; i < ARRAY_COUNT(sRolePlayDoodleBannedAbilities); i++) - { - if (ability == sRolePlayDoodleBannedAbilities[i]) - return TRUE; - } - return FALSE; -} - -bool32 IsRolePlayDoodleBannedAbilityAttacker(u16 ability) -{ - u32 i; - for (i = 0; i < ARRAY_COUNT(sRolePlayDoodleBannedAttackerAbilities); i++) - { - if (ability == sRolePlayDoodleBannedAttackerAbilities[i]) - return TRUE; - } - return FALSE; -} - -bool32 IsWorrySeedBannedAbility(u16 ability) -{ - u32 i; - for (i = 0; i < ARRAY_COUNT(sWorrySeedBannedAbilities); i++) - { - if (ability == sWorrySeedBannedAbilities[i]) - return TRUE; - } - return FALSE; -} - -bool32 IsGastroAcidBannedAbility(u16 ability) -{ - u32 i; - for (i = 0; i < ARRAY_COUNT(sGastroAcidBannedAbilities); i++) - { - if (ability == sGastroAcidBannedAbilities[i]) - return TRUE; - } - return FALSE; -} - -bool32 IsEntrainmentBannedAbility(u16 ability) -{ - u32 i; - for (i = 0; i < ARRAY_COUNT(sEntrainmentBannedAbilities); i++) - { - if (ability == sEntrainmentBannedAbilities[i]) - return TRUE; - } - return FALSE; -} - -bool32 IsEntrainmentBannedAbilityAttacker(u16 ability) -{ - u32 i; - for (i = 0; i < ARRAY_COUNT(sEntrainmentBannedAttackerAbilities); i++) - { - if (ability == sEntrainmentBannedAttackerAbilities[i]) - return TRUE; - } - return FALSE; -} - -bool32 IsSimpleBeamBannedAbility(u16 ability) -{ - u32 i; - for (i = 0; i < ARRAY_COUNT(sSimpleBeamBannedAbilities); i++) - { - if (ability == sSimpleBeamBannedAbilities[i]) - return TRUE; - } - return FALSE; -} - // Sort an array of battlers by speed // Useful for effects like pickpocket, eject button, red card, dancer void SortBattlersBySpeed(u8 *battlers, bool32 slowToFast) diff --git a/src/data/abilities.h b/src/data/abilities.h index 56f7547b23..81bfc995a3 100644 --- a/src/data/abilities.h +++ b/src/data/abilities.h @@ -5,6 +5,8 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("-------"), .description = COMPOUND_STRING("No special ability."), .aiRating = 0, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, }, [ABILITY_STENCH] = @@ -33,6 +35,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Battle Armor"), .description = COMPOUND_STRING("Blocks critical hits."), .aiRating = 2, + .breakable = TRUE, }, [ABILITY_STURDY] = @@ -40,6 +43,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Sturdy"), .description = COMPOUND_STRING("Negates 1-hit KO attacks."), .aiRating = 6, + .breakable = TRUE, }, [ABILITY_DAMP] = @@ -47,6 +51,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Damp"), .description = COMPOUND_STRING("Prevents self-destruction."), .aiRating = 2, + .breakable = TRUE, }, [ABILITY_LIMBER] = @@ -54,6 +59,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Limber"), .description = COMPOUND_STRING("Prevents paralysis."), .aiRating = 3, + .breakable = TRUE, }, [ABILITY_SAND_VEIL] = @@ -61,6 +67,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Sand Veil"), .description = COMPOUND_STRING("Ups evasion in a sandstorm."), .aiRating = 3, + .breakable = TRUE, }, [ABILITY_STATIC] = @@ -75,6 +82,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Volt Absorb"), .description = COMPOUND_STRING("Turns electricity into HP."), .aiRating = 7, + .breakable = TRUE, }, [ABILITY_WATER_ABSORB] = @@ -82,6 +90,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Water Absorb"), .description = COMPOUND_STRING("Changes water into HP."), .aiRating = 7, + .breakable = TRUE, }, [ABILITY_OBLIVIOUS] = @@ -89,6 +98,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Oblivious"), .description = COMPOUND_STRING("Prevents attraction."), .aiRating = 2, + .breakable = TRUE, }, [ABILITY_CLOUD_NINE] = @@ -114,6 +124,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Insomnia"), .description = COMPOUND_STRING("Prevents sleep."), .aiRating = 4, + .breakable = TRUE, }, [ABILITY_COLOR_CHANGE] = @@ -128,6 +139,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Immunity"), .description = COMPOUND_STRING("Prevents poisoning."), .aiRating = 4, + .breakable = TRUE, }, [ABILITY_FLASH_FIRE] = @@ -135,6 +147,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Flash Fire"), .description = COMPOUND_STRING("Powers up if hit by fire."), .aiRating = 6, + .breakable = TRUE, }, [ABILITY_SHIELD_DUST] = @@ -142,6 +155,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Shield Dust"), .description = COMPOUND_STRING("Prevents added effects."), .aiRating = 5, + .breakable = TRUE, }, [ABILITY_OWN_TEMPO] = @@ -149,6 +163,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Own Tempo"), .description = COMPOUND_STRING("Prevents confusion."), .aiRating = 3, + .breakable = TRUE, }, [ABILITY_SUCTION_CUPS] = @@ -156,6 +171,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Suction Cups"), .description = COMPOUND_STRING("Firmly anchors the body."), .aiRating = 2, + .breakable = TRUE, }, [ABILITY_INTIMIDATE] = @@ -184,6 +200,9 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Wonder Guard"), .description = COMPOUND_STRING("“Supereffective” hits."), .aiRating = 10, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .breakable = TRUE, }, [ABILITY_LEVITATE] = @@ -191,6 +210,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Levitate"), .description = COMPOUND_STRING("Not hit by Ground attacks."), .aiRating = 7, + .breakable = TRUE, }, [ABILITY_EFFECT_SPORE] = @@ -212,6 +232,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Clear Body"), .description = COMPOUND_STRING("Prevents ability reduction."), .aiRating = 4, + .breakable = TRUE, }, [ABILITY_NATURAL_CURE] = @@ -230,6 +251,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Draws electrical moves."), .aiRating = 7, + .breakable = TRUE, }, [ABILITY_SERENE_GRACE] = @@ -258,6 +280,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Illuminate"), .description = COMPOUND_STRING("Encounter rate increases."), .aiRating = 0, + .breakable = TRUE, }, [ABILITY_TRACE] = @@ -265,6 +288,8 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Trace"), .description = COMPOUND_STRING("Copies special ability."), .aiRating = 6, + .cantBeCopied = TRUE, + .cantBeTraced = TRUE, }, [ABILITY_HUGE_POWER] = @@ -286,6 +311,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Inner Focus"), .description = COMPOUND_STRING("Prevents flinching."), .aiRating = 2, + .breakable = TRUE, }, [ABILITY_MAGMA_ARMOR] = @@ -293,6 +319,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Magma Armor"), .description = COMPOUND_STRING("Prevents freezing."), .aiRating = 1, + .breakable = TRUE, }, [ABILITY_WATER_VEIL] = @@ -300,6 +327,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Water Veil"), .description = COMPOUND_STRING("Prevents burns."), .aiRating = 4, + .breakable = TRUE, }, [ABILITY_MAGNET_PULL] = @@ -314,6 +342,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Soundproof"), .description = COMPOUND_STRING("Avoids sound-based moves."), .aiRating = 4, + .breakable = TRUE, }, [ABILITY_RAIN_DISH] = @@ -342,6 +371,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Thick Fat"), .description = COMPOUND_STRING("Heat-and-cold protection."), .aiRating = 7, + .breakable = TRUE, }, [ABILITY_EARLY_BIRD] = @@ -370,6 +400,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Keen Eye"), .description = COMPOUND_STRING("Prevents loss of accuracy."), .aiRating = 1, + .breakable = TRUE, }, [ABILITY_HYPER_CUTTER] = @@ -377,6 +408,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Hyper Cutter"), .description = COMPOUND_STRING("Prevents Attack reduction."), .aiRating = 3, + .breakable = TRUE, }, [ABILITY_PICKUP] = @@ -391,6 +423,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Truant"), .description = COMPOUND_STRING("Moves only every two turns."), .aiRating = -2, + .cantBeOverwritten = TRUE, }, [ABILITY_HUSTLE] = @@ -426,6 +459,8 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Forecast"), .description = COMPOUND_STRING("Changes with the weather."), .aiRating = 6, + .cantBeCopied = TRUE, + .cantBeTraced = TRUE, }, [ABILITY_STICKY_HOLD] = @@ -433,6 +468,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Sticky Hold"), .description = COMPOUND_STRING("Prevents item theft."), .aiRating = 3, + .breakable = TRUE, }, [ABILITY_SHED_SKIN] = @@ -454,6 +490,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Marvel Scale"), .description = COMPOUND_STRING("Ups Defense if suffering."), .aiRating = 5, + .breakable = TRUE, }, [ABILITY_LIQUID_OOZE] = @@ -517,6 +554,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Vital Spirit"), .description = COMPOUND_STRING("Prevents sleep."), .aiRating = 4, + .breakable = TRUE, }, [ABILITY_WHITE_SMOKE] = @@ -524,6 +562,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("White Smoke"), .description = COMPOUND_STRING("Prevents ability reduction."), .aiRating = 4, + .breakable = TRUE, }, [ABILITY_PURE_POWER] = @@ -538,6 +577,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Shell Armor"), .description = COMPOUND_STRING("Blocks critical hits."), .aiRating = 2, + .breakable = TRUE, }, [ABILITY_AIR_LOCK] = @@ -552,6 +592,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Tangled Feet"), .description = COMPOUND_STRING("Ups evasion if confused."), .aiRating = 2, + .breakable = TRUE, }, [ABILITY_MOTOR_DRIVE] = @@ -559,6 +600,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Motor Drive"), .description = COMPOUND_STRING("Electricity raises Speed."), .aiRating = 6, + .breakable = TRUE, }, [ABILITY_RIVALRY] = @@ -580,6 +622,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Snow Cloak"), .description = COMPOUND_STRING("Ups evasion in Hail or Snow."), .aiRating = 3, + .breakable = TRUE, }, [ABILITY_GLUTTONY] = @@ -608,6 +651,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Heatproof"), .description = COMPOUND_STRING("Heat and burn protection."), .aiRating = 5, + .breakable = TRUE, }, [ABILITY_SIMPLE] = @@ -615,6 +659,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Simple"), .description = COMPOUND_STRING("Prone to wild stat changes."), .aiRating = 8, + .breakable = TRUE, }, [ABILITY_DRY_SKIN] = @@ -622,6 +667,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Dry Skin"), .description = COMPOUND_STRING("Prefers moisture to heat."), .aiRating = 6, + .breakable = TRUE, }, [ABILITY_DOWNLOAD] = @@ -727,6 +773,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Leaf Guard"), .description = COMPOUND_STRING("Blocks status in sunshine."), .aiRating = 2, + .breakable = TRUE, }, [ABILITY_KLUTZ] = @@ -776,6 +823,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Unaware"), .description = COMPOUND_STRING("Ignores stat changes."), .aiRating = 6, + .breakable = TRUE, }, [ABILITY_TINTED_LENS] = @@ -790,6 +838,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Filter"), .description = COMPOUND_STRING("Weakens “supereffective”."), .aiRating = 6, + .breakable = TRUE, }, [ABILITY_SLOW_START] = @@ -811,6 +860,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Storm Drain"), .description = COMPOUND_STRING("Draws in Water moves."), .aiRating = 7, + .breakable = TRUE, }, [ABILITY_ICE_BODY] = @@ -825,6 +875,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Solid Rock"), .description = COMPOUND_STRING("Weakens “supereffective”."), .aiRating = 6, + .breakable = TRUE, }, [ABILITY_SNOW_WARNING] = @@ -860,6 +911,11 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Multitype"), .description = COMPOUND_STRING("Changes type to its Plate."), .aiRating = 8, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, }, [ABILITY_FLOWER_GIFT] = @@ -867,6 +923,9 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Flower Gift"), .description = COMPOUND_STRING("Allies power up in sunshine."), .aiRating = 4, + .cantBeCopied = TRUE, + .cantBeTraced = TRUE, + .breakable = TRUE, }, [ABILITY_BAD_DREAMS] = @@ -895,6 +954,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Contrary"), .description = COMPOUND_STRING("Inverts stat changes."), .aiRating = 8, + .breakable = TRUE, }, [ABILITY_UNNERVE] = @@ -937,6 +997,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Friend Guard"), .description = COMPOUND_STRING("Lowers damage to partner."), .aiRating = 0, + .breakable = TRUE, }, [ABILITY_WEAK_ARMOR] = @@ -951,6 +1012,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Heavy Metal"), .description = COMPOUND_STRING("Doubles weight."), .aiRating = -1, + .breakable = TRUE, }, [ABILITY_LIGHT_METAL] = @@ -958,6 +1020,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Light Metal"), .description = COMPOUND_STRING("Halves weight."), .aiRating = 2, + .breakable = TRUE, }, [ABILITY_MULTISCALE] = @@ -965,6 +1028,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Multiscale"), .description = COMPOUND_STRING("Halves damage at full HP."), .aiRating = 8, + .breakable = TRUE, }, [ABILITY_TOXIC_BOOST] = @@ -993,6 +1057,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Telepathy"), .description = COMPOUND_STRING("Can't be damaged by an ally."), .aiRating = 0, + .breakable = TRUE, }, [ABILITY_MOODY] = @@ -1007,6 +1072,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Overcoat"), .description = COMPOUND_STRING("Blocks weather and powder."), .aiRating = 5, + .breakable = TRUE, }, [ABILITY_POISON_TOUCH] = @@ -1028,6 +1094,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Big Pecks"), .description = COMPOUND_STRING("Prevents Defense loss."), .aiRating = 1, + .breakable = TRUE, }, [ABILITY_SAND_RUSH] = @@ -1042,6 +1109,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Wonder Skin"), .description = COMPOUND_STRING("May avoid status problems."), .aiRating = 4, + .breakable = TRUE, }, [ABILITY_ANALYTIC] = @@ -1056,6 +1124,9 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Illusion"), .description = COMPOUND_STRING("Appears as a partner."), .aiRating = 8, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, }, [ABILITY_IMPOSTER] = @@ -1063,6 +1134,8 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Imposter"), .description = COMPOUND_STRING("Transforms into the foe."), .aiRating = 9, + .cantBeCopied = TRUE, + .cantBeTraced = TRUE, }, [ABILITY_INFILTRATOR] = @@ -1105,6 +1178,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Magic Bounce"), .description = COMPOUND_STRING("Reflects status moves."), .aiRating = 9, + .breakable = TRUE, }, [ABILITY_SAP_SIPPER] = @@ -1112,6 +1186,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Sap Sipper"), .description = COMPOUND_STRING("Grass increases Attack."), .aiRating = 7, + .breakable = TRUE, }, [ABILITY_PRANKSTER] = @@ -1140,6 +1215,10 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Zen Mode"), .description = COMPOUND_STRING("Transforms at half HP."), .aiRating = -1, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = B_UPDATED_ABILITY_DATA >= GEN_7, }, [ABILITY_VICTORY_STAR] = @@ -1168,6 +1247,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Aroma Veil"), .description = COMPOUND_STRING("Prevents limiting of moves."), .aiRating = 3, + .breakable = TRUE, }, [ABILITY_FLOWER_VEIL] = @@ -1238,6 +1318,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Sweet Veil"), .description = COMPOUND_STRING("Prevents party from sleep."), .aiRating = 4, + .breakable = TRUE, }, [ABILITY_STANCE_CHANGE] = @@ -1249,6 +1330,11 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Transforms as it battles."), .aiRating = 10, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, }, [ABILITY_GALE_WINGS] = @@ -1274,6 +1360,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Grass Pelt"), .description = COMPOUND_STRING("Ups Defense in grass."), .aiRating = 2, + .breakable = TRUE, }, [ABILITY_SYMBIOSIS] = @@ -1420,6 +1507,11 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Shields Down"), .description = COMPOUND_STRING("Shell breaks at half HP."), .aiRating = 6, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, }, [ABILITY_STAKEOUT] = @@ -1497,6 +1589,11 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Schooling"), .description = COMPOUND_STRING("Forms a school when strong."), .aiRating = 6, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, }, [ABILITY_DISGUISE] = @@ -1504,6 +1601,12 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Disguise"), .description = COMPOUND_STRING("Decoy protects it once."), .aiRating = 8, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, + .failsOnImposter = TRUE, }, [ABILITY_BATTLE_BOND] = @@ -1511,6 +1614,11 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Battle Bond"), .description = COMPOUND_STRING("Changes form after a KO."), .aiRating = 6, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, }, [ABILITY_POWER_CONSTRUCT] = @@ -1522,6 +1630,11 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Cells aid it when weakened."), .aiRating = 10, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, }, [ABILITY_CORROSION] = @@ -1536,6 +1649,11 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Comatose"), .description = COMPOUND_STRING("Always drowsing."), .aiRating = 6, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, }, [ABILITY_QUEENLY_MAJESTY] = @@ -1547,6 +1665,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Protects from priority."), .aiRating = 6, + .breakable = TRUE, }, [ABILITY_INNARDS_OUT] = @@ -1575,6 +1694,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Fluffy"), .description = COMPOUND_STRING("Tougher but flammable."), .aiRating = 5, + .breakable = TRUE, }, [ABILITY_DAZZLING] = @@ -1582,6 +1702,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Dazzling"), .description = COMPOUND_STRING("Protects from priority."), .aiRating = 5, + .breakable = TRUE, }, [ABILITY_SOUL_HEART] = @@ -1607,6 +1728,8 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Receiver"), .description = COMPOUND_STRING("Copies ally's ability."), .aiRating = 0, + .cantBeCopied = TRUE, + .cantBeTraced = TRUE, }, [ABILITY_POWER_OF_ALCHEMY] = @@ -1618,6 +1741,8 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Copies ally's ability."), .aiRating = 0, + .cantBeCopied = TRUE, + .cantBeTraced = TRUE, }, [ABILITY_BEAST_BOOST] = @@ -1632,6 +1757,11 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("RKS System"), .description = COMPOUND_STRING("Memories change its type."), .aiRating = 8, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, }, [ABILITY_ELECTRIC_SURGE] = @@ -1764,6 +1894,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Mirror Armor"), .description = COMPOUND_STRING("Reflect stat decreases."), .aiRating = 6, + .breakable = TRUE, }, [ABILITY_GULP_MISSILE] = @@ -1771,6 +1902,9 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Gulp Missile"), .description = COMPOUND_STRING("If hit, spits prey from sea."), .aiRating = 3, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, + .failsOnImposter = TRUE, }, [ABILITY_STALWART] = @@ -1792,6 +1926,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Punk Rock"), .description = COMPOUND_STRING("Ups and resists sound."), .aiRating = 2, + .breakable = TRUE, }, [ABILITY_SAND_SPIT] = @@ -1806,6 +1941,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Ice Scales"), .description = COMPOUND_STRING("Halves special damage."), .aiRating = 7, + .breakable = TRUE, }, [ABILITY_RIPEN] = @@ -1820,6 +1956,13 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Ice Face"), .description = COMPOUND_STRING("Hail or Snow renew free hit."), .aiRating = 4, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, + .breakable = TRUE, + .failsOnImposter = TRUE, }, [ABILITY_POWER_SPOT] = @@ -1896,6 +2039,10 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("All Abilities are nullified."), .aiRating = 5, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .failsOnImposter = TRUE, }, [ABILITY_PASTEL_VEIL] = @@ -1903,6 +2050,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Pastel Veil"), .description = COMPOUND_STRING("Protects team from poison."), .aiRating = 4, + .breakable = TRUE, }, [ABILITY_HUNGER_SWITCH] = @@ -1914,6 +2062,10 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Changes form each turn."), .aiRating = 2, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .failsOnImposter = TRUE, }, [ABILITY_QUICK_DRAW] = @@ -1978,6 +2130,11 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("As One"), .description = COMPOUND_STRING("Unnerve and Chilling Neigh."), .aiRating = 10, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, }, [ABILITY_AS_ONE_SHADOW_RIDER] = @@ -1985,6 +2142,11 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("As One"), .description = COMPOUND_STRING("Unnerve and Grim Neigh."), .aiRating = 10, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, }, [ABILITY_LINGERING_AROMA] = @@ -2014,6 +2176,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Fire hits up Attack."), .aiRating = 4, + .breakable = TRUE, }, [ABILITY_ANGER_SHELL] = @@ -2032,6 +2195,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Protected by pure salts."), .aiRating = 6, + .breakable = TRUE, }, [ABILITY_WELL_BAKED_BODY] = @@ -2043,6 +2207,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Strengthened by Fire."), .aiRating = 5, + .breakable = TRUE, }, [ABILITY_WIND_RIDER] = @@ -2050,6 +2215,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Wind Rider"), .description = COMPOUND_STRING("Ups Attack if hit by wind."), .aiRating = 4, + .breakable = TRUE, }, [ABILITY_GUARD_DOG] = @@ -2057,6 +2223,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Guard Dog"), .description = COMPOUND_STRING("Cannot be intimidated."), .aiRating = 5, + .breakable = TRUE, }, [ABILITY_ROCKY_PAYLOAD] = @@ -2082,6 +2249,12 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Zero to Hero"), .description = COMPOUND_STRING("Changes form on switch out."), .aiRating = 10, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, + .failsOnImposter = TRUE, }, [ABILITY_COMMANDER] = @@ -2089,6 +2262,9 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Commander"), .description = COMPOUND_STRING("Commands from Dondozo."), .aiRating = 10, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, }, [ABILITY_ELECTROMORPHOSIS] = @@ -2111,6 +2287,10 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Sun boosts best stat."), .aiRating = 7, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .failsOnImposter = TRUE, }, [ABILITY_QUARK_DRIVE] = @@ -2118,6 +2298,10 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Quark Drive"), .description = COMPOUND_STRING("Elec. field ups best stat."), .aiRating = 7, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .failsOnImposter = TRUE, }, [ABILITY_GOOD_AS_GOLD] = @@ -2125,6 +2309,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Good as Gold"), .description = COMPOUND_STRING("Avoids status problems."), .aiRating = 8, + .breakable = TRUE, }, [ABILITY_VESSEL_OF_RUIN] = @@ -2136,6 +2321,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Lowers foes' sp. damage."), .aiRating = 5, + .breakable = TRUE, }, [ABILITY_SWORD_OF_RUIN] = @@ -2147,6 +2333,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Lowers foes' Defense."), .aiRating = 5, + .breakable = TRUE, }, [ABILITY_TABLETS_OF_RUIN] = @@ -2158,6 +2345,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Lowers foes' damage."), .aiRating = 5, + .breakable = TRUE, }, [ABILITY_BEADS_OF_RUIN] = @@ -2169,6 +2357,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Lowers foes' Sp. Defense."), .aiRating = 5, + .breakable = TRUE, }, [ABILITY_ORICHALCUM_PULSE] = @@ -2244,6 +2433,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Armor Tail"), .description = COMPOUND_STRING("Protects from priority."), .aiRating = 5, + .breakable = TRUE, }, [ABILITY_EARTH_EATER] = @@ -2251,6 +2441,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Earth Eater"), .description = COMPOUND_STRING("Eats ground to heal HP."), .aiRating = 7, + .breakable = TRUE, }, [ABILITY_MYCELIUM_MIGHT] = @@ -2276,6 +2467,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Mind's Eye"), .description = COMPOUND_STRING("Keen Eye and Scrappy."), .aiRating = 8, + .breakable = TRUE, }, [ABILITY_EMBODY_ASPECT_TEAL] = @@ -2287,6 +2479,10 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Raises Speed."), .aiRating = 6, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .failsOnImposter = TRUE, }, [ABILITY_EMBODY_ASPECT_HEARTHFLAME] = @@ -2298,6 +2494,10 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Raises Attack."), .aiRating = 6, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .failsOnImposter = TRUE, }, [ABILITY_EMBODY_ASPECT_WELLSPRING] = @@ -2309,6 +2509,10 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Raises Sp. Def."), .aiRating = 6, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .failsOnImposter = TRUE, }, [ABILITY_EMBODY_ASPECT_CORNERSTONE] = @@ -2320,6 +2524,10 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Raises Defense."), .aiRating = 6, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .failsOnImposter = TRUE, }, [ABILITY_TOXIC_CHAIN] = @@ -2345,6 +2553,12 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Tera Shift"), .description = COMPOUND_STRING("Terasteralizes upon entry."), .aiRating = 10, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .cantBeSuppressed = TRUE, + .cantBeOverwritten = TRUE, + .failsOnImposter = TRUE, }, [ABILITY_TERA_SHELL] = @@ -2352,6 +2566,10 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Tera Shell"), .description = COMPOUND_STRING("Resistant to types at full HP."), .aiRating = 10, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, + .breakable = TRUE, }, [ABILITY_TERAFORM_ZERO] = @@ -2363,6 +2581,9 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Removes weather and terrain."), .aiRating = 10, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, }, [ABILITY_POISON_PUPPETEER] = @@ -2374,5 +2595,8 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #endif .description = COMPOUND_STRING("Confuses poisoned foes."), .aiRating = 8, + .cantBeCopied = TRUE, + .cantBeSwapped = TRUE, + .cantBeTraced = TRUE, }, }; diff --git a/test/battle/move_effect/doodle.c b/test/battle/move_effect/doodle.c index 8a7144b430..23671b3846 100644 --- a/test/battle/move_effect/doodle.c +++ b/test/battle/move_effect/doodle.c @@ -49,7 +49,7 @@ DOUBLE_BATTLE_TEST("Doodle can't copy a banned ability") DOUBLE_BATTLE_TEST("Doodle fails if user has a banned Ability") { GIVEN { - PLAYER(SPECIES_GREAT_TUSK) { Ability(ABILITY_PROTOSYNTHESIS); } + PLAYER(SPECIES_CRAMORANT) { Ability(ABILITY_GULP_MISSILE); } PLAYER(SPECIES_WYNAUT) { Ability(ABILITY_SHADOW_TAG); } OPPONENT(SPECIES_TORCHIC) { Ability(ABILITY_BLAZE); } OPPONENT(SPECIES_WOBBUFFET); @@ -59,7 +59,7 @@ DOUBLE_BATTLE_TEST("Doodle fails if user has a banned Ability") ANIMATION(ANIM_TYPE_MOVE, MOVE_DOODLE, playerLeft); MESSAGE("But it failed!"); } THEN { - EXPECT(playerLeft->ability == ABILITY_PROTOSYNTHESIS); + EXPECT(playerLeft->ability == ABILITY_GULP_MISSILE); EXPECT(playerRight->ability == ABILITY_SHADOW_TAG); } } @@ -68,7 +68,7 @@ DOUBLE_BATTLE_TEST("Doodle fails if partner has a banned Ability") { GIVEN { PLAYER(SPECIES_WYNAUT) { Ability(ABILITY_SHADOW_TAG); } - PLAYER(SPECIES_GREAT_TUSK) { Ability(ABILITY_PROTOSYNTHESIS); } + PLAYER(SPECIES_CRAMORANT) { Ability(ABILITY_GULP_MISSILE); } OPPONENT(SPECIES_TORCHIC) { Ability(ABILITY_BLAZE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -78,6 +78,6 @@ DOUBLE_BATTLE_TEST("Doodle fails if partner has a banned Ability") MESSAGE("But it failed!"); } THEN { EXPECT(playerLeft->ability == ABILITY_SHADOW_TAG); - EXPECT(playerRight->ability == ABILITY_PROTOSYNTHESIS); + EXPECT(playerRight->ability == ABILITY_GULP_MISSILE); } } From 7aaefe72fb4938ea12b5f7797fefe7356f571daa Mon Sep 17 00:00:00 2001 From: Nephrite Date: Mon, 1 Jan 2024 18:58:29 +0000 Subject: [PATCH 47/82] Receiver/Power of Alchemy (#3889) --- src/battle_script_commands.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6cc177769f..ab9a544c34 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -9210,28 +9210,14 @@ static void Cmd_various(void) i = GetBattlerAbility(gBattlerAbility); if (IsBattlerAlive(gBattlerAbility) && (i == ABILITY_RECEIVER || i == ABILITY_POWER_OF_ALCHEMY) - && GetBattlerHoldEffect(battler, TRUE) != HOLD_EFFECT_ABILITY_SHIELD) + && GetBattlerHoldEffect(battler, TRUE) != HOLD_EFFECT_ABILITY_SHIELD + && !gAbilities[gBattleMons[battler].ability].cantBeCopied) { - switch (gBattleMons[battler].ability) - { // Can't copy these abilities. - case ABILITY_POWER_OF_ALCHEMY: case ABILITY_RECEIVER: - case ABILITY_FORECAST: case ABILITY_MULTITYPE: - case ABILITY_FLOWER_GIFT: case ABILITY_ILLUSION: - case ABILITY_WONDER_GUARD: case ABILITY_ZEN_MODE: - case ABILITY_STANCE_CHANGE: case ABILITY_IMPOSTER: - case ABILITY_POWER_CONSTRUCT: case ABILITY_BATTLE_BOND: - case ABILITY_SCHOOLING: case ABILITY_COMATOSE: - case ABILITY_SHIELDS_DOWN: case ABILITY_DISGUISE: - case ABILITY_RKS_SYSTEM: case ABILITY_TRACE: - case ABILITY_ZERO_TO_HERO: - break; - default: - gBattleStruct->tracedAbility[gBattlerAbility] = gBattleMons[battler].ability; // re-using the variable for trace - gBattleScripting.battler = battler; - BattleScriptPush(cmd->nextInstr); - gBattlescriptCurrInstr = BattleScript_ReceiverActivates; - return; - } + gBattleStruct->tracedAbility[gBattlerAbility] = gBattleMons[battler].ability; // re-using the variable for trace + gBattleScripting.battler = battler; + BattleScriptPush(cmd->nextInstr); + gBattlescriptCurrInstr = BattleScript_ReceiverActivates; + return; } break; } From 58a93a544f9dad80e9170513ce96473c36ab18a6 Mon Sep 17 00:00:00 2001 From: lordraindance2 <47706100+lordraindance2@users.noreply.github.com> Date: Tue, 2 Jan 2024 03:44:15 -0500 Subject: [PATCH 48/82] Refactored SetMoveEffect Inner Focus Case (#3885) * Rollbacked SetMoveEffect Inner Focus logic Co-authored-by: poetahto * Refactored else if --------- Co-authored-by: poetahto --- src/battle_script_commands.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index fdf3da1912..b9ff7f63c8 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3128,20 +3128,25 @@ void SetMoveEffect(bool32 primary, u32 certain) } break; case MOVE_EFFECT_FLINCH: - if (battlerAbility == ABILITY_INNER_FOCUS - && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)) + if (battlerAbility == ABILITY_INNER_FOCUS) { - gLastUsedAbility = ABILITY_INNER_FOCUS; - gBattlerAbility = gEffectBattler; - RecordAbilityBattle(gEffectBattler, ABILITY_INNER_FOCUS); - gBattlescriptCurrInstr = BattleScript_FlinchPrevention; + if (primary == TRUE || certain == MOVE_EFFECT_CERTAIN) + { + gLastUsedAbility = ABILITY_INNER_FOCUS; + gBattlerAbility = gEffectBattler; + RecordAbilityBattle(gEffectBattler, ABILITY_INNER_FOCUS); + gBattlescriptCurrInstr = BattleScript_FlinchPrevention; + } else + { + gBattlescriptCurrInstr++; + } } else if (GetBattlerTurnOrderNum(gEffectBattler) > gCurrentTurnActionNumber - && !IsDynamaxed(gEffectBattler)) + && !IsDynamaxed(gEffectBattler)) { - gBattleMons[gEffectBattler].status2 |= sStatusFlagsForMoveEffects[gBattleScripting.moveEffect]; + gBattleMons[gEffectBattler].status2 |= sStatusFlagsForMoveEffects[gBattleScripting.moveEffect]; + gBattlescriptCurrInstr++; } - gBattlescriptCurrInstr++; break; case MOVE_EFFECT_UPROAR: if (!(gBattleMons[gEffectBattler].status2 & STATUS2_UPROAR)) From d3b29406a57a45bf90beb0759b258dd244e6062e Mon Sep 17 00:00:00 2001 From: Frank DeBlasio <35279583+fdeblasio@users.noreply.github.com> Date: Tue, 2 Jan 2024 04:05:31 -0500 Subject: [PATCH 49/82] Fixed Collision Course and Electro Drift PP (#3890) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/data/battle_moves.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 3675234b8e..d33469a9fa 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -13967,7 +13967,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .power = 100, .type = TYPE_FIGHTING, .accuracy = 100, - .pp = 10, + .pp = 5, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -13983,7 +13983,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .power = 100, .type = TYPE_ELECTRIC, .accuracy = 100, - .pp = 10, + .pp = 5, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, From f24deb930131819e5ff3be401742b41162e4829a Mon Sep 17 00:00:00 2001 From: aronson Date: Tue, 2 Jan 2024 07:46:01 -0600 Subject: [PATCH 50/82] Allocate initialized sections for EWRAM and IWRAM (#3877) --- Makefile | 2 +- include/crt0.h | 2 ++ include/gba/defines.h | 6 +++-- ld_script.ld | 38 ++++++++++++++++++++++++--- ld_script_modern.ld | 44 ++++++++++++++++++++++++++----- ld_script_test.ld | 41 +++++++++++++++++++++++++---- src/crt0.s | 61 +++++++++++++++++++++++++++++++++++++++++-- src/main.c | 5 ---- src/reload_save.c | 2 ++ 9 files changed, 175 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index d899015225..ea7adb0e66 100644 --- a/Makefile +++ b/Makefile @@ -473,7 +473,7 @@ endif $(OBJ_DIR)/ld_script.ld: $(LD_SCRIPT) $(LD_SCRIPT_DEPS) cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT) > ld_script.ld -LDFLAGS = -Map ../../$(MAP) +LDFLAGS = -Map ../../$(MAP) --no-warn-rwx-segments $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) libagbsyscall @echo "cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ " @cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld --print-memory-usage -o ../../$@ $(OBJS_REL) $(LIB) | cat diff --git a/include/crt0.h b/include/crt0.h index a4a5c7f79b..c60ed3b0b7 100644 --- a/include/crt0.h +++ b/include/crt0.h @@ -3,4 +3,6 @@ extern u32 IntrMain[]; +extern void ReInitializeEWRAM(); + #endif //GUARD_CRT0_H diff --git a/include/gba/defines.h b/include/gba/defines.h index 0601f1b47e..6366355875 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -6,8 +6,10 @@ #define TRUE 1 #define FALSE 0 -#define IWRAM_DATA __attribute__((section("iwram_data"))) -#define EWRAM_DATA __attribute__((section("ewram_data"))) +#define IWRAM_DATA __attribute__((section(".bss"))) +#define EWRAM_DATA __attribute__((section(".sbss"))) +#define IWRAM_INIT __attribute__((section(".iwram"))) +#define EWRAM_INIT __attribute__((section(".ewram"))) #define UNUSED __attribute__((unused)) #if MODERN diff --git a/ld_script.ld b/ld_script.ld index 642480d35d..e9cbae8957 100644 --- a/ld_script.ld +++ b/ld_script.ld @@ -13,19 +13,35 @@ MEMORY SECTIONS { - ewram 0x2000000 (NOLOAD) : + .ewram ORIGIN(EWRAM) : AT (__ewram_lma) + ALIGN(4) + { + __ewram_start = .; + *(.ewram*) + __ewram_end = .; + } > EWRAM + + .ewram.sbss (NOLOAD) : ALIGN(4) { INCLUDE "sym_ewram.ld" - src/*.o(ewram_data); - gflib/*.o(ewram_data); + src/*.o(.sbss); + gflib/*.o(.sbss); *libc.a:impure.o(.data); *libc.a:locale.o(.data); *libc.a:mallocr.o(.data); } > EWRAM - iwram 0x3000000 (NOLOAD) : + .iwram ORIGIN(IWRAM) : AT (__iwram_lma) + ALIGN(4) + { + __iwram_start = .; + *(.iwram*); + __iwram_end = .; + } > IWRAM + + .iwram.bss (NOLOAD) : ALIGN(4) { /* .bss starts at 0x3000000 */ @@ -1324,6 +1340,20 @@ SECTIONS { data/*.o(.rodata); } > ROM = 0 + .data.iwram : + ALIGN(4) + { + __iwram_lma = .; + . = . + (__iwram_end - __iwram_start); + } > ROM = 0 + + .data.ewram : + ALIGN(4) + { + __ewram_lma = .; + . = . + (__ewram_end - __ewram_start); + } > ROM = 0 + __rom_end = .; /* DWARF debug sections. diff --git a/ld_script_modern.ld b/ld_script_modern.ld index f3bf7b6798..fd35a1ca31 100644 --- a/ld_script_modern.ld +++ b/ld_script_modern.ld @@ -12,15 +12,32 @@ MEMORY } SECTIONS { - ewram 0x2000000 (NOLOAD) : + + + .ewram ORIGIN(EWRAM) : AT (__ewram_lma) ALIGN(4) { - src/*.o(ewram_data); - gflib/*.o(ewram_data); - + __ewram_start = .; + *(.ewram*) + __ewram_end = .; } > EWRAM - iwram 0x3000000 (NOLOAD) : + .ewram.sbss (NOLOAD) : + ALIGN(4) + { + src/*.o(.sbss); + gflib/*.o(.sbss); + } > EWRAM + + .iwram ORIGIN(IWRAM) : AT (__iwram_lma) + ALIGN(4) + { + __iwram_start = .; + *(.iwram*); + __iwram_end = .; + } > IWRAM + + .iwram.bss (NOLOAD) : ALIGN(4) { src/*.o(.bss); @@ -38,9 +55,8 @@ SECTIONS { } > IWRAM /* BEGIN ROM DATA */ - . = 0x8000000; - .text : + .text ORIGIN(ROM) : ALIGN(4) { src/rom_header.o(.text*); @@ -125,6 +141,20 @@ SECTIONS { src/graphics.o(.rodata); } > ROM =0 + .data.iwram : + ALIGN(4) + { + __iwram_lma = .; + . = . + (__iwram_end - __iwram_start); + } > ROM = 0 + + .data.ewram : + ALIGN(4) + { + __ewram_lma = .; + . = . + (__ewram_end - __ewram_start); + } > ROM = 0 + __rom_end = .; /* DWARF debug sections. diff --git a/ld_script_test.ld b/ld_script_test.ld index 49a0ec35b0..ec99609a7e 100644 --- a/ld_script_test.ld +++ b/ld_script_test.ld @@ -12,15 +12,32 @@ MEMORY } SECTIONS { - ewram 0x2000000 (NOLOAD) : + + .ewram ORIGIN(EWRAM) : AT (__ewram_lma) ALIGN(4) { - src/*.o(ewram_data); - gflib/*.o(ewram_data); - test/*.o(ewram_data); + __ewram_start = .; + *(.ewram*) + __ewram_end = .; } > EWRAM - iwram 0x3000000 (NOLOAD) : + .ewram.sbss (NOLOAD) : + ALIGN(4) + { + src/*.o(.sbss); + gflib/*.o(.sbss); + test/*.o(.sbss); + } > EWRAM + + .iwram ORIGIN(IWRAM) : AT (__iwram_lma) + ALIGN(4) + { + __iwram_start = .; + *(.iwram*); + __iwram_end = .; + } > IWRAM + + .iwram.sbss (NOLOAD) : ALIGN(4) { src/*.o(.bss); @@ -97,6 +114,20 @@ SECTIONS { src/libisagbprn.o(.rodata); } > ROM =0 + .data.iwram : + ALIGN(4) + { + __iwram_lma = .; + . = . + (__iwram_end - __iwram_start); + } > ROM = 0 + + .data.ewram : + ALIGN(4) + { + __ewram_lma = .; + . = . + (__ewram_end - __ewram_start); + } > ROM = 0 + tests : ALIGN(4) { diff --git a/src/crt0.s b/src/crt0.s index 5808147220..af6ea0bc95 100644 --- a/src/crt0.s +++ b/src/crt0.s @@ -6,22 +6,28 @@ .align 2, 0 Init:: +@ Set up location for IRQ stack mov r0, #PSR_IRQ_MODE msr cpsr_cf, r0 ldr sp, sp_irq +@ Set up location for system stack mov r0, #PSR_SYS_MODE msr cpsr_cf, r0 ldr sp, sp_sys +@ Prepare for interrupt handling ldr r1, =INTR_VECTOR adr r0, IntrMain str r0, [r1] - .if MODERN +@ Dispatch memory reset request to hardware mov r0, #255 @ RESET_ALL svc #1 << 16 - .endif @ MODERN +@ Fill RAM areas with appropriate data + bl InitializeWorkingMemory +@ Jump to AgbMain ldr r1, =AgbMain + 1 mov lr, pc bx r1 +@ Re-init if AgbMain exits b Init .align 2, 0 @@ -124,3 +130,54 @@ IntrMain_RetAddr: .pool .align 2, 0 @ Don't pad with nop. + +@ Fills initialized IWRAM and EWRAM sections in RAM from LMA areas in ROM +InitializeWorkingMemory: + push {r0-r3,lr} + ldr r0, =__iwram_lma + ldr r1, =__iwram_start + ldr r2, =__iwram_end + cmp r1, r2 + beq skip_iwram_copy + bl CopyMemory_DMA +skip_iwram_copy: + ldr r0, =__ewram_lma + ldr r1, =__ewram_start + ldr r2, =__ewram_end + cmp r1, r2 + beq skip_ewram_copy + bl CopyMemory_DMA +skip_ewram_copy: + pop {r0-r3,lr} + bx lr + +@ Uses a DMA transfer to load from r0 into r1 until r2 +CopyMemory_DMA: + subs r2, r2, r1 + lsr r2, r2, #2 + mov r4, #0x80000000 + orr r4, r4, #(1 << 26) + orr r2, r2, r4 + ldr r3, =REG_DMA3 + stmia r3, {r0, r1, r2} + bx lr + +.thumb +@ Called from C code to reinitialize working memory after a link connection failure +ReInitializeEWRAM:: + ldr r0, =__ewram_lma + ldr r1, =__ewram_start + ldr r2, =__ewram_end + cmp r1, r2 + beq EndReinitializeEWRAM + subs r2, r1 + movs r3, #1 + lsls r3, r3, #26 + orrs r2, r2, r3 + swi 0x0B +EndReinitializeEWRAM: + bx lr + + .pool + + .align 2, 0 @ Don't pad with nop. diff --git a/src/main.c b/src/main.c index 1f2b712750..1d23daa3e3 100644 --- a/src/main.c +++ b/src/main.c @@ -93,11 +93,6 @@ void EnableVCountIntrAtLine150(void); void AgbMain() { - // Modern compilers are liberal with the stack on entry to this function, - // so RegisterRamReset may crash if it resets IWRAM. -#if !MODERN - RegisterRamReset(RESET_ALL); -#endif //MODERN *(vu16 *)BG_PLTT = RGB_WHITE; // Set the backdrop to white on startup InitGpuRegManager(); REG_WAITCNT = WAITCNT_PREFETCH_ENABLE | WAITCNT_WS0_S_1 | WAITCNT_WS0_N_3; diff --git a/src/reload_save.c b/src/reload_save.c index 5425d1c7c4..f6104c1db7 100644 --- a/src/reload_save.c +++ b/src/reload_save.c @@ -1,5 +1,6 @@ #include "global.h" #include "main.h" +#include "crt0.h" #include "gpu_regs.h" #include "m4a.h" #include "load_save.h" @@ -15,6 +16,7 @@ void ReloadSave(void) u16 imeBackup = REG_IME; REG_IME = 0; RegisterRamReset(RESET_EWRAM); + ReInitializeEWRAM(); ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_FORCED_BLANK); REG_IME = imeBackup; gMain.inBattle = FALSE; From d1ab5255529ecdf7cb374a0d56dafe58944feea7 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Tue, 2 Jan 2024 13:54:42 +0000 Subject: [PATCH 51/82] Revert "Allocate initialized sections for EWRAM and IWRAM (#3877)" (#3891) This reverts commit f24deb930131819e5ff3be401742b41162e4829a. --- Makefile | 2 +- include/crt0.h | 2 -- include/gba/defines.h | 6 ++--- ld_script.ld | 38 +++------------------------ ld_script_modern.ld | 44 +++++-------------------------- ld_script_test.ld | 41 ++++------------------------- src/crt0.s | 61 ++----------------------------------------- src/main.c | 5 ++++ src/reload_save.c | 2 -- 9 files changed, 26 insertions(+), 175 deletions(-) diff --git a/Makefile b/Makefile index ea7adb0e66..d899015225 100644 --- a/Makefile +++ b/Makefile @@ -473,7 +473,7 @@ endif $(OBJ_DIR)/ld_script.ld: $(LD_SCRIPT) $(LD_SCRIPT_DEPS) cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT) > ld_script.ld -LDFLAGS = -Map ../../$(MAP) --no-warn-rwx-segments +LDFLAGS = -Map ../../$(MAP) $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) libagbsyscall @echo "cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ " @cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld --print-memory-usage -o ../../$@ $(OBJS_REL) $(LIB) | cat diff --git a/include/crt0.h b/include/crt0.h index c60ed3b0b7..a4a5c7f79b 100644 --- a/include/crt0.h +++ b/include/crt0.h @@ -3,6 +3,4 @@ extern u32 IntrMain[]; -extern void ReInitializeEWRAM(); - #endif //GUARD_CRT0_H diff --git a/include/gba/defines.h b/include/gba/defines.h index 6366355875..0601f1b47e 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -6,10 +6,8 @@ #define TRUE 1 #define FALSE 0 -#define IWRAM_DATA __attribute__((section(".bss"))) -#define EWRAM_DATA __attribute__((section(".sbss"))) -#define IWRAM_INIT __attribute__((section(".iwram"))) -#define EWRAM_INIT __attribute__((section(".ewram"))) +#define IWRAM_DATA __attribute__((section("iwram_data"))) +#define EWRAM_DATA __attribute__((section("ewram_data"))) #define UNUSED __attribute__((unused)) #if MODERN diff --git a/ld_script.ld b/ld_script.ld index e9cbae8957..642480d35d 100644 --- a/ld_script.ld +++ b/ld_script.ld @@ -13,35 +13,19 @@ MEMORY SECTIONS { - .ewram ORIGIN(EWRAM) : AT (__ewram_lma) - ALIGN(4) - { - __ewram_start = .; - *(.ewram*) - __ewram_end = .; - } > EWRAM - - .ewram.sbss (NOLOAD) : + ewram 0x2000000 (NOLOAD) : ALIGN(4) { INCLUDE "sym_ewram.ld" - src/*.o(.sbss); - gflib/*.o(.sbss); + src/*.o(ewram_data); + gflib/*.o(ewram_data); *libc.a:impure.o(.data); *libc.a:locale.o(.data); *libc.a:mallocr.o(.data); } > EWRAM - .iwram ORIGIN(IWRAM) : AT (__iwram_lma) - ALIGN(4) - { - __iwram_start = .; - *(.iwram*); - __iwram_end = .; - } > IWRAM - - .iwram.bss (NOLOAD) : + iwram 0x3000000 (NOLOAD) : ALIGN(4) { /* .bss starts at 0x3000000 */ @@ -1340,20 +1324,6 @@ SECTIONS { data/*.o(.rodata); } > ROM = 0 - .data.iwram : - ALIGN(4) - { - __iwram_lma = .; - . = . + (__iwram_end - __iwram_start); - } > ROM = 0 - - .data.ewram : - ALIGN(4) - { - __ewram_lma = .; - . = . + (__ewram_end - __ewram_start); - } > ROM = 0 - __rom_end = .; /* DWARF debug sections. diff --git a/ld_script_modern.ld b/ld_script_modern.ld index fd35a1ca31..f3bf7b6798 100644 --- a/ld_script_modern.ld +++ b/ld_script_modern.ld @@ -12,32 +12,15 @@ MEMORY } SECTIONS { - - - .ewram ORIGIN(EWRAM) : AT (__ewram_lma) + ewram 0x2000000 (NOLOAD) : ALIGN(4) { - __ewram_start = .; - *(.ewram*) - __ewram_end = .; + src/*.o(ewram_data); + gflib/*.o(ewram_data); + } > EWRAM - .ewram.sbss (NOLOAD) : - ALIGN(4) - { - src/*.o(.sbss); - gflib/*.o(.sbss); - } > EWRAM - - .iwram ORIGIN(IWRAM) : AT (__iwram_lma) - ALIGN(4) - { - __iwram_start = .; - *(.iwram*); - __iwram_end = .; - } > IWRAM - - .iwram.bss (NOLOAD) : + iwram 0x3000000 (NOLOAD) : ALIGN(4) { src/*.o(.bss); @@ -55,8 +38,9 @@ SECTIONS { } > IWRAM /* BEGIN ROM DATA */ + . = 0x8000000; - .text ORIGIN(ROM) : + .text : ALIGN(4) { src/rom_header.o(.text*); @@ -141,20 +125,6 @@ SECTIONS { src/graphics.o(.rodata); } > ROM =0 - .data.iwram : - ALIGN(4) - { - __iwram_lma = .; - . = . + (__iwram_end - __iwram_start); - } > ROM = 0 - - .data.ewram : - ALIGN(4) - { - __ewram_lma = .; - . = . + (__ewram_end - __ewram_start); - } > ROM = 0 - __rom_end = .; /* DWARF debug sections. diff --git a/ld_script_test.ld b/ld_script_test.ld index ec99609a7e..49a0ec35b0 100644 --- a/ld_script_test.ld +++ b/ld_script_test.ld @@ -12,32 +12,15 @@ MEMORY } SECTIONS { - - .ewram ORIGIN(EWRAM) : AT (__ewram_lma) + ewram 0x2000000 (NOLOAD) : ALIGN(4) { - __ewram_start = .; - *(.ewram*) - __ewram_end = .; + src/*.o(ewram_data); + gflib/*.o(ewram_data); + test/*.o(ewram_data); } > EWRAM - .ewram.sbss (NOLOAD) : - ALIGN(4) - { - src/*.o(.sbss); - gflib/*.o(.sbss); - test/*.o(.sbss); - } > EWRAM - - .iwram ORIGIN(IWRAM) : AT (__iwram_lma) - ALIGN(4) - { - __iwram_start = .; - *(.iwram*); - __iwram_end = .; - } > IWRAM - - .iwram.sbss (NOLOAD) : + iwram 0x3000000 (NOLOAD) : ALIGN(4) { src/*.o(.bss); @@ -114,20 +97,6 @@ SECTIONS { src/libisagbprn.o(.rodata); } > ROM =0 - .data.iwram : - ALIGN(4) - { - __iwram_lma = .; - . = . + (__iwram_end - __iwram_start); - } > ROM = 0 - - .data.ewram : - ALIGN(4) - { - __ewram_lma = .; - . = . + (__ewram_end - __ewram_start); - } > ROM = 0 - tests : ALIGN(4) { diff --git a/src/crt0.s b/src/crt0.s index af6ea0bc95..5808147220 100644 --- a/src/crt0.s +++ b/src/crt0.s @@ -6,28 +6,22 @@ .align 2, 0 Init:: -@ Set up location for IRQ stack mov r0, #PSR_IRQ_MODE msr cpsr_cf, r0 ldr sp, sp_irq -@ Set up location for system stack mov r0, #PSR_SYS_MODE msr cpsr_cf, r0 ldr sp, sp_sys -@ Prepare for interrupt handling ldr r1, =INTR_VECTOR adr r0, IntrMain str r0, [r1] -@ Dispatch memory reset request to hardware + .if MODERN mov r0, #255 @ RESET_ALL svc #1 << 16 -@ Fill RAM areas with appropriate data - bl InitializeWorkingMemory -@ Jump to AgbMain + .endif @ MODERN ldr r1, =AgbMain + 1 mov lr, pc bx r1 -@ Re-init if AgbMain exits b Init .align 2, 0 @@ -130,54 +124,3 @@ IntrMain_RetAddr: .pool .align 2, 0 @ Don't pad with nop. - -@ Fills initialized IWRAM and EWRAM sections in RAM from LMA areas in ROM -InitializeWorkingMemory: - push {r0-r3,lr} - ldr r0, =__iwram_lma - ldr r1, =__iwram_start - ldr r2, =__iwram_end - cmp r1, r2 - beq skip_iwram_copy - bl CopyMemory_DMA -skip_iwram_copy: - ldr r0, =__ewram_lma - ldr r1, =__ewram_start - ldr r2, =__ewram_end - cmp r1, r2 - beq skip_ewram_copy - bl CopyMemory_DMA -skip_ewram_copy: - pop {r0-r3,lr} - bx lr - -@ Uses a DMA transfer to load from r0 into r1 until r2 -CopyMemory_DMA: - subs r2, r2, r1 - lsr r2, r2, #2 - mov r4, #0x80000000 - orr r4, r4, #(1 << 26) - orr r2, r2, r4 - ldr r3, =REG_DMA3 - stmia r3, {r0, r1, r2} - bx lr - -.thumb -@ Called from C code to reinitialize working memory after a link connection failure -ReInitializeEWRAM:: - ldr r0, =__ewram_lma - ldr r1, =__ewram_start - ldr r2, =__ewram_end - cmp r1, r2 - beq EndReinitializeEWRAM - subs r2, r1 - movs r3, #1 - lsls r3, r3, #26 - orrs r2, r2, r3 - swi 0x0B -EndReinitializeEWRAM: - bx lr - - .pool - - .align 2, 0 @ Don't pad with nop. diff --git a/src/main.c b/src/main.c index 1d23daa3e3..1f2b712750 100644 --- a/src/main.c +++ b/src/main.c @@ -93,6 +93,11 @@ void EnableVCountIntrAtLine150(void); void AgbMain() { + // Modern compilers are liberal with the stack on entry to this function, + // so RegisterRamReset may crash if it resets IWRAM. +#if !MODERN + RegisterRamReset(RESET_ALL); +#endif //MODERN *(vu16 *)BG_PLTT = RGB_WHITE; // Set the backdrop to white on startup InitGpuRegManager(); REG_WAITCNT = WAITCNT_PREFETCH_ENABLE | WAITCNT_WS0_S_1 | WAITCNT_WS0_N_3; diff --git a/src/reload_save.c b/src/reload_save.c index f6104c1db7..5425d1c7c4 100644 --- a/src/reload_save.c +++ b/src/reload_save.c @@ -1,6 +1,5 @@ #include "global.h" #include "main.h" -#include "crt0.h" #include "gpu_regs.h" #include "m4a.h" #include "load_save.h" @@ -16,7 +15,6 @@ void ReloadSave(void) u16 imeBackup = REG_IME; REG_IME = 0; RegisterRamReset(RESET_EWRAM); - ReInitializeEWRAM(); ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_FORCED_BLANK); REG_IME = imeBackup; gMain.inBattle = FALSE; From 3c21e23555195f5f8643eb95578aae30c885a06f Mon Sep 17 00:00:00 2001 From: aronson Date: Tue, 2 Jan 2024 08:24:52 -0600 Subject: [PATCH 52/82] Allocate initialized sections for EWRAM and IWRAM (#3892) --- Makefile | 2 +- include/crt0.h | 2 ++ include/gba/defines.h | 6 +++-- ld_script.ld | 38 ++++++++++++++++++++++++--- ld_script_modern.ld | 44 ++++++++++++++++++++++++++----- ld_script_test.ld | 41 +++++++++++++++++++++++++---- src/crt0.s | 61 +++++++++++++++++++++++++++++++++++++++++-- src/main.c | 5 ---- src/reload_save.c | 2 ++ 9 files changed, 175 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index d899015225..ea7adb0e66 100644 --- a/Makefile +++ b/Makefile @@ -473,7 +473,7 @@ endif $(OBJ_DIR)/ld_script.ld: $(LD_SCRIPT) $(LD_SCRIPT_DEPS) cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT) > ld_script.ld -LDFLAGS = -Map ../../$(MAP) +LDFLAGS = -Map ../../$(MAP) --no-warn-rwx-segments $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) libagbsyscall @echo "cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ " @cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld --print-memory-usage -o ../../$@ $(OBJS_REL) $(LIB) | cat diff --git a/include/crt0.h b/include/crt0.h index a4a5c7f79b..c60ed3b0b7 100644 --- a/include/crt0.h +++ b/include/crt0.h @@ -3,4 +3,6 @@ extern u32 IntrMain[]; +extern void ReInitializeEWRAM(); + #endif //GUARD_CRT0_H diff --git a/include/gba/defines.h b/include/gba/defines.h index fbe0a60706..65dfc5e855 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -6,8 +6,10 @@ #define TRUE 1 #define FALSE 0 -#define IWRAM_DATA __attribute__((section("iwram_data"))) -#define EWRAM_DATA __attribute__((section("ewram_data"))) +#define IWRAM_DATA __attribute__((section(".bss"))) +#define EWRAM_DATA __attribute__((section(".sbss"))) +#define IWRAM_INIT __attribute__((section(".iwram"))) +#define EWRAM_INIT __attribute__((section(".ewram"))) #define UNUSED __attribute__((unused)) #if MODERN diff --git a/ld_script.ld b/ld_script.ld index 642480d35d..e9cbae8957 100644 --- a/ld_script.ld +++ b/ld_script.ld @@ -13,19 +13,35 @@ MEMORY SECTIONS { - ewram 0x2000000 (NOLOAD) : + .ewram ORIGIN(EWRAM) : AT (__ewram_lma) + ALIGN(4) + { + __ewram_start = .; + *(.ewram*) + __ewram_end = .; + } > EWRAM + + .ewram.sbss (NOLOAD) : ALIGN(4) { INCLUDE "sym_ewram.ld" - src/*.o(ewram_data); - gflib/*.o(ewram_data); + src/*.o(.sbss); + gflib/*.o(.sbss); *libc.a:impure.o(.data); *libc.a:locale.o(.data); *libc.a:mallocr.o(.data); } > EWRAM - iwram 0x3000000 (NOLOAD) : + .iwram ORIGIN(IWRAM) : AT (__iwram_lma) + ALIGN(4) + { + __iwram_start = .; + *(.iwram*); + __iwram_end = .; + } > IWRAM + + .iwram.bss (NOLOAD) : ALIGN(4) { /* .bss starts at 0x3000000 */ @@ -1324,6 +1340,20 @@ SECTIONS { data/*.o(.rodata); } > ROM = 0 + .data.iwram : + ALIGN(4) + { + __iwram_lma = .; + . = . + (__iwram_end - __iwram_start); + } > ROM = 0 + + .data.ewram : + ALIGN(4) + { + __ewram_lma = .; + . = . + (__ewram_end - __ewram_start); + } > ROM = 0 + __rom_end = .; /* DWARF debug sections. diff --git a/ld_script_modern.ld b/ld_script_modern.ld index f3bf7b6798..fd35a1ca31 100644 --- a/ld_script_modern.ld +++ b/ld_script_modern.ld @@ -12,15 +12,32 @@ MEMORY } SECTIONS { - ewram 0x2000000 (NOLOAD) : + + + .ewram ORIGIN(EWRAM) : AT (__ewram_lma) ALIGN(4) { - src/*.o(ewram_data); - gflib/*.o(ewram_data); - + __ewram_start = .; + *(.ewram*) + __ewram_end = .; } > EWRAM - iwram 0x3000000 (NOLOAD) : + .ewram.sbss (NOLOAD) : + ALIGN(4) + { + src/*.o(.sbss); + gflib/*.o(.sbss); + } > EWRAM + + .iwram ORIGIN(IWRAM) : AT (__iwram_lma) + ALIGN(4) + { + __iwram_start = .; + *(.iwram*); + __iwram_end = .; + } > IWRAM + + .iwram.bss (NOLOAD) : ALIGN(4) { src/*.o(.bss); @@ -38,9 +55,8 @@ SECTIONS { } > IWRAM /* BEGIN ROM DATA */ - . = 0x8000000; - .text : + .text ORIGIN(ROM) : ALIGN(4) { src/rom_header.o(.text*); @@ -125,6 +141,20 @@ SECTIONS { src/graphics.o(.rodata); } > ROM =0 + .data.iwram : + ALIGN(4) + { + __iwram_lma = .; + . = . + (__iwram_end - __iwram_start); + } > ROM = 0 + + .data.ewram : + ALIGN(4) + { + __ewram_lma = .; + . = . + (__ewram_end - __ewram_start); + } > ROM = 0 + __rom_end = .; /* DWARF debug sections. diff --git a/ld_script_test.ld b/ld_script_test.ld index 49a0ec35b0..ec99609a7e 100644 --- a/ld_script_test.ld +++ b/ld_script_test.ld @@ -12,15 +12,32 @@ MEMORY } SECTIONS { - ewram 0x2000000 (NOLOAD) : + + .ewram ORIGIN(EWRAM) : AT (__ewram_lma) ALIGN(4) { - src/*.o(ewram_data); - gflib/*.o(ewram_data); - test/*.o(ewram_data); + __ewram_start = .; + *(.ewram*) + __ewram_end = .; } > EWRAM - iwram 0x3000000 (NOLOAD) : + .ewram.sbss (NOLOAD) : + ALIGN(4) + { + src/*.o(.sbss); + gflib/*.o(.sbss); + test/*.o(.sbss); + } > EWRAM + + .iwram ORIGIN(IWRAM) : AT (__iwram_lma) + ALIGN(4) + { + __iwram_start = .; + *(.iwram*); + __iwram_end = .; + } > IWRAM + + .iwram.sbss (NOLOAD) : ALIGN(4) { src/*.o(.bss); @@ -97,6 +114,20 @@ SECTIONS { src/libisagbprn.o(.rodata); } > ROM =0 + .data.iwram : + ALIGN(4) + { + __iwram_lma = .; + . = . + (__iwram_end - __iwram_start); + } > ROM = 0 + + .data.ewram : + ALIGN(4) + { + __ewram_lma = .; + . = . + (__ewram_end - __ewram_start); + } > ROM = 0 + tests : ALIGN(4) { diff --git a/src/crt0.s b/src/crt0.s index 5808147220..af6ea0bc95 100644 --- a/src/crt0.s +++ b/src/crt0.s @@ -6,22 +6,28 @@ .align 2, 0 Init:: +@ Set up location for IRQ stack mov r0, #PSR_IRQ_MODE msr cpsr_cf, r0 ldr sp, sp_irq +@ Set up location for system stack mov r0, #PSR_SYS_MODE msr cpsr_cf, r0 ldr sp, sp_sys +@ Prepare for interrupt handling ldr r1, =INTR_VECTOR adr r0, IntrMain str r0, [r1] - .if MODERN +@ Dispatch memory reset request to hardware mov r0, #255 @ RESET_ALL svc #1 << 16 - .endif @ MODERN +@ Fill RAM areas with appropriate data + bl InitializeWorkingMemory +@ Jump to AgbMain ldr r1, =AgbMain + 1 mov lr, pc bx r1 +@ Re-init if AgbMain exits b Init .align 2, 0 @@ -124,3 +130,54 @@ IntrMain_RetAddr: .pool .align 2, 0 @ Don't pad with nop. + +@ Fills initialized IWRAM and EWRAM sections in RAM from LMA areas in ROM +InitializeWorkingMemory: + push {r0-r3,lr} + ldr r0, =__iwram_lma + ldr r1, =__iwram_start + ldr r2, =__iwram_end + cmp r1, r2 + beq skip_iwram_copy + bl CopyMemory_DMA +skip_iwram_copy: + ldr r0, =__ewram_lma + ldr r1, =__ewram_start + ldr r2, =__ewram_end + cmp r1, r2 + beq skip_ewram_copy + bl CopyMemory_DMA +skip_ewram_copy: + pop {r0-r3,lr} + bx lr + +@ Uses a DMA transfer to load from r0 into r1 until r2 +CopyMemory_DMA: + subs r2, r2, r1 + lsr r2, r2, #2 + mov r4, #0x80000000 + orr r4, r4, #(1 << 26) + orr r2, r2, r4 + ldr r3, =REG_DMA3 + stmia r3, {r0, r1, r2} + bx lr + +.thumb +@ Called from C code to reinitialize working memory after a link connection failure +ReInitializeEWRAM:: + ldr r0, =__ewram_lma + ldr r1, =__ewram_start + ldr r2, =__ewram_end + cmp r1, r2 + beq EndReinitializeEWRAM + subs r2, r1 + movs r3, #1 + lsls r3, r3, #26 + orrs r2, r2, r3 + swi 0x0B +EndReinitializeEWRAM: + bx lr + + .pool + + .align 2, 0 @ Don't pad with nop. diff --git a/src/main.c b/src/main.c index 54d25c1c10..b7d10cabcd 100644 --- a/src/main.c +++ b/src/main.c @@ -93,11 +93,6 @@ void EnableVCountIntrAtLine150(void); void AgbMain() { - // Modern compilers are liberal with the stack on entry to this function, - // so RegisterRamReset may crash if it resets IWRAM. -#if !MODERN - RegisterRamReset(RESET_ALL); -#endif //MODERN *(vu16 *)BG_PLTT = RGB_WHITE; // Set the backdrop to white on startup InitGpuRegManager(); REG_WAITCNT = WAITCNT_PREFETCH_ENABLE | WAITCNT_WS0_S_1 | WAITCNT_WS0_N_3; diff --git a/src/reload_save.c b/src/reload_save.c index 5425d1c7c4..f6104c1db7 100644 --- a/src/reload_save.c +++ b/src/reload_save.c @@ -1,5 +1,6 @@ #include "global.h" #include "main.h" +#include "crt0.h" #include "gpu_regs.h" #include "m4a.h" #include "load_save.h" @@ -15,6 +16,7 @@ void ReloadSave(void) u16 imeBackup = REG_IME; REG_IME = 0; RegisterRamReset(RESET_EWRAM); + ReInitializeEWRAM(); ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_FORCED_BLANK); REG_IME = imeBackup; gMain.inBattle = FALSE; From 9f09309e0c7e36de020950e11796bdd2f05f06b4 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Tue, 2 Jan 2024 23:29:46 +0100 Subject: [PATCH 53/82] Remove comment from pokemon_icon.c (#3896) --- src/pokemon_icon.c | 1468 -------------------------------------------- 1 file changed, 1468 deletions(-) diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 89d7d545b8..950613dccc 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -22,1474 +22,6 @@ struct MonIconSpriteTemplate static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *, s16, s16, u8); static void FreeAndDestroyMonIconSprite_(struct Sprite *sprite); -// Kept this commented out table to keep PoryMap compatibility. -/* -const u8 *const gMonIconTable[NUM_SPECIES + 1] = -{ - [SPECIES_NONE] = gMonIcon_QuestionMark, - [SPECIES_BULBASAUR] = gMonIcon_Bulbasaur, - [SPECIES_IVYSAUR] = gMonIcon_Ivysaur, - [SPECIES_VENUSAUR] = gMonIcon_Venusaur, - [SPECIES_CHARMANDER] = gMonIcon_Charmander, - [SPECIES_CHARMELEON] = gMonIcon_Charmeleon, - [SPECIES_CHARIZARD] = gMonIcon_Charizard, - [SPECIES_SQUIRTLE] = gMonIcon_Squirtle, - [SPECIES_WARTORTLE] = gMonIcon_Wartortle, - [SPECIES_BLASTOISE] = gMonIcon_Blastoise, - [SPECIES_CATERPIE] = gMonIcon_Caterpie, - [SPECIES_METAPOD] = gMonIcon_Metapod, - [SPECIES_BUTTERFREE] = gMonIcon_Butterfree, - [SPECIES_WEEDLE] = gMonIcon_Weedle, - [SPECIES_KAKUNA] = gMonIcon_Kakuna, - [SPECIES_BEEDRILL] = gMonIcon_Beedrill, - [SPECIES_PIDGEY] = gMonIcon_Pidgey, - [SPECIES_PIDGEOTTO] = gMonIcon_Pidgeotto, - [SPECIES_PIDGEOT] = gMonIcon_Pidgeot, - [SPECIES_RATTATA] = gMonIcon_Rattata, - [SPECIES_RATICATE] = gMonIcon_Raticate, - [SPECIES_SPEAROW] = gMonIcon_Spearow, - [SPECIES_FEAROW] = gMonIcon_Fearow, - [SPECIES_EKANS] = gMonIcon_Ekans, - [SPECIES_ARBOK] = gMonIcon_Arbok, - [SPECIES_PIKACHU] = gMonIcon_Pikachu, - [SPECIES_RAICHU] = gMonIcon_Raichu, - [SPECIES_SANDSHREW] = gMonIcon_Sandshrew, - [SPECIES_SANDSLASH] = gMonIcon_Sandslash, - [SPECIES_NIDORAN_F] = gMonIcon_NidoranF, - [SPECIES_NIDORINA] = gMonIcon_Nidorina, - [SPECIES_NIDOQUEEN] = gMonIcon_Nidoqueen, - [SPECIES_NIDORAN_M] = gMonIcon_NidoranM, - [SPECIES_NIDORINO] = gMonIcon_Nidorino, - [SPECIES_NIDOKING] = gMonIcon_Nidoking, - [SPECIES_CLEFAIRY] = gMonIcon_Clefairy, - [SPECIES_CLEFABLE] = gMonIcon_Clefable, - [SPECIES_VULPIX] = gMonIcon_Vulpix, - [SPECIES_NINETALES] = gMonIcon_Ninetales, - [SPECIES_JIGGLYPUFF] = gMonIcon_Jigglypuff, - [SPECIES_WIGGLYTUFF] = gMonIcon_Wigglytuff, - [SPECIES_ZUBAT] = gMonIcon_Zubat, - [SPECIES_GOLBAT] = gMonIcon_Golbat, - [SPECIES_ODDISH] = gMonIcon_Oddish, - [SPECIES_GLOOM] = gMonIcon_Gloom, - [SPECIES_VILEPLUME] = gMonIcon_Vileplume, - [SPECIES_PARAS] = gMonIcon_Paras, - [SPECIES_PARASECT] = gMonIcon_Parasect, - [SPECIES_VENONAT] = gMonIcon_Venonat, - [SPECIES_VENOMOTH] = gMonIcon_Venomoth, - [SPECIES_DIGLETT] = gMonIcon_Diglett, - [SPECIES_DUGTRIO] = gMonIcon_Dugtrio, - [SPECIES_MEOWTH] = gMonIcon_Meowth, - [SPECIES_PERSIAN] = gMonIcon_Persian, - [SPECIES_PSYDUCK] = gMonIcon_Psyduck, - [SPECIES_GOLDUCK] = gMonIcon_Golduck, - [SPECIES_MANKEY] = gMonIcon_Mankey, - [SPECIES_PRIMEAPE] = gMonIcon_Primeape, - [SPECIES_GROWLITHE] = gMonIcon_Growlithe, - [SPECIES_ARCANINE] = gMonIcon_Arcanine, - [SPECIES_POLIWAG] = gMonIcon_Poliwag, - [SPECIES_POLIWHIRL] = gMonIcon_Poliwhirl, - [SPECIES_POLIWRATH] = gMonIcon_Poliwrath, - [SPECIES_ABRA] = gMonIcon_Abra, - [SPECIES_KADABRA] = gMonIcon_Kadabra, - [SPECIES_ALAKAZAM] = gMonIcon_Alakazam, - [SPECIES_MACHOP] = gMonIcon_Machop, - [SPECIES_MACHOKE] = gMonIcon_Machoke, - [SPECIES_MACHAMP] = gMonIcon_Machamp, - [SPECIES_BELLSPROUT] = gMonIcon_Bellsprout, - [SPECIES_WEEPINBELL] = gMonIcon_Weepinbell, - [SPECIES_VICTREEBEL] = gMonIcon_Victreebel, - [SPECIES_TENTACOOL] = gMonIcon_Tentacool, - [SPECIES_TENTACRUEL] = gMonIcon_Tentacruel, - [SPECIES_GEODUDE] = gMonIcon_Geodude, - [SPECIES_GRAVELER] = gMonIcon_Graveler, - [SPECIES_GOLEM] = gMonIcon_Golem, - [SPECIES_PONYTA] = gMonIcon_Ponyta, - [SPECIES_RAPIDASH] = gMonIcon_Rapidash, - [SPECIES_SLOWPOKE] = gMonIcon_Slowpoke, - [SPECIES_SLOWBRO] = gMonIcon_Slowbro, - [SPECIES_MAGNEMITE] = gMonIcon_Magnemite, - [SPECIES_MAGNETON] = gMonIcon_Magneton, - [SPECIES_FARFETCHD] = gMonIcon_Farfetchd, - [SPECIES_DODUO] = gMonIcon_Doduo, - [SPECIES_DODRIO] = gMonIcon_Dodrio, - [SPECIES_SEEL] = gMonIcon_Seel, - [SPECIES_DEWGONG] = gMonIcon_Dewgong, - [SPECIES_GRIMER] = gMonIcon_Grimer, - [SPECIES_MUK] = gMonIcon_Muk, - [SPECIES_SHELLDER] = gMonIcon_Shellder, - [SPECIES_CLOYSTER] = gMonIcon_Cloyster, - [SPECIES_GASTLY] = gMonIcon_Gastly, - [SPECIES_HAUNTER] = gMonIcon_Haunter, - [SPECIES_GENGAR] = gMonIcon_Gengar, - [SPECIES_ONIX] = gMonIcon_Onix, - [SPECIES_DROWZEE] = gMonIcon_Drowzee, - [SPECIES_HYPNO] = gMonIcon_Hypno, - [SPECIES_KRABBY] = gMonIcon_Krabby, - [SPECIES_KINGLER] = gMonIcon_Kingler, - [SPECIES_VOLTORB] = gMonIcon_Voltorb, - [SPECIES_ELECTRODE] = gMonIcon_Electrode, - [SPECIES_EXEGGCUTE] = gMonIcon_Exeggcute, - [SPECIES_EXEGGUTOR] = gMonIcon_Exeggutor, - [SPECIES_CUBONE] = gMonIcon_Cubone, - [SPECIES_MAROWAK] = gMonIcon_Marowak, - [SPECIES_HITMONLEE] = gMonIcon_Hitmonlee, - [SPECIES_HITMONCHAN] = gMonIcon_Hitmonchan, - [SPECIES_LICKITUNG] = gMonIcon_Lickitung, - [SPECIES_KOFFING] = gMonIcon_Koffing, - [SPECIES_WEEZING] = gMonIcon_Weezing, - [SPECIES_RHYHORN] = gMonIcon_Rhyhorn, - [SPECIES_RHYDON] = gMonIcon_Rhydon, - [SPECIES_CHANSEY] = gMonIcon_Chansey, - [SPECIES_TANGELA] = gMonIcon_Tangela, - [SPECIES_KANGASKHAN] = gMonIcon_Kangaskhan, - [SPECIES_HORSEA] = gMonIcon_Horsea, - [SPECIES_SEADRA] = gMonIcon_Seadra, - [SPECIES_GOLDEEN] = gMonIcon_Goldeen, - [SPECIES_SEAKING] = gMonIcon_Seaking, - [SPECIES_STARYU] = gMonIcon_Staryu, - [SPECIES_STARMIE] = gMonIcon_Starmie, - [SPECIES_MR_MIME] = gMonIcon_MrMime, - [SPECIES_SCYTHER] = gMonIcon_Scyther, - [SPECIES_JYNX] = gMonIcon_Jynx, - [SPECIES_ELECTABUZZ] = gMonIcon_Electabuzz, - [SPECIES_MAGMAR] = gMonIcon_Magmar, - [SPECIES_PINSIR] = gMonIcon_Pinsir, - [SPECIES_TAUROS] = gMonIcon_Tauros, - [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = gMonIcon_TaurosPaldeanCombatBreed, - [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = gMonIcon_TaurosPaldeanBlazeBreed, - [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = gMonIcon_TaurosPaldeanAquaBreed, - [SPECIES_MAGIKARP] = gMonIcon_Magikarp, - [SPECIES_GYARADOS] = gMonIcon_Gyarados, - [SPECIES_LAPRAS] = gMonIcon_Lapras, - [SPECIES_DITTO] = gMonIcon_Ditto, - [SPECIES_EEVEE] = gMonIcon_Eevee, - [SPECIES_VAPOREON] = gMonIcon_Vaporeon, - [SPECIES_JOLTEON] = gMonIcon_Jolteon, - [SPECIES_FLAREON] = gMonIcon_Flareon, - [SPECIES_PORYGON] = gMonIcon_Porygon, - [SPECIES_OMANYTE] = gMonIcon_Omanyte, - [SPECIES_OMASTAR] = gMonIcon_Omastar, - [SPECIES_KABUTO] = gMonIcon_Kabuto, - [SPECIES_KABUTOPS] = gMonIcon_Kabutops, - [SPECIES_AERODACTYL] = gMonIcon_Aerodactyl, - [SPECIES_SNORLAX] = gMonIcon_Snorlax, - [SPECIES_ARTICUNO] = gMonIcon_Articuno, - [SPECIES_ZAPDOS] = gMonIcon_Zapdos, - [SPECIES_MOLTRES] = gMonIcon_Moltres, - [SPECIES_DRATINI] = gMonIcon_Dratini, - [SPECIES_DRAGONAIR] = gMonIcon_Dragonair, - [SPECIES_DRAGONITE] = gMonIcon_Dragonite, - [SPECIES_MEWTWO] = gMonIcon_Mewtwo, - [SPECIES_MEW] = gMonIcon_Mew, - [SPECIES_CHIKORITA] = gMonIcon_Chikorita, - [SPECIES_BAYLEEF] = gMonIcon_Bayleef, - [SPECIES_MEGANIUM] = gMonIcon_Meganium, - [SPECIES_CYNDAQUIL] = gMonIcon_Cyndaquil, - [SPECIES_QUILAVA] = gMonIcon_Quilava, - [SPECIES_TYPHLOSION] = gMonIcon_Typhlosion, - [SPECIES_TOTODILE] = gMonIcon_Totodile, - [SPECIES_CROCONAW] = gMonIcon_Croconaw, - [SPECIES_FERALIGATR] = gMonIcon_Feraligatr, - [SPECIES_SENTRET] = gMonIcon_Sentret, - [SPECIES_FURRET] = gMonIcon_Furret, - [SPECIES_HOOTHOOT] = gMonIcon_Hoothoot, - [SPECIES_NOCTOWL] = gMonIcon_Noctowl, - [SPECIES_LEDYBA] = gMonIcon_Ledyba, - [SPECIES_LEDIAN] = gMonIcon_Ledian, - [SPECIES_SPINARAK] = gMonIcon_Spinarak, - [SPECIES_ARIADOS] = gMonIcon_Ariados, - [SPECIES_CROBAT] = gMonIcon_Crobat, - [SPECIES_CHINCHOU] = gMonIcon_Chinchou, - [SPECIES_LANTURN] = gMonIcon_Lanturn, - [SPECIES_PICHU] = gMonIcon_Pichu, - [SPECIES_CLEFFA] = gMonIcon_Cleffa, - [SPECIES_IGGLYBUFF] = gMonIcon_Igglybuff, - [SPECIES_TOGEPI] = gMonIcon_Togepi, - [SPECIES_TOGETIC] = gMonIcon_Togetic, - [SPECIES_NATU] = gMonIcon_Natu, - [SPECIES_XATU] = gMonIcon_Xatu, - [SPECIES_MAREEP] = gMonIcon_Mareep, - [SPECIES_FLAAFFY] = gMonIcon_Flaaffy, - [SPECIES_AMPHAROS] = gMonIcon_Ampharos, - [SPECIES_BELLOSSOM] = gMonIcon_Bellossom, - [SPECIES_MARILL] = gMonIcon_Marill, - [SPECIES_AZUMARILL] = gMonIcon_Azumarill, - [SPECIES_SUDOWOODO] = gMonIcon_Sudowoodo, - [SPECIES_POLITOED] = gMonIcon_Politoed, - [SPECIES_HOPPIP] = gMonIcon_Hoppip, - [SPECIES_SKIPLOOM] = gMonIcon_Skiploom, - [SPECIES_JUMPLUFF] = gMonIcon_Jumpluff, - [SPECIES_AIPOM] = gMonIcon_Aipom, - [SPECIES_SUNKERN] = gMonIcon_Sunkern, - [SPECIES_SUNFLORA] = gMonIcon_Sunflora, - [SPECIES_YANMA] = gMonIcon_Yanma, - [SPECIES_WOOPER] = gMonIcon_Wooper, - //[SPECIES_WOOPER_PALDEAN] = gMonIcon_WooperPaldean, - [SPECIES_QUAGSIRE] = gMonIcon_Quagsire, - [SPECIES_ESPEON] = gMonIcon_Espeon, - [SPECIES_UMBREON] = gMonIcon_Umbreon, - [SPECIES_MURKROW] = gMonIcon_Murkrow, - [SPECIES_SLOWKING] = gMonIcon_Slowking, - [SPECIES_MISDREAVUS] = gMonIcon_Misdreavus, - [SPECIES_UNOWN] = gMonIcon_UnownA, - [SPECIES_WOBBUFFET] = gMonIcon_Wobbuffet, - [SPECIES_GIRAFARIG] = gMonIcon_Girafarig, - [SPECIES_PINECO] = gMonIcon_Pineco, - [SPECIES_FORRETRESS] = gMonIcon_Forretress, - [SPECIES_DUNSPARCE] = gMonIcon_Dunsparce, - [SPECIES_GLIGAR] = gMonIcon_Gligar, - [SPECIES_STEELIX] = gMonIcon_Steelix, - [SPECIES_SNUBBULL] = gMonIcon_Snubbull, - [SPECIES_GRANBULL] = gMonIcon_Granbull, - [SPECIES_QWILFISH] = gMonIcon_Qwilfish, - [SPECIES_SCIZOR] = gMonIcon_Scizor, - [SPECIES_SHUCKLE] = gMonIcon_Shuckle, - [SPECIES_HERACROSS] = gMonIcon_Heracross, - [SPECIES_SNEASEL] = gMonIcon_Sneasel, - [SPECIES_TEDDIURSA] = gMonIcon_Teddiursa, - [SPECIES_URSARING] = gMonIcon_Ursaring, - [SPECIES_SLUGMA] = gMonIcon_Slugma, - [SPECIES_MAGCARGO] = gMonIcon_Magcargo, - [SPECIES_SWINUB] = gMonIcon_Swinub, - [SPECIES_PILOSWINE] = gMonIcon_Piloswine, - [SPECIES_CORSOLA] = gMonIcon_Corsola, - [SPECIES_REMORAID] = gMonIcon_Remoraid, - [SPECIES_OCTILLERY] = gMonIcon_Octillery, - [SPECIES_DELIBIRD] = gMonIcon_Delibird, - [SPECIES_MANTINE] = gMonIcon_Mantine, - [SPECIES_SKARMORY] = gMonIcon_Skarmory, - [SPECIES_HOUNDOUR] = gMonIcon_Houndour, - [SPECIES_HOUNDOOM] = gMonIcon_Houndoom, - [SPECIES_KINGDRA] = gMonIcon_Kingdra, - [SPECIES_PHANPY] = gMonIcon_Phanpy, - [SPECIES_DONPHAN] = gMonIcon_Donphan, - [SPECIES_PORYGON2] = gMonIcon_Porygon2, - [SPECIES_STANTLER] = gMonIcon_Stantler, - [SPECIES_SMEARGLE] = gMonIcon_Smeargle, - [SPECIES_TYROGUE] = gMonIcon_Tyrogue, - [SPECIES_HITMONTOP] = gMonIcon_Hitmontop, - [SPECIES_SMOOCHUM] = gMonIcon_Smoochum, - [SPECIES_ELEKID] = gMonIcon_Elekid, - [SPECIES_MAGBY] = gMonIcon_Magby, - [SPECIES_MILTANK] = gMonIcon_Miltank, - [SPECIES_BLISSEY] = gMonIcon_Blissey, - [SPECIES_RAIKOU] = gMonIcon_Raikou, - [SPECIES_ENTEI] = gMonIcon_Entei, - [SPECIES_SUICUNE] = gMonIcon_Suicune, - [SPECIES_LARVITAR] = gMonIcon_Larvitar, - [SPECIES_PUPITAR] = gMonIcon_Pupitar, - [SPECIES_TYRANITAR] = gMonIcon_Tyranitar, - [SPECIES_LUGIA] = gMonIcon_Lugia, - [SPECIES_HO_OH] = gMonIcon_HoOh, - [SPECIES_CELEBI] = gMonIcon_Celebi, - [SPECIES_TREECKO] = gMonIcon_Treecko, - [SPECIES_GROVYLE] = gMonIcon_Grovyle, - [SPECIES_SCEPTILE] = gMonIcon_Sceptile, - [SPECIES_TORCHIC] = gMonIcon_Torchic, - [SPECIES_COMBUSKEN] = gMonIcon_Combusken, - [SPECIES_BLAZIKEN] = gMonIcon_Blaziken, - [SPECIES_MUDKIP] = gMonIcon_Mudkip, - [SPECIES_MARSHTOMP] = gMonIcon_Marshtomp, - [SPECIES_SWAMPERT] = gMonIcon_Swampert, - [SPECIES_POOCHYENA] = gMonIcon_Poochyena, - [SPECIES_MIGHTYENA] = gMonIcon_Mightyena, - [SPECIES_ZIGZAGOON] = gMonIcon_Zigzagoon, - [SPECIES_LINOONE] = gMonIcon_Linoone, - [SPECIES_WURMPLE] = gMonIcon_Wurmple, - [SPECIES_SILCOON] = gMonIcon_Silcoon, - [SPECIES_BEAUTIFLY] = gMonIcon_Beautifly, - [SPECIES_CASCOON] = gMonIcon_Cascoon, - [SPECIES_DUSTOX] = gMonIcon_Dustox, - [SPECIES_LOTAD] = gMonIcon_Lotad, - [SPECIES_LOMBRE] = gMonIcon_Lombre, - [SPECIES_LUDICOLO] = gMonIcon_Ludicolo, - [SPECIES_SEEDOT] = gMonIcon_Seedot, - [SPECIES_NUZLEAF] = gMonIcon_Nuzleaf, - [SPECIES_SHIFTRY] = gMonIcon_Shiftry, - [SPECIES_NINCADA] = gMonIcon_Nincada, - [SPECIES_NINJASK] = gMonIcon_Ninjask, - [SPECIES_SHEDINJA] = gMonIcon_Shedinja, - [SPECIES_TAILLOW] = gMonIcon_Taillow, - [SPECIES_SWELLOW] = gMonIcon_Swellow, - [SPECIES_SHROOMISH] = gMonIcon_Shroomish, - [SPECIES_BRELOOM] = gMonIcon_Breloom, - [SPECIES_SPINDA] = gMonIcon_Spinda, - [SPECIES_WINGULL] = gMonIcon_Wingull, - [SPECIES_PELIPPER] = gMonIcon_Pelipper, - [SPECIES_SURSKIT] = gMonIcon_Surskit, - [SPECIES_MASQUERAIN] = gMonIcon_Masquerain, - [SPECIES_WAILMER] = gMonIcon_Wailmer, - [SPECIES_WAILORD] = gMonIcon_Wailord, - [SPECIES_SKITTY] = gMonIcon_Skitty, - [SPECIES_DELCATTY] = gMonIcon_Delcatty, - [SPECIES_KECLEON] = gMonIcon_Kecleon, - [SPECIES_BALTOY] = gMonIcon_Baltoy, - [SPECIES_CLAYDOL] = gMonIcon_Claydol, - [SPECIES_NOSEPASS] = gMonIcon_Nosepass, - [SPECIES_TORKOAL] = gMonIcon_Torkoal, - [SPECIES_SABLEYE] = gMonIcon_Sableye, - [SPECIES_BARBOACH] = gMonIcon_Barboach, - [SPECIES_WHISCASH] = gMonIcon_Whiscash, - [SPECIES_LUVDISC] = gMonIcon_Luvdisc, - [SPECIES_CORPHISH] = gMonIcon_Corphish, - [SPECIES_CRAWDAUNT] = gMonIcon_Crawdaunt, - [SPECIES_FEEBAS] = gMonIcon_Feebas, - [SPECIES_MILOTIC] = gMonIcon_Milotic, - [SPECIES_CARVANHA] = gMonIcon_Carvanha, - [SPECIES_SHARPEDO] = gMonIcon_Sharpedo, - [SPECIES_TRAPINCH] = gMonIcon_Trapinch, - [SPECIES_VIBRAVA] = gMonIcon_Vibrava, - [SPECIES_FLYGON] = gMonIcon_Flygon, - [SPECIES_MAKUHITA] = gMonIcon_Makuhita, - [SPECIES_HARIYAMA] = gMonIcon_Hariyama, - [SPECIES_ELECTRIKE] = gMonIcon_Electrike, - [SPECIES_MANECTRIC] = gMonIcon_Manectric, - [SPECIES_NUMEL] = gMonIcon_Numel, - [SPECIES_CAMERUPT] = gMonIcon_Camerupt, - [SPECIES_SPHEAL] = gMonIcon_Spheal, - [SPECIES_SEALEO] = gMonIcon_Sealeo, - [SPECIES_WALREIN] = gMonIcon_Walrein, - [SPECIES_CACNEA] = gMonIcon_Cacnea, - [SPECIES_CACTURNE] = gMonIcon_Cacturne, - [SPECIES_SNORUNT] = gMonIcon_Snorunt, - [SPECIES_GLALIE] = gMonIcon_Glalie, - [SPECIES_LUNATONE] = gMonIcon_Lunatone, - [SPECIES_SOLROCK] = gMonIcon_Solrock, - [SPECIES_AZURILL] = gMonIcon_Azurill, - [SPECIES_SPOINK] = gMonIcon_Spoink, - [SPECIES_GRUMPIG] = gMonIcon_Grumpig, - [SPECIES_PLUSLE] = gMonIcon_Plusle, - [SPECIES_MINUN] = gMonIcon_Minun, - [SPECIES_MAWILE] = gMonIcon_Mawile, - [SPECIES_MEDITITE] = gMonIcon_Meditite, - [SPECIES_MEDICHAM] = gMonIcon_Medicham, - [SPECIES_SWABLU] = gMonIcon_Swablu, - [SPECIES_ALTARIA] = gMonIcon_Altaria, - [SPECIES_WYNAUT] = gMonIcon_Wynaut, - [SPECIES_DUSKULL] = gMonIcon_Duskull, - [SPECIES_DUSCLOPS] = gMonIcon_Dusclops, - [SPECIES_ROSELIA] = gMonIcon_Roselia, - [SPECIES_SLAKOTH] = gMonIcon_Slakoth, - [SPECIES_VIGOROTH] = gMonIcon_Vigoroth, - [SPECIES_SLAKING] = gMonIcon_Slaking, - [SPECIES_GULPIN] = gMonIcon_Gulpin, - [SPECIES_SWALOT] = gMonIcon_Swalot, - [SPECIES_TROPIUS] = gMonIcon_Tropius, - [SPECIES_WHISMUR] = gMonIcon_Whismur, - [SPECIES_LOUDRED] = gMonIcon_Loudred, - [SPECIES_EXPLOUD] = gMonIcon_Exploud, - [SPECIES_CLAMPERL] = gMonIcon_Clamperl, - [SPECIES_HUNTAIL] = gMonIcon_Huntail, - [SPECIES_GOREBYSS] = gMonIcon_Gorebyss, - [SPECIES_ABSOL] = gMonIcon_Absol, - [SPECIES_SHUPPET] = gMonIcon_Shuppet, - [SPECIES_BANETTE] = gMonIcon_Banette, - [SPECIES_SEVIPER] = gMonIcon_Seviper, - [SPECIES_ZANGOOSE] = gMonIcon_Zangoose, - [SPECIES_RELICANTH] = gMonIcon_Relicanth, - [SPECIES_ARON] = gMonIcon_Aron, - [SPECIES_LAIRON] = gMonIcon_Lairon, - [SPECIES_AGGRON] = gMonIcon_Aggron, - [SPECIES_CASTFORM_NORMAL] = gMonIcon_CastformNormal, - [SPECIES_VOLBEAT] = gMonIcon_Volbeat, - [SPECIES_ILLUMISE] = gMonIcon_Illumise, - [SPECIES_LILEEP] = gMonIcon_Lileep, - [SPECIES_CRADILY] = gMonIcon_Cradily, - [SPECIES_ANORITH] = gMonIcon_Anorith, - [SPECIES_ARMALDO] = gMonIcon_Armaldo, - [SPECIES_RALTS] = gMonIcon_Ralts, - [SPECIES_KIRLIA] = gMonIcon_Kirlia, - [SPECIES_GARDEVOIR] = gMonIcon_Gardevoir, - [SPECIES_BAGON] = gMonIcon_Bagon, - [SPECIES_SHELGON] = gMonIcon_Shelgon, - [SPECIES_SALAMENCE] = gMonIcon_Salamence, - [SPECIES_BELDUM] = gMonIcon_Beldum, - [SPECIES_METANG] = gMonIcon_Metang, - [SPECIES_METAGROSS] = gMonIcon_Metagross, - [SPECIES_REGIROCK] = gMonIcon_Regirock, - [SPECIES_REGICE] = gMonIcon_Regice, - [SPECIES_REGISTEEL] = gMonIcon_Registeel, - [SPECIES_KYOGRE] = gMonIcon_Kyogre, - [SPECIES_GROUDON] = gMonIcon_Groudon, - [SPECIES_RAYQUAZA] = gMonIcon_Rayquaza, - [SPECIES_LATIAS] = gMonIcon_Latias, - [SPECIES_LATIOS] = gMonIcon_Latios, - [SPECIES_JIRACHI] = gMonIcon_Jirachi, - [SPECIES_DEOXYS_NORMAL] = gMonIcon_DeoxysNormal, - [SPECIES_CHIMECHO] = gMonIcon_Chimecho, - [SPECIES_TURTWIG] = gMonIcon_Turtwig, - [SPECIES_GROTLE] = gMonIcon_Grotle, - [SPECIES_TORTERRA] = gMonIcon_Torterra, - [SPECIES_CHIMCHAR] = gMonIcon_Chimchar, - [SPECIES_MONFERNO] = gMonIcon_Monferno, - [SPECIES_INFERNAPE] = gMonIcon_Infernape, - [SPECIES_PIPLUP] = gMonIcon_Piplup, - [SPECIES_PRINPLUP] = gMonIcon_Prinplup, - [SPECIES_EMPOLEON] = gMonIcon_Empoleon, - [SPECIES_STARLY] = gMonIcon_Starly, - [SPECIES_STARAVIA] = gMonIcon_Staravia, - [SPECIES_STARAPTOR] = gMonIcon_Staraptor, - [SPECIES_BIDOOF] = gMonIcon_Bidoof, - [SPECIES_BIBAREL] = gMonIcon_Bibarel, - [SPECIES_KRICKETOT] = gMonIcon_Kricketot, - [SPECIES_KRICKETUNE] = gMonIcon_Kricketune, - [SPECIES_SHINX] = gMonIcon_Shinx, - [SPECIES_LUXIO] = gMonIcon_Luxio, - [SPECIES_LUXRAY] = gMonIcon_Luxray, - [SPECIES_BUDEW] = gMonIcon_Budew, - [SPECIES_ROSERADE] = gMonIcon_Roserade, - [SPECIES_CRANIDOS] = gMonIcon_Cranidos, - [SPECIES_RAMPARDOS] = gMonIcon_Rampardos, - [SPECIES_SHIELDON] = gMonIcon_Shieldon, - [SPECIES_BASTIODON] = gMonIcon_Bastiodon, - [SPECIES_BURMY_PLANT_CLOAK] = gMonIcon_BurmyPlantCloak, - [SPECIES_WORMADAM_PLANT_CLOAK] = gMonIcon_WormadamPlantCloak, - [SPECIES_MOTHIM] = gMonIcon_Mothim, - [SPECIES_COMBEE] = gMonIcon_Combee, - [SPECIES_VESPIQUEN] = gMonIcon_Vespiquen, - [SPECIES_PACHIRISU] = gMonIcon_Pachirisu, - [SPECIES_BUIZEL] = gMonIcon_Buizel, - [SPECIES_FLOATZEL] = gMonIcon_Floatzel, - [SPECIES_CHERUBI] = gMonIcon_Cherubi, - [SPECIES_CHERRIM_OVERCAST] = gMonIcon_CherrimOvercast, - [SPECIES_SHELLOS_WEST_SEA] = gMonIcon_ShellosWestSea, - [SPECIES_GASTRODON_WEST_SEA] = gMonIcon_GastrodonWestSea, - [SPECIES_AMBIPOM] = gMonIcon_Ambipom, - [SPECIES_DRIFLOON] = gMonIcon_Drifloon, - [SPECIES_DRIFBLIM] = gMonIcon_Drifblim, - [SPECIES_BUNEARY] = gMonIcon_Buneary, - [SPECIES_LOPUNNY] = gMonIcon_Lopunny, - [SPECIES_MISMAGIUS] = gMonIcon_Mismagius, - [SPECIES_HONCHKROW] = gMonIcon_Honchkrow, - [SPECIES_GLAMEOW] = gMonIcon_Glameow, - [SPECIES_PURUGLY] = gMonIcon_Purugly, - [SPECIES_CHINGLING] = gMonIcon_Chingling, - [SPECIES_STUNKY] = gMonIcon_Stunky, - [SPECIES_SKUNTANK] = gMonIcon_Skuntank, - [SPECIES_BRONZOR] = gMonIcon_Bronzor, - [SPECIES_BRONZONG] = gMonIcon_Bronzong, - [SPECIES_BONSLY] = gMonIcon_Bonsly, - [SPECIES_MIME_JR] = gMonIcon_MimeJr, - [SPECIES_HAPPINY] = gMonIcon_Happiny, - [SPECIES_CHATOT] = gMonIcon_Chatot, - [SPECIES_SPIRITOMB] = gMonIcon_Spiritomb, - [SPECIES_GIBLE] = gMonIcon_Gible, - [SPECIES_GABITE] = gMonIcon_Gabite, - [SPECIES_GARCHOMP] = gMonIcon_Garchomp, - [SPECIES_MUNCHLAX] = gMonIcon_Munchlax, - [SPECIES_RIOLU] = gMonIcon_Riolu, - [SPECIES_LUCARIO] = gMonIcon_Lucario, - [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas, - [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon, - [SPECIES_SKORUPI] = gMonIcon_Skorupi, - [SPECIES_DRAPION] = gMonIcon_Drapion, - [SPECIES_CROAGUNK] = gMonIcon_Croagunk, - [SPECIES_TOXICROAK] = gMonIcon_Toxicroak, - [SPECIES_CARNIVINE] = gMonIcon_Carnivine, - [SPECIES_FINNEON] = gMonIcon_Finneon, - [SPECIES_LUMINEON] = gMonIcon_Lumineon, - [SPECIES_MANTYKE] = gMonIcon_Mantyke, - [SPECIES_SNOVER] = gMonIcon_Snover, - [SPECIES_ABOMASNOW] = gMonIcon_Abomasnow, - [SPECIES_WEAVILE] = gMonIcon_Weavile, - [SPECIES_MAGNEZONE] = gMonIcon_Magnezone, - [SPECIES_LICKILICKY] = gMonIcon_Lickilicky, - [SPECIES_RHYPERIOR] = gMonIcon_Rhyperior, - [SPECIES_TANGROWTH] = gMonIcon_Tangrowth, - [SPECIES_ELECTIVIRE] = gMonIcon_Electivire, - [SPECIES_MAGMORTAR] = gMonIcon_Magmortar, - [SPECIES_TOGEKISS] = gMonIcon_Togekiss, - [SPECIES_YANMEGA] = gMonIcon_Yanmega, - [SPECIES_LEAFEON] = gMonIcon_Leafeon, - [SPECIES_GLACEON] = gMonIcon_Glaceon, - [SPECIES_GLISCOR] = gMonIcon_Gliscor, - [SPECIES_MAMOSWINE] = gMonIcon_Mamoswine, - [SPECIES_PORYGON_Z] = gMonIcon_Porygon_Z, - [SPECIES_GALLADE] = gMonIcon_Gallade, - [SPECIES_PROBOPASS] = gMonIcon_Probopass, - [SPECIES_DUSKNOIR] = gMonIcon_Dusknoir, - [SPECIES_FROSLASS] = gMonIcon_Froslass, - [SPECIES_ROTOM] = gMonIcon_Rotom, - [SPECIES_UXIE] = gMonIcon_Uxie, - [SPECIES_MESPRIT] = gMonIcon_Mesprit, - [SPECIES_AZELF] = gMonIcon_Azelf, - [SPECIES_DIALGA] = gMonIcon_Dialga, - [SPECIES_PALKIA] = gMonIcon_Palkia, - [SPECIES_HEATRAN] = gMonIcon_Heatran, - [SPECIES_REGIGIGAS] = gMonIcon_Regigigas, - [SPECIES_GIRATINA_ALTERED] = gMonIcon_GiratinaAltered, - [SPECIES_CRESSELIA] = gMonIcon_Cresselia, - [SPECIES_PHIONE] = gMonIcon_Phione, - [SPECIES_MANAPHY] = gMonIcon_Manaphy, - [SPECIES_DARKRAI] = gMonIcon_Darkrai, - [SPECIES_SHAYMIN_LAND] = gMonIcon_ShayminLand, - [SPECIES_ARCEUS_NORMAL] = gMonIcon_Arceus, - [SPECIES_VICTINI] = gMonIcon_Victini, - [SPECIES_SNIVY] = gMonIcon_Snivy, - [SPECIES_SERVINE] = gMonIcon_Servine, - [SPECIES_SERPERIOR] = gMonIcon_Serperior, - [SPECIES_TEPIG] = gMonIcon_Tepig, - [SPECIES_PIGNITE] = gMonIcon_Pignite, - [SPECIES_EMBOAR] = gMonIcon_Emboar, - [SPECIES_OSHAWOTT] = gMonIcon_Oshawott, - [SPECIES_DEWOTT] = gMonIcon_Dewott, - [SPECIES_SAMUROTT] = gMonIcon_Samurott, - [SPECIES_PATRAT] = gMonIcon_Patrat, - [SPECIES_WATCHOG] = gMonIcon_Watchog, - [SPECIES_LILLIPUP] = gMonIcon_Lillipup, - [SPECIES_HERDIER] = gMonIcon_Herdier, - [SPECIES_STOUTLAND] = gMonIcon_Stoutland, - [SPECIES_PURRLOIN] = gMonIcon_Purrloin, - [SPECIES_LIEPARD] = gMonIcon_Liepard, - [SPECIES_PANSAGE] = gMonIcon_Pansage, - [SPECIES_SIMISAGE] = gMonIcon_Simisage, - [SPECIES_PANSEAR] = gMonIcon_Pansear, - [SPECIES_SIMISEAR] = gMonIcon_Simisear, - [SPECIES_PANPOUR] = gMonIcon_Panpour, - [SPECIES_SIMIPOUR] = gMonIcon_Simipour, - [SPECIES_MUNNA] = gMonIcon_Munna, - [SPECIES_MUSHARNA] = gMonIcon_Musharna, - [SPECIES_PIDOVE] = gMonIcon_Pidove, - [SPECIES_TRANQUILL] = gMonIcon_Tranquill, - [SPECIES_UNFEZANT] = gMonIcon_Unfezant, - [SPECIES_BLITZLE] = gMonIcon_Blitzle, - [SPECIES_ZEBSTRIKA] = gMonIcon_Zebstrika, - [SPECIES_ROGGENROLA] = gMonIcon_Roggenrola, - [SPECIES_BOLDORE] = gMonIcon_Boldore, - [SPECIES_GIGALITH] = gMonIcon_Gigalith, - [SPECIES_WOOBAT] = gMonIcon_Woobat, - [SPECIES_SWOOBAT] = gMonIcon_Swoobat, - [SPECIES_DRILBUR] = gMonIcon_Drilbur, - [SPECIES_EXCADRILL] = gMonIcon_Excadrill, - [SPECIES_AUDINO] = gMonIcon_Audino, - [SPECIES_TIMBURR] = gMonIcon_Timburr, - [SPECIES_GURDURR] = gMonIcon_Gurdurr, - [SPECIES_CONKELDURR] = gMonIcon_Conkeldurr, - [SPECIES_TYMPOLE] = gMonIcon_Tympole, - [SPECIES_PALPITOAD] = gMonIcon_Palpitoad, - [SPECIES_SEISMITOAD] = gMonIcon_Seismitoad, - [SPECIES_THROH] = gMonIcon_Throh, - [SPECIES_SAWK] = gMonIcon_Sawk, - [SPECIES_SEWADDLE] = gMonIcon_Sewaddle, - [SPECIES_SWADLOON] = gMonIcon_Swadloon, - [SPECIES_LEAVANNY] = gMonIcon_Leavanny, - [SPECIES_VENIPEDE] = gMonIcon_Venipede, - [SPECIES_WHIRLIPEDE] = gMonIcon_Whirlipede, - [SPECIES_SCOLIPEDE] = gMonIcon_Scolipede, - [SPECIES_COTTONEE] = gMonIcon_Cottonee, - [SPECIES_WHIMSICOTT] = gMonIcon_Whimsicott, - [SPECIES_PETILIL] = gMonIcon_Petilil, - [SPECIES_LILLIGANT] = gMonIcon_Lilligant, - [SPECIES_BASCULIN_RED_STRIPED] = gMonIcon_BasculinRedStriped, - [SPECIES_SANDILE] = gMonIcon_Sandile, - [SPECIES_KROKOROK] = gMonIcon_Krokorok, - [SPECIES_KROOKODILE] = gMonIcon_Krookodile, - [SPECIES_DARUMAKA] = gMonIcon_Darumaka, - [SPECIES_DARMANITAN_STANDARD_MODE] = gMonIcon_DarmanitanStandardMode, - [SPECIES_MARACTUS] = gMonIcon_Maractus, - [SPECIES_DWEBBLE] = gMonIcon_Dwebble, - [SPECIES_CRUSTLE] = gMonIcon_Crustle, - [SPECIES_SCRAGGY] = gMonIcon_Scraggy, - [SPECIES_SCRAFTY] = gMonIcon_Scrafty, - [SPECIES_SIGILYPH] = gMonIcon_Sigilyph, - [SPECIES_YAMASK] = gMonIcon_Yamask, - [SPECIES_COFAGRIGUS] = gMonIcon_Cofagrigus, - [SPECIES_TIRTOUGA] = gMonIcon_Tirtouga, - [SPECIES_CARRACOSTA] = gMonIcon_Carracosta, - [SPECIES_ARCHEN] = gMonIcon_Archen, - [SPECIES_ARCHEOPS] = gMonIcon_Archeops, - [SPECIES_TRUBBISH] = gMonIcon_Trubbish, - [SPECIES_GARBODOR] = gMonIcon_Garbodor, - [SPECIES_ZORUA] = gMonIcon_Zorua, - [SPECIES_ZOROARK] = gMonIcon_Zoroark, - [SPECIES_MINCCINO] = gMonIcon_Minccino, - [SPECIES_CINCCINO] = gMonIcon_Cinccino, - [SPECIES_GOTHITA] = gMonIcon_Gothita, - [SPECIES_GOTHORITA] = gMonIcon_Gothorita, - [SPECIES_GOTHITELLE] = gMonIcon_Gothitelle, - [SPECIES_SOLOSIS] = gMonIcon_Solosis, - [SPECIES_DUOSION] = gMonIcon_Duosion, - [SPECIES_REUNICLUS] = gMonIcon_Reuniclus, - [SPECIES_DUCKLETT] = gMonIcon_Ducklett, - [SPECIES_SWANNA] = gMonIcon_Swanna, - [SPECIES_VANILLITE] = gMonIcon_Vanillite, - [SPECIES_VANILLISH] = gMonIcon_Vanillish, - [SPECIES_VANILLUXE] = gMonIcon_Vanilluxe, - [SPECIES_DEERLING_SPRING] = gMonIcon_DeerlingSpring, - [SPECIES_SAWSBUCK_SPRING] = gMonIcon_SawsbuckSpring, - [SPECIES_EMOLGA] = gMonIcon_Emolga, - [SPECIES_KARRABLAST] = gMonIcon_Karrablast, - [SPECIES_ESCAVALIER] = gMonIcon_Escavalier, - [SPECIES_FOONGUS] = gMonIcon_Foongus, - [SPECIES_AMOONGUSS] = gMonIcon_Amoonguss, - [SPECIES_FRILLISH] = gMonIcon_Frillish, - [SPECIES_JELLICENT] = gMonIcon_Jellicent, - [SPECIES_ALOMOMOLA] = gMonIcon_Alomomola, - [SPECIES_JOLTIK] = gMonIcon_Joltik, - [SPECIES_GALVANTULA] = gMonIcon_Galvantula, - [SPECIES_FERROSEED] = gMonIcon_Ferroseed, - [SPECIES_FERROTHORN] = gMonIcon_Ferrothorn, - [SPECIES_KLINK] = gMonIcon_Klink, - [SPECIES_KLANG] = gMonIcon_Klang, - [SPECIES_KLINKLANG] = gMonIcon_Klinklang, - [SPECIES_TYNAMO] = gMonIcon_Tynamo, - [SPECIES_EELEKTRIK] = gMonIcon_Eelektrik, - [SPECIES_EELEKTROSS] = gMonIcon_Eelektross, - [SPECIES_ELGYEM] = gMonIcon_Elgyem, - [SPECIES_BEHEEYEM] = gMonIcon_Beheeyem, - [SPECIES_LITWICK] = gMonIcon_Litwick, - [SPECIES_LAMPENT] = gMonIcon_Lampent, - [SPECIES_CHANDELURE] = gMonIcon_Chandelure, - [SPECIES_AXEW] = gMonIcon_Axew, - [SPECIES_FRAXURE] = gMonIcon_Fraxure, - [SPECIES_HAXORUS] = gMonIcon_Haxorus, - [SPECIES_CUBCHOO] = gMonIcon_Cubchoo, - [SPECIES_BEARTIC] = gMonIcon_Beartic, - [SPECIES_CRYOGONAL] = gMonIcon_Cryogonal, - [SPECIES_SHELMET] = gMonIcon_Shelmet, - [SPECIES_ACCELGOR] = gMonIcon_Accelgor, - [SPECIES_STUNFISK] = gMonIcon_Stunfisk, - [SPECIES_MIENFOO] = gMonIcon_Mienfoo, - [SPECIES_MIENSHAO] = gMonIcon_Mienshao, - [SPECIES_DRUDDIGON] = gMonIcon_Druddigon, - [SPECIES_GOLETT] = gMonIcon_Golett, - [SPECIES_GOLURK] = gMonIcon_Golurk, - [SPECIES_PAWNIARD] = gMonIcon_Pawniard, - [SPECIES_BISHARP] = gMonIcon_Bisharp, - [SPECIES_BOUFFALANT] = gMonIcon_Bouffalant, - [SPECIES_RUFFLET] = gMonIcon_Rufflet, - [SPECIES_BRAVIARY] = gMonIcon_Braviary, - [SPECIES_VULLABY] = gMonIcon_Vullaby, - [SPECIES_MANDIBUZZ] = gMonIcon_Mandibuzz, - [SPECIES_HEATMOR] = gMonIcon_Heatmor, - [SPECIES_DURANT] = gMonIcon_Durant, - [SPECIES_DEINO] = gMonIcon_Deino, - [SPECIES_ZWEILOUS] = gMonIcon_Zweilous, - [SPECIES_HYDREIGON] = gMonIcon_Hydreigon, - [SPECIES_LARVESTA] = gMonIcon_Larvesta, - [SPECIES_VOLCARONA] = gMonIcon_Volcarona, - [SPECIES_COBALION] = gMonIcon_Cobalion, - [SPECIES_TERRAKION] = gMonIcon_Terrakion, - [SPECIES_VIRIZION] = gMonIcon_Virizion, - [SPECIES_TORNADUS_INCARNATE] = gMonIcon_TornadusIncarnate, - [SPECIES_THUNDURUS_INCARNATE] = gMonIcon_ThundurusIncarnate, - [SPECIES_RESHIRAM] = gMonIcon_Reshiram, - [SPECIES_ZEKROM] = gMonIcon_Zekrom, - [SPECIES_LANDORUS_INCARNATE] = gMonIcon_LandorusIncarnate, - [SPECIES_KYUREM] = gMonIcon_Kyurem, - [SPECIES_KELDEO_ORDINARY] = gMonIcon_KeldeoOrdinary, - [SPECIES_MELOETTA_ARIA] = gMonIcon_MeloettaAria, - [SPECIES_GENESECT] = gMonIcon_Genesect, - [SPECIES_CHESPIN] = gMonIcon_Chespin, - [SPECIES_QUILLADIN] = gMonIcon_Quilladin, - [SPECIES_CHESNAUGHT] = gMonIcon_Chesnaught, - [SPECIES_FENNEKIN] = gMonIcon_Fennekin, - [SPECIES_BRAIXEN] = gMonIcon_Braixen, - [SPECIES_DELPHOX] = gMonIcon_Delphox, - [SPECIES_FROAKIE] = gMonIcon_Froakie, - [SPECIES_FROGADIER] = gMonIcon_Frogadier, - [SPECIES_GRENINJA] = gMonIcon_Greninja, - [SPECIES_BUNNELBY] = gMonIcon_Bunnelby, - [SPECIES_DIGGERSBY] = gMonIcon_Diggersby, - [SPECIES_FLETCHLING] = gMonIcon_Fletchling, - [SPECIES_FLETCHINDER] = gMonIcon_Fletchinder, - [SPECIES_TALONFLAME] = gMonIcon_Talonflame, - [SPECIES_SCATTERBUG] = gMonIcon_Scatterbug, - [SPECIES_SPEWPA] = gMonIcon_Spewpa, - [SPECIES_VIVILLON_ICY_SNOW] = gMonIcon_VivillonIcySnow, - [SPECIES_LITLEO] = gMonIcon_Litleo, - [SPECIES_PYROAR] = gMonIcon_Pyroar, - [SPECIES_FLABEBE_RED_FLOWER] = gMonIcon_FlabebeRedFlower, - [SPECIES_FLOETTE_RED_FLOWER] = gMonIcon_FloetteRedFlower, - [SPECIES_FLORGES_RED_FLOWER] = gMonIcon_FlorgesRedFlower, - [SPECIES_SKIDDO] = gMonIcon_Skiddo, - [SPECIES_GOGOAT] = gMonIcon_Gogoat, - [SPECIES_PANCHAM] = gMonIcon_Pancham, - [SPECIES_PANGORO] = gMonIcon_Pangoro, - [SPECIES_FURFROU_NATURAL] = gMonIcon_FurfrouNatural, - [SPECIES_ESPURR] = gMonIcon_Espurr, - [SPECIES_MEOWSTIC_MALE] = gMonIcon_MeowsticMale, - [SPECIES_HONEDGE] = gMonIcon_Honedge, - [SPECIES_DOUBLADE] = gMonIcon_Doublade, - [SPECIES_AEGISLASH_SHIELD] = gMonIcon_AegislashShield, - [SPECIES_SPRITZEE] = gMonIcon_Spritzee, - [SPECIES_AROMATISSE] = gMonIcon_Aromatisse, - [SPECIES_SWIRLIX] = gMonIcon_Swirlix, - [SPECIES_SLURPUFF] = gMonIcon_Slurpuff, - [SPECIES_INKAY] = gMonIcon_Inkay, - [SPECIES_MALAMAR] = gMonIcon_Malamar, - [SPECIES_BINACLE] = gMonIcon_Binacle, - [SPECIES_BARBARACLE] = gMonIcon_Barbaracle, - [SPECIES_SKRELP] = gMonIcon_Skrelp, - [SPECIES_DRAGALGE] = gMonIcon_Dragalge, - [SPECIES_CLAUNCHER] = gMonIcon_Clauncher, - [SPECIES_CLAWITZER] = gMonIcon_Clawitzer, - [SPECIES_HELIOPTILE] = gMonIcon_Helioptile, - [SPECIES_HELIOLISK] = gMonIcon_Heliolisk, - [SPECIES_TYRUNT] = gMonIcon_Tyrunt, - [SPECIES_TYRANTRUM] = gMonIcon_Tyrantrum, - [SPECIES_AMAURA] = gMonIcon_Amaura, - [SPECIES_AURORUS] = gMonIcon_Aurorus, - [SPECIES_SYLVEON] = gMonIcon_Sylveon, - [SPECIES_HAWLUCHA] = gMonIcon_Hawlucha, - [SPECIES_DEDENNE] = gMonIcon_Dedenne, - [SPECIES_CARBINK] = gMonIcon_Carbink, - [SPECIES_GOOMY] = gMonIcon_Goomy, - [SPECIES_SLIGGOO] = gMonIcon_Sliggoo, - [SPECIES_GOODRA] = gMonIcon_Goodra, - [SPECIES_KLEFKI] = gMonIcon_Klefki, - [SPECIES_PHANTUMP] = gMonIcon_Phantump, - [SPECIES_TREVENANT] = gMonIcon_Trevenant, - [SPECIES_PUMPKABOO_AVERAGE] = gMonIcon_Pumpkaboo, - [SPECIES_GOURGEIST_AVERAGE] = gMonIcon_Gourgeist, - [SPECIES_BERGMITE] = gMonIcon_Bergmite, - [SPECIES_AVALUGG] = gMonIcon_Avalugg, - [SPECIES_NOIBAT] = gMonIcon_Noibat, - [SPECIES_NOIVERN] = gMonIcon_Noivern, - [SPECIES_XERNEAS_NEUTRAL] = gMonIcon_XerneasNeutral, - [SPECIES_YVELTAL] = gMonIcon_Yveltal, - [SPECIES_ZYGARDE_50_AURA_BREAK] = gMonIcon_Zygarde50, - [SPECIES_DIANCIE] = gMonIcon_Diancie, - [SPECIES_HOOPA_CONFINED] = gMonIcon_HoopaConfined, - [SPECIES_VOLCANION] = gMonIcon_Volcanion, - [SPECIES_ROWLET] = gMonIcon_Rowlet, - [SPECIES_DARTRIX] = gMonIcon_Dartrix, - [SPECIES_DECIDUEYE] = gMonIcon_Decidueye, - [SPECIES_LITTEN] = gMonIcon_Litten, - [SPECIES_TORRACAT] = gMonIcon_Torracat, - [SPECIES_INCINEROAR] = gMonIcon_Incineroar, - [SPECIES_POPPLIO] = gMonIcon_Popplio, - [SPECIES_BRIONNE] = gMonIcon_Brionne, - [SPECIES_PRIMARINA] = gMonIcon_Primarina, - [SPECIES_PIKIPEK] = gMonIcon_Pikipek, - [SPECIES_TRUMBEAK] = gMonIcon_Trumbeak, - [SPECIES_TOUCANNON] = gMonIcon_Toucannon, - [SPECIES_YUNGOOS] = gMonIcon_Yungoos, - [SPECIES_GUMSHOOS] = gMonIcon_Gumshoos, - [SPECIES_GRUBBIN] = gMonIcon_Grubbin, - [SPECIES_CHARJABUG] = gMonIcon_Charjabug, - [SPECIES_VIKAVOLT] = gMonIcon_Vikavolt, - [SPECIES_CRABRAWLER] = gMonIcon_Crabrawler, - [SPECIES_CRABOMINABLE] = gMonIcon_Crabominable, - [SPECIES_ORICORIO_BAILE] = gMonIcon_OricorioBaile, - [SPECIES_CUTIEFLY] = gMonIcon_Cutiefly, - [SPECIES_RIBOMBEE] = gMonIcon_Ribombee, - [SPECIES_ROCKRUFF] = gMonIcon_Rockruff, - [SPECIES_LYCANROC_MIDDAY] = gMonIcon_LycanrocMidday, - [SPECIES_WISHIWASHI_SOLO] = gMonIcon_WishiwashiSolo, - [SPECIES_MAREANIE] = gMonIcon_Mareanie, - [SPECIES_TOXAPEX] = gMonIcon_Toxapex, - [SPECIES_MUDBRAY] = gMonIcon_Mudbray, - [SPECIES_MUDSDALE] = gMonIcon_Mudsdale, - [SPECIES_DEWPIDER] = gMonIcon_Dewpider, - [SPECIES_ARAQUANID] = gMonIcon_Araquanid, - [SPECIES_FOMANTIS] = gMonIcon_Fomantis, - [SPECIES_LURANTIS] = gMonIcon_Lurantis, - [SPECIES_MORELULL] = gMonIcon_Morelull, - [SPECIES_SHIINOTIC] = gMonIcon_Shiinotic, - [SPECIES_SALANDIT] = gMonIcon_Salandit, - [SPECIES_SALAZZLE] = gMonIcon_Salazzle, - [SPECIES_STUFFUL] = gMonIcon_Stufful, - [SPECIES_BEWEAR] = gMonIcon_Bewear, - [SPECIES_BOUNSWEET] = gMonIcon_Bounsweet, - [SPECIES_STEENEE] = gMonIcon_Steenee, - [SPECIES_TSAREENA] = gMonIcon_Tsareena, - [SPECIES_COMFEY] = gMonIcon_Comfey, - [SPECIES_ORANGURU] = gMonIcon_Oranguru, - [SPECIES_PASSIMIAN] = gMonIcon_Passimian, - [SPECIES_WIMPOD] = gMonIcon_Wimpod, - [SPECIES_GOLISOPOD] = gMonIcon_Golisopod, - [SPECIES_SANDYGAST] = gMonIcon_Sandygast, - [SPECIES_PALOSSAND] = gMonIcon_Palossand, - [SPECIES_PYUKUMUKU] = gMonIcon_Pyukumuku, - [SPECIES_TYPE_NULL] = gMonIcon_TypeNull, - [SPECIES_SILVALLY_NORMAL] = gMonIcon_Silvally, - [SPECIES_MINIOR_METEOR_RED] = gMonIcon_MiniorMeteor, - [SPECIES_KOMALA] = gMonIcon_Komala, - [SPECIES_TURTONATOR] = gMonIcon_Turtonator, - [SPECIES_TOGEDEMARU] = gMonIcon_Togedemaru, - [SPECIES_MIMIKYU_DISGUISED] = gMonIcon_MimikyuDisguised, - [SPECIES_BRUXISH] = gMonIcon_Bruxish, - [SPECIES_DRAMPA] = gMonIcon_Drampa, - [SPECIES_DHELMISE] = gMonIcon_Dhelmise, - [SPECIES_JANGMO_O] = gMonIcon_JangmoO, - [SPECIES_HAKAMO_O] = gMonIcon_HakamoO, - [SPECIES_KOMMO_O] = gMonIcon_KommoO, - [SPECIES_TAPU_KOKO] = gMonIcon_TapuKoko, - [SPECIES_TAPU_LELE] = gMonIcon_TapuLele, - [SPECIES_TAPU_BULU] = gMonIcon_TapuBulu, - [SPECIES_TAPU_FINI] = gMonIcon_TapuFini, - [SPECIES_COSMOG] = gMonIcon_Cosmog, - [SPECIES_COSMOEM] = gMonIcon_Cosmoem, - [SPECIES_SOLGALEO] = gMonIcon_Solgaleo, - [SPECIES_LUNALA] = gMonIcon_Lunala, - [SPECIES_NIHILEGO] = gMonIcon_Nihilego, - [SPECIES_BUZZWOLE] = gMonIcon_Buzzwole, - [SPECIES_PHEROMOSA] = gMonIcon_Pheromosa, - [SPECIES_XURKITREE] = gMonIcon_Xurkitree, - [SPECIES_CELESTEELA] = gMonIcon_Celesteela, - [SPECIES_KARTANA] = gMonIcon_Kartana, - [SPECIES_GUZZLORD] = gMonIcon_Guzzlord, - [SPECIES_NECROZMA] = gMonIcon_Necrozma, - [SPECIES_MAGEARNA] = gMonIcon_Magearna, - [SPECIES_MARSHADOW] = gMonIcon_Marshadow, - [SPECIES_POIPOLE] = gMonIcon_Poipole, - [SPECIES_NAGANADEL] = gMonIcon_Naganadel, - [SPECIES_STAKATAKA] = gMonIcon_Stakataka, - [SPECIES_BLACEPHALON] = gMonIcon_Blacephalon, - [SPECIES_ZERAORA] = gMonIcon_Zeraora, - [SPECIES_MELTAN] = gMonIcon_Meltan, - [SPECIES_MELMETAL] = gMonIcon_Melmetal, - [SPECIES_GROOKEY] = gMonIcon_Grookey, - [SPECIES_THWACKEY] = gMonIcon_Thwackey, - [SPECIES_RILLABOOM] = gMonIcon_Rillaboom, - [SPECIES_SCORBUNNY] = gMonIcon_Scorbunny, - [SPECIES_RABOOT] = gMonIcon_Raboot, - [SPECIES_CINDERACE] = gMonIcon_Cinderace, - [SPECIES_SOBBLE] = gMonIcon_Sobble, - [SPECIES_DRIZZILE] = gMonIcon_Drizzile, - [SPECIES_INTELEON] = gMonIcon_Inteleon, - [SPECIES_SKWOVET] = gMonIcon_Skwovet, - [SPECIES_GREEDENT] = gMonIcon_Greedent, - [SPECIES_ROOKIDEE] = gMonIcon_Rookidee, - [SPECIES_CORVISQUIRE] = gMonIcon_Corvisquire, - [SPECIES_CORVIKNIGHT] = gMonIcon_Corviknight, - [SPECIES_BLIPBUG] = gMonIcon_Blipbug, - [SPECIES_DOTTLER] = gMonIcon_Dottler, - [SPECIES_ORBEETLE] = gMonIcon_Orbeetle, - [SPECIES_NICKIT] = gMonIcon_Nickit, - [SPECIES_THIEVUL] = gMonIcon_Thievul, - [SPECIES_GOSSIFLEUR] = gMonIcon_Gossifleur, - [SPECIES_ELDEGOSS] = gMonIcon_Eldegoss, - [SPECIES_WOOLOO] = gMonIcon_Wooloo, - [SPECIES_DUBWOOL] = gMonIcon_Dubwool, - [SPECIES_CHEWTLE] = gMonIcon_Chewtle, - [SPECIES_DREDNAW] = gMonIcon_Drednaw, - [SPECIES_YAMPER] = gMonIcon_Yamper, - [SPECIES_BOLTUND] = gMonIcon_Boltund, - [SPECIES_ROLYCOLY] = gMonIcon_Rolycoly, - [SPECIES_CARKOL] = gMonIcon_Carkol, - [SPECIES_COALOSSAL] = gMonIcon_Coalossal, - [SPECIES_APPLIN] = gMonIcon_Applin, - [SPECIES_FLAPPLE] = gMonIcon_Flapple, - [SPECIES_APPLETUN] = gMonIcon_Appletun, - [SPECIES_SILICOBRA] = gMonIcon_Silicobra, - [SPECIES_SANDACONDA] = gMonIcon_Sandaconda, - [SPECIES_CRAMORANT] = gMonIcon_Cramorant, - [SPECIES_ARROKUDA] = gMonIcon_Arrokuda, - [SPECIES_BARRASKEWDA] = gMonIcon_Barraskewda, - [SPECIES_TOXEL] = gMonIcon_Toxel, - [SPECIES_TOXTRICITY_AMPED] = gMonIcon_ToxtricityAmped, - [SPECIES_SIZZLIPEDE] = gMonIcon_Sizzlipede, - [SPECIES_CENTISKORCH] = gMonIcon_Centiskorch, - [SPECIES_CLOBBOPUS] = gMonIcon_Clobbopus, - [SPECIES_GRAPPLOCT] = gMonIcon_Grapploct, - [SPECIES_SINISTEA_PHONY] = gMonIcon_Sinistea, - [SPECIES_POLTEAGEIST_PHONY] = gMonIcon_Polteageist, - [SPECIES_HATENNA] = gMonIcon_Hatenna, - [SPECIES_HATTREM] = gMonIcon_Hattrem, - [SPECIES_HATTERENE] = gMonIcon_Hatterene, - [SPECIES_IMPIDIMP] = gMonIcon_Impidimp, - [SPECIES_MORGREM] = gMonIcon_Morgrem, - [SPECIES_GRIMMSNARL] = gMonIcon_Grimmsnarl, - [SPECIES_OBSTAGOON] = gMonIcon_Obstagoon, - [SPECIES_PERRSERKER] = gMonIcon_Perrserker, - [SPECIES_CURSOLA] = gMonIcon_Cursola, - [SPECIES_SIRFETCHD] = gMonIcon_Sirfetchd, - [SPECIES_MR_RIME] = gMonIcon_MrRime, - [SPECIES_RUNERIGUS] = gMonIcon_Runerigus, - [SPECIES_MILCERY] = gMonIcon_Milcery, - [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream, - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRubyCream, - [SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryMatchaCream, - [SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryMintCream, - [SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryLemonCream, - [SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberrySaltedCream, - [SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRubySwirl, - [SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryCaramelSwirl, - [SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRainbowSwirl, - [SPECIES_ALCREMIE_BERRY_VANILLA_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream, - [SPECIES_ALCREMIE_BERRY_RUBY_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRubyCream, - [SPECIES_ALCREMIE_BERRY_MATCHA_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryMatchaCream, - [SPECIES_ALCREMIE_BERRY_MINT_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryMintCream, - [SPECIES_ALCREMIE_BERRY_LEMON_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryLemonCream, - [SPECIES_ALCREMIE_BERRY_SALTED_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberrySaltedCream, - [SPECIES_ALCREMIE_BERRY_RUBY_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRubySwirl, - [SPECIES_ALCREMIE_BERRY_CARAMEL_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryCaramelSwirl, - [SPECIES_ALCREMIE_BERRY_RAINBOW_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRainbowSwirl, - [SPECIES_ALCREMIE_LOVE_VANILLA_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream, - [SPECIES_ALCREMIE_LOVE_RUBY_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRubyCream, - [SPECIES_ALCREMIE_LOVE_MATCHA_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryMatchaCream, - [SPECIES_ALCREMIE_LOVE_MINT_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryMintCream, - [SPECIES_ALCREMIE_LOVE_LEMON_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryLemonCream, - [SPECIES_ALCREMIE_LOVE_SALTED_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberrySaltedCream, - [SPECIES_ALCREMIE_LOVE_RUBY_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRubySwirl, - [SPECIES_ALCREMIE_LOVE_CARAMEL_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryCaramelSwirl, - [SPECIES_ALCREMIE_LOVE_RAINBOW_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRainbowSwirl, - [SPECIES_ALCREMIE_STAR_VANILLA_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream, - [SPECIES_ALCREMIE_STAR_RUBY_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRubyCream, - [SPECIES_ALCREMIE_STAR_MATCHA_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryMatchaCream, - [SPECIES_ALCREMIE_STAR_MINT_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryMintCream, - [SPECIES_ALCREMIE_STAR_LEMON_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryLemonCream, - [SPECIES_ALCREMIE_STAR_SALTED_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberrySaltedCream, - [SPECIES_ALCREMIE_STAR_RUBY_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRubySwirl, - [SPECIES_ALCREMIE_STAR_CARAMEL_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryCaramelSwirl, - [SPECIES_ALCREMIE_STAR_RAINBOW_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRainbowSwirl, - [SPECIES_ALCREMIE_CLOVER_VANILLA_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream, - [SPECIES_ALCREMIE_CLOVER_RUBY_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRubyCream, - [SPECIES_ALCREMIE_CLOVER_MATCHA_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryMatchaCream, - [SPECIES_ALCREMIE_CLOVER_MINT_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryMintCream, - [SPECIES_ALCREMIE_CLOVER_LEMON_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryLemonCream, - [SPECIES_ALCREMIE_CLOVER_SALTED_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberrySaltedCream, - [SPECIES_ALCREMIE_CLOVER_RUBY_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRubySwirl, - [SPECIES_ALCREMIE_CLOVER_CARAMEL_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryCaramelSwirl, - [SPECIES_ALCREMIE_CLOVER_RAINBOW_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRainbowSwirl, - [SPECIES_ALCREMIE_FLOWER_VANILLA_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream, - [SPECIES_ALCREMIE_FLOWER_RUBY_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRubyCream, - [SPECIES_ALCREMIE_FLOWER_MATCHA_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryMatchaCream, - [SPECIES_ALCREMIE_FLOWER_MINT_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryMintCream, - [SPECIES_ALCREMIE_FLOWER_LEMON_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryLemonCream, - [SPECIES_ALCREMIE_FLOWER_SALTED_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberrySaltedCream, - [SPECIES_ALCREMIE_FLOWER_RUBY_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRubySwirl, - [SPECIES_ALCREMIE_FLOWER_CARAMEL_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryCaramelSwirl, - [SPECIES_ALCREMIE_FLOWER_RAINBOW_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRainbowSwirl, - [SPECIES_ALCREMIE_RIBBON_VANILLA_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream, - [SPECIES_ALCREMIE_RIBBON_RUBY_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRubyCream, - [SPECIES_ALCREMIE_RIBBON_MATCHA_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryMatchaCream, - [SPECIES_ALCREMIE_RIBBON_MINT_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryMintCream, - [SPECIES_ALCREMIE_RIBBON_LEMON_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryLemonCream, - [SPECIES_ALCREMIE_RIBBON_SALTED_CREAM] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberrySaltedCream, - [SPECIES_ALCREMIE_RIBBON_RUBY_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRubySwirl, - [SPECIES_ALCREMIE_RIBBON_CARAMEL_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryCaramelSwirl, - [SPECIES_ALCREMIE_RIBBON_RAINBOW_SWIRL] = gMonIcon_AlcremieStrawberryVanillaCream,//gMonIcon_AlcremieStrawberryRainbowSwirl, - [SPECIES_FALINKS] = gMonIcon_Falinks, - [SPECIES_PINCURCHIN] = gMonIcon_Pincurchin, - [SPECIES_SNOM] = gMonIcon_Snom, - [SPECIES_FROSMOTH] = gMonIcon_Frosmoth, - [SPECIES_STONJOURNER] = gMonIcon_Stonjourner, - [SPECIES_EISCUE_ICE_FACE] = gMonIcon_EiscueIceFace, - [SPECIES_INDEEDEE_MALE] = gMonIcon_IndeedeeMale, - [SPECIES_MORPEKO_FULL_BELLY] = gMonIcon_MorpekoFullBelly, - [SPECIES_CUFANT] = gMonIcon_Cufant, - [SPECIES_COPPERAJAH] = gMonIcon_Copperajah, - [SPECIES_DRACOZOLT] = gMonIcon_Dracozolt, - [SPECIES_ARCTOZOLT] = gMonIcon_Arctozolt, - [SPECIES_DRACOVISH] = gMonIcon_Dracovish, - [SPECIES_ARCTOVISH] = gMonIcon_Arctovish, - [SPECIES_DURALUDON] = gMonIcon_Duraludon, - [SPECIES_DREEPY] = gMonIcon_Dreepy, - [SPECIES_DRAKLOAK] = gMonIcon_Drakloak, - [SPECIES_DRAGAPULT] = gMonIcon_Dragapult, - [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = gMonIcon_ZacianHeroOfManyBattles, - [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = gMonIcon_ZamazentaHeroOfManyBattles, - [SPECIES_ETERNATUS] = gMonIcon_Eternatus, - [SPECIES_KUBFU] = gMonIcon_Kubfu, - [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = gMonIcon_UrshifuSingleStrikeStyle, - [SPECIES_ZARUDE] = gMonIcon_Zarude, - [SPECIES_REGIELEKI] = gMonIcon_Regieleki, - [SPECIES_REGIDRAGO] = gMonIcon_Regidrago, - [SPECIES_GLASTRIER] = gMonIcon_Glastrier, - [SPECIES_SPECTRIER] = gMonIcon_Spectrier, - [SPECIES_CALYREX] = gMonIcon_Calyrex, - [SPECIES_WYRDEER] = gMonIcon_Wyrdeer, - [SPECIES_KLEAVOR] = gMonIcon_Kleavor, - [SPECIES_URSALUNA] = gMonIcon_Ursaluna, - //[SPECIES_URSALUNA_BLOODMOON] = gMonIcon_UrsalunaBloodmoon, TODO - [SPECIES_BASCULEGION_MALE] = gMonIcon_BasculegionMale, - [SPECIES_SNEASLER] = gMonIcon_Sneasler, - [SPECIES_OVERQWIL] = gMonIcon_Overqwil, - [SPECIES_ENAMORUS_INCARNATE] = gMonIcon_EnamorusIncarnate, - [SPECIES_VENUSAUR_MEGA] = gMonIcon_VenusaurMega, - [SPECIES_CHARIZARD_MEGA_X] = gMonIcon_CharizardMegaX, - [SPECIES_CHARIZARD_MEGA_Y] = gMonIcon_CharizardMegaY, - [SPECIES_BLASTOISE_MEGA] = gMonIcon_BlastoiseMega, - [SPECIES_BEEDRILL_MEGA] = gMonIcon_BeedrillMega, - [SPECIES_PIDGEOT_MEGA] = gMonIcon_PidgeotMega, - [SPECIES_ALAKAZAM_MEGA] = gMonIcon_AlakazamMega, - [SPECIES_SLOWBRO_MEGA] = gMonIcon_SlowbroMega, - [SPECIES_GENGAR_MEGA] = gMonIcon_GengarMega, - [SPECIES_KANGASKHAN_MEGA] = gMonIcon_KangaskhanMega, - [SPECIES_PINSIR_MEGA] = gMonIcon_PinsirMega, - [SPECIES_GYARADOS_MEGA] = gMonIcon_GyaradosMega, - [SPECIES_AERODACTYL_MEGA] = gMonIcon_AerodactylMega, - [SPECIES_MEWTWO_MEGA_X] = gMonIcon_MewtwoMegaX, - [SPECIES_MEWTWO_MEGA_Y] = gMonIcon_MewtwoMegaY, - [SPECIES_AMPHAROS_MEGA] = gMonIcon_AmpharosMega, - [SPECIES_STEELIX_MEGA] = gMonIcon_SteelixMega, - [SPECIES_SCIZOR_MEGA] = gMonIcon_ScizorMega, - [SPECIES_HERACROSS_MEGA] = gMonIcon_HeracrossMega, - [SPECIES_HOUNDOOM_MEGA] = gMonIcon_HoundoomMega, - [SPECIES_TYRANITAR_MEGA] = gMonIcon_TyranitarMega, - [SPECIES_SCEPTILE_MEGA] = gMonIcon_SceptileMega, - [SPECIES_BLAZIKEN_MEGA] = gMonIcon_BlazikenMega, - [SPECIES_SWAMPERT_MEGA] = gMonIcon_SwampertMega, - [SPECIES_GARDEVOIR_MEGA] = gMonIcon_GardevoirMega, - [SPECIES_SABLEYE_MEGA] = gMonIcon_SableyeMega, - [SPECIES_MAWILE_MEGA] = gMonIcon_MawileMega, - [SPECIES_AGGRON_MEGA] = gMonIcon_AggronMega, - [SPECIES_MEDICHAM_MEGA] = gMonIcon_MedichamMega, - [SPECIES_MANECTRIC_MEGA] = gMonIcon_ManectricMega, - [SPECIES_SHARPEDO_MEGA] = gMonIcon_SharpedoMega, - [SPECIES_CAMERUPT_MEGA] = gMonIcon_CameruptMega, - [SPECIES_ALTARIA_MEGA] = gMonIcon_AltariaMega, - [SPECIES_BANETTE_MEGA] = gMonIcon_BanetteMega, - [SPECIES_ABSOL_MEGA] = gMonIcon_AbsolMega, - [SPECIES_GLALIE_MEGA] = gMonIcon_GlalieMega, - [SPECIES_SALAMENCE_MEGA] = gMonIcon_SalamenceMega, - [SPECIES_METAGROSS_MEGA] = gMonIcon_MetagrossMega, - [SPECIES_LATIAS_MEGA] = gMonIcon_LatiasMega, - [SPECIES_LATIOS_MEGA] = gMonIcon_LatiosMega, - [SPECIES_LOPUNNY_MEGA] = gMonIcon_LopunnyMega, - [SPECIES_GARCHOMP_MEGA] = gMonIcon_GarchompMega, - [SPECIES_LUCARIO_MEGA] = gMonIcon_LucarioMega, - [SPECIES_ABOMASNOW_MEGA] = gMonIcon_AbomasnowMega, - [SPECIES_GALLADE_MEGA] = gMonIcon_GalladeMega, - [SPECIES_AUDINO_MEGA] = gMonIcon_AudinoMega, - [SPECIES_DIANCIE_MEGA] = gMonIcon_DiancieMega, - [SPECIES_RAYQUAZA_MEGA] = gMonIcon_RayquazaMega, - [SPECIES_KYOGRE_PRIMAL] = gMonIcon_KyogrePrimal, - [SPECIES_GROUDON_PRIMAL] = gMonIcon_GroudonPrimal, - [SPECIES_RATTATA_ALOLAN] = gMonIcon_RattataAlolan, - [SPECIES_RATICATE_ALOLAN] = gMonIcon_RaticateAlolan, - [SPECIES_RAICHU_ALOLAN] = gMonIcon_RaichuAlolan, - [SPECIES_SANDSHREW_ALOLAN] = gMonIcon_SandshrewAlolan, - [SPECIES_SANDSLASH_ALOLAN] = gMonIcon_SandslashAlolan, - [SPECIES_VULPIX_ALOLAN] = gMonIcon_VulpixAlolan, - [SPECIES_NINETALES_ALOLAN] = gMonIcon_NinetalesAlolan, - [SPECIES_DIGLETT_ALOLAN] = gMonIcon_DiglettAlolan, - [SPECIES_DUGTRIO_ALOLAN] = gMonIcon_DugtrioAlolan, - [SPECIES_MEOWTH_ALOLAN] = gMonIcon_MeowthAlolan, - [SPECIES_PERSIAN_ALOLAN] = gMonIcon_PersianAlolan, - [SPECIES_GEODUDE_ALOLAN] = gMonIcon_GeodudeAlolan, - [SPECIES_GRAVELER_ALOLAN] = gMonIcon_GravelerAlolan, - [SPECIES_GOLEM_ALOLAN] = gMonIcon_GolemAlolan, - [SPECIES_GRIMER_ALOLAN] = gMonIcon_GrimerAlolan, - [SPECIES_MUK_ALOLAN] = gMonIcon_MukAlolan, - [SPECIES_EXEGGUTOR_ALOLAN] = gMonIcon_ExeggutorAlolan, - [SPECIES_MAROWAK_ALOLAN] = gMonIcon_MarowakAlolan, - [SPECIES_MEOWTH_GALARIAN] = gMonIcon_MeowthGalarian, - [SPECIES_PONYTA_GALARIAN] = gMonIcon_PonytaGalarian, - [SPECIES_RAPIDASH_GALARIAN] = gMonIcon_RapidashGalarian, - [SPECIES_SLOWPOKE_GALARIAN] = gMonIcon_SlowpokeGalarian, - [SPECIES_SLOWBRO_GALARIAN] = gMonIcon_SlowbroGalarian, - [SPECIES_FARFETCHD_GALARIAN] = gMonIcon_FarfetchdGalarian, - [SPECIES_WEEZING_GALARIAN] = gMonIcon_WeezingGalarian, - [SPECIES_MR_MIME_GALARIAN] = gMonIcon_MrMimeGalarian, - [SPECIES_ARTICUNO_GALARIAN] = gMonIcon_ArticunoGalarian, - [SPECIES_ZAPDOS_GALARIAN] = gMonIcon_ZapdosGalarian, - [SPECIES_MOLTRES_GALARIAN] = gMonIcon_MoltresGalarian, - [SPECIES_SLOWKING_GALARIAN] = gMonIcon_SlowkingGalarian, - [SPECIES_CORSOLA_GALARIAN] = gMonIcon_CorsolaGalarian, - [SPECIES_ZIGZAGOON_GALARIAN] = gMonIcon_ZigzagoonGalarian, - [SPECIES_LINOONE_GALARIAN] = gMonIcon_LinooneGalarian, - [SPECIES_DARUMAKA_GALARIAN] = gMonIcon_DarumakaGalarian, - [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = gMonIcon_DarmanitanGalarianStandardMode, - [SPECIES_YAMASK_GALARIAN] = gMonIcon_YamaskGalarian, - [SPECIES_STUNFISK_GALARIAN] = gMonIcon_StunfiskGalarian, - [SPECIES_GROWLITHE_HISUIAN] = gMonIcon_GrowlitheHisuian, - [SPECIES_ARCANINE_HISUIAN] = gMonIcon_ArcanineHisuian, - [SPECIES_VOLTORB_HISUIAN] = gMonIcon_VoltorbHisuian, - [SPECIES_ELECTRODE_HISUIAN] = gMonIcon_ElectrodeHisuian, - [SPECIES_TYPHLOSION_HISUIAN] = gMonIcon_TyphlosionHisuian, - [SPECIES_QWILFISH_HISUIAN] = gMonIcon_QwilfishHisuian, - [SPECIES_SNEASEL_HISUIAN] = gMonIcon_SneaselHisuian, - [SPECIES_SAMUROTT_HISUIAN] = gMonIcon_SamurottHisuian, - [SPECIES_LILLIGANT_HISUIAN] = gMonIcon_LilligantHisuian, - [SPECIES_ZORUA_HISUIAN] = gMonIcon_ZoruaHisuian, - [SPECIES_ZOROARK_HISUIAN] = gMonIcon_ZoroarkHisuian, - [SPECIES_BRAVIARY_HISUIAN] = gMonIcon_BraviaryHisuian, - [SPECIES_SLIGGOO_HISUIAN] = gMonIcon_SliggooHisuian, - [SPECIES_GOODRA_HISUIAN] = gMonIcon_GoodraHisuian, - [SPECIES_AVALUGG_HISUIAN] = gMonIcon_AvaluggHisuian, - [SPECIES_DECIDUEYE_HISUIAN] = gMonIcon_DecidueyeHisuian, - [SPECIES_PIKACHU_COSPLAY] = gMonIcon_PikachuCosplay, - [SPECIES_PIKACHU_ROCK_STAR] = gMonIcon_PikachuRockStar, - [SPECIES_PIKACHU_BELLE] = gMonIcon_PikachuBelle, - [SPECIES_PIKACHU_POP_STAR] = gMonIcon_PikachuPopStar, - [SPECIES_PIKACHU_PH_D] = gMonIcon_PikachuPhD, - [SPECIES_PIKACHU_LIBRE] = gMonIcon_PikachuLibre, - [SPECIES_PIKACHU_ORIGINAL_CAP] = gMonIcon_PikachuOriginalCap, - [SPECIES_PIKACHU_HOENN_CAP] = gMonIcon_PikachuHoennCap, - [SPECIES_PIKACHU_SINNOH_CAP] = gMonIcon_PikachuSinnohCap, - [SPECIES_PIKACHU_UNOVA_CAP] = gMonIcon_PikachuUnovaCap, - [SPECIES_PIKACHU_KALOS_CAP] = gMonIcon_PikachuKalosCap, - [SPECIES_PIKACHU_ALOLA_CAP] = gMonIcon_PikachuAlolaCap, - [SPECIES_PIKACHU_PARTNER_CAP] = gMonIcon_PikachuPartnerCap, - [SPECIES_PIKACHU_WORLD_CAP] = gMonIcon_PikachuWorldCap, - [SPECIES_PICHU_SPIKY_EARED] = gMonIcon_PichuSpikyEared, - [SPECIES_UNOWN_B] = gMonIcon_UnownB, - [SPECIES_UNOWN_C] = gMonIcon_UnownC, - [SPECIES_UNOWN_D] = gMonIcon_UnownD, - [SPECIES_UNOWN_E] = gMonIcon_UnownE, - [SPECIES_UNOWN_F] = gMonIcon_UnownF, - [SPECIES_UNOWN_G] = gMonIcon_UnownG, - [SPECIES_UNOWN_H] = gMonIcon_UnownH, - [SPECIES_UNOWN_I] = gMonIcon_UnownI, - [SPECIES_UNOWN_J] = gMonIcon_UnownJ, - [SPECIES_UNOWN_K] = gMonIcon_UnownK, - [SPECIES_UNOWN_L] = gMonIcon_UnownL, - [SPECIES_UNOWN_M] = gMonIcon_UnownM, - [SPECIES_UNOWN_N] = gMonIcon_UnownN, - [SPECIES_UNOWN_O] = gMonIcon_UnownO, - [SPECIES_UNOWN_P] = gMonIcon_UnownP, - [SPECIES_UNOWN_Q] = gMonIcon_UnownQ, - [SPECIES_UNOWN_R] = gMonIcon_UnownR, - [SPECIES_UNOWN_S] = gMonIcon_UnownS, - [SPECIES_UNOWN_T] = gMonIcon_UnownT, - [SPECIES_UNOWN_U] = gMonIcon_UnownU, - [SPECIES_UNOWN_V] = gMonIcon_UnownV, - [SPECIES_UNOWN_W] = gMonIcon_UnownW, - [SPECIES_UNOWN_X] = gMonIcon_UnownX, - [SPECIES_UNOWN_Y] = gMonIcon_UnownY, - [SPECIES_UNOWN_Z] = gMonIcon_UnownZ, - [SPECIES_UNOWN_EMARK] = gMonIcon_UnownExclamationMark, - [SPECIES_UNOWN_QMARK] = gMonIcon_UnownQuestionMark, - [SPECIES_CASTFORM_SUNNY] = gMonIcon_CastformSunny, - [SPECIES_CASTFORM_RAINY] = gMonIcon_CastformRainy, - [SPECIES_CASTFORM_SNOWY] = gMonIcon_CastformSnowy, - [SPECIES_DEOXYS_ATTACK] = gMonIcon_DeoxysAttack, - [SPECIES_DEOXYS_DEFENSE] = gMonIcon_DeoxysDefense, - [SPECIES_DEOXYS_SPEED] = gMonIcon_DeoxysSpeed, - [SPECIES_BURMY_SANDY_CLOAK] = gMonIcon_BurmySandyCloak, - [SPECIES_BURMY_TRASH_CLOAK] = gMonIcon_BurmyTrashCloak, - [SPECIES_WORMADAM_SANDY_CLOAK] = gMonIcon_WormadamSandyCloak, - [SPECIES_WORMADAM_TRASH_CLOAK] = gMonIcon_WormadamTrashCloak, - [SPECIES_CHERRIM_SUNSHINE] = gMonIcon_CherrimSunshine, - [SPECIES_SHELLOS_EAST_SEA] = gMonIcon_ShellosEastSea, - [SPECIES_GASTRODON_EAST_SEA] = gMonIcon_GastrodonEastSea, - [SPECIES_ROTOM_HEAT] = gMonIcon_RotomHeat, - [SPECIES_ROTOM_WASH] = gMonIcon_RotomWash, - [SPECIES_ROTOM_FROST] = gMonIcon_RotomFrost, - [SPECIES_ROTOM_FAN] = gMonIcon_RotomFan, - [SPECIES_ROTOM_MOW] = gMonIcon_RotomMow, - [SPECIES_DIALGA_ORIGIN] = gMonIcon_DialgaOrigin, - [SPECIES_PALKIA_ORIGIN] = gMonIcon_PalkiaOrigin, - [SPECIES_GIRATINA_ORIGIN] = gMonIcon_GiratinaOrigin, - [SPECIES_SHAYMIN_SKY] = gMonIcon_ShayminSky, - [SPECIES_ARCEUS_FIGHTING] = gMonIcon_Arceus, - [SPECIES_ARCEUS_FLYING] = gMonIcon_Arceus, - [SPECIES_ARCEUS_POISON] = gMonIcon_Arceus, - [SPECIES_ARCEUS_GROUND] = gMonIcon_Arceus, - [SPECIES_ARCEUS_ROCK] = gMonIcon_Arceus, - [SPECIES_ARCEUS_BUG] = gMonIcon_Arceus, - [SPECIES_ARCEUS_GHOST] = gMonIcon_Arceus, - [SPECIES_ARCEUS_STEEL] = gMonIcon_Arceus, - [SPECIES_ARCEUS_FIRE] = gMonIcon_Arceus, - [SPECIES_ARCEUS_WATER] = gMonIcon_Arceus, - [SPECIES_ARCEUS_GRASS] = gMonIcon_Arceus, - [SPECIES_ARCEUS_ELECTRIC] = gMonIcon_Arceus, - [SPECIES_ARCEUS_PSYCHIC] = gMonIcon_Arceus, - [SPECIES_ARCEUS_ICE] = gMonIcon_Arceus, - [SPECIES_ARCEUS_DRAGON] = gMonIcon_Arceus, - [SPECIES_ARCEUS_DARK] = gMonIcon_Arceus, - [SPECIES_ARCEUS_FAIRY] = gMonIcon_Arceus, - [SPECIES_BASCULIN_BLUE_STRIPED] = gMonIcon_BasculinBlueStriped, - [SPECIES_BASCULIN_WHITE_STRIPED] = gMonIcon_BasculinWhiteStriped, - [SPECIES_DARMANITAN_ZEN_MODE] = gMonIcon_DarmanitanZenMode, - [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = gMonIcon_DarmanitanGalarianZenMode, - [SPECIES_DEERLING_SUMMER] = gMonIcon_DeerlingSummer, - [SPECIES_DEERLING_AUTUMN] = gMonIcon_DeerlingAutumn, - [SPECIES_DEERLING_WINTER] = gMonIcon_DeerlingWinter, - [SPECIES_SAWSBUCK_SUMMER] = gMonIcon_SawsbuckSummer, - [SPECIES_SAWSBUCK_AUTUMN] = gMonIcon_SawsbuckAutumn, - [SPECIES_SAWSBUCK_WINTER] = gMonIcon_SawsbuckWinter, - [SPECIES_TORNADUS_THERIAN] = gMonIcon_TornadusTherian, - [SPECIES_THUNDURUS_THERIAN] = gMonIcon_ThundurusTherian, - [SPECIES_LANDORUS_THERIAN] = gMonIcon_LandorusTherian, - [SPECIES_KYUREM_WHITE] = gMonIcon_KyuremWhite, - [SPECIES_KYUREM_BLACK] = gMonIcon_KyuremBlack, - [SPECIES_KELDEO_RESOLUTE] = gMonIcon_KeldeoResolute, - [SPECIES_MELOETTA_PIROUETTE] = gMonIcon_MeloettaPirouette, - [SPECIES_GENESECT_DOUSE_DRIVE] = gMonIcon_Genesect, - [SPECIES_GENESECT_SHOCK_DRIVE] = gMonIcon_Genesect, - [SPECIES_GENESECT_BURN_DRIVE] = gMonIcon_Genesect, - [SPECIES_GENESECT_CHILL_DRIVE] = gMonIcon_Genesect, - [SPECIES_GRENINJA_BATTLE_BOND] = gMonIcon_Greninja, - [SPECIES_GRENINJA_ASH] = gMonIcon_GreninjaAsh, - [SPECIES_VIVILLON_POLAR] = gMonIcon_VivillonPolar, - [SPECIES_VIVILLON_TUNDRA] = gMonIcon_VivillonTundra, - [SPECIES_VIVILLON_CONTINENTAL] = gMonIcon_VivillonContinental, - [SPECIES_VIVILLON_GARDEN] = gMonIcon_VivillonGarden, - [SPECIES_VIVILLON_ELEGANT] = gMonIcon_VivillonElegant, - [SPECIES_VIVILLON_MEADOW] = gMonIcon_VivillonMeadow, - [SPECIES_VIVILLON_MODERN] = gMonIcon_VivillonModern, - [SPECIES_VIVILLON_MARINE] = gMonIcon_VivillonMarine, - [SPECIES_VIVILLON_ARCHIPELAGO] = gMonIcon_VivillonArchipelago, - [SPECIES_VIVILLON_HIGH_PLAINS] = gMonIcon_VivillonHighPlains, - [SPECIES_VIVILLON_SANDSTORM] = gMonIcon_VivillonSandstorm, - [SPECIES_VIVILLON_RIVER] = gMonIcon_VivillonRiver, - [SPECIES_VIVILLON_MONSOON] = gMonIcon_VivillonMonsoon, - [SPECIES_VIVILLON_SAVANNA] = gMonIcon_VivillonSavanna, - [SPECIES_VIVILLON_SUN] = gMonIcon_VivillonSun, - [SPECIES_VIVILLON_OCEAN] = gMonIcon_VivillonOcean, - [SPECIES_VIVILLON_JUNGLE] = gMonIcon_VivillonJungle, - [SPECIES_VIVILLON_FANCY] = gMonIcon_VivillonFancy, - [SPECIES_VIVILLON_POKE_BALL] = gMonIcon_VivillonPokeBall, - [SPECIES_FLABEBE_YELLOW_FLOWER] = gMonIcon_FlabebeYellowFlower, - [SPECIES_FLABEBE_ORANGE_FLOWER] = gMonIcon_FlabebeOrangeFlower, - [SPECIES_FLABEBE_BLUE_FLOWER] = gMonIcon_FlabebeBlueFlower, - [SPECIES_FLABEBE_WHITE_FLOWER] = gMonIcon_FlabebeWhiteFlower, - [SPECIES_FLOETTE_YELLOW_FLOWER] = gMonIcon_FloetteYellowFlower, - [SPECIES_FLOETTE_ORANGE_FLOWER] = gMonIcon_FloetteOrangeFlower, - [SPECIES_FLOETTE_BLUE_FLOWER] = gMonIcon_FloetteBlueFlower, - [SPECIES_FLOETTE_WHITE_FLOWER] = gMonIcon_FloetteWhiteFlower, - [SPECIES_FLOETTE_ETERNAL_FLOWER] = gMonIcon_FloetteEternalFlower, - [SPECIES_FLORGES_YELLOW_FLOWER] = gMonIcon_FlorgesYellowFlower, - [SPECIES_FLORGES_ORANGE_FLOWER] = gMonIcon_FlorgesOrangeFlower, - [SPECIES_FLORGES_BLUE_FLOWER] = gMonIcon_FlorgesBlueFlower, - [SPECIES_FLORGES_WHITE_FLOWER] = gMonIcon_FlorgesWhiteFlower, - [SPECIES_FURFROU_HEART_TRIM] = gMonIcon_FurfrouHeartTrim, - [SPECIES_FURFROU_STAR_TRIM] = gMonIcon_FurfrouStarTrim, - [SPECIES_FURFROU_DIAMOND_TRIM] = gMonIcon_FurfrouDiamondTrim, - [SPECIES_FURFROU_DEBUTANTE_TRIM] = gMonIcon_FurfrouDebutanteTrim, - [SPECIES_FURFROU_MATRON_TRIM] = gMonIcon_FurfrouMatronTrim, - [SPECIES_FURFROU_DANDY_TRIM] = gMonIcon_FurfrouDandyTrim, - [SPECIES_FURFROU_LA_REINE_TRIM] = gMonIcon_FurfrouLaReineTrim, - [SPECIES_FURFROU_KABUKI_TRIM] = gMonIcon_FurfrouKabukiTrim, - [SPECIES_FURFROU_PHARAOH_TRIM] = gMonIcon_FurfrouPharaohTrim, - [SPECIES_MEOWSTIC_FEMALE] = gMonIcon_MeowsticFemale, - [SPECIES_AEGISLASH_BLADE] = gMonIcon_AegislashBlade, - [SPECIES_PUMPKABOO_SMALL] = gMonIcon_Pumpkaboo, - [SPECIES_PUMPKABOO_LARGE] = gMonIcon_Pumpkaboo, - [SPECIES_PUMPKABOO_SUPER] = gMonIcon_Pumpkaboo, - [SPECIES_GOURGEIST_SMALL] = gMonIcon_Gourgeist, - [SPECIES_GOURGEIST_LARGE] = gMonIcon_Gourgeist, - [SPECIES_GOURGEIST_SUPER] = gMonIcon_Gourgeist, - [SPECIES_XERNEAS_ACTIVE] = gMonIcon_XerneasActive, - [SPECIES_ZYGARDE_10_AURA_BREAK] = gMonIcon_Zygarde10, - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = gMonIcon_Zygarde10, - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = gMonIcon_Zygarde50, - [SPECIES_ZYGARDE_COMPLETE] = gMonIcon_ZygardeComplete, - [SPECIES_HOOPA_UNBOUND] = gMonIcon_HoopaUnbound, - [SPECIES_ORICORIO_POM_POM] = gMonIcon_OricorioPomPom, - [SPECIES_ORICORIO_PAU] = gMonIcon_OricorioPau, - [SPECIES_ORICORIO_SENSU] = gMonIcon_OricorioSensu, - [SPECIES_ROCKRUFF_OWN_TEMPO] = gMonIcon_Rockruff, - [SPECIES_LYCANROC_MIDNIGHT] = gMonIcon_LycanrocMidnight, - [SPECIES_LYCANROC_DUSK] = gMonIcon_LycanrocDusk, - [SPECIES_WISHIWASHI_SCHOOL] = gMonIcon_WishiwashiSchool, - [SPECIES_SILVALLY_FIGHTING] = gMonIcon_Silvally, - [SPECIES_SILVALLY_FLYING] = gMonIcon_Silvally, - [SPECIES_SILVALLY_POISON] = gMonIcon_Silvally, - [SPECIES_SILVALLY_GROUND] = gMonIcon_Silvally, - [SPECIES_SILVALLY_ROCK] = gMonIcon_Silvally, - [SPECIES_SILVALLY_BUG] = gMonIcon_Silvally, - [SPECIES_SILVALLY_GHOST] = gMonIcon_Silvally, - [SPECIES_SILVALLY_STEEL] = gMonIcon_Silvally, - [SPECIES_SILVALLY_FIRE] = gMonIcon_Silvally, - [SPECIES_SILVALLY_WATER] = gMonIcon_Silvally, - [SPECIES_SILVALLY_GRASS] = gMonIcon_Silvally, - [SPECIES_SILVALLY_ELECTRIC] = gMonIcon_Silvally, - [SPECIES_SILVALLY_PSYCHIC] = gMonIcon_Silvally, - [SPECIES_SILVALLY_ICE] = gMonIcon_Silvally, - [SPECIES_SILVALLY_DRAGON] = gMonIcon_Silvally, - [SPECIES_SILVALLY_DARK] = gMonIcon_Silvally, - [SPECIES_SILVALLY_FAIRY] = gMonIcon_Silvally, - [SPECIES_MINIOR_METEOR_ORANGE] = gMonIcon_MiniorMeteor, - [SPECIES_MINIOR_METEOR_YELLOW] = gMonIcon_MiniorMeteor, - [SPECIES_MINIOR_METEOR_GREEN] = gMonIcon_MiniorMeteor, - [SPECIES_MINIOR_METEOR_BLUE] = gMonIcon_MiniorMeteor, - [SPECIES_MINIOR_METEOR_INDIGO] = gMonIcon_MiniorMeteor, - [SPECIES_MINIOR_METEOR_VIOLET] = gMonIcon_MiniorMeteor, - [SPECIES_MINIOR_CORE_RED] = gMonIcon_MiniorCoreRed, - [SPECIES_MINIOR_CORE_ORANGE] = gMonIcon_MiniorCoreOrange, - [SPECIES_MINIOR_CORE_YELLOW] = gMonIcon_MiniorCoreYellow, - [SPECIES_MINIOR_CORE_GREEN] = gMonIcon_MiniorCoreGreen, - [SPECIES_MINIOR_CORE_BLUE] = gMonIcon_MiniorCoreBlue, - [SPECIES_MINIOR_CORE_INDIGO] = gMonIcon_MiniorCoreIndigo, - [SPECIES_MINIOR_CORE_VIOLET] = gMonIcon_MiniorCoreViolet, - [SPECIES_MIMIKYU_BUSTED] = gMonIcon_MimikyuBusted, - [SPECIES_NECROZMA_DUSK_MANE] = gMonIcon_NecrozmaDuskMane, - [SPECIES_NECROZMA_DAWN_WINGS] = gMonIcon_NecrozmaDawnWings, - [SPECIES_NECROZMA_ULTRA] = gMonIcon_NecrozmaUltra, - [SPECIES_MAGEARNA_ORIGINAL_COLOR] = gMonIcon_MagearnaOriginalColor, - [SPECIES_CRAMORANT_GULPING] = gMonIcon_CramorantGulping, - [SPECIES_CRAMORANT_GORGING] = gMonIcon_CramorantGorging, - [SPECIES_TOXTRICITY_LOW_KEY] = gMonIcon_ToxtricityLowKey, - [SPECIES_SINISTEA_ANTIQUE] = gMonIcon_Sinistea, - [SPECIES_POLTEAGEIST_ANTIQUE] = gMonIcon_Polteageist, - [SPECIES_EISCUE_NOICE_FACE] = gMonIcon_EiscueNoiceFace, - [SPECIES_INDEEDEE_FEMALE] = gMonIcon_IndeedeeFemale, - [SPECIES_MORPEKO_HANGRY] = gMonIcon_MorpekoHangry, - [SPECIES_ZACIAN_CROWNED_SWORD] = gMonIcon_ZacianCrownedSword, - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = gMonIcon_ZamazentaCrownedShield, - [SPECIES_ETERNATUS_ETERNAMAX] = gMonIcon_EternatusEternamax, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = gMonIcon_UrshifuSingleStrikeStyle, - [SPECIES_ZARUDE_DADA] = gMonIcon_ZarudeDada, - [SPECIES_CALYREX_ICE_RIDER] = gMonIcon_CalyrexIceRider, - [SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_CalyrexShadowRider, - [SPECIES_ENAMORUS_THERIAN] = gMonIcon_EnamorusTherian, - [SPECIES_BASCULEGION_FEMALE] = gMonIcon_BasculegionFemale, - // Gigantamax Forms - [SPECIES_VENUSAUR_GIGANTAMAX] = gMonIcon_VenusaurGigantamax, - [SPECIES_CHARIZARD_GIGANTAMAX] = gMonIcon_CharizardGigantamax, - [SPECIES_BLASTOISE_GIGANTAMAX] = gMonIcon_BlastoiseGigantamax, - [SPECIES_BUTTERFREE_GIGANTAMAX] = gMonIcon_ButterfreeGigantamax, - [SPECIES_PIKACHU_GIGANTAMAX] = gMonIcon_PikachuGigantamax, - [SPECIES_MEOWTH_GIGANTAMAX] = gMonIcon_MeowthGigantamax, - [SPECIES_MACHAMP_GIGANTAMAX] = gMonIcon_MachampGigantamax, - [SPECIES_GENGAR_GIGANTAMAX] = gMonIcon_GengarGigantamax, - [SPECIES_KINGLER_GIGANTAMAX] = gMonIcon_KinglerGigantamax, - [SPECIES_LAPRAS_GIGANTAMAX] = gMonIcon_LaprasGigantamax, - [SPECIES_EEVEE_GIGANTAMAX] = gMonIcon_EeveeGigantamax, - [SPECIES_SNORLAX_GIGANTAMAX] = gMonIcon_SnorlaxGigantamax, - [SPECIES_GARBODOR_GIGANTAMAX] = gMonIcon_GarbodorGigantamax, - [SPECIES_MELMETAL_GIGANTAMAX] = gMonIcon_MelmetalGigantamax, - [SPECIES_RILLABOOM_GIGANTAMAX] = gMonIcon_RillaboomGigantamax, - [SPECIES_CINDERACE_GIGANTAMAX] = gMonIcon_CinderaceGigantamax, - [SPECIES_INTELEON_GIGANTAMAX] = gMonIcon_InteleonGigantamax, - [SPECIES_CORVIKNIGHT_GIGANTAMAX] = gMonIcon_CorviknightGigantamax, - [SPECIES_ORBEETLE_GIGANTAMAX] = gMonIcon_OrbeetleGigantamax, - [SPECIES_DREDNAW_GIGANTAMAX] = gMonIcon_DrednawGigantamax, - [SPECIES_COALOSSAL_GIGANTAMAX] = gMonIcon_CoalossalGigantamax, - [SPECIES_FLAPPLE_GIGANTAMAX] = gMonIcon_FlappleGigantamax, - [SPECIES_APPLETUN_GIGANTAMAX] = gMonIcon_AppletunGigantamax, - [SPECIES_SANDACONDA_GIGANTAMAX] = gMonIcon_SandacondaGigantamax, - [SPECIES_TOXTRICITY_AMPED_GIGANTAMAX] = gMonIcon_ToxtricityGigantamax, - [SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX] = gMonIcon_ToxtricityGigantamax, - [SPECIES_CENTISKORCH_GIGANTAMAX] = gMonIcon_CentiskorchGigantamax, - [SPECIES_HATTERENE_GIGANTAMAX] = gMonIcon_HattereneGigantamax, - [SPECIES_GRIMMSNARL_GIGANTAMAX] = gMonIcon_GrimmsnarlGigantamax, - [SPECIES_ALCREMIE_GIGANTAMAX] = gMonIcon_AlcremieGigantamax, - [SPECIES_COPPERAJAH_GIGANTAMAX] = gMonIcon_CopperajahGigantamax, - [SPECIES_DURALUDON_GIGANTAMAX] = gMonIcon_DuraludonGigantamax, - [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = gMonIcon_UrshifuSingleStrikeGigantamax, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = gMonIcon_UrshifuRapidStrikeGigantamax, - [SPECIES_SPRIGATITO] = gMonIcon_Sprigatito, - [SPECIES_FLORAGATO] = gMonIcon_Floragato, - [SPECIES_MEOWSCARADA] = gMonIcon_Meowscarada, - [SPECIES_FUECOCO] = gMonIcon_Fuecoco, - [SPECIES_CROCALOR] = gMonIcon_Crocalor, - [SPECIES_SKELEDIRGE] = gMonIcon_Skeledirge, - [SPECIES_QUAXLY] = gMonIcon_Quaxly, - [SPECIES_QUAXWELL] = gMonIcon_Quaxwell, - [SPECIES_QUAQUAVAL] = gMonIcon_Quaquaval, - [SPECIES_LECHONK] = gMonIcon_Lechonk, - [SPECIES_OINKOLOGNE_MALE] = gMonIcon_OinkologneMale, - [SPECIES_OINKOLOGNE_FEMALE] = gMonIcon_OinkologneFemale, - [SPECIES_TAROUNTULA] = gMonIcon_Tarountula, - [SPECIES_SPIDOPS] = gMonIcon_Spidops, - [SPECIES_NYMBLE] = gMonIcon_Nymble, - [SPECIES_LOKIX] = gMonIcon_Lokix, - [SPECIES_PAWMI] = gMonIcon_Pawmi, - [SPECIES_PAWMO] = gMonIcon_Pawmo, - [SPECIES_PAWMOT] = gMonIcon_Pawmot, - [SPECIES_TANDEMAUS] = gMonIcon_Tandemaus, - [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = gMonIcon_MausholdFamilyOfThree, - [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = gMonIcon_MausholdFamilyOfFour, - [SPECIES_FIDOUGH] = gMonIcon_Fidough, - [SPECIES_DACHSBUN] = gMonIcon_Dachsbun, - [SPECIES_SMOLIV] = gMonIcon_Smoliv, - [SPECIES_DOLLIV] = gMonIcon_Dolliv, - [SPECIES_ARBOLIVA] = gMonIcon_Arboliva, - [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = gMonIcon_SquawkabillyGreenPlumage, - [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = gMonIcon_SquawkabillyBluePlumage, - [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = gMonIcon_SquawkabillyYellowPlumage, - [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = gMonIcon_SquawkabillyWhitePlumage, - [SPECIES_NACLI] = gMonIcon_Nacli, - [SPECIES_NACLSTACK] = gMonIcon_Naclstack, - [SPECIES_GARGANACL] = gMonIcon_Garganacl, - [SPECIES_CHARCADET] = gMonIcon_Charcadet, - [SPECIES_ARMAROUGE] = gMonIcon_Armarouge, - [SPECIES_CERULEDGE] = gMonIcon_Ceruledge, - [SPECIES_TADBULB] = gMonIcon_Tadbulb, - [SPECIES_BELLIBOLT] = gMonIcon_Bellibolt, - [SPECIES_WATTREL] = gMonIcon_Wattrel, - [SPECIES_KILOWATTREL] = gMonIcon_Kilowattrel, - [SPECIES_MASCHIFF] = gMonIcon_Maschiff, - [SPECIES_MABOSSTIFF] = gMonIcon_Mabosstiff, - [SPECIES_SHROODLE] = gMonIcon_Shroodle, - [SPECIES_GRAFAIAI] = gMonIcon_Grafaiai, - [SPECIES_BRAMBLIN] = gMonIcon_Bramblin, - [SPECIES_BRAMBLEGHAST] = gMonIcon_Brambleghast, - [SPECIES_TOEDSCOOL] = gMonIcon_Toedscool, - [SPECIES_TOEDSCRUEL] = gMonIcon_Toedscruel, - [SPECIES_KLAWF] = gMonIcon_Klawf, - [SPECIES_CAPSAKID] = gMonIcon_Capsakid, - [SPECIES_SCOVILLAIN] = gMonIcon_Scovillain, - [SPECIES_RELLOR] = gMonIcon_Rellor, - [SPECIES_RABSCA] = gMonIcon_Rabsca, - [SPECIES_FLITTLE] = gMonIcon_Flittle, - [SPECIES_ESPATHRA] = gMonIcon_Espathra, - [SPECIES_TINKATINK] = gMonIcon_Tinkatink, - [SPECIES_TINKATUFF] = gMonIcon_Tinkatuff, - [SPECIES_TINKATON] = gMonIcon_Tinkaton, - [SPECIES_WIGLETT] = gMonIcon_Wiglett, - [SPECIES_WUGTRIO] = gMonIcon_Wugtrio, - [SPECIES_BOMBIRDIER] = gMonIcon_Bombirdier, - [SPECIES_FINIZEN] = gMonIcon_Finizen, - [SPECIES_PALAFIN_ZERO] = gMonIcon_PalafinZero, - [SPECIES_PALAFIN_HERO] = gMonIcon_PalafinHero, - [SPECIES_VAROOM] = gMonIcon_Varoom, - [SPECIES_REVAVROOM] = gMonIcon_Revavroom, - [SPECIES_CYCLIZAR] = gMonIcon_Cyclizar, - [SPECIES_ORTHWORM] = gMonIcon_Orthworm, - [SPECIES_GLIMMET] = gMonIcon_Glimmet, - [SPECIES_GLIMMORA] = gMonIcon_Glimmora, - [SPECIES_GREAVARD] = gMonIcon_Greavard, - [SPECIES_HOUNDSTONE] = gMonIcon_Houndstone, - [SPECIES_FLAMIGO] = gMonIcon_Flamigo, - [SPECIES_CETODDLE] = gMonIcon_Cetoddle, - [SPECIES_CETITAN] = gMonIcon_Cetitan, - [SPECIES_VELUZA] = gMonIcon_Veluza, - [SPECIES_DONDOZO] = gMonIcon_Dondozo, - [SPECIES_TATSUGIRI_CURLY] = gMonIcon_TatsugiriCurly, - [SPECIES_TATSUGIRI_DROOPY] = gMonIcon_TatsugiriDroopy, - [SPECIES_TATSUGIRI_STRETCHY] = gMonIcon_TatsugiriStretchy, - [SPECIES_ANNIHILAPE] = gMonIcon_Annihilape, - [SPECIES_CLODSIRE] = gMonIcon_Clodsire, - [SPECIES_FARIGIRAF] = gMonIcon_Farigiraf, - [SPECIES_DUDUNSPARCE_TWO_SEGMENT] = gMonIcon_Dudunsparce, - [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = gMonIcon_Dudunsparce, - [SPECIES_KINGAMBIT] = gMonIcon_Kingambit, - [SPECIES_GREAT_TUSK] = gMonIcon_GreatTusk, - [SPECIES_SCREAM_TAIL] = gMonIcon_ScreamTail, - [SPECIES_BRUTE_BONNET] = gMonIcon_BruteBonnet, - [SPECIES_FLUTTER_MANE] = gMonIcon_FlutterMane, - [SPECIES_SLITHER_WING] = gMonIcon_SlitherWing, - [SPECIES_SANDY_SHOCKS] = gMonIcon_SandyShocks, - [SPECIES_IRON_TREADS] = gMonIcon_IronTreads, - [SPECIES_IRON_BUNDLE] = gMonIcon_IronBundle, - [SPECIES_IRON_HANDS] = gMonIcon_IronHands, - [SPECIES_IRON_JUGULIS] = gMonIcon_IronJugulis, - [SPECIES_IRON_MOTH] = gMonIcon_IronMoth, - [SPECIES_IRON_THORNS] = gMonIcon_IronThorns, - [SPECIES_FRIGIBAX] = gMonIcon_Frigibax, - [SPECIES_ARCTIBAX] = gMonIcon_Arctibax, - [SPECIES_BAXCALIBUR] = gMonIcon_Baxcalibur, - [SPECIES_GIMMIGHOUL_CHEST] = gMonIcon_GimmighoulChest, - [SPECIES_GIMMIGHOUL_ROAMING] = gMonIcon_GimmighoulRoaming, - [SPECIES_GHOLDENGO] = gMonIcon_Gholdengo, - [SPECIES_WO_CHIEN] = gMonIcon_WoChien, - [SPECIES_CHIEN_PAO] = gMonIcon_ChienPao, - [SPECIES_TING_LU] = gMonIcon_TingLu, - [SPECIES_CHI_YU] = gMonIcon_ChiYu, - [SPECIES_ROARING_MOON] = gMonIcon_RoaringMoon, - [SPECIES_IRON_VALIANT] = gMonIcon_IronValiant, - [SPECIES_KORAIDON] = gMonIcon_Koraidon, - [SPECIES_MIRAIDON] = gMonIcon_Miraidon, - [SPECIES_WALKING_WAKE] = gMonIcon_WalkingWake, - [SPECIES_IRON_LEAVES] = gMonIcon_IronLeaves, - [SPECIES_DIPPLIN] = gMonIcon_Dipplin, - [SPECIES_POLTCHAGEIST_COUNTERFEIT] = gMonIcon_Poltchageist, - [SPECIES_POLTCHAGEIST_ARTISAN] = gMonIcon_Poltchageist, - [SPECIES_SINISTCHA_UNREMARKABLE] = gMonIcon_Sinistcha, - [SPECIES_SINISTCHA_MASTERPIECE] = gMonIcon_Sinistcha, - [SPECIES_OKIDOGI] = gMonIcon_Okidogi, - [SPECIES_MUNKIDORI] = gMonIcon_Munkidori, - [SPECIES_FEZANDIPITI] = gMonIcon_Fezandipiti, - [SPECIES_OGERPON_TEAL_MASK] = gMonIcon_OgerponTealMask, - //[SPECIES_OGERPON_WELLSPRING_MASK] = gMonIcon_OgerponWellspringMask, TODO - //[SPECIES_OGERPON_HEARTHFLAME_MASK] = gMonIcon_OgerponHearthflameMask, TODO - //[SPECIES_OGERPON_CORNERSTONE_MASK] = gMonIcon_OgerponCornerstoneMask, TODO - [SPECIES_OGERPON_TEAL_MASK_TERA] = gMonIcon_OgerponTealMask, - //[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = gMonIcon_OgerponWellspringMask, TODO - //[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = gMonIcon_OgerponHearthflameMask, TODO - //[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = gMonIcon_OgerponCornerstoneMask, TODO - [SPECIES_EGG] = gMonIcon_Egg, -}; -*/ - const struct SpritePalette gMonIconPaletteTable[] = { { gMonIconPalettes[0], POKE_ICON_BASE_PAL_TAG + 0 }, From 91dfa93d3bc54bc629309301d3a9b18ffdbf48f8 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:46:07 -0500 Subject: [PATCH 54/82] fix genie storm move anims for both targets, add AnimEllipticalGustCentered, AnimParticleInVortex handles multiple targets, add dynamic pals based on move target in UnpackSelectedBattlePalettes (#3895) Co-authored-by: ghoulslash --- data/battle_anim_scripts.s | 122 +++++++++++++++++++------------------ include/battle_anim.h | 1 + src/battle_anim_flying.c | 21 +++++++ src/battle_anim_new.c | 2 +- src/battle_anim_normal.c | 17 ++++++ src/battle_anim_rock.c | 6 +- 6 files changed, 104 insertions(+), 65 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 0611dee786..4145679f34 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -7022,6 +7022,10 @@ HurricaneGust: createsprite gEllipticalGustSpriteTemplate, ANIM_ATTACKER, 2, 0, -16 createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 return +HurricaneGustCentered: + createsprite gEllipticalGustCenteredSpriteTemplate, ANIM_ATTACKER, 2, 0, -16 + createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 + return Move_HEAD_CHARGE: loadspritegfx ANIM_TAG_IMPACT @@ -15915,36 +15919,36 @@ Move_SPRINGTIDE_STORM:: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_RED_HEART playsewithpan SE_M_GUST, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 88, 1 - createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 2, 6, 0, 11, RGB(31, 22, 30) - call HurricaneGust + createvisualtaskontargets AnimTask_ShakeMon2, 2, 0, ANIM_TARGET, 0, 4, 0x58, 1 + createvisualtask AnimTask_BlendColorCycle, 0x2, F_PAL_TARGET, 0x2, 0x6, 0x0, 0xB, 0x7ADF + call HurricaneGustCentered call SpringtideStormHeartSwirl - call HurricaneGust + call HurricaneGustCentered call SpringtideStormHeartSwirl - call HurricaneGust + call HurricaneGustCentered call SpringtideStormHeartSwirl - call HurricaneGust + call HurricaneGustCentered call SpringtideStormHeartSwirl - call HurricaneGust + call HurricaneGustCentered call SpringtideStormHeartSwirl - call HurricaneGust + call HurricaneGustCentered call SpringtideStormHeartSwirl waitforvisualfinish stopsound end SpringtideStormHeartSwirl: - createsprite gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET + createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET + createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET + createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET + createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET + createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET + createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET return @@ -16485,37 +16489,37 @@ Move_BLEAKWIND_STORM:: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_ICE_CRYSTALS playsewithpan SE_M_GUST, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 88, 1 - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0xB, 0x7FFF - call HurricaneGust + createvisualtaskontargets AnimTask_ShakeMon2, 2, 0, ANIM_TARGET, 0, 4, 0x58, 1 + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0xB, 0x7FFF + call HurricaneGustCentered call BleakwindStormIceSwirl - call HurricaneGust + call HurricaneGustCentered call BleakwindStormIceSwirl - call HurricaneGust + call HurricaneGustCentered call BleakwindStormIceSwirl - call HurricaneGust + call HurricaneGustCentered call BleakwindStormIceSwirl - call HurricaneGust + call HurricaneGustCentered call BleakwindStormIceSwirl - call HurricaneGust + call HurricaneGustCentered call BleakwindStormIceSwirl waitforvisualfinish stopsound - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0xB, 0x0, 0x7FFF + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0xB, 0x0, 0x7FFF waitforvisualfinish end BleakwindStormIceSwirl: - createsprite gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET + createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET + createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET + createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET + createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET + createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET + createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET return @@ -16528,39 +16532,39 @@ Move_WILDBOLT_STORM:: createvisualtask AnimTask_StartSlidingBg, 0x5, 0xff00, 0x0, 0x1, 0xffff waitbgfadein playsewithpan SE_M_GUST, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 88, 1 - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0xB, 0x07FE - call HurricaneGust + createvisualtaskontargets AnimTask_ShakeMon2, 2, 0, ANIM_TARGET, 0, 4, 0x58, 1 + createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 0x4, 0x0, 0xB, 0x07FE + call HurricaneGustCentered call WildboltStormSparkSwirl - call HurricaneGust + call HurricaneGustCentered call WildboltStormSparkSwirl - call HurricaneGust + call HurricaneGustCentered call WildboltStormSparkSwirl - call HurricaneGust + call HurricaneGustCentered call WildboltStormSparkSwirl - call HurricaneGust + call HurricaneGustCentered call WildboltStormSparkSwirl - call HurricaneGust + call HurricaneGustCentered call WildboltStormSparkSwirl waitforvisualfinish stopsound - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0xB, 0x0, 0x07FE + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0xB, 0x0, 0x07FE call UnsetPsychicBg waitforvisualfinish end WildboltStormSparkSwirl: - createsprite gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET + createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET + createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET + createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET + createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET + createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET delay 0x2 - createsprite gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET + createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET return @@ -16570,38 +16574,38 @@ Move_SANDSEAR_STORM:: loadspritegfx ANIM_TAG_SMALL_EMBER createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_GUST, 0x0, 0xA, 0xA, 0x190B playsewithpan SE_M_GUST, SOUND_PAN_TARGET - createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 88, 1 - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0xB, 0x1F - call HurricaneGust + createvisualtaskontargets AnimTask_ShakeMon2, 2, 0, ANIM_TARGET, 0, 4, 0x58, 1 + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0xB, 0x1F + call HurricaneGustCentered call SandsearStormFireSpin - call HurricaneGust + call HurricaneGustCentered call SandsearStormFireSpin - call HurricaneGust + call HurricaneGustCentered call SandsearStormFireSpin - call HurricaneGust + call HurricaneGustCentered call SandsearStormFireSpin - call HurricaneGust + call HurricaneGustCentered call SandsearStormFireSpin - call HurricaneGust + call HurricaneGustCentered call SandsearStormFireSpin waitforvisualfinish stopsound - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0xB, 0x0, 0x1F + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0xB, 0x0, 0x1F waitforvisualfinish end SandsearStormFireSpin: - createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, ANIM_TARGET + createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, ANIM_TARGET delay 0x2 - createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, ANIM_TARGET + createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, ANIM_TARGET delay 0x2 - createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, ANIM_TARGET + createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, ANIM_TARGET delay 0x2 - createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, ANIM_TARGET + createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, ANIM_TARGET delay 0x2 - createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, ANIM_TARGET + createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, ANIM_TARGET delay 0x2 - createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, ANIM_TARGET + createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, ANIM_TARGET return diff --git a/include/battle_anim.h b/include/battle_anim.h index 7aaa099518..f8f0dff969 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -548,5 +548,6 @@ void AnimOutrageFlame(struct Sprite *sprite); // battle_anim_new.c void CoreEnforcerLoadBeamTarget(struct Sprite *sprite); void SpriteCB_RandomCentredHits(struct Sprite *sprite); +void InitSpritePosToAnimTargetsCentre(struct Sprite *sprite, bool32 respectMonPicOffsets); #endif // GUARD_BATTLE_ANIM_H diff --git a/src/battle_anim_flying.c b/src/battle_anim_flying.c index 91ac5e7841..f58aa97ee2 100644 --- a/src/battle_anim_flying.c +++ b/src/battle_anim_flying.c @@ -10,6 +10,7 @@ extern const struct SpriteTemplate gFlashingHitSplatSpriteTemplate; +static void AnimEllipticalGustCentered(struct Sprite *sprite); static void AnimEllipticalGust_Step(struct Sprite *); static void AnimGustToTarget(struct Sprite *); static void AnimGustToTarget_Step(struct Sprite *); @@ -32,6 +33,17 @@ static void AnimSkyAttackBird_Step(struct Sprite *); static void AnimTask_AnimateGustTornadoPalette_Step(u8); static void AnimTask_LoadWindstormBackground_Step(u8 taskId); +const struct SpriteTemplate gEllipticalGustCenteredSpriteTemplate = +{ + .tileTag = ANIM_TAG_GUST, + .paletteTag = ANIM_TAG_GUST, + .oam = &gOamData_AffineOff_ObjNormal_32x64, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = AnimEllipticalGustCentered, +}; + const struct SpriteTemplate gEllipticalGustSpriteTemplate = { .tileTag = ANIM_TAG_GUST, @@ -344,6 +356,15 @@ const struct SpriteTemplate gSkyAttackBirdSpriteTemplate = .callback = AnimSkyAttackBird, }; +// same as AnimEllipticalGust but centered on targets +static void AnimEllipticalGustCentered(struct Sprite *sprite) +{ + InitSpritePosToAnimTargetsCentre(sprite, FALSE); + sprite->y += 20; + sprite->data[1] = 191; + sprite->callback = AnimEllipticalGust_Step; + sprite->callback(sprite); +} void AnimEllipticalGust(struct Sprite *sprite) { diff --git a/src/battle_anim_new.c b/src/battle_anim_new.c index 5faa0a696a..1d4a0bd562 100644 --- a/src/battle_anim_new.c +++ b/src/battle_anim_new.c @@ -7247,7 +7247,7 @@ static void InitSpritePosToGivenTarget(struct Sprite *sprite, u8 target) sprite->y2 = gBattleAnimArgs[1]; } -static void InitSpritePosToAnimTargetsCentre(struct Sprite *sprite, bool8 respectMonPicOffsets) +void InitSpritePosToAnimTargetsCentre(struct Sprite *sprite, bool32 respectMonPicOffsets) { if (!respectMonPicOffsets) { diff --git a/src/battle_anim_normal.c b/src/battle_anim_normal.c index f710409229..3b2de5ddbb 100644 --- a/src/battle_anim_normal.c +++ b/src/battle_anim_normal.c @@ -413,6 +413,23 @@ u32 UnpackSelectedBattlePalettes(s16 selector) bool8 targetPartner = (selector >> 4) & 1; bool8 anim1 = (selector >> 5) & 1; bool8 anim2 = (selector >> 6) & 1; + u32 moveTarget = GetBattlerMoveTargetType(gBattlerAttacker, gAnimMoveIndex); + + switch (moveTarget) + { + case MOVE_TARGET_BOTH: + if (target) { + targetPartner |= 1; + } + break; + case MOVE_TARGET_FOES_AND_ALLY: + if (target) { + targetPartner |= 1; + attackerPartner |= 1; + } + break; + } + return GetBattlePalettesMask(battleBackground, attacker, target, attackerPartner, targetPartner, anim1, anim2); } diff --git a/src/battle_anim_rock.c b/src/battle_anim_rock.c index 6811c857b3..7a84757cd9 100644 --- a/src/battle_anim_rock.c +++ b/src/battle_anim_rock.c @@ -456,11 +456,7 @@ void AnimRockFragment(struct Sprite *sprite) // Swirls particle in vortex. Used for moves like Fire Spin or Sand Tomb void AnimParticleInVortex(struct Sprite *sprite) { - if (gBattleAnimArgs[6] == ANIM_ATTACKER) - InitSpritePosToAnimAttacker(sprite, FALSE); - else - InitSpritePosToAnimTarget(sprite, FALSE); - + InitSpritePosToAnimBattler(gBattleAnimArgs[6], sprite, FALSE); sprite->data[0] = gBattleAnimArgs[3]; sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[4]; From ef6e8ba2eae8da9fa19895f9295c8bfce751214a Mon Sep 17 00:00:00 2001 From: kaisermg5 Date: Wed, 3 Jan 2024 13:07:39 -0300 Subject: [PATCH 55/82] Added Dugtrio's footprint and formSpeciedIdTable. (#3897) --- src/data/pokemon/species_info/gen_1.h | 28 ++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/data/pokemon/species_info/gen_1.h b/src/data/pokemon/species_info/gen_1.h index b502422c0b..af319cab9b 100644 --- a/src/data/pokemon/species_info/gen_1.h +++ b/src/data/pokemon/species_info/gen_1.h @@ -3723,19 +3723,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .formSpeciesIdTable = sDiglettFormSpeciesIdTable, \ DIGLETT_FAMILY_MISC_INFO -#define DUGTRIO_MISC_INFO \ - .catchRate = 50, \ - .expYield = 149, \ - .evYield_Speed = 2, \ - .speciesName = _("Dugtrio"), \ - .cryId = CRY_DUGTRIO, \ - .natDexNum = NATIONAL_DEX_DUGTRIO, \ - .categoryName = _("Mole"), \ - .height = 7, \ - .pokemonScale = 406, \ - .pokemonOffset = 18, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ +#define DUGTRIO_MISC_INFO \ + .catchRate = 50, \ + .expYield = 149, \ + .evYield_Speed = 2, \ + .speciesName = _("Dugtrio"), \ + .cryId = CRY_DUGTRIO, \ + .natDexNum = NATIONAL_DEX_DUGTRIO, \ + .categoryName = _("Mole"), \ + .height = 7, \ + .pokemonScale = 406, \ + .pokemonOffset = 18, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .footprint = gMonFootprint_Dugtrio, \ + .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, \ DIGLETT_FAMILY_MISC_INFO #define DUGTRIO_ATTACK (P_UPDATED_STATS >= GEN_7 ? 100 : 80) From e2c8edeaa64e58763321d6a78556852e063fb617 Mon Sep 17 00:00:00 2001 From: kaisermg5 Date: Wed, 3 Jan 2024 13:20:00 -0300 Subject: [PATCH 56/82] Fix HGSS pokedex preevolutions (#3894) * Fix pre-evolution search in pokedex plus. * Fix mega-evolution search in pokedex plus. --------- Co-authored-by: Bassoonian --- src/pokedex_plus_hgss.c | 48 +++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index d5258362ab..301836867c 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -6481,13 +6481,37 @@ static u8 PrintPreEvolutions(u8 taskId, u16 species) u16 preEvolutionTwo = 0; u8 numPreEvolutions = 0; - bool8 isMega = FALSE; + u16 baseFormSpecies; sPokedexView->sEvoScreenData.isMega = FALSE; + //Check if it's a mega + baseFormSpecies = GetFormSpeciesId(species, 0); + if (baseFormSpecies != species) + { + const struct FormChange *formChanges = GetSpeciesFormChanges(baseFormSpecies); + for (i = 0; formChanges != NULL && formChanges[i].method != FORM_CHANGE_TERMINATOR; i++) + { + if (formChanges[i].method == FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM + && formChanges[i].targetSpecies == species) + { + preEvolutionOne = baseFormSpecies; + numPreEvolutions += 1; + sPokedexView->numPreEvolutions = numPreEvolutions; + sPokedexView->sEvoScreenData.numAllEvolutions += numPreEvolutions; + sPokedexView->sEvoScreenData.isMega = TRUE; + + CopyItemName(GetSpeciesFormChanges(species)->param1, gStringVar2); //item + CreateCaughtBallEvolutionScreen(preEvolutionOne, base_x - 9 - 8, base_y + base_y_offset*(numPreEvolutions - 1), 0); + HandlePreEvolutionSpeciesPrint(taskId, preEvolutionOne, species, base_x - 8, base_y, base_y_offset, numPreEvolutions - 1); + return numPreEvolutions; + } + } + } + //Calculate previous evolution for (i = 0; i < NUM_SPECIES; i++) { - const struct Evolution *evolutions = GetSpeciesEvolutions(species); + const struct Evolution *evolutions = GetSpeciesEvolutions(i); if (evolutions == NULL) continue; @@ -6497,35 +6521,17 @@ static u8 PrintPreEvolutions(u8 taskId, u16 species) { preEvolutionOne = i; numPreEvolutions += 1; - - if (GetSpeciesFormChanges(species) != NULL - && GetSpeciesFormChanges(species)->method == FORM_CHANGE_BATTLE_MEGA_EVOLUTION_ITEM) - { - CopyItemName(GetSpeciesFormChanges(species)->param1, gStringVar2); //item - isMega = TRUE; - } break; } } } - if (isMega) - { - sPokedexView->numPreEvolutions = numPreEvolutions; - sPokedexView->sEvoScreenData.numAllEvolutions += numPreEvolutions; - sPokedexView->sEvoScreenData.isMega = isMega; - - CreateCaughtBallEvolutionScreen(preEvolutionOne, base_x - 9 - 8, base_y + base_y_offset*(numPreEvolutions - 1), 0); - HandlePreEvolutionSpeciesPrint(taskId, preEvolutionOne, species, base_x - 8, base_y, base_y_offset, numPreEvolutions - 1); - return numPreEvolutions; - } - //Calculate if previous evolution also has a previous evolution if (numPreEvolutions != 0) { for (i = 0; i < NUM_SPECIES; i++) { - const struct Evolution *evolutions = GetSpeciesEvolutions(species); + const struct Evolution *evolutions = GetSpeciesEvolutions(i); if (evolutions == NULL) continue; From e7fac028b15d551634a6dd2e1ac67f67dbee8a9f Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Wed, 3 Jan 2024 17:48:09 +0100 Subject: [PATCH 57/82] Fix summary screen nature colours after mints (#3898) --- src/pokemon_summary_screen.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index b6a64c0211..41c4f9f76d 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -171,6 +171,7 @@ static EWRAM_DATA struct PokemonSummaryScreenData u8 OTName[17]; // 0x36 u32 OTID; // 0x48 u8 teraType; + u8 mintNature; } summary; u16 bgTilemapBuffers[PSS_PAGE_COUNT][2][0x400]; u8 mode; @@ -1510,6 +1511,7 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *mon) if (sMonSummaryScreen->monList.mons == gPlayerParty || sMonSummaryScreen->mode == SUMMARY_MODE_BOX || sMonSummaryScreen->handleDeoxys == TRUE) { sum->nature = GetNature(mon); + sum->mintNature = GetMonData(mon, MON_DATA_HIDDEN_NATURE); sum->currentHP = GetMonData(mon, MON_DATA_HP); sum->maxHP = GetMonData(mon, MON_DATA_MAX_HP); sum->atk = GetMonData(mon, MON_DATA_ATK); @@ -1521,6 +1523,7 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *mon) else { sum->nature = GetNature(mon); + sum->mintNature = GetMonData(mon, MON_DATA_HIDDEN_NATURE); sum->currentHP = GetMonData(mon, MON_DATA_HP); sum->maxHP = GetMonData(mon, MON_DATA_MAX_HP); sum->atk = GetMonData(mon, MON_DATA_ATK2); @@ -3500,7 +3503,7 @@ static void BufferLeftColumnStats(void) u8 *maxHPString = Alloc(20); u8 *attackString = Alloc(20); u8 *defenseString = Alloc(20); - const s8 *natureMod = gNatureStatTable[sMonSummaryScreen->summary.nature]; + const s8 *natureMod = gNatureStatTable[sMonSummaryScreen->summary.mintNature]; DynamicPlaceholderTextUtil_Reset(); BufferStat(currentHPString, 0, sMonSummaryScreen->summary.currentHP, 0, 3); @@ -3522,7 +3525,7 @@ static void PrintLeftColumnStats(void) static void BufferRightColumnStats(void) { - const s8 *natureMod = gNatureStatTable[sMonSummaryScreen->summary.nature]; + const s8 *natureMod = gNatureStatTable[sMonSummaryScreen->summary.mintNature]; DynamicPlaceholderTextUtil_Reset(); BufferStat(gStringVar1, natureMod[STAT_SPATK - 1], sMonSummaryScreen->summary.spatk, 0, 3); From 973dae73be0df69b1b4f2ee6d133edd9ee9e22e2 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Wed, 3 Jan 2024 18:48:22 +0000 Subject: [PATCH 58/82] Fix HoF dex numbers (#3901) --- src/hall_of_fame.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index caa497e395..d0cf6ac9b0 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -1128,6 +1128,12 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u dexNumber = SpeciesToPokedexNum(currMon->species); if (dexNumber != 0xFFFF) { + if (IsNationalPokedexEnabled()) + { + stringPtr[0] = (dexNumber / 1000) + CHAR_0; + stringPtr++; + dexNumber %= 1000; + } stringPtr[0] = (dexNumber / 100) + CHAR_0; stringPtr++; dexNumber %= 100; From f94e65a40058fb2c93da8090147e56074af0b081 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Wed, 3 Jan 2024 20:24:45 +0000 Subject: [PATCH 59/82] Footprint config (#3902) * Footprint config * Don't enable by default --- include/config/pokemon.h | 1 + src/data/graphics/pokemon.h | 2052 +++++++++++++++++++++++++ src/data/pokemon/species_info.h | 8 +- src/data/pokemon/species_info/gen_1.h | 374 ++--- src/data/pokemon/species_info/gen_2.h | 204 +-- src/data/pokemon/species_info/gen_3.h | 282 ++-- src/data/pokemon/species_info/gen_4.h | 156 +- src/data/pokemon/species_info/gen_5.h | 318 ++-- src/data/pokemon/species_info/gen_6.h | 150 +- src/data/pokemon/species_info/gen_7.h | 176 +-- src/data/pokemon/species_info/gen_8.h | 184 +-- src/data/pokemon/species_info/gen_9.h | 226 +-- src/pokedex.c | 3 + src/pokedex_plus_hgss.c | 3 + src/pokemon_debug.c | 3 + 15 files changed, 3104 insertions(+), 1036 deletions(-) diff --git a/include/config/pokemon.h b/include/config/pokemon.h index 58c740f079..d905979aae 100644 --- a/include/config/pokemon.h +++ b/include/config/pokemon.h @@ -29,6 +29,7 @@ // Other settings #define P_CUSTOM_GENDER_DIFF_ICONS TRUE // If TRUE, will give more Pokémon custom icons for their female forms, i.e. Hippopotas and Hippowdon +#define P_FOOTPRINTS TRUE // If TRUE, Pokémon will have footprints (as was the case up to Gen 5 and in BDSP). Disabling this saves some ROM space. #define P_LEGENDARY_PERFECT_IVS GEN_LATEST // Since Gen 6, Legendaries, Mythicals and Ultra Beasts found in the wild or given through gifts have at least 3 perfect IVs. #define P_EV_CAP GEN_LATEST // Since Gen 6, the max EVs per stat is 252 instead of 255. #define P_CATCH_CURVE GEN_LATEST // Since Gen 6, the capture rate curve was changed to make pokeballs more effective on lower level pokemon diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 643f65e251..de164520d2 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -3,7 +3,9 @@ const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/quest const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/normal.gbapal.lz"); const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/shiny.gbapal.lz"); const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_FAMILY_BULBASAUR const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/anim_front.4bpp.lz"); @@ -11,21 +13,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/back.4bpp.lz"); const u32 gMonShinyPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/shiny.gbapal.lz"); const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/anim_front.4bpp.lz"); const u32 gMonPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/normal.gbapal.lz"); const u32 gMonBackPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/back.4bpp.lz"); const u32 gMonShinyPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/shiny.gbapal.lz"); const u8 gMonIcon_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/anim_front.4bpp.lz"); const u32 gMonPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/normal.gbapal.lz"); const u32 gMonBackPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/back.4bpp.lz"); const u32 gMonShinyPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/shiny.gbapal.lz"); const u8 gMonIcon_Venusaur[] = INCBIN_U8("graphics/pokemon/venusaur/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Venusaur[] = INCBIN_U8("graphics/pokemon/venusaur/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_VenusaurF[] = INCBIN_U32("graphics/pokemon/venusaur/anim_frontf.4bpp.lz"); const u32 gMonBackPic_VenusaurF[] = INCBIN_U32("graphics/pokemon/venusaur/backf.4bpp.lz"); @@ -53,21 +61,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/back.4bpp.lz"); const u32 gMonShinyPalette_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/shiny.gbapal.lz"); const u8 gMonIcon_Charmander[] = INCBIN_U8("graphics/pokemon/charmander/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Charmander[] = INCBIN_U8("graphics/pokemon/charmander/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/anim_front.4bpp.lz"); const u32 gMonPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/normal.gbapal.lz"); const u32 gMonBackPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/back.4bpp.lz"); const u32 gMonShinyPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/shiny.gbapal.lz"); const u8 gMonIcon_Charmeleon[] = INCBIN_U8("graphics/pokemon/charmeleon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Charmeleon[] = INCBIN_U8("graphics/pokemon/charmeleon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/anim_front.4bpp.lz"); const u32 gMonPalette_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/normal.gbapal.lz"); const u32 gMonBackPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/back.4bpp.lz"); const u32 gMonShinyPalette_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/shiny.gbapal.lz"); const u8 gMonIcon_Charizard[] = INCBIN_U8("graphics/pokemon/charizard/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Charizard[] = INCBIN_U8("graphics/pokemon/charizard/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/front.4bpp.lz"); @@ -98,21 +112,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/back.4bpp.lz"); const u32 gMonShinyPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/shiny.gbapal.lz"); const u8 gMonIcon_Squirtle[] = INCBIN_U8("graphics/pokemon/squirtle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Squirtle[] = INCBIN_U8("graphics/pokemon/squirtle/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/anim_front.4bpp.lz"); const u32 gMonPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/normal.gbapal.lz"); const u32 gMonBackPic_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/back.4bpp.lz"); const u32 gMonShinyPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/shiny.gbapal.lz"); const u8 gMonIcon_Wartortle[] = INCBIN_U8("graphics/pokemon/wartortle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Wartortle[] = INCBIN_U8("graphics/pokemon/wartortle/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/anim_front.4bpp.lz"); const u32 gMonPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/normal.gbapal.lz"); const u32 gMonBackPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/back.4bpp.lz"); const u32 gMonShinyPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/shiny.gbapal.lz"); const u8 gMonIcon_Blastoise[] = INCBIN_U8("graphics/pokemon/blastoise/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Blastoise[] = INCBIN_U8("graphics/pokemon/blastoise/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/front.4bpp.lz"); @@ -137,21 +157,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/back.4bpp.lz"); const u32 gMonShinyPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/shiny.gbapal.lz"); const u8 gMonIcon_Caterpie[] = INCBIN_U8("graphics/pokemon/caterpie/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Caterpie[] = INCBIN_U8("graphics/pokemon/caterpie/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/anim_front.4bpp.lz"); const u32 gMonPalette_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/normal.gbapal.lz"); const u32 gMonBackPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/back.4bpp.lz"); const u32 gMonShinyPalette_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/shiny.gbapal.lz"); const u8 gMonIcon_Metapod[] = INCBIN_U8( "graphics/pokemon/metapod/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Metapod[] = INCBIN_U8("graphics/pokemon/metapod/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/anim_front.4bpp.lz"); const u32 gMonPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/normal.gbapal.lz"); const u32 gMonBackPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/back.4bpp.lz"); const u32 gMonShinyPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/shiny.gbapal.lz"); const u8 gMonIcon_Butterfree[] = INCBIN_U8("graphics/pokemon/butterfree/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Butterfree[] = INCBIN_U8("graphics/pokemon/butterfree/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ButterfreeF[] = INCBIN_U32("graphics/pokemon/butterfree/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ButterfreeF[] = INCBIN_U32("graphics/pokemon/butterfree/backf.4bpp.lz"); @@ -171,21 +197,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/back.4bpp.lz"); const u32 gMonShinyPalette_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/shiny.gbapal.lz"); const u8 gMonIcon_Weedle[] = INCBIN_U8("graphics/pokemon/weedle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Weedle[] = INCBIN_U8("graphics/pokemon/weedle/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/anim_front.4bpp.lz"); const u32 gMonPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/normal.gbapal.lz"); const u32 gMonBackPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/back.4bpp.lz"); const u32 gMonShinyPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/shiny.gbapal.lz"); const u8 gMonIcon_Kakuna[] = INCBIN_U8("graphics/pokemon/kakuna/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kakuna[] = INCBIN_U8("graphics/pokemon/kakuna/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/anim_front.4bpp.lz"); const u32 gMonPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/normal.gbapal.lz"); const u32 gMonBackPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/back.4bpp.lz"); const u32 gMonShinyPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/shiny.gbapal.lz"); const u8 gMonIcon_Beedrill[] = INCBIN_U8("graphics/pokemon/beedrill/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Beedrill[] = INCBIN_U8("graphics/pokemon/beedrill/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/front.4bpp.lz"); @@ -202,21 +234,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/back.4bpp.lz"); const u32 gMonShinyPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/shiny.gbapal.lz"); const u8 gMonIcon_Pidgey[] = INCBIN_U8("graphics/pokemon/pidgey/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pidgey[] = INCBIN_U8("graphics/pokemon/pidgey/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/anim_front.4bpp.lz"); const u32 gMonPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/normal.gbapal.lz"); const u32 gMonBackPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/back.4bpp.lz"); const u32 gMonShinyPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/shiny.gbapal.lz"); const u8 gMonIcon_Pidgeotto[] = INCBIN_U8("graphics/pokemon/pidgeotto/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pidgeotto[] = INCBIN_U8("graphics/pokemon/pidgeotto/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/anim_front.4bpp.lz"); const u32 gMonPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/normal.gbapal.lz"); const u32 gMonBackPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/back.4bpp.lz"); const u32 gMonShinyPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/shiny.gbapal.lz"); const u8 gMonIcon_Pidgeot[] = INCBIN_U8("graphics/pokemon/pidgeot/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pidgeot[] = INCBIN_U8("graphics/pokemon/pidgeot/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/front.4bpp.lz"); @@ -233,7 +271,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/back.4bpp.lz"); const u32 gMonShinyPalette_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/shiny.gbapal.lz"); const u8 gMonIcon_Rattata[] = INCBIN_U8("graphics/pokemon/rattata/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Rattata[] = INCBIN_U8("graphics/pokemon/rattata/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_RattataF[] = INCBIN_U32("graphics/pokemon/rattata/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RattataF[] = INCBIN_U32("graphics/pokemon/rattata/backf.4bpp.lz"); @@ -243,7 +283,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/back.4bpp.lz"); const u32 gMonShinyPalette_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/shiny.gbapal.lz"); const u8 gMonIcon_Raticate[] = INCBIN_U8("graphics/pokemon/raticate/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Raticate[] = INCBIN_U8("graphics/pokemon/raticate/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_RaticateF[] = INCBIN_U32("graphics/pokemon/raticate/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RaticateF[] = INCBIN_U32("graphics/pokemon/raticate/backf.4bpp.lz"); @@ -269,14 +311,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/back.4bpp.lz"); const u32 gMonShinyPalette_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/shiny.gbapal.lz"); const u8 gMonIcon_Spearow[] = INCBIN_U8("graphics/pokemon/spearow/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Spearow[] = INCBIN_U8("graphics/pokemon/spearow/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/anim_front.4bpp.lz"); const u32 gMonPalette_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/normal.gbapal.lz"); const u32 gMonBackPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/back.4bpp.lz"); const u32 gMonShinyPalette_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/shiny.gbapal.lz"); const u8 gMonIcon_Fearow[] = INCBIN_U8("graphics/pokemon/fearow/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Fearow[] = INCBIN_U8("graphics/pokemon/fearow/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SPEAROW #if P_FAMILY_EKANS @@ -285,14 +331,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/back.4bpp.lz"); const u32 gMonShinyPalette_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/shiny.gbapal.lz"); const u8 gMonIcon_Ekans[] = INCBIN_U8("graphics/pokemon/ekans/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ekans[] = INCBIN_U8("graphics/pokemon/ekans/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/anim_front.4bpp.lz"); const u32 gMonPalette_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/normal.gbapal.lz"); const u32 gMonBackPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/back.4bpp.lz"); const u32 gMonShinyPalette_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/shiny.gbapal.lz"); const u8 gMonIcon_Arbok[] = INCBIN_U8("graphics/pokemon/arbok/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Arbok[] = INCBIN_U8("graphics/pokemon/arbok/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_EKANS #if P_FAMILY_PIKACHU @@ -302,7 +352,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/back.4bpp.lz"); const u32 gMonShinyPalette_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/shiny.gbapal.lz"); const u8 gMonIcon_Pichu[] = INCBIN_U8("graphics/pokemon/pichu/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pichu[] = INCBIN_U8("graphics/pokemon/pichu/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/anim_front.4bpp.lz"); const u32 gMonPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/normal.gbapal.lz"); @@ -316,7 +368,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/back.4bpp.lz"); const u32 gMonShinyPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/shiny.gbapal.lz"); const u8 gMonIcon_Pikachu[] = INCBIN_U8("graphics/pokemon/pikachu/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pikachu[] = INCBIN_U8("graphics/pokemon/pikachu/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_PikachuF[] = INCBIN_U32("graphics/pokemon/pikachu/anim_frontf.4bpp.lz"); const u32 gMonBackPic_PikachuF[] = INCBIN_U32("graphics/pokemon/pikachu/backf.4bpp.lz"); @@ -425,7 +479,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/back.4bpp.lz"); const u32 gMonShinyPalette_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/shiny.gbapal.lz"); const u8 gMonIcon_Raichu[] = INCBIN_U8("graphics/pokemon/raichu/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Raichu[] = INCBIN_U8("graphics/pokemon/raichu/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_RaichuF[] = INCBIN_U32("graphics/pokemon/raichu/anim_frontf.4bpp.lz"); @@ -444,14 +500,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/back.4bpp.lz"); const u32 gMonShinyPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/shiny.gbapal.lz"); const u8 gMonIcon_Sandshrew[] = INCBIN_U8("graphics/pokemon/sandshrew/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sandshrew[] = INCBIN_U8("graphics/pokemon/sandshrew/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/anim_front.4bpp.lz"); const u32 gMonPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/normal.gbapal.lz"); const u32 gMonBackPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/back.4bpp.lz"); const u32 gMonShinyPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/shiny.gbapal.lz"); const u8 gMonIcon_Sandslash[] = INCBIN_U8("graphics/pokemon/sandslash/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sandslash[] = INCBIN_U8("graphics/pokemon/sandslash/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/front.4bpp.lz"); @@ -474,42 +534,54 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/back.4bpp.lz"); const u32 gMonShinyPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/shiny.gbapal.lz"); const u8 gMonIcon_NidoranF[] = INCBIN_U8("graphics/pokemon/nidoran_f/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_NidoranF[] = INCBIN_U8("graphics/pokemon/nidoran_f/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/anim_front.4bpp.lz"); const u32 gMonPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/normal.gbapal.lz"); const u32 gMonBackPic_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/back.4bpp.lz"); const u32 gMonShinyPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/shiny.gbapal.lz"); const u8 gMonIcon_Nidorina[] = INCBIN_U8("graphics/pokemon/nidorina/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Nidorina[] = INCBIN_U8("graphics/pokemon/nidorina/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/anim_front.4bpp.lz"); const u32 gMonPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/normal.gbapal.lz"); const u32 gMonBackPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/back.4bpp.lz"); const u32 gMonShinyPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/shiny.gbapal.lz"); const u8 gMonIcon_Nidoqueen[] = INCBIN_U8("graphics/pokemon/nidoqueen/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Nidoqueen[] = INCBIN_U8("graphics/pokemon/nidoqueen/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/anim_front.4bpp.lz"); const u32 gMonPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/normal.gbapal.lz"); const u32 gMonBackPic_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/back.4bpp.lz"); const u32 gMonShinyPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/shiny.gbapal.lz"); const u8 gMonIcon_NidoranM[] = INCBIN_U8("graphics/pokemon/nidoran_m/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_NidoranM[] = INCBIN_U8("graphics/pokemon/nidoran_m/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/anim_front.4bpp.lz"); const u32 gMonPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/normal.gbapal.lz"); const u32 gMonBackPic_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/back.4bpp.lz"); const u32 gMonShinyPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/shiny.gbapal.lz"); const u8 gMonIcon_Nidorino[] = INCBIN_U8("graphics/pokemon/nidorino/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Nidorino[] = INCBIN_U8("graphics/pokemon/nidorino/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/anim_front.4bpp.lz"); const u32 gMonPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/normal.gbapal.lz"); const u32 gMonBackPic_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/back.4bpp.lz"); const u32 gMonShinyPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/shiny.gbapal.lz"); const u8 gMonIcon_Nidoking[] = INCBIN_U8("graphics/pokemon/nidoking/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Nidoking[] = INCBIN_U8("graphics/pokemon/nidoking/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_NIDORAN #if P_FAMILY_CLEFAIRY @@ -519,7 +591,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/back.4bpp.lz"); const u32 gMonShinyPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/shiny.gbapal.lz"); const u8 gMonIcon_Cleffa[] = INCBIN_U8("graphics/pokemon/cleffa/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cleffa[] = INCBIN_U8("graphics/pokemon/cleffa/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/anim_front.4bpp.lz"); @@ -527,14 +601,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/back.4bpp.lz"); const u32 gMonShinyPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/shiny.gbapal.lz"); const u8 gMonIcon_Clefairy[] = INCBIN_U8("graphics/pokemon/clefairy/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Clefairy[] = INCBIN_U8("graphics/pokemon/clefairy/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/anim_front.4bpp.lz"); const u32 gMonPalette_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/normal.gbapal.lz"); const u32 gMonBackPic_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/back.4bpp.lz"); const u32 gMonShinyPalette_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/shiny.gbapal.lz"); const u8 gMonIcon_Clefable[] = INCBIN_U8("graphics/pokemon/clefable/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Clefable[] = INCBIN_U8("graphics/pokemon/clefable/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CLEFAIRY #if P_FAMILY_VULPIX @@ -543,14 +621,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/back.4bpp.lz"); const u32 gMonShinyPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/shiny.gbapal.lz"); const u8 gMonIcon_Vulpix[] = INCBIN_U8("graphics/pokemon/vulpix/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Vulpix[] = INCBIN_U8("graphics/pokemon/vulpix/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/anim_front.4bpp.lz"); const u32 gMonPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/normal.gbapal.lz"); const u32 gMonBackPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/back.4bpp.lz"); const u32 gMonShinyPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/shiny.gbapal.lz"); const u8 gMonIcon_Ninetales[] = INCBIN_U8("graphics/pokemon/ninetales/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ninetales[] = INCBIN_U8("graphics/pokemon/ninetales/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/front.4bpp.lz"); @@ -574,7 +656,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/back.4bpp.lz"); const u32 gMonShinyPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/shiny.gbapal.lz"); const u8 gMonIcon_Igglybuff[] = INCBIN_U8("graphics/pokemon/igglybuff/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Igglybuff[] = INCBIN_U8("graphics/pokemon/igglybuff/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/anim_front.4bpp.lz"); @@ -582,14 +666,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/back.4bpp.lz"); const u32 gMonShinyPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/shiny.gbapal.lz"); const u8 gMonIcon_Jigglypuff[] = INCBIN_U8("graphics/pokemon/jigglypuff/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Jigglypuff[] = INCBIN_U8("graphics/pokemon/jigglypuff/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/anim_front.4bpp.lz"); const u32 gMonPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/normal.gbapal.lz"); const u32 gMonBackPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/back.4bpp.lz"); const u32 gMonShinyPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/shiny.gbapal.lz"); const u8 gMonIcon_Wigglytuff[] = INCBIN_U8("graphics/pokemon/wigglytuff/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Wigglytuff[] = INCBIN_U8("graphics/pokemon/wigglytuff/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_JIGGLYPUFF #if P_FAMILY_ZUBAT @@ -598,7 +686,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/back.4bpp.lz"); const u32 gMonShinyPalette_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/shiny.gbapal.lz"); const u8 gMonIcon_Zubat[] = INCBIN_U8("graphics/pokemon/zubat/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Zubat[] = INCBIN_U8("graphics/pokemon/zubat/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ZubatF[] = INCBIN_U32("graphics/pokemon/zubat/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ZubatF[] = INCBIN_U32("graphics/pokemon/zubat/backf.4bpp.lz"); @@ -608,7 +698,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/back.4bpp.lz"); const u32 gMonShinyPalette_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/shiny.gbapal.lz"); const u8 gMonIcon_Golbat[] = INCBIN_U8("graphics/pokemon/golbat/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Golbat[] = INCBIN_U8("graphics/pokemon/golbat/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GolbatF[] = INCBIN_U32("graphics/pokemon/golbat/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GolbatF[] = INCBIN_U32("graphics/pokemon/golbat/backf.4bpp.lz"); @@ -619,7 +711,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/back.4bpp.lz"); const u32 gMonShinyPalette_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/shiny.gbapal.lz"); const u8 gMonIcon_Crobat[] = INCBIN_U8("graphics/pokemon/crobat/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Crobat[] = INCBIN_U8("graphics/pokemon/crobat/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_ZUBAT @@ -629,14 +723,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/back.4bpp.lz"); const u32 gMonShinyPalette_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/shiny.gbapal.lz"); const u8 gMonIcon_Oddish[] = INCBIN_U8("graphics/pokemon/oddish/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Oddish[] = INCBIN_U8("graphics/pokemon/oddish/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/anim_front.4bpp.lz"); const u32 gMonPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/normal.gbapal.lz"); const u32 gMonBackPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/back.4bpp.lz"); const u32 gMonShinyPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/shiny.gbapal.lz"); const u8 gMonIcon_Gloom[] = INCBIN_U8("graphics/pokemon/gloom/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gloom[] = INCBIN_U8("graphics/pokemon/gloom/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GloomF[] = INCBIN_U32("graphics/pokemon/gloom/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GloomF[] = INCBIN_U32("graphics/pokemon/gloom/backf.4bpp.lz"); @@ -646,7 +744,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/back.4bpp.lz"); const u32 gMonShinyPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/shiny.gbapal.lz"); const u8 gMonIcon_Vileplume[] = INCBIN_U8("graphics/pokemon/vileplume/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Vileplume[] = INCBIN_U8("graphics/pokemon/vileplume/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_VileplumeF[] = INCBIN_U32("graphics/pokemon/vileplume/anim_frontf.4bpp.lz"); const u32 gMonBackPic_VileplumeF[] = INCBIN_U32("graphics/pokemon/vileplume/backf.4bpp.lz"); @@ -657,7 +757,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/back.4bpp.lz"); const u32 gMonShinyPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/shiny.gbapal.lz"); const u8 gMonIcon_Bellossom[] = INCBIN_U8("graphics/pokemon/bellossom/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bellossom[] = INCBIN_U8("graphics/pokemon/bellossom/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_ODDISH @@ -667,14 +769,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Paras[] = INCBIN_U32("graphics/pokemon/paras/back.4bpp.lz"); const u32 gMonShinyPalette_Paras[] = INCBIN_U32("graphics/pokemon/paras/shiny.gbapal.lz"); const u8 gMonIcon_Paras[] = INCBIN_U8("graphics/pokemon/paras/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Paras[] = INCBIN_U8("graphics/pokemon/paras/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/anim_front.4bpp.lz"); const u32 gMonPalette_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/normal.gbapal.lz"); const u32 gMonBackPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/back.4bpp.lz"); const u32 gMonShinyPalette_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/shiny.gbapal.lz"); const u8 gMonIcon_Parasect[] = INCBIN_U8("graphics/pokemon/parasect/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Parasect[] = INCBIN_U8("graphics/pokemon/parasect/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PARAS #if P_FAMILY_VENONAT @@ -683,14 +789,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/back.4bpp.lz"); const u32 gMonShinyPalette_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/shiny.gbapal.lz"); const u8 gMonIcon_Venonat[] = INCBIN_U8("graphics/pokemon/venonat/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Venonat[] = INCBIN_U8("graphics/pokemon/venonat/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/anim_front.4bpp.lz"); const u32 gMonPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/normal.gbapal.lz"); const u32 gMonBackPic_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/back.4bpp.lz"); const u32 gMonShinyPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/shiny.gbapal.lz"); const u8 gMonIcon_Venomoth[] = INCBIN_U8("graphics/pokemon/venomoth/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Venomoth[] = INCBIN_U8("graphics/pokemon/venomoth/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_VENONAT #if P_FAMILY_DIGLETT @@ -699,14 +809,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/back.4bpp.lz"); const u32 gMonShinyPalette_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/shiny.gbapal.lz"); const u8 gMonIcon_Diglett[] = INCBIN_U8("graphics/pokemon/diglett/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Diglett[] = INCBIN_U8("graphics/pokemon/diglett/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/anim_front.4bpp.lz"); const u32 gMonPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/normal.gbapal.lz"); const u32 gMonBackPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/back.4bpp.lz"); const u32 gMonShinyPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/shiny.gbapal.lz"); const u8 gMonIcon_Dugtrio[] = INCBIN_U8("graphics/pokemon/dugtrio/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dugtrio[] = INCBIN_U8("graphics/pokemon/dugtrio/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/front.4bpp.lz"); @@ -729,14 +843,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/back.4bpp.lz"); const u32 gMonShinyPalette_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/shiny.gbapal.lz"); const u8 gMonIcon_Meowth[] = INCBIN_U8("graphics/pokemon/meowth/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Meowth[] = INCBIN_U8("graphics/pokemon/meowth/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/persian/anim_front.4bpp.lz"); const u32 gMonPalette_Persian[] = INCBIN_U32("graphics/pokemon/persian/normal.gbapal.lz"); const u32 gMonBackPic_Persian[] = INCBIN_U32("graphics/pokemon/persian/back.4bpp.lz"); const u32 gMonShinyPalette_Persian[] = INCBIN_U32("graphics/pokemon/persian/shiny.gbapal.lz"); const u8 gMonIcon_Persian[] = INCBIN_U8("graphics/pokemon/persian/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Persian[] = INCBIN_U8("graphics/pokemon/persian/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/front.4bpp.lz"); @@ -764,7 +882,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/back.4bpp.lz"); const u32 gMonShinyPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/shiny.gbapal.lz"); const u8 gMonIcon_Perrserker[] = INCBIN_U8("graphics/pokemon/perrserker/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Perrserker[] = INCBIN_U8("graphics/pokemon/perrserker/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GALARIAN_FORMS #if P_GIGANTAMAX_FORMS @@ -782,14 +902,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/back.4bpp.lz"); const u32 gMonShinyPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/shiny.gbapal.lz"); const u8 gMonIcon_Psyduck[] = INCBIN_U8("graphics/pokemon/psyduck/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Psyduck[] = INCBIN_U8("graphics/pokemon/psyduck/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/anim_front.4bpp.lz"); const u32 gMonPalette_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/normal.gbapal.lz"); const u32 gMonBackPic_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/back.4bpp.lz"); const u32 gMonShinyPalette_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/shiny.gbapal.lz"); const u8 gMonIcon_Golduck[] = INCBIN_U8("graphics/pokemon/golduck/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Golduck[] = INCBIN_U8("graphics/pokemon/golduck/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PSYDUCK #if P_FAMILY_MANKEY @@ -798,14 +922,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/back.4bpp.lz"); const u32 gMonShinyPalette_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/shiny.gbapal.lz"); const u8 gMonIcon_Mankey[] = INCBIN_U8("graphics/pokemon/mankey/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mankey[] = INCBIN_U8("graphics/pokemon/mankey/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/anim_front.4bpp.lz"); const u32 gMonPalette_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/normal.gbapal.lz"); const u32 gMonBackPic_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/back.4bpp.lz"); const u32 gMonShinyPalette_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/shiny.gbapal.lz"); const u8 gMonIcon_Primeape[] = INCBIN_U8("graphics/pokemon/primeape/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Primeape[] = INCBIN_U8("graphics/pokemon/primeape/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_9_CROSS_EVOS const u32 gMonFrontPic_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/front.4bpp.lz"); @@ -813,7 +941,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/back.4bpp.lz"); const u32 gMonShinyPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/shiny.gbapal.lz"); const u8 gMonIcon_Annihilape[] = INCBIN_U8("graphics/pokemon/annihilape/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Annihilape[] = INCBIN_U8("graphics/pokemon/annihilape/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_MANKEY @@ -823,14 +953,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/back.4bpp.lz"); const u32 gMonShinyPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/shiny.gbapal.lz"); const u8 gMonIcon_Growlithe[] = INCBIN_U8("graphics/pokemon/growlithe/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Growlithe[] = INCBIN_U8("graphics/pokemon/growlithe/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/anim_front.4bpp.lz"); const u32 gMonPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/normal.gbapal.lz"); const u32 gMonBackPic_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/back.4bpp.lz"); const u32 gMonShinyPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/shiny.gbapal.lz"); const u8 gMonIcon_Arcanine[] = INCBIN_U8("graphics/pokemon/arcanine/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Arcanine[] = INCBIN_U8("graphics/pokemon/arcanine/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/front.4bpp.lz"); @@ -853,21 +987,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/back.4bpp.lz"); const u32 gMonShinyPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/shiny.gbapal.lz"); const u8 gMonIcon_Poliwag[] = INCBIN_U8("graphics/pokemon/poliwag/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Poliwag[] = INCBIN_U8("graphics/pokemon/poliwag/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/anim_front.4bpp.lz"); const u32 gMonPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/normal.gbapal.lz"); const u32 gMonBackPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/back.4bpp.lz"); const u32 gMonShinyPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/shiny.gbapal.lz"); const u8 gMonIcon_Poliwhirl[] = INCBIN_U8("graphics/pokemon/poliwhirl/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Poliwhirl[] = INCBIN_U8("graphics/pokemon/poliwhirl/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/anim_front.4bpp.lz"); const u32 gMonPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/normal.gbapal.lz"); const u32 gMonBackPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/back.4bpp.lz"); const u32 gMonShinyPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/shiny.gbapal.lz"); const u8 gMonIcon_Poliwrath[] = INCBIN_U8("graphics/pokemon/poliwrath/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Poliwrath[] = INCBIN_U8("graphics/pokemon/poliwrath/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/anim_front.4bpp.lz"); @@ -875,7 +1015,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/back.4bpp.lz"); const u32 gMonShinyPalette_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/shiny.gbapal.lz"); const u8 gMonIcon_Politoed[] = INCBIN_U8("graphics/pokemon/politoed/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Politoed[] = INCBIN_U8("graphics/pokemon/politoed/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_PolitoedF[] = INCBIN_U32("graphics/pokemon/politoed/anim_frontf.4bpp.lz"); const u32 gMonBackPic_PolitoedF[] = INCBIN_U32("graphics/pokemon/politoed/backf.4bpp.lz"); @@ -888,14 +1030,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Abra[] = INCBIN_U32("graphics/pokemon/abra/back.4bpp.lz"); const u32 gMonShinyPalette_Abra[] = INCBIN_U32("graphics/pokemon/abra/shiny.gbapal.lz"); const u8 gMonIcon_Abra[] = INCBIN_U8("graphics/pokemon/abra/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Abra[] = INCBIN_U8("graphics/pokemon/abra/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/anim_front.4bpp.lz"); const u32 gMonPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/normal.gbapal.lz"); const u32 gMonBackPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/back.4bpp.lz"); const u32 gMonShinyPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/shiny.gbapal.lz"); const u8 gMonIcon_Kadabra[] = INCBIN_U8("graphics/pokemon/kadabra/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kadabra[] = INCBIN_U8("graphics/pokemon/kadabra/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_KadabraF[] = INCBIN_U32("graphics/pokemon/kadabra/anim_frontf.4bpp.lz"); const u32 gMonBackPic_KadabraF[] = INCBIN_U32("graphics/pokemon/kadabra/backf.4bpp.lz"); @@ -905,7 +1051,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/back.4bpp.lz"); const u32 gMonShinyPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/shiny.gbapal.lz"); const u8 gMonIcon_Alakazam[] = INCBIN_U8("graphics/pokemon/alakazam/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Alakazam[] = INCBIN_U8("graphics/pokemon/alakazam/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_AlakazamF[] = INCBIN_U32("graphics/pokemon/alakazam/anim_frontf.4bpp.lz"); const u32 gMonBackPic_AlakazamF[] = INCBIN_U32("graphics/pokemon/alakazam/backf.4bpp.lz"); @@ -925,21 +1073,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Machop[] = INCBIN_U32("graphics/pokemon/machop/back.4bpp.lz"); const u32 gMonShinyPalette_Machop[] = INCBIN_U32("graphics/pokemon/machop/shiny.gbapal.lz"); const u8 gMonIcon_Machop[] = INCBIN_U8("graphics/pokemon/machop/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Machop[] = INCBIN_U8("graphics/pokemon/machop/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/anim_front.4bpp.lz"); const u32 gMonPalette_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/normal.gbapal.lz"); const u32 gMonBackPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/back.4bpp.lz"); const u32 gMonShinyPalette_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/shiny.gbapal.lz"); const u8 gMonIcon_Machoke[] = INCBIN_U8("graphics/pokemon/machoke/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Machoke[] = INCBIN_U8("graphics/pokemon/machoke/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/anim_front.4bpp.lz"); const u32 gMonPalette_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/normal.gbapal.lz"); const u32 gMonBackPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/back.4bpp.lz"); const u32 gMonShinyPalette_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/shiny.gbapal.lz"); const u8 gMonIcon_Machamp[] = INCBIN_U8("graphics/pokemon/machamp/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Machamp[] = INCBIN_U8("graphics/pokemon/machamp/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/front.4bpp.lz"); @@ -956,21 +1110,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/back.4bpp.lz"); const u32 gMonShinyPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/shiny.gbapal.lz"); const u8 gMonIcon_Bellsprout[] = INCBIN_U8("graphics/pokemon/bellsprout/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bellsprout[] = INCBIN_U8("graphics/pokemon/bellsprout/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/anim_front.4bpp.lz"); const u32 gMonPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/normal.gbapal.lz"); const u32 gMonBackPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/back.4bpp.lz"); const u32 gMonShinyPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/shiny.gbapal.lz"); const u8 gMonIcon_Weepinbell[] = INCBIN_U8("graphics/pokemon/weepinbell/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Weepinbell[] = INCBIN_U8("graphics/pokemon/weepinbell/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/anim_front.4bpp.lz"); const u32 gMonPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/normal.gbapal.lz"); const u32 gMonBackPic_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/back.4bpp.lz"); const u32 gMonShinyPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/shiny.gbapal.lz"); const u8 gMonIcon_Victreebel[] = INCBIN_U8("graphics/pokemon/victreebel/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Victreebel[] = INCBIN_U8("graphics/pokemon/victreebel/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BELLSPROUT #if P_FAMILY_TENTACOOL @@ -979,14 +1139,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/back.4bpp.lz"); const u32 gMonShinyPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/shiny.gbapal.lz"); const u8 gMonIcon_Tentacool[] = INCBIN_U8("graphics/pokemon/tentacool/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tentacool[] = INCBIN_U8("graphics/pokemon/tentacool/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/anim_front.4bpp.lz"); const u32 gMonPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/normal.gbapal.lz"); const u32 gMonBackPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/back.4bpp.lz"); const u32 gMonShinyPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/shiny.gbapal.lz"); const u8 gMonIcon_Tentacruel[] = INCBIN_U8("graphics/pokemon/tentacruel/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tentacruel[] = INCBIN_U8("graphics/pokemon/tentacruel/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TENTACOOL #if P_FAMILY_GEODUDE @@ -995,21 +1159,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/back.4bpp.lz"); const u32 gMonShinyPalette_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/shiny.gbapal.lz"); const u8 gMonIcon_Geodude[] = INCBIN_U8("graphics/pokemon/geodude/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Geodude[] = INCBIN_U8("graphics/pokemon/geodude/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/anim_front.4bpp.lz"); const u32 gMonPalette_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/normal.gbapal.lz"); const u32 gMonBackPic_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/back.4bpp.lz"); const u32 gMonShinyPalette_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/shiny.gbapal.lz"); const u8 gMonIcon_Graveler[] = INCBIN_U8("graphics/pokemon/graveler/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Graveler[] = INCBIN_U8("graphics/pokemon/graveler/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/golem/anim_front.4bpp.lz"); const u32 gMonPalette_Golem[] = INCBIN_U32("graphics/pokemon/golem/normal.gbapal.lz"); const u32 gMonBackPic_Golem[] = INCBIN_U32("graphics/pokemon/golem/back.4bpp.lz"); const u32 gMonShinyPalette_Golem[] = INCBIN_U32("graphics/pokemon/golem/shiny.gbapal.lz"); const u8 gMonIcon_Golem[] = INCBIN_U8("graphics/pokemon/golem/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Golem[] = INCBIN_U8("graphics/pokemon/golem/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/front.4bpp.lz"); @@ -1038,14 +1208,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/back.4bpp.lz"); const u32 gMonShinyPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/shiny.gbapal.lz"); const u8 gMonIcon_Ponyta[] = INCBIN_U8("graphics/pokemon/ponyta/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ponyta[] = INCBIN_U8("graphics/pokemon/ponyta/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/anim_front.4bpp.lz"); const u32 gMonPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/normal.gbapal.lz"); const u32 gMonBackPic_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/back.4bpp.lz"); const u32 gMonShinyPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/shiny.gbapal.lz"); const u8 gMonIcon_Rapidash[] = INCBIN_U8("graphics/pokemon/rapidash/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Rapidash[] = INCBIN_U8("graphics/pokemon/rapidash/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/front.4bpp.lz"); @@ -1068,14 +1242,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/back.4bpp.lz"); const u32 gMonShinyPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/shiny.gbapal.lz"); const u8 gMonIcon_Slowpoke[] = INCBIN_U8("graphics/pokemon/slowpoke/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Slowpoke[] = INCBIN_U8("graphics/pokemon/slowpoke/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/anim_front.4bpp.lz"); const u32 gMonPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/normal.gbapal.lz"); const u32 gMonBackPic_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/back.4bpp.lz"); const u32 gMonShinyPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/shiny.gbapal.lz"); const u8 gMonIcon_Slowbro[] = INCBIN_U8("graphics/pokemon/slowbro/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Slowbro[] = INCBIN_U8("graphics/pokemon/slowbro/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/anim_front.4bpp.lz"); @@ -1083,7 +1261,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/back.4bpp.lz"); const u32 gMonShinyPalette_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/shiny.gbapal.lz"); const u8 gMonIcon_Slowking[] = INCBIN_U8("graphics/pokemon/slowking/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Slowking[] = INCBIN_U8("graphics/pokemon/slowking/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS #if P_MEGA_EVOLUTIONS @@ -1123,14 +1303,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/back.4bpp.lz"); const u32 gMonShinyPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/shiny.gbapal.lz"); const u8 gMonIcon_Magnemite[] = INCBIN_U8("graphics/pokemon/magnemite/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Magnemite[] = INCBIN_U8("graphics/pokemon/magnemite/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/anim_front.4bpp.lz"); const u32 gMonPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/normal.gbapal.lz"); const u32 gMonBackPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/back.4bpp.lz"); const u32 gMonShinyPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/shiny.gbapal.lz"); const u8 gMonIcon_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/anim_front.4bpp.lz"); @@ -1138,7 +1322,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/back.4bpp.lz"); const u32 gMonShinyPalette_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/shiny.gbapal.lz"); const u8 gMonIcon_Magnezone[] = INCBIN_U8("graphics/pokemon/magnezone/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Magnezone[] = INCBIN_U8("graphics/pokemon/magnezone/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MAGNEMITE @@ -1148,7 +1334,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/back.4bpp.lz"); const u32 gMonShinyPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/shiny.gbapal.lz"); const u8 gMonIcon_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetchd/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetchd/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/front.4bpp.lz"); @@ -1162,7 +1350,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/back.4bpp.lz"); const u32 gMonShinyPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/shiny.gbapal.lz"); const u8 gMonIcon_Sirfetchd[] = INCBIN_U8("graphics/pokemon/sirfetchd/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sirfetchd[] = INCBIN_U8("graphics/pokemon/sirfetchd/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_FARFETCHD @@ -1172,7 +1362,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/back.4bpp.lz"); const u32 gMonShinyPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/shiny.gbapal.lz"); const u8 gMonIcon_Doduo[] = INCBIN_U8("graphics/pokemon/doduo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Doduo[] = INCBIN_U8("graphics/pokemon/doduo/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_DoduoF[] = INCBIN_U32("graphics/pokemon/doduo/anim_frontf.4bpp.lz"); const u32 gMonBackPic_DoduoF[] = INCBIN_U32("graphics/pokemon/doduo/backf.4bpp.lz"); @@ -1182,7 +1374,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/back.4bpp.lz"); const u32 gMonShinyPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/shiny.gbapal.lz"); const u8 gMonIcon_Dodrio[] = INCBIN_U8("graphics/pokemon/dodrio/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dodrio[] = INCBIN_U8("graphics/pokemon/dodrio/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_DodrioF[] = INCBIN_U32("graphics/pokemon/dodrio/anim_frontf.4bpp.lz"); const u32 gMonBackPic_DodrioF[] = INCBIN_U32("graphics/pokemon/dodrio/backf.4bpp.lz"); @@ -1194,14 +1388,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/back.4bpp.lz"); const u32 gMonShinyPalette_Seel[] = INCBIN_U32("graphics/pokemon/seel/shiny.gbapal.lz"); const u8 gMonIcon_Seel[] = INCBIN_U8("graphics/pokemon/seel/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Seel[] = INCBIN_U8("graphics/pokemon/seel/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/anim_front.4bpp.lz"); const u32 gMonPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/normal.gbapal.lz"); const u32 gMonBackPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/back.4bpp.lz"); const u32 gMonShinyPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/shiny.gbapal.lz"); const u8 gMonIcon_Dewgong[] = INCBIN_U8("graphics/pokemon/dewgong/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dewgong[] = INCBIN_U8("graphics/pokemon/dewgong/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SEEL #if P_FAMILY_GRIMER @@ -1210,14 +1408,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/back.4bpp.lz"); const u32 gMonShinyPalette_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/shiny.gbapal.lz"); const u8 gMonIcon_Grimer[] = INCBIN_U8("graphics/pokemon/grimer/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Grimer[] = INCBIN_U8("graphics/pokemon/grimer/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/muk/anim_front.4bpp.lz"); const u32 gMonPalette_Muk[] = INCBIN_U32("graphics/pokemon/muk/normal.gbapal.lz"); const u32 gMonBackPic_Muk[] = INCBIN_U32("graphics/pokemon/muk/back.4bpp.lz"); const u32 gMonShinyPalette_Muk[] = INCBIN_U32("graphics/pokemon/muk/shiny.gbapal.lz"); const u8 gMonIcon_Muk[] = INCBIN_U8("graphics/pokemon/muk/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Muk[] = INCBIN_U8("graphics/pokemon/muk/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/front.4bpp.lz"); @@ -1240,14 +1442,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/back.4bpp.lz"); const u32 gMonShinyPalette_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/shiny.gbapal.lz"); const u8 gMonIcon_Shellder[] = INCBIN_U8("graphics/pokemon/shellder/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Shellder[] = INCBIN_U8("graphics/pokemon/shellder/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/anim_front.4bpp.lz"); const u32 gMonPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/normal.gbapal.lz"); const u32 gMonBackPic_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/back.4bpp.lz"); const u32 gMonShinyPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/shiny.gbapal.lz"); const u8 gMonIcon_Cloyster[] = INCBIN_U8("graphics/pokemon/cloyster/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cloyster[] = INCBIN_U8("graphics/pokemon/cloyster/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SHELLDER #if P_FAMILY_GASTLY @@ -1256,21 +1462,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/back.4bpp.lz"); const u32 gMonShinyPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/shiny.gbapal.lz"); const u8 gMonIcon_Gastly[] = INCBIN_U8("graphics/pokemon/gastly/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gastly[] = INCBIN_U8("graphics/pokemon/gastly/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/anim_front.4bpp.lz"); const u32 gMonPalette_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/normal.gbapal.lz"); const u32 gMonBackPic_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/back.4bpp.lz"); const u32 gMonShinyPalette_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/shiny.gbapal.lz"); const u8 gMonIcon_Haunter[] = INCBIN_U8("graphics/pokemon/haunter/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Haunter[] = INCBIN_U8("graphics/pokemon/haunter/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/anim_front.4bpp.lz"); const u32 gMonPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/normal.gbapal.lz"); const u32 gMonBackPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/back.4bpp.lz"); const u32 gMonShinyPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/shiny.gbapal.lz"); const u8 gMonIcon_Gengar[] = INCBIN_U8("graphics/pokemon/gengar/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gengar[] = INCBIN_U8("graphics/pokemon/gengar/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/front.4bpp.lz"); @@ -1295,7 +1507,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Onix[] = INCBIN_U32("graphics/pokemon/onix/back.4bpp.lz"); const u32 gMonShinyPalette_Onix[] = INCBIN_U32("graphics/pokemon/onix/shiny.gbapal.lz"); const u8 gMonIcon_Onix[] = INCBIN_U8("graphics/pokemon/onix/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Onix[] = INCBIN_U8("graphics/pokemon/onix/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/anim_front.4bpp.lz"); @@ -1303,7 +1517,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/back.4bpp.lz"); const u32 gMonShinyPalette_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/shiny.gbapal.lz"); const u8 gMonIcon_Steelix[] = INCBIN_U8("graphics/pokemon/steelix/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Steelix[] = INCBIN_U8("graphics/pokemon/steelix/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_SteelixF[] = INCBIN_U32("graphics/pokemon/steelix/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SteelixF[] = INCBIN_U32("graphics/pokemon/steelix/backf.4bpp.lz"); @@ -1324,14 +1540,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/back.4bpp.lz"); const u32 gMonShinyPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/shiny.gbapal.lz"); const u8 gMonIcon_Drowzee[] = INCBIN_U8("graphics/pokemon/drowzee/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Drowzee[] = INCBIN_U8("graphics/pokemon/drowzee/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/anim_front.4bpp.lz"); const u32 gMonPalette_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/normal.gbapal.lz"); const u32 gMonBackPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/back.4bpp.lz"); const u32 gMonShinyPalette_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/shiny.gbapal.lz"); const u8 gMonIcon_Hypno[] = INCBIN_U8("graphics/pokemon/hypno/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hypno[] = INCBIN_U8("graphics/pokemon/hypno/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_HypnoF[] = INCBIN_U32("graphics/pokemon/hypno/anim_frontf.4bpp.lz"); const u32 gMonBackPic_HypnoF[] = INCBIN_U32("graphics/pokemon/hypno/backf.4bpp.lz"); @@ -1343,14 +1563,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/back.4bpp.lz"); const u32 gMonShinyPalette_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/shiny.gbapal.lz"); const u8 gMonIcon_Krabby[] = INCBIN_U8("graphics/pokemon/krabby/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Krabby[] = INCBIN_U8("graphics/pokemon/krabby/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/anim_front.4bpp.lz"); const u32 gMonPalette_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/normal.gbapal.lz"); const u32 gMonBackPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/back.4bpp.lz"); const u32 gMonShinyPalette_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/shiny.gbapal.lz"); const u8 gMonIcon_Kingler[] = INCBIN_U8("graphics/pokemon/kingler/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kingler[] = INCBIN_U8("graphics/pokemon/kingler/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/front.4bpp.lz"); @@ -1367,14 +1591,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/back.4bpp.lz"); const u32 gMonShinyPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/shiny.gbapal.lz"); const u8 gMonIcon_Voltorb[] = INCBIN_U8("graphics/pokemon/voltorb/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Voltorb[] = INCBIN_U8("graphics/pokemon/voltorb/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/anim_front.4bpp.lz"); const u32 gMonPalette_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/normal.gbapal.lz"); const u32 gMonBackPic_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/back.4bpp.lz"); const u32 gMonShinyPalette_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/shiny.gbapal.lz"); const u8 gMonIcon_Electrode[] = INCBIN_U8("graphics/pokemon/electrode/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Electrode[] = INCBIN_U8("graphics/pokemon/electrode/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/front.4bpp.lz"); @@ -1397,14 +1625,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/back.4bpp.lz"); const u32 gMonShinyPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/shiny.gbapal.lz"); const u8 gMonIcon_Exeggcute[] = INCBIN_U8("graphics/pokemon/exeggcute/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Exeggcute[] = INCBIN_U8("graphics/pokemon/exeggcute/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/anim_front.4bpp.lz"); const u32 gMonPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/normal.gbapal.lz"); const u32 gMonBackPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/back.4bpp.lz"); const u32 gMonShinyPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/shiny.gbapal.lz"); const u8 gMonIcon_Exeggutor[] = INCBIN_U8("graphics/pokemon/exeggutor/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Exeggutor[] = INCBIN_U8("graphics/pokemon/exeggutor/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/anim_front.4bpp.lz"); @@ -1421,14 +1653,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/back.4bpp.lz"); const u32 gMonShinyPalette_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/shiny.gbapal.lz"); const u8 gMonIcon_Cubone[] = INCBIN_U8("graphics/pokemon/cubone/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cubone[] = INCBIN_U8("graphics/pokemon/cubone/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/anim_front.4bpp.lz"); const u32 gMonPalette_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/normal.gbapal.lz"); const u32 gMonBackPic_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/back.4bpp.lz"); const u32 gMonShinyPalette_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/shiny.gbapal.lz"); const u8 gMonIcon_Marowak[] = INCBIN_U8("graphics/pokemon/marowak/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Marowak[] = INCBIN_U8("graphics/pokemon/marowak/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/front.4bpp.lz"); @@ -1446,7 +1682,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/back.4bpp.lz"); const u32 gMonShinyPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/shiny.gbapal.lz"); const u8 gMonIcon_Tyrogue[] = INCBIN_U8("graphics/pokemon/tyrogue/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tyrogue[] = INCBIN_U8("graphics/pokemon/tyrogue/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/anim_front.4bpp.lz"); @@ -1454,14 +1692,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/back.4bpp.lz"); const u32 gMonShinyPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/shiny.gbapal.lz"); const u8 gMonIcon_Hitmonlee[] = INCBIN_U8("graphics/pokemon/hitmonlee/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hitmonlee[] = INCBIN_U8("graphics/pokemon/hitmonlee/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/anim_front.4bpp.lz"); const u32 gMonPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/normal.gbapal.lz"); const u32 gMonBackPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/back.4bpp.lz"); const u32 gMonShinyPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/shiny.gbapal.lz"); const u8 gMonIcon_Hitmonchan[] = INCBIN_U8("graphics/pokemon/hitmonchan/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hitmonchan[] = INCBIN_U8("graphics/pokemon/hitmonchan/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/anim_front.4bpp.lz"); @@ -1469,7 +1711,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/back.4bpp.lz"); const u32 gMonShinyPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/shiny.gbapal.lz"); const u8 gMonIcon_Hitmontop[] = INCBIN_U8("graphics/pokemon/hitmontop/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hitmontop[] = INCBIN_U8("graphics/pokemon/hitmontop/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_HITMONS @@ -1479,7 +1723,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/back.4bpp.lz"); const u32 gMonShinyPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/shiny.gbapal.lz"); const u8 gMonIcon_Lickitung[] = INCBIN_U8("graphics/pokemon/lickitung/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lickitung[] = INCBIN_U8("graphics/pokemon/lickitung/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/anim_front.4bpp.lz"); @@ -1487,7 +1733,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/back.4bpp.lz"); const u32 gMonShinyPalette_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/shiny.gbapal.lz"); const u8 gMonIcon_Lickilicky[] = INCBIN_U8("graphics/pokemon/lickilicky/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lickilicky[] = INCBIN_U8("graphics/pokemon/lickilicky/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_LICKITUNG @@ -1497,14 +1745,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/back.4bpp.lz"); const u32 gMonShinyPalette_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/shiny.gbapal.lz"); const u8 gMonIcon_Koffing[] = INCBIN_U8("graphics/pokemon/koffing/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Koffing[] = INCBIN_U8("graphics/pokemon/koffing/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/anim_front.4bpp.lz"); const u32 gMonPalette_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/normal.gbapal.lz"); const u32 gMonBackPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/back.4bpp.lz"); const u32 gMonShinyPalette_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/shiny.gbapal.lz"); const u8 gMonIcon_Weezing[] = INCBIN_U8("graphics/pokemon/weezing/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Weezing[] = INCBIN_U8("graphics/pokemon/weezing/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/front.4bpp.lz"); @@ -1521,7 +1773,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/back.4bpp.lz"); const u32 gMonShinyPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/shiny.gbapal.lz"); const u8 gMonIcon_Rhyhorn[] = INCBIN_U8("graphics/pokemon/rhyhorn/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Rhyhorn[] = INCBIN_U8("graphics/pokemon/rhyhorn/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_RhyhornF[] = INCBIN_U32("graphics/pokemon/rhyhorn/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RhyhornF[] = INCBIN_U32("graphics/pokemon/rhyhorn/backf.4bpp.lz"); @@ -1531,7 +1785,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/back.4bpp.lz"); const u32 gMonShinyPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/shiny.gbapal.lz"); const u8 gMonIcon_Rhydon[] = INCBIN_U8("graphics/pokemon/rhydon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Rhydon[] = INCBIN_U8("graphics/pokemon/rhydon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_RhydonF[] = INCBIN_U32("graphics/pokemon/rhydon/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RhydonF[] = INCBIN_U32("graphics/pokemon/rhydon/backf.4bpp.lz"); @@ -1542,7 +1798,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/back.4bpp.lz"); const u32 gMonShinyPalette_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/shiny.gbapal.lz"); const u8 gMonIcon_Rhyperior[] = INCBIN_U8("graphics/pokemon/rhyperior/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Rhyperior[] = INCBIN_U8("graphics/pokemon/rhyperior/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_RhyperiorF[] = INCBIN_U32("graphics/pokemon/rhyperior/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RhyperiorF[] = INCBIN_U32("graphics/pokemon/rhyperior/backf.4bpp.lz"); @@ -1556,7 +1814,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/back.4bpp.lz"); const u32 gMonShinyPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/shiny.gbapal.lz"); const u8 gMonIcon_Happiny[] = INCBIN_U8("graphics/pokemon/happiny/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Happiny[] = INCBIN_U8("graphics/pokemon/happiny/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/anim_front.4bpp.lz"); @@ -1564,7 +1824,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/back.4bpp.lz"); const u32 gMonShinyPalette_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/shiny.gbapal.lz"); const u8 gMonIcon_Chansey[] = INCBIN_U8("graphics/pokemon/chansey/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Chansey[] = INCBIN_U8("graphics/pokemon/chansey/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/anim_front.4bpp.lz"); @@ -1572,7 +1834,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/back.4bpp.lz"); const u32 gMonShinyPalette_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/shiny.gbapal.lz"); const u8 gMonIcon_Blissey[] = INCBIN_U8("graphics/pokemon/blissey/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Blissey[] = INCBIN_U8("graphics/pokemon/blissey/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_CHANSEY @@ -1582,7 +1846,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/back.4bpp.lz"); const u32 gMonShinyPalette_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/shiny.gbapal.lz"); const u8 gMonIcon_Tangela[] = INCBIN_U8("graphics/pokemon/tangela/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tangela[] = INCBIN_U8("graphics/pokemon/tangela/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/anim_front.4bpp.lz"); @@ -1590,7 +1856,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/back.4bpp.lz"); const u32 gMonShinyPalette_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/shiny.gbapal.lz"); const u8 gMonIcon_Tangrowth[] = INCBIN_U8("graphics/pokemon/tangrowth/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tangrowth[] = INCBIN_U8("graphics/pokemon/tangrowth/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_TangrowthF[] = INCBIN_U32("graphics/pokemon/tangrowth/anim_frontf.4bpp.lz"); #endif //P_GEN_4_CROSS_EVOS @@ -1602,7 +1870,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/back.4bpp.lz"); const u32 gMonShinyPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/shiny.gbapal.lz"); const u8 gMonIcon_Kangaskhan[] = INCBIN_U8("graphics/pokemon/kangaskhan/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kangaskhan[] = INCBIN_U8("graphics/pokemon/kangaskhan/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/front.4bpp.lz"); @@ -1619,14 +1889,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/back.4bpp.lz"); const u32 gMonShinyPalette_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/shiny.gbapal.lz"); const u8 gMonIcon_Horsea[] = INCBIN_U8("graphics/pokemon/horsea/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Horsea[] = INCBIN_U8("graphics/pokemon/horsea/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/anim_front.4bpp.lz"); const u32 gMonPalette_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/normal.gbapal.lz"); const u32 gMonBackPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/back.4bpp.lz"); const u32 gMonShinyPalette_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/shiny.gbapal.lz"); const u8 gMonIcon_Seadra[] = INCBIN_U8("graphics/pokemon/seadra/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Seadra[] = INCBIN_U8("graphics/pokemon/seadra/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/anim_front.4bpp.lz"); @@ -1634,7 +1908,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/back.4bpp.lz"); const u32 gMonShinyPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/shiny.gbapal.lz"); const u8 gMonIcon_Kingdra[] = INCBIN_U8("graphics/pokemon/kingdra/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kingdra[] = INCBIN_U8("graphics/pokemon/kingdra/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_HORSEA @@ -1644,7 +1920,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/back.4bpp.lz"); const u32 gMonShinyPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/shiny.gbapal.lz"); const u8 gMonIcon_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GoldeenF[] = INCBIN_U32("graphics/pokemon/goldeen/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GoldeenF[] = INCBIN_U32("graphics/pokemon/goldeen/backf.4bpp.lz"); @@ -1654,7 +1932,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/back.4bpp.lz"); const u32 gMonShinyPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/shiny.gbapal.lz"); const u8 gMonIcon_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_SeakingF[] = INCBIN_U32("graphics/pokemon/seaking/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SeakingF[] = INCBIN_U32("graphics/pokemon/seaking/backf.4bpp.lz"); @@ -1666,14 +1946,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/back.4bpp.lz"); const u32 gMonShinyPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/shiny.gbapal.lz"); const u8 gMonIcon_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/anim_front.4bpp.lz"); const u32 gMonPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/normal.gbapal.lz"); const u32 gMonBackPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/back.4bpp.lz"); const u32 gMonShinyPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/shiny.gbapal.lz"); const u8 gMonIcon_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_STARYU #if P_FAMILY_MR_MIME @@ -1683,7 +1967,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/back.4bpp.lz"); const u32 gMonShinyPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/shiny.gbapal.lz"); const u8 gMonIcon_MimeJr[] = INCBIN_U8("graphics/pokemon/mime_jr/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_MimeJr[] = INCBIN_U8("graphics/pokemon/mime_jr/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/anim_front.4bpp.lz"); @@ -1691,7 +1977,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/back.4bpp.lz"); const u32 gMonShinyPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/shiny.gbapal.lz"); const u8 gMonIcon_MrMime[] = INCBIN_U8("graphics/pokemon/mr_mime/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_MrMime[] = INCBIN_U8("graphics/pokemon/mr_mime/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/front.4bpp.lz"); @@ -1705,7 +1993,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/back.4bpp.lz"); const u32 gMonShinyPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/shiny.gbapal.lz"); const u8 gMonIcon_MrRime[] = INCBIN_U8("graphics/pokemon/mr_rime/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_MrRime[] = INCBIN_U8("graphics/pokemon/mr_rime/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_MR_MIME @@ -1715,7 +2005,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/back.4bpp.lz"); const u32 gMonShinyPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/shiny.gbapal.lz"); const u8 gMonIcon_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ScytherF[] = INCBIN_U32("graphics/pokemon/scyther/anim_frontf.4bpp.lz"); @@ -1725,7 +2017,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/back.4bpp.lz"); const u32 gMonShinyPalette_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/shiny.gbapal.lz"); const u8 gMonIcon_Scizor[] = INCBIN_U8("graphics/pokemon/scizor/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Scizor[] = INCBIN_U8("graphics/pokemon/scizor/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ScizorF[] = INCBIN_U32("graphics/pokemon/scizor/anim_frontf.4bpp.lz"); @@ -1744,7 +2038,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/back.4bpp.lz"); const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/shiny.gbapal.lz"); const u8 gMonIcon_Kleavor[] = INCBIN_U8("graphics/pokemon/kleavor/icon.4bpp"); +#if P_FOOTPRINTS //const u8 gMonFootprint_Kleavor[] = INCBIN_U8("graphics/pokemon/kleavor/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_SCYTHER @@ -1755,7 +2051,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/back.4bpp.lz"); const u32 gMonShinyPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/shiny.gbapal.lz"); const u8 gMonIcon_Smoochum[] = INCBIN_U8("graphics/pokemon/smoochum/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Smoochum[] = INCBIN_U8("graphics/pokemon/smoochum/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/anim_front.4bpp.lz"); @@ -1763,7 +2061,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/back.4bpp.lz"); const u32 gMonShinyPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/shiny.gbapal.lz"); const u8 gMonIcon_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_JYNX #if P_FAMILY_ELECTABUZZ @@ -1773,7 +2073,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/back.4bpp.lz"); const u32 gMonShinyPalette_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/shiny.gbapal.lz"); const u8 gMonIcon_Elekid[] = INCBIN_U8("graphics/pokemon/elekid/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Elekid[] = INCBIN_U8("graphics/pokemon/elekid/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/anim_front.4bpp.lz"); @@ -1781,7 +2083,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/back.4bpp.lz"); const u32 gMonShinyPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/shiny.gbapal.lz"); const u8 gMonIcon_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/anim_front.4bpp.lz"); @@ -1789,7 +2093,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/back.4bpp.lz"); const u32 gMonShinyPalette_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/shiny.gbapal.lz"); const u8 gMonIcon_Electivire[] = INCBIN_U8("graphics/pokemon/electivire/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Electivire[] = INCBIN_U8("graphics/pokemon/electivire/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_ELECTABUZZ @@ -1800,7 +2106,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Magby[] = INCBIN_U32("graphics/pokemon/magby/back.4bpp.lz"); const u32 gMonShinyPalette_Magby[] = INCBIN_U32("graphics/pokemon/magby/shiny.gbapal.lz"); const u8 gMonIcon_Magby[] = INCBIN_U8("graphics/pokemon/magby/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Magby[] = INCBIN_U8("graphics/pokemon/magby/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/anim_front.4bpp.lz"); @@ -1808,7 +2116,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/back.4bpp.lz"); const u32 gMonShinyPalette_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/shiny.gbapal.lz"); const u8 gMonIcon_Magmar[] = INCBIN_U8("graphics/pokemon/magmar/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Magmar[] = INCBIN_U8("graphics/pokemon/magmar/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/anim_front.4bpp.lz"); @@ -1816,7 +2126,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/back.4bpp.lz"); const u32 gMonShinyPalette_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/shiny.gbapal.lz"); const u8 gMonIcon_Magmortar[] = INCBIN_U8("graphics/pokemon/magmortar/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Magmortar[] = INCBIN_U8("graphics/pokemon/magmortar/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MAGMAR @@ -1826,7 +2138,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/back.4bpp.lz"); const u32 gMonShinyPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/shiny.gbapal.lz"); const u8 gMonIcon_Pinsir[] = INCBIN_U8("graphics/pokemon/pinsir/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pinsir[] = INCBIN_U8("graphics/pokemon/pinsir/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/front.4bpp.lz"); @@ -1843,7 +2157,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/back.4bpp.lz"); const u32 gMonShinyPalette_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/shiny.gbapal.lz"); const u8 gMonIcon_Tauros[] = INCBIN_U8("graphics/pokemon/tauros/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tauros[] = INCBIN_U8("graphics/pokemon/tauros/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_PALDEAN_FORMS const u32 gMonFrontPic_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/front.4bpp.lz"); @@ -1872,7 +2188,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/back.4bpp.lz"); const u32 gMonShinyPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/shiny.gbapal.lz"); const u8 gMonIcon_Magikarp[] = INCBIN_U8("graphics/pokemon/magikarp/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Magikarp[] = INCBIN_U8("graphics/pokemon/magikarp/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/magikarp/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/magikarp/backf.4bpp.lz"); @@ -1882,7 +2200,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/back.4bpp.lz"); const u32 gMonShinyPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/shiny.gbapal.lz"); const u8 gMonIcon_Gyarados[] = INCBIN_U8("graphics/pokemon/gyarados/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gyarados[] = INCBIN_U8("graphics/pokemon/gyarados/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GyaradosF[] = INCBIN_U32("graphics/pokemon/gyarados/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GyaradosF[] = INCBIN_U32("graphics/pokemon/gyarados/backf.4bpp.lz"); @@ -1902,7 +2222,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/back.4bpp.lz"); const u32 gMonShinyPalette_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/shiny.gbapal.lz"); const u8 gMonIcon_Lapras[] = INCBIN_U8("graphics/pokemon/lapras/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lapras[] = INCBIN_U8("graphics/pokemon/lapras/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/front.4bpp.lz"); @@ -1919,7 +2241,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/back.4bpp.lz"); const u32 gMonShinyPalette_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/shiny.gbapal.lz"); const u8 gMonIcon_Ditto[] = INCBIN_U8("graphics/pokemon/ditto/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ditto[] = INCBIN_U8("graphics/pokemon/ditto/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DITTO #if P_FAMILY_EEVEE @@ -1928,7 +2252,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/back.4bpp.lz"); const u32 gMonShinyPalette_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/shiny.gbapal.lz"); const u8 gMonIcon_Eevee[] = INCBIN_U8("graphics/pokemon/eevee/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Eevee[] = INCBIN_U8("graphics/pokemon/eevee/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_EeveeF[] = INCBIN_U32("graphics/pokemon/eevee/anim_frontf.4bpp.lz"); const u32 gMonBackPic_EeveeF[] = INCBIN_U32("graphics/pokemon/eevee/backf.4bpp.lz"); @@ -1946,21 +2272,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/back.4bpp.lz"); const u32 gMonShinyPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/shiny.gbapal.lz"); const u8 gMonIcon_Vaporeon[] = INCBIN_U8("graphics/pokemon/vaporeon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Vaporeon[] = INCBIN_U8("graphics/pokemon/vaporeon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/anim_front.4bpp.lz"); const u32 gMonPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/normal.gbapal.lz"); const u32 gMonBackPic_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/back.4bpp.lz"); const u32 gMonShinyPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/shiny.gbapal.lz"); const u8 gMonIcon_Jolteon[] = INCBIN_U8("graphics/pokemon/jolteon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Jolteon[] = INCBIN_U8("graphics/pokemon/jolteon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/anim_front.4bpp.lz"); const u32 gMonPalette_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/normal.gbapal.lz"); const u32 gMonBackPic_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/back.4bpp.lz"); const u32 gMonShinyPalette_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/shiny.gbapal.lz"); const u8 gMonIcon_Flareon[] = INCBIN_U8("graphics/pokemon/flareon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Flareon[] = INCBIN_U8("graphics/pokemon/flareon/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/anim_front.4bpp.lz"); @@ -1968,14 +2300,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/back.4bpp.lz"); const u32 gMonShinyPalette_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/shiny.gbapal.lz"); const u8 gMonIcon_Espeon[] = INCBIN_U8("graphics/pokemon/espeon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Espeon[] = INCBIN_U8("graphics/pokemon/espeon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/anim_front.4bpp.lz"); const u32 gMonPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/normal.gbapal.lz"); const u32 gMonBackPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/back.4bpp.lz"); const u32 gMonShinyPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/shiny.gbapal.lz"); const u8 gMonIcon_Umbreon[] = INCBIN_U8("graphics/pokemon/umbreon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Umbreon[] = INCBIN_U8("graphics/pokemon/umbreon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS #if P_GEN_4_CROSS_EVOS @@ -1984,14 +2320,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/back.4bpp.lz"); const u32 gMonShinyPalette_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/shiny.gbapal.lz"); const u8 gMonIcon_Leafeon[] = INCBIN_U8("graphics/pokemon/leafeon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Leafeon[] = INCBIN_U8("graphics/pokemon/leafeon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/anim_front.4bpp.lz"); const u32 gMonPalette_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/normal.gbapal.lz"); const u32 gMonBackPic_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/back.4bpp.lz"); const u32 gMonShinyPalette_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/shiny.gbapal.lz"); const u8 gMonIcon_Glaceon[] = INCBIN_U8("graphics/pokemon/glaceon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Glaceon[] = INCBIN_U8("graphics/pokemon/glaceon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #if P_GEN_6_CROSS_EVOS @@ -2000,7 +2340,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/back.4bpp.lz"); const u32 gMonShinyPalette_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/shiny.gbapal.lz"); const u8 gMonIcon_Sylveon[] = INCBIN_U8("graphics/pokemon/sylveon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sylveon[] = INCBIN_U8("graphics/pokemon/sylveon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_6_CROSS_EVOS #endif //P_FAMILY_EEVEE @@ -2010,7 +2352,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/back.4bpp.lz"); const u32 gMonShinyPalette_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/shiny.gbapal.lz"); const u8 gMonIcon_Porygon[] = INCBIN_U8("graphics/pokemon/porygon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Porygon[] = INCBIN_U8("graphics/pokemon/porygon/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/anim_front.4bpp.lz"); @@ -2018,7 +2362,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/back.4bpp.lz"); const u32 gMonShinyPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/shiny.gbapal.lz"); const u8 gMonIcon_Porygon2[] = INCBIN_U8("graphics/pokemon/porygon2/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Porygon2[] = INCBIN_U8("graphics/pokemon/porygon2/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/anim_front.4bpp.lz"); @@ -2026,7 +2372,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/back.4bpp.lz"); const u32 gMonShinyPalette_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/shiny.gbapal.lz"); const u8 gMonIcon_PorygonZ[] = INCBIN_U8("graphics/pokemon/porygon_z/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_PorygonZ[] = INCBIN_U8("graphics/pokemon/porygon_z/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_PORYGON @@ -2037,14 +2385,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/back.4bpp.lz"); const u32 gMonShinyPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/shiny.gbapal.lz"); const u8 gMonIcon_Omanyte[] = INCBIN_U8("graphics/pokemon/omanyte/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Omanyte[] = INCBIN_U8("graphics/pokemon/omanyte/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/anim_front.4bpp.lz"); const u32 gMonPalette_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/normal.gbapal.lz"); const u32 gMonBackPic_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/back.4bpp.lz"); const u32 gMonShinyPalette_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/shiny.gbapal.lz"); const u8 gMonIcon_Omastar[] = INCBIN_U8("graphics/pokemon/omastar/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Omastar[] = INCBIN_U8("graphics/pokemon/omastar/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_OMANYTE #if P_FAMILY_KABUTO @@ -2053,14 +2405,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/back.4bpp.lz"); const u32 gMonShinyPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/shiny.gbapal.lz"); const u8 gMonIcon_Kabuto[] = INCBIN_U8("graphics/pokemon/kabuto/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kabuto[] = INCBIN_U8("graphics/pokemon/kabuto/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/anim_front.4bpp.lz"); const u32 gMonPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/normal.gbapal.lz"); const u32 gMonBackPic_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/back.4bpp.lz"); const u32 gMonShinyPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/shiny.gbapal.lz"); const u8 gMonIcon_Kabutops[] = INCBIN_U8("graphics/pokemon/kabutops/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kabutops[] = INCBIN_U8("graphics/pokemon/kabutops/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_KABUTO #if P_FAMILY_AERODACTYL @@ -2069,7 +2425,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/back.4bpp.lz"); const u32 gMonShinyPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/shiny.gbapal.lz"); const u8 gMonIcon_Aerodactyl[] = INCBIN_U8("graphics/pokemon/aerodactyl/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Aerodactyl[] = INCBIN_U8("graphics/pokemon/aerodactyl/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/front.4bpp.lz"); @@ -2087,7 +2445,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/back.4bpp.lz"); const u32 gMonShinyPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/shiny.gbapal.lz"); const u8 gMonIcon_Munchlax[] = INCBIN_U8("graphics/pokemon/munchlax/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Munchlax[] = INCBIN_U8("graphics/pokemon/munchlax/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/anim_front.4bpp.lz"); @@ -2095,7 +2455,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/back.4bpp.lz"); const u32 gMonShinyPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/shiny.gbapal.lz"); const u8 gMonIcon_Snorlax[] = INCBIN_U8("graphics/pokemon/snorlax/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Snorlax[] = INCBIN_U8("graphics/pokemon/snorlax/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/front.4bpp.lz"); @@ -2112,7 +2474,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/back.4bpp.lz"); const u32 gMonShinyPalette_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/shiny.gbapal.lz"); const u8 gMonIcon_Articuno[] = INCBIN_U8("graphics/pokemon/articuno/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Articuno[] = INCBIN_U8("graphics/pokemon/articuno/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/front.4bpp.lz"); @@ -2129,7 +2493,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/back.4bpp.lz"); const u32 gMonShinyPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/shiny.gbapal.lz"); const u8 gMonIcon_Zapdos[] = INCBIN_U8("graphics/pokemon/zapdos/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Zapdos[] = INCBIN_U8("graphics/pokemon/zapdos/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/front.4bpp.lz"); @@ -2146,7 +2512,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/back.4bpp.lz"); const u32 gMonShinyPalette_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/shiny.gbapal.lz"); const u8 gMonIcon_Moltres[] = INCBIN_U8("graphics/pokemon/moltres/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Moltres[] = INCBIN_U8("graphics/pokemon/moltres/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/front.4bpp.lz"); @@ -2163,21 +2531,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/back.4bpp.lz"); const u32 gMonShinyPalette_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/shiny.gbapal.lz"); const u8 gMonIcon_Dratini[] = INCBIN_U8("graphics/pokemon/dratini/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dratini[] = INCBIN_U8("graphics/pokemon/dratini/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/anim_front.4bpp.lz"); const u32 gMonPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/normal.gbapal.lz"); const u32 gMonBackPic_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/back.4bpp.lz"); const u32 gMonShinyPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/shiny.gbapal.lz"); const u8 gMonIcon_Dragonair[] = INCBIN_U8("graphics/pokemon/dragonair/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dragonair[] = INCBIN_U8("graphics/pokemon/dragonair/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/anim_front.4bpp.lz"); const u32 gMonPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/normal.gbapal.lz"); const u32 gMonBackPic_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/back.4bpp.lz"); const u32 gMonShinyPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/shiny.gbapal.lz"); const u8 gMonIcon_Dragonite[] = INCBIN_U8("graphics/pokemon/dragonite/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dragonite[] = INCBIN_U8("graphics/pokemon/dragonite/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DRATINI #if P_FAMILY_MEWTWO @@ -2186,7 +2560,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/back.4bpp.lz"); const u32 gMonShinyPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/shiny.gbapal.lz"); const u8 gMonIcon_Mewtwo[] = INCBIN_U8("graphics/pokemon/mewtwo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mewtwo[] = INCBIN_U8("graphics/pokemon/mewtwo/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/front.4bpp.lz"); @@ -2209,7 +2585,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mew[] = INCBIN_U32("graphics/pokemon/mew/back.4bpp.lz"); const u32 gMonShinyPalette_Mew[] = INCBIN_U32("graphics/pokemon/mew/shiny.gbapal.lz"); const u8 gMonIcon_Mew[] = INCBIN_U8("graphics/pokemon/mew/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mew[] = INCBIN_U8("graphics/pokemon/mew/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MEW #if P_FAMILY_CHIKORITA @@ -2218,21 +2596,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/back.4bpp.lz"); const u32 gMonShinyPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/shiny.gbapal.lz"); const u8 gMonIcon_Chikorita[] = INCBIN_U8("graphics/pokemon/chikorita/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Chikorita[] = INCBIN_U8("graphics/pokemon/chikorita/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/anim_front.4bpp.lz"); const u32 gMonPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/normal.gbapal.lz"); const u32 gMonBackPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/back.4bpp.lz"); const u32 gMonShinyPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/shiny.gbapal.lz"); const u8 gMonIcon_Bayleef[] = INCBIN_U8("graphics/pokemon/bayleef/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bayleef[] = INCBIN_U8("graphics/pokemon/bayleef/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/anim_front.4bpp.lz"); const u32 gMonPalette_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/normal.gbapal.lz"); const u32 gMonBackPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/back.4bpp.lz"); const u32 gMonShinyPalette_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/shiny.gbapal.lz"); const u8 gMonIcon_Meganium[] = INCBIN_U8("graphics/pokemon/meganium/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Meganium[] = INCBIN_U8("graphics/pokemon/meganium/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MeganiumF[] = INCBIN_U32("graphics/pokemon/meganium/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MeganiumF[] = INCBIN_U32("graphics/pokemon/meganium/backf.4bpp.lz"); @@ -2244,21 +2628,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/back.4bpp.lz"); const u32 gMonShinyPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/shiny.gbapal.lz"); const u8 gMonIcon_Cyndaquil[] = INCBIN_U8("graphics/pokemon/cyndaquil/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cyndaquil[] = INCBIN_U8("graphics/pokemon/cyndaquil/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/anim_front.4bpp.lz"); const u32 gMonPalette_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/normal.gbapal.lz"); const u32 gMonBackPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/back.4bpp.lz"); const u32 gMonShinyPalette_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/shiny.gbapal.lz"); const u8 gMonIcon_Quilava[] = INCBIN_U8("graphics/pokemon/quilava/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Quilava[] = INCBIN_U8("graphics/pokemon/quilava/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/anim_front.4bpp.lz"); const u32 gMonPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/normal.gbapal.lz"); const u32 gMonBackPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/back.4bpp.lz"); const u32 gMonShinyPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/shiny.gbapal.lz"); const u8 gMonIcon_Typhlosion[] = INCBIN_U8("graphics/pokemon/typhlosion/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Typhlosion[] = INCBIN_U8("graphics/pokemon/typhlosion/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/front.4bpp.lz"); @@ -2275,21 +2665,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/back.4bpp.lz"); const u32 gMonShinyPalette_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/shiny.gbapal.lz"); const u8 gMonIcon_Totodile[] = INCBIN_U8("graphics/pokemon/totodile/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Totodile[] = INCBIN_U8("graphics/pokemon/totodile/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/anim_front.4bpp.lz"); const u32 gMonPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/normal.gbapal.lz"); const u32 gMonBackPic_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/back.4bpp.lz"); const u32 gMonShinyPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/shiny.gbapal.lz"); const u8 gMonIcon_Croconaw[] = INCBIN_U8("graphics/pokemon/croconaw/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Croconaw[] = INCBIN_U8("graphics/pokemon/croconaw/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/anim_front.4bpp.lz"); const u32 gMonPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/normal.gbapal.lz"); const u32 gMonBackPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/back.4bpp.lz"); const u32 gMonShinyPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/shiny.gbapal.lz"); const u8 gMonIcon_Feraligatr[] = INCBIN_U8("graphics/pokemon/feraligatr/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Feraligatr[] = INCBIN_U8("graphics/pokemon/feraligatr/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TOTODILE #if P_FAMILY_SENTRET @@ -2298,14 +2694,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/back.4bpp.lz"); const u32 gMonShinyPalette_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/shiny.gbapal.lz"); const u8 gMonIcon_Sentret[] = INCBIN_U8("graphics/pokemon/sentret/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sentret[] = INCBIN_U8("graphics/pokemon/sentret/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/anim_front.4bpp.lz"); const u32 gMonPalette_Furret[] = INCBIN_U32("graphics/pokemon/furret/normal.gbapal.lz"); const u32 gMonBackPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/back.4bpp.lz"); const u32 gMonShinyPalette_Furret[] = INCBIN_U32("graphics/pokemon/furret/shiny.gbapal.lz"); const u8 gMonIcon_Furret[] = INCBIN_U8("graphics/pokemon/furret/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Furret[] = INCBIN_U8("graphics/pokemon/furret/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SENTRET #if P_FAMILY_HOOTHOOT @@ -2314,14 +2714,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/back.4bpp.lz"); const u32 gMonShinyPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/shiny.gbapal.lz"); const u8 gMonIcon_Hoothoot[] = INCBIN_U8("graphics/pokemon/hoothoot/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hoothoot[] = INCBIN_U8("graphics/pokemon/hoothoot/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/anim_front.4bpp.lz"); const u32 gMonPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/normal.gbapal.lz"); const u32 gMonBackPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/back.4bpp.lz"); const u32 gMonShinyPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/shiny.gbapal.lz"); const u8 gMonIcon_Noctowl[] = INCBIN_U8("graphics/pokemon/noctowl/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Noctowl[] = INCBIN_U8("graphics/pokemon/noctowl/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_HOOTHOOT #if P_FAMILY_LEDYBA @@ -2330,7 +2734,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/back.4bpp.lz"); const u32 gMonShinyPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/shiny.gbapal.lz"); const u8 gMonIcon_Ledyba[] = INCBIN_U8("graphics/pokemon/ledyba/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ledyba[] = INCBIN_U8("graphics/pokemon/ledyba/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_LedybaF[] = INCBIN_U32("graphics/pokemon/ledyba/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LedybaF[] = INCBIN_U32("graphics/pokemon/ledyba/backf.4bpp.lz"); @@ -2340,7 +2746,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/back.4bpp.lz"); const u32 gMonShinyPalette_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/shiny.gbapal.lz"); const u8 gMonIcon_Ledian[] = INCBIN_U8("graphics/pokemon/ledian/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ledian[] = INCBIN_U8("graphics/pokemon/ledian/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_LedianF[] = INCBIN_U32("graphics/pokemon/ledian/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LedianF[] = INCBIN_U32("graphics/pokemon/ledian/backf.4bpp.lz"); @@ -2352,14 +2760,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/back.4bpp.lz"); const u32 gMonShinyPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/shiny.gbapal.lz"); const u8 gMonIcon_Spinarak[] = INCBIN_U8("graphics/pokemon/spinarak/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Spinarak[] = INCBIN_U8("graphics/pokemon/spinarak/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/anim_front.4bpp.lz"); const u32 gMonPalette_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/normal.gbapal.lz"); const u32 gMonBackPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/back.4bpp.lz"); const u32 gMonShinyPalette_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/shiny.gbapal.lz"); const u8 gMonIcon_Ariados[] = INCBIN_U8("graphics/pokemon/ariados/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ariados[] = INCBIN_U8("graphics/pokemon/ariados/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SPINARAK #if P_FAMILY_CHINCHOU @@ -2368,14 +2780,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/back.4bpp.lz"); const u32 gMonShinyPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/shiny.gbapal.lz"); const u8 gMonIcon_Chinchou[] = INCBIN_U8("graphics/pokemon/chinchou/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Chinchou[] = INCBIN_U8("graphics/pokemon/chinchou/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/anim_front.4bpp.lz"); const u32 gMonPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/normal.gbapal.lz"); const u32 gMonBackPic_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/back.4bpp.lz"); const u32 gMonShinyPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/shiny.gbapal.lz"); const u8 gMonIcon_Lanturn[] = INCBIN_U8("graphics/pokemon/lanturn/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lanturn[] = INCBIN_U8("graphics/pokemon/lanturn/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CHINCHOU #if P_FAMILY_TOGEPI @@ -2384,14 +2800,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/back.4bpp.lz"); const u32 gMonShinyPalette_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/shiny.gbapal.lz"); const u8 gMonIcon_Togepi[] = INCBIN_U8("graphics/pokemon/togepi/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Togepi[] = INCBIN_U8("graphics/pokemon/togepi/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/anim_front.4bpp.lz"); const u32 gMonPalette_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/normal.gbapal.lz"); const u32 gMonBackPic_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/back.4bpp.lz"); const u32 gMonShinyPalette_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/shiny.gbapal.lz"); const u8 gMonIcon_Togetic[] = INCBIN_U8("graphics/pokemon/togetic/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Togetic[] = INCBIN_U8("graphics/pokemon/togetic/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/anim_front.4bpp.lz"); @@ -2399,7 +2819,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/back.4bpp.lz"); const u32 gMonShinyPalette_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/shiny.gbapal.lz"); const u8 gMonIcon_Togekiss[] = INCBIN_U8("graphics/pokemon/togekiss/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Togekiss[] = INCBIN_U8("graphics/pokemon/togekiss/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_TOGEPI @@ -2409,14 +2831,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Natu[] = INCBIN_U32("graphics/pokemon/natu/back.4bpp.lz"); const u32 gMonShinyPalette_Natu[] = INCBIN_U32("graphics/pokemon/natu/shiny.gbapal.lz"); const u8 gMonIcon_Natu[] = INCBIN_U8("graphics/pokemon/natu/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Natu[] = INCBIN_U8("graphics/pokemon/natu/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/anim_front.4bpp.lz"); const u32 gMonPalette_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/normal.gbapal.lz"); const u32 gMonBackPic_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/back.4bpp.lz"); const u32 gMonShinyPalette_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/shiny.gbapal.lz"); const u8 gMonIcon_Xatu[] = INCBIN_U8("graphics/pokemon/xatu/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Xatu[] = INCBIN_U8("graphics/pokemon/xatu/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_XatuF[] = INCBIN_U32("graphics/pokemon/xatu/anim_frontf.4bpp.lz"); #endif //P_FAMILY_NATU @@ -2427,21 +2853,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/back.4bpp.lz"); const u32 gMonShinyPalette_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/shiny.gbapal.lz"); const u8 gMonIcon_Mareep[] = INCBIN_U8("graphics/pokemon/mareep/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mareep[] = INCBIN_U8("graphics/pokemon/mareep/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/anim_front.4bpp.lz"); const u32 gMonPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/normal.gbapal.lz"); const u32 gMonBackPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/back.4bpp.lz"); const u32 gMonShinyPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/shiny.gbapal.lz"); const u8 gMonIcon_Flaaffy[] = INCBIN_U8("graphics/pokemon/flaaffy/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Flaaffy[] = INCBIN_U8("graphics/pokemon/flaaffy/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/anim_front.4bpp.lz"); const u32 gMonPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/normal.gbapal.lz"); const u32 gMonBackPic_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/back.4bpp.lz"); const u32 gMonShinyPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/shiny.gbapal.lz"); const u8 gMonIcon_Ampharos[] = INCBIN_U8("graphics/pokemon/ampharos/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ampharos[] = INCBIN_U8("graphics/pokemon/ampharos/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/front.4bpp.lz"); @@ -2459,7 +2891,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/back.4bpp.lz"); const u32 gMonShinyPalette_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/shiny.gbapal.lz"); const u8 gMonIcon_Azurill[] = INCBIN_U8("graphics/pokemon/azurill/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Azurill[] = INCBIN_U8("graphics/pokemon/azurill/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_3_CROSS_EVOS const u32 gMonFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/anim_front.4bpp.lz"); @@ -2467,14 +2901,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/back.4bpp.lz"); const u32 gMonShinyPalette_Marill[] = INCBIN_U32("graphics/pokemon/marill/shiny.gbapal.lz"); const u8 gMonIcon_Marill[] = INCBIN_U8("graphics/pokemon/marill/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Marill[] = INCBIN_U8("graphics/pokemon/marill/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/anim_front.4bpp.lz"); const u32 gMonPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/normal.gbapal.lz"); const u32 gMonBackPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/back.4bpp.lz"); const u32 gMonShinyPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/shiny.gbapal.lz"); const u8 gMonIcon_Azumarill[] = INCBIN_U8("graphics/pokemon/azumarill/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Azumarill[] = INCBIN_U8("graphics/pokemon/azumarill/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MARILL #if P_FAMILY_SUDOWOODO @@ -2484,7 +2922,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/back.4bpp.lz"); const u32 gMonShinyPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/shiny.gbapal.lz"); const u8 gMonIcon_Bonsly[] = INCBIN_U8("graphics/pokemon/bonsly/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bonsly[] = INCBIN_U8("graphics/pokemon/bonsly/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/anim_front.4bpp.lz"); @@ -2492,7 +2932,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/back.4bpp.lz"); const u32 gMonShinyPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/shiny.gbapal.lz"); const u8 gMonIcon_Sudowoodo[] = INCBIN_U8("graphics/pokemon/sudowoodo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sudowoodo[] = INCBIN_U8("graphics/pokemon/sudowoodo/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_SudowoodoF[] = INCBIN_U32("graphics/pokemon/sudowoodo/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SudowoodoF[] = INCBIN_U32("graphics/pokemon/sudowoodo/backf.4bpp.lz"); @@ -2504,21 +2946,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/back.4bpp.lz"); const u32 gMonShinyPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/shiny.gbapal.lz"); const u8 gMonIcon_Hoppip[] = INCBIN_U8("graphics/pokemon/hoppip/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hoppip[] = INCBIN_U8("graphics/pokemon/hoppip/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/anim_front.4bpp.lz"); const u32 gMonPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/normal.gbapal.lz"); const u32 gMonBackPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/back.4bpp.lz"); const u32 gMonShinyPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/shiny.gbapal.lz"); const u8 gMonIcon_Skiploom[] = INCBIN_U8("graphics/pokemon/skiploom/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Skiploom[] = INCBIN_U8("graphics/pokemon/skiploom/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/anim_front.4bpp.lz"); const u32 gMonPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/normal.gbapal.lz"); const u32 gMonBackPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/back.4bpp.lz"); const u32 gMonShinyPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/shiny.gbapal.lz"); const u8 gMonIcon_Jumpluff[] = INCBIN_U8("graphics/pokemon/jumpluff/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Jumpluff[] = INCBIN_U8("graphics/pokemon/jumpluff/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_HOPPIP #if P_FAMILY_AIPOM @@ -2527,7 +2975,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/back.4bpp.lz"); const u32 gMonShinyPalette_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/shiny.gbapal.lz"); const u8 gMonIcon_Aipom[] = INCBIN_U8("graphics/pokemon/aipom/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Aipom[] = INCBIN_U8("graphics/pokemon/aipom/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_AipomF[] = INCBIN_U32("graphics/pokemon/aipom/anim_frontf.4bpp.lz"); const u32 gMonBackPic_AipomF[] = INCBIN_U32("graphics/pokemon/aipom/backf.4bpp.lz"); @@ -2538,7 +2988,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/back.4bpp.lz"); const u32 gMonShinyPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/shiny.gbapal.lz"); const u8 gMonIcon_Ambipom[] = INCBIN_U8("graphics/pokemon/ambipom/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ambipom[] = INCBIN_U8("graphics/pokemon/ambipom/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/ambipom/anim_frontf.4bpp.lz"); const u32 gMonBackPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/ambipom/backf.4bpp.lz"); @@ -2551,14 +3003,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/back.4bpp.lz"); const u32 gMonShinyPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/shiny.gbapal.lz"); const u8 gMonIcon_Sunkern[] = INCBIN_U8("graphics/pokemon/sunkern/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sunkern[] = INCBIN_U8("graphics/pokemon/sunkern/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/anim_front.4bpp.lz"); const u32 gMonPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/normal.gbapal.lz"); const u32 gMonBackPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/back.4bpp.lz"); const u32 gMonShinyPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/shiny.gbapal.lz"); const u8 gMonIcon_Sunflora[] = INCBIN_U8("graphics/pokemon/sunflora/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sunflora[] = INCBIN_U8("graphics/pokemon/sunflora/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SUNKERN #if P_FAMILY_YANMA @@ -2567,7 +3023,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/back.4bpp.lz"); const u32 gMonShinyPalette_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/shiny.gbapal.lz"); const u8 gMonIcon_Yanma[] = INCBIN_U8("graphics/pokemon/yanma/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Yanma[] = INCBIN_U8("graphics/pokemon/yanma/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/anim_front.4bpp.lz"); @@ -2575,7 +3033,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/back.4bpp.lz"); const u32 gMonShinyPalette_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/shiny.gbapal.lz"); const u8 gMonIcon_Yanmega[] = INCBIN_U8("graphics/pokemon/yanmega/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Yanmega[] = INCBIN_U8("graphics/pokemon/yanmega/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_YANMA @@ -2585,7 +3045,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/back.4bpp.lz"); const u32 gMonShinyPalette_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/shiny.gbapal.lz"); const u8 gMonIcon_Wooper[] = INCBIN_U8("graphics/pokemon/wooper/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Wooper[] = INCBIN_U8("graphics/pokemon/wooper/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_WooperF[] = INCBIN_U32("graphics/pokemon/wooper/anim_frontf.4bpp.lz"); const u32 gMonBackPic_WooperF[] = INCBIN_U32("graphics/pokemon/wooper/backf.4bpp.lz"); @@ -2595,7 +3057,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/back.4bpp.lz"); const u32 gMonShinyPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/shiny.gbapal.lz"); const u8 gMonIcon_Quagsire[] = INCBIN_U8("graphics/pokemon/quagsire/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Quagsire[] = INCBIN_U8("graphics/pokemon/quagsire/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/quagsire/anim_frontf.4bpp.lz"); const u32 gMonBackPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/quagsire/backf.4bpp.lz"); @@ -2612,7 +3076,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/back.4bpp.lz"); const u32 gMonShinyPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/shiny.gbapal.lz"); const u8 gMonIcon_Clodsire[] = INCBIN_U8("graphics/pokemon/clodsire/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Clodsire[] = INCBIN_U8("graphics/pokemon/clodsire/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_PALDEAN_FORMS #endif //P_FAMILY_WOOPER @@ -2622,7 +3088,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/back.4bpp.lz"); const u32 gMonShinyPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/shiny.gbapal.lz"); const u8 gMonIcon_Murkrow[] = INCBIN_U8("graphics/pokemon/murkrow/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Murkrow[] = INCBIN_U8("graphics/pokemon/murkrow/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MurkrowF[] = INCBIN_U32("graphics/pokemon/murkrow/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MurkrowF[] = INCBIN_U32("graphics/pokemon/murkrow/backf.4bpp.lz"); @@ -2633,7 +3101,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/back.4bpp.lz"); const u32 gMonShinyPalette_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/shiny.gbapal.lz"); const u8 gMonIcon_Honchkrow[] = INCBIN_U8("graphics/pokemon/honchkrow/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Honchkrow[] = INCBIN_U8("graphics/pokemon/honchkrow/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MURKROW @@ -2643,7 +3113,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/back.4bpp.lz"); const u32 gMonShinyPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/shiny.gbapal.lz"); const u8 gMonIcon_Misdreavus[] = INCBIN_U8("graphics/pokemon/misdreavus/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Misdreavus[] = INCBIN_U8("graphics/pokemon/misdreavus/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/anim_front.4bpp.lz"); @@ -2651,14 +3123,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/back.4bpp.lz"); const u32 gMonShinyPalette_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/shiny.gbapal.lz"); const u8 gMonIcon_Mismagius[] = INCBIN_U8("graphics/pokemon/mismagius/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mismagius[] = INCBIN_U8("graphics/pokemon/mismagius/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MISDREAVUS #if P_FAMILY_UNOWN const u32 gMonPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/normal.gbapal.lz"); const u32 gMonShinyPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/shiny.gbapal.lz"); +#if P_FOOTPRINTS const u8 gMonFootprint_Unown[] = INCBIN_U8("graphics/pokemon/unown/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/anim_front.4bpp.lz"); const u32 gMonBackPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/back.4bpp.lz"); @@ -2780,7 +3256,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/back.4bpp.lz"); const u32 gMonShinyPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/shiny.gbapal.lz"); const u8 gMonIcon_Wynaut[] = INCBIN_U8("graphics/pokemon/wynaut/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Wynaut[] = INCBIN_U8("graphics/pokemon/wynaut/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_3_CROSS_EVOS const u32 gMonFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/anim_front.4bpp.lz"); @@ -2788,7 +3266,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/back.4bpp.lz"); const u32 gMonShinyPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/shiny.gbapal.lz"); const u8 gMonIcon_Wobbuffet[] = INCBIN_U8("graphics/pokemon/wobbuffet/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Wobbuffet[] = INCBIN_U8("graphics/pokemon/wobbuffet/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_WobbuffetF[] = INCBIN_U32("graphics/pokemon/wobbuffet/anim_frontf.4bpp.lz"); const u32 gMonBackPic_WobbuffetF[] = INCBIN_U32("graphics/pokemon/wobbuffet/backf.4bpp.lz"); @@ -2803,7 +3283,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/back.4bpp.lz"); const u32 gMonShinyPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/shiny.gbapal.lz"); const u8 gMonIcon_Girafarig[] = INCBIN_U8("graphics/pokemon/girafarig/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Girafarig[] = INCBIN_U8("graphics/pokemon/girafarig/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GirafarigF[] = INCBIN_U32("graphics/pokemon/girafarig/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GirafarigF[] = INCBIN_U32("graphics/pokemon/girafarig/backf.4bpp.lz"); @@ -2814,7 +3296,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/back.4bpp.lz"); const u32 gMonShinyPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/shiny.gbapal.lz"); const u8 gMonIcon_Farigiraf[] = INCBIN_U8("graphics/pokemon/farigiraf/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Farigiraf[] = INCBIN_U8("graphics/pokemon/farigiraf/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_GIRAFARIG @@ -2824,14 +3308,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/back.4bpp.lz"); const u32 gMonShinyPalette_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/shiny.gbapal.lz"); const u8 gMonIcon_Pineco[] = INCBIN_U8("graphics/pokemon/pineco/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pineco[] = INCBIN_U8("graphics/pokemon/pineco/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/anim_front.4bpp.lz"); const u32 gMonPalette_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/normal.gbapal.lz"); const u32 gMonBackPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/back.4bpp.lz"); const u32 gMonShinyPalette_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/shiny.gbapal.lz"); const u8 gMonIcon_Forretress[] = INCBIN_U8("graphics/pokemon/forretress/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Forretress[] = INCBIN_U8("graphics/pokemon/forretress/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PINECO #if P_FAMILY_DUNSPARCE @@ -2840,13 +3328,17 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/back.4bpp.lz"); const u32 gMonShinyPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/shiny.gbapal.lz"); const u8 gMonIcon_Dunsparce[] = INCBIN_U8("graphics/pokemon/dunsparce/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dunsparce[] = INCBIN_U8("graphics/pokemon/dunsparce/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_9_CROSS_EVOS const u32 gMonPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/normal.gbapal.lz"); const u32 gMonShinyPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/shiny.gbapal.lz"); const u8 gMonIcon_Dudunsparce[] = INCBIN_U8("graphics/pokemon/dudunsparce/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Dudunsparce[] = INCBIN_U8("graphics/pokemon/dudunsparce/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_DudunsparceTwoSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/front.4bpp.lz"); const u32 gMonBackPic_DudunsparceTwoSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/back.4bpp.lz"); @@ -2862,7 +3354,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/back.4bpp.lz"); const u32 gMonShinyPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/shiny.gbapal.lz"); const u8 gMonIcon_Gligar[] = INCBIN_U8("graphics/pokemon/gligar/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gligar[] = INCBIN_U8("graphics/pokemon/gligar/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GligarF[] = INCBIN_U32("graphics/pokemon/gligar/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GligarF[] = INCBIN_U32("graphics/pokemon/gligar/backf.4bpp.lz"); @@ -2873,7 +3367,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/back.4bpp.lz"); const u32 gMonShinyPalette_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/shiny.gbapal.lz"); const u8 gMonIcon_Gliscor[] = INCBIN_U8("graphics/pokemon/gliscor/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gliscor[] = INCBIN_U8("graphics/pokemon/gliscor/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_GLIGAR @@ -2883,14 +3379,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/back.4bpp.lz"); const u32 gMonShinyPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/shiny.gbapal.lz"); const u8 gMonIcon_Snubbull[] = INCBIN_U8("graphics/pokemon/snubbull/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Snubbull[] = INCBIN_U8("graphics/pokemon/snubbull/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/anim_front.4bpp.lz"); const u32 gMonPalette_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/normal.gbapal.lz"); const u32 gMonBackPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/back.4bpp.lz"); const u32 gMonShinyPalette_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/shiny.gbapal.lz"); const u8 gMonIcon_Granbull[] = INCBIN_U8("graphics/pokemon/granbull/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Granbull[] = INCBIN_U8("graphics/pokemon/granbull/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SNUBBULL #if P_FAMILY_QWILFISH @@ -2899,7 +3399,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/back.4bpp.lz"); const u32 gMonShinyPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/shiny.gbapal.lz"); const u8 gMonIcon_Qwilfish[] = INCBIN_U8("graphics/pokemon/qwilfish/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Qwilfish[] = INCBIN_U8("graphics/pokemon/qwilfish/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/front.4bpp.lz"); @@ -2913,7 +3415,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/back.4bpp.lz"); const u32 gMonShinyPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/shiny.gbapal.lz"); const u8 gMonIcon_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/icon.4bpp"); +#if P_FOOTPRINTS //const u8 gMonFootprint_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_QWILFISH @@ -2923,7 +3427,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/back.4bpp.lz"); const u32 gMonShinyPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/shiny.gbapal.lz"); const u8 gMonIcon_Shuckle[] = INCBIN_U8("graphics/pokemon/shuckle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Shuckle[] = INCBIN_U8("graphics/pokemon/shuckle/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SHUCKLE #if P_FAMILY_HERACROSS @@ -2932,7 +3438,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/back.4bpp.lz"); const u32 gMonShinyPalette_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/shiny.gbapal.lz"); const u8 gMonIcon_Heracross[] = INCBIN_U8("graphics/pokemon/heracross/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Heracross[] = INCBIN_U8("graphics/pokemon/heracross/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_HeracrossF[] = INCBIN_U32("graphics/pokemon/heracross/anim_frontf.4bpp.lz"); const u32 gMonBackPic_HeracrossF[] = INCBIN_U32("graphics/pokemon/heracross/backf.4bpp.lz"); @@ -2952,7 +3460,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/back.4bpp.lz"); const u32 gMonShinyPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/shiny.gbapal.lz"); const u8 gMonIcon_Sneasel[] = INCBIN_U8("graphics/pokemon/sneasel/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sneasel[] = INCBIN_U8("graphics/pokemon/sneasel/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_SneaselF[] = INCBIN_U32("graphics/pokemon/sneasel/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SneaselF[] = INCBIN_U32("graphics/pokemon/sneasel/backf.4bpp.lz"); @@ -2963,7 +3473,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/back.4bpp.lz"); const u32 gMonShinyPalette_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/shiny.gbapal.lz"); const u8 gMonIcon_Weavile[] = INCBIN_U8("graphics/pokemon/weavile/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Weavile[] = INCBIN_U8("graphics/pokemon/weavile/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_WeavileF[] = INCBIN_U32("graphics/pokemon/weavile/anim_frontf.4bpp.lz"); const u32 gMonBackPic_WeavileF[] = INCBIN_U32("graphics/pokemon/weavile/backf.4bpp.lz"); @@ -2984,7 +3496,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/back.4bpp.lz"); const u32 gMonShinyPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/shiny.gbapal.lz"); const u8 gMonIcon_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/icon.4bpp"); +#if P_FOOTPRINTS //const u8 gMonFootprint_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_SNEASEL @@ -2994,14 +3508,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/back.4bpp.lz"); const u32 gMonShinyPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/shiny.gbapal.lz"); const u8 gMonIcon_Teddiursa[] = INCBIN_U8("graphics/pokemon/teddiursa/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Teddiursa[] = INCBIN_U8("graphics/pokemon/teddiursa/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/anim_front.4bpp.lz"); const u32 gMonPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/normal.gbapal.lz"); const u32 gMonBackPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/back.4bpp.lz"); const u32 gMonShinyPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/shiny.gbapal.lz"); const u8 gMonIcon_Ursaring[] = INCBIN_U8("graphics/pokemon/ursaring/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ursaring[] = INCBIN_U8("graphics/pokemon/ursaring/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_UrsaringF[] = INCBIN_U32("graphics/pokemon/ursaring/anim_frontf.4bpp.lz"); const u32 gMonBackPic_UrsaringF[] = INCBIN_U32("graphics/pokemon/ursaring/backf.4bpp.lz"); @@ -3012,7 +3530,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/back.4bpp.lz"); const u32 gMonShinyPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/shiny.gbapal.lz"); const u8 gMonIcon_Ursaluna[] = INCBIN_U8("graphics/pokemon/ursaluna/icon.4bpp"); +#if P_FOOTPRINTS //const u8 gMonFootprint_Ursaluna[] = INCBIN_U8("graphics/pokemon/ursaluna/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/front.4bpp.lz"); const u32 gMonPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/normal.gbapal.lz"); @@ -3028,14 +3548,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/back.4bpp.lz"); const u32 gMonShinyPalette_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/shiny.gbapal.lz"); const u8 gMonIcon_Slugma[] = INCBIN_U8("graphics/pokemon/slugma/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Slugma[] = INCBIN_U8("graphics/pokemon/slugma/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/anim_front.4bpp.lz"); const u32 gMonPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/normal.gbapal.lz"); const u32 gMonBackPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/back.4bpp.lz"); const u32 gMonShinyPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/shiny.gbapal.lz"); const u8 gMonIcon_Magcargo[] = INCBIN_U8("graphics/pokemon/magcargo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Magcargo[] = INCBIN_U8("graphics/pokemon/magcargo/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SLUGMA #if P_FAMILY_SWINUB @@ -3044,14 +3568,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/back.4bpp.lz"); const u32 gMonShinyPalette_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/shiny.gbapal.lz"); const u8 gMonIcon_Swinub[] = INCBIN_U8("graphics/pokemon/swinub/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Swinub[] = INCBIN_U8("graphics/pokemon/swinub/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/anim_front.4bpp.lz"); const u32 gMonPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/normal.gbapal.lz"); const u32 gMonBackPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/back.4bpp.lz"); const u32 gMonShinyPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/shiny.gbapal.lz"); const u8 gMonIcon_Piloswine[] = INCBIN_U8("graphics/pokemon/piloswine/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Piloswine[] = INCBIN_U8("graphics/pokemon/piloswine/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_PiloswineF[] = INCBIN_U32("graphics/pokemon/piloswine/anim_frontf.4bpp.lz"); const u32 gMonBackPic_PiloswineF[] = INCBIN_U32("graphics/pokemon/piloswine/backf.4bpp.lz"); @@ -3062,7 +3590,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/back.4bpp.lz"); const u32 gMonShinyPalette_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/shiny.gbapal.lz"); const u8 gMonIcon_Mamoswine[] = INCBIN_U8("graphics/pokemon/mamoswine/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mamoswine[] = INCBIN_U8("graphics/pokemon/mamoswine/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MamoswineF[] = INCBIN_U32("graphics/pokemon/mamoswine/anim_frontf.4bpp.lz"); #endif //P_GEN_4_CROSS_EVOS @@ -3074,7 +3604,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/back.4bpp.lz"); const u32 gMonShinyPalette_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/shiny.gbapal.lz"); const u8 gMonIcon_Corsola[] = INCBIN_U8("graphics/pokemon/corsola/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Corsola[] = INCBIN_U8("graphics/pokemon/corsola/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/front.4bpp.lz"); @@ -3088,7 +3620,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/back.4bpp.lz"); const u32 gMonShinyPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/shiny.gbapal.lz"); const u8 gMonIcon_Cursola[] = INCBIN_U8("graphics/pokemon/cursola/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cursola[] = INCBIN_U8("graphics/pokemon/cursola/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_CORSOLA @@ -3098,14 +3632,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/back.4bpp.lz"); const u32 gMonShinyPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/shiny.gbapal.lz"); const u8 gMonIcon_Remoraid[] = INCBIN_U8("graphics/pokemon/remoraid/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Remoraid[] = INCBIN_U8("graphics/pokemon/remoraid/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/anim_front.4bpp.lz"); const u32 gMonPalette_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/normal.gbapal.lz"); const u32 gMonBackPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/back.4bpp.lz"); const u32 gMonShinyPalette_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/shiny.gbapal.lz"); const u8 gMonIcon_Octillery[] = INCBIN_U8("graphics/pokemon/octillery/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Octillery[] = INCBIN_U8("graphics/pokemon/octillery/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_OctilleryF[] = INCBIN_U32("graphics/pokemon/octillery/anim_frontf.4bpp.lz"); const u32 gMonBackPic_OctilleryF[] = INCBIN_U32("graphics/pokemon/octillery/backf.4bpp.lz"); @@ -3117,7 +3655,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/back.4bpp.lz"); const u32 gMonShinyPalette_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/shiny.gbapal.lz"); const u8 gMonIcon_Delibird[] = INCBIN_U8("graphics/pokemon/delibird/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Delibird[] = INCBIN_U8("graphics/pokemon/delibird/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DELIBIRD #if P_FAMILY_MANTINE @@ -3127,7 +3667,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/back.4bpp.lz"); const u32 gMonShinyPalette_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/shiny.gbapal.lz"); const u8 gMonIcon_Mantyke[] = INCBIN_U8("graphics/pokemon/mantyke/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mantyke[] = INCBIN_U8("graphics/pokemon/mantyke/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/anim_front.4bpp.lz"); @@ -3135,7 +3677,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/back.4bpp.lz"); const u32 gMonShinyPalette_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/shiny.gbapal.lz"); const u8 gMonIcon_Mantine[] = INCBIN_U8("graphics/pokemon/mantine/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mantine[] = INCBIN_U8("graphics/pokemon/mantine/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MANTINE #if P_FAMILY_SKARMORY @@ -3144,7 +3688,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/back.4bpp.lz"); const u32 gMonShinyPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/shiny.gbapal.lz"); const u8 gMonIcon_Skarmory[] = INCBIN_U8("graphics/pokemon/skarmory/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Skarmory[] = INCBIN_U8("graphics/pokemon/skarmory/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SKARMORY #if P_FAMILY_HOUNDOUR @@ -3153,14 +3699,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/back.4bpp.lz"); const u32 gMonShinyPalette_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/shiny.gbapal.lz"); const u8 gMonIcon_Houndour[] = INCBIN_U8("graphics/pokemon/houndour/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Houndour[] = INCBIN_U8("graphics/pokemon/houndour/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/anim_front.4bpp.lz"); const u32 gMonPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/normal.gbapal.lz"); const u32 gMonBackPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/back.4bpp.lz"); const u32 gMonShinyPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/shiny.gbapal.lz"); const u8 gMonIcon_Houndoom[] = INCBIN_U8("graphics/pokemon/houndoom/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Houndoom[] = INCBIN_U8("graphics/pokemon/houndoom/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_HoundoomF[] = INCBIN_U32("graphics/pokemon/houndoom/anim_frontf.4bpp.lz"); const u32 gMonBackPic_HoundoomF[] = INCBIN_U32("graphics/pokemon/houndoom/backf.4bpp.lz"); @@ -3180,14 +3730,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/back.4bpp.lz"); const u32 gMonShinyPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/shiny.gbapal.lz"); const u8 gMonIcon_Phanpy[] = INCBIN_U8("graphics/pokemon/phanpy/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Phanpy[] = INCBIN_U8("graphics/pokemon/phanpy/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/anim_front.4bpp.lz"); const u32 gMonPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/normal.gbapal.lz"); const u32 gMonBackPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/back.4bpp.lz"); const u32 gMonShinyPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/shiny.gbapal.lz"); const u8 gMonIcon_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_DonphanF[] = INCBIN_U32("graphics/pokemon/donphan/anim_frontf.4bpp.lz"); const u32 gMonBackPic_DonphanF[] = INCBIN_U32("graphics/pokemon/donphan/backf.4bpp.lz"); @@ -3199,7 +3753,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/back.4bpp.lz"); const u32 gMonShinyPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/shiny.gbapal.lz"); const u8 gMonIcon_Stantler[] = INCBIN_U8("graphics/pokemon/stantler/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Stantler[] = INCBIN_U8("graphics/pokemon/stantler/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_8_CROSS_EVOS const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4bpp.lz"); @@ -3207,7 +3763,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/back.4bpp.lz"); const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/shiny.gbapal.lz"); const u8 gMonIcon_Wyrdeer[] = INCBIN_U8("graphics/pokemon/wyrdeer/icon.4bpp"); +#if P_FOOTPRINTS //const u8 gMonFootprint_Wyrdeer[] = INCBIN_U8("graphics/pokemon/wyrdeer/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_STANTLER @@ -3217,7 +3775,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/back.4bpp.lz"); const u32 gMonShinyPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/shiny.gbapal.lz"); const u8 gMonIcon_Smeargle[] = INCBIN_U8("graphics/pokemon/smeargle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Smeargle[] = INCBIN_U8("graphics/pokemon/smeargle/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SMEARGLE #if P_FAMILY_MILTANK @@ -3226,7 +3786,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/back.4bpp.lz"); const u32 gMonShinyPalette_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/shiny.gbapal.lz"); const u8 gMonIcon_Miltank[] = INCBIN_U8("graphics/pokemon/miltank/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Miltank[] = INCBIN_U8("graphics/pokemon/miltank/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MILTANK #if P_FAMILY_RAIKOU @@ -3235,7 +3797,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/back.4bpp.lz"); const u32 gMonShinyPalette_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/shiny.gbapal.lz"); const u8 gMonIcon_Raikou[] = INCBIN_U8("graphics/pokemon/raikou/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Raikou[] = INCBIN_U8("graphics/pokemon/raikou/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_RAIKOU #if P_FAMILY_ENTEI @@ -3244,7 +3808,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Entei[] = INCBIN_U32("graphics/pokemon/entei/back.4bpp.lz"); const u32 gMonShinyPalette_Entei[] = INCBIN_U32("graphics/pokemon/entei/shiny.gbapal.lz"); const u8 gMonIcon_Entei[] = INCBIN_U8("graphics/pokemon/entei/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Entei[] = INCBIN_U8("graphics/pokemon/entei/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ENTEI #if P_FAMILY_SUICUNE @@ -3253,7 +3819,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/back.4bpp.lz"); const u32 gMonShinyPalette_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/shiny.gbapal.lz"); const u8 gMonIcon_Suicune[] = INCBIN_U8("graphics/pokemon/suicune/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Suicune[] = INCBIN_U8("graphics/pokemon/suicune/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SUICUNE #if P_FAMILY_LARVITAR @@ -3262,21 +3830,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/back.4bpp.lz"); const u32 gMonShinyPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/shiny.gbapal.lz"); const u8 gMonIcon_Larvitar[] = INCBIN_U8("graphics/pokemon/larvitar/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Larvitar[] = INCBIN_U8("graphics/pokemon/larvitar/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/anim_front.4bpp.lz"); const u32 gMonPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/normal.gbapal.lz"); const u32 gMonBackPic_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/back.4bpp.lz"); const u32 gMonShinyPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/shiny.gbapal.lz"); const u8 gMonIcon_Pupitar[] = INCBIN_U8("graphics/pokemon/pupitar/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pupitar[] = INCBIN_U8("graphics/pokemon/pupitar/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/anim_front.4bpp.lz"); const u32 gMonPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/normal.gbapal.lz"); const u32 gMonBackPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/back.4bpp.lz"); const u32 gMonShinyPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/shiny.gbapal.lz"); const u8 gMonIcon_Tyranitar[] = INCBIN_U8("graphics/pokemon/tyranitar/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tyranitar[] = INCBIN_U8("graphics/pokemon/tyranitar/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/front.4bpp.lz"); @@ -3293,7 +3867,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/back.4bpp.lz"); const u32 gMonShinyPalette_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/shiny.gbapal.lz"); const u8 gMonIcon_Lugia[] = INCBIN_U8("graphics/pokemon/lugia/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lugia[] = INCBIN_U8("graphics/pokemon/lugia/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_LUGIA #if P_FAMILY_HO_OH @@ -3302,7 +3878,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/back.4bpp.lz"); const u32 gMonShinyPalette_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/shiny.gbapal.lz"); const u8 gMonIcon_HoOh[] = INCBIN_U8("graphics/pokemon/ho_oh/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_HoOh[] = INCBIN_U8("graphics/pokemon/ho_oh/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_HO_OH #if P_FAMILY_CELEBI @@ -3311,7 +3889,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/back.4bpp.lz"); const u32 gMonShinyPalette_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/shiny.gbapal.lz"); const u8 gMonIcon_Celebi[] = INCBIN_U8("graphics/pokemon/celebi/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Celebi[] = INCBIN_U8("graphics/pokemon/celebi/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CELEBI #if P_FAMILY_TREECKO @@ -3320,21 +3900,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/back.4bpp.lz"); const u32 gMonShinyPalette_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/shiny.gbapal.lz"); const u8 gMonIcon_Treecko[] = INCBIN_U8("graphics/pokemon/treecko/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Treecko[] = INCBIN_U8("graphics/pokemon/treecko/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/anim_front.4bpp.lz"); const u32 gMonPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/normal.gbapal.lz"); const u32 gMonBackPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/back.4bpp.lz"); const u32 gMonShinyPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/shiny.gbapal.lz"); const u8 gMonIcon_Grovyle[] = INCBIN_U8("graphics/pokemon/grovyle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Grovyle[] = INCBIN_U8("graphics/pokemon/grovyle/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/anim_front.4bpp.lz"); const u32 gMonPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/normal.gbapal.lz"); const u32 gMonBackPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/back.4bpp.lz"); const u32 gMonShinyPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/shiny.gbapal.lz"); const u8 gMonIcon_Sceptile[] = INCBIN_U8("graphics/pokemon/sceptile/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sceptile[] = INCBIN_U8("graphics/pokemon/sceptile/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/front.4bpp.lz"); @@ -3351,7 +3937,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/back.4bpp.lz"); const u32 gMonShinyPalette_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/shiny.gbapal.lz"); const u8 gMonIcon_Torchic[] = INCBIN_U8("graphics/pokemon/torchic/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Torchic[] = INCBIN_U8("graphics/pokemon/torchic/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonBackPic_TorchicF[] = INCBIN_U32("graphics/pokemon/torchic/backf.4bpp.lz"); @@ -3360,7 +3948,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/back.4bpp.lz"); const u32 gMonShinyPalette_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/shiny.gbapal.lz"); const u8 gMonIcon_Combusken[] = INCBIN_U8("graphics/pokemon/combusken/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Combusken[] = INCBIN_U8("graphics/pokemon/combusken/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_CombuskenF[] = INCBIN_U32("graphics/pokemon/combusken/anim_frontf.4bpp.lz"); const u32 gMonBackPic_CombuskenF[] = INCBIN_U32("graphics/pokemon/combusken/backf.4bpp.lz"); @@ -3370,7 +3960,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/back.4bpp.lz"); const u32 gMonShinyPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/shiny.gbapal.lz"); const u8 gMonIcon_Blaziken[] = INCBIN_U8("graphics/pokemon/blaziken/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Blaziken[] = INCBIN_U8("graphics/pokemon/blaziken/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_BlazikenF[] = INCBIN_U32("graphics/pokemon/blaziken/anim_frontf.4bpp.lz"); const u32 gMonBackPic_BlazikenF[] = INCBIN_U32("graphics/pokemon/blaziken/backf.4bpp.lz"); @@ -3390,21 +3982,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/back.4bpp.lz"); const u32 gMonShinyPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/shiny.gbapal.lz"); const u8 gMonIcon_Mudkip[] = INCBIN_U8("graphics/pokemon/mudkip/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mudkip[] = INCBIN_U8("graphics/pokemon/mudkip/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/anim_front.4bpp.lz"); const u32 gMonPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/normal.gbapal.lz"); const u32 gMonBackPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/back.4bpp.lz"); const u32 gMonShinyPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/shiny.gbapal.lz"); const u8 gMonIcon_Marshtomp[] = INCBIN_U8("graphics/pokemon/marshtomp/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Marshtomp[] = INCBIN_U8("graphics/pokemon/marshtomp/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/anim_front.4bpp.lz"); const u32 gMonPalette_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/normal.gbapal.lz"); const u32 gMonBackPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/back.4bpp.lz"); const u32 gMonShinyPalette_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/shiny.gbapal.lz"); const u8 gMonIcon_Swampert[] = INCBIN_U8("graphics/pokemon/swampert/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Swampert[] = INCBIN_U8("graphics/pokemon/swampert/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/front.4bpp.lz"); @@ -3421,14 +4019,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/back.4bpp.lz"); const u32 gMonShinyPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/shiny.gbapal.lz"); const u8 gMonIcon_Poochyena[] = INCBIN_U8("graphics/pokemon/poochyena/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Poochyena[] = INCBIN_U8("graphics/pokemon/poochyena/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/anim_front.4bpp.lz"); const u32 gMonPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/normal.gbapal.lz"); const u32 gMonBackPic_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/back.4bpp.lz"); const u32 gMonShinyPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/shiny.gbapal.lz"); const u8 gMonIcon_Mightyena[] = INCBIN_U8("graphics/pokemon/mightyena/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mightyena[] = INCBIN_U8("graphics/pokemon/mightyena/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_POOCHYENA #if P_FAMILY_ZIGZAGOON @@ -3437,14 +4039,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/back.4bpp.lz"); const u32 gMonShinyPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/shiny.gbapal.lz"); const u8 gMonIcon_Zigzagoon[] = INCBIN_U8("graphics/pokemon/zigzagoon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Zigzagoon[] = INCBIN_U8("graphics/pokemon/zigzagoon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/anim_front.4bpp.lz"); const u32 gMonPalette_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/normal.gbapal.lz"); const u32 gMonBackPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/back.4bpp.lz"); const u32 gMonShinyPalette_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/shiny.gbapal.lz"); const u8 gMonIcon_Linoone[] = INCBIN_U8("graphics/pokemon/linoone/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Linoone[] = INCBIN_U8("graphics/pokemon/linoone/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/front.4bpp.lz"); @@ -3464,7 +4070,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/back.4bpp.lz"); const u32 gMonShinyPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/shiny.gbapal.lz"); const u8 gMonIcon_Obstagoon[] = INCBIN_U8("graphics/pokemon/obstagoon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Obstagoon[] = INCBIN_U8("graphics/pokemon/obstagoon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZIGZAGOON @@ -3474,21 +4082,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/back.4bpp.lz"); const u32 gMonShinyPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/shiny.gbapal.lz"); const u8 gMonIcon_Wurmple[] = INCBIN_U8("graphics/pokemon/wurmple/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Wurmple[] = INCBIN_U8("graphics/pokemon/wurmple/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/anim_front.4bpp.lz"); const u32 gMonPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/normal.gbapal.lz"); const u32 gMonBackPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/back.4bpp.lz"); const u32 gMonShinyPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/shiny.gbapal.lz"); const u8 gMonIcon_Silcoon[] = INCBIN_U8("graphics/pokemon/silcoon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Silcoon[] = INCBIN_U8("graphics/pokemon/silcoon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/anim_front.4bpp.lz"); const u32 gMonPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/normal.gbapal.lz"); const u32 gMonBackPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/back.4bpp.lz"); const u32 gMonShinyPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/shiny.gbapal.lz"); const u8 gMonIcon_Beautifly[] = INCBIN_U8("graphics/pokemon/beautifly/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Beautifly[] = INCBIN_U8("graphics/pokemon/beautifly/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_BeautiflyF[] = INCBIN_U32("graphics/pokemon/beautifly/anim_frontf.4bpp.lz"); const u32 gMonBackPic_BeautiflyF[] = INCBIN_U32("graphics/pokemon/beautifly/backf.4bpp.lz"); @@ -3498,14 +4112,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/back.4bpp.lz"); const u32 gMonShinyPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/shiny.gbapal.lz"); const u8 gMonIcon_Cascoon[] = INCBIN_U8("graphics/pokemon/cascoon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cascoon[] = INCBIN_U8("graphics/pokemon/cascoon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/anim_front.4bpp.lz"); const u32 gMonPalette_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/normal.gbapal.lz"); const u32 gMonBackPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/back.4bpp.lz"); const u32 gMonShinyPalette_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/shiny.gbapal.lz"); const u8 gMonIcon_Dustox[] = INCBIN_U8("graphics/pokemon/dustox/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dustox[] = INCBIN_U8("graphics/pokemon/dustox/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_DustoxF[] = INCBIN_U32("graphics/pokemon/dustox/anim_frontf.4bpp.lz"); const u32 gMonBackPic_DustoxF[] = INCBIN_U32("graphics/pokemon/dustox/backf.4bpp.lz"); @@ -3517,21 +4135,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/back.4bpp.lz"); const u32 gMonShinyPalette_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/shiny.gbapal.lz"); const u8 gMonIcon_Lotad[] = INCBIN_U8("graphics/pokemon/lotad/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lotad[] = INCBIN_U8("graphics/pokemon/lotad/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/anim_front.4bpp.lz"); const u32 gMonPalette_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/normal.gbapal.lz"); const u32 gMonBackPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/back.4bpp.lz"); const u32 gMonShinyPalette_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/shiny.gbapal.lz"); const u8 gMonIcon_Lombre[] = INCBIN_U8("graphics/pokemon/lombre/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lombre[] = INCBIN_U8("graphics/pokemon/lombre/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/anim_front.4bpp.lz"); const u32 gMonPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/normal.gbapal.lz"); const u32 gMonBackPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/back.4bpp.lz"); const u32 gMonShinyPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/shiny.gbapal.lz"); const u8 gMonIcon_Ludicolo[] = INCBIN_U8("graphics/pokemon/ludicolo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ludicolo[] = INCBIN_U8("graphics/pokemon/ludicolo/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_LudicoloF[] = INCBIN_U32("graphics/pokemon/ludicolo/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LudicoloF[] = INCBIN_U32("graphics/pokemon/ludicolo/backf.4bpp.lz"); @@ -3543,14 +4167,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/back.4bpp.lz"); const u32 gMonShinyPalette_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/shiny.gbapal.lz"); const u8 gMonIcon_Seedot[] = INCBIN_U8("graphics/pokemon/seedot/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Seedot[] = INCBIN_U8("graphics/pokemon/seedot/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/anim_front.4bpp.lz"); const u32 gMonPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/normal.gbapal.lz"); const u32 gMonBackPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/back.4bpp.lz"); const u32 gMonShinyPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/shiny.gbapal.lz"); const u8 gMonIcon_Nuzleaf[] = INCBIN_U8("graphics/pokemon/nuzleaf/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Nuzleaf[] = INCBIN_U8("graphics/pokemon/nuzleaf/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_NuzleafF[] = INCBIN_U32("graphics/pokemon/nuzleaf/anim_frontf.4bpp.lz"); const u32 gMonBackPic_NuzleafF[] = INCBIN_U32("graphics/pokemon/nuzleaf/backf.4bpp.lz"); @@ -3560,7 +4188,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/back.4bpp.lz"); const u32 gMonShinyPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/shiny.gbapal.lz"); const u8 gMonIcon_Shiftry[] = INCBIN_U8("graphics/pokemon/shiftry/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Shiftry[] = INCBIN_U8("graphics/pokemon/shiftry/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ShiftryF[] = INCBIN_U32("graphics/pokemon/shiftry/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ShiftryF[] = INCBIN_U32("graphics/pokemon/shiftry/backf.4bpp.lz"); @@ -3572,14 +4202,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/back.4bpp.lz"); const u32 gMonShinyPalette_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/shiny.gbapal.lz"); const u8 gMonIcon_Taillow[] = INCBIN_U8("graphics/pokemon/taillow/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Taillow[] = INCBIN_U8("graphics/pokemon/taillow/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/anim_front.4bpp.lz"); const u32 gMonPalette_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/normal.gbapal.lz"); const u32 gMonBackPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/back.4bpp.lz"); const u32 gMonShinyPalette_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/shiny.gbapal.lz"); const u8 gMonIcon_Swellow[] = INCBIN_U8("graphics/pokemon/swellow/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Swellow[] = INCBIN_U8("graphics/pokemon/swellow/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TAILLOW #if P_FAMILY_WINGULL @@ -3588,14 +4222,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/back.4bpp.lz"); const u32 gMonShinyPalette_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/shiny.gbapal.lz"); const u8 gMonIcon_Wingull[] = INCBIN_U8("graphics/pokemon/wingull/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Wingull[] = INCBIN_U8("graphics/pokemon/wingull/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/anim_front.4bpp.lz"); const u32 gMonPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/normal.gbapal.lz"); const u32 gMonBackPic_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/back.4bpp.lz"); const u32 gMonShinyPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/shiny.gbapal.lz"); const u8 gMonIcon_Pelipper[] = INCBIN_U8("graphics/pokemon/pelipper/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pelipper[] = INCBIN_U8("graphics/pokemon/pelipper/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_WINGULL #if P_FAMILY_RALTS @@ -3604,21 +4242,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/back.4bpp.lz"); const u32 gMonShinyPalette_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/shiny.gbapal.lz"); const u8 gMonIcon_Ralts[] = INCBIN_U8("graphics/pokemon/ralts/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ralts[] = INCBIN_U8("graphics/pokemon/ralts/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/anim_front.4bpp.lz"); const u32 gMonPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/normal.gbapal.lz"); const u32 gMonBackPic_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/back.4bpp.lz"); const u32 gMonShinyPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/shiny.gbapal.lz"); const u8 gMonIcon_Kirlia[] = INCBIN_U8("graphics/pokemon/kirlia/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kirlia[] = INCBIN_U8("graphics/pokemon/kirlia/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/anim_front.4bpp.lz"); const u32 gMonPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/normal.gbapal.lz"); const u32 gMonBackPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/back.4bpp.lz"); const u32 gMonShinyPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/shiny.gbapal.lz"); const u8 gMonIcon_Gardevoir[] = INCBIN_U8("graphics/pokemon/gardevoir/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gardevoir[] = INCBIN_U8("graphics/pokemon/gardevoir/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/front.4bpp.lz"); @@ -3634,7 +4278,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/back.4bpp.lz"); const u32 gMonShinyPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/shiny.gbapal.lz"); const u8 gMonIcon_Gallade[] = INCBIN_U8("graphics/pokemon/gallade/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gallade[] = INCBIN_U8("graphics/pokemon/gallade/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/front.4bpp.lz"); @@ -3652,14 +4298,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/back.4bpp.lz"); const u32 gMonShinyPalette_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/shiny.gbapal.lz"); const u8 gMonIcon_Surskit[] = INCBIN_U8("graphics/pokemon/surskit/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Surskit[] = INCBIN_U8("graphics/pokemon/surskit/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/anim_front.4bpp.lz"); const u32 gMonPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/normal.gbapal.lz"); const u32 gMonBackPic_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/back.4bpp.lz"); const u32 gMonShinyPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/shiny.gbapal.lz"); const u8 gMonIcon_Masquerain[] = INCBIN_U8("graphics/pokemon/masquerain/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Masquerain[] = INCBIN_U8("graphics/pokemon/masquerain/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SURSKIT #if P_FAMILY_SHROOMISH @@ -3668,14 +4318,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/back.4bpp.lz"); const u32 gMonShinyPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/shiny.gbapal.lz"); const u8 gMonIcon_Shroomish[] = INCBIN_U8("graphics/pokemon/shroomish/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Shroomish[] = INCBIN_U8("graphics/pokemon/shroomish/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/anim_front.4bpp.lz"); const u32 gMonPalette_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/normal.gbapal.lz"); const u32 gMonBackPic_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/back.4bpp.lz"); const u32 gMonShinyPalette_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/shiny.gbapal.lz"); const u8 gMonIcon_Breloom[] = INCBIN_U8("graphics/pokemon/breloom/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Breloom[] = INCBIN_U8("graphics/pokemon/breloom/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SHROOMISH #if P_FAMILY_SLAKOTH @@ -3684,21 +4338,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/back.4bpp.lz"); const u32 gMonShinyPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/shiny.gbapal.lz"); const u8 gMonIcon_Slakoth[] = INCBIN_U8("graphics/pokemon/slakoth/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Slakoth[] = INCBIN_U8("graphics/pokemon/slakoth/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/anim_front.4bpp.lz"); const u32 gMonPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/normal.gbapal.lz"); const u32 gMonBackPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/back.4bpp.lz"); const u32 gMonShinyPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/shiny.gbapal.lz"); const u8 gMonIcon_Vigoroth[] = INCBIN_U8("graphics/pokemon/vigoroth/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Vigoroth[] = INCBIN_U8("graphics/pokemon/vigoroth/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/anim_front.4bpp.lz"); const u32 gMonPalette_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/normal.gbapal.lz"); const u32 gMonBackPic_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/back.4bpp.lz"); const u32 gMonShinyPalette_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/shiny.gbapal.lz"); const u8 gMonIcon_Slaking[] = INCBIN_U8("graphics/pokemon/slaking/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Slaking[] = INCBIN_U8("graphics/pokemon/slaking/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SLAKOTH #if P_FAMILY_NINCADA @@ -3707,21 +4367,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/back.4bpp.lz"); const u32 gMonShinyPalette_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/shiny.gbapal.lz"); const u8 gMonIcon_Nincada[] = INCBIN_U8("graphics/pokemon/nincada/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Nincada[] = INCBIN_U8("graphics/pokemon/nincada/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/anim_front.4bpp.lz"); const u32 gMonPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/normal.gbapal.lz"); const u32 gMonBackPic_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/back.4bpp.lz"); const u32 gMonShinyPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/shiny.gbapal.lz"); const u8 gMonIcon_Ninjask[] = INCBIN_U8("graphics/pokemon/ninjask/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ninjask[] = INCBIN_U8("graphics/pokemon/ninjask/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/anim_front.4bpp.lz"); const u32 gMonPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/normal.gbapal.lz"); const u32 gMonBackPic_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/back.4bpp.lz"); const u32 gMonShinyPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/shiny.gbapal.lz"); const u8 gMonIcon_Shedinja[] = INCBIN_U8("graphics/pokemon/shedinja/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Shedinja[] = INCBIN_U8("graphics/pokemon/shedinja/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_NINCADA #if P_FAMILY_WHISMUR @@ -3730,21 +4396,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/back.4bpp.lz"); const u32 gMonShinyPalette_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/shiny.gbapal.lz"); const u8 gMonIcon_Whismur[] = INCBIN_U8("graphics/pokemon/whismur/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Whismur[] = INCBIN_U8("graphics/pokemon/whismur/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/anim_front.4bpp.lz"); const u32 gMonPalette_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/normal.gbapal.lz"); const u32 gMonBackPic_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/back.4bpp.lz"); const u32 gMonShinyPalette_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/shiny.gbapal.lz"); const u8 gMonIcon_Loudred[] = INCBIN_U8("graphics/pokemon/loudred/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Loudred[] = INCBIN_U8("graphics/pokemon/loudred/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/anim_front.4bpp.lz"); const u32 gMonPalette_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/normal.gbapal.lz"); const u32 gMonBackPic_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/back.4bpp.lz"); const u32 gMonShinyPalette_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/shiny.gbapal.lz"); const u8 gMonIcon_Exploud[] = INCBIN_U8("graphics/pokemon/exploud/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Exploud[] = INCBIN_U8("graphics/pokemon/exploud/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_WHISMUR #if P_FAMILY_MAKUHITA @@ -3753,14 +4425,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/back.4bpp.lz"); const u32 gMonShinyPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/shiny.gbapal.lz"); const u8 gMonIcon_Makuhita[] = INCBIN_U8("graphics/pokemon/makuhita/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Makuhita[] = INCBIN_U8("graphics/pokemon/makuhita/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/anim_front.4bpp.lz"); const u32 gMonPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/normal.gbapal.lz"); const u32 gMonBackPic_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/back.4bpp.lz"); const u32 gMonShinyPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/shiny.gbapal.lz"); const u8 gMonIcon_Hariyama[] = INCBIN_U8("graphics/pokemon/hariyama/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hariyama[] = INCBIN_U8("graphics/pokemon/hariyama/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MAKUHITA #if P_FAMILY_NOSEPASS @@ -3769,7 +4445,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/back.4bpp.lz"); const u32 gMonShinyPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/shiny.gbapal.lz"); const u8 gMonIcon_Nosepass[] = INCBIN_U8("graphics/pokemon/nosepass/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Nosepass[] = INCBIN_U8("graphics/pokemon/nosepass/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/anim_front.4bpp.lz"); @@ -3777,7 +4455,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/back.4bpp.lz"); const u32 gMonShinyPalette_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/shiny.gbapal.lz"); const u8 gMonIcon_Probopass[] = INCBIN_U8("graphics/pokemon/probopass/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Probopass[] = INCBIN_U8("graphics/pokemon/probopass/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_NOSEPASS @@ -3787,14 +4467,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/back.4bpp.lz"); const u32 gMonShinyPalette_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/shiny.gbapal.lz"); const u8 gMonIcon_Skitty[] = INCBIN_U8("graphics/pokemon/skitty/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Skitty[] = INCBIN_U8("graphics/pokemon/skitty/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/anim_front.4bpp.lz"); const u32 gMonPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/normal.gbapal.lz"); const u32 gMonBackPic_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/back.4bpp.lz"); const u32 gMonShinyPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/shiny.gbapal.lz"); const u8 gMonIcon_Delcatty[] = INCBIN_U8("graphics/pokemon/delcatty/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Delcatty[] = INCBIN_U8("graphics/pokemon/delcatty/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SKITTY #if P_FAMILY_SABLEYE @@ -3803,7 +4487,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/back.4bpp.lz"); const u32 gMonShinyPalette_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/shiny.gbapal.lz"); const u8 gMonIcon_Sableye[] = INCBIN_U8("graphics/pokemon/sableye/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sableye[] = INCBIN_U8("graphics/pokemon/sableye/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/front.4bpp.lz"); @@ -3820,7 +4506,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/back.4bpp.lz"); const u32 gMonShinyPalette_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/shiny.gbapal.lz"); const u8 gMonIcon_Mawile[] = INCBIN_U8("graphics/pokemon/mawile/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mawile[] = INCBIN_U8("graphics/pokemon/mawile/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/front.4bpp.lz"); @@ -3837,21 +4525,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Aron[] = INCBIN_U32("graphics/pokemon/aron/back.4bpp.lz"); const u32 gMonShinyPalette_Aron[] = INCBIN_U32("graphics/pokemon/aron/shiny.gbapal.lz"); const u8 gMonIcon_Aron[] = INCBIN_U8("graphics/pokemon/aron/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Aron[] = INCBIN_U8("graphics/pokemon/aron/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/anim_front.4bpp.lz"); const u32 gMonPalette_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/normal.gbapal.lz"); const u32 gMonBackPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/back.4bpp.lz"); const u32 gMonShinyPalette_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/shiny.gbapal.lz"); const u8 gMonIcon_Lairon[] = INCBIN_U8("graphics/pokemon/lairon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lairon[] = INCBIN_U8("graphics/pokemon/lairon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/anim_front.4bpp.lz"); const u32 gMonPalette_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/normal.gbapal.lz"); const u32 gMonBackPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/back.4bpp.lz"); const u32 gMonShinyPalette_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/shiny.gbapal.lz"); const u8 gMonIcon_Aggron[] = INCBIN_U8("graphics/pokemon/aggron/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Aggron[] = INCBIN_U8("graphics/pokemon/aggron/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/front.4bpp.lz"); @@ -3868,7 +4562,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/back.4bpp.lz"); const u32 gMonShinyPalette_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/shiny.gbapal.lz"); const u8 gMonIcon_Meditite[] = INCBIN_U8("graphics/pokemon/meditite/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Meditite[] = INCBIN_U8("graphics/pokemon/meditite/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MedititeF[] = INCBIN_U32("graphics/pokemon/meditite/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MedititeF[] = INCBIN_U32("graphics/pokemon/meditite/backf.4bpp.lz"); @@ -3878,7 +4574,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/back.4bpp.lz"); const u32 gMonShinyPalette_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/shiny.gbapal.lz"); const u8 gMonIcon_Medicham[] = INCBIN_U8("graphics/pokemon/medicham/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Medicham[] = INCBIN_U8("graphics/pokemon/medicham/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MedichamF[] = INCBIN_U32("graphics/pokemon/medicham/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MedichamF[] = INCBIN_U32("graphics/pokemon/medicham/backf.4bpp.lz"); @@ -3898,14 +4596,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/back.4bpp.lz"); const u32 gMonShinyPalette_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/shiny.gbapal.lz"); const u8 gMonIcon_Electrike[] = INCBIN_U8("graphics/pokemon/electrike/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Electrike[] = INCBIN_U8("graphics/pokemon/electrike/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/anim_front.4bpp.lz"); const u32 gMonPalette_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/normal.gbapal.lz"); const u32 gMonBackPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/back.4bpp.lz"); const u32 gMonShinyPalette_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/shiny.gbapal.lz"); const u8 gMonIcon_Manectric[] = INCBIN_U8("graphics/pokemon/manectric/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Manectric[] = INCBIN_U8("graphics/pokemon/manectric/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/front.4bpp.lz"); @@ -3922,7 +4624,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/back.4bpp.lz"); const u32 gMonShinyPalette_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/shiny.gbapal.lz"); const u8 gMonIcon_Plusle[] = INCBIN_U8("graphics/pokemon/plusle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Plusle[] = INCBIN_U8("graphics/pokemon/plusle/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PLUSLE #if P_FAMILY_MINUN @@ -3931,7 +4635,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Minun[] = INCBIN_U32("graphics/pokemon/minun/back.4bpp.lz"); const u32 gMonShinyPalette_Minun[] = INCBIN_U32("graphics/pokemon/minun/shiny.gbapal.lz"); const u8 gMonIcon_Minun[] = INCBIN_U8("graphics/pokemon/minun/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Minun[] = INCBIN_U8("graphics/pokemon/minun/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MINUN #if P_FAMILY_VOLBEAT_ILLUMISE @@ -3940,14 +4646,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/back.4bpp.lz"); const u32 gMonShinyPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/shiny.gbapal.lz"); const u8 gMonIcon_Volbeat[] = INCBIN_U8("graphics/pokemon/volbeat/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Volbeat[] = INCBIN_U8("graphics/pokemon/volbeat/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/anim_front.4bpp.lz"); const u32 gMonPalette_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/normal.gbapal.lz"); const u32 gMonBackPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/back.4bpp.lz"); const u32 gMonShinyPalette_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/shiny.gbapal.lz"); const u8 gMonIcon_Illumise[] = INCBIN_U8("graphics/pokemon/illumise/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Illumise[] = INCBIN_U8("graphics/pokemon/illumise/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_VOLBEAT_ILLUMISE #if P_FAMILY_ROSELIA @@ -3957,7 +4667,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Budew[] = INCBIN_U32("graphics/pokemon/budew/back.4bpp.lz"); const u32 gMonShinyPalette_Budew[] = INCBIN_U32("graphics/pokemon/budew/shiny.gbapal.lz"); const u8 gMonIcon_Budew[] = INCBIN_U8("graphics/pokemon/budew/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Budew[] = INCBIN_U8("graphics/pokemon/budew/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/anim_front.4bpp.lz"); @@ -3965,7 +4677,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/back.4bpp.lz"); const u32 gMonShinyPalette_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/shiny.gbapal.lz"); const u8 gMonIcon_Roselia[] = INCBIN_U8("graphics/pokemon/roselia/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Roselia[] = INCBIN_U8("graphics/pokemon/roselia/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_RoseliaF[] = INCBIN_U32("graphics/pokemon/roselia/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RoseliaF[] = INCBIN_U32("graphics/pokemon/roselia/backf.4bpp.lz"); @@ -3976,7 +4690,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/back.4bpp.lz"); const u32 gMonShinyPalette_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/shiny.gbapal.lz"); const u8 gMonIcon_Roserade[] = INCBIN_U8("graphics/pokemon/roserade/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Roserade[] = INCBIN_U8("graphics/pokemon/roserade/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_RoseradeF[] = INCBIN_U32("graphics/pokemon/roserade/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RoseradeF[] = INCBIN_U32("graphics/pokemon/roserade/backf.4bpp.lz"); @@ -3989,7 +4705,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/back.4bpp.lz"); const u32 gMonShinyPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/shiny.gbapal.lz"); const u8 gMonIcon_Gulpin[] = INCBIN_U8("graphics/pokemon/gulpin/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gulpin[] = INCBIN_U8("graphics/pokemon/gulpin/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GulpinF[] = INCBIN_U32("graphics/pokemon/gulpin/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GulpinF[] = INCBIN_U32("graphics/pokemon/gulpin/backf.4bpp.lz"); @@ -3999,7 +4717,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/back.4bpp.lz"); const u32 gMonShinyPalette_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/shiny.gbapal.lz"); const u8 gMonIcon_Swalot[] = INCBIN_U8("graphics/pokemon/swalot/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Swalot[] = INCBIN_U8("graphics/pokemon/swalot/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_SwalotF[] = INCBIN_U32("graphics/pokemon/swalot/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SwalotF[] = INCBIN_U32("graphics/pokemon/swalot/backf.4bpp.lz"); @@ -4011,14 +4731,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/back.4bpp.lz"); const u32 gMonShinyPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/shiny.gbapal.lz"); const u8 gMonIcon_Carvanha[] = INCBIN_U8("graphics/pokemon/carvanha/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Carvanha[] = INCBIN_U8("graphics/pokemon/carvanha/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/anim_front.4bpp.lz"); const u32 gMonPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/normal.gbapal.lz"); const u32 gMonBackPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/back.4bpp.lz"); const u32 gMonShinyPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/shiny.gbapal.lz"); const u8 gMonIcon_Sharpedo[] = INCBIN_U8("graphics/pokemon/sharpedo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sharpedo[] = INCBIN_U8("graphics/pokemon/sharpedo/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/front.4bpp.lz"); @@ -4035,14 +4759,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/back.4bpp.lz"); const u32 gMonShinyPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/shiny.gbapal.lz"); const u8 gMonIcon_Wailmer[] = INCBIN_U8("graphics/pokemon/wailmer/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Wailmer[] = INCBIN_U8("graphics/pokemon/wailmer/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/anim_front.4bpp.lz"); const u32 gMonPalette_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/normal.gbapal.lz"); const u32 gMonBackPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/back.4bpp.lz"); const u32 gMonShinyPalette_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/shiny.gbapal.lz"); const u8 gMonIcon_Wailord[] = INCBIN_U8("graphics/pokemon/wailord/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Wailord[] = INCBIN_U8("graphics/pokemon/wailord/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_WAILMER #if P_FAMILY_NUMEL @@ -4051,7 +4779,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Numel[] = INCBIN_U32("graphics/pokemon/numel/back.4bpp.lz"); const u32 gMonShinyPalette_Numel[] = INCBIN_U32("graphics/pokemon/numel/shiny.gbapal.lz"); const u8 gMonIcon_Numel[] = INCBIN_U8("graphics/pokemon/numel/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Numel[] = INCBIN_U8("graphics/pokemon/numel/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_NumelF[] = INCBIN_U32("graphics/pokemon/numel/anim_frontf.4bpp.lz"); const u32 gMonBackPic_NumelF[] = INCBIN_U32("graphics/pokemon/numel/backf.4bpp.lz"); @@ -4061,7 +4791,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/back.4bpp.lz"); const u32 gMonShinyPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/shiny.gbapal.lz"); const u8 gMonIcon_Camerupt[] = INCBIN_U8("graphics/pokemon/camerupt/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Camerupt[] = INCBIN_U8("graphics/pokemon/camerupt/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_CameruptF[] = INCBIN_U32("graphics/pokemon/camerupt/anim_frontf.4bpp.lz"); const u32 gMonBackPic_CameruptF[] = INCBIN_U32("graphics/pokemon/camerupt/backf.4bpp.lz"); @@ -4081,7 +4813,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/back.4bpp.lz"); const u32 gMonShinyPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/shiny.gbapal.lz"); const u8 gMonIcon_Torkoal[] = INCBIN_U8("graphics/pokemon/torkoal/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Torkoal[] = INCBIN_U8("graphics/pokemon/torkoal/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TORKOAL #if P_FAMILY_SPOINK @@ -4090,14 +4824,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/back.4bpp.lz"); const u32 gMonShinyPalette_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/shiny.gbapal.lz"); const u8 gMonIcon_Spoink[] = INCBIN_U8("graphics/pokemon/spoink/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Spoink[] = INCBIN_U8("graphics/pokemon/spoink/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/anim_front.4bpp.lz"); const u32 gMonPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/normal.gbapal.lz"); const u32 gMonBackPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/back.4bpp.lz"); const u32 gMonShinyPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/shiny.gbapal.lz"); const u8 gMonIcon_Grumpig[] = INCBIN_U8("graphics/pokemon/grumpig/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Grumpig[] = INCBIN_U8("graphics/pokemon/grumpig/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SPOINK #if P_FAMILY_SPINDA @@ -4106,7 +4844,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/back.4bpp.lz"); const u32 gMonShinyPalette_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/shiny.gbapal.lz"); const u8 gMonIcon_Spinda[] = INCBIN_U8("graphics/pokemon/spinda/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Spinda[] = INCBIN_U8("graphics/pokemon/spinda/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SPINDA #if P_FAMILY_TRAPINCH @@ -4115,21 +4855,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/back.4bpp.lz"); const u32 gMonShinyPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/shiny.gbapal.lz"); const u8 gMonIcon_Trapinch[] = INCBIN_U8("graphics/pokemon/trapinch/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Trapinch[] = INCBIN_U8("graphics/pokemon/trapinch/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/anim_front.4bpp.lz"); const u32 gMonPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/normal.gbapal.lz"); const u32 gMonBackPic_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/back.4bpp.lz"); const u32 gMonShinyPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/shiny.gbapal.lz"); const u8 gMonIcon_Vibrava[] = INCBIN_U8("graphics/pokemon/vibrava/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Vibrava[] = INCBIN_U8("graphics/pokemon/vibrava/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/anim_front.4bpp.lz"); const u32 gMonPalette_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/normal.gbapal.lz"); const u32 gMonBackPic_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/back.4bpp.lz"); const u32 gMonShinyPalette_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/shiny.gbapal.lz"); const u8 gMonIcon_Flygon[] = INCBIN_U8("graphics/pokemon/flygon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Flygon[] = INCBIN_U8("graphics/pokemon/flygon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TRAPINCH #if P_FAMILY_CACNEA @@ -4138,14 +4884,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/back.4bpp.lz"); const u32 gMonShinyPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/shiny.gbapal.lz"); const u8 gMonIcon_Cacnea[] = INCBIN_U8("graphics/pokemon/cacnea/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cacnea[] = INCBIN_U8("graphics/pokemon/cacnea/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/anim_front.4bpp.lz"); const u32 gMonPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/normal.gbapal.lz"); const u32 gMonBackPic_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/back.4bpp.lz"); const u32 gMonShinyPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/shiny.gbapal.lz"); const u8 gMonIcon_Cacturne[] = INCBIN_U8("graphics/pokemon/cacturne/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cacturne[] = INCBIN_U8("graphics/pokemon/cacturne/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_CacturneF[] = INCBIN_U32("graphics/pokemon/cacturne/anim_frontf.4bpp.lz"); #endif //P_FAMILY_CACNEA @@ -4156,14 +4906,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/back.4bpp.lz"); const u32 gMonShinyPalette_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/shiny.gbapal.lz"); const u8 gMonIcon_Swablu[] = INCBIN_U8("graphics/pokemon/swablu/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Swablu[] = INCBIN_U8("graphics/pokemon/swablu/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/anim_front.4bpp.lz"); const u32 gMonPalette_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/normal.gbapal.lz"); const u32 gMonBackPic_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/back.4bpp.lz"); const u32 gMonShinyPalette_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/shiny.gbapal.lz"); const u8 gMonIcon_Altaria[] = INCBIN_U8("graphics/pokemon/altaria/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Altaria[] = INCBIN_U8("graphics/pokemon/altaria/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/front.4bpp.lz"); @@ -4180,7 +4934,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/back.4bpp.lz"); const u32 gMonShinyPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/shiny.gbapal.lz"); const u8 gMonIcon_Zangoose[] = INCBIN_U8("graphics/pokemon/zangoose/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Zangoose[] = INCBIN_U8("graphics/pokemon/zangoose/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ZANGOOSE #if P_FAMILY_SEVIPER @@ -4189,7 +4945,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/back.4bpp.lz"); const u32 gMonShinyPalette_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/shiny.gbapal.lz"); const u8 gMonIcon_Seviper[] = INCBIN_U8("graphics/pokemon/seviper/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Seviper[] = INCBIN_U8("graphics/pokemon/seviper/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SEVIPER #if P_FAMILY_LUNATONE @@ -4198,7 +4956,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/back.4bpp.lz"); const u32 gMonShinyPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/shiny.gbapal.lz"); const u8 gMonIcon_Lunatone[] = INCBIN_U8("graphics/pokemon/lunatone/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lunatone[] = INCBIN_U8("graphics/pokemon/lunatone/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_LUNATONE #if P_FAMILY_SOLROCK @@ -4207,7 +4967,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/back.4bpp.lz"); const u32 gMonShinyPalette_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/shiny.gbapal.lz"); const u8 gMonIcon_Solrock[] = INCBIN_U8("graphics/pokemon/solrock/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Solrock[] = INCBIN_U8("graphics/pokemon/solrock/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SOLROCK #if P_FAMILY_BARBOACH @@ -4216,14 +4978,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/back.4bpp.lz"); const u32 gMonShinyPalette_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/shiny.gbapal.lz"); const u8 gMonIcon_Barboach[] = INCBIN_U8("graphics/pokemon/barboach/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Barboach[] = INCBIN_U8("graphics/pokemon/barboach/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/anim_front.4bpp.lz"); const u32 gMonPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/normal.gbapal.lz"); const u32 gMonBackPic_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/back.4bpp.lz"); const u32 gMonShinyPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/shiny.gbapal.lz"); const u8 gMonIcon_Whiscash[] = INCBIN_U8("graphics/pokemon/whiscash/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Whiscash[] = INCBIN_U8("graphics/pokemon/whiscash/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BARBOACH #if P_FAMILY_CORPHISH @@ -4232,14 +4998,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/back.4bpp.lz"); const u32 gMonShinyPalette_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/shiny.gbapal.lz"); const u8 gMonIcon_Corphish[] = INCBIN_U8("graphics/pokemon/corphish/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Corphish[] = INCBIN_U8("graphics/pokemon/corphish/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/anim_front.4bpp.lz"); const u32 gMonPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/normal.gbapal.lz"); const u32 gMonBackPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/back.4bpp.lz"); const u32 gMonShinyPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/shiny.gbapal.lz"); const u8 gMonIcon_Crawdaunt[] = INCBIN_U8("graphics/pokemon/crawdaunt/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Crawdaunt[] = INCBIN_U8("graphics/pokemon/crawdaunt/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CORPHISH #if P_FAMILY_BALTOY @@ -4248,14 +5018,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/back.4bpp.lz"); const u32 gMonShinyPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/shiny.gbapal.lz"); const u8 gMonIcon_Baltoy[] = INCBIN_U8("graphics/pokemon/baltoy/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Baltoy[] = INCBIN_U8("graphics/pokemon/baltoy/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/anim_front.4bpp.lz"); const u32 gMonPalette_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/normal.gbapal.lz"); const u32 gMonBackPic_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/back.4bpp.lz"); const u32 gMonShinyPalette_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/shiny.gbapal.lz"); const u8 gMonIcon_Claydol[] = INCBIN_U8("graphics/pokemon/claydol/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Claydol[] = INCBIN_U8("graphics/pokemon/claydol/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BALTOY #if P_FAMILY_LILEEP @@ -4264,14 +5038,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/back.4bpp.lz"); const u32 gMonShinyPalette_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/shiny.gbapal.lz"); const u8 gMonIcon_Lileep[] = INCBIN_U8("graphics/pokemon/lileep/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lileep[] = INCBIN_U8("graphics/pokemon/lileep/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/anim_front.4bpp.lz"); const u32 gMonPalette_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/normal.gbapal.lz"); const u32 gMonBackPic_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/back.4bpp.lz"); const u32 gMonShinyPalette_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/shiny.gbapal.lz"); const u8 gMonIcon_Cradily[] = INCBIN_U8("graphics/pokemon/cradily/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cradily[] = INCBIN_U8("graphics/pokemon/cradily/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_LILEEP #if P_FAMILY_ANORITH @@ -4280,14 +5058,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/back.4bpp.lz"); const u32 gMonShinyPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/shiny.gbapal.lz"); const u8 gMonIcon_Anorith[] = INCBIN_U8("graphics/pokemon/anorith/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Anorith[] = INCBIN_U8("graphics/pokemon/anorith/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/anim_front.4bpp.lz"); const u32 gMonPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/normal.gbapal.lz"); const u32 gMonBackPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/back.4bpp.lz"); const u32 gMonShinyPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/shiny.gbapal.lz"); const u8 gMonIcon_Armaldo[] = INCBIN_U8("graphics/pokemon/armaldo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Armaldo[] = INCBIN_U8("graphics/pokemon/armaldo/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ANORITH #if P_FAMILY_FEEBAS @@ -4296,14 +5078,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/back.4bpp.lz"); const u32 gMonShinyPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/shiny.gbapal.lz"); const u8 gMonIcon_Feebas[] = INCBIN_U8("graphics/pokemon/feebas/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Feebas[] = INCBIN_U8("graphics/pokemon/feebas/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/anim_front.4bpp.lz"); const u32 gMonPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/normal.gbapal.lz"); const u32 gMonBackPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/back.4bpp.lz"); const u32 gMonShinyPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/shiny.gbapal.lz"); const u8 gMonIcon_Milotic[] = INCBIN_U8("graphics/pokemon/milotic/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Milotic[] = INCBIN_U8("graphics/pokemon/milotic/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MiloticF[] = INCBIN_U32("graphics/pokemon/milotic/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MiloticF[] = INCBIN_U32("graphics/pokemon/milotic/backf.4bpp.lz"); @@ -4315,7 +5101,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/back.4bpp.lz"); const u32 gMonShinyPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/shiny.gbapal.lz"); const u8 gMonIcon_CastformNormal[] = INCBIN_U8("graphics/pokemon/castform/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Castform[] = INCBIN_U8("graphics/pokemon/castform/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/anim_front.4bpp.lz"); const u32 gMonPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/normal.gbapal.lz"); @@ -4342,7 +5130,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/back.4bpp.lz"); const u32 gMonShinyPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/shiny.gbapal.lz"); const u8 gMonIcon_Kecleon[] = INCBIN_U8("graphics/pokemon/kecleon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kecleon[] = INCBIN_U8("graphics/pokemon/kecleon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_KECLEON #if P_FAMILY_SHUPPET @@ -4351,14 +5141,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/back.4bpp.lz"); const u32 gMonShinyPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/shiny.gbapal.lz"); const u8 gMonIcon_Shuppet[] = INCBIN_U8("graphics/pokemon/shuppet/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Shuppet[] = INCBIN_U8("graphics/pokemon/shuppet/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/anim_front.4bpp.lz"); const u32 gMonPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/normal.gbapal.lz"); const u32 gMonBackPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/back.4bpp.lz"); const u32 gMonShinyPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/shiny.gbapal.lz"); const u8 gMonIcon_Banette[] = INCBIN_U8("graphics/pokemon/banette/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Banette[] = INCBIN_U8("graphics/pokemon/banette/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/front.4bpp.lz"); @@ -4375,14 +5169,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/back.4bpp.lz"); const u32 gMonShinyPalette_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/shiny.gbapal.lz"); const u8 gMonIcon_Duskull[] = INCBIN_U8("graphics/pokemon/duskull/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Duskull[] = INCBIN_U8("graphics/pokemon/duskull/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/anim_front.4bpp.lz"); const u32 gMonPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/normal.gbapal.lz"); const u32 gMonBackPic_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/back.4bpp.lz"); const u32 gMonShinyPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/shiny.gbapal.lz"); const u8 gMonIcon_Dusclops[] = INCBIN_U8("graphics/pokemon/dusclops/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dusclops[] = INCBIN_U8("graphics/pokemon/dusclops/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/anim_front.4bpp.lz"); @@ -4390,7 +5188,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/back.4bpp.lz"); const u32 gMonShinyPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/shiny.gbapal.lz"); const u8 gMonIcon_Dusknoir[] = INCBIN_U8("graphics/pokemon/dusknoir/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dusknoir[] = INCBIN_U8("graphics/pokemon/dusknoir/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_DUSKULL @@ -4400,7 +5200,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/back.4bpp.lz"); const u32 gMonShinyPalette_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/shiny.gbapal.lz"); const u8 gMonIcon_Tropius[] = INCBIN_U8("graphics/pokemon/tropius/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tropius[] = INCBIN_U8("graphics/pokemon/tropius/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TROPIUS #if P_FAMILY_CHIMECHO @@ -4410,7 +5212,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Chingling[] = INCBIN_U32("graphics/pokemon/chingling/back.4bpp.lz"); const u32 gMonShinyPalette_Chingling[] = INCBIN_U32("graphics/pokemon/chingling/shiny.gbapal.lz"); const u8 gMonIcon_Chingling[] = INCBIN_U8("graphics/pokemon/chingling/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Chingling[] = INCBIN_U8("graphics/pokemon/chingling/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/anim_front.4bpp.lz"); @@ -4418,7 +5222,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/back.4bpp.lz"); const u32 gMonShinyPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/shiny.gbapal.lz"); const u8 gMonIcon_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CHIMECHO #if P_FAMILY_ABSOL @@ -4427,7 +5233,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Absol[] = INCBIN_U32("graphics/pokemon/absol/back.4bpp.lz"); const u32 gMonShinyPalette_Absol[] = INCBIN_U32("graphics/pokemon/absol/shiny.gbapal.lz"); const u8 gMonIcon_Absol[] = INCBIN_U8("graphics/pokemon/absol/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Absol[] = INCBIN_U8("graphics/pokemon/absol/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/front.4bpp.lz"); @@ -4444,14 +5252,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/back.4bpp.lz"); const u32 gMonShinyPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/shiny.gbapal.lz"); const u8 gMonIcon_Snorunt[] = INCBIN_U8("graphics/pokemon/snorunt/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Snorunt[] = INCBIN_U8("graphics/pokemon/snorunt/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/anim_front.4bpp.lz"); const u32 gMonPalette_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/normal.gbapal.lz"); const u32 gMonBackPic_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/back.4bpp.lz"); const u32 gMonShinyPalette_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/shiny.gbapal.lz"); const u8 gMonIcon_Glalie[] = INCBIN_U8("graphics/pokemon/glalie/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Glalie[] = INCBIN_U8("graphics/pokemon/glalie/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/front.4bpp.lz"); @@ -4467,7 +5279,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/back.4bpp.lz"); const u32 gMonShinyPalette_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/shiny.gbapal.lz"); const u8 gMonIcon_Froslass[] = INCBIN_U8("graphics/pokemon/froslass/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Froslass[] = INCBIN_U8("graphics/pokemon/froslass/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_SNORUNT @@ -4477,21 +5291,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/back.4bpp.lz"); const u32 gMonShinyPalette_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/shiny.gbapal.lz"); const u8 gMonIcon_Spheal[] = INCBIN_U8("graphics/pokemon/spheal/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Spheal[] = INCBIN_U8("graphics/pokemon/spheal/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/anim_front.4bpp.lz"); const u32 gMonPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/normal.gbapal.lz"); const u32 gMonBackPic_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/back.4bpp.lz"); const u32 gMonShinyPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/shiny.gbapal.lz"); const u8 gMonIcon_Sealeo[] = INCBIN_U8("graphics/pokemon/sealeo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sealeo[] = INCBIN_U8("graphics/pokemon/sealeo/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/anim_front.4bpp.lz"); const u32 gMonPalette_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/normal.gbapal.lz"); const u32 gMonBackPic_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/back.4bpp.lz"); const u32 gMonShinyPalette_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/shiny.gbapal.lz"); const u8 gMonIcon_Walrein[] = INCBIN_U8("graphics/pokemon/walrein/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Walrein[] = INCBIN_U8("graphics/pokemon/walrein/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SPHEAL #if P_FAMILY_CLAMPERL @@ -4500,21 +5320,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/back.4bpp.lz"); const u32 gMonShinyPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/shiny.gbapal.lz"); const u8 gMonIcon_Clamperl[] = INCBIN_U8("graphics/pokemon/clamperl/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Clamperl[] = INCBIN_U8("graphics/pokemon/clamperl/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/anim_front.4bpp.lz"); const u32 gMonPalette_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/normal.gbapal.lz"); const u32 gMonBackPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/back.4bpp.lz"); const u32 gMonShinyPalette_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/shiny.gbapal.lz"); const u8 gMonIcon_Huntail[] = INCBIN_U8("graphics/pokemon/huntail/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Huntail[] = INCBIN_U8("graphics/pokemon/huntail/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/anim_front.4bpp.lz"); const u32 gMonPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/normal.gbapal.lz"); const u32 gMonBackPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/back.4bpp.lz"); const u32 gMonShinyPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/shiny.gbapal.lz"); const u8 gMonIcon_Gorebyss[] = INCBIN_U8("graphics/pokemon/gorebyss/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gorebyss[] = INCBIN_U8("graphics/pokemon/gorebyss/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CLAMPERL #if P_FAMILY_RELICANTH @@ -4523,7 +5349,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/back.4bpp.lz"); const u32 gMonShinyPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/shiny.gbapal.lz"); const u8 gMonIcon_Relicanth[] = INCBIN_U8("graphics/pokemon/relicanth/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Relicanth[] = INCBIN_U8("graphics/pokemon/relicanth/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_RelicanthF[] = INCBIN_U32("graphics/pokemon/relicanth/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RelicanthF[] = INCBIN_U32("graphics/pokemon/relicanth/backf.4bpp.lz"); @@ -4535,7 +5363,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/back.4bpp.lz"); const u32 gMonShinyPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/shiny.gbapal.lz"); const u8 gMonIcon_Luvdisc[] = INCBIN_U8("graphics/pokemon/luvdisc/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Luvdisc[] = INCBIN_U8("graphics/pokemon/luvdisc/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_LUVDISC #if P_FAMILY_BAGON @@ -4544,21 +5374,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/back.4bpp.lz"); const u32 gMonShinyPalette_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/shiny.gbapal.lz"); const u8 gMonIcon_Bagon[] = INCBIN_U8("graphics/pokemon/bagon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bagon[] = INCBIN_U8("graphics/pokemon/bagon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/anim_front.4bpp.lz"); const u32 gMonPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/normal.gbapal.lz"); const u32 gMonBackPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/back.4bpp.lz"); const u32 gMonShinyPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/shiny.gbapal.lz"); const u8 gMonIcon_Shelgon[] = INCBIN_U8("graphics/pokemon/shelgon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Shelgon[] = INCBIN_U8("graphics/pokemon/shelgon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/anim_front.4bpp.lz"); const u32 gMonPalette_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/normal.gbapal.lz"); const u32 gMonBackPic_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/back.4bpp.lz"); const u32 gMonShinyPalette_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/shiny.gbapal.lz"); const u8 gMonIcon_Salamence[] = INCBIN_U8("graphics/pokemon/salamence/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Salamence[] = INCBIN_U8("graphics/pokemon/salamence/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/front.4bpp.lz"); @@ -4575,21 +5411,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/back.4bpp.lz"); const u32 gMonShinyPalette_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/shiny.gbapal.lz"); const u8 gMonIcon_Beldum[] = INCBIN_U8("graphics/pokemon/beldum/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Beldum[] = INCBIN_U8("graphics/pokemon/beldum/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/metang/anim_front.4bpp.lz"); const u32 gMonPalette_Metang[] = INCBIN_U32("graphics/pokemon/metang/normal.gbapal.lz"); const u32 gMonBackPic_Metang[] = INCBIN_U32("graphics/pokemon/metang/back.4bpp.lz"); const u32 gMonShinyPalette_Metang[] = INCBIN_U32("graphics/pokemon/metang/shiny.gbapal.lz"); const u8 gMonIcon_Metang[] = INCBIN_U8("graphics/pokemon/metang/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Metang[] = INCBIN_U8("graphics/pokemon/metang/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/anim_front.4bpp.lz"); const u32 gMonPalette_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/normal.gbapal.lz"); const u32 gMonBackPic_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/back.4bpp.lz"); const u32 gMonShinyPalette_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/shiny.gbapal.lz"); const u8 gMonIcon_Metagross[] = INCBIN_U8("graphics/pokemon/metagross/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Metagross[] = INCBIN_U8("graphics/pokemon/metagross/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/front.4bpp.lz"); @@ -4606,7 +5448,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/back.4bpp.lz"); const u32 gMonShinyPalette_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/shiny.gbapal.lz"); const u8 gMonIcon_Regirock[] = INCBIN_U8("graphics/pokemon/regirock/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Regirock[] = INCBIN_U8("graphics/pokemon/regirock/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_REGIROCK #if P_FAMILY_REGICE @@ -4615,7 +5459,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Regice[] = INCBIN_U32("graphics/pokemon/regice/back.4bpp.lz"); const u32 gMonShinyPalette_Regice[] = INCBIN_U32("graphics/pokemon/regice/shiny.gbapal.lz"); const u8 gMonIcon_Regice[] = INCBIN_U8("graphics/pokemon/regice/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Regice[] = INCBIN_U8("graphics/pokemon/regice/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_REGICE #if P_FAMILY_REGISTEEL @@ -4624,7 +5470,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/back.4bpp.lz"); const u32 gMonShinyPalette_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/shiny.gbapal.lz"); const u8 gMonIcon_Registeel[] = INCBIN_U8("graphics/pokemon/registeel/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Registeel[] = INCBIN_U8("graphics/pokemon/registeel/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_REGISTEEL #if P_FAMILY_LATIAS @@ -4633,7 +5481,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Latias[] = INCBIN_U32("graphics/pokemon/latias/back.4bpp.lz"); const u32 gMonShinyPalette_Latias[] = INCBIN_U32("graphics/pokemon/latias/shiny.gbapal.lz"); const u8 gMonIcon_Latias[] = INCBIN_U8("graphics/pokemon/latias/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Latias[] = INCBIN_U8("graphics/pokemon/latias/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/front.4bpp.lz"); @@ -4650,7 +5500,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Latios[] = INCBIN_U32("graphics/pokemon/latios/back.4bpp.lz"); const u32 gMonShinyPalette_Latios[] = INCBIN_U32("graphics/pokemon/latios/shiny.gbapal.lz"); const u8 gMonIcon_Latios[] = INCBIN_U8("graphics/pokemon/latios/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Latios[] = INCBIN_U8("graphics/pokemon/latios/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/front.4bpp.lz"); @@ -4667,7 +5519,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/back.4bpp.lz"); const u32 gMonShinyPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/shiny.gbapal.lz"); const u8 gMonIcon_Kyogre[] = INCBIN_U8("graphics/pokemon/kyogre/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kyogre[] = INCBIN_U8("graphics/pokemon/kyogre/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_PRIMAL_REVERSIONS const u32 gMonFrontPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/front.4bpp.lz"); @@ -4684,7 +5538,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/back.4bpp.lz"); const u32 gMonShinyPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/shiny.gbapal.lz"); const u8 gMonIcon_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_PRIMAL_REVERSIONS const u32 gMonFrontPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/front.4bpp.lz"); @@ -4701,7 +5557,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/back.4bpp.lz"); const u32 gMonShinyPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/shiny.gbapal.lz"); const u8 gMonIcon_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/front.4bpp.lz"); @@ -4718,7 +5576,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/back.4bpp.lz"); const u32 gMonShinyPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/shiny.gbapal.lz"); const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_JIRACHI #if P_FAMILY_DEOXYS @@ -4727,7 +5587,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/back.4bpp.lz"); const u32 gMonShinyPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/shiny.gbapal.lz"); const u8 gMonIcon_DeoxysNormal[] = INCBIN_U8("graphics/pokemon/deoxys/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/anim_front.4bpp.lz"); const u32 gMonPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/normal.gbapal.lz"); @@ -4754,21 +5616,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/back.4bpp.lz"); const u32 gMonShinyPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/shiny.gbapal.lz"); const u8 gMonIcon_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/anim_front.4bpp.lz"); const u32 gMonPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/normal.gbapal.lz"); const u32 gMonBackPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/back.4bpp.lz"); const u32 gMonShinyPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/shiny.gbapal.lz"); const u8 gMonIcon_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/anim_front.4bpp.lz"); const u32 gMonPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/normal.gbapal.lz"); const u32 gMonBackPic_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/back.4bpp.lz"); const u32 gMonShinyPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/shiny.gbapal.lz"); const u8 gMonIcon_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TURTWIG #if P_FAMILY_CHIMCHAR @@ -4777,21 +5645,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Chimchar[] = INCBIN_U32("graphics/pokemon/chimchar/back.4bpp.lz"); const u32 gMonShinyPalette_Chimchar[] = INCBIN_U32("graphics/pokemon/chimchar/shiny.gbapal.lz"); const u8 gMonIcon_Chimchar[] = INCBIN_U8("graphics/pokemon/chimchar/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Chimchar[] = INCBIN_U8("graphics/pokemon/chimchar/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/anim_front.4bpp.lz"); const u32 gMonPalette_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/normal.gbapal.lz"); const u32 gMonBackPic_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/back.4bpp.lz"); const u32 gMonShinyPalette_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/shiny.gbapal.lz"); const u8 gMonIcon_Monferno[] = INCBIN_U8("graphics/pokemon/monferno/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Monferno[] = INCBIN_U8("graphics/pokemon/monferno/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/anim_front.4bpp.lz"); const u32 gMonPalette_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/normal.gbapal.lz"); const u32 gMonBackPic_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/back.4bpp.lz"); const u32 gMonShinyPalette_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/shiny.gbapal.lz"); const u8 gMonIcon_Infernape[] = INCBIN_U8("graphics/pokemon/infernape/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Infernape[] = INCBIN_U8("graphics/pokemon/infernape/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CHIMCHAR #if P_FAMILY_PIPLUP @@ -4800,21 +5674,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/back.4bpp.lz"); const u32 gMonShinyPalette_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/shiny.gbapal.lz"); const u8 gMonIcon_Piplup[] = INCBIN_U8("graphics/pokemon/piplup/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Piplup[] = INCBIN_U8("graphics/pokemon/piplup/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/anim_front.4bpp.lz"); const u32 gMonPalette_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/normal.gbapal.lz"); const u32 gMonBackPic_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/back.4bpp.lz"); const u32 gMonShinyPalette_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/shiny.gbapal.lz"); const u8 gMonIcon_Prinplup[] = INCBIN_U8("graphics/pokemon/prinplup/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Prinplup[] = INCBIN_U8("graphics/pokemon/prinplup/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/anim_front.4bpp.lz"); const u32 gMonPalette_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/normal.gbapal.lz"); const u32 gMonBackPic_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/back.4bpp.lz"); const u32 gMonShinyPalette_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/shiny.gbapal.lz"); const u8 gMonIcon_Empoleon[] = INCBIN_U8("graphics/pokemon/empoleon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Empoleon[] = INCBIN_U8("graphics/pokemon/empoleon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PIPLUP #if P_FAMILY_STARLY @@ -4823,7 +5703,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Starly[] = INCBIN_U32("graphics/pokemon/starly/back.4bpp.lz"); const u32 gMonShinyPalette_Starly[] = INCBIN_U32("graphics/pokemon/starly/shiny.gbapal.lz"); const u8 gMonIcon_Starly[] = INCBIN_U8("graphics/pokemon/starly/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Starly[] = INCBIN_U8("graphics/pokemon/starly/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_StarlyF[] = INCBIN_U32("graphics/pokemon/starly/anim_frontf.4bpp.lz"); const u32 gMonBackPic_StarlyF[] = INCBIN_U32("graphics/pokemon/starly/backf.4bpp.lz"); @@ -4833,7 +5715,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/back.4bpp.lz"); const u32 gMonShinyPalette_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/shiny.gbapal.lz"); const u8 gMonIcon_Staravia[] = INCBIN_U8("graphics/pokemon/staravia/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Staravia[] = INCBIN_U8("graphics/pokemon/staravia/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_StaraviaF[] = INCBIN_U32("graphics/pokemon/staravia/anim_frontf.4bpp.lz"); const u32 gMonBackPic_StaraviaF[] = INCBIN_U32("graphics/pokemon/staravia/back.4bpp.lz"); @@ -4843,7 +5727,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/back.4bpp.lz"); const u32 gMonShinyPalette_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/shiny.gbapal.lz"); const u8 gMonIcon_Staraptor[] = INCBIN_U8("graphics/pokemon/staraptor/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Staraptor[] = INCBIN_U8("graphics/pokemon/staraptor/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_StaraptorF[] = INCBIN_U32("graphics/pokemon/staraptor/anim_frontf.4bpp.lz"); #endif //P_FAMILY_STARLY @@ -4854,7 +5740,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/back.4bpp.lz"); const u32 gMonShinyPalette_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/shiny.gbapal.lz"); const u8 gMonIcon_Bidoof[] = INCBIN_U8("graphics/pokemon/bidoof/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bidoof[] = INCBIN_U8("graphics/pokemon/bidoof/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_BidoofF[] = INCBIN_U32("graphics/pokemon/bidoof/anim_frontf.4bpp.lz"); const u32 gMonBackPic_BidoofF[] = INCBIN_U32("graphics/pokemon/bidoof/backf.4bpp.lz"); @@ -4864,7 +5752,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/back.4bpp.lz"); const u32 gMonShinyPalette_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/shiny.gbapal.lz"); const u8 gMonIcon_Bibarel[] = INCBIN_U8("graphics/pokemon/bibarel/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bibarel[] = INCBIN_U8("graphics/pokemon/bibarel/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_BibarelF[] = INCBIN_U32("graphics/pokemon/bibarel/anim_frontf.4bpp.lz"); #endif //P_FAMILY_BIDOOF @@ -4875,7 +5765,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/back.4bpp.lz"); const u32 gMonShinyPalette_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/shiny.gbapal.lz"); const u8 gMonIcon_Kricketot[] = INCBIN_U8("graphics/pokemon/kricketot/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kricketot[] = INCBIN_U8("graphics/pokemon/kricketot/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_KricketotF[] = INCBIN_U32("graphics/pokemon/kricketot/anim_frontf.4bpp.lz"); const u32 gMonBackPic_KricketotF[] = INCBIN_U32("graphics/pokemon/kricketot/backf.4bpp.lz"); @@ -4885,7 +5777,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/back.4bpp.lz"); const u32 gMonShinyPalette_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/shiny.gbapal.lz"); const u8 gMonIcon_Kricketune[] = INCBIN_U8("graphics/pokemon/kricketune/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kricketune[] = INCBIN_U8("graphics/pokemon/kricketune/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_KricketuneF[] = INCBIN_U32("graphics/pokemon/kricketune/anim_frontf.4bpp.lz"); const u32 gMonBackPic_KricketuneF[] = INCBIN_U32("graphics/pokemon/kricketune/backf.4bpp.lz"); @@ -4897,7 +5791,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/back.4bpp.lz"); const u32 gMonShinyPalette_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/shiny.gbapal.lz"); const u8 gMonIcon_Shinx[] = INCBIN_U8("graphics/pokemon/shinx/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Shinx[] = INCBIN_U8("graphics/pokemon/shinx/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ShinxF[] = INCBIN_U32("graphics/pokemon/shinx/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ShinxF[] = INCBIN_U32("graphics/pokemon/shinx/backf.4bpp.lz"); @@ -4907,7 +5803,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/back.4bpp.lz"); const u32 gMonShinyPalette_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/shiny.gbapal.lz"); const u8 gMonIcon_Luxio[] = INCBIN_U8("graphics/pokemon/luxio/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Luxio[] = INCBIN_U8("graphics/pokemon/luxio/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_LuxioF[] = INCBIN_U32("graphics/pokemon/luxio/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LuxioF[] = INCBIN_U32("graphics/pokemon/luxio/backf.4bpp.lz"); @@ -4917,7 +5815,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/back.4bpp.lz"); const u32 gMonShinyPalette_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/shiny.gbapal.lz"); const u8 gMonIcon_Luxray[] = INCBIN_U8("graphics/pokemon/luxray/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Luxray[] = INCBIN_U8("graphics/pokemon/luxray/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_LuxrayF[] = INCBIN_U32("graphics/pokemon/luxray/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LuxrayF[] = INCBIN_U32("graphics/pokemon/luxray/backf.4bpp.lz"); @@ -4929,14 +5829,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/back.4bpp.lz"); const u32 gMonShinyPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/shiny.gbapal.lz"); const u8 gMonIcon_Cranidos[] = INCBIN_U8("graphics/pokemon/cranidos/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cranidos[] = INCBIN_U8("graphics/pokemon/cranidos/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/anim_front.4bpp.lz"); const u32 gMonPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/normal.gbapal.lz"); const u32 gMonBackPic_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/back.4bpp.lz"); const u32 gMonShinyPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/shiny.gbapal.lz"); const u8 gMonIcon_Rampardos[] = INCBIN_U8("graphics/pokemon/rampardos/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Rampardos[] = INCBIN_U8("graphics/pokemon/rampardos/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CRANIDOS #if P_FAMILY_SHIELDON @@ -4945,14 +5849,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/back.4bpp.lz"); const u32 gMonShinyPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/shiny.gbapal.lz"); const u8 gMonIcon_Shieldon[] = INCBIN_U8("graphics/pokemon/shieldon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Shieldon[] = INCBIN_U8("graphics/pokemon/shieldon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/anim_front.4bpp.lz"); const u32 gMonPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/normal.gbapal.lz"); const u32 gMonBackPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/back.4bpp.lz"); const u32 gMonShinyPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/shiny.gbapal.lz"); const u8 gMonIcon_Bastiodon[] = INCBIN_U8("graphics/pokemon/bastiodon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bastiodon[] = INCBIN_U8("graphics/pokemon/bastiodon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SHIELDON #if P_FAMILY_BURMY @@ -4961,7 +5869,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/back.4bpp.lz"); const u32 gMonShinyPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/shiny.gbapal.lz"); const u8 gMonIcon_BurmyPlantCloak[] = INCBIN_U8("graphics/pokemon/burmy/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Burmy[] = INCBIN_U8("graphics/pokemon/burmy/plant/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/anim_front.4bpp.lz"); const u32 gMonPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/normal.gbapal.lz"); @@ -4980,7 +5890,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/back.4bpp.lz"); const u32 gMonShinyPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/shiny.gbapal.lz"); const u8 gMonIcon_WormadamPlantCloak[] = INCBIN_U8("graphics/pokemon/wormadam/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Wormadam[] = INCBIN_U8("graphics/pokemon/wormadam/plant/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/anim_front.4bpp.lz"); const u32 gMonPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/normal.gbapal.lz"); @@ -4999,7 +5911,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/back.4bpp.lz"); const u32 gMonShinyPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/shiny.gbapal.lz"); const u8 gMonIcon_Mothim[] = INCBIN_U8("graphics/pokemon/mothim/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mothim[] = INCBIN_U8("graphics/pokemon/mothim/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BURMY #if P_FAMILY_COMBEE @@ -5008,7 +5922,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/back.4bpp.lz"); const u32 gMonShinyPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/shiny.gbapal.lz"); const u8 gMonIcon_Combee[] = INCBIN_U8("graphics/pokemon/combee/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Combee[] = INCBIN_U8("graphics/pokemon/combee/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/normalf.gbapal.lz"); const u32 gMonShinyPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/shinyf.gbapal.lz"); @@ -5018,7 +5934,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/back.4bpp.lz"); const u32 gMonShinyPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/shiny.gbapal.lz"); const u8 gMonIcon_Vespiquen[] = INCBIN_U8("graphics/pokemon/vespiquen/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Vespiquen[] = INCBIN_U8("graphics/pokemon/vespiquen/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_COMBEE #if P_FAMILY_PACHIRISU @@ -5027,7 +5945,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/back.4bpp.lz"); const u32 gMonShinyPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/shiny.gbapal.lz"); const u8 gMonIcon_Pachirisu[] = INCBIN_U8("graphics/pokemon/pachirisu/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pachirisu[] = INCBIN_U8("graphics/pokemon/pachirisu/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_PachirisuF[] = INCBIN_U32("graphics/pokemon/pachirisu/anim_frontf.4bpp.lz"); #endif //P_FAMILY_PACHIRISU @@ -5038,7 +5958,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/back.4bpp.lz"); const u32 gMonShinyPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/shiny.gbapal.lz"); const u8 gMonIcon_Buizel[] = INCBIN_U8("graphics/pokemon/buizel/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Buizel[] = INCBIN_U8("graphics/pokemon/buizel/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonBackPic_BuizelF[] = INCBIN_U32("graphics/pokemon/buizel/backf.4bpp.lz"); @@ -5047,7 +5969,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/back.4bpp.lz"); const u32 gMonShinyPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/shiny.gbapal.lz"); const u8 gMonIcon_Floatzel[] = INCBIN_U8("graphics/pokemon/floatzel/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Floatzel[] = INCBIN_U8("graphics/pokemon/floatzel/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonBackPic_FloatzelF[] = INCBIN_U32("graphics/pokemon/floatzel/backf.4bpp.lz"); #endif //P_FAMILY_BUIZEL @@ -5058,14 +5982,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/back.4bpp.lz"); const u32 gMonShinyPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/shiny.gbapal.lz"); const u8 gMonIcon_Cherubi[] = INCBIN_U8("graphics/pokemon/cherubi/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cherubi[] = INCBIN_U8("graphics/pokemon/cherubi/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/anim_front.4bpp.lz"); const u32 gMonPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/normal.gbapal.lz"); const u32 gMonBackPic_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/back.4bpp.lz"); const u32 gMonShinyPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/shiny.gbapal.lz"); const u8 gMonIcon_CherrimOvercast[] = INCBIN_U8("graphics/pokemon/cherrim/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cherrim[] = INCBIN_U8("graphics/pokemon/cherrim/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/anim_front.4bpp.lz"); const u32 gMonPalette_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/normal.gbapal.lz"); @@ -5080,7 +6008,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/back.4bpp.lz"); const u32 gMonShinyPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/shiny.gbapal.lz"); const u8 gMonIcon_ShellosWestSea[] = INCBIN_U8("graphics/pokemon/shellos/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Shellos[] = INCBIN_U8("graphics/pokemon/shellos/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/anim_front.4bpp.lz"); const u32 gMonPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/normal.gbapal.lz"); @@ -5093,7 +6023,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/back.4bpp.lz"); const u32 gMonShinyPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/shiny.gbapal.lz"); const u8 gMonIcon_GastrodonWestSea[] = INCBIN_U8("graphics/pokemon/gastrodon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gastrodon[] = INCBIN_U8("graphics/pokemon/gastrodon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/anim_front.4bpp.lz"); const u32 gMonPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/normal.gbapal.lz"); @@ -5108,14 +6040,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/back.4bpp.lz"); const u32 gMonShinyPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/shiny.gbapal.lz"); const u8 gMonIcon_Drifloon[] = INCBIN_U8("graphics/pokemon/drifloon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Drifloon[] = INCBIN_U8("graphics/pokemon/drifloon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/anim_front.4bpp.lz"); const u32 gMonPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/normal.gbapal.lz"); const u32 gMonBackPic_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/back.4bpp.lz"); const u32 gMonShinyPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/shiny.gbapal.lz"); const u8 gMonIcon_Drifblim[] = INCBIN_U8("graphics/pokemon/drifblim/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Drifblim[] = INCBIN_U8("graphics/pokemon/drifblim/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DRIFLOON #if P_FAMILY_BUNEARY @@ -5124,14 +6060,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/back.4bpp.lz"); const u32 gMonShinyPalette_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/shiny.gbapal.lz"); const u8 gMonIcon_Buneary[] = INCBIN_U8("graphics/pokemon/buneary/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Buneary[] = INCBIN_U8("graphics/pokemon/buneary/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/anim_front.4bpp.lz"); const u32 gMonPalette_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/normal.gbapal.lz"); const u32 gMonBackPic_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/back.4bpp.lz"); const u32 gMonShinyPalette_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/shiny.gbapal.lz"); const u8 gMonIcon_Lopunny[] = INCBIN_U8("graphics/pokemon/lopunny/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lopunny[] = INCBIN_U8("graphics/pokemon/lopunny/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/front.4bpp.lz"); @@ -5148,14 +6088,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Glameow[] = INCBIN_U32("graphics/pokemon/glameow/back.4bpp.lz"); const u32 gMonShinyPalette_Glameow[] = INCBIN_U32("graphics/pokemon/glameow/shiny.gbapal.lz"); const u8 gMonIcon_Glameow[] = INCBIN_U8("graphics/pokemon/glameow/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Glameow[] = INCBIN_U8("graphics/pokemon/glameow/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/anim_front.4bpp.lz"); const u32 gMonPalette_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/normal.gbapal.lz"); const u32 gMonBackPic_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/back.4bpp.lz"); const u32 gMonShinyPalette_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/shiny.gbapal.lz"); const u8 gMonIcon_Purugly[] = INCBIN_U8("graphics/pokemon/purugly/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Purugly[] = INCBIN_U8("graphics/pokemon/purugly/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_GLAMEOW #if P_FAMILY_STUNKY @@ -5164,14 +6108,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Stunky[] = INCBIN_U32("graphics/pokemon/stunky/back.4bpp.lz"); const u32 gMonShinyPalette_Stunky[] = INCBIN_U32("graphics/pokemon/stunky/shiny.gbapal.lz"); const u8 gMonIcon_Stunky[] = INCBIN_U8("graphics/pokemon/stunky/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Stunky[] = INCBIN_U8("graphics/pokemon/stunky/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/anim_front.4bpp.lz"); const u32 gMonPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/normal.gbapal.lz"); const u32 gMonBackPic_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/back.4bpp.lz"); const u32 gMonShinyPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/shiny.gbapal.lz"); const u8 gMonIcon_Skuntank[] = INCBIN_U8("graphics/pokemon/skuntank/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Skuntank[] = INCBIN_U8("graphics/pokemon/skuntank/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_STUNKY #if P_FAMILY_BRONZOR @@ -5180,14 +6128,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/back.4bpp.lz"); const u32 gMonShinyPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/shiny.gbapal.lz"); const u8 gMonIcon_Bronzor[] = INCBIN_U8("graphics/pokemon/bronzor/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bronzor[] = INCBIN_U8("graphics/pokemon/bronzor/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/anim_front.4bpp.lz"); const u32 gMonPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/normal.gbapal.lz"); const u32 gMonBackPic_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/back.4bpp.lz"); const u32 gMonShinyPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/shiny.gbapal.lz"); const u8 gMonIcon_Bronzong[] = INCBIN_U8("graphics/pokemon/bronzong/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bronzong[] = INCBIN_U8("graphics/pokemon/bronzong/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BRONZOR #if P_FAMILY_CHATOT @@ -5196,7 +6148,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/back.4bpp.lz"); const u32 gMonShinyPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/shiny.gbapal.lz"); const u8 gMonIcon_Chatot[] = INCBIN_U8("graphics/pokemon/chatot/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Chatot[] = INCBIN_U8("graphics/pokemon/chatot/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CHATOT #if P_FAMILY_SPIRITOMB @@ -5205,7 +6159,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/back.4bpp.lz"); const u32 gMonShinyPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/shiny.gbapal.lz"); const u8 gMonIcon_Spiritomb[] = INCBIN_U8("graphics/pokemon/spiritomb/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Spiritomb[] = INCBIN_U8("graphics/pokemon/spiritomb/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SPIRITOMB #if P_FAMILY_GIBLE @@ -5214,7 +6170,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Gible[] = INCBIN_U32("graphics/pokemon/gible/back.4bpp.lz"); const u32 gMonShinyPalette_Gible[] = INCBIN_U32("graphics/pokemon/gible/shiny.gbapal.lz"); const u8 gMonIcon_Gible[] = INCBIN_U8("graphics/pokemon/gible/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gible[] = INCBIN_U8("graphics/pokemon/gible/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GibleF[] = INCBIN_U32("graphics/pokemon/gible/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GibleF[] = INCBIN_U32("graphics/pokemon/gible/backf.4bpp.lz"); @@ -5224,7 +6182,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/back.4bpp.lz"); const u32 gMonShinyPalette_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/shiny.gbapal.lz"); const u8 gMonIcon_Gabite[] = INCBIN_U8("graphics/pokemon/gabite/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gabite[] = INCBIN_U8("graphics/pokemon/gabite/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GabiteF[] = INCBIN_U32("graphics/pokemon/gabite/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GabiteF[] = INCBIN_U32("graphics/pokemon/gabite/backf.4bpp.lz"); @@ -5234,7 +6194,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/back.4bpp.lz"); const u32 gMonShinyPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/shiny.gbapal.lz"); const u8 gMonIcon_Garchomp[] = INCBIN_U8("graphics/pokemon/garchomp/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Garchomp[] = INCBIN_U8("graphics/pokemon/garchomp/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GarchompF[] = INCBIN_U32("graphics/pokemon/garchomp/anim_frontf.4bpp.lz"); @@ -5253,14 +6215,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/back.4bpp.lz"); const u32 gMonShinyPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/shiny.gbapal.lz"); const u8 gMonIcon_Riolu[] = INCBIN_U8("graphics/pokemon/riolu/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Riolu[] = INCBIN_U8("graphics/pokemon/riolu/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/anim_front.4bpp.lz"); const u32 gMonPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/normal.gbapal.lz"); const u32 gMonBackPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/back.4bpp.lz"); const u32 gMonShinyPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/shiny.gbapal.lz"); const u8 gMonIcon_Lucario[] = INCBIN_U8("graphics/pokemon/lucario/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lucario[] = INCBIN_U8("graphics/pokemon/lucario/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/front.4bpp.lz"); @@ -5277,7 +6243,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/back.4bpp.lz"); const u32 gMonShinyPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/shiny.gbapal.lz"); const u8 gMonIcon_Hippopotas[] = INCBIN_U8("graphics/pokemon/hippopotas/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hippopotas[] = INCBIN_U8("graphics/pokemon/hippopotas/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/normalf.gbapal.lz"); const u32 gMonShinyPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/shinyf.gbapal.lz"); @@ -5290,7 +6258,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/back.4bpp.lz"); const u32 gMonShinyPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/shiny.gbapal.lz"); const u8 gMonIcon_Hippowdon[] = INCBIN_U8("graphics/pokemon/hippowdon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hippowdon[] = INCBIN_U8("graphics/pokemon/hippowdon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/normalf.gbapal.lz"); const u32 gMonShinyPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/shinyf.gbapal.lz"); @@ -5305,14 +6275,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/back.4bpp.lz"); const u32 gMonShinyPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/shiny.gbapal.lz"); const u8 gMonIcon_Skorupi[] = INCBIN_U8("graphics/pokemon/skorupi/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Skorupi[] = INCBIN_U8("graphics/pokemon/skorupi/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/anim_front.4bpp.lz"); const u32 gMonPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/normal.gbapal.lz"); const u32 gMonBackPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/back.4bpp.lz"); const u32 gMonShinyPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/shiny.gbapal.lz"); const u8 gMonIcon_Drapion[] = INCBIN_U8("graphics/pokemon/drapion/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Drapion[] = INCBIN_U8("graphics/pokemon/drapion/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SKORUPI #if P_FAMILY_CROAGUNK @@ -5321,7 +6295,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/back.4bpp.lz"); const u32 gMonShinyPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/shiny.gbapal.lz"); const u8 gMonIcon_Croagunk[] = INCBIN_U8("graphics/pokemon/croagunk/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Croagunk[] = INCBIN_U8("graphics/pokemon/croagunk/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_CroagunkF[] = INCBIN_U32("graphics/pokemon/croagunk/anim_frontf.4bpp.lz"); const u32 gMonBackPic_CroagunkF[] = INCBIN_U32("graphics/pokemon/croagunk/backf.4bpp.lz"); @@ -5331,7 +6307,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/back.4bpp.lz"); const u32 gMonShinyPalette_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/shiny.gbapal.lz"); const u8 gMonIcon_Toxicroak[] = INCBIN_U8("graphics/pokemon/toxicroak/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Toxicroak[] = INCBIN_U8("graphics/pokemon/toxicroak/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ToxicroakF[] = INCBIN_U32("graphics/pokemon/toxicroak/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ToxicroakF[] = INCBIN_U32("graphics/pokemon/toxicroak/backf.4bpp.lz"); @@ -5343,7 +6321,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/back.4bpp.lz"); const u32 gMonShinyPalette_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/shiny.gbapal.lz"); const u8 gMonIcon_Carnivine[] = INCBIN_U8("graphics/pokemon/carnivine/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Carnivine[] = INCBIN_U8("graphics/pokemon/carnivine/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CARNIVINE #if P_FAMILY_FINNEON @@ -5352,7 +6332,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/back.4bpp.lz"); const u32 gMonShinyPalette_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/shiny.gbapal.lz"); const u8 gMonIcon_Finneon[] = INCBIN_U8("graphics/pokemon/finneon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Finneon[] = INCBIN_U8("graphics/pokemon/finneon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_FinneonF[] = INCBIN_U32("graphics/pokemon/finneon/anim_frontf.4bpp.lz"); const u32 gMonBackPic_FinneonF[] = INCBIN_U32("graphics/pokemon/finneon/backf.4bpp.lz"); @@ -5362,7 +6344,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/back.4bpp.lz"); const u32 gMonShinyPalette_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/shiny.gbapal.lz"); const u8 gMonIcon_Lumineon[] = INCBIN_U8("graphics/pokemon/lumineon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lumineon[] = INCBIN_U8("graphics/pokemon/lumineon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_LumineonF[] = INCBIN_U32("graphics/pokemon/lumineon/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LumineonF[] = INCBIN_U32("graphics/pokemon/lumineon/backf.4bpp.lz"); @@ -5374,7 +6358,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Snover[] = INCBIN_U32("graphics/pokemon/snover/back.4bpp.lz"); const u32 gMonShinyPalette_Snover[] = INCBIN_U32("graphics/pokemon/snover/shiny.gbapal.lz"); const u8 gMonIcon_Snover[] = INCBIN_U8("graphics/pokemon/snover/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Snover[] = INCBIN_U8("graphics/pokemon/snover/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_SnoverF[] = INCBIN_U32("graphics/pokemon/snover/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SnoverF[] = INCBIN_U32("graphics/pokemon/snover/backf.4bpp.lz"); @@ -5384,7 +6370,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/back.4bpp.lz"); const u32 gMonShinyPalette_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/shiny.gbapal.lz"); const u8 gMonIcon_Abomasnow[] = INCBIN_U8("graphics/pokemon/abomasnow/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Abomasnow[] = INCBIN_U8("graphics/pokemon/abomasnow/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_AbomasnowF[] = INCBIN_U32("graphics/pokemon/abomasnow/anim_frontf.4bpp.lz"); @@ -5403,7 +6391,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/back.4bpp.lz"); const u32 gMonShinyPalette_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/shiny.gbapal.lz"); const u8 gMonIcon_Rotom[] = INCBIN_U8("graphics/pokemon/rotom/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Rotom[] = INCBIN_U8("graphics/pokemon/rotom/normal/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/anim_front.4bpp.lz"); const u32 gMonPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/normal.gbapal.lz"); @@ -5442,7 +6432,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/back.4bpp.lz"); const u32 gMonShinyPalette_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/shiny.gbapal.lz"); const u8 gMonIcon_Uxie[] = INCBIN_U8("graphics/pokemon/uxie/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Uxie[] = INCBIN_U8("graphics/pokemon/uxie/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_UXIE #if P_FAMILY_MESPRIT @@ -5451,7 +6443,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/back.4bpp.lz"); const u32 gMonShinyPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/shiny.gbapal.lz"); const u8 gMonIcon_Mesprit[] = INCBIN_U8("graphics/pokemon/mesprit/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mesprit[] = INCBIN_U8("graphics/pokemon/mesprit/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MESPRIT #if P_FAMILY_AZELF @@ -5460,7 +6454,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/back.4bpp.lz"); const u32 gMonShinyPalette_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/shiny.gbapal.lz"); const u8 gMonIcon_Azelf[] = INCBIN_U8("graphics/pokemon/azelf/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Azelf[] = INCBIN_U8("graphics/pokemon/azelf/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_AZELF #if P_FAMILY_DIALGA @@ -5469,7 +6465,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/back.4bpp.lz"); const u32 gMonShinyPalette_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/shiny.gbapal.lz"); const u8 gMonIcon_Dialga[] = INCBIN_U8("graphics/pokemon/dialga/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dialga[] = INCBIN_U8("graphics/pokemon/dialga/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/front.4bpp.lz"); const u32 gMonPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/normal.gbapal.lz"); @@ -5484,7 +6482,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/back.4bpp.lz"); const u32 gMonShinyPalette_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/shiny.gbapal.lz"); const u8 gMonIcon_Palkia[] = INCBIN_U8("graphics/pokemon/palkia/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Palkia[] = INCBIN_U8("graphics/pokemon/palkia/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/front.4bpp.lz"); const u32 gMonPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/normal.gbapal.lz"); @@ -5499,7 +6499,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/back.4bpp.lz"); const u32 gMonShinyPalette_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/shiny.gbapal.lz"); const u8 gMonIcon_Heatran[] = INCBIN_U8("graphics/pokemon/heatran/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Heatran[] = INCBIN_U8("graphics/pokemon/heatran/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_HEATRAN #if P_FAMILY_REGIGIGAS @@ -5508,7 +6510,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/back.4bpp.lz"); const u32 gMonShinyPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/shiny.gbapal.lz"); const u8 gMonIcon_Regigigas[] = INCBIN_U8("graphics/pokemon/regigigas/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Regigigas[] = INCBIN_U8("graphics/pokemon/regigigas/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_REGIGIGAS #if P_FAMILY_GIRATINA @@ -5517,7 +6521,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/back.4bpp.lz"); const u32 gMonShinyPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/shiny.gbapal.lz"); const u8 gMonIcon_GiratinaAltered[] = INCBIN_U8("graphics/pokemon/giratina/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Giratina[] = INCBIN_U8("graphics/pokemon/giratina/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/anim_front.4bpp.lz"); const u32 gMonPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/normal.gbapal.lz"); @@ -5532,7 +6538,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/back.4bpp.lz"); const u32 gMonShinyPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/shiny.gbapal.lz"); const u8 gMonIcon_Cresselia[] = INCBIN_U8("graphics/pokemon/cresselia/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cresselia[] = INCBIN_U8("graphics/pokemon/cresselia/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CRESSELIA #if P_FAMILY_MANAPHY @@ -5541,14 +6549,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Phione[] = INCBIN_U32("graphics/pokemon/phione/back.4bpp.lz"); const u32 gMonShinyPalette_Phione[] = INCBIN_U32("graphics/pokemon/phione/shiny.gbapal.lz"); const u8 gMonIcon_Phione[] = INCBIN_U8("graphics/pokemon/phione/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Phione[] = INCBIN_U8("graphics/pokemon/phione/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/anim_front.4bpp.lz"); const u32 gMonPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/normal.gbapal.lz"); const u32 gMonBackPic_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/back.4bpp.lz"); const u32 gMonShinyPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/shiny.gbapal.lz"); const u8 gMonIcon_Manaphy[] = INCBIN_U8("graphics/pokemon/manaphy/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Manaphy[] = INCBIN_U8("graphics/pokemon/manaphy/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MANAPHY #if P_FAMILY_DARKRAI @@ -5557,7 +6569,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/back.4bpp.lz"); const u32 gMonShinyPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/shiny.gbapal.lz"); const u8 gMonIcon_Darkrai[] = INCBIN_U8("graphics/pokemon/darkrai/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Darkrai[] = INCBIN_U8("graphics/pokemon/darkrai/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DARKRAI #if P_FAMILY_SHAYMIN @@ -5566,7 +6580,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/back.4bpp.lz"); const u32 gMonShinyPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/shiny.gbapal.lz"); const u8 gMonIcon_ShayminLand[] = INCBIN_U8("graphics/pokemon/shaymin/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Shaymin[] = INCBIN_U8("graphics/pokemon/shaymin/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/anim_front.4bpp.lz"); const u32 gMonPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/normal.gbapal.lz"); @@ -5579,7 +6595,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonFrontPic_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/anim_front.4bpp.lz"); const u32 gMonBackPic_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/back.4bpp.lz"); const u8 gMonIcon_Arceus[] = INCBIN_U8("graphics/pokemon/arceus/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Arceus[] = INCBIN_U8("graphics/pokemon/arceus/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonPalette_ArceusNormal[] = INCBIN_U32("graphics/pokemon/arceus/normal.gbapal.lz"); const u32 gMonShinyPalette_ArceusNormal[] = INCBIN_U32("graphics/pokemon/arceus/shiny.gbapal.lz"); @@ -5642,7 +6660,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Victini[] = INCBIN_U32("graphics/pokemon/victini/back.4bpp.lz"); const u32 gMonShinyPalette_Victini[] = INCBIN_U32("graphics/pokemon/victini/shiny.gbapal.lz"); const u8 gMonIcon_Victini[] = INCBIN_U8("graphics/pokemon/victini/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Victini[] = INCBIN_U8("graphics/pokemon/victini/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_VICTINI #if P_FAMILY_SNIVY @@ -5651,21 +6671,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/back.4bpp.lz"); const u32 gMonShinyPalette_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/shiny.gbapal.lz"); const u8 gMonIcon_Snivy[] = INCBIN_U8("graphics/pokemon/snivy/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Snivy[] = INCBIN_U8("graphics/pokemon/snivy/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Servine[] = INCBIN_U32("graphics/pokemon/servine/anim_front.4bpp.lz"); const u32 gMonPalette_Servine[] = INCBIN_U32("graphics/pokemon/servine/normal.gbapal.lz"); const u32 gMonBackPic_Servine[] = INCBIN_U32("graphics/pokemon/servine/back.4bpp.lz"); const u32 gMonShinyPalette_Servine[] = INCBIN_U32("graphics/pokemon/servine/shiny.gbapal.lz"); const u8 gMonIcon_Servine[] = INCBIN_U8("graphics/pokemon/servine/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Servine[] = INCBIN_U8("graphics/pokemon/servine/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/anim_front.4bpp.lz"); const u32 gMonPalette_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/normal.gbapal.lz"); const u32 gMonBackPic_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/back.4bpp.lz"); const u32 gMonShinyPalette_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/shiny.gbapal.lz"); const u8 gMonIcon_Serperior[] = INCBIN_U8("graphics/pokemon/serperior/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Serperior[] = INCBIN_U8("graphics/pokemon/serperior/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SNIVY #if P_FAMILY_TEPIG @@ -5674,21 +6700,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tepig[] = INCBIN_U32("graphics/pokemon/tepig/back.4bpp.lz"); const u32 gMonShinyPalette_Tepig[] = INCBIN_U32("graphics/pokemon/tepig/shiny.gbapal.lz"); const u8 gMonIcon_Tepig[] = INCBIN_U8("graphics/pokemon/tepig/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tepig[] = INCBIN_U8("graphics/pokemon/tepig/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/anim_front.4bpp.lz"); const u32 gMonPalette_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/normal.gbapal.lz"); const u32 gMonBackPic_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/back.4bpp.lz"); const u32 gMonShinyPalette_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/shiny.gbapal.lz"); const u8 gMonIcon_Pignite[] = INCBIN_U8("graphics/pokemon/pignite/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pignite[] = INCBIN_U8("graphics/pokemon/pignite/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/anim_front.4bpp.lz"); const u32 gMonPalette_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/normal.gbapal.lz"); const u32 gMonBackPic_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/back.4bpp.lz"); const u32 gMonShinyPalette_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/shiny.gbapal.lz"); const u8 gMonIcon_Emboar[] = INCBIN_U8("graphics/pokemon/emboar/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Emboar[] = INCBIN_U8("graphics/pokemon/emboar/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TEPIG #if P_FAMILY_OSHAWOTT @@ -5697,21 +6729,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Oshawott[] = INCBIN_U32("graphics/pokemon/oshawott/back.4bpp.lz"); const u32 gMonShinyPalette_Oshawott[] = INCBIN_U32("graphics/pokemon/oshawott/shiny.gbapal.lz"); const u8 gMonIcon_Oshawott[] = INCBIN_U8("graphics/pokemon/oshawott/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Oshawott[] = INCBIN_U8("graphics/pokemon/oshawott/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/anim_front.4bpp.lz"); const u32 gMonPalette_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/normal.gbapal.lz"); const u32 gMonBackPic_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/back.4bpp.lz"); const u32 gMonShinyPalette_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/shiny.gbapal.lz"); const u8 gMonIcon_Dewott[] = INCBIN_U8("graphics/pokemon/dewott/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dewott[] = INCBIN_U8("graphics/pokemon/dewott/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/anim_front.4bpp.lz"); const u32 gMonPalette_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/normal.gbapal.lz"); const u32 gMonBackPic_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/back.4bpp.lz"); const u32 gMonShinyPalette_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/shiny.gbapal.lz"); const u8 gMonIcon_Samurott[] = INCBIN_U8("graphics/pokemon/samurott/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Samurott[] = INCBIN_U8("graphics/pokemon/samurott/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/front.4bpp.lz"); @@ -5728,14 +6766,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Patrat[] = INCBIN_U32("graphics/pokemon/patrat/back.4bpp.lz"); const u32 gMonShinyPalette_Patrat[] = INCBIN_U32("graphics/pokemon/patrat/shiny.gbapal.lz"); const u8 gMonIcon_Patrat[] = INCBIN_U8("graphics/pokemon/patrat/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Patrat[] = INCBIN_U8("graphics/pokemon/patrat/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/anim_front.4bpp.lz"); const u32 gMonPalette_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/normal.gbapal.lz"); const u32 gMonBackPic_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/back.4bpp.lz"); const u32 gMonShinyPalette_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/shiny.gbapal.lz"); const u8 gMonIcon_Watchog[] = INCBIN_U8("graphics/pokemon/watchog/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Watchog[] = INCBIN_U8("graphics/pokemon/watchog/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PATRAT #if P_FAMILY_LILLIPUP @@ -5744,21 +6786,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Lillipup[] = INCBIN_U32("graphics/pokemon/lillipup/back.4bpp.lz"); const u32 gMonShinyPalette_Lillipup[] = INCBIN_U32("graphics/pokemon/lillipup/shiny.gbapal.lz"); const u8 gMonIcon_Lillipup[] = INCBIN_U8("graphics/pokemon/lillipup/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lillipup[] = INCBIN_U8("graphics/pokemon/lillipup/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/anim_front.4bpp.lz"); const u32 gMonPalette_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/normal.gbapal.lz"); const u32 gMonBackPic_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/back.4bpp.lz"); const u32 gMonShinyPalette_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/shiny.gbapal.lz"); const u8 gMonIcon_Herdier[] = INCBIN_U8("graphics/pokemon/herdier/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Herdier[] = INCBIN_U8("graphics/pokemon/herdier/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/anim_front.4bpp.lz"); const u32 gMonPalette_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/normal.gbapal.lz"); const u32 gMonBackPic_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/back.4bpp.lz"); const u32 gMonShinyPalette_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/shiny.gbapal.lz"); const u8 gMonIcon_Stoutland[] = INCBIN_U8("graphics/pokemon/stoutland/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Stoutland[] = INCBIN_U8("graphics/pokemon/stoutland/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_LILLIPUP #if P_FAMILY_PURRLOIN @@ -5767,14 +6815,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/back.4bpp.lz"); const u32 gMonShinyPalette_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/shiny.gbapal.lz"); const u8 gMonIcon_Purrloin[] = INCBIN_U8("graphics/pokemon/purrloin/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Purrloin[] = INCBIN_U8("graphics/pokemon/purrloin/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/anim_front.4bpp.lz"); const u32 gMonPalette_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/normal.gbapal.lz"); const u32 gMonBackPic_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/back.4bpp.lz"); const u32 gMonShinyPalette_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/shiny.gbapal.lz"); const u8 gMonIcon_Liepard[] = INCBIN_U8("graphics/pokemon/liepard/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Liepard[] = INCBIN_U8("graphics/pokemon/liepard/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PURRLOIN #if P_FAMILY_PANSAGE @@ -5783,14 +6835,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/back.4bpp.lz"); const u32 gMonShinyPalette_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/shiny.gbapal.lz"); const u8 gMonIcon_Pansage[] = INCBIN_U8("graphics/pokemon/pansage/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pansage[] = INCBIN_U8("graphics/pokemon/pansage/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/anim_front.4bpp.lz"); const u32 gMonPalette_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/normal.gbapal.lz"); const u32 gMonBackPic_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/back.4bpp.lz"); const u32 gMonShinyPalette_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/shiny.gbapal.lz"); const u8 gMonIcon_Simisage[] = INCBIN_U8("graphics/pokemon/simisage/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Simisage[] = INCBIN_U8("graphics/pokemon/simisage/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PANSAGE #if P_FAMILY_PANSEAR @@ -5799,14 +6855,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/back.4bpp.lz"); const u32 gMonShinyPalette_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/shiny.gbapal.lz"); const u8 gMonIcon_Pansear[] = INCBIN_U8("graphics/pokemon/pansear/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pansear[] = INCBIN_U8("graphics/pokemon/pansear/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/anim_front.4bpp.lz"); const u32 gMonPalette_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/normal.gbapal.lz"); const u32 gMonBackPic_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/back.4bpp.lz"); const u32 gMonShinyPalette_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/shiny.gbapal.lz"); const u8 gMonIcon_Simisear[] = INCBIN_U8("graphics/pokemon/simisear/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Simisear[] = INCBIN_U8("graphics/pokemon/simisear/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PANSEAR #if P_FAMILY_PANPOUR @@ -5815,14 +6875,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/back.4bpp.lz"); const u32 gMonShinyPalette_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/shiny.gbapal.lz"); const u8 gMonIcon_Panpour[] = INCBIN_U8("graphics/pokemon/panpour/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Panpour[] = INCBIN_U8("graphics/pokemon/panpour/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/anim_front.4bpp.lz"); const u32 gMonPalette_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/normal.gbapal.lz"); const u32 gMonBackPic_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/back.4bpp.lz"); const u32 gMonShinyPalette_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/shiny.gbapal.lz"); const u8 gMonIcon_Simipour[] = INCBIN_U8("graphics/pokemon/simipour/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Simipour[] = INCBIN_U8("graphics/pokemon/simipour/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PANPOUR #if P_FAMILY_MUNNA @@ -5831,14 +6895,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Munna[] = INCBIN_U32("graphics/pokemon/munna/back.4bpp.lz"); const u32 gMonShinyPalette_Munna[] = INCBIN_U32("graphics/pokemon/munna/shiny.gbapal.lz"); const u8 gMonIcon_Munna[] = INCBIN_U8("graphics/pokemon/munna/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Munna[] = INCBIN_U8("graphics/pokemon/munna/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/anim_front.4bpp.lz"); const u32 gMonPalette_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/normal.gbapal.lz"); const u32 gMonBackPic_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/back.4bpp.lz"); const u32 gMonShinyPalette_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/shiny.gbapal.lz"); const u8 gMonIcon_Musharna[] = INCBIN_U8("graphics/pokemon/musharna/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Musharna[] = INCBIN_U8("graphics/pokemon/musharna/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MUNNA #if P_FAMILY_PIDOVE @@ -5847,21 +6915,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/back.4bpp.lz"); const u32 gMonShinyPalette_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/shiny.gbapal.lz"); const u8 gMonIcon_Pidove[] = INCBIN_U8("graphics/pokemon/pidove/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pidove[] = INCBIN_U8("graphics/pokemon/pidove/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/anim_front.4bpp.lz"); const u32 gMonPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/normal.gbapal.lz"); const u32 gMonBackPic_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/back.4bpp.lz"); const u32 gMonShinyPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/shiny.gbapal.lz"); const u8 gMonIcon_Tranquill[] = INCBIN_U8("graphics/pokemon/tranquill/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tranquill[] = INCBIN_U8("graphics/pokemon/tranquill/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/anim_front.4bpp.lz"); const u32 gMonPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/normal.gbapal.lz"); const u32 gMonBackPic_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/back.4bpp.lz"); const u32 gMonShinyPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/shiny.gbapal.lz"); const u8 gMonIcon_Unfezant[] = INCBIN_U8("graphics/pokemon/unfezant/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Unfezant[] = INCBIN_U8("graphics/pokemon/unfezant/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/anim_frontf.4bpp.lz"); const u32 gMonPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/normalf.gbapal.lz"); @@ -5876,14 +6950,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/back.4bpp.lz"); const u32 gMonShinyPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/shiny.gbapal.lz"); const u8 gMonIcon_Blitzle[] = INCBIN_U8("graphics/pokemon/blitzle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Blitzle[] = INCBIN_U8("graphics/pokemon/blitzle/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/anim_front.4bpp.lz"); const u32 gMonPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/normal.gbapal.lz"); const u32 gMonBackPic_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/back.4bpp.lz"); const u32 gMonShinyPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/shiny.gbapal.lz"); const u8 gMonIcon_Zebstrika[] = INCBIN_U8("graphics/pokemon/zebstrika/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Zebstrika[] = INCBIN_U8("graphics/pokemon/zebstrika/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BLITZLE #if P_FAMILY_ROGGENROLA @@ -5892,21 +6970,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/back.4bpp.lz"); const u32 gMonShinyPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/shiny.gbapal.lz"); const u8 gMonIcon_Roggenrola[] = INCBIN_U8("graphics/pokemon/roggenrola/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Roggenrola[] = INCBIN_U8("graphics/pokemon/roggenrola/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/anim_front.4bpp.lz"); const u32 gMonPalette_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/normal.gbapal.lz"); const u32 gMonBackPic_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/back.4bpp.lz"); const u32 gMonShinyPalette_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/shiny.gbapal.lz"); const u8 gMonIcon_Boldore[] = INCBIN_U8("graphics/pokemon/boldore/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Boldore[] = INCBIN_U8("graphics/pokemon/boldore/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/anim_front.4bpp.lz"); const u32 gMonPalette_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/normal.gbapal.lz"); const u32 gMonBackPic_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/back.4bpp.lz"); const u32 gMonShinyPalette_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/shiny.gbapal.lz"); const u8 gMonIcon_Gigalith[] = INCBIN_U8("graphics/pokemon/gigalith/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gigalith[] = INCBIN_U8("graphics/pokemon/gigalith/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ROGGENROLA #if P_FAMILY_WOOBAT @@ -5915,14 +6999,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Woobat[] = INCBIN_U32("graphics/pokemon/woobat/back.4bpp.lz"); const u32 gMonShinyPalette_Woobat[] = INCBIN_U32("graphics/pokemon/woobat/shiny.gbapal.lz"); const u8 gMonIcon_Woobat[] = INCBIN_U8("graphics/pokemon/woobat/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Woobat[] = INCBIN_U8("graphics/pokemon/woobat/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/anim_front.4bpp.lz"); const u32 gMonPalette_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/normal.gbapal.lz"); const u32 gMonBackPic_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/back.4bpp.lz"); const u32 gMonShinyPalette_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/shiny.gbapal.lz"); const u8 gMonIcon_Swoobat[] = INCBIN_U8("graphics/pokemon/swoobat/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Swoobat[] = INCBIN_U8("graphics/pokemon/swoobat/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_WOOBAT #if P_FAMILY_DRILBUR @@ -5931,14 +7019,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Drilbur[] = INCBIN_U32("graphics/pokemon/drilbur/back.4bpp.lz"); const u32 gMonShinyPalette_Drilbur[] = INCBIN_U32("graphics/pokemon/drilbur/shiny.gbapal.lz"); const u8 gMonIcon_Drilbur[] = INCBIN_U8("graphics/pokemon/drilbur/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Drilbur[] = INCBIN_U8("graphics/pokemon/drilbur/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/anim_front.4bpp.lz"); const u32 gMonPalette_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/normal.gbapal.lz"); const u32 gMonBackPic_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/back.4bpp.lz"); const u32 gMonShinyPalette_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/shiny.gbapal.lz"); const u8 gMonIcon_Excadrill[] = INCBIN_U8("graphics/pokemon/excadrill/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Excadrill[] = INCBIN_U8("graphics/pokemon/excadrill/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DRILBUR #if P_FAMILY_AUDINO @@ -5947,7 +7039,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Audino[] = INCBIN_U32("graphics/pokemon/audino/back.4bpp.lz"); const u32 gMonShinyPalette_Audino[] = INCBIN_U32("graphics/pokemon/audino/shiny.gbapal.lz"); const u8 gMonIcon_Audino[] = INCBIN_U8("graphics/pokemon/audino/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Audino[] = INCBIN_U8("graphics/pokemon/audino/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/front.4bpp.lz"); @@ -5964,21 +7058,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Timburr[] = INCBIN_U32("graphics/pokemon/timburr/back.4bpp.lz"); const u32 gMonShinyPalette_Timburr[] = INCBIN_U32("graphics/pokemon/timburr/shiny.gbapal.lz"); const u8 gMonIcon_Timburr[] = INCBIN_U8("graphics/pokemon/timburr/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Timburr[] = INCBIN_U8("graphics/pokemon/timburr/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/anim_front.4bpp.lz"); const u32 gMonPalette_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/normal.gbapal.lz"); const u32 gMonBackPic_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/back.4bpp.lz"); const u32 gMonShinyPalette_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/shiny.gbapal.lz"); const u8 gMonIcon_Gurdurr[] = INCBIN_U8("graphics/pokemon/gurdurr/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gurdurr[] = INCBIN_U8("graphics/pokemon/gurdurr/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/anim_front.4bpp.lz"); const u32 gMonPalette_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/normal.gbapal.lz"); const u32 gMonBackPic_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/back.4bpp.lz"); const u32 gMonShinyPalette_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/shiny.gbapal.lz"); const u8 gMonIcon_Conkeldurr[] = INCBIN_U8("graphics/pokemon/conkeldurr/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Conkeldurr[] = INCBIN_U8("graphics/pokemon/conkeldurr/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TIMBURR #if P_FAMILY_TYMPOLE @@ -5987,21 +7087,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/back.4bpp.lz"); const u32 gMonShinyPalette_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/shiny.gbapal.lz"); const u8 gMonIcon_Tympole[] = INCBIN_U8("graphics/pokemon/tympole/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tympole[] = INCBIN_U8("graphics/pokemon/tympole/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/anim_front.4bpp.lz"); const u32 gMonPalette_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/normal.gbapal.lz"); const u32 gMonBackPic_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/back.4bpp.lz"); const u32 gMonShinyPalette_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/shiny.gbapal.lz"); const u8 gMonIcon_Palpitoad[] = INCBIN_U8("graphics/pokemon/palpitoad/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Palpitoad[] = INCBIN_U8("graphics/pokemon/palpitoad/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/anim_front.4bpp.lz"); const u32 gMonPalette_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/normal.gbapal.lz"); const u32 gMonBackPic_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/back.4bpp.lz"); const u32 gMonShinyPalette_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/shiny.gbapal.lz"); const u8 gMonIcon_Seismitoad[] = INCBIN_U8("graphics/pokemon/seismitoad/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Seismitoad[] = INCBIN_U8("graphics/pokemon/seismitoad/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TYMPOLE #if P_FAMILY_THROH @@ -6010,7 +7116,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Throh[] = INCBIN_U32("graphics/pokemon/throh/back.4bpp.lz"); const u32 gMonShinyPalette_Throh[] = INCBIN_U32("graphics/pokemon/throh/shiny.gbapal.lz"); const u8 gMonIcon_Throh[] = INCBIN_U8("graphics/pokemon/throh/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Throh[] = INCBIN_U8("graphics/pokemon/throh/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_THROH #if P_FAMILY_SAWK @@ -6019,7 +7127,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/back.4bpp.lz"); const u32 gMonShinyPalette_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/shiny.gbapal.lz"); const u8 gMonIcon_Sawk[] = INCBIN_U8("graphics/pokemon/sawk/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sawk[] = INCBIN_U8("graphics/pokemon/sawk/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SAWK #if P_FAMILY_SEWADDLE @@ -6028,21 +7138,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/back.4bpp.lz"); const u32 gMonShinyPalette_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/shiny.gbapal.lz"); const u8 gMonIcon_Sewaddle[] = INCBIN_U8("graphics/pokemon/sewaddle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sewaddle[] = INCBIN_U8("graphics/pokemon/sewaddle/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/anim_front.4bpp.lz"); const u32 gMonPalette_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/normal.gbapal.lz"); const u32 gMonBackPic_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/back.4bpp.lz"); const u32 gMonShinyPalette_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/shiny.gbapal.lz"); const u8 gMonIcon_Swadloon[] = INCBIN_U8("graphics/pokemon/swadloon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Swadloon[] = INCBIN_U8("graphics/pokemon/swadloon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/anim_front.4bpp.lz"); const u32 gMonPalette_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/normal.gbapal.lz"); const u32 gMonBackPic_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/back.4bpp.lz"); const u32 gMonShinyPalette_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/shiny.gbapal.lz"); const u8 gMonIcon_Leavanny[] = INCBIN_U8("graphics/pokemon/leavanny/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Leavanny[] = INCBIN_U8("graphics/pokemon/leavanny/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SEWADDLE #if P_FAMILY_VENIPEDE @@ -6051,21 +7167,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Venipede[] = INCBIN_U32("graphics/pokemon/venipede/back.4bpp.lz"); const u32 gMonShinyPalette_Venipede[] = INCBIN_U32("graphics/pokemon/venipede/shiny.gbapal.lz"); const u8 gMonIcon_Venipede[] = INCBIN_U8("graphics/pokemon/venipede/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Venipede[] = INCBIN_U8("graphics/pokemon/venipede/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/anim_front.4bpp.lz"); const u32 gMonPalette_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/normal.gbapal.lz"); const u32 gMonBackPic_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/back.4bpp.lz"); const u32 gMonShinyPalette_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/shiny.gbapal.lz"); const u8 gMonIcon_Whirlipede[] = INCBIN_U8("graphics/pokemon/whirlipede/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Whirlipede[] = INCBIN_U8("graphics/pokemon/whirlipede/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/anim_front.4bpp.lz"); const u32 gMonPalette_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/normal.gbapal.lz"); const u32 gMonBackPic_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/back.4bpp.lz"); const u32 gMonShinyPalette_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/shiny.gbapal.lz"); const u8 gMonIcon_Scolipede[] = INCBIN_U8("graphics/pokemon/scolipede/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Scolipede[] = INCBIN_U8("graphics/pokemon/scolipede/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_VENIPEDE #if P_FAMILY_COTTONEE @@ -6074,14 +7196,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/back.4bpp.lz"); const u32 gMonShinyPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/shiny.gbapal.lz"); const u8 gMonIcon_Cottonee[] = INCBIN_U8("graphics/pokemon/cottonee/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cottonee[] = INCBIN_U8("graphics/pokemon/cottonee/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/anim_front.4bpp.lz"); const u32 gMonPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/normal.gbapal.lz"); const u32 gMonBackPic_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/back.4bpp.lz"); const u32 gMonShinyPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/shiny.gbapal.lz"); const u8 gMonIcon_Whimsicott[] = INCBIN_U8("graphics/pokemon/whimsicott/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Whimsicott[] = INCBIN_U8("graphics/pokemon/whimsicott/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_COTTONEE #if P_FAMILY_PETILIL @@ -6090,14 +7216,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/back.4bpp.lz"); const u32 gMonShinyPalette_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/shiny.gbapal.lz"); const u8 gMonIcon_Petilil[] = INCBIN_U8("graphics/pokemon/petilil/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Petilil[] = INCBIN_U8("graphics/pokemon/petilil/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/anim_front.4bpp.lz"); const u32 gMonPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/normal.gbapal.lz"); const u32 gMonBackPic_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/back.4bpp.lz"); const u32 gMonShinyPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/shiny.gbapal.lz"); const u8 gMonIcon_Lilligant[] = INCBIN_U8("graphics/pokemon/lilligant/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lilligant[] = INCBIN_U8("graphics/pokemon/lilligant/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/front.4bpp.lz"); @@ -6114,7 +7244,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/back.4bpp.lz"); const u32 gMonShinyPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/shiny.gbapal.lz"); const u8 gMonIcon_BasculinRedStriped[] = INCBIN_U8("graphics/pokemon/basculin/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Basculin[] = INCBIN_U8("graphics/pokemon/basculin/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/front.4bpp.lz"); const u32 gMonPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/normal.gbapal.lz"); @@ -6134,7 +7266,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz"); const u32 gMonShinyPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz"); const u8 gMonIcon_BasculegionMale[] = INCBIN_U8("graphics/pokemon/basculegion/icon.4bpp"); +#if P_FOOTPRINTS //const u8 gMonFootprint_Basculegion[] = INCBIN_U8("graphics/pokemon/basculegion/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/front.4bpp.lz"); const u32 gMonPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/normal.gbapal.lz"); @@ -6150,21 +7284,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/back.4bpp.lz"); const u32 gMonShinyPalette_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/shiny.gbapal.lz"); const u8 gMonIcon_Sandile[] = INCBIN_U8("graphics/pokemon/sandile/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sandile[] = INCBIN_U8("graphics/pokemon/sandile/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/anim_front.4bpp.lz"); const u32 gMonPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/normal.gbapal.lz"); const u32 gMonBackPic_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/back.4bpp.lz"); const u32 gMonShinyPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/shiny.gbapal.lz"); const u8 gMonIcon_Krokorok[] = INCBIN_U8("graphics/pokemon/krokorok/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Krokorok[] = INCBIN_U8("graphics/pokemon/krokorok/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/anim_front.4bpp.lz"); const u32 gMonPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/normal.gbapal.lz"); const u32 gMonBackPic_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/back.4bpp.lz"); const u32 gMonShinyPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/shiny.gbapal.lz"); const u8 gMonIcon_Krookodile[] = INCBIN_U8("graphics/pokemon/krookodile/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Krookodile[] = INCBIN_U8("graphics/pokemon/krookodile/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SANDILE #if P_FAMILY_DARUMAKA @@ -6173,14 +7313,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/back.4bpp.lz"); const u32 gMonShinyPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/shiny.gbapal.lz"); const u8 gMonIcon_Darumaka[] = INCBIN_U8("graphics/pokemon/darumaka/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Darumaka[] = INCBIN_U8("graphics/pokemon/darumaka/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/anim_front.4bpp.lz"); const u32 gMonPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/normal.gbapal.lz"); const u32 gMonBackPic_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/back.4bpp.lz"); const u32 gMonShinyPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/shiny.gbapal.lz"); const u8 gMonIcon_DarmanitanStandardMode[] = INCBIN_U8("graphics/pokemon/darmanitan/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Darmanitan[] = INCBIN_U8("graphics/pokemon/darmanitan/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/anim_front.4bpp.lz"); const u32 gMonPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/normal.gbapal.lz"); @@ -6215,7 +7359,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/back.4bpp.lz"); const u32 gMonShinyPalette_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/shiny.gbapal.lz"); const u8 gMonIcon_Maractus[] = INCBIN_U8("graphics/pokemon/maractus/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Maractus[] = INCBIN_U8("graphics/pokemon/maractus/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MARACTUS #if P_FAMILY_DWEBBLE @@ -6224,14 +7370,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/back.4bpp.lz"); const u32 gMonShinyPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/shiny.gbapal.lz"); const u8 gMonIcon_Dwebble[] = INCBIN_U8("graphics/pokemon/dwebble/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dwebble[] = INCBIN_U8("graphics/pokemon/dwebble/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/anim_front.4bpp.lz"); const u32 gMonPalette_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/normal.gbapal.lz"); const u32 gMonBackPic_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/back.4bpp.lz"); const u32 gMonShinyPalette_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/shiny.gbapal.lz"); const u8 gMonIcon_Crustle[] = INCBIN_U8("graphics/pokemon/crustle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Crustle[] = INCBIN_U8("graphics/pokemon/crustle/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DWEBBLE #if P_FAMILY_SCRAGGY @@ -6240,14 +7390,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/back.4bpp.lz"); const u32 gMonShinyPalette_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/shiny.gbapal.lz"); const u8 gMonIcon_Scraggy[] = INCBIN_U8("graphics/pokemon/scraggy/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Scraggy[] = INCBIN_U8("graphics/pokemon/scraggy/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/anim_front.4bpp.lz"); const u32 gMonPalette_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/normal.gbapal.lz"); const u32 gMonBackPic_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/back.4bpp.lz"); const u32 gMonShinyPalette_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/shiny.gbapal.lz"); const u8 gMonIcon_Scrafty[] = INCBIN_U8("graphics/pokemon/scrafty/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Scrafty[] = INCBIN_U8("graphics/pokemon/scrafty/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SCRAGGY #if P_FAMILY_SIGILYPH @@ -6256,7 +7410,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/back.4bpp.lz"); const u32 gMonShinyPalette_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/shiny.gbapal.lz"); const u8 gMonIcon_Sigilyph[] = INCBIN_U8("graphics/pokemon/sigilyph/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sigilyph[] = INCBIN_U8("graphics/pokemon/sigilyph/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SIGILYPH #if P_FAMILY_YAMASK @@ -6265,14 +7421,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/back.4bpp.lz"); const u32 gMonShinyPalette_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/shiny.gbapal.lz"); const u8 gMonIcon_Yamask[] = INCBIN_U8("graphics/pokemon/yamask/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Yamask[] = INCBIN_U8("graphics/pokemon/yamask/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/anim_front.4bpp.lz"); const u32 gMonPalette_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/normal.gbapal.lz"); const u32 gMonBackPic_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/back.4bpp.lz"); const u32 gMonShinyPalette_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/shiny.gbapal.lz"); const u8 gMonIcon_Cofagrigus[] = INCBIN_U8("graphics/pokemon/cofagrigus/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cofagrigus[] = INCBIN_U8("graphics/pokemon/cofagrigus/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/front.4bpp.lz"); @@ -6286,7 +7446,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/back.4bpp.lz"); const u32 gMonShinyPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/shiny.gbapal.lz"); const u8 gMonIcon_Runerigus[] = INCBIN_U8("graphics/pokemon/runerigus/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Runerigus[] = INCBIN_U8("graphics/pokemon/runerigus/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_YAMASK @@ -6296,14 +7458,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/back.4bpp.lz"); const u32 gMonShinyPalette_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/shiny.gbapal.lz"); const u8 gMonIcon_Tirtouga[] = INCBIN_U8("graphics/pokemon/tirtouga/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tirtouga[] = INCBIN_U8("graphics/pokemon/tirtouga/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/anim_front.4bpp.lz"); const u32 gMonPalette_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/normal.gbapal.lz"); const u32 gMonBackPic_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/back.4bpp.lz"); const u32 gMonShinyPalette_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/shiny.gbapal.lz"); const u8 gMonIcon_Carracosta[] = INCBIN_U8("graphics/pokemon/carracosta/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Carracosta[] = INCBIN_U8("graphics/pokemon/carracosta/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TIRTOUGA #if P_FAMILY_ARCHEN @@ -6312,14 +7478,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Archen[] = INCBIN_U32("graphics/pokemon/archen/back.4bpp.lz"); const u32 gMonShinyPalette_Archen[] = INCBIN_U32("graphics/pokemon/archen/shiny.gbapal.lz"); const u8 gMonIcon_Archen[] = INCBIN_U8("graphics/pokemon/archen/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Archen[] = INCBIN_U8("graphics/pokemon/archen/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/anim_front.4bpp.lz"); const u32 gMonPalette_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/normal.gbapal.lz"); const u32 gMonBackPic_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/back.4bpp.lz"); const u32 gMonShinyPalette_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/shiny.gbapal.lz"); const u8 gMonIcon_Archeops[] = INCBIN_U8("graphics/pokemon/archeops/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Archeops[] = INCBIN_U8("graphics/pokemon/archeops/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ARCHEN #if P_FAMILY_TRUBBISH @@ -6328,14 +7498,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/back.4bpp.lz"); const u32 gMonShinyPalette_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/shiny.gbapal.lz"); const u8 gMonIcon_Trubbish[] = INCBIN_U8("graphics/pokemon/trubbish/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Trubbish[] = INCBIN_U8("graphics/pokemon/trubbish/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/anim_front.4bpp.lz"); const u32 gMonPalette_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/normal.gbapal.lz"); const u32 gMonBackPic_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/back.4bpp.lz"); const u32 gMonShinyPalette_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/shiny.gbapal.lz"); const u8 gMonIcon_Garbodor[] = INCBIN_U8("graphics/pokemon/garbodor/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Garbodor[] = INCBIN_U8("graphics/pokemon/garbodor/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/front.4bpp.lz"); @@ -6352,14 +7526,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/back.4bpp.lz"); const u32 gMonShinyPalette_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/shiny.gbapal.lz"); const u8 gMonIcon_Zorua[] = INCBIN_U8("graphics/pokemon/zorua/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Zorua[] = INCBIN_U8("graphics/pokemon/zorua/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/anim_front.4bpp.lz"); const u32 gMonPalette_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/normal.gbapal.lz"); const u32 gMonBackPic_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/back.4bpp.lz"); const u32 gMonShinyPalette_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/shiny.gbapal.lz"); const u8 gMonIcon_Zoroark[] = INCBIN_U8("graphics/pokemon/zoroark/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Zoroark[] = INCBIN_U8("graphics/pokemon/zoroark/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/front.4bpp.lz"); @@ -6382,14 +7560,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/back.4bpp.lz"); const u32 gMonShinyPalette_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/shiny.gbapal.lz"); const u8 gMonIcon_Minccino[] = INCBIN_U8("graphics/pokemon/minccino/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Minccino[] = INCBIN_U8("graphics/pokemon/minccino/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/anim_front.4bpp.lz"); const u32 gMonPalette_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/normal.gbapal.lz"); const u32 gMonBackPic_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/back.4bpp.lz"); const u32 gMonShinyPalette_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/shiny.gbapal.lz"); const u8 gMonIcon_Cinccino[] = INCBIN_U8("graphics/pokemon/cinccino/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cinccino[] = INCBIN_U8("graphics/pokemon/cinccino/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MINCCINO #if P_FAMILY_GOTHITA @@ -6398,21 +7580,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/back.4bpp.lz"); const u32 gMonShinyPalette_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/shiny.gbapal.lz"); const u8 gMonIcon_Gothita[] = INCBIN_U8("graphics/pokemon/gothita/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gothita[] = INCBIN_U8("graphics/pokemon/gothita/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/anim_front.4bpp.lz"); const u32 gMonPalette_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/normal.gbapal.lz"); const u32 gMonBackPic_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/back.4bpp.lz"); const u32 gMonShinyPalette_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/shiny.gbapal.lz"); const u8 gMonIcon_Gothorita[] = INCBIN_U8("graphics/pokemon/gothorita/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gothorita[] = INCBIN_U8("graphics/pokemon/gothorita/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/anim_front.4bpp.lz"); const u32 gMonPalette_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/normal.gbapal.lz"); const u32 gMonBackPic_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/back.4bpp.lz"); const u32 gMonShinyPalette_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/shiny.gbapal.lz"); const u8 gMonIcon_Gothitelle[] = INCBIN_U8("graphics/pokemon/gothitelle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gothitelle[] = INCBIN_U8("graphics/pokemon/gothitelle/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_GOTHITA #if P_FAMILY_SOLOSIS @@ -6421,21 +7609,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/back.4bpp.lz"); const u32 gMonShinyPalette_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/shiny.gbapal.lz"); const u8 gMonIcon_Solosis[] = INCBIN_U8("graphics/pokemon/solosis/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Solosis[] = INCBIN_U8("graphics/pokemon/solosis/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/anim_front.4bpp.lz"); const u32 gMonPalette_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/normal.gbapal.lz"); const u32 gMonBackPic_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/back.4bpp.lz"); const u32 gMonShinyPalette_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/shiny.gbapal.lz"); const u8 gMonIcon_Duosion[] = INCBIN_U8("graphics/pokemon/duosion/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Duosion[] = INCBIN_U8("graphics/pokemon/duosion/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/anim_front.4bpp.lz"); const u32 gMonPalette_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/normal.gbapal.lz"); const u32 gMonBackPic_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/back.4bpp.lz"); const u32 gMonShinyPalette_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/shiny.gbapal.lz"); const u8 gMonIcon_Reuniclus[] = INCBIN_U8("graphics/pokemon/reuniclus/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Reuniclus[] = INCBIN_U8("graphics/pokemon/reuniclus/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SOLOSIS #if P_FAMILY_DUCKLETT @@ -6444,14 +7638,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/back.4bpp.lz"); const u32 gMonShinyPalette_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/shiny.gbapal.lz"); const u8 gMonIcon_Ducklett[] = INCBIN_U8("graphics/pokemon/ducklett/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ducklett[] = INCBIN_U8("graphics/pokemon/ducklett/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/anim_front.4bpp.lz"); const u32 gMonPalette_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/normal.gbapal.lz"); const u32 gMonBackPic_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/back.4bpp.lz"); const u32 gMonShinyPalette_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/shiny.gbapal.lz"); const u8 gMonIcon_Swanna[] = INCBIN_U8("graphics/pokemon/swanna/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Swanna[] = INCBIN_U8("graphics/pokemon/swanna/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DUCKLETT #if P_FAMILY_VANILLITE @@ -6460,27 +7658,35 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/back.4bpp.lz"); const u32 gMonShinyPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/shiny.gbapal.lz"); const u8 gMonIcon_Vanillite[] = INCBIN_U8("graphics/pokemon/vanillite/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Vanillite[] = INCBIN_U8("graphics/pokemon/vanillite/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/anim_front.4bpp.lz"); const u32 gMonPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/normal.gbapal.lz"); const u32 gMonBackPic_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/back.4bpp.lz"); const u32 gMonShinyPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/shiny.gbapal.lz"); const u8 gMonIcon_Vanillish[] = INCBIN_U8("graphics/pokemon/vanillish/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Vanillish[] = INCBIN_U8("graphics/pokemon/vanillish/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/anim_front.4bpp.lz"); const u32 gMonPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/normal.gbapal.lz"); const u32 gMonBackPic_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/back.4bpp.lz"); const u32 gMonShinyPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/shiny.gbapal.lz"); const u8 gMonIcon_Vanilluxe[] = INCBIN_U8("graphics/pokemon/vanilluxe/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Vanilluxe[] = INCBIN_U8("graphics/pokemon/vanilluxe/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_VANILLITE #if P_FAMILY_DEERLING const u32 gMonFrontPic_Deerling[] = INCBIN_U32("graphics/pokemon/deerling/anim_front.4bpp.lz"); const u32 gMonBackPic_Deerling[] = INCBIN_U32("graphics/pokemon/deerling/back.4bpp.lz"); +#if P_FOOTPRINTS const u8 gMonFootprint_Deerling[] = INCBIN_U8("graphics/pokemon/deerling/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/deerling/normal.gbapal.lz"); const u32 gMonShinyPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/deerling/shiny.gbapal.lz"); @@ -6503,7 +7709,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/back.4bpp.lz"); const u32 gMonShinyPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/shiny.gbapal.lz"); const u8 gMonIcon_SawsbuckSpring[] = INCBIN_U8("graphics/pokemon/sawsbuck/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sawsbuck[] = INCBIN_U8("graphics/pokemon/sawsbuck/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/front.4bpp.lz"); const u32 gMonPalette_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/normal.gbapal.lz"); @@ -6530,7 +7738,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/back.4bpp.lz"); const u32 gMonShinyPalette_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/shiny.gbapal.lz"); const u8 gMonIcon_Emolga[] = INCBIN_U8("graphics/pokemon/emolga/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Emolga[] = INCBIN_U8("graphics/pokemon/emolga/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_EMOLGA #if P_FAMILY_KARRABLAST @@ -6539,14 +7749,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/back.4bpp.lz"); const u32 gMonShinyPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/shiny.gbapal.lz"); const u8 gMonIcon_Karrablast[] = INCBIN_U8("graphics/pokemon/karrablast/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Karrablast[] = INCBIN_U8("graphics/pokemon/karrablast/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/anim_front.4bpp.lz"); const u32 gMonPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/normal.gbapal.lz"); const u32 gMonBackPic_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/back.4bpp.lz"); const u32 gMonShinyPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/shiny.gbapal.lz"); const u8 gMonIcon_Escavalier[] = INCBIN_U8("graphics/pokemon/escavalier/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Escavalier[] = INCBIN_U8("graphics/pokemon/escavalier/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_KARRABLAST #if P_FAMILY_FOONGUS @@ -6555,14 +7769,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/back.4bpp.lz"); const u32 gMonShinyPalette_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/shiny.gbapal.lz"); const u8 gMonIcon_Foongus[] = INCBIN_U8("graphics/pokemon/foongus/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Foongus[] = INCBIN_U8("graphics/pokemon/foongus/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/anim_front.4bpp.lz"); const u32 gMonPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/normal.gbapal.lz"); const u32 gMonBackPic_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/back.4bpp.lz"); const u32 gMonShinyPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/shiny.gbapal.lz"); const u8 gMonIcon_Amoonguss[] = INCBIN_U8("graphics/pokemon/amoonguss/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Amoonguss[] = INCBIN_U8("graphics/pokemon/amoonguss/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_FOONGUS #if P_FAMILY_FRILLISH @@ -6571,7 +7789,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/back.4bpp.lz"); const u32 gMonShinyPalette_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/shiny.gbapal.lz"); const u8 gMonIcon_Frillish[] = INCBIN_U8("graphics/pokemon/frillish/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Frillish[] = INCBIN_U8("graphics/pokemon/frillish/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/anim_frontf.4bpp.lz"); const u32 gMonPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/normalf.gbapal.lz"); @@ -6584,7 +7804,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/back.4bpp.lz"); const u32 gMonShinyPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/shiny.gbapal.lz"); const u8 gMonIcon_Jellicent[] = INCBIN_U8("graphics/pokemon/jellicent/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Jellicent[] = INCBIN_U8("graphics/pokemon/jellicent/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/anim_frontf.4bpp.lz"); const u32 gMonPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/normalf.gbapal.lz"); @@ -6599,7 +7821,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/back.4bpp.lz"); const u32 gMonShinyPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/shiny.gbapal.lz"); const u8 gMonIcon_Alomomola[] = INCBIN_U8("graphics/pokemon/alomomola/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Alomomola[] = INCBIN_U8("graphics/pokemon/alomomola/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ALOMOMOLA #if P_FAMILY_JOLTIK @@ -6608,14 +7832,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/back.4bpp.lz"); const u32 gMonShinyPalette_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/shiny.gbapal.lz"); const u8 gMonIcon_Joltik[] = INCBIN_U8("graphics/pokemon/joltik/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Joltik[] = INCBIN_U8("graphics/pokemon/joltik/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/anim_front.4bpp.lz"); const u32 gMonPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/normal.gbapal.lz"); const u32 gMonBackPic_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/back.4bpp.lz"); const u32 gMonShinyPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/shiny.gbapal.lz"); const u8 gMonIcon_Galvantula[] = INCBIN_U8("graphics/pokemon/galvantula/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Galvantula[] = INCBIN_U8("graphics/pokemon/galvantula/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_JOLTIK #if P_FAMILY_FERROSEED @@ -6624,14 +7852,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Ferroseed[] = INCBIN_U32("graphics/pokemon/ferroseed/back.4bpp.lz"); const u32 gMonShinyPalette_Ferroseed[] = INCBIN_U32("graphics/pokemon/ferroseed/shiny.gbapal.lz"); const u8 gMonIcon_Ferroseed[] = INCBIN_U8("graphics/pokemon/ferroseed/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ferroseed[] = INCBIN_U8("graphics/pokemon/ferroseed/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/anim_front.4bpp.lz"); const u32 gMonPalette_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/normal.gbapal.lz"); const u32 gMonBackPic_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/back.4bpp.lz"); const u32 gMonShinyPalette_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/shiny.gbapal.lz"); const u8 gMonIcon_Ferrothorn[] = INCBIN_U8("graphics/pokemon/ferrothorn/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ferrothorn[] = INCBIN_U8("graphics/pokemon/ferrothorn/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_FERROSEED #if P_FAMILY_KLINK @@ -6640,21 +7872,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Klink[] = INCBIN_U32("graphics/pokemon/klink/back.4bpp.lz"); const u32 gMonShinyPalette_Klink[] = INCBIN_U32("graphics/pokemon/klink/shiny.gbapal.lz"); const u8 gMonIcon_Klink[] = INCBIN_U8("graphics/pokemon/klink/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Klink[] = INCBIN_U8("graphics/pokemon/klink/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Klang[] = INCBIN_U32("graphics/pokemon/klang/anim_front.4bpp.lz"); const u32 gMonPalette_Klang[] = INCBIN_U32("graphics/pokemon/klang/normal.gbapal.lz"); const u32 gMonBackPic_Klang[] = INCBIN_U32("graphics/pokemon/klang/back.4bpp.lz"); const u32 gMonShinyPalette_Klang[] = INCBIN_U32("graphics/pokemon/klang/shiny.gbapal.lz"); const u8 gMonIcon_Klang[] = INCBIN_U8("graphics/pokemon/klang/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Klang[] = INCBIN_U8("graphics/pokemon/klang/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/anim_front.4bpp.lz"); const u32 gMonPalette_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/normal.gbapal.lz"); const u32 gMonBackPic_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/back.4bpp.lz"); const u32 gMonShinyPalette_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/shiny.gbapal.lz"); const u8 gMonIcon_Klinklang[] = INCBIN_U8("graphics/pokemon/klinklang/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Klinklang[] = INCBIN_U8("graphics/pokemon/klinklang/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_KLINK #if P_FAMILY_TYNAMO @@ -6663,21 +7901,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tynamo[] = INCBIN_U32("graphics/pokemon/tynamo/back.4bpp.lz"); const u32 gMonShinyPalette_Tynamo[] = INCBIN_U32("graphics/pokemon/tynamo/shiny.gbapal.lz"); const u8 gMonIcon_Tynamo[] = INCBIN_U8("graphics/pokemon/tynamo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tynamo[] = INCBIN_U8("graphics/pokemon/tynamo/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/anim_front.4bpp.lz"); const u32 gMonPalette_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/normal.gbapal.lz"); const u32 gMonBackPic_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/back.4bpp.lz"); const u32 gMonShinyPalette_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/shiny.gbapal.lz"); const u8 gMonIcon_Eelektrik[] = INCBIN_U8("graphics/pokemon/eelektrik/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Eelektrik[] = INCBIN_U8("graphics/pokemon/eelektrik/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/anim_front.4bpp.lz"); const u32 gMonPalette_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/normal.gbapal.lz"); const u32 gMonBackPic_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/back.4bpp.lz"); const u32 gMonShinyPalette_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/shiny.gbapal.lz"); const u8 gMonIcon_Eelektross[] = INCBIN_U8("graphics/pokemon/eelektross/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Eelektross[] = INCBIN_U8("graphics/pokemon/eelektross/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TYNAMO #if P_FAMILY_ELGYEM @@ -6686,14 +7930,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Elgyem[] = INCBIN_U32("graphics/pokemon/elgyem/back.4bpp.lz"); const u32 gMonShinyPalette_Elgyem[] = INCBIN_U32("graphics/pokemon/elgyem/shiny.gbapal.lz"); const u8 gMonIcon_Elgyem[] = INCBIN_U8("graphics/pokemon/elgyem/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Elgyem[] = INCBIN_U8("graphics/pokemon/elgyem/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/anim_front.4bpp.lz"); const u32 gMonPalette_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/normal.gbapal.lz"); const u32 gMonBackPic_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/back.4bpp.lz"); const u32 gMonShinyPalette_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/shiny.gbapal.lz"); const u8 gMonIcon_Beheeyem[] = INCBIN_U8("graphics/pokemon/beheeyem/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Beheeyem[] = INCBIN_U8("graphics/pokemon/beheeyem/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ELGYEM #if P_FAMILY_LITWICK @@ -6702,21 +7950,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Litwick[] = INCBIN_U32("graphics/pokemon/litwick/back.4bpp.lz"); const u32 gMonShinyPalette_Litwick[] = INCBIN_U32("graphics/pokemon/litwick/shiny.gbapal.lz"); const u8 gMonIcon_Litwick[] = INCBIN_U8("graphics/pokemon/litwick/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Litwick[] = INCBIN_U8("graphics/pokemon/litwick/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/anim_front.4bpp.lz"); const u32 gMonPalette_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/normal.gbapal.lz"); const u32 gMonBackPic_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/back.4bpp.lz"); const u32 gMonShinyPalette_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/shiny.gbapal.lz"); const u8 gMonIcon_Lampent[] = INCBIN_U8("graphics/pokemon/lampent/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lampent[] = INCBIN_U8("graphics/pokemon/lampent/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/anim_front.4bpp.lz"); const u32 gMonPalette_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/normal.gbapal.lz"); const u32 gMonBackPic_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/back.4bpp.lz"); const u32 gMonShinyPalette_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/shiny.gbapal.lz"); const u8 gMonIcon_Chandelure[] = INCBIN_U8("graphics/pokemon/chandelure/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Chandelure[] = INCBIN_U8("graphics/pokemon/chandelure/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_LITWICK #if P_FAMILY_AXEW @@ -6725,21 +7979,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Axew[] = INCBIN_U32("graphics/pokemon/axew/back.4bpp.lz"); const u32 gMonShinyPalette_Axew[] = INCBIN_U32("graphics/pokemon/axew/shiny.gbapal.lz"); const u8 gMonIcon_Axew[] = INCBIN_U8("graphics/pokemon/axew/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Axew[] = INCBIN_U8("graphics/pokemon/axew/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/anim_front.4bpp.lz"); const u32 gMonPalette_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/normal.gbapal.lz"); const u32 gMonBackPic_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/back.4bpp.lz"); const u32 gMonShinyPalette_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/shiny.gbapal.lz"); const u8 gMonIcon_Fraxure[] = INCBIN_U8("graphics/pokemon/fraxure/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Fraxure[] = INCBIN_U8("graphics/pokemon/fraxure/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/anim_front.4bpp.lz"); const u32 gMonPalette_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/normal.gbapal.lz"); const u32 gMonBackPic_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/back.4bpp.lz"); const u32 gMonShinyPalette_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/shiny.gbapal.lz"); const u8 gMonIcon_Haxorus[] = INCBIN_U8("graphics/pokemon/haxorus/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Haxorus[] = INCBIN_U8("graphics/pokemon/haxorus/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_AXEW #if P_FAMILY_CUBCHOO @@ -6748,14 +8008,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cubchoo[] = INCBIN_U32("graphics/pokemon/cubchoo/back.4bpp.lz"); const u32 gMonShinyPalette_Cubchoo[] = INCBIN_U32("graphics/pokemon/cubchoo/shiny.gbapal.lz"); const u8 gMonIcon_Cubchoo[] = INCBIN_U8("graphics/pokemon/cubchoo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cubchoo[] = INCBIN_U8("graphics/pokemon/cubchoo/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/anim_front.4bpp.lz"); const u32 gMonPalette_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/normal.gbapal.lz"); const u32 gMonBackPic_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/back.4bpp.lz"); const u32 gMonShinyPalette_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/shiny.gbapal.lz"); const u8 gMonIcon_Beartic[] = INCBIN_U8("graphics/pokemon/beartic/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Beartic[] = INCBIN_U8("graphics/pokemon/beartic/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CUBCHOO #if P_FAMILY_CRYOGONAL @@ -6764,7 +8028,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cryogonal[] = INCBIN_U32("graphics/pokemon/cryogonal/back.4bpp.lz"); const u32 gMonShinyPalette_Cryogonal[] = INCBIN_U32("graphics/pokemon/cryogonal/shiny.gbapal.lz"); const u8 gMonIcon_Cryogonal[] = INCBIN_U8("graphics/pokemon/cryogonal/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cryogonal[] = INCBIN_U8("graphics/pokemon/cryogonal/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CRYOGONAL #if P_FAMILY_SHELMET @@ -6773,14 +8039,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Shelmet[] = INCBIN_U32("graphics/pokemon/shelmet/back.4bpp.lz"); const u32 gMonShinyPalette_Shelmet[] = INCBIN_U32("graphics/pokemon/shelmet/shiny.gbapal.lz"); const u8 gMonIcon_Shelmet[] = INCBIN_U8("graphics/pokemon/shelmet/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Shelmet[] = INCBIN_U8("graphics/pokemon/shelmet/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/anim_front.4bpp.lz"); const u32 gMonPalette_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/normal.gbapal.lz"); const u32 gMonBackPic_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/back.4bpp.lz"); const u32 gMonShinyPalette_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/shiny.gbapal.lz"); const u8 gMonIcon_Accelgor[] = INCBIN_U8("graphics/pokemon/accelgor/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Accelgor[] = INCBIN_U8("graphics/pokemon/accelgor/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SHELMET #if P_FAMILY_STUNFISK @@ -6789,7 +8059,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/back.4bpp.lz"); const u32 gMonShinyPalette_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/shiny.gbapal.lz"); const u8 gMonIcon_Stunfisk[] = INCBIN_U8("graphics/pokemon/stunfisk/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Stunfisk[] = INCBIN_U8("graphics/pokemon/stunfisk/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/front.4bpp.lz"); @@ -6806,14 +8078,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/back.4bpp.lz"); const u32 gMonShinyPalette_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/shiny.gbapal.lz"); const u8 gMonIcon_Mienfoo[] = INCBIN_U8("graphics/pokemon/mienfoo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mienfoo[] = INCBIN_U8("graphics/pokemon/mienfoo/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/anim_front.4bpp.lz"); const u32 gMonPalette_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/normal.gbapal.lz"); const u32 gMonBackPic_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/back.4bpp.lz"); const u32 gMonShinyPalette_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/shiny.gbapal.lz"); const u8 gMonIcon_Mienshao[] = INCBIN_U8("graphics/pokemon/mienshao/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mienshao[] = INCBIN_U8("graphics/pokemon/mienshao/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MIENFOO #if P_FAMILY_DRUDDIGON @@ -6822,7 +8098,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/back.4bpp.lz"); const u32 gMonShinyPalette_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/shiny.gbapal.lz"); const u8 gMonIcon_Druddigon[] = INCBIN_U8("graphics/pokemon/druddigon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Druddigon[] = INCBIN_U8("graphics/pokemon/druddigon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DRUDDIGON #if P_FAMILY_GOLETT @@ -6831,14 +8109,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Golett[] = INCBIN_U32("graphics/pokemon/golett/back.4bpp.lz"); const u32 gMonShinyPalette_Golett[] = INCBIN_U32("graphics/pokemon/golett/shiny.gbapal.lz"); const u8 gMonIcon_Golett[] = INCBIN_U8("graphics/pokemon/golett/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Golett[] = INCBIN_U8("graphics/pokemon/golett/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/anim_front.4bpp.lz"); const u32 gMonPalette_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/normal.gbapal.lz"); const u32 gMonBackPic_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/back.4bpp.lz"); const u32 gMonShinyPalette_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/shiny.gbapal.lz"); const u8 gMonIcon_Golurk[] = INCBIN_U8("graphics/pokemon/golurk/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Golurk[] = INCBIN_U8("graphics/pokemon/golurk/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_GOLETT #if P_FAMILY_PAWNIARD @@ -6847,14 +8129,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/back.4bpp.lz"); const u32 gMonShinyPalette_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/shiny.gbapal.lz"); const u8 gMonIcon_Pawniard[] = INCBIN_U8("graphics/pokemon/pawniard/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pawniard[] = INCBIN_U8("graphics/pokemon/pawniard/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/anim_front.4bpp.lz"); const u32 gMonPalette_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/normal.gbapal.lz"); const u32 gMonBackPic_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/back.4bpp.lz"); const u32 gMonShinyPalette_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/shiny.gbapal.lz"); const u8 gMonIcon_Bisharp[] = INCBIN_U8("graphics/pokemon/bisharp/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bisharp[] = INCBIN_U8("graphics/pokemon/bisharp/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GEN_9_CROSS_EVOS const u32 gMonFrontPic_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/front.4bpp.lz"); @@ -6862,7 +8148,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/back.4bpp.lz"); const u32 gMonShinyPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/shiny.gbapal.lz"); const u8 gMonIcon_Kingambit[] = INCBIN_U8("graphics/pokemon/kingambit/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Kingambit[] = INCBIN_U8("graphics/pokemon/kingambit/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_PAWNIARD @@ -6872,7 +8160,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bouffalant[] = INCBIN_U32("graphics/pokemon/bouffalant/back.4bpp.lz"); const u32 gMonShinyPalette_Bouffalant[] = INCBIN_U32("graphics/pokemon/bouffalant/shiny.gbapal.lz"); const u8 gMonIcon_Bouffalant[] = INCBIN_U8("graphics/pokemon/bouffalant/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bouffalant[] = INCBIN_U8("graphics/pokemon/bouffalant/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BOUFFALANT #if P_FAMILY_RUFFLET @@ -6881,14 +8171,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Rufflet[] = INCBIN_U32("graphics/pokemon/rufflet/back.4bpp.lz"); const u32 gMonShinyPalette_Rufflet[] = INCBIN_U32("graphics/pokemon/rufflet/shiny.gbapal.lz"); const u8 gMonIcon_Rufflet[] = INCBIN_U8("graphics/pokemon/rufflet/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Rufflet[] = INCBIN_U8("graphics/pokemon/rufflet/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/anim_front.4bpp.lz"); const u32 gMonPalette_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/normal.gbapal.lz"); const u32 gMonBackPic_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/back.4bpp.lz"); const u32 gMonShinyPalette_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/shiny.gbapal.lz"); const u8 gMonIcon_Braviary[] = INCBIN_U8("graphics/pokemon/braviary/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Braviary[] = INCBIN_U8("graphics/pokemon/braviary/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/front.4bpp.lz"); @@ -6905,14 +8199,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/back.4bpp.lz"); const u32 gMonShinyPalette_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/shiny.gbapal.lz"); const u8 gMonIcon_Vullaby[] = INCBIN_U8("graphics/pokemon/vullaby/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Vullaby[] = INCBIN_U8("graphics/pokemon/vullaby/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/anim_front.4bpp.lz"); const u32 gMonPalette_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/normal.gbapal.lz"); const u32 gMonBackPic_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/back.4bpp.lz"); const u32 gMonShinyPalette_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/shiny.gbapal.lz"); const u8 gMonIcon_Mandibuzz[] = INCBIN_U8("graphics/pokemon/mandibuzz/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mandibuzz[] = INCBIN_U8("graphics/pokemon/mandibuzz/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_VULLABY #if P_FAMILY_HEATMOR @@ -6921,7 +8219,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/back.4bpp.lz"); const u32 gMonShinyPalette_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/shiny.gbapal.lz"); const u8 gMonIcon_Heatmor[] = INCBIN_U8("graphics/pokemon/heatmor/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Heatmor[] = INCBIN_U8("graphics/pokemon/heatmor/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_HEATMOR #if P_FAMILY_DURANT @@ -6930,7 +8230,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Durant[] = INCBIN_U32("graphics/pokemon/durant/back.4bpp.lz"); const u32 gMonShinyPalette_Durant[] = INCBIN_U32("graphics/pokemon/durant/shiny.gbapal.lz"); const u8 gMonIcon_Durant[] = INCBIN_U8("graphics/pokemon/durant/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Durant[] = INCBIN_U8("graphics/pokemon/durant/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DURANT #if P_FAMILY_DEINO @@ -6939,21 +8241,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Deino[] = INCBIN_U32("graphics/pokemon/deino/back.4bpp.lz"); const u32 gMonShinyPalette_Deino[] = INCBIN_U32("graphics/pokemon/deino/shiny.gbapal.lz"); const u8 gMonIcon_Deino[] = INCBIN_U8("graphics/pokemon/deino/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Deino[] = INCBIN_U8("graphics/pokemon/deino/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/anim_front.4bpp.lz"); const u32 gMonPalette_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/normal.gbapal.lz"); const u32 gMonBackPic_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/back.4bpp.lz"); const u32 gMonShinyPalette_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/shiny.gbapal.lz"); const u8 gMonIcon_Zweilous[] = INCBIN_U8("graphics/pokemon/zweilous/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Zweilous[] = INCBIN_U8("graphics/pokemon/zweilous/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/anim_front.4bpp.lz"); const u32 gMonPalette_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/normal.gbapal.lz"); const u32 gMonBackPic_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/back.4bpp.lz"); const u32 gMonShinyPalette_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/shiny.gbapal.lz"); const u8 gMonIcon_Hydreigon[] = INCBIN_U8("graphics/pokemon/hydreigon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hydreigon[] = INCBIN_U8("graphics/pokemon/hydreigon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DEINO #if P_FAMILY_LARVESTA @@ -6962,14 +8270,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/back.4bpp.lz"); const u32 gMonShinyPalette_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/shiny.gbapal.lz"); const u8 gMonIcon_Larvesta[] = INCBIN_U8("graphics/pokemon/larvesta/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Larvesta[] = INCBIN_U8("graphics/pokemon/larvesta/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/anim_front.4bpp.lz"); const u32 gMonPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/normal.gbapal.lz"); const u32 gMonBackPic_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/back.4bpp.lz"); const u32 gMonShinyPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/shiny.gbapal.lz"); const u8 gMonIcon_Volcarona[] = INCBIN_U8("graphics/pokemon/volcarona/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Volcarona[] = INCBIN_U8("graphics/pokemon/volcarona/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_LARVESTA #if P_FAMILY_COBALION @@ -6978,7 +8290,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/back.4bpp.lz"); const u32 gMonShinyPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/shiny.gbapal.lz"); const u8 gMonIcon_Cobalion[] = INCBIN_U8("graphics/pokemon/cobalion/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cobalion[] = INCBIN_U8("graphics/pokemon/cobalion/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_COBALION #if P_FAMILY_TERRAKION @@ -6987,7 +8301,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/back.4bpp.lz"); const u32 gMonShinyPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/shiny.gbapal.lz"); const u8 gMonIcon_Terrakion[] = INCBIN_U8("graphics/pokemon/terrakion/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Terrakion[] = INCBIN_U8("graphics/pokemon/terrakion/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TERRAKION #if P_FAMILY_VIRIZION @@ -6996,7 +8312,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/back.4bpp.lz"); const u32 gMonShinyPalette_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/shiny.gbapal.lz"); const u8 gMonIcon_Virizion[] = INCBIN_U8("graphics/pokemon/virizion/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Virizion[] = INCBIN_U8("graphics/pokemon/virizion/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_VIRIZION #if P_FAMILY_TORNADUS @@ -7005,7 +8323,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/back.4bpp.lz"); const u32 gMonShinyPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/shiny.gbapal.lz"); const u8 gMonIcon_TornadusIncarnate[] = INCBIN_U8("graphics/pokemon/tornadus/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tornadus[] = INCBIN_U8("graphics/pokemon/tornadus/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/anim_front.4bpp.lz"); const u32 gMonPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/normal.gbapal.lz"); @@ -7020,7 +8340,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/back.4bpp.lz"); const u32 gMonShinyPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/shiny.gbapal.lz"); const u8 gMonIcon_ThundurusIncarnate[] = INCBIN_U8("graphics/pokemon/thundurus/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Thundurus[] = INCBIN_U8("graphics/pokemon/thundurus/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/anim_front.4bpp.lz"); const u32 gMonPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/normal.gbapal.lz"); @@ -7035,7 +8357,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/back.4bpp.lz"); const u32 gMonShinyPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/shiny.gbapal.lz"); const u8 gMonIcon_Reshiram[] = INCBIN_U8("graphics/pokemon/reshiram/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Reshiram[] = INCBIN_U8("graphics/pokemon/reshiram/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_RESHIRAM #if P_FAMILY_ZEKROM @@ -7044,7 +8368,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/back.4bpp.lz"); const u32 gMonShinyPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/shiny.gbapal.lz"); const u8 gMonIcon_Zekrom[] = INCBIN_U8("graphics/pokemon/zekrom/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Zekrom[] = INCBIN_U8("graphics/pokemon/zekrom/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ZEKROM #if P_FAMILY_LANDORUS @@ -7053,7 +8379,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/back.4bpp.lz"); const u32 gMonShinyPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/shiny.gbapal.lz"); const u8 gMonIcon_LandorusIncarnate[] = INCBIN_U8("graphics/pokemon/landorus/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Landorus[] = INCBIN_U8("graphics/pokemon/landorus/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/anim_front.4bpp.lz"); const u32 gMonPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/normal.gbapal.lz"); @@ -7068,7 +8396,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz"); const u32 gMonShinyPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz"); const u8 gMonIcon_EnamorusIncarnate[] = INCBIN_U8("graphics/pokemon/enamorus/icon.4bpp"); +#if P_FOOTPRINTS //const u8 gMonFootprint_Enamorus[] = INCBIN_U8("graphics/pokemon/enamorus/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/front.4bpp.lz"); const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/normal.gbapal.lz"); @@ -7083,7 +8413,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/back.4bpp.lz"); const u32 gMonShinyPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/shiny.gbapal.lz"); const u8 gMonIcon_Kyurem[] = INCBIN_U8("graphics/pokemon/kyurem/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kyurem[] = INCBIN_U8("graphics/pokemon/kyurem/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_FUSION_FORMS const u32 gMonFrontPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/anim_front.4bpp.lz"); @@ -7106,7 +8438,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/back.4bpp.lz"); const u32 gMonShinyPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/shiny.gbapal.lz"); const u8 gMonIcon_KeldeoOrdinary[] = INCBIN_U8("graphics/pokemon/keldeo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Keldeo[] = INCBIN_U8("graphics/pokemon/keldeo/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/front.4bpp.lz"); const u32 gMonPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/normal.gbapal.lz"); @@ -7121,7 +8455,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/back.4bpp.lz"); const u32 gMonShinyPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/shiny.gbapal.lz"); const u8 gMonIcon_MeloettaAria[] = INCBIN_U8("graphics/pokemon/meloetta/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Meloetta[] = INCBIN_U8("graphics/pokemon/meloetta/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/front.4bpp.lz"); const u32 gMonPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/normal.gbapal.lz"); @@ -7136,7 +8472,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/back.4bpp.lz"); const u32 gMonShinyPalette_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/shiny.gbapal.lz"); const u8 gMonIcon_Genesect[] = INCBIN_U8("graphics/pokemon/genesect/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Genesect[] = INCBIN_U8("graphics/pokemon/genesect/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonPalette_GenesectDouseDrive[] = INCBIN_U32("graphics/pokemon/genesect/douse_drive/normal.gbapal.lz"); const u32 gMonShinyPalette_GenesectDouseDrive[] = INCBIN_U32("graphics/pokemon/genesect/douse_drive/shiny.gbapal.lz"); @@ -7157,21 +8495,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/back.4bpp.lz"); const u32 gMonShinyPalette_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/shiny.gbapal.lz"); const u8 gMonIcon_Chespin[] = INCBIN_U8("graphics/pokemon/chespin/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Chespin[] = INCBIN_U8("graphics/pokemon/chespin/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/anim_front.4bpp.lz"); const u32 gMonPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/normal.gbapal.lz"); const u32 gMonBackPic_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/back.4bpp.lz"); const u32 gMonShinyPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/shiny.gbapal.lz"); const u8 gMonIcon_Quilladin[] = INCBIN_U8("graphics/pokemon/quilladin/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Quilladin[] = INCBIN_U8("graphics/pokemon/quilladin/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/anim_front.4bpp.lz"); const u32 gMonPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/normal.gbapal.lz"); const u32 gMonBackPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/back.4bpp.lz"); const u32 gMonShinyPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/shiny.gbapal.lz"); const u8 gMonIcon_Chesnaught[] = INCBIN_U8("graphics/pokemon/chesnaught/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Chesnaught[] = INCBIN_U8("graphics/pokemon/chesnaught/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CHESPIN #if P_FAMILY_FENNEKIN @@ -7180,21 +8524,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/back.4bpp.lz"); const u32 gMonShinyPalette_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/shiny.gbapal.lz"); const u8 gMonIcon_Fennekin[] = INCBIN_U8("graphics/pokemon/fennekin/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Fennekin[] = INCBIN_U8("graphics/pokemon/fennekin/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/anim_front.4bpp.lz"); const u32 gMonPalette_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/normal.gbapal.lz"); const u32 gMonBackPic_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/back.4bpp.lz"); const u32 gMonShinyPalette_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/shiny.gbapal.lz"); const u8 gMonIcon_Braixen[] = INCBIN_U8("graphics/pokemon/braixen/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Braixen[] = INCBIN_U8("graphics/pokemon/braixen/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/anim_front.4bpp.lz"); const u32 gMonPalette_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/normal.gbapal.lz"); const u32 gMonBackPic_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/back.4bpp.lz"); const u32 gMonShinyPalette_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/shiny.gbapal.lz"); const u8 gMonIcon_Delphox[] = INCBIN_U8("graphics/pokemon/delphox/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Delphox[] = INCBIN_U8("graphics/pokemon/delphox/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_FENNEKIN #if P_FAMILY_FROAKIE @@ -7203,21 +8553,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/back.4bpp.lz"); const u32 gMonShinyPalette_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/shiny.gbapal.lz"); const u8 gMonIcon_Froakie[] = INCBIN_U8("graphics/pokemon/froakie/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Froakie[] = INCBIN_U8("graphics/pokemon/froakie/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/anim_front.4bpp.lz"); const u32 gMonPalette_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/normal.gbapal.lz"); const u32 gMonBackPic_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/back.4bpp.lz"); const u32 gMonShinyPalette_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/shiny.gbapal.lz"); const u8 gMonIcon_Frogadier[] = INCBIN_U8("graphics/pokemon/frogadier/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Frogadier[] = INCBIN_U8("graphics/pokemon/frogadier/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/anim_front.4bpp.lz"); const u32 gMonPalette_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/normal.gbapal.lz"); const u32 gMonBackPic_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/back.4bpp.lz"); const u32 gMonShinyPalette_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/shiny.gbapal.lz"); const u8 gMonIcon_Greninja[] = INCBIN_U8("graphics/pokemon/greninja/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Greninja[] = INCBIN_U8("graphics/pokemon/greninja/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/anim_front.4bpp.lz"); const u32 gMonPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/normal.gbapal.lz"); @@ -7232,14 +8588,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/back.4bpp.lz"); const u32 gMonShinyPalette_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/shiny.gbapal.lz"); const u8 gMonIcon_Bunnelby[] = INCBIN_U8("graphics/pokemon/bunnelby/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bunnelby[] = INCBIN_U8("graphics/pokemon/bunnelby/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/anim_front.4bpp.lz"); const u32 gMonPalette_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/normal.gbapal.lz"); const u32 gMonBackPic_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/back.4bpp.lz"); const u32 gMonShinyPalette_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/shiny.gbapal.lz"); const u8 gMonIcon_Diggersby[] = INCBIN_U8("graphics/pokemon/diggersby/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Diggersby[] = INCBIN_U8("graphics/pokemon/diggersby/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BUNNELBY #if P_FAMILY_FLETCHLING @@ -7248,21 +8608,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/back.4bpp.lz"); const u32 gMonShinyPalette_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/shiny.gbapal.lz"); const u8 gMonIcon_Fletchling[] = INCBIN_U8("graphics/pokemon/fletchling/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Fletchling[] = INCBIN_U8("graphics/pokemon/fletchling/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/anim_front.4bpp.lz"); const u32 gMonPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/normal.gbapal.lz"); const u32 gMonBackPic_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/back.4bpp.lz"); const u32 gMonShinyPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/shiny.gbapal.lz"); const u8 gMonIcon_Fletchinder[] = INCBIN_U8("graphics/pokemon/fletchinder/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Fletchinder[] = INCBIN_U8("graphics/pokemon/fletchinder/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/anim_front.4bpp.lz"); const u32 gMonPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/normal.gbapal.lz"); const u32 gMonBackPic_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/back.4bpp.lz"); const u32 gMonShinyPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/shiny.gbapal.lz"); const u8 gMonIcon_Talonflame[] = INCBIN_U8("graphics/pokemon/talonflame/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Talonflame[] = INCBIN_U8("graphics/pokemon/talonflame/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_FLETCHLING #if P_FAMILY_SCATTERBUG @@ -7271,21 +8637,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/back.4bpp.lz"); const u32 gMonShinyPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/shiny.gbapal.lz"); const u8 gMonIcon_Scatterbug[] = INCBIN_U8("graphics/pokemon/scatterbug/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Scatterbug[] = INCBIN_U8("graphics/pokemon/scatterbug/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/anim_front.4bpp.lz"); const u32 gMonPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/normal.gbapal.lz"); const u32 gMonBackPic_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/back.4bpp.lz"); const u32 gMonShinyPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/shiny.gbapal.lz"); const u8 gMonIcon_Spewpa[] = INCBIN_U8("graphics/pokemon/spewpa/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Spewpa[] = INCBIN_U8("graphics/pokemon/spewpa/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/anim_front.4bpp.lz"); const u32 gMonPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/normal.gbapal.lz"); const u32 gMonBackPic_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/back.4bpp.lz"); const u32 gMonShinyPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/shiny.gbapal.lz"); const u8 gMonIcon_VivillonIcySnow[] = INCBIN_U8("graphics/pokemon/vivillon/meadow/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Vivillon[] = INCBIN_U8("graphics/pokemon/vivillon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/anim_front.4bpp.lz"); const u32 gMonPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/normal.gbapal.lz"); @@ -7408,14 +8780,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/back.4bpp.lz"); const u32 gMonShinyPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/shiny.gbapal.lz"); const u8 gMonIcon_Litleo[] = INCBIN_U8("graphics/pokemon/litleo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Litleo[] = INCBIN_U8("graphics/pokemon/litleo/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/anim_front.4bpp.lz"); const u32 gMonPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/normal.gbapal.lz"); const u32 gMonBackPic_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/back.4bpp.lz"); const u32 gMonShinyPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/shiny.gbapal.lz"); const u8 gMonIcon_Pyroar[] = INCBIN_U8("graphics/pokemon/pyroar/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pyroar[] = INCBIN_U8("graphics/pokemon/pyroar/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/anim_frontf.4bpp.lz"); const u32 gMonBackPic_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/backf.4bpp.lz"); @@ -7425,7 +8801,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar #if P_FAMILY_FLABEBE const u32 gMonFrontPic_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/anim_front.4bpp.lz"); const u32 gMonBackPic_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/back.4bpp.lz"); +#if P_FOOTPRINTS const u8 gMonFootprint_Flabebe[] = INCBIN_U8("graphics/pokemon/flabebe/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/flabebe/normal.gbapal.lz"); const u32 gMonShinyPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/flabebe/shiny.gbapal.lz"); @@ -7449,7 +8827,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonFrontPic_Floette[] = INCBIN_U32("graphics/pokemon/floette/anim_front.4bpp.lz"); const u32 gMonBackPic_Floette[] = INCBIN_U32("graphics/pokemon/floette/back.4bpp.lz"); +#if P_FOOTPRINTS const u8 gMonFootprint_Floette[] = INCBIN_U8("graphics/pokemon/floette/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/floette/normal.gbapal.lz"); const u32 gMonShinyPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/floette/shiny.gbapal.lz"); @@ -7479,7 +8859,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonFrontPic_Florges[] = INCBIN_U32("graphics/pokemon/florges/anim_front.4bpp.lz"); const u32 gMonBackPic_Florges[] = INCBIN_U32("graphics/pokemon/florges/back.4bpp.lz"); +#if P_FOOTPRINTS const u8 gMonFootprint_Florges[] = INCBIN_U8("graphics/pokemon/florges/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/florges/normal.gbapal.lz"); const u32 gMonShinyPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/florges/shiny.gbapal.lz"); @@ -7508,14 +8890,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/back.4bpp.lz"); const u32 gMonShinyPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/shiny.gbapal.lz"); const u8 gMonIcon_Skiddo[] = INCBIN_U8("graphics/pokemon/skiddo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Skiddo[] = INCBIN_U8("graphics/pokemon/skiddo/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/anim_front.4bpp.lz"); const u32 gMonPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/normal.gbapal.lz"); const u32 gMonBackPic_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/back.4bpp.lz"); const u32 gMonShinyPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/shiny.gbapal.lz"); const u8 gMonIcon_Gogoat[] = INCBIN_U8("graphics/pokemon/gogoat/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gogoat[] = INCBIN_U8("graphics/pokemon/gogoat/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SKIDDO #if P_FAMILY_PANCHAM @@ -7524,14 +8910,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/back.4bpp.lz"); const u32 gMonShinyPalette_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/shiny.gbapal.lz"); const u8 gMonIcon_Pancham[] = INCBIN_U8("graphics/pokemon/pancham/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pancham[] = INCBIN_U8("graphics/pokemon/pancham/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/anim_front.4bpp.lz"); const u32 gMonPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/normal.gbapal.lz"); const u32 gMonBackPic_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/back.4bpp.lz"); const u32 gMonShinyPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/shiny.gbapal.lz"); const u8 gMonIcon_Pangoro[] = INCBIN_U8("graphics/pokemon/pangoro/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pangoro[] = INCBIN_U8("graphics/pokemon/pangoro/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PANCHAM #if P_FAMILY_FURFROU @@ -7540,7 +8930,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/back.4bpp.lz"); const u32 gMonShinyPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/shiny.gbapal.lz"); const u8 gMonIcon_FurfrouNatural[] = INCBIN_U8("graphics/pokemon/furfrou/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Furfrou[] = INCBIN_U8("graphics/pokemon/furfrou/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/anim_front.4bpp.lz"); const u32 gMonPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/normal.gbapal.lz"); @@ -7603,14 +8995,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/back.4bpp.lz"); const u32 gMonShinyPalette_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/shiny.gbapal.lz"); const u8 gMonIcon_Espurr[] = INCBIN_U8("graphics/pokemon/espurr/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Espurr[] = INCBIN_U8("graphics/pokemon/espurr/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/anim_front.4bpp.lz"); const u32 gMonPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/normal.gbapal.lz"); const u32 gMonBackPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/back.4bpp.lz"); const u32 gMonShinyPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/shiny.gbapal.lz"); const u8 gMonIcon_MeowsticMale[] = INCBIN_U8("graphics/pokemon/meowstic/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Meowstic[] = INCBIN_U8("graphics/pokemon/meowstic/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/anim_front.4bpp.lz"); const u32 gMonPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/normal.gbapal.lz"); @@ -7625,21 +9021,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/back.4bpp.lz"); const u32 gMonShinyPalette_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/shiny.gbapal.lz"); const u8 gMonIcon_Honedge[] = INCBIN_U8("graphics/pokemon/honedge/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Honedge[] = INCBIN_U8("graphics/pokemon/honedge/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/anim_front.4bpp.lz"); const u32 gMonPalette_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/normal.gbapal.lz"); const u32 gMonBackPic_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/back.4bpp.lz"); const u32 gMonShinyPalette_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/shiny.gbapal.lz"); const u8 gMonIcon_Doublade[] = INCBIN_U8("graphics/pokemon/doublade/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Doublade[] = INCBIN_U8("graphics/pokemon/doublade/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/anim_front.4bpp.lz"); const u32 gMonPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/normal.gbapal.lz"); const u32 gMonBackPic_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/back.4bpp.lz"); const u32 gMonShinyPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/shiny.gbapal.lz"); const u8 gMonIcon_AegislashShield[] = INCBIN_U8("graphics/pokemon/aegislash/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Aegislash[] = INCBIN_U8("graphics/pokemon/aegislash/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/anim_front.4bpp.lz"); const u32 gMonPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/normal.gbapal.lz"); @@ -7654,14 +9056,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/back.4bpp.lz"); const u32 gMonShinyPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/shiny.gbapal.lz"); const u8 gMonIcon_Spritzee[] = INCBIN_U8("graphics/pokemon/spritzee/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Spritzee[] = INCBIN_U8("graphics/pokemon/spritzee/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/anim_front.4bpp.lz"); const u32 gMonPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/normal.gbapal.lz"); const u32 gMonBackPic_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/back.4bpp.lz"); const u32 gMonShinyPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/shiny.gbapal.lz"); const u8 gMonIcon_Aromatisse[] = INCBIN_U8("graphics/pokemon/aromatisse/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Aromatisse[] = INCBIN_U8("graphics/pokemon/aromatisse/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SPRITZEE #if P_FAMILY_SWIRLIX @@ -7670,14 +9076,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/back.4bpp.lz"); const u32 gMonShinyPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/shiny.gbapal.lz"); const u8 gMonIcon_Swirlix[] = INCBIN_U8("graphics/pokemon/swirlix/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Swirlix[] = INCBIN_U8("graphics/pokemon/swirlix/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/anim_front.4bpp.lz"); const u32 gMonPalette_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/normal.gbapal.lz"); const u32 gMonBackPic_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/back.4bpp.lz"); const u32 gMonShinyPalette_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/shiny.gbapal.lz"); const u8 gMonIcon_Slurpuff[] = INCBIN_U8("graphics/pokemon/slurpuff/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Slurpuff[] = INCBIN_U8("graphics/pokemon/slurpuff/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SWIRLIX #if P_FAMILY_INKAY @@ -7686,14 +9096,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/back.4bpp.lz"); const u32 gMonShinyPalette_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/shiny.gbapal.lz"); const u8 gMonIcon_Inkay[] = INCBIN_U8("graphics/pokemon/inkay/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Inkay[] = INCBIN_U8("graphics/pokemon/inkay/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/anim_front.4bpp.lz"); const u32 gMonPalette_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/normal.gbapal.lz"); const u32 gMonBackPic_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/back.4bpp.lz"); const u32 gMonShinyPalette_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/shiny.gbapal.lz"); const u8 gMonIcon_Malamar[] = INCBIN_U8("graphics/pokemon/malamar/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Malamar[] = INCBIN_U8("graphics/pokemon/malamar/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_INKAY #if P_FAMILY_BINACLE @@ -7702,14 +9116,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/back.4bpp.lz"); const u32 gMonShinyPalette_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/shiny.gbapal.lz"); const u8 gMonIcon_Binacle[] = INCBIN_U8("graphics/pokemon/binacle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Binacle[] = INCBIN_U8("graphics/pokemon/binacle/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/anim_front.4bpp.lz"); const u32 gMonPalette_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/normal.gbapal.lz"); const u32 gMonBackPic_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/back.4bpp.lz"); const u32 gMonShinyPalette_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/shiny.gbapal.lz"); const u8 gMonIcon_Barbaracle[] = INCBIN_U8("graphics/pokemon/barbaracle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Barbaracle[] = INCBIN_U8("graphics/pokemon/barbaracle/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BINACLE #if P_FAMILY_SKRELP @@ -7718,14 +9136,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/back.4bpp.lz"); const u32 gMonShinyPalette_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/shiny.gbapal.lz"); const u8 gMonIcon_Skrelp[] = INCBIN_U8("graphics/pokemon/skrelp/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Skrelp[] = INCBIN_U8("graphics/pokemon/skrelp/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/anim_front.4bpp.lz"); const u32 gMonPalette_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/normal.gbapal.lz"); const u32 gMonBackPic_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/back.4bpp.lz"); const u32 gMonShinyPalette_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/shiny.gbapal.lz"); const u8 gMonIcon_Dragalge[] = INCBIN_U8("graphics/pokemon/dragalge/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dragalge[] = INCBIN_U8("graphics/pokemon/dragalge/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SKRELP #if P_FAMILY_CLAUNCHER @@ -7734,14 +9156,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/back.4bpp.lz"); const u32 gMonShinyPalette_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/shiny.gbapal.lz"); const u8 gMonIcon_Clauncher[] = INCBIN_U8("graphics/pokemon/clauncher/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Clauncher[] = INCBIN_U8("graphics/pokemon/clauncher/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/anim_front.4bpp.lz"); const u32 gMonPalette_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/normal.gbapal.lz"); const u32 gMonBackPic_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/back.4bpp.lz"); const u32 gMonShinyPalette_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/shiny.gbapal.lz"); const u8 gMonIcon_Clawitzer[] = INCBIN_U8("graphics/pokemon/clawitzer/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Clawitzer[] = INCBIN_U8("graphics/pokemon/clawitzer/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CLAUNCHER #if P_FAMILY_HELIOPTILE @@ -7750,14 +9176,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/back.4bpp.lz"); const u32 gMonShinyPalette_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/shiny.gbapal.lz"); const u8 gMonIcon_Helioptile[] = INCBIN_U8("graphics/pokemon/helioptile/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Helioptile[] = INCBIN_U8("graphics/pokemon/helioptile/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/anim_front.4bpp.lz"); const u32 gMonPalette_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/normal.gbapal.lz"); const u32 gMonBackPic_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/back.4bpp.lz"); const u32 gMonShinyPalette_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/shiny.gbapal.lz"); const u8 gMonIcon_Heliolisk[] = INCBIN_U8("graphics/pokemon/heliolisk/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Heliolisk[] = INCBIN_U8("graphics/pokemon/heliolisk/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_HELIOPTILE #if P_FAMILY_TYRUNT @@ -7766,14 +9196,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/back.4bpp.lz"); const u32 gMonShinyPalette_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/shiny.gbapal.lz"); const u8 gMonIcon_Tyrunt[] = INCBIN_U8("graphics/pokemon/tyrunt/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tyrunt[] = INCBIN_U8("graphics/pokemon/tyrunt/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/anim_front.4bpp.lz"); const u32 gMonPalette_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/normal.gbapal.lz"); const u32 gMonBackPic_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/back.4bpp.lz"); const u32 gMonShinyPalette_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/shiny.gbapal.lz"); const u8 gMonIcon_Tyrantrum[] = INCBIN_U8("graphics/pokemon/tyrantrum/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tyrantrum[] = INCBIN_U8("graphics/pokemon/tyrantrum/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TYRUNT #if P_FAMILY_AMAURA @@ -7782,14 +9216,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/back.4bpp.lz"); const u32 gMonShinyPalette_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/shiny.gbapal.lz"); const u8 gMonIcon_Amaura[] = INCBIN_U8("graphics/pokemon/amaura/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Amaura[] = INCBIN_U8("graphics/pokemon/amaura/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/anim_front.4bpp.lz"); const u32 gMonPalette_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/normal.gbapal.lz"); const u32 gMonBackPic_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/back.4bpp.lz"); const u32 gMonShinyPalette_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/shiny.gbapal.lz"); const u8 gMonIcon_Aurorus[] = INCBIN_U8("graphics/pokemon/aurorus/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Aurorus[] = INCBIN_U8("graphics/pokemon/aurorus/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_AMAURA #if P_FAMILY_HAWLUCHA @@ -7798,7 +9236,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/back.4bpp.lz"); const u32 gMonShinyPalette_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/shiny.gbapal.lz"); const u8 gMonIcon_Hawlucha[] = INCBIN_U8("graphics/pokemon/hawlucha/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hawlucha[] = INCBIN_U8("graphics/pokemon/hawlucha/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_HAWLUCHA #if P_FAMILY_DEDENNE @@ -7807,7 +9247,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/back.4bpp.lz"); const u32 gMonShinyPalette_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/shiny.gbapal.lz"); const u8 gMonIcon_Dedenne[] = INCBIN_U8("graphics/pokemon/dedenne/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dedenne[] = INCBIN_U8("graphics/pokemon/dedenne/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DEDENNE #if P_FAMILY_CARBINK @@ -7816,7 +9258,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/back.4bpp.lz"); const u32 gMonShinyPalette_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/shiny.gbapal.lz"); const u8 gMonIcon_Carbink[] = INCBIN_U8("graphics/pokemon/carbink/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Carbink[] = INCBIN_U8("graphics/pokemon/carbink/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CARBINK #if P_FAMILY_GOOMY @@ -7825,14 +9269,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/back.4bpp.lz"); const u32 gMonShinyPalette_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/shiny.gbapal.lz"); const u8 gMonIcon_Goomy[] = INCBIN_U8("graphics/pokemon/goomy/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Goomy[] = INCBIN_U8("graphics/pokemon/goomy/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/anim_front.4bpp.lz"); const u32 gMonPalette_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/normal.gbapal.lz"); const u32 gMonBackPic_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/back.4bpp.lz"); const u32 gMonShinyPalette_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/shiny.gbapal.lz"); const u8 gMonIcon_Sliggoo[] = INCBIN_U8("graphics/pokemon/sliggoo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sliggoo[] = INCBIN_U8("graphics/pokemon/sliggoo/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/front.4bpp.lz"); @@ -7847,7 +9295,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/back.4bpp.lz"); const u32 gMonShinyPalette_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/shiny.gbapal.lz"); const u8 gMonIcon_Goodra[] = INCBIN_U8("graphics/pokemon/goodra/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Goodra[] = INCBIN_U8("graphics/pokemon/goodra/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/front.4bpp.lz"); @@ -7864,7 +9314,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/back.4bpp.lz"); const u32 gMonShinyPalette_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/shiny.gbapal.lz"); const u8 gMonIcon_Klefki[] = INCBIN_U8("graphics/pokemon/klefki/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Klefki[] = INCBIN_U8("graphics/pokemon/klefki/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_KLEFKI #if P_FAMILY_PHANTUMP @@ -7873,21 +9325,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/back.4bpp.lz"); const u32 gMonShinyPalette_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/shiny.gbapal.lz"); const u8 gMonIcon_Phantump[] = INCBIN_U8("graphics/pokemon/phantump/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Phantump[] = INCBIN_U8("graphics/pokemon/phantump/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/anim_front.4bpp.lz"); const u32 gMonPalette_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/normal.gbapal.lz"); const u32 gMonBackPic_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/back.4bpp.lz"); const u32 gMonShinyPalette_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/shiny.gbapal.lz"); const u8 gMonIcon_Trevenant[] = INCBIN_U8("graphics/pokemon/trevenant/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Trevenant[] = INCBIN_U8("graphics/pokemon/trevenant/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PHANTUMP #if P_FAMILY_PUMPKABOO const u32 gMonPalette_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/pumpkaboo/normal.gbapal.lz"); const u32 gMonShinyPalette_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/pumpkaboo/shiny.gbapal.lz"); const u8 gMonIcon_Pumpkaboo[] = INCBIN_U8("graphics/pokemon/pumpkaboo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pumpkaboo[] = INCBIN_U8("graphics/pokemon/pumpkaboo/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_PumpkabooAverage[] = INCBIN_U32("graphics/pokemon/pumpkaboo/anim_front.4bpp.lz"); const u32 gMonBackPic_PumpkabooAverage[] = INCBIN_U32("graphics/pokemon/pumpkaboo/back.4bpp.lz"); @@ -7904,7 +9362,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/normal.gbapal.lz"); const u32 gMonShinyPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/shiny.gbapal.lz"); const u8 gMonIcon_Gourgeist[] = INCBIN_U8("graphics/pokemon/gourgeist/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gourgeist[] = INCBIN_U8("graphics/pokemon/gourgeist/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GourgeistAverage[] = INCBIN_U32("graphics/pokemon/gourgeist/anim_front.4bpp.lz"); const u32 gMonBackPic_GourgeistAverage[] = INCBIN_U32("graphics/pokemon/gourgeist/back.4bpp.lz"); @@ -7925,14 +9385,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/back.4bpp.lz"); const u32 gMonShinyPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/shiny.gbapal.lz"); const u8 gMonIcon_Bergmite[] = INCBIN_U8("graphics/pokemon/bergmite/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bergmite[] = INCBIN_U8("graphics/pokemon/bergmite/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/anim_front.4bpp.lz"); const u32 gMonPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/normal.gbapal.lz"); const u32 gMonBackPic_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/back.4bpp.lz"); const u32 gMonShinyPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/shiny.gbapal.lz"); const u8 gMonIcon_Avalugg[] = INCBIN_U8("graphics/pokemon/avalugg/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Avalugg[] = INCBIN_U8("graphics/pokemon/avalugg/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/front.4bpp.lz"); @@ -7949,14 +9413,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/back.4bpp.lz"); const u32 gMonShinyPalette_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/shiny.gbapal.lz"); const u8 gMonIcon_Noibat[] = INCBIN_U8("graphics/pokemon/noibat/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Noibat[] = INCBIN_U8("graphics/pokemon/noibat/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/anim_front.4bpp.lz"); const u32 gMonPalette_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/normal.gbapal.lz"); const u32 gMonBackPic_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/back.4bpp.lz"); const u32 gMonShinyPalette_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/shiny.gbapal.lz"); const u8 gMonIcon_Noivern[] = INCBIN_U8("graphics/pokemon/noivern/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Noivern[] = INCBIN_U8("graphics/pokemon/noivern/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_NOIBAT #if P_FAMILY_XERNEAS @@ -7965,7 +9433,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/back.4bpp.lz"); const u32 gMonShinyPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/shiny.gbapal.lz"); const u8 gMonIcon_XerneasNeutral[] = INCBIN_U8("graphics/pokemon/xerneas/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Xerneas[] = INCBIN_U8("graphics/pokemon/xerneas/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/anim_front.4bpp.lz"); const u32 gMonPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/normal.gbapal.lz"); @@ -7980,7 +9450,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/back.4bpp.lz"); const u32 gMonShinyPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/shiny.gbapal.lz"); const u8 gMonIcon_Yveltal[] = INCBIN_U8("graphics/pokemon/yveltal/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Yveltal[] = INCBIN_U8("graphics/pokemon/yveltal/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_YVELTAL #if P_FAMILY_ZYGARDE @@ -7989,7 +9461,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/back.4bpp.lz"); const u32 gMonShinyPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/shiny.gbapal.lz"); const u8 gMonIcon_Zygarde50[] = INCBIN_U8("graphics/pokemon/zygarde/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Zygarde[] = INCBIN_U8("graphics/pokemon/zygarde/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/anim_front.4bpp.lz"); const u32 gMonPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/normal.gbapal.lz"); @@ -8010,7 +9484,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/back.4bpp.lz"); const u32 gMonShinyPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/shiny.gbapal.lz"); const u8 gMonIcon_Diancie[] = INCBIN_U8("graphics/pokemon/diancie/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Diancie[] = INCBIN_U8("graphics/pokemon/diancie/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/front.4bpp.lz"); @@ -8027,7 +9503,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/back.4bpp.lz"); const u32 gMonShinyPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/shiny.gbapal.lz"); const u8 gMonIcon_HoopaConfined[] = INCBIN_U8("graphics/pokemon/hoopa/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hoopa[] = INCBIN_U8("graphics/pokemon/hoopa/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/anim_front.4bpp.lz"); const u32 gMonPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/normal.gbapal.lz"); @@ -8042,7 +9520,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/back.4bpp.lz"); const u32 gMonShinyPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/shiny.gbapal.lz"); const u8 gMonIcon_Volcanion[] = INCBIN_U8("graphics/pokemon/volcanion/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Volcanion[] = INCBIN_U8("graphics/pokemon/volcanion/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_VOLCANION #if P_FAMILY_ROWLET @@ -8051,21 +9531,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/back.4bpp.lz"); const u32 gMonShinyPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/shiny.gbapal.lz"); const u8 gMonIcon_Rowlet[] = INCBIN_U8("graphics/pokemon/rowlet/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Rowlet[] = INCBIN_U8("graphics/pokemon/rowlet/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/anim_front.4bpp.lz"); const u32 gMonPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/normal.gbapal.lz"); const u32 gMonBackPic_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/back.4bpp.lz"); const u32 gMonShinyPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/shiny.gbapal.lz"); const u8 gMonIcon_Dartrix[] = INCBIN_U8("graphics/pokemon/dartrix/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dartrix[] = INCBIN_U8("graphics/pokemon/dartrix/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/anim_front.4bpp.lz"); const u32 gMonPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/normal.gbapal.lz"); const u32 gMonBackPic_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/back.4bpp.lz"); const u32 gMonShinyPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/shiny.gbapal.lz"); const u8 gMonIcon_Decidueye[] = INCBIN_U8("graphics/pokemon/decidueye/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Decidueye[] = INCBIN_U8("graphics/pokemon/decidueye/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/front.4bpp.lz"); @@ -8082,21 +9568,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Litten[] = INCBIN_U32("graphics/pokemon/litten/back.4bpp.lz"); const u32 gMonShinyPalette_Litten[] = INCBIN_U32("graphics/pokemon/litten/shiny.gbapal.lz"); const u8 gMonIcon_Litten[] = INCBIN_U8("graphics/pokemon/litten/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Litten[] = INCBIN_U8("graphics/pokemon/litten/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/front.4bpp.lz"); const u32 gMonPalette_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/normal.gbapal.lz"); const u32 gMonBackPic_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/back.4bpp.lz"); const u32 gMonShinyPalette_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/shiny.gbapal.lz"); const u8 gMonIcon_Torracat[] = INCBIN_U8("graphics/pokemon/torracat/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Torracat[] = INCBIN_U8("graphics/pokemon/torracat/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/front.4bpp.lz"); const u32 gMonPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/normal.gbapal.lz"); const u32 gMonBackPic_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/back.4bpp.lz"); const u32 gMonShinyPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/shiny.gbapal.lz"); const u8 gMonIcon_Incineroar[] = INCBIN_U8("graphics/pokemon/incineroar/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Incineroar[] = INCBIN_U8("graphics/pokemon/incineroar/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_LITTEN #if P_FAMILY_POPPLIO @@ -8105,21 +9597,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/back.4bpp.lz"); const u32 gMonShinyPalette_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/shiny.gbapal.lz"); const u8 gMonIcon_Popplio[] = INCBIN_U8("graphics/pokemon/popplio/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Popplio[] = INCBIN_U8("graphics/pokemon/popplio/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/front.4bpp.lz"); const u32 gMonPalette_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/normal.gbapal.lz"); const u32 gMonBackPic_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/back.4bpp.lz"); const u32 gMonShinyPalette_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/shiny.gbapal.lz"); const u8 gMonIcon_Brionne[] = INCBIN_U8("graphics/pokemon/brionne/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Brionne[] = INCBIN_U8("graphics/pokemon/brionne/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/front.4bpp.lz"); const u32 gMonPalette_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/normal.gbapal.lz"); const u32 gMonBackPic_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/back.4bpp.lz"); const u32 gMonShinyPalette_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/shiny.gbapal.lz"); const u8 gMonIcon_Primarina[] = INCBIN_U8("graphics/pokemon/primarina/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Primarina[] = INCBIN_U8("graphics/pokemon/primarina/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_POPPLIO #if P_FAMILY_PIKIPEK @@ -8128,21 +9626,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/back.4bpp.lz"); const u32 gMonShinyPalette_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/shiny.gbapal.lz"); const u8 gMonIcon_Pikipek[] = INCBIN_U8("graphics/pokemon/pikipek/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pikipek[] = INCBIN_U8("graphics/pokemon/pikipek/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/anim_front.4bpp.lz"); const u32 gMonPalette_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/normal.gbapal.lz"); const u32 gMonBackPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/back.4bpp.lz"); const u32 gMonShinyPalette_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/shiny.gbapal.lz"); const u8 gMonIcon_Trumbeak[] = INCBIN_U8("graphics/pokemon/trumbeak/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Trumbeak[] = INCBIN_U8("graphics/pokemon/trumbeak/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/anim_front.4bpp.lz"); const u32 gMonPalette_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/normal.gbapal.lz"); const u32 gMonBackPic_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/back.4bpp.lz"); const u32 gMonShinyPalette_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/shiny.gbapal.lz"); const u8 gMonIcon_Toucannon[] = INCBIN_U8("graphics/pokemon/toucannon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Toucannon[] = INCBIN_U8("graphics/pokemon/toucannon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PIKIPEK #if P_FAMILY_YUNGOOS @@ -8151,14 +9655,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/back.4bpp.lz"); const u32 gMonShinyPalette_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/shiny.gbapal.lz"); const u8 gMonIcon_Yungoos[] = INCBIN_U8("graphics/pokemon/yungoos/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Yungoos[] = INCBIN_U8("graphics/pokemon/yungoos/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/front.4bpp.lz"); const u32 gMonPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/normal.gbapal.lz"); const u32 gMonBackPic_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/back.4bpp.lz"); const u32 gMonShinyPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/shiny.gbapal.lz"); const u8 gMonIcon_Gumshoos[] = INCBIN_U8("graphics/pokemon/gumshoos/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gumshoos[] = INCBIN_U8("graphics/pokemon/gumshoos/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_YUNGOOS #if P_FAMILY_GRUBBIN @@ -8167,21 +9675,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/back.4bpp.lz"); const u32 gMonShinyPalette_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/shiny.gbapal.lz"); const u8 gMonIcon_Grubbin[] = INCBIN_U8("graphics/pokemon/grubbin/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Grubbin[] = INCBIN_U8("graphics/pokemon/grubbin/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/anim_front.4bpp.lz"); const u32 gMonPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/normal.gbapal.lz"); const u32 gMonBackPic_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/back.4bpp.lz"); const u32 gMonShinyPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/shiny.gbapal.lz"); const u8 gMonIcon_Charjabug[] = INCBIN_U8("graphics/pokemon/charjabug/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Charjabug[] = INCBIN_U8("graphics/pokemon/charjabug/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/anim_front.4bpp.lz"); const u32 gMonPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/normal.gbapal.lz"); const u32 gMonBackPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/back.4bpp.lz"); const u32 gMonShinyPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/shiny.gbapal.lz"); const u8 gMonIcon_Vikavolt[] = INCBIN_U8("graphics/pokemon/vikavolt/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Vikavolt[] = INCBIN_U8("graphics/pokemon/vikavolt/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_GRUBBIN #if P_FAMILY_CRABRAWLER @@ -8190,14 +9704,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/back.4bpp.lz"); const u32 gMonShinyPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/shiny.gbapal.lz"); const u8 gMonIcon_Crabrawler[] = INCBIN_U8("graphics/pokemon/crabrawler/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Crabrawler[] = INCBIN_U8("graphics/pokemon/crabrawler/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/front.4bpp.lz"); const u32 gMonPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/normal.gbapal.lz"); const u32 gMonBackPic_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/back.4bpp.lz"); const u32 gMonShinyPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/shiny.gbapal.lz"); const u8 gMonIcon_Crabominable[] = INCBIN_U8("graphics/pokemon/crabominable/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Crabominable[] = INCBIN_U8("graphics/pokemon/crabominable/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CRABRAWLER #if P_FAMILY_ORICORIO @@ -8206,7 +9724,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/back.4bpp.lz"); const u32 gMonShinyPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/shiny.gbapal.lz"); const u8 gMonIcon_OricorioBaile[] = INCBIN_U8("graphics/pokemon/oricorio/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Oricorio[] = INCBIN_U8("graphics/pokemon/oricorio/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/front.4bpp.lz"); const u32 gMonPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/normal.gbapal.lz"); @@ -8233,14 +9753,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/back.4bpp.lz"); const u32 gMonShinyPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/shiny.gbapal.lz"); const u8 gMonIcon_Cutiefly[] = INCBIN_U8("graphics/pokemon/cutiefly/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cutiefly[] = INCBIN_U8("graphics/pokemon/cutiefly/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/anim_front.4bpp.lz"); const u32 gMonPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/normal.gbapal.lz"); const u32 gMonBackPic_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/back.4bpp.lz"); const u32 gMonShinyPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/shiny.gbapal.lz"); const u8 gMonIcon_Ribombee[] = INCBIN_U8("graphics/pokemon/ribombee/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Ribombee[] = INCBIN_U8("graphics/pokemon/ribombee/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CUTIEFLY #if P_FAMILY_ROCKRUFF @@ -8249,14 +9773,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/back.4bpp.lz"); const u32 gMonShinyPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/shiny.gbapal.lz"); const u8 gMonIcon_Rockruff[] = INCBIN_U8("graphics/pokemon/rockruff/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Rockruff[] = INCBIN_U8("graphics/pokemon/rockruff/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/anim_front.4bpp.lz"); const u32 gMonPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/normal.gbapal.lz"); const u32 gMonBackPic_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/back.4bpp.lz"); const u32 gMonShinyPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/shiny.gbapal.lz"); const u8 gMonIcon_LycanrocMidday[] = INCBIN_U8("graphics/pokemon/lycanroc/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lycanroc[] = INCBIN_U8("graphics/pokemon/lycanroc/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/anim_front.4bpp.lz"); const u32 gMonPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/normal.gbapal.lz"); @@ -8277,7 +9805,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/back.4bpp.lz"); const u32 gMonShinyPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/shiny.gbapal.lz"); const u8 gMonIcon_WishiwashiSolo[] = INCBIN_U8("graphics/pokemon/wishiwashi/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Wishiwashi[] = INCBIN_U8("graphics/pokemon/wishiwashi/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/front.4bpp.lz"); const u32 gMonPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/normal.gbapal.lz"); @@ -8292,14 +9822,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/back.4bpp.lz"); const u32 gMonShinyPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/shiny.gbapal.lz"); const u8 gMonIcon_Mareanie[] = INCBIN_U8("graphics/pokemon/mareanie/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mareanie[] = INCBIN_U8("graphics/pokemon/mareanie/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/front.4bpp.lz"); const u32 gMonPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/normal.gbapal.lz"); const u32 gMonBackPic_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/back.4bpp.lz"); const u32 gMonShinyPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/shiny.gbapal.lz"); const u8 gMonIcon_Toxapex[] = INCBIN_U8("graphics/pokemon/toxapex/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Toxapex[] = INCBIN_U8("graphics/pokemon/toxapex/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MAREANIE #if P_FAMILY_MUDBRAY @@ -8308,14 +9842,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/back.4bpp.lz"); const u32 gMonShinyPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/shiny.gbapal.lz"); const u8 gMonIcon_Mudbray[] = INCBIN_U8("graphics/pokemon/mudbray/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mudbray[] = INCBIN_U8("graphics/pokemon/mudbray/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/front.4bpp.lz"); const u32 gMonPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/normal.gbapal.lz"); const u32 gMonBackPic_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/back.4bpp.lz"); const u32 gMonShinyPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/shiny.gbapal.lz"); const u8 gMonIcon_Mudsdale[] = INCBIN_U8("graphics/pokemon/mudsdale/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mudsdale[] = INCBIN_U8("graphics/pokemon/mudsdale/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MUDBRAY #if P_FAMILY_DEWPIDER @@ -8324,14 +9862,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/back.4bpp.lz"); const u32 gMonShinyPalette_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/shiny.gbapal.lz"); const u8 gMonIcon_Dewpider[] = INCBIN_U8("graphics/pokemon/dewpider/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dewpider[] = INCBIN_U8("graphics/pokemon/dewpider/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/anim_front.4bpp.lz"); const u32 gMonPalette_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/normal.gbapal.lz"); const u32 gMonBackPic_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/back.4bpp.lz"); const u32 gMonShinyPalette_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/shiny.gbapal.lz"); const u8 gMonIcon_Araquanid[] = INCBIN_U8("graphics/pokemon/araquanid/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Araquanid[] = INCBIN_U8("graphics/pokemon/araquanid/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DEWPIDER #if P_FAMILY_FOMANTIS @@ -8340,14 +9882,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/back.4bpp.lz"); const u32 gMonShinyPalette_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/shiny.gbapal.lz"); const u8 gMonIcon_Fomantis[] = INCBIN_U8("graphics/pokemon/fomantis/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Fomantis[] = INCBIN_U8("graphics/pokemon/fomantis/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/front.4bpp.lz"); const u32 gMonPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/normal.gbapal.lz"); const u32 gMonBackPic_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/back.4bpp.lz"); const u32 gMonShinyPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/shiny.gbapal.lz"); const u8 gMonIcon_Lurantis[] = INCBIN_U8("graphics/pokemon/lurantis/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lurantis[] = INCBIN_U8("graphics/pokemon/lurantis/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_FOMANTIS #if P_FAMILY_MORELULL @@ -8356,14 +9902,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/back.4bpp.lz"); const u32 gMonShinyPalette_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/shiny.gbapal.lz"); const u8 gMonIcon_Morelull[] = INCBIN_U8("graphics/pokemon/morelull/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Morelull[] = INCBIN_U8("graphics/pokemon/morelull/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/front.4bpp.lz"); const u32 gMonPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/normal.gbapal.lz"); const u32 gMonBackPic_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/back.4bpp.lz"); const u32 gMonShinyPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/shiny.gbapal.lz"); const u8 gMonIcon_Shiinotic[] = INCBIN_U8("graphics/pokemon/shiinotic/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Shiinotic[] = INCBIN_U8("graphics/pokemon/shiinotic/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MORELULL #if P_FAMILY_SALANDIT @@ -8372,14 +9922,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/back.4bpp.lz"); const u32 gMonShinyPalette_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/shiny.gbapal.lz"); const u8 gMonIcon_Salandit[] = INCBIN_U8("graphics/pokemon/salandit/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Salandit[] = INCBIN_U8("graphics/pokemon/salandit/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/anim_front.4bpp.lz"); const u32 gMonPalette_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/normal.gbapal.lz"); const u32 gMonBackPic_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/back.4bpp.lz"); const u32 gMonShinyPalette_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/shiny.gbapal.lz"); const u8 gMonIcon_Salazzle[] = INCBIN_U8("graphics/pokemon/salazzle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Salazzle[] = INCBIN_U8("graphics/pokemon/salazzle/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SALANDIT #if P_FAMILY_STUFFUL @@ -8388,14 +9942,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/back.4bpp.lz"); const u32 gMonShinyPalette_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/shiny.gbapal.lz"); const u8 gMonIcon_Stufful[] = INCBIN_U8("graphics/pokemon/stufful/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Stufful[] = INCBIN_U8("graphics/pokemon/stufful/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/anim_front.4bpp.lz"); const u32 gMonPalette_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/normal.gbapal.lz"); const u32 gMonBackPic_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/back.4bpp.lz"); const u32 gMonShinyPalette_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/shiny.gbapal.lz"); const u8 gMonIcon_Bewear[] = INCBIN_U8("graphics/pokemon/bewear/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bewear[] = INCBIN_U8("graphics/pokemon/bewear/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_STUFFUL #if P_FAMILY_BOUNSWEET @@ -8404,21 +9962,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/back.4bpp.lz"); const u32 gMonShinyPalette_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/shiny.gbapal.lz"); const u8 gMonIcon_Bounsweet[] = INCBIN_U8("graphics/pokemon/bounsweet/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bounsweet[] = INCBIN_U8("graphics/pokemon/bounsweet/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/front.4bpp.lz"); const u32 gMonPalette_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/normal.gbapal.lz"); const u32 gMonBackPic_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/back.4bpp.lz"); const u32 gMonShinyPalette_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/shiny.gbapal.lz"); const u8 gMonIcon_Steenee[] = INCBIN_U8("graphics/pokemon/steenee/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Steenee[] = INCBIN_U8("graphics/pokemon/steenee/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/front.4bpp.lz"); const u32 gMonPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/normal.gbapal.lz"); const u32 gMonBackPic_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/back.4bpp.lz"); const u32 gMonShinyPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/shiny.gbapal.lz"); const u8 gMonIcon_Tsareena[] = INCBIN_U8("graphics/pokemon/tsareena/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tsareena[] = INCBIN_U8("graphics/pokemon/tsareena/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BOUNSWEET #if P_FAMILY_COMFEY @@ -8427,7 +9991,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/back.4bpp.lz"); const u32 gMonShinyPalette_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/shiny.gbapal.lz"); const u8 gMonIcon_Comfey[] = INCBIN_U8("graphics/pokemon/comfey/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Comfey[] = INCBIN_U8("graphics/pokemon/comfey/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_COMFEY #if P_FAMILY_ORANGURU @@ -8436,7 +10002,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/back.4bpp.lz"); const u32 gMonShinyPalette_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/shiny.gbapal.lz"); const u8 gMonIcon_Oranguru[] = INCBIN_U8("graphics/pokemon/oranguru/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Oranguru[] = INCBIN_U8("graphics/pokemon/oranguru/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ORANGURU #if P_FAMILY_PASSIMIAN @@ -8445,7 +10013,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/back.4bpp.lz"); const u32 gMonShinyPalette_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/shiny.gbapal.lz"); const u8 gMonIcon_Passimian[] = INCBIN_U8("graphics/pokemon/passimian/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Passimian[] = INCBIN_U8("graphics/pokemon/passimian/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PASSIMIAN #if P_FAMILY_WIMPOD @@ -8454,14 +10024,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/back.4bpp.lz"); const u32 gMonShinyPalette_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/shiny.gbapal.lz"); const u8 gMonIcon_Wimpod[] = INCBIN_U8("graphics/pokemon/wimpod/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Wimpod[] = INCBIN_U8("graphics/pokemon/wimpod/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/anim_front.4bpp.lz"); const u32 gMonPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/normal.gbapal.lz"); const u32 gMonBackPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/back.4bpp.lz"); const u32 gMonShinyPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/shiny.gbapal.lz"); const u8 gMonIcon_Golisopod[] = INCBIN_U8("graphics/pokemon/golisopod/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Golisopod[] = INCBIN_U8("graphics/pokemon/golisopod/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_WIMPOD #if P_FAMILY_SANDYGAST @@ -8470,14 +10044,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/back.4bpp.lz"); const u32 gMonShinyPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/shiny.gbapal.lz"); const u8 gMonIcon_Sandygast[] = INCBIN_U8("graphics/pokemon/sandygast/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sandygast[] = INCBIN_U8("graphics/pokemon/sandygast/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/front.4bpp.lz"); const u32 gMonPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/normal.gbapal.lz"); const u32 gMonBackPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/back.4bpp.lz"); const u32 gMonShinyPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/shiny.gbapal.lz"); const u8 gMonIcon_Palossand[] = INCBIN_U8("graphics/pokemon/palossand/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Palossand[] = INCBIN_U8("graphics/pokemon/palossand/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SANDYGAST #if P_FAMILY_PYUKUMUKU @@ -8486,7 +10064,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/back.4bpp.lz"); const u32 gMonShinyPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/shiny.gbapal.lz"); const u8 gMonIcon_Pyukumuku[] = INCBIN_U8("graphics/pokemon/pyukumuku/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pyukumuku[] = INCBIN_U8("graphics/pokemon/pyukumuku/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PYUKUMUKU #if P_FAMILY_TYPE_NULL @@ -8495,12 +10075,16 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/back.4bpp.lz"); const u32 gMonShinyPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/shiny.gbapal.lz"); const u8 gMonIcon_TypeNull[] = INCBIN_U8("graphics/pokemon/type_null/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Type_Null[] = INCBIN_U8("graphics/pokemon/type_null/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/front.4bpp.lz"); const u32 gMonBackPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/back.4bpp.lz"); const u8 gMonIcon_Silvally[] = INCBIN_U8("graphics/pokemon/silvally/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Silvally[] = INCBIN_U8("graphics/pokemon/silvally/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonPalette_SilvallyNormal[] = INCBIN_U32("graphics/pokemon/silvally/normal.gbapal.lz"); const u32 gMonShinyPalette_SilvallyNormal[] = INCBIN_U32("graphics/pokemon/silvally/shiny.gbapal.lz"); @@ -8563,7 +10147,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/back.4bpp.lz"); const u32 gMonShinyPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/shiny.gbapal.lz"); const u8 gMonIcon_MiniorMeteor[] = INCBIN_U8("graphics/pokemon/minior/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Minior[] = INCBIN_U8("graphics/pokemon/minior/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MiniorCore[] = INCBIN_U32("graphics/pokemon/minior/core/front.4bpp.lz"); const u32 gMonBackPic_MiniorCore[] = INCBIN_U32("graphics/pokemon/minior/core/back.4bpp.lz"); @@ -8597,7 +10183,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/back.4bpp.lz"); const u32 gMonShinyPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/shiny.gbapal.lz"); const u8 gMonIcon_Komala[] = INCBIN_U8("graphics/pokemon/komala/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Komala[] = INCBIN_U8("graphics/pokemon/komala/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_KOMALA #if P_FAMILY_TURTONATOR @@ -8606,7 +10194,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/back.4bpp.lz"); const u32 gMonShinyPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/shiny.gbapal.lz"); const u8 gMonIcon_Turtonator[] = INCBIN_U8("graphics/pokemon/turtonator/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Turtonator[] = INCBIN_U8("graphics/pokemon/turtonator/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TURTONATOR #if P_FAMILY_TOGEDEMARU @@ -8615,7 +10205,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/back.4bpp.lz"); const u32 gMonShinyPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/shiny.gbapal.lz"); const u8 gMonIcon_Togedemaru[] = INCBIN_U8("graphics/pokemon/togedemaru/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Togedemaru[] = INCBIN_U8("graphics/pokemon/togedemaru/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TOGEDEMARU #if P_FAMILY_MIMIKYU @@ -8624,7 +10216,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/back.4bpp.lz"); const u32 gMonShinyPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/shiny.gbapal.lz"); const u8 gMonIcon_MimikyuDisguised[] = INCBIN_U8("graphics/pokemon/mimikyu/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Mimikyu[] = INCBIN_U8("graphics/pokemon/mimikyu/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/front.4bpp.lz"); const u32 gMonPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/normal.gbapal.lz"); @@ -8639,7 +10233,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/back.4bpp.lz"); const u32 gMonShinyPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/shiny.gbapal.lz"); const u8 gMonIcon_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BRUXISH #if P_FAMILY_DRAMPA @@ -8648,7 +10244,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/back.4bpp.lz"); const u32 gMonShinyPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/shiny.gbapal.lz"); const u8 gMonIcon_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DRAMPA #if P_FAMILY_DHELMISE @@ -8657,7 +10255,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/back.4bpp.lz"); const u32 gMonShinyPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/shiny.gbapal.lz"); const u8 gMonIcon_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DHELMISE #if P_FAMILY_JANGMO_O @@ -8666,21 +10266,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz"); const u32 gMonShinyPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz"); const u8 gMonIcon_JangmoO[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_JangmoO[] = INCBIN_U8("graphics/pokemon/jangmo_o/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/anim_front.4bpp.lz"); const u32 gMonPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz"); const u32 gMonBackPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz"); const u32 gMonShinyPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz"); const u8 gMonIcon_HakamoO[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_HakamoO[] = INCBIN_U8("graphics/pokemon/hakamo_o/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/anim_front.4bpp.lz"); const u32 gMonPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/normal.gbapal.lz"); const u32 gMonBackPic_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/back.4bpp.lz"); const u32 gMonShinyPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/shiny.gbapal.lz"); const u8 gMonIcon_KommoO[] = INCBIN_U8("graphics/pokemon/kommo_o/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_KommoO[] = INCBIN_U8("graphics/pokemon/kommo_o/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_JANGMO_O #if P_FAMILY_TAPU_KOKO @@ -8689,7 +10295,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz"); const u32 gMonShinyPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz"); const u8 gMonIcon_TapuKoko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tapu_Koko[] = INCBIN_U8("graphics/pokemon/tapu_koko/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TAPU_KOKO #if P_FAMILY_TAPU_LELE @@ -8698,7 +10306,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/back.4bpp.lz"); const u32 gMonShinyPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/shiny.gbapal.lz"); const u8 gMonIcon_TapuLele[] = INCBIN_U8("graphics/pokemon/tapu_lele/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tapu_Lele[] = INCBIN_U8("graphics/pokemon/tapu_lele/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TAPU_LELE #if P_FAMILY_TAPU_BULU @@ -8707,7 +10317,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/back.4bpp.lz"); const u32 gMonShinyPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/shiny.gbapal.lz"); const u8 gMonIcon_TapuBulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tapu_Bulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TAPU_BULU #if P_FAMILY_TAPU_FINI @@ -8716,7 +10328,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/back.4bpp.lz"); const u32 gMonShinyPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/shiny.gbapal.lz"); const u8 gMonIcon_TapuFini[] = INCBIN_U8("graphics/pokemon/tapu_fini/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Tapu_Fini[] = INCBIN_U8("graphics/pokemon/tapu_fini/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TAPU_FINI #if P_FAMILY_COSMOG @@ -8725,28 +10339,36 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/back.4bpp.lz"); const u32 gMonShinyPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/shiny.gbapal.lz"); const u8 gMonIcon_Cosmog[] = INCBIN_U8("graphics/pokemon/cosmog/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cosmog[] = INCBIN_U8("graphics/pokemon/cosmog/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/front.4bpp.lz"); const u32 gMonPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/normal.gbapal.lz"); const u32 gMonBackPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/back.4bpp.lz"); const u32 gMonShinyPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/shiny.gbapal.lz"); const u8 gMonIcon_Cosmoem[] = INCBIN_U8("graphics/pokemon/cosmoem/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cosmoem[] = INCBIN_U8("graphics/pokemon/cosmoem/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/front.4bpp.lz"); const u32 gMonPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/normal.gbapal.lz"); const u32 gMonBackPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/back.4bpp.lz"); const u32 gMonShinyPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/shiny.gbapal.lz"); const u8 gMonIcon_Solgaleo[] = INCBIN_U8("graphics/pokemon/solgaleo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Solgaleo[] = INCBIN_U8("graphics/pokemon/solgaleo/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/front.4bpp.lz"); const u32 gMonPalette_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/normal.gbapal.lz"); const u32 gMonBackPic_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/back.4bpp.lz"); const u32 gMonShinyPalette_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/shiny.gbapal.lz"); const u8 gMonIcon_Lunala[] = INCBIN_U8("graphics/pokemon/lunala/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Lunala[] = INCBIN_U8("graphics/pokemon/lunala/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_COSMOG #if P_FAMILY_NIHILEGO @@ -8755,7 +10377,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Nihilego[] = INCBIN_U32("graphics/pokemon/nihilego/back.4bpp.lz"); const u32 gMonShinyPalette_Nihilego[] = INCBIN_U32("graphics/pokemon/nihilego/shiny.gbapal.lz"); const u8 gMonIcon_Nihilego[] = INCBIN_U8("graphics/pokemon/nihilego/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Nihilego[] = INCBIN_U8("graphics/pokemon/nihilego/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_NIHILEGO #if P_FAMILY_BUZZWOLE @@ -8764,7 +10388,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Buzzwole[] = INCBIN_U32("graphics/pokemon/buzzwole/back.4bpp.lz"); const u32 gMonShinyPalette_Buzzwole[] = INCBIN_U32("graphics/pokemon/buzzwole/shiny.gbapal.lz"); const u8 gMonIcon_Buzzwole[] = INCBIN_U8("graphics/pokemon/buzzwole/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Buzzwole[] = INCBIN_U8("graphics/pokemon/buzzwole/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BUZZWOLE #if P_FAMILY_PHEROMOSA @@ -8773,7 +10399,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pheromosa[] = INCBIN_U32("graphics/pokemon/pheromosa/back.4bpp.lz"); const u32 gMonShinyPalette_Pheromosa[] = INCBIN_U32("graphics/pokemon/pheromosa/shiny.gbapal.lz"); const u8 gMonIcon_Pheromosa[] = INCBIN_U8("graphics/pokemon/pheromosa/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pheromosa[] = INCBIN_U8("graphics/pokemon/pheromosa/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PHEROMOSA #if P_FAMILY_XURKITREE @@ -8782,7 +10410,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Xurkitree[] = INCBIN_U32("graphics/pokemon/xurkitree/back.4bpp.lz"); const u32 gMonShinyPalette_Xurkitree[] = INCBIN_U32("graphics/pokemon/xurkitree/shiny.gbapal.lz"); const u8 gMonIcon_Xurkitree[] = INCBIN_U8("graphics/pokemon/xurkitree/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Xurkitree[] = INCBIN_U8("graphics/pokemon/xurkitree/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_XURKITREE #if P_FAMILY_CELESTEELA @@ -8791,7 +10421,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Celesteela[] = INCBIN_U32("graphics/pokemon/celesteela/back.4bpp.lz"); const u32 gMonShinyPalette_Celesteela[] = INCBIN_U32("graphics/pokemon/celesteela/shiny.gbapal.lz"); const u8 gMonIcon_Celesteela[] = INCBIN_U8("graphics/pokemon/celesteela/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Celesteela[] = INCBIN_U8("graphics/pokemon/celesteela/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CELESTEELA #if P_FAMILY_KARTANA @@ -8800,7 +10432,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/back.4bpp.lz"); const u32 gMonShinyPalette_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/shiny.gbapal.lz"); const u8 gMonIcon_Kartana[] = INCBIN_U8("graphics/pokemon/kartana/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kartana[] = INCBIN_U8("graphics/pokemon/kartana/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_KARTANA #if P_FAMILY_GUZZLORD @@ -8809,7 +10443,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/back.4bpp.lz"); const u32 gMonShinyPalette_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/shiny.gbapal.lz"); const u8 gMonIcon_Guzzlord[] = INCBIN_U8("graphics/pokemon/guzzlord/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Guzzlord[] = INCBIN_U8("graphics/pokemon/guzzlord/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_GUZZLORD #if P_FAMILY_NECROZMA @@ -8818,7 +10454,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/back.4bpp.lz"); const u32 gMonShinyPalette_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/shiny.gbapal.lz"); const u8 gMonIcon_Necrozma[] = INCBIN_U8("graphics/pokemon/necrozma/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Necrozma[] = INCBIN_U8("graphics/pokemon/necrozma/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_FUSION_FORMS const u32 gMonFrontPic_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma/dusk_mane/front.4bpp.lz"); @@ -8849,7 +10487,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/back.4bpp.lz"); const u32 gMonShinyPalette_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/shiny.gbapal.lz"); const u8 gMonIcon_Magearna[] = INCBIN_U8("graphics/pokemon/magearna/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Magearna[] = INCBIN_U8("graphics/pokemon/magearna/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/front.4bpp.lz"); const u32 gMonPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/normal.gbapal.lz"); @@ -8864,7 +10504,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/back.4bpp.lz"); const u32 gMonShinyPalette_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/shiny.gbapal.lz"); const u8 gMonIcon_Marshadow[] = INCBIN_U8("graphics/pokemon/marshadow/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Marshadow[] = INCBIN_U8("graphics/pokemon/marshadow/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MARSHADOW #if P_FAMILY_POIPOLE @@ -8873,14 +10515,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/back.4bpp.lz"); const u32 gMonShinyPalette_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/shiny.gbapal.lz"); const u8 gMonIcon_Poipole[] = INCBIN_U8("graphics/pokemon/poipole/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Poipole[] = INCBIN_U8("graphics/pokemon/poipole/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/front.4bpp.lz"); const u32 gMonPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/normal.gbapal.lz"); const u32 gMonBackPic_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/back.4bpp.lz"); const u32 gMonShinyPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/shiny.gbapal.lz"); const u8 gMonIcon_Naganadel[] = INCBIN_U8("graphics/pokemon/naganadel/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Naganadel[] = INCBIN_U8("graphics/pokemon/naganadel/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_POIPOLE #if P_FAMILY_STAKATAKA @@ -8889,7 +10535,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/back.4bpp.lz"); const u32 gMonShinyPalette_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/shiny.gbapal.lz"); const u8 gMonIcon_Stakataka[] = INCBIN_U8("graphics/pokemon/stakataka/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Stakataka[] = INCBIN_U8("graphics/pokemon/stakataka/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_STAKATAKA #if P_FAMILY_BLACEPHALON @@ -8898,7 +10546,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/back.4bpp.lz"); const u32 gMonShinyPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/shiny.gbapal.lz"); const u8 gMonIcon_Blacephalon[] = INCBIN_U8("graphics/pokemon/blacephalon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Blacephalon[] = INCBIN_U8("graphics/pokemon/blacephalon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BLACEPHALON #if P_FAMILY_ZERAORA @@ -8907,7 +10557,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/back.4bpp.lz"); const u32 gMonShinyPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/shiny.gbapal.lz"); const u8 gMonIcon_Zeraora[] = INCBIN_U8("graphics/pokemon/zeraora/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Zeraora[] = INCBIN_U8("graphics/pokemon/zeraora/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ZERAORA #if P_FAMILY_MELTAN @@ -8916,14 +10568,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/back.4bpp.lz"); const u32 gMonShinyPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/shiny.gbapal.lz"); const u8 gMonIcon_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/front.4bpp.lz"); const u32 gMonPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/normal.gbapal.lz"); const u32 gMonBackPic_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/back.4bpp.lz"); const u32 gMonShinyPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/shiny.gbapal.lz"); const u8 gMonIcon_Melmetal[] = INCBIN_U8("graphics/pokemon/melmetal/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Melmetal[] = INCBIN_U8("graphics/pokemon/melmetal/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/front.4bpp.lz"); @@ -8940,21 +10596,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/back.4bpp.lz"); const u32 gMonShinyPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/shiny.gbapal.lz"); const u8 gMonIcon_Grookey[] = INCBIN_U8("graphics/pokemon/grookey/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Grookey[] = INCBIN_U8("graphics/pokemon/grookey/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/front.4bpp.lz"); const u32 gMonPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/normal.gbapal.lz"); const u32 gMonBackPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/back.4bpp.lz"); const u32 gMonShinyPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/shiny.gbapal.lz"); const u8 gMonIcon_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/front.4bpp.lz"); const u32 gMonPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/normal.gbapal.lz"); const u32 gMonBackPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/back.4bpp.lz"); const u32 gMonShinyPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/shiny.gbapal.lz"); const u8 gMonIcon_Rillaboom[] = INCBIN_U8("graphics/pokemon/rillaboom/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Rillaboom[] = INCBIN_U8("graphics/pokemon/rillaboom/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/front.4bpp.lz"); @@ -8971,21 +10633,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/back.4bpp.lz"); const u32 gMonShinyPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/shiny.gbapal.lz"); const u8 gMonIcon_Scorbunny[] = INCBIN_U8("graphics/pokemon/scorbunny/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Scorbunny[] = INCBIN_U8("graphics/pokemon/scorbunny/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/front.4bpp.lz"); const u32 gMonPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/normal.gbapal.lz"); const u32 gMonBackPic_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/back.4bpp.lz"); const u32 gMonShinyPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/shiny.gbapal.lz"); const u8 gMonIcon_Raboot[] = INCBIN_U8("graphics/pokemon/raboot/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Raboot[] = INCBIN_U8("graphics/pokemon/raboot/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/front.4bpp.lz"); const u32 gMonPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/normal.gbapal.lz"); const u32 gMonBackPic_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/back.4bpp.lz"); const u32 gMonShinyPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/shiny.gbapal.lz"); const u8 gMonIcon_Cinderace[] = INCBIN_U8("graphics/pokemon/cinderace/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cinderace[] = INCBIN_U8("graphics/pokemon/cinderace/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/front.4bpp.lz"); @@ -9002,21 +10670,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/back.4bpp.lz"); const u32 gMonShinyPalette_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/shiny.gbapal.lz"); const u8 gMonIcon_Sobble[] = INCBIN_U8("graphics/pokemon/sobble/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sobble[] = INCBIN_U8("graphics/pokemon/sobble/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/front.4bpp.lz"); const u32 gMonPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/normal.gbapal.lz"); const u32 gMonBackPic_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/back.4bpp.lz"); const u32 gMonShinyPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/shiny.gbapal.lz"); const u8 gMonIcon_Drizzile[] = INCBIN_U8("graphics/pokemon/drizzile/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Drizzile[] = INCBIN_U8("graphics/pokemon/drizzile/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/front.4bpp.lz"); const u32 gMonPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/normal.gbapal.lz"); const u32 gMonBackPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/back.4bpp.lz"); const u32 gMonShinyPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/shiny.gbapal.lz"); const u8 gMonIcon_Inteleon[] = INCBIN_U8("graphics/pokemon/inteleon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Inteleon[] = INCBIN_U8("graphics/pokemon/inteleon/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/front.4bpp.lz"); @@ -9033,14 +10707,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/back.4bpp.lz"); const u32 gMonShinyPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/shiny.gbapal.lz"); const u8 gMonIcon_Skwovet[] = INCBIN_U8("graphics/pokemon/skwovet/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Skwovet[] = INCBIN_U8("graphics/pokemon/skwovet/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/front.4bpp.lz"); const u32 gMonPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/normal.gbapal.lz"); const u32 gMonBackPic_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/back.4bpp.lz"); const u32 gMonShinyPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/shiny.gbapal.lz"); const u8 gMonIcon_Greedent[] = INCBIN_U8("graphics/pokemon/greedent/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Greedent[] = INCBIN_U8("graphics/pokemon/greedent/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SKWOVET #if P_FAMILY_ROOKIDEE @@ -9049,21 +10727,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/back.4bpp.lz"); const u32 gMonShinyPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/shiny.gbapal.lz"); const u8 gMonIcon_Rookidee[] = INCBIN_U8("graphics/pokemon/rookidee/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Rookidee[] = INCBIN_U8("graphics/pokemon/rookidee/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/anim_front.4bpp.lz"); const u32 gMonPalette_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/normal.gbapal.lz"); const u32 gMonBackPic_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/back.4bpp.lz"); const u32 gMonShinyPalette_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/shiny.gbapal.lz"); const u8 gMonIcon_Corvisquire[] = INCBIN_U8("graphics/pokemon/corvisquire/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Corvisquire[] = INCBIN_U8("graphics/pokemon/corvisquire/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/anim_front.4bpp.lz"); const u32 gMonPalette_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/normal.gbapal.lz"); const u32 gMonBackPic_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/back.4bpp.lz"); const u32 gMonShinyPalette_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/shiny.gbapal.lz"); const u8 gMonIcon_Corviknight[] = INCBIN_U8("graphics/pokemon/corviknight/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Corviknight[] = INCBIN_U8("graphics/pokemon/corviknight/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/front.4bpp.lz"); @@ -9080,21 +10764,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/back.4bpp.lz"); const u32 gMonShinyPalette_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/shiny.gbapal.lz"); const u8 gMonIcon_Blipbug[] = INCBIN_U8("graphics/pokemon/blipbug/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Blipbug[] = INCBIN_U8("graphics/pokemon/blipbug/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/front.4bpp.lz"); const u32 gMonPalette_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/normal.gbapal.lz"); const u32 gMonBackPic_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/back.4bpp.lz"); const u32 gMonShinyPalette_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/shiny.gbapal.lz"); const u8 gMonIcon_Dottler[] = INCBIN_U8("graphics/pokemon/dottler/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dottler[] = INCBIN_U8("graphics/pokemon/dottler/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/front.4bpp.lz"); const u32 gMonPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/normal.gbapal.lz"); const u32 gMonBackPic_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/back.4bpp.lz"); const u32 gMonShinyPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/shiny.gbapal.lz"); const u8 gMonIcon_Orbeetle[] = INCBIN_U8("graphics/pokemon/orbeetle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Orbeetle[] = INCBIN_U8("graphics/pokemon/orbeetle/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/front.4bpp.lz"); @@ -9111,14 +10801,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Nickit[] = INCBIN_U32("graphics/pokemon/nickit/back.4bpp.lz"); const u32 gMonShinyPalette_Nickit[] = INCBIN_U32("graphics/pokemon/nickit/shiny.gbapal.lz"); const u8 gMonIcon_Nickit[] = INCBIN_U8("graphics/pokemon/nickit/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Nickit[] = INCBIN_U8("graphics/pokemon/nickit/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/front.4bpp.lz"); const u32 gMonPalette_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/normal.gbapal.lz"); const u32 gMonBackPic_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/back.4bpp.lz"); const u32 gMonShinyPalette_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/shiny.gbapal.lz"); const u8 gMonIcon_Thievul[] = INCBIN_U8("graphics/pokemon/thievul/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Thievul[] = INCBIN_U8("graphics/pokemon/thievul/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_NICKIT #if P_FAMILY_GOSSIFLEUR @@ -9127,14 +10821,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/back.4bpp.lz"); const u32 gMonShinyPalette_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/shiny.gbapal.lz"); const u8 gMonIcon_Gossifleur[] = INCBIN_U8("graphics/pokemon/gossifleur/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Gossifleur[] = INCBIN_U8("graphics/pokemon/gossifleur/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/front.4bpp.lz"); const u32 gMonPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/normal.gbapal.lz"); const u32 gMonBackPic_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/back.4bpp.lz"); const u32 gMonShinyPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/shiny.gbapal.lz"); const u8 gMonIcon_Eldegoss[] = INCBIN_U8("graphics/pokemon/eldegoss/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Eldegoss[] = INCBIN_U8("graphics/pokemon/eldegoss/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_GOSSIFLEUR #if P_FAMILY_WOOLOO @@ -9143,14 +10841,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/back.4bpp.lz"); const u32 gMonShinyPalette_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/shiny.gbapal.lz"); const u8 gMonIcon_Wooloo[] = INCBIN_U8("graphics/pokemon/wooloo/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Wooloo[] = INCBIN_U8("graphics/pokemon/wooloo/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/front.4bpp.lz"); const u32 gMonPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/normal.gbapal.lz"); const u32 gMonBackPic_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/back.4bpp.lz"); const u32 gMonShinyPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/shiny.gbapal.lz"); const u8 gMonIcon_Dubwool[] = INCBIN_U8("graphics/pokemon/dubwool/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dubwool[] = INCBIN_U8("graphics/pokemon/dubwool/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_WOOLOO #if P_FAMILY_CHEWTLE @@ -9159,14 +10861,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/back.4bpp.lz"); const u32 gMonShinyPalette_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/shiny.gbapal.lz"); const u8 gMonIcon_Chewtle[] = INCBIN_U8("graphics/pokemon/chewtle/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Chewtle[] = INCBIN_U8("graphics/pokemon/chewtle/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/anim_front.4bpp.lz"); const u32 gMonPalette_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/normal.gbapal.lz"); const u32 gMonBackPic_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/back.4bpp.lz"); const u32 gMonShinyPalette_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/shiny.gbapal.lz"); const u8 gMonIcon_Drednaw[] = INCBIN_U8("graphics/pokemon/drednaw/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Drednaw[] = INCBIN_U8("graphics/pokemon/drednaw/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/front.4bpp.lz"); @@ -9183,14 +10889,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/back.4bpp.lz"); const u32 gMonShinyPalette_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/shiny.gbapal.lz"); const u8 gMonIcon_Yamper[] = INCBIN_U8("graphics/pokemon/yamper/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Yamper[] = INCBIN_U8("graphics/pokemon/yamper/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/front.4bpp.lz"); const u32 gMonPalette_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/normal.gbapal.lz"); const u32 gMonBackPic_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/back.4bpp.lz"); const u32 gMonShinyPalette_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/shiny.gbapal.lz"); const u8 gMonIcon_Boltund[] = INCBIN_U8("graphics/pokemon/boltund/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Boltund[] = INCBIN_U8("graphics/pokemon/boltund/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_YAMPER #if P_FAMILY_ROLYCOLY @@ -9199,21 +10909,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/back.4bpp.lz"); const u32 gMonShinyPalette_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/shiny.gbapal.lz"); const u8 gMonIcon_Rolycoly[] = INCBIN_U8("graphics/pokemon/rolycoly/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Rolycoly[] = INCBIN_U8("graphics/pokemon/rolycoly/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/anim_front.4bpp.lz"); const u32 gMonPalette_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/normal.gbapal.lz"); const u32 gMonBackPic_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/back.4bpp.lz"); const u32 gMonShinyPalette_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/shiny.gbapal.lz"); const u8 gMonIcon_Carkol[] = INCBIN_U8("graphics/pokemon/carkol/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Carkol[] = INCBIN_U8("graphics/pokemon/carkol/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/anim_front.4bpp.lz"); const u32 gMonPalette_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/normal.gbapal.lz"); const u32 gMonBackPic_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/back.4bpp.lz"); const u32 gMonShinyPalette_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/shiny.gbapal.lz"); const u8 gMonIcon_Coalossal[] = INCBIN_U8("graphics/pokemon/coalossal/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Coalossal[] = INCBIN_U8("graphics/pokemon/coalossal/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/front.4bpp.lz"); @@ -9230,14 +10946,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Applin[] = INCBIN_U32("graphics/pokemon/applin/back.4bpp.lz"); const u32 gMonShinyPalette_Applin[] = INCBIN_U32("graphics/pokemon/applin/shiny.gbapal.lz"); const u8 gMonIcon_Applin[] = INCBIN_U8("graphics/pokemon/applin/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Applin[] = INCBIN_U8("graphics/pokemon/applin/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/anim_front.4bpp.lz"); const u32 gMonPalette_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/normal.gbapal.lz"); const u32 gMonBackPic_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/back.4bpp.lz"); const u32 gMonShinyPalette_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/shiny.gbapal.lz"); const u8 gMonIcon_Flapple[] = INCBIN_U8("graphics/pokemon/flapple/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Flapple[] = INCBIN_U8("graphics/pokemon/flapple/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/front.4bpp.lz"); @@ -9252,7 +10972,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/back.4bpp.lz"); const u32 gMonShinyPalette_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/shiny.gbapal.lz"); const u8 gMonIcon_Appletun[] = INCBIN_U8("graphics/pokemon/appletun/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Appletun[] = INCBIN_U8("graphics/pokemon/appletun/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/front.4bpp.lz"); @@ -9268,14 +10990,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/back.4bpp.lz"); const u32 gMonShinyPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/shiny.gbapal.lz"); const u8 gMonIcon_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/footprint.1bpp"); +#endif //P_FOOTPRINTS // const u32 gMonFrontPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/front.4bpp.lz"); // const u32 gMonPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/normal.gbapal.lz"); // const u32 gMonBackPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/back.4bpp.lz"); // const u32 gMonShinyPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/shiny.gbapal.lz"); // const u8 gMonIcon_Hydrapple[] = INCBIN_U8("graphics/pokemon/hydrapple/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Hydrapple[] = INCBIN_U8("graphics/pokemon/hydrapple/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_APPLIN @@ -9285,14 +11011,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/back.4bpp.lz"); const u32 gMonShinyPalette_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/shiny.gbapal.lz"); const u8 gMonIcon_Silicobra[] = INCBIN_U8("graphics/pokemon/silicobra/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Silicobra[] = INCBIN_U8("graphics/pokemon/silicobra/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/front.4bpp.lz"); const u32 gMonPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/normal.gbapal.lz"); const u32 gMonBackPic_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/back.4bpp.lz"); const u32 gMonShinyPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/shiny.gbapal.lz"); const u8 gMonIcon_Sandaconda[] = INCBIN_U8("graphics/pokemon/sandaconda/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sandaconda[] = INCBIN_U8("graphics/pokemon/sandaconda/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/front.4bpp.lz"); @@ -9309,7 +11039,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/back.4bpp.lz"); const u32 gMonShinyPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/shiny.gbapal.lz"); const u8 gMonIcon_Cramorant[] = INCBIN_U8("graphics/pokemon/cramorant/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cramorant[] = INCBIN_U8("graphics/pokemon/cramorant/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/front.4bpp.lz"); const u32 gMonPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/normal.gbapal.lz"); @@ -9330,14 +11062,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/back.4bpp.lz"); const u32 gMonShinyPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/shiny.gbapal.lz"); const u8 gMonIcon_Arrokuda[] = INCBIN_U8("graphics/pokemon/arrokuda/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Arrokuda[] = INCBIN_U8("graphics/pokemon/arrokuda/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/front.4bpp.lz"); const u32 gMonPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/normal.gbapal.lz"); const u32 gMonBackPic_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/back.4bpp.lz"); const u32 gMonShinyPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/shiny.gbapal.lz"); const u8 gMonIcon_Barraskewda[] = INCBIN_U8("graphics/pokemon/barraskewda/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Barraskewda[] = INCBIN_U8("graphics/pokemon/barraskewda/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ARROKUDA #if P_FAMILY_TOXEL @@ -9346,14 +11082,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/back.4bpp.lz"); const u32 gMonShinyPalette_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/shiny.gbapal.lz"); const u8 gMonIcon_Toxel[] = INCBIN_U8("graphics/pokemon/toxel/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Toxel[] = INCBIN_U8("graphics/pokemon/toxel/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/front.4bpp.lz"); const u32 gMonPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/normal.gbapal.lz"); const u32 gMonBackPic_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/back.4bpp.lz"); const u32 gMonShinyPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/shiny.gbapal.lz"); const u8 gMonIcon_ToxtricityAmped[] = INCBIN_U8("graphics/pokemon/toxtricity/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Toxtricity[] = INCBIN_U8("graphics/pokemon/toxtricity/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/front.4bpp.lz"); const u32 gMonPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/normal.gbapal.lz"); @@ -9376,14 +11116,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/back.4bpp.lz"); const u32 gMonShinyPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/shiny.gbapal.lz"); const u8 gMonIcon_Sizzlipede[] = INCBIN_U8("graphics/pokemon/sizzlipede/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sizzlipede[] = INCBIN_U8("graphics/pokemon/sizzlipede/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/anim_front.4bpp.lz"); const u32 gMonPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/normal.gbapal.lz"); const u32 gMonBackPic_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/back.4bpp.lz"); const u32 gMonShinyPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/shiny.gbapal.lz"); const u8 gMonIcon_Centiskorch[] = INCBIN_U8("graphics/pokemon/centiskorch/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Centiskorch[] = INCBIN_U8("graphics/pokemon/centiskorch/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/front.4bpp.lz"); @@ -9400,14 +11144,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/back.4bpp.lz"); const u32 gMonShinyPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/shiny.gbapal.lz"); const u8 gMonIcon_Clobbopus[] = INCBIN_U8("graphics/pokemon/clobbopus/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Clobbopus[] = INCBIN_U8("graphics/pokemon/clobbopus/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/front.4bpp.lz"); const u32 gMonPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/normal.gbapal.lz"); const u32 gMonBackPic_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/back.4bpp.lz"); const u32 gMonShinyPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/shiny.gbapal.lz"); const u8 gMonIcon_Grapploct[] = INCBIN_U8("graphics/pokemon/grapploct/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Grapploct[] = INCBIN_U8("graphics/pokemon/grapploct/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CLOBBOPUS #if P_FAMILY_SINISTEA @@ -9416,14 +11164,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/back.4bpp.lz"); const u32 gMonShinyPalette_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/shiny.gbapal.lz"); const u8 gMonIcon_Sinistea[] = INCBIN_U8("graphics/pokemon/sinistea/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Sinistea[] = INCBIN_U8("graphics/pokemon/sinistea/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/front.4bpp.lz"); const u32 gMonPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/normal.gbapal.lz"); const u32 gMonBackPic_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/back.4bpp.lz"); const u32 gMonShinyPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/shiny.gbapal.lz"); const u8 gMonIcon_Polteageist[] = INCBIN_U8("graphics/pokemon/polteageist/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Polteageist[] = INCBIN_U8("graphics/pokemon/polteageist/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SINISTEA #if P_FAMILY_HATENNA @@ -9432,21 +11184,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Hatenna[] = INCBIN_U32("graphics/pokemon/hatenna/back.4bpp.lz"); const u32 gMonShinyPalette_Hatenna[] = INCBIN_U32("graphics/pokemon/hatenna/shiny.gbapal.lz"); const u8 gMonIcon_Hatenna[] = INCBIN_U8("graphics/pokemon/hatenna/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hatenna[] = INCBIN_U8("graphics/pokemon/hatenna/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/front.4bpp.lz"); const u32 gMonPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/normal.gbapal.lz"); const u32 gMonBackPic_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/back.4bpp.lz"); const u32 gMonShinyPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/shiny.gbapal.lz"); const u8 gMonIcon_Hattrem[] = INCBIN_U8("graphics/pokemon/hattrem/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hattrem[] = INCBIN_U8("graphics/pokemon/hattrem/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/front.4bpp.lz"); const u32 gMonPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/normal.gbapal.lz"); const u32 gMonBackPic_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/back.4bpp.lz"); const u32 gMonShinyPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/shiny.gbapal.lz"); const u8 gMonIcon_Hatterene[] = INCBIN_U8("graphics/pokemon/hatterene/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Hatterene[] = INCBIN_U8("graphics/pokemon/hatterene/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/front.4bpp.lz"); @@ -9463,21 +11221,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Impidimp[] = INCBIN_U32("graphics/pokemon/impidimp/back.4bpp.lz"); const u32 gMonShinyPalette_Impidimp[] = INCBIN_U32("graphics/pokemon/impidimp/shiny.gbapal.lz"); const u8 gMonIcon_Impidimp[] = INCBIN_U8("graphics/pokemon/impidimp/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Impidimp[] = INCBIN_U8("graphics/pokemon/impidimp/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/front.4bpp.lz"); const u32 gMonPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/normal.gbapal.lz"); const u32 gMonBackPic_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/back.4bpp.lz"); const u32 gMonShinyPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/shiny.gbapal.lz"); const u8 gMonIcon_Morgrem[] = INCBIN_U8("graphics/pokemon/morgrem/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Morgrem[] = INCBIN_U8("graphics/pokemon/morgrem/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/front.4bpp.lz"); const u32 gMonPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/normal.gbapal.lz"); const u32 gMonBackPic_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/back.4bpp.lz"); const u32 gMonShinyPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/shiny.gbapal.lz"); const u8 gMonIcon_Grimmsnarl[] = INCBIN_U8("graphics/pokemon/grimmsnarl/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Grimmsnarl[] = INCBIN_U8("graphics/pokemon/grimmsnarl/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/front.4bpp.lz"); @@ -9494,7 +11258,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/back.4bpp.lz"); const u32 gMonShinyPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/shiny.gbapal.lz"); const u8 gMonIcon_Milcery[] = INCBIN_U8("graphics/pokemon/milcery/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Milcery[] = INCBIN_U8("graphics/pokemon/milcery/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/front.4bpp.lz"); const u32 gMonBackPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/back.4bpp.lz"); const u32 gMonPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/normal.gbapal.lz"); @@ -9522,7 +11288,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonPalette_AlcremieStrawberryRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_rainbow_swirl.gbapal.lz"); const u32 gMonBackPic_AlcremieStrawberry[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/back.4bpp.lz"); const u32 gMonShinyPalette_AlcremieStrawberry[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_shiny.gbapal.lz"); +#if P_FOOTPRINTS const u8 gMonFootprint_Alcremie[] = INCBIN_U8("graphics/pokemon/alcremie/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/alcremie/berry/front.4bpp.lz"); const u32 gMonPalette_AlcremieBerryVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_default.gbapal.lz"); @@ -9617,7 +11385,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/back.4bpp.lz"); const u32 gMonShinyPalette_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/shiny.gbapal.lz"); const u8 gMonIcon_Falinks[] = INCBIN_U8("graphics/pokemon/falinks/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Falinks[] = INCBIN_U8("graphics/pokemon/falinks/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_FALINKS #if P_FAMILY_PINCURCHIN @@ -9626,7 +11396,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/back.4bpp.lz"); const u32 gMonShinyPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/shiny.gbapal.lz"); const u8 gMonIcon_Pincurchin[] = INCBIN_U8("graphics/pokemon/pincurchin/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Pincurchin[] = INCBIN_U8("graphics/pokemon/pincurchin/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PINCURCHIN #if P_FAMILY_SNOM @@ -9635,14 +11407,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Snom[] = INCBIN_U32("graphics/pokemon/snom/back.4bpp.lz"); const u32 gMonShinyPalette_Snom[] = INCBIN_U32("graphics/pokemon/snom/shiny.gbapal.lz"); const u8 gMonIcon_Snom[] = INCBIN_U8("graphics/pokemon/snom/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Snom[] = INCBIN_U8("graphics/pokemon/snom/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/front.4bpp.lz"); const u32 gMonPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/normal.gbapal.lz"); const u32 gMonBackPic_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/back.4bpp.lz"); const u32 gMonShinyPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/shiny.gbapal.lz"); const u8 gMonIcon_Frosmoth[] = INCBIN_U8("graphics/pokemon/frosmoth/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Frosmoth[] = INCBIN_U8("graphics/pokemon/frosmoth/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SNOM #if P_FAMILY_STONJOURNER @@ -9651,7 +11427,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/back.4bpp.lz"); const u32 gMonShinyPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/shiny.gbapal.lz"); const u8 gMonIcon_Stonjourner[] = INCBIN_U8("graphics/pokemon/stonjourner/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Stonjourner[] = INCBIN_U8("graphics/pokemon/stonjourner/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_STONJOURNER #if P_FAMILY_EISCUE @@ -9660,7 +11438,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/back.4bpp.lz"); const u32 gMonShinyPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/shiny.gbapal.lz"); const u8 gMonIcon_EiscueIceFace[] = INCBIN_U8("graphics/pokemon/eiscue/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Eiscue[] = INCBIN_U8("graphics/pokemon/eiscue/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/front.4bpp.lz"); const u32 gMonPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/normal.gbapal.lz"); @@ -9675,7 +11455,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/back.4bpp.lz"); const u32 gMonShinyPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/shiny.gbapal.lz"); const u8 gMonIcon_IndeedeeMale[] = INCBIN_U8("graphics/pokemon/indeedee/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Indeedee[] = INCBIN_U8("graphics/pokemon/indeedee/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/front.4bpp.lz"); const u32 gMonPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/normal.gbapal.lz"); @@ -9690,7 +11472,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/back.4bpp.lz"); const u32 gMonShinyPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/shiny.gbapal.lz"); const u8 gMonIcon_MorpekoFullBelly[] = INCBIN_U8("graphics/pokemon/morpeko/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Morpeko[] = INCBIN_U8("graphics/pokemon/morpeko/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/front.4bpp.lz"); const u32 gMonPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/normal.gbapal.lz"); @@ -9705,14 +11489,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/back.4bpp.lz"); const u32 gMonShinyPalette_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/shiny.gbapal.lz"); const u8 gMonIcon_Cufant[] = INCBIN_U8("graphics/pokemon/cufant/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Cufant[] = INCBIN_U8("graphics/pokemon/cufant/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/front.4bpp.lz"); const u32 gMonPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/normal.gbapal.lz"); const u32 gMonBackPic_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/back.4bpp.lz"); const u32 gMonShinyPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/shiny.gbapal.lz"); const u8 gMonIcon_Copperajah[] = INCBIN_U8("graphics/pokemon/copperajah/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Copperajah[] = INCBIN_U8("graphics/pokemon/copperajah/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/front.4bpp.lz"); @@ -9729,7 +11517,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/back.4bpp.lz"); const u32 gMonShinyPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/shiny.gbapal.lz"); const u8 gMonIcon_Dracozolt[] = INCBIN_U8("graphics/pokemon/dracozolt/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dracozolt[] = INCBIN_U8("graphics/pokemon/dracozolt/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DRACOZOLT #if P_FAMILY_ARCTOZOLT @@ -9738,7 +11528,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Arctozolt[] = INCBIN_U32("graphics/pokemon/arctozolt/back.4bpp.lz"); const u32 gMonShinyPalette_Arctozolt[] = INCBIN_U32("graphics/pokemon/arctozolt/shiny.gbapal.lz"); const u8 gMonIcon_Arctozolt[] = INCBIN_U8("graphics/pokemon/arctozolt/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Arctozolt[] = INCBIN_U8("graphics/pokemon/arctozolt/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ARCTOZOLT #if P_FAMILY_DRACOVISH @@ -9747,7 +11539,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Dracovish[] = INCBIN_U32("graphics/pokemon/dracovish/back.4bpp.lz"); const u32 gMonShinyPalette_Dracovish[] = INCBIN_U32("graphics/pokemon/dracovish/shiny.gbapal.lz"); const u8 gMonIcon_Dracovish[] = INCBIN_U8("graphics/pokemon/dracovish/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dracovish[] = INCBIN_U8("graphics/pokemon/dracovish/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DRACOVISH #if P_FAMILY_ARCTOVISH @@ -9756,7 +11550,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Arctovish[] = INCBIN_U32("graphics/pokemon/arctovish/back.4bpp.lz"); const u32 gMonShinyPalette_Arctovish[] = INCBIN_U32("graphics/pokemon/arctovish/shiny.gbapal.lz"); const u8 gMonIcon_Arctovish[] = INCBIN_U8("graphics/pokemon/arctovish/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Arctovish[] = INCBIN_U8("graphics/pokemon/arctovish/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ARCTOVISH #if P_FAMILY_DURALUDON @@ -9765,7 +11561,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/back.4bpp.lz"); const u32 gMonShinyPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/shiny.gbapal.lz"); const u8 gMonIcon_Duraludon[] = INCBIN_U8("graphics/pokemon/duraludon/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Duraludon[] = INCBIN_U8("graphics/pokemon/duraludon/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/front.4bpp.lz"); @@ -9781,7 +11579,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar // const u32 gMonBackPic_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/back.4bpp.lz"); // const u32 gMonShinyPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/shiny.gbapal.lz"); // const u8 gMonIcon_Archaludon[] = INCBIN_U8("graphics/pokemon/archaludon/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Archaludon[] = INCBIN_U8("graphics/pokemon/archaludon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DURALUDON @@ -9791,21 +11591,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/back.4bpp.lz"); const u32 gMonShinyPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/shiny.gbapal.lz"); const u8 gMonIcon_Dreepy[] = INCBIN_U8("graphics/pokemon/dreepy/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dreepy[] = INCBIN_U8("graphics/pokemon/dreepy/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/front.4bpp.lz"); const u32 gMonPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/normal.gbapal.lz"); const u32 gMonBackPic_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/back.4bpp.lz"); const u32 gMonShinyPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/shiny.gbapal.lz"); const u8 gMonIcon_Drakloak[] = INCBIN_U8("graphics/pokemon/drakloak/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Drakloak[] = INCBIN_U8("graphics/pokemon/drakloak/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/front.4bpp.lz"); const u32 gMonPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/normal.gbapal.lz"); const u32 gMonBackPic_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/back.4bpp.lz"); const u32 gMonShinyPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/shiny.gbapal.lz"); const u8 gMonIcon_Dragapult[] = INCBIN_U8("graphics/pokemon/dragapult/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Dragapult[] = INCBIN_U8("graphics/pokemon/dragapult/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DREEPY #if P_FAMILY_ZACIAN @@ -9814,7 +11620,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/back.4bpp.lz"); const u32 gMonShinyPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/shiny.gbapal.lz"); const u8 gMonIcon_ZacianHeroOfManyBattles[] = INCBIN_U8("graphics/pokemon/zacian/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Zacian[] = INCBIN_U8("graphics/pokemon/zacian/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/front.4bpp.lz"); const u32 gMonPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/normal.gbapal.lz"); @@ -9829,7 +11637,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/back.4bpp.lz"); const u32 gMonShinyPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/shiny.gbapal.lz"); const u8 gMonIcon_ZamazentaHeroOfManyBattles[] = INCBIN_U8("graphics/pokemon/zamazenta/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Zamazenta[] = INCBIN_U8("graphics/pokemon/zamazenta/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/front.4bpp.lz"); const u32 gMonPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/normal.gbapal.lz"); @@ -9844,7 +11654,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/back.4bpp.lz"); const u32 gMonShinyPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/shiny.gbapal.lz"); const u8 gMonIcon_Eternatus[] = INCBIN_U8("graphics/pokemon/eternatus/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Eternatus[] = INCBIN_U8("graphics/pokemon/eternatus/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/front.4bpp.lz"); const u32 gMonPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/normal.gbapal.lz"); @@ -9859,14 +11671,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/back.4bpp.lz"); const u32 gMonShinyPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/shiny.gbapal.lz"); const u8 gMonIcon_Kubfu[] = INCBIN_U8("graphics/pokemon/kubfu/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Kubfu[] = INCBIN_U8("graphics/pokemon/kubfu/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/front.4bpp.lz"); const u32 gMonPalette_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/normal.gbapal.lz"); const u32 gMonBackPic_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/back.4bpp.lz"); const u32 gMonShinyPalette_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/shiny.gbapal.lz"); const u8 gMonIcon_Urshifu[] = INCBIN_U8("graphics/pokemon/urshifu/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Urshifu[] = INCBIN_U8("graphics/pokemon/urshifu/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/front.4bpp.lz"); const u32 gMonPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/normal.gbapal.lz"); @@ -9892,7 +11708,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/back.4bpp.lz"); const u32 gMonShinyPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/shiny.gbapal.lz"); const u8 gMonIcon_Zarude[] = INCBIN_U8("graphics/pokemon/zarude/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Zarude[] = INCBIN_U8("graphics/pokemon/zarude/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/front.4bpp.lz"); const u32 gMonPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/normal.gbapal.lz"); @@ -9907,7 +11725,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/back.4bpp.lz"); const u32 gMonShinyPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/shiny.gbapal.lz"); const u8 gMonIcon_Regieleki[] = INCBIN_U8("graphics/pokemon/regieleki/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Regieleki[] = INCBIN_U8("graphics/pokemon/regieleki/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_REGIELEKI #if P_FAMILY_REGIDRAGO @@ -9916,7 +11736,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/back.4bpp.lz"); const u32 gMonShinyPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/shiny.gbapal.lz"); const u8 gMonIcon_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_REGIDRAGO #if P_FAMILY_GLASTRIER @@ -9925,7 +11747,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/back.4bpp.lz"); const u32 gMonShinyPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/shiny.gbapal.lz"); const u8 gMonIcon_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_GLASTRIER #if P_FAMILY_SPECTRIER @@ -9934,7 +11758,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/back.4bpp.lz"); const u32 gMonShinyPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/shiny.gbapal.lz"); const u8 gMonIcon_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SPECTRIER #if P_FAMILY_CALYREX @@ -9943,7 +11769,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/back.4bpp.lz"); const u32 gMonShinyPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/shiny.gbapal.lz"); const u8 gMonIcon_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/icon.4bpp"); +#if P_FOOTPRINTS const u8 gMonFootprint_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/footprint.1bpp"); +#endif //P_FOOTPRINTS #if P_FUSION_FORMS const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/front.4bpp.lz"); @@ -9968,21 +11796,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/back.4bpp.lz"); const u32 gMonShinyPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/shiny.gbapal.lz"); const u8 gMonIcon_Sprigatito[] = INCBIN_U8("graphics/pokemon/sprigatito/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Sprigatito[] = INCBIN_U8("graphics/pokemon/sprigatito/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/front.4bpp.lz"); const u32 gMonPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/normal.gbapal.lz"); const u32 gMonBackPic_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/back.4bpp.lz"); const u32 gMonShinyPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/shiny.gbapal.lz"); const u8 gMonIcon_Floragato[] = INCBIN_U8("graphics/pokemon/floragato/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Floragato[] = INCBIN_U8("graphics/pokemon/floragato/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/front.4bpp.lz"); const u32 gMonPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/normal.gbapal.lz"); const u32 gMonBackPic_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/back.4bpp.lz"); const u32 gMonShinyPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/shiny.gbapal.lz"); const u8 gMonIcon_Meowscarada[] = INCBIN_U8("graphics/pokemon/meowscarada/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Meowscarada[] = INCBIN_U8("graphics/pokemon/meowscarada/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SPRIGATITO #if P_FAMILY_FUECOCO @@ -9991,21 +11825,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/back.4bpp.lz"); const u32 gMonShinyPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/shiny.gbapal.lz"); const u8 gMonIcon_Fuecoco[] = INCBIN_U8("graphics/pokemon/fuecoco/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Fuecoco[] = INCBIN_U8("graphics/pokemon/fuecoco/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/front.4bpp.lz"); const u32 gMonPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/normal.gbapal.lz"); const u32 gMonBackPic_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/back.4bpp.lz"); const u32 gMonShinyPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/shiny.gbapal.lz"); const u8 gMonIcon_Crocalor[] = INCBIN_U8("graphics/pokemon/crocalor/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Crocalor[] = INCBIN_U8("graphics/pokemon/crocalor/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/front.4bpp.lz"); const u32 gMonPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/normal.gbapal.lz"); const u32 gMonBackPic_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/back.4bpp.lz"); const u32 gMonShinyPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/shiny.gbapal.lz"); const u8 gMonIcon_Skeledirge[] = INCBIN_U8("graphics/pokemon/skeledirge/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Skeledirge[] = INCBIN_U8("graphics/pokemon/skeledirge/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_FUECOCO #if P_FAMILY_QUAXLY @@ -10014,21 +11854,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/back.4bpp.lz"); const u32 gMonShinyPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/shiny.gbapal.lz"); const u8 gMonIcon_Quaxly[] = INCBIN_U8("graphics/pokemon/quaxly/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Quaxly[] = INCBIN_U8("graphics/pokemon/quaxly/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/front.4bpp.lz"); const u32 gMonPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/normal.gbapal.lz"); const u32 gMonBackPic_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/back.4bpp.lz"); const u32 gMonShinyPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/shiny.gbapal.lz"); const u8 gMonIcon_Quaxwell[] = INCBIN_U8("graphics/pokemon/quaxwell/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Quaxwell[] = INCBIN_U8("graphics/pokemon/quaxwell/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/front.4bpp.lz"); const u32 gMonPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/normal.gbapal.lz"); const u32 gMonBackPic_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/back.4bpp.lz"); const u32 gMonShinyPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/shiny.gbapal.lz"); const u8 gMonIcon_Quaquaval[] = INCBIN_U8("graphics/pokemon/quaquaval/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Quaquaval[] = INCBIN_U8("graphics/pokemon/quaquaval/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_QUAXLY #if P_FAMILY_LECHONK @@ -10037,14 +11883,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/back.4bpp.lz"); const u32 gMonShinyPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/shiny.gbapal.lz"); const u8 gMonIcon_Lechonk[] = INCBIN_U8("graphics/pokemon/lechonk/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Lechonk[] = INCBIN_U8("graphics/pokemon/lechonk/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/front.4bpp.lz"); const u32 gMonPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/normal.gbapal.lz"); const u32 gMonBackPic_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/back.4bpp.lz"); const u32 gMonShinyPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/shiny.gbapal.lz"); const u8 gMonIcon_OinkologneMale[] = INCBIN_U8("graphics/pokemon/oinkologne/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Oinkologne[] = INCBIN_U8("graphics/pokemon/oinkologne/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/front.4bpp.lz"); const u32 gMonPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/normal.gbapal.lz"); @@ -10059,14 +11909,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/back.4bpp.lz"); const u32 gMonShinyPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/shiny.gbapal.lz"); const u8 gMonIcon_Tarountula[] = INCBIN_U8("graphics/pokemon/tarountula/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Tarountula[] = INCBIN_U8("graphics/pokemon/tarountula/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/front.4bpp.lz"); const u32 gMonPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/normal.gbapal.lz"); const u32 gMonBackPic_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/back.4bpp.lz"); const u32 gMonShinyPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/shiny.gbapal.lz"); const u8 gMonIcon_Spidops[] = INCBIN_U8("graphics/pokemon/spidops/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Spidops[] = INCBIN_U8("graphics/pokemon/spidops/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TAROUNTULA #if P_FAMILY_NYMBLE @@ -10075,14 +11929,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/back.4bpp.lz"); const u32 gMonShinyPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/shiny.gbapal.lz"); const u8 gMonIcon_Nymble[] = INCBIN_U8("graphics/pokemon/nymble/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Nymble[] = INCBIN_U8("graphics/pokemon/nymble/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/front.4bpp.lz"); const u32 gMonPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/normal.gbapal.lz"); const u32 gMonBackPic_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/back.4bpp.lz"); const u32 gMonShinyPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/shiny.gbapal.lz"); const u8 gMonIcon_Lokix[] = INCBIN_U8("graphics/pokemon/lokix/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Lokix[] = INCBIN_U8("graphics/pokemon/lokix/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_NYMBLE #if P_FAMILY_PAWMI @@ -10091,21 +11949,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/back.4bpp.lz"); const u32 gMonShinyPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/shiny.gbapal.lz"); const u8 gMonIcon_Pawmi[] = INCBIN_U8("graphics/pokemon/pawmi/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Pawmi[] = INCBIN_U8("graphics/pokemon/pawmi/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/front.4bpp.lz"); const u32 gMonPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/normal.gbapal.lz"); const u32 gMonBackPic_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/back.4bpp.lz"); const u32 gMonShinyPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/shiny.gbapal.lz"); const u8 gMonIcon_Pawmo[] = INCBIN_U8("graphics/pokemon/pawmo/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Pawmo[] = INCBIN_U8("graphics/pokemon/pawmo/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/front.4bpp.lz"); const u32 gMonPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/normal.gbapal.lz"); const u32 gMonBackPic_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/back.4bpp.lz"); const u32 gMonShinyPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/shiny.gbapal.lz"); const u8 gMonIcon_Pawmot[] = INCBIN_U8("graphics/pokemon/pawmot/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Pawmot[] = INCBIN_U8("graphics/pokemon/pawmot/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PAWMI #if P_FAMILY_TANDEMAUS @@ -10114,11 +11978,15 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/back.4bpp.lz"); const u32 gMonShinyPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/shiny.gbapal.lz"); const u8 gMonIcon_Tandemaus[] = INCBIN_U8("graphics/pokemon/tandemaus/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Tandemaus[] = INCBIN_U8("graphics/pokemon/tandemaus/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/normal.gbapal.lz"); const u32 gMonShinyPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/shiny.gbapal.lz"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Maushold[] = INCBIN_U8("graphics/pokemon/maushold/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/front.4bpp.lz"); const u32 gMonBackPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/back.4bpp.lz"); @@ -10135,14 +12003,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/back.4bpp.lz"); const u32 gMonShinyPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/shiny.gbapal.lz"); const u8 gMonIcon_Fidough[] = INCBIN_U8("graphics/pokemon/fidough/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Fidough[] = INCBIN_U8("graphics/pokemon/fidough/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/front.4bpp.lz"); const u32 gMonPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/normal.gbapal.lz"); const u32 gMonBackPic_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/back.4bpp.lz"); const u32 gMonShinyPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/shiny.gbapal.lz"); const u8 gMonIcon_Dachsbun[] = INCBIN_U8("graphics/pokemon/dachsbun/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Dachsbun[] = INCBIN_U8("graphics/pokemon/dachsbun/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_FIDOUGH #if P_FAMILY_SMOLIV @@ -10151,27 +12023,35 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/back.4bpp.lz"); const u32 gMonShinyPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/shiny.gbapal.lz"); const u8 gMonIcon_Smoliv[] = INCBIN_U8("graphics/pokemon/smoliv/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Smoliv[] = INCBIN_U8("graphics/pokemon/smoliv/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/front.4bpp.lz"); const u32 gMonPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/normal.gbapal.lz"); const u32 gMonBackPic_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/back.4bpp.lz"); const u32 gMonShinyPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/shiny.gbapal.lz"); const u8 gMonIcon_Dolliv[] = INCBIN_U8("graphics/pokemon/dolliv/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Dolliv[] = INCBIN_U8("graphics/pokemon/dolliv/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/front.4bpp.lz"); const u32 gMonPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/normal.gbapal.lz"); const u32 gMonBackPic_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/back.4bpp.lz"); const u32 gMonShinyPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/shiny.gbapal.lz"); const u8 gMonIcon_Arboliva[] = INCBIN_U8("graphics/pokemon/arboliva/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Arboliva[] = INCBIN_U8("graphics/pokemon/arboliva/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SMOLIV #if P_FAMILY_SQUAWKABILLY const u32 gMonFrontPic_Squawkabilly[] = INCBIN_U32("graphics/pokemon/squawkabilly/front.4bpp.lz"); const u32 gMonBackPic_Squawkabilly[] = INCBIN_U32("graphics/pokemon/squawkabilly/back.4bpp.lz"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Squawkabilly[] = INCBIN_U8("graphics/pokemon/squawkabilly/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/normal.gbapal.lz"); const u32 gMonShinyPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/shiny.gbapal.lz"); @@ -10196,21 +12076,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/back.4bpp.lz"); const u32 gMonShinyPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/shiny.gbapal.lz"); const u8 gMonIcon_Nacli[] = INCBIN_U8("graphics/pokemon/nacli/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Nacli[] = INCBIN_U8("graphics/pokemon/nacli/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/front.4bpp.lz"); const u32 gMonPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/normal.gbapal.lz"); const u32 gMonBackPic_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/back.4bpp.lz"); const u32 gMonShinyPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/shiny.gbapal.lz"); const u8 gMonIcon_Naclstack[] = INCBIN_U8("graphics/pokemon/naclstack/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Naclstack[] = INCBIN_U8("graphics/pokemon/naclstack/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/front.4bpp.lz"); const u32 gMonPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/normal.gbapal.lz"); const u32 gMonBackPic_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/back.4bpp.lz"); const u32 gMonShinyPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/shiny.gbapal.lz"); const u8 gMonIcon_Garganacl[] = INCBIN_U8("graphics/pokemon/garganacl/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Garganacl[] = INCBIN_U8("graphics/pokemon/garganacl/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_NACLI #if P_FAMILY_CHARCADET @@ -10219,21 +12105,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/back.4bpp.lz"); const u32 gMonShinyPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/shiny.gbapal.lz"); const u8 gMonIcon_Charcadet[] = INCBIN_U8("graphics/pokemon/charcadet/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Charcadet[] = INCBIN_U8("graphics/pokemon/charcadet/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/front.4bpp.lz"); const u32 gMonPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/normal.gbapal.lz"); const u32 gMonBackPic_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/back.4bpp.lz"); const u32 gMonShinyPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/shiny.gbapal.lz"); const u8 gMonIcon_Armarouge[] = INCBIN_U8("graphics/pokemon/armarouge/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Armarouge[] = INCBIN_U8("graphics/pokemon/armarouge/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/front.4bpp.lz"); const u32 gMonPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/normal.gbapal.lz"); const u32 gMonBackPic_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/back.4bpp.lz"); const u32 gMonShinyPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/shiny.gbapal.lz"); const u8 gMonIcon_Ceruledge[] = INCBIN_U8("graphics/pokemon/ceruledge/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Ceruledge[] = INCBIN_U8("graphics/pokemon/ceruledge/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CHARCADET #if P_FAMILY_TADBULB @@ -10242,14 +12134,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/back.4bpp.lz"); const u32 gMonShinyPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/shiny.gbapal.lz"); const u8 gMonIcon_Tadbulb[] = INCBIN_U8("graphics/pokemon/tadbulb/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Tadbulb[] = INCBIN_U8("graphics/pokemon/tadbulb/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/front.4bpp.lz"); const u32 gMonPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/normal.gbapal.lz"); const u32 gMonBackPic_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/back.4bpp.lz"); const u32 gMonShinyPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/shiny.gbapal.lz"); const u8 gMonIcon_Bellibolt[] = INCBIN_U8("graphics/pokemon/bellibolt/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Bellibolt[] = INCBIN_U8("graphics/pokemon/bellibolt/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TADBULB #if P_FAMILY_WATTREL @@ -10258,14 +12154,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/back.4bpp.lz"); const u32 gMonShinyPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/shiny.gbapal.lz"); const u8 gMonIcon_Wattrel[] = INCBIN_U8("graphics/pokemon/wattrel/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Wattrel[] = INCBIN_U8("graphics/pokemon/wattrel/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/front.4bpp.lz"); const u32 gMonPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/normal.gbapal.lz"); const u32 gMonBackPic_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/back.4bpp.lz"); const u32 gMonShinyPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/shiny.gbapal.lz"); const u8 gMonIcon_Kilowattrel[] = INCBIN_U8("graphics/pokemon/kilowattrel/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Kilowattrel[] = INCBIN_U8("graphics/pokemon/kilowattrel/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_WATTREL #if P_FAMILY_MASCHIFF @@ -10274,14 +12174,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/back.4bpp.lz"); const u32 gMonShinyPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/shiny.gbapal.lz"); const u8 gMonIcon_Maschiff[] = INCBIN_U8("graphics/pokemon/maschiff/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Maschiff[] = INCBIN_U8("graphics/pokemon/maschiff/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/front.4bpp.lz"); const u32 gMonPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/normal.gbapal.lz"); const u32 gMonBackPic_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/back.4bpp.lz"); const u32 gMonShinyPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/shiny.gbapal.lz"); const u8 gMonIcon_Mabosstiff[] = INCBIN_U8("graphics/pokemon/mabosstiff/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Mabosstiff[] = INCBIN_U8("graphics/pokemon/mabosstiff/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MASCHIFF #if P_FAMILY_SHROODLE @@ -10290,14 +12194,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/back.4bpp.lz"); const u32 gMonShinyPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/shiny.gbapal.lz"); const u8 gMonIcon_Shroodle[] = INCBIN_U8("graphics/pokemon/shroodle/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Shroodle[] = INCBIN_U8("graphics/pokemon/shroodle/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/front.4bpp.lz"); const u32 gMonPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/normal.gbapal.lz"); const u32 gMonBackPic_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/back.4bpp.lz"); const u32 gMonShinyPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/shiny.gbapal.lz"); const u8 gMonIcon_Grafaiai[] = INCBIN_U8("graphics/pokemon/grafaiai/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Grafaiai[] = INCBIN_U8("graphics/pokemon/grafaiai/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SHROODLE #if P_FAMILY_BRAMBLIN @@ -10306,14 +12214,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/back.4bpp.lz"); const u32 gMonShinyPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/shiny.gbapal.lz"); const u8 gMonIcon_Bramblin[] = INCBIN_U8("graphics/pokemon/bramblin/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Bramblin[] = INCBIN_U8("graphics/pokemon/bramblin/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/front.4bpp.lz"); const u32 gMonPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/normal.gbapal.lz"); const u32 gMonBackPic_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/back.4bpp.lz"); const u32 gMonShinyPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/shiny.gbapal.lz"); const u8 gMonIcon_Brambleghast[] = INCBIN_U8("graphics/pokemon/brambleghast/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Brambleghast[] = INCBIN_U8("graphics/pokemon/brambleghast/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BRAMBLIN #if P_FAMILY_TOEDSCOOL @@ -10322,14 +12234,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/back.4bpp.lz"); const u32 gMonShinyPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/shiny.gbapal.lz"); const u8 gMonIcon_Toedscool[] = INCBIN_U8("graphics/pokemon/toedscool/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Toedscool[] = INCBIN_U8("graphics/pokemon/toedscool/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/front.4bpp.lz"); const u32 gMonPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/normal.gbapal.lz"); const u32 gMonBackPic_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/back.4bpp.lz"); const u32 gMonShinyPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/shiny.gbapal.lz"); const u8 gMonIcon_Toedscruel[] = INCBIN_U8("graphics/pokemon/toedscruel/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Toedscruel[] = INCBIN_U8("graphics/pokemon/toedscruel/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TOEDSCOOL #if P_FAMILY_KLAWF @@ -10338,7 +12254,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/back.4bpp.lz"); const u32 gMonShinyPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/shiny.gbapal.lz"); const u8 gMonIcon_Klawf[] = INCBIN_U8("graphics/pokemon/klawf/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Klawf[] = INCBIN_U8("graphics/pokemon/klawf/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_KLAWF #if P_FAMILY_CAPSAKID @@ -10347,14 +12265,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/back.4bpp.lz"); const u32 gMonShinyPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/shiny.gbapal.lz"); const u8 gMonIcon_Capsakid[] = INCBIN_U8("graphics/pokemon/capsakid/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Capsakid[] = INCBIN_U8("graphics/pokemon/capsakid/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/front.4bpp.lz"); const u32 gMonPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/normal.gbapal.lz"); const u32 gMonBackPic_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/back.4bpp.lz"); const u32 gMonShinyPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/shiny.gbapal.lz"); const u8 gMonIcon_Scovillain[] = INCBIN_U8("graphics/pokemon/scovillain/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Scovillain[] = INCBIN_U8("graphics/pokemon/scovillain/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CAPSAKID #if P_FAMILY_RELLOR @@ -10363,14 +12285,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/back.4bpp.lz"); const u32 gMonShinyPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/shiny.gbapal.lz"); const u8 gMonIcon_Rellor[] = INCBIN_U8("graphics/pokemon/rellor/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Rellor[] = INCBIN_U8("graphics/pokemon/rellor/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/front.4bpp.lz"); const u32 gMonPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/normal.gbapal.lz"); const u32 gMonBackPic_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/back.4bpp.lz"); const u32 gMonShinyPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/shiny.gbapal.lz"); const u8 gMonIcon_Rabsca[] = INCBIN_U8("graphics/pokemon/rabsca/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Rabsca[] = INCBIN_U8("graphics/pokemon/rabsca/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_RELLOR #if P_FAMILY_FLITTLE @@ -10379,14 +12305,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/back.4bpp.lz"); const u32 gMonShinyPalette_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/shiny.gbapal.lz"); const u8 gMonIcon_Flittle[] = INCBIN_U8("graphics/pokemon/flittle/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Flittle[] = INCBIN_U8("graphics/pokemon/flittle/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/front.4bpp.lz"); const u32 gMonPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/normal.gbapal.lz"); const u32 gMonBackPic_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/back.4bpp.lz"); const u32 gMonShinyPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/shiny.gbapal.lz"); const u8 gMonIcon_Espathra[] = INCBIN_U8("graphics/pokemon/espathra/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Espathra[] = INCBIN_U8("graphics/pokemon/espathra/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_FLITTLE #if P_FAMILY_TINKATINK @@ -10395,21 +12325,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/back.4bpp.lz"); const u32 gMonShinyPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/shiny.gbapal.lz"); const u8 gMonIcon_Tinkatink[] = INCBIN_U8("graphics/pokemon/tinkatink/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Tinkatink[] = INCBIN_U8("graphics/pokemon/tinkatink/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/front.4bpp.lz"); const u32 gMonPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/normal.gbapal.lz"); const u32 gMonBackPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/back.4bpp.lz"); const u32 gMonShinyPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/shiny.gbapal.lz"); const u8 gMonIcon_Tinkatuff[] = INCBIN_U8("graphics/pokemon/tinkatuff/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Tinkatuff[] = INCBIN_U8("graphics/pokemon/tinkatuff/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/front.4bpp.lz"); const u32 gMonPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/normal.gbapal.lz"); const u32 gMonBackPic_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/back.4bpp.lz"); const u32 gMonShinyPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/shiny.gbapal.lz"); const u8 gMonIcon_Tinkaton[] = INCBIN_U8("graphics/pokemon/tinkaton/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Tinkaton[] = INCBIN_U8("graphics/pokemon/tinkaton/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TINKATINK #if P_FAMILY_WIGLETT @@ -10418,14 +12354,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/back.4bpp.lz"); const u32 gMonShinyPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/shiny.gbapal.lz"); const u8 gMonIcon_Wiglett[] = INCBIN_U8("graphics/pokemon/wiglett/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Wiglett[] = INCBIN_U8("graphics/pokemon/wiglett/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/front.4bpp.lz"); const u32 gMonPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/normal.gbapal.lz"); const u32 gMonBackPic_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/back.4bpp.lz"); const u32 gMonShinyPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/shiny.gbapal.lz"); const u8 gMonIcon_Wugtrio[] = INCBIN_U8("graphics/pokemon/wugtrio/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Wugtrio[] = INCBIN_U8("graphics/pokemon/wugtrio/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_WIGLETT #if P_FAMILY_BOMBIRDIER @@ -10434,7 +12374,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/back.4bpp.lz"); const u32 gMonShinyPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/shiny.gbapal.lz"); const u8 gMonIcon_Bombirdier[] = INCBIN_U8("graphics/pokemon/bombirdier/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Bombirdier[] = INCBIN_U8("graphics/pokemon/bombirdier/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BOMBIRDIER #if P_FAMILY_FINIZEN @@ -10443,14 +12385,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/back.4bpp.lz"); const u32 gMonShinyPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/shiny.gbapal.lz"); const u8 gMonIcon_Finizen[] = INCBIN_U8("graphics/pokemon/finizen/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Finizen[] = INCBIN_U8("graphics/pokemon/finizen/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/front.4bpp.lz"); const u32 gMonPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/normal.gbapal.lz"); const u32 gMonBackPic_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/back.4bpp.lz"); const u32 gMonShinyPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/shiny.gbapal.lz"); const u8 gMonIcon_PalafinZero[] = INCBIN_U8("graphics/pokemon/palafin/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Palafin[] = INCBIN_U8("graphics/pokemon/palafin/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/front.4bpp.lz"); const u32 gMonPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/normal.gbapal.lz"); @@ -10465,14 +12411,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/back.4bpp.lz"); const u32 gMonShinyPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/shiny.gbapal.lz"); const u8 gMonIcon_Varoom[] = INCBIN_U8("graphics/pokemon/varoom/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Varoom[] = INCBIN_U8("graphics/pokemon/varoom/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/front.4bpp.lz"); const u32 gMonPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/normal.gbapal.lz"); const u32 gMonBackPic_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/back.4bpp.lz"); const u32 gMonShinyPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/shiny.gbapal.lz"); const u8 gMonIcon_Revavroom[] = INCBIN_U8("graphics/pokemon/revavroom/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Revavroom[] = INCBIN_U8("graphics/pokemon/revavroom/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_VAROOM #if P_FAMILY_CYCLIZAR @@ -10481,7 +12431,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/back.4bpp.lz"); const u32 gMonShinyPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/shiny.gbapal.lz"); const u8 gMonIcon_Cyclizar[] = INCBIN_U8("graphics/pokemon/cyclizar/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Cyclizar[] = INCBIN_U8("graphics/pokemon/cyclizar/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CYCLIZAR #if P_FAMILY_ORTHWORM @@ -10490,7 +12442,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/back.4bpp.lz"); const u32 gMonShinyPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/shiny.gbapal.lz"); const u8 gMonIcon_Orthworm[] = INCBIN_U8("graphics/pokemon/orthworm/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Orthworm[] = INCBIN_U8("graphics/pokemon/orthworm/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ORTHWORM #if P_FAMILY_GLIMMET @@ -10499,14 +12453,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/back.4bpp.lz"); const u32 gMonShinyPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/shiny.gbapal.lz"); const u8 gMonIcon_Glimmet[] = INCBIN_U8("graphics/pokemon/glimmet/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Glimmet[] = INCBIN_U8("graphics/pokemon/glimmet/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/front.4bpp.lz"); const u32 gMonPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/normal.gbapal.lz"); const u32 gMonBackPic_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/back.4bpp.lz"); const u32 gMonShinyPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/shiny.gbapal.lz"); const u8 gMonIcon_Glimmora[] = INCBIN_U8("graphics/pokemon/glimmora/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Glimmora[] = INCBIN_U8("graphics/pokemon/glimmora/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_GLIMMET #if P_FAMILY_GREAVARD @@ -10515,14 +12473,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/back.4bpp.lz"); const u32 gMonShinyPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/shiny.gbapal.lz"); const u8 gMonIcon_Greavard[] = INCBIN_U8("graphics/pokemon/greavard/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Greavard[] = INCBIN_U8("graphics/pokemon/greavard/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/front.4bpp.lz"); const u32 gMonPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/normal.gbapal.lz"); const u32 gMonBackPic_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/back.4bpp.lz"); const u32 gMonShinyPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/shiny.gbapal.lz"); const u8 gMonIcon_Houndstone[] = INCBIN_U8("graphics/pokemon/houndstone/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Houndstone[] = INCBIN_U8("graphics/pokemon/houndstone/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_GREAVARD #if P_FAMILY_FLAMIGO @@ -10531,7 +12493,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/back.4bpp.lz"); const u32 gMonShinyPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/shiny.gbapal.lz"); const u8 gMonIcon_Flamigo[] = INCBIN_U8("graphics/pokemon/flamigo/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Flamigo[] = INCBIN_U8("graphics/pokemon/flamigo/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_FLAMIGO #if P_FAMILY_CETODDLE @@ -10540,14 +12504,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/back.4bpp.lz"); const u32 gMonShinyPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/shiny.gbapal.lz"); const u8 gMonIcon_Cetoddle[] = INCBIN_U8("graphics/pokemon/cetoddle/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Cetoddle[] = INCBIN_U8("graphics/pokemon/cetoddle/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/front.4bpp.lz"); const u32 gMonPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/normal.gbapal.lz"); const u32 gMonBackPic_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/back.4bpp.lz"); const u32 gMonShinyPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/shiny.gbapal.lz"); const u8 gMonIcon_Cetitan[] = INCBIN_U8("graphics/pokemon/cetitan/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Cetitan[] = INCBIN_U8("graphics/pokemon/cetitan/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CETODDLE #if P_FAMILY_VELUZA @@ -10556,7 +12524,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/back.4bpp.lz"); const u32 gMonShinyPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/shiny.gbapal.lz"); const u8 gMonIcon_Veluza[] = INCBIN_U8("graphics/pokemon/veluza/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Veluza[] = INCBIN_U8("graphics/pokemon/veluza/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_VELUZA #if P_FAMILY_DONDOZO @@ -10565,7 +12535,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/back.4bpp.lz"); const u32 gMonShinyPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/shiny.gbapal.lz"); const u8 gMonIcon_Dondozo[] = INCBIN_U8("graphics/pokemon/dondozo/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Dondozo[] = INCBIN_U8("graphics/pokemon/dondozo/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_DONDOZO #if P_FAMILY_TATSUGIRI @@ -10574,7 +12546,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/back.4bpp.lz"); const u32 gMonShinyPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/shiny.gbapal.lz"); const u8 gMonIcon_TatsugiriCurly[] = INCBIN_U8("graphics/pokemon/tatsugiri/curly/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Tatsugiri[] = INCBIN_U8("graphics/pokemon/tatsugiri/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/front.4bpp.lz"); const u32 gMonPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/normal.gbapal.lz"); @@ -10595,7 +12569,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/back.4bpp.lz"); const u32 gMonShinyPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/shiny.gbapal.lz"); const u8 gMonIcon_GreatTusk[] = INCBIN_U8("graphics/pokemon/great_tusk/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_GreatTusk[] = INCBIN_U8("graphics/pokemon/great_tusk/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_GREAT_TUSK #if P_FAMILY_SCREAM_TAIL @@ -10604,7 +12580,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/back.4bpp.lz"); const u32 gMonShinyPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/shiny.gbapal.lz"); const u8 gMonIcon_ScreamTail[] = INCBIN_U8("graphics/pokemon/scream_tail/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_ScreamTail[] = INCBIN_U8("graphics/pokemon/scream_tail/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SCREAM_TAIL #if P_FAMILY_BRUTE_BONNET @@ -10613,7 +12591,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/back.4bpp.lz"); const u32 gMonShinyPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/shiny.gbapal.lz"); const u8 gMonIcon_BruteBonnet[] = INCBIN_U8("graphics/pokemon/brute_bonnet/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_BruteBonnet[] = INCBIN_U8("graphics/pokemon/brute_bonnet/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_BRUTE_BONNET #if P_FAMILY_FLUTTER_MANE @@ -10622,7 +12602,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/back.4bpp.lz"); const u32 gMonShinyPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/shiny.gbapal.lz"); const u8 gMonIcon_FlutterMane[] = INCBIN_U8("graphics/pokemon/flutter_mane/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_FlutterMane[] = INCBIN_U8("graphics/pokemon/flutter_mane/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_FLUTTER_MANE #if P_FAMILY_SLITHER_WING @@ -10631,7 +12613,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/back.4bpp.lz"); const u32 gMonShinyPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/shiny.gbapal.lz"); const u8 gMonIcon_SlitherWing[] = INCBIN_U8("graphics/pokemon/slither_wing/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_SlitherWing[] = INCBIN_U8("graphics/pokemon/slither_wing/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SLITHER_WING #if P_FAMILY_SANDY_SHOCKS @@ -10640,7 +12624,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/back.4bpp.lz"); const u32 gMonShinyPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/shiny.gbapal.lz"); const u8 gMonIcon_SandyShocks[] = INCBIN_U8("graphics/pokemon/sandy_shocks/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_SandyShocks[] = INCBIN_U8("graphics/pokemon/sandy_shocks/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_SANDY_SHOCKS #if P_FAMILY_IRON_TREADS @@ -10649,7 +12635,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/back.4bpp.lz"); const u32 gMonShinyPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/shiny.gbapal.lz"); const u8 gMonIcon_IronTreads[] = INCBIN_U8("graphics/pokemon/iron_treads/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_IronTreads[] = INCBIN_U8("graphics/pokemon/iron_treads/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_TREADS #if P_FAMILY_IRON_BUNDLE @@ -10658,7 +12646,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/back.4bpp.lz"); const u32 gMonShinyPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/shiny.gbapal.lz"); const u8 gMonIcon_IronBundle[] = INCBIN_U8("graphics/pokemon/iron_bundle/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_IronBundle[] = INCBIN_U8("graphics/pokemon/iron_bundle/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_BUNDLE #if P_FAMILY_IRON_HANDS @@ -10667,7 +12657,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/back.4bpp.lz"); const u32 gMonShinyPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/shiny.gbapal.lz"); const u8 gMonIcon_IronHands[] = INCBIN_U8("graphics/pokemon/iron_hands/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_IronHands[] = INCBIN_U8("graphics/pokemon/iron_hands/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_HANDS #if P_FAMILY_IRON_JUGULIS @@ -10676,7 +12668,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/back.4bpp.lz"); const u32 gMonShinyPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/shiny.gbapal.lz"); const u8 gMonIcon_IronJugulis[] = INCBIN_U8("graphics/pokemon/iron_jugulis/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_IronJugulis[] = INCBIN_U8("graphics/pokemon/iron_jugulis/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_JUGULIS #if P_FAMILY_IRON_MOTH @@ -10685,7 +12679,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/back.4bpp.lz"); const u32 gMonShinyPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/shiny.gbapal.lz"); const u8 gMonIcon_IronMoth[] = INCBIN_U8("graphics/pokemon/iron_moth/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_IronMoth[] = INCBIN_U8("graphics/pokemon/iron_moth/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_MOTH #if P_FAMILY_IRON_THORNS @@ -10694,7 +12690,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/back.4bpp.lz"); const u32 gMonShinyPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/shiny.gbapal.lz"); const u8 gMonIcon_IronThorns[] = INCBIN_U8("graphics/pokemon/iron_thorns/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_IronThorns[] = INCBIN_U8("graphics/pokemon/iron_thorns/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_THORNS #if P_FAMILY_FRIGIBAX @@ -10703,21 +12701,27 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/back.4bpp.lz"); const u32 gMonShinyPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/shiny.gbapal.lz"); const u8 gMonIcon_Frigibax[] = INCBIN_U8("graphics/pokemon/frigibax/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Frigibax[] = INCBIN_U8("graphics/pokemon/frigibax/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/front.4bpp.lz"); const u32 gMonPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/normal.gbapal.lz"); const u32 gMonBackPic_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/back.4bpp.lz"); const u32 gMonShinyPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/shiny.gbapal.lz"); const u8 gMonIcon_Arctibax[] = INCBIN_U8("graphics/pokemon/arctibax/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Arctibax[] = INCBIN_U8("graphics/pokemon/arctibax/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/front.4bpp.lz"); const u32 gMonPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/normal.gbapal.lz"); const u32 gMonBackPic_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/back.4bpp.lz"); const u32 gMonShinyPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/shiny.gbapal.lz"); const u8 gMonIcon_Baxcalibur[] = INCBIN_U8("graphics/pokemon/baxcalibur/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Baxcalibur[] = INCBIN_U8("graphics/pokemon/baxcalibur/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_FRIGIBAX #if P_FAMILY_GIMMIGHOUL @@ -10726,7 +12730,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/back.4bpp.lz"); const u32 gMonShinyPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/shiny.gbapal.lz"); const u8 gMonIcon_GimmighoulChest[] = INCBIN_U8("graphics/pokemon/gimmighoul/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Gimmighoul[] = INCBIN_U8("graphics/pokemon/gimmighoul/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/front.4bpp.lz"); const u32 gMonPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/normal.gbapal.lz"); @@ -10739,7 +12745,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/back.4bpp.lz"); const u32 gMonShinyPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/shiny.gbapal.lz"); const u8 gMonIcon_Gholdengo[] = INCBIN_U8("graphics/pokemon/gholdengo/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Gholdengo[] = INCBIN_U8("graphics/pokemon/gholdengo/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_GIMMIGHOUL #if P_FAMILY_WO_CHIEN @@ -10748,7 +12756,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/back.4bpp.lz"); const u32 gMonShinyPalette_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/shiny.gbapal.lz"); const u8 gMonIcon_WoChien[] = INCBIN_U8("graphics/pokemon/wo_chien/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_WoChien[] = INCBIN_U8("graphics/pokemon/wo_chien/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_WO_CHIEN #if P_FAMILY_CHIEN_PAO @@ -10757,7 +12767,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/back.4bpp.lz"); const u32 gMonShinyPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/shiny.gbapal.lz"); const u8 gMonIcon_ChienPao[] = INCBIN_U8("graphics/pokemon/chien_pao/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_ChienPao[] = INCBIN_U8("graphics/pokemon/chien_pao/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CHIEN_PAO #if P_FAMILY_TING_LU @@ -10766,7 +12778,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/back.4bpp.lz"); const u32 gMonShinyPalette_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/shiny.gbapal.lz"); const u8 gMonIcon_TingLu[] = INCBIN_U8("graphics/pokemon/ting_lu/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_TingLu[] = INCBIN_U8("graphics/pokemon/ting_lu/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_TING_LU #if P_FAMILY_CHI_YU @@ -10775,7 +12789,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/back.4bpp.lz"); const u32 gMonShinyPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/shiny.gbapal.lz"); const u8 gMonIcon_ChiYu[] = INCBIN_U8("graphics/pokemon/chi_yu/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_ChiYu[] = INCBIN_U8("graphics/pokemon/chi_yu/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_CHI_YU #if P_FAMILY_ROARING_MOON @@ -10784,7 +12800,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/back.4bpp.lz"); const u32 gMonShinyPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/shiny.gbapal.lz"); const u8 gMonIcon_RoaringMoon[] = INCBIN_U8("graphics/pokemon/roaring_moon/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_RoaringMoon[] = INCBIN_U8("graphics/pokemon/roaring_moon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_ROARING_MOON #if P_FAMILY_IRON_VALIANT @@ -10793,7 +12811,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/back.4bpp.lz"); const u32 gMonShinyPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/shiny.gbapal.lz"); const u8 gMonIcon_IronValiant[] = INCBIN_U8("graphics/pokemon/iron_valiant/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_IronValiant[] = INCBIN_U8("graphics/pokemon/iron_valiant/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_VALIANT #if P_FAMILY_KORAIDON @@ -10802,7 +12822,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/back.4bpp.lz"); const u32 gMonShinyPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/shiny.gbapal.lz"); const u8 gMonIcon_Koraidon[] = INCBIN_U8("graphics/pokemon/koraidon/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Koraidon[] = INCBIN_U8("graphics/pokemon/koraidon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_KORAIDON #if P_FAMILY_MIRAIDON @@ -10811,7 +12833,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/back.4bpp.lz"); const u32 gMonShinyPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/shiny.gbapal.lz"); const u8 gMonIcon_Miraidon[] = INCBIN_U8("graphics/pokemon/miraidon/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Miraidon[] = INCBIN_U8("graphics/pokemon/miraidon/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MIRAIDON #if P_FAMILY_WALKING_WAKE @@ -10820,7 +12844,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/back.4bpp.lz"); const u32 gMonShinyPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/shiny.gbapal.lz"); const u8 gMonIcon_WalkingWake[] = INCBIN_U8("graphics/pokemon/walking_wake/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_WalkingWake[] = INCBIN_U8("graphics/pokemon/walking_wake/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_WALKING_WAKE #if P_FAMILY_IRON_LEAVES @@ -10829,7 +12855,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/back.4bpp.lz"); const u32 gMonShinyPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/shiny.gbapal.lz"); const u8 gMonIcon_IronLeaves[] = INCBIN_U8("graphics/pokemon/iron_leaves/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_IronLeaves[] = INCBIN_U8("graphics/pokemon/iron_leaves/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_LEAVES #if P_FAMILY_POLTCHAGEIST @@ -10838,14 +12866,18 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/back.4bpp.lz"); const u32 gMonShinyPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/shiny.gbapal.lz"); const u8 gMonIcon_Poltchageist[] = INCBIN_U8("graphics/pokemon/poltchageist/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Poltchageist[] = INCBIN_U8("graphics/pokemon/poltchageist/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/front.4bpp.lz"); const u32 gMonPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/normal.gbapal.lz"); const u32 gMonBackPic_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/back.4bpp.lz"); const u32 gMonShinyPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/shiny.gbapal.lz"); const u8 gMonIcon_Sinistcha[] = INCBIN_U8("graphics/pokemon/sinistcha/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Sinistcha[] = INCBIN_U8("graphics/pokemon/sinistcha/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_POLTCHAGEIST #if P_FAMILY_OKIDOGI @@ -10854,7 +12886,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/back.4bpp.lz"); const u32 gMonShinyPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/shiny.gbapal.lz"); const u8 gMonIcon_Okidogi[] = INCBIN_U8("graphics/pokemon/okidogi/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Okidogi[] = INCBIN_U8("graphics/pokemon/okidogi/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_OKIDOGI #if P_FAMILY_MUNKIDORI @@ -10863,7 +12897,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/back.4bpp.lz"); const u32 gMonShinyPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/shiny.gbapal.lz"); const u8 gMonIcon_Munkidori[] = INCBIN_U8("graphics/pokemon/munkidori/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Munkidori[] = INCBIN_U8("graphics/pokemon/munkidori/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_MUNKIDORI #if P_FAMILY_FEZANDIPITI @@ -10872,7 +12908,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/back.4bpp.lz"); const u32 gMonShinyPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/shiny.gbapal.lz"); const u8 gMonIcon_Fezandipiti[] = INCBIN_U8("graphics/pokemon/fezandipiti/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Fezandipiti[] = INCBIN_U8("graphics/pokemon/fezandipiti/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_FEZANDIPITI #if P_FAMILY_OGERPON @@ -10881,7 +12919,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonBackPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/back.4bpp.lz"); // const u32 gMonShinyPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/shiny.gbapal.lz"); const u8 gMonIcon_OgerponTealMask[] = INCBIN_U8("graphics/pokemon/ogerpon/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Ogerpon[] = INCBIN_U8("graphics/pokemon/ogerpon/footprint.1bpp"); +#endif //P_FOOTPRINTS const u32 gMonFrontPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/front.4bpp.lz"); const u32 gMonPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/normal.gbapal.lz"); @@ -10928,7 +12968,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar // const u32 gMonBackPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/back.4bpp.lz"); // const u32 gMonShinyPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/shiny.gbapal.lz"); // const u8 gMonIcon_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_GOUGING_FIRE #if P_FAMILY_RAGING_BOLT @@ -10937,7 +12979,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar // const u32 gMonBackPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/back.4bpp.lz"); // const u32 gMonShinyPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/shiny.gbapal.lz"); // const u8 gMonIcon_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_RAGING_BOLT #if P_FAMILY_IRON_BOULDER @@ -10946,7 +12990,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar // const u32 gMonBackPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/back.4bpp.lz"); // const u32 gMonShinyPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/shiny.gbapal.lz"); // const u8 gMonIcon_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_BOULDER #if P_FAMILY_IRON_CROWN @@ -10955,7 +13001,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar // const u32 gMonBackPic_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/back.4bpp.lz"); // const u32 gMonShinyPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/shiny.gbapal.lz"); // const u8 gMonIcon_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_CROWN #if P_FAMILY_TERAPAGOS @@ -10964,7 +13012,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar // const u32 gMonBackPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/back.4bpp.lz"); // const u32 gMonShinyPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/shiny.gbapal.lz"); // const u8 gMonIcon_TerapagosNormal[] = INCBIN_U8("graphics/pokemon/terapagos/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Terapagos[] = INCBIN_U8("graphics/pokemon/terapagos/footprint.1bpp"); +#endif //P_FOOTPRINTS // const u32 gMonFrontPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/front.4bpp.lz"); // const u32 gMonPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/normal.gbapal.lz"); @@ -10985,7 +13035,9 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar // const u32 gMonBackPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/back.4bpp.lz"); // const u32 gMonShinyPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/shiny.gbapal.lz"); // const u8 gMonIcon_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/icon.4bpp"); +#if P_FOOTPRINTS // const u8 gMonFootprint_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/footprint.1bpp"); +#endif //P_FOOTPRINTS #endif //P_FAMILY_PECHARUNT const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz"); diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index e250403fbc..2e0d6bb791 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -217,6 +217,12 @@ const u8 gOgerponCornerstoneMaskPokedexText[] = _( .levelUpLearnset = s ## learn##LevelUpLearnset, \ .teachableLearnset = s ## learn##TeachableLearnset +#if P_FOOTPRINTS +#define FOOTPRINT(sprite) .footprint = gMonFootprint_## sprite +#else +#define FOOTPRINT(sprite) .footprint = NULL +#endif + // Maximum value for a female Pokémon is 254 (MON_FEMALE) which is 100% female. // 255 (MON_GENDERLESS) is reserved for genderless Pokémon. #define PERCENT_FEMALE(percent) min(254, ((percent * 255) / 100)) @@ -330,7 +336,7 @@ const struct SpeciesInfo gSpeciesInfo[] = //PALETTE_FEMALE(CircledQuestionMark), ICON(QuestionMark, 0), //ICON_FEMALE(QuestionMark, 1), - //.footprint = gMonFootprint_None, + //FOOTPRINT(None), LEARNSETS(None), .evolutions = EVOLUTION({EVO_LEVEL, 100, SPECIES_NONE}, {EVO_ITEM, ITEM_MOOMOO_MILK, SPECIES_NONE}), diff --git a/src/data/pokemon/species_info/gen_1.h b/src/data/pokemon/species_info/gen_1.h index b502422c0b..ba72bca4cf 100644 --- a/src/data/pokemon/species_info/gen_1.h +++ b/src/data/pokemon/species_info/gen_1.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Bulbasaur), ICON(Bulbasaur, 4), - .footprint = gMonFootprint_Bulbasaur, + FOOTPRINT(Bulbasaur), LEARNSETS(Bulbasaur), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_IVYSAUR}), }, @@ -96,7 +96,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Ivysaur), ICON(Ivysaur, 4), - .footprint = gMonFootprint_Ivysaur, + FOOTPRINT(Ivysaur), LEARNSETS(Ivysaur), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_VENUSAUR}), }, @@ -115,7 +115,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Venusaur"), \ .natDexNum = NATIONAL_DEX_VENUSAUR, \ .categoryName = _("Seed"), \ - .footprint = gMonFootprint_Venusaur, \ + FOOTPRINT(Venusaur), \ LEARNSETS(Venusaur), \ .formSpeciesIdTable = sVenusaurFormSpeciesIdTable, \ .formChangeTable = sVenusaurFormChangeTable @@ -274,7 +274,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Charmander), ICON(Charmander, 0), - .footprint = gMonFootprint_Charmander, + FOOTPRINT(Charmander), LEARNSETS(Charmander), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_CHARMELEON}), }, @@ -323,7 +323,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Charmeleon), ICON(Charmeleon, 0), - .footprint = gMonFootprint_Charmeleon, + FOOTPRINT(Charmeleon), LEARNSETS(Charmeleon), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_CHARIZARD}), }, @@ -339,7 +339,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Charizard"), \ .natDexNum = NATIONAL_DEX_CHARIZARD, \ .categoryName = _("Flame"), \ - .footprint = gMonFootprint_Charizard, \ + FOOTPRINT(Charizard), \ LEARNSETS(Charizard), \ .formSpeciesIdTable = sCharizardFormSpeciesIdTable, \ .formChangeTable = sCharizardFormChangeTable @@ -539,7 +539,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Squirtle), ICON(Squirtle, 0), - .footprint = gMonFootprint_Squirtle, + FOOTPRINT(Squirtle), LEARNSETS(Squirtle), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_WARTORTLE}), }, @@ -588,7 +588,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Wartortle), ICON(Wartortle, 2), - .footprint = gMonFootprint_Wartortle, + FOOTPRINT(Wartortle), LEARNSETS(Wartortle), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_BLASTOISE}), }, @@ -606,7 +606,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Blastoise"), \ .natDexNum = NATIONAL_DEX_BLASTOISE, \ .categoryName = _("Shellfish"), \ - .footprint = gMonFootprint_Blastoise, \ + FOOTPRINT(Blastoise), \ LEARNSETS(Blastoise), \ .formSpeciesIdTable = sBlastoiseFormSpeciesIdTable, \ .formChangeTable = sBlastoiseFormChangeTable @@ -765,7 +765,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Caterpie), ICON(Caterpie, 1), - .footprint = gMonFootprint_Caterpie, + FOOTPRINT(Caterpie), LEARNSETS(Caterpie), .evolutions = EVOLUTION({EVO_LEVEL, 7, SPECIES_METAPOD}), }, @@ -813,7 +813,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Metapod), ICON(Metapod, 1), - .footprint = gMonFootprint_Metapod, + FOOTPRINT(Metapod), LEARNSETS(Metapod), .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_BUTTERFREE}), }, @@ -842,7 +842,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_BUTTERFREE, \ .natDexNum = NATIONAL_DEX_BUTTERFREE, \ .categoryName = _("Butterfly"), \ - .footprint = gMonFootprint_Butterfree, \ + FOOTPRINT(Butterfree), \ LEARNSETS(Butterfree), \ .formSpeciesIdTable = sButterfreeFormSpeciesIdTable, \ .formChangeTable = sButterfreeFormChangeTable @@ -950,7 +950,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Weedle), ICON(Weedle, 2), - .footprint = gMonFootprint_Weedle, + FOOTPRINT(Weedle), LEARNSETS(Weedle), .evolutions = EVOLUTION({EVO_LEVEL, 7, SPECIES_KAKUNA}), }, @@ -999,7 +999,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Kakuna), ICON(Kakuna, 2), - .footprint = gMonFootprint_Kakuna, + FOOTPRINT(Kakuna), LEARNSETS(Kakuna), .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_BEEDRILL}), }, @@ -1021,7 +1021,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Beedrill"), \ .natDexNum = NATIONAL_DEX_BEEDRILL, \ .categoryName = _("Poison Bee"), \ - .footprint = gMonFootprint_Beedrill, \ + FOOTPRINT(Beedrill), \ LEARNSETS(Beedrill), \ .formSpeciesIdTable = sBeedrillFormSpeciesIdTable, \ .formChangeTable = sBeedrillFormChangeTable @@ -1144,7 +1144,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Pidgey), ICON(Pidgey, 0), - .footprint = gMonFootprint_Pidgey, + FOOTPRINT(Pidgey), LEARNSETS(Pidgey), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_PIDGEOTTO}), }, @@ -1193,7 +1193,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Pidgeotto), ICON(Pidgeotto, 0), - .footprint = gMonFootprint_Pidgeotto, + FOOTPRINT(Pidgeotto), LEARNSETS(Pidgeotto), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_PIDGEOT}), }, @@ -1213,7 +1213,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Pidgeot"), \ .natDexNum = NATIONAL_DEX_PIDGEOT, \ .categoryName = _("Bird"), \ - .footprint = gMonFootprint_Pidgeot, \ + FOOTPRINT(Pidgeot), \ LEARNSETS(Pidgeot), \ .formSpeciesIdTable = sPidgeotFormSpeciesIdTable, \ .formChangeTable = sPidgeotFormChangeTable @@ -1313,7 +1313,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_RATTATA, \ .natDexNum = NATIONAL_DEX_RATTATA, \ .categoryName = _("Mouse"), \ - .footprint = gMonFootprint_Rattata, \ + FOOTPRINT(Rattata), \ .formSpeciesIdTable = sRattataFormSpeciesIdTable #define RATICATE_MISC_INFO \ @@ -1325,7 +1325,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_RATICATE, \ .categoryName = _("Mouse"), \ .height = 7, \ - .footprint = gMonFootprint_Raticate,\ + FOOTPRINT(Raticate), \ .formSpeciesIdTable = sRaticateFormSpeciesIdTable [SPECIES_RATTATA] = @@ -1516,7 +1516,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Spearow), ICON(Spearow, 0), - .footprint = gMonFootprint_Spearow, + FOOTPRINT(Spearow), LEARNSETS(Spearow), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_FEAROW}), }, @@ -1567,7 +1567,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Fearow), ICON(Fearow, 0), - .footprint = gMonFootprint_Fearow, + FOOTPRINT(Fearow), LEARNSETS(Fearow), }, #endif //P_FAMILY_SPEAROW @@ -1617,7 +1617,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Ekans), ICON(Ekans, 2), - .footprint = gMonFootprint_Ekans, + FOOTPRINT(Ekans), LEARNSETS(Ekans), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARBOK}), }, @@ -1665,7 +1665,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Arbok), ICON(Arbok, 2), - .footprint = gMonFootprint_Arbok, + FOOTPRINT(Arbok), LEARNSETS(Arbok), }, #endif //P_FAMILY_EKANS @@ -1701,7 +1701,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 20, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Pichu, \ + FOOTPRINT(Pichu), \ LEARNSETS(Pichu), \ .formSpeciesIdTable = sPichuFormSpeciesIdTable @@ -1757,7 +1757,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_PIKACHU, \ .natDexNum = NATIONAL_DEX_PIKACHU, \ .categoryName = _("Mouse"), \ - .footprint = gMonFootprint_Pikachu, \ + FOOTPRINT(Pikachu), \ LEARNSETS(Pikachu), \ .formSpeciesIdTable = sPikachuFormSpeciesIdTable @@ -2102,7 +2102,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_RAICHU, \ .natDexNum = NATIONAL_DEX_RAICHU, \ .categoryName = _("Mouse"), \ - .footprint = gMonFootprint_Raichu, \ + FOOTPRINT(Raichu), \ .formSpeciesIdTable = sRaichuFormSpeciesIdTable [SPECIES_RAICHU] = @@ -2198,7 +2198,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_SANDSHREW, \ .natDexNum = NATIONAL_DEX_SANDSHREW, \ .categoryName = _("Mouse"), \ - .footprint = gMonFootprint_Sandshrew, \ + FOOTPRINT(Sandshrew), \ .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, \ SANDSHREW_FAMILY_MISC_INFO @@ -2210,7 +2210,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_SANDSLASH, \ .natDexNum = NATIONAL_DEX_SANDSLASH, \ .categoryName = _("Mouse"), \ - .footprint = gMonFootprint_Sandslash, \ + FOOTPRINT(Sandslash), \ .formSpeciesIdTable = sSandslashFormSpeciesIdTable, \ SANDSHREW_FAMILY_MISC_INFO @@ -2406,7 +2406,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(NidoranF), ICON(NidoranF, 0), - .footprint = gMonFootprint_NidoranF, + FOOTPRINT(NidoranF), LEARNSETS(NidoranF), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_NIDORINA}), }, @@ -2454,7 +2454,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Nidorina), ICON(Nidorina, 0), - .footprint = gMonFootprint_Nidorina, + FOOTPRINT(Nidorina), LEARNSETS(Nidorina), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOQUEEN}), }, @@ -2502,7 +2502,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Nidoqueen), ICON(Nidoqueen, 2), - .footprint = gMonFootprint_Nidoqueen, + FOOTPRINT(Nidoqueen), LEARNSETS(Nidoqueen), }, @@ -2549,7 +2549,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(NidoranM), ICON(NidoranM, 2), - .footprint = gMonFootprint_NidoranM, + FOOTPRINT(NidoranM), LEARNSETS(NidoranM), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_NIDORINO}), }, @@ -2597,7 +2597,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Nidorino), ICON(Nidorino, 2), - .footprint = gMonFootprint_Nidorino, + FOOTPRINT(Nidorino), LEARNSETS(Nidorino), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOKING}), }, @@ -2646,7 +2646,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Nidoking), ICON(Nidoking, 2), - .footprint = gMonFootprint_Nidoking, + FOOTPRINT(Nidoking), LEARNSETS(Nidoking), }, #endif //P_FAMILY_NIDORAN @@ -2704,7 +2704,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Cleffa), ICON(Cleffa, 0), - .footprint = gMonFootprint_Cleffa, + FOOTPRINT(Cleffa), LEARNSETS(Cleffa), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_CLEFAIRY}), }, @@ -2755,7 +2755,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Clefairy), ICON(Clefairy, 0), - .footprint = gMonFootprint_Clefairy, + FOOTPRINT(Clefairy), LEARNSETS(Clefairy), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_CLEFABLE}), }, @@ -2805,7 +2805,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Clefable), ICON(Clefable, 0), - .footprint = gMonFootprint_Clefable, + FOOTPRINT(Clefable), LEARNSETS(Clefable), }, #endif //P_FAMILY_CLEFAIRY @@ -2838,7 +2838,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Vulpix, \ + FOOTPRINT(Vulpix), \ .formSpeciesIdTable = sVulpixFormSpeciesIdTable,\ VULPIX_FAMILY_MISC_INFO @@ -2857,7 +2857,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Ninetales, \ + FOOTPRINT(Ninetales), \ .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, \ VULPIX_FAMILY_MISC_INFO @@ -3028,7 +3028,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Igglybuff), ICON(Igglybuff, 1), - .footprint = gMonFootprint_Igglybuff, + FOOTPRINT(Igglybuff), LEARNSETS(Igglybuff), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF}), }, @@ -3079,7 +3079,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Jigglypuff), ICON(Jigglypuff, 0), - .footprint = gMonFootprint_Jigglypuff, + FOOTPRINT(Jigglypuff), LEARNSETS(Jigglypuff), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_WIGGLYTUFF}), }, @@ -3129,7 +3129,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Wigglytuff), ICON(Wigglytuff, 0), - .footprint = gMonFootprint_Wigglytuff, + FOOTPRINT(Wigglytuff), LEARNSETS(Wigglytuff), }, #endif //P_FAMILY_JIGGLYPUFF @@ -3181,7 +3181,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Zubat), ICON(Zubat, 2), - .footprint = gMonFootprint_Zubat, + FOOTPRINT(Zubat), LEARNSETS(Zubat), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_GOLBAT}), }, @@ -3232,7 +3232,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Golbat), ICON(Golbat, 2), - .footprint = gMonFootprint_Golbat, + FOOTPRINT(Golbat), LEARNSETS(Golbat), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_CROBAT}), }, @@ -3282,7 +3282,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Crobat), ICON(Crobat, 2), - .footprint = gMonFootprint_Crobat, + FOOTPRINT(Crobat), LEARNSETS(Crobat), }, #endif //P_GEN_2_CROSS_EVOS @@ -3333,7 +3333,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Oddish), ICON(Oddish, 4), - .footprint = gMonFootprint_Oddish, + FOOTPRINT(Oddish), LEARNSETS(Oddish), .evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_GLOOM}), }, @@ -3384,7 +3384,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Gloom), ICON(Gloom, 0), - .footprint = gMonFootprint_Gloom, + FOOTPRINT(Gloom), LEARNSETS(Gloom), .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VILEPLUME}, {EVO_ITEM, ITEM_SUN_STONE, SPECIES_BELLOSSOM}), @@ -3436,7 +3436,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Vileplume), ICON(Vileplume, 0), - .footprint = gMonFootprint_Vileplume, + FOOTPRINT(Vileplume), LEARNSETS(Vileplume), }, @@ -3485,7 +3485,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Bellossom), ICON(Bellossom, 1), - .footprint = gMonFootprint_Bellossom, + FOOTPRINT(Bellossom), LEARNSETS(Bellossom), }, #endif //P_GEN_2_CROSS_EVOS @@ -3538,7 +3538,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Paras), ICON(Paras, 0), - .footprint = gMonFootprint_Paras, + FOOTPRINT(Paras), LEARNSETS(Paras), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_PARASECT}), }, @@ -3590,7 +3590,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Parasect), ICON(Parasect, 0), - .footprint = gMonFootprint_Parasect, + FOOTPRINT(Parasect), LEARNSETS(Parasect), }, #endif //P_FAMILY_PARAS @@ -3640,7 +3640,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Venonat), ICON(Venonat, 2), - .footprint = gMonFootprint_Venonat, + FOOTPRINT(Venonat), LEARNSETS(Venonat), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_VENOMOTH}), }, @@ -3691,7 +3691,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Venomoth), ICON(Venomoth, 2), - .footprint = gMonFootprint_Venomoth, + FOOTPRINT(Venomoth), LEARNSETS(Venomoth), }, #endif //P_FAMILY_VENONAT @@ -3719,7 +3719,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 25, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Diglett, \ + FOOTPRINT(Diglett), \ .formSpeciesIdTable = sDiglettFormSpeciesIdTable, \ DIGLETT_FAMILY_MISC_INFO @@ -3879,7 +3879,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_MEOWTH, \ .natDexNum = NATIONAL_DEX_MEOWTH, \ .categoryName = _("Scratch Cat"), \ - .footprint = gMonFootprint_Meowth, \ + FOOTPRINT(Meowth), \ .formSpeciesIdTable = sMeowthFormSpeciesIdTable #define PERSIAN_MISC_INFO \ @@ -3896,7 +3896,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_PERSIAN, \ .natDexNum = NATIONAL_DEX_PERSIAN, \ .categoryName = _("Classy Cat"), \ - .footprint = gMonFootprint_Persian, \ + FOOTPRINT(Persian), \ .formSpeciesIdTable = sPersianFormSpeciesIdTable [SPECIES_MEOWTH] = @@ -4133,7 +4133,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Perrserker), ICON(Perrserker, 2), - .footprint = gMonFootprint_Perrserker, + FOOTPRINT(Perrserker), LEARNSETS(Perrserker), }, #endif //P_GALARIAN_FORMS @@ -4224,7 +4224,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Psyduck), ICON(Psyduck, 1), - .footprint = gMonFootprint_Psyduck, + FOOTPRINT(Psyduck), LEARNSETS(Psyduck), .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_GOLDUCK}), }, @@ -4272,7 +4272,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Golduck), ICON(Golduck, 0), - .footprint = gMonFootprint_Golduck, + FOOTPRINT(Golduck), LEARNSETS(Golduck), }, #endif //P_FAMILY_PSYDUCK @@ -4322,7 +4322,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Mankey), ICON(Mankey, 1), - .footprint = gMonFootprint_Mankey, + FOOTPRINT(Mankey), LEARNSETS(Mankey), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_PRIMEAPE}), }, @@ -4370,7 +4370,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Primeape), ICON(Primeape, 2), - .footprint = gMonFootprint_Primeape, + FOOTPRINT(Primeape), LEARNSETS(Primeape), .evolutions = EVOLUTION({EVO_MOVE, MOVE_RAGE_FIST, SPECIES_ANNIHILAPE}), }, @@ -4419,7 +4419,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Annihilape), ICON(Annihilape, 0), - //.footprint = gMonFootprint_Annihilape, + //FOOTPRINT(Annihilape), LEARNSETS(Annihilape), }, #endif //P_GEN_9_CROSS_EVOS @@ -4441,7 +4441,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Growlithe"), \ .cryId = CRY_GROWLITHE, \ .natDexNum = NATIONAL_DEX_GROWLITHE, \ - .footprint = gMonFootprint_Growlithe, \ + FOOTPRINT(Growlithe), \ .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, \ GROWLITHE_FAMILY_MISC_INFO @@ -4453,7 +4453,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_ARCANINE, \ .natDexNum = NATIONAL_DEX_ARCANINE, \ .categoryName = _("Legendary"), \ - .footprint = gMonFootprint_Arcanine, \ + FOOTPRINT(Arcanine), \ .formSpeciesIdTable = sArcanineFormSpeciesIdTable, \ GROWLITHE_FAMILY_MISC_INFO @@ -4649,7 +4649,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Poliwag), ICON(Poliwag, 0), - .footprint = gMonFootprint_Poliwag, + FOOTPRINT(Poliwag), LEARNSETS(Poliwag), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_POLIWHIRL}), }, @@ -4700,7 +4700,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Poliwhirl), ICON(Poliwhirl, 0), - .footprint = gMonFootprint_Poliwhirl, + FOOTPRINT(Poliwhirl), LEARNSETS(Poliwhirl), .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_POLIWRATH}, {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_POLITOED}, @@ -4752,7 +4752,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Poliwrath), ICON(Poliwrath, 0), - .footprint = gMonFootprint_Poliwrath, + FOOTPRINT(Poliwrath), LEARNSETS(Poliwrath), }, @@ -4805,7 +4805,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Politoed), ICON(Politoed, 1), - .footprint = gMonFootprint_Politoed, + FOOTPRINT(Politoed), LEARNSETS(Politoed), }, #endif //P_GEN_2_CROSS_EVOS @@ -4856,7 +4856,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Abra), ICON(Abra, 2), - .footprint = gMonFootprint_Abra, + FOOTPRINT(Abra), LEARNSETS(Abra), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_KADABRA}), }, @@ -4908,7 +4908,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Kadabra), ICON(Kadabra, 2), - .footprint = gMonFootprint_Kadabra, + FOOTPRINT(Kadabra), LEARNSETS(Kadabra), .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_ALAKAZAM}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_ALAKAZAM}), @@ -4930,7 +4930,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Alakazam"), \ .natDexNum = NATIONAL_DEX_ALAKAZAM, \ .categoryName = _("Psi"), \ - .footprint = gMonFootprint_Alakazam, \ + FOOTPRINT(Alakazam), \ LEARNSETS(Alakazam), \ .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, \ .formChangeTable = sAlakazamFormChangeTable @@ -5054,7 +5054,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Machop), ICON(Machop, 0), - .footprint = gMonFootprint_Machop, + FOOTPRINT(Machop), LEARNSETS(Machop), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_MACHOKE}), }, @@ -5104,7 +5104,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Machoke), ICON(Machoke, 2), - .footprint = gMonFootprint_Machoke, + FOOTPRINT(Machoke), LEARNSETS(Machoke), .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_MACHAMP}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_MACHAMP}), @@ -5133,7 +5133,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_MACHAMP, \ .natDexNum = NATIONAL_DEX_MACHAMP, \ .categoryName = _("Superpower"), \ - .footprint = gMonFootprint_Machamp, \ + FOOTPRINT(Machamp), \ LEARNSETS(Machamp), \ .formSpeciesIdTable = sMachampFormSpeciesIdTable, \ .formChangeTable = sMachampFormChangeTable @@ -5236,7 +5236,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Bellsprout), ICON(Bellsprout, 1), - .footprint = gMonFootprint_Bellsprout, + FOOTPRINT(Bellsprout), LEARNSETS(Bellsprout), .evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_WEEPINBELL}), }, @@ -5285,7 +5285,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Weepinbell), ICON(Weepinbell, 1), - .footprint = gMonFootprint_Weepinbell, + FOOTPRINT(Weepinbell), LEARNSETS(Weepinbell), .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VICTREEBEL}), }, @@ -5333,7 +5333,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Victreebel), ICON(Victreebel, 1), - .footprint = gMonFootprint_Victreebel, + FOOTPRINT(Victreebel), LEARNSETS(Victreebel), }, #endif //P_FAMILY_BELLSPROUT @@ -5383,7 +5383,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Tentacool), ICON(Tentacool, 0), - .footprint = gMonFootprint_Tentacool, + FOOTPRINT(Tentacool), LEARNSETS(Tentacool), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_TENTACRUEL}), }, @@ -5432,7 +5432,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Tentacruel), ICON(Tentacruel, 0), - .footprint = gMonFootprint_Tentacruel, + FOOTPRINT(Tentacruel), LEARNSETS(Tentacruel), }, #endif //P_FAMILY_TENTACOOL @@ -5470,7 +5470,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Geodude, \ + FOOTPRINT(Geodude), \ .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, \ GEODUDE_FAMILY_MISC_INFO @@ -5493,7 +5493,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Graveler, \ + FOOTPRINT(Graveler), \ .formSpeciesIdTable = sGravelerFormSpeciesIdTable, \ GEODUDE_FAMILY_MISC_INFO @@ -5513,7 +5513,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_GOLEM, \ .natDexNum = NATIONAL_DEX_GOLEM, \ .categoryName = _("Megaton"), \ - .footprint = gMonFootprint_Golem, \ + FOOTPRINT(Golem), \ .formSpeciesIdTable = sGolemFormSpeciesIdTable, \ GEODUDE_FAMILY_MISC_INFO @@ -5704,7 +5704,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Ponyta"), \ .cryId = CRY_PONYTA, \ .natDexNum = NATIONAL_DEX_PONYTA, \ - .footprint = gMonFootprint_Ponyta, \ + FOOTPRINT(Ponyta), \ .formSpeciesIdTable = sPonytaFormSpeciesIdTable,\ PONYTA_FAMILY_MISC_INFO @@ -5726,7 +5726,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, \ .trainerScale = 289, \ .trainerOffset = 1, \ - .footprint = gMonFootprint_Rapidash, \ + FOOTPRINT(Rapidash), \ .formSpeciesIdTable = sRapidashFormSpeciesIdTable, \ PONYTA_FAMILY_MISC_INFO @@ -5871,7 +5871,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Slowpoke, \ + FOOTPRINT(Slowpoke), \ .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable #define SLOWBRO_MISC_INFO \ @@ -5887,7 +5887,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_SLOWBRO, \ .natDexNum = NATIONAL_DEX_SLOWBRO, \ .categoryName = _("Hermit Crab"), \ - .footprint = gMonFootprint_Slowbro, \ + FOOTPRINT(Slowbro), \ .formSpeciesIdTable = sSlowbroFormSpeciesIdTable #define SLOWKING_MISC_INFO \ @@ -5903,7 +5903,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_SLOWKING, \ .natDexNum = NATIONAL_DEX_SLOWKING, \ .weight = 795, \ - .footprint = gMonFootprint_Slowking, \ + FOOTPRINT(Slowking), \ .formSpeciesIdTable = sSlowkingFormSpeciesIdTable [SPECIES_SLOWPOKE] = @@ -6198,7 +6198,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Magnemite), ICON(Magnemite, 0), - .footprint = gMonFootprint_Magnemite, + FOOTPRINT(Magnemite), LEARNSETS(Magnemite), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MAGNETON}), }, @@ -6248,7 +6248,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Magneton), ICON(Magneton, 0), - .footprint = gMonFootprint_Magneton, + FOOTPRINT(Magneton), LEARNSETS(Magneton), .evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_MAGNEZONE}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_MAGNEZONE}), @@ -6300,7 +6300,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Magnezone), ICON(Magnezone, 0), - .footprint = gMonFootprint_Magnezone, + FOOTPRINT(Magnezone), LEARNSETS(Magnezone), }, #endif //P_GEN_4_CROSS_EVOS @@ -6323,7 +6323,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_FARFETCHD, \ .natDexNum = NATIONAL_DEX_FARFETCHD, \ .categoryName = _("Wild Duck"), \ - .footprint = gMonFootprint_Farfetchd, \ + FOOTPRINT(Farfetchd), \ .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable [SPECIES_FARFETCHD] = @@ -6443,7 +6443,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Sirfetchd), ICON(Sirfetchd, 1), - .footprint = gMonFootprint_Sirfetchd, + FOOTPRINT(Sirfetchd), LEARNSETS(Sirfetchd), }, #endif //P_GALARIAN_FORMS @@ -6496,7 +6496,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Doduo), ICON(Doduo, 2), - .footprint = gMonFootprint_Doduo, + FOOTPRINT(Doduo), LEARNSETS(Doduo), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_DODRIO}), }, @@ -6547,7 +6547,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Dodrio), ICON(Dodrio, 2), - .footprint = gMonFootprint_Dodrio, + FOOTPRINT(Dodrio), LEARNSETS(Dodrio), }, #endif //P_FAMILY_DODUO @@ -6596,7 +6596,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Seel), ICON(Seel, 0), - .footprint = gMonFootprint_Seel, + FOOTPRINT(Seel), LEARNSETS(Seel), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_DEWGONG}), }, @@ -6644,7 +6644,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Dewgong), ICON(Dewgong, 2), - .footprint = gMonFootprint_Dewgong, + FOOTPRINT(Dewgong), LEARNSETS(Dewgong), }, #endif //P_FAMILY_SEEL @@ -6672,7 +6672,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_GRIMER, \ .natDexNum = NATIONAL_DEX_GRIMER, \ .categoryName = _("Sludge"), \ - .footprint = gMonFootprint_Grimer, \ + FOOTPRINT(Grimer), \ .formSpeciesIdTable = sGrimerFormSpeciesIdTable,\ GRIMER_FAMILY_MISC_INFO @@ -6691,7 +6691,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_MUK, \ .natDexNum = NATIONAL_DEX_MUK, \ .categoryName = _("Sludge"), \ - .footprint = gMonFootprint_Muk, \ + FOOTPRINT(Muk), \ .formSpeciesIdTable = sMukFormSpeciesIdTable, \ GRIMER_FAMILY_MISC_INFO @@ -6868,7 +6868,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Shellder), ICON(Shellder, 2), - .footprint = gMonFootprint_Shellder, + FOOTPRINT(Shellder), LEARNSETS(Shellder), .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_CLOYSTER}), }, @@ -6918,7 +6918,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Cloyster), ICON(Cloyster, 2), - .footprint = gMonFootprint_Cloyster, + FOOTPRINT(Cloyster), LEARNSETS(Cloyster), }, #endif //P_FAMILY_SHELLDER @@ -6968,7 +6968,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Gastly), ICON(Gastly, 2), - .footprint = gMonFootprint_Gastly, + FOOTPRINT(Gastly), LEARNSETS(Gastly), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_HAUNTER}), }, @@ -7018,7 +7018,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Haunter), ICON(Haunter, 2), - .footprint = gMonFootprint_Haunter, + FOOTPRINT(Haunter), LEARNSETS(Haunter), .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GENGAR}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GENGAR}), @@ -7043,7 +7043,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Gengar"), \ .natDexNum = NATIONAL_DEX_GENGAR, \ .categoryName = _("Shadow"), \ - .footprint = gMonFootprint_Gengar, \ + FOOTPRINT(Gengar), \ LEARNSETS(Gengar), \ .formSpeciesIdTable = sGengarFormSpeciesIdTable, \ .formChangeTable = sGengarFormChangeTable @@ -7198,7 +7198,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Onix), ICON(Onix, 2), - .footprint = gMonFootprint_Onix, + FOOTPRINT(Onix), LEARNSETS(Onix), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}, {EVO_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}), @@ -7219,7 +7219,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Steelix"), \ .natDexNum = NATIONAL_DEX_STEELIX, \ .categoryName = _("Iron Snake"), \ - .footprint = gMonFootprint_Steelix, \ + FOOTPRINT(Steelix), \ LEARNSETS(Steelix), \ .formSpeciesIdTable = sSteelixFormSpeciesIdTable, \ .formChangeTable = sSteelixFormChangeTable @@ -7345,7 +7345,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Drowzee), ICON(Drowzee, 2), - .footprint = gMonFootprint_Drowzee, + FOOTPRINT(Drowzee), LEARNSETS(Drowzee), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_HYPNO}), }, @@ -7396,7 +7396,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Hypno), ICON(Hypno, 2), - .footprint = gMonFootprint_Hypno, + FOOTPRINT(Hypno), LEARNSETS(Hypno), }, #endif //P_FAMILY_DROWZEE @@ -7445,7 +7445,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Krabby), ICON(Krabby, 0), - .footprint = gMonFootprint_Krabby, + FOOTPRINT(Krabby), LEARNSETS(Krabby), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_KINGLER}), }, @@ -7473,7 +7473,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_KINGLER, \ .natDexNum = NATIONAL_DEX_KINGLER, \ .categoryName = _("Pincer"), \ - .footprint = gMonFootprint_Kingler, \ + FOOTPRINT(Kingler), \ LEARNSETS(Kingler), \ .formSpeciesIdTable = sKinglerFormSpeciesIdTable, \ .formChangeTable = sKinglerFormChangeTable @@ -7561,7 +7561,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -8, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Voltorb, \ + FOOTPRINT(Voltorb), \ .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, \ VOLTORB_FAMILY_MISC_INFO @@ -7583,7 +7583,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Electrode, \ + FOOTPRINT(Electrode), \ .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, \ VOLTORB_FAMILY_MISC_INFO @@ -7731,7 +7731,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Exeggcute), ICON(Exeggcute, 0), - .footprint = gMonFootprint_Exeggcute, + FOOTPRINT(Exeggcute), LEARNSETS(Exeggcute), .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR}, {EVO_NONE, 0, SPECIES_EXEGGUTOR_ALOLAN}), @@ -7751,7 +7751,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_EXEGGUTOR, \ .natDexNum = NATIONAL_DEX_EXEGGUTOR, \ .categoryName = _("Coconut"), \ - .footprint = gMonFootprint_Exeggutor, \ + FOOTPRINT(Exeggutor), \ .formSpeciesIdTable = sExeggutorFormSpeciesIdTable #define EXEGGUTOR_SP_DEF (P_UPDATED_STATS >= GEN_7 ? 75 : 65) @@ -7874,7 +7874,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Cubone), ICON(Cubone, 2), - .footprint = gMonFootprint_Cubone, + FOOTPRINT(Cubone), LEARNSETS(Cubone), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_MAROWAK}, {EVO_NONE, 0, SPECIES_MAROWAK_ALOLAN}), @@ -7905,7 +7905,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 12, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Marowak, \ + FOOTPRINT(Marowak), \ .formSpeciesIdTable = sMarowakFormSpeciesIdTable [SPECIES_MAROWAK] = @@ -8005,7 +8005,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Tyrogue), ICON(Tyrogue, 2), - .footprint = gMonFootprint_Tyrogue, + FOOTPRINT(Tyrogue), LEARNSETS(Tyrogue), .evolutions = EVOLUTION({EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN}, {EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE}, @@ -8056,7 +8056,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Hitmonlee), ICON(Hitmonlee, 2), - .footprint = gMonFootprint_Hitmonlee, + FOOTPRINT(Hitmonlee), LEARNSETS(Hitmonlee), }, @@ -8103,7 +8103,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Hitmonchan), ICON(Hitmonchan, 2), - .footprint = gMonFootprint_Hitmonchan, + FOOTPRINT(Hitmonchan), LEARNSETS(Hitmonchan), }, @@ -8151,7 +8151,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, PALETTES(Hitmontop), ICON(Hitmontop, 2), - .footprint = gMonFootprint_Hitmontop, + FOOTPRINT(Hitmontop), LEARNSETS(Hitmontop), }, #endif //P_GEN_2_CROSS_EVOS @@ -8202,7 +8202,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Lickitung), ICON(Lickitung, 0), - .footprint = gMonFootprint_Lickitung, + FOOTPRINT(Lickitung), LEARNSETS(Lickitung), .evolutions = EVOLUTION({EVO_MOVE, MOVE_ROLLOUT, SPECIES_LICKILICKY}), }, @@ -8252,7 +8252,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Lickilicky), ICON(Lickilicky, 1), - .footprint = gMonFootprint_Lickilicky, + FOOTPRINT(Lickilicky), LEARNSETS(Lickilicky), }, #endif //P_GEN_4_CROSS_EVOS @@ -8308,7 +8308,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Koffing), ICON(Koffing, 2), - .footprint = gMonFootprint_Koffing, + FOOTPRINT(Koffing), LEARNSETS(Koffing), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_WEEZING}, {EVO_NONE, 0, SPECIES_WEEZING_GALARIAN}), @@ -8334,7 +8334,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_WEEZING, \ .natDexNum = NATIONAL_DEX_WEEZING, \ .categoryName = _("Poison Gas"), \ - .footprint = gMonFootprint_Weezing, \ + FOOTPRINT(Weezing), \ .formSpeciesIdTable = sWeezingFormSpeciesIdTable [SPECIES_WEEZING] = @@ -8453,7 +8453,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Rhyhorn), ICON(Rhyhorn, 1), - .footprint = gMonFootprint_Rhyhorn, + FOOTPRINT(Rhyhorn), LEARNSETS(Rhyhorn), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_RHYDON}), }, @@ -8503,7 +8503,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Rhydon), ICON(Rhydon, 1), - .footprint = gMonFootprint_Rhydon, + FOOTPRINT(Rhydon), LEARNSETS(Rhydon), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_PROTECTOR, SPECIES_RHYPERIOR}, {EVO_ITEM, ITEM_PROTECTOR, SPECIES_RHYPERIOR}), @@ -8555,7 +8555,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Rhyperior), ICON(Rhyperior, 0), - .footprint = gMonFootprint_Rhyperior, + FOOTPRINT(Rhyperior), LEARNSETS(Rhyperior), }, #endif //P_GEN_4_CROSS_EVOS @@ -8607,7 +8607,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Happiny), ICON(Happiny, 0), - .footprint = gMonFootprint_Happiny, + FOOTPRINT(Happiny), LEARNSETS(Happiny), .evolutions = EVOLUTION({EVO_ITEM_HOLD_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY}, {EVO_ITEM_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY}), @@ -8658,7 +8658,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Chansey), ICON(Chansey, 0), - .footprint = gMonFootprint_Chansey, + FOOTPRINT(Chansey), LEARNSETS(Chansey), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}), }, @@ -8708,7 +8708,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Blissey), ICON(Blissey, 0), - .footprint = gMonFootprint_Blissey, + FOOTPRINT(Blissey), LEARNSETS(Blissey), }, #endif //P_GEN_2_CROSS_EVOS @@ -8758,7 +8758,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Tangela), ICON(Tangela, 0), - .footprint = gMonFootprint_Tangela, + FOOTPRINT(Tangela), LEARNSETS(Tangela), .evolutions = EVOLUTION({EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_TANGROWTH}), }, @@ -8808,7 +8808,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Tangrowth), ICON(Tangrowth, 0), - .footprint = gMonFootprint_Tangrowth, + FOOTPRINT(Tangrowth), LEARNSETS(Tangrowth), }, #endif //P_GEN_4_CROSS_EVOS @@ -8833,7 +8833,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, \ .trainerScale = 387, \ .trainerOffset = 8, \ - .footprint = gMonFootprint_Kangaskhan, \ + FOOTPRINT(Kangaskhan), \ LEARNSETS(Kangaskhan), \ .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, \ .formChangeTable = sKangaskhanFormChangeTable @@ -8945,7 +8945,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Horsea), ICON(Horsea, 0), - .footprint = gMonFootprint_Horsea, + FOOTPRINT(Horsea), LEARNSETS(Horsea), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_SEADRA}), }, @@ -8995,7 +8995,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Seadra), ICON(Seadra, 0), - .footprint = gMonFootprint_Seadra, + FOOTPRINT(Seadra), LEARNSETS(Seadra), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}, {EVO_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}), @@ -9048,7 +9048,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Kingdra), ICON(Kingdra, 0), - .footprint = gMonFootprint_Kingdra, + FOOTPRINT(Kingdra), LEARNSETS(Kingdra), }, #endif //P_GEN_2_CROSS_EVOS @@ -9101,7 +9101,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Goldeen), ICON(Goldeen, 0), - .footprint = gMonFootprint_Goldeen, + FOOTPRINT(Goldeen), LEARNSETS(Goldeen), .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_SEAKING}), }, @@ -9152,7 +9152,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Seaking), ICON(Seaking, 0), - .footprint = gMonFootprint_Seaking, + FOOTPRINT(Seaking), LEARNSETS(Seaking), }, #endif //P_FAMILY_GOLDEEN @@ -9204,7 +9204,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Staryu), ICON(Staryu, 2), - .footprint = gMonFootprint_Staryu, + FOOTPRINT(Staryu), LEARNSETS(Staryu), .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_STARMIE}), }, @@ -9254,7 +9254,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Starmie), ICON(Starmie, 2), - .footprint = gMonFootprint_Starmie, + FOOTPRINT(Starmie), LEARNSETS(Starmie), }, #endif //P_FAMILY_STARYU @@ -9308,7 +9308,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(MimeJr), ICON(MimeJr, 0), - .footprint = gMonFootprint_MimeJr, + FOOTPRINT(MimeJr), LEARNSETS(MimeJr), .evolutions = EVOLUTION({EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME}, {EVO_NONE, 0, SPECIES_MR_MIME_GALARIAN}), @@ -9326,7 +9326,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Mr. Mime"), \ .cryId = CRY_MR_MIME, \ .natDexNum = NATIONAL_DEX_MR_MIME, \ - .footprint = gMonFootprint_MrMime, \ + FOOTPRINT(MrMime), \ .formSpeciesIdTable = sMrMimeFormSpeciesIdTable [SPECIES_MR_MIME] = @@ -9452,7 +9452,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(MrRime), ICON(MrRime, 0), - .footprint = gMonFootprint_MrRime, + FOOTPRINT(MrRime), LEARNSETS(MrRime), }, #endif //P_GALARIAN_FORMS @@ -9504,7 +9504,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Scyther), ICON(Scyther, 1), - .footprint = gMonFootprint_Scyther, + FOOTPRINT(Scyther), LEARNSETS(Scyther), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}, {EVO_ITEM, ITEM_BLACK_AUGURITE, SPECIES_KLEAVOR}, @@ -9525,7 +9525,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Scizor"), \ .natDexNum = NATIONAL_DEX_SCIZOR, \ .categoryName = _("Pincer"), \ - .footprint = gMonFootprint_Scizor, \ + FOOTPRINT(Scizor), \ LEARNSETS(Scizor), \ .formSpeciesIdTable = sScizorFormSpeciesIdTable,\ .formChangeTable = sScizorFormChangeTable @@ -9648,7 +9648,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Kleavor), ICON(Kleavor, 2), - //.footprint = gMonFootprint_Kleavor, + //FOOTPRINT(Kleavor), LEARNSETS(Kleavor), }, #endif //P_GEN_8_CROSS_EVOS @@ -9700,7 +9700,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Smoochum), ICON(Smoochum, 1), - .footprint = gMonFootprint_Smoochum, + FOOTPRINT(Smoochum), LEARNSETS(Smoochum), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_JYNX}), }, @@ -9749,7 +9749,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Jynx), ICON(Jynx, 2), - .footprint = gMonFootprint_Jynx, + FOOTPRINT(Jynx), LEARNSETS(Jynx), }, #endif //P_FAMILY_JYNX @@ -9801,7 +9801,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Elekid), ICON(Elekid, 1), - .footprint = gMonFootprint_Elekid, + FOOTPRINT(Elekid), LEARNSETS(Elekid), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ELECTABUZZ}), }, @@ -9852,7 +9852,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Electabuzz), ICON(Electabuzz, 1), - .footprint = gMonFootprint_Electabuzz, + FOOTPRINT(Electabuzz), LEARNSETS(Electabuzz), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE}, {EVO_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE}), @@ -9903,7 +9903,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Electivire), ICON(Electivire, 1), - .footprint = gMonFootprint_Electivire, + FOOTPRINT(Electivire), LEARNSETS(Electivire), }, #endif //P_GEN_4_CROSS_EVOS @@ -9956,7 +9956,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Magby), ICON(Magby, 0), - .footprint = gMonFootprint_Magby, + FOOTPRINT(Magby), LEARNSETS(Magby), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MAGMAR}), }, @@ -10006,7 +10006,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Magmar), ICON(Magmar, 0), - .footprint = gMonFootprint_Magmar, + FOOTPRINT(Magmar), LEARNSETS(Magmar), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_MAGMARIZER, SPECIES_MAGMORTAR}, {EVO_ITEM, ITEM_MAGMARIZER, SPECIES_MAGMORTAR}), @@ -10058,7 +10058,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Magmortar), ICON(Magmortar, 0), - .footprint = gMonFootprint_Magmortar, + FOOTPRINT(Magmortar), LEARNSETS(Magmortar), }, #endif //P_GEN_4_CROSS_EVOS @@ -10077,7 +10077,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Pinsir"), \ .natDexNum = NATIONAL_DEX_PINSIR, \ .categoryName = _("Stag Beetle"), \ - .footprint = gMonFootprint_Pinsir, \ + FOOTPRINT(Pinsir), \ LEARNSETS(Pinsir), \ .formSpeciesIdTable = sPinsirFormSpeciesIdTable,\ .formChangeTable = sPinsirFormChangeTable @@ -10181,7 +10181,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Tauros, \ + FOOTPRINT(Tauros), \ .formSpeciesIdTable = sTaurosFormSpeciesIdTable [SPECIES_TAUROS] = @@ -10338,7 +10338,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Magikarp), ICON(Magikarp, 0), - .footprint = gMonFootprint_Magikarp, + FOOTPRINT(Magikarp), LEARNSETS(Magikarp), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_GYARADOS}), }, @@ -10360,7 +10360,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 6, \ .trainerScale = 481, \ .trainerOffset = 13, \ - .footprint = gMonFootprint_Gyarados, \ + FOOTPRINT(Gyarados), \ LEARNSETS(Gyarados), \ .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, \ .formChangeTable = sGyaradosFormChangeTable @@ -10457,7 +10457,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_LAPRAS, \ .natDexNum = NATIONAL_DEX_LAPRAS, \ .categoryName = _("Transport"), \ - .footprint = gMonFootprint_Lapras, \ + FOOTPRINT(Lapras), \ LEARNSETS(Lapras), \ .formSpeciesIdTable = sLaprasFormSpeciesIdTable, \ .formChangeTable = sLaprasFormChangeTable @@ -10562,7 +10562,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Ditto), ICON(Ditto, 2), - .footprint = gMonFootprint_Ditto, + FOOTPRINT(Ditto), LEARNSETS(Ditto), }, #endif //P_FAMILY_DITTO @@ -10590,7 +10590,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_EEVEE, \ .natDexNum = NATIONAL_DEX_EEVEE, \ .categoryName = _("Evolution"), \ - .footprint = gMonFootprint_Eevee, \ + FOOTPRINT(Eevee), \ LEARNSETS(Eevee), \ .formSpeciesIdTable = sEeveeFormSpeciesIdTable, \ .formChangeTable = sEeveeFormChangeTable @@ -10703,7 +10703,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Vaporeon), ICON(Vaporeon, 0), - .footprint = gMonFootprint_Vaporeon, + FOOTPRINT(Vaporeon), LEARNSETS(Vaporeon), }, @@ -10750,7 +10750,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Jolteon), ICON(Jolteon, 2), - .footprint = gMonFootprint_Jolteon, + FOOTPRINT(Jolteon), LEARNSETS(Jolteon), }, @@ -10797,7 +10797,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Flareon), ICON(Flareon, 3), - .footprint = gMonFootprint_Flareon, + FOOTPRINT(Flareon), LEARNSETS(Flareon), }, @@ -10845,7 +10845,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Espeon), ICON(Espeon, 2), - .footprint = gMonFootprint_Espeon, + FOOTPRINT(Espeon), LEARNSETS(Espeon), }, @@ -10892,7 +10892,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Umbreon), ICON(Umbreon, 0), - .footprint = gMonFootprint_Umbreon, + FOOTPRINT(Umbreon), LEARNSETS(Umbreon), }, #endif //P_GEN_2_CROSS_EVOS @@ -10941,7 +10941,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Leafeon), ICON(Leafeon, 1), - .footprint = gMonFootprint_Leafeon, + FOOTPRINT(Leafeon), LEARNSETS(Leafeon), }, @@ -10988,7 +10988,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Glaceon), ICON(Glaceon, 0), - .footprint = gMonFootprint_Glaceon, + FOOTPRINT(Glaceon), LEARNSETS(Glaceon), }, #endif //P_GEN_4_CROSS_EVOS @@ -11038,7 +11038,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Sylveon), ICON(Sylveon, 0), - .footprint = gMonFootprint_Sylveon, + FOOTPRINT(Sylveon), LEARNSETS(Sylveon), }, #endif //P_GEN_6_CROSS_EVOS @@ -11088,7 +11088,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Porygon), ICON(Porygon, 0), - .footprint = gMonFootprint_Porygon, + FOOTPRINT(Porygon), LEARNSETS(Porygon), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_UPGRADE, SPECIES_PORYGON2}, {EVO_ITEM, ITEM_UPGRADE, SPECIES_PORYGON2}), @@ -11139,7 +11139,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Porygon2), ICON(Porygon2, 0), - .footprint = gMonFootprint_Porygon2, + FOOTPRINT(Porygon2), LEARNSETS(Porygon2), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z}, {EVO_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z}), @@ -11190,7 +11190,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(PorygonZ), ICON(PorygonZ, 0), - .footprint = gMonFootprint_PorygonZ, + FOOTPRINT(PorygonZ), LEARNSETS(PorygonZ), }, #endif //P_GEN_4_CROSS_EVOS @@ -11241,7 +11241,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Omanyte), ICON(Omanyte, 0), - .footprint = gMonFootprint_Omanyte, + FOOTPRINT(Omanyte), LEARNSETS(Omanyte), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_OMASTAR}), }, @@ -11289,7 +11289,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Omastar), ICON(Omastar, 0), - .footprint = gMonFootprint_Omastar, + FOOTPRINT(Omastar), LEARNSETS(Omastar), }, #endif //P_FAMILY_OMANYTE @@ -11338,7 +11338,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Kabuto), ICON(Kabuto, 2), - .footprint = gMonFootprint_Kabuto, + FOOTPRINT(Kabuto), LEARNSETS(Kabuto), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_KABUTOPS}), }, @@ -11386,7 +11386,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Kabutops), ICON(Kabutops, 2), - .footprint = gMonFootprint_Kabutops, + FOOTPRINT(Kabutops), LEARNSETS(Kabutops), }, #endif //P_FAMILY_KABUTO @@ -11405,7 +11405,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Aerodactyl"), \ .natDexNum = NATIONAL_DEX_AERODACTYL, \ .categoryName = _("Fossil"), \ - .footprint = gMonFootprint_Aerodactyl, \ + FOOTPRINT(Aerodactyl), \ LEARNSETS(Aerodactyl), \ .formSpeciesIdTable = sAerodactylFormSpeciesIdTable,\ .formChangeTable = sAerodactylFormChangeTable @@ -11530,7 +11530,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Munchlax), ICON(Munchlax, 3), - .footprint = gMonFootprint_Munchlax, + FOOTPRINT(Munchlax), LEARNSETS(Munchlax), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_SNORLAX}), }, @@ -11560,7 +11560,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_SNORLAX, \ .natDexNum = NATIONAL_DEX_SNORLAX, \ .categoryName = _("Sleeping"), \ - .footprint = gMonFootprint_Snorlax, \ + FOOTPRINT(Snorlax), \ LEARNSETS(Snorlax), \ .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, \ .formChangeTable = sSnorlaxFormChangeTable @@ -11634,7 +11634,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, \ .trainerScale = 309, \ .trainerOffset = 2, \ - .footprint = gMonFootprint_Articuno, \ + FOOTPRINT(Articuno), \ .formSpeciesIdTable = sArticunoFormSpeciesIdTable, \ .isLegendary = TRUE @@ -11727,7 +11727,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, \ .trainerScale = 318, \ .trainerOffset = 3, \ - .footprint = gMonFootprint_Zapdos, \ + FOOTPRINT(Zapdos), \ .formSpeciesIdTable = sZapdosFormSpeciesIdTable, \ .isLegendary = TRUE @@ -11821,7 +11821,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, \ .trainerScale = 387, \ .trainerOffset = 8, \ - .footprint = gMonFootprint_Moltres, \ + FOOTPRINT(Moltres), \ .formSpeciesIdTable = sMoltresFormSpeciesIdTable, \ .isLegendary = TRUE @@ -11942,7 +11942,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Dratini), ICON(Dratini, 0), - .footprint = gMonFootprint_Dratini, + FOOTPRINT(Dratini), LEARNSETS(Dratini), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_DRAGONAIR}), }, @@ -11991,7 +11991,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Dragonair), ICON(Dragonair, 0), - .footprint = gMonFootprint_Dragonair, + FOOTPRINT(Dragonair), LEARNSETS(Dragonair), .evolutions = EVOLUTION({EVO_LEVEL, 55, SPECIES_DRAGONITE}), }, @@ -12040,7 +12040,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Dragonite), ICON(Dragonite, 2), - .footprint = gMonFootprint_Dragonite, + FOOTPRINT(Dragonite), LEARNSETS(Dragonite), }, #endif //P_FAMILY_DRATINI @@ -12058,7 +12058,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Mewtwo"), \ .natDexNum = NATIONAL_DEX_MEWTWO, \ .categoryName = _("Genetic"), \ - .footprint = gMonFootprint_Mewtwo, \ + FOOTPRINT(Mewtwo), \ LEARNSETS(Mewtwo), \ .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, \ .formChangeTable = sMewtwoFormChangeTable, \ @@ -12223,7 +12223,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Mew), ICON(Mew, 0), - .footprint = gMonFootprint_Mew, + FOOTPRINT(Mew), LEARNSETS(Mew), }, #endif //P_FAMILY_MEW diff --git a/src/data/pokemon/species_info/gen_2.h b/src/data/pokemon/species_info/gen_2.h index 9ac992ea1f..83634aa0ae 100644 --- a/src/data/pokemon/species_info/gen_2.h +++ b/src/data/pokemon/species_info/gen_2.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Chikorita), ICON(Chikorita, 1), - .footprint = gMonFootprint_Chikorita, + FOOTPRINT(Chikorita), LEARNSETS(Chikorita), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_BAYLEEF}), }, @@ -96,7 +96,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Bayleef), ICON(Bayleef, 1), - .footprint = gMonFootprint_Bayleef, + FOOTPRINT(Bayleef), LEARNSETS(Bayleef), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_MEGANIUM}), }, @@ -147,7 +147,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Meganium), ICON(Meganium, 1), - .footprint = gMonFootprint_Meganium, + FOOTPRINT(Meganium), LEARNSETS(Meganium), }, #endif //P_FAMILY_CHIKORITA @@ -196,7 +196,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Cyndaquil), ICON(Cyndaquil, 3), - .footprint = gMonFootprint_Cyndaquil, + FOOTPRINT(Cyndaquil), LEARNSETS(Cyndaquil), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_QUILAVA}), }, @@ -245,7 +245,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Quilava), ICON(Quilava, 3), - .footprint = gMonFootprint_Quilava, + FOOTPRINT(Quilava), LEARNSETS(Quilava), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_TYPHLOSION}, {EVO_NONE, 0, SPECIES_TYPHLOSION_HISUIAN}), @@ -264,7 +264,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .speciesName = _("Typhlosion"), \ .cryId = CRY_TYPHLOSION, \ .natDexNum = NATIONAL_DEX_TYPHLOSION, \ - .footprint = gMonFootprint_Typhlosion, \ + FOOTPRINT(Typhlosion), \ .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable [SPECIES_TYPHLOSION] = @@ -386,7 +386,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Totodile), ICON(Totodile, 0), - .footprint = gMonFootprint_Totodile, + FOOTPRINT(Totodile), LEARNSETS(Totodile), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CROCONAW}), }, @@ -436,7 +436,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Croconaw), ICON(Croconaw, 0), - .footprint = gMonFootprint_Croconaw, + FOOTPRINT(Croconaw), LEARNSETS(Croconaw), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_FERALIGATR}), }, @@ -486,7 +486,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Feraligatr), ICON(Feraligatr, 0), - .footprint = gMonFootprint_Feraligatr, + FOOTPRINT(Feraligatr), LEARNSETS(Feraligatr), }, #endif //P_FAMILY_TOTODILE @@ -535,7 +535,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Sentret), ICON(Sentret, 2), - .footprint = gMonFootprint_Sentret, + FOOTPRINT(Sentret), LEARNSETS(Sentret), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_FURRET}), }, @@ -583,7 +583,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Furret), ICON(Furret, 2), - .footprint = gMonFootprint_Furret, + FOOTPRINT(Furret), LEARNSETS(Furret), }, #endif //P_FAMILY_SENTRET @@ -632,7 +632,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Hoothoot), ICON(Hoothoot, 2), - .footprint = gMonFootprint_Hoothoot, + FOOTPRINT(Hoothoot), LEARNSETS(Hoothoot), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_NOCTOWL}), }, @@ -680,7 +680,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Noctowl), ICON(Noctowl, 2), - .footprint = gMonFootprint_Noctowl, + FOOTPRINT(Noctowl), LEARNSETS(Noctowl), }, #endif //P_FAMILY_HOOTHOOT @@ -731,7 +731,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Ledyba), ICON(Ledyba, 0), - .footprint = gMonFootprint_Ledyba, + FOOTPRINT(Ledyba), LEARNSETS(Ledyba), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_LEDIAN}), }, @@ -782,7 +782,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Ledian), ICON(Ledian, 0), - .footprint = gMonFootprint_Ledian, + FOOTPRINT(Ledian), LEARNSETS(Ledian), }, #endif //P_FAMILY_LEDYBA @@ -831,7 +831,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Spinarak), ICON(Spinarak, 1), - .footprint = gMonFootprint_Spinarak, + FOOTPRINT(Spinarak), LEARNSETS(Spinarak), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARIADOS}), }, @@ -879,7 +879,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Ariados), ICON(Ariados, 0), - .footprint = gMonFootprint_Ariados, + FOOTPRINT(Ariados), LEARNSETS(Ariados), }, #endif //P_FAMILY_SPINARAK @@ -929,7 +929,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Chinchou), ICON(Chinchou, 2), - .footprint = gMonFootprint_Chinchou, + FOOTPRINT(Chinchou), LEARNSETS(Chinchou), .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_LANTURN}), }, @@ -978,7 +978,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Lanturn), ICON(Lanturn, 0), - .footprint = gMonFootprint_Lanturn, + FOOTPRINT(Lanturn), LEARNSETS(Lanturn), }, #endif //P_FAMILY_CHINCHOU @@ -1029,7 +1029,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Togepi), ICON(Togepi, 0), - .footprint = gMonFootprint_Togepi, + FOOTPRINT(Togepi), LEARNSETS(Togepi), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_TOGETIC}), }, @@ -1077,7 +1077,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Togetic), ICON(Togetic, 0), - .footprint = gMonFootprint_Togetic, + FOOTPRINT(Togetic), LEARNSETS(Togetic), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_TOGEKISS}), }, @@ -1133,7 +1133,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Togekiss), ICON(Togekiss, 2), - .footprint = gMonFootprint_Togekiss, + FOOTPRINT(Togekiss), LEARNSETS(Togekiss), }, #endif //P_GEN_4_CROSS_EVOS @@ -1184,7 +1184,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Natu), ICON(Natu, 1), - .footprint = gMonFootprint_Natu, + FOOTPRINT(Natu), LEARNSETS(Natu), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_XATU}), }, @@ -1234,7 +1234,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Xatu), ICON(Xatu, 1), - .footprint = gMonFootprint_Xatu, + FOOTPRINT(Xatu), LEARNSETS(Xatu), }, #endif //P_FAMILY_NATU @@ -1284,7 +1284,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Mareep), ICON(Mareep, 0), - .footprint = gMonFootprint_Mareep, + FOOTPRINT(Mareep), LEARNSETS(Mareep), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_FLAAFFY}), }, @@ -1332,7 +1332,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Flaaffy), ICON(Flaaffy, 0), - .footprint = gMonFootprint_Flaaffy, + FOOTPRINT(Flaaffy), LEARNSETS(Flaaffy), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_AMPHAROS}), }, @@ -1355,7 +1355,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 4, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Ampharos, \ + FOOTPRINT(Ampharos), \ LEARNSETS(Ampharos), \ .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, \ .formChangeTable = sAmpharosFormChangeTable @@ -1474,7 +1474,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Azurill), ICON(Azurill, 0), - .footprint = gMonFootprint_Azurill, + FOOTPRINT(Azurill), LEARNSETS(Azurill), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_MARILL}), }, @@ -1527,7 +1527,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Marill), ICON(Marill, 0), - .footprint = gMonFootprint_Marill, + FOOTPRINT(Marill), LEARNSETS(Marill), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_AZUMARILL}), }, @@ -1579,7 +1579,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Azumarill), ICON(Azumarill, 0), - .footprint = gMonFootprint_Azumarill, + FOOTPRINT(Azumarill), LEARNSETS(Azumarill), }, #endif //P_FAMILY_MARILL @@ -1629,7 +1629,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Bonsly), ICON(Bonsly, 1), - .footprint = gMonFootprint_Bonsly, + FOOTPRINT(Bonsly), LEARNSETS(Bonsly), .evolutions = EVOLUTION({EVO_MOVE, MOVE_MIMIC, SPECIES_SUDOWOODO}), }, @@ -1680,7 +1680,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Sudowoodo), ICON(Sudowoodo, 1), - .footprint = gMonFootprint_Sudowoodo, + FOOTPRINT(Sudowoodo), LEARNSETS(Sudowoodo), }, #endif //P_FAMILY_SUDOWOODO @@ -1730,7 +1730,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Hoppip), ICON(Hoppip, 1), - .footprint = gMonFootprint_Hoppip, + FOOTPRINT(Hoppip), LEARNSETS(Hoppip), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_SKIPLOOM}), }, @@ -1779,7 +1779,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Skiploom), ICON(Skiploom, 1), - .footprint = gMonFootprint_Skiploom, + FOOTPRINT(Skiploom), LEARNSETS(Skiploom), .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_JUMPLUFF}), }, @@ -1828,7 +1828,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Jumpluff), ICON(Jumpluff, 2), - .footprint = gMonFootprint_Jumpluff, + FOOTPRINT(Jumpluff), LEARNSETS(Jumpluff), }, #endif //P_FAMILY_HOPPIP @@ -1879,7 +1879,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Aipom), ICON(Aipom, 2), - .footprint = gMonFootprint_Aipom, + FOOTPRINT(Aipom), LEARNSETS(Aipom), .evolutions = EVOLUTION({EVO_MOVE, MOVE_DOUBLE_HIT, SPECIES_AMBIPOM}), }, @@ -1930,7 +1930,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Ambipom), ICON(Ambipom, 2), - .footprint = gMonFootprint_Ambipom, + FOOTPRINT(Ambipom), LEARNSETS(Ambipom), }, #endif //P_GEN_4_CROSS_EVOS @@ -1980,7 +1980,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Sunkern), ICON(Sunkern, 1), - .footprint = gMonFootprint_Sunkern, + FOOTPRINT(Sunkern), LEARNSETS(Sunkern), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA}), }, @@ -2028,7 +2028,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Sunflora), ICON(Sunflora, 1), - .footprint = gMonFootprint_Sunflora, + FOOTPRINT(Sunflora), LEARNSETS(Sunflora), }, #endif //P_FAMILY_SUNKERN @@ -2079,7 +2079,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Yanma), ICON(Yanma, 1), - .footprint = gMonFootprint_Yanma, + FOOTPRINT(Yanma), LEARNSETS(Yanma), .evolutions = EVOLUTION({EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_YANMEGA}), }, @@ -2130,7 +2130,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Yanmega), ICON(Yanmega, 1), - .footprint = gMonFootprint_Yanmega, + FOOTPRINT(Yanmega), LEARNSETS(Yanmega), }, #endif //P_GEN_4_CROSS_EVOS @@ -2160,7 +2160,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 21, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Wooper, \ + FOOTPRINT(Wooper), \ .formSpeciesIdTable = sWooperFormSpeciesIdTable [SPECIES_WOOPER] = @@ -2236,7 +2236,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Quagsire), ICON(Quagsire, 0), - .footprint = gMonFootprint_Quagsire, + FOOTPRINT(Quagsire), LEARNSETS(Quagsire), }, @@ -2311,7 +2311,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Clodsire), ICON(Clodsire, 2), - //.footprint = gMonFootprint_Clodsire, + //FOOTPRINT(Clodsire), LEARNSETS(Clodsire), }, #endif //P_PALDEAN_FORMS @@ -2364,7 +2364,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Murkrow), ICON(Murkrow, 2), - .footprint = gMonFootprint_Murkrow, + FOOTPRINT(Murkrow), LEARNSETS(Murkrow), .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_HONCHKROW}), }, @@ -2413,7 +2413,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Honchkrow), ICON(Honchkrow, 2), - .footprint = gMonFootprint_Honchkrow, + FOOTPRINT(Honchkrow), LEARNSETS(Honchkrow), }, #endif //P_GEN_4_CROSS_EVOS @@ -2464,7 +2464,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Misdreavus), ICON(Misdreavus, 0), - .footprint = gMonFootprint_Misdreavus, + FOOTPRINT(Misdreavus), LEARNSETS(Misdreavus), .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_MISMAGIUS}), }, @@ -2515,7 +2515,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Mismagius), ICON(Mismagius, 2), - .footprint = gMonFootprint_Mismagius, + FOOTPRINT(Mismagius), LEARNSETS(Mismagius), }, #endif //P_GEN_4_CROSS_EVOS @@ -2559,7 +2559,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ PALETTES(Unown), \ ICON(Unown ##letter, 0), \ - .footprint = gMonFootprint_Unown, \ + FOOTPRINT(Unown), \ LEARNSETS(Unown), \ .formSpeciesIdTable = sUnownFormSpeciesIdTable @@ -2852,7 +2852,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Wynaut), ICON(Wynaut, 0), - .footprint = gMonFootprint_Wynaut, + FOOTPRINT(Wynaut), LEARNSETS(Wynaut), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_WOBBUFFET}), }, @@ -2906,7 +2906,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE ICON_FEMALE(Wobbuffet, 0), #endif - .footprint = gMonFootprint_Wobbuffet, + FOOTPRINT(Wobbuffet), LEARNSETS(Wobbuffet), }, #endif //P_FAMILY_WOBBUFFET @@ -2957,7 +2957,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Girafarig), ICON(Girafarig, 1), - .footprint = gMonFootprint_Girafarig, + FOOTPRINT(Girafarig), LEARNSETS(Girafarig), .evolutions = EVOLUTION({EVO_MOVE, MOVE_TWIN_BEAM, SPECIES_FARIGIRAF}), }, @@ -3006,7 +3006,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Farigiraf), ICON(Farigiraf, 0), - //.footprint = gMonFootprint_Farigiraf, + //FOOTPRINT(Farigiraf), LEARNSETS(Farigiraf), }, #endif //P_GEN_9_CROSS_EVOS @@ -3056,7 +3056,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Pineco), ICON(Pineco, 0), - .footprint = gMonFootprint_Pineco, + FOOTPRINT(Pineco), LEARNSETS(Pineco), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_FORRETRESS}), }, @@ -3104,7 +3104,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Forretress), ICON(Forretress, 2), - .footprint = gMonFootprint_Forretress, + FOOTPRINT(Forretress), LEARNSETS(Forretress), }, #endif //P_FAMILY_PINECO @@ -3154,7 +3154,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Dunsparce), ICON(Dunsparce, 0), - .footprint = gMonFootprint_Dunsparce, + FOOTPRINT(Dunsparce), LEARNSETS(Dunsparce), .evolutions = EVOLUTION({EVO_MOVE_TWO_SEGMENT, MOVE_HYPER_DRILL, SPECIES_DUDUNSPARCE_TWO_SEGMENT}, {EVO_MOVE_THREE_SEGMENT, MOVE_HYPER_DRILL, SPECIES_DUDUNSPARCE_THREE_SEGMENT}), @@ -3198,7 +3198,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .formSpeciesIdTable = sDudunsparceFormSpeciesIdTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //.footprint = gMonFootprint_Dudunsparce, + //FOOTPRINT(Dudunsparce), [SPECIES_DUDUNSPARCE_TWO_SEGMENT] = { @@ -3273,7 +3273,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Gligar), ICON(Gligar, 0), - .footprint = gMonFootprint_Gligar, + FOOTPRINT(Gligar), LEARNSETS(Gligar), .evolutions = EVOLUTION({EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR}, {EVO_ITEM_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR}), @@ -3324,7 +3324,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Gliscor), ICON(Gliscor, 2), - .footprint = gMonFootprint_Gliscor, + FOOTPRINT(Gliscor), LEARNSETS(Gliscor), }, #endif //P_GEN_4_CROSS_EVOS @@ -3378,7 +3378,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Snubbull), ICON(Snubbull, 0), - .footprint = gMonFootprint_Snubbull, + FOOTPRINT(Snubbull), LEARNSETS(Snubbull), .evolutions = EVOLUTION({EVO_LEVEL, 23, SPECIES_GRANBULL}), }, @@ -3430,7 +3430,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Granbull), ICON(Granbull, 2), - .footprint = gMonFootprint_Granbull, + FOOTPRINT(Granbull), LEARNSETS(Granbull), }, #endif //P_FAMILY_SNUBBULL @@ -3463,7 +3463,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Qwilfish, \ + FOOTPRINT(Qwilfish), \ .formSpeciesIdTable = sQwilfishFormSpeciesIdTable [SPECIES_QWILFISH] = @@ -3558,7 +3558,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Overqwil), ICON(Overqwil, 2), - //.footprint = gMonFootprint_Overqwil, + //FOOTPRINT(Overqwil), LEARNSETS(Overqwil), }, #endif //P_HISUIAN_FORMS @@ -3611,7 +3611,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Shuckle), ICON(Shuckle, 1), - .footprint = gMonFootprint_Shuckle, + FOOTPRINT(Shuckle), LEARNSETS(Shuckle), }, #endif //P_FAMILY_SHUCKLE @@ -3630,7 +3630,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .speciesName = _("Heracross"), \ .natDexNum = NATIONAL_DEX_HERACROSS, \ .categoryName = _("Single Horn"), \ - .footprint = gMonFootprint_Heracross, \ + FOOTPRINT(Heracross), \ LEARNSETS(Heracross), \ .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, \ .formChangeTable = sHeracrossFormChangeTable @@ -3736,7 +3736,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = -3, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Sneasel, \ + FOOTPRINT(Sneasel), \ .formSpeciesIdTable = sSneaselFormSpeciesIdTable [SPECIES_SNEASEL] = @@ -3815,7 +3815,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Weavile), ICON(Weavile, 0), - .footprint = gMonFootprint_Weavile, + FOOTPRINT(Weavile), LEARNSETS(Weavile), }, #endif //P_GEN_4_CROSS_EVOS @@ -3893,7 +3893,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Sneasler), ICON(Sneasler, 2), - //.footprint = gMonFootprint_Sneasler, + //FOOTPRINT(Sneasler), LEARNSETS(Sneasler), }, #endif //P_HISUIAN_FORMS @@ -3944,7 +3944,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Teddiursa), ICON(Teddiursa, 0), - .footprint = gMonFootprint_Teddiursa, + FOOTPRINT(Teddiursa), LEARNSETS(Teddiursa), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_URSARING}), }, @@ -3994,7 +3994,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Ursaring), ICON(Ursaring, 2), - .footprint = gMonFootprint_Ursaring, + FOOTPRINT(Ursaring), LEARNSETS(Ursaring), .evolutions = EVOLUTION({EVO_ITEM_NIGHT, ITEM_PEAT_BLOCK, SPECIES_URSALUNA}, {EVO_NONE, 0, SPECIES_URSALUNA_BLOODMOON}), @@ -4047,7 +4047,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Ursaluna), ICON(Ursaluna, 2), - //.footprint = gMonFootprint_Ursaluna, + //FOOTPRINT(Ursaluna), LEARNSETS(Ursaluna), }, @@ -4084,7 +4084,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(UrsalunaBloodmoon), //ICON(UrsalunaBloodmoon, 0), - //.footprint = gMonFootprint_UrsalunaBloodmoon, + //FOOTPRINT(UrsalunaBloodmoon), LEARNSETS(UrsalunaBloodmoon), }, #endif //P_GEN_8_CROSS_EVOS @@ -4134,7 +4134,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Slugma), ICON(Slugma, 0), - .footprint = gMonFootprint_Slugma, + FOOTPRINT(Slugma), LEARNSETS(Slugma), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MAGCARGO}), }, @@ -4183,7 +4183,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Magcargo), ICON(Magcargo, 0), - .footprint = gMonFootprint_Magcargo, + FOOTPRINT(Magcargo), LEARNSETS(Magcargo), }, #endif //P_FAMILY_SLUGMA @@ -4232,7 +4232,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Swinub), ICON(Swinub, 2), - .footprint = gMonFootprint_Swinub, + FOOTPRINT(Swinub), LEARNSETS(Swinub), .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_PILOSWINE}), }, @@ -4283,7 +4283,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Piloswine), ICON(Piloswine, 2), - .footprint = gMonFootprint_Piloswine, + FOOTPRINT(Piloswine), LEARNSETS(Piloswine), .evolutions = EVOLUTION({EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_MAMOSWINE}), }, @@ -4333,7 +4333,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Mamoswine), ICON(Mamoswine, 2), - .footprint = gMonFootprint_Mamoswine, + FOOTPRINT(Mamoswine), LEARNSETS(Mamoswine), }, #endif //P_GEN_4_CROSS_EVOS @@ -4361,7 +4361,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 15, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Corsola, \ + FOOTPRINT(Corsola), \ .formSpeciesIdTable = sCorsolaFormSpeciesIdTable [SPECIES_CORSOLA] = @@ -4472,7 +4472,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Cursola), ICON(Cursola, 0), - .footprint = gMonFootprint_Cursola, + FOOTPRINT(Cursola), LEARNSETS(Cursola), }, #endif //P_GALARIAN_FORMS @@ -4522,7 +4522,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Remoraid), ICON(Remoraid, 0), - .footprint = gMonFootprint_Remoraid, + FOOTPRINT(Remoraid), LEARNSETS(Remoraid), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_OCTILLERY}), }, @@ -4574,7 +4574,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Octillery), ICON(Octillery, 0), - .footprint = gMonFootprint_Octillery, + FOOTPRINT(Octillery), LEARNSETS(Octillery), }, #endif //P_FAMILY_REMORAID @@ -4623,7 +4623,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Delibird), ICON(Delibird, 1), - .footprint = gMonFootprint_Delibird, + FOOTPRINT(Delibird), LEARNSETS(Delibird), }, #endif //P_FAMILY_DELIBIRD @@ -4673,7 +4673,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Mantyke), ICON(Mantyke, 0), - .footprint = gMonFootprint_Mantyke, + FOOTPRINT(Mantyke), LEARNSETS(Mantyke), .evolutions = EVOLUTION({EVO_SPECIFIC_MON_IN_PARTY, SPECIES_REMORAID, SPECIES_MANTINE}), }, @@ -4723,7 +4723,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Mantine), ICON(Mantine, 2), - .footprint = gMonFootprint_Mantine, + FOOTPRINT(Mantine), LEARNSETS(Mantine), }, #endif //P_FAMILY_MANTINE @@ -4773,7 +4773,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Skarmory), ICON(Skarmory, 0), - .footprint = gMonFootprint_Skarmory, + FOOTPRINT(Skarmory), LEARNSETS(Skarmory), }, #endif //P_FAMILY_SKARMORY @@ -4822,7 +4822,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Houndour), ICON(Houndour, 0), - .footprint = gMonFootprint_Houndour, + FOOTPRINT(Houndour), LEARNSETS(Houndour), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_HOUNDOOM}), }, @@ -4840,7 +4840,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .speciesName = _("Houndoom"), \ .natDexNum = NATIONAL_DEX_HOUNDOOM, \ .categoryName = _("Dark"), \ - .footprint = gMonFootprint_Houndoom, \ + FOOTPRINT(Houndoom), \ LEARNSETS(Houndoom), \ .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, \ .formChangeTable = sHoundoomFormChangeTable @@ -4962,7 +4962,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Phanpy), ICON(Phanpy, 0), - .footprint = gMonFootprint_Phanpy, + FOOTPRINT(Phanpy), LEARNSETS(Phanpy), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_DONPHAN}), }, @@ -5013,7 +5013,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Donphan), ICON(Donphan, 0), - .footprint = gMonFootprint_Donphan, + FOOTPRINT(Donphan), LEARNSETS(Donphan), }, #endif //P_FAMILY_PHANPY @@ -5062,7 +5062,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Stantler), ICON(Stantler, 2), - .footprint = gMonFootprint_Stantler, + FOOTPRINT(Stantler), LEARNSETS(Stantler), .evolutions = EVOLUTION({EVO_MOVE, MOVE_PSYSHIELD_BASH, SPECIES_WYRDEER}), }, @@ -5112,7 +5112,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Wyrdeer), ICON(Wyrdeer, 2), - //.footprint = gMonFootprint_Wyrdeer, + //FOOTPRINT(Wyrdeer), LEARNSETS(Wyrdeer), }, #endif //P_GEN_8_CROSS_EVOS @@ -5162,7 +5162,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Smeargle), ICON(Smeargle, 1), - .footprint = gMonFootprint_Smeargle, + FOOTPRINT(Smeargle), LEARNSETS(Smeargle), }, #endif //P_FAMILY_SMEARGLE @@ -5213,7 +5213,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Miltank), ICON(Miltank, 0), - .footprint = gMonFootprint_Miltank, + FOOTPRINT(Miltank), LEARNSETS(Miltank), }, #endif //P_FAMILY_MILTANK @@ -5268,7 +5268,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Raikou), ICON(Raikou, 2), - .footprint = gMonFootprint_Raikou, + FOOTPRINT(Raikou), LEARNSETS(Raikou), }, #endif //P_FAMILY_RAIKOU @@ -5323,7 +5323,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Entei), ICON(Entei, 2), - .footprint = gMonFootprint_Entei, + FOOTPRINT(Entei), LEARNSETS(Entei), }, #endif //P_FAMILY_ENTEI @@ -5378,7 +5378,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Suicune), ICON(Suicune, 2), - .footprint = gMonFootprint_Suicune, + FOOTPRINT(Suicune), LEARNSETS(Suicune), }, #endif //P_FAMILY_SUICUNE @@ -5427,7 +5427,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Larvitar), ICON(Larvitar, 1), - .footprint = gMonFootprint_Larvitar, + FOOTPRINT(Larvitar), LEARNSETS(Larvitar), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_PUPITAR}), }, @@ -5475,7 +5475,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Pupitar), ICON(Pupitar, 2), - .footprint = gMonFootprint_Pupitar, + FOOTPRINT(Pupitar), LEARNSETS(Pupitar), .evolutions = EVOLUTION({EVO_LEVEL, 55, SPECIES_TYRANITAR}), }, @@ -5493,7 +5493,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .speciesName = _("Tyranitar"), \ .natDexNum = NATIONAL_DEX_TYRANITAR, \ .categoryName = _("Armor"), \ - .footprint = gMonFootprint_Tyranitar, \ + FOOTPRINT(Tyranitar), \ LEARNSETS(Tyranitar), \ .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, \ .formChangeTable = sTyranitarFormChangeTable @@ -5618,7 +5618,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Lugia), ICON(Lugia, 0), - .footprint = gMonFootprint_Lugia, + FOOTPRINT(Lugia), LEARNSETS(Lugia), }, #endif //P_FAMILY_LUGIA @@ -5671,7 +5671,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(HoOh), ICON(HoOh, 1), - .footprint = gMonFootprint_HoOh, + FOOTPRINT(HoOh), LEARNSETS(HoOh), }, #endif //P_FAMILY_HO_OH @@ -5724,7 +5724,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, PALETTES(Celebi), ICON(Celebi, 1), - .footprint = gMonFootprint_Celebi, + FOOTPRINT(Celebi), LEARNSETS(Celebi), }, #endif //P_FAMILY_CELEBI diff --git a/src/data/pokemon/species_info/gen_3.h b/src/data/pokemon/species_info/gen_3.h index 5864449505..40c9839df3 100644 --- a/src/data/pokemon/species_info/gen_3.h +++ b/src/data/pokemon/species_info/gen_3.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Treecko), ICON(Treecko, 1), - .footprint = gMonFootprint_Treecko, + FOOTPRINT(Treecko), LEARNSETS(Treecko), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_GROVYLE}), }, @@ -95,7 +95,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Grovyle), ICON(Grovyle, 1), - .footprint = gMonFootprint_Grovyle, + FOOTPRINT(Grovyle), LEARNSETS(Grovyle), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SCEPTILE}), }, @@ -112,7 +112,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Sceptile"), \ .natDexNum = NATIONAL_DEX_SCEPTILE, \ .categoryName = _("Forest"), \ - .footprint = gMonFootprint_Sceptile, \ + FOOTPRINT(Sceptile), \ LEARNSETS(Sceptile), \ .formSpeciesIdTable = sSceptileFormSpeciesIdTable, \ .formChangeTable = sSceptileFormChangeTable @@ -236,7 +236,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Torchic), ICON(Torchic, 0), - .footprint = gMonFootprint_Torchic, + FOOTPRINT(Torchic), LEARNSETS(Torchic), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_COMBUSKEN}), }, @@ -287,7 +287,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Combusken), ICON(Combusken, 0), - .footprint = gMonFootprint_Combusken, + FOOTPRINT(Combusken), LEARNSETS(Combusken), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_BLAZIKEN}), }, @@ -311,7 +311,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, \ .trainerScale = 301, \ .trainerOffset = 4, \ - .footprint = gMonFootprint_Blaziken, \ + FOOTPRINT(Blaziken), \ LEARNSETS(Blaziken), \ .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, \ .formChangeTable = sBlazikenFormChangeTable @@ -422,7 +422,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Mudkip), ICON(Mudkip, 0), - .footprint = gMonFootprint_Mudkip, + FOOTPRINT(Mudkip), LEARNSETS(Mudkip), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_MARSHTOMP}), }, @@ -470,7 +470,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Marshtomp), ICON(Marshtomp, 0), - .footprint = gMonFootprint_Marshtomp, + FOOTPRINT(Marshtomp), LEARNSETS(Marshtomp), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SWAMPERT}), }, @@ -488,7 +488,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Swampert"), \ .natDexNum = NATIONAL_DEX_SWAMPERT, \ .categoryName = _("Mud Fish"), \ - .footprint = gMonFootprint_Swampert, \ + FOOTPRINT(Swampert), \ LEARNSETS(Swampert), \ .formSpeciesIdTable = sSwampertFormSpeciesIdTable, \ .formChangeTable = sSwampertFormChangeTable @@ -609,7 +609,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Poochyena), ICON(Poochyena, 2), - .footprint = gMonFootprint_Poochyena, + FOOTPRINT(Poochyena), LEARNSETS(Poochyena), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_MIGHTYENA}), }, @@ -657,7 +657,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Mightyena), ICON(Mightyena, 2), - .footprint = gMonFootprint_Mightyena, + FOOTPRINT(Mightyena), LEARNSETS(Mightyena), }, #endif //P_FAMILY_POOCHYENA @@ -689,7 +689,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 22, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Zigzagoon, \ + FOOTPRINT(Zigzagoon), \ .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable #define LINOONE_MISC_INFO \ @@ -719,7 +719,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 7, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Linoone, \ + FOOTPRINT(Linoone), \ .formSpeciesIdTable = sLinooneFormSpeciesIdTable [SPECIES_ZIGZAGOON] = @@ -861,7 +861,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Obstagoon), ICON(Obstagoon, 0), - .footprint = gMonFootprint_Obstagoon, + FOOTPRINT(Obstagoon), LEARNSETS(Obstagoon), }, #endif //P_GALARIAN_FORMS @@ -913,7 +913,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Wurmple), ICON(Wurmple, 0), - .footprint = gMonFootprint_Wurmple, + FOOTPRINT(Wurmple), LEARNSETS(Wurmple), .evolutions = EVOLUTION({EVO_LEVEL_SILCOON, 7, SPECIES_SILCOON}, {EVO_LEVEL_CASCOON, 7, SPECIES_CASCOON}), @@ -962,7 +962,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Silcoon), ICON(Silcoon, 2), - .footprint = gMonFootprint_Silcoon, + FOOTPRINT(Silcoon), LEARNSETS(Silcoon), .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_BEAUTIFLY}), }, @@ -1014,7 +1014,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Beautifly), ICON(Beautifly, 0), - .footprint = gMonFootprint_Beautifly, + FOOTPRINT(Beautifly), LEARNSETS(Beautifly), }, @@ -1061,7 +1061,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Cascoon), ICON(Cascoon, 2), - .footprint = gMonFootprint_Cascoon, + FOOTPRINT(Cascoon), LEARNSETS(Cascoon), .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_DUSTOX}), }, @@ -1113,7 +1113,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Dustox), ICON(Dustox, 5), - .footprint = gMonFootprint_Dustox, + FOOTPRINT(Dustox), LEARNSETS(Dustox), }, #endif //P_FAMILY_WURMPLE @@ -1163,7 +1163,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Lotad), ICON(Lotad, 4), - .footprint = gMonFootprint_Lotad, + FOOTPRINT(Lotad), LEARNSETS(Lotad), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_LOMBRE}), }, @@ -1212,7 +1212,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Lombre), ICON(Lombre, 1), - .footprint = gMonFootprint_Lombre, + FOOTPRINT(Lombre), LEARNSETS(Lombre), .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_LUDICOLO}), }, @@ -1263,7 +1263,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Ludicolo), ICON(Ludicolo, 1), - .footprint = gMonFootprint_Ludicolo, + FOOTPRINT(Ludicolo), LEARNSETS(Ludicolo), }, #endif //P_FAMILY_LOTAD @@ -1313,7 +1313,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Seedot), ICON(Seedot, 2), - .footprint = gMonFootprint_Seedot, + FOOTPRINT(Seedot), LEARNSETS(Seedot), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_NUZLEAF}), }, @@ -1364,7 +1364,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Nuzleaf), ICON(Nuzleaf, 1), - .footprint = gMonFootprint_Nuzleaf, + FOOTPRINT(Nuzleaf), LEARNSETS(Nuzleaf), .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_SHIFTRY}), }, @@ -1419,7 +1419,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Shiftry), ICON(Shiftry, 5), - .footprint = gMonFootprint_Shiftry, + FOOTPRINT(Shiftry), LEARNSETS(Shiftry), }, #endif //P_FAMILY_SEEDOT @@ -1468,7 +1468,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Taillow), ICON(Taillow, 2), - .footprint = gMonFootprint_Taillow, + FOOTPRINT(Taillow), LEARNSETS(Taillow), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_SWELLOW}), }, @@ -1516,7 +1516,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Swellow), ICON(Swellow, 2), - .footprint = gMonFootprint_Swellow, + FOOTPRINT(Swellow), LEARNSETS(Swellow), }, #endif //P_FAMILY_TAILLOW @@ -1567,7 +1567,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Wingull), ICON(Wingull, 0), - .footprint = gMonFootprint_Wingull, + FOOTPRINT(Wingull), LEARNSETS(Wingull), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_PELIPPER}), }, @@ -1617,7 +1617,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Pelipper), ICON(Pelipper, 2), - .footprint = gMonFootprint_Pelipper, + FOOTPRINT(Pelipper), LEARNSETS(Pelipper), }, #endif //P_FAMILY_WINGULL @@ -1674,7 +1674,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Ralts), ICON(Ralts, 1), - .footprint = gMonFootprint_Ralts, + FOOTPRINT(Ralts), LEARNSETS(Ralts), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_KIRLIA}), }, @@ -1722,7 +1722,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Kirlia), ICON(Kirlia, 1), - .footprint = gMonFootprint_Kirlia, + FOOTPRINT(Kirlia), LEARNSETS(Kirlia), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GARDEVOIR}, {EVO_ITEM_MALE, ITEM_DAWN_STONE, SPECIES_GALLADE}), @@ -1747,7 +1747,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Gardevoir, \ + FOOTPRINT(Gardevoir), \ LEARNSETS(Gardevoir), \ .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, \ .formChangeTable = sGardevoirFormChangeTable @@ -1830,7 +1830,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 1, \ .trainerScale = 296, \ .trainerOffset = 1, \ - .footprint = gMonFootprint_Gallade, \ + FOOTPRINT(Gallade), \ LEARNSETS(Gallade), \ .formSpeciesIdTable = sGalladeFormSpeciesIdTable, \ .formChangeTable = sGalladeFormChangeTable @@ -1947,7 +1947,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SPRING, PALETTES(Surskit), ICON(Surskit, 0), - .footprint = gMonFootprint_Surskit, + FOOTPRINT(Surskit), LEARNSETS(Surskit), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_MASQUERAIN}), }, @@ -2003,7 +2003,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Masquerain), ICON(Masquerain, 0), - .footprint = gMonFootprint_Masquerain, + FOOTPRINT(Masquerain), LEARNSETS(Masquerain), }, #endif //P_FAMILY_SURSKIT @@ -2054,7 +2054,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Shroomish), ICON(Shroomish, 1), - .footprint = gMonFootprint_Shroomish, + FOOTPRINT(Shroomish), LEARNSETS(Shroomish), .evolutions = EVOLUTION({EVO_LEVEL, 23, SPECIES_BRELOOM}), }, @@ -2104,7 +2104,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Breloom), ICON(Breloom, 1), - .footprint = gMonFootprint_Breloom, + FOOTPRINT(Breloom), LEARNSETS(Breloom), }, #endif //P_FAMILY_SHROOMISH @@ -2153,7 +2153,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Slakoth), ICON(Slakoth, 2), - .footprint = gMonFootprint_Slakoth, + FOOTPRINT(Slakoth), LEARNSETS(Slakoth), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_VIGOROTH}), }, @@ -2201,7 +2201,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Vigoroth), ICON(Vigoroth, 2), - .footprint = gMonFootprint_Vigoroth, + FOOTPRINT(Vigoroth), LEARNSETS(Vigoroth), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SLAKING}), }, @@ -2249,7 +2249,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Slaking), ICON(Slaking, 2), - .footprint = gMonFootprint_Slaking, + FOOTPRINT(Slaking), LEARNSETS(Slaking), }, #endif //P_FAMILY_SLAKOTH @@ -2299,7 +2299,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Nincada), ICON(Nincada, 1), - .footprint = gMonFootprint_Nincada, + FOOTPRINT(Nincada), LEARNSETS(Nincada), .evolutions = EVOLUTION({EVO_LEVEL_NINJASK, 20, SPECIES_NINJASK}, {EVO_LEVEL_SHEDINJA, 20, SPECIES_SHEDINJA}), @@ -2349,7 +2349,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Ninjask), ICON(Ninjask, 1), - .footprint = gMonFootprint_Ninjask, + FOOTPRINT(Ninjask), LEARNSETS(Ninjask), }, @@ -2397,7 +2397,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Shedinja), ICON(Shedinja, 1), - .footprint = gMonFootprint_Shedinja, + FOOTPRINT(Shedinja), LEARNSETS(Shedinja), }, #endif //P_FAMILY_NINCADA @@ -2446,7 +2446,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Whismur), ICON(Whismur, 1), - .footprint = gMonFootprint_Whismur, + FOOTPRINT(Whismur), LEARNSETS(Whismur), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LOUDRED}), }, @@ -2494,7 +2494,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Loudred), ICON(Loudred, 2), - .footprint = gMonFootprint_Loudred, + FOOTPRINT(Loudred), LEARNSETS(Loudred), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_EXPLOUD}), }, @@ -2542,7 +2542,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Exploud), ICON(Exploud, 2), - .footprint = gMonFootprint_Exploud, + FOOTPRINT(Exploud), LEARNSETS(Exploud), }, #endif //P_FAMILY_WHISMUR @@ -2592,7 +2592,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Makuhita), ICON(Makuhita, 1), - .footprint = gMonFootprint_Makuhita, + FOOTPRINT(Makuhita), LEARNSETS(Makuhita), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_HARIYAMA}), }, @@ -2641,7 +2641,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Hariyama), ICON(Hariyama, 2), - .footprint = gMonFootprint_Hariyama, + FOOTPRINT(Hariyama), LEARNSETS(Hariyama), }, #endif //P_FAMILY_MAKUHITA @@ -2691,7 +2691,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Nosepass), ICON(Nosepass, 0), - .footprint = gMonFootprint_Nosepass, + FOOTPRINT(Nosepass), LEARNSETS(Nosepass), .evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_PROBOPASS}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_PROBOPASS}), @@ -2744,7 +2744,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Probopass), ICON(Probopass, 0), - .footprint = gMonFootprint_Probopass, + FOOTPRINT(Probopass), LEARNSETS(Probopass), }, #endif //P_GEN_4_CROSS_EVOS @@ -2794,7 +2794,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Skitty), ICON(Skitty, 0), - .footprint = gMonFootprint_Skitty, + FOOTPRINT(Skitty), LEARNSETS(Skitty), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY}), }, @@ -2843,7 +2843,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Delcatty), ICON(Delcatty, 2), - .footprint = gMonFootprint_Delcatty, + FOOTPRINT(Delcatty), LEARNSETS(Delcatty), }, #endif //P_FAMILY_SKITTY @@ -2864,7 +2864,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_SABLEYE, \ .categoryName = _("Darkness"), \ .height = 5, \ - .footprint = gMonFootprint_Sableye, \ + FOOTPRINT(Sableye), \ LEARNSETS(Sableye), \ .formSpeciesIdTable = sSableyeFormSpeciesIdTable, \ .formChangeTable = sSableyeFormChangeTable @@ -2960,7 +2960,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Mawile"), \ .natDexNum = NATIONAL_DEX_MAWILE, \ .categoryName = _("Deceiver"), \ - .footprint = gMonFootprint_Mawile, \ + FOOTPRINT(Mawile), \ LEARNSETS(Mawile), \ .formSpeciesIdTable = sMawileFormSpeciesIdTable, \ .formChangeTable = sMawileFormChangeTable @@ -3083,7 +3083,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Aron), ICON(Aron, 2), - .footprint = gMonFootprint_Aron, + FOOTPRINT(Aron), LEARNSETS(Aron), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_LAIRON}), }, @@ -3132,7 +3132,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Lairon), ICON(Lairon, 2), - .footprint = gMonFootprint_Lairon, + FOOTPRINT(Lairon), LEARNSETS(Lairon), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_AGGRON}), }, @@ -3150,7 +3150,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Aggron"), \ .natDexNum = NATIONAL_DEX_AGGRON, \ .categoryName = _("Iron Armor"), \ - .footprint = gMonFootprint_Aggron, \ + FOOTPRINT(Aggron), \ LEARNSETS(Aggron), \ .formSpeciesIdTable = sAggronFormSpeciesIdTable, \ .formChangeTable = sAggronFormChangeTable @@ -3275,7 +3275,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Meditite), ICON(Meditite, 0), - .footprint = gMonFootprint_Meditite, + FOOTPRINT(Meditite), LEARNSETS(Meditite), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_MEDICHAM}), }, @@ -3299,7 +3299,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 5, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Medicham, \ + FOOTPRINT(Medicham), \ LEARNSETS(Medicham), \ .formSpeciesIdTable = sMedichamFormSpeciesIdTable, \ .formChangeTable = sMedichamFormChangeTable @@ -3410,7 +3410,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Electrike), ICON(Electrike, 1), - .footprint = gMonFootprint_Electrike, + FOOTPRINT(Electrike), LEARNSETS(Electrike), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_MANECTRIC}), }, @@ -3428,7 +3428,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Manectric"), \ .natDexNum = NATIONAL_DEX_MANECTRIC, \ .categoryName = _("Discharge"), \ - .footprint = gMonFootprint_Manectric, \ + FOOTPRINT(Manectric), \ LEARNSETS(Manectric), \ .formSpeciesIdTable = sManectricFormSpeciesIdTable, \ .formChangeTable = sManectricFormChangeTable @@ -3549,7 +3549,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Plusle), ICON(Plusle, 0), - .footprint = gMonFootprint_Plusle, + FOOTPRINT(Plusle), LEARNSETS(Plusle), }, #endif //P_FAMILY_PLUSLE @@ -3599,7 +3599,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Minun), ICON(Minun, 0), - .footprint = gMonFootprint_Minun, + FOOTPRINT(Minun), LEARNSETS(Minun), }, #endif //P_FAMILY_MINUN @@ -3654,7 +3654,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Volbeat), ICON(Volbeat, 0), - .footprint = gMonFootprint_Volbeat, + FOOTPRINT(Volbeat), LEARNSETS(Volbeat), }, @@ -3707,7 +3707,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Illumise), ICON(Illumise, 2), - .footprint = gMonFootprint_Illumise, + FOOTPRINT(Illumise), LEARNSETS(Illumise), }, #endif //P_FAMILY_VOLBEAT_ILLUMISE @@ -3759,7 +3759,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Budew), ICON(Budew, 1), - .footprint = gMonFootprint_Budew, + FOOTPRINT(Budew), LEARNSETS(Budew), .evolutions = EVOLUTION({EVO_FRIENDSHIP_DAY, 0, SPECIES_ROSELIA}), }, @@ -3812,7 +3812,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, PALETTES(Roselia), ICON(Roselia, 4), - .footprint = gMonFootprint_Roselia, + FOOTPRINT(Roselia), LEARNSETS(Roselia), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_ROSERADE}), }, @@ -3865,7 +3865,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Roserade), ICON(Roserade, 0), - .footprint = gMonFootprint_Roserade, + FOOTPRINT(Roserade), LEARNSETS(Roserade), }, #endif //P_GEN_4_CROSS_EVOS @@ -3919,7 +3919,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Gulpin), ICON(Gulpin, 1), - .footprint = gMonFootprint_Gulpin, + FOOTPRINT(Gulpin), LEARNSETS(Gulpin), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_SWALOT}), }, @@ -3971,7 +3971,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Swalot), ICON(Swalot, 2), - .footprint = gMonFootprint_Swalot, + FOOTPRINT(Swalot), LEARNSETS(Swalot), }, #endif //P_FAMILY_GULPIN @@ -4021,7 +4021,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SPRING_REPEATED, PALETTES(Carvanha), ICON(Carvanha, 0), - .footprint = gMonFootprint_Carvanha, + FOOTPRINT(Carvanha), LEARNSETS(Carvanha), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_SHARPEDO}), }, @@ -4040,7 +4040,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Sharpedo"), \ .natDexNum = NATIONAL_DEX_SHARPEDO, \ .categoryName = _("Brutal"), \ - .footprint = gMonFootprint_Sharpedo, \ + FOOTPRINT(Sharpedo), \ LEARNSETS(Sharpedo), \ .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, \ .formChangeTable = sSharpedoFormChangeTable @@ -4162,7 +4162,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Wailmer), ICON(Wailmer, 2), - .footprint = gMonFootprint_Wailmer, + FOOTPRINT(Wailmer), LEARNSETS(Wailmer), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_WAILORD}), }, @@ -4211,7 +4211,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Wailord), ICON(Wailord, 0), - .footprint = gMonFootprint_Wailord, + FOOTPRINT(Wailord), LEARNSETS(Wailord), }, #endif //P_FAMILY_WAILMER @@ -4262,7 +4262,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Numel), ICON(Numel, 1), - .footprint = gMonFootprint_Numel, + FOOTPRINT(Numel), LEARNSETS(Numel), .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_CAMERUPT}), }, @@ -4281,7 +4281,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Camerupt"), \ .natDexNum = NATIONAL_DEX_CAMERUPT, \ .categoryName = _("Eruption"), \ - .footprint = gMonFootprint_Camerupt, \ + FOOTPRINT(Camerupt), \ LEARNSETS(Camerupt), \ .formSpeciesIdTable = sCameruptFormSpeciesIdTable, \ .formChangeTable = sCameruptFormChangeTable @@ -4405,7 +4405,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Torkoal), ICON(Torkoal, 2), - .footprint = gMonFootprint_Torkoal, + FOOTPRINT(Torkoal), LEARNSETS(Torkoal), }, #endif //P_FAMILY_TORKOAL @@ -4454,7 +4454,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Spoink), ICON(Spoink, 0), - .footprint = gMonFootprint_Spoink, + FOOTPRINT(Spoink), LEARNSETS(Spoink), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GRUMPIG}), }, @@ -4503,7 +4503,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Grumpig), ICON(Grumpig, 2), - .footprint = gMonFootprint_Grumpig, + FOOTPRINT(Grumpig), LEARNSETS(Grumpig), }, #endif //P_FAMILY_SPOINK @@ -4553,7 +4553,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, PALETTES(Spinda), ICON(Spinda, 1), - .footprint = gMonFootprint_Spinda, + FOOTPRINT(Spinda), LEARNSETS(Spinda), }, #endif //P_FAMILY_SPINDA @@ -4607,7 +4607,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Trapinch), ICON(Trapinch, 0), - .footprint = gMonFootprint_Trapinch, + FOOTPRINT(Trapinch), LEARNSETS(Trapinch), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_VIBRAVA}), }, @@ -4660,7 +4660,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Vibrava), ICON(Vibrava, 1), - .footprint = gMonFootprint_Vibrava, + FOOTPRINT(Vibrava), LEARNSETS(Vibrava), .evolutions = EVOLUTION({EVO_LEVEL, 45, SPECIES_FLYGON}), }, @@ -4714,7 +4714,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Flygon), ICON(Flygon, 1), - .footprint = gMonFootprint_Flygon, + FOOTPRINT(Flygon), LEARNSETS(Flygon), }, #endif //P_FAMILY_TRAPINCH @@ -4764,7 +4764,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Cacnea), ICON(Cacnea, 1), - .footprint = gMonFootprint_Cacnea, + FOOTPRINT(Cacnea), LEARNSETS(Cacnea), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_CACTURNE}), }, @@ -4815,7 +4815,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Cacturne), ICON(Cacturne, 1), - .footprint = gMonFootprint_Cacturne, + FOOTPRINT(Cacturne), LEARNSETS(Cacturne), }, #endif //P_FAMILY_CACNEA @@ -4864,7 +4864,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Swablu), ICON(Swablu, 0), - .footprint = gMonFootprint_Swablu, + FOOTPRINT(Swablu), LEARNSETS(Swablu), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ALTARIA}), }, @@ -4881,7 +4881,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Altaria"), \ .natDexNum = NATIONAL_DEX_ALTARIA, \ .categoryName = _("Humming"), \ - .footprint = gMonFootprint_Altaria, \ + FOOTPRINT(Altaria), \ LEARNSETS(Altaria), \ .formSpeciesIdTable = sAltariaFormSpeciesIdTable, \ .formChangeTable = sAltariaFormChangeTable @@ -5007,7 +5007,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Zangoose), ICON(Zangoose, 0), - .footprint = gMonFootprint_Zangoose, + FOOTPRINT(Zangoose), LEARNSETS(Zangoose), }, #endif //P_FAMILY_ZANGOOSE @@ -5059,7 +5059,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Seviper), ICON(Seviper, 2), - .footprint = gMonFootprint_Seviper, + FOOTPRINT(Seviper), LEARNSETS(Seviper), }, #endif //P_FAMILY_SEVIPER @@ -5111,7 +5111,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Lunatone), ICON(Lunatone, 1), - .footprint = gMonFootprint_Lunatone, + FOOTPRINT(Lunatone), LEARNSETS(Lunatone), }, #endif //P_FAMILY_LUNATONE @@ -5163,7 +5163,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Solrock), ICON(Solrock, 0), - .footprint = gMonFootprint_Solrock, + FOOTPRINT(Solrock), LEARNSETS(Solrock), }, #endif //P_FAMILY_SOLROCK @@ -5213,7 +5213,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Barboach), ICON(Barboach, 0), - .footprint = gMonFootprint_Barboach, + FOOTPRINT(Barboach), LEARNSETS(Barboach), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_WHISCASH}), }, @@ -5261,7 +5261,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Whiscash), ICON(Whiscash, 0), - .footprint = gMonFootprint_Whiscash, + FOOTPRINT(Whiscash), LEARNSETS(Whiscash), }, #endif //P_FAMILY_BARBOACH @@ -5310,7 +5310,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Corphish), ICON(Corphish, 0), - .footprint = gMonFootprint_Corphish, + FOOTPRINT(Corphish), LEARNSETS(Corphish), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_CRAWDAUNT}), }, @@ -5358,7 +5358,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Crawdaunt), ICON(Crawdaunt, 0), - .footprint = gMonFootprint_Crawdaunt, + FOOTPRINT(Crawdaunt), LEARNSETS(Crawdaunt), }, #endif //P_FAMILY_CORPHISH @@ -5409,7 +5409,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Baltoy), ICON(Baltoy, 2), - .footprint = gMonFootprint_Baltoy, + FOOTPRINT(Baltoy), LEARNSETS(Baltoy), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_CLAYDOL}), }, @@ -5459,7 +5459,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Claydol), ICON(Claydol, 0), - .footprint = gMonFootprint_Claydol, + FOOTPRINT(Claydol), LEARNSETS(Claydol), }, #endif //P_FAMILY_BALTOY @@ -5509,7 +5509,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Lileep), ICON(Lileep, 2), - .footprint = gMonFootprint_Lileep, + FOOTPRINT(Lileep), LEARNSETS(Lileep), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_CRADILY}), }, @@ -5558,7 +5558,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Cradily), ICON(Cradily, 1), - .footprint = gMonFootprint_Cradily, + FOOTPRINT(Cradily), LEARNSETS(Cradily), }, #endif //P_FAMILY_LILEEP @@ -5607,7 +5607,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Anorith), ICON(Anorith, 0), - .footprint = gMonFootprint_Anorith, + FOOTPRINT(Anorith), LEARNSETS(Anorith), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_ARMALDO}), }, @@ -5655,7 +5655,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Armaldo), ICON(Armaldo, 2), - .footprint = gMonFootprint_Armaldo, + FOOTPRINT(Armaldo), LEARNSETS(Armaldo), }, #endif //P_FAMILY_ANORITH @@ -5704,7 +5704,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SPRING, PALETTES(Feebas), ICON(Feebas, 2), - .footprint = gMonFootprint_Feebas, + FOOTPRINT(Feebas), LEARNSETS(Feebas), .evolutions = EVOLUTION({EVO_BEAUTY, 170, SPECIES_MILOTIC}, {EVO_TRADE_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC}, @@ -5757,7 +5757,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Milotic), ICON(Milotic, 2), - .footprint = gMonFootprint_Milotic, + FOOTPRINT(Milotic), LEARNSETS(Milotic), }, #endif //P_FAMILY_FEEBAS @@ -5791,7 +5791,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -5, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Castform, \ + FOOTPRINT(Castform), \ LEARNSETS(Castform), \ .formSpeciesIdTable = sCastformFormSpeciesIdTable, \ .formChangeTable = sCastformFormChangeTable @@ -5930,7 +5930,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Kecleon), ICON(Kecleon, 1), - .footprint = gMonFootprint_Kecleon, + FOOTPRINT(Kecleon), LEARNSETS(Kecleon), }, #endif //P_FAMILY_KECLEON @@ -5981,7 +5981,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Shuppet), ICON(Shuppet, 0), - .footprint = gMonFootprint_Shuppet, + FOOTPRINT(Shuppet), LEARNSETS(Shuppet), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_BANETTE}), }, @@ -6000,7 +6000,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Banette"), \ .natDexNum = NATIONAL_DEX_BANETTE, \ .categoryName = _("Marionette"), \ - .footprint = gMonFootprint_Banette, \ + FOOTPRINT(Banette), \ LEARNSETS(Banette), \ .formSpeciesIdTable = sBanetteFormSpeciesIdTable, \ .formChangeTable = sBanetteFormChangeTable @@ -6123,7 +6123,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Duskull), ICON(Duskull, 0), - .footprint = gMonFootprint_Duskull, + FOOTPRINT(Duskull), LEARNSETS(Duskull), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_DUSCLOPS}), }, @@ -6174,7 +6174,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Dusclops), ICON(Dusclops, 0), - .footprint = gMonFootprint_Dusclops, + FOOTPRINT(Dusclops), LEARNSETS(Dusclops), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_REAPER_CLOTH, SPECIES_DUSKNOIR}, {EVO_ITEM, ITEM_REAPER_CLOTH, SPECIES_DUSKNOIR}), @@ -6227,7 +6227,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Dusknoir), ICON(Dusknoir, 2), - .footprint = gMonFootprint_Dusknoir, + FOOTPRINT(Dusknoir), LEARNSETS(Dusknoir), }, #endif //P_GEN_4_CROSS_EVOS @@ -6277,7 +6277,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Tropius), ICON(Tropius, 1), - .footprint = gMonFootprint_Tropius, + FOOTPRINT(Tropius), LEARNSETS(Tropius), }, #endif //P_FAMILY_TROPIUS @@ -6328,7 +6328,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Chingling), ICON(Chingling, 1), - .footprint = gMonFootprint_Chingling, + FOOTPRINT(Chingling), LEARNSETS(Chingling), .evolutions = EVOLUTION({EVO_FRIENDSHIP_NIGHT, 0, SPECIES_CHIMECHO}), }, @@ -6386,7 +6386,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Chimecho), ICON(Chimecho, 0), - .footprint = gMonFootprint_Chimecho, + FOOTPRINT(Chimecho), LEARNSETS(Chimecho), }, #endif //P_FAMILY_CHIMECHO @@ -6411,7 +6411,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 3, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Absol, \ + FOOTPRINT(Absol), \ LEARNSETS(Absol), \ .formSpeciesIdTable = sAbsolFormSpeciesIdTable, \ .formChangeTable = sAbsolFormChangeTable @@ -6525,7 +6525,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Snorunt), ICON(Snorunt, 2), - .footprint = gMonFootprint_Snorunt, + FOOTPRINT(Snorunt), LEARNSETS(Snorunt), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_GLALIE}, {EVO_ITEM_FEMALE, ITEM_DAWN_STONE, SPECIES_FROSLASS}), @@ -6544,7 +6544,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Glalie"), \ .natDexNum = NATIONAL_DEX_GLALIE, \ .categoryName = _("Face"), \ - .footprint = gMonFootprint_Glalie, \ + FOOTPRINT(Glalie), \ LEARNSETS(Glalie), \ .formSpeciesIdTable = sGlalieFormSpeciesIdTable, \ .formChangeTable = sGlalieFormChangeTable @@ -6666,7 +6666,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Froslass), ICON(Froslass, 0), - .footprint = gMonFootprint_Froslass, + FOOTPRINT(Froslass), LEARNSETS(Froslass), }, #endif //P_GEN_4_CROSS_EVOS @@ -6717,7 +6717,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Spheal), ICON(Spheal, 2), - .footprint = gMonFootprint_Spheal, + FOOTPRINT(Spheal), LEARNSETS(Spheal), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_SEALEO}), }, @@ -6765,7 +6765,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Sealeo), ICON(Sealeo, 2), - .footprint = gMonFootprint_Sealeo, + FOOTPRINT(Sealeo), LEARNSETS(Sealeo), .evolutions = EVOLUTION({EVO_LEVEL, 44, SPECIES_WALREIN}), }, @@ -6813,7 +6813,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Walrein), ICON(Walrein, 0), - .footprint = gMonFootprint_Walrein, + FOOTPRINT(Walrein), LEARNSETS(Walrein), }, #endif //P_FAMILY_SPHEAL @@ -6864,7 +6864,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Clamperl), ICON(Clamperl, 0), - .footprint = gMonFootprint_Clamperl, + FOOTPRINT(Clamperl), LEARNSETS(Clamperl), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_DEEP_SEA_TOOTH, SPECIES_HUNTAIL}, {EVO_TRADE_ITEM, ITEM_DEEP_SEA_SCALE, SPECIES_GOREBYSS}, @@ -6917,7 +6917,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Huntail), ICON(Huntail, 0), - .footprint = gMonFootprint_Huntail, + FOOTPRINT(Huntail), LEARNSETS(Huntail), }, @@ -6965,7 +6965,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Gorebyss), ICON(Gorebyss, 0), - .footprint = gMonFootprint_Gorebyss, + FOOTPRINT(Gorebyss), LEARNSETS(Gorebyss), }, #endif //P_FAMILY_CLAMPERL @@ -7018,7 +7018,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Relicanth), ICON(Relicanth, 2), - .footprint = gMonFootprint_Relicanth, + FOOTPRINT(Relicanth), LEARNSETS(Relicanth), }, #endif //P_FAMILY_RELICANTH @@ -7068,7 +7068,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SPRING_REPEATED, PALETTES(Luvdisc), ICON(Luvdisc, 0), - .footprint = gMonFootprint_Luvdisc, + FOOTPRINT(Luvdisc), LEARNSETS(Luvdisc), }, #endif //P_FAMILY_LUVDISC @@ -7118,7 +7118,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Bagon), ICON(Bagon, 0), - .footprint = gMonFootprint_Bagon, + FOOTPRINT(Bagon), LEARNSETS(Bagon), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_SHELGON}), }, @@ -7167,7 +7167,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Shelgon), ICON(Shelgon, 2), - .footprint = gMonFootprint_Shelgon, + FOOTPRINT(Shelgon), LEARNSETS(Shelgon), .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_SALAMENCE}), }, @@ -7186,7 +7186,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Salamence"), \ .natDexNum = NATIONAL_DEX_SALAMENCE, \ .categoryName = _("Dragon"), \ - .footprint = gMonFootprint_Salamence, \ + FOOTPRINT(Salamence), \ LEARNSETS(Salamence), \ .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, \ .formChangeTable = sSalamenceFormChangeTable @@ -7310,7 +7310,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Beldum), ICON(Beldum, 0), - .footprint = gMonFootprint_Beldum, + FOOTPRINT(Beldum), LEARNSETS(Beldum), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_METANG}), }, @@ -7359,7 +7359,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Metang), ICON(Metang, 0), - .footprint = gMonFootprint_Metang, + FOOTPRINT(Metang), LEARNSETS(Metang), .evolutions = EVOLUTION({EVO_LEVEL, 45, SPECIES_METAGROSS}), }, @@ -7378,7 +7378,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Metagross"), \ .natDexNum = NATIONAL_DEX_METAGROSS, \ .categoryName = _("Iron Leg"), \ - .footprint = gMonFootprint_Metagross, \ + FOOTPRINT(Metagross), \ LEARNSETS(Metagross), \ .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, \ .formChangeTable = sMetagrossFormChangeTable @@ -7501,7 +7501,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Regirock), ICON(Regirock, 2), - .footprint = gMonFootprint_Regirock, + FOOTPRINT(Regirock), LEARNSETS(Regirock), }, #endif //P_FAMILY_REGIROCK @@ -7551,7 +7551,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Regice), ICON(Regice, 0), - .footprint = gMonFootprint_Regice, + FOOTPRINT(Regice), LEARNSETS(Regice), }, #endif //P_FAMILY_REGICE @@ -7602,7 +7602,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Registeel), ICON(Registeel, 2), - .footprint = gMonFootprint_Registeel, + FOOTPRINT(Registeel), LEARNSETS(Registeel), }, #endif //P_FAMILY_REGISTEEL @@ -7620,7 +7620,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Latias"), \ .natDexNum = NATIONAL_DEX_LATIAS, \ .categoryName = _("Eon"), \ - .footprint = gMonFootprint_Latias, \ + FOOTPRINT(Latias), \ LEARNSETS(Latias), \ .formSpeciesIdTable = sLatiasFormSpeciesIdTable, \ .formChangeTable = sLatiasFormChangeTable, \ @@ -7716,7 +7716,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Latios"), \ .natDexNum = NATIONAL_DEX_LATIOS, \ .categoryName = _("Eon"), \ - .footprint = gMonFootprint_Latios, \ + FOOTPRINT(Latios), \ LEARNSETS(Latios), \ .formSpeciesIdTable = sLatiosFormSpeciesIdTable, \ .formChangeTable = sLatiosFormChangeTable @@ -7813,7 +7813,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Kyogre"), \ .natDexNum = NATIONAL_DEX_KYOGRE, \ .categoryName = _("Sea Basin"), \ - .footprint = gMonFootprint_Kyogre, \ + FOOTPRINT(Kyogre), \ LEARNSETS(Kyogre), \ .formSpeciesIdTable = sKyogreFormSpeciesIdTable, \ .formChangeTable = sKyogreFormChangeTable @@ -7904,7 +7904,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .cryId = CRY_GROUDON, \ .natDexNum = NATIONAL_DEX_GROUDON, \ .categoryName = _("Continent"), \ - .footprint = gMonFootprint_Groudon, \ + FOOTPRINT(Groudon), \ LEARNSETS(Groudon), \ .formSpeciesIdTable = sGroudonFormSpeciesIdTable, \ .formChangeTable = sGroudonFormChangeTable @@ -7997,7 +7997,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .cryId = CRY_RAYQUAZA, \ .natDexNum = NATIONAL_DEX_RAYQUAZA, \ .categoryName = _("Sky High"), \ - .footprint = gMonFootprint_Rayquaza, \ + FOOTPRINT(Rayquaza), \ LEARNSETS(Rayquaza), \ .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, \ .formChangeTable = sRayquazaFormChangeTable, \ @@ -8122,7 +8122,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Jirachi), ICON(Jirachi, 0), - .footprint = gMonFootprint_Jirachi, + FOOTPRINT(Jirachi), LEARNSETS(Jirachi), }, #endif //P_FAMILY_JIRACHI @@ -8151,7 +8151,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, \ .trainerScale = 290, \ .trainerOffset = 2, \ - .footprint = gMonFootprint_Deoxys, \ + FOOTPRINT(Deoxys), \ .formSpeciesIdTable = sDeoxysFormSpeciesIdTable [SPECIES_DEOXYS_NORMAL] = diff --git a/src/data/pokemon/species_info/gen_4.h b/src/data/pokemon/species_info/gen_4.h index fd2f008cd5..b7566ac6fa 100644 --- a/src/data/pokemon/species_info/gen_4.h +++ b/src/data/pokemon/species_info/gen_4.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Turtwig), ICON(Turtwig, 1), - .footprint = gMonFootprint_Turtwig, + FOOTPRINT(Turtwig), LEARNSETS(Turtwig), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_GROTLE}), }, @@ -96,7 +96,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Grotle), ICON(Grotle, 1), - .footprint = gMonFootprint_Grotle, + FOOTPRINT(Grotle), LEARNSETS(Grotle), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_TORTERRA}), }, @@ -146,7 +146,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, PALETTES(Torterra), ICON(Torterra, 1), - .footprint = gMonFootprint_Torterra, + FOOTPRINT(Torterra), LEARNSETS(Torterra), }, #endif //P_FAMILY_TURTWIG @@ -196,7 +196,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Chimchar), ICON(Chimchar, 1), - .footprint = gMonFootprint_Chimchar, + FOOTPRINT(Chimchar), LEARNSETS(Chimchar), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_MONFERNO}), }, @@ -246,7 +246,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Monferno), ICON(Monferno, 0), - .footprint = gMonFootprint_Monferno, + FOOTPRINT(Monferno), LEARNSETS(Monferno), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_INFERNAPE}), }, @@ -296,7 +296,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Infernape), ICON(Infernape, 0), - .footprint = gMonFootprint_Infernape, + FOOTPRINT(Infernape), LEARNSETS(Infernape), }, #endif //P_FAMILY_CHIMCHAR @@ -349,7 +349,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Piplup), ICON(Piplup, 0), - .footprint = gMonFootprint_Piplup, + FOOTPRINT(Piplup), LEARNSETS(Piplup), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_PRINPLUP}), }, @@ -401,7 +401,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Prinplup), ICON(Prinplup, 0), - .footprint = gMonFootprint_Prinplup, + FOOTPRINT(Prinplup), LEARNSETS(Prinplup), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_EMPOLEON}), }, @@ -453,7 +453,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Empoleon), ICON(Empoleon, 0), - .footprint = gMonFootprint_Empoleon, + FOOTPRINT(Empoleon), LEARNSETS(Empoleon), }, #endif //P_FAMILY_PIPLUP @@ -504,7 +504,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Starly), ICON(Starly, 0), - .footprint = gMonFootprint_Starly, + FOOTPRINT(Starly), LEARNSETS(Starly), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_STARAVIA}), }, @@ -554,7 +554,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Staravia), ICON(Staravia, 0), - .footprint = gMonFootprint_Staravia, + FOOTPRINT(Staravia), LEARNSETS(Staravia), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_STARAPTOR}), }, @@ -603,7 +603,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Staraptor), ICON(Staraptor, 0), - .footprint = gMonFootprint_Staraptor, + FOOTPRINT(Staraptor), LEARNSETS(Staraptor), }, #endif //P_FAMILY_STARLY @@ -654,7 +654,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Bidoof), ICON(Bidoof, 2), - .footprint = gMonFootprint_Bidoof, + FOOTPRINT(Bidoof), LEARNSETS(Bidoof), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_BIBAREL}), }, @@ -703,7 +703,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Bibarel), ICON(Bibarel, 2), - .footprint = gMonFootprint_Bibarel, + FOOTPRINT(Bibarel), LEARNSETS(Bibarel), }, #endif //P_FAMILY_BIDOOF @@ -755,7 +755,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Kricketot), ICON(Kricketot, 2), - .footprint = gMonFootprint_Kricketot, + FOOTPRINT(Kricketot), LEARNSETS(Kricketot), .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_KRICKETUNE}), }, @@ -806,7 +806,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Kricketune), ICON(Kricketune, 2), - .footprint = gMonFootprint_Kricketune, + FOOTPRINT(Kricketune), LEARNSETS(Kricketune), }, #endif //P_FAMILY_KRICKETOT @@ -857,7 +857,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Shinx), ICON(Shinx, 0), - .footprint = gMonFootprint_Shinx, + FOOTPRINT(Shinx), LEARNSETS(Shinx), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_LUXIO}), }, @@ -907,7 +907,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Luxio), ICON(Luxio, 0), - .footprint = gMonFootprint_Luxio, + FOOTPRINT(Luxio), LEARNSETS(Luxio), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_LUXRAY}), }, @@ -957,7 +957,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Luxray), ICON(Luxray, 0), - .footprint = gMonFootprint_Luxray, + FOOTPRINT(Luxray), LEARNSETS(Luxray), }, #endif //P_FAMILY_SHINX @@ -1006,7 +1006,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Cranidos), ICON(Cranidos, 0), - .footprint = gMonFootprint_Cranidos, + FOOTPRINT(Cranidos), LEARNSETS(Cranidos), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_RAMPARDOS}), }, @@ -1054,7 +1054,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Rampardos), ICON(Rampardos, 0), - .footprint = gMonFootprint_Rampardos, + FOOTPRINT(Rampardos), LEARNSETS(Rampardos), }, #endif //P_FAMILY_CRANIDOS @@ -1103,7 +1103,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Shieldon), ICON(Shieldon, 1), - .footprint = gMonFootprint_Shieldon, + FOOTPRINT(Shieldon), LEARNSETS(Shieldon), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_BASTIODON}), }, @@ -1151,7 +1151,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Bastiodon), ICON(Bastiodon, 1), - .footprint = gMonFootprint_Bastiodon, + FOOTPRINT(Bastiodon), LEARNSETS(Bastiodon), }, #endif //P_FAMILY_SHIELDON @@ -1188,7 +1188,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontAnimId = ANIM_V_STRETCH, \ .enemyMonElevation = 10, \ .backAnimId = BACK_ANIM_H_SHAKE, \ - .footprint = gMonFootprint_Burmy, \ + FOOTPRINT(Burmy), \ LEARNSETS(Burmy), \ .formSpeciesIdTable = sBurmyFormSpeciesIdTable, \ .formChangeTable = sBurmyFormChangeTable @@ -1276,7 +1276,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .enemyMonElevation = 8, \ .backPicYOffset = 2, \ .backAnimId = BACK_ANIM_V_SHAKE, \ - .footprint = gMonFootprint_Wormadam, \ + FOOTPRINT(Wormadam), \ .formSpeciesIdTable = sWormadamFormSpeciesIdTable [SPECIES_WORMADAM_PLANT_CLOAK] = @@ -1398,7 +1398,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Mothim), ICON(Mothim, 0), - .footprint = gMonFootprint_Mothim, + FOOTPRINT(Mothim), LEARNSETS(Mothim), }, #endif //P_FAMILY_BURMY @@ -1450,7 +1450,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = PALETTES(Combee), PALETTE_FEMALE(Combee), ICON(Combee, 0), - .footprint = gMonFootprint_Combee, + FOOTPRINT(Combee), LEARNSETS(Combee), .evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 21, SPECIES_VESPIQUEN}), }, @@ -1501,7 +1501,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, PALETTES(Vespiquen), ICON(Vespiquen, 0), - .footprint = gMonFootprint_Vespiquen, + FOOTPRINT(Vespiquen), LEARNSETS(Vespiquen), }, #endif //P_FAMILY_COMBEE @@ -1551,7 +1551,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Pachirisu), ICON(Pachirisu, 0), - .footprint = gMonFootprint_Pachirisu, + FOOTPRINT(Pachirisu), LEARNSETS(Pachirisu), }, #endif //P_FAMILY_PACHIRISU @@ -1601,7 +1601,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Buizel), ICON(Buizel, 0), - .footprint = gMonFootprint_Buizel, + FOOTPRINT(Buizel), LEARNSETS(Buizel), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_FLOATZEL}), }, @@ -1650,7 +1650,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Floatzel), ICON(Floatzel, 0), - .footprint = gMonFootprint_Floatzel, + FOOTPRINT(Floatzel), LEARNSETS(Floatzel), }, #endif //P_FAMILY_BUIZEL @@ -1700,7 +1700,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Cherubi), ICON(Cherubi, 1), - .footprint = gMonFootprint_Cherubi, + FOOTPRINT(Cherubi), LEARNSETS(Cherubi), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_CHERRIM_OVERCAST}), }, @@ -1733,7 +1733,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Cherrim, \ + FOOTPRINT(Cherrim), \ LEARNSETS(Cherrim), \ .formSpeciesIdTable = sCherrimFormSpeciesIdTable, \ .formChangeTable = sCherrimFormChangeTable @@ -1811,7 +1811,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontAnimId = ANIM_V_STRETCH, \ .backPicYOffset = 8, \ .backAnimId = BACK_ANIM_H_SPRING, \ - .footprint = gMonFootprint_Shellos, \ + FOOTPRINT(Shellos), \ LEARNSETS(Shellos), \ .formSpeciesIdTable = sShellosFormSpeciesIdTable @@ -1881,7 +1881,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, \ .backPicYOffset = 3, \ .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ - .footprint = gMonFootprint_Gastrodon, \ + FOOTPRINT(Gastrodon), \ LEARNSETS(Gastrodon), \ .formSpeciesIdTable = sGastrodonFormSpeciesIdTable @@ -1961,7 +1961,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Drifloon), ICON(Drifloon, 2), - .footprint = gMonFootprint_Drifloon, + FOOTPRINT(Drifloon), LEARNSETS(Drifloon), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_DRIFBLIM}), }, @@ -2010,7 +2010,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Drifblim), ICON(Drifblim, 2), - .footprint = gMonFootprint_Drifblim, + FOOTPRINT(Drifblim), LEARNSETS(Drifblim), }, #endif //P_FAMILY_DRIFLOON @@ -2059,7 +2059,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Buneary), ICON(Buneary, 2), - .footprint = gMonFootprint_Buneary, + FOOTPRINT(Buneary), LEARNSETS(Buneary), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_LOPUNNY}), }, @@ -2076,7 +2076,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .speciesName = _("Lopunny"), \ .natDexNum = NATIONAL_DEX_LOPUNNY, \ .categoryName = _("Rabbit"), \ - .footprint = gMonFootprint_Lopunny, \ + FOOTPRINT(Lopunny), \ LEARNSETS(Lopunny), \ .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, \ .formChangeTable = sLopunnyFormChangeTable @@ -2199,7 +2199,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Glameow), ICON(Glameow, 0), - .footprint = gMonFootprint_Glameow, + FOOTPRINT(Glameow), LEARNSETS(Glameow), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_PURUGLY}), }, @@ -2247,7 +2247,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Purugly), ICON(Purugly, 0), - .footprint = gMonFootprint_Purugly, + FOOTPRINT(Purugly), LEARNSETS(Purugly), }, #endif //P_FAMILY_GLAMEOW @@ -2296,7 +2296,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Stunky), ICON(Stunky, 2), - .footprint = gMonFootprint_Stunky, + FOOTPRINT(Stunky), LEARNSETS(Stunky), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SKUNTANK}), }, @@ -2344,7 +2344,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Skuntank), ICON(Skuntank, 2), - .footprint = gMonFootprint_Skuntank, + FOOTPRINT(Skuntank), LEARNSETS(Skuntank), }, #endif //P_FAMILY_STUNKY @@ -2395,7 +2395,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Bronzor), ICON(Bronzor, 0), - .footprint = gMonFootprint_Bronzor, + FOOTPRINT(Bronzor), LEARNSETS(Bronzor), .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_BRONZONG}), }, @@ -2446,7 +2446,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Bronzong), ICON(Bronzong, 0), - .footprint = gMonFootprint_Bronzong, + FOOTPRINT(Bronzong), LEARNSETS(Bronzong), }, #endif //P_FAMILY_BRONZOR @@ -2496,7 +2496,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Chatot), ICON(Chatot, 0), - .footprint = gMonFootprint_Chatot, + FOOTPRINT(Chatot), LEARNSETS(Chatot), }, #endif //P_FAMILY_CHATOT @@ -2546,7 +2546,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Spiritomb), ICON(Spiritomb, 5), - .footprint = gMonFootprint_Spiritomb, + FOOTPRINT(Spiritomb), LEARNSETS(Spiritomb), }, #endif //P_FAMILY_SPIRITOMB @@ -2597,7 +2597,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Gible), ICON(Gible, 0), - .footprint = gMonFootprint_Gible, + FOOTPRINT(Gible), LEARNSETS(Gible), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_GABITE}), }, @@ -2647,7 +2647,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Gabite), ICON(Gabite, 0), - .footprint = gMonFootprint_Gabite, + FOOTPRINT(Gabite), LEARNSETS(Gabite), .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_GARCHOMP}), }, @@ -2671,7 +2671,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 1, \ .trainerScale = 326, \ .trainerOffset = 4, \ - .footprint = gMonFootprint_Garchomp, \ + FOOTPRINT(Garchomp), \ LEARNSETS(Garchomp), \ .formSpeciesIdTable = sGarchompFormSpeciesIdTable, \ .formChangeTable = sGarchompFormChangeTable @@ -2781,7 +2781,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Riolu), ICON(Riolu, 2), - .footprint = gMonFootprint_Riolu, + FOOTPRINT(Riolu), LEARNSETS(Riolu), .evolutions = EVOLUTION({EVO_FRIENDSHIP_DAY, 0, SPECIES_LUCARIO}), }, @@ -2800,7 +2800,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .speciesName = _("Lucario"), \ .natDexNum = NATIONAL_DEX_LUCARIO, \ .categoryName = _("Aura"), \ - .footprint = gMonFootprint_Lucario, \ + FOOTPRINT(Lucario), \ LEARNSETS(Lucario), \ .formSpeciesIdTable = sLucarioFormSpeciesIdTable, \ .formChangeTable = sLucarioFormChangeTable @@ -2925,7 +2925,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE ICON_FEMALE(Hippopotas, 1), #endif - .footprint = gMonFootprint_Hippopotas, + FOOTPRINT(Hippopotas), LEARNSETS(Hippopotas), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_HIPPOWDON}), }, @@ -2977,7 +2977,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE ICON_FEMALE(Hippowdon, 1), #endif - .footprint = gMonFootprint_Hippowdon, + FOOTPRINT(Hippowdon), LEARNSETS(Hippowdon), }, #endif //P_FAMILY_HIPPOPOTAS @@ -3027,7 +3027,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Skorupi), ICON(Skorupi, 0), - .footprint = gMonFootprint_Skorupi, + FOOTPRINT(Skorupi), LEARNSETS(Skorupi), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_DRAPION}), }, @@ -3076,7 +3076,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Drapion), ICON(Drapion, 2), - .footprint = gMonFootprint_Drapion, + FOOTPRINT(Drapion), LEARNSETS(Drapion), }, #endif //P_FAMILY_SKORUPI @@ -3128,7 +3128,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Croagunk), ICON(Croagunk, 0), - .footprint = gMonFootprint_Croagunk, + FOOTPRINT(Croagunk), LEARNSETS(Croagunk), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_TOXICROAK}), }, @@ -3179,7 +3179,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Toxicroak), ICON(Toxicroak, 0), - .footprint = gMonFootprint_Toxicroak, + FOOTPRINT(Toxicroak), LEARNSETS(Toxicroak), }, #endif //P_FAMILY_CROAGUNK @@ -3229,7 +3229,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Carnivine), ICON(Carnivine, 1), - .footprint = gMonFootprint_Carnivine, + FOOTPRINT(Carnivine), LEARNSETS(Carnivine), }, #endif //P_FAMILY_CARNIVINE @@ -3280,7 +3280,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Finneon), ICON(Finneon, 0), - .footprint = gMonFootprint_Finneon, + FOOTPRINT(Finneon), LEARNSETS(Finneon), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_LUMINEON}), }, @@ -3330,7 +3330,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Lumineon), ICON(Lumineon, 0), - .footprint = gMonFootprint_Lumineon, + FOOTPRINT(Lumineon), LEARNSETS(Lumineon), }, #endif //P_FAMILY_FINNEON @@ -3382,7 +3382,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Snover), ICON(Snover, 1), - .footprint = gMonFootprint_Snover, + FOOTPRINT(Snover), LEARNSETS(Snover), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_ABOMASNOW}), }, @@ -3402,7 +3402,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .speciesName = _("Abomasnow"), \ .natDexNum = NATIONAL_DEX_ABOMASNOW, \ .categoryName = _("Frost Tree"), \ - .footprint = gMonFootprint_Abomasnow, \ + FOOTPRINT(Abomasnow), \ LEARNSETS(Abomasnow), \ .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, \ .formChangeTable = sAbomasnowFormChangeTable @@ -3502,7 +3502,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Rotom, \ + FOOTPRINT(Rotom), \ LEARNSETS(Rotom), \ .formSpeciesIdTable = sRotomFormSpeciesIdTable, \ .formChangeTable = sRotomFormChangeTable @@ -3704,7 +3704,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Uxie), ICON(Uxie, 0), - .footprint = gMonFootprint_Uxie, + FOOTPRINT(Uxie), LEARNSETS(Uxie), }, #endif //P_FAMILY_UXIE @@ -3757,7 +3757,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Mesprit), ICON(Mesprit, 0), - .footprint = gMonFootprint_Mesprit, + FOOTPRINT(Mesprit), LEARNSETS(Mesprit), }, #endif //P_FAMILY_MESPRIT @@ -3809,7 +3809,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Azelf), ICON(Azelf, 0), - .footprint = gMonFootprint_Azelf, + FOOTPRINT(Azelf), LEARNSETS(Azelf), }, #endif //P_FAMILY_AZELF @@ -3831,7 +3831,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .cryId = CRY_DIALGA, \ .natDexNum = NATIONAL_DEX_DIALGA, \ .categoryName = _("Temporal"), \ - .footprint = gMonFootprint_Dialga, \ + FOOTPRINT(Dialga), \ LEARNSETS(Dialga), \ .formSpeciesIdTable = sDialgaFormSpeciesIdTable, \ .formChangeTable = sDialgaFormChangeTable, \ @@ -3917,7 +3917,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .cryId = CRY_PALKIA, \ .natDexNum = NATIONAL_DEX_PALKIA, \ .categoryName = _("Spatial"), \ - .footprint = gMonFootprint_Palkia, \ + FOOTPRINT(Palkia), \ LEARNSETS(Palkia), \ .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, \ .formChangeTable = sPalkiaFormChangeTable, \ @@ -4031,7 +4031,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Heatran), ICON(Heatran, 0), - .footprint = gMonFootprint_Heatran, + FOOTPRINT(Heatran), LEARNSETS(Heatran), }, #endif //P_FAMILY_HEATRAN @@ -4081,7 +4081,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Regigigas), ICON(Regigigas, 0), - .footprint = gMonFootprint_Regigigas, + FOOTPRINT(Regigigas), LEARNSETS(Regigigas), }, #endif //P_FAMILY_REGIGIGAS @@ -4102,7 +4102,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .cryId = CRY_GIRATINA, \ .natDexNum = NATIONAL_DEX_GIRATINA, \ .categoryName = _("Renegade"), \ - .footprint = gMonFootprint_Giratina, \ + FOOTPRINT(Giratina), \ LEARNSETS(Giratina), \ .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, \ .formChangeTable = sGiratinaFormChangeTable, \ @@ -4220,7 +4220,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Cresselia), ICON(Cresselia, 0), - .footprint = gMonFootprint_Cresselia, + FOOTPRINT(Cresselia), LEARNSETS(Cresselia), }, #endif //P_FAMILY_CRESSELIA @@ -4271,7 +4271,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Phione), ICON(Phione, 0), - .footprint = gMonFootprint_Phione, + FOOTPRINT(Phione), LEARNSETS(Phione), }, @@ -4320,7 +4320,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Manaphy), ICON(Manaphy, 0), - .footprint = gMonFootprint_Manaphy, + FOOTPRINT(Manaphy), LEARNSETS(Manaphy), }, #endif //P_FAMILY_MANAPHY @@ -4372,7 +4372,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Darkrai), ICON(Darkrai, 0), - .footprint = gMonFootprint_Darkrai, + FOOTPRINT(Darkrai), LEARNSETS(Darkrai), }, #endif //P_FAMILY_DARKRAI @@ -4393,7 +4393,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .speciesName = _("Shaymin"), \ .natDexNum = NATIONAL_DEX_SHAYMIN, \ .categoryName = _("Gratitude"), \ - .footprint = gMonFootprint_Shaymin, \ + FOOTPRINT(Shaymin), \ .formSpeciesIdTable = sShayminFormSpeciesIdTable, \ .formChangeTable = sShayminFormChangeTable, \ .isMythical = TRUE @@ -4510,7 +4510,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_GROW_STUTTER, \ PALETTES(Arceus ##typeName), \ ICON(Arceus, 1), \ - .footprint = gMonFootprint_Arceus, \ + FOOTPRINT(Arceus), \ LEARNSETS(Arceus), \ .formSpeciesIdTable = sArceusFormSpeciesIdTable, \ .formChangeTable = sArceusFormChangeTable, \ diff --git a/src/data/pokemon/species_info/gen_5.h b/src/data/pokemon/species_info/gen_5.h index 7553f1c17a..4d0740b2ee 100644 --- a/src/data/pokemon/species_info/gen_5.h +++ b/src/data/pokemon/species_info/gen_5.h @@ -48,7 +48,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Victini), ICON(Victini, 0), - .footprint = gMonFootprint_Victini, + FOOTPRINT(Victini), LEARNSETS(Victini), }, #endif //P_FAMILY_VICTINI @@ -97,7 +97,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Snivy), ICON(Snivy, 1), - .footprint = gMonFootprint_Snivy, + FOOTPRINT(Snivy), LEARNSETS(Snivy), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_SERVINE}), }, @@ -145,7 +145,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Servine), ICON(Servine, 1), - .footprint = gMonFootprint_Servine, + FOOTPRINT(Servine), LEARNSETS(Servine), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SERPERIOR}), }, @@ -193,7 +193,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Serperior), ICON(Serperior, 1), - .footprint = gMonFootprint_Serperior, + FOOTPRINT(Serperior), LEARNSETS(Serperior), }, #endif //P_FAMILY_SNIVY @@ -242,7 +242,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Tepig), ICON(Tepig, 0), - .footprint = gMonFootprint_Tepig, + FOOTPRINT(Tepig), LEARNSETS(Tepig), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_PIGNITE}), }, @@ -290,7 +290,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Pignite), ICON(Pignite, 0), - .footprint = gMonFootprint_Pignite, + FOOTPRINT(Pignite), LEARNSETS(Pignite), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_EMBOAR}), }, @@ -339,7 +339,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Emboar), ICON(Emboar, 0), - .footprint = gMonFootprint_Emboar, + FOOTPRINT(Emboar), LEARNSETS(Emboar), }, #endif //P_FAMILY_TEPIG @@ -388,7 +388,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Oshawott), ICON(Oshawott, 0), - .footprint = gMonFootprint_Oshawott, + FOOTPRINT(Oshawott), LEARNSETS(Oshawott), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_DEWOTT}), }, @@ -436,7 +436,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Dewott), ICON(Dewott, 0), - .footprint = gMonFootprint_Dewott, + FOOTPRINT(Dewott), LEARNSETS(Dewott), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SAMUROTT}, {EVO_NONE, 0, SPECIES_SAMUROTT_HISUIAN}), @@ -460,7 +460,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, \ .trainerScale = 271, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Samurott, \ + FOOTPRINT(Samurott), \ .formSpeciesIdTable = sSamurottFormSpeciesIdTable [SPECIES_SAMUROTT] = @@ -571,7 +571,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Patrat), ICON(Patrat, 2), - .footprint = gMonFootprint_Patrat, + FOOTPRINT(Patrat), LEARNSETS(Patrat), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_WATCHOG}), }, @@ -619,7 +619,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Watchog), ICON(Watchog, 2), - .footprint = gMonFootprint_Watchog, + FOOTPRINT(Watchog), LEARNSETS(Watchog), }, #endif //P_FAMILY_PATRAT @@ -668,7 +668,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Lillipup), ICON(Lillipup, 2), - .footprint = gMonFootprint_Lillipup, + FOOTPRINT(Lillipup), LEARNSETS(Lillipup), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_HERDIER}), }, @@ -716,7 +716,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Herdier), ICON(Herdier, 2), - .footprint = gMonFootprint_Herdier, + FOOTPRINT(Herdier), LEARNSETS(Herdier), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_STOUTLAND}), }, @@ -764,7 +764,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Stoutland), ICON(Stoutland, 2), - .footprint = gMonFootprint_Stoutland, + FOOTPRINT(Stoutland), LEARNSETS(Stoutland), }, #endif //P_FAMILY_LILLIPUP @@ -813,7 +813,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Purrloin), ICON(Purrloin, 0), - .footprint = gMonFootprint_Purrloin, + FOOTPRINT(Purrloin), LEARNSETS(Purrloin), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LIEPARD}), }, @@ -861,7 +861,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Liepard), ICON(Liepard, 0), - .footprint = gMonFootprint_Liepard, + FOOTPRINT(Liepard), LEARNSETS(Liepard), }, #endif //P_FAMILY_PURRLOIN @@ -910,7 +910,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Pansage), ICON(Pansage, 1), - .footprint = gMonFootprint_Pansage, + FOOTPRINT(Pansage), LEARNSETS(Pansage), .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_SIMISAGE}), }, @@ -958,7 +958,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Simisage), ICON(Simisage, 1), - .footprint = gMonFootprint_Simisage, + FOOTPRINT(Simisage), LEARNSETS(Simisage), }, #endif //P_FAMILY_PANSAGE @@ -1008,7 +1008,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Pansear), ICON(Pansear, 2), - .footprint = gMonFootprint_Pansear, + FOOTPRINT(Pansear), LEARNSETS(Pansear), .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_SIMISEAR}), }, @@ -1057,7 +1057,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Simisear), ICON(Simisear, 2), - .footprint = gMonFootprint_Simisear, + FOOTPRINT(Simisear), LEARNSETS(Simisear), }, #endif //P_FAMILY_PANSEAR @@ -1106,7 +1106,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Panpour), ICON(Panpour, 2), - .footprint = gMonFootprint_Panpour, + FOOTPRINT(Panpour), LEARNSETS(Panpour), .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_SIMIPOUR}), }, @@ -1154,7 +1154,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Simipour), ICON(Simipour, 2), - .footprint = gMonFootprint_Simipour, + FOOTPRINT(Simipour), LEARNSETS(Simipour), }, #endif //P_FAMILY_PANPOUR @@ -1204,7 +1204,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Munna), ICON(Munna, 0), - .footprint = gMonFootprint_Munna, + FOOTPRINT(Munna), LEARNSETS(Munna), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_MUSHARNA}), }, @@ -1253,7 +1253,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Musharna), ICON(Musharna, 0), - .footprint = gMonFootprint_Musharna, + FOOTPRINT(Musharna), LEARNSETS(Musharna), }, #endif //P_FAMILY_MUNNA @@ -1302,7 +1302,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Pidove), ICON(Pidove, 0), - .footprint = gMonFootprint_Pidove, + FOOTPRINT(Pidove), LEARNSETS(Pidove), .evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_TRANQUILL}), }, @@ -1350,7 +1350,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Tranquill), ICON(Tranquill, 0), - .footprint = gMonFootprint_Tranquill, + FOOTPRINT(Tranquill), LEARNSETS(Tranquill), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_UNFEZANT}), }, @@ -1402,7 +1402,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = PALETTE_FEMALE(Unfezant), ICON(Unfezant, 1), ICON_FEMALE(Unfezant, 1), - .footprint = gMonFootprint_Unfezant, + FOOTPRINT(Unfezant), LEARNSETS(Unfezant), }, #endif //P_FAMILY_PIDOVE @@ -1451,7 +1451,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Blitzle), ICON(Blitzle, 2), - .footprint = gMonFootprint_Blitzle, + FOOTPRINT(Blitzle), LEARNSETS(Blitzle), .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_ZEBSTRIKA}), }, @@ -1499,7 +1499,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Zebstrika), ICON(Zebstrika, 2), - .footprint = gMonFootprint_Zebstrika, + FOOTPRINT(Zebstrika), LEARNSETS(Zebstrika), }, #endif //P_FAMILY_BLITZLE @@ -1550,7 +1550,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Roggenrola), ICON(Roggenrola, 2), - .footprint = gMonFootprint_Roggenrola, + FOOTPRINT(Roggenrola), LEARNSETS(Roggenrola), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_BOLDORE}), }, @@ -1601,7 +1601,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Boldore), ICON(Boldore, 0), - .footprint = gMonFootprint_Boldore, + FOOTPRINT(Boldore), LEARNSETS(Boldore), .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GIGALITH}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GIGALITH}), @@ -1652,7 +1652,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Gigalith), ICON(Gigalith, 0), - .footprint = gMonFootprint_Gigalith, + FOOTPRINT(Gigalith), LEARNSETS(Gigalith), }, #endif //P_FAMILY_ROGGENROLA @@ -1702,7 +1702,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Woobat), ICON(Woobat, 0), - .footprint = gMonFootprint_Woobat, + FOOTPRINT(Woobat), LEARNSETS(Woobat), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_SWOOBAT}), }, @@ -1751,7 +1751,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Swoobat), ICON(Swoobat, 0), - .footprint = gMonFootprint_Swoobat, + FOOTPRINT(Swoobat), LEARNSETS(Swoobat), }, #endif //P_FAMILY_WOOBAT @@ -1801,7 +1801,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Drilbur), ICON(Drilbur, 0), - .footprint = gMonFootprint_Drilbur, + FOOTPRINT(Drilbur), LEARNSETS(Drilbur), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_EXCADRILL}), }, @@ -1850,7 +1850,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Excadrill), ICON(Excadrill, 0), - .footprint = gMonFootprint_Excadrill, + FOOTPRINT(Excadrill), LEARNSETS(Excadrill), }, #endif //P_FAMILY_DRILBUR @@ -1868,7 +1868,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .speciesName = _("Audino"), \ .natDexNum = NATIONAL_DEX_AUDINO, \ .categoryName = _("Hearing"), \ - .footprint = gMonFootprint_Audino, \ + FOOTPRINT(Audino), \ LEARNSETS(Audino), \ .formSpeciesIdTable = sAudinoFormSpeciesIdTable, \ .formChangeTable = sAudinoFormChangeTable @@ -1994,7 +1994,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Timburr), ICON(Timburr, 1), - .footprint = gMonFootprint_Timburr, + FOOTPRINT(Timburr), LEARNSETS(Timburr), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GURDURR}), }, @@ -2042,7 +2042,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Gurdurr), ICON(Gurdurr, 1), - .footprint = gMonFootprint_Gurdurr, + FOOTPRINT(Gurdurr), LEARNSETS(Gurdurr), .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_CONKELDURR}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_CONKELDURR}), @@ -2091,7 +2091,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Conkeldurr), ICON(Conkeldurr, 1), - .footprint = gMonFootprint_Conkeldurr, + FOOTPRINT(Conkeldurr), LEARNSETS(Conkeldurr), }, #endif //P_FAMILY_TIMBURR @@ -2140,7 +2140,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SPRING, PALETTES(Tympole), ICON(Tympole, 2), - .footprint = gMonFootprint_Tympole, + FOOTPRINT(Tympole), LEARNSETS(Tympole), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_PALPITOAD}), }, @@ -2188,7 +2188,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Palpitoad), ICON(Palpitoad, 2), - .footprint = gMonFootprint_Palpitoad, + FOOTPRINT(Palpitoad), LEARNSETS(Palpitoad), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SEISMITOAD}), }, @@ -2236,7 +2236,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Seismitoad), ICON(Seismitoad, 0), - .footprint = gMonFootprint_Seismitoad, + FOOTPRINT(Seismitoad), LEARNSETS(Seismitoad), }, #endif //P_FAMILY_TYMPOLE @@ -2286,7 +2286,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Throh), ICON(Throh, 0), - .footprint = gMonFootprint_Throh, + FOOTPRINT(Throh), LEARNSETS(Throh), }, #endif //P_FAMILY_THROH @@ -2337,7 +2337,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Sawk), ICON(Sawk, 0), - .footprint = gMonFootprint_Sawk, + FOOTPRINT(Sawk), LEARNSETS(Sawk), }, #endif //P_FAMILY_SAWK @@ -2387,7 +2387,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Sewaddle), ICON(Sewaddle, 1), - .footprint = gMonFootprint_Sewaddle, + FOOTPRINT(Sewaddle), LEARNSETS(Sewaddle), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_SWADLOON}), }, @@ -2436,7 +2436,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Swadloon), ICON(Swadloon, 1), - .footprint = gMonFootprint_Swadloon, + FOOTPRINT(Swadloon), LEARNSETS(Swadloon), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_LEAVANNY}), }, @@ -2485,7 +2485,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Leavanny), ICON(Leavanny, 1), - .footprint = gMonFootprint_Leavanny, + FOOTPRINT(Leavanny), LEARNSETS(Leavanny), }, #endif //P_FAMILY_SEWADDLE @@ -2539,7 +2539,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Venipede), ICON(Venipede, 1), - .footprint = gMonFootprint_Venipede, + FOOTPRINT(Venipede), LEARNSETS(Venipede), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_WHIRLIPEDE}), }, @@ -2592,7 +2592,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Whirlipede), ICON(Whirlipede, 2), - .footprint = gMonFootprint_Whirlipede, + FOOTPRINT(Whirlipede), LEARNSETS(Whirlipede), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_SCOLIPEDE}), }, @@ -2645,7 +2645,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Scolipede), ICON(Scolipede, 2), - .footprint = gMonFootprint_Scolipede, + FOOTPRINT(Scolipede), LEARNSETS(Scolipede), }, #endif //P_FAMILY_VENIPEDE @@ -2701,7 +2701,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Cottonee), ICON(Cottonee, 1), - .footprint = gMonFootprint_Cottonee, + FOOTPRINT(Cottonee), LEARNSETS(Cottonee), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_WHIMSICOTT}), }, @@ -2750,7 +2750,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Whimsicott), ICON(Whimsicott, 1), - .footprint = gMonFootprint_Whimsicott, + FOOTPRINT(Whimsicott), LEARNSETS(Whimsicott), }, #endif //P_FAMILY_COTTONEE @@ -2801,7 +2801,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Petilil), ICON(Petilil, 1), - .footprint = gMonFootprint_Petilil, + FOOTPRINT(Petilil), LEARNSETS(Petilil), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_LILLIGANT}, {EVO_NONE, 0, SPECIES_LILLIGANT_HISUIAN}), @@ -2821,7 +2821,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .speciesName = _("Lilligant"), \ .cryId = CRY_LILLIGANT, \ .natDexNum = NATIONAL_DEX_LILLIGANT, \ - .footprint = gMonFootprint_Lilligant, \ + FOOTPRINT(Lilligant), \ .formSpeciesIdTable = sLilligantFormSpeciesIdTable [SPECIES_LILLIGANT] = @@ -2929,7 +2929,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 257, \ .trainerOffset = 0, \ .enemyMonElevation = 6, \ - .footprint = gMonFootprint_Basculin, \ + FOOTPRINT(Basculin), \ .formSpeciesIdTable = sBasculinFormSpeciesIdTable [SPECIES_BASCULIN_RED_STRIPED] = @@ -3033,7 +3033,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .formSpeciesIdTable = sBasculegionFormSpeciesIdTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //.footprint = gMonFootprint_Basculegion, + //FOOTPRINT(Basculegion), [SPECIES_BASCULEGION_MALE] = { @@ -3123,7 +3123,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Sandile), ICON(Sandile, 1), - .footprint = gMonFootprint_Sandile, + FOOTPRINT(Sandile), LEARNSETS(Sandile), .evolutions = EVOLUTION({EVO_LEVEL, 29, SPECIES_KROKOROK}), }, @@ -3172,7 +3172,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Krokorok), ICON(Krokorok, 1), - .footprint = gMonFootprint_Krokorok, + FOOTPRINT(Krokorok), LEARNSETS(Krokorok), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_KROOKODILE}), }, @@ -3221,7 +3221,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Krookodile), ICON(Krookodile, 0), - .footprint = gMonFootprint_Krookodile, + FOOTPRINT(Krookodile), LEARNSETS(Krookodile), }, #endif //P_FAMILY_SANDILE @@ -3247,7 +3247,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .cryId = CRY_DARUMAKA, \ .natDexNum = NATIONAL_DEX_DARUMAKA, \ .categoryName = _("Zen Charm"), \ - .footprint = gMonFootprint_Darumaka, \ + FOOTPRINT(Darumaka), \ .formSpeciesIdTable = sDarumakaFormSpeciesIdTable [SPECIES_DARUMAKA] = @@ -3289,7 +3289,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .speciesName = _("Darmanitan"), \ .cryId = CRY_DARMANITAN, \ .natDexNum = NATIONAL_DEX_DARMANITAN, \ - .footprint = gMonFootprint_Darmanitan, \ + FOOTPRINT(Darmanitan), \ .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable #define DARMANITAN_STANDARD_MISC_INFO \ @@ -3510,7 +3510,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Maractus), ICON(Maractus, 1), - .footprint = gMonFootprint_Maractus, + FOOTPRINT(Maractus), LEARNSETS(Maractus), }, #endif //P_FAMILY_MARACTUS @@ -3560,7 +3560,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Dwebble), ICON(Dwebble, 0), - .footprint = gMonFootprint_Dwebble, + FOOTPRINT(Dwebble), LEARNSETS(Dwebble), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_CRUSTLE}), }, @@ -3609,7 +3609,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Crustle), ICON(Crustle, 2), - .footprint = gMonFootprint_Crustle, + FOOTPRINT(Crustle), LEARNSETS(Crustle), }, #endif //P_FAMILY_DWEBBLE @@ -3659,7 +3659,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Scraggy), ICON(Scraggy, 2), - .footprint = gMonFootprint_Scraggy, + FOOTPRINT(Scraggy), LEARNSETS(Scraggy), .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_SCRAFTY}), }, @@ -3709,7 +3709,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Scrafty), ICON(Scrafty, 0), - .footprint = gMonFootprint_Scrafty, + FOOTPRINT(Scrafty), LEARNSETS(Scrafty), }, #endif //P_FAMILY_SCRAGGY @@ -3759,7 +3759,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Sigilyph), ICON(Sigilyph, 0), - .footprint = gMonFootprint_Sigilyph, + FOOTPRINT(Sigilyph), LEARNSETS(Sigilyph), }, #endif //P_FAMILY_SIGILYPH @@ -3785,7 +3785,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Yamask, \ + FOOTPRINT(Yamask), \ .formSpeciesIdTable = sYamaskFormSpeciesIdTable [SPECIES_YAMASK] = @@ -3863,7 +3863,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Cofagrigus), ICON(Cofagrigus, 0), - .footprint = gMonFootprint_Cofagrigus, + FOOTPRINT(Cofagrigus), LEARNSETS(Cofagrigus), }, @@ -3942,7 +3942,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Runerigus), ICON(Runerigus, 2), - .footprint = gMonFootprint_Runerigus, + FOOTPRINT(Runerigus), LEARNSETS(Runerigus), }, #endif //P_GALARIAN_FORMS @@ -3992,7 +3992,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Tirtouga), ICON(Tirtouga, 2), - .footprint = gMonFootprint_Tirtouga, + FOOTPRINT(Tirtouga), LEARNSETS(Tirtouga), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_CARRACOSTA}), }, @@ -4040,7 +4040,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Carracosta), ICON(Carracosta, 2), - .footprint = gMonFootprint_Carracosta, + FOOTPRINT(Carracosta), LEARNSETS(Carracosta), }, #endif //P_FAMILY_TIRTOUGA @@ -4089,7 +4089,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Archen), ICON(Archen, 0), - .footprint = gMonFootprint_Archen, + FOOTPRINT(Archen), LEARNSETS(Archen), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_ARCHEOPS}), }, @@ -4138,7 +4138,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Archeops), ICON(Archeops, 0), - .footprint = gMonFootprint_Archeops, + FOOTPRINT(Archeops), LEARNSETS(Archeops), }, #endif //P_FAMILY_ARCHEN @@ -4188,7 +4188,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Trubbish), ICON(Trubbish, 1), - .footprint = gMonFootprint_Trubbish, + FOOTPRINT(Trubbish), LEARNSETS(Trubbish), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GARBODOR}), }, @@ -4218,7 +4218,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .cryId = CRY_GARBODOR, \ .natDexNum = NATIONAL_DEX_GARBODOR, \ .categoryName = _("Trash Heap"), \ - .footprint = gMonFootprint_Garbodor, \ + FOOTPRINT(Garbodor), \ LEARNSETS(Garbodor), \ .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, \ .formChangeTable = sGarbodorFormChangeTable @@ -4298,7 +4298,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Zorua, \ + FOOTPRINT(Zorua), \ .formSpeciesIdTable = sZoruaFormSpeciesIdTable #define ZOROARK_MISC_INFO \ @@ -4320,7 +4320,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, \ .trainerScale = 296, \ .trainerOffset = 1, \ - .footprint = gMonFootprint_Zoroark, \ + FOOTPRINT(Zoroark), \ .formSpeciesIdTable = sZoroarkFormSpeciesIdTable [SPECIES_ZORUA] = @@ -4488,7 +4488,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Minccino), ICON(Minccino, 0), - .footprint = gMonFootprint_Minccino, + FOOTPRINT(Minccino), LEARNSETS(Minccino), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_CINCCINO}), }, @@ -4537,7 +4537,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Cinccino), ICON(Cinccino, 0), - .footprint = gMonFootprint_Cinccino, + FOOTPRINT(Cinccino), LEARNSETS(Cinccino), }, #endif //P_FAMILY_MINCCINO @@ -4586,7 +4586,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Gothita), ICON(Gothita, 2), - .footprint = gMonFootprint_Gothita, + FOOTPRINT(Gothita), LEARNSETS(Gothita), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GOTHORITA}), }, @@ -4634,7 +4634,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Gothorita), ICON(Gothorita, 2), - .footprint = gMonFootprint_Gothorita, + FOOTPRINT(Gothorita), LEARNSETS(Gothorita), .evolutions = EVOLUTION({EVO_LEVEL, 41, SPECIES_GOTHITELLE}), }, @@ -4682,7 +4682,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Gothitelle), ICON(Gothitelle, 2), - .footprint = gMonFootprint_Gothitelle, + FOOTPRINT(Gothitelle), LEARNSETS(Gothitelle), }, #endif //P_FAMILY_GOTHITA @@ -4733,7 +4733,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Solosis), ICON(Solosis, 1), - .footprint = gMonFootprint_Solosis, + FOOTPRINT(Solosis), LEARNSETS(Solosis), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_DUOSION}), }, @@ -4782,7 +4782,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Duosion), ICON(Duosion, 1), - .footprint = gMonFootprint_Duosion, + FOOTPRINT(Duosion), LEARNSETS(Duosion), .evolutions = EVOLUTION({EVO_LEVEL, 41, SPECIES_REUNICLUS}), }, @@ -4831,7 +4831,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Reuniclus), ICON(Reuniclus, 1), - .footprint = gMonFootprint_Reuniclus, + FOOTPRINT(Reuniclus), LEARNSETS(Reuniclus), }, #endif //P_FAMILY_SOLOSIS @@ -4880,7 +4880,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Ducklett), ICON(Ducklett, 0), - .footprint = gMonFootprint_Ducklett, + FOOTPRINT(Ducklett), LEARNSETS(Ducklett), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_SWANNA}), }, @@ -4928,7 +4928,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Swanna), ICON(Swanna, 2), - .footprint = gMonFootprint_Swanna, + FOOTPRINT(Swanna), LEARNSETS(Swanna), }, #endif //P_FAMILY_DUCKLETT @@ -4978,7 +4978,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Vanillite), ICON(Vanillite, 0), - .footprint = gMonFootprint_Vanillite, + FOOTPRINT(Vanillite), LEARNSETS(Vanillite), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_VANILLISH}), }, @@ -5027,7 +5027,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Vanillish), ICON(Vanillish, 2), - .footprint = gMonFootprint_Vanillish, + FOOTPRINT(Vanillish), LEARNSETS(Vanillish), .evolutions = EVOLUTION({EVO_LEVEL, 47, SPECIES_VANILLUXE}), }, @@ -5076,7 +5076,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Vanilluxe), ICON(Vanilluxe, 2), - .footprint = gMonFootprint_Vanilluxe, + FOOTPRINT(Vanilluxe), LEARNSETS(Vanilluxe), }, #endif //P_FAMILY_VANILLITE @@ -5116,7 +5116,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = BACK_PIC(Deerling, 48, 56), \ .backPicYOffset = 9, \ .backAnimId = BACK_ANIM_H_SLIDE, \ - .footprint = gMonFootprint_Deerling, \ + FOOTPRINT(Deerling), \ LEARNSETS(Deerling), \ .formSpeciesIdTable = sDeerlingFormSpeciesIdTable @@ -5206,7 +5206,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ .backPicYOffset = 5, \ .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, \ - .footprint = gMonFootprint_Sawsbuck, \ + FOOTPRINT(Sawsbuck), \ LEARNSETS(Sawsbuck), \ .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable @@ -5313,7 +5313,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Emolga), ICON(Emolga, 2), - .footprint = gMonFootprint_Emolga, + FOOTPRINT(Emolga), LEARNSETS(Emolga), }, #endif //P_FAMILY_EMOLGA @@ -5362,7 +5362,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Karrablast), ICON(Karrablast, 0), - .footprint = gMonFootprint_Karrablast, + FOOTPRINT(Karrablast), LEARNSETS(Karrablast), .evolutions = EVOLUTION({EVO_TRADE_SPECIFIC_MON, SPECIES_SHELMET, SPECIES_ESCAVALIER}), }, @@ -5410,7 +5410,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Escavalier), ICON(Escavalier, 0), - .footprint = gMonFootprint_Escavalier, + FOOTPRINT(Escavalier), LEARNSETS(Escavalier), }, #endif //P_FAMILY_KARRABLAST @@ -5461,7 +5461,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Foongus), ICON(Foongus, 0), - .footprint = gMonFootprint_Foongus, + FOOTPRINT(Foongus), LEARNSETS(Foongus), .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_AMOONGUSS}), }, @@ -5512,7 +5512,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Amoonguss), ICON(Amoonguss, 1), - .footprint = gMonFootprint_Amoonguss, + FOOTPRINT(Amoonguss), LEARNSETS(Amoonguss), }, #endif //P_FAMILY_FOONGUS @@ -5565,7 +5565,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = PALETTE_FEMALE(Frillish), ICON(Frillish, 0), ICON_FEMALE(Frillish, 1), - .footprint = gMonFootprint_Frillish, + FOOTPRINT(Frillish), LEARNSETS(Frillish), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_JELLICENT}), }, @@ -5617,7 +5617,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = PALETTE_FEMALE(Jellicent), ICON(Jellicent, 0), ICON_FEMALE(Jellicent, 1), - .footprint = gMonFootprint_Jellicent, + FOOTPRINT(Jellicent), LEARNSETS(Jellicent), }, #endif //P_FAMILY_FRILLISH @@ -5666,7 +5666,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Alomomola), ICON(Alomomola, 0), - .footprint = gMonFootprint_Alomomola, + FOOTPRINT(Alomomola), LEARNSETS(Alomomola), }, #endif //P_FAMILY_ALOMOMOLA @@ -5715,7 +5715,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Joltik), ICON(Joltik, 0), - .footprint = gMonFootprint_Joltik, + FOOTPRINT(Joltik), LEARNSETS(Joltik), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GALVANTULA}), }, @@ -5763,7 +5763,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Galvantula), ICON(Galvantula, 2), - .footprint = gMonFootprint_Galvantula, + FOOTPRINT(Galvantula), LEARNSETS(Galvantula), }, #endif //P_FAMILY_JOLTIK @@ -5813,7 +5813,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Ferroseed), ICON(Ferroseed, 1), - .footprint = gMonFootprint_Ferroseed, + FOOTPRINT(Ferroseed), LEARNSETS(Ferroseed), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_FERROTHORN}), }, @@ -5863,7 +5863,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Ferrothorn), ICON(Ferrothorn, 1), - .footprint = gMonFootprint_Ferrothorn, + FOOTPRINT(Ferrothorn), LEARNSETS(Ferrothorn), }, #endif //P_FAMILY_FERROSEED @@ -5914,7 +5914,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Klink), ICON(Klink, 0), - .footprint = gMonFootprint_Klink, + FOOTPRINT(Klink), LEARNSETS(Klink), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_KLANG}), }, @@ -5964,7 +5964,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Klang), ICON(Klang, 0), - .footprint = gMonFootprint_Klang, + FOOTPRINT(Klang), LEARNSETS(Klang), .evolutions = EVOLUTION({EVO_LEVEL, 49, SPECIES_KLINKLANG}), }, @@ -6014,7 +6014,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, PALETTES(Klinklang), ICON(Klinklang, 0), - .footprint = gMonFootprint_Klinklang, + FOOTPRINT(Klinklang), LEARNSETS(Klinklang), }, #endif //P_FAMILY_KLINK @@ -6064,7 +6064,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Tynamo), ICON(Tynamo, 0), - .footprint = gMonFootprint_Tynamo, + FOOTPRINT(Tynamo), LEARNSETS(Tynamo), .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_EELEKTRIK}), }, @@ -6113,7 +6113,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Eelektrik), ICON(Eelektrik, 0), - .footprint = gMonFootprint_Eelektrik, + FOOTPRINT(Eelektrik), LEARNSETS(Eelektrik), .evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_EELEKTROSS}), }, @@ -6162,7 +6162,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Eelektross), ICON(Eelektross, 0), - .footprint = gMonFootprint_Eelektross, + FOOTPRINT(Eelektross), LEARNSETS(Eelektross), }, #endif //P_FAMILY_TYNAMO @@ -6211,7 +6211,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Elgyem), ICON(Elgyem, 0), - .footprint = gMonFootprint_Elgyem, + FOOTPRINT(Elgyem), LEARNSETS(Elgyem), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_BEHEEYEM}), }, @@ -6259,7 +6259,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Beheeyem), ICON(Beheeyem, 2), - .footprint = gMonFootprint_Beheeyem, + FOOTPRINT(Beheeyem), LEARNSETS(Beheeyem), }, #endif //P_FAMILY_ELGYEM @@ -6313,7 +6313,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Litwick), ICON(Litwick, 2), - .footprint = gMonFootprint_Litwick, + FOOTPRINT(Litwick), LEARNSETS(Litwick), .evolutions = EVOLUTION({EVO_LEVEL, 41, SPECIES_LAMPENT}), }, @@ -6366,7 +6366,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Lampent), ICON(Lampent, 2), - .footprint = gMonFootprint_Lampent, + FOOTPRINT(Lampent), LEARNSETS(Lampent), .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_CHANDELURE}), }, @@ -6419,7 +6419,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Chandelure), ICON(Chandelure, 2), - .footprint = gMonFootprint_Chandelure, + FOOTPRINT(Chandelure), LEARNSETS(Chandelure), }, #endif //P_FAMILY_LITWICK @@ -6468,7 +6468,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Axew), ICON(Axew, 1), - .footprint = gMonFootprint_Axew, + FOOTPRINT(Axew), LEARNSETS(Axew), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_FRAXURE}), }, @@ -6516,7 +6516,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Fraxure), ICON(Fraxure, 1), - .footprint = gMonFootprint_Fraxure, + FOOTPRINT(Fraxure), LEARNSETS(Fraxure), .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_HAXORUS}), }, @@ -6564,7 +6564,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Haxorus), ICON(Haxorus, 2), - .footprint = gMonFootprint_Haxorus, + FOOTPRINT(Haxorus), LEARNSETS(Haxorus), }, #endif //P_FAMILY_AXEW @@ -6613,7 +6613,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Cubchoo), ICON(Cubchoo, 0), - .footprint = gMonFootprint_Cubchoo, + FOOTPRINT(Cubchoo), LEARNSETS(Cubchoo), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_BEARTIC}), }, @@ -6661,7 +6661,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Beartic), ICON(Beartic, 0), - .footprint = gMonFootprint_Beartic, + FOOTPRINT(Beartic), LEARNSETS(Beartic), }, #endif //P_FAMILY_CUBCHOO @@ -6717,7 +6717,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Cryogonal), ICON(Cryogonal, 0), - .footprint = gMonFootprint_Cryogonal, + FOOTPRINT(Cryogonal), LEARNSETS(Cryogonal), }, #endif //P_FAMILY_CRYOGONAL @@ -6766,7 +6766,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Shelmet), ICON(Shelmet, 1), - .footprint = gMonFootprint_Shelmet, + FOOTPRINT(Shelmet), LEARNSETS(Shelmet), .evolutions = EVOLUTION({EVO_TRADE_SPECIFIC_MON, SPECIES_KARRABLAST, SPECIES_ACCELGOR}), }, @@ -6814,7 +6814,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SPRING_REPEATED, PALETTES(Accelgor), ICON(Accelgor, 1), - .footprint = gMonFootprint_Accelgor, + FOOTPRINT(Accelgor), LEARNSETS(Accelgor), }, #endif //P_FAMILY_SHELMET @@ -6837,7 +6837,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Stunfisk, \ + FOOTPRINT(Stunfisk), \ .formSpeciesIdTable = sStunfiskFormSpeciesIdTable [SPECIES_STUNFISK] = @@ -6951,7 +6951,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Mienfoo), ICON(Mienfoo, 1), - .footprint = gMonFootprint_Mienfoo, + FOOTPRINT(Mienfoo), LEARNSETS(Mienfoo), .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_MIENSHAO}), }, @@ -6999,7 +6999,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Mienshao), ICON(Mienshao, 2), - .footprint = gMonFootprint_Mienshao, + FOOTPRINT(Mienshao), LEARNSETS(Mienshao), }, #endif //P_FAMILY_MIENFOO @@ -7049,7 +7049,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Druddigon), ICON(Druddigon, 0), - .footprint = gMonFootprint_Druddigon, + FOOTPRINT(Druddigon), LEARNSETS(Druddigon), }, #endif //P_FAMILY_DRUDDIGON @@ -7100,7 +7100,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Golett), ICON(Golett, 0), - .footprint = gMonFootprint_Golett, + FOOTPRINT(Golett), LEARNSETS(Golett), .evolutions = EVOLUTION({EVO_LEVEL, 43, SPECIES_GOLURK}), }, @@ -7150,7 +7150,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Golurk), ICON(Golurk, 0), - .footprint = gMonFootprint_Golurk, + FOOTPRINT(Golurk), LEARNSETS(Golurk), }, #endif //P_FAMILY_GOLETT @@ -7199,7 +7199,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Pawniard), ICON(Pawniard, 0), - .footprint = gMonFootprint_Pawniard, + FOOTPRINT(Pawniard), LEARNSETS(Pawniard), .evolutions = EVOLUTION({EVO_LEVEL, 52, SPECIES_BISHARP}), }, @@ -7247,7 +7247,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Bisharp), ICON(Bisharp, 0), - .footprint = gMonFootprint_Bisharp, + FOOTPRINT(Bisharp), LEARNSETS(Bisharp), .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_KINGAMBIT}), }, @@ -7296,7 +7296,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Kingambit), ICON(Kingambit, 3), - //.footprint = gMonFootprint_Kingambit, + //FOOTPRINT(Kingambit), LEARNSETS(Kingambit), }, #endif //P_GEN_9_CROSS_EVOS @@ -7346,7 +7346,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Bouffalant), ICON(Bouffalant, 2), - .footprint = gMonFootprint_Bouffalant, + FOOTPRINT(Bouffalant), LEARNSETS(Bouffalant), }, #endif //P_FAMILY_BOUFFALANT @@ -7395,7 +7395,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Rufflet), ICON(Rufflet, 2), - .footprint = gMonFootprint_Rufflet, + FOOTPRINT(Rufflet), LEARNSETS(Rufflet), .evolutions = EVOLUTION({EVO_LEVEL, 54, SPECIES_BRAVIARY}, {EVO_NONE, 0, SPECIES_BRAVIARY_HISUIAN}), @@ -7412,7 +7412,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .speciesName = _("Braviary"), \ .cryId = CRY_BRAVIARY, \ .natDexNum = NATIONAL_DEX_BRAVIARY, \ - .footprint = gMonFootprint_Braviary, \ + FOOTPRINT(Braviary), \ .formSpeciesIdTable = sBraviaryFormSpeciesIdTable [SPECIES_BRAVIARY] = @@ -7538,7 +7538,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Vullaby), ICON(Vullaby, 0), - .footprint = gMonFootprint_Vullaby, + FOOTPRINT(Vullaby), LEARNSETS(Vullaby), .evolutions = EVOLUTION({EVO_LEVEL, 54, SPECIES_MANDIBUZZ}), }, @@ -7586,7 +7586,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Mandibuzz), ICON(Mandibuzz, 1), - .footprint = gMonFootprint_Mandibuzz, + FOOTPRINT(Mandibuzz), LEARNSETS(Mandibuzz), }, #endif //P_FAMILY_VULLABY @@ -7635,7 +7635,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Heatmor), ICON(Heatmor, 2), - .footprint = gMonFootprint_Heatmor, + FOOTPRINT(Heatmor), LEARNSETS(Heatmor), }, #endif //P_FAMILY_HEATMOR @@ -7684,7 +7684,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Durant), ICON(Durant, 0), - .footprint = gMonFootprint_Durant, + FOOTPRINT(Durant), LEARNSETS(Durant), }, #endif //P_FAMILY_DURANT @@ -7733,7 +7733,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Deino), ICON(Deino, 2), - .footprint = gMonFootprint_Deino, + FOOTPRINT(Deino), LEARNSETS(Deino), .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_ZWEILOUS}), }, @@ -7781,7 +7781,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Zweilous), ICON(Zweilous, 2), - .footprint = gMonFootprint_Zweilous, + FOOTPRINT(Zweilous), LEARNSETS(Zweilous), .evolutions = EVOLUTION({EVO_LEVEL, 64, SPECIES_HYDREIGON}), }, @@ -7830,7 +7830,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Hydreigon), ICON(Hydreigon, 2), - .footprint = gMonFootprint_Hydreigon, + FOOTPRINT(Hydreigon), LEARNSETS(Hydreigon), }, #endif //P_FAMILY_DEINO @@ -7879,7 +7879,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Larvesta), ICON(Larvesta, 0), - .footprint = gMonFootprint_Larvesta, + FOOTPRINT(Larvesta), LEARNSETS(Larvesta), .evolutions = EVOLUTION({EVO_LEVEL, 59, SPECIES_VOLCARONA}), }, @@ -7930,7 +7930,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Volcarona), ICON(Volcarona, 0), - .footprint = gMonFootprint_Volcarona, + FOOTPRINT(Volcarona), LEARNSETS(Volcarona), }, #endif //P_FAMILY_LARVESTA @@ -7980,7 +7980,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Cobalion), ICON(Cobalion, 0), - .footprint = gMonFootprint_Cobalion, + FOOTPRINT(Cobalion), LEARNSETS(Cobalion), }, #endif //P_FAMILY_COBALION @@ -8030,7 +8030,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Terrakion), ICON(Terrakion, 2), - .footprint = gMonFootprint_Terrakion, + FOOTPRINT(Terrakion), LEARNSETS(Terrakion), }, #endif //P_FAMILY_TERRAKION @@ -8080,7 +8080,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Virizion), ICON(Virizion, 1), - .footprint = gMonFootprint_Virizion, + FOOTPRINT(Virizion), LEARNSETS(Virizion), }, #endif //P_FAMILY_VIRIZION @@ -8102,7 +8102,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .natDexNum = NATIONAL_DEX_TORNADUS, \ .categoryName = _("Cyclone"), \ .weight = 630, \ - .footprint = gMonFootprint_Tornadus, \ + FOOTPRINT(Tornadus), \ LEARNSETS(Tornadus), \ .formSpeciesIdTable = sTornadusFormSpeciesIdTable, \ .formChangeTable = sTornadusFormChangeTable @@ -8189,7 +8189,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .natDexNum = NATIONAL_DEX_THUNDURUS, \ .categoryName = _("Bolt Strike"), \ .weight = 610, \ - .footprint = gMonFootprint_Thundurus, \ + FOOTPRINT(Thundurus), \ LEARNSETS(Thundurus), \ .formSpeciesIdTable = sThundurusFormSpeciesIdTable, \ .formChangeTable = sThundurusFormChangeTable @@ -8308,7 +8308,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Reshiram), ICON(Reshiram, 0), - .footprint = gMonFootprint_Reshiram, + FOOTPRINT(Reshiram), LEARNSETS(Reshiram), }, #endif //P_FAMILY_RESHIRAM @@ -8358,7 +8358,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Zekrom), ICON(Zekrom, 2), - .footprint = gMonFootprint_Zekrom, + FOOTPRINT(Zekrom), LEARNSETS(Zekrom), }, #endif //P_FAMILY_ZEKROM @@ -8379,7 +8379,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .natDexNum = NATIONAL_DEX_LANDORUS, \ .categoryName = _("Abundance"), \ .weight = 680, \ - .footprint = gMonFootprint_Landorus, \ + FOOTPRINT(Landorus), \ LEARNSETS(Landorus), \ .formSpeciesIdTable = sLandorusFormSpeciesIdTable, \ .formChangeTable = sLandorusFormChangeTable @@ -8467,7 +8467,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .natDexNum = NATIONAL_DEX_KYUREM, \ .categoryName = _("Boundary"), \ .weight = 3250, \ - .footprint = gMonFootprint_Kyurem, \ + FOOTPRINT(Kyurem), \ .formSpeciesIdTable = sKyuremFormSpeciesIdTable, \ .isLegendary = TRUE @@ -8615,7 +8615,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, \ .trainerScale = 262, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Keldeo, \ + FOOTPRINT(Keldeo), \ LEARNSETS(Keldeo), \ .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, \ .formChangeTable = sKeldeoFormChangeTable @@ -8686,7 +8686,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Meloetta, \ + FOOTPRINT(Meloetta), \ LEARNSETS(Meloetta), \ .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, \ .formChangeTable = sMeloettaFormChangeTable @@ -8789,7 +8789,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, \ PALETTES(form), \ ICON(Genesect, 2), \ - .footprint = gMonFootprint_Genesect, \ + FOOTPRINT(Genesect), \ LEARNSETS(Genesect), \ .formSpeciesIdTable = sGenesectFormSpeciesIdTable, \ .formChangeTable = sGenesectFormChangeTable, \ diff --git a/src/data/pokemon/species_info/gen_6.h b/src/data/pokemon/species_info/gen_6.h index 66c78f521e..e2c80d26e0 100644 --- a/src/data/pokemon/species_info/gen_6.h +++ b/src/data/pokemon/species_info/gen_6.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Chespin), ICON(Chespin, 1), - .footprint = gMonFootprint_Chespin, + FOOTPRINT(Chespin), LEARNSETS(Chespin), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_QUILLADIN}), }, @@ -95,7 +95,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Quilladin), ICON(Quilladin, 1), - .footprint = gMonFootprint_Quilladin, + FOOTPRINT(Quilladin), LEARNSETS(Quilladin), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_CHESNAUGHT}), }, @@ -143,7 +143,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Chesnaught), ICON(Chesnaught, 1), - .footprint = gMonFootprint_Chesnaught, + FOOTPRINT(Chesnaught), LEARNSETS(Chesnaught), }, #endif //P_FAMILY_CHESPIN @@ -192,7 +192,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Fennekin), ICON(Fennekin, 0), - .footprint = gMonFootprint_Fennekin, + FOOTPRINT(Fennekin), LEARNSETS(Fennekin), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_BRAIXEN}), }, @@ -240,7 +240,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Braixen), ICON(Braixen, 0), - .footprint = gMonFootprint_Braixen, + FOOTPRINT(Braixen), LEARNSETS(Braixen), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_DELPHOX}), }, @@ -288,7 +288,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Delphox), ICON(Delphox, 0), - .footprint = gMonFootprint_Delphox, + FOOTPRINT(Delphox), LEARNSETS(Delphox), }, #endif //P_FAMILY_FENNEKIN @@ -337,7 +337,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Froakie), ICON(Froakie, 0), - .footprint = gMonFootprint_Froakie, + FOOTPRINT(Froakie), LEARNSETS(Froakie), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_FROGADIER}), }, @@ -385,7 +385,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Frogadier), ICON(Frogadier, 0), - .footprint = gMonFootprint_Frogadier, + FOOTPRINT(Frogadier), LEARNSETS(Frogadier), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GRENINJA}), }, @@ -426,7 +426,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 2, \ .trainerScale = 271, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Greninja, \ + FOOTPRINT(Greninja), \ LEARNSETS(Greninja), \ .formSpeciesIdTable = sGreninjaFormSpeciesIdTable @@ -528,7 +528,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Bunnelby), ICON(Bunnelby, 2), - .footprint = gMonFootprint_Bunnelby, + FOOTPRINT(Bunnelby), LEARNSETS(Bunnelby), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_DIGGERSBY}), }, @@ -576,7 +576,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Diggersby), ICON(Diggersby, 2), - .footprint = gMonFootprint_Diggersby, + FOOTPRINT(Diggersby), LEARNSETS(Diggersby), }, #endif //P_FAMILY_BUNNELBY @@ -625,7 +625,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Fletchling), ICON(Fletchling, 2), - .footprint = gMonFootprint_Fletchling, + FOOTPRINT(Fletchling), LEARNSETS(Fletchling), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_FLETCHINDER}), }, @@ -674,7 +674,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Fletchinder), ICON(Fletchinder, 2), - .footprint = gMonFootprint_Fletchinder, + FOOTPRINT(Fletchinder), LEARNSETS(Fletchinder), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_TALONFLAME}), }, @@ -723,7 +723,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Talonflame), ICON(Talonflame, 2), - .footprint = gMonFootprint_Talonflame, + FOOTPRINT(Talonflame), LEARNSETS(Talonflame), }, #endif //P_FAMILY_FLETCHLING @@ -772,7 +772,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Scatterbug), ICON(Scatterbug, 1), - .footprint = gMonFootprint_Scatterbug, + FOOTPRINT(Scatterbug), LEARNSETS(Scatterbug), .evolutions = EVOLUTION({EVO_LEVEL, 9, SPECIES_SPEWPA}), }, @@ -820,7 +820,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Spewpa), ICON(Spewpa, 1), - .footprint = gMonFootprint_Spewpa, + FOOTPRINT(Spewpa), LEARNSETS(Spewpa), .evolutions = EVOLUTION({EVO_LEVEL, 12, SPECIES_VIVILLON_ICY_SNOW}), }, @@ -863,9 +863,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = BACK_PIC(Vivillon ##form, 64, 64), \ .backPicYOffset = 0, \ .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, \ - PALETTES(Vivillon ##form), \ + PALETTES(Vivillon ##form), \ ICON(Vivillon ##form, iconPal), \ - .footprint = gMonFootprint_Vivillon, \ + FOOTPRINT(Vivillon), \ LEARNSETS(Vivillon), \ .formSpeciesIdTable = sVivillonFormSpeciesIdTable @@ -1095,7 +1095,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Litleo), ICON(Litleo, 2), - .footprint = gMonFootprint_Litleo, + FOOTPRINT(Litleo), LEARNSETS(Litleo), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_PYROAR}), }, @@ -1146,7 +1146,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = PALETTES(Pyroar), ICON(Pyroar, 2), ICON_FEMALE(Pyroar, 2), - .footprint = gMonFootprint_Pyroar, + FOOTPRINT(Pyroar), LEARNSETS(Pyroar), }, #endif //P_FAMILY_LITLEO @@ -1188,9 +1188,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = BACK_PIC(Flabebe, 64, 40), \ .backPicYOffset = 12, \ .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, \ - PALETTES(Flabebe##Form##Flower), \ + PALETTES(Flabebe##Form##Flower), \ ICON(Flabebe##Form##Flower, iconPal), \ - .footprint = gMonFootprint_Flabebe, \ + FOOTPRINT(Flabebe), \ LEARNSETS(Flabebe), \ .formSpeciesIdTable = sFlabebeFormSpeciesIdTable, \ .evolutions = EVOLUTION({EVO_LEVEL, 19, SPECIES_FLOETTE_ ##FORM##_FLOWER}) @@ -1263,9 +1263,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimFrames = sAnims_Floette, \ .frontAnimId = ANIM_V_SLIDE_WOBBLE, \ .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, \ - PALETTES(Floette ##form##Flower), \ + PALETTES(Floette ##form##Flower), \ ICON(Floette##form##Flower, iconPal), \ - .footprint = gMonFootprint_Floette, \ + FOOTPRINT(Floette), \ .formSpeciesIdTable = sFloetteFormSpeciesIdTable #define FLOETTE_NORMAL_INFO(form, FORM, iconPal) \ @@ -1392,9 +1392,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = BACK_PIC(Florges, 64, 48), \ .backPicYOffset = 9, \ .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ - PALETTES(Florges##Form##Flower), \ + PALETTES(Florges##Form##Flower), \ ICON(Florges##Form##Flower, iconPal), \ - .footprint = gMonFootprint_Florges, \ + FOOTPRINT(Florges), \ LEARNSETS(Florges), \ .formSpeciesIdTable = sFlorgesFormSpeciesIdTable @@ -1488,7 +1488,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Skiddo), ICON(Skiddo, 1), - .footprint = gMonFootprint_Skiddo, + FOOTPRINT(Skiddo), LEARNSETS(Skiddo), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GOGOAT}), }, @@ -1536,7 +1536,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Gogoat), ICON(Gogoat, 1), - .footprint = gMonFootprint_Gogoat, + FOOTPRINT(Gogoat), LEARNSETS(Gogoat), }, #endif //P_FAMILY_SKIDDO @@ -1586,7 +1586,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, PALETTES(Pancham), ICON(Pancham, 1), - .footprint = gMonFootprint_Pancham, + FOOTPRINT(Pancham), LEARNSETS(Pancham), .evolutions = EVOLUTION({EVO_LEVEL_DARK_TYPE_MON_IN_PARTY, 32, SPECIES_PANGORO}), }, @@ -1635,7 +1635,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Pangoro), ICON(Pangoro, 1), - .footprint = gMonFootprint_Pangoro, + FOOTPRINT(Pangoro), LEARNSETS(Pangoro), }, #endif //P_FAMILY_PANCHAM @@ -1673,7 +1673,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimFrames = sAnims_Furfrou, \ .frontAnimId = ANIM_H_SLIDE, \ .backAnimId = BACK_ANIM_V_STRETCH, \ - .footprint = gMonFootprint_Furfrou, \ + FOOTPRINT(Furfrou), \ LEARNSETS(Furfrou), \ .formSpeciesIdTable = sFurfrouFormSpeciesIdTable @@ -1824,7 +1824,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Espurr), ICON(Espurr, 2), - .footprint = gMonFootprint_Espurr, + FOOTPRINT(Espurr), LEARNSETS(Espurr), .evolutions = EVOLUTION({EVO_LEVEL_MALE, 25, SPECIES_MEOWSTIC_MALE}, {EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_FEMALE}), @@ -1859,7 +1859,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimId = ANIM_GROW_VIBRATE, \ .backPicYOffset = 9, \ .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, \ - .footprint = gMonFootprint_Meowstic, \ + FOOTPRINT(Meowstic), \ .formSpeciesIdTable = sMeowsticFormSpeciesIdTable [SPECIES_MEOWSTIC_MALE] = @@ -1946,7 +1946,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Honedge), ICON(Honedge, 2), - .footprint = gMonFootprint_Honedge, + FOOTPRINT(Honedge), LEARNSETS(Honedge), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_DOUBLADE}), }, @@ -1995,7 +1995,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Doublade), ICON(Doublade, 2), - .footprint = gMonFootprint_Doublade, + FOOTPRINT(Doublade), LEARNSETS(Doublade), .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_AEGISLASH_SHIELD}), }, @@ -2021,7 +2021,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 0, \ .trainerScale = 290, \ .trainerOffset = 1, \ - .footprint = gMonFootprint_Aegislash, \ + FOOTPRINT(Aegislash), \ LEARNSETS(Aegislash), \ .formSpeciesIdTable = sAegislashFormSpeciesIdTable, \ .formChangeTable = sAegislashFormChangeTable @@ -2130,7 +2130,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Spritzee), ICON(Spritzee, 0), - .footprint = gMonFootprint_Spritzee, + FOOTPRINT(Spritzee), LEARNSETS(Spritzee), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_SACHET, SPECIES_AROMATISSE}, {EVO_ITEM, ITEM_SACHET, SPECIES_AROMATISSE}), @@ -2179,7 +2179,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Aromatisse), ICON(Aromatisse, 0), - .footprint = gMonFootprint_Aromatisse, + FOOTPRINT(Aromatisse), LEARNSETS(Aromatisse), }, #endif //P_FAMILY_SPRITZEE @@ -2228,7 +2228,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SPRING, PALETTES(Swirlix), ICON(Swirlix, 1), - .footprint = gMonFootprint_Swirlix, + FOOTPRINT(Swirlix), LEARNSETS(Swirlix), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_WHIPPED_DREAM, SPECIES_SLURPUFF}, {EVO_ITEM, ITEM_WHIPPED_DREAM, SPECIES_SLURPUFF}), @@ -2277,7 +2277,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Slurpuff), ICON(Slurpuff, 1), - .footprint = gMonFootprint_Slurpuff, + FOOTPRINT(Slurpuff), LEARNSETS(Slurpuff), }, #endif //P_FAMILY_SWIRLIX @@ -2327,7 +2327,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Inkay), ICON(Inkay, 0), - .footprint = gMonFootprint_Inkay, + FOOTPRINT(Inkay), LEARNSETS(Inkay), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MALAMAR}), }, @@ -2375,7 +2375,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Malamar), ICON(Malamar, 2), - .footprint = gMonFootprint_Malamar, + FOOTPRINT(Malamar), LEARNSETS(Malamar), }, #endif //P_FAMILY_INKAY @@ -2424,7 +2424,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Binacle), ICON(Binacle, 2), - .footprint = gMonFootprint_Binacle, + FOOTPRINT(Binacle), LEARNSETS(Binacle), .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_BARBARACLE}), }, @@ -2473,7 +2473,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Barbaracle), ICON(Barbaracle, 2), - .footprint = gMonFootprint_Barbaracle, + FOOTPRINT(Barbaracle), LEARNSETS(Barbaracle), }, #endif //P_FAMILY_BINACLE @@ -2522,7 +2522,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Skrelp), ICON(Skrelp, 2), - .footprint = gMonFootprint_Skrelp, + FOOTPRINT(Skrelp), LEARNSETS(Skrelp), .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_DRAGALGE}), }, @@ -2570,7 +2570,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Dragalge), ICON(Dragalge, 5), - .footprint = gMonFootprint_Dragalge, + FOOTPRINT(Dragalge), LEARNSETS(Dragalge), }, #endif //P_FAMILY_SKRELP @@ -2620,7 +2620,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Clauncher), ICON(Clauncher, 0), - .footprint = gMonFootprint_Clauncher, + FOOTPRINT(Clauncher), LEARNSETS(Clauncher), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_CLAWITZER}), }, @@ -2669,7 +2669,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Clawitzer), ICON(Clawitzer, 0), - .footprint = gMonFootprint_Clawitzer, + FOOTPRINT(Clawitzer), LEARNSETS(Clawitzer), }, #endif //P_FAMILY_CLAUNCHER @@ -2718,7 +2718,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Helioptile), ICON(Helioptile, 2), - .footprint = gMonFootprint_Helioptile, + FOOTPRINT(Helioptile), LEARNSETS(Helioptile), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_HELIOLISK}), }, @@ -2767,7 +2767,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Heliolisk), ICON(Heliolisk, 2), - .footprint = gMonFootprint_Heliolisk, + FOOTPRINT(Heliolisk), LEARNSETS(Heliolisk), }, #endif //P_FAMILY_HELIOPTILE @@ -2816,7 +2816,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Tyrunt), ICON(Tyrunt, 2), - .footprint = gMonFootprint_Tyrunt, + FOOTPRINT(Tyrunt), LEARNSETS(Tyrunt), .evolutions = EVOLUTION({EVO_LEVEL_DAY, 39, SPECIES_TYRANTRUM}), }, @@ -2864,7 +2864,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Tyrantrum), ICON(Tyrantrum, 0), - .footprint = gMonFootprint_Tyrantrum, + FOOTPRINT(Tyrantrum), LEARNSETS(Tyrantrum), }, #endif //P_FAMILY_TYRUNT @@ -2913,7 +2913,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Amaura), ICON(Amaura, 0), - .footprint = gMonFootprint_Amaura, + FOOTPRINT(Amaura), LEARNSETS(Amaura), .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 39, SPECIES_AURORUS}), }, @@ -2961,7 +2961,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Aurorus), ICON(Aurorus, 0), - .footprint = gMonFootprint_Aurorus, + FOOTPRINT(Aurorus), LEARNSETS(Aurorus), }, #endif //P_FAMILY_AMAURA @@ -3015,7 +3015,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Hawlucha), ICON(Hawlucha, 0), - .footprint = gMonFootprint_Hawlucha, + FOOTPRINT(Hawlucha), LEARNSETS(Hawlucha), }, #endif //P_FAMILY_HAWLUCHA @@ -3064,7 +3064,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Dedenne), ICON(Dedenne, 0), - .footprint = gMonFootprint_Dedenne, + FOOTPRINT(Dedenne), LEARNSETS(Dedenne), }, #endif //P_FAMILY_DEDENNE @@ -3115,7 +3115,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Carbink), ICON(Carbink, 2), - .footprint = gMonFootprint_Carbink, + FOOTPRINT(Carbink), LEARNSETS(Carbink), }, #endif //P_FAMILY_CARBINK @@ -3165,7 +3165,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SPRING, PALETTES(Goomy), ICON(Goomy, 5), - .footprint = gMonFootprint_Goomy, + FOOTPRINT(Goomy), LEARNSETS(Goomy), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_SLIGGOO}, {EVO_NONE, 0, SPECIES_SLIGGOO_HISUIAN}), @@ -3185,7 +3185,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .speciesName = _("Sliggoo"), \ .cryId = CRY_SLIGGOO, \ .natDexNum = NATIONAL_DEX_SLIGGOO, \ - .footprint = gMonFootprint_Sliggoo, \ + FOOTPRINT(Sliggoo), \ .formSpeciesIdTable = sSliggooFormSpeciesIdTable [SPECIES_SLIGGOO] = @@ -3238,7 +3238,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .speciesName = _("Goodra"), \ .cryId = CRY_GOODRA, \ .natDexNum = NATIONAL_DEX_GOODRA, \ - .footprint = gMonFootprint_Goodra, \ + FOOTPRINT(Goodra), \ .formSpeciesIdTable = sGoodraFormSpeciesIdTable [SPECIES_GOODRA] = @@ -3399,7 +3399,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Klefki), ICON(Klefki, 0), - .footprint = gMonFootprint_Klefki, + FOOTPRINT(Klefki), LEARNSETS(Klefki), }, #endif //P_FAMILY_KLEFKI @@ -3449,7 +3449,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, PALETTES(Phantump), ICON(Phantump, 1), - .footprint = gMonFootprint_Phantump, + FOOTPRINT(Phantump), LEARNSETS(Phantump), .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_TREVENANT}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_TREVENANT}), @@ -3498,7 +3498,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Trevenant), ICON(Trevenant, 1), - .footprint = gMonFootprint_Trevenant, + FOOTPRINT(Trevenant), LEARNSETS(Trevenant), }, #endif //P_FAMILY_PHANTUMP @@ -3524,7 +3524,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, \ PALETTES(Pumpkaboo), \ ICON(Pumpkaboo, 2), \ - .footprint = gMonFootprint_Pumpkaboo, \ + FOOTPRINT(Pumpkaboo), \ LEARNSETS(Pumpkaboo), \ .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable @@ -3663,7 +3663,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_STRETCH, \ PALETTES(Gourgeist), \ ICON(Gourgeist, 2), \ - .footprint = gMonFootprint_Gourgeist, \ + FOOTPRINT(Gourgeist), \ LEARNSETS(Gourgeist), \ .formSpeciesIdTable = sGourgeistFormSpeciesIdTable @@ -3828,7 +3828,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Bergmite), ICON(Bergmite, 0), - .footprint = gMonFootprint_Bergmite, + FOOTPRINT(Bergmite), LEARNSETS(Bergmite), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_AVALUGG}, {EVO_NONE, 0, SPECIES_AVALUGG_HISUIAN}), @@ -3848,7 +3848,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .cryId = CRY_AVALUGG, \ .natDexNum = NATIONAL_DEX_AVALUGG, \ .categoryName = _("Iceberg"), \ - .footprint = gMonFootprint_Avalugg, \ + FOOTPRINT(Avalugg), \ .formSpeciesIdTable = sAvaluggFormSpeciesIdTable [SPECIES_AVALUGG] = @@ -3972,7 +3972,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Noibat), ICON(Noibat, 2), - .footprint = gMonFootprint_Noibat, + FOOTPRINT(Noibat), LEARNSETS(Noibat), .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_NOIVERN}), }, @@ -4024,7 +4024,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Noivern), ICON(Noivern, 2), - .footprint = gMonFootprint_Noivern, + FOOTPRINT(Noivern), LEARNSETS(Noivern), }, #endif //P_FAMILY_NOIBAT @@ -4069,7 +4069,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, \ PALETTES(Xerneas##Form), \ ICON(Xerneas##Form, 0), \ - .footprint = gMonFootprint_Xerneas, \ + FOOTPRINT(Xerneas), \ LEARNSETS(Xerneas), \ .formSpeciesIdTable = sXerneasFormSpeciesIdTable, \ .formChangeTable = sXerneasFormChangeTable, \ @@ -4126,7 +4126,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Yveltal), ICON(Yveltal, 0), - .footprint = gMonFootprint_Yveltal, + FOOTPRINT(Yveltal), LEARNSETS(Yveltal), }, #endif //P_FAMILY_YVELTAL @@ -4146,7 +4146,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .speciesName = _("Zygarde"), \ .natDexNum = NATIONAL_DEX_ZYGARDE, \ .categoryName = _("Order"), \ - .footprint = gMonFootprint_Zygarde, \ + FOOTPRINT(Zygarde), \ LEARNSETS(Zygarde), \ .formSpeciesIdTable = sZygardeFormSpeciesIdTable, \ .isLegendary = TRUE @@ -4276,7 +4276,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .speciesName = _("Diancie"), \ .natDexNum = NATIONAL_DEX_DIANCIE, \ .categoryName = _("Jewel"), \ - .footprint = gMonFootprint_Diancie, \ + FOOTPRINT(Diancie), \ LEARNSETS(Diancie), \ .formSpeciesIdTable = sDiancieFormSpeciesIdTable, \ .formChangeTable = sDiancieFormChangeTable, \ @@ -4364,7 +4364,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .bodyColor = BODY_COLOR_PURPLE, \ .speciesName = _("Hoopa"), \ .natDexNum = NATIONAL_DEX_HOOPA, \ - .footprint = gMonFootprint_Hoopa, \ + FOOTPRINT(Hoopa), \ .formSpeciesIdTable = sHoopaFormSpeciesIdTable, \ .formChangeTable = sHoopaFormChangeTable, \ .isMythical = TRUE @@ -4486,7 +4486,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Volcanion), ICON(Volcanion, 0), - .footprint = gMonFootprint_Volcanion, + FOOTPRINT(Volcanion), LEARNSETS(Volcanion), }, #endif //P_FAMILY_VOLCANION diff --git a/src/data/pokemon/species_info/gen_7.h b/src/data/pokemon/species_info/gen_7.h index f9496af08a..7c96c6541b 100644 --- a/src/data/pokemon/species_info/gen_7.h +++ b/src/data/pokemon/species_info/gen_7.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Rowlet), ICON(Rowlet, 0), - .footprint = gMonFootprint_Rowlet, + FOOTPRINT(Rowlet), LEARNSETS(Rowlet), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_DARTRIX}), }, @@ -96,7 +96,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Dartrix), ICON(Dartrix, 1), - .footprint = gMonFootprint_Dartrix, + FOOTPRINT(Dartrix), LEARNSETS(Dartrix), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_DECIDUEYE}, {EVO_NONE, 0, SPECIES_DECIDUEYE_HISUIAN}), @@ -121,7 +121,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 1, \ .trainerScale = 296, \ .trainerOffset = 1, \ - .footprint = gMonFootprint_Decidueye, \ + FOOTPRINT(Decidueye), \ .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable [SPECIES_DECIDUEYE] = @@ -230,7 +230,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Litten), ICON(Litten, 0), - .footprint = gMonFootprint_Litten, + FOOTPRINT(Litten), LEARNSETS(Litten), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_TORRACAT}), }, @@ -278,7 +278,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Torracat), ICON(Torracat, 0), - .footprint = gMonFootprint_Torracat, + FOOTPRINT(Torracat), LEARNSETS(Torracat), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_INCINEROAR}), }, @@ -326,7 +326,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Incineroar), ICON(Incineroar, 0), - .footprint = gMonFootprint_Incineroar, + FOOTPRINT(Incineroar), LEARNSETS(Incineroar), }, #endif //P_FAMILY_LITTEN @@ -375,7 +375,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Popplio), ICON(Popplio, 0), - .footprint = gMonFootprint_Popplio, + FOOTPRINT(Popplio), LEARNSETS(Popplio), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_BRIONNE}), }, @@ -423,7 +423,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Brionne), ICON(Brionne, 0), - .footprint = gMonFootprint_Brionne, + FOOTPRINT(Brionne), LEARNSETS(Brionne), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_PRIMARINA}), }, @@ -471,7 +471,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Primarina), ICON(Primarina, 0), - .footprint = gMonFootprint_Primarina, + FOOTPRINT(Primarina), LEARNSETS(Primarina), }, #endif //P_FAMILY_POPPLIO @@ -521,7 +521,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Pikipek), ICON(Pikipek, 2), - .footprint = gMonFootprint_Pikipek, + FOOTPRINT(Pikipek), LEARNSETS(Pikipek), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_TRUMBEAK}), }, @@ -570,7 +570,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Trumbeak), ICON(Trumbeak, 0), - .footprint = gMonFootprint_Trumbeak, + FOOTPRINT(Trumbeak), LEARNSETS(Trumbeak), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_TOUCANNON}), }, @@ -619,7 +619,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Toucannon), ICON(Toucannon, 0), - .footprint = gMonFootprint_Toucannon, + FOOTPRINT(Toucannon), LEARNSETS(Toucannon), }, #endif //P_FAMILY_PIKIPEK @@ -669,7 +669,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Yungoos), ICON(Yungoos, 2), - .footprint = gMonFootprint_Yungoos, + FOOTPRINT(Yungoos), LEARNSETS(Yungoos), .evolutions = EVOLUTION({EVO_LEVEL_DAY, 20, SPECIES_GUMSHOOS}), }, @@ -718,7 +718,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Gumshoos), ICON(Gumshoos, 2), - .footprint = gMonFootprint_Gumshoos, + FOOTPRINT(Gumshoos), LEARNSETS(Gumshoos), }, #endif //P_FAMILY_YUNGOOS @@ -767,7 +767,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Grubbin), ICON(Grubbin, 0), - .footprint = gMonFootprint_Grubbin, + FOOTPRINT(Grubbin), LEARNSETS(Grubbin), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_CHARJABUG}), }, @@ -816,7 +816,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Charjabug), ICON(Charjabug, 1), - .footprint = gMonFootprint_Charjabug, + FOOTPRINT(Charjabug), LEARNSETS(Charjabug), .evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_VIKAVOLT}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_VIKAVOLT}), @@ -866,7 +866,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Vikavolt), ICON(Vikavolt, 0), - .footprint = gMonFootprint_Vikavolt, + FOOTPRINT(Vikavolt), LEARNSETS(Vikavolt), }, #endif //P_FAMILY_GRUBBIN @@ -916,7 +916,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Crabrawler), ICON(Crabrawler, 2), - .footprint = gMonFootprint_Crabrawler, + FOOTPRINT(Crabrawler), LEARNSETS(Crabrawler), .evolutions = EVOLUTION({EVO_SPECIFIC_MAP, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM, SPECIES_CRABOMINABLE}, {EVO_ITEM, ITEM_ICE_STONE, SPECIES_CRABOMINABLE}), @@ -966,7 +966,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Crabominable), ICON(Crabominable, 2), - .footprint = gMonFootprint_Crabominable, + FOOTPRINT(Crabominable), LEARNSETS(Crabominable), }, #endif //P_FAMILY_CRABRAWLER @@ -1000,7 +1000,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 0, \ .frontAnimFrames = sAnims_Oricorio, \ .backPicYOffset = 0, \ - .footprint = gMonFootprint_Oricorio, \ + FOOTPRINT(Oricorio), \ LEARNSETS(Oricorio), \ .formSpeciesIdTable = sOricorioFormSpeciesIdTable, \ .formChangeTable = sOricorioFormChangeTable @@ -1133,7 +1133,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Cutiefly), ICON(Cutiefly, 2), - .footprint = gMonFootprint_Cutiefly, + FOOTPRINT(Cutiefly), LEARNSETS(Cutiefly), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_RIBOMBEE}), }, @@ -1183,7 +1183,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Ribombee), ICON(Ribombee, 2), - .footprint = gMonFootprint_Ribombee, + FOOTPRINT(Ribombee), LEARNSETS(Ribombee), }, #endif //P_FAMILY_CUTIEFLY @@ -1223,7 +1223,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backPicYOffset = 7, \ PALETTES(Rockruff), \ ICON(Rockruff, 2), \ - .footprint = gMonFootprint_Rockruff, \ + FOOTPRINT(Rockruff), \ LEARNSETS(Rockruff), \ .formSpeciesIdTable = sRockruffFormSpeciesIdTable @@ -1267,7 +1267,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerScale = 257, \ .trainerOffset = 0, \ BACK_PIC(LycanrocMidday, 64, 56), \ - .footprint = gMonFootprint_Lycanroc, \ + FOOTPRINT(Lycanroc), \ .formSpeciesIdTable = sLycanrocFormSpeciesIdTable [SPECIES_LYCANROC_MIDDAY] = @@ -1378,7 +1378,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 24, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Wishiwashi, \ + FOOTPRINT(Wishiwashi), \ LEARNSETS(Wishiwashi), \ .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, \ .formChangeTable = sWishiwashiFormChangeTable @@ -1486,7 +1486,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Mareanie), ICON(Mareanie, 2), - .footprint = gMonFootprint_Mareanie, + FOOTPRINT(Mareanie), LEARNSETS(Mareanie), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_TOXAPEX}), }, @@ -1535,7 +1535,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Toxapex), ICON(Toxapex, 0), - .footprint = gMonFootprint_Toxapex, + FOOTPRINT(Toxapex), LEARNSETS(Toxapex), }, #endif //P_FAMILY_MAREANIE @@ -1585,7 +1585,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Mudbray), ICON(Mudbray, 2), - .footprint = gMonFootprint_Mudbray, + FOOTPRINT(Mudbray), LEARNSETS(Mudbray), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MUDSDALE}), }, @@ -1634,7 +1634,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Mudsdale), ICON(Mudsdale, 0), - .footprint = gMonFootprint_Mudsdale, + FOOTPRINT(Mudsdale), LEARNSETS(Mudsdale), }, #endif //P_FAMILY_MUDBRAY @@ -1684,7 +1684,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dewpider), ICON(Dewpider, 0), - .footprint = gMonFootprint_Dewpider, + FOOTPRINT(Dewpider), LEARNSETS(Dewpider), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARAQUANID}), }, @@ -1733,7 +1733,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Araquanid), ICON(Araquanid, 2), - .footprint = gMonFootprint_Araquanid, + FOOTPRINT(Araquanid), LEARNSETS(Araquanid), }, #endif //P_FAMILY_DEWPIDER @@ -1783,7 +1783,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Fomantis), ICON(Fomantis, 1), - .footprint = gMonFootprint_Fomantis, + FOOTPRINT(Fomantis), LEARNSETS(Fomantis), .evolutions = EVOLUTION({EVO_LEVEL_DAY, 34, SPECIES_LURANTIS}), }, @@ -1832,7 +1832,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Lurantis), ICON(Lurantis, 1), - .footprint = gMonFootprint_Lurantis, + FOOTPRINT(Lurantis), LEARNSETS(Lurantis), }, #endif //P_FAMILY_FOMANTIS @@ -1883,7 +1883,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Morelull), ICON(Morelull, 0), - .footprint = gMonFootprint_Morelull, + FOOTPRINT(Morelull), LEARNSETS(Morelull), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_SHIINOTIC}), }, @@ -1933,7 +1933,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Shiinotic), ICON(Shiinotic, 1), - .footprint = gMonFootprint_Shiinotic, + FOOTPRINT(Shiinotic), LEARNSETS(Shiinotic), }, #endif //P_FAMILY_MORELULL @@ -1983,7 +1983,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Salandit), ICON(Salandit, 2), - .footprint = gMonFootprint_Salandit, + FOOTPRINT(Salandit), LEARNSETS(Salandit), .evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 33, SPECIES_SALAZZLE}), }, @@ -2032,7 +2032,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Salazzle), ICON(Salazzle, 0), - .footprint = gMonFootprint_Salazzle, + FOOTPRINT(Salazzle), LEARNSETS(Salazzle), }, #endif //P_FAMILY_SALANDIT @@ -2081,7 +2081,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Stufful), ICON(Stufful, 0), - .footprint = gMonFootprint_Stufful, + FOOTPRINT(Stufful), LEARNSETS(Stufful), .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_BEWEAR}), }, @@ -2129,7 +2129,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Bewear), ICON(Bewear, 0), - .footprint = gMonFootprint_Bewear, + FOOTPRINT(Bewear), LEARNSETS(Bewear), }, #endif //P_FAMILY_STUFFUL @@ -2179,7 +2179,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Bounsweet), ICON(Bounsweet, 1), - .footprint = gMonFootprint_Bounsweet, + FOOTPRINT(Bounsweet), LEARNSETS(Bounsweet), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_STEENEE}), }, @@ -2229,7 +2229,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Steenee), ICON(Steenee, 1), - .footprint = gMonFootprint_Steenee, + FOOTPRINT(Steenee), LEARNSETS(Steenee), .evolutions = EVOLUTION({EVO_MOVE, MOVE_STOMP, SPECIES_TSAREENA}), }, @@ -2279,7 +2279,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Tsareena), ICON(Tsareena, 1), - .footprint = gMonFootprint_Tsareena, + FOOTPRINT(Tsareena), LEARNSETS(Tsareena), }, #endif //P_FAMILY_BOUNSWEET @@ -2331,7 +2331,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Comfey), ICON(Comfey, 1), - .footprint = gMonFootprint_Comfey, + FOOTPRINT(Comfey), LEARNSETS(Comfey), }, #endif //P_FAMILY_COMFEY @@ -2380,7 +2380,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Oranguru), ICON(Oranguru, 0), - .footprint = gMonFootprint_Oranguru, + FOOTPRINT(Oranguru), LEARNSETS(Oranguru), }, #endif //P_FAMILY_ORANGURU @@ -2429,7 +2429,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Passimian), ICON(Passimian, 1), - .footprint = gMonFootprint_Passimian, + FOOTPRINT(Passimian), LEARNSETS(Passimian), }, #endif //P_FAMILY_PASSIMIAN @@ -2478,7 +2478,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Wimpod), ICON(Wimpod, 2), - .footprint = gMonFootprint_Wimpod, + FOOTPRINT(Wimpod), LEARNSETS(Wimpod), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GOLISOPOD}), }, @@ -2526,7 +2526,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Golisopod), ICON(Golisopod, 2), - .footprint = gMonFootprint_Golisopod, + FOOTPRINT(Golisopod), LEARNSETS(Golisopod), }, #endif //P_FAMILY_WIMPOD @@ -2576,7 +2576,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Sandygast), ICON(Sandygast, 1), - .footprint = gMonFootprint_Sandygast, + FOOTPRINT(Sandygast), LEARNSETS(Sandygast), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_PALOSSAND}), }, @@ -2625,7 +2625,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Palossand), ICON(Palossand, 2), - .footprint = gMonFootprint_Palossand, + FOOTPRINT(Palossand), LEARNSETS(Palossand), }, #endif //P_FAMILY_SANDYGAST @@ -2674,7 +2674,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Pyukumuku), ICON(Pyukumuku, 0), - .footprint = gMonFootprint_Pyukumuku, + FOOTPRINT(Pyukumuku), LEARNSETS(Pyukumuku), }, #endif //P_FAMILY_PYUKUMUKU @@ -2724,7 +2724,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(TypeNull), ICON(TypeNull, 0), - .footprint = gMonFootprint_Type_Null, + FOOTPRINT(Type_Null), LEARNSETS(TypeNull), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_SILVALLY_NORMAL}), }, @@ -2770,7 +2770,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backPicYOffset = 0, \ PALETTES(palette), \ ICON(Silvally, 0), \ - .footprint = gMonFootprint_Silvally, \ + FOOTPRINT(Silvally), \ LEARNSETS(Silvally), \ .formSpeciesIdTable = sSilvallyFormSpeciesIdTable, \ .formChangeTable = sSilvallyFormChangeTable, \ @@ -2822,7 +2822,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Minior, \ + FOOTPRINT(Minior), \ LEARNSETS(Minior), \ .formSpeciesIdTable = sMiniorFormSpeciesIdTable @@ -2934,7 +2934,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Komala), ICON(Komala, 2), - .footprint = gMonFootprint_Komala, + FOOTPRINT(Komala), LEARNSETS(Komala), }, #endif //P_FAMILY_KOMALA @@ -2984,7 +2984,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Turtonator), ICON(Turtonator, 0), - .footprint = gMonFootprint_Turtonator, + FOOTPRINT(Turtonator), LEARNSETS(Turtonator), }, #endif //P_FAMILY_TURTONATOR @@ -3034,7 +3034,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Togedemaru), ICON(Togedemaru, 2), - .footprint = gMonFootprint_Togedemaru, + FOOTPRINT(Togedemaru), LEARNSETS(Togedemaru), }, #endif //P_FAMILY_TOGEDEMARU @@ -3069,7 +3069,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 24, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Mimikyu, \ + FOOTPRINT(Mimikyu), \ LEARNSETS(Mimikyu), \ .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, \ .formChangeTable = sMimikyuFormChangeTable @@ -3158,7 +3158,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Bruxish), ICON(Bruxish, 0), - .footprint = gMonFootprint_Bruxish, + FOOTPRINT(Bruxish), LEARNSETS(Bruxish), }, #endif //P_FAMILY_BRUXISH @@ -3208,7 +3208,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Drampa), ICON(Drampa, 0), - .footprint = gMonFootprint_Drampa, + FOOTPRINT(Drampa), LEARNSETS(Drampa), }, #endif //P_FAMILY_DRAMPA @@ -3259,7 +3259,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dhelmise), ICON(Dhelmise, 1), - .footprint = gMonFootprint_Dhelmise, + FOOTPRINT(Dhelmise), LEARNSETS(Dhelmise), }, #endif //P_FAMILY_DHELMISE @@ -3309,7 +3309,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(JangmoO), ICON(JangmoO, 2), - .footprint = gMonFootprint_JangmoO, + FOOTPRINT(JangmoO), LEARNSETS(JangmoO), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_HAKAMO_O}), }, @@ -3358,7 +3358,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(HakamoO), ICON(HakamoO, 2), - .footprint = gMonFootprint_HakamoO, + FOOTPRINT(HakamoO), LEARNSETS(HakamoO), .evolutions = EVOLUTION({EVO_LEVEL, 45, SPECIES_KOMMO_O}), }, @@ -3407,7 +3407,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(KommoO), ICON(KommoO, 2), - .footprint = gMonFootprint_KommoO, + FOOTPRINT(KommoO), LEARNSETS(KommoO), }, #endif //P_FAMILY_JANGMO_O @@ -3458,7 +3458,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(TapuKoko), ICON(TapuKoko, 0), - .footprint = gMonFootprint_Tapu_Koko, + FOOTPRINT(Tapu_Koko), LEARNSETS(TapuKoko), }, #endif //P_FAMILY_TAPU_KOKO @@ -3509,7 +3509,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(TapuLele), ICON(TapuLele, 0), - .footprint = gMonFootprint_Tapu_Lele, + FOOTPRINT(Tapu_Lele), LEARNSETS(TapuLele), }, #endif //P_FAMILY_TAPU_LELE @@ -3560,7 +3560,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(TapuBulu), ICON(TapuBulu, 2), - .footprint = gMonFootprint_Tapu_Bulu, + FOOTPRINT(Tapu_Bulu), LEARNSETS(TapuBulu), }, #endif //P_FAMILY_TAPU_BULU @@ -3612,7 +3612,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(TapuFini), ICON(TapuFini, 0), - .footprint = gMonFootprint_Tapu_Fini, + FOOTPRINT(Tapu_Fini), LEARNSETS(TapuFini), }, #endif //P_FAMILY_TAPU_FINI @@ -3663,7 +3663,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Cosmog), ICON(Cosmog, 2), - .footprint = gMonFootprint_Cosmog, + FOOTPRINT(Cosmog), LEARNSETS(Cosmog), .evolutions = EVOLUTION({EVO_LEVEL, 43, SPECIES_COSMOEM}), }, @@ -3714,7 +3714,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Cosmoem), ICON(Cosmoem, 0), - .footprint = gMonFootprint_Cosmoem, + FOOTPRINT(Cosmoem), LEARNSETS(Cosmoem), .evolutions = EVOLUTION({EVO_LEVEL_DAY, 53, SPECIES_SOLGALEO}, {EVO_LEVEL_NIGHT, 53, SPECIES_LUNALA}), @@ -3764,7 +3764,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Solgaleo), ICON(Solgaleo, 0), - .footprint = gMonFootprint_Solgaleo, + FOOTPRINT(Solgaleo), LEARNSETS(Solgaleo), }, @@ -3813,7 +3813,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Lunala), ICON(Lunala, 2), - .footprint = gMonFootprint_Lunala, + FOOTPRINT(Lunala), LEARNSETS(Lunala), }, #endif //P_FAMILY_COSMOG @@ -3864,7 +3864,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Nihilego), ICON(Nihilego, 0), - .footprint = gMonFootprint_Nihilego, + FOOTPRINT(Nihilego), LEARNSETS(Nihilego), }, #endif //P_FAMILY_NIHILEGO @@ -3915,7 +3915,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Buzzwole), ICON(Buzzwole, 0), - .footprint = gMonFootprint_Buzzwole, + FOOTPRINT(Buzzwole), LEARNSETS(Buzzwole), }, #endif //P_FAMILY_BUZZWOLE @@ -3965,7 +3965,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Pheromosa), ICON(Pheromosa, 2), - .footprint = gMonFootprint_Pheromosa, + FOOTPRINT(Pheromosa), LEARNSETS(Pheromosa), }, #endif //P_FAMILY_PHEROMOSA @@ -4015,7 +4015,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Xurkitree), ICON(Xurkitree, 0), - .footprint = gMonFootprint_Xurkitree, + FOOTPRINT(Xurkitree), LEARNSETS(Xurkitree), }, #endif //P_FAMILY_XURKITREE @@ -4067,7 +4067,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Celesteela), ICON(Celesteela, 0), - .footprint = gMonFootprint_Celesteela, + FOOTPRINT(Celesteela), LEARNSETS(Celesteela), }, #endif //P_FAMILY_CELESTEELA @@ -4118,7 +4118,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Kartana), ICON(Kartana, 0), - .footprint = gMonFootprint_Kartana, + FOOTPRINT(Kartana), LEARNSETS(Kartana), }, #endif //P_FAMILY_KARTANA @@ -4168,7 +4168,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Guzzlord), ICON(Guzzlord, 0), - .footprint = gMonFootprint_Guzzlord, + FOOTPRINT(Guzzlord), LEARNSETS(Guzzlord), }, #endif //P_FAMILY_GUZZLORD @@ -4188,7 +4188,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 3, \ .trainerScale = 369, \ .trainerOffset = 7, \ - .footprint = gMonFootprint_Necrozma, \ + FOOTPRINT(Necrozma), \ LEARNSETS(Necrozma), \ .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, \ .isLegendary = TRUE @@ -4382,7 +4382,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backPicYOffset = 4, \ PALETTES(Form), \ ICON(Form, 0), \ - .footprint = gMonFootprint_Magearna, \ + FOOTPRINT(Magearna), \ LEARNSETS(Magearna), \ .formSpeciesIdTable = sMagearnaFormSpeciesIdTable, \ .isMythical = TRUE @@ -4456,7 +4456,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Marshadow), ICON(Marshadow, 0), - .footprint = gMonFootprint_Marshadow, + FOOTPRINT(Marshadow), LEARNSETS(Marshadow), .isMythical = TRUE, }, @@ -4507,7 +4507,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Poipole), ICON(Poipole, 0), - .footprint = gMonFootprint_Poipole, + FOOTPRINT(Poipole), LEARNSETS(Poipole), .evolutions = EVOLUTION({EVO_MOVE, MOVE_DRAGON_PULSE, SPECIES_NAGANADEL}), }, @@ -4556,7 +4556,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Naganadel), ICON(Naganadel, 0), - .footprint = gMonFootprint_Naganadel, + FOOTPRINT(Naganadel), LEARNSETS(Naganadel), }, #endif //P_FAMILY_POIPOLE @@ -4606,7 +4606,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Stakataka), ICON(Stakataka, 0), - .footprint = gMonFootprint_Stakataka, + FOOTPRINT(Stakataka), LEARNSETS(Stakataka), }, #endif //P_FAMILY_STAKATAKA @@ -4656,7 +4656,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Blacephalon), ICON(Blacephalon, 0), - .footprint = gMonFootprint_Blacephalon, + FOOTPRINT(Blacephalon), LEARNSETS(Blacephalon), }, #endif //P_FAMILY_BLACEPHALON @@ -4705,7 +4705,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Zeraora), ICON(Zeraora, 0), - .footprint = gMonFootprint_Zeraora, + FOOTPRINT(Zeraora), LEARNSETS(Zeraora), }, #endif //P_FAMILY_ZERAORA @@ -4754,7 +4754,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Meltan), ICON(Meltan, 2), - .footprint = gMonFootprint_Meltan, + FOOTPRINT(Meltan), LEARNSETS(Meltan), }, @@ -4784,7 +4784,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 10, \ .trainerScale = 423, \ .trainerOffset = 8, \ - .footprint = gMonFootprint_Melmetal, \ + FOOTPRINT(Melmetal), \ LEARNSETS(Melmetal), \ .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, \ .formChangeTable = sMelmetalFormChangeTable, \ diff --git a/src/data/pokemon/species_info/gen_8.h b/src/data/pokemon/species_info/gen_8.h index 0bbd9b2f3a..e355e0230d 100644 --- a/src/data/pokemon/species_info/gen_8.h +++ b/src/data/pokemon/species_info/gen_8.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Grookey), ICON(Grookey, 1), - .footprint = gMonFootprint_Grookey, + FOOTPRINT(Grookey), LEARNSETS(Grookey), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_THWACKEY}), }, @@ -94,7 +94,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Thwackey), ICON(Thwackey, 1), - .footprint = gMonFootprint_Thwackey, + FOOTPRINT(Thwackey), LEARNSETS(Thwackey), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_RILLABOOM}), }, @@ -121,7 +121,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_RILLABOOM, \ .natDexNum = NATIONAL_DEX_RILLABOOM, \ .categoryName = _("Drummer"), \ - .footprint = gMonFootprint_Rillaboom, \ + FOOTPRINT(Rillaboom), \ LEARNSETS(Rillaboom), \ .formSpeciesIdTable = sRillaboomFormSpeciesIdTable, \ .formChangeTable = sRillaboomFormChangeTable @@ -222,7 +222,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Scorbunny), ICON(Scorbunny, 0), - .footprint = gMonFootprint_Scorbunny, + FOOTPRINT(Scorbunny), LEARNSETS(Scorbunny), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_RABOOT}), }, @@ -269,7 +269,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Raboot), ICON(Raboot, 0), - .footprint = gMonFootprint_Raboot, + FOOTPRINT(Raboot), LEARNSETS(Raboot), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_CINDERACE}), }, @@ -296,7 +296,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_CINDERACE, \ .natDexNum = NATIONAL_DEX_CINDERACE, \ .categoryName = _("Striker"), \ - .footprint = gMonFootprint_Cinderace, \ + FOOTPRINT(Cinderace), \ LEARNSETS(Cinderace), \ .formSpeciesIdTable = sCinderaceFormSpeciesIdTable, \ .formChangeTable = sCinderaceFormChangeTable @@ -400,7 +400,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Sobble), ICON(Sobble, 2), - .footprint = gMonFootprint_Sobble, + FOOTPRINT(Sobble), LEARNSETS(Sobble), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_DRIZZILE}), }, @@ -447,7 +447,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Drizzile), ICON(Drizzile, 2), - .footprint = gMonFootprint_Drizzile, + FOOTPRINT(Drizzile), LEARNSETS(Drizzile), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_INTELEON}), }, @@ -474,7 +474,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_INTELEON, \ .natDexNum = NATIONAL_DEX_INTELEON, \ .categoryName = _("Secret Agent"), \ - .footprint = gMonFootprint_Inteleon, \ + FOOTPRINT(Inteleon), \ LEARNSETS(Inteleon), \ .formSpeciesIdTable = sInteleonFormSpeciesIdTable, \ .formChangeTable = sInteleonFormChangeTable @@ -577,7 +577,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Skwovet), ICON(Skwovet, 2), - .footprint = gMonFootprint_Skwovet, + FOOTPRINT(Skwovet), LEARNSETS(Skwovet), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_GREEDENT}), }, @@ -626,7 +626,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Greedent), ICON(Greedent, 0), - .footprint = gMonFootprint_Greedent, + FOOTPRINT(Greedent), LEARNSETS(Greedent), }, #endif //P_FAMILY_SKWOVET @@ -675,7 +675,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Rookidee), ICON(Rookidee, 0), - .footprint = gMonFootprint_Rookidee, + FOOTPRINT(Rookidee), LEARNSETS(Rookidee), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CORVISQUIRE}), }, @@ -724,7 +724,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Corvisquire), ICON(Corvisquire, 0), - .footprint = gMonFootprint_Corvisquire, + FOOTPRINT(Corvisquire), LEARNSETS(Corvisquire), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_CORVIKNIGHT}), }, @@ -751,7 +751,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_CORVIKNIGHT, \ .natDexNum = NATIONAL_DEX_CORVIKNIGHT, \ .categoryName = _("Raven"), \ - .footprint = gMonFootprint_Corviknight, \ + FOOTPRINT(Corviknight), \ LEARNSETS(Corviknight), \ .formSpeciesIdTable = sCorviknightFormSpeciesIdTable, \ .formChangeTable = sCorviknightFormChangeTable @@ -853,7 +853,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Blipbug), ICON(Blipbug, 0), - .footprint = gMonFootprint_Blipbug, + FOOTPRINT(Blipbug), LEARNSETS(Blipbug), .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_DOTTLER}), }, @@ -902,7 +902,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dottler), ICON(Dottler, 2), - .footprint = gMonFootprint_Dottler, + FOOTPRINT(Dottler), LEARNSETS(Dottler), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ORBEETLE}), }, @@ -930,7 +930,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_ORBEETLE, \ .natDexNum = NATIONAL_DEX_ORBEETLE, \ .categoryName = _("Seven Spot"), \ - .footprint = gMonFootprint_Orbeetle, \ + FOOTPRINT(Orbeetle), \ LEARNSETS(Orbeetle), \ .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, \ .formChangeTable = sOrbeetleFormChangeTable @@ -1034,7 +1034,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Nickit), ICON(Nickit, 2), - .footprint = gMonFootprint_Nickit, + FOOTPRINT(Nickit), LEARNSETS(Nickit), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_THIEVUL}), }, @@ -1082,7 +1082,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Thievul), ICON(Thievul, 2), - .footprint = gMonFootprint_Thievul, + FOOTPRINT(Thievul), LEARNSETS(Thievul), }, #endif //P_FAMILY_NICKIT @@ -1131,7 +1131,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Gossifleur), ICON(Gossifleur, 1), - .footprint = gMonFootprint_Gossifleur, + FOOTPRINT(Gossifleur), LEARNSETS(Gossifleur), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_ELDEGOSS}), }, @@ -1179,7 +1179,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Eldegoss), ICON(Eldegoss, 1), - .footprint = gMonFootprint_Eldegoss, + FOOTPRINT(Eldegoss), LEARNSETS(Eldegoss), }, #endif //P_FAMILY_GOSSIFLEUR @@ -1228,7 +1228,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Wooloo), ICON(Wooloo, 0), - .footprint = gMonFootprint_Wooloo, + FOOTPRINT(Wooloo), LEARNSETS(Wooloo), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_DUBWOOL}), }, @@ -1276,7 +1276,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dubwool), ICON(Dubwool, 2), - .footprint = gMonFootprint_Dubwool, + FOOTPRINT(Dubwool), LEARNSETS(Dubwool), }, #endif //P_FAMILY_WOOLOO @@ -1324,7 +1324,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Chewtle), ICON(Chewtle, 0), - .footprint = gMonFootprint_Chewtle, + FOOTPRINT(Chewtle), LEARNSETS(Chewtle), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_DREDNAW}), }, @@ -1351,7 +1351,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_DREDNAW, \ .natDexNum = NATIONAL_DEX_DREDNAW, \ .categoryName = _("Bite"), \ - .footprint = gMonFootprint_Drednaw, \ + FOOTPRINT(Drednaw), \ LEARNSETS(Drednaw), \ .formSpeciesIdTable = sDrednawFormSpeciesIdTable, \ .formChangeTable = sDrednawFormChangeTable @@ -1453,7 +1453,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Yamper), ICON(Yamper, 1), - .footprint = gMonFootprint_Yamper, + FOOTPRINT(Yamper), LEARNSETS(Yamper), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_BOLTUND}), }, @@ -1501,7 +1501,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Boltund), ICON(Boltund, 1), - .footprint = gMonFootprint_Boltund, + FOOTPRINT(Boltund), LEARNSETS(Boltund), }, #endif //P_FAMILY_YAMPER @@ -1550,7 +1550,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Rolycoly), ICON(Rolycoly, 0), - .footprint = gMonFootprint_Rolycoly, + FOOTPRINT(Rolycoly), LEARNSETS(Rolycoly), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CARKOL}), }, @@ -1597,7 +1597,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Carkol), ICON(Carkol, 0), - .footprint = gMonFootprint_Carkol, + FOOTPRINT(Carkol), LEARNSETS(Carkol), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_COALOSSAL}), }, @@ -1624,7 +1624,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_COALOSSAL, \ .natDexNum = NATIONAL_DEX_COALOSSAL, \ .categoryName = _("Coal"), \ - .footprint = gMonFootprint_Coalossal, \ + FOOTPRINT(Coalossal), \ LEARNSETS(Coalossal), \ .formSpeciesIdTable = sCoalossalFormSpeciesIdTable, \ .formChangeTable = sCoalossalFormChangeTable @@ -1727,7 +1727,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Applin), ICON(Applin, 1), - .footprint = gMonFootprint_Applin, + FOOTPRINT(Applin), LEARNSETS(Applin), .evolutions = EVOLUTION({EVO_ITEM, ITEM_TART_APPLE, SPECIES_FLAPPLE}, {EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN}, @@ -1756,7 +1756,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_FLAPPLE, \ .natDexNum = NATIONAL_DEX_FLAPPLE, \ .categoryName = _("Apple Wing"), \ - .footprint = gMonFootprint_Flapple, \ + FOOTPRINT(Flapple), \ LEARNSETS(Flapple), \ .formSpeciesIdTable = sFlappleFormSpeciesIdTable, \ .formChangeTable = sFlappleFormChangeTable @@ -1836,7 +1836,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_APPLETUN, \ .natDexNum = NATIONAL_DEX_APPLETUN, \ .categoryName = _("Apple Nectar"), \ - .footprint = gMonFootprint_Appletun, \ + FOOTPRINT(Appletun), \ LEARNSETS(Appletun), \ .formSpeciesIdTable = sAppletunFormSpeciesIdTable, \ .formChangeTable = sAppletunFormChangeTable @@ -1936,7 +1936,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dipplin), ICON(Dipplin, 1), - //.footprint = gMonFootprint_Dipplin, + //FOOTPRINT(Dipplin), LEARNSETS(Dipplin), .evolutions = EVOLUTION({EVO_MOVE, MOVE_DRAGON_CHEER, SPECIES_HYDRAPPLE}), }, @@ -1984,7 +1984,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, //PALETTES(Hydrapple), //ICON(Hydrapple, 0), - //.footprint = gMonFootprint_Hydrapple, + //FOOTPRINT(Hydrapple), LEARNSETS(Hydrapple), }, #endif //P_GEN_9_CROSS_EVOS @@ -2033,7 +2033,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Silicobra), ICON(Silicobra, 1), - .footprint = gMonFootprint_Silicobra, + FOOTPRINT(Silicobra), LEARNSETS(Silicobra), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SANDACONDA}), }, @@ -2060,7 +2060,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_SANDACONDA, \ .natDexNum = NATIONAL_DEX_SANDACONDA, \ .categoryName = _("Sand Snake"), \ - .footprint = gMonFootprint_Sandaconda, \ + FOOTPRINT(Sandaconda), \ LEARNSETS(Sandaconda), \ .formSpeciesIdTable = sSandacondaFormSpeciesIdTable, \ .formChangeTable = sSandacondaFormChangeTable @@ -2146,7 +2146,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, \ .trainerScale = 257, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Cramorant, \ + FOOTPRINT(Cramorant), \ LEARNSETS(Cramorant), \ .formSpeciesIdTable = sCramorantFormSpeciesIdTable, \ .formChangeTable = sCramorantFormChangeTable @@ -2252,7 +2252,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Arrokuda), ICON(Arrokuda, 2), - .footprint = gMonFootprint_Arrokuda, + FOOTPRINT(Arrokuda), LEARNSETS(Arrokuda), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_BARRASKEWDA}), }, @@ -2300,7 +2300,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Barraskewda), ICON(Barraskewda, 2), - .footprint = gMonFootprint_Barraskewda, + FOOTPRINT(Barraskewda), LEARNSETS(Barraskewda), }, #endif //P_FAMILY_ARROKUDA @@ -2349,7 +2349,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Toxel), ICON(Toxel, 2), - .footprint = gMonFootprint_Toxel, + FOOTPRINT(Toxel), LEARNSETS(Toxel), .evolutions = EVOLUTION({EVO_LEVEL_NATURE_AMPED, 30, SPECIES_TOXTRICITY_AMPED}, {EVO_LEVEL_NATURE_LOW_KEY, 30, SPECIES_TOXTRICITY_LOW_KEY}), @@ -2403,7 +2403,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ToxtricityAmped), ICON(ToxtricityAmped, 2), - .footprint = gMonFootprint_Toxtricity, + FOOTPRINT(Toxtricity), LEARNSETS(ToxtricityAmped), }, @@ -2430,7 +2430,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ToxtricityGigantamax), ICON(ToxtricityGigantamax, 0), - .footprint = gMonFootprint_Toxtricity, + FOOTPRINT(Toxtricity), LEARNSETS(ToxtricityAmped), .isGigantamax = TRUE, }, @@ -2460,7 +2460,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ToxtricityLowKey), ICON(ToxtricityLowKey, 2), - .footprint = gMonFootprint_Toxtricity, + FOOTPRINT(Toxtricity), LEARNSETS(ToxtricityLowKey), }, @@ -2486,7 +2486,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ToxtricityGigantamax), ICON(ToxtricityGigantamax, 0), - .footprint = gMonFootprint_Toxtricity, + FOOTPRINT(Toxtricity), LEARNSETS(ToxtricityLowKey), .isGigantamax = TRUE, }, @@ -2536,7 +2536,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Sizzlipede), ICON(Sizzlipede, 0), - .footprint = gMonFootprint_Sizzlipede, + FOOTPRINT(Sizzlipede), LEARNSETS(Sizzlipede), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_CENTISKORCH}), }, @@ -2563,7 +2563,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_CENTISKORCH, \ .natDexNum = NATIONAL_DEX_CENTISKORCH, \ .categoryName = _("Radiator"), \ - .footprint = gMonFootprint_Centiskorch, \ + FOOTPRINT(Centiskorch), \ LEARNSETS(Centiskorch), \ .formSpeciesIdTable = sCentiskorchFormSpeciesIdTable, \ .formChangeTable = sCentiskorchFormChangeTable @@ -2666,7 +2666,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Clobbopus), ICON(Clobbopus, 0), - .footprint = gMonFootprint_Clobbopus, + FOOTPRINT(Clobbopus), LEARNSETS(Clobbopus), .evolutions = EVOLUTION({EVO_MOVE, MOVE_TAUNT, SPECIES_GRAPPLOCT}), }, @@ -2713,7 +2713,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Grapploct), ICON(Grapploct, 2), - .footprint = gMonFootprint_Grapploct, + FOOTPRINT(Grapploct), LEARNSETS(Grapploct), }, #endif //P_FAMILY_CLOBBOPUS @@ -2754,7 +2754,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .backPicYOffset = 16, \ PALETTES(Sinistea), \ ICON(Sinistea, 2), \ - .footprint = gMonFootprint_Sinistea, \ + FOOTPRINT(Sinistea), \ LEARNSETS(Sinistea), \ .formSpeciesIdTable = sSinisteaFormSpeciesIdTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -2818,7 +2818,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .backPicYOffset = 13, \ PALETTES(Polteageist), \ ICON(Polteageist, 2), \ - .footprint = gMonFootprint_Polteageist, \ + FOOTPRINT(Polteageist), \ LEARNSETS(Polteageist), \ .formSpeciesIdTable = sPolteageistFormSpeciesIdTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -2890,7 +2890,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Hatenna), ICON(Hatenna, 0), - .footprint = gMonFootprint_Hatenna, + FOOTPRINT(Hatenna), LEARNSETS(Hatenna), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_HATTREM}), }, @@ -2937,7 +2937,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Hattrem), ICON(Hattrem, 0), - .footprint = gMonFootprint_Hattrem, + FOOTPRINT(Hattrem), LEARNSETS(Hattrem), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_HATTERENE}), }, @@ -2964,7 +2964,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_HATTERENE, \ .natDexNum = NATIONAL_DEX_HATTERENE, \ .categoryName = _("Silent"), \ - .footprint = gMonFootprint_Hatterene, \ + FOOTPRINT(Hatterene), \ LEARNSETS(Hatterene), \ .formSpeciesIdTable = sHattereneFormSpeciesIdTable, \ .formChangeTable = sHattereneFormChangeTable @@ -3066,7 +3066,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Impidimp), ICON(Impidimp, 0), - .footprint = gMonFootprint_Impidimp, + FOOTPRINT(Impidimp), LEARNSETS(Impidimp), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_MORGREM}), }, @@ -3114,7 +3114,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Morgrem), ICON(Morgrem, 0), - .footprint = gMonFootprint_Morgrem, + FOOTPRINT(Morgrem), LEARNSETS(Morgrem), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_GRIMMSNARL}), }, @@ -3141,7 +3141,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_GRIMMSNARL, \ .natDexNum = NATIONAL_DEX_GRIMMSNARL, \ .categoryName = _("Bulk Up"), \ - .footprint = gMonFootprint_Grimmsnarl, \ + FOOTPRINT(Grimmsnarl), \ LEARNSETS(Grimmsnarl), \ .formSpeciesIdTable = sGrimmsnarlFormSpeciesIdTable, \ .formChangeTable = sGrimmsnarlFormChangeTable @@ -3243,7 +3243,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Milcery), ICON(Milcery, 1), - .footprint = gMonFootprint_Milcery, + FOOTPRINT(Milcery), LEARNSETS(Milcery), .evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM}, {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM}, @@ -3297,7 +3297,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .palette = gMonPalette_Alcremie ##sweet##cream, \ .shinyPalette = gMonShinyPalette_Alcremie ##sweet, \ ICON(AlcremieStrawberryVanillaCream, 1), \ - .footprint = gMonFootprint_Alcremie, \ + FOOTPRINT(Alcremie), \ LEARNSETS(Alcremie), \ .formSpeciesIdTable = sAlcremieFormSpeciesIdTable, \ .formChangeTable = sAlcremieFormChangeTable, \ @@ -3398,7 +3398,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(AlcremieGigantamax), ICON(AlcremieGigantamax, 1), - .footprint = gMonFootprint_Alcremie, + FOOTPRINT(Alcremie), LEARNSETS(Alcremie), .formSpeciesIdTable = sAlcremieFormSpeciesIdTable, .formChangeTable = sAlcremieFormChangeTable, @@ -3449,7 +3449,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Falinks), ICON(Falinks, 0), - .footprint = gMonFootprint_Falinks, + FOOTPRINT(Falinks), LEARNSETS(Falinks), }, #endif //P_FAMILY_FALINKS @@ -3497,7 +3497,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Pincurchin), ICON(Pincurchin, 0), - .footprint = gMonFootprint_Pincurchin, + FOOTPRINT(Pincurchin), LEARNSETS(Pincurchin), }, #endif //P_FAMILY_PINCURCHIN @@ -3547,7 +3547,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Snom), ICON(Snom, 0), - .footprint = gMonFootprint_Snom, + FOOTPRINT(Snom), LEARNSETS(Snom), .evolutions = EVOLUTION({EVO_FRIENDSHIP_NIGHT, 0, SPECIES_FROSMOTH}), }, @@ -3596,7 +3596,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Frosmoth), ICON(Frosmoth, 0), - .footprint = gMonFootprint_Frosmoth, + FOOTPRINT(Frosmoth), LEARNSETS(Frosmoth), }, #endif //P_FAMILY_SNOM @@ -3645,7 +3645,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Stonjourner), ICON(Stonjourner, 2), - .footprint = gMonFootprint_Stonjourner, + FOOTPRINT(Stonjourner), LEARNSETS(Stonjourner), }, #endif //P_FAMILY_STONJOURNER @@ -3672,7 +3672,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, \ .trainerScale = 262, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Eiscue, \ + FOOTPRINT(Eiscue), \ LEARNSETS(Eiscue), \ .formSpeciesIdTable = sEiscueFormSpeciesIdTable, \ .formChangeTable = sEiscueFormChangeTable @@ -3749,7 +3749,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 8, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Indeedee, \ + FOOTPRINT(Indeedee), \ .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable [SPECIES_INDEEDEE_MALE] = @@ -3841,7 +3841,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Morpeko, \ + FOOTPRINT(Morpeko), \ LEARNSETS(Morpeko), \ .formSpeciesIdTable = sMorpekoFormSpeciesIdTable, \ .formChangeTable = sMorpekoFormChangeTable @@ -3932,7 +3932,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Cufant), ICON(Cufant, 0), - .footprint = gMonFootprint_Cufant, + FOOTPRINT(Cufant), LEARNSETS(Cufant), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_COPPERAJAH}), }, @@ -3960,7 +3960,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_COPPERAJAH, \ .natDexNum = NATIONAL_DEX_COPPERAJAH, \ .categoryName = _("Copperderm"), \ - .footprint = gMonFootprint_Copperajah, \ + FOOTPRINT(Copperajah), \ LEARNSETS(Copperajah), \ .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, \ .formChangeTable = sCopperajahFormChangeTable @@ -4062,7 +4062,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dracozolt), ICON(Dracozolt, 1), - .footprint = gMonFootprint_Dracozolt, + FOOTPRINT(Dracozolt), LEARNSETS(Dracozolt), }, #endif //P_FAMILY_DRACOZOLT @@ -4110,7 +4110,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Arctozolt), ICON(Arctozolt, 2), - .footprint = gMonFootprint_Arctozolt, + FOOTPRINT(Arctozolt), LEARNSETS(Arctozolt), }, #endif //P_FAMILY_ARCTOZOLT @@ -4159,7 +4159,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dracovish), ICON(Dracovish, 0), - .footprint = gMonFootprint_Dracovish, + FOOTPRINT(Dracovish), LEARNSETS(Dracovish), }, #endif //P_FAMILY_DRACOVISH @@ -4208,7 +4208,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Arctovish), ICON(Arctovish, 0), - .footprint = gMonFootprint_Arctovish, + FOOTPRINT(Arctovish), LEARNSETS(Arctovish), }, #endif //P_FAMILY_ARCTOVISH @@ -4236,7 +4236,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_DURALUDON, \ .natDexNum = NATIONAL_DEX_DURALUDON, \ .categoryName = _("Alloy"), \ - .footprint = gMonFootprint_Duraludon, \ + FOOTPRINT(Duraludon), \ LEARNSETS(Duraludon), \ .formSpeciesIdTable = sDuraludonFormSpeciesIdTable, \ .formChangeTable = sDuraludonFormChangeTable @@ -4338,7 +4338,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, //PALETTES(Archaludon), //ICON(Archaludon, 0), - //.footprint = gMonFootprint_Archaludon, + //FOOTPRINT(Archaludon), LEARNSETS(Archaludon), }, #endif //P_GEN_9_CROSS_EVOS @@ -4389,7 +4389,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dreepy), ICON(Dreepy, 0), - .footprint = gMonFootprint_Dreepy, + FOOTPRINT(Dreepy), LEARNSETS(Dreepy), .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_DRAKLOAK}), }, @@ -4437,7 +4437,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Drakloak), ICON(Drakloak, 0), - .footprint = gMonFootprint_Drakloak, + FOOTPRINT(Drakloak), LEARNSETS(Drakloak), .evolutions = EVOLUTION({EVO_LEVEL, 60, SPECIES_DRAGAPULT}), }, @@ -4486,7 +4486,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dragapult), ICON(Dragapult, 0), - .footprint = gMonFootprint_Dragapult, + FOOTPRINT(Dragapult), LEARNSETS(Dragapult), }, #endif //P_FAMILY_DREEPY @@ -4511,7 +4511,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Zacian, \ + FOOTPRINT(Zacian), \ LEARNSETS(Zacian), \ .formSpeciesIdTable = sZacianFormSpeciesIdTable, \ .formChangeTable = sZacianFormChangeTable @@ -4594,7 +4594,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .footprint = gMonFootprint_Zamazenta, \ + FOOTPRINT(Zamazenta), \ LEARNSETS(Zamazenta), \ .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, \ .formChangeTable = sZamazentaFormChangeTable @@ -4674,7 +4674,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .speciesName = _("Eternatus"), \ .natDexNum = NATIONAL_DEX_ETERNATUS, \ .categoryName = _("Gigantic"), \ - .footprint = gMonFootprint_Eternatus, \ + FOOTPRINT(Eternatus), \ LEARNSETS(Eternatus), \ .formSpeciesIdTable = sEternatusFormSpeciesIdTable @@ -4791,7 +4791,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Kubfu), ICON(Kubfu, 1), - .footprint = gMonFootprint_Kubfu, + FOOTPRINT(Kubfu), LEARNSETS(Kubfu), .evolutions = EVOLUTION({EVO_DARK_SCROLL, 0, SPECIES_URSHIFU_SINGLE_STRIKE_STYLE}, {EVO_ITEM, ITEM_SCROLL_OF_DARKNESS, SPECIES_URSHIFU_SINGLE_STRIKE_STYLE}, @@ -4820,7 +4820,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .speciesName = _("Urshifu"), \ .natDexNum = NATIONAL_DEX_URSHIFU, \ .categoryName = _("Wushu"), \ - .footprint = gMonFootprint_Urshifu, \ + FOOTPRINT(Urshifu), \ .formSpeciesIdTable = sUrshifuFormSpeciesIdTable #define URSHIFU_SINGLE_STRIKE_STYLE_MISC_INFO \ @@ -4975,7 +4975,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, \ .trainerScale = 286, \ .trainerOffset = 1, \ - .footprint = gMonFootprint_Zarude, \ + FOOTPRINT(Zarude), \ LEARNSETS(Zarude), \ .formSpeciesIdTable = sZarudeFormSpeciesIdTable @@ -5062,7 +5062,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Regieleki), ICON(Regieleki, 0), - .footprint = gMonFootprint_Regieleki, + FOOTPRINT(Regieleki), LEARNSETS(Regieleki), .isLegendary = TRUE, }, @@ -5114,7 +5114,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Regidrago), ICON(Regidrago, 0), - .footprint = gMonFootprint_Regidrago, + FOOTPRINT(Regidrago), LEARNSETS(Regidrago), }, #endif //P_FAMILY_REGIDRAGO @@ -5163,7 +5163,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Glastrier), ICON(Glastrier, 0), - .footprint = gMonFootprint_Glastrier, + FOOTPRINT(Glastrier), LEARNSETS(Glastrier), }, #endif //P_FAMILY_GLASTRIER @@ -5213,7 +5213,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Spectrier), ICON(Spectrier, 0), - .footprint = gMonFootprint_Spectrier, + FOOTPRINT(Spectrier), LEARNSETS(Spectrier), }, #endif //P_FAMILY_SPECTRIER @@ -5221,7 +5221,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #define CALYREX_MISC_INFO \ .speciesName = _("Calyrex"), \ .natDexNum = NATIONAL_DEX_CALYREX, \ - .footprint = gMonFootprint_Calyrex, \ + FOOTPRINT(Calyrex), \ .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, \ .isLegendary = TRUE @@ -5417,7 +5417,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(EnamorusIncarnate), ICON(EnamorusIncarnate, 1), - //.footprint = gMonFootprint_EnamorusIncarnate, + //FOOTPRINT(EnamorusIncarnate), }, [SPECIES_ENAMORUS_THERIAN] = @@ -5445,7 +5445,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(EnamorusTherian), ICON(EnamorusTherian, 1), - //.footprint = gMonFootprint_Enamorus, + //FOOTPRINT(Enamorus), }, #endif //P_FAMILY_ENAMORUS diff --git a/src/data/pokemon/species_info/gen_9.h b/src/data/pokemon/species_info/gen_9.h index 70e55ae320..6f32456c56 100644 --- a/src/data/pokemon/species_info/gen_9.h +++ b/src/data/pokemon/species_info/gen_9.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Sprigatito), ICON(Sprigatito, 4), - //.footprint = gMonFootprint_Sprigatito, + //FOOTPRINT(Sprigatito), LEARNSETS(Sprigatito), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_FLORAGATO}), }, @@ -95,7 +95,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Floragato), ICON(Floragato, 1), - //.footprint = gMonFootprint_Floragato, + //FOOTPRINT(Floragato), LEARNSETS(Floragato), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_MEOWSCARADA}), }, @@ -143,7 +143,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Meowscarada), ICON(Meowscarada, 1), - //.footprint = gMonFootprint_Meowscarada, + //FOOTPRINT(Meowscarada), LEARNSETS(Meowscarada), }, #endif //P_FAMILY_SPRIGATITO @@ -192,7 +192,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Fuecoco), ICON(Fuecoco, 0), - //.footprint = gMonFootprint_Fuecoco, + //FOOTPRINT(Fuecoco), LEARNSETS(Fuecoco), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_CROCALOR}), }, @@ -240,7 +240,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Crocalor), ICON(Crocalor, 0), - //.footprint = gMonFootprint_Crocalor, + //FOOTPRINT(Crocalor), LEARNSETS(Crocalor), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SKELEDIRGE}), }, @@ -288,7 +288,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Skeledirge), ICON(Skeledirge, 0), - //.footprint = gMonFootprint_Skeledirge, + //FOOTPRINT(Skeledirge), LEARNSETS(Skeledirge), }, #endif //P_FAMILY_FUECOCO @@ -337,7 +337,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Quaxly), ICON(Quaxly, 2), - //.footprint = gMonFootprint_Quaxly, + //FOOTPRINT(Quaxly), LEARNSETS(Quaxly), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_QUAXWELL}), }, @@ -385,7 +385,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Quaxwell), ICON(Quaxwell, 0), - //.footprint = gMonFootprint_Quaxwell, + //FOOTPRINT(Quaxwell), LEARNSETS(Quaxwell), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_QUAQUAVAL}), }, @@ -433,7 +433,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Quaquaval), ICON(Quaquaval, 0), - //.footprint = gMonFootprint_Quaquaval, + //FOOTPRINT(Quaquaval), LEARNSETS(Quaquaval), }, #endif //P_FAMILY_QUAXLY @@ -482,7 +482,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Lechonk), ICON(Lechonk, 1), - //.footprint = gMonFootprint_Lechonk, + //FOOTPRINT(Lechonk), LEARNSETS(Lechonk), .evolutions = EVOLUTION({EVO_LEVEL_MALE, 18, SPECIES_OINKOLOGNE_MALE}, {EVO_LEVEL_FEMALE, 18, SPECIES_OINKOLOGNE_FEMALE}), @@ -534,7 +534,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(OinkologneMale), ICON(OinkologneMale, 1), - //.footprint = gMonFootprint_Oinkologne, + //FOOTPRINT(Oinkologne), LEARNSETS(OinkologneMale), }, @@ -565,7 +565,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(OinkologneFemale), ICON(OinkologneFemale, 2), - //.footprint = gMonFootprint_Oinkologne, + //FOOTPRINT(Oinkologne), LEARNSETS(OinkologneFemale), }, #endif //P_FAMILY_LECHONK @@ -614,7 +614,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Tarountula), ICON(Tarountula, 1), - //.footprint = gMonFootprint_Tarountula, + //FOOTPRINT(Tarountula), LEARNSETS(Tarountula), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_SPIDOPS}), }, @@ -662,7 +662,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Spidops), ICON(Spidops, 1), - //.footprint = gMonFootprint_Spidops, + //FOOTPRINT(Spidops), LEARNSETS(Spidops), }, #endif //P_FAMILY_TAROUNTULA @@ -711,7 +711,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Nymble), ICON(Nymble, 0), - //.footprint = gMonFootprint_Nymble, + //FOOTPRINT(Nymble), LEARNSETS(Nymble), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_LOKIX}), }, @@ -759,7 +759,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Lokix), ICON(Lokix, 0), - //.footprint = gMonFootprint_Lokix, + //FOOTPRINT(Lokix), LEARNSETS(Lokix), }, #endif //P_FAMILY_NYMBLE @@ -808,7 +808,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Pawmi), ICON(Pawmi, 3), - //.footprint = gMonFootprint_Pawmi, + //FOOTPRINT(Pawmi), LEARNSETS(Pawmi), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_PAWMO}), }, @@ -856,7 +856,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Pawmo), ICON(Pawmo, 3), - //.footprint = gMonFootprint_Pawmo, + //FOOTPRINT(Pawmo), LEARNSETS(Pawmo), .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_PAWMOT}), }, @@ -904,7 +904,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Pawmot), ICON(Pawmot, 3), - //.footprint = gMonFootprint_Pawmot, + //FOOTPRINT(Pawmot), LEARNSETS(Pawmot), }, #endif //P_FAMILY_PAWMI @@ -953,7 +953,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Tandemaus), ICON(Tandemaus, 0), - //.footprint = gMonFootprint_Tandemaus, + //FOOTPRINT(Tandemaus), LEARNSETS(Tandemaus), .evolutions = EVOLUTION({EVO_LEVEL_FAMILY_OF_FOUR, 25, SPECIES_MAUSHOLD_FAMILY_OF_FOUR}, {EVO_LEVEL_FAMILY_OF_THREE, 25, SPECIES_MAUSHOLD_FAMILY_OF_THREE}), @@ -993,7 +993,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .formSpeciesIdTable = sMausholdFormSpeciesIdTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //.footprint = gMonFootprint_Maushold, + //FOOTPRINT(Maushold), [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { @@ -1069,7 +1069,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Fidough), ICON(Fidough, 1), - //.footprint = gMonFootprint_Fidough, + //FOOTPRINT(Fidough), LEARNSETS(Fidough), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DACHSBUN}), }, @@ -1117,7 +1117,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dachsbun), ICON(Dachsbun, 0), // TODO - //.footprint = gMonFootprint_Dachsbun, + //FOOTPRINT(Dachsbun), LEARNSETS(Dachsbun), }, #endif //P_FAMILY_FIDOUGH @@ -1166,7 +1166,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Smoliv), ICON(Smoliv, 1), - //.footprint = gMonFootprint_Smoliv, + //FOOTPRINT(Smoliv), LEARNSETS(Smoliv), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_DOLLIV}), }, @@ -1214,7 +1214,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dolliv), ICON(Dolliv, 1), - //.footprint = gMonFootprint_Dolliv, + //FOOTPRINT(Dolliv), LEARNSETS(Dolliv), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ARBOLIVA}), }, @@ -1262,7 +1262,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Arboliva), ICON(Arboliva, 5), - //.footprint = gMonFootprint_Arboliva, + //FOOTPRINT(Arboliva), LEARNSETS(Arboliva), }, #endif //P_FAMILY_SMOLIV @@ -1303,7 +1303,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //.footprint = gMonFootprint_Squawkabilly, + //FOOTPRINT(Squawkabilly), [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = { @@ -1406,7 +1406,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Nacli), ICON(Nacli, 2), - //.footprint = gMonFootprint_Nacli, + //FOOTPRINT(Nacli), LEARNSETS(Nacli), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_NACLSTACK}), }, @@ -1454,7 +1454,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Naclstack), ICON(Naclstack, 2), // TODO: recolor - //.footprint = gMonFootprint_Naclstack, + //FOOTPRINT(Naclstack), LEARNSETS(Naclstack), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_GARGANACL}), }, @@ -1502,7 +1502,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Garganacl), ICON(Garganacl, 2), - //.footprint = gMonFootprint_Garganacl, + //FOOTPRINT(Garganacl), LEARNSETS(Garganacl), }, #endif //P_FAMILY_NACLI @@ -1551,7 +1551,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Charcadet), ICON(Charcadet, 1), - //.footprint = gMonFootprint_Charcadet, + //FOOTPRINT(Charcadet), LEARNSETS(Charcadet), .evolutions = EVOLUTION({EVO_ITEM, ITEM_AUSPICIOUS_ARMOR, SPECIES_ARMAROUGE}, {EVO_ITEM, ITEM_MALICIOUS_ARMOR, SPECIES_CERULEDGE}), @@ -1600,7 +1600,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Armarouge), ICON(Armarouge, 0), - //.footprint = gMonFootprint_Armarouge, + //FOOTPRINT(Armarouge), LEARNSETS(Armarouge), }, @@ -1647,7 +1647,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Ceruledge), ICON(Ceruledge, 2), - //.footprint = gMonFootprint_Ceruledge, + //FOOTPRINT(Ceruledge), LEARNSETS(Ceruledge), }, #endif //P_FAMILY_CHARCADET @@ -1697,7 +1697,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Tadbulb), ICON(Tadbulb, 5), // TODO: Redo to 0 - //.footprint = gMonFootprint_Tadbulb, + //FOOTPRINT(Tadbulb), LEARNSETS(Tadbulb), .evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_BELLIBOLT}), }, @@ -1745,7 +1745,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Bellibolt), ICON(Bellibolt, 0), - //.footprint = gMonFootprint_Bellibolt, + //FOOTPRINT(Bellibolt), LEARNSETS(Bellibolt), }, #endif //P_FAMILY_TADBULB @@ -1794,7 +1794,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Wattrel), ICON(Wattrel, 3), - //.footprint = gMonFootprint_Wattrel, + //FOOTPRINT(Wattrel), LEARNSETS(Wattrel), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_KILOWATTREL}), }, @@ -1842,7 +1842,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Kilowattrel), ICON(Kilowattrel, 3), - //.footprint = gMonFootprint_Kilowattrel, + //FOOTPRINT(Kilowattrel), LEARNSETS(Kilowattrel), }, #endif //P_FAMILY_WATTREL @@ -1891,7 +1891,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Maschiff), ICON(Maschiff, 3), - //.footprint = gMonFootprint_Maschiff, + //FOOTPRINT(Maschiff), LEARNSETS(Maschiff), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MABOSSTIFF}), }, @@ -1939,7 +1939,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Mabosstiff), ICON(Mabosstiff, 5), - //.footprint = gMonFootprint_Mabosstiff, + //FOOTPRINT(Mabosstiff), LEARNSETS(Mabosstiff), }, #endif //P_FAMILY_MASCHIFF @@ -1988,7 +1988,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Shroodle), ICON(Shroodle, 0), - //.footprint = gMonFootprint_Shroodle, + //FOOTPRINT(Shroodle), LEARNSETS(Shroodle), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_GRAFAIAI}), }, @@ -2036,7 +2036,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Grafaiai), ICON(Grafaiai, 0), - //.footprint = gMonFootprint_Grafaiai, + //FOOTPRINT(Grafaiai), LEARNSETS(Grafaiai), }, #endif //P_FAMILY_SHROODLE @@ -2085,7 +2085,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Bramblin), ICON(Bramblin, 3), - //.footprint = gMonFootprint_Bramblin, + //FOOTPRINT(Bramblin), LEARNSETS(Bramblin), .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_BRAMBLEGHAST}), }, @@ -2133,7 +2133,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Brambleghast), ICON(Brambleghast, 5), - //.footprint = gMonFootprint_Brambleghast, + //FOOTPRINT(Brambleghast), LEARNSETS(Brambleghast), }, #endif //P_FAMILY_BRAMBLIN @@ -2182,7 +2182,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Toedscool), ICON(Toedscool, 0), - //.footprint = gMonFootprint_Toedscool, + //FOOTPRINT(Toedscool), LEARNSETS(Toedscool), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_TOEDSCRUEL}), }, @@ -2230,7 +2230,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Toedscruel), ICON(Toedscruel, 0), - //.footprint = gMonFootprint_Toedscruel, + //FOOTPRINT(Toedscruel), LEARNSETS(Toedscruel), }, #endif //P_FAMILY_TOEDSCOOL @@ -2279,7 +2279,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Klawf), ICON(Klawf, 0), - //.footprint = gMonFootprint_Klawf, + //FOOTPRINT(Klawf), LEARNSETS(Klawf), }, #endif //P_FAMILY_KLAWF @@ -2328,7 +2328,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Capsakid), ICON(Capsakid, 1), - //.footprint = gMonFootprint_Capsakid, + //FOOTPRINT(Capsakid), LEARNSETS(Capsakid), .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_SCOVILLAIN}), }, @@ -2376,7 +2376,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Scovillain), ICON(Scovillain, 1), - //.footprint = gMonFootprint_Scovillain, + //FOOTPRINT(Scovillain), LEARNSETS(Scovillain), }, #endif //P_FAMILY_CAPSAKID @@ -2425,7 +2425,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Rellor), ICON(Rellor, 5), - //.footprint = gMonFootprint_Rellor, + //FOOTPRINT(Rellor), LEARNSETS(Rellor), .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_RABSCA}), }, @@ -2473,7 +2473,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Rabsca), ICON(Rabsca, 0), - //.footprint = gMonFootprint_Rabsca, + //FOOTPRINT(Rabsca), LEARNSETS(Rabsca), }, #endif //P_FAMILY_RELLOR @@ -2522,7 +2522,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Flittle), ICON(Flittle, 3), - //.footprint = gMonFootprint_Flittle, + //FOOTPRINT(Flittle), LEARNSETS(Flittle), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ESPATHRA}), }, @@ -2570,7 +2570,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Espathra), ICON(Espathra, 5), - //.footprint = gMonFootprint_Espathra, + //FOOTPRINT(Espathra), LEARNSETS(Espathra), }, #endif //P_FAMILY_FLITTLE @@ -2619,7 +2619,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Tinkatink), ICON(Tinkatink, 1), - //.footprint = gMonFootprint_Tinkatink, + //FOOTPRINT(Tinkatink), LEARNSETS(Tinkatink), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_TINKATUFF}), }, @@ -2667,7 +2667,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Tinkatuff), ICON(Tinkatuff, 4), - //.footprint = gMonFootprint_Tinkatuff, + //FOOTPRINT(Tinkatuff), LEARNSETS(Tinkatuff), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_TINKATON}), }, @@ -2715,7 +2715,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Tinkaton), ICON(Tinkaton, 4), - //.footprint = gMonFootprint_Tinkaton, + //FOOTPRINT(Tinkaton), LEARNSETS(Tinkaton), }, #endif //P_FAMILY_TINKATINK @@ -2763,7 +2763,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Wiglett), ICON(Wiglett, 0), - //.footprint = gMonFootprint_Wiglett, + //FOOTPRINT(Wiglett), LEARNSETS(Wiglett), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_WUGTRIO}), }, @@ -2810,7 +2810,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Wugtrio), ICON(Wugtrio, 0), - //.footprint = gMonFootprint_Wugtrio, + //FOOTPRINT(Wugtrio), LEARNSETS(Wugtrio), }, #endif //P_FAMILY_WIGLETT @@ -2860,7 +2860,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Bombirdier), ICON(Bombirdier, 0), - //.footprint = gMonFootprint_Bombirdier, + //FOOTPRINT(Bombirdier), LEARNSETS(Bombirdier), }, #endif //P_FAMILY_BOMBIRDIER @@ -2908,7 +2908,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Finizen), ICON(Finizen, 0), - //.footprint = gMonFootprint_Finizen, + //FOOTPRINT(Finizen), LEARNSETS(Finizen), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_PALAFIN_ZERO}), }, @@ -2935,7 +2935,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .formSpeciesIdTable = sPalafinFormSpeciesIdTable, \ .formChangeTable = sPalafinZeroFormChangeTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.footprint = gMonFootprint_Palafin, + //FOOTPRINT(Palafin), [SPECIES_PALAFIN_ZERO] = { @@ -3038,7 +3038,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Varoom), ICON(Varoom, 5), - //.footprint = gMonFootprint_Varoom, + //FOOTPRINT(Varoom), LEARNSETS(Varoom), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_REVAVROOM}), }, @@ -3086,7 +3086,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Revavroom), ICON(Revavroom, 5), - //.footprint = gMonFootprint_Revavroom, + //FOOTPRINT(Revavroom), LEARNSETS(Revavroom), }, #endif //P_FAMILY_VAROOM @@ -3135,7 +3135,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Cyclizar), ICON(Cyclizar, 1), - //.footprint = gMonFootprint_Cyclizar, + //FOOTPRINT(Cyclizar), LEARNSETS(Cyclizar), }, #endif //P_FAMILY_CYCLIZAR @@ -3184,7 +3184,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Orthworm), ICON(Orthworm, 4), - //.footprint = gMonFootprint_Orthworm, + //FOOTPRINT(Orthworm), LEARNSETS(Orthworm), }, #endif //P_FAMILY_ORTHWORM @@ -3234,7 +3234,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Glimmet), ICON(Glimmet, 0), - //.footprint = gMonFootprint_Glimmet, + //FOOTPRINT(Glimmet), LEARNSETS(Glimmet), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_GLIMMORA}), }, @@ -3283,7 +3283,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Glimmora), ICON(Glimmora, 0), - //.footprint = gMonFootprint_Glimmora, + //FOOTPRINT(Glimmora), LEARNSETS(Glimmora), }, #endif //P_FAMILY_GLIMMET @@ -3332,7 +3332,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Greavard), ICON(Greavard, 2), - //.footprint = gMonFootprint_Greavard, + //FOOTPRINT(Greavard), LEARNSETS(Greavard), .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 30, SPECIES_HOUNDSTONE}), }, @@ -3380,7 +3380,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Houndstone), ICON(Houndstone, 5), - //.footprint = gMonFootprint_Houndstone, + //FOOTPRINT(Houndstone), LEARNSETS(Houndstone), }, #endif //P_FAMILY_GREAVARD @@ -3429,7 +3429,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Flamigo), ICON(Flamigo, 4), - //.footprint = gMonFootprint_Flamigo, + //FOOTPRINT(Flamigo), LEARNSETS(Flamigo), }, #endif //P_FAMILY_FLAMIGO @@ -3478,7 +3478,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Cetoddle), ICON(Cetoddle, 0), - //.footprint = gMonFootprint_Cetoddle, + //FOOTPRINT(Cetoddle), LEARNSETS(Cetoddle), .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_CETITAN}), }, @@ -3526,7 +3526,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Cetitan), ICON(Cetitan, 0), - //.footprint = gMonFootprint_Cetitan, + //FOOTPRINT(Cetitan), LEARNSETS(Cetitan), }, #endif //P_FAMILY_CETODDLE @@ -3576,7 +3576,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Veluza), ICON(Veluza, 4), - //.footprint = gMonFootprint_Veluza, + //FOOTPRINT(Veluza), LEARNSETS(Veluza), }, #endif //P_FAMILY_VELUZA @@ -3626,7 +3626,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dondozo), ICON(Dondozo, 0), - //.footprint = gMonFootprint_Dondozo, + //FOOTPRINT(Dondozo), LEARNSETS(Dondozo), }, #endif //P_FAMILY_DONDOZO @@ -3665,7 +3665,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //.footprint = gMonFootprint_Tatsugiri, + //FOOTPRINT(Tatsugiri), [SPECIES_TATSUGIRI_CURLY] = { @@ -3759,7 +3759,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(GreatTusk), ICON(GreatTusk, 0), - //.footprint = gMonFootprint_GreatTusk, + //FOOTPRINT(GreatTusk), LEARNSETS(GreatTusk), }, #endif //P_FAMILY_GREAT_TUSK @@ -3809,7 +3809,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ScreamTail), ICON(ScreamTail, 0), - //.footprint = gMonFootprint_ScreamTail, + //FOOTPRINT(ScreamTail), LEARNSETS(ScreamTail), }, #endif //P_FAMILY_SCREAM_TAIL @@ -3859,7 +3859,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(BruteBonnet), ICON(BruteBonnet, 1), - //.footprint = gMonFootprint_BruteBonnet, + //FOOTPRINT(BruteBonnet), LEARNSETS(BruteBonnet), }, #endif //P_FAMILY_BRUTE_BONNET @@ -3912,7 +3912,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(FlutterMane), ICON(FlutterMane, 4), - //.footprint = gMonFootprint_FlutterMane, + //FOOTPRINT(FlutterMane), LEARNSETS(FlutterMane), }, #endif //P_FAMILY_FLUTTER_MANE @@ -3961,7 +3961,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(SlitherWing), ICON(SlitherWing, 3), - //.footprint = gMonFootprint_SlitherWing, + //FOOTPRINT(SlitherWing), LEARNSETS(SlitherWing), }, #endif //P_FAMILY_SLITHER_WING @@ -4011,7 +4011,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(SandyShocks), ICON(SandyShocks, 0), - //.footprint = gMonFootprint_SandyShocks, + //FOOTPRINT(SandyShocks), LEARNSETS(SandyShocks), }, #endif //P_FAMILY_SANDY_SHOCKS @@ -4061,7 +4061,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronTreads), ICON(IronTreads, 0), - //.footprint = gMonFootprint_IronTreads, + //FOOTPRINT(IronTreads), LEARNSETS(IronTreads), }, #endif //P_FAMILY_IRON_TREADS @@ -4111,7 +4111,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronBundle), ICON(IronBundle, 0), - //.footprint = gMonFootprint_IronBundle, + //FOOTPRINT(IronBundle), LEARNSETS(IronBundle), }, #endif //P_FAMILY_IRON_BUNDLE @@ -4161,7 +4161,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronHands), ICON(IronHands, 0), - //.footprint = gMonFootprint_IronHands, + //FOOTPRINT(IronHands), LEARNSETS(IronHands), }, #endif //P_FAMILY_IRON_HANDS @@ -4212,7 +4212,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronJugulis), ICON(IronJugulis, 2), - //.footprint = gMonFootprint_IronJugulis, + //FOOTPRINT(IronJugulis), LEARNSETS(IronJugulis), }, #endif //P_FAMILY_IRON_JUGULIS @@ -4263,7 +4263,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronMoth), ICON(IronMoth, 3), - //.footprint = gMonFootprint_IronMoth, + //FOOTPRINT(IronMoth), LEARNSETS(IronMoth), }, #endif //P_FAMILY_IRON_MOTH @@ -4313,7 +4313,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronThorns), ICON(IronThorns, 1), - //.footprint = gMonFootprint_IronThorns, + //FOOTPRINT(IronThorns), LEARNSETS(IronThorns), }, #endif //P_FAMILY_IRON_THORNS @@ -4362,7 +4362,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Frigibax), ICON(Frigibax, 3), - //.footprint = gMonFootprint_Frigibax, + //FOOTPRINT(Frigibax), LEARNSETS(Frigibax), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ARCTIBAX}), }, @@ -4410,7 +4410,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Arctibax), ICON(Arctibax, 0), - //.footprint = gMonFootprint_Arctibax, + //FOOTPRINT(Arctibax), LEARNSETS(Arctibax), .evolutions = EVOLUTION({EVO_LEVEL, 54, SPECIES_BAXCALIBUR}), }, @@ -4458,7 +4458,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Baxcalibur), ICON(Baxcalibur, 0), - //.footprint = gMonFootprint_Baxcalibur, + //FOOTPRINT(Baxcalibur), LEARNSETS(Baxcalibur), }, #endif //P_FAMILY_FRIGIBAX @@ -4483,7 +4483,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}) //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //.footprint = gMonFootprint_Gimmighoul, + //FOOTPRINT(Gimmighoul), [SPECIES_GIMMIGHOUL_CHEST] = { @@ -4590,7 +4590,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Gholdengo), ICON(Gholdengo, 0), - //.footprint = gMonFootprint_Gholdengo, + //FOOTPRINT(Gholdengo), LEARNSETS(Gholdengo), }, #endif //P_FAMILY_GIMMIGHOUL @@ -4640,7 +4640,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(WoChien), ICON(WoChien, 5), - //.footprint = gMonFootprint_WoChien, + //FOOTPRINT(WoChien), LEARNSETS(WoChien), }, #endif //P_FAMILY_WO_CHIEN @@ -4690,7 +4690,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ChienPao), ICON(ChienPao, 0), - //.footprint = gMonFootprint_ChienPao, + //FOOTPRINT(ChienPao), LEARNSETS(ChienPao), }, #endif //P_FAMILY_CHIEN_PAO @@ -4740,7 +4740,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(TingLu), ICON(TingLu, 0), - //.footprint = gMonFootprint_TingLu, + //FOOTPRINT(TingLu), LEARNSETS(TingLu), }, #endif //P_FAMILY_TING_LU @@ -4791,7 +4791,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ChiYu), ICON(ChiYu, 0), - //.footprint = gMonFootprint_ChiYu, + //FOOTPRINT(ChiYu), LEARNSETS(ChiYu), }, #endif //P_FAMILY_CHI_YU @@ -4842,7 +4842,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(RoaringMoon), ICON(RoaringMoon, 3), - //.footprint = gMonFootprint_RoaringMoon, + //FOOTPRINT(RoaringMoon), LEARNSETS(RoaringMoon), }, #endif //P_FAMILY_ROARING_MOON @@ -4891,7 +4891,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronValiant), ICON(IronValiant, 4), - //.footprint = gMonFootprint_IronValiant, + //FOOTPRINT(IronValiant), LEARNSETS(IronValiant), }, #endif //P_FAMILY_IRON_VALIANT @@ -4942,7 +4942,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Koraidon), ICON(Koraidon, 0), - //.footprint = gMonFootprint_Koraidon, + //FOOTPRINT(Koraidon), LEARNSETS(Koraidon), }, #endif //P_FAMILY_KORAIDON @@ -4993,7 +4993,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Miraidon), ICON(Miraidon, 2), - //.footprint = gMonFootprint_Miraidon, + //FOOTPRINT(Miraidon), LEARNSETS(Miraidon), }, #endif //P_FAMILY_MIRAIDON @@ -5042,7 +5042,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(WalkingWake), ICON(WalkingWake, 2), - //.footprint = gMonFootprint_WalkingWake, + //FOOTPRINT(WalkingWake), LEARNSETS(WalkingWake), }, #endif //P_FAMILY_WALKING_WAKE @@ -5091,7 +5091,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronLeaves), ICON(IronLeaves, 1), - //.footprint = gMonFootprint_IronLeaves, + //FOOTPRINT(IronLeaves), LEARNSETS(IronLeaves), }, #endif //P_FAMILY_IRON_LEAVES @@ -5136,7 +5136,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = LEARNSETS(Poltchageist) //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //.footprint = gMonFootprint_Poltchageist, + //FOOTPRINT(Poltchageist), [SPECIES_POLTCHAGEIST_COUNTERFEIT] = { @@ -5198,7 +5198,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = LEARNSETS(Sinistcha) //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //.footprint = gMonFootprint_Sinistcha, + //FOOTPRINT(Sinistcha), [SPECIES_SINISTCHA_UNREMARKABLE] = { @@ -5264,7 +5264,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Okidogi), ICON(Okidogi, 1), - //.footprint = gMonFootprint_Okidogi, + //FOOTPRINT(Okidogi), LEARNSETS(Okidogi), .isLegendary = TRUE, }, @@ -5315,7 +5315,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Munkidori), ICON(Munkidori, 0), - //.footprint = gMonFootprint_Munkidori, + //FOOTPRINT(Munkidori), LEARNSETS(Munkidori), }, #endif //P_FAMILY_MUNKIDORI @@ -5365,7 +5365,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Fezandipiti), ICON(Fezandipiti, 0), - //.footprint = gMonFootprint_Fezandipiti, + //FOOTPRINT(Fezandipiti), LEARNSETS(Fezandipiti), }, #endif //P_FAMILY_FEZANDIPITI @@ -5417,7 +5417,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //.shinyPalette = gMonShinyPalette_OgerponTealMask, //ICON(Ogerpon##Form##, 1), - //.footprint = gMonFootprint_Ogerpon, + //FOOTPRINT(Ogerpon), [SPECIES_OGERPON_TEAL_MASK] = OGERPON_SPECIES_INFO(TealMask, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN, FALSE), [SPECIES_OGERPON_WELLSPRING_MASK] = OGERPON_SPECIES_INFO(WellspringMask, TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE, FALSE), @@ -5477,7 +5477,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //PALETTES(GougingFire), //ICON(GougingFire, 0), - //.footprint = gMonFootprint_GougingFire, + //FOOTPRINT(GougingFire), LEARNSETS(GougingFire), }, #endif //P_FAMILY_GOUGING_FIRE @@ -5527,7 +5527,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //PALETTES(RagingBolt), //ICON(RagingBolt, 0), - //.footprint = gMonFootprint_RagingBolt, + //FOOTPRINT(RagingBolt), LEARNSETS(RagingBolt), }, #endif //P_FAMILY_RAGING_BOLT @@ -5576,7 +5576,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //PALETTES(IronBoulder), //ICON(IronBoulder, 0), - //.footprint = gMonFootprint_IronBoulder, + //FOOTPRINT(IronBoulder), LEARNSETS(IronBoulder), }, #endif //P_FAMILY_IRON_BOULDER @@ -5626,7 +5626,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //PALETTES(IronCrown), //ICON(IronCrown, 0), - //.footprint = gMonFootprint_IronCrown, + //FOOTPRINT(IronCrown), LEARNSETS(IronCrown), }, #endif //P_FAMILY_IRON_CROWN @@ -5650,7 +5650,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .formChangeTable = sTerapagosFormChangeTable, \ .isLegendary = TRUE //.cryId = CRY_TERAPAGOS, - //.footprint = gMonFootprint_Terapagos, + //FOOTPRINT(Terapagos), [SPECIES_TERAPAGOS_NORMAL] = { @@ -5797,7 +5797,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //PALETTES(Pecharunt), //ICON(Pecharunt, 0), - //.footprint = gMonFootprint_Pecharunt, + //FOOTPRINT(Pecharunt), LEARNSETS(Pecharunt), }, #endif //P_FAMILY_PECHARUNT diff --git a/src/pokedex.c b/src/pokedex.c index a0f53d97c0..ce185e2de2 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -4567,6 +4567,9 @@ static void DrawFootprint(u8 windowId, u16 dexNum) const u8 *footprintGfx = gSpeciesInfo[NationalPokedexNumToSpecies(dexNum)].footprint; u32 i, j, tileIdx = 0; + if (P_FOOTPRINTS == FALSE) + return; + if (footprintGfx != NULL) { for (i = 0; i < TILE_SIZE_1BPP * NUM_FOOTPRINT_TILES; i++) diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index 6526af075d..08ad6a0b4e 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -4657,6 +4657,9 @@ static void DrawFootprint(u8 windowId, u16 species) const u8 *footprintGfx = gSpeciesInfo[SanitizeSpeciesId(species)].footprint; u32 i, j, tileIdx = 0; + if (P_FOOTPRINTS == FALSE) + return; + if (footprintGfx != NULL) { for (i = 0; i < TILE_SIZE_1BPP * NUM_FOOTPRINT_TILES; i++) diff --git a/src/pokemon_debug.c b/src/pokemon_debug.c index 6f0cd3956c..16a551dd6a 100644 --- a/src/pokemon_debug.c +++ b/src/pokemon_debug.c @@ -810,6 +810,9 @@ static void DrawFootprintCustom(u8 windowId, u16 species) const u8 *footprintGfx = gSpeciesInfo[species].footprint; u32 i, j, tileIdx = 0; + if (P_FOOTPRINTS == FALSE) + return; + if (footprintGfx != NULL) { for (i = 0; i < 32; i++) From d7cdf4142942f4c803ade40239d601515ad59684 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 3 Jan 2024 18:28:55 -0300 Subject: [PATCH 60/82] =?UTF-8?q?Added=20EV=20setters=20to=20the=20debug?= =?UTF-8?q?=20menu's=20"Give=20Pok=C3=A9mon=20Complex"=20(#3566)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added EV setters to the debug menu's "Give Pokémon Complex" Misc. Changes: -Updated the text strings for the 2 "Give Pokémon" options used by the debug menu. * Optimized DebugAction_Give_Pokemon_SelectShiny and made some debug functions use relevant constants * Removed extra call to CalculateMonStats in DebugAction_Give_Pokemon_ComplexCreateMon * Made the EV selection go back to the start if the sum of EV is > 510 --------- Co-authored-by: Bassoonian --- src/debug.c | 254 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 225 insertions(+), 29 deletions(-) diff --git a/src/debug.c b/src/debug.c index 46655625b8..4079bb58b4 100644 --- a/src/debug.c +++ b/src/debug.c @@ -265,6 +265,12 @@ struct DebugMonData u16 mon_move_1; u16 mon_move_2; u16 mon_move_3; + u8 mon_ev_hp; + u8 mon_ev_atk; + u8 mon_ev_def; + u8 mon_ev_speed; + u8 mon_ev_satk; + u8 mon_ev_sdef; }; struct DebugMenuListData @@ -388,6 +394,7 @@ static void DebugAction_Give_Pokemon_SelectShiny(u8 taskId); static void DebugAction_Give_Pokemon_SelectNature(u8 taskId); static void DebugAction_Give_Pokemon_SelectAbility(u8 taskId); static void DebugAction_Give_Pokemon_SelectIVs(u8 taskId); +static void DebugAction_Give_Pokemon_SelectEVs(u8 taskId); static void DebugAction_Give_Pokemon_ComplexCreateMon(u8 taskId); static void DebugAction_Give_Pokemon_Move(u8 taskId); static void DebugAction_Give_MaxMoney(u8 taskId); @@ -555,20 +562,27 @@ static const u8 sDebugText_Give_GiveItem[] = _("Give item XYZ…{CLEA static const u8 sDebugText_ItemQuantity[] = _("Quantity:{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n\n{STR_VAR_2}"); static const u8 sDebugText_ItemID[] = _("Item Id: {STR_VAR_3}\n{STR_VAR_1}{CLEAR_TO 90}\n\n{STR_VAR_2}"); static const u8 sDebugText_Give_AllTMs[] = _("Give all TMs"); -static const u8 sDebugText_Give_GivePokemonSimple[] = _("Pkm (lvl)…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Give_GivePokemonComplex[] = _("Pkm (l,s,n,a,IV,mov)…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Give_GivePokemonSimple[] = _("Pkmn (Basic){CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Give_GivePokemonComplex[] = _("Pkmn (Complex){CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_PokemonID[] = _("Species: {STR_VAR_3}\n{STR_VAR_1}{CLEAR_TO 90}\n\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_PokemonLevel[] = _("Level:{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_PokemonShiny[] = _("Shiny:{CLEAR_TO 90}\n {STR_VAR_2}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{CLEAR_TO 90}"); static const u8 sDebugText_PokemonNature[] = _("NatureId: {STR_VAR_3}{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_PokemonAbility[] = _("AbilityNum: {STR_VAR_3}{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_PokemonIVs[] = _("All IVs:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); +static const u8 sDebugText_PokemonEVs[] = _("All EVs:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_IV_HP[] = _("IV HP:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_IV_Attack[] = _("IV Attack:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_IV_Defense[] = _("IV Defense:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_IV_Speed[] = _("IV Speed:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_IV_SpAttack[] = _("IV Sp. Attack:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_IV_SpDefense[] = _("IV Sp. Defense:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); +static const u8 sDebugText_EV_HP[] = _("EV HP:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); +static const u8 sDebugText_EV_Attack[] = _("EV Attack:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); +static const u8 sDebugText_EV_Defense[] = _("EV Defense:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); +static const u8 sDebugText_EV_Speed[] = _("EV Speed:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); +static const u8 sDebugText_EV_SpAttack[] = _("EV Sp. Attack:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); +static const u8 sDebugText_EV_SpDefense[] = _("EV Sp. Defense:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_PokemonMove_0[] = _("Move 0: {STR_VAR_3}{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_PokemonMove_1[] = _("Move 1: {STR_VAR_3}{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_PokemonMove_2[] = _("Move 2: {STR_VAR_3}{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); @@ -2946,6 +2960,12 @@ static void ResetMonDataStruct(struct DebugMonData *sDebugMonData) sDebugMonData->mon_iv_speed = 0; sDebugMonData->mon_iv_satk = 0; sDebugMonData->mon_iv_sdef = 0; + sDebugMonData->mon_ev_hp = 0; + sDebugMonData->mon_ev_atk = 0; + sDebugMonData->mon_ev_def = 0; + sDebugMonData->mon_ev_speed = 0; + sDebugMonData->mon_ev_satk = 0; + sDebugMonData->mon_ev_sdef = 0; } #define tIsComplex data[5] @@ -3108,8 +3128,8 @@ static void DebugAction_Give_Pokemon_SelectLevel(u8 taskId) if (JOY_NEW(DPAD_UP)) { gTasks[taskId].tInput += sPowersOfTen[gTasks[taskId].tDigit]; - if (gTasks[taskId].tInput > 100) - gTasks[taskId].tInput = 100; + if (gTasks[taskId].tInput > MAX_LEVEL) + gTasks[taskId].tInput = MAX_LEVEL; } if (JOY_NEW(DPAD_DOWN)) { @@ -3175,27 +3195,14 @@ static void DebugAction_Give_Pokemon_SelectLevel(u8 taskId) static void DebugAction_Give_Pokemon_SelectShiny(u8 taskId) { + static const u8 *txtStr; + if (JOY_NEW(DPAD_ANY)) { PlaySE(SE_SELECT); - - if (JOY_NEW(DPAD_UP)) - { - gTasks[taskId].tInput += sPowersOfTen[gTasks[taskId].tDigit]; - if (gTasks[taskId].tInput > 1) - gTasks[taskId].tInput = 1; - } - if (JOY_NEW(DPAD_DOWN)) - { - gTasks[taskId].tInput -= sPowersOfTen[gTasks[taskId].tDigit]; - if (gTasks[taskId].tInput < 0) - gTasks[taskId].tInput = 0; - } - - if (gTasks[taskId].tInput == 1) - StringCopyPadded(gStringVar2, sDebugText_True, CHAR_SPACE, 15); - else - StringCopyPadded(gStringVar2, sDebugText_False, CHAR_SPACE, 15); + gTasks[taskId].tInput ^= JOY_NEW(DPAD_UP | DPAD_DOWN); + txtStr = (gTasks[taskId].tInput == TRUE) ? sDebugText_True : sDebugText_False; + StringCopyPadded(gStringVar2, txtStr, CHAR_SPACE, 15); ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].tInput, STR_CONV_MODE_LEADING_ZEROS, 0); StringCopyPadded(gStringVar3, gStringVar3, CHAR_SPACE, 15); StringExpandPlaceholders(gStringVar4, sDebugText_PokemonShiny); @@ -3344,8 +3351,8 @@ static void DebugAction_Give_Pokemon_SelectIVs(u8 taskId) if (JOY_NEW(DPAD_UP)) { gTasks[taskId].tInput += sPowersOfTen[gTasks[taskId].tDigit]; - if (gTasks[taskId].tInput > 31) - gTasks[taskId].tInput = 31; + if (gTasks[taskId].tInput > MAX_PER_STAT_IVS) + gTasks[taskId].tInput = MAX_PER_STAT_IVS; } if (JOY_NEW(DPAD_DOWN)) { @@ -3458,13 +3465,184 @@ static void DebugAction_Give_Pokemon_SelectIVs(u8 taskId) gTasks[taskId].tIterator = 0; StringCopy(gStringVar2, gText_DigitIndicator[gTasks[taskId].tDigit]); - StringCopy(gStringVar1, gMoveNames[gTasks[taskId].tInput]); - StringCopyPadded(gStringVar1, gStringVar1, CHAR_SPACE, 15); ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].tInput, STR_CONV_MODE_LEADING_ZEROS, 3); - StringExpandPlaceholders(gStringVar4, sDebugText_PokemonMove_0); + StringCopyPadded(gStringVar3, gStringVar3, CHAR_SPACE, 15); + StringExpandPlaceholders(gStringVar4, sDebugText_EV_HP); + AddTextPrinterParameterized(gTasks[taskId].tSubWindowId, DEBUG_MENU_FONT, gStringVar4, 1, 1, 0, NULL); + gTasks[taskId].func = DebugAction_Give_Pokemon_SelectEVs; + } + } + else if (JOY_NEW(B_BUTTON)) + { + PlaySE(SE_SELECT); + Free(sDebugMonData); + DebugAction_DestroyExtraWindow(taskId); + } +} + +static u32 GetDebugPokemonTotalEV(void) +{ + return (sDebugMonData->mon_ev_hp + + sDebugMonData->mon_ev_atk + + sDebugMonData->mon_ev_def + + sDebugMonData->mon_ev_speed + + sDebugMonData->mon_ev_satk + + sDebugMonData->mon_ev_sdef); +} + +static void DebugAction_Give_Pokemon_SelectEVs(u8 taskId) +{ + u16 totalEV = GetDebugPokemonTotalEV(); + + if (JOY_NEW(DPAD_ANY)) + { + PlaySE(SE_SELECT); + + if (JOY_NEW(DPAD_UP)) + { + gTasks[taskId].tInput += sPowersOfTen[gTasks[taskId].tDigit]; + if (gTasks[taskId].tInput > MAX_PER_STAT_EVS) + gTasks[taskId].tInput = MAX_PER_STAT_EVS; + } + if (JOY_NEW(DPAD_DOWN)) + { + gTasks[taskId].tInput -= sPowersOfTen[gTasks[taskId].tDigit]; + if (gTasks[taskId].tInput < 0) + gTasks[taskId].tInput = 0; + } + if (JOY_NEW(DPAD_LEFT)) + { + if (gTasks[taskId].tDigit > 0) + gTasks[taskId].tDigit -= 1; + } + if (JOY_NEW(DPAD_RIGHT)) + { + if (gTasks[taskId].tDigit < 3) + gTasks[taskId].tDigit += 1; + } + + StringCopy(gStringVar2, gText_DigitIndicator[gTasks[taskId].tDigit]); + ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].tInput, STR_CONV_MODE_LEADING_ZEROS, 3); + StringCopyPadded(gStringVar3, gStringVar3, CHAR_SPACE, 15); + switch (gTasks[taskId].tIterator) + { + case STAT_HP: + StringExpandPlaceholders(gStringVar4, sDebugText_EV_HP); + break; + case STAT_ATK: + StringExpandPlaceholders(gStringVar4, sDebugText_EV_Attack); + break; + case STAT_DEF: + StringExpandPlaceholders(gStringVar4, sDebugText_EV_Defense); + break; + case STAT_SPEED: + StringExpandPlaceholders(gStringVar4, sDebugText_EV_Speed); + break; + case STAT_SPATK: + StringExpandPlaceholders(gStringVar4, sDebugText_EV_SpAttack); + break; + case STAT_SPDEF: + StringExpandPlaceholders(gStringVar4, sDebugText_EV_SpDefense); + break; + } + AddTextPrinterParameterized(gTasks[taskId].tSubWindowId, DEBUG_MENU_FONT, gStringVar4, 1, 1, 0, NULL); + } + + //If A or B button + if (JOY_NEW(A_BUTTON)) + { + switch (gTasks[taskId].tIterator) + { + case STAT_HP: + sDebugMonData->mon_ev_hp = gTasks[taskId].tInput; + break; + case STAT_ATK: + sDebugMonData->mon_ev_atk = gTasks[taskId].tInput; + break; + case STAT_DEF: + sDebugMonData->mon_ev_def = gTasks[taskId].tInput; + break; + case STAT_SPEED: + sDebugMonData->mon_ev_speed = gTasks[taskId].tInput; + break; + case STAT_SPATK: + sDebugMonData->mon_ev_satk = gTasks[taskId].tInput; + break; + case STAT_SPDEF: + sDebugMonData->mon_ev_sdef = gTasks[taskId].tInput; + break; + } + + //Check if all EVs set + if (gTasks[taskId].tIterator != NUM_STATS - 1) + { + gTasks[taskId].tIterator++; + gTasks[taskId].tInput = 0; + gTasks[taskId].tDigit = 0; + + StringCopy(gStringVar2, gText_DigitIndicator[gTasks[taskId].tDigit]); + ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].tInput, STR_CONV_MODE_LEADING_ZEROS, 3); + StringCopyPadded(gStringVar3, gStringVar3, CHAR_SPACE, 15); + switch (gTasks[taskId].tIterator) + { + case STAT_HP: + StringExpandPlaceholders(gStringVar4, sDebugText_EV_HP); + break; + case STAT_ATK: + StringExpandPlaceholders(gStringVar4, sDebugText_EV_Attack); + break; + case STAT_DEF: + StringExpandPlaceholders(gStringVar4, sDebugText_EV_Defense); + break; + case STAT_SPEED: + StringExpandPlaceholders(gStringVar4, sDebugText_EV_Speed); + break; + case STAT_SPATK: + StringExpandPlaceholders(gStringVar4, sDebugText_EV_SpAttack); + break; + case STAT_SPDEF: + StringExpandPlaceholders(gStringVar4, sDebugText_EV_SpDefense); + break; + } AddTextPrinterParameterized(gTasks[taskId].tSubWindowId, DEBUG_MENU_FONT, gStringVar4, 1, 1, 0, NULL); - gTasks[taskId].func = DebugAction_Give_Pokemon_Move; + gTasks[taskId].func = DebugAction_Give_Pokemon_SelectEVs; + } + else + { + gTasks[taskId].tInput = 0; + gTasks[taskId].tDigit = 0; + gTasks[taskId].tIterator = 0; + + if (totalEV > MAX_TOTAL_EVS) + { + sDebugMonData->mon_ev_hp = 0; + sDebugMonData->mon_ev_atk = 0; + sDebugMonData->mon_ev_def = 0; + sDebugMonData->mon_ev_speed = 0; + sDebugMonData->mon_ev_satk = 0; + sDebugMonData->mon_ev_sdef = 0; + + PlaySE(SE_FAILURE); + StringCopy(gStringVar2, gText_DigitIndicator[gTasks[taskId].tDigit]); + ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].tInput, STR_CONV_MODE_LEADING_ZEROS, 3); + StringCopyPadded(gStringVar3, gStringVar3, CHAR_SPACE, 15); + StringExpandPlaceholders(gStringVar4, sDebugText_EV_HP); + AddTextPrinterParameterized(gTasks[taskId].tSubWindowId, DEBUG_MENU_FONT, gStringVar4, 1, 1, 0, NULL); + + gTasks[taskId].func = DebugAction_Give_Pokemon_SelectEVs; + } + else + { + StringCopy(gStringVar2, gText_DigitIndicator[gTasks[taskId].tDigit]); + StringCopy(gStringVar1, gMoveNames[gTasks[taskId].tInput]); + StringCopyPadded(gStringVar1, gStringVar1, CHAR_SPACE, 15); + ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].tInput, STR_CONV_MODE_LEADING_ZEROS, 3); + StringExpandPlaceholders(gStringVar4, sDebugText_PokemonMove_0); + AddTextPrinterParameterized(gTasks[taskId].tSubWindowId, DEBUG_MENU_FONT, gStringVar4, 1, 1, 0, NULL); + + gTasks[taskId].func = DebugAction_Give_Pokemon_Move; + } } } else if (JOY_NEW(B_BUTTON)) @@ -3605,6 +3783,8 @@ static void DebugAction_Give_Pokemon_ComplexCreateMon(u8 taskId) //https://githu u16 moves[4]; u8 IVs[6]; u8 iv_val; + u8 EVs[6]; + u8 ev_val; u16 species = sDebugMonData->species; u8 level = sDebugMonData->level; bool8 isShiny = sDebugMonData->isShiny; @@ -3620,6 +3800,12 @@ static void DebugAction_Give_Pokemon_ComplexCreateMon(u8 taskId) //https://githu IVs[3] = sDebugMonData->mon_iv_speed; IVs[4] = sDebugMonData->mon_iv_satk; IVs[5] = sDebugMonData->mon_iv_sdef; + EVs[0] = sDebugMonData->mon_ev_hp; + EVs[1] = sDebugMonData->mon_ev_atk; + EVs[2] = sDebugMonData->mon_ev_def; + EVs[3] = sDebugMonData->mon_ev_speed; + EVs[4] = sDebugMonData->mon_ev_satk; + EVs[5] = sDebugMonData->mon_ev_sdef; //Nature if (nature == NUM_NATURES || nature == 0xFF) @@ -3636,7 +3822,14 @@ static void DebugAction_Give_Pokemon_ComplexCreateMon(u8 taskId) //https://githu if (iv_val != 32 && iv_val != 0xFF) SetMonData(&mon, MON_DATA_HP_IV + i, &iv_val); } - CalculateMonStats(&mon); + + //EVs + for (i = 0; i < NUM_STATS; i++) + { + ev_val = EVs[i]; + if (ev_val) + SetMonData(&mon, MON_DATA_HP_EV + i, &ev_val); + } //Moves for (i = 0; i < MAX_MON_MOVES; i++) @@ -3657,6 +3850,9 @@ static void DebugAction_Give_Pokemon_ComplexCreateMon(u8 taskId) //https://githu SetMonData(&mon, MON_DATA_ABILITY_NUM, &abilityNum); + //Update mon stats before giving it to the player + CalculateMonStats(&mon); + // give player the mon SetMonData(&mon, MON_DATA_OT_NAME, gSaveBlock2Ptr->playerName); SetMonData(&mon, MON_DATA_OT_GENDER, &gSaveBlock2Ptr->playerGender); From e9e46d8272b19f86496a731b619d4784a11a5495 Mon Sep 17 00:00:00 2001 From: ravepossum <145081120+ravepossum@users.noreply.github.com> Date: Wed, 3 Jan 2024 17:27:10 -0500 Subject: [PATCH 61/82] Fix debug menu flags not redrawing correctly after PR 3796 (#3916) * Fix debug menu flags not redrawing correctly after PR 3796 * Update src/debug.c Co-authored-by: Bassoonian --------- Co-authored-by: ravepossum Co-authored-by: Bassoonian --- src/debug.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/debug.c b/src/debug.c index a298e31b0e..103f3fd2ea 100644 --- a/src/debug.c +++ b/src/debug.c @@ -1437,8 +1437,16 @@ static void DebugTask_HandleMenuInput_FlagsVars(u8 taskId) PlaySE(SE_SELECT); if ((func = sDebugMenu_Actions_Flags[input]) != NULL) { - Debug_RedrawListMenu(taskId); - func(taskId); + if (input == DEBUG_FLAGVAR_MENU_ITEM_FLAGS || input == DEBUG_FLAGVAR_MENU_ITEM_VARS) + { + Debug_RedrawListMenu(taskId); + func(taskId); + } + else + { + func(taskId); + Debug_RedrawListMenu(taskId); + } // Remove TRUE/FALSE window for functions that haven't been assigned flags if (gTasks[taskId].tInput == 0xFF) From 6cb89ef3822ade90b1ed523d98d1fdbb0d5edf22 Mon Sep 17 00:00:00 2001 From: Frank DeBlasio <35279583+fdeblasio@users.noreply.github.com> Date: Wed, 3 Jan 2024 17:49:11 -0500 Subject: [PATCH 62/82] Update debug menu text (#3919) * Updated capitalization and abbrevations in debug menu * Updated spacing in debug.c --- src/debug.c | 130 ++++++++++++++++++++++++++-------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/src/debug.c b/src/debug.c index 4079bb58b4..ad6c0e8137 100644 --- a/src/debug.c +++ b/src/debug.c @@ -221,7 +221,7 @@ enum SoundMenu // Constants #define DEBUG_MENU_FONT FONT_NORMAL -#define DEBUG_MENU_WIDTH_MAIN 16 +#define DEBUG_MENU_WIDTH_MAIN 17 #define DEBUG_MENU_HEIGHT_MAIN 9 #define DEBUG_MENU_WIDTH_EXTRA 10 @@ -456,24 +456,24 @@ static const u8 sDebugText_Dashes[] = _("---"); static const u8 sDebugText_Empty[] = _(""); static const u8 sDebugText_Continue[] = _("Continue…{CLEAR_TO 110}{RIGHT_ARROW}"); // Main Menu -static const u8 sDebugText_Utilities[] = _("Utilities…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_PartyBoxes[] = _("Party/Boxes…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Scripts[] = _("Scripts…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_FlagsVars[] = _("Flags & Vars…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Battle[] = _("Battle Test{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Give[] = _("Give X…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Fill[] = _("Fill PC/Pockets…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Sound[] = _("Sound…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Cancel[] = _("Cancel"); +static const u8 sDebugText_Utilities[] = _("Utilities…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_PartyBoxes[] = _("Party/Boxes…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Scripts[] = _("Scripts…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_FlagsVars[] = _("Flags & Vars…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Battle[] = _("Battle Test{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Give[] = _("Give X…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Fill[] = _("Fill PC/Pockets…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Sound[] = _("Sound…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Cancel[] = _("Cancel"); // Script menu -static const u8 sDebugText_Util_Script_1[] = _("Script 1"); -static const u8 sDebugText_Util_Script_2[] = _("Script 2"); -static const u8 sDebugText_Util_Script_3[] = _("Script 3"); -static const u8 sDebugText_Util_Script_4[] = _("Script 4"); -static const u8 sDebugText_Util_Script_5[] = _("Script 5"); -static const u8 sDebugText_Util_Script_6[] = _("Script 6"); -static const u8 sDebugText_Util_Script_7[] = _("Script 7"); -static const u8 sDebugText_Util_Script_8[] = _("Script 8"); +static const u8 sDebugText_Util_Script_1[] = _("Script 1"); +static const u8 sDebugText_Util_Script_2[] = _("Script 2"); +static const u8 sDebugText_Util_Script_3[] = _("Script 3"); +static const u8 sDebugText_Util_Script_4[] = _("Script 4"); +static const u8 sDebugText_Util_Script_5[] = _("Script 5"); +static const u8 sDebugText_Util_Script_6[] = _("Script 6"); +static const u8 sDebugText_Util_Script_7[] = _("Script 7"); +static const u8 sDebugText_Util_Script_8[] = _("Script 8"); // Util Menu static const u8 sDebugText_Util_FlyToMap[] = _("Fly to map…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Util_WarpToMap[] = _("Warp to map warp…{CLEAR_TO 110}{RIGHT_ARROW}"); @@ -481,48 +481,48 @@ static const u8 sDebugText_Util_WarpToMap_SelectMapGroup[] = _("Group: {STR_VAR_ static const u8 sDebugText_Util_WarpToMap_SelectMap[] = _("Map: {STR_VAR_1}{CLEAR_TO 90}\nMapSec:{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}\n{STR_VAR_3}{CLEAR_TO 90}"); static const u8 sDebugText_Util_WarpToMap_SelectWarp[] = _("Warp:{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_3}{CLEAR_TO 90}"); static const u8 sDebugText_Util_WarpToMap_SelMax[] = _("{STR_VAR_1} / {STR_VAR_2}"); -static const u8 sDebugText_Util_SaveBlockSpace[] = _("SaveBlock Space…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Util_ROMSpace[] = _("ROM Space…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Util_SaveBlockSpace[] = _("Save Block space…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Util_ROMSpace[] = _("ROM space…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Util_Weather[] = _("Set weather…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Util_Weather_ID[] = _("Weather Id: {STR_VAR_3}\n{STR_VAR_1}\n{STR_VAR_2}"); -static const u8 sDebugText_Util_CheckWallClock[] = _("Check Wall Clock…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Util_SetWallClock[] = _("Set Wall Clock…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Util_WatchCredits[] = _("Watch Credits…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Util_Weather_ID[] = _("Weather ID: {STR_VAR_3}\n{STR_VAR_1}\n{STR_VAR_2}"); +static const u8 sDebugText_Util_CheckWallClock[] = _("Check wall clock…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Util_SetWallClock[] = _("Set wall clock…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Util_WatchCredits[] = _("Watch credits…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Util_Player_Name[] = _("Player name"); -static const u8 sDebugText_Util_Player_Gender[] = _("Toggle Gender"); -static const u8 sDebugText_Util_Player_Id[] = _("New Trainer Id"); -static const u8 sDebugText_Util_CheatStart[] = _("CHEAT Start"); +static const u8 sDebugText_Util_Player_Gender[] = _("Toggle gender"); +static const u8 sDebugText_Util_Player_Id[] = _("New Trainer ID"); +static const u8 sDebugText_Util_CheatStart[] = _("Cheat start"); static const u8 sDebugText_Util_ExpansionVersion[] = _("Expansion Version"); // Party/Boxes Menu static const u8 sDebugText_PartyBoxes_AccessPC[] = _("Access PC"); static const u8 sDebugText_PartyBoxes_MoveReminder[] = _("Move Reminder"); static const u8 sDebugText_PartyBoxes_HatchAnEgg[] = _("Hatch an Egg"); -static const u8 sDebugText_PartyBoxes_HealParty[] = _("Heal Party"); +static const u8 sDebugText_PartyBoxes_HealParty[] = _("Heal party"); static const u8 sDebugText_PartyBoxes_PoisonParty[] = _("Poison party"); static const u8 sDebugText_PartyBoxes_ClearBoxes[] = _("Clear Storage Boxes"); // Flags/Vars Menu -static const u8 sDebugText_FlagsVars_Flags[] = _("Set Flag XYZ…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_FlagsVars_Flag[] = _("Flag: {STR_VAR_1}{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}\n{STR_VAR_3}"); -static const u8 sDebugText_FlagsVars_FlagHex[] = _("{STR_VAR_1}{CLEAR_TO 90}\n0x{STR_VAR_2}{CLEAR_TO 90}"); -static const u8 sDebugText_FlagsVars_Vars[] = _("Set Var XYZ…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_FlagsVars_VariableHex[] = _("{STR_VAR_1}{CLEAR_TO 90}\n0x{STR_VAR_2}{CLEAR_TO 90}"); -static const u8 sDebugText_FlagsVars_Variable[] = _("Var: {STR_VAR_1}{CLEAR_TO 90}\nVal: {STR_VAR_3}{CLEAR_TO 90}\n{STR_VAR_2}"); -static const u8 sDebugText_FlagsVars_VariableValueSet[] = _("Var: {STR_VAR_1}{CLEAR_TO 90}\nVal: {STR_VAR_3}{CLEAR_TO 90}\n{STR_VAR_2}"); -static const u8 sDebugText_FlagsVars_PokedexFlags_All[] = _("Pokédex Flags All"); -static const u8 sDebugText_FlagsVars_PokedexFlags_Reset[] = _("Pokédex Flags Reset"); -static const u8 sDebugText_FlagsVars_SwitchDex[] = _("Toggle {STR_VAR_1}Pokédex"); -static const u8 sDebugText_FlagsVars_SwitchNationalDex[] = _("Toggle {STR_VAR_1}NatDex"); -static const u8 sDebugText_FlagsVars_SwitchPokeNav[] = _("Toggle {STR_VAR_1}PokéNav"); -static const u8 sDebugText_FlagsVars_SwitchMatchCall[] = _("Toggle {STR_VAR_1}Match Call"); -static const u8 sDebugText_FlagsVars_RunningShoes[] = _("Toggle {STR_VAR_1}Running Shoes"); -static const u8 sDebugText_FlagsVars_ToggleFlyFlags[] = _("Toggle {STR_VAR_1}Fly Flags"); -static const u8 sDebugText_FlagsVars_ToggleAllBadges[] = _("Toggle {STR_VAR_1}All badges"); -static const u8 sDebugText_FlagsVars_ToggleFrontierPass[] = _("Toggle {STR_VAR_1}Frontier Pass"); -static const u8 sDebugText_FlagsVars_SwitchCollision[] = _("Toggle {STR_VAR_1}Collision OFF"); -static const u8 sDebugText_FlagsVars_SwitchEncounter[] = _("Toggle {STR_VAR_1}Encounter OFF"); -static const u8 sDebugText_FlagsVars_SwitchTrainerSee[] = _("Toggle {STR_VAR_1}TrainerSee OFF"); -static const u8 sDebugText_FlagsVars_SwitchBagUse[] = _("Toggle {STR_VAR_1}BagUse OFF"); -static const u8 sDebugText_FlagsVars_SwitchCatching[] = _("Toggle {STR_VAR_1}Catching OFF"); +static const u8 sDebugText_FlagsVars_Flags[] = _("Set Flag XYZ…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_FlagsVars_Flag[] = _("Flag: {STR_VAR_1}{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}\n{STR_VAR_3}"); +static const u8 sDebugText_FlagsVars_FlagHex[] = _("{STR_VAR_1}{CLEAR_TO 90}\n0x{STR_VAR_2}{CLEAR_TO 90}"); +static const u8 sDebugText_FlagsVars_Vars[] = _("Set Var XYZ…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_FlagsVars_VariableHex[] = _("{STR_VAR_1}{CLEAR_TO 90}\n0x{STR_VAR_2}{CLEAR_TO 90}"); +static const u8 sDebugText_FlagsVars_Variable[] = _("Var: {STR_VAR_1}{CLEAR_TO 90}\nVal: {STR_VAR_3}{CLEAR_TO 90}\n{STR_VAR_2}"); +static const u8 sDebugText_FlagsVars_VariableValueSet[] = _("Var: {STR_VAR_1}{CLEAR_TO 90}\nVal: {STR_VAR_3}{CLEAR_TO 90}\n{STR_VAR_2}"); +static const u8 sDebugText_FlagsVars_PokedexFlags_All[] = _("Pokédex Flags All"); +static const u8 sDebugText_FlagsVars_PokedexFlags_Reset[] = _("Pokédex Flags Reset"); +static const u8 sDebugText_FlagsVars_SwitchDex[] = _("Toggle {STR_VAR_1}Pokédex"); +static const u8 sDebugText_FlagsVars_SwitchNationalDex[] = _("Toggle {STR_VAR_1}National Dex"); +static const u8 sDebugText_FlagsVars_SwitchPokeNav[] = _("Toggle {STR_VAR_1}PokéNav"); +static const u8 sDebugText_FlagsVars_SwitchMatchCall[] = _("Toggle {STR_VAR_1}Match Call"); +static const u8 sDebugText_FlagsVars_RunningShoes[] = _("Toggle {STR_VAR_1}Running Shoes"); +static const u8 sDebugText_FlagsVars_ToggleFlyFlags[] = _("Toggle {STR_VAR_1}Fly Flags"); +static const u8 sDebugText_FlagsVars_ToggleAllBadges[] = _("Toggle {STR_VAR_1}All badges"); +static const u8 sDebugText_FlagsVars_ToggleFrontierPass[] = _("Toggle {STR_VAR_1}Frontier Pass"); +static const u8 sDebugText_FlagsVars_SwitchCollision[] = _("Toggle {STR_VAR_1}Collision OFF"); +static const u8 sDebugText_FlagsVars_SwitchEncounter[] = _("Toggle {STR_VAR_1}Encounter OFF"); +static const u8 sDebugText_FlagsVars_SwitchTrainerSee[] = _("Toggle {STR_VAR_1}Trainer See OFF"); +static const u8 sDebugText_FlagsVars_SwitchBagUse[] = _("Toggle {STR_VAR_1}Bag Use OFF"); +static const u8 sDebugText_FlagsVars_SwitchCatching[] = _("Toggle {STR_VAR_1}Catching OFF"); // Battle static const u8 sDebugText_Battle_0_Wild[] = _("Wild…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Battle_0_WildDouble[] = _("Wild Double…{CLEAR_TO 110}{RIGHT_ARROW}"); @@ -535,10 +535,10 @@ static const u8 sDebugText_Battle_1_AIFlag_02[] = _("{STR_VAR_1}Check viabilit static const u8 sDebugText_Battle_1_AIFlag_03[] = _("{STR_VAR_1}Setup first turn"); static const u8 sDebugText_Battle_1_AIFlag_04[] = _("{STR_VAR_1}Risky"); static const u8 sDebugText_Battle_1_AIFlag_05[] = _("{STR_VAR_1}Prefer strongest move"); -static const u8 sDebugText_Battle_1_AIFlag_06[] = _("{STR_VAR_1}Prefer baton pass"); +static const u8 sDebugText_Battle_1_AIFlag_06[] = _("{STR_VAR_1}Prefer Baton Pass"); static const u8 sDebugText_Battle_1_AIFlag_07[] = _("{STR_VAR_1}Double battle"); -static const u8 sDebugText_Battle_1_AIFlag_08[] = _("{STR_VAR_1}Hp aware"); -static const u8 sDebugText_Battle_1_AIFlag_09[] = _("{STR_VAR_1}Negate unaware"); +static const u8 sDebugText_Battle_1_AIFlag_08[] = _("{STR_VAR_1}HP aware"); +static const u8 sDebugText_Battle_1_AIFlag_09[] = _("{STR_VAR_1}Negate Unaware"); static const u8 sDebugText_Battle_1_AIFlag_10[] = _("{STR_VAR_1}Will suicide"); static const u8 sDebugText_Battle_1_AIFlag_11[] = _("{STR_VAR_1}Help partner"); static const u8 sDebugText_Battle_1_AIFlag_12[] = _("{STR_VAR_1}Prefer status moves"); @@ -560,15 +560,15 @@ static const u8 sDebugText_Battle_2_Terrain_9[] = _("Plain…{CLEAR_TO 110}{RI // Give Menu static const u8 sDebugText_Give_GiveItem[] = _("Give item XYZ…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_ItemQuantity[] = _("Quantity:{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n\n{STR_VAR_2}"); -static const u8 sDebugText_ItemID[] = _("Item Id: {STR_VAR_3}\n{STR_VAR_1}{CLEAR_TO 90}\n\n{STR_VAR_2}"); +static const u8 sDebugText_ItemID[] = _("Item ID: {STR_VAR_3}\n{STR_VAR_1}{CLEAR_TO 90}\n\n{STR_VAR_2}"); static const u8 sDebugText_Give_AllTMs[] = _("Give all TMs"); -static const u8 sDebugText_Give_GivePokemonSimple[] = _("Pkmn (Basic){CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Give_GivePokemonComplex[] = _("Pkmn (Complex){CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Give_GivePokemonSimple[] = _("Pokémon (Basic){CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Give_GivePokemonComplex[] = _("Pokémon (Complex){CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_PokemonID[] = _("Species: {STR_VAR_3}\n{STR_VAR_1}{CLEAR_TO 90}\n\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_PokemonLevel[] = _("Level:{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_PokemonShiny[] = _("Shiny:{CLEAR_TO 90}\n {STR_VAR_2}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{CLEAR_TO 90}"); -static const u8 sDebugText_PokemonNature[] = _("NatureId: {STR_VAR_3}{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); -static const u8 sDebugText_PokemonAbility[] = _("AbilityNum: {STR_VAR_3}{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); +static const u8 sDebugText_PokemonNature[] = _("Nature ID: {STR_VAR_3}{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); +static const u8 sDebugText_PokemonAbility[] = _("Ability Num: {STR_VAR_3}{CLEAR_TO 90}\n{STR_VAR_1}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_PokemonIVs[] = _("All IVs:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_PokemonEVs[] = _("All EVs:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); static const u8 sDebugText_IV_HP[] = _("IV HP:{CLEAR_TO 90}\n {STR_VAR_3}{CLEAR_TO 90}\n{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}"); @@ -592,19 +592,19 @@ static const u8 sDebugText_Give_MaxCoins[] = _("Max Coins"); static const u8 sDebugText_Give_BattlePoints[] = _("Max Battle Points"); static const u8 sDebugText_Give_DaycareEgg[] = _("Daycare Egg"); // Fill Menu -static const u8 sDebugText_Fill_Pc_Fast[] = _("Fill PCBoxes Fast"); -static const u8 sDebugText_Fill_Pc_Slow[] = _("Fill PCBoxes Slow (LAG!)"); -static const u8 sDebugText_Fill_Pc_Items[] = _("Fill PCItems"); +static const u8 sDebugText_Fill_Pc_Fast[] = _("Fill PC Boxes Fast"); +static const u8 sDebugText_Fill_Pc_Slow[] = _("Fill PC Boxes Slow (LAG!)"); +static const u8 sDebugText_Fill_Pc_Items[] = _("Fill PC Items"); static const u8 sDebugText_Fill_PocketItems[] = _("Fill Pocket Items"); -static const u8 sDebugText_Fill_PocketPokeBalls[] = _("Fill Pocket PokeBalls"); +static const u8 sDebugText_Fill_PocketPokeBalls[] = _("Fill Pocket Poké Balls"); static const u8 sDebugText_Fill_PocketTMHM[] = _("Fill Pocket TMHM"); static const u8 sDebugText_Fill_PocketBerries[] = _("Fill Pocket Berries"); -static const u8 sDebugText_Fill_PocketKeyItems[] = _("Fill Pocket KeyItems"); +static const u8 sDebugText_Fill_PocketKeyItems[] = _("Fill Pocket Key Items"); // Sound Menu static const u8 sDebugText_Sound_SFX[] = _("SFX…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Sound_SFX_ID[] = _("SFX Id: {STR_VAR_3} {START_BUTTON} Stop\n{STR_VAR_1} \n{STR_VAR_2}"); +static const u8 sDebugText_Sound_SFX_ID[] = _("SFX ID: {STR_VAR_3} {START_BUTTON} Stop\n{STR_VAR_1} \n{STR_VAR_2}"); static const u8 sDebugText_Sound_Music[] = _("Music…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Sound_Music_ID[] = _("Music Id: {STR_VAR_3} {START_BUTTON} Stop\n{STR_VAR_1} \n{STR_VAR_2}"); +static const u8 sDebugText_Sound_Music_ID[] = _("Music ID: {STR_VAR_3} {START_BUTTON} Stop\n{STR_VAR_1} \n{STR_VAR_2}"); static const u8 sDebugText_Digit_1[] = _("{LEFT_ARROW}+1{RIGHT_ARROW} "); static const u8 sDebugText_Digit_10[] = _("{LEFT_ARROW}+10{RIGHT_ARROW} "); From 4d5c572d0c24f80d1901f9a0e4f4ffb5b4c0172e Mon Sep 17 00:00:00 2001 From: Frank DeBlasio <35279583+fdeblasio@users.noreply.github.com> Date: Thu, 4 Jan 2024 07:30:42 -0500 Subject: [PATCH 63/82] Refactor trainer classes (#3875) * Created TrainerClass struct * Added money multiplier to TrainerClass struct * Added Poke Balls to struct * Condensed gTrainerClasses * Simplified trainer Poke Balls * Moved trainer classes into battle_main.c * Removed complicated ball macro --------- Co-authored-by: Bassoonian Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- include/battle_main.h | 7 -- include/data.h | 10 +- src/battle_dome.c | 4 +- src/battle_main.c | 162 ++++++++++++++-------------- src/battle_message.c | 18 ++-- src/battle_script_commands.c | 15 +-- src/data.c | 1 - src/data/text/trainer_class_names.h | 68 ------------ src/pokemon.c | 6 +- src/pokenav_match_call_data.c | 2 +- src/pokenav_match_call_list.c | 2 +- src/union_room.c | 2 +- 12 files changed, 109 insertions(+), 188 deletions(-) delete mode 100644 src/data/text/trainer_class_names.h diff --git a/include/battle_main.h b/include/battle_main.h index 2c5d887018..c1394db60c 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -4,12 +4,6 @@ #include "pokemon.h" #include "data.h" -struct TrainerMoney -{ - u8 classId; - u8 value; -}; - // For displaying a multi battle partner's Pokémon in the party menu struct MultiPartnerMenuPokemon { @@ -83,7 +77,6 @@ extern const struct SpriteTemplate gUnusedBattleInitSprite; extern const struct OamData gOamData_BattleSpriteOpponentSide; extern const struct OamData gOamData_BattleSpritePlayerSide; extern const u8 gTypeNames[NUMBER_OF_MON_TYPES][TYPE_NAME_LENGTH + 1]; -extern const struct TrainerMoney gTrainerMoneyTable[]; extern const u8 gStatusConditionString_PoisonJpn[8]; extern const u8 gStatusConditionString_SleepJpn[8]; diff --git a/include/data.h b/include/data.h index 6351b6eb16..cce5f77503 100644 --- a/include/data.h +++ b/include/data.h @@ -2,6 +2,7 @@ #define GUARD_DATA_H #include "constants/moves.h" +#include "constants/trainers.h" #define SPECIES_SHINY_TAG 5000 @@ -86,6 +87,13 @@ struct Trainer /*0x1F*/ u8 partySize; }; +struct TrainerClass +{ + u8 name[13]; + u8 money; + u16 ball; +}; + #define TRAINER_ENCOUNTER_MUSIC(trainer)((gTrainers[trainer].encounterMusic_gender & 0x7F)) extern const u16 gMinigameDigits_Pal[]; @@ -117,7 +125,7 @@ extern const struct TrainerBacksprite gTrainerBacksprites[]; extern const struct Trainer gTrainers[]; extern const struct Trainer gBattlePartners[]; -extern const u8 gTrainerClassNames[][13]; +extern const struct TrainerClass gTrainerClasses[TRAINER_CLASS_COUNT]; extern const u8 gMoveNames[MOVES_COUNT_DYNAMAX][MOVE_NAME_LENGTH + 1]; extern const u8 *const gZMoveNames[]; extern const u8 *const gMaxMoveNames[]; diff --git a/src/battle_dome.c b/src/battle_dome.c index 4819f6367d..e6fe9a4085 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -4263,8 +4263,8 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId) else j = GetFrontierOpponentClass(trainerId); - for (;gTrainerClassNames[j][i] != EOS; i++) - gStringVar1[i] = gTrainerClassNames[j][i]; + for (;gTrainerClasses[j].name[i] != EOS; i++) + gStringVar1[i] = gTrainerClasses[j].name[i]; gStringVar1[i] = CHAR_SPACE; gStringVar1[i + 1] = EOS; diff --git a/src/battle_main.c b/src/battle_main.c index 951766adcd..dd30137850 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -322,92 +322,86 @@ const u8 gTypeNames[NUMBER_OF_MON_TYPES][TYPE_NAME_LENGTH + 1] = [TYPE_FAIRY] = _("Fairy"), }; -// This is a factor in how much money you get for beating a trainer. -const struct TrainerMoney gTrainerMoneyTable[] = -{ - {TRAINER_CLASS_TEAM_AQUA, 5}, - {TRAINER_CLASS_AQUA_ADMIN, 10}, - {TRAINER_CLASS_AQUA_LEADER, 20}, - {TRAINER_CLASS_AROMA_LADY, 10}, - {TRAINER_CLASS_RUIN_MANIAC, 15}, - {TRAINER_CLASS_INTERVIEWER, 12}, - {TRAINER_CLASS_TUBER_F, 1}, - {TRAINER_CLASS_TUBER_M, 1}, - {TRAINER_CLASS_SIS_AND_BRO, 3}, - {TRAINER_CLASS_COOLTRAINER, 12}, - {TRAINER_CLASS_HEX_MANIAC, 6}, - {TRAINER_CLASS_LADY, 50}, - {TRAINER_CLASS_BEAUTY, 20}, - {TRAINER_CLASS_RICH_BOY, 50}, - {TRAINER_CLASS_POKEMANIAC, 15}, - {TRAINER_CLASS_SWIMMER_M, 2}, - {TRAINER_CLASS_BLACK_BELT, 8}, - {TRAINER_CLASS_GUITARIST, 8}, - {TRAINER_CLASS_KINDLER, 8}, - {TRAINER_CLASS_CAMPER, 4}, - {TRAINER_CLASS_OLD_COUPLE, 10}, - {TRAINER_CLASS_BUG_MANIAC, 15}, - {TRAINER_CLASS_PSYCHIC, 6}, - {TRAINER_CLASS_GENTLEMAN, 20}, - {TRAINER_CLASS_ELITE_FOUR, 25}, - {TRAINER_CLASS_LEADER, 25}, - {TRAINER_CLASS_SCHOOL_KID, 5}, - {TRAINER_CLASS_SR_AND_JR, 4}, - {TRAINER_CLASS_POKEFAN, 20}, - {TRAINER_CLASS_EXPERT, 10}, - {TRAINER_CLASS_YOUNGSTER, 4}, - {TRAINER_CLASS_CHAMPION, 50}, - {TRAINER_CLASS_FISHERMAN, 10}, - {TRAINER_CLASS_TRIATHLETE, 10}, - {TRAINER_CLASS_DRAGON_TAMER, 12}, - {TRAINER_CLASS_BIRD_KEEPER, 8}, - {TRAINER_CLASS_NINJA_BOY, 3}, - {TRAINER_CLASS_BATTLE_GIRL, 6}, - {TRAINER_CLASS_PARASOL_LADY, 10}, - {TRAINER_CLASS_SWIMMER_F, 2}, - {TRAINER_CLASS_PICNICKER, 4}, - {TRAINER_CLASS_TWINS, 3}, - {TRAINER_CLASS_SAILOR, 8}, - {TRAINER_CLASS_COLLECTOR, 15}, - {TRAINER_CLASS_RIVAL, 15}, - {TRAINER_CLASS_PKMN_BREEDER, 10}, - {TRAINER_CLASS_PKMN_RANGER, 12}, - {TRAINER_CLASS_TEAM_MAGMA, 5}, - {TRAINER_CLASS_MAGMA_ADMIN, 10}, - {TRAINER_CLASS_MAGMA_LEADER, 20}, - {TRAINER_CLASS_LASS, 4}, - {TRAINER_CLASS_BUG_CATCHER, 4}, - {TRAINER_CLASS_HIKER, 10}, - {TRAINER_CLASS_YOUNG_COUPLE, 8}, - {TRAINER_CLASS_WINSTRATE, 10}, - {0xFF, 5}, // Any trainer class not listed above uses this -}; +#define DEFAULT_MONEY 5 +#define DEFAULT_BALL ITEM_POKE_BALL -#if B_TRAINER_CLASS_POKE_BALLS >= GEN_7 -static const u16 sTrainerBallTable[TRAINER_CLASS_COUNT] = +#define TRAINER_CLASS(trainerClass, trainerName, trainerMoney, trainerBall) \ + [TRAINER_CLASS_##trainerClass] = \ + { \ + .name = _(trainerName), \ + .money = trainerMoney, \ + .ball = trainerBall, \ + } + +const struct TrainerClass gTrainerClasses[TRAINER_CLASS_COUNT] = { -#if B_TRAINER_CLASS_POKE_BALLS == GEN_7 - [TRAINER_CLASS_PKMN_BREEDER] = ITEM_FRIEND_BALL, -#elif B_TRAINER_CLASS_POKE_BALLS == GEN_8 - [TRAINER_CLASS_PKMN_BREEDER] = ITEM_HEAL_BALL, -#endif - [TRAINER_CLASS_COOLTRAINER] = ITEM_ULTRA_BALL, - [TRAINER_CLASS_COLLECTOR] = ITEM_PREMIER_BALL, - [TRAINER_CLASS_SWIMMER_M] = ITEM_DIVE_BALL, - [TRAINER_CLASS_BLACK_BELT] = ITEM_ULTRA_BALL, - [TRAINER_CLASS_AQUA_LEADER] = ITEM_MASTER_BALL, - [TRAINER_CLASS_GENTLEMAN] = ITEM_LUXURY_BALL, - [TRAINER_CLASS_ELITE_FOUR] = ITEM_ULTRA_BALL, -#if B_TRAINER_CLASS_POKE_BALLS == GEN_7 - [TRAINER_CLASS_FISHERMAN] = ITEM_LURE_BALL, -#elif B_TRAINER_CLASS_POKE_BALLS == GEN_8 - [TRAINER_CLASS_FISHERMAN] = ITEM_DIVE_BALL, -#endif - [TRAINER_CLASS_SWIMMER_F] = ITEM_DIVE_BALL, - [TRAINER_CLASS_COOLTRAINER_2] = ITEM_ULTRA_BALL, - [TRAINER_CLASS_MAGMA_LEADER] = ITEM_MASTER_BALL, + TRAINER_CLASS(PKMN_TRAINER_1, "{PKMN} TRAINER", DEFAULT_MONEY, DEFAULT_BALL), + TRAINER_CLASS(PKMN_TRAINER_2, "{PKMN} TRAINER", DEFAULT_MONEY, DEFAULT_BALL), + TRAINER_CLASS(HIKER, "HIKER", 10, DEFAULT_BALL), + TRAINER_CLASS(TEAM_AQUA, "TEAM AQUA", 5, DEFAULT_BALL), + TRAINER_CLASS(PKMN_BREEDER, "{PKMN} BREEDER", 10, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? ITEM_HEAL_BALL : ITEM_FRIEND_BALL), + TRAINER_CLASS(COOLTRAINER, "COOLTRAINER", 12, ITEM_ULTRA_BALL), + TRAINER_CLASS(BIRD_KEEPER, "BIRD KEEPER", 8, DEFAULT_BALL), + TRAINER_CLASS(COLLECTOR, "COLLECTOR", 15, ITEM_PREMIER_BALL), + TRAINER_CLASS(SWIMMER_M, "SWIMMER♂", 2, ITEM_DIVE_BALL), + TRAINER_CLASS(TEAM_MAGMA, "TEAM MAGMA", 5, DEFAULT_BALL), + TRAINER_CLASS(EXPERT, "EXPERT", 10, DEFAULT_BALL), + TRAINER_CLASS(AQUA_ADMIN, "AQUA ADMIN", 10, DEFAULT_BALL), + TRAINER_CLASS(BLACK_BELT, "BLACK BELT", 8, ITEM_ULTRA_BALL), + TRAINER_CLASS(AQUA_LEADER, "AQUA LEADER", 20, ITEM_MASTER_BALL), + TRAINER_CLASS(HEX_MANIAC, "HEX MANIAC", 6, DEFAULT_BALL), + TRAINER_CLASS(AROMA_LADY, "AROMA LADY", 10, DEFAULT_BALL), + TRAINER_CLASS(RUIN_MANIAC, "RUIN MANIAC", 15, DEFAULT_BALL), + TRAINER_CLASS(INTERVIEWER, "INTERVIEWER", 12, DEFAULT_BALL), + TRAINER_CLASS(TUBER_F, "TUBER", 1, DEFAULT_BALL), + TRAINER_CLASS(TUBER_M, "TUBER", 1, DEFAULT_BALL), + TRAINER_CLASS(LADY, "LADY", 50, DEFAULT_BALL), + TRAINER_CLASS(BEAUTY, "BEAUTY", 20, DEFAULT_BALL), + TRAINER_CLASS(RICH_BOY, "RICH BOY", 50, DEFAULT_BALL), + TRAINER_CLASS(POKEMANIAC, "POKéMANIAC", 15, DEFAULT_BALL), + TRAINER_CLASS(GUITARIST, "GUITARIST", 8, DEFAULT_BALL), + TRAINER_CLASS(KINDLER, "KINDLER", 8, DEFAULT_BALL), + TRAINER_CLASS(CAMPER, "CAMPER", 4, DEFAULT_BALL), + TRAINER_CLASS(PICNICKER, "PICNICKER", 4, DEFAULT_BALL), + TRAINER_CLASS(BUG_MANIAC, "BUG MANIAC", 15, DEFAULT_BALL), + TRAINER_CLASS(PSYCHIC, "PSYCHIC", 6, DEFAULT_BALL), + TRAINER_CLASS(GENTLEMAN, "GENTLEMAN", 20, ITEM_LUXURY_BALL), + TRAINER_CLASS(ELITE_FOUR, "ELITE FOUR", 25, ITEM_ULTRA_BALL), + TRAINER_CLASS(LEADER, "LEADER", 25, DEFAULT_BALL), + TRAINER_CLASS(SCHOOL_KID, "SCHOOL KID", 5, DEFAULT_BALL), + TRAINER_CLASS(SR_AND_JR, "SR. AND JR.", 4, DEFAULT_BALL), + TRAINER_CLASS(WINSTRATE, "WINSTRATE", 10, DEFAULT_BALL), + TRAINER_CLASS(POKEFAN, "POKéFAN", 20, DEFAULT_BALL), + TRAINER_CLASS(YOUNGSTER, "YOUNGSTER", 4, DEFAULT_BALL), + TRAINER_CLASS(CHAMPION, "CHAMPION", 50, DEFAULT_BALL), + TRAINER_CLASS(FISHERMAN, "FISHERMAN", 10, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? ITEM_DIVE_BALL : ITEM_LURE_BALL), + TRAINER_CLASS(TRIATHLETE, "TRIATHLETE", 10, DEFAULT_BALL), + TRAINER_CLASS(DRAGON_TAMER, "DRAGON TAMER", 12, DEFAULT_BALL), + TRAINER_CLASS(NINJA_BOY, "NINJA BOY", 3, DEFAULT_BALL), + TRAINER_CLASS(BATTLE_GIRL, "BATTLE GIRL", 6, DEFAULT_BALL), + TRAINER_CLASS(PARASOL_LADY, "PARASOL LADY", 10, DEFAULT_BALL), + TRAINER_CLASS(SWIMMER_F, "SWIMMER♀", 2, ITEM_DIVE_BALL), + TRAINER_CLASS(TWINS, "TWINS", 3, DEFAULT_BALL), + TRAINER_CLASS(SAILOR, "SAILOR", 8, DEFAULT_BALL), + TRAINER_CLASS(COOLTRAINER_2, "COOLTRAINER", DEFAULT_MONEY, ITEM_ULTRA_BALL), + TRAINER_CLASS(MAGMA_ADMIN, "MAGMA ADMIN", 10, DEFAULT_BALL), + TRAINER_CLASS(RIVAL, "{PKMN} TRAINER", 15, DEFAULT_BALL), + TRAINER_CLASS(BUG_CATCHER, "BUG CATCHER", 4, DEFAULT_BALL), + TRAINER_CLASS(PKMN_RANGER, "{PKMN} RANGER", 12, DEFAULT_BALL), + TRAINER_CLASS(MAGMA_LEADER, "MAGMA LEADER", 20, ITEM_MASTER_BALL), + TRAINER_CLASS(LASS, "LASS", 4, DEFAULT_BALL), + TRAINER_CLASS(YOUNG_COUPLE, "YOUNG COUPLE", 8, DEFAULT_BALL), + TRAINER_CLASS(OLD_COUPLE, "OLD COUPLE", 10, DEFAULT_BALL), + TRAINER_CLASS(SIS_AND_BRO, "SIS AND BRO", 3, DEFAULT_BALL), + TRAINER_CLASS(SALON_MAIDEN, "SALON MAIDEN", DEFAULT_MONEY, DEFAULT_BALL), + TRAINER_CLASS(DOME_ACE, "DOME ACE", DEFAULT_MONEY, DEFAULT_BALL), + TRAINER_CLASS(PALACE_MAVEN, "PALACE MAVEN", DEFAULT_MONEY, DEFAULT_BALL), + TRAINER_CLASS(ARENA_TYCOON, "ARENA TYCOON", DEFAULT_MONEY, DEFAULT_BALL), + TRAINER_CLASS(FACTORY_HEAD, "FACTORY HEAD", DEFAULT_MONEY, DEFAULT_BALL), + TRAINER_CLASS(PIKE_QUEEN, "PIKE QUEEN", DEFAULT_MONEY, DEFAULT_BALL), + TRAINER_CLASS(PYRAMID_KING, "PYRAMID KING", DEFAULT_MONEY, DEFAULT_BALL), + TRAINER_CLASS(RS_PROTAG, "{PKMN} TRAINER", DEFAULT_MONEY, DEFAULT_BALL), }; -#endif static void (* const sTurnActionsFuncsTable[])(void) = { @@ -2036,7 +2030,7 @@ u8 CreateNPCTrainerPartyFromTrainer(struct Pokemon *party, const struct Trainer #if B_TRAINER_CLASS_POKE_BALLS >= GEN_7 if (ball == -1) { - ball = (sTrainerBallTable[trainer->trainerClass]) ? sTrainerBallTable[trainer->trainerClass] : ITEM_POKE_BALL; + ball = gTrainerClasses[trainer->trainerClass].ball ?: ITEM_POKE_BALL; SetMonData(&party[i], MON_DATA_POKEBALL, &ball); } #endif diff --git a/src/battle_message.c b/src/battle_message.c index b421836f4a..90d86f6495 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -3214,19 +3214,19 @@ static const u8 *BattleStringGetOpponentClassByTrainerId(u16 trainerId) const u8 *toCpy; if (gBattleTypeFlags & BATTLE_TYPE_SECRET_BASE) - toCpy = gTrainerClassNames[GetSecretBaseTrainerClass()]; + toCpy = gTrainerClasses[GetSecretBaseTrainerClass()].name; else if (trainerId == TRAINER_UNION_ROOM) - toCpy = gTrainerClassNames[GetUnionRoomTrainerClass()]; + toCpy = gTrainerClasses[GetUnionRoomTrainerClass()].name; else if (trainerId == TRAINER_FRONTIER_BRAIN) - toCpy = gTrainerClassNames[GetFrontierBrainTrainerClass()]; + toCpy = gTrainerClasses[GetFrontierBrainTrainerClass()].name; else if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) - toCpy = gTrainerClassNames[GetFrontierOpponentClass(trainerId)]; + toCpy = gTrainerClasses[GetFrontierOpponentClass(trainerId)].name; else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) - toCpy = gTrainerClassNames[GetTrainerHillOpponentClass(trainerId)]; + toCpy = gTrainerClasses[GetTrainerHillOpponentClass(trainerId)].name; else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) - toCpy = gTrainerClassNames[GetEreaderTrainerClassId()]; + toCpy = gTrainerClasses[GetEreaderTrainerClassId()].name; else - toCpy = gTrainerClassNames[gTrainers[trainerId].trainerClass]; + toCpy = gTrainerClasses[gTrainers[trainerId].trainerClass].name; return toCpy; } @@ -3575,7 +3575,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) } break; case B_TXT_PARTNER_CLASS: - toCpy = gTrainerClassNames[GetFrontierOpponentClass(gPartnerTrainerId)]; + toCpy = gTrainerClasses[GetFrontierOpponentClass(gPartnerTrainerId)].name; break; case B_TXT_PARTNER_NAME: toCpy = BattleStringGetPlayerName(text, GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)); @@ -3588,7 +3588,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) { case B_POSITION_PLAYER_RIGHT: if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) - toCpy = gTrainerClassNames[GetFrontierOpponentClass(gPartnerTrainerId)]; + toCpy = gTrainerClasses[GetFrontierOpponentClass(gPartnerTrainerId)].name; break; case B_POSITION_OPPONENT_LEFT: toCpy = BattleStringGetOpponentClassByTrainerId(gTrainerBattleOpponent_A); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index ab9a544c34..51f6ebfd00 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7362,9 +7362,9 @@ static void Cmd_hitanimation(void) static u32 GetTrainerMoneyToGive(u16 trainerId) { - u32 i = 0; u32 lastMonLevel = 0; u32 moneyReward; + u8 trainerMoney; if (trainerId == TRAINER_SECRET_BASE) { @@ -7374,19 +7374,14 @@ static u32 GetTrainerMoneyToGive(u16 trainerId) { const struct TrainerMon *party = gTrainers[trainerId].party; lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl; - - for (; gTrainerMoneyTable[i].classId != 0xFF; i++) - { - if (gTrainerMoneyTable[i].classId == gTrainers[trainerId].trainerClass) - break; - } + trainerMoney = gTrainerClasses[gTrainers[trainerId].trainerClass].money; if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) - moneyReward = 4 * lastMonLevel * gBattleStruct->moneyMultiplier * gTrainerMoneyTable[i].value; + moneyReward = 4 * lastMonLevel * gBattleStruct->moneyMultiplier * trainerMoney; else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) - moneyReward = 4 * lastMonLevel * gBattleStruct->moneyMultiplier * 2 * gTrainerMoneyTable[i].value; + moneyReward = 4 * lastMonLevel * gBattleStruct->moneyMultiplier * 2 * trainerMoney; else - moneyReward = 4 * lastMonLevel * gBattleStruct->moneyMultiplier * gTrainerMoneyTable[i].value; + moneyReward = 4 * lastMonLevel * gBattleStruct->moneyMultiplier * trainerMoney; } return moneyReward; diff --git a/src/data.c b/src/data.c index da6edde3f3..5b8dc6148d 100644 --- a/src/data.c +++ b/src/data.c @@ -220,6 +220,5 @@ const union AnimCmd *const gAnims_MonPic[MAX_MON_PIC_FRAMES] = }; #include "data/trainer_parties.h" -#include "data/text/trainer_class_names.h" #include "data/trainers.h" #include "data/text/move_names.h" diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h deleted file mode 100644 index 63cc356b23..0000000000 --- a/src/data/text/trainer_class_names.h +++ /dev/null @@ -1,68 +0,0 @@ -const u8 gTrainerClassNames[][13] = { - [TRAINER_CLASS_PKMN_TRAINER_1] = _("{PKMN} TRAINER"), - [TRAINER_CLASS_PKMN_TRAINER_2] = _("{PKMN} TRAINER"), - [TRAINER_CLASS_HIKER] = _("HIKER"), - [TRAINER_CLASS_TEAM_AQUA] = _("TEAM AQUA"), - [TRAINER_CLASS_PKMN_BREEDER] = _("{PKMN} BREEDER"), - [TRAINER_CLASS_COOLTRAINER] = _("COOLTRAINER"), - [TRAINER_CLASS_BIRD_KEEPER] = _("BIRD KEEPER"), - [TRAINER_CLASS_COLLECTOR] = _("COLLECTOR"), - [TRAINER_CLASS_SWIMMER_M] = _("SWIMMER♂"), - [TRAINER_CLASS_TEAM_MAGMA] = _("TEAM MAGMA"), - [TRAINER_CLASS_EXPERT] = _("EXPERT"), - [TRAINER_CLASS_AQUA_ADMIN] = _("AQUA ADMIN"), - [TRAINER_CLASS_BLACK_BELT] = _("BLACK BELT"), - [TRAINER_CLASS_AQUA_LEADER] = _("AQUA LEADER"), - [TRAINER_CLASS_HEX_MANIAC] = _("HEX MANIAC"), - [TRAINER_CLASS_AROMA_LADY] = _("AROMA LADY"), - [TRAINER_CLASS_RUIN_MANIAC] = _("RUIN MANIAC"), - [TRAINER_CLASS_INTERVIEWER] = _("INTERVIEWER"), - [TRAINER_CLASS_TUBER_F] = _("TUBER"), - [TRAINER_CLASS_TUBER_M] = _("TUBER"), - [TRAINER_CLASS_LADY] = _("LADY"), - [TRAINER_CLASS_BEAUTY] = _("BEAUTY"), - [TRAINER_CLASS_RICH_BOY] = _("RICH BOY"), - [TRAINER_CLASS_POKEMANIAC] = _("POKéMANIAC"), - [TRAINER_CLASS_GUITARIST] = _("GUITARIST"), - [TRAINER_CLASS_KINDLER] = _("KINDLER"), - [TRAINER_CLASS_CAMPER] = _("CAMPER"), - [TRAINER_CLASS_PICNICKER] = _("PICNICKER"), - [TRAINER_CLASS_BUG_MANIAC] = _("BUG MANIAC"), - [TRAINER_CLASS_PSYCHIC] = _("PSYCHIC"), - [TRAINER_CLASS_GENTLEMAN] = _("GENTLEMAN"), - [TRAINER_CLASS_ELITE_FOUR] = _("ELITE FOUR"), - [TRAINER_CLASS_LEADER] = _("LEADER"), - [TRAINER_CLASS_SCHOOL_KID] = _("SCHOOL KID"), - [TRAINER_CLASS_SR_AND_JR] = _("SR. AND JR."), - [TRAINER_CLASS_WINSTRATE] = _("WINSTRATE"), - [TRAINER_CLASS_POKEFAN] = _("POKéFAN"), - [TRAINER_CLASS_YOUNGSTER] = _("YOUNGSTER"), - [TRAINER_CLASS_CHAMPION] = _("CHAMPION"), - [TRAINER_CLASS_FISHERMAN] = _("FISHERMAN"), - [TRAINER_CLASS_TRIATHLETE] = _("TRIATHLETE"), - [TRAINER_CLASS_DRAGON_TAMER] = _("DRAGON TAMER"), - [TRAINER_CLASS_NINJA_BOY] = _("NINJA BOY"), - [TRAINER_CLASS_BATTLE_GIRL] = _("BATTLE GIRL"), - [TRAINER_CLASS_PARASOL_LADY] = _("PARASOL LADY"), - [TRAINER_CLASS_SWIMMER_F] = _("SWIMMER♀"), - [TRAINER_CLASS_TWINS] = _("TWINS"), - [TRAINER_CLASS_SAILOR] = _("SAILOR"), - [TRAINER_CLASS_COOLTRAINER_2] = _("COOLTRAINER"), - [TRAINER_CLASS_MAGMA_ADMIN] = _("MAGMA ADMIN"), - [TRAINER_CLASS_RIVAL] = _("{PKMN} TRAINER"), - [TRAINER_CLASS_BUG_CATCHER] = _("BUG CATCHER"), - [TRAINER_CLASS_PKMN_RANGER] = _("{PKMN} RANGER"), - [TRAINER_CLASS_MAGMA_LEADER] = _("MAGMA LEADER"), - [TRAINER_CLASS_LASS] = _("LASS"), - [TRAINER_CLASS_YOUNG_COUPLE] = _("YOUNG COUPLE"), - [TRAINER_CLASS_OLD_COUPLE] = _("OLD COUPLE"), - [TRAINER_CLASS_SIS_AND_BRO] = _("SIS AND BRO"), - [TRAINER_CLASS_SALON_MAIDEN] = _("SALON MAIDEN"), - [TRAINER_CLASS_DOME_ACE] = _("DOME ACE"), - [TRAINER_CLASS_PALACE_MAVEN] = _("PALACE MAVEN"), - [TRAINER_CLASS_ARENA_TYCOON] = _("ARENA TYCOON"), - [TRAINER_CLASS_FACTORY_HEAD] = _("FACTORY HEAD"), - [TRAINER_CLASS_PIKE_QUEEN] = _("PIKE QUEEN"), - [TRAINER_CLASS_PYRAMID_KING] = _("PYRAMID KING"), - [TRAINER_CLASS_RS_PROTAG] = _("{PKMN} TRAINER"), -}; diff --git a/src/pokemon.c b/src/pokemon.c index 96811a92dd..d02d2941de 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5791,11 +5791,11 @@ void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality) const u8 *GetTrainerClassNameFromId(u16 trainerId) { if (trainerId > TRAINER_PARTNER(PARTNER_NONE)) - return gTrainerClassNames[gBattlePartners[trainerId].trainerClass]; + return gTrainerClasses[gBattlePartners[trainerId].trainerClass].name; else if (trainerId < TRAINERS_COUNT) - return gTrainerClassNames[gTrainers[trainerId].trainerClass]; + return gTrainerClasses[gTrainers[trainerId].trainerClass].name; - return gTrainerClassNames[gTrainers[TRAINER_NONE].trainerClass]; + return gTrainerClasses[gTrainers[TRAINER_NONE].trainerClass].name; } const u8 *GetTrainerNameFromId(u16 trainerId) diff --git a/src/pokenav_match_call_data.c b/src/pokenav_match_call_data.c index f6d71009bb..d62116fec9 100644 --- a/src/pokenav_match_call_data.c +++ b/src/pokenav_match_call_data.c @@ -1088,7 +1088,7 @@ static void MatchCall_GetNameAndDesc_Birch(match_call_t matchCall, const u8 **de static void MatchCall_GetNameAndDescByRematchIdx(u32 idx, const u8 **desc, const u8 **name) { const struct Trainer *trainer = gTrainers + GetTrainerIdxByRematchIdx(idx); - *desc = gTrainerClassNames[trainer->trainerClass]; + *desc = gTrainerClasses[trainer->trainerClass].name; *name = trainer->trainerName; } diff --git a/src/pokenav_match_call_list.c b/src/pokenav_match_call_list.c index 8d1a73f557..1c947bed82 100755 --- a/src/pokenav_match_call_list.c +++ b/src/pokenav_match_call_list.c @@ -405,7 +405,7 @@ void BufferMatchCallNameAndDesc(struct PokenavMatchCallEntry *matchCallEntry, u8 int index = GetTrainerIdxByRematchIdx(matchCallEntry->headerId); const struct Trainer *trainer = &gTrainers[index]; int class = trainer->trainerClass; - className = gTrainerClassNames[class]; + className = gTrainerClasses[class].name; trainerName = trainer->trainerName; } else diff --git a/src/union_room.c b/src/union_room.c index 51f96c8adc..d71d3edad1 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -4444,7 +4444,7 @@ static void ViewURoomPartnerTrainerCard(u8 *unused, struct WirelessLink_URoom *d DynamicPlaceholderTextUtil_Reset(); - StringCopy(data->trainerCardStrBuffer[0], gTrainerClassNames[GetUnionRoomTrainerClass()]); + StringCopy(data->trainerCardStrBuffer[0], gTrainerClasses[GetUnionRoomTrainerClass()].name); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, data->trainerCardStrBuffer[0]); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, trainerCard->playerName); From bfe3e762ffd7b13d44b390c8c653819d3b3ebca3 Mon Sep 17 00:00:00 2001 From: Frank DeBlasio <35279583+fdeblasio@users.noreply.github.com> Date: Thu, 4 Jan 2024 09:39:26 -0500 Subject: [PATCH 64/82] Fixed Battle AI debug screen shiny sprites (#3922) * Switched gBattleMons.isShiny to GetMonData * Simplified getting party of Pokemon --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/battle_debug.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/battle_debug.c b/src/battle_debug.c index 8e4046b565..ddbed79dda 100644 --- a/src/battle_debug.c +++ b/src/battle_debug.c @@ -769,6 +769,7 @@ static void Task_ShowAiPoints(u8 taskId) u32 i, count; struct WindowTemplate winTemplate; struct BattleDebugMenu *data = GetStructPtr(taskId); + struct Pokemon *mon; switch (data->aiViewState) { @@ -800,8 +801,11 @@ static void Task_ShowAiPoints(u8 taskId) data->spriteIds.aiIconSpriteIds[i] = 0xFF; } } + + mon = &GetBattlerParty(data->aiBattlerId)[gBattlerPartyIndexes[data->aiBattlerId]]; + data->aiMonSpriteId = CreateMonPicSprite(gBattleMons[data->aiBattlerId].species, - gBattleMons[data->aiBattlerId].isShiny, + GetMonData(mon, MON_DATA_IS_SHINY), gBattleMons[data->aiBattlerId].personality, TRUE, 39, 130, 15, TAG_NONE); @@ -926,6 +930,7 @@ static void Task_ShowAiKnowledge(u8 taskId) u32 i, count; struct WindowTemplate winTemplate; struct BattleDebugMenu *data = GetStructPtr(taskId); + struct Pokemon *mon; switch (data->aiViewState) { @@ -957,8 +962,11 @@ static void Task_ShowAiKnowledge(u8 taskId) data->spriteIds.aiIconSpriteIds[i] = 0xFF; } } + + mon = &GetBattlerParty(data->aiBattlerId)[gBattlerPartyIndexes[data->aiBattlerId]]; + data->aiMonSpriteId = CreateMonPicSprite(gBattleMons[data->aiBattlerId].species, - gBattleMons[data->aiBattlerId].isShiny, + GetMonData(mon, MON_DATA_IS_SHINY), gBattleMons[data->aiBattlerId].personality, TRUE, 39, 130, 15, TAG_NONE); From 52eeca6e4e5c1c590efb051e427ae0d730754ce8 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 4 Jan 2024 16:02:21 +0000 Subject: [PATCH 65/82] Replace berry descriptions with compound strings --- src/berry.c | 408 ++++++++++++++++++---------------------------------- 1 file changed, 136 insertions(+), 272 deletions(-) diff --git a/src/berry.c b/src/berry.c index 60776af2c6..88c4a16fe3 100644 --- a/src/berry.c +++ b/src/berry.c @@ -34,142 +34,6 @@ static void TryForWeeds(struct BerryTree *tree); static void TryForPests(struct BerryTree *tree); static void AddTreeBonus(struct BerryTree *tree, u8 bonus); -//.rodata -static const u8 sBerryDescriptionPart1_Cheri[] = _("Blooms with delicate pretty flowers."); -static const u8 sBerryDescriptionPart2_Cheri[] = _("The bright red Berry is very spicy."); -static const u8 sBerryDescriptionPart1_Chesto[] = _("The Berry's thick skin and fruit are"); -static const u8 sBerryDescriptionPart2_Chesto[] = _("very tough. It is dry-tasting all over."); -static const u8 sBerryDescriptionPart1_Pecha[] = _("Very sweet and delicious."); -static const u8 sBerryDescriptionPart2_Pecha[] = _("Also very tender - handle with care."); -static const u8 sBerryDescriptionPart1_Rawst[] = _("If the leaves grow long and curly,"); -static const u8 sBerryDescriptionPart2_Rawst[] = _("the Berry seems to grow very bitter."); -static const u8 sBerryDescriptionPart1_Aspear[] = _("The hard Berry is dense with a rich"); -static const u8 sBerryDescriptionPart2_Aspear[] = _("juice. It is quite sour."); -static const u8 sBerryDescriptionPart1_Leppa[] = _("Grows slower than Cheri and others."); -static const u8 sBerryDescriptionPart2_Leppa[] = _("The smaller the Berry, the tastier."); -static const u8 sBerryDescriptionPart1_Oran[] = _("A peculiar Berry with a mix of flavors."); -static const u8 sBerryDescriptionPart2_Oran[] = _("Berries grow in half a day."); -static const u8 sBerryDescriptionPart1_Persim[] = _("Loves sunlight. The Berry's color"); -static const u8 sBerryDescriptionPart2_Persim[] = _("grows vivid when exposed to the sun."); -static const u8 sBerryDescriptionPart1_Lum[] = _("Slow to grow. If raised with loving"); -static const u8 sBerryDescriptionPart2_Lum[] = _("care, it may grow two Berries."); -static const u8 sBerryDescriptionPart1_Sitrus[] = _("Closely related to Oran. The large"); -static const u8 sBerryDescriptionPart2_Sitrus[] = _("Berry has a well-rounded flavor."); -static const u8 sBerryDescriptionPart1_Figy[] = _("The Berry, which looks chewed up,"); -static const u8 sBerryDescriptionPart2_Figy[] = _("brims with spicy substances."); -static const u8 sBerryDescriptionPart1_Wiki[] = _("The Berry is said to have grown lumpy"); -static const u8 sBerryDescriptionPart2_Wiki[] = _("to help Pokémon grip it."); -static const u8 sBerryDescriptionPart1_Mago[] = _("The Berry turns curvy as it grows."); -static const u8 sBerryDescriptionPart2_Mago[] = _("The curvier, the sweeter and tastier."); -static const u8 sBerryDescriptionPart1_Aguav[] = _("The flower is dainty. It is rare in its"); -static const u8 sBerryDescriptionPart2_Aguav[] = _("ability to grow without light."); -static const u8 sBerryDescriptionPart1_Iapapa[] = _("The Berry is very big and sour."); -static const u8 sBerryDescriptionPart2_Iapapa[] = _("It takes at least a day to grow."); -static const u8 sBerryDescriptionPart1_Razz[] = _("The red Berry tastes slightly spicy."); -static const u8 sBerryDescriptionPart2_Razz[] = _("It grows quickly in just four hours."); -static const u8 sBerryDescriptionPart1_Bluk[] = _("The Berry is blue on the outside, but"); -static const u8 sBerryDescriptionPart2_Bluk[] = _("it blackens the mouth when eaten."); -static const u8 sBerryDescriptionPart1_Nanab[] = _("This Berry was the seventh"); -static const u8 sBerryDescriptionPart2_Nanab[] = _("discovered in the world. It is sweet."); -static const u8 sBerryDescriptionPart1_Wepear[] = _("The flower is small and white. It has a"); -static const u8 sBerryDescriptionPart2_Wepear[] = _("delicate balance of bitter and sour."); -static const u8 sBerryDescriptionPart1_Pinap[] = _("Weak against wind and cold."); -static const u8 sBerryDescriptionPart2_Pinap[] = _("The fruit is spicy and the skin, sour."); -static const u8 sBerryDescriptionPart1_Pomeg[] = _("However much it is watered,"); -static const u8 sBerryDescriptionPart2_Pomeg[] = _("it only grows up to six Berries."); -static const u8 sBerryDescriptionPart1_Kelpsy[] = _("A rare variety shaped like a root."); -static const u8 sBerryDescriptionPart2_Kelpsy[] = _("Grows a very large flower."); -static const u8 sBerryDescriptionPart1_Qualot[] = _("Loves water. Grows strong even in"); -static const u8 sBerryDescriptionPart2_Qualot[] = _("locations with constant rainfall."); -static const u8 sBerryDescriptionPart1_Hondew[] = _("A Berry that is very valuable and"); -static const u8 sBerryDescriptionPart2_Hondew[] = _("rarely seen. It is very delicious."); -static const u8 sBerryDescriptionPart1_Grepa[] = _("Despite its tenderness and round"); -static const u8 sBerryDescriptionPart2_Grepa[] = _("shape, the Berry is unimaginably sour."); -static const u8 sBerryDescriptionPart1_Tamato[] = _("The Berry is lip-bendingly spicy."); -static const u8 sBerryDescriptionPart2_Tamato[] = _("It takes time to grow."); -static const u8 sBerryDescriptionPart1_Cornn[] = _("A Berry from an ancient era. May not"); -static const u8 sBerryDescriptionPart2_Cornn[] = _("grow unless planted in quantity."); -static const u8 sBerryDescriptionPart1_Magost[] = _("A Berry that is widely said to have"); -static const u8 sBerryDescriptionPart2_Magost[] = _("a finely balanced flavor."); -static const u8 sBerryDescriptionPart1_Rabuta[] = _("A rare variety that is overgrown with"); -static const u8 sBerryDescriptionPart2_Rabuta[] = _("hair. It is quite bitter."); -static const u8 sBerryDescriptionPart1_Nomel[] = _("Quite sour. Just one bite makes it"); -static const u8 sBerryDescriptionPart2_Nomel[] = _("impossible to taste for three days."); -static const u8 sBerryDescriptionPart1_Spelon[] = _("The vividly red Berry is very spicy."); -static const u8 sBerryDescriptionPart2_Spelon[] = _("Its warts secrete a spicy substance."); -static const u8 sBerryDescriptionPart1_Pamtre[] = _("Drifts on the sea from somewhere."); -static const u8 sBerryDescriptionPart2_Pamtre[] = _("It is thought to grow elsewhere."); -static const u8 sBerryDescriptionPart1_Watmel[] = _("A huge Berry, with some over 20"); -static const u8 sBerryDescriptionPart2_Watmel[] = _("inches discovered. Exceedingly sweet."); -static const u8 sBerryDescriptionPart1_Durin[] = _("Bitter to even look at. It is so"); -static const u8 sBerryDescriptionPart2_Durin[] = _("bitter, no one has ever eaten it as is."); -static const u8 sBerryDescriptionPart1_Belue[] = _("It is glossy and looks delicious, but"); -static const u8 sBerryDescriptionPart2_Belue[] = _("it is awfully sour. Takes time to grow."); -static const u8 sBerryDescriptionPart1_Chilan[] = _("It can be made into a whistle that"); -static const u8 sBerryDescriptionPart2_Chilan[] = _("produces an indescribable sound."); -static const u8 sBerryDescriptionPart1_Occa[] = _("Said to grow in the tropics once,"); -static const u8 sBerryDescriptionPart2_Occa[] = _("it boasts an intensely hot spiciness."); -static const u8 sBerryDescriptionPart1_Passho[] = _("Its flesh is dotted with many tiny"); -static const u8 sBerryDescriptionPart2_Passho[] = _("bubbles that keep it afloat in water."); -static const u8 sBerryDescriptionPart1_Wacan[] = _("Energy drawn from lightning strikes"); -static const u8 sBerryDescriptionPart2_Wacan[] = _("makes this Berry grow big and rich."); -static const u8 sBerryDescriptionPart1_Rindo[] = _("This berry has a vegetable-like flavor,"); -static const u8 sBerryDescriptionPart2_Rindo[] = _("but is rich in health-promoting fiber."); -static const u8 sBerryDescriptionPart1_Yache[] = _("This Berry has a refreshing dry and"); -static const u8 sBerryDescriptionPart2_Yache[] = _("sour flavor. Tastes better chilled."); -static const u8 sBerryDescriptionPart1_Chople[] = _("Contains a substance that generates"); -static const u8 sBerryDescriptionPart2_Chople[] = _("heat. Can even fire up a chilly heart."); -static const u8 sBerryDescriptionPart1_Kebia[] = _("Brilliant green on the outside, inside"); -static const u8 sBerryDescriptionPart2_Kebia[] = _("it is packed with black-colored flesh."); -static const u8 sBerryDescriptionPart1_Shuca[] = _("The sweet pulp has just the hint of a"); -static const u8 sBerryDescriptionPart2_Shuca[] = _("a hard-edged and fragrant bite to it."); -static const u8 sBerryDescriptionPart1_Coba[] = _("This Berry is said to be a cross of"); -static const u8 sBerryDescriptionPart2_Coba[] = _("two Berries blown in from far away."); -static const u8 sBerryDescriptionPart1_Payapa[] = _("Said to sense human emotions, it swells"); -static const u8 sBerryDescriptionPart2_Payapa[] = _("roundly when a person approaches."); -static const u8 sBerryDescriptionPart1_Tanga[] = _("It grows a flower at the tip that lures"); -static const u8 sBerryDescriptionPart2_Tanga[] = _("Bug Pokémon with its stringy petals."); -static const u8 sBerryDescriptionPart1_Charti[] = _("Often used for pickles because of its"); -static const u8 sBerryDescriptionPart2_Charti[] = _("dry flavor. Sometimes eaten raw."); -static const u8 sBerryDescriptionPart1_Kasib[] = _("Old superstitions say it has an odd"); -static const u8 sBerryDescriptionPart2_Kasib[] = _("power. A popular good-luck charm."); -static const u8 sBerryDescriptionPart1_Haban[] = _("Less bitter if enough of this Berry"); -static const u8 sBerryDescriptionPart2_Haban[] = _("is boiled down. Makes a good jam."); -static const u8 sBerryDescriptionPart1_Colbur[] = _("Tiny hooks on the surface latch onto"); -static const u8 sBerryDescriptionPart2_Colbur[] = _("Pokémon to reach far-off places."); -static const u8 sBerryDescriptionPart1_Babiri[] = _("Very tough with a strong flavor. It"); -static const u8 sBerryDescriptionPart2_Babiri[] = _("was used to make medicine in the past."); -static const u8 sBerryDescriptionPart1_Roseli[] = _("In nature, they grow in wide rings"); -static const u8 sBerryDescriptionPart2_Roseli[] = _("for reasons that are still unknown."); -static const u8 sBerryDescriptionPart1_Liechi[] = _("A mysterious Berry. It is rumored to"); -static const u8 sBerryDescriptionPart2_Liechi[] = _("contain the power of the sea."); -static const u8 sBerryDescriptionPart1_Ganlon[] = _("A mysterious Berry. It is rumored to"); -static const u8 sBerryDescriptionPart2_Ganlon[] = _("contain the power of the land."); -static const u8 sBerryDescriptionPart1_Salac[] = _("A mysterious Berry. It is rumored to"); -static const u8 sBerryDescriptionPart2_Salac[] = _("contain the power of the sky."); -static const u8 sBerryDescriptionPart1_Petaya[] = _("A mysterious Berry. It is rumored to"); -static const u8 sBerryDescriptionPart2_Petaya[] = _("contain the power of all living things."); -static const u8 sBerryDescriptionPart1_Apicot[] = _("A very mystifying Berry. No telling"); -static const u8 sBerryDescriptionPart2_Apicot[] = _("what may happen or how it can be used."); -static const u8 sBerryDescriptionPart1_Lansat[] = _("Said to be a legendary Berry."); -static const u8 sBerryDescriptionPart2_Lansat[] = _("Holding it supposedly brings joy."); -static const u8 sBerryDescriptionPart1_Starf[] = _("So strong, it was abandoned at the"); -static const u8 sBerryDescriptionPart2_Starf[] = _("world's edge. Considered a mirage."); -static const u8 sBerryDescriptionPart1_Enigma[] = _("A completely enigmatic Berry."); -static const u8 sBerryDescriptionPart2_Enigma[] = _("Appears to have the power of stars."); -static const u8 sBerryDescriptionPart1_Micle[] = _("It makes other food eaten at the"); -static const u8 sBerryDescriptionPart2_Micle[] = _("same time taste sweet."); -static const u8 sBerryDescriptionPart1_Custap[] = _("The flesh underneath the Custap"); -static const u8 sBerryDescriptionPart2_Custap[] = _("Berry's skin is sweet and creamy soft."); -static const u8 sBerryDescriptionPart1_Jaboca[] = _("The drupelets that make up this berry"); -static const u8 sBerryDescriptionPart2_Jaboca[] = _("pop rythmically if handled roughly."); -static const u8 sBerryDescriptionPart1_Rowap[] = _("People once worked top-shaped pieces"); -static const u8 sBerryDescriptionPart2_Rowap[] = _("of this berry free to use as toys."); -static const u8 sBerryDescriptionPart1_Kee[] = _("A berry that is incredibly spicy at"); -static const u8 sBerryDescriptionPart2_Kee[] = _("first, then extremely bitter."); -static const u8 sBerryDescriptionPart1_Maranga[] = _("Its outside is very bitter, but its"); -static const u8 sBerryDescriptionPart2_Maranga[] = _("inside tastes like a sweet drink."); - // Check include/config/overworld.h configs and throw an error if illegal #if OW_BERRY_GROWTH_RATE < GEN_3 || (OW_BERRY_GROWTH_RATE > GEN_7 && OW_BERRY_GROWTH_RATE != GEN_6_ORAS) #error "OW_BERRY_GROWTH_RATE must be between GEN_3 and GEN_7!" @@ -198,8 +62,8 @@ const struct Berry gBerries[] = .size = 20, .maxYield = YIELD_RATE(3, 5, 15, 20), .minYield = YIELD_RATE(2, 2, 4, 4), - .description1 = sBerryDescriptionPart1_Cheri, - .description2 = sBerryDescriptionPart2_Cheri, + .description1 = COMPOUND_STRING("Blooms with delicate pretty flowers."), + .description2 = COMPOUND_STRING("The bright red Berry is very spicy."), .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 10, .dry = 0, @@ -221,8 +85,8 @@ const struct Berry gBerries[] = .size = 80, .maxYield = YIELD_RATE(3, 5, 15, 20), .minYield = YIELD_RATE(2, 2, 4, 4), - .description1 = sBerryDescriptionPart1_Chesto, - .description2 = sBerryDescriptionPart2_Chesto, + .description1 = COMPOUND_STRING("The Berry's thick skin and fruit are"), + .description2 = COMPOUND_STRING("very tough. It is dry-tasting all over."), .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 10, @@ -244,8 +108,8 @@ const struct Berry gBerries[] = .size = 40, .maxYield = YIELD_RATE(3, 5, 15, 20), .minYield = YIELD_RATE(2, 2, 4, 4), - .description1 = sBerryDescriptionPart1_Pecha, - .description2 = sBerryDescriptionPart2_Pecha, + .description1 = COMPOUND_STRING("Very sweet and delicious."), + .description2 = COMPOUND_STRING("Also very tender - handle with care."), .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 0, @@ -267,8 +131,8 @@ const struct Berry gBerries[] = .size = 32, .maxYield = YIELD_RATE(3, 5, 15, 20), .minYield = YIELD_RATE(2, 2, 4, 4), - .description1 = sBerryDescriptionPart1_Rawst, - .description2 = sBerryDescriptionPart2_Rawst, + .description1 = COMPOUND_STRING("If the leaves grow long and curly,"), + .description2 = COMPOUND_STRING("the Berry seems to grow very bitter."), .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 0, @@ -290,8 +154,8 @@ const struct Berry gBerries[] = .size = 50, .maxYield = YIELD_RATE(3, 5, 15, 20), .minYield = YIELD_RATE(2, 2, 4, 4), - .description1 = sBerryDescriptionPart1_Aspear, - .description2 = sBerryDescriptionPart2_Aspear, + .description1 = COMPOUND_STRING("The hard Berry is dense with a rich"), + .description2 = COMPOUND_STRING("juice. It is quite sour."), .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 0, @@ -313,8 +177,8 @@ const struct Berry gBerries[] = .size = 28, .maxYield = YIELD_RATE(3, 5, 15, 22), .minYield = YIELD_RATE(2, 2, 2, 2), - .description1 = sBerryDescriptionPart1_Leppa, - .description2 = sBerryDescriptionPart2_Leppa, + .description1 = COMPOUND_STRING("Grows slower than Cheri and others."), + .description2 = COMPOUND_STRING("The smaller the Berry, the tastier."), .growthDuration = GROWTH_DURATION(16, 16, 24, 24, 16, 24), .spicy = 10, .dry = 0, @@ -336,8 +200,8 @@ const struct Berry gBerries[] = .size = 35, .maxYield = YIELD_RATE(3, 5, 15, 20), .minYield = YIELD_RATE(2, 2, 4, 4), - .description1 = sBerryDescriptionPart1_Oran, - .description2 = sBerryDescriptionPart2_Oran, + .description1 = COMPOUND_STRING("A peculiar Berry with a mix of flavors."), + .description2 = COMPOUND_STRING("Berries grow in half a day."), .growthDuration = GROWTH_DURATION(12, 16, 24, 24, 16, 24), .spicy = 10, .dry = 10, @@ -359,8 +223,8 @@ const struct Berry gBerries[] = .size = 47, .maxYield = YIELD_RATE(3, 5, 15, 20), .minYield = YIELD_RATE(2, 2, 4, 4), - .description1 = sBerryDescriptionPart1_Persim, - .description2 = sBerryDescriptionPart2_Persim, + .description1 = COMPOUND_STRING("Loves sunlight. The Berry's color"), + .description2 = COMPOUND_STRING("grows vivid when exposed to the sun."), .growthDuration = GROWTH_DURATION(12, 16, 24, 24, 16, 24), .spicy = 10, .dry = 10, @@ -382,8 +246,8 @@ const struct Berry gBerries[] = .size = 34, .maxYield = YIELD_RATE(2, 5, 20, 18), .minYield = YIELD_RATE(1, 2, 3, 2), - .description1 = sBerryDescriptionPart1_Lum, - .description2 = sBerryDescriptionPart2_Lum, + .description1 = COMPOUND_STRING("Slow to grow. If raised with loving"), + .description2 = COMPOUND_STRING("care, it may grow two Berries."), .growthDuration = GROWTH_DURATION(48, 48, 72, 48, 32, 48), .spicy = 10, .dry = 10, @@ -405,8 +269,8 @@ const struct Berry gBerries[] = .size = 95, .maxYield = YIELD_RATE(3, 5, 20, 27), .minYield = YIELD_RATE(2, 2, 3, 3), - .description1 = sBerryDescriptionPart1_Sitrus, - .description2 = sBerryDescriptionPart2_Sitrus, + .description1 = COMPOUND_STRING("Closely related to Oran. The large"), + .description2 = COMPOUND_STRING("Berry has a well-rounded flavor."), .growthDuration = GROWTH_DURATION(24, 32, 48, 48, 32, 48), .spicy = 10, .dry = 10, @@ -428,8 +292,8 @@ const struct Berry gBerries[] = .size = 100, .maxYield = YIELD_RATE(3, 5, 15, 15), .minYield = YIELD_RATE(2, 1, 3, 3), - .description1 = sBerryDescriptionPart1_Figy, - .description2 = sBerryDescriptionPart2_Figy, + .description1 = COMPOUND_STRING("The Berry, which looks chewed up,"), + .description2 = COMPOUND_STRING("brims with spicy substances."), .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 10, .dry = 0, @@ -451,8 +315,8 @@ const struct Berry gBerries[] = .size = 115, .maxYield = YIELD_RATE(3, 5, 15, 15), .minYield = YIELD_RATE(2, 1, 3, 3), - .description1 = sBerryDescriptionPart1_Wiki, - .description2 = sBerryDescriptionPart2_Wiki, + .description1 = COMPOUND_STRING("The Berry is said to have grown lumpy"), + .description2 = COMPOUND_STRING("to help Pokémon grip it."), .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 10, @@ -474,8 +338,8 @@ const struct Berry gBerries[] = .size = 126, .maxYield = YIELD_RATE(3, 5, 15, 15), .minYield = YIELD_RATE(2, 1, 3, 3), - .description1 = sBerryDescriptionPart1_Mago, - .description2 = sBerryDescriptionPart2_Mago, + .description1 = COMPOUND_STRING("The Berry turns curvy as it grows."), + .description2 = COMPOUND_STRING("The curvier, the sweeter and tastier."), .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 0, @@ -497,8 +361,8 @@ const struct Berry gBerries[] = .size = 64, .maxYield = YIELD_RATE(3, 5, 15, 15), .minYield = YIELD_RATE(2, 1, 3, 3), - .description1 = sBerryDescriptionPart1_Aguav, - .description2 = sBerryDescriptionPart2_Aguav, + .description1 = COMPOUND_STRING("The flower is dainty. It is rare in its"), + .description2 = COMPOUND_STRING("ability to grow without light."), .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 0, @@ -520,8 +384,8 @@ const struct Berry gBerries[] = .size = 223, .maxYield = YIELD_RATE(3, 5, 15, 15), .minYield = YIELD_RATE(2, 1, 3, 3), - .description1 = sBerryDescriptionPart1_Iapapa, - .description2 = sBerryDescriptionPart2_Iapapa, + .description1 = COMPOUND_STRING("The Berry is very big and sour."), + .description2 = COMPOUND_STRING("It takes at least a day to grow."), .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 0, @@ -543,8 +407,8 @@ const struct Berry gBerries[] = .size = 120, .maxYield = YIELD_RATE(6, 10, 15, 20), .minYield = YIELD_RATE(3, 2, 3, 4), - .description1 = sBerryDescriptionPart1_Razz, - .description2 = sBerryDescriptionPart2_Razz, + .description1 = COMPOUND_STRING("The red Berry tastes slightly spicy."), + .description2 = COMPOUND_STRING("It grows quickly in just four hours."), .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 10, .dry = 10, @@ -566,8 +430,8 @@ const struct Berry gBerries[] = .size = 108, .maxYield = YIELD_RATE(6, 10, 15, 20), .minYield = YIELD_RATE(3, 2, 3, 4), - .description1 = sBerryDescriptionPart1_Bluk, - .description2 = sBerryDescriptionPart2_Bluk, + .description1 = COMPOUND_STRING("The Berry is blue on the outside, but"), + .description2 = COMPOUND_STRING("it blackens the mouth when eaten."), .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 0, .dry = 10, @@ -589,8 +453,8 @@ const struct Berry gBerries[] = .size = 77, .maxYield = YIELD_RATE(6, 10, 15, 20), .minYield = YIELD_RATE(3, 2, 3, 4), - .description1 = sBerryDescriptionPart1_Nanab, - .description2 = sBerryDescriptionPart2_Nanab, + .description1 = COMPOUND_STRING("This Berry was the seventh"), + .description2 = COMPOUND_STRING("discovered in the world. It is sweet."), .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 0, .dry = 0, @@ -612,8 +476,8 @@ const struct Berry gBerries[] = .size = 74, .maxYield = YIELD_RATE(6, 10, 15, 20), .minYield = YIELD_RATE(3, 2, 3, 4), - .description1 = sBerryDescriptionPart1_Wepear, - .description2 = sBerryDescriptionPart2_Wepear, + .description1 = COMPOUND_STRING("The flower is small and white. It has a"), + .description2 = COMPOUND_STRING("delicate balance of bitter and sour."), .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 0, .dry = 0, @@ -635,8 +499,8 @@ const struct Berry gBerries[] = .size = 80, .maxYield = YIELD_RATE(6, 10, 15, 20), .minYield = YIELD_RATE(3, 2, 3, 4), - .description1 = sBerryDescriptionPart1_Pinap, - .description2 = sBerryDescriptionPart2_Pinap, + .description1 = COMPOUND_STRING("Weak against wind and cold."), + .description2 = COMPOUND_STRING("The fruit is spicy and the skin, sour."), .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 10, .dry = 0, @@ -658,8 +522,8 @@ const struct Berry gBerries[] = .size = 135, .maxYield = YIELD_RATE(6, 5, 20, 26), .minYield = YIELD_RATE(2, 1, 1, 2), - .description1 = sBerryDescriptionPart1_Pomeg, - .description2 = sBerryDescriptionPart2_Pomeg, + .description1 = COMPOUND_STRING("However much it is watered,"), + .description2 = COMPOUND_STRING("it only grows up to six Berries."), .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 10, .dry = 0, @@ -681,8 +545,8 @@ const struct Berry gBerries[] = .size = 150, .maxYield = YIELD_RATE(6, 5, 20, 26), .minYield = YIELD_RATE(2, 1, 1, 2), - .description1 = sBerryDescriptionPart1_Kelpsy, - .description2 = sBerryDescriptionPart2_Kelpsy, + .description1 = COMPOUND_STRING("A rare variety shaped like a root."), + .description2 = COMPOUND_STRING("Grows a very large flower."), .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 0, .dry = 10, @@ -704,8 +568,8 @@ const struct Berry gBerries[] = .size = 110, .maxYield = YIELD_RATE(6, 5, 20, 26), .minYield = YIELD_RATE(2, 1, 1, 2), - .description1 = sBerryDescriptionPart1_Qualot, - .description2 = sBerryDescriptionPart2_Qualot, + .description1 = COMPOUND_STRING("Loves water. Grows strong even in"), + .description2 = COMPOUND_STRING("locations with constant rainfall."), .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 10, .dry = 0, @@ -727,8 +591,8 @@ const struct Berry gBerries[] = .size = 162, .maxYield = YIELD_RATE(6, 5, 20, 26), .minYield = YIELD_RATE(2, 1, 1, 2), - .description1 = sBerryDescriptionPart1_Hondew, - .description2 = sBerryDescriptionPart2_Hondew, + .description1 = COMPOUND_STRING("A Berry that is very valuable and"), + .description2 = COMPOUND_STRING("rarely seen. It is very delicious."), .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 10, .dry = 10, @@ -750,8 +614,8 @@ const struct Berry gBerries[] = .size = 149, .maxYield = YIELD_RATE(6, 5, 20, 26), .minYield = YIELD_RATE(2, 1, 1, 2), - .description1 = sBerryDescriptionPart1_Grepa, - .description2 = sBerryDescriptionPart2_Grepa, + .description1 = COMPOUND_STRING("Despite its tenderness and round"), + .description2 = COMPOUND_STRING("shape, the Berry is unimaginably sour."), .growthDuration = GROWTH_DURATION(12, 32, 48, 48, 32, 48), .spicy = 0, .dry = 10, @@ -773,8 +637,8 @@ const struct Berry gBerries[] = .size = 200, .maxYield = YIELD_RATE(4, 5, 20, 26), .minYield = YIELD_RATE(2, 1, 1, 2), - .description1 = sBerryDescriptionPart1_Tamato, - .description2 = sBerryDescriptionPart2_Tamato, + .description1 = COMPOUND_STRING("The Berry is lip-bendingly spicy."), + .description2 = COMPOUND_STRING("It takes time to grow."), .growthDuration = GROWTH_DURATION(24, 32, 48, 48, 32, 48), .spicy = 20, .dry = 10, @@ -796,8 +660,8 @@ const struct Berry gBerries[] = .size = 75, .maxYield = YIELD_RATE(4, 10, 15, 15), .minYield = YIELD_RATE(2, 2, 3, 3), - .description1 = sBerryDescriptionPart1_Cornn, - .description2 = sBerryDescriptionPart2_Cornn, + .description1 = COMPOUND_STRING("A Berry from an ancient era. May not"), + .description2 = COMPOUND_STRING("grow unless planted in quantity."), .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), .spicy = 0, .dry = 20, @@ -819,8 +683,8 @@ const struct Berry gBerries[] = .size = 140, .maxYield = YIELD_RATE(4, 10, 15, 15), .minYield = YIELD_RATE(2, 2, 3, 3), - .description1 = sBerryDescriptionPart1_Magost, - .description2 = sBerryDescriptionPart2_Magost, + .description1 = COMPOUND_STRING("A Berry that is widely said to have"), + .description2 = COMPOUND_STRING("a finely balanced flavor."), .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), .spicy = 0, .dry = 0, @@ -842,8 +706,8 @@ const struct Berry gBerries[] = .size = 226, .maxYield = YIELD_RATE(4, 10, 15, 15), .minYield = YIELD_RATE(2, 2, 3, 3), - .description1 = sBerryDescriptionPart1_Rabuta, - .description2 = sBerryDescriptionPart2_Rabuta, + .description1 = COMPOUND_STRING("A rare variety that is overgrown with"), + .description2 = COMPOUND_STRING("hair. It is quite bitter."), .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), .spicy = 0, .dry = 0, @@ -865,8 +729,8 @@ const struct Berry gBerries[] = .size = 285, .maxYield = YIELD_RATE(4, 10, 15, 15), .minYield = YIELD_RATE(2, 2, 3, 3), - .description1 = sBerryDescriptionPart1_Nomel, - .description2 = sBerryDescriptionPart2_Nomel, + .description1 = COMPOUND_STRING("Quite sour. Just one bite makes it"), + .description2 = COMPOUND_STRING("impossible to taste for three days."), .growthDuration = GROWTH_DURATION(24, 24, 36, 24, 16, 24), .spicy = 10, .dry = 0, @@ -888,8 +752,8 @@ const struct Berry gBerries[] = .size = 133, .maxYield = YIELD_RATE(2, 15, 15, 15), .minYield = YIELD_RATE(1, 2, 3, 3), - .description1 = sBerryDescriptionPart1_Spelon, - .description2 = sBerryDescriptionPart2_Spelon, + .description1 = COMPOUND_STRING("The vividly red Berry is very spicy."), + .description2 = COMPOUND_STRING("Its warts secrete a spicy substance."), .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 40, .dry = 10, @@ -911,8 +775,8 @@ const struct Berry gBerries[] = .size = 244, .maxYield = YIELD_RATE(2, 15, 15, 15), .minYield = YIELD_RATE(1, 3, 3, 3), - .description1 = sBerryDescriptionPart1_Pamtre, - .description2 = sBerryDescriptionPart2_Pamtre, + .description1 = COMPOUND_STRING("Drifts on the sea from somewhere."), + .description2 = COMPOUND_STRING("It is thought to grow elsewhere."), .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 0, .dry = 40, @@ -934,8 +798,8 @@ const struct Berry gBerries[] = .size = 250, .maxYield = YIELD_RATE(2, 15, 15, 15), .minYield = YIELD_RATE(1, 2, 3, 3), - .description1 = sBerryDescriptionPart1_Watmel, - .description2 = sBerryDescriptionPart2_Watmel, + .description1 = COMPOUND_STRING("A huge Berry, with some over 20"), + .description2 = COMPOUND_STRING("inches discovered. Exceedingly sweet."), .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 0, .dry = 0, @@ -957,8 +821,8 @@ const struct Berry gBerries[] = .size = 280, .maxYield = YIELD_RATE(2, 15, 15, 15), .minYield = YIELD_RATE(1, 3, 3, 3), - .description1 = sBerryDescriptionPart1_Durin, - .description2 = sBerryDescriptionPart2_Durin, + .description1 = COMPOUND_STRING("Bitter to even look at. It is so"), + .description2 = COMPOUND_STRING("bitter, no one has ever eaten it as is."), .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 0, .dry = 0, @@ -980,8 +844,8 @@ const struct Berry gBerries[] = .size = 300, .maxYield = YIELD_RATE(2, 15, 15, 15), .minYield = YIELD_RATE(1, 2, 3, 3), - .description1 = sBerryDescriptionPart1_Belue, - .description2 = sBerryDescriptionPart2_Belue, + .description1 = COMPOUND_STRING("It is glossy and looks delicious, but"), + .description2 = COMPOUND_STRING("it is awfully sour. Takes time to grow."), .growthDuration = GROWTH_DURATION(72, 60, 90, 24, 16, 24), .spicy = 10, .dry = 0, @@ -1003,8 +867,8 @@ const struct Berry gBerries[] = .size = 34, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Chilan, - .description2 = sBerryDescriptionPart2_Chilan, + .description1 = COMPOUND_STRING("It can be made into a whistle that"), + .description2 = COMPOUND_STRING("produces an indescribable sound."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 25, @@ -1026,8 +890,8 @@ const struct Berry gBerries[] = .size = 90, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Occa, - .description2 = sBerryDescriptionPart2_Occa, + .description1 = COMPOUND_STRING("Said to grow in the tropics once,"), + .description2 = COMPOUND_STRING("it boasts an intensely hot spiciness."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 15, .dry = 0, @@ -1049,8 +913,8 @@ const struct Berry gBerries[] = .size = 33, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Passho, - .description2 = sBerryDescriptionPart2_Passho, + .description1 = COMPOUND_STRING("Its flesh is dotted with many tiny"), + .description2 = COMPOUND_STRING("bubbles that keep it afloat in water."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 15, @@ -1072,8 +936,8 @@ const struct Berry gBerries[] = .size = 250, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Wacan, - .description2 = sBerryDescriptionPart2_Wacan, + .description1 = COMPOUND_STRING("Energy drawn from lightning strikes"), + .description2 = COMPOUND_STRING("makes this Berry grow big and rich."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, @@ -1095,8 +959,8 @@ const struct Berry gBerries[] = .size = 156, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Rindo, - .description2 = sBerryDescriptionPart2_Rindo, + .description1 = COMPOUND_STRING("This berry has a vegetable-like flavor,"), + .description2 = COMPOUND_STRING("but is rich in health-promoting fiber."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 10, .dry = 0, @@ -1118,8 +982,8 @@ const struct Berry gBerries[] = .size = 135, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Yache, - .description2 = sBerryDescriptionPart2_Yache, + .description1 = COMPOUND_STRING("This Berry has a refreshing dry and"), + .description2 = COMPOUND_STRING("sour flavor. Tastes better chilled."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 10, @@ -1141,8 +1005,8 @@ const struct Berry gBerries[] = .size = 77, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Chople, - .description2 = sBerryDescriptionPart2_Chople, + .description1 = COMPOUND_STRING("Contains a substance that generates"), + .description2 = COMPOUND_STRING("heat. Can even fire up a chilly heart."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 15, .dry = 0, @@ -1164,8 +1028,8 @@ const struct Berry gBerries[] = .size = 90, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Kebia, - .description2 = sBerryDescriptionPart2_Kebia, + .description1 = COMPOUND_STRING("Brilliant green on the outside, inside"), + .description2 = COMPOUND_STRING("it is packed with black-colored flesh."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 15, @@ -1187,8 +1051,8 @@ const struct Berry gBerries[] = .size = 42, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Shuca, - .description2 = sBerryDescriptionPart2_Shuca, + .description1 = COMPOUND_STRING("The sweet pulp has just the hint of a"), + .description2 = COMPOUND_STRING("a hard-edged and fragrant bite to it."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 10, .dry = 0, @@ -1210,8 +1074,8 @@ const struct Berry gBerries[] = .size = 278, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Coba, - .description2 = sBerryDescriptionPart2_Coba, + .description1 = COMPOUND_STRING("This Berry is said to be a cross of"), + .description2 = COMPOUND_STRING("two Berries blown in from far away."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 10, @@ -1233,8 +1097,8 @@ const struct Berry gBerries[] = .size = 252, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Payapa, - .description2 = sBerryDescriptionPart2_Payapa, + .description1 = COMPOUND_STRING("Said to sense human emotions, it swells"), + .description2 = COMPOUND_STRING("roundly when a person approaches."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, @@ -1256,8 +1120,8 @@ const struct Berry gBerries[] = .size = 42, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Tanga, - .description2 = sBerryDescriptionPart2_Tanga, + .description1 = COMPOUND_STRING("It grows a flower at the tip that lures"), + .description2 = COMPOUND_STRING("Bug Pokémon with its stringy petals."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 20, .dry = 0, @@ -1279,8 +1143,8 @@ const struct Berry gBerries[] = .size = 28, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Charti, - .description2 = sBerryDescriptionPart2_Charti, + .description1 = COMPOUND_STRING("Often used for pickles because of its"), + .description2 = COMPOUND_STRING("dry flavor. Sometimes eaten raw."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 10, .dry = 20, @@ -1302,8 +1166,8 @@ const struct Berry gBerries[] = .size = 144, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Kasib, - .description2 = sBerryDescriptionPart2_Kasib, + .description1 = COMPOUND_STRING("Old superstitions say it has an odd"), + .description2 = COMPOUND_STRING("power. A popular good-luck charm."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 10, @@ -1325,8 +1189,8 @@ const struct Berry gBerries[] = .size = 23, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Haban, - .description2 = sBerryDescriptionPart2_Haban, + .description1 = COMPOUND_STRING("Less bitter if enough of this Berry"), + .description2 = COMPOUND_STRING("is boiled down. Makes a good jam."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, @@ -1348,8 +1212,8 @@ const struct Berry gBerries[] = .size = 39, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Colbur, - .description2 = sBerryDescriptionPart2_Colbur, + .description1 = COMPOUND_STRING("Tiny hooks on the surface latch onto"), + .description2 = COMPOUND_STRING("Pokémon to reach far-off places."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, @@ -1371,8 +1235,8 @@ const struct Berry gBerries[] = .size = 265, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Babiri, - .description2 = sBerryDescriptionPart2_Babiri, + .description1 = COMPOUND_STRING("Very tough with a strong flavor. It"), + .description2 = COMPOUND_STRING("was used to make medicine in the past."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 25, .dry = 10, @@ -1394,8 +1258,8 @@ const struct Berry gBerries[] = .size = 35, .maxYield = YIELD_RATE(5, 5, 20, 10), .minYield = YIELD_RATE(2, 1, 3, 2), - .description1 = sBerryDescriptionPart1_Roseli, - .description2 = sBerryDescriptionPart2_Roseli, + .description1 = COMPOUND_STRING("In nature, they grow in wide rings"), + .description2 = COMPOUND_STRING("for reasons that are still unknown."), .growthDuration = GROWTH_DURATION(84, 72, 108, 48, 32, 48), .spicy = 0, .dry = 0, @@ -1417,8 +1281,8 @@ const struct Berry gBerries[] = .size = 111, .maxYield = YIELD_RATE(2, 5, 10, 13), .minYield = YIELD_RATE(1, 1, 1, 2), - .description1 = sBerryDescriptionPart1_Liechi, - .description2 = sBerryDescriptionPart2_Liechi, + .description1 = COMPOUND_STRING("A mysterious Berry. It is rumored to"), + .description2 = COMPOUND_STRING("contain the power of the sea."), .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 40, .dry = 0, @@ -1440,8 +1304,8 @@ const struct Berry gBerries[] = .size = 33, .maxYield = YIELD_RATE(2, 5, 10, 13), .minYield = YIELD_RATE(1, 1, 1, 2), - .description1 = sBerryDescriptionPart1_Ganlon, - .description2 = sBerryDescriptionPart2_Ganlon, + .description1 = COMPOUND_STRING("A mysterious Berry. It is rumored to"), + .description2 = COMPOUND_STRING("contain the power of the land."), .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 0, .dry = 40, @@ -1463,8 +1327,8 @@ const struct Berry gBerries[] = .size = 95, .maxYield = YIELD_RATE(2, 5, 10, 13), .minYield = YIELD_RATE(1, 1, 1, 2), - .description1 = sBerryDescriptionPart1_Salac, - .description2 = sBerryDescriptionPart2_Salac, + .description1 = COMPOUND_STRING("A mysterious Berry. It is rumored to"), + .description2 = COMPOUND_STRING("contain the power of the sky."), .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 0, .dry = 0, @@ -1486,8 +1350,8 @@ const struct Berry gBerries[] = .size = 237, .maxYield = YIELD_RATE(2, 5, 10, 13), .minYield = YIELD_RATE(1, 1, 1, 2), - .description1 = sBerryDescriptionPart1_Petaya, - .description2 = sBerryDescriptionPart2_Petaya, + .description1 = COMPOUND_STRING("A mysterious Berry. It is rumored to"), + .description2 = COMPOUND_STRING("contain the power of all living things."), .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 40, .dry = 0, @@ -1509,8 +1373,8 @@ const struct Berry gBerries[] = .size = 75, .maxYield = YIELD_RATE(2, 5, 10, 13), .minYield = YIELD_RATE(1, 1, 1, 2), - .description1 = sBerryDescriptionPart1_Apicot, - .description2 = sBerryDescriptionPart2_Apicot, + .description1 = COMPOUND_STRING("A very mystifying Berry. No telling"), + .description2 = COMPOUND_STRING("what may happen or how it can be used."), .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 0, .dry = 40, @@ -1532,8 +1396,8 @@ const struct Berry gBerries[] = .size = 97, .maxYield = YIELD_RATE(2, 5, 5, 7), .minYield = YIELD_RATE(1, 1, 1, 1), - .description1 = sBerryDescriptionPart1_Lansat, - .description2 = sBerryDescriptionPart2_Lansat, + .description1 = COMPOUND_STRING("Said to be a legendary Berry."), + .description2 = COMPOUND_STRING("Holding it supposedly brings joy."), .growthDuration = GROWTH_DURATION(96, 96, 144, 120, 48, 72), .spicy = 10, .dry = 10, @@ -1555,8 +1419,8 @@ const struct Berry gBerries[] = .size = 153, .maxYield = YIELD_RATE(2, 5, 5, 7), .minYield = YIELD_RATE(1, 1, 1, 1), - .description1 = sBerryDescriptionPart1_Starf, - .description2 = sBerryDescriptionPart2_Starf, + .description1 = COMPOUND_STRING("So strong, it was abandoned at the"), + .description2 = COMPOUND_STRING("world's edge. Considered a mirage."), .growthDuration = GROWTH_DURATION(96, 96, 144, 120, 48, 72), .spicy = 10, .dry = 10, @@ -1578,8 +1442,8 @@ const struct Berry gBerries[] = .size = 155, .maxYield = YIELD_RATE(2, 5, 5, 13), .minYield = YIELD_RATE(1, 1, 1, 1), - .description1 = sBerryDescriptionPart1_Enigma, - .description2 = sBerryDescriptionPart2_Enigma, + .description1 = COMPOUND_STRING("A completely enigmatic Berry."), + .description2 = COMPOUND_STRING("Appears to have the power of stars."), .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 40, .dry = 10, @@ -1601,8 +1465,8 @@ const struct Berry gBerries[] = .size = 41, .maxYield = YIELD_RATE(2, 5, 5, 13), .minYield = YIELD_RATE(1, 1, 1, 1), - .description1 = sBerryDescriptionPart1_Micle, - .description2 = sBerryDescriptionPart2_Micle, + .description1 = COMPOUND_STRING("It makes other food eaten at the"), + .description2 = COMPOUND_STRING("same time taste sweet."), .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 0, .dry = 40, @@ -1624,8 +1488,8 @@ const struct Berry gBerries[] = .size = 267, .maxYield = YIELD_RATE(2, 5, 5, 13), .minYield = YIELD_RATE(1, 1, 1, 1), - .description1 = sBerryDescriptionPart1_Custap, - .description2 = sBerryDescriptionPart2_Custap, + .description1 = COMPOUND_STRING("The flesh underneath the Custap"), + .description2 = COMPOUND_STRING("Berry's skin is sweet and creamy soft."), .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 0, .dry = 0, @@ -1647,8 +1511,8 @@ const struct Berry gBerries[] = .size = 33, .maxYield = YIELD_RATE(2, 5, 5, 13), .minYield = YIELD_RATE(1, 1, 1, 1), - .description1 = sBerryDescriptionPart1_Jaboca, - .description2 = sBerryDescriptionPart2_Jaboca, + .description1 = COMPOUND_STRING("The drupelets that make up this berry"), + .description2 = COMPOUND_STRING("pop rythmically if handled roughly."), .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 0, .dry = 0, @@ -1670,8 +1534,8 @@ const struct Berry gBerries[] = .size = 52, .maxYield = YIELD_RATE(2, 5, 5, 13), .minYield = YIELD_RATE(1, 1, 1, 1), - .description1 = sBerryDescriptionPart1_Rowap, - .description2 = sBerryDescriptionPart2_Rowap, + .description1 = COMPOUND_STRING("People once worked top-shaped pieces"), + .description2 = COMPOUND_STRING("of this berry free to use as toys."), .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 10, .dry = 0, @@ -1693,8 +1557,8 @@ const struct Berry gBerries[] = .size = 0, .maxYield = YIELD_RATE(2, 5, 10, 13), .minYield = YIELD_RATE(1, 1, 1, 2), - .description1 = sBerryDescriptionPart1_Kee, - .description2 = sBerryDescriptionPart2_Kee, + .description1 = COMPOUND_STRING("A berry that is incredibly spicy at"), + .description2 = COMPOUND_STRING("first, then extremely bitter."), .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 30, .dry = 30, @@ -1716,8 +1580,8 @@ const struct Berry gBerries[] = .size = 0, .maxYield = YIELD_RATE(2, 5, 10, 13), .minYield = YIELD_RATE(1, 1, 1, 2), - .description1 = sBerryDescriptionPart1_Maranga, - .description2 = sBerryDescriptionPart2_Maranga, + .description1 = COMPOUND_STRING("Its outside is very bitter, but its"), + .description2 = COMPOUND_STRING("inside tastes like a sweet drink."), .growthDuration = GROWTH_DURATION(96, 96, 144, 96, 48, 72), .spicy = 10, .dry = 10, @@ -1739,8 +1603,8 @@ const struct Berry gBerries[] = .size = 0, .maxYield = YIELD_RATE(2, 5, 5, 13), .minYield = YIELD_RATE(1, 1, 1, 1), - .description1 = sBerryDescriptionPart1_Enigma, - .description2 = sBerryDescriptionPart2_Enigma, + .description1 = COMPOUND_STRING("A completely enigmatic Berry."), + .description2 = COMPOUND_STRING("Appears to have the power of stars."), .growthDuration = GROWTH_DURATION(96, 96, 144, 72, 48, 72), .spicy = 40, .dry = 40, From b56a9e62860a7c5eba7c6580cbf2f0b8d1b75665 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 4 Jan 2024 16:04:00 +0000 Subject: [PATCH 66/82] Remove unused function --- include/berry.h | 1 - src/berry.c | 6 ------ 2 files changed, 7 deletions(-) diff --git a/include/berry.h b/include/berry.h index 13cf77d4dd..ba1bbb1d12 100644 --- a/include/berry.h +++ b/include/berry.h @@ -1,7 +1,6 @@ #ifndef GUARD_BERRY_H #define GUARD_BERRY_H -void ClearEnigmaBerries(void); void SetEnigmaBerry(u8 *src); bool32 IsEnigmaBerryValid(void); const struct Berry *GetBerryInfo(u8 berry); diff --git a/src/berry.c b/src/berry.c index 88c4a16fe3..a73c9ddf12 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1667,12 +1667,6 @@ const struct BerryCrushBerryData gBerryCrush_BerryData[] = { const struct BerryTree gBlankBerryTree = {}; -// unused -void ClearEnigmaBerries(void) -{ - CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, sizeof(gSaveBlock1Ptr->enigmaBerry)); -} - void SetEnigmaBerry(u8 *src) { u32 i; From b948accc804168391cd4c964950d2bc53de5d63b Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 4 Jan 2024 16:07:12 +0000 Subject: [PATCH 67/82] Remove redundant table --- include/event_object_movement.h | 1 - .../berry_tree_graphics_tables.h | 70 ------------------- src/event_object_movement.c | 2 +- 3 files changed, 1 insertion(+), 72 deletions(-) diff --git a/include/event_object_movement.h b/include/event_object_movement.h index b48522ebc8..276c4340de 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -94,7 +94,6 @@ extern const struct OamData gObjectEventBaseOam_32x32; extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; extern const u8 gReflectionEffectPaletteMap[]; -extern const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[]; extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[]; extern const u8 *const gBerryTreePaletteSlotTablePointers[]; diff --git a/src/data/object_events/berry_tree_graphics_tables.h b/src/data/object_events/berry_tree_graphics_tables.h index 63559a326c..585c2ddb16 100755 --- a/src/data/object_events/berry_tree_graphics_tables.h +++ b/src/data/object_events/berry_tree_graphics_tables.h @@ -774,73 +774,3 @@ const u8 *const gBerryTreePaletteSlotTablePointers[] = { [ITEM_ENIGMA_BERRY_E_READER - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, }; -const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[] = { - [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_COBA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, - [ITEM_ENIGMA_BERRY_E_READER - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, -}; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 6cd6955031..fc14b5127a 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1888,7 +1888,7 @@ static void SetBerryTreeGraphics(struct ObjectEvent *objectEvent, struct Sprite if (berryId > ITEM_TO_BERRY(LAST_BERRY_INDEX)) berryId = 0; - ObjectEventSetGraphicsId(objectEvent, gBerryTreeObjectEventGraphicsIdTablePointers[berryId][berryStage]); + ObjectEventSetGraphicsId(objectEvent, gBerryTreeObjectEventGraphicsIdTable[berryStage]); sprite->images = gBerryTreePicTablePointers[berryId]; sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[berryId][berryStage]; StartSpriteAnim(sprite, berryStage); From 1ee568ac6b44098fd1713635bff1f195190753bc Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 4 Jan 2024 16:12:39 +0000 Subject: [PATCH 68/82] Remove leftover code for myself --- include/global.berry.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/global.berry.h b/include/global.berry.h index f5967d4839..a8a76c089e 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -4,10 +4,6 @@ #define BERRY_NAME_LENGTH 6 #define BERRY_ITEM_EFFECT_COUNT 18 -// water up to 15 (4 bits) -// weeds up to 7 * 0.5 (3 bits), 0 => 0.1 -// pests up to 7 * 0.5 (3 bits), 0 => 0.2 - struct Berry { const u8 name[BERRY_NAME_LENGTH + 1]; From 8b80a54a7a849cb957b11c0927dea7368c5cdaae Mon Sep 17 00:00:00 2001 From: BiffaloXIII <155677715+BiffaloXIII@users.noreply.github.com> Date: Thu, 4 Jan 2024 17:54:03 -0300 Subject: [PATCH 69/82] Removed footprint field when P_FOOTPRINTS is FALSE (#3925) --- include/pokedex.h | 1 + include/pokemon.h | 2 + src/data/pokemon/species_info.h | 6 +- src/data/pokemon/species_info/gen_1.h | 374 +++++++++++++------------- src/data/pokemon/species_info/gen_2.h | 204 +++++++------- src/data/pokemon/species_info/gen_3.h | 282 +++++++++---------- src/data/pokemon/species_info/gen_4.h | 156 +++++------ src/data/pokemon/species_info/gen_5.h | 318 +++++++++++----------- src/data/pokemon/species_info/gen_6.h | 142 +++++----- src/data/pokemon/species_info/gen_7.h | 176 ++++++------ src/data/pokemon/species_info/gen_8.h | 184 ++++++------- src/data/pokemon/species_info/gen_9.h | 226 ++++++++-------- src/pokedex.c | 16 +- src/pokedex_plus_hgss.c | 44 --- src/pokemon_debug.c | 32 +-- 15 files changed, 1048 insertions(+), 1115 deletions(-) diff --git a/include/pokedex.h b/include/pokedex.h index c2169c6994..c53d3e013b 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -23,6 +23,7 @@ u16 GetNationalPokedexCount(u8); u16 GetHoennPokedexCount(u8); u8 DisplayCaughtMonDexPage(u16 species, bool32 isShiny, u32 personality); s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); +void DrawFootprint(u8 windowId, u16 species); u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16); bool16 HasAllHoennMons(void); void ResetPokedexScrollPositions(void); diff --git a/include/pokemon.h b/include/pokemon.h index 87d74b766c..c5f6f51cb6 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -403,7 +403,9 @@ struct SpeciesInfo /*0x8C*/ /* 0x64 */ const u32 *shinyPaletteFemale; /* 0x68 */ const u8 *iconSprite; /* 0x6C */ const u8 *iconSpriteFemale; +#if P_FOOTPRINTS /* 0x70 */ const u8 *footprint; +#endif // All Pokémon pics are 64x64, but this data table defines where in this 64x64 frame the sprite's non-transparent pixels actually are. /* 0x74 */ u8 frontPicSize; // The dimensions of this drawn pixel area. /* 0x74 */ u8 frontPicSizeFemale; // The dimensions of this drawn pixel area. diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 2e0d6bb791..0b0803f376 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -218,9 +218,9 @@ const u8 gOgerponCornerstoneMaskPokedexText[] = _( .teachableLearnset = s ## learn##TeachableLearnset #if P_FOOTPRINTS -#define FOOTPRINT(sprite) .footprint = gMonFootprint_## sprite +#define FOOTPRINT(sprite) .footprint = gMonFootprint_## sprite, #else -#define FOOTPRINT(sprite) .footprint = NULL +#define FOOTPRINT(sprite) #endif // Maximum value for a female Pokémon is 254 (MON_FEMALE) which is 100% female. @@ -336,7 +336,7 @@ const struct SpeciesInfo gSpeciesInfo[] = //PALETTE_FEMALE(CircledQuestionMark), ICON(QuestionMark, 0), //ICON_FEMALE(QuestionMark, 1), - //FOOTPRINT(None), + //FOOTPRINT(None) LEARNSETS(None), .evolutions = EVOLUTION({EVO_LEVEL, 100, SPECIES_NONE}, {EVO_ITEM, ITEM_MOOMOO_MILK, SPECIES_NONE}), diff --git a/src/data/pokemon/species_info/gen_1.h b/src/data/pokemon/species_info/gen_1.h index ba72bca4cf..fbba8e5e2d 100644 --- a/src/data/pokemon/species_info/gen_1.h +++ b/src/data/pokemon/species_info/gen_1.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Bulbasaur), ICON(Bulbasaur, 4), - FOOTPRINT(Bulbasaur), + FOOTPRINT(Bulbasaur) LEARNSETS(Bulbasaur), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_IVYSAUR}), }, @@ -96,7 +96,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Ivysaur), ICON(Ivysaur, 4), - FOOTPRINT(Ivysaur), + FOOTPRINT(Ivysaur) LEARNSETS(Ivysaur), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_VENUSAUR}), }, @@ -115,7 +115,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Venusaur"), \ .natDexNum = NATIONAL_DEX_VENUSAUR, \ .categoryName = _("Seed"), \ - FOOTPRINT(Venusaur), \ + FOOTPRINT(Venusaur) \ LEARNSETS(Venusaur), \ .formSpeciesIdTable = sVenusaurFormSpeciesIdTable, \ .formChangeTable = sVenusaurFormChangeTable @@ -274,7 +274,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Charmander), ICON(Charmander, 0), - FOOTPRINT(Charmander), + FOOTPRINT(Charmander) LEARNSETS(Charmander), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_CHARMELEON}), }, @@ -323,7 +323,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Charmeleon), ICON(Charmeleon, 0), - FOOTPRINT(Charmeleon), + FOOTPRINT(Charmeleon) LEARNSETS(Charmeleon), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_CHARIZARD}), }, @@ -339,7 +339,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Charizard"), \ .natDexNum = NATIONAL_DEX_CHARIZARD, \ .categoryName = _("Flame"), \ - FOOTPRINT(Charizard), \ + FOOTPRINT(Charizard) \ LEARNSETS(Charizard), \ .formSpeciesIdTable = sCharizardFormSpeciesIdTable, \ .formChangeTable = sCharizardFormChangeTable @@ -539,7 +539,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Squirtle), ICON(Squirtle, 0), - FOOTPRINT(Squirtle), + FOOTPRINT(Squirtle) LEARNSETS(Squirtle), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_WARTORTLE}), }, @@ -588,7 +588,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Wartortle), ICON(Wartortle, 2), - FOOTPRINT(Wartortle), + FOOTPRINT(Wartortle) LEARNSETS(Wartortle), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_BLASTOISE}), }, @@ -606,7 +606,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Blastoise"), \ .natDexNum = NATIONAL_DEX_BLASTOISE, \ .categoryName = _("Shellfish"), \ - FOOTPRINT(Blastoise), \ + FOOTPRINT(Blastoise) \ LEARNSETS(Blastoise), \ .formSpeciesIdTable = sBlastoiseFormSpeciesIdTable, \ .formChangeTable = sBlastoiseFormChangeTable @@ -765,7 +765,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Caterpie), ICON(Caterpie, 1), - FOOTPRINT(Caterpie), + FOOTPRINT(Caterpie) LEARNSETS(Caterpie), .evolutions = EVOLUTION({EVO_LEVEL, 7, SPECIES_METAPOD}), }, @@ -813,7 +813,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Metapod), ICON(Metapod, 1), - FOOTPRINT(Metapod), + FOOTPRINT(Metapod) LEARNSETS(Metapod), .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_BUTTERFREE}), }, @@ -842,7 +842,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_BUTTERFREE, \ .natDexNum = NATIONAL_DEX_BUTTERFREE, \ .categoryName = _("Butterfly"), \ - FOOTPRINT(Butterfree), \ + FOOTPRINT(Butterfree) \ LEARNSETS(Butterfree), \ .formSpeciesIdTable = sButterfreeFormSpeciesIdTable, \ .formChangeTable = sButterfreeFormChangeTable @@ -950,7 +950,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Weedle), ICON(Weedle, 2), - FOOTPRINT(Weedle), + FOOTPRINT(Weedle) LEARNSETS(Weedle), .evolutions = EVOLUTION({EVO_LEVEL, 7, SPECIES_KAKUNA}), }, @@ -999,7 +999,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Kakuna), ICON(Kakuna, 2), - FOOTPRINT(Kakuna), + FOOTPRINT(Kakuna) LEARNSETS(Kakuna), .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_BEEDRILL}), }, @@ -1021,7 +1021,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Beedrill"), \ .natDexNum = NATIONAL_DEX_BEEDRILL, \ .categoryName = _("Poison Bee"), \ - FOOTPRINT(Beedrill), \ + FOOTPRINT(Beedrill) \ LEARNSETS(Beedrill), \ .formSpeciesIdTable = sBeedrillFormSpeciesIdTable, \ .formChangeTable = sBeedrillFormChangeTable @@ -1144,7 +1144,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Pidgey), ICON(Pidgey, 0), - FOOTPRINT(Pidgey), + FOOTPRINT(Pidgey) LEARNSETS(Pidgey), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_PIDGEOTTO}), }, @@ -1193,7 +1193,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Pidgeotto), ICON(Pidgeotto, 0), - FOOTPRINT(Pidgeotto), + FOOTPRINT(Pidgeotto) LEARNSETS(Pidgeotto), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_PIDGEOT}), }, @@ -1213,7 +1213,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Pidgeot"), \ .natDexNum = NATIONAL_DEX_PIDGEOT, \ .categoryName = _("Bird"), \ - FOOTPRINT(Pidgeot), \ + FOOTPRINT(Pidgeot) \ LEARNSETS(Pidgeot), \ .formSpeciesIdTable = sPidgeotFormSpeciesIdTable, \ .formChangeTable = sPidgeotFormChangeTable @@ -1313,7 +1313,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_RATTATA, \ .natDexNum = NATIONAL_DEX_RATTATA, \ .categoryName = _("Mouse"), \ - FOOTPRINT(Rattata), \ + FOOTPRINT(Rattata) \ .formSpeciesIdTable = sRattataFormSpeciesIdTable #define RATICATE_MISC_INFO \ @@ -1325,7 +1325,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_RATICATE, \ .categoryName = _("Mouse"), \ .height = 7, \ - FOOTPRINT(Raticate), \ + FOOTPRINT(Raticate) \ .formSpeciesIdTable = sRaticateFormSpeciesIdTable [SPECIES_RATTATA] = @@ -1516,7 +1516,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Spearow), ICON(Spearow, 0), - FOOTPRINT(Spearow), + FOOTPRINT(Spearow) LEARNSETS(Spearow), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_FEAROW}), }, @@ -1567,7 +1567,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Fearow), ICON(Fearow, 0), - FOOTPRINT(Fearow), + FOOTPRINT(Fearow) LEARNSETS(Fearow), }, #endif //P_FAMILY_SPEAROW @@ -1617,7 +1617,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Ekans), ICON(Ekans, 2), - FOOTPRINT(Ekans), + FOOTPRINT(Ekans) LEARNSETS(Ekans), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARBOK}), }, @@ -1665,7 +1665,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Arbok), ICON(Arbok, 2), - FOOTPRINT(Arbok), + FOOTPRINT(Arbok) LEARNSETS(Arbok), }, #endif //P_FAMILY_EKANS @@ -1701,7 +1701,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 20, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Pichu), \ + FOOTPRINT(Pichu) \ LEARNSETS(Pichu), \ .formSpeciesIdTable = sPichuFormSpeciesIdTable @@ -1757,7 +1757,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_PIKACHU, \ .natDexNum = NATIONAL_DEX_PIKACHU, \ .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu), \ + FOOTPRINT(Pikachu) \ LEARNSETS(Pikachu), \ .formSpeciesIdTable = sPikachuFormSpeciesIdTable @@ -2102,7 +2102,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_RAICHU, \ .natDexNum = NATIONAL_DEX_RAICHU, \ .categoryName = _("Mouse"), \ - FOOTPRINT(Raichu), \ + FOOTPRINT(Raichu) \ .formSpeciesIdTable = sRaichuFormSpeciesIdTable [SPECIES_RAICHU] = @@ -2198,7 +2198,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_SANDSHREW, \ .natDexNum = NATIONAL_DEX_SANDSHREW, \ .categoryName = _("Mouse"), \ - FOOTPRINT(Sandshrew), \ + FOOTPRINT(Sandshrew) \ .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, \ SANDSHREW_FAMILY_MISC_INFO @@ -2210,7 +2210,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_SANDSLASH, \ .natDexNum = NATIONAL_DEX_SANDSLASH, \ .categoryName = _("Mouse"), \ - FOOTPRINT(Sandslash), \ + FOOTPRINT(Sandslash) \ .formSpeciesIdTable = sSandslashFormSpeciesIdTable, \ SANDSHREW_FAMILY_MISC_INFO @@ -2406,7 +2406,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(NidoranF), ICON(NidoranF, 0), - FOOTPRINT(NidoranF), + FOOTPRINT(NidoranF) LEARNSETS(NidoranF), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_NIDORINA}), }, @@ -2454,7 +2454,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Nidorina), ICON(Nidorina, 0), - FOOTPRINT(Nidorina), + FOOTPRINT(Nidorina) LEARNSETS(Nidorina), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOQUEEN}), }, @@ -2502,7 +2502,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Nidoqueen), ICON(Nidoqueen, 2), - FOOTPRINT(Nidoqueen), + FOOTPRINT(Nidoqueen) LEARNSETS(Nidoqueen), }, @@ -2549,7 +2549,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(NidoranM), ICON(NidoranM, 2), - FOOTPRINT(NidoranM), + FOOTPRINT(NidoranM) LEARNSETS(NidoranM), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_NIDORINO}), }, @@ -2597,7 +2597,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Nidorino), ICON(Nidorino, 2), - FOOTPRINT(Nidorino), + FOOTPRINT(Nidorino) LEARNSETS(Nidorino), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOKING}), }, @@ -2646,7 +2646,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Nidoking), ICON(Nidoking, 2), - FOOTPRINT(Nidoking), + FOOTPRINT(Nidoking) LEARNSETS(Nidoking), }, #endif //P_FAMILY_NIDORAN @@ -2704,7 +2704,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Cleffa), ICON(Cleffa, 0), - FOOTPRINT(Cleffa), + FOOTPRINT(Cleffa) LEARNSETS(Cleffa), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_CLEFAIRY}), }, @@ -2755,7 +2755,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Clefairy), ICON(Clefairy, 0), - FOOTPRINT(Clefairy), + FOOTPRINT(Clefairy) LEARNSETS(Clefairy), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_CLEFABLE}), }, @@ -2805,7 +2805,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Clefable), ICON(Clefable, 0), - FOOTPRINT(Clefable), + FOOTPRINT(Clefable) LEARNSETS(Clefable), }, #endif //P_FAMILY_CLEFAIRY @@ -2838,7 +2838,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Vulpix), \ + FOOTPRINT(Vulpix) \ .formSpeciesIdTable = sVulpixFormSpeciesIdTable,\ VULPIX_FAMILY_MISC_INFO @@ -2857,7 +2857,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Ninetales), \ + FOOTPRINT(Ninetales) \ .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, \ VULPIX_FAMILY_MISC_INFO @@ -3028,7 +3028,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Igglybuff), ICON(Igglybuff, 1), - FOOTPRINT(Igglybuff), + FOOTPRINT(Igglybuff) LEARNSETS(Igglybuff), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF}), }, @@ -3079,7 +3079,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Jigglypuff), ICON(Jigglypuff, 0), - FOOTPRINT(Jigglypuff), + FOOTPRINT(Jigglypuff) LEARNSETS(Jigglypuff), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_WIGGLYTUFF}), }, @@ -3129,7 +3129,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Wigglytuff), ICON(Wigglytuff, 0), - FOOTPRINT(Wigglytuff), + FOOTPRINT(Wigglytuff) LEARNSETS(Wigglytuff), }, #endif //P_FAMILY_JIGGLYPUFF @@ -3181,7 +3181,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Zubat), ICON(Zubat, 2), - FOOTPRINT(Zubat), + FOOTPRINT(Zubat) LEARNSETS(Zubat), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_GOLBAT}), }, @@ -3232,7 +3232,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Golbat), ICON(Golbat, 2), - FOOTPRINT(Golbat), + FOOTPRINT(Golbat) LEARNSETS(Golbat), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_CROBAT}), }, @@ -3282,7 +3282,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Crobat), ICON(Crobat, 2), - FOOTPRINT(Crobat), + FOOTPRINT(Crobat) LEARNSETS(Crobat), }, #endif //P_GEN_2_CROSS_EVOS @@ -3333,7 +3333,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Oddish), ICON(Oddish, 4), - FOOTPRINT(Oddish), + FOOTPRINT(Oddish) LEARNSETS(Oddish), .evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_GLOOM}), }, @@ -3384,7 +3384,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Gloom), ICON(Gloom, 0), - FOOTPRINT(Gloom), + FOOTPRINT(Gloom) LEARNSETS(Gloom), .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VILEPLUME}, {EVO_ITEM, ITEM_SUN_STONE, SPECIES_BELLOSSOM}), @@ -3436,7 +3436,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Vileplume), ICON(Vileplume, 0), - FOOTPRINT(Vileplume), + FOOTPRINT(Vileplume) LEARNSETS(Vileplume), }, @@ -3485,7 +3485,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Bellossom), ICON(Bellossom, 1), - FOOTPRINT(Bellossom), + FOOTPRINT(Bellossom) LEARNSETS(Bellossom), }, #endif //P_GEN_2_CROSS_EVOS @@ -3538,7 +3538,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Paras), ICON(Paras, 0), - FOOTPRINT(Paras), + FOOTPRINT(Paras) LEARNSETS(Paras), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_PARASECT}), }, @@ -3590,7 +3590,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Parasect), ICON(Parasect, 0), - FOOTPRINT(Parasect), + FOOTPRINT(Parasect) LEARNSETS(Parasect), }, #endif //P_FAMILY_PARAS @@ -3640,7 +3640,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Venonat), ICON(Venonat, 2), - FOOTPRINT(Venonat), + FOOTPRINT(Venonat) LEARNSETS(Venonat), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_VENOMOTH}), }, @@ -3691,7 +3691,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Venomoth), ICON(Venomoth, 2), - FOOTPRINT(Venomoth), + FOOTPRINT(Venomoth) LEARNSETS(Venomoth), }, #endif //P_FAMILY_VENONAT @@ -3719,7 +3719,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 25, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Diglett), \ + FOOTPRINT(Diglett) \ .formSpeciesIdTable = sDiglettFormSpeciesIdTable, \ DIGLETT_FAMILY_MISC_INFO @@ -3879,7 +3879,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_MEOWTH, \ .natDexNum = NATIONAL_DEX_MEOWTH, \ .categoryName = _("Scratch Cat"), \ - FOOTPRINT(Meowth), \ + FOOTPRINT(Meowth) \ .formSpeciesIdTable = sMeowthFormSpeciesIdTable #define PERSIAN_MISC_INFO \ @@ -3896,7 +3896,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_PERSIAN, \ .natDexNum = NATIONAL_DEX_PERSIAN, \ .categoryName = _("Classy Cat"), \ - FOOTPRINT(Persian), \ + FOOTPRINT(Persian) \ .formSpeciesIdTable = sPersianFormSpeciesIdTable [SPECIES_MEOWTH] = @@ -4133,7 +4133,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Perrserker), ICON(Perrserker, 2), - FOOTPRINT(Perrserker), + FOOTPRINT(Perrserker) LEARNSETS(Perrserker), }, #endif //P_GALARIAN_FORMS @@ -4224,7 +4224,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Psyduck), ICON(Psyduck, 1), - FOOTPRINT(Psyduck), + FOOTPRINT(Psyduck) LEARNSETS(Psyduck), .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_GOLDUCK}), }, @@ -4272,7 +4272,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Golduck), ICON(Golduck, 0), - FOOTPRINT(Golduck), + FOOTPRINT(Golduck) LEARNSETS(Golduck), }, #endif //P_FAMILY_PSYDUCK @@ -4322,7 +4322,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Mankey), ICON(Mankey, 1), - FOOTPRINT(Mankey), + FOOTPRINT(Mankey) LEARNSETS(Mankey), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_PRIMEAPE}), }, @@ -4370,7 +4370,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Primeape), ICON(Primeape, 2), - FOOTPRINT(Primeape), + FOOTPRINT(Primeape) LEARNSETS(Primeape), .evolutions = EVOLUTION({EVO_MOVE, MOVE_RAGE_FIST, SPECIES_ANNIHILAPE}), }, @@ -4419,7 +4419,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Annihilape), ICON(Annihilape, 0), - //FOOTPRINT(Annihilape), + //FOOTPRINT(Annihilape) LEARNSETS(Annihilape), }, #endif //P_GEN_9_CROSS_EVOS @@ -4441,7 +4441,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Growlithe"), \ .cryId = CRY_GROWLITHE, \ .natDexNum = NATIONAL_DEX_GROWLITHE, \ - FOOTPRINT(Growlithe), \ + FOOTPRINT(Growlithe) \ .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, \ GROWLITHE_FAMILY_MISC_INFO @@ -4453,7 +4453,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_ARCANINE, \ .natDexNum = NATIONAL_DEX_ARCANINE, \ .categoryName = _("Legendary"), \ - FOOTPRINT(Arcanine), \ + FOOTPRINT(Arcanine) \ .formSpeciesIdTable = sArcanineFormSpeciesIdTable, \ GROWLITHE_FAMILY_MISC_INFO @@ -4649,7 +4649,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Poliwag), ICON(Poliwag, 0), - FOOTPRINT(Poliwag), + FOOTPRINT(Poliwag) LEARNSETS(Poliwag), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_POLIWHIRL}), }, @@ -4700,7 +4700,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Poliwhirl), ICON(Poliwhirl, 0), - FOOTPRINT(Poliwhirl), + FOOTPRINT(Poliwhirl) LEARNSETS(Poliwhirl), .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_POLIWRATH}, {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_POLITOED}, @@ -4752,7 +4752,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Poliwrath), ICON(Poliwrath, 0), - FOOTPRINT(Poliwrath), + FOOTPRINT(Poliwrath) LEARNSETS(Poliwrath), }, @@ -4805,7 +4805,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Politoed), ICON(Politoed, 1), - FOOTPRINT(Politoed), + FOOTPRINT(Politoed) LEARNSETS(Politoed), }, #endif //P_GEN_2_CROSS_EVOS @@ -4856,7 +4856,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Abra), ICON(Abra, 2), - FOOTPRINT(Abra), + FOOTPRINT(Abra) LEARNSETS(Abra), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_KADABRA}), }, @@ -4908,7 +4908,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Kadabra), ICON(Kadabra, 2), - FOOTPRINT(Kadabra), + FOOTPRINT(Kadabra) LEARNSETS(Kadabra), .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_ALAKAZAM}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_ALAKAZAM}), @@ -4930,7 +4930,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Alakazam"), \ .natDexNum = NATIONAL_DEX_ALAKAZAM, \ .categoryName = _("Psi"), \ - FOOTPRINT(Alakazam), \ + FOOTPRINT(Alakazam) \ LEARNSETS(Alakazam), \ .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, \ .formChangeTable = sAlakazamFormChangeTable @@ -5054,7 +5054,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Machop), ICON(Machop, 0), - FOOTPRINT(Machop), + FOOTPRINT(Machop) LEARNSETS(Machop), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_MACHOKE}), }, @@ -5104,7 +5104,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Machoke), ICON(Machoke, 2), - FOOTPRINT(Machoke), + FOOTPRINT(Machoke) LEARNSETS(Machoke), .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_MACHAMP}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_MACHAMP}), @@ -5133,7 +5133,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_MACHAMP, \ .natDexNum = NATIONAL_DEX_MACHAMP, \ .categoryName = _("Superpower"), \ - FOOTPRINT(Machamp), \ + FOOTPRINT(Machamp) \ LEARNSETS(Machamp), \ .formSpeciesIdTable = sMachampFormSpeciesIdTable, \ .formChangeTable = sMachampFormChangeTable @@ -5236,7 +5236,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Bellsprout), ICON(Bellsprout, 1), - FOOTPRINT(Bellsprout), + FOOTPRINT(Bellsprout) LEARNSETS(Bellsprout), .evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_WEEPINBELL}), }, @@ -5285,7 +5285,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Weepinbell), ICON(Weepinbell, 1), - FOOTPRINT(Weepinbell), + FOOTPRINT(Weepinbell) LEARNSETS(Weepinbell), .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VICTREEBEL}), }, @@ -5333,7 +5333,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Victreebel), ICON(Victreebel, 1), - FOOTPRINT(Victreebel), + FOOTPRINT(Victreebel) LEARNSETS(Victreebel), }, #endif //P_FAMILY_BELLSPROUT @@ -5383,7 +5383,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Tentacool), ICON(Tentacool, 0), - FOOTPRINT(Tentacool), + FOOTPRINT(Tentacool) LEARNSETS(Tentacool), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_TENTACRUEL}), }, @@ -5432,7 +5432,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Tentacruel), ICON(Tentacruel, 0), - FOOTPRINT(Tentacruel), + FOOTPRINT(Tentacruel) LEARNSETS(Tentacruel), }, #endif //P_FAMILY_TENTACOOL @@ -5470,7 +5470,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Geodude), \ + FOOTPRINT(Geodude) \ .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, \ GEODUDE_FAMILY_MISC_INFO @@ -5493,7 +5493,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Graveler), \ + FOOTPRINT(Graveler) \ .formSpeciesIdTable = sGravelerFormSpeciesIdTable, \ GEODUDE_FAMILY_MISC_INFO @@ -5513,7 +5513,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_GOLEM, \ .natDexNum = NATIONAL_DEX_GOLEM, \ .categoryName = _("Megaton"), \ - FOOTPRINT(Golem), \ + FOOTPRINT(Golem) \ .formSpeciesIdTable = sGolemFormSpeciesIdTable, \ GEODUDE_FAMILY_MISC_INFO @@ -5704,7 +5704,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Ponyta"), \ .cryId = CRY_PONYTA, \ .natDexNum = NATIONAL_DEX_PONYTA, \ - FOOTPRINT(Ponyta), \ + FOOTPRINT(Ponyta) \ .formSpeciesIdTable = sPonytaFormSpeciesIdTable,\ PONYTA_FAMILY_MISC_INFO @@ -5726,7 +5726,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, \ .trainerScale = 289, \ .trainerOffset = 1, \ - FOOTPRINT(Rapidash), \ + FOOTPRINT(Rapidash) \ .formSpeciesIdTable = sRapidashFormSpeciesIdTable, \ PONYTA_FAMILY_MISC_INFO @@ -5871,7 +5871,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Slowpoke), \ + FOOTPRINT(Slowpoke) \ .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable #define SLOWBRO_MISC_INFO \ @@ -5887,7 +5887,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_SLOWBRO, \ .natDexNum = NATIONAL_DEX_SLOWBRO, \ .categoryName = _("Hermit Crab"), \ - FOOTPRINT(Slowbro), \ + FOOTPRINT(Slowbro) \ .formSpeciesIdTable = sSlowbroFormSpeciesIdTable #define SLOWKING_MISC_INFO \ @@ -5903,7 +5903,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_SLOWKING, \ .natDexNum = NATIONAL_DEX_SLOWKING, \ .weight = 795, \ - FOOTPRINT(Slowking), \ + FOOTPRINT(Slowking) \ .formSpeciesIdTable = sSlowkingFormSpeciesIdTable [SPECIES_SLOWPOKE] = @@ -6198,7 +6198,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Magnemite), ICON(Magnemite, 0), - FOOTPRINT(Magnemite), + FOOTPRINT(Magnemite) LEARNSETS(Magnemite), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MAGNETON}), }, @@ -6248,7 +6248,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Magneton), ICON(Magneton, 0), - FOOTPRINT(Magneton), + FOOTPRINT(Magneton) LEARNSETS(Magneton), .evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_MAGNEZONE}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_MAGNEZONE}), @@ -6300,7 +6300,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Magnezone), ICON(Magnezone, 0), - FOOTPRINT(Magnezone), + FOOTPRINT(Magnezone) LEARNSETS(Magnezone), }, #endif //P_GEN_4_CROSS_EVOS @@ -6323,7 +6323,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_FARFETCHD, \ .natDexNum = NATIONAL_DEX_FARFETCHD, \ .categoryName = _("Wild Duck"), \ - FOOTPRINT(Farfetchd), \ + FOOTPRINT(Farfetchd) \ .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable [SPECIES_FARFETCHD] = @@ -6443,7 +6443,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Sirfetchd), ICON(Sirfetchd, 1), - FOOTPRINT(Sirfetchd), + FOOTPRINT(Sirfetchd) LEARNSETS(Sirfetchd), }, #endif //P_GALARIAN_FORMS @@ -6496,7 +6496,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Doduo), ICON(Doduo, 2), - FOOTPRINT(Doduo), + FOOTPRINT(Doduo) LEARNSETS(Doduo), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_DODRIO}), }, @@ -6547,7 +6547,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Dodrio), ICON(Dodrio, 2), - FOOTPRINT(Dodrio), + FOOTPRINT(Dodrio) LEARNSETS(Dodrio), }, #endif //P_FAMILY_DODUO @@ -6596,7 +6596,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Seel), ICON(Seel, 0), - FOOTPRINT(Seel), + FOOTPRINT(Seel) LEARNSETS(Seel), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_DEWGONG}), }, @@ -6644,7 +6644,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Dewgong), ICON(Dewgong, 2), - FOOTPRINT(Dewgong), + FOOTPRINT(Dewgong) LEARNSETS(Dewgong), }, #endif //P_FAMILY_SEEL @@ -6672,7 +6672,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_GRIMER, \ .natDexNum = NATIONAL_DEX_GRIMER, \ .categoryName = _("Sludge"), \ - FOOTPRINT(Grimer), \ + FOOTPRINT(Grimer) \ .formSpeciesIdTable = sGrimerFormSpeciesIdTable,\ GRIMER_FAMILY_MISC_INFO @@ -6691,7 +6691,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_MUK, \ .natDexNum = NATIONAL_DEX_MUK, \ .categoryName = _("Sludge"), \ - FOOTPRINT(Muk), \ + FOOTPRINT(Muk) \ .formSpeciesIdTable = sMukFormSpeciesIdTable, \ GRIMER_FAMILY_MISC_INFO @@ -6868,7 +6868,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Shellder), ICON(Shellder, 2), - FOOTPRINT(Shellder), + FOOTPRINT(Shellder) LEARNSETS(Shellder), .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_CLOYSTER}), }, @@ -6918,7 +6918,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Cloyster), ICON(Cloyster, 2), - FOOTPRINT(Cloyster), + FOOTPRINT(Cloyster) LEARNSETS(Cloyster), }, #endif //P_FAMILY_SHELLDER @@ -6968,7 +6968,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Gastly), ICON(Gastly, 2), - FOOTPRINT(Gastly), + FOOTPRINT(Gastly) LEARNSETS(Gastly), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_HAUNTER}), }, @@ -7018,7 +7018,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Haunter), ICON(Haunter, 2), - FOOTPRINT(Haunter), + FOOTPRINT(Haunter) LEARNSETS(Haunter), .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GENGAR}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GENGAR}), @@ -7043,7 +7043,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Gengar"), \ .natDexNum = NATIONAL_DEX_GENGAR, \ .categoryName = _("Shadow"), \ - FOOTPRINT(Gengar), \ + FOOTPRINT(Gengar) \ LEARNSETS(Gengar), \ .formSpeciesIdTable = sGengarFormSpeciesIdTable, \ .formChangeTable = sGengarFormChangeTable @@ -7198,7 +7198,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Onix), ICON(Onix, 2), - FOOTPRINT(Onix), + FOOTPRINT(Onix) LEARNSETS(Onix), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}, {EVO_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}), @@ -7219,7 +7219,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Steelix"), \ .natDexNum = NATIONAL_DEX_STEELIX, \ .categoryName = _("Iron Snake"), \ - FOOTPRINT(Steelix), \ + FOOTPRINT(Steelix) \ LEARNSETS(Steelix), \ .formSpeciesIdTable = sSteelixFormSpeciesIdTable, \ .formChangeTable = sSteelixFormChangeTable @@ -7345,7 +7345,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Drowzee), ICON(Drowzee, 2), - FOOTPRINT(Drowzee), + FOOTPRINT(Drowzee) LEARNSETS(Drowzee), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_HYPNO}), }, @@ -7396,7 +7396,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Hypno), ICON(Hypno, 2), - FOOTPRINT(Hypno), + FOOTPRINT(Hypno) LEARNSETS(Hypno), }, #endif //P_FAMILY_DROWZEE @@ -7445,7 +7445,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Krabby), ICON(Krabby, 0), - FOOTPRINT(Krabby), + FOOTPRINT(Krabby) LEARNSETS(Krabby), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_KINGLER}), }, @@ -7473,7 +7473,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_KINGLER, \ .natDexNum = NATIONAL_DEX_KINGLER, \ .categoryName = _("Pincer"), \ - FOOTPRINT(Kingler), \ + FOOTPRINT(Kingler) \ LEARNSETS(Kingler), \ .formSpeciesIdTable = sKinglerFormSpeciesIdTable, \ .formChangeTable = sKinglerFormChangeTable @@ -7561,7 +7561,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -8, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Voltorb), \ + FOOTPRINT(Voltorb) \ .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, \ VOLTORB_FAMILY_MISC_INFO @@ -7583,7 +7583,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Electrode), \ + FOOTPRINT(Electrode) \ .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, \ VOLTORB_FAMILY_MISC_INFO @@ -7731,7 +7731,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Exeggcute), ICON(Exeggcute, 0), - FOOTPRINT(Exeggcute), + FOOTPRINT(Exeggcute) LEARNSETS(Exeggcute), .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR}, {EVO_NONE, 0, SPECIES_EXEGGUTOR_ALOLAN}), @@ -7751,7 +7751,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_EXEGGUTOR, \ .natDexNum = NATIONAL_DEX_EXEGGUTOR, \ .categoryName = _("Coconut"), \ - FOOTPRINT(Exeggutor), \ + FOOTPRINT(Exeggutor) \ .formSpeciesIdTable = sExeggutorFormSpeciesIdTable #define EXEGGUTOR_SP_DEF (P_UPDATED_STATS >= GEN_7 ? 75 : 65) @@ -7874,7 +7874,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Cubone), ICON(Cubone, 2), - FOOTPRINT(Cubone), + FOOTPRINT(Cubone) LEARNSETS(Cubone), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_MAROWAK}, {EVO_NONE, 0, SPECIES_MAROWAK_ALOLAN}), @@ -7905,7 +7905,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 12, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Marowak), \ + FOOTPRINT(Marowak) \ .formSpeciesIdTable = sMarowakFormSpeciesIdTable [SPECIES_MAROWAK] = @@ -8005,7 +8005,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Tyrogue), ICON(Tyrogue, 2), - FOOTPRINT(Tyrogue), + FOOTPRINT(Tyrogue) LEARNSETS(Tyrogue), .evolutions = EVOLUTION({EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN}, {EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE}, @@ -8056,7 +8056,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Hitmonlee), ICON(Hitmonlee, 2), - FOOTPRINT(Hitmonlee), + FOOTPRINT(Hitmonlee) LEARNSETS(Hitmonlee), }, @@ -8103,7 +8103,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Hitmonchan), ICON(Hitmonchan, 2), - FOOTPRINT(Hitmonchan), + FOOTPRINT(Hitmonchan) LEARNSETS(Hitmonchan), }, @@ -8151,7 +8151,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, PALETTES(Hitmontop), ICON(Hitmontop, 2), - FOOTPRINT(Hitmontop), + FOOTPRINT(Hitmontop) LEARNSETS(Hitmontop), }, #endif //P_GEN_2_CROSS_EVOS @@ -8202,7 +8202,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Lickitung), ICON(Lickitung, 0), - FOOTPRINT(Lickitung), + FOOTPRINT(Lickitung) LEARNSETS(Lickitung), .evolutions = EVOLUTION({EVO_MOVE, MOVE_ROLLOUT, SPECIES_LICKILICKY}), }, @@ -8252,7 +8252,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Lickilicky), ICON(Lickilicky, 1), - FOOTPRINT(Lickilicky), + FOOTPRINT(Lickilicky) LEARNSETS(Lickilicky), }, #endif //P_GEN_4_CROSS_EVOS @@ -8308,7 +8308,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Koffing), ICON(Koffing, 2), - FOOTPRINT(Koffing), + FOOTPRINT(Koffing) LEARNSETS(Koffing), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_WEEZING}, {EVO_NONE, 0, SPECIES_WEEZING_GALARIAN}), @@ -8334,7 +8334,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_WEEZING, \ .natDexNum = NATIONAL_DEX_WEEZING, \ .categoryName = _("Poison Gas"), \ - FOOTPRINT(Weezing), \ + FOOTPRINT(Weezing) \ .formSpeciesIdTable = sWeezingFormSpeciesIdTable [SPECIES_WEEZING] = @@ -8453,7 +8453,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Rhyhorn), ICON(Rhyhorn, 1), - FOOTPRINT(Rhyhorn), + FOOTPRINT(Rhyhorn) LEARNSETS(Rhyhorn), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_RHYDON}), }, @@ -8503,7 +8503,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Rhydon), ICON(Rhydon, 1), - FOOTPRINT(Rhydon), + FOOTPRINT(Rhydon) LEARNSETS(Rhydon), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_PROTECTOR, SPECIES_RHYPERIOR}, {EVO_ITEM, ITEM_PROTECTOR, SPECIES_RHYPERIOR}), @@ -8555,7 +8555,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Rhyperior), ICON(Rhyperior, 0), - FOOTPRINT(Rhyperior), + FOOTPRINT(Rhyperior) LEARNSETS(Rhyperior), }, #endif //P_GEN_4_CROSS_EVOS @@ -8607,7 +8607,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Happiny), ICON(Happiny, 0), - FOOTPRINT(Happiny), + FOOTPRINT(Happiny) LEARNSETS(Happiny), .evolutions = EVOLUTION({EVO_ITEM_HOLD_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY}, {EVO_ITEM_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY}), @@ -8658,7 +8658,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Chansey), ICON(Chansey, 0), - FOOTPRINT(Chansey), + FOOTPRINT(Chansey) LEARNSETS(Chansey), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}), }, @@ -8708,7 +8708,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Blissey), ICON(Blissey, 0), - FOOTPRINT(Blissey), + FOOTPRINT(Blissey) LEARNSETS(Blissey), }, #endif //P_GEN_2_CROSS_EVOS @@ -8758,7 +8758,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Tangela), ICON(Tangela, 0), - FOOTPRINT(Tangela), + FOOTPRINT(Tangela) LEARNSETS(Tangela), .evolutions = EVOLUTION({EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_TANGROWTH}), }, @@ -8808,7 +8808,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Tangrowth), ICON(Tangrowth, 0), - FOOTPRINT(Tangrowth), + FOOTPRINT(Tangrowth) LEARNSETS(Tangrowth), }, #endif //P_GEN_4_CROSS_EVOS @@ -8833,7 +8833,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, \ .trainerScale = 387, \ .trainerOffset = 8, \ - FOOTPRINT(Kangaskhan), \ + FOOTPRINT(Kangaskhan) \ LEARNSETS(Kangaskhan), \ .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, \ .formChangeTable = sKangaskhanFormChangeTable @@ -8945,7 +8945,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Horsea), ICON(Horsea, 0), - FOOTPRINT(Horsea), + FOOTPRINT(Horsea) LEARNSETS(Horsea), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_SEADRA}), }, @@ -8995,7 +8995,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Seadra), ICON(Seadra, 0), - FOOTPRINT(Seadra), + FOOTPRINT(Seadra) LEARNSETS(Seadra), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}, {EVO_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}), @@ -9048,7 +9048,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Kingdra), ICON(Kingdra, 0), - FOOTPRINT(Kingdra), + FOOTPRINT(Kingdra) LEARNSETS(Kingdra), }, #endif //P_GEN_2_CROSS_EVOS @@ -9101,7 +9101,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Goldeen), ICON(Goldeen, 0), - FOOTPRINT(Goldeen), + FOOTPRINT(Goldeen) LEARNSETS(Goldeen), .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_SEAKING}), }, @@ -9152,7 +9152,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Seaking), ICON(Seaking, 0), - FOOTPRINT(Seaking), + FOOTPRINT(Seaking) LEARNSETS(Seaking), }, #endif //P_FAMILY_GOLDEEN @@ -9204,7 +9204,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Staryu), ICON(Staryu, 2), - FOOTPRINT(Staryu), + FOOTPRINT(Staryu) LEARNSETS(Staryu), .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_STARMIE}), }, @@ -9254,7 +9254,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Starmie), ICON(Starmie, 2), - FOOTPRINT(Starmie), + FOOTPRINT(Starmie) LEARNSETS(Starmie), }, #endif //P_FAMILY_STARYU @@ -9308,7 +9308,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(MimeJr), ICON(MimeJr, 0), - FOOTPRINT(MimeJr), + FOOTPRINT(MimeJr) LEARNSETS(MimeJr), .evolutions = EVOLUTION({EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME}, {EVO_NONE, 0, SPECIES_MR_MIME_GALARIAN}), @@ -9326,7 +9326,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Mr. Mime"), \ .cryId = CRY_MR_MIME, \ .natDexNum = NATIONAL_DEX_MR_MIME, \ - FOOTPRINT(MrMime), \ + FOOTPRINT(MrMime) \ .formSpeciesIdTable = sMrMimeFormSpeciesIdTable [SPECIES_MR_MIME] = @@ -9452,7 +9452,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(MrRime), ICON(MrRime, 0), - FOOTPRINT(MrRime), + FOOTPRINT(MrRime) LEARNSETS(MrRime), }, #endif //P_GALARIAN_FORMS @@ -9504,7 +9504,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Scyther), ICON(Scyther, 1), - FOOTPRINT(Scyther), + FOOTPRINT(Scyther) LEARNSETS(Scyther), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}, {EVO_ITEM, ITEM_BLACK_AUGURITE, SPECIES_KLEAVOR}, @@ -9525,7 +9525,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Scizor"), \ .natDexNum = NATIONAL_DEX_SCIZOR, \ .categoryName = _("Pincer"), \ - FOOTPRINT(Scizor), \ + FOOTPRINT(Scizor) \ LEARNSETS(Scizor), \ .formSpeciesIdTable = sScizorFormSpeciesIdTable,\ .formChangeTable = sScizorFormChangeTable @@ -9648,7 +9648,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Kleavor), ICON(Kleavor, 2), - //FOOTPRINT(Kleavor), + //FOOTPRINT(Kleavor) LEARNSETS(Kleavor), }, #endif //P_GEN_8_CROSS_EVOS @@ -9700,7 +9700,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Smoochum), ICON(Smoochum, 1), - FOOTPRINT(Smoochum), + FOOTPRINT(Smoochum) LEARNSETS(Smoochum), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_JYNX}), }, @@ -9749,7 +9749,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Jynx), ICON(Jynx, 2), - FOOTPRINT(Jynx), + FOOTPRINT(Jynx) LEARNSETS(Jynx), }, #endif //P_FAMILY_JYNX @@ -9801,7 +9801,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Elekid), ICON(Elekid, 1), - FOOTPRINT(Elekid), + FOOTPRINT(Elekid) LEARNSETS(Elekid), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ELECTABUZZ}), }, @@ -9852,7 +9852,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Electabuzz), ICON(Electabuzz, 1), - FOOTPRINT(Electabuzz), + FOOTPRINT(Electabuzz) LEARNSETS(Electabuzz), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE}, {EVO_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE}), @@ -9903,7 +9903,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Electivire), ICON(Electivire, 1), - FOOTPRINT(Electivire), + FOOTPRINT(Electivire) LEARNSETS(Electivire), }, #endif //P_GEN_4_CROSS_EVOS @@ -9956,7 +9956,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Magby), ICON(Magby, 0), - FOOTPRINT(Magby), + FOOTPRINT(Magby) LEARNSETS(Magby), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MAGMAR}), }, @@ -10006,7 +10006,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Magmar), ICON(Magmar, 0), - FOOTPRINT(Magmar), + FOOTPRINT(Magmar) LEARNSETS(Magmar), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_MAGMARIZER, SPECIES_MAGMORTAR}, {EVO_ITEM, ITEM_MAGMARIZER, SPECIES_MAGMORTAR}), @@ -10058,7 +10058,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Magmortar), ICON(Magmortar, 0), - FOOTPRINT(Magmortar), + FOOTPRINT(Magmortar) LEARNSETS(Magmortar), }, #endif //P_GEN_4_CROSS_EVOS @@ -10077,7 +10077,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Pinsir"), \ .natDexNum = NATIONAL_DEX_PINSIR, \ .categoryName = _("Stag Beetle"), \ - FOOTPRINT(Pinsir), \ + FOOTPRINT(Pinsir) \ LEARNSETS(Pinsir), \ .formSpeciesIdTable = sPinsirFormSpeciesIdTable,\ .formChangeTable = sPinsirFormChangeTable @@ -10181,7 +10181,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Tauros), \ + FOOTPRINT(Tauros) \ .formSpeciesIdTable = sTaurosFormSpeciesIdTable [SPECIES_TAUROS] = @@ -10338,7 +10338,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Magikarp), ICON(Magikarp, 0), - FOOTPRINT(Magikarp), + FOOTPRINT(Magikarp) LEARNSETS(Magikarp), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_GYARADOS}), }, @@ -10360,7 +10360,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 6, \ .trainerScale = 481, \ .trainerOffset = 13, \ - FOOTPRINT(Gyarados), \ + FOOTPRINT(Gyarados) \ LEARNSETS(Gyarados), \ .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, \ .formChangeTable = sGyaradosFormChangeTable @@ -10457,7 +10457,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_LAPRAS, \ .natDexNum = NATIONAL_DEX_LAPRAS, \ .categoryName = _("Transport"), \ - FOOTPRINT(Lapras), \ + FOOTPRINT(Lapras) \ LEARNSETS(Lapras), \ .formSpeciesIdTable = sLaprasFormSpeciesIdTable, \ .formChangeTable = sLaprasFormChangeTable @@ -10562,7 +10562,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Ditto), ICON(Ditto, 2), - FOOTPRINT(Ditto), + FOOTPRINT(Ditto) LEARNSETS(Ditto), }, #endif //P_FAMILY_DITTO @@ -10590,7 +10590,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_EEVEE, \ .natDexNum = NATIONAL_DEX_EEVEE, \ .categoryName = _("Evolution"), \ - FOOTPRINT(Eevee), \ + FOOTPRINT(Eevee) \ LEARNSETS(Eevee), \ .formSpeciesIdTable = sEeveeFormSpeciesIdTable, \ .formChangeTable = sEeveeFormChangeTable @@ -10703,7 +10703,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Vaporeon), ICON(Vaporeon, 0), - FOOTPRINT(Vaporeon), + FOOTPRINT(Vaporeon) LEARNSETS(Vaporeon), }, @@ -10750,7 +10750,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Jolteon), ICON(Jolteon, 2), - FOOTPRINT(Jolteon), + FOOTPRINT(Jolteon) LEARNSETS(Jolteon), }, @@ -10797,7 +10797,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Flareon), ICON(Flareon, 3), - FOOTPRINT(Flareon), + FOOTPRINT(Flareon) LEARNSETS(Flareon), }, @@ -10845,7 +10845,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Espeon), ICON(Espeon, 2), - FOOTPRINT(Espeon), + FOOTPRINT(Espeon) LEARNSETS(Espeon), }, @@ -10892,7 +10892,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Umbreon), ICON(Umbreon, 0), - FOOTPRINT(Umbreon), + FOOTPRINT(Umbreon) LEARNSETS(Umbreon), }, #endif //P_GEN_2_CROSS_EVOS @@ -10941,7 +10941,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Leafeon), ICON(Leafeon, 1), - FOOTPRINT(Leafeon), + FOOTPRINT(Leafeon) LEARNSETS(Leafeon), }, @@ -10988,7 +10988,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Glaceon), ICON(Glaceon, 0), - FOOTPRINT(Glaceon), + FOOTPRINT(Glaceon) LEARNSETS(Glaceon), }, #endif //P_GEN_4_CROSS_EVOS @@ -11038,7 +11038,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Sylveon), ICON(Sylveon, 0), - FOOTPRINT(Sylveon), + FOOTPRINT(Sylveon) LEARNSETS(Sylveon), }, #endif //P_GEN_6_CROSS_EVOS @@ -11088,7 +11088,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Porygon), ICON(Porygon, 0), - FOOTPRINT(Porygon), + FOOTPRINT(Porygon) LEARNSETS(Porygon), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_UPGRADE, SPECIES_PORYGON2}, {EVO_ITEM, ITEM_UPGRADE, SPECIES_PORYGON2}), @@ -11139,7 +11139,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Porygon2), ICON(Porygon2, 0), - FOOTPRINT(Porygon2), + FOOTPRINT(Porygon2) LEARNSETS(Porygon2), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z}, {EVO_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z}), @@ -11190,7 +11190,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(PorygonZ), ICON(PorygonZ, 0), - FOOTPRINT(PorygonZ), + FOOTPRINT(PorygonZ) LEARNSETS(PorygonZ), }, #endif //P_GEN_4_CROSS_EVOS @@ -11241,7 +11241,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Omanyte), ICON(Omanyte, 0), - FOOTPRINT(Omanyte), + FOOTPRINT(Omanyte) LEARNSETS(Omanyte), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_OMASTAR}), }, @@ -11289,7 +11289,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Omastar), ICON(Omastar, 0), - FOOTPRINT(Omastar), + FOOTPRINT(Omastar) LEARNSETS(Omastar), }, #endif //P_FAMILY_OMANYTE @@ -11338,7 +11338,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Kabuto), ICON(Kabuto, 2), - FOOTPRINT(Kabuto), + FOOTPRINT(Kabuto) LEARNSETS(Kabuto), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_KABUTOPS}), }, @@ -11386,7 +11386,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Kabutops), ICON(Kabutops, 2), - FOOTPRINT(Kabutops), + FOOTPRINT(Kabutops) LEARNSETS(Kabutops), }, #endif //P_FAMILY_KABUTO @@ -11405,7 +11405,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Aerodactyl"), \ .natDexNum = NATIONAL_DEX_AERODACTYL, \ .categoryName = _("Fossil"), \ - FOOTPRINT(Aerodactyl), \ + FOOTPRINT(Aerodactyl) \ LEARNSETS(Aerodactyl), \ .formSpeciesIdTable = sAerodactylFormSpeciesIdTable,\ .formChangeTable = sAerodactylFormChangeTable @@ -11530,7 +11530,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Munchlax), ICON(Munchlax, 3), - FOOTPRINT(Munchlax), + FOOTPRINT(Munchlax) LEARNSETS(Munchlax), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_SNORLAX}), }, @@ -11560,7 +11560,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_SNORLAX, \ .natDexNum = NATIONAL_DEX_SNORLAX, \ .categoryName = _("Sleeping"), \ - FOOTPRINT(Snorlax), \ + FOOTPRINT(Snorlax) \ LEARNSETS(Snorlax), \ .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, \ .formChangeTable = sSnorlaxFormChangeTable @@ -11634,7 +11634,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, \ .trainerScale = 309, \ .trainerOffset = 2, \ - FOOTPRINT(Articuno), \ + FOOTPRINT(Articuno) \ .formSpeciesIdTable = sArticunoFormSpeciesIdTable, \ .isLegendary = TRUE @@ -11727,7 +11727,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, \ .trainerScale = 318, \ .trainerOffset = 3, \ - FOOTPRINT(Zapdos), \ + FOOTPRINT(Zapdos) \ .formSpeciesIdTable = sZapdosFormSpeciesIdTable, \ .isLegendary = TRUE @@ -11821,7 +11821,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, \ .trainerScale = 387, \ .trainerOffset = 8, \ - FOOTPRINT(Moltres), \ + FOOTPRINT(Moltres) \ .formSpeciesIdTable = sMoltresFormSpeciesIdTable, \ .isLegendary = TRUE @@ -11942,7 +11942,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Dratini), ICON(Dratini, 0), - FOOTPRINT(Dratini), + FOOTPRINT(Dratini) LEARNSETS(Dratini), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_DRAGONAIR}), }, @@ -11991,7 +11991,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Dragonair), ICON(Dragonair, 0), - FOOTPRINT(Dragonair), + FOOTPRINT(Dragonair) LEARNSETS(Dragonair), .evolutions = EVOLUTION({EVO_LEVEL, 55, SPECIES_DRAGONITE}), }, @@ -12040,7 +12040,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Dragonite), ICON(Dragonite, 2), - FOOTPRINT(Dragonite), + FOOTPRINT(Dragonite) LEARNSETS(Dragonite), }, #endif //P_FAMILY_DRATINI @@ -12058,7 +12058,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Mewtwo"), \ .natDexNum = NATIONAL_DEX_MEWTWO, \ .categoryName = _("Genetic"), \ - FOOTPRINT(Mewtwo), \ + FOOTPRINT(Mewtwo) \ LEARNSETS(Mewtwo), \ .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, \ .formChangeTable = sMewtwoFormChangeTable, \ @@ -12223,7 +12223,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Mew), ICON(Mew, 0), - FOOTPRINT(Mew), + FOOTPRINT(Mew) LEARNSETS(Mew), }, #endif //P_FAMILY_MEW diff --git a/src/data/pokemon/species_info/gen_2.h b/src/data/pokemon/species_info/gen_2.h index 83634aa0ae..f5af710a19 100644 --- a/src/data/pokemon/species_info/gen_2.h +++ b/src/data/pokemon/species_info/gen_2.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Chikorita), ICON(Chikorita, 1), - FOOTPRINT(Chikorita), + FOOTPRINT(Chikorita) LEARNSETS(Chikorita), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_BAYLEEF}), }, @@ -96,7 +96,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Bayleef), ICON(Bayleef, 1), - FOOTPRINT(Bayleef), + FOOTPRINT(Bayleef) LEARNSETS(Bayleef), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_MEGANIUM}), }, @@ -147,7 +147,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Meganium), ICON(Meganium, 1), - FOOTPRINT(Meganium), + FOOTPRINT(Meganium) LEARNSETS(Meganium), }, #endif //P_FAMILY_CHIKORITA @@ -196,7 +196,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Cyndaquil), ICON(Cyndaquil, 3), - FOOTPRINT(Cyndaquil), + FOOTPRINT(Cyndaquil) LEARNSETS(Cyndaquil), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_QUILAVA}), }, @@ -245,7 +245,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Quilava), ICON(Quilava, 3), - FOOTPRINT(Quilava), + FOOTPRINT(Quilava) LEARNSETS(Quilava), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_TYPHLOSION}, {EVO_NONE, 0, SPECIES_TYPHLOSION_HISUIAN}), @@ -264,7 +264,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .speciesName = _("Typhlosion"), \ .cryId = CRY_TYPHLOSION, \ .natDexNum = NATIONAL_DEX_TYPHLOSION, \ - FOOTPRINT(Typhlosion), \ + FOOTPRINT(Typhlosion) \ .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable [SPECIES_TYPHLOSION] = @@ -386,7 +386,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Totodile), ICON(Totodile, 0), - FOOTPRINT(Totodile), + FOOTPRINT(Totodile) LEARNSETS(Totodile), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CROCONAW}), }, @@ -436,7 +436,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Croconaw), ICON(Croconaw, 0), - FOOTPRINT(Croconaw), + FOOTPRINT(Croconaw) LEARNSETS(Croconaw), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_FERALIGATR}), }, @@ -486,7 +486,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Feraligatr), ICON(Feraligatr, 0), - FOOTPRINT(Feraligatr), + FOOTPRINT(Feraligatr) LEARNSETS(Feraligatr), }, #endif //P_FAMILY_TOTODILE @@ -535,7 +535,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Sentret), ICON(Sentret, 2), - FOOTPRINT(Sentret), + FOOTPRINT(Sentret) LEARNSETS(Sentret), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_FURRET}), }, @@ -583,7 +583,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Furret), ICON(Furret, 2), - FOOTPRINT(Furret), + FOOTPRINT(Furret) LEARNSETS(Furret), }, #endif //P_FAMILY_SENTRET @@ -632,7 +632,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Hoothoot), ICON(Hoothoot, 2), - FOOTPRINT(Hoothoot), + FOOTPRINT(Hoothoot) LEARNSETS(Hoothoot), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_NOCTOWL}), }, @@ -680,7 +680,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Noctowl), ICON(Noctowl, 2), - FOOTPRINT(Noctowl), + FOOTPRINT(Noctowl) LEARNSETS(Noctowl), }, #endif //P_FAMILY_HOOTHOOT @@ -731,7 +731,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Ledyba), ICON(Ledyba, 0), - FOOTPRINT(Ledyba), + FOOTPRINT(Ledyba) LEARNSETS(Ledyba), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_LEDIAN}), }, @@ -782,7 +782,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Ledian), ICON(Ledian, 0), - FOOTPRINT(Ledian), + FOOTPRINT(Ledian) LEARNSETS(Ledian), }, #endif //P_FAMILY_LEDYBA @@ -831,7 +831,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Spinarak), ICON(Spinarak, 1), - FOOTPRINT(Spinarak), + FOOTPRINT(Spinarak) LEARNSETS(Spinarak), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARIADOS}), }, @@ -879,7 +879,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Ariados), ICON(Ariados, 0), - FOOTPRINT(Ariados), + FOOTPRINT(Ariados) LEARNSETS(Ariados), }, #endif //P_FAMILY_SPINARAK @@ -929,7 +929,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Chinchou), ICON(Chinchou, 2), - FOOTPRINT(Chinchou), + FOOTPRINT(Chinchou) LEARNSETS(Chinchou), .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_LANTURN}), }, @@ -978,7 +978,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Lanturn), ICON(Lanturn, 0), - FOOTPRINT(Lanturn), + FOOTPRINT(Lanturn) LEARNSETS(Lanturn), }, #endif //P_FAMILY_CHINCHOU @@ -1029,7 +1029,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Togepi), ICON(Togepi, 0), - FOOTPRINT(Togepi), + FOOTPRINT(Togepi) LEARNSETS(Togepi), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_TOGETIC}), }, @@ -1077,7 +1077,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Togetic), ICON(Togetic, 0), - FOOTPRINT(Togetic), + FOOTPRINT(Togetic) LEARNSETS(Togetic), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_TOGEKISS}), }, @@ -1133,7 +1133,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Togekiss), ICON(Togekiss, 2), - FOOTPRINT(Togekiss), + FOOTPRINT(Togekiss) LEARNSETS(Togekiss), }, #endif //P_GEN_4_CROSS_EVOS @@ -1184,7 +1184,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Natu), ICON(Natu, 1), - FOOTPRINT(Natu), + FOOTPRINT(Natu) LEARNSETS(Natu), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_XATU}), }, @@ -1234,7 +1234,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Xatu), ICON(Xatu, 1), - FOOTPRINT(Xatu), + FOOTPRINT(Xatu) LEARNSETS(Xatu), }, #endif //P_FAMILY_NATU @@ -1284,7 +1284,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Mareep), ICON(Mareep, 0), - FOOTPRINT(Mareep), + FOOTPRINT(Mareep) LEARNSETS(Mareep), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_FLAAFFY}), }, @@ -1332,7 +1332,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Flaaffy), ICON(Flaaffy, 0), - FOOTPRINT(Flaaffy), + FOOTPRINT(Flaaffy) LEARNSETS(Flaaffy), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_AMPHAROS}), }, @@ -1355,7 +1355,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 4, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Ampharos), \ + FOOTPRINT(Ampharos) \ LEARNSETS(Ampharos), \ .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, \ .formChangeTable = sAmpharosFormChangeTable @@ -1474,7 +1474,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Azurill), ICON(Azurill, 0), - FOOTPRINT(Azurill), + FOOTPRINT(Azurill) LEARNSETS(Azurill), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_MARILL}), }, @@ -1527,7 +1527,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Marill), ICON(Marill, 0), - FOOTPRINT(Marill), + FOOTPRINT(Marill) LEARNSETS(Marill), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_AZUMARILL}), }, @@ -1579,7 +1579,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Azumarill), ICON(Azumarill, 0), - FOOTPRINT(Azumarill), + FOOTPRINT(Azumarill) LEARNSETS(Azumarill), }, #endif //P_FAMILY_MARILL @@ -1629,7 +1629,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Bonsly), ICON(Bonsly, 1), - FOOTPRINT(Bonsly), + FOOTPRINT(Bonsly) LEARNSETS(Bonsly), .evolutions = EVOLUTION({EVO_MOVE, MOVE_MIMIC, SPECIES_SUDOWOODO}), }, @@ -1680,7 +1680,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Sudowoodo), ICON(Sudowoodo, 1), - FOOTPRINT(Sudowoodo), + FOOTPRINT(Sudowoodo) LEARNSETS(Sudowoodo), }, #endif //P_FAMILY_SUDOWOODO @@ -1730,7 +1730,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Hoppip), ICON(Hoppip, 1), - FOOTPRINT(Hoppip), + FOOTPRINT(Hoppip) LEARNSETS(Hoppip), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_SKIPLOOM}), }, @@ -1779,7 +1779,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Skiploom), ICON(Skiploom, 1), - FOOTPRINT(Skiploom), + FOOTPRINT(Skiploom) LEARNSETS(Skiploom), .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_JUMPLUFF}), }, @@ -1828,7 +1828,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Jumpluff), ICON(Jumpluff, 2), - FOOTPRINT(Jumpluff), + FOOTPRINT(Jumpluff) LEARNSETS(Jumpluff), }, #endif //P_FAMILY_HOPPIP @@ -1879,7 +1879,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Aipom), ICON(Aipom, 2), - FOOTPRINT(Aipom), + FOOTPRINT(Aipom) LEARNSETS(Aipom), .evolutions = EVOLUTION({EVO_MOVE, MOVE_DOUBLE_HIT, SPECIES_AMBIPOM}), }, @@ -1930,7 +1930,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Ambipom), ICON(Ambipom, 2), - FOOTPRINT(Ambipom), + FOOTPRINT(Ambipom) LEARNSETS(Ambipom), }, #endif //P_GEN_4_CROSS_EVOS @@ -1980,7 +1980,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Sunkern), ICON(Sunkern, 1), - FOOTPRINT(Sunkern), + FOOTPRINT(Sunkern) LEARNSETS(Sunkern), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA}), }, @@ -2028,7 +2028,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Sunflora), ICON(Sunflora, 1), - FOOTPRINT(Sunflora), + FOOTPRINT(Sunflora) LEARNSETS(Sunflora), }, #endif //P_FAMILY_SUNKERN @@ -2079,7 +2079,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Yanma), ICON(Yanma, 1), - FOOTPRINT(Yanma), + FOOTPRINT(Yanma) LEARNSETS(Yanma), .evolutions = EVOLUTION({EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_YANMEGA}), }, @@ -2130,7 +2130,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Yanmega), ICON(Yanmega, 1), - FOOTPRINT(Yanmega), + FOOTPRINT(Yanmega) LEARNSETS(Yanmega), }, #endif //P_GEN_4_CROSS_EVOS @@ -2160,7 +2160,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 21, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Wooper), \ + FOOTPRINT(Wooper) \ .formSpeciesIdTable = sWooperFormSpeciesIdTable [SPECIES_WOOPER] = @@ -2236,7 +2236,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Quagsire), ICON(Quagsire, 0), - FOOTPRINT(Quagsire), + FOOTPRINT(Quagsire) LEARNSETS(Quagsire), }, @@ -2311,7 +2311,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Clodsire), ICON(Clodsire, 2), - //FOOTPRINT(Clodsire), + //FOOTPRINT(Clodsire) LEARNSETS(Clodsire), }, #endif //P_PALDEAN_FORMS @@ -2364,7 +2364,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Murkrow), ICON(Murkrow, 2), - FOOTPRINT(Murkrow), + FOOTPRINT(Murkrow) LEARNSETS(Murkrow), .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_HONCHKROW}), }, @@ -2413,7 +2413,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Honchkrow), ICON(Honchkrow, 2), - FOOTPRINT(Honchkrow), + FOOTPRINT(Honchkrow) LEARNSETS(Honchkrow), }, #endif //P_GEN_4_CROSS_EVOS @@ -2464,7 +2464,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Misdreavus), ICON(Misdreavus, 0), - FOOTPRINT(Misdreavus), + FOOTPRINT(Misdreavus) LEARNSETS(Misdreavus), .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_MISMAGIUS}), }, @@ -2515,7 +2515,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Mismagius), ICON(Mismagius, 2), - FOOTPRINT(Mismagius), + FOOTPRINT(Mismagius) LEARNSETS(Mismagius), }, #endif //P_GEN_4_CROSS_EVOS @@ -2559,7 +2559,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ PALETTES(Unown), \ ICON(Unown ##letter, 0), \ - FOOTPRINT(Unown), \ + FOOTPRINT(Unown) \ LEARNSETS(Unown), \ .formSpeciesIdTable = sUnownFormSpeciesIdTable @@ -2852,7 +2852,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Wynaut), ICON(Wynaut, 0), - FOOTPRINT(Wynaut), + FOOTPRINT(Wynaut) LEARNSETS(Wynaut), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_WOBBUFFET}), }, @@ -2906,7 +2906,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE ICON_FEMALE(Wobbuffet, 0), #endif - FOOTPRINT(Wobbuffet), + FOOTPRINT(Wobbuffet) LEARNSETS(Wobbuffet), }, #endif //P_FAMILY_WOBBUFFET @@ -2957,7 +2957,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Girafarig), ICON(Girafarig, 1), - FOOTPRINT(Girafarig), + FOOTPRINT(Girafarig) LEARNSETS(Girafarig), .evolutions = EVOLUTION({EVO_MOVE, MOVE_TWIN_BEAM, SPECIES_FARIGIRAF}), }, @@ -3006,7 +3006,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Farigiraf), ICON(Farigiraf, 0), - //FOOTPRINT(Farigiraf), + //FOOTPRINT(Farigiraf) LEARNSETS(Farigiraf), }, #endif //P_GEN_9_CROSS_EVOS @@ -3056,7 +3056,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Pineco), ICON(Pineco, 0), - FOOTPRINT(Pineco), + FOOTPRINT(Pineco) LEARNSETS(Pineco), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_FORRETRESS}), }, @@ -3104,7 +3104,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Forretress), ICON(Forretress, 2), - FOOTPRINT(Forretress), + FOOTPRINT(Forretress) LEARNSETS(Forretress), }, #endif //P_FAMILY_PINECO @@ -3154,7 +3154,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Dunsparce), ICON(Dunsparce, 0), - FOOTPRINT(Dunsparce), + FOOTPRINT(Dunsparce) LEARNSETS(Dunsparce), .evolutions = EVOLUTION({EVO_MOVE_TWO_SEGMENT, MOVE_HYPER_DRILL, SPECIES_DUDUNSPARCE_TWO_SEGMENT}, {EVO_MOVE_THREE_SEGMENT, MOVE_HYPER_DRILL, SPECIES_DUDUNSPARCE_THREE_SEGMENT}), @@ -3198,7 +3198,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .formSpeciesIdTable = sDudunsparceFormSpeciesIdTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Dudunsparce), + //FOOTPRINT(Dudunsparce) [SPECIES_DUDUNSPARCE_TWO_SEGMENT] = { @@ -3273,7 +3273,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Gligar), ICON(Gligar, 0), - FOOTPRINT(Gligar), + FOOTPRINT(Gligar) LEARNSETS(Gligar), .evolutions = EVOLUTION({EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR}, {EVO_ITEM_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR}), @@ -3324,7 +3324,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Gliscor), ICON(Gliscor, 2), - FOOTPRINT(Gliscor), + FOOTPRINT(Gliscor) LEARNSETS(Gliscor), }, #endif //P_GEN_4_CROSS_EVOS @@ -3378,7 +3378,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Snubbull), ICON(Snubbull, 0), - FOOTPRINT(Snubbull), + FOOTPRINT(Snubbull) LEARNSETS(Snubbull), .evolutions = EVOLUTION({EVO_LEVEL, 23, SPECIES_GRANBULL}), }, @@ -3430,7 +3430,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Granbull), ICON(Granbull, 2), - FOOTPRINT(Granbull), + FOOTPRINT(Granbull) LEARNSETS(Granbull), }, #endif //P_FAMILY_SNUBBULL @@ -3463,7 +3463,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Qwilfish), \ + FOOTPRINT(Qwilfish) \ .formSpeciesIdTable = sQwilfishFormSpeciesIdTable [SPECIES_QWILFISH] = @@ -3558,7 +3558,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Overqwil), ICON(Overqwil, 2), - //FOOTPRINT(Overqwil), + //FOOTPRINT(Overqwil) LEARNSETS(Overqwil), }, #endif //P_HISUIAN_FORMS @@ -3611,7 +3611,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Shuckle), ICON(Shuckle, 1), - FOOTPRINT(Shuckle), + FOOTPRINT(Shuckle) LEARNSETS(Shuckle), }, #endif //P_FAMILY_SHUCKLE @@ -3630,7 +3630,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .speciesName = _("Heracross"), \ .natDexNum = NATIONAL_DEX_HERACROSS, \ .categoryName = _("Single Horn"), \ - FOOTPRINT(Heracross), \ + FOOTPRINT(Heracross) \ LEARNSETS(Heracross), \ .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, \ .formChangeTable = sHeracrossFormChangeTable @@ -3736,7 +3736,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = -3, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Sneasel), \ + FOOTPRINT(Sneasel) \ .formSpeciesIdTable = sSneaselFormSpeciesIdTable [SPECIES_SNEASEL] = @@ -3815,7 +3815,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Weavile), ICON(Weavile, 0), - FOOTPRINT(Weavile), + FOOTPRINT(Weavile) LEARNSETS(Weavile), }, #endif //P_GEN_4_CROSS_EVOS @@ -3893,7 +3893,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Sneasler), ICON(Sneasler, 2), - //FOOTPRINT(Sneasler), + //FOOTPRINT(Sneasler) LEARNSETS(Sneasler), }, #endif //P_HISUIAN_FORMS @@ -3944,7 +3944,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Teddiursa), ICON(Teddiursa, 0), - FOOTPRINT(Teddiursa), + FOOTPRINT(Teddiursa) LEARNSETS(Teddiursa), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_URSARING}), }, @@ -3994,7 +3994,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Ursaring), ICON(Ursaring, 2), - FOOTPRINT(Ursaring), + FOOTPRINT(Ursaring) LEARNSETS(Ursaring), .evolutions = EVOLUTION({EVO_ITEM_NIGHT, ITEM_PEAT_BLOCK, SPECIES_URSALUNA}, {EVO_NONE, 0, SPECIES_URSALUNA_BLOODMOON}), @@ -4047,7 +4047,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Ursaluna), ICON(Ursaluna, 2), - //FOOTPRINT(Ursaluna), + //FOOTPRINT(Ursaluna) LEARNSETS(Ursaluna), }, @@ -4084,7 +4084,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(UrsalunaBloodmoon), //ICON(UrsalunaBloodmoon, 0), - //FOOTPRINT(UrsalunaBloodmoon), + //FOOTPRINT(UrsalunaBloodmoon) LEARNSETS(UrsalunaBloodmoon), }, #endif //P_GEN_8_CROSS_EVOS @@ -4134,7 +4134,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Slugma), ICON(Slugma, 0), - FOOTPRINT(Slugma), + FOOTPRINT(Slugma) LEARNSETS(Slugma), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MAGCARGO}), }, @@ -4183,7 +4183,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Magcargo), ICON(Magcargo, 0), - FOOTPRINT(Magcargo), + FOOTPRINT(Magcargo) LEARNSETS(Magcargo), }, #endif //P_FAMILY_SLUGMA @@ -4232,7 +4232,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Swinub), ICON(Swinub, 2), - FOOTPRINT(Swinub), + FOOTPRINT(Swinub) LEARNSETS(Swinub), .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_PILOSWINE}), }, @@ -4283,7 +4283,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Piloswine), ICON(Piloswine, 2), - FOOTPRINT(Piloswine), + FOOTPRINT(Piloswine) LEARNSETS(Piloswine), .evolutions = EVOLUTION({EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_MAMOSWINE}), }, @@ -4333,7 +4333,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Mamoswine), ICON(Mamoswine, 2), - FOOTPRINT(Mamoswine), + FOOTPRINT(Mamoswine) LEARNSETS(Mamoswine), }, #endif //P_GEN_4_CROSS_EVOS @@ -4361,7 +4361,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 15, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Corsola), \ + FOOTPRINT(Corsola) \ .formSpeciesIdTable = sCorsolaFormSpeciesIdTable [SPECIES_CORSOLA] = @@ -4472,7 +4472,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Cursola), ICON(Cursola, 0), - FOOTPRINT(Cursola), + FOOTPRINT(Cursola) LEARNSETS(Cursola), }, #endif //P_GALARIAN_FORMS @@ -4522,7 +4522,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Remoraid), ICON(Remoraid, 0), - FOOTPRINT(Remoraid), + FOOTPRINT(Remoraid) LEARNSETS(Remoraid), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_OCTILLERY}), }, @@ -4574,7 +4574,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Octillery), ICON(Octillery, 0), - FOOTPRINT(Octillery), + FOOTPRINT(Octillery) LEARNSETS(Octillery), }, #endif //P_FAMILY_REMORAID @@ -4623,7 +4623,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Delibird), ICON(Delibird, 1), - FOOTPRINT(Delibird), + FOOTPRINT(Delibird) LEARNSETS(Delibird), }, #endif //P_FAMILY_DELIBIRD @@ -4673,7 +4673,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Mantyke), ICON(Mantyke, 0), - FOOTPRINT(Mantyke), + FOOTPRINT(Mantyke) LEARNSETS(Mantyke), .evolutions = EVOLUTION({EVO_SPECIFIC_MON_IN_PARTY, SPECIES_REMORAID, SPECIES_MANTINE}), }, @@ -4723,7 +4723,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Mantine), ICON(Mantine, 2), - FOOTPRINT(Mantine), + FOOTPRINT(Mantine) LEARNSETS(Mantine), }, #endif //P_FAMILY_MANTINE @@ -4773,7 +4773,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Skarmory), ICON(Skarmory, 0), - FOOTPRINT(Skarmory), + FOOTPRINT(Skarmory) LEARNSETS(Skarmory), }, #endif //P_FAMILY_SKARMORY @@ -4822,7 +4822,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Houndour), ICON(Houndour, 0), - FOOTPRINT(Houndour), + FOOTPRINT(Houndour) LEARNSETS(Houndour), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_HOUNDOOM}), }, @@ -4840,7 +4840,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .speciesName = _("Houndoom"), \ .natDexNum = NATIONAL_DEX_HOUNDOOM, \ .categoryName = _("Dark"), \ - FOOTPRINT(Houndoom), \ + FOOTPRINT(Houndoom) \ LEARNSETS(Houndoom), \ .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, \ .formChangeTable = sHoundoomFormChangeTable @@ -4962,7 +4962,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Phanpy), ICON(Phanpy, 0), - FOOTPRINT(Phanpy), + FOOTPRINT(Phanpy) LEARNSETS(Phanpy), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_DONPHAN}), }, @@ -5013,7 +5013,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Donphan), ICON(Donphan, 0), - FOOTPRINT(Donphan), + FOOTPRINT(Donphan) LEARNSETS(Donphan), }, #endif //P_FAMILY_PHANPY @@ -5062,7 +5062,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Stantler), ICON(Stantler, 2), - FOOTPRINT(Stantler), + FOOTPRINT(Stantler) LEARNSETS(Stantler), .evolutions = EVOLUTION({EVO_MOVE, MOVE_PSYSHIELD_BASH, SPECIES_WYRDEER}), }, @@ -5112,7 +5112,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Wyrdeer), ICON(Wyrdeer, 2), - //FOOTPRINT(Wyrdeer), + //FOOTPRINT(Wyrdeer) LEARNSETS(Wyrdeer), }, #endif //P_GEN_8_CROSS_EVOS @@ -5162,7 +5162,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Smeargle), ICON(Smeargle, 1), - FOOTPRINT(Smeargle), + FOOTPRINT(Smeargle) LEARNSETS(Smeargle), }, #endif //P_FAMILY_SMEARGLE @@ -5213,7 +5213,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Miltank), ICON(Miltank, 0), - FOOTPRINT(Miltank), + FOOTPRINT(Miltank) LEARNSETS(Miltank), }, #endif //P_FAMILY_MILTANK @@ -5268,7 +5268,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Raikou), ICON(Raikou, 2), - FOOTPRINT(Raikou), + FOOTPRINT(Raikou) LEARNSETS(Raikou), }, #endif //P_FAMILY_RAIKOU @@ -5323,7 +5323,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Entei), ICON(Entei, 2), - FOOTPRINT(Entei), + FOOTPRINT(Entei) LEARNSETS(Entei), }, #endif //P_FAMILY_ENTEI @@ -5378,7 +5378,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Suicune), ICON(Suicune, 2), - FOOTPRINT(Suicune), + FOOTPRINT(Suicune) LEARNSETS(Suicune), }, #endif //P_FAMILY_SUICUNE @@ -5427,7 +5427,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Larvitar), ICON(Larvitar, 1), - FOOTPRINT(Larvitar), + FOOTPRINT(Larvitar) LEARNSETS(Larvitar), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_PUPITAR}), }, @@ -5475,7 +5475,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Pupitar), ICON(Pupitar, 2), - FOOTPRINT(Pupitar), + FOOTPRINT(Pupitar) LEARNSETS(Pupitar), .evolutions = EVOLUTION({EVO_LEVEL, 55, SPECIES_TYRANITAR}), }, @@ -5493,7 +5493,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .speciesName = _("Tyranitar"), \ .natDexNum = NATIONAL_DEX_TYRANITAR, \ .categoryName = _("Armor"), \ - FOOTPRINT(Tyranitar), \ + FOOTPRINT(Tyranitar) \ LEARNSETS(Tyranitar), \ .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, \ .formChangeTable = sTyranitarFormChangeTable @@ -5618,7 +5618,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Lugia), ICON(Lugia, 0), - FOOTPRINT(Lugia), + FOOTPRINT(Lugia) LEARNSETS(Lugia), }, #endif //P_FAMILY_LUGIA @@ -5671,7 +5671,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(HoOh), ICON(HoOh, 1), - FOOTPRINT(HoOh), + FOOTPRINT(HoOh) LEARNSETS(HoOh), }, #endif //P_FAMILY_HO_OH @@ -5724,7 +5724,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, PALETTES(Celebi), ICON(Celebi, 1), - FOOTPRINT(Celebi), + FOOTPRINT(Celebi) LEARNSETS(Celebi), }, #endif //P_FAMILY_CELEBI diff --git a/src/data/pokemon/species_info/gen_3.h b/src/data/pokemon/species_info/gen_3.h index 40c9839df3..51ebee6f43 100644 --- a/src/data/pokemon/species_info/gen_3.h +++ b/src/data/pokemon/species_info/gen_3.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Treecko), ICON(Treecko, 1), - FOOTPRINT(Treecko), + FOOTPRINT(Treecko) LEARNSETS(Treecko), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_GROVYLE}), }, @@ -95,7 +95,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Grovyle), ICON(Grovyle, 1), - FOOTPRINT(Grovyle), + FOOTPRINT(Grovyle) LEARNSETS(Grovyle), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SCEPTILE}), }, @@ -112,7 +112,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Sceptile"), \ .natDexNum = NATIONAL_DEX_SCEPTILE, \ .categoryName = _("Forest"), \ - FOOTPRINT(Sceptile), \ + FOOTPRINT(Sceptile) \ LEARNSETS(Sceptile), \ .formSpeciesIdTable = sSceptileFormSpeciesIdTable, \ .formChangeTable = sSceptileFormChangeTable @@ -236,7 +236,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Torchic), ICON(Torchic, 0), - FOOTPRINT(Torchic), + FOOTPRINT(Torchic) LEARNSETS(Torchic), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_COMBUSKEN}), }, @@ -287,7 +287,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Combusken), ICON(Combusken, 0), - FOOTPRINT(Combusken), + FOOTPRINT(Combusken) LEARNSETS(Combusken), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_BLAZIKEN}), }, @@ -311,7 +311,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, \ .trainerScale = 301, \ .trainerOffset = 4, \ - FOOTPRINT(Blaziken), \ + FOOTPRINT(Blaziken) \ LEARNSETS(Blaziken), \ .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, \ .formChangeTable = sBlazikenFormChangeTable @@ -422,7 +422,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Mudkip), ICON(Mudkip, 0), - FOOTPRINT(Mudkip), + FOOTPRINT(Mudkip) LEARNSETS(Mudkip), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_MARSHTOMP}), }, @@ -470,7 +470,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Marshtomp), ICON(Marshtomp, 0), - FOOTPRINT(Marshtomp), + FOOTPRINT(Marshtomp) LEARNSETS(Marshtomp), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SWAMPERT}), }, @@ -488,7 +488,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Swampert"), \ .natDexNum = NATIONAL_DEX_SWAMPERT, \ .categoryName = _("Mud Fish"), \ - FOOTPRINT(Swampert), \ + FOOTPRINT(Swampert) \ LEARNSETS(Swampert), \ .formSpeciesIdTable = sSwampertFormSpeciesIdTable, \ .formChangeTable = sSwampertFormChangeTable @@ -609,7 +609,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Poochyena), ICON(Poochyena, 2), - FOOTPRINT(Poochyena), + FOOTPRINT(Poochyena) LEARNSETS(Poochyena), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_MIGHTYENA}), }, @@ -657,7 +657,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Mightyena), ICON(Mightyena, 2), - FOOTPRINT(Mightyena), + FOOTPRINT(Mightyena) LEARNSETS(Mightyena), }, #endif //P_FAMILY_POOCHYENA @@ -689,7 +689,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 22, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Zigzagoon), \ + FOOTPRINT(Zigzagoon) \ .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable #define LINOONE_MISC_INFO \ @@ -719,7 +719,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 7, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Linoone), \ + FOOTPRINT(Linoone) \ .formSpeciesIdTable = sLinooneFormSpeciesIdTable [SPECIES_ZIGZAGOON] = @@ -861,7 +861,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Obstagoon), ICON(Obstagoon, 0), - FOOTPRINT(Obstagoon), + FOOTPRINT(Obstagoon) LEARNSETS(Obstagoon), }, #endif //P_GALARIAN_FORMS @@ -913,7 +913,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Wurmple), ICON(Wurmple, 0), - FOOTPRINT(Wurmple), + FOOTPRINT(Wurmple) LEARNSETS(Wurmple), .evolutions = EVOLUTION({EVO_LEVEL_SILCOON, 7, SPECIES_SILCOON}, {EVO_LEVEL_CASCOON, 7, SPECIES_CASCOON}), @@ -962,7 +962,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Silcoon), ICON(Silcoon, 2), - FOOTPRINT(Silcoon), + FOOTPRINT(Silcoon) LEARNSETS(Silcoon), .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_BEAUTIFLY}), }, @@ -1014,7 +1014,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Beautifly), ICON(Beautifly, 0), - FOOTPRINT(Beautifly), + FOOTPRINT(Beautifly) LEARNSETS(Beautifly), }, @@ -1061,7 +1061,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Cascoon), ICON(Cascoon, 2), - FOOTPRINT(Cascoon), + FOOTPRINT(Cascoon) LEARNSETS(Cascoon), .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_DUSTOX}), }, @@ -1113,7 +1113,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Dustox), ICON(Dustox, 5), - FOOTPRINT(Dustox), + FOOTPRINT(Dustox) LEARNSETS(Dustox), }, #endif //P_FAMILY_WURMPLE @@ -1163,7 +1163,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Lotad), ICON(Lotad, 4), - FOOTPRINT(Lotad), + FOOTPRINT(Lotad) LEARNSETS(Lotad), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_LOMBRE}), }, @@ -1212,7 +1212,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Lombre), ICON(Lombre, 1), - FOOTPRINT(Lombre), + FOOTPRINT(Lombre) LEARNSETS(Lombre), .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_LUDICOLO}), }, @@ -1263,7 +1263,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Ludicolo), ICON(Ludicolo, 1), - FOOTPRINT(Ludicolo), + FOOTPRINT(Ludicolo) LEARNSETS(Ludicolo), }, #endif //P_FAMILY_LOTAD @@ -1313,7 +1313,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Seedot), ICON(Seedot, 2), - FOOTPRINT(Seedot), + FOOTPRINT(Seedot) LEARNSETS(Seedot), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_NUZLEAF}), }, @@ -1364,7 +1364,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Nuzleaf), ICON(Nuzleaf, 1), - FOOTPRINT(Nuzleaf), + FOOTPRINT(Nuzleaf) LEARNSETS(Nuzleaf), .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_SHIFTRY}), }, @@ -1419,7 +1419,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Shiftry), ICON(Shiftry, 5), - FOOTPRINT(Shiftry), + FOOTPRINT(Shiftry) LEARNSETS(Shiftry), }, #endif //P_FAMILY_SEEDOT @@ -1468,7 +1468,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Taillow), ICON(Taillow, 2), - FOOTPRINT(Taillow), + FOOTPRINT(Taillow) LEARNSETS(Taillow), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_SWELLOW}), }, @@ -1516,7 +1516,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Swellow), ICON(Swellow, 2), - FOOTPRINT(Swellow), + FOOTPRINT(Swellow) LEARNSETS(Swellow), }, #endif //P_FAMILY_TAILLOW @@ -1567,7 +1567,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Wingull), ICON(Wingull, 0), - FOOTPRINT(Wingull), + FOOTPRINT(Wingull) LEARNSETS(Wingull), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_PELIPPER}), }, @@ -1617,7 +1617,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Pelipper), ICON(Pelipper, 2), - FOOTPRINT(Pelipper), + FOOTPRINT(Pelipper) LEARNSETS(Pelipper), }, #endif //P_FAMILY_WINGULL @@ -1674,7 +1674,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Ralts), ICON(Ralts, 1), - FOOTPRINT(Ralts), + FOOTPRINT(Ralts) LEARNSETS(Ralts), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_KIRLIA}), }, @@ -1722,7 +1722,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Kirlia), ICON(Kirlia, 1), - FOOTPRINT(Kirlia), + FOOTPRINT(Kirlia) LEARNSETS(Kirlia), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GARDEVOIR}, {EVO_ITEM_MALE, ITEM_DAWN_STONE, SPECIES_GALLADE}), @@ -1747,7 +1747,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Gardevoir), \ + FOOTPRINT(Gardevoir) \ LEARNSETS(Gardevoir), \ .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, \ .formChangeTable = sGardevoirFormChangeTable @@ -1830,7 +1830,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 1, \ .trainerScale = 296, \ .trainerOffset = 1, \ - FOOTPRINT(Gallade), \ + FOOTPRINT(Gallade) \ LEARNSETS(Gallade), \ .formSpeciesIdTable = sGalladeFormSpeciesIdTable, \ .formChangeTable = sGalladeFormChangeTable @@ -1947,7 +1947,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SPRING, PALETTES(Surskit), ICON(Surskit, 0), - FOOTPRINT(Surskit), + FOOTPRINT(Surskit) LEARNSETS(Surskit), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_MASQUERAIN}), }, @@ -2003,7 +2003,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Masquerain), ICON(Masquerain, 0), - FOOTPRINT(Masquerain), + FOOTPRINT(Masquerain) LEARNSETS(Masquerain), }, #endif //P_FAMILY_SURSKIT @@ -2054,7 +2054,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Shroomish), ICON(Shroomish, 1), - FOOTPRINT(Shroomish), + FOOTPRINT(Shroomish) LEARNSETS(Shroomish), .evolutions = EVOLUTION({EVO_LEVEL, 23, SPECIES_BRELOOM}), }, @@ -2104,7 +2104,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Breloom), ICON(Breloom, 1), - FOOTPRINT(Breloom), + FOOTPRINT(Breloom) LEARNSETS(Breloom), }, #endif //P_FAMILY_SHROOMISH @@ -2153,7 +2153,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Slakoth), ICON(Slakoth, 2), - FOOTPRINT(Slakoth), + FOOTPRINT(Slakoth) LEARNSETS(Slakoth), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_VIGOROTH}), }, @@ -2201,7 +2201,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Vigoroth), ICON(Vigoroth, 2), - FOOTPRINT(Vigoroth), + FOOTPRINT(Vigoroth) LEARNSETS(Vigoroth), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SLAKING}), }, @@ -2249,7 +2249,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Slaking), ICON(Slaking, 2), - FOOTPRINT(Slaking), + FOOTPRINT(Slaking) LEARNSETS(Slaking), }, #endif //P_FAMILY_SLAKOTH @@ -2299,7 +2299,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Nincada), ICON(Nincada, 1), - FOOTPRINT(Nincada), + FOOTPRINT(Nincada) LEARNSETS(Nincada), .evolutions = EVOLUTION({EVO_LEVEL_NINJASK, 20, SPECIES_NINJASK}, {EVO_LEVEL_SHEDINJA, 20, SPECIES_SHEDINJA}), @@ -2349,7 +2349,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Ninjask), ICON(Ninjask, 1), - FOOTPRINT(Ninjask), + FOOTPRINT(Ninjask) LEARNSETS(Ninjask), }, @@ -2397,7 +2397,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Shedinja), ICON(Shedinja, 1), - FOOTPRINT(Shedinja), + FOOTPRINT(Shedinja) LEARNSETS(Shedinja), }, #endif //P_FAMILY_NINCADA @@ -2446,7 +2446,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Whismur), ICON(Whismur, 1), - FOOTPRINT(Whismur), + FOOTPRINT(Whismur) LEARNSETS(Whismur), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LOUDRED}), }, @@ -2494,7 +2494,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Loudred), ICON(Loudred, 2), - FOOTPRINT(Loudred), + FOOTPRINT(Loudred) LEARNSETS(Loudred), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_EXPLOUD}), }, @@ -2542,7 +2542,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Exploud), ICON(Exploud, 2), - FOOTPRINT(Exploud), + FOOTPRINT(Exploud) LEARNSETS(Exploud), }, #endif //P_FAMILY_WHISMUR @@ -2592,7 +2592,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Makuhita), ICON(Makuhita, 1), - FOOTPRINT(Makuhita), + FOOTPRINT(Makuhita) LEARNSETS(Makuhita), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_HARIYAMA}), }, @@ -2641,7 +2641,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Hariyama), ICON(Hariyama, 2), - FOOTPRINT(Hariyama), + FOOTPRINT(Hariyama) LEARNSETS(Hariyama), }, #endif //P_FAMILY_MAKUHITA @@ -2691,7 +2691,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Nosepass), ICON(Nosepass, 0), - FOOTPRINT(Nosepass), + FOOTPRINT(Nosepass) LEARNSETS(Nosepass), .evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_PROBOPASS}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_PROBOPASS}), @@ -2744,7 +2744,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Probopass), ICON(Probopass, 0), - FOOTPRINT(Probopass), + FOOTPRINT(Probopass) LEARNSETS(Probopass), }, #endif //P_GEN_4_CROSS_EVOS @@ -2794,7 +2794,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Skitty), ICON(Skitty, 0), - FOOTPRINT(Skitty), + FOOTPRINT(Skitty) LEARNSETS(Skitty), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY}), }, @@ -2843,7 +2843,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Delcatty), ICON(Delcatty, 2), - FOOTPRINT(Delcatty), + FOOTPRINT(Delcatty) LEARNSETS(Delcatty), }, #endif //P_FAMILY_SKITTY @@ -2864,7 +2864,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_SABLEYE, \ .categoryName = _("Darkness"), \ .height = 5, \ - FOOTPRINT(Sableye), \ + FOOTPRINT(Sableye) \ LEARNSETS(Sableye), \ .formSpeciesIdTable = sSableyeFormSpeciesIdTable, \ .formChangeTable = sSableyeFormChangeTable @@ -2960,7 +2960,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Mawile"), \ .natDexNum = NATIONAL_DEX_MAWILE, \ .categoryName = _("Deceiver"), \ - FOOTPRINT(Mawile), \ + FOOTPRINT(Mawile) \ LEARNSETS(Mawile), \ .formSpeciesIdTable = sMawileFormSpeciesIdTable, \ .formChangeTable = sMawileFormChangeTable @@ -3083,7 +3083,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Aron), ICON(Aron, 2), - FOOTPRINT(Aron), + FOOTPRINT(Aron) LEARNSETS(Aron), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_LAIRON}), }, @@ -3132,7 +3132,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Lairon), ICON(Lairon, 2), - FOOTPRINT(Lairon), + FOOTPRINT(Lairon) LEARNSETS(Lairon), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_AGGRON}), }, @@ -3150,7 +3150,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Aggron"), \ .natDexNum = NATIONAL_DEX_AGGRON, \ .categoryName = _("Iron Armor"), \ - FOOTPRINT(Aggron), \ + FOOTPRINT(Aggron) \ LEARNSETS(Aggron), \ .formSpeciesIdTable = sAggronFormSpeciesIdTable, \ .formChangeTable = sAggronFormChangeTable @@ -3275,7 +3275,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Meditite), ICON(Meditite, 0), - FOOTPRINT(Meditite), + FOOTPRINT(Meditite) LEARNSETS(Meditite), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_MEDICHAM}), }, @@ -3299,7 +3299,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 5, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Medicham), \ + FOOTPRINT(Medicham) \ LEARNSETS(Medicham), \ .formSpeciesIdTable = sMedichamFormSpeciesIdTable, \ .formChangeTable = sMedichamFormChangeTable @@ -3410,7 +3410,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Electrike), ICON(Electrike, 1), - FOOTPRINT(Electrike), + FOOTPRINT(Electrike) LEARNSETS(Electrike), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_MANECTRIC}), }, @@ -3428,7 +3428,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Manectric"), \ .natDexNum = NATIONAL_DEX_MANECTRIC, \ .categoryName = _("Discharge"), \ - FOOTPRINT(Manectric), \ + FOOTPRINT(Manectric) \ LEARNSETS(Manectric), \ .formSpeciesIdTable = sManectricFormSpeciesIdTable, \ .formChangeTable = sManectricFormChangeTable @@ -3549,7 +3549,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Plusle), ICON(Plusle, 0), - FOOTPRINT(Plusle), + FOOTPRINT(Plusle) LEARNSETS(Plusle), }, #endif //P_FAMILY_PLUSLE @@ -3599,7 +3599,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Minun), ICON(Minun, 0), - FOOTPRINT(Minun), + FOOTPRINT(Minun) LEARNSETS(Minun), }, #endif //P_FAMILY_MINUN @@ -3654,7 +3654,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Volbeat), ICON(Volbeat, 0), - FOOTPRINT(Volbeat), + FOOTPRINT(Volbeat) LEARNSETS(Volbeat), }, @@ -3707,7 +3707,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Illumise), ICON(Illumise, 2), - FOOTPRINT(Illumise), + FOOTPRINT(Illumise) LEARNSETS(Illumise), }, #endif //P_FAMILY_VOLBEAT_ILLUMISE @@ -3759,7 +3759,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Budew), ICON(Budew, 1), - FOOTPRINT(Budew), + FOOTPRINT(Budew) LEARNSETS(Budew), .evolutions = EVOLUTION({EVO_FRIENDSHIP_DAY, 0, SPECIES_ROSELIA}), }, @@ -3812,7 +3812,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, PALETTES(Roselia), ICON(Roselia, 4), - FOOTPRINT(Roselia), + FOOTPRINT(Roselia) LEARNSETS(Roselia), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_ROSERADE}), }, @@ -3865,7 +3865,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Roserade), ICON(Roserade, 0), - FOOTPRINT(Roserade), + FOOTPRINT(Roserade) LEARNSETS(Roserade), }, #endif //P_GEN_4_CROSS_EVOS @@ -3919,7 +3919,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Gulpin), ICON(Gulpin, 1), - FOOTPRINT(Gulpin), + FOOTPRINT(Gulpin) LEARNSETS(Gulpin), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_SWALOT}), }, @@ -3971,7 +3971,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Swalot), ICON(Swalot, 2), - FOOTPRINT(Swalot), + FOOTPRINT(Swalot) LEARNSETS(Swalot), }, #endif //P_FAMILY_GULPIN @@ -4021,7 +4021,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SPRING_REPEATED, PALETTES(Carvanha), ICON(Carvanha, 0), - FOOTPRINT(Carvanha), + FOOTPRINT(Carvanha) LEARNSETS(Carvanha), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_SHARPEDO}), }, @@ -4040,7 +4040,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Sharpedo"), \ .natDexNum = NATIONAL_DEX_SHARPEDO, \ .categoryName = _("Brutal"), \ - FOOTPRINT(Sharpedo), \ + FOOTPRINT(Sharpedo) \ LEARNSETS(Sharpedo), \ .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, \ .formChangeTable = sSharpedoFormChangeTable @@ -4162,7 +4162,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Wailmer), ICON(Wailmer, 2), - FOOTPRINT(Wailmer), + FOOTPRINT(Wailmer) LEARNSETS(Wailmer), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_WAILORD}), }, @@ -4211,7 +4211,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Wailord), ICON(Wailord, 0), - FOOTPRINT(Wailord), + FOOTPRINT(Wailord) LEARNSETS(Wailord), }, #endif //P_FAMILY_WAILMER @@ -4262,7 +4262,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Numel), ICON(Numel, 1), - FOOTPRINT(Numel), + FOOTPRINT(Numel) LEARNSETS(Numel), .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_CAMERUPT}), }, @@ -4281,7 +4281,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Camerupt"), \ .natDexNum = NATIONAL_DEX_CAMERUPT, \ .categoryName = _("Eruption"), \ - FOOTPRINT(Camerupt), \ + FOOTPRINT(Camerupt) \ LEARNSETS(Camerupt), \ .formSpeciesIdTable = sCameruptFormSpeciesIdTable, \ .formChangeTable = sCameruptFormChangeTable @@ -4405,7 +4405,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Torkoal), ICON(Torkoal, 2), - FOOTPRINT(Torkoal), + FOOTPRINT(Torkoal) LEARNSETS(Torkoal), }, #endif //P_FAMILY_TORKOAL @@ -4454,7 +4454,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Spoink), ICON(Spoink, 0), - FOOTPRINT(Spoink), + FOOTPRINT(Spoink) LEARNSETS(Spoink), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GRUMPIG}), }, @@ -4503,7 +4503,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Grumpig), ICON(Grumpig, 2), - FOOTPRINT(Grumpig), + FOOTPRINT(Grumpig) LEARNSETS(Grumpig), }, #endif //P_FAMILY_SPOINK @@ -4553,7 +4553,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, PALETTES(Spinda), ICON(Spinda, 1), - FOOTPRINT(Spinda), + FOOTPRINT(Spinda) LEARNSETS(Spinda), }, #endif //P_FAMILY_SPINDA @@ -4607,7 +4607,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Trapinch), ICON(Trapinch, 0), - FOOTPRINT(Trapinch), + FOOTPRINT(Trapinch) LEARNSETS(Trapinch), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_VIBRAVA}), }, @@ -4660,7 +4660,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Vibrava), ICON(Vibrava, 1), - FOOTPRINT(Vibrava), + FOOTPRINT(Vibrava) LEARNSETS(Vibrava), .evolutions = EVOLUTION({EVO_LEVEL, 45, SPECIES_FLYGON}), }, @@ -4714,7 +4714,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Flygon), ICON(Flygon, 1), - FOOTPRINT(Flygon), + FOOTPRINT(Flygon) LEARNSETS(Flygon), }, #endif //P_FAMILY_TRAPINCH @@ -4764,7 +4764,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Cacnea), ICON(Cacnea, 1), - FOOTPRINT(Cacnea), + FOOTPRINT(Cacnea) LEARNSETS(Cacnea), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_CACTURNE}), }, @@ -4815,7 +4815,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Cacturne), ICON(Cacturne, 1), - FOOTPRINT(Cacturne), + FOOTPRINT(Cacturne) LEARNSETS(Cacturne), }, #endif //P_FAMILY_CACNEA @@ -4864,7 +4864,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Swablu), ICON(Swablu, 0), - FOOTPRINT(Swablu), + FOOTPRINT(Swablu) LEARNSETS(Swablu), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ALTARIA}), }, @@ -4881,7 +4881,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Altaria"), \ .natDexNum = NATIONAL_DEX_ALTARIA, \ .categoryName = _("Humming"), \ - FOOTPRINT(Altaria), \ + FOOTPRINT(Altaria) \ LEARNSETS(Altaria), \ .formSpeciesIdTable = sAltariaFormSpeciesIdTable, \ .formChangeTable = sAltariaFormChangeTable @@ -5007,7 +5007,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Zangoose), ICON(Zangoose, 0), - FOOTPRINT(Zangoose), + FOOTPRINT(Zangoose) LEARNSETS(Zangoose), }, #endif //P_FAMILY_ZANGOOSE @@ -5059,7 +5059,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Seviper), ICON(Seviper, 2), - FOOTPRINT(Seviper), + FOOTPRINT(Seviper) LEARNSETS(Seviper), }, #endif //P_FAMILY_SEVIPER @@ -5111,7 +5111,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Lunatone), ICON(Lunatone, 1), - FOOTPRINT(Lunatone), + FOOTPRINT(Lunatone) LEARNSETS(Lunatone), }, #endif //P_FAMILY_LUNATONE @@ -5163,7 +5163,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Solrock), ICON(Solrock, 0), - FOOTPRINT(Solrock), + FOOTPRINT(Solrock) LEARNSETS(Solrock), }, #endif //P_FAMILY_SOLROCK @@ -5213,7 +5213,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Barboach), ICON(Barboach, 0), - FOOTPRINT(Barboach), + FOOTPRINT(Barboach) LEARNSETS(Barboach), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_WHISCASH}), }, @@ -5261,7 +5261,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Whiscash), ICON(Whiscash, 0), - FOOTPRINT(Whiscash), + FOOTPRINT(Whiscash) LEARNSETS(Whiscash), }, #endif //P_FAMILY_BARBOACH @@ -5310,7 +5310,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Corphish), ICON(Corphish, 0), - FOOTPRINT(Corphish), + FOOTPRINT(Corphish) LEARNSETS(Corphish), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_CRAWDAUNT}), }, @@ -5358,7 +5358,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Crawdaunt), ICON(Crawdaunt, 0), - FOOTPRINT(Crawdaunt), + FOOTPRINT(Crawdaunt) LEARNSETS(Crawdaunt), }, #endif //P_FAMILY_CORPHISH @@ -5409,7 +5409,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Baltoy), ICON(Baltoy, 2), - FOOTPRINT(Baltoy), + FOOTPRINT(Baltoy) LEARNSETS(Baltoy), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_CLAYDOL}), }, @@ -5459,7 +5459,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Claydol), ICON(Claydol, 0), - FOOTPRINT(Claydol), + FOOTPRINT(Claydol) LEARNSETS(Claydol), }, #endif //P_FAMILY_BALTOY @@ -5509,7 +5509,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Lileep), ICON(Lileep, 2), - FOOTPRINT(Lileep), + FOOTPRINT(Lileep) LEARNSETS(Lileep), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_CRADILY}), }, @@ -5558,7 +5558,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Cradily), ICON(Cradily, 1), - FOOTPRINT(Cradily), + FOOTPRINT(Cradily) LEARNSETS(Cradily), }, #endif //P_FAMILY_LILEEP @@ -5607,7 +5607,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Anorith), ICON(Anorith, 0), - FOOTPRINT(Anorith), + FOOTPRINT(Anorith) LEARNSETS(Anorith), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_ARMALDO}), }, @@ -5655,7 +5655,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Armaldo), ICON(Armaldo, 2), - FOOTPRINT(Armaldo), + FOOTPRINT(Armaldo) LEARNSETS(Armaldo), }, #endif //P_FAMILY_ANORITH @@ -5704,7 +5704,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SPRING, PALETTES(Feebas), ICON(Feebas, 2), - FOOTPRINT(Feebas), + FOOTPRINT(Feebas) LEARNSETS(Feebas), .evolutions = EVOLUTION({EVO_BEAUTY, 170, SPECIES_MILOTIC}, {EVO_TRADE_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC}, @@ -5757,7 +5757,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Milotic), ICON(Milotic, 2), - FOOTPRINT(Milotic), + FOOTPRINT(Milotic) LEARNSETS(Milotic), }, #endif //P_FAMILY_FEEBAS @@ -5791,7 +5791,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -5, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Castform), \ + FOOTPRINT(Castform) \ LEARNSETS(Castform), \ .formSpeciesIdTable = sCastformFormSpeciesIdTable, \ .formChangeTable = sCastformFormChangeTable @@ -5930,7 +5930,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Kecleon), ICON(Kecleon, 1), - FOOTPRINT(Kecleon), + FOOTPRINT(Kecleon) LEARNSETS(Kecleon), }, #endif //P_FAMILY_KECLEON @@ -5981,7 +5981,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Shuppet), ICON(Shuppet, 0), - FOOTPRINT(Shuppet), + FOOTPRINT(Shuppet) LEARNSETS(Shuppet), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_BANETTE}), }, @@ -6000,7 +6000,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Banette"), \ .natDexNum = NATIONAL_DEX_BANETTE, \ .categoryName = _("Marionette"), \ - FOOTPRINT(Banette), \ + FOOTPRINT(Banette) \ LEARNSETS(Banette), \ .formSpeciesIdTable = sBanetteFormSpeciesIdTable, \ .formChangeTable = sBanetteFormChangeTable @@ -6123,7 +6123,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Duskull), ICON(Duskull, 0), - FOOTPRINT(Duskull), + FOOTPRINT(Duskull) LEARNSETS(Duskull), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_DUSCLOPS}), }, @@ -6174,7 +6174,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Dusclops), ICON(Dusclops, 0), - FOOTPRINT(Dusclops), + FOOTPRINT(Dusclops) LEARNSETS(Dusclops), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_REAPER_CLOTH, SPECIES_DUSKNOIR}, {EVO_ITEM, ITEM_REAPER_CLOTH, SPECIES_DUSKNOIR}), @@ -6227,7 +6227,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Dusknoir), ICON(Dusknoir, 2), - FOOTPRINT(Dusknoir), + FOOTPRINT(Dusknoir) LEARNSETS(Dusknoir), }, #endif //P_GEN_4_CROSS_EVOS @@ -6277,7 +6277,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Tropius), ICON(Tropius, 1), - FOOTPRINT(Tropius), + FOOTPRINT(Tropius) LEARNSETS(Tropius), }, #endif //P_FAMILY_TROPIUS @@ -6328,7 +6328,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Chingling), ICON(Chingling, 1), - FOOTPRINT(Chingling), + FOOTPRINT(Chingling) LEARNSETS(Chingling), .evolutions = EVOLUTION({EVO_FRIENDSHIP_NIGHT, 0, SPECIES_CHIMECHO}), }, @@ -6386,7 +6386,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Chimecho), ICON(Chimecho, 0), - FOOTPRINT(Chimecho), + FOOTPRINT(Chimecho) LEARNSETS(Chimecho), }, #endif //P_FAMILY_CHIMECHO @@ -6411,7 +6411,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 3, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Absol), \ + FOOTPRINT(Absol) \ LEARNSETS(Absol), \ .formSpeciesIdTable = sAbsolFormSpeciesIdTable, \ .formChangeTable = sAbsolFormChangeTable @@ -6525,7 +6525,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Snorunt), ICON(Snorunt, 2), - FOOTPRINT(Snorunt), + FOOTPRINT(Snorunt) LEARNSETS(Snorunt), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_GLALIE}, {EVO_ITEM_FEMALE, ITEM_DAWN_STONE, SPECIES_FROSLASS}), @@ -6544,7 +6544,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Glalie"), \ .natDexNum = NATIONAL_DEX_GLALIE, \ .categoryName = _("Face"), \ - FOOTPRINT(Glalie), \ + FOOTPRINT(Glalie) \ LEARNSETS(Glalie), \ .formSpeciesIdTable = sGlalieFormSpeciesIdTable, \ .formChangeTable = sGlalieFormChangeTable @@ -6666,7 +6666,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Froslass), ICON(Froslass, 0), - FOOTPRINT(Froslass), + FOOTPRINT(Froslass) LEARNSETS(Froslass), }, #endif //P_GEN_4_CROSS_EVOS @@ -6717,7 +6717,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Spheal), ICON(Spheal, 2), - FOOTPRINT(Spheal), + FOOTPRINT(Spheal) LEARNSETS(Spheal), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_SEALEO}), }, @@ -6765,7 +6765,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Sealeo), ICON(Sealeo, 2), - FOOTPRINT(Sealeo), + FOOTPRINT(Sealeo) LEARNSETS(Sealeo), .evolutions = EVOLUTION({EVO_LEVEL, 44, SPECIES_WALREIN}), }, @@ -6813,7 +6813,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Walrein), ICON(Walrein, 0), - FOOTPRINT(Walrein), + FOOTPRINT(Walrein) LEARNSETS(Walrein), }, #endif //P_FAMILY_SPHEAL @@ -6864,7 +6864,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Clamperl), ICON(Clamperl, 0), - FOOTPRINT(Clamperl), + FOOTPRINT(Clamperl) LEARNSETS(Clamperl), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_DEEP_SEA_TOOTH, SPECIES_HUNTAIL}, {EVO_TRADE_ITEM, ITEM_DEEP_SEA_SCALE, SPECIES_GOREBYSS}, @@ -6917,7 +6917,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Huntail), ICON(Huntail, 0), - FOOTPRINT(Huntail), + FOOTPRINT(Huntail) LEARNSETS(Huntail), }, @@ -6965,7 +6965,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Gorebyss), ICON(Gorebyss, 0), - FOOTPRINT(Gorebyss), + FOOTPRINT(Gorebyss) LEARNSETS(Gorebyss), }, #endif //P_FAMILY_CLAMPERL @@ -7018,7 +7018,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Relicanth), ICON(Relicanth, 2), - FOOTPRINT(Relicanth), + FOOTPRINT(Relicanth) LEARNSETS(Relicanth), }, #endif //P_FAMILY_RELICANTH @@ -7068,7 +7068,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_H_SPRING_REPEATED, PALETTES(Luvdisc), ICON(Luvdisc, 0), - FOOTPRINT(Luvdisc), + FOOTPRINT(Luvdisc) LEARNSETS(Luvdisc), }, #endif //P_FAMILY_LUVDISC @@ -7118,7 +7118,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Bagon), ICON(Bagon, 0), - FOOTPRINT(Bagon), + FOOTPRINT(Bagon) LEARNSETS(Bagon), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_SHELGON}), }, @@ -7167,7 +7167,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Shelgon), ICON(Shelgon, 2), - FOOTPRINT(Shelgon), + FOOTPRINT(Shelgon) LEARNSETS(Shelgon), .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_SALAMENCE}), }, @@ -7186,7 +7186,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Salamence"), \ .natDexNum = NATIONAL_DEX_SALAMENCE, \ .categoryName = _("Dragon"), \ - FOOTPRINT(Salamence), \ + FOOTPRINT(Salamence) \ LEARNSETS(Salamence), \ .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, \ .formChangeTable = sSalamenceFormChangeTable @@ -7310,7 +7310,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Beldum), ICON(Beldum, 0), - FOOTPRINT(Beldum), + FOOTPRINT(Beldum) LEARNSETS(Beldum), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_METANG}), }, @@ -7359,7 +7359,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Metang), ICON(Metang, 0), - FOOTPRINT(Metang), + FOOTPRINT(Metang) LEARNSETS(Metang), .evolutions = EVOLUTION({EVO_LEVEL, 45, SPECIES_METAGROSS}), }, @@ -7378,7 +7378,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Metagross"), \ .natDexNum = NATIONAL_DEX_METAGROSS, \ .categoryName = _("Iron Leg"), \ - FOOTPRINT(Metagross), \ + FOOTPRINT(Metagross) \ LEARNSETS(Metagross), \ .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, \ .formChangeTable = sMetagrossFormChangeTable @@ -7501,7 +7501,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Regirock), ICON(Regirock, 2), - FOOTPRINT(Regirock), + FOOTPRINT(Regirock) LEARNSETS(Regirock), }, #endif //P_FAMILY_REGIROCK @@ -7551,7 +7551,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Regice), ICON(Regice, 0), - FOOTPRINT(Regice), + FOOTPRINT(Regice) LEARNSETS(Regice), }, #endif //P_FAMILY_REGICE @@ -7602,7 +7602,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Registeel), ICON(Registeel, 2), - FOOTPRINT(Registeel), + FOOTPRINT(Registeel) LEARNSETS(Registeel), }, #endif //P_FAMILY_REGISTEEL @@ -7620,7 +7620,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Latias"), \ .natDexNum = NATIONAL_DEX_LATIAS, \ .categoryName = _("Eon"), \ - FOOTPRINT(Latias), \ + FOOTPRINT(Latias) \ LEARNSETS(Latias), \ .formSpeciesIdTable = sLatiasFormSpeciesIdTable, \ .formChangeTable = sLatiasFormChangeTable, \ @@ -7716,7 +7716,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Latios"), \ .natDexNum = NATIONAL_DEX_LATIOS, \ .categoryName = _("Eon"), \ - FOOTPRINT(Latios), \ + FOOTPRINT(Latios) \ LEARNSETS(Latios), \ .formSpeciesIdTable = sLatiosFormSpeciesIdTable, \ .formChangeTable = sLatiosFormChangeTable @@ -7813,7 +7813,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .speciesName = _("Kyogre"), \ .natDexNum = NATIONAL_DEX_KYOGRE, \ .categoryName = _("Sea Basin"), \ - FOOTPRINT(Kyogre), \ + FOOTPRINT(Kyogre) \ LEARNSETS(Kyogre), \ .formSpeciesIdTable = sKyogreFormSpeciesIdTable, \ .formChangeTable = sKyogreFormChangeTable @@ -7904,7 +7904,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .cryId = CRY_GROUDON, \ .natDexNum = NATIONAL_DEX_GROUDON, \ .categoryName = _("Continent"), \ - FOOTPRINT(Groudon), \ + FOOTPRINT(Groudon) \ LEARNSETS(Groudon), \ .formSpeciesIdTable = sGroudonFormSpeciesIdTable, \ .formChangeTable = sGroudonFormChangeTable @@ -7997,7 +7997,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .cryId = CRY_RAYQUAZA, \ .natDexNum = NATIONAL_DEX_RAYQUAZA, \ .categoryName = _("Sky High"), \ - FOOTPRINT(Rayquaza), \ + FOOTPRINT(Rayquaza) \ LEARNSETS(Rayquaza), \ .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, \ .formChangeTable = sRayquazaFormChangeTable, \ @@ -8122,7 +8122,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Jirachi), ICON(Jirachi, 0), - FOOTPRINT(Jirachi), + FOOTPRINT(Jirachi) LEARNSETS(Jirachi), }, #endif //P_FAMILY_JIRACHI @@ -8151,7 +8151,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, \ .trainerScale = 290, \ .trainerOffset = 2, \ - FOOTPRINT(Deoxys), \ + FOOTPRINT(Deoxys) \ .formSpeciesIdTable = sDeoxysFormSpeciesIdTable [SPECIES_DEOXYS_NORMAL] = diff --git a/src/data/pokemon/species_info/gen_4.h b/src/data/pokemon/species_info/gen_4.h index b7566ac6fa..e9c95ddd77 100644 --- a/src/data/pokemon/species_info/gen_4.h +++ b/src/data/pokemon/species_info/gen_4.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Turtwig), ICON(Turtwig, 1), - FOOTPRINT(Turtwig), + FOOTPRINT(Turtwig) LEARNSETS(Turtwig), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_GROTLE}), }, @@ -96,7 +96,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Grotle), ICON(Grotle, 1), - FOOTPRINT(Grotle), + FOOTPRINT(Grotle) LEARNSETS(Grotle), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_TORTERRA}), }, @@ -146,7 +146,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, PALETTES(Torterra), ICON(Torterra, 1), - FOOTPRINT(Torterra), + FOOTPRINT(Torterra) LEARNSETS(Torterra), }, #endif //P_FAMILY_TURTWIG @@ -196,7 +196,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Chimchar), ICON(Chimchar, 1), - FOOTPRINT(Chimchar), + FOOTPRINT(Chimchar) LEARNSETS(Chimchar), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_MONFERNO}), }, @@ -246,7 +246,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Monferno), ICON(Monferno, 0), - FOOTPRINT(Monferno), + FOOTPRINT(Monferno) LEARNSETS(Monferno), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_INFERNAPE}), }, @@ -296,7 +296,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Infernape), ICON(Infernape, 0), - FOOTPRINT(Infernape), + FOOTPRINT(Infernape) LEARNSETS(Infernape), }, #endif //P_FAMILY_CHIMCHAR @@ -349,7 +349,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Piplup), ICON(Piplup, 0), - FOOTPRINT(Piplup), + FOOTPRINT(Piplup) LEARNSETS(Piplup), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_PRINPLUP}), }, @@ -401,7 +401,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Prinplup), ICON(Prinplup, 0), - FOOTPRINT(Prinplup), + FOOTPRINT(Prinplup) LEARNSETS(Prinplup), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_EMPOLEON}), }, @@ -453,7 +453,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Empoleon), ICON(Empoleon, 0), - FOOTPRINT(Empoleon), + FOOTPRINT(Empoleon) LEARNSETS(Empoleon), }, #endif //P_FAMILY_PIPLUP @@ -504,7 +504,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Starly), ICON(Starly, 0), - FOOTPRINT(Starly), + FOOTPRINT(Starly) LEARNSETS(Starly), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_STARAVIA}), }, @@ -554,7 +554,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Staravia), ICON(Staravia, 0), - FOOTPRINT(Staravia), + FOOTPRINT(Staravia) LEARNSETS(Staravia), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_STARAPTOR}), }, @@ -603,7 +603,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Staraptor), ICON(Staraptor, 0), - FOOTPRINT(Staraptor), + FOOTPRINT(Staraptor) LEARNSETS(Staraptor), }, #endif //P_FAMILY_STARLY @@ -654,7 +654,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Bidoof), ICON(Bidoof, 2), - FOOTPRINT(Bidoof), + FOOTPRINT(Bidoof) LEARNSETS(Bidoof), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_BIBAREL}), }, @@ -703,7 +703,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Bibarel), ICON(Bibarel, 2), - FOOTPRINT(Bibarel), + FOOTPRINT(Bibarel) LEARNSETS(Bibarel), }, #endif //P_FAMILY_BIDOOF @@ -755,7 +755,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Kricketot), ICON(Kricketot, 2), - FOOTPRINT(Kricketot), + FOOTPRINT(Kricketot) LEARNSETS(Kricketot), .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_KRICKETUNE}), }, @@ -806,7 +806,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Kricketune), ICON(Kricketune, 2), - FOOTPRINT(Kricketune), + FOOTPRINT(Kricketune) LEARNSETS(Kricketune), }, #endif //P_FAMILY_KRICKETOT @@ -857,7 +857,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Shinx), ICON(Shinx, 0), - FOOTPRINT(Shinx), + FOOTPRINT(Shinx) LEARNSETS(Shinx), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_LUXIO}), }, @@ -907,7 +907,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Luxio), ICON(Luxio, 0), - FOOTPRINT(Luxio), + FOOTPRINT(Luxio) LEARNSETS(Luxio), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_LUXRAY}), }, @@ -957,7 +957,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Luxray), ICON(Luxray, 0), - FOOTPRINT(Luxray), + FOOTPRINT(Luxray) LEARNSETS(Luxray), }, #endif //P_FAMILY_SHINX @@ -1006,7 +1006,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Cranidos), ICON(Cranidos, 0), - FOOTPRINT(Cranidos), + FOOTPRINT(Cranidos) LEARNSETS(Cranidos), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_RAMPARDOS}), }, @@ -1054,7 +1054,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Rampardos), ICON(Rampardos, 0), - FOOTPRINT(Rampardos), + FOOTPRINT(Rampardos) LEARNSETS(Rampardos), }, #endif //P_FAMILY_CRANIDOS @@ -1103,7 +1103,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Shieldon), ICON(Shieldon, 1), - FOOTPRINT(Shieldon), + FOOTPRINT(Shieldon) LEARNSETS(Shieldon), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_BASTIODON}), }, @@ -1151,7 +1151,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Bastiodon), ICON(Bastiodon, 1), - FOOTPRINT(Bastiodon), + FOOTPRINT(Bastiodon) LEARNSETS(Bastiodon), }, #endif //P_FAMILY_SHIELDON @@ -1188,7 +1188,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontAnimId = ANIM_V_STRETCH, \ .enemyMonElevation = 10, \ .backAnimId = BACK_ANIM_H_SHAKE, \ - FOOTPRINT(Burmy), \ + FOOTPRINT(Burmy) \ LEARNSETS(Burmy), \ .formSpeciesIdTable = sBurmyFormSpeciesIdTable, \ .formChangeTable = sBurmyFormChangeTable @@ -1276,7 +1276,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .enemyMonElevation = 8, \ .backPicYOffset = 2, \ .backAnimId = BACK_ANIM_V_SHAKE, \ - FOOTPRINT(Wormadam), \ + FOOTPRINT(Wormadam) \ .formSpeciesIdTable = sWormadamFormSpeciesIdTable [SPECIES_WORMADAM_PLANT_CLOAK] = @@ -1398,7 +1398,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Mothim), ICON(Mothim, 0), - FOOTPRINT(Mothim), + FOOTPRINT(Mothim) LEARNSETS(Mothim), }, #endif //P_FAMILY_BURMY @@ -1450,7 +1450,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = PALETTES(Combee), PALETTE_FEMALE(Combee), ICON(Combee, 0), - FOOTPRINT(Combee), + FOOTPRINT(Combee) LEARNSETS(Combee), .evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 21, SPECIES_VESPIQUEN}), }, @@ -1501,7 +1501,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, PALETTES(Vespiquen), ICON(Vespiquen, 0), - FOOTPRINT(Vespiquen), + FOOTPRINT(Vespiquen) LEARNSETS(Vespiquen), }, #endif //P_FAMILY_COMBEE @@ -1551,7 +1551,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Pachirisu), ICON(Pachirisu, 0), - FOOTPRINT(Pachirisu), + FOOTPRINT(Pachirisu) LEARNSETS(Pachirisu), }, #endif //P_FAMILY_PACHIRISU @@ -1601,7 +1601,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Buizel), ICON(Buizel, 0), - FOOTPRINT(Buizel), + FOOTPRINT(Buizel) LEARNSETS(Buizel), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_FLOATZEL}), }, @@ -1650,7 +1650,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Floatzel), ICON(Floatzel, 0), - FOOTPRINT(Floatzel), + FOOTPRINT(Floatzel) LEARNSETS(Floatzel), }, #endif //P_FAMILY_BUIZEL @@ -1700,7 +1700,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Cherubi), ICON(Cherubi, 1), - FOOTPRINT(Cherubi), + FOOTPRINT(Cherubi) LEARNSETS(Cherubi), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_CHERRIM_OVERCAST}), }, @@ -1733,7 +1733,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Cherrim), \ + FOOTPRINT(Cherrim) \ LEARNSETS(Cherrim), \ .formSpeciesIdTable = sCherrimFormSpeciesIdTable, \ .formChangeTable = sCherrimFormChangeTable @@ -1811,7 +1811,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontAnimId = ANIM_V_STRETCH, \ .backPicYOffset = 8, \ .backAnimId = BACK_ANIM_H_SPRING, \ - FOOTPRINT(Shellos), \ + FOOTPRINT(Shellos) \ LEARNSETS(Shellos), \ .formSpeciesIdTable = sShellosFormSpeciesIdTable @@ -1881,7 +1881,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, \ .backPicYOffset = 3, \ .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ - FOOTPRINT(Gastrodon), \ + FOOTPRINT(Gastrodon) \ LEARNSETS(Gastrodon), \ .formSpeciesIdTable = sGastrodonFormSpeciesIdTable @@ -1961,7 +1961,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Drifloon), ICON(Drifloon, 2), - FOOTPRINT(Drifloon), + FOOTPRINT(Drifloon) LEARNSETS(Drifloon), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_DRIFBLIM}), }, @@ -2010,7 +2010,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Drifblim), ICON(Drifblim, 2), - FOOTPRINT(Drifblim), + FOOTPRINT(Drifblim) LEARNSETS(Drifblim), }, #endif //P_FAMILY_DRIFLOON @@ -2059,7 +2059,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Buneary), ICON(Buneary, 2), - FOOTPRINT(Buneary), + FOOTPRINT(Buneary) LEARNSETS(Buneary), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_LOPUNNY}), }, @@ -2076,7 +2076,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .speciesName = _("Lopunny"), \ .natDexNum = NATIONAL_DEX_LOPUNNY, \ .categoryName = _("Rabbit"), \ - FOOTPRINT(Lopunny), \ + FOOTPRINT(Lopunny) \ LEARNSETS(Lopunny), \ .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, \ .formChangeTable = sLopunnyFormChangeTable @@ -2199,7 +2199,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Glameow), ICON(Glameow, 0), - FOOTPRINT(Glameow), + FOOTPRINT(Glameow) LEARNSETS(Glameow), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_PURUGLY}), }, @@ -2247,7 +2247,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Purugly), ICON(Purugly, 0), - FOOTPRINT(Purugly), + FOOTPRINT(Purugly) LEARNSETS(Purugly), }, #endif //P_FAMILY_GLAMEOW @@ -2296,7 +2296,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Stunky), ICON(Stunky, 2), - FOOTPRINT(Stunky), + FOOTPRINT(Stunky) LEARNSETS(Stunky), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SKUNTANK}), }, @@ -2344,7 +2344,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Skuntank), ICON(Skuntank, 2), - FOOTPRINT(Skuntank), + FOOTPRINT(Skuntank) LEARNSETS(Skuntank), }, #endif //P_FAMILY_STUNKY @@ -2395,7 +2395,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Bronzor), ICON(Bronzor, 0), - FOOTPRINT(Bronzor), + FOOTPRINT(Bronzor) LEARNSETS(Bronzor), .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_BRONZONG}), }, @@ -2446,7 +2446,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Bronzong), ICON(Bronzong, 0), - FOOTPRINT(Bronzong), + FOOTPRINT(Bronzong) LEARNSETS(Bronzong), }, #endif //P_FAMILY_BRONZOR @@ -2496,7 +2496,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Chatot), ICON(Chatot, 0), - FOOTPRINT(Chatot), + FOOTPRINT(Chatot) LEARNSETS(Chatot), }, #endif //P_FAMILY_CHATOT @@ -2546,7 +2546,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Spiritomb), ICON(Spiritomb, 5), - FOOTPRINT(Spiritomb), + FOOTPRINT(Spiritomb) LEARNSETS(Spiritomb), }, #endif //P_FAMILY_SPIRITOMB @@ -2597,7 +2597,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Gible), ICON(Gible, 0), - FOOTPRINT(Gible), + FOOTPRINT(Gible) LEARNSETS(Gible), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_GABITE}), }, @@ -2647,7 +2647,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Gabite), ICON(Gabite, 0), - FOOTPRINT(Gabite), + FOOTPRINT(Gabite) LEARNSETS(Gabite), .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_GARCHOMP}), }, @@ -2671,7 +2671,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 1, \ .trainerScale = 326, \ .trainerOffset = 4, \ - FOOTPRINT(Garchomp), \ + FOOTPRINT(Garchomp) \ LEARNSETS(Garchomp), \ .formSpeciesIdTable = sGarchompFormSpeciesIdTable, \ .formChangeTable = sGarchompFormChangeTable @@ -2781,7 +2781,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Riolu), ICON(Riolu, 2), - FOOTPRINT(Riolu), + FOOTPRINT(Riolu) LEARNSETS(Riolu), .evolutions = EVOLUTION({EVO_FRIENDSHIP_DAY, 0, SPECIES_LUCARIO}), }, @@ -2800,7 +2800,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .speciesName = _("Lucario"), \ .natDexNum = NATIONAL_DEX_LUCARIO, \ .categoryName = _("Aura"), \ - FOOTPRINT(Lucario), \ + FOOTPRINT(Lucario) \ LEARNSETS(Lucario), \ .formSpeciesIdTable = sLucarioFormSpeciesIdTable, \ .formChangeTable = sLucarioFormChangeTable @@ -2925,7 +2925,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE ICON_FEMALE(Hippopotas, 1), #endif - FOOTPRINT(Hippopotas), + FOOTPRINT(Hippopotas) LEARNSETS(Hippopotas), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_HIPPOWDON}), }, @@ -2977,7 +2977,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE ICON_FEMALE(Hippowdon, 1), #endif - FOOTPRINT(Hippowdon), + FOOTPRINT(Hippowdon) LEARNSETS(Hippowdon), }, #endif //P_FAMILY_HIPPOPOTAS @@ -3027,7 +3027,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Skorupi), ICON(Skorupi, 0), - FOOTPRINT(Skorupi), + FOOTPRINT(Skorupi) LEARNSETS(Skorupi), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_DRAPION}), }, @@ -3076,7 +3076,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Drapion), ICON(Drapion, 2), - FOOTPRINT(Drapion), + FOOTPRINT(Drapion) LEARNSETS(Drapion), }, #endif //P_FAMILY_SKORUPI @@ -3128,7 +3128,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Croagunk), ICON(Croagunk, 0), - FOOTPRINT(Croagunk), + FOOTPRINT(Croagunk) LEARNSETS(Croagunk), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_TOXICROAK}), }, @@ -3179,7 +3179,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Toxicroak), ICON(Toxicroak, 0), - FOOTPRINT(Toxicroak), + FOOTPRINT(Toxicroak) LEARNSETS(Toxicroak), }, #endif //P_FAMILY_CROAGUNK @@ -3229,7 +3229,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Carnivine), ICON(Carnivine, 1), - FOOTPRINT(Carnivine), + FOOTPRINT(Carnivine) LEARNSETS(Carnivine), }, #endif //P_FAMILY_CARNIVINE @@ -3280,7 +3280,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Finneon), ICON(Finneon, 0), - FOOTPRINT(Finneon), + FOOTPRINT(Finneon) LEARNSETS(Finneon), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_LUMINEON}), }, @@ -3330,7 +3330,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Lumineon), ICON(Lumineon, 0), - FOOTPRINT(Lumineon), + FOOTPRINT(Lumineon) LEARNSETS(Lumineon), }, #endif //P_FAMILY_FINNEON @@ -3382,7 +3382,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Snover), ICON(Snover, 1), - FOOTPRINT(Snover), + FOOTPRINT(Snover) LEARNSETS(Snover), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_ABOMASNOW}), }, @@ -3402,7 +3402,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .speciesName = _("Abomasnow"), \ .natDexNum = NATIONAL_DEX_ABOMASNOW, \ .categoryName = _("Frost Tree"), \ - FOOTPRINT(Abomasnow), \ + FOOTPRINT(Abomasnow) \ LEARNSETS(Abomasnow), \ .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, \ .formChangeTable = sAbomasnowFormChangeTable @@ -3502,7 +3502,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Rotom), \ + FOOTPRINT(Rotom) \ LEARNSETS(Rotom), \ .formSpeciesIdTable = sRotomFormSpeciesIdTable, \ .formChangeTable = sRotomFormChangeTable @@ -3704,7 +3704,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Uxie), ICON(Uxie, 0), - FOOTPRINT(Uxie), + FOOTPRINT(Uxie) LEARNSETS(Uxie), }, #endif //P_FAMILY_UXIE @@ -3757,7 +3757,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Mesprit), ICON(Mesprit, 0), - FOOTPRINT(Mesprit), + FOOTPRINT(Mesprit) LEARNSETS(Mesprit), }, #endif //P_FAMILY_MESPRIT @@ -3809,7 +3809,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Azelf), ICON(Azelf, 0), - FOOTPRINT(Azelf), + FOOTPRINT(Azelf) LEARNSETS(Azelf), }, #endif //P_FAMILY_AZELF @@ -3831,7 +3831,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .cryId = CRY_DIALGA, \ .natDexNum = NATIONAL_DEX_DIALGA, \ .categoryName = _("Temporal"), \ - FOOTPRINT(Dialga), \ + FOOTPRINT(Dialga) \ LEARNSETS(Dialga), \ .formSpeciesIdTable = sDialgaFormSpeciesIdTable, \ .formChangeTable = sDialgaFormChangeTable, \ @@ -3917,7 +3917,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .cryId = CRY_PALKIA, \ .natDexNum = NATIONAL_DEX_PALKIA, \ .categoryName = _("Spatial"), \ - FOOTPRINT(Palkia), \ + FOOTPRINT(Palkia) \ LEARNSETS(Palkia), \ .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, \ .formChangeTable = sPalkiaFormChangeTable, \ @@ -4031,7 +4031,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Heatran), ICON(Heatran, 0), - FOOTPRINT(Heatran), + FOOTPRINT(Heatran) LEARNSETS(Heatran), }, #endif //P_FAMILY_HEATRAN @@ -4081,7 +4081,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Regigigas), ICON(Regigigas, 0), - FOOTPRINT(Regigigas), + FOOTPRINT(Regigigas) LEARNSETS(Regigigas), }, #endif //P_FAMILY_REGIGIGAS @@ -4102,7 +4102,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .cryId = CRY_GIRATINA, \ .natDexNum = NATIONAL_DEX_GIRATINA, \ .categoryName = _("Renegade"), \ - FOOTPRINT(Giratina), \ + FOOTPRINT(Giratina) \ LEARNSETS(Giratina), \ .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, \ .formChangeTable = sGiratinaFormChangeTable, \ @@ -4220,7 +4220,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Cresselia), ICON(Cresselia, 0), - FOOTPRINT(Cresselia), + FOOTPRINT(Cresselia) LEARNSETS(Cresselia), }, #endif //P_FAMILY_CRESSELIA @@ -4271,7 +4271,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Phione), ICON(Phione, 0), - FOOTPRINT(Phione), + FOOTPRINT(Phione) LEARNSETS(Phione), }, @@ -4320,7 +4320,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Manaphy), ICON(Manaphy, 0), - FOOTPRINT(Manaphy), + FOOTPRINT(Manaphy) LEARNSETS(Manaphy), }, #endif //P_FAMILY_MANAPHY @@ -4372,7 +4372,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Darkrai), ICON(Darkrai, 0), - FOOTPRINT(Darkrai), + FOOTPRINT(Darkrai) LEARNSETS(Darkrai), }, #endif //P_FAMILY_DARKRAI @@ -4393,7 +4393,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .speciesName = _("Shaymin"), \ .natDexNum = NATIONAL_DEX_SHAYMIN, \ .categoryName = _("Gratitude"), \ - FOOTPRINT(Shaymin), \ + FOOTPRINT(Shaymin) \ .formSpeciesIdTable = sShayminFormSpeciesIdTable, \ .formChangeTable = sShayminFormChangeTable, \ .isMythical = TRUE @@ -4510,7 +4510,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_GROW_STUTTER, \ PALETTES(Arceus ##typeName), \ ICON(Arceus, 1), \ - FOOTPRINT(Arceus), \ + FOOTPRINT(Arceus) \ LEARNSETS(Arceus), \ .formSpeciesIdTable = sArceusFormSpeciesIdTable, \ .formChangeTable = sArceusFormChangeTable, \ diff --git a/src/data/pokemon/species_info/gen_5.h b/src/data/pokemon/species_info/gen_5.h index 4d0740b2ee..adaae4bd8a 100644 --- a/src/data/pokemon/species_info/gen_5.h +++ b/src/data/pokemon/species_info/gen_5.h @@ -48,7 +48,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Victini), ICON(Victini, 0), - FOOTPRINT(Victini), + FOOTPRINT(Victini) LEARNSETS(Victini), }, #endif //P_FAMILY_VICTINI @@ -97,7 +97,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Snivy), ICON(Snivy, 1), - FOOTPRINT(Snivy), + FOOTPRINT(Snivy) LEARNSETS(Snivy), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_SERVINE}), }, @@ -145,7 +145,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Servine), ICON(Servine, 1), - FOOTPRINT(Servine), + FOOTPRINT(Servine) LEARNSETS(Servine), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SERPERIOR}), }, @@ -193,7 +193,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Serperior), ICON(Serperior, 1), - FOOTPRINT(Serperior), + FOOTPRINT(Serperior) LEARNSETS(Serperior), }, #endif //P_FAMILY_SNIVY @@ -242,7 +242,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Tepig), ICON(Tepig, 0), - FOOTPRINT(Tepig), + FOOTPRINT(Tepig) LEARNSETS(Tepig), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_PIGNITE}), }, @@ -290,7 +290,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Pignite), ICON(Pignite, 0), - FOOTPRINT(Pignite), + FOOTPRINT(Pignite) LEARNSETS(Pignite), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_EMBOAR}), }, @@ -339,7 +339,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Emboar), ICON(Emboar, 0), - FOOTPRINT(Emboar), + FOOTPRINT(Emboar) LEARNSETS(Emboar), }, #endif //P_FAMILY_TEPIG @@ -388,7 +388,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Oshawott), ICON(Oshawott, 0), - FOOTPRINT(Oshawott), + FOOTPRINT(Oshawott) LEARNSETS(Oshawott), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_DEWOTT}), }, @@ -436,7 +436,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Dewott), ICON(Dewott, 0), - FOOTPRINT(Dewott), + FOOTPRINT(Dewott) LEARNSETS(Dewott), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SAMUROTT}, {EVO_NONE, 0, SPECIES_SAMUROTT_HISUIAN}), @@ -460,7 +460,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, \ .trainerScale = 271, \ .trainerOffset = 0, \ - FOOTPRINT(Samurott), \ + FOOTPRINT(Samurott) \ .formSpeciesIdTable = sSamurottFormSpeciesIdTable [SPECIES_SAMUROTT] = @@ -571,7 +571,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Patrat), ICON(Patrat, 2), - FOOTPRINT(Patrat), + FOOTPRINT(Patrat) LEARNSETS(Patrat), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_WATCHOG}), }, @@ -619,7 +619,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Watchog), ICON(Watchog, 2), - FOOTPRINT(Watchog), + FOOTPRINT(Watchog) LEARNSETS(Watchog), }, #endif //P_FAMILY_PATRAT @@ -668,7 +668,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Lillipup), ICON(Lillipup, 2), - FOOTPRINT(Lillipup), + FOOTPRINT(Lillipup) LEARNSETS(Lillipup), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_HERDIER}), }, @@ -716,7 +716,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Herdier), ICON(Herdier, 2), - FOOTPRINT(Herdier), + FOOTPRINT(Herdier) LEARNSETS(Herdier), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_STOUTLAND}), }, @@ -764,7 +764,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Stoutland), ICON(Stoutland, 2), - FOOTPRINT(Stoutland), + FOOTPRINT(Stoutland) LEARNSETS(Stoutland), }, #endif //P_FAMILY_LILLIPUP @@ -813,7 +813,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Purrloin), ICON(Purrloin, 0), - FOOTPRINT(Purrloin), + FOOTPRINT(Purrloin) LEARNSETS(Purrloin), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LIEPARD}), }, @@ -861,7 +861,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Liepard), ICON(Liepard, 0), - FOOTPRINT(Liepard), + FOOTPRINT(Liepard) LEARNSETS(Liepard), }, #endif //P_FAMILY_PURRLOIN @@ -910,7 +910,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Pansage), ICON(Pansage, 1), - FOOTPRINT(Pansage), + FOOTPRINT(Pansage) LEARNSETS(Pansage), .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_SIMISAGE}), }, @@ -958,7 +958,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Simisage), ICON(Simisage, 1), - FOOTPRINT(Simisage), + FOOTPRINT(Simisage) LEARNSETS(Simisage), }, #endif //P_FAMILY_PANSAGE @@ -1008,7 +1008,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Pansear), ICON(Pansear, 2), - FOOTPRINT(Pansear), + FOOTPRINT(Pansear) LEARNSETS(Pansear), .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_SIMISEAR}), }, @@ -1057,7 +1057,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Simisear), ICON(Simisear, 2), - FOOTPRINT(Simisear), + FOOTPRINT(Simisear) LEARNSETS(Simisear), }, #endif //P_FAMILY_PANSEAR @@ -1106,7 +1106,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Panpour), ICON(Panpour, 2), - FOOTPRINT(Panpour), + FOOTPRINT(Panpour) LEARNSETS(Panpour), .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_SIMIPOUR}), }, @@ -1154,7 +1154,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Simipour), ICON(Simipour, 2), - FOOTPRINT(Simipour), + FOOTPRINT(Simipour) LEARNSETS(Simipour), }, #endif //P_FAMILY_PANPOUR @@ -1204,7 +1204,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Munna), ICON(Munna, 0), - FOOTPRINT(Munna), + FOOTPRINT(Munna) LEARNSETS(Munna), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_MUSHARNA}), }, @@ -1253,7 +1253,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Musharna), ICON(Musharna, 0), - FOOTPRINT(Musharna), + FOOTPRINT(Musharna) LEARNSETS(Musharna), }, #endif //P_FAMILY_MUNNA @@ -1302,7 +1302,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Pidove), ICON(Pidove, 0), - FOOTPRINT(Pidove), + FOOTPRINT(Pidove) LEARNSETS(Pidove), .evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_TRANQUILL}), }, @@ -1350,7 +1350,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Tranquill), ICON(Tranquill, 0), - FOOTPRINT(Tranquill), + FOOTPRINT(Tranquill) LEARNSETS(Tranquill), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_UNFEZANT}), }, @@ -1402,7 +1402,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = PALETTE_FEMALE(Unfezant), ICON(Unfezant, 1), ICON_FEMALE(Unfezant, 1), - FOOTPRINT(Unfezant), + FOOTPRINT(Unfezant) LEARNSETS(Unfezant), }, #endif //P_FAMILY_PIDOVE @@ -1451,7 +1451,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Blitzle), ICON(Blitzle, 2), - FOOTPRINT(Blitzle), + FOOTPRINT(Blitzle) LEARNSETS(Blitzle), .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_ZEBSTRIKA}), }, @@ -1499,7 +1499,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Zebstrika), ICON(Zebstrika, 2), - FOOTPRINT(Zebstrika), + FOOTPRINT(Zebstrika) LEARNSETS(Zebstrika), }, #endif //P_FAMILY_BLITZLE @@ -1550,7 +1550,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Roggenrola), ICON(Roggenrola, 2), - FOOTPRINT(Roggenrola), + FOOTPRINT(Roggenrola) LEARNSETS(Roggenrola), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_BOLDORE}), }, @@ -1601,7 +1601,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Boldore), ICON(Boldore, 0), - FOOTPRINT(Boldore), + FOOTPRINT(Boldore) LEARNSETS(Boldore), .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GIGALITH}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GIGALITH}), @@ -1652,7 +1652,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Gigalith), ICON(Gigalith, 0), - FOOTPRINT(Gigalith), + FOOTPRINT(Gigalith) LEARNSETS(Gigalith), }, #endif //P_FAMILY_ROGGENROLA @@ -1702,7 +1702,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Woobat), ICON(Woobat, 0), - FOOTPRINT(Woobat), + FOOTPRINT(Woobat) LEARNSETS(Woobat), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_SWOOBAT}), }, @@ -1751,7 +1751,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Swoobat), ICON(Swoobat, 0), - FOOTPRINT(Swoobat), + FOOTPRINT(Swoobat) LEARNSETS(Swoobat), }, #endif //P_FAMILY_WOOBAT @@ -1801,7 +1801,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Drilbur), ICON(Drilbur, 0), - FOOTPRINT(Drilbur), + FOOTPRINT(Drilbur) LEARNSETS(Drilbur), .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_EXCADRILL}), }, @@ -1850,7 +1850,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Excadrill), ICON(Excadrill, 0), - FOOTPRINT(Excadrill), + FOOTPRINT(Excadrill) LEARNSETS(Excadrill), }, #endif //P_FAMILY_DRILBUR @@ -1868,7 +1868,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .speciesName = _("Audino"), \ .natDexNum = NATIONAL_DEX_AUDINO, \ .categoryName = _("Hearing"), \ - FOOTPRINT(Audino), \ + FOOTPRINT(Audino) \ LEARNSETS(Audino), \ .formSpeciesIdTable = sAudinoFormSpeciesIdTable, \ .formChangeTable = sAudinoFormChangeTable @@ -1994,7 +1994,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Timburr), ICON(Timburr, 1), - FOOTPRINT(Timburr), + FOOTPRINT(Timburr) LEARNSETS(Timburr), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GURDURR}), }, @@ -2042,7 +2042,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Gurdurr), ICON(Gurdurr, 1), - FOOTPRINT(Gurdurr), + FOOTPRINT(Gurdurr) LEARNSETS(Gurdurr), .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_CONKELDURR}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_CONKELDURR}), @@ -2091,7 +2091,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Conkeldurr), ICON(Conkeldurr, 1), - FOOTPRINT(Conkeldurr), + FOOTPRINT(Conkeldurr) LEARNSETS(Conkeldurr), }, #endif //P_FAMILY_TIMBURR @@ -2140,7 +2140,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SPRING, PALETTES(Tympole), ICON(Tympole, 2), - FOOTPRINT(Tympole), + FOOTPRINT(Tympole) LEARNSETS(Tympole), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_PALPITOAD}), }, @@ -2188,7 +2188,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Palpitoad), ICON(Palpitoad, 2), - FOOTPRINT(Palpitoad), + FOOTPRINT(Palpitoad) LEARNSETS(Palpitoad), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SEISMITOAD}), }, @@ -2236,7 +2236,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Seismitoad), ICON(Seismitoad, 0), - FOOTPRINT(Seismitoad), + FOOTPRINT(Seismitoad) LEARNSETS(Seismitoad), }, #endif //P_FAMILY_TYMPOLE @@ -2286,7 +2286,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Throh), ICON(Throh, 0), - FOOTPRINT(Throh), + FOOTPRINT(Throh) LEARNSETS(Throh), }, #endif //P_FAMILY_THROH @@ -2337,7 +2337,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Sawk), ICON(Sawk, 0), - FOOTPRINT(Sawk), + FOOTPRINT(Sawk) LEARNSETS(Sawk), }, #endif //P_FAMILY_SAWK @@ -2387,7 +2387,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Sewaddle), ICON(Sewaddle, 1), - FOOTPRINT(Sewaddle), + FOOTPRINT(Sewaddle) LEARNSETS(Sewaddle), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_SWADLOON}), }, @@ -2436,7 +2436,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Swadloon), ICON(Swadloon, 1), - FOOTPRINT(Swadloon), + FOOTPRINT(Swadloon) LEARNSETS(Swadloon), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_LEAVANNY}), }, @@ -2485,7 +2485,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Leavanny), ICON(Leavanny, 1), - FOOTPRINT(Leavanny), + FOOTPRINT(Leavanny) LEARNSETS(Leavanny), }, #endif //P_FAMILY_SEWADDLE @@ -2539,7 +2539,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Venipede), ICON(Venipede, 1), - FOOTPRINT(Venipede), + FOOTPRINT(Venipede) LEARNSETS(Venipede), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_WHIRLIPEDE}), }, @@ -2592,7 +2592,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Whirlipede), ICON(Whirlipede, 2), - FOOTPRINT(Whirlipede), + FOOTPRINT(Whirlipede) LEARNSETS(Whirlipede), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_SCOLIPEDE}), }, @@ -2645,7 +2645,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Scolipede), ICON(Scolipede, 2), - FOOTPRINT(Scolipede), + FOOTPRINT(Scolipede) LEARNSETS(Scolipede), }, #endif //P_FAMILY_VENIPEDE @@ -2701,7 +2701,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Cottonee), ICON(Cottonee, 1), - FOOTPRINT(Cottonee), + FOOTPRINT(Cottonee) LEARNSETS(Cottonee), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_WHIMSICOTT}), }, @@ -2750,7 +2750,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Whimsicott), ICON(Whimsicott, 1), - FOOTPRINT(Whimsicott), + FOOTPRINT(Whimsicott) LEARNSETS(Whimsicott), }, #endif //P_FAMILY_COTTONEE @@ -2801,7 +2801,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Petilil), ICON(Petilil, 1), - FOOTPRINT(Petilil), + FOOTPRINT(Petilil) LEARNSETS(Petilil), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_LILLIGANT}, {EVO_NONE, 0, SPECIES_LILLIGANT_HISUIAN}), @@ -2821,7 +2821,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .speciesName = _("Lilligant"), \ .cryId = CRY_LILLIGANT, \ .natDexNum = NATIONAL_DEX_LILLIGANT, \ - FOOTPRINT(Lilligant), \ + FOOTPRINT(Lilligant) \ .formSpeciesIdTable = sLilligantFormSpeciesIdTable [SPECIES_LILLIGANT] = @@ -2929,7 +2929,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 257, \ .trainerOffset = 0, \ .enemyMonElevation = 6, \ - FOOTPRINT(Basculin), \ + FOOTPRINT(Basculin) \ .formSpeciesIdTable = sBasculinFormSpeciesIdTable [SPECIES_BASCULIN_RED_STRIPED] = @@ -3033,7 +3033,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .formSpeciesIdTable = sBasculegionFormSpeciesIdTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Basculegion), + //FOOTPRINT(Basculegion) [SPECIES_BASCULEGION_MALE] = { @@ -3123,7 +3123,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Sandile), ICON(Sandile, 1), - FOOTPRINT(Sandile), + FOOTPRINT(Sandile) LEARNSETS(Sandile), .evolutions = EVOLUTION({EVO_LEVEL, 29, SPECIES_KROKOROK}), }, @@ -3172,7 +3172,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Krokorok), ICON(Krokorok, 1), - FOOTPRINT(Krokorok), + FOOTPRINT(Krokorok) LEARNSETS(Krokorok), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_KROOKODILE}), }, @@ -3221,7 +3221,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Krookodile), ICON(Krookodile, 0), - FOOTPRINT(Krookodile), + FOOTPRINT(Krookodile) LEARNSETS(Krookodile), }, #endif //P_FAMILY_SANDILE @@ -3247,7 +3247,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .cryId = CRY_DARUMAKA, \ .natDexNum = NATIONAL_DEX_DARUMAKA, \ .categoryName = _("Zen Charm"), \ - FOOTPRINT(Darumaka), \ + FOOTPRINT(Darumaka) \ .formSpeciesIdTable = sDarumakaFormSpeciesIdTable [SPECIES_DARUMAKA] = @@ -3289,7 +3289,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .speciesName = _("Darmanitan"), \ .cryId = CRY_DARMANITAN, \ .natDexNum = NATIONAL_DEX_DARMANITAN, \ - FOOTPRINT(Darmanitan), \ + FOOTPRINT(Darmanitan) \ .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable #define DARMANITAN_STANDARD_MISC_INFO \ @@ -3510,7 +3510,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Maractus), ICON(Maractus, 1), - FOOTPRINT(Maractus), + FOOTPRINT(Maractus) LEARNSETS(Maractus), }, #endif //P_FAMILY_MARACTUS @@ -3560,7 +3560,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Dwebble), ICON(Dwebble, 0), - FOOTPRINT(Dwebble), + FOOTPRINT(Dwebble) LEARNSETS(Dwebble), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_CRUSTLE}), }, @@ -3609,7 +3609,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Crustle), ICON(Crustle, 2), - FOOTPRINT(Crustle), + FOOTPRINT(Crustle) LEARNSETS(Crustle), }, #endif //P_FAMILY_DWEBBLE @@ -3659,7 +3659,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Scraggy), ICON(Scraggy, 2), - FOOTPRINT(Scraggy), + FOOTPRINT(Scraggy) LEARNSETS(Scraggy), .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_SCRAFTY}), }, @@ -3709,7 +3709,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Scrafty), ICON(Scrafty, 0), - FOOTPRINT(Scrafty), + FOOTPRINT(Scrafty) LEARNSETS(Scrafty), }, #endif //P_FAMILY_SCRAGGY @@ -3759,7 +3759,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Sigilyph), ICON(Sigilyph, 0), - FOOTPRINT(Sigilyph), + FOOTPRINT(Sigilyph) LEARNSETS(Sigilyph), }, #endif //P_FAMILY_SIGILYPH @@ -3785,7 +3785,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Yamask), \ + FOOTPRINT(Yamask) \ .formSpeciesIdTable = sYamaskFormSpeciesIdTable [SPECIES_YAMASK] = @@ -3863,7 +3863,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Cofagrigus), ICON(Cofagrigus, 0), - FOOTPRINT(Cofagrigus), + FOOTPRINT(Cofagrigus) LEARNSETS(Cofagrigus), }, @@ -3942,7 +3942,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Runerigus), ICON(Runerigus, 2), - FOOTPRINT(Runerigus), + FOOTPRINT(Runerigus) LEARNSETS(Runerigus), }, #endif //P_GALARIAN_FORMS @@ -3992,7 +3992,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Tirtouga), ICON(Tirtouga, 2), - FOOTPRINT(Tirtouga), + FOOTPRINT(Tirtouga) LEARNSETS(Tirtouga), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_CARRACOSTA}), }, @@ -4040,7 +4040,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Carracosta), ICON(Carracosta, 2), - FOOTPRINT(Carracosta), + FOOTPRINT(Carracosta) LEARNSETS(Carracosta), }, #endif //P_FAMILY_TIRTOUGA @@ -4089,7 +4089,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Archen), ICON(Archen, 0), - FOOTPRINT(Archen), + FOOTPRINT(Archen) LEARNSETS(Archen), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_ARCHEOPS}), }, @@ -4138,7 +4138,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Archeops), ICON(Archeops, 0), - FOOTPRINT(Archeops), + FOOTPRINT(Archeops) LEARNSETS(Archeops), }, #endif //P_FAMILY_ARCHEN @@ -4188,7 +4188,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Trubbish), ICON(Trubbish, 1), - FOOTPRINT(Trubbish), + FOOTPRINT(Trubbish) LEARNSETS(Trubbish), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GARBODOR}), }, @@ -4218,7 +4218,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .cryId = CRY_GARBODOR, \ .natDexNum = NATIONAL_DEX_GARBODOR, \ .categoryName = _("Trash Heap"), \ - FOOTPRINT(Garbodor), \ + FOOTPRINT(Garbodor) \ LEARNSETS(Garbodor), \ .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, \ .formChangeTable = sGarbodorFormChangeTable @@ -4298,7 +4298,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Zorua), \ + FOOTPRINT(Zorua) \ .formSpeciesIdTable = sZoruaFormSpeciesIdTable #define ZOROARK_MISC_INFO \ @@ -4320,7 +4320,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, \ .trainerScale = 296, \ .trainerOffset = 1, \ - FOOTPRINT(Zoroark), \ + FOOTPRINT(Zoroark) \ .formSpeciesIdTable = sZoroarkFormSpeciesIdTable [SPECIES_ZORUA] = @@ -4488,7 +4488,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Minccino), ICON(Minccino, 0), - FOOTPRINT(Minccino), + FOOTPRINT(Minccino) LEARNSETS(Minccino), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_CINCCINO}), }, @@ -4537,7 +4537,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Cinccino), ICON(Cinccino, 0), - FOOTPRINT(Cinccino), + FOOTPRINT(Cinccino) LEARNSETS(Cinccino), }, #endif //P_FAMILY_MINCCINO @@ -4586,7 +4586,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Gothita), ICON(Gothita, 2), - FOOTPRINT(Gothita), + FOOTPRINT(Gothita) LEARNSETS(Gothita), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GOTHORITA}), }, @@ -4634,7 +4634,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Gothorita), ICON(Gothorita, 2), - FOOTPRINT(Gothorita), + FOOTPRINT(Gothorita) LEARNSETS(Gothorita), .evolutions = EVOLUTION({EVO_LEVEL, 41, SPECIES_GOTHITELLE}), }, @@ -4682,7 +4682,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Gothitelle), ICON(Gothitelle, 2), - FOOTPRINT(Gothitelle), + FOOTPRINT(Gothitelle) LEARNSETS(Gothitelle), }, #endif //P_FAMILY_GOTHITA @@ -4733,7 +4733,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Solosis), ICON(Solosis, 1), - FOOTPRINT(Solosis), + FOOTPRINT(Solosis) LEARNSETS(Solosis), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_DUOSION}), }, @@ -4782,7 +4782,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Duosion), ICON(Duosion, 1), - FOOTPRINT(Duosion), + FOOTPRINT(Duosion) LEARNSETS(Duosion), .evolutions = EVOLUTION({EVO_LEVEL, 41, SPECIES_REUNICLUS}), }, @@ -4831,7 +4831,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Reuniclus), ICON(Reuniclus, 1), - FOOTPRINT(Reuniclus), + FOOTPRINT(Reuniclus) LEARNSETS(Reuniclus), }, #endif //P_FAMILY_SOLOSIS @@ -4880,7 +4880,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Ducklett), ICON(Ducklett, 0), - FOOTPRINT(Ducklett), + FOOTPRINT(Ducklett) LEARNSETS(Ducklett), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_SWANNA}), }, @@ -4928,7 +4928,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Swanna), ICON(Swanna, 2), - FOOTPRINT(Swanna), + FOOTPRINT(Swanna) LEARNSETS(Swanna), }, #endif //P_FAMILY_DUCKLETT @@ -4978,7 +4978,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Vanillite), ICON(Vanillite, 0), - FOOTPRINT(Vanillite), + FOOTPRINT(Vanillite) LEARNSETS(Vanillite), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_VANILLISH}), }, @@ -5027,7 +5027,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Vanillish), ICON(Vanillish, 2), - FOOTPRINT(Vanillish), + FOOTPRINT(Vanillish) LEARNSETS(Vanillish), .evolutions = EVOLUTION({EVO_LEVEL, 47, SPECIES_VANILLUXE}), }, @@ -5076,7 +5076,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Vanilluxe), ICON(Vanilluxe, 2), - FOOTPRINT(Vanilluxe), + FOOTPRINT(Vanilluxe) LEARNSETS(Vanilluxe), }, #endif //P_FAMILY_VANILLITE @@ -5116,7 +5116,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = BACK_PIC(Deerling, 48, 56), \ .backPicYOffset = 9, \ .backAnimId = BACK_ANIM_H_SLIDE, \ - FOOTPRINT(Deerling), \ + FOOTPRINT(Deerling) \ LEARNSETS(Deerling), \ .formSpeciesIdTable = sDeerlingFormSpeciesIdTable @@ -5206,7 +5206,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ .backPicYOffset = 5, \ .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, \ - FOOTPRINT(Sawsbuck), \ + FOOTPRINT(Sawsbuck) \ LEARNSETS(Sawsbuck), \ .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable @@ -5313,7 +5313,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Emolga), ICON(Emolga, 2), - FOOTPRINT(Emolga), + FOOTPRINT(Emolga) LEARNSETS(Emolga), }, #endif //P_FAMILY_EMOLGA @@ -5362,7 +5362,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Karrablast), ICON(Karrablast, 0), - FOOTPRINT(Karrablast), + FOOTPRINT(Karrablast) LEARNSETS(Karrablast), .evolutions = EVOLUTION({EVO_TRADE_SPECIFIC_MON, SPECIES_SHELMET, SPECIES_ESCAVALIER}), }, @@ -5410,7 +5410,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Escavalier), ICON(Escavalier, 0), - FOOTPRINT(Escavalier), + FOOTPRINT(Escavalier) LEARNSETS(Escavalier), }, #endif //P_FAMILY_KARRABLAST @@ -5461,7 +5461,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Foongus), ICON(Foongus, 0), - FOOTPRINT(Foongus), + FOOTPRINT(Foongus) LEARNSETS(Foongus), .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_AMOONGUSS}), }, @@ -5512,7 +5512,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Amoonguss), ICON(Amoonguss, 1), - FOOTPRINT(Amoonguss), + FOOTPRINT(Amoonguss) LEARNSETS(Amoonguss), }, #endif //P_FAMILY_FOONGUS @@ -5565,7 +5565,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = PALETTE_FEMALE(Frillish), ICON(Frillish, 0), ICON_FEMALE(Frillish, 1), - FOOTPRINT(Frillish), + FOOTPRINT(Frillish) LEARNSETS(Frillish), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_JELLICENT}), }, @@ -5617,7 +5617,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = PALETTE_FEMALE(Jellicent), ICON(Jellicent, 0), ICON_FEMALE(Jellicent, 1), - FOOTPRINT(Jellicent), + FOOTPRINT(Jellicent) LEARNSETS(Jellicent), }, #endif //P_FAMILY_FRILLISH @@ -5666,7 +5666,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Alomomola), ICON(Alomomola, 0), - FOOTPRINT(Alomomola), + FOOTPRINT(Alomomola) LEARNSETS(Alomomola), }, #endif //P_FAMILY_ALOMOMOLA @@ -5715,7 +5715,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Joltik), ICON(Joltik, 0), - FOOTPRINT(Joltik), + FOOTPRINT(Joltik) LEARNSETS(Joltik), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GALVANTULA}), }, @@ -5763,7 +5763,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Galvantula), ICON(Galvantula, 2), - FOOTPRINT(Galvantula), + FOOTPRINT(Galvantula) LEARNSETS(Galvantula), }, #endif //P_FAMILY_JOLTIK @@ -5813,7 +5813,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Ferroseed), ICON(Ferroseed, 1), - FOOTPRINT(Ferroseed), + FOOTPRINT(Ferroseed) LEARNSETS(Ferroseed), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_FERROTHORN}), }, @@ -5863,7 +5863,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Ferrothorn), ICON(Ferrothorn, 1), - FOOTPRINT(Ferrothorn), + FOOTPRINT(Ferrothorn) LEARNSETS(Ferrothorn), }, #endif //P_FAMILY_FERROSEED @@ -5914,7 +5914,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Klink), ICON(Klink, 0), - FOOTPRINT(Klink), + FOOTPRINT(Klink) LEARNSETS(Klink), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_KLANG}), }, @@ -5964,7 +5964,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Klang), ICON(Klang, 0), - FOOTPRINT(Klang), + FOOTPRINT(Klang) LEARNSETS(Klang), .evolutions = EVOLUTION({EVO_LEVEL, 49, SPECIES_KLINKLANG}), }, @@ -6014,7 +6014,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, PALETTES(Klinklang), ICON(Klinklang, 0), - FOOTPRINT(Klinklang), + FOOTPRINT(Klinklang) LEARNSETS(Klinklang), }, #endif //P_FAMILY_KLINK @@ -6064,7 +6064,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Tynamo), ICON(Tynamo, 0), - FOOTPRINT(Tynamo), + FOOTPRINT(Tynamo) LEARNSETS(Tynamo), .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_EELEKTRIK}), }, @@ -6113,7 +6113,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Eelektrik), ICON(Eelektrik, 0), - FOOTPRINT(Eelektrik), + FOOTPRINT(Eelektrik) LEARNSETS(Eelektrik), .evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_EELEKTROSS}), }, @@ -6162,7 +6162,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Eelektross), ICON(Eelektross, 0), - FOOTPRINT(Eelektross), + FOOTPRINT(Eelektross) LEARNSETS(Eelektross), }, #endif //P_FAMILY_TYNAMO @@ -6211,7 +6211,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Elgyem), ICON(Elgyem, 0), - FOOTPRINT(Elgyem), + FOOTPRINT(Elgyem) LEARNSETS(Elgyem), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_BEHEEYEM}), }, @@ -6259,7 +6259,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Beheeyem), ICON(Beheeyem, 2), - FOOTPRINT(Beheeyem), + FOOTPRINT(Beheeyem) LEARNSETS(Beheeyem), }, #endif //P_FAMILY_ELGYEM @@ -6313,7 +6313,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Litwick), ICON(Litwick, 2), - FOOTPRINT(Litwick), + FOOTPRINT(Litwick) LEARNSETS(Litwick), .evolutions = EVOLUTION({EVO_LEVEL, 41, SPECIES_LAMPENT}), }, @@ -6366,7 +6366,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Lampent), ICON(Lampent, 2), - FOOTPRINT(Lampent), + FOOTPRINT(Lampent) LEARNSETS(Lampent), .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_CHANDELURE}), }, @@ -6419,7 +6419,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Chandelure), ICON(Chandelure, 2), - FOOTPRINT(Chandelure), + FOOTPRINT(Chandelure) LEARNSETS(Chandelure), }, #endif //P_FAMILY_LITWICK @@ -6468,7 +6468,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Axew), ICON(Axew, 1), - FOOTPRINT(Axew), + FOOTPRINT(Axew) LEARNSETS(Axew), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_FRAXURE}), }, @@ -6516,7 +6516,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Fraxure), ICON(Fraxure, 1), - FOOTPRINT(Fraxure), + FOOTPRINT(Fraxure) LEARNSETS(Fraxure), .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_HAXORUS}), }, @@ -6564,7 +6564,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Haxorus), ICON(Haxorus, 2), - FOOTPRINT(Haxorus), + FOOTPRINT(Haxorus) LEARNSETS(Haxorus), }, #endif //P_FAMILY_AXEW @@ -6613,7 +6613,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Cubchoo), ICON(Cubchoo, 0), - FOOTPRINT(Cubchoo), + FOOTPRINT(Cubchoo) LEARNSETS(Cubchoo), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_BEARTIC}), }, @@ -6661,7 +6661,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Beartic), ICON(Beartic, 0), - FOOTPRINT(Beartic), + FOOTPRINT(Beartic) LEARNSETS(Beartic), }, #endif //P_FAMILY_CUBCHOO @@ -6717,7 +6717,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Cryogonal), ICON(Cryogonal, 0), - FOOTPRINT(Cryogonal), + FOOTPRINT(Cryogonal) LEARNSETS(Cryogonal), }, #endif //P_FAMILY_CRYOGONAL @@ -6766,7 +6766,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Shelmet), ICON(Shelmet, 1), - FOOTPRINT(Shelmet), + FOOTPRINT(Shelmet) LEARNSETS(Shelmet), .evolutions = EVOLUTION({EVO_TRADE_SPECIFIC_MON, SPECIES_KARRABLAST, SPECIES_ACCELGOR}), }, @@ -6814,7 +6814,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SPRING_REPEATED, PALETTES(Accelgor), ICON(Accelgor, 1), - FOOTPRINT(Accelgor), + FOOTPRINT(Accelgor) LEARNSETS(Accelgor), }, #endif //P_FAMILY_SHELMET @@ -6837,7 +6837,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Stunfisk), \ + FOOTPRINT(Stunfisk) \ .formSpeciesIdTable = sStunfiskFormSpeciesIdTable [SPECIES_STUNFISK] = @@ -6951,7 +6951,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Mienfoo), ICON(Mienfoo, 1), - FOOTPRINT(Mienfoo), + FOOTPRINT(Mienfoo) LEARNSETS(Mienfoo), .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_MIENSHAO}), }, @@ -6999,7 +6999,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Mienshao), ICON(Mienshao, 2), - FOOTPRINT(Mienshao), + FOOTPRINT(Mienshao) LEARNSETS(Mienshao), }, #endif //P_FAMILY_MIENFOO @@ -7049,7 +7049,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Druddigon), ICON(Druddigon, 0), - FOOTPRINT(Druddigon), + FOOTPRINT(Druddigon) LEARNSETS(Druddigon), }, #endif //P_FAMILY_DRUDDIGON @@ -7100,7 +7100,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Golett), ICON(Golett, 0), - FOOTPRINT(Golett), + FOOTPRINT(Golett) LEARNSETS(Golett), .evolutions = EVOLUTION({EVO_LEVEL, 43, SPECIES_GOLURK}), }, @@ -7150,7 +7150,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Golurk), ICON(Golurk, 0), - FOOTPRINT(Golurk), + FOOTPRINT(Golurk) LEARNSETS(Golurk), }, #endif //P_FAMILY_GOLETT @@ -7199,7 +7199,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Pawniard), ICON(Pawniard, 0), - FOOTPRINT(Pawniard), + FOOTPRINT(Pawniard) LEARNSETS(Pawniard), .evolutions = EVOLUTION({EVO_LEVEL, 52, SPECIES_BISHARP}), }, @@ -7247,7 +7247,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Bisharp), ICON(Bisharp, 0), - FOOTPRINT(Bisharp), + FOOTPRINT(Bisharp) LEARNSETS(Bisharp), .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_KINGAMBIT}), }, @@ -7296,7 +7296,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Kingambit), ICON(Kingambit, 3), - //FOOTPRINT(Kingambit), + //FOOTPRINT(Kingambit) LEARNSETS(Kingambit), }, #endif //P_GEN_9_CROSS_EVOS @@ -7346,7 +7346,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Bouffalant), ICON(Bouffalant, 2), - FOOTPRINT(Bouffalant), + FOOTPRINT(Bouffalant) LEARNSETS(Bouffalant), }, #endif //P_FAMILY_BOUFFALANT @@ -7395,7 +7395,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Rufflet), ICON(Rufflet, 2), - FOOTPRINT(Rufflet), + FOOTPRINT(Rufflet) LEARNSETS(Rufflet), .evolutions = EVOLUTION({EVO_LEVEL, 54, SPECIES_BRAVIARY}, {EVO_NONE, 0, SPECIES_BRAVIARY_HISUIAN}), @@ -7412,7 +7412,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .speciesName = _("Braviary"), \ .cryId = CRY_BRAVIARY, \ .natDexNum = NATIONAL_DEX_BRAVIARY, \ - FOOTPRINT(Braviary), \ + FOOTPRINT(Braviary) \ .formSpeciesIdTable = sBraviaryFormSpeciesIdTable [SPECIES_BRAVIARY] = @@ -7538,7 +7538,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Vullaby), ICON(Vullaby, 0), - FOOTPRINT(Vullaby), + FOOTPRINT(Vullaby) LEARNSETS(Vullaby), .evolutions = EVOLUTION({EVO_LEVEL, 54, SPECIES_MANDIBUZZ}), }, @@ -7586,7 +7586,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Mandibuzz), ICON(Mandibuzz, 1), - FOOTPRINT(Mandibuzz), + FOOTPRINT(Mandibuzz) LEARNSETS(Mandibuzz), }, #endif //P_FAMILY_VULLABY @@ -7635,7 +7635,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Heatmor), ICON(Heatmor, 2), - FOOTPRINT(Heatmor), + FOOTPRINT(Heatmor) LEARNSETS(Heatmor), }, #endif //P_FAMILY_HEATMOR @@ -7684,7 +7684,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Durant), ICON(Durant, 0), - FOOTPRINT(Durant), + FOOTPRINT(Durant) LEARNSETS(Durant), }, #endif //P_FAMILY_DURANT @@ -7733,7 +7733,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Deino), ICON(Deino, 2), - FOOTPRINT(Deino), + FOOTPRINT(Deino) LEARNSETS(Deino), .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_ZWEILOUS}), }, @@ -7781,7 +7781,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Zweilous), ICON(Zweilous, 2), - FOOTPRINT(Zweilous), + FOOTPRINT(Zweilous) LEARNSETS(Zweilous), .evolutions = EVOLUTION({EVO_LEVEL, 64, SPECIES_HYDREIGON}), }, @@ -7830,7 +7830,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Hydreigon), ICON(Hydreigon, 2), - FOOTPRINT(Hydreigon), + FOOTPRINT(Hydreigon) LEARNSETS(Hydreigon), }, #endif //P_FAMILY_DEINO @@ -7879,7 +7879,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Larvesta), ICON(Larvesta, 0), - FOOTPRINT(Larvesta), + FOOTPRINT(Larvesta) LEARNSETS(Larvesta), .evolutions = EVOLUTION({EVO_LEVEL, 59, SPECIES_VOLCARONA}), }, @@ -7930,7 +7930,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Volcarona), ICON(Volcarona, 0), - FOOTPRINT(Volcarona), + FOOTPRINT(Volcarona) LEARNSETS(Volcarona), }, #endif //P_FAMILY_LARVESTA @@ -7980,7 +7980,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Cobalion), ICON(Cobalion, 0), - FOOTPRINT(Cobalion), + FOOTPRINT(Cobalion) LEARNSETS(Cobalion), }, #endif //P_FAMILY_COBALION @@ -8030,7 +8030,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Terrakion), ICON(Terrakion, 2), - FOOTPRINT(Terrakion), + FOOTPRINT(Terrakion) LEARNSETS(Terrakion), }, #endif //P_FAMILY_TERRAKION @@ -8080,7 +8080,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Virizion), ICON(Virizion, 1), - FOOTPRINT(Virizion), + FOOTPRINT(Virizion) LEARNSETS(Virizion), }, #endif //P_FAMILY_VIRIZION @@ -8102,7 +8102,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .natDexNum = NATIONAL_DEX_TORNADUS, \ .categoryName = _("Cyclone"), \ .weight = 630, \ - FOOTPRINT(Tornadus), \ + FOOTPRINT(Tornadus) \ LEARNSETS(Tornadus), \ .formSpeciesIdTable = sTornadusFormSpeciesIdTable, \ .formChangeTable = sTornadusFormChangeTable @@ -8189,7 +8189,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .natDexNum = NATIONAL_DEX_THUNDURUS, \ .categoryName = _("Bolt Strike"), \ .weight = 610, \ - FOOTPRINT(Thundurus), \ + FOOTPRINT(Thundurus) \ LEARNSETS(Thundurus), \ .formSpeciesIdTable = sThundurusFormSpeciesIdTable, \ .formChangeTable = sThundurusFormChangeTable @@ -8308,7 +8308,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Reshiram), ICON(Reshiram, 0), - FOOTPRINT(Reshiram), + FOOTPRINT(Reshiram) LEARNSETS(Reshiram), }, #endif //P_FAMILY_RESHIRAM @@ -8358,7 +8358,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Zekrom), ICON(Zekrom, 2), - FOOTPRINT(Zekrom), + FOOTPRINT(Zekrom) LEARNSETS(Zekrom), }, #endif //P_FAMILY_ZEKROM @@ -8379,7 +8379,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .natDexNum = NATIONAL_DEX_LANDORUS, \ .categoryName = _("Abundance"), \ .weight = 680, \ - FOOTPRINT(Landorus), \ + FOOTPRINT(Landorus) \ LEARNSETS(Landorus), \ .formSpeciesIdTable = sLandorusFormSpeciesIdTable, \ .formChangeTable = sLandorusFormChangeTable @@ -8467,7 +8467,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .natDexNum = NATIONAL_DEX_KYUREM, \ .categoryName = _("Boundary"), \ .weight = 3250, \ - FOOTPRINT(Kyurem), \ + FOOTPRINT(Kyurem) \ .formSpeciesIdTable = sKyuremFormSpeciesIdTable, \ .isLegendary = TRUE @@ -8615,7 +8615,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, \ .trainerScale = 262, \ .trainerOffset = 0, \ - FOOTPRINT(Keldeo), \ + FOOTPRINT(Keldeo) \ LEARNSETS(Keldeo), \ .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, \ .formChangeTable = sKeldeoFormChangeTable @@ -8686,7 +8686,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Meloetta), \ + FOOTPRINT(Meloetta) \ LEARNSETS(Meloetta), \ .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, \ .formChangeTable = sMeloettaFormChangeTable @@ -8789,7 +8789,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, \ PALETTES(form), \ ICON(Genesect, 2), \ - FOOTPRINT(Genesect), \ + FOOTPRINT(Genesect) \ LEARNSETS(Genesect), \ .formSpeciesIdTable = sGenesectFormSpeciesIdTable, \ .formChangeTable = sGenesectFormChangeTable, \ diff --git a/src/data/pokemon/species_info/gen_6.h b/src/data/pokemon/species_info/gen_6.h index e2c80d26e0..a8c10c7947 100644 --- a/src/data/pokemon/species_info/gen_6.h +++ b/src/data/pokemon/species_info/gen_6.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Chespin), ICON(Chespin, 1), - FOOTPRINT(Chespin), + FOOTPRINT(Chespin) LEARNSETS(Chespin), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_QUILLADIN}), }, @@ -95,7 +95,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_GROW, PALETTES(Quilladin), ICON(Quilladin, 1), - FOOTPRINT(Quilladin), + FOOTPRINT(Quilladin) LEARNSETS(Quilladin), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_CHESNAUGHT}), }, @@ -143,7 +143,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Chesnaught), ICON(Chesnaught, 1), - FOOTPRINT(Chesnaught), + FOOTPRINT(Chesnaught) LEARNSETS(Chesnaught), }, #endif //P_FAMILY_CHESPIN @@ -192,7 +192,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Fennekin), ICON(Fennekin, 0), - FOOTPRINT(Fennekin), + FOOTPRINT(Fennekin) LEARNSETS(Fennekin), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_BRAIXEN}), }, @@ -240,7 +240,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Braixen), ICON(Braixen, 0), - FOOTPRINT(Braixen), + FOOTPRINT(Braixen) LEARNSETS(Braixen), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_DELPHOX}), }, @@ -288,7 +288,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Delphox), ICON(Delphox, 0), - FOOTPRINT(Delphox), + FOOTPRINT(Delphox) LEARNSETS(Delphox), }, #endif //P_FAMILY_FENNEKIN @@ -337,7 +337,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Froakie), ICON(Froakie, 0), - FOOTPRINT(Froakie), + FOOTPRINT(Froakie) LEARNSETS(Froakie), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_FROGADIER}), }, @@ -385,7 +385,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Frogadier), ICON(Frogadier, 0), - FOOTPRINT(Frogadier), + FOOTPRINT(Frogadier) LEARNSETS(Frogadier), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GRENINJA}), }, @@ -426,7 +426,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 2, \ .trainerScale = 271, \ .trainerOffset = 0, \ - FOOTPRINT(Greninja), \ + FOOTPRINT(Greninja) \ LEARNSETS(Greninja), \ .formSpeciesIdTable = sGreninjaFormSpeciesIdTable @@ -528,7 +528,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Bunnelby), ICON(Bunnelby, 2), - FOOTPRINT(Bunnelby), + FOOTPRINT(Bunnelby) LEARNSETS(Bunnelby), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_DIGGERSBY}), }, @@ -576,7 +576,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Diggersby), ICON(Diggersby, 2), - FOOTPRINT(Diggersby), + FOOTPRINT(Diggersby) LEARNSETS(Diggersby), }, #endif //P_FAMILY_BUNNELBY @@ -625,7 +625,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Fletchling), ICON(Fletchling, 2), - FOOTPRINT(Fletchling), + FOOTPRINT(Fletchling) LEARNSETS(Fletchling), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_FLETCHINDER}), }, @@ -674,7 +674,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Fletchinder), ICON(Fletchinder, 2), - FOOTPRINT(Fletchinder), + FOOTPRINT(Fletchinder) LEARNSETS(Fletchinder), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_TALONFLAME}), }, @@ -723,7 +723,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Talonflame), ICON(Talonflame, 2), - FOOTPRINT(Talonflame), + FOOTPRINT(Talonflame) LEARNSETS(Talonflame), }, #endif //P_FAMILY_FLETCHLING @@ -772,7 +772,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Scatterbug), ICON(Scatterbug, 1), - FOOTPRINT(Scatterbug), + FOOTPRINT(Scatterbug) LEARNSETS(Scatterbug), .evolutions = EVOLUTION({EVO_LEVEL, 9, SPECIES_SPEWPA}), }, @@ -820,7 +820,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Spewpa), ICON(Spewpa, 1), - FOOTPRINT(Spewpa), + FOOTPRINT(Spewpa) LEARNSETS(Spewpa), .evolutions = EVOLUTION({EVO_LEVEL, 12, SPECIES_VIVILLON_ICY_SNOW}), }, @@ -865,7 +865,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, \ PALETTES(Vivillon ##form), \ ICON(Vivillon ##form, iconPal), \ - FOOTPRINT(Vivillon), \ + FOOTPRINT(Vivillon) \ LEARNSETS(Vivillon), \ .formSpeciesIdTable = sVivillonFormSpeciesIdTable @@ -1095,7 +1095,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Litleo), ICON(Litleo, 2), - FOOTPRINT(Litleo), + FOOTPRINT(Litleo) LEARNSETS(Litleo), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_PYROAR}), }, @@ -1146,7 +1146,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = PALETTES(Pyroar), ICON(Pyroar, 2), ICON_FEMALE(Pyroar, 2), - FOOTPRINT(Pyroar), + FOOTPRINT(Pyroar) LEARNSETS(Pyroar), }, #endif //P_FAMILY_LITLEO @@ -1190,7 +1190,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, \ PALETTES(Flabebe##Form##Flower), \ ICON(Flabebe##Form##Flower, iconPal), \ - FOOTPRINT(Flabebe), \ + FOOTPRINT(Flabebe) \ LEARNSETS(Flabebe), \ .formSpeciesIdTable = sFlabebeFormSpeciesIdTable, \ .evolutions = EVOLUTION({EVO_LEVEL, 19, SPECIES_FLOETTE_ ##FORM##_FLOWER}) @@ -1265,7 +1265,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, \ PALETTES(Floette ##form##Flower), \ ICON(Floette##form##Flower, iconPal), \ - FOOTPRINT(Floette), \ + FOOTPRINT(Floette) \ .formSpeciesIdTable = sFloetteFormSpeciesIdTable #define FLOETTE_NORMAL_INFO(form, FORM, iconPal) \ @@ -1394,7 +1394,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ PALETTES(Florges##Form##Flower), \ ICON(Florges##Form##Flower, iconPal), \ - FOOTPRINT(Florges), \ + FOOTPRINT(Florges) \ LEARNSETS(Florges), \ .formSpeciesIdTable = sFlorgesFormSpeciesIdTable @@ -1488,7 +1488,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Skiddo), ICON(Skiddo, 1), - FOOTPRINT(Skiddo), + FOOTPRINT(Skiddo) LEARNSETS(Skiddo), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GOGOAT}), }, @@ -1536,7 +1536,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, PALETTES(Gogoat), ICON(Gogoat, 1), - FOOTPRINT(Gogoat), + FOOTPRINT(Gogoat) LEARNSETS(Gogoat), }, #endif //P_FAMILY_SKIDDO @@ -1586,7 +1586,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, PALETTES(Pancham), ICON(Pancham, 1), - FOOTPRINT(Pancham), + FOOTPRINT(Pancham) LEARNSETS(Pancham), .evolutions = EVOLUTION({EVO_LEVEL_DARK_TYPE_MON_IN_PARTY, 32, SPECIES_PANGORO}), }, @@ -1635,7 +1635,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Pangoro), ICON(Pangoro, 1), - FOOTPRINT(Pangoro), + FOOTPRINT(Pangoro) LEARNSETS(Pangoro), }, #endif //P_FAMILY_PANCHAM @@ -1673,7 +1673,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimFrames = sAnims_Furfrou, \ .frontAnimId = ANIM_H_SLIDE, \ .backAnimId = BACK_ANIM_V_STRETCH, \ - FOOTPRINT(Furfrou), \ + FOOTPRINT(Furfrou) \ LEARNSETS(Furfrou), \ .formSpeciesIdTable = sFurfrouFormSpeciesIdTable @@ -1824,7 +1824,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Espurr), ICON(Espurr, 2), - FOOTPRINT(Espurr), + FOOTPRINT(Espurr) LEARNSETS(Espurr), .evolutions = EVOLUTION({EVO_LEVEL_MALE, 25, SPECIES_MEOWSTIC_MALE}, {EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_FEMALE}), @@ -1859,7 +1859,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimId = ANIM_GROW_VIBRATE, \ .backPicYOffset = 9, \ .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, \ - FOOTPRINT(Meowstic), \ + FOOTPRINT(Meowstic) \ .formSpeciesIdTable = sMeowsticFormSpeciesIdTable [SPECIES_MEOWSTIC_MALE] = @@ -1946,7 +1946,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Honedge), ICON(Honedge, 2), - FOOTPRINT(Honedge), + FOOTPRINT(Honedge) LEARNSETS(Honedge), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_DOUBLADE}), }, @@ -1995,7 +1995,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Doublade), ICON(Doublade, 2), - FOOTPRINT(Doublade), + FOOTPRINT(Doublade) LEARNSETS(Doublade), .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_AEGISLASH_SHIELD}), }, @@ -2021,7 +2021,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 0, \ .trainerScale = 290, \ .trainerOffset = 1, \ - FOOTPRINT(Aegislash), \ + FOOTPRINT(Aegislash) \ LEARNSETS(Aegislash), \ .formSpeciesIdTable = sAegislashFormSpeciesIdTable, \ .formChangeTable = sAegislashFormChangeTable @@ -2130,7 +2130,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Spritzee), ICON(Spritzee, 0), - FOOTPRINT(Spritzee), + FOOTPRINT(Spritzee) LEARNSETS(Spritzee), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_SACHET, SPECIES_AROMATISSE}, {EVO_ITEM, ITEM_SACHET, SPECIES_AROMATISSE}), @@ -2179,7 +2179,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Aromatisse), ICON(Aromatisse, 0), - FOOTPRINT(Aromatisse), + FOOTPRINT(Aromatisse) LEARNSETS(Aromatisse), }, #endif //P_FAMILY_SPRITZEE @@ -2228,7 +2228,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SPRING, PALETTES(Swirlix), ICON(Swirlix, 1), - FOOTPRINT(Swirlix), + FOOTPRINT(Swirlix) LEARNSETS(Swirlix), .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_WHIPPED_DREAM, SPECIES_SLURPUFF}, {EVO_ITEM, ITEM_WHIPPED_DREAM, SPECIES_SLURPUFF}), @@ -2277,7 +2277,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Slurpuff), ICON(Slurpuff, 1), - FOOTPRINT(Slurpuff), + FOOTPRINT(Slurpuff) LEARNSETS(Slurpuff), }, #endif //P_FAMILY_SWIRLIX @@ -2327,7 +2327,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Inkay), ICON(Inkay, 0), - FOOTPRINT(Inkay), + FOOTPRINT(Inkay) LEARNSETS(Inkay), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MALAMAR}), }, @@ -2375,7 +2375,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Malamar), ICON(Malamar, 2), - FOOTPRINT(Malamar), + FOOTPRINT(Malamar) LEARNSETS(Malamar), }, #endif //P_FAMILY_INKAY @@ -2424,7 +2424,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Binacle), ICON(Binacle, 2), - FOOTPRINT(Binacle), + FOOTPRINT(Binacle) LEARNSETS(Binacle), .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_BARBARACLE}), }, @@ -2473,7 +2473,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Barbaracle), ICON(Barbaracle, 2), - FOOTPRINT(Barbaracle), + FOOTPRINT(Barbaracle) LEARNSETS(Barbaracle), }, #endif //P_FAMILY_BINACLE @@ -2522,7 +2522,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Skrelp), ICON(Skrelp, 2), - FOOTPRINT(Skrelp), + FOOTPRINT(Skrelp) LEARNSETS(Skrelp), .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_DRAGALGE}), }, @@ -2570,7 +2570,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Dragalge), ICON(Dragalge, 5), - FOOTPRINT(Dragalge), + FOOTPRINT(Dragalge) LEARNSETS(Dragalge), }, #endif //P_FAMILY_SKRELP @@ -2620,7 +2620,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Clauncher), ICON(Clauncher, 0), - FOOTPRINT(Clauncher), + FOOTPRINT(Clauncher) LEARNSETS(Clauncher), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_CLAWITZER}), }, @@ -2669,7 +2669,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE, PALETTES(Clawitzer), ICON(Clawitzer, 0), - FOOTPRINT(Clawitzer), + FOOTPRINT(Clawitzer) LEARNSETS(Clawitzer), }, #endif //P_FAMILY_CLAUNCHER @@ -2718,7 +2718,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Helioptile), ICON(Helioptile, 2), - FOOTPRINT(Helioptile), + FOOTPRINT(Helioptile) LEARNSETS(Helioptile), .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_HELIOLISK}), }, @@ -2767,7 +2767,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Heliolisk), ICON(Heliolisk, 2), - FOOTPRINT(Heliolisk), + FOOTPRINT(Heliolisk) LEARNSETS(Heliolisk), }, #endif //P_FAMILY_HELIOPTILE @@ -2816,7 +2816,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Tyrunt), ICON(Tyrunt, 2), - FOOTPRINT(Tyrunt), + FOOTPRINT(Tyrunt) LEARNSETS(Tyrunt), .evolutions = EVOLUTION({EVO_LEVEL_DAY, 39, SPECIES_TYRANTRUM}), }, @@ -2864,7 +2864,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Tyrantrum), ICON(Tyrantrum, 0), - FOOTPRINT(Tyrantrum), + FOOTPRINT(Tyrantrum) LEARNSETS(Tyrantrum), }, #endif //P_FAMILY_TYRUNT @@ -2913,7 +2913,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Amaura), ICON(Amaura, 0), - FOOTPRINT(Amaura), + FOOTPRINT(Amaura) LEARNSETS(Amaura), .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 39, SPECIES_AURORUS}), }, @@ -2961,7 +2961,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Aurorus), ICON(Aurorus, 0), - FOOTPRINT(Aurorus), + FOOTPRINT(Aurorus) LEARNSETS(Aurorus), }, #endif //P_FAMILY_AMAURA @@ -3015,7 +3015,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Hawlucha), ICON(Hawlucha, 0), - FOOTPRINT(Hawlucha), + FOOTPRINT(Hawlucha) LEARNSETS(Hawlucha), }, #endif //P_FAMILY_HAWLUCHA @@ -3064,7 +3064,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, PALETTES(Dedenne), ICON(Dedenne, 0), - FOOTPRINT(Dedenne), + FOOTPRINT(Dedenne) LEARNSETS(Dedenne), }, #endif //P_FAMILY_DEDENNE @@ -3115,7 +3115,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Carbink), ICON(Carbink, 2), - FOOTPRINT(Carbink), + FOOTPRINT(Carbink) LEARNSETS(Carbink), }, #endif //P_FAMILY_CARBINK @@ -3165,7 +3165,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SPRING, PALETTES(Goomy), ICON(Goomy, 5), - FOOTPRINT(Goomy), + FOOTPRINT(Goomy) LEARNSETS(Goomy), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_SLIGGOO}, {EVO_NONE, 0, SPECIES_SLIGGOO_HISUIAN}), @@ -3185,7 +3185,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .speciesName = _("Sliggoo"), \ .cryId = CRY_SLIGGOO, \ .natDexNum = NATIONAL_DEX_SLIGGOO, \ - FOOTPRINT(Sliggoo), \ + FOOTPRINT(Sliggoo) \ .formSpeciesIdTable = sSliggooFormSpeciesIdTable [SPECIES_SLIGGOO] = @@ -3238,7 +3238,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .speciesName = _("Goodra"), \ .cryId = CRY_GOODRA, \ .natDexNum = NATIONAL_DEX_GOODRA, \ - FOOTPRINT(Goodra), \ + FOOTPRINT(Goodra) \ .formSpeciesIdTable = sGoodraFormSpeciesIdTable [SPECIES_GOODRA] = @@ -3399,7 +3399,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Klefki), ICON(Klefki, 0), - FOOTPRINT(Klefki), + FOOTPRINT(Klefki) LEARNSETS(Klefki), }, #endif //P_FAMILY_KLEFKI @@ -3449,7 +3449,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, PALETTES(Phantump), ICON(Phantump, 1), - FOOTPRINT(Phantump), + FOOTPRINT(Phantump) LEARNSETS(Phantump), .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_TREVENANT}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_TREVENANT}), @@ -3498,7 +3498,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_SHAKE_LOW, PALETTES(Trevenant), ICON(Trevenant, 1), - FOOTPRINT(Trevenant), + FOOTPRINT(Trevenant) LEARNSETS(Trevenant), }, #endif //P_FAMILY_PHANTUMP @@ -3524,7 +3524,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, \ PALETTES(Pumpkaboo), \ ICON(Pumpkaboo, 2), \ - FOOTPRINT(Pumpkaboo), \ + FOOTPRINT(Pumpkaboo) \ LEARNSETS(Pumpkaboo), \ .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable @@ -3663,7 +3663,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_V_STRETCH, \ PALETTES(Gourgeist), \ ICON(Gourgeist, 2), \ - FOOTPRINT(Gourgeist), \ + FOOTPRINT(Gourgeist) \ LEARNSETS(Gourgeist), \ .formSpeciesIdTable = sGourgeistFormSpeciesIdTable @@ -3828,7 +3828,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Bergmite), ICON(Bergmite, 0), - FOOTPRINT(Bergmite), + FOOTPRINT(Bergmite) LEARNSETS(Bergmite), .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_AVALUGG}, {EVO_NONE, 0, SPECIES_AVALUGG_HISUIAN}), @@ -3848,7 +3848,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .cryId = CRY_AVALUGG, \ .natDexNum = NATIONAL_DEX_AVALUGG, \ .categoryName = _("Iceberg"), \ - FOOTPRINT(Avalugg), \ + FOOTPRINT(Avalugg) \ .formSpeciesIdTable = sAvaluggFormSpeciesIdTable [SPECIES_AVALUGG] = @@ -3972,7 +3972,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Noibat), ICON(Noibat, 2), - FOOTPRINT(Noibat), + FOOTPRINT(Noibat) LEARNSETS(Noibat), .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_NOIVERN}), }, @@ -4024,7 +4024,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_JOLT_RIGHT, PALETTES(Noivern), ICON(Noivern, 2), - FOOTPRINT(Noivern), + FOOTPRINT(Noivern) LEARNSETS(Noivern), }, #endif //P_FAMILY_NOIBAT @@ -4069,7 +4069,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, \ PALETTES(Xerneas##Form), \ ICON(Xerneas##Form, 0), \ - FOOTPRINT(Xerneas), \ + FOOTPRINT(Xerneas) \ LEARNSETS(Xerneas), \ .formSpeciesIdTable = sXerneasFormSpeciesIdTable, \ .formChangeTable = sXerneasFormChangeTable, \ @@ -4126,7 +4126,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Yveltal), ICON(Yveltal, 0), - FOOTPRINT(Yveltal), + FOOTPRINT(Yveltal) LEARNSETS(Yveltal), }, #endif //P_FAMILY_YVELTAL @@ -4146,7 +4146,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .speciesName = _("Zygarde"), \ .natDexNum = NATIONAL_DEX_ZYGARDE, \ .categoryName = _("Order"), \ - FOOTPRINT(Zygarde), \ + FOOTPRINT(Zygarde) \ LEARNSETS(Zygarde), \ .formSpeciesIdTable = sZygardeFormSpeciesIdTable, \ .isLegendary = TRUE @@ -4276,7 +4276,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .speciesName = _("Diancie"), \ .natDexNum = NATIONAL_DEX_DIANCIE, \ .categoryName = _("Jewel"), \ - FOOTPRINT(Diancie), \ + FOOTPRINT(Diancie) \ LEARNSETS(Diancie), \ .formSpeciesIdTable = sDiancieFormSpeciesIdTable, \ .formChangeTable = sDiancieFormChangeTable, \ @@ -4364,7 +4364,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .bodyColor = BODY_COLOR_PURPLE, \ .speciesName = _("Hoopa"), \ .natDexNum = NATIONAL_DEX_HOOPA, \ - FOOTPRINT(Hoopa), \ + FOOTPRINT(Hoopa) \ .formSpeciesIdTable = sHoopaFormSpeciesIdTable, \ .formChangeTable = sHoopaFormChangeTable, \ .isMythical = TRUE @@ -4486,7 +4486,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Volcanion), ICON(Volcanion, 0), - FOOTPRINT(Volcanion), + FOOTPRINT(Volcanion) LEARNSETS(Volcanion), }, #endif //P_FAMILY_VOLCANION diff --git a/src/data/pokemon/species_info/gen_7.h b/src/data/pokemon/species_info/gen_7.h index 7c96c6541b..d3f223ab46 100644 --- a/src/data/pokemon/species_info/gen_7.h +++ b/src/data/pokemon/species_info/gen_7.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, PALETTES(Rowlet), ICON(Rowlet, 0), - FOOTPRINT(Rowlet), + FOOTPRINT(Rowlet) LEARNSETS(Rowlet), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_DARTRIX}), }, @@ -96,7 +96,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_V_STRETCH, PALETTES(Dartrix), ICON(Dartrix, 1), - FOOTPRINT(Dartrix), + FOOTPRINT(Dartrix) LEARNSETS(Dartrix), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_DECIDUEYE}, {EVO_NONE, 0, SPECIES_DECIDUEYE_HISUIAN}), @@ -121,7 +121,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 1, \ .trainerScale = 296, \ .trainerOffset = 1, \ - FOOTPRINT(Decidueye), \ + FOOTPRINT(Decidueye) \ .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable [SPECIES_DECIDUEYE] = @@ -230,7 +230,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Litten), ICON(Litten, 0), - FOOTPRINT(Litten), + FOOTPRINT(Litten) LEARNSETS(Litten), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_TORRACAT}), }, @@ -278,7 +278,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Torracat), ICON(Torracat, 0), - FOOTPRINT(Torracat), + FOOTPRINT(Torracat) LEARNSETS(Torracat), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_INCINEROAR}), }, @@ -326,7 +326,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Incineroar), ICON(Incineroar, 0), - FOOTPRINT(Incineroar), + FOOTPRINT(Incineroar) LEARNSETS(Incineroar), }, #endif //P_FAMILY_LITTEN @@ -375,7 +375,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Popplio), ICON(Popplio, 0), - FOOTPRINT(Popplio), + FOOTPRINT(Popplio) LEARNSETS(Popplio), .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_BRIONNE}), }, @@ -423,7 +423,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Brionne), ICON(Brionne, 0), - FOOTPRINT(Brionne), + FOOTPRINT(Brionne) LEARNSETS(Brionne), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_PRIMARINA}), }, @@ -471,7 +471,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Primarina), ICON(Primarina, 0), - FOOTPRINT(Primarina), + FOOTPRINT(Primarina) LEARNSETS(Primarina), }, #endif //P_FAMILY_POPPLIO @@ -521,7 +521,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_SHRINK_GROW, PALETTES(Pikipek), ICON(Pikipek, 2), - FOOTPRINT(Pikipek), + FOOTPRINT(Pikipek) LEARNSETS(Pikipek), .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_TRUMBEAK}), }, @@ -570,7 +570,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(Trumbeak), ICON(Trumbeak, 0), - FOOTPRINT(Trumbeak), + FOOTPRINT(Trumbeak) LEARNSETS(Trumbeak), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_TOUCANNON}), }, @@ -619,7 +619,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(Toucannon), ICON(Toucannon, 0), - FOOTPRINT(Toucannon), + FOOTPRINT(Toucannon) LEARNSETS(Toucannon), }, #endif //P_FAMILY_PIKIPEK @@ -669,7 +669,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Yungoos), ICON(Yungoos, 2), - FOOTPRINT(Yungoos), + FOOTPRINT(Yungoos) LEARNSETS(Yungoos), .evolutions = EVOLUTION({EVO_LEVEL_DAY, 20, SPECIES_GUMSHOOS}), }, @@ -718,7 +718,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Gumshoos), ICON(Gumshoos, 2), - FOOTPRINT(Gumshoos), + FOOTPRINT(Gumshoos) LEARNSETS(Gumshoos), }, #endif //P_FAMILY_YUNGOOS @@ -767,7 +767,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Grubbin), ICON(Grubbin, 0), - FOOTPRINT(Grubbin), + FOOTPRINT(Grubbin) LEARNSETS(Grubbin), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_CHARJABUG}), }, @@ -816,7 +816,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Charjabug), ICON(Charjabug, 1), - FOOTPRINT(Charjabug), + FOOTPRINT(Charjabug) LEARNSETS(Charjabug), .evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_VIKAVOLT}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_VIKAVOLT}), @@ -866,7 +866,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Vikavolt), ICON(Vikavolt, 0), - FOOTPRINT(Vikavolt), + FOOTPRINT(Vikavolt) LEARNSETS(Vikavolt), }, #endif //P_FAMILY_GRUBBIN @@ -916,7 +916,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Crabrawler), ICON(Crabrawler, 2), - FOOTPRINT(Crabrawler), + FOOTPRINT(Crabrawler) LEARNSETS(Crabrawler), .evolutions = EVOLUTION({EVO_SPECIFIC_MAP, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM, SPECIES_CRABOMINABLE}, {EVO_ITEM, ITEM_ICE_STONE, SPECIES_CRABOMINABLE}), @@ -966,7 +966,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Crabominable), ICON(Crabominable, 2), - FOOTPRINT(Crabominable), + FOOTPRINT(Crabominable) LEARNSETS(Crabominable), }, #endif //P_FAMILY_CRABRAWLER @@ -1000,7 +1000,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 0, \ .frontAnimFrames = sAnims_Oricorio, \ .backPicYOffset = 0, \ - FOOTPRINT(Oricorio), \ + FOOTPRINT(Oricorio) \ LEARNSETS(Oricorio), \ .formSpeciesIdTable = sOricorioFormSpeciesIdTable, \ .formChangeTable = sOricorioFormChangeTable @@ -1133,7 +1133,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, PALETTES(Cutiefly), ICON(Cutiefly, 2), - FOOTPRINT(Cutiefly), + FOOTPRINT(Cutiefly) LEARNSETS(Cutiefly), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_RIBOMBEE}), }, @@ -1183,7 +1183,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Ribombee), ICON(Ribombee, 2), - FOOTPRINT(Ribombee), + FOOTPRINT(Ribombee) LEARNSETS(Ribombee), }, #endif //P_FAMILY_CUTIEFLY @@ -1223,7 +1223,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backPicYOffset = 7, \ PALETTES(Rockruff), \ ICON(Rockruff, 2), \ - FOOTPRINT(Rockruff), \ + FOOTPRINT(Rockruff) \ LEARNSETS(Rockruff), \ .formSpeciesIdTable = sRockruffFormSpeciesIdTable @@ -1267,7 +1267,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerScale = 257, \ .trainerOffset = 0, \ BACK_PIC(LycanrocMidday, 64, 56), \ - FOOTPRINT(Lycanroc), \ + FOOTPRINT(Lycanroc) \ .formSpeciesIdTable = sLycanrocFormSpeciesIdTable [SPECIES_LYCANROC_MIDDAY] = @@ -1378,7 +1378,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 24, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Wishiwashi), \ + FOOTPRINT(Wishiwashi) \ LEARNSETS(Wishiwashi), \ .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, \ .formChangeTable = sWishiwashiFormChangeTable @@ -1486,7 +1486,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Mareanie), ICON(Mareanie, 2), - FOOTPRINT(Mareanie), + FOOTPRINT(Mareanie) LEARNSETS(Mareanie), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_TOXAPEX}), }, @@ -1535,7 +1535,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Toxapex), ICON(Toxapex, 0), - FOOTPRINT(Toxapex), + FOOTPRINT(Toxapex) LEARNSETS(Toxapex), }, #endif //P_FAMILY_MAREANIE @@ -1585,7 +1585,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Mudbray), ICON(Mudbray, 2), - FOOTPRINT(Mudbray), + FOOTPRINT(Mudbray) LEARNSETS(Mudbray), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MUDSDALE}), }, @@ -1634,7 +1634,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Mudsdale), ICON(Mudsdale, 0), - FOOTPRINT(Mudsdale), + FOOTPRINT(Mudsdale) LEARNSETS(Mudsdale), }, #endif //P_FAMILY_MUDBRAY @@ -1684,7 +1684,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dewpider), ICON(Dewpider, 0), - FOOTPRINT(Dewpider), + FOOTPRINT(Dewpider) LEARNSETS(Dewpider), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARAQUANID}), }, @@ -1733,7 +1733,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Araquanid), ICON(Araquanid, 2), - FOOTPRINT(Araquanid), + FOOTPRINT(Araquanid) LEARNSETS(Araquanid), }, #endif //P_FAMILY_DEWPIDER @@ -1783,7 +1783,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Fomantis), ICON(Fomantis, 1), - FOOTPRINT(Fomantis), + FOOTPRINT(Fomantis) LEARNSETS(Fomantis), .evolutions = EVOLUTION({EVO_LEVEL_DAY, 34, SPECIES_LURANTIS}), }, @@ -1832,7 +1832,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Lurantis), ICON(Lurantis, 1), - FOOTPRINT(Lurantis), + FOOTPRINT(Lurantis) LEARNSETS(Lurantis), }, #endif //P_FAMILY_FOMANTIS @@ -1883,7 +1883,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Morelull), ICON(Morelull, 0), - FOOTPRINT(Morelull), + FOOTPRINT(Morelull) LEARNSETS(Morelull), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_SHIINOTIC}), }, @@ -1933,7 +1933,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Shiinotic), ICON(Shiinotic, 1), - FOOTPRINT(Shiinotic), + FOOTPRINT(Shiinotic) LEARNSETS(Shiinotic), }, #endif //P_FAMILY_MORELULL @@ -1983,7 +1983,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Salandit), ICON(Salandit, 2), - FOOTPRINT(Salandit), + FOOTPRINT(Salandit) LEARNSETS(Salandit), .evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 33, SPECIES_SALAZZLE}), }, @@ -2032,7 +2032,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Salazzle), ICON(Salazzle, 0), - FOOTPRINT(Salazzle), + FOOTPRINT(Salazzle) LEARNSETS(Salazzle), }, #endif //P_FAMILY_SALANDIT @@ -2081,7 +2081,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Stufful), ICON(Stufful, 0), - FOOTPRINT(Stufful), + FOOTPRINT(Stufful) LEARNSETS(Stufful), .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_BEWEAR}), }, @@ -2129,7 +2129,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Bewear), ICON(Bewear, 0), - FOOTPRINT(Bewear), + FOOTPRINT(Bewear) LEARNSETS(Bewear), }, #endif //P_FAMILY_STUFFUL @@ -2179,7 +2179,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Bounsweet), ICON(Bounsweet, 1), - FOOTPRINT(Bounsweet), + FOOTPRINT(Bounsweet) LEARNSETS(Bounsweet), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_STEENEE}), }, @@ -2229,7 +2229,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Steenee), ICON(Steenee, 1), - FOOTPRINT(Steenee), + FOOTPRINT(Steenee) LEARNSETS(Steenee), .evolutions = EVOLUTION({EVO_MOVE, MOVE_STOMP, SPECIES_TSAREENA}), }, @@ -2279,7 +2279,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Tsareena), ICON(Tsareena, 1), - FOOTPRINT(Tsareena), + FOOTPRINT(Tsareena) LEARNSETS(Tsareena), }, #endif //P_FAMILY_BOUNSWEET @@ -2331,7 +2331,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Comfey), ICON(Comfey, 1), - FOOTPRINT(Comfey), + FOOTPRINT(Comfey) LEARNSETS(Comfey), }, #endif //P_FAMILY_COMFEY @@ -2380,7 +2380,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Oranguru), ICON(Oranguru, 0), - FOOTPRINT(Oranguru), + FOOTPRINT(Oranguru) LEARNSETS(Oranguru), }, #endif //P_FAMILY_ORANGURU @@ -2429,7 +2429,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Passimian), ICON(Passimian, 1), - FOOTPRINT(Passimian), + FOOTPRINT(Passimian) LEARNSETS(Passimian), }, #endif //P_FAMILY_PASSIMIAN @@ -2478,7 +2478,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Wimpod), ICON(Wimpod, 2), - FOOTPRINT(Wimpod), + FOOTPRINT(Wimpod) LEARNSETS(Wimpod), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GOLISOPOD}), }, @@ -2526,7 +2526,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Golisopod), ICON(Golisopod, 2), - FOOTPRINT(Golisopod), + FOOTPRINT(Golisopod) LEARNSETS(Golisopod), }, #endif //P_FAMILY_WIMPOD @@ -2576,7 +2576,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Sandygast), ICON(Sandygast, 1), - FOOTPRINT(Sandygast), + FOOTPRINT(Sandygast) LEARNSETS(Sandygast), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_PALOSSAND}), }, @@ -2625,7 +2625,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Palossand), ICON(Palossand, 2), - FOOTPRINT(Palossand), + FOOTPRINT(Palossand) LEARNSETS(Palossand), }, #endif //P_FAMILY_SANDYGAST @@ -2674,7 +2674,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Pyukumuku), ICON(Pyukumuku, 0), - FOOTPRINT(Pyukumuku), + FOOTPRINT(Pyukumuku) LEARNSETS(Pyukumuku), }, #endif //P_FAMILY_PYUKUMUKU @@ -2724,7 +2724,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(TypeNull), ICON(TypeNull, 0), - FOOTPRINT(Type_Null), + FOOTPRINT(Type_Null) LEARNSETS(TypeNull), .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_SILVALLY_NORMAL}), }, @@ -2770,7 +2770,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backPicYOffset = 0, \ PALETTES(palette), \ ICON(Silvally, 0), \ - FOOTPRINT(Silvally), \ + FOOTPRINT(Silvally) \ LEARNSETS(Silvally), \ .formSpeciesIdTable = sSilvallyFormSpeciesIdTable, \ .formChangeTable = sSilvallyFormChangeTable, \ @@ -2822,7 +2822,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Minior), \ + FOOTPRINT(Minior) \ LEARNSETS(Minior), \ .formSpeciesIdTable = sMiniorFormSpeciesIdTable @@ -2934,7 +2934,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Komala), ICON(Komala, 2), - FOOTPRINT(Komala), + FOOTPRINT(Komala) LEARNSETS(Komala), }, #endif //P_FAMILY_KOMALA @@ -2984,7 +2984,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Turtonator), ICON(Turtonator, 0), - FOOTPRINT(Turtonator), + FOOTPRINT(Turtonator) LEARNSETS(Turtonator), }, #endif //P_FAMILY_TURTONATOR @@ -3034,7 +3034,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(Togedemaru), ICON(Togedemaru, 2), - FOOTPRINT(Togedemaru), + FOOTPRINT(Togedemaru) LEARNSETS(Togedemaru), }, #endif //P_FAMILY_TOGEDEMARU @@ -3069,7 +3069,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 24, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Mimikyu), \ + FOOTPRINT(Mimikyu) \ LEARNSETS(Mimikyu), \ .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, \ .formChangeTable = sMimikyuFormChangeTable @@ -3158,7 +3158,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Bruxish), ICON(Bruxish, 0), - FOOTPRINT(Bruxish), + FOOTPRINT(Bruxish) LEARNSETS(Bruxish), }, #endif //P_FAMILY_BRUXISH @@ -3208,7 +3208,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_H_SLIDE, PALETTES(Drampa), ICON(Drampa, 0), - FOOTPRINT(Drampa), + FOOTPRINT(Drampa) LEARNSETS(Drampa), }, #endif //P_FAMILY_DRAMPA @@ -3259,7 +3259,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dhelmise), ICON(Dhelmise, 1), - FOOTPRINT(Dhelmise), + FOOTPRINT(Dhelmise) LEARNSETS(Dhelmise), }, #endif //P_FAMILY_DHELMISE @@ -3309,7 +3309,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_GROW_STUTTER, PALETTES(JangmoO), ICON(JangmoO, 2), - FOOTPRINT(JangmoO), + FOOTPRINT(JangmoO) LEARNSETS(JangmoO), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_HAKAMO_O}), }, @@ -3358,7 +3358,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_H_STRETCH, PALETTES(HakamoO), ICON(HakamoO, 2), - FOOTPRINT(HakamoO), + FOOTPRINT(HakamoO) LEARNSETS(HakamoO), .evolutions = EVOLUTION({EVO_LEVEL, 45, SPECIES_KOMMO_O}), }, @@ -3407,7 +3407,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, PALETTES(KommoO), ICON(KommoO, 2), - FOOTPRINT(KommoO), + FOOTPRINT(KommoO) LEARNSETS(KommoO), }, #endif //P_FAMILY_JANGMO_O @@ -3458,7 +3458,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(TapuKoko), ICON(TapuKoko, 0), - FOOTPRINT(Tapu_Koko), + FOOTPRINT(Tapu_Koko) LEARNSETS(TapuKoko), }, #endif //P_FAMILY_TAPU_KOKO @@ -3509,7 +3509,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(TapuLele), ICON(TapuLele, 0), - FOOTPRINT(Tapu_Lele), + FOOTPRINT(Tapu_Lele) LEARNSETS(TapuLele), }, #endif //P_FAMILY_TAPU_LELE @@ -3560,7 +3560,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(TapuBulu), ICON(TapuBulu, 2), - FOOTPRINT(Tapu_Bulu), + FOOTPRINT(Tapu_Bulu) LEARNSETS(TapuBulu), }, #endif //P_FAMILY_TAPU_BULU @@ -3612,7 +3612,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(TapuFini), ICON(TapuFini, 0), - FOOTPRINT(Tapu_Fini), + FOOTPRINT(Tapu_Fini) LEARNSETS(TapuFini), }, #endif //P_FAMILY_TAPU_FINI @@ -3663,7 +3663,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Cosmog), ICON(Cosmog, 2), - FOOTPRINT(Cosmog), + FOOTPRINT(Cosmog) LEARNSETS(Cosmog), .evolutions = EVOLUTION({EVO_LEVEL, 43, SPECIES_COSMOEM}), }, @@ -3714,7 +3714,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Cosmoem), ICON(Cosmoem, 0), - FOOTPRINT(Cosmoem), + FOOTPRINT(Cosmoem) LEARNSETS(Cosmoem), .evolutions = EVOLUTION({EVO_LEVEL_DAY, 53, SPECIES_SOLGALEO}, {EVO_LEVEL_NIGHT, 53, SPECIES_LUNALA}), @@ -3764,7 +3764,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Solgaleo), ICON(Solgaleo, 0), - FOOTPRINT(Solgaleo), + FOOTPRINT(Solgaleo) LEARNSETS(Solgaleo), }, @@ -3813,7 +3813,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Lunala), ICON(Lunala, 2), - FOOTPRINT(Lunala), + FOOTPRINT(Lunala) LEARNSETS(Lunala), }, #endif //P_FAMILY_COSMOG @@ -3864,7 +3864,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Nihilego), ICON(Nihilego, 0), - FOOTPRINT(Nihilego), + FOOTPRINT(Nihilego) LEARNSETS(Nihilego), }, #endif //P_FAMILY_NIHILEGO @@ -3915,7 +3915,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Buzzwole), ICON(Buzzwole, 0), - FOOTPRINT(Buzzwole), + FOOTPRINT(Buzzwole) LEARNSETS(Buzzwole), }, #endif //P_FAMILY_BUZZWOLE @@ -3965,7 +3965,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Pheromosa), ICON(Pheromosa, 2), - FOOTPRINT(Pheromosa), + FOOTPRINT(Pheromosa) LEARNSETS(Pheromosa), }, #endif //P_FAMILY_PHEROMOSA @@ -4015,7 +4015,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Xurkitree), ICON(Xurkitree, 0), - FOOTPRINT(Xurkitree), + FOOTPRINT(Xurkitree) LEARNSETS(Xurkitree), }, #endif //P_FAMILY_XURKITREE @@ -4067,7 +4067,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Celesteela), ICON(Celesteela, 0), - FOOTPRINT(Celesteela), + FOOTPRINT(Celesteela) LEARNSETS(Celesteela), }, #endif //P_FAMILY_CELESTEELA @@ -4118,7 +4118,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Kartana), ICON(Kartana, 0), - FOOTPRINT(Kartana), + FOOTPRINT(Kartana) LEARNSETS(Kartana), }, #endif //P_FAMILY_KARTANA @@ -4168,7 +4168,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Guzzlord), ICON(Guzzlord, 0), - FOOTPRINT(Guzzlord), + FOOTPRINT(Guzzlord) LEARNSETS(Guzzlord), }, #endif //P_FAMILY_GUZZLORD @@ -4188,7 +4188,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 3, \ .trainerScale = 369, \ .trainerOffset = 7, \ - FOOTPRINT(Necrozma), \ + FOOTPRINT(Necrozma) \ LEARNSETS(Necrozma), \ .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, \ .isLegendary = TRUE @@ -4382,7 +4382,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backPicYOffset = 4, \ PALETTES(Form), \ ICON(Form, 0), \ - FOOTPRINT(Magearna), \ + FOOTPRINT(Magearna) \ LEARNSETS(Magearna), \ .formSpeciesIdTable = sMagearnaFormSpeciesIdTable, \ .isMythical = TRUE @@ -4456,7 +4456,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Marshadow), ICON(Marshadow, 0), - FOOTPRINT(Marshadow), + FOOTPRINT(Marshadow) LEARNSETS(Marshadow), .isMythical = TRUE, }, @@ -4507,7 +4507,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Poipole), ICON(Poipole, 0), - FOOTPRINT(Poipole), + FOOTPRINT(Poipole) LEARNSETS(Poipole), .evolutions = EVOLUTION({EVO_MOVE, MOVE_DRAGON_PULSE, SPECIES_NAGANADEL}), }, @@ -4556,7 +4556,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Naganadel), ICON(Naganadel, 0), - FOOTPRINT(Naganadel), + FOOTPRINT(Naganadel) LEARNSETS(Naganadel), }, #endif //P_FAMILY_POIPOLE @@ -4606,7 +4606,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Stakataka), ICON(Stakataka, 0), - FOOTPRINT(Stakataka), + FOOTPRINT(Stakataka) LEARNSETS(Stakataka), }, #endif //P_FAMILY_STAKATAKA @@ -4656,7 +4656,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Blacephalon), ICON(Blacephalon, 0), - FOOTPRINT(Blacephalon), + FOOTPRINT(Blacephalon) LEARNSETS(Blacephalon), }, #endif //P_FAMILY_BLACEPHALON @@ -4705,7 +4705,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Zeraora), ICON(Zeraora, 0), - FOOTPRINT(Zeraora), + FOOTPRINT(Zeraora) LEARNSETS(Zeraora), }, #endif //P_FAMILY_ZERAORA @@ -4754,7 +4754,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Meltan), ICON(Meltan, 2), - FOOTPRINT(Meltan), + FOOTPRINT(Meltan) LEARNSETS(Meltan), }, @@ -4784,7 +4784,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 10, \ .trainerScale = 423, \ .trainerOffset = 8, \ - FOOTPRINT(Melmetal), \ + FOOTPRINT(Melmetal) \ LEARNSETS(Melmetal), \ .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, \ .formChangeTable = sMelmetalFormChangeTable, \ diff --git a/src/data/pokemon/species_info/gen_8.h b/src/data/pokemon/species_info/gen_8.h index e355e0230d..91797c7f0c 100644 --- a/src/data/pokemon/species_info/gen_8.h +++ b/src/data/pokemon/species_info/gen_8.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Grookey), ICON(Grookey, 1), - FOOTPRINT(Grookey), + FOOTPRINT(Grookey) LEARNSETS(Grookey), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_THWACKEY}), }, @@ -94,7 +94,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Thwackey), ICON(Thwackey, 1), - FOOTPRINT(Thwackey), + FOOTPRINT(Thwackey) LEARNSETS(Thwackey), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_RILLABOOM}), }, @@ -121,7 +121,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_RILLABOOM, \ .natDexNum = NATIONAL_DEX_RILLABOOM, \ .categoryName = _("Drummer"), \ - FOOTPRINT(Rillaboom), \ + FOOTPRINT(Rillaboom) \ LEARNSETS(Rillaboom), \ .formSpeciesIdTable = sRillaboomFormSpeciesIdTable, \ .formChangeTable = sRillaboomFormChangeTable @@ -222,7 +222,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Scorbunny), ICON(Scorbunny, 0), - FOOTPRINT(Scorbunny), + FOOTPRINT(Scorbunny) LEARNSETS(Scorbunny), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_RABOOT}), }, @@ -269,7 +269,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Raboot), ICON(Raboot, 0), - FOOTPRINT(Raboot), + FOOTPRINT(Raboot) LEARNSETS(Raboot), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_CINDERACE}), }, @@ -296,7 +296,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_CINDERACE, \ .natDexNum = NATIONAL_DEX_CINDERACE, \ .categoryName = _("Striker"), \ - FOOTPRINT(Cinderace), \ + FOOTPRINT(Cinderace) \ LEARNSETS(Cinderace), \ .formSpeciesIdTable = sCinderaceFormSpeciesIdTable, \ .formChangeTable = sCinderaceFormChangeTable @@ -400,7 +400,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Sobble), ICON(Sobble, 2), - FOOTPRINT(Sobble), + FOOTPRINT(Sobble) LEARNSETS(Sobble), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_DRIZZILE}), }, @@ -447,7 +447,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Drizzile), ICON(Drizzile, 2), - FOOTPRINT(Drizzile), + FOOTPRINT(Drizzile) LEARNSETS(Drizzile), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_INTELEON}), }, @@ -474,7 +474,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_INTELEON, \ .natDexNum = NATIONAL_DEX_INTELEON, \ .categoryName = _("Secret Agent"), \ - FOOTPRINT(Inteleon), \ + FOOTPRINT(Inteleon) \ LEARNSETS(Inteleon), \ .formSpeciesIdTable = sInteleonFormSpeciesIdTable, \ .formChangeTable = sInteleonFormChangeTable @@ -577,7 +577,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Skwovet), ICON(Skwovet, 2), - FOOTPRINT(Skwovet), + FOOTPRINT(Skwovet) LEARNSETS(Skwovet), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_GREEDENT}), }, @@ -626,7 +626,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Greedent), ICON(Greedent, 0), - FOOTPRINT(Greedent), + FOOTPRINT(Greedent) LEARNSETS(Greedent), }, #endif //P_FAMILY_SKWOVET @@ -675,7 +675,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Rookidee), ICON(Rookidee, 0), - FOOTPRINT(Rookidee), + FOOTPRINT(Rookidee) LEARNSETS(Rookidee), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CORVISQUIRE}), }, @@ -724,7 +724,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Corvisquire), ICON(Corvisquire, 0), - FOOTPRINT(Corvisquire), + FOOTPRINT(Corvisquire) LEARNSETS(Corvisquire), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_CORVIKNIGHT}), }, @@ -751,7 +751,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_CORVIKNIGHT, \ .natDexNum = NATIONAL_DEX_CORVIKNIGHT, \ .categoryName = _("Raven"), \ - FOOTPRINT(Corviknight), \ + FOOTPRINT(Corviknight) \ LEARNSETS(Corviknight), \ .formSpeciesIdTable = sCorviknightFormSpeciesIdTable, \ .formChangeTable = sCorviknightFormChangeTable @@ -853,7 +853,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Blipbug), ICON(Blipbug, 0), - FOOTPRINT(Blipbug), + FOOTPRINT(Blipbug) LEARNSETS(Blipbug), .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_DOTTLER}), }, @@ -902,7 +902,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dottler), ICON(Dottler, 2), - FOOTPRINT(Dottler), + FOOTPRINT(Dottler) LEARNSETS(Dottler), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ORBEETLE}), }, @@ -930,7 +930,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_ORBEETLE, \ .natDexNum = NATIONAL_DEX_ORBEETLE, \ .categoryName = _("Seven Spot"), \ - FOOTPRINT(Orbeetle), \ + FOOTPRINT(Orbeetle) \ LEARNSETS(Orbeetle), \ .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, \ .formChangeTable = sOrbeetleFormChangeTable @@ -1034,7 +1034,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Nickit), ICON(Nickit, 2), - FOOTPRINT(Nickit), + FOOTPRINT(Nickit) LEARNSETS(Nickit), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_THIEVUL}), }, @@ -1082,7 +1082,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Thievul), ICON(Thievul, 2), - FOOTPRINT(Thievul), + FOOTPRINT(Thievul) LEARNSETS(Thievul), }, #endif //P_FAMILY_NICKIT @@ -1131,7 +1131,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Gossifleur), ICON(Gossifleur, 1), - FOOTPRINT(Gossifleur), + FOOTPRINT(Gossifleur) LEARNSETS(Gossifleur), .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_ELDEGOSS}), }, @@ -1179,7 +1179,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Eldegoss), ICON(Eldegoss, 1), - FOOTPRINT(Eldegoss), + FOOTPRINT(Eldegoss) LEARNSETS(Eldegoss), }, #endif //P_FAMILY_GOSSIFLEUR @@ -1228,7 +1228,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Wooloo), ICON(Wooloo, 0), - FOOTPRINT(Wooloo), + FOOTPRINT(Wooloo) LEARNSETS(Wooloo), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_DUBWOOL}), }, @@ -1276,7 +1276,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dubwool), ICON(Dubwool, 2), - FOOTPRINT(Dubwool), + FOOTPRINT(Dubwool) LEARNSETS(Dubwool), }, #endif //P_FAMILY_WOOLOO @@ -1324,7 +1324,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Chewtle), ICON(Chewtle, 0), - FOOTPRINT(Chewtle), + FOOTPRINT(Chewtle) LEARNSETS(Chewtle), .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_DREDNAW}), }, @@ -1351,7 +1351,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_DREDNAW, \ .natDexNum = NATIONAL_DEX_DREDNAW, \ .categoryName = _("Bite"), \ - FOOTPRINT(Drednaw), \ + FOOTPRINT(Drednaw) \ LEARNSETS(Drednaw), \ .formSpeciesIdTable = sDrednawFormSpeciesIdTable, \ .formChangeTable = sDrednawFormChangeTable @@ -1453,7 +1453,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Yamper), ICON(Yamper, 1), - FOOTPRINT(Yamper), + FOOTPRINT(Yamper) LEARNSETS(Yamper), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_BOLTUND}), }, @@ -1501,7 +1501,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Boltund), ICON(Boltund, 1), - FOOTPRINT(Boltund), + FOOTPRINT(Boltund) LEARNSETS(Boltund), }, #endif //P_FAMILY_YAMPER @@ -1550,7 +1550,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Rolycoly), ICON(Rolycoly, 0), - FOOTPRINT(Rolycoly), + FOOTPRINT(Rolycoly) LEARNSETS(Rolycoly), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CARKOL}), }, @@ -1597,7 +1597,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Carkol), ICON(Carkol, 0), - FOOTPRINT(Carkol), + FOOTPRINT(Carkol) LEARNSETS(Carkol), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_COALOSSAL}), }, @@ -1624,7 +1624,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_COALOSSAL, \ .natDexNum = NATIONAL_DEX_COALOSSAL, \ .categoryName = _("Coal"), \ - FOOTPRINT(Coalossal), \ + FOOTPRINT(Coalossal) \ LEARNSETS(Coalossal), \ .formSpeciesIdTable = sCoalossalFormSpeciesIdTable, \ .formChangeTable = sCoalossalFormChangeTable @@ -1727,7 +1727,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Applin), ICON(Applin, 1), - FOOTPRINT(Applin), + FOOTPRINT(Applin) LEARNSETS(Applin), .evolutions = EVOLUTION({EVO_ITEM, ITEM_TART_APPLE, SPECIES_FLAPPLE}, {EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN}, @@ -1756,7 +1756,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_FLAPPLE, \ .natDexNum = NATIONAL_DEX_FLAPPLE, \ .categoryName = _("Apple Wing"), \ - FOOTPRINT(Flapple), \ + FOOTPRINT(Flapple) \ LEARNSETS(Flapple), \ .formSpeciesIdTable = sFlappleFormSpeciesIdTable, \ .formChangeTable = sFlappleFormChangeTable @@ -1836,7 +1836,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_APPLETUN, \ .natDexNum = NATIONAL_DEX_APPLETUN, \ .categoryName = _("Apple Nectar"), \ - FOOTPRINT(Appletun), \ + FOOTPRINT(Appletun) \ LEARNSETS(Appletun), \ .formSpeciesIdTable = sAppletunFormSpeciesIdTable, \ .formChangeTable = sAppletunFormChangeTable @@ -1936,7 +1936,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dipplin), ICON(Dipplin, 1), - //FOOTPRINT(Dipplin), + //FOOTPRINT(Dipplin) LEARNSETS(Dipplin), .evolutions = EVOLUTION({EVO_MOVE, MOVE_DRAGON_CHEER, SPECIES_HYDRAPPLE}), }, @@ -1984,7 +1984,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, //PALETTES(Hydrapple), //ICON(Hydrapple, 0), - //FOOTPRINT(Hydrapple), + //FOOTPRINT(Hydrapple) LEARNSETS(Hydrapple), }, #endif //P_GEN_9_CROSS_EVOS @@ -2033,7 +2033,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Silicobra), ICON(Silicobra, 1), - FOOTPRINT(Silicobra), + FOOTPRINT(Silicobra) LEARNSETS(Silicobra), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SANDACONDA}), }, @@ -2060,7 +2060,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_SANDACONDA, \ .natDexNum = NATIONAL_DEX_SANDACONDA, \ .categoryName = _("Sand Snake"), \ - FOOTPRINT(Sandaconda), \ + FOOTPRINT(Sandaconda) \ LEARNSETS(Sandaconda), \ .formSpeciesIdTable = sSandacondaFormSpeciesIdTable, \ .formChangeTable = sSandacondaFormChangeTable @@ -2146,7 +2146,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, \ .trainerScale = 257, \ .trainerOffset = 0, \ - FOOTPRINT(Cramorant), \ + FOOTPRINT(Cramorant) \ LEARNSETS(Cramorant), \ .formSpeciesIdTable = sCramorantFormSpeciesIdTable, \ .formChangeTable = sCramorantFormChangeTable @@ -2252,7 +2252,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Arrokuda), ICON(Arrokuda, 2), - FOOTPRINT(Arrokuda), + FOOTPRINT(Arrokuda) LEARNSETS(Arrokuda), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_BARRASKEWDA}), }, @@ -2300,7 +2300,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Barraskewda), ICON(Barraskewda, 2), - FOOTPRINT(Barraskewda), + FOOTPRINT(Barraskewda) LEARNSETS(Barraskewda), }, #endif //P_FAMILY_ARROKUDA @@ -2349,7 +2349,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Toxel), ICON(Toxel, 2), - FOOTPRINT(Toxel), + FOOTPRINT(Toxel) LEARNSETS(Toxel), .evolutions = EVOLUTION({EVO_LEVEL_NATURE_AMPED, 30, SPECIES_TOXTRICITY_AMPED}, {EVO_LEVEL_NATURE_LOW_KEY, 30, SPECIES_TOXTRICITY_LOW_KEY}), @@ -2403,7 +2403,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ToxtricityAmped), ICON(ToxtricityAmped, 2), - FOOTPRINT(Toxtricity), + FOOTPRINT(Toxtricity) LEARNSETS(ToxtricityAmped), }, @@ -2430,7 +2430,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ToxtricityGigantamax), ICON(ToxtricityGigantamax, 0), - FOOTPRINT(Toxtricity), + FOOTPRINT(Toxtricity) LEARNSETS(ToxtricityAmped), .isGigantamax = TRUE, }, @@ -2460,7 +2460,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ToxtricityLowKey), ICON(ToxtricityLowKey, 2), - FOOTPRINT(Toxtricity), + FOOTPRINT(Toxtricity) LEARNSETS(ToxtricityLowKey), }, @@ -2486,7 +2486,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ToxtricityGigantamax), ICON(ToxtricityGigantamax, 0), - FOOTPRINT(Toxtricity), + FOOTPRINT(Toxtricity) LEARNSETS(ToxtricityLowKey), .isGigantamax = TRUE, }, @@ -2536,7 +2536,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Sizzlipede), ICON(Sizzlipede, 0), - FOOTPRINT(Sizzlipede), + FOOTPRINT(Sizzlipede) LEARNSETS(Sizzlipede), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_CENTISKORCH}), }, @@ -2563,7 +2563,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_CENTISKORCH, \ .natDexNum = NATIONAL_DEX_CENTISKORCH, \ .categoryName = _("Radiator"), \ - FOOTPRINT(Centiskorch), \ + FOOTPRINT(Centiskorch) \ LEARNSETS(Centiskorch), \ .formSpeciesIdTable = sCentiskorchFormSpeciesIdTable, \ .formChangeTable = sCentiskorchFormChangeTable @@ -2666,7 +2666,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Clobbopus), ICON(Clobbopus, 0), - FOOTPRINT(Clobbopus), + FOOTPRINT(Clobbopus) LEARNSETS(Clobbopus), .evolutions = EVOLUTION({EVO_MOVE, MOVE_TAUNT, SPECIES_GRAPPLOCT}), }, @@ -2713,7 +2713,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Grapploct), ICON(Grapploct, 2), - FOOTPRINT(Grapploct), + FOOTPRINT(Grapploct) LEARNSETS(Grapploct), }, #endif //P_FAMILY_CLOBBOPUS @@ -2754,7 +2754,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .backPicYOffset = 16, \ PALETTES(Sinistea), \ ICON(Sinistea, 2), \ - FOOTPRINT(Sinistea), \ + FOOTPRINT(Sinistea) \ LEARNSETS(Sinistea), \ .formSpeciesIdTable = sSinisteaFormSpeciesIdTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -2818,7 +2818,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .backPicYOffset = 13, \ PALETTES(Polteageist), \ ICON(Polteageist, 2), \ - FOOTPRINT(Polteageist), \ + FOOTPRINT(Polteageist) \ LEARNSETS(Polteageist), \ .formSpeciesIdTable = sPolteageistFormSpeciesIdTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -2890,7 +2890,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Hatenna), ICON(Hatenna, 0), - FOOTPRINT(Hatenna), + FOOTPRINT(Hatenna) LEARNSETS(Hatenna), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_HATTREM}), }, @@ -2937,7 +2937,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Hattrem), ICON(Hattrem, 0), - FOOTPRINT(Hattrem), + FOOTPRINT(Hattrem) LEARNSETS(Hattrem), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_HATTERENE}), }, @@ -2964,7 +2964,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_HATTERENE, \ .natDexNum = NATIONAL_DEX_HATTERENE, \ .categoryName = _("Silent"), \ - FOOTPRINT(Hatterene), \ + FOOTPRINT(Hatterene) \ LEARNSETS(Hatterene), \ .formSpeciesIdTable = sHattereneFormSpeciesIdTable, \ .formChangeTable = sHattereneFormChangeTable @@ -3066,7 +3066,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Impidimp), ICON(Impidimp, 0), - FOOTPRINT(Impidimp), + FOOTPRINT(Impidimp) LEARNSETS(Impidimp), .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_MORGREM}), }, @@ -3114,7 +3114,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Morgrem), ICON(Morgrem, 0), - FOOTPRINT(Morgrem), + FOOTPRINT(Morgrem) LEARNSETS(Morgrem), .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_GRIMMSNARL}), }, @@ -3141,7 +3141,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_GRIMMSNARL, \ .natDexNum = NATIONAL_DEX_GRIMMSNARL, \ .categoryName = _("Bulk Up"), \ - FOOTPRINT(Grimmsnarl), \ + FOOTPRINT(Grimmsnarl) \ LEARNSETS(Grimmsnarl), \ .formSpeciesIdTable = sGrimmsnarlFormSpeciesIdTable, \ .formChangeTable = sGrimmsnarlFormChangeTable @@ -3243,7 +3243,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Milcery), ICON(Milcery, 1), - FOOTPRINT(Milcery), + FOOTPRINT(Milcery) LEARNSETS(Milcery), .evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM}, {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM}, @@ -3297,7 +3297,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .palette = gMonPalette_Alcremie ##sweet##cream, \ .shinyPalette = gMonShinyPalette_Alcremie ##sweet, \ ICON(AlcremieStrawberryVanillaCream, 1), \ - FOOTPRINT(Alcremie), \ + FOOTPRINT(Alcremie) \ LEARNSETS(Alcremie), \ .formSpeciesIdTable = sAlcremieFormSpeciesIdTable, \ .formChangeTable = sAlcremieFormChangeTable, \ @@ -3398,7 +3398,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(AlcremieGigantamax), ICON(AlcremieGigantamax, 1), - FOOTPRINT(Alcremie), + FOOTPRINT(Alcremie) LEARNSETS(Alcremie), .formSpeciesIdTable = sAlcremieFormSpeciesIdTable, .formChangeTable = sAlcremieFormChangeTable, @@ -3449,7 +3449,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Falinks), ICON(Falinks, 0), - FOOTPRINT(Falinks), + FOOTPRINT(Falinks) LEARNSETS(Falinks), }, #endif //P_FAMILY_FALINKS @@ -3497,7 +3497,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Pincurchin), ICON(Pincurchin, 0), - FOOTPRINT(Pincurchin), + FOOTPRINT(Pincurchin) LEARNSETS(Pincurchin), }, #endif //P_FAMILY_PINCURCHIN @@ -3547,7 +3547,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Snom), ICON(Snom, 0), - FOOTPRINT(Snom), + FOOTPRINT(Snom) LEARNSETS(Snom), .evolutions = EVOLUTION({EVO_FRIENDSHIP_NIGHT, 0, SPECIES_FROSMOTH}), }, @@ -3596,7 +3596,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Frosmoth), ICON(Frosmoth, 0), - FOOTPRINT(Frosmoth), + FOOTPRINT(Frosmoth) LEARNSETS(Frosmoth), }, #endif //P_FAMILY_SNOM @@ -3645,7 +3645,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Stonjourner), ICON(Stonjourner, 2), - FOOTPRINT(Stonjourner), + FOOTPRINT(Stonjourner) LEARNSETS(Stonjourner), }, #endif //P_FAMILY_STONJOURNER @@ -3672,7 +3672,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, \ .trainerScale = 262, \ .trainerOffset = 0, \ - FOOTPRINT(Eiscue), \ + FOOTPRINT(Eiscue) \ LEARNSETS(Eiscue), \ .formSpeciesIdTable = sEiscueFormSpeciesIdTable, \ .formChangeTable = sEiscueFormChangeTable @@ -3749,7 +3749,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 8, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Indeedee), \ + FOOTPRINT(Indeedee) \ .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable [SPECIES_INDEEDEE_MALE] = @@ -3841,7 +3841,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Morpeko), \ + FOOTPRINT(Morpeko) \ LEARNSETS(Morpeko), \ .formSpeciesIdTable = sMorpekoFormSpeciesIdTable, \ .formChangeTable = sMorpekoFormChangeTable @@ -3932,7 +3932,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Cufant), ICON(Cufant, 0), - FOOTPRINT(Cufant), + FOOTPRINT(Cufant) LEARNSETS(Cufant), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_COPPERAJAH}), }, @@ -3960,7 +3960,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_COPPERAJAH, \ .natDexNum = NATIONAL_DEX_COPPERAJAH, \ .categoryName = _("Copperderm"), \ - FOOTPRINT(Copperajah), \ + FOOTPRINT(Copperajah) \ LEARNSETS(Copperajah), \ .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, \ .formChangeTable = sCopperajahFormChangeTable @@ -4062,7 +4062,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dracozolt), ICON(Dracozolt, 1), - FOOTPRINT(Dracozolt), + FOOTPRINT(Dracozolt) LEARNSETS(Dracozolt), }, #endif //P_FAMILY_DRACOZOLT @@ -4110,7 +4110,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Arctozolt), ICON(Arctozolt, 2), - FOOTPRINT(Arctozolt), + FOOTPRINT(Arctozolt) LEARNSETS(Arctozolt), }, #endif //P_FAMILY_ARCTOZOLT @@ -4159,7 +4159,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dracovish), ICON(Dracovish, 0), - FOOTPRINT(Dracovish), + FOOTPRINT(Dracovish) LEARNSETS(Dracovish), }, #endif //P_FAMILY_DRACOVISH @@ -4208,7 +4208,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Arctovish), ICON(Arctovish, 0), - FOOTPRINT(Arctovish), + FOOTPRINT(Arctovish) LEARNSETS(Arctovish), }, #endif //P_FAMILY_ARCTOVISH @@ -4236,7 +4236,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_DURALUDON, \ .natDexNum = NATIONAL_DEX_DURALUDON, \ .categoryName = _("Alloy"), \ - FOOTPRINT(Duraludon), \ + FOOTPRINT(Duraludon) \ LEARNSETS(Duraludon), \ .formSpeciesIdTable = sDuraludonFormSpeciesIdTable, \ .formChangeTable = sDuraludonFormChangeTable @@ -4338,7 +4338,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, //PALETTES(Archaludon), //ICON(Archaludon, 0), - //FOOTPRINT(Archaludon), + //FOOTPRINT(Archaludon) LEARNSETS(Archaludon), }, #endif //P_GEN_9_CROSS_EVOS @@ -4389,7 +4389,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dreepy), ICON(Dreepy, 0), - FOOTPRINT(Dreepy), + FOOTPRINT(Dreepy) LEARNSETS(Dreepy), .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_DRAKLOAK}), }, @@ -4437,7 +4437,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Drakloak), ICON(Drakloak, 0), - FOOTPRINT(Drakloak), + FOOTPRINT(Drakloak) LEARNSETS(Drakloak), .evolutions = EVOLUTION({EVO_LEVEL, 60, SPECIES_DRAGAPULT}), }, @@ -4486,7 +4486,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dragapult), ICON(Dragapult, 0), - FOOTPRINT(Dragapult), + FOOTPRINT(Dragapult) LEARNSETS(Dragapult), }, #endif //P_FAMILY_DREEPY @@ -4511,7 +4511,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Zacian), \ + FOOTPRINT(Zacian) \ LEARNSETS(Zacian), \ .formSpeciesIdTable = sZacianFormSpeciesIdTable, \ .formChangeTable = sZacianFormChangeTable @@ -4594,7 +4594,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FOOTPRINT(Zamazenta), \ + FOOTPRINT(Zamazenta) \ LEARNSETS(Zamazenta), \ .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, \ .formChangeTable = sZamazentaFormChangeTable @@ -4674,7 +4674,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .speciesName = _("Eternatus"), \ .natDexNum = NATIONAL_DEX_ETERNATUS, \ .categoryName = _("Gigantic"), \ - FOOTPRINT(Eternatus), \ + FOOTPRINT(Eternatus) \ LEARNSETS(Eternatus), \ .formSpeciesIdTable = sEternatusFormSpeciesIdTable @@ -4791,7 +4791,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Kubfu), ICON(Kubfu, 1), - FOOTPRINT(Kubfu), + FOOTPRINT(Kubfu) LEARNSETS(Kubfu), .evolutions = EVOLUTION({EVO_DARK_SCROLL, 0, SPECIES_URSHIFU_SINGLE_STRIKE_STYLE}, {EVO_ITEM, ITEM_SCROLL_OF_DARKNESS, SPECIES_URSHIFU_SINGLE_STRIKE_STYLE}, @@ -4820,7 +4820,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .speciesName = _("Urshifu"), \ .natDexNum = NATIONAL_DEX_URSHIFU, \ .categoryName = _("Wushu"), \ - FOOTPRINT(Urshifu), \ + FOOTPRINT(Urshifu) \ .formSpeciesIdTable = sUrshifuFormSpeciesIdTable #define URSHIFU_SINGLE_STRIKE_STYLE_MISC_INFO \ @@ -4975,7 +4975,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, \ .trainerScale = 286, \ .trainerOffset = 1, \ - FOOTPRINT(Zarude), \ + FOOTPRINT(Zarude) \ LEARNSETS(Zarude), \ .formSpeciesIdTable = sZarudeFormSpeciesIdTable @@ -5062,7 +5062,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Regieleki), ICON(Regieleki, 0), - FOOTPRINT(Regieleki), + FOOTPRINT(Regieleki) LEARNSETS(Regieleki), .isLegendary = TRUE, }, @@ -5114,7 +5114,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Regidrago), ICON(Regidrago, 0), - FOOTPRINT(Regidrago), + FOOTPRINT(Regidrago) LEARNSETS(Regidrago), }, #endif //P_FAMILY_REGIDRAGO @@ -5163,7 +5163,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Glastrier), ICON(Glastrier, 0), - FOOTPRINT(Glastrier), + FOOTPRINT(Glastrier) LEARNSETS(Glastrier), }, #endif //P_FAMILY_GLASTRIER @@ -5213,7 +5213,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Spectrier), ICON(Spectrier, 0), - FOOTPRINT(Spectrier), + FOOTPRINT(Spectrier) LEARNSETS(Spectrier), }, #endif //P_FAMILY_SPECTRIER @@ -5221,7 +5221,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #define CALYREX_MISC_INFO \ .speciesName = _("Calyrex"), \ .natDexNum = NATIONAL_DEX_CALYREX, \ - FOOTPRINT(Calyrex), \ + FOOTPRINT(Calyrex) \ .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, \ .isLegendary = TRUE @@ -5417,7 +5417,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(EnamorusIncarnate), ICON(EnamorusIncarnate, 1), - //FOOTPRINT(EnamorusIncarnate), + //FOOTPRINT(EnamorusIncarnate) }, [SPECIES_ENAMORUS_THERIAN] = @@ -5445,7 +5445,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(EnamorusTherian), ICON(EnamorusTherian, 1), - //FOOTPRINT(Enamorus), + //FOOTPRINT(Enamorus) }, #endif //P_FAMILY_ENAMORUS diff --git a/src/data/pokemon/species_info/gen_9.h b/src/data/pokemon/species_info/gen_9.h index 6f32456c56..2a9321f2d1 100644 --- a/src/data/pokemon/species_info/gen_9.h +++ b/src/data/pokemon/species_info/gen_9.h @@ -47,7 +47,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Sprigatito), ICON(Sprigatito, 4), - //FOOTPRINT(Sprigatito), + //FOOTPRINT(Sprigatito) LEARNSETS(Sprigatito), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_FLORAGATO}), }, @@ -95,7 +95,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Floragato), ICON(Floragato, 1), - //FOOTPRINT(Floragato), + //FOOTPRINT(Floragato) LEARNSETS(Floragato), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_MEOWSCARADA}), }, @@ -143,7 +143,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Meowscarada), ICON(Meowscarada, 1), - //FOOTPRINT(Meowscarada), + //FOOTPRINT(Meowscarada) LEARNSETS(Meowscarada), }, #endif //P_FAMILY_SPRIGATITO @@ -192,7 +192,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Fuecoco), ICON(Fuecoco, 0), - //FOOTPRINT(Fuecoco), + //FOOTPRINT(Fuecoco) LEARNSETS(Fuecoco), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_CROCALOR}), }, @@ -240,7 +240,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Crocalor), ICON(Crocalor, 0), - //FOOTPRINT(Crocalor), + //FOOTPRINT(Crocalor) LEARNSETS(Crocalor), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SKELEDIRGE}), }, @@ -288,7 +288,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Skeledirge), ICON(Skeledirge, 0), - //FOOTPRINT(Skeledirge), + //FOOTPRINT(Skeledirge) LEARNSETS(Skeledirge), }, #endif //P_FAMILY_FUECOCO @@ -337,7 +337,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Quaxly), ICON(Quaxly, 2), - //FOOTPRINT(Quaxly), + //FOOTPRINT(Quaxly) LEARNSETS(Quaxly), .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_QUAXWELL}), }, @@ -385,7 +385,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Quaxwell), ICON(Quaxwell, 0), - //FOOTPRINT(Quaxwell), + //FOOTPRINT(Quaxwell) LEARNSETS(Quaxwell), .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_QUAQUAVAL}), }, @@ -433,7 +433,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Quaquaval), ICON(Quaquaval, 0), - //FOOTPRINT(Quaquaval), + //FOOTPRINT(Quaquaval) LEARNSETS(Quaquaval), }, #endif //P_FAMILY_QUAXLY @@ -482,7 +482,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Lechonk), ICON(Lechonk, 1), - //FOOTPRINT(Lechonk), + //FOOTPRINT(Lechonk) LEARNSETS(Lechonk), .evolutions = EVOLUTION({EVO_LEVEL_MALE, 18, SPECIES_OINKOLOGNE_MALE}, {EVO_LEVEL_FEMALE, 18, SPECIES_OINKOLOGNE_FEMALE}), @@ -534,7 +534,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(OinkologneMale), ICON(OinkologneMale, 1), - //FOOTPRINT(Oinkologne), + //FOOTPRINT(Oinkologne) LEARNSETS(OinkologneMale), }, @@ -565,7 +565,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(OinkologneFemale), ICON(OinkologneFemale, 2), - //FOOTPRINT(Oinkologne), + //FOOTPRINT(Oinkologne) LEARNSETS(OinkologneFemale), }, #endif //P_FAMILY_LECHONK @@ -614,7 +614,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Tarountula), ICON(Tarountula, 1), - //FOOTPRINT(Tarountula), + //FOOTPRINT(Tarountula) LEARNSETS(Tarountula), .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_SPIDOPS}), }, @@ -662,7 +662,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Spidops), ICON(Spidops, 1), - //FOOTPRINT(Spidops), + //FOOTPRINT(Spidops) LEARNSETS(Spidops), }, #endif //P_FAMILY_TAROUNTULA @@ -711,7 +711,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Nymble), ICON(Nymble, 0), - //FOOTPRINT(Nymble), + //FOOTPRINT(Nymble) LEARNSETS(Nymble), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_LOKIX}), }, @@ -759,7 +759,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Lokix), ICON(Lokix, 0), - //FOOTPRINT(Lokix), + //FOOTPRINT(Lokix) LEARNSETS(Lokix), }, #endif //P_FAMILY_NYMBLE @@ -808,7 +808,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Pawmi), ICON(Pawmi, 3), - //FOOTPRINT(Pawmi), + //FOOTPRINT(Pawmi) LEARNSETS(Pawmi), .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_PAWMO}), }, @@ -856,7 +856,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Pawmo), ICON(Pawmo, 3), - //FOOTPRINT(Pawmo), + //FOOTPRINT(Pawmo) LEARNSETS(Pawmo), .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_PAWMOT}), }, @@ -904,7 +904,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Pawmot), ICON(Pawmot, 3), - //FOOTPRINT(Pawmot), + //FOOTPRINT(Pawmot) LEARNSETS(Pawmot), }, #endif //P_FAMILY_PAWMI @@ -953,7 +953,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Tandemaus), ICON(Tandemaus, 0), - //FOOTPRINT(Tandemaus), + //FOOTPRINT(Tandemaus) LEARNSETS(Tandemaus), .evolutions = EVOLUTION({EVO_LEVEL_FAMILY_OF_FOUR, 25, SPECIES_MAUSHOLD_FAMILY_OF_FOUR}, {EVO_LEVEL_FAMILY_OF_THREE, 25, SPECIES_MAUSHOLD_FAMILY_OF_THREE}), @@ -993,7 +993,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .formSpeciesIdTable = sMausholdFormSpeciesIdTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Maushold), + //FOOTPRINT(Maushold) [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { @@ -1069,7 +1069,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Fidough), ICON(Fidough, 1), - //FOOTPRINT(Fidough), + //FOOTPRINT(Fidough) LEARNSETS(Fidough), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DACHSBUN}), }, @@ -1117,7 +1117,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dachsbun), ICON(Dachsbun, 0), // TODO - //FOOTPRINT(Dachsbun), + //FOOTPRINT(Dachsbun) LEARNSETS(Dachsbun), }, #endif //P_FAMILY_FIDOUGH @@ -1166,7 +1166,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Smoliv), ICON(Smoliv, 1), - //FOOTPRINT(Smoliv), + //FOOTPRINT(Smoliv) LEARNSETS(Smoliv), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_DOLLIV}), }, @@ -1214,7 +1214,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dolliv), ICON(Dolliv, 1), - //FOOTPRINT(Dolliv), + //FOOTPRINT(Dolliv) LEARNSETS(Dolliv), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ARBOLIVA}), }, @@ -1262,7 +1262,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Arboliva), ICON(Arboliva, 5), - //FOOTPRINT(Arboliva), + //FOOTPRINT(Arboliva) LEARNSETS(Arboliva), }, #endif //P_FAMILY_SMOLIV @@ -1303,7 +1303,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Squawkabilly), + //FOOTPRINT(Squawkabilly) [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = { @@ -1406,7 +1406,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Nacli), ICON(Nacli, 2), - //FOOTPRINT(Nacli), + //FOOTPRINT(Nacli) LEARNSETS(Nacli), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_NACLSTACK}), }, @@ -1454,7 +1454,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Naclstack), ICON(Naclstack, 2), // TODO: recolor - //FOOTPRINT(Naclstack), + //FOOTPRINT(Naclstack) LEARNSETS(Naclstack), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_GARGANACL}), }, @@ -1502,7 +1502,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Garganacl), ICON(Garganacl, 2), - //FOOTPRINT(Garganacl), + //FOOTPRINT(Garganacl) LEARNSETS(Garganacl), }, #endif //P_FAMILY_NACLI @@ -1551,7 +1551,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Charcadet), ICON(Charcadet, 1), - //FOOTPRINT(Charcadet), + //FOOTPRINT(Charcadet) LEARNSETS(Charcadet), .evolutions = EVOLUTION({EVO_ITEM, ITEM_AUSPICIOUS_ARMOR, SPECIES_ARMAROUGE}, {EVO_ITEM, ITEM_MALICIOUS_ARMOR, SPECIES_CERULEDGE}), @@ -1600,7 +1600,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Armarouge), ICON(Armarouge, 0), - //FOOTPRINT(Armarouge), + //FOOTPRINT(Armarouge) LEARNSETS(Armarouge), }, @@ -1647,7 +1647,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Ceruledge), ICON(Ceruledge, 2), - //FOOTPRINT(Ceruledge), + //FOOTPRINT(Ceruledge) LEARNSETS(Ceruledge), }, #endif //P_FAMILY_CHARCADET @@ -1697,7 +1697,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Tadbulb), ICON(Tadbulb, 5), // TODO: Redo to 0 - //FOOTPRINT(Tadbulb), + //FOOTPRINT(Tadbulb) LEARNSETS(Tadbulb), .evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_BELLIBOLT}), }, @@ -1745,7 +1745,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Bellibolt), ICON(Bellibolt, 0), - //FOOTPRINT(Bellibolt), + //FOOTPRINT(Bellibolt) LEARNSETS(Bellibolt), }, #endif //P_FAMILY_TADBULB @@ -1794,7 +1794,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Wattrel), ICON(Wattrel, 3), - //FOOTPRINT(Wattrel), + //FOOTPRINT(Wattrel) LEARNSETS(Wattrel), .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_KILOWATTREL}), }, @@ -1842,7 +1842,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Kilowattrel), ICON(Kilowattrel, 3), - //FOOTPRINT(Kilowattrel), + //FOOTPRINT(Kilowattrel) LEARNSETS(Kilowattrel), }, #endif //P_FAMILY_WATTREL @@ -1891,7 +1891,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Maschiff), ICON(Maschiff, 3), - //FOOTPRINT(Maschiff), + //FOOTPRINT(Maschiff) LEARNSETS(Maschiff), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MABOSSTIFF}), }, @@ -1939,7 +1939,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Mabosstiff), ICON(Mabosstiff, 5), - //FOOTPRINT(Mabosstiff), + //FOOTPRINT(Mabosstiff) LEARNSETS(Mabosstiff), }, #endif //P_FAMILY_MASCHIFF @@ -1988,7 +1988,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Shroodle), ICON(Shroodle, 0), - //FOOTPRINT(Shroodle), + //FOOTPRINT(Shroodle) LEARNSETS(Shroodle), .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_GRAFAIAI}), }, @@ -2036,7 +2036,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Grafaiai), ICON(Grafaiai, 0), - //FOOTPRINT(Grafaiai), + //FOOTPRINT(Grafaiai) LEARNSETS(Grafaiai), }, #endif //P_FAMILY_SHROODLE @@ -2085,7 +2085,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Bramblin), ICON(Bramblin, 3), - //FOOTPRINT(Bramblin), + //FOOTPRINT(Bramblin) LEARNSETS(Bramblin), .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_BRAMBLEGHAST}), }, @@ -2133,7 +2133,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Brambleghast), ICON(Brambleghast, 5), - //FOOTPRINT(Brambleghast), + //FOOTPRINT(Brambleghast) LEARNSETS(Brambleghast), }, #endif //P_FAMILY_BRAMBLIN @@ -2182,7 +2182,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Toedscool), ICON(Toedscool, 0), - //FOOTPRINT(Toedscool), + //FOOTPRINT(Toedscool) LEARNSETS(Toedscool), .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_TOEDSCRUEL}), }, @@ -2230,7 +2230,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Toedscruel), ICON(Toedscruel, 0), - //FOOTPRINT(Toedscruel), + //FOOTPRINT(Toedscruel) LEARNSETS(Toedscruel), }, #endif //P_FAMILY_TOEDSCOOL @@ -2279,7 +2279,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Klawf), ICON(Klawf, 0), - //FOOTPRINT(Klawf), + //FOOTPRINT(Klawf) LEARNSETS(Klawf), }, #endif //P_FAMILY_KLAWF @@ -2328,7 +2328,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Capsakid), ICON(Capsakid, 1), - //FOOTPRINT(Capsakid), + //FOOTPRINT(Capsakid) LEARNSETS(Capsakid), .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_SCOVILLAIN}), }, @@ -2376,7 +2376,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Scovillain), ICON(Scovillain, 1), - //FOOTPRINT(Scovillain), + //FOOTPRINT(Scovillain) LEARNSETS(Scovillain), }, #endif //P_FAMILY_CAPSAKID @@ -2425,7 +2425,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Rellor), ICON(Rellor, 5), - //FOOTPRINT(Rellor), + //FOOTPRINT(Rellor) LEARNSETS(Rellor), .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_RABSCA}), }, @@ -2473,7 +2473,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Rabsca), ICON(Rabsca, 0), - //FOOTPRINT(Rabsca), + //FOOTPRINT(Rabsca) LEARNSETS(Rabsca), }, #endif //P_FAMILY_RELLOR @@ -2522,7 +2522,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Flittle), ICON(Flittle, 3), - //FOOTPRINT(Flittle), + //FOOTPRINT(Flittle) LEARNSETS(Flittle), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ESPATHRA}), }, @@ -2570,7 +2570,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Espathra), ICON(Espathra, 5), - //FOOTPRINT(Espathra), + //FOOTPRINT(Espathra) LEARNSETS(Espathra), }, #endif //P_FAMILY_FLITTLE @@ -2619,7 +2619,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Tinkatink), ICON(Tinkatink, 1), - //FOOTPRINT(Tinkatink), + //FOOTPRINT(Tinkatink) LEARNSETS(Tinkatink), .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_TINKATUFF}), }, @@ -2667,7 +2667,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Tinkatuff), ICON(Tinkatuff, 4), - //FOOTPRINT(Tinkatuff), + //FOOTPRINT(Tinkatuff) LEARNSETS(Tinkatuff), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_TINKATON}), }, @@ -2715,7 +2715,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Tinkaton), ICON(Tinkaton, 4), - //FOOTPRINT(Tinkaton), + //FOOTPRINT(Tinkaton) LEARNSETS(Tinkaton), }, #endif //P_FAMILY_TINKATINK @@ -2763,7 +2763,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Wiglett), ICON(Wiglett, 0), - //FOOTPRINT(Wiglett), + //FOOTPRINT(Wiglett) LEARNSETS(Wiglett), .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_WUGTRIO}), }, @@ -2810,7 +2810,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Wugtrio), ICON(Wugtrio, 0), - //FOOTPRINT(Wugtrio), + //FOOTPRINT(Wugtrio) LEARNSETS(Wugtrio), }, #endif //P_FAMILY_WIGLETT @@ -2860,7 +2860,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Bombirdier), ICON(Bombirdier, 0), - //FOOTPRINT(Bombirdier), + //FOOTPRINT(Bombirdier) LEARNSETS(Bombirdier), }, #endif //P_FAMILY_BOMBIRDIER @@ -2908,7 +2908,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Finizen), ICON(Finizen, 0), - //FOOTPRINT(Finizen), + //FOOTPRINT(Finizen) LEARNSETS(Finizen), .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_PALAFIN_ZERO}), }, @@ -2935,7 +2935,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .formSpeciesIdTable = sPalafinFormSpeciesIdTable, \ .formChangeTable = sPalafinZeroFormChangeTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //FOOTPRINT(Palafin), + //FOOTPRINT(Palafin) [SPECIES_PALAFIN_ZERO] = { @@ -3038,7 +3038,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Varoom), ICON(Varoom, 5), - //FOOTPRINT(Varoom), + //FOOTPRINT(Varoom) LEARNSETS(Varoom), .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_REVAVROOM}), }, @@ -3086,7 +3086,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Revavroom), ICON(Revavroom, 5), - //FOOTPRINT(Revavroom), + //FOOTPRINT(Revavroom) LEARNSETS(Revavroom), }, #endif //P_FAMILY_VAROOM @@ -3135,7 +3135,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Cyclizar), ICON(Cyclizar, 1), - //FOOTPRINT(Cyclizar), + //FOOTPRINT(Cyclizar) LEARNSETS(Cyclizar), }, #endif //P_FAMILY_CYCLIZAR @@ -3184,7 +3184,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Orthworm), ICON(Orthworm, 4), - //FOOTPRINT(Orthworm), + //FOOTPRINT(Orthworm) LEARNSETS(Orthworm), }, #endif //P_FAMILY_ORTHWORM @@ -3234,7 +3234,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Glimmet), ICON(Glimmet, 0), - //FOOTPRINT(Glimmet), + //FOOTPRINT(Glimmet) LEARNSETS(Glimmet), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_GLIMMORA}), }, @@ -3283,7 +3283,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Glimmora), ICON(Glimmora, 0), - //FOOTPRINT(Glimmora), + //FOOTPRINT(Glimmora) LEARNSETS(Glimmora), }, #endif //P_FAMILY_GLIMMET @@ -3332,7 +3332,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Greavard), ICON(Greavard, 2), - //FOOTPRINT(Greavard), + //FOOTPRINT(Greavard) LEARNSETS(Greavard), .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 30, SPECIES_HOUNDSTONE}), }, @@ -3380,7 +3380,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Houndstone), ICON(Houndstone, 5), - //FOOTPRINT(Houndstone), + //FOOTPRINT(Houndstone) LEARNSETS(Houndstone), }, #endif //P_FAMILY_GREAVARD @@ -3429,7 +3429,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Flamigo), ICON(Flamigo, 4), - //FOOTPRINT(Flamigo), + //FOOTPRINT(Flamigo) LEARNSETS(Flamigo), }, #endif //P_FAMILY_FLAMIGO @@ -3478,7 +3478,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Cetoddle), ICON(Cetoddle, 0), - //FOOTPRINT(Cetoddle), + //FOOTPRINT(Cetoddle) LEARNSETS(Cetoddle), .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_CETITAN}), }, @@ -3526,7 +3526,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Cetitan), ICON(Cetitan, 0), - //FOOTPRINT(Cetitan), + //FOOTPRINT(Cetitan) LEARNSETS(Cetitan), }, #endif //P_FAMILY_CETODDLE @@ -3576,7 +3576,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Veluza), ICON(Veluza, 4), - //FOOTPRINT(Veluza), + //FOOTPRINT(Veluza) LEARNSETS(Veluza), }, #endif //P_FAMILY_VELUZA @@ -3626,7 +3626,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Dondozo), ICON(Dondozo, 0), - //FOOTPRINT(Dondozo), + //FOOTPRINT(Dondozo) LEARNSETS(Dondozo), }, #endif //P_FAMILY_DONDOZO @@ -3665,7 +3665,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Tatsugiri), + //FOOTPRINT(Tatsugiri) [SPECIES_TATSUGIRI_CURLY] = { @@ -3759,7 +3759,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(GreatTusk), ICON(GreatTusk, 0), - //FOOTPRINT(GreatTusk), + //FOOTPRINT(GreatTusk) LEARNSETS(GreatTusk), }, #endif //P_FAMILY_GREAT_TUSK @@ -3809,7 +3809,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ScreamTail), ICON(ScreamTail, 0), - //FOOTPRINT(ScreamTail), + //FOOTPRINT(ScreamTail) LEARNSETS(ScreamTail), }, #endif //P_FAMILY_SCREAM_TAIL @@ -3859,7 +3859,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(BruteBonnet), ICON(BruteBonnet, 1), - //FOOTPRINT(BruteBonnet), + //FOOTPRINT(BruteBonnet) LEARNSETS(BruteBonnet), }, #endif //P_FAMILY_BRUTE_BONNET @@ -3912,7 +3912,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(FlutterMane), ICON(FlutterMane, 4), - //FOOTPRINT(FlutterMane), + //FOOTPRINT(FlutterMane) LEARNSETS(FlutterMane), }, #endif //P_FAMILY_FLUTTER_MANE @@ -3961,7 +3961,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(SlitherWing), ICON(SlitherWing, 3), - //FOOTPRINT(SlitherWing), + //FOOTPRINT(SlitherWing) LEARNSETS(SlitherWing), }, #endif //P_FAMILY_SLITHER_WING @@ -4011,7 +4011,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(SandyShocks), ICON(SandyShocks, 0), - //FOOTPRINT(SandyShocks), + //FOOTPRINT(SandyShocks) LEARNSETS(SandyShocks), }, #endif //P_FAMILY_SANDY_SHOCKS @@ -4061,7 +4061,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronTreads), ICON(IronTreads, 0), - //FOOTPRINT(IronTreads), + //FOOTPRINT(IronTreads) LEARNSETS(IronTreads), }, #endif //P_FAMILY_IRON_TREADS @@ -4111,7 +4111,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronBundle), ICON(IronBundle, 0), - //FOOTPRINT(IronBundle), + //FOOTPRINT(IronBundle) LEARNSETS(IronBundle), }, #endif //P_FAMILY_IRON_BUNDLE @@ -4161,7 +4161,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronHands), ICON(IronHands, 0), - //FOOTPRINT(IronHands), + //FOOTPRINT(IronHands) LEARNSETS(IronHands), }, #endif //P_FAMILY_IRON_HANDS @@ -4212,7 +4212,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronJugulis), ICON(IronJugulis, 2), - //FOOTPRINT(IronJugulis), + //FOOTPRINT(IronJugulis) LEARNSETS(IronJugulis), }, #endif //P_FAMILY_IRON_JUGULIS @@ -4263,7 +4263,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronMoth), ICON(IronMoth, 3), - //FOOTPRINT(IronMoth), + //FOOTPRINT(IronMoth) LEARNSETS(IronMoth), }, #endif //P_FAMILY_IRON_MOTH @@ -4313,7 +4313,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronThorns), ICON(IronThorns, 1), - //FOOTPRINT(IronThorns), + //FOOTPRINT(IronThorns) LEARNSETS(IronThorns), }, #endif //P_FAMILY_IRON_THORNS @@ -4362,7 +4362,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Frigibax), ICON(Frigibax, 3), - //FOOTPRINT(Frigibax), + //FOOTPRINT(Frigibax) LEARNSETS(Frigibax), .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ARCTIBAX}), }, @@ -4410,7 +4410,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Arctibax), ICON(Arctibax, 0), - //FOOTPRINT(Arctibax), + //FOOTPRINT(Arctibax) LEARNSETS(Arctibax), .evolutions = EVOLUTION({EVO_LEVEL, 54, SPECIES_BAXCALIBUR}), }, @@ -4458,7 +4458,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Baxcalibur), ICON(Baxcalibur, 0), - //FOOTPRINT(Baxcalibur), + //FOOTPRINT(Baxcalibur) LEARNSETS(Baxcalibur), }, #endif //P_FAMILY_FRIGIBAX @@ -4483,7 +4483,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}) //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Gimmighoul), + //FOOTPRINT(Gimmighoul) [SPECIES_GIMMIGHOUL_CHEST] = { @@ -4590,7 +4590,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Gholdengo), ICON(Gholdengo, 0), - //FOOTPRINT(Gholdengo), + //FOOTPRINT(Gholdengo) LEARNSETS(Gholdengo), }, #endif //P_FAMILY_GIMMIGHOUL @@ -4640,7 +4640,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(WoChien), ICON(WoChien, 5), - //FOOTPRINT(WoChien), + //FOOTPRINT(WoChien) LEARNSETS(WoChien), }, #endif //P_FAMILY_WO_CHIEN @@ -4690,7 +4690,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ChienPao), ICON(ChienPao, 0), - //FOOTPRINT(ChienPao), + //FOOTPRINT(ChienPao) LEARNSETS(ChienPao), }, #endif //P_FAMILY_CHIEN_PAO @@ -4740,7 +4740,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(TingLu), ICON(TingLu, 0), - //FOOTPRINT(TingLu), + //FOOTPRINT(TingLu) LEARNSETS(TingLu), }, #endif //P_FAMILY_TING_LU @@ -4791,7 +4791,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ChiYu), ICON(ChiYu, 0), - //FOOTPRINT(ChiYu), + //FOOTPRINT(ChiYu) LEARNSETS(ChiYu), }, #endif //P_FAMILY_CHI_YU @@ -4842,7 +4842,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(RoaringMoon), ICON(RoaringMoon, 3), - //FOOTPRINT(RoaringMoon), + //FOOTPRINT(RoaringMoon) LEARNSETS(RoaringMoon), }, #endif //P_FAMILY_ROARING_MOON @@ -4891,7 +4891,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronValiant), ICON(IronValiant, 4), - //FOOTPRINT(IronValiant), + //FOOTPRINT(IronValiant) LEARNSETS(IronValiant), }, #endif //P_FAMILY_IRON_VALIANT @@ -4942,7 +4942,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Koraidon), ICON(Koraidon, 0), - //FOOTPRINT(Koraidon), + //FOOTPRINT(Koraidon) LEARNSETS(Koraidon), }, #endif //P_FAMILY_KORAIDON @@ -4993,7 +4993,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Miraidon), ICON(Miraidon, 2), - //FOOTPRINT(Miraidon), + //FOOTPRINT(Miraidon) LEARNSETS(Miraidon), }, #endif //P_FAMILY_MIRAIDON @@ -5042,7 +5042,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(WalkingWake), ICON(WalkingWake, 2), - //FOOTPRINT(WalkingWake), + //FOOTPRINT(WalkingWake) LEARNSETS(WalkingWake), }, #endif //P_FAMILY_WALKING_WAKE @@ -5091,7 +5091,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(IronLeaves), ICON(IronLeaves, 1), - //FOOTPRINT(IronLeaves), + //FOOTPRINT(IronLeaves) LEARNSETS(IronLeaves), }, #endif //P_FAMILY_IRON_LEAVES @@ -5136,7 +5136,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = LEARNSETS(Poltchageist) //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Poltchageist), + //FOOTPRINT(Poltchageist) [SPECIES_POLTCHAGEIST_COUNTERFEIT] = { @@ -5198,7 +5198,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = LEARNSETS(Sinistcha) //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Sinistcha), + //FOOTPRINT(Sinistcha) [SPECIES_SINISTCHA_UNREMARKABLE] = { @@ -5264,7 +5264,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Okidogi), ICON(Okidogi, 1), - //FOOTPRINT(Okidogi), + //FOOTPRINT(Okidogi) LEARNSETS(Okidogi), .isLegendary = TRUE, }, @@ -5315,7 +5315,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Munkidori), ICON(Munkidori, 0), - //FOOTPRINT(Munkidori), + //FOOTPRINT(Munkidori) LEARNSETS(Munkidori), }, #endif //P_FAMILY_MUNKIDORI @@ -5365,7 +5365,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Fezandipiti), ICON(Fezandipiti, 0), - //FOOTPRINT(Fezandipiti), + //FOOTPRINT(Fezandipiti) LEARNSETS(Fezandipiti), }, #endif //P_FAMILY_FEZANDIPITI @@ -5417,7 +5417,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //.shinyPalette = gMonShinyPalette_OgerponTealMask, //ICON(Ogerpon##Form##, 1), - //FOOTPRINT(Ogerpon), + //FOOTPRINT(Ogerpon) [SPECIES_OGERPON_TEAL_MASK] = OGERPON_SPECIES_INFO(TealMask, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN, FALSE), [SPECIES_OGERPON_WELLSPRING_MASK] = OGERPON_SPECIES_INFO(WellspringMask, TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE, FALSE), @@ -5477,7 +5477,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //PALETTES(GougingFire), //ICON(GougingFire, 0), - //FOOTPRINT(GougingFire), + //FOOTPRINT(GougingFire) LEARNSETS(GougingFire), }, #endif //P_FAMILY_GOUGING_FIRE @@ -5527,7 +5527,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //PALETTES(RagingBolt), //ICON(RagingBolt, 0), - //FOOTPRINT(RagingBolt), + //FOOTPRINT(RagingBolt) LEARNSETS(RagingBolt), }, #endif //P_FAMILY_RAGING_BOLT @@ -5576,7 +5576,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //PALETTES(IronBoulder), //ICON(IronBoulder, 0), - //FOOTPRINT(IronBoulder), + //FOOTPRINT(IronBoulder) LEARNSETS(IronBoulder), }, #endif //P_FAMILY_IRON_BOULDER @@ -5626,7 +5626,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //PALETTES(IronCrown), //ICON(IronCrown, 0), - //FOOTPRINT(IronCrown), + //FOOTPRINT(IronCrown) LEARNSETS(IronCrown), }, #endif //P_FAMILY_IRON_CROWN @@ -5650,7 +5650,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .formChangeTable = sTerapagosFormChangeTable, \ .isLegendary = TRUE //.cryId = CRY_TERAPAGOS, - //FOOTPRINT(Terapagos), + //FOOTPRINT(Terapagos) [SPECIES_TERAPAGOS_NORMAL] = { @@ -5797,7 +5797,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.backAnimId = BACK_ANIM_NONE, //PALETTES(Pecharunt), //ICON(Pecharunt, 0), - //FOOTPRINT(Pecharunt), + //FOOTPRINT(Pecharunt) LEARNSETS(Pecharunt), }, #endif //P_FAMILY_PECHARUNT diff --git a/src/pokedex.c b/src/pokedex.c index ce185e2de2..5fb1911ac5 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -279,7 +279,6 @@ static void PrintMonWeight(u16 weight, u8 left, u8 top); static void ResetOtherVideoRegisters(u16); static u8 PrintCryScreenSpeciesName(u8, u16, u8, u8); static void PrintDecimalNum(u8 windowId, u16 num, u8 left, u8 top); -static void DrawFootprint(u8 windowId, u16 dexNum); static u16 GetPokemonScaleFromNationalDexNumber(u16 nationalNum); static u16 GetPokemonOffsetFromNationalDexNumber(u16 nationalNum); static u16 GetTrainerScaleFromNationalDexNumber(u16 nationalNum); @@ -3291,7 +3290,7 @@ static void Task_LoadInfoScreen(u8 taskId) FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); PutWindowTilemap(WIN_INFO); PutWindowTilemap(WIN_FOOTPRINT); - DrawFootprint(WIN_FOOTPRINT, sPokedexListItem->dexNum); + DrawFootprint(WIN_FOOTPRINT, NationalPokedexNumToSpecies(sPokedexListItem->dexNum)); CopyWindowToVram(WIN_FOOTPRINT, COPYWIN_GFX); gMain.state++; break; @@ -4020,7 +4019,7 @@ static void Task_DisplayCaughtMonDexPage(u8 taskId) FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); PutWindowTilemap(WIN_INFO); PutWindowTilemap(WIN_FOOTPRINT); - DrawFootprint(WIN_FOOTPRINT, dexNum); + DrawFootprint(WIN_FOOTPRINT, NationalPokedexNumToSpecies(dexNum)); CopyWindowToVram(WIN_FOOTPRINT, COPYWIN_GFX); ResetPaletteFade(); LoadPokedexBgPalette(FALSE); @@ -4561,14 +4560,17 @@ static void UNUSED PrintDecimalNum(u8 windowId, u16 num, u8 left, u8 top) #define NUM_FOOTPRINT_TILES 4 -static void DrawFootprint(u8 windowId, u16 dexNum) +void DrawFootprint(u8 windowId, u16 species) { u8 ALIGNED(4) footprint4bpp[TILE_SIZE_4BPP * NUM_FOOTPRINT_TILES]; - const u8 *footprintGfx = gSpeciesInfo[NationalPokedexNumToSpecies(dexNum)].footprint; + const u8 *footprintGfx = NULL; u32 i, j, tileIdx = 0; - if (P_FOOTPRINTS == FALSE) - return; +#if P_FOOTPRINTS + footprintGfx = gSpeciesInfo[SanitizeSpeciesId(species)].footprint; +#else + return; +#endif if (footprintGfx != NULL) { diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index 08ad6a0b4e..ac2f58f784 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -539,7 +539,6 @@ static void PrintMonWeight(u16 weight, u8 left, u8 top); static void ResetOtherVideoRegisters(u16); static u8 PrintCryScreenSpeciesName(u8, u16, u8, u8); static void PrintDecimalNum(u8 windowId, u16 num, u8 left, u8 top); -static void DrawFootprint(u8 windowId, u16 species); static u16 CreateMonSpriteFromNationalDexNumberHGSS(u16 nationalNum, s16 x, s16 y, u16 paletteSlot); static u16 CreateSizeScreenTrainerPic(u16, s16, s16, s8); static u16 GetNextPosition(u8, u16, u16, u16); @@ -4645,49 +4644,6 @@ static void UNUSED PrintDecimalNum(u8 windowId, u16 num, u8 left, u8 top) PrintInfoSubMenuText(windowId, str, left, top); } -// The footprints are drawn on WIN_FOOTPRINT, which uses BG palette 15 (loaded with graphics/text_window/message_box.gbapal) -// The footprint pixels are stored as 1BPP, and set to the below color index in this palette when converted to 4BPP. -#define FOOTPRINT_COLOR_IDX 2 - -#define NUM_FOOTPRINT_TILES 4 - -static void DrawFootprint(u8 windowId, u16 species) -{ - u8 ALIGNED(4) footprint4bpp[TILE_SIZE_4BPP * NUM_FOOTPRINT_TILES]; - const u8 *footprintGfx = gSpeciesInfo[SanitizeSpeciesId(species)].footprint; - u32 i, j, tileIdx = 0; - - if (P_FOOTPRINTS == FALSE) - return; - - if (footprintGfx != NULL) - { - for (i = 0; i < TILE_SIZE_1BPP * NUM_FOOTPRINT_TILES; i++) - { - u8 footprint1bpp = footprintGfx[i]; - - // Convert the 8 pixels in the above 1BPP byte to 4BPP. - // Each iteration creates one 4BPP byte (2 pixels), - // so we need 4 iterations to do all 8 pixels. - for (j = 0; j < 4; j++) - { - u8 tile = 0; - if (footprint1bpp & (1 << (2 * j))) - tile |= FOOTPRINT_COLOR_IDX; // Set pixel - if (footprint1bpp & (2 << (2 * j))) - tile |= FOOTPRINT_COLOR_IDX << 4; // Set pixel - footprint4bpp[tileIdx] = tile; - tileIdx++; - } - } - } - else - { - CpuFastFill(0, footprint4bpp, sizeof(footprint4bpp)); - } - CopyToWindowPixelBuffer(windowId, footprint4bpp, sizeof(footprint4bpp), 0); -} - static void PrintInfoSubMenuText(u8 windowId, const u8 *str, u8 left, u8 top) { u8 color[3]; diff --git a/src/pokemon_debug.c b/src/pokemon_debug.c index 16a551dd6a..f34afe278d 100644 --- a/src/pokemon_debug.c +++ b/src/pokemon_debug.c @@ -803,34 +803,6 @@ static void LoadAndCreateEnemyShadowSpriteCustom(struct PokemonDebugMenu *data, gSprites[data->frontShadowSpriteId].invisible = invisible; } -//Tile functions (footprints) -static void DrawFootprintCustom(u8 windowId, u16 species) -{ - u8 footprint[32 * 4] = {0}; - const u8 *footprintGfx = gSpeciesInfo[species].footprint; - u32 i, j, tileIdx = 0; - - if (P_FOOTPRINTS == FALSE) - return; - - if (footprintGfx != NULL) - { - for (i = 0; i < 32; i++) - { - u8 tile = footprintGfx[i]; - for (j = 0; j < 4; j++) - { - u8 value = ((tile >> (2 * j)) & 1 ? 2 : 0); - if (tile & (2 << (2 * j))) - value |= 0x20; - footprint[tileIdx] = value; - tileIdx++; - } - } - } - CopyToWindowPixelBuffer(windowId, footprint, sizeof(footprint), 0); -} - //Battle background functions static void LoadBattleBg(u8 battleBgType, u8 battleTerrain) { @@ -1189,7 +1161,7 @@ void CB2_Debug_Pokemon(void) PrintBattleBgName(taskId); //Footprint - DrawFootprintCustom(WIN_FOOTPRINT, species); + DrawFootprint(WIN_FOOTPRINT, species); CopyWindowToVram(WIN_FOOTPRINT, COPYWIN_GFX); gMain.state++; @@ -1740,7 +1712,7 @@ static void ReloadPokemonSprites(struct PokemonDebugMenu *data) SetArrowInvisibility(data); //Footprint - DrawFootprintCustom(WIN_FOOTPRINT, species); + DrawFootprint(WIN_FOOTPRINT, species); CopyWindowToVram(WIN_FOOTPRINT, COPYWIN_GFX); } From 10b37d9772d24ad1766f5f8d7f3626c8c7d4da77 Mon Sep 17 00:00:00 2001 From: aronson Date: Fri, 5 Jan 2024 02:39:32 -0600 Subject: [PATCH 70/82] Remove --no-warn-rwx-segments from linker flags (#3903) Co-authored-by: DizzyEggg --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ea7adb0e66..d899015225 100644 --- a/Makefile +++ b/Makefile @@ -473,7 +473,7 @@ endif $(OBJ_DIR)/ld_script.ld: $(LD_SCRIPT) $(LD_SCRIPT_DEPS) cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT) > ld_script.ld -LDFLAGS = -Map ../../$(MAP) --no-warn-rwx-segments +LDFLAGS = -Map ../../$(MAP) $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) libagbsyscall @echo "cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ " @cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld --print-memory-usage -o ../../$@ $(OBJS_REL) $(LIB) | cat From f9c21afb757aa4c494cec734e952fb1e0b833aba Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 5 Jan 2024 08:47:28 +0000 Subject: [PATCH 71/82] Dynamic regional dex rating (#3900) --- include/birch_pc.h | 6 +++ src/birch_pc.c | 96 ++++++++++++++++++++-------------------------- src/match_call.c | 84 +--------------------------------------- 3 files changed, 49 insertions(+), 137 deletions(-) create mode 100644 include/birch_pc.h diff --git a/include/birch_pc.h b/include/birch_pc.h new file mode 100644 index 0000000000..5e0e8d9c16 --- /dev/null +++ b/include/birch_pc.h @@ -0,0 +1,6 @@ +#ifndef GUARD_BIRCH_PC_H +#define GUARD_BIRCH_PC_H + +const u8 *GetPokedexRatingText(u16 count); + +#endif // GUARD_BIRCH_PC_H diff --git a/src/birch_pc.c b/src/birch_pc.c index 1f0ab23498..b656dd1de6 100644 --- a/src/birch_pc.c +++ b/src/birch_pc.c @@ -20,66 +20,52 @@ bool16 ScriptGetPokedexInfo(void) return IsNationalPokedexEnabled(); } +// Species in this array are ignored in the progress towards a full regional dex +static const u16 sRegionalNotCountedList[] = { + SPECIES_JIRACHI, + SPECIES_DEOXYS, + SPECIES_NONE +}; + +#define BIRCH_DEX_STRINGS 21 + +static const u8 *const sBirchDexRatingTexts[BIRCH_DEX_STRINGS] = +{ + gBirchDexRatingText_LessThan10, + gBirchDexRatingText_LessThan20, + gBirchDexRatingText_LessThan30, + gBirchDexRatingText_LessThan40, + gBirchDexRatingText_LessThan50, + gBirchDexRatingText_LessThan60, + gBirchDexRatingText_LessThan70, + gBirchDexRatingText_LessThan80, + gBirchDexRatingText_LessThan90, + gBirchDexRatingText_LessThan100, + gBirchDexRatingText_LessThan110, + gBirchDexRatingText_LessThan120, + gBirchDexRatingText_LessThan130, + gBirchDexRatingText_LessThan140, + gBirchDexRatingText_LessThan150, + gBirchDexRatingText_LessThan160, + gBirchDexRatingText_LessThan170, + gBirchDexRatingText_LessThan180, + gBirchDexRatingText_LessThan190, + gBirchDexRatingText_LessThan200, + gBirchDexRatingText_DexCompleted, +}; + // This shows your Hoenn Pokedex rating and not your National Dex. const u8 *GetPokedexRatingText(u16 count) { - if (count < 10) - return gBirchDexRatingText_LessThan10; - if (count < 20) - return gBirchDexRatingText_LessThan20; - if (count < 30) - return gBirchDexRatingText_LessThan30; - if (count < 40) - return gBirchDexRatingText_LessThan40; - if (count < 50) - return gBirchDexRatingText_LessThan50; - if (count < 60) - return gBirchDexRatingText_LessThan60; - if (count < 70) - return gBirchDexRatingText_LessThan70; - if (count < 80) - return gBirchDexRatingText_LessThan80; - if (count < 90) - return gBirchDexRatingText_LessThan90; - if (count < 100) - return gBirchDexRatingText_LessThan100; - if (count < 110) - return gBirchDexRatingText_LessThan110; - if (count < 120) - return gBirchDexRatingText_LessThan120; - if (count < 130) - return gBirchDexRatingText_LessThan130; - if (count < 140) - return gBirchDexRatingText_LessThan140; - if (count < 150) - return gBirchDexRatingText_LessThan150; - if (count < 160) - return gBirchDexRatingText_LessThan160; - if (count < 170) - return gBirchDexRatingText_LessThan170; - if (count < 180) - return gBirchDexRatingText_LessThan180; - if (count < 190) - return gBirchDexRatingText_LessThan190; - if (count < 200) - return gBirchDexRatingText_LessThan200; - if (count == 200) + u32 i; + u16 maxDex = HOENN_DEX_COUNT - 1; + for(i = 0; sRegionalNotCountedList[i] != SPECIES_NONE; i++) { - if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), FLAG_GET_CAUGHT) - || GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), FLAG_GET_CAUGHT)) // Jirachi or Deoxys is not counted towards the dex completion. If either of these flags are enabled, it means the actual count is less than 200. - return gBirchDexRatingText_LessThan200; - return gBirchDexRatingText_DexCompleted; + if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(sRegionalNotCountedList[i]), FLAG_GET_CAUGHT)) + count--; + maxDex--; } - if (count == HOENN_DEX_COUNT - 1) - { - if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), FLAG_GET_CAUGHT) - && GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), FLAG_GET_CAUGHT)) // If both of these flags are enabled, it means the actual count is less than 200. - return gBirchDexRatingText_LessThan200; - return gBirchDexRatingText_DexCompleted; - } - if (count == HOENN_DEX_COUNT) - return gBirchDexRatingText_DexCompleted; - return gBirchDexRatingText_LessThan10; + return sBirchDexRatingTexts[(count * (BIRCH_DEX_STRINGS - 1)) / maxDex]; } void ShowPokedexRatingMessage(void) diff --git a/src/match_call.c b/src/match_call.c index 0c1176486e..2b2e5fc3c3 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -3,6 +3,7 @@ #include "battle.h" #include "battle_setup.h" #include "bg.h" +#include "birch_pc.h" #include "data.h" #include "event_data.h" #include "event_object_movement.h" @@ -1965,90 +1966,10 @@ static u16 GetFrontierStreakInfo(u16 facilityId, u32 *topicTextId) return streak; } -static u8 GetPokedexRatingLevel(u16 numSeen) -{ - if (numSeen < 10) - return 0; - if (numSeen < 20) - return 1; - if (numSeen < 30) - return 2; - if (numSeen < 40) - return 3; - if (numSeen < 50) - return 4; - if (numSeen < 60) - return 5; - if (numSeen < 70) - return 6; - if (numSeen < 80) - return 7; - if (numSeen < 90) - return 8; - if (numSeen < 100) - return 9; - if (numSeen < 110) - return 10; - if (numSeen < 120) - return 11; - if (numSeen < 130) - return 12; - if (numSeen < 140) - return 13; - if (numSeen < 150) - return 14; - if (numSeen < 160) - return 15; - if (numSeen < 170) - return 16; - if (numSeen < 180) - return 17; - if (numSeen < 190) - return 18; - if (numSeen < 200) - return 19; - - if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), FLAG_GET_CAUGHT)) - numSeen--; - if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), FLAG_GET_CAUGHT)) - numSeen--; - - if (numSeen < 200) - return 19; - else - return 20; -} - -static const u8 *const sBirchDexRatingTexts[] = -{ - gBirchDexRatingText_LessThan10, - gBirchDexRatingText_LessThan20, - gBirchDexRatingText_LessThan30, - gBirchDexRatingText_LessThan40, - gBirchDexRatingText_LessThan50, - gBirchDexRatingText_LessThan60, - gBirchDexRatingText_LessThan70, - gBirchDexRatingText_LessThan80, - gBirchDexRatingText_LessThan90, - gBirchDexRatingText_LessThan100, - gBirchDexRatingText_LessThan110, - gBirchDexRatingText_LessThan120, - gBirchDexRatingText_LessThan130, - gBirchDexRatingText_LessThan140, - gBirchDexRatingText_LessThan150, - gBirchDexRatingText_LessThan160, - gBirchDexRatingText_LessThan170, - gBirchDexRatingText_LessThan180, - gBirchDexRatingText_LessThan190, - gBirchDexRatingText_LessThan200, - gBirchDexRatingText_DexCompleted, -}; - void BufferPokedexRatingForMatchCall(u8 *destStr) { int numSeen, numCaught; u8 *str; - u8 dexRatingLevel; u8 *buffer = Alloc(sizeof(gStringVar4)); if (!buffer) @@ -2061,12 +1982,11 @@ void BufferPokedexRatingForMatchCall(u8 *destStr) numCaught = GetHoennPokedexCount(FLAG_GET_CAUGHT); ConvertIntToDecimalStringN(gStringVar1, numSeen, STR_CONV_MODE_LEFT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, numCaught, STR_CONV_MODE_LEFT_ALIGN, 3); - dexRatingLevel = GetPokedexRatingLevel(numCaught); str = StringCopy(buffer, gBirchDexRatingText_AreYouCurious); *(str++) = CHAR_PROMPT_CLEAR; str = StringCopy(str, gBirchDexRatingText_SoYouveSeenAndCaught); *(str++) = CHAR_PROMPT_CLEAR; - StringCopy(str, sBirchDexRatingTexts[dexRatingLevel]); + StringCopy(str, GetPokedexRatingText(numCaught)); str = StringExpandPlaceholders(destStr, buffer); if (IsNationalPokedexEnabled()) From 7b0904c580d1bb9f8e9c4bc212c6fb6176ca36a5 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 5 Jan 2024 11:32:59 +0100 Subject: [PATCH 72/82] Fix extended berry stage palettes --- include/config/overworld.h | 2 +- .../berry_tree_graphics_tables.h | 90 +++++++++---------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/include/config/overworld.h b/include/config/overworld.h index 1399d87648..c19ceeac7b 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -24,7 +24,7 @@ #define OW_BERRY_MULCH_USAGE FALSE // If enabled, Mulch can be used on soil to fertilize it. Otherwise, it is considered unusable. Note that moisture effects only work with OW_BERRY_MOISTURE enabled! #define OW_BERRY_WEEDS FALSE // If enabled, weeds may grow on Berry plants that the player needs to take care of. Without OW_BERRY_MOISTURE, weeding bonuses are rounded down. #define OW_BERRY_PESTS FALSE // If enabled, pests may approach Berry plants that the player needs to take care of. Without OW_BERRY_MOISTURE, pest bonuses are rounded down. -#define OW_BERRY_SIX_STAGES TRUE // In XY, Berries go through six stages instead of four. This toggle does not affect the time it takes for a tree to be ready for harvest. Without OW_BERRY_MOISTURE, the two extra stages count as BERRY_STAGE_TALLER for watering purposes. +#define OW_BERRY_SIX_STAGES FALSE // In XY, Berries go through six stages instead of four. This toggle does not affect the time it takes for a tree to be ready for harvest. Without OW_BERRY_MOISTURE, the two extra stages count as BERRY_STAGE_TALLER for watering purposes. #define OW_BERRY_GROWTH_RATE GEN_3 // Presets for how long each Berry plant takes to grow. #define OW_BERRY_YIELD_RATE GEN_3 // Presets for how many Berries each plant can yield. diff --git a/src/data/object_events/berry_tree_graphics_tables.h b/src/data/object_events/berry_tree_graphics_tables.h index 585c2ddb16..d2127199fd 100755 --- a/src/data/object_events/berry_tree_graphics_tables.h +++ b/src/data/object_events/berry_tree_graphics_tables.h @@ -10,7 +10,7 @@ static const struct SpriteFrameImage sPicTable_CheriBerryTree[] = { overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_ChestoBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -24,7 +24,7 @@ static const struct SpriteFrameImage sPicTable_ChestoBerryTree[] = { overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; +const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2, 2, 2}; static const struct SpriteFrameImage sPicTable_PechaBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -38,7 +38,7 @@ static const struct SpriteFrameImage sPicTable_PechaBerryTree[] = { overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_RawstBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -52,7 +52,7 @@ static const struct SpriteFrameImage sPicTable_RawstBerryTree[] = { overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_AspearBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -66,7 +66,7 @@ static const struct SpriteFrameImage sPicTable_AspearBerryTree[] = { overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; +const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3, 3, 3}; static const struct SpriteFrameImage sPicTable_LeppaBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -80,7 +80,7 @@ static const struct SpriteFrameImage sPicTable_LeppaBerryTree[] = { overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; +const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3, 3, 3}; static const struct SpriteFrameImage sPicTable_OranBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -94,7 +94,7 @@ static const struct SpriteFrameImage sPicTable_OranBerryTree[] = { overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; +const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2, 2, 2}; static const struct SpriteFrameImage sPicTable_PersimBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -108,7 +108,7 @@ static const struct SpriteFrameImage sPicTable_PersimBerryTree[] = { overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; +const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2, 2, 2}; static const struct SpriteFrameImage sPicTable_LumBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -122,7 +122,7 @@ static const struct SpriteFrameImage sPicTable_LumBerryTree[] = { overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_SitrusBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -136,7 +136,7 @@ static const struct SpriteFrameImage sPicTable_SitrusBerryTree[] = { overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_FigyBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -150,7 +150,7 @@ static const struct SpriteFrameImage sPicTable_FigyBerryTree[] = { overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; +const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3, 3, 3}; static const struct SpriteFrameImage sPicTable_WikiBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -164,7 +164,7 @@ static const struct SpriteFrameImage sPicTable_WikiBerryTree[] = { overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; +const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3, 3, 3}; static const struct SpriteFrameImage sPicTable_MagoBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -178,7 +178,7 @@ static const struct SpriteFrameImage sPicTable_MagoBerryTree[] = { overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; +const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3, 3, 3}; static const struct SpriteFrameImage sPicTable_AguavBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -192,7 +192,7 @@ static const struct SpriteFrameImage sPicTable_AguavBerryTree[] = { overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_IapapaBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -206,7 +206,7 @@ static const struct SpriteFrameImage sPicTable_IapapaBerryTree[] = { overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; +const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3, 3, 3}; static const struct SpriteFrameImage sPicTable_RazzBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -220,7 +220,7 @@ static const struct SpriteFrameImage sPicTable_RazzBerryTree[] = { overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_WepearBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -234,7 +234,7 @@ static const struct SpriteFrameImage sPicTable_WepearBerryTree[] = { overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; +const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2, 2, 2}; static const struct SpriteFrameImage sPicTable_PomegBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -248,7 +248,7 @@ static const struct SpriteFrameImage sPicTable_PomegBerryTree[] = { overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; +const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3, 3, 3}; static const struct SpriteFrameImage sPicTable_KelpsyBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -262,7 +262,7 @@ static const struct SpriteFrameImage sPicTable_KelpsyBerryTree[] = { overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; +const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2, 2, 2}; static const struct SpriteFrameImage sPicTable_HondewBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -276,7 +276,7 @@ static const struct SpriteFrameImage sPicTable_HondewBerryTree[] = { overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; +const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5, 5, 5}; static const struct SpriteFrameImage sPicTable_GrepaBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -290,7 +290,7 @@ static const struct SpriteFrameImage sPicTable_GrepaBerryTree[] = { overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; +const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3, 3, 3}; static const struct SpriteFrameImage sPicTable_TamatoBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -304,7 +304,7 @@ static const struct SpriteFrameImage sPicTable_TamatoBerryTree[] = { overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; +const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2, 2, 2}; static const struct SpriteFrameImage sPicTable_CornnBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -318,7 +318,7 @@ static const struct SpriteFrameImage sPicTable_CornnBerryTree[] = { overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; +const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2, 2, 2}; static const struct SpriteFrameImage sPicTable_RabutaBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -332,7 +332,7 @@ static const struct SpriteFrameImage sPicTable_RabutaBerryTree[] = { overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_NomelBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -346,7 +346,7 @@ static const struct SpriteFrameImage sPicTable_NomelBerryTree[] = { overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; +const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3, 3, 3}; static const struct SpriteFrameImage sPicTable_SpelonBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -360,7 +360,7 @@ static const struct SpriteFrameImage sPicTable_SpelonBerryTree[] = { overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; +const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3, 3, 3}; static const struct SpriteFrameImage sPicTable_PamtreBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -374,7 +374,7 @@ static const struct SpriteFrameImage sPicTable_PamtreBerryTree[] = { overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; +const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2, 2, 2}; static const struct SpriteFrameImage sPicTable_DurinBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -388,7 +388,7 @@ static const struct SpriteFrameImage sPicTable_DurinBerryTree[] = { overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_OccaBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -402,7 +402,7 @@ static const struct SpriteFrameImage sPicTable_OccaBerryTree[] = { overworld_frame(gObjectEventPic_OccaBerryTree, 2, 4, 5) }; -const u8 gBerryTreePaletteSlotTable_Occa[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Occa[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_YacheBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -416,7 +416,7 @@ static const struct SpriteFrameImage sPicTable_YacheBerryTree[] = { overworld_frame(gObjectEventPic_YacheBerryTree, 2, 4, 5) }; -const u8 gBerryTreePaletteSlotTable_Yache[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Yache[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_ChopleBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -430,7 +430,7 @@ static const struct SpriteFrameImage sPicTable_ChopleBerryTree[] = { overworld_frame(gObjectEventPic_ChopleBerryTree, 2, 4, 5) }; -const u8 gBerryTreePaletteSlotTable_Chople[] = {3, 4, 3, 3, 3}; +const u8 gBerryTreePaletteSlotTable_Chople[] = {3, 4, 3, 3, 3, 3, 3}; static const struct SpriteFrameImage sPicTable_KebiaBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -444,7 +444,7 @@ static const struct SpriteFrameImage sPicTable_KebiaBerryTree[] = { overworld_frame(gObjectEventPic_KebiaBerryTree, 2, 4, 5) }; -const u8 gBerryTreePaletteSlotTable_Kebia[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Kebia[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_ShucaBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -458,7 +458,7 @@ static const struct SpriteFrameImage sPicTable_ShucaBerryTree[] = { overworld_frame(gObjectEventPic_ShucaBerryTree, 2, 4, 5) }; -const u8 gBerryTreePaletteSlotTable_Shuca[] = {3, 4, 5, 5, 5}; +const u8 gBerryTreePaletteSlotTable_Shuca[] = {3, 4, 5, 5, 5, 5, 5}; static const struct SpriteFrameImage sPicTable_PayapaBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -472,7 +472,7 @@ static const struct SpriteFrameImage sPicTable_PayapaBerryTree[] = { overworld_frame(gObjectEventPic_PayapaBerryTree, 2, 4, 5) }; -const u8 gBerryTreePaletteSlotTable_Payapa[] = {3, 4, 5, 5, 5}; +const u8 gBerryTreePaletteSlotTable_Payapa[] = {3, 4, 5, 5, 5, 5, 5}; static const struct SpriteFrameImage sPicTable_TangaBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -486,7 +486,7 @@ static const struct SpriteFrameImage sPicTable_TangaBerryTree[] = { overworld_frame(gObjectEventPic_TangaBerryTree, 2, 4, 5) }; -const u8 gBerryTreePaletteSlotTable_Tanga[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Tanga[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_KasibBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -500,7 +500,7 @@ static const struct SpriteFrameImage sPicTable_KasibBerryTree[] = { overworld_frame(gObjectEventPic_KasibBerryTree, 2, 4, 5) }; -const u8 gBerryTreePaletteSlotTable_Kasib[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Kasib[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_HabanBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -514,7 +514,7 @@ static const struct SpriteFrameImage sPicTable_HabanBerryTree[] = { overworld_frame(gObjectEventPic_HabanBerryTree, 2, 4, 5) }; -const u8 gBerryTreePaletteSlotTable_Haban[] = {3, 4, 3, 3, 3}; +const u8 gBerryTreePaletteSlotTable_Haban[] = {3, 4, 3, 3, 3, 3, 3}; static const struct SpriteFrameImage sPicTable_ColburBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -528,7 +528,7 @@ static const struct SpriteFrameImage sPicTable_ColburBerryTree[] = { overworld_frame(gObjectEventPic_ColburBerryTree, 2, 4, 5) }; -const u8 gBerryTreePaletteSlotTable_Colbur[] = {3, 4, 5, 5, 5}; +const u8 gBerryTreePaletteSlotTable_Colbur[] = {3, 4, 5, 5, 5, 5, 5}; static const struct SpriteFrameImage sPicTable_RoseliBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -542,7 +542,7 @@ static const struct SpriteFrameImage sPicTable_RoseliBerryTree[] = { overworld_frame(gObjectEventPic_RoseliBerryTree, 2, 4, 5) }; -const u8 gBerryTreePaletteSlotTable_Roseli[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Roseli[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_LiechiBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -556,7 +556,7 @@ static const struct SpriteFrameImage sPicTable_LiechiBerryTree[] = { overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4, 4, 4}; static const struct SpriteFrameImage sPicTable_LansatBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -570,7 +570,7 @@ static const struct SpriteFrameImage sPicTable_LansatBerryTree[] = { overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; +const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2, 2, 2}; const struct SpriteFrameImage sPicTable_MicleBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -584,7 +584,7 @@ const struct SpriteFrameImage sPicTable_MicleBerryTree[] = { overworld_frame(gObjectEventPic_MicleBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Micle[] = {3, 4, 4, 4, 4}; +const u8 gBerryTreePaletteSlotTable_Micle[] = {3, 4, 4, 4, 4, 4, 4}; const struct SpriteFrameImage sPicTable_CustapBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -598,7 +598,7 @@ const struct SpriteFrameImage sPicTable_CustapBerryTree[] = { overworld_frame(gObjectEventPic_CustapBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Custap[] = {3, 4, 5, 5, 5}; +const u8 gBerryTreePaletteSlotTable_Custap[] = {3, 4, 5, 5, 5, 5, 5}; const struct SpriteFrameImage sPicTable_JabocaBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -612,7 +612,7 @@ const struct SpriteFrameImage sPicTable_JabocaBerryTree[] = { overworld_frame(gObjectEventPic_JabocaBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Jaboca[] = {3, 4, 5, 5, 5}; +const u8 gBerryTreePaletteSlotTable_Jaboca[] = {3, 4, 5, 5, 5, 5, 5}; const struct SpriteFrameImage sPicTable_RowapBerryTree[] = { overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), @@ -626,7 +626,7 @@ const struct SpriteFrameImage sPicTable_RowapBerryTree[] = { overworld_frame(gObjectEventPic_RowapBerryTree, 2, 4, 5), }; -const u8 gBerryTreePaletteSlotTable_Rowap[] = {3, 4, 5, 5, 5}; +const u8 gBerryTreePaletteSlotTable_Rowap[] = {3, 4, 5, 5, 5, 5, 5}; const u8 gDeadBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES}; From 48c26f7802ccf4c234eead4fc0c633dc369740d5 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 5 Jan 2024 12:36:28 +0000 Subject: [PATCH 73/82] Update README.md (#3929) Add Dynamic Multichoice to upcoming readme Co-authored-by: DizzyEggg --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5117bf22ed..61d5cadd24 100644 --- a/README.md +++ b/README.md @@ -140,6 +140,7 @@ Based off RHH's pokeemerald-expansion v1.7.1 https://github.com/rh-hideout/pokee - *Support for new evolution methods*. - *Dark Mode*. - [Nature Colors](https://github.com/DizzyEggg/pokeemerald/tree/nature_color) in summary screen by @DizzyEggg + - [Dynamic Multichoice](https://github.com/SBird1337/pokeemerald/tree/feature/dynmulti) by @SBird1337 - ***Other features*** - Pressing B while holding a Pokémon drops them like in modern games (configurable). - Running indoors (configurable). From 9c07718a051da65598b2136fecaea01928c41317 Mon Sep 17 00:00:00 2001 From: Gabriel Cowley Date: Fri, 5 Jan 2024 14:30:25 +0000 Subject: [PATCH 74/82] Fix debug action SelectShiny tInput value toggle (#3930) --- src/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/debug.c b/src/debug.c index 420f7191ad..fd176d0251 100644 --- a/src/debug.c +++ b/src/debug.c @@ -3279,7 +3279,7 @@ static void DebugAction_Give_Pokemon_SelectShiny(u8 taskId) if (JOY_NEW(DPAD_ANY)) { PlaySE(SE_SELECT); - gTasks[taskId].tInput ^= JOY_NEW(DPAD_UP | DPAD_DOWN); + gTasks[taskId].tInput ^= JOY_NEW(DPAD_UP | DPAD_DOWN) > 0; txtStr = (gTasks[taskId].tInput == TRUE) ? sDebugText_True : sDebugText_False; StringCopyPadded(gStringVar2, txtStr, CHAR_SPACE, 15); ConvertIntToDecimalStringN(gStringVar3, gTasks[taskId].tInput, STR_CONV_MODE_LEADING_ZEROS, 0); From dbad66ee1b16d3d54b5f9a53e6f0b61d8fc05aa7 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 5 Jan 2024 12:09:39 -0300 Subject: [PATCH 75/82] Applied a number of changes to the debug menu (#3926) * Renamed the Party/Boxes section of the debug menu to just Party Misc: -Relabeled the enums containing the constants for the different features in each main section of the menu. -The reason why is that "enum PartyMenu" was throwing a compiler error for whatever reason, so I renamed the other labels to keep them consistent with it. * Renamed the debug menu's 'Fill PC/Pockets' to 'PC/Bag' * Moved PC/Bar higher in the debug menu's list * Added a debug feature to clear the bag * Moved 'Access PC' and 'Clear Boxes' to PC/Bag * Relocated the GivePCBagDebugMenu enum * Packed the debug menu's 'Fill' options into a PC/Bag category of their own And reupdated a lot of labels that I previously renamed. I shouldn't have removed the "Fill" in them when I renamed PC/Pockets to PC/Bag.. * Fixed alignment in sDebugMenu_Items_Utilities * Shuffled the positions of the debug menu's 'Access PC' and 'Clear Bag' * Made the B button take you back to PC/Bag from Fill, instead of taking you to the main debug menu * Updated alignment in sDebugMenu_Items_Utilities again --------- Co-authored-by: DizzyEggg --- src/debug.c | 398 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 230 insertions(+), 168 deletions(-) diff --git a/src/debug.c b/src/debug.c index fd176d0251..023b032384 100644 --- a/src/debug.c +++ b/src/debug.c @@ -73,17 +73,17 @@ enum DebugMenu { DEBUG_MENU_ITEM_UTILITIES, - DEBUG_MENU_ITEM_PARTY_BOXES, + DEBUG_MENU_ITEM_PCBAG, + DEBUG_MENU_ITEM_PARTY, DEBUG_MENU_ITEM_GIVE, DEBUG_MENU_ITEM_SCRIPTS, DEBUG_MENU_ITEM_FLAGVAR, - DEBUG_MENU_ITEM_FILL, //DEBUG_MENU_ITEM_BATTLE, DEBUG_MENU_ITEM_SOUND, DEBUG_MENU_ITEM_CANCEL, }; -enum UtilMenu +enum UtilDebugMenu { DEBUG_UTIL_MENU_ITEM_FLY, DEBUG_UTIL_MENU_ITEM_WARP, @@ -101,17 +101,35 @@ enum UtilMenu DEBUG_UTIL_MENU_ITEM_BERRY_FUNCTIONS, }; -enum PartyBoxesMenu +enum GivePCBagDebugMenu { - DEBUG_PARTY_BOXES_MENU_ITEM_ACCESS_PC, - DEBUG_PARTY_BOXES_MENU_ITEM_MOVE_REMINDER, - DEBUG_PARTY_BOXES_MENU_ITEM_HATCH_AN_EGG, - DEBUG_PARTY_BOXES_MENU_ITEM_HEAL_PARTY, - DEBUG_PARTY_BOXES_MENU_ITEM_POISON_MONS, - DEBUG_PARTY_BOXES_MENU_ITEM_CLEAR_BOXES, + DEBUG_PCBAG_MENU_ITEM_FILL, + DEBUG_PCBAG_MENU_ITEM_ACCESS_PC, + DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG, + DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES, }; -enum ScriptMenu +enum GivePCBagFillDebugMenu +{ + DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_FAST, + DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_SLOW, + DEBUG_PCBAG_MENU_ITEM_FILL_PC_ITEMS, + DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_ITEMS, + DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BALLS, + DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_TMHM, + DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BERRIES, + DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_KEY_ITEMS, +}; + +enum PartyDebugMenu +{ + DEBUG_PARTY_MENU_ITEM_MOVE_REMINDER, + DEBUG_PARTY_MENU_ITEM_HATCH_AN_EGG, + DEBUG_PARTY_MENU_ITEM_HEAL_PARTY, + DEBUG_PARTY_MENU_ITEM_POISON_MONS, +}; + +enum ScriptDebugMenu { DEBUG_UTIL_MENU_ITEM_SCRIPT_1, DEBUG_UTIL_MENU_ITEM_SCRIPT_2, @@ -123,7 +141,7 @@ enum ScriptMenu DEBUG_UTIL_MENU_ITEM_SCRIPT_8, }; -enum FlagsVarsMenu +enum FlagsVarsDebugMenu { DEBUG_FLAGVAR_MENU_ITEM_FLAGS, DEBUG_FLAGVAR_MENU_ITEM_VARS, @@ -190,7 +208,7 @@ enum BattleTerrain DEBUG_BATTLE_2_MENU_ITEM_TERRAIN_9, }; -enum GiveMenu +enum GiveDebugMenu { DEBUG_GIVE_MENU_ITEM_ITEM_X, DEBUG_GIVE_MENU_ITEM_ALLTMS, @@ -202,19 +220,7 @@ enum GiveMenu DEBUG_GIVE_MENU_ITEM_DAYCARE_EGG, }; -enum GiveFillMenu -{ - DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST, - DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW, - DEBUG_FILL_MENU_ITEM_PC_ITEMS, - DEBUG_FILL_MENU_ITEM_POCKET_ITEMS, - DEBUG_FILL_MENU_ITEM_POCKET_BALLS, - DEBUG_FILL_MENU_ITEM_POCKET_TMHM, - DEBUG_FILL_MENU_ITEM_POCKET_BERRIES, - DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS, -}; - -enum SoundMenu +enum SoundDebugMenu { DEBUG_SOUND_MENU_ITEM_SE, DEBUG_SOUND_MENU_ITEM_MUS, @@ -329,21 +335,22 @@ static void DebugAction_Util_Script_7(u8 taskId); static void DebugAction_Util_Script_8(u8 taskId); static void DebugAction_OpenUtilitiesMenu(u8 taskId); -static void DebugAction_OpenPartyBoxesMenu(u8 taskId); +static void DebugAction_OpenPCBagMenu(u8 taskId); +static void DebugAction_OpenPartyMenu(u8 taskId); static void DebugAction_OpenScriptsMenu(u8 taskId); static void DebugAction_OpenFlagsVarsMenu(u8 taskId); static void DebugAction_OpenGiveMenu(u8 taskId); -static void DebugAction_OpenFillMenu(u8 taskId); static void DebugAction_OpenSoundMenu(u8 taskId); static void DebugTask_HandleMenuInput_Main(u8 taskId); static void DebugTask_HandleMenuInput_Utilities(u8 taskId); -static void DebugTask_HandleMenuInput_PartyBoxes(u8 taskId); +static void DebugTask_HandleMenuInput_PCBag(u8 taskId); +static void DebugTask_HandleMenuInput_PCBag_Fill(u8 taskId); +static void DebugTask_HandleMenuInput_Party(u8 taskId); static void DebugTask_HandleMenuInput_Scripts(u8 taskId); static void DebugTask_HandleMenuInput_FlagsVars(u8 taskId); static void DebugTask_HandleMenuInput_Battle(u8 taskId); static void DebugTask_HandleMenuInput_Give(u8 taskId); -static void DebugTask_HandleMenuInput_Fill(u8 taskId); static void DebugTask_HandleMenuInput_Sound(u8 taskId); static void DebugTask_HandleMenuInput_BerryFunctions(u8 taskId); @@ -366,12 +373,23 @@ static void DebugAction_Util_CheatStart(u8 taskId); static void DebugAction_Util_ExpansionVersion(u8 taskId); static void DebugAction_Util_BerryFunctions(u8 taskId); -static void DebugAction_PartyBoxes_AccessPC(u8 taskId); -static void DebugAction_PartyBoxes_MoveReminder(u8 taskId); -static void DebugAction_PartyBoxes_HatchAnEgg(u8 taskId); -static void DebugAction_PartyBoxes_HealParty(u8 taskId); -static void DebugAction_PartyBoxes_PoisonMons(u8 taskId); -static void DebugAction_PartyBoxes_ClearBoxes(u8 taskId); +static void DebugAction_OpenPCBagFillMenu(u8 taskId); +static void DebugAction_PCBag_Fill_PCBoxes_Fast(u8 taskId); +static void DebugAction_PCBag_Fill_PCBoxes_Slow(u8 taskId); +static void DebugAction_PCBag_Fill_PCItemStorage(u8 taskId); +static void DebugAction_PCBag_Fill_PocketItems(u8 taskId); +static void DebugAction_PCBag_Fill_PocketPokeBalls(u8 taskId); +static void DebugAction_PCBag_Fill_PocketTMHM(u8 taskId); +static void DebugAction_PCBag_Fill_PocketBerries(u8 taskId); +static void DebugAction_PCBag_Fill_PocketKeyItems(u8 taskId); +static void DebugAction_PCBag_AccessPC(u8 taskId); +static void DebugAction_PCBag_ClearBag(u8 taskId); +static void DebugAction_PCBag_ClearBoxes(u8 taskId); + +static void DebugAction_Party_MoveReminder(u8 taskId); +static void DebugAction_Party_HatchAnEgg(u8 taskId); +static void DebugAction_Party_HealParty(u8 taskId); +static void DebugAction_Party_PoisonMons(u8 taskId); static void DebugAction_FlagsVars_Flags(u8 taskId); static void DebugAction_FlagsVars_FlagsSelect(u8 taskId); @@ -416,15 +434,6 @@ static void DebugAction_Give_MaxCoins(u8 taskId); static void DebugAction_Give_MaxBattlePoints(u8 taskId); static void DebugAction_Give_DayCareEgg(u8 taskId); -static void DebugAction_Fill_PCBoxes_Fast(u8 taskId); -static void DebugAction_Fill_PCBoxes_Slow(u8 taskId); -static void DebugAction_Fill_PCItemStorage(u8 taskId); -static void DebugAction_Fill_PocketItems(u8 taskId); -static void DebugAction_Fill_PocketPokeBalls(u8 taskId); -static void DebugAction_Fill_PocketTMHM(u8 taskId); -static void DebugAction_Fill_PocketBerries(u8 taskId); -static void DebugAction_Fill_PocketKeyItems(u8 taskId); - static void DebugAction_Sound_SE(u8 taskId); static void DebugAction_Sound_SE_SelectId(u8 taskId); static void DebugAction_Sound_MUS(u8 taskId); @@ -479,12 +488,12 @@ static const u8 sDebugText_Empty[] = _(""); static const u8 sDebugText_Continue[] = _("Continue…{CLEAR_TO 110}{RIGHT_ARROW}"); // Main Menu static const u8 sDebugText_Utilities[] = _("Utilities…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_PartyBoxes[] = _("Party/Boxes…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_PCBag[] = _("PC/Bag…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_Party[] = _("Party…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Scripts[] = _("Scripts…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_FlagsVars[] = _("Flags & Vars…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Battle[] = _("Battle Test{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Give[] = _("Give X…{CLEAR_TO 110}{RIGHT_ARROW}"); -static const u8 sDebugText_Fill[] = _("Fill PC/Pockets…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Sound[] = _("Sound…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Cancel[] = _("Cancel"); // Script menu @@ -516,13 +525,24 @@ static const u8 sDebugText_Util_Player_Id[] = _("New Trainer ID") static const u8 sDebugText_Util_CheatStart[] = _("Cheat start"); static const u8 sDebugText_Util_ExpansionVersion[] = _("Expansion Version"); static const u8 sDebugText_Util_BerryFunctions[] = _("Berry Functions…{CLEAR_TO 110}{RIGHT_ARROW}"); +// PC/Bag Menu +static const u8 sDebugText_PCBag_Fill[] = _("Fill…{CLEAR_TO 110}{RIGHT_ARROW}"); +static const u8 sDebugText_PCBag_Fill_Pc_Fast[] = _("Fill PC Boxes Fast"); +static const u8 sDebugText_PCBag_Fill_Pc_Slow[] = _("Fill PC Boxes Slow (LAG!)"); +static const u8 sDebugText_PCBag_Fill_Pc_Items[] = _("Fill PC Items"); +static const u8 sDebugText_PCBag_Fill_PocketItems[] = _("Fill Pocket Items"); +static const u8 sDebugText_PCBag_Fill_PocketPokeBalls[] = _("Fill Pocket Poké Balls"); +static const u8 sDebugText_PCBag_Fill_PocketTMHM[] = _("Fill Pocket TMHM"); +static const u8 sDebugText_PCBag_Fill_PocketBerries[] = _("Fill Pocket Berries"); +static const u8 sDebugText_PCBag_Fill_PocketKeyItems[] = _("Fill Pocket Key Items"); +static const u8 sDebugText_PCBag_AccessPC[] = _("Access PC"); +static const u8 sDebugText_PCBag_ClearBag[] = _("Clear Bag"); +static const u8 sDebugText_PCBag_ClearBoxes[] = _("Clear Storage Boxes"); // Party/Boxes Menu -static const u8 sDebugText_PartyBoxes_AccessPC[] = _("Access PC"); -static const u8 sDebugText_PartyBoxes_MoveReminder[] = _("Move Reminder"); -static const u8 sDebugText_PartyBoxes_HatchAnEgg[] = _("Hatch an Egg"); -static const u8 sDebugText_PartyBoxes_HealParty[] = _("Heal party"); -static const u8 sDebugText_PartyBoxes_PoisonParty[] = _("Poison party"); -static const u8 sDebugText_PartyBoxes_ClearBoxes[] = _("Clear Storage Boxes"); +static const u8 sDebugText_Party_MoveReminder[] = _("Move Reminder"); +static const u8 sDebugText_Party_HatchAnEgg[] = _("Hatch an Egg"); +static const u8 sDebugText_Party_HealParty[] = _("Heal party"); +static const u8 sDebugText_Party_PoisonParty[] = _("Poison party"); // Flags/Vars Menu static const u8 sDebugText_FlagsVars_Flags[] = _("Set Flag XYZ…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_FlagsVars_Flag[] = _("Flag: {STR_VAR_1}{CLEAR_TO 90}\n{STR_VAR_2}{CLEAR_TO 90}\n{STR_VAR_3}"); @@ -614,15 +634,6 @@ static const u8 sDebugText_Give_MaxMoney[] = _("Max Money"); static const u8 sDebugText_Give_MaxCoins[] = _("Max Coins"); static const u8 sDebugText_Give_BattlePoints[] = _("Max Battle Points"); static const u8 sDebugText_Give_DaycareEgg[] = _("Daycare Egg"); -// Fill Menu -static const u8 sDebugText_Fill_Pc_Fast[] = _("Fill PC Boxes Fast"); -static const u8 sDebugText_Fill_Pc_Slow[] = _("Fill PC Boxes Slow (LAG!)"); -static const u8 sDebugText_Fill_Pc_Items[] = _("Fill PC Items"); -static const u8 sDebugText_Fill_PocketItems[] = _("Fill Pocket Items"); -static const u8 sDebugText_Fill_PocketPokeBalls[] = _("Fill Pocket Poké Balls"); -static const u8 sDebugText_Fill_PocketTMHM[] = _("Fill Pocket TMHM"); -static const u8 sDebugText_Fill_PocketBerries[] = _("Fill Pocket Berries"); -static const u8 sDebugText_Fill_PocketKeyItems[] = _("Fill Pocket Key Items"); // Sound Menu static const u8 sDebugText_Sound_SFX[] = _("SFX…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Sound_SFX_ID[] = _("SFX ID: {STR_VAR_3} {START_BUTTON} Stop\n{STR_VAR_1} \n{STR_VAR_2}"); @@ -674,11 +685,11 @@ static const s32 sPowersOfTen[] = static const struct ListMenuItem sDebugMenu_Items_Main[] = { [DEBUG_MENU_ITEM_UTILITIES] = {sDebugText_Utilities, DEBUG_MENU_ITEM_UTILITIES}, - [DEBUG_MENU_ITEM_PARTY_BOXES] = {sDebugText_PartyBoxes, DEBUG_MENU_ITEM_PARTY_BOXES}, + [DEBUG_MENU_ITEM_PCBAG] = {sDebugText_PCBag, DEBUG_MENU_ITEM_PCBAG}, + [DEBUG_MENU_ITEM_PARTY] = {sDebugText_Party, DEBUG_MENU_ITEM_PARTY}, [DEBUG_MENU_ITEM_GIVE] = {sDebugText_Give, DEBUG_MENU_ITEM_GIVE}, [DEBUG_MENU_ITEM_SCRIPTS] = {sDebugText_Scripts, DEBUG_MENU_ITEM_SCRIPTS}, [DEBUG_MENU_ITEM_FLAGVAR] = {sDebugText_FlagsVars, DEBUG_MENU_ITEM_FLAGVAR}, - [DEBUG_MENU_ITEM_FILL] = {sDebugText_Fill, DEBUG_MENU_ITEM_FILL}, //[DEBUG_MENU_ITEM_BATTLE] = {sDebugText_Battle, DEBUG_MENU_ITEM_BATTLE}, [DEBUG_MENU_ITEM_SOUND] = {sDebugText_Sound, DEBUG_MENU_ITEM_SOUND}, [DEBUG_MENU_ITEM_CANCEL] = {sDebugText_Cancel, DEBUG_MENU_ITEM_CANCEL}, @@ -702,14 +713,32 @@ static const struct ListMenuItem sDebugMenu_Items_Utilities[] = [DEBUG_UTIL_MENU_ITEM_BERRY_FUNCTIONS] = {sDebugText_Util_BerryFunctions, DEBUG_UTIL_MENU_ITEM_BERRY_FUNCTIONS}, }; -static const struct ListMenuItem sDebugMenu_Items_PartyBoxes[] = +static const struct ListMenuItem sDebugMenu_Items_PCBag[] = { - [DEBUG_PARTY_BOXES_MENU_ITEM_ACCESS_PC] = {sDebugText_PartyBoxes_AccessPC, DEBUG_PARTY_BOXES_MENU_ITEM_ACCESS_PC}, - [DEBUG_PARTY_BOXES_MENU_ITEM_MOVE_REMINDER] = {sDebugText_PartyBoxes_MoveReminder, DEBUG_PARTY_BOXES_MENU_ITEM_MOVE_REMINDER}, - [DEBUG_PARTY_BOXES_MENU_ITEM_HATCH_AN_EGG] = {sDebugText_PartyBoxes_HatchAnEgg, DEBUG_PARTY_BOXES_MENU_ITEM_HATCH_AN_EGG}, - [DEBUG_PARTY_BOXES_MENU_ITEM_HEAL_PARTY] = {sDebugText_PartyBoxes_HealParty, DEBUG_PARTY_BOXES_MENU_ITEM_HEAL_PARTY}, - [DEBUG_PARTY_BOXES_MENU_ITEM_POISON_MONS] = {sDebugText_PartyBoxes_PoisonParty, DEBUG_PARTY_BOXES_MENU_ITEM_POISON_MONS}, - [DEBUG_PARTY_BOXES_MENU_ITEM_CLEAR_BOXES] = {sDebugText_PartyBoxes_ClearBoxes, DEBUG_PARTY_BOXES_MENU_ITEM_CLEAR_BOXES}, + [DEBUG_PCBAG_MENU_ITEM_FILL] = {sDebugText_PCBag_Fill, DEBUG_PCBAG_MENU_ITEM_FILL}, + [DEBUG_PCBAG_MENU_ITEM_ACCESS_PC] = {sDebugText_PCBag_AccessPC, DEBUG_PCBAG_MENU_ITEM_ACCESS_PC}, + [DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = {sDebugText_PCBag_ClearBag, DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG}, + [DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES] = {sDebugText_PCBag_ClearBoxes, DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES}, +}; + +static const struct ListMenuItem sDebugMenu_Items_PCBag_Fill[] = +{ + [DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_FAST] = {sDebugText_PCBag_Fill_Pc_Fast, DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_FAST}, + [DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_SLOW] = {sDebugText_PCBag_Fill_Pc_Slow, DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_SLOW}, + [DEBUG_PCBAG_MENU_ITEM_FILL_PC_ITEMS] = {sDebugText_PCBag_Fill_Pc_Items , DEBUG_PCBAG_MENU_ITEM_FILL_PC_ITEMS}, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_ITEMS] = {sDebugText_PCBag_Fill_PocketItems, DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_ITEMS}, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BALLS] = {sDebugText_PCBag_Fill_PocketPokeBalls, DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BALLS}, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_TMHM] = {sDebugText_PCBag_Fill_PocketTMHM, DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_TMHM}, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BERRIES] = {sDebugText_PCBag_Fill_PocketBerries, DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BERRIES}, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_KEY_ITEMS] = {sDebugText_PCBag_Fill_PocketKeyItems, DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_KEY_ITEMS}, +}; + +static const struct ListMenuItem sDebugMenu_Items_Party[] = +{ + [DEBUG_PARTY_MENU_ITEM_MOVE_REMINDER] = {sDebugText_Party_MoveReminder, DEBUG_PARTY_MENU_ITEM_MOVE_REMINDER}, + [DEBUG_PARTY_MENU_ITEM_HATCH_AN_EGG] = {sDebugText_Party_HatchAnEgg, DEBUG_PARTY_MENU_ITEM_HATCH_AN_EGG}, + [DEBUG_PARTY_MENU_ITEM_HEAL_PARTY] = {sDebugText_Party_HealParty, DEBUG_PARTY_MENU_ITEM_HEAL_PARTY}, + [DEBUG_PARTY_MENU_ITEM_POISON_MONS] = {sDebugText_Party_PoisonParty, DEBUG_PARTY_MENU_ITEM_POISON_MONS}, }; static const struct ListMenuItem sDebugMenu_Items_Scripts[] = @@ -803,18 +832,6 @@ static const struct ListMenuItem sDebugMenu_Items_Give[] = [DEBUG_GIVE_MENU_ITEM_DAYCARE_EGG] = {sDebugText_Give_DaycareEgg, DEBUG_GIVE_MENU_ITEM_DAYCARE_EGG}, }; -static const struct ListMenuItem sDebugMenu_Items_Fill[] = -{ - [DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST] = {sDebugText_Fill_Pc_Fast, DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST}, - [DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW] = {sDebugText_Fill_Pc_Slow, DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW}, - [DEBUG_FILL_MENU_ITEM_PC_ITEMS] = {sDebugText_Fill_Pc_Items , DEBUG_FILL_MENU_ITEM_PC_ITEMS}, - [DEBUG_FILL_MENU_ITEM_POCKET_ITEMS] = {sDebugText_Fill_PocketItems, DEBUG_FILL_MENU_ITEM_POCKET_ITEMS}, - [DEBUG_FILL_MENU_ITEM_POCKET_BALLS] = {sDebugText_Fill_PocketPokeBalls, DEBUG_FILL_MENU_ITEM_POCKET_BALLS}, - [DEBUG_FILL_MENU_ITEM_POCKET_TMHM] = {sDebugText_Fill_PocketTMHM, DEBUG_FILL_MENU_ITEM_POCKET_TMHM}, - [DEBUG_FILL_MENU_ITEM_POCKET_BERRIES] = {sDebugText_Fill_PocketBerries, DEBUG_FILL_MENU_ITEM_POCKET_BERRIES}, - [DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS] = {sDebugText_Fill_PocketKeyItems, DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS}, -}; - static const struct ListMenuItem sDebugMenu_Items_Sound[] = { [DEBUG_SOUND_MENU_ITEM_SE] = {sDebugText_Sound_SFX, DEBUG_SOUND_MENU_ITEM_SE}, @@ -835,11 +852,11 @@ static const struct ListMenuItem sDebugMenu_Items_BerryFunctions[] = static void (*const sDebugMenu_Actions_Main[])(u8) = { [DEBUG_MENU_ITEM_UTILITIES] = DebugAction_OpenUtilitiesMenu, - [DEBUG_MENU_ITEM_PARTY_BOXES] = DebugAction_OpenPartyBoxesMenu, + [DEBUG_MENU_ITEM_PCBAG] = DebugAction_OpenPCBagMenu, + [DEBUG_MENU_ITEM_PARTY] = DebugAction_OpenPartyMenu, [DEBUG_MENU_ITEM_GIVE] = DebugAction_OpenGiveMenu, [DEBUG_MENU_ITEM_SCRIPTS] = DebugAction_OpenScriptsMenu, [DEBUG_MENU_ITEM_FLAGVAR] = DebugAction_OpenFlagsVarsMenu, - [DEBUG_MENU_ITEM_FILL] = DebugAction_OpenFillMenu, //[DEBUG_MENU_ITEM_BATTLE] = DebugAction_OpenBattleMenu, [DEBUG_MENU_ITEM_SOUND] = DebugAction_OpenSoundMenu, [DEBUG_MENU_ITEM_CANCEL] = DebugAction_Cancel @@ -863,14 +880,32 @@ static void (*const sDebugMenu_Actions_Utilities[])(u8) = [DEBUG_UTIL_MENU_ITEM_BERRY_FUNCTIONS] = DebugAction_Util_BerryFunctions, }; -static void (*const sDebugMenu_Actions_PartyBoxes[])(u8) = +static void (*const sDebugMenu_Actions_PCBag[])(u8) = { - [DEBUG_PARTY_BOXES_MENU_ITEM_ACCESS_PC] = DebugAction_PartyBoxes_AccessPC, - [DEBUG_PARTY_BOXES_MENU_ITEM_MOVE_REMINDER] = DebugAction_PartyBoxes_MoveReminder, - [DEBUG_PARTY_BOXES_MENU_ITEM_HATCH_AN_EGG] = DebugAction_PartyBoxes_HatchAnEgg, - [DEBUG_PARTY_BOXES_MENU_ITEM_HEAL_PARTY] = DebugAction_PartyBoxes_HealParty, - [DEBUG_PARTY_BOXES_MENU_ITEM_POISON_MONS] = DebugAction_PartyBoxes_PoisonMons, - [DEBUG_PARTY_BOXES_MENU_ITEM_CLEAR_BOXES] = DebugAction_PartyBoxes_ClearBoxes, + [DEBUG_PCBAG_MENU_ITEM_FILL] = DebugAction_OpenPCBagFillMenu, + [DEBUG_PCBAG_MENU_ITEM_ACCESS_PC] = DebugAction_PCBag_AccessPC, + [DEBUG_PCBAG_MENU_ITEM_CLEAR_BAG] = DebugAction_PCBag_ClearBag, + [DEBUG_PCBAG_MENU_ITEM_CLEAR_BOXES] = DebugAction_PCBag_ClearBoxes, +}; + +static void (*const sDebugMenu_Actions_PCBag_Fill[])(u8) = +{ + [DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_FAST] = DebugAction_PCBag_Fill_PCBoxes_Fast, + [DEBUG_PCBAG_MENU_ITEM_FILL_PC_BOXES_SLOW] = DebugAction_PCBag_Fill_PCBoxes_Slow, + [DEBUG_PCBAG_MENU_ITEM_FILL_PC_ITEMS] = DebugAction_PCBag_Fill_PCItemStorage, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_ITEMS] = DebugAction_PCBag_Fill_PocketItems, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BALLS] = DebugAction_PCBag_Fill_PocketPokeBalls, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_TMHM] = DebugAction_PCBag_Fill_PocketTMHM, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_BERRIES] = DebugAction_PCBag_Fill_PocketBerries, + [DEBUG_PCBAG_MENU_ITEM_FILL_POCKET_KEY_ITEMS] = DebugAction_PCBag_Fill_PocketKeyItems, +}; + +static void (*const sDebugMenu_Actions_Party[])(u8) = +{ + [DEBUG_PARTY_MENU_ITEM_MOVE_REMINDER] = DebugAction_Party_MoveReminder, + [DEBUG_PARTY_MENU_ITEM_HATCH_AN_EGG] = DebugAction_Party_HatchAnEgg, + [DEBUG_PARTY_MENU_ITEM_HEAL_PARTY] = DebugAction_Party_HealParty, + [DEBUG_PARTY_MENU_ITEM_POISON_MONS] = DebugAction_Party_PoisonMons, }; static void (*const sDebugMenu_Actions_Scripts[])(u8) = @@ -917,18 +952,6 @@ static void (*const sDebugMenu_Actions_Give[])(u8) = [DEBUG_GIVE_MENU_ITEM_DAYCARE_EGG] = DebugAction_Give_DayCareEgg, }; -static void (*const sDebugMenu_Actions_Fill[])(u8) = -{ - [DEBUG_FILL_MENU_ITEM_PC_BOXES_FAST] = DebugAction_Fill_PCBoxes_Fast, - [DEBUG_FILL_MENU_ITEM_PC_BOXES_SLOW] = DebugAction_Fill_PCBoxes_Slow, - [DEBUG_FILL_MENU_ITEM_PC_ITEMS] = DebugAction_Fill_PCItemStorage, - [DEBUG_FILL_MENU_ITEM_POCKET_ITEMS] = DebugAction_Fill_PocketItems, - [DEBUG_FILL_MENU_ITEM_POCKET_BALLS] = DebugAction_Fill_PocketPokeBalls, - [DEBUG_FILL_MENU_ITEM_POCKET_TMHM] = DebugAction_Fill_PocketTMHM, - [DEBUG_FILL_MENU_ITEM_POCKET_BERRIES] = DebugAction_Fill_PocketBerries, - [DEBUG_FILL_MENU_ITEM_POCKET_KEY_ITEMS] = DebugAction_Fill_PocketKeyItems, -}; - static void (*const sDebugMenu_Actions_Sound[])(u8) = { [DEBUG_SOUND_MENU_ITEM_SE] = DebugAction_Sound_SE, @@ -1017,11 +1040,25 @@ static const struct ListMenuTemplate sDebugMenu_ListTemplate_Utilities = .totalItems = ARRAY_COUNT(sDebugMenu_Items_Utilities), }; -static const struct ListMenuTemplate sDebugMenu_ListTemplate_PartyBoxes = +static const struct ListMenuTemplate sDebugMenu_ListTemplate_PCBag = { - .items = sDebugMenu_Items_PartyBoxes, + .items = sDebugMenu_Items_PCBag, .moveCursorFunc = ListMenuDefaultCursorMoveFunc, - .totalItems = ARRAY_COUNT(sDebugMenu_Items_PartyBoxes), + .totalItems = ARRAY_COUNT(sDebugMenu_Items_PCBag), +}; + +static const struct ListMenuTemplate sDebugMenu_ListTemplate_PCBag_Fill = +{ + .items = sDebugMenu_Items_PCBag_Fill, + .moveCursorFunc = ListMenuDefaultCursorMoveFunc, + .totalItems = ARRAY_COUNT(sDebugMenu_Items_PCBag_Fill), +}; + +static const struct ListMenuTemplate sDebugMenu_ListTemplate_Party = +{ + .items = sDebugMenu_Items_Party, + .moveCursorFunc = ListMenuDefaultCursorMoveFunc, + .totalItems = ARRAY_COUNT(sDebugMenu_Items_Party), }; static const struct ListMenuTemplate sDebugMenu_ListTemplate_Scripts = @@ -1066,13 +1103,6 @@ static const struct ListMenuTemplate sDebugMenu_ListTemplate_Give = .totalItems = ARRAY_COUNT(sDebugMenu_Items_Give), }; -static const struct ListMenuTemplate sDebugMenu_ListTemplate_Fill = -{ - .items = sDebugMenu_Items_Fill, - .moveCursorFunc = ListMenuDefaultCursorMoveFunc, - .totalItems = ARRAY_COUNT(sDebugMenu_Items_Fill), -}; - static const struct ListMenuTemplate sDebugMenu_ListTemplate_Sound = { .items = sDebugMenu_Items_Sound, @@ -1458,7 +1488,7 @@ static void DebugTask_HandleMenuInput_Utilities(u8 taskId) } } -static void DebugTask_HandleMenuInput_PartyBoxes(u8 taskId) +static void DebugTask_HandleMenuInput_PCBag(u8 taskId) { void (*func)(u8); u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuTaskId); @@ -1466,7 +1496,45 @@ static void DebugTask_HandleMenuInput_PartyBoxes(u8 taskId) if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); - if ((func = sDebugMenu_Actions_PartyBoxes[input]) != NULL) + if ((func = sDebugMenu_Actions_PCBag[input]) != NULL) + func(taskId); + } + else if (JOY_NEW(B_BUTTON)) + { + PlaySE(SE_SELECT); + Debug_DestroyMenu(taskId); + Debug_ReShowMainMenu(); + } +} + +static void DebugTask_HandleMenuInput_PCBag_Fill(u8 taskId) +{ + void (*func)(u8); + u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuTaskId); + + if (JOY_NEW(A_BUTTON)) + { + PlaySE(SE_SELECT); + if ((func = sDebugMenu_Actions_PCBag_Fill[input]) != NULL) + func(taskId); + } + else if (JOY_NEW(B_BUTTON)) + { + PlaySE(SE_SELECT); + Debug_DestroyMenu(taskId); + Debug_ShowMenu(DebugTask_HandleMenuInput_PCBag, sDebugMenu_ListTemplate_PCBag); + } +} + +static void DebugTask_HandleMenuInput_Party(u8 taskId) +{ + void (*func)(u8); + u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuTaskId); + + if (JOY_NEW(A_BUTTON)) + { + PlaySE(SE_SELECT); + if ((func = sDebugMenu_Actions_Party[input]) != NULL) func(taskId); } else if (JOY_NEW(B_BUTTON)) @@ -1698,25 +1766,6 @@ static void DebugTask_HandleMenuInput_Give(u8 taskId) } } -static void DebugTask_HandleMenuInput_Fill(u8 taskId) -{ - void (*func)(u8); - u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuTaskId); - - if (JOY_NEW(A_BUTTON)) - { - PlaySE(SE_SELECT); - if ((func = sDebugMenu_Actions_Fill[input]) != NULL) - func(taskId); - } - else if (JOY_NEW(B_BUTTON)) - { - PlaySE(SE_SELECT); - Debug_DestroyMenu(taskId); - Debug_ReShowMainMenu(); - } -} - static void DebugTask_HandleMenuInput_Sound(u8 taskId) { void (*func)(u8); @@ -1763,10 +1812,16 @@ static void DebugAction_OpenUtilitiesMenu(u8 taskId) Debug_ShowMenu(DebugTask_HandleMenuInput_Utilities, sDebugMenu_ListTemplate_Utilities); } -static void DebugAction_OpenPartyBoxesMenu(u8 taskId) +static void DebugAction_OpenPCBagMenu(u8 taskId) { Debug_DestroyMenu(taskId); - Debug_ShowMenu(DebugTask_HandleMenuInput_PartyBoxes, sDebugMenu_ListTemplate_PartyBoxes); + Debug_ShowMenu(DebugTask_HandleMenuInput_PCBag, sDebugMenu_ListTemplate_PCBag); +} + +static void DebugAction_OpenPartyMenu(u8 taskId) +{ + Debug_DestroyMenu(taskId); + Debug_ShowMenu(DebugTask_HandleMenuInput_Party, sDebugMenu_ListTemplate_Party); } static void DebugAction_OpenScriptsMenu(u8 taskId) @@ -1788,12 +1843,6 @@ static void DebugAction_OpenGiveMenu(u8 taskId) Debug_ShowMenu(DebugTask_HandleMenuInput_Give, sDebugMenu_ListTemplate_Give); } -static void DebugAction_OpenFillMenu(u8 taskId) -{ - Debug_DestroyMenu(taskId); - Debug_ShowMenu(DebugTask_HandleMenuInput_Fill, sDebugMenu_ListTemplate_Fill); -} - static void DebugAction_OpenSoundMenu(u8 taskId) { Debug_DestroyMenu(taskId); @@ -4003,8 +4052,15 @@ static void DebugAction_Give_DayCareEgg(u8 taskId) } // ******************************* -// Actions Fill -static void DebugAction_Fill_PCBoxes_Fast(u8 taskId) //Credit: Sierraffinity +// Actions PCBag + +static void DebugAction_OpenPCBagFillMenu(u8 taskId) +{ + Debug_DestroyMenu(taskId); + Debug_ShowMenu(DebugTask_HandleMenuInput_PCBag_Fill, sDebugMenu_ListTemplate_PCBag_Fill); +} + +static void DebugAction_PCBag_Fill_PCBoxes_Fast(u8 taskId) //Credit: Sierraffinity { int boxId, boxPosition; u32 personality; @@ -4037,7 +4093,7 @@ static void DebugAction_Fill_PCBoxes_Fast(u8 taskId) //Credit: Sierraffinity ScriptContext_Enable(); } -static void DebugAction_Fill_PCBoxes_Slow(u8 taskId) +static void DebugAction_PCBag_Fill_PCBoxes_Slow(u8 taskId) { int boxId, boxPosition; struct BoxPokemon boxMon; @@ -4068,7 +4124,7 @@ static void DebugAction_Fill_PCBoxes_Slow(u8 taskId) Debug_DestroyMenu_Full_Script(taskId, Debug_BoxFilledMessage); } -static void DebugAction_Fill_PCItemStorage(u8 taskId) +static void DebugAction_PCBag_Fill_PCItemStorage(u8 taskId) { u16 itemId; @@ -4079,7 +4135,7 @@ static void DebugAction_Fill_PCItemStorage(u8 taskId) } } -static void DebugAction_Fill_PocketItems(u8 taskId) +static void DebugAction_PCBag_Fill_PocketItems(u8 taskId) { u16 itemId; @@ -4090,7 +4146,7 @@ static void DebugAction_Fill_PocketItems(u8 taskId) } } -static void DebugAction_Fill_PocketPokeBalls(u8 taskId) +static void DebugAction_PCBag_Fill_PocketPokeBalls(u8 taskId) { u16 itemId; @@ -4101,7 +4157,7 @@ static void DebugAction_Fill_PocketPokeBalls(u8 taskId) } } -static void DebugAction_Fill_PocketTMHM(u8 taskId) +static void DebugAction_PCBag_Fill_PocketTMHM(u8 taskId) { u16 itemId; @@ -4112,7 +4168,7 @@ static void DebugAction_Fill_PocketTMHM(u8 taskId) } } -static void DebugAction_Fill_PocketBerries(u8 taskId) +static void DebugAction_PCBag_Fill_PocketBerries(u8 taskId) { u16 itemId; @@ -4123,7 +4179,7 @@ static void DebugAction_Fill_PocketBerries(u8 taskId) } } -static void DebugAction_Fill_PocketKeyItems(u8 taskId) +static void DebugAction_PCBag_Fill_PocketKeyItems(u8 taskId) { u16 itemId; @@ -4134,6 +4190,24 @@ static void DebugAction_Fill_PocketKeyItems(u8 taskId) } } +static void DebugAction_PCBag_AccessPC(u8 taskId) +{ + Debug_DestroyMenu_Full_Script(taskId, EventScript_PC); +} + +static void DebugAction_PCBag_ClearBag(u8 taskId) +{ + PlaySE(MUS_LEVEL_UP); + ClearBag(); +} + +static void DebugAction_PCBag_ClearBoxes(u8 taskId) +{ + ResetPokemonStorageSystem(); + Debug_DestroyMenu_Full(taskId); + ScriptContext_Enable(); +} + // ******************************* // Actions Sound static const u8 *const sBGMNames[]; @@ -4978,22 +5052,17 @@ static void DebugAction_BerryFunctions_Weeds(u8 taskId) // ******************************* // Actions Party/Boxes -static void DebugAction_PartyBoxes_AccessPC(u8 taskId) -{ - Debug_DestroyMenu_Full_Script(taskId, EventScript_PC); -} - -static void DebugAction_PartyBoxes_MoveReminder(u8 taskId) +static void DebugAction_Party_MoveReminder(u8 taskId) { Debug_DestroyMenu_Full_Script(taskId, FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon); } -static void DebugAction_PartyBoxes_HatchAnEgg(u8 taskId) +static void DebugAction_Party_HatchAnEgg(u8 taskId) { Debug_DestroyMenu_Full_Script(taskId, Debug_HatchAnEgg); } -static void DebugAction_PartyBoxes_HealParty(u8 taskId) +static void DebugAction_Party_HealParty(u8 taskId) { PlaySE(SE_USE_ITEM); HealPlayerParty(); @@ -5001,7 +5070,7 @@ static void DebugAction_PartyBoxes_HealParty(u8 taskId) Debug_DestroyMenu_Full(taskId); } -static void DebugAction_PartyBoxes_PoisonMons(u8 taskId) +static void DebugAction_Party_PoisonMons(u8 taskId) { int i; for (i = 0; i < PARTY_SIZE; i++) @@ -5019,11 +5088,4 @@ static void DebugAction_PartyBoxes_PoisonMons(u8 taskId) Debug_DestroyMenu_Full(taskId); } -static void DebugAction_PartyBoxes_ClearBoxes(u8 taskId) -{ - ResetPokemonStorageSystem(); - Debug_DestroyMenu_Full(taskId); - ScriptContext_Enable(); -} - #endif //DEBUG_OVERWORLD_MENU == TRUE From 338740e256d35c2b938188abb5f254a96fe5c6ad Mon Sep 17 00:00:00 2001 From: johannakullmann <151456919+johannakullmann@users.noreply.github.com> Date: Fri, 5 Jan 2024 17:56:38 +0100 Subject: [PATCH 76/82] Fixed bug that prevents field moves from being displayed when adding more field moves (#3933) When adding a new field move, no field moves will be displayed in the party menu screen at all. This fixes this issue. --- src/party_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/party_menu.c b/src/party_menu.c index f333db02fb..1573c71a64 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -2787,7 +2787,7 @@ static void SetPartyMonFieldSelectionActions(struct Pokemon *mons, u8 slotId) // Add field moves to action list for (i = 0; i < MAX_MON_MOVES; i++) { - for (j = 0; sFieldMoves[j] != FIELD_MOVES_COUNT; j++) + for (j = 0; j != FIELD_MOVES_COUNT; j++) { if (GetMonData(&mons[slotId], i + MON_DATA_MOVE1) == sFieldMoves[j]) { From 34ceb930cc696934084505224c7ee339c6ffdbf4 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 5 Jan 2024 19:07:51 +0000 Subject: [PATCH 77/82] Fix YIELD_RATE (#3931) --- src/berry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/berry.c b/src/berry.c index a73c9ddf12..b747b2e19c 100644 --- a/src/berry.c +++ b/src/berry.c @@ -50,7 +50,7 @@ static void AddTreeBonus(struct BerryTree *tree, u8 bonus); #endif #define GROWTH_DURATION(g3, g4, g5, xy, oras, g7) OW_BERRY_GROWTH_RATE == GEN_3 ? g3 : OW_BERRY_GROWTH_RATE == GEN_4 ? g4 : OW_BERRY_GROWTH_RATE == GEN_5 ? g5 : OW_BERRY_GROWTH_RATE == GEN_6_XY ? xy : OW_BERRY_GROWTH_RATE == GEN_6_ORAS ? oras : g7 -#define YIELD_RATE(g3, g4, xy, oras) GROWTH_DURATION(g3, g4, 0, xy, oras, 0) +#define YIELD_RATE(g3, g4, xy, oras) OW_BERRY_YIELD_RATE == GEN_3 ? g3 : OW_BERRY_YIELD_RATE == GEN_4 ? g4 : OW_BERRY_YIELD_RATE == GEN_6_XY ? xy : oras const struct Berry gBerries[] = { From 396f2c9565082757361bb26e5c63a40fdb3c9fd8 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Sat, 6 Jan 2024 10:52:48 -0500 Subject: [PATCH 78/82] some pledge combo fixes (#3934) Co-authored-by: ghoulslash Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/battle_main.c | 2 ++ src/battle_util.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/battle_main.c b/src/battle_main.c index 1216d8dd37..f647ae5569 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4932,6 +4932,8 @@ static void TurnValuesCleanUp(bool8 var0) gSideStatuses[B_SIDE_OPPONENT] &= ~(SIDE_STATUS_QUICK_GUARD | SIDE_STATUS_WIDE_GUARD | SIDE_STATUS_CRAFTY_SHIELD | SIDE_STATUS_MAT_BLOCK); gSideTimers[B_SIDE_PLAYER].followmeTimer = 0; gSideTimers[B_SIDE_OPPONENT].followmeTimer = 0; + + gBattleStruct->pledgeMove = FALSE; // combined pledge move may not have been used due to a canceller } void SpecialStatusesClear(void) diff --git a/src/battle_util.c b/src/battle_util.c index ff8a7f5dc8..81a5c82d8c 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3165,7 +3165,7 @@ u8 DoBattlerEndTurnEffects(void) gBattleStruct->turnEffectsTracker++; break; case ENDTURN_SEA_OF_FIRE_DAMAGE: - if (gSideStatuses[GetBattlerSide(battler)] & SIDE_STATUS_SEA_OF_FIRE) + if (IsBattlerAlive(battler) && gSideStatuses[GetBattlerSide(battler)] & SIDE_STATUS_SEA_OF_FIRE) { gBattleMoveDamage = gBattleMons[battler].maxHP / 8; BtlController_EmitStatusAnimation(battler, BUFFER_A, FALSE, STATUS1_BURN); From b077d927314c75e309c214cde57f818a5ddd1435 Mon Sep 17 00:00:00 2001 From: MartyKen <73791756+MartyKen@users.noreply.github.com> Date: Mon, 8 Jan 2024 20:48:12 +0100 Subject: [PATCH 79/82] Organized pokemon graphics by generation (#3868) * VSync BENCHMARKs and avoid AdvanceRandom in tests (#3867) * Organized pokemon graphics per generation title says it all --------- Co-authored-by: Martin Griffin --- .../pokemon/{ => gen_1}/abra/anim_front.png | Bin graphics/pokemon/{ => gen_1}/abra/back.png | Bin .../pokemon/{ => gen_1}/abra/footprint.png | Bin graphics/pokemon/{ => gen_1}/abra/icon.png | Bin graphics/pokemon/{ => gen_1}/abra/normal.pal | 0 graphics/pokemon/{ => gen_1}/abra/shiny.pal | 0 .../{ => gen_1}/aerodactyl/anim_front.png | Bin .../pokemon/{ => gen_1}/aerodactyl/back.png | Bin .../{ => gen_1}/aerodactyl/footprint.png | Bin .../pokemon/{ => gen_1}/aerodactyl/icon.png | Bin .../{ => gen_1}/aerodactyl/mega/back.png | Bin .../{ => gen_1}/aerodactyl/mega/front.png | Bin .../{ => gen_1}/aerodactyl/mega/icon.png | Bin .../{ => gen_1}/aerodactyl/mega/normal.pal | 0 .../{ => gen_1}/aerodactyl/mega/shiny.pal | 0 .../pokemon/{ => gen_1}/aerodactyl/normal.pal | 0 .../pokemon/{ => gen_1}/aerodactyl/shiny.pal | 0 .../{ => gen_1}/alakazam/anim_front.png | Bin .../{ => gen_1}/alakazam/anim_frontf.png | Bin .../pokemon/{ => gen_1}/alakazam/back.png | Bin .../pokemon/{ => gen_1}/alakazam/backf.png | Bin .../{ => gen_1}/alakazam/footprint.png | Bin .../pokemon/{ => gen_1}/alakazam/icon.png | Bin .../{ => gen_1}/alakazam/mega/back.png | Bin .../{ => gen_1}/alakazam/mega/front.png | Bin .../{ => gen_1}/alakazam/mega/icon.png | Bin .../{ => gen_1}/alakazam/mega/normal.pal | 0 .../{ => gen_1}/alakazam/mega/shiny.pal | 0 .../pokemon/{ => gen_1}/alakazam/normal.pal | 0 .../pokemon/{ => gen_1}/alakazam/shiny.pal | 0 .../pokemon/{ => gen_1}/arbok/anim_front.png | Bin graphics/pokemon/{ => gen_1}/arbok/back.png | Bin .../{accelgor => gen_1/arbok}/footprint.png | Bin graphics/pokemon/{ => gen_1}/arbok/icon.png | Bin graphics/pokemon/{ => gen_1}/arbok/normal.pal | 0 graphics/pokemon/{ => gen_1}/arbok/shiny.pal | 0 .../{ => gen_1}/arcanine/anim_front.png | Bin .../pokemon/{ => gen_1}/arcanine/back.png | Bin .../{ => gen_1}/arcanine/footprint.png | Bin .../{ => gen_1}/arcanine/hisuian/back.png | Bin .../{ => gen_1}/arcanine/hisuian/front.png | Bin .../{ => gen_1}/arcanine/hisuian/icon.png | Bin .../{ => gen_1}/arcanine/hisuian/normal.pal | 0 .../{ => gen_1}/arcanine/hisuian/shiny.pal | 0 .../pokemon/{ => gen_1}/arcanine/icon.png | Bin .../pokemon/{ => gen_1}/arcanine/normal.pal | 0 .../pokemon/{ => gen_1}/arcanine/shiny.pal | 0 .../{ => gen_1}/articuno/anim_front.png | Bin .../pokemon/{ => gen_1}/articuno/back.png | Bin .../{ => gen_1}/articuno/footprint.png | Bin .../{ => gen_1}/articuno/galarian/back.png | Bin .../{ => gen_1}/articuno/galarian/front.png | Bin .../{ => gen_1}/articuno/galarian/icon.png | Bin .../{ => gen_1}/articuno/galarian/normal.pal | 0 .../{ => gen_1}/articuno/galarian/shiny.pal | 0 .../pokemon/{ => gen_1}/articuno/icon.png | Bin .../pokemon/{ => gen_1}/articuno/normal.pal | 0 .../pokemon/{ => gen_1}/articuno/shiny.pal | 0 .../{ => gen_1}/beedrill/anim_front.png | Bin .../pokemon/{ => gen_1}/beedrill/back.png | Bin .../{ => gen_1}/beedrill/footprint.png | Bin .../pokemon/{ => gen_1}/beedrill/icon.png | Bin .../{ => gen_1}/beedrill/mega/back.png | Bin .../{ => gen_1}/beedrill/mega/front.png | Bin .../{ => gen_1}/beedrill/mega/icon.png | Bin .../{ => gen_1}/beedrill/mega/normal.pal | 0 .../{ => gen_1}/beedrill/mega/shiny.pal | 0 .../pokemon/{ => gen_1}/beedrill/normal.pal | 0 .../pokemon/{ => gen_1}/beedrill/shiny.pal | 0 .../{ => gen_1}/bellsprout/anim_front.png | Bin .../pokemon/{ => gen_1}/bellsprout/back.png | Bin .../{ => gen_1}/bellsprout/footprint.png | Bin .../pokemon/{ => gen_1}/bellsprout/icon.png | Bin .../pokemon/{ => gen_1}/bellsprout/normal.pal | 0 .../pokemon/{ => gen_1}/bellsprout/shiny.pal | 0 .../{ => gen_1}/blastoise/anim_front.png | Bin .../pokemon/{ => gen_1}/blastoise/back.png | Bin .../{ => gen_1}/blastoise/footprint.png | Bin .../{ => gen_1}/blastoise/gigantamax/back.png | Bin .../blastoise/gigantamax/front.png | Bin .../{ => gen_1}/blastoise/gigantamax/icon.png | Bin .../blastoise/gigantamax/normal.pal | 0 .../blastoise/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_1}/blastoise/icon.png | Bin .../{ => gen_1}/blastoise/mega/back.png | Bin .../{ => gen_1}/blastoise/mega/front.png | Bin .../{ => gen_1}/blastoise/mega/icon.png | Bin .../{ => gen_1}/blastoise/mega/normal.pal | 0 .../{ => gen_1}/blastoise/mega/shiny.pal | 0 .../pokemon/{ => gen_1}/blastoise/normal.pal | 0 .../pokemon/{ => gen_1}/blastoise/shiny.pal | 0 .../{ => gen_1}/bulbasaur/anim_front.png | Bin .../pokemon/{ => gen_1}/bulbasaur/back.png | Bin .../{ => gen_1}/bulbasaur/footprint.png | Bin .../pokemon/{ => gen_1}/bulbasaur/icon.png | Bin .../pokemon/{ => gen_1}/bulbasaur/normal.pal | 0 .../pokemon/{ => gen_1}/bulbasaur/shiny.pal | 0 .../{ => gen_1}/butterfree/anim_front.png | Bin .../{ => gen_1}/butterfree/anim_frontf.png | Bin .../pokemon/{ => gen_1}/butterfree/back.png | Bin .../pokemon/{ => gen_1}/butterfree/backf.png | Bin .../{ => gen_1}/butterfree/footprint.png | Bin .../butterfree/gigantamax/back.png | Bin .../butterfree/gigantamax/front.png | Bin .../butterfree/gigantamax/icon.png | Bin .../butterfree/gigantamax/normal.pal | 0 .../butterfree/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_1}/butterfree/icon.png | Bin .../pokemon/{ => gen_1}/butterfree/normal.pal | 0 .../pokemon/{ => gen_1}/butterfree/shiny.pal | 0 .../{ => gen_1}/caterpie/anim_front.png | Bin .../pokemon/{ => gen_1}/caterpie/back.png | Bin .../caterpie}/footprint.png | Bin .../pokemon/{ => gen_1}/caterpie/icon.png | Bin .../pokemon/{ => gen_1}/caterpie/normal.pal | 0 .../pokemon/{ => gen_1}/caterpie/shiny.pal | 0 .../{ => gen_1}/chansey/anim_front.png | Bin graphics/pokemon/{ => gen_1}/chansey/back.png | Bin .../pokemon/{ => gen_1}/chansey/footprint.png | Bin graphics/pokemon/{ => gen_1}/chansey/icon.png | Bin .../pokemon/{ => gen_1}/chansey/normal.pal | 0 .../pokemon/{ => gen_1}/chansey/shiny.pal | 0 .../{ => gen_1}/charizard/anim_front.png | Bin .../pokemon/{ => gen_1}/charizard/back.png | Bin .../{ => gen_1}/charizard/footprint.png | Bin .../{ => gen_1}/charizard/gigantamax/back.png | Bin .../charizard/gigantamax/front.png | Bin .../{ => gen_1}/charizard/gigantamax/icon.png | Bin .../charizard/gigantamax/normal.pal | 0 .../charizard/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_1}/charizard/icon.png | Bin .../{ => gen_1}/charizard/mega_x/back.png | Bin .../{ => gen_1}/charizard/mega_x/front.png | Bin .../{ => gen_1}/charizard/mega_x/icon.png | Bin .../{ => gen_1}/charizard/mega_x/normal.pal | 0 .../{ => gen_1}/charizard/mega_x/shiny.pal | 0 .../{ => gen_1}/charizard/mega_y/back.png | Bin .../{ => gen_1}/charizard/mega_y/front.png | Bin .../{ => gen_1}/charizard/mega_y/icon.png | Bin .../{ => gen_1}/charizard/mega_y/normal.pal | 0 .../{ => gen_1}/charizard/mega_y/shiny.pal | 0 .../pokemon/{ => gen_1}/charizard/normal.pal | 0 .../pokemon/{ => gen_1}/charizard/shiny.pal | 0 .../{ => gen_1}/charmander/anim_front.png | Bin .../pokemon/{ => gen_1}/charmander/back.png | Bin .../{ => gen_1}/charmander/footprint.png | Bin .../pokemon/{ => gen_1}/charmander/icon.png | Bin .../pokemon/{ => gen_1}/charmander/normal.pal | 0 .../pokemon/{ => gen_1}/charmander/shiny.pal | 0 .../{ => gen_1}/charmeleon/anim_front.png | Bin .../pokemon/{ => gen_1}/charmeleon/back.png | Bin .../{ => gen_1}/charmeleon/footprint.png | Bin .../pokemon/{ => gen_1}/charmeleon/icon.png | Bin .../pokemon/{ => gen_1}/charmeleon/normal.pal | 0 .../pokemon/{ => gen_1}/charmeleon/shiny.pal | 0 .../{ => gen_1}/clefable/anim_front.png | Bin .../pokemon/{ => gen_1}/clefable/back.png | Bin .../{ => gen_1}/clefable/footprint.png | Bin .../pokemon/{ => gen_1}/clefable/icon.png | Bin .../pokemon/{ => gen_1}/clefable/normal.pal | 0 .../pokemon/{ => gen_1}/clefable/shiny.pal | 0 .../{ => gen_1}/clefairy/anim_front.png | Bin .../pokemon/{ => gen_1}/clefairy/back.png | Bin .../{chewtle => gen_1/clefairy}/footprint.png | Bin .../pokemon/{ => gen_1}/clefairy/icon.png | Bin .../pokemon/{ => gen_1}/clefairy/normal.pal | 0 .../pokemon/{ => gen_1}/clefairy/shiny.pal | 0 .../{ => gen_1}/cloyster/anim_front.png | Bin .../pokemon/{ => gen_1}/cloyster/back.png | Bin .../cloyster}/footprint.png | Bin .../pokemon/{ => gen_1}/cloyster/icon.png | Bin .../pokemon/{ => gen_1}/cloyster/normal.pal | 0 .../pokemon/{ => gen_1}/cloyster/shiny.pal | 0 .../pokemon/{ => gen_1}/cubone/anim_front.png | Bin graphics/pokemon/{ => gen_1}/cubone/back.png | Bin .../pokemon/{ => gen_1}/cubone/footprint.png | Bin graphics/pokemon/{ => gen_1}/cubone/icon.png | Bin .../pokemon/{ => gen_1}/cubone/normal.pal | 0 graphics/pokemon/{ => gen_1}/cubone/shiny.pal | 0 .../{ => gen_1}/dewgong/anim_front.png | Bin graphics/pokemon/{ => gen_1}/dewgong/back.png | Bin .../{alcremie => gen_1/dewgong}/footprint.png | Bin graphics/pokemon/{ => gen_1}/dewgong/icon.png | Bin .../pokemon/{ => gen_1}/dewgong/normal.pal | 0 .../pokemon/{ => gen_1}/dewgong/shiny.pal | 0 .../{ => gen_1}/diglett/alolan/back.png | Bin .../{ => gen_1}/diglett/alolan/front.png | Bin .../{ => gen_1}/diglett/alolan/icon.png | Bin .../{ => gen_1}/diglett/alolan/normal.pal | 0 .../{ => gen_1}/diglett/alolan/shiny.pal | 0 .../{ => gen_1}/diglett/anim_front.png | Bin graphics/pokemon/{ => gen_1}/diglett/back.png | Bin .../diglett}/footprint.png | Bin graphics/pokemon/{ => gen_1}/diglett/icon.png | Bin .../pokemon/{ => gen_1}/diglett/normal.pal | 0 .../pokemon/{ => gen_1}/diglett/shiny.pal | 0 .../pokemon/{ => gen_1}/ditto/anim_front.png | Bin graphics/pokemon/{ => gen_1}/ditto/back.png | Bin .../{amoonguss => gen_1/ditto}/footprint.png | Bin graphics/pokemon/{ => gen_1}/ditto/icon.png | Bin graphics/pokemon/{ => gen_1}/ditto/normal.pal | 0 graphics/pokemon/{ => gen_1}/ditto/shiny.pal | 0 .../pokemon/{ => gen_1}/dodrio/anim_front.png | Bin .../{ => gen_1}/dodrio/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/dodrio/back.png | Bin graphics/pokemon/{ => gen_1}/dodrio/backf.png | Bin .../pokemon/{ => gen_1}/dodrio/footprint.png | Bin graphics/pokemon/{ => gen_1}/dodrio/icon.png | Bin .../pokemon/{ => gen_1}/dodrio/normal.pal | 0 graphics/pokemon/{ => gen_1}/dodrio/shiny.pal | 0 .../pokemon/{ => gen_1}/doduo/anim_front.png | Bin .../pokemon/{ => gen_1}/doduo/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/doduo/back.png | Bin graphics/pokemon/{ => gen_1}/doduo/backf.png | Bin .../pokemon/{ => gen_1}/doduo/footprint.png | Bin graphics/pokemon/{ => gen_1}/doduo/icon.png | Bin graphics/pokemon/{ => gen_1}/doduo/normal.pal | 0 graphics/pokemon/{ => gen_1}/doduo/shiny.pal | 0 .../{ => gen_1}/dragonair/anim_front.png | Bin .../pokemon/{ => gen_1}/dragonair/back.png | Bin .../dragonair}/footprint.png | Bin .../pokemon/{ => gen_1}/dragonair/icon.png | Bin .../pokemon/{ => gen_1}/dragonair/normal.pal | 0 .../pokemon/{ => gen_1}/dragonair/shiny.pal | 0 .../{ => gen_1}/dragonite/anim_front.png | Bin .../pokemon/{ => gen_1}/dragonite/back.png | Bin .../dragonite}/footprint.png | Bin .../pokemon/{ => gen_1}/dragonite/icon.png | Bin .../pokemon/{ => gen_1}/dragonite/normal.pal | 0 .../pokemon/{ => gen_1}/dragonite/shiny.pal | 0 .../{ => gen_1}/dratini/anim_front.png | Bin graphics/pokemon/{ => gen_1}/dratini/back.png | Bin .../{applin => gen_1/dratini}/footprint.png | Bin graphics/pokemon/{ => gen_1}/dratini/icon.png | Bin .../pokemon/{ => gen_1}/dratini/normal.pal | 0 .../pokemon/{ => gen_1}/dratini/shiny.pal | 0 .../{ => gen_1}/drowzee/anim_front.png | Bin graphics/pokemon/{ => gen_1}/drowzee/back.png | Bin .../pokemon/{ => gen_1}/drowzee/footprint.png | Bin graphics/pokemon/{ => gen_1}/drowzee/icon.png | Bin .../pokemon/{ => gen_1}/drowzee/normal.pal | 0 .../pokemon/{ => gen_1}/drowzee/shiny.pal | 0 .../{ => gen_1}/dugtrio/alolan/back.png | Bin .../{ => gen_1}/dugtrio/alolan/front.png | Bin .../{ => gen_1}/dugtrio/alolan/icon.png | Bin .../{ => gen_1}/dugtrio/alolan/normal.pal | 0 .../{ => gen_1}/dugtrio/alolan/shiny.pal | 0 .../{ => gen_1}/dugtrio/anim_front.png | Bin graphics/pokemon/{ => gen_1}/dugtrio/back.png | Bin .../{arbok => gen_1/dugtrio}/footprint.png | Bin graphics/pokemon/{ => gen_1}/dugtrio/icon.png | Bin .../pokemon/{ => gen_1}/dugtrio/normal.pal | 0 .../pokemon/{ => gen_1}/dugtrio/shiny.pal | 0 .../pokemon/{ => gen_1}/eevee/anim_front.png | Bin .../pokemon/{ => gen_1}/eevee/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/eevee/back.png | Bin graphics/pokemon/{ => gen_1}/eevee/backf.png | Bin .../pokemon/{ => gen_1}/eevee/footprint.png | Bin graphics/pokemon/{ => gen_1}/eevee/frontf.png | Bin .../{ => gen_1}/eevee/gigantamax/back.png | Bin .../{ => gen_1}/eevee/gigantamax/front.png | Bin .../{ => gen_1}/eevee/gigantamax/icon.png | Bin .../{ => gen_1}/eevee/gigantamax/normal.pal | 0 .../{ => gen_1}/eevee/gigantamax/shiny.pal | 0 graphics/pokemon/{ => gen_1}/eevee/icon.png | Bin graphics/pokemon/{ => gen_1}/eevee/normal.pal | 0 graphics/pokemon/{ => gen_1}/eevee/shiny.pal | 0 .../pokemon/{ => gen_1}/ekans/anim_front.png | Bin graphics/pokemon/{ => gen_1}/ekans/back.png | Bin .../{arrokuda => gen_1/ekans}/footprint.png | Bin graphics/pokemon/{ => gen_1}/ekans/icon.png | Bin graphics/pokemon/{ => gen_1}/ekans/normal.pal | 0 graphics/pokemon/{ => gen_1}/ekans/shiny.pal | 0 .../{ => gen_1}/electabuzz/anim_front.png | Bin .../pokemon/{ => gen_1}/electabuzz/back.png | Bin .../{ => gen_1}/electabuzz/footprint.png | Bin .../pokemon/{ => gen_1}/electabuzz/icon.png | Bin .../pokemon/{ => gen_1}/electabuzz/normal.pal | 0 .../pokemon/{ => gen_1}/electabuzz/shiny.pal | 0 .../{ => gen_1}/electrode/anim_front.png | Bin .../pokemon/{ => gen_1}/electrode/back.png | Bin .../electrode}/footprint.png | Bin .../{ => gen_1}/electrode/hisuian/back.png | Bin .../{ => gen_1}/electrode/hisuian/front.png | Bin .../{ => gen_1}/electrode/hisuian/icon.png | Bin .../{ => gen_1}/electrode/hisuian/normal.pal | 0 .../{ => gen_1}/electrode/hisuian/shiny.pal | 0 .../pokemon/{ => gen_1}/electrode/icon.png | Bin .../pokemon/{ => gen_1}/electrode/normal.pal | 0 .../pokemon/{ => gen_1}/electrode/shiny.pal | 0 .../{ => gen_1}/exeggcute/anim_front.png | Bin .../pokemon/{ => gen_1}/exeggcute/back.png | Bin .../exeggcute}/footprint.png | Bin .../pokemon/{ => gen_1}/exeggcute/icon.png | Bin .../pokemon/{ => gen_1}/exeggcute/normal.pal | 0 .../pokemon/{ => gen_1}/exeggcute/shiny.pal | 0 .../exeggutor/alolan/anim_front.png | Bin .../{ => gen_1}/exeggutor/alolan/back.png | Bin .../{ => gen_1}/exeggutor/alolan/icon.png | Bin .../{ => gen_1}/exeggutor/alolan/normal.pal | 0 .../{ => gen_1}/exeggutor/alolan/shiny.pal | 0 .../{ => gen_1}/exeggutor/anim_front.png | Bin .../pokemon/{ => gen_1}/exeggutor/back.png | Bin .../{ => gen_1}/exeggutor/footprint.png | Bin .../pokemon/{ => gen_1}/exeggutor/icon.png | Bin .../pokemon/{ => gen_1}/exeggutor/normal.pal | 0 .../pokemon/{ => gen_1}/exeggutor/shiny.pal | 0 .../{ => gen_1}/farfetchd/anim_front.png | Bin .../pokemon/{ => gen_1}/farfetchd/back.png | Bin .../{ => gen_1}/farfetchd/footprint.png | Bin .../{ => gen_1}/farfetchd/galarian/back.png | Bin .../{ => gen_1}/farfetchd/galarian/front.png | Bin .../{ => gen_1}/farfetchd/galarian/icon.png | Bin .../{ => gen_1}/farfetchd/galarian/normal.pal | 0 .../{ => gen_1}/farfetchd/galarian/shiny.pal | 0 .../pokemon/{ => gen_1}/farfetchd/icon.png | Bin .../pokemon/{ => gen_1}/farfetchd/normal.pal | 0 .../pokemon/{ => gen_1}/farfetchd/shiny.pal | 0 .../pokemon/{ => gen_1}/fearow/anim_front.png | Bin graphics/pokemon/{ => gen_1}/fearow/back.png | Bin .../pokemon/{ => gen_1}/fearow/footprint.png | Bin graphics/pokemon/{ => gen_1}/fearow/icon.png | Bin .../pokemon/{ => gen_1}/fearow/normal.pal | 0 graphics/pokemon/{ => gen_1}/fearow/shiny.pal | 0 .../{ => gen_1}/flareon/anim_front.png | Bin graphics/pokemon/{ => gen_1}/flareon/back.png | Bin .../{boltund => gen_1/flareon}/footprint.png | Bin graphics/pokemon/{ => gen_1}/flareon/icon.png | Bin .../pokemon/{ => gen_1}/flareon/normal.pal | 0 .../pokemon/{ => gen_1}/flareon/shiny.pal | 0 .../pokemon/{ => gen_1}/gastly/anim_front.png | Bin graphics/pokemon/{ => gen_1}/gastly/back.png | Bin .../{basculin => gen_1/gastly}/footprint.png | Bin graphics/pokemon/{ => gen_1}/gastly/icon.png | Bin .../pokemon/{ => gen_1}/gastly/normal.pal | 0 graphics/pokemon/{ => gen_1}/gastly/shiny.pal | 0 .../pokemon/{ => gen_1}/gengar/anim_front.png | Bin graphics/pokemon/{ => gen_1}/gengar/back.png | Bin .../pokemon/{ => gen_1}/gengar/footprint.png | Bin .../{ => gen_1}/gengar/gigantamax/back.png | Bin .../{ => gen_1}/gengar/gigantamax/front.png | Bin .../{ => gen_1}/gengar/gigantamax/icon.png | Bin .../{ => gen_1}/gengar/gigantamax/normal.pal | 0 .../{ => gen_1}/gengar/gigantamax/shiny.pal | 0 graphics/pokemon/{ => gen_1}/gengar/icon.png | Bin .../pokemon/{ => gen_1}/gengar/mega/back.png | Bin .../pokemon/{ => gen_1}/gengar/mega/front.png | Bin .../pokemon/{ => gen_1}/gengar/mega/icon.png | Bin .../{ => gen_1}/gengar/mega/normal.pal | 0 .../pokemon/{ => gen_1}/gengar/mega/shiny.pal | 0 .../pokemon/{ => gen_1}/gengar/normal.pal | 0 graphics/pokemon/{ => gen_1}/gengar/shiny.pal | 0 .../{ => gen_1}/geodude/alolan/back.png | Bin .../{ => gen_1}/geodude/alolan/front.png | Bin .../{ => gen_1}/geodude/alolan/icon.png | Bin .../{ => gen_1}/geodude/alolan/normal.pal | 0 .../{ => gen_1}/geodude/alolan/shiny.pal | 0 .../{ => gen_1}/geodude/anim_front.png | Bin graphics/pokemon/{ => gen_1}/geodude/back.png | Bin .../geodude}/footprint.png | Bin graphics/pokemon/{ => gen_1}/geodude/icon.png | Bin .../pokemon/{ => gen_1}/geodude/normal.pal | 0 .../pokemon/{ => gen_1}/geodude/shiny.pal | 0 .../pokemon/{ => gen_1}/gloom/anim_front.png | Bin .../pokemon/{ => gen_1}/gloom/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/gloom/back.png | Bin graphics/pokemon/{ => gen_1}/gloom/backf.png | Bin .../pokemon/{ => gen_1}/gloom/footprint.png | Bin graphics/pokemon/{ => gen_1}/gloom/icon.png | Bin graphics/pokemon/{ => gen_1}/gloom/normal.pal | 0 graphics/pokemon/{ => gen_1}/gloom/shiny.pal | 0 .../pokemon/{ => gen_1}/golbat/anim_front.png | Bin .../{ => gen_1}/golbat/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/golbat/back.png | Bin graphics/pokemon/{ => gen_1}/golbat/backf.png | Bin .../pokemon/{ => gen_1}/golbat/footprint.png | Bin graphics/pokemon/{ => gen_1}/golbat/icon.png | Bin .../pokemon/{ => gen_1}/golbat/normal.pal | 0 graphics/pokemon/{ => gen_1}/golbat/shiny.pal | 0 .../{ => gen_1}/goldeen/anim_front.png | Bin .../{ => gen_1}/goldeen/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/goldeen/back.png | Bin .../pokemon/{ => gen_1}/goldeen/backf.png | Bin .../{binacle => gen_1/goldeen}/footprint.png | Bin graphics/pokemon/{ => gen_1}/goldeen/icon.png | Bin .../pokemon/{ => gen_1}/goldeen/normal.pal | 0 .../pokemon/{ => gen_1}/goldeen/shiny.pal | 0 .../{ => gen_1}/golduck/anim_front.png | Bin graphics/pokemon/{ => gen_1}/golduck/back.png | Bin .../pokemon/{ => gen_1}/golduck/footprint.png | Bin graphics/pokemon/{ => gen_1}/golduck/icon.png | Bin .../pokemon/{ => gen_1}/golduck/normal.pal | 0 .../pokemon/{ => gen_1}/golduck/shiny.pal | 0 .../pokemon/{ => gen_1}/golem/alolan/back.png | Bin .../{ => gen_1}/golem/alolan/front.png | Bin .../pokemon/{ => gen_1}/golem/alolan/icon.png | Bin .../{ => gen_1}/golem/alolan/normal.pal | 0 .../{ => gen_1}/golem/alolan/shiny.pal | 0 .../pokemon/{ => gen_1}/golem/anim_front.png | Bin graphics/pokemon/{ => gen_1}/golem/back.png | Bin .../pokemon/{ => gen_1}/golem/footprint.png | Bin graphics/pokemon/{ => gen_1}/golem/icon.png | Bin graphics/pokemon/{ => gen_1}/golem/normal.pal | 0 graphics/pokemon/{ => gen_1}/golem/shiny.pal | 0 .../{ => gen_1}/graveler/alolan/back.png | Bin .../{ => gen_1}/graveler/alolan/front.png | Bin .../{ => gen_1}/graveler/alolan/icon.png | Bin .../{ => gen_1}/graveler/alolan/normal.pal | 0 .../{ => gen_1}/graveler/alolan/shiny.pal | 0 .../{ => gen_1}/graveler/anim_front.png | Bin .../pokemon/{ => gen_1}/graveler/back.png | Bin .../{ => gen_1}/graveler/footprint.png | Bin .../pokemon/{ => gen_1}/graveler/icon.png | Bin .../pokemon/{ => gen_1}/graveler/normal.pal | 0 .../pokemon/{ => gen_1}/graveler/shiny.pal | 0 .../{ => gen_1}/grimer/alolan/back.png | Bin .../{ => gen_1}/grimer/alolan/front.png | Bin .../{ => gen_1}/grimer/alolan/icon.png | Bin .../{ => gen_1}/grimer/alolan/normal.pal | 0 .../{ => gen_1}/grimer/alolan/shiny.pal | 0 .../pokemon/{ => gen_1}/grimer/anim_front.png | Bin graphics/pokemon/{ => gen_1}/grimer/back.png | Bin .../{brionne => gen_1/grimer}/footprint.png | Bin graphics/pokemon/{ => gen_1}/grimer/icon.png | Bin .../pokemon/{ => gen_1}/grimer/normal.pal | 0 graphics/pokemon/{ => gen_1}/grimer/shiny.pal | 0 .../{ => gen_1}/growlithe/anim_front.png | Bin .../pokemon/{ => gen_1}/growlithe/back.png | Bin .../{ => gen_1}/growlithe/footprint.png | Bin .../{ => gen_1}/growlithe/hisuian/back.png | Bin .../{ => gen_1}/growlithe/hisuian/front.png | Bin .../{ => gen_1}/growlithe/hisuian/icon.png | Bin .../{ => gen_1}/growlithe/hisuian/normal.pal | 0 .../{ => gen_1}/growlithe/hisuian/shiny.pal | 0 .../pokemon/{ => gen_1}/growlithe/icon.png | Bin .../pokemon/{ => gen_1}/growlithe/normal.pal | 0 .../pokemon/{ => gen_1}/growlithe/shiny.pal | 0 .../{ => gen_1}/gyarados/anim_front.png | Bin .../{ => gen_1}/gyarados/anim_frontf.png | Bin .../pokemon/{ => gen_1}/gyarados/back.png | Bin .../pokemon/{ => gen_1}/gyarados/backf.png | Bin .../gyarados}/footprint.png | Bin .../pokemon/{ => gen_1}/gyarados/icon.png | Bin .../{ => gen_1}/gyarados/mega/back.png | Bin .../{ => gen_1}/gyarados/mega/front.png | Bin .../{ => gen_1}/gyarados/mega/icon.png | Bin .../{ => gen_1}/gyarados/mega/normal.pal | 0 .../{ => gen_1}/gyarados/mega/shiny.pal | 0 .../pokemon/{ => gen_1}/gyarados/normal.pal | 0 .../pokemon/{ => gen_1}/gyarados/shiny.pal | 0 .../{ => gen_1}/haunter/anim_front.png | Bin graphics/pokemon/{ => gen_1}/haunter/back.png | Bin .../{bronzor => gen_1/haunter}/footprint.png | Bin graphics/pokemon/{ => gen_1}/haunter/icon.png | Bin .../pokemon/{ => gen_1}/haunter/normal.pal | 0 .../pokemon/{ => gen_1}/haunter/shiny.pal | 0 .../{ => gen_1}/hitmonchan/anim_front.png | Bin .../pokemon/{ => gen_1}/hitmonchan/back.png | Bin .../{ => gen_1}/hitmonchan/footprint.png | Bin .../pokemon/{ => gen_1}/hitmonchan/icon.png | Bin .../pokemon/{ => gen_1}/hitmonchan/normal.pal | 0 .../pokemon/{ => gen_1}/hitmonchan/shiny.pal | 0 .../{ => gen_1}/hitmonlee/anim_front.png | Bin .../pokemon/{ => gen_1}/hitmonlee/back.png | Bin .../{ => gen_1}/hitmonlee/footprint.png | Bin .../pokemon/{ => gen_1}/hitmonlee/icon.png | Bin .../pokemon/{ => gen_1}/hitmonlee/normal.pal | 0 .../pokemon/{ => gen_1}/hitmonlee/shiny.pal | 0 .../pokemon/{ => gen_1}/horsea/anim_front.png | Bin graphics/pokemon/{ => gen_1}/horsea/back.png | Bin .../{bruxish => gen_1/horsea}/footprint.png | Bin graphics/pokemon/{ => gen_1}/horsea/icon.png | Bin .../pokemon/{ => gen_1}/horsea/normal.pal | 0 graphics/pokemon/{ => gen_1}/horsea/shiny.pal | 0 .../pokemon/{ => gen_1}/hypno/anim_front.png | Bin .../pokemon/{ => gen_1}/hypno/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/hypno/back.png | Bin graphics/pokemon/{ => gen_1}/hypno/backf.png | Bin .../pokemon/{ => gen_1}/hypno/footprint.png | Bin graphics/pokemon/{ => gen_1}/hypno/icon.png | Bin graphics/pokemon/{ => gen_1}/hypno/normal.pal | 0 graphics/pokemon/{ => gen_1}/hypno/shiny.pal | 0 .../{ => gen_1}/ivysaur/anim_front.png | Bin graphics/pokemon/{ => gen_1}/ivysaur/back.png | Bin .../{drednaw => gen_1/ivysaur}/footprint.png | Bin graphics/pokemon/{ => gen_1}/ivysaur/icon.png | Bin .../pokemon/{ => gen_1}/ivysaur/normal.pal | 0 .../pokemon/{ => gen_1}/ivysaur/shiny.pal | 0 .../{ => gen_1}/jigglypuff/anim_front.png | Bin .../pokemon/{ => gen_1}/jigglypuff/back.png | Bin .../{ => gen_1}/jigglypuff/footprint.png | Bin .../pokemon/{ => gen_1}/jigglypuff/icon.png | Bin .../pokemon/{ => gen_1}/jigglypuff/normal.pal | 0 .../pokemon/{ => gen_1}/jigglypuff/shiny.pal | 0 .../{ => gen_1}/jolteon/anim_front.png | Bin graphics/pokemon/{ => gen_1}/jolteon/back.png | Bin .../pokemon/{ => gen_1}/jolteon/footprint.png | Bin graphics/pokemon/{ => gen_1}/jolteon/icon.png | Bin .../pokemon/{ => gen_1}/jolteon/normal.pal | 0 .../pokemon/{ => gen_1}/jolteon/shiny.pal | 0 .../pokemon/{ => gen_1}/jynx/anim_front.png | Bin graphics/pokemon/{ => gen_1}/jynx/back.png | Bin .../{burmy/plant => gen_1/jynx}/footprint.png | Bin graphics/pokemon/{ => gen_1}/jynx/icon.png | Bin graphics/pokemon/{ => gen_1}/jynx/normal.pal | 0 graphics/pokemon/{ => gen_1}/jynx/shiny.pal | 0 .../pokemon/{ => gen_1}/kabuto/anim_front.png | Bin graphics/pokemon/{ => gen_1}/kabuto/back.png | Bin .../{baltoy => gen_1/kabuto}/footprint.png | Bin graphics/pokemon/{ => gen_1}/kabuto/icon.png | Bin .../pokemon/{ => gen_1}/kabuto/normal.pal | 0 graphics/pokemon/{ => gen_1}/kabuto/shiny.pal | 0 .../{ => gen_1}/kabutops/anim_front.png | Bin .../pokemon/{ => gen_1}/kabutops/back.png | Bin .../{ => gen_1}/kabutops/footprint.png | Bin .../pokemon/{ => gen_1}/kabutops/icon.png | Bin .../pokemon/{ => gen_1}/kabutops/normal.pal | 0 .../pokemon/{ => gen_1}/kabutops/shiny.pal | 0 .../{ => gen_1}/kadabra/anim_front.png | Bin .../{ => gen_1}/kadabra/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/kadabra/back.png | Bin .../pokemon/{ => gen_1}/kadabra/backf.png | Bin .../pokemon/{ => gen_1}/kadabra/footprint.png | Bin graphics/pokemon/{ => gen_1}/kadabra/icon.png | Bin .../pokemon/{ => gen_1}/kadabra/normal.pal | 0 .../pokemon/{ => gen_1}/kadabra/shiny.pal | 0 .../pokemon/{ => gen_1}/kakuna/anim_front.png | Bin graphics/pokemon/{ => gen_1}/kakuna/back.png | Bin .../{carbink => gen_1/kakuna}/footprint.png | Bin graphics/pokemon/{ => gen_1}/kakuna/icon.png | Bin .../pokemon/{ => gen_1}/kakuna/normal.pal | 0 graphics/pokemon/{ => gen_1}/kakuna/shiny.pal | 0 .../{ => gen_1}/kangaskhan/anim_front.png | Bin .../pokemon/{ => gen_1}/kangaskhan/back.png | Bin .../{ => gen_1}/kangaskhan/footprint.png | Bin .../pokemon/{ => gen_1}/kangaskhan/icon.png | Bin .../{ => gen_1}/kangaskhan/mega/back.png | Bin .../{ => gen_1}/kangaskhan/mega/front.png | Bin .../{ => gen_1}/kangaskhan/mega/icon.png | Bin .../{ => gen_1}/kangaskhan/mega/normal.pal | 0 .../{ => gen_1}/kangaskhan/mega/shiny.pal | 0 .../pokemon/{ => gen_1}/kangaskhan/normal.pal | 0 .../pokemon/{ => gen_1}/kangaskhan/shiny.pal | 0 .../{ => gen_1}/kingler/anim_front.png | Bin graphics/pokemon/{ => gen_1}/kingler/back.png | Bin .../pokemon/{ => gen_1}/kingler/footprint.png | Bin .../{ => gen_1}/kingler/gigantamax/back.png | Bin .../{ => gen_1}/kingler/gigantamax/front.png | Bin .../{ => gen_1}/kingler/gigantamax/icon.png | Bin .../{ => gen_1}/kingler/gigantamax/normal.pal | 0 .../{ => gen_1}/kingler/gigantamax/shiny.pal | 0 graphics/pokemon/{ => gen_1}/kingler/icon.png | Bin .../pokemon/{ => gen_1}/kingler/normal.pal | 0 .../pokemon/{ => gen_1}/kingler/shiny.pal | 0 .../{ => gen_1}/koffing/anim_front.png | Bin graphics/pokemon/{ => gen_1}/koffing/back.png | Bin .../koffing}/footprint.png | Bin graphics/pokemon/{ => gen_1}/koffing/icon.png | Bin .../pokemon/{ => gen_1}/koffing/normal.pal | 0 .../pokemon/{ => gen_1}/koffing/shiny.pal | 0 .../pokemon/{ => gen_1}/krabby/anim_front.png | Bin graphics/pokemon/{ => gen_1}/krabby/back.png | Bin .../pokemon/{ => gen_1}/krabby/footprint.png | Bin graphics/pokemon/{ => gen_1}/krabby/icon.png | Bin .../pokemon/{ => gen_1}/krabby/normal.pal | 0 graphics/pokemon/{ => gen_1}/krabby/shiny.pal | 0 .../pokemon/{ => gen_1}/lapras/anim_front.png | Bin graphics/pokemon/{ => gen_1}/lapras/back.png | Bin .../{carvanha => gen_1/lapras}/footprint.png | Bin .../{ => gen_1}/lapras/gigantamax/back.png | Bin .../{ => gen_1}/lapras/gigantamax/front.png | Bin .../{ => gen_1}/lapras/gigantamax/icon.png | Bin .../{ => gen_1}/lapras/gigantamax/normal.pal | 0 .../{ => gen_1}/lapras/gigantamax/shiny.pal | 0 graphics/pokemon/{ => gen_1}/lapras/icon.png | Bin .../pokemon/{ => gen_1}/lapras/normal.pal | 0 graphics/pokemon/{ => gen_1}/lapras/shiny.pal | 0 .../{ => gen_1}/lickitung/anim_front.png | Bin .../pokemon/{ => gen_1}/lickitung/back.png | Bin .../{ => gen_1}/lickitung/footprint.png | Bin .../pokemon/{ => gen_1}/lickitung/icon.png | Bin .../pokemon/{ => gen_1}/lickitung/normal.pal | 0 .../pokemon/{ => gen_1}/lickitung/shiny.pal | 0 .../{ => gen_1}/machamp/anim_front.png | Bin graphics/pokemon/{ => gen_1}/machamp/back.png | Bin .../pokemon/{ => gen_1}/machamp/footprint.png | Bin .../{ => gen_1}/machamp/gigantamax/back.png | Bin .../{ => gen_1}/machamp/gigantamax/front.png | Bin .../{ => gen_1}/machamp/gigantamax/icon.png | Bin .../{ => gen_1}/machamp/gigantamax/normal.pal | 0 .../{ => gen_1}/machamp/gigantamax/shiny.pal | 0 graphics/pokemon/{ => gen_1}/machamp/icon.png | Bin .../pokemon/{ => gen_1}/machamp/normal.pal | 0 .../pokemon/{ => gen_1}/machamp/shiny.pal | 0 .../{ => gen_1}/machoke/anim_front.png | Bin graphics/pokemon/{ => gen_1}/machoke/back.png | Bin .../pokemon/{ => gen_1}/machoke/footprint.png | Bin graphics/pokemon/{ => gen_1}/machoke/icon.png | Bin .../pokemon/{ => gen_1}/machoke/normal.pal | 0 .../pokemon/{ => gen_1}/machoke/shiny.pal | 0 .../pokemon/{ => gen_1}/machop/anim_front.png | Bin graphics/pokemon/{ => gen_1}/machop/back.png | Bin .../pokemon/{ => gen_1}/machop/footprint.png | Bin graphics/pokemon/{ => gen_1}/machop/icon.png | Bin .../pokemon/{ => gen_1}/machop/normal.pal | 0 graphics/pokemon/{ => gen_1}/machop/shiny.pal | 0 .../{ => gen_1}/magikarp/anim_front.png | Bin .../{ => gen_1}/magikarp/anim_frontf.png | Bin .../pokemon/{ => gen_1}/magikarp/back.png | Bin .../pokemon/{ => gen_1}/magikarp/backf.png | Bin .../{cascoon => gen_1/magikarp}/footprint.png | Bin .../pokemon/{ => gen_1}/magikarp/icon.png | Bin .../pokemon/{ => gen_1}/magikarp/normal.pal | 0 .../pokemon/{ => gen_1}/magikarp/shiny.pal | 0 .../pokemon/{ => gen_1}/magmar/anim_front.png | Bin graphics/pokemon/{ => gen_1}/magmar/back.png | Bin .../pokemon/{ => gen_1}/magmar/footprint.png | Bin graphics/pokemon/{ => gen_1}/magmar/icon.png | Bin .../pokemon/{ => gen_1}/magmar/normal.pal | 0 graphics/pokemon/{ => gen_1}/magmar/shiny.pal | 0 .../{ => gen_1}/magnemite/anim_front.png | Bin .../pokemon/{ => gen_1}/magnemite/back.png | Bin .../{ => gen_1}/magnemite/footprint.png | Bin .../pokemon/{ => gen_1}/magnemite/icon.png | Bin .../pokemon/{ => gen_1}/magnemite/normal.pal | 0 .../pokemon/{ => gen_1}/magnemite/shiny.pal | 0 .../{ => gen_1}/magneton/anim_front.png | Bin .../pokemon/{ => gen_1}/magneton/back.png | Bin .../{ => gen_1}/magneton/footprint.png | Bin .../pokemon/{ => gen_1}/magneton/icon.png | Bin .../pokemon/{ => gen_1}/magneton/normal.pal | 0 .../pokemon/{ => gen_1}/magneton/shiny.pal | 0 .../pokemon/{ => gen_1}/mankey/anim_front.png | Bin graphics/pokemon/{ => gen_1}/mankey/back.png | Bin .../pokemon/{ => gen_1}/mankey/footprint.png | Bin graphics/pokemon/{ => gen_1}/mankey/icon.png | Bin .../pokemon/{ => gen_1}/mankey/normal.pal | 0 graphics/pokemon/{ => gen_1}/mankey/shiny.pal | 0 .../{ => gen_1}/marowak/alolan/back.png | Bin .../{ => gen_1}/marowak/alolan/front.png | Bin .../{ => gen_1}/marowak/alolan/icon.png | Bin .../{ => gen_1}/marowak/alolan/normal.pal | 0 .../{ => gen_1}/marowak/alolan/shiny.pal | 0 .../{ => gen_1}/marowak/anim_front.png | Bin graphics/pokemon/{ => gen_1}/marowak/back.png | Bin .../pokemon/{ => gen_1}/marowak/footprint.png | Bin graphics/pokemon/{ => gen_1}/marowak/icon.png | Bin .../pokemon/{ => gen_1}/marowak/normal.pal | 0 .../pokemon/{ => gen_1}/marowak/shiny.pal | 0 .../{ => gen_1}/meowth/alolan/back.png | Bin .../{ => gen_1}/meowth/alolan/front.png | Bin .../{ => gen_1}/meowth/alolan/icon.png | Bin .../{ => gen_1}/meowth/alolan/normal.pal | 0 .../{ => gen_1}/meowth/alolan/shiny.pal | 0 .../pokemon/{ => gen_1}/meowth/anim_front.png | Bin graphics/pokemon/{ => gen_1}/meowth/back.png | Bin .../pokemon/{ => gen_1}/meowth/footprint.png | Bin .../{ => gen_1}/meowth/galarian/back.png | Bin .../{ => gen_1}/meowth/galarian/front.png | Bin .../{ => gen_1}/meowth/galarian/icon.png | Bin .../{ => gen_1}/meowth/galarian/normal.pal | 0 .../{ => gen_1}/meowth/galarian/shiny.pal | 0 .../{ => gen_1}/meowth/gigantamax/back.png | Bin .../{ => gen_1}/meowth/gigantamax/front.png | Bin .../{ => gen_1}/meowth/gigantamax/icon.png | Bin .../{ => gen_1}/meowth/gigantamax/normal.pal | 0 .../{ => gen_1}/meowth/gigantamax/shiny.pal | 0 graphics/pokemon/{ => gen_1}/meowth/icon.png | Bin .../pokemon/{ => gen_1}/meowth/normal.pal | 0 graphics/pokemon/{ => gen_1}/meowth/shiny.pal | 0 .../{ => gen_1}/metapod/anim_front.png | Bin graphics/pokemon/{ => gen_1}/metapod/back.png | Bin .../{castform => gen_1/metapod}/footprint.png | Bin graphics/pokemon/{ => gen_1}/metapod/icon.png | Bin .../pokemon/{ => gen_1}/metapod/normal.pal | 0 .../pokemon/{ => gen_1}/metapod/shiny.pal | 0 .../pokemon/{ => gen_1}/mew/anim_front.png | Bin graphics/pokemon/{ => gen_1}/mew/back.png | Bin .../pokemon/{ => gen_1}/mew/footprint.png | Bin graphics/pokemon/{ => gen_1}/mew/icon.png | Bin graphics/pokemon/{ => gen_1}/mew/normal.pal | 0 graphics/pokemon/{ => gen_1}/mew/shiny.pal | 0 .../pokemon/{ => gen_1}/mewtwo/anim_front.png | Bin graphics/pokemon/{ => gen_1}/mewtwo/back.png | Bin .../pokemon/{ => gen_1}/mewtwo/footprint.png | Bin graphics/pokemon/{ => gen_1}/mewtwo/icon.png | Bin .../{ => gen_1}/mewtwo/mega_x/back.png | Bin .../{ => gen_1}/mewtwo/mega_x/front.png | Bin .../{ => gen_1}/mewtwo/mega_x/icon.png | Bin .../{ => gen_1}/mewtwo/mega_x/normal.pal | 0 .../{ => gen_1}/mewtwo/mega_x/shiny.pal | 0 .../{ => gen_1}/mewtwo/mega_y/back.png | Bin .../{ => gen_1}/mewtwo/mega_y/front.png | Bin .../{ => gen_1}/mewtwo/mega_y/icon.png | Bin .../{ => gen_1}/mewtwo/mega_y/normal.pal | 0 .../{ => gen_1}/mewtwo/mega_y/shiny.pal | 0 .../pokemon/{ => gen_1}/mewtwo/normal.pal | 0 graphics/pokemon/{ => gen_1}/mewtwo/shiny.pal | 0 .../{ => gen_1}/moltres/anim_front.png | Bin graphics/pokemon/{ => gen_1}/moltres/back.png | Bin .../pokemon/{ => gen_1}/moltres/footprint.png | Bin .../{ => gen_1}/moltres/galarian/back.png | Bin .../{ => gen_1}/moltres/galarian/front.png | Bin .../{ => gen_1}/moltres/galarian/icon.png | Bin .../{ => gen_1}/moltres/galarian/normal.pal | 0 .../{ => gen_1}/moltres/galarian/shiny.pal | 0 graphics/pokemon/{ => gen_1}/moltres/icon.png | Bin .../pokemon/{ => gen_1}/moltres/normal.pal | 0 .../pokemon/{ => gen_1}/moltres/shiny.pal | 0 .../{ => gen_1}/mr_mime/anim_front.png | Bin graphics/pokemon/{ => gen_1}/mr_mime/back.png | Bin .../mr_mime}/footprint.png | Bin .../{ => gen_1}/mr_mime/galarian/back.png | Bin .../{ => gen_1}/mr_mime/galarian/front.png | Bin .../{ => gen_1}/mr_mime/galarian/icon.png | Bin .../{ => gen_1}/mr_mime/galarian/normal.pal | 0 .../{ => gen_1}/mr_mime/galarian/shiny.pal | 0 graphics/pokemon/{ => gen_1}/mr_mime/icon.png | Bin .../pokemon/{ => gen_1}/mr_mime/normal.pal | 0 .../pokemon/{ => gen_1}/mr_mime/shiny.pal | 0 .../pokemon/{ => gen_1}/muk/alolan/back.png | Bin .../pokemon/{ => gen_1}/muk/alolan/front.png | Bin .../pokemon/{ => gen_1}/muk/alolan/icon.png | Bin .../pokemon/{ => gen_1}/muk/alolan/normal.pal | 0 .../pokemon/{ => gen_1}/muk/alolan/shiny.pal | 0 .../pokemon/{ => gen_1}/muk/anim_front.png | Bin graphics/pokemon/{ => gen_1}/muk/back.png | Bin .../{chandelure => gen_1/muk}/footprint.png | Bin graphics/pokemon/{ => gen_1}/muk/icon.png | Bin graphics/pokemon/{ => gen_1}/muk/normal.pal | 0 graphics/pokemon/{ => gen_1}/muk/shiny.pal | 0 .../{ => gen_1}/nidoking/anim_front.png | Bin .../pokemon/{ => gen_1}/nidoking/back.png | Bin .../{ => gen_1}/nidoking/footprint.png | Bin .../pokemon/{ => gen_1}/nidoking/icon.png | Bin .../pokemon/{ => gen_1}/nidoking/normal.pal | 0 .../pokemon/{ => gen_1}/nidoking/shiny.pal | 0 .../{ => gen_1}/nidoqueen/anim_front.png | Bin .../pokemon/{ => gen_1}/nidoqueen/back.png | Bin .../{ => gen_1}/nidoqueen/footprint.png | Bin .../pokemon/{ => gen_1}/nidoqueen/icon.png | Bin .../pokemon/{ => gen_1}/nidoqueen/normal.pal | 0 .../pokemon/{ => gen_1}/nidoqueen/shiny.pal | 0 .../{ => gen_1}/nidoran_f/anim_front.png | Bin .../pokemon/{ => gen_1}/nidoran_f/back.png | Bin .../{ => gen_1}/nidoran_f/footprint.png | Bin .../pokemon/{ => gen_1}/nidoran_f/icon.png | Bin .../pokemon/{ => gen_1}/nidoran_f/normal.pal | 0 .../pokemon/{ => gen_1}/nidoran_f/shiny.pal | 0 .../{ => gen_1}/nidoran_m/anim_front.png | Bin .../pokemon/{ => gen_1}/nidoran_m/back.png | Bin .../{ => gen_1}/nidoran_m/footprint.png | Bin .../pokemon/{ => gen_1}/nidoran_m/icon.png | Bin .../pokemon/{ => gen_1}/nidoran_m/normal.pal | 0 .../pokemon/{ => gen_1}/nidoran_m/shiny.pal | 0 .../{ => gen_1}/nidorina/anim_front.png | Bin .../pokemon/{ => gen_1}/nidorina/back.png | Bin .../{ => gen_1}/nidorina/footprint.png | Bin .../pokemon/{ => gen_1}/nidorina/icon.png | Bin .../pokemon/{ => gen_1}/nidorina/normal.pal | 0 .../pokemon/{ => gen_1}/nidorina/shiny.pal | 0 .../{ => gen_1}/nidorino/anim_front.png | Bin .../pokemon/{ => gen_1}/nidorino/back.png | Bin .../{ => gen_1}/nidorino/footprint.png | Bin .../pokemon/{ => gen_1}/nidorino/icon.png | Bin .../pokemon/{ => gen_1}/nidorino/normal.pal | 0 .../pokemon/{ => gen_1}/nidorino/shiny.pal | 0 .../{ => gen_1}/ninetales/alolan/back.png | Bin .../{ => gen_1}/ninetales/alolan/front.png | Bin .../{ => gen_1}/ninetales/alolan/icon.png | Bin .../{ => gen_1}/ninetales/alolan/normal.pal | 0 .../{ => gen_1}/ninetales/alolan/shiny.pal | 0 .../{ => gen_1}/ninetales/anim_front.png | Bin .../pokemon/{ => gen_1}/ninetales/back.png | Bin .../{ => gen_1}/ninetales/footprint.png | Bin .../pokemon/{ => gen_1}/ninetales/icon.png | Bin .../pokemon/{ => gen_1}/ninetales/normal.pal | 0 .../pokemon/{ => gen_1}/ninetales/shiny.pal | 0 .../pokemon/{ => gen_1}/oddish/anim_front.png | Bin graphics/pokemon/{ => gen_1}/oddish/back.png | Bin .../pokemon/{ => gen_1}/oddish/footprint.png | Bin graphics/pokemon/{ => gen_1}/oddish/icon.png | Bin .../pokemon/{ => gen_1}/oddish/normal.pal | 0 graphics/pokemon/{ => gen_1}/oddish/shiny.pal | 0 .../{ => gen_1}/omanyte/anim_front.png | Bin graphics/pokemon/{ => gen_1}/omanyte/back.png | Bin .../pokemon/{ => gen_1}/omanyte/footprint.png | Bin graphics/pokemon/{ => gen_1}/omanyte/icon.png | Bin .../pokemon/{ => gen_1}/omanyte/normal.pal | 0 .../pokemon/{ => gen_1}/omanyte/shiny.pal | 0 .../{ => gen_1}/omastar/anim_front.png | Bin graphics/pokemon/{ => gen_1}/omastar/back.png | Bin .../pokemon/{ => gen_1}/omastar/footprint.png | Bin graphics/pokemon/{ => gen_1}/omastar/icon.png | Bin .../pokemon/{ => gen_1}/omastar/normal.pal | 0 .../pokemon/{ => gen_1}/omastar/shiny.pal | 0 .../pokemon/{ => gen_1}/onix/anim_front.png | Bin graphics/pokemon/{ => gen_1}/onix/back.png | Bin .../{charjabug => gen_1/onix}/footprint.png | Bin graphics/pokemon/{ => gen_1}/onix/icon.png | Bin graphics/pokemon/{ => gen_1}/onix/normal.pal | 0 graphics/pokemon/{ => gen_1}/onix/shiny.pal | 0 .../pokemon/{ => gen_1}/paras/anim_front.png | Bin graphics/pokemon/{ => gen_1}/paras/back.png | Bin .../{gossifleur => gen_1/paras}/footprint.png | Bin graphics/pokemon/{ => gen_1}/paras/icon.png | Bin graphics/pokemon/{ => gen_1}/paras/normal.pal | 0 graphics/pokemon/{ => gen_1}/paras/shiny.pal | 0 .../{ => gen_1}/parasect/anim_front.png | Bin .../pokemon/{ => gen_1}/parasect/back.png | Bin .../{ => gen_1}/parasect/footprint.png | Bin .../pokemon/{ => gen_1}/parasect/icon.png | Bin .../pokemon/{ => gen_1}/parasect/normal.pal | 0 .../pokemon/{ => gen_1}/parasect/shiny.pal | 0 .../{ => gen_1}/persian/alolan/back.png | Bin .../{ => gen_1}/persian/alolan/front.png | Bin .../{ => gen_1}/persian/alolan/icon.png | Bin .../{ => gen_1}/persian/alolan/normal.pal | 0 .../{ => gen_1}/persian/alolan/shiny.pal | 0 .../{ => gen_1}/persian/anim_front.png | Bin graphics/pokemon/{ => gen_1}/persian/back.png | Bin .../pokemon/{ => gen_1}/persian/footprint.png | Bin graphics/pokemon/{ => gen_1}/persian/icon.png | Bin .../pokemon/{ => gen_1}/persian/normal.pal | 0 .../pokemon/{ => gen_1}/persian/shiny.pal | 0 .../{ => gen_1}/pidgeot/anim_front.png | Bin graphics/pokemon/{ => gen_1}/pidgeot/back.png | Bin .../pidgeot}/footprint.png | Bin graphics/pokemon/{ => gen_1}/pidgeot/icon.png | Bin .../pokemon/{ => gen_1}/pidgeot/mega/back.png | Bin .../{ => gen_1}/pidgeot/mega/front.png | Bin .../pokemon/{ => gen_1}/pidgeot/mega/icon.png | Bin .../{ => gen_1}/pidgeot/mega/normal.pal | 0 .../{ => gen_1}/pidgeot/mega/shiny.pal | 0 .../pokemon/{ => gen_1}/pidgeot/normal.pal | 0 .../pokemon/{ => gen_1}/pidgeot/shiny.pal | 0 .../{ => gen_1}/pidgeotto/anim_front.png | Bin .../pokemon/{ => gen_1}/pidgeotto/back.png | Bin .../pidgeotto}/footprint.png | Bin .../pokemon/{ => gen_1}/pidgeotto/icon.png | Bin .../pokemon/{ => gen_1}/pidgeotto/normal.pal | 0 .../pokemon/{ => gen_1}/pidgeotto/shiny.pal | 0 .../pokemon/{ => gen_1}/pidgey/anim_front.png | Bin graphics/pokemon/{ => gen_1}/pidgey/back.png | Bin .../pokemon/{ => gen_1}/pidgey/footprint.png | Bin graphics/pokemon/{ => gen_1}/pidgey/icon.png | Bin .../pokemon/{ => gen_1}/pidgey/normal.pal | 0 graphics/pokemon/{ => gen_1}/pidgey/shiny.pal | 0 .../{ => gen_1}/pikachu/alola_cap/back.png | Bin .../{ => gen_1}/pikachu/alola_cap/front.png | Bin .../{ => gen_1}/pikachu/alola_cap/icon.png | Bin .../{ => gen_1}/pikachu/alola_cap/normal.pal | 0 .../{ => gen_1}/pikachu/alola_cap/shiny.pal | 0 .../{ => gen_1}/pikachu/anim_front.png | Bin .../{ => gen_1}/pikachu/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/pikachu/back.png | Bin .../pokemon/{ => gen_1}/pikachu/backf.png | Bin .../{ => gen_1}/pikachu/belle/back.png | Bin .../{ => gen_1}/pikachu/belle/front.png | Bin .../{ => gen_1}/pikachu/belle/icon.png | Bin .../{ => gen_1}/pikachu/belle/normal.pal | 0 .../{ => gen_1}/pikachu/belle/shiny.pal | 0 .../{ => gen_1}/pikachu/cosplay/back.png | Bin .../{ => gen_1}/pikachu/cosplay/front.png | Bin .../{ => gen_1}/pikachu/cosplay/icon.png | Bin .../{ => gen_1}/pikachu/cosplay/normal.pal | 0 .../{ => gen_1}/pikachu/cosplay/shiny.pal | 0 .../pokemon/{ => gen_1}/pikachu/footprint.png | Bin .../{ => gen_1}/pikachu/gigantamax/back.png | Bin .../{ => gen_1}/pikachu/gigantamax/front.png | Bin .../{ => gen_1}/pikachu/gigantamax/icon.png | Bin .../{ => gen_1}/pikachu/gigantamax/normal.pal | 0 .../{ => gen_1}/pikachu/gigantamax/shiny.pal | 0 .../{ => gen_1}/pikachu/hoenn_cap/back.png | Bin .../{ => gen_1}/pikachu/hoenn_cap/front.png | Bin .../{ => gen_1}/pikachu/hoenn_cap/icon.png | Bin .../{ => gen_1}/pikachu/hoenn_cap/normal.pal | 0 .../{ => gen_1}/pikachu/hoenn_cap/shiny.pal | 0 graphics/pokemon/{ => gen_1}/pikachu/icon.png | Bin .../pokemon/{ => gen_1}/pikachu/iconf.png | Bin .../{ => gen_1}/pikachu/kalos_cap/back.png | Bin .../{ => gen_1}/pikachu/kalos_cap/front.png | Bin .../{ => gen_1}/pikachu/kalos_cap/icon.png | Bin .../{ => gen_1}/pikachu/kalos_cap/normal.pal | 0 .../{ => gen_1}/pikachu/kalos_cap/shiny.pal | 0 .../{ => gen_1}/pikachu/libre/back.png | Bin .../{ => gen_1}/pikachu/libre/front.png | Bin .../{ => gen_1}/pikachu/libre/icon.png | Bin .../{ => gen_1}/pikachu/libre/normal.pal | 0 .../{ => gen_1}/pikachu/libre/shiny.pal | 0 .../pokemon/{ => gen_1}/pikachu/normal.pal | 0 .../{ => gen_1}/pikachu/original_cap/back.png | Bin .../pikachu/original_cap/front.png | Bin .../{ => gen_1}/pikachu/original_cap/icon.png | Bin .../pikachu/original_cap/normal.pal | 0 .../pikachu/original_cap/shiny.pal | 0 .../{ => gen_1}/pikachu/partner_cap/back.png | Bin .../{ => gen_1}/pikachu/partner_cap/front.png | Bin .../{ => gen_1}/pikachu/partner_cap/icon.png | Bin .../pikachu/partner_cap/normal.pal | 0 .../{ => gen_1}/pikachu/partner_cap/shiny.pal | 0 .../pokemon/{ => gen_1}/pikachu/ph_d/back.png | Bin .../{ => gen_1}/pikachu/ph_d/front.png | Bin .../pokemon/{ => gen_1}/pikachu/ph_d/icon.png | Bin .../{ => gen_1}/pikachu/ph_d/normal.pal | 0 .../{ => gen_1}/pikachu/ph_d/shiny.pal | 0 .../{ => gen_1}/pikachu/pop_star/back.png | Bin .../{ => gen_1}/pikachu/pop_star/front.png | Bin .../{ => gen_1}/pikachu/pop_star/icon.png | Bin .../{ => gen_1}/pikachu/pop_star/normal.pal | 0 .../{ => gen_1}/pikachu/pop_star/shiny.pal | 0 .../{ => gen_1}/pikachu/rock_star/back.png | Bin .../{ => gen_1}/pikachu/rock_star/front.png | Bin .../{ => gen_1}/pikachu/rock_star/icon.png | Bin .../{ => gen_1}/pikachu/rock_star/normal.pal | 0 .../{ => gen_1}/pikachu/rock_star/shiny.pal | 0 .../pokemon/{ => gen_1}/pikachu/shiny.pal | 0 .../{ => gen_1}/pikachu/sinnoh_cap/back.png | Bin .../{ => gen_1}/pikachu/sinnoh_cap/front.png | Bin .../{ => gen_1}/pikachu/sinnoh_cap/icon.png | Bin .../{ => gen_1}/pikachu/sinnoh_cap/normal.pal | 0 .../{ => gen_1}/pikachu/sinnoh_cap/shiny.pal | 0 .../{ => gen_1}/pikachu/unova_cap/back.png | Bin .../{ => gen_1}/pikachu/unova_cap/front.png | Bin .../{ => gen_1}/pikachu/unova_cap/icon.png | Bin .../{ => gen_1}/pikachu/unova_cap/normal.pal | 0 .../{ => gen_1}/pikachu/unova_cap/shiny.pal | 0 .../{ => gen_1}/pikachu/world_cap/back.png | Bin .../{ => gen_1}/pikachu/world_cap/front.png | Bin .../{ => gen_1}/pikachu/world_cap/icon.png | Bin .../{ => gen_1}/pikachu/world_cap/normal.pal | 0 .../{ => gen_1}/pikachu/world_cap/shiny.pal | 0 .../pokemon/{ => gen_1}/pinsir/anim_front.png | Bin graphics/pokemon/{ => gen_1}/pinsir/back.png | Bin .../pokemon/{ => gen_1}/pinsir/footprint.png | Bin graphics/pokemon/{ => gen_1}/pinsir/icon.png | Bin .../pokemon/{ => gen_1}/pinsir/mega/back.png | Bin .../pokemon/{ => gen_1}/pinsir/mega/front.png | Bin .../pokemon/{ => gen_1}/pinsir/mega/icon.png | Bin .../{ => gen_1}/pinsir/mega/normal.pal | 0 .../pokemon/{ => gen_1}/pinsir/mega/shiny.pal | 0 .../pokemon/{ => gen_1}/pinsir/normal.pal | 0 graphics/pokemon/{ => gen_1}/pinsir/shiny.pal | 0 .../{ => gen_1}/poliwag/anim_front.png | Bin graphics/pokemon/{ => gen_1}/poliwag/back.png | Bin .../poliwag}/footprint.png | Bin graphics/pokemon/{ => gen_1}/poliwag/icon.png | Bin .../pokemon/{ => gen_1}/poliwag/normal.pal | 0 .../pokemon/{ => gen_1}/poliwag/shiny.pal | 0 .../{ => gen_1}/poliwhirl/anim_front.png | Bin .../pokemon/{ => gen_1}/poliwhirl/back.png | Bin .../{ => gen_1}/poliwhirl/footprint.png | Bin .../pokemon/{ => gen_1}/poliwhirl/icon.png | Bin .../pokemon/{ => gen_1}/poliwhirl/normal.pal | 0 .../pokemon/{ => gen_1}/poliwhirl/shiny.pal | 0 .../{ => gen_1}/poliwrath/anim_front.png | Bin .../pokemon/{ => gen_1}/poliwrath/back.png | Bin .../{ => gen_1}/poliwrath/footprint.png | Bin .../pokemon/{ => gen_1}/poliwrath/icon.png | Bin .../pokemon/{ => gen_1}/poliwrath/normal.pal | 0 .../pokemon/{ => gen_1}/poliwrath/shiny.pal | 0 .../pokemon/{ => gen_1}/ponyta/anim_front.png | Bin graphics/pokemon/{ => gen_1}/ponyta/back.png | Bin .../pokemon/{ => gen_1}/ponyta/footprint.png | Bin .../{ => gen_1}/ponyta/galarian/back.png | Bin .../{ => gen_1}/ponyta/galarian/front.png | Bin .../{ => gen_1}/ponyta/galarian/icon.png | Bin .../{ => gen_1}/ponyta/galarian/normal.pal | 0 .../{ => gen_1}/ponyta/galarian/shiny.pal | 0 graphics/pokemon/{ => gen_1}/ponyta/icon.png | Bin .../pokemon/{ => gen_1}/ponyta/normal.pal | 0 graphics/pokemon/{ => gen_1}/ponyta/shiny.pal | 0 .../{ => gen_1}/porygon/anim_front.png | Bin graphics/pokemon/{ => gen_1}/porygon/back.png | Bin .../pokemon/{ => gen_1}/porygon/footprint.png | Bin graphics/pokemon/{ => gen_1}/porygon/icon.png | Bin .../pokemon/{ => gen_1}/porygon/normal.pal | 0 .../pokemon/{ => gen_1}/porygon/shiny.pal | 0 .../{ => gen_1}/primeape/anim_front.png | Bin .../pokemon/{ => gen_1}/primeape/back.png | Bin .../{ => gen_1}/primeape/footprint.png | Bin .../pokemon/{ => gen_1}/primeape/icon.png | Bin .../pokemon/{ => gen_1}/primeape/normal.pal | 0 .../pokemon/{ => gen_1}/primeape/shiny.pal | 0 .../{ => gen_1}/psyduck/anim_front.png | Bin graphics/pokemon/{ => gen_1}/psyduck/back.png | Bin .../psyduck}/footprint.png | Bin graphics/pokemon/{ => gen_1}/psyduck/icon.png | Bin .../pokemon/{ => gen_1}/psyduck/normal.pal | 0 .../pokemon/{ => gen_1}/psyduck/shiny.pal | 0 .../{ => gen_1}/raichu/alolan/back.png | Bin .../{ => gen_1}/raichu/alolan/front.png | Bin .../{ => gen_1}/raichu/alolan/icon.png | Bin .../{ => gen_1}/raichu/alolan/normal.pal | 0 .../{ => gen_1}/raichu/alolan/shiny.pal | 0 .../pokemon/{ => gen_1}/raichu/anim_front.png | Bin .../{ => gen_1}/raichu/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/raichu/back.png | Bin .../pokemon/{ => gen_1}/raichu/footprint.png | Bin graphics/pokemon/{ => gen_1}/raichu/icon.png | Bin .../pokemon/{ => gen_1}/raichu/normal.pal | 0 graphics/pokemon/{ => gen_1}/raichu/shiny.pal | 0 .../{ => gen_1}/rapidash/anim_front.png | Bin .../pokemon/{ => gen_1}/rapidash/back.png | Bin .../{ => gen_1}/rapidash/footprint.png | Bin .../{ => gen_1}/rapidash/galarian/back.png | Bin .../{ => gen_1}/rapidash/galarian/front.png | Bin .../{ => gen_1}/rapidash/galarian/icon.png | Bin .../{ => gen_1}/rapidash/galarian/normal.pal | 0 .../{ => gen_1}/rapidash/galarian/shiny.pal | 0 .../pokemon/{ => gen_1}/rapidash/icon.png | Bin .../pokemon/{ => gen_1}/rapidash/normal.pal | 0 .../pokemon/{ => gen_1}/rapidash/shiny.pal | 0 .../{ => gen_1}/raticate/alolan/back.png | Bin .../{ => gen_1}/raticate/alolan/front.png | Bin .../{ => gen_1}/raticate/alolan/icon.png | Bin .../{ => gen_1}/raticate/alolan/normal.pal | 0 .../{ => gen_1}/raticate/alolan/shiny.pal | 0 .../{ => gen_1}/raticate/anim_front.png | Bin .../{ => gen_1}/raticate/anim_frontf.png | Bin .../pokemon/{ => gen_1}/raticate/back.png | Bin .../pokemon/{ => gen_1}/raticate/backf.png | Bin .../raticate}/footprint.png | Bin .../pokemon/{ => gen_1}/raticate/icon.png | Bin .../pokemon/{ => gen_1}/raticate/normal.pal | 0 .../pokemon/{ => gen_1}/raticate/shiny.pal | 0 .../{ => gen_1}/rattata/alolan/back.png | Bin .../{ => gen_1}/rattata/alolan/front.png | Bin .../{ => gen_1}/rattata/alolan/icon.png | Bin .../{ => gen_1}/rattata/alolan/normal.pal | 0 .../{ => gen_1}/rattata/alolan/shiny.pal | 0 .../{ => gen_1}/rattata/anim_front.png | Bin .../{ => gen_1}/rattata/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/rattata/back.png | Bin .../pokemon/{ => gen_1}/rattata/backf.png | Bin .../pokemon/{ => gen_1}/rattata/footprint.png | Bin graphics/pokemon/{ => gen_1}/rattata/icon.png | Bin .../pokemon/{ => gen_1}/rattata/normal.pal | 0 .../pokemon/{ => gen_1}/rattata/shiny.pal | 0 .../pokemon/{ => gen_1}/rhydon/anim_front.png | Bin .../{ => gen_1}/rhydon/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/rhydon/back.png | Bin graphics/pokemon/{ => gen_1}/rhydon/backf.png | Bin .../pokemon/{ => gen_1}/rhydon/footprint.png | Bin graphics/pokemon/{ => gen_1}/rhydon/icon.png | Bin .../pokemon/{ => gen_1}/rhydon/normal.pal | 0 graphics/pokemon/{ => gen_1}/rhydon/shiny.pal | 0 .../{ => gen_1}/rhyhorn/anim_front.png | Bin .../{ => gen_1}/rhyhorn/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/rhyhorn/back.png | Bin .../pokemon/{ => gen_1}/rhyhorn/backf.png | Bin .../pokemon/{ => gen_1}/rhyhorn/footprint.png | Bin graphics/pokemon/{ => gen_1}/rhyhorn/icon.png | Bin .../pokemon/{ => gen_1}/rhyhorn/normal.pal | 0 .../pokemon/{ => gen_1}/rhyhorn/shiny.pal | 0 .../{ => gen_1}/sandshrew/alolan/back.png | Bin .../{ => gen_1}/sandshrew/alolan/front.png | Bin .../{ => gen_1}/sandshrew/alolan/icon.png | Bin .../{ => gen_1}/sandshrew/alolan/normal.pal | 0 .../{ => gen_1}/sandshrew/alolan/shiny.pal | 0 .../{ => gen_1}/sandshrew/anim_front.png | Bin .../pokemon/{ => gen_1}/sandshrew/back.png | Bin .../{ => gen_1}/sandshrew/footprint.png | Bin .../pokemon/{ => gen_1}/sandshrew/icon.png | Bin .../pokemon/{ => gen_1}/sandshrew/normal.pal | 0 .../pokemon/{ => gen_1}/sandshrew/shiny.pal | 0 .../{ => gen_1}/sandslash/alolan/back.png | Bin .../{ => gen_1}/sandslash/alolan/front.png | Bin .../{ => gen_1}/sandslash/alolan/icon.png | Bin .../{ => gen_1}/sandslash/alolan/normal.pal | 0 .../{ => gen_1}/sandslash/alolan/shiny.pal | 0 .../{ => gen_1}/sandslash/anim_front.png | Bin .../pokemon/{ => gen_1}/sandslash/back.png | Bin .../{ => gen_1}/sandslash/footprint.png | Bin .../pokemon/{ => gen_1}/sandslash/icon.png | Bin .../pokemon/{ => gen_1}/sandslash/normal.pal | 0 .../pokemon/{ => gen_1}/sandslash/shiny.pal | 0 .../{ => gen_1}/scyther/anim_front.png | Bin .../{ => gen_1}/scyther/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/scyther/back.png | Bin .../pokemon/{ => gen_1}/scyther/footprint.png | Bin graphics/pokemon/{ => gen_1}/scyther/icon.png | Bin .../pokemon/{ => gen_1}/scyther/normal.pal | 0 .../pokemon/{ => gen_1}/scyther/shiny.pal | 0 .../pokemon/{ => gen_1}/seadra/anim_front.png | Bin graphics/pokemon/{ => gen_1}/seadra/back.png | Bin .../{chimecho => gen_1/seadra}/footprint.png | Bin graphics/pokemon/{ => gen_1}/seadra/icon.png | Bin .../pokemon/{ => gen_1}/seadra/normal.pal | 0 graphics/pokemon/{ => gen_1}/seadra/shiny.pal | 0 .../{ => gen_1}/seaking/anim_front.png | Bin .../{ => gen_1}/seaking/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/seaking/back.png | Bin .../pokemon/{ => gen_1}/seaking/backf.png | Bin .../{chinchou => gen_1/seaking}/footprint.png | Bin graphics/pokemon/{ => gen_1}/seaking/icon.png | Bin .../pokemon/{ => gen_1}/seaking/normal.pal | 0 .../pokemon/{ => gen_1}/seaking/shiny.pal | 0 .../pokemon/{ => gen_1}/seel/anim_front.png | Bin graphics/pokemon/{ => gen_1}/seel/back.png | Bin .../{clamperl => gen_1/seel}/footprint.png | Bin graphics/pokemon/{ => gen_1}/seel/icon.png | Bin graphics/pokemon/{ => gen_1}/seel/normal.pal | 0 graphics/pokemon/{ => gen_1}/seel/shiny.pal | 0 .../{ => gen_1}/shellder/anim_front.png | Bin .../pokemon/{ => gen_1}/shellder/back.png | Bin .../shellder}/footprint.png | Bin .../pokemon/{ => gen_1}/shellder/icon.png | Bin .../pokemon/{ => gen_1}/shellder/normal.pal | 0 .../pokemon/{ => gen_1}/shellder/shiny.pal | 0 .../{ => gen_1}/slowbro/anim_front.png | Bin graphics/pokemon/{ => gen_1}/slowbro/back.png | Bin .../pokemon/{ => gen_1}/slowbro/footprint.png | Bin .../{ => gen_1}/slowbro/galarian/back.png | Bin .../{ => gen_1}/slowbro/galarian/front.png | Bin .../{ => gen_1}/slowbro/galarian/icon.png | Bin .../{ => gen_1}/slowbro/galarian/normal.pal | 0 .../{ => gen_1}/slowbro/galarian/shiny.pal | 0 graphics/pokemon/{ => gen_1}/slowbro/icon.png | Bin .../pokemon/{ => gen_1}/slowbro/mega/back.png | Bin .../{ => gen_1}/slowbro/mega/front.png | Bin .../pokemon/{ => gen_1}/slowbro/mega/icon.png | Bin .../{ => gen_1}/slowbro/mega/normal.pal | 0 .../{ => gen_1}/slowbro/mega/shiny.pal | 0 .../pokemon/{ => gen_1}/slowbro/normal.pal | 0 .../pokemon/{ => gen_1}/slowbro/shiny.pal | 0 .../{ => gen_1}/slowpoke/anim_front.png | Bin .../pokemon/{ => gen_1}/slowpoke/back.png | Bin .../{ => gen_1}/slowpoke/footprint.png | Bin .../{ => gen_1}/slowpoke/galarian/back.png | Bin .../{ => gen_1}/slowpoke/galarian/front.png | Bin .../{ => gen_1}/slowpoke/galarian/icon.png | Bin .../{ => gen_1}/slowpoke/galarian/normal.pal | 0 .../{ => gen_1}/slowpoke/galarian/shiny.pal | 0 .../pokemon/{ => gen_1}/slowpoke/icon.png | Bin .../pokemon/{ => gen_1}/slowpoke/normal.pal | 0 .../pokemon/{ => gen_1}/slowpoke/shiny.pal | 0 .../{ => gen_1}/snorlax/anim_front.png | Bin graphics/pokemon/{ => gen_1}/snorlax/back.png | Bin .../pokemon/{ => gen_1}/snorlax/footprint.png | Bin .../{ => gen_1}/snorlax/gigantamax/back.png | Bin .../{ => gen_1}/snorlax/gigantamax/front.png | Bin .../{ => gen_1}/snorlax/gigantamax/icon.png | Bin .../{ => gen_1}/snorlax/gigantamax/normal.pal | 0 .../{ => gen_1}/snorlax/gigantamax/shiny.pal | 0 graphics/pokemon/{ => gen_1}/snorlax/icon.png | Bin .../pokemon/{ => gen_1}/snorlax/normal.pal | 0 .../pokemon/{ => gen_1}/snorlax/shiny.pal | 0 .../{ => gen_1}/spearow/anim_front.png | Bin graphics/pokemon/{ => gen_1}/spearow/back.png | Bin .../{rookidee => gen_1/spearow}/footprint.png | Bin graphics/pokemon/{ => gen_1}/spearow/icon.png | Bin .../pokemon/{ => gen_1}/spearow/normal.pal | 0 .../pokemon/{ => gen_1}/spearow/shiny.pal | 0 .../{ => gen_1}/squirtle/anim_front.png | Bin .../pokemon/{ => gen_1}/squirtle/back.png | Bin .../{ => gen_1}/squirtle/footprint.png | Bin .../pokemon/{ => gen_1}/squirtle/icon.png | Bin .../pokemon/{ => gen_1}/squirtle/normal.pal | 0 .../pokemon/{ => gen_1}/squirtle/shiny.pal | 0 .../{ => gen_1}/starmie/anim_front.png | Bin graphics/pokemon/{ => gen_1}/starmie/back.png | Bin .../starmie}/footprint.png | Bin graphics/pokemon/{ => gen_1}/starmie/icon.png | Bin .../pokemon/{ => gen_1}/starmie/normal.pal | 0 .../pokemon/{ => gen_1}/starmie/shiny.pal | 0 .../pokemon/{ => gen_1}/staryu/anim_front.png | Bin graphics/pokemon/{ => gen_1}/staryu/back.png | Bin .../{blipbug => gen_1/staryu}/footprint.png | Bin graphics/pokemon/{ => gen_1}/staryu/icon.png | Bin .../pokemon/{ => gen_1}/staryu/normal.pal | 0 graphics/pokemon/{ => gen_1}/staryu/shiny.pal | 0 .../{ => gen_1}/tangela/anim_front.png | Bin graphics/pokemon/{ => gen_1}/tangela/back.png | Bin .../pokemon/{ => gen_1}/tangela/footprint.png | Bin graphics/pokemon/{ => gen_1}/tangela/icon.png | Bin .../pokemon/{ => gen_1}/tangela/normal.pal | 0 .../pokemon/{ => gen_1}/tangela/shiny.pal | 0 .../pokemon/{ => gen_1}/tauros/anim_front.png | Bin graphics/pokemon/{ => gen_1}/tauros/back.png | Bin .../pokemon/{ => gen_1}/tauros/footprint.png | Bin graphics/pokemon/{ => gen_1}/tauros/icon.png | Bin .../pokemon/{ => gen_1}/tauros/normal.pal | 0 .../tauros/paldean_aqua_breed/back.png | Bin .../tauros/paldean_aqua_breed/front.png | Bin .../tauros/paldean_aqua_breed/icon.png | Bin .../tauros/paldean_aqua_breed/normal.pal | 0 .../tauros/paldean_aqua_breed/shiny.pal | 0 .../tauros/paldean_blaze_breed/back.png | Bin .../tauros/paldean_blaze_breed/front.ase | Bin .../tauros/paldean_blaze_breed/front.png | Bin .../tauros/paldean_blaze_breed/icon.png | Bin .../tauros/paldean_blaze_breed/normal.pal | 0 .../tauros/paldean_blaze_breed/shiny.pal | 0 .../tauros/paldean_combat_breed/back.png | Bin .../tauros/paldean_combat_breed/front.png | Bin .../tauros/paldean_combat_breed/icon.png | Bin .../tauros/paldean_combat_breed/normal.pal | 0 .../tauros/paldean_combat_breed/shiny.pal | 0 graphics/pokemon/{ => gen_1}/tauros/shiny.pal | 0 .../{ => gen_1}/tentacool/anim_front.png | Bin .../pokemon/{ => gen_1}/tentacool/back.png | Bin .../tentacool}/footprint.png | Bin .../pokemon/{ => gen_1}/tentacool/icon.png | Bin .../pokemon/{ => gen_1}/tentacool/normal.pal | 0 .../pokemon/{ => gen_1}/tentacool/shiny.pal | 0 .../{ => gen_1}/tentacruel/anim_front.png | Bin .../pokemon/{ => gen_1}/tentacruel/back.png | Bin .../tentacruel}/footprint.png | Bin .../pokemon/{ => gen_1}/tentacruel/icon.png | Bin .../pokemon/{ => gen_1}/tentacruel/normal.pal | 0 .../pokemon/{ => gen_1}/tentacruel/shiny.pal | 0 .../{ => gen_1}/vaporeon/anim_front.png | Bin .../pokemon/{ => gen_1}/vaporeon/back.png | Bin .../vaporeon}/footprint.png | Bin .../pokemon/{ => gen_1}/vaporeon/icon.png | Bin .../pokemon/{ => gen_1}/vaporeon/normal.pal | 0 .../pokemon/{ => gen_1}/vaporeon/shiny.pal | 0 .../{ => gen_1}/venomoth/anim_front.png | Bin .../pokemon/{ => gen_1}/venomoth/back.png | Bin .../venomoth}/footprint.png | Bin .../pokemon/{ => gen_1}/venomoth/icon.png | Bin .../pokemon/{ => gen_1}/venomoth/normal.pal | 0 .../pokemon/{ => gen_1}/venomoth/shiny.pal | 0 .../{ => gen_1}/venonat/anim_front.png | Bin graphics/pokemon/{ => gen_1}/venonat/back.png | Bin .../pokemon/{ => gen_1}/venonat/footprint.png | Bin graphics/pokemon/{ => gen_1}/venonat/icon.png | Bin .../pokemon/{ => gen_1}/venonat/normal.pal | 0 .../pokemon/{ => gen_1}/venonat/shiny.pal | 0 .../{ => gen_1}/venusaur/anim_front.png | Bin .../{ => gen_1}/venusaur/anim_frontf.png | Bin .../pokemon/{ => gen_1}/venusaur/back.png | Bin .../pokemon/{ => gen_1}/venusaur/backf.png | Bin .../{ => gen_1}/venusaur/footprint.png | Bin .../{ => gen_1}/venusaur/gigantamax/back.png | Bin .../{ => gen_1}/venusaur/gigantamax/front.png | Bin .../{ => gen_1}/venusaur/gigantamax/icon.png | Bin .../venusaur/gigantamax/normal.pal | 0 .../{ => gen_1}/venusaur/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_1}/venusaur/icon.png | Bin .../{ => gen_1}/venusaur/mega/back.png | Bin .../{ => gen_1}/venusaur/mega/front.png | Bin .../{ => gen_1}/venusaur/mega/icon.png | Bin .../{ => gen_1}/venusaur/mega/normal.pal | 0 .../{ => gen_1}/venusaur/mega/shiny.pal | 0 .../pokemon/{ => gen_1}/venusaur/normal.pal | 0 .../pokemon/{ => gen_1}/venusaur/shiny.pal | 0 .../{ => gen_1}/victreebel/anim_front.png | Bin .../pokemon/{ => gen_1}/victreebel/back.png | Bin .../victreebel}/footprint.png | Bin .../pokemon/{ => gen_1}/victreebel/icon.png | Bin .../pokemon/{ => gen_1}/victreebel/normal.pal | 0 .../pokemon/{ => gen_1}/victreebel/shiny.pal | 0 .../{ => gen_1}/vileplume/anim_front.png | Bin .../{ => gen_1}/vileplume/anim_frontf.png | Bin .../pokemon/{ => gen_1}/vileplume/back.png | Bin .../pokemon/{ => gen_1}/vileplume/backf.png | Bin .../{ => gen_1}/vileplume/footprint.png | Bin .../pokemon/{ => gen_1}/vileplume/icon.png | Bin .../pokemon/{ => gen_1}/vileplume/normal.pal | 0 .../pokemon/{ => gen_1}/vileplume/shiny.pal | 0 .../{ => gen_1}/voltorb/anim_front.png | Bin graphics/pokemon/{ => gen_1}/voltorb/back.png | Bin .../{comfey => gen_1/voltorb}/footprint.png | Bin .../{ => gen_1}/voltorb/hisuian/back.png | Bin .../{ => gen_1}/voltorb/hisuian/front.png | Bin .../{ => gen_1}/voltorb/hisuian/icon.png | Bin .../{ => gen_1}/voltorb/hisuian/normal.pal | 0 .../{ => gen_1}/voltorb/hisuian/shiny.pal | 0 graphics/pokemon/{ => gen_1}/voltorb/icon.png | Bin .../pokemon/{ => gen_1}/voltorb/normal.pal | 0 .../pokemon/{ => gen_1}/voltorb/shiny.pal | 0 .../{ => gen_1}/vulpix/alolan/back.png | Bin .../{ => gen_1}/vulpix/alolan/front.png | Bin .../{ => gen_1}/vulpix/alolan/icon.png | Bin .../{ => gen_1}/vulpix/alolan/normal.pal | 0 .../{ => gen_1}/vulpix/alolan/shiny.pal | 0 .../pokemon/{ => gen_1}/vulpix/anim_front.png | Bin graphics/pokemon/{ => gen_1}/vulpix/back.png | Bin .../pokemon/{ => gen_1}/vulpix/footprint.png | Bin graphics/pokemon/{ => gen_1}/vulpix/icon.png | Bin .../pokemon/{ => gen_1}/vulpix/normal.pal | 0 graphics/pokemon/{ => gen_1}/vulpix/shiny.pal | 0 .../{ => gen_1}/wartortle/anim_front.png | Bin .../pokemon/{ => gen_1}/wartortle/back.png | Bin .../{ => gen_1}/wartortle/footprint.png | Bin .../pokemon/{ => gen_1}/wartortle/icon.png | Bin .../pokemon/{ => gen_1}/wartortle/normal.pal | 0 .../pokemon/{ => gen_1}/wartortle/shiny.pal | 0 .../pokemon/{ => gen_1}/weedle/anim_front.png | Bin graphics/pokemon/{ => gen_1}/weedle/back.png | Bin .../{bounsweet => gen_1/weedle}/footprint.png | Bin graphics/pokemon/{ => gen_1}/weedle/icon.png | Bin .../pokemon/{ => gen_1}/weedle/normal.pal | 0 graphics/pokemon/{ => gen_1}/weedle/shiny.pal | 0 .../{ => gen_1}/weepinbell/anim_front.png | Bin .../pokemon/{ => gen_1}/weepinbell/back.png | Bin .../weepinbell}/footprint.png | Bin .../pokemon/{ => gen_1}/weepinbell/icon.png | Bin .../pokemon/{ => gen_1}/weepinbell/normal.pal | 0 .../pokemon/{ => gen_1}/weepinbell/shiny.pal | 0 .../{ => gen_1}/weezing/anim_front.png | Bin graphics/pokemon/{ => gen_1}/weezing/back.png | Bin .../{cosmog => gen_1/weezing}/footprint.png | Bin .../{ => gen_1}/weezing/galarian/back.png | Bin .../{ => gen_1}/weezing/galarian/front.png | Bin .../{ => gen_1}/weezing/galarian/icon.png | Bin .../{ => gen_1}/weezing/galarian/normal.pal | 0 .../{ => gen_1}/weezing/galarian/shiny.pal | 0 graphics/pokemon/{ => gen_1}/weezing/icon.png | Bin .../pokemon/{ => gen_1}/weezing/normal.pal | 0 .../pokemon/{ => gen_1}/weezing/shiny.pal | 0 .../{ => gen_1}/wigglytuff/anim_front.png | Bin .../pokemon/{ => gen_1}/wigglytuff/back.png | Bin .../{ => gen_1}/wigglytuff/footprint.png | Bin .../pokemon/{ => gen_1}/wigglytuff/icon.png | Bin .../pokemon/{ => gen_1}/wigglytuff/normal.pal | 0 .../pokemon/{ => gen_1}/wigglytuff/shiny.pal | 0 .../pokemon/{ => gen_1}/zapdos/anim_front.png | Bin graphics/pokemon/{ => gen_1}/zapdos/back.png | Bin .../pokemon/{ => gen_1}/zapdos/footprint.png | Bin .../{ => gen_1}/zapdos/galarian/back.png | Bin .../{ => gen_1}/zapdos/galarian/front.png | Bin .../{ => gen_1}/zapdos/galarian/icon.png | Bin .../{ => gen_1}/zapdos/galarian/normal.pal | 0 .../{ => gen_1}/zapdos/galarian/shiny.pal | 0 graphics/pokemon/{ => gen_1}/zapdos/icon.png | Bin .../pokemon/{ => gen_1}/zapdos/normal.pal | 0 graphics/pokemon/{ => gen_1}/zapdos/shiny.pal | 0 .../pokemon/{ => gen_1}/zubat/anim_front.png | Bin .../pokemon/{ => gen_1}/zubat/anim_frontf.png | Bin graphics/pokemon/{ => gen_1}/zubat/back.png | Bin graphics/pokemon/{ => gen_1}/zubat/backf.png | Bin .../{cottonee => gen_1/zubat}/footprint.png | Bin graphics/pokemon/{ => gen_1}/zubat/icon.png | Bin graphics/pokemon/{ => gen_1}/zubat/normal.pal | 0 graphics/pokemon/{ => gen_1}/zubat/shiny.pal | 0 .../pokemon/{ => gen_2}/aipom/anim_front.png | Bin .../pokemon/{ => gen_2}/aipom/anim_frontf.png | Bin graphics/pokemon/{ => gen_2}/aipom/back.png | Bin graphics/pokemon/{ => gen_2}/aipom/backf.png | Bin .../pokemon/{ => gen_2}/aipom/footprint.png | Bin graphics/pokemon/{ => gen_2}/aipom/icon.png | Bin graphics/pokemon/{ => gen_2}/aipom/normal.pal | 0 graphics/pokemon/{ => gen_2}/aipom/shiny.pal | 0 .../{ => gen_2}/ampharos/anim_front.png | Bin .../pokemon/{ => gen_2}/ampharos/back.png | Bin .../{ => gen_2}/ampharos/footprint.png | Bin .../pokemon/{ => gen_2}/ampharos/icon.png | Bin .../{ => gen_2}/ampharos/mega/back.png | Bin .../{ => gen_2}/ampharos/mega/front.png | Bin .../{ => gen_2}/ampharos/mega/icon.png | Bin .../{ => gen_2}/ampharos/mega/normal.pal | 0 .../{ => gen_2}/ampharos/mega/shiny.pal | 0 .../pokemon/{ => gen_2}/ampharos/normal.pal | 0 .../pokemon/{ => gen_2}/ampharos/shiny.pal | 0 .../{ => gen_2}/ariados/anim_front.png | Bin graphics/pokemon/{ => gen_2}/ariados/back.png | Bin .../pokemon/{ => gen_2}/ariados/footprint.png | Bin graphics/pokemon/{ => gen_2}/ariados/icon.png | Bin .../pokemon/{ => gen_2}/ariados/normal.pal | 0 .../pokemon/{ => gen_2}/ariados/shiny.pal | 0 .../{ => gen_2}/azumarill/anim_front.png | Bin .../pokemon/{ => gen_2}/azumarill/back.png | Bin .../{ => gen_2}/azumarill/footprint.png | Bin .../pokemon/{ => gen_2}/azumarill/icon.png | Bin .../pokemon/{ => gen_2}/azumarill/normal.pal | 0 .../pokemon/{ => gen_2}/azumarill/shiny.pal | 0 .../{ => gen_2}/bayleef/anim_front.png | Bin graphics/pokemon/{ => gen_2}/bayleef/back.png | Bin .../pokemon/{ => gen_2}/bayleef/footprint.png | Bin graphics/pokemon/{ => gen_2}/bayleef/icon.png | Bin .../pokemon/{ => gen_2}/bayleef/normal.pal | 0 .../pokemon/{ => gen_2}/bayleef/shiny.pal | 0 .../{ => gen_2}/bellossom/anim_front.png | Bin .../pokemon/{ => gen_2}/bellossom/back.png | Bin .../bellossom}/footprint.png | Bin .../pokemon/{ => gen_2}/bellossom/icon.png | Bin .../pokemon/{ => gen_2}/bellossom/normal.pal | 0 .../pokemon/{ => gen_2}/bellossom/shiny.pal | 0 .../{ => gen_2}/blissey/anim_front.png | Bin graphics/pokemon/{ => gen_2}/blissey/back.png | Bin .../pokemon/{ => gen_2}/blissey/footprint.png | Bin graphics/pokemon/{ => gen_2}/blissey/icon.png | Bin .../pokemon/{ => gen_2}/blissey/normal.pal | 0 .../pokemon/{ => gen_2}/blissey/shiny.pal | 0 .../pokemon/{ => gen_2}/celebi/anim_front.png | Bin graphics/pokemon/{ => gen_2}/celebi/back.png | Bin .../pokemon/{ => gen_2}/celebi/footprint.png | Bin graphics/pokemon/{ => gen_2}/celebi/icon.png | Bin .../pokemon/{ => gen_2}/celebi/normal.pal | 0 graphics/pokemon/{ => gen_2}/celebi/shiny.pal | 0 .../{ => gen_2}/chikorita/anim_front.png | Bin .../pokemon/{ => gen_2}/chikorita/back.png | Bin .../{ => gen_2}/chikorita/footprint.png | Bin .../pokemon/{ => gen_2}/chikorita/icon.png | Bin .../pokemon/{ => gen_2}/chikorita/normal.pal | 0 .../pokemon/{ => gen_2}/chikorita/shiny.pal | 0 .../{ => gen_2}/chinchou/anim_front.png | Bin .../pokemon/{ => gen_2}/chinchou/back.png | Bin .../{crobat => gen_2/chinchou}/footprint.png | Bin .../pokemon/{ => gen_2}/chinchou/icon.png | Bin .../pokemon/{ => gen_2}/chinchou/normal.pal | 0 .../pokemon/{ => gen_2}/chinchou/shiny.pal | 0 .../pokemon/{ => gen_2}/cleffa/anim_front.png | Bin graphics/pokemon/{ => gen_2}/cleffa/back.png | Bin .../pokemon/{ => gen_2}/cleffa/footprint.png | Bin graphics/pokemon/{ => gen_2}/cleffa/icon.png | Bin .../pokemon/{ => gen_2}/cleffa/normal.pal | 0 graphics/pokemon/{ => gen_2}/cleffa/shiny.pal | 0 .../{ => gen_2}/corsola/anim_front.png | Bin graphics/pokemon/{ => gen_2}/corsola/back.png | Bin .../pokemon/{ => gen_2}/corsola/footprint.png | Bin .../{ => gen_2}/corsola/galarian/back.png | Bin .../{ => gen_2}/corsola/galarian/front.png | Bin .../{ => gen_2}/corsola/galarian/icon.png | Bin .../{ => gen_2}/corsola/galarian/normal.pal | 0 .../{ => gen_2}/corsola/galarian/shiny.pal | 0 graphics/pokemon/{ => gen_2}/corsola/icon.png | Bin .../pokemon/{ => gen_2}/corsola/normal.pal | 0 .../pokemon/{ => gen_2}/corsola/shiny.pal | 0 .../pokemon/{ => gen_2}/crobat/anim_front.png | Bin graphics/pokemon/{ => gen_2}/crobat/back.png | Bin .../{cryogonal => gen_2/crobat}/footprint.png | Bin graphics/pokemon/{ => gen_2}/crobat/icon.png | Bin .../pokemon/{ => gen_2}/crobat/normal.pal | 0 graphics/pokemon/{ => gen_2}/crobat/shiny.pal | 0 .../{ => gen_2}/croconaw/anim_front.png | Bin .../pokemon/{ => gen_2}/croconaw/back.png | Bin .../{ => gen_2}/croconaw/footprint.png | Bin .../pokemon/{ => gen_2}/croconaw/icon.png | Bin .../pokemon/{ => gen_2}/croconaw/normal.pal | 0 .../pokemon/{ => gen_2}/croconaw/shiny.pal | 0 .../{ => gen_2}/cyndaquil/anim_front.png | Bin .../pokemon/{ => gen_2}/cyndaquil/back.png | Bin .../{cufant => gen_2/cyndaquil}/footprint.png | Bin .../pokemon/{ => gen_2}/cyndaquil/icon.png | Bin .../pokemon/{ => gen_2}/cyndaquil/normal.pal | 0 .../pokemon/{ => gen_2}/cyndaquil/shiny.pal | 0 .../{ => gen_2}/delibird/anim_front.png | Bin .../pokemon/{ => gen_2}/delibird/back.png | Bin .../{ => gen_2}/delibird/footprint.png | Bin .../pokemon/{ => gen_2}/delibird/icon.png | Bin .../pokemon/{ => gen_2}/delibird/normal.pal | 0 .../pokemon/{ => gen_2}/delibird/shiny.pal | 0 .../{ => gen_2}/donphan/anim_front.png | Bin .../{ => gen_2}/donphan/anim_frontf.png | Bin graphics/pokemon/{ => gen_2}/donphan/back.png | Bin .../pokemon/{ => gen_2}/donphan/backf.png | Bin .../pokemon/{ => gen_2}/donphan/footprint.png | Bin graphics/pokemon/{ => gen_2}/donphan/icon.png | Bin .../pokemon/{ => gen_2}/donphan/normal.pal | 0 .../pokemon/{ => gen_2}/donphan/shiny.pal | 0 .../{ => gen_2}/dunsparce/anim_front.png | Bin .../pokemon/{ => gen_2}/dunsparce/back.png | Bin .../dunsparce}/footprint.png | Bin .../pokemon/{ => gen_2}/dunsparce/icon.png | Bin .../pokemon/{ => gen_2}/dunsparce/normal.pal | 0 .../pokemon/{ => gen_2}/dunsparce/shiny.pal | 0 .../pokemon/{ => gen_2}/elekid/anim_front.png | Bin graphics/pokemon/{ => gen_2}/elekid/back.png | Bin .../pokemon/{ => gen_2}/elekid/footprint.png | Bin graphics/pokemon/{ => gen_2}/elekid/icon.png | Bin .../pokemon/{ => gen_2}/elekid/normal.pal | 0 graphics/pokemon/{ => gen_2}/elekid/shiny.pal | 0 .../pokemon/{ => gen_2}/entei/anim_front.png | Bin graphics/pokemon/{ => gen_2}/entei/back.png | Bin .../pokemon/{ => gen_2}/entei/footprint.png | Bin graphics/pokemon/{ => gen_2}/entei/icon.png | Bin graphics/pokemon/{ => gen_2}/entei/normal.pal | 0 graphics/pokemon/{ => gen_2}/entei/shiny.pal | 0 .../pokemon/{ => gen_2}/espeon/anim_front.png | Bin graphics/pokemon/{ => gen_2}/espeon/back.png | Bin .../pokemon/{ => gen_2}/espeon/footprint.png | Bin graphics/pokemon/{ => gen_2}/espeon/icon.png | Bin .../pokemon/{ => gen_2}/espeon/normal.pal | 0 graphics/pokemon/{ => gen_2}/espeon/shiny.pal | 0 .../{ => gen_2}/feraligatr/anim_front.png | Bin .../pokemon/{ => gen_2}/feraligatr/back.png | Bin .../{ => gen_2}/feraligatr/footprint.png | Bin .../pokemon/{ => gen_2}/feraligatr/icon.png | Bin .../pokemon/{ => gen_2}/feraligatr/normal.pal | 0 .../pokemon/{ => gen_2}/feraligatr/shiny.pal | 0 .../{ => gen_2}/flaaffy/anim_front.png | Bin graphics/pokemon/{ => gen_2}/flaaffy/back.png | Bin .../pokemon/{ => gen_2}/flaaffy/footprint.png | Bin graphics/pokemon/{ => gen_2}/flaaffy/icon.png | Bin .../pokemon/{ => gen_2}/flaaffy/normal.pal | 0 .../pokemon/{ => gen_2}/flaaffy/shiny.pal | 0 .../{ => gen_2}/forretress/anim_front.png | Bin .../pokemon/{ => gen_2}/forretress/back.png | Bin .../forretress}/footprint.png | Bin .../pokemon/{ => gen_2}/forretress/icon.png | Bin .../pokemon/{ => gen_2}/forretress/normal.pal | 0 .../pokemon/{ => gen_2}/forretress/shiny.pal | 0 .../pokemon/{ => gen_2}/furret/anim_front.png | Bin graphics/pokemon/{ => gen_2}/furret/back.png | Bin .../pokemon/{ => gen_2}/furret/footprint.png | Bin graphics/pokemon/{ => gen_2}/furret/icon.png | Bin .../pokemon/{ => gen_2}/furret/normal.pal | 0 graphics/pokemon/{ => gen_2}/furret/shiny.pal | 0 .../{ => gen_2}/girafarig/anim_front.png | Bin .../{ => gen_2}/girafarig/anim_frontf.png | Bin .../pokemon/{ => gen_2}/girafarig/back.png | Bin .../pokemon/{ => gen_2}/girafarig/backf.png | Bin .../{ => gen_2}/girafarig/footprint.png | Bin .../pokemon/{ => gen_2}/girafarig/icon.png | Bin .../pokemon/{ => gen_2}/girafarig/normal.pal | 0 .../pokemon/{ => gen_2}/girafarig/shiny.pal | 0 .../pokemon/{ => gen_2}/gligar/anim_front.png | Bin .../{ => gen_2}/gligar/anim_frontf.png | Bin graphics/pokemon/{ => gen_2}/gligar/back.png | Bin graphics/pokemon/{ => gen_2}/gligar/backf.png | Bin .../pokemon/{ => gen_2}/gligar/footprint.png | Bin graphics/pokemon/{ => gen_2}/gligar/icon.png | Bin .../pokemon/{ => gen_2}/gligar/normal.pal | 0 graphics/pokemon/{ => gen_2}/gligar/shiny.pal | 0 .../{ => gen_2}/granbull/anim_front.png | Bin .../pokemon/{ => gen_2}/granbull/back.png | Bin .../{ => gen_2}/granbull/footprint.png | Bin .../pokemon/{ => gen_2}/granbull/icon.png | Bin .../pokemon/{ => gen_2}/granbull/normal.pal | 0 .../pokemon/{ => gen_2}/granbull/shiny.pal | 0 .../{ => gen_2}/heracross/anim_front.png | Bin .../{ => gen_2}/heracross/anim_frontf.png | Bin .../pokemon/{ => gen_2}/heracross/back.png | Bin .../pokemon/{ => gen_2}/heracross/backf.png | Bin .../{ => gen_2}/heracross/footprint.png | Bin .../pokemon/{ => gen_2}/heracross/icon.png | Bin .../{ => gen_2}/heracross/mega/back.png | Bin .../{ => gen_2}/heracross/mega/front.png | Bin .../{ => gen_2}/heracross/mega/icon.png | Bin .../{ => gen_2}/heracross/mega/normal.pal | 0 .../{ => gen_2}/heracross/mega/shiny.pal | 0 .../pokemon/{ => gen_2}/heracross/normal.pal | 0 .../pokemon/{ => gen_2}/heracross/shiny.pal | 0 .../{ => gen_2}/hitmontop/anim_front.png | Bin .../pokemon/{ => gen_2}/hitmontop/back.png | Bin .../{ => gen_2}/hitmontop/footprint.png | Bin .../pokemon/{ => gen_2}/hitmontop/icon.png | Bin .../pokemon/{ => gen_2}/hitmontop/normal.pal | 0 .../pokemon/{ => gen_2}/hitmontop/shiny.pal | 0 .../pokemon/{ => gen_2}/ho_oh/anim_front.png | Bin graphics/pokemon/{ => gen_2}/ho_oh/back.png | Bin .../pokemon/{ => gen_2}/ho_oh/footprint.png | Bin graphics/pokemon/{ => gen_2}/ho_oh/icon.png | Bin graphics/pokemon/{ => gen_2}/ho_oh/normal.pal | 0 graphics/pokemon/{ => gen_2}/ho_oh/shiny.pal | 0 .../{ => gen_2}/hoothoot/anim_front.png | Bin .../pokemon/{ => gen_2}/hoothoot/back.png | Bin .../{ => gen_2}/hoothoot/footprint.png | Bin .../pokemon/{ => gen_2}/hoothoot/icon.png | Bin .../pokemon/{ => gen_2}/hoothoot/normal.pal | 0 .../pokemon/{ => gen_2}/hoothoot/shiny.pal | 0 .../pokemon/{ => gen_2}/hoppip/anim_front.png | Bin graphics/pokemon/{ => gen_2}/hoppip/back.png | Bin .../pokemon/{ => gen_2}/hoppip/footprint.png | Bin graphics/pokemon/{ => gen_2}/hoppip/icon.png | Bin .../pokemon/{ => gen_2}/hoppip/normal.pal | 0 graphics/pokemon/{ => gen_2}/hoppip/shiny.pal | 0 .../{ => gen_2}/houndoom/anim_front.png | Bin .../{ => gen_2}/houndoom/anim_frontf.png | Bin .../pokemon/{ => gen_2}/houndoom/back.png | Bin .../pokemon/{ => gen_2}/houndoom/backf.png | Bin .../{ => gen_2}/houndoom/footprint.png | Bin .../pokemon/{ => gen_2}/houndoom/icon.png | Bin .../{ => gen_2}/houndoom/mega/back.png | Bin .../{ => gen_2}/houndoom/mega/front.png | Bin .../{ => gen_2}/houndoom/mega/icon.png | Bin .../{ => gen_2}/houndoom/mega/normal.pal | 0 .../{ => gen_2}/houndoom/mega/shiny.pal | 0 .../pokemon/{ => gen_2}/houndoom/normal.pal | 0 .../pokemon/{ => gen_2}/houndoom/shiny.pal | 0 .../{ => gen_2}/houndour/anim_front.png | Bin .../pokemon/{ => gen_2}/houndour/back.png | Bin .../{ => gen_2}/houndour/footprint.png | Bin .../pokemon/{ => gen_2}/houndour/icon.png | Bin .../pokemon/{ => gen_2}/houndour/normal.pal | 0 .../pokemon/{ => gen_2}/houndour/shiny.pal | 0 .../{ => gen_2}/igglybuff/anim_front.png | Bin .../pokemon/{ => gen_2}/igglybuff/back.png | Bin .../{ => gen_2}/igglybuff/footprint.png | Bin .../pokemon/{ => gen_2}/igglybuff/icon.png | Bin .../pokemon/{ => gen_2}/igglybuff/normal.pal | 0 .../pokemon/{ => gen_2}/igglybuff/shiny.pal | 0 .../{ => gen_2}/jumpluff/anim_front.png | Bin .../pokemon/{ => gen_2}/jumpluff/back.png | Bin .../{dottler => gen_2/jumpluff}/footprint.png | Bin .../pokemon/{ => gen_2}/jumpluff/icon.png | Bin .../pokemon/{ => gen_2}/jumpluff/normal.pal | 0 .../pokemon/{ => gen_2}/jumpluff/shiny.pal | 0 .../{ => gen_2}/kingdra/anim_front.png | Bin graphics/pokemon/{ => gen_2}/kingdra/back.png | Bin .../{diancie => gen_2/kingdra}/footprint.png | Bin graphics/pokemon/{ => gen_2}/kingdra/icon.png | Bin .../pokemon/{ => gen_2}/kingdra/normal.pal | 0 .../pokemon/{ => gen_2}/kingdra/shiny.pal | 0 .../{ => gen_2}/lanturn/anim_front.png | Bin graphics/pokemon/{ => gen_2}/lanturn/back.png | Bin .../{diglett => gen_2/lanturn}/footprint.png | Bin graphics/pokemon/{ => gen_2}/lanturn/icon.png | Bin .../pokemon/{ => gen_2}/lanturn/normal.pal | 0 .../pokemon/{ => gen_2}/lanturn/shiny.pal | 0 .../{ => gen_2}/larvitar/anim_front.png | Bin .../pokemon/{ => gen_2}/larvitar/back.png | Bin .../{ => gen_2}/larvitar/footprint.png | Bin .../pokemon/{ => gen_2}/larvitar/icon.png | Bin .../pokemon/{ => gen_2}/larvitar/normal.pal | 0 .../pokemon/{ => gen_2}/larvitar/shiny.pal | 0 .../pokemon/{ => gen_2}/ledian/anim_front.png | Bin .../{ => gen_2}/ledian/anim_frontf.png | Bin graphics/pokemon/{ => gen_2}/ledian/back.png | Bin graphics/pokemon/{ => gen_2}/ledian/backf.png | Bin .../pokemon/{ => gen_2}/ledian/footprint.png | Bin graphics/pokemon/{ => gen_2}/ledian/icon.png | Bin .../pokemon/{ => gen_2}/ledian/normal.pal | 0 graphics/pokemon/{ => gen_2}/ledian/shiny.pal | 0 .../pokemon/{ => gen_2}/ledyba/anim_front.png | Bin .../{ => gen_2}/ledyba/anim_frontf.png | Bin graphics/pokemon/{ => gen_2}/ledyba/back.png | Bin graphics/pokemon/{ => gen_2}/ledyba/backf.png | Bin .../pokemon/{ => gen_2}/ledyba/footprint.png | Bin graphics/pokemon/{ => gen_2}/ledyba/icon.png | Bin .../pokemon/{ => gen_2}/ledyba/normal.pal | 0 graphics/pokemon/{ => gen_2}/ledyba/shiny.pal | 0 .../pokemon/{ => gen_2}/lugia/anim_front.png | Bin graphics/pokemon/{ => gen_2}/lugia/back.png | Bin .../pokemon/{ => gen_2}/lugia/footprint.png | Bin graphics/pokemon/{ => gen_2}/lugia/icon.png | Bin graphics/pokemon/{ => gen_2}/lugia/normal.pal | 0 graphics/pokemon/{ => gen_2}/lugia/shiny.pal | 0 .../pokemon/{ => gen_2}/magby/anim_front.png | Bin graphics/pokemon/{ => gen_2}/magby/back.png | Bin .../pokemon/{ => gen_2}/magby/footprint.png | Bin graphics/pokemon/{ => gen_2}/magby/icon.png | Bin graphics/pokemon/{ => gen_2}/magby/normal.pal | 0 graphics/pokemon/{ => gen_2}/magby/shiny.pal | 0 .../{ => gen_2}/magcargo/anim_front.png | Bin .../pokemon/{ => gen_2}/magcargo/back.png | Bin .../{ditto => gen_2/magcargo}/footprint.png | Bin .../pokemon/{ => gen_2}/magcargo/icon.png | Bin .../pokemon/{ => gen_2}/magcargo/normal.pal | 0 .../pokemon/{ => gen_2}/magcargo/shiny.pal | 0 .../{ => gen_2}/mantine/anim_front.png | Bin graphics/pokemon/{ => gen_2}/mantine/back.png | Bin .../{doublade => gen_2/mantine}/footprint.png | Bin graphics/pokemon/{ => gen_2}/mantine/icon.png | Bin .../pokemon/{ => gen_2}/mantine/normal.pal | 0 .../pokemon/{ => gen_2}/mantine/shiny.pal | 0 .../pokemon/{ => gen_2}/mareep/anim_front.png | Bin graphics/pokemon/{ => gen_2}/mareep/back.png | Bin .../pokemon/{ => gen_2}/mareep/footprint.png | Bin graphics/pokemon/{ => gen_2}/mareep/icon.png | Bin .../pokemon/{ => gen_2}/mareep/normal.pal | 0 graphics/pokemon/{ => gen_2}/mareep/shiny.pal | 0 .../pokemon/{ => gen_2}/marill/anim_front.png | Bin graphics/pokemon/{ => gen_2}/marill/back.png | Bin .../pokemon/{ => gen_2}/marill/footprint.png | Bin graphics/pokemon/{ => gen_2}/marill/icon.png | Bin .../pokemon/{ => gen_2}/marill/normal.pal | 0 graphics/pokemon/{ => gen_2}/marill/shiny.pal | 0 .../{ => gen_2}/meganium/anim_front.png | Bin .../{ => gen_2}/meganium/anim_frontf.png | Bin .../pokemon/{ => gen_2}/meganium/back.png | Bin .../pokemon/{ => gen_2}/meganium/backf.png | Bin .../{ => gen_2}/meganium/footprint.png | Bin .../pokemon/{ => gen_2}/meganium/icon.png | Bin .../pokemon/{ => gen_2}/meganium/normal.pal | 0 .../pokemon/{ => gen_2}/meganium/shiny.pal | 0 .../{ => gen_2}/miltank/anim_front.png | Bin graphics/pokemon/{ => gen_2}/miltank/back.png | Bin .../pokemon/{ => gen_2}/miltank/footprint.png | Bin graphics/pokemon/{ => gen_2}/miltank/icon.png | Bin .../pokemon/{ => gen_2}/miltank/normal.pal | 0 .../pokemon/{ => gen_2}/miltank/shiny.pal | 0 .../{ => gen_2}/misdreavus/anim_front.png | Bin .../pokemon/{ => gen_2}/misdreavus/back.png | Bin .../misdreavus}/footprint.png | Bin .../pokemon/{ => gen_2}/misdreavus/icon.png | Bin .../pokemon/{ => gen_2}/misdreavus/normal.pal | 0 .../pokemon/{ => gen_2}/misdreavus/shiny.pal | 0 .../{ => gen_2}/murkrow/anim_front.png | Bin .../{ => gen_2}/murkrow/anim_frontf.png | Bin graphics/pokemon/{ => gen_2}/murkrow/back.png | Bin .../pokemon/{ => gen_2}/murkrow/backf.png | Bin .../pokemon/{ => gen_2}/murkrow/footprint.png | Bin graphics/pokemon/{ => gen_2}/murkrow/icon.png | Bin .../pokemon/{ => gen_2}/murkrow/normal.pal | 0 .../pokemon/{ => gen_2}/murkrow/shiny.pal | 0 .../pokemon/{ => gen_2}/natu/anim_front.png | Bin graphics/pokemon/{ => gen_2}/natu/back.png | Bin .../pokemon/{ => gen_2}/natu/footprint.png | Bin graphics/pokemon/{ => gen_2}/natu/icon.png | Bin graphics/pokemon/{ => gen_2}/natu/normal.pal | 0 graphics/pokemon/{ => gen_2}/natu/shiny.pal | 0 .../{ => gen_2}/noctowl/anim_front.png | Bin graphics/pokemon/{ => gen_2}/noctowl/back.png | Bin .../pokemon/{ => gen_2}/noctowl/footprint.png | Bin graphics/pokemon/{ => gen_2}/noctowl/icon.png | Bin .../pokemon/{ => gen_2}/noctowl/normal.pal | 0 .../pokemon/{ => gen_2}/noctowl/shiny.pal | 0 .../{ => gen_2}/octillery/anim_front.png | Bin .../{ => gen_2}/octillery/anim_frontf.png | Bin .../pokemon/{ => gen_2}/octillery/back.png | Bin .../pokemon/{ => gen_2}/octillery/backf.png | Bin .../octillery}/footprint.png | Bin .../pokemon/{ => gen_2}/octillery/icon.png | Bin .../pokemon/{ => gen_2}/octillery/normal.pal | 0 .../pokemon/{ => gen_2}/octillery/shiny.pal | 0 .../pokemon/{ => gen_2}/phanpy/anim_front.png | Bin graphics/pokemon/{ => gen_2}/phanpy/back.png | Bin .../pokemon/{ => gen_2}/phanpy/footprint.png | Bin graphics/pokemon/{ => gen_2}/phanpy/icon.png | Bin .../pokemon/{ => gen_2}/phanpy/normal.pal | 0 graphics/pokemon/{ => gen_2}/phanpy/shiny.pal | 0 .../pokemon/{ => gen_2}/pichu/anim_front.png | Bin graphics/pokemon/{ => gen_2}/pichu/back.png | Bin .../pokemon/{ => gen_2}/pichu/footprint.png | Bin graphics/pokemon/{ => gen_2}/pichu/icon.png | Bin graphics/pokemon/{ => gen_2}/pichu/normal.pal | 0 graphics/pokemon/{ => gen_2}/pichu/shiny.pal | 0 .../pichu/spiky_eared/anim_front.png | Bin .../{ => gen_2}/pichu/spiky_eared/back.png | Bin .../{ => gen_2}/pichu/spiky_eared/front.png | Bin .../{ => gen_2}/pichu/spiky_eared/icon.png | Bin .../{ => gen_2}/pichu/spiky_eared/normal.pal | 0 .../{ => gen_2}/pichu/spiky_eared/shiny.pal | 0 .../{ => gen_2}/piloswine/anim_front.png | Bin .../{ => gen_2}/piloswine/anim_frontf.png | Bin .../pokemon/{ => gen_2}/piloswine/back.png | Bin .../pokemon/{ => gen_2}/piloswine/backf.png | Bin .../{ => gen_2}/piloswine/footprint.png | Bin .../pokemon/{ => gen_2}/piloswine/icon.png | Bin .../pokemon/{ => gen_2}/piloswine/normal.pal | 0 .../pokemon/{ => gen_2}/piloswine/shiny.pal | 0 .../pokemon/{ => gen_2}/pineco/anim_front.png | Bin graphics/pokemon/{ => gen_2}/pineco/back.png | Bin .../{dragonair => gen_2/pineco}/footprint.png | Bin graphics/pokemon/{ => gen_2}/pineco/icon.png | Bin .../pokemon/{ => gen_2}/pineco/normal.pal | 0 graphics/pokemon/{ => gen_2}/pineco/shiny.pal | 0 .../{ => gen_2}/politoed/anim_front.png | Bin .../{ => gen_2}/politoed/anim_frontf.png | Bin .../pokemon/{ => gen_2}/politoed/back.png | Bin .../pokemon/{ => gen_2}/politoed/backf.png | Bin .../{ => gen_2}/politoed/footprint.png | Bin .../pokemon/{ => gen_2}/politoed/icon.png | Bin .../pokemon/{ => gen_2}/politoed/normal.pal | 0 .../pokemon/{ => gen_2}/politoed/shiny.pal | 0 .../{ => gen_2}/porygon2/anim_front.png | Bin .../pokemon/{ => gen_2}/porygon2/back.png | Bin .../porygon2}/footprint.png | Bin .../pokemon/{ => gen_2}/porygon2/icon.png | Bin .../pokemon/{ => gen_2}/porygon2/normal.pal | 0 .../pokemon/{ => gen_2}/porygon2/shiny.pal | 0 .../{ => gen_2}/pupitar/anim_front.png | Bin graphics/pokemon/{ => gen_2}/pupitar/back.png | Bin .../{drampa => gen_2/pupitar}/footprint.png | Bin graphics/pokemon/{ => gen_2}/pupitar/icon.png | Bin .../pokemon/{ => gen_2}/pupitar/normal.pal | 0 .../pokemon/{ => gen_2}/pupitar/shiny.pal | 0 .../{ => gen_2}/quagsire/anim_front.png | Bin .../{ => gen_2}/quagsire/anim_frontf.png | Bin .../pokemon/{ => gen_2}/quagsire/back.png | Bin .../pokemon/{ => gen_2}/quagsire/backf.png | Bin .../{ => gen_2}/quagsire/footprint.png | Bin .../pokemon/{ => gen_2}/quagsire/icon.png | Bin .../pokemon/{ => gen_2}/quagsire/normal.pal | 0 .../pokemon/{ => gen_2}/quagsire/shiny.pal | 0 .../{ => gen_2}/quilava/anim_front.png | Bin graphics/pokemon/{ => gen_2}/quilava/back.png | Bin .../pokemon/{ => gen_2}/quilava/footprint.png | Bin graphics/pokemon/{ => gen_2}/quilava/icon.png | Bin .../pokemon/{ => gen_2}/quilava/normal.pal | 0 .../pokemon/{ => gen_2}/quilava/shiny.pal | 0 .../{ => gen_2}/qwilfish/anim_front.png | Bin .../pokemon/{ => gen_2}/qwilfish/back.png | Bin .../{dratini => gen_2/qwilfish}/footprint.png | Bin .../{ => gen_2}/qwilfish/hisuian/back.png | Bin .../{ => gen_2}/qwilfish/hisuian/front.png | Bin .../{ => gen_2}/qwilfish/hisuian/icon.png | Bin .../{ => gen_2}/qwilfish/hisuian/normal.pal | 0 .../{ => gen_2}/qwilfish/hisuian/shiny.pal | 0 .../pokemon/{ => gen_2}/qwilfish/icon.png | Bin .../pokemon/{ => gen_2}/qwilfish/normal.pal | 0 .../pokemon/{ => gen_2}/qwilfish/shiny.pal | 0 .../pokemon/{ => gen_2}/raikou/anim_front.png | Bin graphics/pokemon/{ => gen_2}/raikou/back.png | Bin .../pokemon/{ => gen_2}/raikou/footprint.png | Bin graphics/pokemon/{ => gen_2}/raikou/icon.png | Bin .../pokemon/{ => gen_2}/raikou/normal.pal | 0 graphics/pokemon/{ => gen_2}/raikou/shiny.pal | 0 .../{ => gen_2}/remoraid/anim_front.png | Bin .../pokemon/{ => gen_2}/remoraid/back.png | Bin .../{dreepy => gen_2/remoraid}/footprint.png | Bin .../pokemon/{ => gen_2}/remoraid/icon.png | Bin .../pokemon/{ => gen_2}/remoraid/normal.pal | 0 .../pokemon/{ => gen_2}/remoraid/shiny.pal | 0 .../pokemon/{ => gen_2}/scizor/anim_front.png | Bin .../{ => gen_2}/scizor/anim_frontf.png | Bin graphics/pokemon/{ => gen_2}/scizor/back.png | Bin .../pokemon/{ => gen_2}/scizor/footprint.png | Bin graphics/pokemon/{ => gen_2}/scizor/icon.png | Bin .../pokemon/{ => gen_2}/scizor/mega/back.png | Bin .../pokemon/{ => gen_2}/scizor/mega/front.png | Bin .../pokemon/{ => gen_2}/scizor/mega/icon.png | Bin .../{ => gen_2}/scizor/mega/normal.pal | 0 .../pokemon/{ => gen_2}/scizor/mega/shiny.pal | 0 .../pokemon/{ => gen_2}/scizor/normal.pal | 0 graphics/pokemon/{ => gen_2}/scizor/shiny.pal | 0 .../{ => gen_2}/sentret/anim_front.png | Bin graphics/pokemon/{ => gen_2}/sentret/back.png | Bin .../pokemon/{ => gen_2}/sentret/footprint.png | Bin graphics/pokemon/{ => gen_2}/sentret/icon.png | Bin .../pokemon/{ => gen_2}/sentret/normal.pal | 0 .../pokemon/{ => gen_2}/sentret/shiny.pal | 0 .../{ => gen_2}/shuckle/anim_front.png | Bin graphics/pokemon/{ => gen_2}/shuckle/back.png | Bin .../{amaura => gen_2/shuckle}/footprint.png | Bin graphics/pokemon/{ => gen_2}/shuckle/icon.png | Bin .../pokemon/{ => gen_2}/shuckle/normal.pal | 0 .../pokemon/{ => gen_2}/shuckle/shiny.pal | 0 .../{ => gen_2}/skarmory/anim_front.png | Bin .../pokemon/{ => gen_2}/skarmory/back.png | Bin .../{ => gen_2}/skarmory/footprint.png | Bin .../pokemon/{ => gen_2}/skarmory/icon.png | Bin .../pokemon/{ => gen_2}/skarmory/normal.pal | 0 .../pokemon/{ => gen_2}/skarmory/shiny.pal | 0 .../{ => gen_2}/skiploom/anim_front.png | Bin .../pokemon/{ => gen_2}/skiploom/back.png | Bin .../{ => gen_2}/skiploom/footprint.png | Bin .../pokemon/{ => gen_2}/skiploom/icon.png | Bin .../pokemon/{ => gen_2}/skiploom/normal.pal | 0 .../pokemon/{ => gen_2}/skiploom/shiny.pal | 0 .../{ => gen_2}/slowking/anim_front.png | Bin .../pokemon/{ => gen_2}/slowking/back.png | Bin .../{ => gen_2}/slowking/footprint.png | Bin .../{ => gen_2}/slowking/galarian/back.png | Bin .../{ => gen_2}/slowking/galarian/front.png | Bin .../{ => gen_2}/slowking/galarian/icon.png | Bin .../{ => gen_2}/slowking/galarian/normal.pal | 0 .../{ => gen_2}/slowking/galarian/shiny.pal | 0 .../pokemon/{ => gen_2}/slowking/icon.png | Bin .../pokemon/{ => gen_2}/slowking/normal.pal | 0 .../pokemon/{ => gen_2}/slowking/shiny.pal | 0 .../pokemon/{ => gen_2}/slugma/anim_front.png | Bin graphics/pokemon/{ => gen_2}/slugma/back.png | Bin .../{drifblim => gen_2/slugma}/footprint.png | Bin graphics/pokemon/{ => gen_2}/slugma/icon.png | Bin .../pokemon/{ => gen_2}/slugma/normal.pal | 0 graphics/pokemon/{ => gen_2}/slugma/shiny.pal | 0 .../{ => gen_2}/smeargle/anim_front.png | Bin .../pokemon/{ => gen_2}/smeargle/back.png | Bin .../{ => gen_2}/smeargle/footprint.png | Bin .../pokemon/{ => gen_2}/smeargle/icon.png | Bin .../pokemon/{ => gen_2}/smeargle/normal.pal | 0 .../pokemon/{ => gen_2}/smeargle/shiny.pal | 0 .../{ => gen_2}/smoochum/anim_front.png | Bin .../pokemon/{ => gen_2}/smoochum/back.png | Bin .../{ => gen_2}/smoochum/footprint.png | Bin .../pokemon/{ => gen_2}/smoochum/icon.png | Bin .../pokemon/{ => gen_2}/smoochum/normal.pal | 0 .../pokemon/{ => gen_2}/smoochum/shiny.pal | 0 .../{ => gen_2}/sneasel/anim_front.png | Bin .../{ => gen_2}/sneasel/anim_frontf.png | Bin graphics/pokemon/{ => gen_2}/sneasel/back.png | Bin .../pokemon/{ => gen_2}/sneasel/backf.png | Bin .../pokemon/{ => gen_2}/sneasel/footprint.png | Bin .../{ => gen_2}/sneasel/hisuian/back.png | Bin .../{ => gen_2}/sneasel/hisuian/backf.png | Bin .../{ => gen_2}/sneasel/hisuian/front.png | Bin .../{ => gen_2}/sneasel/hisuian/frontf.png | Bin .../{ => gen_2}/sneasel/hisuian/icon.png | Bin .../{ => gen_2}/sneasel/hisuian/normal.pal | 0 .../{ => gen_2}/sneasel/hisuian/shiny.pal | 0 graphics/pokemon/{ => gen_2}/sneasel/icon.png | Bin .../pokemon/{ => gen_2}/sneasel/normal.pal | 0 .../pokemon/{ => gen_2}/sneasel/shiny.pal | 0 .../{ => gen_2}/snubbull/anim_front.png | Bin .../pokemon/{ => gen_2}/snubbull/back.png | Bin .../{ => gen_2}/snubbull/footprint.png | Bin .../pokemon/{ => gen_2}/snubbull/icon.png | Bin .../pokemon/{ => gen_2}/snubbull/normal.pal | 0 .../pokemon/{ => gen_2}/snubbull/shiny.pal | 0 .../{ => gen_2}/spinarak/anim_front.png | Bin .../pokemon/{ => gen_2}/spinarak/back.png | Bin .../spinarak}/footprint.png | Bin .../pokemon/{ => gen_2}/spinarak/icon.png | Bin .../pokemon/{ => gen_2}/spinarak/normal.pal | 0 .../pokemon/{ => gen_2}/spinarak/shiny.pal | 0 .../{ => gen_2}/stantler/anim_front.png | Bin .../pokemon/{ => gen_2}/stantler/back.png | Bin .../{ => gen_2}/stantler/footprint.png | Bin .../pokemon/{ => gen_2}/stantler/icon.png | Bin .../pokemon/{ => gen_2}/stantler/normal.pal | 0 .../pokemon/{ => gen_2}/stantler/shiny.pal | 0 .../{ => gen_2}/steelix/anim_front.png | Bin .../{ => gen_2}/steelix/anim_frontf.png | Bin graphics/pokemon/{ => gen_2}/steelix/back.png | Bin .../pokemon/{ => gen_2}/steelix/backf.png | Bin .../{drifloon => gen_2/steelix}/footprint.png | Bin graphics/pokemon/{ => gen_2}/steelix/icon.png | Bin .../pokemon/{ => gen_2}/steelix/mega/back.png | Bin .../{ => gen_2}/steelix/mega/front.png | Bin .../pokemon/{ => gen_2}/steelix/mega/icon.png | Bin .../{ => gen_2}/steelix/mega/normal.pal | 0 .../{ => gen_2}/steelix/mega/shiny.pal | 0 .../pokemon/{ => gen_2}/steelix/normal.pal | 0 .../pokemon/{ => gen_2}/steelix/shiny.pal | 0 .../{ => gen_2}/sudowoodo/anim_front.png | Bin .../{ => gen_2}/sudowoodo/anim_frontf.png | Bin .../pokemon/{ => gen_2}/sudowoodo/back.png | Bin .../pokemon/{ => gen_2}/sudowoodo/backf.png | Bin .../{ => gen_2}/sudowoodo/footprint.png | Bin .../pokemon/{ => gen_2}/sudowoodo/icon.png | Bin .../pokemon/{ => gen_2}/sudowoodo/normal.pal | 0 .../pokemon/{ => gen_2}/sudowoodo/shiny.pal | 0 .../{ => gen_2}/suicune/anim_front.png | Bin graphics/pokemon/{ => gen_2}/suicune/back.png | Bin .../pokemon/{ => gen_2}/suicune/footprint.png | Bin graphics/pokemon/{ => gen_2}/suicune/icon.png | Bin .../pokemon/{ => gen_2}/suicune/normal.pal | 0 .../pokemon/{ => gen_2}/suicune/shiny.pal | 0 .../{ => gen_2}/sunflora/anim_front.png | Bin .../pokemon/{ => gen_2}/sunflora/back.png | Bin .../{ => gen_2}/sunflora/footprint.png | Bin .../pokemon/{ => gen_2}/sunflora/icon.png | Bin .../pokemon/{ => gen_2}/sunflora/normal.pal | 0 .../pokemon/{ => gen_2}/sunflora/shiny.pal | 0 .../{ => gen_2}/sunkern/anim_front.png | Bin graphics/pokemon/{ => gen_2}/sunkern/back.png | Bin .../{dugtrio => gen_2/sunkern}/footprint.png | Bin graphics/pokemon/{ => gen_2}/sunkern/icon.png | Bin .../pokemon/{ => gen_2}/sunkern/normal.pal | 0 .../pokemon/{ => gen_2}/sunkern/shiny.pal | 0 .../pokemon/{ => gen_2}/swinub/anim_front.png | Bin graphics/pokemon/{ => gen_2}/swinub/back.png | Bin .../pokemon/{ => gen_2}/swinub/footprint.png | Bin graphics/pokemon/{ => gen_2}/swinub/icon.png | Bin .../pokemon/{ => gen_2}/swinub/normal.pal | 0 graphics/pokemon/{ => gen_2}/swinub/shiny.pal | 0 .../{ => gen_2}/teddiursa/anim_front.png | Bin .../pokemon/{ => gen_2}/teddiursa/back.png | Bin .../{ => gen_2}/teddiursa/footprint.png | Bin .../pokemon/{ => gen_2}/teddiursa/icon.png | Bin .../pokemon/{ => gen_2}/teddiursa/normal.pal | 0 .../pokemon/{ => gen_2}/teddiursa/shiny.pal | 0 .../pokemon/{ => gen_2}/togepi/anim_front.png | Bin graphics/pokemon/{ => gen_2}/togepi/back.png | Bin .../pokemon/{ => gen_2}/togepi/footprint.png | Bin graphics/pokemon/{ => gen_2}/togepi/icon.png | Bin .../pokemon/{ => gen_2}/togepi/normal.pal | 0 graphics/pokemon/{ => gen_2}/togepi/shiny.pal | 0 .../{ => gen_2}/togetic/anim_front.png | Bin graphics/pokemon/{ => gen_2}/togetic/back.png | Bin .../pokemon/{ => gen_2}/togetic/footprint.png | Bin graphics/pokemon/{ => gen_2}/togetic/icon.png | Bin .../pokemon/{ => gen_2}/togetic/normal.pal | 0 .../pokemon/{ => gen_2}/togetic/shiny.pal | 0 .../{ => gen_2}/totodile/anim_front.png | Bin .../pokemon/{ => gen_2}/totodile/back.png | Bin .../{ => gen_2}/totodile/footprint.png | Bin .../pokemon/{ => gen_2}/totodile/icon.png | Bin .../pokemon/{ => gen_2}/totodile/normal.pal | 0 .../pokemon/{ => gen_2}/totodile/shiny.pal | 0 .../{ => gen_2}/typhlosion/anim_front.png | Bin .../pokemon/{ => gen_2}/typhlosion/back.png | Bin .../{ => gen_2}/typhlosion/footprint.png | Bin .../{ => gen_2}/typhlosion/hisuian/back.png | Bin .../{ => gen_2}/typhlosion/hisuian/front.png | Bin .../{ => gen_2}/typhlosion/hisuian/icon.png | Bin .../{ => gen_2}/typhlosion/hisuian/normal.pal | 0 .../{ => gen_2}/typhlosion/hisuian/shiny.pal | 0 .../pokemon/{ => gen_2}/typhlosion/icon.png | Bin .../pokemon/{ => gen_2}/typhlosion/normal.pal | 0 .../pokemon/{ => gen_2}/typhlosion/shiny.pal | 0 .../{ => gen_2}/tyranitar/anim_front.png | Bin .../pokemon/{ => gen_2}/tyranitar/back.png | Bin .../{ => gen_2}/tyranitar/footprint.png | Bin .../pokemon/{ => gen_2}/tyranitar/icon.png | Bin .../{ => gen_2}/tyranitar/mega/back.png | Bin .../{ => gen_2}/tyranitar/mega/front.png | Bin .../{ => gen_2}/tyranitar/mega/icon.png | Bin .../{ => gen_2}/tyranitar/mega/normal.pal | 0 .../{ => gen_2}/tyranitar/mega/shiny.pal | 0 .../pokemon/{ => gen_2}/tyranitar/normal.pal | 0 .../pokemon/{ => gen_2}/tyranitar/shiny.pal | 0 .../{ => gen_2}/tyrogue/anim_front.png | Bin graphics/pokemon/{ => gen_2}/tyrogue/back.png | Bin .../pokemon/{ => gen_2}/tyrogue/footprint.png | Bin graphics/pokemon/{ => gen_2}/tyrogue/icon.png | Bin .../pokemon/{ => gen_2}/tyrogue/normal.pal | 0 .../pokemon/{ => gen_2}/tyrogue/shiny.pal | 0 .../{ => gen_2}/umbreon/anim_front.png | Bin graphics/pokemon/{ => gen_2}/umbreon/back.png | Bin .../pokemon/{ => gen_2}/umbreon/footprint.png | Bin graphics/pokemon/{ => gen_2}/umbreon/icon.png | Bin .../pokemon/{ => gen_2}/umbreon/normal.pal | 0 .../pokemon/{ => gen_2}/umbreon/shiny.pal | 0 .../pokemon/{ => gen_2}/unown/anim_front.png | Bin .../{ => gen_2}/unown/b/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/b/back.png | Bin graphics/pokemon/{ => gen_2}/unown/b/icon.png | Bin graphics/pokemon/{ => gen_2}/unown/back.png | Bin .../{ => gen_2}/unown/c/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/c/back.png | Bin graphics/pokemon/{ => gen_2}/unown/c/icon.png | Bin .../{ => gen_2}/unown/d/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/d/back.png | Bin graphics/pokemon/{ => gen_2}/unown/d/icon.png | Bin .../{ => gen_2}/unown/e/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/e/back.png | Bin graphics/pokemon/{ => gen_2}/unown/e/icon.png | Bin .../unown/exclamation_mark/anim_front.png | Bin .../unown/exclamation_mark/back.png | Bin .../unown/exclamation_mark/icon.png | Bin .../{ => gen_2}/unown/f/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/f/back.png | Bin graphics/pokemon/{ => gen_2}/unown/f/icon.png | Bin .../{dunsparce => gen_2/unown}/footprint.png | Bin .../{ => gen_2}/unown/g/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/g/back.png | Bin graphics/pokemon/{ => gen_2}/unown/g/icon.png | Bin .../{ => gen_2}/unown/h/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/h/back.png | Bin graphics/pokemon/{ => gen_2}/unown/h/icon.png | Bin .../{ => gen_2}/unown/i/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/i/back.png | Bin graphics/pokemon/{ => gen_2}/unown/i/icon.png | Bin graphics/pokemon/{ => gen_2}/unown/icon.png | Bin .../{ => gen_2}/unown/j/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/j/back.png | Bin graphics/pokemon/{ => gen_2}/unown/j/icon.png | Bin .../{ => gen_2}/unown/k/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/k/back.png | Bin graphics/pokemon/{ => gen_2}/unown/k/icon.png | Bin .../{ => gen_2}/unown/l/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/l/back.png | Bin graphics/pokemon/{ => gen_2}/unown/l/icon.png | Bin .../{ => gen_2}/unown/m/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/m/back.png | Bin graphics/pokemon/{ => gen_2}/unown/m/icon.png | Bin .../{ => gen_2}/unown/n/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/n/back.png | Bin graphics/pokemon/{ => gen_2}/unown/n/icon.png | Bin graphics/pokemon/{ => gen_2}/unown/normal.pal | 0 .../{ => gen_2}/unown/o/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/o/back.png | Bin graphics/pokemon/{ => gen_2}/unown/o/icon.png | Bin .../{ => gen_2}/unown/p/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/p/back.png | Bin graphics/pokemon/{ => gen_2}/unown/p/icon.png | Bin .../{ => gen_2}/unown/q/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/q/back.png | Bin graphics/pokemon/{ => gen_2}/unown/q/icon.png | Bin .../unown/question_mark/anim_front.png | Bin .../{ => gen_2}/unown/question_mark/back.png | Bin .../{ => gen_2}/unown/question_mark/icon.png | Bin .../{ => gen_2}/unown/r/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/r/back.png | Bin graphics/pokemon/{ => gen_2}/unown/r/icon.png | Bin .../{ => gen_2}/unown/s/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/s/back.png | Bin graphics/pokemon/{ => gen_2}/unown/s/icon.png | Bin graphics/pokemon/{ => gen_2}/unown/shiny.pal | 0 .../{ => gen_2}/unown/t/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/t/back.png | Bin graphics/pokemon/{ => gen_2}/unown/t/icon.png | Bin .../{ => gen_2}/unown/u/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/u/back.png | Bin graphics/pokemon/{ => gen_2}/unown/u/icon.png | Bin .../{ => gen_2}/unown/v/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/v/back.png | Bin graphics/pokemon/{ => gen_2}/unown/v/icon.png | Bin .../{ => gen_2}/unown/w/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/w/back.png | Bin graphics/pokemon/{ => gen_2}/unown/w/icon.png | Bin .../{ => gen_2}/unown/x/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/x/back.png | Bin graphics/pokemon/{ => gen_2}/unown/x/icon.png | Bin .../{ => gen_2}/unown/y/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/y/back.png | Bin graphics/pokemon/{ => gen_2}/unown/y/icon.png | Bin .../{ => gen_2}/unown/z/anim_front.png | Bin graphics/pokemon/{ => gen_2}/unown/z/back.png | Bin graphics/pokemon/{ => gen_2}/unown/z/icon.png | Bin .../{ => gen_2}/ursaring/anim_front.png | Bin .../{ => gen_2}/ursaring/anim_frontf.png | Bin .../pokemon/{ => gen_2}/ursaring/back.png | Bin .../pokemon/{ => gen_2}/ursaring/backf.png | Bin .../{ => gen_2}/ursaring/footprint.png | Bin .../pokemon/{ => gen_2}/ursaring/icon.png | Bin .../pokemon/{ => gen_2}/ursaring/normal.pal | 0 .../pokemon/{ => gen_2}/ursaring/shiny.pal | 0 .../{ => gen_2}/wobbuffet/anim_front.png | Bin .../{ => gen_2}/wobbuffet/anim_frontf.png | Bin .../pokemon/{ => gen_2}/wobbuffet/back.png | Bin .../pokemon/{ => gen_2}/wobbuffet/backf.png | Bin .../{ => gen_2}/wobbuffet/footprint.png | Bin .../pokemon/{ => gen_2}/wobbuffet/icon.png | Bin .../pokemon/{ => gen_2}/wobbuffet/iconf.png | Bin .../pokemon/{ => gen_2}/wobbuffet/normal.pal | 0 .../pokemon/{ => gen_2}/wobbuffet/shiny.pal | 0 .../pokemon/{ => gen_2}/wooper/anim_front.png | Bin .../{ => gen_2}/wooper/anim_frontf.png | Bin graphics/pokemon/{ => gen_2}/wooper/back.png | Bin graphics/pokemon/{ => gen_2}/wooper/backf.png | Bin .../pokemon/{ => gen_2}/wooper/footprint.png | Bin graphics/pokemon/{ => gen_2}/wooper/icon.png | Bin .../pokemon/{ => gen_2}/wooper/normal.pal | 0 graphics/pokemon/{ => gen_2}/wooper/shiny.pal | 0 .../wooper/wooper_paldean/back.png | Bin .../wooper/wooper_paldean/front.png | Bin .../wooper/wooper_paldean/normal.pal | 0 .../wooper/wooper_paldean/shiny.pal | 0 .../pokemon/{ => gen_2}/xatu/anim_front.png | Bin .../pokemon/{ => gen_2}/xatu/anim_frontf.png | Bin graphics/pokemon/{ => gen_2}/xatu/back.png | Bin .../pokemon/{ => gen_2}/xatu/footprint.png | Bin graphics/pokemon/{ => gen_2}/xatu/icon.png | Bin graphics/pokemon/{ => gen_2}/xatu/normal.pal | 0 graphics/pokemon/{ => gen_2}/xatu/shiny.pal | 0 .../pokemon/{ => gen_2}/yanma/anim_front.png | Bin graphics/pokemon/{ => gen_2}/yanma/back.png | Bin .../pokemon/{ => gen_2}/yanma/footprint.png | Bin graphics/pokemon/{ => gen_2}/yanma/icon.png | Bin graphics/pokemon/{ => gen_2}/yanma/normal.pal | 0 graphics/pokemon/{ => gen_2}/yanma/shiny.pal | 0 .../pokemon/{ => gen_3}/absol/anim_front.png | Bin graphics/pokemon/{ => gen_3}/absol/back.png | Bin .../pokemon/{ => gen_3}/absol/footprint.png | Bin graphics/pokemon/{ => gen_3}/absol/icon.png | Bin .../pokemon/{ => gen_3}/absol/mega/back.png | Bin .../pokemon/{ => gen_3}/absol/mega/front.png | Bin .../pokemon/{ => gen_3}/absol/mega/icon.png | Bin .../pokemon/{ => gen_3}/absol/mega/normal.pal | 0 .../pokemon/{ => gen_3}/absol/mega/shiny.pal | 0 graphics/pokemon/{ => gen_3}/absol/normal.pal | 0 graphics/pokemon/{ => gen_3}/absol/shiny.pal | 0 .../pokemon/{ => gen_3}/aggron/anim_front.png | Bin graphics/pokemon/{ => gen_3}/aggron/back.png | Bin .../pokemon/{ => gen_3}/aggron/footprint.png | Bin graphics/pokemon/{ => gen_3}/aggron/icon.png | Bin .../pokemon/{ => gen_3}/aggron/mega/back.png | Bin .../pokemon/{ => gen_3}/aggron/mega/front.png | Bin .../pokemon/{ => gen_3}/aggron/mega/icon.png | Bin .../{ => gen_3}/aggron/mega/normal.pal | 0 .../pokemon/{ => gen_3}/aggron/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/aggron/normal.pal | 0 graphics/pokemon/{ => gen_3}/aggron/shiny.pal | 0 .../{ => gen_3}/altaria/anim_front.png | Bin graphics/pokemon/{ => gen_3}/altaria/back.png | Bin .../pokemon/{ => gen_3}/altaria/footprint.png | Bin graphics/pokemon/{ => gen_3}/altaria/icon.png | Bin .../pokemon/{ => gen_3}/altaria/mega/back.png | Bin .../{ => gen_3}/altaria/mega/front.png | Bin .../pokemon/{ => gen_3}/altaria/mega/icon.png | Bin .../{ => gen_3}/altaria/mega/normal.pal | 0 .../{ => gen_3}/altaria/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/altaria/normal.pal | 0 .../pokemon/{ => gen_3}/altaria/shiny.pal | 0 .../{ => gen_3}/anorith/anim_front.png | Bin graphics/pokemon/{ => gen_3}/anorith/back.png | Bin .../{duosion => gen_3/anorith}/footprint.png | Bin graphics/pokemon/{ => gen_3}/anorith/icon.png | Bin .../pokemon/{ => gen_3}/anorith/normal.pal | 0 .../pokemon/{ => gen_3}/anorith/shiny.pal | 0 .../{ => gen_3}/armaldo/anim_front.png | Bin graphics/pokemon/{ => gen_3}/armaldo/back.png | Bin .../pokemon/{ => gen_3}/armaldo/footprint.png | Bin graphics/pokemon/{ => gen_3}/armaldo/icon.png | Bin .../pokemon/{ => gen_3}/armaldo/normal.pal | 0 .../pokemon/{ => gen_3}/armaldo/shiny.pal | 0 .../pokemon/{ => gen_3}/aron/anim_front.png | Bin graphics/pokemon/{ => gen_3}/aron/back.png | Bin .../pokemon/{ => gen_3}/aron/footprint.png | Bin graphics/pokemon/{ => gen_3}/aron/icon.png | Bin graphics/pokemon/{ => gen_3}/aron/normal.pal | 0 graphics/pokemon/{ => gen_3}/aron/shiny.pal | 0 .../{ => gen_3}/azurill/anim_front.png | Bin graphics/pokemon/{ => gen_3}/azurill/back.png | Bin .../pokemon/{ => gen_3}/azurill/footprint.png | Bin graphics/pokemon/{ => gen_3}/azurill/icon.png | Bin .../pokemon/{ => gen_3}/azurill/normal.pal | 0 .../pokemon/{ => gen_3}/azurill/shiny.pal | 0 .../pokemon/{ => gen_3}/bagon/anim_front.png | Bin graphics/pokemon/{ => gen_3}/bagon/back.png | Bin .../pokemon/{ => gen_3}/bagon/footprint.png | Bin graphics/pokemon/{ => gen_3}/bagon/icon.png | Bin graphics/pokemon/{ => gen_3}/bagon/normal.pal | 0 graphics/pokemon/{ => gen_3}/bagon/shiny.pal | 0 .../pokemon/{ => gen_3}/baltoy/anim_front.png | Bin graphics/pokemon/{ => gen_3}/baltoy/back.png | Bin .../{drapion => gen_3/baltoy}/footprint.png | Bin graphics/pokemon/{ => gen_3}/baltoy/icon.png | Bin .../pokemon/{ => gen_3}/baltoy/normal.pal | 0 graphics/pokemon/{ => gen_3}/baltoy/shiny.pal | 0 .../{ => gen_3}/banette/anim_front.png | Bin graphics/pokemon/{ => gen_3}/banette/back.png | Bin .../pokemon/{ => gen_3}/banette/footprint.png | Bin graphics/pokemon/{ => gen_3}/banette/icon.png | Bin .../pokemon/{ => gen_3}/banette/mega/back.png | Bin .../{ => gen_3}/banette/mega/front.png | Bin .../pokemon/{ => gen_3}/banette/mega/icon.png | Bin .../{ => gen_3}/banette/mega/normal.pal | 0 .../{ => gen_3}/banette/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/banette/normal.pal | 0 .../pokemon/{ => gen_3}/banette/shiny.pal | 0 .../{ => gen_3}/barboach/anim_front.png | Bin .../pokemon/{ => gen_3}/barboach/back.png | Bin .../barboach}/footprint.png | Bin .../pokemon/{ => gen_3}/barboach/icon.png | Bin .../pokemon/{ => gen_3}/barboach/normal.pal | 0 .../pokemon/{ => gen_3}/barboach/shiny.pal | 0 .../{ => gen_3}/beautifly/anim_front.png | Bin .../{ => gen_3}/beautifly/anim_frontf.png | Bin .../pokemon/{ => gen_3}/beautifly/back.png | Bin .../pokemon/{ => gen_3}/beautifly/backf.png | Bin .../{ => gen_3}/beautifly/footprint.png | Bin .../pokemon/{ => gen_3}/beautifly/icon.png | Bin .../pokemon/{ => gen_3}/beautifly/normal.pal | 0 .../pokemon/{ => gen_3}/beautifly/shiny.pal | 0 .../pokemon/{ => gen_3}/beldum/anim_front.png | Bin graphics/pokemon/{ => gen_3}/beldum/back.png | Bin .../pokemon/{ => gen_3}/beldum/footprint.png | Bin graphics/pokemon/{ => gen_3}/beldum/icon.png | Bin .../pokemon/{ => gen_3}/beldum/normal.pal | 0 graphics/pokemon/{ => gen_3}/beldum/shiny.pal | 0 .../{ => gen_3}/blaziken/anim_front.png | Bin .../{ => gen_3}/blaziken/anim_frontf.png | Bin .../pokemon/{ => gen_3}/blaziken/back.png | Bin .../pokemon/{ => gen_3}/blaziken/backf.png | Bin .../{ => gen_3}/blaziken/footprint.png | Bin .../pokemon/{ => gen_3}/blaziken/icon.png | Bin .../{ => gen_3}/blaziken/mega/back.png | Bin .../{ => gen_3}/blaziken/mega/front.png | Bin .../{ => gen_3}/blaziken/mega/icon.png | Bin .../{ => gen_3}/blaziken/mega/normal.pal | 0 .../{ => gen_3}/blaziken/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/blaziken/normal.pal | 0 .../pokemon/{ => gen_3}/blaziken/shiny.pal | 0 .../{ => gen_3}/breloom/anim_front.png | Bin graphics/pokemon/{ => gen_3}/breloom/back.png | Bin .../pokemon/{ => gen_3}/breloom/footprint.png | Bin graphics/pokemon/{ => gen_3}/breloom/icon.png | Bin .../pokemon/{ => gen_3}/breloom/normal.pal | 0 .../pokemon/{ => gen_3}/breloom/shiny.pal | 0 .../pokemon/{ => gen_3}/cacnea/anim_front.png | Bin graphics/pokemon/{ => gen_3}/cacnea/back.png | Bin .../pokemon/{ => gen_3}/cacnea/footprint.png | Bin graphics/pokemon/{ => gen_3}/cacnea/icon.png | Bin .../pokemon/{ => gen_3}/cacnea/normal.pal | 0 graphics/pokemon/{ => gen_3}/cacnea/shiny.pal | 0 .../{ => gen_3}/cacturne/anim_front.png | Bin .../{ => gen_3}/cacturne/anim_frontf.png | Bin .../pokemon/{ => gen_3}/cacturne/back.png | Bin .../{ => gen_3}/cacturne/footprint.png | Bin .../pokemon/{ => gen_3}/cacturne/icon.png | Bin .../pokemon/{ => gen_3}/cacturne/normal.pal | 0 .../pokemon/{ => gen_3}/cacturne/shiny.pal | 0 .../{ => gen_3}/camerupt/anim_front.png | Bin .../{ => gen_3}/camerupt/anim_frontf.png | Bin .../pokemon/{ => gen_3}/camerupt/back.png | Bin .../pokemon/{ => gen_3}/camerupt/backf.png | Bin .../{ => gen_3}/camerupt/footprint.png | Bin .../pokemon/{ => gen_3}/camerupt/icon.png | Bin .../{ => gen_3}/camerupt/mega/back.png | Bin .../{ => gen_3}/camerupt/mega/front.png | Bin .../{ => gen_3}/camerupt/mega/icon.png | Bin .../{ => gen_3}/camerupt/mega/normal.pal | 0 .../{ => gen_3}/camerupt/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/camerupt/normal.pal | 0 .../pokemon/{ => gen_3}/camerupt/shiny.pal | 0 .../{ => gen_3}/carvanha/anim_front.png | Bin .../pokemon/{ => gen_3}/carvanha/back.png | Bin .../{duskull => gen_3/carvanha}/footprint.png | Bin .../pokemon/{ => gen_3}/carvanha/icon.png | Bin .../pokemon/{ => gen_3}/carvanha/normal.pal | 0 .../pokemon/{ => gen_3}/carvanha/shiny.pal | 0 .../{ => gen_3}/cascoon/anim_front.png | Bin graphics/pokemon/{ => gen_3}/cascoon/back.png | Bin .../cascoon}/footprint.png | Bin graphics/pokemon/{ => gen_3}/cascoon/icon.png | Bin .../pokemon/{ => gen_3}/cascoon/normal.pal | 0 .../pokemon/{ => gen_3}/cascoon/shiny.pal | 0 .../{ => gen_3}/castform/anim_front.png | Bin .../pokemon/{ => gen_3}/castform/back.png | Bin .../castform}/footprint.png | Bin .../pokemon/{ => gen_3}/castform/icon.png | Bin .../pokemon/{ => gen_3}/castform/normal.pal | 0 .../{ => gen_3}/castform/rainy/anim_front.png | Bin .../{ => gen_3}/castform/rainy/back.png | Bin .../{ => gen_3}/castform/rainy/icon.png | Bin .../{ => gen_3}/castform/rainy/normal.pal | 0 .../{ => gen_3}/castform/rainy/shiny.pal | 0 .../pokemon/{ => gen_3}/castform/shiny.pal | 0 .../{ => gen_3}/castform/snowy/anim_front.png | Bin .../{ => gen_3}/castform/snowy/back.png | Bin .../{ => gen_3}/castform/snowy/icon.png | Bin .../{ => gen_3}/castform/snowy/normal.pal | 0 .../{ => gen_3}/castform/snowy/shiny.pal | 0 .../{ => gen_3}/castform/sunny/anim_front.png | Bin .../{ => gen_3}/castform/sunny/back.png | Bin .../{ => gen_3}/castform/sunny/icon.png | Bin .../{ => gen_3}/castform/sunny/normal.pal | 0 .../{ => gen_3}/castform/sunny/shiny.pal | 0 .../{ => gen_3}/chimecho/anim_front.png | Bin .../pokemon/{ => gen_3}/chimecho/back.png | Bin .../{ekans => gen_3/chimecho}/footprint.png | Bin .../pokemon/{ => gen_3}/chimecho/icon.png | Bin .../pokemon/{ => gen_3}/chimecho/normal.pal | 0 .../pokemon/{ => gen_3}/chimecho/shiny.pal | 0 .../{ => gen_3}/clamperl/anim_front.png | Bin .../pokemon/{ => gen_3}/clamperl/back.png | Bin .../clamperl}/footprint.png | Bin .../pokemon/{ => gen_3}/clamperl/icon.png | Bin .../pokemon/{ => gen_3}/clamperl/normal.pal | 0 .../pokemon/{ => gen_3}/clamperl/shiny.pal | 0 .../{ => gen_3}/claydol/anim_front.png | Bin graphics/pokemon/{ => gen_3}/claydol/back.png | Bin .../pokemon/{ => gen_3}/claydol/footprint.png | Bin graphics/pokemon/{ => gen_3}/claydol/icon.png | Bin .../pokemon/{ => gen_3}/claydol/normal.pal | 0 .../pokemon/{ => gen_3}/claydol/shiny.pal | 0 .../{ => gen_3}/combusken/anim_front.png | Bin .../{ => gen_3}/combusken/anim_frontf.png | Bin .../pokemon/{ => gen_3}/combusken/back.png | Bin .../pokemon/{ => gen_3}/combusken/backf.png | Bin .../{ => gen_3}/combusken/footprint.png | Bin .../pokemon/{ => gen_3}/combusken/icon.png | Bin .../pokemon/{ => gen_3}/combusken/normal.pal | 0 .../pokemon/{ => gen_3}/combusken/shiny.pal | 0 .../{ => gen_3}/corphish/anim_front.png | Bin .../pokemon/{ => gen_3}/corphish/back.png | Bin .../{ => gen_3}/corphish/footprint.png | Bin .../pokemon/{ => gen_3}/corphish/icon.png | Bin .../pokemon/{ => gen_3}/corphish/normal.pal | 0 .../pokemon/{ => gen_3}/corphish/shiny.pal | 0 .../{ => gen_3}/cradily/anim_front.png | Bin graphics/pokemon/{ => gen_3}/cradily/back.png | Bin .../pokemon/{ => gen_3}/cradily/footprint.png | Bin graphics/pokemon/{ => gen_3}/cradily/icon.png | Bin .../pokemon/{ => gen_3}/cradily/normal.pal | 0 .../pokemon/{ => gen_3}/cradily/shiny.pal | 0 .../{ => gen_3}/crawdaunt/anim_front.png | Bin .../pokemon/{ => gen_3}/crawdaunt/back.png | Bin .../{ => gen_3}/crawdaunt/footprint.png | Bin .../pokemon/{ => gen_3}/crawdaunt/icon.png | Bin .../pokemon/{ => gen_3}/crawdaunt/normal.pal | 0 .../pokemon/{ => gen_3}/crawdaunt/shiny.pal | 0 .../{ => gen_3}/delcatty/anim_front.png | Bin .../pokemon/{ => gen_3}/delcatty/back.png | Bin .../{ => gen_3}/delcatty/footprint.png | Bin .../pokemon/{ => gen_3}/delcatty/icon.png | Bin .../pokemon/{ => gen_3}/delcatty/normal.pal | 0 .../pokemon/{ => gen_3}/delcatty/shiny.pal | 0 .../pokemon/{ => gen_3}/deoxys/anim_front.png | Bin .../{ => gen_3}/deoxys/attack/anim_front.png | Bin .../{ => gen_3}/deoxys/attack/back.png | Bin .../{ => gen_3}/deoxys/attack/icon.png | Bin .../{ => gen_3}/deoxys/attack/normal.pal | 0 .../{ => gen_3}/deoxys/attack/shiny.pal | 0 graphics/pokemon/{ => gen_3}/deoxys/back.png | Bin .../{ => gen_3}/deoxys/defense/anim_front.png | Bin .../{ => gen_3}/deoxys/defense/back.png | Bin .../{ => gen_3}/deoxys/defense/icon.png | Bin .../{ => gen_3}/deoxys/defense/normal.pal | 0 .../{ => gen_3}/deoxys/defense/shiny.pal | 0 .../pokemon/{ => gen_3}/deoxys/footprint.png | Bin graphics/pokemon/{ => gen_3}/deoxys/icon.png | Bin .../{ => gen_3}/deoxys/icon_speed_wide.png | Bin .../pokemon/{ => gen_3}/deoxys/normal.pal | 0 graphics/pokemon/{ => gen_3}/deoxys/shiny.pal | 0 .../{ => gen_3}/deoxys/speed/anim_front.png | Bin .../pokemon/{ => gen_3}/deoxys/speed/back.png | Bin .../pokemon/{ => gen_3}/deoxys/speed/icon.png | Bin .../{ => gen_3}/deoxys/speed/normal.pal | 0 .../{ => gen_3}/deoxys/speed/shiny.pal | 0 .../{ => gen_3}/dusclops/anim_front.png | Bin .../pokemon/{ => gen_3}/dusclops/back.png | Bin .../{ => gen_3}/dusclops/footprint.png | Bin .../pokemon/{ => gen_3}/dusclops/icon.png | Bin .../pokemon/{ => gen_3}/dusclops/normal.pal | 0 .../pokemon/{ => gen_3}/dusclops/shiny.pal | 0 .../{ => gen_3}/duskull/anim_front.png | Bin graphics/pokemon/{ => gen_3}/duskull/back.png | Bin .../duskull}/footprint.png | Bin graphics/pokemon/{ => gen_3}/duskull/icon.png | Bin .../pokemon/{ => gen_3}/duskull/normal.pal | 0 .../pokemon/{ => gen_3}/duskull/shiny.pal | 0 .../pokemon/{ => gen_3}/dustox/anim_front.png | Bin .../{ => gen_3}/dustox/anim_frontf.png | Bin graphics/pokemon/{ => gen_3}/dustox/back.png | Bin graphics/pokemon/{ => gen_3}/dustox/backf.png | Bin .../pokemon/{ => gen_3}/dustox/footprint.png | Bin graphics/pokemon/{ => gen_3}/dustox/icon.png | Bin .../pokemon/{ => gen_3}/dustox/normal.pal | 0 graphics/pokemon/{ => gen_3}/dustox/shiny.pal | 0 .../{ => gen_3}/electrike/anim_front.png | Bin .../pokemon/{ => gen_3}/electrike/back.png | Bin .../{ => gen_3}/electrike/footprint.png | Bin .../pokemon/{ => gen_3}/electrike/icon.png | Bin .../pokemon/{ => gen_3}/electrike/normal.pal | 0 .../pokemon/{ => gen_3}/electrike/shiny.pal | 0 .../{ => gen_3}/exploud/anim_front.png | Bin graphics/pokemon/{ => gen_3}/exploud/back.png | Bin .../pokemon/{ => gen_3}/exploud/footprint.png | Bin graphics/pokemon/{ => gen_3}/exploud/icon.png | Bin .../pokemon/{ => gen_3}/exploud/normal.pal | 0 .../pokemon/{ => gen_3}/exploud/shiny.pal | 0 .../pokemon/{ => gen_3}/feebas/anim_front.png | Bin graphics/pokemon/{ => gen_3}/feebas/back.png | Bin .../feebas}/footprint.png | Bin graphics/pokemon/{ => gen_3}/feebas/icon.png | Bin .../pokemon/{ => gen_3}/feebas/normal.pal | 0 graphics/pokemon/{ => gen_3}/feebas/shiny.pal | 0 .../pokemon/{ => gen_3}/flygon/anim_front.png | Bin graphics/pokemon/{ => gen_3}/flygon/back.png | Bin .../pokemon/{ => gen_3}/flygon/footprint.png | Bin graphics/pokemon/{ => gen_3}/flygon/icon.png | Bin .../pokemon/{ => gen_3}/flygon/normal.pal | 0 graphics/pokemon/{ => gen_3}/flygon/shiny.pal | 0 .../{ => gen_3}/gardevoir/anim_front.png | Bin .../pokemon/{ => gen_3}/gardevoir/back.png | Bin .../{ => gen_3}/gardevoir/footprint.png | Bin .../pokemon/{ => gen_3}/gardevoir/icon.png | Bin .../{ => gen_3}/gardevoir/mega/back.png | Bin .../{ => gen_3}/gardevoir/mega/front.png | Bin .../{ => gen_3}/gardevoir/mega/icon.png | Bin .../{ => gen_3}/gardevoir/mega/normal.pal | 0 .../{ => gen_3}/gardevoir/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/gardevoir/normal.pal | 0 .../pokemon/{ => gen_3}/gardevoir/shiny.pal | 0 .../pokemon/{ => gen_3}/glalie/anim_front.png | Bin graphics/pokemon/{ => gen_3}/glalie/back.png | Bin .../{exeggcute => gen_3/glalie}/footprint.png | Bin graphics/pokemon/{ => gen_3}/glalie/icon.png | Bin .../pokemon/{ => gen_3}/glalie/mega/back.png | Bin .../pokemon/{ => gen_3}/glalie/mega/front.png | Bin .../pokemon/{ => gen_3}/glalie/mega/icon.png | Bin .../{ => gen_3}/glalie/mega/normal.pal | 0 .../pokemon/{ => gen_3}/glalie/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/glalie/normal.pal | 0 graphics/pokemon/{ => gen_3}/glalie/shiny.pal | 0 .../{ => gen_3}/gorebyss/anim_front.png | Bin .../pokemon/{ => gen_3}/gorebyss/back.png | Bin .../{feebas => gen_3/gorebyss}/footprint.png | Bin .../pokemon/{ => gen_3}/gorebyss/icon.png | Bin .../pokemon/{ => gen_3}/gorebyss/normal.pal | 0 .../pokemon/{ => gen_3}/gorebyss/shiny.pal | 0 .../{ => gen_3}/groudon/anim_front.png | Bin graphics/pokemon/{ => gen_3}/groudon/back.png | Bin .../pokemon/{ => gen_3}/groudon/footprint.png | Bin graphics/pokemon/{ => gen_3}/groudon/icon.png | Bin .../pokemon/{ => gen_3}/groudon/normal.pal | 0 .../{ => gen_3}/groudon/primal/back.png | Bin .../{ => gen_3}/groudon/primal/front.png | Bin .../{ => gen_3}/groudon/primal/icon.png | Bin .../{ => gen_3}/groudon/primal/normal.pal | 0 .../{ => gen_3}/groudon/primal/shiny.pal | 0 .../pokemon/{ => gen_3}/groudon/shiny.pal | 0 .../{ => gen_3}/grovyle/anim_front.png | Bin graphics/pokemon/{ => gen_3}/grovyle/back.png | Bin .../pokemon/{ => gen_3}/grovyle/footprint.png | Bin graphics/pokemon/{ => gen_3}/grovyle/icon.png | Bin .../pokemon/{ => gen_3}/grovyle/normal.pal | 0 .../pokemon/{ => gen_3}/grovyle/shiny.pal | 0 .../{ => gen_3}/grumpig/anim_front.png | Bin graphics/pokemon/{ => gen_3}/grumpig/back.png | Bin .../pokemon/{ => gen_3}/grumpig/footprint.png | Bin graphics/pokemon/{ => gen_3}/grumpig/icon.png | Bin .../pokemon/{ => gen_3}/grumpig/normal.pal | 0 .../pokemon/{ => gen_3}/grumpig/shiny.pal | 0 .../pokemon/{ => gen_3}/gulpin/anim_front.png | Bin .../{ => gen_3}/gulpin/anim_frontf.png | Bin graphics/pokemon/{ => gen_3}/gulpin/back.png | Bin graphics/pokemon/{ => gen_3}/gulpin/backf.png | Bin .../{ferroseed => gen_3/gulpin}/footprint.png | Bin graphics/pokemon/{ => gen_3}/gulpin/icon.png | Bin .../pokemon/{ => gen_3}/gulpin/normal.pal | 0 graphics/pokemon/{ => gen_3}/gulpin/shiny.pal | 0 .../{ => gen_3}/hariyama/anim_front.png | Bin .../pokemon/{ => gen_3}/hariyama/back.png | Bin .../{ => gen_3}/hariyama/footprint.png | Bin .../pokemon/{ => gen_3}/hariyama/icon.png | Bin .../pokemon/{ => gen_3}/hariyama/normal.pal | 0 .../pokemon/{ => gen_3}/hariyama/shiny.pal | 0 .../{ => gen_3}/huntail/anim_front.png | Bin graphics/pokemon/{ => gen_3}/huntail/back.png | Bin .../{finneon => gen_3/huntail}/footprint.png | Bin graphics/pokemon/{ => gen_3}/huntail/icon.png | Bin .../pokemon/{ => gen_3}/huntail/normal.pal | 0 .../pokemon/{ => gen_3}/huntail/shiny.pal | 0 .../{ => gen_3}/illumise/anim_front.png | Bin .../pokemon/{ => gen_3}/illumise/back.png | Bin .../{ => gen_3}/illumise/footprint.png | Bin .../pokemon/{ => gen_3}/illumise/icon.png | Bin .../pokemon/{ => gen_3}/illumise/normal.pal | 0 .../pokemon/{ => gen_3}/illumise/shiny.pal | 0 .../{ => gen_3}/jirachi/anim_front.png | Bin graphics/pokemon/{ => gen_3}/jirachi/back.png | Bin .../pokemon/{ => gen_3}/jirachi/footprint.png | Bin graphics/pokemon/{ => gen_3}/jirachi/icon.png | Bin .../pokemon/{ => gen_3}/jirachi/normal.pal | 0 .../pokemon/{ => gen_3}/jirachi/shiny.pal | 0 .../{ => gen_3}/kecleon/anim_front.png | Bin graphics/pokemon/{ => gen_3}/kecleon/back.png | Bin .../pokemon/{ => gen_3}/kecleon/footprint.png | Bin graphics/pokemon/{ => gen_3}/kecleon/icon.png | Bin .../pokemon/{ => gen_3}/kecleon/normal.pal | 0 .../pokemon/{ => gen_3}/kecleon/shiny.pal | 0 .../pokemon/{ => gen_3}/kirlia/anim_front.png | Bin graphics/pokemon/{ => gen_3}/kirlia/back.png | Bin .../{budew => gen_3/kirlia}/footprint.png | Bin graphics/pokemon/{ => gen_3}/kirlia/icon.png | Bin .../pokemon/{ => gen_3}/kirlia/normal.pal | 0 graphics/pokemon/{ => gen_3}/kirlia/shiny.pal | 0 .../pokemon/{ => gen_3}/kyogre/anim_front.png | Bin graphics/pokemon/{ => gen_3}/kyogre/back.png | Bin .../pokemon/{ => gen_3}/kyogre/footprint.png | Bin graphics/pokemon/{ => gen_3}/kyogre/icon.png | Bin .../pokemon/{ => gen_3}/kyogre/normal.pal | 0 .../{ => gen_3}/kyogre/primal/back.png | Bin .../{ => gen_3}/kyogre/primal/front.png | Bin .../{ => gen_3}/kyogre/primal/icon.png | Bin .../{ => gen_3}/kyogre/primal/normal.pal | 0 .../{ => gen_3}/kyogre/primal/shiny.pal | 0 graphics/pokemon/{ => gen_3}/kyogre/shiny.pal | 0 .../pokemon/{ => gen_3}/lairon/anim_front.png | Bin graphics/pokemon/{ => gen_3}/lairon/back.png | Bin .../pokemon/{ => gen_3}/lairon/footprint.png | Bin graphics/pokemon/{ => gen_3}/lairon/icon.png | Bin .../pokemon/{ => gen_3}/lairon/normal.pal | 0 graphics/pokemon/{ => gen_3}/lairon/shiny.pal | 0 .../pokemon/{ => gen_3}/latias/anim_front.png | Bin graphics/pokemon/{ => gen_3}/latias/back.png | Bin .../pokemon/{ => gen_3}/latias/footprint.png | Bin graphics/pokemon/{ => gen_3}/latias/icon.png | Bin .../pokemon/{ => gen_3}/latias/mega/back.png | Bin .../pokemon/{ => gen_3}/latias/mega/front.png | Bin .../pokemon/{ => gen_3}/latias/mega/icon.png | Bin .../{ => gen_3}/latias/mega/normal.pal | 0 .../pokemon/{ => gen_3}/latias/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/latias/normal.pal | 0 graphics/pokemon/{ => gen_3}/latias/shiny.pal | 0 .../pokemon/{ => gen_3}/latios/anim_front.png | Bin graphics/pokemon/{ => gen_3}/latios/back.png | Bin .../pokemon/{ => gen_3}/latios/footprint.png | Bin graphics/pokemon/{ => gen_3}/latios/icon.png | Bin .../pokemon/{ => gen_3}/latios/mega/back.png | Bin .../pokemon/{ => gen_3}/latios/mega/front.png | Bin .../pokemon/{ => gen_3}/latios/mega/icon.png | Bin .../{ => gen_3}/latios/mega/normal.pal | 0 .../pokemon/{ => gen_3}/latios/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/latios/normal.pal | 0 graphics/pokemon/{ => gen_3}/latios/shiny.pal | 0 .../pokemon/{ => gen_3}/lileep/anim_front.png | Bin graphics/pokemon/{ => gen_3}/lileep/back.png | Bin .../pokemon/{ => gen_3}/lileep/footprint.png | Bin graphics/pokemon/{ => gen_3}/lileep/icon.png | Bin .../pokemon/{ => gen_3}/lileep/normal.pal | 0 graphics/pokemon/{ => gen_3}/lileep/shiny.pal | 0 .../{ => gen_3}/linoone/anim_front.png | Bin graphics/pokemon/{ => gen_3}/linoone/back.png | Bin .../pokemon/{ => gen_3}/linoone/footprint.png | Bin .../{ => gen_3}/linoone/galarian/back.png | Bin .../{ => gen_3}/linoone/galarian/front.png | Bin .../{ => gen_3}/linoone/galarian/icon.png | Bin .../{ => gen_3}/linoone/galarian/normal.pal | 0 .../{ => gen_3}/linoone/galarian/shiny.pal | 0 graphics/pokemon/{ => gen_3}/linoone/icon.png | Bin .../pokemon/{ => gen_3}/linoone/normal.pal | 0 .../pokemon/{ => gen_3}/linoone/shiny.pal | 0 .../pokemon/{ => gen_3}/lombre/anim_front.png | Bin graphics/pokemon/{ => gen_3}/lombre/back.png | Bin .../pokemon/{ => gen_3}/lombre/footprint.png | Bin graphics/pokemon/{ => gen_3}/lombre/icon.png | Bin .../pokemon/{ => gen_3}/lombre/normal.pal | 0 graphics/pokemon/{ => gen_3}/lombre/shiny.pal | 0 .../pokemon/{ => gen_3}/lotad/anim_front.png | Bin graphics/pokemon/{ => gen_3}/lotad/back.png | Bin .../pokemon/{ => gen_3}/lotad/footprint.png | Bin graphics/pokemon/{ => gen_3}/lotad/icon.png | Bin graphics/pokemon/{ => gen_3}/lotad/normal.pal | 0 graphics/pokemon/{ => gen_3}/lotad/shiny.pal | 0 .../{ => gen_3}/loudred/anim_front.png | Bin graphics/pokemon/{ => gen_3}/loudred/back.png | Bin .../pokemon/{ => gen_3}/loudred/footprint.png | Bin graphics/pokemon/{ => gen_3}/loudred/icon.png | Bin .../pokemon/{ => gen_3}/loudred/normal.pal | 0 .../pokemon/{ => gen_3}/loudred/shiny.pal | 0 .../{ => gen_3}/ludicolo/anim_front.png | Bin .../{ => gen_3}/ludicolo/anim_frontf.png | Bin .../pokemon/{ => gen_3}/ludicolo/back.png | Bin .../pokemon/{ => gen_3}/ludicolo/backf.png | Bin .../{ => gen_3}/ludicolo/footprint.png | Bin .../pokemon/{ => gen_3}/ludicolo/icon.png | Bin .../pokemon/{ => gen_3}/ludicolo/normal.pal | 0 .../pokemon/{ => gen_3}/ludicolo/shiny.pal | 0 .../{ => gen_3}/lunatone/anim_front.png | Bin .../pokemon/{ => gen_3}/lunatone/back.png | Bin .../{flabebe => gen_3/lunatone}/footprint.png | Bin .../pokemon/{ => gen_3}/lunatone/icon.png | Bin .../pokemon/{ => gen_3}/lunatone/normal.pal | 0 .../pokemon/{ => gen_3}/lunatone/shiny.pal | 0 .../{ => gen_3}/luvdisc/anim_front.png | Bin graphics/pokemon/{ => gen_3}/luvdisc/back.png | Bin .../{flapple => gen_3/luvdisc}/footprint.png | Bin graphics/pokemon/{ => gen_3}/luvdisc/icon.png | Bin .../pokemon/{ => gen_3}/luvdisc/normal.pal | 0 .../pokemon/{ => gen_3}/luvdisc/shiny.pal | 0 .../{ => gen_3}/makuhita/anim_front.png | Bin .../pokemon/{ => gen_3}/makuhita/back.png | Bin .../{ => gen_3}/makuhita/footprint.png | Bin .../pokemon/{ => gen_3}/makuhita/icon.png | Bin .../pokemon/{ => gen_3}/makuhita/normal.pal | 0 .../pokemon/{ => gen_3}/makuhita/shiny.pal | 0 .../{ => gen_3}/manectric/anim_front.png | Bin .../pokemon/{ => gen_3}/manectric/back.png | Bin .../{ => gen_3}/manectric/footprint.png | Bin .../pokemon/{ => gen_3}/manectric/icon.png | Bin .../{ => gen_3}/manectric/mega/back.png | Bin .../{ => gen_3}/manectric/mega/front.png | Bin .../{ => gen_3}/manectric/mega/icon.png | Bin .../{ => gen_3}/manectric/mega/normal.pal | 0 .../{ => gen_3}/manectric/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/manectric/normal.pal | 0 .../pokemon/{ => gen_3}/manectric/shiny.pal | 0 .../{ => gen_3}/marshtomp/anim_front.png | Bin .../pokemon/{ => gen_3}/marshtomp/back.png | Bin .../{ => gen_3}/marshtomp/footprint.png | Bin .../pokemon/{ => gen_3}/marshtomp/icon.png | Bin .../pokemon/{ => gen_3}/marshtomp/normal.pal | 0 .../pokemon/{ => gen_3}/marshtomp/shiny.pal | 0 .../{ => gen_3}/masquerain/anim_front.png | Bin .../pokemon/{ => gen_3}/masquerain/back.png | Bin .../masquerain}/footprint.png | Bin .../pokemon/{ => gen_3}/masquerain/icon.png | Bin .../pokemon/{ => gen_3}/masquerain/normal.pal | 0 .../pokemon/{ => gen_3}/masquerain/shiny.pal | 0 .../pokemon/{ => gen_3}/mawile/anim_front.png | Bin graphics/pokemon/{ => gen_3}/mawile/back.png | Bin .../pokemon/{ => gen_3}/mawile/footprint.png | Bin graphics/pokemon/{ => gen_3}/mawile/icon.png | Bin .../pokemon/{ => gen_3}/mawile/mega/back.png | Bin .../pokemon/{ => gen_3}/mawile/mega/front.png | Bin .../pokemon/{ => gen_3}/mawile/mega/icon.png | Bin .../{ => gen_3}/mawile/mega/normal.pal | 0 .../pokemon/{ => gen_3}/mawile/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/mawile/normal.pal | 0 graphics/pokemon/{ => gen_3}/mawile/shiny.pal | 0 .../{ => gen_3}/medicham/anim_front.png | Bin .../{ => gen_3}/medicham/anim_frontf.png | Bin .../pokemon/{ => gen_3}/medicham/back.png | Bin .../pokemon/{ => gen_3}/medicham/backf.png | Bin .../{ => gen_3}/medicham/footprint.png | Bin .../pokemon/{ => gen_3}/medicham/icon.png | Bin .../{ => gen_3}/medicham/mega/back.png | Bin .../{ => gen_3}/medicham/mega/front.png | Bin .../{ => gen_3}/medicham/mega/icon.png | Bin .../{ => gen_3}/medicham/mega/normal.pal | 0 .../{ => gen_3}/medicham/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/medicham/normal.pal | 0 .../pokemon/{ => gen_3}/medicham/shiny.pal | 0 .../{ => gen_3}/meditite/anim_front.png | Bin .../{ => gen_3}/meditite/anim_frontf.png | Bin .../pokemon/{ => gen_3}/meditite/back.png | Bin .../pokemon/{ => gen_3}/meditite/backf.png | Bin .../{ => gen_3}/meditite/footprint.png | Bin .../pokemon/{ => gen_3}/meditite/icon.png | Bin .../pokemon/{ => gen_3}/meditite/normal.pal | 0 .../pokemon/{ => gen_3}/meditite/shiny.pal | 0 .../{ => gen_3}/metagross/anim_front.png | Bin .../pokemon/{ => gen_3}/metagross/back.png | Bin .../{ => gen_3}/metagross/footprint.png | Bin .../pokemon/{ => gen_3}/metagross/icon.png | Bin .../{ => gen_3}/metagross/mega/back.png | Bin .../{ => gen_3}/metagross/mega/front.png | Bin .../{ => gen_3}/metagross/mega/icon.png | Bin .../{ => gen_3}/metagross/mega/normal.pal | 0 .../{ => gen_3}/metagross/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/metagross/normal.pal | 0 .../pokemon/{ => gen_3}/metagross/shiny.pal | 0 .../pokemon/{ => gen_3}/metang/anim_front.png | Bin graphics/pokemon/{ => gen_3}/metang/back.png | Bin .../pokemon/{ => gen_3}/metang/footprint.png | Bin graphics/pokemon/{ => gen_3}/metang/icon.png | Bin .../pokemon/{ => gen_3}/metang/normal.pal | 0 graphics/pokemon/{ => gen_3}/metang/shiny.pal | 0 .../{ => gen_3}/mightyena/anim_front.png | Bin .../pokemon/{ => gen_3}/mightyena/back.png | Bin .../{ => gen_3}/mightyena/footprint.png | Bin .../pokemon/{ => gen_3}/mightyena/icon.png | Bin .../pokemon/{ => gen_3}/mightyena/normal.pal | 0 .../pokemon/{ => gen_3}/mightyena/shiny.pal | 0 .../{ => gen_3}/milotic/anim_front.png | Bin .../{ => gen_3}/milotic/anim_frontf.png | Bin graphics/pokemon/{ => gen_3}/milotic/back.png | Bin .../pokemon/{ => gen_3}/milotic/backf.png | Bin .../{florges => gen_3/milotic}/footprint.png | Bin graphics/pokemon/{ => gen_3}/milotic/icon.png | Bin .../pokemon/{ => gen_3}/milotic/normal.pal | 0 .../pokemon/{ => gen_3}/milotic/shiny.pal | 0 .../pokemon/{ => gen_3}/minun/anim_front.png | Bin graphics/pokemon/{ => gen_3}/minun/back.png | Bin .../pokemon/{ => gen_3}/minun/footprint.png | Bin graphics/pokemon/{ => gen_3}/minun/icon.png | Bin graphics/pokemon/{ => gen_3}/minun/normal.pal | 0 graphics/pokemon/{ => gen_3}/minun/shiny.pal | 0 .../pokemon/{ => gen_3}/mudkip/anim_front.png | Bin graphics/pokemon/{ => gen_3}/mudkip/back.png | Bin .../pokemon/{ => gen_3}/mudkip/footprint.png | Bin graphics/pokemon/{ => gen_3}/mudkip/icon.png | Bin .../pokemon/{ => gen_3}/mudkip/normal.pal | 0 graphics/pokemon/{ => gen_3}/mudkip/shiny.pal | 0 .../{ => gen_3}/nincada/anim_front.png | Bin graphics/pokemon/{ => gen_3}/nincada/back.png | Bin .../pokemon/{ => gen_3}/nincada/footprint.png | Bin graphics/pokemon/{ => gen_3}/nincada/icon.png | Bin .../pokemon/{ => gen_3}/nincada/normal.pal | 0 .../pokemon/{ => gen_3}/nincada/shiny.pal | 0 .../{ => gen_3}/ninjask/anim_front.png | Bin graphics/pokemon/{ => gen_3}/ninjask/back.png | Bin .../pokemon/{ => gen_3}/ninjask/footprint.png | Bin graphics/pokemon/{ => gen_3}/ninjask/icon.png | Bin .../pokemon/{ => gen_3}/ninjask/normal.pal | 0 .../pokemon/{ => gen_3}/ninjask/shiny.pal | 0 .../{ => gen_3}/nosepass/anim_front.png | Bin .../pokemon/{ => gen_3}/nosepass/back.png | Bin .../{ => gen_3}/nosepass/footprint.png | Bin .../pokemon/{ => gen_3}/nosepass/icon.png | Bin .../pokemon/{ => gen_3}/nosepass/normal.pal | 0 .../pokemon/{ => gen_3}/nosepass/shiny.pal | 0 .../pokemon/{ => gen_3}/numel/anim_front.png | Bin .../pokemon/{ => gen_3}/numel/anim_frontf.png | Bin graphics/pokemon/{ => gen_3}/numel/back.png | Bin graphics/pokemon/{ => gen_3}/numel/backf.png | Bin .../pokemon/{ => gen_3}/numel/footprint.png | Bin graphics/pokemon/{ => gen_3}/numel/icon.png | Bin graphics/pokemon/{ => gen_3}/numel/normal.pal | 0 graphics/pokemon/{ => gen_3}/numel/shiny.pal | 0 .../{ => gen_3}/nuzleaf/anim_front.png | Bin .../{ => gen_3}/nuzleaf/anim_frontf.png | Bin graphics/pokemon/{ => gen_3}/nuzleaf/back.png | Bin .../pokemon/{ => gen_3}/nuzleaf/backf.png | Bin .../pokemon/{ => gen_3}/nuzleaf/footprint.png | Bin graphics/pokemon/{ => gen_3}/nuzleaf/icon.png | Bin .../pokemon/{ => gen_3}/nuzleaf/normal.pal | 0 .../pokemon/{ => gen_3}/nuzleaf/shiny.pal | 0 .../{ => gen_3}/pelipper/anim_front.png | Bin .../pokemon/{ => gen_3}/pelipper/back.png | Bin .../{ => gen_3}/pelipper/footprint.png | Bin .../pokemon/{ => gen_3}/pelipper/icon.png | Bin .../pokemon/{ => gen_3}/pelipper/normal.pal | 0 .../pokemon/{ => gen_3}/pelipper/shiny.pal | 0 .../pokemon/{ => gen_3}/plusle/anim_front.png | Bin graphics/pokemon/{ => gen_3}/plusle/back.png | Bin .../pokemon/{ => gen_3}/plusle/footprint.png | Bin graphics/pokemon/{ => gen_3}/plusle/icon.png | Bin .../pokemon/{ => gen_3}/plusle/normal.pal | 0 graphics/pokemon/{ => gen_3}/plusle/shiny.pal | 0 .../{ => gen_3}/poochyena/anim_front.png | Bin .../pokemon/{ => gen_3}/poochyena/back.png | Bin .../{ => gen_3}/poochyena/footprint.png | Bin .../pokemon/{ => gen_3}/poochyena/icon.png | Bin .../pokemon/{ => gen_3}/poochyena/normal.pal | 0 .../pokemon/{ => gen_3}/poochyena/shiny.pal | 0 .../pokemon/{ => gen_3}/ralts/anim_front.png | Bin graphics/pokemon/{ => gen_3}/ralts/back.png | Bin .../{durant => gen_3/ralts}/footprint.png | Bin graphics/pokemon/{ => gen_3}/ralts/icon.png | Bin graphics/pokemon/{ => gen_3}/ralts/normal.pal | 0 graphics/pokemon/{ => gen_3}/ralts/shiny.pal | 0 .../{ => gen_3}/rayquaza/anim_front.png | Bin .../pokemon/{ => gen_3}/rayquaza/back.png | Bin .../{foongus => gen_3/rayquaza}/footprint.png | Bin .../pokemon/{ => gen_3}/rayquaza/icon.png | Bin .../{ => gen_3}/rayquaza/mega/back.png | Bin .../{ => gen_3}/rayquaza/mega/front.png | Bin .../{ => gen_3}/rayquaza/mega/icon.png | Bin .../{ => gen_3}/rayquaza/mega/normal.pal | 0 .../{ => gen_3}/rayquaza/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/rayquaza/normal.pal | 0 .../pokemon/{ => gen_3}/rayquaza/shiny.pal | 0 .../pokemon/{ => gen_3}/regice/anim_front.png | Bin graphics/pokemon/{ => gen_3}/regice/back.png | Bin .../{dwebble => gen_3/regice}/footprint.png | Bin graphics/pokemon/{ => gen_3}/regice/icon.png | Bin .../pokemon/{ => gen_3}/regice/normal.pal | 0 graphics/pokemon/{ => gen_3}/regice/shiny.pal | 0 .../{ => gen_3}/regirock/anim_front.png | Bin .../pokemon/{ => gen_3}/regirock/back.png | Bin .../{ => gen_3}/regirock/footprint.png | Bin .../pokemon/{ => gen_3}/regirock/icon.png | Bin .../pokemon/{ => gen_3}/regirock/normal.pal | 0 .../pokemon/{ => gen_3}/regirock/shiny.pal | 0 .../{ => gen_3}/registeel/anim_front.png | Bin .../pokemon/{ => gen_3}/registeel/back.png | Bin .../{ => gen_3}/registeel/footprint.png | Bin .../pokemon/{ => gen_3}/registeel/icon.png | Bin .../pokemon/{ => gen_3}/registeel/normal.pal | 0 .../pokemon/{ => gen_3}/registeel/shiny.pal | 0 .../{ => gen_3}/relicanth/anim_front.png | Bin .../{ => gen_3}/relicanth/anim_frontf.png | Bin .../pokemon/{ => gen_3}/relicanth/back.png | Bin .../pokemon/{ => gen_3}/relicanth/backf.png | Bin .../relicanth}/footprint.png | Bin .../pokemon/{ => gen_3}/relicanth/icon.png | Bin .../pokemon/{ => gen_3}/relicanth/normal.pal | 0 .../pokemon/{ => gen_3}/relicanth/shiny.pal | 0 .../{ => gen_3}/roselia/anim_front.png | Bin .../{ => gen_3}/roselia/anim_frontf.png | Bin graphics/pokemon/{ => gen_3}/roselia/back.png | Bin .../pokemon/{ => gen_3}/roselia/backf.png | Bin .../pokemon/{ => gen_3}/roselia/footprint.png | Bin graphics/pokemon/{ => gen_3}/roselia/icon.png | Bin .../pokemon/{ => gen_3}/roselia/normal.pal | 0 .../pokemon/{ => gen_3}/roselia/shiny.pal | 0 .../{ => gen_3}/sableye/anim_front.png | Bin graphics/pokemon/{ => gen_3}/sableye/back.png | Bin .../pokemon/{ => gen_3}/sableye/footprint.png | Bin graphics/pokemon/{ => gen_3}/sableye/icon.png | Bin .../pokemon/{ => gen_3}/sableye/mega/back.png | Bin .../{ => gen_3}/sableye/mega/front.png | Bin .../pokemon/{ => gen_3}/sableye/mega/icon.png | Bin .../{ => gen_3}/sableye/mega/normal.pal | 0 .../{ => gen_3}/sableye/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/sableye/normal.pal | 0 .../pokemon/{ => gen_3}/sableye/shiny.pal | 0 .../{ => gen_3}/salamence/anim_front.png | Bin .../pokemon/{ => gen_3}/salamence/back.png | Bin .../{ => gen_3}/salamence/footprint.png | Bin .../pokemon/{ => gen_3}/salamence/icon.png | Bin .../{ => gen_3}/salamence/mega/back.png | Bin .../{ => gen_3}/salamence/mega/front.png | Bin .../{ => gen_3}/salamence/mega/icon.png | Bin .../{ => gen_3}/salamence/mega/normal.pal | 0 .../{ => gen_3}/salamence/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/salamence/normal.pal | 0 .../pokemon/{ => gen_3}/salamence/shiny.pal | 0 .../{ => gen_3}/sceptile/anim_front.png | Bin .../pokemon/{ => gen_3}/sceptile/back.png | Bin .../{ => gen_3}/sceptile/footprint.png | Bin .../pokemon/{ => gen_3}/sceptile/icon.png | Bin .../{ => gen_3}/sceptile/mega/back.png | Bin .../{ => gen_3}/sceptile/mega/front.png | Bin .../{ => gen_3}/sceptile/mega/icon.png | Bin .../{ => gen_3}/sceptile/mega/normal.pal | 0 .../{ => gen_3}/sceptile/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/sceptile/normal.pal | 0 .../pokemon/{ => gen_3}/sceptile/shiny.pal | 0 .../pokemon/{ => gen_3}/sealeo/anim_front.png | Bin graphics/pokemon/{ => gen_3}/sealeo/back.png | Bin .../{frillish => gen_3/sealeo}/footprint.png | Bin graphics/pokemon/{ => gen_3}/sealeo/icon.png | Bin .../pokemon/{ => gen_3}/sealeo/normal.pal | 0 graphics/pokemon/{ => gen_3}/sealeo/shiny.pal | 0 .../pokemon/{ => gen_3}/seedot/anim_front.png | Bin graphics/pokemon/{ => gen_3}/seedot/back.png | Bin .../pokemon/{ => gen_3}/seedot/footprint.png | Bin graphics/pokemon/{ => gen_3}/seedot/icon.png | Bin .../pokemon/{ => gen_3}/seedot/normal.pal | 0 graphics/pokemon/{ => gen_3}/seedot/shiny.pal | 0 .../{ => gen_3}/seviper/anim_front.png | Bin graphics/pokemon/{ => gen_3}/seviper/back.png | Bin .../{froslass => gen_3/seviper}/footprint.png | Bin graphics/pokemon/{ => gen_3}/seviper/icon.png | Bin .../pokemon/{ => gen_3}/seviper/normal.pal | 0 .../pokemon/{ => gen_3}/seviper/shiny.pal | 0 .../{ => gen_3}/sharpedo/anim_front.png | Bin .../pokemon/{ => gen_3}/sharpedo/back.png | Bin .../sharpedo}/footprint.png | Bin .../pokemon/{ => gen_3}/sharpedo/icon.png | Bin .../{ => gen_3}/sharpedo/mega/back.png | Bin .../{ => gen_3}/sharpedo/mega/front.png | Bin .../{ => gen_3}/sharpedo/mega/icon.png | Bin .../{ => gen_3}/sharpedo/mega/normal.pal | 0 .../{ => gen_3}/sharpedo/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/sharpedo/normal.pal | 0 .../pokemon/{ => gen_3}/sharpedo/shiny.pal | 0 .../{ => gen_3}/shedinja/anim_front.png | Bin .../pokemon/{ => gen_3}/shedinja/back.png | Bin .../{ => gen_3}/shedinja/footprint.png | Bin .../pokemon/{ => gen_3}/shedinja/icon.png | Bin .../pokemon/{ => gen_3}/shedinja/normal.pal | 0 .../pokemon/{ => gen_3}/shedinja/shiny.pal | 0 .../{ => gen_3}/shelgon/anim_front.png | Bin graphics/pokemon/{ => gen_3}/shelgon/back.png | Bin .../pokemon/{ => gen_3}/shelgon/footprint.png | Bin graphics/pokemon/{ => gen_3}/shelgon/icon.png | Bin .../pokemon/{ => gen_3}/shelgon/normal.pal | 0 .../pokemon/{ => gen_3}/shelgon/shiny.pal | 0 .../{ => gen_3}/shiftry/anim_front.png | Bin .../{ => gen_3}/shiftry/anim_frontf.png | Bin graphics/pokemon/{ => gen_3}/shiftry/back.png | Bin .../pokemon/{ => gen_3}/shiftry/backf.png | Bin .../pokemon/{ => gen_3}/shiftry/footprint.png | Bin graphics/pokemon/{ => gen_3}/shiftry/icon.png | Bin .../pokemon/{ => gen_3}/shiftry/normal.pal | 0 .../pokemon/{ => gen_3}/shiftry/shiny.pal | 0 .../{ => gen_3}/shroomish/anim_front.png | Bin .../pokemon/{ => gen_3}/shroomish/back.png | Bin .../{ => gen_3}/shroomish/footprint.png | Bin .../pokemon/{ => gen_3}/shroomish/icon.png | Bin .../pokemon/{ => gen_3}/shroomish/normal.pal | 0 .../pokemon/{ => gen_3}/shroomish/shiny.pal | 0 .../{ => gen_3}/shuppet/anim_front.png | Bin graphics/pokemon/{ => gen_3}/shuppet/back.png | Bin .../{gastly => gen_3/shuppet}/footprint.png | Bin graphics/pokemon/{ => gen_3}/shuppet/icon.png | Bin .../pokemon/{ => gen_3}/shuppet/normal.pal | 0 .../pokemon/{ => gen_3}/shuppet/shiny.pal | 0 .../{ => gen_3}/silcoon/anim_front.png | Bin graphics/pokemon/{ => gen_3}/silcoon/back.png | Bin .../{geodude => gen_3/silcoon}/footprint.png | Bin graphics/pokemon/{ => gen_3}/silcoon/icon.png | Bin .../pokemon/{ => gen_3}/silcoon/normal.pal | 0 .../pokemon/{ => gen_3}/silcoon/shiny.pal | 0 .../pokemon/{ => gen_3}/skitty/anim_front.png | Bin graphics/pokemon/{ => gen_3}/skitty/back.png | Bin .../pokemon/{ => gen_3}/skitty/footprint.png | Bin graphics/pokemon/{ => gen_3}/skitty/icon.png | Bin .../pokemon/{ => gen_3}/skitty/normal.pal | 0 graphics/pokemon/{ => gen_3}/skitty/shiny.pal | 0 .../{ => gen_3}/slaking/anim_front.png | Bin graphics/pokemon/{ => gen_3}/slaking/back.png | Bin .../pokemon/{ => gen_3}/slaking/footprint.png | Bin graphics/pokemon/{ => gen_3}/slaking/icon.png | Bin .../pokemon/{ => gen_3}/slaking/normal.pal | 0 .../pokemon/{ => gen_3}/slaking/shiny.pal | 0 .../{ => gen_3}/slakoth/anim_front.png | Bin graphics/pokemon/{ => gen_3}/slakoth/back.png | Bin .../pokemon/{ => gen_3}/slakoth/footprint.png | Bin graphics/pokemon/{ => gen_3}/slakoth/icon.png | Bin .../pokemon/{ => gen_3}/slakoth/normal.pal | 0 .../pokemon/{ => gen_3}/slakoth/shiny.pal | 0 .../{ => gen_3}/snorunt/anim_front.png | Bin graphics/pokemon/{ => gen_3}/snorunt/back.png | Bin .../pokemon/{ => gen_3}/snorunt/footprint.png | Bin graphics/pokemon/{ => gen_3}/snorunt/icon.png | Bin .../pokemon/{ => gen_3}/snorunt/normal.pal | 0 .../pokemon/{ => gen_3}/snorunt/shiny.pal | 0 .../{ => gen_3}/solrock/anim_front.png | Bin graphics/pokemon/{ => gen_3}/solrock/back.png | Bin .../{glalie => gen_3/solrock}/footprint.png | Bin graphics/pokemon/{ => gen_3}/solrock/icon.png | Bin .../pokemon/{ => gen_3}/solrock/normal.pal | 0 .../pokemon/{ => gen_3}/solrock/shiny.pal | 0 .../pokemon/{ => gen_3}/spheal/anim_front.png | Bin graphics/pokemon/{ => gen_3}/spheal/back.png | Bin .../{goldeen => gen_3/spheal}/footprint.png | Bin graphics/pokemon/{ => gen_3}/spheal/icon.png | Bin .../pokemon/{ => gen_3}/spheal/normal.pal | 0 graphics/pokemon/{ => gen_3}/spheal/shiny.pal | 0 .../pokemon/{ => gen_3}/spinda/anim_front.png | Bin graphics/pokemon/{ => gen_3}/spinda/back.png | Bin .../pokemon/{ => gen_3}/spinda/footprint.png | Bin graphics/pokemon/{ => gen_3}/spinda/icon.png | Bin .../pokemon/{ => gen_3}/spinda/normal.pal | 0 graphics/pokemon/{ => gen_3}/spinda/shiny.pal | 0 .../{ => gen_3}/spinda/spots/spot_0.png | Bin .../{ => gen_3}/spinda/spots/spot_1.png | Bin .../{ => gen_3}/spinda/spots/spot_2.png | Bin .../{ => gen_3}/spinda/spots/spot_3.png | Bin .../pokemon/{ => gen_3}/spoink/anim_front.png | Bin graphics/pokemon/{ => gen_3}/spoink/back.png | Bin .../{goomy => gen_3/spoink}/footprint.png | Bin graphics/pokemon/{ => gen_3}/spoink/icon.png | Bin .../pokemon/{ => gen_3}/spoink/normal.pal | 0 graphics/pokemon/{ => gen_3}/spoink/shiny.pal | 0 .../{ => gen_3}/surskit/anim_front.png | Bin graphics/pokemon/{ => gen_3}/surskit/back.png | Bin .../pokemon/{ => gen_3}/surskit/footprint.png | Bin graphics/pokemon/{ => gen_3}/surskit/icon.png | Bin .../pokemon/{ => gen_3}/surskit/normal.pal | 0 .../pokemon/{ => gen_3}/surskit/shiny.pal | 0 .../pokemon/{ => gen_3}/swablu/anim_front.png | Bin graphics/pokemon/{ => gen_3}/swablu/back.png | Bin .../pokemon/{ => gen_3}/swablu/footprint.png | Bin graphics/pokemon/{ => gen_3}/swablu/icon.png | Bin .../pokemon/{ => gen_3}/swablu/normal.pal | 0 graphics/pokemon/{ => gen_3}/swablu/shiny.pal | 0 .../pokemon/{ => gen_3}/swalot/anim_front.png | Bin .../{ => gen_3}/swalot/anim_frontf.png | Bin graphics/pokemon/{ => gen_3}/swalot/back.png | Bin graphics/pokemon/{ => gen_3}/swalot/backf.png | Bin .../{gorebyss => gen_3/swalot}/footprint.png | Bin graphics/pokemon/{ => gen_3}/swalot/icon.png | Bin .../pokemon/{ => gen_3}/swalot/normal.pal | 0 graphics/pokemon/{ => gen_3}/swalot/shiny.pal | 0 .../{ => gen_3}/swampert/anim_front.png | Bin .../pokemon/{ => gen_3}/swampert/back.png | Bin .../{ => gen_3}/swampert/footprint.png | Bin .../pokemon/{ => gen_3}/swampert/icon.png | Bin .../{ => gen_3}/swampert/mega/back.png | Bin .../{ => gen_3}/swampert/mega/front.png | Bin .../{ => gen_3}/swampert/mega/icon.png | Bin .../{ => gen_3}/swampert/mega/normal.pal | 0 .../{ => gen_3}/swampert/mega/shiny.pal | 0 .../pokemon/{ => gen_3}/swampert/normal.pal | 0 .../pokemon/{ => gen_3}/swampert/shiny.pal | 0 .../{ => gen_3}/swellow/anim_front.png | Bin graphics/pokemon/{ => gen_3}/swellow/back.png | Bin .../pokemon/{ => gen_3}/swellow/footprint.png | Bin graphics/pokemon/{ => gen_3}/swellow/icon.png | Bin .../pokemon/{ => gen_3}/swellow/normal.pal | 0 .../pokemon/{ => gen_3}/swellow/shiny.pal | 0 .../{ => gen_3}/taillow/anim_front.png | Bin graphics/pokemon/{ => gen_3}/taillow/back.png | Bin .../pokemon/{ => gen_3}/taillow/footprint.png | Bin graphics/pokemon/{ => gen_3}/taillow/icon.png | Bin .../pokemon/{ => gen_3}/taillow/normal.pal | 0 .../pokemon/{ => gen_3}/taillow/shiny.pal | 0 .../{ => gen_3}/torchic/anim_front.png | Bin graphics/pokemon/{ => gen_3}/torchic/back.png | Bin .../pokemon/{ => gen_3}/torchic/backf.png | Bin .../pokemon/{ => gen_3}/torchic/footprint.png | Bin graphics/pokemon/{ => gen_3}/torchic/icon.png | Bin .../pokemon/{ => gen_3}/torchic/normal.pal | 0 .../pokemon/{ => gen_3}/torchic/shiny.pal | 0 .../{ => gen_3}/torkoal/anim_front.png | Bin graphics/pokemon/{ => gen_3}/torkoal/back.png | Bin .../pokemon/{ => gen_3}/torkoal/footprint.png | Bin graphics/pokemon/{ => gen_3}/torkoal/icon.png | Bin .../pokemon/{ => gen_3}/torkoal/normal.pal | 0 .../pokemon/{ => gen_3}/torkoal/shiny.pal | 0 .../{ => gen_3}/trapinch/anim_front.png | Bin .../pokemon/{ => gen_3}/trapinch/back.png | Bin .../{ => gen_3}/trapinch/footprint.png | Bin .../pokemon/{ => gen_3}/trapinch/icon.png | Bin .../pokemon/{ => gen_3}/trapinch/normal.pal | 0 .../pokemon/{ => gen_3}/trapinch/shiny.pal | 0 .../{ => gen_3}/treecko/anim_front.png | Bin graphics/pokemon/{ => gen_3}/treecko/back.png | Bin .../pokemon/{ => gen_3}/treecko/footprint.png | Bin graphics/pokemon/{ => gen_3}/treecko/icon.png | Bin .../pokemon/{ => gen_3}/treecko/normal.pal | 0 .../pokemon/{ => gen_3}/treecko/shiny.pal | 0 .../{ => gen_3}/tropius/anim_front.png | Bin graphics/pokemon/{ => gen_3}/tropius/back.png | Bin .../pokemon/{ => gen_3}/tropius/footprint.png | Bin graphics/pokemon/{ => gen_3}/tropius/icon.png | Bin .../pokemon/{ => gen_3}/tropius/normal.pal | 0 .../pokemon/{ => gen_3}/tropius/shiny.pal | 0 .../{ => gen_3}/vibrava/anim_front.png | Bin graphics/pokemon/{ => gen_3}/vibrava/back.png | Bin .../pokemon/{ => gen_3}/vibrava/footprint.png | Bin graphics/pokemon/{ => gen_3}/vibrava/icon.png | Bin .../pokemon/{ => gen_3}/vibrava/normal.pal | 0 .../pokemon/{ => gen_3}/vibrava/shiny.pal | 0 .../{ => gen_3}/vigoroth/anim_front.png | Bin .../pokemon/{ => gen_3}/vigoroth/back.png | Bin .../{ => gen_3}/vigoroth/footprint.png | Bin .../pokemon/{ => gen_3}/vigoroth/icon.png | Bin .../pokemon/{ => gen_3}/vigoroth/normal.pal | 0 .../pokemon/{ => gen_3}/vigoroth/shiny.pal | 0 .../{ => gen_3}/volbeat/anim_front.png | Bin graphics/pokemon/{ => gen_3}/volbeat/back.png | Bin .../pokemon/{ => gen_3}/volbeat/footprint.png | Bin graphics/pokemon/{ => gen_3}/volbeat/icon.png | Bin .../pokemon/{ => gen_3}/volbeat/normal.pal | 0 .../pokemon/{ => gen_3}/volbeat/shiny.pal | 0 .../{ => gen_3}/wailmer/anim_front.png | Bin graphics/pokemon/{ => gen_3}/wailmer/back.png | Bin .../{grimer => gen_3/wailmer}/footprint.png | Bin graphics/pokemon/{ => gen_3}/wailmer/icon.png | Bin .../pokemon/{ => gen_3}/wailmer/normal.pal | 0 .../pokemon/{ => gen_3}/wailmer/shiny.pal | 0 .../{ => gen_3}/wailord/anim_front.png | Bin graphics/pokemon/{ => gen_3}/wailord/back.png | Bin .../{gulpin => gen_3/wailord}/footprint.png | Bin graphics/pokemon/{ => gen_3}/wailord/icon.png | Bin .../pokemon/{ => gen_3}/wailord/normal.pal | 0 .../pokemon/{ => gen_3}/wailord/shiny.pal | 0 .../{ => gen_3}/walrein/anim_front.png | Bin graphics/pokemon/{ => gen_3}/walrein/back.png | Bin .../{gyarados => gen_3/walrein}/footprint.png | Bin graphics/pokemon/{ => gen_3}/walrein/icon.png | Bin .../pokemon/{ => gen_3}/walrein/normal.pal | 0 .../pokemon/{ => gen_3}/walrein/shiny.pal | 0 .../{ => gen_3}/whiscash/anim_front.png | Bin .../pokemon/{ => gen_3}/whiscash/back.png | Bin .../whiscash}/footprint.png | Bin .../pokemon/{ => gen_3}/whiscash/icon.png | Bin .../pokemon/{ => gen_3}/whiscash/normal.pal | 0 .../pokemon/{ => gen_3}/whiscash/shiny.pal | 0 .../{ => gen_3}/whismur/anim_front.png | Bin graphics/pokemon/{ => gen_3}/whismur/back.png | Bin .../pokemon/{ => gen_3}/whismur/footprint.png | Bin graphics/pokemon/{ => gen_3}/whismur/icon.png | Bin .../pokemon/{ => gen_3}/whismur/normal.pal | 0 .../pokemon/{ => gen_3}/whismur/shiny.pal | 0 .../{ => gen_3}/wingull/anim_front.png | Bin graphics/pokemon/{ => gen_3}/wingull/back.png | Bin .../pokemon/{ => gen_3}/wingull/footprint.png | Bin graphics/pokemon/{ => gen_3}/wingull/icon.png | Bin .../pokemon/{ => gen_3}/wingull/normal.pal | 0 .../pokemon/{ => gen_3}/wingull/shiny.pal | 0 .../{ => gen_3}/wurmple/anim_front.png | Bin graphics/pokemon/{ => gen_3}/wurmple/back.png | Bin .../pokemon/{ => gen_3}/wurmple/footprint.png | Bin graphics/pokemon/{ => gen_3}/wurmple/icon.png | Bin .../pokemon/{ => gen_3}/wurmple/normal.pal | 0 .../pokemon/{ => gen_3}/wurmple/shiny.pal | 0 .../pokemon/{ => gen_3}/wynaut/anim_front.png | Bin graphics/pokemon/{ => gen_3}/wynaut/back.png | Bin .../pokemon/{ => gen_3}/wynaut/footprint.png | Bin graphics/pokemon/{ => gen_3}/wynaut/icon.png | Bin .../pokemon/{ => gen_3}/wynaut/normal.pal | 0 graphics/pokemon/{ => gen_3}/wynaut/shiny.pal | 0 .../{ => gen_3}/zangoose/anim_front.png | Bin .../pokemon/{ => gen_3}/zangoose/back.png | Bin .../{ => gen_3}/zangoose/footprint.png | Bin .../pokemon/{ => gen_3}/zangoose/icon.png | Bin .../pokemon/{ => gen_3}/zangoose/normal.pal | 0 .../pokemon/{ => gen_3}/zangoose/shiny.pal | 0 .../{ => gen_3}/zigzagoon/anim_front.png | Bin .../pokemon/{ => gen_3}/zigzagoon/back.png | Bin .../{ => gen_3}/zigzagoon/footprint.png | Bin .../{ => gen_3}/zigzagoon/galarian/back.png | Bin .../{ => gen_3}/zigzagoon/galarian/front.png | Bin .../{ => gen_3}/zigzagoon/galarian/icon.png | Bin .../{ => gen_3}/zigzagoon/galarian/normal.pal | 0 .../{ => gen_3}/zigzagoon/galarian/shiny.pal | 0 .../pokemon/{ => gen_3}/zigzagoon/icon.png | Bin .../pokemon/{ => gen_3}/zigzagoon/normal.pal | 0 .../pokemon/{ => gen_3}/zigzagoon/shiny.pal | 0 .../{ => gen_4}/abomasnow/anim_front.png | Bin .../{ => gen_4}/abomasnow/anim_frontf.png | Bin .../pokemon/{ => gen_4}/abomasnow/back.png | Bin .../{ => gen_4}/abomasnow/footprint.png | Bin .../pokemon/{ => gen_4}/abomasnow/icon.png | Bin .../{ => gen_4}/abomasnow/mega/back.png | Bin .../{ => gen_4}/abomasnow/mega/front.png | Bin .../{ => gen_4}/abomasnow/mega/icon.png | Bin .../{ => gen_4}/abomasnow/mega/normal.pal | 0 .../{ => gen_4}/abomasnow/mega/shiny.pal | 0 .../pokemon/{ => gen_4}/abomasnow/normal.pal | 0 .../pokemon/{ => gen_4}/abomasnow/shiny.pal | 0 .../{ => gen_4}/ambipom/anim_front.png | Bin .../{ => gen_4}/ambipom/anim_frontf.png | Bin graphics/pokemon/{ => gen_4}/ambipom/back.png | Bin .../pokemon/{ => gen_4}/ambipom/backf.png | Bin .../pokemon/{ => gen_4}/ambipom/footprint.png | Bin graphics/pokemon/{ => gen_4}/ambipom/icon.png | Bin .../pokemon/{ => gen_4}/ambipom/normal.pal | 0 .../pokemon/{ => gen_4}/ambipom/shiny.pal | 0 .../pokemon/{ => gen_4}/arceus/anim_front.png | Bin graphics/pokemon/{ => gen_4}/arceus/back.png | Bin .../pokemon/{ => gen_4}/arceus/bug/normal.pal | 0 .../pokemon/{ => gen_4}/arceus/bug/shiny.pal | 0 .../{ => gen_4}/arceus/dark/normal.pal | 0 .../pokemon/{ => gen_4}/arceus/dark/shiny.pal | 0 .../{ => gen_4}/arceus/dragon/normal.pal | 0 .../{ => gen_4}/arceus/dragon/shiny.pal | 0 .../{ => gen_4}/arceus/electric/normal.pal | 0 .../{ => gen_4}/arceus/electric/shiny.pal | 0 .../{ => gen_4}/arceus/fairy/normal.pal | 0 .../{ => gen_4}/arceus/fairy/shiny.pal | 0 .../{ => gen_4}/arceus/fighting/normal.pal | 0 .../{ => gen_4}/arceus/fighting/shiny.pal | 0 .../{ => gen_4}/arceus/fire/normal.pal | 0 .../pokemon/{ => gen_4}/arceus/fire/shiny.pal | 0 .../{ => gen_4}/arceus/flying/normal.pal | 0 .../{ => gen_4}/arceus/flying/shiny.pal | 0 .../pokemon/{ => gen_4}/arceus/footprint.png | Bin .../{ => gen_4}/arceus/ghost/normal.pal | 0 .../{ => gen_4}/arceus/ghost/shiny.pal | 0 .../{ => gen_4}/arceus/grass/normal.pal | 0 .../{ => gen_4}/arceus/grass/shiny.pal | 0 .../{ => gen_4}/arceus/ground/normal.pal | 0 .../{ => gen_4}/arceus/ground/shiny.pal | 0 .../pokemon/{ => gen_4}/arceus/ice/normal.pal | 0 .../pokemon/{ => gen_4}/arceus/ice/shiny.pal | 0 graphics/pokemon/{ => gen_4}/arceus/icon.png | Bin .../pokemon/{ => gen_4}/arceus/normal.pal | 0 .../{ => gen_4}/arceus/poison/normal.pal | 0 .../{ => gen_4}/arceus/poison/shiny.pal | 0 .../{ => gen_4}/arceus/psychic/normal.pal | 0 .../{ => gen_4}/arceus/psychic/shiny.pal | 0 .../{ => gen_4}/arceus/rock/normal.pal | 0 .../pokemon/{ => gen_4}/arceus/rock/shiny.pal | 0 graphics/pokemon/{ => gen_4}/arceus/shiny.pal | 0 .../{ => gen_4}/arceus/steel/normal.pal | 0 .../{ => gen_4}/arceus/steel/shiny.pal | 0 .../{ => gen_4}/arceus/water/normal.pal | 0 .../{ => gen_4}/arceus/water/shiny.pal | 0 .../pokemon/{ => gen_4}/azelf/anim_front.png | Bin graphics/pokemon/{ => gen_4}/azelf/back.png | Bin .../pokemon/{ => gen_4}/azelf/footprint.png | Bin graphics/pokemon/{ => gen_4}/azelf/icon.png | Bin graphics/pokemon/{ => gen_4}/azelf/normal.pal | 0 graphics/pokemon/{ => gen_4}/azelf/shiny.pal | 0 .../{ => gen_4}/bastiodon/anim_front.png | Bin .../pokemon/{ => gen_4}/bastiodon/back.png | Bin .../{ => gen_4}/bastiodon/footprint.png | Bin .../pokemon/{ => gen_4}/bastiodon/icon.png | Bin .../pokemon/{ => gen_4}/bastiodon/normal.pal | 0 .../pokemon/{ => gen_4}/bastiodon/shiny.pal | 0 .../{ => gen_4}/bibarel/anim_front.png | Bin .../{ => gen_4}/bibarel/anim_frontf.png | Bin graphics/pokemon/{ => gen_4}/bibarel/back.png | Bin .../pokemon/{ => gen_4}/bibarel/footprint.png | Bin graphics/pokemon/{ => gen_4}/bibarel/icon.png | Bin .../pokemon/{ => gen_4}/bibarel/normal.pal | 0 .../pokemon/{ => gen_4}/bibarel/shiny.pal | 0 .../pokemon/{ => gen_4}/bidoof/anim_front.png | Bin .../{ => gen_4}/bidoof/anim_frontf.png | Bin graphics/pokemon/{ => gen_4}/bidoof/back.png | Bin graphics/pokemon/{ => gen_4}/bidoof/backf.png | Bin .../pokemon/{ => gen_4}/bidoof/footprint.png | Bin graphics/pokemon/{ => gen_4}/bidoof/icon.png | Bin .../pokemon/{ => gen_4}/bidoof/normal.pal | 0 graphics/pokemon/{ => gen_4}/bidoof/shiny.pal | 0 .../pokemon/{ => gen_4}/bonsly/anim_front.png | Bin graphics/pokemon/{ => gen_4}/bonsly/back.png | Bin .../pokemon/{ => gen_4}/bonsly/footprint.png | Bin graphics/pokemon/{ => gen_4}/bonsly/icon.png | Bin .../pokemon/{ => gen_4}/bonsly/normal.pal | 0 graphics/pokemon/{ => gen_4}/bonsly/shiny.pal | 0 .../{ => gen_4}/bronzong/anim_front.png | Bin .../pokemon/{ => gen_4}/bronzong/back.png | Bin .../{haunter => gen_4/bronzong}/footprint.png | Bin .../pokemon/{ => gen_4}/bronzong/icon.png | Bin .../pokemon/{ => gen_4}/bronzong/normal.pal | 0 .../pokemon/{ => gen_4}/bronzong/shiny.pal | 0 .../{ => gen_4}/bronzor/anim_front.png | Bin graphics/pokemon/{ => gen_4}/bronzor/back.png | Bin .../{honedge => gen_4/bronzor}/footprint.png | Bin graphics/pokemon/{ => gen_4}/bronzor/icon.png | Bin .../pokemon/{ => gen_4}/bronzor/normal.pal | 0 .../pokemon/{ => gen_4}/bronzor/shiny.pal | 0 .../pokemon/{ => gen_4}/budew/anim_front.png | Bin graphics/pokemon/{ => gen_4}/budew/back.png | Bin .../{buzzwole => gen_4/budew}/footprint.png | Bin graphics/pokemon/{ => gen_4}/budew/icon.png | Bin graphics/pokemon/{ => gen_4}/budew/normal.pal | 0 graphics/pokemon/{ => gen_4}/budew/shiny.pal | 0 .../pokemon/{ => gen_4}/buizel/anim_front.png | Bin graphics/pokemon/{ => gen_4}/buizel/back.png | Bin graphics/pokemon/{ => gen_4}/buizel/backf.png | Bin .../pokemon/{ => gen_4}/buizel/footprint.png | Bin graphics/pokemon/{ => gen_4}/buizel/icon.png | Bin .../pokemon/{ => gen_4}/buizel/normal.pal | 0 graphics/pokemon/{ => gen_4}/buizel/shiny.pal | 0 .../{ => gen_4}/buneary/anim_front.png | Bin graphics/pokemon/{ => gen_4}/buneary/back.png | Bin .../pokemon/{ => gen_4}/buneary/footprint.png | Bin graphics/pokemon/{ => gen_4}/buneary/icon.png | Bin .../pokemon/{ => gen_4}/buneary/normal.pal | 0 .../pokemon/{ => gen_4}/buneary/shiny.pal | 0 .../pokemon/{ => gen_4}/burmy/anim_front.png | Bin graphics/pokemon/{ => gen_4}/burmy/back.png | Bin graphics/pokemon/{ => gen_4}/burmy/icon.png | Bin graphics/pokemon/{ => gen_4}/burmy/normal.pal | 0 .../burmy/plant}/footprint.png | Bin .../burmy/sandy_cloak/anim_front.png | Bin .../{ => gen_4}/burmy/sandy_cloak/back.png | Bin .../{ => gen_4}/burmy/sandy_cloak/icon.png | Bin .../{ => gen_4}/burmy/sandy_cloak/normal.pal | 0 .../{ => gen_4}/burmy/sandy_cloak/shiny.pal | 0 graphics/pokemon/{ => gen_4}/burmy/shiny.pal | 0 .../burmy/trash_cloak/anim_front.png | Bin .../{ => gen_4}/burmy/trash_cloak/back.png | Bin .../{ => gen_4}/burmy/trash_cloak/icon.png | Bin .../{ => gen_4}/burmy/trash_cloak/normal.pal | 0 .../{ => gen_4}/burmy/trash_cloak/shiny.pal | 0 .../{ => gen_4}/carnivine/anim_front.png | Bin .../pokemon/{ => gen_4}/carnivine/back.png | Bin .../{horsea => gen_4/carnivine}/footprint.png | Bin .../pokemon/{ => gen_4}/carnivine/icon.png | Bin .../pokemon/{ => gen_4}/carnivine/normal.pal | 0 .../pokemon/{ => gen_4}/carnivine/shiny.pal | 0 .../pokemon/{ => gen_4}/chatot/anim_front.png | Bin graphics/pokemon/{ => gen_4}/chatot/back.png | Bin .../pokemon/{ => gen_4}/chatot/footprint.png | Bin graphics/pokemon/{ => gen_4}/chatot/icon.png | Bin .../pokemon/{ => gen_4}/chatot/normal.pal | 0 graphics/pokemon/{ => gen_4}/chatot/shiny.pal | 0 .../{ => gen_4}/cherrim/anim_front.png | Bin graphics/pokemon/{ => gen_4}/cherrim/back.png | Bin .../{calyrex => gen_4/cherrim}/footprint.png | Bin graphics/pokemon/{ => gen_4}/cherrim/icon.png | Bin .../pokemon/{ => gen_4}/cherrim/normal.pal | 0 .../pokemon/{ => gen_4}/cherrim/shiny.pal | 0 .../cherrim/sunshine/anim_front.png | Bin .../{ => gen_4}/cherrim/sunshine/back.png | Bin .../{ => gen_4}/cherrim/sunshine/icon.png | Bin .../{ => gen_4}/cherrim/sunshine/normal.pal | 0 .../{ => gen_4}/cherrim/sunshine/shiny.pal | 0 .../{ => gen_4}/cherubi/anim_front.png | Bin graphics/pokemon/{ => gen_4}/cherubi/back.png | Bin .../{caterpie => gen_4/cherubi}/footprint.png | Bin graphics/pokemon/{ => gen_4}/cherubi/icon.png | Bin .../pokemon/{ => gen_4}/cherubi/normal.pal | 0 .../pokemon/{ => gen_4}/cherubi/shiny.pal | 0 .../{ => gen_4}/chimchar/anim_front.png | Bin .../pokemon/{ => gen_4}/chimchar/back.png | Bin .../{ => gen_4}/chimchar/footprint.png | Bin .../pokemon/{ => gen_4}/chimchar/icon.png | Bin .../pokemon/{ => gen_4}/chimchar/normal.pal | 0 .../pokemon/{ => gen_4}/chimchar/shiny.pal | 0 .../{ => gen_4}/chingling/anim_front.png | Bin .../pokemon/{ => gen_4}/chingling/back.png | Bin .../{ => gen_4}/chingling/footprint.png | Bin .../pokemon/{ => gen_4}/chingling/icon.png | Bin .../pokemon/{ => gen_4}/chingling/normal.pal | 0 .../pokemon/{ => gen_4}/chingling/shiny.pal | 0 .../pokemon/{ => gen_4}/combee/anim_front.png | Bin graphics/pokemon/{ => gen_4}/combee/back.png | Bin .../{huntail => gen_4/combee}/footprint.png | Bin graphics/pokemon/{ => gen_4}/combee/icon.png | Bin .../pokemon/{ => gen_4}/combee/normal.pal | 0 .../pokemon/{ => gen_4}/combee/normalf.pal | 0 graphics/pokemon/{ => gen_4}/combee/shiny.pal | 0 .../pokemon/{ => gen_4}/combee/shinyf.pal | 0 .../{ => gen_4}/cranidos/anim_front.png | Bin .../pokemon/{ => gen_4}/cranidos/back.png | Bin .../{ => gen_4}/cranidos/footprint.png | Bin .../pokemon/{ => gen_4}/cranidos/icon.png | Bin .../pokemon/{ => gen_4}/cranidos/normal.pal | 0 .../pokemon/{ => gen_4}/cranidos/shiny.pal | 0 .../{ => gen_4}/cresselia/anim_front.png | Bin .../pokemon/{ => gen_4}/cresselia/back.png | Bin .../cresselia}/footprint.png | Bin .../pokemon/{ => gen_4}/cresselia/icon.png | Bin .../pokemon/{ => gen_4}/cresselia/normal.pal | 0 .../pokemon/{ => gen_4}/cresselia/shiny.pal | 0 .../{ => gen_4}/croagunk/anim_front.png | Bin .../{ => gen_4}/croagunk/anim_frontf.png | Bin .../pokemon/{ => gen_4}/croagunk/back.png | Bin .../pokemon/{ => gen_4}/croagunk/backf.png | Bin .../{ => gen_4}/croagunk/footprint.png | Bin .../pokemon/{ => gen_4}/croagunk/icon.png | Bin .../pokemon/{ => gen_4}/croagunk/normal.pal | 0 .../pokemon/{ => gen_4}/croagunk/shiny.pal | 0 .../{ => gen_4}/darkrai/anim_front.png | Bin graphics/pokemon/{ => gen_4}/darkrai/back.png | Bin .../darkrai}/footprint.png | Bin graphics/pokemon/{ => gen_4}/darkrai/icon.png | Bin .../pokemon/{ => gen_4}/darkrai/normal.pal | 0 .../pokemon/{ => gen_4}/darkrai/shiny.pal | 0 .../pokemon/{ => gen_4}/dialga/anim_front.png | Bin graphics/pokemon/{ => gen_4}/dialga/back.png | Bin .../pokemon/{ => gen_4}/dialga/footprint.png | Bin graphics/pokemon/{ => gen_4}/dialga/icon.png | Bin .../pokemon/{ => gen_4}/dialga/normal.pal | 0 .../{ => gen_4}/dialga/origin/back.png | Bin .../{ => gen_4}/dialga/origin/front.png | Bin .../{ => gen_4}/dialga/origin/icon.png | Bin .../{ => gen_4}/dialga/origin/normal.pal | 0 .../{ => gen_4}/dialga/origin/shiny.pal | 0 graphics/pokemon/{ => gen_4}/dialga/shiny.pal | 0 .../{ => gen_4}/drapion/anim_front.png | Bin graphics/pokemon/{ => gen_4}/drapion/back.png | Bin .../{espurr => gen_4/drapion}/footprint.png | Bin graphics/pokemon/{ => gen_4}/drapion/icon.png | Bin .../pokemon/{ => gen_4}/drapion/normal.pal | 0 .../pokemon/{ => gen_4}/drapion/shiny.pal | 0 .../{ => gen_4}/drifblim/anim_front.png | Bin .../pokemon/{ => gen_4}/drifblim/back.png | Bin .../{inkay => gen_4/drifblim}/footprint.png | Bin .../pokemon/{ => gen_4}/drifblim/icon.png | Bin .../pokemon/{ => gen_4}/drifblim/normal.pal | 0 .../pokemon/{ => gen_4}/drifblim/shiny.pal | 0 .../{ => gen_4}/drifloon/anim_front.png | Bin .../pokemon/{ => gen_4}/drifloon/back.png | Bin .../drifloon}/footprint.png | Bin .../pokemon/{ => gen_4}/drifloon/icon.png | Bin .../pokemon/{ => gen_4}/drifloon/normal.pal | 0 .../pokemon/{ => gen_4}/drifloon/shiny.pal | 0 .../{ => gen_4}/dusknoir/anim_front.png | Bin .../pokemon/{ => gen_4}/dusknoir/back.png | Bin .../{jynx => gen_4/dusknoir}/footprint.png | Bin .../pokemon/{ => gen_4}/dusknoir/icon.png | Bin .../pokemon/{ => gen_4}/dusknoir/normal.pal | 0 .../pokemon/{ => gen_4}/dusknoir/shiny.pal | 0 .../{ => gen_4}/electivire/anim_front.png | Bin .../pokemon/{ => gen_4}/electivire/back.png | Bin .../{ => gen_4}/electivire/footprint.png | Bin .../pokemon/{ => gen_4}/electivire/icon.png | Bin .../pokemon/{ => gen_4}/electivire/normal.pal | 0 .../pokemon/{ => gen_4}/electivire/shiny.pal | 0 .../{ => gen_4}/empoleon/anim_front.png | Bin .../pokemon/{ => gen_4}/empoleon/back.png | Bin .../{ => gen_4}/empoleon/footprint.png | Bin .../pokemon/{ => gen_4}/empoleon/icon.png | Bin .../pokemon/{ => gen_4}/empoleon/normal.pal | 0 .../pokemon/{ => gen_4}/empoleon/shiny.pal | 0 .../{ => gen_4}/finneon/anim_front.png | Bin .../{ => gen_4}/finneon/anim_frontf.png | Bin graphics/pokemon/{ => gen_4}/finneon/back.png | Bin .../pokemon/{ => gen_4}/finneon/backf.png | Bin .../{kakuna => gen_4/finneon}/footprint.png | Bin graphics/pokemon/{ => gen_4}/finneon/icon.png | Bin .../pokemon/{ => gen_4}/finneon/normal.pal | 0 .../pokemon/{ => gen_4}/finneon/shiny.pal | 0 .../{ => gen_4}/floatzel/anim_front.png | Bin .../pokemon/{ => gen_4}/floatzel/back.png | Bin .../pokemon/{ => gen_4}/floatzel/backf.png | Bin .../{ => gen_4}/floatzel/footprint.png | Bin .../pokemon/{ => gen_4}/floatzel/icon.png | Bin .../pokemon/{ => gen_4}/floatzel/normal.pal | 0 .../pokemon/{ => gen_4}/floatzel/shiny.pal | 0 .../{ => gen_4}/froslass/anim_front.png | Bin .../pokemon/{ => gen_4}/froslass/back.png | Bin .../{kartana => gen_4/froslass}/footprint.png | Bin .../pokemon/{ => gen_4}/froslass/icon.png | Bin .../pokemon/{ => gen_4}/froslass/normal.pal | 0 .../pokemon/{ => gen_4}/froslass/shiny.pal | 0 .../pokemon/{ => gen_4}/gabite/anim_front.png | Bin .../{ => gen_4}/gabite/anim_frontf.png | Bin graphics/pokemon/{ => gen_4}/gabite/back.png | Bin graphics/pokemon/{ => gen_4}/gabite/backf.png | Bin .../pokemon/{ => gen_4}/gabite/footprint.png | Bin graphics/pokemon/{ => gen_4}/gabite/icon.png | Bin .../pokemon/{ => gen_4}/gabite/normal.pal | 0 graphics/pokemon/{ => gen_4}/gabite/shiny.pal | 0 .../{ => gen_4}/gallade/anim_front.png | Bin graphics/pokemon/{ => gen_4}/gallade/back.png | Bin .../pokemon/{ => gen_4}/gallade/footprint.png | Bin graphics/pokemon/{ => gen_4}/gallade/icon.png | Bin .../pokemon/{ => gen_4}/gallade/mega/back.png | Bin .../{ => gen_4}/gallade/mega/front.png | Bin .../pokemon/{ => gen_4}/gallade/mega/icon.png | Bin .../{ => gen_4}/gallade/mega/normal.pal | 0 .../{ => gen_4}/gallade/mega/shiny.pal | 0 .../pokemon/{ => gen_4}/gallade/normal.pal | 0 .../pokemon/{ => gen_4}/gallade/shiny.pal | 0 .../{ => gen_4}/garchomp/anim_front.png | Bin .../{ => gen_4}/garchomp/anim_frontf.png | Bin .../pokemon/{ => gen_4}/garchomp/back.png | Bin .../{ => gen_4}/garchomp/footprint.png | Bin .../pokemon/{ => gen_4}/garchomp/icon.png | Bin .../{ => gen_4}/garchomp/mega/back.png | Bin .../{ => gen_4}/garchomp/mega/front.png | Bin .../{ => gen_4}/garchomp/mega/icon.png | Bin .../{ => gen_4}/garchomp/mega/normal.pal | 0 .../{ => gen_4}/garchomp/mega/shiny.pal | 0 .../pokemon/{ => gen_4}/garchomp/normal.pal | 0 .../pokemon/{ => gen_4}/garchomp/shiny.pal | 0 .../{ => gen_4}/gastrodon/anim_front.png | Bin .../pokemon/{ => gen_4}/gastrodon/back.png | Bin .../gastrodon/east_sea/anim_front.png | Bin .../{ => gen_4}/gastrodon/east_sea/back.png | Bin .../{ => gen_4}/gastrodon/east_sea/icon.png | Bin .../{ => gen_4}/gastrodon/east_sea/normal.pal | 0 .../{ => gen_4}/gastrodon/east_sea/shiny.pal | 0 .../{ => gen_4}/gastrodon/footprint.png | Bin .../pokemon/{ => gen_4}/gastrodon/icon.png | Bin .../pokemon/{ => gen_4}/gastrodon/normal.pal | 0 .../pokemon/{ => gen_4}/gastrodon/shiny.pal | 0 .../pokemon/{ => gen_4}/gible/anim_front.png | Bin .../pokemon/{ => gen_4}/gible/anim_frontf.png | Bin graphics/pokemon/{ => gen_4}/gible/back.png | Bin graphics/pokemon/{ => gen_4}/gible/backf.png | Bin .../pokemon/{ => gen_4}/gible/footprint.png | Bin graphics/pokemon/{ => gen_4}/gible/icon.png | Bin graphics/pokemon/{ => gen_4}/gible/normal.pal | 0 graphics/pokemon/{ => gen_4}/gible/shiny.pal | 0 .../{ => gen_4}/giratina/anim_front.png | Bin .../pokemon/{ => gen_4}/giratina/back.png | Bin .../{ => gen_4}/giratina/footprint.png | Bin .../pokemon/{ => gen_4}/giratina/icon.png | Bin .../pokemon/{ => gen_4}/giratina/normal.pal | 0 .../giratina/origin/anim_front.png | Bin .../{ => gen_4}/giratina/origin/back.png | Bin .../{ => gen_4}/giratina/origin/icon.png | Bin .../{ => gen_4}/giratina/origin/normal.pal | 0 .../{ => gen_4}/giratina/origin/shiny.pal | 0 .../pokemon/{ => gen_4}/giratina/shiny.pal | 0 .../{ => gen_4}/glaceon/anim_front.png | Bin graphics/pokemon/{ => gen_4}/glaceon/back.png | Bin .../pokemon/{ => gen_4}/glaceon/footprint.png | Bin graphics/pokemon/{ => gen_4}/glaceon/icon.png | Bin .../pokemon/{ => gen_4}/glaceon/normal.pal | 0 .../pokemon/{ => gen_4}/glaceon/shiny.pal | 0 .../{ => gen_4}/glameow/anim_front.png | Bin graphics/pokemon/{ => gen_4}/glameow/back.png | Bin .../pokemon/{ => gen_4}/glameow/footprint.png | Bin graphics/pokemon/{ => gen_4}/glameow/icon.png | Bin .../pokemon/{ => gen_4}/glameow/normal.pal | 0 .../pokemon/{ => gen_4}/glameow/shiny.pal | 0 .../{ => gen_4}/gliscor/anim_front.png | Bin graphics/pokemon/{ => gen_4}/gliscor/back.png | Bin .../pokemon/{ => gen_4}/gliscor/footprint.png | Bin graphics/pokemon/{ => gen_4}/gliscor/icon.png | Bin .../pokemon/{ => gen_4}/gliscor/normal.pal | 0 .../pokemon/{ => gen_4}/gliscor/shiny.pal | 0 .../pokemon/{ => gen_4}/grotle/anim_front.png | Bin graphics/pokemon/{ => gen_4}/grotle/back.png | Bin .../pokemon/{ => gen_4}/grotle/footprint.png | Bin graphics/pokemon/{ => gen_4}/grotle/icon.png | Bin .../pokemon/{ => gen_4}/grotle/normal.pal | 0 graphics/pokemon/{ => gen_4}/grotle/shiny.pal | 0 .../{ => gen_4}/happiny/anim_front.png | Bin graphics/pokemon/{ => gen_4}/happiny/back.png | Bin .../pokemon/{ => gen_4}/happiny/footprint.png | Bin graphics/pokemon/{ => gen_4}/happiny/icon.png | Bin .../pokemon/{ => gen_4}/happiny/normal.pal | 0 .../pokemon/{ => gen_4}/happiny/shiny.pal | 0 .../{ => gen_4}/heatran/anim_front.png | Bin graphics/pokemon/{ => gen_4}/heatran/back.png | Bin .../pokemon/{ => gen_4}/heatran/footprint.png | Bin graphics/pokemon/{ => gen_4}/heatran/icon.png | Bin .../pokemon/{ => gen_4}/heatran/normal.pal | 0 .../pokemon/{ => gen_4}/heatran/shiny.pal | 0 .../{ => gen_4}/hippopotas/anim_front.png | Bin .../pokemon/{ => gen_4}/hippopotas/back.png | Bin .../{ => gen_4}/hippopotas/footprint.png | Bin .../pokemon/{ => gen_4}/hippopotas/icon.png | Bin .../pokemon/{ => gen_4}/hippopotas/iconf.png | Bin .../pokemon/{ => gen_4}/hippopotas/normal.pal | 0 .../{ => gen_4}/hippopotas/normalf.pal | 0 .../pokemon/{ => gen_4}/hippopotas/shiny.pal | 0 .../pokemon/{ => gen_4}/hippopotas/shinyf.pal | 0 .../{ => gen_4}/hippowdon/anim_front.png | Bin .../pokemon/{ => gen_4}/hippowdon/back.png | Bin .../{ => gen_4}/hippowdon/footprint.png | Bin .../pokemon/{ => gen_4}/hippowdon/icon.png | Bin .../pokemon/{ => gen_4}/hippowdon/iconf.png | Bin .../pokemon/{ => gen_4}/hippowdon/normal.pal | 0 .../pokemon/{ => gen_4}/hippowdon/normalf.pal | 0 .../pokemon/{ => gen_4}/hippowdon/shiny.pal | 0 .../pokemon/{ => gen_4}/hippowdon/shinyf.pal | 0 .../{ => gen_4}/honchkrow/anim_front.png | Bin .../pokemon/{ => gen_4}/honchkrow/back.png | Bin .../{ => gen_4}/honchkrow/footprint.png | Bin .../pokemon/{ => gen_4}/honchkrow/icon.png | Bin .../pokemon/{ => gen_4}/honchkrow/normal.pal | 0 .../pokemon/{ => gen_4}/honchkrow/shiny.pal | 0 .../{ => gen_4}/infernape/anim_front.png | Bin .../pokemon/{ => gen_4}/infernape/back.png | Bin .../{ => gen_4}/infernape/footprint.png | Bin .../pokemon/{ => gen_4}/infernape/icon.png | Bin .../pokemon/{ => gen_4}/infernape/normal.pal | 0 .../pokemon/{ => gen_4}/infernape/shiny.pal | 0 .../{ => gen_4}/kricketot/anim_front.png | Bin .../{ => gen_4}/kricketot/anim_frontf.png | Bin .../pokemon/{ => gen_4}/kricketot/back.png | Bin .../pokemon/{ => gen_4}/kricketot/backf.png | Bin .../{ => gen_4}/kricketot/footprint.png | Bin .../pokemon/{ => gen_4}/kricketot/icon.png | Bin .../pokemon/{ => gen_4}/kricketot/normal.pal | 0 .../pokemon/{ => gen_4}/kricketot/shiny.pal | 0 .../{ => gen_4}/kricketune/anim_front.png | Bin .../{ => gen_4}/kricketune/anim_frontf.png | Bin .../pokemon/{ => gen_4}/kricketune/back.png | Bin .../pokemon/{ => gen_4}/kricketune/backf.png | Bin .../kricketune}/footprint.png | Bin .../pokemon/{ => gen_4}/kricketune/icon.png | Bin .../pokemon/{ => gen_4}/kricketune/normal.pal | 0 .../pokemon/{ => gen_4}/kricketune/shiny.pal | 0 .../{ => gen_4}/leafeon/anim_front.png | Bin graphics/pokemon/{ => gen_4}/leafeon/back.png | Bin .../pokemon/{ => gen_4}/leafeon/footprint.png | Bin graphics/pokemon/{ => gen_4}/leafeon/icon.png | Bin .../pokemon/{ => gen_4}/leafeon/normal.pal | 0 .../pokemon/{ => gen_4}/leafeon/shiny.pal | 0 .../{ => gen_4}/lickilicky/anim_front.png | Bin .../pokemon/{ => gen_4}/lickilicky/back.png | Bin .../{ => gen_4}/lickilicky/footprint.png | Bin .../pokemon/{ => gen_4}/lickilicky/icon.png | Bin .../pokemon/{ => gen_4}/lickilicky/normal.pal | 0 .../pokemon/{ => gen_4}/lickilicky/shiny.pal | 0 .../{ => gen_4}/lopunny/anim_front.png | Bin graphics/pokemon/{ => gen_4}/lopunny/back.png | Bin .../pokemon/{ => gen_4}/lopunny/footprint.png | Bin graphics/pokemon/{ => gen_4}/lopunny/icon.png | Bin .../pokemon/{ => gen_4}/lopunny/mega/back.png | Bin .../{ => gen_4}/lopunny/mega/front.png | Bin .../pokemon/{ => gen_4}/lopunny/mega/icon.png | Bin .../{ => gen_4}/lopunny/mega/normal.pal | 0 .../{ => gen_4}/lopunny/mega/shiny.pal | 0 .../pokemon/{ => gen_4}/lopunny/normal.pal | 0 .../pokemon/{ => gen_4}/lopunny/shiny.pal | 0 .../{ => gen_4}/lucario/anim_front.png | Bin graphics/pokemon/{ => gen_4}/lucario/back.png | Bin .../pokemon/{ => gen_4}/lucario/footprint.png | Bin graphics/pokemon/{ => gen_4}/lucario/icon.png | Bin .../pokemon/{ => gen_4}/lucario/mega/back.png | Bin .../{ => gen_4}/lucario/mega/front.png | Bin .../pokemon/{ => gen_4}/lucario/mega/icon.png | Bin .../{ => gen_4}/lucario/mega/normal.pal | 0 .../{ => gen_4}/lucario/mega/shiny.pal | 0 .../pokemon/{ => gen_4}/lucario/normal.pal | 0 .../pokemon/{ => gen_4}/lucario/shiny.pal | 0 .../{ => gen_4}/lumineon/anim_front.png | Bin .../{ => gen_4}/lumineon/anim_frontf.png | Bin .../pokemon/{ => gen_4}/lumineon/back.png | Bin .../pokemon/{ => gen_4}/lumineon/backf.png | Bin .../{kingdra => gen_4/lumineon}/footprint.png | Bin .../pokemon/{ => gen_4}/lumineon/icon.png | Bin .../pokemon/{ => gen_4}/lumineon/normal.pal | 0 .../pokemon/{ => gen_4}/lumineon/shiny.pal | 0 .../pokemon/{ => gen_4}/luxio/anim_front.png | Bin .../pokemon/{ => gen_4}/luxio/anim_frontf.png | Bin graphics/pokemon/{ => gen_4}/luxio/back.png | Bin graphics/pokemon/{ => gen_4}/luxio/backf.png | Bin .../pokemon/{ => gen_4}/luxio/footprint.png | Bin graphics/pokemon/{ => gen_4}/luxio/icon.png | Bin graphics/pokemon/{ => gen_4}/luxio/normal.pal | 0 graphics/pokemon/{ => gen_4}/luxio/shiny.pal | 0 .../pokemon/{ => gen_4}/luxray/anim_front.png | Bin .../{ => gen_4}/luxray/anim_frontf.png | Bin graphics/pokemon/{ => gen_4}/luxray/back.png | Bin graphics/pokemon/{ => gen_4}/luxray/backf.png | Bin .../pokemon/{ => gen_4}/luxray/footprint.png | Bin graphics/pokemon/{ => gen_4}/luxray/icon.png | Bin .../pokemon/{ => gen_4}/luxray/normal.pal | 0 graphics/pokemon/{ => gen_4}/luxray/shiny.pal | 0 .../{ => gen_4}/magmortar/anim_front.png | Bin .../pokemon/{ => gen_4}/magmortar/back.png | Bin .../{ => gen_4}/magmortar/footprint.png | Bin .../pokemon/{ => gen_4}/magmortar/icon.png | Bin .../pokemon/{ => gen_4}/magmortar/normal.pal | 0 .../pokemon/{ => gen_4}/magmortar/shiny.pal | 0 .../{ => gen_4}/magnezone/anim_front.png | Bin .../pokemon/{ => gen_4}/magnezone/back.png | Bin .../{klang => gen_4/magnezone}/footprint.png | Bin .../pokemon/{ => gen_4}/magnezone/icon.png | Bin .../pokemon/{ => gen_4}/magnezone/normal.pal | 0 .../pokemon/{ => gen_4}/magnezone/shiny.pal | 0 .../{ => gen_4}/mamoswine/anim_front.png | Bin .../{ => gen_4}/mamoswine/anim_frontf.png | Bin .../pokemon/{ => gen_4}/mamoswine/back.png | Bin .../{ => gen_4}/mamoswine/footprint.png | Bin .../pokemon/{ => gen_4}/mamoswine/icon.png | Bin .../pokemon/{ => gen_4}/mamoswine/normal.pal | 0 .../pokemon/{ => gen_4}/mamoswine/shiny.pal | 0 .../{ => gen_4}/manaphy/anim_front.png | Bin graphics/pokemon/{ => gen_4}/manaphy/back.png | Bin .../{klefki => gen_4/manaphy}/footprint.png | Bin graphics/pokemon/{ => gen_4}/manaphy/icon.png | Bin .../pokemon/{ => gen_4}/manaphy/normal.pal | 0 .../pokemon/{ => gen_4}/manaphy/shiny.pal | 0 .../{ => gen_4}/mantyke/anim_front.png | Bin graphics/pokemon/{ => gen_4}/mantyke/back.png | Bin .../{klink => gen_4/mantyke}/footprint.png | Bin graphics/pokemon/{ => gen_4}/mantyke/icon.png | Bin .../pokemon/{ => gen_4}/mantyke/normal.pal | 0 .../pokemon/{ => gen_4}/mantyke/shiny.pal | 0 .../{ => gen_4}/mesprit/anim_front.png | Bin graphics/pokemon/{ => gen_4}/mesprit/back.png | Bin .../pokemon/{ => gen_4}/mesprit/footprint.png | Bin graphics/pokemon/{ => gen_4}/mesprit/icon.png | Bin .../pokemon/{ => gen_4}/mesprit/normal.pal | 0 .../pokemon/{ => gen_4}/mesprit/shiny.pal | 0 .../{ => gen_4}/mime_jr/anim_front.png | Bin graphics/pokemon/{ => gen_4}/mime_jr/back.png | Bin .../{cursola => gen_4/mime_jr}/footprint.png | Bin graphics/pokemon/{ => gen_4}/mime_jr/icon.png | Bin .../pokemon/{ => gen_4}/mime_jr/normal.pal | 0 .../pokemon/{ => gen_4}/mime_jr/shiny.pal | 0 .../{ => gen_4}/mismagius/anim_front.png | Bin .../pokemon/{ => gen_4}/mismagius/back.png | Bin .../mismagius}/footprint.png | Bin .../pokemon/{ => gen_4}/mismagius/icon.png | Bin .../pokemon/{ => gen_4}/mismagius/normal.pal | 0 .../pokemon/{ => gen_4}/mismagius/shiny.pal | 0 .../{ => gen_4}/monferno/anim_front.png | Bin .../pokemon/{ => gen_4}/monferno/back.png | Bin .../{ => gen_4}/monferno/footprint.png | Bin .../pokemon/{ => gen_4}/monferno/icon.png | Bin .../pokemon/{ => gen_4}/monferno/normal.pal | 0 .../pokemon/{ => gen_4}/monferno/shiny.pal | 0 .../pokemon/{ => gen_4}/mothim/anim_front.png | Bin graphics/pokemon/{ => gen_4}/mothim/back.png | Bin .../{kabuto => gen_4/mothim}/footprint.png | Bin graphics/pokemon/{ => gen_4}/mothim/icon.png | Bin .../pokemon/{ => gen_4}/mothim/normal.pal | 0 graphics/pokemon/{ => gen_4}/mothim/shiny.pal | 0 .../{ => gen_4}/munchlax/anim_front.png | Bin .../pokemon/{ => gen_4}/munchlax/back.png | Bin .../{ => gen_4}/munchlax/footprint.png | Bin .../pokemon/{ => gen_4}/munchlax/icon.png | Bin .../pokemon/{ => gen_4}/munchlax/normal.pal | 0 .../pokemon/{ => gen_4}/munchlax/shiny.pal | 0 .../{ => gen_4}/pachirisu/anim_front.png | Bin .../{ => gen_4}/pachirisu/anim_frontf.png | Bin .../pokemon/{ => gen_4}/pachirisu/back.png | Bin .../{ => gen_4}/pachirisu/footprint.png | Bin .../pokemon/{ => gen_4}/pachirisu/icon.png | Bin .../pokemon/{ => gen_4}/pachirisu/normal.pal | 0 .../pokemon/{ => gen_4}/pachirisu/shiny.pal | 0 .../pokemon/{ => gen_4}/palkia/anim_front.png | Bin graphics/pokemon/{ => gen_4}/palkia/back.png | Bin .../pokemon/{ => gen_4}/palkia/footprint.png | Bin graphics/pokemon/{ => gen_4}/palkia/icon.png | Bin .../pokemon/{ => gen_4}/palkia/normal.pal | 0 .../{ => gen_4}/palkia/origin/back.png | Bin .../{ => gen_4}/palkia/origin/front.png | Bin .../{ => gen_4}/palkia/origin/icon.png | Bin .../{ => gen_4}/palkia/origin/normal.pal | 0 .../{ => gen_4}/palkia/origin/shiny.pal | 0 graphics/pokemon/{ => gen_4}/palkia/shiny.pal | 0 .../pokemon/{ => gen_4}/phione/anim_front.png | Bin graphics/pokemon/{ => gen_4}/phione/back.png | Bin .../{koffing => gen_4/phione}/footprint.png | Bin graphics/pokemon/{ => gen_4}/phione/icon.png | Bin .../pokemon/{ => gen_4}/phione/normal.pal | 0 graphics/pokemon/{ => gen_4}/phione/shiny.pal | 0 .../pokemon/{ => gen_4}/piplup/anim_front.png | Bin graphics/pokemon/{ => gen_4}/piplup/back.png | Bin .../pokemon/{ => gen_4}/piplup/footprint.png | Bin graphics/pokemon/{ => gen_4}/piplup/icon.png | Bin .../pokemon/{ => gen_4}/piplup/normal.pal | 0 graphics/pokemon/{ => gen_4}/piplup/shiny.pal | 0 .../{ => gen_4}/porygon_z/anim_front.png | Bin .../pokemon/{ => gen_4}/porygon_z/back.png | Bin .../porygon_z}/footprint.png | Bin .../pokemon/{ => gen_4}/porygon_z/icon.png | Bin .../pokemon/{ => gen_4}/porygon_z/normal.pal | 0 .../pokemon/{ => gen_4}/porygon_z/shiny.pal | 0 .../{ => gen_4}/prinplup/anim_front.png | Bin .../pokemon/{ => gen_4}/prinplup/back.png | Bin .../{ => gen_4}/prinplup/footprint.png | Bin .../pokemon/{ => gen_4}/prinplup/icon.png | Bin .../pokemon/{ => gen_4}/prinplup/normal.pal | 0 .../pokemon/{ => gen_4}/prinplup/shiny.pal | 0 .../{ => gen_4}/probopass/anim_front.png | Bin .../pokemon/{ => gen_4}/probopass/back.png | Bin .../{ => gen_4}/probopass/footprint.png | Bin .../pokemon/{ => gen_4}/probopass/icon.png | Bin .../pokemon/{ => gen_4}/probopass/normal.pal | 0 .../pokemon/{ => gen_4}/probopass/shiny.pal | 0 .../{ => gen_4}/purugly/anim_front.png | Bin graphics/pokemon/{ => gen_4}/purugly/back.png | Bin .../pokemon/{ => gen_4}/purugly/footprint.png | Bin graphics/pokemon/{ => gen_4}/purugly/icon.png | Bin .../pokemon/{ => gen_4}/purugly/normal.pal | 0 .../pokemon/{ => gen_4}/purugly/shiny.pal | 0 .../{ => gen_4}/rampardos/anim_front.png | Bin .../pokemon/{ => gen_4}/rampardos/back.png | Bin .../{ => gen_4}/rampardos/footprint.png | Bin .../pokemon/{ => gen_4}/rampardos/icon.png | Bin .../pokemon/{ => gen_4}/rampardos/normal.pal | 0 .../pokemon/{ => gen_4}/rampardos/shiny.pal | 0 .../{ => gen_4}/regigigas/anim_front.png | Bin .../pokemon/{ => gen_4}/regigigas/back.png | Bin .../{ => gen_4}/regigigas/footprint.png | Bin .../pokemon/{ => gen_4}/regigigas/icon.png | Bin .../pokemon/{ => gen_4}/regigigas/normal.pal | 0 .../pokemon/{ => gen_4}/regigigas/shiny.pal | 0 .../{ => gen_4}/rhyperior/anim_front.png | Bin .../{ => gen_4}/rhyperior/anim_frontf.png | Bin .../pokemon/{ => gen_4}/rhyperior/back.png | Bin .../pokemon/{ => gen_4}/rhyperior/backf.png | Bin .../{ => gen_4}/rhyperior/footprint.png | Bin .../pokemon/{ => gen_4}/rhyperior/icon.png | Bin .../pokemon/{ => gen_4}/rhyperior/normal.pal | 0 .../pokemon/{ => gen_4}/rhyperior/shiny.pal | 0 .../pokemon/{ => gen_4}/riolu/anim_front.png | Bin graphics/pokemon/{ => gen_4}/riolu/back.png | Bin .../pokemon/{ => gen_4}/riolu/footprint.png | Bin graphics/pokemon/{ => gen_4}/riolu/icon.png | Bin graphics/pokemon/{ => gen_4}/riolu/normal.pal | 0 graphics/pokemon/{ => gen_4}/riolu/shiny.pal | 0 .../{ => gen_4}/roserade/anim_front.png | Bin .../{ => gen_4}/roserade/anim_frontf.png | Bin .../pokemon/{ => gen_4}/roserade/back.png | Bin .../pokemon/{ => gen_4}/roserade/backf.png | Bin .../roserade}/footprint.png | Bin .../pokemon/{ => gen_4}/roserade/icon.png | Bin .../pokemon/{ => gen_4}/roserade/normal.pal | 0 .../pokemon/{ => gen_4}/roserade/shiny.pal | 0 .../pokemon/{ => gen_4}/rotom/anim_front.png | Bin graphics/pokemon/{ => gen_4}/rotom/back.png | Bin .../{ => gen_4}/rotom/fan/anim_front.png | Bin .../pokemon/{ => gen_4}/rotom/fan/back.png | Bin .../pokemon/{ => gen_4}/rotom/fan/icon.png | Bin .../pokemon/{ => gen_4}/rotom/fan/normal.pal | 0 .../pokemon/{ => gen_4}/rotom/fan/shiny.pal | 0 .../{ => gen_4}/rotom/frost/anim_front.png | Bin .../pokemon/{ => gen_4}/rotom/frost/back.png | Bin .../pokemon/{ => gen_4}/rotom/frost/icon.png | Bin .../{ => gen_4}/rotom/frost/normal.pal | 0 .../pokemon/{ => gen_4}/rotom/frost/shiny.pal | 0 .../{ => gen_4}/rotom/heat/anim_front.png | Bin .../pokemon/{ => gen_4}/rotom/heat/back.png | Bin .../pokemon/{ => gen_4}/rotom/heat/icon.png | Bin .../pokemon/{ => gen_4}/rotom/heat/normal.pal | 0 .../pokemon/{ => gen_4}/rotom/heat/shiny.pal | 0 graphics/pokemon/{ => gen_4}/rotom/icon.png | Bin .../{ => gen_4}/rotom/mow/anim_front.png | Bin .../pokemon/{ => gen_4}/rotom/mow/back.png | Bin .../pokemon/{ => gen_4}/rotom/mow/icon.png | Bin .../pokemon/{ => gen_4}/rotom/mow/normal.pal | 0 .../pokemon/{ => gen_4}/rotom/mow/shiny.pal | 0 graphics/pokemon/{ => gen_4}/rotom/normal.pal | 0 .../rotom/normal}/footprint.png | Bin graphics/pokemon/{ => gen_4}/rotom/shiny.pal | 0 .../{ => gen_4}/rotom/wash/anim_front.png | Bin .../pokemon/{ => gen_4}/rotom/wash/back.png | Bin .../pokemon/{ => gen_4}/rotom/wash/icon.png | Bin .../pokemon/{ => gen_4}/rotom/wash/normal.pal | 0 .../pokemon/{ => gen_4}/rotom/wash/shiny.pal | 0 .../{ => gen_4}/shaymin/anim_front.png | Bin graphics/pokemon/{ => gen_4}/shaymin/back.png | Bin .../pokemon/{ => gen_4}/shaymin/footprint.png | Bin graphics/pokemon/{ => gen_4}/shaymin/icon.png | Bin .../pokemon/{ => gen_4}/shaymin/normal.pal | 0 .../pokemon/{ => gen_4}/shaymin/shiny.pal | 0 .../{ => gen_4}/shaymin/sky/anim_front.png | Bin .../pokemon/{ => gen_4}/shaymin/sky/back.png | Bin .../pokemon/{ => gen_4}/shaymin/sky/icon.png | Bin .../{ => gen_4}/shaymin/sky/normal.pal | 0 .../pokemon/{ => gen_4}/shaymin/sky/shiny.pal | 0 .../{ => gen_4}/shellos/anim_front.png | Bin graphics/pokemon/{ => gen_4}/shellos/back.png | Bin .../shellos/east_sea/anim_front.png | Bin .../{ => gen_4}/shellos/east_sea/back.png | Bin .../{ => gen_4}/shellos/east_sea/icon.png | Bin .../{ => gen_4}/shellos/east_sea/normal.pal | 0 .../{ => gen_4}/shellos/east_sea/shiny.pal | 0 .../pokemon/{ => gen_4}/shellos/footprint.png | Bin graphics/pokemon/{ => gen_4}/shellos/icon.png | Bin .../pokemon/{ => gen_4}/shellos/normal.pal | 0 .../pokemon/{ => gen_4}/shellos/shiny.pal | 0 .../{ => gen_4}/shieldon/anim_front.png | Bin .../pokemon/{ => gen_4}/shieldon/back.png | Bin .../{ => gen_4}/shieldon/footprint.png | Bin .../pokemon/{ => gen_4}/shieldon/icon.png | Bin .../pokemon/{ => gen_4}/shieldon/normal.pal | 0 .../pokemon/{ => gen_4}/shieldon/shiny.pal | 0 .../pokemon/{ => gen_4}/shinx/anim_front.png | Bin .../pokemon/{ => gen_4}/shinx/anim_frontf.png | Bin graphics/pokemon/{ => gen_4}/shinx/back.png | Bin graphics/pokemon/{ => gen_4}/shinx/backf.png | Bin .../pokemon/{ => gen_4}/shinx/footprint.png | Bin graphics/pokemon/{ => gen_4}/shinx/icon.png | Bin graphics/pokemon/{ => gen_4}/shinx/normal.pal | 0 graphics/pokemon/{ => gen_4}/shinx/shiny.pal | 0 .../{ => gen_4}/skorupi/anim_front.png | Bin graphics/pokemon/{ => gen_4}/skorupi/back.png | Bin .../skorupi}/footprint.png | Bin graphics/pokemon/{ => gen_4}/skorupi/icon.png | Bin .../pokemon/{ => gen_4}/skorupi/normal.pal | 0 .../pokemon/{ => gen_4}/skorupi/shiny.pal | 0 .../{ => gen_4}/skuntank/anim_front.png | Bin .../pokemon/{ => gen_4}/skuntank/back.png | Bin .../{ => gen_4}/skuntank/footprint.png | Bin .../pokemon/{ => gen_4}/skuntank/icon.png | Bin .../pokemon/{ => gen_4}/skuntank/normal.pal | 0 .../pokemon/{ => gen_4}/skuntank/shiny.pal | 0 .../pokemon/{ => gen_4}/snover/anim_front.png | Bin .../{ => gen_4}/snover/anim_frontf.png | Bin graphics/pokemon/{ => gen_4}/snover/back.png | Bin graphics/pokemon/{ => gen_4}/snover/backf.png | Bin .../pokemon/{ => gen_4}/snover/footprint.png | Bin graphics/pokemon/{ => gen_4}/snover/icon.png | Bin .../pokemon/{ => gen_4}/snover/normal.pal | 0 graphics/pokemon/{ => gen_4}/snover/shiny.pal | 0 .../{ => gen_4}/spiritomb/anim_front.png | Bin .../pokemon/{ => gen_4}/spiritomb/back.png | Bin .../spiritomb}/footprint.png | Bin .../pokemon/{ => gen_4}/spiritomb/icon.png | Bin .../pokemon/{ => gen_4}/spiritomb/normal.pal | 0 .../pokemon/{ => gen_4}/spiritomb/shiny.pal | 0 .../{ => gen_4}/staraptor/anim_front.png | Bin .../{ => gen_4}/staraptor/anim_frontf.png | Bin .../pokemon/{ => gen_4}/staraptor/back.png | Bin .../{ => gen_4}/staraptor/footprint.png | Bin .../pokemon/{ => gen_4}/staraptor/icon.png | Bin .../pokemon/{ => gen_4}/staraptor/normal.pal | 0 .../pokemon/{ => gen_4}/staraptor/shiny.pal | 0 .../{ => gen_4}/staravia/anim_front.png | Bin .../{ => gen_4}/staravia/anim_frontf.png | Bin .../pokemon/{ => gen_4}/staravia/back.png | Bin .../pokemon/{ => gen_4}/staravia/backf.png | Bin .../{ => gen_4}/staravia/footprint.png | Bin .../pokemon/{ => gen_4}/staravia/icon.png | Bin .../pokemon/{ => gen_4}/staravia/normal.pal | 0 .../pokemon/{ => gen_4}/staravia/shiny.pal | 0 .../pokemon/{ => gen_4}/starly/anim_front.png | Bin .../{ => gen_4}/starly/anim_frontf.png | Bin graphics/pokemon/{ => gen_4}/starly/back.png | Bin graphics/pokemon/{ => gen_4}/starly/backf.png | Bin .../pokemon/{ => gen_4}/starly/footprint.png | Bin graphics/pokemon/{ => gen_4}/starly/icon.png | Bin .../pokemon/{ => gen_4}/starly/normal.pal | 0 graphics/pokemon/{ => gen_4}/starly/shiny.pal | 0 .../pokemon/{ => gen_4}/stunky/anim_front.png | Bin graphics/pokemon/{ => gen_4}/stunky/back.png | Bin .../pokemon/{ => gen_4}/stunky/footprint.png | Bin graphics/pokemon/{ => gen_4}/stunky/icon.png | Bin .../pokemon/{ => gen_4}/stunky/normal.pal | 0 graphics/pokemon/{ => gen_4}/stunky/shiny.pal | 0 .../{ => gen_4}/tangrowth/anim_front.png | Bin .../{ => gen_4}/tangrowth/anim_frontf.png | Bin .../pokemon/{ => gen_4}/tangrowth/back.png | Bin .../{ => gen_4}/tangrowth/footprint.png | Bin .../pokemon/{ => gen_4}/tangrowth/icon.png | Bin .../pokemon/{ => gen_4}/tangrowth/normal.pal | 0 .../pokemon/{ => gen_4}/tangrowth/shiny.pal | 0 .../{ => gen_4}/togekiss/anim_front.png | Bin .../pokemon/{ => gen_4}/togekiss/back.png | Bin .../{ => gen_4}/togekiss/footprint.png | Bin .../pokemon/{ => gen_4}/togekiss/icon.png | Bin .../pokemon/{ => gen_4}/togekiss/normal.pal | 0 .../pokemon/{ => gen_4}/togekiss/shiny.pal | 0 .../{ => gen_4}/torterra/anim_front.png | Bin .../pokemon/{ => gen_4}/torterra/back.png | Bin .../{ => gen_4}/torterra/footprint.png | Bin .../pokemon/{ => gen_4}/torterra/icon.png | Bin .../pokemon/{ => gen_4}/torterra/normal.pal | 0 .../pokemon/{ => gen_4}/torterra/shiny.pal | 0 .../{ => gen_4}/toxicroak/anim_front.png | Bin .../{ => gen_4}/toxicroak/anim_frontf.png | Bin .../pokemon/{ => gen_4}/toxicroak/back.png | Bin .../pokemon/{ => gen_4}/toxicroak/backf.png | Bin .../{ => gen_4}/toxicroak/footprint.png | Bin .../pokemon/{ => gen_4}/toxicroak/icon.png | Bin .../pokemon/{ => gen_4}/toxicroak/normal.pal | 0 .../pokemon/{ => gen_4}/toxicroak/shiny.pal | 0 .../{ => gen_4}/turtwig/anim_front.png | Bin graphics/pokemon/{ => gen_4}/turtwig/back.png | Bin .../pokemon/{ => gen_4}/turtwig/footprint.png | Bin graphics/pokemon/{ => gen_4}/turtwig/icon.png | Bin .../pokemon/{ => gen_4}/turtwig/normal.pal | 0 .../pokemon/{ => gen_4}/turtwig/shiny.pal | 0 .../pokemon/{ => gen_4}/uxie/anim_front.png | Bin graphics/pokemon/{ => gen_4}/uxie/back.png | Bin .../pokemon/{ => gen_4}/uxie/footprint.png | Bin graphics/pokemon/{ => gen_4}/uxie/icon.png | Bin graphics/pokemon/{ => gen_4}/uxie/normal.pal | 0 graphics/pokemon/{ => gen_4}/uxie/shiny.pal | 0 .../{ => gen_4}/vespiquen/anim_front.png | Bin .../pokemon/{ => gen_4}/vespiquen/back.png | Bin .../vespiquen}/footprint.png | Bin .../pokemon/{ => gen_4}/vespiquen/icon.png | Bin .../pokemon/{ => gen_4}/vespiquen/normal.pal | 0 .../pokemon/{ => gen_4}/vespiquen/shiny.pal | 0 .../{ => gen_4}/weavile/anim_front.png | Bin .../{ => gen_4}/weavile/anim_frontf.png | Bin graphics/pokemon/{ => gen_4}/weavile/back.png | Bin .../pokemon/{ => gen_4}/weavile/backf.png | Bin .../pokemon/{ => gen_4}/weavile/footprint.png | Bin graphics/pokemon/{ => gen_4}/weavile/icon.png | Bin .../pokemon/{ => gen_4}/weavile/normal.pal | 0 .../pokemon/{ => gen_4}/weavile/shiny.pal | 0 .../{ => gen_4}/wormadam/anim_front.png | Bin .../pokemon/{ => gen_4}/wormadam/back.png | Bin .../pokemon/{ => gen_4}/wormadam/icon.png | Bin .../pokemon/{ => gen_4}/wormadam/normal.pal | 0 .../wormadam/plant}/footprint.png | Bin .../wormadam/sandy_cloak/anim_front.png | Bin .../{ => gen_4}/wormadam/sandy_cloak/back.png | Bin .../{ => gen_4}/wormadam/sandy_cloak/icon.png | Bin .../wormadam/sandy_cloak/normal.pal | 0 .../wormadam/sandy_cloak/shiny.pal | 0 .../pokemon/{ => gen_4}/wormadam/shiny.pal | 0 .../wormadam/trash_cloak/anim_front.png | Bin .../{ => gen_4}/wormadam/trash_cloak/back.png | Bin .../{ => gen_4}/wormadam/trash_cloak/icon.png | Bin .../wormadam/trash_cloak/normal.pal | 0 .../wormadam/trash_cloak/shiny.pal | 0 .../{ => gen_4}/yanmega/anim_front.png | Bin graphics/pokemon/{ => gen_4}/yanmega/back.png | Bin .../pokemon/{ => gen_4}/yanmega/footprint.png | Bin graphics/pokemon/{ => gen_4}/yanmega/icon.png | Bin .../pokemon/{ => gen_4}/yanmega/normal.pal | 0 .../pokemon/{ => gen_4}/yanmega/shiny.pal | 0 .../{ => gen_5}/accelgor/anim_front.png | Bin .../pokemon/{ => gen_5}/accelgor/back.png | Bin .../{litwick => gen_5/accelgor}/footprint.png | Bin .../pokemon/{ => gen_5}/accelgor/icon.png | Bin .../pokemon/{ => gen_5}/accelgor/normal.pal | 0 .../pokemon/{ => gen_5}/accelgor/shiny.pal | 0 .../{ => gen_5}/alomomola/anim_front.png | Bin .../pokemon/{ => gen_5}/alomomola/back.png | Bin .../alomomola}/footprint.png | Bin .../pokemon/{ => gen_5}/alomomola/icon.png | Bin .../pokemon/{ => gen_5}/alomomola/normal.pal | 0 .../pokemon/{ => gen_5}/alomomola/shiny.pal | 0 .../{ => gen_5}/amoonguss/anim_front.png | Bin .../pokemon/{ => gen_5}/amoonguss/back.png | Bin .../{lunala => gen_5/amoonguss}/footprint.png | Bin .../pokemon/{ => gen_5}/amoonguss/icon.png | Bin .../pokemon/{ => gen_5}/amoonguss/normal.pal | 0 .../pokemon/{ => gen_5}/amoonguss/shiny.pal | 0 .../pokemon/{ => gen_5}/archen/anim_front.png | Bin graphics/pokemon/{ => gen_5}/archen/back.png | Bin .../pokemon/{ => gen_5}/archen/footprint.png | Bin graphics/pokemon/{ => gen_5}/archen/icon.png | Bin .../pokemon/{ => gen_5}/archen/normal.pal | 0 graphics/pokemon/{ => gen_5}/archen/shiny.pal | 0 .../{ => gen_5}/archeops/anim_front.png | Bin .../pokemon/{ => gen_5}/archeops/back.png | Bin .../{ => gen_5}/archeops/footprint.png | Bin .../pokemon/{ => gen_5}/archeops/icon.png | Bin .../pokemon/{ => gen_5}/archeops/normal.pal | 0 .../pokemon/{ => gen_5}/archeops/shiny.pal | 0 .../pokemon/{ => gen_5}/audino/anim_front.png | Bin graphics/pokemon/{ => gen_5}/audino/back.png | Bin .../pokemon/{ => gen_5}/audino/footprint.png | Bin graphics/pokemon/{ => gen_5}/audino/icon.png | Bin .../pokemon/{ => gen_5}/audino/mega/back.png | Bin .../pokemon/{ => gen_5}/audino/mega/front.png | Bin .../pokemon/{ => gen_5}/audino/mega/icon.png | Bin .../{ => gen_5}/audino/mega/normal.pal | 0 .../pokemon/{ => gen_5}/audino/mega/shiny.pal | 0 .../pokemon/{ => gen_5}/audino/normal.pal | 0 graphics/pokemon/{ => gen_5}/audino/shiny.pal | 0 .../pokemon/{ => gen_5}/axew/anim_front.png | Bin graphics/pokemon/{ => gen_5}/axew/back.png | Bin .../pokemon/{ => gen_5}/axew/footprint.png | Bin graphics/pokemon/{ => gen_5}/axew/icon.png | Bin graphics/pokemon/{ => gen_5}/axew/normal.pal | 0 graphics/pokemon/{ => gen_5}/axew/shiny.pal | 0 .../{ => gen_5}/basculin/anim_front.png | Bin .../pokemon/{ => gen_5}/basculin/back.png | Bin .../basculin/blue_striped/back.png | Bin .../basculin/blue_striped/front.png | Bin .../basculin/blue_striped/icon.png | Bin .../basculin/blue_striped/normal.pal | 0 .../basculin/blue_striped/shiny.pal | 0 .../basculin}/footprint.png | Bin .../pokemon/{ => gen_5}/basculin/icon.png | Bin .../pokemon/{ => gen_5}/basculin/normal.pal | 0 .../pokemon/{ => gen_5}/basculin/shiny.pal | 0 .../basculin/white_striped/back.png | Bin .../basculin/white_striped/front.png | Bin .../basculin/white_striped/icon.png | Bin .../basculin/white_striped/normal.pal | 0 .../basculin/white_striped/shiny.pal | 0 .../{ => gen_5}/beartic/anim_front.png | Bin graphics/pokemon/{ => gen_5}/beartic/back.png | Bin .../pokemon/{ => gen_5}/beartic/footprint.png | Bin graphics/pokemon/{ => gen_5}/beartic/icon.png | Bin .../pokemon/{ => gen_5}/beartic/normal.pal | 0 .../pokemon/{ => gen_5}/beartic/shiny.pal | 0 .../{ => gen_5}/beheeyem/anim_front.png | Bin .../pokemon/{ => gen_5}/beheeyem/back.png | Bin .../{ => gen_5}/beheeyem/footprint.png | Bin .../pokemon/{ => gen_5}/beheeyem/icon.png | Bin .../pokemon/{ => gen_5}/beheeyem/normal.pal | 0 .../pokemon/{ => gen_5}/beheeyem/shiny.pal | 0 .../{ => gen_5}/bisharp/anim_front.png | Bin graphics/pokemon/{ => gen_5}/bisharp/back.png | Bin .../pokemon/{ => gen_5}/bisharp/footprint.png | Bin graphics/pokemon/{ => gen_5}/bisharp/icon.png | Bin .../pokemon/{ => gen_5}/bisharp/normal.pal | 0 .../pokemon/{ => gen_5}/bisharp/shiny.pal | 0 .../{ => gen_5}/blitzle/anim_front.png | Bin graphics/pokemon/{ => gen_5}/blitzle/back.png | Bin .../pokemon/{ => gen_5}/blitzle/footprint.png | Bin graphics/pokemon/{ => gen_5}/blitzle/icon.png | Bin .../pokemon/{ => gen_5}/blitzle/normal.pal | 0 .../pokemon/{ => gen_5}/blitzle/shiny.pal | 0 .../{ => gen_5}/boldore/anim_front.png | Bin graphics/pokemon/{ => gen_5}/boldore/back.png | Bin .../pokemon/{ => gen_5}/boldore/footprint.png | Bin graphics/pokemon/{ => gen_5}/boldore/icon.png | Bin .../pokemon/{ => gen_5}/boldore/normal.pal | 0 .../pokemon/{ => gen_5}/boldore/shiny.pal | 0 .../{ => gen_5}/bouffalant/anim_front.png | Bin .../pokemon/{ => gen_5}/bouffalant/back.png | Bin .../{ => gen_5}/bouffalant/footprint.png | Bin .../pokemon/{ => gen_5}/bouffalant/icon.png | Bin .../pokemon/{ => gen_5}/bouffalant/normal.pal | 0 .../pokemon/{ => gen_5}/bouffalant/shiny.pal | 0 .../{ => gen_5}/braviary/anim_front.png | Bin .../pokemon/{ => gen_5}/braviary/back.png | Bin .../{ => gen_5}/braviary/footprint.png | Bin .../{ => gen_5}/braviary/hisuian/back.png | Bin .../{ => gen_5}/braviary/hisuian/front.png | Bin .../{ => gen_5}/braviary/hisuian/icon.png | Bin .../{ => gen_5}/braviary/hisuian/normal.pal | 0 .../{ => gen_5}/braviary/hisuian/shiny.pal | 0 .../pokemon/{ => gen_5}/braviary/icon.png | Bin .../pokemon/{ => gen_5}/braviary/normal.pal | 0 .../pokemon/{ => gen_5}/braviary/shiny.pal | 0 .../{ => gen_5}/carracosta/anim_front.png | Bin .../pokemon/{ => gen_5}/carracosta/back.png | Bin .../{ => gen_5}/carracosta/footprint.png | Bin .../pokemon/{ => gen_5}/carracosta/icon.png | Bin .../pokemon/{ => gen_5}/carracosta/normal.pal | 0 .../pokemon/{ => gen_5}/carracosta/shiny.pal | 0 .../{ => gen_5}/chandelure/anim_front.png | Bin .../pokemon/{ => gen_5}/chandelure/back.png | Bin .../chandelure}/footprint.png | Bin .../pokemon/{ => gen_5}/chandelure/icon.png | Bin .../pokemon/{ => gen_5}/chandelure/normal.pal | 0 .../pokemon/{ => gen_5}/chandelure/shiny.pal | 0 .../{ => gen_5}/cinccino/anim_front.png | Bin .../pokemon/{ => gen_5}/cinccino/back.png | Bin .../{ => gen_5}/cinccino/footprint.png | Bin .../pokemon/{ => gen_5}/cinccino/icon.png | Bin .../pokemon/{ => gen_5}/cinccino/normal.pal | 0 .../pokemon/{ => gen_5}/cinccino/shiny.pal | 0 .../{ => gen_5}/cobalion/anim_front.png | Bin .../pokemon/{ => gen_5}/cobalion/back.png | Bin .../{ => gen_5}/cobalion/footprint.png | Bin .../pokemon/{ => gen_5}/cobalion/icon.png | Bin .../pokemon/{ => gen_5}/cobalion/normal.pal | 0 .../pokemon/{ => gen_5}/cobalion/shiny.pal | 0 .../{ => gen_5}/cofagrigus/anim_front.png | Bin .../pokemon/{ => gen_5}/cofagrigus/back.png | Bin .../cofagrigus}/footprint.png | Bin .../pokemon/{ => gen_5}/cofagrigus/icon.png | Bin .../pokemon/{ => gen_5}/cofagrigus/normal.pal | 0 .../pokemon/{ => gen_5}/cofagrigus/shiny.pal | 0 .../{ => gen_5}/conkeldurr/anim_front.png | Bin .../pokemon/{ => gen_5}/conkeldurr/back.png | Bin .../{ => gen_5}/conkeldurr/footprint.png | Bin .../pokemon/{ => gen_5}/conkeldurr/icon.png | Bin .../pokemon/{ => gen_5}/conkeldurr/normal.pal | 0 .../pokemon/{ => gen_5}/conkeldurr/shiny.pal | 0 .../{ => gen_5}/cottonee/anim_front.png | Bin .../pokemon/{ => gen_5}/cottonee/back.png | Bin .../cottonee}/footprint.png | Bin .../pokemon/{ => gen_5}/cottonee/icon.png | Bin .../pokemon/{ => gen_5}/cottonee/normal.pal | 0 .../pokemon/{ => gen_5}/cottonee/shiny.pal | 0 .../{ => gen_5}/crustle/anim_front.png | Bin graphics/pokemon/{ => gen_5}/crustle/back.png | Bin .../{cherubi => gen_5/crustle}/footprint.png | Bin graphics/pokemon/{ => gen_5}/crustle/icon.png | Bin .../pokemon/{ => gen_5}/crustle/normal.pal | 0 .../pokemon/{ => gen_5}/crustle/shiny.pal | 0 .../{ => gen_5}/cryogonal/anim_front.png | Bin .../pokemon/{ => gen_5}/cryogonal/back.png | Bin .../cryogonal}/footprint.png | Bin .../pokemon/{ => gen_5}/cryogonal/icon.png | Bin .../pokemon/{ => gen_5}/cryogonal/normal.pal | 0 .../pokemon/{ => gen_5}/cryogonal/shiny.pal | 0 .../{ => gen_5}/cubchoo/anim_front.png | Bin graphics/pokemon/{ => gen_5}/cubchoo/back.png | Bin .../pokemon/{ => gen_5}/cubchoo/footprint.png | Bin graphics/pokemon/{ => gen_5}/cubchoo/icon.png | Bin .../pokemon/{ => gen_5}/cubchoo/normal.pal | 0 .../pokemon/{ => gen_5}/cubchoo/shiny.pal | 0 .../{ => gen_5}/darmanitan/anim_front.png | Bin .../pokemon/{ => gen_5}/darmanitan/back.png | Bin .../{ => gen_5}/darmanitan/footprint.png | Bin .../{ => gen_5}/darmanitan/galarian/back.png | Bin .../{ => gen_5}/darmanitan/galarian/front.png | Bin .../{ => gen_5}/darmanitan/galarian/icon.png | Bin .../darmanitan/galarian/normal.pal | 0 .../{ => gen_5}/darmanitan/galarian/shiny.pal | 0 .../pokemon/{ => gen_5}/darmanitan/icon.png | Bin .../pokemon/{ => gen_5}/darmanitan/normal.pal | 0 .../pokemon/{ => gen_5}/darmanitan/shiny.pal | 0 .../darmanitan/zen_mode/anim_front.png | Bin .../{ => gen_5}/darmanitan/zen_mode/back.png | Bin .../darmanitan/zen_mode/galarian/back.png | Bin .../darmanitan/zen_mode/galarian/front.png | Bin .../darmanitan/zen_mode/galarian/icon.png | Bin .../darmanitan/zen_mode/galarian/normal.pal | 0 .../darmanitan/zen_mode/galarian/shiny.pal | 0 .../{ => gen_5}/darmanitan/zen_mode/icon.png | Bin .../darmanitan/zen_mode/normal.pal | 0 .../{ => gen_5}/darmanitan/zen_mode/shiny.pal | 0 .../{ => gen_5}/darumaka/anim_front.png | Bin .../pokemon/{ => gen_5}/darumaka/back.png | Bin .../{ => gen_5}/darumaka/footprint.png | Bin .../{ => gen_5}/darumaka/galarian/back.png | Bin .../{ => gen_5}/darumaka/galarian/front.png | Bin .../{ => gen_5}/darumaka/galarian/icon.png | Bin .../{ => gen_5}/darumaka/galarian/normal.pal | 0 .../{ => gen_5}/darumaka/galarian/shiny.pal | 0 .../pokemon/{ => gen_5}/darumaka/icon.png | Bin .../pokemon/{ => gen_5}/darumaka/normal.pal | 0 .../pokemon/{ => gen_5}/darumaka/shiny.pal | 0 .../{ => gen_5}/deerling/anim_front.png | Bin .../{ => gen_5}/deerling/autumn/icon.png | Bin .../{ => gen_5}/deerling/autumn/normal.pal | 0 .../{ => gen_5}/deerling/autumn/shiny.pal | 0 .../pokemon/{ => gen_5}/deerling/back.png | Bin .../{ => gen_5}/deerling/footprint.png | Bin .../pokemon/{ => gen_5}/deerling/icon.png | Bin .../pokemon/{ => gen_5}/deerling/normal.pal | 0 .../pokemon/{ => gen_5}/deerling/shiny.pal | 0 .../{ => gen_5}/deerling/summer/icon.png | Bin .../{ => gen_5}/deerling/summer/normal.pal | 0 .../{ => gen_5}/deerling/summer/shiny.pal | 0 .../{ => gen_5}/deerling/winter/icon.png | Bin .../{ => gen_5}/deerling/winter/normal.pal | 0 .../{ => gen_5}/deerling/winter/shiny.pal | 0 .../pokemon/{ => gen_5}/deino/anim_front.png | Bin graphics/pokemon/{ => gen_5}/deino/back.png | Bin .../pokemon/{ => gen_5}/deino/footprint.png | Bin graphics/pokemon/{ => gen_5}/deino/icon.png | Bin graphics/pokemon/{ => gen_5}/deino/normal.pal | 0 graphics/pokemon/{ => gen_5}/deino/shiny.pal | 0 .../pokemon/{ => gen_5}/dewott/anim_front.png | Bin graphics/pokemon/{ => gen_5}/dewott/back.png | Bin .../pokemon/{ => gen_5}/dewott/footprint.png | Bin graphics/pokemon/{ => gen_5}/dewott/icon.png | Bin .../pokemon/{ => gen_5}/dewott/normal.pal | 0 graphics/pokemon/{ => gen_5}/dewott/shiny.pal | 0 .../{ => gen_5}/drilbur/anim_front.png | Bin graphics/pokemon/{ => gen_5}/drilbur/back.png | Bin .../pokemon/{ => gen_5}/drilbur/footprint.png | Bin graphics/pokemon/{ => gen_5}/drilbur/icon.png | Bin .../pokemon/{ => gen_5}/drilbur/normal.pal | 0 .../pokemon/{ => gen_5}/drilbur/shiny.pal | 0 .../{ => gen_5}/druddigon/anim_front.png | Bin .../pokemon/{ => gen_5}/druddigon/back.png | Bin .../{ => gen_5}/druddigon/footprint.png | Bin .../pokemon/{ => gen_5}/druddigon/icon.png | Bin .../pokemon/{ => gen_5}/druddigon/normal.pal | 0 .../pokemon/{ => gen_5}/druddigon/shiny.pal | 0 .../{ => gen_5}/ducklett/anim_front.png | Bin .../pokemon/{ => gen_5}/ducklett/back.png | Bin .../{ => gen_5}/ducklett/footprint.png | Bin .../pokemon/{ => gen_5}/ducklett/icon.png | Bin .../pokemon/{ => gen_5}/ducklett/normal.pal | 0 .../pokemon/{ => gen_5}/ducklett/shiny.pal | 0 .../{ => gen_5}/duosion/anim_front.png | Bin graphics/pokemon/{ => gen_5}/duosion/back.png | Bin .../{manaphy => gen_5/duosion}/footprint.png | Bin graphics/pokemon/{ => gen_5}/duosion/icon.png | Bin .../pokemon/{ => gen_5}/duosion/normal.pal | 0 .../pokemon/{ => gen_5}/duosion/shiny.pal | 0 .../pokemon/{ => gen_5}/durant/anim_front.png | Bin graphics/pokemon/{ => gen_5}/durant/back.png | Bin .../{leavanny => gen_5/durant}/footprint.png | Bin graphics/pokemon/{ => gen_5}/durant/icon.png | Bin .../pokemon/{ => gen_5}/durant/normal.pal | 0 graphics/pokemon/{ => gen_5}/durant/shiny.pal | 0 .../{ => gen_5}/dwebble/anim_front.png | Bin graphics/pokemon/{ => gen_5}/dwebble/back.png | Bin .../{meowstic => gen_5/dwebble}/footprint.png | Bin graphics/pokemon/{ => gen_5}/dwebble/icon.png | Bin .../pokemon/{ => gen_5}/dwebble/normal.pal | 0 .../pokemon/{ => gen_5}/dwebble/shiny.pal | 0 .../{ => gen_5}/eelektrik/anim_front.png | Bin .../pokemon/{ => gen_5}/eelektrik/back.png | Bin .../eelektrik}/footprint.png | Bin .../pokemon/{ => gen_5}/eelektrik/icon.png | Bin .../pokemon/{ => gen_5}/eelektrik/normal.pal | 0 .../pokemon/{ => gen_5}/eelektrik/shiny.pal | 0 .../{ => gen_5}/eelektross/anim_front.png | Bin .../pokemon/{ => gen_5}/eelektross/back.png | Bin .../eelektross}/footprint.png | Bin .../pokemon/{ => gen_5}/eelektross/icon.png | Bin .../pokemon/{ => gen_5}/eelektross/normal.pal | 0 .../pokemon/{ => gen_5}/eelektross/shiny.pal | 0 .../pokemon/{ => gen_5}/elgyem/anim_front.png | Bin graphics/pokemon/{ => gen_5}/elgyem/back.png | Bin .../{bunnelby => gen_5/elgyem}/footprint.png | Bin graphics/pokemon/{ => gen_5}/elgyem/icon.png | Bin .../pokemon/{ => gen_5}/elgyem/normal.pal | 0 graphics/pokemon/{ => gen_5}/elgyem/shiny.pal | 0 .../pokemon/{ => gen_5}/emboar/anim_front.png | Bin graphics/pokemon/{ => gen_5}/emboar/back.png | Bin .../pokemon/{ => gen_5}/emboar/footprint.png | Bin graphics/pokemon/{ => gen_5}/emboar/icon.png | Bin .../pokemon/{ => gen_5}/emboar/normal.pal | 0 graphics/pokemon/{ => gen_5}/emboar/shiny.pal | 0 .../pokemon/{ => gen_5}/emolga/anim_front.png | Bin graphics/pokemon/{ => gen_5}/emolga/back.png | Bin .../pokemon/{ => gen_5}/emolga/footprint.png | Bin graphics/pokemon/{ => gen_5}/emolga/icon.png | Bin .../pokemon/{ => gen_5}/emolga/normal.pal | 0 graphics/pokemon/{ => gen_5}/emolga/shiny.pal | 0 .../{ => gen_5}/escavalier/anim_front.png | Bin .../pokemon/{ => gen_5}/escavalier/back.png | Bin .../escavalier}/footprint.png | Bin .../pokemon/{ => gen_5}/escavalier/icon.png | Bin .../pokemon/{ => gen_5}/escavalier/normal.pal | 0 .../pokemon/{ => gen_5}/escavalier/shiny.pal | 0 .../{ => gen_5}/excadrill/anim_front.png | Bin .../pokemon/{ => gen_5}/excadrill/back.png | Bin .../{ => gen_5}/excadrill/footprint.png | Bin .../pokemon/{ => gen_5}/excadrill/icon.png | Bin .../pokemon/{ => gen_5}/excadrill/normal.pal | 0 .../pokemon/{ => gen_5}/excadrill/shiny.pal | 0 .../{ => gen_5}/ferroseed/anim_front.png | Bin .../pokemon/{ => gen_5}/ferroseed/back.png | Bin .../ferroseed}/footprint.png | Bin .../pokemon/{ => gen_5}/ferroseed/icon.png | Bin .../pokemon/{ => gen_5}/ferroseed/normal.pal | 0 .../pokemon/{ => gen_5}/ferroseed/shiny.pal | 0 .../{ => gen_5}/ferrothorn/anim_front.png | Bin .../pokemon/{ => gen_5}/ferrothorn/back.png | Bin .../{ => gen_5}/ferrothorn/footprint.png | Bin .../pokemon/{ => gen_5}/ferrothorn/icon.png | Bin .../pokemon/{ => gen_5}/ferrothorn/normal.pal | 0 .../pokemon/{ => gen_5}/ferrothorn/shiny.pal | 0 .../{ => gen_5}/foongus/anim_front.png | Bin graphics/pokemon/{ => gen_5}/foongus/back.png | Bin .../{meltan => gen_5/foongus}/footprint.png | Bin graphics/pokemon/{ => gen_5}/foongus/icon.png | Bin .../pokemon/{ => gen_5}/foongus/normal.pal | 0 .../pokemon/{ => gen_5}/foongus/shiny.pal | 0 .../{ => gen_5}/fraxure/anim_front.png | Bin graphics/pokemon/{ => gen_5}/fraxure/back.png | Bin .../pokemon/{ => gen_5}/fraxure/footprint.png | Bin graphics/pokemon/{ => gen_5}/fraxure/icon.png | Bin .../pokemon/{ => gen_5}/fraxure/normal.pal | 0 .../pokemon/{ => gen_5}/fraxure/shiny.pal | 0 .../{ => gen_5}/frillish/anim_front.png | Bin .../{ => gen_5}/frillish/anim_frontf.png | Bin .../pokemon/{ => gen_5}/frillish/back.png | Bin .../pokemon/{ => gen_5}/frillish/backf.png | Bin .../{metapod => gen_5/frillish}/footprint.png | Bin .../pokemon/{ => gen_5}/frillish/frontf.png | Bin .../pokemon/{ => gen_5}/frillish/icon.png | Bin .../pokemon/{ => gen_5}/frillish/iconf.png | Bin .../pokemon/{ => gen_5}/frillish/normal.pal | 0 .../pokemon/{ => gen_5}/frillish/normalf.pal | 0 .../pokemon/{ => gen_5}/frillish/shiny.pal | 0 .../pokemon/{ => gen_5}/frillish/shinyf.pal | 0 .../{ => gen_5}/galvantula/anim_front.png | Bin .../pokemon/{ => gen_5}/galvantula/back.png | Bin .../{ => gen_5}/galvantula/footprint.png | Bin .../pokemon/{ => gen_5}/galvantula/icon.png | Bin .../pokemon/{ => gen_5}/galvantula/normal.pal | 0 .../pokemon/{ => gen_5}/galvantula/shiny.pal | 0 .../{ => gen_5}/garbodor/anim_front.png | Bin .../pokemon/{ => gen_5}/garbodor/back.png | Bin .../{ => gen_5}/garbodor/footprint.png | Bin .../{ => gen_5}/garbodor/gigantamax/back.png | Bin .../{ => gen_5}/garbodor/gigantamax/front.png | Bin .../{ => gen_5}/garbodor/gigantamax/icon.png | Bin .../garbodor/gigantamax/normal.pal | 0 .../{ => gen_5}/garbodor/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_5}/garbodor/icon.png | Bin .../pokemon/{ => gen_5}/garbodor/normal.pal | 0 .../pokemon/{ => gen_5}/garbodor/shiny.pal | 0 .../{ => gen_5}/genesect/anim_front.png | Bin .../pokemon/{ => gen_5}/genesect/back.png | Bin .../genesect/burn_drive/normal.pal | 0 .../{ => gen_5}/genesect/burn_drive/shiny.pal | 0 .../genesect/chill_drive/normal.pal | 0 .../genesect/chill_drive/shiny.pal | 0 .../genesect/douse_drive/normal.pal | 0 .../genesect/douse_drive/shiny.pal | 0 .../{ => gen_5}/genesect/footprint.png | Bin .../pokemon/{ => gen_5}/genesect/icon.png | Bin .../pokemon/{ => gen_5}/genesect/normal.pal | 0 .../pokemon/{ => gen_5}/genesect/shiny.pal | 0 .../genesect/shock_drive/normal.pal | 0 .../genesect/shock_drive/shiny.pal | 0 .../{ => gen_5}/gigalith/anim_front.png | Bin .../pokemon/{ => gen_5}/gigalith/back.png | Bin .../{ => gen_5}/gigalith/footprint.png | Bin .../pokemon/{ => gen_5}/gigalith/icon.png | Bin .../pokemon/{ => gen_5}/gigalith/normal.pal | 0 .../pokemon/{ => gen_5}/gigalith/shiny.pal | 0 .../pokemon/{ => gen_5}/golett/anim_front.png | Bin graphics/pokemon/{ => gen_5}/golett/back.png | Bin .../pokemon/{ => gen_5}/golett/footprint.png | Bin graphics/pokemon/{ => gen_5}/golett/icon.png | Bin .../pokemon/{ => gen_5}/golett/normal.pal | 0 graphics/pokemon/{ => gen_5}/golett/shiny.pal | 0 .../pokemon/{ => gen_5}/golurk/anim_front.png | Bin graphics/pokemon/{ => gen_5}/golurk/back.png | Bin .../pokemon/{ => gen_5}/golurk/footprint.png | Bin graphics/pokemon/{ => gen_5}/golurk/icon.png | Bin .../pokemon/{ => gen_5}/golurk/normal.pal | 0 graphics/pokemon/{ => gen_5}/golurk/shiny.pal | 0 .../{ => gen_5}/gothita/anim_front.png | Bin graphics/pokemon/{ => gen_5}/gothita/back.png | Bin .../gothita}/footprint.png | Bin graphics/pokemon/{ => gen_5}/gothita/icon.png | Bin .../pokemon/{ => gen_5}/gothita/normal.pal | 0 .../pokemon/{ => gen_5}/gothita/shiny.pal | 0 .../{ => gen_5}/gothitelle/anim_front.png | Bin .../pokemon/{ => gen_5}/gothitelle/back.png | Bin .../{ => gen_5}/gothitelle/footprint.png | Bin .../pokemon/{ => gen_5}/gothitelle/icon.png | Bin .../pokemon/{ => gen_5}/gothitelle/normal.pal | 0 .../pokemon/{ => gen_5}/gothitelle/shiny.pal | 0 .../{ => gen_5}/gothorita/anim_front.png | Bin .../pokemon/{ => gen_5}/gothorita/back.png | Bin .../{ => gen_5}/gothorita/footprint.png | Bin .../pokemon/{ => gen_5}/gothorita/icon.png | Bin .../pokemon/{ => gen_5}/gothorita/normal.pal | 0 .../pokemon/{ => gen_5}/gothorita/shiny.pal | 0 .../{ => gen_5}/gurdurr/anim_front.png | Bin graphics/pokemon/{ => gen_5}/gurdurr/back.png | Bin .../pokemon/{ => gen_5}/gurdurr/footprint.png | Bin graphics/pokemon/{ => gen_5}/gurdurr/icon.png | Bin .../pokemon/{ => gen_5}/gurdurr/normal.pal | 0 .../pokemon/{ => gen_5}/gurdurr/shiny.pal | 0 .../{ => gen_5}/haxorus/anim_front.png | Bin graphics/pokemon/{ => gen_5}/haxorus/back.png | Bin .../pokemon/{ => gen_5}/haxorus/footprint.png | Bin graphics/pokemon/{ => gen_5}/haxorus/icon.png | Bin .../pokemon/{ => gen_5}/haxorus/normal.pal | 0 .../pokemon/{ => gen_5}/haxorus/shiny.pal | 0 .../{ => gen_5}/heatmor/anim_front.png | Bin graphics/pokemon/{ => gen_5}/heatmor/back.png | Bin .../pokemon/{ => gen_5}/heatmor/footprint.png | Bin graphics/pokemon/{ => gen_5}/heatmor/icon.png | Bin .../pokemon/{ => gen_5}/heatmor/normal.pal | 0 .../pokemon/{ => gen_5}/heatmor/shiny.pal | 0 .../{ => gen_5}/herdier/anim_front.png | Bin graphics/pokemon/{ => gen_5}/herdier/back.png | Bin .../{elgyem => gen_5/herdier}/footprint.png | Bin graphics/pokemon/{ => gen_5}/herdier/icon.png | Bin .../pokemon/{ => gen_5}/herdier/normal.pal | 0 .../pokemon/{ => gen_5}/herdier/shiny.pal | 0 .../{ => gen_5}/hydreigon/anim_front.png | Bin .../pokemon/{ => gen_5}/hydreigon/back.png | Bin .../hydreigon}/footprint.png | Bin .../pokemon/{ => gen_5}/hydreigon/icon.png | Bin .../pokemon/{ => gen_5}/hydreigon/normal.pal | 0 .../pokemon/{ => gen_5}/hydreigon/shiny.pal | 0 .../{ => gen_5}/jellicent/anim_front.png | Bin .../{ => gen_5}/jellicent/anim_frontf.png | Bin .../pokemon/{ => gen_5}/jellicent/back.png | Bin .../pokemon/{ => gen_5}/jellicent/backf.png | Bin .../jellicent}/footprint.png | Bin .../pokemon/{ => gen_5}/jellicent/frontf.png | Bin .../pokemon/{ => gen_5}/jellicent/icon.png | Bin .../pokemon/{ => gen_5}/jellicent/iconf.png | Bin .../pokemon/{ => gen_5}/jellicent/normal.pal | 0 .../pokemon/{ => gen_5}/jellicent/normalf.pal | 0 .../pokemon/{ => gen_5}/jellicent/shiny.pal | 0 .../pokemon/{ => gen_5}/jellicent/shinyf.pal | 0 .../pokemon/{ => gen_5}/joltik/anim_front.png | Bin graphics/pokemon/{ => gen_5}/joltik/back.png | Bin .../{crustle => gen_5/joltik}/footprint.png | Bin graphics/pokemon/{ => gen_5}/joltik/icon.png | Bin .../pokemon/{ => gen_5}/joltik/normal.pal | 0 graphics/pokemon/{ => gen_5}/joltik/shiny.pal | 0 .../{ => gen_5}/karrablast/anim_front.png | Bin .../pokemon/{ => gen_5}/karrablast/back.png | Bin .../karrablast}/footprint.png | Bin .../pokemon/{ => gen_5}/karrablast/icon.png | Bin .../pokemon/{ => gen_5}/karrablast/normal.pal | 0 .../pokemon/{ => gen_5}/karrablast/shiny.pal | 0 .../pokemon/{ => gen_5}/keldeo/anim_front.png | Bin graphics/pokemon/{ => gen_5}/keldeo/back.png | Bin .../pokemon/{ => gen_5}/keldeo/footprint.png | Bin graphics/pokemon/{ => gen_5}/keldeo/icon.png | Bin .../pokemon/{ => gen_5}/keldeo/normal.pal | 0 .../{ => gen_5}/keldeo/resolute/back.png | Bin .../{ => gen_5}/keldeo/resolute/front.png | Bin .../{ => gen_5}/keldeo/resolute/icon.png | Bin .../{ => gen_5}/keldeo/resolute/normal.pal | 0 .../{ => gen_5}/keldeo/resolute/shiny.pal | 0 graphics/pokemon/{ => gen_5}/keldeo/shiny.pal | 0 .../pokemon/{ => gen_5}/klang/anim_front.png | Bin graphics/pokemon/{ => gen_5}/klang/back.png | Bin .../{mimikyu => gen_5/klang}/footprint.png | Bin graphics/pokemon/{ => gen_5}/klang/icon.png | Bin graphics/pokemon/{ => gen_5}/klang/normal.pal | 0 graphics/pokemon/{ => gen_5}/klang/shiny.pal | 0 .../pokemon/{ => gen_5}/klink/anim_front.png | Bin graphics/pokemon/{ => gen_5}/klink/back.png | Bin .../{minior => gen_5/klink}/footprint.png | Bin graphics/pokemon/{ => gen_5}/klink/icon.png | Bin graphics/pokemon/{ => gen_5}/klink/normal.pal | 0 graphics/pokemon/{ => gen_5}/klink/shiny.pal | 0 .../{ => gen_5}/klinklang/anim_front.png | Bin .../pokemon/{ => gen_5}/klinklang/back.png | Bin .../klinklang}/footprint.png | Bin .../pokemon/{ => gen_5}/klinklang/icon.png | Bin .../pokemon/{ => gen_5}/klinklang/normal.pal | 0 .../pokemon/{ => gen_5}/klinklang/shiny.pal | 0 .../{ => gen_5}/krokorok/anim_front.png | Bin .../pokemon/{ => gen_5}/krokorok/back.png | Bin .../{ => gen_5}/krokorok/footprint.png | Bin .../pokemon/{ => gen_5}/krokorok/icon.png | Bin .../pokemon/{ => gen_5}/krokorok/normal.pal | 0 .../pokemon/{ => gen_5}/krokorok/shiny.pal | 0 .../{ => gen_5}/krookodile/anim_front.png | Bin .../pokemon/{ => gen_5}/krookodile/back.png | Bin .../{ => gen_5}/krookodile/footprint.png | Bin .../pokemon/{ => gen_5}/krookodile/icon.png | Bin .../pokemon/{ => gen_5}/krookodile/normal.pal | 0 .../pokemon/{ => gen_5}/krookodile/shiny.pal | 0 .../pokemon/{ => gen_5}/kyurem/anim_front.png | Bin graphics/pokemon/{ => gen_5}/kyurem/back.png | Bin .../{ => gen_5}/kyurem/black/anim_front.png | Bin .../pokemon/{ => gen_5}/kyurem/black/back.png | Bin .../pokemon/{ => gen_5}/kyurem/black/icon.png | Bin .../{ => gen_5}/kyurem/black/normal.pal | 0 .../{ => gen_5}/kyurem/black/shiny.pal | 0 .../pokemon/{ => gen_5}/kyurem/footprint.png | Bin graphics/pokemon/{ => gen_5}/kyurem/icon.png | Bin .../pokemon/{ => gen_5}/kyurem/normal.pal | 0 graphics/pokemon/{ => gen_5}/kyurem/shiny.pal | 0 .../{ => gen_5}/kyurem/white/anim_front.png | Bin .../pokemon/{ => gen_5}/kyurem/white/back.png | Bin .../pokemon/{ => gen_5}/kyurem/white/icon.png | Bin .../{ => gen_5}/kyurem/white/normal.pal | 0 .../{ => gen_5}/kyurem/white/shiny.pal | 0 .../{ => gen_5}/lampent/anim_front.png | Bin graphics/pokemon/{ => gen_5}/lampent/back.png | Bin .../lampent}/footprint.png | Bin graphics/pokemon/{ => gen_5}/lampent/icon.png | Bin .../pokemon/{ => gen_5}/lampent/normal.pal | 0 .../pokemon/{ => gen_5}/lampent/shiny.pal | 0 .../{ => gen_5}/landorus/anim_front.png | Bin .../pokemon/{ => gen_5}/landorus/back.png | Bin .../{muk => gen_5/landorus}/footprint.png | Bin .../pokemon/{ => gen_5}/landorus/icon.png | Bin .../pokemon/{ => gen_5}/landorus/normal.pal | 0 .../pokemon/{ => gen_5}/landorus/shiny.pal | 0 .../landorus/therian/anim_front.png | Bin .../{ => gen_5}/landorus/therian/back.png | Bin .../{ => gen_5}/landorus/therian/icon.png | Bin .../{ => gen_5}/landorus/therian/normal.pal | 0 .../{ => gen_5}/landorus/therian/shiny.pal | 0 .../{ => gen_5}/larvesta/anim_front.png | Bin .../pokemon/{ => gen_5}/larvesta/back.png | Bin .../larvesta}/footprint.png | Bin .../pokemon/{ => gen_5}/larvesta/icon.png | Bin .../pokemon/{ => gen_5}/larvesta/normal.pal | 0 .../pokemon/{ => gen_5}/larvesta/shiny.pal | 0 .../{ => gen_5}/leavanny/anim_front.png | Bin .../pokemon/{ => gen_5}/leavanny/back.png | Bin .../{mothim => gen_5/leavanny}/footprint.png | Bin .../pokemon/{ => gen_5}/leavanny/icon.png | Bin .../pokemon/{ => gen_5}/leavanny/normal.pal | 0 .../pokemon/{ => gen_5}/leavanny/shiny.pal | 0 .../{ => gen_5}/liepard/anim_front.png | Bin graphics/pokemon/{ => gen_5}/liepard/back.png | Bin .../pokemon/{ => gen_5}/liepard/footprint.png | Bin graphics/pokemon/{ => gen_5}/liepard/icon.png | Bin .../pokemon/{ => gen_5}/liepard/normal.pal | 0 .../pokemon/{ => gen_5}/liepard/shiny.pal | 0 .../{ => gen_5}/lilligant/anim_front.png | Bin .../pokemon/{ => gen_5}/lilligant/back.png | Bin .../{ => gen_5}/lilligant/footprint.png | Bin .../{ => gen_5}/lilligant/hisuian/back.png | Bin .../{ => gen_5}/lilligant/hisuian/front.png | Bin .../{ => gen_5}/lilligant/hisuian/icon.png | Bin .../{ => gen_5}/lilligant/hisuian/normal.pal | 0 .../{ => gen_5}/lilligant/hisuian/shiny.pal | 0 .../pokemon/{ => gen_5}/lilligant/icon.png | Bin .../pokemon/{ => gen_5}/lilligant/normal.pal | 0 .../pokemon/{ => gen_5}/lilligant/shiny.pal | 0 .../{ => gen_5}/lillipup/anim_front.png | Bin .../pokemon/{ => gen_5}/lillipup/back.png | Bin .../{ => gen_5}/lillipup/footprint.png | Bin .../pokemon/{ => gen_5}/lillipup/icon.png | Bin .../pokemon/{ => gen_5}/lillipup/normal.pal | 0 .../pokemon/{ => gen_5}/lillipup/shiny.pal | 0 .../{ => gen_5}/litwick/anim_front.png | Bin graphics/pokemon/{ => gen_5}/litwick/back.png | Bin .../litwick}/footprint.png | Bin graphics/pokemon/{ => gen_5}/litwick/icon.png | Bin .../pokemon/{ => gen_5}/litwick/normal.pal | 0 .../pokemon/{ => gen_5}/litwick/shiny.pal | 0 .../{ => gen_5}/mandibuzz/anim_front.png | Bin .../pokemon/{ => gen_5}/mandibuzz/back.png | Bin .../{ => gen_5}/mandibuzz/footprint.png | Bin .../pokemon/{ => gen_5}/mandibuzz/icon.png | Bin .../pokemon/{ => gen_5}/mandibuzz/normal.pal | 0 .../pokemon/{ => gen_5}/mandibuzz/shiny.pal | 0 .../{ => gen_5}/maractus/anim_front.png | Bin .../pokemon/{ => gen_5}/maractus/back.png | Bin .../{ => gen_5}/maractus/footprint.png | Bin .../pokemon/{ => gen_5}/maractus/icon.png | Bin .../pokemon/{ => gen_5}/maractus/normal.pal | 0 .../pokemon/{ => gen_5}/maractus/shiny.pal | 0 .../{ => gen_5}/meloetta/anim_front.png | Bin .../pokemon/{ => gen_5}/meloetta/back.png | Bin .../{darkrai => gen_5/meloetta}/footprint.png | Bin .../pokemon/{ => gen_5}/meloetta/icon.png | Bin .../pokemon/{ => gen_5}/meloetta/normal.pal | 0 .../{ => gen_5}/meloetta/pirouette/back.png | Bin .../{ => gen_5}/meloetta/pirouette/front.png | Bin .../{ => gen_5}/meloetta/pirouette/icon.png | Bin .../{ => gen_5}/meloetta/pirouette/normal.pal | 0 .../{ => gen_5}/meloetta/pirouette/shiny.pal | 0 .../pokemon/{ => gen_5}/meloetta/shiny.pal | 0 .../{ => gen_5}/mienfoo/anim_front.png | Bin graphics/pokemon/{ => gen_5}/mienfoo/back.png | Bin .../pokemon/{ => gen_5}/mienfoo/footprint.png | Bin graphics/pokemon/{ => gen_5}/mienfoo/icon.png | Bin .../pokemon/{ => gen_5}/mienfoo/normal.pal | 0 .../pokemon/{ => gen_5}/mienfoo/shiny.pal | 0 .../{ => gen_5}/mienshao/anim_front.png | Bin .../pokemon/{ => gen_5}/mienshao/back.png | Bin .../{ => gen_5}/mienshao/footprint.png | Bin .../pokemon/{ => gen_5}/mienshao/icon.png | Bin .../pokemon/{ => gen_5}/mienshao/normal.pal | 0 .../pokemon/{ => gen_5}/mienshao/shiny.pal | 0 .../{ => gen_5}/minccino/anim_front.png | Bin .../pokemon/{ => gen_5}/minccino/back.png | Bin .../{ => gen_5}/minccino/footprint.png | Bin .../pokemon/{ => gen_5}/minccino/icon.png | Bin .../pokemon/{ => gen_5}/minccino/normal.pal | 0 .../pokemon/{ => gen_5}/minccino/shiny.pal | 0 .../pokemon/{ => gen_5}/munna/anim_front.png | Bin graphics/pokemon/{ => gen_5}/munna/back.png | Bin .../{dewpider => gen_5/munna}/footprint.png | Bin graphics/pokemon/{ => gen_5}/munna/icon.png | Bin graphics/pokemon/{ => gen_5}/munna/normal.pal | 0 graphics/pokemon/{ => gen_5}/munna/shiny.pal | 0 .../{ => gen_5}/musharna/anim_front.png | Bin .../pokemon/{ => gen_5}/musharna/back.png | Bin .../musharna}/footprint.png | Bin .../pokemon/{ => gen_5}/musharna/icon.png | Bin .../pokemon/{ => gen_5}/musharna/normal.pal | 0 .../pokemon/{ => gen_5}/musharna/shiny.pal | 0 .../{ => gen_5}/oshawott/anim_front.png | Bin .../pokemon/{ => gen_5}/oshawott/back.png | Bin .../{ => gen_5}/oshawott/footprint.png | Bin .../pokemon/{ => gen_5}/oshawott/icon.png | Bin .../pokemon/{ => gen_5}/oshawott/normal.pal | 0 .../pokemon/{ => gen_5}/oshawott/shiny.pal | 0 .../{ => gen_5}/palpitoad/anim_front.png | Bin .../pokemon/{ => gen_5}/palpitoad/back.png | Bin .../{ => gen_5}/palpitoad/footprint.png | Bin .../pokemon/{ => gen_5}/palpitoad/icon.png | Bin .../pokemon/{ => gen_5}/palpitoad/normal.pal | 0 .../pokemon/{ => gen_5}/palpitoad/shiny.pal | 0 .../{ => gen_5}/panpour/anim_front.png | Bin graphics/pokemon/{ => gen_5}/panpour/back.png | Bin .../pokemon/{ => gen_5}/panpour/footprint.png | Bin graphics/pokemon/{ => gen_5}/panpour/icon.png | Bin .../pokemon/{ => gen_5}/panpour/normal.pal | 0 .../pokemon/{ => gen_5}/panpour/shiny.pal | 0 .../{ => gen_5}/pansage/anim_front.png | Bin graphics/pokemon/{ => gen_5}/pansage/back.png | Bin .../pokemon/{ => gen_5}/pansage/footprint.png | Bin graphics/pokemon/{ => gen_5}/pansage/icon.png | Bin .../pokemon/{ => gen_5}/pansage/normal.pal | 0 .../pokemon/{ => gen_5}/pansage/shiny.pal | 0 .../{ => gen_5}/pansear/anim_front.png | Bin graphics/pokemon/{ => gen_5}/pansear/back.png | Bin .../pokemon/{ => gen_5}/pansear/footprint.png | Bin graphics/pokemon/{ => gen_5}/pansear/icon.png | Bin .../pokemon/{ => gen_5}/pansear/normal.pal | 0 .../pokemon/{ => gen_5}/pansear/shiny.pal | 0 .../pokemon/{ => gen_5}/patrat/anim_front.png | Bin graphics/pokemon/{ => gen_5}/patrat/back.png | Bin .../pokemon/{ => gen_5}/patrat/footprint.png | Bin graphics/pokemon/{ => gen_5}/patrat/icon.png | Bin .../pokemon/{ => gen_5}/patrat/normal.pal | 0 graphics/pokemon/{ => gen_5}/patrat/shiny.pal | 0 .../{ => gen_5}/pawniard/anim_front.png | Bin .../pokemon/{ => gen_5}/pawniard/back.png | Bin .../{ => gen_5}/pawniard/footprint.png | Bin .../pokemon/{ => gen_5}/pawniard/icon.png | Bin .../pokemon/{ => gen_5}/pawniard/normal.pal | 0 .../pokemon/{ => gen_5}/pawniard/shiny.pal | 0 .../{ => gen_5}/petilil/anim_front.png | Bin graphics/pokemon/{ => gen_5}/petilil/back.png | Bin .../{necrozma => gen_5/petilil}/footprint.png | Bin graphics/pokemon/{ => gen_5}/petilil/icon.png | Bin .../pokemon/{ => gen_5}/petilil/normal.pal | 0 .../pokemon/{ => gen_5}/petilil/shiny.pal | 0 .../pokemon/{ => gen_5}/pidove/anim_front.png | Bin graphics/pokemon/{ => gen_5}/pidove/back.png | Bin .../pokemon/{ => gen_5}/pidove/footprint.png | Bin graphics/pokemon/{ => gen_5}/pidove/icon.png | Bin .../pokemon/{ => gen_5}/pidove/normal.pal | 0 graphics/pokemon/{ => gen_5}/pidove/shiny.pal | 0 .../{ => gen_5}/pignite/anim_front.png | Bin graphics/pokemon/{ => gen_5}/pignite/back.png | Bin .../pokemon/{ => gen_5}/pignite/footprint.png | Bin graphics/pokemon/{ => gen_5}/pignite/icon.png | Bin .../pokemon/{ => gen_5}/pignite/normal.pal | 0 .../pokemon/{ => gen_5}/pignite/shiny.pal | 0 .../{ => gen_5}/purrloin/anim_front.png | Bin .../pokemon/{ => gen_5}/purrloin/back.png | Bin .../{ => gen_5}/purrloin/footprint.png | Bin .../pokemon/{ => gen_5}/purrloin/icon.png | Bin .../pokemon/{ => gen_5}/purrloin/normal.pal | 0 .../pokemon/{ => gen_5}/purrloin/shiny.pal | 0 .../{ => gen_5}/reshiram/anim_front.png | Bin .../pokemon/{ => gen_5}/reshiram/back.png | Bin .../{ => gen_5}/reshiram/footprint.png | Bin .../pokemon/{ => gen_5}/reshiram/icon.png | Bin .../pokemon/{ => gen_5}/reshiram/normal.pal | 0 .../pokemon/{ => gen_5}/reshiram/shiny.pal | 0 .../{ => gen_5}/reuniclus/anim_front.png | Bin .../pokemon/{ => gen_5}/reuniclus/back.png | Bin .../reuniclus}/footprint.png | Bin .../pokemon/{ => gen_5}/reuniclus/icon.png | Bin .../pokemon/{ => gen_5}/reuniclus/normal.pal | 0 .../pokemon/{ => gen_5}/reuniclus/shiny.pal | 0 .../{ => gen_5}/roggenrola/anim_front.png | Bin .../pokemon/{ => gen_5}/roggenrola/back.png | Bin .../{ => gen_5}/roggenrola/footprint.png | Bin .../pokemon/{ => gen_5}/roggenrola/icon.png | Bin .../pokemon/{ => gen_5}/roggenrola/normal.pal | 0 .../pokemon/{ => gen_5}/roggenrola/shiny.pal | 0 .../{ => gen_5}/rufflet/anim_front.png | Bin graphics/pokemon/{ => gen_5}/rufflet/back.png | Bin .../pokemon/{ => gen_5}/rufflet/footprint.png | Bin graphics/pokemon/{ => gen_5}/rufflet/icon.png | Bin .../pokemon/{ => gen_5}/rufflet/normal.pal | 0 .../pokemon/{ => gen_5}/rufflet/shiny.pal | 0 .../{ => gen_5}/samurott/anim_front.png | Bin .../pokemon/{ => gen_5}/samurott/back.png | Bin .../{ => gen_5}/samurott/footprint.png | Bin .../{ => gen_5}/samurott/hisuian/back.png | Bin .../{ => gen_5}/samurott/hisuian/front.png | Bin .../{ => gen_5}/samurott/hisuian/icon.png | Bin .../{ => gen_5}/samurott/hisuian/normal.pal | 0 .../{ => gen_5}/samurott/hisuian/shiny.pal | 0 .../pokemon/{ => gen_5}/samurott/icon.png | Bin .../pokemon/{ => gen_5}/samurott/normal.pal | 0 .../pokemon/{ => gen_5}/samurott/shiny.pal | 0 .../{ => gen_5}/sandile/anim_front.png | Bin graphics/pokemon/{ => gen_5}/sandile/back.png | Bin .../pokemon/{ => gen_5}/sandile/footprint.png | Bin graphics/pokemon/{ => gen_5}/sandile/icon.png | Bin .../pokemon/{ => gen_5}/sandile/normal.pal | 0 .../pokemon/{ => gen_5}/sandile/shiny.pal | 0 .../pokemon/{ => gen_5}/sawk/anim_front.png | Bin graphics/pokemon/{ => gen_5}/sawk/back.png | Bin .../pokemon/{ => gen_5}/sawk/footprint.png | Bin graphics/pokemon/{ => gen_5}/sawk/icon.png | Bin graphics/pokemon/{ => gen_5}/sawk/normal.pal | 0 graphics/pokemon/{ => gen_5}/sawk/shiny.pal | 0 .../{ => gen_5}/sawsbuck/anim_front.png | Bin .../{ => gen_5}/sawsbuck/autumn/back.png | Bin .../{ => gen_5}/sawsbuck/autumn/front.png | Bin .../{ => gen_5}/sawsbuck/autumn/icon.png | Bin .../{ => gen_5}/sawsbuck/autumn/normal.pal | 0 .../{ => gen_5}/sawsbuck/autumn/shiny.pal | 0 .../pokemon/{ => gen_5}/sawsbuck/back.png | Bin .../{ => gen_5}/sawsbuck/footprint.png | Bin .../pokemon/{ => gen_5}/sawsbuck/icon.png | Bin .../pokemon/{ => gen_5}/sawsbuck/normal.pal | 0 .../pokemon/{ => gen_5}/sawsbuck/shiny.pal | 0 .../{ => gen_5}/sawsbuck/summer/back.png | Bin .../{ => gen_5}/sawsbuck/summer/front.png | Bin .../{ => gen_5}/sawsbuck/summer/icon.png | Bin .../{ => gen_5}/sawsbuck/summer/normal.pal | 0 .../{ => gen_5}/sawsbuck/summer/shiny.pal | 0 .../{ => gen_5}/sawsbuck/winter/back.png | Bin .../{ => gen_5}/sawsbuck/winter/front.png | Bin .../{ => gen_5}/sawsbuck/winter/icon.png | Bin .../{ => gen_5}/sawsbuck/winter/normal.pal | 0 .../{ => gen_5}/sawsbuck/winter/shiny.pal | 0 .../{ => gen_5}/scolipede/anim_front.png | Bin .../pokemon/{ => gen_5}/scolipede/back.png | Bin .../{ => gen_5}/scolipede/footprint.png | Bin .../pokemon/{ => gen_5}/scolipede/icon.png | Bin .../pokemon/{ => gen_5}/scolipede/normal.pal | 0 .../pokemon/{ => gen_5}/scolipede/shiny.pal | 0 .../{ => gen_5}/scrafty/anim_front.png | Bin graphics/pokemon/{ => gen_5}/scrafty/back.png | Bin .../pokemon/{ => gen_5}/scrafty/footprint.png | Bin graphics/pokemon/{ => gen_5}/scrafty/icon.png | Bin .../pokemon/{ => gen_5}/scrafty/normal.pal | 0 .../pokemon/{ => gen_5}/scrafty/shiny.pal | 0 .../{ => gen_5}/scraggy/anim_front.png | Bin graphics/pokemon/{ => gen_5}/scraggy/back.png | Bin .../{herdier => gen_5/scraggy}/footprint.png | Bin graphics/pokemon/{ => gen_5}/scraggy/icon.png | Bin .../pokemon/{ => gen_5}/scraggy/normal.pal | 0 .../pokemon/{ => gen_5}/scraggy/shiny.pal | 0 .../{ => gen_5}/seismitoad/anim_front.png | Bin .../pokemon/{ => gen_5}/seismitoad/back.png | Bin .../{ => gen_5}/seismitoad/footprint.png | Bin .../pokemon/{ => gen_5}/seismitoad/icon.png | Bin .../pokemon/{ => gen_5}/seismitoad/normal.pal | 0 .../pokemon/{ => gen_5}/seismitoad/shiny.pal | 0 .../{ => gen_5}/serperior/anim_front.png | Bin .../pokemon/{ => gen_5}/serperior/back.png | Bin .../{onix => gen_5/serperior}/footprint.png | Bin .../pokemon/{ => gen_5}/serperior/icon.png | Bin .../pokemon/{ => gen_5}/serperior/normal.pal | 0 .../pokemon/{ => gen_5}/serperior/shiny.pal | 0 .../{ => gen_5}/servine/anim_front.png | Bin graphics/pokemon/{ => gen_5}/servine/back.png | Bin .../pokemon/{ => gen_5}/servine/footprint.png | Bin graphics/pokemon/{ => gen_5}/servine/icon.png | Bin .../pokemon/{ => gen_5}/servine/normal.pal | 0 .../pokemon/{ => gen_5}/servine/shiny.pal | 0 .../{ => gen_5}/sewaddle/anim_front.png | Bin .../pokemon/{ => gen_5}/sewaddle/back.png | Bin .../sewaddle}/footprint.png | Bin .../pokemon/{ => gen_5}/sewaddle/icon.png | Bin .../pokemon/{ => gen_5}/sewaddle/normal.pal | 0 .../pokemon/{ => gen_5}/sewaddle/shiny.pal | 0 .../{ => gen_5}/shelmet/anim_front.png | Bin graphics/pokemon/{ => gen_5}/shelmet/back.png | Bin .../{fomantis => gen_5/shelmet}/footprint.png | Bin graphics/pokemon/{ => gen_5}/shelmet/icon.png | Bin .../pokemon/{ => gen_5}/shelmet/normal.pal | 0 .../pokemon/{ => gen_5}/shelmet/shiny.pal | 0 .../{ => gen_5}/sigilyph/anim_front.png | Bin .../pokemon/{ => gen_5}/sigilyph/back.png | Bin .../sigilyph}/footprint.png | Bin .../pokemon/{ => gen_5}/sigilyph/icon.png | Bin .../pokemon/{ => gen_5}/sigilyph/normal.pal | 0 .../pokemon/{ => gen_5}/sigilyph/shiny.pal | 0 .../{ => gen_5}/simipour/anim_front.png | Bin .../pokemon/{ => gen_5}/simipour/back.png | Bin .../{ => gen_5}/simipour/footprint.png | Bin .../pokemon/{ => gen_5}/simipour/icon.png | Bin .../pokemon/{ => gen_5}/simipour/normal.pal | 0 .../pokemon/{ => gen_5}/simipour/shiny.pal | 0 .../{ => gen_5}/simisage/anim_front.png | Bin .../pokemon/{ => gen_5}/simisage/back.png | Bin .../{ => gen_5}/simisage/footprint.png | Bin .../pokemon/{ => gen_5}/simisage/icon.png | Bin .../pokemon/{ => gen_5}/simisage/normal.pal | 0 .../pokemon/{ => gen_5}/simisage/shiny.pal | 0 .../{ => gen_5}/simisear/anim_front.png | Bin .../pokemon/{ => gen_5}/simisear/back.png | Bin .../{ => gen_5}/simisear/footprint.png | Bin .../pokemon/{ => gen_5}/simisear/icon.png | Bin .../pokemon/{ => gen_5}/simisear/normal.pal | 0 .../pokemon/{ => gen_5}/simisear/shiny.pal | 0 .../pokemon/{ => gen_5}/snivy/anim_front.png | Bin graphics/pokemon/{ => gen_5}/snivy/back.png | Bin .../pokemon/{ => gen_5}/snivy/footprint.png | Bin graphics/pokemon/{ => gen_5}/snivy/icon.png | Bin graphics/pokemon/{ => gen_5}/snivy/normal.pal | 0 graphics/pokemon/{ => gen_5}/snivy/shiny.pal | 0 .../{ => gen_5}/solosis/anim_front.png | Bin graphics/pokemon/{ => gen_5}/solosis/back.png | Bin .../{petilil => gen_5/solosis}/footprint.png | Bin graphics/pokemon/{ => gen_5}/solosis/icon.png | Bin .../pokemon/{ => gen_5}/solosis/normal.pal | 0 .../pokemon/{ => gen_5}/solosis/shiny.pal | 0 .../{ => gen_5}/stoutland/anim_front.png | Bin .../pokemon/{ => gen_5}/stoutland/back.png | Bin .../{ => gen_5}/stoutland/footprint.png | Bin .../pokemon/{ => gen_5}/stoutland/icon.png | Bin .../pokemon/{ => gen_5}/stoutland/normal.pal | 0 .../pokemon/{ => gen_5}/stoutland/shiny.pal | 0 .../{ => gen_5}/stunfisk/anim_front.png | Bin .../pokemon/{ => gen_5}/stunfisk/back.png | Bin .../stunfisk}/footprint.png | Bin .../{ => gen_5}/stunfisk/galarian/back.png | Bin .../{ => gen_5}/stunfisk/galarian/front.png | Bin .../{ => gen_5}/stunfisk/galarian/icon.png | Bin .../{ => gen_5}/stunfisk/galarian/normal.pal | 0 .../{ => gen_5}/stunfisk/galarian/shiny.pal | 0 .../pokemon/{ => gen_5}/stunfisk/icon.png | Bin .../pokemon/{ => gen_5}/stunfisk/normal.pal | 0 .../pokemon/{ => gen_5}/stunfisk/shiny.pal | 0 .../{ => gen_5}/swadloon/anim_front.png | Bin .../pokemon/{ => gen_5}/swadloon/back.png | Bin .../{phione => gen_5/swadloon}/footprint.png | Bin .../pokemon/{ => gen_5}/swadloon/icon.png | Bin .../pokemon/{ => gen_5}/swadloon/normal.pal | 0 .../pokemon/{ => gen_5}/swadloon/shiny.pal | 0 .../pokemon/{ => gen_5}/swanna/anim_front.png | Bin graphics/pokemon/{ => gen_5}/swanna/back.png | Bin .../pokemon/{ => gen_5}/swanna/footprint.png | Bin graphics/pokemon/{ => gen_5}/swanna/icon.png | Bin .../pokemon/{ => gen_5}/swanna/normal.pal | 0 graphics/pokemon/{ => gen_5}/swanna/shiny.pal | 0 .../{ => gen_5}/swoobat/anim_front.png | Bin graphics/pokemon/{ => gen_5}/swoobat/back.png | Bin .../pokemon/{ => gen_5}/swoobat/footprint.png | Bin graphics/pokemon/{ => gen_5}/swoobat/icon.png | Bin .../pokemon/{ => gen_5}/swoobat/normal.pal | 0 .../pokemon/{ => gen_5}/swoobat/shiny.pal | 0 .../pokemon/{ => gen_5}/tepig/anim_front.png | Bin graphics/pokemon/{ => gen_5}/tepig/back.png | Bin .../pokemon/{ => gen_5}/tepig/footprint.png | Bin graphics/pokemon/{ => gen_5}/tepig/icon.png | Bin graphics/pokemon/{ => gen_5}/tepig/normal.pal | 0 graphics/pokemon/{ => gen_5}/tepig/shiny.pal | 0 .../{ => gen_5}/terrakion/anim_front.png | Bin .../pokemon/{ => gen_5}/terrakion/back.png | Bin .../{ => gen_5}/terrakion/footprint.png | Bin .../pokemon/{ => gen_5}/terrakion/icon.png | Bin .../pokemon/{ => gen_5}/terrakion/normal.pal | 0 .../pokemon/{ => gen_5}/terrakion/shiny.pal | 0 .../pokemon/{ => gen_5}/throh/anim_front.png | Bin graphics/pokemon/{ => gen_5}/throh/back.png | Bin .../pokemon/{ => gen_5}/throh/footprint.png | Bin graphics/pokemon/{ => gen_5}/throh/icon.png | Bin graphics/pokemon/{ => gen_5}/throh/normal.pal | 0 graphics/pokemon/{ => gen_5}/throh/shiny.pal | 0 .../{ => gen_5}/thundurus/anim_front.png | Bin .../pokemon/{ => gen_5}/thundurus/back.png | Bin .../{pineco => gen_5/thundurus}/footprint.png | Bin .../pokemon/{ => gen_5}/thundurus/icon.png | Bin .../pokemon/{ => gen_5}/thundurus/normal.pal | 0 .../pokemon/{ => gen_5}/thundurus/shiny.pal | 0 .../thundurus/therian/anim_front.png | Bin .../{ => gen_5}/thundurus/therian/back.png | Bin .../{ => gen_5}/thundurus/therian/icon.png | Bin .../{ => gen_5}/thundurus/therian/normal.pal | 0 .../{ => gen_5}/thundurus/therian/shiny.pal | 0 .../{ => gen_5}/timburr/anim_front.png | Bin graphics/pokemon/{ => gen_5}/timburr/back.png | Bin .../pokemon/{ => gen_5}/timburr/footprint.png | Bin graphics/pokemon/{ => gen_5}/timburr/icon.png | Bin .../pokemon/{ => gen_5}/timburr/normal.pal | 0 .../pokemon/{ => gen_5}/timburr/shiny.pal | 0 .../{ => gen_5}/tirtouga/anim_front.png | Bin .../pokemon/{ => gen_5}/tirtouga/back.png | Bin .../{popplio => gen_5/tirtouga}/footprint.png | Bin .../pokemon/{ => gen_5}/tirtouga/icon.png | Bin .../pokemon/{ => gen_5}/tirtouga/normal.pal | 0 .../pokemon/{ => gen_5}/tirtouga/shiny.pal | 0 .../{ => gen_5}/tornadus/anim_front.png | Bin .../pokemon/{ => gen_5}/tornadus/back.png | Bin .../tornadus}/footprint.png | Bin .../pokemon/{ => gen_5}/tornadus/icon.png | Bin .../pokemon/{ => gen_5}/tornadus/normal.pal | 0 .../pokemon/{ => gen_5}/tornadus/shiny.pal | 0 .../tornadus/therian/anim_front.png | Bin .../{ => gen_5}/tornadus/therian/back.png | Bin .../{ => gen_5}/tornadus/therian/icon.png | Bin .../{ => gen_5}/tornadus/therian/normal.pal | 0 .../{ => gen_5}/tornadus/therian/shiny.pal | 0 .../{ => gen_5}/tranquill/anim_front.png | Bin .../pokemon/{ => gen_5}/tranquill/back.png | Bin .../{ => gen_5}/tranquill/footprint.png | Bin .../pokemon/{ => gen_5}/tranquill/icon.png | Bin .../pokemon/{ => gen_5}/tranquill/normal.pal | 0 .../pokemon/{ => gen_5}/tranquill/shiny.pal | 0 .../{ => gen_5}/trubbish/anim_front.png | Bin .../pokemon/{ => gen_5}/trubbish/back.png | Bin .../{ => gen_5}/trubbish/footprint.png | Bin .../pokemon/{ => gen_5}/trubbish/icon.png | Bin .../pokemon/{ => gen_5}/trubbish/normal.pal | 0 .../pokemon/{ => gen_5}/trubbish/shiny.pal | 0 .../{ => gen_5}/tympole/anim_front.png | Bin graphics/pokemon/{ => gen_5}/tympole/back.png | Bin .../{pupitar => gen_5/tympole}/footprint.png | Bin graphics/pokemon/{ => gen_5}/tympole/icon.png | Bin .../pokemon/{ => gen_5}/tympole/normal.pal | 0 .../pokemon/{ => gen_5}/tympole/shiny.pal | 0 .../pokemon/{ => gen_5}/tynamo/anim_front.png | Bin graphics/pokemon/{ => gen_5}/tynamo/back.png | Bin .../{pyukumuku => gen_5/tynamo}/footprint.png | Bin graphics/pokemon/{ => gen_5}/tynamo/icon.png | Bin .../pokemon/{ => gen_5}/tynamo/normal.pal | 0 graphics/pokemon/{ => gen_5}/tynamo/shiny.pal | 0 .../{ => gen_5}/unfezant/anim_front.png | Bin .../{ => gen_5}/unfezant/anim_frontf.png | Bin .../pokemon/{ => gen_5}/unfezant/back.png | Bin .../pokemon/{ => gen_5}/unfezant/backf.png | Bin .../{ => gen_5}/unfezant/footprint.png | Bin .../pokemon/{ => gen_5}/unfezant/frontf.png | Bin .../pokemon/{ => gen_5}/unfezant/icon.png | Bin .../pokemon/{ => gen_5}/unfezant/iconf.png | Bin .../pokemon/{ => gen_5}/unfezant/normal.pal | 0 .../pokemon/{ => gen_5}/unfezant/normalf.pal | 0 .../pokemon/{ => gen_5}/unfezant/shiny.pal | 0 .../pokemon/{ => gen_5}/unfezant/shinyf.pal | 0 .../{ => gen_5}/vanillish/anim_front.png | Bin .../pokemon/{ => gen_5}/vanillish/back.png | Bin .../vanillish}/footprint.png | Bin .../pokemon/{ => gen_5}/vanillish/icon.png | Bin .../pokemon/{ => gen_5}/vanillish/normal.pal | 0 .../pokemon/{ => gen_5}/vanillish/shiny.pal | 0 .../{ => gen_5}/vanillite/anim_front.png | Bin .../pokemon/{ => gen_5}/vanillite/back.png | Bin .../vanillite}/footprint.png | Bin .../pokemon/{ => gen_5}/vanillite/icon.png | Bin .../pokemon/{ => gen_5}/vanillite/normal.pal | 0 .../pokemon/{ => gen_5}/vanillite/shiny.pal | 0 .../{ => gen_5}/vanilluxe/anim_front.png | Bin .../pokemon/{ => gen_5}/vanilluxe/back.png | Bin .../vanilluxe}/footprint.png | Bin .../pokemon/{ => gen_5}/vanilluxe/icon.png | Bin .../pokemon/{ => gen_5}/vanilluxe/normal.pal | 0 .../pokemon/{ => gen_5}/vanilluxe/shiny.pal | 0 .../{ => gen_5}/venipede/anim_front.png | Bin .../pokemon/{ => gen_5}/venipede/back.png | Bin .../{gothita => gen_5/venipede}/footprint.png | Bin .../pokemon/{ => gen_5}/venipede/icon.png | Bin .../pokemon/{ => gen_5}/venipede/normal.pal | 0 .../pokemon/{ => gen_5}/venipede/shiny.pal | 0 .../{ => gen_5}/victini/anim_front.png | Bin graphics/pokemon/{ => gen_5}/victini/back.png | Bin .../pokemon/{ => gen_5}/victini/footprint.png | Bin graphics/pokemon/{ => gen_5}/victini/icon.png | Bin .../pokemon/{ => gen_5}/victini/normal.pal | 0 .../pokemon/{ => gen_5}/victini/shiny.pal | 0 .../{ => gen_5}/virizion/anim_front.png | Bin .../pokemon/{ => gen_5}/virizion/back.png | Bin .../{ => gen_5}/virizion/footprint.png | Bin .../pokemon/{ => gen_5}/virizion/icon.png | Bin .../pokemon/{ => gen_5}/virizion/normal.pal | 0 .../pokemon/{ => gen_5}/virizion/shiny.pal | 0 .../{ => gen_5}/volcarona/anim_front.png | Bin .../pokemon/{ => gen_5}/volcarona/back.png | Bin .../volcarona}/footprint.png | Bin .../pokemon/{ => gen_5}/volcarona/icon.png | Bin .../pokemon/{ => gen_5}/volcarona/normal.pal | 0 .../pokemon/{ => gen_5}/volcarona/shiny.pal | 0 .../{ => gen_5}/vullaby/anim_front.png | Bin graphics/pokemon/{ => gen_5}/vullaby/back.png | Bin .../pokemon/{ => gen_5}/vullaby/footprint.png | Bin graphics/pokemon/{ => gen_5}/vullaby/icon.png | Bin .../pokemon/{ => gen_5}/vullaby/normal.pal | 0 .../pokemon/{ => gen_5}/vullaby/shiny.pal | 0 .../{ => gen_5}/watchog/anim_front.png | Bin graphics/pokemon/{ => gen_5}/watchog/back.png | Bin .../pokemon/{ => gen_5}/watchog/footprint.png | Bin graphics/pokemon/{ => gen_5}/watchog/icon.png | Bin .../pokemon/{ => gen_5}/watchog/normal.pal | 0 .../pokemon/{ => gen_5}/watchog/shiny.pal | 0 .../{ => gen_5}/whimsicott/anim_front.png | Bin .../pokemon/{ => gen_5}/whimsicott/back.png | Bin .../whimsicott}/footprint.png | Bin .../pokemon/{ => gen_5}/whimsicott/icon.png | Bin .../pokemon/{ => gen_5}/whimsicott/normal.pal | 0 .../pokemon/{ => gen_5}/whimsicott/shiny.pal | 0 .../{ => gen_5}/whirlipede/anim_front.png | Bin .../pokemon/{ => gen_5}/whirlipede/back.png | Bin .../whirlipede}/footprint.png | Bin .../pokemon/{ => gen_5}/whirlipede/icon.png | Bin .../pokemon/{ => gen_5}/whirlipede/normal.pal | 0 .../pokemon/{ => gen_5}/whirlipede/shiny.pal | 0 .../pokemon/{ => gen_5}/woobat/anim_front.png | Bin graphics/pokemon/{ => gen_5}/woobat/back.png | Bin .../normal => gen_5/woobat}/footprint.png | Bin graphics/pokemon/{ => gen_5}/woobat/icon.png | Bin .../pokemon/{ => gen_5}/woobat/normal.pal | 0 graphics/pokemon/{ => gen_5}/woobat/shiny.pal | 0 .../pokemon/{ => gen_5}/yamask/anim_front.png | Bin graphics/pokemon/{ => gen_5}/yamask/back.png | Bin .../{runerigus => gen_5/yamask}/footprint.png | Bin .../{ => gen_5}/yamask/galarian/back.png | Bin .../{ => gen_5}/yamask/galarian/front.png | Bin .../{ => gen_5}/yamask/galarian/icon.png | Bin .../{ => gen_5}/yamask/galarian/normal.pal | 0 .../{ => gen_5}/yamask/galarian/shiny.pal | 0 graphics/pokemon/{ => gen_5}/yamask/icon.png | Bin .../pokemon/{ => gen_5}/yamask/normal.pal | 0 graphics/pokemon/{ => gen_5}/yamask/shiny.pal | 0 .../{ => gen_5}/zebstrika/anim_front.png | Bin .../pokemon/{ => gen_5}/zebstrika/back.png | Bin .../{ => gen_5}/zebstrika/footprint.png | Bin .../pokemon/{ => gen_5}/zebstrika/icon.png | Bin .../pokemon/{ => gen_5}/zebstrika/normal.pal | 0 .../pokemon/{ => gen_5}/zebstrika/shiny.pal | 0 .../pokemon/{ => gen_5}/zekrom/anim_front.png | Bin graphics/pokemon/{ => gen_5}/zekrom/back.png | Bin .../pokemon/{ => gen_5}/zekrom/footprint.png | Bin graphics/pokemon/{ => gen_5}/zekrom/icon.png | Bin .../pokemon/{ => gen_5}/zekrom/normal.pal | 0 graphics/pokemon/{ => gen_5}/zekrom/shiny.pal | 0 .../{ => gen_5}/zoroark/anim_front.png | Bin graphics/pokemon/{ => gen_5}/zoroark/back.png | Bin .../pokemon/{ => gen_5}/zoroark/footprint.png | Bin .../{ => gen_5}/zoroark/hisuian/back.png | Bin .../{ => gen_5}/zoroark/hisuian/front.png | Bin .../{ => gen_5}/zoroark/hisuian/icon.png | Bin .../{ => gen_5}/zoroark/hisuian/normal.pal | 0 .../{ => gen_5}/zoroark/hisuian/shiny.pal | 0 graphics/pokemon/{ => gen_5}/zoroark/icon.png | Bin .../pokemon/{ => gen_5}/zoroark/normal.pal | 0 .../pokemon/{ => gen_5}/zoroark/shiny.pal | 0 .../pokemon/{ => gen_5}/zorua/anim_front.png | Bin graphics/pokemon/{ => gen_5}/zorua/back.png | Bin .../{goodra => gen_5/zorua}/footprint.png | Bin .../{ => gen_5}/zorua/hisuian/back.png | Bin .../{ => gen_5}/zorua/hisuian/front.png | Bin .../{ => gen_5}/zorua/hisuian/icon.png | Bin .../{ => gen_5}/zorua/hisuian/normal.pal | 0 .../{ => gen_5}/zorua/hisuian/shiny.pal | 0 graphics/pokemon/{ => gen_5}/zorua/icon.png | Bin graphics/pokemon/{ => gen_5}/zorua/normal.pal | 0 graphics/pokemon/{ => gen_5}/zorua/shiny.pal | 0 .../{ => gen_5}/zweilous/anim_front.png | Bin .../pokemon/{ => gen_5}/zweilous/back.png | Bin .../{ => gen_5}/zweilous/footprint.png | Bin .../pokemon/{ => gen_5}/zweilous/icon.png | Bin .../pokemon/{ => gen_5}/zweilous/normal.pal | 0 .../pokemon/{ => gen_5}/zweilous/shiny.pal | 0 .../{ => gen_6}/aegislash/anim_front.png | Bin .../pokemon/{ => gen_6}/aegislash/back.png | Bin .../aegislash/blade/anim_front.png | Bin .../{ => gen_6}/aegislash/blade/back.png | Bin .../{ => gen_6}/aegislash/blade/icon.png | Bin .../{ => gen_6}/aegislash/blade/normal.pal | 0 .../{ => gen_6}/aegislash/blade/shiny.pal | 0 .../aegislash}/footprint.png | Bin .../pokemon/{ => gen_6}/aegislash/icon.png | Bin .../pokemon/{ => gen_6}/aegislash/normal.pal | 0 .../pokemon/{ => gen_6}/aegislash/shiny.pal | 0 .../pokemon/{ => gen_6}/amaura/anim_front.png | Bin graphics/pokemon/{ => gen_6}/amaura/back.png | Bin .../{shuckle => gen_6/amaura}/footprint.png | Bin graphics/pokemon/{ => gen_6}/amaura/icon.png | Bin .../pokemon/{ => gen_6}/amaura/normal.pal | 0 graphics/pokemon/{ => gen_6}/amaura/shiny.pal | 0 .../{ => gen_6}/aromatisse/anim_front.png | Bin .../pokemon/{ => gen_6}/aromatisse/back.png | Bin .../aromatisse}/footprint.png | Bin .../pokemon/{ => gen_6}/aromatisse/icon.png | Bin .../pokemon/{ => gen_6}/aromatisse/normal.pal | 0 .../pokemon/{ => gen_6}/aromatisse/shiny.pal | 0 .../{ => gen_6}/aurorus/anim_front.png | Bin graphics/pokemon/{ => gen_6}/aurorus/back.png | Bin .../pokemon/{ => gen_6}/aurorus/footprint.png | Bin graphics/pokemon/{ => gen_6}/aurorus/icon.png | Bin .../pokemon/{ => gen_6}/aurorus/normal.pal | 0 .../pokemon/{ => gen_6}/aurorus/shiny.pal | 0 .../{ => gen_6}/avalugg/anim_front.png | Bin graphics/pokemon/{ => gen_6}/avalugg/back.png | Bin .../pokemon/{ => gen_6}/avalugg/footprint.png | Bin .../{ => gen_6}/avalugg/hisuian/back.png | Bin .../{ => gen_6}/avalugg/hisuian/front.png | Bin .../{ => gen_6}/avalugg/hisuian/icon.png | Bin .../{ => gen_6}/avalugg/hisuian/normal.pal | 0 .../{ => gen_6}/avalugg/hisuian/shiny.pal | 0 graphics/pokemon/{ => gen_6}/avalugg/icon.png | Bin .../pokemon/{ => gen_6}/avalugg/normal.pal | 0 .../pokemon/{ => gen_6}/avalugg/shiny.pal | 0 .../{ => gen_6}/barbaracle/anim_front.png | Bin .../pokemon/{ => gen_6}/barbaracle/back.png | Bin .../{ => gen_6}/barbaracle/footprint.png | Bin .../pokemon/{ => gen_6}/barbaracle/icon.png | Bin .../pokemon/{ => gen_6}/barbaracle/normal.pal | 0 .../pokemon/{ => gen_6}/barbaracle/shiny.pal | 0 .../{ => gen_6}/bergmite/anim_front.png | Bin .../pokemon/{ => gen_6}/bergmite/back.png | Bin .../bergmite}/footprint.png | Bin .../pokemon/{ => gen_6}/bergmite/icon.png | Bin .../pokemon/{ => gen_6}/bergmite/normal.pal | 0 .../pokemon/{ => gen_6}/bergmite/shiny.pal | 0 .../{ => gen_6}/binacle/anim_front.png | Bin graphics/pokemon/{ => gen_6}/binacle/back.png | Bin .../binacle}/footprint.png | Bin graphics/pokemon/{ => gen_6}/binacle/icon.png | Bin .../pokemon/{ => gen_6}/binacle/normal.pal | 0 .../pokemon/{ => gen_6}/binacle/shiny.pal | 0 .../{ => gen_6}/braixen/anim_front.png | Bin graphics/pokemon/{ => gen_6}/braixen/back.png | Bin .../pokemon/{ => gen_6}/braixen/footprint.png | Bin graphics/pokemon/{ => gen_6}/braixen/icon.png | Bin .../pokemon/{ => gen_6}/braixen/normal.pal | 0 .../pokemon/{ => gen_6}/braixen/shiny.pal | 0 .../{ => gen_6}/bunnelby/anim_front.png | Bin .../pokemon/{ => gen_6}/bunnelby/back.png | Bin .../{scraggy => gen_6/bunnelby}/footprint.png | Bin .../pokemon/{ => gen_6}/bunnelby/icon.png | Bin .../pokemon/{ => gen_6}/bunnelby/normal.pal | 0 .../pokemon/{ => gen_6}/bunnelby/shiny.pal | 0 .../{ => gen_6}/carbink/anim_front.png | Bin graphics/pokemon/{ => gen_6}/carbink/back.png | Bin .../{seadra => gen_6/carbink}/footprint.png | Bin graphics/pokemon/{ => gen_6}/carbink/icon.png | Bin .../pokemon/{ => gen_6}/carbink/normal.pal | 0 .../pokemon/{ => gen_6}/carbink/shiny.pal | 0 .../{ => gen_6}/chesnaught/anim_front.png | Bin .../pokemon/{ => gen_6}/chesnaught/back.png | Bin .../{ => gen_6}/chesnaught/footprint.png | Bin .../pokemon/{ => gen_6}/chesnaught/icon.png | Bin .../pokemon/{ => gen_6}/chesnaught/normal.pal | 0 .../pokemon/{ => gen_6}/chesnaught/shiny.pal | 0 .../{ => gen_6}/chespin/anim_front.png | Bin graphics/pokemon/{ => gen_6}/chespin/back.png | Bin .../pokemon/{ => gen_6}/chespin/footprint.png | Bin graphics/pokemon/{ => gen_6}/chespin/icon.png | Bin .../pokemon/{ => gen_6}/chespin/normal.pal | 0 .../pokemon/{ => gen_6}/chespin/shiny.pal | 0 .../{ => gen_6}/clauncher/anim_front.png | Bin .../pokemon/{ => gen_6}/clauncher/back.png | Bin .../clauncher}/footprint.png | Bin .../pokemon/{ => gen_6}/clauncher/icon.png | Bin .../pokemon/{ => gen_6}/clauncher/normal.pal | 0 .../pokemon/{ => gen_6}/clauncher/shiny.pal | 0 .../{ => gen_6}/clawitzer/anim_front.png | Bin .../pokemon/{ => gen_6}/clawitzer/back.png | Bin .../clawitzer}/footprint.png | Bin .../pokemon/{ => gen_6}/clawitzer/icon.png | Bin .../pokemon/{ => gen_6}/clawitzer/normal.pal | 0 .../pokemon/{ => gen_6}/clawitzer/shiny.pal | 0 .../{ => gen_6}/dedenne/anim_front.png | Bin graphics/pokemon/{ => gen_6}/dedenne/back.png | Bin .../pokemon/{ => gen_6}/dedenne/footprint.png | Bin graphics/pokemon/{ => gen_6}/dedenne/icon.png | Bin .../pokemon/{ => gen_6}/dedenne/normal.pal | 0 .../pokemon/{ => gen_6}/dedenne/shiny.pal | 0 .../{ => gen_6}/delphox/anim_front.png | Bin graphics/pokemon/{ => gen_6}/delphox/back.png | Bin .../pokemon/{ => gen_6}/delphox/footprint.png | Bin graphics/pokemon/{ => gen_6}/delphox/icon.png | Bin .../pokemon/{ => gen_6}/delphox/normal.pal | 0 .../pokemon/{ => gen_6}/delphox/shiny.pal | 0 .../{ => gen_6}/diancie/anim_front.png | Bin graphics/pokemon/{ => gen_6}/diancie/back.png | Bin .../{sealeo => gen_6/diancie}/footprint.png | Bin graphics/pokemon/{ => gen_6}/diancie/icon.png | Bin .../pokemon/{ => gen_6}/diancie/mega/back.png | Bin .../{ => gen_6}/diancie/mega/front.png | Bin .../pokemon/{ => gen_6}/diancie/mega/icon.png | Bin .../{ => gen_6}/diancie/mega/normal.pal | 0 .../{ => gen_6}/diancie/mega/shiny.pal | 0 .../pokemon/{ => gen_6}/diancie/normal.pal | 0 .../pokemon/{ => gen_6}/diancie/shiny.pal | 0 .../{ => gen_6}/diggersby/anim_front.png | Bin .../pokemon/{ => gen_6}/diggersby/back.png | Bin .../{ => gen_6}/diggersby/footprint.png | Bin .../pokemon/{ => gen_6}/diggersby/icon.png | Bin .../pokemon/{ => gen_6}/diggersby/normal.pal | 0 .../pokemon/{ => gen_6}/diggersby/shiny.pal | 0 .../{ => gen_6}/doublade/anim_front.png | Bin .../pokemon/{ => gen_6}/doublade/back.png | Bin .../{seel => gen_6/doublade}/footprint.png | Bin .../pokemon/{ => gen_6}/doublade/icon.png | Bin .../pokemon/{ => gen_6}/doublade/normal.pal | 0 .../pokemon/{ => gen_6}/doublade/shiny.pal | 0 .../{ => gen_6}/dragalge/anim_front.png | Bin .../pokemon/{ => gen_6}/dragalge/back.png | Bin .../dragalge}/footprint.png | Bin .../pokemon/{ => gen_6}/dragalge/icon.png | Bin .../pokemon/{ => gen_6}/dragalge/normal.pal | 0 .../pokemon/{ => gen_6}/dragalge/shiny.pal | 0 .../pokemon/{ => gen_6}/espurr/anim_front.png | Bin graphics/pokemon/{ => gen_6}/espurr/back.png | Bin .../{ralts => gen_6/espurr}/footprint.png | Bin graphics/pokemon/{ => gen_6}/espurr/icon.png | Bin .../pokemon/{ => gen_6}/espurr/normal.pal | 0 graphics/pokemon/{ => gen_6}/espurr/shiny.pal | 0 .../{ => gen_6}/fennekin/anim_front.png | Bin .../pokemon/{ => gen_6}/fennekin/back.png | Bin .../{joltik => gen_6/fennekin}/footprint.png | Bin .../pokemon/{ => gen_6}/fennekin/icon.png | Bin .../pokemon/{ => gen_6}/fennekin/normal.pal | 0 .../pokemon/{ => gen_6}/fennekin/shiny.pal | 0 .../{ => gen_6}/flabebe/anim_front.png | Bin graphics/pokemon/{ => gen_6}/flabebe/back.png | Bin .../{ => gen_6}/flabebe/blue_flower/icon.png | Bin .../flabebe/blue_flower/normal.pal | 0 .../{ => gen_6}/flabebe/blue_flower/shiny.pal | 0 .../{seviper => gen_6/flabebe}/footprint.png | Bin graphics/pokemon/{ => gen_6}/flabebe/icon.png | Bin .../pokemon/{ => gen_6}/flabebe/normal.pal | 0 .../flabebe/orange_flower/icon.png | Bin .../flabebe/orange_flower/normal.pal | 0 .../flabebe/orange_flower/shiny.pal | 0 .../pokemon/{ => gen_6}/flabebe/shiny.pal | 0 .../{ => gen_6}/flabebe/white_flower/icon.png | Bin .../flabebe/white_flower/normal.pal | 0 .../flabebe/white_flower/shiny.pal | 0 .../flabebe/yellow_flower/icon.png | Bin .../flabebe/yellow_flower/normal.pal | 0 .../flabebe/yellow_flower/shiny.pal | 0 .../{ => gen_6}/fletchinder/anim_front.png | Bin .../pokemon/{ => gen_6}/fletchinder/back.png | Bin .../{ => gen_6}/fletchinder/footprint.png | Bin .../pokemon/{ => gen_6}/fletchinder/icon.png | Bin .../{ => gen_6}/fletchinder/normal.pal | 0 .../pokemon/{ => gen_6}/fletchinder/shiny.pal | 0 .../{ => gen_6}/fletchling/anim_front.png | Bin .../pokemon/{ => gen_6}/fletchling/back.png | Bin .../{ => gen_6}/fletchling/footprint.png | Bin .../pokemon/{ => gen_6}/fletchling/icon.png | Bin .../pokemon/{ => gen_6}/fletchling/normal.pal | 0 .../pokemon/{ => gen_6}/fletchling/shiny.pal | 0 .../{ => gen_6}/floette/anim_front.png | Bin graphics/pokemon/{ => gen_6}/floette/back.png | Bin .../{ => gen_6}/floette/blue_flower/icon.png | Bin .../floette/blue_flower/normal.pal | 0 .../{ => gen_6}/floette/blue_flower/shiny.pal | 0 .../floette/eternal_flower/anim_front.png | Bin .../floette/eternal_flower/back.png | Bin .../floette/eternal_flower/icon.png | Bin .../floette/eternal_flower/normal.pal | 0 .../floette/eternal_flower/shiny.pal | 0 .../{sharpedo => gen_6/floette}/footprint.png | Bin graphics/pokemon/{ => gen_6}/floette/icon.png | Bin .../pokemon/{ => gen_6}/floette/normal.pal | 0 .../floette/orange_flower/icon.png | Bin .../floette/orange_flower/normal.pal | 0 .../floette/orange_flower/shiny.pal | 0 .../pokemon/{ => gen_6}/floette/shiny.pal | 0 .../{ => gen_6}/floette/white_flower/icon.png | Bin .../floette/white_flower/normal.pal | 0 .../floette/white_flower/shiny.pal | 0 .../floette/yellow_flower/icon.png | Bin .../floette/yellow_flower/normal.pal | 0 .../floette/yellow_flower/shiny.pal | 0 .../{ => gen_6}/florges/anim_front.png | Bin graphics/pokemon/{ => gen_6}/florges/back.png | Bin .../{ => gen_6}/florges/blue_flower/icon.png | Bin .../florges/blue_flower/normal.pal | 0 .../{ => gen_6}/florges/blue_flower/shiny.pal | 0 .../{shellder => gen_6/florges}/footprint.png | Bin graphics/pokemon/{ => gen_6}/florges/icon.png | Bin .../pokemon/{ => gen_6}/florges/normal.pal | 0 .../florges/orange_flower/icon.png | Bin .../florges/orange_flower/normal.pal | 0 .../florges/orange_flower/shiny.pal | 0 .../pokemon/{ => gen_6}/florges/shiny.pal | 0 .../{ => gen_6}/florges/white_flower/icon.png | Bin .../florges/white_flower/normal.pal | 0 .../florges/white_flower/shiny.pal | 0 .../florges/yellow_flower/icon.png | Bin .../florges/yellow_flower/normal.pal | 0 .../florges/yellow_flower/shiny.pal | 0 .../{ => gen_6}/froakie/anim_front.png | Bin graphics/pokemon/{ => gen_6}/froakie/back.png | Bin .../pokemon/{ => gen_6}/froakie/footprint.png | Bin graphics/pokemon/{ => gen_6}/froakie/icon.png | Bin .../pokemon/{ => gen_6}/froakie/normal.pal | 0 .../pokemon/{ => gen_6}/froakie/shiny.pal | 0 .../{ => gen_6}/frogadier/anim_front.png | Bin .../pokemon/{ => gen_6}/frogadier/back.png | Bin .../{ => gen_6}/frogadier/footprint.png | Bin .../pokemon/{ => gen_6}/frogadier/icon.png | Bin .../pokemon/{ => gen_6}/frogadier/normal.pal | 0 .../pokemon/{ => gen_6}/frogadier/shiny.pal | 0 .../{ => gen_6}/furfrou/anim_front.png | Bin graphics/pokemon/{ => gen_6}/furfrou/back.png | Bin .../furfrou/dandy_trim/anim_front.png | Bin .../{ => gen_6}/furfrou/dandy_trim/back.png | Bin .../{ => gen_6}/furfrou/dandy_trim/icon.png | Bin .../{ => gen_6}/furfrou/dandy_trim/normal.pal | 0 .../{ => gen_6}/furfrou/dandy_trim/shiny.pal | 0 .../furfrou/debutante_trim/anim_front.png | Bin .../furfrou/debutante_trim/back.png | Bin .../furfrou/debutante_trim/icon.png | Bin .../furfrou/debutante_trim/normal.pal | 0 .../furfrou/debutante_trim/shiny.pal | 0 .../furfrou/diamond_trim/anim_front.png | Bin .../{ => gen_6}/furfrou/diamond_trim/back.png | Bin .../{ => gen_6}/furfrou/diamond_trim/icon.png | Bin .../furfrou/diamond_trim/normal.pal | 0 .../furfrou/diamond_trim/shiny.pal | 0 .../furfrou}/footprint.png | Bin .../furfrou/heart_trim/anim_front.png | Bin .../{ => gen_6}/furfrou/heart_trim/back.png | Bin .../{ => gen_6}/furfrou/heart_trim/icon.png | Bin .../{ => gen_6}/furfrou/heart_trim/normal.pal | 0 .../{ => gen_6}/furfrou/heart_trim/shiny.pal | 0 graphics/pokemon/{ => gen_6}/furfrou/icon.png | Bin .../furfrou/kabuki_trim/anim_front.png | Bin .../{ => gen_6}/furfrou/kabuki_trim/back.png | Bin .../{ => gen_6}/furfrou/kabuki_trim/icon.png | Bin .../furfrou/kabuki_trim/normal.pal | 0 .../{ => gen_6}/furfrou/kabuki_trim/shiny.pal | 0 .../furfrou/la_reine_trim/anim_front.png | Bin .../furfrou/la_reine_trim/back.png | Bin .../furfrou/la_reine_trim/icon.png | Bin .../furfrou/la_reine_trim/normal.pal | 0 .../furfrou/la_reine_trim/shiny.pal | 0 .../furfrou/matron_trim/anim_front.png | Bin .../{ => gen_6}/furfrou/matron_trim/back.png | Bin .../{ => gen_6}/furfrou/matron_trim/icon.png | Bin .../furfrou/matron_trim/normal.pal | 0 .../{ => gen_6}/furfrou/matron_trim/shiny.pal | 0 .../pokemon/{ => gen_6}/furfrou/normal.pal | 0 .../furfrou/pharaoh_trim/anim_front.png | Bin .../{ => gen_6}/furfrou/pharaoh_trim/back.png | Bin .../{ => gen_6}/furfrou/pharaoh_trim/icon.png | Bin .../furfrou/pharaoh_trim/normal.pal | 0 .../furfrou/pharaoh_trim/shiny.pal | 0 .../pokemon/{ => gen_6}/furfrou/shiny.pal | 0 .../furfrou/star_trim/anim_front.png | Bin .../{ => gen_6}/furfrou/star_trim/back.png | Bin .../{ => gen_6}/furfrou/star_trim/icon.png | Bin .../{ => gen_6}/furfrou/star_trim/normal.pal | 0 .../{ => gen_6}/furfrou/star_trim/shiny.pal | 0 .../pokemon/{ => gen_6}/gogoat/anim_front.png | Bin graphics/pokemon/{ => gen_6}/gogoat/back.png | Bin .../pokemon/{ => gen_6}/gogoat/footprint.png | Bin graphics/pokemon/{ => gen_6}/gogoat/icon.png | Bin .../pokemon/{ => gen_6}/gogoat/normal.pal | 0 graphics/pokemon/{ => gen_6}/gogoat/shiny.pal | 0 .../pokemon/{ => gen_6}/goodra/anim_front.png | Bin graphics/pokemon/{ => gen_6}/goodra/back.png | Bin .../{zorua => gen_6/goodra}/footprint.png | Bin .../{ => gen_6}/goodra/hisuian/back.png | Bin .../{ => gen_6}/goodra/hisuian/front.png | Bin .../{ => gen_6}/goodra/hisuian/icon.png | Bin .../{ => gen_6}/goodra/hisuian/normal.pal | 0 .../{ => gen_6}/goodra/hisuian/shiny.pal | 0 graphics/pokemon/{ => gen_6}/goodra/icon.png | Bin .../pokemon/{ => gen_6}/goodra/normal.pal | 0 graphics/pokemon/{ => gen_6}/goodra/shiny.pal | 0 .../pokemon/{ => gen_6}/goomy/anim_front.png | Bin graphics/pokemon/{ => gen_6}/goomy/back.png | Bin .../{shuppet => gen_6/goomy}/footprint.png | Bin graphics/pokemon/{ => gen_6}/goomy/icon.png | Bin graphics/pokemon/{ => gen_6}/goomy/normal.pal | 0 graphics/pokemon/{ => gen_6}/goomy/shiny.pal | 0 .../{ => gen_6}/gourgeist/anim_front.png | Bin .../pokemon/{ => gen_6}/gourgeist/back.png | Bin .../{regice => gen_6/gourgeist}/footprint.png | Bin .../pokemon/{ => gen_6}/gourgeist/icon.png | Bin .../gourgeist/large/anim_front.png | Bin .../{ => gen_6}/gourgeist/large/back.png | Bin .../pokemon/{ => gen_6}/gourgeist/normal.pal | 0 .../pokemon/{ => gen_6}/gourgeist/shiny.pal | 0 .../gourgeist/small/anim_front.png | Bin .../{ => gen_6}/gourgeist/small/back.png | Bin .../gourgeist/super/anim_front.png | Bin .../{ => gen_6}/gourgeist/super/back.png | Bin .../{ => gen_6}/greninja/anim_front.png | Bin .../{ => gen_6}/greninja/ash/anim_front.png | Bin .../pokemon/{ => gen_6}/greninja/ash/back.png | Bin .../pokemon/{ => gen_6}/greninja/ash/icon.png | Bin .../{ => gen_6}/greninja/ash/normal.pal | 0 .../{ => gen_6}/greninja/ash/shiny.pal | 0 .../pokemon/{ => gen_6}/greninja/back.png | Bin .../{ => gen_6}/greninja/footprint.png | Bin .../pokemon/{ => gen_6}/greninja/icon.png | Bin .../pokemon/{ => gen_6}/greninja/normal.pal | 0 .../pokemon/{ => gen_6}/greninja/shiny.pal | 0 .../{ => gen_6}/hawlucha/anim_front.png | Bin .../pokemon/{ => gen_6}/hawlucha/back.png | Bin .../{ => gen_6}/hawlucha/footprint.png | Bin .../pokemon/{ => gen_6}/hawlucha/icon.png | Bin .../pokemon/{ => gen_6}/hawlucha/normal.pal | 0 .../pokemon/{ => gen_6}/hawlucha/shiny.pal | 0 .../{ => gen_6}/heliolisk/anim_front.png | Bin .../pokemon/{ => gen_6}/heliolisk/back.png | Bin .../{ => gen_6}/heliolisk/footprint.png | Bin .../pokemon/{ => gen_6}/heliolisk/icon.png | Bin .../pokemon/{ => gen_6}/heliolisk/normal.pal | 0 .../pokemon/{ => gen_6}/heliolisk/shiny.pal | 0 .../{ => gen_6}/helioptile/anim_front.png | Bin .../pokemon/{ => gen_6}/helioptile/back.png | Bin .../{ => gen_6}/helioptile/footprint.png | Bin .../pokemon/{ => gen_6}/helioptile/icon.png | Bin .../pokemon/{ => gen_6}/helioptile/normal.pal | 0 .../pokemon/{ => gen_6}/helioptile/shiny.pal | 0 .../{ => gen_6}/honedge/anim_front.png | Bin graphics/pokemon/{ => gen_6}/honedge/back.png | Bin .../{sigilyph => gen_6/honedge}/footprint.png | Bin graphics/pokemon/{ => gen_6}/honedge/icon.png | Bin .../pokemon/{ => gen_6}/honedge/normal.pal | 0 .../pokemon/{ => gen_6}/honedge/shiny.pal | 0 .../pokemon/{ => gen_6}/hoopa/anim_front.png | Bin graphics/pokemon/{ => gen_6}/hoopa/back.png | Bin .../{silcoon => gen_6/hoopa}/footprint.png | Bin graphics/pokemon/{ => gen_6}/hoopa/icon.png | Bin graphics/pokemon/{ => gen_6}/hoopa/normal.pal | 0 graphics/pokemon/{ => gen_6}/hoopa/shiny.pal | 0 .../{ => gen_6}/hoopa/unbound/anim_front.png | Bin .../{ => gen_6}/hoopa/unbound/back.png | Bin .../{ => gen_6}/hoopa/unbound/icon.png | Bin .../{ => gen_6}/hoopa/unbound/normal.pal | 0 .../{ => gen_6}/hoopa/unbound/shiny.pal | 0 .../pokemon/{ => gen_6}/inkay/anim_front.png | Bin graphics/pokemon/{ => gen_6}/inkay/back.png | Bin .../{silicobra => gen_6/inkay}/footprint.png | Bin graphics/pokemon/{ => gen_6}/inkay/icon.png | Bin graphics/pokemon/{ => gen_6}/inkay/normal.pal | 0 graphics/pokemon/{ => gen_6}/inkay/shiny.pal | 0 .../pokemon/{ => gen_6}/klefki/anim_front.png | Bin graphics/pokemon/{ => gen_6}/klefki/back.png | Bin .../{sinistea => gen_6/klefki}/footprint.png | Bin graphics/pokemon/{ => gen_6}/klefki/icon.png | Bin .../pokemon/{ => gen_6}/klefki/normal.pal | 0 graphics/pokemon/{ => gen_6}/klefki/shiny.pal | 0 .../pokemon/{ => gen_6}/litleo/anim_front.png | Bin graphics/pokemon/{ => gen_6}/litleo/back.png | Bin .../pokemon/{ => gen_6}/litleo/footprint.png | Bin graphics/pokemon/{ => gen_6}/litleo/icon.png | Bin .../pokemon/{ => gen_6}/litleo/normal.pal | 0 graphics/pokemon/{ => gen_6}/litleo/shiny.pal | 0 .../{ => gen_6}/malamar/anim_front.png | Bin graphics/pokemon/{ => gen_6}/malamar/back.png | Bin .../pokemon/{ => gen_6}/malamar/footprint.png | Bin graphics/pokemon/{ => gen_6}/malamar/icon.png | Bin .../pokemon/{ => gen_6}/malamar/normal.pal | 0 .../pokemon/{ => gen_6}/malamar/shiny.pal | 0 .../{ => gen_6}/meowstic/anim_front.png | Bin .../pokemon/{ => gen_6}/meowstic/back.png | Bin .../meowstic/female/anim_front.png | Bin .../{ => gen_6}/meowstic/female/back.png | Bin .../{ => gen_6}/meowstic/female/icon.png | Bin .../{ => gen_6}/meowstic/female/normal.pal | 0 .../{ => gen_6}/meowstic/female/shiny.pal | 0 .../meowstic}/footprint.png | Bin .../pokemon/{ => gen_6}/meowstic/icon.png | Bin .../pokemon/{ => gen_6}/meowstic/normal.pal | 0 .../pokemon/{ => gen_6}/meowstic/shiny.pal | 0 .../pokemon/{ => gen_6}/noibat/anim_front.png | Bin graphics/pokemon/{ => gen_6}/noibat/back.png | Bin .../pokemon/{ => gen_6}/noibat/footprint.png | Bin graphics/pokemon/{ => gen_6}/noibat/icon.png | Bin .../pokemon/{ => gen_6}/noibat/normal.pal | 0 graphics/pokemon/{ => gen_6}/noibat/shiny.pal | 0 .../{ => gen_6}/noivern/anim_front.png | Bin graphics/pokemon/{ => gen_6}/noivern/back.png | Bin .../pokemon/{ => gen_6}/noivern/footprint.png | Bin graphics/pokemon/{ => gen_6}/noivern/icon.png | Bin .../pokemon/{ => gen_6}/noivern/normal.pal | 0 .../pokemon/{ => gen_6}/noivern/shiny.pal | 0 .../{ => gen_6}/pancham/anim_front.png | Bin graphics/pokemon/{ => gen_6}/pancham/back.png | Bin .../pokemon/{ => gen_6}/pancham/footprint.png | Bin graphics/pokemon/{ => gen_6}/pancham/icon.png | Bin .../pokemon/{ => gen_6}/pancham/normal.pal | 0 .../pokemon/{ => gen_6}/pancham/shiny.pal | 0 .../{ => gen_6}/pangoro/anim_front.png | Bin graphics/pokemon/{ => gen_6}/pangoro/back.png | Bin .../pokemon/{ => gen_6}/pangoro/footprint.png | Bin graphics/pokemon/{ => gen_6}/pangoro/icon.png | Bin .../pokemon/{ => gen_6}/pangoro/normal.pal | 0 .../pokemon/{ => gen_6}/pangoro/shiny.pal | 0 .../{ => gen_6}/phantump/anim_front.png | Bin .../pokemon/{ => gen_6}/phantump/back.png | Bin .../{skrelp => gen_6/phantump}/footprint.png | Bin .../pokemon/{ => gen_6}/phantump/icon.png | Bin .../pokemon/{ => gen_6}/phantump/normal.pal | 0 .../pokemon/{ => gen_6}/phantump/shiny.pal | 0 .../{ => gen_6}/pumpkaboo/anim_front.png | Bin .../pokemon/{ => gen_6}/pumpkaboo/back.png | Bin .../pumpkaboo}/footprint.png | Bin .../pokemon/{ => gen_6}/pumpkaboo/icon.png | Bin .../pumpkaboo/large/anim_front.png | Bin .../{ => gen_6}/pumpkaboo/large/back.png | Bin .../pokemon/{ => gen_6}/pumpkaboo/normal.pal | 0 .../pokemon/{ => gen_6}/pumpkaboo/shiny.pal | 0 .../pumpkaboo/small/anim_front.png | Bin .../{ => gen_6}/pumpkaboo/small/back.png | Bin .../pumpkaboo/super/anim_front.png | Bin .../{ => gen_6}/pumpkaboo/super/back.png | Bin .../pokemon/{ => gen_6}/pyroar/anim_front.png | Bin .../{ => gen_6}/pyroar/anim_frontf.png | Bin graphics/pokemon/{ => gen_6}/pyroar/back.png | Bin graphics/pokemon/{ => gen_6}/pyroar/backf.png | Bin .../pokemon/{ => gen_6}/pyroar/footprint.png | Bin .../pokemon/{ => gen_6}/pyroar/frontf.png | Bin graphics/pokemon/{ => gen_6}/pyroar/icon.png | Bin graphics/pokemon/{ => gen_6}/pyroar/iconf.png | Bin .../pokemon/{ => gen_6}/pyroar/normal.pal | 0 graphics/pokemon/{ => gen_6}/pyroar/shiny.pal | 0 .../{ => gen_6}/quilladin/anim_front.png | Bin .../pokemon/{ => gen_6}/quilladin/back.png | Bin .../{ => gen_6}/quilladin/footprint.png | Bin .../pokemon/{ => gen_6}/quilladin/icon.png | Bin .../pokemon/{ => gen_6}/quilladin/normal.pal | 0 .../pokemon/{ => gen_6}/quilladin/shiny.pal | 0 .../{ => gen_6}/scatterbug/anim_front.png | Bin .../pokemon/{ => gen_6}/scatterbug/back.png | Bin .../scatterbug}/footprint.png | Bin .../pokemon/{ => gen_6}/scatterbug/icon.png | Bin .../pokemon/{ => gen_6}/scatterbug/normal.pal | 0 .../pokemon/{ => gen_6}/scatterbug/shiny.pal | 0 .../pokemon/{ => gen_6}/skiddo/anim_front.png | Bin graphics/pokemon/{ => gen_6}/skiddo/back.png | Bin .../pokemon/{ => gen_6}/skiddo/footprint.png | Bin graphics/pokemon/{ => gen_6}/skiddo/icon.png | Bin .../pokemon/{ => gen_6}/skiddo/normal.pal | 0 graphics/pokemon/{ => gen_6}/skiddo/shiny.pal | 0 .../pokemon/{ => gen_6}/skrelp/anim_front.png | Bin graphics/pokemon/{ => gen_6}/skrelp/back.png | Bin .../{sliggoo => gen_6/skrelp}/footprint.png | Bin graphics/pokemon/{ => gen_6}/skrelp/icon.png | Bin .../pokemon/{ => gen_6}/skrelp/normal.pal | 0 graphics/pokemon/{ => gen_6}/skrelp/shiny.pal | 0 .../{ => gen_6}/sliggoo/anim_front.png | Bin graphics/pokemon/{ => gen_6}/sliggoo/back.png | Bin .../{slugma => gen_6/sliggoo}/footprint.png | Bin .../{ => gen_6}/sliggoo/hisuian/back.png | Bin .../{ => gen_6}/sliggoo/hisuian/front.png | Bin .../{ => gen_6}/sliggoo/hisuian/icon.png | Bin .../{ => gen_6}/sliggoo/hisuian/normal.pal | 0 .../{ => gen_6}/sliggoo/hisuian/shiny.pal | 0 graphics/pokemon/{ => gen_6}/sliggoo/icon.png | Bin .../pokemon/{ => gen_6}/sliggoo/normal.pal | 0 .../pokemon/{ => gen_6}/sliggoo/shiny.pal | 0 .../{ => gen_6}/slurpuff/anim_front.png | Bin .../pokemon/{ => gen_6}/slurpuff/back.png | Bin .../{kirlia => gen_6/slurpuff}/footprint.png | Bin .../pokemon/{ => gen_6}/slurpuff/icon.png | Bin .../pokemon/{ => gen_6}/slurpuff/normal.pal | 0 .../pokemon/{ => gen_6}/slurpuff/shiny.pal | 0 .../pokemon/{ => gen_6}/spewpa/anim_front.png | Bin graphics/pokemon/{ => gen_6}/spewpa/back.png | Bin .../{snom => gen_6/spewpa}/footprint.png | Bin graphics/pokemon/{ => gen_6}/spewpa/icon.png | Bin .../pokemon/{ => gen_6}/spewpa/normal.pal | 0 graphics/pokemon/{ => gen_6}/spewpa/shiny.pal | 0 .../{ => gen_6}/spritzee/anim_front.png | Bin .../pokemon/{ => gen_6}/spritzee/back.png | Bin .../{skorupi => gen_6/spritzee}/footprint.png | Bin .../pokemon/{ => gen_6}/spritzee/icon.png | Bin .../pokemon/{ => gen_6}/spritzee/normal.pal | 0 .../pokemon/{ => gen_6}/spritzee/shiny.pal | 0 .../{ => gen_6}/swirlix/anim_front.png | Bin graphics/pokemon/{ => gen_6}/swirlix/back.png | Bin .../{solosis => gen_6/swirlix}/footprint.png | Bin graphics/pokemon/{ => gen_6}/swirlix/icon.png | Bin .../pokemon/{ => gen_6}/swirlix/normal.pal | 0 .../pokemon/{ => gen_6}/swirlix/shiny.pal | 0 .../{ => gen_6}/sylveon/anim_front.png | Bin graphics/pokemon/{ => gen_6}/sylveon/back.png | Bin .../pokemon/{ => gen_6}/sylveon/footprint.png | Bin graphics/pokemon/{ => gen_6}/sylveon/icon.png | Bin .../pokemon/{ => gen_6}/sylveon/normal.pal | 0 .../pokemon/{ => gen_6}/sylveon/shiny.pal | 0 .../{ => gen_6}/talonflame/anim_front.png | Bin .../pokemon/{ => gen_6}/talonflame/back.png | Bin .../{ => gen_6}/talonflame/footprint.png | Bin .../pokemon/{ => gen_6}/talonflame/icon.png | Bin .../pokemon/{ => gen_6}/talonflame/normal.pal | 0 .../pokemon/{ => gen_6}/talonflame/shiny.pal | 0 .../{ => gen_6}/trevenant/anim_front.png | Bin .../pokemon/{ => gen_6}/trevenant/back.png | Bin .../trevenant}/footprint.png | Bin .../pokemon/{ => gen_6}/trevenant/icon.png | Bin .../pokemon/{ => gen_6}/trevenant/normal.pal | 0 .../pokemon/{ => gen_6}/trevenant/shiny.pal | 0 .../{ => gen_6}/tyrantrum/anim_front.png | Bin .../pokemon/{ => gen_6}/tyrantrum/back.png | Bin .../{ => gen_6}/tyrantrum/footprint.png | Bin .../pokemon/{ => gen_6}/tyrantrum/icon.png | Bin .../pokemon/{ => gen_6}/tyrantrum/normal.pal | 0 .../pokemon/{ => gen_6}/tyrantrum/shiny.pal | 0 .../pokemon/{ => gen_6}/tyrunt/anim_front.png | Bin graphics/pokemon/{ => gen_6}/tyrunt/back.png | Bin .../pokemon/{ => gen_6}/tyrunt/footprint.png | Bin graphics/pokemon/{ => gen_6}/tyrunt/icon.png | Bin .../pokemon/{ => gen_6}/tyrunt/normal.pal | 0 graphics/pokemon/{ => gen_6}/tyrunt/shiny.pal | 0 .../{ => gen_6}/vivillon/anim_front.png | Bin .../vivillon/archipelago/anim_front.png | Bin .../{ => gen_6}/vivillon/archipelago/back.png | Bin .../{ => gen_6}/vivillon/archipelago/icon.png | Bin .../vivillon/archipelago/normal.pal | 0 .../vivillon/archipelago/shiny.pal | 0 .../pokemon/{ => gen_6}/vivillon/back.png | Bin .../vivillon/continental/anim_front.png | Bin .../{ => gen_6}/vivillon/continental/back.png | Bin .../{ => gen_6}/vivillon/continental/icon.png | Bin .../vivillon/continental/normal.pal | 0 .../vivillon/continental/shiny.pal | 0 .../vivillon/elegant/anim_front.png | Bin .../{ => gen_6}/vivillon/elegant/back.png | Bin .../{ => gen_6}/vivillon/elegant/icon.png | Bin .../{ => gen_6}/vivillon/elegant/normal.pal | 0 .../{ => gen_6}/vivillon/elegant/shiny.pal | 0 .../{ => gen_6}/vivillon/fancy/anim_front.png | Bin .../{ => gen_6}/vivillon/fancy/back.png | Bin .../{ => gen_6}/vivillon/fancy/icon.png | Bin .../{ => gen_6}/vivillon/fancy/normal.pal | 0 .../{ => gen_6}/vivillon/fancy/shiny.pal | 0 .../{solrock => gen_6/vivillon}/footprint.png | Bin .../vivillon/garden/anim_front.png | Bin .../{ => gen_6}/vivillon/garden/back.png | Bin .../{ => gen_6}/vivillon/garden/icon.png | Bin .../{ => gen_6}/vivillon/garden/normal.pal | 0 .../{ => gen_6}/vivillon/garden/shiny.pal | 0 .../vivillon/high_plains/anim_front.png | Bin .../{ => gen_6}/vivillon/high_plains/back.png | Bin .../{ => gen_6}/vivillon/high_plains/icon.png | Bin .../vivillon/high_plains/normal.pal | 0 .../vivillon/high_plains/shiny.pal | 0 .../pokemon/{ => gen_6}/vivillon/icon.png | Bin .../vivillon/jungle/anim_front.png | Bin .../{ => gen_6}/vivillon/jungle/back.png | Bin .../{ => gen_6}/vivillon/jungle/icon.png | Bin .../{ => gen_6}/vivillon/jungle/normal.pal | 0 .../{ => gen_6}/vivillon/jungle/shiny.pal | 0 .../vivillon/marine/anim_front.png | Bin .../{ => gen_6}/vivillon/marine/back.png | Bin .../{ => gen_6}/vivillon/marine/icon.png | Bin .../{ => gen_6}/vivillon/marine/normal.pal | 0 .../{ => gen_6}/vivillon/marine/shiny.pal | 0 .../vivillon/meadow/anim_front.png | Bin .../{ => gen_6}/vivillon/meadow/back.png | Bin .../{ => gen_6}/vivillon/meadow/icon.png | Bin .../{ => gen_6}/vivillon/meadow/normal.pal | 0 .../{ => gen_6}/vivillon/meadow/shiny.pal | 0 .../vivillon/modern/anim_front.png | Bin .../{ => gen_6}/vivillon/modern/back.png | Bin .../{ => gen_6}/vivillon/modern/icon.png | Bin .../{ => gen_6}/vivillon/modern/normal.pal | 0 .../{ => gen_6}/vivillon/modern/shiny.pal | 0 .../vivillon/monsoon/anim_front.png | Bin .../{ => gen_6}/vivillon/monsoon/back.png | Bin .../{ => gen_6}/vivillon/monsoon/icon.png | Bin .../{ => gen_6}/vivillon/monsoon/normal.pal | 0 .../{ => gen_6}/vivillon/monsoon/shiny.pal | 0 .../pokemon/{ => gen_6}/vivillon/normal.pal | 0 .../{ => gen_6}/vivillon/ocean/anim_front.png | Bin .../{ => gen_6}/vivillon/ocean/back.png | Bin .../{ => gen_6}/vivillon/ocean/icon.png | Bin .../{ => gen_6}/vivillon/ocean/normal.pal | 0 .../{ => gen_6}/vivillon/ocean/shiny.pal | 0 .../vivillon/poke_ball/anim_front.png | Bin .../{ => gen_6}/vivillon/poke_ball/back.png | Bin .../{ => gen_6}/vivillon/poke_ball/icon.png | Bin .../{ => gen_6}/vivillon/poke_ball/normal.pal | 0 .../{ => gen_6}/vivillon/poke_ball/shiny.pal | 0 .../{ => gen_6}/vivillon/polar/anim_front.png | Bin .../{ => gen_6}/vivillon/polar/back.png | Bin .../{ => gen_6}/vivillon/polar/icon.png | Bin .../{ => gen_6}/vivillon/polar/normal.pal | 0 .../{ => gen_6}/vivillon/polar/shiny.pal | 0 .../{ => gen_6}/vivillon/river/anim_front.png | Bin .../{ => gen_6}/vivillon/river/back.png | Bin .../{ => gen_6}/vivillon/river/icon.png | Bin .../{ => gen_6}/vivillon/river/normal.pal | 0 .../{ => gen_6}/vivillon/river/shiny.pal | 0 .../vivillon/sandstorm/anim_front.png | Bin .../{ => gen_6}/vivillon/sandstorm/back.png | Bin .../{ => gen_6}/vivillon/sandstorm/icon.png | Bin .../{ => gen_6}/vivillon/sandstorm/normal.pal | 0 .../{ => gen_6}/vivillon/sandstorm/shiny.pal | 0 .../vivillon/savanna/anim_front.png | Bin .../{ => gen_6}/vivillon/savanna/back.png | Bin .../{ => gen_6}/vivillon/savanna/icon.png | Bin .../{ => gen_6}/vivillon/savanna/normal.pal | 0 .../{ => gen_6}/vivillon/savanna/shiny.pal | 0 .../pokemon/{ => gen_6}/vivillon/shiny.pal | 0 .../{ => gen_6}/vivillon/sun/anim_front.png | Bin .../pokemon/{ => gen_6}/vivillon/sun/back.png | Bin .../pokemon/{ => gen_6}/vivillon/sun/icon.png | Bin .../{ => gen_6}/vivillon/sun/normal.pal | 0 .../{ => gen_6}/vivillon/sun/shiny.pal | 0 .../vivillon/tundra/anim_front.png | Bin .../{ => gen_6}/vivillon/tundra/back.png | Bin .../{ => gen_6}/vivillon/tundra/icon.png | Bin .../{ => gen_6}/vivillon/tundra/normal.pal | 0 .../{ => gen_6}/vivillon/tundra/shiny.pal | 0 .../{ => gen_6}/volcanion/anim_front.png | Bin .../pokemon/{ => gen_6}/volcanion/back.png | Bin .../{ => gen_6}/volcanion/footprint.png | Bin .../pokemon/{ => gen_6}/volcanion/icon.png | Bin .../pokemon/{ => gen_6}/volcanion/normal.pal | 0 .../pokemon/{ => gen_6}/volcanion/shiny.pal | 0 .../{ => gen_6}/xerneas/active/anim_front.png | Bin .../{ => gen_6}/xerneas/active/back.png | Bin .../{ => gen_6}/xerneas/active/icon.png | Bin .../{ => gen_6}/xerneas/active/normal.pal | 0 .../{ => gen_6}/xerneas/active/shiny.pal | 0 graphics/pokemon/{ => gen_6}/xerneas/back.png | Bin .../{lurantis => gen_6/xerneas}/footprint.png | Bin .../pokemon/{ => gen_6}/xerneas/front.png | Bin graphics/pokemon/{ => gen_6}/xerneas/icon.png | Bin .../pokemon/{ => gen_6}/xerneas/normal.pal | 0 .../pokemon/{ => gen_6}/xerneas/shiny.pal | 0 .../{ => gen_6}/yveltal/anim_front.png | Bin graphics/pokemon/{ => gen_6}/yveltal/back.png | Bin .../pokemon/{ => gen_6}/yveltal/footprint.png | Bin graphics/pokemon/{ => gen_6}/yveltal/icon.png | Bin .../pokemon/{ => gen_6}/yveltal/normal.pal | 0 .../pokemon/{ => gen_6}/yveltal/shiny.pal | 0 .../zygarde/10_percent/anim_front.png | Bin .../{ => gen_6}/zygarde/10_percent/back.png | Bin .../{ => gen_6}/zygarde/10_percent/icon.png | Bin .../{ => gen_6}/zygarde/10_percent/normal.pal | 0 .../{ => gen_6}/zygarde/10_percent/shiny.pal | 0 .../{ => gen_6}/zygarde/anim_front.png | Bin graphics/pokemon/{ => gen_6}/zygarde/back.png | Bin .../zygarde/complete/anim_front.png | Bin .../{ => gen_6}/zygarde/complete/back.png | Bin .../{ => gen_6}/zygarde/complete/icon.png | Bin .../{ => gen_6}/zygarde/complete/normal.pal | 0 .../{ => gen_6}/zygarde/complete/shiny.pal | 0 .../pokemon/{ => gen_6}/zygarde/footprint.png | Bin graphics/pokemon/{ => gen_6}/zygarde/icon.png | Bin .../pokemon/{ => gen_6}/zygarde/normal.pal | 0 .../pokemon/{ => gen_6}/zygarde/shiny.pal | 0 .../{ => gen_7}/araquanid/anim_front.png | Bin .../pokemon/{ => gen_7}/araquanid/back.png | Bin .../araquanid}/footprint.png | Bin .../pokemon/{ => gen_7}/araquanid/icon.png | Bin .../pokemon/{ => gen_7}/araquanid/normal.pal | 0 .../pokemon/{ => gen_7}/araquanid/shiny.pal | 0 .../pokemon/{ => gen_7}/bewear/anim_front.png | Bin graphics/pokemon/{ => gen_7}/bewear/back.png | Bin .../pokemon/{ => gen_7}/bewear/footprint.png | Bin graphics/pokemon/{ => gen_7}/bewear/icon.png | Bin .../pokemon/{ => gen_7}/bewear/normal.pal | 0 graphics/pokemon/{ => gen_7}/bewear/shiny.pal | 0 .../pokemon/{ => gen_7}/blacephalon/back.png | Bin .../blacephalon}/footprint.png | Bin .../pokemon/{ => gen_7}/blacephalon/front.png | Bin .../pokemon/{ => gen_7}/blacephalon/icon.png | Bin .../{ => gen_7}/blacephalon/normal.pal | 0 .../pokemon/{ => gen_7}/blacephalon/shiny.pal | 0 .../pokemon/{ => gen_7}/bounsweet/back.png | Bin .../bounsweet}/footprint.png | Bin .../pokemon/{ => gen_7}/bounsweet/front.png | Bin .../pokemon/{ => gen_7}/bounsweet/icon.png | Bin .../pokemon/{ => gen_7}/bounsweet/normal.pal | 0 .../pokemon/{ => gen_7}/bounsweet/shiny.pal | 0 graphics/pokemon/{ => gen_7}/brionne/back.png | Bin .../{spewpa => gen_7/brionne}/footprint.png | Bin .../pokemon/{ => gen_7}/brionne/front.png | Bin graphics/pokemon/{ => gen_7}/brionne/icon.png | Bin .../pokemon/{ => gen_7}/brionne/normal.pal | 0 .../pokemon/{ => gen_7}/brionne/shiny.pal | 0 graphics/pokemon/{ => gen_7}/bruxish/back.png | Bin .../{spheal => gen_7/bruxish}/footprint.png | Bin .../pokemon/{ => gen_7}/bruxish/front.png | Bin graphics/pokemon/{ => gen_7}/bruxish/icon.png | Bin .../pokemon/{ => gen_7}/bruxish/normal.pal | 0 .../pokemon/{ => gen_7}/bruxish/shiny.pal | 0 .../pokemon/{ => gen_7}/buzzwole/back.png | Bin .../{munna => gen_7/buzzwole}/footprint.png | Bin .../pokemon/{ => gen_7}/buzzwole/front.png | Bin .../pokemon/{ => gen_7}/buzzwole/icon.png | Bin .../pokemon/{ => gen_7}/buzzwole/normal.pal | 0 .../pokemon/{ => gen_7}/buzzwole/shiny.pal | 0 .../pokemon/{ => gen_7}/celesteela/back.png | Bin .../{ => gen_7}/celesteela/footprint.png | Bin .../pokemon/{ => gen_7}/celesteela/front.png | Bin .../pokemon/{ => gen_7}/celesteela/icon.png | Bin .../pokemon/{ => gen_7}/celesteela/normal.pal | 0 .../pokemon/{ => gen_7}/celesteela/shiny.pal | 0 .../{ => gen_7}/charjabug/anim_front.png | Bin .../pokemon/{ => gen_7}/charjabug/back.png | Bin .../charjabug}/footprint.png | Bin .../pokemon/{ => gen_7}/charjabug/icon.png | Bin .../pokemon/{ => gen_7}/charjabug/normal.pal | 0 .../pokemon/{ => gen_7}/charjabug/shiny.pal | 0 graphics/pokemon/{ => gen_7}/comfey/back.png | Bin .../{spoink => gen_7/comfey}/footprint.png | Bin graphics/pokemon/{ => gen_7}/comfey/front.png | Bin graphics/pokemon/{ => gen_7}/comfey/icon.png | Bin .../pokemon/{ => gen_7}/comfey/normal.pal | 0 graphics/pokemon/{ => gen_7}/comfey/shiny.pal | 0 graphics/pokemon/{ => gen_7}/cosmoem/back.png | Bin .../cosmoem}/footprint.png | Bin .../pokemon/{ => gen_7}/cosmoem/front.png | Bin graphics/pokemon/{ => gen_7}/cosmoem/icon.png | Bin .../pokemon/{ => gen_7}/cosmoem/normal.pal | 0 .../pokemon/{ => gen_7}/cosmoem/shiny.pal | 0 graphics/pokemon/{ => gen_7}/cosmog/back.png | Bin .../{steelix => gen_7/cosmog}/footprint.png | Bin graphics/pokemon/{ => gen_7}/cosmog/front.png | Bin graphics/pokemon/{ => gen_7}/cosmog/icon.png | Bin .../pokemon/{ => gen_7}/cosmog/normal.pal | 0 graphics/pokemon/{ => gen_7}/cosmog/shiny.pal | 0 .../pokemon/{ => gen_7}/crabominable/back.png | Bin .../crabominable}/footprint.png | Bin .../{ => gen_7}/crabominable/front.png | Bin .../pokemon/{ => gen_7}/crabominable/icon.png | Bin .../{ => gen_7}/crabominable/normal.pal | 0 .../{ => gen_7}/crabominable/shiny.pal | 0 .../pokemon/{ => gen_7}/crabrawler/back.png | Bin .../crabrawler}/footprint.png | Bin .../pokemon/{ => gen_7}/crabrawler/front.png | Bin .../pokemon/{ => gen_7}/crabrawler/icon.png | Bin .../pokemon/{ => gen_7}/crabrawler/normal.pal | 0 .../pokemon/{ => gen_7}/crabrawler/shiny.pal | 0 .../{ => gen_7}/cutiefly/anim_front.png | Bin .../pokemon/{ => gen_7}/cutiefly/back.png | Bin .../{poipole => gen_7/cutiefly}/footprint.png | Bin .../pokemon/{ => gen_7}/cutiefly/icon.png | Bin .../pokemon/{ => gen_7}/cutiefly/normal.pal | 0 .../pokemon/{ => gen_7}/cutiefly/shiny.pal | 0 .../{ => gen_7}/dartrix/anim_front.png | Bin graphics/pokemon/{ => gen_7}/dartrix/back.png | Bin .../pokemon/{ => gen_7}/dartrix/footprint.png | Bin graphics/pokemon/{ => gen_7}/dartrix/icon.png | Bin .../pokemon/{ => gen_7}/dartrix/normal.pal | 0 .../pokemon/{ => gen_7}/dartrix/shiny.pal | 0 .../{ => gen_7}/decidueye/anim_front.png | Bin .../pokemon/{ => gen_7}/decidueye/back.png | Bin .../{ => gen_7}/decidueye/footprint.png | Bin .../{ => gen_7}/decidueye/hisuian/back.png | Bin .../{ => gen_7}/decidueye/hisuian/front.png | Bin .../{ => gen_7}/decidueye/hisuian/icon.png | Bin .../{ => gen_7}/decidueye/hisuian/normal.pal | 0 .../{ => gen_7}/decidueye/hisuian/shiny.pal | 0 .../pokemon/{ => gen_7}/decidueye/icon.png | Bin .../pokemon/{ => gen_7}/decidueye/normal.pal | 0 .../pokemon/{ => gen_7}/decidueye/shiny.pal | 0 .../{ => gen_7}/dewpider/anim_front.png | Bin .../pokemon/{ => gen_7}/dewpider/back.png | Bin .../dewpider}/footprint.png | Bin .../pokemon/{ => gen_7}/dewpider/icon.png | Bin .../pokemon/{ => gen_7}/dewpider/normal.pal | 0 .../pokemon/{ => gen_7}/dewpider/shiny.pal | 0 .../pokemon/{ => gen_7}/dhelmise/back.png | Bin .../dhelmise}/footprint.png | Bin .../pokemon/{ => gen_7}/dhelmise/front.png | Bin .../pokemon/{ => gen_7}/dhelmise/icon.png | Bin .../pokemon/{ => gen_7}/dhelmise/normal.pal | 0 .../pokemon/{ => gen_7}/dhelmise/shiny.pal | 0 .../pokemon/{ => gen_7}/drampa/anim_front.png | Bin graphics/pokemon/{ => gen_7}/drampa/back.png | Bin .../{sunkern => gen_7/drampa}/footprint.png | Bin graphics/pokemon/{ => gen_7}/drampa/icon.png | Bin .../pokemon/{ => gen_7}/drampa/normal.pal | 0 graphics/pokemon/{ => gen_7}/drampa/shiny.pal | 0 .../pokemon/{ => gen_7}/fomantis/back.png | Bin .../fomantis}/footprint.png | Bin .../pokemon/{ => gen_7}/fomantis/front.png | Bin .../pokemon/{ => gen_7}/fomantis/icon.png | Bin .../pokemon/{ => gen_7}/fomantis/normal.pal | 0 .../pokemon/{ => gen_7}/fomantis/shiny.pal | 0 .../{ => gen_7}/golisopod/anim_front.png | Bin .../pokemon/{ => gen_7}/golisopod/back.png | Bin .../{ => gen_7}/golisopod/footprint.png | Bin .../pokemon/{ => gen_7}/golisopod/icon.png | Bin .../pokemon/{ => gen_7}/golisopod/normal.pal | 0 .../pokemon/{ => gen_7}/golisopod/shiny.pal | 0 .../{ => gen_7}/grubbin/anim_front.png | Bin graphics/pokemon/{ => gen_7}/grubbin/back.png | Bin .../{sewaddle => gen_7/grubbin}/footprint.png | Bin graphics/pokemon/{ => gen_7}/grubbin/icon.png | Bin .../pokemon/{ => gen_7}/grubbin/normal.pal | 0 .../pokemon/{ => gen_7}/grubbin/shiny.pal | 0 .../pokemon/{ => gen_7}/gumshoos/back.png | Bin .../gumshoos}/footprint.png | Bin .../pokemon/{ => gen_7}/gumshoos/front.png | Bin .../pokemon/{ => gen_7}/gumshoos/icon.png | Bin .../pokemon/{ => gen_7}/gumshoos/normal.pal | 0 .../pokemon/{ => gen_7}/gumshoos/shiny.pal | 0 .../pokemon/{ => gen_7}/guzzlord/back.png | Bin .../{ => gen_7}/guzzlord/footprint.png | Bin .../pokemon/{ => gen_7}/guzzlord/front.png | Bin .../pokemon/{ => gen_7}/guzzlord/icon.png | Bin .../pokemon/{ => gen_7}/guzzlord/normal.pal | 0 .../pokemon/{ => gen_7}/guzzlord/shiny.pal | 0 .../{ => gen_7}/hakamo_o/anim_front.png | Bin .../pokemon/{ => gen_7}/hakamo_o/back.png | Bin .../{ => gen_7}/hakamo_o/footprint.png | Bin .../pokemon/{ => gen_7}/hakamo_o/icon.png | Bin .../pokemon/{ => gen_7}/hakamo_o/normal.pal | 0 .../pokemon/{ => gen_7}/hakamo_o/shiny.pal | 0 .../pokemon/{ => gen_7}/incineroar/back.png | Bin .../incineroar}/footprint.png | Bin .../pokemon/{ => gen_7}/incineroar/front.png | Bin .../pokemon/{ => gen_7}/incineroar/icon.png | Bin .../pokemon/{ => gen_7}/incineroar/normal.pal | 0 .../pokemon/{ => gen_7}/incineroar/shiny.pal | 0 .../{ => gen_7}/jangmo_o/anim_front.png | Bin .../pokemon/{ => gen_7}/jangmo_o/back.png | Bin .../{ => gen_7}/jangmo_o/footprint.png | Bin .../pokemon/{ => gen_7}/jangmo_o/icon.png | Bin .../pokemon/{ => gen_7}/jangmo_o/normal.pal | 0 .../pokemon/{ => gen_7}/jangmo_o/shiny.pal | 0 graphics/pokemon/{ => gen_7}/kartana/back.png | Bin .../{swadloon => gen_7/kartana}/footprint.png | Bin .../pokemon/{ => gen_7}/kartana/front.png | Bin graphics/pokemon/{ => gen_7}/kartana/icon.png | Bin .../pokemon/{ => gen_7}/kartana/normal.pal | 0 .../pokemon/{ => gen_7}/kartana/shiny.pal | 0 graphics/pokemon/{ => gen_7}/komala/back.png | Bin .../pokemon/{ => gen_7}/komala/footprint.png | Bin graphics/pokemon/{ => gen_7}/komala/front.png | Bin graphics/pokemon/{ => gen_7}/komala/icon.png | Bin .../pokemon/{ => gen_7}/komala/normal.pal | 0 graphics/pokemon/{ => gen_7}/komala/shiny.pal | 0 .../{ => gen_7}/kommo_o/anim_front.png | Bin graphics/pokemon/{ => gen_7}/kommo_o/back.png | Bin .../pokemon/{ => gen_7}/kommo_o/footprint.png | Bin graphics/pokemon/{ => gen_7}/kommo_o/icon.png | Bin .../pokemon/{ => gen_7}/kommo_o/normal.pal | 0 .../pokemon/{ => gen_7}/kommo_o/shiny.pal | 0 graphics/pokemon/{ => gen_7}/litten/back.png | Bin .../{appletun => gen_7/litten}/footprint.png | Bin graphics/pokemon/{ => gen_7}/litten/front.png | Bin graphics/pokemon/{ => gen_7}/litten/icon.png | Bin .../pokemon/{ => gen_7}/litten/normal.pal | 0 graphics/pokemon/{ => gen_7}/litten/shiny.pal | 0 graphics/pokemon/{ => gen_7}/lunala/back.png | Bin .../{swalot => gen_7/lunala}/footprint.png | Bin graphics/pokemon/{ => gen_7}/lunala/front.png | Bin graphics/pokemon/{ => gen_7}/lunala/icon.png | Bin .../pokemon/{ => gen_7}/lunala/normal.pal | 0 graphics/pokemon/{ => gen_7}/lunala/shiny.pal | 0 .../pokemon/{ => gen_7}/lurantis/back.png | Bin .../{shelmet => gen_7/lurantis}/footprint.png | Bin .../pokemon/{ => gen_7}/lurantis/front.png | Bin .../pokemon/{ => gen_7}/lurantis/icon.png | Bin .../pokemon/{ => gen_7}/lurantis/normal.pal | 0 .../pokemon/{ => gen_7}/lurantis/shiny.pal | 0 .../{ => gen_7}/lycanroc/anim_front.png | Bin .../pokemon/{ => gen_7}/lycanroc/back.png | Bin .../{ => gen_7}/lycanroc/dusk/anim_front.png | Bin .../{ => gen_7}/lycanroc/dusk/back.png | Bin .../{ => gen_7}/lycanroc/dusk/icon.png | Bin .../{ => gen_7}/lycanroc/dusk/normal.pal | 0 .../{ => gen_7}/lycanroc/dusk/shiny.pal | 0 .../{ => gen_7}/lycanroc/footprint.png | Bin .../pokemon/{ => gen_7}/lycanroc/icon.png | Bin .../lycanroc/midnight/anim_front.png | Bin .../{ => gen_7}/lycanroc/midnight/back.png | Bin .../{ => gen_7}/lycanroc/midnight/icon.png | Bin .../{ => gen_7}/lycanroc/midnight/normal.pal | 0 .../{ => gen_7}/lycanroc/midnight/shiny.pal | 0 .../pokemon/{ => gen_7}/lycanroc/normal.pal | 0 .../pokemon/{ => gen_7}/lycanroc/shiny.pal | 0 .../pokemon/{ => gen_7}/magearna/back.png | Bin .../magearna}/footprint.png | Bin .../pokemon/{ => gen_7}/magearna/front.png | Bin .../pokemon/{ => gen_7}/magearna/icon.png | Bin .../pokemon/{ => gen_7}/magearna/normal.pal | 0 .../magearna/original_color/back.png | Bin .../magearna/original_color/front.png | Bin .../magearna/original_color/icon.png | Bin .../magearna/original_color/normal.pal | 0 .../magearna/original_color/shiny.pal | 0 .../pokemon/{ => gen_7}/magearna/shiny.pal | 0 .../pokemon/{ => gen_7}/mareanie/back.png | Bin .../{swirlix => gen_7/mareanie}/footprint.png | Bin .../pokemon/{ => gen_7}/mareanie/front.png | Bin .../pokemon/{ => gen_7}/mareanie/icon.png | Bin .../pokemon/{ => gen_7}/mareanie/normal.pal | 0 .../pokemon/{ => gen_7}/mareanie/shiny.pal | 0 .../{ => gen_7}/marshadow/anim_front.png | Bin .../pokemon/{ => gen_7}/marshadow/back.png | Bin .../{ => gen_7}/marshadow/footprint.png | Bin .../pokemon/{ => gen_7}/marshadow/icon.png | Bin .../pokemon/{ => gen_7}/marshadow/normal.pal | 0 .../pokemon/{ => gen_7}/marshadow/shiny.pal | 0 .../pokemon/{ => gen_7}/melmetal/back.png | Bin .../{ => gen_7}/melmetal/footprint.png | Bin .../pokemon/{ => gen_7}/melmetal/front.png | Bin .../{ => gen_7}/melmetal/gigantamax/back.png | Bin .../{ => gen_7}/melmetal/gigantamax/front.png | Bin .../{ => gen_7}/melmetal/gigantamax/icon.png | Bin .../melmetal/gigantamax/normal.pal | 0 .../{ => gen_7}/melmetal/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_7}/melmetal/icon.png | Bin .../pokemon/{ => gen_7}/melmetal/normal.pal | 0 .../pokemon/{ => gen_7}/melmetal/shiny.pal | 0 graphics/pokemon/{ => gen_7}/meltan/back.png | Bin .../{tapu_bulu => gen_7/meltan}/footprint.png | Bin graphics/pokemon/{ => gen_7}/meltan/front.png | Bin graphics/pokemon/{ => gen_7}/meltan/icon.png | Bin .../pokemon/{ => gen_7}/meltan/normal.pal | 0 graphics/pokemon/{ => gen_7}/meltan/shiny.pal | 0 graphics/pokemon/{ => gen_7}/mimikyu/back.png | Bin .../{ => gen_7}/mimikyu/busted/back.png | Bin .../{ => gen_7}/mimikyu/busted/front.png | Bin .../{ => gen_7}/mimikyu/busted/icon.png | Bin .../{ => gen_7}/mimikyu/busted/normal.pal | 0 .../{ => gen_7}/mimikyu/busted/shiny.pal | 0 .../mimikyu}/footprint.png | Bin .../pokemon/{ => gen_7}/mimikyu/front.png | Bin graphics/pokemon/{ => gen_7}/mimikyu/icon.png | Bin .../pokemon/{ => gen_7}/mimikyu/normal.pal | 0 .../pokemon/{ => gen_7}/mimikyu/shiny.pal | 0 graphics/pokemon/{ => gen_7}/minior/back.png | Bin .../pokemon/{ => gen_7}/minior/core/back.png | Bin .../{ => gen_7}/minior/core/blue/icon.png | Bin .../{ => gen_7}/minior/core/blue/normal.pal | 0 .../pokemon/{ => gen_7}/minior/core/front.png | Bin .../{ => gen_7}/minior/core/green/icon.png | Bin .../{ => gen_7}/minior/core/green/normal.pal | 0 .../{ => gen_7}/minior/core/indigo/icon.png | Bin .../{ => gen_7}/minior/core/indigo/normal.pal | 0 .../{ => gen_7}/minior/core/orange/icon.png | Bin .../{ => gen_7}/minior/core/orange/normal.pal | 0 .../{ => gen_7}/minior/core/red/icon.png | Bin .../{ => gen_7}/minior/core/red/normal.pal | 0 .../pokemon/{ => gen_7}/minior/core/shiny.pal | 0 .../{ => gen_7}/minior/core/violet/icon.png | Bin .../{ => gen_7}/minior/core/violet/normal.pal | 0 .../{ => gen_7}/minior/core/yellow/icon.png | Bin .../{ => gen_7}/minior/core/yellow/normal.pal | 0 .../{tapu_koko => gen_7/minior}/footprint.png | Bin graphics/pokemon/{ => gen_7}/minior/front.png | Bin graphics/pokemon/{ => gen_7}/minior/icon.png | Bin .../pokemon/{ => gen_7}/minior/normal.pal | 0 graphics/pokemon/{ => gen_7}/minior/shiny.pal | 0 .../pokemon/{ => gen_7}/morelull/back.png | Bin .../{ => gen_7}/morelull/footprint.png | Bin .../pokemon/{ => gen_7}/morelull/front.png | Bin .../pokemon/{ => gen_7}/morelull/icon.png | Bin .../pokemon/{ => gen_7}/morelull/normal.pal | 0 .../pokemon/{ => gen_7}/morelull/shiny.pal | 0 graphics/pokemon/{ => gen_7}/mudbray/back.png | Bin .../pokemon/{ => gen_7}/mudbray/footprint.png | Bin .../pokemon/{ => gen_7}/mudbray/front.png | Bin graphics/pokemon/{ => gen_7}/mudbray/icon.png | Bin .../pokemon/{ => gen_7}/mudbray/normal.pal | 0 .../pokemon/{ => gen_7}/mudbray/shiny.pal | 0 .../pokemon/{ => gen_7}/mudsdale/back.png | Bin .../{ => gen_7}/mudsdale/footprint.png | Bin .../pokemon/{ => gen_7}/mudsdale/front.png | Bin .../pokemon/{ => gen_7}/mudsdale/icon.png | Bin .../pokemon/{ => gen_7}/mudsdale/normal.pal | 0 .../pokemon/{ => gen_7}/mudsdale/shiny.pal | 0 .../pokemon/{ => gen_7}/naganadel/back.png | Bin .../naganadel}/footprint.png | Bin .../pokemon/{ => gen_7}/naganadel/front.png | Bin .../pokemon/{ => gen_7}/naganadel/icon.png | Bin .../pokemon/{ => gen_7}/naganadel/normal.pal | 0 .../pokemon/{ => gen_7}/naganadel/shiny.pal | 0 .../pokemon/{ => gen_7}/necrozma/back.png | Bin .../{ => gen_7}/necrozma/dawn_wings/back.png | Bin .../{ => gen_7}/necrozma/dawn_wings/front.png | Bin .../{ => gen_7}/necrozma/dawn_wings/icon.png | Bin .../necrozma/dawn_wings/normal.pal | 0 .../{ => gen_7}/necrozma/dawn_wings/shiny.pal | 0 .../{ => gen_7}/necrozma/dusk_mane/back.png | Bin .../{ => gen_7}/necrozma/dusk_mane/front.png | Bin .../{ => gen_7}/necrozma/dusk_mane/icon.png | Bin .../{ => gen_7}/necrozma/dusk_mane/normal.pal | 0 .../{ => gen_7}/necrozma/dusk_mane/shiny.pal | 0 .../necrozma}/footprint.png | Bin .../pokemon/{ => gen_7}/necrozma/front.png | Bin .../pokemon/{ => gen_7}/necrozma/icon.png | Bin .../pokemon/{ => gen_7}/necrozma/normal.pal | 0 .../pokemon/{ => gen_7}/necrozma/shiny.pal | 0 .../{ => gen_7}/necrozma/ultra/back.png | Bin .../{ => gen_7}/necrozma/ultra/front.png | Bin .../{ => gen_7}/necrozma/ultra/icon.png | Bin .../{ => gen_7}/necrozma/ultra/normal.pal | 0 .../{ => gen_7}/necrozma/ultra/shiny.pal | 0 .../pokemon/{ => gen_7}/nihilego/back.png | Bin .../nihilego}/footprint.png | Bin .../pokemon/{ => gen_7}/nihilego/front.png | Bin .../pokemon/{ => gen_7}/nihilego/icon.png | Bin .../pokemon/{ => gen_7}/nihilego/normal.pal | 0 .../pokemon/{ => gen_7}/nihilego/shiny.pal | 0 .../{ => gen_7}/oranguru/anim_front.png | Bin .../pokemon/{ => gen_7}/oranguru/back.png | Bin .../{ => gen_7}/oranguru/footprint.png | Bin .../pokemon/{ => gen_7}/oranguru/icon.png | Bin .../pokemon/{ => gen_7}/oranguru/normal.pal | 0 .../pokemon/{ => gen_7}/oranguru/shiny.pal | 0 .../pokemon/{ => gen_7}/oricorio/back.png | Bin .../{ => gen_7}/oricorio/footprint.png | Bin .../pokemon/{ => gen_7}/oricorio/front.png | Bin .../pokemon/{ => gen_7}/oricorio/icon.png | Bin .../pokemon/{ => gen_7}/oricorio/normal.pal | 0 .../pokemon/{ => gen_7}/oricorio/pau/back.png | Bin .../{ => gen_7}/oricorio/pau/front.png | Bin .../pokemon/{ => gen_7}/oricorio/pau/icon.png | Bin .../{ => gen_7}/oricorio/pau/normal.pal | 0 .../{ => gen_7}/oricorio/pau/shiny.pal | 0 .../{ => gen_7}/oricorio/pom_pom/back.png | Bin .../{ => gen_7}/oricorio/pom_pom/front.png | Bin .../{ => gen_7}/oricorio/pom_pom/icon.png | Bin .../{ => gen_7}/oricorio/pom_pom/normal.pal | 0 .../{ => gen_7}/oricorio/pom_pom/shiny.pal | 0 .../{ => gen_7}/oricorio/sensu/back.png | Bin .../{ => gen_7}/oricorio/sensu/front.png | Bin .../{ => gen_7}/oricorio/sensu/icon.png | Bin .../{ => gen_7}/oricorio/sensu/normal.pal | 0 .../{ => gen_7}/oricorio/sensu/shiny.pal | 0 .../pokemon/{ => gen_7}/oricorio/shiny.pal | 0 .../pokemon/{ => gen_7}/palossand/back.png | Bin .../palossand}/footprint.png | Bin .../pokemon/{ => gen_7}/palossand/front.png | Bin .../pokemon/{ => gen_7}/palossand/icon.png | Bin .../pokemon/{ => gen_7}/palossand/normal.pal | 0 .../pokemon/{ => gen_7}/palossand/shiny.pal | 0 .../{ => gen_7}/passimian/anim_front.png | Bin .../pokemon/{ => gen_7}/passimian/back.png | Bin .../{ => gen_7}/passimian/footprint.png | Bin .../pokemon/{ => gen_7}/passimian/icon.png | Bin .../pokemon/{ => gen_7}/passimian/normal.pal | 0 .../pokemon/{ => gen_7}/passimian/shiny.pal | 0 .../pokemon/{ => gen_7}/pheromosa/back.png | Bin .../{ => gen_7}/pheromosa/footprint.png | Bin .../pokemon/{ => gen_7}/pheromosa/front.png | Bin .../pokemon/{ => gen_7}/pheromosa/icon.png | Bin .../pokemon/{ => gen_7}/pheromosa/normal.pal | 0 .../pokemon/{ => gen_7}/pheromosa/shiny.pal | 0 .../{ => gen_7}/pikipek/anim_front.png | Bin graphics/pokemon/{ => gen_7}/pikipek/back.png | Bin .../pokemon/{ => gen_7}/pikipek/footprint.png | Bin graphics/pokemon/{ => gen_7}/pikipek/icon.png | Bin .../pokemon/{ => gen_7}/pikipek/normal.pal | 0 .../pokemon/{ => gen_7}/pikipek/shiny.pal | 0 graphics/pokemon/{ => gen_7}/poipole/back.png | Bin .../{starmie => gen_7/poipole}/footprint.png | Bin .../pokemon/{ => gen_7}/poipole/front.png | Bin graphics/pokemon/{ => gen_7}/poipole/icon.png | Bin .../pokemon/{ => gen_7}/poipole/normal.pal | 0 .../pokemon/{ => gen_7}/poipole/shiny.pal | 0 graphics/pokemon/{ => gen_7}/popplio/back.png | Bin .../{tirtouga => gen_7/popplio}/footprint.png | Bin .../pokemon/{ => gen_7}/popplio/front.png | Bin graphics/pokemon/{ => gen_7}/popplio/icon.png | Bin .../pokemon/{ => gen_7}/popplio/normal.pal | 0 .../pokemon/{ => gen_7}/popplio/shiny.pal | 0 .../pokemon/{ => gen_7}/primarina/back.png | Bin .../primarina}/footprint.png | Bin .../pokemon/{ => gen_7}/primarina/front.png | Bin .../pokemon/{ => gen_7}/primarina/icon.png | Bin .../pokemon/{ => gen_7}/primarina/normal.pal | 0 .../pokemon/{ => gen_7}/primarina/shiny.pal | 0 .../{ => gen_7}/pyukumuku/anim_front.png | Bin .../pokemon/{ => gen_7}/pyukumuku/back.png | Bin .../pyukumuku}/footprint.png | Bin .../pokemon/{ => gen_7}/pyukumuku/icon.png | Bin .../pokemon/{ => gen_7}/pyukumuku/normal.pal | 0 .../pokemon/{ => gen_7}/pyukumuku/shiny.pal | 0 .../{ => gen_7}/ribombee/anim_front.png | Bin .../pokemon/{ => gen_7}/ribombee/back.png | Bin .../{ => gen_7}/ribombee/footprint.png | Bin .../pokemon/{ => gen_7}/ribombee/icon.png | Bin .../pokemon/{ => gen_7}/ribombee/normal.pal | 0 .../pokemon/{ => gen_7}/ribombee/shiny.pal | 0 .../{ => gen_7}/rockruff/anim_front.png | Bin .../pokemon/{ => gen_7}/rockruff/back.png | Bin .../{ => gen_7}/rockruff/footprint.png | Bin .../pokemon/{ => gen_7}/rockruff/icon.png | Bin .../pokemon/{ => gen_7}/rockruff/normal.pal | 0 .../pokemon/{ => gen_7}/rockruff/shiny.pal | 0 .../pokemon/{ => gen_7}/rowlet/anim_front.png | Bin graphics/pokemon/{ => gen_7}/rowlet/back.png | Bin .../pokemon/{ => gen_7}/rowlet/footprint.png | Bin graphics/pokemon/{ => gen_7}/rowlet/icon.png | Bin .../pokemon/{ => gen_7}/rowlet/normal.pal | 0 graphics/pokemon/{ => gen_7}/rowlet/shiny.pal | 0 .../{ => gen_7}/salandit/anim_front.png | Bin .../pokemon/{ => gen_7}/salandit/back.png | Bin .../{ => gen_7}/salandit/footprint.png | Bin .../pokemon/{ => gen_7}/salandit/icon.png | Bin .../pokemon/{ => gen_7}/salandit/normal.pal | 0 .../pokemon/{ => gen_7}/salandit/shiny.pal | 0 .../{ => gen_7}/salazzle/anim_front.png | Bin .../pokemon/{ => gen_7}/salazzle/back.png | Bin .../{ => gen_7}/salazzle/footprint.png | Bin .../pokemon/{ => gen_7}/salazzle/icon.png | Bin .../pokemon/{ => gen_7}/salazzle/normal.pal | 0 .../pokemon/{ => gen_7}/salazzle/shiny.pal | 0 .../pokemon/{ => gen_7}/sandygast/back.png | Bin .../{tynamo => gen_7/sandygast}/footprint.png | Bin .../pokemon/{ => gen_7}/sandygast/front.png | Bin .../pokemon/{ => gen_7}/sandygast/icon.png | Bin .../pokemon/{ => gen_7}/sandygast/normal.pal | 0 .../pokemon/{ => gen_7}/sandygast/shiny.pal | 0 .../pokemon/{ => gen_7}/shiinotic/back.png | Bin .../shiinotic}/footprint.png | Bin .../pokemon/{ => gen_7}/shiinotic/front.png | Bin .../pokemon/{ => gen_7}/shiinotic/icon.png | Bin .../pokemon/{ => gen_7}/shiinotic/normal.pal | 0 .../pokemon/{ => gen_7}/shiinotic/shiny.pal | 0 .../pokemon/{ => gen_7}/silvally/back.png | Bin .../{ => gen_7}/silvally/bug/normal.pal | 0 .../{ => gen_7}/silvally/bug/shiny.pal | 0 .../{ => gen_7}/silvally/dark/normal.pal | 0 .../{ => gen_7}/silvally/dark/shiny.pal | 0 .../{ => gen_7}/silvally/dragon/normal.pal | 0 .../{ => gen_7}/silvally/dragon/shiny.pal | 0 .../{ => gen_7}/silvally/electric/normal.pal | 0 .../{ => gen_7}/silvally/electric/shiny.pal | 0 .../{ => gen_7}/silvally/fairy/normal.pal | 0 .../{ => gen_7}/silvally/fairy/shiny.pal | 0 .../{ => gen_7}/silvally/fighting/normal.pal | 0 .../{ => gen_7}/silvally/fighting/shiny.pal | 0 .../{ => gen_7}/silvally/fire/normal.pal | 0 .../{ => gen_7}/silvally/fire/shiny.pal | 0 .../{ => gen_7}/silvally/flying/normal.pal | 0 .../{ => gen_7}/silvally/flying/shiny.pal | 0 .../{ => gen_7}/silvally/footprint.png | Bin .../pokemon/{ => gen_7}/silvally/front.png | Bin .../{ => gen_7}/silvally/ghost/normal.pal | 0 .../{ => gen_7}/silvally/ghost/shiny.pal | 0 .../{ => gen_7}/silvally/grass/normal.pal | 0 .../{ => gen_7}/silvally/grass/shiny.pal | 0 .../{ => gen_7}/silvally/ground/normal.pal | 0 .../{ => gen_7}/silvally/ground/shiny.pal | 0 .../{ => gen_7}/silvally/ice/normal.pal | 0 .../{ => gen_7}/silvally/ice/shiny.pal | 0 .../pokemon/{ => gen_7}/silvally/icon.png | Bin .../pokemon/{ => gen_7}/silvally/normal.pal | 0 .../{ => gen_7}/silvally/poison/normal.pal | 0 .../{ => gen_7}/silvally/poison/shiny.pal | 0 .../{ => gen_7}/silvally/psychic/normal.pal | 0 .../{ => gen_7}/silvally/psychic/shiny.pal | 0 .../{ => gen_7}/silvally/rock/normal.pal | 0 .../{ => gen_7}/silvally/rock/shiny.pal | 0 .../pokemon/{ => gen_7}/silvally/shiny.pal | 0 .../{ => gen_7}/silvally/steel/normal.pal | 0 .../{ => gen_7}/silvally/steel/shiny.pal | 0 .../{ => gen_7}/silvally/water/normal.pal | 0 .../{ => gen_7}/silvally/water/shiny.pal | 0 .../pokemon/{ => gen_7}/solgaleo/back.png | Bin .../{ => gen_7}/solgaleo/footprint.png | Bin .../pokemon/{ => gen_7}/solgaleo/front.png | Bin .../pokemon/{ => gen_7}/solgaleo/icon.png | Bin .../pokemon/{ => gen_7}/solgaleo/normal.pal | 0 .../pokemon/{ => gen_7}/solgaleo/shiny.pal | 0 .../pokemon/{ => gen_7}/stakataka/back.png | Bin .../{unown => gen_7/stakataka}/footprint.png | Bin .../pokemon/{ => gen_7}/stakataka/front.png | Bin .../pokemon/{ => gen_7}/stakataka/icon.png | Bin .../pokemon/{ => gen_7}/stakataka/normal.pal | 0 .../pokemon/{ => gen_7}/stakataka/shiny.pal | 0 graphics/pokemon/{ => gen_7}/steenee/back.png | Bin .../{staryu => gen_7/steenee}/footprint.png | Bin .../pokemon/{ => gen_7}/steenee/front.png | Bin graphics/pokemon/{ => gen_7}/steenee/icon.png | Bin .../pokemon/{ => gen_7}/steenee/normal.pal | 0 .../pokemon/{ => gen_7}/steenee/shiny.pal | 0 .../{ => gen_7}/stufful/anim_front.png | Bin graphics/pokemon/{ => gen_7}/stufful/back.png | Bin .../pokemon/{ => gen_7}/stufful/footprint.png | Bin graphics/pokemon/{ => gen_7}/stufful/icon.png | Bin .../pokemon/{ => gen_7}/stufful/normal.pal | 0 .../pokemon/{ => gen_7}/stufful/shiny.pal | 0 .../{ => gen_7}/tapu_bulu/anim_front.png | Bin .../pokemon/{ => gen_7}/tapu_bulu/back.png | Bin .../tapu_bulu}/footprint.png | Bin .../pokemon/{ => gen_7}/tapu_bulu/icon.png | Bin .../pokemon/{ => gen_7}/tapu_bulu/normal.pal | 0 .../pokemon/{ => gen_7}/tapu_bulu/shiny.pal | 0 .../{ => gen_7}/tapu_fini/anim_front.png | Bin .../pokemon/{ => gen_7}/tapu_fini/back.png | Bin .../tapu_fini}/footprint.png | Bin .../pokemon/{ => gen_7}/tapu_fini/icon.png | Bin .../pokemon/{ => gen_7}/tapu_fini/normal.pal | 0 .../pokemon/{ => gen_7}/tapu_fini/shiny.pal | 0 .../{ => gen_7}/tapu_koko/anim_front.png | Bin .../pokemon/{ => gen_7}/tapu_koko/back.png | Bin .../tapu_koko}/footprint.png | Bin .../pokemon/{ => gen_7}/tapu_koko/icon.png | Bin .../pokemon/{ => gen_7}/tapu_koko/normal.pal | 0 .../pokemon/{ => gen_7}/tapu_koko/shiny.pal | 0 .../{ => gen_7}/tapu_lele/anim_front.png | Bin .../pokemon/{ => gen_7}/tapu_lele/back.png | Bin .../tapu_lele}/footprint.png | Bin .../pokemon/{ => gen_7}/tapu_lele/icon.png | Bin .../pokemon/{ => gen_7}/tapu_lele/normal.pal | 0 .../pokemon/{ => gen_7}/tapu_lele/shiny.pal | 0 .../{ => gen_7}/togedemaru/anim_front.png | Bin .../pokemon/{ => gen_7}/togedemaru/back.png | Bin .../togedemaru}/footprint.png | Bin .../pokemon/{ => gen_7}/togedemaru/icon.png | Bin .../pokemon/{ => gen_7}/togedemaru/normal.pal | 0 .../pokemon/{ => gen_7}/togedemaru/shiny.pal | 0 .../pokemon/{ => gen_7}/torracat/back.png | Bin .../{ => gen_7}/torracat/footprint.png | Bin .../pokemon/{ => gen_7}/torracat/front.png | Bin .../pokemon/{ => gen_7}/torracat/icon.png | Bin .../pokemon/{ => gen_7}/torracat/normal.pal | 0 .../pokemon/{ => gen_7}/torracat/shiny.pal | 0 .../{ => gen_7}/toucannon/anim_front.png | Bin .../pokemon/{ => gen_7}/toucannon/back.png | Bin .../{ => gen_7}/toucannon/footprint.png | Bin .../pokemon/{ => gen_7}/toucannon/icon.png | Bin .../pokemon/{ => gen_7}/toucannon/normal.pal | 0 .../pokemon/{ => gen_7}/toucannon/shiny.pal | 0 graphics/pokemon/{ => gen_7}/toxapex/back.png | Bin .../pokemon/{ => gen_7}/toxapex/footprint.png | Bin .../pokemon/{ => gen_7}/toxapex/front.png | Bin graphics/pokemon/{ => gen_7}/toxapex/icon.png | Bin .../pokemon/{ => gen_7}/toxapex/normal.pal | 0 .../pokemon/{ => gen_7}/toxapex/shiny.pal | 0 .../{ => gen_7}/trumbeak/anim_front.png | Bin .../pokemon/{ => gen_7}/trumbeak/back.png | Bin .../{ => gen_7}/trumbeak/footprint.png | Bin .../pokemon/{ => gen_7}/trumbeak/icon.png | Bin .../pokemon/{ => gen_7}/trumbeak/normal.pal | 0 .../pokemon/{ => gen_7}/trumbeak/shiny.pal | 0 .../pokemon/{ => gen_7}/tsareena/back.png | Bin .../{steenee => gen_7/tsareena}/footprint.png | Bin .../pokemon/{ => gen_7}/tsareena/front.png | Bin .../pokemon/{ => gen_7}/tsareena/icon.png | Bin .../pokemon/{ => gen_7}/tsareena/normal.pal | 0 .../pokemon/{ => gen_7}/tsareena/shiny.pal | 0 .../{ => gen_7}/turtonator/anim_front.png | Bin .../pokemon/{ => gen_7}/turtonator/back.png | Bin .../{ => gen_7}/turtonator/footprint.png | Bin .../pokemon/{ => gen_7}/turtonator/icon.png | Bin .../pokemon/{ => gen_7}/turtonator/normal.pal | 0 .../pokemon/{ => gen_7}/turtonator/shiny.pal | 0 .../pokemon/{ => gen_7}/type_null/back.png | Bin .../{ => gen_7}/type_null/footprint.png | Bin .../pokemon/{ => gen_7}/type_null/front.png | Bin .../pokemon/{ => gen_7}/type_null/icon.png | Bin .../pokemon/{ => gen_7}/type_null/normal.pal | 0 .../pokemon/{ => gen_7}/type_null/shiny.pal | 0 .../{ => gen_7}/vikavolt/anim_front.png | Bin .../pokemon/{ => gen_7}/vikavolt/back.png | Bin .../{ => gen_7}/vikavolt/footprint.png | Bin .../pokemon/{ => gen_7}/vikavolt/icon.png | Bin .../pokemon/{ => gen_7}/vikavolt/normal.pal | 0 .../pokemon/{ => gen_7}/vikavolt/shiny.pal | 0 .../pokemon/{ => gen_7}/wimpod/anim_front.png | Bin graphics/pokemon/{ => gen_7}/wimpod/back.png | Bin .../{trevenant => gen_7/wimpod}/footprint.png | Bin graphics/pokemon/{ => gen_7}/wimpod/icon.png | Bin .../pokemon/{ => gen_7}/wimpod/normal.pal | 0 graphics/pokemon/{ => gen_7}/wimpod/shiny.pal | 0 .../pokemon/{ => gen_7}/wishiwashi/back.png | Bin .../wishiwashi}/footprint.png | Bin .../pokemon/{ => gen_7}/wishiwashi/front.png | Bin .../pokemon/{ => gen_7}/wishiwashi/icon.png | Bin .../pokemon/{ => gen_7}/wishiwashi/normal.pal | 0 .../{ => gen_7}/wishiwashi/school/back.png | Bin .../{ => gen_7}/wishiwashi/school/front.png | Bin .../{ => gen_7}/wishiwashi/school/icon.png | Bin .../{ => gen_7}/wishiwashi/school/normal.pal | 0 .../{ => gen_7}/wishiwashi/school/shiny.pal | 0 .../pokemon/{ => gen_7}/wishiwashi/shiny.pal | 0 .../pokemon/{ => gen_7}/xurkitree/back.png | Bin .../{ => gen_7}/xurkitree/footprint.png | Bin .../pokemon/{ => gen_7}/xurkitree/front.png | Bin .../pokemon/{ => gen_7}/xurkitree/icon.png | Bin .../pokemon/{ => gen_7}/xurkitree/normal.pal | 0 .../pokemon/{ => gen_7}/xurkitree/shiny.pal | 0 graphics/pokemon/{ => gen_7}/yungoos/back.png | Bin .../pokemon/{ => gen_7}/yungoos/footprint.png | Bin .../pokemon/{ => gen_7}/yungoos/front.png | Bin graphics/pokemon/{ => gen_7}/yungoos/icon.png | Bin .../pokemon/{ => gen_7}/yungoos/normal.pal | 0 .../pokemon/{ => gen_7}/yungoos/shiny.pal | 0 graphics/pokemon/{ => gen_7}/zeraora/back.png | Bin .../pokemon/{ => gen_7}/zeraora/footprint.png | Bin .../pokemon/{ => gen_7}/zeraora/front.png | Bin graphics/pokemon/{ => gen_7}/zeraora/icon.png | Bin .../pokemon/{ => gen_7}/zeraora/normal.pal | 0 .../pokemon/{ => gen_7}/zeraora/shiny.pal | 0 .../pokemon/{ => gen_8}/alcremie/back.png | Bin .../{ => gen_8}/alcremie/berry/back.png | Bin .../alcremie/berry/berry_caramel_swirl.pal | 0 .../alcremie/berry/berry_default.pal | 0 .../alcremie/berry/berry_lemon_cream.pal | 0 .../alcremie/berry/berry_matcha_cream.pal | 0 .../alcremie/berry/berry_mint_cream.pal | 0 .../alcremie/berry/berry_rainbow_swirl.pal | 0 .../alcremie/berry/berry_ruby_cream.pal | 0 .../alcremie/berry/berry_ruby_swirl.pal | 0 .../alcremie/berry/berry_salted_cream.pal | 0 .../alcremie/berry/berry_shiny.pal | 0 .../{ => gen_8}/alcremie/berry/front.png | Bin .../alcremie/caramel_swirl/back.png | Bin .../alcremie/caramel_swirl/front.png | Bin .../alcremie/caramel_swirl/normal.pal | 0 .../alcremie/caramel_swirl/shiny.pal | 0 .../{ => gen_8}/alcremie/clover/back.png | Bin .../alcremie/clover/clover_caramel_swirl.pal | 0 .../alcremie/clover/clover_default.pal | 0 .../alcremie/clover/clover_lemon_cream.pal | 0 .../alcremie/clover/clover_matcha_cream.pal | 0 .../alcremie/clover/clover_mint_cream.pal | 0 .../alcremie/clover/clover_rainbow_swirl.pal | 0 .../alcremie/clover/clover_ruby_cream.pal | 0 .../alcremie/clover/clover_ruby_swirl.pal | 0 .../alcremie/clover/clover_salted_cream.pal | 0 .../alcremie/clover/clover_shiny.pal | 0 .../{ => gen_8}/alcremie/clover/front.png | Bin .../{ => gen_8}/alcremie/flower/back.png | Bin .../alcremie/flower/flower_caramel_swirl.pal | 0 .../alcremie/flower/flower_default.pal | 0 .../alcremie/flower/flower_lemon_cream.pal | 0 .../alcremie/flower/flower_matcha_cream.pal | 0 .../alcremie/flower/flower_mint_cream.pal | 0 .../alcremie/flower/flower_rainbow_swirl.pal | 0 .../alcremie/flower/flower_ruby_cream.pal | 0 .../alcremie/flower/flower_ruby_swirl.pal | 0 .../alcremie/flower/flower_salted_cream.pal | 0 .../alcremie/flower/flower_shiny.pal | 0 .../{ => gen_8}/alcremie/flower/front.png | Bin .../alcremie}/footprint.png | Bin .../pokemon/{ => gen_8}/alcremie/front.png | Bin .../{ => gen_8}/alcremie/gigantamax/back.png | Bin .../{ => gen_8}/alcremie/gigantamax/front.png | Bin .../{ => gen_8}/alcremie/gigantamax/icon.png | Bin .../alcremie/gigantamax/normal.pal | 0 .../{ => gen_8}/alcremie/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/alcremie/icon.png | Bin .../{ => gen_8}/alcremie/love/back.png | Bin .../{ => gen_8}/alcremie/love/front.png | Bin .../alcremie/love/love_caramel_swirl.pal | 0 .../alcremie/love/love_default.pal | 0 .../alcremie/love/love_lemon_cream.pal | 0 .../alcremie/love/love_matcha_cream.pal | 0 .../alcremie/love/love_mint_cream.pal | 0 .../alcremie/love/love_rainbow_swirl.pal | 0 .../alcremie/love/love_ruby_cream.pal | 0 .../alcremie/love/love_ruby_swirl.pal | 0 .../alcremie/love/love_salted_cream.pal | 0 .../{ => gen_8}/alcremie/love/love_shiny.pal | 0 .../pokemon/{ => gen_8}/alcremie/normal.pal | 0 .../alcremie/rainbow_swirl/back.png | Bin .../alcremie/rainbow_swirl/front.png | Bin .../alcremie/rainbow_swirl/normal.pal | 0 .../alcremie/rainbow_swirl/shiny.pal | 0 .../{ => gen_8}/alcremie/ribbon/back.png | Bin .../{ => gen_8}/alcremie/ribbon/front.png | Bin .../alcremie/ribbon/ribbon_caramel_swirl.pal | 0 .../alcremie/ribbon/ribbon_default.pal | 0 .../alcremie/ribbon/ribbon_lemon_cream.pal | 0 .../alcremie/ribbon/ribbon_matcha_cream.pal | 0 .../alcremie/ribbon/ribbon_mint_cream.pal | 0 .../alcremie/ribbon/ribbon_rainbow_swirl.pal | 0 .../alcremie/ribbon/ribbon_ruby_cream.pal | 0 .../alcremie/ribbon/ribbon_ruby_swirl.pal | 0 .../alcremie/ribbon/ribbon_salted_cream.pal | 0 .../alcremie/ribbon/ribbon_shiny.pal | 0 .../pokemon/{ => gen_8}/alcremie/shiny.pal | 0 .../{ => gen_8}/alcremie/star/back.png | Bin .../{ => gen_8}/alcremie/star/front.png | Bin .../alcremie/star/star_caramel_swirl.pal | 0 .../alcremie/star/star_default.pal | 0 .../alcremie/star/star_lemon_cream.pal | 0 .../alcremie/star/star_matcha_cream.pal | 0 .../alcremie/star/star_mint_cream.pal | 0 .../alcremie/star/star_rainbow_swirl.pal | 0 .../alcremie/star/star_ruby_cream.pal | 0 .../alcremie/star/star_ruby_swirl.pal | 0 .../alcremie/star/star_salted_cream.pal | 0 .../{ => gen_8}/alcremie/star/star_shiny.pal | 0 .../{ => gen_8}/alcremie/strawberry/back.png | Bin .../{ => gen_8}/alcremie/strawberry/front.png | Bin .../strawberry/strawberry_caramel_swirl.pal | 0 .../strawberry/strawberry_default.pal | 0 .../strawberry/strawberry_lemon_cream.pal | 0 .../strawberry/strawberry_matcha_cream.pal | 0 .../strawberry/strawberry_mint_cream.pal | 0 .../strawberry/strawberry_rainbow_swirl.pal | 0 .../strawberry/strawberry_ruby_cream.pal | 0 .../strawberry/strawberry_ruby_swirl.pal | 0 .../strawberry/strawberry_salted_cream.pal | 0 .../alcremie/strawberry/strawberry_shiny.pal | 0 .../{ => gen_8}/appletun/anim_front.png | Bin .../pokemon/{ => gen_8}/appletun/back.png | Bin .../{litten => gen_8/appletun}/footprint.png | Bin .../{ => gen_8}/appletun/gigantamax/back.png | Bin .../{ => gen_8}/appletun/gigantamax/front.png | Bin .../{ => gen_8}/appletun/gigantamax/icon.png | Bin .../appletun/gigantamax/normal.pal | 0 .../{ => gen_8}/appletun/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/appletun/icon.png | Bin .../pokemon/{ => gen_8}/appletun/normal.pal | 0 .../pokemon/{ => gen_8}/appletun/shiny.pal | 0 .../pokemon/{ => gen_8}/applin/anim_front.png | Bin graphics/pokemon/{ => gen_8}/applin/back.png | Bin .../{volcarona => gen_8/applin}/footprint.png | Bin graphics/pokemon/{ => gen_8}/applin/icon.png | Bin .../pokemon/{ => gen_8}/applin/normal.pal | 0 graphics/pokemon/{ => gen_8}/applin/shiny.pal | 0 .../pokemon/{ => gen_8}/arctovish/back.png | Bin .../arctovish}/footprint.png | Bin .../pokemon/{ => gen_8}/arctovish/front.png | Bin .../pokemon/{ => gen_8}/arctovish/icon.png | Bin .../pokemon/{ => gen_8}/arctovish/normal.pal | 0 .../pokemon/{ => gen_8}/arctovish/shiny.pal | 0 .../pokemon/{ => gen_8}/arctozolt/back.png | Bin .../arctozolt}/footprint.png | Bin .../pokemon/{ => gen_8}/arctozolt/front.png | Bin .../pokemon/{ => gen_8}/arctozolt/icon.png | Bin .../pokemon/{ => gen_8}/arctozolt/normal.pal | 0 .../pokemon/{ => gen_8}/arctozolt/shiny.pal | 0 .../pokemon/{ => gen_8}/arrokuda/back.png | Bin .../{voltorb => gen_8/arrokuda}/footprint.png | Bin .../pokemon/{ => gen_8}/arrokuda/front.png | Bin .../pokemon/{ => gen_8}/arrokuda/icon.png | Bin .../pokemon/{ => gen_8}/arrokuda/normal.pal | 0 .../pokemon/{ => gen_8}/arrokuda/shiny.pal | 0 .../pokemon/{ => gen_8}/barraskewda/back.png | Bin .../barraskewda}/footprint.png | Bin .../pokemon/{ => gen_8}/barraskewda/front.png | Bin .../pokemon/{ => gen_8}/barraskewda/icon.png | Bin .../{ => gen_8}/barraskewda/normal.pal | 0 .../pokemon/{ => gen_8}/barraskewda/shiny.pal | 0 .../pokemon/{ => gen_8}/basculegion/back.png | Bin .../{ => gen_8}/basculegion/female/back.png | Bin .../{ => gen_8}/basculegion/female/front.png | Bin .../{ => gen_8}/basculegion/female/icon.png | Bin .../{ => gen_8}/basculegion/female/normal.pal | 0 .../{ => gen_8}/basculegion/female/shiny.pal | 0 .../pokemon/{ => gen_8}/basculegion/front.png | Bin .../pokemon/{ => gen_8}/basculegion/icon.png | Bin .../{ => gen_8}/basculegion/normal.pal | 0 .../pokemon/{ => gen_8}/basculegion/shiny.pal | 0 graphics/pokemon/{ => gen_8}/blipbug/back.png | Bin .../{tsareena => gen_8/blipbug}/footprint.png | Bin .../pokemon/{ => gen_8}/blipbug/front.png | Bin graphics/pokemon/{ => gen_8}/blipbug/icon.png | Bin .../pokemon/{ => gen_8}/blipbug/normal.pal | 0 .../pokemon/{ => gen_8}/blipbug/shiny.pal | 0 graphics/pokemon/{ => gen_8}/boltund/back.png | Bin .../{flareon => gen_8/boltund}/footprint.png | Bin .../pokemon/{ => gen_8}/boltund/front.png | Bin graphics/pokemon/{ => gen_8}/boltund/icon.png | Bin .../pokemon/{ => gen_8}/boltund/normal.pal | 0 .../pokemon/{ => gen_8}/boltund/shiny.pal | 0 graphics/pokemon/{ => gen_8}/calyrex/back.png | Bin .../{venipede => gen_8/calyrex}/footprint.png | Bin .../pokemon/{ => gen_8}/calyrex/front.png | Bin .../{ => gen_8}/calyrex/ice_rider/back.png | Bin .../{ => gen_8}/calyrex/ice_rider/front.png | Bin .../{ => gen_8}/calyrex/ice_rider/icon.png | Bin .../{ => gen_8}/calyrex/ice_rider/normal.pal | 0 .../{ => gen_8}/calyrex/ice_rider/shiny.pal | 0 graphics/pokemon/{ => gen_8}/calyrex/icon.png | Bin .../pokemon/{ => gen_8}/calyrex/normal.pal | 0 .../{ => gen_8}/calyrex/shadow_rider/back.png | Bin .../calyrex/shadow_rider/front.png | Bin .../{ => gen_8}/calyrex/shadow_rider/icon.png | Bin .../calyrex/shadow_rider/normal.pal | 0 .../calyrex/shadow_rider/shiny.pal | 0 .../pokemon/{ => gen_8}/calyrex/shiny.pal | 0 .../pokemon/{ => gen_8}/carkol/anim_front.png | Bin graphics/pokemon/{ => gen_8}/carkol/back.png | Bin .../pokemon/{ => gen_8}/carkol/footprint.png | Bin graphics/pokemon/{ => gen_8}/carkol/icon.png | Bin .../pokemon/{ => gen_8}/carkol/normal.pal | 0 graphics/pokemon/{ => gen_8}/carkol/shiny.pal | 0 .../{ => gen_8}/centiskorch/anim_front.png | Bin .../pokemon/{ => gen_8}/centiskorch/back.png | Bin .../centiskorch}/footprint.png | Bin .../centiskorch/gigantamax/back.png | Bin .../centiskorch/gigantamax/front.png | Bin .../centiskorch/gigantamax/icon.png | Bin .../centiskorch/gigantamax/normal.pal | 0 .../centiskorch/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/centiskorch/icon.png | Bin .../{ => gen_8}/centiskorch/normal.pal | 0 .../pokemon/{ => gen_8}/centiskorch/shiny.pal | 0 .../{ => gen_8}/chewtle/anim_front.png | Bin graphics/pokemon/{ => gen_8}/chewtle/back.png | Bin .../{clefairy => gen_8/chewtle}/footprint.png | Bin graphics/pokemon/{ => gen_8}/chewtle/icon.png | Bin .../pokemon/{ => gen_8}/chewtle/normal.pal | 0 .../pokemon/{ => gen_8}/chewtle/shiny.pal | 0 .../pokemon/{ => gen_8}/cinderace/back.png | Bin .../{ => gen_8}/cinderace/footprint.png | Bin .../pokemon/{ => gen_8}/cinderace/front.png | Bin .../{ => gen_8}/cinderace/gigantamax/back.png | Bin .../cinderace/gigantamax/front.png | Bin .../{ => gen_8}/cinderace/gigantamax/icon.png | Bin .../cinderace/gigantamax/normal.pal | 0 .../cinderace/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/cinderace/icon.png | Bin .../pokemon/{ => gen_8}/cinderace/normal.pal | 0 .../pokemon/{ => gen_8}/cinderace/shiny.pal | 0 .../pokemon/{ => gen_8}/clobbopus/back.png | Bin .../clobbopus}/footprint.png | Bin .../pokemon/{ => gen_8}/clobbopus/front.png | Bin .../pokemon/{ => gen_8}/clobbopus/icon.png | Bin .../pokemon/{ => gen_8}/clobbopus/normal.pal | 0 .../pokemon/{ => gen_8}/clobbopus/shiny.pal | 0 .../{ => gen_8}/coalossal/anim_front.png | Bin .../pokemon/{ => gen_8}/coalossal/back.png | Bin .../{ => gen_8}/coalossal/footprint.png | Bin .../{ => gen_8}/coalossal/gigantamax/back.png | Bin .../coalossal/gigantamax/front.png | Bin .../{ => gen_8}/coalossal/gigantamax/icon.png | Bin .../coalossal/gigantamax/normal.pal | 0 .../coalossal/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/coalossal/icon.png | Bin .../pokemon/{ => gen_8}/coalossal/normal.pal | 0 .../pokemon/{ => gen_8}/coalossal/shiny.pal | 0 .../pokemon/{ => gen_8}/copperajah/back.png | Bin .../{ => gen_8}/copperajah/footprint.png | Bin .../pokemon/{ => gen_8}/copperajah/front.png | Bin .../copperajah/gigantamax/back.png | Bin .../copperajah/gigantamax/front.png | Bin .../copperajah/gigantamax/icon.png | Bin .../copperajah/gigantamax/normal.pal | 0 .../copperajah/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/copperajah/icon.png | Bin .../pokemon/{ => gen_8}/copperajah/normal.pal | 0 .../pokemon/{ => gen_8}/copperajah/shiny.pal | 0 .../{ => gen_8}/corviknight/anim_front.png | Bin .../pokemon/{ => gen_8}/corviknight/back.png | Bin .../corviknight}/footprint.png | Bin .../corviknight/gigantamax/back.png | Bin .../corviknight/gigantamax/front.png | Bin .../corviknight/gigantamax/icon.png | Bin .../corviknight/gigantamax/normal.pal | 0 .../corviknight/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/corviknight/icon.png | Bin .../{ => gen_8}/corviknight/normal.pal | 0 .../pokemon/{ => gen_8}/corviknight/shiny.pal | 0 .../{ => gen_8}/corvisquire/anim_front.png | Bin .../pokemon/{ => gen_8}/corvisquire/back.png | Bin .../corvisquire}/footprint.png | Bin .../pokemon/{ => gen_8}/corvisquire/icon.png | Bin .../{ => gen_8}/corvisquire/normal.pal | 0 .../pokemon/{ => gen_8}/corvisquire/shiny.pal | 0 .../pokemon/{ => gen_8}/cramorant/back.png | Bin .../cramorant}/footprint.png | Bin .../pokemon/{ => gen_8}/cramorant/front.png | Bin .../{ => gen_8}/cramorant/gorging/back.png | Bin .../{ => gen_8}/cramorant/gorging/front.png | Bin .../{ => gen_8}/cramorant/gorging/icon.png | Bin .../{ => gen_8}/cramorant/gorging/normal.pal | 0 .../{ => gen_8}/cramorant/gorging/shiny.pal | 0 .../{ => gen_8}/cramorant/gulping/back.png | Bin .../{ => gen_8}/cramorant/gulping/front.png | Bin .../{ => gen_8}/cramorant/gulping/icon.png | Bin .../{ => gen_8}/cramorant/gulping/normal.pal | 0 .../{ => gen_8}/cramorant/gulping/shiny.pal | 0 .../pokemon/{ => gen_8}/cramorant/icon.png | Bin .../pokemon/{ => gen_8}/cramorant/normal.pal | 0 .../pokemon/{ => gen_8}/cramorant/shiny.pal | 0 graphics/pokemon/{ => gen_8}/cufant/back.png | Bin .../{cyndaquil => gen_8/cufant}/footprint.png | Bin graphics/pokemon/{ => gen_8}/cufant/front.png | Bin graphics/pokemon/{ => gen_8}/cufant/icon.png | Bin .../pokemon/{ => gen_8}/cufant/normal.pal | 0 graphics/pokemon/{ => gen_8}/cufant/shiny.pal | 0 graphics/pokemon/{ => gen_8}/cursola/back.png | Bin .../{falinks => gen_8/cursola}/footprint.png | Bin .../pokemon/{ => gen_8}/cursola/front.png | Bin graphics/pokemon/{ => gen_8}/cursola/icon.png | Bin .../pokemon/{ => gen_8}/cursola/normal.pal | 0 .../pokemon/{ => gen_8}/cursola/shiny.pal | 0 graphics/pokemon/{ => gen_8}/dottler/back.png | Bin .../{jumpluff => gen_8/dottler}/footprint.png | Bin .../pokemon/{ => gen_8}/dottler/front.png | Bin graphics/pokemon/{ => gen_8}/dottler/icon.png | Bin .../pokemon/{ => gen_8}/dottler/normal.pal | 0 .../pokemon/{ => gen_8}/dottler/shiny.pal | 0 .../pokemon/{ => gen_8}/dracovish/back.png | Bin .../dracovish}/footprint.png | Bin .../pokemon/{ => gen_8}/dracovish/front.png | Bin .../pokemon/{ => gen_8}/dracovish/icon.png | Bin .../pokemon/{ => gen_8}/dracovish/normal.pal | 0 .../pokemon/{ => gen_8}/dracovish/shiny.pal | 0 .../pokemon/{ => gen_8}/dracozolt/back.png | Bin .../dracozolt}/footprint.png | Bin .../pokemon/{ => gen_8}/dracozolt/front.png | Bin .../pokemon/{ => gen_8}/dracozolt/icon.png | Bin .../pokemon/{ => gen_8}/dracozolt/normal.pal | 0 .../pokemon/{ => gen_8}/dracozolt/shiny.pal | 0 .../pokemon/{ => gen_8}/dragapult/back.png | Bin .../{ => gen_8}/dragapult/footprint.png | Bin .../pokemon/{ => gen_8}/dragapult/front.png | Bin .../pokemon/{ => gen_8}/dragapult/icon.png | Bin .../pokemon/{ => gen_8}/dragapult/normal.pal | 0 .../pokemon/{ => gen_8}/dragapult/shiny.pal | 0 .../pokemon/{ => gen_8}/drakloak/back.png | Bin .../drakloak}/footprint.png | Bin .../pokemon/{ => gen_8}/drakloak/front.png | Bin .../pokemon/{ => gen_8}/drakloak/icon.png | Bin .../pokemon/{ => gen_8}/drakloak/normal.pal | 0 .../pokemon/{ => gen_8}/drakloak/shiny.pal | 0 .../{ => gen_8}/drednaw/anim_front.png | Bin graphics/pokemon/{ => gen_8}/drednaw/back.png | Bin .../{ivysaur => gen_8/drednaw}/footprint.png | Bin .../{ => gen_8}/drednaw/gigantamax/back.png | Bin .../{ => gen_8}/drednaw/gigantamax/front.png | Bin .../{ => gen_8}/drednaw/gigantamax/icon.png | Bin .../{ => gen_8}/drednaw/gigantamax/normal.pal | 0 .../{ => gen_8}/drednaw/gigantamax/shiny.pal | 0 graphics/pokemon/{ => gen_8}/drednaw/icon.png | Bin .../pokemon/{ => gen_8}/drednaw/normal.pal | 0 .../pokemon/{ => gen_8}/drednaw/shiny.pal | 0 graphics/pokemon/{ => gen_8}/dreepy/back.png | Bin .../{wailord => gen_8/dreepy}/footprint.png | Bin graphics/pokemon/{ => gen_8}/dreepy/front.png | Bin graphics/pokemon/{ => gen_8}/dreepy/icon.png | Bin .../pokemon/{ => gen_8}/dreepy/normal.pal | 0 graphics/pokemon/{ => gen_8}/dreepy/shiny.pal | 0 .../pokemon/{ => gen_8}/drizzile/back.png | Bin .../{ => gen_8}/drizzile/footprint.png | Bin .../pokemon/{ => gen_8}/drizzile/front.png | Bin .../pokemon/{ => gen_8}/drizzile/icon.png | Bin .../pokemon/{ => gen_8}/drizzile/normal.pal | 0 .../pokemon/{ => gen_8}/drizzile/shiny.pal | 0 graphics/pokemon/{ => gen_8}/dubwool/back.png | Bin .../pokemon/{ => gen_8}/dubwool/footprint.png | Bin .../pokemon/{ => gen_8}/dubwool/front.png | Bin graphics/pokemon/{ => gen_8}/dubwool/icon.png | Bin .../pokemon/{ => gen_8}/dubwool/normal.pal | 0 .../pokemon/{ => gen_8}/dubwool/shiny.pal | 0 .../pokemon/{ => gen_8}/duraludon/back.png | Bin .../{ => gen_8}/duraludon/footprint.png | Bin .../pokemon/{ => gen_8}/duraludon/front.png | Bin .../{ => gen_8}/duraludon/gigantamax/back.png | Bin .../duraludon/gigantamax/front.png | Bin .../{ => gen_8}/duraludon/gigantamax/icon.png | Bin .../duraludon/gigantamax/normal.pal | 0 .../duraludon/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/duraludon/icon.png | Bin .../pokemon/{ => gen_8}/duraludon/normal.pal | 0 .../pokemon/{ => gen_8}/duraludon/shiny.pal | 0 graphics/pokemon/{ => gen_8}/eiscue/back.png | Bin .../pokemon/{ => gen_8}/eiscue/footprint.png | Bin graphics/pokemon/{ => gen_8}/eiscue/front.png | Bin graphics/pokemon/{ => gen_8}/eiscue/icon.png | Bin .../{ => gen_8}/eiscue/noice_face/back.png | Bin .../{ => gen_8}/eiscue/noice_face/front.png | Bin .../{ => gen_8}/eiscue/noice_face/icon.png | Bin .../{ => gen_8}/eiscue/noice_face/normal.pal | 0 .../{ => gen_8}/eiscue/noice_face/shiny.pal | 0 .../pokemon/{ => gen_8}/eiscue/normal.pal | 0 graphics/pokemon/{ => gen_8}/eiscue/shiny.pal | 0 .../pokemon/{ => gen_8}/eldegoss/back.png | Bin .../{walrein => gen_8/eldegoss}/footprint.png | Bin .../pokemon/{ => gen_8}/eldegoss/front.png | Bin .../pokemon/{ => gen_8}/eldegoss/icon.png | Bin .../pokemon/{ => gen_8}/eldegoss/normal.pal | 0 .../pokemon/{ => gen_8}/eldegoss/shiny.pal | 0 .../pokemon/{ => gen_8}/enamorus/back.png | Bin .../pokemon/{ => gen_8}/enamorus/front.png | Bin .../pokemon/{ => gen_8}/enamorus/icon.png | Bin .../pokemon/{ => gen_8}/enamorus/normal.pal | 0 .../pokemon/{ => gen_8}/enamorus/shiny.pal | 0 .../{ => gen_8}/enamorus/therian/back.png | Bin .../{ => gen_8}/enamorus/therian/front.png | Bin .../{ => gen_8}/enamorus/therian/icon.png | Bin .../{ => gen_8}/enamorus/therian/normal.pal | 0 .../{ => gen_8}/enamorus/therian/shiny.pal | 0 .../pokemon/{ => gen_8}/eternatus/back.png | Bin .../{ => gen_8}/eternatus/eternamax/back.png | Bin .../{ => gen_8}/eternatus/eternamax/front.png | Bin .../{ => gen_8}/eternatus/eternamax/icon.png | Bin .../eternatus/eternamax/normal.pal | 0 .../{ => gen_8}/eternatus/eternamax/shiny.pal | 0 .../{ => gen_8}/eternatus/footprint.png | Bin .../pokemon/{ => gen_8}/eternatus/front.png | Bin .../pokemon/{ => gen_8}/eternatus/icon.png | Bin .../pokemon/{ => gen_8}/eternatus/normal.pal | 0 .../pokemon/{ => gen_8}/eternatus/shiny.pal | 0 graphics/pokemon/{ => gen_8}/falinks/back.png | Bin .../{mime_jr => gen_8/falinks}/footprint.png | Bin .../pokemon/{ => gen_8}/falinks/front.png | Bin graphics/pokemon/{ => gen_8}/falinks/icon.png | Bin .../pokemon/{ => gen_8}/falinks/normal.pal | 0 .../pokemon/{ => gen_8}/falinks/shiny.pal | 0 .../{ => gen_8}/flapple/anim_front.png | Bin graphics/pokemon/{ => gen_8}/flapple/back.png | Bin .../flapple}/footprint.png | Bin .../{ => gen_8}/flapple/gigantamax/back.png | Bin .../{ => gen_8}/flapple/gigantamax/front.png | Bin .../{ => gen_8}/flapple/gigantamax/icon.png | Bin .../{ => gen_8}/flapple/gigantamax/normal.pal | 0 .../{ => gen_8}/flapple/gigantamax/shiny.pal | 0 graphics/pokemon/{ => gen_8}/flapple/icon.png | Bin .../pokemon/{ => gen_8}/flapple/normal.pal | 0 .../pokemon/{ => gen_8}/flapple/shiny.pal | 0 .../pokemon/{ => gen_8}/frosmoth/back.png | Bin .../{weezing => gen_8/frosmoth}/footprint.png | Bin .../pokemon/{ => gen_8}/frosmoth/front.png | Bin .../pokemon/{ => gen_8}/frosmoth/icon.png | Bin .../pokemon/{ => gen_8}/frosmoth/normal.pal | 0 .../pokemon/{ => gen_8}/frosmoth/shiny.pal | 0 .../pokemon/{ => gen_8}/glastrier/back.png | Bin .../{ => gen_8}/glastrier/footprint.png | Bin .../pokemon/{ => gen_8}/glastrier/front.png | Bin .../pokemon/{ => gen_8}/glastrier/icon.png | Bin .../pokemon/{ => gen_8}/glastrier/normal.pal | 0 .../pokemon/{ => gen_8}/glastrier/shiny.pal | 0 .../pokemon/{ => gen_8}/gossifleur/back.png | Bin .../{paras => gen_8/gossifleur}/footprint.png | Bin .../pokemon/{ => gen_8}/gossifleur/front.png | Bin .../pokemon/{ => gen_8}/gossifleur/icon.png | Bin .../pokemon/{ => gen_8}/gossifleur/normal.pal | 0 .../pokemon/{ => gen_8}/gossifleur/shiny.pal | 0 .../pokemon/{ => gen_8}/grapploct/back.png | Bin .../grapploct}/footprint.png | Bin .../pokemon/{ => gen_8}/grapploct/front.png | Bin .../pokemon/{ => gen_8}/grapploct/icon.png | Bin .../pokemon/{ => gen_8}/grapploct/normal.pal | 0 .../pokemon/{ => gen_8}/grapploct/shiny.pal | 0 .../pokemon/{ => gen_8}/greedent/back.png | Bin .../{ => gen_8}/greedent/footprint.png | Bin .../pokemon/{ => gen_8}/greedent/front.png | Bin .../pokemon/{ => gen_8}/greedent/icon.png | Bin .../pokemon/{ => gen_8}/greedent/normal.pal | 0 .../pokemon/{ => gen_8}/greedent/shiny.pal | 0 .../pokemon/{ => gen_8}/grimmsnarl/back.png | Bin .../{ => gen_8}/grimmsnarl/footprint.png | Bin .../pokemon/{ => gen_8}/grimmsnarl/front.png | Bin .../grimmsnarl/gigantamax/back.png | Bin .../grimmsnarl/gigantamax/front.png | Bin .../grimmsnarl/gigantamax/icon.png | Bin .../grimmsnarl/gigantamax/normal.pal | 0 .../grimmsnarl/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/grimmsnarl/icon.png | Bin .../pokemon/{ => gen_8}/grimmsnarl/normal.pal | 0 .../pokemon/{ => gen_8}/grimmsnarl/shiny.pal | 0 graphics/pokemon/{ => gen_8}/grookey/back.png | Bin .../pokemon/{ => gen_8}/grookey/footprint.png | Bin .../pokemon/{ => gen_8}/grookey/front.png | Bin graphics/pokemon/{ => gen_8}/grookey/icon.png | Bin .../pokemon/{ => gen_8}/grookey/normal.pal | 0 .../pokemon/{ => gen_8}/grookey/shiny.pal | 0 graphics/pokemon/{ => gen_8}/hatenna/back.png | Bin .../{morpeko => gen_8/hatenna}/footprint.png | Bin .../pokemon/{ => gen_8}/hatenna/front.png | Bin graphics/pokemon/{ => gen_8}/hatenna/icon.png | Bin .../pokemon/{ => gen_8}/hatenna/normal.pal | 0 .../pokemon/{ => gen_8}/hatenna/shiny.pal | 0 .../pokemon/{ => gen_8}/hatterene/back.png | Bin .../hatterene}/footprint.png | Bin .../pokemon/{ => gen_8}/hatterene/front.png | Bin .../{ => gen_8}/hatterene/gigantamax/back.png | Bin .../hatterene/gigantamax/front.png | Bin .../{ => gen_8}/hatterene/gigantamax/icon.png | Bin .../hatterene/gigantamax/normal.pal | 0 .../hatterene/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/hatterene/icon.png | Bin .../pokemon/{ => gen_8}/hatterene/normal.pal | 0 .../pokemon/{ => gen_8}/hatterene/shiny.pal | 0 graphics/pokemon/{ => gen_8}/hattrem/back.png | Bin .../{wimpod => gen_8/hattrem}/footprint.png | Bin .../pokemon/{ => gen_8}/hattrem/front.png | Bin graphics/pokemon/{ => gen_8}/hattrem/icon.png | Bin .../pokemon/{ => gen_8}/hattrem/normal.pal | 0 .../pokemon/{ => gen_8}/hattrem/shiny.pal | 0 .../pokemon/{ => gen_8}/impidimp/back.png | Bin .../impidimp}/footprint.png | Bin .../pokemon/{ => gen_8}/impidimp/front.png | Bin .../pokemon/{ => gen_8}/impidimp/icon.png | Bin .../pokemon/{ => gen_8}/impidimp/normal.pal | 0 .../pokemon/{ => gen_8}/impidimp/shiny.pal | 0 .../pokemon/{ => gen_8}/indeedee/back.png | Bin .../{ => gen_8}/indeedee/female/back.png | Bin .../{ => gen_8}/indeedee/female/front.png | Bin .../{ => gen_8}/indeedee/female/icon.png | Bin .../{ => gen_8}/indeedee/female/normal.pal | 0 .../{ => gen_8}/indeedee/female/shiny.pal | 0 .../{ => gen_8}/indeedee/footprint.png | Bin .../pokemon/{ => gen_8}/indeedee/front.png | Bin .../pokemon/{ => gen_8}/indeedee/icon.png | Bin .../pokemon/{ => gen_8}/indeedee/normal.pal | 0 .../pokemon/{ => gen_8}/indeedee/shiny.pal | 0 .../pokemon/{ => gen_8}/inteleon/back.png | Bin .../{ => gen_8}/inteleon/footprint.png | Bin .../pokemon/{ => gen_8}/inteleon/front.png | Bin .../{ => gen_8}/inteleon/gigantamax/back.png | Bin .../{ => gen_8}/inteleon/gigantamax/front.png | Bin .../{ => gen_8}/inteleon/gigantamax/icon.png | Bin .../inteleon/gigantamax/normal.pal | 0 .../{ => gen_8}/inteleon/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/inteleon/icon.png | Bin .../pokemon/{ => gen_8}/inteleon/normal.pal | 0 .../pokemon/{ => gen_8}/inteleon/shiny.pal | 0 graphics/pokemon/{ => gen_8}/kleavor/back.png | Bin .../pokemon/{ => gen_8}/kleavor/front.png | Bin graphics/pokemon/{ => gen_8}/kleavor/icon.png | Bin .../pokemon/{ => gen_8}/kleavor/normal.pal | 0 .../pokemon/{ => gen_8}/kleavor/shiny.pal | 0 graphics/pokemon/{ => gen_8}/kubfu/back.png | Bin .../pokemon/{ => gen_8}/kubfu/footprint.png | Bin graphics/pokemon/{ => gen_8}/kubfu/front.png | Bin graphics/pokemon/{ => gen_8}/kubfu/icon.png | Bin graphics/pokemon/{ => gen_8}/kubfu/normal.pal | 0 graphics/pokemon/{ => gen_8}/kubfu/shiny.pal | 0 graphics/pokemon/{ => gen_8}/milcery/back.png | Bin .../{whiscash => gen_8/milcery}/footprint.png | Bin .../pokemon/{ => gen_8}/milcery/front.png | Bin graphics/pokemon/{ => gen_8}/milcery/icon.png | Bin .../pokemon/{ => gen_8}/milcery/normal.pal | 0 .../pokemon/{ => gen_8}/milcery/shiny.pal | 0 graphics/pokemon/{ => gen_8}/morgrem/back.png | Bin .../pokemon/{ => gen_8}/morgrem/footprint.png | Bin .../pokemon/{ => gen_8}/morgrem/front.png | Bin graphics/pokemon/{ => gen_8}/morgrem/icon.png | Bin .../pokemon/{ => gen_8}/morgrem/normal.pal | 0 .../pokemon/{ => gen_8}/morgrem/shiny.pal | 0 graphics/pokemon/{ => gen_8}/morpeko/back.png | Bin .../morpeko}/footprint.png | Bin .../pokemon/{ => gen_8}/morpeko/front.png | Bin .../{ => gen_8}/morpeko/hangry/back.png | Bin .../{ => gen_8}/morpeko/hangry/front.png | Bin .../{ => gen_8}/morpeko/hangry/icon.png | Bin .../{ => gen_8}/morpeko/hangry/normal.pal | 0 .../{ => gen_8}/morpeko/hangry/shiny.pal | 0 graphics/pokemon/{ => gen_8}/morpeko/icon.png | Bin .../pokemon/{ => gen_8}/morpeko/normal.pal | 0 .../pokemon/{ => gen_8}/morpeko/shiny.pal | 0 graphics/pokemon/{ => gen_8}/mr_rime/back.png | Bin .../pokemon/{ => gen_8}/mr_rime/footprint.png | Bin .../pokemon/{ => gen_8}/mr_rime/front.png | Bin graphics/pokemon/{ => gen_8}/mr_rime/icon.png | Bin .../pokemon/{ => gen_8}/mr_rime/normal.pal | 0 .../pokemon/{ => gen_8}/mr_rime/shiny.pal | 0 graphics/pokemon/{ => gen_8}/nickit/back.png | Bin .../pokemon/{ => gen_8}/nickit/footprint.png | Bin graphics/pokemon/{ => gen_8}/nickit/front.png | Bin graphics/pokemon/{ => gen_8}/nickit/icon.png | Bin .../pokemon/{ => gen_8}/nickit/normal.pal | 0 graphics/pokemon/{ => gen_8}/nickit/shiny.pal | 0 .../pokemon/{ => gen_8}/obstagoon/back.png | Bin .../{ => gen_8}/obstagoon/footprint.png | Bin .../pokemon/{ => gen_8}/obstagoon/front.png | Bin .../pokemon/{ => gen_8}/obstagoon/icon.png | Bin .../pokemon/{ => gen_8}/obstagoon/normal.pal | 0 .../pokemon/{ => gen_8}/obstagoon/shiny.pal | 0 .../pokemon/{ => gen_8}/orbeetle/back.png | Bin .../{ => gen_8}/orbeetle/footprint.png | Bin .../pokemon/{ => gen_8}/orbeetle/front.png | Bin .../{ => gen_8}/orbeetle/gigantamax/back.png | Bin .../{ => gen_8}/orbeetle/gigantamax/front.png | Bin .../{ => gen_8}/orbeetle/gigantamax/icon.png | Bin .../orbeetle/gigantamax/normal.pal | 0 .../{ => gen_8}/orbeetle/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/orbeetle/icon.png | Bin .../pokemon/{ => gen_8}/orbeetle/normal.pal | 0 .../pokemon/{ => gen_8}/orbeetle/shiny.pal | 0 .../pokemon/{ => gen_8}/overqwil/back.png | Bin .../pokemon/{ => gen_8}/overqwil/front.png | Bin .../pokemon/{ => gen_8}/overqwil/icon.png | Bin .../pokemon/{ => gen_8}/overqwil/normal.pal | 0 .../pokemon/{ => gen_8}/overqwil/shiny.pal | 0 .../pokemon/{ => gen_8}/perrserker/back.png | Bin .../{ => gen_8}/perrserker/footprint.png | Bin .../pokemon/{ => gen_8}/perrserker/front.png | Bin .../pokemon/{ => gen_8}/perrserker/icon.png | Bin .../pokemon/{ => gen_8}/perrserker/normal.pal | 0 .../pokemon/{ => gen_8}/perrserker/shiny.pal | 0 .../{ => gen_8}/pincurchin/anim_front.png | Bin .../pokemon/{ => gen_8}/pincurchin/back.png | Bin .../pincurchin}/footprint.png | Bin .../pokemon/{ => gen_8}/pincurchin/icon.png | Bin .../pokemon/{ => gen_8}/pincurchin/normal.pal | 0 .../pokemon/{ => gen_8}/pincurchin/shiny.pal | 0 .../pokemon/{ => gen_8}/polteageist/back.png | Bin .../polteageist}/footprint.png | Bin .../pokemon/{ => gen_8}/polteageist/front.png | Bin .../pokemon/{ => gen_8}/polteageist/icon.png | Bin .../{ => gen_8}/polteageist/normal.pal | 0 .../pokemon/{ => gen_8}/polteageist/shiny.pal | 0 graphics/pokemon/{ => gen_8}/raboot/back.png | Bin .../pokemon/{ => gen_8}/raboot/footprint.png | Bin graphics/pokemon/{ => gen_8}/raboot/front.png | Bin graphics/pokemon/{ => gen_8}/raboot/icon.png | Bin .../pokemon/{ => gen_8}/raboot/normal.pal | 0 graphics/pokemon/{ => gen_8}/raboot/shiny.pal | 0 .../pokemon/{ => gen_8}/regidrago/back.png | Bin .../{ => gen_8}/regidrago/footprint.png | Bin .../pokemon/{ => gen_8}/regidrago/front.png | Bin .../pokemon/{ => gen_8}/regidrago/icon.png | Bin .../pokemon/{ => gen_8}/regidrago/normal.pal | 0 .../pokemon/{ => gen_8}/regidrago/shiny.pal | 0 .../pokemon/{ => gen_8}/regieleki/back.png | Bin .../regieleki}/footprint.png | Bin .../pokemon/{ => gen_8}/regieleki/front.png | Bin .../pokemon/{ => gen_8}/regieleki/icon.png | Bin .../pokemon/{ => gen_8}/regieleki/normal.pal | 0 .../pokemon/{ => gen_8}/regieleki/shiny.pal | 0 .../pokemon/{ => gen_8}/rillaboom/back.png | Bin .../{ => gen_8}/rillaboom/footprint.png | Bin .../pokemon/{ => gen_8}/rillaboom/front.png | Bin .../{ => gen_8}/rillaboom/gigantamax/back.png | Bin .../rillaboom/gigantamax/front.png | Bin .../{ => gen_8}/rillaboom/gigantamax/icon.png | Bin .../rillaboom/gigantamax/normal.pal | 0 .../rillaboom/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/rillaboom/icon.png | Bin .../pokemon/{ => gen_8}/rillaboom/normal.pal | 0 .../pokemon/{ => gen_8}/rillaboom/shiny.pal | 0 .../{ => gen_8}/rolycoly/anim_front.png | Bin .../pokemon/{ => gen_8}/rolycoly/back.png | Bin .../{ => gen_8}/rolycoly/footprint.png | Bin .../pokemon/{ => gen_8}/rolycoly/icon.png | Bin .../pokemon/{ => gen_8}/rolycoly/normal.pal | 0 .../pokemon/{ => gen_8}/rolycoly/shiny.pal | 0 .../{ => gen_8}/rookidee/anim_front.png | Bin .../pokemon/{ => gen_8}/rookidee/back.png | Bin .../{spearow => gen_8/rookidee}/footprint.png | Bin .../pokemon/{ => gen_8}/rookidee/icon.png | Bin .../pokemon/{ => gen_8}/rookidee/normal.pal | 0 .../pokemon/{ => gen_8}/rookidee/shiny.pal | 0 .../pokemon/{ => gen_8}/runerigus/back.png | Bin .../runerigus}/footprint.png | Bin .../pokemon/{ => gen_8}/runerigus/front.png | Bin .../pokemon/{ => gen_8}/runerigus/icon.png | Bin .../pokemon/{ => gen_8}/runerigus/normal.pal | 0 .../pokemon/{ => gen_8}/runerigus/shiny.pal | 0 .../pokemon/{ => gen_8}/sandaconda/back.png | Bin .../sandaconda}/footprint.png | Bin .../pokemon/{ => gen_8}/sandaconda/front.png | Bin .../sandaconda/gigantamax/back.png | Bin .../sandaconda/gigantamax/front.png | Bin .../sandaconda/gigantamax/icon.png | Bin .../sandaconda/gigantamax/normal.pal | 0 .../sandaconda/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/sandaconda/icon.png | Bin .../pokemon/{ => gen_8}/sandaconda/normal.pal | 0 .../pokemon/{ => gen_8}/sandaconda/shiny.pal | 0 .../pokemon/{ => gen_8}/scorbunny/back.png | Bin .../{ => gen_8}/scorbunny/footprint.png | Bin .../pokemon/{ => gen_8}/scorbunny/front.png | Bin .../pokemon/{ => gen_8}/scorbunny/icon.png | Bin .../pokemon/{ => gen_8}/scorbunny/normal.pal | 0 .../pokemon/{ => gen_8}/scorbunny/shiny.pal | 0 .../pokemon/{ => gen_8}/silicobra/back.png | Bin .../plant => gen_8/silicobra}/footprint.png | Bin .../pokemon/{ => gen_8}/silicobra/front.png | Bin .../pokemon/{ => gen_8}/silicobra/icon.png | Bin .../pokemon/{ => gen_8}/silicobra/normal.pal | 0 .../pokemon/{ => gen_8}/silicobra/shiny.pal | 0 .../pokemon/{ => gen_8}/sinistea/back.png | Bin .../{yamask => gen_8/sinistea}/footprint.png | Bin .../pokemon/{ => gen_8}/sinistea/front.png | Bin .../pokemon/{ => gen_8}/sinistea/icon.png | Bin .../pokemon/{ => gen_8}/sinistea/normal.pal | 0 .../pokemon/{ => gen_8}/sinistea/shiny.pal | 0 .../pokemon/{ => gen_8}/sirfetchd/back.png | Bin .../{ => gen_8}/sirfetchd/footprint.png | Bin .../pokemon/{ => gen_8}/sirfetchd/front.png | Bin .../pokemon/{ => gen_8}/sirfetchd/icon.png | Bin .../pokemon/{ => gen_8}/sirfetchd/normal.pal | 0 .../pokemon/{ => gen_8}/sirfetchd/shiny.pal | 0 .../{ => gen_8}/sizzlipede/anim_front.png | Bin .../pokemon/{ => gen_8}/sizzlipede/back.png | Bin .../sizzlipede}/footprint.png | Bin .../pokemon/{ => gen_8}/sizzlipede/icon.png | Bin .../pokemon/{ => gen_8}/sizzlipede/normal.pal | 0 .../pokemon/{ => gen_8}/sizzlipede/shiny.pal | 0 graphics/pokemon/{ => gen_8}/skwovet/back.png | Bin .../pokemon/{ => gen_8}/skwovet/footprint.png | Bin .../pokemon/{ => gen_8}/skwovet/front.png | Bin graphics/pokemon/{ => gen_8}/skwovet/icon.png | Bin .../pokemon/{ => gen_8}/skwovet/normal.pal | 0 .../pokemon/{ => gen_8}/skwovet/shiny.pal | 0 .../pokemon/{ => gen_8}/sneasler/back.png | Bin .../pokemon/{ => gen_8}/sneasler/front.png | Bin .../pokemon/{ => gen_8}/sneasler/icon.png | Bin .../pokemon/{ => gen_8}/sneasler/normal.pal | 0 .../pokemon/{ => gen_8}/sneasler/shiny.pal | 0 graphics/pokemon/{ => gen_8}/snom/back.png | Bin .../{zubat => gen_8/snom}/footprint.png | Bin graphics/pokemon/{ => gen_8}/snom/front.png | Bin graphics/pokemon/{ => gen_8}/snom/icon.png | Bin graphics/pokemon/{ => gen_8}/snom/normal.pal | 0 graphics/pokemon/{ => gen_8}/snom/shiny.pal | 0 graphics/pokemon/{ => gen_8}/sobble/back.png | Bin .../pokemon/{ => gen_8}/sobble/footprint.png | Bin graphics/pokemon/{ => gen_8}/sobble/front.png | Bin graphics/pokemon/{ => gen_8}/sobble/icon.png | Bin .../pokemon/{ => gen_8}/sobble/normal.pal | 0 graphics/pokemon/{ => gen_8}/sobble/shiny.pal | 0 .../pokemon/{ => gen_8}/spectrier/back.png | Bin .../{ => gen_8}/spectrier/footprint.png | Bin .../pokemon/{ => gen_8}/spectrier/front.png | Bin .../pokemon/{ => gen_8}/spectrier/icon.png | Bin .../pokemon/{ => gen_8}/spectrier/normal.pal | 0 .../pokemon/{ => gen_8}/spectrier/shiny.pal | 0 .../pokemon/{ => gen_8}/stonjourner/back.png | Bin .../{ => gen_8}/stonjourner/footprint.png | Bin .../pokemon/{ => gen_8}/stonjourner/front.png | Bin .../pokemon/{ => gen_8}/stonjourner/icon.png | Bin .../{ => gen_8}/stonjourner/normal.pal | 0 .../pokemon/{ => gen_8}/stonjourner/shiny.pal | 0 graphics/pokemon/{ => gen_8}/thievul/back.png | Bin .../pokemon/{ => gen_8}/thievul/footprint.png | Bin .../pokemon/{ => gen_8}/thievul/front.png | Bin graphics/pokemon/{ => gen_8}/thievul/icon.png | Bin .../pokemon/{ => gen_8}/thievul/normal.pal | 0 .../pokemon/{ => gen_8}/thievul/shiny.pal | 0 .../pokemon/{ => gen_8}/thwackey/back.png | Bin .../{ => gen_8}/thwackey/footprint.png | Bin .../pokemon/{ => gen_8}/thwackey/front.png | Bin .../pokemon/{ => gen_8}/thwackey/icon.png | Bin .../pokemon/{ => gen_8}/thwackey/normal.pal | 0 .../pokemon/{ => gen_8}/thwackey/shiny.pal | 0 graphics/pokemon/{ => gen_8}/toxel/back.png | Bin .../pokemon/{ => gen_8}/toxel/footprint.png | Bin graphics/pokemon/{ => gen_8}/toxel/front.png | Bin graphics/pokemon/{ => gen_8}/toxel/icon.png | Bin graphics/pokemon/{ => gen_8}/toxel/normal.pal | 0 graphics/pokemon/{ => gen_8}/toxel/shiny.pal | 0 .../pokemon/{ => gen_8}/toxtricity/back.png | Bin .../{ => gen_8}/toxtricity/footprint.png | Bin .../pokemon/{ => gen_8}/toxtricity/front.png | Bin .../toxtricity/gigantamax/back.png | Bin .../toxtricity/gigantamax/front.png | Bin .../toxtricity/gigantamax/icon.png | Bin .../toxtricity/gigantamax/normal.pal | 0 .../toxtricity/gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/toxtricity/icon.png | Bin .../{ => gen_8}/toxtricity/low_key/back.png | Bin .../{ => gen_8}/toxtricity/low_key/front.png | Bin .../{ => gen_8}/toxtricity/low_key/icon.png | Bin .../{ => gen_8}/toxtricity/low_key/normal.pal | 0 .../{ => gen_8}/toxtricity/low_key/shiny.pal | 0 .../pokemon/{ => gen_8}/toxtricity/normal.pal | 0 .../pokemon/{ => gen_8}/toxtricity/shiny.pal | 0 .../pokemon/{ => gen_8}/ursaluna/back.png | Bin .../{ => gen_8}/ursaluna/bloodmoon/back.png | Bin .../{ => gen_8}/ursaluna/bloodmoon/front.png | Bin .../{ => gen_8}/ursaluna/bloodmoon/normal.pal | 0 .../{ => gen_8}/ursaluna/bloodmoon/shiny.pal | 0 .../pokemon/{ => gen_8}/ursaluna/front.png | Bin .../pokemon/{ => gen_8}/ursaluna/icon.png | Bin .../pokemon/{ => gen_8}/ursaluna/normal.pal | 0 .../pokemon/{ => gen_8}/ursaluna/shiny.pal | 0 graphics/pokemon/{ => gen_8}/urshifu/back.png | Bin .../pokemon/{ => gen_8}/urshifu/footprint.png | Bin .../pokemon/{ => gen_8}/urshifu/front.png | Bin graphics/pokemon/{ => gen_8}/urshifu/icon.png | Bin .../pokemon/{ => gen_8}/urshifu/normal.pal | 0 .../urshifu/rapid_strike_style/back.png | Bin .../urshifu/rapid_strike_style/front.png | Bin .../urshifu/rapid_strike_style/normal.pal | 0 .../urshifu/rapid_strike_style/shiny.pal | 0 .../rapid_strike_style_gigantamax/back.png | Bin .../rapid_strike_style_gigantamax/front.png | Bin .../rapid_strike_style_gigantamax/icon.png | Bin .../rapid_strike_style_gigantamax/normal.pal | 0 .../rapid_strike_style_gigantamax/shiny.pal | 0 .../pokemon/{ => gen_8}/urshifu/shiny.pal | 0 .../single_strike_style_gigantamax/back.png | Bin .../single_strike_style_gigantamax/front.png | Bin .../single_strike_style_gigantamax/icon.png | Bin .../single_strike_style_gigantamax/normal.pal | 0 .../single_strike_style_gigantamax/shiny.pal | 0 graphics/pokemon/{ => gen_8}/wooloo/back.png | Bin .../pokemon/{ => gen_8}/wooloo/footprint.png | Bin graphics/pokemon/{ => gen_8}/wooloo/front.png | Bin graphics/pokemon/{ => gen_8}/wooloo/icon.png | Bin .../pokemon/{ => gen_8}/wooloo/normal.pal | 0 graphics/pokemon/{ => gen_8}/wooloo/shiny.pal | 0 graphics/pokemon/{ => gen_8}/wyrdeer/back.png | Bin .../pokemon/{ => gen_8}/wyrdeer/front.png | Bin graphics/pokemon/{ => gen_8}/wyrdeer/icon.png | Bin .../pokemon/{ => gen_8}/wyrdeer/normal.pal | 0 .../pokemon/{ => gen_8}/wyrdeer/shiny.pal | 0 graphics/pokemon/{ => gen_8}/yamper/back.png | Bin .../pokemon/{ => gen_8}/yamper/footprint.png | Bin graphics/pokemon/{ => gen_8}/yamper/front.png | Bin graphics/pokemon/{ => gen_8}/yamper/icon.png | Bin .../pokemon/{ => gen_8}/yamper/normal.pal | 0 graphics/pokemon/{ => gen_8}/yamper/shiny.pal | 0 graphics/pokemon/{ => gen_8}/zacian/back.png | Bin .../{ => gen_8}/zacian/crowned_sword/back.png | Bin .../zacian/crowned_sword/front.png | Bin .../{ => gen_8}/zacian/crowned_sword/icon.png | Bin .../zacian/crowned_sword/normal.pal | 0 .../zacian/crowned_sword/shiny.pal | 0 .../pokemon/{ => gen_8}/zacian/footprint.png | Bin graphics/pokemon/{ => gen_8}/zacian/front.png | Bin graphics/pokemon/{ => gen_8}/zacian/icon.png | Bin .../pokemon/{ => gen_8}/zacian/normal.pal | 0 graphics/pokemon/{ => gen_8}/zacian/shiny.pal | 0 .../pokemon/{ => gen_8}/zamazenta/back.png | Bin .../zamazenta/crowned_shield/back.png | Bin .../zamazenta/crowned_shield/front.png | Bin .../zamazenta/crowned_shield/icon.png | Bin .../zamazenta/crowned_shield/normal.pal | 0 .../zamazenta/crowned_shield/shiny.pal | 0 .../{ => gen_8}/zamazenta/footprint.png | Bin .../pokemon/{ => gen_8}/zamazenta/front.png | Bin .../pokemon/{ => gen_8}/zamazenta/icon.png | Bin .../pokemon/{ => gen_8}/zamazenta/normal.pal | 0 .../pokemon/{ => gen_8}/zamazenta/shiny.pal | 0 graphics/pokemon/{ => gen_8}/zarude/back.png | Bin .../pokemon/{ => gen_8}/zarude/dada/back.png | Bin .../pokemon/{ => gen_8}/zarude/dada/front.png | Bin .../pokemon/{ => gen_8}/zarude/dada/icon.png | Bin .../{ => gen_8}/zarude/dada/normal.pal | 0 .../pokemon/{ => gen_8}/zarude/dada/shiny.pal | 0 .../pokemon/{ => gen_8}/zarude/footprint.png | Bin graphics/pokemon/{ => gen_8}/zarude/front.png | Bin graphics/pokemon/{ => gen_8}/zarude/icon.png | Bin .../pokemon/{ => gen_8}/zarude/normal.pal | 0 graphics/pokemon/{ => gen_8}/zarude/shiny.pal | 0 .../pokemon/{ => gen_9}/annihilape/back.png | Bin .../pokemon/{ => gen_9}/annihilape/front.png | Bin .../pokemon/{ => gen_9}/annihilape/icon.png | Bin .../pokemon/{ => gen_9}/annihilape/normal.pal | 0 .../pokemon/{ => gen_9}/annihilape/shiny.pal | 0 .../pokemon/{ => gen_9}/arboliva/back.png | Bin .../pokemon/{ => gen_9}/arboliva/front.png | Bin .../pokemon/{ => gen_9}/arboliva/icon.png | Bin .../pokemon/{ => gen_9}/arboliva/normal.pal | 0 .../pokemon/{ => gen_9}/arboliva/shiny.pal | 0 .../pokemon/{ => gen_9}/arctibax/back.png | Bin .../pokemon/{ => gen_9}/arctibax/front.png | Bin .../pokemon/{ => gen_9}/arctibax/icon.png | Bin .../pokemon/{ => gen_9}/arctibax/normal.pal | 0 .../pokemon/{ => gen_9}/arctibax/shiny.pal | 0 .../pokemon/{ => gen_9}/armarouge/back.png | Bin .../pokemon/{ => gen_9}/armarouge/front.png | Bin .../pokemon/{ => gen_9}/armarouge/icon.png | Bin .../pokemon/{ => gen_9}/armarouge/normal.pal | 0 .../pokemon/{ => gen_9}/armarouge/shiny.pal | 0 .../pokemon/{ => gen_9}/baxcalibur/back.png | Bin .../pokemon/{ => gen_9}/baxcalibur/front.png | Bin .../pokemon/{ => gen_9}/baxcalibur/icon.png | Bin .../pokemon/{ => gen_9}/baxcalibur/normal.pal | 0 .../pokemon/{ => gen_9}/baxcalibur/shiny.pal | 0 .../pokemon/{ => gen_9}/bellibolt/back.png | Bin .../pokemon/{ => gen_9}/bellibolt/front.png | Bin .../pokemon/{ => gen_9}/bellibolt/icon.png | Bin .../pokemon/{ => gen_9}/bellibolt/normal.pal | 0 .../pokemon/{ => gen_9}/bellibolt/shiny.pal | 0 .../pokemon/{ => gen_9}/bombirdier/back.png | Bin .../pokemon/{ => gen_9}/bombirdier/front.png | Bin .../pokemon/{ => gen_9}/bombirdier/icon.png | Bin .../pokemon/{ => gen_9}/bombirdier/normal.pal | 0 .../pokemon/{ => gen_9}/bombirdier/shiny.pal | 0 .../pokemon/{ => gen_9}/brambleghast/back.png | Bin .../{ => gen_9}/brambleghast/front.png | Bin .../pokemon/{ => gen_9}/brambleghast/icon.png | Bin .../{ => gen_9}/brambleghast/normal.pal | 0 .../{ => gen_9}/brambleghast/shiny.pal | 0 .../pokemon/{ => gen_9}/bramblin/back.png | Bin .../pokemon/{ => gen_9}/bramblin/front.png | Bin .../pokemon/{ => gen_9}/bramblin/icon.png | Bin .../pokemon/{ => gen_9}/bramblin/normal.pal | 0 .../pokemon/{ => gen_9}/bramblin/shiny.pal | 0 .../pokemon/{ => gen_9}/brute_bonnet/back.png | Bin .../{ => gen_9}/brute_bonnet/front.png | Bin .../pokemon/{ => gen_9}/brute_bonnet/icon.png | Bin .../{ => gen_9}/brute_bonnet/normal.pal | 0 .../{ => gen_9}/brute_bonnet/shiny.pal | 0 .../pokemon/{ => gen_9}/capsakid/back.png | Bin .../pokemon/{ => gen_9}/capsakid/front.png | Bin .../pokemon/{ => gen_9}/capsakid/icon.png | Bin .../pokemon/{ => gen_9}/capsakid/normal.pal | 0 .../pokemon/{ => gen_9}/capsakid/shiny.pal | 0 .../pokemon/{ => gen_9}/ceruledge/back.png | Bin .../pokemon/{ => gen_9}/ceruledge/front.png | Bin .../pokemon/{ => gen_9}/ceruledge/icon.png | Bin .../pokemon/{ => gen_9}/ceruledge/normal.pal | 0 .../pokemon/{ => gen_9}/ceruledge/shiny.pal | 0 graphics/pokemon/{ => gen_9}/cetitan/back.png | Bin .../pokemon/{ => gen_9}/cetitan/front.png | Bin graphics/pokemon/{ => gen_9}/cetitan/icon.png | Bin .../pokemon/{ => gen_9}/cetitan/normal.pal | 0 .../pokemon/{ => gen_9}/cetitan/shiny.pal | 0 .../pokemon/{ => gen_9}/cetoddle/back.png | Bin .../pokemon/{ => gen_9}/cetoddle/front.png | Bin .../pokemon/{ => gen_9}/cetoddle/icon.png | Bin .../pokemon/{ => gen_9}/cetoddle/normal.pal | 0 .../pokemon/{ => gen_9}/cetoddle/shiny.pal | 0 .../pokemon/{ => gen_9}/charcadet/back.png | Bin .../pokemon/{ => gen_9}/charcadet/front.png | Bin .../pokemon/{ => gen_9}/charcadet/icon.png | Bin .../pokemon/{ => gen_9}/charcadet/normal.pal | 0 .../pokemon/{ => gen_9}/charcadet/shiny.pal | 0 graphics/pokemon/{ => gen_9}/chi_yu/back.png | Bin graphics/pokemon/{ => gen_9}/chi_yu/front.png | Bin graphics/pokemon/{ => gen_9}/chi_yu/icon.png | Bin .../pokemon/{ => gen_9}/chi_yu/normal.pal | 0 graphics/pokemon/{ => gen_9}/chi_yu/shiny.pal | 0 .../pokemon/{ => gen_9}/chien_pao/back.png | Bin .../pokemon/{ => gen_9}/chien_pao/front.png | Bin .../pokemon/{ => gen_9}/chien_pao/icon.png | Bin .../pokemon/{ => gen_9}/chien_pao/normal.pal | 0 .../pokemon/{ => gen_9}/chien_pao/shiny.pal | 0 .../pokemon/{ => gen_9}/clodsire/back.png | Bin .../pokemon/{ => gen_9}/clodsire/front.png | Bin .../pokemon/{ => gen_9}/clodsire/icon.png | Bin .../pokemon/{ => gen_9}/clodsire/normal.pal | 0 .../pokemon/{ => gen_9}/clodsire/shiny.pal | 0 .../pokemon/{ => gen_9}/crocalor/back.png | Bin .../pokemon/{ => gen_9}/crocalor/front.png | Bin .../pokemon/{ => gen_9}/crocalor/icon.png | Bin .../pokemon/{ => gen_9}/crocalor/normal.pal | 0 .../pokemon/{ => gen_9}/crocalor/shiny.pal | 0 .../pokemon/{ => gen_9}/cyclizar/back.png | Bin .../pokemon/{ => gen_9}/cyclizar/front.png | Bin .../pokemon/{ => gen_9}/cyclizar/icon.png | Bin .../pokemon/{ => gen_9}/cyclizar/normal.pal | 0 .../pokemon/{ => gen_9}/cyclizar/shiny.pal | 0 .../pokemon/{ => gen_9}/dachsbun/back.png | Bin .../pokemon/{ => gen_9}/dachsbun/front.png | Bin .../pokemon/{ => gen_9}/dachsbun/icon.png | Bin .../pokemon/{ => gen_9}/dachsbun/normal.pal | 0 .../pokemon/{ => gen_9}/dachsbun/shiny.pal | 0 graphics/pokemon/{ => gen_9}/dipplin/back.png | Bin .../pokemon/{ => gen_9}/dipplin/front.png | Bin graphics/pokemon/{ => gen_9}/dipplin/icon.png | Bin .../pokemon/{ => gen_9}/dipplin/normal.pal | 0 .../pokemon/{ => gen_9}/dipplin/shiny.pal | 0 graphics/pokemon/{ => gen_9}/dolliv/back.png | Bin graphics/pokemon/{ => gen_9}/dolliv/front.png | Bin graphics/pokemon/{ => gen_9}/dolliv/icon.png | Bin .../pokemon/{ => gen_9}/dolliv/normal.pal | 0 graphics/pokemon/{ => gen_9}/dolliv/shiny.pal | 0 graphics/pokemon/{ => gen_9}/dondozo/back.png | Bin .../pokemon/{ => gen_9}/dondozo/front.png | Bin graphics/pokemon/{ => gen_9}/dondozo/icon.png | Bin .../pokemon/{ => gen_9}/dondozo/normal.pal | 0 .../pokemon/{ => gen_9}/dondozo/shiny.pal | 0 .../pokemon/{ => gen_9}/dudunsparce/back.png | Bin .../pokemon/{ => gen_9}/dudunsparce/front.png | Bin .../pokemon/{ => gen_9}/dudunsparce/icon.png | Bin .../{ => gen_9}/dudunsparce/normal.pal | 0 .../pokemon/{ => gen_9}/dudunsparce/shiny.pal | 0 .../dudunsparce/three_segment/back.png | Bin .../dudunsparce/three_segment/front.png | Bin .../pokemon/{ => gen_9}/espathra/back.png | Bin .../pokemon/{ => gen_9}/espathra/front.png | Bin .../pokemon/{ => gen_9}/espathra/icon.png | Bin .../pokemon/{ => gen_9}/espathra/normal.pal | 0 .../pokemon/{ => gen_9}/espathra/shiny.pal | 0 .../pokemon/{ => gen_9}/farigiraf/back.png | Bin .../pokemon/{ => gen_9}/farigiraf/front.png | Bin .../pokemon/{ => gen_9}/farigiraf/icon.png | Bin .../pokemon/{ => gen_9}/farigiraf/normal.pal | 0 .../pokemon/{ => gen_9}/farigiraf/shiny.pal | 0 .../pokemon/{ => gen_9}/fezandipiti/back.png | Bin .../pokemon/{ => gen_9}/fezandipiti/front.png | Bin .../pokemon/{ => gen_9}/fezandipiti/icon.png | Bin .../{ => gen_9}/fezandipiti/normal.pal | 0 .../pokemon/{ => gen_9}/fezandipiti/shiny.pal | 0 graphics/pokemon/{ => gen_9}/fidough/back.png | Bin .../pokemon/{ => gen_9}/fidough/front.png | Bin graphics/pokemon/{ => gen_9}/fidough/icon.png | Bin .../pokemon/{ => gen_9}/fidough/normal.pal | 0 .../pokemon/{ => gen_9}/fidough/shiny.pal | 0 graphics/pokemon/{ => gen_9}/finizen/back.png | Bin .../pokemon/{ => gen_9}/finizen/front.png | Bin graphics/pokemon/{ => gen_9}/finizen/icon.png | Bin .../pokemon/{ => gen_9}/finizen/normal.pal | 0 .../pokemon/{ => gen_9}/finizen/shiny.pal | 0 graphics/pokemon/{ => gen_9}/flamigo/back.png | Bin .../pokemon/{ => gen_9}/flamigo/front.png | Bin graphics/pokemon/{ => gen_9}/flamigo/icon.png | Bin .../pokemon/{ => gen_9}/flamigo/normal.pal | 0 .../pokemon/{ => gen_9}/flamigo/shiny.pal | 0 graphics/pokemon/{ => gen_9}/flittle/back.png | Bin .../pokemon/{ => gen_9}/flittle/front.png | Bin graphics/pokemon/{ => gen_9}/flittle/icon.png | Bin .../pokemon/{ => gen_9}/flittle/normal.pal | 0 .../pokemon/{ => gen_9}/flittle/shiny.pal | 0 .../pokemon/{ => gen_9}/floragato/back.png | Bin .../pokemon/{ => gen_9}/floragato/front.png | Bin .../pokemon/{ => gen_9}/floragato/icon.png | Bin .../pokemon/{ => gen_9}/floragato/normal.pal | 0 .../pokemon/{ => gen_9}/floragato/shiny.pal | 0 .../pokemon/{ => gen_9}/flutter_mane/back.png | Bin .../{ => gen_9}/flutter_mane/front.png | Bin .../pokemon/{ => gen_9}/flutter_mane/icon.png | Bin .../{ => gen_9}/flutter_mane/normal.pal | 0 .../{ => gen_9}/flutter_mane/shiny.pal | 0 .../{ => gen_9}/frigibax/anim_front.png | Bin .../pokemon/{ => gen_9}/frigibax/back.png | Bin .../pokemon/{ => gen_9}/frigibax/icon.png | Bin .../pokemon/{ => gen_9}/frigibax/normal.pal | 0 .../pokemon/{ => gen_9}/frigibax/shiny.pal | 0 graphics/pokemon/{ => gen_9}/fuecoco/back.png | Bin .../pokemon/{ => gen_9}/fuecoco/front.png | Bin graphics/pokemon/{ => gen_9}/fuecoco/icon.png | Bin .../pokemon/{ => gen_9}/fuecoco/normal.pal | 0 .../pokemon/{ => gen_9}/fuecoco/shiny.pal | 0 .../pokemon/{ => gen_9}/garganacl/back.png | Bin .../pokemon/{ => gen_9}/garganacl/front.png | Bin .../pokemon/{ => gen_9}/garganacl/icon.png | Bin .../pokemon/{ => gen_9}/garganacl/normal.pal | 0 .../pokemon/{ => gen_9}/garganacl/shiny.pal | 0 .../pokemon/{ => gen_9}/gholdengo/back.png | Bin .../pokemon/{ => gen_9}/gholdengo/front.png | Bin .../pokemon/{ => gen_9}/gholdengo/icon.png | Bin .../pokemon/{ => gen_9}/gholdengo/normal.pal | 0 .../pokemon/{ => gen_9}/gholdengo/shiny.pal | 0 .../pokemon/{ => gen_9}/gimmighoul/back.png | Bin .../pokemon/{ => gen_9}/gimmighoul/front.png | Bin .../pokemon/{ => gen_9}/gimmighoul/icon.png | Bin .../pokemon/{ => gen_9}/gimmighoul/normal.pal | 0 .../{ => gen_9}/gimmighoul/roaming/back.png | Bin .../{ => gen_9}/gimmighoul/roaming/front.png | Bin .../{ => gen_9}/gimmighoul/roaming/icon.png | Bin .../{ => gen_9}/gimmighoul/roaming/normal.pal | 0 .../{ => gen_9}/gimmighoul/roaming/shiny.pal | 0 .../pokemon/{ => gen_9}/gimmighoul/shiny.pal | 0 graphics/pokemon/{ => gen_9}/glimmet/back.png | Bin .../pokemon/{ => gen_9}/glimmet/front.png | Bin graphics/pokemon/{ => gen_9}/glimmet/icon.png | Bin .../pokemon/{ => gen_9}/glimmet/normal.pal | 0 .../pokemon/{ => gen_9}/glimmet/shiny.pal | 0 .../pokemon/{ => gen_9}/glimmora/back.png | Bin .../pokemon/{ => gen_9}/glimmora/front.png | Bin .../pokemon/{ => gen_9}/glimmora/icon.png | Bin .../pokemon/{ => gen_9}/glimmora/normal.pal | 0 .../pokemon/{ => gen_9}/glimmora/shiny.pal | 0 .../pokemon/{ => gen_9}/grafaiai/back.png | Bin .../pokemon/{ => gen_9}/grafaiai/front.png | Bin .../pokemon/{ => gen_9}/grafaiai/icon.png | Bin .../pokemon/{ => gen_9}/grafaiai/normal.pal | 0 .../pokemon/{ => gen_9}/grafaiai/shiny.pal | 0 .../{ => gen_9}/great_tusk/anim_front.png | Bin .../pokemon/{ => gen_9}/great_tusk/back.png | Bin .../pokemon/{ => gen_9}/great_tusk/icon.png | Bin .../pokemon/{ => gen_9}/great_tusk/normal.pal | 0 .../pokemon/{ => gen_9}/great_tusk/shiny.pal | 0 .../pokemon/{ => gen_9}/greavard/back.png | Bin .../pokemon/{ => gen_9}/greavard/front.png | Bin .../pokemon/{ => gen_9}/greavard/icon.png | Bin .../pokemon/{ => gen_9}/greavard/normal.pal | 0 .../pokemon/{ => gen_9}/greavard/shiny.pal | 0 .../pokemon/{ => gen_9}/houndstone/back.png | Bin .../pokemon/{ => gen_9}/houndstone/front.png | Bin .../pokemon/{ => gen_9}/houndstone/icon.png | Bin .../pokemon/{ => gen_9}/houndstone/normal.pal | 0 .../pokemon/{ => gen_9}/houndstone/shiny.pal | 0 .../pokemon/{ => gen_9}/iron_bundle/back.png | Bin .../pokemon/{ => gen_9}/iron_bundle/front.png | Bin .../pokemon/{ => gen_9}/iron_bundle/icon.png | Bin .../{ => gen_9}/iron_bundle/normal.pal | 0 .../pokemon/{ => gen_9}/iron_bundle/shiny.pal | 0 .../pokemon/{ => gen_9}/iron_hands/back.png | Bin .../pokemon/{ => gen_9}/iron_hands/front.png | Bin .../pokemon/{ => gen_9}/iron_hands/icon.png | Bin .../pokemon/{ => gen_9}/iron_hands/normal.pal | 0 .../pokemon/{ => gen_9}/iron_hands/shiny.pal | 0 .../pokemon/{ => gen_9}/iron_jugulis/back.png | Bin .../{ => gen_9}/iron_jugulis/front.png | Bin .../pokemon/{ => gen_9}/iron_jugulis/icon.png | Bin .../{ => gen_9}/iron_jugulis/normal.pal | 0 .../{ => gen_9}/iron_jugulis/shiny.pal | 0 .../pokemon/{ => gen_9}/iron_leaves/back.png | Bin .../pokemon/{ => gen_9}/iron_leaves/front.png | Bin .../pokemon/{ => gen_9}/iron_leaves/icon.png | Bin .../{ => gen_9}/iron_leaves/normal.pal | 0 .../pokemon/{ => gen_9}/iron_leaves/shiny.pal | 0 .../pokemon/{ => gen_9}/iron_moth/back.png | Bin .../pokemon/{ => gen_9}/iron_moth/front.png | Bin .../pokemon/{ => gen_9}/iron_moth/icon.png | Bin .../pokemon/{ => gen_9}/iron_moth/normal.pal | 0 .../pokemon/{ => gen_9}/iron_moth/shiny.pal | 0 .../pokemon/{ => gen_9}/iron_thorns/back.png | Bin .../pokemon/{ => gen_9}/iron_thorns/front.png | Bin .../pokemon/{ => gen_9}/iron_thorns/icon.png | Bin .../{ => gen_9}/iron_thorns/normal.pal | 0 .../pokemon/{ => gen_9}/iron_thorns/shiny.pal | 0 .../pokemon/{ => gen_9}/iron_treads/back.png | Bin .../pokemon/{ => gen_9}/iron_treads/front.png | Bin .../pokemon/{ => gen_9}/iron_treads/icon.png | Bin .../{ => gen_9}/iron_treads/normal.pal | 0 .../pokemon/{ => gen_9}/iron_treads/shiny.pal | 0 .../pokemon/{ => gen_9}/iron_valiant/back.png | Bin .../{ => gen_9}/iron_valiant/front.png | Bin .../pokemon/{ => gen_9}/iron_valiant/icon.png | Bin .../{ => gen_9}/iron_valiant/normal.pal | 0 .../{ => gen_9}/iron_valiant/shiny.pal | 0 .../pokemon/{ => gen_9}/kilowattrel/back.png | Bin .../pokemon/{ => gen_9}/kilowattrel/front.png | Bin .../pokemon/{ => gen_9}/kilowattrel/icon.png | Bin .../{ => gen_9}/kilowattrel/normal.pal | 0 .../pokemon/{ => gen_9}/kilowattrel/shiny.pal | 0 .../pokemon/{ => gen_9}/kingambit/back.png | Bin .../pokemon/{ => gen_9}/kingambit/front.png | Bin .../pokemon/{ => gen_9}/kingambit/icon.png | Bin .../pokemon/{ => gen_9}/kingambit/normal.pal | 0 .../pokemon/{ => gen_9}/kingambit/shiny.pal | 0 graphics/pokemon/{ => gen_9}/klawf/back.png | Bin graphics/pokemon/{ => gen_9}/klawf/front.png | Bin graphics/pokemon/{ => gen_9}/klawf/icon.png | Bin graphics/pokemon/{ => gen_9}/klawf/normal.pal | 0 graphics/pokemon/{ => gen_9}/klawf/shiny.pal | 0 .../pokemon/{ => gen_9}/koraidon/back.png | Bin .../pokemon/{ => gen_9}/koraidon/front.png | Bin .../pokemon/{ => gen_9}/koraidon/icon.png | Bin .../pokemon/{ => gen_9}/koraidon/normal.pal | 0 .../pokemon/{ => gen_9}/koraidon/shiny.pal | 0 graphics/pokemon/{ => gen_9}/lechonk/back.png | Bin .../pokemon/{ => gen_9}/lechonk/front.png | Bin graphics/pokemon/{ => gen_9}/lechonk/icon.png | Bin .../pokemon/{ => gen_9}/lechonk/normal.pal | 0 .../pokemon/{ => gen_9}/lechonk/shiny.pal | 0 graphics/pokemon/{ => gen_9}/lokix/back.png | Bin graphics/pokemon/{ => gen_9}/lokix/front.png | Bin graphics/pokemon/{ => gen_9}/lokix/icon.png | Bin graphics/pokemon/{ => gen_9}/lokix/normal.pal | 0 graphics/pokemon/{ => gen_9}/lokix/shiny.pal | 0 .../pokemon/{ => gen_9}/mabosstiff/back.png | Bin .../pokemon/{ => gen_9}/mabosstiff/front.png | Bin .../pokemon/{ => gen_9}/mabosstiff/icon.png | Bin .../pokemon/{ => gen_9}/mabosstiff/normal.pal | 0 .../pokemon/{ => gen_9}/mabosstiff/shiny.pal | 0 .../pokemon/{ => gen_9}/maschiff/back.png | Bin .../pokemon/{ => gen_9}/maschiff/front.png | Bin .../pokemon/{ => gen_9}/maschiff/icon.png | Bin .../pokemon/{ => gen_9}/maschiff/normal.pal | 0 .../pokemon/{ => gen_9}/maschiff/shiny.pal | 0 .../pokemon/{ => gen_9}/maushold/back.png | Bin .../{ => gen_9}/maushold/four/back.png | Bin .../{ => gen_9}/maushold/four/front.png | Bin .../{ => gen_9}/maushold/four/icon.png | Bin .../pokemon/{ => gen_9}/maushold/front.png | Bin .../pokemon/{ => gen_9}/maushold/icon.png | Bin .../pokemon/{ => gen_9}/maushold/normal.pal | 0 .../pokemon/{ => gen_9}/maushold/shiny.pal | 0 .../pokemon/{ => gen_9}/meowscarada/back.png | Bin .../pokemon/{ => gen_9}/meowscarada/front.png | Bin .../pokemon/{ => gen_9}/meowscarada/icon.png | Bin .../{ => gen_9}/meowscarada/normal.pal | 0 .../pokemon/{ => gen_9}/meowscarada/shiny.pal | 0 .../pokemon/{ => gen_9}/miraidon/back.png | Bin .../pokemon/{ => gen_9}/miraidon/front.png | Bin .../pokemon/{ => gen_9}/miraidon/icon.png | Bin .../pokemon/{ => gen_9}/miraidon/normal.pal | 0 .../pokemon/{ => gen_9}/miraidon/shiny.pal | 0 .../pokemon/{ => gen_9}/munkidori/back.png | Bin .../pokemon/{ => gen_9}/munkidori/front.png | Bin .../pokemon/{ => gen_9}/munkidori/icon.png | Bin .../pokemon/{ => gen_9}/munkidori/normal.pal | 0 .../pokemon/{ => gen_9}/munkidori/shiny.pal | 0 graphics/pokemon/{ => gen_9}/nacli/back.png | Bin graphics/pokemon/{ => gen_9}/nacli/front.png | Bin graphics/pokemon/{ => gen_9}/nacli/icon.png | Bin graphics/pokemon/{ => gen_9}/nacli/normal.pal | 0 graphics/pokemon/{ => gen_9}/nacli/shiny.pal | 0 .../pokemon/{ => gen_9}/naclstack/back.png | Bin .../pokemon/{ => gen_9}/naclstack/front.png | Bin .../pokemon/{ => gen_9}/naclstack/icon.png | Bin .../pokemon/{ => gen_9}/naclstack/normal.pal | 0 .../pokemon/{ => gen_9}/naclstack/shiny.pal | 0 graphics/pokemon/{ => gen_9}/nymble/back.png | Bin graphics/pokemon/{ => gen_9}/nymble/front.png | Bin graphics/pokemon/{ => gen_9}/nymble/icon.png | Bin .../pokemon/{ => gen_9}/nymble/normal.pal | 0 graphics/pokemon/{ => gen_9}/nymble/shiny.pal | 0 graphics/pokemon/{ => gen_9}/ogerpon/back.png | Bin .../{ => gen_9}/ogerpon/cornerstone/back.png | Bin .../{ => gen_9}/ogerpon/cornerstone/front.png | Bin .../ogerpon/cornerstone/normal.pal | 0 .../pokemon/{ => gen_9}/ogerpon/front.png | Bin .../{ => gen_9}/ogerpon/hearthflame/back.png | Bin .../{ => gen_9}/ogerpon/hearthflame/front.png | Bin .../ogerpon/hearthflame/normal.pal | 0 graphics/pokemon/{ => gen_9}/ogerpon/icon.png | Bin .../pokemon/{ => gen_9}/ogerpon/normal.pal | 0 .../{ => gen_9}/ogerpon/wellspring/back.png | Bin .../{ => gen_9}/ogerpon/wellspring/front.png | Bin .../{ => gen_9}/ogerpon/wellspring/normal.pal | 0 .../pokemon/{ => gen_9}/oinkologne/back.png | Bin .../{ => gen_9}/oinkologne/female/back.png | Bin .../{ => gen_9}/oinkologne/female/front.png | Bin .../{ => gen_9}/oinkologne/female/icon.png | Bin .../oinkologne/female/iconTODO.png | Bin .../{ => gen_9}/oinkologne/female/normal.pal | 0 .../{ => gen_9}/oinkologne/female/shiny.pal | 0 .../pokemon/{ => gen_9}/oinkologne/front.png | Bin .../pokemon/{ => gen_9}/oinkologne/icon.png | Bin .../pokemon/{ => gen_9}/oinkologne/normal.pal | 0 .../pokemon/{ => gen_9}/oinkologne/shiny.pal | 0 graphics/pokemon/{ => gen_9}/okidogi/back.png | Bin .../pokemon/{ => gen_9}/okidogi/front.png | Bin graphics/pokemon/{ => gen_9}/okidogi/icon.png | Bin .../pokemon/{ => gen_9}/okidogi/normal.pal | 0 .../pokemon/{ => gen_9}/okidogi/shiny.pal | 0 .../pokemon/{ => gen_9}/orthworm/back.png | Bin .../pokemon/{ => gen_9}/orthworm/front.png | Bin .../pokemon/{ => gen_9}/orthworm/icon.png | Bin .../pokemon/{ => gen_9}/orthworm/normal.pal | 0 .../pokemon/{ => gen_9}/orthworm/shiny.pal | 0 graphics/pokemon/{ => gen_9}/palafin/back.png | Bin .../pokemon/{ => gen_9}/palafin/front.png | Bin .../pokemon/{ => gen_9}/palafin/hero/back.png | Bin .../{ => gen_9}/palafin/hero/front.png | Bin .../pokemon/{ => gen_9}/palafin/hero/icon.png | Bin .../{ => gen_9}/palafin/hero/normal.pal | 0 .../{ => gen_9}/palafin/hero/shiny.pal | 0 graphics/pokemon/{ => gen_9}/palafin/icon.png | Bin .../pokemon/{ => gen_9}/palafin/normal.pal | 0 .../pokemon/{ => gen_9}/palafin/shiny.pal | 0 graphics/pokemon/{ => gen_9}/pawmi/back.png | Bin graphics/pokemon/{ => gen_9}/pawmi/front.png | Bin graphics/pokemon/{ => gen_9}/pawmi/icon.png | Bin graphics/pokemon/{ => gen_9}/pawmi/normal.pal | 0 graphics/pokemon/{ => gen_9}/pawmi/normal.png | Bin graphics/pokemon/{ => gen_9}/pawmi/shiny.pal | 0 graphics/pokemon/{ => gen_9}/pawmo/back.png | Bin graphics/pokemon/{ => gen_9}/pawmo/front.png | Bin graphics/pokemon/{ => gen_9}/pawmo/icon.png | Bin graphics/pokemon/{ => gen_9}/pawmo/normal.pal | 0 graphics/pokemon/{ => gen_9}/pawmo/shiny.pal | 0 graphics/pokemon/{ => gen_9}/pawmot/back.png | Bin graphics/pokemon/{ => gen_9}/pawmot/front.png | Bin graphics/pokemon/{ => gen_9}/pawmot/icon.png | Bin .../pokemon/{ => gen_9}/pawmot/normal.pal | 0 graphics/pokemon/{ => gen_9}/pawmot/shiny.pal | 0 .../pokemon/{ => gen_9}/poltchageist/back.png | Bin .../{ => gen_9}/poltchageist/front.png | Bin .../pokemon/{ => gen_9}/poltchageist/icon.png | Bin .../{ => gen_9}/poltchageist/normal.pal | 0 .../{ => gen_9}/poltchageist/shiny.pal | 0 .../pokemon/{ => gen_9}/quaquaval/back.png | Bin .../pokemon/{ => gen_9}/quaquaval/front.png | Bin .../pokemon/{ => gen_9}/quaquaval/icon.png | Bin .../pokemon/{ => gen_9}/quaquaval/normal.pal | 0 .../pokemon/{ => gen_9}/quaquaval/shiny.pal | 0 graphics/pokemon/{ => gen_9}/quaxly/back.png | Bin graphics/pokemon/{ => gen_9}/quaxly/front.png | Bin graphics/pokemon/{ => gen_9}/quaxly/icon.png | Bin .../pokemon/{ => gen_9}/quaxly/normal.pal | 0 graphics/pokemon/{ => gen_9}/quaxly/shiny.pal | 0 .../pokemon/{ => gen_9}/quaxwell/back.png | Bin .../pokemon/{ => gen_9}/quaxwell/front.png | Bin .../pokemon/{ => gen_9}/quaxwell/icon.png | Bin .../pokemon/{ => gen_9}/quaxwell/normal.pal | 0 .../pokemon/{ => gen_9}/quaxwell/shiny.pal | 0 graphics/pokemon/{ => gen_9}/rabsca/back.png | Bin graphics/pokemon/{ => gen_9}/rabsca/front.png | Bin graphics/pokemon/{ => gen_9}/rabsca/icon.png | Bin .../pokemon/{ => gen_9}/rabsca/normal.pal | 0 graphics/pokemon/{ => gen_9}/rabsca/shiny.pal | 0 graphics/pokemon/{ => gen_9}/rellor/back.png | Bin graphics/pokemon/{ => gen_9}/rellor/front.png | Bin graphics/pokemon/{ => gen_9}/rellor/icon.png | Bin .../pokemon/{ => gen_9}/rellor/normal.pal | 0 graphics/pokemon/{ => gen_9}/rellor/shiny.pal | 0 .../pokemon/{ => gen_9}/revavroom/back.png | Bin .../pokemon/{ => gen_9}/revavroom/front.png | Bin .../pokemon/{ => gen_9}/revavroom/icon.png | Bin .../pokemon/{ => gen_9}/revavroom/normal.pal | 0 .../pokemon/{ => gen_9}/revavroom/shiny.pal | 0 .../pokemon/{ => gen_9}/roaring_moon/back.png | Bin .../{ => gen_9}/roaring_moon/front.png | Bin .../pokemon/{ => gen_9}/roaring_moon/icon.png | Bin .../{ => gen_9}/roaring_moon/normal.pal | 0 .../{ => gen_9}/roaring_moon/shiny.pal | 0 .../pokemon/{ => gen_9}/sandy_shocks/back.png | Bin .../{ => gen_9}/sandy_shocks/front.png | Bin .../pokemon/{ => gen_9}/sandy_shocks/icon.png | Bin .../{ => gen_9}/sandy_shocks/normal.pal | 0 .../{ => gen_9}/sandy_shocks/shiny.pal | 0 .../pokemon/{ => gen_9}/scovillain/back.png | Bin .../pokemon/{ => gen_9}/scovillain/front.png | Bin .../pokemon/{ => gen_9}/scovillain/icon.png | Bin .../pokemon/{ => gen_9}/scovillain/normal.pal | 0 .../pokemon/{ => gen_9}/scovillain/shiny.pal | 0 .../pokemon/{ => gen_9}/scream_tail/back.png | Bin .../pokemon/{ => gen_9}/scream_tail/front.png | Bin .../pokemon/{ => gen_9}/scream_tail/icon.png | Bin .../{ => gen_9}/scream_tail/normal.pal | 0 .../pokemon/{ => gen_9}/scream_tail/shiny.pal | 0 .../pokemon/{ => gen_9}/shroodle/back.png | Bin .../pokemon/{ => gen_9}/shroodle/front.png | Bin .../pokemon/{ => gen_9}/shroodle/icon.png | Bin .../pokemon/{ => gen_9}/shroodle/normal.pal | 0 .../pokemon/{ => gen_9}/shroodle/shiny.pal | 0 .../pokemon/{ => gen_9}/sinistcha/back.png | Bin .../pokemon/{ => gen_9}/sinistcha/front.png | Bin .../pokemon/{ => gen_9}/sinistcha/icon.png | Bin .../pokemon/{ => gen_9}/sinistcha/normal.pal | 0 .../pokemon/{ => gen_9}/sinistcha/shiny.pal | 0 .../pokemon/{ => gen_9}/skeledirge/back.png | Bin .../pokemon/{ => gen_9}/skeledirge/front.png | Bin .../pokemon/{ => gen_9}/skeledirge/icon.png | Bin .../pokemon/{ => gen_9}/skeledirge/normal.pal | 0 .../pokemon/{ => gen_9}/skeledirge/shiny.pal | 0 .../pokemon/{ => gen_9}/slither_wing/back.png | Bin .../{ => gen_9}/slither_wing/front.png | Bin .../pokemon/{ => gen_9}/slither_wing/icon.png | Bin .../{ => gen_9}/slither_wing/normal.pal | 0 .../{ => gen_9}/slither_wing/shiny.pal | 0 graphics/pokemon/{ => gen_9}/smoliv/back.png | Bin graphics/pokemon/{ => gen_9}/smoliv/front.png | Bin graphics/pokemon/{ => gen_9}/smoliv/icon.png | Bin .../pokemon/{ => gen_9}/smoliv/normal.pal | 0 graphics/pokemon/{ => gen_9}/smoliv/shiny.pal | 0 graphics/pokemon/{ => gen_9}/spidops/back.png | Bin .../pokemon/{ => gen_9}/spidops/front.png | Bin graphics/pokemon/{ => gen_9}/spidops/icon.png | Bin .../pokemon/{ => gen_9}/spidops/normal.pal | 0 .../pokemon/{ => gen_9}/spidops/shiny.pal | 0 .../pokemon/{ => gen_9}/sprigatito/back.png | Bin .../pokemon/{ => gen_9}/sprigatito/front.png | Bin .../pokemon/{ => gen_9}/sprigatito/icon.png | Bin .../pokemon/{ => gen_9}/sprigatito/normal.pal | 0 .../pokemon/{ => gen_9}/sprigatito/shiny.pal | 0 .../pokemon/{ => gen_9}/squawkabilly/back.png | Bin .../squawkabilly/blue_plumage/icon.png | Bin .../squawkabilly/blue_plumage/normal.pal | 0 .../squawkabilly/blue_plumage/shiny.pal | 0 .../{ => gen_9}/squawkabilly/front.png | Bin .../squawkabilly/green_plumage/icon.png | Bin .../squawkabilly/green_plumage/normal.pal | 0 .../squawkabilly/green_plumage/shiny.pal | 0 .../squawkabilly/white_plumage/icon.png | Bin .../squawkabilly/white_plumage/normal.pal | 0 .../squawkabilly/white_plumage/shiny.pal | 0 .../squawkabilly/yellow_plumage/icon.png | Bin .../squawkabilly/yellow_plumage/normal.pal | 0 .../squawkabilly/yellow_plumage/shiny.pal | 0 graphics/pokemon/{ => gen_9}/tadbulb/back.png | Bin .../pokemon/{ => gen_9}/tadbulb/front.png | Bin graphics/pokemon/{ => gen_9}/tadbulb/icon.png | Bin .../pokemon/{ => gen_9}/tadbulb/normal.pal | 0 .../pokemon/{ => gen_9}/tadbulb/shiny.pal | 0 .../pokemon/{ => gen_9}/tandemaus/back.png | Bin .../pokemon/{ => gen_9}/tandemaus/front.png | Bin .../pokemon/{ => gen_9}/tandemaus/icon.png | Bin .../pokemon/{ => gen_9}/tandemaus/normal.pal | 0 .../pokemon/{ => gen_9}/tandemaus/shiny.pal | 0 .../pokemon/{ => gen_9}/tarountula/back.png | Bin .../pokemon/{ => gen_9}/tarountula/front.png | Bin .../pokemon/{ => gen_9}/tarountula/icon.png | Bin .../pokemon/{ => gen_9}/tarountula/normal.pal | 0 .../pokemon/{ => gen_9}/tarountula/shiny.pal | 0 .../{ => gen_9}/tatsugiri/curly/back.png | Bin .../{ => gen_9}/tatsugiri/curly/front.png | Bin .../{ => gen_9}/tatsugiri/curly/icon.png | Bin .../{ => gen_9}/tatsugiri/curly/normal.pal | 0 .../{ => gen_9}/tatsugiri/curly/shiny.pal | 0 .../{ => gen_9}/tatsugiri/droopy/back.png | Bin .../{ => gen_9}/tatsugiri/droopy/front.png | Bin .../{ => gen_9}/tatsugiri/droopy/icon.png | Bin .../{ => gen_9}/tatsugiri/droopy/normal.pal | 0 .../{ => gen_9}/tatsugiri/droopy/shiny.pal | 0 .../{ => gen_9}/tatsugiri/stretchy/back.png | Bin .../{ => gen_9}/tatsugiri/stretchy/front.png | Bin .../{ => gen_9}/tatsugiri/stretchy/icon.png | Bin .../{ => gen_9}/tatsugiri/stretchy/normal.pal | 0 .../{ => gen_9}/tatsugiri/stretchy/shiny.pal | 0 graphics/pokemon/{ => gen_9}/ting_lu/back.png | Bin .../pokemon/{ => gen_9}/ting_lu/front.png | Bin graphics/pokemon/{ => gen_9}/ting_lu/icon.png | Bin .../pokemon/{ => gen_9}/ting_lu/normal.pal | 0 .../pokemon/{ => gen_9}/ting_lu/shiny.pal | 0 .../pokemon/{ => gen_9}/tinkatink/back.png | Bin .../pokemon/{ => gen_9}/tinkatink/front.png | Bin .../pokemon/{ => gen_9}/tinkatink/icon.png | Bin .../pokemon/{ => gen_9}/tinkatink/normal.pal | 0 .../pokemon/{ => gen_9}/tinkatink/shiny.pal | 0 .../pokemon/{ => gen_9}/tinkaton/back.png | Bin .../pokemon/{ => gen_9}/tinkaton/front.png | Bin .../pokemon/{ => gen_9}/tinkaton/icon.png | Bin .../pokemon/{ => gen_9}/tinkaton/normal.pal | 0 .../pokemon/{ => gen_9}/tinkaton/shiny.pal | 0 .../pokemon/{ => gen_9}/tinkatuff/back.png | Bin .../pokemon/{ => gen_9}/tinkatuff/front.png | Bin .../pokemon/{ => gen_9}/tinkatuff/icon.png | Bin .../pokemon/{ => gen_9}/tinkatuff/normal.pal | 0 .../pokemon/{ => gen_9}/tinkatuff/shiny.pal | 0 .../pokemon/{ => gen_9}/toedscool/back.png | Bin .../pokemon/{ => gen_9}/toedscool/front.png | Bin .../pokemon/{ => gen_9}/toedscool/icon.png | Bin .../pokemon/{ => gen_9}/toedscool/normal.pal | 0 .../pokemon/{ => gen_9}/toedscool/shiny.pal | 0 .../pokemon/{ => gen_9}/toedscruel/back.png | Bin .../pokemon/{ => gen_9}/toedscruel/front.png | Bin .../pokemon/{ => gen_9}/toedscruel/icon.png | Bin .../pokemon/{ => gen_9}/toedscruel/normal.pal | 0 .../pokemon/{ => gen_9}/toedscruel/shiny.pal | 0 graphics/pokemon/{ => gen_9}/varoom/back.png | Bin graphics/pokemon/{ => gen_9}/varoom/front.png | Bin graphics/pokemon/{ => gen_9}/varoom/icon.png | Bin .../pokemon/{ => gen_9}/varoom/normal.pal | 0 graphics/pokemon/{ => gen_9}/varoom/shiny.pal | 0 graphics/pokemon/{ => gen_9}/veluza/back.png | Bin graphics/pokemon/{ => gen_9}/veluza/front.png | Bin graphics/pokemon/{ => gen_9}/veluza/icon.png | Bin .../pokemon/{ => gen_9}/veluza/normal.pal | 0 graphics/pokemon/{ => gen_9}/veluza/shiny.pal | 0 .../pokemon/{ => gen_9}/walking_wake/back.png | Bin .../{ => gen_9}/walking_wake/front.png | Bin .../pokemon/{ => gen_9}/walking_wake/icon.png | Bin .../{ => gen_9}/walking_wake/normal.pal | 0 .../{ => gen_9}/walking_wake/shiny.pal | 0 graphics/pokemon/{ => gen_9}/wattrel/back.png | Bin .../pokemon/{ => gen_9}/wattrel/front.png | Bin graphics/pokemon/{ => gen_9}/wattrel/icon.png | Bin .../pokemon/{ => gen_9}/wattrel/normal.pal | 0 .../pokemon/{ => gen_9}/wattrel/shiny.pal | 0 graphics/pokemon/{ => gen_9}/wiglett/back.png | Bin .../pokemon/{ => gen_9}/wiglett/front.png | Bin graphics/pokemon/{ => gen_9}/wiglett/icon.png | Bin .../pokemon/{ => gen_9}/wiglett/normal.pal | 0 .../pokemon/{ => gen_9}/wiglett/shiny.pal | 0 .../pokemon/{ => gen_9}/wo_chien/back.png | Bin .../pokemon/{ => gen_9}/wo_chien/front.png | Bin .../pokemon/{ => gen_9}/wo_chien/icon.png | Bin .../pokemon/{ => gen_9}/wo_chien/normal.pal | 0 .../pokemon/{ => gen_9}/wo_chien/shiny.pal | 0 graphics/pokemon/{ => gen_9}/wugtrio/back.png | Bin .../pokemon/{ => gen_9}/wugtrio/front.png | Bin graphics/pokemon/{ => gen_9}/wugtrio/icon.png | Bin .../pokemon/{ => gen_9}/wugtrio/normal.pal | 0 .../pokemon/{ => gen_9}/wugtrio/shiny.pal | 0 graphics_file_rules.mk | 2 +- src/data/graphics/pokemon.h | 16040 ++++++++-------- src/pokemon.c | 8 +- 7834 files changed, 8026 insertions(+), 8024 deletions(-) rename graphics/pokemon/{ => gen_1}/abra/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/abra/back.png (100%) rename graphics/pokemon/{ => gen_1}/abra/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/abra/icon.png (100%) rename graphics/pokemon/{ => gen_1}/abra/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/abra/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/aerodactyl/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/aerodactyl/back.png (100%) rename graphics/pokemon/{ => gen_1}/aerodactyl/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/aerodactyl/icon.png (100%) rename graphics/pokemon/{ => gen_1}/aerodactyl/mega/back.png (100%) rename graphics/pokemon/{ => gen_1}/aerodactyl/mega/front.png (100%) rename graphics/pokemon/{ => gen_1}/aerodactyl/mega/icon.png (100%) rename graphics/pokemon/{ => gen_1}/aerodactyl/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/aerodactyl/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/aerodactyl/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/aerodactyl/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/alakazam/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/alakazam/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/alakazam/back.png (100%) rename graphics/pokemon/{ => gen_1}/alakazam/backf.png (100%) rename graphics/pokemon/{ => gen_1}/alakazam/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/alakazam/icon.png (100%) rename graphics/pokemon/{ => gen_1}/alakazam/mega/back.png (100%) rename graphics/pokemon/{ => gen_1}/alakazam/mega/front.png (100%) rename graphics/pokemon/{ => gen_1}/alakazam/mega/icon.png (100%) rename graphics/pokemon/{ => gen_1}/alakazam/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/alakazam/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/alakazam/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/alakazam/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/arbok/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/arbok/back.png (100%) rename graphics/pokemon/{accelgor => gen_1/arbok}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/arbok/icon.png (100%) rename graphics/pokemon/{ => gen_1}/arbok/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/arbok/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/arcanine/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/arcanine/back.png (100%) rename graphics/pokemon/{ => gen_1}/arcanine/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/arcanine/hisuian/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_1}/arcanine/hisuian/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_1}/arcanine/hisuian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/arcanine/hisuian/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_1}/arcanine/hisuian/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_1}/arcanine/icon.png (100%) rename graphics/pokemon/{ => gen_1}/arcanine/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/arcanine/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/articuno/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/articuno/back.png (100%) rename graphics/pokemon/{ => gen_1}/articuno/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/articuno/galarian/back.png (100%) rename graphics/pokemon/{ => gen_1}/articuno/galarian/front.png (100%) rename graphics/pokemon/{ => gen_1}/articuno/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/articuno/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/articuno/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/articuno/icon.png (100%) rename graphics/pokemon/{ => gen_1}/articuno/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/articuno/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/beedrill/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/beedrill/back.png (100%) rename graphics/pokemon/{ => gen_1}/beedrill/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/beedrill/icon.png (100%) rename graphics/pokemon/{ => gen_1}/beedrill/mega/back.png (100%) rename graphics/pokemon/{ => gen_1}/beedrill/mega/front.png (100%) rename graphics/pokemon/{ => gen_1}/beedrill/mega/icon.png (100%) rename graphics/pokemon/{ => gen_1}/beedrill/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/beedrill/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/beedrill/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/beedrill/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/bellsprout/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/bellsprout/back.png (100%) rename graphics/pokemon/{ => gen_1}/bellsprout/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/bellsprout/icon.png (100%) rename graphics/pokemon/{ => gen_1}/bellsprout/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/bellsprout/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/blastoise/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/blastoise/back.png (100%) rename graphics/pokemon/{ => gen_1}/blastoise/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/blastoise/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_1}/blastoise/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_1}/blastoise/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_1}/blastoise/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/blastoise/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/blastoise/icon.png (100%) rename graphics/pokemon/{ => gen_1}/blastoise/mega/back.png (100%) rename graphics/pokemon/{ => gen_1}/blastoise/mega/front.png (100%) rename graphics/pokemon/{ => gen_1}/blastoise/mega/icon.png (100%) rename graphics/pokemon/{ => gen_1}/blastoise/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/blastoise/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/blastoise/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/blastoise/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/bulbasaur/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/bulbasaur/back.png (100%) rename graphics/pokemon/{ => gen_1}/bulbasaur/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/bulbasaur/icon.png (100%) rename graphics/pokemon/{ => gen_1}/bulbasaur/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/bulbasaur/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/butterfree/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/butterfree/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/butterfree/back.png (100%) rename graphics/pokemon/{ => gen_1}/butterfree/backf.png (100%) rename graphics/pokemon/{ => gen_1}/butterfree/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/butterfree/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_1}/butterfree/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_1}/butterfree/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_1}/butterfree/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/butterfree/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/butterfree/icon.png (100%) rename graphics/pokemon/{ => gen_1}/butterfree/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/butterfree/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/caterpie/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/caterpie/back.png (100%) rename graphics/pokemon/{araquanid => gen_1/caterpie}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/caterpie/icon.png (100%) rename graphics/pokemon/{ => gen_1}/caterpie/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/caterpie/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/chansey/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/chansey/back.png (100%) rename graphics/pokemon/{ => gen_1}/chansey/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/chansey/icon.png (100%) rename graphics/pokemon/{ => gen_1}/chansey/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/chansey/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/charizard/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/charizard/back.png (100%) rename graphics/pokemon/{ => gen_1}/charizard/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/charizard/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_1}/charizard/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_1}/charizard/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_1}/charizard/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/charizard/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/charizard/icon.png (100%) rename graphics/pokemon/{ => gen_1}/charizard/mega_x/back.png (100%) rename graphics/pokemon/{ => gen_1}/charizard/mega_x/front.png (100%) rename graphics/pokemon/{ => gen_1}/charizard/mega_x/icon.png (100%) rename graphics/pokemon/{ => gen_1}/charizard/mega_x/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/charizard/mega_x/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/charizard/mega_y/back.png (100%) rename graphics/pokemon/{ => gen_1}/charizard/mega_y/front.png (100%) rename graphics/pokemon/{ => gen_1}/charizard/mega_y/icon.png (100%) rename graphics/pokemon/{ => gen_1}/charizard/mega_y/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/charizard/mega_y/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/charizard/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/charizard/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/charmander/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/charmander/back.png (100%) rename graphics/pokemon/{ => gen_1}/charmander/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/charmander/icon.png (100%) rename graphics/pokemon/{ => gen_1}/charmander/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/charmander/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/charmeleon/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/charmeleon/back.png (100%) rename graphics/pokemon/{ => gen_1}/charmeleon/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/charmeleon/icon.png (100%) rename graphics/pokemon/{ => gen_1}/charmeleon/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/charmeleon/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/clefable/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/clefable/back.png (100%) rename graphics/pokemon/{ => gen_1}/clefable/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/clefable/icon.png (100%) rename graphics/pokemon/{ => gen_1}/clefable/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/clefable/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/clefairy/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/clefairy/back.png (100%) rename graphics/pokemon/{chewtle => gen_1/clefairy}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/clefairy/icon.png (100%) rename graphics/pokemon/{ => gen_1}/clefairy/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/clefairy/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/cloyster/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/cloyster/back.png (100%) rename graphics/pokemon/{aegislash => gen_1/cloyster}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/cloyster/icon.png (100%) rename graphics/pokemon/{ => gen_1}/cloyster/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/cloyster/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/cubone/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/cubone/back.png (100%) rename graphics/pokemon/{ => gen_1}/cubone/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/cubone/icon.png (100%) rename graphics/pokemon/{ => gen_1}/cubone/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/cubone/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/dewgong/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/dewgong/back.png (100%) rename graphics/pokemon/{alcremie => gen_1/dewgong}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/dewgong/icon.png (100%) rename graphics/pokemon/{ => gen_1}/dewgong/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/dewgong/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/diglett/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/diglett/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/diglett/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/diglett/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/diglett/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/diglett/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/diglett/back.png (100%) rename graphics/pokemon/{alomomola => gen_1/diglett}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/diglett/icon.png (100%) rename graphics/pokemon/{ => gen_1}/diglett/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/diglett/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/ditto/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/ditto/back.png (100%) rename graphics/pokemon/{amoonguss => gen_1/ditto}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/ditto/icon.png (100%) rename graphics/pokemon/{ => gen_1}/ditto/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/ditto/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/dodrio/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/dodrio/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/dodrio/back.png (100%) rename graphics/pokemon/{ => gen_1}/dodrio/backf.png (100%) rename graphics/pokemon/{ => gen_1}/dodrio/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/dodrio/icon.png (100%) rename graphics/pokemon/{ => gen_1}/dodrio/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/dodrio/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/doduo/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/doduo/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/doduo/back.png (100%) rename graphics/pokemon/{ => gen_1}/doduo/backf.png (100%) rename graphics/pokemon/{ => gen_1}/doduo/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/doduo/icon.png (100%) rename graphics/pokemon/{ => gen_1}/doduo/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/doduo/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/dragonair/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/dragonair/back.png (100%) rename graphics/pokemon/{anorith => gen_1/dragonair}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/dragonair/icon.png (100%) rename graphics/pokemon/{ => gen_1}/dragonair/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/dragonair/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/dragonite/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/dragonite/back.png (100%) rename graphics/pokemon/{dracovish => gen_1/dragonite}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/dragonite/icon.png (100%) rename graphics/pokemon/{ => gen_1}/dragonite/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/dragonite/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/dratini/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/dratini/back.png (100%) rename graphics/pokemon/{applin => gen_1/dratini}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/dratini/icon.png (100%) rename graphics/pokemon/{ => gen_1}/dratini/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/dratini/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/drowzee/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/drowzee/back.png (100%) rename graphics/pokemon/{ => gen_1}/drowzee/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/drowzee/icon.png (100%) rename graphics/pokemon/{ => gen_1}/drowzee/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/drowzee/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/dugtrio/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/dugtrio/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/dugtrio/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/dugtrio/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/dugtrio/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/dugtrio/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/dugtrio/back.png (100%) rename graphics/pokemon/{arbok => gen_1/dugtrio}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/dugtrio/icon.png (100%) rename graphics/pokemon/{ => gen_1}/dugtrio/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/dugtrio/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/eevee/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/eevee/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/eevee/back.png (100%) rename graphics/pokemon/{ => gen_1}/eevee/backf.png (100%) rename graphics/pokemon/{ => gen_1}/eevee/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/eevee/frontf.png (100%) rename graphics/pokemon/{ => gen_1}/eevee/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_1}/eevee/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_1}/eevee/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_1}/eevee/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/eevee/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/eevee/icon.png (100%) rename graphics/pokemon/{ => gen_1}/eevee/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/eevee/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/ekans/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/ekans/back.png (100%) rename graphics/pokemon/{arrokuda => gen_1/ekans}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/ekans/icon.png (100%) rename graphics/pokemon/{ => gen_1}/ekans/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/ekans/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/electabuzz/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/electabuzz/back.png (100%) rename graphics/pokemon/{ => gen_1}/electabuzz/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/electabuzz/icon.png (100%) rename graphics/pokemon/{ => gen_1}/electabuzz/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/electabuzz/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/electrode/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/electrode/back.png (100%) rename graphics/pokemon/{barboach => gen_1/electrode}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/electrode/hisuian/back.png (100%) rename graphics/pokemon/{ => gen_1}/electrode/hisuian/front.png (100%) rename graphics/pokemon/{ => gen_1}/electrode/hisuian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/electrode/hisuian/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/electrode/hisuian/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/electrode/icon.png (100%) rename graphics/pokemon/{ => gen_1}/electrode/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/electrode/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/exeggcute/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/exeggcute/back.png (100%) rename graphics/pokemon/{barraskewda => gen_1/exeggcute}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/exeggcute/icon.png (100%) rename graphics/pokemon/{ => gen_1}/exeggcute/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/exeggcute/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/exeggutor/alolan/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/exeggutor/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/exeggutor/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/exeggutor/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/exeggutor/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/exeggutor/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/exeggutor/back.png (100%) rename graphics/pokemon/{ => gen_1}/exeggutor/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/exeggutor/icon.png (100%) rename graphics/pokemon/{ => gen_1}/exeggutor/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/exeggutor/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/farfetchd/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/farfetchd/back.png (100%) rename graphics/pokemon/{ => gen_1}/farfetchd/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/farfetchd/galarian/back.png (100%) rename graphics/pokemon/{ => gen_1}/farfetchd/galarian/front.png (100%) rename graphics/pokemon/{ => gen_1}/farfetchd/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/farfetchd/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/farfetchd/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/farfetchd/icon.png (100%) rename graphics/pokemon/{ => gen_1}/farfetchd/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/farfetchd/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/fearow/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/fearow/back.png (100%) rename graphics/pokemon/{ => gen_1}/fearow/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/fearow/icon.png (100%) rename graphics/pokemon/{ => gen_1}/fearow/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/fearow/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/flareon/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/flareon/back.png (100%) rename graphics/pokemon/{boltund => gen_1/flareon}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/flareon/icon.png (100%) rename graphics/pokemon/{ => gen_1}/flareon/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/flareon/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/gastly/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/gastly/back.png (100%) rename graphics/pokemon/{basculin => gen_1/gastly}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/gastly/icon.png (100%) rename graphics/pokemon/{ => gen_1}/gastly/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/gastly/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/gengar/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/gengar/back.png (100%) rename graphics/pokemon/{ => gen_1}/gengar/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/gengar/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_1}/gengar/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_1}/gengar/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_1}/gengar/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/gengar/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/gengar/icon.png (100%) rename graphics/pokemon/{ => gen_1}/gengar/mega/back.png (100%) rename graphics/pokemon/{ => gen_1}/gengar/mega/front.png (100%) rename graphics/pokemon/{ => gen_1}/gengar/mega/icon.png (100%) rename graphics/pokemon/{ => gen_1}/gengar/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/gengar/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/gengar/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/gengar/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/geodude/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/geodude/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/geodude/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/geodude/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/geodude/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/geodude/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/geodude/back.png (100%) rename graphics/pokemon/{bellossom => gen_1/geodude}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/geodude/icon.png (100%) rename graphics/pokemon/{ => gen_1}/geodude/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/geodude/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/gloom/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/gloom/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/gloom/back.png (100%) rename graphics/pokemon/{ => gen_1}/gloom/backf.png (100%) rename graphics/pokemon/{ => gen_1}/gloom/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/gloom/icon.png (100%) rename graphics/pokemon/{ => gen_1}/gloom/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/gloom/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/golbat/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/golbat/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/golbat/back.png (100%) rename graphics/pokemon/{ => gen_1}/golbat/backf.png (100%) rename graphics/pokemon/{ => gen_1}/golbat/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/golbat/icon.png (100%) rename graphics/pokemon/{ => gen_1}/golbat/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/golbat/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/goldeen/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/goldeen/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/goldeen/back.png (100%) rename graphics/pokemon/{ => gen_1}/goldeen/backf.png (100%) rename graphics/pokemon/{binacle => gen_1/goldeen}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/goldeen/icon.png (100%) rename graphics/pokemon/{ => gen_1}/goldeen/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/goldeen/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/golduck/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/golduck/back.png (100%) rename graphics/pokemon/{ => gen_1}/golduck/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/golduck/icon.png (100%) rename graphics/pokemon/{ => gen_1}/golduck/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/golduck/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/golem/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/golem/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/golem/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/golem/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/golem/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/golem/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/golem/back.png (100%) rename graphics/pokemon/{ => gen_1}/golem/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/golem/icon.png (100%) rename graphics/pokemon/{ => gen_1}/golem/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/golem/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/graveler/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/graveler/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/graveler/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/graveler/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/graveler/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/graveler/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/graveler/back.png (100%) rename graphics/pokemon/{ => gen_1}/graveler/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/graveler/icon.png (100%) rename graphics/pokemon/{ => gen_1}/graveler/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/graveler/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/grimer/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/grimer/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/grimer/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/grimer/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/grimer/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/grimer/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/grimer/back.png (100%) rename graphics/pokemon/{brionne => gen_1/grimer}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/grimer/icon.png (100%) rename graphics/pokemon/{ => gen_1}/grimer/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/grimer/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/growlithe/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/growlithe/back.png (100%) rename graphics/pokemon/{ => gen_1}/growlithe/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/growlithe/hisuian/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_1}/growlithe/hisuian/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_1}/growlithe/hisuian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/growlithe/hisuian/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_1}/growlithe/hisuian/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_1}/growlithe/icon.png (100%) rename graphics/pokemon/{ => gen_1}/growlithe/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/growlithe/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/gyarados/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/gyarados/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/gyarados/back.png (100%) rename graphics/pokemon/{ => gen_1}/gyarados/backf.png (100%) rename graphics/pokemon/{bronzong => gen_1/gyarados}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/gyarados/icon.png (100%) rename graphics/pokemon/{ => gen_1}/gyarados/mega/back.png (100%) rename graphics/pokemon/{ => gen_1}/gyarados/mega/front.png (100%) rename graphics/pokemon/{ => gen_1}/gyarados/mega/icon.png (100%) rename graphics/pokemon/{ => gen_1}/gyarados/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/gyarados/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/gyarados/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/gyarados/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/haunter/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/haunter/back.png (100%) rename graphics/pokemon/{bronzor => gen_1/haunter}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/haunter/icon.png (100%) rename graphics/pokemon/{ => gen_1}/haunter/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/haunter/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/hitmonchan/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/hitmonchan/back.png (100%) rename graphics/pokemon/{ => gen_1}/hitmonchan/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/hitmonchan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/hitmonchan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/hitmonchan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/hitmonlee/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/hitmonlee/back.png (100%) rename graphics/pokemon/{ => gen_1}/hitmonlee/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/hitmonlee/icon.png (100%) rename graphics/pokemon/{ => gen_1}/hitmonlee/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/hitmonlee/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/horsea/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/horsea/back.png (100%) rename graphics/pokemon/{bruxish => gen_1/horsea}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/horsea/icon.png (100%) rename graphics/pokemon/{ => gen_1}/horsea/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/horsea/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/hypno/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/hypno/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/hypno/back.png (100%) rename graphics/pokemon/{ => gen_1}/hypno/backf.png (100%) rename graphics/pokemon/{ => gen_1}/hypno/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/hypno/icon.png (100%) rename graphics/pokemon/{ => gen_1}/hypno/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/hypno/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/ivysaur/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/ivysaur/back.png (100%) rename graphics/pokemon/{drednaw => gen_1/ivysaur}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/ivysaur/icon.png (100%) rename graphics/pokemon/{ => gen_1}/ivysaur/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/ivysaur/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/jigglypuff/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/jigglypuff/back.png (100%) rename graphics/pokemon/{ => gen_1}/jigglypuff/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/jigglypuff/icon.png (100%) rename graphics/pokemon/{ => gen_1}/jigglypuff/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/jigglypuff/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/jolteon/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/jolteon/back.png (100%) rename graphics/pokemon/{ => gen_1}/jolteon/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/jolteon/icon.png (100%) rename graphics/pokemon/{ => gen_1}/jolteon/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/jolteon/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/jynx/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/jynx/back.png (100%) rename graphics/pokemon/{burmy/plant => gen_1/jynx}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/jynx/icon.png (100%) rename graphics/pokemon/{ => gen_1}/jynx/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/jynx/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/kabuto/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/kabuto/back.png (100%) rename graphics/pokemon/{baltoy => gen_1/kabuto}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/kabuto/icon.png (100%) rename graphics/pokemon/{ => gen_1}/kabuto/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/kabuto/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/kabutops/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/kabutops/back.png (100%) rename graphics/pokemon/{ => gen_1}/kabutops/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/kabutops/icon.png (100%) rename graphics/pokemon/{ => gen_1}/kabutops/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/kabutops/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/kadabra/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/kadabra/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/kadabra/back.png (100%) rename graphics/pokemon/{ => gen_1}/kadabra/backf.png (100%) rename graphics/pokemon/{ => gen_1}/kadabra/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/kadabra/icon.png (100%) rename graphics/pokemon/{ => gen_1}/kadabra/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/kadabra/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/kakuna/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/kakuna/back.png (100%) rename graphics/pokemon/{carbink => gen_1/kakuna}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/kakuna/icon.png (100%) rename graphics/pokemon/{ => gen_1}/kakuna/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/kakuna/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/kangaskhan/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/kangaskhan/back.png (100%) rename graphics/pokemon/{ => gen_1}/kangaskhan/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/kangaskhan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/kangaskhan/mega/back.png (100%) rename graphics/pokemon/{ => gen_1}/kangaskhan/mega/front.png (100%) rename graphics/pokemon/{ => gen_1}/kangaskhan/mega/icon.png (100%) rename graphics/pokemon/{ => gen_1}/kangaskhan/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/kangaskhan/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/kangaskhan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/kangaskhan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/kingler/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/kingler/back.png (100%) rename graphics/pokemon/{ => gen_1}/kingler/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/kingler/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_1}/kingler/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_1}/kingler/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_1}/kingler/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/kingler/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/kingler/icon.png (100%) rename graphics/pokemon/{ => gen_1}/kingler/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/kingler/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/koffing/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/koffing/back.png (100%) rename graphics/pokemon/{carnivine => gen_1/koffing}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/koffing/icon.png (100%) rename graphics/pokemon/{ => gen_1}/koffing/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/koffing/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/krabby/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/krabby/back.png (100%) rename graphics/pokemon/{ => gen_1}/krabby/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/krabby/icon.png (100%) rename graphics/pokemon/{ => gen_1}/krabby/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/krabby/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/lapras/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/lapras/back.png (100%) rename graphics/pokemon/{carvanha => gen_1/lapras}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/lapras/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_1}/lapras/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_1}/lapras/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_1}/lapras/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/lapras/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/lapras/icon.png (100%) rename graphics/pokemon/{ => gen_1}/lapras/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/lapras/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/lickitung/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/lickitung/back.png (100%) rename graphics/pokemon/{ => gen_1}/lickitung/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/lickitung/icon.png (100%) rename graphics/pokemon/{ => gen_1}/lickitung/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/lickitung/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/machamp/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/machamp/back.png (100%) rename graphics/pokemon/{ => gen_1}/machamp/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/machamp/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_1}/machamp/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_1}/machamp/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_1}/machamp/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/machamp/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/machamp/icon.png (100%) rename graphics/pokemon/{ => gen_1}/machamp/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/machamp/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/machoke/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/machoke/back.png (100%) rename graphics/pokemon/{ => gen_1}/machoke/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/machoke/icon.png (100%) rename graphics/pokemon/{ => gen_1}/machoke/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/machoke/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/machop/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/machop/back.png (100%) rename graphics/pokemon/{ => gen_1}/machop/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/machop/icon.png (100%) rename graphics/pokemon/{ => gen_1}/machop/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/machop/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/magikarp/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/magikarp/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/magikarp/back.png (100%) rename graphics/pokemon/{ => gen_1}/magikarp/backf.png (100%) rename graphics/pokemon/{cascoon => gen_1/magikarp}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/magikarp/icon.png (100%) rename graphics/pokemon/{ => gen_1}/magikarp/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/magikarp/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/magmar/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/magmar/back.png (100%) rename graphics/pokemon/{ => gen_1}/magmar/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/magmar/icon.png (100%) rename graphics/pokemon/{ => gen_1}/magmar/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/magmar/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/magnemite/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/magnemite/back.png (100%) rename graphics/pokemon/{ => gen_1}/magnemite/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/magnemite/icon.png (100%) rename graphics/pokemon/{ => gen_1}/magnemite/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/magnemite/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/magneton/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/magneton/back.png (100%) rename graphics/pokemon/{ => gen_1}/magneton/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/magneton/icon.png (100%) rename graphics/pokemon/{ => gen_1}/magneton/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/magneton/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/mankey/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/mankey/back.png (100%) rename graphics/pokemon/{ => gen_1}/mankey/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/mankey/icon.png (100%) rename graphics/pokemon/{ => gen_1}/mankey/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/mankey/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/marowak/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/marowak/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/marowak/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/marowak/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/marowak/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/marowak/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/marowak/back.png (100%) rename graphics/pokemon/{ => gen_1}/marowak/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/marowak/icon.png (100%) rename graphics/pokemon/{ => gen_1}/marowak/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/marowak/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/meowth/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/meowth/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/meowth/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/meowth/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/meowth/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/meowth/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/meowth/back.png (100%) rename graphics/pokemon/{ => gen_1}/meowth/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/meowth/galarian/back.png (100%) rename graphics/pokemon/{ => gen_1}/meowth/galarian/front.png (100%) rename graphics/pokemon/{ => gen_1}/meowth/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/meowth/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/meowth/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/meowth/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_1}/meowth/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_1}/meowth/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_1}/meowth/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/meowth/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/meowth/icon.png (100%) rename graphics/pokemon/{ => gen_1}/meowth/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/meowth/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/metapod/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/metapod/back.png (100%) rename graphics/pokemon/{castform => gen_1/metapod}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/metapod/icon.png (100%) rename graphics/pokemon/{ => gen_1}/metapod/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/metapod/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/mew/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/mew/back.png (100%) rename graphics/pokemon/{ => gen_1}/mew/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/mew/icon.png (100%) rename graphics/pokemon/{ => gen_1}/mew/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/mew/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/back.png (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/icon.png (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/mega_x/back.png (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/mega_x/front.png (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/mega_x/icon.png (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/mega_x/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/mega_x/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/mega_y/back.png (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/mega_y/front.png (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/mega_y/icon.png (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/mega_y/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/mega_y/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/mewtwo/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/moltres/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/moltres/back.png (100%) rename graphics/pokemon/{ => gen_1}/moltres/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/moltres/galarian/back.png (100%) rename graphics/pokemon/{ => gen_1}/moltres/galarian/front.png (100%) rename graphics/pokemon/{ => gen_1}/moltres/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/moltres/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/moltres/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/moltres/icon.png (100%) rename graphics/pokemon/{ => gen_1}/moltres/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/moltres/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/mr_mime/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/mr_mime/back.png (100%) rename graphics/pokemon/{blacephalon => gen_1/mr_mime}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/mr_mime/galarian/back.png (100%) rename graphics/pokemon/{ => gen_1}/mr_mime/galarian/front.png (100%) rename graphics/pokemon/{ => gen_1}/mr_mime/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/mr_mime/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/mr_mime/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/mr_mime/icon.png (100%) rename graphics/pokemon/{ => gen_1}/mr_mime/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/mr_mime/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/muk/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/muk/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/muk/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/muk/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/muk/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/muk/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/muk/back.png (100%) rename graphics/pokemon/{chandelure => gen_1/muk}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/muk/icon.png (100%) rename graphics/pokemon/{ => gen_1}/muk/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/muk/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/nidoking/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/nidoking/back.png (100%) rename graphics/pokemon/{ => gen_1}/nidoking/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/nidoking/icon.png (100%) rename graphics/pokemon/{ => gen_1}/nidoking/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/nidoking/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/nidoqueen/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/nidoqueen/back.png (100%) rename graphics/pokemon/{ => gen_1}/nidoqueen/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/nidoqueen/icon.png (100%) rename graphics/pokemon/{ => gen_1}/nidoqueen/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/nidoqueen/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/nidoran_f/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/nidoran_f/back.png (100%) rename graphics/pokemon/{ => gen_1}/nidoran_f/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/nidoran_f/icon.png (100%) rename graphics/pokemon/{ => gen_1}/nidoran_f/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/nidoran_f/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/nidoran_m/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/nidoran_m/back.png (100%) rename graphics/pokemon/{ => gen_1}/nidoran_m/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/nidoran_m/icon.png (100%) rename graphics/pokemon/{ => gen_1}/nidoran_m/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/nidoran_m/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/nidorina/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/nidorina/back.png (100%) rename graphics/pokemon/{ => gen_1}/nidorina/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/nidorina/icon.png (100%) rename graphics/pokemon/{ => gen_1}/nidorina/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/nidorina/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/nidorino/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/nidorino/back.png (100%) rename graphics/pokemon/{ => gen_1}/nidorino/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/nidorino/icon.png (100%) rename graphics/pokemon/{ => gen_1}/nidorino/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/nidorino/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/ninetales/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/ninetales/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/ninetales/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/ninetales/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/ninetales/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/ninetales/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/ninetales/back.png (100%) rename graphics/pokemon/{ => gen_1}/ninetales/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/ninetales/icon.png (100%) rename graphics/pokemon/{ => gen_1}/ninetales/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/ninetales/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/oddish/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/oddish/back.png (100%) rename graphics/pokemon/{ => gen_1}/oddish/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/oddish/icon.png (100%) rename graphics/pokemon/{ => gen_1}/oddish/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/oddish/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/omanyte/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/omanyte/back.png (100%) rename graphics/pokemon/{ => gen_1}/omanyte/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/omanyte/icon.png (100%) rename graphics/pokemon/{ => gen_1}/omanyte/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/omanyte/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/omastar/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/omastar/back.png (100%) rename graphics/pokemon/{ => gen_1}/omastar/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/omastar/icon.png (100%) rename graphics/pokemon/{ => gen_1}/omastar/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/omastar/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/onix/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/onix/back.png (100%) rename graphics/pokemon/{charjabug => gen_1/onix}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/onix/icon.png (100%) rename graphics/pokemon/{ => gen_1}/onix/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/onix/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/paras/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/paras/back.png (100%) rename graphics/pokemon/{gossifleur => gen_1/paras}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/paras/icon.png (100%) rename graphics/pokemon/{ => gen_1}/paras/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/paras/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/parasect/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/parasect/back.png (100%) rename graphics/pokemon/{ => gen_1}/parasect/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/parasect/icon.png (100%) rename graphics/pokemon/{ => gen_1}/parasect/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/parasect/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/persian/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/persian/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/persian/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/persian/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/persian/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/persian/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/persian/back.png (100%) rename graphics/pokemon/{ => gen_1}/persian/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/persian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/persian/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/persian/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pidgeot/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/pidgeot/back.png (100%) rename graphics/pokemon/{corviknight => gen_1/pidgeot}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/pidgeot/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pidgeot/mega/back.png (100%) rename graphics/pokemon/{ => gen_1}/pidgeot/mega/front.png (100%) rename graphics/pokemon/{ => gen_1}/pidgeot/mega/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pidgeot/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pidgeot/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pidgeot/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pidgeot/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pidgeotto/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/pidgeotto/back.png (100%) rename graphics/pokemon/{corvisquire => gen_1/pidgeotto}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/pidgeotto/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pidgeotto/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pidgeotto/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pidgey/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/pidgey/back.png (100%) rename graphics/pokemon/{ => gen_1}/pidgey/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/pidgey/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pidgey/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pidgey/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/alola_cap/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/alola_cap/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/alola_cap/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/alola_cap/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/alola_cap/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/backf.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/belle/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/belle/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/belle/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/belle/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/belle/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/cosplay/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/cosplay/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/cosplay/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/cosplay/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/cosplay/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/hoenn_cap/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/hoenn_cap/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/hoenn_cap/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/hoenn_cap/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/hoenn_cap/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/iconf.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/kalos_cap/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/kalos_cap/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/kalos_cap/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/kalos_cap/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/kalos_cap/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/libre/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/libre/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/libre/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/libre/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/libre/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/original_cap/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/original_cap/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/original_cap/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/original_cap/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/original_cap/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/partner_cap/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/partner_cap/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/partner_cap/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/partner_cap/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/partner_cap/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/ph_d/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/ph_d/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/ph_d/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/ph_d/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/ph_d/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/pop_star/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/pop_star/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/pop_star/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/pop_star/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/pop_star/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/rock_star/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/rock_star/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/rock_star/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/rock_star/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/rock_star/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/sinnoh_cap/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/sinnoh_cap/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/sinnoh_cap/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/sinnoh_cap/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/sinnoh_cap/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/unova_cap/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/unova_cap/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/unova_cap/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/unova_cap/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/unova_cap/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/world_cap/back.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/world_cap/front.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/world_cap/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pikachu/world_cap/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pikachu/world_cap/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pinsir/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/pinsir/back.png (100%) rename graphics/pokemon/{ => gen_1}/pinsir/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/pinsir/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pinsir/mega/back.png (100%) rename graphics/pokemon/{ => gen_1}/pinsir/mega/front.png (100%) rename graphics/pokemon/{ => gen_1}/pinsir/mega/icon.png (100%) rename graphics/pokemon/{ => gen_1}/pinsir/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pinsir/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/pinsir/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/pinsir/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/poliwag/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/poliwag/back.png (100%) rename graphics/pokemon/{clobbopus => gen_1/poliwag}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/poliwag/icon.png (100%) rename graphics/pokemon/{ => gen_1}/poliwag/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/poliwag/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/poliwhirl/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/poliwhirl/back.png (100%) rename graphics/pokemon/{ => gen_1}/poliwhirl/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/poliwhirl/icon.png (100%) rename graphics/pokemon/{ => gen_1}/poliwhirl/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/poliwhirl/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/poliwrath/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/poliwrath/back.png (100%) rename graphics/pokemon/{ => gen_1}/poliwrath/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/poliwrath/icon.png (100%) rename graphics/pokemon/{ => gen_1}/poliwrath/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/poliwrath/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/ponyta/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/ponyta/back.png (100%) rename graphics/pokemon/{ => gen_1}/ponyta/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/ponyta/galarian/back.png (100%) rename graphics/pokemon/{ => gen_1}/ponyta/galarian/front.png (100%) rename graphics/pokemon/{ => gen_1}/ponyta/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/ponyta/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/ponyta/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/ponyta/icon.png (100%) rename graphics/pokemon/{ => gen_1}/ponyta/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/ponyta/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/porygon/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/porygon/back.png (100%) rename graphics/pokemon/{ => gen_1}/porygon/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/porygon/icon.png (100%) rename graphics/pokemon/{ => gen_1}/porygon/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/porygon/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/primeape/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/primeape/back.png (100%) rename graphics/pokemon/{ => gen_1}/primeape/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/primeape/icon.png (100%) rename graphics/pokemon/{ => gen_1}/primeape/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/primeape/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/psyduck/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/psyduck/back.png (100%) rename graphics/pokemon/{cramorant => gen_1/psyduck}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/psyduck/icon.png (100%) rename graphics/pokemon/{ => gen_1}/psyduck/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/psyduck/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/raichu/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/raichu/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/raichu/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/raichu/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/raichu/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/raichu/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/raichu/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/raichu/back.png (100%) rename graphics/pokemon/{ => gen_1}/raichu/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/raichu/icon.png (100%) rename graphics/pokemon/{ => gen_1}/raichu/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/raichu/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/rapidash/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/rapidash/back.png (100%) rename graphics/pokemon/{ => gen_1}/rapidash/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/rapidash/galarian/back.png (100%) rename graphics/pokemon/{ => gen_1}/rapidash/galarian/front.png (100%) rename graphics/pokemon/{ => gen_1}/rapidash/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/rapidash/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/rapidash/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/rapidash/icon.png (100%) rename graphics/pokemon/{ => gen_1}/rapidash/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/rapidash/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/raticate/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/raticate/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/raticate/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/raticate/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/raticate/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/raticate/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/raticate/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/raticate/back.png (100%) rename graphics/pokemon/{ => gen_1}/raticate/backf.png (100%) rename graphics/pokemon/{gumshoos => gen_1/raticate}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/raticate/icon.png (100%) rename graphics/pokemon/{ => gen_1}/raticate/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/raticate/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/rattata/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/rattata/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/rattata/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/rattata/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/rattata/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/rattata/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/rattata/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/rattata/back.png (100%) rename graphics/pokemon/{ => gen_1}/rattata/backf.png (100%) rename graphics/pokemon/{ => gen_1}/rattata/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/rattata/icon.png (100%) rename graphics/pokemon/{ => gen_1}/rattata/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/rattata/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/rhydon/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/rhydon/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/rhydon/back.png (100%) rename graphics/pokemon/{ => gen_1}/rhydon/backf.png (100%) rename graphics/pokemon/{ => gen_1}/rhydon/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/rhydon/icon.png (100%) rename graphics/pokemon/{ => gen_1}/rhydon/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/rhydon/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/rhyhorn/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/rhyhorn/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/rhyhorn/back.png (100%) rename graphics/pokemon/{ => gen_1}/rhyhorn/backf.png (100%) rename graphics/pokemon/{ => gen_1}/rhyhorn/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/rhyhorn/icon.png (100%) rename graphics/pokemon/{ => gen_1}/rhyhorn/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/rhyhorn/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/sandshrew/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/sandshrew/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/sandshrew/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/sandshrew/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/sandshrew/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/sandshrew/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/sandshrew/back.png (100%) rename graphics/pokemon/{ => gen_1}/sandshrew/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/sandshrew/icon.png (100%) rename graphics/pokemon/{ => gen_1}/sandshrew/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/sandshrew/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/sandslash/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/sandslash/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/sandslash/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/sandslash/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/sandslash/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/sandslash/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/sandslash/back.png (100%) rename graphics/pokemon/{ => gen_1}/sandslash/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/sandslash/icon.png (100%) rename graphics/pokemon/{ => gen_1}/sandslash/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/sandslash/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/scyther/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/scyther/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/scyther/back.png (100%) rename graphics/pokemon/{ => gen_1}/scyther/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/scyther/icon.png (100%) rename graphics/pokemon/{ => gen_1}/scyther/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/scyther/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/seadra/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/seadra/back.png (100%) rename graphics/pokemon/{chimecho => gen_1/seadra}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/seadra/icon.png (100%) rename graphics/pokemon/{ => gen_1}/seadra/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/seadra/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/seaking/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/seaking/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/seaking/back.png (100%) rename graphics/pokemon/{ => gen_1}/seaking/backf.png (100%) rename graphics/pokemon/{chinchou => gen_1/seaking}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/seaking/icon.png (100%) rename graphics/pokemon/{ => gen_1}/seaking/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/seaking/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/seel/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/seel/back.png (100%) rename graphics/pokemon/{clamperl => gen_1/seel}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/seel/icon.png (100%) rename graphics/pokemon/{ => gen_1}/seel/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/seel/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/shellder/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/shellder/back.png (100%) rename graphics/pokemon/{clawitzer => gen_1/shellder}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/shellder/icon.png (100%) rename graphics/pokemon/{ => gen_1}/shellder/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/shellder/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/slowbro/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/slowbro/back.png (100%) rename graphics/pokemon/{ => gen_1}/slowbro/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/slowbro/galarian/back.png (100%) rename graphics/pokemon/{ => gen_1}/slowbro/galarian/front.png (100%) rename graphics/pokemon/{ => gen_1}/slowbro/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/slowbro/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/slowbro/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/slowbro/icon.png (100%) rename graphics/pokemon/{ => gen_1}/slowbro/mega/back.png (100%) rename graphics/pokemon/{ => gen_1}/slowbro/mega/front.png (100%) rename graphics/pokemon/{ => gen_1}/slowbro/mega/icon.png (100%) rename graphics/pokemon/{ => gen_1}/slowbro/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/slowbro/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/slowbro/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/slowbro/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/slowpoke/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/slowpoke/back.png (100%) rename graphics/pokemon/{ => gen_1}/slowpoke/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/slowpoke/galarian/back.png (100%) rename graphics/pokemon/{ => gen_1}/slowpoke/galarian/front.png (100%) rename graphics/pokemon/{ => gen_1}/slowpoke/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/slowpoke/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/slowpoke/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/slowpoke/icon.png (100%) rename graphics/pokemon/{ => gen_1}/slowpoke/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/slowpoke/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/snorlax/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/snorlax/back.png (100%) rename graphics/pokemon/{ => gen_1}/snorlax/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/snorlax/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_1}/snorlax/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_1}/snorlax/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_1}/snorlax/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/snorlax/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/snorlax/icon.png (100%) rename graphics/pokemon/{ => gen_1}/snorlax/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/snorlax/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/spearow/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/spearow/back.png (100%) rename graphics/pokemon/{rookidee => gen_1/spearow}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/spearow/icon.png (100%) rename graphics/pokemon/{ => gen_1}/spearow/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/spearow/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/squirtle/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/squirtle/back.png (100%) rename graphics/pokemon/{ => gen_1}/squirtle/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/squirtle/icon.png (100%) rename graphics/pokemon/{ => gen_1}/squirtle/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/squirtle/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/starmie/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/starmie/back.png (100%) rename graphics/pokemon/{aromatisse => gen_1/starmie}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/starmie/icon.png (100%) rename graphics/pokemon/{ => gen_1}/starmie/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/starmie/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/staryu/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/staryu/back.png (100%) rename graphics/pokemon/{blipbug => gen_1/staryu}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/staryu/icon.png (100%) rename graphics/pokemon/{ => gen_1}/staryu/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/staryu/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/tangela/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/tangela/back.png (100%) rename graphics/pokemon/{ => gen_1}/tangela/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/tangela/icon.png (100%) rename graphics/pokemon/{ => gen_1}/tangela/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/tangela/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/tauros/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/tauros/back.png (100%) rename graphics/pokemon/{ => gen_1}/tauros/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/tauros/icon.png (100%) rename graphics/pokemon/{ => gen_1}/tauros/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_aqua_breed/back.png (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_aqua_breed/front.png (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_aqua_breed/icon.png (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_aqua_breed/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_aqua_breed/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_blaze_breed/back.png (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_blaze_breed/front.ase (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_blaze_breed/front.png (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_blaze_breed/icon.png (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_blaze_breed/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_blaze_breed/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_combat_breed/back.png (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_combat_breed/front.png (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_combat_breed/icon.png (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_combat_breed/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/tauros/paldean_combat_breed/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/tauros/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/tentacool/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/tentacool/back.png (100%) rename graphics/pokemon/{cloyster => gen_1/tentacool}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/tentacool/icon.png (100%) rename graphics/pokemon/{ => gen_1}/tentacool/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/tentacool/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/tentacruel/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/tentacruel/back.png (100%) rename graphics/pokemon/{cofagrigus => gen_1/tentacruel}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/tentacruel/icon.png (100%) rename graphics/pokemon/{ => gen_1}/tentacruel/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/tentacruel/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/vaporeon/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/vaporeon/back.png (100%) rename graphics/pokemon/{incineroar => gen_1/vaporeon}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/vaporeon/icon.png (100%) rename graphics/pokemon/{ => gen_1}/vaporeon/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/vaporeon/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/venomoth/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/venomoth/back.png (100%) rename graphics/pokemon/{bergmite => gen_1/venomoth}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/venomoth/icon.png (100%) rename graphics/pokemon/{ => gen_1}/venomoth/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/venomoth/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/venonat/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/venonat/back.png (100%) rename graphics/pokemon/{ => gen_1}/venonat/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/venonat/icon.png (100%) rename graphics/pokemon/{ => gen_1}/venonat/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/venonat/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/venusaur/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/venusaur/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/venusaur/back.png (100%) rename graphics/pokemon/{ => gen_1}/venusaur/backf.png (100%) rename graphics/pokemon/{ => gen_1}/venusaur/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/venusaur/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_1}/venusaur/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_1}/venusaur/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_1}/venusaur/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/venusaur/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/venusaur/icon.png (100%) rename graphics/pokemon/{ => gen_1}/venusaur/mega/back.png (100%) rename graphics/pokemon/{ => gen_1}/venusaur/mega/front.png (100%) rename graphics/pokemon/{ => gen_1}/venusaur/mega/icon.png (100%) rename graphics/pokemon/{ => gen_1}/venusaur/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/venusaur/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/venusaur/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/venusaur/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/victreebel/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/victreebel/back.png (100%) rename graphics/pokemon/{combee => gen_1/victreebel}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/victreebel/icon.png (100%) rename graphics/pokemon/{ => gen_1}/victreebel/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/victreebel/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/vileplume/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/vileplume/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/vileplume/back.png (100%) rename graphics/pokemon/{ => gen_1}/vileplume/backf.png (100%) rename graphics/pokemon/{ => gen_1}/vileplume/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/vileplume/icon.png (100%) rename graphics/pokemon/{ => gen_1}/vileplume/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/vileplume/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/voltorb/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/voltorb/back.png (100%) rename graphics/pokemon/{comfey => gen_1/voltorb}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/voltorb/hisuian/back.png (100%) rename graphics/pokemon/{ => gen_1}/voltorb/hisuian/front.png (100%) rename graphics/pokemon/{ => gen_1}/voltorb/hisuian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/voltorb/hisuian/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/voltorb/hisuian/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/voltorb/icon.png (100%) rename graphics/pokemon/{ => gen_1}/voltorb/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/voltorb/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/vulpix/alolan/back.png (100%) rename graphics/pokemon/{ => gen_1}/vulpix/alolan/front.png (100%) rename graphics/pokemon/{ => gen_1}/vulpix/alolan/icon.png (100%) rename graphics/pokemon/{ => gen_1}/vulpix/alolan/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/vulpix/alolan/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/vulpix/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/vulpix/back.png (100%) rename graphics/pokemon/{ => gen_1}/vulpix/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/vulpix/icon.png (100%) rename graphics/pokemon/{ => gen_1}/vulpix/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/vulpix/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/wartortle/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/wartortle/back.png (100%) rename graphics/pokemon/{ => gen_1}/wartortle/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/wartortle/icon.png (100%) rename graphics/pokemon/{ => gen_1}/wartortle/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/wartortle/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/weedle/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/weedle/back.png (100%) rename graphics/pokemon/{bounsweet => gen_1/weedle}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/weedle/icon.png (100%) rename graphics/pokemon/{ => gen_1}/weedle/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/weedle/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/weepinbell/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/weepinbell/back.png (100%) rename graphics/pokemon/{cosmoem => gen_1/weepinbell}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/weepinbell/icon.png (100%) rename graphics/pokemon/{ => gen_1}/weepinbell/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/weepinbell/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/weezing/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/weezing/back.png (100%) rename graphics/pokemon/{cosmog => gen_1/weezing}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/weezing/galarian/back.png (100%) rename graphics/pokemon/{ => gen_1}/weezing/galarian/front.png (100%) rename graphics/pokemon/{ => gen_1}/weezing/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/weezing/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/weezing/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/weezing/icon.png (100%) rename graphics/pokemon/{ => gen_1}/weezing/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/weezing/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/wigglytuff/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/wigglytuff/back.png (100%) rename graphics/pokemon/{ => gen_1}/wigglytuff/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/wigglytuff/icon.png (100%) rename graphics/pokemon/{ => gen_1}/wigglytuff/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/wigglytuff/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/zapdos/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/zapdos/back.png (100%) rename graphics/pokemon/{ => gen_1}/zapdos/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/zapdos/galarian/back.png (100%) rename graphics/pokemon/{ => gen_1}/zapdos/galarian/front.png (100%) rename graphics/pokemon/{ => gen_1}/zapdos/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_1}/zapdos/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/zapdos/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/zapdos/icon.png (100%) rename graphics/pokemon/{ => gen_1}/zapdos/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/zapdos/shiny.pal (100%) rename graphics/pokemon/{ => gen_1}/zubat/anim_front.png (100%) rename graphics/pokemon/{ => gen_1}/zubat/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_1}/zubat/back.png (100%) rename graphics/pokemon/{ => gen_1}/zubat/backf.png (100%) rename graphics/pokemon/{cottonee => gen_1/zubat}/footprint.png (100%) rename graphics/pokemon/{ => gen_1}/zubat/icon.png (100%) rename graphics/pokemon/{ => gen_1}/zubat/normal.pal (100%) rename graphics/pokemon/{ => gen_1}/zubat/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/aipom/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/aipom/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/aipom/back.png (100%) rename graphics/pokemon/{ => gen_2}/aipom/backf.png (100%) rename graphics/pokemon/{ => gen_2}/aipom/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/aipom/icon.png (100%) rename graphics/pokemon/{ => gen_2}/aipom/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/aipom/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/ampharos/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/ampharos/back.png (100%) rename graphics/pokemon/{ => gen_2}/ampharos/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/ampharos/icon.png (100%) rename graphics/pokemon/{ => gen_2}/ampharos/mega/back.png (100%) rename graphics/pokemon/{ => gen_2}/ampharos/mega/front.png (100%) rename graphics/pokemon/{ => gen_2}/ampharos/mega/icon.png (100%) rename graphics/pokemon/{ => gen_2}/ampharos/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/ampharos/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/ampharos/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/ampharos/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/ariados/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/ariados/back.png (100%) rename graphics/pokemon/{ => gen_2}/ariados/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/ariados/icon.png (100%) rename graphics/pokemon/{ => gen_2}/ariados/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/ariados/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/azumarill/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/azumarill/back.png (100%) rename graphics/pokemon/{ => gen_2}/azumarill/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/azumarill/icon.png (100%) rename graphics/pokemon/{ => gen_2}/azumarill/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/azumarill/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/bayleef/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/bayleef/back.png (100%) rename graphics/pokemon/{ => gen_2}/bayleef/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/bayleef/icon.png (100%) rename graphics/pokemon/{ => gen_2}/bayleef/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/bayleef/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/bellossom/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/bellossom/back.png (100%) rename graphics/pokemon/{cresselia => gen_2/bellossom}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/bellossom/icon.png (100%) rename graphics/pokemon/{ => gen_2}/bellossom/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/bellossom/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/blissey/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/blissey/back.png (100%) rename graphics/pokemon/{ => gen_2}/blissey/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/blissey/icon.png (100%) rename graphics/pokemon/{ => gen_2}/blissey/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/blissey/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/celebi/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/celebi/back.png (100%) rename graphics/pokemon/{ => gen_2}/celebi/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/celebi/icon.png (100%) rename graphics/pokemon/{ => gen_2}/celebi/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/celebi/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/chikorita/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/chikorita/back.png (100%) rename graphics/pokemon/{ => gen_2}/chikorita/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/chikorita/icon.png (100%) rename graphics/pokemon/{ => gen_2}/chikorita/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/chikorita/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/chinchou/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/chinchou/back.png (100%) rename graphics/pokemon/{crobat => gen_2/chinchou}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/chinchou/icon.png (100%) rename graphics/pokemon/{ => gen_2}/chinchou/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/chinchou/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/cleffa/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/cleffa/back.png (100%) rename graphics/pokemon/{ => gen_2}/cleffa/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/cleffa/icon.png (100%) rename graphics/pokemon/{ => gen_2}/cleffa/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/cleffa/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/corsola/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/corsola/back.png (100%) rename graphics/pokemon/{ => gen_2}/corsola/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/corsola/galarian/back.png (100%) rename graphics/pokemon/{ => gen_2}/corsola/galarian/front.png (100%) rename graphics/pokemon/{ => gen_2}/corsola/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_2}/corsola/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/corsola/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/corsola/icon.png (100%) rename graphics/pokemon/{ => gen_2}/corsola/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/corsola/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/crobat/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/crobat/back.png (100%) rename graphics/pokemon/{cryogonal => gen_2/crobat}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/crobat/icon.png (100%) rename graphics/pokemon/{ => gen_2}/crobat/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/crobat/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/croconaw/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/croconaw/back.png (100%) rename graphics/pokemon/{ => gen_2}/croconaw/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/croconaw/icon.png (100%) rename graphics/pokemon/{ => gen_2}/croconaw/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/croconaw/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/cyndaquil/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/cyndaquil/back.png (100%) rename graphics/pokemon/{cufant => gen_2/cyndaquil}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/cyndaquil/icon.png (100%) rename graphics/pokemon/{ => gen_2}/cyndaquil/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/cyndaquil/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/delibird/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/delibird/back.png (100%) rename graphics/pokemon/{ => gen_2}/delibird/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/delibird/icon.png (100%) rename graphics/pokemon/{ => gen_2}/delibird/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/delibird/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/donphan/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/donphan/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/donphan/back.png (100%) rename graphics/pokemon/{ => gen_2}/donphan/backf.png (100%) rename graphics/pokemon/{ => gen_2}/donphan/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/donphan/icon.png (100%) rename graphics/pokemon/{ => gen_2}/donphan/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/donphan/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/dunsparce/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/dunsparce/back.png (100%) rename graphics/pokemon/{dewgong => gen_2/dunsparce}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/dunsparce/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_2}/dunsparce/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/dunsparce/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/elekid/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/elekid/back.png (100%) rename graphics/pokemon/{ => gen_2}/elekid/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/elekid/icon.png (100%) rename graphics/pokemon/{ => gen_2}/elekid/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/elekid/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/entei/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/entei/back.png (100%) rename graphics/pokemon/{ => gen_2}/entei/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/entei/icon.png (100%) rename graphics/pokemon/{ => gen_2}/entei/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/entei/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/espeon/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/espeon/back.png (100%) rename graphics/pokemon/{ => gen_2}/espeon/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/espeon/icon.png (100%) rename graphics/pokemon/{ => gen_2}/espeon/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/espeon/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/feraligatr/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/feraligatr/back.png (100%) rename graphics/pokemon/{ => gen_2}/feraligatr/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/feraligatr/icon.png (100%) rename graphics/pokemon/{ => gen_2}/feraligatr/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/feraligatr/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/flaaffy/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/flaaffy/back.png (100%) rename graphics/pokemon/{ => gen_2}/flaaffy/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/flaaffy/icon.png (100%) rename graphics/pokemon/{ => gen_2}/flaaffy/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/flaaffy/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/forretress/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/forretress/back.png (100%) rename graphics/pokemon/{dhelmise => gen_2/forretress}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/forretress/icon.png (100%) rename graphics/pokemon/{ => gen_2}/forretress/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/forretress/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/furret/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/furret/back.png (100%) rename graphics/pokemon/{ => gen_2}/furret/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/furret/icon.png (100%) rename graphics/pokemon/{ => gen_2}/furret/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/furret/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/girafarig/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/girafarig/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/girafarig/back.png (100%) rename graphics/pokemon/{ => gen_2}/girafarig/backf.png (100%) rename graphics/pokemon/{ => gen_2}/girafarig/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/girafarig/icon.png (100%) rename graphics/pokemon/{ => gen_2}/girafarig/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/girafarig/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/gligar/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/gligar/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/gligar/back.png (100%) rename graphics/pokemon/{ => gen_2}/gligar/backf.png (100%) rename graphics/pokemon/{ => gen_2}/gligar/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/gligar/icon.png (100%) rename graphics/pokemon/{ => gen_2}/gligar/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/gligar/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/granbull/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/granbull/back.png (100%) rename graphics/pokemon/{ => gen_2}/granbull/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/granbull/icon.png (100%) rename graphics/pokemon/{ => gen_2}/granbull/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/granbull/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/heracross/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/heracross/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/heracross/back.png (100%) rename graphics/pokemon/{ => gen_2}/heracross/backf.png (100%) rename graphics/pokemon/{ => gen_2}/heracross/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/heracross/icon.png (100%) rename graphics/pokemon/{ => gen_2}/heracross/mega/back.png (100%) rename graphics/pokemon/{ => gen_2}/heracross/mega/front.png (100%) rename graphics/pokemon/{ => gen_2}/heracross/mega/icon.png (100%) rename graphics/pokemon/{ => gen_2}/heracross/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/heracross/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/heracross/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/heracross/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/hitmontop/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/hitmontop/back.png (100%) rename graphics/pokemon/{ => gen_2}/hitmontop/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/hitmontop/icon.png (100%) rename graphics/pokemon/{ => gen_2}/hitmontop/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/hitmontop/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/ho_oh/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/ho_oh/back.png (100%) rename graphics/pokemon/{ => gen_2}/ho_oh/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/ho_oh/icon.png (100%) rename graphics/pokemon/{ => gen_2}/ho_oh/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/ho_oh/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/hoothoot/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/hoothoot/back.png (100%) rename graphics/pokemon/{ => gen_2}/hoothoot/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/hoothoot/icon.png (100%) rename graphics/pokemon/{ => gen_2}/hoothoot/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/hoothoot/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/hoppip/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/hoppip/back.png (100%) rename graphics/pokemon/{ => gen_2}/hoppip/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/hoppip/icon.png (100%) rename graphics/pokemon/{ => gen_2}/hoppip/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/hoppip/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/houndoom/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/houndoom/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/houndoom/back.png (100%) rename graphics/pokemon/{ => gen_2}/houndoom/backf.png (100%) rename graphics/pokemon/{ => gen_2}/houndoom/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/houndoom/icon.png (100%) rename graphics/pokemon/{ => gen_2}/houndoom/mega/back.png (100%) rename graphics/pokemon/{ => gen_2}/houndoom/mega/front.png (100%) rename graphics/pokemon/{ => gen_2}/houndoom/mega/icon.png (100%) rename graphics/pokemon/{ => gen_2}/houndoom/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/houndoom/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/houndoom/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/houndoom/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/houndour/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/houndour/back.png (100%) rename graphics/pokemon/{ => gen_2}/houndour/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/houndour/icon.png (100%) rename graphics/pokemon/{ => gen_2}/houndour/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/houndour/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/igglybuff/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/igglybuff/back.png (100%) rename graphics/pokemon/{ => gen_2}/igglybuff/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/igglybuff/icon.png (100%) rename graphics/pokemon/{ => gen_2}/igglybuff/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/igglybuff/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/jumpluff/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/jumpluff/back.png (100%) rename graphics/pokemon/{dottler => gen_2/jumpluff}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/jumpluff/icon.png (100%) rename graphics/pokemon/{ => gen_2}/jumpluff/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/jumpluff/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/kingdra/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/kingdra/back.png (100%) rename graphics/pokemon/{diancie => gen_2/kingdra}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/kingdra/icon.png (100%) rename graphics/pokemon/{ => gen_2}/kingdra/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/kingdra/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/lanturn/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/lanturn/back.png (100%) rename graphics/pokemon/{diglett => gen_2/lanturn}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/lanturn/icon.png (100%) rename graphics/pokemon/{ => gen_2}/lanturn/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/lanturn/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/larvitar/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/larvitar/back.png (100%) rename graphics/pokemon/{ => gen_2}/larvitar/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/larvitar/icon.png (100%) rename graphics/pokemon/{ => gen_2}/larvitar/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/larvitar/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/ledian/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/ledian/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/ledian/back.png (100%) rename graphics/pokemon/{ => gen_2}/ledian/backf.png (100%) rename graphics/pokemon/{ => gen_2}/ledian/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/ledian/icon.png (100%) rename graphics/pokemon/{ => gen_2}/ledian/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/ledian/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/ledyba/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/ledyba/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/ledyba/back.png (100%) rename graphics/pokemon/{ => gen_2}/ledyba/backf.png (100%) rename graphics/pokemon/{ => gen_2}/ledyba/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/ledyba/icon.png (100%) rename graphics/pokemon/{ => gen_2}/ledyba/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/ledyba/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/lugia/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/lugia/back.png (100%) rename graphics/pokemon/{ => gen_2}/lugia/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/lugia/icon.png (100%) rename graphics/pokemon/{ => gen_2}/lugia/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/lugia/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/magby/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/magby/back.png (100%) rename graphics/pokemon/{ => gen_2}/magby/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/magby/icon.png (100%) rename graphics/pokemon/{ => gen_2}/magby/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/magby/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/magcargo/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/magcargo/back.png (100%) rename graphics/pokemon/{ditto => gen_2/magcargo}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/magcargo/icon.png (100%) rename graphics/pokemon/{ => gen_2}/magcargo/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/magcargo/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/mantine/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/mantine/back.png (100%) rename graphics/pokemon/{doublade => gen_2/mantine}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/mantine/icon.png (100%) rename graphics/pokemon/{ => gen_2}/mantine/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/mantine/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/mareep/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/mareep/back.png (100%) rename graphics/pokemon/{ => gen_2}/mareep/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/mareep/icon.png (100%) rename graphics/pokemon/{ => gen_2}/mareep/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/mareep/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/marill/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/marill/back.png (100%) rename graphics/pokemon/{ => gen_2}/marill/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/marill/icon.png (100%) rename graphics/pokemon/{ => gen_2}/marill/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/marill/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/meganium/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/meganium/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/meganium/back.png (100%) rename graphics/pokemon/{ => gen_2}/meganium/backf.png (100%) rename graphics/pokemon/{ => gen_2}/meganium/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/meganium/icon.png (100%) rename graphics/pokemon/{ => gen_2}/meganium/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/meganium/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/miltank/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/miltank/back.png (100%) rename graphics/pokemon/{ => gen_2}/miltank/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/miltank/icon.png (100%) rename graphics/pokemon/{ => gen_2}/miltank/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/miltank/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/misdreavus/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/misdreavus/back.png (100%) rename graphics/pokemon/{dragalge => gen_2/misdreavus}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/misdreavus/icon.png (100%) rename graphics/pokemon/{ => gen_2}/misdreavus/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/misdreavus/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/murkrow/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/murkrow/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/murkrow/back.png (100%) rename graphics/pokemon/{ => gen_2}/murkrow/backf.png (100%) rename graphics/pokemon/{ => gen_2}/murkrow/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/murkrow/icon.png (100%) rename graphics/pokemon/{ => gen_2}/murkrow/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/murkrow/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/natu/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/natu/back.png (100%) rename graphics/pokemon/{ => gen_2}/natu/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/natu/icon.png (100%) rename graphics/pokemon/{ => gen_2}/natu/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/natu/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/noctowl/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/noctowl/back.png (100%) rename graphics/pokemon/{ => gen_2}/noctowl/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/noctowl/icon.png (100%) rename graphics/pokemon/{ => gen_2}/noctowl/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/noctowl/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/octillery/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/octillery/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/octillery/back.png (100%) rename graphics/pokemon/{ => gen_2}/octillery/backf.png (100%) rename graphics/pokemon/{grapploct => gen_2/octillery}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/octillery/icon.png (100%) rename graphics/pokemon/{ => gen_2}/octillery/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/octillery/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/phanpy/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/phanpy/back.png (100%) rename graphics/pokemon/{ => gen_2}/phanpy/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/phanpy/icon.png (100%) rename graphics/pokemon/{ => gen_2}/phanpy/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/phanpy/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/pichu/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/pichu/back.png (100%) rename graphics/pokemon/{ => gen_2}/pichu/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/pichu/icon.png (100%) rename graphics/pokemon/{ => gen_2}/pichu/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/pichu/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/pichu/spiky_eared/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/pichu/spiky_eared/back.png (100%) rename graphics/pokemon/{ => gen_2}/pichu/spiky_eared/front.png (100%) rename graphics/pokemon/{ => gen_2}/pichu/spiky_eared/icon.png (100%) rename graphics/pokemon/{ => gen_2}/pichu/spiky_eared/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/pichu/spiky_eared/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/piloswine/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/piloswine/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/piloswine/back.png (100%) rename graphics/pokemon/{ => gen_2}/piloswine/backf.png (100%) rename graphics/pokemon/{ => gen_2}/piloswine/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/piloswine/icon.png (100%) rename graphics/pokemon/{ => gen_2}/piloswine/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/piloswine/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/pineco/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/pineco/back.png (100%) rename graphics/pokemon/{dragonair => gen_2/pineco}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/pineco/icon.png (100%) rename graphics/pokemon/{ => gen_2}/pineco/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/pineco/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/politoed/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/politoed/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/politoed/back.png (100%) rename graphics/pokemon/{ => gen_2}/politoed/backf.png (100%) rename graphics/pokemon/{ => gen_2}/politoed/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/politoed/icon.png (100%) rename graphics/pokemon/{ => gen_2}/politoed/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/politoed/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/porygon2/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/porygon2/back.png (100%) rename graphics/pokemon/{arctovish => gen_2/porygon2}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/porygon2/icon.png (100%) rename graphics/pokemon/{ => gen_2}/porygon2/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/porygon2/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/pupitar/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/pupitar/back.png (100%) rename graphics/pokemon/{drampa => gen_2/pupitar}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/pupitar/icon.png (100%) rename graphics/pokemon/{ => gen_2}/pupitar/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/pupitar/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/quagsire/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/quagsire/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/quagsire/back.png (100%) rename graphics/pokemon/{ => gen_2}/quagsire/backf.png (100%) rename graphics/pokemon/{ => gen_2}/quagsire/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/quagsire/icon.png (100%) rename graphics/pokemon/{ => gen_2}/quagsire/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/quagsire/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/quilava/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/quilava/back.png (100%) rename graphics/pokemon/{ => gen_2}/quilava/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/quilava/icon.png (100%) rename graphics/pokemon/{ => gen_2}/quilava/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/quilava/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/qwilfish/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/qwilfish/back.png (100%) rename graphics/pokemon/{dratini => gen_2/qwilfish}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/qwilfish/hisuian/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_2}/qwilfish/hisuian/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_2}/qwilfish/hisuian/icon.png (100%) rename graphics/pokemon/{ => gen_2}/qwilfish/hisuian/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_2}/qwilfish/hisuian/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_2}/qwilfish/icon.png (100%) rename graphics/pokemon/{ => gen_2}/qwilfish/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/qwilfish/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/raikou/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/raikou/back.png (100%) rename graphics/pokemon/{ => gen_2}/raikou/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/raikou/icon.png (100%) rename graphics/pokemon/{ => gen_2}/raikou/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/raikou/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/remoraid/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/remoraid/back.png (100%) rename graphics/pokemon/{dreepy => gen_2/remoraid}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/remoraid/icon.png (100%) rename graphics/pokemon/{ => gen_2}/remoraid/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/remoraid/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/scizor/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/scizor/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/scizor/back.png (100%) rename graphics/pokemon/{ => gen_2}/scizor/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/scizor/icon.png (100%) rename graphics/pokemon/{ => gen_2}/scizor/mega/back.png (100%) rename graphics/pokemon/{ => gen_2}/scizor/mega/front.png (100%) rename graphics/pokemon/{ => gen_2}/scizor/mega/icon.png (100%) rename graphics/pokemon/{ => gen_2}/scizor/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/scizor/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/scizor/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/scizor/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/sentret/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/sentret/back.png (100%) rename graphics/pokemon/{ => gen_2}/sentret/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/sentret/icon.png (100%) rename graphics/pokemon/{ => gen_2}/sentret/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/sentret/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/shuckle/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/shuckle/back.png (100%) rename graphics/pokemon/{amaura => gen_2/shuckle}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/shuckle/icon.png (100%) rename graphics/pokemon/{ => gen_2}/shuckle/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/shuckle/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/skarmory/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/skarmory/back.png (100%) rename graphics/pokemon/{ => gen_2}/skarmory/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/skarmory/icon.png (100%) rename graphics/pokemon/{ => gen_2}/skarmory/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/skarmory/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/skiploom/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/skiploom/back.png (100%) rename graphics/pokemon/{ => gen_2}/skiploom/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/skiploom/icon.png (100%) rename graphics/pokemon/{ => gen_2}/skiploom/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/skiploom/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/slowking/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/slowking/back.png (100%) rename graphics/pokemon/{ => gen_2}/slowking/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/slowking/galarian/back.png (100%) rename graphics/pokemon/{ => gen_2}/slowking/galarian/front.png (100%) rename graphics/pokemon/{ => gen_2}/slowking/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_2}/slowking/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/slowking/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/slowking/icon.png (100%) rename graphics/pokemon/{ => gen_2}/slowking/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/slowking/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/slugma/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/slugma/back.png (100%) rename graphics/pokemon/{drifblim => gen_2/slugma}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/slugma/icon.png (100%) rename graphics/pokemon/{ => gen_2}/slugma/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/slugma/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/smeargle/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/smeargle/back.png (100%) rename graphics/pokemon/{ => gen_2}/smeargle/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/smeargle/icon.png (100%) rename graphics/pokemon/{ => gen_2}/smeargle/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/smeargle/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/smoochum/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/smoochum/back.png (100%) rename graphics/pokemon/{ => gen_2}/smoochum/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/smoochum/icon.png (100%) rename graphics/pokemon/{ => gen_2}/smoochum/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/smoochum/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/sneasel/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/sneasel/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/sneasel/back.png (100%) rename graphics/pokemon/{ => gen_2}/sneasel/backf.png (100%) rename graphics/pokemon/{ => gen_2}/sneasel/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/sneasel/hisuian/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_2}/sneasel/hisuian/backf.png (100%) rename graphics/pokemon/{ => gen_2}/sneasel/hisuian/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_2}/sneasel/hisuian/frontf.png (100%) rename graphics/pokemon/{ => gen_2}/sneasel/hisuian/icon.png (100%) rename graphics/pokemon/{ => gen_2}/sneasel/hisuian/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_2}/sneasel/hisuian/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_2}/sneasel/icon.png (100%) rename graphics/pokemon/{ => gen_2}/sneasel/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/sneasel/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/snubbull/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/snubbull/back.png (100%) rename graphics/pokemon/{ => gen_2}/snubbull/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/snubbull/icon.png (100%) rename graphics/pokemon/{ => gen_2}/snubbull/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/snubbull/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/spinarak/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/spinarak/back.png (100%) rename graphics/pokemon/{clauncher => gen_2/spinarak}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/spinarak/icon.png (100%) rename graphics/pokemon/{ => gen_2}/spinarak/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/spinarak/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/stantler/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/stantler/back.png (100%) rename graphics/pokemon/{ => gen_2}/stantler/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/stantler/icon.png (100%) rename graphics/pokemon/{ => gen_2}/stantler/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/stantler/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/steelix/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/steelix/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/steelix/back.png (100%) rename graphics/pokemon/{ => gen_2}/steelix/backf.png (100%) rename graphics/pokemon/{drifloon => gen_2/steelix}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/steelix/icon.png (100%) rename graphics/pokemon/{ => gen_2}/steelix/mega/back.png (100%) rename graphics/pokemon/{ => gen_2}/steelix/mega/front.png (100%) rename graphics/pokemon/{ => gen_2}/steelix/mega/icon.png (100%) rename graphics/pokemon/{ => gen_2}/steelix/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/steelix/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/steelix/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/steelix/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/sudowoodo/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/sudowoodo/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/sudowoodo/back.png (100%) rename graphics/pokemon/{ => gen_2}/sudowoodo/backf.png (100%) rename graphics/pokemon/{ => gen_2}/sudowoodo/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/sudowoodo/icon.png (100%) rename graphics/pokemon/{ => gen_2}/sudowoodo/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/sudowoodo/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/suicune/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/suicune/back.png (100%) rename graphics/pokemon/{ => gen_2}/suicune/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/suicune/icon.png (100%) rename graphics/pokemon/{ => gen_2}/suicune/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/suicune/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/sunflora/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/sunflora/back.png (100%) rename graphics/pokemon/{ => gen_2}/sunflora/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/sunflora/icon.png (100%) rename graphics/pokemon/{ => gen_2}/sunflora/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/sunflora/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/sunkern/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/sunkern/back.png (100%) rename graphics/pokemon/{dugtrio => gen_2/sunkern}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/sunkern/icon.png (100%) rename graphics/pokemon/{ => gen_2}/sunkern/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/sunkern/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/swinub/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/swinub/back.png (100%) rename graphics/pokemon/{ => gen_2}/swinub/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/swinub/icon.png (100%) rename graphics/pokemon/{ => gen_2}/swinub/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/swinub/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/teddiursa/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/teddiursa/back.png (100%) rename graphics/pokemon/{ => gen_2}/teddiursa/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/teddiursa/icon.png (100%) rename graphics/pokemon/{ => gen_2}/teddiursa/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/teddiursa/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/togepi/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/togepi/back.png (100%) rename graphics/pokemon/{ => gen_2}/togepi/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/togepi/icon.png (100%) rename graphics/pokemon/{ => gen_2}/togepi/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/togepi/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/togetic/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/togetic/back.png (100%) rename graphics/pokemon/{ => gen_2}/togetic/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/togetic/icon.png (100%) rename graphics/pokemon/{ => gen_2}/togetic/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/togetic/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/totodile/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/totodile/back.png (100%) rename graphics/pokemon/{ => gen_2}/totodile/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/totodile/icon.png (100%) rename graphics/pokemon/{ => gen_2}/totodile/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/totodile/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/typhlosion/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/typhlosion/back.png (100%) rename graphics/pokemon/{ => gen_2}/typhlosion/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/typhlosion/hisuian/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_2}/typhlosion/hisuian/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_2}/typhlosion/hisuian/icon.png (100%) rename graphics/pokemon/{ => gen_2}/typhlosion/hisuian/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_2}/typhlosion/hisuian/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_2}/typhlosion/icon.png (100%) rename graphics/pokemon/{ => gen_2}/typhlosion/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/typhlosion/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/tyranitar/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/tyranitar/back.png (100%) rename graphics/pokemon/{ => gen_2}/tyranitar/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/tyranitar/icon.png (100%) rename graphics/pokemon/{ => gen_2}/tyranitar/mega/back.png (100%) rename graphics/pokemon/{ => gen_2}/tyranitar/mega/front.png (100%) rename graphics/pokemon/{ => gen_2}/tyranitar/mega/icon.png (100%) rename graphics/pokemon/{ => gen_2}/tyranitar/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/tyranitar/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/tyranitar/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/tyranitar/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/tyrogue/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/tyrogue/back.png (100%) rename graphics/pokemon/{ => gen_2}/tyrogue/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/tyrogue/icon.png (100%) rename graphics/pokemon/{ => gen_2}/tyrogue/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/tyrogue/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/umbreon/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/umbreon/back.png (100%) rename graphics/pokemon/{ => gen_2}/umbreon/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/umbreon/icon.png (100%) rename graphics/pokemon/{ => gen_2}/umbreon/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/umbreon/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/unown/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/b/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/b/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/b/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/c/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/c/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/c/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/d/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/d/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/d/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/e/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/e/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/e/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/exclamation_mark/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/exclamation_mark/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/exclamation_mark/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/f/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/f/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/f/icon.png (100%) rename graphics/pokemon/{dunsparce => gen_2/unown}/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/unown/g/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/g/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/g/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/h/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/h/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/h/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/i/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/i/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/i/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/j/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/j/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/j/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/k/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/k/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/k/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/l/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/l/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/l/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/m/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/m/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/m/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/n/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/n/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/n/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/unown/o/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/o/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/o/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/p/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/p/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/p/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/q/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/q/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/q/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/question_mark/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/question_mark/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/question_mark/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/r/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/r/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/r/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/s/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/s/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/s/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/unown/t/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/t/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/t/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/u/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/u/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/u/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/v/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/v/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/v/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/w/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/w/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/w/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/x/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/x/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/x/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/y/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/y/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/y/icon.png (100%) rename graphics/pokemon/{ => gen_2}/unown/z/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/unown/z/back.png (100%) rename graphics/pokemon/{ => gen_2}/unown/z/icon.png (100%) rename graphics/pokemon/{ => gen_2}/ursaring/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/ursaring/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/ursaring/back.png (100%) rename graphics/pokemon/{ => gen_2}/ursaring/backf.png (100%) rename graphics/pokemon/{ => gen_2}/ursaring/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/ursaring/icon.png (100%) rename graphics/pokemon/{ => gen_2}/ursaring/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/ursaring/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/wobbuffet/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/wobbuffet/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/wobbuffet/back.png (100%) rename graphics/pokemon/{ => gen_2}/wobbuffet/backf.png (100%) rename graphics/pokemon/{ => gen_2}/wobbuffet/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/wobbuffet/icon.png (100%) rename graphics/pokemon/{ => gen_2}/wobbuffet/iconf.png (100%) rename graphics/pokemon/{ => gen_2}/wobbuffet/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/wobbuffet/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/wooper/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/wooper/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/wooper/back.png (100%) rename graphics/pokemon/{ => gen_2}/wooper/backf.png (100%) rename graphics/pokemon/{ => gen_2}/wooper/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/wooper/icon.png (100%) rename graphics/pokemon/{ => gen_2}/wooper/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/wooper/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/wooper/wooper_paldean/back.png (100%) rename graphics/pokemon/{ => gen_2}/wooper/wooper_paldean/front.png (100%) rename graphics/pokemon/{ => gen_2}/wooper/wooper_paldean/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/wooper/wooper_paldean/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/xatu/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/xatu/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_2}/xatu/back.png (100%) rename graphics/pokemon/{ => gen_2}/xatu/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/xatu/icon.png (100%) rename graphics/pokemon/{ => gen_2}/xatu/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/xatu/shiny.pal (100%) rename graphics/pokemon/{ => gen_2}/yanma/anim_front.png (100%) rename graphics/pokemon/{ => gen_2}/yanma/back.png (100%) rename graphics/pokemon/{ => gen_2}/yanma/footprint.png (100%) rename graphics/pokemon/{ => gen_2}/yanma/icon.png (100%) rename graphics/pokemon/{ => gen_2}/yanma/normal.pal (100%) rename graphics/pokemon/{ => gen_2}/yanma/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/absol/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/absol/back.png (100%) rename graphics/pokemon/{ => gen_3}/absol/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/absol/icon.png (100%) rename graphics/pokemon/{ => gen_3}/absol/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/absol/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/absol/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/absol/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/absol/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/absol/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/absol/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/aggron/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/aggron/back.png (100%) rename graphics/pokemon/{ => gen_3}/aggron/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/aggron/icon.png (100%) rename graphics/pokemon/{ => gen_3}/aggron/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/aggron/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/aggron/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/aggron/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/aggron/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/aggron/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/aggron/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/altaria/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/altaria/back.png (100%) rename graphics/pokemon/{ => gen_3}/altaria/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/altaria/icon.png (100%) rename graphics/pokemon/{ => gen_3}/altaria/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/altaria/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/altaria/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/altaria/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/altaria/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/altaria/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/altaria/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/anorith/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/anorith/back.png (100%) rename graphics/pokemon/{duosion => gen_3/anorith}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/anorith/icon.png (100%) rename graphics/pokemon/{ => gen_3}/anorith/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/anorith/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/armaldo/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/armaldo/back.png (100%) rename graphics/pokemon/{ => gen_3}/armaldo/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/armaldo/icon.png (100%) rename graphics/pokemon/{ => gen_3}/armaldo/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/armaldo/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/aron/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/aron/back.png (100%) rename graphics/pokemon/{ => gen_3}/aron/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/aron/icon.png (100%) rename graphics/pokemon/{ => gen_3}/aron/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/aron/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/azurill/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/azurill/back.png (100%) rename graphics/pokemon/{ => gen_3}/azurill/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/azurill/icon.png (100%) rename graphics/pokemon/{ => gen_3}/azurill/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/azurill/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/bagon/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/bagon/back.png (100%) rename graphics/pokemon/{ => gen_3}/bagon/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/bagon/icon.png (100%) rename graphics/pokemon/{ => gen_3}/bagon/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/bagon/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/baltoy/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/baltoy/back.png (100%) rename graphics/pokemon/{drapion => gen_3/baltoy}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/baltoy/icon.png (100%) rename graphics/pokemon/{ => gen_3}/baltoy/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/baltoy/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/banette/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/banette/back.png (100%) rename graphics/pokemon/{ => gen_3}/banette/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/banette/icon.png (100%) rename graphics/pokemon/{ => gen_3}/banette/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/banette/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/banette/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/banette/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/banette/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/banette/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/banette/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/barboach/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/barboach/back.png (100%) rename graphics/pokemon/{dusknoir => gen_3/barboach}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/barboach/icon.png (100%) rename graphics/pokemon/{ => gen_3}/barboach/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/barboach/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/beautifly/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/beautifly/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/beautifly/back.png (100%) rename graphics/pokemon/{ => gen_3}/beautifly/backf.png (100%) rename graphics/pokemon/{ => gen_3}/beautifly/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/beautifly/icon.png (100%) rename graphics/pokemon/{ => gen_3}/beautifly/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/beautifly/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/beldum/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/beldum/back.png (100%) rename graphics/pokemon/{ => gen_3}/beldum/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/beldum/icon.png (100%) rename graphics/pokemon/{ => gen_3}/beldum/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/beldum/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/blaziken/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/blaziken/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/blaziken/back.png (100%) rename graphics/pokemon/{ => gen_3}/blaziken/backf.png (100%) rename graphics/pokemon/{ => gen_3}/blaziken/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/blaziken/icon.png (100%) rename graphics/pokemon/{ => gen_3}/blaziken/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/blaziken/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/blaziken/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/blaziken/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/blaziken/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/blaziken/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/blaziken/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/breloom/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/breloom/back.png (100%) rename graphics/pokemon/{ => gen_3}/breloom/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/breloom/icon.png (100%) rename graphics/pokemon/{ => gen_3}/breloom/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/breloom/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/cacnea/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/cacnea/back.png (100%) rename graphics/pokemon/{ => gen_3}/cacnea/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/cacnea/icon.png (100%) rename graphics/pokemon/{ => gen_3}/cacnea/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/cacnea/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/cacturne/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/cacturne/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/cacturne/back.png (100%) rename graphics/pokemon/{ => gen_3}/cacturne/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/cacturne/icon.png (100%) rename graphics/pokemon/{ => gen_3}/cacturne/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/cacturne/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/camerupt/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/camerupt/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/camerupt/back.png (100%) rename graphics/pokemon/{ => gen_3}/camerupt/backf.png (100%) rename graphics/pokemon/{ => gen_3}/camerupt/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/camerupt/icon.png (100%) rename graphics/pokemon/{ => gen_3}/camerupt/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/camerupt/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/camerupt/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/camerupt/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/camerupt/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/camerupt/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/camerupt/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/carvanha/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/carvanha/back.png (100%) rename graphics/pokemon/{duskull => gen_3/carvanha}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/carvanha/icon.png (100%) rename graphics/pokemon/{ => gen_3}/carvanha/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/carvanha/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/cascoon/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/cascoon/back.png (100%) rename graphics/pokemon/{eelektrik => gen_3/cascoon}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/cascoon/icon.png (100%) rename graphics/pokemon/{ => gen_3}/cascoon/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/cascoon/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/castform/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/castform/back.png (100%) rename graphics/pokemon/{eelektross => gen_3/castform}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/castform/icon.png (100%) rename graphics/pokemon/{ => gen_3}/castform/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/castform/rainy/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/castform/rainy/back.png (100%) rename graphics/pokemon/{ => gen_3}/castform/rainy/icon.png (100%) rename graphics/pokemon/{ => gen_3}/castform/rainy/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/castform/rainy/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/castform/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/castform/snowy/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/castform/snowy/back.png (100%) rename graphics/pokemon/{ => gen_3}/castform/snowy/icon.png (100%) rename graphics/pokemon/{ => gen_3}/castform/snowy/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/castform/snowy/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/castform/sunny/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/castform/sunny/back.png (100%) rename graphics/pokemon/{ => gen_3}/castform/sunny/icon.png (100%) rename graphics/pokemon/{ => gen_3}/castform/sunny/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/castform/sunny/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/chimecho/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/chimecho/back.png (100%) rename graphics/pokemon/{ekans => gen_3/chimecho}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/chimecho/icon.png (100%) rename graphics/pokemon/{ => gen_3}/chimecho/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/chimecho/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/clamperl/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/clamperl/back.png (100%) rename graphics/pokemon/{eldegoss => gen_3/clamperl}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/clamperl/icon.png (100%) rename graphics/pokemon/{ => gen_3}/clamperl/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/clamperl/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/claydol/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/claydol/back.png (100%) rename graphics/pokemon/{ => gen_3}/claydol/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/claydol/icon.png (100%) rename graphics/pokemon/{ => gen_3}/claydol/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/claydol/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/combusken/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/combusken/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/combusken/back.png (100%) rename graphics/pokemon/{ => gen_3}/combusken/backf.png (100%) rename graphics/pokemon/{ => gen_3}/combusken/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/combusken/icon.png (100%) rename graphics/pokemon/{ => gen_3}/combusken/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/combusken/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/corphish/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/corphish/back.png (100%) rename graphics/pokemon/{ => gen_3}/corphish/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/corphish/icon.png (100%) rename graphics/pokemon/{ => gen_3}/corphish/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/corphish/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/cradily/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/cradily/back.png (100%) rename graphics/pokemon/{ => gen_3}/cradily/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/cradily/icon.png (100%) rename graphics/pokemon/{ => gen_3}/cradily/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/cradily/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/crawdaunt/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/crawdaunt/back.png (100%) rename graphics/pokemon/{ => gen_3}/crawdaunt/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/crawdaunt/icon.png (100%) rename graphics/pokemon/{ => gen_3}/crawdaunt/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/crawdaunt/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/delcatty/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/delcatty/back.png (100%) rename graphics/pokemon/{ => gen_3}/delcatty/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/delcatty/icon.png (100%) rename graphics/pokemon/{ => gen_3}/delcatty/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/delcatty/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/deoxys/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/deoxys/attack/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/deoxys/attack/back.png (100%) rename graphics/pokemon/{ => gen_3}/deoxys/attack/icon.png (100%) rename graphics/pokemon/{ => gen_3}/deoxys/attack/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/deoxys/attack/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/deoxys/back.png (100%) rename graphics/pokemon/{ => gen_3}/deoxys/defense/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/deoxys/defense/back.png (100%) rename graphics/pokemon/{ => gen_3}/deoxys/defense/icon.png (100%) rename graphics/pokemon/{ => gen_3}/deoxys/defense/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/deoxys/defense/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/deoxys/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/deoxys/icon.png (100%) rename graphics/pokemon/{ => gen_3}/deoxys/icon_speed_wide.png (100%) rename graphics/pokemon/{ => gen_3}/deoxys/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/deoxys/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/deoxys/speed/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/deoxys/speed/back.png (100%) rename graphics/pokemon/{ => gen_3}/deoxys/speed/icon.png (100%) rename graphics/pokemon/{ => gen_3}/deoxys/speed/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/deoxys/speed/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/dusclops/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/dusclops/back.png (100%) rename graphics/pokemon/{ => gen_3}/dusclops/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/dusclops/icon.png (100%) rename graphics/pokemon/{ => gen_3}/dusclops/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/dusclops/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/duskull/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/duskull/back.png (100%) rename graphics/pokemon/{electrode => gen_3/duskull}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/duskull/icon.png (100%) rename graphics/pokemon/{ => gen_3}/duskull/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/duskull/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/dustox/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/dustox/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/dustox/back.png (100%) rename graphics/pokemon/{ => gen_3}/dustox/backf.png (100%) rename graphics/pokemon/{ => gen_3}/dustox/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/dustox/icon.png (100%) rename graphics/pokemon/{ => gen_3}/dustox/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/dustox/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/electrike/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/electrike/back.png (100%) rename graphics/pokemon/{ => gen_3}/electrike/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/electrike/icon.png (100%) rename graphics/pokemon/{ => gen_3}/electrike/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/electrike/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/exploud/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/exploud/back.png (100%) rename graphics/pokemon/{ => gen_3}/exploud/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/exploud/icon.png (100%) rename graphics/pokemon/{ => gen_3}/exploud/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/exploud/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/feebas/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/feebas/back.png (100%) rename graphics/pokemon/{escavalier => gen_3/feebas}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/feebas/icon.png (100%) rename graphics/pokemon/{ => gen_3}/feebas/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/feebas/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/flygon/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/flygon/back.png (100%) rename graphics/pokemon/{ => gen_3}/flygon/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/flygon/icon.png (100%) rename graphics/pokemon/{ => gen_3}/flygon/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/flygon/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/gardevoir/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/gardevoir/back.png (100%) rename graphics/pokemon/{ => gen_3}/gardevoir/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/gardevoir/icon.png (100%) rename graphics/pokemon/{ => gen_3}/gardevoir/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/gardevoir/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/gardevoir/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/gardevoir/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/gardevoir/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/gardevoir/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/gardevoir/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/glalie/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/glalie/back.png (100%) rename graphics/pokemon/{exeggcute => gen_3/glalie}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/glalie/icon.png (100%) rename graphics/pokemon/{ => gen_3}/glalie/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/glalie/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/glalie/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/glalie/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/glalie/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/glalie/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/glalie/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/gorebyss/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/gorebyss/back.png (100%) rename graphics/pokemon/{feebas => gen_3/gorebyss}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/gorebyss/icon.png (100%) rename graphics/pokemon/{ => gen_3}/gorebyss/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/gorebyss/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/groudon/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/groudon/back.png (100%) rename graphics/pokemon/{ => gen_3}/groudon/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/groudon/icon.png (100%) rename graphics/pokemon/{ => gen_3}/groudon/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/groudon/primal/back.png (100%) rename graphics/pokemon/{ => gen_3}/groudon/primal/front.png (100%) rename graphics/pokemon/{ => gen_3}/groudon/primal/icon.png (100%) rename graphics/pokemon/{ => gen_3}/groudon/primal/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/groudon/primal/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/groudon/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/grovyle/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/grovyle/back.png (100%) rename graphics/pokemon/{ => gen_3}/grovyle/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/grovyle/icon.png (100%) rename graphics/pokemon/{ => gen_3}/grovyle/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/grovyle/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/grumpig/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/grumpig/back.png (100%) rename graphics/pokemon/{ => gen_3}/grumpig/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/grumpig/icon.png (100%) rename graphics/pokemon/{ => gen_3}/grumpig/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/grumpig/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/gulpin/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/gulpin/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/gulpin/back.png (100%) rename graphics/pokemon/{ => gen_3}/gulpin/backf.png (100%) rename graphics/pokemon/{ferroseed => gen_3/gulpin}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/gulpin/icon.png (100%) rename graphics/pokemon/{ => gen_3}/gulpin/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/gulpin/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/hariyama/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/hariyama/back.png (100%) rename graphics/pokemon/{ => gen_3}/hariyama/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/hariyama/icon.png (100%) rename graphics/pokemon/{ => gen_3}/hariyama/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/hariyama/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/huntail/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/huntail/back.png (100%) rename graphics/pokemon/{finneon => gen_3/huntail}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/huntail/icon.png (100%) rename graphics/pokemon/{ => gen_3}/huntail/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/huntail/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/illumise/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/illumise/back.png (100%) rename graphics/pokemon/{ => gen_3}/illumise/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/illumise/icon.png (100%) rename graphics/pokemon/{ => gen_3}/illumise/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/illumise/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/jirachi/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/jirachi/back.png (100%) rename graphics/pokemon/{ => gen_3}/jirachi/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/jirachi/icon.png (100%) rename graphics/pokemon/{ => gen_3}/jirachi/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/jirachi/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/kecleon/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/kecleon/back.png (100%) rename graphics/pokemon/{ => gen_3}/kecleon/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/kecleon/icon.png (100%) rename graphics/pokemon/{ => gen_3}/kecleon/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/kecleon/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/kirlia/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/kirlia/back.png (100%) rename graphics/pokemon/{budew => gen_3/kirlia}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/kirlia/icon.png (100%) rename graphics/pokemon/{ => gen_3}/kirlia/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/kirlia/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/kyogre/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/kyogre/back.png (100%) rename graphics/pokemon/{ => gen_3}/kyogre/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/kyogre/icon.png (100%) rename graphics/pokemon/{ => gen_3}/kyogre/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/kyogre/primal/back.png (100%) rename graphics/pokemon/{ => gen_3}/kyogre/primal/front.png (100%) rename graphics/pokemon/{ => gen_3}/kyogre/primal/icon.png (100%) rename graphics/pokemon/{ => gen_3}/kyogre/primal/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/kyogre/primal/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/kyogre/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/lairon/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/lairon/back.png (100%) rename graphics/pokemon/{ => gen_3}/lairon/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/lairon/icon.png (100%) rename graphics/pokemon/{ => gen_3}/lairon/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/lairon/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/latias/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/latias/back.png (100%) rename graphics/pokemon/{ => gen_3}/latias/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/latias/icon.png (100%) rename graphics/pokemon/{ => gen_3}/latias/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/latias/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/latias/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/latias/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/latias/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/latias/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/latias/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/latios/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/latios/back.png (100%) rename graphics/pokemon/{ => gen_3}/latios/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/latios/icon.png (100%) rename graphics/pokemon/{ => gen_3}/latios/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/latios/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/latios/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/latios/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/latios/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/latios/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/latios/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/lileep/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/lileep/back.png (100%) rename graphics/pokemon/{ => gen_3}/lileep/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/lileep/icon.png (100%) rename graphics/pokemon/{ => gen_3}/lileep/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/lileep/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/linoone/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/linoone/back.png (100%) rename graphics/pokemon/{ => gen_3}/linoone/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/linoone/galarian/back.png (100%) rename graphics/pokemon/{ => gen_3}/linoone/galarian/front.png (100%) rename graphics/pokemon/{ => gen_3}/linoone/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_3}/linoone/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/linoone/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/linoone/icon.png (100%) rename graphics/pokemon/{ => gen_3}/linoone/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/linoone/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/lombre/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/lombre/back.png (100%) rename graphics/pokemon/{ => gen_3}/lombre/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/lombre/icon.png (100%) rename graphics/pokemon/{ => gen_3}/lombre/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/lombre/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/lotad/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/lotad/back.png (100%) rename graphics/pokemon/{ => gen_3}/lotad/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/lotad/icon.png (100%) rename graphics/pokemon/{ => gen_3}/lotad/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/lotad/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/loudred/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/loudred/back.png (100%) rename graphics/pokemon/{ => gen_3}/loudred/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/loudred/icon.png (100%) rename graphics/pokemon/{ => gen_3}/loudred/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/loudred/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/ludicolo/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/ludicolo/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/ludicolo/back.png (100%) rename graphics/pokemon/{ => gen_3}/ludicolo/backf.png (100%) rename graphics/pokemon/{ => gen_3}/ludicolo/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/ludicolo/icon.png (100%) rename graphics/pokemon/{ => gen_3}/ludicolo/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/ludicolo/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/lunatone/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/lunatone/back.png (100%) rename graphics/pokemon/{flabebe => gen_3/lunatone}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/lunatone/icon.png (100%) rename graphics/pokemon/{ => gen_3}/lunatone/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/lunatone/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/luvdisc/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/luvdisc/back.png (100%) rename graphics/pokemon/{flapple => gen_3/luvdisc}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/luvdisc/icon.png (100%) rename graphics/pokemon/{ => gen_3}/luvdisc/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/luvdisc/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/makuhita/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/makuhita/back.png (100%) rename graphics/pokemon/{ => gen_3}/makuhita/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/makuhita/icon.png (100%) rename graphics/pokemon/{ => gen_3}/makuhita/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/makuhita/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/manectric/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/manectric/back.png (100%) rename graphics/pokemon/{ => gen_3}/manectric/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/manectric/icon.png (100%) rename graphics/pokemon/{ => gen_3}/manectric/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/manectric/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/manectric/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/manectric/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/manectric/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/manectric/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/manectric/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/marshtomp/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/marshtomp/back.png (100%) rename graphics/pokemon/{ => gen_3}/marshtomp/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/marshtomp/icon.png (100%) rename graphics/pokemon/{ => gen_3}/marshtomp/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/marshtomp/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/masquerain/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/masquerain/back.png (100%) rename graphics/pokemon/{floette => gen_3/masquerain}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/masquerain/icon.png (100%) rename graphics/pokemon/{ => gen_3}/masquerain/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/masquerain/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/mawile/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/mawile/back.png (100%) rename graphics/pokemon/{ => gen_3}/mawile/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/mawile/icon.png (100%) rename graphics/pokemon/{ => gen_3}/mawile/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/mawile/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/mawile/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/mawile/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/mawile/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/mawile/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/mawile/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/medicham/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/medicham/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/medicham/back.png (100%) rename graphics/pokemon/{ => gen_3}/medicham/backf.png (100%) rename graphics/pokemon/{ => gen_3}/medicham/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/medicham/icon.png (100%) rename graphics/pokemon/{ => gen_3}/medicham/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/medicham/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/medicham/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/medicham/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/medicham/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/medicham/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/medicham/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/meditite/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/meditite/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/meditite/back.png (100%) rename graphics/pokemon/{ => gen_3}/meditite/backf.png (100%) rename graphics/pokemon/{ => gen_3}/meditite/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/meditite/icon.png (100%) rename graphics/pokemon/{ => gen_3}/meditite/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/meditite/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/metagross/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/metagross/back.png (100%) rename graphics/pokemon/{ => gen_3}/metagross/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/metagross/icon.png (100%) rename graphics/pokemon/{ => gen_3}/metagross/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/metagross/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/metagross/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/metagross/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/metagross/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/metagross/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/metagross/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/metang/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/metang/back.png (100%) rename graphics/pokemon/{ => gen_3}/metang/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/metang/icon.png (100%) rename graphics/pokemon/{ => gen_3}/metang/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/metang/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/mightyena/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/mightyena/back.png (100%) rename graphics/pokemon/{ => gen_3}/mightyena/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/mightyena/icon.png (100%) rename graphics/pokemon/{ => gen_3}/mightyena/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/mightyena/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/milotic/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/milotic/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/milotic/back.png (100%) rename graphics/pokemon/{ => gen_3}/milotic/backf.png (100%) rename graphics/pokemon/{florges => gen_3/milotic}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/milotic/icon.png (100%) rename graphics/pokemon/{ => gen_3}/milotic/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/milotic/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/minun/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/minun/back.png (100%) rename graphics/pokemon/{ => gen_3}/minun/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/minun/icon.png (100%) rename graphics/pokemon/{ => gen_3}/minun/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/minun/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/mudkip/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/mudkip/back.png (100%) rename graphics/pokemon/{ => gen_3}/mudkip/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/mudkip/icon.png (100%) rename graphics/pokemon/{ => gen_3}/mudkip/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/mudkip/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/nincada/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/nincada/back.png (100%) rename graphics/pokemon/{ => gen_3}/nincada/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/nincada/icon.png (100%) rename graphics/pokemon/{ => gen_3}/nincada/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/nincada/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/ninjask/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/ninjask/back.png (100%) rename graphics/pokemon/{ => gen_3}/ninjask/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/ninjask/icon.png (100%) rename graphics/pokemon/{ => gen_3}/ninjask/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/ninjask/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/nosepass/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/nosepass/back.png (100%) rename graphics/pokemon/{ => gen_3}/nosepass/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/nosepass/icon.png (100%) rename graphics/pokemon/{ => gen_3}/nosepass/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/nosepass/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/numel/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/numel/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/numel/back.png (100%) rename graphics/pokemon/{ => gen_3}/numel/backf.png (100%) rename graphics/pokemon/{ => gen_3}/numel/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/numel/icon.png (100%) rename graphics/pokemon/{ => gen_3}/numel/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/numel/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/nuzleaf/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/nuzleaf/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/nuzleaf/back.png (100%) rename graphics/pokemon/{ => gen_3}/nuzleaf/backf.png (100%) rename graphics/pokemon/{ => gen_3}/nuzleaf/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/nuzleaf/icon.png (100%) rename graphics/pokemon/{ => gen_3}/nuzleaf/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/nuzleaf/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/pelipper/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/pelipper/back.png (100%) rename graphics/pokemon/{ => gen_3}/pelipper/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/pelipper/icon.png (100%) rename graphics/pokemon/{ => gen_3}/pelipper/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/pelipper/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/plusle/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/plusle/back.png (100%) rename graphics/pokemon/{ => gen_3}/plusle/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/plusle/icon.png (100%) rename graphics/pokemon/{ => gen_3}/plusle/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/plusle/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/poochyena/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/poochyena/back.png (100%) rename graphics/pokemon/{ => gen_3}/poochyena/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/poochyena/icon.png (100%) rename graphics/pokemon/{ => gen_3}/poochyena/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/poochyena/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/ralts/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/ralts/back.png (100%) rename graphics/pokemon/{durant => gen_3/ralts}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/ralts/icon.png (100%) rename graphics/pokemon/{ => gen_3}/ralts/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/ralts/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/rayquaza/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/rayquaza/back.png (100%) rename graphics/pokemon/{foongus => gen_3/rayquaza}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/rayquaza/icon.png (100%) rename graphics/pokemon/{ => gen_3}/rayquaza/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/rayquaza/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/rayquaza/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/rayquaza/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/rayquaza/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/rayquaza/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/rayquaza/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/regice/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/regice/back.png (100%) rename graphics/pokemon/{dwebble => gen_3/regice}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/regice/icon.png (100%) rename graphics/pokemon/{ => gen_3}/regice/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/regice/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/regirock/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/regirock/back.png (100%) rename graphics/pokemon/{ => gen_3}/regirock/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/regirock/icon.png (100%) rename graphics/pokemon/{ => gen_3}/regirock/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/regirock/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/registeel/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/registeel/back.png (100%) rename graphics/pokemon/{ => gen_3}/registeel/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/registeel/icon.png (100%) rename graphics/pokemon/{ => gen_3}/registeel/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/registeel/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/relicanth/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/relicanth/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/relicanth/back.png (100%) rename graphics/pokemon/{ => gen_3}/relicanth/backf.png (100%) rename graphics/pokemon/{forretress => gen_3/relicanth}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/relicanth/icon.png (100%) rename graphics/pokemon/{ => gen_3}/relicanth/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/relicanth/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/roselia/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/roselia/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/roselia/back.png (100%) rename graphics/pokemon/{ => gen_3}/roselia/backf.png (100%) rename graphics/pokemon/{ => gen_3}/roselia/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/roselia/icon.png (100%) rename graphics/pokemon/{ => gen_3}/roselia/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/roselia/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/sableye/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/sableye/back.png (100%) rename graphics/pokemon/{ => gen_3}/sableye/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/sableye/icon.png (100%) rename graphics/pokemon/{ => gen_3}/sableye/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/sableye/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/sableye/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/sableye/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/sableye/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/sableye/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/sableye/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/salamence/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/salamence/back.png (100%) rename graphics/pokemon/{ => gen_3}/salamence/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/salamence/icon.png (100%) rename graphics/pokemon/{ => gen_3}/salamence/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/salamence/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/salamence/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/salamence/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/salamence/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/salamence/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/salamence/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/sceptile/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/sceptile/back.png (100%) rename graphics/pokemon/{ => gen_3}/sceptile/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/sceptile/icon.png (100%) rename graphics/pokemon/{ => gen_3}/sceptile/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/sceptile/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/sceptile/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/sceptile/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/sceptile/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/sceptile/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/sceptile/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/sealeo/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/sealeo/back.png (100%) rename graphics/pokemon/{frillish => gen_3/sealeo}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/sealeo/icon.png (100%) rename graphics/pokemon/{ => gen_3}/sealeo/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/sealeo/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/seedot/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/seedot/back.png (100%) rename graphics/pokemon/{ => gen_3}/seedot/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/seedot/icon.png (100%) rename graphics/pokemon/{ => gen_3}/seedot/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/seedot/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/seviper/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/seviper/back.png (100%) rename graphics/pokemon/{froslass => gen_3/seviper}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/seviper/icon.png (100%) rename graphics/pokemon/{ => gen_3}/seviper/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/seviper/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/sharpedo/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/sharpedo/back.png (100%) rename graphics/pokemon/{frosmoth => gen_3/sharpedo}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/sharpedo/icon.png (100%) rename graphics/pokemon/{ => gen_3}/sharpedo/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/sharpedo/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/sharpedo/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/sharpedo/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/sharpedo/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/sharpedo/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/sharpedo/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/shedinja/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/shedinja/back.png (100%) rename graphics/pokemon/{ => gen_3}/shedinja/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/shedinja/icon.png (100%) rename graphics/pokemon/{ => gen_3}/shedinja/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/shedinja/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/shelgon/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/shelgon/back.png (100%) rename graphics/pokemon/{ => gen_3}/shelgon/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/shelgon/icon.png (100%) rename graphics/pokemon/{ => gen_3}/shelgon/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/shelgon/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/shiftry/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/shiftry/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/shiftry/back.png (100%) rename graphics/pokemon/{ => gen_3}/shiftry/backf.png (100%) rename graphics/pokemon/{ => gen_3}/shiftry/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/shiftry/icon.png (100%) rename graphics/pokemon/{ => gen_3}/shiftry/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/shiftry/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/shroomish/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/shroomish/back.png (100%) rename graphics/pokemon/{ => gen_3}/shroomish/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/shroomish/icon.png (100%) rename graphics/pokemon/{ => gen_3}/shroomish/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/shroomish/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/shuppet/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/shuppet/back.png (100%) rename graphics/pokemon/{gastly => gen_3/shuppet}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/shuppet/icon.png (100%) rename graphics/pokemon/{ => gen_3}/shuppet/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/shuppet/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/silcoon/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/silcoon/back.png (100%) rename graphics/pokemon/{geodude => gen_3/silcoon}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/silcoon/icon.png (100%) rename graphics/pokemon/{ => gen_3}/silcoon/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/silcoon/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/skitty/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/skitty/back.png (100%) rename graphics/pokemon/{ => gen_3}/skitty/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/skitty/icon.png (100%) rename graphics/pokemon/{ => gen_3}/skitty/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/skitty/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/slaking/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/slaking/back.png (100%) rename graphics/pokemon/{ => gen_3}/slaking/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/slaking/icon.png (100%) rename graphics/pokemon/{ => gen_3}/slaking/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/slaking/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/slakoth/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/slakoth/back.png (100%) rename graphics/pokemon/{ => gen_3}/slakoth/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/slakoth/icon.png (100%) rename graphics/pokemon/{ => gen_3}/slakoth/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/slakoth/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/snorunt/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/snorunt/back.png (100%) rename graphics/pokemon/{ => gen_3}/snorunt/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/snorunt/icon.png (100%) rename graphics/pokemon/{ => gen_3}/snorunt/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/snorunt/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/solrock/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/solrock/back.png (100%) rename graphics/pokemon/{glalie => gen_3/solrock}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/solrock/icon.png (100%) rename graphics/pokemon/{ => gen_3}/solrock/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/solrock/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/spheal/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/spheal/back.png (100%) rename graphics/pokemon/{goldeen => gen_3/spheal}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/spheal/icon.png (100%) rename graphics/pokemon/{ => gen_3}/spheal/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/spheal/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/spinda/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/spinda/back.png (100%) rename graphics/pokemon/{ => gen_3}/spinda/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/spinda/icon.png (100%) rename graphics/pokemon/{ => gen_3}/spinda/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/spinda/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/spinda/spots/spot_0.png (100%) rename graphics/pokemon/{ => gen_3}/spinda/spots/spot_1.png (100%) rename graphics/pokemon/{ => gen_3}/spinda/spots/spot_2.png (100%) rename graphics/pokemon/{ => gen_3}/spinda/spots/spot_3.png (100%) rename graphics/pokemon/{ => gen_3}/spoink/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/spoink/back.png (100%) rename graphics/pokemon/{goomy => gen_3/spoink}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/spoink/icon.png (100%) rename graphics/pokemon/{ => gen_3}/spoink/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/spoink/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/surskit/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/surskit/back.png (100%) rename graphics/pokemon/{ => gen_3}/surskit/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/surskit/icon.png (100%) rename graphics/pokemon/{ => gen_3}/surskit/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/surskit/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/swablu/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/swablu/back.png (100%) rename graphics/pokemon/{ => gen_3}/swablu/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/swablu/icon.png (100%) rename graphics/pokemon/{ => gen_3}/swablu/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/swablu/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/swalot/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/swalot/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_3}/swalot/back.png (100%) rename graphics/pokemon/{ => gen_3}/swalot/backf.png (100%) rename graphics/pokemon/{gorebyss => gen_3/swalot}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/swalot/icon.png (100%) rename graphics/pokemon/{ => gen_3}/swalot/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/swalot/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/swampert/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/swampert/back.png (100%) rename graphics/pokemon/{ => gen_3}/swampert/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/swampert/icon.png (100%) rename graphics/pokemon/{ => gen_3}/swampert/mega/back.png (100%) rename graphics/pokemon/{ => gen_3}/swampert/mega/front.png (100%) rename graphics/pokemon/{ => gen_3}/swampert/mega/icon.png (100%) rename graphics/pokemon/{ => gen_3}/swampert/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/swampert/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/swampert/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/swampert/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/swellow/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/swellow/back.png (100%) rename graphics/pokemon/{ => gen_3}/swellow/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/swellow/icon.png (100%) rename graphics/pokemon/{ => gen_3}/swellow/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/swellow/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/taillow/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/taillow/back.png (100%) rename graphics/pokemon/{ => gen_3}/taillow/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/taillow/icon.png (100%) rename graphics/pokemon/{ => gen_3}/taillow/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/taillow/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/torchic/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/torchic/back.png (100%) rename graphics/pokemon/{ => gen_3}/torchic/backf.png (100%) rename graphics/pokemon/{ => gen_3}/torchic/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/torchic/icon.png (100%) rename graphics/pokemon/{ => gen_3}/torchic/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/torchic/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/torkoal/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/torkoal/back.png (100%) rename graphics/pokemon/{ => gen_3}/torkoal/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/torkoal/icon.png (100%) rename graphics/pokemon/{ => gen_3}/torkoal/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/torkoal/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/trapinch/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/trapinch/back.png (100%) rename graphics/pokemon/{ => gen_3}/trapinch/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/trapinch/icon.png (100%) rename graphics/pokemon/{ => gen_3}/trapinch/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/trapinch/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/treecko/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/treecko/back.png (100%) rename graphics/pokemon/{ => gen_3}/treecko/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/treecko/icon.png (100%) rename graphics/pokemon/{ => gen_3}/treecko/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/treecko/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/tropius/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/tropius/back.png (100%) rename graphics/pokemon/{ => gen_3}/tropius/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/tropius/icon.png (100%) rename graphics/pokemon/{ => gen_3}/tropius/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/tropius/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/vibrava/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/vibrava/back.png (100%) rename graphics/pokemon/{ => gen_3}/vibrava/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/vibrava/icon.png (100%) rename graphics/pokemon/{ => gen_3}/vibrava/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/vibrava/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/vigoroth/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/vigoroth/back.png (100%) rename graphics/pokemon/{ => gen_3}/vigoroth/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/vigoroth/icon.png (100%) rename graphics/pokemon/{ => gen_3}/vigoroth/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/vigoroth/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/volbeat/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/volbeat/back.png (100%) rename graphics/pokemon/{ => gen_3}/volbeat/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/volbeat/icon.png (100%) rename graphics/pokemon/{ => gen_3}/volbeat/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/volbeat/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/wailmer/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/wailmer/back.png (100%) rename graphics/pokemon/{grimer => gen_3/wailmer}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/wailmer/icon.png (100%) rename graphics/pokemon/{ => gen_3}/wailmer/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/wailmer/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/wailord/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/wailord/back.png (100%) rename graphics/pokemon/{gulpin => gen_3/wailord}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/wailord/icon.png (100%) rename graphics/pokemon/{ => gen_3}/wailord/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/wailord/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/walrein/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/walrein/back.png (100%) rename graphics/pokemon/{gyarados => gen_3/walrein}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/walrein/icon.png (100%) rename graphics/pokemon/{ => gen_3}/walrein/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/walrein/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/whiscash/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/whiscash/back.png (100%) rename graphics/pokemon/{hatterene => gen_3/whiscash}/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/whiscash/icon.png (100%) rename graphics/pokemon/{ => gen_3}/whiscash/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/whiscash/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/whismur/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/whismur/back.png (100%) rename graphics/pokemon/{ => gen_3}/whismur/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/whismur/icon.png (100%) rename graphics/pokemon/{ => gen_3}/whismur/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/whismur/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/wingull/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/wingull/back.png (100%) rename graphics/pokemon/{ => gen_3}/wingull/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/wingull/icon.png (100%) rename graphics/pokemon/{ => gen_3}/wingull/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/wingull/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/wurmple/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/wurmple/back.png (100%) rename graphics/pokemon/{ => gen_3}/wurmple/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/wurmple/icon.png (100%) rename graphics/pokemon/{ => gen_3}/wurmple/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/wurmple/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/wynaut/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/wynaut/back.png (100%) rename graphics/pokemon/{ => gen_3}/wynaut/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/wynaut/icon.png (100%) rename graphics/pokemon/{ => gen_3}/wynaut/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/wynaut/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/zangoose/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/zangoose/back.png (100%) rename graphics/pokemon/{ => gen_3}/zangoose/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/zangoose/icon.png (100%) rename graphics/pokemon/{ => gen_3}/zangoose/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/zangoose/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/zigzagoon/anim_front.png (100%) rename graphics/pokemon/{ => gen_3}/zigzagoon/back.png (100%) rename graphics/pokemon/{ => gen_3}/zigzagoon/footprint.png (100%) rename graphics/pokemon/{ => gen_3}/zigzagoon/galarian/back.png (100%) rename graphics/pokemon/{ => gen_3}/zigzagoon/galarian/front.png (100%) rename graphics/pokemon/{ => gen_3}/zigzagoon/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_3}/zigzagoon/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/zigzagoon/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_3}/zigzagoon/icon.png (100%) rename graphics/pokemon/{ => gen_3}/zigzagoon/normal.pal (100%) rename graphics/pokemon/{ => gen_3}/zigzagoon/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/abomasnow/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/abomasnow/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/abomasnow/back.png (100%) rename graphics/pokemon/{ => gen_4}/abomasnow/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/abomasnow/icon.png (100%) rename graphics/pokemon/{ => gen_4}/abomasnow/mega/back.png (100%) rename graphics/pokemon/{ => gen_4}/abomasnow/mega/front.png (100%) rename graphics/pokemon/{ => gen_4}/abomasnow/mega/icon.png (100%) rename graphics/pokemon/{ => gen_4}/abomasnow/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/abomasnow/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/abomasnow/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/abomasnow/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/ambipom/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/ambipom/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/ambipom/back.png (100%) rename graphics/pokemon/{ => gen_4}/ambipom/backf.png (100%) rename graphics/pokemon/{ => gen_4}/ambipom/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/ambipom/icon.png (100%) rename graphics/pokemon/{ => gen_4}/ambipom/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/ambipom/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/arceus/back.png (100%) rename graphics/pokemon/{ => gen_4}/arceus/bug/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/bug/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/dark/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/dark/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/dragon/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/dragon/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/electric/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/electric/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/fairy/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/fairy/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/fighting/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/fighting/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/fire/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/fire/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/flying/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/flying/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/arceus/ghost/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/ghost/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/grass/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/grass/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/ground/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/ground/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/ice/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/ice/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/icon.png (100%) rename graphics/pokemon/{ => gen_4}/arceus/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/poison/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/poison/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/psychic/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/psychic/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/rock/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/rock/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/steel/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/steel/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/water/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/arceus/water/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/azelf/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/azelf/back.png (100%) rename graphics/pokemon/{ => gen_4}/azelf/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/azelf/icon.png (100%) rename graphics/pokemon/{ => gen_4}/azelf/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/azelf/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/bastiodon/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/bastiodon/back.png (100%) rename graphics/pokemon/{ => gen_4}/bastiodon/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/bastiodon/icon.png (100%) rename graphics/pokemon/{ => gen_4}/bastiodon/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/bastiodon/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/bibarel/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/bibarel/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/bibarel/back.png (100%) rename graphics/pokemon/{ => gen_4}/bibarel/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/bibarel/icon.png (100%) rename graphics/pokemon/{ => gen_4}/bibarel/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/bibarel/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/bidoof/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/bidoof/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/bidoof/back.png (100%) rename graphics/pokemon/{ => gen_4}/bidoof/backf.png (100%) rename graphics/pokemon/{ => gen_4}/bidoof/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/bidoof/icon.png (100%) rename graphics/pokemon/{ => gen_4}/bidoof/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/bidoof/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/bonsly/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/bonsly/back.png (100%) rename graphics/pokemon/{ => gen_4}/bonsly/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/bonsly/icon.png (100%) rename graphics/pokemon/{ => gen_4}/bonsly/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/bonsly/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/bronzong/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/bronzong/back.png (100%) rename graphics/pokemon/{haunter => gen_4/bronzong}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/bronzong/icon.png (100%) rename graphics/pokemon/{ => gen_4}/bronzong/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/bronzong/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/bronzor/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/bronzor/back.png (100%) rename graphics/pokemon/{honedge => gen_4/bronzor}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/bronzor/icon.png (100%) rename graphics/pokemon/{ => gen_4}/bronzor/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/bronzor/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/budew/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/budew/back.png (100%) rename graphics/pokemon/{buzzwole => gen_4/budew}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/budew/icon.png (100%) rename graphics/pokemon/{ => gen_4}/budew/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/budew/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/buizel/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/buizel/back.png (100%) rename graphics/pokemon/{ => gen_4}/buizel/backf.png (100%) rename graphics/pokemon/{ => gen_4}/buizel/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/buizel/icon.png (100%) rename graphics/pokemon/{ => gen_4}/buizel/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/buizel/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/buneary/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/buneary/back.png (100%) rename graphics/pokemon/{ => gen_4}/buneary/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/buneary/icon.png (100%) rename graphics/pokemon/{ => gen_4}/buneary/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/buneary/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/burmy/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/burmy/back.png (100%) rename graphics/pokemon/{ => gen_4}/burmy/icon.png (100%) rename graphics/pokemon/{ => gen_4}/burmy/normal.pal (100%) rename graphics/pokemon/{hoopa => gen_4/burmy/plant}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/burmy/sandy_cloak/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/burmy/sandy_cloak/back.png (100%) rename graphics/pokemon/{ => gen_4}/burmy/sandy_cloak/icon.png (100%) rename graphics/pokemon/{ => gen_4}/burmy/sandy_cloak/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/burmy/sandy_cloak/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/burmy/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/burmy/trash_cloak/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/burmy/trash_cloak/back.png (100%) rename graphics/pokemon/{ => gen_4}/burmy/trash_cloak/icon.png (100%) rename graphics/pokemon/{ => gen_4}/burmy/trash_cloak/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/burmy/trash_cloak/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/carnivine/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/carnivine/back.png (100%) rename graphics/pokemon/{horsea => gen_4/carnivine}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/carnivine/icon.png (100%) rename graphics/pokemon/{ => gen_4}/carnivine/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/carnivine/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/chatot/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/chatot/back.png (100%) rename graphics/pokemon/{ => gen_4}/chatot/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/chatot/icon.png (100%) rename graphics/pokemon/{ => gen_4}/chatot/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/chatot/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/cherrim/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/cherrim/back.png (100%) rename graphics/pokemon/{calyrex => gen_4/cherrim}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/cherrim/icon.png (100%) rename graphics/pokemon/{ => gen_4}/cherrim/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/cherrim/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/cherrim/sunshine/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/cherrim/sunshine/back.png (100%) rename graphics/pokemon/{ => gen_4}/cherrim/sunshine/icon.png (100%) rename graphics/pokemon/{ => gen_4}/cherrim/sunshine/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/cherrim/sunshine/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/cherubi/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/cherubi/back.png (100%) rename graphics/pokemon/{caterpie => gen_4/cherubi}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/cherubi/icon.png (100%) rename graphics/pokemon/{ => gen_4}/cherubi/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/cherubi/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/chimchar/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/chimchar/back.png (100%) rename graphics/pokemon/{ => gen_4}/chimchar/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/chimchar/icon.png (100%) rename graphics/pokemon/{ => gen_4}/chimchar/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/chimchar/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/chingling/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/chingling/back.png (100%) rename graphics/pokemon/{ => gen_4}/chingling/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/chingling/icon.png (100%) rename graphics/pokemon/{ => gen_4}/chingling/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/chingling/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/combee/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/combee/back.png (100%) rename graphics/pokemon/{huntail => gen_4/combee}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/combee/icon.png (100%) rename graphics/pokemon/{ => gen_4}/combee/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/combee/normalf.pal (100%) rename graphics/pokemon/{ => gen_4}/combee/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/combee/shinyf.pal (100%) rename graphics/pokemon/{ => gen_4}/cranidos/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/cranidos/back.png (100%) rename graphics/pokemon/{ => gen_4}/cranidos/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/cranidos/icon.png (100%) rename graphics/pokemon/{ => gen_4}/cranidos/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/cranidos/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/cresselia/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/cresselia/back.png (100%) rename graphics/pokemon/{hydreigon => gen_4/cresselia}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/cresselia/icon.png (100%) rename graphics/pokemon/{ => gen_4}/cresselia/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/cresselia/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/croagunk/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/croagunk/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/croagunk/back.png (100%) rename graphics/pokemon/{ => gen_4}/croagunk/backf.png (100%) rename graphics/pokemon/{ => gen_4}/croagunk/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/croagunk/icon.png (100%) rename graphics/pokemon/{ => gen_4}/croagunk/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/croagunk/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/darkrai/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/darkrai/back.png (100%) rename graphics/pokemon/{centiskorch => gen_4/darkrai}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/darkrai/icon.png (100%) rename graphics/pokemon/{ => gen_4}/darkrai/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/darkrai/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/dialga/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/dialga/back.png (100%) rename graphics/pokemon/{ => gen_4}/dialga/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/dialga/icon.png (100%) rename graphics/pokemon/{ => gen_4}/dialga/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/dialga/origin/back.png (100%) rename graphics/pokemon/{ => gen_4}/dialga/origin/front.png (100%) rename graphics/pokemon/{ => gen_4}/dialga/origin/icon.png (100%) rename graphics/pokemon/{ => gen_4}/dialga/origin/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/dialga/origin/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/dialga/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/drapion/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/drapion/back.png (100%) rename graphics/pokemon/{espurr => gen_4/drapion}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/drapion/icon.png (100%) rename graphics/pokemon/{ => gen_4}/drapion/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/drapion/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/drifblim/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/drifblim/back.png (100%) rename graphics/pokemon/{inkay => gen_4/drifblim}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/drifblim/icon.png (100%) rename graphics/pokemon/{ => gen_4}/drifblim/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/drifblim/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/drifloon/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/drifloon/back.png (100%) rename graphics/pokemon/{jellicent => gen_4/drifloon}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/drifloon/icon.png (100%) rename graphics/pokemon/{ => gen_4}/drifloon/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/drifloon/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/dusknoir/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/dusknoir/back.png (100%) rename graphics/pokemon/{jynx => gen_4/dusknoir}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/dusknoir/icon.png (100%) rename graphics/pokemon/{ => gen_4}/dusknoir/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/dusknoir/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/electivire/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/electivire/back.png (100%) rename graphics/pokemon/{ => gen_4}/electivire/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/electivire/icon.png (100%) rename graphics/pokemon/{ => gen_4}/electivire/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/electivire/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/empoleon/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/empoleon/back.png (100%) rename graphics/pokemon/{ => gen_4}/empoleon/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/empoleon/icon.png (100%) rename graphics/pokemon/{ => gen_4}/empoleon/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/empoleon/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/finneon/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/finneon/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/finneon/back.png (100%) rename graphics/pokemon/{ => gen_4}/finneon/backf.png (100%) rename graphics/pokemon/{kakuna => gen_4/finneon}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/finneon/icon.png (100%) rename graphics/pokemon/{ => gen_4}/finneon/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/finneon/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/floatzel/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/floatzel/back.png (100%) rename graphics/pokemon/{ => gen_4}/floatzel/backf.png (100%) rename graphics/pokemon/{ => gen_4}/floatzel/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/floatzel/icon.png (100%) rename graphics/pokemon/{ => gen_4}/floatzel/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/floatzel/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/froslass/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/froslass/back.png (100%) rename graphics/pokemon/{kartana => gen_4/froslass}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/froslass/icon.png (100%) rename graphics/pokemon/{ => gen_4}/froslass/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/froslass/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/gabite/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/gabite/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/gabite/back.png (100%) rename graphics/pokemon/{ => gen_4}/gabite/backf.png (100%) rename graphics/pokemon/{ => gen_4}/gabite/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/gabite/icon.png (100%) rename graphics/pokemon/{ => gen_4}/gabite/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/gabite/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/gallade/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/gallade/back.png (100%) rename graphics/pokemon/{ => gen_4}/gallade/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/gallade/icon.png (100%) rename graphics/pokemon/{ => gen_4}/gallade/mega/back.png (100%) rename graphics/pokemon/{ => gen_4}/gallade/mega/front.png (100%) rename graphics/pokemon/{ => gen_4}/gallade/mega/icon.png (100%) rename graphics/pokemon/{ => gen_4}/gallade/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/gallade/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/gallade/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/gallade/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/garchomp/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/garchomp/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/garchomp/back.png (100%) rename graphics/pokemon/{ => gen_4}/garchomp/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/garchomp/icon.png (100%) rename graphics/pokemon/{ => gen_4}/garchomp/mega/back.png (100%) rename graphics/pokemon/{ => gen_4}/garchomp/mega/front.png (100%) rename graphics/pokemon/{ => gen_4}/garchomp/mega/icon.png (100%) rename graphics/pokemon/{ => gen_4}/garchomp/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/garchomp/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/garchomp/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/garchomp/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/gastrodon/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/gastrodon/back.png (100%) rename graphics/pokemon/{ => gen_4}/gastrodon/east_sea/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/gastrodon/east_sea/back.png (100%) rename graphics/pokemon/{ => gen_4}/gastrodon/east_sea/icon.png (100%) rename graphics/pokemon/{ => gen_4}/gastrodon/east_sea/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/gastrodon/east_sea/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/gastrodon/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/gastrodon/icon.png (100%) rename graphics/pokemon/{ => gen_4}/gastrodon/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/gastrodon/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/gible/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/gible/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/gible/back.png (100%) rename graphics/pokemon/{ => gen_4}/gible/backf.png (100%) rename graphics/pokemon/{ => gen_4}/gible/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/gible/icon.png (100%) rename graphics/pokemon/{ => gen_4}/gible/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/gible/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/giratina/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/giratina/back.png (100%) rename graphics/pokemon/{ => gen_4}/giratina/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/giratina/icon.png (100%) rename graphics/pokemon/{ => gen_4}/giratina/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/giratina/origin/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/giratina/origin/back.png (100%) rename graphics/pokemon/{ => gen_4}/giratina/origin/icon.png (100%) rename graphics/pokemon/{ => gen_4}/giratina/origin/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/giratina/origin/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/giratina/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/glaceon/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/glaceon/back.png (100%) rename graphics/pokemon/{ => gen_4}/glaceon/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/glaceon/icon.png (100%) rename graphics/pokemon/{ => gen_4}/glaceon/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/glaceon/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/glameow/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/glameow/back.png (100%) rename graphics/pokemon/{ => gen_4}/glameow/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/glameow/icon.png (100%) rename graphics/pokemon/{ => gen_4}/glameow/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/glameow/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/gliscor/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/gliscor/back.png (100%) rename graphics/pokemon/{ => gen_4}/gliscor/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/gliscor/icon.png (100%) rename graphics/pokemon/{ => gen_4}/gliscor/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/gliscor/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/grotle/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/grotle/back.png (100%) rename graphics/pokemon/{ => gen_4}/grotle/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/grotle/icon.png (100%) rename graphics/pokemon/{ => gen_4}/grotle/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/grotle/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/happiny/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/happiny/back.png (100%) rename graphics/pokemon/{ => gen_4}/happiny/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/happiny/icon.png (100%) rename graphics/pokemon/{ => gen_4}/happiny/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/happiny/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/heatran/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/heatran/back.png (100%) rename graphics/pokemon/{ => gen_4}/heatran/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/heatran/icon.png (100%) rename graphics/pokemon/{ => gen_4}/heatran/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/heatran/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/hippopotas/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/hippopotas/back.png (100%) rename graphics/pokemon/{ => gen_4}/hippopotas/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/hippopotas/icon.png (100%) rename graphics/pokemon/{ => gen_4}/hippopotas/iconf.png (100%) rename graphics/pokemon/{ => gen_4}/hippopotas/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/hippopotas/normalf.pal (100%) rename graphics/pokemon/{ => gen_4}/hippopotas/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/hippopotas/shinyf.pal (100%) rename graphics/pokemon/{ => gen_4}/hippowdon/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/hippowdon/back.png (100%) rename graphics/pokemon/{ => gen_4}/hippowdon/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/hippowdon/icon.png (100%) rename graphics/pokemon/{ => gen_4}/hippowdon/iconf.png (100%) rename graphics/pokemon/{ => gen_4}/hippowdon/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/hippowdon/normalf.pal (100%) rename graphics/pokemon/{ => gen_4}/hippowdon/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/hippowdon/shinyf.pal (100%) rename graphics/pokemon/{ => gen_4}/honchkrow/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/honchkrow/back.png (100%) rename graphics/pokemon/{ => gen_4}/honchkrow/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/honchkrow/icon.png (100%) rename graphics/pokemon/{ => gen_4}/honchkrow/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/honchkrow/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/infernape/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/infernape/back.png (100%) rename graphics/pokemon/{ => gen_4}/infernape/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/infernape/icon.png (100%) rename graphics/pokemon/{ => gen_4}/infernape/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/infernape/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/kricketot/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/kricketot/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/kricketot/back.png (100%) rename graphics/pokemon/{ => gen_4}/kricketot/backf.png (100%) rename graphics/pokemon/{ => gen_4}/kricketot/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/kricketot/icon.png (100%) rename graphics/pokemon/{ => gen_4}/kricketot/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/kricketot/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/kricketune/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/kricketune/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/kricketune/back.png (100%) rename graphics/pokemon/{ => gen_4}/kricketune/backf.png (100%) rename graphics/pokemon/{gourgeist => gen_4/kricketune}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/kricketune/icon.png (100%) rename graphics/pokemon/{ => gen_4}/kricketune/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/kricketune/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/leafeon/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/leafeon/back.png (100%) rename graphics/pokemon/{ => gen_4}/leafeon/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/leafeon/icon.png (100%) rename graphics/pokemon/{ => gen_4}/leafeon/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/leafeon/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/lickilicky/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/lickilicky/back.png (100%) rename graphics/pokemon/{ => gen_4}/lickilicky/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/lickilicky/icon.png (100%) rename graphics/pokemon/{ => gen_4}/lickilicky/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/lickilicky/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/lopunny/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/lopunny/back.png (100%) rename graphics/pokemon/{ => gen_4}/lopunny/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/lopunny/icon.png (100%) rename graphics/pokemon/{ => gen_4}/lopunny/mega/back.png (100%) rename graphics/pokemon/{ => gen_4}/lopunny/mega/front.png (100%) rename graphics/pokemon/{ => gen_4}/lopunny/mega/icon.png (100%) rename graphics/pokemon/{ => gen_4}/lopunny/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/lopunny/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/lopunny/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/lopunny/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/lucario/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/lucario/back.png (100%) rename graphics/pokemon/{ => gen_4}/lucario/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/lucario/icon.png (100%) rename graphics/pokemon/{ => gen_4}/lucario/mega/back.png (100%) rename graphics/pokemon/{ => gen_4}/lucario/mega/front.png (100%) rename graphics/pokemon/{ => gen_4}/lucario/mega/icon.png (100%) rename graphics/pokemon/{ => gen_4}/lucario/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/lucario/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/lucario/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/lucario/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/lumineon/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/lumineon/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/lumineon/back.png (100%) rename graphics/pokemon/{ => gen_4}/lumineon/backf.png (100%) rename graphics/pokemon/{kingdra => gen_4/lumineon}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/lumineon/icon.png (100%) rename graphics/pokemon/{ => gen_4}/lumineon/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/lumineon/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/luxio/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/luxio/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/luxio/back.png (100%) rename graphics/pokemon/{ => gen_4}/luxio/backf.png (100%) rename graphics/pokemon/{ => gen_4}/luxio/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/luxio/icon.png (100%) rename graphics/pokemon/{ => gen_4}/luxio/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/luxio/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/luxray/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/luxray/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/luxray/back.png (100%) rename graphics/pokemon/{ => gen_4}/luxray/backf.png (100%) rename graphics/pokemon/{ => gen_4}/luxray/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/luxray/icon.png (100%) rename graphics/pokemon/{ => gen_4}/luxray/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/luxray/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/magmortar/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/magmortar/back.png (100%) rename graphics/pokemon/{ => gen_4}/magmortar/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/magmortar/icon.png (100%) rename graphics/pokemon/{ => gen_4}/magmortar/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/magmortar/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/magnezone/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/magnezone/back.png (100%) rename graphics/pokemon/{klang => gen_4/magnezone}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/magnezone/icon.png (100%) rename graphics/pokemon/{ => gen_4}/magnezone/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/magnezone/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/mamoswine/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/mamoswine/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/mamoswine/back.png (100%) rename graphics/pokemon/{ => gen_4}/mamoswine/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/mamoswine/icon.png (100%) rename graphics/pokemon/{ => gen_4}/mamoswine/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/mamoswine/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/manaphy/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/manaphy/back.png (100%) rename graphics/pokemon/{klefki => gen_4/manaphy}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/manaphy/icon.png (100%) rename graphics/pokemon/{ => gen_4}/manaphy/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/manaphy/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/mantyke/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/mantyke/back.png (100%) rename graphics/pokemon/{klink => gen_4/mantyke}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/mantyke/icon.png (100%) rename graphics/pokemon/{ => gen_4}/mantyke/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/mantyke/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/mesprit/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/mesprit/back.png (100%) rename graphics/pokemon/{ => gen_4}/mesprit/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/mesprit/icon.png (100%) rename graphics/pokemon/{ => gen_4}/mesprit/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/mesprit/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/mime_jr/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/mime_jr/back.png (100%) rename graphics/pokemon/{cursola => gen_4/mime_jr}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/mime_jr/icon.png (100%) rename graphics/pokemon/{ => gen_4}/mime_jr/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/mime_jr/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/mismagius/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/mismagius/back.png (100%) rename graphics/pokemon/{klinklang => gen_4/mismagius}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/mismagius/icon.png (100%) rename graphics/pokemon/{ => gen_4}/mismagius/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/mismagius/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/monferno/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/monferno/back.png (100%) rename graphics/pokemon/{ => gen_4}/monferno/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/monferno/icon.png (100%) rename graphics/pokemon/{ => gen_4}/monferno/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/monferno/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/mothim/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/mothim/back.png (100%) rename graphics/pokemon/{kabuto => gen_4/mothim}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/mothim/icon.png (100%) rename graphics/pokemon/{ => gen_4}/mothim/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/mothim/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/munchlax/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/munchlax/back.png (100%) rename graphics/pokemon/{ => gen_4}/munchlax/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/munchlax/icon.png (100%) rename graphics/pokemon/{ => gen_4}/munchlax/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/munchlax/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/pachirisu/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/pachirisu/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/pachirisu/back.png (100%) rename graphics/pokemon/{ => gen_4}/pachirisu/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/pachirisu/icon.png (100%) rename graphics/pokemon/{ => gen_4}/pachirisu/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/pachirisu/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/palkia/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/palkia/back.png (100%) rename graphics/pokemon/{ => gen_4}/palkia/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/palkia/icon.png (100%) rename graphics/pokemon/{ => gen_4}/palkia/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/palkia/origin/back.png (100%) rename graphics/pokemon/{ => gen_4}/palkia/origin/front.png (100%) rename graphics/pokemon/{ => gen_4}/palkia/origin/icon.png (100%) rename graphics/pokemon/{ => gen_4}/palkia/origin/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/palkia/origin/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/palkia/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/phione/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/phione/back.png (100%) rename graphics/pokemon/{koffing => gen_4/phione}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/phione/icon.png (100%) rename graphics/pokemon/{ => gen_4}/phione/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/phione/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/piplup/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/piplup/back.png (100%) rename graphics/pokemon/{ => gen_4}/piplup/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/piplup/icon.png (100%) rename graphics/pokemon/{ => gen_4}/piplup/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/piplup/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/porygon_z/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/porygon_z/back.png (100%) rename graphics/pokemon/{cherrim => gen_4/porygon_z}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/porygon_z/icon.png (100%) rename graphics/pokemon/{ => gen_4}/porygon_z/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/porygon_z/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/prinplup/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/prinplup/back.png (100%) rename graphics/pokemon/{ => gen_4}/prinplup/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/prinplup/icon.png (100%) rename graphics/pokemon/{ => gen_4}/prinplup/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/prinplup/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/probopass/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/probopass/back.png (100%) rename graphics/pokemon/{ => gen_4}/probopass/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/probopass/icon.png (100%) rename graphics/pokemon/{ => gen_4}/probopass/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/probopass/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/purugly/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/purugly/back.png (100%) rename graphics/pokemon/{ => gen_4}/purugly/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/purugly/icon.png (100%) rename graphics/pokemon/{ => gen_4}/purugly/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/purugly/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/rampardos/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/rampardos/back.png (100%) rename graphics/pokemon/{ => gen_4}/rampardos/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/rampardos/icon.png (100%) rename graphics/pokemon/{ => gen_4}/rampardos/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/rampardos/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/regigigas/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/regigigas/back.png (100%) rename graphics/pokemon/{ => gen_4}/regigigas/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/regigigas/icon.png (100%) rename graphics/pokemon/{ => gen_4}/regigigas/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/regigigas/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/rhyperior/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/rhyperior/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/rhyperior/back.png (100%) rename graphics/pokemon/{ => gen_4}/rhyperior/backf.png (100%) rename graphics/pokemon/{ => gen_4}/rhyperior/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/rhyperior/icon.png (100%) rename graphics/pokemon/{ => gen_4}/rhyperior/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/rhyperior/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/riolu/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/riolu/back.png (100%) rename graphics/pokemon/{ => gen_4}/riolu/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/riolu/icon.png (100%) rename graphics/pokemon/{ => gen_4}/riolu/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/riolu/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/roserade/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/roserade/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/roserade/back.png (100%) rename graphics/pokemon/{ => gen_4}/roserade/backf.png (100%) rename graphics/pokemon/{karrablast => gen_4/roserade}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/roserade/icon.png (100%) rename graphics/pokemon/{ => gen_4}/roserade/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/roserade/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/rotom/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/back.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/fan/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/fan/back.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/fan/icon.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/fan/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/rotom/fan/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/rotom/frost/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/frost/back.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/frost/icon.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/frost/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/rotom/frost/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/rotom/heat/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/heat/back.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/heat/icon.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/heat/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/rotom/heat/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/rotom/icon.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/mow/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/mow/back.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/mow/icon.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/mow/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/rotom/mow/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/rotom/normal.pal (100%) rename graphics/pokemon/{lampent => gen_4/rotom/normal}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/rotom/wash/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/wash/back.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/wash/icon.png (100%) rename graphics/pokemon/{ => gen_4}/rotom/wash/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/rotom/wash/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/shaymin/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/shaymin/back.png (100%) rename graphics/pokemon/{ => gen_4}/shaymin/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/shaymin/icon.png (100%) rename graphics/pokemon/{ => gen_4}/shaymin/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/shaymin/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/shaymin/sky/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/shaymin/sky/back.png (100%) rename graphics/pokemon/{ => gen_4}/shaymin/sky/icon.png (100%) rename graphics/pokemon/{ => gen_4}/shaymin/sky/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/shaymin/sky/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/shellos/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/shellos/back.png (100%) rename graphics/pokemon/{ => gen_4}/shellos/east_sea/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/shellos/east_sea/back.png (100%) rename graphics/pokemon/{ => gen_4}/shellos/east_sea/icon.png (100%) rename graphics/pokemon/{ => gen_4}/shellos/east_sea/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/shellos/east_sea/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/shellos/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/shellos/icon.png (100%) rename graphics/pokemon/{ => gen_4}/shellos/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/shellos/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/shieldon/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/shieldon/back.png (100%) rename graphics/pokemon/{ => gen_4}/shieldon/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/shieldon/icon.png (100%) rename graphics/pokemon/{ => gen_4}/shieldon/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/shieldon/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/shinx/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/shinx/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/shinx/back.png (100%) rename graphics/pokemon/{ => gen_4}/shinx/backf.png (100%) rename graphics/pokemon/{ => gen_4}/shinx/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/shinx/icon.png (100%) rename graphics/pokemon/{ => gen_4}/shinx/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/shinx/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/skorupi/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/skorupi/back.png (100%) rename graphics/pokemon/{kricketune => gen_4/skorupi}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/skorupi/icon.png (100%) rename graphics/pokemon/{ => gen_4}/skorupi/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/skorupi/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/skuntank/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/skuntank/back.png (100%) rename graphics/pokemon/{ => gen_4}/skuntank/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/skuntank/icon.png (100%) rename graphics/pokemon/{ => gen_4}/skuntank/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/skuntank/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/snover/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/snover/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/snover/back.png (100%) rename graphics/pokemon/{ => gen_4}/snover/backf.png (100%) rename graphics/pokemon/{ => gen_4}/snover/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/snover/icon.png (100%) rename graphics/pokemon/{ => gen_4}/snover/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/snover/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/spiritomb/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/spiritomb/back.png (100%) rename graphics/pokemon/{landorus => gen_4/spiritomb}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/spiritomb/icon.png (100%) rename graphics/pokemon/{ => gen_4}/spiritomb/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/spiritomb/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/staraptor/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/staraptor/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/staraptor/back.png (100%) rename graphics/pokemon/{ => gen_4}/staraptor/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/staraptor/icon.png (100%) rename graphics/pokemon/{ => gen_4}/staraptor/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/staraptor/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/staravia/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/staravia/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/staravia/back.png (100%) rename graphics/pokemon/{ => gen_4}/staravia/backf.png (100%) rename graphics/pokemon/{ => gen_4}/staravia/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/staravia/icon.png (100%) rename graphics/pokemon/{ => gen_4}/staravia/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/staravia/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/starly/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/starly/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/starly/back.png (100%) rename graphics/pokemon/{ => gen_4}/starly/backf.png (100%) rename graphics/pokemon/{ => gen_4}/starly/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/starly/icon.png (100%) rename graphics/pokemon/{ => gen_4}/starly/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/starly/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/stunky/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/stunky/back.png (100%) rename graphics/pokemon/{ => gen_4}/stunky/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/stunky/icon.png (100%) rename graphics/pokemon/{ => gen_4}/stunky/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/stunky/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/tangrowth/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/tangrowth/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/tangrowth/back.png (100%) rename graphics/pokemon/{ => gen_4}/tangrowth/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/tangrowth/icon.png (100%) rename graphics/pokemon/{ => gen_4}/tangrowth/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/tangrowth/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/togekiss/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/togekiss/back.png (100%) rename graphics/pokemon/{ => gen_4}/togekiss/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/togekiss/icon.png (100%) rename graphics/pokemon/{ => gen_4}/togekiss/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/togekiss/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/torterra/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/torterra/back.png (100%) rename graphics/pokemon/{ => gen_4}/torterra/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/torterra/icon.png (100%) rename graphics/pokemon/{ => gen_4}/torterra/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/torterra/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/toxicroak/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/toxicroak/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/toxicroak/back.png (100%) rename graphics/pokemon/{ => gen_4}/toxicroak/backf.png (100%) rename graphics/pokemon/{ => gen_4}/toxicroak/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/toxicroak/icon.png (100%) rename graphics/pokemon/{ => gen_4}/toxicroak/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/toxicroak/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/turtwig/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/turtwig/back.png (100%) rename graphics/pokemon/{ => gen_4}/turtwig/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/turtwig/icon.png (100%) rename graphics/pokemon/{ => gen_4}/turtwig/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/turtwig/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/uxie/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/uxie/back.png (100%) rename graphics/pokemon/{ => gen_4}/uxie/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/uxie/icon.png (100%) rename graphics/pokemon/{ => gen_4}/uxie/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/uxie/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/vespiquen/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/vespiquen/back.png (100%) rename graphics/pokemon/{lanturn => gen_4/vespiquen}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/vespiquen/icon.png (100%) rename graphics/pokemon/{ => gen_4}/vespiquen/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/vespiquen/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/weavile/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/weavile/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_4}/weavile/back.png (100%) rename graphics/pokemon/{ => gen_4}/weavile/backf.png (100%) rename graphics/pokemon/{ => gen_4}/weavile/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/weavile/icon.png (100%) rename graphics/pokemon/{ => gen_4}/weavile/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/weavile/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/wormadam/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/wormadam/back.png (100%) rename graphics/pokemon/{ => gen_4}/wormadam/icon.png (100%) rename graphics/pokemon/{ => gen_4}/wormadam/normal.pal (100%) rename graphics/pokemon/{lapras => gen_4/wormadam/plant}/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/wormadam/sandy_cloak/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/wormadam/sandy_cloak/back.png (100%) rename graphics/pokemon/{ => gen_4}/wormadam/sandy_cloak/icon.png (100%) rename graphics/pokemon/{ => gen_4}/wormadam/sandy_cloak/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/wormadam/sandy_cloak/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/wormadam/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/wormadam/trash_cloak/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/wormadam/trash_cloak/back.png (100%) rename graphics/pokemon/{ => gen_4}/wormadam/trash_cloak/icon.png (100%) rename graphics/pokemon/{ => gen_4}/wormadam/trash_cloak/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/wormadam/trash_cloak/shiny.pal (100%) rename graphics/pokemon/{ => gen_4}/yanmega/anim_front.png (100%) rename graphics/pokemon/{ => gen_4}/yanmega/back.png (100%) rename graphics/pokemon/{ => gen_4}/yanmega/footprint.png (100%) rename graphics/pokemon/{ => gen_4}/yanmega/icon.png (100%) rename graphics/pokemon/{ => gen_4}/yanmega/normal.pal (100%) rename graphics/pokemon/{ => gen_4}/yanmega/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/accelgor/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/accelgor/back.png (100%) rename graphics/pokemon/{litwick => gen_5/accelgor}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/accelgor/icon.png (100%) rename graphics/pokemon/{ => gen_5}/accelgor/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/accelgor/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/alomomola/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/alomomola/back.png (100%) rename graphics/pokemon/{lumineon => gen_5/alomomola}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/alomomola/icon.png (100%) rename graphics/pokemon/{ => gen_5}/alomomola/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/alomomola/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/amoonguss/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/amoonguss/back.png (100%) rename graphics/pokemon/{lunala => gen_5/amoonguss}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/amoonguss/icon.png (100%) rename graphics/pokemon/{ => gen_5}/amoonguss/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/amoonguss/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/archen/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/archen/back.png (100%) rename graphics/pokemon/{ => gen_5}/archen/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/archen/icon.png (100%) rename graphics/pokemon/{ => gen_5}/archen/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/archen/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/archeops/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/archeops/back.png (100%) rename graphics/pokemon/{ => gen_5}/archeops/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/archeops/icon.png (100%) rename graphics/pokemon/{ => gen_5}/archeops/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/archeops/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/audino/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/audino/back.png (100%) rename graphics/pokemon/{ => gen_5}/audino/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/audino/icon.png (100%) rename graphics/pokemon/{ => gen_5}/audino/mega/back.png (100%) rename graphics/pokemon/{ => gen_5}/audino/mega/front.png (100%) rename graphics/pokemon/{ => gen_5}/audino/mega/icon.png (100%) rename graphics/pokemon/{ => gen_5}/audino/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/audino/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/audino/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/audino/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/axew/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/axew/back.png (100%) rename graphics/pokemon/{ => gen_5}/axew/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/axew/icon.png (100%) rename graphics/pokemon/{ => gen_5}/axew/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/axew/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/basculin/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/basculin/back.png (100%) rename graphics/pokemon/{ => gen_5}/basculin/blue_striped/back.png (100%) rename graphics/pokemon/{ => gen_5}/basculin/blue_striped/front.png (100%) rename graphics/pokemon/{ => gen_5}/basculin/blue_striped/icon.png (100%) rename graphics/pokemon/{ => gen_5}/basculin/blue_striped/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/basculin/blue_striped/shiny.pal (100%) rename graphics/pokemon/{lunatone => gen_5/basculin}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/basculin/icon.png (100%) rename graphics/pokemon/{ => gen_5}/basculin/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/basculin/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/basculin/white_striped/back.png (100%) rename graphics/pokemon/{ => gen_5}/basculin/white_striped/front.png (100%) rename graphics/pokemon/{ => gen_5}/basculin/white_striped/icon.png (100%) rename graphics/pokemon/{ => gen_5}/basculin/white_striped/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/basculin/white_striped/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/beartic/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/beartic/back.png (100%) rename graphics/pokemon/{ => gen_5}/beartic/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/beartic/icon.png (100%) rename graphics/pokemon/{ => gen_5}/beartic/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/beartic/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/beheeyem/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/beheeyem/back.png (100%) rename graphics/pokemon/{ => gen_5}/beheeyem/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/beheeyem/icon.png (100%) rename graphics/pokemon/{ => gen_5}/beheeyem/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/beheeyem/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/bisharp/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/bisharp/back.png (100%) rename graphics/pokemon/{ => gen_5}/bisharp/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/bisharp/icon.png (100%) rename graphics/pokemon/{ => gen_5}/bisharp/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/bisharp/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/blitzle/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/blitzle/back.png (100%) rename graphics/pokemon/{ => gen_5}/blitzle/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/blitzle/icon.png (100%) rename graphics/pokemon/{ => gen_5}/blitzle/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/blitzle/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/boldore/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/boldore/back.png (100%) rename graphics/pokemon/{ => gen_5}/boldore/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/boldore/icon.png (100%) rename graphics/pokemon/{ => gen_5}/boldore/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/boldore/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/bouffalant/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/bouffalant/back.png (100%) rename graphics/pokemon/{ => gen_5}/bouffalant/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/bouffalant/icon.png (100%) rename graphics/pokemon/{ => gen_5}/bouffalant/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/bouffalant/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/braviary/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/braviary/back.png (100%) rename graphics/pokemon/{ => gen_5}/braviary/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/braviary/hisuian/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_5}/braviary/hisuian/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_5}/braviary/hisuian/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_5}/braviary/hisuian/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_5}/braviary/hisuian/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_5}/braviary/icon.png (100%) rename graphics/pokemon/{ => gen_5}/braviary/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/braviary/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/carracosta/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/carracosta/back.png (100%) rename graphics/pokemon/{ => gen_5}/carracosta/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/carracosta/icon.png (100%) rename graphics/pokemon/{ => gen_5}/carracosta/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/carracosta/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/chandelure/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/chandelure/back.png (100%) rename graphics/pokemon/{luvdisc => gen_5/chandelure}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/chandelure/icon.png (100%) rename graphics/pokemon/{ => gen_5}/chandelure/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/chandelure/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/cinccino/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/cinccino/back.png (100%) rename graphics/pokemon/{ => gen_5}/cinccino/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/cinccino/icon.png (100%) rename graphics/pokemon/{ => gen_5}/cinccino/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/cinccino/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/cobalion/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/cobalion/back.png (100%) rename graphics/pokemon/{ => gen_5}/cobalion/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/cobalion/icon.png (100%) rename graphics/pokemon/{ => gen_5}/cobalion/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/cobalion/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/cofagrigus/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/cofagrigus/back.png (100%) rename graphics/pokemon/{magcargo => gen_5/cofagrigus}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/cofagrigus/icon.png (100%) rename graphics/pokemon/{ => gen_5}/cofagrigus/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/cofagrigus/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/conkeldurr/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/conkeldurr/back.png (100%) rename graphics/pokemon/{ => gen_5}/conkeldurr/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/conkeldurr/icon.png (100%) rename graphics/pokemon/{ => gen_5}/conkeldurr/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/conkeldurr/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/cottonee/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/cottonee/back.png (100%) rename graphics/pokemon/{magikarp => gen_5/cottonee}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/cottonee/icon.png (100%) rename graphics/pokemon/{ => gen_5}/cottonee/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/cottonee/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/crustle/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/crustle/back.png (100%) rename graphics/pokemon/{cherubi => gen_5/crustle}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/crustle/icon.png (100%) rename graphics/pokemon/{ => gen_5}/crustle/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/crustle/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/cryogonal/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/cryogonal/back.png (100%) rename graphics/pokemon/{magnezone => gen_5/cryogonal}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/cryogonal/icon.png (100%) rename graphics/pokemon/{ => gen_5}/cryogonal/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/cryogonal/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/cubchoo/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/cubchoo/back.png (100%) rename graphics/pokemon/{ => gen_5}/cubchoo/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/cubchoo/icon.png (100%) rename graphics/pokemon/{ => gen_5}/cubchoo/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/cubchoo/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/back.png (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/galarian/back.png (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/galarian/front.png (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/icon.png (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/zen_mode/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/zen_mode/back.png (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/zen_mode/galarian/back.png (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/zen_mode/galarian/front.png (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/zen_mode/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/zen_mode/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/zen_mode/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/zen_mode/icon.png (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/zen_mode/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/darmanitan/zen_mode/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/darumaka/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/darumaka/back.png (100%) rename graphics/pokemon/{ => gen_5}/darumaka/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/darumaka/galarian/back.png (100%) rename graphics/pokemon/{ => gen_5}/darumaka/galarian/front.png (100%) rename graphics/pokemon/{ => gen_5}/darumaka/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_5}/darumaka/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/darumaka/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/darumaka/icon.png (100%) rename graphics/pokemon/{ => gen_5}/darumaka/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/darumaka/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/deerling/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/deerling/autumn/icon.png (100%) rename graphics/pokemon/{ => gen_5}/deerling/autumn/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/deerling/autumn/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/deerling/back.png (100%) rename graphics/pokemon/{ => gen_5}/deerling/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/deerling/icon.png (100%) rename graphics/pokemon/{ => gen_5}/deerling/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/deerling/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/deerling/summer/icon.png (100%) rename graphics/pokemon/{ => gen_5}/deerling/summer/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/deerling/summer/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/deerling/winter/icon.png (100%) rename graphics/pokemon/{ => gen_5}/deerling/winter/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/deerling/winter/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/deino/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/deino/back.png (100%) rename graphics/pokemon/{ => gen_5}/deino/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/deino/icon.png (100%) rename graphics/pokemon/{ => gen_5}/deino/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/deino/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/dewott/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/dewott/back.png (100%) rename graphics/pokemon/{ => gen_5}/dewott/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/dewott/icon.png (100%) rename graphics/pokemon/{ => gen_5}/dewott/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/dewott/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/drilbur/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/drilbur/back.png (100%) rename graphics/pokemon/{ => gen_5}/drilbur/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/drilbur/icon.png (100%) rename graphics/pokemon/{ => gen_5}/drilbur/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/drilbur/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/druddigon/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/druddigon/back.png (100%) rename graphics/pokemon/{ => gen_5}/druddigon/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/druddigon/icon.png (100%) rename graphics/pokemon/{ => gen_5}/druddigon/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/druddigon/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/ducklett/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/ducklett/back.png (100%) rename graphics/pokemon/{ => gen_5}/ducklett/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/ducklett/icon.png (100%) rename graphics/pokemon/{ => gen_5}/ducklett/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/ducklett/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/duosion/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/duosion/back.png (100%) rename graphics/pokemon/{manaphy => gen_5/duosion}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/duosion/icon.png (100%) rename graphics/pokemon/{ => gen_5}/duosion/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/duosion/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/durant/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/durant/back.png (100%) rename graphics/pokemon/{leavanny => gen_5/durant}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/durant/icon.png (100%) rename graphics/pokemon/{ => gen_5}/durant/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/durant/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/dwebble/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/dwebble/back.png (100%) rename graphics/pokemon/{meowstic => gen_5/dwebble}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/dwebble/icon.png (100%) rename graphics/pokemon/{ => gen_5}/dwebble/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/dwebble/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/eelektrik/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/eelektrik/back.png (100%) rename graphics/pokemon/{mantine => gen_5/eelektrik}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/eelektrik/icon.png (100%) rename graphics/pokemon/{ => gen_5}/eelektrik/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/eelektrik/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/eelektross/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/eelektross/back.png (100%) rename graphics/pokemon/{mantyke => gen_5/eelektross}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/eelektross/icon.png (100%) rename graphics/pokemon/{ => gen_5}/eelektross/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/eelektross/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/elgyem/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/elgyem/back.png (100%) rename graphics/pokemon/{bunnelby => gen_5/elgyem}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/elgyem/icon.png (100%) rename graphics/pokemon/{ => gen_5}/elgyem/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/elgyem/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/emboar/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/emboar/back.png (100%) rename graphics/pokemon/{ => gen_5}/emboar/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/emboar/icon.png (100%) rename graphics/pokemon/{ => gen_5}/emboar/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/emboar/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/emolga/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/emolga/back.png (100%) rename graphics/pokemon/{ => gen_5}/emolga/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/emolga/icon.png (100%) rename graphics/pokemon/{ => gen_5}/emolga/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/emolga/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/escavalier/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/escavalier/back.png (100%) rename graphics/pokemon/{mareanie => gen_5/escavalier}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/escavalier/icon.png (100%) rename graphics/pokemon/{ => gen_5}/escavalier/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/escavalier/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/excadrill/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/excadrill/back.png (100%) rename graphics/pokemon/{ => gen_5}/excadrill/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/excadrill/icon.png (100%) rename graphics/pokemon/{ => gen_5}/excadrill/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/excadrill/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/ferroseed/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/ferroseed/back.png (100%) rename graphics/pokemon/{masquerain => gen_5/ferroseed}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/ferroseed/icon.png (100%) rename graphics/pokemon/{ => gen_5}/ferroseed/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/ferroseed/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/ferrothorn/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/ferrothorn/back.png (100%) rename graphics/pokemon/{ => gen_5}/ferrothorn/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/ferrothorn/icon.png (100%) rename graphics/pokemon/{ => gen_5}/ferrothorn/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/ferrothorn/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/foongus/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/foongus/back.png (100%) rename graphics/pokemon/{meltan => gen_5/foongus}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/foongus/icon.png (100%) rename graphics/pokemon/{ => gen_5}/foongus/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/foongus/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/fraxure/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/fraxure/back.png (100%) rename graphics/pokemon/{ => gen_5}/fraxure/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/fraxure/icon.png (100%) rename graphics/pokemon/{ => gen_5}/fraxure/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/fraxure/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/frillish/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/frillish/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_5}/frillish/back.png (100%) rename graphics/pokemon/{ => gen_5}/frillish/backf.png (100%) rename graphics/pokemon/{metapod => gen_5/frillish}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/frillish/frontf.png (100%) rename graphics/pokemon/{ => gen_5}/frillish/icon.png (100%) rename graphics/pokemon/{ => gen_5}/frillish/iconf.png (100%) rename graphics/pokemon/{ => gen_5}/frillish/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/frillish/normalf.pal (100%) rename graphics/pokemon/{ => gen_5}/frillish/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/frillish/shinyf.pal (100%) rename graphics/pokemon/{ => gen_5}/galvantula/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/galvantula/back.png (100%) rename graphics/pokemon/{ => gen_5}/galvantula/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/galvantula/icon.png (100%) rename graphics/pokemon/{ => gen_5}/galvantula/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/galvantula/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/garbodor/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/garbodor/back.png (100%) rename graphics/pokemon/{ => gen_5}/garbodor/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/garbodor/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_5}/garbodor/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_5}/garbodor/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_5}/garbodor/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/garbodor/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/garbodor/icon.png (100%) rename graphics/pokemon/{ => gen_5}/garbodor/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/garbodor/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/genesect/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/genesect/back.png (100%) rename graphics/pokemon/{ => gen_5}/genesect/burn_drive/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/genesect/burn_drive/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/genesect/chill_drive/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/genesect/chill_drive/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/genesect/douse_drive/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/genesect/douse_drive/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/genesect/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/genesect/icon.png (100%) rename graphics/pokemon/{ => gen_5}/genesect/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/genesect/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/genesect/shock_drive/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/genesect/shock_drive/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/gigalith/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/gigalith/back.png (100%) rename graphics/pokemon/{ => gen_5}/gigalith/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/gigalith/icon.png (100%) rename graphics/pokemon/{ => gen_5}/gigalith/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/gigalith/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/golett/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/golett/back.png (100%) rename graphics/pokemon/{ => gen_5}/golett/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/golett/icon.png (100%) rename graphics/pokemon/{ => gen_5}/golett/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/golett/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/golurk/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/golurk/back.png (100%) rename graphics/pokemon/{ => gen_5}/golurk/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/golurk/icon.png (100%) rename graphics/pokemon/{ => gen_5}/golurk/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/golurk/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/gothita/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/gothita/back.png (100%) rename graphics/pokemon/{crabrawler => gen_5/gothita}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/gothita/icon.png (100%) rename graphics/pokemon/{ => gen_5}/gothita/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/gothita/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/gothitelle/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/gothitelle/back.png (100%) rename graphics/pokemon/{ => gen_5}/gothitelle/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/gothitelle/icon.png (100%) rename graphics/pokemon/{ => gen_5}/gothitelle/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/gothitelle/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/gothorita/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/gothorita/back.png (100%) rename graphics/pokemon/{ => gen_5}/gothorita/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/gothorita/icon.png (100%) rename graphics/pokemon/{ => gen_5}/gothorita/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/gothorita/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/gurdurr/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/gurdurr/back.png (100%) rename graphics/pokemon/{ => gen_5}/gurdurr/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/gurdurr/icon.png (100%) rename graphics/pokemon/{ => gen_5}/gurdurr/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/gurdurr/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/haxorus/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/haxorus/back.png (100%) rename graphics/pokemon/{ => gen_5}/haxorus/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/haxorus/icon.png (100%) rename graphics/pokemon/{ => gen_5}/haxorus/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/haxorus/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/heatmor/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/heatmor/back.png (100%) rename graphics/pokemon/{ => gen_5}/heatmor/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/heatmor/icon.png (100%) rename graphics/pokemon/{ => gen_5}/heatmor/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/heatmor/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/herdier/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/herdier/back.png (100%) rename graphics/pokemon/{elgyem => gen_5/herdier}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/herdier/icon.png (100%) rename graphics/pokemon/{ => gen_5}/herdier/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/herdier/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/hydreigon/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/hydreigon/back.png (100%) rename graphics/pokemon/{milcery => gen_5/hydreigon}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/hydreigon/icon.png (100%) rename graphics/pokemon/{ => gen_5}/hydreigon/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/hydreigon/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/jellicent/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/jellicent/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_5}/jellicent/back.png (100%) rename graphics/pokemon/{ => gen_5}/jellicent/backf.png (100%) rename graphics/pokemon/{milotic => gen_5/jellicent}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/jellicent/frontf.png (100%) rename graphics/pokemon/{ => gen_5}/jellicent/icon.png (100%) rename graphics/pokemon/{ => gen_5}/jellicent/iconf.png (100%) rename graphics/pokemon/{ => gen_5}/jellicent/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/jellicent/normalf.pal (100%) rename graphics/pokemon/{ => gen_5}/jellicent/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/jellicent/shinyf.pal (100%) rename graphics/pokemon/{ => gen_5}/joltik/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/joltik/back.png (100%) rename graphics/pokemon/{crustle => gen_5/joltik}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/joltik/icon.png (100%) rename graphics/pokemon/{ => gen_5}/joltik/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/joltik/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/karrablast/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/karrablast/back.png (100%) rename graphics/pokemon/{roserade => gen_5/karrablast}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/karrablast/icon.png (100%) rename graphics/pokemon/{ => gen_5}/karrablast/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/karrablast/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/keldeo/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/keldeo/back.png (100%) rename graphics/pokemon/{ => gen_5}/keldeo/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/keldeo/icon.png (100%) rename graphics/pokemon/{ => gen_5}/keldeo/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/keldeo/resolute/back.png (100%) rename graphics/pokemon/{ => gen_5}/keldeo/resolute/front.png (100%) rename graphics/pokemon/{ => gen_5}/keldeo/resolute/icon.png (100%) rename graphics/pokemon/{ => gen_5}/keldeo/resolute/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/keldeo/resolute/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/keldeo/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/klang/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/klang/back.png (100%) rename graphics/pokemon/{mimikyu => gen_5/klang}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/klang/icon.png (100%) rename graphics/pokemon/{ => gen_5}/klang/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/klang/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/klink/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/klink/back.png (100%) rename graphics/pokemon/{minior => gen_5/klink}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/klink/icon.png (100%) rename graphics/pokemon/{ => gen_5}/klink/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/klink/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/klinklang/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/klinklang/back.png (100%) rename graphics/pokemon/{misdreavus => gen_5/klinklang}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/klinklang/icon.png (100%) rename graphics/pokemon/{ => gen_5}/klinklang/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/klinklang/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/krokorok/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/krokorok/back.png (100%) rename graphics/pokemon/{ => gen_5}/krokorok/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/krokorok/icon.png (100%) rename graphics/pokemon/{ => gen_5}/krokorok/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/krokorok/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/krookodile/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/krookodile/back.png (100%) rename graphics/pokemon/{ => gen_5}/krookodile/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/krookodile/icon.png (100%) rename graphics/pokemon/{ => gen_5}/krookodile/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/krookodile/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/kyurem/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/kyurem/back.png (100%) rename graphics/pokemon/{ => gen_5}/kyurem/black/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/kyurem/black/back.png (100%) rename graphics/pokemon/{ => gen_5}/kyurem/black/icon.png (100%) rename graphics/pokemon/{ => gen_5}/kyurem/black/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/kyurem/black/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/kyurem/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/kyurem/icon.png (100%) rename graphics/pokemon/{ => gen_5}/kyurem/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/kyurem/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/kyurem/white/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/kyurem/white/back.png (100%) rename graphics/pokemon/{ => gen_5}/kyurem/white/icon.png (100%) rename graphics/pokemon/{ => gen_5}/kyurem/white/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/kyurem/white/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/lampent/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/lampent/back.png (100%) rename graphics/pokemon/{mismagius => gen_5/lampent}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/lampent/icon.png (100%) rename graphics/pokemon/{ => gen_5}/lampent/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/lampent/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/landorus/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/landorus/back.png (100%) rename graphics/pokemon/{muk => gen_5/landorus}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/landorus/icon.png (100%) rename graphics/pokemon/{ => gen_5}/landorus/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/landorus/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/landorus/therian/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/landorus/therian/back.png (100%) rename graphics/pokemon/{ => gen_5}/landorus/therian/icon.png (100%) rename graphics/pokemon/{ => gen_5}/landorus/therian/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/landorus/therian/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/larvesta/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/larvesta/back.png (100%) rename graphics/pokemon/{cutiefly => gen_5/larvesta}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/larvesta/icon.png (100%) rename graphics/pokemon/{ => gen_5}/larvesta/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/larvesta/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/leavanny/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/leavanny/back.png (100%) rename graphics/pokemon/{mothim => gen_5/leavanny}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/leavanny/icon.png (100%) rename graphics/pokemon/{ => gen_5}/leavanny/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/leavanny/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/liepard/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/liepard/back.png (100%) rename graphics/pokemon/{ => gen_5}/liepard/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/liepard/icon.png (100%) rename graphics/pokemon/{ => gen_5}/liepard/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/liepard/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/lilligant/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/lilligant/back.png (100%) rename graphics/pokemon/{ => gen_5}/lilligant/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/lilligant/hisuian/back.png (100%) rename graphics/pokemon/{ => gen_5}/lilligant/hisuian/front.png (100%) rename graphics/pokemon/{ => gen_5}/lilligant/hisuian/icon.png (100%) rename graphics/pokemon/{ => gen_5}/lilligant/hisuian/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/lilligant/hisuian/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/lilligant/icon.png (100%) rename graphics/pokemon/{ => gen_5}/lilligant/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/lilligant/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/lillipup/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/lillipup/back.png (100%) rename graphics/pokemon/{ => gen_5}/lillipup/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/lillipup/icon.png (100%) rename graphics/pokemon/{ => gen_5}/lillipup/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/lillipup/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/litwick/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/litwick/back.png (100%) rename graphics/pokemon/{naganadel => gen_5/litwick}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/litwick/icon.png (100%) rename graphics/pokemon/{ => gen_5}/litwick/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/litwick/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/mandibuzz/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/mandibuzz/back.png (100%) rename graphics/pokemon/{ => gen_5}/mandibuzz/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/mandibuzz/icon.png (100%) rename graphics/pokemon/{ => gen_5}/mandibuzz/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/mandibuzz/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/maractus/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/maractus/back.png (100%) rename graphics/pokemon/{ => gen_5}/maractus/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/maractus/icon.png (100%) rename graphics/pokemon/{ => gen_5}/maractus/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/maractus/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/meloetta/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/meloetta/back.png (100%) rename graphics/pokemon/{darkrai => gen_5/meloetta}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/meloetta/icon.png (100%) rename graphics/pokemon/{ => gen_5}/meloetta/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/meloetta/pirouette/back.png (100%) rename graphics/pokemon/{ => gen_5}/meloetta/pirouette/front.png (100%) rename graphics/pokemon/{ => gen_5}/meloetta/pirouette/icon.png (100%) rename graphics/pokemon/{ => gen_5}/meloetta/pirouette/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/meloetta/pirouette/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/meloetta/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/mienfoo/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/mienfoo/back.png (100%) rename graphics/pokemon/{ => gen_5}/mienfoo/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/mienfoo/icon.png (100%) rename graphics/pokemon/{ => gen_5}/mienfoo/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/mienfoo/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/mienshao/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/mienshao/back.png (100%) rename graphics/pokemon/{ => gen_5}/mienshao/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/mienshao/icon.png (100%) rename graphics/pokemon/{ => gen_5}/mienshao/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/mienshao/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/minccino/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/minccino/back.png (100%) rename graphics/pokemon/{ => gen_5}/minccino/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/minccino/icon.png (100%) rename graphics/pokemon/{ => gen_5}/minccino/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/minccino/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/munna/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/munna/back.png (100%) rename graphics/pokemon/{dewpider => gen_5/munna}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/munna/icon.png (100%) rename graphics/pokemon/{ => gen_5}/munna/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/munna/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/musharna/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/musharna/back.png (100%) rename graphics/pokemon/{drakloak => gen_5/musharna}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/musharna/icon.png (100%) rename graphics/pokemon/{ => gen_5}/musharna/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/musharna/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/oshawott/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/oshawott/back.png (100%) rename graphics/pokemon/{ => gen_5}/oshawott/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/oshawott/icon.png (100%) rename graphics/pokemon/{ => gen_5}/oshawott/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/oshawott/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/palpitoad/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/palpitoad/back.png (100%) rename graphics/pokemon/{ => gen_5}/palpitoad/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/palpitoad/icon.png (100%) rename graphics/pokemon/{ => gen_5}/palpitoad/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/palpitoad/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/panpour/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/panpour/back.png (100%) rename graphics/pokemon/{ => gen_5}/panpour/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/panpour/icon.png (100%) rename graphics/pokemon/{ => gen_5}/panpour/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/panpour/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/pansage/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/pansage/back.png (100%) rename graphics/pokemon/{ => gen_5}/pansage/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/pansage/icon.png (100%) rename graphics/pokemon/{ => gen_5}/pansage/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/pansage/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/pansear/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/pansear/back.png (100%) rename graphics/pokemon/{ => gen_5}/pansear/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/pansear/icon.png (100%) rename graphics/pokemon/{ => gen_5}/pansear/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/pansear/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/patrat/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/patrat/back.png (100%) rename graphics/pokemon/{ => gen_5}/patrat/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/patrat/icon.png (100%) rename graphics/pokemon/{ => gen_5}/patrat/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/patrat/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/pawniard/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/pawniard/back.png (100%) rename graphics/pokemon/{ => gen_5}/pawniard/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/pawniard/icon.png (100%) rename graphics/pokemon/{ => gen_5}/pawniard/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/pawniard/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/petilil/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/petilil/back.png (100%) rename graphics/pokemon/{necrozma => gen_5/petilil}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/petilil/icon.png (100%) rename graphics/pokemon/{ => gen_5}/petilil/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/petilil/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/pidove/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/pidove/back.png (100%) rename graphics/pokemon/{ => gen_5}/pidove/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/pidove/icon.png (100%) rename graphics/pokemon/{ => gen_5}/pidove/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/pidove/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/pignite/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/pignite/back.png (100%) rename graphics/pokemon/{ => gen_5}/pignite/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/pignite/icon.png (100%) rename graphics/pokemon/{ => gen_5}/pignite/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/pignite/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/purrloin/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/purrloin/back.png (100%) rename graphics/pokemon/{ => gen_5}/purrloin/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/purrloin/icon.png (100%) rename graphics/pokemon/{ => gen_5}/purrloin/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/purrloin/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/reshiram/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/reshiram/back.png (100%) rename graphics/pokemon/{ => gen_5}/reshiram/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/reshiram/icon.png (100%) rename graphics/pokemon/{ => gen_5}/reshiram/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/reshiram/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/reuniclus/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/reuniclus/back.png (100%) rename graphics/pokemon/{nihilego => gen_5/reuniclus}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/reuniclus/icon.png (100%) rename graphics/pokemon/{ => gen_5}/reuniclus/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/reuniclus/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/roggenrola/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/roggenrola/back.png (100%) rename graphics/pokemon/{ => gen_5}/roggenrola/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/roggenrola/icon.png (100%) rename graphics/pokemon/{ => gen_5}/roggenrola/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/roggenrola/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/rufflet/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/rufflet/back.png (100%) rename graphics/pokemon/{ => gen_5}/rufflet/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/rufflet/icon.png (100%) rename graphics/pokemon/{ => gen_5}/rufflet/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/rufflet/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/samurott/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/samurott/back.png (100%) rename graphics/pokemon/{ => gen_5}/samurott/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/samurott/hisuian/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_5}/samurott/hisuian/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_5}/samurott/hisuian/icon.png (100%) rename graphics/pokemon/{ => gen_5}/samurott/hisuian/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_5}/samurott/hisuian/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_5}/samurott/icon.png (100%) rename graphics/pokemon/{ => gen_5}/samurott/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/samurott/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/sandile/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/sandile/back.png (100%) rename graphics/pokemon/{ => gen_5}/sandile/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/sandile/icon.png (100%) rename graphics/pokemon/{ => gen_5}/sandile/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/sandile/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/sawk/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/sawk/back.png (100%) rename graphics/pokemon/{ => gen_5}/sawk/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/sawk/icon.png (100%) rename graphics/pokemon/{ => gen_5}/sawk/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/sawk/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/autumn/back.png (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/autumn/front.png (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/autumn/icon.png (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/autumn/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/autumn/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/back.png (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/icon.png (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/summer/back.png (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/summer/front.png (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/summer/icon.png (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/summer/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/summer/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/winter/back.png (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/winter/front.png (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/winter/icon.png (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/winter/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/sawsbuck/winter/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/scolipede/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/scolipede/back.png (100%) rename graphics/pokemon/{ => gen_5}/scolipede/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/scolipede/icon.png (100%) rename graphics/pokemon/{ => gen_5}/scolipede/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/scolipede/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/scrafty/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/scrafty/back.png (100%) rename graphics/pokemon/{ => gen_5}/scrafty/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/scrafty/icon.png (100%) rename graphics/pokemon/{ => gen_5}/scrafty/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/scrafty/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/scraggy/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/scraggy/back.png (100%) rename graphics/pokemon/{herdier => gen_5/scraggy}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/scraggy/icon.png (100%) rename graphics/pokemon/{ => gen_5}/scraggy/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/scraggy/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/seismitoad/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/seismitoad/back.png (100%) rename graphics/pokemon/{ => gen_5}/seismitoad/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/seismitoad/icon.png (100%) rename graphics/pokemon/{ => gen_5}/seismitoad/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/seismitoad/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/serperior/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/serperior/back.png (100%) rename graphics/pokemon/{onix => gen_5/serperior}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/serperior/icon.png (100%) rename graphics/pokemon/{ => gen_5}/serperior/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/serperior/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/servine/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/servine/back.png (100%) rename graphics/pokemon/{ => gen_5}/servine/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/servine/icon.png (100%) rename graphics/pokemon/{ => gen_5}/servine/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/servine/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/sewaddle/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/sewaddle/back.png (100%) rename graphics/pokemon/{fennekin => gen_5/sewaddle}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/sewaddle/icon.png (100%) rename graphics/pokemon/{ => gen_5}/sewaddle/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/sewaddle/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/shelmet/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/shelmet/back.png (100%) rename graphics/pokemon/{fomantis => gen_5/shelmet}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/shelmet/icon.png (100%) rename graphics/pokemon/{ => gen_5}/shelmet/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/shelmet/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/sigilyph/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/sigilyph/back.png (100%) rename graphics/pokemon/{palossand => gen_5/sigilyph}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/sigilyph/icon.png (100%) rename graphics/pokemon/{ => gen_5}/sigilyph/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/sigilyph/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/simipour/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/simipour/back.png (100%) rename graphics/pokemon/{ => gen_5}/simipour/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/simipour/icon.png (100%) rename graphics/pokemon/{ => gen_5}/simipour/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/simipour/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/simisage/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/simisage/back.png (100%) rename graphics/pokemon/{ => gen_5}/simisage/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/simisage/icon.png (100%) rename graphics/pokemon/{ => gen_5}/simisage/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/simisage/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/simisear/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/simisear/back.png (100%) rename graphics/pokemon/{ => gen_5}/simisear/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/simisear/icon.png (100%) rename graphics/pokemon/{ => gen_5}/simisear/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/simisear/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/snivy/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/snivy/back.png (100%) rename graphics/pokemon/{ => gen_5}/snivy/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/snivy/icon.png (100%) rename graphics/pokemon/{ => gen_5}/snivy/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/snivy/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/solosis/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/solosis/back.png (100%) rename graphics/pokemon/{petilil => gen_5/solosis}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/solosis/icon.png (100%) rename graphics/pokemon/{ => gen_5}/solosis/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/solosis/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/stoutland/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/stoutland/back.png (100%) rename graphics/pokemon/{ => gen_5}/stoutland/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/stoutland/icon.png (100%) rename graphics/pokemon/{ => gen_5}/stoutland/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/stoutland/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/stunfisk/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/stunfisk/back.png (100%) rename graphics/pokemon/{phantump => gen_5/stunfisk}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/stunfisk/galarian/back.png (100%) rename graphics/pokemon/{ => gen_5}/stunfisk/galarian/front.png (100%) rename graphics/pokemon/{ => gen_5}/stunfisk/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_5}/stunfisk/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/stunfisk/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/stunfisk/icon.png (100%) rename graphics/pokemon/{ => gen_5}/stunfisk/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/stunfisk/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/swadloon/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/swadloon/back.png (100%) rename graphics/pokemon/{phione => gen_5/swadloon}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/swadloon/icon.png (100%) rename graphics/pokemon/{ => gen_5}/swadloon/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/swadloon/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/swanna/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/swanna/back.png (100%) rename graphics/pokemon/{ => gen_5}/swanna/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/swanna/icon.png (100%) rename graphics/pokemon/{ => gen_5}/swanna/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/swanna/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/swoobat/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/swoobat/back.png (100%) rename graphics/pokemon/{ => gen_5}/swoobat/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/swoobat/icon.png (100%) rename graphics/pokemon/{ => gen_5}/swoobat/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/swoobat/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/tepig/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/tepig/back.png (100%) rename graphics/pokemon/{ => gen_5}/tepig/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/tepig/icon.png (100%) rename graphics/pokemon/{ => gen_5}/tepig/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/tepig/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/terrakion/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/terrakion/back.png (100%) rename graphics/pokemon/{ => gen_5}/terrakion/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/terrakion/icon.png (100%) rename graphics/pokemon/{ => gen_5}/terrakion/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/terrakion/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/throh/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/throh/back.png (100%) rename graphics/pokemon/{ => gen_5}/throh/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/throh/icon.png (100%) rename graphics/pokemon/{ => gen_5}/throh/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/throh/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/thundurus/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/thundurus/back.png (100%) rename graphics/pokemon/{pineco => gen_5/thundurus}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/thundurus/icon.png (100%) rename graphics/pokemon/{ => gen_5}/thundurus/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/thundurus/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/thundurus/therian/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/thundurus/therian/back.png (100%) rename graphics/pokemon/{ => gen_5}/thundurus/therian/icon.png (100%) rename graphics/pokemon/{ => gen_5}/thundurus/therian/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/thundurus/therian/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/timburr/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/timburr/back.png (100%) rename graphics/pokemon/{ => gen_5}/timburr/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/timburr/icon.png (100%) rename graphics/pokemon/{ => gen_5}/timburr/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/timburr/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/tirtouga/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/tirtouga/back.png (100%) rename graphics/pokemon/{popplio => gen_5/tirtouga}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/tirtouga/icon.png (100%) rename graphics/pokemon/{ => gen_5}/tirtouga/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/tirtouga/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/tornadus/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/tornadus/back.png (100%) rename graphics/pokemon/{primarina => gen_5/tornadus}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/tornadus/icon.png (100%) rename graphics/pokemon/{ => gen_5}/tornadus/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/tornadus/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/tornadus/therian/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/tornadus/therian/back.png (100%) rename graphics/pokemon/{ => gen_5}/tornadus/therian/icon.png (100%) rename graphics/pokemon/{ => gen_5}/tornadus/therian/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/tornadus/therian/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/tranquill/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/tranquill/back.png (100%) rename graphics/pokemon/{ => gen_5}/tranquill/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/tranquill/icon.png (100%) rename graphics/pokemon/{ => gen_5}/tranquill/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/tranquill/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/trubbish/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/trubbish/back.png (100%) rename graphics/pokemon/{ => gen_5}/trubbish/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/trubbish/icon.png (100%) rename graphics/pokemon/{ => gen_5}/trubbish/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/trubbish/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/tympole/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/tympole/back.png (100%) rename graphics/pokemon/{pupitar => gen_5/tympole}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/tympole/icon.png (100%) rename graphics/pokemon/{ => gen_5}/tympole/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/tympole/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/tynamo/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/tynamo/back.png (100%) rename graphics/pokemon/{pyukumuku => gen_5/tynamo}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/tynamo/icon.png (100%) rename graphics/pokemon/{ => gen_5}/tynamo/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/tynamo/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/unfezant/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/unfezant/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_5}/unfezant/back.png (100%) rename graphics/pokemon/{ => gen_5}/unfezant/backf.png (100%) rename graphics/pokemon/{ => gen_5}/unfezant/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/unfezant/frontf.png (100%) rename graphics/pokemon/{ => gen_5}/unfezant/icon.png (100%) rename graphics/pokemon/{ => gen_5}/unfezant/iconf.png (100%) rename graphics/pokemon/{ => gen_5}/unfezant/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/unfezant/normalf.pal (100%) rename graphics/pokemon/{ => gen_5}/unfezant/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/unfezant/shinyf.pal (100%) rename graphics/pokemon/{ => gen_5}/vanillish/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/vanillish/back.png (100%) rename graphics/pokemon/{qwilfish => gen_5/vanillish}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/vanillish/icon.png (100%) rename graphics/pokemon/{ => gen_5}/vanillish/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/vanillish/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/vanillite/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/vanillite/back.png (100%) rename graphics/pokemon/{rayquaza => gen_5/vanillite}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/vanillite/icon.png (100%) rename graphics/pokemon/{ => gen_5}/vanillite/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/vanillite/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/vanilluxe/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/vanilluxe/back.png (100%) rename graphics/pokemon/{relicanth => gen_5/vanilluxe}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/vanilluxe/icon.png (100%) rename graphics/pokemon/{ => gen_5}/vanilluxe/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/vanilluxe/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/venipede/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/venipede/back.png (100%) rename graphics/pokemon/{gothita => gen_5/venipede}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/venipede/icon.png (100%) rename graphics/pokemon/{ => gen_5}/venipede/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/venipede/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/victini/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/victini/back.png (100%) rename graphics/pokemon/{ => gen_5}/victini/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/victini/icon.png (100%) rename graphics/pokemon/{ => gen_5}/victini/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/victini/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/virizion/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/virizion/back.png (100%) rename graphics/pokemon/{ => gen_5}/virizion/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/virizion/icon.png (100%) rename graphics/pokemon/{ => gen_5}/virizion/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/virizion/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/volcarona/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/volcarona/back.png (100%) rename graphics/pokemon/{remoraid => gen_5/volcarona}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/volcarona/icon.png (100%) rename graphics/pokemon/{ => gen_5}/volcarona/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/volcarona/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/vullaby/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/vullaby/back.png (100%) rename graphics/pokemon/{ => gen_5}/vullaby/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/vullaby/icon.png (100%) rename graphics/pokemon/{ => gen_5}/vullaby/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/vullaby/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/watchog/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/watchog/back.png (100%) rename graphics/pokemon/{ => gen_5}/watchog/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/watchog/icon.png (100%) rename graphics/pokemon/{ => gen_5}/watchog/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/watchog/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/whimsicott/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/whimsicott/back.png (100%) rename graphics/pokemon/{grubbin => gen_5/whimsicott}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/whimsicott/icon.png (100%) rename graphics/pokemon/{ => gen_5}/whimsicott/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/whimsicott/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/whirlipede/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/whirlipede/back.png (100%) rename graphics/pokemon/{reuniclus => gen_5/whirlipede}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/whirlipede/icon.png (100%) rename graphics/pokemon/{ => gen_5}/whirlipede/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/whirlipede/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/woobat/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/woobat/back.png (100%) rename graphics/pokemon/{rotom/normal => gen_5/woobat}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/woobat/icon.png (100%) rename graphics/pokemon/{ => gen_5}/woobat/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/woobat/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/yamask/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/yamask/back.png (100%) rename graphics/pokemon/{runerigus => gen_5/yamask}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/yamask/galarian/back.png (100%) rename graphics/pokemon/{ => gen_5}/yamask/galarian/front.png (100%) rename graphics/pokemon/{ => gen_5}/yamask/galarian/icon.png (100%) rename graphics/pokemon/{ => gen_5}/yamask/galarian/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/yamask/galarian/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/yamask/icon.png (100%) rename graphics/pokemon/{ => gen_5}/yamask/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/yamask/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/zebstrika/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/zebstrika/back.png (100%) rename graphics/pokemon/{ => gen_5}/zebstrika/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/zebstrika/icon.png (100%) rename graphics/pokemon/{ => gen_5}/zebstrika/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/zebstrika/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/zekrom/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/zekrom/back.png (100%) rename graphics/pokemon/{ => gen_5}/zekrom/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/zekrom/icon.png (100%) rename graphics/pokemon/{ => gen_5}/zekrom/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/zekrom/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/zoroark/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/zoroark/back.png (100%) rename graphics/pokemon/{ => gen_5}/zoroark/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/zoroark/hisuian/back.png (100%) rename graphics/pokemon/{ => gen_5}/zoroark/hisuian/front.png (100%) rename graphics/pokemon/{ => gen_5}/zoroark/hisuian/icon.png (100%) rename graphics/pokemon/{ => gen_5}/zoroark/hisuian/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/zoroark/hisuian/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/zoroark/icon.png (100%) rename graphics/pokemon/{ => gen_5}/zoroark/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/zoroark/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/zorua/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/zorua/back.png (100%) rename graphics/pokemon/{goodra => gen_5/zorua}/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/zorua/hisuian/back.png (100%) rename graphics/pokemon/{ => gen_5}/zorua/hisuian/front.png (100%) rename graphics/pokemon/{ => gen_5}/zorua/hisuian/icon.png (100%) rename graphics/pokemon/{ => gen_5}/zorua/hisuian/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/zorua/hisuian/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/zorua/icon.png (100%) rename graphics/pokemon/{ => gen_5}/zorua/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/zorua/shiny.pal (100%) rename graphics/pokemon/{ => gen_5}/zweilous/anim_front.png (100%) rename graphics/pokemon/{ => gen_5}/zweilous/back.png (100%) rename graphics/pokemon/{ => gen_5}/zweilous/footprint.png (100%) rename graphics/pokemon/{ => gen_5}/zweilous/icon.png (100%) rename graphics/pokemon/{ => gen_5}/zweilous/normal.pal (100%) rename graphics/pokemon/{ => gen_5}/zweilous/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/aegislash/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/aegislash/back.png (100%) rename graphics/pokemon/{ => gen_6}/aegislash/blade/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/aegislash/blade/back.png (100%) rename graphics/pokemon/{ => gen_6}/aegislash/blade/icon.png (100%) rename graphics/pokemon/{ => gen_6}/aegislash/blade/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/aegislash/blade/shiny.pal (100%) rename graphics/pokemon/{sandaconda => gen_6/aegislash}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/aegislash/icon.png (100%) rename graphics/pokemon/{ => gen_6}/aegislash/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/aegislash/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/amaura/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/amaura/back.png (100%) rename graphics/pokemon/{shuckle => gen_6/amaura}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/amaura/icon.png (100%) rename graphics/pokemon/{ => gen_6}/amaura/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/amaura/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/aromatisse/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/aromatisse/back.png (100%) rename graphics/pokemon/{hattrem => gen_6/aromatisse}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/aromatisse/icon.png (100%) rename graphics/pokemon/{ => gen_6}/aromatisse/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/aromatisse/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/aurorus/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/aurorus/back.png (100%) rename graphics/pokemon/{ => gen_6}/aurorus/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/aurorus/icon.png (100%) rename graphics/pokemon/{ => gen_6}/aurorus/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/aurorus/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/avalugg/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/avalugg/back.png (100%) rename graphics/pokemon/{ => gen_6}/avalugg/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/avalugg/hisuian/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_6}/avalugg/hisuian/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_6}/avalugg/hisuian/icon.png (100%) rename graphics/pokemon/{ => gen_6}/avalugg/hisuian/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_6}/avalugg/hisuian/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_6}/avalugg/icon.png (100%) rename graphics/pokemon/{ => gen_6}/avalugg/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/avalugg/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/barbaracle/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/barbaracle/back.png (100%) rename graphics/pokemon/{ => gen_6}/barbaracle/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/barbaracle/icon.png (100%) rename graphics/pokemon/{ => gen_6}/barbaracle/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/barbaracle/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/bergmite/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/bergmite/back.png (100%) rename graphics/pokemon/{pincurchin => gen_6/bergmite}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/bergmite/icon.png (100%) rename graphics/pokemon/{ => gen_6}/bergmite/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/bergmite/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/binacle/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/binacle/back.png (100%) rename graphics/pokemon/{sandygast => gen_6/binacle}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/binacle/icon.png (100%) rename graphics/pokemon/{ => gen_6}/binacle/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/binacle/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/braixen/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/braixen/back.png (100%) rename graphics/pokemon/{ => gen_6}/braixen/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/braixen/icon.png (100%) rename graphics/pokemon/{ => gen_6}/braixen/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/braixen/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/bunnelby/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/bunnelby/back.png (100%) rename graphics/pokemon/{scraggy => gen_6/bunnelby}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/bunnelby/icon.png (100%) rename graphics/pokemon/{ => gen_6}/bunnelby/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/bunnelby/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/carbink/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/carbink/back.png (100%) rename graphics/pokemon/{seadra => gen_6/carbink}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/carbink/icon.png (100%) rename graphics/pokemon/{ => gen_6}/carbink/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/carbink/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/chesnaught/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/chesnaught/back.png (100%) rename graphics/pokemon/{ => gen_6}/chesnaught/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/chesnaught/icon.png (100%) rename graphics/pokemon/{ => gen_6}/chesnaught/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/chesnaught/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/chespin/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/chespin/back.png (100%) rename graphics/pokemon/{ => gen_6}/chespin/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/chespin/icon.png (100%) rename graphics/pokemon/{ => gen_6}/chespin/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/chespin/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/clauncher/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/clauncher/back.png (100%) rename graphics/pokemon/{pumpkaboo => gen_6/clauncher}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/clauncher/icon.png (100%) rename graphics/pokemon/{ => gen_6}/clauncher/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/clauncher/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/clawitzer/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/clawitzer/back.png (100%) rename graphics/pokemon/{seaking => gen_6/clawitzer}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/clawitzer/icon.png (100%) rename graphics/pokemon/{ => gen_6}/clawitzer/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/clawitzer/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/dedenne/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/dedenne/back.png (100%) rename graphics/pokemon/{ => gen_6}/dedenne/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/dedenne/icon.png (100%) rename graphics/pokemon/{ => gen_6}/dedenne/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/dedenne/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/delphox/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/delphox/back.png (100%) rename graphics/pokemon/{ => gen_6}/delphox/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/delphox/icon.png (100%) rename graphics/pokemon/{ => gen_6}/delphox/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/delphox/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/diancie/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/diancie/back.png (100%) rename graphics/pokemon/{sealeo => gen_6/diancie}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/diancie/icon.png (100%) rename graphics/pokemon/{ => gen_6}/diancie/mega/back.png (100%) rename graphics/pokemon/{ => gen_6}/diancie/mega/front.png (100%) rename graphics/pokemon/{ => gen_6}/diancie/mega/icon.png (100%) rename graphics/pokemon/{ => gen_6}/diancie/mega/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/diancie/mega/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/diancie/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/diancie/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/diggersby/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/diggersby/back.png (100%) rename graphics/pokemon/{ => gen_6}/diggersby/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/diggersby/icon.png (100%) rename graphics/pokemon/{ => gen_6}/diggersby/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/diggersby/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/doublade/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/doublade/back.png (100%) rename graphics/pokemon/{seel => gen_6/doublade}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/doublade/icon.png (100%) rename graphics/pokemon/{ => gen_6}/doublade/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/doublade/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/dragalge/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/dragalge/back.png (100%) rename graphics/pokemon/{serperior => gen_6/dragalge}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/dragalge/icon.png (100%) rename graphics/pokemon/{ => gen_6}/dragalge/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/dragalge/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/espurr/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/espurr/back.png (100%) rename graphics/pokemon/{ralts => gen_6/espurr}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/espurr/icon.png (100%) rename graphics/pokemon/{ => gen_6}/espurr/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/espurr/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/fennekin/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/fennekin/back.png (100%) rename graphics/pokemon/{joltik => gen_6/fennekin}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/fennekin/icon.png (100%) rename graphics/pokemon/{ => gen_6}/fennekin/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/fennekin/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/flabebe/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/flabebe/back.png (100%) rename graphics/pokemon/{ => gen_6}/flabebe/blue_flower/icon.png (100%) rename graphics/pokemon/{ => gen_6}/flabebe/blue_flower/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/flabebe/blue_flower/shiny.pal (100%) rename graphics/pokemon/{seviper => gen_6/flabebe}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/flabebe/icon.png (100%) rename graphics/pokemon/{ => gen_6}/flabebe/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/flabebe/orange_flower/icon.png (100%) rename graphics/pokemon/{ => gen_6}/flabebe/orange_flower/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/flabebe/orange_flower/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/flabebe/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/flabebe/white_flower/icon.png (100%) rename graphics/pokemon/{ => gen_6}/flabebe/white_flower/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/flabebe/white_flower/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/flabebe/yellow_flower/icon.png (100%) rename graphics/pokemon/{ => gen_6}/flabebe/yellow_flower/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/flabebe/yellow_flower/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/fletchinder/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/fletchinder/back.png (100%) rename graphics/pokemon/{ => gen_6}/fletchinder/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/fletchinder/icon.png (100%) rename graphics/pokemon/{ => gen_6}/fletchinder/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/fletchinder/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/fletchling/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/fletchling/back.png (100%) rename graphics/pokemon/{ => gen_6}/fletchling/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/fletchling/icon.png (100%) rename graphics/pokemon/{ => gen_6}/fletchling/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/fletchling/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/floette/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/floette/back.png (100%) rename graphics/pokemon/{ => gen_6}/floette/blue_flower/icon.png (100%) rename graphics/pokemon/{ => gen_6}/floette/blue_flower/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/floette/blue_flower/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/floette/eternal_flower/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/floette/eternal_flower/back.png (100%) rename graphics/pokemon/{ => gen_6}/floette/eternal_flower/icon.png (100%) rename graphics/pokemon/{ => gen_6}/floette/eternal_flower/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/floette/eternal_flower/shiny.pal (100%) rename graphics/pokemon/{sharpedo => gen_6/floette}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/floette/icon.png (100%) rename graphics/pokemon/{ => gen_6}/floette/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/floette/orange_flower/icon.png (100%) rename graphics/pokemon/{ => gen_6}/floette/orange_flower/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/floette/orange_flower/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/floette/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/floette/white_flower/icon.png (100%) rename graphics/pokemon/{ => gen_6}/floette/white_flower/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/floette/white_flower/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/floette/yellow_flower/icon.png (100%) rename graphics/pokemon/{ => gen_6}/floette/yellow_flower/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/floette/yellow_flower/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/florges/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/florges/back.png (100%) rename graphics/pokemon/{ => gen_6}/florges/blue_flower/icon.png (100%) rename graphics/pokemon/{ => gen_6}/florges/blue_flower/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/florges/blue_flower/shiny.pal (100%) rename graphics/pokemon/{shellder => gen_6/florges}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/florges/icon.png (100%) rename graphics/pokemon/{ => gen_6}/florges/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/florges/orange_flower/icon.png (100%) rename graphics/pokemon/{ => gen_6}/florges/orange_flower/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/florges/orange_flower/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/florges/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/florges/white_flower/icon.png (100%) rename graphics/pokemon/{ => gen_6}/florges/white_flower/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/florges/white_flower/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/florges/yellow_flower/icon.png (100%) rename graphics/pokemon/{ => gen_6}/florges/yellow_flower/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/florges/yellow_flower/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/froakie/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/froakie/back.png (100%) rename graphics/pokemon/{ => gen_6}/froakie/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/froakie/icon.png (100%) rename graphics/pokemon/{ => gen_6}/froakie/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/froakie/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/frogadier/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/frogadier/back.png (100%) rename graphics/pokemon/{ => gen_6}/frogadier/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/frogadier/icon.png (100%) rename graphics/pokemon/{ => gen_6}/frogadier/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/frogadier/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/back.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/dandy_trim/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/dandy_trim/back.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/dandy_trim/icon.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/dandy_trim/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/dandy_trim/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/debutante_trim/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/debutante_trim/back.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/debutante_trim/icon.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/debutante_trim/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/debutante_trim/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/diamond_trim/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/diamond_trim/back.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/diamond_trim/icon.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/diamond_trim/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/diamond_trim/shiny.pal (100%) rename graphics/pokemon/{crabominable => gen_6/furfrou}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/heart_trim/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/heart_trim/back.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/heart_trim/icon.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/heart_trim/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/heart_trim/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/icon.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/kabuki_trim/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/kabuki_trim/back.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/kabuki_trim/icon.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/kabuki_trim/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/kabuki_trim/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/la_reine_trim/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/la_reine_trim/back.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/la_reine_trim/icon.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/la_reine_trim/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/la_reine_trim/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/matron_trim/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/matron_trim/back.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/matron_trim/icon.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/matron_trim/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/matron_trim/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/pharaoh_trim/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/pharaoh_trim/back.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/pharaoh_trim/icon.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/pharaoh_trim/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/pharaoh_trim/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/star_trim/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/star_trim/back.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/star_trim/icon.png (100%) rename graphics/pokemon/{ => gen_6}/furfrou/star_trim/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/furfrou/star_trim/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/gogoat/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/gogoat/back.png (100%) rename graphics/pokemon/{ => gen_6}/gogoat/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/gogoat/icon.png (100%) rename graphics/pokemon/{ => gen_6}/gogoat/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/gogoat/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/goodra/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/goodra/back.png (100%) rename graphics/pokemon/{zorua => gen_6/goodra}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/goodra/hisuian/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_6}/goodra/hisuian/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_6}/goodra/hisuian/icon.png (100%) rename graphics/pokemon/{ => gen_6}/goodra/hisuian/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_6}/goodra/hisuian/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_6}/goodra/icon.png (100%) rename graphics/pokemon/{ => gen_6}/goodra/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/goodra/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/goomy/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/goomy/back.png (100%) rename graphics/pokemon/{shuppet => gen_6/goomy}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/goomy/icon.png (100%) rename graphics/pokemon/{ => gen_6}/goomy/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/goomy/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/gourgeist/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/gourgeist/back.png (100%) rename graphics/pokemon/{regice => gen_6/gourgeist}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/gourgeist/icon.png (100%) rename graphics/pokemon/{ => gen_6}/gourgeist/large/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/gourgeist/large/back.png (100%) rename graphics/pokemon/{ => gen_6}/gourgeist/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/gourgeist/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/gourgeist/small/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/gourgeist/small/back.png (100%) rename graphics/pokemon/{ => gen_6}/gourgeist/super/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/gourgeist/super/back.png (100%) rename graphics/pokemon/{ => gen_6}/greninja/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/greninja/ash/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/greninja/ash/back.png (100%) rename graphics/pokemon/{ => gen_6}/greninja/ash/icon.png (100%) rename graphics/pokemon/{ => gen_6}/greninja/ash/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/greninja/ash/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/greninja/back.png (100%) rename graphics/pokemon/{ => gen_6}/greninja/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/greninja/icon.png (100%) rename graphics/pokemon/{ => gen_6}/greninja/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/greninja/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/hawlucha/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/hawlucha/back.png (100%) rename graphics/pokemon/{ => gen_6}/hawlucha/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/hawlucha/icon.png (100%) rename graphics/pokemon/{ => gen_6}/hawlucha/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/hawlucha/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/heliolisk/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/heliolisk/back.png (100%) rename graphics/pokemon/{ => gen_6}/heliolisk/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/heliolisk/icon.png (100%) rename graphics/pokemon/{ => gen_6}/heliolisk/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/heliolisk/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/helioptile/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/helioptile/back.png (100%) rename graphics/pokemon/{ => gen_6}/helioptile/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/helioptile/icon.png (100%) rename graphics/pokemon/{ => gen_6}/helioptile/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/helioptile/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/honedge/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/honedge/back.png (100%) rename graphics/pokemon/{sigilyph => gen_6/honedge}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/honedge/icon.png (100%) rename graphics/pokemon/{ => gen_6}/honedge/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/honedge/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/hoopa/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/hoopa/back.png (100%) rename graphics/pokemon/{silcoon => gen_6/hoopa}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/hoopa/icon.png (100%) rename graphics/pokemon/{ => gen_6}/hoopa/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/hoopa/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/hoopa/unbound/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/hoopa/unbound/back.png (100%) rename graphics/pokemon/{ => gen_6}/hoopa/unbound/icon.png (100%) rename graphics/pokemon/{ => gen_6}/hoopa/unbound/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/hoopa/unbound/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/inkay/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/inkay/back.png (100%) rename graphics/pokemon/{silicobra => gen_6/inkay}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/inkay/icon.png (100%) rename graphics/pokemon/{ => gen_6}/inkay/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/inkay/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/klefki/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/klefki/back.png (100%) rename graphics/pokemon/{sinistea => gen_6/klefki}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/klefki/icon.png (100%) rename graphics/pokemon/{ => gen_6}/klefki/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/klefki/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/litleo/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/litleo/back.png (100%) rename graphics/pokemon/{ => gen_6}/litleo/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/litleo/icon.png (100%) rename graphics/pokemon/{ => gen_6}/litleo/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/litleo/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/malamar/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/malamar/back.png (100%) rename graphics/pokemon/{ => gen_6}/malamar/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/malamar/icon.png (100%) rename graphics/pokemon/{ => gen_6}/malamar/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/malamar/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/meowstic/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/meowstic/back.png (100%) rename graphics/pokemon/{ => gen_6}/meowstic/female/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/meowstic/female/back.png (100%) rename graphics/pokemon/{ => gen_6}/meowstic/female/icon.png (100%) rename graphics/pokemon/{ => gen_6}/meowstic/female/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/meowstic/female/shiny.pal (100%) rename graphics/pokemon/{regieleki => gen_6/meowstic}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/meowstic/icon.png (100%) rename graphics/pokemon/{ => gen_6}/meowstic/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/meowstic/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/noibat/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/noibat/back.png (100%) rename graphics/pokemon/{ => gen_6}/noibat/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/noibat/icon.png (100%) rename graphics/pokemon/{ => gen_6}/noibat/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/noibat/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/noivern/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/noivern/back.png (100%) rename graphics/pokemon/{ => gen_6}/noivern/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/noivern/icon.png (100%) rename graphics/pokemon/{ => gen_6}/noivern/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/noivern/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/pancham/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/pancham/back.png (100%) rename graphics/pokemon/{ => gen_6}/pancham/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/pancham/icon.png (100%) rename graphics/pokemon/{ => gen_6}/pancham/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/pancham/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/pangoro/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/pangoro/back.png (100%) rename graphics/pokemon/{ => gen_6}/pangoro/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/pangoro/icon.png (100%) rename graphics/pokemon/{ => gen_6}/pangoro/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/pangoro/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/phantump/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/phantump/back.png (100%) rename graphics/pokemon/{skrelp => gen_6/phantump}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/phantump/icon.png (100%) rename graphics/pokemon/{ => gen_6}/phantump/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/phantump/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/pumpkaboo/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/pumpkaboo/back.png (100%) rename graphics/pokemon/{scatterbug => gen_6/pumpkaboo}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/pumpkaboo/icon.png (100%) rename graphics/pokemon/{ => gen_6}/pumpkaboo/large/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/pumpkaboo/large/back.png (100%) rename graphics/pokemon/{ => gen_6}/pumpkaboo/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/pumpkaboo/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/pumpkaboo/small/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/pumpkaboo/small/back.png (100%) rename graphics/pokemon/{ => gen_6}/pumpkaboo/super/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/pumpkaboo/super/back.png (100%) rename graphics/pokemon/{ => gen_6}/pyroar/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/pyroar/anim_frontf.png (100%) rename graphics/pokemon/{ => gen_6}/pyroar/back.png (100%) rename graphics/pokemon/{ => gen_6}/pyroar/backf.png (100%) rename graphics/pokemon/{ => gen_6}/pyroar/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/pyroar/frontf.png (100%) rename graphics/pokemon/{ => gen_6}/pyroar/icon.png (100%) rename graphics/pokemon/{ => gen_6}/pyroar/iconf.png (100%) rename graphics/pokemon/{ => gen_6}/pyroar/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/pyroar/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/quilladin/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/quilladin/back.png (100%) rename graphics/pokemon/{ => gen_6}/quilladin/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/quilladin/icon.png (100%) rename graphics/pokemon/{ => gen_6}/quilladin/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/quilladin/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/scatterbug/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/scatterbug/back.png (100%) rename graphics/pokemon/{sizzlipede => gen_6/scatterbug}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/scatterbug/icon.png (100%) rename graphics/pokemon/{ => gen_6}/scatterbug/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/scatterbug/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/skiddo/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/skiddo/back.png (100%) rename graphics/pokemon/{ => gen_6}/skiddo/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/skiddo/icon.png (100%) rename graphics/pokemon/{ => gen_6}/skiddo/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/skiddo/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/skrelp/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/skrelp/back.png (100%) rename graphics/pokemon/{sliggoo => gen_6/skrelp}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/skrelp/icon.png (100%) rename graphics/pokemon/{ => gen_6}/skrelp/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/skrelp/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/sliggoo/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/sliggoo/back.png (100%) rename graphics/pokemon/{slugma => gen_6/sliggoo}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/sliggoo/hisuian/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_6}/sliggoo/hisuian/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_6}/sliggoo/hisuian/icon.png (100%) rename graphics/pokemon/{ => gen_6}/sliggoo/hisuian/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_6}/sliggoo/hisuian/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_6}/sliggoo/icon.png (100%) rename graphics/pokemon/{ => gen_6}/sliggoo/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/sliggoo/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/slurpuff/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/slurpuff/back.png (100%) rename graphics/pokemon/{kirlia => gen_6/slurpuff}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/slurpuff/icon.png (100%) rename graphics/pokemon/{ => gen_6}/slurpuff/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/slurpuff/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/spewpa/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/spewpa/back.png (100%) rename graphics/pokemon/{snom => gen_6/spewpa}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/spewpa/icon.png (100%) rename graphics/pokemon/{ => gen_6}/spewpa/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/spewpa/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/spritzee/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/spritzee/back.png (100%) rename graphics/pokemon/{skorupi => gen_6/spritzee}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/spritzee/icon.png (100%) rename graphics/pokemon/{ => gen_6}/spritzee/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/spritzee/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/swirlix/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/swirlix/back.png (100%) rename graphics/pokemon/{solosis => gen_6/swirlix}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/swirlix/icon.png (100%) rename graphics/pokemon/{ => gen_6}/swirlix/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/swirlix/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/sylveon/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/sylveon/back.png (100%) rename graphics/pokemon/{ => gen_6}/sylveon/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/sylveon/icon.png (100%) rename graphics/pokemon/{ => gen_6}/sylveon/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/sylveon/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/talonflame/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/talonflame/back.png (100%) rename graphics/pokemon/{ => gen_6}/talonflame/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/talonflame/icon.png (100%) rename graphics/pokemon/{ => gen_6}/talonflame/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/talonflame/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/trevenant/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/trevenant/back.png (100%) rename graphics/pokemon/{larvesta => gen_6/trevenant}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/trevenant/icon.png (100%) rename graphics/pokemon/{ => gen_6}/trevenant/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/trevenant/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/tyrantrum/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/tyrantrum/back.png (100%) rename graphics/pokemon/{ => gen_6}/tyrantrum/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/tyrantrum/icon.png (100%) rename graphics/pokemon/{ => gen_6}/tyrantrum/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/tyrantrum/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/tyrunt/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/tyrunt/back.png (100%) rename graphics/pokemon/{ => gen_6}/tyrunt/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/tyrunt/icon.png (100%) rename graphics/pokemon/{ => gen_6}/tyrunt/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/tyrunt/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/archipelago/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/archipelago/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/archipelago/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/archipelago/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/archipelago/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/continental/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/continental/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/continental/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/continental/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/continental/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/elegant/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/elegant/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/elegant/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/elegant/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/elegant/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/fancy/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/fancy/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/fancy/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/fancy/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/fancy/shiny.pal (100%) rename graphics/pokemon/{solrock => gen_6/vivillon}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/garden/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/garden/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/garden/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/garden/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/garden/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/high_plains/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/high_plains/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/high_plains/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/high_plains/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/high_plains/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/jungle/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/jungle/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/jungle/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/jungle/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/jungle/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/marine/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/marine/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/marine/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/marine/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/marine/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/meadow/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/meadow/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/meadow/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/meadow/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/meadow/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/modern/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/modern/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/modern/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/modern/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/modern/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/monsoon/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/monsoon/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/monsoon/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/monsoon/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/monsoon/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/ocean/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/ocean/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/ocean/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/ocean/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/ocean/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/poke_ball/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/poke_ball/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/poke_ball/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/poke_ball/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/poke_ball/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/polar/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/polar/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/polar/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/polar/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/polar/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/river/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/river/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/river/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/river/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/river/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/sandstorm/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/sandstorm/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/sandstorm/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/sandstorm/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/sandstorm/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/savanna/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/savanna/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/savanna/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/savanna/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/savanna/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/sun/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/sun/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/sun/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/sun/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/sun/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/tundra/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/tundra/back.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/tundra/icon.png (100%) rename graphics/pokemon/{ => gen_6}/vivillon/tundra/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/vivillon/tundra/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/volcanion/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/volcanion/back.png (100%) rename graphics/pokemon/{ => gen_6}/volcanion/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/volcanion/icon.png (100%) rename graphics/pokemon/{ => gen_6}/volcanion/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/volcanion/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/xerneas/active/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/xerneas/active/back.png (100%) rename graphics/pokemon/{ => gen_6}/xerneas/active/icon.png (100%) rename graphics/pokemon/{ => gen_6}/xerneas/active/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/xerneas/active/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/xerneas/back.png (100%) rename graphics/pokemon/{lurantis => gen_6/xerneas}/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/xerneas/front.png (100%) rename graphics/pokemon/{ => gen_6}/xerneas/icon.png (100%) rename graphics/pokemon/{ => gen_6}/xerneas/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/xerneas/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/yveltal/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/yveltal/back.png (100%) rename graphics/pokemon/{ => gen_6}/yveltal/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/yveltal/icon.png (100%) rename graphics/pokemon/{ => gen_6}/yveltal/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/yveltal/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/zygarde/10_percent/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/zygarde/10_percent/back.png (100%) rename graphics/pokemon/{ => gen_6}/zygarde/10_percent/icon.png (100%) rename graphics/pokemon/{ => gen_6}/zygarde/10_percent/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/zygarde/10_percent/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/zygarde/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/zygarde/back.png (100%) rename graphics/pokemon/{ => gen_6}/zygarde/complete/anim_front.png (100%) rename graphics/pokemon/{ => gen_6}/zygarde/complete/back.png (100%) rename graphics/pokemon/{ => gen_6}/zygarde/complete/icon.png (100%) rename graphics/pokemon/{ => gen_6}/zygarde/complete/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/zygarde/complete/shiny.pal (100%) rename graphics/pokemon/{ => gen_6}/zygarde/footprint.png (100%) rename graphics/pokemon/{ => gen_6}/zygarde/icon.png (100%) rename graphics/pokemon/{ => gen_6}/zygarde/normal.pal (100%) rename graphics/pokemon/{ => gen_6}/zygarde/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/araquanid/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/araquanid/back.png (100%) rename graphics/pokemon/{magearna => gen_7/araquanid}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/araquanid/icon.png (100%) rename graphics/pokemon/{ => gen_7}/araquanid/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/araquanid/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/bewear/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/bewear/back.png (100%) rename graphics/pokemon/{ => gen_7}/bewear/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/bewear/icon.png (100%) rename graphics/pokemon/{ => gen_7}/bewear/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/bewear/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/blacephalon/back.png (100%) rename graphics/pokemon/{mr_mime => gen_7/blacephalon}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/blacephalon/front.png (100%) rename graphics/pokemon/{ => gen_7}/blacephalon/icon.png (100%) rename graphics/pokemon/{ => gen_7}/blacephalon/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/blacephalon/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/bounsweet/back.png (100%) rename graphics/pokemon/{meloetta => gen_7/bounsweet}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/bounsweet/front.png (100%) rename graphics/pokemon/{ => gen_7}/bounsweet/icon.png (100%) rename graphics/pokemon/{ => gen_7}/bounsweet/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/bounsweet/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/brionne/back.png (100%) rename graphics/pokemon/{spewpa => gen_7/brionne}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/brionne/front.png (100%) rename graphics/pokemon/{ => gen_7}/brionne/icon.png (100%) rename graphics/pokemon/{ => gen_7}/brionne/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/brionne/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/bruxish/back.png (100%) rename graphics/pokemon/{spheal => gen_7/bruxish}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/bruxish/front.png (100%) rename graphics/pokemon/{ => gen_7}/bruxish/icon.png (100%) rename graphics/pokemon/{ => gen_7}/bruxish/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/bruxish/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/buzzwole/back.png (100%) rename graphics/pokemon/{munna => gen_7/buzzwole}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/buzzwole/front.png (100%) rename graphics/pokemon/{ => gen_7}/buzzwole/icon.png (100%) rename graphics/pokemon/{ => gen_7}/buzzwole/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/buzzwole/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/celesteela/back.png (100%) rename graphics/pokemon/{ => gen_7}/celesteela/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/celesteela/front.png (100%) rename graphics/pokemon/{ => gen_7}/celesteela/icon.png (100%) rename graphics/pokemon/{ => gen_7}/celesteela/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/celesteela/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/charjabug/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/charjabug/back.png (100%) rename graphics/pokemon/{spiritomb => gen_7/charjabug}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/charjabug/icon.png (100%) rename graphics/pokemon/{ => gen_7}/charjabug/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/charjabug/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/comfey/back.png (100%) rename graphics/pokemon/{spoink => gen_7/comfey}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/comfey/front.png (100%) rename graphics/pokemon/{ => gen_7}/comfey/icon.png (100%) rename graphics/pokemon/{ => gen_7}/comfey/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/comfey/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/cosmoem/back.png (100%) rename graphics/pokemon/{stakataka => gen_7/cosmoem}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/cosmoem/front.png (100%) rename graphics/pokemon/{ => gen_7}/cosmoem/icon.png (100%) rename graphics/pokemon/{ => gen_7}/cosmoem/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/cosmoem/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/cosmog/back.png (100%) rename graphics/pokemon/{steelix => gen_7/cosmog}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/cosmog/front.png (100%) rename graphics/pokemon/{ => gen_7}/cosmog/icon.png (100%) rename graphics/pokemon/{ => gen_7}/cosmog/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/cosmog/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/crabominable/back.png (100%) rename graphics/pokemon/{furfrou => gen_7/crabominable}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/crabominable/front.png (100%) rename graphics/pokemon/{ => gen_7}/crabominable/icon.png (100%) rename graphics/pokemon/{ => gen_7}/crabominable/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/crabominable/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/crabrawler/back.png (100%) rename graphics/pokemon/{musharna => gen_7/crabrawler}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/crabrawler/front.png (100%) rename graphics/pokemon/{ => gen_7}/crabrawler/icon.png (100%) rename graphics/pokemon/{ => gen_7}/crabrawler/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/crabrawler/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/cutiefly/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/cutiefly/back.png (100%) rename graphics/pokemon/{poipole => gen_7/cutiefly}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/cutiefly/icon.png (100%) rename graphics/pokemon/{ => gen_7}/cutiefly/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/cutiefly/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/dartrix/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/dartrix/back.png (100%) rename graphics/pokemon/{ => gen_7}/dartrix/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/dartrix/icon.png (100%) rename graphics/pokemon/{ => gen_7}/dartrix/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/dartrix/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/decidueye/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/decidueye/back.png (100%) rename graphics/pokemon/{ => gen_7}/decidueye/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/decidueye/hisuian/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_7}/decidueye/hisuian/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_7}/decidueye/hisuian/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_7}/decidueye/hisuian/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_7}/decidueye/hisuian/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_7}/decidueye/icon.png (100%) rename graphics/pokemon/{ => gen_7}/decidueye/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/decidueye/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/dewpider/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/dewpider/back.png (100%) rename graphics/pokemon/{polteageist => gen_7/dewpider}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/dewpider/icon.png (100%) rename graphics/pokemon/{ => gen_7}/dewpider/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/dewpider/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/dhelmise/back.png (100%) rename graphics/pokemon/{stunfisk => gen_7/dhelmise}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/dhelmise/front.png (100%) rename graphics/pokemon/{ => gen_7}/dhelmise/icon.png (100%) rename graphics/pokemon/{ => gen_7}/dhelmise/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/dhelmise/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/drampa/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/drampa/back.png (100%) rename graphics/pokemon/{sunkern => gen_7/drampa}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/drampa/icon.png (100%) rename graphics/pokemon/{ => gen_7}/drampa/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/drampa/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/fomantis/back.png (100%) rename graphics/pokemon/{porygon_z => gen_7/fomantis}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/fomantis/front.png (100%) rename graphics/pokemon/{ => gen_7}/fomantis/icon.png (100%) rename graphics/pokemon/{ => gen_7}/fomantis/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/fomantis/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/golisopod/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/golisopod/back.png (100%) rename graphics/pokemon/{ => gen_7}/golisopod/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/golisopod/icon.png (100%) rename graphics/pokemon/{ => gen_7}/golisopod/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/golisopod/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/grubbin/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/grubbin/back.png (100%) rename graphics/pokemon/{sewaddle => gen_7/grubbin}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/grubbin/icon.png (100%) rename graphics/pokemon/{ => gen_7}/grubbin/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/grubbin/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/gumshoos/back.png (100%) rename graphics/pokemon/{raticate => gen_7/gumshoos}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/gumshoos/front.png (100%) rename graphics/pokemon/{ => gen_7}/gumshoos/icon.png (100%) rename graphics/pokemon/{ => gen_7}/gumshoos/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/gumshoos/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/guzzlord/back.png (100%) rename graphics/pokemon/{ => gen_7}/guzzlord/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/guzzlord/front.png (100%) rename graphics/pokemon/{ => gen_7}/guzzlord/icon.png (100%) rename graphics/pokemon/{ => gen_7}/guzzlord/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/guzzlord/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/hakamo_o/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/hakamo_o/back.png (100%) rename graphics/pokemon/{ => gen_7}/hakamo_o/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/hakamo_o/icon.png (100%) rename graphics/pokemon/{ => gen_7}/hakamo_o/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/hakamo_o/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/incineroar/back.png (100%) rename graphics/pokemon/{vaporeon => gen_7/incineroar}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/incineroar/front.png (100%) rename graphics/pokemon/{ => gen_7}/incineroar/icon.png (100%) rename graphics/pokemon/{ => gen_7}/incineroar/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/incineroar/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/jangmo_o/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/jangmo_o/back.png (100%) rename graphics/pokemon/{ => gen_7}/jangmo_o/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/jangmo_o/icon.png (100%) rename graphics/pokemon/{ => gen_7}/jangmo_o/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/jangmo_o/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/kartana/back.png (100%) rename graphics/pokemon/{swadloon => gen_7/kartana}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/kartana/front.png (100%) rename graphics/pokemon/{ => gen_7}/kartana/icon.png (100%) rename graphics/pokemon/{ => gen_7}/kartana/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/kartana/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/komala/back.png (100%) rename graphics/pokemon/{ => gen_7}/komala/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/komala/front.png (100%) rename graphics/pokemon/{ => gen_7}/komala/icon.png (100%) rename graphics/pokemon/{ => gen_7}/komala/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/komala/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/kommo_o/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/kommo_o/back.png (100%) rename graphics/pokemon/{ => gen_7}/kommo_o/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/kommo_o/icon.png (100%) rename graphics/pokemon/{ => gen_7}/kommo_o/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/kommo_o/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/litten/back.png (100%) rename graphics/pokemon/{appletun => gen_7/litten}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/litten/front.png (100%) rename graphics/pokemon/{ => gen_7}/litten/icon.png (100%) rename graphics/pokemon/{ => gen_7}/litten/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/litten/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/lunala/back.png (100%) rename graphics/pokemon/{swalot => gen_7/lunala}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/lunala/front.png (100%) rename graphics/pokemon/{ => gen_7}/lunala/icon.png (100%) rename graphics/pokemon/{ => gen_7}/lunala/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/lunala/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/lurantis/back.png (100%) rename graphics/pokemon/{shelmet => gen_7/lurantis}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/lurantis/front.png (100%) rename graphics/pokemon/{ => gen_7}/lurantis/icon.png (100%) rename graphics/pokemon/{ => gen_7}/lurantis/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/lurantis/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/back.png (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/dusk/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/dusk/back.png (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/dusk/icon.png (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/dusk/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/dusk/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/icon.png (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/midnight/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/midnight/back.png (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/midnight/icon.png (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/midnight/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/midnight/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/lycanroc/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/magearna/back.png (100%) rename graphics/pokemon/{slurpuff => gen_7/magearna}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/magearna/front.png (100%) rename graphics/pokemon/{ => gen_7}/magearna/icon.png (100%) rename graphics/pokemon/{ => gen_7}/magearna/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/magearna/original_color/back.png (100%) rename graphics/pokemon/{ => gen_7}/magearna/original_color/front.png (100%) rename graphics/pokemon/{ => gen_7}/magearna/original_color/icon.png (100%) rename graphics/pokemon/{ => gen_7}/magearna/original_color/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/magearna/original_color/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/magearna/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/mareanie/back.png (100%) rename graphics/pokemon/{swirlix => gen_7/mareanie}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/mareanie/front.png (100%) rename graphics/pokemon/{ => gen_7}/mareanie/icon.png (100%) rename graphics/pokemon/{ => gen_7}/mareanie/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/mareanie/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/marshadow/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/marshadow/back.png (100%) rename graphics/pokemon/{ => gen_7}/marshadow/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/marshadow/icon.png (100%) rename graphics/pokemon/{ => gen_7}/marshadow/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/marshadow/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/melmetal/back.png (100%) rename graphics/pokemon/{ => gen_7}/melmetal/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/melmetal/front.png (100%) rename graphics/pokemon/{ => gen_7}/melmetal/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_7}/melmetal/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_7}/melmetal/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_7}/melmetal/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/melmetal/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/melmetal/icon.png (100%) rename graphics/pokemon/{ => gen_7}/melmetal/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/melmetal/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/meltan/back.png (100%) rename graphics/pokemon/{tapu_bulu => gen_7/meltan}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/meltan/front.png (100%) rename graphics/pokemon/{ => gen_7}/meltan/icon.png (100%) rename graphics/pokemon/{ => gen_7}/meltan/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/meltan/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/mimikyu/back.png (100%) rename graphics/pokemon/{ => gen_7}/mimikyu/busted/back.png (100%) rename graphics/pokemon/{ => gen_7}/mimikyu/busted/front.png (100%) rename graphics/pokemon/{ => gen_7}/mimikyu/busted/icon.png (100%) rename graphics/pokemon/{ => gen_7}/mimikyu/busted/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/mimikyu/busted/shiny.pal (100%) rename graphics/pokemon/{tapu_fini => gen_7/mimikyu}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/mimikyu/front.png (100%) rename graphics/pokemon/{ => gen_7}/mimikyu/icon.png (100%) rename graphics/pokemon/{ => gen_7}/mimikyu/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/mimikyu/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/minior/back.png (100%) rename graphics/pokemon/{ => gen_7}/minior/core/back.png (100%) rename graphics/pokemon/{ => gen_7}/minior/core/blue/icon.png (100%) rename graphics/pokemon/{ => gen_7}/minior/core/blue/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/minior/core/front.png (100%) rename graphics/pokemon/{ => gen_7}/minior/core/green/icon.png (100%) rename graphics/pokemon/{ => gen_7}/minior/core/green/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/minior/core/indigo/icon.png (100%) rename graphics/pokemon/{ => gen_7}/minior/core/indigo/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/minior/core/orange/icon.png (100%) rename graphics/pokemon/{ => gen_7}/minior/core/orange/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/minior/core/red/icon.png (100%) rename graphics/pokemon/{ => gen_7}/minior/core/red/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/minior/core/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/minior/core/violet/icon.png (100%) rename graphics/pokemon/{ => gen_7}/minior/core/violet/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/minior/core/yellow/icon.png (100%) rename graphics/pokemon/{ => gen_7}/minior/core/yellow/normal.pal (100%) rename graphics/pokemon/{tapu_koko => gen_7/minior}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/minior/front.png (100%) rename graphics/pokemon/{ => gen_7}/minior/icon.png (100%) rename graphics/pokemon/{ => gen_7}/minior/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/minior/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/morelull/back.png (100%) rename graphics/pokemon/{ => gen_7}/morelull/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/morelull/front.png (100%) rename graphics/pokemon/{ => gen_7}/morelull/icon.png (100%) rename graphics/pokemon/{ => gen_7}/morelull/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/morelull/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/mudbray/back.png (100%) rename graphics/pokemon/{ => gen_7}/mudbray/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/mudbray/front.png (100%) rename graphics/pokemon/{ => gen_7}/mudbray/icon.png (100%) rename graphics/pokemon/{ => gen_7}/mudbray/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/mudbray/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/mudsdale/back.png (100%) rename graphics/pokemon/{ => gen_7}/mudsdale/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/mudsdale/front.png (100%) rename graphics/pokemon/{ => gen_7}/mudsdale/icon.png (100%) rename graphics/pokemon/{ => gen_7}/mudsdale/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/mudsdale/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/naganadel/back.png (100%) rename graphics/pokemon/{tapu_lele => gen_7/naganadel}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/naganadel/front.png (100%) rename graphics/pokemon/{ => gen_7}/naganadel/icon.png (100%) rename graphics/pokemon/{ => gen_7}/naganadel/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/naganadel/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/necrozma/back.png (100%) rename graphics/pokemon/{ => gen_7}/necrozma/dawn_wings/back.png (100%) rename graphics/pokemon/{ => gen_7}/necrozma/dawn_wings/front.png (100%) rename graphics/pokemon/{ => gen_7}/necrozma/dawn_wings/icon.png (100%) rename graphics/pokemon/{ => gen_7}/necrozma/dawn_wings/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/necrozma/dawn_wings/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/necrozma/dusk_mane/back.png (100%) rename graphics/pokemon/{ => gen_7}/necrozma/dusk_mane/front.png (100%) rename graphics/pokemon/{ => gen_7}/necrozma/dusk_mane/icon.png (100%) rename graphics/pokemon/{ => gen_7}/necrozma/dusk_mane/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/necrozma/dusk_mane/shiny.pal (100%) rename graphics/pokemon/{tentacool => gen_7/necrozma}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/necrozma/front.png (100%) rename graphics/pokemon/{ => gen_7}/necrozma/icon.png (100%) rename graphics/pokemon/{ => gen_7}/necrozma/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/necrozma/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/necrozma/ultra/back.png (100%) rename graphics/pokemon/{ => gen_7}/necrozma/ultra/front.png (100%) rename graphics/pokemon/{ => gen_7}/necrozma/ultra/icon.png (100%) rename graphics/pokemon/{ => gen_7}/necrozma/ultra/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/necrozma/ultra/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/nihilego/back.png (100%) rename graphics/pokemon/{tentacruel => gen_7/nihilego}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/nihilego/front.png (100%) rename graphics/pokemon/{ => gen_7}/nihilego/icon.png (100%) rename graphics/pokemon/{ => gen_7}/nihilego/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/nihilego/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/oranguru/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/oranguru/back.png (100%) rename graphics/pokemon/{ => gen_7}/oranguru/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/oranguru/icon.png (100%) rename graphics/pokemon/{ => gen_7}/oranguru/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/oranguru/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/oricorio/back.png (100%) rename graphics/pokemon/{ => gen_7}/oricorio/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/oricorio/front.png (100%) rename graphics/pokemon/{ => gen_7}/oricorio/icon.png (100%) rename graphics/pokemon/{ => gen_7}/oricorio/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/oricorio/pau/back.png (100%) rename graphics/pokemon/{ => gen_7}/oricorio/pau/front.png (100%) rename graphics/pokemon/{ => gen_7}/oricorio/pau/icon.png (100%) rename graphics/pokemon/{ => gen_7}/oricorio/pau/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/oricorio/pau/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/oricorio/pom_pom/back.png (100%) rename graphics/pokemon/{ => gen_7}/oricorio/pom_pom/front.png (100%) rename graphics/pokemon/{ => gen_7}/oricorio/pom_pom/icon.png (100%) rename graphics/pokemon/{ => gen_7}/oricorio/pom_pom/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/oricorio/pom_pom/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/oricorio/sensu/back.png (100%) rename graphics/pokemon/{ => gen_7}/oricorio/sensu/front.png (100%) rename graphics/pokemon/{ => gen_7}/oricorio/sensu/icon.png (100%) rename graphics/pokemon/{ => gen_7}/oricorio/sensu/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/oricorio/sensu/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/oricorio/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/palossand/back.png (100%) rename graphics/pokemon/{thundurus => gen_7/palossand}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/palossand/front.png (100%) rename graphics/pokemon/{ => gen_7}/palossand/icon.png (100%) rename graphics/pokemon/{ => gen_7}/palossand/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/palossand/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/passimian/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/passimian/back.png (100%) rename graphics/pokemon/{ => gen_7}/passimian/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/passimian/icon.png (100%) rename graphics/pokemon/{ => gen_7}/passimian/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/passimian/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/pheromosa/back.png (100%) rename graphics/pokemon/{ => gen_7}/pheromosa/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/pheromosa/front.png (100%) rename graphics/pokemon/{ => gen_7}/pheromosa/icon.png (100%) rename graphics/pokemon/{ => gen_7}/pheromosa/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/pheromosa/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/pikipek/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/pikipek/back.png (100%) rename graphics/pokemon/{ => gen_7}/pikipek/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/pikipek/icon.png (100%) rename graphics/pokemon/{ => gen_7}/pikipek/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/pikipek/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/poipole/back.png (100%) rename graphics/pokemon/{starmie => gen_7/poipole}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/poipole/front.png (100%) rename graphics/pokemon/{ => gen_7}/poipole/icon.png (100%) rename graphics/pokemon/{ => gen_7}/poipole/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/poipole/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/popplio/back.png (100%) rename graphics/pokemon/{tirtouga => gen_7/popplio}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/popplio/front.png (100%) rename graphics/pokemon/{ => gen_7}/popplio/icon.png (100%) rename graphics/pokemon/{ => gen_7}/popplio/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/popplio/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/primarina/back.png (100%) rename graphics/pokemon/{tornadus => gen_7/primarina}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/primarina/front.png (100%) rename graphics/pokemon/{ => gen_7}/primarina/icon.png (100%) rename graphics/pokemon/{ => gen_7}/primarina/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/primarina/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/pyukumuku/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/pyukumuku/back.png (100%) rename graphics/pokemon/{tympole => gen_7/pyukumuku}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/pyukumuku/icon.png (100%) rename graphics/pokemon/{ => gen_7}/pyukumuku/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/pyukumuku/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/ribombee/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/ribombee/back.png (100%) rename graphics/pokemon/{ => gen_7}/ribombee/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/ribombee/icon.png (100%) rename graphics/pokemon/{ => gen_7}/ribombee/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/ribombee/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/rockruff/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/rockruff/back.png (100%) rename graphics/pokemon/{ => gen_7}/rockruff/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/rockruff/icon.png (100%) rename graphics/pokemon/{ => gen_7}/rockruff/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/rockruff/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/rowlet/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/rowlet/back.png (100%) rename graphics/pokemon/{ => gen_7}/rowlet/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/rowlet/icon.png (100%) rename graphics/pokemon/{ => gen_7}/rowlet/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/rowlet/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/salandit/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/salandit/back.png (100%) rename graphics/pokemon/{ => gen_7}/salandit/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/salandit/icon.png (100%) rename graphics/pokemon/{ => gen_7}/salandit/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/salandit/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/salazzle/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/salazzle/back.png (100%) rename graphics/pokemon/{ => gen_7}/salazzle/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/salazzle/icon.png (100%) rename graphics/pokemon/{ => gen_7}/salazzle/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/salazzle/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/sandygast/back.png (100%) rename graphics/pokemon/{tynamo => gen_7/sandygast}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/sandygast/front.png (100%) rename graphics/pokemon/{ => gen_7}/sandygast/icon.png (100%) rename graphics/pokemon/{ => gen_7}/sandygast/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/sandygast/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/shiinotic/back.png (100%) rename graphics/pokemon/{hatenna => gen_7/shiinotic}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/shiinotic/front.png (100%) rename graphics/pokemon/{ => gen_7}/shiinotic/icon.png (100%) rename graphics/pokemon/{ => gen_7}/shiinotic/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/shiinotic/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/back.png (100%) rename graphics/pokemon/{ => gen_7}/silvally/bug/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/bug/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/dark/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/dark/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/dragon/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/dragon/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/electric/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/electric/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/fairy/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/fairy/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/fighting/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/fighting/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/fire/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/fire/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/flying/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/flying/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/silvally/front.png (100%) rename graphics/pokemon/{ => gen_7}/silvally/ghost/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/ghost/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/grass/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/grass/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/ground/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/ground/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/ice/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/ice/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/icon.png (100%) rename graphics/pokemon/{ => gen_7}/silvally/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/poison/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/poison/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/psychic/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/psychic/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/rock/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/rock/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/steel/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/steel/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/water/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/silvally/water/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/solgaleo/back.png (100%) rename graphics/pokemon/{ => gen_7}/solgaleo/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/solgaleo/front.png (100%) rename graphics/pokemon/{ => gen_7}/solgaleo/icon.png (100%) rename graphics/pokemon/{ => gen_7}/solgaleo/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/solgaleo/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/stakataka/back.png (100%) rename graphics/pokemon/{unown => gen_7/stakataka}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/stakataka/front.png (100%) rename graphics/pokemon/{ => gen_7}/stakataka/icon.png (100%) rename graphics/pokemon/{ => gen_7}/stakataka/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/stakataka/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/steenee/back.png (100%) rename graphics/pokemon/{staryu => gen_7/steenee}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/steenee/front.png (100%) rename graphics/pokemon/{ => gen_7}/steenee/icon.png (100%) rename graphics/pokemon/{ => gen_7}/steenee/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/steenee/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/stufful/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/stufful/back.png (100%) rename graphics/pokemon/{ => gen_7}/stufful/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/stufful/icon.png (100%) rename graphics/pokemon/{ => gen_7}/stufful/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/stufful/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/tapu_bulu/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/tapu_bulu/back.png (100%) rename graphics/pokemon/{vanillish => gen_7/tapu_bulu}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/tapu_bulu/icon.png (100%) rename graphics/pokemon/{ => gen_7}/tapu_bulu/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/tapu_bulu/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/tapu_fini/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/tapu_fini/back.png (100%) rename graphics/pokemon/{vanillite => gen_7/tapu_fini}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/tapu_fini/icon.png (100%) rename graphics/pokemon/{ => gen_7}/tapu_fini/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/tapu_fini/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/tapu_koko/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/tapu_koko/back.png (100%) rename graphics/pokemon/{vanilluxe => gen_7/tapu_koko}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/tapu_koko/icon.png (100%) rename graphics/pokemon/{ => gen_7}/tapu_koko/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/tapu_koko/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/tapu_lele/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/tapu_lele/back.png (100%) rename graphics/pokemon/{vespiquen => gen_7/tapu_lele}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/tapu_lele/icon.png (100%) rename graphics/pokemon/{ => gen_7}/tapu_lele/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/tapu_lele/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/togedemaru/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/togedemaru/back.png (100%) rename graphics/pokemon/{impidimp => gen_7/togedemaru}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/togedemaru/icon.png (100%) rename graphics/pokemon/{ => gen_7}/togedemaru/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/togedemaru/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/torracat/back.png (100%) rename graphics/pokemon/{ => gen_7}/torracat/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/torracat/front.png (100%) rename graphics/pokemon/{ => gen_7}/torracat/icon.png (100%) rename graphics/pokemon/{ => gen_7}/torracat/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/torracat/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/toucannon/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/toucannon/back.png (100%) rename graphics/pokemon/{ => gen_7}/toucannon/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/toucannon/icon.png (100%) rename graphics/pokemon/{ => gen_7}/toucannon/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/toucannon/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/toxapex/back.png (100%) rename graphics/pokemon/{ => gen_7}/toxapex/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/toxapex/front.png (100%) rename graphics/pokemon/{ => gen_7}/toxapex/icon.png (100%) rename graphics/pokemon/{ => gen_7}/toxapex/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/toxapex/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/trumbeak/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/trumbeak/back.png (100%) rename graphics/pokemon/{ => gen_7}/trumbeak/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/trumbeak/icon.png (100%) rename graphics/pokemon/{ => gen_7}/trumbeak/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/trumbeak/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/tsareena/back.png (100%) rename graphics/pokemon/{steenee => gen_7/tsareena}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/tsareena/front.png (100%) rename graphics/pokemon/{ => gen_7}/tsareena/icon.png (100%) rename graphics/pokemon/{ => gen_7}/tsareena/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/tsareena/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/turtonator/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/turtonator/back.png (100%) rename graphics/pokemon/{ => gen_7}/turtonator/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/turtonator/icon.png (100%) rename graphics/pokemon/{ => gen_7}/turtonator/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/turtonator/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/type_null/back.png (100%) rename graphics/pokemon/{ => gen_7}/type_null/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/type_null/front.png (100%) rename graphics/pokemon/{ => gen_7}/type_null/icon.png (100%) rename graphics/pokemon/{ => gen_7}/type_null/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/type_null/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/vikavolt/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/vikavolt/back.png (100%) rename graphics/pokemon/{ => gen_7}/vikavolt/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/vikavolt/icon.png (100%) rename graphics/pokemon/{ => gen_7}/vikavolt/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/vikavolt/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/wimpod/anim_front.png (100%) rename graphics/pokemon/{ => gen_7}/wimpod/back.png (100%) rename graphics/pokemon/{trevenant => gen_7/wimpod}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/wimpod/icon.png (100%) rename graphics/pokemon/{ => gen_7}/wimpod/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/wimpod/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/wishiwashi/back.png (100%) rename graphics/pokemon/{victreebel => gen_7/wishiwashi}/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/wishiwashi/front.png (100%) rename graphics/pokemon/{ => gen_7}/wishiwashi/icon.png (100%) rename graphics/pokemon/{ => gen_7}/wishiwashi/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/wishiwashi/school/back.png (100%) rename graphics/pokemon/{ => gen_7}/wishiwashi/school/front.png (100%) rename graphics/pokemon/{ => gen_7}/wishiwashi/school/icon.png (100%) rename graphics/pokemon/{ => gen_7}/wishiwashi/school/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/wishiwashi/school/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/wishiwashi/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/xurkitree/back.png (100%) rename graphics/pokemon/{ => gen_7}/xurkitree/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/xurkitree/front.png (100%) rename graphics/pokemon/{ => gen_7}/xurkitree/icon.png (100%) rename graphics/pokemon/{ => gen_7}/xurkitree/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/xurkitree/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/yungoos/back.png (100%) rename graphics/pokemon/{ => gen_7}/yungoos/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/yungoos/front.png (100%) rename graphics/pokemon/{ => gen_7}/yungoos/icon.png (100%) rename graphics/pokemon/{ => gen_7}/yungoos/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/yungoos/shiny.pal (100%) rename graphics/pokemon/{ => gen_7}/zeraora/back.png (100%) rename graphics/pokemon/{ => gen_7}/zeraora/footprint.png (100%) rename graphics/pokemon/{ => gen_7}/zeraora/front.png (100%) rename graphics/pokemon/{ => gen_7}/zeraora/icon.png (100%) rename graphics/pokemon/{ => gen_7}/zeraora/normal.pal (100%) rename graphics/pokemon/{ => gen_7}/zeraora/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/back.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/berry/back.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/berry/berry_caramel_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/berry/berry_default.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/berry/berry_lemon_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/berry/berry_matcha_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/berry/berry_mint_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/berry/berry_rainbow_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/berry/berry_ruby_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/berry/berry_ruby_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/berry/berry_salted_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/berry/berry_shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/berry/front.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/caramel_swirl/back.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/caramel_swirl/front.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/caramel_swirl/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/caramel_swirl/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/clover/back.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/clover/clover_caramel_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/clover/clover_default.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/clover/clover_lemon_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/clover/clover_matcha_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/clover/clover_mint_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/clover/clover_rainbow_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/clover/clover_ruby_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/clover/clover_ruby_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/clover/clover_salted_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/clover/clover_shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/clover/front.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/flower/back.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/flower/flower_caramel_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/flower/flower_default.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/flower/flower_lemon_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/flower/flower_matcha_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/flower/flower_mint_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/flower/flower_rainbow_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/flower/flower_ruby_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/flower/flower_ruby_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/flower/flower_salted_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/flower/flower_shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/flower/front.png (100%) rename graphics/pokemon/{vivillon => gen_8/alcremie}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/front.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/icon.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/love/back.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/love/front.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/love/love_caramel_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/love/love_default.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/love/love_lemon_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/love/love_matcha_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/love/love_mint_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/love/love_rainbow_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/love/love_ruby_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/love/love_ruby_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/love/love_salted_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/love/love_shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/rainbow_swirl/back.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/rainbow_swirl/front.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/rainbow_swirl/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/rainbow_swirl/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/ribbon/back.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/ribbon/front.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/ribbon/ribbon_caramel_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/ribbon/ribbon_default.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/ribbon/ribbon_lemon_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/ribbon/ribbon_matcha_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/ribbon/ribbon_mint_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/ribbon/ribbon_rainbow_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/ribbon/ribbon_ruby_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/ribbon/ribbon_ruby_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/ribbon/ribbon_salted_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/ribbon/ribbon_shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/star/back.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/star/front.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/star/star_caramel_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/star/star_default.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/star/star_lemon_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/star/star_matcha_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/star/star_mint_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/star/star_rainbow_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/star/star_ruby_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/star/star_ruby_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/star/star_salted_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/star/star_shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/strawberry/back.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/strawberry/front.png (100%) rename graphics/pokemon/{ => gen_8}/alcremie/strawberry/strawberry_caramel_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/strawberry/strawberry_default.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/strawberry/strawberry_lemon_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/strawberry/strawberry_matcha_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/strawberry/strawberry_mint_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/strawberry/strawberry_rainbow_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/strawberry/strawberry_ruby_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/strawberry/strawberry_ruby_swirl.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/strawberry/strawberry_salted_cream.pal (100%) rename graphics/pokemon/{ => gen_8}/alcremie/strawberry/strawberry_shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/appletun/anim_front.png (100%) rename graphics/pokemon/{ => gen_8}/appletun/back.png (100%) rename graphics/pokemon/{litten => gen_8/appletun}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/appletun/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/appletun/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/appletun/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/appletun/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/appletun/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/appletun/icon.png (100%) rename graphics/pokemon/{ => gen_8}/appletun/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/appletun/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/applin/anim_front.png (100%) rename graphics/pokemon/{ => gen_8}/applin/back.png (100%) rename graphics/pokemon/{volcarona => gen_8/applin}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/applin/icon.png (100%) rename graphics/pokemon/{ => gen_8}/applin/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/applin/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/arctovish/back.png (100%) rename graphics/pokemon/{arctozolt => gen_8/arctovish}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/arctovish/front.png (100%) rename graphics/pokemon/{ => gen_8}/arctovish/icon.png (100%) rename graphics/pokemon/{ => gen_8}/arctovish/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/arctovish/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/arctozolt/back.png (100%) rename graphics/pokemon/{porygon2 => gen_8/arctozolt}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/arctozolt/front.png (100%) rename graphics/pokemon/{ => gen_8}/arctozolt/icon.png (100%) rename graphics/pokemon/{ => gen_8}/arctozolt/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/arctozolt/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/arrokuda/back.png (100%) rename graphics/pokemon/{voltorb => gen_8/arrokuda}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/arrokuda/front.png (100%) rename graphics/pokemon/{ => gen_8}/arrokuda/icon.png (100%) rename graphics/pokemon/{ => gen_8}/arrokuda/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/arrokuda/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/barraskewda/back.png (100%) rename graphics/pokemon/{wailmer => gen_8/barraskewda}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/barraskewda/front.png (100%) rename graphics/pokemon/{ => gen_8}/barraskewda/icon.png (100%) rename graphics/pokemon/{ => gen_8}/barraskewda/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/barraskewda/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/basculegion/back.png (100%) rename graphics/pokemon/{ => gen_8}/basculegion/female/back.png (100%) rename graphics/pokemon/{ => gen_8}/basculegion/female/front.png (100%) rename graphics/pokemon/{ => gen_8}/basculegion/female/icon.png (100%) rename graphics/pokemon/{ => gen_8}/basculegion/female/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/basculegion/female/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/basculegion/front.png (100%) rename graphics/pokemon/{ => gen_8}/basculegion/icon.png (100%) rename graphics/pokemon/{ => gen_8}/basculegion/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/basculegion/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/blipbug/back.png (100%) rename graphics/pokemon/{tsareena => gen_8/blipbug}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/blipbug/front.png (100%) rename graphics/pokemon/{ => gen_8}/blipbug/icon.png (100%) rename graphics/pokemon/{ => gen_8}/blipbug/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/blipbug/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/boltund/back.png (100%) rename graphics/pokemon/{flareon => gen_8/boltund}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/boltund/front.png (100%) rename graphics/pokemon/{ => gen_8}/boltund/icon.png (100%) rename graphics/pokemon/{ => gen_8}/boltund/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/boltund/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/calyrex/back.png (100%) rename graphics/pokemon/{venipede => gen_8/calyrex}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/calyrex/front.png (100%) rename graphics/pokemon/{ => gen_8}/calyrex/ice_rider/back.png (100%) rename graphics/pokemon/{ => gen_8}/calyrex/ice_rider/front.png (100%) rename graphics/pokemon/{ => gen_8}/calyrex/ice_rider/icon.png (100%) rename graphics/pokemon/{ => gen_8}/calyrex/ice_rider/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/calyrex/ice_rider/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/calyrex/icon.png (100%) rename graphics/pokemon/{ => gen_8}/calyrex/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/calyrex/shadow_rider/back.png (100%) rename graphics/pokemon/{ => gen_8}/calyrex/shadow_rider/front.png (100%) rename graphics/pokemon/{ => gen_8}/calyrex/shadow_rider/icon.png (100%) rename graphics/pokemon/{ => gen_8}/calyrex/shadow_rider/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/calyrex/shadow_rider/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/calyrex/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/carkol/anim_front.png (100%) rename graphics/pokemon/{ => gen_8}/carkol/back.png (100%) rename graphics/pokemon/{ => gen_8}/carkol/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/carkol/icon.png (100%) rename graphics/pokemon/{ => gen_8}/carkol/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/carkol/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/centiskorch/anim_front.png (100%) rename graphics/pokemon/{ => gen_8}/centiskorch/back.png (100%) rename graphics/pokemon/{weedle => gen_8/centiskorch}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/centiskorch/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/centiskorch/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/centiskorch/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/centiskorch/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/centiskorch/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/centiskorch/icon.png (100%) rename graphics/pokemon/{ => gen_8}/centiskorch/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/centiskorch/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/chewtle/anim_front.png (100%) rename graphics/pokemon/{ => gen_8}/chewtle/back.png (100%) rename graphics/pokemon/{clefairy => gen_8/chewtle}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/chewtle/icon.png (100%) rename graphics/pokemon/{ => gen_8}/chewtle/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/chewtle/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/cinderace/back.png (100%) rename graphics/pokemon/{ => gen_8}/cinderace/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/cinderace/front.png (100%) rename graphics/pokemon/{ => gen_8}/cinderace/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/cinderace/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/cinderace/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/cinderace/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/cinderace/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/cinderace/icon.png (100%) rename graphics/pokemon/{ => gen_8}/cinderace/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/cinderace/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/clobbopus/back.png (100%) rename graphics/pokemon/{poliwag => gen_8/clobbopus}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/clobbopus/front.png (100%) rename graphics/pokemon/{ => gen_8}/clobbopus/icon.png (100%) rename graphics/pokemon/{ => gen_8}/clobbopus/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/clobbopus/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/coalossal/anim_front.png (100%) rename graphics/pokemon/{ => gen_8}/coalossal/back.png (100%) rename graphics/pokemon/{ => gen_8}/coalossal/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/coalossal/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/coalossal/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/coalossal/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/coalossal/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/coalossal/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/coalossal/icon.png (100%) rename graphics/pokemon/{ => gen_8}/coalossal/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/coalossal/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/copperajah/back.png (100%) rename graphics/pokemon/{ => gen_8}/copperajah/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/copperajah/front.png (100%) rename graphics/pokemon/{ => gen_8}/copperajah/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/copperajah/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/copperajah/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/copperajah/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/copperajah/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/copperajah/icon.png (100%) rename graphics/pokemon/{ => gen_8}/copperajah/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/copperajah/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/corviknight/anim_front.png (100%) rename graphics/pokemon/{ => gen_8}/corviknight/back.png (100%) rename graphics/pokemon/{pidgeot => gen_8/corviknight}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/corviknight/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/corviknight/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/corviknight/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/corviknight/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/corviknight/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/corviknight/icon.png (100%) rename graphics/pokemon/{ => gen_8}/corviknight/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/corviknight/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/corvisquire/anim_front.png (100%) rename graphics/pokemon/{ => gen_8}/corvisquire/back.png (100%) rename graphics/pokemon/{pidgeotto => gen_8/corvisquire}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/corvisquire/icon.png (100%) rename graphics/pokemon/{ => gen_8}/corvisquire/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/corvisquire/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/cramorant/back.png (100%) rename graphics/pokemon/{psyduck => gen_8/cramorant}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/cramorant/front.png (100%) rename graphics/pokemon/{ => gen_8}/cramorant/gorging/back.png (100%) rename graphics/pokemon/{ => gen_8}/cramorant/gorging/front.png (100%) rename graphics/pokemon/{ => gen_8}/cramorant/gorging/icon.png (100%) rename graphics/pokemon/{ => gen_8}/cramorant/gorging/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/cramorant/gorging/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/cramorant/gulping/back.png (100%) rename graphics/pokemon/{ => gen_8}/cramorant/gulping/front.png (100%) rename graphics/pokemon/{ => gen_8}/cramorant/gulping/icon.png (100%) rename graphics/pokemon/{ => gen_8}/cramorant/gulping/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/cramorant/gulping/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/cramorant/icon.png (100%) rename graphics/pokemon/{ => gen_8}/cramorant/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/cramorant/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/cufant/back.png (100%) rename graphics/pokemon/{cyndaquil => gen_8/cufant}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/cufant/front.png (100%) rename graphics/pokemon/{ => gen_8}/cufant/icon.png (100%) rename graphics/pokemon/{ => gen_8}/cufant/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/cufant/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/cursola/back.png (100%) rename graphics/pokemon/{falinks => gen_8/cursola}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/cursola/front.png (100%) rename graphics/pokemon/{ => gen_8}/cursola/icon.png (100%) rename graphics/pokemon/{ => gen_8}/cursola/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/cursola/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/dottler/back.png (100%) rename graphics/pokemon/{jumpluff => gen_8/dottler}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/dottler/front.png (100%) rename graphics/pokemon/{ => gen_8}/dottler/icon.png (100%) rename graphics/pokemon/{ => gen_8}/dottler/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/dottler/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/dracovish/back.png (100%) rename graphics/pokemon/{dracozolt => gen_8/dracovish}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/dracovish/front.png (100%) rename graphics/pokemon/{ => gen_8}/dracovish/icon.png (100%) rename graphics/pokemon/{ => gen_8}/dracovish/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/dracovish/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/dracozolt/back.png (100%) rename graphics/pokemon/{dragonite => gen_8/dracozolt}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/dracozolt/front.png (100%) rename graphics/pokemon/{ => gen_8}/dracozolt/icon.png (100%) rename graphics/pokemon/{ => gen_8}/dracozolt/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/dracozolt/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/dragapult/back.png (100%) rename graphics/pokemon/{ => gen_8}/dragapult/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/dragapult/front.png (100%) rename graphics/pokemon/{ => gen_8}/dragapult/icon.png (100%) rename graphics/pokemon/{ => gen_8}/dragapult/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/dragapult/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/drakloak/back.png (100%) rename graphics/pokemon/{whimsicott => gen_8/drakloak}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/drakloak/front.png (100%) rename graphics/pokemon/{ => gen_8}/drakloak/icon.png (100%) rename graphics/pokemon/{ => gen_8}/drakloak/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/drakloak/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/drednaw/anim_front.png (100%) rename graphics/pokemon/{ => gen_8}/drednaw/back.png (100%) rename graphics/pokemon/{ivysaur => gen_8/drednaw}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/drednaw/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/drednaw/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/drednaw/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/drednaw/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/drednaw/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/drednaw/icon.png (100%) rename graphics/pokemon/{ => gen_8}/drednaw/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/drednaw/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/dreepy/back.png (100%) rename graphics/pokemon/{wailord => gen_8/dreepy}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/dreepy/front.png (100%) rename graphics/pokemon/{ => gen_8}/dreepy/icon.png (100%) rename graphics/pokemon/{ => gen_8}/dreepy/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/dreepy/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/drizzile/back.png (100%) rename graphics/pokemon/{ => gen_8}/drizzile/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/drizzile/front.png (100%) rename graphics/pokemon/{ => gen_8}/drizzile/icon.png (100%) rename graphics/pokemon/{ => gen_8}/drizzile/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/drizzile/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/dubwool/back.png (100%) rename graphics/pokemon/{ => gen_8}/dubwool/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/dubwool/front.png (100%) rename graphics/pokemon/{ => gen_8}/dubwool/icon.png (100%) rename graphics/pokemon/{ => gen_8}/dubwool/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/dubwool/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/duraludon/back.png (100%) rename graphics/pokemon/{ => gen_8}/duraludon/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/duraludon/front.png (100%) rename graphics/pokemon/{ => gen_8}/duraludon/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/duraludon/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/duraludon/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/duraludon/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/duraludon/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/duraludon/icon.png (100%) rename graphics/pokemon/{ => gen_8}/duraludon/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/duraludon/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/eiscue/back.png (100%) rename graphics/pokemon/{ => gen_8}/eiscue/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/eiscue/front.png (100%) rename graphics/pokemon/{ => gen_8}/eiscue/icon.png (100%) rename graphics/pokemon/{ => gen_8}/eiscue/noice_face/back.png (100%) rename graphics/pokemon/{ => gen_8}/eiscue/noice_face/front.png (100%) rename graphics/pokemon/{ => gen_8}/eiscue/noice_face/icon.png (100%) rename graphics/pokemon/{ => gen_8}/eiscue/noice_face/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/eiscue/noice_face/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/eiscue/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/eiscue/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/eldegoss/back.png (100%) rename graphics/pokemon/{walrein => gen_8/eldegoss}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/eldegoss/front.png (100%) rename graphics/pokemon/{ => gen_8}/eldegoss/icon.png (100%) rename graphics/pokemon/{ => gen_8}/eldegoss/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/eldegoss/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/enamorus/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_8}/enamorus/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_8}/enamorus/icon.png (100%) rename graphics/pokemon/{ => gen_8}/enamorus/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_8}/enamorus/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/enamorus/therian/back.png (100%) rename graphics/pokemon/{ => gen_8}/enamorus/therian/front.png (100%) rename graphics/pokemon/{ => gen_8}/enamorus/therian/icon.png (100%) rename graphics/pokemon/{ => gen_8}/enamorus/therian/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/enamorus/therian/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/eternatus/back.png (100%) rename graphics/pokemon/{ => gen_8}/eternatus/eternamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/eternatus/eternamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/eternatus/eternamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/eternatus/eternamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/eternatus/eternamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/eternatus/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/eternatus/front.png (100%) rename graphics/pokemon/{ => gen_8}/eternatus/icon.png (100%) rename graphics/pokemon/{ => gen_8}/eternatus/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/eternatus/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/falinks/back.png (100%) rename graphics/pokemon/{mime_jr => gen_8/falinks}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/falinks/front.png (100%) rename graphics/pokemon/{ => gen_8}/falinks/icon.png (100%) rename graphics/pokemon/{ => gen_8}/falinks/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/falinks/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/flapple/anim_front.png (100%) rename graphics/pokemon/{ => gen_8}/flapple/back.png (100%) rename graphics/pokemon/{weepinbell => gen_8/flapple}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/flapple/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/flapple/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/flapple/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/flapple/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/flapple/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/flapple/icon.png (100%) rename graphics/pokemon/{ => gen_8}/flapple/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/flapple/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/frosmoth/back.png (100%) rename graphics/pokemon/{weezing => gen_8/frosmoth}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/frosmoth/front.png (100%) rename graphics/pokemon/{ => gen_8}/frosmoth/icon.png (100%) rename graphics/pokemon/{ => gen_8}/frosmoth/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/frosmoth/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/glastrier/back.png (100%) rename graphics/pokemon/{ => gen_8}/glastrier/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/glastrier/front.png (100%) rename graphics/pokemon/{ => gen_8}/glastrier/icon.png (100%) rename graphics/pokemon/{ => gen_8}/glastrier/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/glastrier/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/gossifleur/back.png (100%) rename graphics/pokemon/{paras => gen_8/gossifleur}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/gossifleur/front.png (100%) rename graphics/pokemon/{ => gen_8}/gossifleur/icon.png (100%) rename graphics/pokemon/{ => gen_8}/gossifleur/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/gossifleur/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/grapploct/back.png (100%) rename graphics/pokemon/{octillery => gen_8/grapploct}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/grapploct/front.png (100%) rename graphics/pokemon/{ => gen_8}/grapploct/icon.png (100%) rename graphics/pokemon/{ => gen_8}/grapploct/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/grapploct/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/greedent/back.png (100%) rename graphics/pokemon/{ => gen_8}/greedent/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/greedent/front.png (100%) rename graphics/pokemon/{ => gen_8}/greedent/icon.png (100%) rename graphics/pokemon/{ => gen_8}/greedent/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/greedent/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/grimmsnarl/back.png (100%) rename graphics/pokemon/{ => gen_8}/grimmsnarl/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/grimmsnarl/front.png (100%) rename graphics/pokemon/{ => gen_8}/grimmsnarl/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/grimmsnarl/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/grimmsnarl/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/grimmsnarl/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/grimmsnarl/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/grimmsnarl/icon.png (100%) rename graphics/pokemon/{ => gen_8}/grimmsnarl/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/grimmsnarl/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/grookey/back.png (100%) rename graphics/pokemon/{ => gen_8}/grookey/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/grookey/front.png (100%) rename graphics/pokemon/{ => gen_8}/grookey/icon.png (100%) rename graphics/pokemon/{ => gen_8}/grookey/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/grookey/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/hatenna/back.png (100%) rename graphics/pokemon/{morpeko => gen_8/hatenna}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/hatenna/front.png (100%) rename graphics/pokemon/{ => gen_8}/hatenna/icon.png (100%) rename graphics/pokemon/{ => gen_8}/hatenna/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/hatenna/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/hatterene/back.png (100%) rename graphics/pokemon/{whirlipede => gen_8/hatterene}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/hatterene/front.png (100%) rename graphics/pokemon/{ => gen_8}/hatterene/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/hatterene/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/hatterene/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/hatterene/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/hatterene/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/hatterene/icon.png (100%) rename graphics/pokemon/{ => gen_8}/hatterene/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/hatterene/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/hattrem/back.png (100%) rename graphics/pokemon/{wimpod => gen_8/hattrem}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/hattrem/front.png (100%) rename graphics/pokemon/{ => gen_8}/hattrem/icon.png (100%) rename graphics/pokemon/{ => gen_8}/hattrem/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/hattrem/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/impidimp/back.png (100%) rename graphics/pokemon/{shiinotic => gen_8/impidimp}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/impidimp/front.png (100%) rename graphics/pokemon/{ => gen_8}/impidimp/icon.png (100%) rename graphics/pokemon/{ => gen_8}/impidimp/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/impidimp/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/indeedee/back.png (100%) rename graphics/pokemon/{ => gen_8}/indeedee/female/back.png (100%) rename graphics/pokemon/{ => gen_8}/indeedee/female/front.png (100%) rename graphics/pokemon/{ => gen_8}/indeedee/female/icon.png (100%) rename graphics/pokemon/{ => gen_8}/indeedee/female/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/indeedee/female/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/indeedee/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/indeedee/front.png (100%) rename graphics/pokemon/{ => gen_8}/indeedee/icon.png (100%) rename graphics/pokemon/{ => gen_8}/indeedee/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/indeedee/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/inteleon/back.png (100%) rename graphics/pokemon/{ => gen_8}/inteleon/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/inteleon/front.png (100%) rename graphics/pokemon/{ => gen_8}/inteleon/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/inteleon/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/inteleon/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/inteleon/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/inteleon/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/inteleon/icon.png (100%) rename graphics/pokemon/{ => gen_8}/inteleon/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/inteleon/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/kleavor/back.png (100%) rename graphics/pokemon/{ => gen_8}/kleavor/front.png (100%) rename graphics/pokemon/{ => gen_8}/kleavor/icon.png (100%) rename graphics/pokemon/{ => gen_8}/kleavor/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/kleavor/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/kubfu/back.png (100%) rename graphics/pokemon/{ => gen_8}/kubfu/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/kubfu/front.png (100%) rename graphics/pokemon/{ => gen_8}/kubfu/icon.png (100%) rename graphics/pokemon/{ => gen_8}/kubfu/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/kubfu/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/milcery/back.png (100%) rename graphics/pokemon/{whiscash => gen_8/milcery}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/milcery/front.png (100%) rename graphics/pokemon/{ => gen_8}/milcery/icon.png (100%) rename graphics/pokemon/{ => gen_8}/milcery/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/milcery/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/morgrem/back.png (100%) rename graphics/pokemon/{ => gen_8}/morgrem/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/morgrem/front.png (100%) rename graphics/pokemon/{ => gen_8}/morgrem/icon.png (100%) rename graphics/pokemon/{ => gen_8}/morgrem/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/morgrem/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/morpeko/back.png (100%) rename graphics/pokemon/{togedemaru => gen_8/morpeko}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/morpeko/front.png (100%) rename graphics/pokemon/{ => gen_8}/morpeko/hangry/back.png (100%) rename graphics/pokemon/{ => gen_8}/morpeko/hangry/front.png (100%) rename graphics/pokemon/{ => gen_8}/morpeko/hangry/icon.png (100%) rename graphics/pokemon/{ => gen_8}/morpeko/hangry/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/morpeko/hangry/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/morpeko/icon.png (100%) rename graphics/pokemon/{ => gen_8}/morpeko/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/morpeko/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/mr_rime/back.png (100%) rename graphics/pokemon/{ => gen_8}/mr_rime/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/mr_rime/front.png (100%) rename graphics/pokemon/{ => gen_8}/mr_rime/icon.png (100%) rename graphics/pokemon/{ => gen_8}/mr_rime/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/mr_rime/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/nickit/back.png (100%) rename graphics/pokemon/{ => gen_8}/nickit/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/nickit/front.png (100%) rename graphics/pokemon/{ => gen_8}/nickit/icon.png (100%) rename graphics/pokemon/{ => gen_8}/nickit/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/nickit/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/obstagoon/back.png (100%) rename graphics/pokemon/{ => gen_8}/obstagoon/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/obstagoon/front.png (100%) rename graphics/pokemon/{ => gen_8}/obstagoon/icon.png (100%) rename graphics/pokemon/{ => gen_8}/obstagoon/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/obstagoon/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/orbeetle/back.png (100%) rename graphics/pokemon/{ => gen_8}/orbeetle/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/orbeetle/front.png (100%) rename graphics/pokemon/{ => gen_8}/orbeetle/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/orbeetle/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/orbeetle/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/orbeetle/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/orbeetle/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/orbeetle/icon.png (100%) rename graphics/pokemon/{ => gen_8}/orbeetle/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/orbeetle/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/overqwil/back.png (100%) rename graphics/pokemon/{ => gen_8}/overqwil/front.png (100%) rename graphics/pokemon/{ => gen_8}/overqwil/icon.png (100%) rename graphics/pokemon/{ => gen_8}/overqwil/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/overqwil/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/perrserker/back.png (100%) rename graphics/pokemon/{ => gen_8}/perrserker/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/perrserker/front.png (100%) rename graphics/pokemon/{ => gen_8}/perrserker/icon.png (100%) rename graphics/pokemon/{ => gen_8}/perrserker/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/perrserker/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/pincurchin/anim_front.png (100%) rename graphics/pokemon/{ => gen_8}/pincurchin/back.png (100%) rename graphics/pokemon/{spinarak => gen_8/pincurchin}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/pincurchin/icon.png (100%) rename graphics/pokemon/{ => gen_8}/pincurchin/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/pincurchin/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/polteageist/back.png (100%) rename graphics/pokemon/{xerneas => gen_8/polteageist}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/polteageist/front.png (100%) rename graphics/pokemon/{ => gen_8}/polteageist/icon.png (100%) rename graphics/pokemon/{ => gen_8}/polteageist/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/polteageist/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/raboot/back.png (100%) rename graphics/pokemon/{ => gen_8}/raboot/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/raboot/front.png (100%) rename graphics/pokemon/{ => gen_8}/raboot/icon.png (100%) rename graphics/pokemon/{ => gen_8}/raboot/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/raboot/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/regidrago/back.png (100%) rename graphics/pokemon/{ => gen_8}/regidrago/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/regidrago/front.png (100%) rename graphics/pokemon/{ => gen_8}/regidrago/icon.png (100%) rename graphics/pokemon/{ => gen_8}/regidrago/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/regidrago/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/regieleki/back.png (100%) rename graphics/pokemon/{spritzee => gen_8/regieleki}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/regieleki/front.png (100%) rename graphics/pokemon/{ => gen_8}/regieleki/icon.png (100%) rename graphics/pokemon/{ => gen_8}/regieleki/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/regieleki/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/rillaboom/back.png (100%) rename graphics/pokemon/{ => gen_8}/rillaboom/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/rillaboom/front.png (100%) rename graphics/pokemon/{ => gen_8}/rillaboom/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/rillaboom/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/rillaboom/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/rillaboom/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/rillaboom/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/rillaboom/icon.png (100%) rename graphics/pokemon/{ => gen_8}/rillaboom/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/rillaboom/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/rolycoly/anim_front.png (100%) rename graphics/pokemon/{ => gen_8}/rolycoly/back.png (100%) rename graphics/pokemon/{ => gen_8}/rolycoly/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/rolycoly/icon.png (100%) rename graphics/pokemon/{ => gen_8}/rolycoly/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/rolycoly/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/rookidee/anim_front.png (100%) rename graphics/pokemon/{ => gen_8}/rookidee/back.png (100%) rename graphics/pokemon/{spearow => gen_8/rookidee}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/rookidee/icon.png (100%) rename graphics/pokemon/{ => gen_8}/rookidee/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/rookidee/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/runerigus/back.png (100%) rename graphics/pokemon/{wishiwashi => gen_8/runerigus}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/runerigus/front.png (100%) rename graphics/pokemon/{ => gen_8}/runerigus/icon.png (100%) rename graphics/pokemon/{ => gen_8}/runerigus/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/runerigus/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/sandaconda/back.png (100%) rename graphics/pokemon/{woobat => gen_8/sandaconda}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/sandaconda/front.png (100%) rename graphics/pokemon/{ => gen_8}/sandaconda/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/sandaconda/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/sandaconda/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/sandaconda/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/sandaconda/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/sandaconda/icon.png (100%) rename graphics/pokemon/{ => gen_8}/sandaconda/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/sandaconda/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/scorbunny/back.png (100%) rename graphics/pokemon/{ => gen_8}/scorbunny/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/scorbunny/front.png (100%) rename graphics/pokemon/{ => gen_8}/scorbunny/icon.png (100%) rename graphics/pokemon/{ => gen_8}/scorbunny/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/scorbunny/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/silicobra/back.png (100%) rename graphics/pokemon/{wormadam/plant => gen_8/silicobra}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/silicobra/front.png (100%) rename graphics/pokemon/{ => gen_8}/silicobra/icon.png (100%) rename graphics/pokemon/{ => gen_8}/silicobra/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/silicobra/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/sinistea/back.png (100%) rename graphics/pokemon/{yamask => gen_8/sinistea}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/sinistea/front.png (100%) rename graphics/pokemon/{ => gen_8}/sinistea/icon.png (100%) rename graphics/pokemon/{ => gen_8}/sinistea/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/sinistea/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/sirfetchd/back.png (100%) rename graphics/pokemon/{ => gen_8}/sirfetchd/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/sirfetchd/front.png (100%) rename graphics/pokemon/{ => gen_8}/sirfetchd/icon.png (100%) rename graphics/pokemon/{ => gen_8}/sirfetchd/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/sirfetchd/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/sizzlipede/anim_front.png (100%) rename graphics/pokemon/{ => gen_8}/sizzlipede/back.png (100%) rename graphics/pokemon/{venomoth => gen_8/sizzlipede}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/sizzlipede/icon.png (100%) rename graphics/pokemon/{ => gen_8}/sizzlipede/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/sizzlipede/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/skwovet/back.png (100%) rename graphics/pokemon/{ => gen_8}/skwovet/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/skwovet/front.png (100%) rename graphics/pokemon/{ => gen_8}/skwovet/icon.png (100%) rename graphics/pokemon/{ => gen_8}/skwovet/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/skwovet/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/sneasler/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_8}/sneasler/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_8}/sneasler/icon.png (100%) rename graphics/pokemon/{ => gen_8}/sneasler/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_8}/sneasler/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_8}/snom/back.png (100%) rename graphics/pokemon/{zubat => gen_8/snom}/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/snom/front.png (100%) rename graphics/pokemon/{ => gen_8}/snom/icon.png (100%) rename graphics/pokemon/{ => gen_8}/snom/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/snom/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/sobble/back.png (100%) rename graphics/pokemon/{ => gen_8}/sobble/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/sobble/front.png (100%) rename graphics/pokemon/{ => gen_8}/sobble/icon.png (100%) rename graphics/pokemon/{ => gen_8}/sobble/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/sobble/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/spectrier/back.png (100%) rename graphics/pokemon/{ => gen_8}/spectrier/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/spectrier/front.png (100%) rename graphics/pokemon/{ => gen_8}/spectrier/icon.png (100%) rename graphics/pokemon/{ => gen_8}/spectrier/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/spectrier/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/stonjourner/back.png (100%) rename graphics/pokemon/{ => gen_8}/stonjourner/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/stonjourner/front.png (100%) rename graphics/pokemon/{ => gen_8}/stonjourner/icon.png (100%) rename graphics/pokemon/{ => gen_8}/stonjourner/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/stonjourner/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/thievul/back.png (100%) rename graphics/pokemon/{ => gen_8}/thievul/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/thievul/front.png (100%) rename graphics/pokemon/{ => gen_8}/thievul/icon.png (100%) rename graphics/pokemon/{ => gen_8}/thievul/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/thievul/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/thwackey/back.png (100%) rename graphics/pokemon/{ => gen_8}/thwackey/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/thwackey/front.png (100%) rename graphics/pokemon/{ => gen_8}/thwackey/icon.png (100%) rename graphics/pokemon/{ => gen_8}/thwackey/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/thwackey/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/toxel/back.png (100%) rename graphics/pokemon/{ => gen_8}/toxel/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/toxel/front.png (100%) rename graphics/pokemon/{ => gen_8}/toxel/icon.png (100%) rename graphics/pokemon/{ => gen_8}/toxel/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/toxel/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/back.png (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/front.png (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/icon.png (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/low_key/back.png (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/low_key/front.png (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/low_key/icon.png (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/low_key/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/low_key/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/toxtricity/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/ursaluna/back.png (100%) rename graphics/pokemon/{ => gen_8}/ursaluna/bloodmoon/back.png (100%) rename graphics/pokemon/{ => gen_8}/ursaluna/bloodmoon/front.png (100%) rename graphics/pokemon/{ => gen_8}/ursaluna/bloodmoon/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/ursaluna/bloodmoon/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/ursaluna/front.png (100%) rename graphics/pokemon/{ => gen_8}/ursaluna/icon.png (100%) rename graphics/pokemon/{ => gen_8}/ursaluna/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/ursaluna/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/urshifu/back.png (100%) rename graphics/pokemon/{ => gen_8}/urshifu/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/urshifu/front.png (100%) rename graphics/pokemon/{ => gen_8}/urshifu/icon.png (100%) rename graphics/pokemon/{ => gen_8}/urshifu/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/urshifu/rapid_strike_style/back.png (100%) rename graphics/pokemon/{ => gen_8}/urshifu/rapid_strike_style/front.png (100%) rename graphics/pokemon/{ => gen_8}/urshifu/rapid_strike_style/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/urshifu/rapid_strike_style/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/urshifu/rapid_strike_style_gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/urshifu/rapid_strike_style_gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/urshifu/rapid_strike_style_gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/urshifu/rapid_strike_style_gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/urshifu/rapid_strike_style_gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/urshifu/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/urshifu/single_strike_style_gigantamax/back.png (100%) rename graphics/pokemon/{ => gen_8}/urshifu/single_strike_style_gigantamax/front.png (100%) rename graphics/pokemon/{ => gen_8}/urshifu/single_strike_style_gigantamax/icon.png (100%) rename graphics/pokemon/{ => gen_8}/urshifu/single_strike_style_gigantamax/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/urshifu/single_strike_style_gigantamax/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/wooloo/back.png (100%) rename graphics/pokemon/{ => gen_8}/wooloo/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/wooloo/front.png (100%) rename graphics/pokemon/{ => gen_8}/wooloo/icon.png (100%) rename graphics/pokemon/{ => gen_8}/wooloo/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/wooloo/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/wyrdeer/back.png (100%) rename graphics/pokemon/{ => gen_8}/wyrdeer/front.png (100%) rename graphics/pokemon/{ => gen_8}/wyrdeer/icon.png (100%) rename graphics/pokemon/{ => gen_8}/wyrdeer/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/wyrdeer/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/yamper/back.png (100%) rename graphics/pokemon/{ => gen_8}/yamper/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/yamper/front.png (100%) rename graphics/pokemon/{ => gen_8}/yamper/icon.png (100%) rename graphics/pokemon/{ => gen_8}/yamper/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/yamper/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/zacian/back.png (100%) rename graphics/pokemon/{ => gen_8}/zacian/crowned_sword/back.png (100%) rename graphics/pokemon/{ => gen_8}/zacian/crowned_sword/front.png (100%) rename graphics/pokemon/{ => gen_8}/zacian/crowned_sword/icon.png (100%) rename graphics/pokemon/{ => gen_8}/zacian/crowned_sword/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/zacian/crowned_sword/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/zacian/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/zacian/front.png (100%) rename graphics/pokemon/{ => gen_8}/zacian/icon.png (100%) rename graphics/pokemon/{ => gen_8}/zacian/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/zacian/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/zamazenta/back.png (100%) rename graphics/pokemon/{ => gen_8}/zamazenta/crowned_shield/back.png (100%) rename graphics/pokemon/{ => gen_8}/zamazenta/crowned_shield/front.png (100%) rename graphics/pokemon/{ => gen_8}/zamazenta/crowned_shield/icon.png (100%) rename graphics/pokemon/{ => gen_8}/zamazenta/crowned_shield/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/zamazenta/crowned_shield/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/zamazenta/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/zamazenta/front.png (100%) rename graphics/pokemon/{ => gen_8}/zamazenta/icon.png (100%) rename graphics/pokemon/{ => gen_8}/zamazenta/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/zamazenta/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/zarude/back.png (100%) rename graphics/pokemon/{ => gen_8}/zarude/dada/back.png (100%) rename graphics/pokemon/{ => gen_8}/zarude/dada/front.png (100%) rename graphics/pokemon/{ => gen_8}/zarude/dada/icon.png (100%) rename graphics/pokemon/{ => gen_8}/zarude/dada/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/zarude/dada/shiny.pal (100%) rename graphics/pokemon/{ => gen_8}/zarude/footprint.png (100%) rename graphics/pokemon/{ => gen_8}/zarude/front.png (100%) rename graphics/pokemon/{ => gen_8}/zarude/icon.png (100%) rename graphics/pokemon/{ => gen_8}/zarude/normal.pal (100%) rename graphics/pokemon/{ => gen_8}/zarude/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/annihilape/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/annihilape/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/annihilape/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/annihilape/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/annihilape/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/arboliva/back.png (100%) rename graphics/pokemon/{ => gen_9}/arboliva/front.png (100%) rename graphics/pokemon/{ => gen_9}/arboliva/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/arboliva/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/arboliva/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/arctibax/back.png (100%) rename graphics/pokemon/{ => gen_9}/arctibax/front.png (100%) rename graphics/pokemon/{ => gen_9}/arctibax/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/arctibax/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/arctibax/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/armarouge/back.png (100%) rename graphics/pokemon/{ => gen_9}/armarouge/front.png (100%) rename graphics/pokemon/{ => gen_9}/armarouge/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/armarouge/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/armarouge/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/baxcalibur/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/baxcalibur/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/baxcalibur/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/baxcalibur/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/baxcalibur/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/bellibolt/back.png (100%) rename graphics/pokemon/{ => gen_9}/bellibolt/front.png (100%) rename graphics/pokemon/{ => gen_9}/bellibolt/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/bellibolt/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/bellibolt/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/bombirdier/back.png (100%) rename graphics/pokemon/{ => gen_9}/bombirdier/front.png (100%) rename graphics/pokemon/{ => gen_9}/bombirdier/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/bombirdier/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/bombirdier/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/brambleghast/back.png (100%) rename graphics/pokemon/{ => gen_9}/brambleghast/front.png (100%) rename graphics/pokemon/{ => gen_9}/brambleghast/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/brambleghast/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/brambleghast/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/bramblin/back.png (100%) rename graphics/pokemon/{ => gen_9}/bramblin/front.png (100%) rename graphics/pokemon/{ => gen_9}/bramblin/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/bramblin/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/bramblin/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/brute_bonnet/back.png (100%) rename graphics/pokemon/{ => gen_9}/brute_bonnet/front.png (100%) rename graphics/pokemon/{ => gen_9}/brute_bonnet/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/brute_bonnet/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/brute_bonnet/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/capsakid/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/capsakid/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/capsakid/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/capsakid/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/capsakid/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/ceruledge/back.png (100%) rename graphics/pokemon/{ => gen_9}/ceruledge/front.png (100%) rename graphics/pokemon/{ => gen_9}/ceruledge/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/ceruledge/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/ceruledge/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/cetitan/back.png (100%) rename graphics/pokemon/{ => gen_9}/cetitan/front.png (100%) rename graphics/pokemon/{ => gen_9}/cetitan/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/cetitan/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/cetitan/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/cetoddle/back.png (100%) rename graphics/pokemon/{ => gen_9}/cetoddle/front.png (100%) rename graphics/pokemon/{ => gen_9}/cetoddle/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/cetoddle/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/cetoddle/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/charcadet/back.png (100%) rename graphics/pokemon/{ => gen_9}/charcadet/front.png (100%) rename graphics/pokemon/{ => gen_9}/charcadet/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/charcadet/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/charcadet/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/chi_yu/back.png (100%) rename graphics/pokemon/{ => gen_9}/chi_yu/front.png (100%) rename graphics/pokemon/{ => gen_9}/chi_yu/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/chi_yu/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/chi_yu/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/chien_pao/back.png (100%) rename graphics/pokemon/{ => gen_9}/chien_pao/front.png (100%) rename graphics/pokemon/{ => gen_9}/chien_pao/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/chien_pao/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/chien_pao/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/clodsire/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/clodsire/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/clodsire/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/clodsire/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/clodsire/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/crocalor/back.png (100%) rename graphics/pokemon/{ => gen_9}/crocalor/front.png (100%) rename graphics/pokemon/{ => gen_9}/crocalor/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/crocalor/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/crocalor/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/cyclizar/back.png (100%) rename graphics/pokemon/{ => gen_9}/cyclizar/front.png (100%) rename graphics/pokemon/{ => gen_9}/cyclizar/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/cyclizar/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/cyclizar/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/dachsbun/back.png (100%) rename graphics/pokemon/{ => gen_9}/dachsbun/front.png (100%) rename graphics/pokemon/{ => gen_9}/dachsbun/icon.png (100%) rename graphics/pokemon/{ => gen_9}/dachsbun/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/dachsbun/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/dipplin/back.png (100%) rename graphics/pokemon/{ => gen_9}/dipplin/front.png (100%) rename graphics/pokemon/{ => gen_9}/dipplin/icon.png (100%) rename graphics/pokemon/{ => gen_9}/dipplin/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/dipplin/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/dolliv/back.png (100%) rename graphics/pokemon/{ => gen_9}/dolliv/front.png (100%) rename graphics/pokemon/{ => gen_9}/dolliv/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/dolliv/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/dolliv/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/dondozo/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/dondozo/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/dondozo/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/dondozo/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/dondozo/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/dudunsparce/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/dudunsparce/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/dudunsparce/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/dudunsparce/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/dudunsparce/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/dudunsparce/three_segment/back.png (100%) rename graphics/pokemon/{ => gen_9}/dudunsparce/three_segment/front.png (100%) rename graphics/pokemon/{ => gen_9}/espathra/back.png (100%) rename graphics/pokemon/{ => gen_9}/espathra/front.png (100%) rename graphics/pokemon/{ => gen_9}/espathra/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/espathra/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/espathra/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/farigiraf/back.png (100%) rename graphics/pokemon/{ => gen_9}/farigiraf/front.png (100%) rename graphics/pokemon/{ => gen_9}/farigiraf/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/farigiraf/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/farigiraf/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/fezandipiti/back.png (100%) rename graphics/pokemon/{ => gen_9}/fezandipiti/front.png (100%) rename graphics/pokemon/{ => gen_9}/fezandipiti/icon.png (100%) rename graphics/pokemon/{ => gen_9}/fezandipiti/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/fezandipiti/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/fidough/back.png (100%) rename graphics/pokemon/{ => gen_9}/fidough/front.png (100%) rename graphics/pokemon/{ => gen_9}/fidough/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/fidough/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/fidough/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/finizen/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/finizen/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/finizen/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/finizen/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/finizen/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/flamigo/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/flamigo/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/flamigo/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/flamigo/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/flamigo/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/flittle/back.png (100%) rename graphics/pokemon/{ => gen_9}/flittle/front.png (100%) rename graphics/pokemon/{ => gen_9}/flittle/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/flittle/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/flittle/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/floragato/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/floragato/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/floragato/icon.png (100%) rename graphics/pokemon/{ => gen_9}/floragato/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/floragato/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/flutter_mane/back.png (100%) rename graphics/pokemon/{ => gen_9}/flutter_mane/front.png (100%) rename graphics/pokemon/{ => gen_9}/flutter_mane/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/flutter_mane/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/flutter_mane/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/frigibax/anim_front.png (100%) rename graphics/pokemon/{ => gen_9}/frigibax/back.png (100%) rename graphics/pokemon/{ => gen_9}/frigibax/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/frigibax/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/frigibax/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/fuecoco/back.png (100%) rename graphics/pokemon/{ => gen_9}/fuecoco/front.png (100%) rename graphics/pokemon/{ => gen_9}/fuecoco/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/fuecoco/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/fuecoco/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/garganacl/back.png (100%) rename graphics/pokemon/{ => gen_9}/garganacl/front.png (100%) rename graphics/pokemon/{ => gen_9}/garganacl/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/garganacl/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/garganacl/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/gholdengo/back.png (100%) rename graphics/pokemon/{ => gen_9}/gholdengo/front.png (100%) rename graphics/pokemon/{ => gen_9}/gholdengo/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/gholdengo/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/gholdengo/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/gimmighoul/back.png (100%) rename graphics/pokemon/{ => gen_9}/gimmighoul/front.png (100%) rename graphics/pokemon/{ => gen_9}/gimmighoul/icon.png (100%) rename graphics/pokemon/{ => gen_9}/gimmighoul/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/gimmighoul/roaming/back.png (100%) rename graphics/pokemon/{ => gen_9}/gimmighoul/roaming/front.png (100%) rename graphics/pokemon/{ => gen_9}/gimmighoul/roaming/icon.png (100%) rename graphics/pokemon/{ => gen_9}/gimmighoul/roaming/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/gimmighoul/roaming/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/gimmighoul/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/glimmet/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/glimmet/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/glimmet/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/glimmet/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/glimmet/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/glimmora/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/glimmora/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/glimmora/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/glimmora/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/glimmora/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/grafaiai/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/grafaiai/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/grafaiai/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/grafaiai/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/grafaiai/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/great_tusk/anim_front.png (100%) rename graphics/pokemon/{ => gen_9}/great_tusk/back.png (100%) rename graphics/pokemon/{ => gen_9}/great_tusk/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/great_tusk/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/great_tusk/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/greavard/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/greavard/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/greavard/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/greavard/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/greavard/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/houndstone/back.png (100%) rename graphics/pokemon/{ => gen_9}/houndstone/front.png (100%) rename graphics/pokemon/{ => gen_9}/houndstone/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/houndstone/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/houndstone/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_bundle/back.png (100%) rename graphics/pokemon/{ => gen_9}/iron_bundle/front.png (100%) rename graphics/pokemon/{ => gen_9}/iron_bundle/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/iron_bundle/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_bundle/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_hands/back.png (100%) rename graphics/pokemon/{ => gen_9}/iron_hands/front.png (100%) rename graphics/pokemon/{ => gen_9}/iron_hands/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/iron_hands/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_hands/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_jugulis/back.png (100%) rename graphics/pokemon/{ => gen_9}/iron_jugulis/front.png (100%) rename graphics/pokemon/{ => gen_9}/iron_jugulis/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/iron_jugulis/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_jugulis/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_leaves/back.png (100%) rename graphics/pokemon/{ => gen_9}/iron_leaves/front.png (100%) rename graphics/pokemon/{ => gen_9}/iron_leaves/icon.png (100%) rename graphics/pokemon/{ => gen_9}/iron_leaves/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_leaves/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_moth/back.png (100%) rename graphics/pokemon/{ => gen_9}/iron_moth/front.png (100%) rename graphics/pokemon/{ => gen_9}/iron_moth/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/iron_moth/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_moth/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_thorns/back.png (100%) rename graphics/pokemon/{ => gen_9}/iron_thorns/front.png (100%) rename graphics/pokemon/{ => gen_9}/iron_thorns/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/iron_thorns/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_thorns/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_treads/back.png (100%) rename graphics/pokemon/{ => gen_9}/iron_treads/front.png (100%) rename graphics/pokemon/{ => gen_9}/iron_treads/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/iron_treads/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_treads/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_valiant/back.png (100%) rename graphics/pokemon/{ => gen_9}/iron_valiant/front.png (100%) rename graphics/pokemon/{ => gen_9}/iron_valiant/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/iron_valiant/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/iron_valiant/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/kilowattrel/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/kilowattrel/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/kilowattrel/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/kilowattrel/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/kilowattrel/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/kingambit/back.png (100%) rename graphics/pokemon/{ => gen_9}/kingambit/front.png (100%) rename graphics/pokemon/{ => gen_9}/kingambit/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/kingambit/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/kingambit/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/klawf/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/klawf/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/klawf/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/klawf/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/klawf/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/koraidon/back.png (100%) rename graphics/pokemon/{ => gen_9}/koraidon/front.png (100%) rename graphics/pokemon/{ => gen_9}/koraidon/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/koraidon/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/koraidon/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/lechonk/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/lechonk/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/lechonk/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/lechonk/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/lechonk/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/lokix/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/lokix/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/lokix/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/lokix/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/lokix/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/mabosstiff/back.png (100%) rename graphics/pokemon/{ => gen_9}/mabosstiff/front.png (100%) rename graphics/pokemon/{ => gen_9}/mabosstiff/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/mabosstiff/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/mabosstiff/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/maschiff/back.png (100%) rename graphics/pokemon/{ => gen_9}/maschiff/front.png (100%) rename graphics/pokemon/{ => gen_9}/maschiff/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/maschiff/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/maschiff/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/maushold/back.png (100%) rename graphics/pokemon/{ => gen_9}/maushold/four/back.png (100%) rename graphics/pokemon/{ => gen_9}/maushold/four/front.png (100%) rename graphics/pokemon/{ => gen_9}/maushold/four/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/maushold/front.png (100%) rename graphics/pokemon/{ => gen_9}/maushold/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/maushold/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/maushold/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/meowscarada/back.png (100%) rename graphics/pokemon/{ => gen_9}/meowscarada/front.png (100%) rename graphics/pokemon/{ => gen_9}/meowscarada/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/meowscarada/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/meowscarada/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/miraidon/back.png (100%) rename graphics/pokemon/{ => gen_9}/miraidon/front.png (100%) rename graphics/pokemon/{ => gen_9}/miraidon/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/miraidon/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/miraidon/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/munkidori/back.png (100%) rename graphics/pokemon/{ => gen_9}/munkidori/front.png (100%) rename graphics/pokemon/{ => gen_9}/munkidori/icon.png (100%) rename graphics/pokemon/{ => gen_9}/munkidori/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/munkidori/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/nacli/back.png (100%) rename graphics/pokemon/{ => gen_9}/nacli/front.png (100%) rename graphics/pokemon/{ => gen_9}/nacli/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/nacli/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/nacli/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/naclstack/back.png (100%) rename graphics/pokemon/{ => gen_9}/naclstack/front.png (100%) rename graphics/pokemon/{ => gen_9}/naclstack/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/naclstack/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/naclstack/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/nymble/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/nymble/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/nymble/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/nymble/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/nymble/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/ogerpon/back.png (100%) rename graphics/pokemon/{ => gen_9}/ogerpon/cornerstone/back.png (100%) rename graphics/pokemon/{ => gen_9}/ogerpon/cornerstone/front.png (100%) rename graphics/pokemon/{ => gen_9}/ogerpon/cornerstone/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/ogerpon/front.png (100%) rename graphics/pokemon/{ => gen_9}/ogerpon/hearthflame/back.png (100%) rename graphics/pokemon/{ => gen_9}/ogerpon/hearthflame/front.png (100%) rename graphics/pokemon/{ => gen_9}/ogerpon/hearthflame/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/ogerpon/icon.png (100%) rename graphics/pokemon/{ => gen_9}/ogerpon/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/ogerpon/wellspring/back.png (100%) rename graphics/pokemon/{ => gen_9}/ogerpon/wellspring/front.png (100%) rename graphics/pokemon/{ => gen_9}/ogerpon/wellspring/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/oinkologne/back.png (100%) rename graphics/pokemon/{ => gen_9}/oinkologne/female/back.png (100%) rename graphics/pokemon/{ => gen_9}/oinkologne/female/front.png (100%) rename graphics/pokemon/{ => gen_9}/oinkologne/female/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/oinkologne/female/iconTODO.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/oinkologne/female/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/oinkologne/female/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/oinkologne/front.png (100%) rename graphics/pokemon/{ => gen_9}/oinkologne/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/oinkologne/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/oinkologne/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/okidogi/back.png (100%) rename graphics/pokemon/{ => gen_9}/okidogi/front.png (100%) rename graphics/pokemon/{ => gen_9}/okidogi/icon.png (100%) rename graphics/pokemon/{ => gen_9}/okidogi/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/okidogi/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/orthworm/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/orthworm/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/orthworm/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/orthworm/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/orthworm/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/palafin/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/palafin/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/palafin/hero/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/palafin/hero/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/palafin/hero/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/palafin/hero/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/palafin/hero/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/palafin/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/palafin/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/palafin/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/pawmi/back.png (100%) rename graphics/pokemon/{ => gen_9}/pawmi/front.png (100%) rename graphics/pokemon/{ => gen_9}/pawmi/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/pawmi/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/pawmi/normal.png (100%) rename graphics/pokemon/{ => gen_9}/pawmi/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/pawmo/back.png (100%) rename graphics/pokemon/{ => gen_9}/pawmo/front.png (100%) rename graphics/pokemon/{ => gen_9}/pawmo/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/pawmo/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/pawmo/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/pawmot/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/pawmot/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/pawmot/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/pawmot/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/pawmot/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/poltchageist/back.png (100%) rename graphics/pokemon/{ => gen_9}/poltchageist/front.png (100%) rename graphics/pokemon/{ => gen_9}/poltchageist/icon.png (100%) rename graphics/pokemon/{ => gen_9}/poltchageist/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/poltchageist/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/quaquaval/back.png (100%) rename graphics/pokemon/{ => gen_9}/quaquaval/front.png (100%) rename graphics/pokemon/{ => gen_9}/quaquaval/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/quaquaval/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/quaquaval/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/quaxly/back.png (100%) rename graphics/pokemon/{ => gen_9}/quaxly/front.png (100%) rename graphics/pokemon/{ => gen_9}/quaxly/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/quaxly/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/quaxly/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/quaxwell/back.png (100%) rename graphics/pokemon/{ => gen_9}/quaxwell/front.png (100%) rename graphics/pokemon/{ => gen_9}/quaxwell/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/quaxwell/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/quaxwell/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/rabsca/back.png (100%) rename graphics/pokemon/{ => gen_9}/rabsca/front.png (100%) rename graphics/pokemon/{ => gen_9}/rabsca/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/rabsca/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/rabsca/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/rellor/back.png (100%) rename graphics/pokemon/{ => gen_9}/rellor/front.png (100%) rename graphics/pokemon/{ => gen_9}/rellor/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/rellor/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/rellor/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/revavroom/back.png (100%) rename graphics/pokemon/{ => gen_9}/revavroom/front.png (100%) rename graphics/pokemon/{ => gen_9}/revavroom/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/revavroom/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/revavroom/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/roaring_moon/back.png (100%) rename graphics/pokemon/{ => gen_9}/roaring_moon/front.png (100%) rename graphics/pokemon/{ => gen_9}/roaring_moon/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/roaring_moon/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/roaring_moon/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/sandy_shocks/back.png (100%) rename graphics/pokemon/{ => gen_9}/sandy_shocks/front.png (100%) rename graphics/pokemon/{ => gen_9}/sandy_shocks/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/sandy_shocks/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/sandy_shocks/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/scovillain/back.png (100%) rename graphics/pokemon/{ => gen_9}/scovillain/front.png (100%) rename graphics/pokemon/{ => gen_9}/scovillain/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/scovillain/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/scovillain/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/scream_tail/back.png (100%) rename graphics/pokemon/{ => gen_9}/scream_tail/front.png (100%) rename graphics/pokemon/{ => gen_9}/scream_tail/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/scream_tail/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/scream_tail/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/shroodle/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/shroodle/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/shroodle/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/shroodle/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/shroodle/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/sinistcha/back.png (100%) rename graphics/pokemon/{ => gen_9}/sinistcha/front.png (100%) rename graphics/pokemon/{ => gen_9}/sinistcha/icon.png (100%) rename graphics/pokemon/{ => gen_9}/sinistcha/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/sinistcha/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/skeledirge/back.png (100%) rename graphics/pokemon/{ => gen_9}/skeledirge/front.png (100%) rename graphics/pokemon/{ => gen_9}/skeledirge/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/skeledirge/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/skeledirge/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/slither_wing/back.png (100%) rename graphics/pokemon/{ => gen_9}/slither_wing/front.png (100%) rename graphics/pokemon/{ => gen_9}/slither_wing/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/slither_wing/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/slither_wing/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/smoliv/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/smoliv/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/smoliv/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/smoliv/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/smoliv/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/spidops/back.png (100%) rename graphics/pokemon/{ => gen_9}/spidops/front.png (100%) rename graphics/pokemon/{ => gen_9}/spidops/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/spidops/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/spidops/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/sprigatito/back.png (100%) rename graphics/pokemon/{ => gen_9}/sprigatito/front.png (100%) rename graphics/pokemon/{ => gen_9}/sprigatito/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/sprigatito/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/sprigatito/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/squawkabilly/back.png (100%) rename graphics/pokemon/{ => gen_9}/squawkabilly/blue_plumage/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/squawkabilly/blue_plumage/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/squawkabilly/blue_plumage/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/squawkabilly/front.png (100%) rename graphics/pokemon/{ => gen_9}/squawkabilly/green_plumage/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/squawkabilly/green_plumage/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/squawkabilly/green_plumage/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/squawkabilly/white_plumage/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/squawkabilly/white_plumage/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/squawkabilly/white_plumage/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/squawkabilly/yellow_plumage/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/squawkabilly/yellow_plumage/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/squawkabilly/yellow_plumage/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/tadbulb/back.png (100%) rename graphics/pokemon/{ => gen_9}/tadbulb/front.png (100%) rename graphics/pokemon/{ => gen_9}/tadbulb/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/tadbulb/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/tadbulb/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/tandemaus/back.png (100%) rename graphics/pokemon/{ => gen_9}/tandemaus/front.png (100%) rename graphics/pokemon/{ => gen_9}/tandemaus/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/tandemaus/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/tandemaus/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/tarountula/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/tarountula/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/tarountula/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/tarountula/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/tarountula/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/tatsugiri/curly/back.png (100%) rename graphics/pokemon/{ => gen_9}/tatsugiri/curly/front.png (100%) rename graphics/pokemon/{ => gen_9}/tatsugiri/curly/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/tatsugiri/curly/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/tatsugiri/curly/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/tatsugiri/droopy/back.png (100%) rename graphics/pokemon/{ => gen_9}/tatsugiri/droopy/front.png (100%) rename graphics/pokemon/{ => gen_9}/tatsugiri/droopy/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/tatsugiri/droopy/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/tatsugiri/droopy/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/tatsugiri/stretchy/back.png (100%) rename graphics/pokemon/{ => gen_9}/tatsugiri/stretchy/front.png (100%) rename graphics/pokemon/{ => gen_9}/tatsugiri/stretchy/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/tatsugiri/stretchy/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/tatsugiri/stretchy/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/ting_lu/back.png (100%) rename graphics/pokemon/{ => gen_9}/ting_lu/front.png (100%) rename graphics/pokemon/{ => gen_9}/ting_lu/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/ting_lu/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/ting_lu/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/tinkatink/back.png (100%) rename graphics/pokemon/{ => gen_9}/tinkatink/front.png (100%) rename graphics/pokemon/{ => gen_9}/tinkatink/icon.png (100%) rename graphics/pokemon/{ => gen_9}/tinkatink/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/tinkatink/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/tinkaton/back.png (100%) rename graphics/pokemon/{ => gen_9}/tinkaton/front.png (100%) rename graphics/pokemon/{ => gen_9}/tinkaton/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/tinkaton/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/tinkaton/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/tinkatuff/back.png (100%) rename graphics/pokemon/{ => gen_9}/tinkatuff/front.png (100%) rename graphics/pokemon/{ => gen_9}/tinkatuff/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/tinkatuff/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/tinkatuff/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/toedscool/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/toedscool/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/toedscool/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/toedscool/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/toedscool/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/toedscruel/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/toedscruel/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/toedscruel/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/toedscruel/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/toedscruel/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/varoom/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/varoom/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/varoom/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/varoom/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/varoom/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/veluza/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/veluza/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/veluza/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/veluza/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/veluza/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/walking_wake/back.png (100%) rename graphics/pokemon/{ => gen_9}/walking_wake/front.png (100%) rename graphics/pokemon/{ => gen_9}/walking_wake/icon.png (100%) rename graphics/pokemon/{ => gen_9}/walking_wake/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/walking_wake/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/wattrel/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wattrel/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wattrel/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wattrel/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wattrel/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wiglett/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wiglett/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wiglett/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wiglett/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wiglett/shiny.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wo_chien/back.png (100%) rename graphics/pokemon/{ => gen_9}/wo_chien/front.png (100%) rename graphics/pokemon/{ => gen_9}/wo_chien/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wo_chien/normal.pal (100%) rename graphics/pokemon/{ => gen_9}/wo_chien/shiny.pal (100%) rename graphics/pokemon/{ => gen_9}/wugtrio/back.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wugtrio/front.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wugtrio/icon.png (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wugtrio/normal.pal (100%) mode change 100755 => 100644 rename graphics/pokemon/{ => gen_9}/wugtrio/shiny.pal (100%) mode change 100755 => 100644 diff --git a/graphics/pokemon/abra/anim_front.png b/graphics/pokemon/gen_1/abra/anim_front.png similarity index 100% rename from graphics/pokemon/abra/anim_front.png rename to graphics/pokemon/gen_1/abra/anim_front.png diff --git a/graphics/pokemon/abra/back.png b/graphics/pokemon/gen_1/abra/back.png similarity index 100% rename from graphics/pokemon/abra/back.png rename to graphics/pokemon/gen_1/abra/back.png diff --git a/graphics/pokemon/abra/footprint.png b/graphics/pokemon/gen_1/abra/footprint.png similarity index 100% rename from graphics/pokemon/abra/footprint.png rename to graphics/pokemon/gen_1/abra/footprint.png diff --git a/graphics/pokemon/abra/icon.png b/graphics/pokemon/gen_1/abra/icon.png similarity index 100% rename from graphics/pokemon/abra/icon.png rename to graphics/pokemon/gen_1/abra/icon.png diff --git a/graphics/pokemon/abra/normal.pal b/graphics/pokemon/gen_1/abra/normal.pal similarity index 100% rename from graphics/pokemon/abra/normal.pal rename to graphics/pokemon/gen_1/abra/normal.pal diff --git a/graphics/pokemon/abra/shiny.pal b/graphics/pokemon/gen_1/abra/shiny.pal similarity index 100% rename from graphics/pokemon/abra/shiny.pal rename to graphics/pokemon/gen_1/abra/shiny.pal diff --git a/graphics/pokemon/aerodactyl/anim_front.png b/graphics/pokemon/gen_1/aerodactyl/anim_front.png similarity index 100% rename from graphics/pokemon/aerodactyl/anim_front.png rename to graphics/pokemon/gen_1/aerodactyl/anim_front.png diff --git a/graphics/pokemon/aerodactyl/back.png b/graphics/pokemon/gen_1/aerodactyl/back.png similarity index 100% rename from graphics/pokemon/aerodactyl/back.png rename to graphics/pokemon/gen_1/aerodactyl/back.png diff --git a/graphics/pokemon/aerodactyl/footprint.png b/graphics/pokemon/gen_1/aerodactyl/footprint.png similarity index 100% rename from graphics/pokemon/aerodactyl/footprint.png rename to graphics/pokemon/gen_1/aerodactyl/footprint.png diff --git a/graphics/pokemon/aerodactyl/icon.png b/graphics/pokemon/gen_1/aerodactyl/icon.png similarity index 100% rename from graphics/pokemon/aerodactyl/icon.png rename to graphics/pokemon/gen_1/aerodactyl/icon.png diff --git a/graphics/pokemon/aerodactyl/mega/back.png b/graphics/pokemon/gen_1/aerodactyl/mega/back.png similarity index 100% rename from graphics/pokemon/aerodactyl/mega/back.png rename to graphics/pokemon/gen_1/aerodactyl/mega/back.png diff --git a/graphics/pokemon/aerodactyl/mega/front.png b/graphics/pokemon/gen_1/aerodactyl/mega/front.png similarity index 100% rename from graphics/pokemon/aerodactyl/mega/front.png rename to graphics/pokemon/gen_1/aerodactyl/mega/front.png diff --git a/graphics/pokemon/aerodactyl/mega/icon.png b/graphics/pokemon/gen_1/aerodactyl/mega/icon.png similarity index 100% rename from graphics/pokemon/aerodactyl/mega/icon.png rename to graphics/pokemon/gen_1/aerodactyl/mega/icon.png diff --git a/graphics/pokemon/aerodactyl/mega/normal.pal b/graphics/pokemon/gen_1/aerodactyl/mega/normal.pal similarity index 100% rename from graphics/pokemon/aerodactyl/mega/normal.pal rename to graphics/pokemon/gen_1/aerodactyl/mega/normal.pal diff --git a/graphics/pokemon/aerodactyl/mega/shiny.pal b/graphics/pokemon/gen_1/aerodactyl/mega/shiny.pal similarity index 100% rename from graphics/pokemon/aerodactyl/mega/shiny.pal rename to graphics/pokemon/gen_1/aerodactyl/mega/shiny.pal diff --git a/graphics/pokemon/aerodactyl/normal.pal b/graphics/pokemon/gen_1/aerodactyl/normal.pal similarity index 100% rename from graphics/pokemon/aerodactyl/normal.pal rename to graphics/pokemon/gen_1/aerodactyl/normal.pal diff --git a/graphics/pokemon/aerodactyl/shiny.pal b/graphics/pokemon/gen_1/aerodactyl/shiny.pal similarity index 100% rename from graphics/pokemon/aerodactyl/shiny.pal rename to graphics/pokemon/gen_1/aerodactyl/shiny.pal diff --git a/graphics/pokemon/alakazam/anim_front.png b/graphics/pokemon/gen_1/alakazam/anim_front.png similarity index 100% rename from graphics/pokemon/alakazam/anim_front.png rename to graphics/pokemon/gen_1/alakazam/anim_front.png diff --git a/graphics/pokemon/alakazam/anim_frontf.png b/graphics/pokemon/gen_1/alakazam/anim_frontf.png similarity index 100% rename from graphics/pokemon/alakazam/anim_frontf.png rename to graphics/pokemon/gen_1/alakazam/anim_frontf.png diff --git a/graphics/pokemon/alakazam/back.png b/graphics/pokemon/gen_1/alakazam/back.png similarity index 100% rename from graphics/pokemon/alakazam/back.png rename to graphics/pokemon/gen_1/alakazam/back.png diff --git a/graphics/pokemon/alakazam/backf.png b/graphics/pokemon/gen_1/alakazam/backf.png similarity index 100% rename from graphics/pokemon/alakazam/backf.png rename to graphics/pokemon/gen_1/alakazam/backf.png diff --git a/graphics/pokemon/alakazam/footprint.png b/graphics/pokemon/gen_1/alakazam/footprint.png similarity index 100% rename from graphics/pokemon/alakazam/footprint.png rename to graphics/pokemon/gen_1/alakazam/footprint.png diff --git a/graphics/pokemon/alakazam/icon.png b/graphics/pokemon/gen_1/alakazam/icon.png similarity index 100% rename from graphics/pokemon/alakazam/icon.png rename to graphics/pokemon/gen_1/alakazam/icon.png diff --git a/graphics/pokemon/alakazam/mega/back.png b/graphics/pokemon/gen_1/alakazam/mega/back.png similarity index 100% rename from graphics/pokemon/alakazam/mega/back.png rename to graphics/pokemon/gen_1/alakazam/mega/back.png diff --git a/graphics/pokemon/alakazam/mega/front.png b/graphics/pokemon/gen_1/alakazam/mega/front.png similarity index 100% rename from graphics/pokemon/alakazam/mega/front.png rename to graphics/pokemon/gen_1/alakazam/mega/front.png diff --git a/graphics/pokemon/alakazam/mega/icon.png b/graphics/pokemon/gen_1/alakazam/mega/icon.png similarity index 100% rename from graphics/pokemon/alakazam/mega/icon.png rename to graphics/pokemon/gen_1/alakazam/mega/icon.png diff --git a/graphics/pokemon/alakazam/mega/normal.pal b/graphics/pokemon/gen_1/alakazam/mega/normal.pal similarity index 100% rename from graphics/pokemon/alakazam/mega/normal.pal rename to graphics/pokemon/gen_1/alakazam/mega/normal.pal diff --git a/graphics/pokemon/alakazam/mega/shiny.pal b/graphics/pokemon/gen_1/alakazam/mega/shiny.pal similarity index 100% rename from graphics/pokemon/alakazam/mega/shiny.pal rename to graphics/pokemon/gen_1/alakazam/mega/shiny.pal diff --git a/graphics/pokemon/alakazam/normal.pal b/graphics/pokemon/gen_1/alakazam/normal.pal similarity index 100% rename from graphics/pokemon/alakazam/normal.pal rename to graphics/pokemon/gen_1/alakazam/normal.pal diff --git a/graphics/pokemon/alakazam/shiny.pal b/graphics/pokemon/gen_1/alakazam/shiny.pal similarity index 100% rename from graphics/pokemon/alakazam/shiny.pal rename to graphics/pokemon/gen_1/alakazam/shiny.pal diff --git a/graphics/pokemon/arbok/anim_front.png b/graphics/pokemon/gen_1/arbok/anim_front.png similarity index 100% rename from graphics/pokemon/arbok/anim_front.png rename to graphics/pokemon/gen_1/arbok/anim_front.png diff --git a/graphics/pokemon/arbok/back.png b/graphics/pokemon/gen_1/arbok/back.png similarity index 100% rename from graphics/pokemon/arbok/back.png rename to graphics/pokemon/gen_1/arbok/back.png diff --git a/graphics/pokemon/accelgor/footprint.png b/graphics/pokemon/gen_1/arbok/footprint.png similarity index 100% rename from graphics/pokemon/accelgor/footprint.png rename to graphics/pokemon/gen_1/arbok/footprint.png diff --git a/graphics/pokemon/arbok/icon.png b/graphics/pokemon/gen_1/arbok/icon.png similarity index 100% rename from graphics/pokemon/arbok/icon.png rename to graphics/pokemon/gen_1/arbok/icon.png diff --git a/graphics/pokemon/arbok/normal.pal b/graphics/pokemon/gen_1/arbok/normal.pal similarity index 100% rename from graphics/pokemon/arbok/normal.pal rename to graphics/pokemon/gen_1/arbok/normal.pal diff --git a/graphics/pokemon/arbok/shiny.pal b/graphics/pokemon/gen_1/arbok/shiny.pal similarity index 100% rename from graphics/pokemon/arbok/shiny.pal rename to graphics/pokemon/gen_1/arbok/shiny.pal diff --git a/graphics/pokemon/arcanine/anim_front.png b/graphics/pokemon/gen_1/arcanine/anim_front.png similarity index 100% rename from graphics/pokemon/arcanine/anim_front.png rename to graphics/pokemon/gen_1/arcanine/anim_front.png diff --git a/graphics/pokemon/arcanine/back.png b/graphics/pokemon/gen_1/arcanine/back.png similarity index 100% rename from graphics/pokemon/arcanine/back.png rename to graphics/pokemon/gen_1/arcanine/back.png diff --git a/graphics/pokemon/arcanine/footprint.png b/graphics/pokemon/gen_1/arcanine/footprint.png similarity index 100% rename from graphics/pokemon/arcanine/footprint.png rename to graphics/pokemon/gen_1/arcanine/footprint.png diff --git a/graphics/pokemon/arcanine/hisuian/back.png b/graphics/pokemon/gen_1/arcanine/hisuian/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/arcanine/hisuian/back.png rename to graphics/pokemon/gen_1/arcanine/hisuian/back.png diff --git a/graphics/pokemon/arcanine/hisuian/front.png b/graphics/pokemon/gen_1/arcanine/hisuian/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/arcanine/hisuian/front.png rename to graphics/pokemon/gen_1/arcanine/hisuian/front.png diff --git a/graphics/pokemon/arcanine/hisuian/icon.png b/graphics/pokemon/gen_1/arcanine/hisuian/icon.png similarity index 100% rename from graphics/pokemon/arcanine/hisuian/icon.png rename to graphics/pokemon/gen_1/arcanine/hisuian/icon.png diff --git a/graphics/pokemon/arcanine/hisuian/normal.pal b/graphics/pokemon/gen_1/arcanine/hisuian/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/arcanine/hisuian/normal.pal rename to graphics/pokemon/gen_1/arcanine/hisuian/normal.pal diff --git a/graphics/pokemon/arcanine/hisuian/shiny.pal b/graphics/pokemon/gen_1/arcanine/hisuian/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/arcanine/hisuian/shiny.pal rename to graphics/pokemon/gen_1/arcanine/hisuian/shiny.pal diff --git a/graphics/pokemon/arcanine/icon.png b/graphics/pokemon/gen_1/arcanine/icon.png similarity index 100% rename from graphics/pokemon/arcanine/icon.png rename to graphics/pokemon/gen_1/arcanine/icon.png diff --git a/graphics/pokemon/arcanine/normal.pal b/graphics/pokemon/gen_1/arcanine/normal.pal similarity index 100% rename from graphics/pokemon/arcanine/normal.pal rename to graphics/pokemon/gen_1/arcanine/normal.pal diff --git a/graphics/pokemon/arcanine/shiny.pal b/graphics/pokemon/gen_1/arcanine/shiny.pal similarity index 100% rename from graphics/pokemon/arcanine/shiny.pal rename to graphics/pokemon/gen_1/arcanine/shiny.pal diff --git a/graphics/pokemon/articuno/anim_front.png b/graphics/pokemon/gen_1/articuno/anim_front.png similarity index 100% rename from graphics/pokemon/articuno/anim_front.png rename to graphics/pokemon/gen_1/articuno/anim_front.png diff --git a/graphics/pokemon/articuno/back.png b/graphics/pokemon/gen_1/articuno/back.png similarity index 100% rename from graphics/pokemon/articuno/back.png rename to graphics/pokemon/gen_1/articuno/back.png diff --git a/graphics/pokemon/articuno/footprint.png b/graphics/pokemon/gen_1/articuno/footprint.png similarity index 100% rename from graphics/pokemon/articuno/footprint.png rename to graphics/pokemon/gen_1/articuno/footprint.png diff --git a/graphics/pokemon/articuno/galarian/back.png b/graphics/pokemon/gen_1/articuno/galarian/back.png similarity index 100% rename from graphics/pokemon/articuno/galarian/back.png rename to graphics/pokemon/gen_1/articuno/galarian/back.png diff --git a/graphics/pokemon/articuno/galarian/front.png b/graphics/pokemon/gen_1/articuno/galarian/front.png similarity index 100% rename from graphics/pokemon/articuno/galarian/front.png rename to graphics/pokemon/gen_1/articuno/galarian/front.png diff --git a/graphics/pokemon/articuno/galarian/icon.png b/graphics/pokemon/gen_1/articuno/galarian/icon.png similarity index 100% rename from graphics/pokemon/articuno/galarian/icon.png rename to graphics/pokemon/gen_1/articuno/galarian/icon.png diff --git a/graphics/pokemon/articuno/galarian/normal.pal b/graphics/pokemon/gen_1/articuno/galarian/normal.pal similarity index 100% rename from graphics/pokemon/articuno/galarian/normal.pal rename to graphics/pokemon/gen_1/articuno/galarian/normal.pal diff --git a/graphics/pokemon/articuno/galarian/shiny.pal b/graphics/pokemon/gen_1/articuno/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/articuno/galarian/shiny.pal rename to graphics/pokemon/gen_1/articuno/galarian/shiny.pal diff --git a/graphics/pokemon/articuno/icon.png b/graphics/pokemon/gen_1/articuno/icon.png similarity index 100% rename from graphics/pokemon/articuno/icon.png rename to graphics/pokemon/gen_1/articuno/icon.png diff --git a/graphics/pokemon/articuno/normal.pal b/graphics/pokemon/gen_1/articuno/normal.pal similarity index 100% rename from graphics/pokemon/articuno/normal.pal rename to graphics/pokemon/gen_1/articuno/normal.pal diff --git a/graphics/pokemon/articuno/shiny.pal b/graphics/pokemon/gen_1/articuno/shiny.pal similarity index 100% rename from graphics/pokemon/articuno/shiny.pal rename to graphics/pokemon/gen_1/articuno/shiny.pal diff --git a/graphics/pokemon/beedrill/anim_front.png b/graphics/pokemon/gen_1/beedrill/anim_front.png similarity index 100% rename from graphics/pokemon/beedrill/anim_front.png rename to graphics/pokemon/gen_1/beedrill/anim_front.png diff --git a/graphics/pokemon/beedrill/back.png b/graphics/pokemon/gen_1/beedrill/back.png similarity index 100% rename from graphics/pokemon/beedrill/back.png rename to graphics/pokemon/gen_1/beedrill/back.png diff --git a/graphics/pokemon/beedrill/footprint.png b/graphics/pokemon/gen_1/beedrill/footprint.png similarity index 100% rename from graphics/pokemon/beedrill/footprint.png rename to graphics/pokemon/gen_1/beedrill/footprint.png diff --git a/graphics/pokemon/beedrill/icon.png b/graphics/pokemon/gen_1/beedrill/icon.png similarity index 100% rename from graphics/pokemon/beedrill/icon.png rename to graphics/pokemon/gen_1/beedrill/icon.png diff --git a/graphics/pokemon/beedrill/mega/back.png b/graphics/pokemon/gen_1/beedrill/mega/back.png similarity index 100% rename from graphics/pokemon/beedrill/mega/back.png rename to graphics/pokemon/gen_1/beedrill/mega/back.png diff --git a/graphics/pokemon/beedrill/mega/front.png b/graphics/pokemon/gen_1/beedrill/mega/front.png similarity index 100% rename from graphics/pokemon/beedrill/mega/front.png rename to graphics/pokemon/gen_1/beedrill/mega/front.png diff --git a/graphics/pokemon/beedrill/mega/icon.png b/graphics/pokemon/gen_1/beedrill/mega/icon.png similarity index 100% rename from graphics/pokemon/beedrill/mega/icon.png rename to graphics/pokemon/gen_1/beedrill/mega/icon.png diff --git a/graphics/pokemon/beedrill/mega/normal.pal b/graphics/pokemon/gen_1/beedrill/mega/normal.pal similarity index 100% rename from graphics/pokemon/beedrill/mega/normal.pal rename to graphics/pokemon/gen_1/beedrill/mega/normal.pal diff --git a/graphics/pokemon/beedrill/mega/shiny.pal b/graphics/pokemon/gen_1/beedrill/mega/shiny.pal similarity index 100% rename from graphics/pokemon/beedrill/mega/shiny.pal rename to graphics/pokemon/gen_1/beedrill/mega/shiny.pal diff --git a/graphics/pokemon/beedrill/normal.pal b/graphics/pokemon/gen_1/beedrill/normal.pal similarity index 100% rename from graphics/pokemon/beedrill/normal.pal rename to graphics/pokemon/gen_1/beedrill/normal.pal diff --git a/graphics/pokemon/beedrill/shiny.pal b/graphics/pokemon/gen_1/beedrill/shiny.pal similarity index 100% rename from graphics/pokemon/beedrill/shiny.pal rename to graphics/pokemon/gen_1/beedrill/shiny.pal diff --git a/graphics/pokemon/bellsprout/anim_front.png b/graphics/pokemon/gen_1/bellsprout/anim_front.png similarity index 100% rename from graphics/pokemon/bellsprout/anim_front.png rename to graphics/pokemon/gen_1/bellsprout/anim_front.png diff --git a/graphics/pokemon/bellsprout/back.png b/graphics/pokemon/gen_1/bellsprout/back.png similarity index 100% rename from graphics/pokemon/bellsprout/back.png rename to graphics/pokemon/gen_1/bellsprout/back.png diff --git a/graphics/pokemon/bellsprout/footprint.png b/graphics/pokemon/gen_1/bellsprout/footprint.png similarity index 100% rename from graphics/pokemon/bellsprout/footprint.png rename to graphics/pokemon/gen_1/bellsprout/footprint.png diff --git a/graphics/pokemon/bellsprout/icon.png b/graphics/pokemon/gen_1/bellsprout/icon.png similarity index 100% rename from graphics/pokemon/bellsprout/icon.png rename to graphics/pokemon/gen_1/bellsprout/icon.png diff --git a/graphics/pokemon/bellsprout/normal.pal b/graphics/pokemon/gen_1/bellsprout/normal.pal similarity index 100% rename from graphics/pokemon/bellsprout/normal.pal rename to graphics/pokemon/gen_1/bellsprout/normal.pal diff --git a/graphics/pokemon/bellsprout/shiny.pal b/graphics/pokemon/gen_1/bellsprout/shiny.pal similarity index 100% rename from graphics/pokemon/bellsprout/shiny.pal rename to graphics/pokemon/gen_1/bellsprout/shiny.pal diff --git a/graphics/pokemon/blastoise/anim_front.png b/graphics/pokemon/gen_1/blastoise/anim_front.png similarity index 100% rename from graphics/pokemon/blastoise/anim_front.png rename to graphics/pokemon/gen_1/blastoise/anim_front.png diff --git a/graphics/pokemon/blastoise/back.png b/graphics/pokemon/gen_1/blastoise/back.png similarity index 100% rename from graphics/pokemon/blastoise/back.png rename to graphics/pokemon/gen_1/blastoise/back.png diff --git a/graphics/pokemon/blastoise/footprint.png b/graphics/pokemon/gen_1/blastoise/footprint.png similarity index 100% rename from graphics/pokemon/blastoise/footprint.png rename to graphics/pokemon/gen_1/blastoise/footprint.png diff --git a/graphics/pokemon/blastoise/gigantamax/back.png b/graphics/pokemon/gen_1/blastoise/gigantamax/back.png similarity index 100% rename from graphics/pokemon/blastoise/gigantamax/back.png rename to graphics/pokemon/gen_1/blastoise/gigantamax/back.png diff --git a/graphics/pokemon/blastoise/gigantamax/front.png b/graphics/pokemon/gen_1/blastoise/gigantamax/front.png similarity index 100% rename from graphics/pokemon/blastoise/gigantamax/front.png rename to graphics/pokemon/gen_1/blastoise/gigantamax/front.png diff --git a/graphics/pokemon/blastoise/gigantamax/icon.png b/graphics/pokemon/gen_1/blastoise/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/blastoise/gigantamax/icon.png rename to graphics/pokemon/gen_1/blastoise/gigantamax/icon.png diff --git a/graphics/pokemon/blastoise/gigantamax/normal.pal b/graphics/pokemon/gen_1/blastoise/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/blastoise/gigantamax/normal.pal rename to graphics/pokemon/gen_1/blastoise/gigantamax/normal.pal diff --git a/graphics/pokemon/blastoise/gigantamax/shiny.pal b/graphics/pokemon/gen_1/blastoise/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/blastoise/gigantamax/shiny.pal rename to graphics/pokemon/gen_1/blastoise/gigantamax/shiny.pal diff --git a/graphics/pokemon/blastoise/icon.png b/graphics/pokemon/gen_1/blastoise/icon.png similarity index 100% rename from graphics/pokemon/blastoise/icon.png rename to graphics/pokemon/gen_1/blastoise/icon.png diff --git a/graphics/pokemon/blastoise/mega/back.png b/graphics/pokemon/gen_1/blastoise/mega/back.png similarity index 100% rename from graphics/pokemon/blastoise/mega/back.png rename to graphics/pokemon/gen_1/blastoise/mega/back.png diff --git a/graphics/pokemon/blastoise/mega/front.png b/graphics/pokemon/gen_1/blastoise/mega/front.png similarity index 100% rename from graphics/pokemon/blastoise/mega/front.png rename to graphics/pokemon/gen_1/blastoise/mega/front.png diff --git a/graphics/pokemon/blastoise/mega/icon.png b/graphics/pokemon/gen_1/blastoise/mega/icon.png similarity index 100% rename from graphics/pokemon/blastoise/mega/icon.png rename to graphics/pokemon/gen_1/blastoise/mega/icon.png diff --git a/graphics/pokemon/blastoise/mega/normal.pal b/graphics/pokemon/gen_1/blastoise/mega/normal.pal similarity index 100% rename from graphics/pokemon/blastoise/mega/normal.pal rename to graphics/pokemon/gen_1/blastoise/mega/normal.pal diff --git a/graphics/pokemon/blastoise/mega/shiny.pal b/graphics/pokemon/gen_1/blastoise/mega/shiny.pal similarity index 100% rename from graphics/pokemon/blastoise/mega/shiny.pal rename to graphics/pokemon/gen_1/blastoise/mega/shiny.pal diff --git a/graphics/pokemon/blastoise/normal.pal b/graphics/pokemon/gen_1/blastoise/normal.pal similarity index 100% rename from graphics/pokemon/blastoise/normal.pal rename to graphics/pokemon/gen_1/blastoise/normal.pal diff --git a/graphics/pokemon/blastoise/shiny.pal b/graphics/pokemon/gen_1/blastoise/shiny.pal similarity index 100% rename from graphics/pokemon/blastoise/shiny.pal rename to graphics/pokemon/gen_1/blastoise/shiny.pal diff --git a/graphics/pokemon/bulbasaur/anim_front.png b/graphics/pokemon/gen_1/bulbasaur/anim_front.png similarity index 100% rename from graphics/pokemon/bulbasaur/anim_front.png rename to graphics/pokemon/gen_1/bulbasaur/anim_front.png diff --git a/graphics/pokemon/bulbasaur/back.png b/graphics/pokemon/gen_1/bulbasaur/back.png similarity index 100% rename from graphics/pokemon/bulbasaur/back.png rename to graphics/pokemon/gen_1/bulbasaur/back.png diff --git a/graphics/pokemon/bulbasaur/footprint.png b/graphics/pokemon/gen_1/bulbasaur/footprint.png similarity index 100% rename from graphics/pokemon/bulbasaur/footprint.png rename to graphics/pokemon/gen_1/bulbasaur/footprint.png diff --git a/graphics/pokemon/bulbasaur/icon.png b/graphics/pokemon/gen_1/bulbasaur/icon.png similarity index 100% rename from graphics/pokemon/bulbasaur/icon.png rename to graphics/pokemon/gen_1/bulbasaur/icon.png diff --git a/graphics/pokemon/bulbasaur/normal.pal b/graphics/pokemon/gen_1/bulbasaur/normal.pal similarity index 100% rename from graphics/pokemon/bulbasaur/normal.pal rename to graphics/pokemon/gen_1/bulbasaur/normal.pal diff --git a/graphics/pokemon/bulbasaur/shiny.pal b/graphics/pokemon/gen_1/bulbasaur/shiny.pal similarity index 100% rename from graphics/pokemon/bulbasaur/shiny.pal rename to graphics/pokemon/gen_1/bulbasaur/shiny.pal diff --git a/graphics/pokemon/butterfree/anim_front.png b/graphics/pokemon/gen_1/butterfree/anim_front.png similarity index 100% rename from graphics/pokemon/butterfree/anim_front.png rename to graphics/pokemon/gen_1/butterfree/anim_front.png diff --git a/graphics/pokemon/butterfree/anim_frontf.png b/graphics/pokemon/gen_1/butterfree/anim_frontf.png similarity index 100% rename from graphics/pokemon/butterfree/anim_frontf.png rename to graphics/pokemon/gen_1/butterfree/anim_frontf.png diff --git a/graphics/pokemon/butterfree/back.png b/graphics/pokemon/gen_1/butterfree/back.png similarity index 100% rename from graphics/pokemon/butterfree/back.png rename to graphics/pokemon/gen_1/butterfree/back.png diff --git a/graphics/pokemon/butterfree/backf.png b/graphics/pokemon/gen_1/butterfree/backf.png similarity index 100% rename from graphics/pokemon/butterfree/backf.png rename to graphics/pokemon/gen_1/butterfree/backf.png diff --git a/graphics/pokemon/butterfree/footprint.png b/graphics/pokemon/gen_1/butterfree/footprint.png similarity index 100% rename from graphics/pokemon/butterfree/footprint.png rename to graphics/pokemon/gen_1/butterfree/footprint.png diff --git a/graphics/pokemon/butterfree/gigantamax/back.png b/graphics/pokemon/gen_1/butterfree/gigantamax/back.png similarity index 100% rename from graphics/pokemon/butterfree/gigantamax/back.png rename to graphics/pokemon/gen_1/butterfree/gigantamax/back.png diff --git a/graphics/pokemon/butterfree/gigantamax/front.png b/graphics/pokemon/gen_1/butterfree/gigantamax/front.png similarity index 100% rename from graphics/pokemon/butterfree/gigantamax/front.png rename to graphics/pokemon/gen_1/butterfree/gigantamax/front.png diff --git a/graphics/pokemon/butterfree/gigantamax/icon.png b/graphics/pokemon/gen_1/butterfree/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/butterfree/gigantamax/icon.png rename to graphics/pokemon/gen_1/butterfree/gigantamax/icon.png diff --git a/graphics/pokemon/butterfree/gigantamax/normal.pal b/graphics/pokemon/gen_1/butterfree/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/butterfree/gigantamax/normal.pal rename to graphics/pokemon/gen_1/butterfree/gigantamax/normal.pal diff --git a/graphics/pokemon/butterfree/gigantamax/shiny.pal b/graphics/pokemon/gen_1/butterfree/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/butterfree/gigantamax/shiny.pal rename to graphics/pokemon/gen_1/butterfree/gigantamax/shiny.pal diff --git a/graphics/pokemon/butterfree/icon.png b/graphics/pokemon/gen_1/butterfree/icon.png similarity index 100% rename from graphics/pokemon/butterfree/icon.png rename to graphics/pokemon/gen_1/butterfree/icon.png diff --git a/graphics/pokemon/butterfree/normal.pal b/graphics/pokemon/gen_1/butterfree/normal.pal similarity index 100% rename from graphics/pokemon/butterfree/normal.pal rename to graphics/pokemon/gen_1/butterfree/normal.pal diff --git a/graphics/pokemon/butterfree/shiny.pal b/graphics/pokemon/gen_1/butterfree/shiny.pal similarity index 100% rename from graphics/pokemon/butterfree/shiny.pal rename to graphics/pokemon/gen_1/butterfree/shiny.pal diff --git a/graphics/pokemon/caterpie/anim_front.png b/graphics/pokemon/gen_1/caterpie/anim_front.png similarity index 100% rename from graphics/pokemon/caterpie/anim_front.png rename to graphics/pokemon/gen_1/caterpie/anim_front.png diff --git a/graphics/pokemon/caterpie/back.png b/graphics/pokemon/gen_1/caterpie/back.png similarity index 100% rename from graphics/pokemon/caterpie/back.png rename to graphics/pokemon/gen_1/caterpie/back.png diff --git a/graphics/pokemon/araquanid/footprint.png b/graphics/pokemon/gen_1/caterpie/footprint.png similarity index 100% rename from graphics/pokemon/araquanid/footprint.png rename to graphics/pokemon/gen_1/caterpie/footprint.png diff --git a/graphics/pokemon/caterpie/icon.png b/graphics/pokemon/gen_1/caterpie/icon.png similarity index 100% rename from graphics/pokemon/caterpie/icon.png rename to graphics/pokemon/gen_1/caterpie/icon.png diff --git a/graphics/pokemon/caterpie/normal.pal b/graphics/pokemon/gen_1/caterpie/normal.pal similarity index 100% rename from graphics/pokemon/caterpie/normal.pal rename to graphics/pokemon/gen_1/caterpie/normal.pal diff --git a/graphics/pokemon/caterpie/shiny.pal b/graphics/pokemon/gen_1/caterpie/shiny.pal similarity index 100% rename from graphics/pokemon/caterpie/shiny.pal rename to graphics/pokemon/gen_1/caterpie/shiny.pal diff --git a/graphics/pokemon/chansey/anim_front.png b/graphics/pokemon/gen_1/chansey/anim_front.png similarity index 100% rename from graphics/pokemon/chansey/anim_front.png rename to graphics/pokemon/gen_1/chansey/anim_front.png diff --git a/graphics/pokemon/chansey/back.png b/graphics/pokemon/gen_1/chansey/back.png similarity index 100% rename from graphics/pokemon/chansey/back.png rename to graphics/pokemon/gen_1/chansey/back.png diff --git a/graphics/pokemon/chansey/footprint.png b/graphics/pokemon/gen_1/chansey/footprint.png similarity index 100% rename from graphics/pokemon/chansey/footprint.png rename to graphics/pokemon/gen_1/chansey/footprint.png diff --git a/graphics/pokemon/chansey/icon.png b/graphics/pokemon/gen_1/chansey/icon.png similarity index 100% rename from graphics/pokemon/chansey/icon.png rename to graphics/pokemon/gen_1/chansey/icon.png diff --git a/graphics/pokemon/chansey/normal.pal b/graphics/pokemon/gen_1/chansey/normal.pal similarity index 100% rename from graphics/pokemon/chansey/normal.pal rename to graphics/pokemon/gen_1/chansey/normal.pal diff --git a/graphics/pokemon/chansey/shiny.pal b/graphics/pokemon/gen_1/chansey/shiny.pal similarity index 100% rename from graphics/pokemon/chansey/shiny.pal rename to graphics/pokemon/gen_1/chansey/shiny.pal diff --git a/graphics/pokemon/charizard/anim_front.png b/graphics/pokemon/gen_1/charizard/anim_front.png similarity index 100% rename from graphics/pokemon/charizard/anim_front.png rename to graphics/pokemon/gen_1/charizard/anim_front.png diff --git a/graphics/pokemon/charizard/back.png b/graphics/pokemon/gen_1/charizard/back.png similarity index 100% rename from graphics/pokemon/charizard/back.png rename to graphics/pokemon/gen_1/charizard/back.png diff --git a/graphics/pokemon/charizard/footprint.png b/graphics/pokemon/gen_1/charizard/footprint.png similarity index 100% rename from graphics/pokemon/charizard/footprint.png rename to graphics/pokemon/gen_1/charizard/footprint.png diff --git a/graphics/pokemon/charizard/gigantamax/back.png b/graphics/pokemon/gen_1/charizard/gigantamax/back.png similarity index 100% rename from graphics/pokemon/charizard/gigantamax/back.png rename to graphics/pokemon/gen_1/charizard/gigantamax/back.png diff --git a/graphics/pokemon/charizard/gigantamax/front.png b/graphics/pokemon/gen_1/charizard/gigantamax/front.png similarity index 100% rename from graphics/pokemon/charizard/gigantamax/front.png rename to graphics/pokemon/gen_1/charizard/gigantamax/front.png diff --git a/graphics/pokemon/charizard/gigantamax/icon.png b/graphics/pokemon/gen_1/charizard/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/charizard/gigantamax/icon.png rename to graphics/pokemon/gen_1/charizard/gigantamax/icon.png diff --git a/graphics/pokemon/charizard/gigantamax/normal.pal b/graphics/pokemon/gen_1/charizard/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/charizard/gigantamax/normal.pal rename to graphics/pokemon/gen_1/charizard/gigantamax/normal.pal diff --git a/graphics/pokemon/charizard/gigantamax/shiny.pal b/graphics/pokemon/gen_1/charizard/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/charizard/gigantamax/shiny.pal rename to graphics/pokemon/gen_1/charizard/gigantamax/shiny.pal diff --git a/graphics/pokemon/charizard/icon.png b/graphics/pokemon/gen_1/charizard/icon.png similarity index 100% rename from graphics/pokemon/charizard/icon.png rename to graphics/pokemon/gen_1/charizard/icon.png diff --git a/graphics/pokemon/charizard/mega_x/back.png b/graphics/pokemon/gen_1/charizard/mega_x/back.png similarity index 100% rename from graphics/pokemon/charizard/mega_x/back.png rename to graphics/pokemon/gen_1/charizard/mega_x/back.png diff --git a/graphics/pokemon/charizard/mega_x/front.png b/graphics/pokemon/gen_1/charizard/mega_x/front.png similarity index 100% rename from graphics/pokemon/charizard/mega_x/front.png rename to graphics/pokemon/gen_1/charizard/mega_x/front.png diff --git a/graphics/pokemon/charizard/mega_x/icon.png b/graphics/pokemon/gen_1/charizard/mega_x/icon.png similarity index 100% rename from graphics/pokemon/charizard/mega_x/icon.png rename to graphics/pokemon/gen_1/charizard/mega_x/icon.png diff --git a/graphics/pokemon/charizard/mega_x/normal.pal b/graphics/pokemon/gen_1/charizard/mega_x/normal.pal similarity index 100% rename from graphics/pokemon/charizard/mega_x/normal.pal rename to graphics/pokemon/gen_1/charizard/mega_x/normal.pal diff --git a/graphics/pokemon/charizard/mega_x/shiny.pal b/graphics/pokemon/gen_1/charizard/mega_x/shiny.pal similarity index 100% rename from graphics/pokemon/charizard/mega_x/shiny.pal rename to graphics/pokemon/gen_1/charizard/mega_x/shiny.pal diff --git a/graphics/pokemon/charizard/mega_y/back.png b/graphics/pokemon/gen_1/charizard/mega_y/back.png similarity index 100% rename from graphics/pokemon/charizard/mega_y/back.png rename to graphics/pokemon/gen_1/charizard/mega_y/back.png diff --git a/graphics/pokemon/charizard/mega_y/front.png b/graphics/pokemon/gen_1/charizard/mega_y/front.png similarity index 100% rename from graphics/pokemon/charizard/mega_y/front.png rename to graphics/pokemon/gen_1/charizard/mega_y/front.png diff --git a/graphics/pokemon/charizard/mega_y/icon.png b/graphics/pokemon/gen_1/charizard/mega_y/icon.png similarity index 100% rename from graphics/pokemon/charizard/mega_y/icon.png rename to graphics/pokemon/gen_1/charizard/mega_y/icon.png diff --git a/graphics/pokemon/charizard/mega_y/normal.pal b/graphics/pokemon/gen_1/charizard/mega_y/normal.pal similarity index 100% rename from graphics/pokemon/charizard/mega_y/normal.pal rename to graphics/pokemon/gen_1/charizard/mega_y/normal.pal diff --git a/graphics/pokemon/charizard/mega_y/shiny.pal b/graphics/pokemon/gen_1/charizard/mega_y/shiny.pal similarity index 100% rename from graphics/pokemon/charizard/mega_y/shiny.pal rename to graphics/pokemon/gen_1/charizard/mega_y/shiny.pal diff --git a/graphics/pokemon/charizard/normal.pal b/graphics/pokemon/gen_1/charizard/normal.pal similarity index 100% rename from graphics/pokemon/charizard/normal.pal rename to graphics/pokemon/gen_1/charizard/normal.pal diff --git a/graphics/pokemon/charizard/shiny.pal b/graphics/pokemon/gen_1/charizard/shiny.pal similarity index 100% rename from graphics/pokemon/charizard/shiny.pal rename to graphics/pokemon/gen_1/charizard/shiny.pal diff --git a/graphics/pokemon/charmander/anim_front.png b/graphics/pokemon/gen_1/charmander/anim_front.png similarity index 100% rename from graphics/pokemon/charmander/anim_front.png rename to graphics/pokemon/gen_1/charmander/anim_front.png diff --git a/graphics/pokemon/charmander/back.png b/graphics/pokemon/gen_1/charmander/back.png similarity index 100% rename from graphics/pokemon/charmander/back.png rename to graphics/pokemon/gen_1/charmander/back.png diff --git a/graphics/pokemon/charmander/footprint.png b/graphics/pokemon/gen_1/charmander/footprint.png similarity index 100% rename from graphics/pokemon/charmander/footprint.png rename to graphics/pokemon/gen_1/charmander/footprint.png diff --git a/graphics/pokemon/charmander/icon.png b/graphics/pokemon/gen_1/charmander/icon.png similarity index 100% rename from graphics/pokemon/charmander/icon.png rename to graphics/pokemon/gen_1/charmander/icon.png diff --git a/graphics/pokemon/charmander/normal.pal b/graphics/pokemon/gen_1/charmander/normal.pal similarity index 100% rename from graphics/pokemon/charmander/normal.pal rename to graphics/pokemon/gen_1/charmander/normal.pal diff --git a/graphics/pokemon/charmander/shiny.pal b/graphics/pokemon/gen_1/charmander/shiny.pal similarity index 100% rename from graphics/pokemon/charmander/shiny.pal rename to graphics/pokemon/gen_1/charmander/shiny.pal diff --git a/graphics/pokemon/charmeleon/anim_front.png b/graphics/pokemon/gen_1/charmeleon/anim_front.png similarity index 100% rename from graphics/pokemon/charmeleon/anim_front.png rename to graphics/pokemon/gen_1/charmeleon/anim_front.png diff --git a/graphics/pokemon/charmeleon/back.png b/graphics/pokemon/gen_1/charmeleon/back.png similarity index 100% rename from graphics/pokemon/charmeleon/back.png rename to graphics/pokemon/gen_1/charmeleon/back.png diff --git a/graphics/pokemon/charmeleon/footprint.png b/graphics/pokemon/gen_1/charmeleon/footprint.png similarity index 100% rename from graphics/pokemon/charmeleon/footprint.png rename to graphics/pokemon/gen_1/charmeleon/footprint.png diff --git a/graphics/pokemon/charmeleon/icon.png b/graphics/pokemon/gen_1/charmeleon/icon.png similarity index 100% rename from graphics/pokemon/charmeleon/icon.png rename to graphics/pokemon/gen_1/charmeleon/icon.png diff --git a/graphics/pokemon/charmeleon/normal.pal b/graphics/pokemon/gen_1/charmeleon/normal.pal similarity index 100% rename from graphics/pokemon/charmeleon/normal.pal rename to graphics/pokemon/gen_1/charmeleon/normal.pal diff --git a/graphics/pokemon/charmeleon/shiny.pal b/graphics/pokemon/gen_1/charmeleon/shiny.pal similarity index 100% rename from graphics/pokemon/charmeleon/shiny.pal rename to graphics/pokemon/gen_1/charmeleon/shiny.pal diff --git a/graphics/pokemon/clefable/anim_front.png b/graphics/pokemon/gen_1/clefable/anim_front.png similarity index 100% rename from graphics/pokemon/clefable/anim_front.png rename to graphics/pokemon/gen_1/clefable/anim_front.png diff --git a/graphics/pokemon/clefable/back.png b/graphics/pokemon/gen_1/clefable/back.png similarity index 100% rename from graphics/pokemon/clefable/back.png rename to graphics/pokemon/gen_1/clefable/back.png diff --git a/graphics/pokemon/clefable/footprint.png b/graphics/pokemon/gen_1/clefable/footprint.png similarity index 100% rename from graphics/pokemon/clefable/footprint.png rename to graphics/pokemon/gen_1/clefable/footprint.png diff --git a/graphics/pokemon/clefable/icon.png b/graphics/pokemon/gen_1/clefable/icon.png similarity index 100% rename from graphics/pokemon/clefable/icon.png rename to graphics/pokemon/gen_1/clefable/icon.png diff --git a/graphics/pokemon/clefable/normal.pal b/graphics/pokemon/gen_1/clefable/normal.pal similarity index 100% rename from graphics/pokemon/clefable/normal.pal rename to graphics/pokemon/gen_1/clefable/normal.pal diff --git a/graphics/pokemon/clefable/shiny.pal b/graphics/pokemon/gen_1/clefable/shiny.pal similarity index 100% rename from graphics/pokemon/clefable/shiny.pal rename to graphics/pokemon/gen_1/clefable/shiny.pal diff --git a/graphics/pokemon/clefairy/anim_front.png b/graphics/pokemon/gen_1/clefairy/anim_front.png similarity index 100% rename from graphics/pokemon/clefairy/anim_front.png rename to graphics/pokemon/gen_1/clefairy/anim_front.png diff --git a/graphics/pokemon/clefairy/back.png b/graphics/pokemon/gen_1/clefairy/back.png similarity index 100% rename from graphics/pokemon/clefairy/back.png rename to graphics/pokemon/gen_1/clefairy/back.png diff --git a/graphics/pokemon/chewtle/footprint.png b/graphics/pokemon/gen_1/clefairy/footprint.png similarity index 100% rename from graphics/pokemon/chewtle/footprint.png rename to graphics/pokemon/gen_1/clefairy/footprint.png diff --git a/graphics/pokemon/clefairy/icon.png b/graphics/pokemon/gen_1/clefairy/icon.png similarity index 100% rename from graphics/pokemon/clefairy/icon.png rename to graphics/pokemon/gen_1/clefairy/icon.png diff --git a/graphics/pokemon/clefairy/normal.pal b/graphics/pokemon/gen_1/clefairy/normal.pal similarity index 100% rename from graphics/pokemon/clefairy/normal.pal rename to graphics/pokemon/gen_1/clefairy/normal.pal diff --git a/graphics/pokemon/clefairy/shiny.pal b/graphics/pokemon/gen_1/clefairy/shiny.pal similarity index 100% rename from graphics/pokemon/clefairy/shiny.pal rename to graphics/pokemon/gen_1/clefairy/shiny.pal diff --git a/graphics/pokemon/cloyster/anim_front.png b/graphics/pokemon/gen_1/cloyster/anim_front.png similarity index 100% rename from graphics/pokemon/cloyster/anim_front.png rename to graphics/pokemon/gen_1/cloyster/anim_front.png diff --git a/graphics/pokemon/cloyster/back.png b/graphics/pokemon/gen_1/cloyster/back.png similarity index 100% rename from graphics/pokemon/cloyster/back.png rename to graphics/pokemon/gen_1/cloyster/back.png diff --git a/graphics/pokemon/aegislash/footprint.png b/graphics/pokemon/gen_1/cloyster/footprint.png similarity index 100% rename from graphics/pokemon/aegislash/footprint.png rename to graphics/pokemon/gen_1/cloyster/footprint.png diff --git a/graphics/pokemon/cloyster/icon.png b/graphics/pokemon/gen_1/cloyster/icon.png similarity index 100% rename from graphics/pokemon/cloyster/icon.png rename to graphics/pokemon/gen_1/cloyster/icon.png diff --git a/graphics/pokemon/cloyster/normal.pal b/graphics/pokemon/gen_1/cloyster/normal.pal similarity index 100% rename from graphics/pokemon/cloyster/normal.pal rename to graphics/pokemon/gen_1/cloyster/normal.pal diff --git a/graphics/pokemon/cloyster/shiny.pal b/graphics/pokemon/gen_1/cloyster/shiny.pal similarity index 100% rename from graphics/pokemon/cloyster/shiny.pal rename to graphics/pokemon/gen_1/cloyster/shiny.pal diff --git a/graphics/pokemon/cubone/anim_front.png b/graphics/pokemon/gen_1/cubone/anim_front.png similarity index 100% rename from graphics/pokemon/cubone/anim_front.png rename to graphics/pokemon/gen_1/cubone/anim_front.png diff --git a/graphics/pokemon/cubone/back.png b/graphics/pokemon/gen_1/cubone/back.png similarity index 100% rename from graphics/pokemon/cubone/back.png rename to graphics/pokemon/gen_1/cubone/back.png diff --git a/graphics/pokemon/cubone/footprint.png b/graphics/pokemon/gen_1/cubone/footprint.png similarity index 100% rename from graphics/pokemon/cubone/footprint.png rename to graphics/pokemon/gen_1/cubone/footprint.png diff --git a/graphics/pokemon/cubone/icon.png b/graphics/pokemon/gen_1/cubone/icon.png similarity index 100% rename from graphics/pokemon/cubone/icon.png rename to graphics/pokemon/gen_1/cubone/icon.png diff --git a/graphics/pokemon/cubone/normal.pal b/graphics/pokemon/gen_1/cubone/normal.pal similarity index 100% rename from graphics/pokemon/cubone/normal.pal rename to graphics/pokemon/gen_1/cubone/normal.pal diff --git a/graphics/pokemon/cubone/shiny.pal b/graphics/pokemon/gen_1/cubone/shiny.pal similarity index 100% rename from graphics/pokemon/cubone/shiny.pal rename to graphics/pokemon/gen_1/cubone/shiny.pal diff --git a/graphics/pokemon/dewgong/anim_front.png b/graphics/pokemon/gen_1/dewgong/anim_front.png similarity index 100% rename from graphics/pokemon/dewgong/anim_front.png rename to graphics/pokemon/gen_1/dewgong/anim_front.png diff --git a/graphics/pokemon/dewgong/back.png b/graphics/pokemon/gen_1/dewgong/back.png similarity index 100% rename from graphics/pokemon/dewgong/back.png rename to graphics/pokemon/gen_1/dewgong/back.png diff --git a/graphics/pokemon/alcremie/footprint.png b/graphics/pokemon/gen_1/dewgong/footprint.png similarity index 100% rename from graphics/pokemon/alcremie/footprint.png rename to graphics/pokemon/gen_1/dewgong/footprint.png diff --git a/graphics/pokemon/dewgong/icon.png b/graphics/pokemon/gen_1/dewgong/icon.png similarity index 100% rename from graphics/pokemon/dewgong/icon.png rename to graphics/pokemon/gen_1/dewgong/icon.png diff --git a/graphics/pokemon/dewgong/normal.pal b/graphics/pokemon/gen_1/dewgong/normal.pal similarity index 100% rename from graphics/pokemon/dewgong/normal.pal rename to graphics/pokemon/gen_1/dewgong/normal.pal diff --git a/graphics/pokemon/dewgong/shiny.pal b/graphics/pokemon/gen_1/dewgong/shiny.pal similarity index 100% rename from graphics/pokemon/dewgong/shiny.pal rename to graphics/pokemon/gen_1/dewgong/shiny.pal diff --git a/graphics/pokemon/diglett/alolan/back.png b/graphics/pokemon/gen_1/diglett/alolan/back.png similarity index 100% rename from graphics/pokemon/diglett/alolan/back.png rename to graphics/pokemon/gen_1/diglett/alolan/back.png diff --git a/graphics/pokemon/diglett/alolan/front.png b/graphics/pokemon/gen_1/diglett/alolan/front.png similarity index 100% rename from graphics/pokemon/diglett/alolan/front.png rename to graphics/pokemon/gen_1/diglett/alolan/front.png diff --git a/graphics/pokemon/diglett/alolan/icon.png b/graphics/pokemon/gen_1/diglett/alolan/icon.png similarity index 100% rename from graphics/pokemon/diglett/alolan/icon.png rename to graphics/pokemon/gen_1/diglett/alolan/icon.png diff --git a/graphics/pokemon/diglett/alolan/normal.pal b/graphics/pokemon/gen_1/diglett/alolan/normal.pal similarity index 100% rename from graphics/pokemon/diglett/alolan/normal.pal rename to graphics/pokemon/gen_1/diglett/alolan/normal.pal diff --git a/graphics/pokemon/diglett/alolan/shiny.pal b/graphics/pokemon/gen_1/diglett/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/diglett/alolan/shiny.pal rename to graphics/pokemon/gen_1/diglett/alolan/shiny.pal diff --git a/graphics/pokemon/diglett/anim_front.png b/graphics/pokemon/gen_1/diglett/anim_front.png similarity index 100% rename from graphics/pokemon/diglett/anim_front.png rename to graphics/pokemon/gen_1/diglett/anim_front.png diff --git a/graphics/pokemon/diglett/back.png b/graphics/pokemon/gen_1/diglett/back.png similarity index 100% rename from graphics/pokemon/diglett/back.png rename to graphics/pokemon/gen_1/diglett/back.png diff --git a/graphics/pokemon/alomomola/footprint.png b/graphics/pokemon/gen_1/diglett/footprint.png similarity index 100% rename from graphics/pokemon/alomomola/footprint.png rename to graphics/pokemon/gen_1/diglett/footprint.png diff --git a/graphics/pokemon/diglett/icon.png b/graphics/pokemon/gen_1/diglett/icon.png similarity index 100% rename from graphics/pokemon/diglett/icon.png rename to graphics/pokemon/gen_1/diglett/icon.png diff --git a/graphics/pokemon/diglett/normal.pal b/graphics/pokemon/gen_1/diglett/normal.pal similarity index 100% rename from graphics/pokemon/diglett/normal.pal rename to graphics/pokemon/gen_1/diglett/normal.pal diff --git a/graphics/pokemon/diglett/shiny.pal b/graphics/pokemon/gen_1/diglett/shiny.pal similarity index 100% rename from graphics/pokemon/diglett/shiny.pal rename to graphics/pokemon/gen_1/diglett/shiny.pal diff --git a/graphics/pokemon/ditto/anim_front.png b/graphics/pokemon/gen_1/ditto/anim_front.png similarity index 100% rename from graphics/pokemon/ditto/anim_front.png rename to graphics/pokemon/gen_1/ditto/anim_front.png diff --git a/graphics/pokemon/ditto/back.png b/graphics/pokemon/gen_1/ditto/back.png similarity index 100% rename from graphics/pokemon/ditto/back.png rename to graphics/pokemon/gen_1/ditto/back.png diff --git a/graphics/pokemon/amoonguss/footprint.png b/graphics/pokemon/gen_1/ditto/footprint.png similarity index 100% rename from graphics/pokemon/amoonguss/footprint.png rename to graphics/pokemon/gen_1/ditto/footprint.png diff --git a/graphics/pokemon/ditto/icon.png b/graphics/pokemon/gen_1/ditto/icon.png similarity index 100% rename from graphics/pokemon/ditto/icon.png rename to graphics/pokemon/gen_1/ditto/icon.png diff --git a/graphics/pokemon/ditto/normal.pal b/graphics/pokemon/gen_1/ditto/normal.pal similarity index 100% rename from graphics/pokemon/ditto/normal.pal rename to graphics/pokemon/gen_1/ditto/normal.pal diff --git a/graphics/pokemon/ditto/shiny.pal b/graphics/pokemon/gen_1/ditto/shiny.pal similarity index 100% rename from graphics/pokemon/ditto/shiny.pal rename to graphics/pokemon/gen_1/ditto/shiny.pal diff --git a/graphics/pokemon/dodrio/anim_front.png b/graphics/pokemon/gen_1/dodrio/anim_front.png similarity index 100% rename from graphics/pokemon/dodrio/anim_front.png rename to graphics/pokemon/gen_1/dodrio/anim_front.png diff --git a/graphics/pokemon/dodrio/anim_frontf.png b/graphics/pokemon/gen_1/dodrio/anim_frontf.png similarity index 100% rename from graphics/pokemon/dodrio/anim_frontf.png rename to graphics/pokemon/gen_1/dodrio/anim_frontf.png diff --git a/graphics/pokemon/dodrio/back.png b/graphics/pokemon/gen_1/dodrio/back.png similarity index 100% rename from graphics/pokemon/dodrio/back.png rename to graphics/pokemon/gen_1/dodrio/back.png diff --git a/graphics/pokemon/dodrio/backf.png b/graphics/pokemon/gen_1/dodrio/backf.png similarity index 100% rename from graphics/pokemon/dodrio/backf.png rename to graphics/pokemon/gen_1/dodrio/backf.png diff --git a/graphics/pokemon/dodrio/footprint.png b/graphics/pokemon/gen_1/dodrio/footprint.png similarity index 100% rename from graphics/pokemon/dodrio/footprint.png rename to graphics/pokemon/gen_1/dodrio/footprint.png diff --git a/graphics/pokemon/dodrio/icon.png b/graphics/pokemon/gen_1/dodrio/icon.png similarity index 100% rename from graphics/pokemon/dodrio/icon.png rename to graphics/pokemon/gen_1/dodrio/icon.png diff --git a/graphics/pokemon/dodrio/normal.pal b/graphics/pokemon/gen_1/dodrio/normal.pal similarity index 100% rename from graphics/pokemon/dodrio/normal.pal rename to graphics/pokemon/gen_1/dodrio/normal.pal diff --git a/graphics/pokemon/dodrio/shiny.pal b/graphics/pokemon/gen_1/dodrio/shiny.pal similarity index 100% rename from graphics/pokemon/dodrio/shiny.pal rename to graphics/pokemon/gen_1/dodrio/shiny.pal diff --git a/graphics/pokemon/doduo/anim_front.png b/graphics/pokemon/gen_1/doduo/anim_front.png similarity index 100% rename from graphics/pokemon/doduo/anim_front.png rename to graphics/pokemon/gen_1/doduo/anim_front.png diff --git a/graphics/pokemon/doduo/anim_frontf.png b/graphics/pokemon/gen_1/doduo/anim_frontf.png similarity index 100% rename from graphics/pokemon/doduo/anim_frontf.png rename to graphics/pokemon/gen_1/doduo/anim_frontf.png diff --git a/graphics/pokemon/doduo/back.png b/graphics/pokemon/gen_1/doduo/back.png similarity index 100% rename from graphics/pokemon/doduo/back.png rename to graphics/pokemon/gen_1/doduo/back.png diff --git a/graphics/pokemon/doduo/backf.png b/graphics/pokemon/gen_1/doduo/backf.png similarity index 100% rename from graphics/pokemon/doduo/backf.png rename to graphics/pokemon/gen_1/doduo/backf.png diff --git a/graphics/pokemon/doduo/footprint.png b/graphics/pokemon/gen_1/doduo/footprint.png similarity index 100% rename from graphics/pokemon/doduo/footprint.png rename to graphics/pokemon/gen_1/doduo/footprint.png diff --git a/graphics/pokemon/doduo/icon.png b/graphics/pokemon/gen_1/doduo/icon.png similarity index 100% rename from graphics/pokemon/doduo/icon.png rename to graphics/pokemon/gen_1/doduo/icon.png diff --git a/graphics/pokemon/doduo/normal.pal b/graphics/pokemon/gen_1/doduo/normal.pal similarity index 100% rename from graphics/pokemon/doduo/normal.pal rename to graphics/pokemon/gen_1/doduo/normal.pal diff --git a/graphics/pokemon/doduo/shiny.pal b/graphics/pokemon/gen_1/doduo/shiny.pal similarity index 100% rename from graphics/pokemon/doduo/shiny.pal rename to graphics/pokemon/gen_1/doduo/shiny.pal diff --git a/graphics/pokemon/dragonair/anim_front.png b/graphics/pokemon/gen_1/dragonair/anim_front.png similarity index 100% rename from graphics/pokemon/dragonair/anim_front.png rename to graphics/pokemon/gen_1/dragonair/anim_front.png diff --git a/graphics/pokemon/dragonair/back.png b/graphics/pokemon/gen_1/dragonair/back.png similarity index 100% rename from graphics/pokemon/dragonair/back.png rename to graphics/pokemon/gen_1/dragonair/back.png diff --git a/graphics/pokemon/anorith/footprint.png b/graphics/pokemon/gen_1/dragonair/footprint.png similarity index 100% rename from graphics/pokemon/anorith/footprint.png rename to graphics/pokemon/gen_1/dragonair/footprint.png diff --git a/graphics/pokemon/dragonair/icon.png b/graphics/pokemon/gen_1/dragonair/icon.png similarity index 100% rename from graphics/pokemon/dragonair/icon.png rename to graphics/pokemon/gen_1/dragonair/icon.png diff --git a/graphics/pokemon/dragonair/normal.pal b/graphics/pokemon/gen_1/dragonair/normal.pal similarity index 100% rename from graphics/pokemon/dragonair/normal.pal rename to graphics/pokemon/gen_1/dragonair/normal.pal diff --git a/graphics/pokemon/dragonair/shiny.pal b/graphics/pokemon/gen_1/dragonair/shiny.pal similarity index 100% rename from graphics/pokemon/dragonair/shiny.pal rename to graphics/pokemon/gen_1/dragonair/shiny.pal diff --git a/graphics/pokemon/dragonite/anim_front.png b/graphics/pokemon/gen_1/dragonite/anim_front.png similarity index 100% rename from graphics/pokemon/dragonite/anim_front.png rename to graphics/pokemon/gen_1/dragonite/anim_front.png diff --git a/graphics/pokemon/dragonite/back.png b/graphics/pokemon/gen_1/dragonite/back.png similarity index 100% rename from graphics/pokemon/dragonite/back.png rename to graphics/pokemon/gen_1/dragonite/back.png diff --git a/graphics/pokemon/dracovish/footprint.png b/graphics/pokemon/gen_1/dragonite/footprint.png similarity index 100% rename from graphics/pokemon/dracovish/footprint.png rename to graphics/pokemon/gen_1/dragonite/footprint.png diff --git a/graphics/pokemon/dragonite/icon.png b/graphics/pokemon/gen_1/dragonite/icon.png similarity index 100% rename from graphics/pokemon/dragonite/icon.png rename to graphics/pokemon/gen_1/dragonite/icon.png diff --git a/graphics/pokemon/dragonite/normal.pal b/graphics/pokemon/gen_1/dragonite/normal.pal similarity index 100% rename from graphics/pokemon/dragonite/normal.pal rename to graphics/pokemon/gen_1/dragonite/normal.pal diff --git a/graphics/pokemon/dragonite/shiny.pal b/graphics/pokemon/gen_1/dragonite/shiny.pal similarity index 100% rename from graphics/pokemon/dragonite/shiny.pal rename to graphics/pokemon/gen_1/dragonite/shiny.pal diff --git a/graphics/pokemon/dratini/anim_front.png b/graphics/pokemon/gen_1/dratini/anim_front.png similarity index 100% rename from graphics/pokemon/dratini/anim_front.png rename to graphics/pokemon/gen_1/dratini/anim_front.png diff --git a/graphics/pokemon/dratini/back.png b/graphics/pokemon/gen_1/dratini/back.png similarity index 100% rename from graphics/pokemon/dratini/back.png rename to graphics/pokemon/gen_1/dratini/back.png diff --git a/graphics/pokemon/applin/footprint.png b/graphics/pokemon/gen_1/dratini/footprint.png similarity index 100% rename from graphics/pokemon/applin/footprint.png rename to graphics/pokemon/gen_1/dratini/footprint.png diff --git a/graphics/pokemon/dratini/icon.png b/graphics/pokemon/gen_1/dratini/icon.png similarity index 100% rename from graphics/pokemon/dratini/icon.png rename to graphics/pokemon/gen_1/dratini/icon.png diff --git a/graphics/pokemon/dratini/normal.pal b/graphics/pokemon/gen_1/dratini/normal.pal similarity index 100% rename from graphics/pokemon/dratini/normal.pal rename to graphics/pokemon/gen_1/dratini/normal.pal diff --git a/graphics/pokemon/dratini/shiny.pal b/graphics/pokemon/gen_1/dratini/shiny.pal similarity index 100% rename from graphics/pokemon/dratini/shiny.pal rename to graphics/pokemon/gen_1/dratini/shiny.pal diff --git a/graphics/pokemon/drowzee/anim_front.png b/graphics/pokemon/gen_1/drowzee/anim_front.png similarity index 100% rename from graphics/pokemon/drowzee/anim_front.png rename to graphics/pokemon/gen_1/drowzee/anim_front.png diff --git a/graphics/pokemon/drowzee/back.png b/graphics/pokemon/gen_1/drowzee/back.png similarity index 100% rename from graphics/pokemon/drowzee/back.png rename to graphics/pokemon/gen_1/drowzee/back.png diff --git a/graphics/pokemon/drowzee/footprint.png b/graphics/pokemon/gen_1/drowzee/footprint.png similarity index 100% rename from graphics/pokemon/drowzee/footprint.png rename to graphics/pokemon/gen_1/drowzee/footprint.png diff --git a/graphics/pokemon/drowzee/icon.png b/graphics/pokemon/gen_1/drowzee/icon.png similarity index 100% rename from graphics/pokemon/drowzee/icon.png rename to graphics/pokemon/gen_1/drowzee/icon.png diff --git a/graphics/pokemon/drowzee/normal.pal b/graphics/pokemon/gen_1/drowzee/normal.pal similarity index 100% rename from graphics/pokemon/drowzee/normal.pal rename to graphics/pokemon/gen_1/drowzee/normal.pal diff --git a/graphics/pokemon/drowzee/shiny.pal b/graphics/pokemon/gen_1/drowzee/shiny.pal similarity index 100% rename from graphics/pokemon/drowzee/shiny.pal rename to graphics/pokemon/gen_1/drowzee/shiny.pal diff --git a/graphics/pokemon/dugtrio/alolan/back.png b/graphics/pokemon/gen_1/dugtrio/alolan/back.png similarity index 100% rename from graphics/pokemon/dugtrio/alolan/back.png rename to graphics/pokemon/gen_1/dugtrio/alolan/back.png diff --git a/graphics/pokemon/dugtrio/alolan/front.png b/graphics/pokemon/gen_1/dugtrio/alolan/front.png similarity index 100% rename from graphics/pokemon/dugtrio/alolan/front.png rename to graphics/pokemon/gen_1/dugtrio/alolan/front.png diff --git a/graphics/pokemon/dugtrio/alolan/icon.png b/graphics/pokemon/gen_1/dugtrio/alolan/icon.png similarity index 100% rename from graphics/pokemon/dugtrio/alolan/icon.png rename to graphics/pokemon/gen_1/dugtrio/alolan/icon.png diff --git a/graphics/pokemon/dugtrio/alolan/normal.pal b/graphics/pokemon/gen_1/dugtrio/alolan/normal.pal similarity index 100% rename from graphics/pokemon/dugtrio/alolan/normal.pal rename to graphics/pokemon/gen_1/dugtrio/alolan/normal.pal diff --git a/graphics/pokemon/dugtrio/alolan/shiny.pal b/graphics/pokemon/gen_1/dugtrio/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/dugtrio/alolan/shiny.pal rename to graphics/pokemon/gen_1/dugtrio/alolan/shiny.pal diff --git a/graphics/pokemon/dugtrio/anim_front.png b/graphics/pokemon/gen_1/dugtrio/anim_front.png similarity index 100% rename from graphics/pokemon/dugtrio/anim_front.png rename to graphics/pokemon/gen_1/dugtrio/anim_front.png diff --git a/graphics/pokemon/dugtrio/back.png b/graphics/pokemon/gen_1/dugtrio/back.png similarity index 100% rename from graphics/pokemon/dugtrio/back.png rename to graphics/pokemon/gen_1/dugtrio/back.png diff --git a/graphics/pokemon/arbok/footprint.png b/graphics/pokemon/gen_1/dugtrio/footprint.png similarity index 100% rename from graphics/pokemon/arbok/footprint.png rename to graphics/pokemon/gen_1/dugtrio/footprint.png diff --git a/graphics/pokemon/dugtrio/icon.png b/graphics/pokemon/gen_1/dugtrio/icon.png similarity index 100% rename from graphics/pokemon/dugtrio/icon.png rename to graphics/pokemon/gen_1/dugtrio/icon.png diff --git a/graphics/pokemon/dugtrio/normal.pal b/graphics/pokemon/gen_1/dugtrio/normal.pal similarity index 100% rename from graphics/pokemon/dugtrio/normal.pal rename to graphics/pokemon/gen_1/dugtrio/normal.pal diff --git a/graphics/pokemon/dugtrio/shiny.pal b/graphics/pokemon/gen_1/dugtrio/shiny.pal similarity index 100% rename from graphics/pokemon/dugtrio/shiny.pal rename to graphics/pokemon/gen_1/dugtrio/shiny.pal diff --git a/graphics/pokemon/eevee/anim_front.png b/graphics/pokemon/gen_1/eevee/anim_front.png similarity index 100% rename from graphics/pokemon/eevee/anim_front.png rename to graphics/pokemon/gen_1/eevee/anim_front.png diff --git a/graphics/pokemon/eevee/anim_frontf.png b/graphics/pokemon/gen_1/eevee/anim_frontf.png similarity index 100% rename from graphics/pokemon/eevee/anim_frontf.png rename to graphics/pokemon/gen_1/eevee/anim_frontf.png diff --git a/graphics/pokemon/eevee/back.png b/graphics/pokemon/gen_1/eevee/back.png similarity index 100% rename from graphics/pokemon/eevee/back.png rename to graphics/pokemon/gen_1/eevee/back.png diff --git a/graphics/pokemon/eevee/backf.png b/graphics/pokemon/gen_1/eevee/backf.png similarity index 100% rename from graphics/pokemon/eevee/backf.png rename to graphics/pokemon/gen_1/eevee/backf.png diff --git a/graphics/pokemon/eevee/footprint.png b/graphics/pokemon/gen_1/eevee/footprint.png similarity index 100% rename from graphics/pokemon/eevee/footprint.png rename to graphics/pokemon/gen_1/eevee/footprint.png diff --git a/graphics/pokemon/eevee/frontf.png b/graphics/pokemon/gen_1/eevee/frontf.png similarity index 100% rename from graphics/pokemon/eevee/frontf.png rename to graphics/pokemon/gen_1/eevee/frontf.png diff --git a/graphics/pokemon/eevee/gigantamax/back.png b/graphics/pokemon/gen_1/eevee/gigantamax/back.png similarity index 100% rename from graphics/pokemon/eevee/gigantamax/back.png rename to graphics/pokemon/gen_1/eevee/gigantamax/back.png diff --git a/graphics/pokemon/eevee/gigantamax/front.png b/graphics/pokemon/gen_1/eevee/gigantamax/front.png similarity index 100% rename from graphics/pokemon/eevee/gigantamax/front.png rename to graphics/pokemon/gen_1/eevee/gigantamax/front.png diff --git a/graphics/pokemon/eevee/gigantamax/icon.png b/graphics/pokemon/gen_1/eevee/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/eevee/gigantamax/icon.png rename to graphics/pokemon/gen_1/eevee/gigantamax/icon.png diff --git a/graphics/pokemon/eevee/gigantamax/normal.pal b/graphics/pokemon/gen_1/eevee/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/eevee/gigantamax/normal.pal rename to graphics/pokemon/gen_1/eevee/gigantamax/normal.pal diff --git a/graphics/pokemon/eevee/gigantamax/shiny.pal b/graphics/pokemon/gen_1/eevee/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/eevee/gigantamax/shiny.pal rename to graphics/pokemon/gen_1/eevee/gigantamax/shiny.pal diff --git a/graphics/pokemon/eevee/icon.png b/graphics/pokemon/gen_1/eevee/icon.png similarity index 100% rename from graphics/pokemon/eevee/icon.png rename to graphics/pokemon/gen_1/eevee/icon.png diff --git a/graphics/pokemon/eevee/normal.pal b/graphics/pokemon/gen_1/eevee/normal.pal similarity index 100% rename from graphics/pokemon/eevee/normal.pal rename to graphics/pokemon/gen_1/eevee/normal.pal diff --git a/graphics/pokemon/eevee/shiny.pal b/graphics/pokemon/gen_1/eevee/shiny.pal similarity index 100% rename from graphics/pokemon/eevee/shiny.pal rename to graphics/pokemon/gen_1/eevee/shiny.pal diff --git a/graphics/pokemon/ekans/anim_front.png b/graphics/pokemon/gen_1/ekans/anim_front.png similarity index 100% rename from graphics/pokemon/ekans/anim_front.png rename to graphics/pokemon/gen_1/ekans/anim_front.png diff --git a/graphics/pokemon/ekans/back.png b/graphics/pokemon/gen_1/ekans/back.png similarity index 100% rename from graphics/pokemon/ekans/back.png rename to graphics/pokemon/gen_1/ekans/back.png diff --git a/graphics/pokemon/arrokuda/footprint.png b/graphics/pokemon/gen_1/ekans/footprint.png similarity index 100% rename from graphics/pokemon/arrokuda/footprint.png rename to graphics/pokemon/gen_1/ekans/footprint.png diff --git a/graphics/pokemon/ekans/icon.png b/graphics/pokemon/gen_1/ekans/icon.png similarity index 100% rename from graphics/pokemon/ekans/icon.png rename to graphics/pokemon/gen_1/ekans/icon.png diff --git a/graphics/pokemon/ekans/normal.pal b/graphics/pokemon/gen_1/ekans/normal.pal similarity index 100% rename from graphics/pokemon/ekans/normal.pal rename to graphics/pokemon/gen_1/ekans/normal.pal diff --git a/graphics/pokemon/ekans/shiny.pal b/graphics/pokemon/gen_1/ekans/shiny.pal similarity index 100% rename from graphics/pokemon/ekans/shiny.pal rename to graphics/pokemon/gen_1/ekans/shiny.pal diff --git a/graphics/pokemon/electabuzz/anim_front.png b/graphics/pokemon/gen_1/electabuzz/anim_front.png similarity index 100% rename from graphics/pokemon/electabuzz/anim_front.png rename to graphics/pokemon/gen_1/electabuzz/anim_front.png diff --git a/graphics/pokemon/electabuzz/back.png b/graphics/pokemon/gen_1/electabuzz/back.png similarity index 100% rename from graphics/pokemon/electabuzz/back.png rename to graphics/pokemon/gen_1/electabuzz/back.png diff --git a/graphics/pokemon/electabuzz/footprint.png b/graphics/pokemon/gen_1/electabuzz/footprint.png similarity index 100% rename from graphics/pokemon/electabuzz/footprint.png rename to graphics/pokemon/gen_1/electabuzz/footprint.png diff --git a/graphics/pokemon/electabuzz/icon.png b/graphics/pokemon/gen_1/electabuzz/icon.png similarity index 100% rename from graphics/pokemon/electabuzz/icon.png rename to graphics/pokemon/gen_1/electabuzz/icon.png diff --git a/graphics/pokemon/electabuzz/normal.pal b/graphics/pokemon/gen_1/electabuzz/normal.pal similarity index 100% rename from graphics/pokemon/electabuzz/normal.pal rename to graphics/pokemon/gen_1/electabuzz/normal.pal diff --git a/graphics/pokemon/electabuzz/shiny.pal b/graphics/pokemon/gen_1/electabuzz/shiny.pal similarity index 100% rename from graphics/pokemon/electabuzz/shiny.pal rename to graphics/pokemon/gen_1/electabuzz/shiny.pal diff --git a/graphics/pokemon/electrode/anim_front.png b/graphics/pokemon/gen_1/electrode/anim_front.png similarity index 100% rename from graphics/pokemon/electrode/anim_front.png rename to graphics/pokemon/gen_1/electrode/anim_front.png diff --git a/graphics/pokemon/electrode/back.png b/graphics/pokemon/gen_1/electrode/back.png similarity index 100% rename from graphics/pokemon/electrode/back.png rename to graphics/pokemon/gen_1/electrode/back.png diff --git a/graphics/pokemon/barboach/footprint.png b/graphics/pokemon/gen_1/electrode/footprint.png similarity index 100% rename from graphics/pokemon/barboach/footprint.png rename to graphics/pokemon/gen_1/electrode/footprint.png diff --git a/graphics/pokemon/electrode/hisuian/back.png b/graphics/pokemon/gen_1/electrode/hisuian/back.png similarity index 100% rename from graphics/pokemon/electrode/hisuian/back.png rename to graphics/pokemon/gen_1/electrode/hisuian/back.png diff --git a/graphics/pokemon/electrode/hisuian/front.png b/graphics/pokemon/gen_1/electrode/hisuian/front.png similarity index 100% rename from graphics/pokemon/electrode/hisuian/front.png rename to graphics/pokemon/gen_1/electrode/hisuian/front.png diff --git a/graphics/pokemon/electrode/hisuian/icon.png b/graphics/pokemon/gen_1/electrode/hisuian/icon.png similarity index 100% rename from graphics/pokemon/electrode/hisuian/icon.png rename to graphics/pokemon/gen_1/electrode/hisuian/icon.png diff --git a/graphics/pokemon/electrode/hisuian/normal.pal b/graphics/pokemon/gen_1/electrode/hisuian/normal.pal similarity index 100% rename from graphics/pokemon/electrode/hisuian/normal.pal rename to graphics/pokemon/gen_1/electrode/hisuian/normal.pal diff --git a/graphics/pokemon/electrode/hisuian/shiny.pal b/graphics/pokemon/gen_1/electrode/hisuian/shiny.pal similarity index 100% rename from graphics/pokemon/electrode/hisuian/shiny.pal rename to graphics/pokemon/gen_1/electrode/hisuian/shiny.pal diff --git a/graphics/pokemon/electrode/icon.png b/graphics/pokemon/gen_1/electrode/icon.png similarity index 100% rename from graphics/pokemon/electrode/icon.png rename to graphics/pokemon/gen_1/electrode/icon.png diff --git a/graphics/pokemon/electrode/normal.pal b/graphics/pokemon/gen_1/electrode/normal.pal similarity index 100% rename from graphics/pokemon/electrode/normal.pal rename to graphics/pokemon/gen_1/electrode/normal.pal diff --git a/graphics/pokemon/electrode/shiny.pal b/graphics/pokemon/gen_1/electrode/shiny.pal similarity index 100% rename from graphics/pokemon/electrode/shiny.pal rename to graphics/pokemon/gen_1/electrode/shiny.pal diff --git a/graphics/pokemon/exeggcute/anim_front.png b/graphics/pokemon/gen_1/exeggcute/anim_front.png similarity index 100% rename from graphics/pokemon/exeggcute/anim_front.png rename to graphics/pokemon/gen_1/exeggcute/anim_front.png diff --git a/graphics/pokemon/exeggcute/back.png b/graphics/pokemon/gen_1/exeggcute/back.png similarity index 100% rename from graphics/pokemon/exeggcute/back.png rename to graphics/pokemon/gen_1/exeggcute/back.png diff --git a/graphics/pokemon/barraskewda/footprint.png b/graphics/pokemon/gen_1/exeggcute/footprint.png similarity index 100% rename from graphics/pokemon/barraskewda/footprint.png rename to graphics/pokemon/gen_1/exeggcute/footprint.png diff --git a/graphics/pokemon/exeggcute/icon.png b/graphics/pokemon/gen_1/exeggcute/icon.png similarity index 100% rename from graphics/pokemon/exeggcute/icon.png rename to graphics/pokemon/gen_1/exeggcute/icon.png diff --git a/graphics/pokemon/exeggcute/normal.pal b/graphics/pokemon/gen_1/exeggcute/normal.pal similarity index 100% rename from graphics/pokemon/exeggcute/normal.pal rename to graphics/pokemon/gen_1/exeggcute/normal.pal diff --git a/graphics/pokemon/exeggcute/shiny.pal b/graphics/pokemon/gen_1/exeggcute/shiny.pal similarity index 100% rename from graphics/pokemon/exeggcute/shiny.pal rename to graphics/pokemon/gen_1/exeggcute/shiny.pal diff --git a/graphics/pokemon/exeggutor/alolan/anim_front.png b/graphics/pokemon/gen_1/exeggutor/alolan/anim_front.png similarity index 100% rename from graphics/pokemon/exeggutor/alolan/anim_front.png rename to graphics/pokemon/gen_1/exeggutor/alolan/anim_front.png diff --git a/graphics/pokemon/exeggutor/alolan/back.png b/graphics/pokemon/gen_1/exeggutor/alolan/back.png similarity index 100% rename from graphics/pokemon/exeggutor/alolan/back.png rename to graphics/pokemon/gen_1/exeggutor/alolan/back.png diff --git a/graphics/pokemon/exeggutor/alolan/icon.png b/graphics/pokemon/gen_1/exeggutor/alolan/icon.png similarity index 100% rename from graphics/pokemon/exeggutor/alolan/icon.png rename to graphics/pokemon/gen_1/exeggutor/alolan/icon.png diff --git a/graphics/pokemon/exeggutor/alolan/normal.pal b/graphics/pokemon/gen_1/exeggutor/alolan/normal.pal similarity index 100% rename from graphics/pokemon/exeggutor/alolan/normal.pal rename to graphics/pokemon/gen_1/exeggutor/alolan/normal.pal diff --git a/graphics/pokemon/exeggutor/alolan/shiny.pal b/graphics/pokemon/gen_1/exeggutor/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/exeggutor/alolan/shiny.pal rename to graphics/pokemon/gen_1/exeggutor/alolan/shiny.pal diff --git a/graphics/pokemon/exeggutor/anim_front.png b/graphics/pokemon/gen_1/exeggutor/anim_front.png similarity index 100% rename from graphics/pokemon/exeggutor/anim_front.png rename to graphics/pokemon/gen_1/exeggutor/anim_front.png diff --git a/graphics/pokemon/exeggutor/back.png b/graphics/pokemon/gen_1/exeggutor/back.png similarity index 100% rename from graphics/pokemon/exeggutor/back.png rename to graphics/pokemon/gen_1/exeggutor/back.png diff --git a/graphics/pokemon/exeggutor/footprint.png b/graphics/pokemon/gen_1/exeggutor/footprint.png similarity index 100% rename from graphics/pokemon/exeggutor/footprint.png rename to graphics/pokemon/gen_1/exeggutor/footprint.png diff --git a/graphics/pokemon/exeggutor/icon.png b/graphics/pokemon/gen_1/exeggutor/icon.png similarity index 100% rename from graphics/pokemon/exeggutor/icon.png rename to graphics/pokemon/gen_1/exeggutor/icon.png diff --git a/graphics/pokemon/exeggutor/normal.pal b/graphics/pokemon/gen_1/exeggutor/normal.pal similarity index 100% rename from graphics/pokemon/exeggutor/normal.pal rename to graphics/pokemon/gen_1/exeggutor/normal.pal diff --git a/graphics/pokemon/exeggutor/shiny.pal b/graphics/pokemon/gen_1/exeggutor/shiny.pal similarity index 100% rename from graphics/pokemon/exeggutor/shiny.pal rename to graphics/pokemon/gen_1/exeggutor/shiny.pal diff --git a/graphics/pokemon/farfetchd/anim_front.png b/graphics/pokemon/gen_1/farfetchd/anim_front.png similarity index 100% rename from graphics/pokemon/farfetchd/anim_front.png rename to graphics/pokemon/gen_1/farfetchd/anim_front.png diff --git a/graphics/pokemon/farfetchd/back.png b/graphics/pokemon/gen_1/farfetchd/back.png similarity index 100% rename from graphics/pokemon/farfetchd/back.png rename to graphics/pokemon/gen_1/farfetchd/back.png diff --git a/graphics/pokemon/farfetchd/footprint.png b/graphics/pokemon/gen_1/farfetchd/footprint.png similarity index 100% rename from graphics/pokemon/farfetchd/footprint.png rename to graphics/pokemon/gen_1/farfetchd/footprint.png diff --git a/graphics/pokemon/farfetchd/galarian/back.png b/graphics/pokemon/gen_1/farfetchd/galarian/back.png similarity index 100% rename from graphics/pokemon/farfetchd/galarian/back.png rename to graphics/pokemon/gen_1/farfetchd/galarian/back.png diff --git a/graphics/pokemon/farfetchd/galarian/front.png b/graphics/pokemon/gen_1/farfetchd/galarian/front.png similarity index 100% rename from graphics/pokemon/farfetchd/galarian/front.png rename to graphics/pokemon/gen_1/farfetchd/galarian/front.png diff --git a/graphics/pokemon/farfetchd/galarian/icon.png b/graphics/pokemon/gen_1/farfetchd/galarian/icon.png similarity index 100% rename from graphics/pokemon/farfetchd/galarian/icon.png rename to graphics/pokemon/gen_1/farfetchd/galarian/icon.png diff --git a/graphics/pokemon/farfetchd/galarian/normal.pal b/graphics/pokemon/gen_1/farfetchd/galarian/normal.pal similarity index 100% rename from graphics/pokemon/farfetchd/galarian/normal.pal rename to graphics/pokemon/gen_1/farfetchd/galarian/normal.pal diff --git a/graphics/pokemon/farfetchd/galarian/shiny.pal b/graphics/pokemon/gen_1/farfetchd/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/farfetchd/galarian/shiny.pal rename to graphics/pokemon/gen_1/farfetchd/galarian/shiny.pal diff --git a/graphics/pokemon/farfetchd/icon.png b/graphics/pokemon/gen_1/farfetchd/icon.png similarity index 100% rename from graphics/pokemon/farfetchd/icon.png rename to graphics/pokemon/gen_1/farfetchd/icon.png diff --git a/graphics/pokemon/farfetchd/normal.pal b/graphics/pokemon/gen_1/farfetchd/normal.pal similarity index 100% rename from graphics/pokemon/farfetchd/normal.pal rename to graphics/pokemon/gen_1/farfetchd/normal.pal diff --git a/graphics/pokemon/farfetchd/shiny.pal b/graphics/pokemon/gen_1/farfetchd/shiny.pal similarity index 100% rename from graphics/pokemon/farfetchd/shiny.pal rename to graphics/pokemon/gen_1/farfetchd/shiny.pal diff --git a/graphics/pokemon/fearow/anim_front.png b/graphics/pokemon/gen_1/fearow/anim_front.png similarity index 100% rename from graphics/pokemon/fearow/anim_front.png rename to graphics/pokemon/gen_1/fearow/anim_front.png diff --git a/graphics/pokemon/fearow/back.png b/graphics/pokemon/gen_1/fearow/back.png similarity index 100% rename from graphics/pokemon/fearow/back.png rename to graphics/pokemon/gen_1/fearow/back.png diff --git a/graphics/pokemon/fearow/footprint.png b/graphics/pokemon/gen_1/fearow/footprint.png similarity index 100% rename from graphics/pokemon/fearow/footprint.png rename to graphics/pokemon/gen_1/fearow/footprint.png diff --git a/graphics/pokemon/fearow/icon.png b/graphics/pokemon/gen_1/fearow/icon.png similarity index 100% rename from graphics/pokemon/fearow/icon.png rename to graphics/pokemon/gen_1/fearow/icon.png diff --git a/graphics/pokemon/fearow/normal.pal b/graphics/pokemon/gen_1/fearow/normal.pal similarity index 100% rename from graphics/pokemon/fearow/normal.pal rename to graphics/pokemon/gen_1/fearow/normal.pal diff --git a/graphics/pokemon/fearow/shiny.pal b/graphics/pokemon/gen_1/fearow/shiny.pal similarity index 100% rename from graphics/pokemon/fearow/shiny.pal rename to graphics/pokemon/gen_1/fearow/shiny.pal diff --git a/graphics/pokemon/flareon/anim_front.png b/graphics/pokemon/gen_1/flareon/anim_front.png similarity index 100% rename from graphics/pokemon/flareon/anim_front.png rename to graphics/pokemon/gen_1/flareon/anim_front.png diff --git a/graphics/pokemon/flareon/back.png b/graphics/pokemon/gen_1/flareon/back.png similarity index 100% rename from graphics/pokemon/flareon/back.png rename to graphics/pokemon/gen_1/flareon/back.png diff --git a/graphics/pokemon/boltund/footprint.png b/graphics/pokemon/gen_1/flareon/footprint.png similarity index 100% rename from graphics/pokemon/boltund/footprint.png rename to graphics/pokemon/gen_1/flareon/footprint.png diff --git a/graphics/pokemon/flareon/icon.png b/graphics/pokemon/gen_1/flareon/icon.png similarity index 100% rename from graphics/pokemon/flareon/icon.png rename to graphics/pokemon/gen_1/flareon/icon.png diff --git a/graphics/pokemon/flareon/normal.pal b/graphics/pokemon/gen_1/flareon/normal.pal similarity index 100% rename from graphics/pokemon/flareon/normal.pal rename to graphics/pokemon/gen_1/flareon/normal.pal diff --git a/graphics/pokemon/flareon/shiny.pal b/graphics/pokemon/gen_1/flareon/shiny.pal similarity index 100% rename from graphics/pokemon/flareon/shiny.pal rename to graphics/pokemon/gen_1/flareon/shiny.pal diff --git a/graphics/pokemon/gastly/anim_front.png b/graphics/pokemon/gen_1/gastly/anim_front.png similarity index 100% rename from graphics/pokemon/gastly/anim_front.png rename to graphics/pokemon/gen_1/gastly/anim_front.png diff --git a/graphics/pokemon/gastly/back.png b/graphics/pokemon/gen_1/gastly/back.png similarity index 100% rename from graphics/pokemon/gastly/back.png rename to graphics/pokemon/gen_1/gastly/back.png diff --git a/graphics/pokemon/basculin/footprint.png b/graphics/pokemon/gen_1/gastly/footprint.png similarity index 100% rename from graphics/pokemon/basculin/footprint.png rename to graphics/pokemon/gen_1/gastly/footprint.png diff --git a/graphics/pokemon/gastly/icon.png b/graphics/pokemon/gen_1/gastly/icon.png similarity index 100% rename from graphics/pokemon/gastly/icon.png rename to graphics/pokemon/gen_1/gastly/icon.png diff --git a/graphics/pokemon/gastly/normal.pal b/graphics/pokemon/gen_1/gastly/normal.pal similarity index 100% rename from graphics/pokemon/gastly/normal.pal rename to graphics/pokemon/gen_1/gastly/normal.pal diff --git a/graphics/pokemon/gastly/shiny.pal b/graphics/pokemon/gen_1/gastly/shiny.pal similarity index 100% rename from graphics/pokemon/gastly/shiny.pal rename to graphics/pokemon/gen_1/gastly/shiny.pal diff --git a/graphics/pokemon/gengar/anim_front.png b/graphics/pokemon/gen_1/gengar/anim_front.png similarity index 100% rename from graphics/pokemon/gengar/anim_front.png rename to graphics/pokemon/gen_1/gengar/anim_front.png diff --git a/graphics/pokemon/gengar/back.png b/graphics/pokemon/gen_1/gengar/back.png similarity index 100% rename from graphics/pokemon/gengar/back.png rename to graphics/pokemon/gen_1/gengar/back.png diff --git a/graphics/pokemon/gengar/footprint.png b/graphics/pokemon/gen_1/gengar/footprint.png similarity index 100% rename from graphics/pokemon/gengar/footprint.png rename to graphics/pokemon/gen_1/gengar/footprint.png diff --git a/graphics/pokemon/gengar/gigantamax/back.png b/graphics/pokemon/gen_1/gengar/gigantamax/back.png similarity index 100% rename from graphics/pokemon/gengar/gigantamax/back.png rename to graphics/pokemon/gen_1/gengar/gigantamax/back.png diff --git a/graphics/pokemon/gengar/gigantamax/front.png b/graphics/pokemon/gen_1/gengar/gigantamax/front.png similarity index 100% rename from graphics/pokemon/gengar/gigantamax/front.png rename to graphics/pokemon/gen_1/gengar/gigantamax/front.png diff --git a/graphics/pokemon/gengar/gigantamax/icon.png b/graphics/pokemon/gen_1/gengar/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/gengar/gigantamax/icon.png rename to graphics/pokemon/gen_1/gengar/gigantamax/icon.png diff --git a/graphics/pokemon/gengar/gigantamax/normal.pal b/graphics/pokemon/gen_1/gengar/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/gengar/gigantamax/normal.pal rename to graphics/pokemon/gen_1/gengar/gigantamax/normal.pal diff --git a/graphics/pokemon/gengar/gigantamax/shiny.pal b/graphics/pokemon/gen_1/gengar/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/gengar/gigantamax/shiny.pal rename to graphics/pokemon/gen_1/gengar/gigantamax/shiny.pal diff --git a/graphics/pokemon/gengar/icon.png b/graphics/pokemon/gen_1/gengar/icon.png similarity index 100% rename from graphics/pokemon/gengar/icon.png rename to graphics/pokemon/gen_1/gengar/icon.png diff --git a/graphics/pokemon/gengar/mega/back.png b/graphics/pokemon/gen_1/gengar/mega/back.png similarity index 100% rename from graphics/pokemon/gengar/mega/back.png rename to graphics/pokemon/gen_1/gengar/mega/back.png diff --git a/graphics/pokemon/gengar/mega/front.png b/graphics/pokemon/gen_1/gengar/mega/front.png similarity index 100% rename from graphics/pokemon/gengar/mega/front.png rename to graphics/pokemon/gen_1/gengar/mega/front.png diff --git a/graphics/pokemon/gengar/mega/icon.png b/graphics/pokemon/gen_1/gengar/mega/icon.png similarity index 100% rename from graphics/pokemon/gengar/mega/icon.png rename to graphics/pokemon/gen_1/gengar/mega/icon.png diff --git a/graphics/pokemon/gengar/mega/normal.pal b/graphics/pokemon/gen_1/gengar/mega/normal.pal similarity index 100% rename from graphics/pokemon/gengar/mega/normal.pal rename to graphics/pokemon/gen_1/gengar/mega/normal.pal diff --git a/graphics/pokemon/gengar/mega/shiny.pal b/graphics/pokemon/gen_1/gengar/mega/shiny.pal similarity index 100% rename from graphics/pokemon/gengar/mega/shiny.pal rename to graphics/pokemon/gen_1/gengar/mega/shiny.pal diff --git a/graphics/pokemon/gengar/normal.pal b/graphics/pokemon/gen_1/gengar/normal.pal similarity index 100% rename from graphics/pokemon/gengar/normal.pal rename to graphics/pokemon/gen_1/gengar/normal.pal diff --git a/graphics/pokemon/gengar/shiny.pal b/graphics/pokemon/gen_1/gengar/shiny.pal similarity index 100% rename from graphics/pokemon/gengar/shiny.pal rename to graphics/pokemon/gen_1/gengar/shiny.pal diff --git a/graphics/pokemon/geodude/alolan/back.png b/graphics/pokemon/gen_1/geodude/alolan/back.png similarity index 100% rename from graphics/pokemon/geodude/alolan/back.png rename to graphics/pokemon/gen_1/geodude/alolan/back.png diff --git a/graphics/pokemon/geodude/alolan/front.png b/graphics/pokemon/gen_1/geodude/alolan/front.png similarity index 100% rename from graphics/pokemon/geodude/alolan/front.png rename to graphics/pokemon/gen_1/geodude/alolan/front.png diff --git a/graphics/pokemon/geodude/alolan/icon.png b/graphics/pokemon/gen_1/geodude/alolan/icon.png similarity index 100% rename from graphics/pokemon/geodude/alolan/icon.png rename to graphics/pokemon/gen_1/geodude/alolan/icon.png diff --git a/graphics/pokemon/geodude/alolan/normal.pal b/graphics/pokemon/gen_1/geodude/alolan/normal.pal similarity index 100% rename from graphics/pokemon/geodude/alolan/normal.pal rename to graphics/pokemon/gen_1/geodude/alolan/normal.pal diff --git a/graphics/pokemon/geodude/alolan/shiny.pal b/graphics/pokemon/gen_1/geodude/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/geodude/alolan/shiny.pal rename to graphics/pokemon/gen_1/geodude/alolan/shiny.pal diff --git a/graphics/pokemon/geodude/anim_front.png b/graphics/pokemon/gen_1/geodude/anim_front.png similarity index 100% rename from graphics/pokemon/geodude/anim_front.png rename to graphics/pokemon/gen_1/geodude/anim_front.png diff --git a/graphics/pokemon/geodude/back.png b/graphics/pokemon/gen_1/geodude/back.png similarity index 100% rename from graphics/pokemon/geodude/back.png rename to graphics/pokemon/gen_1/geodude/back.png diff --git a/graphics/pokemon/bellossom/footprint.png b/graphics/pokemon/gen_1/geodude/footprint.png similarity index 100% rename from graphics/pokemon/bellossom/footprint.png rename to graphics/pokemon/gen_1/geodude/footprint.png diff --git a/graphics/pokemon/geodude/icon.png b/graphics/pokemon/gen_1/geodude/icon.png similarity index 100% rename from graphics/pokemon/geodude/icon.png rename to graphics/pokemon/gen_1/geodude/icon.png diff --git a/graphics/pokemon/geodude/normal.pal b/graphics/pokemon/gen_1/geodude/normal.pal similarity index 100% rename from graphics/pokemon/geodude/normal.pal rename to graphics/pokemon/gen_1/geodude/normal.pal diff --git a/graphics/pokemon/geodude/shiny.pal b/graphics/pokemon/gen_1/geodude/shiny.pal similarity index 100% rename from graphics/pokemon/geodude/shiny.pal rename to graphics/pokemon/gen_1/geodude/shiny.pal diff --git a/graphics/pokemon/gloom/anim_front.png b/graphics/pokemon/gen_1/gloom/anim_front.png similarity index 100% rename from graphics/pokemon/gloom/anim_front.png rename to graphics/pokemon/gen_1/gloom/anim_front.png diff --git a/graphics/pokemon/gloom/anim_frontf.png b/graphics/pokemon/gen_1/gloom/anim_frontf.png similarity index 100% rename from graphics/pokemon/gloom/anim_frontf.png rename to graphics/pokemon/gen_1/gloom/anim_frontf.png diff --git a/graphics/pokemon/gloom/back.png b/graphics/pokemon/gen_1/gloom/back.png similarity index 100% rename from graphics/pokemon/gloom/back.png rename to graphics/pokemon/gen_1/gloom/back.png diff --git a/graphics/pokemon/gloom/backf.png b/graphics/pokemon/gen_1/gloom/backf.png similarity index 100% rename from graphics/pokemon/gloom/backf.png rename to graphics/pokemon/gen_1/gloom/backf.png diff --git a/graphics/pokemon/gloom/footprint.png b/graphics/pokemon/gen_1/gloom/footprint.png similarity index 100% rename from graphics/pokemon/gloom/footprint.png rename to graphics/pokemon/gen_1/gloom/footprint.png diff --git a/graphics/pokemon/gloom/icon.png b/graphics/pokemon/gen_1/gloom/icon.png similarity index 100% rename from graphics/pokemon/gloom/icon.png rename to graphics/pokemon/gen_1/gloom/icon.png diff --git a/graphics/pokemon/gloom/normal.pal b/graphics/pokemon/gen_1/gloom/normal.pal similarity index 100% rename from graphics/pokemon/gloom/normal.pal rename to graphics/pokemon/gen_1/gloom/normal.pal diff --git a/graphics/pokemon/gloom/shiny.pal b/graphics/pokemon/gen_1/gloom/shiny.pal similarity index 100% rename from graphics/pokemon/gloom/shiny.pal rename to graphics/pokemon/gen_1/gloom/shiny.pal diff --git a/graphics/pokemon/golbat/anim_front.png b/graphics/pokemon/gen_1/golbat/anim_front.png similarity index 100% rename from graphics/pokemon/golbat/anim_front.png rename to graphics/pokemon/gen_1/golbat/anim_front.png diff --git a/graphics/pokemon/golbat/anim_frontf.png b/graphics/pokemon/gen_1/golbat/anim_frontf.png similarity index 100% rename from graphics/pokemon/golbat/anim_frontf.png rename to graphics/pokemon/gen_1/golbat/anim_frontf.png diff --git a/graphics/pokemon/golbat/back.png b/graphics/pokemon/gen_1/golbat/back.png similarity index 100% rename from graphics/pokemon/golbat/back.png rename to graphics/pokemon/gen_1/golbat/back.png diff --git a/graphics/pokemon/golbat/backf.png b/graphics/pokemon/gen_1/golbat/backf.png similarity index 100% rename from graphics/pokemon/golbat/backf.png rename to graphics/pokemon/gen_1/golbat/backf.png diff --git a/graphics/pokemon/golbat/footprint.png b/graphics/pokemon/gen_1/golbat/footprint.png similarity index 100% rename from graphics/pokemon/golbat/footprint.png rename to graphics/pokemon/gen_1/golbat/footprint.png diff --git a/graphics/pokemon/golbat/icon.png b/graphics/pokemon/gen_1/golbat/icon.png similarity index 100% rename from graphics/pokemon/golbat/icon.png rename to graphics/pokemon/gen_1/golbat/icon.png diff --git a/graphics/pokemon/golbat/normal.pal b/graphics/pokemon/gen_1/golbat/normal.pal similarity index 100% rename from graphics/pokemon/golbat/normal.pal rename to graphics/pokemon/gen_1/golbat/normal.pal diff --git a/graphics/pokemon/golbat/shiny.pal b/graphics/pokemon/gen_1/golbat/shiny.pal similarity index 100% rename from graphics/pokemon/golbat/shiny.pal rename to graphics/pokemon/gen_1/golbat/shiny.pal diff --git a/graphics/pokemon/goldeen/anim_front.png b/graphics/pokemon/gen_1/goldeen/anim_front.png similarity index 100% rename from graphics/pokemon/goldeen/anim_front.png rename to graphics/pokemon/gen_1/goldeen/anim_front.png diff --git a/graphics/pokemon/goldeen/anim_frontf.png b/graphics/pokemon/gen_1/goldeen/anim_frontf.png similarity index 100% rename from graphics/pokemon/goldeen/anim_frontf.png rename to graphics/pokemon/gen_1/goldeen/anim_frontf.png diff --git a/graphics/pokemon/goldeen/back.png b/graphics/pokemon/gen_1/goldeen/back.png similarity index 100% rename from graphics/pokemon/goldeen/back.png rename to graphics/pokemon/gen_1/goldeen/back.png diff --git a/graphics/pokemon/goldeen/backf.png b/graphics/pokemon/gen_1/goldeen/backf.png similarity index 100% rename from graphics/pokemon/goldeen/backf.png rename to graphics/pokemon/gen_1/goldeen/backf.png diff --git a/graphics/pokemon/binacle/footprint.png b/graphics/pokemon/gen_1/goldeen/footprint.png similarity index 100% rename from graphics/pokemon/binacle/footprint.png rename to graphics/pokemon/gen_1/goldeen/footprint.png diff --git a/graphics/pokemon/goldeen/icon.png b/graphics/pokemon/gen_1/goldeen/icon.png similarity index 100% rename from graphics/pokemon/goldeen/icon.png rename to graphics/pokemon/gen_1/goldeen/icon.png diff --git a/graphics/pokemon/goldeen/normal.pal b/graphics/pokemon/gen_1/goldeen/normal.pal similarity index 100% rename from graphics/pokemon/goldeen/normal.pal rename to graphics/pokemon/gen_1/goldeen/normal.pal diff --git a/graphics/pokemon/goldeen/shiny.pal b/graphics/pokemon/gen_1/goldeen/shiny.pal similarity index 100% rename from graphics/pokemon/goldeen/shiny.pal rename to graphics/pokemon/gen_1/goldeen/shiny.pal diff --git a/graphics/pokemon/golduck/anim_front.png b/graphics/pokemon/gen_1/golduck/anim_front.png similarity index 100% rename from graphics/pokemon/golduck/anim_front.png rename to graphics/pokemon/gen_1/golduck/anim_front.png diff --git a/graphics/pokemon/golduck/back.png b/graphics/pokemon/gen_1/golduck/back.png similarity index 100% rename from graphics/pokemon/golduck/back.png rename to graphics/pokemon/gen_1/golduck/back.png diff --git a/graphics/pokemon/golduck/footprint.png b/graphics/pokemon/gen_1/golduck/footprint.png similarity index 100% rename from graphics/pokemon/golduck/footprint.png rename to graphics/pokemon/gen_1/golduck/footprint.png diff --git a/graphics/pokemon/golduck/icon.png b/graphics/pokemon/gen_1/golduck/icon.png similarity index 100% rename from graphics/pokemon/golduck/icon.png rename to graphics/pokemon/gen_1/golduck/icon.png diff --git a/graphics/pokemon/golduck/normal.pal b/graphics/pokemon/gen_1/golduck/normal.pal similarity index 100% rename from graphics/pokemon/golduck/normal.pal rename to graphics/pokemon/gen_1/golduck/normal.pal diff --git a/graphics/pokemon/golduck/shiny.pal b/graphics/pokemon/gen_1/golduck/shiny.pal similarity index 100% rename from graphics/pokemon/golduck/shiny.pal rename to graphics/pokemon/gen_1/golduck/shiny.pal diff --git a/graphics/pokemon/golem/alolan/back.png b/graphics/pokemon/gen_1/golem/alolan/back.png similarity index 100% rename from graphics/pokemon/golem/alolan/back.png rename to graphics/pokemon/gen_1/golem/alolan/back.png diff --git a/graphics/pokemon/golem/alolan/front.png b/graphics/pokemon/gen_1/golem/alolan/front.png similarity index 100% rename from graphics/pokemon/golem/alolan/front.png rename to graphics/pokemon/gen_1/golem/alolan/front.png diff --git a/graphics/pokemon/golem/alolan/icon.png b/graphics/pokemon/gen_1/golem/alolan/icon.png similarity index 100% rename from graphics/pokemon/golem/alolan/icon.png rename to graphics/pokemon/gen_1/golem/alolan/icon.png diff --git a/graphics/pokemon/golem/alolan/normal.pal b/graphics/pokemon/gen_1/golem/alolan/normal.pal similarity index 100% rename from graphics/pokemon/golem/alolan/normal.pal rename to graphics/pokemon/gen_1/golem/alolan/normal.pal diff --git a/graphics/pokemon/golem/alolan/shiny.pal b/graphics/pokemon/gen_1/golem/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/golem/alolan/shiny.pal rename to graphics/pokemon/gen_1/golem/alolan/shiny.pal diff --git a/graphics/pokemon/golem/anim_front.png b/graphics/pokemon/gen_1/golem/anim_front.png similarity index 100% rename from graphics/pokemon/golem/anim_front.png rename to graphics/pokemon/gen_1/golem/anim_front.png diff --git a/graphics/pokemon/golem/back.png b/graphics/pokemon/gen_1/golem/back.png similarity index 100% rename from graphics/pokemon/golem/back.png rename to graphics/pokemon/gen_1/golem/back.png diff --git a/graphics/pokemon/golem/footprint.png b/graphics/pokemon/gen_1/golem/footprint.png similarity index 100% rename from graphics/pokemon/golem/footprint.png rename to graphics/pokemon/gen_1/golem/footprint.png diff --git a/graphics/pokemon/golem/icon.png b/graphics/pokemon/gen_1/golem/icon.png similarity index 100% rename from graphics/pokemon/golem/icon.png rename to graphics/pokemon/gen_1/golem/icon.png diff --git a/graphics/pokemon/golem/normal.pal b/graphics/pokemon/gen_1/golem/normal.pal similarity index 100% rename from graphics/pokemon/golem/normal.pal rename to graphics/pokemon/gen_1/golem/normal.pal diff --git a/graphics/pokemon/golem/shiny.pal b/graphics/pokemon/gen_1/golem/shiny.pal similarity index 100% rename from graphics/pokemon/golem/shiny.pal rename to graphics/pokemon/gen_1/golem/shiny.pal diff --git a/graphics/pokemon/graveler/alolan/back.png b/graphics/pokemon/gen_1/graveler/alolan/back.png similarity index 100% rename from graphics/pokemon/graveler/alolan/back.png rename to graphics/pokemon/gen_1/graveler/alolan/back.png diff --git a/graphics/pokemon/graveler/alolan/front.png b/graphics/pokemon/gen_1/graveler/alolan/front.png similarity index 100% rename from graphics/pokemon/graveler/alolan/front.png rename to graphics/pokemon/gen_1/graveler/alolan/front.png diff --git a/graphics/pokemon/graveler/alolan/icon.png b/graphics/pokemon/gen_1/graveler/alolan/icon.png similarity index 100% rename from graphics/pokemon/graveler/alolan/icon.png rename to graphics/pokemon/gen_1/graveler/alolan/icon.png diff --git a/graphics/pokemon/graveler/alolan/normal.pal b/graphics/pokemon/gen_1/graveler/alolan/normal.pal similarity index 100% rename from graphics/pokemon/graveler/alolan/normal.pal rename to graphics/pokemon/gen_1/graveler/alolan/normal.pal diff --git a/graphics/pokemon/graveler/alolan/shiny.pal b/graphics/pokemon/gen_1/graveler/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/graveler/alolan/shiny.pal rename to graphics/pokemon/gen_1/graveler/alolan/shiny.pal diff --git a/graphics/pokemon/graveler/anim_front.png b/graphics/pokemon/gen_1/graveler/anim_front.png similarity index 100% rename from graphics/pokemon/graveler/anim_front.png rename to graphics/pokemon/gen_1/graveler/anim_front.png diff --git a/graphics/pokemon/graveler/back.png b/graphics/pokemon/gen_1/graveler/back.png similarity index 100% rename from graphics/pokemon/graveler/back.png rename to graphics/pokemon/gen_1/graveler/back.png diff --git a/graphics/pokemon/graveler/footprint.png b/graphics/pokemon/gen_1/graveler/footprint.png similarity index 100% rename from graphics/pokemon/graveler/footprint.png rename to graphics/pokemon/gen_1/graveler/footprint.png diff --git a/graphics/pokemon/graveler/icon.png b/graphics/pokemon/gen_1/graveler/icon.png similarity index 100% rename from graphics/pokemon/graveler/icon.png rename to graphics/pokemon/gen_1/graveler/icon.png diff --git a/graphics/pokemon/graveler/normal.pal b/graphics/pokemon/gen_1/graveler/normal.pal similarity index 100% rename from graphics/pokemon/graveler/normal.pal rename to graphics/pokemon/gen_1/graveler/normal.pal diff --git a/graphics/pokemon/graveler/shiny.pal b/graphics/pokemon/gen_1/graveler/shiny.pal similarity index 100% rename from graphics/pokemon/graveler/shiny.pal rename to graphics/pokemon/gen_1/graveler/shiny.pal diff --git a/graphics/pokemon/grimer/alolan/back.png b/graphics/pokemon/gen_1/grimer/alolan/back.png similarity index 100% rename from graphics/pokemon/grimer/alolan/back.png rename to graphics/pokemon/gen_1/grimer/alolan/back.png diff --git a/graphics/pokemon/grimer/alolan/front.png b/graphics/pokemon/gen_1/grimer/alolan/front.png similarity index 100% rename from graphics/pokemon/grimer/alolan/front.png rename to graphics/pokemon/gen_1/grimer/alolan/front.png diff --git a/graphics/pokemon/grimer/alolan/icon.png b/graphics/pokemon/gen_1/grimer/alolan/icon.png similarity index 100% rename from graphics/pokemon/grimer/alolan/icon.png rename to graphics/pokemon/gen_1/grimer/alolan/icon.png diff --git a/graphics/pokemon/grimer/alolan/normal.pal b/graphics/pokemon/gen_1/grimer/alolan/normal.pal similarity index 100% rename from graphics/pokemon/grimer/alolan/normal.pal rename to graphics/pokemon/gen_1/grimer/alolan/normal.pal diff --git a/graphics/pokemon/grimer/alolan/shiny.pal b/graphics/pokemon/gen_1/grimer/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/grimer/alolan/shiny.pal rename to graphics/pokemon/gen_1/grimer/alolan/shiny.pal diff --git a/graphics/pokemon/grimer/anim_front.png b/graphics/pokemon/gen_1/grimer/anim_front.png similarity index 100% rename from graphics/pokemon/grimer/anim_front.png rename to graphics/pokemon/gen_1/grimer/anim_front.png diff --git a/graphics/pokemon/grimer/back.png b/graphics/pokemon/gen_1/grimer/back.png similarity index 100% rename from graphics/pokemon/grimer/back.png rename to graphics/pokemon/gen_1/grimer/back.png diff --git a/graphics/pokemon/brionne/footprint.png b/graphics/pokemon/gen_1/grimer/footprint.png similarity index 100% rename from graphics/pokemon/brionne/footprint.png rename to graphics/pokemon/gen_1/grimer/footprint.png diff --git a/graphics/pokemon/grimer/icon.png b/graphics/pokemon/gen_1/grimer/icon.png similarity index 100% rename from graphics/pokemon/grimer/icon.png rename to graphics/pokemon/gen_1/grimer/icon.png diff --git a/graphics/pokemon/grimer/normal.pal b/graphics/pokemon/gen_1/grimer/normal.pal similarity index 100% rename from graphics/pokemon/grimer/normal.pal rename to graphics/pokemon/gen_1/grimer/normal.pal diff --git a/graphics/pokemon/grimer/shiny.pal b/graphics/pokemon/gen_1/grimer/shiny.pal similarity index 100% rename from graphics/pokemon/grimer/shiny.pal rename to graphics/pokemon/gen_1/grimer/shiny.pal diff --git a/graphics/pokemon/growlithe/anim_front.png b/graphics/pokemon/gen_1/growlithe/anim_front.png similarity index 100% rename from graphics/pokemon/growlithe/anim_front.png rename to graphics/pokemon/gen_1/growlithe/anim_front.png diff --git a/graphics/pokemon/growlithe/back.png b/graphics/pokemon/gen_1/growlithe/back.png similarity index 100% rename from graphics/pokemon/growlithe/back.png rename to graphics/pokemon/gen_1/growlithe/back.png diff --git a/graphics/pokemon/growlithe/footprint.png b/graphics/pokemon/gen_1/growlithe/footprint.png similarity index 100% rename from graphics/pokemon/growlithe/footprint.png rename to graphics/pokemon/gen_1/growlithe/footprint.png diff --git a/graphics/pokemon/growlithe/hisuian/back.png b/graphics/pokemon/gen_1/growlithe/hisuian/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/growlithe/hisuian/back.png rename to graphics/pokemon/gen_1/growlithe/hisuian/back.png diff --git a/graphics/pokemon/growlithe/hisuian/front.png b/graphics/pokemon/gen_1/growlithe/hisuian/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/growlithe/hisuian/front.png rename to graphics/pokemon/gen_1/growlithe/hisuian/front.png diff --git a/graphics/pokemon/growlithe/hisuian/icon.png b/graphics/pokemon/gen_1/growlithe/hisuian/icon.png similarity index 100% rename from graphics/pokemon/growlithe/hisuian/icon.png rename to graphics/pokemon/gen_1/growlithe/hisuian/icon.png diff --git a/graphics/pokemon/growlithe/hisuian/normal.pal b/graphics/pokemon/gen_1/growlithe/hisuian/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/growlithe/hisuian/normal.pal rename to graphics/pokemon/gen_1/growlithe/hisuian/normal.pal diff --git a/graphics/pokemon/growlithe/hisuian/shiny.pal b/graphics/pokemon/gen_1/growlithe/hisuian/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/growlithe/hisuian/shiny.pal rename to graphics/pokemon/gen_1/growlithe/hisuian/shiny.pal diff --git a/graphics/pokemon/growlithe/icon.png b/graphics/pokemon/gen_1/growlithe/icon.png similarity index 100% rename from graphics/pokemon/growlithe/icon.png rename to graphics/pokemon/gen_1/growlithe/icon.png diff --git a/graphics/pokemon/growlithe/normal.pal b/graphics/pokemon/gen_1/growlithe/normal.pal similarity index 100% rename from graphics/pokemon/growlithe/normal.pal rename to graphics/pokemon/gen_1/growlithe/normal.pal diff --git a/graphics/pokemon/growlithe/shiny.pal b/graphics/pokemon/gen_1/growlithe/shiny.pal similarity index 100% rename from graphics/pokemon/growlithe/shiny.pal rename to graphics/pokemon/gen_1/growlithe/shiny.pal diff --git a/graphics/pokemon/gyarados/anim_front.png b/graphics/pokemon/gen_1/gyarados/anim_front.png similarity index 100% rename from graphics/pokemon/gyarados/anim_front.png rename to graphics/pokemon/gen_1/gyarados/anim_front.png diff --git a/graphics/pokemon/gyarados/anim_frontf.png b/graphics/pokemon/gen_1/gyarados/anim_frontf.png similarity index 100% rename from graphics/pokemon/gyarados/anim_frontf.png rename to graphics/pokemon/gen_1/gyarados/anim_frontf.png diff --git a/graphics/pokemon/gyarados/back.png b/graphics/pokemon/gen_1/gyarados/back.png similarity index 100% rename from graphics/pokemon/gyarados/back.png rename to graphics/pokemon/gen_1/gyarados/back.png diff --git a/graphics/pokemon/gyarados/backf.png b/graphics/pokemon/gen_1/gyarados/backf.png similarity index 100% rename from graphics/pokemon/gyarados/backf.png rename to graphics/pokemon/gen_1/gyarados/backf.png diff --git a/graphics/pokemon/bronzong/footprint.png b/graphics/pokemon/gen_1/gyarados/footprint.png similarity index 100% rename from graphics/pokemon/bronzong/footprint.png rename to graphics/pokemon/gen_1/gyarados/footprint.png diff --git a/graphics/pokemon/gyarados/icon.png b/graphics/pokemon/gen_1/gyarados/icon.png similarity index 100% rename from graphics/pokemon/gyarados/icon.png rename to graphics/pokemon/gen_1/gyarados/icon.png diff --git a/graphics/pokemon/gyarados/mega/back.png b/graphics/pokemon/gen_1/gyarados/mega/back.png similarity index 100% rename from graphics/pokemon/gyarados/mega/back.png rename to graphics/pokemon/gen_1/gyarados/mega/back.png diff --git a/graphics/pokemon/gyarados/mega/front.png b/graphics/pokemon/gen_1/gyarados/mega/front.png similarity index 100% rename from graphics/pokemon/gyarados/mega/front.png rename to graphics/pokemon/gen_1/gyarados/mega/front.png diff --git a/graphics/pokemon/gyarados/mega/icon.png b/graphics/pokemon/gen_1/gyarados/mega/icon.png similarity index 100% rename from graphics/pokemon/gyarados/mega/icon.png rename to graphics/pokemon/gen_1/gyarados/mega/icon.png diff --git a/graphics/pokemon/gyarados/mega/normal.pal b/graphics/pokemon/gen_1/gyarados/mega/normal.pal similarity index 100% rename from graphics/pokemon/gyarados/mega/normal.pal rename to graphics/pokemon/gen_1/gyarados/mega/normal.pal diff --git a/graphics/pokemon/gyarados/mega/shiny.pal b/graphics/pokemon/gen_1/gyarados/mega/shiny.pal similarity index 100% rename from graphics/pokemon/gyarados/mega/shiny.pal rename to graphics/pokemon/gen_1/gyarados/mega/shiny.pal diff --git a/graphics/pokemon/gyarados/normal.pal b/graphics/pokemon/gen_1/gyarados/normal.pal similarity index 100% rename from graphics/pokemon/gyarados/normal.pal rename to graphics/pokemon/gen_1/gyarados/normal.pal diff --git a/graphics/pokemon/gyarados/shiny.pal b/graphics/pokemon/gen_1/gyarados/shiny.pal similarity index 100% rename from graphics/pokemon/gyarados/shiny.pal rename to graphics/pokemon/gen_1/gyarados/shiny.pal diff --git a/graphics/pokemon/haunter/anim_front.png b/graphics/pokemon/gen_1/haunter/anim_front.png similarity index 100% rename from graphics/pokemon/haunter/anim_front.png rename to graphics/pokemon/gen_1/haunter/anim_front.png diff --git a/graphics/pokemon/haunter/back.png b/graphics/pokemon/gen_1/haunter/back.png similarity index 100% rename from graphics/pokemon/haunter/back.png rename to graphics/pokemon/gen_1/haunter/back.png diff --git a/graphics/pokemon/bronzor/footprint.png b/graphics/pokemon/gen_1/haunter/footprint.png similarity index 100% rename from graphics/pokemon/bronzor/footprint.png rename to graphics/pokemon/gen_1/haunter/footprint.png diff --git a/graphics/pokemon/haunter/icon.png b/graphics/pokemon/gen_1/haunter/icon.png similarity index 100% rename from graphics/pokemon/haunter/icon.png rename to graphics/pokemon/gen_1/haunter/icon.png diff --git a/graphics/pokemon/haunter/normal.pal b/graphics/pokemon/gen_1/haunter/normal.pal similarity index 100% rename from graphics/pokemon/haunter/normal.pal rename to graphics/pokemon/gen_1/haunter/normal.pal diff --git a/graphics/pokemon/haunter/shiny.pal b/graphics/pokemon/gen_1/haunter/shiny.pal similarity index 100% rename from graphics/pokemon/haunter/shiny.pal rename to graphics/pokemon/gen_1/haunter/shiny.pal diff --git a/graphics/pokemon/hitmonchan/anim_front.png b/graphics/pokemon/gen_1/hitmonchan/anim_front.png similarity index 100% rename from graphics/pokemon/hitmonchan/anim_front.png rename to graphics/pokemon/gen_1/hitmonchan/anim_front.png diff --git a/graphics/pokemon/hitmonchan/back.png b/graphics/pokemon/gen_1/hitmonchan/back.png similarity index 100% rename from graphics/pokemon/hitmonchan/back.png rename to graphics/pokemon/gen_1/hitmonchan/back.png diff --git a/graphics/pokemon/hitmonchan/footprint.png b/graphics/pokemon/gen_1/hitmonchan/footprint.png similarity index 100% rename from graphics/pokemon/hitmonchan/footprint.png rename to graphics/pokemon/gen_1/hitmonchan/footprint.png diff --git a/graphics/pokemon/hitmonchan/icon.png b/graphics/pokemon/gen_1/hitmonchan/icon.png similarity index 100% rename from graphics/pokemon/hitmonchan/icon.png rename to graphics/pokemon/gen_1/hitmonchan/icon.png diff --git a/graphics/pokemon/hitmonchan/normal.pal b/graphics/pokemon/gen_1/hitmonchan/normal.pal similarity index 100% rename from graphics/pokemon/hitmonchan/normal.pal rename to graphics/pokemon/gen_1/hitmonchan/normal.pal diff --git a/graphics/pokemon/hitmonchan/shiny.pal b/graphics/pokemon/gen_1/hitmonchan/shiny.pal similarity index 100% rename from graphics/pokemon/hitmonchan/shiny.pal rename to graphics/pokemon/gen_1/hitmonchan/shiny.pal diff --git a/graphics/pokemon/hitmonlee/anim_front.png b/graphics/pokemon/gen_1/hitmonlee/anim_front.png similarity index 100% rename from graphics/pokemon/hitmonlee/anim_front.png rename to graphics/pokemon/gen_1/hitmonlee/anim_front.png diff --git a/graphics/pokemon/hitmonlee/back.png b/graphics/pokemon/gen_1/hitmonlee/back.png similarity index 100% rename from graphics/pokemon/hitmonlee/back.png rename to graphics/pokemon/gen_1/hitmonlee/back.png diff --git a/graphics/pokemon/hitmonlee/footprint.png b/graphics/pokemon/gen_1/hitmonlee/footprint.png similarity index 100% rename from graphics/pokemon/hitmonlee/footprint.png rename to graphics/pokemon/gen_1/hitmonlee/footprint.png diff --git a/graphics/pokemon/hitmonlee/icon.png b/graphics/pokemon/gen_1/hitmonlee/icon.png similarity index 100% rename from graphics/pokemon/hitmonlee/icon.png rename to graphics/pokemon/gen_1/hitmonlee/icon.png diff --git a/graphics/pokemon/hitmonlee/normal.pal b/graphics/pokemon/gen_1/hitmonlee/normal.pal similarity index 100% rename from graphics/pokemon/hitmonlee/normal.pal rename to graphics/pokemon/gen_1/hitmonlee/normal.pal diff --git a/graphics/pokemon/hitmonlee/shiny.pal b/graphics/pokemon/gen_1/hitmonlee/shiny.pal similarity index 100% rename from graphics/pokemon/hitmonlee/shiny.pal rename to graphics/pokemon/gen_1/hitmonlee/shiny.pal diff --git a/graphics/pokemon/horsea/anim_front.png b/graphics/pokemon/gen_1/horsea/anim_front.png similarity index 100% rename from graphics/pokemon/horsea/anim_front.png rename to graphics/pokemon/gen_1/horsea/anim_front.png diff --git a/graphics/pokemon/horsea/back.png b/graphics/pokemon/gen_1/horsea/back.png similarity index 100% rename from graphics/pokemon/horsea/back.png rename to graphics/pokemon/gen_1/horsea/back.png diff --git a/graphics/pokemon/bruxish/footprint.png b/graphics/pokemon/gen_1/horsea/footprint.png similarity index 100% rename from graphics/pokemon/bruxish/footprint.png rename to graphics/pokemon/gen_1/horsea/footprint.png diff --git a/graphics/pokemon/horsea/icon.png b/graphics/pokemon/gen_1/horsea/icon.png similarity index 100% rename from graphics/pokemon/horsea/icon.png rename to graphics/pokemon/gen_1/horsea/icon.png diff --git a/graphics/pokemon/horsea/normal.pal b/graphics/pokemon/gen_1/horsea/normal.pal similarity index 100% rename from graphics/pokemon/horsea/normal.pal rename to graphics/pokemon/gen_1/horsea/normal.pal diff --git a/graphics/pokemon/horsea/shiny.pal b/graphics/pokemon/gen_1/horsea/shiny.pal similarity index 100% rename from graphics/pokemon/horsea/shiny.pal rename to graphics/pokemon/gen_1/horsea/shiny.pal diff --git a/graphics/pokemon/hypno/anim_front.png b/graphics/pokemon/gen_1/hypno/anim_front.png similarity index 100% rename from graphics/pokemon/hypno/anim_front.png rename to graphics/pokemon/gen_1/hypno/anim_front.png diff --git a/graphics/pokemon/hypno/anim_frontf.png b/graphics/pokemon/gen_1/hypno/anim_frontf.png similarity index 100% rename from graphics/pokemon/hypno/anim_frontf.png rename to graphics/pokemon/gen_1/hypno/anim_frontf.png diff --git a/graphics/pokemon/hypno/back.png b/graphics/pokemon/gen_1/hypno/back.png similarity index 100% rename from graphics/pokemon/hypno/back.png rename to graphics/pokemon/gen_1/hypno/back.png diff --git a/graphics/pokemon/hypno/backf.png b/graphics/pokemon/gen_1/hypno/backf.png similarity index 100% rename from graphics/pokemon/hypno/backf.png rename to graphics/pokemon/gen_1/hypno/backf.png diff --git a/graphics/pokemon/hypno/footprint.png b/graphics/pokemon/gen_1/hypno/footprint.png similarity index 100% rename from graphics/pokemon/hypno/footprint.png rename to graphics/pokemon/gen_1/hypno/footprint.png diff --git a/graphics/pokemon/hypno/icon.png b/graphics/pokemon/gen_1/hypno/icon.png similarity index 100% rename from graphics/pokemon/hypno/icon.png rename to graphics/pokemon/gen_1/hypno/icon.png diff --git a/graphics/pokemon/hypno/normal.pal b/graphics/pokemon/gen_1/hypno/normal.pal similarity index 100% rename from graphics/pokemon/hypno/normal.pal rename to graphics/pokemon/gen_1/hypno/normal.pal diff --git a/graphics/pokemon/hypno/shiny.pal b/graphics/pokemon/gen_1/hypno/shiny.pal similarity index 100% rename from graphics/pokemon/hypno/shiny.pal rename to graphics/pokemon/gen_1/hypno/shiny.pal diff --git a/graphics/pokemon/ivysaur/anim_front.png b/graphics/pokemon/gen_1/ivysaur/anim_front.png similarity index 100% rename from graphics/pokemon/ivysaur/anim_front.png rename to graphics/pokemon/gen_1/ivysaur/anim_front.png diff --git a/graphics/pokemon/ivysaur/back.png b/graphics/pokemon/gen_1/ivysaur/back.png similarity index 100% rename from graphics/pokemon/ivysaur/back.png rename to graphics/pokemon/gen_1/ivysaur/back.png diff --git a/graphics/pokemon/drednaw/footprint.png b/graphics/pokemon/gen_1/ivysaur/footprint.png similarity index 100% rename from graphics/pokemon/drednaw/footprint.png rename to graphics/pokemon/gen_1/ivysaur/footprint.png diff --git a/graphics/pokemon/ivysaur/icon.png b/graphics/pokemon/gen_1/ivysaur/icon.png similarity index 100% rename from graphics/pokemon/ivysaur/icon.png rename to graphics/pokemon/gen_1/ivysaur/icon.png diff --git a/graphics/pokemon/ivysaur/normal.pal b/graphics/pokemon/gen_1/ivysaur/normal.pal similarity index 100% rename from graphics/pokemon/ivysaur/normal.pal rename to graphics/pokemon/gen_1/ivysaur/normal.pal diff --git a/graphics/pokemon/ivysaur/shiny.pal b/graphics/pokemon/gen_1/ivysaur/shiny.pal similarity index 100% rename from graphics/pokemon/ivysaur/shiny.pal rename to graphics/pokemon/gen_1/ivysaur/shiny.pal diff --git a/graphics/pokemon/jigglypuff/anim_front.png b/graphics/pokemon/gen_1/jigglypuff/anim_front.png similarity index 100% rename from graphics/pokemon/jigglypuff/anim_front.png rename to graphics/pokemon/gen_1/jigglypuff/anim_front.png diff --git a/graphics/pokemon/jigglypuff/back.png b/graphics/pokemon/gen_1/jigglypuff/back.png similarity index 100% rename from graphics/pokemon/jigglypuff/back.png rename to graphics/pokemon/gen_1/jigglypuff/back.png diff --git a/graphics/pokemon/jigglypuff/footprint.png b/graphics/pokemon/gen_1/jigglypuff/footprint.png similarity index 100% rename from graphics/pokemon/jigglypuff/footprint.png rename to graphics/pokemon/gen_1/jigglypuff/footprint.png diff --git a/graphics/pokemon/jigglypuff/icon.png b/graphics/pokemon/gen_1/jigglypuff/icon.png similarity index 100% rename from graphics/pokemon/jigglypuff/icon.png rename to graphics/pokemon/gen_1/jigglypuff/icon.png diff --git a/graphics/pokemon/jigglypuff/normal.pal b/graphics/pokemon/gen_1/jigglypuff/normal.pal similarity index 100% rename from graphics/pokemon/jigglypuff/normal.pal rename to graphics/pokemon/gen_1/jigglypuff/normal.pal diff --git a/graphics/pokemon/jigglypuff/shiny.pal b/graphics/pokemon/gen_1/jigglypuff/shiny.pal similarity index 100% rename from graphics/pokemon/jigglypuff/shiny.pal rename to graphics/pokemon/gen_1/jigglypuff/shiny.pal diff --git a/graphics/pokemon/jolteon/anim_front.png b/graphics/pokemon/gen_1/jolteon/anim_front.png similarity index 100% rename from graphics/pokemon/jolteon/anim_front.png rename to graphics/pokemon/gen_1/jolteon/anim_front.png diff --git a/graphics/pokemon/jolteon/back.png b/graphics/pokemon/gen_1/jolteon/back.png similarity index 100% rename from graphics/pokemon/jolteon/back.png rename to graphics/pokemon/gen_1/jolteon/back.png diff --git a/graphics/pokemon/jolteon/footprint.png b/graphics/pokemon/gen_1/jolteon/footprint.png similarity index 100% rename from graphics/pokemon/jolteon/footprint.png rename to graphics/pokemon/gen_1/jolteon/footprint.png diff --git a/graphics/pokemon/jolteon/icon.png b/graphics/pokemon/gen_1/jolteon/icon.png similarity index 100% rename from graphics/pokemon/jolteon/icon.png rename to graphics/pokemon/gen_1/jolteon/icon.png diff --git a/graphics/pokemon/jolteon/normal.pal b/graphics/pokemon/gen_1/jolteon/normal.pal similarity index 100% rename from graphics/pokemon/jolteon/normal.pal rename to graphics/pokemon/gen_1/jolteon/normal.pal diff --git a/graphics/pokemon/jolteon/shiny.pal b/graphics/pokemon/gen_1/jolteon/shiny.pal similarity index 100% rename from graphics/pokemon/jolteon/shiny.pal rename to graphics/pokemon/gen_1/jolteon/shiny.pal diff --git a/graphics/pokemon/jynx/anim_front.png b/graphics/pokemon/gen_1/jynx/anim_front.png similarity index 100% rename from graphics/pokemon/jynx/anim_front.png rename to graphics/pokemon/gen_1/jynx/anim_front.png diff --git a/graphics/pokemon/jynx/back.png b/graphics/pokemon/gen_1/jynx/back.png similarity index 100% rename from graphics/pokemon/jynx/back.png rename to graphics/pokemon/gen_1/jynx/back.png diff --git a/graphics/pokemon/burmy/plant/footprint.png b/graphics/pokemon/gen_1/jynx/footprint.png similarity index 100% rename from graphics/pokemon/burmy/plant/footprint.png rename to graphics/pokemon/gen_1/jynx/footprint.png diff --git a/graphics/pokemon/jynx/icon.png b/graphics/pokemon/gen_1/jynx/icon.png similarity index 100% rename from graphics/pokemon/jynx/icon.png rename to graphics/pokemon/gen_1/jynx/icon.png diff --git a/graphics/pokemon/jynx/normal.pal b/graphics/pokemon/gen_1/jynx/normal.pal similarity index 100% rename from graphics/pokemon/jynx/normal.pal rename to graphics/pokemon/gen_1/jynx/normal.pal diff --git a/graphics/pokemon/jynx/shiny.pal b/graphics/pokemon/gen_1/jynx/shiny.pal similarity index 100% rename from graphics/pokemon/jynx/shiny.pal rename to graphics/pokemon/gen_1/jynx/shiny.pal diff --git a/graphics/pokemon/kabuto/anim_front.png b/graphics/pokemon/gen_1/kabuto/anim_front.png similarity index 100% rename from graphics/pokemon/kabuto/anim_front.png rename to graphics/pokemon/gen_1/kabuto/anim_front.png diff --git a/graphics/pokemon/kabuto/back.png b/graphics/pokemon/gen_1/kabuto/back.png similarity index 100% rename from graphics/pokemon/kabuto/back.png rename to graphics/pokemon/gen_1/kabuto/back.png diff --git a/graphics/pokemon/baltoy/footprint.png b/graphics/pokemon/gen_1/kabuto/footprint.png similarity index 100% rename from graphics/pokemon/baltoy/footprint.png rename to graphics/pokemon/gen_1/kabuto/footprint.png diff --git a/graphics/pokemon/kabuto/icon.png b/graphics/pokemon/gen_1/kabuto/icon.png similarity index 100% rename from graphics/pokemon/kabuto/icon.png rename to graphics/pokemon/gen_1/kabuto/icon.png diff --git a/graphics/pokemon/kabuto/normal.pal b/graphics/pokemon/gen_1/kabuto/normal.pal similarity index 100% rename from graphics/pokemon/kabuto/normal.pal rename to graphics/pokemon/gen_1/kabuto/normal.pal diff --git a/graphics/pokemon/kabuto/shiny.pal b/graphics/pokemon/gen_1/kabuto/shiny.pal similarity index 100% rename from graphics/pokemon/kabuto/shiny.pal rename to graphics/pokemon/gen_1/kabuto/shiny.pal diff --git a/graphics/pokemon/kabutops/anim_front.png b/graphics/pokemon/gen_1/kabutops/anim_front.png similarity index 100% rename from graphics/pokemon/kabutops/anim_front.png rename to graphics/pokemon/gen_1/kabutops/anim_front.png diff --git a/graphics/pokemon/kabutops/back.png b/graphics/pokemon/gen_1/kabutops/back.png similarity index 100% rename from graphics/pokemon/kabutops/back.png rename to graphics/pokemon/gen_1/kabutops/back.png diff --git a/graphics/pokemon/kabutops/footprint.png b/graphics/pokemon/gen_1/kabutops/footprint.png similarity index 100% rename from graphics/pokemon/kabutops/footprint.png rename to graphics/pokemon/gen_1/kabutops/footprint.png diff --git a/graphics/pokemon/kabutops/icon.png b/graphics/pokemon/gen_1/kabutops/icon.png similarity index 100% rename from graphics/pokemon/kabutops/icon.png rename to graphics/pokemon/gen_1/kabutops/icon.png diff --git a/graphics/pokemon/kabutops/normal.pal b/graphics/pokemon/gen_1/kabutops/normal.pal similarity index 100% rename from graphics/pokemon/kabutops/normal.pal rename to graphics/pokemon/gen_1/kabutops/normal.pal diff --git a/graphics/pokemon/kabutops/shiny.pal b/graphics/pokemon/gen_1/kabutops/shiny.pal similarity index 100% rename from graphics/pokemon/kabutops/shiny.pal rename to graphics/pokemon/gen_1/kabutops/shiny.pal diff --git a/graphics/pokemon/kadabra/anim_front.png b/graphics/pokemon/gen_1/kadabra/anim_front.png similarity index 100% rename from graphics/pokemon/kadabra/anim_front.png rename to graphics/pokemon/gen_1/kadabra/anim_front.png diff --git a/graphics/pokemon/kadabra/anim_frontf.png b/graphics/pokemon/gen_1/kadabra/anim_frontf.png similarity index 100% rename from graphics/pokemon/kadabra/anim_frontf.png rename to graphics/pokemon/gen_1/kadabra/anim_frontf.png diff --git a/graphics/pokemon/kadabra/back.png b/graphics/pokemon/gen_1/kadabra/back.png similarity index 100% rename from graphics/pokemon/kadabra/back.png rename to graphics/pokemon/gen_1/kadabra/back.png diff --git a/graphics/pokemon/kadabra/backf.png b/graphics/pokemon/gen_1/kadabra/backf.png similarity index 100% rename from graphics/pokemon/kadabra/backf.png rename to graphics/pokemon/gen_1/kadabra/backf.png diff --git a/graphics/pokemon/kadabra/footprint.png b/graphics/pokemon/gen_1/kadabra/footprint.png similarity index 100% rename from graphics/pokemon/kadabra/footprint.png rename to graphics/pokemon/gen_1/kadabra/footprint.png diff --git a/graphics/pokemon/kadabra/icon.png b/graphics/pokemon/gen_1/kadabra/icon.png similarity index 100% rename from graphics/pokemon/kadabra/icon.png rename to graphics/pokemon/gen_1/kadabra/icon.png diff --git a/graphics/pokemon/kadabra/normal.pal b/graphics/pokemon/gen_1/kadabra/normal.pal similarity index 100% rename from graphics/pokemon/kadabra/normal.pal rename to graphics/pokemon/gen_1/kadabra/normal.pal diff --git a/graphics/pokemon/kadabra/shiny.pal b/graphics/pokemon/gen_1/kadabra/shiny.pal similarity index 100% rename from graphics/pokemon/kadabra/shiny.pal rename to graphics/pokemon/gen_1/kadabra/shiny.pal diff --git a/graphics/pokemon/kakuna/anim_front.png b/graphics/pokemon/gen_1/kakuna/anim_front.png similarity index 100% rename from graphics/pokemon/kakuna/anim_front.png rename to graphics/pokemon/gen_1/kakuna/anim_front.png diff --git a/graphics/pokemon/kakuna/back.png b/graphics/pokemon/gen_1/kakuna/back.png similarity index 100% rename from graphics/pokemon/kakuna/back.png rename to graphics/pokemon/gen_1/kakuna/back.png diff --git a/graphics/pokemon/carbink/footprint.png b/graphics/pokemon/gen_1/kakuna/footprint.png similarity index 100% rename from graphics/pokemon/carbink/footprint.png rename to graphics/pokemon/gen_1/kakuna/footprint.png diff --git a/graphics/pokemon/kakuna/icon.png b/graphics/pokemon/gen_1/kakuna/icon.png similarity index 100% rename from graphics/pokemon/kakuna/icon.png rename to graphics/pokemon/gen_1/kakuna/icon.png diff --git a/graphics/pokemon/kakuna/normal.pal b/graphics/pokemon/gen_1/kakuna/normal.pal similarity index 100% rename from graphics/pokemon/kakuna/normal.pal rename to graphics/pokemon/gen_1/kakuna/normal.pal diff --git a/graphics/pokemon/kakuna/shiny.pal b/graphics/pokemon/gen_1/kakuna/shiny.pal similarity index 100% rename from graphics/pokemon/kakuna/shiny.pal rename to graphics/pokemon/gen_1/kakuna/shiny.pal diff --git a/graphics/pokemon/kangaskhan/anim_front.png b/graphics/pokemon/gen_1/kangaskhan/anim_front.png similarity index 100% rename from graphics/pokemon/kangaskhan/anim_front.png rename to graphics/pokemon/gen_1/kangaskhan/anim_front.png diff --git a/graphics/pokemon/kangaskhan/back.png b/graphics/pokemon/gen_1/kangaskhan/back.png similarity index 100% rename from graphics/pokemon/kangaskhan/back.png rename to graphics/pokemon/gen_1/kangaskhan/back.png diff --git a/graphics/pokemon/kangaskhan/footprint.png b/graphics/pokemon/gen_1/kangaskhan/footprint.png similarity index 100% rename from graphics/pokemon/kangaskhan/footprint.png rename to graphics/pokemon/gen_1/kangaskhan/footprint.png diff --git a/graphics/pokemon/kangaskhan/icon.png b/graphics/pokemon/gen_1/kangaskhan/icon.png similarity index 100% rename from graphics/pokemon/kangaskhan/icon.png rename to graphics/pokemon/gen_1/kangaskhan/icon.png diff --git a/graphics/pokemon/kangaskhan/mega/back.png b/graphics/pokemon/gen_1/kangaskhan/mega/back.png similarity index 100% rename from graphics/pokemon/kangaskhan/mega/back.png rename to graphics/pokemon/gen_1/kangaskhan/mega/back.png diff --git a/graphics/pokemon/kangaskhan/mega/front.png b/graphics/pokemon/gen_1/kangaskhan/mega/front.png similarity index 100% rename from graphics/pokemon/kangaskhan/mega/front.png rename to graphics/pokemon/gen_1/kangaskhan/mega/front.png diff --git a/graphics/pokemon/kangaskhan/mega/icon.png b/graphics/pokemon/gen_1/kangaskhan/mega/icon.png similarity index 100% rename from graphics/pokemon/kangaskhan/mega/icon.png rename to graphics/pokemon/gen_1/kangaskhan/mega/icon.png diff --git a/graphics/pokemon/kangaskhan/mega/normal.pal b/graphics/pokemon/gen_1/kangaskhan/mega/normal.pal similarity index 100% rename from graphics/pokemon/kangaskhan/mega/normal.pal rename to graphics/pokemon/gen_1/kangaskhan/mega/normal.pal diff --git a/graphics/pokemon/kangaskhan/mega/shiny.pal b/graphics/pokemon/gen_1/kangaskhan/mega/shiny.pal similarity index 100% rename from graphics/pokemon/kangaskhan/mega/shiny.pal rename to graphics/pokemon/gen_1/kangaskhan/mega/shiny.pal diff --git a/graphics/pokemon/kangaskhan/normal.pal b/graphics/pokemon/gen_1/kangaskhan/normal.pal similarity index 100% rename from graphics/pokemon/kangaskhan/normal.pal rename to graphics/pokemon/gen_1/kangaskhan/normal.pal diff --git a/graphics/pokemon/kangaskhan/shiny.pal b/graphics/pokemon/gen_1/kangaskhan/shiny.pal similarity index 100% rename from graphics/pokemon/kangaskhan/shiny.pal rename to graphics/pokemon/gen_1/kangaskhan/shiny.pal diff --git a/graphics/pokemon/kingler/anim_front.png b/graphics/pokemon/gen_1/kingler/anim_front.png similarity index 100% rename from graphics/pokemon/kingler/anim_front.png rename to graphics/pokemon/gen_1/kingler/anim_front.png diff --git a/graphics/pokemon/kingler/back.png b/graphics/pokemon/gen_1/kingler/back.png similarity index 100% rename from graphics/pokemon/kingler/back.png rename to graphics/pokemon/gen_1/kingler/back.png diff --git a/graphics/pokemon/kingler/footprint.png b/graphics/pokemon/gen_1/kingler/footprint.png similarity index 100% rename from graphics/pokemon/kingler/footprint.png rename to graphics/pokemon/gen_1/kingler/footprint.png diff --git a/graphics/pokemon/kingler/gigantamax/back.png b/graphics/pokemon/gen_1/kingler/gigantamax/back.png similarity index 100% rename from graphics/pokemon/kingler/gigantamax/back.png rename to graphics/pokemon/gen_1/kingler/gigantamax/back.png diff --git a/graphics/pokemon/kingler/gigantamax/front.png b/graphics/pokemon/gen_1/kingler/gigantamax/front.png similarity index 100% rename from graphics/pokemon/kingler/gigantamax/front.png rename to graphics/pokemon/gen_1/kingler/gigantamax/front.png diff --git a/graphics/pokemon/kingler/gigantamax/icon.png b/graphics/pokemon/gen_1/kingler/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/kingler/gigantamax/icon.png rename to graphics/pokemon/gen_1/kingler/gigantamax/icon.png diff --git a/graphics/pokemon/kingler/gigantamax/normal.pal b/graphics/pokemon/gen_1/kingler/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/kingler/gigantamax/normal.pal rename to graphics/pokemon/gen_1/kingler/gigantamax/normal.pal diff --git a/graphics/pokemon/kingler/gigantamax/shiny.pal b/graphics/pokemon/gen_1/kingler/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/kingler/gigantamax/shiny.pal rename to graphics/pokemon/gen_1/kingler/gigantamax/shiny.pal diff --git a/graphics/pokemon/kingler/icon.png b/graphics/pokemon/gen_1/kingler/icon.png similarity index 100% rename from graphics/pokemon/kingler/icon.png rename to graphics/pokemon/gen_1/kingler/icon.png diff --git a/graphics/pokemon/kingler/normal.pal b/graphics/pokemon/gen_1/kingler/normal.pal similarity index 100% rename from graphics/pokemon/kingler/normal.pal rename to graphics/pokemon/gen_1/kingler/normal.pal diff --git a/graphics/pokemon/kingler/shiny.pal b/graphics/pokemon/gen_1/kingler/shiny.pal similarity index 100% rename from graphics/pokemon/kingler/shiny.pal rename to graphics/pokemon/gen_1/kingler/shiny.pal diff --git a/graphics/pokemon/koffing/anim_front.png b/graphics/pokemon/gen_1/koffing/anim_front.png similarity index 100% rename from graphics/pokemon/koffing/anim_front.png rename to graphics/pokemon/gen_1/koffing/anim_front.png diff --git a/graphics/pokemon/koffing/back.png b/graphics/pokemon/gen_1/koffing/back.png similarity index 100% rename from graphics/pokemon/koffing/back.png rename to graphics/pokemon/gen_1/koffing/back.png diff --git a/graphics/pokemon/carnivine/footprint.png b/graphics/pokemon/gen_1/koffing/footprint.png similarity index 100% rename from graphics/pokemon/carnivine/footprint.png rename to graphics/pokemon/gen_1/koffing/footprint.png diff --git a/graphics/pokemon/koffing/icon.png b/graphics/pokemon/gen_1/koffing/icon.png similarity index 100% rename from graphics/pokemon/koffing/icon.png rename to graphics/pokemon/gen_1/koffing/icon.png diff --git a/graphics/pokemon/koffing/normal.pal b/graphics/pokemon/gen_1/koffing/normal.pal similarity index 100% rename from graphics/pokemon/koffing/normal.pal rename to graphics/pokemon/gen_1/koffing/normal.pal diff --git a/graphics/pokemon/koffing/shiny.pal b/graphics/pokemon/gen_1/koffing/shiny.pal similarity index 100% rename from graphics/pokemon/koffing/shiny.pal rename to graphics/pokemon/gen_1/koffing/shiny.pal diff --git a/graphics/pokemon/krabby/anim_front.png b/graphics/pokemon/gen_1/krabby/anim_front.png similarity index 100% rename from graphics/pokemon/krabby/anim_front.png rename to graphics/pokemon/gen_1/krabby/anim_front.png diff --git a/graphics/pokemon/krabby/back.png b/graphics/pokemon/gen_1/krabby/back.png similarity index 100% rename from graphics/pokemon/krabby/back.png rename to graphics/pokemon/gen_1/krabby/back.png diff --git a/graphics/pokemon/krabby/footprint.png b/graphics/pokemon/gen_1/krabby/footprint.png similarity index 100% rename from graphics/pokemon/krabby/footprint.png rename to graphics/pokemon/gen_1/krabby/footprint.png diff --git a/graphics/pokemon/krabby/icon.png b/graphics/pokemon/gen_1/krabby/icon.png similarity index 100% rename from graphics/pokemon/krabby/icon.png rename to graphics/pokemon/gen_1/krabby/icon.png diff --git a/graphics/pokemon/krabby/normal.pal b/graphics/pokemon/gen_1/krabby/normal.pal similarity index 100% rename from graphics/pokemon/krabby/normal.pal rename to graphics/pokemon/gen_1/krabby/normal.pal diff --git a/graphics/pokemon/krabby/shiny.pal b/graphics/pokemon/gen_1/krabby/shiny.pal similarity index 100% rename from graphics/pokemon/krabby/shiny.pal rename to graphics/pokemon/gen_1/krabby/shiny.pal diff --git a/graphics/pokemon/lapras/anim_front.png b/graphics/pokemon/gen_1/lapras/anim_front.png similarity index 100% rename from graphics/pokemon/lapras/anim_front.png rename to graphics/pokemon/gen_1/lapras/anim_front.png diff --git a/graphics/pokemon/lapras/back.png b/graphics/pokemon/gen_1/lapras/back.png similarity index 100% rename from graphics/pokemon/lapras/back.png rename to graphics/pokemon/gen_1/lapras/back.png diff --git a/graphics/pokemon/carvanha/footprint.png b/graphics/pokemon/gen_1/lapras/footprint.png similarity index 100% rename from graphics/pokemon/carvanha/footprint.png rename to graphics/pokemon/gen_1/lapras/footprint.png diff --git a/graphics/pokemon/lapras/gigantamax/back.png b/graphics/pokemon/gen_1/lapras/gigantamax/back.png similarity index 100% rename from graphics/pokemon/lapras/gigantamax/back.png rename to graphics/pokemon/gen_1/lapras/gigantamax/back.png diff --git a/graphics/pokemon/lapras/gigantamax/front.png b/graphics/pokemon/gen_1/lapras/gigantamax/front.png similarity index 100% rename from graphics/pokemon/lapras/gigantamax/front.png rename to graphics/pokemon/gen_1/lapras/gigantamax/front.png diff --git a/graphics/pokemon/lapras/gigantamax/icon.png b/graphics/pokemon/gen_1/lapras/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/lapras/gigantamax/icon.png rename to graphics/pokemon/gen_1/lapras/gigantamax/icon.png diff --git a/graphics/pokemon/lapras/gigantamax/normal.pal b/graphics/pokemon/gen_1/lapras/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/lapras/gigantamax/normal.pal rename to graphics/pokemon/gen_1/lapras/gigantamax/normal.pal diff --git a/graphics/pokemon/lapras/gigantamax/shiny.pal b/graphics/pokemon/gen_1/lapras/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/lapras/gigantamax/shiny.pal rename to graphics/pokemon/gen_1/lapras/gigantamax/shiny.pal diff --git a/graphics/pokemon/lapras/icon.png b/graphics/pokemon/gen_1/lapras/icon.png similarity index 100% rename from graphics/pokemon/lapras/icon.png rename to graphics/pokemon/gen_1/lapras/icon.png diff --git a/graphics/pokemon/lapras/normal.pal b/graphics/pokemon/gen_1/lapras/normal.pal similarity index 100% rename from graphics/pokemon/lapras/normal.pal rename to graphics/pokemon/gen_1/lapras/normal.pal diff --git a/graphics/pokemon/lapras/shiny.pal b/graphics/pokemon/gen_1/lapras/shiny.pal similarity index 100% rename from graphics/pokemon/lapras/shiny.pal rename to graphics/pokemon/gen_1/lapras/shiny.pal diff --git a/graphics/pokemon/lickitung/anim_front.png b/graphics/pokemon/gen_1/lickitung/anim_front.png similarity index 100% rename from graphics/pokemon/lickitung/anim_front.png rename to graphics/pokemon/gen_1/lickitung/anim_front.png diff --git a/graphics/pokemon/lickitung/back.png b/graphics/pokemon/gen_1/lickitung/back.png similarity index 100% rename from graphics/pokemon/lickitung/back.png rename to graphics/pokemon/gen_1/lickitung/back.png diff --git a/graphics/pokemon/lickitung/footprint.png b/graphics/pokemon/gen_1/lickitung/footprint.png similarity index 100% rename from graphics/pokemon/lickitung/footprint.png rename to graphics/pokemon/gen_1/lickitung/footprint.png diff --git a/graphics/pokemon/lickitung/icon.png b/graphics/pokemon/gen_1/lickitung/icon.png similarity index 100% rename from graphics/pokemon/lickitung/icon.png rename to graphics/pokemon/gen_1/lickitung/icon.png diff --git a/graphics/pokemon/lickitung/normal.pal b/graphics/pokemon/gen_1/lickitung/normal.pal similarity index 100% rename from graphics/pokemon/lickitung/normal.pal rename to graphics/pokemon/gen_1/lickitung/normal.pal diff --git a/graphics/pokemon/lickitung/shiny.pal b/graphics/pokemon/gen_1/lickitung/shiny.pal similarity index 100% rename from graphics/pokemon/lickitung/shiny.pal rename to graphics/pokemon/gen_1/lickitung/shiny.pal diff --git a/graphics/pokemon/machamp/anim_front.png b/graphics/pokemon/gen_1/machamp/anim_front.png similarity index 100% rename from graphics/pokemon/machamp/anim_front.png rename to graphics/pokemon/gen_1/machamp/anim_front.png diff --git a/graphics/pokemon/machamp/back.png b/graphics/pokemon/gen_1/machamp/back.png similarity index 100% rename from graphics/pokemon/machamp/back.png rename to graphics/pokemon/gen_1/machamp/back.png diff --git a/graphics/pokemon/machamp/footprint.png b/graphics/pokemon/gen_1/machamp/footprint.png similarity index 100% rename from graphics/pokemon/machamp/footprint.png rename to graphics/pokemon/gen_1/machamp/footprint.png diff --git a/graphics/pokemon/machamp/gigantamax/back.png b/graphics/pokemon/gen_1/machamp/gigantamax/back.png similarity index 100% rename from graphics/pokemon/machamp/gigantamax/back.png rename to graphics/pokemon/gen_1/machamp/gigantamax/back.png diff --git a/graphics/pokemon/machamp/gigantamax/front.png b/graphics/pokemon/gen_1/machamp/gigantamax/front.png similarity index 100% rename from graphics/pokemon/machamp/gigantamax/front.png rename to graphics/pokemon/gen_1/machamp/gigantamax/front.png diff --git a/graphics/pokemon/machamp/gigantamax/icon.png b/graphics/pokemon/gen_1/machamp/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/machamp/gigantamax/icon.png rename to graphics/pokemon/gen_1/machamp/gigantamax/icon.png diff --git a/graphics/pokemon/machamp/gigantamax/normal.pal b/graphics/pokemon/gen_1/machamp/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/machamp/gigantamax/normal.pal rename to graphics/pokemon/gen_1/machamp/gigantamax/normal.pal diff --git a/graphics/pokemon/machamp/gigantamax/shiny.pal b/graphics/pokemon/gen_1/machamp/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/machamp/gigantamax/shiny.pal rename to graphics/pokemon/gen_1/machamp/gigantamax/shiny.pal diff --git a/graphics/pokemon/machamp/icon.png b/graphics/pokemon/gen_1/machamp/icon.png similarity index 100% rename from graphics/pokemon/machamp/icon.png rename to graphics/pokemon/gen_1/machamp/icon.png diff --git a/graphics/pokemon/machamp/normal.pal b/graphics/pokemon/gen_1/machamp/normal.pal similarity index 100% rename from graphics/pokemon/machamp/normal.pal rename to graphics/pokemon/gen_1/machamp/normal.pal diff --git a/graphics/pokemon/machamp/shiny.pal b/graphics/pokemon/gen_1/machamp/shiny.pal similarity index 100% rename from graphics/pokemon/machamp/shiny.pal rename to graphics/pokemon/gen_1/machamp/shiny.pal diff --git a/graphics/pokemon/machoke/anim_front.png b/graphics/pokemon/gen_1/machoke/anim_front.png similarity index 100% rename from graphics/pokemon/machoke/anim_front.png rename to graphics/pokemon/gen_1/machoke/anim_front.png diff --git a/graphics/pokemon/machoke/back.png b/graphics/pokemon/gen_1/machoke/back.png similarity index 100% rename from graphics/pokemon/machoke/back.png rename to graphics/pokemon/gen_1/machoke/back.png diff --git a/graphics/pokemon/machoke/footprint.png b/graphics/pokemon/gen_1/machoke/footprint.png similarity index 100% rename from graphics/pokemon/machoke/footprint.png rename to graphics/pokemon/gen_1/machoke/footprint.png diff --git a/graphics/pokemon/machoke/icon.png b/graphics/pokemon/gen_1/machoke/icon.png similarity index 100% rename from graphics/pokemon/machoke/icon.png rename to graphics/pokemon/gen_1/machoke/icon.png diff --git a/graphics/pokemon/machoke/normal.pal b/graphics/pokemon/gen_1/machoke/normal.pal similarity index 100% rename from graphics/pokemon/machoke/normal.pal rename to graphics/pokemon/gen_1/machoke/normal.pal diff --git a/graphics/pokemon/machoke/shiny.pal b/graphics/pokemon/gen_1/machoke/shiny.pal similarity index 100% rename from graphics/pokemon/machoke/shiny.pal rename to graphics/pokemon/gen_1/machoke/shiny.pal diff --git a/graphics/pokemon/machop/anim_front.png b/graphics/pokemon/gen_1/machop/anim_front.png similarity index 100% rename from graphics/pokemon/machop/anim_front.png rename to graphics/pokemon/gen_1/machop/anim_front.png diff --git a/graphics/pokemon/machop/back.png b/graphics/pokemon/gen_1/machop/back.png similarity index 100% rename from graphics/pokemon/machop/back.png rename to graphics/pokemon/gen_1/machop/back.png diff --git a/graphics/pokemon/machop/footprint.png b/graphics/pokemon/gen_1/machop/footprint.png similarity index 100% rename from graphics/pokemon/machop/footprint.png rename to graphics/pokemon/gen_1/machop/footprint.png diff --git a/graphics/pokemon/machop/icon.png b/graphics/pokemon/gen_1/machop/icon.png similarity index 100% rename from graphics/pokemon/machop/icon.png rename to graphics/pokemon/gen_1/machop/icon.png diff --git a/graphics/pokemon/machop/normal.pal b/graphics/pokemon/gen_1/machop/normal.pal similarity index 100% rename from graphics/pokemon/machop/normal.pal rename to graphics/pokemon/gen_1/machop/normal.pal diff --git a/graphics/pokemon/machop/shiny.pal b/graphics/pokemon/gen_1/machop/shiny.pal similarity index 100% rename from graphics/pokemon/machop/shiny.pal rename to graphics/pokemon/gen_1/machop/shiny.pal diff --git a/graphics/pokemon/magikarp/anim_front.png b/graphics/pokemon/gen_1/magikarp/anim_front.png similarity index 100% rename from graphics/pokemon/magikarp/anim_front.png rename to graphics/pokemon/gen_1/magikarp/anim_front.png diff --git a/graphics/pokemon/magikarp/anim_frontf.png b/graphics/pokemon/gen_1/magikarp/anim_frontf.png similarity index 100% rename from graphics/pokemon/magikarp/anim_frontf.png rename to graphics/pokemon/gen_1/magikarp/anim_frontf.png diff --git a/graphics/pokemon/magikarp/back.png b/graphics/pokemon/gen_1/magikarp/back.png similarity index 100% rename from graphics/pokemon/magikarp/back.png rename to graphics/pokemon/gen_1/magikarp/back.png diff --git a/graphics/pokemon/magikarp/backf.png b/graphics/pokemon/gen_1/magikarp/backf.png similarity index 100% rename from graphics/pokemon/magikarp/backf.png rename to graphics/pokemon/gen_1/magikarp/backf.png diff --git a/graphics/pokemon/cascoon/footprint.png b/graphics/pokemon/gen_1/magikarp/footprint.png similarity index 100% rename from graphics/pokemon/cascoon/footprint.png rename to graphics/pokemon/gen_1/magikarp/footprint.png diff --git a/graphics/pokemon/magikarp/icon.png b/graphics/pokemon/gen_1/magikarp/icon.png similarity index 100% rename from graphics/pokemon/magikarp/icon.png rename to graphics/pokemon/gen_1/magikarp/icon.png diff --git a/graphics/pokemon/magikarp/normal.pal b/graphics/pokemon/gen_1/magikarp/normal.pal similarity index 100% rename from graphics/pokemon/magikarp/normal.pal rename to graphics/pokemon/gen_1/magikarp/normal.pal diff --git a/graphics/pokemon/magikarp/shiny.pal b/graphics/pokemon/gen_1/magikarp/shiny.pal similarity index 100% rename from graphics/pokemon/magikarp/shiny.pal rename to graphics/pokemon/gen_1/magikarp/shiny.pal diff --git a/graphics/pokemon/magmar/anim_front.png b/graphics/pokemon/gen_1/magmar/anim_front.png similarity index 100% rename from graphics/pokemon/magmar/anim_front.png rename to graphics/pokemon/gen_1/magmar/anim_front.png diff --git a/graphics/pokemon/magmar/back.png b/graphics/pokemon/gen_1/magmar/back.png similarity index 100% rename from graphics/pokemon/magmar/back.png rename to graphics/pokemon/gen_1/magmar/back.png diff --git a/graphics/pokemon/magmar/footprint.png b/graphics/pokemon/gen_1/magmar/footprint.png similarity index 100% rename from graphics/pokemon/magmar/footprint.png rename to graphics/pokemon/gen_1/magmar/footprint.png diff --git a/graphics/pokemon/magmar/icon.png b/graphics/pokemon/gen_1/magmar/icon.png similarity index 100% rename from graphics/pokemon/magmar/icon.png rename to graphics/pokemon/gen_1/magmar/icon.png diff --git a/graphics/pokemon/magmar/normal.pal b/graphics/pokemon/gen_1/magmar/normal.pal similarity index 100% rename from graphics/pokemon/magmar/normal.pal rename to graphics/pokemon/gen_1/magmar/normal.pal diff --git a/graphics/pokemon/magmar/shiny.pal b/graphics/pokemon/gen_1/magmar/shiny.pal similarity index 100% rename from graphics/pokemon/magmar/shiny.pal rename to graphics/pokemon/gen_1/magmar/shiny.pal diff --git a/graphics/pokemon/magnemite/anim_front.png b/graphics/pokemon/gen_1/magnemite/anim_front.png similarity index 100% rename from graphics/pokemon/magnemite/anim_front.png rename to graphics/pokemon/gen_1/magnemite/anim_front.png diff --git a/graphics/pokemon/magnemite/back.png b/graphics/pokemon/gen_1/magnemite/back.png similarity index 100% rename from graphics/pokemon/magnemite/back.png rename to graphics/pokemon/gen_1/magnemite/back.png diff --git a/graphics/pokemon/magnemite/footprint.png b/graphics/pokemon/gen_1/magnemite/footprint.png similarity index 100% rename from graphics/pokemon/magnemite/footprint.png rename to graphics/pokemon/gen_1/magnemite/footprint.png diff --git a/graphics/pokemon/magnemite/icon.png b/graphics/pokemon/gen_1/magnemite/icon.png similarity index 100% rename from graphics/pokemon/magnemite/icon.png rename to graphics/pokemon/gen_1/magnemite/icon.png diff --git a/graphics/pokemon/magnemite/normal.pal b/graphics/pokemon/gen_1/magnemite/normal.pal similarity index 100% rename from graphics/pokemon/magnemite/normal.pal rename to graphics/pokemon/gen_1/magnemite/normal.pal diff --git a/graphics/pokemon/magnemite/shiny.pal b/graphics/pokemon/gen_1/magnemite/shiny.pal similarity index 100% rename from graphics/pokemon/magnemite/shiny.pal rename to graphics/pokemon/gen_1/magnemite/shiny.pal diff --git a/graphics/pokemon/magneton/anim_front.png b/graphics/pokemon/gen_1/magneton/anim_front.png similarity index 100% rename from graphics/pokemon/magneton/anim_front.png rename to graphics/pokemon/gen_1/magneton/anim_front.png diff --git a/graphics/pokemon/magneton/back.png b/graphics/pokemon/gen_1/magneton/back.png similarity index 100% rename from graphics/pokemon/magneton/back.png rename to graphics/pokemon/gen_1/magneton/back.png diff --git a/graphics/pokemon/magneton/footprint.png b/graphics/pokemon/gen_1/magneton/footprint.png similarity index 100% rename from graphics/pokemon/magneton/footprint.png rename to graphics/pokemon/gen_1/magneton/footprint.png diff --git a/graphics/pokemon/magneton/icon.png b/graphics/pokemon/gen_1/magneton/icon.png similarity index 100% rename from graphics/pokemon/magneton/icon.png rename to graphics/pokemon/gen_1/magneton/icon.png diff --git a/graphics/pokemon/magneton/normal.pal b/graphics/pokemon/gen_1/magneton/normal.pal similarity index 100% rename from graphics/pokemon/magneton/normal.pal rename to graphics/pokemon/gen_1/magneton/normal.pal diff --git a/graphics/pokemon/magneton/shiny.pal b/graphics/pokemon/gen_1/magneton/shiny.pal similarity index 100% rename from graphics/pokemon/magneton/shiny.pal rename to graphics/pokemon/gen_1/magneton/shiny.pal diff --git a/graphics/pokemon/mankey/anim_front.png b/graphics/pokemon/gen_1/mankey/anim_front.png similarity index 100% rename from graphics/pokemon/mankey/anim_front.png rename to graphics/pokemon/gen_1/mankey/anim_front.png diff --git a/graphics/pokemon/mankey/back.png b/graphics/pokemon/gen_1/mankey/back.png similarity index 100% rename from graphics/pokemon/mankey/back.png rename to graphics/pokemon/gen_1/mankey/back.png diff --git a/graphics/pokemon/mankey/footprint.png b/graphics/pokemon/gen_1/mankey/footprint.png similarity index 100% rename from graphics/pokemon/mankey/footprint.png rename to graphics/pokemon/gen_1/mankey/footprint.png diff --git a/graphics/pokemon/mankey/icon.png b/graphics/pokemon/gen_1/mankey/icon.png similarity index 100% rename from graphics/pokemon/mankey/icon.png rename to graphics/pokemon/gen_1/mankey/icon.png diff --git a/graphics/pokemon/mankey/normal.pal b/graphics/pokemon/gen_1/mankey/normal.pal similarity index 100% rename from graphics/pokemon/mankey/normal.pal rename to graphics/pokemon/gen_1/mankey/normal.pal diff --git a/graphics/pokemon/mankey/shiny.pal b/graphics/pokemon/gen_1/mankey/shiny.pal similarity index 100% rename from graphics/pokemon/mankey/shiny.pal rename to graphics/pokemon/gen_1/mankey/shiny.pal diff --git a/graphics/pokemon/marowak/alolan/back.png b/graphics/pokemon/gen_1/marowak/alolan/back.png similarity index 100% rename from graphics/pokemon/marowak/alolan/back.png rename to graphics/pokemon/gen_1/marowak/alolan/back.png diff --git a/graphics/pokemon/marowak/alolan/front.png b/graphics/pokemon/gen_1/marowak/alolan/front.png similarity index 100% rename from graphics/pokemon/marowak/alolan/front.png rename to graphics/pokemon/gen_1/marowak/alolan/front.png diff --git a/graphics/pokemon/marowak/alolan/icon.png b/graphics/pokemon/gen_1/marowak/alolan/icon.png similarity index 100% rename from graphics/pokemon/marowak/alolan/icon.png rename to graphics/pokemon/gen_1/marowak/alolan/icon.png diff --git a/graphics/pokemon/marowak/alolan/normal.pal b/graphics/pokemon/gen_1/marowak/alolan/normal.pal similarity index 100% rename from graphics/pokemon/marowak/alolan/normal.pal rename to graphics/pokemon/gen_1/marowak/alolan/normal.pal diff --git a/graphics/pokemon/marowak/alolan/shiny.pal b/graphics/pokemon/gen_1/marowak/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/marowak/alolan/shiny.pal rename to graphics/pokemon/gen_1/marowak/alolan/shiny.pal diff --git a/graphics/pokemon/marowak/anim_front.png b/graphics/pokemon/gen_1/marowak/anim_front.png similarity index 100% rename from graphics/pokemon/marowak/anim_front.png rename to graphics/pokemon/gen_1/marowak/anim_front.png diff --git a/graphics/pokemon/marowak/back.png b/graphics/pokemon/gen_1/marowak/back.png similarity index 100% rename from graphics/pokemon/marowak/back.png rename to graphics/pokemon/gen_1/marowak/back.png diff --git a/graphics/pokemon/marowak/footprint.png b/graphics/pokemon/gen_1/marowak/footprint.png similarity index 100% rename from graphics/pokemon/marowak/footprint.png rename to graphics/pokemon/gen_1/marowak/footprint.png diff --git a/graphics/pokemon/marowak/icon.png b/graphics/pokemon/gen_1/marowak/icon.png similarity index 100% rename from graphics/pokemon/marowak/icon.png rename to graphics/pokemon/gen_1/marowak/icon.png diff --git a/graphics/pokemon/marowak/normal.pal b/graphics/pokemon/gen_1/marowak/normal.pal similarity index 100% rename from graphics/pokemon/marowak/normal.pal rename to graphics/pokemon/gen_1/marowak/normal.pal diff --git a/graphics/pokemon/marowak/shiny.pal b/graphics/pokemon/gen_1/marowak/shiny.pal similarity index 100% rename from graphics/pokemon/marowak/shiny.pal rename to graphics/pokemon/gen_1/marowak/shiny.pal diff --git a/graphics/pokemon/meowth/alolan/back.png b/graphics/pokemon/gen_1/meowth/alolan/back.png similarity index 100% rename from graphics/pokemon/meowth/alolan/back.png rename to graphics/pokemon/gen_1/meowth/alolan/back.png diff --git a/graphics/pokemon/meowth/alolan/front.png b/graphics/pokemon/gen_1/meowth/alolan/front.png similarity index 100% rename from graphics/pokemon/meowth/alolan/front.png rename to graphics/pokemon/gen_1/meowth/alolan/front.png diff --git a/graphics/pokemon/meowth/alolan/icon.png b/graphics/pokemon/gen_1/meowth/alolan/icon.png similarity index 100% rename from graphics/pokemon/meowth/alolan/icon.png rename to graphics/pokemon/gen_1/meowth/alolan/icon.png diff --git a/graphics/pokemon/meowth/alolan/normal.pal b/graphics/pokemon/gen_1/meowth/alolan/normal.pal similarity index 100% rename from graphics/pokemon/meowth/alolan/normal.pal rename to graphics/pokemon/gen_1/meowth/alolan/normal.pal diff --git a/graphics/pokemon/meowth/alolan/shiny.pal b/graphics/pokemon/gen_1/meowth/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/meowth/alolan/shiny.pal rename to graphics/pokemon/gen_1/meowth/alolan/shiny.pal diff --git a/graphics/pokemon/meowth/anim_front.png b/graphics/pokemon/gen_1/meowth/anim_front.png similarity index 100% rename from graphics/pokemon/meowth/anim_front.png rename to graphics/pokemon/gen_1/meowth/anim_front.png diff --git a/graphics/pokemon/meowth/back.png b/graphics/pokemon/gen_1/meowth/back.png similarity index 100% rename from graphics/pokemon/meowth/back.png rename to graphics/pokemon/gen_1/meowth/back.png diff --git a/graphics/pokemon/meowth/footprint.png b/graphics/pokemon/gen_1/meowth/footprint.png similarity index 100% rename from graphics/pokemon/meowth/footprint.png rename to graphics/pokemon/gen_1/meowth/footprint.png diff --git a/graphics/pokemon/meowth/galarian/back.png b/graphics/pokemon/gen_1/meowth/galarian/back.png similarity index 100% rename from graphics/pokemon/meowth/galarian/back.png rename to graphics/pokemon/gen_1/meowth/galarian/back.png diff --git a/graphics/pokemon/meowth/galarian/front.png b/graphics/pokemon/gen_1/meowth/galarian/front.png similarity index 100% rename from graphics/pokemon/meowth/galarian/front.png rename to graphics/pokemon/gen_1/meowth/galarian/front.png diff --git a/graphics/pokemon/meowth/galarian/icon.png b/graphics/pokemon/gen_1/meowth/galarian/icon.png similarity index 100% rename from graphics/pokemon/meowth/galarian/icon.png rename to graphics/pokemon/gen_1/meowth/galarian/icon.png diff --git a/graphics/pokemon/meowth/galarian/normal.pal b/graphics/pokemon/gen_1/meowth/galarian/normal.pal similarity index 100% rename from graphics/pokemon/meowth/galarian/normal.pal rename to graphics/pokemon/gen_1/meowth/galarian/normal.pal diff --git a/graphics/pokemon/meowth/galarian/shiny.pal b/graphics/pokemon/gen_1/meowth/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/meowth/galarian/shiny.pal rename to graphics/pokemon/gen_1/meowth/galarian/shiny.pal diff --git a/graphics/pokemon/meowth/gigantamax/back.png b/graphics/pokemon/gen_1/meowth/gigantamax/back.png similarity index 100% rename from graphics/pokemon/meowth/gigantamax/back.png rename to graphics/pokemon/gen_1/meowth/gigantamax/back.png diff --git a/graphics/pokemon/meowth/gigantamax/front.png b/graphics/pokemon/gen_1/meowth/gigantamax/front.png similarity index 100% rename from graphics/pokemon/meowth/gigantamax/front.png rename to graphics/pokemon/gen_1/meowth/gigantamax/front.png diff --git a/graphics/pokemon/meowth/gigantamax/icon.png b/graphics/pokemon/gen_1/meowth/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/meowth/gigantamax/icon.png rename to graphics/pokemon/gen_1/meowth/gigantamax/icon.png diff --git a/graphics/pokemon/meowth/gigantamax/normal.pal b/graphics/pokemon/gen_1/meowth/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/meowth/gigantamax/normal.pal rename to graphics/pokemon/gen_1/meowth/gigantamax/normal.pal diff --git a/graphics/pokemon/meowth/gigantamax/shiny.pal b/graphics/pokemon/gen_1/meowth/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/meowth/gigantamax/shiny.pal rename to graphics/pokemon/gen_1/meowth/gigantamax/shiny.pal diff --git a/graphics/pokemon/meowth/icon.png b/graphics/pokemon/gen_1/meowth/icon.png similarity index 100% rename from graphics/pokemon/meowth/icon.png rename to graphics/pokemon/gen_1/meowth/icon.png diff --git a/graphics/pokemon/meowth/normal.pal b/graphics/pokemon/gen_1/meowth/normal.pal similarity index 100% rename from graphics/pokemon/meowth/normal.pal rename to graphics/pokemon/gen_1/meowth/normal.pal diff --git a/graphics/pokemon/meowth/shiny.pal b/graphics/pokemon/gen_1/meowth/shiny.pal similarity index 100% rename from graphics/pokemon/meowth/shiny.pal rename to graphics/pokemon/gen_1/meowth/shiny.pal diff --git a/graphics/pokemon/metapod/anim_front.png b/graphics/pokemon/gen_1/metapod/anim_front.png similarity index 100% rename from graphics/pokemon/metapod/anim_front.png rename to graphics/pokemon/gen_1/metapod/anim_front.png diff --git a/graphics/pokemon/metapod/back.png b/graphics/pokemon/gen_1/metapod/back.png similarity index 100% rename from graphics/pokemon/metapod/back.png rename to graphics/pokemon/gen_1/metapod/back.png diff --git a/graphics/pokemon/castform/footprint.png b/graphics/pokemon/gen_1/metapod/footprint.png similarity index 100% rename from graphics/pokemon/castform/footprint.png rename to graphics/pokemon/gen_1/metapod/footprint.png diff --git a/graphics/pokemon/metapod/icon.png b/graphics/pokemon/gen_1/metapod/icon.png similarity index 100% rename from graphics/pokemon/metapod/icon.png rename to graphics/pokemon/gen_1/metapod/icon.png diff --git a/graphics/pokemon/metapod/normal.pal b/graphics/pokemon/gen_1/metapod/normal.pal similarity index 100% rename from graphics/pokemon/metapod/normal.pal rename to graphics/pokemon/gen_1/metapod/normal.pal diff --git a/graphics/pokemon/metapod/shiny.pal b/graphics/pokemon/gen_1/metapod/shiny.pal similarity index 100% rename from graphics/pokemon/metapod/shiny.pal rename to graphics/pokemon/gen_1/metapod/shiny.pal diff --git a/graphics/pokemon/mew/anim_front.png b/graphics/pokemon/gen_1/mew/anim_front.png similarity index 100% rename from graphics/pokemon/mew/anim_front.png rename to graphics/pokemon/gen_1/mew/anim_front.png diff --git a/graphics/pokemon/mew/back.png b/graphics/pokemon/gen_1/mew/back.png similarity index 100% rename from graphics/pokemon/mew/back.png rename to graphics/pokemon/gen_1/mew/back.png diff --git a/graphics/pokemon/mew/footprint.png b/graphics/pokemon/gen_1/mew/footprint.png similarity index 100% rename from graphics/pokemon/mew/footprint.png rename to graphics/pokemon/gen_1/mew/footprint.png diff --git a/graphics/pokemon/mew/icon.png b/graphics/pokemon/gen_1/mew/icon.png similarity index 100% rename from graphics/pokemon/mew/icon.png rename to graphics/pokemon/gen_1/mew/icon.png diff --git a/graphics/pokemon/mew/normal.pal b/graphics/pokemon/gen_1/mew/normal.pal similarity index 100% rename from graphics/pokemon/mew/normal.pal rename to graphics/pokemon/gen_1/mew/normal.pal diff --git a/graphics/pokemon/mew/shiny.pal b/graphics/pokemon/gen_1/mew/shiny.pal similarity index 100% rename from graphics/pokemon/mew/shiny.pal rename to graphics/pokemon/gen_1/mew/shiny.pal diff --git a/graphics/pokemon/mewtwo/anim_front.png b/graphics/pokemon/gen_1/mewtwo/anim_front.png similarity index 100% rename from graphics/pokemon/mewtwo/anim_front.png rename to graphics/pokemon/gen_1/mewtwo/anim_front.png diff --git a/graphics/pokemon/mewtwo/back.png b/graphics/pokemon/gen_1/mewtwo/back.png similarity index 100% rename from graphics/pokemon/mewtwo/back.png rename to graphics/pokemon/gen_1/mewtwo/back.png diff --git a/graphics/pokemon/mewtwo/footprint.png b/graphics/pokemon/gen_1/mewtwo/footprint.png similarity index 100% rename from graphics/pokemon/mewtwo/footprint.png rename to graphics/pokemon/gen_1/mewtwo/footprint.png diff --git a/graphics/pokemon/mewtwo/icon.png b/graphics/pokemon/gen_1/mewtwo/icon.png similarity index 100% rename from graphics/pokemon/mewtwo/icon.png rename to graphics/pokemon/gen_1/mewtwo/icon.png diff --git a/graphics/pokemon/mewtwo/mega_x/back.png b/graphics/pokemon/gen_1/mewtwo/mega_x/back.png similarity index 100% rename from graphics/pokemon/mewtwo/mega_x/back.png rename to graphics/pokemon/gen_1/mewtwo/mega_x/back.png diff --git a/graphics/pokemon/mewtwo/mega_x/front.png b/graphics/pokemon/gen_1/mewtwo/mega_x/front.png similarity index 100% rename from graphics/pokemon/mewtwo/mega_x/front.png rename to graphics/pokemon/gen_1/mewtwo/mega_x/front.png diff --git a/graphics/pokemon/mewtwo/mega_x/icon.png b/graphics/pokemon/gen_1/mewtwo/mega_x/icon.png similarity index 100% rename from graphics/pokemon/mewtwo/mega_x/icon.png rename to graphics/pokemon/gen_1/mewtwo/mega_x/icon.png diff --git a/graphics/pokemon/mewtwo/mega_x/normal.pal b/graphics/pokemon/gen_1/mewtwo/mega_x/normal.pal similarity index 100% rename from graphics/pokemon/mewtwo/mega_x/normal.pal rename to graphics/pokemon/gen_1/mewtwo/mega_x/normal.pal diff --git a/graphics/pokemon/mewtwo/mega_x/shiny.pal b/graphics/pokemon/gen_1/mewtwo/mega_x/shiny.pal similarity index 100% rename from graphics/pokemon/mewtwo/mega_x/shiny.pal rename to graphics/pokemon/gen_1/mewtwo/mega_x/shiny.pal diff --git a/graphics/pokemon/mewtwo/mega_y/back.png b/graphics/pokemon/gen_1/mewtwo/mega_y/back.png similarity index 100% rename from graphics/pokemon/mewtwo/mega_y/back.png rename to graphics/pokemon/gen_1/mewtwo/mega_y/back.png diff --git a/graphics/pokemon/mewtwo/mega_y/front.png b/graphics/pokemon/gen_1/mewtwo/mega_y/front.png similarity index 100% rename from graphics/pokemon/mewtwo/mega_y/front.png rename to graphics/pokemon/gen_1/mewtwo/mega_y/front.png diff --git a/graphics/pokemon/mewtwo/mega_y/icon.png b/graphics/pokemon/gen_1/mewtwo/mega_y/icon.png similarity index 100% rename from graphics/pokemon/mewtwo/mega_y/icon.png rename to graphics/pokemon/gen_1/mewtwo/mega_y/icon.png diff --git a/graphics/pokemon/mewtwo/mega_y/normal.pal b/graphics/pokemon/gen_1/mewtwo/mega_y/normal.pal similarity index 100% rename from graphics/pokemon/mewtwo/mega_y/normal.pal rename to graphics/pokemon/gen_1/mewtwo/mega_y/normal.pal diff --git a/graphics/pokemon/mewtwo/mega_y/shiny.pal b/graphics/pokemon/gen_1/mewtwo/mega_y/shiny.pal similarity index 100% rename from graphics/pokemon/mewtwo/mega_y/shiny.pal rename to graphics/pokemon/gen_1/mewtwo/mega_y/shiny.pal diff --git a/graphics/pokemon/mewtwo/normal.pal b/graphics/pokemon/gen_1/mewtwo/normal.pal similarity index 100% rename from graphics/pokemon/mewtwo/normal.pal rename to graphics/pokemon/gen_1/mewtwo/normal.pal diff --git a/graphics/pokemon/mewtwo/shiny.pal b/graphics/pokemon/gen_1/mewtwo/shiny.pal similarity index 100% rename from graphics/pokemon/mewtwo/shiny.pal rename to graphics/pokemon/gen_1/mewtwo/shiny.pal diff --git a/graphics/pokemon/moltres/anim_front.png b/graphics/pokemon/gen_1/moltres/anim_front.png similarity index 100% rename from graphics/pokemon/moltres/anim_front.png rename to graphics/pokemon/gen_1/moltres/anim_front.png diff --git a/graphics/pokemon/moltres/back.png b/graphics/pokemon/gen_1/moltres/back.png similarity index 100% rename from graphics/pokemon/moltres/back.png rename to graphics/pokemon/gen_1/moltres/back.png diff --git a/graphics/pokemon/moltres/footprint.png b/graphics/pokemon/gen_1/moltres/footprint.png similarity index 100% rename from graphics/pokemon/moltres/footprint.png rename to graphics/pokemon/gen_1/moltres/footprint.png diff --git a/graphics/pokemon/moltres/galarian/back.png b/graphics/pokemon/gen_1/moltres/galarian/back.png similarity index 100% rename from graphics/pokemon/moltres/galarian/back.png rename to graphics/pokemon/gen_1/moltres/galarian/back.png diff --git a/graphics/pokemon/moltres/galarian/front.png b/graphics/pokemon/gen_1/moltres/galarian/front.png similarity index 100% rename from graphics/pokemon/moltres/galarian/front.png rename to graphics/pokemon/gen_1/moltres/galarian/front.png diff --git a/graphics/pokemon/moltres/galarian/icon.png b/graphics/pokemon/gen_1/moltres/galarian/icon.png similarity index 100% rename from graphics/pokemon/moltres/galarian/icon.png rename to graphics/pokemon/gen_1/moltres/galarian/icon.png diff --git a/graphics/pokemon/moltres/galarian/normal.pal b/graphics/pokemon/gen_1/moltres/galarian/normal.pal similarity index 100% rename from graphics/pokemon/moltres/galarian/normal.pal rename to graphics/pokemon/gen_1/moltres/galarian/normal.pal diff --git a/graphics/pokemon/moltres/galarian/shiny.pal b/graphics/pokemon/gen_1/moltres/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/moltres/galarian/shiny.pal rename to graphics/pokemon/gen_1/moltres/galarian/shiny.pal diff --git a/graphics/pokemon/moltres/icon.png b/graphics/pokemon/gen_1/moltres/icon.png similarity index 100% rename from graphics/pokemon/moltres/icon.png rename to graphics/pokemon/gen_1/moltres/icon.png diff --git a/graphics/pokemon/moltres/normal.pal b/graphics/pokemon/gen_1/moltres/normal.pal similarity index 100% rename from graphics/pokemon/moltres/normal.pal rename to graphics/pokemon/gen_1/moltres/normal.pal diff --git a/graphics/pokemon/moltres/shiny.pal b/graphics/pokemon/gen_1/moltres/shiny.pal similarity index 100% rename from graphics/pokemon/moltres/shiny.pal rename to graphics/pokemon/gen_1/moltres/shiny.pal diff --git a/graphics/pokemon/mr_mime/anim_front.png b/graphics/pokemon/gen_1/mr_mime/anim_front.png similarity index 100% rename from graphics/pokemon/mr_mime/anim_front.png rename to graphics/pokemon/gen_1/mr_mime/anim_front.png diff --git a/graphics/pokemon/mr_mime/back.png b/graphics/pokemon/gen_1/mr_mime/back.png similarity index 100% rename from graphics/pokemon/mr_mime/back.png rename to graphics/pokemon/gen_1/mr_mime/back.png diff --git a/graphics/pokemon/blacephalon/footprint.png b/graphics/pokemon/gen_1/mr_mime/footprint.png similarity index 100% rename from graphics/pokemon/blacephalon/footprint.png rename to graphics/pokemon/gen_1/mr_mime/footprint.png diff --git a/graphics/pokemon/mr_mime/galarian/back.png b/graphics/pokemon/gen_1/mr_mime/galarian/back.png similarity index 100% rename from graphics/pokemon/mr_mime/galarian/back.png rename to graphics/pokemon/gen_1/mr_mime/galarian/back.png diff --git a/graphics/pokemon/mr_mime/galarian/front.png b/graphics/pokemon/gen_1/mr_mime/galarian/front.png similarity index 100% rename from graphics/pokemon/mr_mime/galarian/front.png rename to graphics/pokemon/gen_1/mr_mime/galarian/front.png diff --git a/graphics/pokemon/mr_mime/galarian/icon.png b/graphics/pokemon/gen_1/mr_mime/galarian/icon.png similarity index 100% rename from graphics/pokemon/mr_mime/galarian/icon.png rename to graphics/pokemon/gen_1/mr_mime/galarian/icon.png diff --git a/graphics/pokemon/mr_mime/galarian/normal.pal b/graphics/pokemon/gen_1/mr_mime/galarian/normal.pal similarity index 100% rename from graphics/pokemon/mr_mime/galarian/normal.pal rename to graphics/pokemon/gen_1/mr_mime/galarian/normal.pal diff --git a/graphics/pokemon/mr_mime/galarian/shiny.pal b/graphics/pokemon/gen_1/mr_mime/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/mr_mime/galarian/shiny.pal rename to graphics/pokemon/gen_1/mr_mime/galarian/shiny.pal diff --git a/graphics/pokemon/mr_mime/icon.png b/graphics/pokemon/gen_1/mr_mime/icon.png similarity index 100% rename from graphics/pokemon/mr_mime/icon.png rename to graphics/pokemon/gen_1/mr_mime/icon.png diff --git a/graphics/pokemon/mr_mime/normal.pal b/graphics/pokemon/gen_1/mr_mime/normal.pal similarity index 100% rename from graphics/pokemon/mr_mime/normal.pal rename to graphics/pokemon/gen_1/mr_mime/normal.pal diff --git a/graphics/pokemon/mr_mime/shiny.pal b/graphics/pokemon/gen_1/mr_mime/shiny.pal similarity index 100% rename from graphics/pokemon/mr_mime/shiny.pal rename to graphics/pokemon/gen_1/mr_mime/shiny.pal diff --git a/graphics/pokemon/muk/alolan/back.png b/graphics/pokemon/gen_1/muk/alolan/back.png similarity index 100% rename from graphics/pokemon/muk/alolan/back.png rename to graphics/pokemon/gen_1/muk/alolan/back.png diff --git a/graphics/pokemon/muk/alolan/front.png b/graphics/pokemon/gen_1/muk/alolan/front.png similarity index 100% rename from graphics/pokemon/muk/alolan/front.png rename to graphics/pokemon/gen_1/muk/alolan/front.png diff --git a/graphics/pokemon/muk/alolan/icon.png b/graphics/pokemon/gen_1/muk/alolan/icon.png similarity index 100% rename from graphics/pokemon/muk/alolan/icon.png rename to graphics/pokemon/gen_1/muk/alolan/icon.png diff --git a/graphics/pokemon/muk/alolan/normal.pal b/graphics/pokemon/gen_1/muk/alolan/normal.pal similarity index 100% rename from graphics/pokemon/muk/alolan/normal.pal rename to graphics/pokemon/gen_1/muk/alolan/normal.pal diff --git a/graphics/pokemon/muk/alolan/shiny.pal b/graphics/pokemon/gen_1/muk/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/muk/alolan/shiny.pal rename to graphics/pokemon/gen_1/muk/alolan/shiny.pal diff --git a/graphics/pokemon/muk/anim_front.png b/graphics/pokemon/gen_1/muk/anim_front.png similarity index 100% rename from graphics/pokemon/muk/anim_front.png rename to graphics/pokemon/gen_1/muk/anim_front.png diff --git a/graphics/pokemon/muk/back.png b/graphics/pokemon/gen_1/muk/back.png similarity index 100% rename from graphics/pokemon/muk/back.png rename to graphics/pokemon/gen_1/muk/back.png diff --git a/graphics/pokemon/chandelure/footprint.png b/graphics/pokemon/gen_1/muk/footprint.png similarity index 100% rename from graphics/pokemon/chandelure/footprint.png rename to graphics/pokemon/gen_1/muk/footprint.png diff --git a/graphics/pokemon/muk/icon.png b/graphics/pokemon/gen_1/muk/icon.png similarity index 100% rename from graphics/pokemon/muk/icon.png rename to graphics/pokemon/gen_1/muk/icon.png diff --git a/graphics/pokemon/muk/normal.pal b/graphics/pokemon/gen_1/muk/normal.pal similarity index 100% rename from graphics/pokemon/muk/normal.pal rename to graphics/pokemon/gen_1/muk/normal.pal diff --git a/graphics/pokemon/muk/shiny.pal b/graphics/pokemon/gen_1/muk/shiny.pal similarity index 100% rename from graphics/pokemon/muk/shiny.pal rename to graphics/pokemon/gen_1/muk/shiny.pal diff --git a/graphics/pokemon/nidoking/anim_front.png b/graphics/pokemon/gen_1/nidoking/anim_front.png similarity index 100% rename from graphics/pokemon/nidoking/anim_front.png rename to graphics/pokemon/gen_1/nidoking/anim_front.png diff --git a/graphics/pokemon/nidoking/back.png b/graphics/pokemon/gen_1/nidoking/back.png similarity index 100% rename from graphics/pokemon/nidoking/back.png rename to graphics/pokemon/gen_1/nidoking/back.png diff --git a/graphics/pokemon/nidoking/footprint.png b/graphics/pokemon/gen_1/nidoking/footprint.png similarity index 100% rename from graphics/pokemon/nidoking/footprint.png rename to graphics/pokemon/gen_1/nidoking/footprint.png diff --git a/graphics/pokemon/nidoking/icon.png b/graphics/pokemon/gen_1/nidoking/icon.png similarity index 100% rename from graphics/pokemon/nidoking/icon.png rename to graphics/pokemon/gen_1/nidoking/icon.png diff --git a/graphics/pokemon/nidoking/normal.pal b/graphics/pokemon/gen_1/nidoking/normal.pal similarity index 100% rename from graphics/pokemon/nidoking/normal.pal rename to graphics/pokemon/gen_1/nidoking/normal.pal diff --git a/graphics/pokemon/nidoking/shiny.pal b/graphics/pokemon/gen_1/nidoking/shiny.pal similarity index 100% rename from graphics/pokemon/nidoking/shiny.pal rename to graphics/pokemon/gen_1/nidoking/shiny.pal diff --git a/graphics/pokemon/nidoqueen/anim_front.png b/graphics/pokemon/gen_1/nidoqueen/anim_front.png similarity index 100% rename from graphics/pokemon/nidoqueen/anim_front.png rename to graphics/pokemon/gen_1/nidoqueen/anim_front.png diff --git a/graphics/pokemon/nidoqueen/back.png b/graphics/pokemon/gen_1/nidoqueen/back.png similarity index 100% rename from graphics/pokemon/nidoqueen/back.png rename to graphics/pokemon/gen_1/nidoqueen/back.png diff --git a/graphics/pokemon/nidoqueen/footprint.png b/graphics/pokemon/gen_1/nidoqueen/footprint.png similarity index 100% rename from graphics/pokemon/nidoqueen/footprint.png rename to graphics/pokemon/gen_1/nidoqueen/footprint.png diff --git a/graphics/pokemon/nidoqueen/icon.png b/graphics/pokemon/gen_1/nidoqueen/icon.png similarity index 100% rename from graphics/pokemon/nidoqueen/icon.png rename to graphics/pokemon/gen_1/nidoqueen/icon.png diff --git a/graphics/pokemon/nidoqueen/normal.pal b/graphics/pokemon/gen_1/nidoqueen/normal.pal similarity index 100% rename from graphics/pokemon/nidoqueen/normal.pal rename to graphics/pokemon/gen_1/nidoqueen/normal.pal diff --git a/graphics/pokemon/nidoqueen/shiny.pal b/graphics/pokemon/gen_1/nidoqueen/shiny.pal similarity index 100% rename from graphics/pokemon/nidoqueen/shiny.pal rename to graphics/pokemon/gen_1/nidoqueen/shiny.pal diff --git a/graphics/pokemon/nidoran_f/anim_front.png b/graphics/pokemon/gen_1/nidoran_f/anim_front.png similarity index 100% rename from graphics/pokemon/nidoran_f/anim_front.png rename to graphics/pokemon/gen_1/nidoran_f/anim_front.png diff --git a/graphics/pokemon/nidoran_f/back.png b/graphics/pokemon/gen_1/nidoran_f/back.png similarity index 100% rename from graphics/pokemon/nidoran_f/back.png rename to graphics/pokemon/gen_1/nidoran_f/back.png diff --git a/graphics/pokemon/nidoran_f/footprint.png b/graphics/pokemon/gen_1/nidoran_f/footprint.png similarity index 100% rename from graphics/pokemon/nidoran_f/footprint.png rename to graphics/pokemon/gen_1/nidoran_f/footprint.png diff --git a/graphics/pokemon/nidoran_f/icon.png b/graphics/pokemon/gen_1/nidoran_f/icon.png similarity index 100% rename from graphics/pokemon/nidoran_f/icon.png rename to graphics/pokemon/gen_1/nidoran_f/icon.png diff --git a/graphics/pokemon/nidoran_f/normal.pal b/graphics/pokemon/gen_1/nidoran_f/normal.pal similarity index 100% rename from graphics/pokemon/nidoran_f/normal.pal rename to graphics/pokemon/gen_1/nidoran_f/normal.pal diff --git a/graphics/pokemon/nidoran_f/shiny.pal b/graphics/pokemon/gen_1/nidoran_f/shiny.pal similarity index 100% rename from graphics/pokemon/nidoran_f/shiny.pal rename to graphics/pokemon/gen_1/nidoran_f/shiny.pal diff --git a/graphics/pokemon/nidoran_m/anim_front.png b/graphics/pokemon/gen_1/nidoran_m/anim_front.png similarity index 100% rename from graphics/pokemon/nidoran_m/anim_front.png rename to graphics/pokemon/gen_1/nidoran_m/anim_front.png diff --git a/graphics/pokemon/nidoran_m/back.png b/graphics/pokemon/gen_1/nidoran_m/back.png similarity index 100% rename from graphics/pokemon/nidoran_m/back.png rename to graphics/pokemon/gen_1/nidoran_m/back.png diff --git a/graphics/pokemon/nidoran_m/footprint.png b/graphics/pokemon/gen_1/nidoran_m/footprint.png similarity index 100% rename from graphics/pokemon/nidoran_m/footprint.png rename to graphics/pokemon/gen_1/nidoran_m/footprint.png diff --git a/graphics/pokemon/nidoran_m/icon.png b/graphics/pokemon/gen_1/nidoran_m/icon.png similarity index 100% rename from graphics/pokemon/nidoran_m/icon.png rename to graphics/pokemon/gen_1/nidoran_m/icon.png diff --git a/graphics/pokemon/nidoran_m/normal.pal b/graphics/pokemon/gen_1/nidoran_m/normal.pal similarity index 100% rename from graphics/pokemon/nidoran_m/normal.pal rename to graphics/pokemon/gen_1/nidoran_m/normal.pal diff --git a/graphics/pokemon/nidoran_m/shiny.pal b/graphics/pokemon/gen_1/nidoran_m/shiny.pal similarity index 100% rename from graphics/pokemon/nidoran_m/shiny.pal rename to graphics/pokemon/gen_1/nidoran_m/shiny.pal diff --git a/graphics/pokemon/nidorina/anim_front.png b/graphics/pokemon/gen_1/nidorina/anim_front.png similarity index 100% rename from graphics/pokemon/nidorina/anim_front.png rename to graphics/pokemon/gen_1/nidorina/anim_front.png diff --git a/graphics/pokemon/nidorina/back.png b/graphics/pokemon/gen_1/nidorina/back.png similarity index 100% rename from graphics/pokemon/nidorina/back.png rename to graphics/pokemon/gen_1/nidorina/back.png diff --git a/graphics/pokemon/nidorina/footprint.png b/graphics/pokemon/gen_1/nidorina/footprint.png similarity index 100% rename from graphics/pokemon/nidorina/footprint.png rename to graphics/pokemon/gen_1/nidorina/footprint.png diff --git a/graphics/pokemon/nidorina/icon.png b/graphics/pokemon/gen_1/nidorina/icon.png similarity index 100% rename from graphics/pokemon/nidorina/icon.png rename to graphics/pokemon/gen_1/nidorina/icon.png diff --git a/graphics/pokemon/nidorina/normal.pal b/graphics/pokemon/gen_1/nidorina/normal.pal similarity index 100% rename from graphics/pokemon/nidorina/normal.pal rename to graphics/pokemon/gen_1/nidorina/normal.pal diff --git a/graphics/pokemon/nidorina/shiny.pal b/graphics/pokemon/gen_1/nidorina/shiny.pal similarity index 100% rename from graphics/pokemon/nidorina/shiny.pal rename to graphics/pokemon/gen_1/nidorina/shiny.pal diff --git a/graphics/pokemon/nidorino/anim_front.png b/graphics/pokemon/gen_1/nidorino/anim_front.png similarity index 100% rename from graphics/pokemon/nidorino/anim_front.png rename to graphics/pokemon/gen_1/nidorino/anim_front.png diff --git a/graphics/pokemon/nidorino/back.png b/graphics/pokemon/gen_1/nidorino/back.png similarity index 100% rename from graphics/pokemon/nidorino/back.png rename to graphics/pokemon/gen_1/nidorino/back.png diff --git a/graphics/pokemon/nidorino/footprint.png b/graphics/pokemon/gen_1/nidorino/footprint.png similarity index 100% rename from graphics/pokemon/nidorino/footprint.png rename to graphics/pokemon/gen_1/nidorino/footprint.png diff --git a/graphics/pokemon/nidorino/icon.png b/graphics/pokemon/gen_1/nidorino/icon.png similarity index 100% rename from graphics/pokemon/nidorino/icon.png rename to graphics/pokemon/gen_1/nidorino/icon.png diff --git a/graphics/pokemon/nidorino/normal.pal b/graphics/pokemon/gen_1/nidorino/normal.pal similarity index 100% rename from graphics/pokemon/nidorino/normal.pal rename to graphics/pokemon/gen_1/nidorino/normal.pal diff --git a/graphics/pokemon/nidorino/shiny.pal b/graphics/pokemon/gen_1/nidorino/shiny.pal similarity index 100% rename from graphics/pokemon/nidorino/shiny.pal rename to graphics/pokemon/gen_1/nidorino/shiny.pal diff --git a/graphics/pokemon/ninetales/alolan/back.png b/graphics/pokemon/gen_1/ninetales/alolan/back.png similarity index 100% rename from graphics/pokemon/ninetales/alolan/back.png rename to graphics/pokemon/gen_1/ninetales/alolan/back.png diff --git a/graphics/pokemon/ninetales/alolan/front.png b/graphics/pokemon/gen_1/ninetales/alolan/front.png similarity index 100% rename from graphics/pokemon/ninetales/alolan/front.png rename to graphics/pokemon/gen_1/ninetales/alolan/front.png diff --git a/graphics/pokemon/ninetales/alolan/icon.png b/graphics/pokemon/gen_1/ninetales/alolan/icon.png similarity index 100% rename from graphics/pokemon/ninetales/alolan/icon.png rename to graphics/pokemon/gen_1/ninetales/alolan/icon.png diff --git a/graphics/pokemon/ninetales/alolan/normal.pal b/graphics/pokemon/gen_1/ninetales/alolan/normal.pal similarity index 100% rename from graphics/pokemon/ninetales/alolan/normal.pal rename to graphics/pokemon/gen_1/ninetales/alolan/normal.pal diff --git a/graphics/pokemon/ninetales/alolan/shiny.pal b/graphics/pokemon/gen_1/ninetales/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/ninetales/alolan/shiny.pal rename to graphics/pokemon/gen_1/ninetales/alolan/shiny.pal diff --git a/graphics/pokemon/ninetales/anim_front.png b/graphics/pokemon/gen_1/ninetales/anim_front.png similarity index 100% rename from graphics/pokemon/ninetales/anim_front.png rename to graphics/pokemon/gen_1/ninetales/anim_front.png diff --git a/graphics/pokemon/ninetales/back.png b/graphics/pokemon/gen_1/ninetales/back.png similarity index 100% rename from graphics/pokemon/ninetales/back.png rename to graphics/pokemon/gen_1/ninetales/back.png diff --git a/graphics/pokemon/ninetales/footprint.png b/graphics/pokemon/gen_1/ninetales/footprint.png similarity index 100% rename from graphics/pokemon/ninetales/footprint.png rename to graphics/pokemon/gen_1/ninetales/footprint.png diff --git a/graphics/pokemon/ninetales/icon.png b/graphics/pokemon/gen_1/ninetales/icon.png similarity index 100% rename from graphics/pokemon/ninetales/icon.png rename to graphics/pokemon/gen_1/ninetales/icon.png diff --git a/graphics/pokemon/ninetales/normal.pal b/graphics/pokemon/gen_1/ninetales/normal.pal similarity index 100% rename from graphics/pokemon/ninetales/normal.pal rename to graphics/pokemon/gen_1/ninetales/normal.pal diff --git a/graphics/pokemon/ninetales/shiny.pal b/graphics/pokemon/gen_1/ninetales/shiny.pal similarity index 100% rename from graphics/pokemon/ninetales/shiny.pal rename to graphics/pokemon/gen_1/ninetales/shiny.pal diff --git a/graphics/pokemon/oddish/anim_front.png b/graphics/pokemon/gen_1/oddish/anim_front.png similarity index 100% rename from graphics/pokemon/oddish/anim_front.png rename to graphics/pokemon/gen_1/oddish/anim_front.png diff --git a/graphics/pokemon/oddish/back.png b/graphics/pokemon/gen_1/oddish/back.png similarity index 100% rename from graphics/pokemon/oddish/back.png rename to graphics/pokemon/gen_1/oddish/back.png diff --git a/graphics/pokemon/oddish/footprint.png b/graphics/pokemon/gen_1/oddish/footprint.png similarity index 100% rename from graphics/pokemon/oddish/footprint.png rename to graphics/pokemon/gen_1/oddish/footprint.png diff --git a/graphics/pokemon/oddish/icon.png b/graphics/pokemon/gen_1/oddish/icon.png similarity index 100% rename from graphics/pokemon/oddish/icon.png rename to graphics/pokemon/gen_1/oddish/icon.png diff --git a/graphics/pokemon/oddish/normal.pal b/graphics/pokemon/gen_1/oddish/normal.pal similarity index 100% rename from graphics/pokemon/oddish/normal.pal rename to graphics/pokemon/gen_1/oddish/normal.pal diff --git a/graphics/pokemon/oddish/shiny.pal b/graphics/pokemon/gen_1/oddish/shiny.pal similarity index 100% rename from graphics/pokemon/oddish/shiny.pal rename to graphics/pokemon/gen_1/oddish/shiny.pal diff --git a/graphics/pokemon/omanyte/anim_front.png b/graphics/pokemon/gen_1/omanyte/anim_front.png similarity index 100% rename from graphics/pokemon/omanyte/anim_front.png rename to graphics/pokemon/gen_1/omanyte/anim_front.png diff --git a/graphics/pokemon/omanyte/back.png b/graphics/pokemon/gen_1/omanyte/back.png similarity index 100% rename from graphics/pokemon/omanyte/back.png rename to graphics/pokemon/gen_1/omanyte/back.png diff --git a/graphics/pokemon/omanyte/footprint.png b/graphics/pokemon/gen_1/omanyte/footprint.png similarity index 100% rename from graphics/pokemon/omanyte/footprint.png rename to graphics/pokemon/gen_1/omanyte/footprint.png diff --git a/graphics/pokemon/omanyte/icon.png b/graphics/pokemon/gen_1/omanyte/icon.png similarity index 100% rename from graphics/pokemon/omanyte/icon.png rename to graphics/pokemon/gen_1/omanyte/icon.png diff --git a/graphics/pokemon/omanyte/normal.pal b/graphics/pokemon/gen_1/omanyte/normal.pal similarity index 100% rename from graphics/pokemon/omanyte/normal.pal rename to graphics/pokemon/gen_1/omanyte/normal.pal diff --git a/graphics/pokemon/omanyte/shiny.pal b/graphics/pokemon/gen_1/omanyte/shiny.pal similarity index 100% rename from graphics/pokemon/omanyte/shiny.pal rename to graphics/pokemon/gen_1/omanyte/shiny.pal diff --git a/graphics/pokemon/omastar/anim_front.png b/graphics/pokemon/gen_1/omastar/anim_front.png similarity index 100% rename from graphics/pokemon/omastar/anim_front.png rename to graphics/pokemon/gen_1/omastar/anim_front.png diff --git a/graphics/pokemon/omastar/back.png b/graphics/pokemon/gen_1/omastar/back.png similarity index 100% rename from graphics/pokemon/omastar/back.png rename to graphics/pokemon/gen_1/omastar/back.png diff --git a/graphics/pokemon/omastar/footprint.png b/graphics/pokemon/gen_1/omastar/footprint.png similarity index 100% rename from graphics/pokemon/omastar/footprint.png rename to graphics/pokemon/gen_1/omastar/footprint.png diff --git a/graphics/pokemon/omastar/icon.png b/graphics/pokemon/gen_1/omastar/icon.png similarity index 100% rename from graphics/pokemon/omastar/icon.png rename to graphics/pokemon/gen_1/omastar/icon.png diff --git a/graphics/pokemon/omastar/normal.pal b/graphics/pokemon/gen_1/omastar/normal.pal similarity index 100% rename from graphics/pokemon/omastar/normal.pal rename to graphics/pokemon/gen_1/omastar/normal.pal diff --git a/graphics/pokemon/omastar/shiny.pal b/graphics/pokemon/gen_1/omastar/shiny.pal similarity index 100% rename from graphics/pokemon/omastar/shiny.pal rename to graphics/pokemon/gen_1/omastar/shiny.pal diff --git a/graphics/pokemon/onix/anim_front.png b/graphics/pokemon/gen_1/onix/anim_front.png similarity index 100% rename from graphics/pokemon/onix/anim_front.png rename to graphics/pokemon/gen_1/onix/anim_front.png diff --git a/graphics/pokemon/onix/back.png b/graphics/pokemon/gen_1/onix/back.png similarity index 100% rename from graphics/pokemon/onix/back.png rename to graphics/pokemon/gen_1/onix/back.png diff --git a/graphics/pokemon/charjabug/footprint.png b/graphics/pokemon/gen_1/onix/footprint.png similarity index 100% rename from graphics/pokemon/charjabug/footprint.png rename to graphics/pokemon/gen_1/onix/footprint.png diff --git a/graphics/pokemon/onix/icon.png b/graphics/pokemon/gen_1/onix/icon.png similarity index 100% rename from graphics/pokemon/onix/icon.png rename to graphics/pokemon/gen_1/onix/icon.png diff --git a/graphics/pokemon/onix/normal.pal b/graphics/pokemon/gen_1/onix/normal.pal similarity index 100% rename from graphics/pokemon/onix/normal.pal rename to graphics/pokemon/gen_1/onix/normal.pal diff --git a/graphics/pokemon/onix/shiny.pal b/graphics/pokemon/gen_1/onix/shiny.pal similarity index 100% rename from graphics/pokemon/onix/shiny.pal rename to graphics/pokemon/gen_1/onix/shiny.pal diff --git a/graphics/pokemon/paras/anim_front.png b/graphics/pokemon/gen_1/paras/anim_front.png similarity index 100% rename from graphics/pokemon/paras/anim_front.png rename to graphics/pokemon/gen_1/paras/anim_front.png diff --git a/graphics/pokemon/paras/back.png b/graphics/pokemon/gen_1/paras/back.png similarity index 100% rename from graphics/pokemon/paras/back.png rename to graphics/pokemon/gen_1/paras/back.png diff --git a/graphics/pokemon/gossifleur/footprint.png b/graphics/pokemon/gen_1/paras/footprint.png similarity index 100% rename from graphics/pokemon/gossifleur/footprint.png rename to graphics/pokemon/gen_1/paras/footprint.png diff --git a/graphics/pokemon/paras/icon.png b/graphics/pokemon/gen_1/paras/icon.png similarity index 100% rename from graphics/pokemon/paras/icon.png rename to graphics/pokemon/gen_1/paras/icon.png diff --git a/graphics/pokemon/paras/normal.pal b/graphics/pokemon/gen_1/paras/normal.pal similarity index 100% rename from graphics/pokemon/paras/normal.pal rename to graphics/pokemon/gen_1/paras/normal.pal diff --git a/graphics/pokemon/paras/shiny.pal b/graphics/pokemon/gen_1/paras/shiny.pal similarity index 100% rename from graphics/pokemon/paras/shiny.pal rename to graphics/pokemon/gen_1/paras/shiny.pal diff --git a/graphics/pokemon/parasect/anim_front.png b/graphics/pokemon/gen_1/parasect/anim_front.png similarity index 100% rename from graphics/pokemon/parasect/anim_front.png rename to graphics/pokemon/gen_1/parasect/anim_front.png diff --git a/graphics/pokemon/parasect/back.png b/graphics/pokemon/gen_1/parasect/back.png similarity index 100% rename from graphics/pokemon/parasect/back.png rename to graphics/pokemon/gen_1/parasect/back.png diff --git a/graphics/pokemon/parasect/footprint.png b/graphics/pokemon/gen_1/parasect/footprint.png similarity index 100% rename from graphics/pokemon/parasect/footprint.png rename to graphics/pokemon/gen_1/parasect/footprint.png diff --git a/graphics/pokemon/parasect/icon.png b/graphics/pokemon/gen_1/parasect/icon.png similarity index 100% rename from graphics/pokemon/parasect/icon.png rename to graphics/pokemon/gen_1/parasect/icon.png diff --git a/graphics/pokemon/parasect/normal.pal b/graphics/pokemon/gen_1/parasect/normal.pal similarity index 100% rename from graphics/pokemon/parasect/normal.pal rename to graphics/pokemon/gen_1/parasect/normal.pal diff --git a/graphics/pokemon/parasect/shiny.pal b/graphics/pokemon/gen_1/parasect/shiny.pal similarity index 100% rename from graphics/pokemon/parasect/shiny.pal rename to graphics/pokemon/gen_1/parasect/shiny.pal diff --git a/graphics/pokemon/persian/alolan/back.png b/graphics/pokemon/gen_1/persian/alolan/back.png similarity index 100% rename from graphics/pokemon/persian/alolan/back.png rename to graphics/pokemon/gen_1/persian/alolan/back.png diff --git a/graphics/pokemon/persian/alolan/front.png b/graphics/pokemon/gen_1/persian/alolan/front.png similarity index 100% rename from graphics/pokemon/persian/alolan/front.png rename to graphics/pokemon/gen_1/persian/alolan/front.png diff --git a/graphics/pokemon/persian/alolan/icon.png b/graphics/pokemon/gen_1/persian/alolan/icon.png similarity index 100% rename from graphics/pokemon/persian/alolan/icon.png rename to graphics/pokemon/gen_1/persian/alolan/icon.png diff --git a/graphics/pokemon/persian/alolan/normal.pal b/graphics/pokemon/gen_1/persian/alolan/normal.pal similarity index 100% rename from graphics/pokemon/persian/alolan/normal.pal rename to graphics/pokemon/gen_1/persian/alolan/normal.pal diff --git a/graphics/pokemon/persian/alolan/shiny.pal b/graphics/pokemon/gen_1/persian/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/persian/alolan/shiny.pal rename to graphics/pokemon/gen_1/persian/alolan/shiny.pal diff --git a/graphics/pokemon/persian/anim_front.png b/graphics/pokemon/gen_1/persian/anim_front.png similarity index 100% rename from graphics/pokemon/persian/anim_front.png rename to graphics/pokemon/gen_1/persian/anim_front.png diff --git a/graphics/pokemon/persian/back.png b/graphics/pokemon/gen_1/persian/back.png similarity index 100% rename from graphics/pokemon/persian/back.png rename to graphics/pokemon/gen_1/persian/back.png diff --git a/graphics/pokemon/persian/footprint.png b/graphics/pokemon/gen_1/persian/footprint.png similarity index 100% rename from graphics/pokemon/persian/footprint.png rename to graphics/pokemon/gen_1/persian/footprint.png diff --git a/graphics/pokemon/persian/icon.png b/graphics/pokemon/gen_1/persian/icon.png similarity index 100% rename from graphics/pokemon/persian/icon.png rename to graphics/pokemon/gen_1/persian/icon.png diff --git a/graphics/pokemon/persian/normal.pal b/graphics/pokemon/gen_1/persian/normal.pal similarity index 100% rename from graphics/pokemon/persian/normal.pal rename to graphics/pokemon/gen_1/persian/normal.pal diff --git a/graphics/pokemon/persian/shiny.pal b/graphics/pokemon/gen_1/persian/shiny.pal similarity index 100% rename from graphics/pokemon/persian/shiny.pal rename to graphics/pokemon/gen_1/persian/shiny.pal diff --git a/graphics/pokemon/pidgeot/anim_front.png b/graphics/pokemon/gen_1/pidgeot/anim_front.png similarity index 100% rename from graphics/pokemon/pidgeot/anim_front.png rename to graphics/pokemon/gen_1/pidgeot/anim_front.png diff --git a/graphics/pokemon/pidgeot/back.png b/graphics/pokemon/gen_1/pidgeot/back.png similarity index 100% rename from graphics/pokemon/pidgeot/back.png rename to graphics/pokemon/gen_1/pidgeot/back.png diff --git a/graphics/pokemon/corviknight/footprint.png b/graphics/pokemon/gen_1/pidgeot/footprint.png similarity index 100% rename from graphics/pokemon/corviknight/footprint.png rename to graphics/pokemon/gen_1/pidgeot/footprint.png diff --git a/graphics/pokemon/pidgeot/icon.png b/graphics/pokemon/gen_1/pidgeot/icon.png similarity index 100% rename from graphics/pokemon/pidgeot/icon.png rename to graphics/pokemon/gen_1/pidgeot/icon.png diff --git a/graphics/pokemon/pidgeot/mega/back.png b/graphics/pokemon/gen_1/pidgeot/mega/back.png similarity index 100% rename from graphics/pokemon/pidgeot/mega/back.png rename to graphics/pokemon/gen_1/pidgeot/mega/back.png diff --git a/graphics/pokemon/pidgeot/mega/front.png b/graphics/pokemon/gen_1/pidgeot/mega/front.png similarity index 100% rename from graphics/pokemon/pidgeot/mega/front.png rename to graphics/pokemon/gen_1/pidgeot/mega/front.png diff --git a/graphics/pokemon/pidgeot/mega/icon.png b/graphics/pokemon/gen_1/pidgeot/mega/icon.png similarity index 100% rename from graphics/pokemon/pidgeot/mega/icon.png rename to graphics/pokemon/gen_1/pidgeot/mega/icon.png diff --git a/graphics/pokemon/pidgeot/mega/normal.pal b/graphics/pokemon/gen_1/pidgeot/mega/normal.pal similarity index 100% rename from graphics/pokemon/pidgeot/mega/normal.pal rename to graphics/pokemon/gen_1/pidgeot/mega/normal.pal diff --git a/graphics/pokemon/pidgeot/mega/shiny.pal b/graphics/pokemon/gen_1/pidgeot/mega/shiny.pal similarity index 100% rename from graphics/pokemon/pidgeot/mega/shiny.pal rename to graphics/pokemon/gen_1/pidgeot/mega/shiny.pal diff --git a/graphics/pokemon/pidgeot/normal.pal b/graphics/pokemon/gen_1/pidgeot/normal.pal similarity index 100% rename from graphics/pokemon/pidgeot/normal.pal rename to graphics/pokemon/gen_1/pidgeot/normal.pal diff --git a/graphics/pokemon/pidgeot/shiny.pal b/graphics/pokemon/gen_1/pidgeot/shiny.pal similarity index 100% rename from graphics/pokemon/pidgeot/shiny.pal rename to graphics/pokemon/gen_1/pidgeot/shiny.pal diff --git a/graphics/pokemon/pidgeotto/anim_front.png b/graphics/pokemon/gen_1/pidgeotto/anim_front.png similarity index 100% rename from graphics/pokemon/pidgeotto/anim_front.png rename to graphics/pokemon/gen_1/pidgeotto/anim_front.png diff --git a/graphics/pokemon/pidgeotto/back.png b/graphics/pokemon/gen_1/pidgeotto/back.png similarity index 100% rename from graphics/pokemon/pidgeotto/back.png rename to graphics/pokemon/gen_1/pidgeotto/back.png diff --git a/graphics/pokemon/corvisquire/footprint.png b/graphics/pokemon/gen_1/pidgeotto/footprint.png similarity index 100% rename from graphics/pokemon/corvisquire/footprint.png rename to graphics/pokemon/gen_1/pidgeotto/footprint.png diff --git a/graphics/pokemon/pidgeotto/icon.png b/graphics/pokemon/gen_1/pidgeotto/icon.png similarity index 100% rename from graphics/pokemon/pidgeotto/icon.png rename to graphics/pokemon/gen_1/pidgeotto/icon.png diff --git a/graphics/pokemon/pidgeotto/normal.pal b/graphics/pokemon/gen_1/pidgeotto/normal.pal similarity index 100% rename from graphics/pokemon/pidgeotto/normal.pal rename to graphics/pokemon/gen_1/pidgeotto/normal.pal diff --git a/graphics/pokemon/pidgeotto/shiny.pal b/graphics/pokemon/gen_1/pidgeotto/shiny.pal similarity index 100% rename from graphics/pokemon/pidgeotto/shiny.pal rename to graphics/pokemon/gen_1/pidgeotto/shiny.pal diff --git a/graphics/pokemon/pidgey/anim_front.png b/graphics/pokemon/gen_1/pidgey/anim_front.png similarity index 100% rename from graphics/pokemon/pidgey/anim_front.png rename to graphics/pokemon/gen_1/pidgey/anim_front.png diff --git a/graphics/pokemon/pidgey/back.png b/graphics/pokemon/gen_1/pidgey/back.png similarity index 100% rename from graphics/pokemon/pidgey/back.png rename to graphics/pokemon/gen_1/pidgey/back.png diff --git a/graphics/pokemon/pidgey/footprint.png b/graphics/pokemon/gen_1/pidgey/footprint.png similarity index 100% rename from graphics/pokemon/pidgey/footprint.png rename to graphics/pokemon/gen_1/pidgey/footprint.png diff --git a/graphics/pokemon/pidgey/icon.png b/graphics/pokemon/gen_1/pidgey/icon.png similarity index 100% rename from graphics/pokemon/pidgey/icon.png rename to graphics/pokemon/gen_1/pidgey/icon.png diff --git a/graphics/pokemon/pidgey/normal.pal b/graphics/pokemon/gen_1/pidgey/normal.pal similarity index 100% rename from graphics/pokemon/pidgey/normal.pal rename to graphics/pokemon/gen_1/pidgey/normal.pal diff --git a/graphics/pokemon/pidgey/shiny.pal b/graphics/pokemon/gen_1/pidgey/shiny.pal similarity index 100% rename from graphics/pokemon/pidgey/shiny.pal rename to graphics/pokemon/gen_1/pidgey/shiny.pal diff --git a/graphics/pokemon/pikachu/alola_cap/back.png b/graphics/pokemon/gen_1/pikachu/alola_cap/back.png similarity index 100% rename from graphics/pokemon/pikachu/alola_cap/back.png rename to graphics/pokemon/gen_1/pikachu/alola_cap/back.png diff --git a/graphics/pokemon/pikachu/alola_cap/front.png b/graphics/pokemon/gen_1/pikachu/alola_cap/front.png similarity index 100% rename from graphics/pokemon/pikachu/alola_cap/front.png rename to graphics/pokemon/gen_1/pikachu/alola_cap/front.png diff --git a/graphics/pokemon/pikachu/alola_cap/icon.png b/graphics/pokemon/gen_1/pikachu/alola_cap/icon.png similarity index 100% rename from graphics/pokemon/pikachu/alola_cap/icon.png rename to graphics/pokemon/gen_1/pikachu/alola_cap/icon.png diff --git a/graphics/pokemon/pikachu/alola_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/alola_cap/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/alola_cap/normal.pal rename to graphics/pokemon/gen_1/pikachu/alola_cap/normal.pal diff --git a/graphics/pokemon/pikachu/alola_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/alola_cap/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/alola_cap/shiny.pal rename to graphics/pokemon/gen_1/pikachu/alola_cap/shiny.pal diff --git a/graphics/pokemon/pikachu/anim_front.png b/graphics/pokemon/gen_1/pikachu/anim_front.png similarity index 100% rename from graphics/pokemon/pikachu/anim_front.png rename to graphics/pokemon/gen_1/pikachu/anim_front.png diff --git a/graphics/pokemon/pikachu/anim_frontf.png b/graphics/pokemon/gen_1/pikachu/anim_frontf.png similarity index 100% rename from graphics/pokemon/pikachu/anim_frontf.png rename to graphics/pokemon/gen_1/pikachu/anim_frontf.png diff --git a/graphics/pokemon/pikachu/back.png b/graphics/pokemon/gen_1/pikachu/back.png similarity index 100% rename from graphics/pokemon/pikachu/back.png rename to graphics/pokemon/gen_1/pikachu/back.png diff --git a/graphics/pokemon/pikachu/backf.png b/graphics/pokemon/gen_1/pikachu/backf.png similarity index 100% rename from graphics/pokemon/pikachu/backf.png rename to graphics/pokemon/gen_1/pikachu/backf.png diff --git a/graphics/pokemon/pikachu/belle/back.png b/graphics/pokemon/gen_1/pikachu/belle/back.png similarity index 100% rename from graphics/pokemon/pikachu/belle/back.png rename to graphics/pokemon/gen_1/pikachu/belle/back.png diff --git a/graphics/pokemon/pikachu/belle/front.png b/graphics/pokemon/gen_1/pikachu/belle/front.png similarity index 100% rename from graphics/pokemon/pikachu/belle/front.png rename to graphics/pokemon/gen_1/pikachu/belle/front.png diff --git a/graphics/pokemon/pikachu/belle/icon.png b/graphics/pokemon/gen_1/pikachu/belle/icon.png similarity index 100% rename from graphics/pokemon/pikachu/belle/icon.png rename to graphics/pokemon/gen_1/pikachu/belle/icon.png diff --git a/graphics/pokemon/pikachu/belle/normal.pal b/graphics/pokemon/gen_1/pikachu/belle/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/belle/normal.pal rename to graphics/pokemon/gen_1/pikachu/belle/normal.pal diff --git a/graphics/pokemon/pikachu/belle/shiny.pal b/graphics/pokemon/gen_1/pikachu/belle/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/belle/shiny.pal rename to graphics/pokemon/gen_1/pikachu/belle/shiny.pal diff --git a/graphics/pokemon/pikachu/cosplay/back.png b/graphics/pokemon/gen_1/pikachu/cosplay/back.png similarity index 100% rename from graphics/pokemon/pikachu/cosplay/back.png rename to graphics/pokemon/gen_1/pikachu/cosplay/back.png diff --git a/graphics/pokemon/pikachu/cosplay/front.png b/graphics/pokemon/gen_1/pikachu/cosplay/front.png similarity index 100% rename from graphics/pokemon/pikachu/cosplay/front.png rename to graphics/pokemon/gen_1/pikachu/cosplay/front.png diff --git a/graphics/pokemon/pikachu/cosplay/icon.png b/graphics/pokemon/gen_1/pikachu/cosplay/icon.png similarity index 100% rename from graphics/pokemon/pikachu/cosplay/icon.png rename to graphics/pokemon/gen_1/pikachu/cosplay/icon.png diff --git a/graphics/pokemon/pikachu/cosplay/normal.pal b/graphics/pokemon/gen_1/pikachu/cosplay/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/cosplay/normal.pal rename to graphics/pokemon/gen_1/pikachu/cosplay/normal.pal diff --git a/graphics/pokemon/pikachu/cosplay/shiny.pal b/graphics/pokemon/gen_1/pikachu/cosplay/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/cosplay/shiny.pal rename to graphics/pokemon/gen_1/pikachu/cosplay/shiny.pal diff --git a/graphics/pokemon/pikachu/footprint.png b/graphics/pokemon/gen_1/pikachu/footprint.png similarity index 100% rename from graphics/pokemon/pikachu/footprint.png rename to graphics/pokemon/gen_1/pikachu/footprint.png diff --git a/graphics/pokemon/pikachu/gigantamax/back.png b/graphics/pokemon/gen_1/pikachu/gigantamax/back.png similarity index 100% rename from graphics/pokemon/pikachu/gigantamax/back.png rename to graphics/pokemon/gen_1/pikachu/gigantamax/back.png diff --git a/graphics/pokemon/pikachu/gigantamax/front.png b/graphics/pokemon/gen_1/pikachu/gigantamax/front.png similarity index 100% rename from graphics/pokemon/pikachu/gigantamax/front.png rename to graphics/pokemon/gen_1/pikachu/gigantamax/front.png diff --git a/graphics/pokemon/pikachu/gigantamax/icon.png b/graphics/pokemon/gen_1/pikachu/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/pikachu/gigantamax/icon.png rename to graphics/pokemon/gen_1/pikachu/gigantamax/icon.png diff --git a/graphics/pokemon/pikachu/gigantamax/normal.pal b/graphics/pokemon/gen_1/pikachu/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/gigantamax/normal.pal rename to graphics/pokemon/gen_1/pikachu/gigantamax/normal.pal diff --git a/graphics/pokemon/pikachu/gigantamax/shiny.pal b/graphics/pokemon/gen_1/pikachu/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/gigantamax/shiny.pal rename to graphics/pokemon/gen_1/pikachu/gigantamax/shiny.pal diff --git a/graphics/pokemon/pikachu/hoenn_cap/back.png b/graphics/pokemon/gen_1/pikachu/hoenn_cap/back.png similarity index 100% rename from graphics/pokemon/pikachu/hoenn_cap/back.png rename to graphics/pokemon/gen_1/pikachu/hoenn_cap/back.png diff --git a/graphics/pokemon/pikachu/hoenn_cap/front.png b/graphics/pokemon/gen_1/pikachu/hoenn_cap/front.png similarity index 100% rename from graphics/pokemon/pikachu/hoenn_cap/front.png rename to graphics/pokemon/gen_1/pikachu/hoenn_cap/front.png diff --git a/graphics/pokemon/pikachu/hoenn_cap/icon.png b/graphics/pokemon/gen_1/pikachu/hoenn_cap/icon.png similarity index 100% rename from graphics/pokemon/pikachu/hoenn_cap/icon.png rename to graphics/pokemon/gen_1/pikachu/hoenn_cap/icon.png diff --git a/graphics/pokemon/pikachu/hoenn_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/hoenn_cap/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/hoenn_cap/normal.pal rename to graphics/pokemon/gen_1/pikachu/hoenn_cap/normal.pal diff --git a/graphics/pokemon/pikachu/hoenn_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/hoenn_cap/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/hoenn_cap/shiny.pal rename to graphics/pokemon/gen_1/pikachu/hoenn_cap/shiny.pal diff --git a/graphics/pokemon/pikachu/icon.png b/graphics/pokemon/gen_1/pikachu/icon.png similarity index 100% rename from graphics/pokemon/pikachu/icon.png rename to graphics/pokemon/gen_1/pikachu/icon.png diff --git a/graphics/pokemon/pikachu/iconf.png b/graphics/pokemon/gen_1/pikachu/iconf.png similarity index 100% rename from graphics/pokemon/pikachu/iconf.png rename to graphics/pokemon/gen_1/pikachu/iconf.png diff --git a/graphics/pokemon/pikachu/kalos_cap/back.png b/graphics/pokemon/gen_1/pikachu/kalos_cap/back.png similarity index 100% rename from graphics/pokemon/pikachu/kalos_cap/back.png rename to graphics/pokemon/gen_1/pikachu/kalos_cap/back.png diff --git a/graphics/pokemon/pikachu/kalos_cap/front.png b/graphics/pokemon/gen_1/pikachu/kalos_cap/front.png similarity index 100% rename from graphics/pokemon/pikachu/kalos_cap/front.png rename to graphics/pokemon/gen_1/pikachu/kalos_cap/front.png diff --git a/graphics/pokemon/pikachu/kalos_cap/icon.png b/graphics/pokemon/gen_1/pikachu/kalos_cap/icon.png similarity index 100% rename from graphics/pokemon/pikachu/kalos_cap/icon.png rename to graphics/pokemon/gen_1/pikachu/kalos_cap/icon.png diff --git a/graphics/pokemon/pikachu/kalos_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/kalos_cap/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/kalos_cap/normal.pal rename to graphics/pokemon/gen_1/pikachu/kalos_cap/normal.pal diff --git a/graphics/pokemon/pikachu/kalos_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/kalos_cap/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/kalos_cap/shiny.pal rename to graphics/pokemon/gen_1/pikachu/kalos_cap/shiny.pal diff --git a/graphics/pokemon/pikachu/libre/back.png b/graphics/pokemon/gen_1/pikachu/libre/back.png similarity index 100% rename from graphics/pokemon/pikachu/libre/back.png rename to graphics/pokemon/gen_1/pikachu/libre/back.png diff --git a/graphics/pokemon/pikachu/libre/front.png b/graphics/pokemon/gen_1/pikachu/libre/front.png similarity index 100% rename from graphics/pokemon/pikachu/libre/front.png rename to graphics/pokemon/gen_1/pikachu/libre/front.png diff --git a/graphics/pokemon/pikachu/libre/icon.png b/graphics/pokemon/gen_1/pikachu/libre/icon.png similarity index 100% rename from graphics/pokemon/pikachu/libre/icon.png rename to graphics/pokemon/gen_1/pikachu/libre/icon.png diff --git a/graphics/pokemon/pikachu/libre/normal.pal b/graphics/pokemon/gen_1/pikachu/libre/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/libre/normal.pal rename to graphics/pokemon/gen_1/pikachu/libre/normal.pal diff --git a/graphics/pokemon/pikachu/libre/shiny.pal b/graphics/pokemon/gen_1/pikachu/libre/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/libre/shiny.pal rename to graphics/pokemon/gen_1/pikachu/libre/shiny.pal diff --git a/graphics/pokemon/pikachu/normal.pal b/graphics/pokemon/gen_1/pikachu/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/normal.pal rename to graphics/pokemon/gen_1/pikachu/normal.pal diff --git a/graphics/pokemon/pikachu/original_cap/back.png b/graphics/pokemon/gen_1/pikachu/original_cap/back.png similarity index 100% rename from graphics/pokemon/pikachu/original_cap/back.png rename to graphics/pokemon/gen_1/pikachu/original_cap/back.png diff --git a/graphics/pokemon/pikachu/original_cap/front.png b/graphics/pokemon/gen_1/pikachu/original_cap/front.png similarity index 100% rename from graphics/pokemon/pikachu/original_cap/front.png rename to graphics/pokemon/gen_1/pikachu/original_cap/front.png diff --git a/graphics/pokemon/pikachu/original_cap/icon.png b/graphics/pokemon/gen_1/pikachu/original_cap/icon.png similarity index 100% rename from graphics/pokemon/pikachu/original_cap/icon.png rename to graphics/pokemon/gen_1/pikachu/original_cap/icon.png diff --git a/graphics/pokemon/pikachu/original_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/original_cap/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/original_cap/normal.pal rename to graphics/pokemon/gen_1/pikachu/original_cap/normal.pal diff --git a/graphics/pokemon/pikachu/original_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/original_cap/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/original_cap/shiny.pal rename to graphics/pokemon/gen_1/pikachu/original_cap/shiny.pal diff --git a/graphics/pokemon/pikachu/partner_cap/back.png b/graphics/pokemon/gen_1/pikachu/partner_cap/back.png similarity index 100% rename from graphics/pokemon/pikachu/partner_cap/back.png rename to graphics/pokemon/gen_1/pikachu/partner_cap/back.png diff --git a/graphics/pokemon/pikachu/partner_cap/front.png b/graphics/pokemon/gen_1/pikachu/partner_cap/front.png similarity index 100% rename from graphics/pokemon/pikachu/partner_cap/front.png rename to graphics/pokemon/gen_1/pikachu/partner_cap/front.png diff --git a/graphics/pokemon/pikachu/partner_cap/icon.png b/graphics/pokemon/gen_1/pikachu/partner_cap/icon.png similarity index 100% rename from graphics/pokemon/pikachu/partner_cap/icon.png rename to graphics/pokemon/gen_1/pikachu/partner_cap/icon.png diff --git a/graphics/pokemon/pikachu/partner_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/partner_cap/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/partner_cap/normal.pal rename to graphics/pokemon/gen_1/pikachu/partner_cap/normal.pal diff --git a/graphics/pokemon/pikachu/partner_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/partner_cap/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/partner_cap/shiny.pal rename to graphics/pokemon/gen_1/pikachu/partner_cap/shiny.pal diff --git a/graphics/pokemon/pikachu/ph_d/back.png b/graphics/pokemon/gen_1/pikachu/ph_d/back.png similarity index 100% rename from graphics/pokemon/pikachu/ph_d/back.png rename to graphics/pokemon/gen_1/pikachu/ph_d/back.png diff --git a/graphics/pokemon/pikachu/ph_d/front.png b/graphics/pokemon/gen_1/pikachu/ph_d/front.png similarity index 100% rename from graphics/pokemon/pikachu/ph_d/front.png rename to graphics/pokemon/gen_1/pikachu/ph_d/front.png diff --git a/graphics/pokemon/pikachu/ph_d/icon.png b/graphics/pokemon/gen_1/pikachu/ph_d/icon.png similarity index 100% rename from graphics/pokemon/pikachu/ph_d/icon.png rename to graphics/pokemon/gen_1/pikachu/ph_d/icon.png diff --git a/graphics/pokemon/pikachu/ph_d/normal.pal b/graphics/pokemon/gen_1/pikachu/ph_d/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/ph_d/normal.pal rename to graphics/pokemon/gen_1/pikachu/ph_d/normal.pal diff --git a/graphics/pokemon/pikachu/ph_d/shiny.pal b/graphics/pokemon/gen_1/pikachu/ph_d/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/ph_d/shiny.pal rename to graphics/pokemon/gen_1/pikachu/ph_d/shiny.pal diff --git a/graphics/pokemon/pikachu/pop_star/back.png b/graphics/pokemon/gen_1/pikachu/pop_star/back.png similarity index 100% rename from graphics/pokemon/pikachu/pop_star/back.png rename to graphics/pokemon/gen_1/pikachu/pop_star/back.png diff --git a/graphics/pokemon/pikachu/pop_star/front.png b/graphics/pokemon/gen_1/pikachu/pop_star/front.png similarity index 100% rename from graphics/pokemon/pikachu/pop_star/front.png rename to graphics/pokemon/gen_1/pikachu/pop_star/front.png diff --git a/graphics/pokemon/pikachu/pop_star/icon.png b/graphics/pokemon/gen_1/pikachu/pop_star/icon.png similarity index 100% rename from graphics/pokemon/pikachu/pop_star/icon.png rename to graphics/pokemon/gen_1/pikachu/pop_star/icon.png diff --git a/graphics/pokemon/pikachu/pop_star/normal.pal b/graphics/pokemon/gen_1/pikachu/pop_star/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/pop_star/normal.pal rename to graphics/pokemon/gen_1/pikachu/pop_star/normal.pal diff --git a/graphics/pokemon/pikachu/pop_star/shiny.pal b/graphics/pokemon/gen_1/pikachu/pop_star/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/pop_star/shiny.pal rename to graphics/pokemon/gen_1/pikachu/pop_star/shiny.pal diff --git a/graphics/pokemon/pikachu/rock_star/back.png b/graphics/pokemon/gen_1/pikachu/rock_star/back.png similarity index 100% rename from graphics/pokemon/pikachu/rock_star/back.png rename to graphics/pokemon/gen_1/pikachu/rock_star/back.png diff --git a/graphics/pokemon/pikachu/rock_star/front.png b/graphics/pokemon/gen_1/pikachu/rock_star/front.png similarity index 100% rename from graphics/pokemon/pikachu/rock_star/front.png rename to graphics/pokemon/gen_1/pikachu/rock_star/front.png diff --git a/graphics/pokemon/pikachu/rock_star/icon.png b/graphics/pokemon/gen_1/pikachu/rock_star/icon.png similarity index 100% rename from graphics/pokemon/pikachu/rock_star/icon.png rename to graphics/pokemon/gen_1/pikachu/rock_star/icon.png diff --git a/graphics/pokemon/pikachu/rock_star/normal.pal b/graphics/pokemon/gen_1/pikachu/rock_star/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/rock_star/normal.pal rename to graphics/pokemon/gen_1/pikachu/rock_star/normal.pal diff --git a/graphics/pokemon/pikachu/rock_star/shiny.pal b/graphics/pokemon/gen_1/pikachu/rock_star/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/rock_star/shiny.pal rename to graphics/pokemon/gen_1/pikachu/rock_star/shiny.pal diff --git a/graphics/pokemon/pikachu/shiny.pal b/graphics/pokemon/gen_1/pikachu/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/shiny.pal rename to graphics/pokemon/gen_1/pikachu/shiny.pal diff --git a/graphics/pokemon/pikachu/sinnoh_cap/back.png b/graphics/pokemon/gen_1/pikachu/sinnoh_cap/back.png similarity index 100% rename from graphics/pokemon/pikachu/sinnoh_cap/back.png rename to graphics/pokemon/gen_1/pikachu/sinnoh_cap/back.png diff --git a/graphics/pokemon/pikachu/sinnoh_cap/front.png b/graphics/pokemon/gen_1/pikachu/sinnoh_cap/front.png similarity index 100% rename from graphics/pokemon/pikachu/sinnoh_cap/front.png rename to graphics/pokemon/gen_1/pikachu/sinnoh_cap/front.png diff --git a/graphics/pokemon/pikachu/sinnoh_cap/icon.png b/graphics/pokemon/gen_1/pikachu/sinnoh_cap/icon.png similarity index 100% rename from graphics/pokemon/pikachu/sinnoh_cap/icon.png rename to graphics/pokemon/gen_1/pikachu/sinnoh_cap/icon.png diff --git a/graphics/pokemon/pikachu/sinnoh_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/sinnoh_cap/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/sinnoh_cap/normal.pal rename to graphics/pokemon/gen_1/pikachu/sinnoh_cap/normal.pal diff --git a/graphics/pokemon/pikachu/sinnoh_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/sinnoh_cap/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/sinnoh_cap/shiny.pal rename to graphics/pokemon/gen_1/pikachu/sinnoh_cap/shiny.pal diff --git a/graphics/pokemon/pikachu/unova_cap/back.png b/graphics/pokemon/gen_1/pikachu/unova_cap/back.png similarity index 100% rename from graphics/pokemon/pikachu/unova_cap/back.png rename to graphics/pokemon/gen_1/pikachu/unova_cap/back.png diff --git a/graphics/pokemon/pikachu/unova_cap/front.png b/graphics/pokemon/gen_1/pikachu/unova_cap/front.png similarity index 100% rename from graphics/pokemon/pikachu/unova_cap/front.png rename to graphics/pokemon/gen_1/pikachu/unova_cap/front.png diff --git a/graphics/pokemon/pikachu/unova_cap/icon.png b/graphics/pokemon/gen_1/pikachu/unova_cap/icon.png similarity index 100% rename from graphics/pokemon/pikachu/unova_cap/icon.png rename to graphics/pokemon/gen_1/pikachu/unova_cap/icon.png diff --git a/graphics/pokemon/pikachu/unova_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/unova_cap/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/unova_cap/normal.pal rename to graphics/pokemon/gen_1/pikachu/unova_cap/normal.pal diff --git a/graphics/pokemon/pikachu/unova_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/unova_cap/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/unova_cap/shiny.pal rename to graphics/pokemon/gen_1/pikachu/unova_cap/shiny.pal diff --git a/graphics/pokemon/pikachu/world_cap/back.png b/graphics/pokemon/gen_1/pikachu/world_cap/back.png similarity index 100% rename from graphics/pokemon/pikachu/world_cap/back.png rename to graphics/pokemon/gen_1/pikachu/world_cap/back.png diff --git a/graphics/pokemon/pikachu/world_cap/front.png b/graphics/pokemon/gen_1/pikachu/world_cap/front.png similarity index 100% rename from graphics/pokemon/pikachu/world_cap/front.png rename to graphics/pokemon/gen_1/pikachu/world_cap/front.png diff --git a/graphics/pokemon/pikachu/world_cap/icon.png b/graphics/pokemon/gen_1/pikachu/world_cap/icon.png similarity index 100% rename from graphics/pokemon/pikachu/world_cap/icon.png rename to graphics/pokemon/gen_1/pikachu/world_cap/icon.png diff --git a/graphics/pokemon/pikachu/world_cap/normal.pal b/graphics/pokemon/gen_1/pikachu/world_cap/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/world_cap/normal.pal rename to graphics/pokemon/gen_1/pikachu/world_cap/normal.pal diff --git a/graphics/pokemon/pikachu/world_cap/shiny.pal b/graphics/pokemon/gen_1/pikachu/world_cap/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/world_cap/shiny.pal rename to graphics/pokemon/gen_1/pikachu/world_cap/shiny.pal diff --git a/graphics/pokemon/pinsir/anim_front.png b/graphics/pokemon/gen_1/pinsir/anim_front.png similarity index 100% rename from graphics/pokemon/pinsir/anim_front.png rename to graphics/pokemon/gen_1/pinsir/anim_front.png diff --git a/graphics/pokemon/pinsir/back.png b/graphics/pokemon/gen_1/pinsir/back.png similarity index 100% rename from graphics/pokemon/pinsir/back.png rename to graphics/pokemon/gen_1/pinsir/back.png diff --git a/graphics/pokemon/pinsir/footprint.png b/graphics/pokemon/gen_1/pinsir/footprint.png similarity index 100% rename from graphics/pokemon/pinsir/footprint.png rename to graphics/pokemon/gen_1/pinsir/footprint.png diff --git a/graphics/pokemon/pinsir/icon.png b/graphics/pokemon/gen_1/pinsir/icon.png similarity index 100% rename from graphics/pokemon/pinsir/icon.png rename to graphics/pokemon/gen_1/pinsir/icon.png diff --git a/graphics/pokemon/pinsir/mega/back.png b/graphics/pokemon/gen_1/pinsir/mega/back.png similarity index 100% rename from graphics/pokemon/pinsir/mega/back.png rename to graphics/pokemon/gen_1/pinsir/mega/back.png diff --git a/graphics/pokemon/pinsir/mega/front.png b/graphics/pokemon/gen_1/pinsir/mega/front.png similarity index 100% rename from graphics/pokemon/pinsir/mega/front.png rename to graphics/pokemon/gen_1/pinsir/mega/front.png diff --git a/graphics/pokemon/pinsir/mega/icon.png b/graphics/pokemon/gen_1/pinsir/mega/icon.png similarity index 100% rename from graphics/pokemon/pinsir/mega/icon.png rename to graphics/pokemon/gen_1/pinsir/mega/icon.png diff --git a/graphics/pokemon/pinsir/mega/normal.pal b/graphics/pokemon/gen_1/pinsir/mega/normal.pal similarity index 100% rename from graphics/pokemon/pinsir/mega/normal.pal rename to graphics/pokemon/gen_1/pinsir/mega/normal.pal diff --git a/graphics/pokemon/pinsir/mega/shiny.pal b/graphics/pokemon/gen_1/pinsir/mega/shiny.pal similarity index 100% rename from graphics/pokemon/pinsir/mega/shiny.pal rename to graphics/pokemon/gen_1/pinsir/mega/shiny.pal diff --git a/graphics/pokemon/pinsir/normal.pal b/graphics/pokemon/gen_1/pinsir/normal.pal similarity index 100% rename from graphics/pokemon/pinsir/normal.pal rename to graphics/pokemon/gen_1/pinsir/normal.pal diff --git a/graphics/pokemon/pinsir/shiny.pal b/graphics/pokemon/gen_1/pinsir/shiny.pal similarity index 100% rename from graphics/pokemon/pinsir/shiny.pal rename to graphics/pokemon/gen_1/pinsir/shiny.pal diff --git a/graphics/pokemon/poliwag/anim_front.png b/graphics/pokemon/gen_1/poliwag/anim_front.png similarity index 100% rename from graphics/pokemon/poliwag/anim_front.png rename to graphics/pokemon/gen_1/poliwag/anim_front.png diff --git a/graphics/pokemon/poliwag/back.png b/graphics/pokemon/gen_1/poliwag/back.png similarity index 100% rename from graphics/pokemon/poliwag/back.png rename to graphics/pokemon/gen_1/poliwag/back.png diff --git a/graphics/pokemon/clobbopus/footprint.png b/graphics/pokemon/gen_1/poliwag/footprint.png similarity index 100% rename from graphics/pokemon/clobbopus/footprint.png rename to graphics/pokemon/gen_1/poliwag/footprint.png diff --git a/graphics/pokemon/poliwag/icon.png b/graphics/pokemon/gen_1/poliwag/icon.png similarity index 100% rename from graphics/pokemon/poliwag/icon.png rename to graphics/pokemon/gen_1/poliwag/icon.png diff --git a/graphics/pokemon/poliwag/normal.pal b/graphics/pokemon/gen_1/poliwag/normal.pal similarity index 100% rename from graphics/pokemon/poliwag/normal.pal rename to graphics/pokemon/gen_1/poliwag/normal.pal diff --git a/graphics/pokemon/poliwag/shiny.pal b/graphics/pokemon/gen_1/poliwag/shiny.pal similarity index 100% rename from graphics/pokemon/poliwag/shiny.pal rename to graphics/pokemon/gen_1/poliwag/shiny.pal diff --git a/graphics/pokemon/poliwhirl/anim_front.png b/graphics/pokemon/gen_1/poliwhirl/anim_front.png similarity index 100% rename from graphics/pokemon/poliwhirl/anim_front.png rename to graphics/pokemon/gen_1/poliwhirl/anim_front.png diff --git a/graphics/pokemon/poliwhirl/back.png b/graphics/pokemon/gen_1/poliwhirl/back.png similarity index 100% rename from graphics/pokemon/poliwhirl/back.png rename to graphics/pokemon/gen_1/poliwhirl/back.png diff --git a/graphics/pokemon/poliwhirl/footprint.png b/graphics/pokemon/gen_1/poliwhirl/footprint.png similarity index 100% rename from graphics/pokemon/poliwhirl/footprint.png rename to graphics/pokemon/gen_1/poliwhirl/footprint.png diff --git a/graphics/pokemon/poliwhirl/icon.png b/graphics/pokemon/gen_1/poliwhirl/icon.png similarity index 100% rename from graphics/pokemon/poliwhirl/icon.png rename to graphics/pokemon/gen_1/poliwhirl/icon.png diff --git a/graphics/pokemon/poliwhirl/normal.pal b/graphics/pokemon/gen_1/poliwhirl/normal.pal similarity index 100% rename from graphics/pokemon/poliwhirl/normal.pal rename to graphics/pokemon/gen_1/poliwhirl/normal.pal diff --git a/graphics/pokemon/poliwhirl/shiny.pal b/graphics/pokemon/gen_1/poliwhirl/shiny.pal similarity index 100% rename from graphics/pokemon/poliwhirl/shiny.pal rename to graphics/pokemon/gen_1/poliwhirl/shiny.pal diff --git a/graphics/pokemon/poliwrath/anim_front.png b/graphics/pokemon/gen_1/poliwrath/anim_front.png similarity index 100% rename from graphics/pokemon/poliwrath/anim_front.png rename to graphics/pokemon/gen_1/poliwrath/anim_front.png diff --git a/graphics/pokemon/poliwrath/back.png b/graphics/pokemon/gen_1/poliwrath/back.png similarity index 100% rename from graphics/pokemon/poliwrath/back.png rename to graphics/pokemon/gen_1/poliwrath/back.png diff --git a/graphics/pokemon/poliwrath/footprint.png b/graphics/pokemon/gen_1/poliwrath/footprint.png similarity index 100% rename from graphics/pokemon/poliwrath/footprint.png rename to graphics/pokemon/gen_1/poliwrath/footprint.png diff --git a/graphics/pokemon/poliwrath/icon.png b/graphics/pokemon/gen_1/poliwrath/icon.png similarity index 100% rename from graphics/pokemon/poliwrath/icon.png rename to graphics/pokemon/gen_1/poliwrath/icon.png diff --git a/graphics/pokemon/poliwrath/normal.pal b/graphics/pokemon/gen_1/poliwrath/normal.pal similarity index 100% rename from graphics/pokemon/poliwrath/normal.pal rename to graphics/pokemon/gen_1/poliwrath/normal.pal diff --git a/graphics/pokemon/poliwrath/shiny.pal b/graphics/pokemon/gen_1/poliwrath/shiny.pal similarity index 100% rename from graphics/pokemon/poliwrath/shiny.pal rename to graphics/pokemon/gen_1/poliwrath/shiny.pal diff --git a/graphics/pokemon/ponyta/anim_front.png b/graphics/pokemon/gen_1/ponyta/anim_front.png similarity index 100% rename from graphics/pokemon/ponyta/anim_front.png rename to graphics/pokemon/gen_1/ponyta/anim_front.png diff --git a/graphics/pokemon/ponyta/back.png b/graphics/pokemon/gen_1/ponyta/back.png similarity index 100% rename from graphics/pokemon/ponyta/back.png rename to graphics/pokemon/gen_1/ponyta/back.png diff --git a/graphics/pokemon/ponyta/footprint.png b/graphics/pokemon/gen_1/ponyta/footprint.png similarity index 100% rename from graphics/pokemon/ponyta/footprint.png rename to graphics/pokemon/gen_1/ponyta/footprint.png diff --git a/graphics/pokemon/ponyta/galarian/back.png b/graphics/pokemon/gen_1/ponyta/galarian/back.png similarity index 100% rename from graphics/pokemon/ponyta/galarian/back.png rename to graphics/pokemon/gen_1/ponyta/galarian/back.png diff --git a/graphics/pokemon/ponyta/galarian/front.png b/graphics/pokemon/gen_1/ponyta/galarian/front.png similarity index 100% rename from graphics/pokemon/ponyta/galarian/front.png rename to graphics/pokemon/gen_1/ponyta/galarian/front.png diff --git a/graphics/pokemon/ponyta/galarian/icon.png b/graphics/pokemon/gen_1/ponyta/galarian/icon.png similarity index 100% rename from graphics/pokemon/ponyta/galarian/icon.png rename to graphics/pokemon/gen_1/ponyta/galarian/icon.png diff --git a/graphics/pokemon/ponyta/galarian/normal.pal b/graphics/pokemon/gen_1/ponyta/galarian/normal.pal similarity index 100% rename from graphics/pokemon/ponyta/galarian/normal.pal rename to graphics/pokemon/gen_1/ponyta/galarian/normal.pal diff --git a/graphics/pokemon/ponyta/galarian/shiny.pal b/graphics/pokemon/gen_1/ponyta/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/ponyta/galarian/shiny.pal rename to graphics/pokemon/gen_1/ponyta/galarian/shiny.pal diff --git a/graphics/pokemon/ponyta/icon.png b/graphics/pokemon/gen_1/ponyta/icon.png similarity index 100% rename from graphics/pokemon/ponyta/icon.png rename to graphics/pokemon/gen_1/ponyta/icon.png diff --git a/graphics/pokemon/ponyta/normal.pal b/graphics/pokemon/gen_1/ponyta/normal.pal similarity index 100% rename from graphics/pokemon/ponyta/normal.pal rename to graphics/pokemon/gen_1/ponyta/normal.pal diff --git a/graphics/pokemon/ponyta/shiny.pal b/graphics/pokemon/gen_1/ponyta/shiny.pal similarity index 100% rename from graphics/pokemon/ponyta/shiny.pal rename to graphics/pokemon/gen_1/ponyta/shiny.pal diff --git a/graphics/pokemon/porygon/anim_front.png b/graphics/pokemon/gen_1/porygon/anim_front.png similarity index 100% rename from graphics/pokemon/porygon/anim_front.png rename to graphics/pokemon/gen_1/porygon/anim_front.png diff --git a/graphics/pokemon/porygon/back.png b/graphics/pokemon/gen_1/porygon/back.png similarity index 100% rename from graphics/pokemon/porygon/back.png rename to graphics/pokemon/gen_1/porygon/back.png diff --git a/graphics/pokemon/porygon/footprint.png b/graphics/pokemon/gen_1/porygon/footprint.png similarity index 100% rename from graphics/pokemon/porygon/footprint.png rename to graphics/pokemon/gen_1/porygon/footprint.png diff --git a/graphics/pokemon/porygon/icon.png b/graphics/pokemon/gen_1/porygon/icon.png similarity index 100% rename from graphics/pokemon/porygon/icon.png rename to graphics/pokemon/gen_1/porygon/icon.png diff --git a/graphics/pokemon/porygon/normal.pal b/graphics/pokemon/gen_1/porygon/normal.pal similarity index 100% rename from graphics/pokemon/porygon/normal.pal rename to graphics/pokemon/gen_1/porygon/normal.pal diff --git a/graphics/pokemon/porygon/shiny.pal b/graphics/pokemon/gen_1/porygon/shiny.pal similarity index 100% rename from graphics/pokemon/porygon/shiny.pal rename to graphics/pokemon/gen_1/porygon/shiny.pal diff --git a/graphics/pokemon/primeape/anim_front.png b/graphics/pokemon/gen_1/primeape/anim_front.png similarity index 100% rename from graphics/pokemon/primeape/anim_front.png rename to graphics/pokemon/gen_1/primeape/anim_front.png diff --git a/graphics/pokemon/primeape/back.png b/graphics/pokemon/gen_1/primeape/back.png similarity index 100% rename from graphics/pokemon/primeape/back.png rename to graphics/pokemon/gen_1/primeape/back.png diff --git a/graphics/pokemon/primeape/footprint.png b/graphics/pokemon/gen_1/primeape/footprint.png similarity index 100% rename from graphics/pokemon/primeape/footprint.png rename to graphics/pokemon/gen_1/primeape/footprint.png diff --git a/graphics/pokemon/primeape/icon.png b/graphics/pokemon/gen_1/primeape/icon.png similarity index 100% rename from graphics/pokemon/primeape/icon.png rename to graphics/pokemon/gen_1/primeape/icon.png diff --git a/graphics/pokemon/primeape/normal.pal b/graphics/pokemon/gen_1/primeape/normal.pal similarity index 100% rename from graphics/pokemon/primeape/normal.pal rename to graphics/pokemon/gen_1/primeape/normal.pal diff --git a/graphics/pokemon/primeape/shiny.pal b/graphics/pokemon/gen_1/primeape/shiny.pal similarity index 100% rename from graphics/pokemon/primeape/shiny.pal rename to graphics/pokemon/gen_1/primeape/shiny.pal diff --git a/graphics/pokemon/psyduck/anim_front.png b/graphics/pokemon/gen_1/psyduck/anim_front.png similarity index 100% rename from graphics/pokemon/psyduck/anim_front.png rename to graphics/pokemon/gen_1/psyduck/anim_front.png diff --git a/graphics/pokemon/psyduck/back.png b/graphics/pokemon/gen_1/psyduck/back.png similarity index 100% rename from graphics/pokemon/psyduck/back.png rename to graphics/pokemon/gen_1/psyduck/back.png diff --git a/graphics/pokemon/cramorant/footprint.png b/graphics/pokemon/gen_1/psyduck/footprint.png similarity index 100% rename from graphics/pokemon/cramorant/footprint.png rename to graphics/pokemon/gen_1/psyduck/footprint.png diff --git a/graphics/pokemon/psyduck/icon.png b/graphics/pokemon/gen_1/psyduck/icon.png similarity index 100% rename from graphics/pokemon/psyduck/icon.png rename to graphics/pokemon/gen_1/psyduck/icon.png diff --git a/graphics/pokemon/psyduck/normal.pal b/graphics/pokemon/gen_1/psyduck/normal.pal similarity index 100% rename from graphics/pokemon/psyduck/normal.pal rename to graphics/pokemon/gen_1/psyduck/normal.pal diff --git a/graphics/pokemon/psyduck/shiny.pal b/graphics/pokemon/gen_1/psyduck/shiny.pal similarity index 100% rename from graphics/pokemon/psyduck/shiny.pal rename to graphics/pokemon/gen_1/psyduck/shiny.pal diff --git a/graphics/pokemon/raichu/alolan/back.png b/graphics/pokemon/gen_1/raichu/alolan/back.png similarity index 100% rename from graphics/pokemon/raichu/alolan/back.png rename to graphics/pokemon/gen_1/raichu/alolan/back.png diff --git a/graphics/pokemon/raichu/alolan/front.png b/graphics/pokemon/gen_1/raichu/alolan/front.png similarity index 100% rename from graphics/pokemon/raichu/alolan/front.png rename to graphics/pokemon/gen_1/raichu/alolan/front.png diff --git a/graphics/pokemon/raichu/alolan/icon.png b/graphics/pokemon/gen_1/raichu/alolan/icon.png similarity index 100% rename from graphics/pokemon/raichu/alolan/icon.png rename to graphics/pokemon/gen_1/raichu/alolan/icon.png diff --git a/graphics/pokemon/raichu/alolan/normal.pal b/graphics/pokemon/gen_1/raichu/alolan/normal.pal similarity index 100% rename from graphics/pokemon/raichu/alolan/normal.pal rename to graphics/pokemon/gen_1/raichu/alolan/normal.pal diff --git a/graphics/pokemon/raichu/alolan/shiny.pal b/graphics/pokemon/gen_1/raichu/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/raichu/alolan/shiny.pal rename to graphics/pokemon/gen_1/raichu/alolan/shiny.pal diff --git a/graphics/pokemon/raichu/anim_front.png b/graphics/pokemon/gen_1/raichu/anim_front.png similarity index 100% rename from graphics/pokemon/raichu/anim_front.png rename to graphics/pokemon/gen_1/raichu/anim_front.png diff --git a/graphics/pokemon/raichu/anim_frontf.png b/graphics/pokemon/gen_1/raichu/anim_frontf.png similarity index 100% rename from graphics/pokemon/raichu/anim_frontf.png rename to graphics/pokemon/gen_1/raichu/anim_frontf.png diff --git a/graphics/pokemon/raichu/back.png b/graphics/pokemon/gen_1/raichu/back.png similarity index 100% rename from graphics/pokemon/raichu/back.png rename to graphics/pokemon/gen_1/raichu/back.png diff --git a/graphics/pokemon/raichu/footprint.png b/graphics/pokemon/gen_1/raichu/footprint.png similarity index 100% rename from graphics/pokemon/raichu/footprint.png rename to graphics/pokemon/gen_1/raichu/footprint.png diff --git a/graphics/pokemon/raichu/icon.png b/graphics/pokemon/gen_1/raichu/icon.png similarity index 100% rename from graphics/pokemon/raichu/icon.png rename to graphics/pokemon/gen_1/raichu/icon.png diff --git a/graphics/pokemon/raichu/normal.pal b/graphics/pokemon/gen_1/raichu/normal.pal similarity index 100% rename from graphics/pokemon/raichu/normal.pal rename to graphics/pokemon/gen_1/raichu/normal.pal diff --git a/graphics/pokemon/raichu/shiny.pal b/graphics/pokemon/gen_1/raichu/shiny.pal similarity index 100% rename from graphics/pokemon/raichu/shiny.pal rename to graphics/pokemon/gen_1/raichu/shiny.pal diff --git a/graphics/pokemon/rapidash/anim_front.png b/graphics/pokemon/gen_1/rapidash/anim_front.png similarity index 100% rename from graphics/pokemon/rapidash/anim_front.png rename to graphics/pokemon/gen_1/rapidash/anim_front.png diff --git a/graphics/pokemon/rapidash/back.png b/graphics/pokemon/gen_1/rapidash/back.png similarity index 100% rename from graphics/pokemon/rapidash/back.png rename to graphics/pokemon/gen_1/rapidash/back.png diff --git a/graphics/pokemon/rapidash/footprint.png b/graphics/pokemon/gen_1/rapidash/footprint.png similarity index 100% rename from graphics/pokemon/rapidash/footprint.png rename to graphics/pokemon/gen_1/rapidash/footprint.png diff --git a/graphics/pokemon/rapidash/galarian/back.png b/graphics/pokemon/gen_1/rapidash/galarian/back.png similarity index 100% rename from graphics/pokemon/rapidash/galarian/back.png rename to graphics/pokemon/gen_1/rapidash/galarian/back.png diff --git a/graphics/pokemon/rapidash/galarian/front.png b/graphics/pokemon/gen_1/rapidash/galarian/front.png similarity index 100% rename from graphics/pokemon/rapidash/galarian/front.png rename to graphics/pokemon/gen_1/rapidash/galarian/front.png diff --git a/graphics/pokemon/rapidash/galarian/icon.png b/graphics/pokemon/gen_1/rapidash/galarian/icon.png similarity index 100% rename from graphics/pokemon/rapidash/galarian/icon.png rename to graphics/pokemon/gen_1/rapidash/galarian/icon.png diff --git a/graphics/pokemon/rapidash/galarian/normal.pal b/graphics/pokemon/gen_1/rapidash/galarian/normal.pal similarity index 100% rename from graphics/pokemon/rapidash/galarian/normal.pal rename to graphics/pokemon/gen_1/rapidash/galarian/normal.pal diff --git a/graphics/pokemon/rapidash/galarian/shiny.pal b/graphics/pokemon/gen_1/rapidash/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/rapidash/galarian/shiny.pal rename to graphics/pokemon/gen_1/rapidash/galarian/shiny.pal diff --git a/graphics/pokemon/rapidash/icon.png b/graphics/pokemon/gen_1/rapidash/icon.png similarity index 100% rename from graphics/pokemon/rapidash/icon.png rename to graphics/pokemon/gen_1/rapidash/icon.png diff --git a/graphics/pokemon/rapidash/normal.pal b/graphics/pokemon/gen_1/rapidash/normal.pal similarity index 100% rename from graphics/pokemon/rapidash/normal.pal rename to graphics/pokemon/gen_1/rapidash/normal.pal diff --git a/graphics/pokemon/rapidash/shiny.pal b/graphics/pokemon/gen_1/rapidash/shiny.pal similarity index 100% rename from graphics/pokemon/rapidash/shiny.pal rename to graphics/pokemon/gen_1/rapidash/shiny.pal diff --git a/graphics/pokemon/raticate/alolan/back.png b/graphics/pokemon/gen_1/raticate/alolan/back.png similarity index 100% rename from graphics/pokemon/raticate/alolan/back.png rename to graphics/pokemon/gen_1/raticate/alolan/back.png diff --git a/graphics/pokemon/raticate/alolan/front.png b/graphics/pokemon/gen_1/raticate/alolan/front.png similarity index 100% rename from graphics/pokemon/raticate/alolan/front.png rename to graphics/pokemon/gen_1/raticate/alolan/front.png diff --git a/graphics/pokemon/raticate/alolan/icon.png b/graphics/pokemon/gen_1/raticate/alolan/icon.png similarity index 100% rename from graphics/pokemon/raticate/alolan/icon.png rename to graphics/pokemon/gen_1/raticate/alolan/icon.png diff --git a/graphics/pokemon/raticate/alolan/normal.pal b/graphics/pokemon/gen_1/raticate/alolan/normal.pal similarity index 100% rename from graphics/pokemon/raticate/alolan/normal.pal rename to graphics/pokemon/gen_1/raticate/alolan/normal.pal diff --git a/graphics/pokemon/raticate/alolan/shiny.pal b/graphics/pokemon/gen_1/raticate/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/raticate/alolan/shiny.pal rename to graphics/pokemon/gen_1/raticate/alolan/shiny.pal diff --git a/graphics/pokemon/raticate/anim_front.png b/graphics/pokemon/gen_1/raticate/anim_front.png similarity index 100% rename from graphics/pokemon/raticate/anim_front.png rename to graphics/pokemon/gen_1/raticate/anim_front.png diff --git a/graphics/pokemon/raticate/anim_frontf.png b/graphics/pokemon/gen_1/raticate/anim_frontf.png similarity index 100% rename from graphics/pokemon/raticate/anim_frontf.png rename to graphics/pokemon/gen_1/raticate/anim_frontf.png diff --git a/graphics/pokemon/raticate/back.png b/graphics/pokemon/gen_1/raticate/back.png similarity index 100% rename from graphics/pokemon/raticate/back.png rename to graphics/pokemon/gen_1/raticate/back.png diff --git a/graphics/pokemon/raticate/backf.png b/graphics/pokemon/gen_1/raticate/backf.png similarity index 100% rename from graphics/pokemon/raticate/backf.png rename to graphics/pokemon/gen_1/raticate/backf.png diff --git a/graphics/pokemon/gumshoos/footprint.png b/graphics/pokemon/gen_1/raticate/footprint.png similarity index 100% rename from graphics/pokemon/gumshoos/footprint.png rename to graphics/pokemon/gen_1/raticate/footprint.png diff --git a/graphics/pokemon/raticate/icon.png b/graphics/pokemon/gen_1/raticate/icon.png similarity index 100% rename from graphics/pokemon/raticate/icon.png rename to graphics/pokemon/gen_1/raticate/icon.png diff --git a/graphics/pokemon/raticate/normal.pal b/graphics/pokemon/gen_1/raticate/normal.pal similarity index 100% rename from graphics/pokemon/raticate/normal.pal rename to graphics/pokemon/gen_1/raticate/normal.pal diff --git a/graphics/pokemon/raticate/shiny.pal b/graphics/pokemon/gen_1/raticate/shiny.pal similarity index 100% rename from graphics/pokemon/raticate/shiny.pal rename to graphics/pokemon/gen_1/raticate/shiny.pal diff --git a/graphics/pokemon/rattata/alolan/back.png b/graphics/pokemon/gen_1/rattata/alolan/back.png similarity index 100% rename from graphics/pokemon/rattata/alolan/back.png rename to graphics/pokemon/gen_1/rattata/alolan/back.png diff --git a/graphics/pokemon/rattata/alolan/front.png b/graphics/pokemon/gen_1/rattata/alolan/front.png similarity index 100% rename from graphics/pokemon/rattata/alolan/front.png rename to graphics/pokemon/gen_1/rattata/alolan/front.png diff --git a/graphics/pokemon/rattata/alolan/icon.png b/graphics/pokemon/gen_1/rattata/alolan/icon.png similarity index 100% rename from graphics/pokemon/rattata/alolan/icon.png rename to graphics/pokemon/gen_1/rattata/alolan/icon.png diff --git a/graphics/pokemon/rattata/alolan/normal.pal b/graphics/pokemon/gen_1/rattata/alolan/normal.pal similarity index 100% rename from graphics/pokemon/rattata/alolan/normal.pal rename to graphics/pokemon/gen_1/rattata/alolan/normal.pal diff --git a/graphics/pokemon/rattata/alolan/shiny.pal b/graphics/pokemon/gen_1/rattata/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/rattata/alolan/shiny.pal rename to graphics/pokemon/gen_1/rattata/alolan/shiny.pal diff --git a/graphics/pokemon/rattata/anim_front.png b/graphics/pokemon/gen_1/rattata/anim_front.png similarity index 100% rename from graphics/pokemon/rattata/anim_front.png rename to graphics/pokemon/gen_1/rattata/anim_front.png diff --git a/graphics/pokemon/rattata/anim_frontf.png b/graphics/pokemon/gen_1/rattata/anim_frontf.png similarity index 100% rename from graphics/pokemon/rattata/anim_frontf.png rename to graphics/pokemon/gen_1/rattata/anim_frontf.png diff --git a/graphics/pokemon/rattata/back.png b/graphics/pokemon/gen_1/rattata/back.png similarity index 100% rename from graphics/pokemon/rattata/back.png rename to graphics/pokemon/gen_1/rattata/back.png diff --git a/graphics/pokemon/rattata/backf.png b/graphics/pokemon/gen_1/rattata/backf.png similarity index 100% rename from graphics/pokemon/rattata/backf.png rename to graphics/pokemon/gen_1/rattata/backf.png diff --git a/graphics/pokemon/rattata/footprint.png b/graphics/pokemon/gen_1/rattata/footprint.png similarity index 100% rename from graphics/pokemon/rattata/footprint.png rename to graphics/pokemon/gen_1/rattata/footprint.png diff --git a/graphics/pokemon/rattata/icon.png b/graphics/pokemon/gen_1/rattata/icon.png similarity index 100% rename from graphics/pokemon/rattata/icon.png rename to graphics/pokemon/gen_1/rattata/icon.png diff --git a/graphics/pokemon/rattata/normal.pal b/graphics/pokemon/gen_1/rattata/normal.pal similarity index 100% rename from graphics/pokemon/rattata/normal.pal rename to graphics/pokemon/gen_1/rattata/normal.pal diff --git a/graphics/pokemon/rattata/shiny.pal b/graphics/pokemon/gen_1/rattata/shiny.pal similarity index 100% rename from graphics/pokemon/rattata/shiny.pal rename to graphics/pokemon/gen_1/rattata/shiny.pal diff --git a/graphics/pokemon/rhydon/anim_front.png b/graphics/pokemon/gen_1/rhydon/anim_front.png similarity index 100% rename from graphics/pokemon/rhydon/anim_front.png rename to graphics/pokemon/gen_1/rhydon/anim_front.png diff --git a/graphics/pokemon/rhydon/anim_frontf.png b/graphics/pokemon/gen_1/rhydon/anim_frontf.png similarity index 100% rename from graphics/pokemon/rhydon/anim_frontf.png rename to graphics/pokemon/gen_1/rhydon/anim_frontf.png diff --git a/graphics/pokemon/rhydon/back.png b/graphics/pokemon/gen_1/rhydon/back.png similarity index 100% rename from graphics/pokemon/rhydon/back.png rename to graphics/pokemon/gen_1/rhydon/back.png diff --git a/graphics/pokemon/rhydon/backf.png b/graphics/pokemon/gen_1/rhydon/backf.png similarity index 100% rename from graphics/pokemon/rhydon/backf.png rename to graphics/pokemon/gen_1/rhydon/backf.png diff --git a/graphics/pokemon/rhydon/footprint.png b/graphics/pokemon/gen_1/rhydon/footprint.png similarity index 100% rename from graphics/pokemon/rhydon/footprint.png rename to graphics/pokemon/gen_1/rhydon/footprint.png diff --git a/graphics/pokemon/rhydon/icon.png b/graphics/pokemon/gen_1/rhydon/icon.png similarity index 100% rename from graphics/pokemon/rhydon/icon.png rename to graphics/pokemon/gen_1/rhydon/icon.png diff --git a/graphics/pokemon/rhydon/normal.pal b/graphics/pokemon/gen_1/rhydon/normal.pal similarity index 100% rename from graphics/pokemon/rhydon/normal.pal rename to graphics/pokemon/gen_1/rhydon/normal.pal diff --git a/graphics/pokemon/rhydon/shiny.pal b/graphics/pokemon/gen_1/rhydon/shiny.pal similarity index 100% rename from graphics/pokemon/rhydon/shiny.pal rename to graphics/pokemon/gen_1/rhydon/shiny.pal diff --git a/graphics/pokemon/rhyhorn/anim_front.png b/graphics/pokemon/gen_1/rhyhorn/anim_front.png similarity index 100% rename from graphics/pokemon/rhyhorn/anim_front.png rename to graphics/pokemon/gen_1/rhyhorn/anim_front.png diff --git a/graphics/pokemon/rhyhorn/anim_frontf.png b/graphics/pokemon/gen_1/rhyhorn/anim_frontf.png similarity index 100% rename from graphics/pokemon/rhyhorn/anim_frontf.png rename to graphics/pokemon/gen_1/rhyhorn/anim_frontf.png diff --git a/graphics/pokemon/rhyhorn/back.png b/graphics/pokemon/gen_1/rhyhorn/back.png similarity index 100% rename from graphics/pokemon/rhyhorn/back.png rename to graphics/pokemon/gen_1/rhyhorn/back.png diff --git a/graphics/pokemon/rhyhorn/backf.png b/graphics/pokemon/gen_1/rhyhorn/backf.png similarity index 100% rename from graphics/pokemon/rhyhorn/backf.png rename to graphics/pokemon/gen_1/rhyhorn/backf.png diff --git a/graphics/pokemon/rhyhorn/footprint.png b/graphics/pokemon/gen_1/rhyhorn/footprint.png similarity index 100% rename from graphics/pokemon/rhyhorn/footprint.png rename to graphics/pokemon/gen_1/rhyhorn/footprint.png diff --git a/graphics/pokemon/rhyhorn/icon.png b/graphics/pokemon/gen_1/rhyhorn/icon.png similarity index 100% rename from graphics/pokemon/rhyhorn/icon.png rename to graphics/pokemon/gen_1/rhyhorn/icon.png diff --git a/graphics/pokemon/rhyhorn/normal.pal b/graphics/pokemon/gen_1/rhyhorn/normal.pal similarity index 100% rename from graphics/pokemon/rhyhorn/normal.pal rename to graphics/pokemon/gen_1/rhyhorn/normal.pal diff --git a/graphics/pokemon/rhyhorn/shiny.pal b/graphics/pokemon/gen_1/rhyhorn/shiny.pal similarity index 100% rename from graphics/pokemon/rhyhorn/shiny.pal rename to graphics/pokemon/gen_1/rhyhorn/shiny.pal diff --git a/graphics/pokemon/sandshrew/alolan/back.png b/graphics/pokemon/gen_1/sandshrew/alolan/back.png similarity index 100% rename from graphics/pokemon/sandshrew/alolan/back.png rename to graphics/pokemon/gen_1/sandshrew/alolan/back.png diff --git a/graphics/pokemon/sandshrew/alolan/front.png b/graphics/pokemon/gen_1/sandshrew/alolan/front.png similarity index 100% rename from graphics/pokemon/sandshrew/alolan/front.png rename to graphics/pokemon/gen_1/sandshrew/alolan/front.png diff --git a/graphics/pokemon/sandshrew/alolan/icon.png b/graphics/pokemon/gen_1/sandshrew/alolan/icon.png similarity index 100% rename from graphics/pokemon/sandshrew/alolan/icon.png rename to graphics/pokemon/gen_1/sandshrew/alolan/icon.png diff --git a/graphics/pokemon/sandshrew/alolan/normal.pal b/graphics/pokemon/gen_1/sandshrew/alolan/normal.pal similarity index 100% rename from graphics/pokemon/sandshrew/alolan/normal.pal rename to graphics/pokemon/gen_1/sandshrew/alolan/normal.pal diff --git a/graphics/pokemon/sandshrew/alolan/shiny.pal b/graphics/pokemon/gen_1/sandshrew/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/sandshrew/alolan/shiny.pal rename to graphics/pokemon/gen_1/sandshrew/alolan/shiny.pal diff --git a/graphics/pokemon/sandshrew/anim_front.png b/graphics/pokemon/gen_1/sandshrew/anim_front.png similarity index 100% rename from graphics/pokemon/sandshrew/anim_front.png rename to graphics/pokemon/gen_1/sandshrew/anim_front.png diff --git a/graphics/pokemon/sandshrew/back.png b/graphics/pokemon/gen_1/sandshrew/back.png similarity index 100% rename from graphics/pokemon/sandshrew/back.png rename to graphics/pokemon/gen_1/sandshrew/back.png diff --git a/graphics/pokemon/sandshrew/footprint.png b/graphics/pokemon/gen_1/sandshrew/footprint.png similarity index 100% rename from graphics/pokemon/sandshrew/footprint.png rename to graphics/pokemon/gen_1/sandshrew/footprint.png diff --git a/graphics/pokemon/sandshrew/icon.png b/graphics/pokemon/gen_1/sandshrew/icon.png similarity index 100% rename from graphics/pokemon/sandshrew/icon.png rename to graphics/pokemon/gen_1/sandshrew/icon.png diff --git a/graphics/pokemon/sandshrew/normal.pal b/graphics/pokemon/gen_1/sandshrew/normal.pal similarity index 100% rename from graphics/pokemon/sandshrew/normal.pal rename to graphics/pokemon/gen_1/sandshrew/normal.pal diff --git a/graphics/pokemon/sandshrew/shiny.pal b/graphics/pokemon/gen_1/sandshrew/shiny.pal similarity index 100% rename from graphics/pokemon/sandshrew/shiny.pal rename to graphics/pokemon/gen_1/sandshrew/shiny.pal diff --git a/graphics/pokemon/sandslash/alolan/back.png b/graphics/pokemon/gen_1/sandslash/alolan/back.png similarity index 100% rename from graphics/pokemon/sandslash/alolan/back.png rename to graphics/pokemon/gen_1/sandslash/alolan/back.png diff --git a/graphics/pokemon/sandslash/alolan/front.png b/graphics/pokemon/gen_1/sandslash/alolan/front.png similarity index 100% rename from graphics/pokemon/sandslash/alolan/front.png rename to graphics/pokemon/gen_1/sandslash/alolan/front.png diff --git a/graphics/pokemon/sandslash/alolan/icon.png b/graphics/pokemon/gen_1/sandslash/alolan/icon.png similarity index 100% rename from graphics/pokemon/sandslash/alolan/icon.png rename to graphics/pokemon/gen_1/sandslash/alolan/icon.png diff --git a/graphics/pokemon/sandslash/alolan/normal.pal b/graphics/pokemon/gen_1/sandslash/alolan/normal.pal similarity index 100% rename from graphics/pokemon/sandslash/alolan/normal.pal rename to graphics/pokemon/gen_1/sandslash/alolan/normal.pal diff --git a/graphics/pokemon/sandslash/alolan/shiny.pal b/graphics/pokemon/gen_1/sandslash/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/sandslash/alolan/shiny.pal rename to graphics/pokemon/gen_1/sandslash/alolan/shiny.pal diff --git a/graphics/pokemon/sandslash/anim_front.png b/graphics/pokemon/gen_1/sandslash/anim_front.png similarity index 100% rename from graphics/pokemon/sandslash/anim_front.png rename to graphics/pokemon/gen_1/sandslash/anim_front.png diff --git a/graphics/pokemon/sandslash/back.png b/graphics/pokemon/gen_1/sandslash/back.png similarity index 100% rename from graphics/pokemon/sandslash/back.png rename to graphics/pokemon/gen_1/sandslash/back.png diff --git a/graphics/pokemon/sandslash/footprint.png b/graphics/pokemon/gen_1/sandslash/footprint.png similarity index 100% rename from graphics/pokemon/sandslash/footprint.png rename to graphics/pokemon/gen_1/sandslash/footprint.png diff --git a/graphics/pokemon/sandslash/icon.png b/graphics/pokemon/gen_1/sandslash/icon.png similarity index 100% rename from graphics/pokemon/sandslash/icon.png rename to graphics/pokemon/gen_1/sandslash/icon.png diff --git a/graphics/pokemon/sandslash/normal.pal b/graphics/pokemon/gen_1/sandslash/normal.pal similarity index 100% rename from graphics/pokemon/sandslash/normal.pal rename to graphics/pokemon/gen_1/sandslash/normal.pal diff --git a/graphics/pokemon/sandslash/shiny.pal b/graphics/pokemon/gen_1/sandslash/shiny.pal similarity index 100% rename from graphics/pokemon/sandslash/shiny.pal rename to graphics/pokemon/gen_1/sandslash/shiny.pal diff --git a/graphics/pokemon/scyther/anim_front.png b/graphics/pokemon/gen_1/scyther/anim_front.png similarity index 100% rename from graphics/pokemon/scyther/anim_front.png rename to graphics/pokemon/gen_1/scyther/anim_front.png diff --git a/graphics/pokemon/scyther/anim_frontf.png b/graphics/pokemon/gen_1/scyther/anim_frontf.png similarity index 100% rename from graphics/pokemon/scyther/anim_frontf.png rename to graphics/pokemon/gen_1/scyther/anim_frontf.png diff --git a/graphics/pokemon/scyther/back.png b/graphics/pokemon/gen_1/scyther/back.png similarity index 100% rename from graphics/pokemon/scyther/back.png rename to graphics/pokemon/gen_1/scyther/back.png diff --git a/graphics/pokemon/scyther/footprint.png b/graphics/pokemon/gen_1/scyther/footprint.png similarity index 100% rename from graphics/pokemon/scyther/footprint.png rename to graphics/pokemon/gen_1/scyther/footprint.png diff --git a/graphics/pokemon/scyther/icon.png b/graphics/pokemon/gen_1/scyther/icon.png similarity index 100% rename from graphics/pokemon/scyther/icon.png rename to graphics/pokemon/gen_1/scyther/icon.png diff --git a/graphics/pokemon/scyther/normal.pal b/graphics/pokemon/gen_1/scyther/normal.pal similarity index 100% rename from graphics/pokemon/scyther/normal.pal rename to graphics/pokemon/gen_1/scyther/normal.pal diff --git a/graphics/pokemon/scyther/shiny.pal b/graphics/pokemon/gen_1/scyther/shiny.pal similarity index 100% rename from graphics/pokemon/scyther/shiny.pal rename to graphics/pokemon/gen_1/scyther/shiny.pal diff --git a/graphics/pokemon/seadra/anim_front.png b/graphics/pokemon/gen_1/seadra/anim_front.png similarity index 100% rename from graphics/pokemon/seadra/anim_front.png rename to graphics/pokemon/gen_1/seadra/anim_front.png diff --git a/graphics/pokemon/seadra/back.png b/graphics/pokemon/gen_1/seadra/back.png similarity index 100% rename from graphics/pokemon/seadra/back.png rename to graphics/pokemon/gen_1/seadra/back.png diff --git a/graphics/pokemon/chimecho/footprint.png b/graphics/pokemon/gen_1/seadra/footprint.png similarity index 100% rename from graphics/pokemon/chimecho/footprint.png rename to graphics/pokemon/gen_1/seadra/footprint.png diff --git a/graphics/pokemon/seadra/icon.png b/graphics/pokemon/gen_1/seadra/icon.png similarity index 100% rename from graphics/pokemon/seadra/icon.png rename to graphics/pokemon/gen_1/seadra/icon.png diff --git a/graphics/pokemon/seadra/normal.pal b/graphics/pokemon/gen_1/seadra/normal.pal similarity index 100% rename from graphics/pokemon/seadra/normal.pal rename to graphics/pokemon/gen_1/seadra/normal.pal diff --git a/graphics/pokemon/seadra/shiny.pal b/graphics/pokemon/gen_1/seadra/shiny.pal similarity index 100% rename from graphics/pokemon/seadra/shiny.pal rename to graphics/pokemon/gen_1/seadra/shiny.pal diff --git a/graphics/pokemon/seaking/anim_front.png b/graphics/pokemon/gen_1/seaking/anim_front.png similarity index 100% rename from graphics/pokemon/seaking/anim_front.png rename to graphics/pokemon/gen_1/seaking/anim_front.png diff --git a/graphics/pokemon/seaking/anim_frontf.png b/graphics/pokemon/gen_1/seaking/anim_frontf.png similarity index 100% rename from graphics/pokemon/seaking/anim_frontf.png rename to graphics/pokemon/gen_1/seaking/anim_frontf.png diff --git a/graphics/pokemon/seaking/back.png b/graphics/pokemon/gen_1/seaking/back.png similarity index 100% rename from graphics/pokemon/seaking/back.png rename to graphics/pokemon/gen_1/seaking/back.png diff --git a/graphics/pokemon/seaking/backf.png b/graphics/pokemon/gen_1/seaking/backf.png similarity index 100% rename from graphics/pokemon/seaking/backf.png rename to graphics/pokemon/gen_1/seaking/backf.png diff --git a/graphics/pokemon/chinchou/footprint.png b/graphics/pokemon/gen_1/seaking/footprint.png similarity index 100% rename from graphics/pokemon/chinchou/footprint.png rename to graphics/pokemon/gen_1/seaking/footprint.png diff --git a/graphics/pokemon/seaking/icon.png b/graphics/pokemon/gen_1/seaking/icon.png similarity index 100% rename from graphics/pokemon/seaking/icon.png rename to graphics/pokemon/gen_1/seaking/icon.png diff --git a/graphics/pokemon/seaking/normal.pal b/graphics/pokemon/gen_1/seaking/normal.pal similarity index 100% rename from graphics/pokemon/seaking/normal.pal rename to graphics/pokemon/gen_1/seaking/normal.pal diff --git a/graphics/pokemon/seaking/shiny.pal b/graphics/pokemon/gen_1/seaking/shiny.pal similarity index 100% rename from graphics/pokemon/seaking/shiny.pal rename to graphics/pokemon/gen_1/seaking/shiny.pal diff --git a/graphics/pokemon/seel/anim_front.png b/graphics/pokemon/gen_1/seel/anim_front.png similarity index 100% rename from graphics/pokemon/seel/anim_front.png rename to graphics/pokemon/gen_1/seel/anim_front.png diff --git a/graphics/pokemon/seel/back.png b/graphics/pokemon/gen_1/seel/back.png similarity index 100% rename from graphics/pokemon/seel/back.png rename to graphics/pokemon/gen_1/seel/back.png diff --git a/graphics/pokemon/clamperl/footprint.png b/graphics/pokemon/gen_1/seel/footprint.png similarity index 100% rename from graphics/pokemon/clamperl/footprint.png rename to graphics/pokemon/gen_1/seel/footprint.png diff --git a/graphics/pokemon/seel/icon.png b/graphics/pokemon/gen_1/seel/icon.png similarity index 100% rename from graphics/pokemon/seel/icon.png rename to graphics/pokemon/gen_1/seel/icon.png diff --git a/graphics/pokemon/seel/normal.pal b/graphics/pokemon/gen_1/seel/normal.pal similarity index 100% rename from graphics/pokemon/seel/normal.pal rename to graphics/pokemon/gen_1/seel/normal.pal diff --git a/graphics/pokemon/seel/shiny.pal b/graphics/pokemon/gen_1/seel/shiny.pal similarity index 100% rename from graphics/pokemon/seel/shiny.pal rename to graphics/pokemon/gen_1/seel/shiny.pal diff --git a/graphics/pokemon/shellder/anim_front.png b/graphics/pokemon/gen_1/shellder/anim_front.png similarity index 100% rename from graphics/pokemon/shellder/anim_front.png rename to graphics/pokemon/gen_1/shellder/anim_front.png diff --git a/graphics/pokemon/shellder/back.png b/graphics/pokemon/gen_1/shellder/back.png similarity index 100% rename from graphics/pokemon/shellder/back.png rename to graphics/pokemon/gen_1/shellder/back.png diff --git a/graphics/pokemon/clawitzer/footprint.png b/graphics/pokemon/gen_1/shellder/footprint.png similarity index 100% rename from graphics/pokemon/clawitzer/footprint.png rename to graphics/pokemon/gen_1/shellder/footprint.png diff --git a/graphics/pokemon/shellder/icon.png b/graphics/pokemon/gen_1/shellder/icon.png similarity index 100% rename from graphics/pokemon/shellder/icon.png rename to graphics/pokemon/gen_1/shellder/icon.png diff --git a/graphics/pokemon/shellder/normal.pal b/graphics/pokemon/gen_1/shellder/normal.pal similarity index 100% rename from graphics/pokemon/shellder/normal.pal rename to graphics/pokemon/gen_1/shellder/normal.pal diff --git a/graphics/pokemon/shellder/shiny.pal b/graphics/pokemon/gen_1/shellder/shiny.pal similarity index 100% rename from graphics/pokemon/shellder/shiny.pal rename to graphics/pokemon/gen_1/shellder/shiny.pal diff --git a/graphics/pokemon/slowbro/anim_front.png b/graphics/pokemon/gen_1/slowbro/anim_front.png similarity index 100% rename from graphics/pokemon/slowbro/anim_front.png rename to graphics/pokemon/gen_1/slowbro/anim_front.png diff --git a/graphics/pokemon/slowbro/back.png b/graphics/pokemon/gen_1/slowbro/back.png similarity index 100% rename from graphics/pokemon/slowbro/back.png rename to graphics/pokemon/gen_1/slowbro/back.png diff --git a/graphics/pokemon/slowbro/footprint.png b/graphics/pokemon/gen_1/slowbro/footprint.png similarity index 100% rename from graphics/pokemon/slowbro/footprint.png rename to graphics/pokemon/gen_1/slowbro/footprint.png diff --git a/graphics/pokemon/slowbro/galarian/back.png b/graphics/pokemon/gen_1/slowbro/galarian/back.png similarity index 100% rename from graphics/pokemon/slowbro/galarian/back.png rename to graphics/pokemon/gen_1/slowbro/galarian/back.png diff --git a/graphics/pokemon/slowbro/galarian/front.png b/graphics/pokemon/gen_1/slowbro/galarian/front.png similarity index 100% rename from graphics/pokemon/slowbro/galarian/front.png rename to graphics/pokemon/gen_1/slowbro/galarian/front.png diff --git a/graphics/pokemon/slowbro/galarian/icon.png b/graphics/pokemon/gen_1/slowbro/galarian/icon.png similarity index 100% rename from graphics/pokemon/slowbro/galarian/icon.png rename to graphics/pokemon/gen_1/slowbro/galarian/icon.png diff --git a/graphics/pokemon/slowbro/galarian/normal.pal b/graphics/pokemon/gen_1/slowbro/galarian/normal.pal similarity index 100% rename from graphics/pokemon/slowbro/galarian/normal.pal rename to graphics/pokemon/gen_1/slowbro/galarian/normal.pal diff --git a/graphics/pokemon/slowbro/galarian/shiny.pal b/graphics/pokemon/gen_1/slowbro/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/slowbro/galarian/shiny.pal rename to graphics/pokemon/gen_1/slowbro/galarian/shiny.pal diff --git a/graphics/pokemon/slowbro/icon.png b/graphics/pokemon/gen_1/slowbro/icon.png similarity index 100% rename from graphics/pokemon/slowbro/icon.png rename to graphics/pokemon/gen_1/slowbro/icon.png diff --git a/graphics/pokemon/slowbro/mega/back.png b/graphics/pokemon/gen_1/slowbro/mega/back.png similarity index 100% rename from graphics/pokemon/slowbro/mega/back.png rename to graphics/pokemon/gen_1/slowbro/mega/back.png diff --git a/graphics/pokemon/slowbro/mega/front.png b/graphics/pokemon/gen_1/slowbro/mega/front.png similarity index 100% rename from graphics/pokemon/slowbro/mega/front.png rename to graphics/pokemon/gen_1/slowbro/mega/front.png diff --git a/graphics/pokemon/slowbro/mega/icon.png b/graphics/pokemon/gen_1/slowbro/mega/icon.png similarity index 100% rename from graphics/pokemon/slowbro/mega/icon.png rename to graphics/pokemon/gen_1/slowbro/mega/icon.png diff --git a/graphics/pokemon/slowbro/mega/normal.pal b/graphics/pokemon/gen_1/slowbro/mega/normal.pal similarity index 100% rename from graphics/pokemon/slowbro/mega/normal.pal rename to graphics/pokemon/gen_1/slowbro/mega/normal.pal diff --git a/graphics/pokemon/slowbro/mega/shiny.pal b/graphics/pokemon/gen_1/slowbro/mega/shiny.pal similarity index 100% rename from graphics/pokemon/slowbro/mega/shiny.pal rename to graphics/pokemon/gen_1/slowbro/mega/shiny.pal diff --git a/graphics/pokemon/slowbro/normal.pal b/graphics/pokemon/gen_1/slowbro/normal.pal similarity index 100% rename from graphics/pokemon/slowbro/normal.pal rename to graphics/pokemon/gen_1/slowbro/normal.pal diff --git a/graphics/pokemon/slowbro/shiny.pal b/graphics/pokemon/gen_1/slowbro/shiny.pal similarity index 100% rename from graphics/pokemon/slowbro/shiny.pal rename to graphics/pokemon/gen_1/slowbro/shiny.pal diff --git a/graphics/pokemon/slowpoke/anim_front.png b/graphics/pokemon/gen_1/slowpoke/anim_front.png similarity index 100% rename from graphics/pokemon/slowpoke/anim_front.png rename to graphics/pokemon/gen_1/slowpoke/anim_front.png diff --git a/graphics/pokemon/slowpoke/back.png b/graphics/pokemon/gen_1/slowpoke/back.png similarity index 100% rename from graphics/pokemon/slowpoke/back.png rename to graphics/pokemon/gen_1/slowpoke/back.png diff --git a/graphics/pokemon/slowpoke/footprint.png b/graphics/pokemon/gen_1/slowpoke/footprint.png similarity index 100% rename from graphics/pokemon/slowpoke/footprint.png rename to graphics/pokemon/gen_1/slowpoke/footprint.png diff --git a/graphics/pokemon/slowpoke/galarian/back.png b/graphics/pokemon/gen_1/slowpoke/galarian/back.png similarity index 100% rename from graphics/pokemon/slowpoke/galarian/back.png rename to graphics/pokemon/gen_1/slowpoke/galarian/back.png diff --git a/graphics/pokemon/slowpoke/galarian/front.png b/graphics/pokemon/gen_1/slowpoke/galarian/front.png similarity index 100% rename from graphics/pokemon/slowpoke/galarian/front.png rename to graphics/pokemon/gen_1/slowpoke/galarian/front.png diff --git a/graphics/pokemon/slowpoke/galarian/icon.png b/graphics/pokemon/gen_1/slowpoke/galarian/icon.png similarity index 100% rename from graphics/pokemon/slowpoke/galarian/icon.png rename to graphics/pokemon/gen_1/slowpoke/galarian/icon.png diff --git a/graphics/pokemon/slowpoke/galarian/normal.pal b/graphics/pokemon/gen_1/slowpoke/galarian/normal.pal similarity index 100% rename from graphics/pokemon/slowpoke/galarian/normal.pal rename to graphics/pokemon/gen_1/slowpoke/galarian/normal.pal diff --git a/graphics/pokemon/slowpoke/galarian/shiny.pal b/graphics/pokemon/gen_1/slowpoke/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/slowpoke/galarian/shiny.pal rename to graphics/pokemon/gen_1/slowpoke/galarian/shiny.pal diff --git a/graphics/pokemon/slowpoke/icon.png b/graphics/pokemon/gen_1/slowpoke/icon.png similarity index 100% rename from graphics/pokemon/slowpoke/icon.png rename to graphics/pokemon/gen_1/slowpoke/icon.png diff --git a/graphics/pokemon/slowpoke/normal.pal b/graphics/pokemon/gen_1/slowpoke/normal.pal similarity index 100% rename from graphics/pokemon/slowpoke/normal.pal rename to graphics/pokemon/gen_1/slowpoke/normal.pal diff --git a/graphics/pokemon/slowpoke/shiny.pal b/graphics/pokemon/gen_1/slowpoke/shiny.pal similarity index 100% rename from graphics/pokemon/slowpoke/shiny.pal rename to graphics/pokemon/gen_1/slowpoke/shiny.pal diff --git a/graphics/pokemon/snorlax/anim_front.png b/graphics/pokemon/gen_1/snorlax/anim_front.png similarity index 100% rename from graphics/pokemon/snorlax/anim_front.png rename to graphics/pokemon/gen_1/snorlax/anim_front.png diff --git a/graphics/pokemon/snorlax/back.png b/graphics/pokemon/gen_1/snorlax/back.png similarity index 100% rename from graphics/pokemon/snorlax/back.png rename to graphics/pokemon/gen_1/snorlax/back.png diff --git a/graphics/pokemon/snorlax/footprint.png b/graphics/pokemon/gen_1/snorlax/footprint.png similarity index 100% rename from graphics/pokemon/snorlax/footprint.png rename to graphics/pokemon/gen_1/snorlax/footprint.png diff --git a/graphics/pokemon/snorlax/gigantamax/back.png b/graphics/pokemon/gen_1/snorlax/gigantamax/back.png similarity index 100% rename from graphics/pokemon/snorlax/gigantamax/back.png rename to graphics/pokemon/gen_1/snorlax/gigantamax/back.png diff --git a/graphics/pokemon/snorlax/gigantamax/front.png b/graphics/pokemon/gen_1/snorlax/gigantamax/front.png similarity index 100% rename from graphics/pokemon/snorlax/gigantamax/front.png rename to graphics/pokemon/gen_1/snorlax/gigantamax/front.png diff --git a/graphics/pokemon/snorlax/gigantamax/icon.png b/graphics/pokemon/gen_1/snorlax/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/snorlax/gigantamax/icon.png rename to graphics/pokemon/gen_1/snorlax/gigantamax/icon.png diff --git a/graphics/pokemon/snorlax/gigantamax/normal.pal b/graphics/pokemon/gen_1/snorlax/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/snorlax/gigantamax/normal.pal rename to graphics/pokemon/gen_1/snorlax/gigantamax/normal.pal diff --git a/graphics/pokemon/snorlax/gigantamax/shiny.pal b/graphics/pokemon/gen_1/snorlax/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/snorlax/gigantamax/shiny.pal rename to graphics/pokemon/gen_1/snorlax/gigantamax/shiny.pal diff --git a/graphics/pokemon/snorlax/icon.png b/graphics/pokemon/gen_1/snorlax/icon.png similarity index 100% rename from graphics/pokemon/snorlax/icon.png rename to graphics/pokemon/gen_1/snorlax/icon.png diff --git a/graphics/pokemon/snorlax/normal.pal b/graphics/pokemon/gen_1/snorlax/normal.pal similarity index 100% rename from graphics/pokemon/snorlax/normal.pal rename to graphics/pokemon/gen_1/snorlax/normal.pal diff --git a/graphics/pokemon/snorlax/shiny.pal b/graphics/pokemon/gen_1/snorlax/shiny.pal similarity index 100% rename from graphics/pokemon/snorlax/shiny.pal rename to graphics/pokemon/gen_1/snorlax/shiny.pal diff --git a/graphics/pokemon/spearow/anim_front.png b/graphics/pokemon/gen_1/spearow/anim_front.png similarity index 100% rename from graphics/pokemon/spearow/anim_front.png rename to graphics/pokemon/gen_1/spearow/anim_front.png diff --git a/graphics/pokemon/spearow/back.png b/graphics/pokemon/gen_1/spearow/back.png similarity index 100% rename from graphics/pokemon/spearow/back.png rename to graphics/pokemon/gen_1/spearow/back.png diff --git a/graphics/pokemon/rookidee/footprint.png b/graphics/pokemon/gen_1/spearow/footprint.png similarity index 100% rename from graphics/pokemon/rookidee/footprint.png rename to graphics/pokemon/gen_1/spearow/footprint.png diff --git a/graphics/pokemon/spearow/icon.png b/graphics/pokemon/gen_1/spearow/icon.png similarity index 100% rename from graphics/pokemon/spearow/icon.png rename to graphics/pokemon/gen_1/spearow/icon.png diff --git a/graphics/pokemon/spearow/normal.pal b/graphics/pokemon/gen_1/spearow/normal.pal similarity index 100% rename from graphics/pokemon/spearow/normal.pal rename to graphics/pokemon/gen_1/spearow/normal.pal diff --git a/graphics/pokemon/spearow/shiny.pal b/graphics/pokemon/gen_1/spearow/shiny.pal similarity index 100% rename from graphics/pokemon/spearow/shiny.pal rename to graphics/pokemon/gen_1/spearow/shiny.pal diff --git a/graphics/pokemon/squirtle/anim_front.png b/graphics/pokemon/gen_1/squirtle/anim_front.png similarity index 100% rename from graphics/pokemon/squirtle/anim_front.png rename to graphics/pokemon/gen_1/squirtle/anim_front.png diff --git a/graphics/pokemon/squirtle/back.png b/graphics/pokemon/gen_1/squirtle/back.png similarity index 100% rename from graphics/pokemon/squirtle/back.png rename to graphics/pokemon/gen_1/squirtle/back.png diff --git a/graphics/pokemon/squirtle/footprint.png b/graphics/pokemon/gen_1/squirtle/footprint.png similarity index 100% rename from graphics/pokemon/squirtle/footprint.png rename to graphics/pokemon/gen_1/squirtle/footprint.png diff --git a/graphics/pokemon/squirtle/icon.png b/graphics/pokemon/gen_1/squirtle/icon.png similarity index 100% rename from graphics/pokemon/squirtle/icon.png rename to graphics/pokemon/gen_1/squirtle/icon.png diff --git a/graphics/pokemon/squirtle/normal.pal b/graphics/pokemon/gen_1/squirtle/normal.pal similarity index 100% rename from graphics/pokemon/squirtle/normal.pal rename to graphics/pokemon/gen_1/squirtle/normal.pal diff --git a/graphics/pokemon/squirtle/shiny.pal b/graphics/pokemon/gen_1/squirtle/shiny.pal similarity index 100% rename from graphics/pokemon/squirtle/shiny.pal rename to graphics/pokemon/gen_1/squirtle/shiny.pal diff --git a/graphics/pokemon/starmie/anim_front.png b/graphics/pokemon/gen_1/starmie/anim_front.png similarity index 100% rename from graphics/pokemon/starmie/anim_front.png rename to graphics/pokemon/gen_1/starmie/anim_front.png diff --git a/graphics/pokemon/starmie/back.png b/graphics/pokemon/gen_1/starmie/back.png similarity index 100% rename from graphics/pokemon/starmie/back.png rename to graphics/pokemon/gen_1/starmie/back.png diff --git a/graphics/pokemon/aromatisse/footprint.png b/graphics/pokemon/gen_1/starmie/footprint.png similarity index 100% rename from graphics/pokemon/aromatisse/footprint.png rename to graphics/pokemon/gen_1/starmie/footprint.png diff --git a/graphics/pokemon/starmie/icon.png b/graphics/pokemon/gen_1/starmie/icon.png similarity index 100% rename from graphics/pokemon/starmie/icon.png rename to graphics/pokemon/gen_1/starmie/icon.png diff --git a/graphics/pokemon/starmie/normal.pal b/graphics/pokemon/gen_1/starmie/normal.pal similarity index 100% rename from graphics/pokemon/starmie/normal.pal rename to graphics/pokemon/gen_1/starmie/normal.pal diff --git a/graphics/pokemon/starmie/shiny.pal b/graphics/pokemon/gen_1/starmie/shiny.pal similarity index 100% rename from graphics/pokemon/starmie/shiny.pal rename to graphics/pokemon/gen_1/starmie/shiny.pal diff --git a/graphics/pokemon/staryu/anim_front.png b/graphics/pokemon/gen_1/staryu/anim_front.png similarity index 100% rename from graphics/pokemon/staryu/anim_front.png rename to graphics/pokemon/gen_1/staryu/anim_front.png diff --git a/graphics/pokemon/staryu/back.png b/graphics/pokemon/gen_1/staryu/back.png similarity index 100% rename from graphics/pokemon/staryu/back.png rename to graphics/pokemon/gen_1/staryu/back.png diff --git a/graphics/pokemon/blipbug/footprint.png b/graphics/pokemon/gen_1/staryu/footprint.png similarity index 100% rename from graphics/pokemon/blipbug/footprint.png rename to graphics/pokemon/gen_1/staryu/footprint.png diff --git a/graphics/pokemon/staryu/icon.png b/graphics/pokemon/gen_1/staryu/icon.png similarity index 100% rename from graphics/pokemon/staryu/icon.png rename to graphics/pokemon/gen_1/staryu/icon.png diff --git a/graphics/pokemon/staryu/normal.pal b/graphics/pokemon/gen_1/staryu/normal.pal similarity index 100% rename from graphics/pokemon/staryu/normal.pal rename to graphics/pokemon/gen_1/staryu/normal.pal diff --git a/graphics/pokemon/staryu/shiny.pal b/graphics/pokemon/gen_1/staryu/shiny.pal similarity index 100% rename from graphics/pokemon/staryu/shiny.pal rename to graphics/pokemon/gen_1/staryu/shiny.pal diff --git a/graphics/pokemon/tangela/anim_front.png b/graphics/pokemon/gen_1/tangela/anim_front.png similarity index 100% rename from graphics/pokemon/tangela/anim_front.png rename to graphics/pokemon/gen_1/tangela/anim_front.png diff --git a/graphics/pokemon/tangela/back.png b/graphics/pokemon/gen_1/tangela/back.png similarity index 100% rename from graphics/pokemon/tangela/back.png rename to graphics/pokemon/gen_1/tangela/back.png diff --git a/graphics/pokemon/tangela/footprint.png b/graphics/pokemon/gen_1/tangela/footprint.png similarity index 100% rename from graphics/pokemon/tangela/footprint.png rename to graphics/pokemon/gen_1/tangela/footprint.png diff --git a/graphics/pokemon/tangela/icon.png b/graphics/pokemon/gen_1/tangela/icon.png similarity index 100% rename from graphics/pokemon/tangela/icon.png rename to graphics/pokemon/gen_1/tangela/icon.png diff --git a/graphics/pokemon/tangela/normal.pal b/graphics/pokemon/gen_1/tangela/normal.pal similarity index 100% rename from graphics/pokemon/tangela/normal.pal rename to graphics/pokemon/gen_1/tangela/normal.pal diff --git a/graphics/pokemon/tangela/shiny.pal b/graphics/pokemon/gen_1/tangela/shiny.pal similarity index 100% rename from graphics/pokemon/tangela/shiny.pal rename to graphics/pokemon/gen_1/tangela/shiny.pal diff --git a/graphics/pokemon/tauros/anim_front.png b/graphics/pokemon/gen_1/tauros/anim_front.png similarity index 100% rename from graphics/pokemon/tauros/anim_front.png rename to graphics/pokemon/gen_1/tauros/anim_front.png diff --git a/graphics/pokemon/tauros/back.png b/graphics/pokemon/gen_1/tauros/back.png similarity index 100% rename from graphics/pokemon/tauros/back.png rename to graphics/pokemon/gen_1/tauros/back.png diff --git a/graphics/pokemon/tauros/footprint.png b/graphics/pokemon/gen_1/tauros/footprint.png similarity index 100% rename from graphics/pokemon/tauros/footprint.png rename to graphics/pokemon/gen_1/tauros/footprint.png diff --git a/graphics/pokemon/tauros/icon.png b/graphics/pokemon/gen_1/tauros/icon.png similarity index 100% rename from graphics/pokemon/tauros/icon.png rename to graphics/pokemon/gen_1/tauros/icon.png diff --git a/graphics/pokemon/tauros/normal.pal b/graphics/pokemon/gen_1/tauros/normal.pal similarity index 100% rename from graphics/pokemon/tauros/normal.pal rename to graphics/pokemon/gen_1/tauros/normal.pal diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/back.png b/graphics/pokemon/gen_1/tauros/paldean_aqua_breed/back.png similarity index 100% rename from graphics/pokemon/tauros/paldean_aqua_breed/back.png rename to graphics/pokemon/gen_1/tauros/paldean_aqua_breed/back.png diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/front.png b/graphics/pokemon/gen_1/tauros/paldean_aqua_breed/front.png similarity index 100% rename from graphics/pokemon/tauros/paldean_aqua_breed/front.png rename to graphics/pokemon/gen_1/tauros/paldean_aqua_breed/front.png diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/icon.png b/graphics/pokemon/gen_1/tauros/paldean_aqua_breed/icon.png similarity index 100% rename from graphics/pokemon/tauros/paldean_aqua_breed/icon.png rename to graphics/pokemon/gen_1/tauros/paldean_aqua_breed/icon.png diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/normal.pal b/graphics/pokemon/gen_1/tauros/paldean_aqua_breed/normal.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_aqua_breed/normal.pal rename to graphics/pokemon/gen_1/tauros/paldean_aqua_breed/normal.pal diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/shiny.pal b/graphics/pokemon/gen_1/tauros/paldean_aqua_breed/shiny.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_aqua_breed/shiny.pal rename to graphics/pokemon/gen_1/tauros/paldean_aqua_breed/shiny.pal diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/back.png b/graphics/pokemon/gen_1/tauros/paldean_blaze_breed/back.png similarity index 100% rename from graphics/pokemon/tauros/paldean_blaze_breed/back.png rename to graphics/pokemon/gen_1/tauros/paldean_blaze_breed/back.png diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/front.ase b/graphics/pokemon/gen_1/tauros/paldean_blaze_breed/front.ase similarity index 100% rename from graphics/pokemon/tauros/paldean_blaze_breed/front.ase rename to graphics/pokemon/gen_1/tauros/paldean_blaze_breed/front.ase diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/front.png b/graphics/pokemon/gen_1/tauros/paldean_blaze_breed/front.png similarity index 100% rename from graphics/pokemon/tauros/paldean_blaze_breed/front.png rename to graphics/pokemon/gen_1/tauros/paldean_blaze_breed/front.png diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/icon.png b/graphics/pokemon/gen_1/tauros/paldean_blaze_breed/icon.png similarity index 100% rename from graphics/pokemon/tauros/paldean_blaze_breed/icon.png rename to graphics/pokemon/gen_1/tauros/paldean_blaze_breed/icon.png diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/normal.pal b/graphics/pokemon/gen_1/tauros/paldean_blaze_breed/normal.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_blaze_breed/normal.pal rename to graphics/pokemon/gen_1/tauros/paldean_blaze_breed/normal.pal diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/shiny.pal b/graphics/pokemon/gen_1/tauros/paldean_blaze_breed/shiny.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_blaze_breed/shiny.pal rename to graphics/pokemon/gen_1/tauros/paldean_blaze_breed/shiny.pal diff --git a/graphics/pokemon/tauros/paldean_combat_breed/back.png b/graphics/pokemon/gen_1/tauros/paldean_combat_breed/back.png similarity index 100% rename from graphics/pokemon/tauros/paldean_combat_breed/back.png rename to graphics/pokemon/gen_1/tauros/paldean_combat_breed/back.png diff --git a/graphics/pokemon/tauros/paldean_combat_breed/front.png b/graphics/pokemon/gen_1/tauros/paldean_combat_breed/front.png similarity index 100% rename from graphics/pokemon/tauros/paldean_combat_breed/front.png rename to graphics/pokemon/gen_1/tauros/paldean_combat_breed/front.png diff --git a/graphics/pokemon/tauros/paldean_combat_breed/icon.png b/graphics/pokemon/gen_1/tauros/paldean_combat_breed/icon.png similarity index 100% rename from graphics/pokemon/tauros/paldean_combat_breed/icon.png rename to graphics/pokemon/gen_1/tauros/paldean_combat_breed/icon.png diff --git a/graphics/pokemon/tauros/paldean_combat_breed/normal.pal b/graphics/pokemon/gen_1/tauros/paldean_combat_breed/normal.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_combat_breed/normal.pal rename to graphics/pokemon/gen_1/tauros/paldean_combat_breed/normal.pal diff --git a/graphics/pokemon/tauros/paldean_combat_breed/shiny.pal b/graphics/pokemon/gen_1/tauros/paldean_combat_breed/shiny.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_combat_breed/shiny.pal rename to graphics/pokemon/gen_1/tauros/paldean_combat_breed/shiny.pal diff --git a/graphics/pokemon/tauros/shiny.pal b/graphics/pokemon/gen_1/tauros/shiny.pal similarity index 100% rename from graphics/pokemon/tauros/shiny.pal rename to graphics/pokemon/gen_1/tauros/shiny.pal diff --git a/graphics/pokemon/tentacool/anim_front.png b/graphics/pokemon/gen_1/tentacool/anim_front.png similarity index 100% rename from graphics/pokemon/tentacool/anim_front.png rename to graphics/pokemon/gen_1/tentacool/anim_front.png diff --git a/graphics/pokemon/tentacool/back.png b/graphics/pokemon/gen_1/tentacool/back.png similarity index 100% rename from graphics/pokemon/tentacool/back.png rename to graphics/pokemon/gen_1/tentacool/back.png diff --git a/graphics/pokemon/cloyster/footprint.png b/graphics/pokemon/gen_1/tentacool/footprint.png similarity index 100% rename from graphics/pokemon/cloyster/footprint.png rename to graphics/pokemon/gen_1/tentacool/footprint.png diff --git a/graphics/pokemon/tentacool/icon.png b/graphics/pokemon/gen_1/tentacool/icon.png similarity index 100% rename from graphics/pokemon/tentacool/icon.png rename to graphics/pokemon/gen_1/tentacool/icon.png diff --git a/graphics/pokemon/tentacool/normal.pal b/graphics/pokemon/gen_1/tentacool/normal.pal similarity index 100% rename from graphics/pokemon/tentacool/normal.pal rename to graphics/pokemon/gen_1/tentacool/normal.pal diff --git a/graphics/pokemon/tentacool/shiny.pal b/graphics/pokemon/gen_1/tentacool/shiny.pal similarity index 100% rename from graphics/pokemon/tentacool/shiny.pal rename to graphics/pokemon/gen_1/tentacool/shiny.pal diff --git a/graphics/pokemon/tentacruel/anim_front.png b/graphics/pokemon/gen_1/tentacruel/anim_front.png similarity index 100% rename from graphics/pokemon/tentacruel/anim_front.png rename to graphics/pokemon/gen_1/tentacruel/anim_front.png diff --git a/graphics/pokemon/tentacruel/back.png b/graphics/pokemon/gen_1/tentacruel/back.png similarity index 100% rename from graphics/pokemon/tentacruel/back.png rename to graphics/pokemon/gen_1/tentacruel/back.png diff --git a/graphics/pokemon/cofagrigus/footprint.png b/graphics/pokemon/gen_1/tentacruel/footprint.png similarity index 100% rename from graphics/pokemon/cofagrigus/footprint.png rename to graphics/pokemon/gen_1/tentacruel/footprint.png diff --git a/graphics/pokemon/tentacruel/icon.png b/graphics/pokemon/gen_1/tentacruel/icon.png similarity index 100% rename from graphics/pokemon/tentacruel/icon.png rename to graphics/pokemon/gen_1/tentacruel/icon.png diff --git a/graphics/pokemon/tentacruel/normal.pal b/graphics/pokemon/gen_1/tentacruel/normal.pal similarity index 100% rename from graphics/pokemon/tentacruel/normal.pal rename to graphics/pokemon/gen_1/tentacruel/normal.pal diff --git a/graphics/pokemon/tentacruel/shiny.pal b/graphics/pokemon/gen_1/tentacruel/shiny.pal similarity index 100% rename from graphics/pokemon/tentacruel/shiny.pal rename to graphics/pokemon/gen_1/tentacruel/shiny.pal diff --git a/graphics/pokemon/vaporeon/anim_front.png b/graphics/pokemon/gen_1/vaporeon/anim_front.png similarity index 100% rename from graphics/pokemon/vaporeon/anim_front.png rename to graphics/pokemon/gen_1/vaporeon/anim_front.png diff --git a/graphics/pokemon/vaporeon/back.png b/graphics/pokemon/gen_1/vaporeon/back.png similarity index 100% rename from graphics/pokemon/vaporeon/back.png rename to graphics/pokemon/gen_1/vaporeon/back.png diff --git a/graphics/pokemon/incineroar/footprint.png b/graphics/pokemon/gen_1/vaporeon/footprint.png similarity index 100% rename from graphics/pokemon/incineroar/footprint.png rename to graphics/pokemon/gen_1/vaporeon/footprint.png diff --git a/graphics/pokemon/vaporeon/icon.png b/graphics/pokemon/gen_1/vaporeon/icon.png similarity index 100% rename from graphics/pokemon/vaporeon/icon.png rename to graphics/pokemon/gen_1/vaporeon/icon.png diff --git a/graphics/pokemon/vaporeon/normal.pal b/graphics/pokemon/gen_1/vaporeon/normal.pal similarity index 100% rename from graphics/pokemon/vaporeon/normal.pal rename to graphics/pokemon/gen_1/vaporeon/normal.pal diff --git a/graphics/pokemon/vaporeon/shiny.pal b/graphics/pokemon/gen_1/vaporeon/shiny.pal similarity index 100% rename from graphics/pokemon/vaporeon/shiny.pal rename to graphics/pokemon/gen_1/vaporeon/shiny.pal diff --git a/graphics/pokemon/venomoth/anim_front.png b/graphics/pokemon/gen_1/venomoth/anim_front.png similarity index 100% rename from graphics/pokemon/venomoth/anim_front.png rename to graphics/pokemon/gen_1/venomoth/anim_front.png diff --git a/graphics/pokemon/venomoth/back.png b/graphics/pokemon/gen_1/venomoth/back.png similarity index 100% rename from graphics/pokemon/venomoth/back.png rename to graphics/pokemon/gen_1/venomoth/back.png diff --git a/graphics/pokemon/bergmite/footprint.png b/graphics/pokemon/gen_1/venomoth/footprint.png similarity index 100% rename from graphics/pokemon/bergmite/footprint.png rename to graphics/pokemon/gen_1/venomoth/footprint.png diff --git a/graphics/pokemon/venomoth/icon.png b/graphics/pokemon/gen_1/venomoth/icon.png similarity index 100% rename from graphics/pokemon/venomoth/icon.png rename to graphics/pokemon/gen_1/venomoth/icon.png diff --git a/graphics/pokemon/venomoth/normal.pal b/graphics/pokemon/gen_1/venomoth/normal.pal similarity index 100% rename from graphics/pokemon/venomoth/normal.pal rename to graphics/pokemon/gen_1/venomoth/normal.pal diff --git a/graphics/pokemon/venomoth/shiny.pal b/graphics/pokemon/gen_1/venomoth/shiny.pal similarity index 100% rename from graphics/pokemon/venomoth/shiny.pal rename to graphics/pokemon/gen_1/venomoth/shiny.pal diff --git a/graphics/pokemon/venonat/anim_front.png b/graphics/pokemon/gen_1/venonat/anim_front.png similarity index 100% rename from graphics/pokemon/venonat/anim_front.png rename to graphics/pokemon/gen_1/venonat/anim_front.png diff --git a/graphics/pokemon/venonat/back.png b/graphics/pokemon/gen_1/venonat/back.png similarity index 100% rename from graphics/pokemon/venonat/back.png rename to graphics/pokemon/gen_1/venonat/back.png diff --git a/graphics/pokemon/venonat/footprint.png b/graphics/pokemon/gen_1/venonat/footprint.png similarity index 100% rename from graphics/pokemon/venonat/footprint.png rename to graphics/pokemon/gen_1/venonat/footprint.png diff --git a/graphics/pokemon/venonat/icon.png b/graphics/pokemon/gen_1/venonat/icon.png similarity index 100% rename from graphics/pokemon/venonat/icon.png rename to graphics/pokemon/gen_1/venonat/icon.png diff --git a/graphics/pokemon/venonat/normal.pal b/graphics/pokemon/gen_1/venonat/normal.pal similarity index 100% rename from graphics/pokemon/venonat/normal.pal rename to graphics/pokemon/gen_1/venonat/normal.pal diff --git a/graphics/pokemon/venonat/shiny.pal b/graphics/pokemon/gen_1/venonat/shiny.pal similarity index 100% rename from graphics/pokemon/venonat/shiny.pal rename to graphics/pokemon/gen_1/venonat/shiny.pal diff --git a/graphics/pokemon/venusaur/anim_front.png b/graphics/pokemon/gen_1/venusaur/anim_front.png similarity index 100% rename from graphics/pokemon/venusaur/anim_front.png rename to graphics/pokemon/gen_1/venusaur/anim_front.png diff --git a/graphics/pokemon/venusaur/anim_frontf.png b/graphics/pokemon/gen_1/venusaur/anim_frontf.png similarity index 100% rename from graphics/pokemon/venusaur/anim_frontf.png rename to graphics/pokemon/gen_1/venusaur/anim_frontf.png diff --git a/graphics/pokemon/venusaur/back.png b/graphics/pokemon/gen_1/venusaur/back.png similarity index 100% rename from graphics/pokemon/venusaur/back.png rename to graphics/pokemon/gen_1/venusaur/back.png diff --git a/graphics/pokemon/venusaur/backf.png b/graphics/pokemon/gen_1/venusaur/backf.png similarity index 100% rename from graphics/pokemon/venusaur/backf.png rename to graphics/pokemon/gen_1/venusaur/backf.png diff --git a/graphics/pokemon/venusaur/footprint.png b/graphics/pokemon/gen_1/venusaur/footprint.png similarity index 100% rename from graphics/pokemon/venusaur/footprint.png rename to graphics/pokemon/gen_1/venusaur/footprint.png diff --git a/graphics/pokemon/venusaur/gigantamax/back.png b/graphics/pokemon/gen_1/venusaur/gigantamax/back.png similarity index 100% rename from graphics/pokemon/venusaur/gigantamax/back.png rename to graphics/pokemon/gen_1/venusaur/gigantamax/back.png diff --git a/graphics/pokemon/venusaur/gigantamax/front.png b/graphics/pokemon/gen_1/venusaur/gigantamax/front.png similarity index 100% rename from graphics/pokemon/venusaur/gigantamax/front.png rename to graphics/pokemon/gen_1/venusaur/gigantamax/front.png diff --git a/graphics/pokemon/venusaur/gigantamax/icon.png b/graphics/pokemon/gen_1/venusaur/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/venusaur/gigantamax/icon.png rename to graphics/pokemon/gen_1/venusaur/gigantamax/icon.png diff --git a/graphics/pokemon/venusaur/gigantamax/normal.pal b/graphics/pokemon/gen_1/venusaur/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/venusaur/gigantamax/normal.pal rename to graphics/pokemon/gen_1/venusaur/gigantamax/normal.pal diff --git a/graphics/pokemon/venusaur/gigantamax/shiny.pal b/graphics/pokemon/gen_1/venusaur/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/venusaur/gigantamax/shiny.pal rename to graphics/pokemon/gen_1/venusaur/gigantamax/shiny.pal diff --git a/graphics/pokemon/venusaur/icon.png b/graphics/pokemon/gen_1/venusaur/icon.png similarity index 100% rename from graphics/pokemon/venusaur/icon.png rename to graphics/pokemon/gen_1/venusaur/icon.png diff --git a/graphics/pokemon/venusaur/mega/back.png b/graphics/pokemon/gen_1/venusaur/mega/back.png similarity index 100% rename from graphics/pokemon/venusaur/mega/back.png rename to graphics/pokemon/gen_1/venusaur/mega/back.png diff --git a/graphics/pokemon/venusaur/mega/front.png b/graphics/pokemon/gen_1/venusaur/mega/front.png similarity index 100% rename from graphics/pokemon/venusaur/mega/front.png rename to graphics/pokemon/gen_1/venusaur/mega/front.png diff --git a/graphics/pokemon/venusaur/mega/icon.png b/graphics/pokemon/gen_1/venusaur/mega/icon.png similarity index 100% rename from graphics/pokemon/venusaur/mega/icon.png rename to graphics/pokemon/gen_1/venusaur/mega/icon.png diff --git a/graphics/pokemon/venusaur/mega/normal.pal b/graphics/pokemon/gen_1/venusaur/mega/normal.pal similarity index 100% rename from graphics/pokemon/venusaur/mega/normal.pal rename to graphics/pokemon/gen_1/venusaur/mega/normal.pal diff --git a/graphics/pokemon/venusaur/mega/shiny.pal b/graphics/pokemon/gen_1/venusaur/mega/shiny.pal similarity index 100% rename from graphics/pokemon/venusaur/mega/shiny.pal rename to graphics/pokemon/gen_1/venusaur/mega/shiny.pal diff --git a/graphics/pokemon/venusaur/normal.pal b/graphics/pokemon/gen_1/venusaur/normal.pal similarity index 100% rename from graphics/pokemon/venusaur/normal.pal rename to graphics/pokemon/gen_1/venusaur/normal.pal diff --git a/graphics/pokemon/venusaur/shiny.pal b/graphics/pokemon/gen_1/venusaur/shiny.pal similarity index 100% rename from graphics/pokemon/venusaur/shiny.pal rename to graphics/pokemon/gen_1/venusaur/shiny.pal diff --git a/graphics/pokemon/victreebel/anim_front.png b/graphics/pokemon/gen_1/victreebel/anim_front.png similarity index 100% rename from graphics/pokemon/victreebel/anim_front.png rename to graphics/pokemon/gen_1/victreebel/anim_front.png diff --git a/graphics/pokemon/victreebel/back.png b/graphics/pokemon/gen_1/victreebel/back.png similarity index 100% rename from graphics/pokemon/victreebel/back.png rename to graphics/pokemon/gen_1/victreebel/back.png diff --git a/graphics/pokemon/combee/footprint.png b/graphics/pokemon/gen_1/victreebel/footprint.png similarity index 100% rename from graphics/pokemon/combee/footprint.png rename to graphics/pokemon/gen_1/victreebel/footprint.png diff --git a/graphics/pokemon/victreebel/icon.png b/graphics/pokemon/gen_1/victreebel/icon.png similarity index 100% rename from graphics/pokemon/victreebel/icon.png rename to graphics/pokemon/gen_1/victreebel/icon.png diff --git a/graphics/pokemon/victreebel/normal.pal b/graphics/pokemon/gen_1/victreebel/normal.pal similarity index 100% rename from graphics/pokemon/victreebel/normal.pal rename to graphics/pokemon/gen_1/victreebel/normal.pal diff --git a/graphics/pokemon/victreebel/shiny.pal b/graphics/pokemon/gen_1/victreebel/shiny.pal similarity index 100% rename from graphics/pokemon/victreebel/shiny.pal rename to graphics/pokemon/gen_1/victreebel/shiny.pal diff --git a/graphics/pokemon/vileplume/anim_front.png b/graphics/pokemon/gen_1/vileplume/anim_front.png similarity index 100% rename from graphics/pokemon/vileplume/anim_front.png rename to graphics/pokemon/gen_1/vileplume/anim_front.png diff --git a/graphics/pokemon/vileplume/anim_frontf.png b/graphics/pokemon/gen_1/vileplume/anim_frontf.png similarity index 100% rename from graphics/pokemon/vileplume/anim_frontf.png rename to graphics/pokemon/gen_1/vileplume/anim_frontf.png diff --git a/graphics/pokemon/vileplume/back.png b/graphics/pokemon/gen_1/vileplume/back.png similarity index 100% rename from graphics/pokemon/vileplume/back.png rename to graphics/pokemon/gen_1/vileplume/back.png diff --git a/graphics/pokemon/vileplume/backf.png b/graphics/pokemon/gen_1/vileplume/backf.png similarity index 100% rename from graphics/pokemon/vileplume/backf.png rename to graphics/pokemon/gen_1/vileplume/backf.png diff --git a/graphics/pokemon/vileplume/footprint.png b/graphics/pokemon/gen_1/vileplume/footprint.png similarity index 100% rename from graphics/pokemon/vileplume/footprint.png rename to graphics/pokemon/gen_1/vileplume/footprint.png diff --git a/graphics/pokemon/vileplume/icon.png b/graphics/pokemon/gen_1/vileplume/icon.png similarity index 100% rename from graphics/pokemon/vileplume/icon.png rename to graphics/pokemon/gen_1/vileplume/icon.png diff --git a/graphics/pokemon/vileplume/normal.pal b/graphics/pokemon/gen_1/vileplume/normal.pal similarity index 100% rename from graphics/pokemon/vileplume/normal.pal rename to graphics/pokemon/gen_1/vileplume/normal.pal diff --git a/graphics/pokemon/vileplume/shiny.pal b/graphics/pokemon/gen_1/vileplume/shiny.pal similarity index 100% rename from graphics/pokemon/vileplume/shiny.pal rename to graphics/pokemon/gen_1/vileplume/shiny.pal diff --git a/graphics/pokemon/voltorb/anim_front.png b/graphics/pokemon/gen_1/voltorb/anim_front.png similarity index 100% rename from graphics/pokemon/voltorb/anim_front.png rename to graphics/pokemon/gen_1/voltorb/anim_front.png diff --git a/graphics/pokemon/voltorb/back.png b/graphics/pokemon/gen_1/voltorb/back.png similarity index 100% rename from graphics/pokemon/voltorb/back.png rename to graphics/pokemon/gen_1/voltorb/back.png diff --git a/graphics/pokemon/comfey/footprint.png b/graphics/pokemon/gen_1/voltorb/footprint.png similarity index 100% rename from graphics/pokemon/comfey/footprint.png rename to graphics/pokemon/gen_1/voltorb/footprint.png diff --git a/graphics/pokemon/voltorb/hisuian/back.png b/graphics/pokemon/gen_1/voltorb/hisuian/back.png similarity index 100% rename from graphics/pokemon/voltorb/hisuian/back.png rename to graphics/pokemon/gen_1/voltorb/hisuian/back.png diff --git a/graphics/pokemon/voltorb/hisuian/front.png b/graphics/pokemon/gen_1/voltorb/hisuian/front.png similarity index 100% rename from graphics/pokemon/voltorb/hisuian/front.png rename to graphics/pokemon/gen_1/voltorb/hisuian/front.png diff --git a/graphics/pokemon/voltorb/hisuian/icon.png b/graphics/pokemon/gen_1/voltorb/hisuian/icon.png similarity index 100% rename from graphics/pokemon/voltorb/hisuian/icon.png rename to graphics/pokemon/gen_1/voltorb/hisuian/icon.png diff --git a/graphics/pokemon/voltorb/hisuian/normal.pal b/graphics/pokemon/gen_1/voltorb/hisuian/normal.pal similarity index 100% rename from graphics/pokemon/voltorb/hisuian/normal.pal rename to graphics/pokemon/gen_1/voltorb/hisuian/normal.pal diff --git a/graphics/pokemon/voltorb/hisuian/shiny.pal b/graphics/pokemon/gen_1/voltorb/hisuian/shiny.pal similarity index 100% rename from graphics/pokemon/voltorb/hisuian/shiny.pal rename to graphics/pokemon/gen_1/voltorb/hisuian/shiny.pal diff --git a/graphics/pokemon/voltorb/icon.png b/graphics/pokemon/gen_1/voltorb/icon.png similarity index 100% rename from graphics/pokemon/voltorb/icon.png rename to graphics/pokemon/gen_1/voltorb/icon.png diff --git a/graphics/pokemon/voltorb/normal.pal b/graphics/pokemon/gen_1/voltorb/normal.pal similarity index 100% rename from graphics/pokemon/voltorb/normal.pal rename to graphics/pokemon/gen_1/voltorb/normal.pal diff --git a/graphics/pokemon/voltorb/shiny.pal b/graphics/pokemon/gen_1/voltorb/shiny.pal similarity index 100% rename from graphics/pokemon/voltorb/shiny.pal rename to graphics/pokemon/gen_1/voltorb/shiny.pal diff --git a/graphics/pokemon/vulpix/alolan/back.png b/graphics/pokemon/gen_1/vulpix/alolan/back.png similarity index 100% rename from graphics/pokemon/vulpix/alolan/back.png rename to graphics/pokemon/gen_1/vulpix/alolan/back.png diff --git a/graphics/pokemon/vulpix/alolan/front.png b/graphics/pokemon/gen_1/vulpix/alolan/front.png similarity index 100% rename from graphics/pokemon/vulpix/alolan/front.png rename to graphics/pokemon/gen_1/vulpix/alolan/front.png diff --git a/graphics/pokemon/vulpix/alolan/icon.png b/graphics/pokemon/gen_1/vulpix/alolan/icon.png similarity index 100% rename from graphics/pokemon/vulpix/alolan/icon.png rename to graphics/pokemon/gen_1/vulpix/alolan/icon.png diff --git a/graphics/pokemon/vulpix/alolan/normal.pal b/graphics/pokemon/gen_1/vulpix/alolan/normal.pal similarity index 100% rename from graphics/pokemon/vulpix/alolan/normal.pal rename to graphics/pokemon/gen_1/vulpix/alolan/normal.pal diff --git a/graphics/pokemon/vulpix/alolan/shiny.pal b/graphics/pokemon/gen_1/vulpix/alolan/shiny.pal similarity index 100% rename from graphics/pokemon/vulpix/alolan/shiny.pal rename to graphics/pokemon/gen_1/vulpix/alolan/shiny.pal diff --git a/graphics/pokemon/vulpix/anim_front.png b/graphics/pokemon/gen_1/vulpix/anim_front.png similarity index 100% rename from graphics/pokemon/vulpix/anim_front.png rename to graphics/pokemon/gen_1/vulpix/anim_front.png diff --git a/graphics/pokemon/vulpix/back.png b/graphics/pokemon/gen_1/vulpix/back.png similarity index 100% rename from graphics/pokemon/vulpix/back.png rename to graphics/pokemon/gen_1/vulpix/back.png diff --git a/graphics/pokemon/vulpix/footprint.png b/graphics/pokemon/gen_1/vulpix/footprint.png similarity index 100% rename from graphics/pokemon/vulpix/footprint.png rename to graphics/pokemon/gen_1/vulpix/footprint.png diff --git a/graphics/pokemon/vulpix/icon.png b/graphics/pokemon/gen_1/vulpix/icon.png similarity index 100% rename from graphics/pokemon/vulpix/icon.png rename to graphics/pokemon/gen_1/vulpix/icon.png diff --git a/graphics/pokemon/vulpix/normal.pal b/graphics/pokemon/gen_1/vulpix/normal.pal similarity index 100% rename from graphics/pokemon/vulpix/normal.pal rename to graphics/pokemon/gen_1/vulpix/normal.pal diff --git a/graphics/pokemon/vulpix/shiny.pal b/graphics/pokemon/gen_1/vulpix/shiny.pal similarity index 100% rename from graphics/pokemon/vulpix/shiny.pal rename to graphics/pokemon/gen_1/vulpix/shiny.pal diff --git a/graphics/pokemon/wartortle/anim_front.png b/graphics/pokemon/gen_1/wartortle/anim_front.png similarity index 100% rename from graphics/pokemon/wartortle/anim_front.png rename to graphics/pokemon/gen_1/wartortle/anim_front.png diff --git a/graphics/pokemon/wartortle/back.png b/graphics/pokemon/gen_1/wartortle/back.png similarity index 100% rename from graphics/pokemon/wartortle/back.png rename to graphics/pokemon/gen_1/wartortle/back.png diff --git a/graphics/pokemon/wartortle/footprint.png b/graphics/pokemon/gen_1/wartortle/footprint.png similarity index 100% rename from graphics/pokemon/wartortle/footprint.png rename to graphics/pokemon/gen_1/wartortle/footprint.png diff --git a/graphics/pokemon/wartortle/icon.png b/graphics/pokemon/gen_1/wartortle/icon.png similarity index 100% rename from graphics/pokemon/wartortle/icon.png rename to graphics/pokemon/gen_1/wartortle/icon.png diff --git a/graphics/pokemon/wartortle/normal.pal b/graphics/pokemon/gen_1/wartortle/normal.pal similarity index 100% rename from graphics/pokemon/wartortle/normal.pal rename to graphics/pokemon/gen_1/wartortle/normal.pal diff --git a/graphics/pokemon/wartortle/shiny.pal b/graphics/pokemon/gen_1/wartortle/shiny.pal similarity index 100% rename from graphics/pokemon/wartortle/shiny.pal rename to graphics/pokemon/gen_1/wartortle/shiny.pal diff --git a/graphics/pokemon/weedle/anim_front.png b/graphics/pokemon/gen_1/weedle/anim_front.png similarity index 100% rename from graphics/pokemon/weedle/anim_front.png rename to graphics/pokemon/gen_1/weedle/anim_front.png diff --git a/graphics/pokemon/weedle/back.png b/graphics/pokemon/gen_1/weedle/back.png similarity index 100% rename from graphics/pokemon/weedle/back.png rename to graphics/pokemon/gen_1/weedle/back.png diff --git a/graphics/pokemon/bounsweet/footprint.png b/graphics/pokemon/gen_1/weedle/footprint.png similarity index 100% rename from graphics/pokemon/bounsweet/footprint.png rename to graphics/pokemon/gen_1/weedle/footprint.png diff --git a/graphics/pokemon/weedle/icon.png b/graphics/pokemon/gen_1/weedle/icon.png similarity index 100% rename from graphics/pokemon/weedle/icon.png rename to graphics/pokemon/gen_1/weedle/icon.png diff --git a/graphics/pokemon/weedle/normal.pal b/graphics/pokemon/gen_1/weedle/normal.pal similarity index 100% rename from graphics/pokemon/weedle/normal.pal rename to graphics/pokemon/gen_1/weedle/normal.pal diff --git a/graphics/pokemon/weedle/shiny.pal b/graphics/pokemon/gen_1/weedle/shiny.pal similarity index 100% rename from graphics/pokemon/weedle/shiny.pal rename to graphics/pokemon/gen_1/weedle/shiny.pal diff --git a/graphics/pokemon/weepinbell/anim_front.png b/graphics/pokemon/gen_1/weepinbell/anim_front.png similarity index 100% rename from graphics/pokemon/weepinbell/anim_front.png rename to graphics/pokemon/gen_1/weepinbell/anim_front.png diff --git a/graphics/pokemon/weepinbell/back.png b/graphics/pokemon/gen_1/weepinbell/back.png similarity index 100% rename from graphics/pokemon/weepinbell/back.png rename to graphics/pokemon/gen_1/weepinbell/back.png diff --git a/graphics/pokemon/cosmoem/footprint.png b/graphics/pokemon/gen_1/weepinbell/footprint.png similarity index 100% rename from graphics/pokemon/cosmoem/footprint.png rename to graphics/pokemon/gen_1/weepinbell/footprint.png diff --git a/graphics/pokemon/weepinbell/icon.png b/graphics/pokemon/gen_1/weepinbell/icon.png similarity index 100% rename from graphics/pokemon/weepinbell/icon.png rename to graphics/pokemon/gen_1/weepinbell/icon.png diff --git a/graphics/pokemon/weepinbell/normal.pal b/graphics/pokemon/gen_1/weepinbell/normal.pal similarity index 100% rename from graphics/pokemon/weepinbell/normal.pal rename to graphics/pokemon/gen_1/weepinbell/normal.pal diff --git a/graphics/pokemon/weepinbell/shiny.pal b/graphics/pokemon/gen_1/weepinbell/shiny.pal similarity index 100% rename from graphics/pokemon/weepinbell/shiny.pal rename to graphics/pokemon/gen_1/weepinbell/shiny.pal diff --git a/graphics/pokemon/weezing/anim_front.png b/graphics/pokemon/gen_1/weezing/anim_front.png similarity index 100% rename from graphics/pokemon/weezing/anim_front.png rename to graphics/pokemon/gen_1/weezing/anim_front.png diff --git a/graphics/pokemon/weezing/back.png b/graphics/pokemon/gen_1/weezing/back.png similarity index 100% rename from graphics/pokemon/weezing/back.png rename to graphics/pokemon/gen_1/weezing/back.png diff --git a/graphics/pokemon/cosmog/footprint.png b/graphics/pokemon/gen_1/weezing/footprint.png similarity index 100% rename from graphics/pokemon/cosmog/footprint.png rename to graphics/pokemon/gen_1/weezing/footprint.png diff --git a/graphics/pokemon/weezing/galarian/back.png b/graphics/pokemon/gen_1/weezing/galarian/back.png similarity index 100% rename from graphics/pokemon/weezing/galarian/back.png rename to graphics/pokemon/gen_1/weezing/galarian/back.png diff --git a/graphics/pokemon/weezing/galarian/front.png b/graphics/pokemon/gen_1/weezing/galarian/front.png similarity index 100% rename from graphics/pokemon/weezing/galarian/front.png rename to graphics/pokemon/gen_1/weezing/galarian/front.png diff --git a/graphics/pokemon/weezing/galarian/icon.png b/graphics/pokemon/gen_1/weezing/galarian/icon.png similarity index 100% rename from graphics/pokemon/weezing/galarian/icon.png rename to graphics/pokemon/gen_1/weezing/galarian/icon.png diff --git a/graphics/pokemon/weezing/galarian/normal.pal b/graphics/pokemon/gen_1/weezing/galarian/normal.pal similarity index 100% rename from graphics/pokemon/weezing/galarian/normal.pal rename to graphics/pokemon/gen_1/weezing/galarian/normal.pal diff --git a/graphics/pokemon/weezing/galarian/shiny.pal b/graphics/pokemon/gen_1/weezing/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/weezing/galarian/shiny.pal rename to graphics/pokemon/gen_1/weezing/galarian/shiny.pal diff --git a/graphics/pokemon/weezing/icon.png b/graphics/pokemon/gen_1/weezing/icon.png similarity index 100% rename from graphics/pokemon/weezing/icon.png rename to graphics/pokemon/gen_1/weezing/icon.png diff --git a/graphics/pokemon/weezing/normal.pal b/graphics/pokemon/gen_1/weezing/normal.pal similarity index 100% rename from graphics/pokemon/weezing/normal.pal rename to graphics/pokemon/gen_1/weezing/normal.pal diff --git a/graphics/pokemon/weezing/shiny.pal b/graphics/pokemon/gen_1/weezing/shiny.pal similarity index 100% rename from graphics/pokemon/weezing/shiny.pal rename to graphics/pokemon/gen_1/weezing/shiny.pal diff --git a/graphics/pokemon/wigglytuff/anim_front.png b/graphics/pokemon/gen_1/wigglytuff/anim_front.png similarity index 100% rename from graphics/pokemon/wigglytuff/anim_front.png rename to graphics/pokemon/gen_1/wigglytuff/anim_front.png diff --git a/graphics/pokemon/wigglytuff/back.png b/graphics/pokemon/gen_1/wigglytuff/back.png similarity index 100% rename from graphics/pokemon/wigglytuff/back.png rename to graphics/pokemon/gen_1/wigglytuff/back.png diff --git a/graphics/pokemon/wigglytuff/footprint.png b/graphics/pokemon/gen_1/wigglytuff/footprint.png similarity index 100% rename from graphics/pokemon/wigglytuff/footprint.png rename to graphics/pokemon/gen_1/wigglytuff/footprint.png diff --git a/graphics/pokemon/wigglytuff/icon.png b/graphics/pokemon/gen_1/wigglytuff/icon.png similarity index 100% rename from graphics/pokemon/wigglytuff/icon.png rename to graphics/pokemon/gen_1/wigglytuff/icon.png diff --git a/graphics/pokemon/wigglytuff/normal.pal b/graphics/pokemon/gen_1/wigglytuff/normal.pal similarity index 100% rename from graphics/pokemon/wigglytuff/normal.pal rename to graphics/pokemon/gen_1/wigglytuff/normal.pal diff --git a/graphics/pokemon/wigglytuff/shiny.pal b/graphics/pokemon/gen_1/wigglytuff/shiny.pal similarity index 100% rename from graphics/pokemon/wigglytuff/shiny.pal rename to graphics/pokemon/gen_1/wigglytuff/shiny.pal diff --git a/graphics/pokemon/zapdos/anim_front.png b/graphics/pokemon/gen_1/zapdos/anim_front.png similarity index 100% rename from graphics/pokemon/zapdos/anim_front.png rename to graphics/pokemon/gen_1/zapdos/anim_front.png diff --git a/graphics/pokemon/zapdos/back.png b/graphics/pokemon/gen_1/zapdos/back.png similarity index 100% rename from graphics/pokemon/zapdos/back.png rename to graphics/pokemon/gen_1/zapdos/back.png diff --git a/graphics/pokemon/zapdos/footprint.png b/graphics/pokemon/gen_1/zapdos/footprint.png similarity index 100% rename from graphics/pokemon/zapdos/footprint.png rename to graphics/pokemon/gen_1/zapdos/footprint.png diff --git a/graphics/pokemon/zapdos/galarian/back.png b/graphics/pokemon/gen_1/zapdos/galarian/back.png similarity index 100% rename from graphics/pokemon/zapdos/galarian/back.png rename to graphics/pokemon/gen_1/zapdos/galarian/back.png diff --git a/graphics/pokemon/zapdos/galarian/front.png b/graphics/pokemon/gen_1/zapdos/galarian/front.png similarity index 100% rename from graphics/pokemon/zapdos/galarian/front.png rename to graphics/pokemon/gen_1/zapdos/galarian/front.png diff --git a/graphics/pokemon/zapdos/galarian/icon.png b/graphics/pokemon/gen_1/zapdos/galarian/icon.png similarity index 100% rename from graphics/pokemon/zapdos/galarian/icon.png rename to graphics/pokemon/gen_1/zapdos/galarian/icon.png diff --git a/graphics/pokemon/zapdos/galarian/normal.pal b/graphics/pokemon/gen_1/zapdos/galarian/normal.pal similarity index 100% rename from graphics/pokemon/zapdos/galarian/normal.pal rename to graphics/pokemon/gen_1/zapdos/galarian/normal.pal diff --git a/graphics/pokemon/zapdos/galarian/shiny.pal b/graphics/pokemon/gen_1/zapdos/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/zapdos/galarian/shiny.pal rename to graphics/pokemon/gen_1/zapdos/galarian/shiny.pal diff --git a/graphics/pokemon/zapdos/icon.png b/graphics/pokemon/gen_1/zapdos/icon.png similarity index 100% rename from graphics/pokemon/zapdos/icon.png rename to graphics/pokemon/gen_1/zapdos/icon.png diff --git a/graphics/pokemon/zapdos/normal.pal b/graphics/pokemon/gen_1/zapdos/normal.pal similarity index 100% rename from graphics/pokemon/zapdos/normal.pal rename to graphics/pokemon/gen_1/zapdos/normal.pal diff --git a/graphics/pokemon/zapdos/shiny.pal b/graphics/pokemon/gen_1/zapdos/shiny.pal similarity index 100% rename from graphics/pokemon/zapdos/shiny.pal rename to graphics/pokemon/gen_1/zapdos/shiny.pal diff --git a/graphics/pokemon/zubat/anim_front.png b/graphics/pokemon/gen_1/zubat/anim_front.png similarity index 100% rename from graphics/pokemon/zubat/anim_front.png rename to graphics/pokemon/gen_1/zubat/anim_front.png diff --git a/graphics/pokemon/zubat/anim_frontf.png b/graphics/pokemon/gen_1/zubat/anim_frontf.png similarity index 100% rename from graphics/pokemon/zubat/anim_frontf.png rename to graphics/pokemon/gen_1/zubat/anim_frontf.png diff --git a/graphics/pokemon/zubat/back.png b/graphics/pokemon/gen_1/zubat/back.png similarity index 100% rename from graphics/pokemon/zubat/back.png rename to graphics/pokemon/gen_1/zubat/back.png diff --git a/graphics/pokemon/zubat/backf.png b/graphics/pokemon/gen_1/zubat/backf.png similarity index 100% rename from graphics/pokemon/zubat/backf.png rename to graphics/pokemon/gen_1/zubat/backf.png diff --git a/graphics/pokemon/cottonee/footprint.png b/graphics/pokemon/gen_1/zubat/footprint.png similarity index 100% rename from graphics/pokemon/cottonee/footprint.png rename to graphics/pokemon/gen_1/zubat/footprint.png diff --git a/graphics/pokemon/zubat/icon.png b/graphics/pokemon/gen_1/zubat/icon.png similarity index 100% rename from graphics/pokemon/zubat/icon.png rename to graphics/pokemon/gen_1/zubat/icon.png diff --git a/graphics/pokemon/zubat/normal.pal b/graphics/pokemon/gen_1/zubat/normal.pal similarity index 100% rename from graphics/pokemon/zubat/normal.pal rename to graphics/pokemon/gen_1/zubat/normal.pal diff --git a/graphics/pokemon/zubat/shiny.pal b/graphics/pokemon/gen_1/zubat/shiny.pal similarity index 100% rename from graphics/pokemon/zubat/shiny.pal rename to graphics/pokemon/gen_1/zubat/shiny.pal diff --git a/graphics/pokemon/aipom/anim_front.png b/graphics/pokemon/gen_2/aipom/anim_front.png similarity index 100% rename from graphics/pokemon/aipom/anim_front.png rename to graphics/pokemon/gen_2/aipom/anim_front.png diff --git a/graphics/pokemon/aipom/anim_frontf.png b/graphics/pokemon/gen_2/aipom/anim_frontf.png similarity index 100% rename from graphics/pokemon/aipom/anim_frontf.png rename to graphics/pokemon/gen_2/aipom/anim_frontf.png diff --git a/graphics/pokemon/aipom/back.png b/graphics/pokemon/gen_2/aipom/back.png similarity index 100% rename from graphics/pokemon/aipom/back.png rename to graphics/pokemon/gen_2/aipom/back.png diff --git a/graphics/pokemon/aipom/backf.png b/graphics/pokemon/gen_2/aipom/backf.png similarity index 100% rename from graphics/pokemon/aipom/backf.png rename to graphics/pokemon/gen_2/aipom/backf.png diff --git a/graphics/pokemon/aipom/footprint.png b/graphics/pokemon/gen_2/aipom/footprint.png similarity index 100% rename from graphics/pokemon/aipom/footprint.png rename to graphics/pokemon/gen_2/aipom/footprint.png diff --git a/graphics/pokemon/aipom/icon.png b/graphics/pokemon/gen_2/aipom/icon.png similarity index 100% rename from graphics/pokemon/aipom/icon.png rename to graphics/pokemon/gen_2/aipom/icon.png diff --git a/graphics/pokemon/aipom/normal.pal b/graphics/pokemon/gen_2/aipom/normal.pal similarity index 100% rename from graphics/pokemon/aipom/normal.pal rename to graphics/pokemon/gen_2/aipom/normal.pal diff --git a/graphics/pokemon/aipom/shiny.pal b/graphics/pokemon/gen_2/aipom/shiny.pal similarity index 100% rename from graphics/pokemon/aipom/shiny.pal rename to graphics/pokemon/gen_2/aipom/shiny.pal diff --git a/graphics/pokemon/ampharos/anim_front.png b/graphics/pokemon/gen_2/ampharos/anim_front.png similarity index 100% rename from graphics/pokemon/ampharos/anim_front.png rename to graphics/pokemon/gen_2/ampharos/anim_front.png diff --git a/graphics/pokemon/ampharos/back.png b/graphics/pokemon/gen_2/ampharos/back.png similarity index 100% rename from graphics/pokemon/ampharos/back.png rename to graphics/pokemon/gen_2/ampharos/back.png diff --git a/graphics/pokemon/ampharos/footprint.png b/graphics/pokemon/gen_2/ampharos/footprint.png similarity index 100% rename from graphics/pokemon/ampharos/footprint.png rename to graphics/pokemon/gen_2/ampharos/footprint.png diff --git a/graphics/pokemon/ampharos/icon.png b/graphics/pokemon/gen_2/ampharos/icon.png similarity index 100% rename from graphics/pokemon/ampharos/icon.png rename to graphics/pokemon/gen_2/ampharos/icon.png diff --git a/graphics/pokemon/ampharos/mega/back.png b/graphics/pokemon/gen_2/ampharos/mega/back.png similarity index 100% rename from graphics/pokemon/ampharos/mega/back.png rename to graphics/pokemon/gen_2/ampharos/mega/back.png diff --git a/graphics/pokemon/ampharos/mega/front.png b/graphics/pokemon/gen_2/ampharos/mega/front.png similarity index 100% rename from graphics/pokemon/ampharos/mega/front.png rename to graphics/pokemon/gen_2/ampharos/mega/front.png diff --git a/graphics/pokemon/ampharos/mega/icon.png b/graphics/pokemon/gen_2/ampharos/mega/icon.png similarity index 100% rename from graphics/pokemon/ampharos/mega/icon.png rename to graphics/pokemon/gen_2/ampharos/mega/icon.png diff --git a/graphics/pokemon/ampharos/mega/normal.pal b/graphics/pokemon/gen_2/ampharos/mega/normal.pal similarity index 100% rename from graphics/pokemon/ampharos/mega/normal.pal rename to graphics/pokemon/gen_2/ampharos/mega/normal.pal diff --git a/graphics/pokemon/ampharos/mega/shiny.pal b/graphics/pokemon/gen_2/ampharos/mega/shiny.pal similarity index 100% rename from graphics/pokemon/ampharos/mega/shiny.pal rename to graphics/pokemon/gen_2/ampharos/mega/shiny.pal diff --git a/graphics/pokemon/ampharos/normal.pal b/graphics/pokemon/gen_2/ampharos/normal.pal similarity index 100% rename from graphics/pokemon/ampharos/normal.pal rename to graphics/pokemon/gen_2/ampharos/normal.pal diff --git a/graphics/pokemon/ampharos/shiny.pal b/graphics/pokemon/gen_2/ampharos/shiny.pal similarity index 100% rename from graphics/pokemon/ampharos/shiny.pal rename to graphics/pokemon/gen_2/ampharos/shiny.pal diff --git a/graphics/pokemon/ariados/anim_front.png b/graphics/pokemon/gen_2/ariados/anim_front.png similarity index 100% rename from graphics/pokemon/ariados/anim_front.png rename to graphics/pokemon/gen_2/ariados/anim_front.png diff --git a/graphics/pokemon/ariados/back.png b/graphics/pokemon/gen_2/ariados/back.png similarity index 100% rename from graphics/pokemon/ariados/back.png rename to graphics/pokemon/gen_2/ariados/back.png diff --git a/graphics/pokemon/ariados/footprint.png b/graphics/pokemon/gen_2/ariados/footprint.png similarity index 100% rename from graphics/pokemon/ariados/footprint.png rename to graphics/pokemon/gen_2/ariados/footprint.png diff --git a/graphics/pokemon/ariados/icon.png b/graphics/pokemon/gen_2/ariados/icon.png similarity index 100% rename from graphics/pokemon/ariados/icon.png rename to graphics/pokemon/gen_2/ariados/icon.png diff --git a/graphics/pokemon/ariados/normal.pal b/graphics/pokemon/gen_2/ariados/normal.pal similarity index 100% rename from graphics/pokemon/ariados/normal.pal rename to graphics/pokemon/gen_2/ariados/normal.pal diff --git a/graphics/pokemon/ariados/shiny.pal b/graphics/pokemon/gen_2/ariados/shiny.pal similarity index 100% rename from graphics/pokemon/ariados/shiny.pal rename to graphics/pokemon/gen_2/ariados/shiny.pal diff --git a/graphics/pokemon/azumarill/anim_front.png b/graphics/pokemon/gen_2/azumarill/anim_front.png similarity index 100% rename from graphics/pokemon/azumarill/anim_front.png rename to graphics/pokemon/gen_2/azumarill/anim_front.png diff --git a/graphics/pokemon/azumarill/back.png b/graphics/pokemon/gen_2/azumarill/back.png similarity index 100% rename from graphics/pokemon/azumarill/back.png rename to graphics/pokemon/gen_2/azumarill/back.png diff --git a/graphics/pokemon/azumarill/footprint.png b/graphics/pokemon/gen_2/azumarill/footprint.png similarity index 100% rename from graphics/pokemon/azumarill/footprint.png rename to graphics/pokemon/gen_2/azumarill/footprint.png diff --git a/graphics/pokemon/azumarill/icon.png b/graphics/pokemon/gen_2/azumarill/icon.png similarity index 100% rename from graphics/pokemon/azumarill/icon.png rename to graphics/pokemon/gen_2/azumarill/icon.png diff --git a/graphics/pokemon/azumarill/normal.pal b/graphics/pokemon/gen_2/azumarill/normal.pal similarity index 100% rename from graphics/pokemon/azumarill/normal.pal rename to graphics/pokemon/gen_2/azumarill/normal.pal diff --git a/graphics/pokemon/azumarill/shiny.pal b/graphics/pokemon/gen_2/azumarill/shiny.pal similarity index 100% rename from graphics/pokemon/azumarill/shiny.pal rename to graphics/pokemon/gen_2/azumarill/shiny.pal diff --git a/graphics/pokemon/bayleef/anim_front.png b/graphics/pokemon/gen_2/bayleef/anim_front.png similarity index 100% rename from graphics/pokemon/bayleef/anim_front.png rename to graphics/pokemon/gen_2/bayleef/anim_front.png diff --git a/graphics/pokemon/bayleef/back.png b/graphics/pokemon/gen_2/bayleef/back.png similarity index 100% rename from graphics/pokemon/bayleef/back.png rename to graphics/pokemon/gen_2/bayleef/back.png diff --git a/graphics/pokemon/bayleef/footprint.png b/graphics/pokemon/gen_2/bayleef/footprint.png similarity index 100% rename from graphics/pokemon/bayleef/footprint.png rename to graphics/pokemon/gen_2/bayleef/footprint.png diff --git a/graphics/pokemon/bayleef/icon.png b/graphics/pokemon/gen_2/bayleef/icon.png similarity index 100% rename from graphics/pokemon/bayleef/icon.png rename to graphics/pokemon/gen_2/bayleef/icon.png diff --git a/graphics/pokemon/bayleef/normal.pal b/graphics/pokemon/gen_2/bayleef/normal.pal similarity index 100% rename from graphics/pokemon/bayleef/normal.pal rename to graphics/pokemon/gen_2/bayleef/normal.pal diff --git a/graphics/pokemon/bayleef/shiny.pal b/graphics/pokemon/gen_2/bayleef/shiny.pal similarity index 100% rename from graphics/pokemon/bayleef/shiny.pal rename to graphics/pokemon/gen_2/bayleef/shiny.pal diff --git a/graphics/pokemon/bellossom/anim_front.png b/graphics/pokemon/gen_2/bellossom/anim_front.png similarity index 100% rename from graphics/pokemon/bellossom/anim_front.png rename to graphics/pokemon/gen_2/bellossom/anim_front.png diff --git a/graphics/pokemon/bellossom/back.png b/graphics/pokemon/gen_2/bellossom/back.png similarity index 100% rename from graphics/pokemon/bellossom/back.png rename to graphics/pokemon/gen_2/bellossom/back.png diff --git a/graphics/pokemon/cresselia/footprint.png b/graphics/pokemon/gen_2/bellossom/footprint.png similarity index 100% rename from graphics/pokemon/cresselia/footprint.png rename to graphics/pokemon/gen_2/bellossom/footprint.png diff --git a/graphics/pokemon/bellossom/icon.png b/graphics/pokemon/gen_2/bellossom/icon.png similarity index 100% rename from graphics/pokemon/bellossom/icon.png rename to graphics/pokemon/gen_2/bellossom/icon.png diff --git a/graphics/pokemon/bellossom/normal.pal b/graphics/pokemon/gen_2/bellossom/normal.pal similarity index 100% rename from graphics/pokemon/bellossom/normal.pal rename to graphics/pokemon/gen_2/bellossom/normal.pal diff --git a/graphics/pokemon/bellossom/shiny.pal b/graphics/pokemon/gen_2/bellossom/shiny.pal similarity index 100% rename from graphics/pokemon/bellossom/shiny.pal rename to graphics/pokemon/gen_2/bellossom/shiny.pal diff --git a/graphics/pokemon/blissey/anim_front.png b/graphics/pokemon/gen_2/blissey/anim_front.png similarity index 100% rename from graphics/pokemon/blissey/anim_front.png rename to graphics/pokemon/gen_2/blissey/anim_front.png diff --git a/graphics/pokemon/blissey/back.png b/graphics/pokemon/gen_2/blissey/back.png similarity index 100% rename from graphics/pokemon/blissey/back.png rename to graphics/pokemon/gen_2/blissey/back.png diff --git a/graphics/pokemon/blissey/footprint.png b/graphics/pokemon/gen_2/blissey/footprint.png similarity index 100% rename from graphics/pokemon/blissey/footprint.png rename to graphics/pokemon/gen_2/blissey/footprint.png diff --git a/graphics/pokemon/blissey/icon.png b/graphics/pokemon/gen_2/blissey/icon.png similarity index 100% rename from graphics/pokemon/blissey/icon.png rename to graphics/pokemon/gen_2/blissey/icon.png diff --git a/graphics/pokemon/blissey/normal.pal b/graphics/pokemon/gen_2/blissey/normal.pal similarity index 100% rename from graphics/pokemon/blissey/normal.pal rename to graphics/pokemon/gen_2/blissey/normal.pal diff --git a/graphics/pokemon/blissey/shiny.pal b/graphics/pokemon/gen_2/blissey/shiny.pal similarity index 100% rename from graphics/pokemon/blissey/shiny.pal rename to graphics/pokemon/gen_2/blissey/shiny.pal diff --git a/graphics/pokemon/celebi/anim_front.png b/graphics/pokemon/gen_2/celebi/anim_front.png similarity index 100% rename from graphics/pokemon/celebi/anim_front.png rename to graphics/pokemon/gen_2/celebi/anim_front.png diff --git a/graphics/pokemon/celebi/back.png b/graphics/pokemon/gen_2/celebi/back.png similarity index 100% rename from graphics/pokemon/celebi/back.png rename to graphics/pokemon/gen_2/celebi/back.png diff --git a/graphics/pokemon/celebi/footprint.png b/graphics/pokemon/gen_2/celebi/footprint.png similarity index 100% rename from graphics/pokemon/celebi/footprint.png rename to graphics/pokemon/gen_2/celebi/footprint.png diff --git a/graphics/pokemon/celebi/icon.png b/graphics/pokemon/gen_2/celebi/icon.png similarity index 100% rename from graphics/pokemon/celebi/icon.png rename to graphics/pokemon/gen_2/celebi/icon.png diff --git a/graphics/pokemon/celebi/normal.pal b/graphics/pokemon/gen_2/celebi/normal.pal similarity index 100% rename from graphics/pokemon/celebi/normal.pal rename to graphics/pokemon/gen_2/celebi/normal.pal diff --git a/graphics/pokemon/celebi/shiny.pal b/graphics/pokemon/gen_2/celebi/shiny.pal similarity index 100% rename from graphics/pokemon/celebi/shiny.pal rename to graphics/pokemon/gen_2/celebi/shiny.pal diff --git a/graphics/pokemon/chikorita/anim_front.png b/graphics/pokemon/gen_2/chikorita/anim_front.png similarity index 100% rename from graphics/pokemon/chikorita/anim_front.png rename to graphics/pokemon/gen_2/chikorita/anim_front.png diff --git a/graphics/pokemon/chikorita/back.png b/graphics/pokemon/gen_2/chikorita/back.png similarity index 100% rename from graphics/pokemon/chikorita/back.png rename to graphics/pokemon/gen_2/chikorita/back.png diff --git a/graphics/pokemon/chikorita/footprint.png b/graphics/pokemon/gen_2/chikorita/footprint.png similarity index 100% rename from graphics/pokemon/chikorita/footprint.png rename to graphics/pokemon/gen_2/chikorita/footprint.png diff --git a/graphics/pokemon/chikorita/icon.png b/graphics/pokemon/gen_2/chikorita/icon.png similarity index 100% rename from graphics/pokemon/chikorita/icon.png rename to graphics/pokemon/gen_2/chikorita/icon.png diff --git a/graphics/pokemon/chikorita/normal.pal b/graphics/pokemon/gen_2/chikorita/normal.pal similarity index 100% rename from graphics/pokemon/chikorita/normal.pal rename to graphics/pokemon/gen_2/chikorita/normal.pal diff --git a/graphics/pokemon/chikorita/shiny.pal b/graphics/pokemon/gen_2/chikorita/shiny.pal similarity index 100% rename from graphics/pokemon/chikorita/shiny.pal rename to graphics/pokemon/gen_2/chikorita/shiny.pal diff --git a/graphics/pokemon/chinchou/anim_front.png b/graphics/pokemon/gen_2/chinchou/anim_front.png similarity index 100% rename from graphics/pokemon/chinchou/anim_front.png rename to graphics/pokemon/gen_2/chinchou/anim_front.png diff --git a/graphics/pokemon/chinchou/back.png b/graphics/pokemon/gen_2/chinchou/back.png similarity index 100% rename from graphics/pokemon/chinchou/back.png rename to graphics/pokemon/gen_2/chinchou/back.png diff --git a/graphics/pokemon/crobat/footprint.png b/graphics/pokemon/gen_2/chinchou/footprint.png similarity index 100% rename from graphics/pokemon/crobat/footprint.png rename to graphics/pokemon/gen_2/chinchou/footprint.png diff --git a/graphics/pokemon/chinchou/icon.png b/graphics/pokemon/gen_2/chinchou/icon.png similarity index 100% rename from graphics/pokemon/chinchou/icon.png rename to graphics/pokemon/gen_2/chinchou/icon.png diff --git a/graphics/pokemon/chinchou/normal.pal b/graphics/pokemon/gen_2/chinchou/normal.pal similarity index 100% rename from graphics/pokemon/chinchou/normal.pal rename to graphics/pokemon/gen_2/chinchou/normal.pal diff --git a/graphics/pokemon/chinchou/shiny.pal b/graphics/pokemon/gen_2/chinchou/shiny.pal similarity index 100% rename from graphics/pokemon/chinchou/shiny.pal rename to graphics/pokemon/gen_2/chinchou/shiny.pal diff --git a/graphics/pokemon/cleffa/anim_front.png b/graphics/pokemon/gen_2/cleffa/anim_front.png similarity index 100% rename from graphics/pokemon/cleffa/anim_front.png rename to graphics/pokemon/gen_2/cleffa/anim_front.png diff --git a/graphics/pokemon/cleffa/back.png b/graphics/pokemon/gen_2/cleffa/back.png similarity index 100% rename from graphics/pokemon/cleffa/back.png rename to graphics/pokemon/gen_2/cleffa/back.png diff --git a/graphics/pokemon/cleffa/footprint.png b/graphics/pokemon/gen_2/cleffa/footprint.png similarity index 100% rename from graphics/pokemon/cleffa/footprint.png rename to graphics/pokemon/gen_2/cleffa/footprint.png diff --git a/graphics/pokemon/cleffa/icon.png b/graphics/pokemon/gen_2/cleffa/icon.png similarity index 100% rename from graphics/pokemon/cleffa/icon.png rename to graphics/pokemon/gen_2/cleffa/icon.png diff --git a/graphics/pokemon/cleffa/normal.pal b/graphics/pokemon/gen_2/cleffa/normal.pal similarity index 100% rename from graphics/pokemon/cleffa/normal.pal rename to graphics/pokemon/gen_2/cleffa/normal.pal diff --git a/graphics/pokemon/cleffa/shiny.pal b/graphics/pokemon/gen_2/cleffa/shiny.pal similarity index 100% rename from graphics/pokemon/cleffa/shiny.pal rename to graphics/pokemon/gen_2/cleffa/shiny.pal diff --git a/graphics/pokemon/corsola/anim_front.png b/graphics/pokemon/gen_2/corsola/anim_front.png similarity index 100% rename from graphics/pokemon/corsola/anim_front.png rename to graphics/pokemon/gen_2/corsola/anim_front.png diff --git a/graphics/pokemon/corsola/back.png b/graphics/pokemon/gen_2/corsola/back.png similarity index 100% rename from graphics/pokemon/corsola/back.png rename to graphics/pokemon/gen_2/corsola/back.png diff --git a/graphics/pokemon/corsola/footprint.png b/graphics/pokemon/gen_2/corsola/footprint.png similarity index 100% rename from graphics/pokemon/corsola/footprint.png rename to graphics/pokemon/gen_2/corsola/footprint.png diff --git a/graphics/pokemon/corsola/galarian/back.png b/graphics/pokemon/gen_2/corsola/galarian/back.png similarity index 100% rename from graphics/pokemon/corsola/galarian/back.png rename to graphics/pokemon/gen_2/corsola/galarian/back.png diff --git a/graphics/pokemon/corsola/galarian/front.png b/graphics/pokemon/gen_2/corsola/galarian/front.png similarity index 100% rename from graphics/pokemon/corsola/galarian/front.png rename to graphics/pokemon/gen_2/corsola/galarian/front.png diff --git a/graphics/pokemon/corsola/galarian/icon.png b/graphics/pokemon/gen_2/corsola/galarian/icon.png similarity index 100% rename from graphics/pokemon/corsola/galarian/icon.png rename to graphics/pokemon/gen_2/corsola/galarian/icon.png diff --git a/graphics/pokemon/corsola/galarian/normal.pal b/graphics/pokemon/gen_2/corsola/galarian/normal.pal similarity index 100% rename from graphics/pokemon/corsola/galarian/normal.pal rename to graphics/pokemon/gen_2/corsola/galarian/normal.pal diff --git a/graphics/pokemon/corsola/galarian/shiny.pal b/graphics/pokemon/gen_2/corsola/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/corsola/galarian/shiny.pal rename to graphics/pokemon/gen_2/corsola/galarian/shiny.pal diff --git a/graphics/pokemon/corsola/icon.png b/graphics/pokemon/gen_2/corsola/icon.png similarity index 100% rename from graphics/pokemon/corsola/icon.png rename to graphics/pokemon/gen_2/corsola/icon.png diff --git a/graphics/pokemon/corsola/normal.pal b/graphics/pokemon/gen_2/corsola/normal.pal similarity index 100% rename from graphics/pokemon/corsola/normal.pal rename to graphics/pokemon/gen_2/corsola/normal.pal diff --git a/graphics/pokemon/corsola/shiny.pal b/graphics/pokemon/gen_2/corsola/shiny.pal similarity index 100% rename from graphics/pokemon/corsola/shiny.pal rename to graphics/pokemon/gen_2/corsola/shiny.pal diff --git a/graphics/pokemon/crobat/anim_front.png b/graphics/pokemon/gen_2/crobat/anim_front.png similarity index 100% rename from graphics/pokemon/crobat/anim_front.png rename to graphics/pokemon/gen_2/crobat/anim_front.png diff --git a/graphics/pokemon/crobat/back.png b/graphics/pokemon/gen_2/crobat/back.png similarity index 100% rename from graphics/pokemon/crobat/back.png rename to graphics/pokemon/gen_2/crobat/back.png diff --git a/graphics/pokemon/cryogonal/footprint.png b/graphics/pokemon/gen_2/crobat/footprint.png similarity index 100% rename from graphics/pokemon/cryogonal/footprint.png rename to graphics/pokemon/gen_2/crobat/footprint.png diff --git a/graphics/pokemon/crobat/icon.png b/graphics/pokemon/gen_2/crobat/icon.png similarity index 100% rename from graphics/pokemon/crobat/icon.png rename to graphics/pokemon/gen_2/crobat/icon.png diff --git a/graphics/pokemon/crobat/normal.pal b/graphics/pokemon/gen_2/crobat/normal.pal similarity index 100% rename from graphics/pokemon/crobat/normal.pal rename to graphics/pokemon/gen_2/crobat/normal.pal diff --git a/graphics/pokemon/crobat/shiny.pal b/graphics/pokemon/gen_2/crobat/shiny.pal similarity index 100% rename from graphics/pokemon/crobat/shiny.pal rename to graphics/pokemon/gen_2/crobat/shiny.pal diff --git a/graphics/pokemon/croconaw/anim_front.png b/graphics/pokemon/gen_2/croconaw/anim_front.png similarity index 100% rename from graphics/pokemon/croconaw/anim_front.png rename to graphics/pokemon/gen_2/croconaw/anim_front.png diff --git a/graphics/pokemon/croconaw/back.png b/graphics/pokemon/gen_2/croconaw/back.png similarity index 100% rename from graphics/pokemon/croconaw/back.png rename to graphics/pokemon/gen_2/croconaw/back.png diff --git a/graphics/pokemon/croconaw/footprint.png b/graphics/pokemon/gen_2/croconaw/footprint.png similarity index 100% rename from graphics/pokemon/croconaw/footprint.png rename to graphics/pokemon/gen_2/croconaw/footprint.png diff --git a/graphics/pokemon/croconaw/icon.png b/graphics/pokemon/gen_2/croconaw/icon.png similarity index 100% rename from graphics/pokemon/croconaw/icon.png rename to graphics/pokemon/gen_2/croconaw/icon.png diff --git a/graphics/pokemon/croconaw/normal.pal b/graphics/pokemon/gen_2/croconaw/normal.pal similarity index 100% rename from graphics/pokemon/croconaw/normal.pal rename to graphics/pokemon/gen_2/croconaw/normal.pal diff --git a/graphics/pokemon/croconaw/shiny.pal b/graphics/pokemon/gen_2/croconaw/shiny.pal similarity index 100% rename from graphics/pokemon/croconaw/shiny.pal rename to graphics/pokemon/gen_2/croconaw/shiny.pal diff --git a/graphics/pokemon/cyndaquil/anim_front.png b/graphics/pokemon/gen_2/cyndaquil/anim_front.png similarity index 100% rename from graphics/pokemon/cyndaquil/anim_front.png rename to graphics/pokemon/gen_2/cyndaquil/anim_front.png diff --git a/graphics/pokemon/cyndaquil/back.png b/graphics/pokemon/gen_2/cyndaquil/back.png similarity index 100% rename from graphics/pokemon/cyndaquil/back.png rename to graphics/pokemon/gen_2/cyndaquil/back.png diff --git a/graphics/pokemon/cufant/footprint.png b/graphics/pokemon/gen_2/cyndaquil/footprint.png similarity index 100% rename from graphics/pokemon/cufant/footprint.png rename to graphics/pokemon/gen_2/cyndaquil/footprint.png diff --git a/graphics/pokemon/cyndaquil/icon.png b/graphics/pokemon/gen_2/cyndaquil/icon.png similarity index 100% rename from graphics/pokemon/cyndaquil/icon.png rename to graphics/pokemon/gen_2/cyndaquil/icon.png diff --git a/graphics/pokemon/cyndaquil/normal.pal b/graphics/pokemon/gen_2/cyndaquil/normal.pal similarity index 100% rename from graphics/pokemon/cyndaquil/normal.pal rename to graphics/pokemon/gen_2/cyndaquil/normal.pal diff --git a/graphics/pokemon/cyndaquil/shiny.pal b/graphics/pokemon/gen_2/cyndaquil/shiny.pal similarity index 100% rename from graphics/pokemon/cyndaquil/shiny.pal rename to graphics/pokemon/gen_2/cyndaquil/shiny.pal diff --git a/graphics/pokemon/delibird/anim_front.png b/graphics/pokemon/gen_2/delibird/anim_front.png similarity index 100% rename from graphics/pokemon/delibird/anim_front.png rename to graphics/pokemon/gen_2/delibird/anim_front.png diff --git a/graphics/pokemon/delibird/back.png b/graphics/pokemon/gen_2/delibird/back.png similarity index 100% rename from graphics/pokemon/delibird/back.png rename to graphics/pokemon/gen_2/delibird/back.png diff --git a/graphics/pokemon/delibird/footprint.png b/graphics/pokemon/gen_2/delibird/footprint.png similarity index 100% rename from graphics/pokemon/delibird/footprint.png rename to graphics/pokemon/gen_2/delibird/footprint.png diff --git a/graphics/pokemon/delibird/icon.png b/graphics/pokemon/gen_2/delibird/icon.png similarity index 100% rename from graphics/pokemon/delibird/icon.png rename to graphics/pokemon/gen_2/delibird/icon.png diff --git a/graphics/pokemon/delibird/normal.pal b/graphics/pokemon/gen_2/delibird/normal.pal similarity index 100% rename from graphics/pokemon/delibird/normal.pal rename to graphics/pokemon/gen_2/delibird/normal.pal diff --git a/graphics/pokemon/delibird/shiny.pal b/graphics/pokemon/gen_2/delibird/shiny.pal similarity index 100% rename from graphics/pokemon/delibird/shiny.pal rename to graphics/pokemon/gen_2/delibird/shiny.pal diff --git a/graphics/pokemon/donphan/anim_front.png b/graphics/pokemon/gen_2/donphan/anim_front.png similarity index 100% rename from graphics/pokemon/donphan/anim_front.png rename to graphics/pokemon/gen_2/donphan/anim_front.png diff --git a/graphics/pokemon/donphan/anim_frontf.png b/graphics/pokemon/gen_2/donphan/anim_frontf.png similarity index 100% rename from graphics/pokemon/donphan/anim_frontf.png rename to graphics/pokemon/gen_2/donphan/anim_frontf.png diff --git a/graphics/pokemon/donphan/back.png b/graphics/pokemon/gen_2/donphan/back.png similarity index 100% rename from graphics/pokemon/donphan/back.png rename to graphics/pokemon/gen_2/donphan/back.png diff --git a/graphics/pokemon/donphan/backf.png b/graphics/pokemon/gen_2/donphan/backf.png similarity index 100% rename from graphics/pokemon/donphan/backf.png rename to graphics/pokemon/gen_2/donphan/backf.png diff --git a/graphics/pokemon/donphan/footprint.png b/graphics/pokemon/gen_2/donphan/footprint.png similarity index 100% rename from graphics/pokemon/donphan/footprint.png rename to graphics/pokemon/gen_2/donphan/footprint.png diff --git a/graphics/pokemon/donphan/icon.png b/graphics/pokemon/gen_2/donphan/icon.png similarity index 100% rename from graphics/pokemon/donphan/icon.png rename to graphics/pokemon/gen_2/donphan/icon.png diff --git a/graphics/pokemon/donphan/normal.pal b/graphics/pokemon/gen_2/donphan/normal.pal similarity index 100% rename from graphics/pokemon/donphan/normal.pal rename to graphics/pokemon/gen_2/donphan/normal.pal diff --git a/graphics/pokemon/donphan/shiny.pal b/graphics/pokemon/gen_2/donphan/shiny.pal similarity index 100% rename from graphics/pokemon/donphan/shiny.pal rename to graphics/pokemon/gen_2/donphan/shiny.pal diff --git a/graphics/pokemon/dunsparce/anim_front.png b/graphics/pokemon/gen_2/dunsparce/anim_front.png similarity index 100% rename from graphics/pokemon/dunsparce/anim_front.png rename to graphics/pokemon/gen_2/dunsparce/anim_front.png diff --git a/graphics/pokemon/dunsparce/back.png b/graphics/pokemon/gen_2/dunsparce/back.png similarity index 100% rename from graphics/pokemon/dunsparce/back.png rename to graphics/pokemon/gen_2/dunsparce/back.png diff --git a/graphics/pokemon/dewgong/footprint.png b/graphics/pokemon/gen_2/dunsparce/footprint.png similarity index 100% rename from graphics/pokemon/dewgong/footprint.png rename to graphics/pokemon/gen_2/dunsparce/footprint.png diff --git a/graphics/pokemon/dunsparce/icon.png b/graphics/pokemon/gen_2/dunsparce/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/dunsparce/icon.png rename to graphics/pokemon/gen_2/dunsparce/icon.png diff --git a/graphics/pokemon/dunsparce/normal.pal b/graphics/pokemon/gen_2/dunsparce/normal.pal similarity index 100% rename from graphics/pokemon/dunsparce/normal.pal rename to graphics/pokemon/gen_2/dunsparce/normal.pal diff --git a/graphics/pokemon/dunsparce/shiny.pal b/graphics/pokemon/gen_2/dunsparce/shiny.pal similarity index 100% rename from graphics/pokemon/dunsparce/shiny.pal rename to graphics/pokemon/gen_2/dunsparce/shiny.pal diff --git a/graphics/pokemon/elekid/anim_front.png b/graphics/pokemon/gen_2/elekid/anim_front.png similarity index 100% rename from graphics/pokemon/elekid/anim_front.png rename to graphics/pokemon/gen_2/elekid/anim_front.png diff --git a/graphics/pokemon/elekid/back.png b/graphics/pokemon/gen_2/elekid/back.png similarity index 100% rename from graphics/pokemon/elekid/back.png rename to graphics/pokemon/gen_2/elekid/back.png diff --git a/graphics/pokemon/elekid/footprint.png b/graphics/pokemon/gen_2/elekid/footprint.png similarity index 100% rename from graphics/pokemon/elekid/footprint.png rename to graphics/pokemon/gen_2/elekid/footprint.png diff --git a/graphics/pokemon/elekid/icon.png b/graphics/pokemon/gen_2/elekid/icon.png similarity index 100% rename from graphics/pokemon/elekid/icon.png rename to graphics/pokemon/gen_2/elekid/icon.png diff --git a/graphics/pokemon/elekid/normal.pal b/graphics/pokemon/gen_2/elekid/normal.pal similarity index 100% rename from graphics/pokemon/elekid/normal.pal rename to graphics/pokemon/gen_2/elekid/normal.pal diff --git a/graphics/pokemon/elekid/shiny.pal b/graphics/pokemon/gen_2/elekid/shiny.pal similarity index 100% rename from graphics/pokemon/elekid/shiny.pal rename to graphics/pokemon/gen_2/elekid/shiny.pal diff --git a/graphics/pokemon/entei/anim_front.png b/graphics/pokemon/gen_2/entei/anim_front.png similarity index 100% rename from graphics/pokemon/entei/anim_front.png rename to graphics/pokemon/gen_2/entei/anim_front.png diff --git a/graphics/pokemon/entei/back.png b/graphics/pokemon/gen_2/entei/back.png similarity index 100% rename from graphics/pokemon/entei/back.png rename to graphics/pokemon/gen_2/entei/back.png diff --git a/graphics/pokemon/entei/footprint.png b/graphics/pokemon/gen_2/entei/footprint.png similarity index 100% rename from graphics/pokemon/entei/footprint.png rename to graphics/pokemon/gen_2/entei/footprint.png diff --git a/graphics/pokemon/entei/icon.png b/graphics/pokemon/gen_2/entei/icon.png similarity index 100% rename from graphics/pokemon/entei/icon.png rename to graphics/pokemon/gen_2/entei/icon.png diff --git a/graphics/pokemon/entei/normal.pal b/graphics/pokemon/gen_2/entei/normal.pal similarity index 100% rename from graphics/pokemon/entei/normal.pal rename to graphics/pokemon/gen_2/entei/normal.pal diff --git a/graphics/pokemon/entei/shiny.pal b/graphics/pokemon/gen_2/entei/shiny.pal similarity index 100% rename from graphics/pokemon/entei/shiny.pal rename to graphics/pokemon/gen_2/entei/shiny.pal diff --git a/graphics/pokemon/espeon/anim_front.png b/graphics/pokemon/gen_2/espeon/anim_front.png similarity index 100% rename from graphics/pokemon/espeon/anim_front.png rename to graphics/pokemon/gen_2/espeon/anim_front.png diff --git a/graphics/pokemon/espeon/back.png b/graphics/pokemon/gen_2/espeon/back.png similarity index 100% rename from graphics/pokemon/espeon/back.png rename to graphics/pokemon/gen_2/espeon/back.png diff --git a/graphics/pokemon/espeon/footprint.png b/graphics/pokemon/gen_2/espeon/footprint.png similarity index 100% rename from graphics/pokemon/espeon/footprint.png rename to graphics/pokemon/gen_2/espeon/footprint.png diff --git a/graphics/pokemon/espeon/icon.png b/graphics/pokemon/gen_2/espeon/icon.png similarity index 100% rename from graphics/pokemon/espeon/icon.png rename to graphics/pokemon/gen_2/espeon/icon.png diff --git a/graphics/pokemon/espeon/normal.pal b/graphics/pokemon/gen_2/espeon/normal.pal similarity index 100% rename from graphics/pokemon/espeon/normal.pal rename to graphics/pokemon/gen_2/espeon/normal.pal diff --git a/graphics/pokemon/espeon/shiny.pal b/graphics/pokemon/gen_2/espeon/shiny.pal similarity index 100% rename from graphics/pokemon/espeon/shiny.pal rename to graphics/pokemon/gen_2/espeon/shiny.pal diff --git a/graphics/pokemon/feraligatr/anim_front.png b/graphics/pokemon/gen_2/feraligatr/anim_front.png similarity index 100% rename from graphics/pokemon/feraligatr/anim_front.png rename to graphics/pokemon/gen_2/feraligatr/anim_front.png diff --git a/graphics/pokemon/feraligatr/back.png b/graphics/pokemon/gen_2/feraligatr/back.png similarity index 100% rename from graphics/pokemon/feraligatr/back.png rename to graphics/pokemon/gen_2/feraligatr/back.png diff --git a/graphics/pokemon/feraligatr/footprint.png b/graphics/pokemon/gen_2/feraligatr/footprint.png similarity index 100% rename from graphics/pokemon/feraligatr/footprint.png rename to graphics/pokemon/gen_2/feraligatr/footprint.png diff --git a/graphics/pokemon/feraligatr/icon.png b/graphics/pokemon/gen_2/feraligatr/icon.png similarity index 100% rename from graphics/pokemon/feraligatr/icon.png rename to graphics/pokemon/gen_2/feraligatr/icon.png diff --git a/graphics/pokemon/feraligatr/normal.pal b/graphics/pokemon/gen_2/feraligatr/normal.pal similarity index 100% rename from graphics/pokemon/feraligatr/normal.pal rename to graphics/pokemon/gen_2/feraligatr/normal.pal diff --git a/graphics/pokemon/feraligatr/shiny.pal b/graphics/pokemon/gen_2/feraligatr/shiny.pal similarity index 100% rename from graphics/pokemon/feraligatr/shiny.pal rename to graphics/pokemon/gen_2/feraligatr/shiny.pal diff --git a/graphics/pokemon/flaaffy/anim_front.png b/graphics/pokemon/gen_2/flaaffy/anim_front.png similarity index 100% rename from graphics/pokemon/flaaffy/anim_front.png rename to graphics/pokemon/gen_2/flaaffy/anim_front.png diff --git a/graphics/pokemon/flaaffy/back.png b/graphics/pokemon/gen_2/flaaffy/back.png similarity index 100% rename from graphics/pokemon/flaaffy/back.png rename to graphics/pokemon/gen_2/flaaffy/back.png diff --git a/graphics/pokemon/flaaffy/footprint.png b/graphics/pokemon/gen_2/flaaffy/footprint.png similarity index 100% rename from graphics/pokemon/flaaffy/footprint.png rename to graphics/pokemon/gen_2/flaaffy/footprint.png diff --git a/graphics/pokemon/flaaffy/icon.png b/graphics/pokemon/gen_2/flaaffy/icon.png similarity index 100% rename from graphics/pokemon/flaaffy/icon.png rename to graphics/pokemon/gen_2/flaaffy/icon.png diff --git a/graphics/pokemon/flaaffy/normal.pal b/graphics/pokemon/gen_2/flaaffy/normal.pal similarity index 100% rename from graphics/pokemon/flaaffy/normal.pal rename to graphics/pokemon/gen_2/flaaffy/normal.pal diff --git a/graphics/pokemon/flaaffy/shiny.pal b/graphics/pokemon/gen_2/flaaffy/shiny.pal similarity index 100% rename from graphics/pokemon/flaaffy/shiny.pal rename to graphics/pokemon/gen_2/flaaffy/shiny.pal diff --git a/graphics/pokemon/forretress/anim_front.png b/graphics/pokemon/gen_2/forretress/anim_front.png similarity index 100% rename from graphics/pokemon/forretress/anim_front.png rename to graphics/pokemon/gen_2/forretress/anim_front.png diff --git a/graphics/pokemon/forretress/back.png b/graphics/pokemon/gen_2/forretress/back.png similarity index 100% rename from graphics/pokemon/forretress/back.png rename to graphics/pokemon/gen_2/forretress/back.png diff --git a/graphics/pokemon/dhelmise/footprint.png b/graphics/pokemon/gen_2/forretress/footprint.png similarity index 100% rename from graphics/pokemon/dhelmise/footprint.png rename to graphics/pokemon/gen_2/forretress/footprint.png diff --git a/graphics/pokemon/forretress/icon.png b/graphics/pokemon/gen_2/forretress/icon.png similarity index 100% rename from graphics/pokemon/forretress/icon.png rename to graphics/pokemon/gen_2/forretress/icon.png diff --git a/graphics/pokemon/forretress/normal.pal b/graphics/pokemon/gen_2/forretress/normal.pal similarity index 100% rename from graphics/pokemon/forretress/normal.pal rename to graphics/pokemon/gen_2/forretress/normal.pal diff --git a/graphics/pokemon/forretress/shiny.pal b/graphics/pokemon/gen_2/forretress/shiny.pal similarity index 100% rename from graphics/pokemon/forretress/shiny.pal rename to graphics/pokemon/gen_2/forretress/shiny.pal diff --git a/graphics/pokemon/furret/anim_front.png b/graphics/pokemon/gen_2/furret/anim_front.png similarity index 100% rename from graphics/pokemon/furret/anim_front.png rename to graphics/pokemon/gen_2/furret/anim_front.png diff --git a/graphics/pokemon/furret/back.png b/graphics/pokemon/gen_2/furret/back.png similarity index 100% rename from graphics/pokemon/furret/back.png rename to graphics/pokemon/gen_2/furret/back.png diff --git a/graphics/pokemon/furret/footprint.png b/graphics/pokemon/gen_2/furret/footprint.png similarity index 100% rename from graphics/pokemon/furret/footprint.png rename to graphics/pokemon/gen_2/furret/footprint.png diff --git a/graphics/pokemon/furret/icon.png b/graphics/pokemon/gen_2/furret/icon.png similarity index 100% rename from graphics/pokemon/furret/icon.png rename to graphics/pokemon/gen_2/furret/icon.png diff --git a/graphics/pokemon/furret/normal.pal b/graphics/pokemon/gen_2/furret/normal.pal similarity index 100% rename from graphics/pokemon/furret/normal.pal rename to graphics/pokemon/gen_2/furret/normal.pal diff --git a/graphics/pokemon/furret/shiny.pal b/graphics/pokemon/gen_2/furret/shiny.pal similarity index 100% rename from graphics/pokemon/furret/shiny.pal rename to graphics/pokemon/gen_2/furret/shiny.pal diff --git a/graphics/pokemon/girafarig/anim_front.png b/graphics/pokemon/gen_2/girafarig/anim_front.png similarity index 100% rename from graphics/pokemon/girafarig/anim_front.png rename to graphics/pokemon/gen_2/girafarig/anim_front.png diff --git a/graphics/pokemon/girafarig/anim_frontf.png b/graphics/pokemon/gen_2/girafarig/anim_frontf.png similarity index 100% rename from graphics/pokemon/girafarig/anim_frontf.png rename to graphics/pokemon/gen_2/girafarig/anim_frontf.png diff --git a/graphics/pokemon/girafarig/back.png b/graphics/pokemon/gen_2/girafarig/back.png similarity index 100% rename from graphics/pokemon/girafarig/back.png rename to graphics/pokemon/gen_2/girafarig/back.png diff --git a/graphics/pokemon/girafarig/backf.png b/graphics/pokemon/gen_2/girafarig/backf.png similarity index 100% rename from graphics/pokemon/girafarig/backf.png rename to graphics/pokemon/gen_2/girafarig/backf.png diff --git a/graphics/pokemon/girafarig/footprint.png b/graphics/pokemon/gen_2/girafarig/footprint.png similarity index 100% rename from graphics/pokemon/girafarig/footprint.png rename to graphics/pokemon/gen_2/girafarig/footprint.png diff --git a/graphics/pokemon/girafarig/icon.png b/graphics/pokemon/gen_2/girafarig/icon.png similarity index 100% rename from graphics/pokemon/girafarig/icon.png rename to graphics/pokemon/gen_2/girafarig/icon.png diff --git a/graphics/pokemon/girafarig/normal.pal b/graphics/pokemon/gen_2/girafarig/normal.pal similarity index 100% rename from graphics/pokemon/girafarig/normal.pal rename to graphics/pokemon/gen_2/girafarig/normal.pal diff --git a/graphics/pokemon/girafarig/shiny.pal b/graphics/pokemon/gen_2/girafarig/shiny.pal similarity index 100% rename from graphics/pokemon/girafarig/shiny.pal rename to graphics/pokemon/gen_2/girafarig/shiny.pal diff --git a/graphics/pokemon/gligar/anim_front.png b/graphics/pokemon/gen_2/gligar/anim_front.png similarity index 100% rename from graphics/pokemon/gligar/anim_front.png rename to graphics/pokemon/gen_2/gligar/anim_front.png diff --git a/graphics/pokemon/gligar/anim_frontf.png b/graphics/pokemon/gen_2/gligar/anim_frontf.png similarity index 100% rename from graphics/pokemon/gligar/anim_frontf.png rename to graphics/pokemon/gen_2/gligar/anim_frontf.png diff --git a/graphics/pokemon/gligar/back.png b/graphics/pokemon/gen_2/gligar/back.png similarity index 100% rename from graphics/pokemon/gligar/back.png rename to graphics/pokemon/gen_2/gligar/back.png diff --git a/graphics/pokemon/gligar/backf.png b/graphics/pokemon/gen_2/gligar/backf.png similarity index 100% rename from graphics/pokemon/gligar/backf.png rename to graphics/pokemon/gen_2/gligar/backf.png diff --git a/graphics/pokemon/gligar/footprint.png b/graphics/pokemon/gen_2/gligar/footprint.png similarity index 100% rename from graphics/pokemon/gligar/footprint.png rename to graphics/pokemon/gen_2/gligar/footprint.png diff --git a/graphics/pokemon/gligar/icon.png b/graphics/pokemon/gen_2/gligar/icon.png similarity index 100% rename from graphics/pokemon/gligar/icon.png rename to graphics/pokemon/gen_2/gligar/icon.png diff --git a/graphics/pokemon/gligar/normal.pal b/graphics/pokemon/gen_2/gligar/normal.pal similarity index 100% rename from graphics/pokemon/gligar/normal.pal rename to graphics/pokemon/gen_2/gligar/normal.pal diff --git a/graphics/pokemon/gligar/shiny.pal b/graphics/pokemon/gen_2/gligar/shiny.pal similarity index 100% rename from graphics/pokemon/gligar/shiny.pal rename to graphics/pokemon/gen_2/gligar/shiny.pal diff --git a/graphics/pokemon/granbull/anim_front.png b/graphics/pokemon/gen_2/granbull/anim_front.png similarity index 100% rename from graphics/pokemon/granbull/anim_front.png rename to graphics/pokemon/gen_2/granbull/anim_front.png diff --git a/graphics/pokemon/granbull/back.png b/graphics/pokemon/gen_2/granbull/back.png similarity index 100% rename from graphics/pokemon/granbull/back.png rename to graphics/pokemon/gen_2/granbull/back.png diff --git a/graphics/pokemon/granbull/footprint.png b/graphics/pokemon/gen_2/granbull/footprint.png similarity index 100% rename from graphics/pokemon/granbull/footprint.png rename to graphics/pokemon/gen_2/granbull/footprint.png diff --git a/graphics/pokemon/granbull/icon.png b/graphics/pokemon/gen_2/granbull/icon.png similarity index 100% rename from graphics/pokemon/granbull/icon.png rename to graphics/pokemon/gen_2/granbull/icon.png diff --git a/graphics/pokemon/granbull/normal.pal b/graphics/pokemon/gen_2/granbull/normal.pal similarity index 100% rename from graphics/pokemon/granbull/normal.pal rename to graphics/pokemon/gen_2/granbull/normal.pal diff --git a/graphics/pokemon/granbull/shiny.pal b/graphics/pokemon/gen_2/granbull/shiny.pal similarity index 100% rename from graphics/pokemon/granbull/shiny.pal rename to graphics/pokemon/gen_2/granbull/shiny.pal diff --git a/graphics/pokemon/heracross/anim_front.png b/graphics/pokemon/gen_2/heracross/anim_front.png similarity index 100% rename from graphics/pokemon/heracross/anim_front.png rename to graphics/pokemon/gen_2/heracross/anim_front.png diff --git a/graphics/pokemon/heracross/anim_frontf.png b/graphics/pokemon/gen_2/heracross/anim_frontf.png similarity index 100% rename from graphics/pokemon/heracross/anim_frontf.png rename to graphics/pokemon/gen_2/heracross/anim_frontf.png diff --git a/graphics/pokemon/heracross/back.png b/graphics/pokemon/gen_2/heracross/back.png similarity index 100% rename from graphics/pokemon/heracross/back.png rename to graphics/pokemon/gen_2/heracross/back.png diff --git a/graphics/pokemon/heracross/backf.png b/graphics/pokemon/gen_2/heracross/backf.png similarity index 100% rename from graphics/pokemon/heracross/backf.png rename to graphics/pokemon/gen_2/heracross/backf.png diff --git a/graphics/pokemon/heracross/footprint.png b/graphics/pokemon/gen_2/heracross/footprint.png similarity index 100% rename from graphics/pokemon/heracross/footprint.png rename to graphics/pokemon/gen_2/heracross/footprint.png diff --git a/graphics/pokemon/heracross/icon.png b/graphics/pokemon/gen_2/heracross/icon.png similarity index 100% rename from graphics/pokemon/heracross/icon.png rename to graphics/pokemon/gen_2/heracross/icon.png diff --git a/graphics/pokemon/heracross/mega/back.png b/graphics/pokemon/gen_2/heracross/mega/back.png similarity index 100% rename from graphics/pokemon/heracross/mega/back.png rename to graphics/pokemon/gen_2/heracross/mega/back.png diff --git a/graphics/pokemon/heracross/mega/front.png b/graphics/pokemon/gen_2/heracross/mega/front.png similarity index 100% rename from graphics/pokemon/heracross/mega/front.png rename to graphics/pokemon/gen_2/heracross/mega/front.png diff --git a/graphics/pokemon/heracross/mega/icon.png b/graphics/pokemon/gen_2/heracross/mega/icon.png similarity index 100% rename from graphics/pokemon/heracross/mega/icon.png rename to graphics/pokemon/gen_2/heracross/mega/icon.png diff --git a/graphics/pokemon/heracross/mega/normal.pal b/graphics/pokemon/gen_2/heracross/mega/normal.pal similarity index 100% rename from graphics/pokemon/heracross/mega/normal.pal rename to graphics/pokemon/gen_2/heracross/mega/normal.pal diff --git a/graphics/pokemon/heracross/mega/shiny.pal b/graphics/pokemon/gen_2/heracross/mega/shiny.pal similarity index 100% rename from graphics/pokemon/heracross/mega/shiny.pal rename to graphics/pokemon/gen_2/heracross/mega/shiny.pal diff --git a/graphics/pokemon/heracross/normal.pal b/graphics/pokemon/gen_2/heracross/normal.pal similarity index 100% rename from graphics/pokemon/heracross/normal.pal rename to graphics/pokemon/gen_2/heracross/normal.pal diff --git a/graphics/pokemon/heracross/shiny.pal b/graphics/pokemon/gen_2/heracross/shiny.pal similarity index 100% rename from graphics/pokemon/heracross/shiny.pal rename to graphics/pokemon/gen_2/heracross/shiny.pal diff --git a/graphics/pokemon/hitmontop/anim_front.png b/graphics/pokemon/gen_2/hitmontop/anim_front.png similarity index 100% rename from graphics/pokemon/hitmontop/anim_front.png rename to graphics/pokemon/gen_2/hitmontop/anim_front.png diff --git a/graphics/pokemon/hitmontop/back.png b/graphics/pokemon/gen_2/hitmontop/back.png similarity index 100% rename from graphics/pokemon/hitmontop/back.png rename to graphics/pokemon/gen_2/hitmontop/back.png diff --git a/graphics/pokemon/hitmontop/footprint.png b/graphics/pokemon/gen_2/hitmontop/footprint.png similarity index 100% rename from graphics/pokemon/hitmontop/footprint.png rename to graphics/pokemon/gen_2/hitmontop/footprint.png diff --git a/graphics/pokemon/hitmontop/icon.png b/graphics/pokemon/gen_2/hitmontop/icon.png similarity index 100% rename from graphics/pokemon/hitmontop/icon.png rename to graphics/pokemon/gen_2/hitmontop/icon.png diff --git a/graphics/pokemon/hitmontop/normal.pal b/graphics/pokemon/gen_2/hitmontop/normal.pal similarity index 100% rename from graphics/pokemon/hitmontop/normal.pal rename to graphics/pokemon/gen_2/hitmontop/normal.pal diff --git a/graphics/pokemon/hitmontop/shiny.pal b/graphics/pokemon/gen_2/hitmontop/shiny.pal similarity index 100% rename from graphics/pokemon/hitmontop/shiny.pal rename to graphics/pokemon/gen_2/hitmontop/shiny.pal diff --git a/graphics/pokemon/ho_oh/anim_front.png b/graphics/pokemon/gen_2/ho_oh/anim_front.png similarity index 100% rename from graphics/pokemon/ho_oh/anim_front.png rename to graphics/pokemon/gen_2/ho_oh/anim_front.png diff --git a/graphics/pokemon/ho_oh/back.png b/graphics/pokemon/gen_2/ho_oh/back.png similarity index 100% rename from graphics/pokemon/ho_oh/back.png rename to graphics/pokemon/gen_2/ho_oh/back.png diff --git a/graphics/pokemon/ho_oh/footprint.png b/graphics/pokemon/gen_2/ho_oh/footprint.png similarity index 100% rename from graphics/pokemon/ho_oh/footprint.png rename to graphics/pokemon/gen_2/ho_oh/footprint.png diff --git a/graphics/pokemon/ho_oh/icon.png b/graphics/pokemon/gen_2/ho_oh/icon.png similarity index 100% rename from graphics/pokemon/ho_oh/icon.png rename to graphics/pokemon/gen_2/ho_oh/icon.png diff --git a/graphics/pokemon/ho_oh/normal.pal b/graphics/pokemon/gen_2/ho_oh/normal.pal similarity index 100% rename from graphics/pokemon/ho_oh/normal.pal rename to graphics/pokemon/gen_2/ho_oh/normal.pal diff --git a/graphics/pokemon/ho_oh/shiny.pal b/graphics/pokemon/gen_2/ho_oh/shiny.pal similarity index 100% rename from graphics/pokemon/ho_oh/shiny.pal rename to graphics/pokemon/gen_2/ho_oh/shiny.pal diff --git a/graphics/pokemon/hoothoot/anim_front.png b/graphics/pokemon/gen_2/hoothoot/anim_front.png similarity index 100% rename from graphics/pokemon/hoothoot/anim_front.png rename to graphics/pokemon/gen_2/hoothoot/anim_front.png diff --git a/graphics/pokemon/hoothoot/back.png b/graphics/pokemon/gen_2/hoothoot/back.png similarity index 100% rename from graphics/pokemon/hoothoot/back.png rename to graphics/pokemon/gen_2/hoothoot/back.png diff --git a/graphics/pokemon/hoothoot/footprint.png b/graphics/pokemon/gen_2/hoothoot/footprint.png similarity index 100% rename from graphics/pokemon/hoothoot/footprint.png rename to graphics/pokemon/gen_2/hoothoot/footprint.png diff --git a/graphics/pokemon/hoothoot/icon.png b/graphics/pokemon/gen_2/hoothoot/icon.png similarity index 100% rename from graphics/pokemon/hoothoot/icon.png rename to graphics/pokemon/gen_2/hoothoot/icon.png diff --git a/graphics/pokemon/hoothoot/normal.pal b/graphics/pokemon/gen_2/hoothoot/normal.pal similarity index 100% rename from graphics/pokemon/hoothoot/normal.pal rename to graphics/pokemon/gen_2/hoothoot/normal.pal diff --git a/graphics/pokemon/hoothoot/shiny.pal b/graphics/pokemon/gen_2/hoothoot/shiny.pal similarity index 100% rename from graphics/pokemon/hoothoot/shiny.pal rename to graphics/pokemon/gen_2/hoothoot/shiny.pal diff --git a/graphics/pokemon/hoppip/anim_front.png b/graphics/pokemon/gen_2/hoppip/anim_front.png similarity index 100% rename from graphics/pokemon/hoppip/anim_front.png rename to graphics/pokemon/gen_2/hoppip/anim_front.png diff --git a/graphics/pokemon/hoppip/back.png b/graphics/pokemon/gen_2/hoppip/back.png similarity index 100% rename from graphics/pokemon/hoppip/back.png rename to graphics/pokemon/gen_2/hoppip/back.png diff --git a/graphics/pokemon/hoppip/footprint.png b/graphics/pokemon/gen_2/hoppip/footprint.png similarity index 100% rename from graphics/pokemon/hoppip/footprint.png rename to graphics/pokemon/gen_2/hoppip/footprint.png diff --git a/graphics/pokemon/hoppip/icon.png b/graphics/pokemon/gen_2/hoppip/icon.png similarity index 100% rename from graphics/pokemon/hoppip/icon.png rename to graphics/pokemon/gen_2/hoppip/icon.png diff --git a/graphics/pokemon/hoppip/normal.pal b/graphics/pokemon/gen_2/hoppip/normal.pal similarity index 100% rename from graphics/pokemon/hoppip/normal.pal rename to graphics/pokemon/gen_2/hoppip/normal.pal diff --git a/graphics/pokemon/hoppip/shiny.pal b/graphics/pokemon/gen_2/hoppip/shiny.pal similarity index 100% rename from graphics/pokemon/hoppip/shiny.pal rename to graphics/pokemon/gen_2/hoppip/shiny.pal diff --git a/graphics/pokemon/houndoom/anim_front.png b/graphics/pokemon/gen_2/houndoom/anim_front.png similarity index 100% rename from graphics/pokemon/houndoom/anim_front.png rename to graphics/pokemon/gen_2/houndoom/anim_front.png diff --git a/graphics/pokemon/houndoom/anim_frontf.png b/graphics/pokemon/gen_2/houndoom/anim_frontf.png similarity index 100% rename from graphics/pokemon/houndoom/anim_frontf.png rename to graphics/pokemon/gen_2/houndoom/anim_frontf.png diff --git a/graphics/pokemon/houndoom/back.png b/graphics/pokemon/gen_2/houndoom/back.png similarity index 100% rename from graphics/pokemon/houndoom/back.png rename to graphics/pokemon/gen_2/houndoom/back.png diff --git a/graphics/pokemon/houndoom/backf.png b/graphics/pokemon/gen_2/houndoom/backf.png similarity index 100% rename from graphics/pokemon/houndoom/backf.png rename to graphics/pokemon/gen_2/houndoom/backf.png diff --git a/graphics/pokemon/houndoom/footprint.png b/graphics/pokemon/gen_2/houndoom/footprint.png similarity index 100% rename from graphics/pokemon/houndoom/footprint.png rename to graphics/pokemon/gen_2/houndoom/footprint.png diff --git a/graphics/pokemon/houndoom/icon.png b/graphics/pokemon/gen_2/houndoom/icon.png similarity index 100% rename from graphics/pokemon/houndoom/icon.png rename to graphics/pokemon/gen_2/houndoom/icon.png diff --git a/graphics/pokemon/houndoom/mega/back.png b/graphics/pokemon/gen_2/houndoom/mega/back.png similarity index 100% rename from graphics/pokemon/houndoom/mega/back.png rename to graphics/pokemon/gen_2/houndoom/mega/back.png diff --git a/graphics/pokemon/houndoom/mega/front.png b/graphics/pokemon/gen_2/houndoom/mega/front.png similarity index 100% rename from graphics/pokemon/houndoom/mega/front.png rename to graphics/pokemon/gen_2/houndoom/mega/front.png diff --git a/graphics/pokemon/houndoom/mega/icon.png b/graphics/pokemon/gen_2/houndoom/mega/icon.png similarity index 100% rename from graphics/pokemon/houndoom/mega/icon.png rename to graphics/pokemon/gen_2/houndoom/mega/icon.png diff --git a/graphics/pokemon/houndoom/mega/normal.pal b/graphics/pokemon/gen_2/houndoom/mega/normal.pal similarity index 100% rename from graphics/pokemon/houndoom/mega/normal.pal rename to graphics/pokemon/gen_2/houndoom/mega/normal.pal diff --git a/graphics/pokemon/houndoom/mega/shiny.pal b/graphics/pokemon/gen_2/houndoom/mega/shiny.pal similarity index 100% rename from graphics/pokemon/houndoom/mega/shiny.pal rename to graphics/pokemon/gen_2/houndoom/mega/shiny.pal diff --git a/graphics/pokemon/houndoom/normal.pal b/graphics/pokemon/gen_2/houndoom/normal.pal similarity index 100% rename from graphics/pokemon/houndoom/normal.pal rename to graphics/pokemon/gen_2/houndoom/normal.pal diff --git a/graphics/pokemon/houndoom/shiny.pal b/graphics/pokemon/gen_2/houndoom/shiny.pal similarity index 100% rename from graphics/pokemon/houndoom/shiny.pal rename to graphics/pokemon/gen_2/houndoom/shiny.pal diff --git a/graphics/pokemon/houndour/anim_front.png b/graphics/pokemon/gen_2/houndour/anim_front.png similarity index 100% rename from graphics/pokemon/houndour/anim_front.png rename to graphics/pokemon/gen_2/houndour/anim_front.png diff --git a/graphics/pokemon/houndour/back.png b/graphics/pokemon/gen_2/houndour/back.png similarity index 100% rename from graphics/pokemon/houndour/back.png rename to graphics/pokemon/gen_2/houndour/back.png diff --git a/graphics/pokemon/houndour/footprint.png b/graphics/pokemon/gen_2/houndour/footprint.png similarity index 100% rename from graphics/pokemon/houndour/footprint.png rename to graphics/pokemon/gen_2/houndour/footprint.png diff --git a/graphics/pokemon/houndour/icon.png b/graphics/pokemon/gen_2/houndour/icon.png similarity index 100% rename from graphics/pokemon/houndour/icon.png rename to graphics/pokemon/gen_2/houndour/icon.png diff --git a/graphics/pokemon/houndour/normal.pal b/graphics/pokemon/gen_2/houndour/normal.pal similarity index 100% rename from graphics/pokemon/houndour/normal.pal rename to graphics/pokemon/gen_2/houndour/normal.pal diff --git a/graphics/pokemon/houndour/shiny.pal b/graphics/pokemon/gen_2/houndour/shiny.pal similarity index 100% rename from graphics/pokemon/houndour/shiny.pal rename to graphics/pokemon/gen_2/houndour/shiny.pal diff --git a/graphics/pokemon/igglybuff/anim_front.png b/graphics/pokemon/gen_2/igglybuff/anim_front.png similarity index 100% rename from graphics/pokemon/igglybuff/anim_front.png rename to graphics/pokemon/gen_2/igglybuff/anim_front.png diff --git a/graphics/pokemon/igglybuff/back.png b/graphics/pokemon/gen_2/igglybuff/back.png similarity index 100% rename from graphics/pokemon/igglybuff/back.png rename to graphics/pokemon/gen_2/igglybuff/back.png diff --git a/graphics/pokemon/igglybuff/footprint.png b/graphics/pokemon/gen_2/igglybuff/footprint.png similarity index 100% rename from graphics/pokemon/igglybuff/footprint.png rename to graphics/pokemon/gen_2/igglybuff/footprint.png diff --git a/graphics/pokemon/igglybuff/icon.png b/graphics/pokemon/gen_2/igglybuff/icon.png similarity index 100% rename from graphics/pokemon/igglybuff/icon.png rename to graphics/pokemon/gen_2/igglybuff/icon.png diff --git a/graphics/pokemon/igglybuff/normal.pal b/graphics/pokemon/gen_2/igglybuff/normal.pal similarity index 100% rename from graphics/pokemon/igglybuff/normal.pal rename to graphics/pokemon/gen_2/igglybuff/normal.pal diff --git a/graphics/pokemon/igglybuff/shiny.pal b/graphics/pokemon/gen_2/igglybuff/shiny.pal similarity index 100% rename from graphics/pokemon/igglybuff/shiny.pal rename to graphics/pokemon/gen_2/igglybuff/shiny.pal diff --git a/graphics/pokemon/jumpluff/anim_front.png b/graphics/pokemon/gen_2/jumpluff/anim_front.png similarity index 100% rename from graphics/pokemon/jumpluff/anim_front.png rename to graphics/pokemon/gen_2/jumpluff/anim_front.png diff --git a/graphics/pokemon/jumpluff/back.png b/graphics/pokemon/gen_2/jumpluff/back.png similarity index 100% rename from graphics/pokemon/jumpluff/back.png rename to graphics/pokemon/gen_2/jumpluff/back.png diff --git a/graphics/pokemon/dottler/footprint.png b/graphics/pokemon/gen_2/jumpluff/footprint.png similarity index 100% rename from graphics/pokemon/dottler/footprint.png rename to graphics/pokemon/gen_2/jumpluff/footprint.png diff --git a/graphics/pokemon/jumpluff/icon.png b/graphics/pokemon/gen_2/jumpluff/icon.png similarity index 100% rename from graphics/pokemon/jumpluff/icon.png rename to graphics/pokemon/gen_2/jumpluff/icon.png diff --git a/graphics/pokemon/jumpluff/normal.pal b/graphics/pokemon/gen_2/jumpluff/normal.pal similarity index 100% rename from graphics/pokemon/jumpluff/normal.pal rename to graphics/pokemon/gen_2/jumpluff/normal.pal diff --git a/graphics/pokemon/jumpluff/shiny.pal b/graphics/pokemon/gen_2/jumpluff/shiny.pal similarity index 100% rename from graphics/pokemon/jumpluff/shiny.pal rename to graphics/pokemon/gen_2/jumpluff/shiny.pal diff --git a/graphics/pokemon/kingdra/anim_front.png b/graphics/pokemon/gen_2/kingdra/anim_front.png similarity index 100% rename from graphics/pokemon/kingdra/anim_front.png rename to graphics/pokemon/gen_2/kingdra/anim_front.png diff --git a/graphics/pokemon/kingdra/back.png b/graphics/pokemon/gen_2/kingdra/back.png similarity index 100% rename from graphics/pokemon/kingdra/back.png rename to graphics/pokemon/gen_2/kingdra/back.png diff --git a/graphics/pokemon/diancie/footprint.png b/graphics/pokemon/gen_2/kingdra/footprint.png similarity index 100% rename from graphics/pokemon/diancie/footprint.png rename to graphics/pokemon/gen_2/kingdra/footprint.png diff --git a/graphics/pokemon/kingdra/icon.png b/graphics/pokemon/gen_2/kingdra/icon.png similarity index 100% rename from graphics/pokemon/kingdra/icon.png rename to graphics/pokemon/gen_2/kingdra/icon.png diff --git a/graphics/pokemon/kingdra/normal.pal b/graphics/pokemon/gen_2/kingdra/normal.pal similarity index 100% rename from graphics/pokemon/kingdra/normal.pal rename to graphics/pokemon/gen_2/kingdra/normal.pal diff --git a/graphics/pokemon/kingdra/shiny.pal b/graphics/pokemon/gen_2/kingdra/shiny.pal similarity index 100% rename from graphics/pokemon/kingdra/shiny.pal rename to graphics/pokemon/gen_2/kingdra/shiny.pal diff --git a/graphics/pokemon/lanturn/anim_front.png b/graphics/pokemon/gen_2/lanturn/anim_front.png similarity index 100% rename from graphics/pokemon/lanturn/anim_front.png rename to graphics/pokemon/gen_2/lanturn/anim_front.png diff --git a/graphics/pokemon/lanturn/back.png b/graphics/pokemon/gen_2/lanturn/back.png similarity index 100% rename from graphics/pokemon/lanturn/back.png rename to graphics/pokemon/gen_2/lanturn/back.png diff --git a/graphics/pokemon/diglett/footprint.png b/graphics/pokemon/gen_2/lanturn/footprint.png similarity index 100% rename from graphics/pokemon/diglett/footprint.png rename to graphics/pokemon/gen_2/lanturn/footprint.png diff --git a/graphics/pokemon/lanturn/icon.png b/graphics/pokemon/gen_2/lanturn/icon.png similarity index 100% rename from graphics/pokemon/lanturn/icon.png rename to graphics/pokemon/gen_2/lanturn/icon.png diff --git a/graphics/pokemon/lanturn/normal.pal b/graphics/pokemon/gen_2/lanturn/normal.pal similarity index 100% rename from graphics/pokemon/lanturn/normal.pal rename to graphics/pokemon/gen_2/lanturn/normal.pal diff --git a/graphics/pokemon/lanturn/shiny.pal b/graphics/pokemon/gen_2/lanturn/shiny.pal similarity index 100% rename from graphics/pokemon/lanturn/shiny.pal rename to graphics/pokemon/gen_2/lanturn/shiny.pal diff --git a/graphics/pokemon/larvitar/anim_front.png b/graphics/pokemon/gen_2/larvitar/anim_front.png similarity index 100% rename from graphics/pokemon/larvitar/anim_front.png rename to graphics/pokemon/gen_2/larvitar/anim_front.png diff --git a/graphics/pokemon/larvitar/back.png b/graphics/pokemon/gen_2/larvitar/back.png similarity index 100% rename from graphics/pokemon/larvitar/back.png rename to graphics/pokemon/gen_2/larvitar/back.png diff --git a/graphics/pokemon/larvitar/footprint.png b/graphics/pokemon/gen_2/larvitar/footprint.png similarity index 100% rename from graphics/pokemon/larvitar/footprint.png rename to graphics/pokemon/gen_2/larvitar/footprint.png diff --git a/graphics/pokemon/larvitar/icon.png b/graphics/pokemon/gen_2/larvitar/icon.png similarity index 100% rename from graphics/pokemon/larvitar/icon.png rename to graphics/pokemon/gen_2/larvitar/icon.png diff --git a/graphics/pokemon/larvitar/normal.pal b/graphics/pokemon/gen_2/larvitar/normal.pal similarity index 100% rename from graphics/pokemon/larvitar/normal.pal rename to graphics/pokemon/gen_2/larvitar/normal.pal diff --git a/graphics/pokemon/larvitar/shiny.pal b/graphics/pokemon/gen_2/larvitar/shiny.pal similarity index 100% rename from graphics/pokemon/larvitar/shiny.pal rename to graphics/pokemon/gen_2/larvitar/shiny.pal diff --git a/graphics/pokemon/ledian/anim_front.png b/graphics/pokemon/gen_2/ledian/anim_front.png similarity index 100% rename from graphics/pokemon/ledian/anim_front.png rename to graphics/pokemon/gen_2/ledian/anim_front.png diff --git a/graphics/pokemon/ledian/anim_frontf.png b/graphics/pokemon/gen_2/ledian/anim_frontf.png similarity index 100% rename from graphics/pokemon/ledian/anim_frontf.png rename to graphics/pokemon/gen_2/ledian/anim_frontf.png diff --git a/graphics/pokemon/ledian/back.png b/graphics/pokemon/gen_2/ledian/back.png similarity index 100% rename from graphics/pokemon/ledian/back.png rename to graphics/pokemon/gen_2/ledian/back.png diff --git a/graphics/pokemon/ledian/backf.png b/graphics/pokemon/gen_2/ledian/backf.png similarity index 100% rename from graphics/pokemon/ledian/backf.png rename to graphics/pokemon/gen_2/ledian/backf.png diff --git a/graphics/pokemon/ledian/footprint.png b/graphics/pokemon/gen_2/ledian/footprint.png similarity index 100% rename from graphics/pokemon/ledian/footprint.png rename to graphics/pokemon/gen_2/ledian/footprint.png diff --git a/graphics/pokemon/ledian/icon.png b/graphics/pokemon/gen_2/ledian/icon.png similarity index 100% rename from graphics/pokemon/ledian/icon.png rename to graphics/pokemon/gen_2/ledian/icon.png diff --git a/graphics/pokemon/ledian/normal.pal b/graphics/pokemon/gen_2/ledian/normal.pal similarity index 100% rename from graphics/pokemon/ledian/normal.pal rename to graphics/pokemon/gen_2/ledian/normal.pal diff --git a/graphics/pokemon/ledian/shiny.pal b/graphics/pokemon/gen_2/ledian/shiny.pal similarity index 100% rename from graphics/pokemon/ledian/shiny.pal rename to graphics/pokemon/gen_2/ledian/shiny.pal diff --git a/graphics/pokemon/ledyba/anim_front.png b/graphics/pokemon/gen_2/ledyba/anim_front.png similarity index 100% rename from graphics/pokemon/ledyba/anim_front.png rename to graphics/pokemon/gen_2/ledyba/anim_front.png diff --git a/graphics/pokemon/ledyba/anim_frontf.png b/graphics/pokemon/gen_2/ledyba/anim_frontf.png similarity index 100% rename from graphics/pokemon/ledyba/anim_frontf.png rename to graphics/pokemon/gen_2/ledyba/anim_frontf.png diff --git a/graphics/pokemon/ledyba/back.png b/graphics/pokemon/gen_2/ledyba/back.png similarity index 100% rename from graphics/pokemon/ledyba/back.png rename to graphics/pokemon/gen_2/ledyba/back.png diff --git a/graphics/pokemon/ledyba/backf.png b/graphics/pokemon/gen_2/ledyba/backf.png similarity index 100% rename from graphics/pokemon/ledyba/backf.png rename to graphics/pokemon/gen_2/ledyba/backf.png diff --git a/graphics/pokemon/ledyba/footprint.png b/graphics/pokemon/gen_2/ledyba/footprint.png similarity index 100% rename from graphics/pokemon/ledyba/footprint.png rename to graphics/pokemon/gen_2/ledyba/footprint.png diff --git a/graphics/pokemon/ledyba/icon.png b/graphics/pokemon/gen_2/ledyba/icon.png similarity index 100% rename from graphics/pokemon/ledyba/icon.png rename to graphics/pokemon/gen_2/ledyba/icon.png diff --git a/graphics/pokemon/ledyba/normal.pal b/graphics/pokemon/gen_2/ledyba/normal.pal similarity index 100% rename from graphics/pokemon/ledyba/normal.pal rename to graphics/pokemon/gen_2/ledyba/normal.pal diff --git a/graphics/pokemon/ledyba/shiny.pal b/graphics/pokemon/gen_2/ledyba/shiny.pal similarity index 100% rename from graphics/pokemon/ledyba/shiny.pal rename to graphics/pokemon/gen_2/ledyba/shiny.pal diff --git a/graphics/pokemon/lugia/anim_front.png b/graphics/pokemon/gen_2/lugia/anim_front.png similarity index 100% rename from graphics/pokemon/lugia/anim_front.png rename to graphics/pokemon/gen_2/lugia/anim_front.png diff --git a/graphics/pokemon/lugia/back.png b/graphics/pokemon/gen_2/lugia/back.png similarity index 100% rename from graphics/pokemon/lugia/back.png rename to graphics/pokemon/gen_2/lugia/back.png diff --git a/graphics/pokemon/lugia/footprint.png b/graphics/pokemon/gen_2/lugia/footprint.png similarity index 100% rename from graphics/pokemon/lugia/footprint.png rename to graphics/pokemon/gen_2/lugia/footprint.png diff --git a/graphics/pokemon/lugia/icon.png b/graphics/pokemon/gen_2/lugia/icon.png similarity index 100% rename from graphics/pokemon/lugia/icon.png rename to graphics/pokemon/gen_2/lugia/icon.png diff --git a/graphics/pokemon/lugia/normal.pal b/graphics/pokemon/gen_2/lugia/normal.pal similarity index 100% rename from graphics/pokemon/lugia/normal.pal rename to graphics/pokemon/gen_2/lugia/normal.pal diff --git a/graphics/pokemon/lugia/shiny.pal b/graphics/pokemon/gen_2/lugia/shiny.pal similarity index 100% rename from graphics/pokemon/lugia/shiny.pal rename to graphics/pokemon/gen_2/lugia/shiny.pal diff --git a/graphics/pokemon/magby/anim_front.png b/graphics/pokemon/gen_2/magby/anim_front.png similarity index 100% rename from graphics/pokemon/magby/anim_front.png rename to graphics/pokemon/gen_2/magby/anim_front.png diff --git a/graphics/pokemon/magby/back.png b/graphics/pokemon/gen_2/magby/back.png similarity index 100% rename from graphics/pokemon/magby/back.png rename to graphics/pokemon/gen_2/magby/back.png diff --git a/graphics/pokemon/magby/footprint.png b/graphics/pokemon/gen_2/magby/footprint.png similarity index 100% rename from graphics/pokemon/magby/footprint.png rename to graphics/pokemon/gen_2/magby/footprint.png diff --git a/graphics/pokemon/magby/icon.png b/graphics/pokemon/gen_2/magby/icon.png similarity index 100% rename from graphics/pokemon/magby/icon.png rename to graphics/pokemon/gen_2/magby/icon.png diff --git a/graphics/pokemon/magby/normal.pal b/graphics/pokemon/gen_2/magby/normal.pal similarity index 100% rename from graphics/pokemon/magby/normal.pal rename to graphics/pokemon/gen_2/magby/normal.pal diff --git a/graphics/pokemon/magby/shiny.pal b/graphics/pokemon/gen_2/magby/shiny.pal similarity index 100% rename from graphics/pokemon/magby/shiny.pal rename to graphics/pokemon/gen_2/magby/shiny.pal diff --git a/graphics/pokemon/magcargo/anim_front.png b/graphics/pokemon/gen_2/magcargo/anim_front.png similarity index 100% rename from graphics/pokemon/magcargo/anim_front.png rename to graphics/pokemon/gen_2/magcargo/anim_front.png diff --git a/graphics/pokemon/magcargo/back.png b/graphics/pokemon/gen_2/magcargo/back.png similarity index 100% rename from graphics/pokemon/magcargo/back.png rename to graphics/pokemon/gen_2/magcargo/back.png diff --git a/graphics/pokemon/ditto/footprint.png b/graphics/pokemon/gen_2/magcargo/footprint.png similarity index 100% rename from graphics/pokemon/ditto/footprint.png rename to graphics/pokemon/gen_2/magcargo/footprint.png diff --git a/graphics/pokemon/magcargo/icon.png b/graphics/pokemon/gen_2/magcargo/icon.png similarity index 100% rename from graphics/pokemon/magcargo/icon.png rename to graphics/pokemon/gen_2/magcargo/icon.png diff --git a/graphics/pokemon/magcargo/normal.pal b/graphics/pokemon/gen_2/magcargo/normal.pal similarity index 100% rename from graphics/pokemon/magcargo/normal.pal rename to graphics/pokemon/gen_2/magcargo/normal.pal diff --git a/graphics/pokemon/magcargo/shiny.pal b/graphics/pokemon/gen_2/magcargo/shiny.pal similarity index 100% rename from graphics/pokemon/magcargo/shiny.pal rename to graphics/pokemon/gen_2/magcargo/shiny.pal diff --git a/graphics/pokemon/mantine/anim_front.png b/graphics/pokemon/gen_2/mantine/anim_front.png similarity index 100% rename from graphics/pokemon/mantine/anim_front.png rename to graphics/pokemon/gen_2/mantine/anim_front.png diff --git a/graphics/pokemon/mantine/back.png b/graphics/pokemon/gen_2/mantine/back.png similarity index 100% rename from graphics/pokemon/mantine/back.png rename to graphics/pokemon/gen_2/mantine/back.png diff --git a/graphics/pokemon/doublade/footprint.png b/graphics/pokemon/gen_2/mantine/footprint.png similarity index 100% rename from graphics/pokemon/doublade/footprint.png rename to graphics/pokemon/gen_2/mantine/footprint.png diff --git a/graphics/pokemon/mantine/icon.png b/graphics/pokemon/gen_2/mantine/icon.png similarity index 100% rename from graphics/pokemon/mantine/icon.png rename to graphics/pokemon/gen_2/mantine/icon.png diff --git a/graphics/pokemon/mantine/normal.pal b/graphics/pokemon/gen_2/mantine/normal.pal similarity index 100% rename from graphics/pokemon/mantine/normal.pal rename to graphics/pokemon/gen_2/mantine/normal.pal diff --git a/graphics/pokemon/mantine/shiny.pal b/graphics/pokemon/gen_2/mantine/shiny.pal similarity index 100% rename from graphics/pokemon/mantine/shiny.pal rename to graphics/pokemon/gen_2/mantine/shiny.pal diff --git a/graphics/pokemon/mareep/anim_front.png b/graphics/pokemon/gen_2/mareep/anim_front.png similarity index 100% rename from graphics/pokemon/mareep/anim_front.png rename to graphics/pokemon/gen_2/mareep/anim_front.png diff --git a/graphics/pokemon/mareep/back.png b/graphics/pokemon/gen_2/mareep/back.png similarity index 100% rename from graphics/pokemon/mareep/back.png rename to graphics/pokemon/gen_2/mareep/back.png diff --git a/graphics/pokemon/mareep/footprint.png b/graphics/pokemon/gen_2/mareep/footprint.png similarity index 100% rename from graphics/pokemon/mareep/footprint.png rename to graphics/pokemon/gen_2/mareep/footprint.png diff --git a/graphics/pokemon/mareep/icon.png b/graphics/pokemon/gen_2/mareep/icon.png similarity index 100% rename from graphics/pokemon/mareep/icon.png rename to graphics/pokemon/gen_2/mareep/icon.png diff --git a/graphics/pokemon/mareep/normal.pal b/graphics/pokemon/gen_2/mareep/normal.pal similarity index 100% rename from graphics/pokemon/mareep/normal.pal rename to graphics/pokemon/gen_2/mareep/normal.pal diff --git a/graphics/pokemon/mareep/shiny.pal b/graphics/pokemon/gen_2/mareep/shiny.pal similarity index 100% rename from graphics/pokemon/mareep/shiny.pal rename to graphics/pokemon/gen_2/mareep/shiny.pal diff --git a/graphics/pokemon/marill/anim_front.png b/graphics/pokemon/gen_2/marill/anim_front.png similarity index 100% rename from graphics/pokemon/marill/anim_front.png rename to graphics/pokemon/gen_2/marill/anim_front.png diff --git a/graphics/pokemon/marill/back.png b/graphics/pokemon/gen_2/marill/back.png similarity index 100% rename from graphics/pokemon/marill/back.png rename to graphics/pokemon/gen_2/marill/back.png diff --git a/graphics/pokemon/marill/footprint.png b/graphics/pokemon/gen_2/marill/footprint.png similarity index 100% rename from graphics/pokemon/marill/footprint.png rename to graphics/pokemon/gen_2/marill/footprint.png diff --git a/graphics/pokemon/marill/icon.png b/graphics/pokemon/gen_2/marill/icon.png similarity index 100% rename from graphics/pokemon/marill/icon.png rename to graphics/pokemon/gen_2/marill/icon.png diff --git a/graphics/pokemon/marill/normal.pal b/graphics/pokemon/gen_2/marill/normal.pal similarity index 100% rename from graphics/pokemon/marill/normal.pal rename to graphics/pokemon/gen_2/marill/normal.pal diff --git a/graphics/pokemon/marill/shiny.pal b/graphics/pokemon/gen_2/marill/shiny.pal similarity index 100% rename from graphics/pokemon/marill/shiny.pal rename to graphics/pokemon/gen_2/marill/shiny.pal diff --git a/graphics/pokemon/meganium/anim_front.png b/graphics/pokemon/gen_2/meganium/anim_front.png similarity index 100% rename from graphics/pokemon/meganium/anim_front.png rename to graphics/pokemon/gen_2/meganium/anim_front.png diff --git a/graphics/pokemon/meganium/anim_frontf.png b/graphics/pokemon/gen_2/meganium/anim_frontf.png similarity index 100% rename from graphics/pokemon/meganium/anim_frontf.png rename to graphics/pokemon/gen_2/meganium/anim_frontf.png diff --git a/graphics/pokemon/meganium/back.png b/graphics/pokemon/gen_2/meganium/back.png similarity index 100% rename from graphics/pokemon/meganium/back.png rename to graphics/pokemon/gen_2/meganium/back.png diff --git a/graphics/pokemon/meganium/backf.png b/graphics/pokemon/gen_2/meganium/backf.png similarity index 100% rename from graphics/pokemon/meganium/backf.png rename to graphics/pokemon/gen_2/meganium/backf.png diff --git a/graphics/pokemon/meganium/footprint.png b/graphics/pokemon/gen_2/meganium/footprint.png similarity index 100% rename from graphics/pokemon/meganium/footprint.png rename to graphics/pokemon/gen_2/meganium/footprint.png diff --git a/graphics/pokemon/meganium/icon.png b/graphics/pokemon/gen_2/meganium/icon.png similarity index 100% rename from graphics/pokemon/meganium/icon.png rename to graphics/pokemon/gen_2/meganium/icon.png diff --git a/graphics/pokemon/meganium/normal.pal b/graphics/pokemon/gen_2/meganium/normal.pal similarity index 100% rename from graphics/pokemon/meganium/normal.pal rename to graphics/pokemon/gen_2/meganium/normal.pal diff --git a/graphics/pokemon/meganium/shiny.pal b/graphics/pokemon/gen_2/meganium/shiny.pal similarity index 100% rename from graphics/pokemon/meganium/shiny.pal rename to graphics/pokemon/gen_2/meganium/shiny.pal diff --git a/graphics/pokemon/miltank/anim_front.png b/graphics/pokemon/gen_2/miltank/anim_front.png similarity index 100% rename from graphics/pokemon/miltank/anim_front.png rename to graphics/pokemon/gen_2/miltank/anim_front.png diff --git a/graphics/pokemon/miltank/back.png b/graphics/pokemon/gen_2/miltank/back.png similarity index 100% rename from graphics/pokemon/miltank/back.png rename to graphics/pokemon/gen_2/miltank/back.png diff --git a/graphics/pokemon/miltank/footprint.png b/graphics/pokemon/gen_2/miltank/footprint.png similarity index 100% rename from graphics/pokemon/miltank/footprint.png rename to graphics/pokemon/gen_2/miltank/footprint.png diff --git a/graphics/pokemon/miltank/icon.png b/graphics/pokemon/gen_2/miltank/icon.png similarity index 100% rename from graphics/pokemon/miltank/icon.png rename to graphics/pokemon/gen_2/miltank/icon.png diff --git a/graphics/pokemon/miltank/normal.pal b/graphics/pokemon/gen_2/miltank/normal.pal similarity index 100% rename from graphics/pokemon/miltank/normal.pal rename to graphics/pokemon/gen_2/miltank/normal.pal diff --git a/graphics/pokemon/miltank/shiny.pal b/graphics/pokemon/gen_2/miltank/shiny.pal similarity index 100% rename from graphics/pokemon/miltank/shiny.pal rename to graphics/pokemon/gen_2/miltank/shiny.pal diff --git a/graphics/pokemon/misdreavus/anim_front.png b/graphics/pokemon/gen_2/misdreavus/anim_front.png similarity index 100% rename from graphics/pokemon/misdreavus/anim_front.png rename to graphics/pokemon/gen_2/misdreavus/anim_front.png diff --git a/graphics/pokemon/misdreavus/back.png b/graphics/pokemon/gen_2/misdreavus/back.png similarity index 100% rename from graphics/pokemon/misdreavus/back.png rename to graphics/pokemon/gen_2/misdreavus/back.png diff --git a/graphics/pokemon/dragalge/footprint.png b/graphics/pokemon/gen_2/misdreavus/footprint.png similarity index 100% rename from graphics/pokemon/dragalge/footprint.png rename to graphics/pokemon/gen_2/misdreavus/footprint.png diff --git a/graphics/pokemon/misdreavus/icon.png b/graphics/pokemon/gen_2/misdreavus/icon.png similarity index 100% rename from graphics/pokemon/misdreavus/icon.png rename to graphics/pokemon/gen_2/misdreavus/icon.png diff --git a/graphics/pokemon/misdreavus/normal.pal b/graphics/pokemon/gen_2/misdreavus/normal.pal similarity index 100% rename from graphics/pokemon/misdreavus/normal.pal rename to graphics/pokemon/gen_2/misdreavus/normal.pal diff --git a/graphics/pokemon/misdreavus/shiny.pal b/graphics/pokemon/gen_2/misdreavus/shiny.pal similarity index 100% rename from graphics/pokemon/misdreavus/shiny.pal rename to graphics/pokemon/gen_2/misdreavus/shiny.pal diff --git a/graphics/pokemon/murkrow/anim_front.png b/graphics/pokemon/gen_2/murkrow/anim_front.png similarity index 100% rename from graphics/pokemon/murkrow/anim_front.png rename to graphics/pokemon/gen_2/murkrow/anim_front.png diff --git a/graphics/pokemon/murkrow/anim_frontf.png b/graphics/pokemon/gen_2/murkrow/anim_frontf.png similarity index 100% rename from graphics/pokemon/murkrow/anim_frontf.png rename to graphics/pokemon/gen_2/murkrow/anim_frontf.png diff --git a/graphics/pokemon/murkrow/back.png b/graphics/pokemon/gen_2/murkrow/back.png similarity index 100% rename from graphics/pokemon/murkrow/back.png rename to graphics/pokemon/gen_2/murkrow/back.png diff --git a/graphics/pokemon/murkrow/backf.png b/graphics/pokemon/gen_2/murkrow/backf.png similarity index 100% rename from graphics/pokemon/murkrow/backf.png rename to graphics/pokemon/gen_2/murkrow/backf.png diff --git a/graphics/pokemon/murkrow/footprint.png b/graphics/pokemon/gen_2/murkrow/footprint.png similarity index 100% rename from graphics/pokemon/murkrow/footprint.png rename to graphics/pokemon/gen_2/murkrow/footprint.png diff --git a/graphics/pokemon/murkrow/icon.png b/graphics/pokemon/gen_2/murkrow/icon.png similarity index 100% rename from graphics/pokemon/murkrow/icon.png rename to graphics/pokemon/gen_2/murkrow/icon.png diff --git a/graphics/pokemon/murkrow/normal.pal b/graphics/pokemon/gen_2/murkrow/normal.pal similarity index 100% rename from graphics/pokemon/murkrow/normal.pal rename to graphics/pokemon/gen_2/murkrow/normal.pal diff --git a/graphics/pokemon/murkrow/shiny.pal b/graphics/pokemon/gen_2/murkrow/shiny.pal similarity index 100% rename from graphics/pokemon/murkrow/shiny.pal rename to graphics/pokemon/gen_2/murkrow/shiny.pal diff --git a/graphics/pokemon/natu/anim_front.png b/graphics/pokemon/gen_2/natu/anim_front.png similarity index 100% rename from graphics/pokemon/natu/anim_front.png rename to graphics/pokemon/gen_2/natu/anim_front.png diff --git a/graphics/pokemon/natu/back.png b/graphics/pokemon/gen_2/natu/back.png similarity index 100% rename from graphics/pokemon/natu/back.png rename to graphics/pokemon/gen_2/natu/back.png diff --git a/graphics/pokemon/natu/footprint.png b/graphics/pokemon/gen_2/natu/footprint.png similarity index 100% rename from graphics/pokemon/natu/footprint.png rename to graphics/pokemon/gen_2/natu/footprint.png diff --git a/graphics/pokemon/natu/icon.png b/graphics/pokemon/gen_2/natu/icon.png similarity index 100% rename from graphics/pokemon/natu/icon.png rename to graphics/pokemon/gen_2/natu/icon.png diff --git a/graphics/pokemon/natu/normal.pal b/graphics/pokemon/gen_2/natu/normal.pal similarity index 100% rename from graphics/pokemon/natu/normal.pal rename to graphics/pokemon/gen_2/natu/normal.pal diff --git a/graphics/pokemon/natu/shiny.pal b/graphics/pokemon/gen_2/natu/shiny.pal similarity index 100% rename from graphics/pokemon/natu/shiny.pal rename to graphics/pokemon/gen_2/natu/shiny.pal diff --git a/graphics/pokemon/noctowl/anim_front.png b/graphics/pokemon/gen_2/noctowl/anim_front.png similarity index 100% rename from graphics/pokemon/noctowl/anim_front.png rename to graphics/pokemon/gen_2/noctowl/anim_front.png diff --git a/graphics/pokemon/noctowl/back.png b/graphics/pokemon/gen_2/noctowl/back.png similarity index 100% rename from graphics/pokemon/noctowl/back.png rename to graphics/pokemon/gen_2/noctowl/back.png diff --git a/graphics/pokemon/noctowl/footprint.png b/graphics/pokemon/gen_2/noctowl/footprint.png similarity index 100% rename from graphics/pokemon/noctowl/footprint.png rename to graphics/pokemon/gen_2/noctowl/footprint.png diff --git a/graphics/pokemon/noctowl/icon.png b/graphics/pokemon/gen_2/noctowl/icon.png similarity index 100% rename from graphics/pokemon/noctowl/icon.png rename to graphics/pokemon/gen_2/noctowl/icon.png diff --git a/graphics/pokemon/noctowl/normal.pal b/graphics/pokemon/gen_2/noctowl/normal.pal similarity index 100% rename from graphics/pokemon/noctowl/normal.pal rename to graphics/pokemon/gen_2/noctowl/normal.pal diff --git a/graphics/pokemon/noctowl/shiny.pal b/graphics/pokemon/gen_2/noctowl/shiny.pal similarity index 100% rename from graphics/pokemon/noctowl/shiny.pal rename to graphics/pokemon/gen_2/noctowl/shiny.pal diff --git a/graphics/pokemon/octillery/anim_front.png b/graphics/pokemon/gen_2/octillery/anim_front.png similarity index 100% rename from graphics/pokemon/octillery/anim_front.png rename to graphics/pokemon/gen_2/octillery/anim_front.png diff --git a/graphics/pokemon/octillery/anim_frontf.png b/graphics/pokemon/gen_2/octillery/anim_frontf.png similarity index 100% rename from graphics/pokemon/octillery/anim_frontf.png rename to graphics/pokemon/gen_2/octillery/anim_frontf.png diff --git a/graphics/pokemon/octillery/back.png b/graphics/pokemon/gen_2/octillery/back.png similarity index 100% rename from graphics/pokemon/octillery/back.png rename to graphics/pokemon/gen_2/octillery/back.png diff --git a/graphics/pokemon/octillery/backf.png b/graphics/pokemon/gen_2/octillery/backf.png similarity index 100% rename from graphics/pokemon/octillery/backf.png rename to graphics/pokemon/gen_2/octillery/backf.png diff --git a/graphics/pokemon/grapploct/footprint.png b/graphics/pokemon/gen_2/octillery/footprint.png similarity index 100% rename from graphics/pokemon/grapploct/footprint.png rename to graphics/pokemon/gen_2/octillery/footprint.png diff --git a/graphics/pokemon/octillery/icon.png b/graphics/pokemon/gen_2/octillery/icon.png similarity index 100% rename from graphics/pokemon/octillery/icon.png rename to graphics/pokemon/gen_2/octillery/icon.png diff --git a/graphics/pokemon/octillery/normal.pal b/graphics/pokemon/gen_2/octillery/normal.pal similarity index 100% rename from graphics/pokemon/octillery/normal.pal rename to graphics/pokemon/gen_2/octillery/normal.pal diff --git a/graphics/pokemon/octillery/shiny.pal b/graphics/pokemon/gen_2/octillery/shiny.pal similarity index 100% rename from graphics/pokemon/octillery/shiny.pal rename to graphics/pokemon/gen_2/octillery/shiny.pal diff --git a/graphics/pokemon/phanpy/anim_front.png b/graphics/pokemon/gen_2/phanpy/anim_front.png similarity index 100% rename from graphics/pokemon/phanpy/anim_front.png rename to graphics/pokemon/gen_2/phanpy/anim_front.png diff --git a/graphics/pokemon/phanpy/back.png b/graphics/pokemon/gen_2/phanpy/back.png similarity index 100% rename from graphics/pokemon/phanpy/back.png rename to graphics/pokemon/gen_2/phanpy/back.png diff --git a/graphics/pokemon/phanpy/footprint.png b/graphics/pokemon/gen_2/phanpy/footprint.png similarity index 100% rename from graphics/pokemon/phanpy/footprint.png rename to graphics/pokemon/gen_2/phanpy/footprint.png diff --git a/graphics/pokemon/phanpy/icon.png b/graphics/pokemon/gen_2/phanpy/icon.png similarity index 100% rename from graphics/pokemon/phanpy/icon.png rename to graphics/pokemon/gen_2/phanpy/icon.png diff --git a/graphics/pokemon/phanpy/normal.pal b/graphics/pokemon/gen_2/phanpy/normal.pal similarity index 100% rename from graphics/pokemon/phanpy/normal.pal rename to graphics/pokemon/gen_2/phanpy/normal.pal diff --git a/graphics/pokemon/phanpy/shiny.pal b/graphics/pokemon/gen_2/phanpy/shiny.pal similarity index 100% rename from graphics/pokemon/phanpy/shiny.pal rename to graphics/pokemon/gen_2/phanpy/shiny.pal diff --git a/graphics/pokemon/pichu/anim_front.png b/graphics/pokemon/gen_2/pichu/anim_front.png similarity index 100% rename from graphics/pokemon/pichu/anim_front.png rename to graphics/pokemon/gen_2/pichu/anim_front.png diff --git a/graphics/pokemon/pichu/back.png b/graphics/pokemon/gen_2/pichu/back.png similarity index 100% rename from graphics/pokemon/pichu/back.png rename to graphics/pokemon/gen_2/pichu/back.png diff --git a/graphics/pokemon/pichu/footprint.png b/graphics/pokemon/gen_2/pichu/footprint.png similarity index 100% rename from graphics/pokemon/pichu/footprint.png rename to graphics/pokemon/gen_2/pichu/footprint.png diff --git a/graphics/pokemon/pichu/icon.png b/graphics/pokemon/gen_2/pichu/icon.png similarity index 100% rename from graphics/pokemon/pichu/icon.png rename to graphics/pokemon/gen_2/pichu/icon.png diff --git a/graphics/pokemon/pichu/normal.pal b/graphics/pokemon/gen_2/pichu/normal.pal similarity index 100% rename from graphics/pokemon/pichu/normal.pal rename to graphics/pokemon/gen_2/pichu/normal.pal diff --git a/graphics/pokemon/pichu/shiny.pal b/graphics/pokemon/gen_2/pichu/shiny.pal similarity index 100% rename from graphics/pokemon/pichu/shiny.pal rename to graphics/pokemon/gen_2/pichu/shiny.pal diff --git a/graphics/pokemon/pichu/spiky_eared/anim_front.png b/graphics/pokemon/gen_2/pichu/spiky_eared/anim_front.png similarity index 100% rename from graphics/pokemon/pichu/spiky_eared/anim_front.png rename to graphics/pokemon/gen_2/pichu/spiky_eared/anim_front.png diff --git a/graphics/pokemon/pichu/spiky_eared/back.png b/graphics/pokemon/gen_2/pichu/spiky_eared/back.png similarity index 100% rename from graphics/pokemon/pichu/spiky_eared/back.png rename to graphics/pokemon/gen_2/pichu/spiky_eared/back.png diff --git a/graphics/pokemon/pichu/spiky_eared/front.png b/graphics/pokemon/gen_2/pichu/spiky_eared/front.png similarity index 100% rename from graphics/pokemon/pichu/spiky_eared/front.png rename to graphics/pokemon/gen_2/pichu/spiky_eared/front.png diff --git a/graphics/pokemon/pichu/spiky_eared/icon.png b/graphics/pokemon/gen_2/pichu/spiky_eared/icon.png similarity index 100% rename from graphics/pokemon/pichu/spiky_eared/icon.png rename to graphics/pokemon/gen_2/pichu/spiky_eared/icon.png diff --git a/graphics/pokemon/pichu/spiky_eared/normal.pal b/graphics/pokemon/gen_2/pichu/spiky_eared/normal.pal similarity index 100% rename from graphics/pokemon/pichu/spiky_eared/normal.pal rename to graphics/pokemon/gen_2/pichu/spiky_eared/normal.pal diff --git a/graphics/pokemon/pichu/spiky_eared/shiny.pal b/graphics/pokemon/gen_2/pichu/spiky_eared/shiny.pal similarity index 100% rename from graphics/pokemon/pichu/spiky_eared/shiny.pal rename to graphics/pokemon/gen_2/pichu/spiky_eared/shiny.pal diff --git a/graphics/pokemon/piloswine/anim_front.png b/graphics/pokemon/gen_2/piloswine/anim_front.png similarity index 100% rename from graphics/pokemon/piloswine/anim_front.png rename to graphics/pokemon/gen_2/piloswine/anim_front.png diff --git a/graphics/pokemon/piloswine/anim_frontf.png b/graphics/pokemon/gen_2/piloswine/anim_frontf.png similarity index 100% rename from graphics/pokemon/piloswine/anim_frontf.png rename to graphics/pokemon/gen_2/piloswine/anim_frontf.png diff --git a/graphics/pokemon/piloswine/back.png b/graphics/pokemon/gen_2/piloswine/back.png similarity index 100% rename from graphics/pokemon/piloswine/back.png rename to graphics/pokemon/gen_2/piloswine/back.png diff --git a/graphics/pokemon/piloswine/backf.png b/graphics/pokemon/gen_2/piloswine/backf.png similarity index 100% rename from graphics/pokemon/piloswine/backf.png rename to graphics/pokemon/gen_2/piloswine/backf.png diff --git a/graphics/pokemon/piloswine/footprint.png b/graphics/pokemon/gen_2/piloswine/footprint.png similarity index 100% rename from graphics/pokemon/piloswine/footprint.png rename to graphics/pokemon/gen_2/piloswine/footprint.png diff --git a/graphics/pokemon/piloswine/icon.png b/graphics/pokemon/gen_2/piloswine/icon.png similarity index 100% rename from graphics/pokemon/piloswine/icon.png rename to graphics/pokemon/gen_2/piloswine/icon.png diff --git a/graphics/pokemon/piloswine/normal.pal b/graphics/pokemon/gen_2/piloswine/normal.pal similarity index 100% rename from graphics/pokemon/piloswine/normal.pal rename to graphics/pokemon/gen_2/piloswine/normal.pal diff --git a/graphics/pokemon/piloswine/shiny.pal b/graphics/pokemon/gen_2/piloswine/shiny.pal similarity index 100% rename from graphics/pokemon/piloswine/shiny.pal rename to graphics/pokemon/gen_2/piloswine/shiny.pal diff --git a/graphics/pokemon/pineco/anim_front.png b/graphics/pokemon/gen_2/pineco/anim_front.png similarity index 100% rename from graphics/pokemon/pineco/anim_front.png rename to graphics/pokemon/gen_2/pineco/anim_front.png diff --git a/graphics/pokemon/pineco/back.png b/graphics/pokemon/gen_2/pineco/back.png similarity index 100% rename from graphics/pokemon/pineco/back.png rename to graphics/pokemon/gen_2/pineco/back.png diff --git a/graphics/pokemon/dragonair/footprint.png b/graphics/pokemon/gen_2/pineco/footprint.png similarity index 100% rename from graphics/pokemon/dragonair/footprint.png rename to graphics/pokemon/gen_2/pineco/footprint.png diff --git a/graphics/pokemon/pineco/icon.png b/graphics/pokemon/gen_2/pineco/icon.png similarity index 100% rename from graphics/pokemon/pineco/icon.png rename to graphics/pokemon/gen_2/pineco/icon.png diff --git a/graphics/pokemon/pineco/normal.pal b/graphics/pokemon/gen_2/pineco/normal.pal similarity index 100% rename from graphics/pokemon/pineco/normal.pal rename to graphics/pokemon/gen_2/pineco/normal.pal diff --git a/graphics/pokemon/pineco/shiny.pal b/graphics/pokemon/gen_2/pineco/shiny.pal similarity index 100% rename from graphics/pokemon/pineco/shiny.pal rename to graphics/pokemon/gen_2/pineco/shiny.pal diff --git a/graphics/pokemon/politoed/anim_front.png b/graphics/pokemon/gen_2/politoed/anim_front.png similarity index 100% rename from graphics/pokemon/politoed/anim_front.png rename to graphics/pokemon/gen_2/politoed/anim_front.png diff --git a/graphics/pokemon/politoed/anim_frontf.png b/graphics/pokemon/gen_2/politoed/anim_frontf.png similarity index 100% rename from graphics/pokemon/politoed/anim_frontf.png rename to graphics/pokemon/gen_2/politoed/anim_frontf.png diff --git a/graphics/pokemon/politoed/back.png b/graphics/pokemon/gen_2/politoed/back.png similarity index 100% rename from graphics/pokemon/politoed/back.png rename to graphics/pokemon/gen_2/politoed/back.png diff --git a/graphics/pokemon/politoed/backf.png b/graphics/pokemon/gen_2/politoed/backf.png similarity index 100% rename from graphics/pokemon/politoed/backf.png rename to graphics/pokemon/gen_2/politoed/backf.png diff --git a/graphics/pokemon/politoed/footprint.png b/graphics/pokemon/gen_2/politoed/footprint.png similarity index 100% rename from graphics/pokemon/politoed/footprint.png rename to graphics/pokemon/gen_2/politoed/footprint.png diff --git a/graphics/pokemon/politoed/icon.png b/graphics/pokemon/gen_2/politoed/icon.png similarity index 100% rename from graphics/pokemon/politoed/icon.png rename to graphics/pokemon/gen_2/politoed/icon.png diff --git a/graphics/pokemon/politoed/normal.pal b/graphics/pokemon/gen_2/politoed/normal.pal similarity index 100% rename from graphics/pokemon/politoed/normal.pal rename to graphics/pokemon/gen_2/politoed/normal.pal diff --git a/graphics/pokemon/politoed/shiny.pal b/graphics/pokemon/gen_2/politoed/shiny.pal similarity index 100% rename from graphics/pokemon/politoed/shiny.pal rename to graphics/pokemon/gen_2/politoed/shiny.pal diff --git a/graphics/pokemon/porygon2/anim_front.png b/graphics/pokemon/gen_2/porygon2/anim_front.png similarity index 100% rename from graphics/pokemon/porygon2/anim_front.png rename to graphics/pokemon/gen_2/porygon2/anim_front.png diff --git a/graphics/pokemon/porygon2/back.png b/graphics/pokemon/gen_2/porygon2/back.png similarity index 100% rename from graphics/pokemon/porygon2/back.png rename to graphics/pokemon/gen_2/porygon2/back.png diff --git a/graphics/pokemon/arctovish/footprint.png b/graphics/pokemon/gen_2/porygon2/footprint.png similarity index 100% rename from graphics/pokemon/arctovish/footprint.png rename to graphics/pokemon/gen_2/porygon2/footprint.png diff --git a/graphics/pokemon/porygon2/icon.png b/graphics/pokemon/gen_2/porygon2/icon.png similarity index 100% rename from graphics/pokemon/porygon2/icon.png rename to graphics/pokemon/gen_2/porygon2/icon.png diff --git a/graphics/pokemon/porygon2/normal.pal b/graphics/pokemon/gen_2/porygon2/normal.pal similarity index 100% rename from graphics/pokemon/porygon2/normal.pal rename to graphics/pokemon/gen_2/porygon2/normal.pal diff --git a/graphics/pokemon/porygon2/shiny.pal b/graphics/pokemon/gen_2/porygon2/shiny.pal similarity index 100% rename from graphics/pokemon/porygon2/shiny.pal rename to graphics/pokemon/gen_2/porygon2/shiny.pal diff --git a/graphics/pokemon/pupitar/anim_front.png b/graphics/pokemon/gen_2/pupitar/anim_front.png similarity index 100% rename from graphics/pokemon/pupitar/anim_front.png rename to graphics/pokemon/gen_2/pupitar/anim_front.png diff --git a/graphics/pokemon/pupitar/back.png b/graphics/pokemon/gen_2/pupitar/back.png similarity index 100% rename from graphics/pokemon/pupitar/back.png rename to graphics/pokemon/gen_2/pupitar/back.png diff --git a/graphics/pokemon/drampa/footprint.png b/graphics/pokemon/gen_2/pupitar/footprint.png similarity index 100% rename from graphics/pokemon/drampa/footprint.png rename to graphics/pokemon/gen_2/pupitar/footprint.png diff --git a/graphics/pokemon/pupitar/icon.png b/graphics/pokemon/gen_2/pupitar/icon.png similarity index 100% rename from graphics/pokemon/pupitar/icon.png rename to graphics/pokemon/gen_2/pupitar/icon.png diff --git a/graphics/pokemon/pupitar/normal.pal b/graphics/pokemon/gen_2/pupitar/normal.pal similarity index 100% rename from graphics/pokemon/pupitar/normal.pal rename to graphics/pokemon/gen_2/pupitar/normal.pal diff --git a/graphics/pokemon/pupitar/shiny.pal b/graphics/pokemon/gen_2/pupitar/shiny.pal similarity index 100% rename from graphics/pokemon/pupitar/shiny.pal rename to graphics/pokemon/gen_2/pupitar/shiny.pal diff --git a/graphics/pokemon/quagsire/anim_front.png b/graphics/pokemon/gen_2/quagsire/anim_front.png similarity index 100% rename from graphics/pokemon/quagsire/anim_front.png rename to graphics/pokemon/gen_2/quagsire/anim_front.png diff --git a/graphics/pokemon/quagsire/anim_frontf.png b/graphics/pokemon/gen_2/quagsire/anim_frontf.png similarity index 100% rename from graphics/pokemon/quagsire/anim_frontf.png rename to graphics/pokemon/gen_2/quagsire/anim_frontf.png diff --git a/graphics/pokemon/quagsire/back.png b/graphics/pokemon/gen_2/quagsire/back.png similarity index 100% rename from graphics/pokemon/quagsire/back.png rename to graphics/pokemon/gen_2/quagsire/back.png diff --git a/graphics/pokemon/quagsire/backf.png b/graphics/pokemon/gen_2/quagsire/backf.png similarity index 100% rename from graphics/pokemon/quagsire/backf.png rename to graphics/pokemon/gen_2/quagsire/backf.png diff --git a/graphics/pokemon/quagsire/footprint.png b/graphics/pokemon/gen_2/quagsire/footprint.png similarity index 100% rename from graphics/pokemon/quagsire/footprint.png rename to graphics/pokemon/gen_2/quagsire/footprint.png diff --git a/graphics/pokemon/quagsire/icon.png b/graphics/pokemon/gen_2/quagsire/icon.png similarity index 100% rename from graphics/pokemon/quagsire/icon.png rename to graphics/pokemon/gen_2/quagsire/icon.png diff --git a/graphics/pokemon/quagsire/normal.pal b/graphics/pokemon/gen_2/quagsire/normal.pal similarity index 100% rename from graphics/pokemon/quagsire/normal.pal rename to graphics/pokemon/gen_2/quagsire/normal.pal diff --git a/graphics/pokemon/quagsire/shiny.pal b/graphics/pokemon/gen_2/quagsire/shiny.pal similarity index 100% rename from graphics/pokemon/quagsire/shiny.pal rename to graphics/pokemon/gen_2/quagsire/shiny.pal diff --git a/graphics/pokemon/quilava/anim_front.png b/graphics/pokemon/gen_2/quilava/anim_front.png similarity index 100% rename from graphics/pokemon/quilava/anim_front.png rename to graphics/pokemon/gen_2/quilava/anim_front.png diff --git a/graphics/pokemon/quilava/back.png b/graphics/pokemon/gen_2/quilava/back.png similarity index 100% rename from graphics/pokemon/quilava/back.png rename to graphics/pokemon/gen_2/quilava/back.png diff --git a/graphics/pokemon/quilava/footprint.png b/graphics/pokemon/gen_2/quilava/footprint.png similarity index 100% rename from graphics/pokemon/quilava/footprint.png rename to graphics/pokemon/gen_2/quilava/footprint.png diff --git a/graphics/pokemon/quilava/icon.png b/graphics/pokemon/gen_2/quilava/icon.png similarity index 100% rename from graphics/pokemon/quilava/icon.png rename to graphics/pokemon/gen_2/quilava/icon.png diff --git a/graphics/pokemon/quilava/normal.pal b/graphics/pokemon/gen_2/quilava/normal.pal similarity index 100% rename from graphics/pokemon/quilava/normal.pal rename to graphics/pokemon/gen_2/quilava/normal.pal diff --git a/graphics/pokemon/quilava/shiny.pal b/graphics/pokemon/gen_2/quilava/shiny.pal similarity index 100% rename from graphics/pokemon/quilava/shiny.pal rename to graphics/pokemon/gen_2/quilava/shiny.pal diff --git a/graphics/pokemon/qwilfish/anim_front.png b/graphics/pokemon/gen_2/qwilfish/anim_front.png similarity index 100% rename from graphics/pokemon/qwilfish/anim_front.png rename to graphics/pokemon/gen_2/qwilfish/anim_front.png diff --git a/graphics/pokemon/qwilfish/back.png b/graphics/pokemon/gen_2/qwilfish/back.png similarity index 100% rename from graphics/pokemon/qwilfish/back.png rename to graphics/pokemon/gen_2/qwilfish/back.png diff --git a/graphics/pokemon/dratini/footprint.png b/graphics/pokemon/gen_2/qwilfish/footprint.png similarity index 100% rename from graphics/pokemon/dratini/footprint.png rename to graphics/pokemon/gen_2/qwilfish/footprint.png diff --git a/graphics/pokemon/qwilfish/hisuian/back.png b/graphics/pokemon/gen_2/qwilfish/hisuian/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/back.png rename to graphics/pokemon/gen_2/qwilfish/hisuian/back.png diff --git a/graphics/pokemon/qwilfish/hisuian/front.png b/graphics/pokemon/gen_2/qwilfish/hisuian/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/front.png rename to graphics/pokemon/gen_2/qwilfish/hisuian/front.png diff --git a/graphics/pokemon/qwilfish/hisuian/icon.png b/graphics/pokemon/gen_2/qwilfish/hisuian/icon.png similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/icon.png rename to graphics/pokemon/gen_2/qwilfish/hisuian/icon.png diff --git a/graphics/pokemon/qwilfish/hisuian/normal.pal b/graphics/pokemon/gen_2/qwilfish/hisuian/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/normal.pal rename to graphics/pokemon/gen_2/qwilfish/hisuian/normal.pal diff --git a/graphics/pokemon/qwilfish/hisuian/shiny.pal b/graphics/pokemon/gen_2/qwilfish/hisuian/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/shiny.pal rename to graphics/pokemon/gen_2/qwilfish/hisuian/shiny.pal diff --git a/graphics/pokemon/qwilfish/icon.png b/graphics/pokemon/gen_2/qwilfish/icon.png similarity index 100% rename from graphics/pokemon/qwilfish/icon.png rename to graphics/pokemon/gen_2/qwilfish/icon.png diff --git a/graphics/pokemon/qwilfish/normal.pal b/graphics/pokemon/gen_2/qwilfish/normal.pal similarity index 100% rename from graphics/pokemon/qwilfish/normal.pal rename to graphics/pokemon/gen_2/qwilfish/normal.pal diff --git a/graphics/pokemon/qwilfish/shiny.pal b/graphics/pokemon/gen_2/qwilfish/shiny.pal similarity index 100% rename from graphics/pokemon/qwilfish/shiny.pal rename to graphics/pokemon/gen_2/qwilfish/shiny.pal diff --git a/graphics/pokemon/raikou/anim_front.png b/graphics/pokemon/gen_2/raikou/anim_front.png similarity index 100% rename from graphics/pokemon/raikou/anim_front.png rename to graphics/pokemon/gen_2/raikou/anim_front.png diff --git a/graphics/pokemon/raikou/back.png b/graphics/pokemon/gen_2/raikou/back.png similarity index 100% rename from graphics/pokemon/raikou/back.png rename to graphics/pokemon/gen_2/raikou/back.png diff --git a/graphics/pokemon/raikou/footprint.png b/graphics/pokemon/gen_2/raikou/footprint.png similarity index 100% rename from graphics/pokemon/raikou/footprint.png rename to graphics/pokemon/gen_2/raikou/footprint.png diff --git a/graphics/pokemon/raikou/icon.png b/graphics/pokemon/gen_2/raikou/icon.png similarity index 100% rename from graphics/pokemon/raikou/icon.png rename to graphics/pokemon/gen_2/raikou/icon.png diff --git a/graphics/pokemon/raikou/normal.pal b/graphics/pokemon/gen_2/raikou/normal.pal similarity index 100% rename from graphics/pokemon/raikou/normal.pal rename to graphics/pokemon/gen_2/raikou/normal.pal diff --git a/graphics/pokemon/raikou/shiny.pal b/graphics/pokemon/gen_2/raikou/shiny.pal similarity index 100% rename from graphics/pokemon/raikou/shiny.pal rename to graphics/pokemon/gen_2/raikou/shiny.pal diff --git a/graphics/pokemon/remoraid/anim_front.png b/graphics/pokemon/gen_2/remoraid/anim_front.png similarity index 100% rename from graphics/pokemon/remoraid/anim_front.png rename to graphics/pokemon/gen_2/remoraid/anim_front.png diff --git a/graphics/pokemon/remoraid/back.png b/graphics/pokemon/gen_2/remoraid/back.png similarity index 100% rename from graphics/pokemon/remoraid/back.png rename to graphics/pokemon/gen_2/remoraid/back.png diff --git a/graphics/pokemon/dreepy/footprint.png b/graphics/pokemon/gen_2/remoraid/footprint.png similarity index 100% rename from graphics/pokemon/dreepy/footprint.png rename to graphics/pokemon/gen_2/remoraid/footprint.png diff --git a/graphics/pokemon/remoraid/icon.png b/graphics/pokemon/gen_2/remoraid/icon.png similarity index 100% rename from graphics/pokemon/remoraid/icon.png rename to graphics/pokemon/gen_2/remoraid/icon.png diff --git a/graphics/pokemon/remoraid/normal.pal b/graphics/pokemon/gen_2/remoraid/normal.pal similarity index 100% rename from graphics/pokemon/remoraid/normal.pal rename to graphics/pokemon/gen_2/remoraid/normal.pal diff --git a/graphics/pokemon/remoraid/shiny.pal b/graphics/pokemon/gen_2/remoraid/shiny.pal similarity index 100% rename from graphics/pokemon/remoraid/shiny.pal rename to graphics/pokemon/gen_2/remoraid/shiny.pal diff --git a/graphics/pokemon/scizor/anim_front.png b/graphics/pokemon/gen_2/scizor/anim_front.png similarity index 100% rename from graphics/pokemon/scizor/anim_front.png rename to graphics/pokemon/gen_2/scizor/anim_front.png diff --git a/graphics/pokemon/scizor/anim_frontf.png b/graphics/pokemon/gen_2/scizor/anim_frontf.png similarity index 100% rename from graphics/pokemon/scizor/anim_frontf.png rename to graphics/pokemon/gen_2/scizor/anim_frontf.png diff --git a/graphics/pokemon/scizor/back.png b/graphics/pokemon/gen_2/scizor/back.png similarity index 100% rename from graphics/pokemon/scizor/back.png rename to graphics/pokemon/gen_2/scizor/back.png diff --git a/graphics/pokemon/scizor/footprint.png b/graphics/pokemon/gen_2/scizor/footprint.png similarity index 100% rename from graphics/pokemon/scizor/footprint.png rename to graphics/pokemon/gen_2/scizor/footprint.png diff --git a/graphics/pokemon/scizor/icon.png b/graphics/pokemon/gen_2/scizor/icon.png similarity index 100% rename from graphics/pokemon/scizor/icon.png rename to graphics/pokemon/gen_2/scizor/icon.png diff --git a/graphics/pokemon/scizor/mega/back.png b/graphics/pokemon/gen_2/scizor/mega/back.png similarity index 100% rename from graphics/pokemon/scizor/mega/back.png rename to graphics/pokemon/gen_2/scizor/mega/back.png diff --git a/graphics/pokemon/scizor/mega/front.png b/graphics/pokemon/gen_2/scizor/mega/front.png similarity index 100% rename from graphics/pokemon/scizor/mega/front.png rename to graphics/pokemon/gen_2/scizor/mega/front.png diff --git a/graphics/pokemon/scizor/mega/icon.png b/graphics/pokemon/gen_2/scizor/mega/icon.png similarity index 100% rename from graphics/pokemon/scizor/mega/icon.png rename to graphics/pokemon/gen_2/scizor/mega/icon.png diff --git a/graphics/pokemon/scizor/mega/normal.pal b/graphics/pokemon/gen_2/scizor/mega/normal.pal similarity index 100% rename from graphics/pokemon/scizor/mega/normal.pal rename to graphics/pokemon/gen_2/scizor/mega/normal.pal diff --git a/graphics/pokemon/scizor/mega/shiny.pal b/graphics/pokemon/gen_2/scizor/mega/shiny.pal similarity index 100% rename from graphics/pokemon/scizor/mega/shiny.pal rename to graphics/pokemon/gen_2/scizor/mega/shiny.pal diff --git a/graphics/pokemon/scizor/normal.pal b/graphics/pokemon/gen_2/scizor/normal.pal similarity index 100% rename from graphics/pokemon/scizor/normal.pal rename to graphics/pokemon/gen_2/scizor/normal.pal diff --git a/graphics/pokemon/scizor/shiny.pal b/graphics/pokemon/gen_2/scizor/shiny.pal similarity index 100% rename from graphics/pokemon/scizor/shiny.pal rename to graphics/pokemon/gen_2/scizor/shiny.pal diff --git a/graphics/pokemon/sentret/anim_front.png b/graphics/pokemon/gen_2/sentret/anim_front.png similarity index 100% rename from graphics/pokemon/sentret/anim_front.png rename to graphics/pokemon/gen_2/sentret/anim_front.png diff --git a/graphics/pokemon/sentret/back.png b/graphics/pokemon/gen_2/sentret/back.png similarity index 100% rename from graphics/pokemon/sentret/back.png rename to graphics/pokemon/gen_2/sentret/back.png diff --git a/graphics/pokemon/sentret/footprint.png b/graphics/pokemon/gen_2/sentret/footprint.png similarity index 100% rename from graphics/pokemon/sentret/footprint.png rename to graphics/pokemon/gen_2/sentret/footprint.png diff --git a/graphics/pokemon/sentret/icon.png b/graphics/pokemon/gen_2/sentret/icon.png similarity index 100% rename from graphics/pokemon/sentret/icon.png rename to graphics/pokemon/gen_2/sentret/icon.png diff --git a/graphics/pokemon/sentret/normal.pal b/graphics/pokemon/gen_2/sentret/normal.pal similarity index 100% rename from graphics/pokemon/sentret/normal.pal rename to graphics/pokemon/gen_2/sentret/normal.pal diff --git a/graphics/pokemon/sentret/shiny.pal b/graphics/pokemon/gen_2/sentret/shiny.pal similarity index 100% rename from graphics/pokemon/sentret/shiny.pal rename to graphics/pokemon/gen_2/sentret/shiny.pal diff --git a/graphics/pokemon/shuckle/anim_front.png b/graphics/pokemon/gen_2/shuckle/anim_front.png similarity index 100% rename from graphics/pokemon/shuckle/anim_front.png rename to graphics/pokemon/gen_2/shuckle/anim_front.png diff --git a/graphics/pokemon/shuckle/back.png b/graphics/pokemon/gen_2/shuckle/back.png similarity index 100% rename from graphics/pokemon/shuckle/back.png rename to graphics/pokemon/gen_2/shuckle/back.png diff --git a/graphics/pokemon/amaura/footprint.png b/graphics/pokemon/gen_2/shuckle/footprint.png similarity index 100% rename from graphics/pokemon/amaura/footprint.png rename to graphics/pokemon/gen_2/shuckle/footprint.png diff --git a/graphics/pokemon/shuckle/icon.png b/graphics/pokemon/gen_2/shuckle/icon.png similarity index 100% rename from graphics/pokemon/shuckle/icon.png rename to graphics/pokemon/gen_2/shuckle/icon.png diff --git a/graphics/pokemon/shuckle/normal.pal b/graphics/pokemon/gen_2/shuckle/normal.pal similarity index 100% rename from graphics/pokemon/shuckle/normal.pal rename to graphics/pokemon/gen_2/shuckle/normal.pal diff --git a/graphics/pokemon/shuckle/shiny.pal b/graphics/pokemon/gen_2/shuckle/shiny.pal similarity index 100% rename from graphics/pokemon/shuckle/shiny.pal rename to graphics/pokemon/gen_2/shuckle/shiny.pal diff --git a/graphics/pokemon/skarmory/anim_front.png b/graphics/pokemon/gen_2/skarmory/anim_front.png similarity index 100% rename from graphics/pokemon/skarmory/anim_front.png rename to graphics/pokemon/gen_2/skarmory/anim_front.png diff --git a/graphics/pokemon/skarmory/back.png b/graphics/pokemon/gen_2/skarmory/back.png similarity index 100% rename from graphics/pokemon/skarmory/back.png rename to graphics/pokemon/gen_2/skarmory/back.png diff --git a/graphics/pokemon/skarmory/footprint.png b/graphics/pokemon/gen_2/skarmory/footprint.png similarity index 100% rename from graphics/pokemon/skarmory/footprint.png rename to graphics/pokemon/gen_2/skarmory/footprint.png diff --git a/graphics/pokemon/skarmory/icon.png b/graphics/pokemon/gen_2/skarmory/icon.png similarity index 100% rename from graphics/pokemon/skarmory/icon.png rename to graphics/pokemon/gen_2/skarmory/icon.png diff --git a/graphics/pokemon/skarmory/normal.pal b/graphics/pokemon/gen_2/skarmory/normal.pal similarity index 100% rename from graphics/pokemon/skarmory/normal.pal rename to graphics/pokemon/gen_2/skarmory/normal.pal diff --git a/graphics/pokemon/skarmory/shiny.pal b/graphics/pokemon/gen_2/skarmory/shiny.pal similarity index 100% rename from graphics/pokemon/skarmory/shiny.pal rename to graphics/pokemon/gen_2/skarmory/shiny.pal diff --git a/graphics/pokemon/skiploom/anim_front.png b/graphics/pokemon/gen_2/skiploom/anim_front.png similarity index 100% rename from graphics/pokemon/skiploom/anim_front.png rename to graphics/pokemon/gen_2/skiploom/anim_front.png diff --git a/graphics/pokemon/skiploom/back.png b/graphics/pokemon/gen_2/skiploom/back.png similarity index 100% rename from graphics/pokemon/skiploom/back.png rename to graphics/pokemon/gen_2/skiploom/back.png diff --git a/graphics/pokemon/skiploom/footprint.png b/graphics/pokemon/gen_2/skiploom/footprint.png similarity index 100% rename from graphics/pokemon/skiploom/footprint.png rename to graphics/pokemon/gen_2/skiploom/footprint.png diff --git a/graphics/pokemon/skiploom/icon.png b/graphics/pokemon/gen_2/skiploom/icon.png similarity index 100% rename from graphics/pokemon/skiploom/icon.png rename to graphics/pokemon/gen_2/skiploom/icon.png diff --git a/graphics/pokemon/skiploom/normal.pal b/graphics/pokemon/gen_2/skiploom/normal.pal similarity index 100% rename from graphics/pokemon/skiploom/normal.pal rename to graphics/pokemon/gen_2/skiploom/normal.pal diff --git a/graphics/pokemon/skiploom/shiny.pal b/graphics/pokemon/gen_2/skiploom/shiny.pal similarity index 100% rename from graphics/pokemon/skiploom/shiny.pal rename to graphics/pokemon/gen_2/skiploom/shiny.pal diff --git a/graphics/pokemon/slowking/anim_front.png b/graphics/pokemon/gen_2/slowking/anim_front.png similarity index 100% rename from graphics/pokemon/slowking/anim_front.png rename to graphics/pokemon/gen_2/slowking/anim_front.png diff --git a/graphics/pokemon/slowking/back.png b/graphics/pokemon/gen_2/slowking/back.png similarity index 100% rename from graphics/pokemon/slowking/back.png rename to graphics/pokemon/gen_2/slowking/back.png diff --git a/graphics/pokemon/slowking/footprint.png b/graphics/pokemon/gen_2/slowking/footprint.png similarity index 100% rename from graphics/pokemon/slowking/footprint.png rename to graphics/pokemon/gen_2/slowking/footprint.png diff --git a/graphics/pokemon/slowking/galarian/back.png b/graphics/pokemon/gen_2/slowking/galarian/back.png similarity index 100% rename from graphics/pokemon/slowking/galarian/back.png rename to graphics/pokemon/gen_2/slowking/galarian/back.png diff --git a/graphics/pokemon/slowking/galarian/front.png b/graphics/pokemon/gen_2/slowking/galarian/front.png similarity index 100% rename from graphics/pokemon/slowking/galarian/front.png rename to graphics/pokemon/gen_2/slowking/galarian/front.png diff --git a/graphics/pokemon/slowking/galarian/icon.png b/graphics/pokemon/gen_2/slowking/galarian/icon.png similarity index 100% rename from graphics/pokemon/slowking/galarian/icon.png rename to graphics/pokemon/gen_2/slowking/galarian/icon.png diff --git a/graphics/pokemon/slowking/galarian/normal.pal b/graphics/pokemon/gen_2/slowking/galarian/normal.pal similarity index 100% rename from graphics/pokemon/slowking/galarian/normal.pal rename to graphics/pokemon/gen_2/slowking/galarian/normal.pal diff --git a/graphics/pokemon/slowking/galarian/shiny.pal b/graphics/pokemon/gen_2/slowking/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/slowking/galarian/shiny.pal rename to graphics/pokemon/gen_2/slowking/galarian/shiny.pal diff --git a/graphics/pokemon/slowking/icon.png b/graphics/pokemon/gen_2/slowking/icon.png similarity index 100% rename from graphics/pokemon/slowking/icon.png rename to graphics/pokemon/gen_2/slowking/icon.png diff --git a/graphics/pokemon/slowking/normal.pal b/graphics/pokemon/gen_2/slowking/normal.pal similarity index 100% rename from graphics/pokemon/slowking/normal.pal rename to graphics/pokemon/gen_2/slowking/normal.pal diff --git a/graphics/pokemon/slowking/shiny.pal b/graphics/pokemon/gen_2/slowking/shiny.pal similarity index 100% rename from graphics/pokemon/slowking/shiny.pal rename to graphics/pokemon/gen_2/slowking/shiny.pal diff --git a/graphics/pokemon/slugma/anim_front.png b/graphics/pokemon/gen_2/slugma/anim_front.png similarity index 100% rename from graphics/pokemon/slugma/anim_front.png rename to graphics/pokemon/gen_2/slugma/anim_front.png diff --git a/graphics/pokemon/slugma/back.png b/graphics/pokemon/gen_2/slugma/back.png similarity index 100% rename from graphics/pokemon/slugma/back.png rename to graphics/pokemon/gen_2/slugma/back.png diff --git a/graphics/pokemon/drifblim/footprint.png b/graphics/pokemon/gen_2/slugma/footprint.png similarity index 100% rename from graphics/pokemon/drifblim/footprint.png rename to graphics/pokemon/gen_2/slugma/footprint.png diff --git a/graphics/pokemon/slugma/icon.png b/graphics/pokemon/gen_2/slugma/icon.png similarity index 100% rename from graphics/pokemon/slugma/icon.png rename to graphics/pokemon/gen_2/slugma/icon.png diff --git a/graphics/pokemon/slugma/normal.pal b/graphics/pokemon/gen_2/slugma/normal.pal similarity index 100% rename from graphics/pokemon/slugma/normal.pal rename to graphics/pokemon/gen_2/slugma/normal.pal diff --git a/graphics/pokemon/slugma/shiny.pal b/graphics/pokemon/gen_2/slugma/shiny.pal similarity index 100% rename from graphics/pokemon/slugma/shiny.pal rename to graphics/pokemon/gen_2/slugma/shiny.pal diff --git a/graphics/pokemon/smeargle/anim_front.png b/graphics/pokemon/gen_2/smeargle/anim_front.png similarity index 100% rename from graphics/pokemon/smeargle/anim_front.png rename to graphics/pokemon/gen_2/smeargle/anim_front.png diff --git a/graphics/pokemon/smeargle/back.png b/graphics/pokemon/gen_2/smeargle/back.png similarity index 100% rename from graphics/pokemon/smeargle/back.png rename to graphics/pokemon/gen_2/smeargle/back.png diff --git a/graphics/pokemon/smeargle/footprint.png b/graphics/pokemon/gen_2/smeargle/footprint.png similarity index 100% rename from graphics/pokemon/smeargle/footprint.png rename to graphics/pokemon/gen_2/smeargle/footprint.png diff --git a/graphics/pokemon/smeargle/icon.png b/graphics/pokemon/gen_2/smeargle/icon.png similarity index 100% rename from graphics/pokemon/smeargle/icon.png rename to graphics/pokemon/gen_2/smeargle/icon.png diff --git a/graphics/pokemon/smeargle/normal.pal b/graphics/pokemon/gen_2/smeargle/normal.pal similarity index 100% rename from graphics/pokemon/smeargle/normal.pal rename to graphics/pokemon/gen_2/smeargle/normal.pal diff --git a/graphics/pokemon/smeargle/shiny.pal b/graphics/pokemon/gen_2/smeargle/shiny.pal similarity index 100% rename from graphics/pokemon/smeargle/shiny.pal rename to graphics/pokemon/gen_2/smeargle/shiny.pal diff --git a/graphics/pokemon/smoochum/anim_front.png b/graphics/pokemon/gen_2/smoochum/anim_front.png similarity index 100% rename from graphics/pokemon/smoochum/anim_front.png rename to graphics/pokemon/gen_2/smoochum/anim_front.png diff --git a/graphics/pokemon/smoochum/back.png b/graphics/pokemon/gen_2/smoochum/back.png similarity index 100% rename from graphics/pokemon/smoochum/back.png rename to graphics/pokemon/gen_2/smoochum/back.png diff --git a/graphics/pokemon/smoochum/footprint.png b/graphics/pokemon/gen_2/smoochum/footprint.png similarity index 100% rename from graphics/pokemon/smoochum/footprint.png rename to graphics/pokemon/gen_2/smoochum/footprint.png diff --git a/graphics/pokemon/smoochum/icon.png b/graphics/pokemon/gen_2/smoochum/icon.png similarity index 100% rename from graphics/pokemon/smoochum/icon.png rename to graphics/pokemon/gen_2/smoochum/icon.png diff --git a/graphics/pokemon/smoochum/normal.pal b/graphics/pokemon/gen_2/smoochum/normal.pal similarity index 100% rename from graphics/pokemon/smoochum/normal.pal rename to graphics/pokemon/gen_2/smoochum/normal.pal diff --git a/graphics/pokemon/smoochum/shiny.pal b/graphics/pokemon/gen_2/smoochum/shiny.pal similarity index 100% rename from graphics/pokemon/smoochum/shiny.pal rename to graphics/pokemon/gen_2/smoochum/shiny.pal diff --git a/graphics/pokemon/sneasel/anim_front.png b/graphics/pokemon/gen_2/sneasel/anim_front.png similarity index 100% rename from graphics/pokemon/sneasel/anim_front.png rename to graphics/pokemon/gen_2/sneasel/anim_front.png diff --git a/graphics/pokemon/sneasel/anim_frontf.png b/graphics/pokemon/gen_2/sneasel/anim_frontf.png similarity index 100% rename from graphics/pokemon/sneasel/anim_frontf.png rename to graphics/pokemon/gen_2/sneasel/anim_frontf.png diff --git a/graphics/pokemon/sneasel/back.png b/graphics/pokemon/gen_2/sneasel/back.png similarity index 100% rename from graphics/pokemon/sneasel/back.png rename to graphics/pokemon/gen_2/sneasel/back.png diff --git a/graphics/pokemon/sneasel/backf.png b/graphics/pokemon/gen_2/sneasel/backf.png similarity index 100% rename from graphics/pokemon/sneasel/backf.png rename to graphics/pokemon/gen_2/sneasel/backf.png diff --git a/graphics/pokemon/sneasel/footprint.png b/graphics/pokemon/gen_2/sneasel/footprint.png similarity index 100% rename from graphics/pokemon/sneasel/footprint.png rename to graphics/pokemon/gen_2/sneasel/footprint.png diff --git a/graphics/pokemon/sneasel/hisuian/back.png b/graphics/pokemon/gen_2/sneasel/hisuian/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/sneasel/hisuian/back.png rename to graphics/pokemon/gen_2/sneasel/hisuian/back.png diff --git a/graphics/pokemon/sneasel/hisuian/backf.png b/graphics/pokemon/gen_2/sneasel/hisuian/backf.png similarity index 100% rename from graphics/pokemon/sneasel/hisuian/backf.png rename to graphics/pokemon/gen_2/sneasel/hisuian/backf.png diff --git a/graphics/pokemon/sneasel/hisuian/front.png b/graphics/pokemon/gen_2/sneasel/hisuian/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/sneasel/hisuian/front.png rename to graphics/pokemon/gen_2/sneasel/hisuian/front.png diff --git a/graphics/pokemon/sneasel/hisuian/frontf.png b/graphics/pokemon/gen_2/sneasel/hisuian/frontf.png similarity index 100% rename from graphics/pokemon/sneasel/hisuian/frontf.png rename to graphics/pokemon/gen_2/sneasel/hisuian/frontf.png diff --git a/graphics/pokemon/sneasel/hisuian/icon.png b/graphics/pokemon/gen_2/sneasel/hisuian/icon.png similarity index 100% rename from graphics/pokemon/sneasel/hisuian/icon.png rename to graphics/pokemon/gen_2/sneasel/hisuian/icon.png diff --git a/graphics/pokemon/sneasel/hisuian/normal.pal b/graphics/pokemon/gen_2/sneasel/hisuian/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/sneasel/hisuian/normal.pal rename to graphics/pokemon/gen_2/sneasel/hisuian/normal.pal diff --git a/graphics/pokemon/sneasel/hisuian/shiny.pal b/graphics/pokemon/gen_2/sneasel/hisuian/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/sneasel/hisuian/shiny.pal rename to graphics/pokemon/gen_2/sneasel/hisuian/shiny.pal diff --git a/graphics/pokemon/sneasel/icon.png b/graphics/pokemon/gen_2/sneasel/icon.png similarity index 100% rename from graphics/pokemon/sneasel/icon.png rename to graphics/pokemon/gen_2/sneasel/icon.png diff --git a/graphics/pokemon/sneasel/normal.pal b/graphics/pokemon/gen_2/sneasel/normal.pal similarity index 100% rename from graphics/pokemon/sneasel/normal.pal rename to graphics/pokemon/gen_2/sneasel/normal.pal diff --git a/graphics/pokemon/sneasel/shiny.pal b/graphics/pokemon/gen_2/sneasel/shiny.pal similarity index 100% rename from graphics/pokemon/sneasel/shiny.pal rename to graphics/pokemon/gen_2/sneasel/shiny.pal diff --git a/graphics/pokemon/snubbull/anim_front.png b/graphics/pokemon/gen_2/snubbull/anim_front.png similarity index 100% rename from graphics/pokemon/snubbull/anim_front.png rename to graphics/pokemon/gen_2/snubbull/anim_front.png diff --git a/graphics/pokemon/snubbull/back.png b/graphics/pokemon/gen_2/snubbull/back.png similarity index 100% rename from graphics/pokemon/snubbull/back.png rename to graphics/pokemon/gen_2/snubbull/back.png diff --git a/graphics/pokemon/snubbull/footprint.png b/graphics/pokemon/gen_2/snubbull/footprint.png similarity index 100% rename from graphics/pokemon/snubbull/footprint.png rename to graphics/pokemon/gen_2/snubbull/footprint.png diff --git a/graphics/pokemon/snubbull/icon.png b/graphics/pokemon/gen_2/snubbull/icon.png similarity index 100% rename from graphics/pokemon/snubbull/icon.png rename to graphics/pokemon/gen_2/snubbull/icon.png diff --git a/graphics/pokemon/snubbull/normal.pal b/graphics/pokemon/gen_2/snubbull/normal.pal similarity index 100% rename from graphics/pokemon/snubbull/normal.pal rename to graphics/pokemon/gen_2/snubbull/normal.pal diff --git a/graphics/pokemon/snubbull/shiny.pal b/graphics/pokemon/gen_2/snubbull/shiny.pal similarity index 100% rename from graphics/pokemon/snubbull/shiny.pal rename to graphics/pokemon/gen_2/snubbull/shiny.pal diff --git a/graphics/pokemon/spinarak/anim_front.png b/graphics/pokemon/gen_2/spinarak/anim_front.png similarity index 100% rename from graphics/pokemon/spinarak/anim_front.png rename to graphics/pokemon/gen_2/spinarak/anim_front.png diff --git a/graphics/pokemon/spinarak/back.png b/graphics/pokemon/gen_2/spinarak/back.png similarity index 100% rename from graphics/pokemon/spinarak/back.png rename to graphics/pokemon/gen_2/spinarak/back.png diff --git a/graphics/pokemon/clauncher/footprint.png b/graphics/pokemon/gen_2/spinarak/footprint.png similarity index 100% rename from graphics/pokemon/clauncher/footprint.png rename to graphics/pokemon/gen_2/spinarak/footprint.png diff --git a/graphics/pokemon/spinarak/icon.png b/graphics/pokemon/gen_2/spinarak/icon.png similarity index 100% rename from graphics/pokemon/spinarak/icon.png rename to graphics/pokemon/gen_2/spinarak/icon.png diff --git a/graphics/pokemon/spinarak/normal.pal b/graphics/pokemon/gen_2/spinarak/normal.pal similarity index 100% rename from graphics/pokemon/spinarak/normal.pal rename to graphics/pokemon/gen_2/spinarak/normal.pal diff --git a/graphics/pokemon/spinarak/shiny.pal b/graphics/pokemon/gen_2/spinarak/shiny.pal similarity index 100% rename from graphics/pokemon/spinarak/shiny.pal rename to graphics/pokemon/gen_2/spinarak/shiny.pal diff --git a/graphics/pokemon/stantler/anim_front.png b/graphics/pokemon/gen_2/stantler/anim_front.png similarity index 100% rename from graphics/pokemon/stantler/anim_front.png rename to graphics/pokemon/gen_2/stantler/anim_front.png diff --git a/graphics/pokemon/stantler/back.png b/graphics/pokemon/gen_2/stantler/back.png similarity index 100% rename from graphics/pokemon/stantler/back.png rename to graphics/pokemon/gen_2/stantler/back.png diff --git a/graphics/pokemon/stantler/footprint.png b/graphics/pokemon/gen_2/stantler/footprint.png similarity index 100% rename from graphics/pokemon/stantler/footprint.png rename to graphics/pokemon/gen_2/stantler/footprint.png diff --git a/graphics/pokemon/stantler/icon.png b/graphics/pokemon/gen_2/stantler/icon.png similarity index 100% rename from graphics/pokemon/stantler/icon.png rename to graphics/pokemon/gen_2/stantler/icon.png diff --git a/graphics/pokemon/stantler/normal.pal b/graphics/pokemon/gen_2/stantler/normal.pal similarity index 100% rename from graphics/pokemon/stantler/normal.pal rename to graphics/pokemon/gen_2/stantler/normal.pal diff --git a/graphics/pokemon/stantler/shiny.pal b/graphics/pokemon/gen_2/stantler/shiny.pal similarity index 100% rename from graphics/pokemon/stantler/shiny.pal rename to graphics/pokemon/gen_2/stantler/shiny.pal diff --git a/graphics/pokemon/steelix/anim_front.png b/graphics/pokemon/gen_2/steelix/anim_front.png similarity index 100% rename from graphics/pokemon/steelix/anim_front.png rename to graphics/pokemon/gen_2/steelix/anim_front.png diff --git a/graphics/pokemon/steelix/anim_frontf.png b/graphics/pokemon/gen_2/steelix/anim_frontf.png similarity index 100% rename from graphics/pokemon/steelix/anim_frontf.png rename to graphics/pokemon/gen_2/steelix/anim_frontf.png diff --git a/graphics/pokemon/steelix/back.png b/graphics/pokemon/gen_2/steelix/back.png similarity index 100% rename from graphics/pokemon/steelix/back.png rename to graphics/pokemon/gen_2/steelix/back.png diff --git a/graphics/pokemon/steelix/backf.png b/graphics/pokemon/gen_2/steelix/backf.png similarity index 100% rename from graphics/pokemon/steelix/backf.png rename to graphics/pokemon/gen_2/steelix/backf.png diff --git a/graphics/pokemon/drifloon/footprint.png b/graphics/pokemon/gen_2/steelix/footprint.png similarity index 100% rename from graphics/pokemon/drifloon/footprint.png rename to graphics/pokemon/gen_2/steelix/footprint.png diff --git a/graphics/pokemon/steelix/icon.png b/graphics/pokemon/gen_2/steelix/icon.png similarity index 100% rename from graphics/pokemon/steelix/icon.png rename to graphics/pokemon/gen_2/steelix/icon.png diff --git a/graphics/pokemon/steelix/mega/back.png b/graphics/pokemon/gen_2/steelix/mega/back.png similarity index 100% rename from graphics/pokemon/steelix/mega/back.png rename to graphics/pokemon/gen_2/steelix/mega/back.png diff --git a/graphics/pokemon/steelix/mega/front.png b/graphics/pokemon/gen_2/steelix/mega/front.png similarity index 100% rename from graphics/pokemon/steelix/mega/front.png rename to graphics/pokemon/gen_2/steelix/mega/front.png diff --git a/graphics/pokemon/steelix/mega/icon.png b/graphics/pokemon/gen_2/steelix/mega/icon.png similarity index 100% rename from graphics/pokemon/steelix/mega/icon.png rename to graphics/pokemon/gen_2/steelix/mega/icon.png diff --git a/graphics/pokemon/steelix/mega/normal.pal b/graphics/pokemon/gen_2/steelix/mega/normal.pal similarity index 100% rename from graphics/pokemon/steelix/mega/normal.pal rename to graphics/pokemon/gen_2/steelix/mega/normal.pal diff --git a/graphics/pokemon/steelix/mega/shiny.pal b/graphics/pokemon/gen_2/steelix/mega/shiny.pal similarity index 100% rename from graphics/pokemon/steelix/mega/shiny.pal rename to graphics/pokemon/gen_2/steelix/mega/shiny.pal diff --git a/graphics/pokemon/steelix/normal.pal b/graphics/pokemon/gen_2/steelix/normal.pal similarity index 100% rename from graphics/pokemon/steelix/normal.pal rename to graphics/pokemon/gen_2/steelix/normal.pal diff --git a/graphics/pokemon/steelix/shiny.pal b/graphics/pokemon/gen_2/steelix/shiny.pal similarity index 100% rename from graphics/pokemon/steelix/shiny.pal rename to graphics/pokemon/gen_2/steelix/shiny.pal diff --git a/graphics/pokemon/sudowoodo/anim_front.png b/graphics/pokemon/gen_2/sudowoodo/anim_front.png similarity index 100% rename from graphics/pokemon/sudowoodo/anim_front.png rename to graphics/pokemon/gen_2/sudowoodo/anim_front.png diff --git a/graphics/pokemon/sudowoodo/anim_frontf.png b/graphics/pokemon/gen_2/sudowoodo/anim_frontf.png similarity index 100% rename from graphics/pokemon/sudowoodo/anim_frontf.png rename to graphics/pokemon/gen_2/sudowoodo/anim_frontf.png diff --git a/graphics/pokemon/sudowoodo/back.png b/graphics/pokemon/gen_2/sudowoodo/back.png similarity index 100% rename from graphics/pokemon/sudowoodo/back.png rename to graphics/pokemon/gen_2/sudowoodo/back.png diff --git a/graphics/pokemon/sudowoodo/backf.png b/graphics/pokemon/gen_2/sudowoodo/backf.png similarity index 100% rename from graphics/pokemon/sudowoodo/backf.png rename to graphics/pokemon/gen_2/sudowoodo/backf.png diff --git a/graphics/pokemon/sudowoodo/footprint.png b/graphics/pokemon/gen_2/sudowoodo/footprint.png similarity index 100% rename from graphics/pokemon/sudowoodo/footprint.png rename to graphics/pokemon/gen_2/sudowoodo/footprint.png diff --git a/graphics/pokemon/sudowoodo/icon.png b/graphics/pokemon/gen_2/sudowoodo/icon.png similarity index 100% rename from graphics/pokemon/sudowoodo/icon.png rename to graphics/pokemon/gen_2/sudowoodo/icon.png diff --git a/graphics/pokemon/sudowoodo/normal.pal b/graphics/pokemon/gen_2/sudowoodo/normal.pal similarity index 100% rename from graphics/pokemon/sudowoodo/normal.pal rename to graphics/pokemon/gen_2/sudowoodo/normal.pal diff --git a/graphics/pokemon/sudowoodo/shiny.pal b/graphics/pokemon/gen_2/sudowoodo/shiny.pal similarity index 100% rename from graphics/pokemon/sudowoodo/shiny.pal rename to graphics/pokemon/gen_2/sudowoodo/shiny.pal diff --git a/graphics/pokemon/suicune/anim_front.png b/graphics/pokemon/gen_2/suicune/anim_front.png similarity index 100% rename from graphics/pokemon/suicune/anim_front.png rename to graphics/pokemon/gen_2/suicune/anim_front.png diff --git a/graphics/pokemon/suicune/back.png b/graphics/pokemon/gen_2/suicune/back.png similarity index 100% rename from graphics/pokemon/suicune/back.png rename to graphics/pokemon/gen_2/suicune/back.png diff --git a/graphics/pokemon/suicune/footprint.png b/graphics/pokemon/gen_2/suicune/footprint.png similarity index 100% rename from graphics/pokemon/suicune/footprint.png rename to graphics/pokemon/gen_2/suicune/footprint.png diff --git a/graphics/pokemon/suicune/icon.png b/graphics/pokemon/gen_2/suicune/icon.png similarity index 100% rename from graphics/pokemon/suicune/icon.png rename to graphics/pokemon/gen_2/suicune/icon.png diff --git a/graphics/pokemon/suicune/normal.pal b/graphics/pokemon/gen_2/suicune/normal.pal similarity index 100% rename from graphics/pokemon/suicune/normal.pal rename to graphics/pokemon/gen_2/suicune/normal.pal diff --git a/graphics/pokemon/suicune/shiny.pal b/graphics/pokemon/gen_2/suicune/shiny.pal similarity index 100% rename from graphics/pokemon/suicune/shiny.pal rename to graphics/pokemon/gen_2/suicune/shiny.pal diff --git a/graphics/pokemon/sunflora/anim_front.png b/graphics/pokemon/gen_2/sunflora/anim_front.png similarity index 100% rename from graphics/pokemon/sunflora/anim_front.png rename to graphics/pokemon/gen_2/sunflora/anim_front.png diff --git a/graphics/pokemon/sunflora/back.png b/graphics/pokemon/gen_2/sunflora/back.png similarity index 100% rename from graphics/pokemon/sunflora/back.png rename to graphics/pokemon/gen_2/sunflora/back.png diff --git a/graphics/pokemon/sunflora/footprint.png b/graphics/pokemon/gen_2/sunflora/footprint.png similarity index 100% rename from graphics/pokemon/sunflora/footprint.png rename to graphics/pokemon/gen_2/sunflora/footprint.png diff --git a/graphics/pokemon/sunflora/icon.png b/graphics/pokemon/gen_2/sunflora/icon.png similarity index 100% rename from graphics/pokemon/sunflora/icon.png rename to graphics/pokemon/gen_2/sunflora/icon.png diff --git a/graphics/pokemon/sunflora/normal.pal b/graphics/pokemon/gen_2/sunflora/normal.pal similarity index 100% rename from graphics/pokemon/sunflora/normal.pal rename to graphics/pokemon/gen_2/sunflora/normal.pal diff --git a/graphics/pokemon/sunflora/shiny.pal b/graphics/pokemon/gen_2/sunflora/shiny.pal similarity index 100% rename from graphics/pokemon/sunflora/shiny.pal rename to graphics/pokemon/gen_2/sunflora/shiny.pal diff --git a/graphics/pokemon/sunkern/anim_front.png b/graphics/pokemon/gen_2/sunkern/anim_front.png similarity index 100% rename from graphics/pokemon/sunkern/anim_front.png rename to graphics/pokemon/gen_2/sunkern/anim_front.png diff --git a/graphics/pokemon/sunkern/back.png b/graphics/pokemon/gen_2/sunkern/back.png similarity index 100% rename from graphics/pokemon/sunkern/back.png rename to graphics/pokemon/gen_2/sunkern/back.png diff --git a/graphics/pokemon/dugtrio/footprint.png b/graphics/pokemon/gen_2/sunkern/footprint.png similarity index 100% rename from graphics/pokemon/dugtrio/footprint.png rename to graphics/pokemon/gen_2/sunkern/footprint.png diff --git a/graphics/pokemon/sunkern/icon.png b/graphics/pokemon/gen_2/sunkern/icon.png similarity index 100% rename from graphics/pokemon/sunkern/icon.png rename to graphics/pokemon/gen_2/sunkern/icon.png diff --git a/graphics/pokemon/sunkern/normal.pal b/graphics/pokemon/gen_2/sunkern/normal.pal similarity index 100% rename from graphics/pokemon/sunkern/normal.pal rename to graphics/pokemon/gen_2/sunkern/normal.pal diff --git a/graphics/pokemon/sunkern/shiny.pal b/graphics/pokemon/gen_2/sunkern/shiny.pal similarity index 100% rename from graphics/pokemon/sunkern/shiny.pal rename to graphics/pokemon/gen_2/sunkern/shiny.pal diff --git a/graphics/pokemon/swinub/anim_front.png b/graphics/pokemon/gen_2/swinub/anim_front.png similarity index 100% rename from graphics/pokemon/swinub/anim_front.png rename to graphics/pokemon/gen_2/swinub/anim_front.png diff --git a/graphics/pokemon/swinub/back.png b/graphics/pokemon/gen_2/swinub/back.png similarity index 100% rename from graphics/pokemon/swinub/back.png rename to graphics/pokemon/gen_2/swinub/back.png diff --git a/graphics/pokemon/swinub/footprint.png b/graphics/pokemon/gen_2/swinub/footprint.png similarity index 100% rename from graphics/pokemon/swinub/footprint.png rename to graphics/pokemon/gen_2/swinub/footprint.png diff --git a/graphics/pokemon/swinub/icon.png b/graphics/pokemon/gen_2/swinub/icon.png similarity index 100% rename from graphics/pokemon/swinub/icon.png rename to graphics/pokemon/gen_2/swinub/icon.png diff --git a/graphics/pokemon/swinub/normal.pal b/graphics/pokemon/gen_2/swinub/normal.pal similarity index 100% rename from graphics/pokemon/swinub/normal.pal rename to graphics/pokemon/gen_2/swinub/normal.pal diff --git a/graphics/pokemon/swinub/shiny.pal b/graphics/pokemon/gen_2/swinub/shiny.pal similarity index 100% rename from graphics/pokemon/swinub/shiny.pal rename to graphics/pokemon/gen_2/swinub/shiny.pal diff --git a/graphics/pokemon/teddiursa/anim_front.png b/graphics/pokemon/gen_2/teddiursa/anim_front.png similarity index 100% rename from graphics/pokemon/teddiursa/anim_front.png rename to graphics/pokemon/gen_2/teddiursa/anim_front.png diff --git a/graphics/pokemon/teddiursa/back.png b/graphics/pokemon/gen_2/teddiursa/back.png similarity index 100% rename from graphics/pokemon/teddiursa/back.png rename to graphics/pokemon/gen_2/teddiursa/back.png diff --git a/graphics/pokemon/teddiursa/footprint.png b/graphics/pokemon/gen_2/teddiursa/footprint.png similarity index 100% rename from graphics/pokemon/teddiursa/footprint.png rename to graphics/pokemon/gen_2/teddiursa/footprint.png diff --git a/graphics/pokemon/teddiursa/icon.png b/graphics/pokemon/gen_2/teddiursa/icon.png similarity index 100% rename from graphics/pokemon/teddiursa/icon.png rename to graphics/pokemon/gen_2/teddiursa/icon.png diff --git a/graphics/pokemon/teddiursa/normal.pal b/graphics/pokemon/gen_2/teddiursa/normal.pal similarity index 100% rename from graphics/pokemon/teddiursa/normal.pal rename to graphics/pokemon/gen_2/teddiursa/normal.pal diff --git a/graphics/pokemon/teddiursa/shiny.pal b/graphics/pokemon/gen_2/teddiursa/shiny.pal similarity index 100% rename from graphics/pokemon/teddiursa/shiny.pal rename to graphics/pokemon/gen_2/teddiursa/shiny.pal diff --git a/graphics/pokemon/togepi/anim_front.png b/graphics/pokemon/gen_2/togepi/anim_front.png similarity index 100% rename from graphics/pokemon/togepi/anim_front.png rename to graphics/pokemon/gen_2/togepi/anim_front.png diff --git a/graphics/pokemon/togepi/back.png b/graphics/pokemon/gen_2/togepi/back.png similarity index 100% rename from graphics/pokemon/togepi/back.png rename to graphics/pokemon/gen_2/togepi/back.png diff --git a/graphics/pokemon/togepi/footprint.png b/graphics/pokemon/gen_2/togepi/footprint.png similarity index 100% rename from graphics/pokemon/togepi/footprint.png rename to graphics/pokemon/gen_2/togepi/footprint.png diff --git a/graphics/pokemon/togepi/icon.png b/graphics/pokemon/gen_2/togepi/icon.png similarity index 100% rename from graphics/pokemon/togepi/icon.png rename to graphics/pokemon/gen_2/togepi/icon.png diff --git a/graphics/pokemon/togepi/normal.pal b/graphics/pokemon/gen_2/togepi/normal.pal similarity index 100% rename from graphics/pokemon/togepi/normal.pal rename to graphics/pokemon/gen_2/togepi/normal.pal diff --git a/graphics/pokemon/togepi/shiny.pal b/graphics/pokemon/gen_2/togepi/shiny.pal similarity index 100% rename from graphics/pokemon/togepi/shiny.pal rename to graphics/pokemon/gen_2/togepi/shiny.pal diff --git a/graphics/pokemon/togetic/anim_front.png b/graphics/pokemon/gen_2/togetic/anim_front.png similarity index 100% rename from graphics/pokemon/togetic/anim_front.png rename to graphics/pokemon/gen_2/togetic/anim_front.png diff --git a/graphics/pokemon/togetic/back.png b/graphics/pokemon/gen_2/togetic/back.png similarity index 100% rename from graphics/pokemon/togetic/back.png rename to graphics/pokemon/gen_2/togetic/back.png diff --git a/graphics/pokemon/togetic/footprint.png b/graphics/pokemon/gen_2/togetic/footprint.png similarity index 100% rename from graphics/pokemon/togetic/footprint.png rename to graphics/pokemon/gen_2/togetic/footprint.png diff --git a/graphics/pokemon/togetic/icon.png b/graphics/pokemon/gen_2/togetic/icon.png similarity index 100% rename from graphics/pokemon/togetic/icon.png rename to graphics/pokemon/gen_2/togetic/icon.png diff --git a/graphics/pokemon/togetic/normal.pal b/graphics/pokemon/gen_2/togetic/normal.pal similarity index 100% rename from graphics/pokemon/togetic/normal.pal rename to graphics/pokemon/gen_2/togetic/normal.pal diff --git a/graphics/pokemon/togetic/shiny.pal b/graphics/pokemon/gen_2/togetic/shiny.pal similarity index 100% rename from graphics/pokemon/togetic/shiny.pal rename to graphics/pokemon/gen_2/togetic/shiny.pal diff --git a/graphics/pokemon/totodile/anim_front.png b/graphics/pokemon/gen_2/totodile/anim_front.png similarity index 100% rename from graphics/pokemon/totodile/anim_front.png rename to graphics/pokemon/gen_2/totodile/anim_front.png diff --git a/graphics/pokemon/totodile/back.png b/graphics/pokemon/gen_2/totodile/back.png similarity index 100% rename from graphics/pokemon/totodile/back.png rename to graphics/pokemon/gen_2/totodile/back.png diff --git a/graphics/pokemon/totodile/footprint.png b/graphics/pokemon/gen_2/totodile/footprint.png similarity index 100% rename from graphics/pokemon/totodile/footprint.png rename to graphics/pokemon/gen_2/totodile/footprint.png diff --git a/graphics/pokemon/totodile/icon.png b/graphics/pokemon/gen_2/totodile/icon.png similarity index 100% rename from graphics/pokemon/totodile/icon.png rename to graphics/pokemon/gen_2/totodile/icon.png diff --git a/graphics/pokemon/totodile/normal.pal b/graphics/pokemon/gen_2/totodile/normal.pal similarity index 100% rename from graphics/pokemon/totodile/normal.pal rename to graphics/pokemon/gen_2/totodile/normal.pal diff --git a/graphics/pokemon/totodile/shiny.pal b/graphics/pokemon/gen_2/totodile/shiny.pal similarity index 100% rename from graphics/pokemon/totodile/shiny.pal rename to graphics/pokemon/gen_2/totodile/shiny.pal diff --git a/graphics/pokemon/typhlosion/anim_front.png b/graphics/pokemon/gen_2/typhlosion/anim_front.png similarity index 100% rename from graphics/pokemon/typhlosion/anim_front.png rename to graphics/pokemon/gen_2/typhlosion/anim_front.png diff --git a/graphics/pokemon/typhlosion/back.png b/graphics/pokemon/gen_2/typhlosion/back.png similarity index 100% rename from graphics/pokemon/typhlosion/back.png rename to graphics/pokemon/gen_2/typhlosion/back.png diff --git a/graphics/pokemon/typhlosion/footprint.png b/graphics/pokemon/gen_2/typhlosion/footprint.png similarity index 100% rename from graphics/pokemon/typhlosion/footprint.png rename to graphics/pokemon/gen_2/typhlosion/footprint.png diff --git a/graphics/pokemon/typhlosion/hisuian/back.png b/graphics/pokemon/gen_2/typhlosion/hisuian/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/back.png rename to graphics/pokemon/gen_2/typhlosion/hisuian/back.png diff --git a/graphics/pokemon/typhlosion/hisuian/front.png b/graphics/pokemon/gen_2/typhlosion/hisuian/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/front.png rename to graphics/pokemon/gen_2/typhlosion/hisuian/front.png diff --git a/graphics/pokemon/typhlosion/hisuian/icon.png b/graphics/pokemon/gen_2/typhlosion/hisuian/icon.png similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/icon.png rename to graphics/pokemon/gen_2/typhlosion/hisuian/icon.png diff --git a/graphics/pokemon/typhlosion/hisuian/normal.pal b/graphics/pokemon/gen_2/typhlosion/hisuian/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/normal.pal rename to graphics/pokemon/gen_2/typhlosion/hisuian/normal.pal diff --git a/graphics/pokemon/typhlosion/hisuian/shiny.pal b/graphics/pokemon/gen_2/typhlosion/hisuian/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/shiny.pal rename to graphics/pokemon/gen_2/typhlosion/hisuian/shiny.pal diff --git a/graphics/pokemon/typhlosion/icon.png b/graphics/pokemon/gen_2/typhlosion/icon.png similarity index 100% rename from graphics/pokemon/typhlosion/icon.png rename to graphics/pokemon/gen_2/typhlosion/icon.png diff --git a/graphics/pokemon/typhlosion/normal.pal b/graphics/pokemon/gen_2/typhlosion/normal.pal similarity index 100% rename from graphics/pokemon/typhlosion/normal.pal rename to graphics/pokemon/gen_2/typhlosion/normal.pal diff --git a/graphics/pokemon/typhlosion/shiny.pal b/graphics/pokemon/gen_2/typhlosion/shiny.pal similarity index 100% rename from graphics/pokemon/typhlosion/shiny.pal rename to graphics/pokemon/gen_2/typhlosion/shiny.pal diff --git a/graphics/pokemon/tyranitar/anim_front.png b/graphics/pokemon/gen_2/tyranitar/anim_front.png similarity index 100% rename from graphics/pokemon/tyranitar/anim_front.png rename to graphics/pokemon/gen_2/tyranitar/anim_front.png diff --git a/graphics/pokemon/tyranitar/back.png b/graphics/pokemon/gen_2/tyranitar/back.png similarity index 100% rename from graphics/pokemon/tyranitar/back.png rename to graphics/pokemon/gen_2/tyranitar/back.png diff --git a/graphics/pokemon/tyranitar/footprint.png b/graphics/pokemon/gen_2/tyranitar/footprint.png similarity index 100% rename from graphics/pokemon/tyranitar/footprint.png rename to graphics/pokemon/gen_2/tyranitar/footprint.png diff --git a/graphics/pokemon/tyranitar/icon.png b/graphics/pokemon/gen_2/tyranitar/icon.png similarity index 100% rename from graphics/pokemon/tyranitar/icon.png rename to graphics/pokemon/gen_2/tyranitar/icon.png diff --git a/graphics/pokemon/tyranitar/mega/back.png b/graphics/pokemon/gen_2/tyranitar/mega/back.png similarity index 100% rename from graphics/pokemon/tyranitar/mega/back.png rename to graphics/pokemon/gen_2/tyranitar/mega/back.png diff --git a/graphics/pokemon/tyranitar/mega/front.png b/graphics/pokemon/gen_2/tyranitar/mega/front.png similarity index 100% rename from graphics/pokemon/tyranitar/mega/front.png rename to graphics/pokemon/gen_2/tyranitar/mega/front.png diff --git a/graphics/pokemon/tyranitar/mega/icon.png b/graphics/pokemon/gen_2/tyranitar/mega/icon.png similarity index 100% rename from graphics/pokemon/tyranitar/mega/icon.png rename to graphics/pokemon/gen_2/tyranitar/mega/icon.png diff --git a/graphics/pokemon/tyranitar/mega/normal.pal b/graphics/pokemon/gen_2/tyranitar/mega/normal.pal similarity index 100% rename from graphics/pokemon/tyranitar/mega/normal.pal rename to graphics/pokemon/gen_2/tyranitar/mega/normal.pal diff --git a/graphics/pokemon/tyranitar/mega/shiny.pal b/graphics/pokemon/gen_2/tyranitar/mega/shiny.pal similarity index 100% rename from graphics/pokemon/tyranitar/mega/shiny.pal rename to graphics/pokemon/gen_2/tyranitar/mega/shiny.pal diff --git a/graphics/pokemon/tyranitar/normal.pal b/graphics/pokemon/gen_2/tyranitar/normal.pal similarity index 100% rename from graphics/pokemon/tyranitar/normal.pal rename to graphics/pokemon/gen_2/tyranitar/normal.pal diff --git a/graphics/pokemon/tyranitar/shiny.pal b/graphics/pokemon/gen_2/tyranitar/shiny.pal similarity index 100% rename from graphics/pokemon/tyranitar/shiny.pal rename to graphics/pokemon/gen_2/tyranitar/shiny.pal diff --git a/graphics/pokemon/tyrogue/anim_front.png b/graphics/pokemon/gen_2/tyrogue/anim_front.png similarity index 100% rename from graphics/pokemon/tyrogue/anim_front.png rename to graphics/pokemon/gen_2/tyrogue/anim_front.png diff --git a/graphics/pokemon/tyrogue/back.png b/graphics/pokemon/gen_2/tyrogue/back.png similarity index 100% rename from graphics/pokemon/tyrogue/back.png rename to graphics/pokemon/gen_2/tyrogue/back.png diff --git a/graphics/pokemon/tyrogue/footprint.png b/graphics/pokemon/gen_2/tyrogue/footprint.png similarity index 100% rename from graphics/pokemon/tyrogue/footprint.png rename to graphics/pokemon/gen_2/tyrogue/footprint.png diff --git a/graphics/pokemon/tyrogue/icon.png b/graphics/pokemon/gen_2/tyrogue/icon.png similarity index 100% rename from graphics/pokemon/tyrogue/icon.png rename to graphics/pokemon/gen_2/tyrogue/icon.png diff --git a/graphics/pokemon/tyrogue/normal.pal b/graphics/pokemon/gen_2/tyrogue/normal.pal similarity index 100% rename from graphics/pokemon/tyrogue/normal.pal rename to graphics/pokemon/gen_2/tyrogue/normal.pal diff --git a/graphics/pokemon/tyrogue/shiny.pal b/graphics/pokemon/gen_2/tyrogue/shiny.pal similarity index 100% rename from graphics/pokemon/tyrogue/shiny.pal rename to graphics/pokemon/gen_2/tyrogue/shiny.pal diff --git a/graphics/pokemon/umbreon/anim_front.png b/graphics/pokemon/gen_2/umbreon/anim_front.png similarity index 100% rename from graphics/pokemon/umbreon/anim_front.png rename to graphics/pokemon/gen_2/umbreon/anim_front.png diff --git a/graphics/pokemon/umbreon/back.png b/graphics/pokemon/gen_2/umbreon/back.png similarity index 100% rename from graphics/pokemon/umbreon/back.png rename to graphics/pokemon/gen_2/umbreon/back.png diff --git a/graphics/pokemon/umbreon/footprint.png b/graphics/pokemon/gen_2/umbreon/footprint.png similarity index 100% rename from graphics/pokemon/umbreon/footprint.png rename to graphics/pokemon/gen_2/umbreon/footprint.png diff --git a/graphics/pokemon/umbreon/icon.png b/graphics/pokemon/gen_2/umbreon/icon.png similarity index 100% rename from graphics/pokemon/umbreon/icon.png rename to graphics/pokemon/gen_2/umbreon/icon.png diff --git a/graphics/pokemon/umbreon/normal.pal b/graphics/pokemon/gen_2/umbreon/normal.pal similarity index 100% rename from graphics/pokemon/umbreon/normal.pal rename to graphics/pokemon/gen_2/umbreon/normal.pal diff --git a/graphics/pokemon/umbreon/shiny.pal b/graphics/pokemon/gen_2/umbreon/shiny.pal similarity index 100% rename from graphics/pokemon/umbreon/shiny.pal rename to graphics/pokemon/gen_2/umbreon/shiny.pal diff --git a/graphics/pokemon/unown/anim_front.png b/graphics/pokemon/gen_2/unown/anim_front.png similarity index 100% rename from graphics/pokemon/unown/anim_front.png rename to graphics/pokemon/gen_2/unown/anim_front.png diff --git a/graphics/pokemon/unown/b/anim_front.png b/graphics/pokemon/gen_2/unown/b/anim_front.png similarity index 100% rename from graphics/pokemon/unown/b/anim_front.png rename to graphics/pokemon/gen_2/unown/b/anim_front.png diff --git a/graphics/pokemon/unown/b/back.png b/graphics/pokemon/gen_2/unown/b/back.png similarity index 100% rename from graphics/pokemon/unown/b/back.png rename to graphics/pokemon/gen_2/unown/b/back.png diff --git a/graphics/pokemon/unown/b/icon.png b/graphics/pokemon/gen_2/unown/b/icon.png similarity index 100% rename from graphics/pokemon/unown/b/icon.png rename to graphics/pokemon/gen_2/unown/b/icon.png diff --git a/graphics/pokemon/unown/back.png b/graphics/pokemon/gen_2/unown/back.png similarity index 100% rename from graphics/pokemon/unown/back.png rename to graphics/pokemon/gen_2/unown/back.png diff --git a/graphics/pokemon/unown/c/anim_front.png b/graphics/pokemon/gen_2/unown/c/anim_front.png similarity index 100% rename from graphics/pokemon/unown/c/anim_front.png rename to graphics/pokemon/gen_2/unown/c/anim_front.png diff --git a/graphics/pokemon/unown/c/back.png b/graphics/pokemon/gen_2/unown/c/back.png similarity index 100% rename from graphics/pokemon/unown/c/back.png rename to graphics/pokemon/gen_2/unown/c/back.png diff --git a/graphics/pokemon/unown/c/icon.png b/graphics/pokemon/gen_2/unown/c/icon.png similarity index 100% rename from graphics/pokemon/unown/c/icon.png rename to graphics/pokemon/gen_2/unown/c/icon.png diff --git a/graphics/pokemon/unown/d/anim_front.png b/graphics/pokemon/gen_2/unown/d/anim_front.png similarity index 100% rename from graphics/pokemon/unown/d/anim_front.png rename to graphics/pokemon/gen_2/unown/d/anim_front.png diff --git a/graphics/pokemon/unown/d/back.png b/graphics/pokemon/gen_2/unown/d/back.png similarity index 100% rename from graphics/pokemon/unown/d/back.png rename to graphics/pokemon/gen_2/unown/d/back.png diff --git a/graphics/pokemon/unown/d/icon.png b/graphics/pokemon/gen_2/unown/d/icon.png similarity index 100% rename from graphics/pokemon/unown/d/icon.png rename to graphics/pokemon/gen_2/unown/d/icon.png diff --git a/graphics/pokemon/unown/e/anim_front.png b/graphics/pokemon/gen_2/unown/e/anim_front.png similarity index 100% rename from graphics/pokemon/unown/e/anim_front.png rename to graphics/pokemon/gen_2/unown/e/anim_front.png diff --git a/graphics/pokemon/unown/e/back.png b/graphics/pokemon/gen_2/unown/e/back.png similarity index 100% rename from graphics/pokemon/unown/e/back.png rename to graphics/pokemon/gen_2/unown/e/back.png diff --git a/graphics/pokemon/unown/e/icon.png b/graphics/pokemon/gen_2/unown/e/icon.png similarity index 100% rename from graphics/pokemon/unown/e/icon.png rename to graphics/pokemon/gen_2/unown/e/icon.png diff --git a/graphics/pokemon/unown/exclamation_mark/anim_front.png b/graphics/pokemon/gen_2/unown/exclamation_mark/anim_front.png similarity index 100% rename from graphics/pokemon/unown/exclamation_mark/anim_front.png rename to graphics/pokemon/gen_2/unown/exclamation_mark/anim_front.png diff --git a/graphics/pokemon/unown/exclamation_mark/back.png b/graphics/pokemon/gen_2/unown/exclamation_mark/back.png similarity index 100% rename from graphics/pokemon/unown/exclamation_mark/back.png rename to graphics/pokemon/gen_2/unown/exclamation_mark/back.png diff --git a/graphics/pokemon/unown/exclamation_mark/icon.png b/graphics/pokemon/gen_2/unown/exclamation_mark/icon.png similarity index 100% rename from graphics/pokemon/unown/exclamation_mark/icon.png rename to graphics/pokemon/gen_2/unown/exclamation_mark/icon.png diff --git a/graphics/pokemon/unown/f/anim_front.png b/graphics/pokemon/gen_2/unown/f/anim_front.png similarity index 100% rename from graphics/pokemon/unown/f/anim_front.png rename to graphics/pokemon/gen_2/unown/f/anim_front.png diff --git a/graphics/pokemon/unown/f/back.png b/graphics/pokemon/gen_2/unown/f/back.png similarity index 100% rename from graphics/pokemon/unown/f/back.png rename to graphics/pokemon/gen_2/unown/f/back.png diff --git a/graphics/pokemon/unown/f/icon.png b/graphics/pokemon/gen_2/unown/f/icon.png similarity index 100% rename from graphics/pokemon/unown/f/icon.png rename to graphics/pokemon/gen_2/unown/f/icon.png diff --git a/graphics/pokemon/dunsparce/footprint.png b/graphics/pokemon/gen_2/unown/footprint.png similarity index 100% rename from graphics/pokemon/dunsparce/footprint.png rename to graphics/pokemon/gen_2/unown/footprint.png diff --git a/graphics/pokemon/unown/g/anim_front.png b/graphics/pokemon/gen_2/unown/g/anim_front.png similarity index 100% rename from graphics/pokemon/unown/g/anim_front.png rename to graphics/pokemon/gen_2/unown/g/anim_front.png diff --git a/graphics/pokemon/unown/g/back.png b/graphics/pokemon/gen_2/unown/g/back.png similarity index 100% rename from graphics/pokemon/unown/g/back.png rename to graphics/pokemon/gen_2/unown/g/back.png diff --git a/graphics/pokemon/unown/g/icon.png b/graphics/pokemon/gen_2/unown/g/icon.png similarity index 100% rename from graphics/pokemon/unown/g/icon.png rename to graphics/pokemon/gen_2/unown/g/icon.png diff --git a/graphics/pokemon/unown/h/anim_front.png b/graphics/pokemon/gen_2/unown/h/anim_front.png similarity index 100% rename from graphics/pokemon/unown/h/anim_front.png rename to graphics/pokemon/gen_2/unown/h/anim_front.png diff --git a/graphics/pokemon/unown/h/back.png b/graphics/pokemon/gen_2/unown/h/back.png similarity index 100% rename from graphics/pokemon/unown/h/back.png rename to graphics/pokemon/gen_2/unown/h/back.png diff --git a/graphics/pokemon/unown/h/icon.png b/graphics/pokemon/gen_2/unown/h/icon.png similarity index 100% rename from graphics/pokemon/unown/h/icon.png rename to graphics/pokemon/gen_2/unown/h/icon.png diff --git a/graphics/pokemon/unown/i/anim_front.png b/graphics/pokemon/gen_2/unown/i/anim_front.png similarity index 100% rename from graphics/pokemon/unown/i/anim_front.png rename to graphics/pokemon/gen_2/unown/i/anim_front.png diff --git a/graphics/pokemon/unown/i/back.png b/graphics/pokemon/gen_2/unown/i/back.png similarity index 100% rename from graphics/pokemon/unown/i/back.png rename to graphics/pokemon/gen_2/unown/i/back.png diff --git a/graphics/pokemon/unown/i/icon.png b/graphics/pokemon/gen_2/unown/i/icon.png similarity index 100% rename from graphics/pokemon/unown/i/icon.png rename to graphics/pokemon/gen_2/unown/i/icon.png diff --git a/graphics/pokemon/unown/icon.png b/graphics/pokemon/gen_2/unown/icon.png similarity index 100% rename from graphics/pokemon/unown/icon.png rename to graphics/pokemon/gen_2/unown/icon.png diff --git a/graphics/pokemon/unown/j/anim_front.png b/graphics/pokemon/gen_2/unown/j/anim_front.png similarity index 100% rename from graphics/pokemon/unown/j/anim_front.png rename to graphics/pokemon/gen_2/unown/j/anim_front.png diff --git a/graphics/pokemon/unown/j/back.png b/graphics/pokemon/gen_2/unown/j/back.png similarity index 100% rename from graphics/pokemon/unown/j/back.png rename to graphics/pokemon/gen_2/unown/j/back.png diff --git a/graphics/pokemon/unown/j/icon.png b/graphics/pokemon/gen_2/unown/j/icon.png similarity index 100% rename from graphics/pokemon/unown/j/icon.png rename to graphics/pokemon/gen_2/unown/j/icon.png diff --git a/graphics/pokemon/unown/k/anim_front.png b/graphics/pokemon/gen_2/unown/k/anim_front.png similarity index 100% rename from graphics/pokemon/unown/k/anim_front.png rename to graphics/pokemon/gen_2/unown/k/anim_front.png diff --git a/graphics/pokemon/unown/k/back.png b/graphics/pokemon/gen_2/unown/k/back.png similarity index 100% rename from graphics/pokemon/unown/k/back.png rename to graphics/pokemon/gen_2/unown/k/back.png diff --git a/graphics/pokemon/unown/k/icon.png b/graphics/pokemon/gen_2/unown/k/icon.png similarity index 100% rename from graphics/pokemon/unown/k/icon.png rename to graphics/pokemon/gen_2/unown/k/icon.png diff --git a/graphics/pokemon/unown/l/anim_front.png b/graphics/pokemon/gen_2/unown/l/anim_front.png similarity index 100% rename from graphics/pokemon/unown/l/anim_front.png rename to graphics/pokemon/gen_2/unown/l/anim_front.png diff --git a/graphics/pokemon/unown/l/back.png b/graphics/pokemon/gen_2/unown/l/back.png similarity index 100% rename from graphics/pokemon/unown/l/back.png rename to graphics/pokemon/gen_2/unown/l/back.png diff --git a/graphics/pokemon/unown/l/icon.png b/graphics/pokemon/gen_2/unown/l/icon.png similarity index 100% rename from graphics/pokemon/unown/l/icon.png rename to graphics/pokemon/gen_2/unown/l/icon.png diff --git a/graphics/pokemon/unown/m/anim_front.png b/graphics/pokemon/gen_2/unown/m/anim_front.png similarity index 100% rename from graphics/pokemon/unown/m/anim_front.png rename to graphics/pokemon/gen_2/unown/m/anim_front.png diff --git a/graphics/pokemon/unown/m/back.png b/graphics/pokemon/gen_2/unown/m/back.png similarity index 100% rename from graphics/pokemon/unown/m/back.png rename to graphics/pokemon/gen_2/unown/m/back.png diff --git a/graphics/pokemon/unown/m/icon.png b/graphics/pokemon/gen_2/unown/m/icon.png similarity index 100% rename from graphics/pokemon/unown/m/icon.png rename to graphics/pokemon/gen_2/unown/m/icon.png diff --git a/graphics/pokemon/unown/n/anim_front.png b/graphics/pokemon/gen_2/unown/n/anim_front.png similarity index 100% rename from graphics/pokemon/unown/n/anim_front.png rename to graphics/pokemon/gen_2/unown/n/anim_front.png diff --git a/graphics/pokemon/unown/n/back.png b/graphics/pokemon/gen_2/unown/n/back.png similarity index 100% rename from graphics/pokemon/unown/n/back.png rename to graphics/pokemon/gen_2/unown/n/back.png diff --git a/graphics/pokemon/unown/n/icon.png b/graphics/pokemon/gen_2/unown/n/icon.png similarity index 100% rename from graphics/pokemon/unown/n/icon.png rename to graphics/pokemon/gen_2/unown/n/icon.png diff --git a/graphics/pokemon/unown/normal.pal b/graphics/pokemon/gen_2/unown/normal.pal similarity index 100% rename from graphics/pokemon/unown/normal.pal rename to graphics/pokemon/gen_2/unown/normal.pal diff --git a/graphics/pokemon/unown/o/anim_front.png b/graphics/pokemon/gen_2/unown/o/anim_front.png similarity index 100% rename from graphics/pokemon/unown/o/anim_front.png rename to graphics/pokemon/gen_2/unown/o/anim_front.png diff --git a/graphics/pokemon/unown/o/back.png b/graphics/pokemon/gen_2/unown/o/back.png similarity index 100% rename from graphics/pokemon/unown/o/back.png rename to graphics/pokemon/gen_2/unown/o/back.png diff --git a/graphics/pokemon/unown/o/icon.png b/graphics/pokemon/gen_2/unown/o/icon.png similarity index 100% rename from graphics/pokemon/unown/o/icon.png rename to graphics/pokemon/gen_2/unown/o/icon.png diff --git a/graphics/pokemon/unown/p/anim_front.png b/graphics/pokemon/gen_2/unown/p/anim_front.png similarity index 100% rename from graphics/pokemon/unown/p/anim_front.png rename to graphics/pokemon/gen_2/unown/p/anim_front.png diff --git a/graphics/pokemon/unown/p/back.png b/graphics/pokemon/gen_2/unown/p/back.png similarity index 100% rename from graphics/pokemon/unown/p/back.png rename to graphics/pokemon/gen_2/unown/p/back.png diff --git a/graphics/pokemon/unown/p/icon.png b/graphics/pokemon/gen_2/unown/p/icon.png similarity index 100% rename from graphics/pokemon/unown/p/icon.png rename to graphics/pokemon/gen_2/unown/p/icon.png diff --git a/graphics/pokemon/unown/q/anim_front.png b/graphics/pokemon/gen_2/unown/q/anim_front.png similarity index 100% rename from graphics/pokemon/unown/q/anim_front.png rename to graphics/pokemon/gen_2/unown/q/anim_front.png diff --git a/graphics/pokemon/unown/q/back.png b/graphics/pokemon/gen_2/unown/q/back.png similarity index 100% rename from graphics/pokemon/unown/q/back.png rename to graphics/pokemon/gen_2/unown/q/back.png diff --git a/graphics/pokemon/unown/q/icon.png b/graphics/pokemon/gen_2/unown/q/icon.png similarity index 100% rename from graphics/pokemon/unown/q/icon.png rename to graphics/pokemon/gen_2/unown/q/icon.png diff --git a/graphics/pokemon/unown/question_mark/anim_front.png b/graphics/pokemon/gen_2/unown/question_mark/anim_front.png similarity index 100% rename from graphics/pokemon/unown/question_mark/anim_front.png rename to graphics/pokemon/gen_2/unown/question_mark/anim_front.png diff --git a/graphics/pokemon/unown/question_mark/back.png b/graphics/pokemon/gen_2/unown/question_mark/back.png similarity index 100% rename from graphics/pokemon/unown/question_mark/back.png rename to graphics/pokemon/gen_2/unown/question_mark/back.png diff --git a/graphics/pokemon/unown/question_mark/icon.png b/graphics/pokemon/gen_2/unown/question_mark/icon.png similarity index 100% rename from graphics/pokemon/unown/question_mark/icon.png rename to graphics/pokemon/gen_2/unown/question_mark/icon.png diff --git a/graphics/pokemon/unown/r/anim_front.png b/graphics/pokemon/gen_2/unown/r/anim_front.png similarity index 100% rename from graphics/pokemon/unown/r/anim_front.png rename to graphics/pokemon/gen_2/unown/r/anim_front.png diff --git a/graphics/pokemon/unown/r/back.png b/graphics/pokemon/gen_2/unown/r/back.png similarity index 100% rename from graphics/pokemon/unown/r/back.png rename to graphics/pokemon/gen_2/unown/r/back.png diff --git a/graphics/pokemon/unown/r/icon.png b/graphics/pokemon/gen_2/unown/r/icon.png similarity index 100% rename from graphics/pokemon/unown/r/icon.png rename to graphics/pokemon/gen_2/unown/r/icon.png diff --git a/graphics/pokemon/unown/s/anim_front.png b/graphics/pokemon/gen_2/unown/s/anim_front.png similarity index 100% rename from graphics/pokemon/unown/s/anim_front.png rename to graphics/pokemon/gen_2/unown/s/anim_front.png diff --git a/graphics/pokemon/unown/s/back.png b/graphics/pokemon/gen_2/unown/s/back.png similarity index 100% rename from graphics/pokemon/unown/s/back.png rename to graphics/pokemon/gen_2/unown/s/back.png diff --git a/graphics/pokemon/unown/s/icon.png b/graphics/pokemon/gen_2/unown/s/icon.png similarity index 100% rename from graphics/pokemon/unown/s/icon.png rename to graphics/pokemon/gen_2/unown/s/icon.png diff --git a/graphics/pokemon/unown/shiny.pal b/graphics/pokemon/gen_2/unown/shiny.pal similarity index 100% rename from graphics/pokemon/unown/shiny.pal rename to graphics/pokemon/gen_2/unown/shiny.pal diff --git a/graphics/pokemon/unown/t/anim_front.png b/graphics/pokemon/gen_2/unown/t/anim_front.png similarity index 100% rename from graphics/pokemon/unown/t/anim_front.png rename to graphics/pokemon/gen_2/unown/t/anim_front.png diff --git a/graphics/pokemon/unown/t/back.png b/graphics/pokemon/gen_2/unown/t/back.png similarity index 100% rename from graphics/pokemon/unown/t/back.png rename to graphics/pokemon/gen_2/unown/t/back.png diff --git a/graphics/pokemon/unown/t/icon.png b/graphics/pokemon/gen_2/unown/t/icon.png similarity index 100% rename from graphics/pokemon/unown/t/icon.png rename to graphics/pokemon/gen_2/unown/t/icon.png diff --git a/graphics/pokemon/unown/u/anim_front.png b/graphics/pokemon/gen_2/unown/u/anim_front.png similarity index 100% rename from graphics/pokemon/unown/u/anim_front.png rename to graphics/pokemon/gen_2/unown/u/anim_front.png diff --git a/graphics/pokemon/unown/u/back.png b/graphics/pokemon/gen_2/unown/u/back.png similarity index 100% rename from graphics/pokemon/unown/u/back.png rename to graphics/pokemon/gen_2/unown/u/back.png diff --git a/graphics/pokemon/unown/u/icon.png b/graphics/pokemon/gen_2/unown/u/icon.png similarity index 100% rename from graphics/pokemon/unown/u/icon.png rename to graphics/pokemon/gen_2/unown/u/icon.png diff --git a/graphics/pokemon/unown/v/anim_front.png b/graphics/pokemon/gen_2/unown/v/anim_front.png similarity index 100% rename from graphics/pokemon/unown/v/anim_front.png rename to graphics/pokemon/gen_2/unown/v/anim_front.png diff --git a/graphics/pokemon/unown/v/back.png b/graphics/pokemon/gen_2/unown/v/back.png similarity index 100% rename from graphics/pokemon/unown/v/back.png rename to graphics/pokemon/gen_2/unown/v/back.png diff --git a/graphics/pokemon/unown/v/icon.png b/graphics/pokemon/gen_2/unown/v/icon.png similarity index 100% rename from graphics/pokemon/unown/v/icon.png rename to graphics/pokemon/gen_2/unown/v/icon.png diff --git a/graphics/pokemon/unown/w/anim_front.png b/graphics/pokemon/gen_2/unown/w/anim_front.png similarity index 100% rename from graphics/pokemon/unown/w/anim_front.png rename to graphics/pokemon/gen_2/unown/w/anim_front.png diff --git a/graphics/pokemon/unown/w/back.png b/graphics/pokemon/gen_2/unown/w/back.png similarity index 100% rename from graphics/pokemon/unown/w/back.png rename to graphics/pokemon/gen_2/unown/w/back.png diff --git a/graphics/pokemon/unown/w/icon.png b/graphics/pokemon/gen_2/unown/w/icon.png similarity index 100% rename from graphics/pokemon/unown/w/icon.png rename to graphics/pokemon/gen_2/unown/w/icon.png diff --git a/graphics/pokemon/unown/x/anim_front.png b/graphics/pokemon/gen_2/unown/x/anim_front.png similarity index 100% rename from graphics/pokemon/unown/x/anim_front.png rename to graphics/pokemon/gen_2/unown/x/anim_front.png diff --git a/graphics/pokemon/unown/x/back.png b/graphics/pokemon/gen_2/unown/x/back.png similarity index 100% rename from graphics/pokemon/unown/x/back.png rename to graphics/pokemon/gen_2/unown/x/back.png diff --git a/graphics/pokemon/unown/x/icon.png b/graphics/pokemon/gen_2/unown/x/icon.png similarity index 100% rename from graphics/pokemon/unown/x/icon.png rename to graphics/pokemon/gen_2/unown/x/icon.png diff --git a/graphics/pokemon/unown/y/anim_front.png b/graphics/pokemon/gen_2/unown/y/anim_front.png similarity index 100% rename from graphics/pokemon/unown/y/anim_front.png rename to graphics/pokemon/gen_2/unown/y/anim_front.png diff --git a/graphics/pokemon/unown/y/back.png b/graphics/pokemon/gen_2/unown/y/back.png similarity index 100% rename from graphics/pokemon/unown/y/back.png rename to graphics/pokemon/gen_2/unown/y/back.png diff --git a/graphics/pokemon/unown/y/icon.png b/graphics/pokemon/gen_2/unown/y/icon.png similarity index 100% rename from graphics/pokemon/unown/y/icon.png rename to graphics/pokemon/gen_2/unown/y/icon.png diff --git a/graphics/pokemon/unown/z/anim_front.png b/graphics/pokemon/gen_2/unown/z/anim_front.png similarity index 100% rename from graphics/pokemon/unown/z/anim_front.png rename to graphics/pokemon/gen_2/unown/z/anim_front.png diff --git a/graphics/pokemon/unown/z/back.png b/graphics/pokemon/gen_2/unown/z/back.png similarity index 100% rename from graphics/pokemon/unown/z/back.png rename to graphics/pokemon/gen_2/unown/z/back.png diff --git a/graphics/pokemon/unown/z/icon.png b/graphics/pokemon/gen_2/unown/z/icon.png similarity index 100% rename from graphics/pokemon/unown/z/icon.png rename to graphics/pokemon/gen_2/unown/z/icon.png diff --git a/graphics/pokemon/ursaring/anim_front.png b/graphics/pokemon/gen_2/ursaring/anim_front.png similarity index 100% rename from graphics/pokemon/ursaring/anim_front.png rename to graphics/pokemon/gen_2/ursaring/anim_front.png diff --git a/graphics/pokemon/ursaring/anim_frontf.png b/graphics/pokemon/gen_2/ursaring/anim_frontf.png similarity index 100% rename from graphics/pokemon/ursaring/anim_frontf.png rename to graphics/pokemon/gen_2/ursaring/anim_frontf.png diff --git a/graphics/pokemon/ursaring/back.png b/graphics/pokemon/gen_2/ursaring/back.png similarity index 100% rename from graphics/pokemon/ursaring/back.png rename to graphics/pokemon/gen_2/ursaring/back.png diff --git a/graphics/pokemon/ursaring/backf.png b/graphics/pokemon/gen_2/ursaring/backf.png similarity index 100% rename from graphics/pokemon/ursaring/backf.png rename to graphics/pokemon/gen_2/ursaring/backf.png diff --git a/graphics/pokemon/ursaring/footprint.png b/graphics/pokemon/gen_2/ursaring/footprint.png similarity index 100% rename from graphics/pokemon/ursaring/footprint.png rename to graphics/pokemon/gen_2/ursaring/footprint.png diff --git a/graphics/pokemon/ursaring/icon.png b/graphics/pokemon/gen_2/ursaring/icon.png similarity index 100% rename from graphics/pokemon/ursaring/icon.png rename to graphics/pokemon/gen_2/ursaring/icon.png diff --git a/graphics/pokemon/ursaring/normal.pal b/graphics/pokemon/gen_2/ursaring/normal.pal similarity index 100% rename from graphics/pokemon/ursaring/normal.pal rename to graphics/pokemon/gen_2/ursaring/normal.pal diff --git a/graphics/pokemon/ursaring/shiny.pal b/graphics/pokemon/gen_2/ursaring/shiny.pal similarity index 100% rename from graphics/pokemon/ursaring/shiny.pal rename to graphics/pokemon/gen_2/ursaring/shiny.pal diff --git a/graphics/pokemon/wobbuffet/anim_front.png b/graphics/pokemon/gen_2/wobbuffet/anim_front.png similarity index 100% rename from graphics/pokemon/wobbuffet/anim_front.png rename to graphics/pokemon/gen_2/wobbuffet/anim_front.png diff --git a/graphics/pokemon/wobbuffet/anim_frontf.png b/graphics/pokemon/gen_2/wobbuffet/anim_frontf.png similarity index 100% rename from graphics/pokemon/wobbuffet/anim_frontf.png rename to graphics/pokemon/gen_2/wobbuffet/anim_frontf.png diff --git a/graphics/pokemon/wobbuffet/back.png b/graphics/pokemon/gen_2/wobbuffet/back.png similarity index 100% rename from graphics/pokemon/wobbuffet/back.png rename to graphics/pokemon/gen_2/wobbuffet/back.png diff --git a/graphics/pokemon/wobbuffet/backf.png b/graphics/pokemon/gen_2/wobbuffet/backf.png similarity index 100% rename from graphics/pokemon/wobbuffet/backf.png rename to graphics/pokemon/gen_2/wobbuffet/backf.png diff --git a/graphics/pokemon/wobbuffet/footprint.png b/graphics/pokemon/gen_2/wobbuffet/footprint.png similarity index 100% rename from graphics/pokemon/wobbuffet/footprint.png rename to graphics/pokemon/gen_2/wobbuffet/footprint.png diff --git a/graphics/pokemon/wobbuffet/icon.png b/graphics/pokemon/gen_2/wobbuffet/icon.png similarity index 100% rename from graphics/pokemon/wobbuffet/icon.png rename to graphics/pokemon/gen_2/wobbuffet/icon.png diff --git a/graphics/pokemon/wobbuffet/iconf.png b/graphics/pokemon/gen_2/wobbuffet/iconf.png similarity index 100% rename from graphics/pokemon/wobbuffet/iconf.png rename to graphics/pokemon/gen_2/wobbuffet/iconf.png diff --git a/graphics/pokemon/wobbuffet/normal.pal b/graphics/pokemon/gen_2/wobbuffet/normal.pal similarity index 100% rename from graphics/pokemon/wobbuffet/normal.pal rename to graphics/pokemon/gen_2/wobbuffet/normal.pal diff --git a/graphics/pokemon/wobbuffet/shiny.pal b/graphics/pokemon/gen_2/wobbuffet/shiny.pal similarity index 100% rename from graphics/pokemon/wobbuffet/shiny.pal rename to graphics/pokemon/gen_2/wobbuffet/shiny.pal diff --git a/graphics/pokemon/wooper/anim_front.png b/graphics/pokemon/gen_2/wooper/anim_front.png similarity index 100% rename from graphics/pokemon/wooper/anim_front.png rename to graphics/pokemon/gen_2/wooper/anim_front.png diff --git a/graphics/pokemon/wooper/anim_frontf.png b/graphics/pokemon/gen_2/wooper/anim_frontf.png similarity index 100% rename from graphics/pokemon/wooper/anim_frontf.png rename to graphics/pokemon/gen_2/wooper/anim_frontf.png diff --git a/graphics/pokemon/wooper/back.png b/graphics/pokemon/gen_2/wooper/back.png similarity index 100% rename from graphics/pokemon/wooper/back.png rename to graphics/pokemon/gen_2/wooper/back.png diff --git a/graphics/pokemon/wooper/backf.png b/graphics/pokemon/gen_2/wooper/backf.png similarity index 100% rename from graphics/pokemon/wooper/backf.png rename to graphics/pokemon/gen_2/wooper/backf.png diff --git a/graphics/pokemon/wooper/footprint.png b/graphics/pokemon/gen_2/wooper/footprint.png similarity index 100% rename from graphics/pokemon/wooper/footprint.png rename to graphics/pokemon/gen_2/wooper/footprint.png diff --git a/graphics/pokemon/wooper/icon.png b/graphics/pokemon/gen_2/wooper/icon.png similarity index 100% rename from graphics/pokemon/wooper/icon.png rename to graphics/pokemon/gen_2/wooper/icon.png diff --git a/graphics/pokemon/wooper/normal.pal b/graphics/pokemon/gen_2/wooper/normal.pal similarity index 100% rename from graphics/pokemon/wooper/normal.pal rename to graphics/pokemon/gen_2/wooper/normal.pal diff --git a/graphics/pokemon/wooper/shiny.pal b/graphics/pokemon/gen_2/wooper/shiny.pal similarity index 100% rename from graphics/pokemon/wooper/shiny.pal rename to graphics/pokemon/gen_2/wooper/shiny.pal diff --git a/graphics/pokemon/wooper/wooper_paldean/back.png b/graphics/pokemon/gen_2/wooper/wooper_paldean/back.png similarity index 100% rename from graphics/pokemon/wooper/wooper_paldean/back.png rename to graphics/pokemon/gen_2/wooper/wooper_paldean/back.png diff --git a/graphics/pokemon/wooper/wooper_paldean/front.png b/graphics/pokemon/gen_2/wooper/wooper_paldean/front.png similarity index 100% rename from graphics/pokemon/wooper/wooper_paldean/front.png rename to graphics/pokemon/gen_2/wooper/wooper_paldean/front.png diff --git a/graphics/pokemon/wooper/wooper_paldean/normal.pal b/graphics/pokemon/gen_2/wooper/wooper_paldean/normal.pal similarity index 100% rename from graphics/pokemon/wooper/wooper_paldean/normal.pal rename to graphics/pokemon/gen_2/wooper/wooper_paldean/normal.pal diff --git a/graphics/pokemon/wooper/wooper_paldean/shiny.pal b/graphics/pokemon/gen_2/wooper/wooper_paldean/shiny.pal similarity index 100% rename from graphics/pokemon/wooper/wooper_paldean/shiny.pal rename to graphics/pokemon/gen_2/wooper/wooper_paldean/shiny.pal diff --git a/graphics/pokemon/xatu/anim_front.png b/graphics/pokemon/gen_2/xatu/anim_front.png similarity index 100% rename from graphics/pokemon/xatu/anim_front.png rename to graphics/pokemon/gen_2/xatu/anim_front.png diff --git a/graphics/pokemon/xatu/anim_frontf.png b/graphics/pokemon/gen_2/xatu/anim_frontf.png similarity index 100% rename from graphics/pokemon/xatu/anim_frontf.png rename to graphics/pokemon/gen_2/xatu/anim_frontf.png diff --git a/graphics/pokemon/xatu/back.png b/graphics/pokemon/gen_2/xatu/back.png similarity index 100% rename from graphics/pokemon/xatu/back.png rename to graphics/pokemon/gen_2/xatu/back.png diff --git a/graphics/pokemon/xatu/footprint.png b/graphics/pokemon/gen_2/xatu/footprint.png similarity index 100% rename from graphics/pokemon/xatu/footprint.png rename to graphics/pokemon/gen_2/xatu/footprint.png diff --git a/graphics/pokemon/xatu/icon.png b/graphics/pokemon/gen_2/xatu/icon.png similarity index 100% rename from graphics/pokemon/xatu/icon.png rename to graphics/pokemon/gen_2/xatu/icon.png diff --git a/graphics/pokemon/xatu/normal.pal b/graphics/pokemon/gen_2/xatu/normal.pal similarity index 100% rename from graphics/pokemon/xatu/normal.pal rename to graphics/pokemon/gen_2/xatu/normal.pal diff --git a/graphics/pokemon/xatu/shiny.pal b/graphics/pokemon/gen_2/xatu/shiny.pal similarity index 100% rename from graphics/pokemon/xatu/shiny.pal rename to graphics/pokemon/gen_2/xatu/shiny.pal diff --git a/graphics/pokemon/yanma/anim_front.png b/graphics/pokemon/gen_2/yanma/anim_front.png similarity index 100% rename from graphics/pokemon/yanma/anim_front.png rename to graphics/pokemon/gen_2/yanma/anim_front.png diff --git a/graphics/pokemon/yanma/back.png b/graphics/pokemon/gen_2/yanma/back.png similarity index 100% rename from graphics/pokemon/yanma/back.png rename to graphics/pokemon/gen_2/yanma/back.png diff --git a/graphics/pokemon/yanma/footprint.png b/graphics/pokemon/gen_2/yanma/footprint.png similarity index 100% rename from graphics/pokemon/yanma/footprint.png rename to graphics/pokemon/gen_2/yanma/footprint.png diff --git a/graphics/pokemon/yanma/icon.png b/graphics/pokemon/gen_2/yanma/icon.png similarity index 100% rename from graphics/pokemon/yanma/icon.png rename to graphics/pokemon/gen_2/yanma/icon.png diff --git a/graphics/pokemon/yanma/normal.pal b/graphics/pokemon/gen_2/yanma/normal.pal similarity index 100% rename from graphics/pokemon/yanma/normal.pal rename to graphics/pokemon/gen_2/yanma/normal.pal diff --git a/graphics/pokemon/yanma/shiny.pal b/graphics/pokemon/gen_2/yanma/shiny.pal similarity index 100% rename from graphics/pokemon/yanma/shiny.pal rename to graphics/pokemon/gen_2/yanma/shiny.pal diff --git a/graphics/pokemon/absol/anim_front.png b/graphics/pokemon/gen_3/absol/anim_front.png similarity index 100% rename from graphics/pokemon/absol/anim_front.png rename to graphics/pokemon/gen_3/absol/anim_front.png diff --git a/graphics/pokemon/absol/back.png b/graphics/pokemon/gen_3/absol/back.png similarity index 100% rename from graphics/pokemon/absol/back.png rename to graphics/pokemon/gen_3/absol/back.png diff --git a/graphics/pokemon/absol/footprint.png b/graphics/pokemon/gen_3/absol/footprint.png similarity index 100% rename from graphics/pokemon/absol/footprint.png rename to graphics/pokemon/gen_3/absol/footprint.png diff --git a/graphics/pokemon/absol/icon.png b/graphics/pokemon/gen_3/absol/icon.png similarity index 100% rename from graphics/pokemon/absol/icon.png rename to graphics/pokemon/gen_3/absol/icon.png diff --git a/graphics/pokemon/absol/mega/back.png b/graphics/pokemon/gen_3/absol/mega/back.png similarity index 100% rename from graphics/pokemon/absol/mega/back.png rename to graphics/pokemon/gen_3/absol/mega/back.png diff --git a/graphics/pokemon/absol/mega/front.png b/graphics/pokemon/gen_3/absol/mega/front.png similarity index 100% rename from graphics/pokemon/absol/mega/front.png rename to graphics/pokemon/gen_3/absol/mega/front.png diff --git a/graphics/pokemon/absol/mega/icon.png b/graphics/pokemon/gen_3/absol/mega/icon.png similarity index 100% rename from graphics/pokemon/absol/mega/icon.png rename to graphics/pokemon/gen_3/absol/mega/icon.png diff --git a/graphics/pokemon/absol/mega/normal.pal b/graphics/pokemon/gen_3/absol/mega/normal.pal similarity index 100% rename from graphics/pokemon/absol/mega/normal.pal rename to graphics/pokemon/gen_3/absol/mega/normal.pal diff --git a/graphics/pokemon/absol/mega/shiny.pal b/graphics/pokemon/gen_3/absol/mega/shiny.pal similarity index 100% rename from graphics/pokemon/absol/mega/shiny.pal rename to graphics/pokemon/gen_3/absol/mega/shiny.pal diff --git a/graphics/pokemon/absol/normal.pal b/graphics/pokemon/gen_3/absol/normal.pal similarity index 100% rename from graphics/pokemon/absol/normal.pal rename to graphics/pokemon/gen_3/absol/normal.pal diff --git a/graphics/pokemon/absol/shiny.pal b/graphics/pokemon/gen_3/absol/shiny.pal similarity index 100% rename from graphics/pokemon/absol/shiny.pal rename to graphics/pokemon/gen_3/absol/shiny.pal diff --git a/graphics/pokemon/aggron/anim_front.png b/graphics/pokemon/gen_3/aggron/anim_front.png similarity index 100% rename from graphics/pokemon/aggron/anim_front.png rename to graphics/pokemon/gen_3/aggron/anim_front.png diff --git a/graphics/pokemon/aggron/back.png b/graphics/pokemon/gen_3/aggron/back.png similarity index 100% rename from graphics/pokemon/aggron/back.png rename to graphics/pokemon/gen_3/aggron/back.png diff --git a/graphics/pokemon/aggron/footprint.png b/graphics/pokemon/gen_3/aggron/footprint.png similarity index 100% rename from graphics/pokemon/aggron/footprint.png rename to graphics/pokemon/gen_3/aggron/footprint.png diff --git a/graphics/pokemon/aggron/icon.png b/graphics/pokemon/gen_3/aggron/icon.png similarity index 100% rename from graphics/pokemon/aggron/icon.png rename to graphics/pokemon/gen_3/aggron/icon.png diff --git a/graphics/pokemon/aggron/mega/back.png b/graphics/pokemon/gen_3/aggron/mega/back.png similarity index 100% rename from graphics/pokemon/aggron/mega/back.png rename to graphics/pokemon/gen_3/aggron/mega/back.png diff --git a/graphics/pokemon/aggron/mega/front.png b/graphics/pokemon/gen_3/aggron/mega/front.png similarity index 100% rename from graphics/pokemon/aggron/mega/front.png rename to graphics/pokemon/gen_3/aggron/mega/front.png diff --git a/graphics/pokemon/aggron/mega/icon.png b/graphics/pokemon/gen_3/aggron/mega/icon.png similarity index 100% rename from graphics/pokemon/aggron/mega/icon.png rename to graphics/pokemon/gen_3/aggron/mega/icon.png diff --git a/graphics/pokemon/aggron/mega/normal.pal b/graphics/pokemon/gen_3/aggron/mega/normal.pal similarity index 100% rename from graphics/pokemon/aggron/mega/normal.pal rename to graphics/pokemon/gen_3/aggron/mega/normal.pal diff --git a/graphics/pokemon/aggron/mega/shiny.pal b/graphics/pokemon/gen_3/aggron/mega/shiny.pal similarity index 100% rename from graphics/pokemon/aggron/mega/shiny.pal rename to graphics/pokemon/gen_3/aggron/mega/shiny.pal diff --git a/graphics/pokemon/aggron/normal.pal b/graphics/pokemon/gen_3/aggron/normal.pal similarity index 100% rename from graphics/pokemon/aggron/normal.pal rename to graphics/pokemon/gen_3/aggron/normal.pal diff --git a/graphics/pokemon/aggron/shiny.pal b/graphics/pokemon/gen_3/aggron/shiny.pal similarity index 100% rename from graphics/pokemon/aggron/shiny.pal rename to graphics/pokemon/gen_3/aggron/shiny.pal diff --git a/graphics/pokemon/altaria/anim_front.png b/graphics/pokemon/gen_3/altaria/anim_front.png similarity index 100% rename from graphics/pokemon/altaria/anim_front.png rename to graphics/pokemon/gen_3/altaria/anim_front.png diff --git a/graphics/pokemon/altaria/back.png b/graphics/pokemon/gen_3/altaria/back.png similarity index 100% rename from graphics/pokemon/altaria/back.png rename to graphics/pokemon/gen_3/altaria/back.png diff --git a/graphics/pokemon/altaria/footprint.png b/graphics/pokemon/gen_3/altaria/footprint.png similarity index 100% rename from graphics/pokemon/altaria/footprint.png rename to graphics/pokemon/gen_3/altaria/footprint.png diff --git a/graphics/pokemon/altaria/icon.png b/graphics/pokemon/gen_3/altaria/icon.png similarity index 100% rename from graphics/pokemon/altaria/icon.png rename to graphics/pokemon/gen_3/altaria/icon.png diff --git a/graphics/pokemon/altaria/mega/back.png b/graphics/pokemon/gen_3/altaria/mega/back.png similarity index 100% rename from graphics/pokemon/altaria/mega/back.png rename to graphics/pokemon/gen_3/altaria/mega/back.png diff --git a/graphics/pokemon/altaria/mega/front.png b/graphics/pokemon/gen_3/altaria/mega/front.png similarity index 100% rename from graphics/pokemon/altaria/mega/front.png rename to graphics/pokemon/gen_3/altaria/mega/front.png diff --git a/graphics/pokemon/altaria/mega/icon.png b/graphics/pokemon/gen_3/altaria/mega/icon.png similarity index 100% rename from graphics/pokemon/altaria/mega/icon.png rename to graphics/pokemon/gen_3/altaria/mega/icon.png diff --git a/graphics/pokemon/altaria/mega/normal.pal b/graphics/pokemon/gen_3/altaria/mega/normal.pal similarity index 100% rename from graphics/pokemon/altaria/mega/normal.pal rename to graphics/pokemon/gen_3/altaria/mega/normal.pal diff --git a/graphics/pokemon/altaria/mega/shiny.pal b/graphics/pokemon/gen_3/altaria/mega/shiny.pal similarity index 100% rename from graphics/pokemon/altaria/mega/shiny.pal rename to graphics/pokemon/gen_3/altaria/mega/shiny.pal diff --git a/graphics/pokemon/altaria/normal.pal b/graphics/pokemon/gen_3/altaria/normal.pal similarity index 100% rename from graphics/pokemon/altaria/normal.pal rename to graphics/pokemon/gen_3/altaria/normal.pal diff --git a/graphics/pokemon/altaria/shiny.pal b/graphics/pokemon/gen_3/altaria/shiny.pal similarity index 100% rename from graphics/pokemon/altaria/shiny.pal rename to graphics/pokemon/gen_3/altaria/shiny.pal diff --git a/graphics/pokemon/anorith/anim_front.png b/graphics/pokemon/gen_3/anorith/anim_front.png similarity index 100% rename from graphics/pokemon/anorith/anim_front.png rename to graphics/pokemon/gen_3/anorith/anim_front.png diff --git a/graphics/pokemon/anorith/back.png b/graphics/pokemon/gen_3/anorith/back.png similarity index 100% rename from graphics/pokemon/anorith/back.png rename to graphics/pokemon/gen_3/anorith/back.png diff --git a/graphics/pokemon/duosion/footprint.png b/graphics/pokemon/gen_3/anorith/footprint.png similarity index 100% rename from graphics/pokemon/duosion/footprint.png rename to graphics/pokemon/gen_3/anorith/footprint.png diff --git a/graphics/pokemon/anorith/icon.png b/graphics/pokemon/gen_3/anorith/icon.png similarity index 100% rename from graphics/pokemon/anorith/icon.png rename to graphics/pokemon/gen_3/anorith/icon.png diff --git a/graphics/pokemon/anorith/normal.pal b/graphics/pokemon/gen_3/anorith/normal.pal similarity index 100% rename from graphics/pokemon/anorith/normal.pal rename to graphics/pokemon/gen_3/anorith/normal.pal diff --git a/graphics/pokemon/anorith/shiny.pal b/graphics/pokemon/gen_3/anorith/shiny.pal similarity index 100% rename from graphics/pokemon/anorith/shiny.pal rename to graphics/pokemon/gen_3/anorith/shiny.pal diff --git a/graphics/pokemon/armaldo/anim_front.png b/graphics/pokemon/gen_3/armaldo/anim_front.png similarity index 100% rename from graphics/pokemon/armaldo/anim_front.png rename to graphics/pokemon/gen_3/armaldo/anim_front.png diff --git a/graphics/pokemon/armaldo/back.png b/graphics/pokemon/gen_3/armaldo/back.png similarity index 100% rename from graphics/pokemon/armaldo/back.png rename to graphics/pokemon/gen_3/armaldo/back.png diff --git a/graphics/pokemon/armaldo/footprint.png b/graphics/pokemon/gen_3/armaldo/footprint.png similarity index 100% rename from graphics/pokemon/armaldo/footprint.png rename to graphics/pokemon/gen_3/armaldo/footprint.png diff --git a/graphics/pokemon/armaldo/icon.png b/graphics/pokemon/gen_3/armaldo/icon.png similarity index 100% rename from graphics/pokemon/armaldo/icon.png rename to graphics/pokemon/gen_3/armaldo/icon.png diff --git a/graphics/pokemon/armaldo/normal.pal b/graphics/pokemon/gen_3/armaldo/normal.pal similarity index 100% rename from graphics/pokemon/armaldo/normal.pal rename to graphics/pokemon/gen_3/armaldo/normal.pal diff --git a/graphics/pokemon/armaldo/shiny.pal b/graphics/pokemon/gen_3/armaldo/shiny.pal similarity index 100% rename from graphics/pokemon/armaldo/shiny.pal rename to graphics/pokemon/gen_3/armaldo/shiny.pal diff --git a/graphics/pokemon/aron/anim_front.png b/graphics/pokemon/gen_3/aron/anim_front.png similarity index 100% rename from graphics/pokemon/aron/anim_front.png rename to graphics/pokemon/gen_3/aron/anim_front.png diff --git a/graphics/pokemon/aron/back.png b/graphics/pokemon/gen_3/aron/back.png similarity index 100% rename from graphics/pokemon/aron/back.png rename to graphics/pokemon/gen_3/aron/back.png diff --git a/graphics/pokemon/aron/footprint.png b/graphics/pokemon/gen_3/aron/footprint.png similarity index 100% rename from graphics/pokemon/aron/footprint.png rename to graphics/pokemon/gen_3/aron/footprint.png diff --git a/graphics/pokemon/aron/icon.png b/graphics/pokemon/gen_3/aron/icon.png similarity index 100% rename from graphics/pokemon/aron/icon.png rename to graphics/pokemon/gen_3/aron/icon.png diff --git a/graphics/pokemon/aron/normal.pal b/graphics/pokemon/gen_3/aron/normal.pal similarity index 100% rename from graphics/pokemon/aron/normal.pal rename to graphics/pokemon/gen_3/aron/normal.pal diff --git a/graphics/pokemon/aron/shiny.pal b/graphics/pokemon/gen_3/aron/shiny.pal similarity index 100% rename from graphics/pokemon/aron/shiny.pal rename to graphics/pokemon/gen_3/aron/shiny.pal diff --git a/graphics/pokemon/azurill/anim_front.png b/graphics/pokemon/gen_3/azurill/anim_front.png similarity index 100% rename from graphics/pokemon/azurill/anim_front.png rename to graphics/pokemon/gen_3/azurill/anim_front.png diff --git a/graphics/pokemon/azurill/back.png b/graphics/pokemon/gen_3/azurill/back.png similarity index 100% rename from graphics/pokemon/azurill/back.png rename to graphics/pokemon/gen_3/azurill/back.png diff --git a/graphics/pokemon/azurill/footprint.png b/graphics/pokemon/gen_3/azurill/footprint.png similarity index 100% rename from graphics/pokemon/azurill/footprint.png rename to graphics/pokemon/gen_3/azurill/footprint.png diff --git a/graphics/pokemon/azurill/icon.png b/graphics/pokemon/gen_3/azurill/icon.png similarity index 100% rename from graphics/pokemon/azurill/icon.png rename to graphics/pokemon/gen_3/azurill/icon.png diff --git a/graphics/pokemon/azurill/normal.pal b/graphics/pokemon/gen_3/azurill/normal.pal similarity index 100% rename from graphics/pokemon/azurill/normal.pal rename to graphics/pokemon/gen_3/azurill/normal.pal diff --git a/graphics/pokemon/azurill/shiny.pal b/graphics/pokemon/gen_3/azurill/shiny.pal similarity index 100% rename from graphics/pokemon/azurill/shiny.pal rename to graphics/pokemon/gen_3/azurill/shiny.pal diff --git a/graphics/pokemon/bagon/anim_front.png b/graphics/pokemon/gen_3/bagon/anim_front.png similarity index 100% rename from graphics/pokemon/bagon/anim_front.png rename to graphics/pokemon/gen_3/bagon/anim_front.png diff --git a/graphics/pokemon/bagon/back.png b/graphics/pokemon/gen_3/bagon/back.png similarity index 100% rename from graphics/pokemon/bagon/back.png rename to graphics/pokemon/gen_3/bagon/back.png diff --git a/graphics/pokemon/bagon/footprint.png b/graphics/pokemon/gen_3/bagon/footprint.png similarity index 100% rename from graphics/pokemon/bagon/footprint.png rename to graphics/pokemon/gen_3/bagon/footprint.png diff --git a/graphics/pokemon/bagon/icon.png b/graphics/pokemon/gen_3/bagon/icon.png similarity index 100% rename from graphics/pokemon/bagon/icon.png rename to graphics/pokemon/gen_3/bagon/icon.png diff --git a/graphics/pokemon/bagon/normal.pal b/graphics/pokemon/gen_3/bagon/normal.pal similarity index 100% rename from graphics/pokemon/bagon/normal.pal rename to graphics/pokemon/gen_3/bagon/normal.pal diff --git a/graphics/pokemon/bagon/shiny.pal b/graphics/pokemon/gen_3/bagon/shiny.pal similarity index 100% rename from graphics/pokemon/bagon/shiny.pal rename to graphics/pokemon/gen_3/bagon/shiny.pal diff --git a/graphics/pokemon/baltoy/anim_front.png b/graphics/pokemon/gen_3/baltoy/anim_front.png similarity index 100% rename from graphics/pokemon/baltoy/anim_front.png rename to graphics/pokemon/gen_3/baltoy/anim_front.png diff --git a/graphics/pokemon/baltoy/back.png b/graphics/pokemon/gen_3/baltoy/back.png similarity index 100% rename from graphics/pokemon/baltoy/back.png rename to graphics/pokemon/gen_3/baltoy/back.png diff --git a/graphics/pokemon/drapion/footprint.png b/graphics/pokemon/gen_3/baltoy/footprint.png similarity index 100% rename from graphics/pokemon/drapion/footprint.png rename to graphics/pokemon/gen_3/baltoy/footprint.png diff --git a/graphics/pokemon/baltoy/icon.png b/graphics/pokemon/gen_3/baltoy/icon.png similarity index 100% rename from graphics/pokemon/baltoy/icon.png rename to graphics/pokemon/gen_3/baltoy/icon.png diff --git a/graphics/pokemon/baltoy/normal.pal b/graphics/pokemon/gen_3/baltoy/normal.pal similarity index 100% rename from graphics/pokemon/baltoy/normal.pal rename to graphics/pokemon/gen_3/baltoy/normal.pal diff --git a/graphics/pokemon/baltoy/shiny.pal b/graphics/pokemon/gen_3/baltoy/shiny.pal similarity index 100% rename from graphics/pokemon/baltoy/shiny.pal rename to graphics/pokemon/gen_3/baltoy/shiny.pal diff --git a/graphics/pokemon/banette/anim_front.png b/graphics/pokemon/gen_3/banette/anim_front.png similarity index 100% rename from graphics/pokemon/banette/anim_front.png rename to graphics/pokemon/gen_3/banette/anim_front.png diff --git a/graphics/pokemon/banette/back.png b/graphics/pokemon/gen_3/banette/back.png similarity index 100% rename from graphics/pokemon/banette/back.png rename to graphics/pokemon/gen_3/banette/back.png diff --git a/graphics/pokemon/banette/footprint.png b/graphics/pokemon/gen_3/banette/footprint.png similarity index 100% rename from graphics/pokemon/banette/footprint.png rename to graphics/pokemon/gen_3/banette/footprint.png diff --git a/graphics/pokemon/banette/icon.png b/graphics/pokemon/gen_3/banette/icon.png similarity index 100% rename from graphics/pokemon/banette/icon.png rename to graphics/pokemon/gen_3/banette/icon.png diff --git a/graphics/pokemon/banette/mega/back.png b/graphics/pokemon/gen_3/banette/mega/back.png similarity index 100% rename from graphics/pokemon/banette/mega/back.png rename to graphics/pokemon/gen_3/banette/mega/back.png diff --git a/graphics/pokemon/banette/mega/front.png b/graphics/pokemon/gen_3/banette/mega/front.png similarity index 100% rename from graphics/pokemon/banette/mega/front.png rename to graphics/pokemon/gen_3/banette/mega/front.png diff --git a/graphics/pokemon/banette/mega/icon.png b/graphics/pokemon/gen_3/banette/mega/icon.png similarity index 100% rename from graphics/pokemon/banette/mega/icon.png rename to graphics/pokemon/gen_3/banette/mega/icon.png diff --git a/graphics/pokemon/banette/mega/normal.pal b/graphics/pokemon/gen_3/banette/mega/normal.pal similarity index 100% rename from graphics/pokemon/banette/mega/normal.pal rename to graphics/pokemon/gen_3/banette/mega/normal.pal diff --git a/graphics/pokemon/banette/mega/shiny.pal b/graphics/pokemon/gen_3/banette/mega/shiny.pal similarity index 100% rename from graphics/pokemon/banette/mega/shiny.pal rename to graphics/pokemon/gen_3/banette/mega/shiny.pal diff --git a/graphics/pokemon/banette/normal.pal b/graphics/pokemon/gen_3/banette/normal.pal similarity index 100% rename from graphics/pokemon/banette/normal.pal rename to graphics/pokemon/gen_3/banette/normal.pal diff --git a/graphics/pokemon/banette/shiny.pal b/graphics/pokemon/gen_3/banette/shiny.pal similarity index 100% rename from graphics/pokemon/banette/shiny.pal rename to graphics/pokemon/gen_3/banette/shiny.pal diff --git a/graphics/pokemon/barboach/anim_front.png b/graphics/pokemon/gen_3/barboach/anim_front.png similarity index 100% rename from graphics/pokemon/barboach/anim_front.png rename to graphics/pokemon/gen_3/barboach/anim_front.png diff --git a/graphics/pokemon/barboach/back.png b/graphics/pokemon/gen_3/barboach/back.png similarity index 100% rename from graphics/pokemon/barboach/back.png rename to graphics/pokemon/gen_3/barboach/back.png diff --git a/graphics/pokemon/dusknoir/footprint.png b/graphics/pokemon/gen_3/barboach/footprint.png similarity index 100% rename from graphics/pokemon/dusknoir/footprint.png rename to graphics/pokemon/gen_3/barboach/footprint.png diff --git a/graphics/pokemon/barboach/icon.png b/graphics/pokemon/gen_3/barboach/icon.png similarity index 100% rename from graphics/pokemon/barboach/icon.png rename to graphics/pokemon/gen_3/barboach/icon.png diff --git a/graphics/pokemon/barboach/normal.pal b/graphics/pokemon/gen_3/barboach/normal.pal similarity index 100% rename from graphics/pokemon/barboach/normal.pal rename to graphics/pokemon/gen_3/barboach/normal.pal diff --git a/graphics/pokemon/barboach/shiny.pal b/graphics/pokemon/gen_3/barboach/shiny.pal similarity index 100% rename from graphics/pokemon/barboach/shiny.pal rename to graphics/pokemon/gen_3/barboach/shiny.pal diff --git a/graphics/pokemon/beautifly/anim_front.png b/graphics/pokemon/gen_3/beautifly/anim_front.png similarity index 100% rename from graphics/pokemon/beautifly/anim_front.png rename to graphics/pokemon/gen_3/beautifly/anim_front.png diff --git a/graphics/pokemon/beautifly/anim_frontf.png b/graphics/pokemon/gen_3/beautifly/anim_frontf.png similarity index 100% rename from graphics/pokemon/beautifly/anim_frontf.png rename to graphics/pokemon/gen_3/beautifly/anim_frontf.png diff --git a/graphics/pokemon/beautifly/back.png b/graphics/pokemon/gen_3/beautifly/back.png similarity index 100% rename from graphics/pokemon/beautifly/back.png rename to graphics/pokemon/gen_3/beautifly/back.png diff --git a/graphics/pokemon/beautifly/backf.png b/graphics/pokemon/gen_3/beautifly/backf.png similarity index 100% rename from graphics/pokemon/beautifly/backf.png rename to graphics/pokemon/gen_3/beautifly/backf.png diff --git a/graphics/pokemon/beautifly/footprint.png b/graphics/pokemon/gen_3/beautifly/footprint.png similarity index 100% rename from graphics/pokemon/beautifly/footprint.png rename to graphics/pokemon/gen_3/beautifly/footprint.png diff --git a/graphics/pokemon/beautifly/icon.png b/graphics/pokemon/gen_3/beautifly/icon.png similarity index 100% rename from graphics/pokemon/beautifly/icon.png rename to graphics/pokemon/gen_3/beautifly/icon.png diff --git a/graphics/pokemon/beautifly/normal.pal b/graphics/pokemon/gen_3/beautifly/normal.pal similarity index 100% rename from graphics/pokemon/beautifly/normal.pal rename to graphics/pokemon/gen_3/beautifly/normal.pal diff --git a/graphics/pokemon/beautifly/shiny.pal b/graphics/pokemon/gen_3/beautifly/shiny.pal similarity index 100% rename from graphics/pokemon/beautifly/shiny.pal rename to graphics/pokemon/gen_3/beautifly/shiny.pal diff --git a/graphics/pokemon/beldum/anim_front.png b/graphics/pokemon/gen_3/beldum/anim_front.png similarity index 100% rename from graphics/pokemon/beldum/anim_front.png rename to graphics/pokemon/gen_3/beldum/anim_front.png diff --git a/graphics/pokemon/beldum/back.png b/graphics/pokemon/gen_3/beldum/back.png similarity index 100% rename from graphics/pokemon/beldum/back.png rename to graphics/pokemon/gen_3/beldum/back.png diff --git a/graphics/pokemon/beldum/footprint.png b/graphics/pokemon/gen_3/beldum/footprint.png similarity index 100% rename from graphics/pokemon/beldum/footprint.png rename to graphics/pokemon/gen_3/beldum/footprint.png diff --git a/graphics/pokemon/beldum/icon.png b/graphics/pokemon/gen_3/beldum/icon.png similarity index 100% rename from graphics/pokemon/beldum/icon.png rename to graphics/pokemon/gen_3/beldum/icon.png diff --git a/graphics/pokemon/beldum/normal.pal b/graphics/pokemon/gen_3/beldum/normal.pal similarity index 100% rename from graphics/pokemon/beldum/normal.pal rename to graphics/pokemon/gen_3/beldum/normal.pal diff --git a/graphics/pokemon/beldum/shiny.pal b/graphics/pokemon/gen_3/beldum/shiny.pal similarity index 100% rename from graphics/pokemon/beldum/shiny.pal rename to graphics/pokemon/gen_3/beldum/shiny.pal diff --git a/graphics/pokemon/blaziken/anim_front.png b/graphics/pokemon/gen_3/blaziken/anim_front.png similarity index 100% rename from graphics/pokemon/blaziken/anim_front.png rename to graphics/pokemon/gen_3/blaziken/anim_front.png diff --git a/graphics/pokemon/blaziken/anim_frontf.png b/graphics/pokemon/gen_3/blaziken/anim_frontf.png similarity index 100% rename from graphics/pokemon/blaziken/anim_frontf.png rename to graphics/pokemon/gen_3/blaziken/anim_frontf.png diff --git a/graphics/pokemon/blaziken/back.png b/graphics/pokemon/gen_3/blaziken/back.png similarity index 100% rename from graphics/pokemon/blaziken/back.png rename to graphics/pokemon/gen_3/blaziken/back.png diff --git a/graphics/pokemon/blaziken/backf.png b/graphics/pokemon/gen_3/blaziken/backf.png similarity index 100% rename from graphics/pokemon/blaziken/backf.png rename to graphics/pokemon/gen_3/blaziken/backf.png diff --git a/graphics/pokemon/blaziken/footprint.png b/graphics/pokemon/gen_3/blaziken/footprint.png similarity index 100% rename from graphics/pokemon/blaziken/footprint.png rename to graphics/pokemon/gen_3/blaziken/footprint.png diff --git a/graphics/pokemon/blaziken/icon.png b/graphics/pokemon/gen_3/blaziken/icon.png similarity index 100% rename from graphics/pokemon/blaziken/icon.png rename to graphics/pokemon/gen_3/blaziken/icon.png diff --git a/graphics/pokemon/blaziken/mega/back.png b/graphics/pokemon/gen_3/blaziken/mega/back.png similarity index 100% rename from graphics/pokemon/blaziken/mega/back.png rename to graphics/pokemon/gen_3/blaziken/mega/back.png diff --git a/graphics/pokemon/blaziken/mega/front.png b/graphics/pokemon/gen_3/blaziken/mega/front.png similarity index 100% rename from graphics/pokemon/blaziken/mega/front.png rename to graphics/pokemon/gen_3/blaziken/mega/front.png diff --git a/graphics/pokemon/blaziken/mega/icon.png b/graphics/pokemon/gen_3/blaziken/mega/icon.png similarity index 100% rename from graphics/pokemon/blaziken/mega/icon.png rename to graphics/pokemon/gen_3/blaziken/mega/icon.png diff --git a/graphics/pokemon/blaziken/mega/normal.pal b/graphics/pokemon/gen_3/blaziken/mega/normal.pal similarity index 100% rename from graphics/pokemon/blaziken/mega/normal.pal rename to graphics/pokemon/gen_3/blaziken/mega/normal.pal diff --git a/graphics/pokemon/blaziken/mega/shiny.pal b/graphics/pokemon/gen_3/blaziken/mega/shiny.pal similarity index 100% rename from graphics/pokemon/blaziken/mega/shiny.pal rename to graphics/pokemon/gen_3/blaziken/mega/shiny.pal diff --git a/graphics/pokemon/blaziken/normal.pal b/graphics/pokemon/gen_3/blaziken/normal.pal similarity index 100% rename from graphics/pokemon/blaziken/normal.pal rename to graphics/pokemon/gen_3/blaziken/normal.pal diff --git a/graphics/pokemon/blaziken/shiny.pal b/graphics/pokemon/gen_3/blaziken/shiny.pal similarity index 100% rename from graphics/pokemon/blaziken/shiny.pal rename to graphics/pokemon/gen_3/blaziken/shiny.pal diff --git a/graphics/pokemon/breloom/anim_front.png b/graphics/pokemon/gen_3/breloom/anim_front.png similarity index 100% rename from graphics/pokemon/breloom/anim_front.png rename to graphics/pokemon/gen_3/breloom/anim_front.png diff --git a/graphics/pokemon/breloom/back.png b/graphics/pokemon/gen_3/breloom/back.png similarity index 100% rename from graphics/pokemon/breloom/back.png rename to graphics/pokemon/gen_3/breloom/back.png diff --git a/graphics/pokemon/breloom/footprint.png b/graphics/pokemon/gen_3/breloom/footprint.png similarity index 100% rename from graphics/pokemon/breloom/footprint.png rename to graphics/pokemon/gen_3/breloom/footprint.png diff --git a/graphics/pokemon/breloom/icon.png b/graphics/pokemon/gen_3/breloom/icon.png similarity index 100% rename from graphics/pokemon/breloom/icon.png rename to graphics/pokemon/gen_3/breloom/icon.png diff --git a/graphics/pokemon/breloom/normal.pal b/graphics/pokemon/gen_3/breloom/normal.pal similarity index 100% rename from graphics/pokemon/breloom/normal.pal rename to graphics/pokemon/gen_3/breloom/normal.pal diff --git a/graphics/pokemon/breloom/shiny.pal b/graphics/pokemon/gen_3/breloom/shiny.pal similarity index 100% rename from graphics/pokemon/breloom/shiny.pal rename to graphics/pokemon/gen_3/breloom/shiny.pal diff --git a/graphics/pokemon/cacnea/anim_front.png b/graphics/pokemon/gen_3/cacnea/anim_front.png similarity index 100% rename from graphics/pokemon/cacnea/anim_front.png rename to graphics/pokemon/gen_3/cacnea/anim_front.png diff --git a/graphics/pokemon/cacnea/back.png b/graphics/pokemon/gen_3/cacnea/back.png similarity index 100% rename from graphics/pokemon/cacnea/back.png rename to graphics/pokemon/gen_3/cacnea/back.png diff --git a/graphics/pokemon/cacnea/footprint.png b/graphics/pokemon/gen_3/cacnea/footprint.png similarity index 100% rename from graphics/pokemon/cacnea/footprint.png rename to graphics/pokemon/gen_3/cacnea/footprint.png diff --git a/graphics/pokemon/cacnea/icon.png b/graphics/pokemon/gen_3/cacnea/icon.png similarity index 100% rename from graphics/pokemon/cacnea/icon.png rename to graphics/pokemon/gen_3/cacnea/icon.png diff --git a/graphics/pokemon/cacnea/normal.pal b/graphics/pokemon/gen_3/cacnea/normal.pal similarity index 100% rename from graphics/pokemon/cacnea/normal.pal rename to graphics/pokemon/gen_3/cacnea/normal.pal diff --git a/graphics/pokemon/cacnea/shiny.pal b/graphics/pokemon/gen_3/cacnea/shiny.pal similarity index 100% rename from graphics/pokemon/cacnea/shiny.pal rename to graphics/pokemon/gen_3/cacnea/shiny.pal diff --git a/graphics/pokemon/cacturne/anim_front.png b/graphics/pokemon/gen_3/cacturne/anim_front.png similarity index 100% rename from graphics/pokemon/cacturne/anim_front.png rename to graphics/pokemon/gen_3/cacturne/anim_front.png diff --git a/graphics/pokemon/cacturne/anim_frontf.png b/graphics/pokemon/gen_3/cacturne/anim_frontf.png similarity index 100% rename from graphics/pokemon/cacturne/anim_frontf.png rename to graphics/pokemon/gen_3/cacturne/anim_frontf.png diff --git a/graphics/pokemon/cacturne/back.png b/graphics/pokemon/gen_3/cacturne/back.png similarity index 100% rename from graphics/pokemon/cacturne/back.png rename to graphics/pokemon/gen_3/cacturne/back.png diff --git a/graphics/pokemon/cacturne/footprint.png b/graphics/pokemon/gen_3/cacturne/footprint.png similarity index 100% rename from graphics/pokemon/cacturne/footprint.png rename to graphics/pokemon/gen_3/cacturne/footprint.png diff --git a/graphics/pokemon/cacturne/icon.png b/graphics/pokemon/gen_3/cacturne/icon.png similarity index 100% rename from graphics/pokemon/cacturne/icon.png rename to graphics/pokemon/gen_3/cacturne/icon.png diff --git a/graphics/pokemon/cacturne/normal.pal b/graphics/pokemon/gen_3/cacturne/normal.pal similarity index 100% rename from graphics/pokemon/cacturne/normal.pal rename to graphics/pokemon/gen_3/cacturne/normal.pal diff --git a/graphics/pokemon/cacturne/shiny.pal b/graphics/pokemon/gen_3/cacturne/shiny.pal similarity index 100% rename from graphics/pokemon/cacturne/shiny.pal rename to graphics/pokemon/gen_3/cacturne/shiny.pal diff --git a/graphics/pokemon/camerupt/anim_front.png b/graphics/pokemon/gen_3/camerupt/anim_front.png similarity index 100% rename from graphics/pokemon/camerupt/anim_front.png rename to graphics/pokemon/gen_3/camerupt/anim_front.png diff --git a/graphics/pokemon/camerupt/anim_frontf.png b/graphics/pokemon/gen_3/camerupt/anim_frontf.png similarity index 100% rename from graphics/pokemon/camerupt/anim_frontf.png rename to graphics/pokemon/gen_3/camerupt/anim_frontf.png diff --git a/graphics/pokemon/camerupt/back.png b/graphics/pokemon/gen_3/camerupt/back.png similarity index 100% rename from graphics/pokemon/camerupt/back.png rename to graphics/pokemon/gen_3/camerupt/back.png diff --git a/graphics/pokemon/camerupt/backf.png b/graphics/pokemon/gen_3/camerupt/backf.png similarity index 100% rename from graphics/pokemon/camerupt/backf.png rename to graphics/pokemon/gen_3/camerupt/backf.png diff --git a/graphics/pokemon/camerupt/footprint.png b/graphics/pokemon/gen_3/camerupt/footprint.png similarity index 100% rename from graphics/pokemon/camerupt/footprint.png rename to graphics/pokemon/gen_3/camerupt/footprint.png diff --git a/graphics/pokemon/camerupt/icon.png b/graphics/pokemon/gen_3/camerupt/icon.png similarity index 100% rename from graphics/pokemon/camerupt/icon.png rename to graphics/pokemon/gen_3/camerupt/icon.png diff --git a/graphics/pokemon/camerupt/mega/back.png b/graphics/pokemon/gen_3/camerupt/mega/back.png similarity index 100% rename from graphics/pokemon/camerupt/mega/back.png rename to graphics/pokemon/gen_3/camerupt/mega/back.png diff --git a/graphics/pokemon/camerupt/mega/front.png b/graphics/pokemon/gen_3/camerupt/mega/front.png similarity index 100% rename from graphics/pokemon/camerupt/mega/front.png rename to graphics/pokemon/gen_3/camerupt/mega/front.png diff --git a/graphics/pokemon/camerupt/mega/icon.png b/graphics/pokemon/gen_3/camerupt/mega/icon.png similarity index 100% rename from graphics/pokemon/camerupt/mega/icon.png rename to graphics/pokemon/gen_3/camerupt/mega/icon.png diff --git a/graphics/pokemon/camerupt/mega/normal.pal b/graphics/pokemon/gen_3/camerupt/mega/normal.pal similarity index 100% rename from graphics/pokemon/camerupt/mega/normal.pal rename to graphics/pokemon/gen_3/camerupt/mega/normal.pal diff --git a/graphics/pokemon/camerupt/mega/shiny.pal b/graphics/pokemon/gen_3/camerupt/mega/shiny.pal similarity index 100% rename from graphics/pokemon/camerupt/mega/shiny.pal rename to graphics/pokemon/gen_3/camerupt/mega/shiny.pal diff --git a/graphics/pokemon/camerupt/normal.pal b/graphics/pokemon/gen_3/camerupt/normal.pal similarity index 100% rename from graphics/pokemon/camerupt/normal.pal rename to graphics/pokemon/gen_3/camerupt/normal.pal diff --git a/graphics/pokemon/camerupt/shiny.pal b/graphics/pokemon/gen_3/camerupt/shiny.pal similarity index 100% rename from graphics/pokemon/camerupt/shiny.pal rename to graphics/pokemon/gen_3/camerupt/shiny.pal diff --git a/graphics/pokemon/carvanha/anim_front.png b/graphics/pokemon/gen_3/carvanha/anim_front.png similarity index 100% rename from graphics/pokemon/carvanha/anim_front.png rename to graphics/pokemon/gen_3/carvanha/anim_front.png diff --git a/graphics/pokemon/carvanha/back.png b/graphics/pokemon/gen_3/carvanha/back.png similarity index 100% rename from graphics/pokemon/carvanha/back.png rename to graphics/pokemon/gen_3/carvanha/back.png diff --git a/graphics/pokemon/duskull/footprint.png b/graphics/pokemon/gen_3/carvanha/footprint.png similarity index 100% rename from graphics/pokemon/duskull/footprint.png rename to graphics/pokemon/gen_3/carvanha/footprint.png diff --git a/graphics/pokemon/carvanha/icon.png b/graphics/pokemon/gen_3/carvanha/icon.png similarity index 100% rename from graphics/pokemon/carvanha/icon.png rename to graphics/pokemon/gen_3/carvanha/icon.png diff --git a/graphics/pokemon/carvanha/normal.pal b/graphics/pokemon/gen_3/carvanha/normal.pal similarity index 100% rename from graphics/pokemon/carvanha/normal.pal rename to graphics/pokemon/gen_3/carvanha/normal.pal diff --git a/graphics/pokemon/carvanha/shiny.pal b/graphics/pokemon/gen_3/carvanha/shiny.pal similarity index 100% rename from graphics/pokemon/carvanha/shiny.pal rename to graphics/pokemon/gen_3/carvanha/shiny.pal diff --git a/graphics/pokemon/cascoon/anim_front.png b/graphics/pokemon/gen_3/cascoon/anim_front.png similarity index 100% rename from graphics/pokemon/cascoon/anim_front.png rename to graphics/pokemon/gen_3/cascoon/anim_front.png diff --git a/graphics/pokemon/cascoon/back.png b/graphics/pokemon/gen_3/cascoon/back.png similarity index 100% rename from graphics/pokemon/cascoon/back.png rename to graphics/pokemon/gen_3/cascoon/back.png diff --git a/graphics/pokemon/eelektrik/footprint.png b/graphics/pokemon/gen_3/cascoon/footprint.png similarity index 100% rename from graphics/pokemon/eelektrik/footprint.png rename to graphics/pokemon/gen_3/cascoon/footprint.png diff --git a/graphics/pokemon/cascoon/icon.png b/graphics/pokemon/gen_3/cascoon/icon.png similarity index 100% rename from graphics/pokemon/cascoon/icon.png rename to graphics/pokemon/gen_3/cascoon/icon.png diff --git a/graphics/pokemon/cascoon/normal.pal b/graphics/pokemon/gen_3/cascoon/normal.pal similarity index 100% rename from graphics/pokemon/cascoon/normal.pal rename to graphics/pokemon/gen_3/cascoon/normal.pal diff --git a/graphics/pokemon/cascoon/shiny.pal b/graphics/pokemon/gen_3/cascoon/shiny.pal similarity index 100% rename from graphics/pokemon/cascoon/shiny.pal rename to graphics/pokemon/gen_3/cascoon/shiny.pal diff --git a/graphics/pokemon/castform/anim_front.png b/graphics/pokemon/gen_3/castform/anim_front.png similarity index 100% rename from graphics/pokemon/castform/anim_front.png rename to graphics/pokemon/gen_3/castform/anim_front.png diff --git a/graphics/pokemon/castform/back.png b/graphics/pokemon/gen_3/castform/back.png similarity index 100% rename from graphics/pokemon/castform/back.png rename to graphics/pokemon/gen_3/castform/back.png diff --git a/graphics/pokemon/eelektross/footprint.png b/graphics/pokemon/gen_3/castform/footprint.png similarity index 100% rename from graphics/pokemon/eelektross/footprint.png rename to graphics/pokemon/gen_3/castform/footprint.png diff --git a/graphics/pokemon/castform/icon.png b/graphics/pokemon/gen_3/castform/icon.png similarity index 100% rename from graphics/pokemon/castform/icon.png rename to graphics/pokemon/gen_3/castform/icon.png diff --git a/graphics/pokemon/castform/normal.pal b/graphics/pokemon/gen_3/castform/normal.pal similarity index 100% rename from graphics/pokemon/castform/normal.pal rename to graphics/pokemon/gen_3/castform/normal.pal diff --git a/graphics/pokemon/castform/rainy/anim_front.png b/graphics/pokemon/gen_3/castform/rainy/anim_front.png similarity index 100% rename from graphics/pokemon/castform/rainy/anim_front.png rename to graphics/pokemon/gen_3/castform/rainy/anim_front.png diff --git a/graphics/pokemon/castform/rainy/back.png b/graphics/pokemon/gen_3/castform/rainy/back.png similarity index 100% rename from graphics/pokemon/castform/rainy/back.png rename to graphics/pokemon/gen_3/castform/rainy/back.png diff --git a/graphics/pokemon/castform/rainy/icon.png b/graphics/pokemon/gen_3/castform/rainy/icon.png similarity index 100% rename from graphics/pokemon/castform/rainy/icon.png rename to graphics/pokemon/gen_3/castform/rainy/icon.png diff --git a/graphics/pokemon/castform/rainy/normal.pal b/graphics/pokemon/gen_3/castform/rainy/normal.pal similarity index 100% rename from graphics/pokemon/castform/rainy/normal.pal rename to graphics/pokemon/gen_3/castform/rainy/normal.pal diff --git a/graphics/pokemon/castform/rainy/shiny.pal b/graphics/pokemon/gen_3/castform/rainy/shiny.pal similarity index 100% rename from graphics/pokemon/castform/rainy/shiny.pal rename to graphics/pokemon/gen_3/castform/rainy/shiny.pal diff --git a/graphics/pokemon/castform/shiny.pal b/graphics/pokemon/gen_3/castform/shiny.pal similarity index 100% rename from graphics/pokemon/castform/shiny.pal rename to graphics/pokemon/gen_3/castform/shiny.pal diff --git a/graphics/pokemon/castform/snowy/anim_front.png b/graphics/pokemon/gen_3/castform/snowy/anim_front.png similarity index 100% rename from graphics/pokemon/castform/snowy/anim_front.png rename to graphics/pokemon/gen_3/castform/snowy/anim_front.png diff --git a/graphics/pokemon/castform/snowy/back.png b/graphics/pokemon/gen_3/castform/snowy/back.png similarity index 100% rename from graphics/pokemon/castform/snowy/back.png rename to graphics/pokemon/gen_3/castform/snowy/back.png diff --git a/graphics/pokemon/castform/snowy/icon.png b/graphics/pokemon/gen_3/castform/snowy/icon.png similarity index 100% rename from graphics/pokemon/castform/snowy/icon.png rename to graphics/pokemon/gen_3/castform/snowy/icon.png diff --git a/graphics/pokemon/castform/snowy/normal.pal b/graphics/pokemon/gen_3/castform/snowy/normal.pal similarity index 100% rename from graphics/pokemon/castform/snowy/normal.pal rename to graphics/pokemon/gen_3/castform/snowy/normal.pal diff --git a/graphics/pokemon/castform/snowy/shiny.pal b/graphics/pokemon/gen_3/castform/snowy/shiny.pal similarity index 100% rename from graphics/pokemon/castform/snowy/shiny.pal rename to graphics/pokemon/gen_3/castform/snowy/shiny.pal diff --git a/graphics/pokemon/castform/sunny/anim_front.png b/graphics/pokemon/gen_3/castform/sunny/anim_front.png similarity index 100% rename from graphics/pokemon/castform/sunny/anim_front.png rename to graphics/pokemon/gen_3/castform/sunny/anim_front.png diff --git a/graphics/pokemon/castform/sunny/back.png b/graphics/pokemon/gen_3/castform/sunny/back.png similarity index 100% rename from graphics/pokemon/castform/sunny/back.png rename to graphics/pokemon/gen_3/castform/sunny/back.png diff --git a/graphics/pokemon/castform/sunny/icon.png b/graphics/pokemon/gen_3/castform/sunny/icon.png similarity index 100% rename from graphics/pokemon/castform/sunny/icon.png rename to graphics/pokemon/gen_3/castform/sunny/icon.png diff --git a/graphics/pokemon/castform/sunny/normal.pal b/graphics/pokemon/gen_3/castform/sunny/normal.pal similarity index 100% rename from graphics/pokemon/castform/sunny/normal.pal rename to graphics/pokemon/gen_3/castform/sunny/normal.pal diff --git a/graphics/pokemon/castform/sunny/shiny.pal b/graphics/pokemon/gen_3/castform/sunny/shiny.pal similarity index 100% rename from graphics/pokemon/castform/sunny/shiny.pal rename to graphics/pokemon/gen_3/castform/sunny/shiny.pal diff --git a/graphics/pokemon/chimecho/anim_front.png b/graphics/pokemon/gen_3/chimecho/anim_front.png similarity index 100% rename from graphics/pokemon/chimecho/anim_front.png rename to graphics/pokemon/gen_3/chimecho/anim_front.png diff --git a/graphics/pokemon/chimecho/back.png b/graphics/pokemon/gen_3/chimecho/back.png similarity index 100% rename from graphics/pokemon/chimecho/back.png rename to graphics/pokemon/gen_3/chimecho/back.png diff --git a/graphics/pokemon/ekans/footprint.png b/graphics/pokemon/gen_3/chimecho/footprint.png similarity index 100% rename from graphics/pokemon/ekans/footprint.png rename to graphics/pokemon/gen_3/chimecho/footprint.png diff --git a/graphics/pokemon/chimecho/icon.png b/graphics/pokemon/gen_3/chimecho/icon.png similarity index 100% rename from graphics/pokemon/chimecho/icon.png rename to graphics/pokemon/gen_3/chimecho/icon.png diff --git a/graphics/pokemon/chimecho/normal.pal b/graphics/pokemon/gen_3/chimecho/normal.pal similarity index 100% rename from graphics/pokemon/chimecho/normal.pal rename to graphics/pokemon/gen_3/chimecho/normal.pal diff --git a/graphics/pokemon/chimecho/shiny.pal b/graphics/pokemon/gen_3/chimecho/shiny.pal similarity index 100% rename from graphics/pokemon/chimecho/shiny.pal rename to graphics/pokemon/gen_3/chimecho/shiny.pal diff --git a/graphics/pokemon/clamperl/anim_front.png b/graphics/pokemon/gen_3/clamperl/anim_front.png similarity index 100% rename from graphics/pokemon/clamperl/anim_front.png rename to graphics/pokemon/gen_3/clamperl/anim_front.png diff --git a/graphics/pokemon/clamperl/back.png b/graphics/pokemon/gen_3/clamperl/back.png similarity index 100% rename from graphics/pokemon/clamperl/back.png rename to graphics/pokemon/gen_3/clamperl/back.png diff --git a/graphics/pokemon/eldegoss/footprint.png b/graphics/pokemon/gen_3/clamperl/footprint.png similarity index 100% rename from graphics/pokemon/eldegoss/footprint.png rename to graphics/pokemon/gen_3/clamperl/footprint.png diff --git a/graphics/pokemon/clamperl/icon.png b/graphics/pokemon/gen_3/clamperl/icon.png similarity index 100% rename from graphics/pokemon/clamperl/icon.png rename to graphics/pokemon/gen_3/clamperl/icon.png diff --git a/graphics/pokemon/clamperl/normal.pal b/graphics/pokemon/gen_3/clamperl/normal.pal similarity index 100% rename from graphics/pokemon/clamperl/normal.pal rename to graphics/pokemon/gen_3/clamperl/normal.pal diff --git a/graphics/pokemon/clamperl/shiny.pal b/graphics/pokemon/gen_3/clamperl/shiny.pal similarity index 100% rename from graphics/pokemon/clamperl/shiny.pal rename to graphics/pokemon/gen_3/clamperl/shiny.pal diff --git a/graphics/pokemon/claydol/anim_front.png b/graphics/pokemon/gen_3/claydol/anim_front.png similarity index 100% rename from graphics/pokemon/claydol/anim_front.png rename to graphics/pokemon/gen_3/claydol/anim_front.png diff --git a/graphics/pokemon/claydol/back.png b/graphics/pokemon/gen_3/claydol/back.png similarity index 100% rename from graphics/pokemon/claydol/back.png rename to graphics/pokemon/gen_3/claydol/back.png diff --git a/graphics/pokemon/claydol/footprint.png b/graphics/pokemon/gen_3/claydol/footprint.png similarity index 100% rename from graphics/pokemon/claydol/footprint.png rename to graphics/pokemon/gen_3/claydol/footprint.png diff --git a/graphics/pokemon/claydol/icon.png b/graphics/pokemon/gen_3/claydol/icon.png similarity index 100% rename from graphics/pokemon/claydol/icon.png rename to graphics/pokemon/gen_3/claydol/icon.png diff --git a/graphics/pokemon/claydol/normal.pal b/graphics/pokemon/gen_3/claydol/normal.pal similarity index 100% rename from graphics/pokemon/claydol/normal.pal rename to graphics/pokemon/gen_3/claydol/normal.pal diff --git a/graphics/pokemon/claydol/shiny.pal b/graphics/pokemon/gen_3/claydol/shiny.pal similarity index 100% rename from graphics/pokemon/claydol/shiny.pal rename to graphics/pokemon/gen_3/claydol/shiny.pal diff --git a/graphics/pokemon/combusken/anim_front.png b/graphics/pokemon/gen_3/combusken/anim_front.png similarity index 100% rename from graphics/pokemon/combusken/anim_front.png rename to graphics/pokemon/gen_3/combusken/anim_front.png diff --git a/graphics/pokemon/combusken/anim_frontf.png b/graphics/pokemon/gen_3/combusken/anim_frontf.png similarity index 100% rename from graphics/pokemon/combusken/anim_frontf.png rename to graphics/pokemon/gen_3/combusken/anim_frontf.png diff --git a/graphics/pokemon/combusken/back.png b/graphics/pokemon/gen_3/combusken/back.png similarity index 100% rename from graphics/pokemon/combusken/back.png rename to graphics/pokemon/gen_3/combusken/back.png diff --git a/graphics/pokemon/combusken/backf.png b/graphics/pokemon/gen_3/combusken/backf.png similarity index 100% rename from graphics/pokemon/combusken/backf.png rename to graphics/pokemon/gen_3/combusken/backf.png diff --git a/graphics/pokemon/combusken/footprint.png b/graphics/pokemon/gen_3/combusken/footprint.png similarity index 100% rename from graphics/pokemon/combusken/footprint.png rename to graphics/pokemon/gen_3/combusken/footprint.png diff --git a/graphics/pokemon/combusken/icon.png b/graphics/pokemon/gen_3/combusken/icon.png similarity index 100% rename from graphics/pokemon/combusken/icon.png rename to graphics/pokemon/gen_3/combusken/icon.png diff --git a/graphics/pokemon/combusken/normal.pal b/graphics/pokemon/gen_3/combusken/normal.pal similarity index 100% rename from graphics/pokemon/combusken/normal.pal rename to graphics/pokemon/gen_3/combusken/normal.pal diff --git a/graphics/pokemon/combusken/shiny.pal b/graphics/pokemon/gen_3/combusken/shiny.pal similarity index 100% rename from graphics/pokemon/combusken/shiny.pal rename to graphics/pokemon/gen_3/combusken/shiny.pal diff --git a/graphics/pokemon/corphish/anim_front.png b/graphics/pokemon/gen_3/corphish/anim_front.png similarity index 100% rename from graphics/pokemon/corphish/anim_front.png rename to graphics/pokemon/gen_3/corphish/anim_front.png diff --git a/graphics/pokemon/corphish/back.png b/graphics/pokemon/gen_3/corphish/back.png similarity index 100% rename from graphics/pokemon/corphish/back.png rename to graphics/pokemon/gen_3/corphish/back.png diff --git a/graphics/pokemon/corphish/footprint.png b/graphics/pokemon/gen_3/corphish/footprint.png similarity index 100% rename from graphics/pokemon/corphish/footprint.png rename to graphics/pokemon/gen_3/corphish/footprint.png diff --git a/graphics/pokemon/corphish/icon.png b/graphics/pokemon/gen_3/corphish/icon.png similarity index 100% rename from graphics/pokemon/corphish/icon.png rename to graphics/pokemon/gen_3/corphish/icon.png diff --git a/graphics/pokemon/corphish/normal.pal b/graphics/pokemon/gen_3/corphish/normal.pal similarity index 100% rename from graphics/pokemon/corphish/normal.pal rename to graphics/pokemon/gen_3/corphish/normal.pal diff --git a/graphics/pokemon/corphish/shiny.pal b/graphics/pokemon/gen_3/corphish/shiny.pal similarity index 100% rename from graphics/pokemon/corphish/shiny.pal rename to graphics/pokemon/gen_3/corphish/shiny.pal diff --git a/graphics/pokemon/cradily/anim_front.png b/graphics/pokemon/gen_3/cradily/anim_front.png similarity index 100% rename from graphics/pokemon/cradily/anim_front.png rename to graphics/pokemon/gen_3/cradily/anim_front.png diff --git a/graphics/pokemon/cradily/back.png b/graphics/pokemon/gen_3/cradily/back.png similarity index 100% rename from graphics/pokemon/cradily/back.png rename to graphics/pokemon/gen_3/cradily/back.png diff --git a/graphics/pokemon/cradily/footprint.png b/graphics/pokemon/gen_3/cradily/footprint.png similarity index 100% rename from graphics/pokemon/cradily/footprint.png rename to graphics/pokemon/gen_3/cradily/footprint.png diff --git a/graphics/pokemon/cradily/icon.png b/graphics/pokemon/gen_3/cradily/icon.png similarity index 100% rename from graphics/pokemon/cradily/icon.png rename to graphics/pokemon/gen_3/cradily/icon.png diff --git a/graphics/pokemon/cradily/normal.pal b/graphics/pokemon/gen_3/cradily/normal.pal similarity index 100% rename from graphics/pokemon/cradily/normal.pal rename to graphics/pokemon/gen_3/cradily/normal.pal diff --git a/graphics/pokemon/cradily/shiny.pal b/graphics/pokemon/gen_3/cradily/shiny.pal similarity index 100% rename from graphics/pokemon/cradily/shiny.pal rename to graphics/pokemon/gen_3/cradily/shiny.pal diff --git a/graphics/pokemon/crawdaunt/anim_front.png b/graphics/pokemon/gen_3/crawdaunt/anim_front.png similarity index 100% rename from graphics/pokemon/crawdaunt/anim_front.png rename to graphics/pokemon/gen_3/crawdaunt/anim_front.png diff --git a/graphics/pokemon/crawdaunt/back.png b/graphics/pokemon/gen_3/crawdaunt/back.png similarity index 100% rename from graphics/pokemon/crawdaunt/back.png rename to graphics/pokemon/gen_3/crawdaunt/back.png diff --git a/graphics/pokemon/crawdaunt/footprint.png b/graphics/pokemon/gen_3/crawdaunt/footprint.png similarity index 100% rename from graphics/pokemon/crawdaunt/footprint.png rename to graphics/pokemon/gen_3/crawdaunt/footprint.png diff --git a/graphics/pokemon/crawdaunt/icon.png b/graphics/pokemon/gen_3/crawdaunt/icon.png similarity index 100% rename from graphics/pokemon/crawdaunt/icon.png rename to graphics/pokemon/gen_3/crawdaunt/icon.png diff --git a/graphics/pokemon/crawdaunt/normal.pal b/graphics/pokemon/gen_3/crawdaunt/normal.pal similarity index 100% rename from graphics/pokemon/crawdaunt/normal.pal rename to graphics/pokemon/gen_3/crawdaunt/normal.pal diff --git a/graphics/pokemon/crawdaunt/shiny.pal b/graphics/pokemon/gen_3/crawdaunt/shiny.pal similarity index 100% rename from graphics/pokemon/crawdaunt/shiny.pal rename to graphics/pokemon/gen_3/crawdaunt/shiny.pal diff --git a/graphics/pokemon/delcatty/anim_front.png b/graphics/pokemon/gen_3/delcatty/anim_front.png similarity index 100% rename from graphics/pokemon/delcatty/anim_front.png rename to graphics/pokemon/gen_3/delcatty/anim_front.png diff --git a/graphics/pokemon/delcatty/back.png b/graphics/pokemon/gen_3/delcatty/back.png similarity index 100% rename from graphics/pokemon/delcatty/back.png rename to graphics/pokemon/gen_3/delcatty/back.png diff --git a/graphics/pokemon/delcatty/footprint.png b/graphics/pokemon/gen_3/delcatty/footprint.png similarity index 100% rename from graphics/pokemon/delcatty/footprint.png rename to graphics/pokemon/gen_3/delcatty/footprint.png diff --git a/graphics/pokemon/delcatty/icon.png b/graphics/pokemon/gen_3/delcatty/icon.png similarity index 100% rename from graphics/pokemon/delcatty/icon.png rename to graphics/pokemon/gen_3/delcatty/icon.png diff --git a/graphics/pokemon/delcatty/normal.pal b/graphics/pokemon/gen_3/delcatty/normal.pal similarity index 100% rename from graphics/pokemon/delcatty/normal.pal rename to graphics/pokemon/gen_3/delcatty/normal.pal diff --git a/graphics/pokemon/delcatty/shiny.pal b/graphics/pokemon/gen_3/delcatty/shiny.pal similarity index 100% rename from graphics/pokemon/delcatty/shiny.pal rename to graphics/pokemon/gen_3/delcatty/shiny.pal diff --git a/graphics/pokemon/deoxys/anim_front.png b/graphics/pokemon/gen_3/deoxys/anim_front.png similarity index 100% rename from graphics/pokemon/deoxys/anim_front.png rename to graphics/pokemon/gen_3/deoxys/anim_front.png diff --git a/graphics/pokemon/deoxys/attack/anim_front.png b/graphics/pokemon/gen_3/deoxys/attack/anim_front.png similarity index 100% rename from graphics/pokemon/deoxys/attack/anim_front.png rename to graphics/pokemon/gen_3/deoxys/attack/anim_front.png diff --git a/graphics/pokemon/deoxys/attack/back.png b/graphics/pokemon/gen_3/deoxys/attack/back.png similarity index 100% rename from graphics/pokemon/deoxys/attack/back.png rename to graphics/pokemon/gen_3/deoxys/attack/back.png diff --git a/graphics/pokemon/deoxys/attack/icon.png b/graphics/pokemon/gen_3/deoxys/attack/icon.png similarity index 100% rename from graphics/pokemon/deoxys/attack/icon.png rename to graphics/pokemon/gen_3/deoxys/attack/icon.png diff --git a/graphics/pokemon/deoxys/attack/normal.pal b/graphics/pokemon/gen_3/deoxys/attack/normal.pal similarity index 100% rename from graphics/pokemon/deoxys/attack/normal.pal rename to graphics/pokemon/gen_3/deoxys/attack/normal.pal diff --git a/graphics/pokemon/deoxys/attack/shiny.pal b/graphics/pokemon/gen_3/deoxys/attack/shiny.pal similarity index 100% rename from graphics/pokemon/deoxys/attack/shiny.pal rename to graphics/pokemon/gen_3/deoxys/attack/shiny.pal diff --git a/graphics/pokemon/deoxys/back.png b/graphics/pokemon/gen_3/deoxys/back.png similarity index 100% rename from graphics/pokemon/deoxys/back.png rename to graphics/pokemon/gen_3/deoxys/back.png diff --git a/graphics/pokemon/deoxys/defense/anim_front.png b/graphics/pokemon/gen_3/deoxys/defense/anim_front.png similarity index 100% rename from graphics/pokemon/deoxys/defense/anim_front.png rename to graphics/pokemon/gen_3/deoxys/defense/anim_front.png diff --git a/graphics/pokemon/deoxys/defense/back.png b/graphics/pokemon/gen_3/deoxys/defense/back.png similarity index 100% rename from graphics/pokemon/deoxys/defense/back.png rename to graphics/pokemon/gen_3/deoxys/defense/back.png diff --git a/graphics/pokemon/deoxys/defense/icon.png b/graphics/pokemon/gen_3/deoxys/defense/icon.png similarity index 100% rename from graphics/pokemon/deoxys/defense/icon.png rename to graphics/pokemon/gen_3/deoxys/defense/icon.png diff --git a/graphics/pokemon/deoxys/defense/normal.pal b/graphics/pokemon/gen_3/deoxys/defense/normal.pal similarity index 100% rename from graphics/pokemon/deoxys/defense/normal.pal rename to graphics/pokemon/gen_3/deoxys/defense/normal.pal diff --git a/graphics/pokemon/deoxys/defense/shiny.pal b/graphics/pokemon/gen_3/deoxys/defense/shiny.pal similarity index 100% rename from graphics/pokemon/deoxys/defense/shiny.pal rename to graphics/pokemon/gen_3/deoxys/defense/shiny.pal diff --git a/graphics/pokemon/deoxys/footprint.png b/graphics/pokemon/gen_3/deoxys/footprint.png similarity index 100% rename from graphics/pokemon/deoxys/footprint.png rename to graphics/pokemon/gen_3/deoxys/footprint.png diff --git a/graphics/pokemon/deoxys/icon.png b/graphics/pokemon/gen_3/deoxys/icon.png similarity index 100% rename from graphics/pokemon/deoxys/icon.png rename to graphics/pokemon/gen_3/deoxys/icon.png diff --git a/graphics/pokemon/deoxys/icon_speed_wide.png b/graphics/pokemon/gen_3/deoxys/icon_speed_wide.png similarity index 100% rename from graphics/pokemon/deoxys/icon_speed_wide.png rename to graphics/pokemon/gen_3/deoxys/icon_speed_wide.png diff --git a/graphics/pokemon/deoxys/normal.pal b/graphics/pokemon/gen_3/deoxys/normal.pal similarity index 100% rename from graphics/pokemon/deoxys/normal.pal rename to graphics/pokemon/gen_3/deoxys/normal.pal diff --git a/graphics/pokemon/deoxys/shiny.pal b/graphics/pokemon/gen_3/deoxys/shiny.pal similarity index 100% rename from graphics/pokemon/deoxys/shiny.pal rename to graphics/pokemon/gen_3/deoxys/shiny.pal diff --git a/graphics/pokemon/deoxys/speed/anim_front.png b/graphics/pokemon/gen_3/deoxys/speed/anim_front.png similarity index 100% rename from graphics/pokemon/deoxys/speed/anim_front.png rename to graphics/pokemon/gen_3/deoxys/speed/anim_front.png diff --git a/graphics/pokemon/deoxys/speed/back.png b/graphics/pokemon/gen_3/deoxys/speed/back.png similarity index 100% rename from graphics/pokemon/deoxys/speed/back.png rename to graphics/pokemon/gen_3/deoxys/speed/back.png diff --git a/graphics/pokemon/deoxys/speed/icon.png b/graphics/pokemon/gen_3/deoxys/speed/icon.png similarity index 100% rename from graphics/pokemon/deoxys/speed/icon.png rename to graphics/pokemon/gen_3/deoxys/speed/icon.png diff --git a/graphics/pokemon/deoxys/speed/normal.pal b/graphics/pokemon/gen_3/deoxys/speed/normal.pal similarity index 100% rename from graphics/pokemon/deoxys/speed/normal.pal rename to graphics/pokemon/gen_3/deoxys/speed/normal.pal diff --git a/graphics/pokemon/deoxys/speed/shiny.pal b/graphics/pokemon/gen_3/deoxys/speed/shiny.pal similarity index 100% rename from graphics/pokemon/deoxys/speed/shiny.pal rename to graphics/pokemon/gen_3/deoxys/speed/shiny.pal diff --git a/graphics/pokemon/dusclops/anim_front.png b/graphics/pokemon/gen_3/dusclops/anim_front.png similarity index 100% rename from graphics/pokemon/dusclops/anim_front.png rename to graphics/pokemon/gen_3/dusclops/anim_front.png diff --git a/graphics/pokemon/dusclops/back.png b/graphics/pokemon/gen_3/dusclops/back.png similarity index 100% rename from graphics/pokemon/dusclops/back.png rename to graphics/pokemon/gen_3/dusclops/back.png diff --git a/graphics/pokemon/dusclops/footprint.png b/graphics/pokemon/gen_3/dusclops/footprint.png similarity index 100% rename from graphics/pokemon/dusclops/footprint.png rename to graphics/pokemon/gen_3/dusclops/footprint.png diff --git a/graphics/pokemon/dusclops/icon.png b/graphics/pokemon/gen_3/dusclops/icon.png similarity index 100% rename from graphics/pokemon/dusclops/icon.png rename to graphics/pokemon/gen_3/dusclops/icon.png diff --git a/graphics/pokemon/dusclops/normal.pal b/graphics/pokemon/gen_3/dusclops/normal.pal similarity index 100% rename from graphics/pokemon/dusclops/normal.pal rename to graphics/pokemon/gen_3/dusclops/normal.pal diff --git a/graphics/pokemon/dusclops/shiny.pal b/graphics/pokemon/gen_3/dusclops/shiny.pal similarity index 100% rename from graphics/pokemon/dusclops/shiny.pal rename to graphics/pokemon/gen_3/dusclops/shiny.pal diff --git a/graphics/pokemon/duskull/anim_front.png b/graphics/pokemon/gen_3/duskull/anim_front.png similarity index 100% rename from graphics/pokemon/duskull/anim_front.png rename to graphics/pokemon/gen_3/duskull/anim_front.png diff --git a/graphics/pokemon/duskull/back.png b/graphics/pokemon/gen_3/duskull/back.png similarity index 100% rename from graphics/pokemon/duskull/back.png rename to graphics/pokemon/gen_3/duskull/back.png diff --git a/graphics/pokemon/electrode/footprint.png b/graphics/pokemon/gen_3/duskull/footprint.png similarity index 100% rename from graphics/pokemon/electrode/footprint.png rename to graphics/pokemon/gen_3/duskull/footprint.png diff --git a/graphics/pokemon/duskull/icon.png b/graphics/pokemon/gen_3/duskull/icon.png similarity index 100% rename from graphics/pokemon/duskull/icon.png rename to graphics/pokemon/gen_3/duskull/icon.png diff --git a/graphics/pokemon/duskull/normal.pal b/graphics/pokemon/gen_3/duskull/normal.pal similarity index 100% rename from graphics/pokemon/duskull/normal.pal rename to graphics/pokemon/gen_3/duskull/normal.pal diff --git a/graphics/pokemon/duskull/shiny.pal b/graphics/pokemon/gen_3/duskull/shiny.pal similarity index 100% rename from graphics/pokemon/duskull/shiny.pal rename to graphics/pokemon/gen_3/duskull/shiny.pal diff --git a/graphics/pokemon/dustox/anim_front.png b/graphics/pokemon/gen_3/dustox/anim_front.png similarity index 100% rename from graphics/pokemon/dustox/anim_front.png rename to graphics/pokemon/gen_3/dustox/anim_front.png diff --git a/graphics/pokemon/dustox/anim_frontf.png b/graphics/pokemon/gen_3/dustox/anim_frontf.png similarity index 100% rename from graphics/pokemon/dustox/anim_frontf.png rename to graphics/pokemon/gen_3/dustox/anim_frontf.png diff --git a/graphics/pokemon/dustox/back.png b/graphics/pokemon/gen_3/dustox/back.png similarity index 100% rename from graphics/pokemon/dustox/back.png rename to graphics/pokemon/gen_3/dustox/back.png diff --git a/graphics/pokemon/dustox/backf.png b/graphics/pokemon/gen_3/dustox/backf.png similarity index 100% rename from graphics/pokemon/dustox/backf.png rename to graphics/pokemon/gen_3/dustox/backf.png diff --git a/graphics/pokemon/dustox/footprint.png b/graphics/pokemon/gen_3/dustox/footprint.png similarity index 100% rename from graphics/pokemon/dustox/footprint.png rename to graphics/pokemon/gen_3/dustox/footprint.png diff --git a/graphics/pokemon/dustox/icon.png b/graphics/pokemon/gen_3/dustox/icon.png similarity index 100% rename from graphics/pokemon/dustox/icon.png rename to graphics/pokemon/gen_3/dustox/icon.png diff --git a/graphics/pokemon/dustox/normal.pal b/graphics/pokemon/gen_3/dustox/normal.pal similarity index 100% rename from graphics/pokemon/dustox/normal.pal rename to graphics/pokemon/gen_3/dustox/normal.pal diff --git a/graphics/pokemon/dustox/shiny.pal b/graphics/pokemon/gen_3/dustox/shiny.pal similarity index 100% rename from graphics/pokemon/dustox/shiny.pal rename to graphics/pokemon/gen_3/dustox/shiny.pal diff --git a/graphics/pokemon/electrike/anim_front.png b/graphics/pokemon/gen_3/electrike/anim_front.png similarity index 100% rename from graphics/pokemon/electrike/anim_front.png rename to graphics/pokemon/gen_3/electrike/anim_front.png diff --git a/graphics/pokemon/electrike/back.png b/graphics/pokemon/gen_3/electrike/back.png similarity index 100% rename from graphics/pokemon/electrike/back.png rename to graphics/pokemon/gen_3/electrike/back.png diff --git a/graphics/pokemon/electrike/footprint.png b/graphics/pokemon/gen_3/electrike/footprint.png similarity index 100% rename from graphics/pokemon/electrike/footprint.png rename to graphics/pokemon/gen_3/electrike/footprint.png diff --git a/graphics/pokemon/electrike/icon.png b/graphics/pokemon/gen_3/electrike/icon.png similarity index 100% rename from graphics/pokemon/electrike/icon.png rename to graphics/pokemon/gen_3/electrike/icon.png diff --git a/graphics/pokemon/electrike/normal.pal b/graphics/pokemon/gen_3/electrike/normal.pal similarity index 100% rename from graphics/pokemon/electrike/normal.pal rename to graphics/pokemon/gen_3/electrike/normal.pal diff --git a/graphics/pokemon/electrike/shiny.pal b/graphics/pokemon/gen_3/electrike/shiny.pal similarity index 100% rename from graphics/pokemon/electrike/shiny.pal rename to graphics/pokemon/gen_3/electrike/shiny.pal diff --git a/graphics/pokemon/exploud/anim_front.png b/graphics/pokemon/gen_3/exploud/anim_front.png similarity index 100% rename from graphics/pokemon/exploud/anim_front.png rename to graphics/pokemon/gen_3/exploud/anim_front.png diff --git a/graphics/pokemon/exploud/back.png b/graphics/pokemon/gen_3/exploud/back.png similarity index 100% rename from graphics/pokemon/exploud/back.png rename to graphics/pokemon/gen_3/exploud/back.png diff --git a/graphics/pokemon/exploud/footprint.png b/graphics/pokemon/gen_3/exploud/footprint.png similarity index 100% rename from graphics/pokemon/exploud/footprint.png rename to graphics/pokemon/gen_3/exploud/footprint.png diff --git a/graphics/pokemon/exploud/icon.png b/graphics/pokemon/gen_3/exploud/icon.png similarity index 100% rename from graphics/pokemon/exploud/icon.png rename to graphics/pokemon/gen_3/exploud/icon.png diff --git a/graphics/pokemon/exploud/normal.pal b/graphics/pokemon/gen_3/exploud/normal.pal similarity index 100% rename from graphics/pokemon/exploud/normal.pal rename to graphics/pokemon/gen_3/exploud/normal.pal diff --git a/graphics/pokemon/exploud/shiny.pal b/graphics/pokemon/gen_3/exploud/shiny.pal similarity index 100% rename from graphics/pokemon/exploud/shiny.pal rename to graphics/pokemon/gen_3/exploud/shiny.pal diff --git a/graphics/pokemon/feebas/anim_front.png b/graphics/pokemon/gen_3/feebas/anim_front.png similarity index 100% rename from graphics/pokemon/feebas/anim_front.png rename to graphics/pokemon/gen_3/feebas/anim_front.png diff --git a/graphics/pokemon/feebas/back.png b/graphics/pokemon/gen_3/feebas/back.png similarity index 100% rename from graphics/pokemon/feebas/back.png rename to graphics/pokemon/gen_3/feebas/back.png diff --git a/graphics/pokemon/escavalier/footprint.png b/graphics/pokemon/gen_3/feebas/footprint.png similarity index 100% rename from graphics/pokemon/escavalier/footprint.png rename to graphics/pokemon/gen_3/feebas/footprint.png diff --git a/graphics/pokemon/feebas/icon.png b/graphics/pokemon/gen_3/feebas/icon.png similarity index 100% rename from graphics/pokemon/feebas/icon.png rename to graphics/pokemon/gen_3/feebas/icon.png diff --git a/graphics/pokemon/feebas/normal.pal b/graphics/pokemon/gen_3/feebas/normal.pal similarity index 100% rename from graphics/pokemon/feebas/normal.pal rename to graphics/pokemon/gen_3/feebas/normal.pal diff --git a/graphics/pokemon/feebas/shiny.pal b/graphics/pokemon/gen_3/feebas/shiny.pal similarity index 100% rename from graphics/pokemon/feebas/shiny.pal rename to graphics/pokemon/gen_3/feebas/shiny.pal diff --git a/graphics/pokemon/flygon/anim_front.png b/graphics/pokemon/gen_3/flygon/anim_front.png similarity index 100% rename from graphics/pokemon/flygon/anim_front.png rename to graphics/pokemon/gen_3/flygon/anim_front.png diff --git a/graphics/pokemon/flygon/back.png b/graphics/pokemon/gen_3/flygon/back.png similarity index 100% rename from graphics/pokemon/flygon/back.png rename to graphics/pokemon/gen_3/flygon/back.png diff --git a/graphics/pokemon/flygon/footprint.png b/graphics/pokemon/gen_3/flygon/footprint.png similarity index 100% rename from graphics/pokemon/flygon/footprint.png rename to graphics/pokemon/gen_3/flygon/footprint.png diff --git a/graphics/pokemon/flygon/icon.png b/graphics/pokemon/gen_3/flygon/icon.png similarity index 100% rename from graphics/pokemon/flygon/icon.png rename to graphics/pokemon/gen_3/flygon/icon.png diff --git a/graphics/pokemon/flygon/normal.pal b/graphics/pokemon/gen_3/flygon/normal.pal similarity index 100% rename from graphics/pokemon/flygon/normal.pal rename to graphics/pokemon/gen_3/flygon/normal.pal diff --git a/graphics/pokemon/flygon/shiny.pal b/graphics/pokemon/gen_3/flygon/shiny.pal similarity index 100% rename from graphics/pokemon/flygon/shiny.pal rename to graphics/pokemon/gen_3/flygon/shiny.pal diff --git a/graphics/pokemon/gardevoir/anim_front.png b/graphics/pokemon/gen_3/gardevoir/anim_front.png similarity index 100% rename from graphics/pokemon/gardevoir/anim_front.png rename to graphics/pokemon/gen_3/gardevoir/anim_front.png diff --git a/graphics/pokemon/gardevoir/back.png b/graphics/pokemon/gen_3/gardevoir/back.png similarity index 100% rename from graphics/pokemon/gardevoir/back.png rename to graphics/pokemon/gen_3/gardevoir/back.png diff --git a/graphics/pokemon/gardevoir/footprint.png b/graphics/pokemon/gen_3/gardevoir/footprint.png similarity index 100% rename from graphics/pokemon/gardevoir/footprint.png rename to graphics/pokemon/gen_3/gardevoir/footprint.png diff --git a/graphics/pokemon/gardevoir/icon.png b/graphics/pokemon/gen_3/gardevoir/icon.png similarity index 100% rename from graphics/pokemon/gardevoir/icon.png rename to graphics/pokemon/gen_3/gardevoir/icon.png diff --git a/graphics/pokemon/gardevoir/mega/back.png b/graphics/pokemon/gen_3/gardevoir/mega/back.png similarity index 100% rename from graphics/pokemon/gardevoir/mega/back.png rename to graphics/pokemon/gen_3/gardevoir/mega/back.png diff --git a/graphics/pokemon/gardevoir/mega/front.png b/graphics/pokemon/gen_3/gardevoir/mega/front.png similarity index 100% rename from graphics/pokemon/gardevoir/mega/front.png rename to graphics/pokemon/gen_3/gardevoir/mega/front.png diff --git a/graphics/pokemon/gardevoir/mega/icon.png b/graphics/pokemon/gen_3/gardevoir/mega/icon.png similarity index 100% rename from graphics/pokemon/gardevoir/mega/icon.png rename to graphics/pokemon/gen_3/gardevoir/mega/icon.png diff --git a/graphics/pokemon/gardevoir/mega/normal.pal b/graphics/pokemon/gen_3/gardevoir/mega/normal.pal similarity index 100% rename from graphics/pokemon/gardevoir/mega/normal.pal rename to graphics/pokemon/gen_3/gardevoir/mega/normal.pal diff --git a/graphics/pokemon/gardevoir/mega/shiny.pal b/graphics/pokemon/gen_3/gardevoir/mega/shiny.pal similarity index 100% rename from graphics/pokemon/gardevoir/mega/shiny.pal rename to graphics/pokemon/gen_3/gardevoir/mega/shiny.pal diff --git a/graphics/pokemon/gardevoir/normal.pal b/graphics/pokemon/gen_3/gardevoir/normal.pal similarity index 100% rename from graphics/pokemon/gardevoir/normal.pal rename to graphics/pokemon/gen_3/gardevoir/normal.pal diff --git a/graphics/pokemon/gardevoir/shiny.pal b/graphics/pokemon/gen_3/gardevoir/shiny.pal similarity index 100% rename from graphics/pokemon/gardevoir/shiny.pal rename to graphics/pokemon/gen_3/gardevoir/shiny.pal diff --git a/graphics/pokemon/glalie/anim_front.png b/graphics/pokemon/gen_3/glalie/anim_front.png similarity index 100% rename from graphics/pokemon/glalie/anim_front.png rename to graphics/pokemon/gen_3/glalie/anim_front.png diff --git a/graphics/pokemon/glalie/back.png b/graphics/pokemon/gen_3/glalie/back.png similarity index 100% rename from graphics/pokemon/glalie/back.png rename to graphics/pokemon/gen_3/glalie/back.png diff --git a/graphics/pokemon/exeggcute/footprint.png b/graphics/pokemon/gen_3/glalie/footprint.png similarity index 100% rename from graphics/pokemon/exeggcute/footprint.png rename to graphics/pokemon/gen_3/glalie/footprint.png diff --git a/graphics/pokemon/glalie/icon.png b/graphics/pokemon/gen_3/glalie/icon.png similarity index 100% rename from graphics/pokemon/glalie/icon.png rename to graphics/pokemon/gen_3/glalie/icon.png diff --git a/graphics/pokemon/glalie/mega/back.png b/graphics/pokemon/gen_3/glalie/mega/back.png similarity index 100% rename from graphics/pokemon/glalie/mega/back.png rename to graphics/pokemon/gen_3/glalie/mega/back.png diff --git a/graphics/pokemon/glalie/mega/front.png b/graphics/pokemon/gen_3/glalie/mega/front.png similarity index 100% rename from graphics/pokemon/glalie/mega/front.png rename to graphics/pokemon/gen_3/glalie/mega/front.png diff --git a/graphics/pokemon/glalie/mega/icon.png b/graphics/pokemon/gen_3/glalie/mega/icon.png similarity index 100% rename from graphics/pokemon/glalie/mega/icon.png rename to graphics/pokemon/gen_3/glalie/mega/icon.png diff --git a/graphics/pokemon/glalie/mega/normal.pal b/graphics/pokemon/gen_3/glalie/mega/normal.pal similarity index 100% rename from graphics/pokemon/glalie/mega/normal.pal rename to graphics/pokemon/gen_3/glalie/mega/normal.pal diff --git a/graphics/pokemon/glalie/mega/shiny.pal b/graphics/pokemon/gen_3/glalie/mega/shiny.pal similarity index 100% rename from graphics/pokemon/glalie/mega/shiny.pal rename to graphics/pokemon/gen_3/glalie/mega/shiny.pal diff --git a/graphics/pokemon/glalie/normal.pal b/graphics/pokemon/gen_3/glalie/normal.pal similarity index 100% rename from graphics/pokemon/glalie/normal.pal rename to graphics/pokemon/gen_3/glalie/normal.pal diff --git a/graphics/pokemon/glalie/shiny.pal b/graphics/pokemon/gen_3/glalie/shiny.pal similarity index 100% rename from graphics/pokemon/glalie/shiny.pal rename to graphics/pokemon/gen_3/glalie/shiny.pal diff --git a/graphics/pokemon/gorebyss/anim_front.png b/graphics/pokemon/gen_3/gorebyss/anim_front.png similarity index 100% rename from graphics/pokemon/gorebyss/anim_front.png rename to graphics/pokemon/gen_3/gorebyss/anim_front.png diff --git a/graphics/pokemon/gorebyss/back.png b/graphics/pokemon/gen_3/gorebyss/back.png similarity index 100% rename from graphics/pokemon/gorebyss/back.png rename to graphics/pokemon/gen_3/gorebyss/back.png diff --git a/graphics/pokemon/feebas/footprint.png b/graphics/pokemon/gen_3/gorebyss/footprint.png similarity index 100% rename from graphics/pokemon/feebas/footprint.png rename to graphics/pokemon/gen_3/gorebyss/footprint.png diff --git a/graphics/pokemon/gorebyss/icon.png b/graphics/pokemon/gen_3/gorebyss/icon.png similarity index 100% rename from graphics/pokemon/gorebyss/icon.png rename to graphics/pokemon/gen_3/gorebyss/icon.png diff --git a/graphics/pokemon/gorebyss/normal.pal b/graphics/pokemon/gen_3/gorebyss/normal.pal similarity index 100% rename from graphics/pokemon/gorebyss/normal.pal rename to graphics/pokemon/gen_3/gorebyss/normal.pal diff --git a/graphics/pokemon/gorebyss/shiny.pal b/graphics/pokemon/gen_3/gorebyss/shiny.pal similarity index 100% rename from graphics/pokemon/gorebyss/shiny.pal rename to graphics/pokemon/gen_3/gorebyss/shiny.pal diff --git a/graphics/pokemon/groudon/anim_front.png b/graphics/pokemon/gen_3/groudon/anim_front.png similarity index 100% rename from graphics/pokemon/groudon/anim_front.png rename to graphics/pokemon/gen_3/groudon/anim_front.png diff --git a/graphics/pokemon/groudon/back.png b/graphics/pokemon/gen_3/groudon/back.png similarity index 100% rename from graphics/pokemon/groudon/back.png rename to graphics/pokemon/gen_3/groudon/back.png diff --git a/graphics/pokemon/groudon/footprint.png b/graphics/pokemon/gen_3/groudon/footprint.png similarity index 100% rename from graphics/pokemon/groudon/footprint.png rename to graphics/pokemon/gen_3/groudon/footprint.png diff --git a/graphics/pokemon/groudon/icon.png b/graphics/pokemon/gen_3/groudon/icon.png similarity index 100% rename from graphics/pokemon/groudon/icon.png rename to graphics/pokemon/gen_3/groudon/icon.png diff --git a/graphics/pokemon/groudon/normal.pal b/graphics/pokemon/gen_3/groudon/normal.pal similarity index 100% rename from graphics/pokemon/groudon/normal.pal rename to graphics/pokemon/gen_3/groudon/normal.pal diff --git a/graphics/pokemon/groudon/primal/back.png b/graphics/pokemon/gen_3/groudon/primal/back.png similarity index 100% rename from graphics/pokemon/groudon/primal/back.png rename to graphics/pokemon/gen_3/groudon/primal/back.png diff --git a/graphics/pokemon/groudon/primal/front.png b/graphics/pokemon/gen_3/groudon/primal/front.png similarity index 100% rename from graphics/pokemon/groudon/primal/front.png rename to graphics/pokemon/gen_3/groudon/primal/front.png diff --git a/graphics/pokemon/groudon/primal/icon.png b/graphics/pokemon/gen_3/groudon/primal/icon.png similarity index 100% rename from graphics/pokemon/groudon/primal/icon.png rename to graphics/pokemon/gen_3/groudon/primal/icon.png diff --git a/graphics/pokemon/groudon/primal/normal.pal b/graphics/pokemon/gen_3/groudon/primal/normal.pal similarity index 100% rename from graphics/pokemon/groudon/primal/normal.pal rename to graphics/pokemon/gen_3/groudon/primal/normal.pal diff --git a/graphics/pokemon/groudon/primal/shiny.pal b/graphics/pokemon/gen_3/groudon/primal/shiny.pal similarity index 100% rename from graphics/pokemon/groudon/primal/shiny.pal rename to graphics/pokemon/gen_3/groudon/primal/shiny.pal diff --git a/graphics/pokemon/groudon/shiny.pal b/graphics/pokemon/gen_3/groudon/shiny.pal similarity index 100% rename from graphics/pokemon/groudon/shiny.pal rename to graphics/pokemon/gen_3/groudon/shiny.pal diff --git a/graphics/pokemon/grovyle/anim_front.png b/graphics/pokemon/gen_3/grovyle/anim_front.png similarity index 100% rename from graphics/pokemon/grovyle/anim_front.png rename to graphics/pokemon/gen_3/grovyle/anim_front.png diff --git a/graphics/pokemon/grovyle/back.png b/graphics/pokemon/gen_3/grovyle/back.png similarity index 100% rename from graphics/pokemon/grovyle/back.png rename to graphics/pokemon/gen_3/grovyle/back.png diff --git a/graphics/pokemon/grovyle/footprint.png b/graphics/pokemon/gen_3/grovyle/footprint.png similarity index 100% rename from graphics/pokemon/grovyle/footprint.png rename to graphics/pokemon/gen_3/grovyle/footprint.png diff --git a/graphics/pokemon/grovyle/icon.png b/graphics/pokemon/gen_3/grovyle/icon.png similarity index 100% rename from graphics/pokemon/grovyle/icon.png rename to graphics/pokemon/gen_3/grovyle/icon.png diff --git a/graphics/pokemon/grovyle/normal.pal b/graphics/pokemon/gen_3/grovyle/normal.pal similarity index 100% rename from graphics/pokemon/grovyle/normal.pal rename to graphics/pokemon/gen_3/grovyle/normal.pal diff --git a/graphics/pokemon/grovyle/shiny.pal b/graphics/pokemon/gen_3/grovyle/shiny.pal similarity index 100% rename from graphics/pokemon/grovyle/shiny.pal rename to graphics/pokemon/gen_3/grovyle/shiny.pal diff --git a/graphics/pokemon/grumpig/anim_front.png b/graphics/pokemon/gen_3/grumpig/anim_front.png similarity index 100% rename from graphics/pokemon/grumpig/anim_front.png rename to graphics/pokemon/gen_3/grumpig/anim_front.png diff --git a/graphics/pokemon/grumpig/back.png b/graphics/pokemon/gen_3/grumpig/back.png similarity index 100% rename from graphics/pokemon/grumpig/back.png rename to graphics/pokemon/gen_3/grumpig/back.png diff --git a/graphics/pokemon/grumpig/footprint.png b/graphics/pokemon/gen_3/grumpig/footprint.png similarity index 100% rename from graphics/pokemon/grumpig/footprint.png rename to graphics/pokemon/gen_3/grumpig/footprint.png diff --git a/graphics/pokemon/grumpig/icon.png b/graphics/pokemon/gen_3/grumpig/icon.png similarity index 100% rename from graphics/pokemon/grumpig/icon.png rename to graphics/pokemon/gen_3/grumpig/icon.png diff --git a/graphics/pokemon/grumpig/normal.pal b/graphics/pokemon/gen_3/grumpig/normal.pal similarity index 100% rename from graphics/pokemon/grumpig/normal.pal rename to graphics/pokemon/gen_3/grumpig/normal.pal diff --git a/graphics/pokemon/grumpig/shiny.pal b/graphics/pokemon/gen_3/grumpig/shiny.pal similarity index 100% rename from graphics/pokemon/grumpig/shiny.pal rename to graphics/pokemon/gen_3/grumpig/shiny.pal diff --git a/graphics/pokemon/gulpin/anim_front.png b/graphics/pokemon/gen_3/gulpin/anim_front.png similarity index 100% rename from graphics/pokemon/gulpin/anim_front.png rename to graphics/pokemon/gen_3/gulpin/anim_front.png diff --git a/graphics/pokemon/gulpin/anim_frontf.png b/graphics/pokemon/gen_3/gulpin/anim_frontf.png similarity index 100% rename from graphics/pokemon/gulpin/anim_frontf.png rename to graphics/pokemon/gen_3/gulpin/anim_frontf.png diff --git a/graphics/pokemon/gulpin/back.png b/graphics/pokemon/gen_3/gulpin/back.png similarity index 100% rename from graphics/pokemon/gulpin/back.png rename to graphics/pokemon/gen_3/gulpin/back.png diff --git a/graphics/pokemon/gulpin/backf.png b/graphics/pokemon/gen_3/gulpin/backf.png similarity index 100% rename from graphics/pokemon/gulpin/backf.png rename to graphics/pokemon/gen_3/gulpin/backf.png diff --git a/graphics/pokemon/ferroseed/footprint.png b/graphics/pokemon/gen_3/gulpin/footprint.png similarity index 100% rename from graphics/pokemon/ferroseed/footprint.png rename to graphics/pokemon/gen_3/gulpin/footprint.png diff --git a/graphics/pokemon/gulpin/icon.png b/graphics/pokemon/gen_3/gulpin/icon.png similarity index 100% rename from graphics/pokemon/gulpin/icon.png rename to graphics/pokemon/gen_3/gulpin/icon.png diff --git a/graphics/pokemon/gulpin/normal.pal b/graphics/pokemon/gen_3/gulpin/normal.pal similarity index 100% rename from graphics/pokemon/gulpin/normal.pal rename to graphics/pokemon/gen_3/gulpin/normal.pal diff --git a/graphics/pokemon/gulpin/shiny.pal b/graphics/pokemon/gen_3/gulpin/shiny.pal similarity index 100% rename from graphics/pokemon/gulpin/shiny.pal rename to graphics/pokemon/gen_3/gulpin/shiny.pal diff --git a/graphics/pokemon/hariyama/anim_front.png b/graphics/pokemon/gen_3/hariyama/anim_front.png similarity index 100% rename from graphics/pokemon/hariyama/anim_front.png rename to graphics/pokemon/gen_3/hariyama/anim_front.png diff --git a/graphics/pokemon/hariyama/back.png b/graphics/pokemon/gen_3/hariyama/back.png similarity index 100% rename from graphics/pokemon/hariyama/back.png rename to graphics/pokemon/gen_3/hariyama/back.png diff --git a/graphics/pokemon/hariyama/footprint.png b/graphics/pokemon/gen_3/hariyama/footprint.png similarity index 100% rename from graphics/pokemon/hariyama/footprint.png rename to graphics/pokemon/gen_3/hariyama/footprint.png diff --git a/graphics/pokemon/hariyama/icon.png b/graphics/pokemon/gen_3/hariyama/icon.png similarity index 100% rename from graphics/pokemon/hariyama/icon.png rename to graphics/pokemon/gen_3/hariyama/icon.png diff --git a/graphics/pokemon/hariyama/normal.pal b/graphics/pokemon/gen_3/hariyama/normal.pal similarity index 100% rename from graphics/pokemon/hariyama/normal.pal rename to graphics/pokemon/gen_3/hariyama/normal.pal diff --git a/graphics/pokemon/hariyama/shiny.pal b/graphics/pokemon/gen_3/hariyama/shiny.pal similarity index 100% rename from graphics/pokemon/hariyama/shiny.pal rename to graphics/pokemon/gen_3/hariyama/shiny.pal diff --git a/graphics/pokemon/huntail/anim_front.png b/graphics/pokemon/gen_3/huntail/anim_front.png similarity index 100% rename from graphics/pokemon/huntail/anim_front.png rename to graphics/pokemon/gen_3/huntail/anim_front.png diff --git a/graphics/pokemon/huntail/back.png b/graphics/pokemon/gen_3/huntail/back.png similarity index 100% rename from graphics/pokemon/huntail/back.png rename to graphics/pokemon/gen_3/huntail/back.png diff --git a/graphics/pokemon/finneon/footprint.png b/graphics/pokemon/gen_3/huntail/footprint.png similarity index 100% rename from graphics/pokemon/finneon/footprint.png rename to graphics/pokemon/gen_3/huntail/footprint.png diff --git a/graphics/pokemon/huntail/icon.png b/graphics/pokemon/gen_3/huntail/icon.png similarity index 100% rename from graphics/pokemon/huntail/icon.png rename to graphics/pokemon/gen_3/huntail/icon.png diff --git a/graphics/pokemon/huntail/normal.pal b/graphics/pokemon/gen_3/huntail/normal.pal similarity index 100% rename from graphics/pokemon/huntail/normal.pal rename to graphics/pokemon/gen_3/huntail/normal.pal diff --git a/graphics/pokemon/huntail/shiny.pal b/graphics/pokemon/gen_3/huntail/shiny.pal similarity index 100% rename from graphics/pokemon/huntail/shiny.pal rename to graphics/pokemon/gen_3/huntail/shiny.pal diff --git a/graphics/pokemon/illumise/anim_front.png b/graphics/pokemon/gen_3/illumise/anim_front.png similarity index 100% rename from graphics/pokemon/illumise/anim_front.png rename to graphics/pokemon/gen_3/illumise/anim_front.png diff --git a/graphics/pokemon/illumise/back.png b/graphics/pokemon/gen_3/illumise/back.png similarity index 100% rename from graphics/pokemon/illumise/back.png rename to graphics/pokemon/gen_3/illumise/back.png diff --git a/graphics/pokemon/illumise/footprint.png b/graphics/pokemon/gen_3/illumise/footprint.png similarity index 100% rename from graphics/pokemon/illumise/footprint.png rename to graphics/pokemon/gen_3/illumise/footprint.png diff --git a/graphics/pokemon/illumise/icon.png b/graphics/pokemon/gen_3/illumise/icon.png similarity index 100% rename from graphics/pokemon/illumise/icon.png rename to graphics/pokemon/gen_3/illumise/icon.png diff --git a/graphics/pokemon/illumise/normal.pal b/graphics/pokemon/gen_3/illumise/normal.pal similarity index 100% rename from graphics/pokemon/illumise/normal.pal rename to graphics/pokemon/gen_3/illumise/normal.pal diff --git a/graphics/pokemon/illumise/shiny.pal b/graphics/pokemon/gen_3/illumise/shiny.pal similarity index 100% rename from graphics/pokemon/illumise/shiny.pal rename to graphics/pokemon/gen_3/illumise/shiny.pal diff --git a/graphics/pokemon/jirachi/anim_front.png b/graphics/pokemon/gen_3/jirachi/anim_front.png similarity index 100% rename from graphics/pokemon/jirachi/anim_front.png rename to graphics/pokemon/gen_3/jirachi/anim_front.png diff --git a/graphics/pokemon/jirachi/back.png b/graphics/pokemon/gen_3/jirachi/back.png similarity index 100% rename from graphics/pokemon/jirachi/back.png rename to graphics/pokemon/gen_3/jirachi/back.png diff --git a/graphics/pokemon/jirachi/footprint.png b/graphics/pokemon/gen_3/jirachi/footprint.png similarity index 100% rename from graphics/pokemon/jirachi/footprint.png rename to graphics/pokemon/gen_3/jirachi/footprint.png diff --git a/graphics/pokemon/jirachi/icon.png b/graphics/pokemon/gen_3/jirachi/icon.png similarity index 100% rename from graphics/pokemon/jirachi/icon.png rename to graphics/pokemon/gen_3/jirachi/icon.png diff --git a/graphics/pokemon/jirachi/normal.pal b/graphics/pokemon/gen_3/jirachi/normal.pal similarity index 100% rename from graphics/pokemon/jirachi/normal.pal rename to graphics/pokemon/gen_3/jirachi/normal.pal diff --git a/graphics/pokemon/jirachi/shiny.pal b/graphics/pokemon/gen_3/jirachi/shiny.pal similarity index 100% rename from graphics/pokemon/jirachi/shiny.pal rename to graphics/pokemon/gen_3/jirachi/shiny.pal diff --git a/graphics/pokemon/kecleon/anim_front.png b/graphics/pokemon/gen_3/kecleon/anim_front.png similarity index 100% rename from graphics/pokemon/kecleon/anim_front.png rename to graphics/pokemon/gen_3/kecleon/anim_front.png diff --git a/graphics/pokemon/kecleon/back.png b/graphics/pokemon/gen_3/kecleon/back.png similarity index 100% rename from graphics/pokemon/kecleon/back.png rename to graphics/pokemon/gen_3/kecleon/back.png diff --git a/graphics/pokemon/kecleon/footprint.png b/graphics/pokemon/gen_3/kecleon/footprint.png similarity index 100% rename from graphics/pokemon/kecleon/footprint.png rename to graphics/pokemon/gen_3/kecleon/footprint.png diff --git a/graphics/pokemon/kecleon/icon.png b/graphics/pokemon/gen_3/kecleon/icon.png similarity index 100% rename from graphics/pokemon/kecleon/icon.png rename to graphics/pokemon/gen_3/kecleon/icon.png diff --git a/graphics/pokemon/kecleon/normal.pal b/graphics/pokemon/gen_3/kecleon/normal.pal similarity index 100% rename from graphics/pokemon/kecleon/normal.pal rename to graphics/pokemon/gen_3/kecleon/normal.pal diff --git a/graphics/pokemon/kecleon/shiny.pal b/graphics/pokemon/gen_3/kecleon/shiny.pal similarity index 100% rename from graphics/pokemon/kecleon/shiny.pal rename to graphics/pokemon/gen_3/kecleon/shiny.pal diff --git a/graphics/pokemon/kirlia/anim_front.png b/graphics/pokemon/gen_3/kirlia/anim_front.png similarity index 100% rename from graphics/pokemon/kirlia/anim_front.png rename to graphics/pokemon/gen_3/kirlia/anim_front.png diff --git a/graphics/pokemon/kirlia/back.png b/graphics/pokemon/gen_3/kirlia/back.png similarity index 100% rename from graphics/pokemon/kirlia/back.png rename to graphics/pokemon/gen_3/kirlia/back.png diff --git a/graphics/pokemon/budew/footprint.png b/graphics/pokemon/gen_3/kirlia/footprint.png similarity index 100% rename from graphics/pokemon/budew/footprint.png rename to graphics/pokemon/gen_3/kirlia/footprint.png diff --git a/graphics/pokemon/kirlia/icon.png b/graphics/pokemon/gen_3/kirlia/icon.png similarity index 100% rename from graphics/pokemon/kirlia/icon.png rename to graphics/pokemon/gen_3/kirlia/icon.png diff --git a/graphics/pokemon/kirlia/normal.pal b/graphics/pokemon/gen_3/kirlia/normal.pal similarity index 100% rename from graphics/pokemon/kirlia/normal.pal rename to graphics/pokemon/gen_3/kirlia/normal.pal diff --git a/graphics/pokemon/kirlia/shiny.pal b/graphics/pokemon/gen_3/kirlia/shiny.pal similarity index 100% rename from graphics/pokemon/kirlia/shiny.pal rename to graphics/pokemon/gen_3/kirlia/shiny.pal diff --git a/graphics/pokemon/kyogre/anim_front.png b/graphics/pokemon/gen_3/kyogre/anim_front.png similarity index 100% rename from graphics/pokemon/kyogre/anim_front.png rename to graphics/pokemon/gen_3/kyogre/anim_front.png diff --git a/graphics/pokemon/kyogre/back.png b/graphics/pokemon/gen_3/kyogre/back.png similarity index 100% rename from graphics/pokemon/kyogre/back.png rename to graphics/pokemon/gen_3/kyogre/back.png diff --git a/graphics/pokemon/kyogre/footprint.png b/graphics/pokemon/gen_3/kyogre/footprint.png similarity index 100% rename from graphics/pokemon/kyogre/footprint.png rename to graphics/pokemon/gen_3/kyogre/footprint.png diff --git a/graphics/pokemon/kyogre/icon.png b/graphics/pokemon/gen_3/kyogre/icon.png similarity index 100% rename from graphics/pokemon/kyogre/icon.png rename to graphics/pokemon/gen_3/kyogre/icon.png diff --git a/graphics/pokemon/kyogre/normal.pal b/graphics/pokemon/gen_3/kyogre/normal.pal similarity index 100% rename from graphics/pokemon/kyogre/normal.pal rename to graphics/pokemon/gen_3/kyogre/normal.pal diff --git a/graphics/pokemon/kyogre/primal/back.png b/graphics/pokemon/gen_3/kyogre/primal/back.png similarity index 100% rename from graphics/pokemon/kyogre/primal/back.png rename to graphics/pokemon/gen_3/kyogre/primal/back.png diff --git a/graphics/pokemon/kyogre/primal/front.png b/graphics/pokemon/gen_3/kyogre/primal/front.png similarity index 100% rename from graphics/pokemon/kyogre/primal/front.png rename to graphics/pokemon/gen_3/kyogre/primal/front.png diff --git a/graphics/pokemon/kyogre/primal/icon.png b/graphics/pokemon/gen_3/kyogre/primal/icon.png similarity index 100% rename from graphics/pokemon/kyogre/primal/icon.png rename to graphics/pokemon/gen_3/kyogre/primal/icon.png diff --git a/graphics/pokemon/kyogre/primal/normal.pal b/graphics/pokemon/gen_3/kyogre/primal/normal.pal similarity index 100% rename from graphics/pokemon/kyogre/primal/normal.pal rename to graphics/pokemon/gen_3/kyogre/primal/normal.pal diff --git a/graphics/pokemon/kyogre/primal/shiny.pal b/graphics/pokemon/gen_3/kyogre/primal/shiny.pal similarity index 100% rename from graphics/pokemon/kyogre/primal/shiny.pal rename to graphics/pokemon/gen_3/kyogre/primal/shiny.pal diff --git a/graphics/pokemon/kyogre/shiny.pal b/graphics/pokemon/gen_3/kyogre/shiny.pal similarity index 100% rename from graphics/pokemon/kyogre/shiny.pal rename to graphics/pokemon/gen_3/kyogre/shiny.pal diff --git a/graphics/pokemon/lairon/anim_front.png b/graphics/pokemon/gen_3/lairon/anim_front.png similarity index 100% rename from graphics/pokemon/lairon/anim_front.png rename to graphics/pokemon/gen_3/lairon/anim_front.png diff --git a/graphics/pokemon/lairon/back.png b/graphics/pokemon/gen_3/lairon/back.png similarity index 100% rename from graphics/pokemon/lairon/back.png rename to graphics/pokemon/gen_3/lairon/back.png diff --git a/graphics/pokemon/lairon/footprint.png b/graphics/pokemon/gen_3/lairon/footprint.png similarity index 100% rename from graphics/pokemon/lairon/footprint.png rename to graphics/pokemon/gen_3/lairon/footprint.png diff --git a/graphics/pokemon/lairon/icon.png b/graphics/pokemon/gen_3/lairon/icon.png similarity index 100% rename from graphics/pokemon/lairon/icon.png rename to graphics/pokemon/gen_3/lairon/icon.png diff --git a/graphics/pokemon/lairon/normal.pal b/graphics/pokemon/gen_3/lairon/normal.pal similarity index 100% rename from graphics/pokemon/lairon/normal.pal rename to graphics/pokemon/gen_3/lairon/normal.pal diff --git a/graphics/pokemon/lairon/shiny.pal b/graphics/pokemon/gen_3/lairon/shiny.pal similarity index 100% rename from graphics/pokemon/lairon/shiny.pal rename to graphics/pokemon/gen_3/lairon/shiny.pal diff --git a/graphics/pokemon/latias/anim_front.png b/graphics/pokemon/gen_3/latias/anim_front.png similarity index 100% rename from graphics/pokemon/latias/anim_front.png rename to graphics/pokemon/gen_3/latias/anim_front.png diff --git a/graphics/pokemon/latias/back.png b/graphics/pokemon/gen_3/latias/back.png similarity index 100% rename from graphics/pokemon/latias/back.png rename to graphics/pokemon/gen_3/latias/back.png diff --git a/graphics/pokemon/latias/footprint.png b/graphics/pokemon/gen_3/latias/footprint.png similarity index 100% rename from graphics/pokemon/latias/footprint.png rename to graphics/pokemon/gen_3/latias/footprint.png diff --git a/graphics/pokemon/latias/icon.png b/graphics/pokemon/gen_3/latias/icon.png similarity index 100% rename from graphics/pokemon/latias/icon.png rename to graphics/pokemon/gen_3/latias/icon.png diff --git a/graphics/pokemon/latias/mega/back.png b/graphics/pokemon/gen_3/latias/mega/back.png similarity index 100% rename from graphics/pokemon/latias/mega/back.png rename to graphics/pokemon/gen_3/latias/mega/back.png diff --git a/graphics/pokemon/latias/mega/front.png b/graphics/pokemon/gen_3/latias/mega/front.png similarity index 100% rename from graphics/pokemon/latias/mega/front.png rename to graphics/pokemon/gen_3/latias/mega/front.png diff --git a/graphics/pokemon/latias/mega/icon.png b/graphics/pokemon/gen_3/latias/mega/icon.png similarity index 100% rename from graphics/pokemon/latias/mega/icon.png rename to graphics/pokemon/gen_3/latias/mega/icon.png diff --git a/graphics/pokemon/latias/mega/normal.pal b/graphics/pokemon/gen_3/latias/mega/normal.pal similarity index 100% rename from graphics/pokemon/latias/mega/normal.pal rename to graphics/pokemon/gen_3/latias/mega/normal.pal diff --git a/graphics/pokemon/latias/mega/shiny.pal b/graphics/pokemon/gen_3/latias/mega/shiny.pal similarity index 100% rename from graphics/pokemon/latias/mega/shiny.pal rename to graphics/pokemon/gen_3/latias/mega/shiny.pal diff --git a/graphics/pokemon/latias/normal.pal b/graphics/pokemon/gen_3/latias/normal.pal similarity index 100% rename from graphics/pokemon/latias/normal.pal rename to graphics/pokemon/gen_3/latias/normal.pal diff --git a/graphics/pokemon/latias/shiny.pal b/graphics/pokemon/gen_3/latias/shiny.pal similarity index 100% rename from graphics/pokemon/latias/shiny.pal rename to graphics/pokemon/gen_3/latias/shiny.pal diff --git a/graphics/pokemon/latios/anim_front.png b/graphics/pokemon/gen_3/latios/anim_front.png similarity index 100% rename from graphics/pokemon/latios/anim_front.png rename to graphics/pokemon/gen_3/latios/anim_front.png diff --git a/graphics/pokemon/latios/back.png b/graphics/pokemon/gen_3/latios/back.png similarity index 100% rename from graphics/pokemon/latios/back.png rename to graphics/pokemon/gen_3/latios/back.png diff --git a/graphics/pokemon/latios/footprint.png b/graphics/pokemon/gen_3/latios/footprint.png similarity index 100% rename from graphics/pokemon/latios/footprint.png rename to graphics/pokemon/gen_3/latios/footprint.png diff --git a/graphics/pokemon/latios/icon.png b/graphics/pokemon/gen_3/latios/icon.png similarity index 100% rename from graphics/pokemon/latios/icon.png rename to graphics/pokemon/gen_3/latios/icon.png diff --git a/graphics/pokemon/latios/mega/back.png b/graphics/pokemon/gen_3/latios/mega/back.png similarity index 100% rename from graphics/pokemon/latios/mega/back.png rename to graphics/pokemon/gen_3/latios/mega/back.png diff --git a/graphics/pokemon/latios/mega/front.png b/graphics/pokemon/gen_3/latios/mega/front.png similarity index 100% rename from graphics/pokemon/latios/mega/front.png rename to graphics/pokemon/gen_3/latios/mega/front.png diff --git a/graphics/pokemon/latios/mega/icon.png b/graphics/pokemon/gen_3/latios/mega/icon.png similarity index 100% rename from graphics/pokemon/latios/mega/icon.png rename to graphics/pokemon/gen_3/latios/mega/icon.png diff --git a/graphics/pokemon/latios/mega/normal.pal b/graphics/pokemon/gen_3/latios/mega/normal.pal similarity index 100% rename from graphics/pokemon/latios/mega/normal.pal rename to graphics/pokemon/gen_3/latios/mega/normal.pal diff --git a/graphics/pokemon/latios/mega/shiny.pal b/graphics/pokemon/gen_3/latios/mega/shiny.pal similarity index 100% rename from graphics/pokemon/latios/mega/shiny.pal rename to graphics/pokemon/gen_3/latios/mega/shiny.pal diff --git a/graphics/pokemon/latios/normal.pal b/graphics/pokemon/gen_3/latios/normal.pal similarity index 100% rename from graphics/pokemon/latios/normal.pal rename to graphics/pokemon/gen_3/latios/normal.pal diff --git a/graphics/pokemon/latios/shiny.pal b/graphics/pokemon/gen_3/latios/shiny.pal similarity index 100% rename from graphics/pokemon/latios/shiny.pal rename to graphics/pokemon/gen_3/latios/shiny.pal diff --git a/graphics/pokemon/lileep/anim_front.png b/graphics/pokemon/gen_3/lileep/anim_front.png similarity index 100% rename from graphics/pokemon/lileep/anim_front.png rename to graphics/pokemon/gen_3/lileep/anim_front.png diff --git a/graphics/pokemon/lileep/back.png b/graphics/pokemon/gen_3/lileep/back.png similarity index 100% rename from graphics/pokemon/lileep/back.png rename to graphics/pokemon/gen_3/lileep/back.png diff --git a/graphics/pokemon/lileep/footprint.png b/graphics/pokemon/gen_3/lileep/footprint.png similarity index 100% rename from graphics/pokemon/lileep/footprint.png rename to graphics/pokemon/gen_3/lileep/footprint.png diff --git a/graphics/pokemon/lileep/icon.png b/graphics/pokemon/gen_3/lileep/icon.png similarity index 100% rename from graphics/pokemon/lileep/icon.png rename to graphics/pokemon/gen_3/lileep/icon.png diff --git a/graphics/pokemon/lileep/normal.pal b/graphics/pokemon/gen_3/lileep/normal.pal similarity index 100% rename from graphics/pokemon/lileep/normal.pal rename to graphics/pokemon/gen_3/lileep/normal.pal diff --git a/graphics/pokemon/lileep/shiny.pal b/graphics/pokemon/gen_3/lileep/shiny.pal similarity index 100% rename from graphics/pokemon/lileep/shiny.pal rename to graphics/pokemon/gen_3/lileep/shiny.pal diff --git a/graphics/pokemon/linoone/anim_front.png b/graphics/pokemon/gen_3/linoone/anim_front.png similarity index 100% rename from graphics/pokemon/linoone/anim_front.png rename to graphics/pokemon/gen_3/linoone/anim_front.png diff --git a/graphics/pokemon/linoone/back.png b/graphics/pokemon/gen_3/linoone/back.png similarity index 100% rename from graphics/pokemon/linoone/back.png rename to graphics/pokemon/gen_3/linoone/back.png diff --git a/graphics/pokemon/linoone/footprint.png b/graphics/pokemon/gen_3/linoone/footprint.png similarity index 100% rename from graphics/pokemon/linoone/footprint.png rename to graphics/pokemon/gen_3/linoone/footprint.png diff --git a/graphics/pokemon/linoone/galarian/back.png b/graphics/pokemon/gen_3/linoone/galarian/back.png similarity index 100% rename from graphics/pokemon/linoone/galarian/back.png rename to graphics/pokemon/gen_3/linoone/galarian/back.png diff --git a/graphics/pokemon/linoone/galarian/front.png b/graphics/pokemon/gen_3/linoone/galarian/front.png similarity index 100% rename from graphics/pokemon/linoone/galarian/front.png rename to graphics/pokemon/gen_3/linoone/galarian/front.png diff --git a/graphics/pokemon/linoone/galarian/icon.png b/graphics/pokemon/gen_3/linoone/galarian/icon.png similarity index 100% rename from graphics/pokemon/linoone/galarian/icon.png rename to graphics/pokemon/gen_3/linoone/galarian/icon.png diff --git a/graphics/pokemon/linoone/galarian/normal.pal b/graphics/pokemon/gen_3/linoone/galarian/normal.pal similarity index 100% rename from graphics/pokemon/linoone/galarian/normal.pal rename to graphics/pokemon/gen_3/linoone/galarian/normal.pal diff --git a/graphics/pokemon/linoone/galarian/shiny.pal b/graphics/pokemon/gen_3/linoone/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/linoone/galarian/shiny.pal rename to graphics/pokemon/gen_3/linoone/galarian/shiny.pal diff --git a/graphics/pokemon/linoone/icon.png b/graphics/pokemon/gen_3/linoone/icon.png similarity index 100% rename from graphics/pokemon/linoone/icon.png rename to graphics/pokemon/gen_3/linoone/icon.png diff --git a/graphics/pokemon/linoone/normal.pal b/graphics/pokemon/gen_3/linoone/normal.pal similarity index 100% rename from graphics/pokemon/linoone/normal.pal rename to graphics/pokemon/gen_3/linoone/normal.pal diff --git a/graphics/pokemon/linoone/shiny.pal b/graphics/pokemon/gen_3/linoone/shiny.pal similarity index 100% rename from graphics/pokemon/linoone/shiny.pal rename to graphics/pokemon/gen_3/linoone/shiny.pal diff --git a/graphics/pokemon/lombre/anim_front.png b/graphics/pokemon/gen_3/lombre/anim_front.png similarity index 100% rename from graphics/pokemon/lombre/anim_front.png rename to graphics/pokemon/gen_3/lombre/anim_front.png diff --git a/graphics/pokemon/lombre/back.png b/graphics/pokemon/gen_3/lombre/back.png similarity index 100% rename from graphics/pokemon/lombre/back.png rename to graphics/pokemon/gen_3/lombre/back.png diff --git a/graphics/pokemon/lombre/footprint.png b/graphics/pokemon/gen_3/lombre/footprint.png similarity index 100% rename from graphics/pokemon/lombre/footprint.png rename to graphics/pokemon/gen_3/lombre/footprint.png diff --git a/graphics/pokemon/lombre/icon.png b/graphics/pokemon/gen_3/lombre/icon.png similarity index 100% rename from graphics/pokemon/lombre/icon.png rename to graphics/pokemon/gen_3/lombre/icon.png diff --git a/graphics/pokemon/lombre/normal.pal b/graphics/pokemon/gen_3/lombre/normal.pal similarity index 100% rename from graphics/pokemon/lombre/normal.pal rename to graphics/pokemon/gen_3/lombre/normal.pal diff --git a/graphics/pokemon/lombre/shiny.pal b/graphics/pokemon/gen_3/lombre/shiny.pal similarity index 100% rename from graphics/pokemon/lombre/shiny.pal rename to graphics/pokemon/gen_3/lombre/shiny.pal diff --git a/graphics/pokemon/lotad/anim_front.png b/graphics/pokemon/gen_3/lotad/anim_front.png similarity index 100% rename from graphics/pokemon/lotad/anim_front.png rename to graphics/pokemon/gen_3/lotad/anim_front.png diff --git a/graphics/pokemon/lotad/back.png b/graphics/pokemon/gen_3/lotad/back.png similarity index 100% rename from graphics/pokemon/lotad/back.png rename to graphics/pokemon/gen_3/lotad/back.png diff --git a/graphics/pokemon/lotad/footprint.png b/graphics/pokemon/gen_3/lotad/footprint.png similarity index 100% rename from graphics/pokemon/lotad/footprint.png rename to graphics/pokemon/gen_3/lotad/footprint.png diff --git a/graphics/pokemon/lotad/icon.png b/graphics/pokemon/gen_3/lotad/icon.png similarity index 100% rename from graphics/pokemon/lotad/icon.png rename to graphics/pokemon/gen_3/lotad/icon.png diff --git a/graphics/pokemon/lotad/normal.pal b/graphics/pokemon/gen_3/lotad/normal.pal similarity index 100% rename from graphics/pokemon/lotad/normal.pal rename to graphics/pokemon/gen_3/lotad/normal.pal diff --git a/graphics/pokemon/lotad/shiny.pal b/graphics/pokemon/gen_3/lotad/shiny.pal similarity index 100% rename from graphics/pokemon/lotad/shiny.pal rename to graphics/pokemon/gen_3/lotad/shiny.pal diff --git a/graphics/pokemon/loudred/anim_front.png b/graphics/pokemon/gen_3/loudred/anim_front.png similarity index 100% rename from graphics/pokemon/loudred/anim_front.png rename to graphics/pokemon/gen_3/loudred/anim_front.png diff --git a/graphics/pokemon/loudred/back.png b/graphics/pokemon/gen_3/loudred/back.png similarity index 100% rename from graphics/pokemon/loudred/back.png rename to graphics/pokemon/gen_3/loudred/back.png diff --git a/graphics/pokemon/loudred/footprint.png b/graphics/pokemon/gen_3/loudred/footprint.png similarity index 100% rename from graphics/pokemon/loudred/footprint.png rename to graphics/pokemon/gen_3/loudred/footprint.png diff --git a/graphics/pokemon/loudred/icon.png b/graphics/pokemon/gen_3/loudred/icon.png similarity index 100% rename from graphics/pokemon/loudred/icon.png rename to graphics/pokemon/gen_3/loudred/icon.png diff --git a/graphics/pokemon/loudred/normal.pal b/graphics/pokemon/gen_3/loudred/normal.pal similarity index 100% rename from graphics/pokemon/loudred/normal.pal rename to graphics/pokemon/gen_3/loudred/normal.pal diff --git a/graphics/pokemon/loudred/shiny.pal b/graphics/pokemon/gen_3/loudred/shiny.pal similarity index 100% rename from graphics/pokemon/loudred/shiny.pal rename to graphics/pokemon/gen_3/loudred/shiny.pal diff --git a/graphics/pokemon/ludicolo/anim_front.png b/graphics/pokemon/gen_3/ludicolo/anim_front.png similarity index 100% rename from graphics/pokemon/ludicolo/anim_front.png rename to graphics/pokemon/gen_3/ludicolo/anim_front.png diff --git a/graphics/pokemon/ludicolo/anim_frontf.png b/graphics/pokemon/gen_3/ludicolo/anim_frontf.png similarity index 100% rename from graphics/pokemon/ludicolo/anim_frontf.png rename to graphics/pokemon/gen_3/ludicolo/anim_frontf.png diff --git a/graphics/pokemon/ludicolo/back.png b/graphics/pokemon/gen_3/ludicolo/back.png similarity index 100% rename from graphics/pokemon/ludicolo/back.png rename to graphics/pokemon/gen_3/ludicolo/back.png diff --git a/graphics/pokemon/ludicolo/backf.png b/graphics/pokemon/gen_3/ludicolo/backf.png similarity index 100% rename from graphics/pokemon/ludicolo/backf.png rename to graphics/pokemon/gen_3/ludicolo/backf.png diff --git a/graphics/pokemon/ludicolo/footprint.png b/graphics/pokemon/gen_3/ludicolo/footprint.png similarity index 100% rename from graphics/pokemon/ludicolo/footprint.png rename to graphics/pokemon/gen_3/ludicolo/footprint.png diff --git a/graphics/pokemon/ludicolo/icon.png b/graphics/pokemon/gen_3/ludicolo/icon.png similarity index 100% rename from graphics/pokemon/ludicolo/icon.png rename to graphics/pokemon/gen_3/ludicolo/icon.png diff --git a/graphics/pokemon/ludicolo/normal.pal b/graphics/pokemon/gen_3/ludicolo/normal.pal similarity index 100% rename from graphics/pokemon/ludicolo/normal.pal rename to graphics/pokemon/gen_3/ludicolo/normal.pal diff --git a/graphics/pokemon/ludicolo/shiny.pal b/graphics/pokemon/gen_3/ludicolo/shiny.pal similarity index 100% rename from graphics/pokemon/ludicolo/shiny.pal rename to graphics/pokemon/gen_3/ludicolo/shiny.pal diff --git a/graphics/pokemon/lunatone/anim_front.png b/graphics/pokemon/gen_3/lunatone/anim_front.png similarity index 100% rename from graphics/pokemon/lunatone/anim_front.png rename to graphics/pokemon/gen_3/lunatone/anim_front.png diff --git a/graphics/pokemon/lunatone/back.png b/graphics/pokemon/gen_3/lunatone/back.png similarity index 100% rename from graphics/pokemon/lunatone/back.png rename to graphics/pokemon/gen_3/lunatone/back.png diff --git a/graphics/pokemon/flabebe/footprint.png b/graphics/pokemon/gen_3/lunatone/footprint.png similarity index 100% rename from graphics/pokemon/flabebe/footprint.png rename to graphics/pokemon/gen_3/lunatone/footprint.png diff --git a/graphics/pokemon/lunatone/icon.png b/graphics/pokemon/gen_3/lunatone/icon.png similarity index 100% rename from graphics/pokemon/lunatone/icon.png rename to graphics/pokemon/gen_3/lunatone/icon.png diff --git a/graphics/pokemon/lunatone/normal.pal b/graphics/pokemon/gen_3/lunatone/normal.pal similarity index 100% rename from graphics/pokemon/lunatone/normal.pal rename to graphics/pokemon/gen_3/lunatone/normal.pal diff --git a/graphics/pokemon/lunatone/shiny.pal b/graphics/pokemon/gen_3/lunatone/shiny.pal similarity index 100% rename from graphics/pokemon/lunatone/shiny.pal rename to graphics/pokemon/gen_3/lunatone/shiny.pal diff --git a/graphics/pokemon/luvdisc/anim_front.png b/graphics/pokemon/gen_3/luvdisc/anim_front.png similarity index 100% rename from graphics/pokemon/luvdisc/anim_front.png rename to graphics/pokemon/gen_3/luvdisc/anim_front.png diff --git a/graphics/pokemon/luvdisc/back.png b/graphics/pokemon/gen_3/luvdisc/back.png similarity index 100% rename from graphics/pokemon/luvdisc/back.png rename to graphics/pokemon/gen_3/luvdisc/back.png diff --git a/graphics/pokemon/flapple/footprint.png b/graphics/pokemon/gen_3/luvdisc/footprint.png similarity index 100% rename from graphics/pokemon/flapple/footprint.png rename to graphics/pokemon/gen_3/luvdisc/footprint.png diff --git a/graphics/pokemon/luvdisc/icon.png b/graphics/pokemon/gen_3/luvdisc/icon.png similarity index 100% rename from graphics/pokemon/luvdisc/icon.png rename to graphics/pokemon/gen_3/luvdisc/icon.png diff --git a/graphics/pokemon/luvdisc/normal.pal b/graphics/pokemon/gen_3/luvdisc/normal.pal similarity index 100% rename from graphics/pokemon/luvdisc/normal.pal rename to graphics/pokemon/gen_3/luvdisc/normal.pal diff --git a/graphics/pokemon/luvdisc/shiny.pal b/graphics/pokemon/gen_3/luvdisc/shiny.pal similarity index 100% rename from graphics/pokemon/luvdisc/shiny.pal rename to graphics/pokemon/gen_3/luvdisc/shiny.pal diff --git a/graphics/pokemon/makuhita/anim_front.png b/graphics/pokemon/gen_3/makuhita/anim_front.png similarity index 100% rename from graphics/pokemon/makuhita/anim_front.png rename to graphics/pokemon/gen_3/makuhita/anim_front.png diff --git a/graphics/pokemon/makuhita/back.png b/graphics/pokemon/gen_3/makuhita/back.png similarity index 100% rename from graphics/pokemon/makuhita/back.png rename to graphics/pokemon/gen_3/makuhita/back.png diff --git a/graphics/pokemon/makuhita/footprint.png b/graphics/pokemon/gen_3/makuhita/footprint.png similarity index 100% rename from graphics/pokemon/makuhita/footprint.png rename to graphics/pokemon/gen_3/makuhita/footprint.png diff --git a/graphics/pokemon/makuhita/icon.png b/graphics/pokemon/gen_3/makuhita/icon.png similarity index 100% rename from graphics/pokemon/makuhita/icon.png rename to graphics/pokemon/gen_3/makuhita/icon.png diff --git a/graphics/pokemon/makuhita/normal.pal b/graphics/pokemon/gen_3/makuhita/normal.pal similarity index 100% rename from graphics/pokemon/makuhita/normal.pal rename to graphics/pokemon/gen_3/makuhita/normal.pal diff --git a/graphics/pokemon/makuhita/shiny.pal b/graphics/pokemon/gen_3/makuhita/shiny.pal similarity index 100% rename from graphics/pokemon/makuhita/shiny.pal rename to graphics/pokemon/gen_3/makuhita/shiny.pal diff --git a/graphics/pokemon/manectric/anim_front.png b/graphics/pokemon/gen_3/manectric/anim_front.png similarity index 100% rename from graphics/pokemon/manectric/anim_front.png rename to graphics/pokemon/gen_3/manectric/anim_front.png diff --git a/graphics/pokemon/manectric/back.png b/graphics/pokemon/gen_3/manectric/back.png similarity index 100% rename from graphics/pokemon/manectric/back.png rename to graphics/pokemon/gen_3/manectric/back.png diff --git a/graphics/pokemon/manectric/footprint.png b/graphics/pokemon/gen_3/manectric/footprint.png similarity index 100% rename from graphics/pokemon/manectric/footprint.png rename to graphics/pokemon/gen_3/manectric/footprint.png diff --git a/graphics/pokemon/manectric/icon.png b/graphics/pokemon/gen_3/manectric/icon.png similarity index 100% rename from graphics/pokemon/manectric/icon.png rename to graphics/pokemon/gen_3/manectric/icon.png diff --git a/graphics/pokemon/manectric/mega/back.png b/graphics/pokemon/gen_3/manectric/mega/back.png similarity index 100% rename from graphics/pokemon/manectric/mega/back.png rename to graphics/pokemon/gen_3/manectric/mega/back.png diff --git a/graphics/pokemon/manectric/mega/front.png b/graphics/pokemon/gen_3/manectric/mega/front.png similarity index 100% rename from graphics/pokemon/manectric/mega/front.png rename to graphics/pokemon/gen_3/manectric/mega/front.png diff --git a/graphics/pokemon/manectric/mega/icon.png b/graphics/pokemon/gen_3/manectric/mega/icon.png similarity index 100% rename from graphics/pokemon/manectric/mega/icon.png rename to graphics/pokemon/gen_3/manectric/mega/icon.png diff --git a/graphics/pokemon/manectric/mega/normal.pal b/graphics/pokemon/gen_3/manectric/mega/normal.pal similarity index 100% rename from graphics/pokemon/manectric/mega/normal.pal rename to graphics/pokemon/gen_3/manectric/mega/normal.pal diff --git a/graphics/pokemon/manectric/mega/shiny.pal b/graphics/pokemon/gen_3/manectric/mega/shiny.pal similarity index 100% rename from graphics/pokemon/manectric/mega/shiny.pal rename to graphics/pokemon/gen_3/manectric/mega/shiny.pal diff --git a/graphics/pokemon/manectric/normal.pal b/graphics/pokemon/gen_3/manectric/normal.pal similarity index 100% rename from graphics/pokemon/manectric/normal.pal rename to graphics/pokemon/gen_3/manectric/normal.pal diff --git a/graphics/pokemon/manectric/shiny.pal b/graphics/pokemon/gen_3/manectric/shiny.pal similarity index 100% rename from graphics/pokemon/manectric/shiny.pal rename to graphics/pokemon/gen_3/manectric/shiny.pal diff --git a/graphics/pokemon/marshtomp/anim_front.png b/graphics/pokemon/gen_3/marshtomp/anim_front.png similarity index 100% rename from graphics/pokemon/marshtomp/anim_front.png rename to graphics/pokemon/gen_3/marshtomp/anim_front.png diff --git a/graphics/pokemon/marshtomp/back.png b/graphics/pokemon/gen_3/marshtomp/back.png similarity index 100% rename from graphics/pokemon/marshtomp/back.png rename to graphics/pokemon/gen_3/marshtomp/back.png diff --git a/graphics/pokemon/marshtomp/footprint.png b/graphics/pokemon/gen_3/marshtomp/footprint.png similarity index 100% rename from graphics/pokemon/marshtomp/footprint.png rename to graphics/pokemon/gen_3/marshtomp/footprint.png diff --git a/graphics/pokemon/marshtomp/icon.png b/graphics/pokemon/gen_3/marshtomp/icon.png similarity index 100% rename from graphics/pokemon/marshtomp/icon.png rename to graphics/pokemon/gen_3/marshtomp/icon.png diff --git a/graphics/pokemon/marshtomp/normal.pal b/graphics/pokemon/gen_3/marshtomp/normal.pal similarity index 100% rename from graphics/pokemon/marshtomp/normal.pal rename to graphics/pokemon/gen_3/marshtomp/normal.pal diff --git a/graphics/pokemon/marshtomp/shiny.pal b/graphics/pokemon/gen_3/marshtomp/shiny.pal similarity index 100% rename from graphics/pokemon/marshtomp/shiny.pal rename to graphics/pokemon/gen_3/marshtomp/shiny.pal diff --git a/graphics/pokemon/masquerain/anim_front.png b/graphics/pokemon/gen_3/masquerain/anim_front.png similarity index 100% rename from graphics/pokemon/masquerain/anim_front.png rename to graphics/pokemon/gen_3/masquerain/anim_front.png diff --git a/graphics/pokemon/masquerain/back.png b/graphics/pokemon/gen_3/masquerain/back.png similarity index 100% rename from graphics/pokemon/masquerain/back.png rename to graphics/pokemon/gen_3/masquerain/back.png diff --git a/graphics/pokemon/floette/footprint.png b/graphics/pokemon/gen_3/masquerain/footprint.png similarity index 100% rename from graphics/pokemon/floette/footprint.png rename to graphics/pokemon/gen_3/masquerain/footprint.png diff --git a/graphics/pokemon/masquerain/icon.png b/graphics/pokemon/gen_3/masquerain/icon.png similarity index 100% rename from graphics/pokemon/masquerain/icon.png rename to graphics/pokemon/gen_3/masquerain/icon.png diff --git a/graphics/pokemon/masquerain/normal.pal b/graphics/pokemon/gen_3/masquerain/normal.pal similarity index 100% rename from graphics/pokemon/masquerain/normal.pal rename to graphics/pokemon/gen_3/masquerain/normal.pal diff --git a/graphics/pokemon/masquerain/shiny.pal b/graphics/pokemon/gen_3/masquerain/shiny.pal similarity index 100% rename from graphics/pokemon/masquerain/shiny.pal rename to graphics/pokemon/gen_3/masquerain/shiny.pal diff --git a/graphics/pokemon/mawile/anim_front.png b/graphics/pokemon/gen_3/mawile/anim_front.png similarity index 100% rename from graphics/pokemon/mawile/anim_front.png rename to graphics/pokemon/gen_3/mawile/anim_front.png diff --git a/graphics/pokemon/mawile/back.png b/graphics/pokemon/gen_3/mawile/back.png similarity index 100% rename from graphics/pokemon/mawile/back.png rename to graphics/pokemon/gen_3/mawile/back.png diff --git a/graphics/pokemon/mawile/footprint.png b/graphics/pokemon/gen_3/mawile/footprint.png similarity index 100% rename from graphics/pokemon/mawile/footprint.png rename to graphics/pokemon/gen_3/mawile/footprint.png diff --git a/graphics/pokemon/mawile/icon.png b/graphics/pokemon/gen_3/mawile/icon.png similarity index 100% rename from graphics/pokemon/mawile/icon.png rename to graphics/pokemon/gen_3/mawile/icon.png diff --git a/graphics/pokemon/mawile/mega/back.png b/graphics/pokemon/gen_3/mawile/mega/back.png similarity index 100% rename from graphics/pokemon/mawile/mega/back.png rename to graphics/pokemon/gen_3/mawile/mega/back.png diff --git a/graphics/pokemon/mawile/mega/front.png b/graphics/pokemon/gen_3/mawile/mega/front.png similarity index 100% rename from graphics/pokemon/mawile/mega/front.png rename to graphics/pokemon/gen_3/mawile/mega/front.png diff --git a/graphics/pokemon/mawile/mega/icon.png b/graphics/pokemon/gen_3/mawile/mega/icon.png similarity index 100% rename from graphics/pokemon/mawile/mega/icon.png rename to graphics/pokemon/gen_3/mawile/mega/icon.png diff --git a/graphics/pokemon/mawile/mega/normal.pal b/graphics/pokemon/gen_3/mawile/mega/normal.pal similarity index 100% rename from graphics/pokemon/mawile/mega/normal.pal rename to graphics/pokemon/gen_3/mawile/mega/normal.pal diff --git a/graphics/pokemon/mawile/mega/shiny.pal b/graphics/pokemon/gen_3/mawile/mega/shiny.pal similarity index 100% rename from graphics/pokemon/mawile/mega/shiny.pal rename to graphics/pokemon/gen_3/mawile/mega/shiny.pal diff --git a/graphics/pokemon/mawile/normal.pal b/graphics/pokemon/gen_3/mawile/normal.pal similarity index 100% rename from graphics/pokemon/mawile/normal.pal rename to graphics/pokemon/gen_3/mawile/normal.pal diff --git a/graphics/pokemon/mawile/shiny.pal b/graphics/pokemon/gen_3/mawile/shiny.pal similarity index 100% rename from graphics/pokemon/mawile/shiny.pal rename to graphics/pokemon/gen_3/mawile/shiny.pal diff --git a/graphics/pokemon/medicham/anim_front.png b/graphics/pokemon/gen_3/medicham/anim_front.png similarity index 100% rename from graphics/pokemon/medicham/anim_front.png rename to graphics/pokemon/gen_3/medicham/anim_front.png diff --git a/graphics/pokemon/medicham/anim_frontf.png b/graphics/pokemon/gen_3/medicham/anim_frontf.png similarity index 100% rename from graphics/pokemon/medicham/anim_frontf.png rename to graphics/pokemon/gen_3/medicham/anim_frontf.png diff --git a/graphics/pokemon/medicham/back.png b/graphics/pokemon/gen_3/medicham/back.png similarity index 100% rename from graphics/pokemon/medicham/back.png rename to graphics/pokemon/gen_3/medicham/back.png diff --git a/graphics/pokemon/medicham/backf.png b/graphics/pokemon/gen_3/medicham/backf.png similarity index 100% rename from graphics/pokemon/medicham/backf.png rename to graphics/pokemon/gen_3/medicham/backf.png diff --git a/graphics/pokemon/medicham/footprint.png b/graphics/pokemon/gen_3/medicham/footprint.png similarity index 100% rename from graphics/pokemon/medicham/footprint.png rename to graphics/pokemon/gen_3/medicham/footprint.png diff --git a/graphics/pokemon/medicham/icon.png b/graphics/pokemon/gen_3/medicham/icon.png similarity index 100% rename from graphics/pokemon/medicham/icon.png rename to graphics/pokemon/gen_3/medicham/icon.png diff --git a/graphics/pokemon/medicham/mega/back.png b/graphics/pokemon/gen_3/medicham/mega/back.png similarity index 100% rename from graphics/pokemon/medicham/mega/back.png rename to graphics/pokemon/gen_3/medicham/mega/back.png diff --git a/graphics/pokemon/medicham/mega/front.png b/graphics/pokemon/gen_3/medicham/mega/front.png similarity index 100% rename from graphics/pokemon/medicham/mega/front.png rename to graphics/pokemon/gen_3/medicham/mega/front.png diff --git a/graphics/pokemon/medicham/mega/icon.png b/graphics/pokemon/gen_3/medicham/mega/icon.png similarity index 100% rename from graphics/pokemon/medicham/mega/icon.png rename to graphics/pokemon/gen_3/medicham/mega/icon.png diff --git a/graphics/pokemon/medicham/mega/normal.pal b/graphics/pokemon/gen_3/medicham/mega/normal.pal similarity index 100% rename from graphics/pokemon/medicham/mega/normal.pal rename to graphics/pokemon/gen_3/medicham/mega/normal.pal diff --git a/graphics/pokemon/medicham/mega/shiny.pal b/graphics/pokemon/gen_3/medicham/mega/shiny.pal similarity index 100% rename from graphics/pokemon/medicham/mega/shiny.pal rename to graphics/pokemon/gen_3/medicham/mega/shiny.pal diff --git a/graphics/pokemon/medicham/normal.pal b/graphics/pokemon/gen_3/medicham/normal.pal similarity index 100% rename from graphics/pokemon/medicham/normal.pal rename to graphics/pokemon/gen_3/medicham/normal.pal diff --git a/graphics/pokemon/medicham/shiny.pal b/graphics/pokemon/gen_3/medicham/shiny.pal similarity index 100% rename from graphics/pokemon/medicham/shiny.pal rename to graphics/pokemon/gen_3/medicham/shiny.pal diff --git a/graphics/pokemon/meditite/anim_front.png b/graphics/pokemon/gen_3/meditite/anim_front.png similarity index 100% rename from graphics/pokemon/meditite/anim_front.png rename to graphics/pokemon/gen_3/meditite/anim_front.png diff --git a/graphics/pokemon/meditite/anim_frontf.png b/graphics/pokemon/gen_3/meditite/anim_frontf.png similarity index 100% rename from graphics/pokemon/meditite/anim_frontf.png rename to graphics/pokemon/gen_3/meditite/anim_frontf.png diff --git a/graphics/pokemon/meditite/back.png b/graphics/pokemon/gen_3/meditite/back.png similarity index 100% rename from graphics/pokemon/meditite/back.png rename to graphics/pokemon/gen_3/meditite/back.png diff --git a/graphics/pokemon/meditite/backf.png b/graphics/pokemon/gen_3/meditite/backf.png similarity index 100% rename from graphics/pokemon/meditite/backf.png rename to graphics/pokemon/gen_3/meditite/backf.png diff --git a/graphics/pokemon/meditite/footprint.png b/graphics/pokemon/gen_3/meditite/footprint.png similarity index 100% rename from graphics/pokemon/meditite/footprint.png rename to graphics/pokemon/gen_3/meditite/footprint.png diff --git a/graphics/pokemon/meditite/icon.png b/graphics/pokemon/gen_3/meditite/icon.png similarity index 100% rename from graphics/pokemon/meditite/icon.png rename to graphics/pokemon/gen_3/meditite/icon.png diff --git a/graphics/pokemon/meditite/normal.pal b/graphics/pokemon/gen_3/meditite/normal.pal similarity index 100% rename from graphics/pokemon/meditite/normal.pal rename to graphics/pokemon/gen_3/meditite/normal.pal diff --git a/graphics/pokemon/meditite/shiny.pal b/graphics/pokemon/gen_3/meditite/shiny.pal similarity index 100% rename from graphics/pokemon/meditite/shiny.pal rename to graphics/pokemon/gen_3/meditite/shiny.pal diff --git a/graphics/pokemon/metagross/anim_front.png b/graphics/pokemon/gen_3/metagross/anim_front.png similarity index 100% rename from graphics/pokemon/metagross/anim_front.png rename to graphics/pokemon/gen_3/metagross/anim_front.png diff --git a/graphics/pokemon/metagross/back.png b/graphics/pokemon/gen_3/metagross/back.png similarity index 100% rename from graphics/pokemon/metagross/back.png rename to graphics/pokemon/gen_3/metagross/back.png diff --git a/graphics/pokemon/metagross/footprint.png b/graphics/pokemon/gen_3/metagross/footprint.png similarity index 100% rename from graphics/pokemon/metagross/footprint.png rename to graphics/pokemon/gen_3/metagross/footprint.png diff --git a/graphics/pokemon/metagross/icon.png b/graphics/pokemon/gen_3/metagross/icon.png similarity index 100% rename from graphics/pokemon/metagross/icon.png rename to graphics/pokemon/gen_3/metagross/icon.png diff --git a/graphics/pokemon/metagross/mega/back.png b/graphics/pokemon/gen_3/metagross/mega/back.png similarity index 100% rename from graphics/pokemon/metagross/mega/back.png rename to graphics/pokemon/gen_3/metagross/mega/back.png diff --git a/graphics/pokemon/metagross/mega/front.png b/graphics/pokemon/gen_3/metagross/mega/front.png similarity index 100% rename from graphics/pokemon/metagross/mega/front.png rename to graphics/pokemon/gen_3/metagross/mega/front.png diff --git a/graphics/pokemon/metagross/mega/icon.png b/graphics/pokemon/gen_3/metagross/mega/icon.png similarity index 100% rename from graphics/pokemon/metagross/mega/icon.png rename to graphics/pokemon/gen_3/metagross/mega/icon.png diff --git a/graphics/pokemon/metagross/mega/normal.pal b/graphics/pokemon/gen_3/metagross/mega/normal.pal similarity index 100% rename from graphics/pokemon/metagross/mega/normal.pal rename to graphics/pokemon/gen_3/metagross/mega/normal.pal diff --git a/graphics/pokemon/metagross/mega/shiny.pal b/graphics/pokemon/gen_3/metagross/mega/shiny.pal similarity index 100% rename from graphics/pokemon/metagross/mega/shiny.pal rename to graphics/pokemon/gen_3/metagross/mega/shiny.pal diff --git a/graphics/pokemon/metagross/normal.pal b/graphics/pokemon/gen_3/metagross/normal.pal similarity index 100% rename from graphics/pokemon/metagross/normal.pal rename to graphics/pokemon/gen_3/metagross/normal.pal diff --git a/graphics/pokemon/metagross/shiny.pal b/graphics/pokemon/gen_3/metagross/shiny.pal similarity index 100% rename from graphics/pokemon/metagross/shiny.pal rename to graphics/pokemon/gen_3/metagross/shiny.pal diff --git a/graphics/pokemon/metang/anim_front.png b/graphics/pokemon/gen_3/metang/anim_front.png similarity index 100% rename from graphics/pokemon/metang/anim_front.png rename to graphics/pokemon/gen_3/metang/anim_front.png diff --git a/graphics/pokemon/metang/back.png b/graphics/pokemon/gen_3/metang/back.png similarity index 100% rename from graphics/pokemon/metang/back.png rename to graphics/pokemon/gen_3/metang/back.png diff --git a/graphics/pokemon/metang/footprint.png b/graphics/pokemon/gen_3/metang/footprint.png similarity index 100% rename from graphics/pokemon/metang/footprint.png rename to graphics/pokemon/gen_3/metang/footprint.png diff --git a/graphics/pokemon/metang/icon.png b/graphics/pokemon/gen_3/metang/icon.png similarity index 100% rename from graphics/pokemon/metang/icon.png rename to graphics/pokemon/gen_3/metang/icon.png diff --git a/graphics/pokemon/metang/normal.pal b/graphics/pokemon/gen_3/metang/normal.pal similarity index 100% rename from graphics/pokemon/metang/normal.pal rename to graphics/pokemon/gen_3/metang/normal.pal diff --git a/graphics/pokemon/metang/shiny.pal b/graphics/pokemon/gen_3/metang/shiny.pal similarity index 100% rename from graphics/pokemon/metang/shiny.pal rename to graphics/pokemon/gen_3/metang/shiny.pal diff --git a/graphics/pokemon/mightyena/anim_front.png b/graphics/pokemon/gen_3/mightyena/anim_front.png similarity index 100% rename from graphics/pokemon/mightyena/anim_front.png rename to graphics/pokemon/gen_3/mightyena/anim_front.png diff --git a/graphics/pokemon/mightyena/back.png b/graphics/pokemon/gen_3/mightyena/back.png similarity index 100% rename from graphics/pokemon/mightyena/back.png rename to graphics/pokemon/gen_3/mightyena/back.png diff --git a/graphics/pokemon/mightyena/footprint.png b/graphics/pokemon/gen_3/mightyena/footprint.png similarity index 100% rename from graphics/pokemon/mightyena/footprint.png rename to graphics/pokemon/gen_3/mightyena/footprint.png diff --git a/graphics/pokemon/mightyena/icon.png b/graphics/pokemon/gen_3/mightyena/icon.png similarity index 100% rename from graphics/pokemon/mightyena/icon.png rename to graphics/pokemon/gen_3/mightyena/icon.png diff --git a/graphics/pokemon/mightyena/normal.pal b/graphics/pokemon/gen_3/mightyena/normal.pal similarity index 100% rename from graphics/pokemon/mightyena/normal.pal rename to graphics/pokemon/gen_3/mightyena/normal.pal diff --git a/graphics/pokemon/mightyena/shiny.pal b/graphics/pokemon/gen_3/mightyena/shiny.pal similarity index 100% rename from graphics/pokemon/mightyena/shiny.pal rename to graphics/pokemon/gen_3/mightyena/shiny.pal diff --git a/graphics/pokemon/milotic/anim_front.png b/graphics/pokemon/gen_3/milotic/anim_front.png similarity index 100% rename from graphics/pokemon/milotic/anim_front.png rename to graphics/pokemon/gen_3/milotic/anim_front.png diff --git a/graphics/pokemon/milotic/anim_frontf.png b/graphics/pokemon/gen_3/milotic/anim_frontf.png similarity index 100% rename from graphics/pokemon/milotic/anim_frontf.png rename to graphics/pokemon/gen_3/milotic/anim_frontf.png diff --git a/graphics/pokemon/milotic/back.png b/graphics/pokemon/gen_3/milotic/back.png similarity index 100% rename from graphics/pokemon/milotic/back.png rename to graphics/pokemon/gen_3/milotic/back.png diff --git a/graphics/pokemon/milotic/backf.png b/graphics/pokemon/gen_3/milotic/backf.png similarity index 100% rename from graphics/pokemon/milotic/backf.png rename to graphics/pokemon/gen_3/milotic/backf.png diff --git a/graphics/pokemon/florges/footprint.png b/graphics/pokemon/gen_3/milotic/footprint.png similarity index 100% rename from graphics/pokemon/florges/footprint.png rename to graphics/pokemon/gen_3/milotic/footprint.png diff --git a/graphics/pokemon/milotic/icon.png b/graphics/pokemon/gen_3/milotic/icon.png similarity index 100% rename from graphics/pokemon/milotic/icon.png rename to graphics/pokemon/gen_3/milotic/icon.png diff --git a/graphics/pokemon/milotic/normal.pal b/graphics/pokemon/gen_3/milotic/normal.pal similarity index 100% rename from graphics/pokemon/milotic/normal.pal rename to graphics/pokemon/gen_3/milotic/normal.pal diff --git a/graphics/pokemon/milotic/shiny.pal b/graphics/pokemon/gen_3/milotic/shiny.pal similarity index 100% rename from graphics/pokemon/milotic/shiny.pal rename to graphics/pokemon/gen_3/milotic/shiny.pal diff --git a/graphics/pokemon/minun/anim_front.png b/graphics/pokemon/gen_3/minun/anim_front.png similarity index 100% rename from graphics/pokemon/minun/anim_front.png rename to graphics/pokemon/gen_3/minun/anim_front.png diff --git a/graphics/pokemon/minun/back.png b/graphics/pokemon/gen_3/minun/back.png similarity index 100% rename from graphics/pokemon/minun/back.png rename to graphics/pokemon/gen_3/minun/back.png diff --git a/graphics/pokemon/minun/footprint.png b/graphics/pokemon/gen_3/minun/footprint.png similarity index 100% rename from graphics/pokemon/minun/footprint.png rename to graphics/pokemon/gen_3/minun/footprint.png diff --git a/graphics/pokemon/minun/icon.png b/graphics/pokemon/gen_3/minun/icon.png similarity index 100% rename from graphics/pokemon/minun/icon.png rename to graphics/pokemon/gen_3/minun/icon.png diff --git a/graphics/pokemon/minun/normal.pal b/graphics/pokemon/gen_3/minun/normal.pal similarity index 100% rename from graphics/pokemon/minun/normal.pal rename to graphics/pokemon/gen_3/minun/normal.pal diff --git a/graphics/pokemon/minun/shiny.pal b/graphics/pokemon/gen_3/minun/shiny.pal similarity index 100% rename from graphics/pokemon/minun/shiny.pal rename to graphics/pokemon/gen_3/minun/shiny.pal diff --git a/graphics/pokemon/mudkip/anim_front.png b/graphics/pokemon/gen_3/mudkip/anim_front.png similarity index 100% rename from graphics/pokemon/mudkip/anim_front.png rename to graphics/pokemon/gen_3/mudkip/anim_front.png diff --git a/graphics/pokemon/mudkip/back.png b/graphics/pokemon/gen_3/mudkip/back.png similarity index 100% rename from graphics/pokemon/mudkip/back.png rename to graphics/pokemon/gen_3/mudkip/back.png diff --git a/graphics/pokemon/mudkip/footprint.png b/graphics/pokemon/gen_3/mudkip/footprint.png similarity index 100% rename from graphics/pokemon/mudkip/footprint.png rename to graphics/pokemon/gen_3/mudkip/footprint.png diff --git a/graphics/pokemon/mudkip/icon.png b/graphics/pokemon/gen_3/mudkip/icon.png similarity index 100% rename from graphics/pokemon/mudkip/icon.png rename to graphics/pokemon/gen_3/mudkip/icon.png diff --git a/graphics/pokemon/mudkip/normal.pal b/graphics/pokemon/gen_3/mudkip/normal.pal similarity index 100% rename from graphics/pokemon/mudkip/normal.pal rename to graphics/pokemon/gen_3/mudkip/normal.pal diff --git a/graphics/pokemon/mudkip/shiny.pal b/graphics/pokemon/gen_3/mudkip/shiny.pal similarity index 100% rename from graphics/pokemon/mudkip/shiny.pal rename to graphics/pokemon/gen_3/mudkip/shiny.pal diff --git a/graphics/pokemon/nincada/anim_front.png b/graphics/pokemon/gen_3/nincada/anim_front.png similarity index 100% rename from graphics/pokemon/nincada/anim_front.png rename to graphics/pokemon/gen_3/nincada/anim_front.png diff --git a/graphics/pokemon/nincada/back.png b/graphics/pokemon/gen_3/nincada/back.png similarity index 100% rename from graphics/pokemon/nincada/back.png rename to graphics/pokemon/gen_3/nincada/back.png diff --git a/graphics/pokemon/nincada/footprint.png b/graphics/pokemon/gen_3/nincada/footprint.png similarity index 100% rename from graphics/pokemon/nincada/footprint.png rename to graphics/pokemon/gen_3/nincada/footprint.png diff --git a/graphics/pokemon/nincada/icon.png b/graphics/pokemon/gen_3/nincada/icon.png similarity index 100% rename from graphics/pokemon/nincada/icon.png rename to graphics/pokemon/gen_3/nincada/icon.png diff --git a/graphics/pokemon/nincada/normal.pal b/graphics/pokemon/gen_3/nincada/normal.pal similarity index 100% rename from graphics/pokemon/nincada/normal.pal rename to graphics/pokemon/gen_3/nincada/normal.pal diff --git a/graphics/pokemon/nincada/shiny.pal b/graphics/pokemon/gen_3/nincada/shiny.pal similarity index 100% rename from graphics/pokemon/nincada/shiny.pal rename to graphics/pokemon/gen_3/nincada/shiny.pal diff --git a/graphics/pokemon/ninjask/anim_front.png b/graphics/pokemon/gen_3/ninjask/anim_front.png similarity index 100% rename from graphics/pokemon/ninjask/anim_front.png rename to graphics/pokemon/gen_3/ninjask/anim_front.png diff --git a/graphics/pokemon/ninjask/back.png b/graphics/pokemon/gen_3/ninjask/back.png similarity index 100% rename from graphics/pokemon/ninjask/back.png rename to graphics/pokemon/gen_3/ninjask/back.png diff --git a/graphics/pokemon/ninjask/footprint.png b/graphics/pokemon/gen_3/ninjask/footprint.png similarity index 100% rename from graphics/pokemon/ninjask/footprint.png rename to graphics/pokemon/gen_3/ninjask/footprint.png diff --git a/graphics/pokemon/ninjask/icon.png b/graphics/pokemon/gen_3/ninjask/icon.png similarity index 100% rename from graphics/pokemon/ninjask/icon.png rename to graphics/pokemon/gen_3/ninjask/icon.png diff --git a/graphics/pokemon/ninjask/normal.pal b/graphics/pokemon/gen_3/ninjask/normal.pal similarity index 100% rename from graphics/pokemon/ninjask/normal.pal rename to graphics/pokemon/gen_3/ninjask/normal.pal diff --git a/graphics/pokemon/ninjask/shiny.pal b/graphics/pokemon/gen_3/ninjask/shiny.pal similarity index 100% rename from graphics/pokemon/ninjask/shiny.pal rename to graphics/pokemon/gen_3/ninjask/shiny.pal diff --git a/graphics/pokemon/nosepass/anim_front.png b/graphics/pokemon/gen_3/nosepass/anim_front.png similarity index 100% rename from graphics/pokemon/nosepass/anim_front.png rename to graphics/pokemon/gen_3/nosepass/anim_front.png diff --git a/graphics/pokemon/nosepass/back.png b/graphics/pokemon/gen_3/nosepass/back.png similarity index 100% rename from graphics/pokemon/nosepass/back.png rename to graphics/pokemon/gen_3/nosepass/back.png diff --git a/graphics/pokemon/nosepass/footprint.png b/graphics/pokemon/gen_3/nosepass/footprint.png similarity index 100% rename from graphics/pokemon/nosepass/footprint.png rename to graphics/pokemon/gen_3/nosepass/footprint.png diff --git a/graphics/pokemon/nosepass/icon.png b/graphics/pokemon/gen_3/nosepass/icon.png similarity index 100% rename from graphics/pokemon/nosepass/icon.png rename to graphics/pokemon/gen_3/nosepass/icon.png diff --git a/graphics/pokemon/nosepass/normal.pal b/graphics/pokemon/gen_3/nosepass/normal.pal similarity index 100% rename from graphics/pokemon/nosepass/normal.pal rename to graphics/pokemon/gen_3/nosepass/normal.pal diff --git a/graphics/pokemon/nosepass/shiny.pal b/graphics/pokemon/gen_3/nosepass/shiny.pal similarity index 100% rename from graphics/pokemon/nosepass/shiny.pal rename to graphics/pokemon/gen_3/nosepass/shiny.pal diff --git a/graphics/pokemon/numel/anim_front.png b/graphics/pokemon/gen_3/numel/anim_front.png similarity index 100% rename from graphics/pokemon/numel/anim_front.png rename to graphics/pokemon/gen_3/numel/anim_front.png diff --git a/graphics/pokemon/numel/anim_frontf.png b/graphics/pokemon/gen_3/numel/anim_frontf.png similarity index 100% rename from graphics/pokemon/numel/anim_frontf.png rename to graphics/pokemon/gen_3/numel/anim_frontf.png diff --git a/graphics/pokemon/numel/back.png b/graphics/pokemon/gen_3/numel/back.png similarity index 100% rename from graphics/pokemon/numel/back.png rename to graphics/pokemon/gen_3/numel/back.png diff --git a/graphics/pokemon/numel/backf.png b/graphics/pokemon/gen_3/numel/backf.png similarity index 100% rename from graphics/pokemon/numel/backf.png rename to graphics/pokemon/gen_3/numel/backf.png diff --git a/graphics/pokemon/numel/footprint.png b/graphics/pokemon/gen_3/numel/footprint.png similarity index 100% rename from graphics/pokemon/numel/footprint.png rename to graphics/pokemon/gen_3/numel/footprint.png diff --git a/graphics/pokemon/numel/icon.png b/graphics/pokemon/gen_3/numel/icon.png similarity index 100% rename from graphics/pokemon/numel/icon.png rename to graphics/pokemon/gen_3/numel/icon.png diff --git a/graphics/pokemon/numel/normal.pal b/graphics/pokemon/gen_3/numel/normal.pal similarity index 100% rename from graphics/pokemon/numel/normal.pal rename to graphics/pokemon/gen_3/numel/normal.pal diff --git a/graphics/pokemon/numel/shiny.pal b/graphics/pokemon/gen_3/numel/shiny.pal similarity index 100% rename from graphics/pokemon/numel/shiny.pal rename to graphics/pokemon/gen_3/numel/shiny.pal diff --git a/graphics/pokemon/nuzleaf/anim_front.png b/graphics/pokemon/gen_3/nuzleaf/anim_front.png similarity index 100% rename from graphics/pokemon/nuzleaf/anim_front.png rename to graphics/pokemon/gen_3/nuzleaf/anim_front.png diff --git a/graphics/pokemon/nuzleaf/anim_frontf.png b/graphics/pokemon/gen_3/nuzleaf/anim_frontf.png similarity index 100% rename from graphics/pokemon/nuzleaf/anim_frontf.png rename to graphics/pokemon/gen_3/nuzleaf/anim_frontf.png diff --git a/graphics/pokemon/nuzleaf/back.png b/graphics/pokemon/gen_3/nuzleaf/back.png similarity index 100% rename from graphics/pokemon/nuzleaf/back.png rename to graphics/pokemon/gen_3/nuzleaf/back.png diff --git a/graphics/pokemon/nuzleaf/backf.png b/graphics/pokemon/gen_3/nuzleaf/backf.png similarity index 100% rename from graphics/pokemon/nuzleaf/backf.png rename to graphics/pokemon/gen_3/nuzleaf/backf.png diff --git a/graphics/pokemon/nuzleaf/footprint.png b/graphics/pokemon/gen_3/nuzleaf/footprint.png similarity index 100% rename from graphics/pokemon/nuzleaf/footprint.png rename to graphics/pokemon/gen_3/nuzleaf/footprint.png diff --git a/graphics/pokemon/nuzleaf/icon.png b/graphics/pokemon/gen_3/nuzleaf/icon.png similarity index 100% rename from graphics/pokemon/nuzleaf/icon.png rename to graphics/pokemon/gen_3/nuzleaf/icon.png diff --git a/graphics/pokemon/nuzleaf/normal.pal b/graphics/pokemon/gen_3/nuzleaf/normal.pal similarity index 100% rename from graphics/pokemon/nuzleaf/normal.pal rename to graphics/pokemon/gen_3/nuzleaf/normal.pal diff --git a/graphics/pokemon/nuzleaf/shiny.pal b/graphics/pokemon/gen_3/nuzleaf/shiny.pal similarity index 100% rename from graphics/pokemon/nuzleaf/shiny.pal rename to graphics/pokemon/gen_3/nuzleaf/shiny.pal diff --git a/graphics/pokemon/pelipper/anim_front.png b/graphics/pokemon/gen_3/pelipper/anim_front.png similarity index 100% rename from graphics/pokemon/pelipper/anim_front.png rename to graphics/pokemon/gen_3/pelipper/anim_front.png diff --git a/graphics/pokemon/pelipper/back.png b/graphics/pokemon/gen_3/pelipper/back.png similarity index 100% rename from graphics/pokemon/pelipper/back.png rename to graphics/pokemon/gen_3/pelipper/back.png diff --git a/graphics/pokemon/pelipper/footprint.png b/graphics/pokemon/gen_3/pelipper/footprint.png similarity index 100% rename from graphics/pokemon/pelipper/footprint.png rename to graphics/pokemon/gen_3/pelipper/footprint.png diff --git a/graphics/pokemon/pelipper/icon.png b/graphics/pokemon/gen_3/pelipper/icon.png similarity index 100% rename from graphics/pokemon/pelipper/icon.png rename to graphics/pokemon/gen_3/pelipper/icon.png diff --git a/graphics/pokemon/pelipper/normal.pal b/graphics/pokemon/gen_3/pelipper/normal.pal similarity index 100% rename from graphics/pokemon/pelipper/normal.pal rename to graphics/pokemon/gen_3/pelipper/normal.pal diff --git a/graphics/pokemon/pelipper/shiny.pal b/graphics/pokemon/gen_3/pelipper/shiny.pal similarity index 100% rename from graphics/pokemon/pelipper/shiny.pal rename to graphics/pokemon/gen_3/pelipper/shiny.pal diff --git a/graphics/pokemon/plusle/anim_front.png b/graphics/pokemon/gen_3/plusle/anim_front.png similarity index 100% rename from graphics/pokemon/plusle/anim_front.png rename to graphics/pokemon/gen_3/plusle/anim_front.png diff --git a/graphics/pokemon/plusle/back.png b/graphics/pokemon/gen_3/plusle/back.png similarity index 100% rename from graphics/pokemon/plusle/back.png rename to graphics/pokemon/gen_3/plusle/back.png diff --git a/graphics/pokemon/plusle/footprint.png b/graphics/pokemon/gen_3/plusle/footprint.png similarity index 100% rename from graphics/pokemon/plusle/footprint.png rename to graphics/pokemon/gen_3/plusle/footprint.png diff --git a/graphics/pokemon/plusle/icon.png b/graphics/pokemon/gen_3/plusle/icon.png similarity index 100% rename from graphics/pokemon/plusle/icon.png rename to graphics/pokemon/gen_3/plusle/icon.png diff --git a/graphics/pokemon/plusle/normal.pal b/graphics/pokemon/gen_3/plusle/normal.pal similarity index 100% rename from graphics/pokemon/plusle/normal.pal rename to graphics/pokemon/gen_3/plusle/normal.pal diff --git a/graphics/pokemon/plusle/shiny.pal b/graphics/pokemon/gen_3/plusle/shiny.pal similarity index 100% rename from graphics/pokemon/plusle/shiny.pal rename to graphics/pokemon/gen_3/plusle/shiny.pal diff --git a/graphics/pokemon/poochyena/anim_front.png b/graphics/pokemon/gen_3/poochyena/anim_front.png similarity index 100% rename from graphics/pokemon/poochyena/anim_front.png rename to graphics/pokemon/gen_3/poochyena/anim_front.png diff --git a/graphics/pokemon/poochyena/back.png b/graphics/pokemon/gen_3/poochyena/back.png similarity index 100% rename from graphics/pokemon/poochyena/back.png rename to graphics/pokemon/gen_3/poochyena/back.png diff --git a/graphics/pokemon/poochyena/footprint.png b/graphics/pokemon/gen_3/poochyena/footprint.png similarity index 100% rename from graphics/pokemon/poochyena/footprint.png rename to graphics/pokemon/gen_3/poochyena/footprint.png diff --git a/graphics/pokemon/poochyena/icon.png b/graphics/pokemon/gen_3/poochyena/icon.png similarity index 100% rename from graphics/pokemon/poochyena/icon.png rename to graphics/pokemon/gen_3/poochyena/icon.png diff --git a/graphics/pokemon/poochyena/normal.pal b/graphics/pokemon/gen_3/poochyena/normal.pal similarity index 100% rename from graphics/pokemon/poochyena/normal.pal rename to graphics/pokemon/gen_3/poochyena/normal.pal diff --git a/graphics/pokemon/poochyena/shiny.pal b/graphics/pokemon/gen_3/poochyena/shiny.pal similarity index 100% rename from graphics/pokemon/poochyena/shiny.pal rename to graphics/pokemon/gen_3/poochyena/shiny.pal diff --git a/graphics/pokemon/ralts/anim_front.png b/graphics/pokemon/gen_3/ralts/anim_front.png similarity index 100% rename from graphics/pokemon/ralts/anim_front.png rename to graphics/pokemon/gen_3/ralts/anim_front.png diff --git a/graphics/pokemon/ralts/back.png b/graphics/pokemon/gen_3/ralts/back.png similarity index 100% rename from graphics/pokemon/ralts/back.png rename to graphics/pokemon/gen_3/ralts/back.png diff --git a/graphics/pokemon/durant/footprint.png b/graphics/pokemon/gen_3/ralts/footprint.png similarity index 100% rename from graphics/pokemon/durant/footprint.png rename to graphics/pokemon/gen_3/ralts/footprint.png diff --git a/graphics/pokemon/ralts/icon.png b/graphics/pokemon/gen_3/ralts/icon.png similarity index 100% rename from graphics/pokemon/ralts/icon.png rename to graphics/pokemon/gen_3/ralts/icon.png diff --git a/graphics/pokemon/ralts/normal.pal b/graphics/pokemon/gen_3/ralts/normal.pal similarity index 100% rename from graphics/pokemon/ralts/normal.pal rename to graphics/pokemon/gen_3/ralts/normal.pal diff --git a/graphics/pokemon/ralts/shiny.pal b/graphics/pokemon/gen_3/ralts/shiny.pal similarity index 100% rename from graphics/pokemon/ralts/shiny.pal rename to graphics/pokemon/gen_3/ralts/shiny.pal diff --git a/graphics/pokemon/rayquaza/anim_front.png b/graphics/pokemon/gen_3/rayquaza/anim_front.png similarity index 100% rename from graphics/pokemon/rayquaza/anim_front.png rename to graphics/pokemon/gen_3/rayquaza/anim_front.png diff --git a/graphics/pokemon/rayquaza/back.png b/graphics/pokemon/gen_3/rayquaza/back.png similarity index 100% rename from graphics/pokemon/rayquaza/back.png rename to graphics/pokemon/gen_3/rayquaza/back.png diff --git a/graphics/pokemon/foongus/footprint.png b/graphics/pokemon/gen_3/rayquaza/footprint.png similarity index 100% rename from graphics/pokemon/foongus/footprint.png rename to graphics/pokemon/gen_3/rayquaza/footprint.png diff --git a/graphics/pokemon/rayquaza/icon.png b/graphics/pokemon/gen_3/rayquaza/icon.png similarity index 100% rename from graphics/pokemon/rayquaza/icon.png rename to graphics/pokemon/gen_3/rayquaza/icon.png diff --git a/graphics/pokemon/rayquaza/mega/back.png b/graphics/pokemon/gen_3/rayquaza/mega/back.png similarity index 100% rename from graphics/pokemon/rayquaza/mega/back.png rename to graphics/pokemon/gen_3/rayquaza/mega/back.png diff --git a/graphics/pokemon/rayquaza/mega/front.png b/graphics/pokemon/gen_3/rayquaza/mega/front.png similarity index 100% rename from graphics/pokemon/rayquaza/mega/front.png rename to graphics/pokemon/gen_3/rayquaza/mega/front.png diff --git a/graphics/pokemon/rayquaza/mega/icon.png b/graphics/pokemon/gen_3/rayquaza/mega/icon.png similarity index 100% rename from graphics/pokemon/rayquaza/mega/icon.png rename to graphics/pokemon/gen_3/rayquaza/mega/icon.png diff --git a/graphics/pokemon/rayquaza/mega/normal.pal b/graphics/pokemon/gen_3/rayquaza/mega/normal.pal similarity index 100% rename from graphics/pokemon/rayquaza/mega/normal.pal rename to graphics/pokemon/gen_3/rayquaza/mega/normal.pal diff --git a/graphics/pokemon/rayquaza/mega/shiny.pal b/graphics/pokemon/gen_3/rayquaza/mega/shiny.pal similarity index 100% rename from graphics/pokemon/rayquaza/mega/shiny.pal rename to graphics/pokemon/gen_3/rayquaza/mega/shiny.pal diff --git a/graphics/pokemon/rayquaza/normal.pal b/graphics/pokemon/gen_3/rayquaza/normal.pal similarity index 100% rename from graphics/pokemon/rayquaza/normal.pal rename to graphics/pokemon/gen_3/rayquaza/normal.pal diff --git a/graphics/pokemon/rayquaza/shiny.pal b/graphics/pokemon/gen_3/rayquaza/shiny.pal similarity index 100% rename from graphics/pokemon/rayquaza/shiny.pal rename to graphics/pokemon/gen_3/rayquaza/shiny.pal diff --git a/graphics/pokemon/regice/anim_front.png b/graphics/pokemon/gen_3/regice/anim_front.png similarity index 100% rename from graphics/pokemon/regice/anim_front.png rename to graphics/pokemon/gen_3/regice/anim_front.png diff --git a/graphics/pokemon/regice/back.png b/graphics/pokemon/gen_3/regice/back.png similarity index 100% rename from graphics/pokemon/regice/back.png rename to graphics/pokemon/gen_3/regice/back.png diff --git a/graphics/pokemon/dwebble/footprint.png b/graphics/pokemon/gen_3/regice/footprint.png similarity index 100% rename from graphics/pokemon/dwebble/footprint.png rename to graphics/pokemon/gen_3/regice/footprint.png diff --git a/graphics/pokemon/regice/icon.png b/graphics/pokemon/gen_3/regice/icon.png similarity index 100% rename from graphics/pokemon/regice/icon.png rename to graphics/pokemon/gen_3/regice/icon.png diff --git a/graphics/pokemon/regice/normal.pal b/graphics/pokemon/gen_3/regice/normal.pal similarity index 100% rename from graphics/pokemon/regice/normal.pal rename to graphics/pokemon/gen_3/regice/normal.pal diff --git a/graphics/pokemon/regice/shiny.pal b/graphics/pokemon/gen_3/regice/shiny.pal similarity index 100% rename from graphics/pokemon/regice/shiny.pal rename to graphics/pokemon/gen_3/regice/shiny.pal diff --git a/graphics/pokemon/regirock/anim_front.png b/graphics/pokemon/gen_3/regirock/anim_front.png similarity index 100% rename from graphics/pokemon/regirock/anim_front.png rename to graphics/pokemon/gen_3/regirock/anim_front.png diff --git a/graphics/pokemon/regirock/back.png b/graphics/pokemon/gen_3/regirock/back.png similarity index 100% rename from graphics/pokemon/regirock/back.png rename to graphics/pokemon/gen_3/regirock/back.png diff --git a/graphics/pokemon/regirock/footprint.png b/graphics/pokemon/gen_3/regirock/footprint.png similarity index 100% rename from graphics/pokemon/regirock/footprint.png rename to graphics/pokemon/gen_3/regirock/footprint.png diff --git a/graphics/pokemon/regirock/icon.png b/graphics/pokemon/gen_3/regirock/icon.png similarity index 100% rename from graphics/pokemon/regirock/icon.png rename to graphics/pokemon/gen_3/regirock/icon.png diff --git a/graphics/pokemon/regirock/normal.pal b/graphics/pokemon/gen_3/regirock/normal.pal similarity index 100% rename from graphics/pokemon/regirock/normal.pal rename to graphics/pokemon/gen_3/regirock/normal.pal diff --git a/graphics/pokemon/regirock/shiny.pal b/graphics/pokemon/gen_3/regirock/shiny.pal similarity index 100% rename from graphics/pokemon/regirock/shiny.pal rename to graphics/pokemon/gen_3/regirock/shiny.pal diff --git a/graphics/pokemon/registeel/anim_front.png b/graphics/pokemon/gen_3/registeel/anim_front.png similarity index 100% rename from graphics/pokemon/registeel/anim_front.png rename to graphics/pokemon/gen_3/registeel/anim_front.png diff --git a/graphics/pokemon/registeel/back.png b/graphics/pokemon/gen_3/registeel/back.png similarity index 100% rename from graphics/pokemon/registeel/back.png rename to graphics/pokemon/gen_3/registeel/back.png diff --git a/graphics/pokemon/registeel/footprint.png b/graphics/pokemon/gen_3/registeel/footprint.png similarity index 100% rename from graphics/pokemon/registeel/footprint.png rename to graphics/pokemon/gen_3/registeel/footprint.png diff --git a/graphics/pokemon/registeel/icon.png b/graphics/pokemon/gen_3/registeel/icon.png similarity index 100% rename from graphics/pokemon/registeel/icon.png rename to graphics/pokemon/gen_3/registeel/icon.png diff --git a/graphics/pokemon/registeel/normal.pal b/graphics/pokemon/gen_3/registeel/normal.pal similarity index 100% rename from graphics/pokemon/registeel/normal.pal rename to graphics/pokemon/gen_3/registeel/normal.pal diff --git a/graphics/pokemon/registeel/shiny.pal b/graphics/pokemon/gen_3/registeel/shiny.pal similarity index 100% rename from graphics/pokemon/registeel/shiny.pal rename to graphics/pokemon/gen_3/registeel/shiny.pal diff --git a/graphics/pokemon/relicanth/anim_front.png b/graphics/pokemon/gen_3/relicanth/anim_front.png similarity index 100% rename from graphics/pokemon/relicanth/anim_front.png rename to graphics/pokemon/gen_3/relicanth/anim_front.png diff --git a/graphics/pokemon/relicanth/anim_frontf.png b/graphics/pokemon/gen_3/relicanth/anim_frontf.png similarity index 100% rename from graphics/pokemon/relicanth/anim_frontf.png rename to graphics/pokemon/gen_3/relicanth/anim_frontf.png diff --git a/graphics/pokemon/relicanth/back.png b/graphics/pokemon/gen_3/relicanth/back.png similarity index 100% rename from graphics/pokemon/relicanth/back.png rename to graphics/pokemon/gen_3/relicanth/back.png diff --git a/graphics/pokemon/relicanth/backf.png b/graphics/pokemon/gen_3/relicanth/backf.png similarity index 100% rename from graphics/pokemon/relicanth/backf.png rename to graphics/pokemon/gen_3/relicanth/backf.png diff --git a/graphics/pokemon/forretress/footprint.png b/graphics/pokemon/gen_3/relicanth/footprint.png similarity index 100% rename from graphics/pokemon/forretress/footprint.png rename to graphics/pokemon/gen_3/relicanth/footprint.png diff --git a/graphics/pokemon/relicanth/icon.png b/graphics/pokemon/gen_3/relicanth/icon.png similarity index 100% rename from graphics/pokemon/relicanth/icon.png rename to graphics/pokemon/gen_3/relicanth/icon.png diff --git a/graphics/pokemon/relicanth/normal.pal b/graphics/pokemon/gen_3/relicanth/normal.pal similarity index 100% rename from graphics/pokemon/relicanth/normal.pal rename to graphics/pokemon/gen_3/relicanth/normal.pal diff --git a/graphics/pokemon/relicanth/shiny.pal b/graphics/pokemon/gen_3/relicanth/shiny.pal similarity index 100% rename from graphics/pokemon/relicanth/shiny.pal rename to graphics/pokemon/gen_3/relicanth/shiny.pal diff --git a/graphics/pokemon/roselia/anim_front.png b/graphics/pokemon/gen_3/roselia/anim_front.png similarity index 100% rename from graphics/pokemon/roselia/anim_front.png rename to graphics/pokemon/gen_3/roselia/anim_front.png diff --git a/graphics/pokemon/roselia/anim_frontf.png b/graphics/pokemon/gen_3/roselia/anim_frontf.png similarity index 100% rename from graphics/pokemon/roselia/anim_frontf.png rename to graphics/pokemon/gen_3/roselia/anim_frontf.png diff --git a/graphics/pokemon/roselia/back.png b/graphics/pokemon/gen_3/roselia/back.png similarity index 100% rename from graphics/pokemon/roselia/back.png rename to graphics/pokemon/gen_3/roselia/back.png diff --git a/graphics/pokemon/roselia/backf.png b/graphics/pokemon/gen_3/roselia/backf.png similarity index 100% rename from graphics/pokemon/roselia/backf.png rename to graphics/pokemon/gen_3/roselia/backf.png diff --git a/graphics/pokemon/roselia/footprint.png b/graphics/pokemon/gen_3/roselia/footprint.png similarity index 100% rename from graphics/pokemon/roselia/footprint.png rename to graphics/pokemon/gen_3/roselia/footprint.png diff --git a/graphics/pokemon/roselia/icon.png b/graphics/pokemon/gen_3/roselia/icon.png similarity index 100% rename from graphics/pokemon/roselia/icon.png rename to graphics/pokemon/gen_3/roselia/icon.png diff --git a/graphics/pokemon/roselia/normal.pal b/graphics/pokemon/gen_3/roselia/normal.pal similarity index 100% rename from graphics/pokemon/roselia/normal.pal rename to graphics/pokemon/gen_3/roselia/normal.pal diff --git a/graphics/pokemon/roselia/shiny.pal b/graphics/pokemon/gen_3/roselia/shiny.pal similarity index 100% rename from graphics/pokemon/roselia/shiny.pal rename to graphics/pokemon/gen_3/roselia/shiny.pal diff --git a/graphics/pokemon/sableye/anim_front.png b/graphics/pokemon/gen_3/sableye/anim_front.png similarity index 100% rename from graphics/pokemon/sableye/anim_front.png rename to graphics/pokemon/gen_3/sableye/anim_front.png diff --git a/graphics/pokemon/sableye/back.png b/graphics/pokemon/gen_3/sableye/back.png similarity index 100% rename from graphics/pokemon/sableye/back.png rename to graphics/pokemon/gen_3/sableye/back.png diff --git a/graphics/pokemon/sableye/footprint.png b/graphics/pokemon/gen_3/sableye/footprint.png similarity index 100% rename from graphics/pokemon/sableye/footprint.png rename to graphics/pokemon/gen_3/sableye/footprint.png diff --git a/graphics/pokemon/sableye/icon.png b/graphics/pokemon/gen_3/sableye/icon.png similarity index 100% rename from graphics/pokemon/sableye/icon.png rename to graphics/pokemon/gen_3/sableye/icon.png diff --git a/graphics/pokemon/sableye/mega/back.png b/graphics/pokemon/gen_3/sableye/mega/back.png similarity index 100% rename from graphics/pokemon/sableye/mega/back.png rename to graphics/pokemon/gen_3/sableye/mega/back.png diff --git a/graphics/pokemon/sableye/mega/front.png b/graphics/pokemon/gen_3/sableye/mega/front.png similarity index 100% rename from graphics/pokemon/sableye/mega/front.png rename to graphics/pokemon/gen_3/sableye/mega/front.png diff --git a/graphics/pokemon/sableye/mega/icon.png b/graphics/pokemon/gen_3/sableye/mega/icon.png similarity index 100% rename from graphics/pokemon/sableye/mega/icon.png rename to graphics/pokemon/gen_3/sableye/mega/icon.png diff --git a/graphics/pokemon/sableye/mega/normal.pal b/graphics/pokemon/gen_3/sableye/mega/normal.pal similarity index 100% rename from graphics/pokemon/sableye/mega/normal.pal rename to graphics/pokemon/gen_3/sableye/mega/normal.pal diff --git a/graphics/pokemon/sableye/mega/shiny.pal b/graphics/pokemon/gen_3/sableye/mega/shiny.pal similarity index 100% rename from graphics/pokemon/sableye/mega/shiny.pal rename to graphics/pokemon/gen_3/sableye/mega/shiny.pal diff --git a/graphics/pokemon/sableye/normal.pal b/graphics/pokemon/gen_3/sableye/normal.pal similarity index 100% rename from graphics/pokemon/sableye/normal.pal rename to graphics/pokemon/gen_3/sableye/normal.pal diff --git a/graphics/pokemon/sableye/shiny.pal b/graphics/pokemon/gen_3/sableye/shiny.pal similarity index 100% rename from graphics/pokemon/sableye/shiny.pal rename to graphics/pokemon/gen_3/sableye/shiny.pal diff --git a/graphics/pokemon/salamence/anim_front.png b/graphics/pokemon/gen_3/salamence/anim_front.png similarity index 100% rename from graphics/pokemon/salamence/anim_front.png rename to graphics/pokemon/gen_3/salamence/anim_front.png diff --git a/graphics/pokemon/salamence/back.png b/graphics/pokemon/gen_3/salamence/back.png similarity index 100% rename from graphics/pokemon/salamence/back.png rename to graphics/pokemon/gen_3/salamence/back.png diff --git a/graphics/pokemon/salamence/footprint.png b/graphics/pokemon/gen_3/salamence/footprint.png similarity index 100% rename from graphics/pokemon/salamence/footprint.png rename to graphics/pokemon/gen_3/salamence/footprint.png diff --git a/graphics/pokemon/salamence/icon.png b/graphics/pokemon/gen_3/salamence/icon.png similarity index 100% rename from graphics/pokemon/salamence/icon.png rename to graphics/pokemon/gen_3/salamence/icon.png diff --git a/graphics/pokemon/salamence/mega/back.png b/graphics/pokemon/gen_3/salamence/mega/back.png similarity index 100% rename from graphics/pokemon/salamence/mega/back.png rename to graphics/pokemon/gen_3/salamence/mega/back.png diff --git a/graphics/pokemon/salamence/mega/front.png b/graphics/pokemon/gen_3/salamence/mega/front.png similarity index 100% rename from graphics/pokemon/salamence/mega/front.png rename to graphics/pokemon/gen_3/salamence/mega/front.png diff --git a/graphics/pokemon/salamence/mega/icon.png b/graphics/pokemon/gen_3/salamence/mega/icon.png similarity index 100% rename from graphics/pokemon/salamence/mega/icon.png rename to graphics/pokemon/gen_3/salamence/mega/icon.png diff --git a/graphics/pokemon/salamence/mega/normal.pal b/graphics/pokemon/gen_3/salamence/mega/normal.pal similarity index 100% rename from graphics/pokemon/salamence/mega/normal.pal rename to graphics/pokemon/gen_3/salamence/mega/normal.pal diff --git a/graphics/pokemon/salamence/mega/shiny.pal b/graphics/pokemon/gen_3/salamence/mega/shiny.pal similarity index 100% rename from graphics/pokemon/salamence/mega/shiny.pal rename to graphics/pokemon/gen_3/salamence/mega/shiny.pal diff --git a/graphics/pokemon/salamence/normal.pal b/graphics/pokemon/gen_3/salamence/normal.pal similarity index 100% rename from graphics/pokemon/salamence/normal.pal rename to graphics/pokemon/gen_3/salamence/normal.pal diff --git a/graphics/pokemon/salamence/shiny.pal b/graphics/pokemon/gen_3/salamence/shiny.pal similarity index 100% rename from graphics/pokemon/salamence/shiny.pal rename to graphics/pokemon/gen_3/salamence/shiny.pal diff --git a/graphics/pokemon/sceptile/anim_front.png b/graphics/pokemon/gen_3/sceptile/anim_front.png similarity index 100% rename from graphics/pokemon/sceptile/anim_front.png rename to graphics/pokemon/gen_3/sceptile/anim_front.png diff --git a/graphics/pokemon/sceptile/back.png b/graphics/pokemon/gen_3/sceptile/back.png similarity index 100% rename from graphics/pokemon/sceptile/back.png rename to graphics/pokemon/gen_3/sceptile/back.png diff --git a/graphics/pokemon/sceptile/footprint.png b/graphics/pokemon/gen_3/sceptile/footprint.png similarity index 100% rename from graphics/pokemon/sceptile/footprint.png rename to graphics/pokemon/gen_3/sceptile/footprint.png diff --git a/graphics/pokemon/sceptile/icon.png b/graphics/pokemon/gen_3/sceptile/icon.png similarity index 100% rename from graphics/pokemon/sceptile/icon.png rename to graphics/pokemon/gen_3/sceptile/icon.png diff --git a/graphics/pokemon/sceptile/mega/back.png b/graphics/pokemon/gen_3/sceptile/mega/back.png similarity index 100% rename from graphics/pokemon/sceptile/mega/back.png rename to graphics/pokemon/gen_3/sceptile/mega/back.png diff --git a/graphics/pokemon/sceptile/mega/front.png b/graphics/pokemon/gen_3/sceptile/mega/front.png similarity index 100% rename from graphics/pokemon/sceptile/mega/front.png rename to graphics/pokemon/gen_3/sceptile/mega/front.png diff --git a/graphics/pokemon/sceptile/mega/icon.png b/graphics/pokemon/gen_3/sceptile/mega/icon.png similarity index 100% rename from graphics/pokemon/sceptile/mega/icon.png rename to graphics/pokemon/gen_3/sceptile/mega/icon.png diff --git a/graphics/pokemon/sceptile/mega/normal.pal b/graphics/pokemon/gen_3/sceptile/mega/normal.pal similarity index 100% rename from graphics/pokemon/sceptile/mega/normal.pal rename to graphics/pokemon/gen_3/sceptile/mega/normal.pal diff --git a/graphics/pokemon/sceptile/mega/shiny.pal b/graphics/pokemon/gen_3/sceptile/mega/shiny.pal similarity index 100% rename from graphics/pokemon/sceptile/mega/shiny.pal rename to graphics/pokemon/gen_3/sceptile/mega/shiny.pal diff --git a/graphics/pokemon/sceptile/normal.pal b/graphics/pokemon/gen_3/sceptile/normal.pal similarity index 100% rename from graphics/pokemon/sceptile/normal.pal rename to graphics/pokemon/gen_3/sceptile/normal.pal diff --git a/graphics/pokemon/sceptile/shiny.pal b/graphics/pokemon/gen_3/sceptile/shiny.pal similarity index 100% rename from graphics/pokemon/sceptile/shiny.pal rename to graphics/pokemon/gen_3/sceptile/shiny.pal diff --git a/graphics/pokemon/sealeo/anim_front.png b/graphics/pokemon/gen_3/sealeo/anim_front.png similarity index 100% rename from graphics/pokemon/sealeo/anim_front.png rename to graphics/pokemon/gen_3/sealeo/anim_front.png diff --git a/graphics/pokemon/sealeo/back.png b/graphics/pokemon/gen_3/sealeo/back.png similarity index 100% rename from graphics/pokemon/sealeo/back.png rename to graphics/pokemon/gen_3/sealeo/back.png diff --git a/graphics/pokemon/frillish/footprint.png b/graphics/pokemon/gen_3/sealeo/footprint.png similarity index 100% rename from graphics/pokemon/frillish/footprint.png rename to graphics/pokemon/gen_3/sealeo/footprint.png diff --git a/graphics/pokemon/sealeo/icon.png b/graphics/pokemon/gen_3/sealeo/icon.png similarity index 100% rename from graphics/pokemon/sealeo/icon.png rename to graphics/pokemon/gen_3/sealeo/icon.png diff --git a/graphics/pokemon/sealeo/normal.pal b/graphics/pokemon/gen_3/sealeo/normal.pal similarity index 100% rename from graphics/pokemon/sealeo/normal.pal rename to graphics/pokemon/gen_3/sealeo/normal.pal diff --git a/graphics/pokemon/sealeo/shiny.pal b/graphics/pokemon/gen_3/sealeo/shiny.pal similarity index 100% rename from graphics/pokemon/sealeo/shiny.pal rename to graphics/pokemon/gen_3/sealeo/shiny.pal diff --git a/graphics/pokemon/seedot/anim_front.png b/graphics/pokemon/gen_3/seedot/anim_front.png similarity index 100% rename from graphics/pokemon/seedot/anim_front.png rename to graphics/pokemon/gen_3/seedot/anim_front.png diff --git a/graphics/pokemon/seedot/back.png b/graphics/pokemon/gen_3/seedot/back.png similarity index 100% rename from graphics/pokemon/seedot/back.png rename to graphics/pokemon/gen_3/seedot/back.png diff --git a/graphics/pokemon/seedot/footprint.png b/graphics/pokemon/gen_3/seedot/footprint.png similarity index 100% rename from graphics/pokemon/seedot/footprint.png rename to graphics/pokemon/gen_3/seedot/footprint.png diff --git a/graphics/pokemon/seedot/icon.png b/graphics/pokemon/gen_3/seedot/icon.png similarity index 100% rename from graphics/pokemon/seedot/icon.png rename to graphics/pokemon/gen_3/seedot/icon.png diff --git a/graphics/pokemon/seedot/normal.pal b/graphics/pokemon/gen_3/seedot/normal.pal similarity index 100% rename from graphics/pokemon/seedot/normal.pal rename to graphics/pokemon/gen_3/seedot/normal.pal diff --git a/graphics/pokemon/seedot/shiny.pal b/graphics/pokemon/gen_3/seedot/shiny.pal similarity index 100% rename from graphics/pokemon/seedot/shiny.pal rename to graphics/pokemon/gen_3/seedot/shiny.pal diff --git a/graphics/pokemon/seviper/anim_front.png b/graphics/pokemon/gen_3/seviper/anim_front.png similarity index 100% rename from graphics/pokemon/seviper/anim_front.png rename to graphics/pokemon/gen_3/seviper/anim_front.png diff --git a/graphics/pokemon/seviper/back.png b/graphics/pokemon/gen_3/seviper/back.png similarity index 100% rename from graphics/pokemon/seviper/back.png rename to graphics/pokemon/gen_3/seviper/back.png diff --git a/graphics/pokemon/froslass/footprint.png b/graphics/pokemon/gen_3/seviper/footprint.png similarity index 100% rename from graphics/pokemon/froslass/footprint.png rename to graphics/pokemon/gen_3/seviper/footprint.png diff --git a/graphics/pokemon/seviper/icon.png b/graphics/pokemon/gen_3/seviper/icon.png similarity index 100% rename from graphics/pokemon/seviper/icon.png rename to graphics/pokemon/gen_3/seviper/icon.png diff --git a/graphics/pokemon/seviper/normal.pal b/graphics/pokemon/gen_3/seviper/normal.pal similarity index 100% rename from graphics/pokemon/seviper/normal.pal rename to graphics/pokemon/gen_3/seviper/normal.pal diff --git a/graphics/pokemon/seviper/shiny.pal b/graphics/pokemon/gen_3/seviper/shiny.pal similarity index 100% rename from graphics/pokemon/seviper/shiny.pal rename to graphics/pokemon/gen_3/seviper/shiny.pal diff --git a/graphics/pokemon/sharpedo/anim_front.png b/graphics/pokemon/gen_3/sharpedo/anim_front.png similarity index 100% rename from graphics/pokemon/sharpedo/anim_front.png rename to graphics/pokemon/gen_3/sharpedo/anim_front.png diff --git a/graphics/pokemon/sharpedo/back.png b/graphics/pokemon/gen_3/sharpedo/back.png similarity index 100% rename from graphics/pokemon/sharpedo/back.png rename to graphics/pokemon/gen_3/sharpedo/back.png diff --git a/graphics/pokemon/frosmoth/footprint.png b/graphics/pokemon/gen_3/sharpedo/footprint.png similarity index 100% rename from graphics/pokemon/frosmoth/footprint.png rename to graphics/pokemon/gen_3/sharpedo/footprint.png diff --git a/graphics/pokemon/sharpedo/icon.png b/graphics/pokemon/gen_3/sharpedo/icon.png similarity index 100% rename from graphics/pokemon/sharpedo/icon.png rename to graphics/pokemon/gen_3/sharpedo/icon.png diff --git a/graphics/pokemon/sharpedo/mega/back.png b/graphics/pokemon/gen_3/sharpedo/mega/back.png similarity index 100% rename from graphics/pokemon/sharpedo/mega/back.png rename to graphics/pokemon/gen_3/sharpedo/mega/back.png diff --git a/graphics/pokemon/sharpedo/mega/front.png b/graphics/pokemon/gen_3/sharpedo/mega/front.png similarity index 100% rename from graphics/pokemon/sharpedo/mega/front.png rename to graphics/pokemon/gen_3/sharpedo/mega/front.png diff --git a/graphics/pokemon/sharpedo/mega/icon.png b/graphics/pokemon/gen_3/sharpedo/mega/icon.png similarity index 100% rename from graphics/pokemon/sharpedo/mega/icon.png rename to graphics/pokemon/gen_3/sharpedo/mega/icon.png diff --git a/graphics/pokemon/sharpedo/mega/normal.pal b/graphics/pokemon/gen_3/sharpedo/mega/normal.pal similarity index 100% rename from graphics/pokemon/sharpedo/mega/normal.pal rename to graphics/pokemon/gen_3/sharpedo/mega/normal.pal diff --git a/graphics/pokemon/sharpedo/mega/shiny.pal b/graphics/pokemon/gen_3/sharpedo/mega/shiny.pal similarity index 100% rename from graphics/pokemon/sharpedo/mega/shiny.pal rename to graphics/pokemon/gen_3/sharpedo/mega/shiny.pal diff --git a/graphics/pokemon/sharpedo/normal.pal b/graphics/pokemon/gen_3/sharpedo/normal.pal similarity index 100% rename from graphics/pokemon/sharpedo/normal.pal rename to graphics/pokemon/gen_3/sharpedo/normal.pal diff --git a/graphics/pokemon/sharpedo/shiny.pal b/graphics/pokemon/gen_3/sharpedo/shiny.pal similarity index 100% rename from graphics/pokemon/sharpedo/shiny.pal rename to graphics/pokemon/gen_3/sharpedo/shiny.pal diff --git a/graphics/pokemon/shedinja/anim_front.png b/graphics/pokemon/gen_3/shedinja/anim_front.png similarity index 100% rename from graphics/pokemon/shedinja/anim_front.png rename to graphics/pokemon/gen_3/shedinja/anim_front.png diff --git a/graphics/pokemon/shedinja/back.png b/graphics/pokemon/gen_3/shedinja/back.png similarity index 100% rename from graphics/pokemon/shedinja/back.png rename to graphics/pokemon/gen_3/shedinja/back.png diff --git a/graphics/pokemon/shedinja/footprint.png b/graphics/pokemon/gen_3/shedinja/footprint.png similarity index 100% rename from graphics/pokemon/shedinja/footprint.png rename to graphics/pokemon/gen_3/shedinja/footprint.png diff --git a/graphics/pokemon/shedinja/icon.png b/graphics/pokemon/gen_3/shedinja/icon.png similarity index 100% rename from graphics/pokemon/shedinja/icon.png rename to graphics/pokemon/gen_3/shedinja/icon.png diff --git a/graphics/pokemon/shedinja/normal.pal b/graphics/pokemon/gen_3/shedinja/normal.pal similarity index 100% rename from graphics/pokemon/shedinja/normal.pal rename to graphics/pokemon/gen_3/shedinja/normal.pal diff --git a/graphics/pokemon/shedinja/shiny.pal b/graphics/pokemon/gen_3/shedinja/shiny.pal similarity index 100% rename from graphics/pokemon/shedinja/shiny.pal rename to graphics/pokemon/gen_3/shedinja/shiny.pal diff --git a/graphics/pokemon/shelgon/anim_front.png b/graphics/pokemon/gen_3/shelgon/anim_front.png similarity index 100% rename from graphics/pokemon/shelgon/anim_front.png rename to graphics/pokemon/gen_3/shelgon/anim_front.png diff --git a/graphics/pokemon/shelgon/back.png b/graphics/pokemon/gen_3/shelgon/back.png similarity index 100% rename from graphics/pokemon/shelgon/back.png rename to graphics/pokemon/gen_3/shelgon/back.png diff --git a/graphics/pokemon/shelgon/footprint.png b/graphics/pokemon/gen_3/shelgon/footprint.png similarity index 100% rename from graphics/pokemon/shelgon/footprint.png rename to graphics/pokemon/gen_3/shelgon/footprint.png diff --git a/graphics/pokemon/shelgon/icon.png b/graphics/pokemon/gen_3/shelgon/icon.png similarity index 100% rename from graphics/pokemon/shelgon/icon.png rename to graphics/pokemon/gen_3/shelgon/icon.png diff --git a/graphics/pokemon/shelgon/normal.pal b/graphics/pokemon/gen_3/shelgon/normal.pal similarity index 100% rename from graphics/pokemon/shelgon/normal.pal rename to graphics/pokemon/gen_3/shelgon/normal.pal diff --git a/graphics/pokemon/shelgon/shiny.pal b/graphics/pokemon/gen_3/shelgon/shiny.pal similarity index 100% rename from graphics/pokemon/shelgon/shiny.pal rename to graphics/pokemon/gen_3/shelgon/shiny.pal diff --git a/graphics/pokemon/shiftry/anim_front.png b/graphics/pokemon/gen_3/shiftry/anim_front.png similarity index 100% rename from graphics/pokemon/shiftry/anim_front.png rename to graphics/pokemon/gen_3/shiftry/anim_front.png diff --git a/graphics/pokemon/shiftry/anim_frontf.png b/graphics/pokemon/gen_3/shiftry/anim_frontf.png similarity index 100% rename from graphics/pokemon/shiftry/anim_frontf.png rename to graphics/pokemon/gen_3/shiftry/anim_frontf.png diff --git a/graphics/pokemon/shiftry/back.png b/graphics/pokemon/gen_3/shiftry/back.png similarity index 100% rename from graphics/pokemon/shiftry/back.png rename to graphics/pokemon/gen_3/shiftry/back.png diff --git a/graphics/pokemon/shiftry/backf.png b/graphics/pokemon/gen_3/shiftry/backf.png similarity index 100% rename from graphics/pokemon/shiftry/backf.png rename to graphics/pokemon/gen_3/shiftry/backf.png diff --git a/graphics/pokemon/shiftry/footprint.png b/graphics/pokemon/gen_3/shiftry/footprint.png similarity index 100% rename from graphics/pokemon/shiftry/footprint.png rename to graphics/pokemon/gen_3/shiftry/footprint.png diff --git a/graphics/pokemon/shiftry/icon.png b/graphics/pokemon/gen_3/shiftry/icon.png similarity index 100% rename from graphics/pokemon/shiftry/icon.png rename to graphics/pokemon/gen_3/shiftry/icon.png diff --git a/graphics/pokemon/shiftry/normal.pal b/graphics/pokemon/gen_3/shiftry/normal.pal similarity index 100% rename from graphics/pokemon/shiftry/normal.pal rename to graphics/pokemon/gen_3/shiftry/normal.pal diff --git a/graphics/pokemon/shiftry/shiny.pal b/graphics/pokemon/gen_3/shiftry/shiny.pal similarity index 100% rename from graphics/pokemon/shiftry/shiny.pal rename to graphics/pokemon/gen_3/shiftry/shiny.pal diff --git a/graphics/pokemon/shroomish/anim_front.png b/graphics/pokemon/gen_3/shroomish/anim_front.png similarity index 100% rename from graphics/pokemon/shroomish/anim_front.png rename to graphics/pokemon/gen_3/shroomish/anim_front.png diff --git a/graphics/pokemon/shroomish/back.png b/graphics/pokemon/gen_3/shroomish/back.png similarity index 100% rename from graphics/pokemon/shroomish/back.png rename to graphics/pokemon/gen_3/shroomish/back.png diff --git a/graphics/pokemon/shroomish/footprint.png b/graphics/pokemon/gen_3/shroomish/footprint.png similarity index 100% rename from graphics/pokemon/shroomish/footprint.png rename to graphics/pokemon/gen_3/shroomish/footprint.png diff --git a/graphics/pokemon/shroomish/icon.png b/graphics/pokemon/gen_3/shroomish/icon.png similarity index 100% rename from graphics/pokemon/shroomish/icon.png rename to graphics/pokemon/gen_3/shroomish/icon.png diff --git a/graphics/pokemon/shroomish/normal.pal b/graphics/pokemon/gen_3/shroomish/normal.pal similarity index 100% rename from graphics/pokemon/shroomish/normal.pal rename to graphics/pokemon/gen_3/shroomish/normal.pal diff --git a/graphics/pokemon/shroomish/shiny.pal b/graphics/pokemon/gen_3/shroomish/shiny.pal similarity index 100% rename from graphics/pokemon/shroomish/shiny.pal rename to graphics/pokemon/gen_3/shroomish/shiny.pal diff --git a/graphics/pokemon/shuppet/anim_front.png b/graphics/pokemon/gen_3/shuppet/anim_front.png similarity index 100% rename from graphics/pokemon/shuppet/anim_front.png rename to graphics/pokemon/gen_3/shuppet/anim_front.png diff --git a/graphics/pokemon/shuppet/back.png b/graphics/pokemon/gen_3/shuppet/back.png similarity index 100% rename from graphics/pokemon/shuppet/back.png rename to graphics/pokemon/gen_3/shuppet/back.png diff --git a/graphics/pokemon/gastly/footprint.png b/graphics/pokemon/gen_3/shuppet/footprint.png similarity index 100% rename from graphics/pokemon/gastly/footprint.png rename to graphics/pokemon/gen_3/shuppet/footprint.png diff --git a/graphics/pokemon/shuppet/icon.png b/graphics/pokemon/gen_3/shuppet/icon.png similarity index 100% rename from graphics/pokemon/shuppet/icon.png rename to graphics/pokemon/gen_3/shuppet/icon.png diff --git a/graphics/pokemon/shuppet/normal.pal b/graphics/pokemon/gen_3/shuppet/normal.pal similarity index 100% rename from graphics/pokemon/shuppet/normal.pal rename to graphics/pokemon/gen_3/shuppet/normal.pal diff --git a/graphics/pokemon/shuppet/shiny.pal b/graphics/pokemon/gen_3/shuppet/shiny.pal similarity index 100% rename from graphics/pokemon/shuppet/shiny.pal rename to graphics/pokemon/gen_3/shuppet/shiny.pal diff --git a/graphics/pokemon/silcoon/anim_front.png b/graphics/pokemon/gen_3/silcoon/anim_front.png similarity index 100% rename from graphics/pokemon/silcoon/anim_front.png rename to graphics/pokemon/gen_3/silcoon/anim_front.png diff --git a/graphics/pokemon/silcoon/back.png b/graphics/pokemon/gen_3/silcoon/back.png similarity index 100% rename from graphics/pokemon/silcoon/back.png rename to graphics/pokemon/gen_3/silcoon/back.png diff --git a/graphics/pokemon/geodude/footprint.png b/graphics/pokemon/gen_3/silcoon/footprint.png similarity index 100% rename from graphics/pokemon/geodude/footprint.png rename to graphics/pokemon/gen_3/silcoon/footprint.png diff --git a/graphics/pokemon/silcoon/icon.png b/graphics/pokemon/gen_3/silcoon/icon.png similarity index 100% rename from graphics/pokemon/silcoon/icon.png rename to graphics/pokemon/gen_3/silcoon/icon.png diff --git a/graphics/pokemon/silcoon/normal.pal b/graphics/pokemon/gen_3/silcoon/normal.pal similarity index 100% rename from graphics/pokemon/silcoon/normal.pal rename to graphics/pokemon/gen_3/silcoon/normal.pal diff --git a/graphics/pokemon/silcoon/shiny.pal b/graphics/pokemon/gen_3/silcoon/shiny.pal similarity index 100% rename from graphics/pokemon/silcoon/shiny.pal rename to graphics/pokemon/gen_3/silcoon/shiny.pal diff --git a/graphics/pokemon/skitty/anim_front.png b/graphics/pokemon/gen_3/skitty/anim_front.png similarity index 100% rename from graphics/pokemon/skitty/anim_front.png rename to graphics/pokemon/gen_3/skitty/anim_front.png diff --git a/graphics/pokemon/skitty/back.png b/graphics/pokemon/gen_3/skitty/back.png similarity index 100% rename from graphics/pokemon/skitty/back.png rename to graphics/pokemon/gen_3/skitty/back.png diff --git a/graphics/pokemon/skitty/footprint.png b/graphics/pokemon/gen_3/skitty/footprint.png similarity index 100% rename from graphics/pokemon/skitty/footprint.png rename to graphics/pokemon/gen_3/skitty/footprint.png diff --git a/graphics/pokemon/skitty/icon.png b/graphics/pokemon/gen_3/skitty/icon.png similarity index 100% rename from graphics/pokemon/skitty/icon.png rename to graphics/pokemon/gen_3/skitty/icon.png diff --git a/graphics/pokemon/skitty/normal.pal b/graphics/pokemon/gen_3/skitty/normal.pal similarity index 100% rename from graphics/pokemon/skitty/normal.pal rename to graphics/pokemon/gen_3/skitty/normal.pal diff --git a/graphics/pokemon/skitty/shiny.pal b/graphics/pokemon/gen_3/skitty/shiny.pal similarity index 100% rename from graphics/pokemon/skitty/shiny.pal rename to graphics/pokemon/gen_3/skitty/shiny.pal diff --git a/graphics/pokemon/slaking/anim_front.png b/graphics/pokemon/gen_3/slaking/anim_front.png similarity index 100% rename from graphics/pokemon/slaking/anim_front.png rename to graphics/pokemon/gen_3/slaking/anim_front.png diff --git a/graphics/pokemon/slaking/back.png b/graphics/pokemon/gen_3/slaking/back.png similarity index 100% rename from graphics/pokemon/slaking/back.png rename to graphics/pokemon/gen_3/slaking/back.png diff --git a/graphics/pokemon/slaking/footprint.png b/graphics/pokemon/gen_3/slaking/footprint.png similarity index 100% rename from graphics/pokemon/slaking/footprint.png rename to graphics/pokemon/gen_3/slaking/footprint.png diff --git a/graphics/pokemon/slaking/icon.png b/graphics/pokemon/gen_3/slaking/icon.png similarity index 100% rename from graphics/pokemon/slaking/icon.png rename to graphics/pokemon/gen_3/slaking/icon.png diff --git a/graphics/pokemon/slaking/normal.pal b/graphics/pokemon/gen_3/slaking/normal.pal similarity index 100% rename from graphics/pokemon/slaking/normal.pal rename to graphics/pokemon/gen_3/slaking/normal.pal diff --git a/graphics/pokemon/slaking/shiny.pal b/graphics/pokemon/gen_3/slaking/shiny.pal similarity index 100% rename from graphics/pokemon/slaking/shiny.pal rename to graphics/pokemon/gen_3/slaking/shiny.pal diff --git a/graphics/pokemon/slakoth/anim_front.png b/graphics/pokemon/gen_3/slakoth/anim_front.png similarity index 100% rename from graphics/pokemon/slakoth/anim_front.png rename to graphics/pokemon/gen_3/slakoth/anim_front.png diff --git a/graphics/pokemon/slakoth/back.png b/graphics/pokemon/gen_3/slakoth/back.png similarity index 100% rename from graphics/pokemon/slakoth/back.png rename to graphics/pokemon/gen_3/slakoth/back.png diff --git a/graphics/pokemon/slakoth/footprint.png b/graphics/pokemon/gen_3/slakoth/footprint.png similarity index 100% rename from graphics/pokemon/slakoth/footprint.png rename to graphics/pokemon/gen_3/slakoth/footprint.png diff --git a/graphics/pokemon/slakoth/icon.png b/graphics/pokemon/gen_3/slakoth/icon.png similarity index 100% rename from graphics/pokemon/slakoth/icon.png rename to graphics/pokemon/gen_3/slakoth/icon.png diff --git a/graphics/pokemon/slakoth/normal.pal b/graphics/pokemon/gen_3/slakoth/normal.pal similarity index 100% rename from graphics/pokemon/slakoth/normal.pal rename to graphics/pokemon/gen_3/slakoth/normal.pal diff --git a/graphics/pokemon/slakoth/shiny.pal b/graphics/pokemon/gen_3/slakoth/shiny.pal similarity index 100% rename from graphics/pokemon/slakoth/shiny.pal rename to graphics/pokemon/gen_3/slakoth/shiny.pal diff --git a/graphics/pokemon/snorunt/anim_front.png b/graphics/pokemon/gen_3/snorunt/anim_front.png similarity index 100% rename from graphics/pokemon/snorunt/anim_front.png rename to graphics/pokemon/gen_3/snorunt/anim_front.png diff --git a/graphics/pokemon/snorunt/back.png b/graphics/pokemon/gen_3/snorunt/back.png similarity index 100% rename from graphics/pokemon/snorunt/back.png rename to graphics/pokemon/gen_3/snorunt/back.png diff --git a/graphics/pokemon/snorunt/footprint.png b/graphics/pokemon/gen_3/snorunt/footprint.png similarity index 100% rename from graphics/pokemon/snorunt/footprint.png rename to graphics/pokemon/gen_3/snorunt/footprint.png diff --git a/graphics/pokemon/snorunt/icon.png b/graphics/pokemon/gen_3/snorunt/icon.png similarity index 100% rename from graphics/pokemon/snorunt/icon.png rename to graphics/pokemon/gen_3/snorunt/icon.png diff --git a/graphics/pokemon/snorunt/normal.pal b/graphics/pokemon/gen_3/snorunt/normal.pal similarity index 100% rename from graphics/pokemon/snorunt/normal.pal rename to graphics/pokemon/gen_3/snorunt/normal.pal diff --git a/graphics/pokemon/snorunt/shiny.pal b/graphics/pokemon/gen_3/snorunt/shiny.pal similarity index 100% rename from graphics/pokemon/snorunt/shiny.pal rename to graphics/pokemon/gen_3/snorunt/shiny.pal diff --git a/graphics/pokemon/solrock/anim_front.png b/graphics/pokemon/gen_3/solrock/anim_front.png similarity index 100% rename from graphics/pokemon/solrock/anim_front.png rename to graphics/pokemon/gen_3/solrock/anim_front.png diff --git a/graphics/pokemon/solrock/back.png b/graphics/pokemon/gen_3/solrock/back.png similarity index 100% rename from graphics/pokemon/solrock/back.png rename to graphics/pokemon/gen_3/solrock/back.png diff --git a/graphics/pokemon/glalie/footprint.png b/graphics/pokemon/gen_3/solrock/footprint.png similarity index 100% rename from graphics/pokemon/glalie/footprint.png rename to graphics/pokemon/gen_3/solrock/footprint.png diff --git a/graphics/pokemon/solrock/icon.png b/graphics/pokemon/gen_3/solrock/icon.png similarity index 100% rename from graphics/pokemon/solrock/icon.png rename to graphics/pokemon/gen_3/solrock/icon.png diff --git a/graphics/pokemon/solrock/normal.pal b/graphics/pokemon/gen_3/solrock/normal.pal similarity index 100% rename from graphics/pokemon/solrock/normal.pal rename to graphics/pokemon/gen_3/solrock/normal.pal diff --git a/graphics/pokemon/solrock/shiny.pal b/graphics/pokemon/gen_3/solrock/shiny.pal similarity index 100% rename from graphics/pokemon/solrock/shiny.pal rename to graphics/pokemon/gen_3/solrock/shiny.pal diff --git a/graphics/pokemon/spheal/anim_front.png b/graphics/pokemon/gen_3/spheal/anim_front.png similarity index 100% rename from graphics/pokemon/spheal/anim_front.png rename to graphics/pokemon/gen_3/spheal/anim_front.png diff --git a/graphics/pokemon/spheal/back.png b/graphics/pokemon/gen_3/spheal/back.png similarity index 100% rename from graphics/pokemon/spheal/back.png rename to graphics/pokemon/gen_3/spheal/back.png diff --git a/graphics/pokemon/goldeen/footprint.png b/graphics/pokemon/gen_3/spheal/footprint.png similarity index 100% rename from graphics/pokemon/goldeen/footprint.png rename to graphics/pokemon/gen_3/spheal/footprint.png diff --git a/graphics/pokemon/spheal/icon.png b/graphics/pokemon/gen_3/spheal/icon.png similarity index 100% rename from graphics/pokemon/spheal/icon.png rename to graphics/pokemon/gen_3/spheal/icon.png diff --git a/graphics/pokemon/spheal/normal.pal b/graphics/pokemon/gen_3/spheal/normal.pal similarity index 100% rename from graphics/pokemon/spheal/normal.pal rename to graphics/pokemon/gen_3/spheal/normal.pal diff --git a/graphics/pokemon/spheal/shiny.pal b/graphics/pokemon/gen_3/spheal/shiny.pal similarity index 100% rename from graphics/pokemon/spheal/shiny.pal rename to graphics/pokemon/gen_3/spheal/shiny.pal diff --git a/graphics/pokemon/spinda/anim_front.png b/graphics/pokemon/gen_3/spinda/anim_front.png similarity index 100% rename from graphics/pokemon/spinda/anim_front.png rename to graphics/pokemon/gen_3/spinda/anim_front.png diff --git a/graphics/pokemon/spinda/back.png b/graphics/pokemon/gen_3/spinda/back.png similarity index 100% rename from graphics/pokemon/spinda/back.png rename to graphics/pokemon/gen_3/spinda/back.png diff --git a/graphics/pokemon/spinda/footprint.png b/graphics/pokemon/gen_3/spinda/footprint.png similarity index 100% rename from graphics/pokemon/spinda/footprint.png rename to graphics/pokemon/gen_3/spinda/footprint.png diff --git a/graphics/pokemon/spinda/icon.png b/graphics/pokemon/gen_3/spinda/icon.png similarity index 100% rename from graphics/pokemon/spinda/icon.png rename to graphics/pokemon/gen_3/spinda/icon.png diff --git a/graphics/pokemon/spinda/normal.pal b/graphics/pokemon/gen_3/spinda/normal.pal similarity index 100% rename from graphics/pokemon/spinda/normal.pal rename to graphics/pokemon/gen_3/spinda/normal.pal diff --git a/graphics/pokemon/spinda/shiny.pal b/graphics/pokemon/gen_3/spinda/shiny.pal similarity index 100% rename from graphics/pokemon/spinda/shiny.pal rename to graphics/pokemon/gen_3/spinda/shiny.pal diff --git a/graphics/pokemon/spinda/spots/spot_0.png b/graphics/pokemon/gen_3/spinda/spots/spot_0.png similarity index 100% rename from graphics/pokemon/spinda/spots/spot_0.png rename to graphics/pokemon/gen_3/spinda/spots/spot_0.png diff --git a/graphics/pokemon/spinda/spots/spot_1.png b/graphics/pokemon/gen_3/spinda/spots/spot_1.png similarity index 100% rename from graphics/pokemon/spinda/spots/spot_1.png rename to graphics/pokemon/gen_3/spinda/spots/spot_1.png diff --git a/graphics/pokemon/spinda/spots/spot_2.png b/graphics/pokemon/gen_3/spinda/spots/spot_2.png similarity index 100% rename from graphics/pokemon/spinda/spots/spot_2.png rename to graphics/pokemon/gen_3/spinda/spots/spot_2.png diff --git a/graphics/pokemon/spinda/spots/spot_3.png b/graphics/pokemon/gen_3/spinda/spots/spot_3.png similarity index 100% rename from graphics/pokemon/spinda/spots/spot_3.png rename to graphics/pokemon/gen_3/spinda/spots/spot_3.png diff --git a/graphics/pokemon/spoink/anim_front.png b/graphics/pokemon/gen_3/spoink/anim_front.png similarity index 100% rename from graphics/pokemon/spoink/anim_front.png rename to graphics/pokemon/gen_3/spoink/anim_front.png diff --git a/graphics/pokemon/spoink/back.png b/graphics/pokemon/gen_3/spoink/back.png similarity index 100% rename from graphics/pokemon/spoink/back.png rename to graphics/pokemon/gen_3/spoink/back.png diff --git a/graphics/pokemon/goomy/footprint.png b/graphics/pokemon/gen_3/spoink/footprint.png similarity index 100% rename from graphics/pokemon/goomy/footprint.png rename to graphics/pokemon/gen_3/spoink/footprint.png diff --git a/graphics/pokemon/spoink/icon.png b/graphics/pokemon/gen_3/spoink/icon.png similarity index 100% rename from graphics/pokemon/spoink/icon.png rename to graphics/pokemon/gen_3/spoink/icon.png diff --git a/graphics/pokemon/spoink/normal.pal b/graphics/pokemon/gen_3/spoink/normal.pal similarity index 100% rename from graphics/pokemon/spoink/normal.pal rename to graphics/pokemon/gen_3/spoink/normal.pal diff --git a/graphics/pokemon/spoink/shiny.pal b/graphics/pokemon/gen_3/spoink/shiny.pal similarity index 100% rename from graphics/pokemon/spoink/shiny.pal rename to graphics/pokemon/gen_3/spoink/shiny.pal diff --git a/graphics/pokemon/surskit/anim_front.png b/graphics/pokemon/gen_3/surskit/anim_front.png similarity index 100% rename from graphics/pokemon/surskit/anim_front.png rename to graphics/pokemon/gen_3/surskit/anim_front.png diff --git a/graphics/pokemon/surskit/back.png b/graphics/pokemon/gen_3/surskit/back.png similarity index 100% rename from graphics/pokemon/surskit/back.png rename to graphics/pokemon/gen_3/surskit/back.png diff --git a/graphics/pokemon/surskit/footprint.png b/graphics/pokemon/gen_3/surskit/footprint.png similarity index 100% rename from graphics/pokemon/surskit/footprint.png rename to graphics/pokemon/gen_3/surskit/footprint.png diff --git a/graphics/pokemon/surskit/icon.png b/graphics/pokemon/gen_3/surskit/icon.png similarity index 100% rename from graphics/pokemon/surskit/icon.png rename to graphics/pokemon/gen_3/surskit/icon.png diff --git a/graphics/pokemon/surskit/normal.pal b/graphics/pokemon/gen_3/surskit/normal.pal similarity index 100% rename from graphics/pokemon/surskit/normal.pal rename to graphics/pokemon/gen_3/surskit/normal.pal diff --git a/graphics/pokemon/surskit/shiny.pal b/graphics/pokemon/gen_3/surskit/shiny.pal similarity index 100% rename from graphics/pokemon/surskit/shiny.pal rename to graphics/pokemon/gen_3/surskit/shiny.pal diff --git a/graphics/pokemon/swablu/anim_front.png b/graphics/pokemon/gen_3/swablu/anim_front.png similarity index 100% rename from graphics/pokemon/swablu/anim_front.png rename to graphics/pokemon/gen_3/swablu/anim_front.png diff --git a/graphics/pokemon/swablu/back.png b/graphics/pokemon/gen_3/swablu/back.png similarity index 100% rename from graphics/pokemon/swablu/back.png rename to graphics/pokemon/gen_3/swablu/back.png diff --git a/graphics/pokemon/swablu/footprint.png b/graphics/pokemon/gen_3/swablu/footprint.png similarity index 100% rename from graphics/pokemon/swablu/footprint.png rename to graphics/pokemon/gen_3/swablu/footprint.png diff --git a/graphics/pokemon/swablu/icon.png b/graphics/pokemon/gen_3/swablu/icon.png similarity index 100% rename from graphics/pokemon/swablu/icon.png rename to graphics/pokemon/gen_3/swablu/icon.png diff --git a/graphics/pokemon/swablu/normal.pal b/graphics/pokemon/gen_3/swablu/normal.pal similarity index 100% rename from graphics/pokemon/swablu/normal.pal rename to graphics/pokemon/gen_3/swablu/normal.pal diff --git a/graphics/pokemon/swablu/shiny.pal b/graphics/pokemon/gen_3/swablu/shiny.pal similarity index 100% rename from graphics/pokemon/swablu/shiny.pal rename to graphics/pokemon/gen_3/swablu/shiny.pal diff --git a/graphics/pokemon/swalot/anim_front.png b/graphics/pokemon/gen_3/swalot/anim_front.png similarity index 100% rename from graphics/pokemon/swalot/anim_front.png rename to graphics/pokemon/gen_3/swalot/anim_front.png diff --git a/graphics/pokemon/swalot/anim_frontf.png b/graphics/pokemon/gen_3/swalot/anim_frontf.png similarity index 100% rename from graphics/pokemon/swalot/anim_frontf.png rename to graphics/pokemon/gen_3/swalot/anim_frontf.png diff --git a/graphics/pokemon/swalot/back.png b/graphics/pokemon/gen_3/swalot/back.png similarity index 100% rename from graphics/pokemon/swalot/back.png rename to graphics/pokemon/gen_3/swalot/back.png diff --git a/graphics/pokemon/swalot/backf.png b/graphics/pokemon/gen_3/swalot/backf.png similarity index 100% rename from graphics/pokemon/swalot/backf.png rename to graphics/pokemon/gen_3/swalot/backf.png diff --git a/graphics/pokemon/gorebyss/footprint.png b/graphics/pokemon/gen_3/swalot/footprint.png similarity index 100% rename from graphics/pokemon/gorebyss/footprint.png rename to graphics/pokemon/gen_3/swalot/footprint.png diff --git a/graphics/pokemon/swalot/icon.png b/graphics/pokemon/gen_3/swalot/icon.png similarity index 100% rename from graphics/pokemon/swalot/icon.png rename to graphics/pokemon/gen_3/swalot/icon.png diff --git a/graphics/pokemon/swalot/normal.pal b/graphics/pokemon/gen_3/swalot/normal.pal similarity index 100% rename from graphics/pokemon/swalot/normal.pal rename to graphics/pokemon/gen_3/swalot/normal.pal diff --git a/graphics/pokemon/swalot/shiny.pal b/graphics/pokemon/gen_3/swalot/shiny.pal similarity index 100% rename from graphics/pokemon/swalot/shiny.pal rename to graphics/pokemon/gen_3/swalot/shiny.pal diff --git a/graphics/pokemon/swampert/anim_front.png b/graphics/pokemon/gen_3/swampert/anim_front.png similarity index 100% rename from graphics/pokemon/swampert/anim_front.png rename to graphics/pokemon/gen_3/swampert/anim_front.png diff --git a/graphics/pokemon/swampert/back.png b/graphics/pokemon/gen_3/swampert/back.png similarity index 100% rename from graphics/pokemon/swampert/back.png rename to graphics/pokemon/gen_3/swampert/back.png diff --git a/graphics/pokemon/swampert/footprint.png b/graphics/pokemon/gen_3/swampert/footprint.png similarity index 100% rename from graphics/pokemon/swampert/footprint.png rename to graphics/pokemon/gen_3/swampert/footprint.png diff --git a/graphics/pokemon/swampert/icon.png b/graphics/pokemon/gen_3/swampert/icon.png similarity index 100% rename from graphics/pokemon/swampert/icon.png rename to graphics/pokemon/gen_3/swampert/icon.png diff --git a/graphics/pokemon/swampert/mega/back.png b/graphics/pokemon/gen_3/swampert/mega/back.png similarity index 100% rename from graphics/pokemon/swampert/mega/back.png rename to graphics/pokemon/gen_3/swampert/mega/back.png diff --git a/graphics/pokemon/swampert/mega/front.png b/graphics/pokemon/gen_3/swampert/mega/front.png similarity index 100% rename from graphics/pokemon/swampert/mega/front.png rename to graphics/pokemon/gen_3/swampert/mega/front.png diff --git a/graphics/pokemon/swampert/mega/icon.png b/graphics/pokemon/gen_3/swampert/mega/icon.png similarity index 100% rename from graphics/pokemon/swampert/mega/icon.png rename to graphics/pokemon/gen_3/swampert/mega/icon.png diff --git a/graphics/pokemon/swampert/mega/normal.pal b/graphics/pokemon/gen_3/swampert/mega/normal.pal similarity index 100% rename from graphics/pokemon/swampert/mega/normal.pal rename to graphics/pokemon/gen_3/swampert/mega/normal.pal diff --git a/graphics/pokemon/swampert/mega/shiny.pal b/graphics/pokemon/gen_3/swampert/mega/shiny.pal similarity index 100% rename from graphics/pokemon/swampert/mega/shiny.pal rename to graphics/pokemon/gen_3/swampert/mega/shiny.pal diff --git a/graphics/pokemon/swampert/normal.pal b/graphics/pokemon/gen_3/swampert/normal.pal similarity index 100% rename from graphics/pokemon/swampert/normal.pal rename to graphics/pokemon/gen_3/swampert/normal.pal diff --git a/graphics/pokemon/swampert/shiny.pal b/graphics/pokemon/gen_3/swampert/shiny.pal similarity index 100% rename from graphics/pokemon/swampert/shiny.pal rename to graphics/pokemon/gen_3/swampert/shiny.pal diff --git a/graphics/pokemon/swellow/anim_front.png b/graphics/pokemon/gen_3/swellow/anim_front.png similarity index 100% rename from graphics/pokemon/swellow/anim_front.png rename to graphics/pokemon/gen_3/swellow/anim_front.png diff --git a/graphics/pokemon/swellow/back.png b/graphics/pokemon/gen_3/swellow/back.png similarity index 100% rename from graphics/pokemon/swellow/back.png rename to graphics/pokemon/gen_3/swellow/back.png diff --git a/graphics/pokemon/swellow/footprint.png b/graphics/pokemon/gen_3/swellow/footprint.png similarity index 100% rename from graphics/pokemon/swellow/footprint.png rename to graphics/pokemon/gen_3/swellow/footprint.png diff --git a/graphics/pokemon/swellow/icon.png b/graphics/pokemon/gen_3/swellow/icon.png similarity index 100% rename from graphics/pokemon/swellow/icon.png rename to graphics/pokemon/gen_3/swellow/icon.png diff --git a/graphics/pokemon/swellow/normal.pal b/graphics/pokemon/gen_3/swellow/normal.pal similarity index 100% rename from graphics/pokemon/swellow/normal.pal rename to graphics/pokemon/gen_3/swellow/normal.pal diff --git a/graphics/pokemon/swellow/shiny.pal b/graphics/pokemon/gen_3/swellow/shiny.pal similarity index 100% rename from graphics/pokemon/swellow/shiny.pal rename to graphics/pokemon/gen_3/swellow/shiny.pal diff --git a/graphics/pokemon/taillow/anim_front.png b/graphics/pokemon/gen_3/taillow/anim_front.png similarity index 100% rename from graphics/pokemon/taillow/anim_front.png rename to graphics/pokemon/gen_3/taillow/anim_front.png diff --git a/graphics/pokemon/taillow/back.png b/graphics/pokemon/gen_3/taillow/back.png similarity index 100% rename from graphics/pokemon/taillow/back.png rename to graphics/pokemon/gen_3/taillow/back.png diff --git a/graphics/pokemon/taillow/footprint.png b/graphics/pokemon/gen_3/taillow/footprint.png similarity index 100% rename from graphics/pokemon/taillow/footprint.png rename to graphics/pokemon/gen_3/taillow/footprint.png diff --git a/graphics/pokemon/taillow/icon.png b/graphics/pokemon/gen_3/taillow/icon.png similarity index 100% rename from graphics/pokemon/taillow/icon.png rename to graphics/pokemon/gen_3/taillow/icon.png diff --git a/graphics/pokemon/taillow/normal.pal b/graphics/pokemon/gen_3/taillow/normal.pal similarity index 100% rename from graphics/pokemon/taillow/normal.pal rename to graphics/pokemon/gen_3/taillow/normal.pal diff --git a/graphics/pokemon/taillow/shiny.pal b/graphics/pokemon/gen_3/taillow/shiny.pal similarity index 100% rename from graphics/pokemon/taillow/shiny.pal rename to graphics/pokemon/gen_3/taillow/shiny.pal diff --git a/graphics/pokemon/torchic/anim_front.png b/graphics/pokemon/gen_3/torchic/anim_front.png similarity index 100% rename from graphics/pokemon/torchic/anim_front.png rename to graphics/pokemon/gen_3/torchic/anim_front.png diff --git a/graphics/pokemon/torchic/back.png b/graphics/pokemon/gen_3/torchic/back.png similarity index 100% rename from graphics/pokemon/torchic/back.png rename to graphics/pokemon/gen_3/torchic/back.png diff --git a/graphics/pokemon/torchic/backf.png b/graphics/pokemon/gen_3/torchic/backf.png similarity index 100% rename from graphics/pokemon/torchic/backf.png rename to graphics/pokemon/gen_3/torchic/backf.png diff --git a/graphics/pokemon/torchic/footprint.png b/graphics/pokemon/gen_3/torchic/footprint.png similarity index 100% rename from graphics/pokemon/torchic/footprint.png rename to graphics/pokemon/gen_3/torchic/footprint.png diff --git a/graphics/pokemon/torchic/icon.png b/graphics/pokemon/gen_3/torchic/icon.png similarity index 100% rename from graphics/pokemon/torchic/icon.png rename to graphics/pokemon/gen_3/torchic/icon.png diff --git a/graphics/pokemon/torchic/normal.pal b/graphics/pokemon/gen_3/torchic/normal.pal similarity index 100% rename from graphics/pokemon/torchic/normal.pal rename to graphics/pokemon/gen_3/torchic/normal.pal diff --git a/graphics/pokemon/torchic/shiny.pal b/graphics/pokemon/gen_3/torchic/shiny.pal similarity index 100% rename from graphics/pokemon/torchic/shiny.pal rename to graphics/pokemon/gen_3/torchic/shiny.pal diff --git a/graphics/pokemon/torkoal/anim_front.png b/graphics/pokemon/gen_3/torkoal/anim_front.png similarity index 100% rename from graphics/pokemon/torkoal/anim_front.png rename to graphics/pokemon/gen_3/torkoal/anim_front.png diff --git a/graphics/pokemon/torkoal/back.png b/graphics/pokemon/gen_3/torkoal/back.png similarity index 100% rename from graphics/pokemon/torkoal/back.png rename to graphics/pokemon/gen_3/torkoal/back.png diff --git a/graphics/pokemon/torkoal/footprint.png b/graphics/pokemon/gen_3/torkoal/footprint.png similarity index 100% rename from graphics/pokemon/torkoal/footprint.png rename to graphics/pokemon/gen_3/torkoal/footprint.png diff --git a/graphics/pokemon/torkoal/icon.png b/graphics/pokemon/gen_3/torkoal/icon.png similarity index 100% rename from graphics/pokemon/torkoal/icon.png rename to graphics/pokemon/gen_3/torkoal/icon.png diff --git a/graphics/pokemon/torkoal/normal.pal b/graphics/pokemon/gen_3/torkoal/normal.pal similarity index 100% rename from graphics/pokemon/torkoal/normal.pal rename to graphics/pokemon/gen_3/torkoal/normal.pal diff --git a/graphics/pokemon/torkoal/shiny.pal b/graphics/pokemon/gen_3/torkoal/shiny.pal similarity index 100% rename from graphics/pokemon/torkoal/shiny.pal rename to graphics/pokemon/gen_3/torkoal/shiny.pal diff --git a/graphics/pokemon/trapinch/anim_front.png b/graphics/pokemon/gen_3/trapinch/anim_front.png similarity index 100% rename from graphics/pokemon/trapinch/anim_front.png rename to graphics/pokemon/gen_3/trapinch/anim_front.png diff --git a/graphics/pokemon/trapinch/back.png b/graphics/pokemon/gen_3/trapinch/back.png similarity index 100% rename from graphics/pokemon/trapinch/back.png rename to graphics/pokemon/gen_3/trapinch/back.png diff --git a/graphics/pokemon/trapinch/footprint.png b/graphics/pokemon/gen_3/trapinch/footprint.png similarity index 100% rename from graphics/pokemon/trapinch/footprint.png rename to graphics/pokemon/gen_3/trapinch/footprint.png diff --git a/graphics/pokemon/trapinch/icon.png b/graphics/pokemon/gen_3/trapinch/icon.png similarity index 100% rename from graphics/pokemon/trapinch/icon.png rename to graphics/pokemon/gen_3/trapinch/icon.png diff --git a/graphics/pokemon/trapinch/normal.pal b/graphics/pokemon/gen_3/trapinch/normal.pal similarity index 100% rename from graphics/pokemon/trapinch/normal.pal rename to graphics/pokemon/gen_3/trapinch/normal.pal diff --git a/graphics/pokemon/trapinch/shiny.pal b/graphics/pokemon/gen_3/trapinch/shiny.pal similarity index 100% rename from graphics/pokemon/trapinch/shiny.pal rename to graphics/pokemon/gen_3/trapinch/shiny.pal diff --git a/graphics/pokemon/treecko/anim_front.png b/graphics/pokemon/gen_3/treecko/anim_front.png similarity index 100% rename from graphics/pokemon/treecko/anim_front.png rename to graphics/pokemon/gen_3/treecko/anim_front.png diff --git a/graphics/pokemon/treecko/back.png b/graphics/pokemon/gen_3/treecko/back.png similarity index 100% rename from graphics/pokemon/treecko/back.png rename to graphics/pokemon/gen_3/treecko/back.png diff --git a/graphics/pokemon/treecko/footprint.png b/graphics/pokemon/gen_3/treecko/footprint.png similarity index 100% rename from graphics/pokemon/treecko/footprint.png rename to graphics/pokemon/gen_3/treecko/footprint.png diff --git a/graphics/pokemon/treecko/icon.png b/graphics/pokemon/gen_3/treecko/icon.png similarity index 100% rename from graphics/pokemon/treecko/icon.png rename to graphics/pokemon/gen_3/treecko/icon.png diff --git a/graphics/pokemon/treecko/normal.pal b/graphics/pokemon/gen_3/treecko/normal.pal similarity index 100% rename from graphics/pokemon/treecko/normal.pal rename to graphics/pokemon/gen_3/treecko/normal.pal diff --git a/graphics/pokemon/treecko/shiny.pal b/graphics/pokemon/gen_3/treecko/shiny.pal similarity index 100% rename from graphics/pokemon/treecko/shiny.pal rename to graphics/pokemon/gen_3/treecko/shiny.pal diff --git a/graphics/pokemon/tropius/anim_front.png b/graphics/pokemon/gen_3/tropius/anim_front.png similarity index 100% rename from graphics/pokemon/tropius/anim_front.png rename to graphics/pokemon/gen_3/tropius/anim_front.png diff --git a/graphics/pokemon/tropius/back.png b/graphics/pokemon/gen_3/tropius/back.png similarity index 100% rename from graphics/pokemon/tropius/back.png rename to graphics/pokemon/gen_3/tropius/back.png diff --git a/graphics/pokemon/tropius/footprint.png b/graphics/pokemon/gen_3/tropius/footprint.png similarity index 100% rename from graphics/pokemon/tropius/footprint.png rename to graphics/pokemon/gen_3/tropius/footprint.png diff --git a/graphics/pokemon/tropius/icon.png b/graphics/pokemon/gen_3/tropius/icon.png similarity index 100% rename from graphics/pokemon/tropius/icon.png rename to graphics/pokemon/gen_3/tropius/icon.png diff --git a/graphics/pokemon/tropius/normal.pal b/graphics/pokemon/gen_3/tropius/normal.pal similarity index 100% rename from graphics/pokemon/tropius/normal.pal rename to graphics/pokemon/gen_3/tropius/normal.pal diff --git a/graphics/pokemon/tropius/shiny.pal b/graphics/pokemon/gen_3/tropius/shiny.pal similarity index 100% rename from graphics/pokemon/tropius/shiny.pal rename to graphics/pokemon/gen_3/tropius/shiny.pal diff --git a/graphics/pokemon/vibrava/anim_front.png b/graphics/pokemon/gen_3/vibrava/anim_front.png similarity index 100% rename from graphics/pokemon/vibrava/anim_front.png rename to graphics/pokemon/gen_3/vibrava/anim_front.png diff --git a/graphics/pokemon/vibrava/back.png b/graphics/pokemon/gen_3/vibrava/back.png similarity index 100% rename from graphics/pokemon/vibrava/back.png rename to graphics/pokemon/gen_3/vibrava/back.png diff --git a/graphics/pokemon/vibrava/footprint.png b/graphics/pokemon/gen_3/vibrava/footprint.png similarity index 100% rename from graphics/pokemon/vibrava/footprint.png rename to graphics/pokemon/gen_3/vibrava/footprint.png diff --git a/graphics/pokemon/vibrava/icon.png b/graphics/pokemon/gen_3/vibrava/icon.png similarity index 100% rename from graphics/pokemon/vibrava/icon.png rename to graphics/pokemon/gen_3/vibrava/icon.png diff --git a/graphics/pokemon/vibrava/normal.pal b/graphics/pokemon/gen_3/vibrava/normal.pal similarity index 100% rename from graphics/pokemon/vibrava/normal.pal rename to graphics/pokemon/gen_3/vibrava/normal.pal diff --git a/graphics/pokemon/vibrava/shiny.pal b/graphics/pokemon/gen_3/vibrava/shiny.pal similarity index 100% rename from graphics/pokemon/vibrava/shiny.pal rename to graphics/pokemon/gen_3/vibrava/shiny.pal diff --git a/graphics/pokemon/vigoroth/anim_front.png b/graphics/pokemon/gen_3/vigoroth/anim_front.png similarity index 100% rename from graphics/pokemon/vigoroth/anim_front.png rename to graphics/pokemon/gen_3/vigoroth/anim_front.png diff --git a/graphics/pokemon/vigoroth/back.png b/graphics/pokemon/gen_3/vigoroth/back.png similarity index 100% rename from graphics/pokemon/vigoroth/back.png rename to graphics/pokemon/gen_3/vigoroth/back.png diff --git a/graphics/pokemon/vigoroth/footprint.png b/graphics/pokemon/gen_3/vigoroth/footprint.png similarity index 100% rename from graphics/pokemon/vigoroth/footprint.png rename to graphics/pokemon/gen_3/vigoroth/footprint.png diff --git a/graphics/pokemon/vigoroth/icon.png b/graphics/pokemon/gen_3/vigoroth/icon.png similarity index 100% rename from graphics/pokemon/vigoroth/icon.png rename to graphics/pokemon/gen_3/vigoroth/icon.png diff --git a/graphics/pokemon/vigoroth/normal.pal b/graphics/pokemon/gen_3/vigoroth/normal.pal similarity index 100% rename from graphics/pokemon/vigoroth/normal.pal rename to graphics/pokemon/gen_3/vigoroth/normal.pal diff --git a/graphics/pokemon/vigoroth/shiny.pal b/graphics/pokemon/gen_3/vigoroth/shiny.pal similarity index 100% rename from graphics/pokemon/vigoroth/shiny.pal rename to graphics/pokemon/gen_3/vigoroth/shiny.pal diff --git a/graphics/pokemon/volbeat/anim_front.png b/graphics/pokemon/gen_3/volbeat/anim_front.png similarity index 100% rename from graphics/pokemon/volbeat/anim_front.png rename to graphics/pokemon/gen_3/volbeat/anim_front.png diff --git a/graphics/pokemon/volbeat/back.png b/graphics/pokemon/gen_3/volbeat/back.png similarity index 100% rename from graphics/pokemon/volbeat/back.png rename to graphics/pokemon/gen_3/volbeat/back.png diff --git a/graphics/pokemon/volbeat/footprint.png b/graphics/pokemon/gen_3/volbeat/footprint.png similarity index 100% rename from graphics/pokemon/volbeat/footprint.png rename to graphics/pokemon/gen_3/volbeat/footprint.png diff --git a/graphics/pokemon/volbeat/icon.png b/graphics/pokemon/gen_3/volbeat/icon.png similarity index 100% rename from graphics/pokemon/volbeat/icon.png rename to graphics/pokemon/gen_3/volbeat/icon.png diff --git a/graphics/pokemon/volbeat/normal.pal b/graphics/pokemon/gen_3/volbeat/normal.pal similarity index 100% rename from graphics/pokemon/volbeat/normal.pal rename to graphics/pokemon/gen_3/volbeat/normal.pal diff --git a/graphics/pokemon/volbeat/shiny.pal b/graphics/pokemon/gen_3/volbeat/shiny.pal similarity index 100% rename from graphics/pokemon/volbeat/shiny.pal rename to graphics/pokemon/gen_3/volbeat/shiny.pal diff --git a/graphics/pokemon/wailmer/anim_front.png b/graphics/pokemon/gen_3/wailmer/anim_front.png similarity index 100% rename from graphics/pokemon/wailmer/anim_front.png rename to graphics/pokemon/gen_3/wailmer/anim_front.png diff --git a/graphics/pokemon/wailmer/back.png b/graphics/pokemon/gen_3/wailmer/back.png similarity index 100% rename from graphics/pokemon/wailmer/back.png rename to graphics/pokemon/gen_3/wailmer/back.png diff --git a/graphics/pokemon/grimer/footprint.png b/graphics/pokemon/gen_3/wailmer/footprint.png similarity index 100% rename from graphics/pokemon/grimer/footprint.png rename to graphics/pokemon/gen_3/wailmer/footprint.png diff --git a/graphics/pokemon/wailmer/icon.png b/graphics/pokemon/gen_3/wailmer/icon.png similarity index 100% rename from graphics/pokemon/wailmer/icon.png rename to graphics/pokemon/gen_3/wailmer/icon.png diff --git a/graphics/pokemon/wailmer/normal.pal b/graphics/pokemon/gen_3/wailmer/normal.pal similarity index 100% rename from graphics/pokemon/wailmer/normal.pal rename to graphics/pokemon/gen_3/wailmer/normal.pal diff --git a/graphics/pokemon/wailmer/shiny.pal b/graphics/pokemon/gen_3/wailmer/shiny.pal similarity index 100% rename from graphics/pokemon/wailmer/shiny.pal rename to graphics/pokemon/gen_3/wailmer/shiny.pal diff --git a/graphics/pokemon/wailord/anim_front.png b/graphics/pokemon/gen_3/wailord/anim_front.png similarity index 100% rename from graphics/pokemon/wailord/anim_front.png rename to graphics/pokemon/gen_3/wailord/anim_front.png diff --git a/graphics/pokemon/wailord/back.png b/graphics/pokemon/gen_3/wailord/back.png similarity index 100% rename from graphics/pokemon/wailord/back.png rename to graphics/pokemon/gen_3/wailord/back.png diff --git a/graphics/pokemon/gulpin/footprint.png b/graphics/pokemon/gen_3/wailord/footprint.png similarity index 100% rename from graphics/pokemon/gulpin/footprint.png rename to graphics/pokemon/gen_3/wailord/footprint.png diff --git a/graphics/pokemon/wailord/icon.png b/graphics/pokemon/gen_3/wailord/icon.png similarity index 100% rename from graphics/pokemon/wailord/icon.png rename to graphics/pokemon/gen_3/wailord/icon.png diff --git a/graphics/pokemon/wailord/normal.pal b/graphics/pokemon/gen_3/wailord/normal.pal similarity index 100% rename from graphics/pokemon/wailord/normal.pal rename to graphics/pokemon/gen_3/wailord/normal.pal diff --git a/graphics/pokemon/wailord/shiny.pal b/graphics/pokemon/gen_3/wailord/shiny.pal similarity index 100% rename from graphics/pokemon/wailord/shiny.pal rename to graphics/pokemon/gen_3/wailord/shiny.pal diff --git a/graphics/pokemon/walrein/anim_front.png b/graphics/pokemon/gen_3/walrein/anim_front.png similarity index 100% rename from graphics/pokemon/walrein/anim_front.png rename to graphics/pokemon/gen_3/walrein/anim_front.png diff --git a/graphics/pokemon/walrein/back.png b/graphics/pokemon/gen_3/walrein/back.png similarity index 100% rename from graphics/pokemon/walrein/back.png rename to graphics/pokemon/gen_3/walrein/back.png diff --git a/graphics/pokemon/gyarados/footprint.png b/graphics/pokemon/gen_3/walrein/footprint.png similarity index 100% rename from graphics/pokemon/gyarados/footprint.png rename to graphics/pokemon/gen_3/walrein/footprint.png diff --git a/graphics/pokemon/walrein/icon.png b/graphics/pokemon/gen_3/walrein/icon.png similarity index 100% rename from graphics/pokemon/walrein/icon.png rename to graphics/pokemon/gen_3/walrein/icon.png diff --git a/graphics/pokemon/walrein/normal.pal b/graphics/pokemon/gen_3/walrein/normal.pal similarity index 100% rename from graphics/pokemon/walrein/normal.pal rename to graphics/pokemon/gen_3/walrein/normal.pal diff --git a/graphics/pokemon/walrein/shiny.pal b/graphics/pokemon/gen_3/walrein/shiny.pal similarity index 100% rename from graphics/pokemon/walrein/shiny.pal rename to graphics/pokemon/gen_3/walrein/shiny.pal diff --git a/graphics/pokemon/whiscash/anim_front.png b/graphics/pokemon/gen_3/whiscash/anim_front.png similarity index 100% rename from graphics/pokemon/whiscash/anim_front.png rename to graphics/pokemon/gen_3/whiscash/anim_front.png diff --git a/graphics/pokemon/whiscash/back.png b/graphics/pokemon/gen_3/whiscash/back.png similarity index 100% rename from graphics/pokemon/whiscash/back.png rename to graphics/pokemon/gen_3/whiscash/back.png diff --git a/graphics/pokemon/hatterene/footprint.png b/graphics/pokemon/gen_3/whiscash/footprint.png similarity index 100% rename from graphics/pokemon/hatterene/footprint.png rename to graphics/pokemon/gen_3/whiscash/footprint.png diff --git a/graphics/pokemon/whiscash/icon.png b/graphics/pokemon/gen_3/whiscash/icon.png similarity index 100% rename from graphics/pokemon/whiscash/icon.png rename to graphics/pokemon/gen_3/whiscash/icon.png diff --git a/graphics/pokemon/whiscash/normal.pal b/graphics/pokemon/gen_3/whiscash/normal.pal similarity index 100% rename from graphics/pokemon/whiscash/normal.pal rename to graphics/pokemon/gen_3/whiscash/normal.pal diff --git a/graphics/pokemon/whiscash/shiny.pal b/graphics/pokemon/gen_3/whiscash/shiny.pal similarity index 100% rename from graphics/pokemon/whiscash/shiny.pal rename to graphics/pokemon/gen_3/whiscash/shiny.pal diff --git a/graphics/pokemon/whismur/anim_front.png b/graphics/pokemon/gen_3/whismur/anim_front.png similarity index 100% rename from graphics/pokemon/whismur/anim_front.png rename to graphics/pokemon/gen_3/whismur/anim_front.png diff --git a/graphics/pokemon/whismur/back.png b/graphics/pokemon/gen_3/whismur/back.png similarity index 100% rename from graphics/pokemon/whismur/back.png rename to graphics/pokemon/gen_3/whismur/back.png diff --git a/graphics/pokemon/whismur/footprint.png b/graphics/pokemon/gen_3/whismur/footprint.png similarity index 100% rename from graphics/pokemon/whismur/footprint.png rename to graphics/pokemon/gen_3/whismur/footprint.png diff --git a/graphics/pokemon/whismur/icon.png b/graphics/pokemon/gen_3/whismur/icon.png similarity index 100% rename from graphics/pokemon/whismur/icon.png rename to graphics/pokemon/gen_3/whismur/icon.png diff --git a/graphics/pokemon/whismur/normal.pal b/graphics/pokemon/gen_3/whismur/normal.pal similarity index 100% rename from graphics/pokemon/whismur/normal.pal rename to graphics/pokemon/gen_3/whismur/normal.pal diff --git a/graphics/pokemon/whismur/shiny.pal b/graphics/pokemon/gen_3/whismur/shiny.pal similarity index 100% rename from graphics/pokemon/whismur/shiny.pal rename to graphics/pokemon/gen_3/whismur/shiny.pal diff --git a/graphics/pokemon/wingull/anim_front.png b/graphics/pokemon/gen_3/wingull/anim_front.png similarity index 100% rename from graphics/pokemon/wingull/anim_front.png rename to graphics/pokemon/gen_3/wingull/anim_front.png diff --git a/graphics/pokemon/wingull/back.png b/graphics/pokemon/gen_3/wingull/back.png similarity index 100% rename from graphics/pokemon/wingull/back.png rename to graphics/pokemon/gen_3/wingull/back.png diff --git a/graphics/pokemon/wingull/footprint.png b/graphics/pokemon/gen_3/wingull/footprint.png similarity index 100% rename from graphics/pokemon/wingull/footprint.png rename to graphics/pokemon/gen_3/wingull/footprint.png diff --git a/graphics/pokemon/wingull/icon.png b/graphics/pokemon/gen_3/wingull/icon.png similarity index 100% rename from graphics/pokemon/wingull/icon.png rename to graphics/pokemon/gen_3/wingull/icon.png diff --git a/graphics/pokemon/wingull/normal.pal b/graphics/pokemon/gen_3/wingull/normal.pal similarity index 100% rename from graphics/pokemon/wingull/normal.pal rename to graphics/pokemon/gen_3/wingull/normal.pal diff --git a/graphics/pokemon/wingull/shiny.pal b/graphics/pokemon/gen_3/wingull/shiny.pal similarity index 100% rename from graphics/pokemon/wingull/shiny.pal rename to graphics/pokemon/gen_3/wingull/shiny.pal diff --git a/graphics/pokemon/wurmple/anim_front.png b/graphics/pokemon/gen_3/wurmple/anim_front.png similarity index 100% rename from graphics/pokemon/wurmple/anim_front.png rename to graphics/pokemon/gen_3/wurmple/anim_front.png diff --git a/graphics/pokemon/wurmple/back.png b/graphics/pokemon/gen_3/wurmple/back.png similarity index 100% rename from graphics/pokemon/wurmple/back.png rename to graphics/pokemon/gen_3/wurmple/back.png diff --git a/graphics/pokemon/wurmple/footprint.png b/graphics/pokemon/gen_3/wurmple/footprint.png similarity index 100% rename from graphics/pokemon/wurmple/footprint.png rename to graphics/pokemon/gen_3/wurmple/footprint.png diff --git a/graphics/pokemon/wurmple/icon.png b/graphics/pokemon/gen_3/wurmple/icon.png similarity index 100% rename from graphics/pokemon/wurmple/icon.png rename to graphics/pokemon/gen_3/wurmple/icon.png diff --git a/graphics/pokemon/wurmple/normal.pal b/graphics/pokemon/gen_3/wurmple/normal.pal similarity index 100% rename from graphics/pokemon/wurmple/normal.pal rename to graphics/pokemon/gen_3/wurmple/normal.pal diff --git a/graphics/pokemon/wurmple/shiny.pal b/graphics/pokemon/gen_3/wurmple/shiny.pal similarity index 100% rename from graphics/pokemon/wurmple/shiny.pal rename to graphics/pokemon/gen_3/wurmple/shiny.pal diff --git a/graphics/pokemon/wynaut/anim_front.png b/graphics/pokemon/gen_3/wynaut/anim_front.png similarity index 100% rename from graphics/pokemon/wynaut/anim_front.png rename to graphics/pokemon/gen_3/wynaut/anim_front.png diff --git a/graphics/pokemon/wynaut/back.png b/graphics/pokemon/gen_3/wynaut/back.png similarity index 100% rename from graphics/pokemon/wynaut/back.png rename to graphics/pokemon/gen_3/wynaut/back.png diff --git a/graphics/pokemon/wynaut/footprint.png b/graphics/pokemon/gen_3/wynaut/footprint.png similarity index 100% rename from graphics/pokemon/wynaut/footprint.png rename to graphics/pokemon/gen_3/wynaut/footprint.png diff --git a/graphics/pokemon/wynaut/icon.png b/graphics/pokemon/gen_3/wynaut/icon.png similarity index 100% rename from graphics/pokemon/wynaut/icon.png rename to graphics/pokemon/gen_3/wynaut/icon.png diff --git a/graphics/pokemon/wynaut/normal.pal b/graphics/pokemon/gen_3/wynaut/normal.pal similarity index 100% rename from graphics/pokemon/wynaut/normal.pal rename to graphics/pokemon/gen_3/wynaut/normal.pal diff --git a/graphics/pokemon/wynaut/shiny.pal b/graphics/pokemon/gen_3/wynaut/shiny.pal similarity index 100% rename from graphics/pokemon/wynaut/shiny.pal rename to graphics/pokemon/gen_3/wynaut/shiny.pal diff --git a/graphics/pokemon/zangoose/anim_front.png b/graphics/pokemon/gen_3/zangoose/anim_front.png similarity index 100% rename from graphics/pokemon/zangoose/anim_front.png rename to graphics/pokemon/gen_3/zangoose/anim_front.png diff --git a/graphics/pokemon/zangoose/back.png b/graphics/pokemon/gen_3/zangoose/back.png similarity index 100% rename from graphics/pokemon/zangoose/back.png rename to graphics/pokemon/gen_3/zangoose/back.png diff --git a/graphics/pokemon/zangoose/footprint.png b/graphics/pokemon/gen_3/zangoose/footprint.png similarity index 100% rename from graphics/pokemon/zangoose/footprint.png rename to graphics/pokemon/gen_3/zangoose/footprint.png diff --git a/graphics/pokemon/zangoose/icon.png b/graphics/pokemon/gen_3/zangoose/icon.png similarity index 100% rename from graphics/pokemon/zangoose/icon.png rename to graphics/pokemon/gen_3/zangoose/icon.png diff --git a/graphics/pokemon/zangoose/normal.pal b/graphics/pokemon/gen_3/zangoose/normal.pal similarity index 100% rename from graphics/pokemon/zangoose/normal.pal rename to graphics/pokemon/gen_3/zangoose/normal.pal diff --git a/graphics/pokemon/zangoose/shiny.pal b/graphics/pokemon/gen_3/zangoose/shiny.pal similarity index 100% rename from graphics/pokemon/zangoose/shiny.pal rename to graphics/pokemon/gen_3/zangoose/shiny.pal diff --git a/graphics/pokemon/zigzagoon/anim_front.png b/graphics/pokemon/gen_3/zigzagoon/anim_front.png similarity index 100% rename from graphics/pokemon/zigzagoon/anim_front.png rename to graphics/pokemon/gen_3/zigzagoon/anim_front.png diff --git a/graphics/pokemon/zigzagoon/back.png b/graphics/pokemon/gen_3/zigzagoon/back.png similarity index 100% rename from graphics/pokemon/zigzagoon/back.png rename to graphics/pokemon/gen_3/zigzagoon/back.png diff --git a/graphics/pokemon/zigzagoon/footprint.png b/graphics/pokemon/gen_3/zigzagoon/footprint.png similarity index 100% rename from graphics/pokemon/zigzagoon/footprint.png rename to graphics/pokemon/gen_3/zigzagoon/footprint.png diff --git a/graphics/pokemon/zigzagoon/galarian/back.png b/graphics/pokemon/gen_3/zigzagoon/galarian/back.png similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/back.png rename to graphics/pokemon/gen_3/zigzagoon/galarian/back.png diff --git a/graphics/pokemon/zigzagoon/galarian/front.png b/graphics/pokemon/gen_3/zigzagoon/galarian/front.png similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/front.png rename to graphics/pokemon/gen_3/zigzagoon/galarian/front.png diff --git a/graphics/pokemon/zigzagoon/galarian/icon.png b/graphics/pokemon/gen_3/zigzagoon/galarian/icon.png similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/icon.png rename to graphics/pokemon/gen_3/zigzagoon/galarian/icon.png diff --git a/graphics/pokemon/zigzagoon/galarian/normal.pal b/graphics/pokemon/gen_3/zigzagoon/galarian/normal.pal similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/normal.pal rename to graphics/pokemon/gen_3/zigzagoon/galarian/normal.pal diff --git a/graphics/pokemon/zigzagoon/galarian/shiny.pal b/graphics/pokemon/gen_3/zigzagoon/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/shiny.pal rename to graphics/pokemon/gen_3/zigzagoon/galarian/shiny.pal diff --git a/graphics/pokemon/zigzagoon/icon.png b/graphics/pokemon/gen_3/zigzagoon/icon.png similarity index 100% rename from graphics/pokemon/zigzagoon/icon.png rename to graphics/pokemon/gen_3/zigzagoon/icon.png diff --git a/graphics/pokemon/zigzagoon/normal.pal b/graphics/pokemon/gen_3/zigzagoon/normal.pal similarity index 100% rename from graphics/pokemon/zigzagoon/normal.pal rename to graphics/pokemon/gen_3/zigzagoon/normal.pal diff --git a/graphics/pokemon/zigzagoon/shiny.pal b/graphics/pokemon/gen_3/zigzagoon/shiny.pal similarity index 100% rename from graphics/pokemon/zigzagoon/shiny.pal rename to graphics/pokemon/gen_3/zigzagoon/shiny.pal diff --git a/graphics/pokemon/abomasnow/anim_front.png b/graphics/pokemon/gen_4/abomasnow/anim_front.png similarity index 100% rename from graphics/pokemon/abomasnow/anim_front.png rename to graphics/pokemon/gen_4/abomasnow/anim_front.png diff --git a/graphics/pokemon/abomasnow/anim_frontf.png b/graphics/pokemon/gen_4/abomasnow/anim_frontf.png similarity index 100% rename from graphics/pokemon/abomasnow/anim_frontf.png rename to graphics/pokemon/gen_4/abomasnow/anim_frontf.png diff --git a/graphics/pokemon/abomasnow/back.png b/graphics/pokemon/gen_4/abomasnow/back.png similarity index 100% rename from graphics/pokemon/abomasnow/back.png rename to graphics/pokemon/gen_4/abomasnow/back.png diff --git a/graphics/pokemon/abomasnow/footprint.png b/graphics/pokemon/gen_4/abomasnow/footprint.png similarity index 100% rename from graphics/pokemon/abomasnow/footprint.png rename to graphics/pokemon/gen_4/abomasnow/footprint.png diff --git a/graphics/pokemon/abomasnow/icon.png b/graphics/pokemon/gen_4/abomasnow/icon.png similarity index 100% rename from graphics/pokemon/abomasnow/icon.png rename to graphics/pokemon/gen_4/abomasnow/icon.png diff --git a/graphics/pokemon/abomasnow/mega/back.png b/graphics/pokemon/gen_4/abomasnow/mega/back.png similarity index 100% rename from graphics/pokemon/abomasnow/mega/back.png rename to graphics/pokemon/gen_4/abomasnow/mega/back.png diff --git a/graphics/pokemon/abomasnow/mega/front.png b/graphics/pokemon/gen_4/abomasnow/mega/front.png similarity index 100% rename from graphics/pokemon/abomasnow/mega/front.png rename to graphics/pokemon/gen_4/abomasnow/mega/front.png diff --git a/graphics/pokemon/abomasnow/mega/icon.png b/graphics/pokemon/gen_4/abomasnow/mega/icon.png similarity index 100% rename from graphics/pokemon/abomasnow/mega/icon.png rename to graphics/pokemon/gen_4/abomasnow/mega/icon.png diff --git a/graphics/pokemon/abomasnow/mega/normal.pal b/graphics/pokemon/gen_4/abomasnow/mega/normal.pal similarity index 100% rename from graphics/pokemon/abomasnow/mega/normal.pal rename to graphics/pokemon/gen_4/abomasnow/mega/normal.pal diff --git a/graphics/pokemon/abomasnow/mega/shiny.pal b/graphics/pokemon/gen_4/abomasnow/mega/shiny.pal similarity index 100% rename from graphics/pokemon/abomasnow/mega/shiny.pal rename to graphics/pokemon/gen_4/abomasnow/mega/shiny.pal diff --git a/graphics/pokemon/abomasnow/normal.pal b/graphics/pokemon/gen_4/abomasnow/normal.pal similarity index 100% rename from graphics/pokemon/abomasnow/normal.pal rename to graphics/pokemon/gen_4/abomasnow/normal.pal diff --git a/graphics/pokemon/abomasnow/shiny.pal b/graphics/pokemon/gen_4/abomasnow/shiny.pal similarity index 100% rename from graphics/pokemon/abomasnow/shiny.pal rename to graphics/pokemon/gen_4/abomasnow/shiny.pal diff --git a/graphics/pokemon/ambipom/anim_front.png b/graphics/pokemon/gen_4/ambipom/anim_front.png similarity index 100% rename from graphics/pokemon/ambipom/anim_front.png rename to graphics/pokemon/gen_4/ambipom/anim_front.png diff --git a/graphics/pokemon/ambipom/anim_frontf.png b/graphics/pokemon/gen_4/ambipom/anim_frontf.png similarity index 100% rename from graphics/pokemon/ambipom/anim_frontf.png rename to graphics/pokemon/gen_4/ambipom/anim_frontf.png diff --git a/graphics/pokemon/ambipom/back.png b/graphics/pokemon/gen_4/ambipom/back.png similarity index 100% rename from graphics/pokemon/ambipom/back.png rename to graphics/pokemon/gen_4/ambipom/back.png diff --git a/graphics/pokemon/ambipom/backf.png b/graphics/pokemon/gen_4/ambipom/backf.png similarity index 100% rename from graphics/pokemon/ambipom/backf.png rename to graphics/pokemon/gen_4/ambipom/backf.png diff --git a/graphics/pokemon/ambipom/footprint.png b/graphics/pokemon/gen_4/ambipom/footprint.png similarity index 100% rename from graphics/pokemon/ambipom/footprint.png rename to graphics/pokemon/gen_4/ambipom/footprint.png diff --git a/graphics/pokemon/ambipom/icon.png b/graphics/pokemon/gen_4/ambipom/icon.png similarity index 100% rename from graphics/pokemon/ambipom/icon.png rename to graphics/pokemon/gen_4/ambipom/icon.png diff --git a/graphics/pokemon/ambipom/normal.pal b/graphics/pokemon/gen_4/ambipom/normal.pal similarity index 100% rename from graphics/pokemon/ambipom/normal.pal rename to graphics/pokemon/gen_4/ambipom/normal.pal diff --git a/graphics/pokemon/ambipom/shiny.pal b/graphics/pokemon/gen_4/ambipom/shiny.pal similarity index 100% rename from graphics/pokemon/ambipom/shiny.pal rename to graphics/pokemon/gen_4/ambipom/shiny.pal diff --git a/graphics/pokemon/arceus/anim_front.png b/graphics/pokemon/gen_4/arceus/anim_front.png similarity index 100% rename from graphics/pokemon/arceus/anim_front.png rename to graphics/pokemon/gen_4/arceus/anim_front.png diff --git a/graphics/pokemon/arceus/back.png b/graphics/pokemon/gen_4/arceus/back.png similarity index 100% rename from graphics/pokemon/arceus/back.png rename to graphics/pokemon/gen_4/arceus/back.png diff --git a/graphics/pokemon/arceus/bug/normal.pal b/graphics/pokemon/gen_4/arceus/bug/normal.pal similarity index 100% rename from graphics/pokemon/arceus/bug/normal.pal rename to graphics/pokemon/gen_4/arceus/bug/normal.pal diff --git a/graphics/pokemon/arceus/bug/shiny.pal b/graphics/pokemon/gen_4/arceus/bug/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/bug/shiny.pal rename to graphics/pokemon/gen_4/arceus/bug/shiny.pal diff --git a/graphics/pokemon/arceus/dark/normal.pal b/graphics/pokemon/gen_4/arceus/dark/normal.pal similarity index 100% rename from graphics/pokemon/arceus/dark/normal.pal rename to graphics/pokemon/gen_4/arceus/dark/normal.pal diff --git a/graphics/pokemon/arceus/dark/shiny.pal b/graphics/pokemon/gen_4/arceus/dark/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/dark/shiny.pal rename to graphics/pokemon/gen_4/arceus/dark/shiny.pal diff --git a/graphics/pokemon/arceus/dragon/normal.pal b/graphics/pokemon/gen_4/arceus/dragon/normal.pal similarity index 100% rename from graphics/pokemon/arceus/dragon/normal.pal rename to graphics/pokemon/gen_4/arceus/dragon/normal.pal diff --git a/graphics/pokemon/arceus/dragon/shiny.pal b/graphics/pokemon/gen_4/arceus/dragon/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/dragon/shiny.pal rename to graphics/pokemon/gen_4/arceus/dragon/shiny.pal diff --git a/graphics/pokemon/arceus/electric/normal.pal b/graphics/pokemon/gen_4/arceus/electric/normal.pal similarity index 100% rename from graphics/pokemon/arceus/electric/normal.pal rename to graphics/pokemon/gen_4/arceus/electric/normal.pal diff --git a/graphics/pokemon/arceus/electric/shiny.pal b/graphics/pokemon/gen_4/arceus/electric/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/electric/shiny.pal rename to graphics/pokemon/gen_4/arceus/electric/shiny.pal diff --git a/graphics/pokemon/arceus/fairy/normal.pal b/graphics/pokemon/gen_4/arceus/fairy/normal.pal similarity index 100% rename from graphics/pokemon/arceus/fairy/normal.pal rename to graphics/pokemon/gen_4/arceus/fairy/normal.pal diff --git a/graphics/pokemon/arceus/fairy/shiny.pal b/graphics/pokemon/gen_4/arceus/fairy/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/fairy/shiny.pal rename to graphics/pokemon/gen_4/arceus/fairy/shiny.pal diff --git a/graphics/pokemon/arceus/fighting/normal.pal b/graphics/pokemon/gen_4/arceus/fighting/normal.pal similarity index 100% rename from graphics/pokemon/arceus/fighting/normal.pal rename to graphics/pokemon/gen_4/arceus/fighting/normal.pal diff --git a/graphics/pokemon/arceus/fighting/shiny.pal b/graphics/pokemon/gen_4/arceus/fighting/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/fighting/shiny.pal rename to graphics/pokemon/gen_4/arceus/fighting/shiny.pal diff --git a/graphics/pokemon/arceus/fire/normal.pal b/graphics/pokemon/gen_4/arceus/fire/normal.pal similarity index 100% rename from graphics/pokemon/arceus/fire/normal.pal rename to graphics/pokemon/gen_4/arceus/fire/normal.pal diff --git a/graphics/pokemon/arceus/fire/shiny.pal b/graphics/pokemon/gen_4/arceus/fire/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/fire/shiny.pal rename to graphics/pokemon/gen_4/arceus/fire/shiny.pal diff --git a/graphics/pokemon/arceus/flying/normal.pal b/graphics/pokemon/gen_4/arceus/flying/normal.pal similarity index 100% rename from graphics/pokemon/arceus/flying/normal.pal rename to graphics/pokemon/gen_4/arceus/flying/normal.pal diff --git a/graphics/pokemon/arceus/flying/shiny.pal b/graphics/pokemon/gen_4/arceus/flying/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/flying/shiny.pal rename to graphics/pokemon/gen_4/arceus/flying/shiny.pal diff --git a/graphics/pokemon/arceus/footprint.png b/graphics/pokemon/gen_4/arceus/footprint.png similarity index 100% rename from graphics/pokemon/arceus/footprint.png rename to graphics/pokemon/gen_4/arceus/footprint.png diff --git a/graphics/pokemon/arceus/ghost/normal.pal b/graphics/pokemon/gen_4/arceus/ghost/normal.pal similarity index 100% rename from graphics/pokemon/arceus/ghost/normal.pal rename to graphics/pokemon/gen_4/arceus/ghost/normal.pal diff --git a/graphics/pokemon/arceus/ghost/shiny.pal b/graphics/pokemon/gen_4/arceus/ghost/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/ghost/shiny.pal rename to graphics/pokemon/gen_4/arceus/ghost/shiny.pal diff --git a/graphics/pokemon/arceus/grass/normal.pal b/graphics/pokemon/gen_4/arceus/grass/normal.pal similarity index 100% rename from graphics/pokemon/arceus/grass/normal.pal rename to graphics/pokemon/gen_4/arceus/grass/normal.pal diff --git a/graphics/pokemon/arceus/grass/shiny.pal b/graphics/pokemon/gen_4/arceus/grass/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/grass/shiny.pal rename to graphics/pokemon/gen_4/arceus/grass/shiny.pal diff --git a/graphics/pokemon/arceus/ground/normal.pal b/graphics/pokemon/gen_4/arceus/ground/normal.pal similarity index 100% rename from graphics/pokemon/arceus/ground/normal.pal rename to graphics/pokemon/gen_4/arceus/ground/normal.pal diff --git a/graphics/pokemon/arceus/ground/shiny.pal b/graphics/pokemon/gen_4/arceus/ground/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/ground/shiny.pal rename to graphics/pokemon/gen_4/arceus/ground/shiny.pal diff --git a/graphics/pokemon/arceus/ice/normal.pal b/graphics/pokemon/gen_4/arceus/ice/normal.pal similarity index 100% rename from graphics/pokemon/arceus/ice/normal.pal rename to graphics/pokemon/gen_4/arceus/ice/normal.pal diff --git a/graphics/pokemon/arceus/ice/shiny.pal b/graphics/pokemon/gen_4/arceus/ice/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/ice/shiny.pal rename to graphics/pokemon/gen_4/arceus/ice/shiny.pal diff --git a/graphics/pokemon/arceus/icon.png b/graphics/pokemon/gen_4/arceus/icon.png similarity index 100% rename from graphics/pokemon/arceus/icon.png rename to graphics/pokemon/gen_4/arceus/icon.png diff --git a/graphics/pokemon/arceus/normal.pal b/graphics/pokemon/gen_4/arceus/normal.pal similarity index 100% rename from graphics/pokemon/arceus/normal.pal rename to graphics/pokemon/gen_4/arceus/normal.pal diff --git a/graphics/pokemon/arceus/poison/normal.pal b/graphics/pokemon/gen_4/arceus/poison/normal.pal similarity index 100% rename from graphics/pokemon/arceus/poison/normal.pal rename to graphics/pokemon/gen_4/arceus/poison/normal.pal diff --git a/graphics/pokemon/arceus/poison/shiny.pal b/graphics/pokemon/gen_4/arceus/poison/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/poison/shiny.pal rename to graphics/pokemon/gen_4/arceus/poison/shiny.pal diff --git a/graphics/pokemon/arceus/psychic/normal.pal b/graphics/pokemon/gen_4/arceus/psychic/normal.pal similarity index 100% rename from graphics/pokemon/arceus/psychic/normal.pal rename to graphics/pokemon/gen_4/arceus/psychic/normal.pal diff --git a/graphics/pokemon/arceus/psychic/shiny.pal b/graphics/pokemon/gen_4/arceus/psychic/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/psychic/shiny.pal rename to graphics/pokemon/gen_4/arceus/psychic/shiny.pal diff --git a/graphics/pokemon/arceus/rock/normal.pal b/graphics/pokemon/gen_4/arceus/rock/normal.pal similarity index 100% rename from graphics/pokemon/arceus/rock/normal.pal rename to graphics/pokemon/gen_4/arceus/rock/normal.pal diff --git a/graphics/pokemon/arceus/rock/shiny.pal b/graphics/pokemon/gen_4/arceus/rock/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/rock/shiny.pal rename to graphics/pokemon/gen_4/arceus/rock/shiny.pal diff --git a/graphics/pokemon/arceus/shiny.pal b/graphics/pokemon/gen_4/arceus/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/shiny.pal rename to graphics/pokemon/gen_4/arceus/shiny.pal diff --git a/graphics/pokemon/arceus/steel/normal.pal b/graphics/pokemon/gen_4/arceus/steel/normal.pal similarity index 100% rename from graphics/pokemon/arceus/steel/normal.pal rename to graphics/pokemon/gen_4/arceus/steel/normal.pal diff --git a/graphics/pokemon/arceus/steel/shiny.pal b/graphics/pokemon/gen_4/arceus/steel/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/steel/shiny.pal rename to graphics/pokemon/gen_4/arceus/steel/shiny.pal diff --git a/graphics/pokemon/arceus/water/normal.pal b/graphics/pokemon/gen_4/arceus/water/normal.pal similarity index 100% rename from graphics/pokemon/arceus/water/normal.pal rename to graphics/pokemon/gen_4/arceus/water/normal.pal diff --git a/graphics/pokemon/arceus/water/shiny.pal b/graphics/pokemon/gen_4/arceus/water/shiny.pal similarity index 100% rename from graphics/pokemon/arceus/water/shiny.pal rename to graphics/pokemon/gen_4/arceus/water/shiny.pal diff --git a/graphics/pokemon/azelf/anim_front.png b/graphics/pokemon/gen_4/azelf/anim_front.png similarity index 100% rename from graphics/pokemon/azelf/anim_front.png rename to graphics/pokemon/gen_4/azelf/anim_front.png diff --git a/graphics/pokemon/azelf/back.png b/graphics/pokemon/gen_4/azelf/back.png similarity index 100% rename from graphics/pokemon/azelf/back.png rename to graphics/pokemon/gen_4/azelf/back.png diff --git a/graphics/pokemon/azelf/footprint.png b/graphics/pokemon/gen_4/azelf/footprint.png similarity index 100% rename from graphics/pokemon/azelf/footprint.png rename to graphics/pokemon/gen_4/azelf/footprint.png diff --git a/graphics/pokemon/azelf/icon.png b/graphics/pokemon/gen_4/azelf/icon.png similarity index 100% rename from graphics/pokemon/azelf/icon.png rename to graphics/pokemon/gen_4/azelf/icon.png diff --git a/graphics/pokemon/azelf/normal.pal b/graphics/pokemon/gen_4/azelf/normal.pal similarity index 100% rename from graphics/pokemon/azelf/normal.pal rename to graphics/pokemon/gen_4/azelf/normal.pal diff --git a/graphics/pokemon/azelf/shiny.pal b/graphics/pokemon/gen_4/azelf/shiny.pal similarity index 100% rename from graphics/pokemon/azelf/shiny.pal rename to graphics/pokemon/gen_4/azelf/shiny.pal diff --git a/graphics/pokemon/bastiodon/anim_front.png b/graphics/pokemon/gen_4/bastiodon/anim_front.png similarity index 100% rename from graphics/pokemon/bastiodon/anim_front.png rename to graphics/pokemon/gen_4/bastiodon/anim_front.png diff --git a/graphics/pokemon/bastiodon/back.png b/graphics/pokemon/gen_4/bastiodon/back.png similarity index 100% rename from graphics/pokemon/bastiodon/back.png rename to graphics/pokemon/gen_4/bastiodon/back.png diff --git a/graphics/pokemon/bastiodon/footprint.png b/graphics/pokemon/gen_4/bastiodon/footprint.png similarity index 100% rename from graphics/pokemon/bastiodon/footprint.png rename to graphics/pokemon/gen_4/bastiodon/footprint.png diff --git a/graphics/pokemon/bastiodon/icon.png b/graphics/pokemon/gen_4/bastiodon/icon.png similarity index 100% rename from graphics/pokemon/bastiodon/icon.png rename to graphics/pokemon/gen_4/bastiodon/icon.png diff --git a/graphics/pokemon/bastiodon/normal.pal b/graphics/pokemon/gen_4/bastiodon/normal.pal similarity index 100% rename from graphics/pokemon/bastiodon/normal.pal rename to graphics/pokemon/gen_4/bastiodon/normal.pal diff --git a/graphics/pokemon/bastiodon/shiny.pal b/graphics/pokemon/gen_4/bastiodon/shiny.pal similarity index 100% rename from graphics/pokemon/bastiodon/shiny.pal rename to graphics/pokemon/gen_4/bastiodon/shiny.pal diff --git a/graphics/pokemon/bibarel/anim_front.png b/graphics/pokemon/gen_4/bibarel/anim_front.png similarity index 100% rename from graphics/pokemon/bibarel/anim_front.png rename to graphics/pokemon/gen_4/bibarel/anim_front.png diff --git a/graphics/pokemon/bibarel/anim_frontf.png b/graphics/pokemon/gen_4/bibarel/anim_frontf.png similarity index 100% rename from graphics/pokemon/bibarel/anim_frontf.png rename to graphics/pokemon/gen_4/bibarel/anim_frontf.png diff --git a/graphics/pokemon/bibarel/back.png b/graphics/pokemon/gen_4/bibarel/back.png similarity index 100% rename from graphics/pokemon/bibarel/back.png rename to graphics/pokemon/gen_4/bibarel/back.png diff --git a/graphics/pokemon/bibarel/footprint.png b/graphics/pokemon/gen_4/bibarel/footprint.png similarity index 100% rename from graphics/pokemon/bibarel/footprint.png rename to graphics/pokemon/gen_4/bibarel/footprint.png diff --git a/graphics/pokemon/bibarel/icon.png b/graphics/pokemon/gen_4/bibarel/icon.png similarity index 100% rename from graphics/pokemon/bibarel/icon.png rename to graphics/pokemon/gen_4/bibarel/icon.png diff --git a/graphics/pokemon/bibarel/normal.pal b/graphics/pokemon/gen_4/bibarel/normal.pal similarity index 100% rename from graphics/pokemon/bibarel/normal.pal rename to graphics/pokemon/gen_4/bibarel/normal.pal diff --git a/graphics/pokemon/bibarel/shiny.pal b/graphics/pokemon/gen_4/bibarel/shiny.pal similarity index 100% rename from graphics/pokemon/bibarel/shiny.pal rename to graphics/pokemon/gen_4/bibarel/shiny.pal diff --git a/graphics/pokemon/bidoof/anim_front.png b/graphics/pokemon/gen_4/bidoof/anim_front.png similarity index 100% rename from graphics/pokemon/bidoof/anim_front.png rename to graphics/pokemon/gen_4/bidoof/anim_front.png diff --git a/graphics/pokemon/bidoof/anim_frontf.png b/graphics/pokemon/gen_4/bidoof/anim_frontf.png similarity index 100% rename from graphics/pokemon/bidoof/anim_frontf.png rename to graphics/pokemon/gen_4/bidoof/anim_frontf.png diff --git a/graphics/pokemon/bidoof/back.png b/graphics/pokemon/gen_4/bidoof/back.png similarity index 100% rename from graphics/pokemon/bidoof/back.png rename to graphics/pokemon/gen_4/bidoof/back.png diff --git a/graphics/pokemon/bidoof/backf.png b/graphics/pokemon/gen_4/bidoof/backf.png similarity index 100% rename from graphics/pokemon/bidoof/backf.png rename to graphics/pokemon/gen_4/bidoof/backf.png diff --git a/graphics/pokemon/bidoof/footprint.png b/graphics/pokemon/gen_4/bidoof/footprint.png similarity index 100% rename from graphics/pokemon/bidoof/footprint.png rename to graphics/pokemon/gen_4/bidoof/footprint.png diff --git a/graphics/pokemon/bidoof/icon.png b/graphics/pokemon/gen_4/bidoof/icon.png similarity index 100% rename from graphics/pokemon/bidoof/icon.png rename to graphics/pokemon/gen_4/bidoof/icon.png diff --git a/graphics/pokemon/bidoof/normal.pal b/graphics/pokemon/gen_4/bidoof/normal.pal similarity index 100% rename from graphics/pokemon/bidoof/normal.pal rename to graphics/pokemon/gen_4/bidoof/normal.pal diff --git a/graphics/pokemon/bidoof/shiny.pal b/graphics/pokemon/gen_4/bidoof/shiny.pal similarity index 100% rename from graphics/pokemon/bidoof/shiny.pal rename to graphics/pokemon/gen_4/bidoof/shiny.pal diff --git a/graphics/pokemon/bonsly/anim_front.png b/graphics/pokemon/gen_4/bonsly/anim_front.png similarity index 100% rename from graphics/pokemon/bonsly/anim_front.png rename to graphics/pokemon/gen_4/bonsly/anim_front.png diff --git a/graphics/pokemon/bonsly/back.png b/graphics/pokemon/gen_4/bonsly/back.png similarity index 100% rename from graphics/pokemon/bonsly/back.png rename to graphics/pokemon/gen_4/bonsly/back.png diff --git a/graphics/pokemon/bonsly/footprint.png b/graphics/pokemon/gen_4/bonsly/footprint.png similarity index 100% rename from graphics/pokemon/bonsly/footprint.png rename to graphics/pokemon/gen_4/bonsly/footprint.png diff --git a/graphics/pokemon/bonsly/icon.png b/graphics/pokemon/gen_4/bonsly/icon.png similarity index 100% rename from graphics/pokemon/bonsly/icon.png rename to graphics/pokemon/gen_4/bonsly/icon.png diff --git a/graphics/pokemon/bonsly/normal.pal b/graphics/pokemon/gen_4/bonsly/normal.pal similarity index 100% rename from graphics/pokemon/bonsly/normal.pal rename to graphics/pokemon/gen_4/bonsly/normal.pal diff --git a/graphics/pokemon/bonsly/shiny.pal b/graphics/pokemon/gen_4/bonsly/shiny.pal similarity index 100% rename from graphics/pokemon/bonsly/shiny.pal rename to graphics/pokemon/gen_4/bonsly/shiny.pal diff --git a/graphics/pokemon/bronzong/anim_front.png b/graphics/pokemon/gen_4/bronzong/anim_front.png similarity index 100% rename from graphics/pokemon/bronzong/anim_front.png rename to graphics/pokemon/gen_4/bronzong/anim_front.png diff --git a/graphics/pokemon/bronzong/back.png b/graphics/pokemon/gen_4/bronzong/back.png similarity index 100% rename from graphics/pokemon/bronzong/back.png rename to graphics/pokemon/gen_4/bronzong/back.png diff --git a/graphics/pokemon/haunter/footprint.png b/graphics/pokemon/gen_4/bronzong/footprint.png similarity index 100% rename from graphics/pokemon/haunter/footprint.png rename to graphics/pokemon/gen_4/bronzong/footprint.png diff --git a/graphics/pokemon/bronzong/icon.png b/graphics/pokemon/gen_4/bronzong/icon.png similarity index 100% rename from graphics/pokemon/bronzong/icon.png rename to graphics/pokemon/gen_4/bronzong/icon.png diff --git a/graphics/pokemon/bronzong/normal.pal b/graphics/pokemon/gen_4/bronzong/normal.pal similarity index 100% rename from graphics/pokemon/bronzong/normal.pal rename to graphics/pokemon/gen_4/bronzong/normal.pal diff --git a/graphics/pokemon/bronzong/shiny.pal b/graphics/pokemon/gen_4/bronzong/shiny.pal similarity index 100% rename from graphics/pokemon/bronzong/shiny.pal rename to graphics/pokemon/gen_4/bronzong/shiny.pal diff --git a/graphics/pokemon/bronzor/anim_front.png b/graphics/pokemon/gen_4/bronzor/anim_front.png similarity index 100% rename from graphics/pokemon/bronzor/anim_front.png rename to graphics/pokemon/gen_4/bronzor/anim_front.png diff --git a/graphics/pokemon/bronzor/back.png b/graphics/pokemon/gen_4/bronzor/back.png similarity index 100% rename from graphics/pokemon/bronzor/back.png rename to graphics/pokemon/gen_4/bronzor/back.png diff --git a/graphics/pokemon/honedge/footprint.png b/graphics/pokemon/gen_4/bronzor/footprint.png similarity index 100% rename from graphics/pokemon/honedge/footprint.png rename to graphics/pokemon/gen_4/bronzor/footprint.png diff --git a/graphics/pokemon/bronzor/icon.png b/graphics/pokemon/gen_4/bronzor/icon.png similarity index 100% rename from graphics/pokemon/bronzor/icon.png rename to graphics/pokemon/gen_4/bronzor/icon.png diff --git a/graphics/pokemon/bronzor/normal.pal b/graphics/pokemon/gen_4/bronzor/normal.pal similarity index 100% rename from graphics/pokemon/bronzor/normal.pal rename to graphics/pokemon/gen_4/bronzor/normal.pal diff --git a/graphics/pokemon/bronzor/shiny.pal b/graphics/pokemon/gen_4/bronzor/shiny.pal similarity index 100% rename from graphics/pokemon/bronzor/shiny.pal rename to graphics/pokemon/gen_4/bronzor/shiny.pal diff --git a/graphics/pokemon/budew/anim_front.png b/graphics/pokemon/gen_4/budew/anim_front.png similarity index 100% rename from graphics/pokemon/budew/anim_front.png rename to graphics/pokemon/gen_4/budew/anim_front.png diff --git a/graphics/pokemon/budew/back.png b/graphics/pokemon/gen_4/budew/back.png similarity index 100% rename from graphics/pokemon/budew/back.png rename to graphics/pokemon/gen_4/budew/back.png diff --git a/graphics/pokemon/buzzwole/footprint.png b/graphics/pokemon/gen_4/budew/footprint.png similarity index 100% rename from graphics/pokemon/buzzwole/footprint.png rename to graphics/pokemon/gen_4/budew/footprint.png diff --git a/graphics/pokemon/budew/icon.png b/graphics/pokemon/gen_4/budew/icon.png similarity index 100% rename from graphics/pokemon/budew/icon.png rename to graphics/pokemon/gen_4/budew/icon.png diff --git a/graphics/pokemon/budew/normal.pal b/graphics/pokemon/gen_4/budew/normal.pal similarity index 100% rename from graphics/pokemon/budew/normal.pal rename to graphics/pokemon/gen_4/budew/normal.pal diff --git a/graphics/pokemon/budew/shiny.pal b/graphics/pokemon/gen_4/budew/shiny.pal similarity index 100% rename from graphics/pokemon/budew/shiny.pal rename to graphics/pokemon/gen_4/budew/shiny.pal diff --git a/graphics/pokemon/buizel/anim_front.png b/graphics/pokemon/gen_4/buizel/anim_front.png similarity index 100% rename from graphics/pokemon/buizel/anim_front.png rename to graphics/pokemon/gen_4/buizel/anim_front.png diff --git a/graphics/pokemon/buizel/back.png b/graphics/pokemon/gen_4/buizel/back.png similarity index 100% rename from graphics/pokemon/buizel/back.png rename to graphics/pokemon/gen_4/buizel/back.png diff --git a/graphics/pokemon/buizel/backf.png b/graphics/pokemon/gen_4/buizel/backf.png similarity index 100% rename from graphics/pokemon/buizel/backf.png rename to graphics/pokemon/gen_4/buizel/backf.png diff --git a/graphics/pokemon/buizel/footprint.png b/graphics/pokemon/gen_4/buizel/footprint.png similarity index 100% rename from graphics/pokemon/buizel/footprint.png rename to graphics/pokemon/gen_4/buizel/footprint.png diff --git a/graphics/pokemon/buizel/icon.png b/graphics/pokemon/gen_4/buizel/icon.png similarity index 100% rename from graphics/pokemon/buizel/icon.png rename to graphics/pokemon/gen_4/buizel/icon.png diff --git a/graphics/pokemon/buizel/normal.pal b/graphics/pokemon/gen_4/buizel/normal.pal similarity index 100% rename from graphics/pokemon/buizel/normal.pal rename to graphics/pokemon/gen_4/buizel/normal.pal diff --git a/graphics/pokemon/buizel/shiny.pal b/graphics/pokemon/gen_4/buizel/shiny.pal similarity index 100% rename from graphics/pokemon/buizel/shiny.pal rename to graphics/pokemon/gen_4/buizel/shiny.pal diff --git a/graphics/pokemon/buneary/anim_front.png b/graphics/pokemon/gen_4/buneary/anim_front.png similarity index 100% rename from graphics/pokemon/buneary/anim_front.png rename to graphics/pokemon/gen_4/buneary/anim_front.png diff --git a/graphics/pokemon/buneary/back.png b/graphics/pokemon/gen_4/buneary/back.png similarity index 100% rename from graphics/pokemon/buneary/back.png rename to graphics/pokemon/gen_4/buneary/back.png diff --git a/graphics/pokemon/buneary/footprint.png b/graphics/pokemon/gen_4/buneary/footprint.png similarity index 100% rename from graphics/pokemon/buneary/footprint.png rename to graphics/pokemon/gen_4/buneary/footprint.png diff --git a/graphics/pokemon/buneary/icon.png b/graphics/pokemon/gen_4/buneary/icon.png similarity index 100% rename from graphics/pokemon/buneary/icon.png rename to graphics/pokemon/gen_4/buneary/icon.png diff --git a/graphics/pokemon/buneary/normal.pal b/graphics/pokemon/gen_4/buneary/normal.pal similarity index 100% rename from graphics/pokemon/buneary/normal.pal rename to graphics/pokemon/gen_4/buneary/normal.pal diff --git a/graphics/pokemon/buneary/shiny.pal b/graphics/pokemon/gen_4/buneary/shiny.pal similarity index 100% rename from graphics/pokemon/buneary/shiny.pal rename to graphics/pokemon/gen_4/buneary/shiny.pal diff --git a/graphics/pokemon/burmy/anim_front.png b/graphics/pokemon/gen_4/burmy/anim_front.png similarity index 100% rename from graphics/pokemon/burmy/anim_front.png rename to graphics/pokemon/gen_4/burmy/anim_front.png diff --git a/graphics/pokemon/burmy/back.png b/graphics/pokemon/gen_4/burmy/back.png similarity index 100% rename from graphics/pokemon/burmy/back.png rename to graphics/pokemon/gen_4/burmy/back.png diff --git a/graphics/pokemon/burmy/icon.png b/graphics/pokemon/gen_4/burmy/icon.png similarity index 100% rename from graphics/pokemon/burmy/icon.png rename to graphics/pokemon/gen_4/burmy/icon.png diff --git a/graphics/pokemon/burmy/normal.pal b/graphics/pokemon/gen_4/burmy/normal.pal similarity index 100% rename from graphics/pokemon/burmy/normal.pal rename to graphics/pokemon/gen_4/burmy/normal.pal diff --git a/graphics/pokemon/hoopa/footprint.png b/graphics/pokemon/gen_4/burmy/plant/footprint.png similarity index 100% rename from graphics/pokemon/hoopa/footprint.png rename to graphics/pokemon/gen_4/burmy/plant/footprint.png diff --git a/graphics/pokemon/burmy/sandy_cloak/anim_front.png b/graphics/pokemon/gen_4/burmy/sandy_cloak/anim_front.png similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/anim_front.png rename to graphics/pokemon/gen_4/burmy/sandy_cloak/anim_front.png diff --git a/graphics/pokemon/burmy/sandy_cloak/back.png b/graphics/pokemon/gen_4/burmy/sandy_cloak/back.png similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/back.png rename to graphics/pokemon/gen_4/burmy/sandy_cloak/back.png diff --git a/graphics/pokemon/burmy/sandy_cloak/icon.png b/graphics/pokemon/gen_4/burmy/sandy_cloak/icon.png similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/icon.png rename to graphics/pokemon/gen_4/burmy/sandy_cloak/icon.png diff --git a/graphics/pokemon/burmy/sandy_cloak/normal.pal b/graphics/pokemon/gen_4/burmy/sandy_cloak/normal.pal similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/normal.pal rename to graphics/pokemon/gen_4/burmy/sandy_cloak/normal.pal diff --git a/graphics/pokemon/burmy/sandy_cloak/shiny.pal b/graphics/pokemon/gen_4/burmy/sandy_cloak/shiny.pal similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/shiny.pal rename to graphics/pokemon/gen_4/burmy/sandy_cloak/shiny.pal diff --git a/graphics/pokemon/burmy/shiny.pal b/graphics/pokemon/gen_4/burmy/shiny.pal similarity index 100% rename from graphics/pokemon/burmy/shiny.pal rename to graphics/pokemon/gen_4/burmy/shiny.pal diff --git a/graphics/pokemon/burmy/trash_cloak/anim_front.png b/graphics/pokemon/gen_4/burmy/trash_cloak/anim_front.png similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/anim_front.png rename to graphics/pokemon/gen_4/burmy/trash_cloak/anim_front.png diff --git a/graphics/pokemon/burmy/trash_cloak/back.png b/graphics/pokemon/gen_4/burmy/trash_cloak/back.png similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/back.png rename to graphics/pokemon/gen_4/burmy/trash_cloak/back.png diff --git a/graphics/pokemon/burmy/trash_cloak/icon.png b/graphics/pokemon/gen_4/burmy/trash_cloak/icon.png similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/icon.png rename to graphics/pokemon/gen_4/burmy/trash_cloak/icon.png diff --git a/graphics/pokemon/burmy/trash_cloak/normal.pal b/graphics/pokemon/gen_4/burmy/trash_cloak/normal.pal similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/normal.pal rename to graphics/pokemon/gen_4/burmy/trash_cloak/normal.pal diff --git a/graphics/pokemon/burmy/trash_cloak/shiny.pal b/graphics/pokemon/gen_4/burmy/trash_cloak/shiny.pal similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/shiny.pal rename to graphics/pokemon/gen_4/burmy/trash_cloak/shiny.pal diff --git a/graphics/pokemon/carnivine/anim_front.png b/graphics/pokemon/gen_4/carnivine/anim_front.png similarity index 100% rename from graphics/pokemon/carnivine/anim_front.png rename to graphics/pokemon/gen_4/carnivine/anim_front.png diff --git a/graphics/pokemon/carnivine/back.png b/graphics/pokemon/gen_4/carnivine/back.png similarity index 100% rename from graphics/pokemon/carnivine/back.png rename to graphics/pokemon/gen_4/carnivine/back.png diff --git a/graphics/pokemon/horsea/footprint.png b/graphics/pokemon/gen_4/carnivine/footprint.png similarity index 100% rename from graphics/pokemon/horsea/footprint.png rename to graphics/pokemon/gen_4/carnivine/footprint.png diff --git a/graphics/pokemon/carnivine/icon.png b/graphics/pokemon/gen_4/carnivine/icon.png similarity index 100% rename from graphics/pokemon/carnivine/icon.png rename to graphics/pokemon/gen_4/carnivine/icon.png diff --git a/graphics/pokemon/carnivine/normal.pal b/graphics/pokemon/gen_4/carnivine/normal.pal similarity index 100% rename from graphics/pokemon/carnivine/normal.pal rename to graphics/pokemon/gen_4/carnivine/normal.pal diff --git a/graphics/pokemon/carnivine/shiny.pal b/graphics/pokemon/gen_4/carnivine/shiny.pal similarity index 100% rename from graphics/pokemon/carnivine/shiny.pal rename to graphics/pokemon/gen_4/carnivine/shiny.pal diff --git a/graphics/pokemon/chatot/anim_front.png b/graphics/pokemon/gen_4/chatot/anim_front.png similarity index 100% rename from graphics/pokemon/chatot/anim_front.png rename to graphics/pokemon/gen_4/chatot/anim_front.png diff --git a/graphics/pokemon/chatot/back.png b/graphics/pokemon/gen_4/chatot/back.png similarity index 100% rename from graphics/pokemon/chatot/back.png rename to graphics/pokemon/gen_4/chatot/back.png diff --git a/graphics/pokemon/chatot/footprint.png b/graphics/pokemon/gen_4/chatot/footprint.png similarity index 100% rename from graphics/pokemon/chatot/footprint.png rename to graphics/pokemon/gen_4/chatot/footprint.png diff --git a/graphics/pokemon/chatot/icon.png b/graphics/pokemon/gen_4/chatot/icon.png similarity index 100% rename from graphics/pokemon/chatot/icon.png rename to graphics/pokemon/gen_4/chatot/icon.png diff --git a/graphics/pokemon/chatot/normal.pal b/graphics/pokemon/gen_4/chatot/normal.pal similarity index 100% rename from graphics/pokemon/chatot/normal.pal rename to graphics/pokemon/gen_4/chatot/normal.pal diff --git a/graphics/pokemon/chatot/shiny.pal b/graphics/pokemon/gen_4/chatot/shiny.pal similarity index 100% rename from graphics/pokemon/chatot/shiny.pal rename to graphics/pokemon/gen_4/chatot/shiny.pal diff --git a/graphics/pokemon/cherrim/anim_front.png b/graphics/pokemon/gen_4/cherrim/anim_front.png similarity index 100% rename from graphics/pokemon/cherrim/anim_front.png rename to graphics/pokemon/gen_4/cherrim/anim_front.png diff --git a/graphics/pokemon/cherrim/back.png b/graphics/pokemon/gen_4/cherrim/back.png similarity index 100% rename from graphics/pokemon/cherrim/back.png rename to graphics/pokemon/gen_4/cherrim/back.png diff --git a/graphics/pokemon/calyrex/footprint.png b/graphics/pokemon/gen_4/cherrim/footprint.png similarity index 100% rename from graphics/pokemon/calyrex/footprint.png rename to graphics/pokemon/gen_4/cherrim/footprint.png diff --git a/graphics/pokemon/cherrim/icon.png b/graphics/pokemon/gen_4/cherrim/icon.png similarity index 100% rename from graphics/pokemon/cherrim/icon.png rename to graphics/pokemon/gen_4/cherrim/icon.png diff --git a/graphics/pokemon/cherrim/normal.pal b/graphics/pokemon/gen_4/cherrim/normal.pal similarity index 100% rename from graphics/pokemon/cherrim/normal.pal rename to graphics/pokemon/gen_4/cherrim/normal.pal diff --git a/graphics/pokemon/cherrim/shiny.pal b/graphics/pokemon/gen_4/cherrim/shiny.pal similarity index 100% rename from graphics/pokemon/cherrim/shiny.pal rename to graphics/pokemon/gen_4/cherrim/shiny.pal diff --git a/graphics/pokemon/cherrim/sunshine/anim_front.png b/graphics/pokemon/gen_4/cherrim/sunshine/anim_front.png similarity index 100% rename from graphics/pokemon/cherrim/sunshine/anim_front.png rename to graphics/pokemon/gen_4/cherrim/sunshine/anim_front.png diff --git a/graphics/pokemon/cherrim/sunshine/back.png b/graphics/pokemon/gen_4/cherrim/sunshine/back.png similarity index 100% rename from graphics/pokemon/cherrim/sunshine/back.png rename to graphics/pokemon/gen_4/cherrim/sunshine/back.png diff --git a/graphics/pokemon/cherrim/sunshine/icon.png b/graphics/pokemon/gen_4/cherrim/sunshine/icon.png similarity index 100% rename from graphics/pokemon/cherrim/sunshine/icon.png rename to graphics/pokemon/gen_4/cherrim/sunshine/icon.png diff --git a/graphics/pokemon/cherrim/sunshine/normal.pal b/graphics/pokemon/gen_4/cherrim/sunshine/normal.pal similarity index 100% rename from graphics/pokemon/cherrim/sunshine/normal.pal rename to graphics/pokemon/gen_4/cherrim/sunshine/normal.pal diff --git a/graphics/pokemon/cherrim/sunshine/shiny.pal b/graphics/pokemon/gen_4/cherrim/sunshine/shiny.pal similarity index 100% rename from graphics/pokemon/cherrim/sunshine/shiny.pal rename to graphics/pokemon/gen_4/cherrim/sunshine/shiny.pal diff --git a/graphics/pokemon/cherubi/anim_front.png b/graphics/pokemon/gen_4/cherubi/anim_front.png similarity index 100% rename from graphics/pokemon/cherubi/anim_front.png rename to graphics/pokemon/gen_4/cherubi/anim_front.png diff --git a/graphics/pokemon/cherubi/back.png b/graphics/pokemon/gen_4/cherubi/back.png similarity index 100% rename from graphics/pokemon/cherubi/back.png rename to graphics/pokemon/gen_4/cherubi/back.png diff --git a/graphics/pokemon/caterpie/footprint.png b/graphics/pokemon/gen_4/cherubi/footprint.png similarity index 100% rename from graphics/pokemon/caterpie/footprint.png rename to graphics/pokemon/gen_4/cherubi/footprint.png diff --git a/graphics/pokemon/cherubi/icon.png b/graphics/pokemon/gen_4/cherubi/icon.png similarity index 100% rename from graphics/pokemon/cherubi/icon.png rename to graphics/pokemon/gen_4/cherubi/icon.png diff --git a/graphics/pokemon/cherubi/normal.pal b/graphics/pokemon/gen_4/cherubi/normal.pal similarity index 100% rename from graphics/pokemon/cherubi/normal.pal rename to graphics/pokemon/gen_4/cherubi/normal.pal diff --git a/graphics/pokemon/cherubi/shiny.pal b/graphics/pokemon/gen_4/cherubi/shiny.pal similarity index 100% rename from graphics/pokemon/cherubi/shiny.pal rename to graphics/pokemon/gen_4/cherubi/shiny.pal diff --git a/graphics/pokemon/chimchar/anim_front.png b/graphics/pokemon/gen_4/chimchar/anim_front.png similarity index 100% rename from graphics/pokemon/chimchar/anim_front.png rename to graphics/pokemon/gen_4/chimchar/anim_front.png diff --git a/graphics/pokemon/chimchar/back.png b/graphics/pokemon/gen_4/chimchar/back.png similarity index 100% rename from graphics/pokemon/chimchar/back.png rename to graphics/pokemon/gen_4/chimchar/back.png diff --git a/graphics/pokemon/chimchar/footprint.png b/graphics/pokemon/gen_4/chimchar/footprint.png similarity index 100% rename from graphics/pokemon/chimchar/footprint.png rename to graphics/pokemon/gen_4/chimchar/footprint.png diff --git a/graphics/pokemon/chimchar/icon.png b/graphics/pokemon/gen_4/chimchar/icon.png similarity index 100% rename from graphics/pokemon/chimchar/icon.png rename to graphics/pokemon/gen_4/chimchar/icon.png diff --git a/graphics/pokemon/chimchar/normal.pal b/graphics/pokemon/gen_4/chimchar/normal.pal similarity index 100% rename from graphics/pokemon/chimchar/normal.pal rename to graphics/pokemon/gen_4/chimchar/normal.pal diff --git a/graphics/pokemon/chimchar/shiny.pal b/graphics/pokemon/gen_4/chimchar/shiny.pal similarity index 100% rename from graphics/pokemon/chimchar/shiny.pal rename to graphics/pokemon/gen_4/chimchar/shiny.pal diff --git a/graphics/pokemon/chingling/anim_front.png b/graphics/pokemon/gen_4/chingling/anim_front.png similarity index 100% rename from graphics/pokemon/chingling/anim_front.png rename to graphics/pokemon/gen_4/chingling/anim_front.png diff --git a/graphics/pokemon/chingling/back.png b/graphics/pokemon/gen_4/chingling/back.png similarity index 100% rename from graphics/pokemon/chingling/back.png rename to graphics/pokemon/gen_4/chingling/back.png diff --git a/graphics/pokemon/chingling/footprint.png b/graphics/pokemon/gen_4/chingling/footprint.png similarity index 100% rename from graphics/pokemon/chingling/footprint.png rename to graphics/pokemon/gen_4/chingling/footprint.png diff --git a/graphics/pokemon/chingling/icon.png b/graphics/pokemon/gen_4/chingling/icon.png similarity index 100% rename from graphics/pokemon/chingling/icon.png rename to graphics/pokemon/gen_4/chingling/icon.png diff --git a/graphics/pokemon/chingling/normal.pal b/graphics/pokemon/gen_4/chingling/normal.pal similarity index 100% rename from graphics/pokemon/chingling/normal.pal rename to graphics/pokemon/gen_4/chingling/normal.pal diff --git a/graphics/pokemon/chingling/shiny.pal b/graphics/pokemon/gen_4/chingling/shiny.pal similarity index 100% rename from graphics/pokemon/chingling/shiny.pal rename to graphics/pokemon/gen_4/chingling/shiny.pal diff --git a/graphics/pokemon/combee/anim_front.png b/graphics/pokemon/gen_4/combee/anim_front.png similarity index 100% rename from graphics/pokemon/combee/anim_front.png rename to graphics/pokemon/gen_4/combee/anim_front.png diff --git a/graphics/pokemon/combee/back.png b/graphics/pokemon/gen_4/combee/back.png similarity index 100% rename from graphics/pokemon/combee/back.png rename to graphics/pokemon/gen_4/combee/back.png diff --git a/graphics/pokemon/huntail/footprint.png b/graphics/pokemon/gen_4/combee/footprint.png similarity index 100% rename from graphics/pokemon/huntail/footprint.png rename to graphics/pokemon/gen_4/combee/footprint.png diff --git a/graphics/pokemon/combee/icon.png b/graphics/pokemon/gen_4/combee/icon.png similarity index 100% rename from graphics/pokemon/combee/icon.png rename to graphics/pokemon/gen_4/combee/icon.png diff --git a/graphics/pokemon/combee/normal.pal b/graphics/pokemon/gen_4/combee/normal.pal similarity index 100% rename from graphics/pokemon/combee/normal.pal rename to graphics/pokemon/gen_4/combee/normal.pal diff --git a/graphics/pokemon/combee/normalf.pal b/graphics/pokemon/gen_4/combee/normalf.pal similarity index 100% rename from graphics/pokemon/combee/normalf.pal rename to graphics/pokemon/gen_4/combee/normalf.pal diff --git a/graphics/pokemon/combee/shiny.pal b/graphics/pokemon/gen_4/combee/shiny.pal similarity index 100% rename from graphics/pokemon/combee/shiny.pal rename to graphics/pokemon/gen_4/combee/shiny.pal diff --git a/graphics/pokemon/combee/shinyf.pal b/graphics/pokemon/gen_4/combee/shinyf.pal similarity index 100% rename from graphics/pokemon/combee/shinyf.pal rename to graphics/pokemon/gen_4/combee/shinyf.pal diff --git a/graphics/pokemon/cranidos/anim_front.png b/graphics/pokemon/gen_4/cranidos/anim_front.png similarity index 100% rename from graphics/pokemon/cranidos/anim_front.png rename to graphics/pokemon/gen_4/cranidos/anim_front.png diff --git a/graphics/pokemon/cranidos/back.png b/graphics/pokemon/gen_4/cranidos/back.png similarity index 100% rename from graphics/pokemon/cranidos/back.png rename to graphics/pokemon/gen_4/cranidos/back.png diff --git a/graphics/pokemon/cranidos/footprint.png b/graphics/pokemon/gen_4/cranidos/footprint.png similarity index 100% rename from graphics/pokemon/cranidos/footprint.png rename to graphics/pokemon/gen_4/cranidos/footprint.png diff --git a/graphics/pokemon/cranidos/icon.png b/graphics/pokemon/gen_4/cranidos/icon.png similarity index 100% rename from graphics/pokemon/cranidos/icon.png rename to graphics/pokemon/gen_4/cranidos/icon.png diff --git a/graphics/pokemon/cranidos/normal.pal b/graphics/pokemon/gen_4/cranidos/normal.pal similarity index 100% rename from graphics/pokemon/cranidos/normal.pal rename to graphics/pokemon/gen_4/cranidos/normal.pal diff --git a/graphics/pokemon/cranidos/shiny.pal b/graphics/pokemon/gen_4/cranidos/shiny.pal similarity index 100% rename from graphics/pokemon/cranidos/shiny.pal rename to graphics/pokemon/gen_4/cranidos/shiny.pal diff --git a/graphics/pokemon/cresselia/anim_front.png b/graphics/pokemon/gen_4/cresselia/anim_front.png similarity index 100% rename from graphics/pokemon/cresselia/anim_front.png rename to graphics/pokemon/gen_4/cresselia/anim_front.png diff --git a/graphics/pokemon/cresselia/back.png b/graphics/pokemon/gen_4/cresselia/back.png similarity index 100% rename from graphics/pokemon/cresselia/back.png rename to graphics/pokemon/gen_4/cresselia/back.png diff --git a/graphics/pokemon/hydreigon/footprint.png b/graphics/pokemon/gen_4/cresselia/footprint.png similarity index 100% rename from graphics/pokemon/hydreigon/footprint.png rename to graphics/pokemon/gen_4/cresselia/footprint.png diff --git a/graphics/pokemon/cresselia/icon.png b/graphics/pokemon/gen_4/cresselia/icon.png similarity index 100% rename from graphics/pokemon/cresselia/icon.png rename to graphics/pokemon/gen_4/cresselia/icon.png diff --git a/graphics/pokemon/cresselia/normal.pal b/graphics/pokemon/gen_4/cresselia/normal.pal similarity index 100% rename from graphics/pokemon/cresselia/normal.pal rename to graphics/pokemon/gen_4/cresselia/normal.pal diff --git a/graphics/pokemon/cresselia/shiny.pal b/graphics/pokemon/gen_4/cresselia/shiny.pal similarity index 100% rename from graphics/pokemon/cresselia/shiny.pal rename to graphics/pokemon/gen_4/cresselia/shiny.pal diff --git a/graphics/pokemon/croagunk/anim_front.png b/graphics/pokemon/gen_4/croagunk/anim_front.png similarity index 100% rename from graphics/pokemon/croagunk/anim_front.png rename to graphics/pokemon/gen_4/croagunk/anim_front.png diff --git a/graphics/pokemon/croagunk/anim_frontf.png b/graphics/pokemon/gen_4/croagunk/anim_frontf.png similarity index 100% rename from graphics/pokemon/croagunk/anim_frontf.png rename to graphics/pokemon/gen_4/croagunk/anim_frontf.png diff --git a/graphics/pokemon/croagunk/back.png b/graphics/pokemon/gen_4/croagunk/back.png similarity index 100% rename from graphics/pokemon/croagunk/back.png rename to graphics/pokemon/gen_4/croagunk/back.png diff --git a/graphics/pokemon/croagunk/backf.png b/graphics/pokemon/gen_4/croagunk/backf.png similarity index 100% rename from graphics/pokemon/croagunk/backf.png rename to graphics/pokemon/gen_4/croagunk/backf.png diff --git a/graphics/pokemon/croagunk/footprint.png b/graphics/pokemon/gen_4/croagunk/footprint.png similarity index 100% rename from graphics/pokemon/croagunk/footprint.png rename to graphics/pokemon/gen_4/croagunk/footprint.png diff --git a/graphics/pokemon/croagunk/icon.png b/graphics/pokemon/gen_4/croagunk/icon.png similarity index 100% rename from graphics/pokemon/croagunk/icon.png rename to graphics/pokemon/gen_4/croagunk/icon.png diff --git a/graphics/pokemon/croagunk/normal.pal b/graphics/pokemon/gen_4/croagunk/normal.pal similarity index 100% rename from graphics/pokemon/croagunk/normal.pal rename to graphics/pokemon/gen_4/croagunk/normal.pal diff --git a/graphics/pokemon/croagunk/shiny.pal b/graphics/pokemon/gen_4/croagunk/shiny.pal similarity index 100% rename from graphics/pokemon/croagunk/shiny.pal rename to graphics/pokemon/gen_4/croagunk/shiny.pal diff --git a/graphics/pokemon/darkrai/anim_front.png b/graphics/pokemon/gen_4/darkrai/anim_front.png similarity index 100% rename from graphics/pokemon/darkrai/anim_front.png rename to graphics/pokemon/gen_4/darkrai/anim_front.png diff --git a/graphics/pokemon/darkrai/back.png b/graphics/pokemon/gen_4/darkrai/back.png similarity index 100% rename from graphics/pokemon/darkrai/back.png rename to graphics/pokemon/gen_4/darkrai/back.png diff --git a/graphics/pokemon/centiskorch/footprint.png b/graphics/pokemon/gen_4/darkrai/footprint.png similarity index 100% rename from graphics/pokemon/centiskorch/footprint.png rename to graphics/pokemon/gen_4/darkrai/footprint.png diff --git a/graphics/pokemon/darkrai/icon.png b/graphics/pokemon/gen_4/darkrai/icon.png similarity index 100% rename from graphics/pokemon/darkrai/icon.png rename to graphics/pokemon/gen_4/darkrai/icon.png diff --git a/graphics/pokemon/darkrai/normal.pal b/graphics/pokemon/gen_4/darkrai/normal.pal similarity index 100% rename from graphics/pokemon/darkrai/normal.pal rename to graphics/pokemon/gen_4/darkrai/normal.pal diff --git a/graphics/pokemon/darkrai/shiny.pal b/graphics/pokemon/gen_4/darkrai/shiny.pal similarity index 100% rename from graphics/pokemon/darkrai/shiny.pal rename to graphics/pokemon/gen_4/darkrai/shiny.pal diff --git a/graphics/pokemon/dialga/anim_front.png b/graphics/pokemon/gen_4/dialga/anim_front.png similarity index 100% rename from graphics/pokemon/dialga/anim_front.png rename to graphics/pokemon/gen_4/dialga/anim_front.png diff --git a/graphics/pokemon/dialga/back.png b/graphics/pokemon/gen_4/dialga/back.png similarity index 100% rename from graphics/pokemon/dialga/back.png rename to graphics/pokemon/gen_4/dialga/back.png diff --git a/graphics/pokemon/dialga/footprint.png b/graphics/pokemon/gen_4/dialga/footprint.png similarity index 100% rename from graphics/pokemon/dialga/footprint.png rename to graphics/pokemon/gen_4/dialga/footprint.png diff --git a/graphics/pokemon/dialga/icon.png b/graphics/pokemon/gen_4/dialga/icon.png similarity index 100% rename from graphics/pokemon/dialga/icon.png rename to graphics/pokemon/gen_4/dialga/icon.png diff --git a/graphics/pokemon/dialga/normal.pal b/graphics/pokemon/gen_4/dialga/normal.pal similarity index 100% rename from graphics/pokemon/dialga/normal.pal rename to graphics/pokemon/gen_4/dialga/normal.pal diff --git a/graphics/pokemon/dialga/origin/back.png b/graphics/pokemon/gen_4/dialga/origin/back.png similarity index 100% rename from graphics/pokemon/dialga/origin/back.png rename to graphics/pokemon/gen_4/dialga/origin/back.png diff --git a/graphics/pokemon/dialga/origin/front.png b/graphics/pokemon/gen_4/dialga/origin/front.png similarity index 100% rename from graphics/pokemon/dialga/origin/front.png rename to graphics/pokemon/gen_4/dialga/origin/front.png diff --git a/graphics/pokemon/dialga/origin/icon.png b/graphics/pokemon/gen_4/dialga/origin/icon.png similarity index 100% rename from graphics/pokemon/dialga/origin/icon.png rename to graphics/pokemon/gen_4/dialga/origin/icon.png diff --git a/graphics/pokemon/dialga/origin/normal.pal b/graphics/pokemon/gen_4/dialga/origin/normal.pal similarity index 100% rename from graphics/pokemon/dialga/origin/normal.pal rename to graphics/pokemon/gen_4/dialga/origin/normal.pal diff --git a/graphics/pokemon/dialga/origin/shiny.pal b/graphics/pokemon/gen_4/dialga/origin/shiny.pal similarity index 100% rename from graphics/pokemon/dialga/origin/shiny.pal rename to graphics/pokemon/gen_4/dialga/origin/shiny.pal diff --git a/graphics/pokemon/dialga/shiny.pal b/graphics/pokemon/gen_4/dialga/shiny.pal similarity index 100% rename from graphics/pokemon/dialga/shiny.pal rename to graphics/pokemon/gen_4/dialga/shiny.pal diff --git a/graphics/pokemon/drapion/anim_front.png b/graphics/pokemon/gen_4/drapion/anim_front.png similarity index 100% rename from graphics/pokemon/drapion/anim_front.png rename to graphics/pokemon/gen_4/drapion/anim_front.png diff --git a/graphics/pokemon/drapion/back.png b/graphics/pokemon/gen_4/drapion/back.png similarity index 100% rename from graphics/pokemon/drapion/back.png rename to graphics/pokemon/gen_4/drapion/back.png diff --git a/graphics/pokemon/espurr/footprint.png b/graphics/pokemon/gen_4/drapion/footprint.png similarity index 100% rename from graphics/pokemon/espurr/footprint.png rename to graphics/pokemon/gen_4/drapion/footprint.png diff --git a/graphics/pokemon/drapion/icon.png b/graphics/pokemon/gen_4/drapion/icon.png similarity index 100% rename from graphics/pokemon/drapion/icon.png rename to graphics/pokemon/gen_4/drapion/icon.png diff --git a/graphics/pokemon/drapion/normal.pal b/graphics/pokemon/gen_4/drapion/normal.pal similarity index 100% rename from graphics/pokemon/drapion/normal.pal rename to graphics/pokemon/gen_4/drapion/normal.pal diff --git a/graphics/pokemon/drapion/shiny.pal b/graphics/pokemon/gen_4/drapion/shiny.pal similarity index 100% rename from graphics/pokemon/drapion/shiny.pal rename to graphics/pokemon/gen_4/drapion/shiny.pal diff --git a/graphics/pokemon/drifblim/anim_front.png b/graphics/pokemon/gen_4/drifblim/anim_front.png similarity index 100% rename from graphics/pokemon/drifblim/anim_front.png rename to graphics/pokemon/gen_4/drifblim/anim_front.png diff --git a/graphics/pokemon/drifblim/back.png b/graphics/pokemon/gen_4/drifblim/back.png similarity index 100% rename from graphics/pokemon/drifblim/back.png rename to graphics/pokemon/gen_4/drifblim/back.png diff --git a/graphics/pokemon/inkay/footprint.png b/graphics/pokemon/gen_4/drifblim/footprint.png similarity index 100% rename from graphics/pokemon/inkay/footprint.png rename to graphics/pokemon/gen_4/drifblim/footprint.png diff --git a/graphics/pokemon/drifblim/icon.png b/graphics/pokemon/gen_4/drifblim/icon.png similarity index 100% rename from graphics/pokemon/drifblim/icon.png rename to graphics/pokemon/gen_4/drifblim/icon.png diff --git a/graphics/pokemon/drifblim/normal.pal b/graphics/pokemon/gen_4/drifblim/normal.pal similarity index 100% rename from graphics/pokemon/drifblim/normal.pal rename to graphics/pokemon/gen_4/drifblim/normal.pal diff --git a/graphics/pokemon/drifblim/shiny.pal b/graphics/pokemon/gen_4/drifblim/shiny.pal similarity index 100% rename from graphics/pokemon/drifblim/shiny.pal rename to graphics/pokemon/gen_4/drifblim/shiny.pal diff --git a/graphics/pokemon/drifloon/anim_front.png b/graphics/pokemon/gen_4/drifloon/anim_front.png similarity index 100% rename from graphics/pokemon/drifloon/anim_front.png rename to graphics/pokemon/gen_4/drifloon/anim_front.png diff --git a/graphics/pokemon/drifloon/back.png b/graphics/pokemon/gen_4/drifloon/back.png similarity index 100% rename from graphics/pokemon/drifloon/back.png rename to graphics/pokemon/gen_4/drifloon/back.png diff --git a/graphics/pokemon/jellicent/footprint.png b/graphics/pokemon/gen_4/drifloon/footprint.png similarity index 100% rename from graphics/pokemon/jellicent/footprint.png rename to graphics/pokemon/gen_4/drifloon/footprint.png diff --git a/graphics/pokemon/drifloon/icon.png b/graphics/pokemon/gen_4/drifloon/icon.png similarity index 100% rename from graphics/pokemon/drifloon/icon.png rename to graphics/pokemon/gen_4/drifloon/icon.png diff --git a/graphics/pokemon/drifloon/normal.pal b/graphics/pokemon/gen_4/drifloon/normal.pal similarity index 100% rename from graphics/pokemon/drifloon/normal.pal rename to graphics/pokemon/gen_4/drifloon/normal.pal diff --git a/graphics/pokemon/drifloon/shiny.pal b/graphics/pokemon/gen_4/drifloon/shiny.pal similarity index 100% rename from graphics/pokemon/drifloon/shiny.pal rename to graphics/pokemon/gen_4/drifloon/shiny.pal diff --git a/graphics/pokemon/dusknoir/anim_front.png b/graphics/pokemon/gen_4/dusknoir/anim_front.png similarity index 100% rename from graphics/pokemon/dusknoir/anim_front.png rename to graphics/pokemon/gen_4/dusknoir/anim_front.png diff --git a/graphics/pokemon/dusknoir/back.png b/graphics/pokemon/gen_4/dusknoir/back.png similarity index 100% rename from graphics/pokemon/dusknoir/back.png rename to graphics/pokemon/gen_4/dusknoir/back.png diff --git a/graphics/pokemon/jynx/footprint.png b/graphics/pokemon/gen_4/dusknoir/footprint.png similarity index 100% rename from graphics/pokemon/jynx/footprint.png rename to graphics/pokemon/gen_4/dusknoir/footprint.png diff --git a/graphics/pokemon/dusknoir/icon.png b/graphics/pokemon/gen_4/dusknoir/icon.png similarity index 100% rename from graphics/pokemon/dusknoir/icon.png rename to graphics/pokemon/gen_4/dusknoir/icon.png diff --git a/graphics/pokemon/dusknoir/normal.pal b/graphics/pokemon/gen_4/dusknoir/normal.pal similarity index 100% rename from graphics/pokemon/dusknoir/normal.pal rename to graphics/pokemon/gen_4/dusknoir/normal.pal diff --git a/graphics/pokemon/dusknoir/shiny.pal b/graphics/pokemon/gen_4/dusknoir/shiny.pal similarity index 100% rename from graphics/pokemon/dusknoir/shiny.pal rename to graphics/pokemon/gen_4/dusknoir/shiny.pal diff --git a/graphics/pokemon/electivire/anim_front.png b/graphics/pokemon/gen_4/electivire/anim_front.png similarity index 100% rename from graphics/pokemon/electivire/anim_front.png rename to graphics/pokemon/gen_4/electivire/anim_front.png diff --git a/graphics/pokemon/electivire/back.png b/graphics/pokemon/gen_4/electivire/back.png similarity index 100% rename from graphics/pokemon/electivire/back.png rename to graphics/pokemon/gen_4/electivire/back.png diff --git a/graphics/pokemon/electivire/footprint.png b/graphics/pokemon/gen_4/electivire/footprint.png similarity index 100% rename from graphics/pokemon/electivire/footprint.png rename to graphics/pokemon/gen_4/electivire/footprint.png diff --git a/graphics/pokemon/electivire/icon.png b/graphics/pokemon/gen_4/electivire/icon.png similarity index 100% rename from graphics/pokemon/electivire/icon.png rename to graphics/pokemon/gen_4/electivire/icon.png diff --git a/graphics/pokemon/electivire/normal.pal b/graphics/pokemon/gen_4/electivire/normal.pal similarity index 100% rename from graphics/pokemon/electivire/normal.pal rename to graphics/pokemon/gen_4/electivire/normal.pal diff --git a/graphics/pokemon/electivire/shiny.pal b/graphics/pokemon/gen_4/electivire/shiny.pal similarity index 100% rename from graphics/pokemon/electivire/shiny.pal rename to graphics/pokemon/gen_4/electivire/shiny.pal diff --git a/graphics/pokemon/empoleon/anim_front.png b/graphics/pokemon/gen_4/empoleon/anim_front.png similarity index 100% rename from graphics/pokemon/empoleon/anim_front.png rename to graphics/pokemon/gen_4/empoleon/anim_front.png diff --git a/graphics/pokemon/empoleon/back.png b/graphics/pokemon/gen_4/empoleon/back.png similarity index 100% rename from graphics/pokemon/empoleon/back.png rename to graphics/pokemon/gen_4/empoleon/back.png diff --git a/graphics/pokemon/empoleon/footprint.png b/graphics/pokemon/gen_4/empoleon/footprint.png similarity index 100% rename from graphics/pokemon/empoleon/footprint.png rename to graphics/pokemon/gen_4/empoleon/footprint.png diff --git a/graphics/pokemon/empoleon/icon.png b/graphics/pokemon/gen_4/empoleon/icon.png similarity index 100% rename from graphics/pokemon/empoleon/icon.png rename to graphics/pokemon/gen_4/empoleon/icon.png diff --git a/graphics/pokemon/empoleon/normal.pal b/graphics/pokemon/gen_4/empoleon/normal.pal similarity index 100% rename from graphics/pokemon/empoleon/normal.pal rename to graphics/pokemon/gen_4/empoleon/normal.pal diff --git a/graphics/pokemon/empoleon/shiny.pal b/graphics/pokemon/gen_4/empoleon/shiny.pal similarity index 100% rename from graphics/pokemon/empoleon/shiny.pal rename to graphics/pokemon/gen_4/empoleon/shiny.pal diff --git a/graphics/pokemon/finneon/anim_front.png b/graphics/pokemon/gen_4/finneon/anim_front.png similarity index 100% rename from graphics/pokemon/finneon/anim_front.png rename to graphics/pokemon/gen_4/finneon/anim_front.png diff --git a/graphics/pokemon/finneon/anim_frontf.png b/graphics/pokemon/gen_4/finneon/anim_frontf.png similarity index 100% rename from graphics/pokemon/finneon/anim_frontf.png rename to graphics/pokemon/gen_4/finneon/anim_frontf.png diff --git a/graphics/pokemon/finneon/back.png b/graphics/pokemon/gen_4/finneon/back.png similarity index 100% rename from graphics/pokemon/finneon/back.png rename to graphics/pokemon/gen_4/finneon/back.png diff --git a/graphics/pokemon/finneon/backf.png b/graphics/pokemon/gen_4/finneon/backf.png similarity index 100% rename from graphics/pokemon/finneon/backf.png rename to graphics/pokemon/gen_4/finneon/backf.png diff --git a/graphics/pokemon/kakuna/footprint.png b/graphics/pokemon/gen_4/finneon/footprint.png similarity index 100% rename from graphics/pokemon/kakuna/footprint.png rename to graphics/pokemon/gen_4/finneon/footprint.png diff --git a/graphics/pokemon/finneon/icon.png b/graphics/pokemon/gen_4/finneon/icon.png similarity index 100% rename from graphics/pokemon/finneon/icon.png rename to graphics/pokemon/gen_4/finneon/icon.png diff --git a/graphics/pokemon/finneon/normal.pal b/graphics/pokemon/gen_4/finneon/normal.pal similarity index 100% rename from graphics/pokemon/finneon/normal.pal rename to graphics/pokemon/gen_4/finneon/normal.pal diff --git a/graphics/pokemon/finneon/shiny.pal b/graphics/pokemon/gen_4/finneon/shiny.pal similarity index 100% rename from graphics/pokemon/finneon/shiny.pal rename to graphics/pokemon/gen_4/finneon/shiny.pal diff --git a/graphics/pokemon/floatzel/anim_front.png b/graphics/pokemon/gen_4/floatzel/anim_front.png similarity index 100% rename from graphics/pokemon/floatzel/anim_front.png rename to graphics/pokemon/gen_4/floatzel/anim_front.png diff --git a/graphics/pokemon/floatzel/back.png b/graphics/pokemon/gen_4/floatzel/back.png similarity index 100% rename from graphics/pokemon/floatzel/back.png rename to graphics/pokemon/gen_4/floatzel/back.png diff --git a/graphics/pokemon/floatzel/backf.png b/graphics/pokemon/gen_4/floatzel/backf.png similarity index 100% rename from graphics/pokemon/floatzel/backf.png rename to graphics/pokemon/gen_4/floatzel/backf.png diff --git a/graphics/pokemon/floatzel/footprint.png b/graphics/pokemon/gen_4/floatzel/footprint.png similarity index 100% rename from graphics/pokemon/floatzel/footprint.png rename to graphics/pokemon/gen_4/floatzel/footprint.png diff --git a/graphics/pokemon/floatzel/icon.png b/graphics/pokemon/gen_4/floatzel/icon.png similarity index 100% rename from graphics/pokemon/floatzel/icon.png rename to graphics/pokemon/gen_4/floatzel/icon.png diff --git a/graphics/pokemon/floatzel/normal.pal b/graphics/pokemon/gen_4/floatzel/normal.pal similarity index 100% rename from graphics/pokemon/floatzel/normal.pal rename to graphics/pokemon/gen_4/floatzel/normal.pal diff --git a/graphics/pokemon/floatzel/shiny.pal b/graphics/pokemon/gen_4/floatzel/shiny.pal similarity index 100% rename from graphics/pokemon/floatzel/shiny.pal rename to graphics/pokemon/gen_4/floatzel/shiny.pal diff --git a/graphics/pokemon/froslass/anim_front.png b/graphics/pokemon/gen_4/froslass/anim_front.png similarity index 100% rename from graphics/pokemon/froslass/anim_front.png rename to graphics/pokemon/gen_4/froslass/anim_front.png diff --git a/graphics/pokemon/froslass/back.png b/graphics/pokemon/gen_4/froslass/back.png similarity index 100% rename from graphics/pokemon/froslass/back.png rename to graphics/pokemon/gen_4/froslass/back.png diff --git a/graphics/pokemon/kartana/footprint.png b/graphics/pokemon/gen_4/froslass/footprint.png similarity index 100% rename from graphics/pokemon/kartana/footprint.png rename to graphics/pokemon/gen_4/froslass/footprint.png diff --git a/graphics/pokemon/froslass/icon.png b/graphics/pokemon/gen_4/froslass/icon.png similarity index 100% rename from graphics/pokemon/froslass/icon.png rename to graphics/pokemon/gen_4/froslass/icon.png diff --git a/graphics/pokemon/froslass/normal.pal b/graphics/pokemon/gen_4/froslass/normal.pal similarity index 100% rename from graphics/pokemon/froslass/normal.pal rename to graphics/pokemon/gen_4/froslass/normal.pal diff --git a/graphics/pokemon/froslass/shiny.pal b/graphics/pokemon/gen_4/froslass/shiny.pal similarity index 100% rename from graphics/pokemon/froslass/shiny.pal rename to graphics/pokemon/gen_4/froslass/shiny.pal diff --git a/graphics/pokemon/gabite/anim_front.png b/graphics/pokemon/gen_4/gabite/anim_front.png similarity index 100% rename from graphics/pokemon/gabite/anim_front.png rename to graphics/pokemon/gen_4/gabite/anim_front.png diff --git a/graphics/pokemon/gabite/anim_frontf.png b/graphics/pokemon/gen_4/gabite/anim_frontf.png similarity index 100% rename from graphics/pokemon/gabite/anim_frontf.png rename to graphics/pokemon/gen_4/gabite/anim_frontf.png diff --git a/graphics/pokemon/gabite/back.png b/graphics/pokemon/gen_4/gabite/back.png similarity index 100% rename from graphics/pokemon/gabite/back.png rename to graphics/pokemon/gen_4/gabite/back.png diff --git a/graphics/pokemon/gabite/backf.png b/graphics/pokemon/gen_4/gabite/backf.png similarity index 100% rename from graphics/pokemon/gabite/backf.png rename to graphics/pokemon/gen_4/gabite/backf.png diff --git a/graphics/pokemon/gabite/footprint.png b/graphics/pokemon/gen_4/gabite/footprint.png similarity index 100% rename from graphics/pokemon/gabite/footprint.png rename to graphics/pokemon/gen_4/gabite/footprint.png diff --git a/graphics/pokemon/gabite/icon.png b/graphics/pokemon/gen_4/gabite/icon.png similarity index 100% rename from graphics/pokemon/gabite/icon.png rename to graphics/pokemon/gen_4/gabite/icon.png diff --git a/graphics/pokemon/gabite/normal.pal b/graphics/pokemon/gen_4/gabite/normal.pal similarity index 100% rename from graphics/pokemon/gabite/normal.pal rename to graphics/pokemon/gen_4/gabite/normal.pal diff --git a/graphics/pokemon/gabite/shiny.pal b/graphics/pokemon/gen_4/gabite/shiny.pal similarity index 100% rename from graphics/pokemon/gabite/shiny.pal rename to graphics/pokemon/gen_4/gabite/shiny.pal diff --git a/graphics/pokemon/gallade/anim_front.png b/graphics/pokemon/gen_4/gallade/anim_front.png similarity index 100% rename from graphics/pokemon/gallade/anim_front.png rename to graphics/pokemon/gen_4/gallade/anim_front.png diff --git a/graphics/pokemon/gallade/back.png b/graphics/pokemon/gen_4/gallade/back.png similarity index 100% rename from graphics/pokemon/gallade/back.png rename to graphics/pokemon/gen_4/gallade/back.png diff --git a/graphics/pokemon/gallade/footprint.png b/graphics/pokemon/gen_4/gallade/footprint.png similarity index 100% rename from graphics/pokemon/gallade/footprint.png rename to graphics/pokemon/gen_4/gallade/footprint.png diff --git a/graphics/pokemon/gallade/icon.png b/graphics/pokemon/gen_4/gallade/icon.png similarity index 100% rename from graphics/pokemon/gallade/icon.png rename to graphics/pokemon/gen_4/gallade/icon.png diff --git a/graphics/pokemon/gallade/mega/back.png b/graphics/pokemon/gen_4/gallade/mega/back.png similarity index 100% rename from graphics/pokemon/gallade/mega/back.png rename to graphics/pokemon/gen_4/gallade/mega/back.png diff --git a/graphics/pokemon/gallade/mega/front.png b/graphics/pokemon/gen_4/gallade/mega/front.png similarity index 100% rename from graphics/pokemon/gallade/mega/front.png rename to graphics/pokemon/gen_4/gallade/mega/front.png diff --git a/graphics/pokemon/gallade/mega/icon.png b/graphics/pokemon/gen_4/gallade/mega/icon.png similarity index 100% rename from graphics/pokemon/gallade/mega/icon.png rename to graphics/pokemon/gen_4/gallade/mega/icon.png diff --git a/graphics/pokemon/gallade/mega/normal.pal b/graphics/pokemon/gen_4/gallade/mega/normal.pal similarity index 100% rename from graphics/pokemon/gallade/mega/normal.pal rename to graphics/pokemon/gen_4/gallade/mega/normal.pal diff --git a/graphics/pokemon/gallade/mega/shiny.pal b/graphics/pokemon/gen_4/gallade/mega/shiny.pal similarity index 100% rename from graphics/pokemon/gallade/mega/shiny.pal rename to graphics/pokemon/gen_4/gallade/mega/shiny.pal diff --git a/graphics/pokemon/gallade/normal.pal b/graphics/pokemon/gen_4/gallade/normal.pal similarity index 100% rename from graphics/pokemon/gallade/normal.pal rename to graphics/pokemon/gen_4/gallade/normal.pal diff --git a/graphics/pokemon/gallade/shiny.pal b/graphics/pokemon/gen_4/gallade/shiny.pal similarity index 100% rename from graphics/pokemon/gallade/shiny.pal rename to graphics/pokemon/gen_4/gallade/shiny.pal diff --git a/graphics/pokemon/garchomp/anim_front.png b/graphics/pokemon/gen_4/garchomp/anim_front.png similarity index 100% rename from graphics/pokemon/garchomp/anim_front.png rename to graphics/pokemon/gen_4/garchomp/anim_front.png diff --git a/graphics/pokemon/garchomp/anim_frontf.png b/graphics/pokemon/gen_4/garchomp/anim_frontf.png similarity index 100% rename from graphics/pokemon/garchomp/anim_frontf.png rename to graphics/pokemon/gen_4/garchomp/anim_frontf.png diff --git a/graphics/pokemon/garchomp/back.png b/graphics/pokemon/gen_4/garchomp/back.png similarity index 100% rename from graphics/pokemon/garchomp/back.png rename to graphics/pokemon/gen_4/garchomp/back.png diff --git a/graphics/pokemon/garchomp/footprint.png b/graphics/pokemon/gen_4/garchomp/footprint.png similarity index 100% rename from graphics/pokemon/garchomp/footprint.png rename to graphics/pokemon/gen_4/garchomp/footprint.png diff --git a/graphics/pokemon/garchomp/icon.png b/graphics/pokemon/gen_4/garchomp/icon.png similarity index 100% rename from graphics/pokemon/garchomp/icon.png rename to graphics/pokemon/gen_4/garchomp/icon.png diff --git a/graphics/pokemon/garchomp/mega/back.png b/graphics/pokemon/gen_4/garchomp/mega/back.png similarity index 100% rename from graphics/pokemon/garchomp/mega/back.png rename to graphics/pokemon/gen_4/garchomp/mega/back.png diff --git a/graphics/pokemon/garchomp/mega/front.png b/graphics/pokemon/gen_4/garchomp/mega/front.png similarity index 100% rename from graphics/pokemon/garchomp/mega/front.png rename to graphics/pokemon/gen_4/garchomp/mega/front.png diff --git a/graphics/pokemon/garchomp/mega/icon.png b/graphics/pokemon/gen_4/garchomp/mega/icon.png similarity index 100% rename from graphics/pokemon/garchomp/mega/icon.png rename to graphics/pokemon/gen_4/garchomp/mega/icon.png diff --git a/graphics/pokemon/garchomp/mega/normal.pal b/graphics/pokemon/gen_4/garchomp/mega/normal.pal similarity index 100% rename from graphics/pokemon/garchomp/mega/normal.pal rename to graphics/pokemon/gen_4/garchomp/mega/normal.pal diff --git a/graphics/pokemon/garchomp/mega/shiny.pal b/graphics/pokemon/gen_4/garchomp/mega/shiny.pal similarity index 100% rename from graphics/pokemon/garchomp/mega/shiny.pal rename to graphics/pokemon/gen_4/garchomp/mega/shiny.pal diff --git a/graphics/pokemon/garchomp/normal.pal b/graphics/pokemon/gen_4/garchomp/normal.pal similarity index 100% rename from graphics/pokemon/garchomp/normal.pal rename to graphics/pokemon/gen_4/garchomp/normal.pal diff --git a/graphics/pokemon/garchomp/shiny.pal b/graphics/pokemon/gen_4/garchomp/shiny.pal similarity index 100% rename from graphics/pokemon/garchomp/shiny.pal rename to graphics/pokemon/gen_4/garchomp/shiny.pal diff --git a/graphics/pokemon/gastrodon/anim_front.png b/graphics/pokemon/gen_4/gastrodon/anim_front.png similarity index 100% rename from graphics/pokemon/gastrodon/anim_front.png rename to graphics/pokemon/gen_4/gastrodon/anim_front.png diff --git a/graphics/pokemon/gastrodon/back.png b/graphics/pokemon/gen_4/gastrodon/back.png similarity index 100% rename from graphics/pokemon/gastrodon/back.png rename to graphics/pokemon/gen_4/gastrodon/back.png diff --git a/graphics/pokemon/gastrodon/east_sea/anim_front.png b/graphics/pokemon/gen_4/gastrodon/east_sea/anim_front.png similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/anim_front.png rename to graphics/pokemon/gen_4/gastrodon/east_sea/anim_front.png diff --git a/graphics/pokemon/gastrodon/east_sea/back.png b/graphics/pokemon/gen_4/gastrodon/east_sea/back.png similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/back.png rename to graphics/pokemon/gen_4/gastrodon/east_sea/back.png diff --git a/graphics/pokemon/gastrodon/east_sea/icon.png b/graphics/pokemon/gen_4/gastrodon/east_sea/icon.png similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/icon.png rename to graphics/pokemon/gen_4/gastrodon/east_sea/icon.png diff --git a/graphics/pokemon/gastrodon/east_sea/normal.pal b/graphics/pokemon/gen_4/gastrodon/east_sea/normal.pal similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/normal.pal rename to graphics/pokemon/gen_4/gastrodon/east_sea/normal.pal diff --git a/graphics/pokemon/gastrodon/east_sea/shiny.pal b/graphics/pokemon/gen_4/gastrodon/east_sea/shiny.pal similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/shiny.pal rename to graphics/pokemon/gen_4/gastrodon/east_sea/shiny.pal diff --git a/graphics/pokemon/gastrodon/footprint.png b/graphics/pokemon/gen_4/gastrodon/footprint.png similarity index 100% rename from graphics/pokemon/gastrodon/footprint.png rename to graphics/pokemon/gen_4/gastrodon/footprint.png diff --git a/graphics/pokemon/gastrodon/icon.png b/graphics/pokemon/gen_4/gastrodon/icon.png similarity index 100% rename from graphics/pokemon/gastrodon/icon.png rename to graphics/pokemon/gen_4/gastrodon/icon.png diff --git a/graphics/pokemon/gastrodon/normal.pal b/graphics/pokemon/gen_4/gastrodon/normal.pal similarity index 100% rename from graphics/pokemon/gastrodon/normal.pal rename to graphics/pokemon/gen_4/gastrodon/normal.pal diff --git a/graphics/pokemon/gastrodon/shiny.pal b/graphics/pokemon/gen_4/gastrodon/shiny.pal similarity index 100% rename from graphics/pokemon/gastrodon/shiny.pal rename to graphics/pokemon/gen_4/gastrodon/shiny.pal diff --git a/graphics/pokemon/gible/anim_front.png b/graphics/pokemon/gen_4/gible/anim_front.png similarity index 100% rename from graphics/pokemon/gible/anim_front.png rename to graphics/pokemon/gen_4/gible/anim_front.png diff --git a/graphics/pokemon/gible/anim_frontf.png b/graphics/pokemon/gen_4/gible/anim_frontf.png similarity index 100% rename from graphics/pokemon/gible/anim_frontf.png rename to graphics/pokemon/gen_4/gible/anim_frontf.png diff --git a/graphics/pokemon/gible/back.png b/graphics/pokemon/gen_4/gible/back.png similarity index 100% rename from graphics/pokemon/gible/back.png rename to graphics/pokemon/gen_4/gible/back.png diff --git a/graphics/pokemon/gible/backf.png b/graphics/pokemon/gen_4/gible/backf.png similarity index 100% rename from graphics/pokemon/gible/backf.png rename to graphics/pokemon/gen_4/gible/backf.png diff --git a/graphics/pokemon/gible/footprint.png b/graphics/pokemon/gen_4/gible/footprint.png similarity index 100% rename from graphics/pokemon/gible/footprint.png rename to graphics/pokemon/gen_4/gible/footprint.png diff --git a/graphics/pokemon/gible/icon.png b/graphics/pokemon/gen_4/gible/icon.png similarity index 100% rename from graphics/pokemon/gible/icon.png rename to graphics/pokemon/gen_4/gible/icon.png diff --git a/graphics/pokemon/gible/normal.pal b/graphics/pokemon/gen_4/gible/normal.pal similarity index 100% rename from graphics/pokemon/gible/normal.pal rename to graphics/pokemon/gen_4/gible/normal.pal diff --git a/graphics/pokemon/gible/shiny.pal b/graphics/pokemon/gen_4/gible/shiny.pal similarity index 100% rename from graphics/pokemon/gible/shiny.pal rename to graphics/pokemon/gen_4/gible/shiny.pal diff --git a/graphics/pokemon/giratina/anim_front.png b/graphics/pokemon/gen_4/giratina/anim_front.png similarity index 100% rename from graphics/pokemon/giratina/anim_front.png rename to graphics/pokemon/gen_4/giratina/anim_front.png diff --git a/graphics/pokemon/giratina/back.png b/graphics/pokemon/gen_4/giratina/back.png similarity index 100% rename from graphics/pokemon/giratina/back.png rename to graphics/pokemon/gen_4/giratina/back.png diff --git a/graphics/pokemon/giratina/footprint.png b/graphics/pokemon/gen_4/giratina/footprint.png similarity index 100% rename from graphics/pokemon/giratina/footprint.png rename to graphics/pokemon/gen_4/giratina/footprint.png diff --git a/graphics/pokemon/giratina/icon.png b/graphics/pokemon/gen_4/giratina/icon.png similarity index 100% rename from graphics/pokemon/giratina/icon.png rename to graphics/pokemon/gen_4/giratina/icon.png diff --git a/graphics/pokemon/giratina/normal.pal b/graphics/pokemon/gen_4/giratina/normal.pal similarity index 100% rename from graphics/pokemon/giratina/normal.pal rename to graphics/pokemon/gen_4/giratina/normal.pal diff --git a/graphics/pokemon/giratina/origin/anim_front.png b/graphics/pokemon/gen_4/giratina/origin/anim_front.png similarity index 100% rename from graphics/pokemon/giratina/origin/anim_front.png rename to graphics/pokemon/gen_4/giratina/origin/anim_front.png diff --git a/graphics/pokemon/giratina/origin/back.png b/graphics/pokemon/gen_4/giratina/origin/back.png similarity index 100% rename from graphics/pokemon/giratina/origin/back.png rename to graphics/pokemon/gen_4/giratina/origin/back.png diff --git a/graphics/pokemon/giratina/origin/icon.png b/graphics/pokemon/gen_4/giratina/origin/icon.png similarity index 100% rename from graphics/pokemon/giratina/origin/icon.png rename to graphics/pokemon/gen_4/giratina/origin/icon.png diff --git a/graphics/pokemon/giratina/origin/normal.pal b/graphics/pokemon/gen_4/giratina/origin/normal.pal similarity index 100% rename from graphics/pokemon/giratina/origin/normal.pal rename to graphics/pokemon/gen_4/giratina/origin/normal.pal diff --git a/graphics/pokemon/giratina/origin/shiny.pal b/graphics/pokemon/gen_4/giratina/origin/shiny.pal similarity index 100% rename from graphics/pokemon/giratina/origin/shiny.pal rename to graphics/pokemon/gen_4/giratina/origin/shiny.pal diff --git a/graphics/pokemon/giratina/shiny.pal b/graphics/pokemon/gen_4/giratina/shiny.pal similarity index 100% rename from graphics/pokemon/giratina/shiny.pal rename to graphics/pokemon/gen_4/giratina/shiny.pal diff --git a/graphics/pokemon/glaceon/anim_front.png b/graphics/pokemon/gen_4/glaceon/anim_front.png similarity index 100% rename from graphics/pokemon/glaceon/anim_front.png rename to graphics/pokemon/gen_4/glaceon/anim_front.png diff --git a/graphics/pokemon/glaceon/back.png b/graphics/pokemon/gen_4/glaceon/back.png similarity index 100% rename from graphics/pokemon/glaceon/back.png rename to graphics/pokemon/gen_4/glaceon/back.png diff --git a/graphics/pokemon/glaceon/footprint.png b/graphics/pokemon/gen_4/glaceon/footprint.png similarity index 100% rename from graphics/pokemon/glaceon/footprint.png rename to graphics/pokemon/gen_4/glaceon/footprint.png diff --git a/graphics/pokemon/glaceon/icon.png b/graphics/pokemon/gen_4/glaceon/icon.png similarity index 100% rename from graphics/pokemon/glaceon/icon.png rename to graphics/pokemon/gen_4/glaceon/icon.png diff --git a/graphics/pokemon/glaceon/normal.pal b/graphics/pokemon/gen_4/glaceon/normal.pal similarity index 100% rename from graphics/pokemon/glaceon/normal.pal rename to graphics/pokemon/gen_4/glaceon/normal.pal diff --git a/graphics/pokemon/glaceon/shiny.pal b/graphics/pokemon/gen_4/glaceon/shiny.pal similarity index 100% rename from graphics/pokemon/glaceon/shiny.pal rename to graphics/pokemon/gen_4/glaceon/shiny.pal diff --git a/graphics/pokemon/glameow/anim_front.png b/graphics/pokemon/gen_4/glameow/anim_front.png similarity index 100% rename from graphics/pokemon/glameow/anim_front.png rename to graphics/pokemon/gen_4/glameow/anim_front.png diff --git a/graphics/pokemon/glameow/back.png b/graphics/pokemon/gen_4/glameow/back.png similarity index 100% rename from graphics/pokemon/glameow/back.png rename to graphics/pokemon/gen_4/glameow/back.png diff --git a/graphics/pokemon/glameow/footprint.png b/graphics/pokemon/gen_4/glameow/footprint.png similarity index 100% rename from graphics/pokemon/glameow/footprint.png rename to graphics/pokemon/gen_4/glameow/footprint.png diff --git a/graphics/pokemon/glameow/icon.png b/graphics/pokemon/gen_4/glameow/icon.png similarity index 100% rename from graphics/pokemon/glameow/icon.png rename to graphics/pokemon/gen_4/glameow/icon.png diff --git a/graphics/pokemon/glameow/normal.pal b/graphics/pokemon/gen_4/glameow/normal.pal similarity index 100% rename from graphics/pokemon/glameow/normal.pal rename to graphics/pokemon/gen_4/glameow/normal.pal diff --git a/graphics/pokemon/glameow/shiny.pal b/graphics/pokemon/gen_4/glameow/shiny.pal similarity index 100% rename from graphics/pokemon/glameow/shiny.pal rename to graphics/pokemon/gen_4/glameow/shiny.pal diff --git a/graphics/pokemon/gliscor/anim_front.png b/graphics/pokemon/gen_4/gliscor/anim_front.png similarity index 100% rename from graphics/pokemon/gliscor/anim_front.png rename to graphics/pokemon/gen_4/gliscor/anim_front.png diff --git a/graphics/pokemon/gliscor/back.png b/graphics/pokemon/gen_4/gliscor/back.png similarity index 100% rename from graphics/pokemon/gliscor/back.png rename to graphics/pokemon/gen_4/gliscor/back.png diff --git a/graphics/pokemon/gliscor/footprint.png b/graphics/pokemon/gen_4/gliscor/footprint.png similarity index 100% rename from graphics/pokemon/gliscor/footprint.png rename to graphics/pokemon/gen_4/gliscor/footprint.png diff --git a/graphics/pokemon/gliscor/icon.png b/graphics/pokemon/gen_4/gliscor/icon.png similarity index 100% rename from graphics/pokemon/gliscor/icon.png rename to graphics/pokemon/gen_4/gliscor/icon.png diff --git a/graphics/pokemon/gliscor/normal.pal b/graphics/pokemon/gen_4/gliscor/normal.pal similarity index 100% rename from graphics/pokemon/gliscor/normal.pal rename to graphics/pokemon/gen_4/gliscor/normal.pal diff --git a/graphics/pokemon/gliscor/shiny.pal b/graphics/pokemon/gen_4/gliscor/shiny.pal similarity index 100% rename from graphics/pokemon/gliscor/shiny.pal rename to graphics/pokemon/gen_4/gliscor/shiny.pal diff --git a/graphics/pokemon/grotle/anim_front.png b/graphics/pokemon/gen_4/grotle/anim_front.png similarity index 100% rename from graphics/pokemon/grotle/anim_front.png rename to graphics/pokemon/gen_4/grotle/anim_front.png diff --git a/graphics/pokemon/grotle/back.png b/graphics/pokemon/gen_4/grotle/back.png similarity index 100% rename from graphics/pokemon/grotle/back.png rename to graphics/pokemon/gen_4/grotle/back.png diff --git a/graphics/pokemon/grotle/footprint.png b/graphics/pokemon/gen_4/grotle/footprint.png similarity index 100% rename from graphics/pokemon/grotle/footprint.png rename to graphics/pokemon/gen_4/grotle/footprint.png diff --git a/graphics/pokemon/grotle/icon.png b/graphics/pokemon/gen_4/grotle/icon.png similarity index 100% rename from graphics/pokemon/grotle/icon.png rename to graphics/pokemon/gen_4/grotle/icon.png diff --git a/graphics/pokemon/grotle/normal.pal b/graphics/pokemon/gen_4/grotle/normal.pal similarity index 100% rename from graphics/pokemon/grotle/normal.pal rename to graphics/pokemon/gen_4/grotle/normal.pal diff --git a/graphics/pokemon/grotle/shiny.pal b/graphics/pokemon/gen_4/grotle/shiny.pal similarity index 100% rename from graphics/pokemon/grotle/shiny.pal rename to graphics/pokemon/gen_4/grotle/shiny.pal diff --git a/graphics/pokemon/happiny/anim_front.png b/graphics/pokemon/gen_4/happiny/anim_front.png similarity index 100% rename from graphics/pokemon/happiny/anim_front.png rename to graphics/pokemon/gen_4/happiny/anim_front.png diff --git a/graphics/pokemon/happiny/back.png b/graphics/pokemon/gen_4/happiny/back.png similarity index 100% rename from graphics/pokemon/happiny/back.png rename to graphics/pokemon/gen_4/happiny/back.png diff --git a/graphics/pokemon/happiny/footprint.png b/graphics/pokemon/gen_4/happiny/footprint.png similarity index 100% rename from graphics/pokemon/happiny/footprint.png rename to graphics/pokemon/gen_4/happiny/footprint.png diff --git a/graphics/pokemon/happiny/icon.png b/graphics/pokemon/gen_4/happiny/icon.png similarity index 100% rename from graphics/pokemon/happiny/icon.png rename to graphics/pokemon/gen_4/happiny/icon.png diff --git a/graphics/pokemon/happiny/normal.pal b/graphics/pokemon/gen_4/happiny/normal.pal similarity index 100% rename from graphics/pokemon/happiny/normal.pal rename to graphics/pokemon/gen_4/happiny/normal.pal diff --git a/graphics/pokemon/happiny/shiny.pal b/graphics/pokemon/gen_4/happiny/shiny.pal similarity index 100% rename from graphics/pokemon/happiny/shiny.pal rename to graphics/pokemon/gen_4/happiny/shiny.pal diff --git a/graphics/pokemon/heatran/anim_front.png b/graphics/pokemon/gen_4/heatran/anim_front.png similarity index 100% rename from graphics/pokemon/heatran/anim_front.png rename to graphics/pokemon/gen_4/heatran/anim_front.png diff --git a/graphics/pokemon/heatran/back.png b/graphics/pokemon/gen_4/heatran/back.png similarity index 100% rename from graphics/pokemon/heatran/back.png rename to graphics/pokemon/gen_4/heatran/back.png diff --git a/graphics/pokemon/heatran/footprint.png b/graphics/pokemon/gen_4/heatran/footprint.png similarity index 100% rename from graphics/pokemon/heatran/footprint.png rename to graphics/pokemon/gen_4/heatran/footprint.png diff --git a/graphics/pokemon/heatran/icon.png b/graphics/pokemon/gen_4/heatran/icon.png similarity index 100% rename from graphics/pokemon/heatran/icon.png rename to graphics/pokemon/gen_4/heatran/icon.png diff --git a/graphics/pokemon/heatran/normal.pal b/graphics/pokemon/gen_4/heatran/normal.pal similarity index 100% rename from graphics/pokemon/heatran/normal.pal rename to graphics/pokemon/gen_4/heatran/normal.pal diff --git a/graphics/pokemon/heatran/shiny.pal b/graphics/pokemon/gen_4/heatran/shiny.pal similarity index 100% rename from graphics/pokemon/heatran/shiny.pal rename to graphics/pokemon/gen_4/heatran/shiny.pal diff --git a/graphics/pokemon/hippopotas/anim_front.png b/graphics/pokemon/gen_4/hippopotas/anim_front.png similarity index 100% rename from graphics/pokemon/hippopotas/anim_front.png rename to graphics/pokemon/gen_4/hippopotas/anim_front.png diff --git a/graphics/pokemon/hippopotas/back.png b/graphics/pokemon/gen_4/hippopotas/back.png similarity index 100% rename from graphics/pokemon/hippopotas/back.png rename to graphics/pokemon/gen_4/hippopotas/back.png diff --git a/graphics/pokemon/hippopotas/footprint.png b/graphics/pokemon/gen_4/hippopotas/footprint.png similarity index 100% rename from graphics/pokemon/hippopotas/footprint.png rename to graphics/pokemon/gen_4/hippopotas/footprint.png diff --git a/graphics/pokemon/hippopotas/icon.png b/graphics/pokemon/gen_4/hippopotas/icon.png similarity index 100% rename from graphics/pokemon/hippopotas/icon.png rename to graphics/pokemon/gen_4/hippopotas/icon.png diff --git a/graphics/pokemon/hippopotas/iconf.png b/graphics/pokemon/gen_4/hippopotas/iconf.png similarity index 100% rename from graphics/pokemon/hippopotas/iconf.png rename to graphics/pokemon/gen_4/hippopotas/iconf.png diff --git a/graphics/pokemon/hippopotas/normal.pal b/graphics/pokemon/gen_4/hippopotas/normal.pal similarity index 100% rename from graphics/pokemon/hippopotas/normal.pal rename to graphics/pokemon/gen_4/hippopotas/normal.pal diff --git a/graphics/pokemon/hippopotas/normalf.pal b/graphics/pokemon/gen_4/hippopotas/normalf.pal similarity index 100% rename from graphics/pokemon/hippopotas/normalf.pal rename to graphics/pokemon/gen_4/hippopotas/normalf.pal diff --git a/graphics/pokemon/hippopotas/shiny.pal b/graphics/pokemon/gen_4/hippopotas/shiny.pal similarity index 100% rename from graphics/pokemon/hippopotas/shiny.pal rename to graphics/pokemon/gen_4/hippopotas/shiny.pal diff --git a/graphics/pokemon/hippopotas/shinyf.pal b/graphics/pokemon/gen_4/hippopotas/shinyf.pal similarity index 100% rename from graphics/pokemon/hippopotas/shinyf.pal rename to graphics/pokemon/gen_4/hippopotas/shinyf.pal diff --git a/graphics/pokemon/hippowdon/anim_front.png b/graphics/pokemon/gen_4/hippowdon/anim_front.png similarity index 100% rename from graphics/pokemon/hippowdon/anim_front.png rename to graphics/pokemon/gen_4/hippowdon/anim_front.png diff --git a/graphics/pokemon/hippowdon/back.png b/graphics/pokemon/gen_4/hippowdon/back.png similarity index 100% rename from graphics/pokemon/hippowdon/back.png rename to graphics/pokemon/gen_4/hippowdon/back.png diff --git a/graphics/pokemon/hippowdon/footprint.png b/graphics/pokemon/gen_4/hippowdon/footprint.png similarity index 100% rename from graphics/pokemon/hippowdon/footprint.png rename to graphics/pokemon/gen_4/hippowdon/footprint.png diff --git a/graphics/pokemon/hippowdon/icon.png b/graphics/pokemon/gen_4/hippowdon/icon.png similarity index 100% rename from graphics/pokemon/hippowdon/icon.png rename to graphics/pokemon/gen_4/hippowdon/icon.png diff --git a/graphics/pokemon/hippowdon/iconf.png b/graphics/pokemon/gen_4/hippowdon/iconf.png similarity index 100% rename from graphics/pokemon/hippowdon/iconf.png rename to graphics/pokemon/gen_4/hippowdon/iconf.png diff --git a/graphics/pokemon/hippowdon/normal.pal b/graphics/pokemon/gen_4/hippowdon/normal.pal similarity index 100% rename from graphics/pokemon/hippowdon/normal.pal rename to graphics/pokemon/gen_4/hippowdon/normal.pal diff --git a/graphics/pokemon/hippowdon/normalf.pal b/graphics/pokemon/gen_4/hippowdon/normalf.pal similarity index 100% rename from graphics/pokemon/hippowdon/normalf.pal rename to graphics/pokemon/gen_4/hippowdon/normalf.pal diff --git a/graphics/pokemon/hippowdon/shiny.pal b/graphics/pokemon/gen_4/hippowdon/shiny.pal similarity index 100% rename from graphics/pokemon/hippowdon/shiny.pal rename to graphics/pokemon/gen_4/hippowdon/shiny.pal diff --git a/graphics/pokemon/hippowdon/shinyf.pal b/graphics/pokemon/gen_4/hippowdon/shinyf.pal similarity index 100% rename from graphics/pokemon/hippowdon/shinyf.pal rename to graphics/pokemon/gen_4/hippowdon/shinyf.pal diff --git a/graphics/pokemon/honchkrow/anim_front.png b/graphics/pokemon/gen_4/honchkrow/anim_front.png similarity index 100% rename from graphics/pokemon/honchkrow/anim_front.png rename to graphics/pokemon/gen_4/honchkrow/anim_front.png diff --git a/graphics/pokemon/honchkrow/back.png b/graphics/pokemon/gen_4/honchkrow/back.png similarity index 100% rename from graphics/pokemon/honchkrow/back.png rename to graphics/pokemon/gen_4/honchkrow/back.png diff --git a/graphics/pokemon/honchkrow/footprint.png b/graphics/pokemon/gen_4/honchkrow/footprint.png similarity index 100% rename from graphics/pokemon/honchkrow/footprint.png rename to graphics/pokemon/gen_4/honchkrow/footprint.png diff --git a/graphics/pokemon/honchkrow/icon.png b/graphics/pokemon/gen_4/honchkrow/icon.png similarity index 100% rename from graphics/pokemon/honchkrow/icon.png rename to graphics/pokemon/gen_4/honchkrow/icon.png diff --git a/graphics/pokemon/honchkrow/normal.pal b/graphics/pokemon/gen_4/honchkrow/normal.pal similarity index 100% rename from graphics/pokemon/honchkrow/normal.pal rename to graphics/pokemon/gen_4/honchkrow/normal.pal diff --git a/graphics/pokemon/honchkrow/shiny.pal b/graphics/pokemon/gen_4/honchkrow/shiny.pal similarity index 100% rename from graphics/pokemon/honchkrow/shiny.pal rename to graphics/pokemon/gen_4/honchkrow/shiny.pal diff --git a/graphics/pokemon/infernape/anim_front.png b/graphics/pokemon/gen_4/infernape/anim_front.png similarity index 100% rename from graphics/pokemon/infernape/anim_front.png rename to graphics/pokemon/gen_4/infernape/anim_front.png diff --git a/graphics/pokemon/infernape/back.png b/graphics/pokemon/gen_4/infernape/back.png similarity index 100% rename from graphics/pokemon/infernape/back.png rename to graphics/pokemon/gen_4/infernape/back.png diff --git a/graphics/pokemon/infernape/footprint.png b/graphics/pokemon/gen_4/infernape/footprint.png similarity index 100% rename from graphics/pokemon/infernape/footprint.png rename to graphics/pokemon/gen_4/infernape/footprint.png diff --git a/graphics/pokemon/infernape/icon.png b/graphics/pokemon/gen_4/infernape/icon.png similarity index 100% rename from graphics/pokemon/infernape/icon.png rename to graphics/pokemon/gen_4/infernape/icon.png diff --git a/graphics/pokemon/infernape/normal.pal b/graphics/pokemon/gen_4/infernape/normal.pal similarity index 100% rename from graphics/pokemon/infernape/normal.pal rename to graphics/pokemon/gen_4/infernape/normal.pal diff --git a/graphics/pokemon/infernape/shiny.pal b/graphics/pokemon/gen_4/infernape/shiny.pal similarity index 100% rename from graphics/pokemon/infernape/shiny.pal rename to graphics/pokemon/gen_4/infernape/shiny.pal diff --git a/graphics/pokemon/kricketot/anim_front.png b/graphics/pokemon/gen_4/kricketot/anim_front.png similarity index 100% rename from graphics/pokemon/kricketot/anim_front.png rename to graphics/pokemon/gen_4/kricketot/anim_front.png diff --git a/graphics/pokemon/kricketot/anim_frontf.png b/graphics/pokemon/gen_4/kricketot/anim_frontf.png similarity index 100% rename from graphics/pokemon/kricketot/anim_frontf.png rename to graphics/pokemon/gen_4/kricketot/anim_frontf.png diff --git a/graphics/pokemon/kricketot/back.png b/graphics/pokemon/gen_4/kricketot/back.png similarity index 100% rename from graphics/pokemon/kricketot/back.png rename to graphics/pokemon/gen_4/kricketot/back.png diff --git a/graphics/pokemon/kricketot/backf.png b/graphics/pokemon/gen_4/kricketot/backf.png similarity index 100% rename from graphics/pokemon/kricketot/backf.png rename to graphics/pokemon/gen_4/kricketot/backf.png diff --git a/graphics/pokemon/kricketot/footprint.png b/graphics/pokemon/gen_4/kricketot/footprint.png similarity index 100% rename from graphics/pokemon/kricketot/footprint.png rename to graphics/pokemon/gen_4/kricketot/footprint.png diff --git a/graphics/pokemon/kricketot/icon.png b/graphics/pokemon/gen_4/kricketot/icon.png similarity index 100% rename from graphics/pokemon/kricketot/icon.png rename to graphics/pokemon/gen_4/kricketot/icon.png diff --git a/graphics/pokemon/kricketot/normal.pal b/graphics/pokemon/gen_4/kricketot/normal.pal similarity index 100% rename from graphics/pokemon/kricketot/normal.pal rename to graphics/pokemon/gen_4/kricketot/normal.pal diff --git a/graphics/pokemon/kricketot/shiny.pal b/graphics/pokemon/gen_4/kricketot/shiny.pal similarity index 100% rename from graphics/pokemon/kricketot/shiny.pal rename to graphics/pokemon/gen_4/kricketot/shiny.pal diff --git a/graphics/pokemon/kricketune/anim_front.png b/graphics/pokemon/gen_4/kricketune/anim_front.png similarity index 100% rename from graphics/pokemon/kricketune/anim_front.png rename to graphics/pokemon/gen_4/kricketune/anim_front.png diff --git a/graphics/pokemon/kricketune/anim_frontf.png b/graphics/pokemon/gen_4/kricketune/anim_frontf.png similarity index 100% rename from graphics/pokemon/kricketune/anim_frontf.png rename to graphics/pokemon/gen_4/kricketune/anim_frontf.png diff --git a/graphics/pokemon/kricketune/back.png b/graphics/pokemon/gen_4/kricketune/back.png similarity index 100% rename from graphics/pokemon/kricketune/back.png rename to graphics/pokemon/gen_4/kricketune/back.png diff --git a/graphics/pokemon/kricketune/backf.png b/graphics/pokemon/gen_4/kricketune/backf.png similarity index 100% rename from graphics/pokemon/kricketune/backf.png rename to graphics/pokemon/gen_4/kricketune/backf.png diff --git a/graphics/pokemon/gourgeist/footprint.png b/graphics/pokemon/gen_4/kricketune/footprint.png similarity index 100% rename from graphics/pokemon/gourgeist/footprint.png rename to graphics/pokemon/gen_4/kricketune/footprint.png diff --git a/graphics/pokemon/kricketune/icon.png b/graphics/pokemon/gen_4/kricketune/icon.png similarity index 100% rename from graphics/pokemon/kricketune/icon.png rename to graphics/pokemon/gen_4/kricketune/icon.png diff --git a/graphics/pokemon/kricketune/normal.pal b/graphics/pokemon/gen_4/kricketune/normal.pal similarity index 100% rename from graphics/pokemon/kricketune/normal.pal rename to graphics/pokemon/gen_4/kricketune/normal.pal diff --git a/graphics/pokemon/kricketune/shiny.pal b/graphics/pokemon/gen_4/kricketune/shiny.pal similarity index 100% rename from graphics/pokemon/kricketune/shiny.pal rename to graphics/pokemon/gen_4/kricketune/shiny.pal diff --git a/graphics/pokemon/leafeon/anim_front.png b/graphics/pokemon/gen_4/leafeon/anim_front.png similarity index 100% rename from graphics/pokemon/leafeon/anim_front.png rename to graphics/pokemon/gen_4/leafeon/anim_front.png diff --git a/graphics/pokemon/leafeon/back.png b/graphics/pokemon/gen_4/leafeon/back.png similarity index 100% rename from graphics/pokemon/leafeon/back.png rename to graphics/pokemon/gen_4/leafeon/back.png diff --git a/graphics/pokemon/leafeon/footprint.png b/graphics/pokemon/gen_4/leafeon/footprint.png similarity index 100% rename from graphics/pokemon/leafeon/footprint.png rename to graphics/pokemon/gen_4/leafeon/footprint.png diff --git a/graphics/pokemon/leafeon/icon.png b/graphics/pokemon/gen_4/leafeon/icon.png similarity index 100% rename from graphics/pokemon/leafeon/icon.png rename to graphics/pokemon/gen_4/leafeon/icon.png diff --git a/graphics/pokemon/leafeon/normal.pal b/graphics/pokemon/gen_4/leafeon/normal.pal similarity index 100% rename from graphics/pokemon/leafeon/normal.pal rename to graphics/pokemon/gen_4/leafeon/normal.pal diff --git a/graphics/pokemon/leafeon/shiny.pal b/graphics/pokemon/gen_4/leafeon/shiny.pal similarity index 100% rename from graphics/pokemon/leafeon/shiny.pal rename to graphics/pokemon/gen_4/leafeon/shiny.pal diff --git a/graphics/pokemon/lickilicky/anim_front.png b/graphics/pokemon/gen_4/lickilicky/anim_front.png similarity index 100% rename from graphics/pokemon/lickilicky/anim_front.png rename to graphics/pokemon/gen_4/lickilicky/anim_front.png diff --git a/graphics/pokemon/lickilicky/back.png b/graphics/pokemon/gen_4/lickilicky/back.png similarity index 100% rename from graphics/pokemon/lickilicky/back.png rename to graphics/pokemon/gen_4/lickilicky/back.png diff --git a/graphics/pokemon/lickilicky/footprint.png b/graphics/pokemon/gen_4/lickilicky/footprint.png similarity index 100% rename from graphics/pokemon/lickilicky/footprint.png rename to graphics/pokemon/gen_4/lickilicky/footprint.png diff --git a/graphics/pokemon/lickilicky/icon.png b/graphics/pokemon/gen_4/lickilicky/icon.png similarity index 100% rename from graphics/pokemon/lickilicky/icon.png rename to graphics/pokemon/gen_4/lickilicky/icon.png diff --git a/graphics/pokemon/lickilicky/normal.pal b/graphics/pokemon/gen_4/lickilicky/normal.pal similarity index 100% rename from graphics/pokemon/lickilicky/normal.pal rename to graphics/pokemon/gen_4/lickilicky/normal.pal diff --git a/graphics/pokemon/lickilicky/shiny.pal b/graphics/pokemon/gen_4/lickilicky/shiny.pal similarity index 100% rename from graphics/pokemon/lickilicky/shiny.pal rename to graphics/pokemon/gen_4/lickilicky/shiny.pal diff --git a/graphics/pokemon/lopunny/anim_front.png b/graphics/pokemon/gen_4/lopunny/anim_front.png similarity index 100% rename from graphics/pokemon/lopunny/anim_front.png rename to graphics/pokemon/gen_4/lopunny/anim_front.png diff --git a/graphics/pokemon/lopunny/back.png b/graphics/pokemon/gen_4/lopunny/back.png similarity index 100% rename from graphics/pokemon/lopunny/back.png rename to graphics/pokemon/gen_4/lopunny/back.png diff --git a/graphics/pokemon/lopunny/footprint.png b/graphics/pokemon/gen_4/lopunny/footprint.png similarity index 100% rename from graphics/pokemon/lopunny/footprint.png rename to graphics/pokemon/gen_4/lopunny/footprint.png diff --git a/graphics/pokemon/lopunny/icon.png b/graphics/pokemon/gen_4/lopunny/icon.png similarity index 100% rename from graphics/pokemon/lopunny/icon.png rename to graphics/pokemon/gen_4/lopunny/icon.png diff --git a/graphics/pokemon/lopunny/mega/back.png b/graphics/pokemon/gen_4/lopunny/mega/back.png similarity index 100% rename from graphics/pokemon/lopunny/mega/back.png rename to graphics/pokemon/gen_4/lopunny/mega/back.png diff --git a/graphics/pokemon/lopunny/mega/front.png b/graphics/pokemon/gen_4/lopunny/mega/front.png similarity index 100% rename from graphics/pokemon/lopunny/mega/front.png rename to graphics/pokemon/gen_4/lopunny/mega/front.png diff --git a/graphics/pokemon/lopunny/mega/icon.png b/graphics/pokemon/gen_4/lopunny/mega/icon.png similarity index 100% rename from graphics/pokemon/lopunny/mega/icon.png rename to graphics/pokemon/gen_4/lopunny/mega/icon.png diff --git a/graphics/pokemon/lopunny/mega/normal.pal b/graphics/pokemon/gen_4/lopunny/mega/normal.pal similarity index 100% rename from graphics/pokemon/lopunny/mega/normal.pal rename to graphics/pokemon/gen_4/lopunny/mega/normal.pal diff --git a/graphics/pokemon/lopunny/mega/shiny.pal b/graphics/pokemon/gen_4/lopunny/mega/shiny.pal similarity index 100% rename from graphics/pokemon/lopunny/mega/shiny.pal rename to graphics/pokemon/gen_4/lopunny/mega/shiny.pal diff --git a/graphics/pokemon/lopunny/normal.pal b/graphics/pokemon/gen_4/lopunny/normal.pal similarity index 100% rename from graphics/pokemon/lopunny/normal.pal rename to graphics/pokemon/gen_4/lopunny/normal.pal diff --git a/graphics/pokemon/lopunny/shiny.pal b/graphics/pokemon/gen_4/lopunny/shiny.pal similarity index 100% rename from graphics/pokemon/lopunny/shiny.pal rename to graphics/pokemon/gen_4/lopunny/shiny.pal diff --git a/graphics/pokemon/lucario/anim_front.png b/graphics/pokemon/gen_4/lucario/anim_front.png similarity index 100% rename from graphics/pokemon/lucario/anim_front.png rename to graphics/pokemon/gen_4/lucario/anim_front.png diff --git a/graphics/pokemon/lucario/back.png b/graphics/pokemon/gen_4/lucario/back.png similarity index 100% rename from graphics/pokemon/lucario/back.png rename to graphics/pokemon/gen_4/lucario/back.png diff --git a/graphics/pokemon/lucario/footprint.png b/graphics/pokemon/gen_4/lucario/footprint.png similarity index 100% rename from graphics/pokemon/lucario/footprint.png rename to graphics/pokemon/gen_4/lucario/footprint.png diff --git a/graphics/pokemon/lucario/icon.png b/graphics/pokemon/gen_4/lucario/icon.png similarity index 100% rename from graphics/pokemon/lucario/icon.png rename to graphics/pokemon/gen_4/lucario/icon.png diff --git a/graphics/pokemon/lucario/mega/back.png b/graphics/pokemon/gen_4/lucario/mega/back.png similarity index 100% rename from graphics/pokemon/lucario/mega/back.png rename to graphics/pokemon/gen_4/lucario/mega/back.png diff --git a/graphics/pokemon/lucario/mega/front.png b/graphics/pokemon/gen_4/lucario/mega/front.png similarity index 100% rename from graphics/pokemon/lucario/mega/front.png rename to graphics/pokemon/gen_4/lucario/mega/front.png diff --git a/graphics/pokemon/lucario/mega/icon.png b/graphics/pokemon/gen_4/lucario/mega/icon.png similarity index 100% rename from graphics/pokemon/lucario/mega/icon.png rename to graphics/pokemon/gen_4/lucario/mega/icon.png diff --git a/graphics/pokemon/lucario/mega/normal.pal b/graphics/pokemon/gen_4/lucario/mega/normal.pal similarity index 100% rename from graphics/pokemon/lucario/mega/normal.pal rename to graphics/pokemon/gen_4/lucario/mega/normal.pal diff --git a/graphics/pokemon/lucario/mega/shiny.pal b/graphics/pokemon/gen_4/lucario/mega/shiny.pal similarity index 100% rename from graphics/pokemon/lucario/mega/shiny.pal rename to graphics/pokemon/gen_4/lucario/mega/shiny.pal diff --git a/graphics/pokemon/lucario/normal.pal b/graphics/pokemon/gen_4/lucario/normal.pal similarity index 100% rename from graphics/pokemon/lucario/normal.pal rename to graphics/pokemon/gen_4/lucario/normal.pal diff --git a/graphics/pokemon/lucario/shiny.pal b/graphics/pokemon/gen_4/lucario/shiny.pal similarity index 100% rename from graphics/pokemon/lucario/shiny.pal rename to graphics/pokemon/gen_4/lucario/shiny.pal diff --git a/graphics/pokemon/lumineon/anim_front.png b/graphics/pokemon/gen_4/lumineon/anim_front.png similarity index 100% rename from graphics/pokemon/lumineon/anim_front.png rename to graphics/pokemon/gen_4/lumineon/anim_front.png diff --git a/graphics/pokemon/lumineon/anim_frontf.png b/graphics/pokemon/gen_4/lumineon/anim_frontf.png similarity index 100% rename from graphics/pokemon/lumineon/anim_frontf.png rename to graphics/pokemon/gen_4/lumineon/anim_frontf.png diff --git a/graphics/pokemon/lumineon/back.png b/graphics/pokemon/gen_4/lumineon/back.png similarity index 100% rename from graphics/pokemon/lumineon/back.png rename to graphics/pokemon/gen_4/lumineon/back.png diff --git a/graphics/pokemon/lumineon/backf.png b/graphics/pokemon/gen_4/lumineon/backf.png similarity index 100% rename from graphics/pokemon/lumineon/backf.png rename to graphics/pokemon/gen_4/lumineon/backf.png diff --git a/graphics/pokemon/kingdra/footprint.png b/graphics/pokemon/gen_4/lumineon/footprint.png similarity index 100% rename from graphics/pokemon/kingdra/footprint.png rename to graphics/pokemon/gen_4/lumineon/footprint.png diff --git a/graphics/pokemon/lumineon/icon.png b/graphics/pokemon/gen_4/lumineon/icon.png similarity index 100% rename from graphics/pokemon/lumineon/icon.png rename to graphics/pokemon/gen_4/lumineon/icon.png diff --git a/graphics/pokemon/lumineon/normal.pal b/graphics/pokemon/gen_4/lumineon/normal.pal similarity index 100% rename from graphics/pokemon/lumineon/normal.pal rename to graphics/pokemon/gen_4/lumineon/normal.pal diff --git a/graphics/pokemon/lumineon/shiny.pal b/graphics/pokemon/gen_4/lumineon/shiny.pal similarity index 100% rename from graphics/pokemon/lumineon/shiny.pal rename to graphics/pokemon/gen_4/lumineon/shiny.pal diff --git a/graphics/pokemon/luxio/anim_front.png b/graphics/pokemon/gen_4/luxio/anim_front.png similarity index 100% rename from graphics/pokemon/luxio/anim_front.png rename to graphics/pokemon/gen_4/luxio/anim_front.png diff --git a/graphics/pokemon/luxio/anim_frontf.png b/graphics/pokemon/gen_4/luxio/anim_frontf.png similarity index 100% rename from graphics/pokemon/luxio/anim_frontf.png rename to graphics/pokemon/gen_4/luxio/anim_frontf.png diff --git a/graphics/pokemon/luxio/back.png b/graphics/pokemon/gen_4/luxio/back.png similarity index 100% rename from graphics/pokemon/luxio/back.png rename to graphics/pokemon/gen_4/luxio/back.png diff --git a/graphics/pokemon/luxio/backf.png b/graphics/pokemon/gen_4/luxio/backf.png similarity index 100% rename from graphics/pokemon/luxio/backf.png rename to graphics/pokemon/gen_4/luxio/backf.png diff --git a/graphics/pokemon/luxio/footprint.png b/graphics/pokemon/gen_4/luxio/footprint.png similarity index 100% rename from graphics/pokemon/luxio/footprint.png rename to graphics/pokemon/gen_4/luxio/footprint.png diff --git a/graphics/pokemon/luxio/icon.png b/graphics/pokemon/gen_4/luxio/icon.png similarity index 100% rename from graphics/pokemon/luxio/icon.png rename to graphics/pokemon/gen_4/luxio/icon.png diff --git a/graphics/pokemon/luxio/normal.pal b/graphics/pokemon/gen_4/luxio/normal.pal similarity index 100% rename from graphics/pokemon/luxio/normal.pal rename to graphics/pokemon/gen_4/luxio/normal.pal diff --git a/graphics/pokemon/luxio/shiny.pal b/graphics/pokemon/gen_4/luxio/shiny.pal similarity index 100% rename from graphics/pokemon/luxio/shiny.pal rename to graphics/pokemon/gen_4/luxio/shiny.pal diff --git a/graphics/pokemon/luxray/anim_front.png b/graphics/pokemon/gen_4/luxray/anim_front.png similarity index 100% rename from graphics/pokemon/luxray/anim_front.png rename to graphics/pokemon/gen_4/luxray/anim_front.png diff --git a/graphics/pokemon/luxray/anim_frontf.png b/graphics/pokemon/gen_4/luxray/anim_frontf.png similarity index 100% rename from graphics/pokemon/luxray/anim_frontf.png rename to graphics/pokemon/gen_4/luxray/anim_frontf.png diff --git a/graphics/pokemon/luxray/back.png b/graphics/pokemon/gen_4/luxray/back.png similarity index 100% rename from graphics/pokemon/luxray/back.png rename to graphics/pokemon/gen_4/luxray/back.png diff --git a/graphics/pokemon/luxray/backf.png b/graphics/pokemon/gen_4/luxray/backf.png similarity index 100% rename from graphics/pokemon/luxray/backf.png rename to graphics/pokemon/gen_4/luxray/backf.png diff --git a/graphics/pokemon/luxray/footprint.png b/graphics/pokemon/gen_4/luxray/footprint.png similarity index 100% rename from graphics/pokemon/luxray/footprint.png rename to graphics/pokemon/gen_4/luxray/footprint.png diff --git a/graphics/pokemon/luxray/icon.png b/graphics/pokemon/gen_4/luxray/icon.png similarity index 100% rename from graphics/pokemon/luxray/icon.png rename to graphics/pokemon/gen_4/luxray/icon.png diff --git a/graphics/pokemon/luxray/normal.pal b/graphics/pokemon/gen_4/luxray/normal.pal similarity index 100% rename from graphics/pokemon/luxray/normal.pal rename to graphics/pokemon/gen_4/luxray/normal.pal diff --git a/graphics/pokemon/luxray/shiny.pal b/graphics/pokemon/gen_4/luxray/shiny.pal similarity index 100% rename from graphics/pokemon/luxray/shiny.pal rename to graphics/pokemon/gen_4/luxray/shiny.pal diff --git a/graphics/pokemon/magmortar/anim_front.png b/graphics/pokemon/gen_4/magmortar/anim_front.png similarity index 100% rename from graphics/pokemon/magmortar/anim_front.png rename to graphics/pokemon/gen_4/magmortar/anim_front.png diff --git a/graphics/pokemon/magmortar/back.png b/graphics/pokemon/gen_4/magmortar/back.png similarity index 100% rename from graphics/pokemon/magmortar/back.png rename to graphics/pokemon/gen_4/magmortar/back.png diff --git a/graphics/pokemon/magmortar/footprint.png b/graphics/pokemon/gen_4/magmortar/footprint.png similarity index 100% rename from graphics/pokemon/magmortar/footprint.png rename to graphics/pokemon/gen_4/magmortar/footprint.png diff --git a/graphics/pokemon/magmortar/icon.png b/graphics/pokemon/gen_4/magmortar/icon.png similarity index 100% rename from graphics/pokemon/magmortar/icon.png rename to graphics/pokemon/gen_4/magmortar/icon.png diff --git a/graphics/pokemon/magmortar/normal.pal b/graphics/pokemon/gen_4/magmortar/normal.pal similarity index 100% rename from graphics/pokemon/magmortar/normal.pal rename to graphics/pokemon/gen_4/magmortar/normal.pal diff --git a/graphics/pokemon/magmortar/shiny.pal b/graphics/pokemon/gen_4/magmortar/shiny.pal similarity index 100% rename from graphics/pokemon/magmortar/shiny.pal rename to graphics/pokemon/gen_4/magmortar/shiny.pal diff --git a/graphics/pokemon/magnezone/anim_front.png b/graphics/pokemon/gen_4/magnezone/anim_front.png similarity index 100% rename from graphics/pokemon/magnezone/anim_front.png rename to graphics/pokemon/gen_4/magnezone/anim_front.png diff --git a/graphics/pokemon/magnezone/back.png b/graphics/pokemon/gen_4/magnezone/back.png similarity index 100% rename from graphics/pokemon/magnezone/back.png rename to graphics/pokemon/gen_4/magnezone/back.png diff --git a/graphics/pokemon/klang/footprint.png b/graphics/pokemon/gen_4/magnezone/footprint.png similarity index 100% rename from graphics/pokemon/klang/footprint.png rename to graphics/pokemon/gen_4/magnezone/footprint.png diff --git a/graphics/pokemon/magnezone/icon.png b/graphics/pokemon/gen_4/magnezone/icon.png similarity index 100% rename from graphics/pokemon/magnezone/icon.png rename to graphics/pokemon/gen_4/magnezone/icon.png diff --git a/graphics/pokemon/magnezone/normal.pal b/graphics/pokemon/gen_4/magnezone/normal.pal similarity index 100% rename from graphics/pokemon/magnezone/normal.pal rename to graphics/pokemon/gen_4/magnezone/normal.pal diff --git a/graphics/pokemon/magnezone/shiny.pal b/graphics/pokemon/gen_4/magnezone/shiny.pal similarity index 100% rename from graphics/pokemon/magnezone/shiny.pal rename to graphics/pokemon/gen_4/magnezone/shiny.pal diff --git a/graphics/pokemon/mamoswine/anim_front.png b/graphics/pokemon/gen_4/mamoswine/anim_front.png similarity index 100% rename from graphics/pokemon/mamoswine/anim_front.png rename to graphics/pokemon/gen_4/mamoswine/anim_front.png diff --git a/graphics/pokemon/mamoswine/anim_frontf.png b/graphics/pokemon/gen_4/mamoswine/anim_frontf.png similarity index 100% rename from graphics/pokemon/mamoswine/anim_frontf.png rename to graphics/pokemon/gen_4/mamoswine/anim_frontf.png diff --git a/graphics/pokemon/mamoswine/back.png b/graphics/pokemon/gen_4/mamoswine/back.png similarity index 100% rename from graphics/pokemon/mamoswine/back.png rename to graphics/pokemon/gen_4/mamoswine/back.png diff --git a/graphics/pokemon/mamoswine/footprint.png b/graphics/pokemon/gen_4/mamoswine/footprint.png similarity index 100% rename from graphics/pokemon/mamoswine/footprint.png rename to graphics/pokemon/gen_4/mamoswine/footprint.png diff --git a/graphics/pokemon/mamoswine/icon.png b/graphics/pokemon/gen_4/mamoswine/icon.png similarity index 100% rename from graphics/pokemon/mamoswine/icon.png rename to graphics/pokemon/gen_4/mamoswine/icon.png diff --git a/graphics/pokemon/mamoswine/normal.pal b/graphics/pokemon/gen_4/mamoswine/normal.pal similarity index 100% rename from graphics/pokemon/mamoswine/normal.pal rename to graphics/pokemon/gen_4/mamoswine/normal.pal diff --git a/graphics/pokemon/mamoswine/shiny.pal b/graphics/pokemon/gen_4/mamoswine/shiny.pal similarity index 100% rename from graphics/pokemon/mamoswine/shiny.pal rename to graphics/pokemon/gen_4/mamoswine/shiny.pal diff --git a/graphics/pokemon/manaphy/anim_front.png b/graphics/pokemon/gen_4/manaphy/anim_front.png similarity index 100% rename from graphics/pokemon/manaphy/anim_front.png rename to graphics/pokemon/gen_4/manaphy/anim_front.png diff --git a/graphics/pokemon/manaphy/back.png b/graphics/pokemon/gen_4/manaphy/back.png similarity index 100% rename from graphics/pokemon/manaphy/back.png rename to graphics/pokemon/gen_4/manaphy/back.png diff --git a/graphics/pokemon/klefki/footprint.png b/graphics/pokemon/gen_4/manaphy/footprint.png similarity index 100% rename from graphics/pokemon/klefki/footprint.png rename to graphics/pokemon/gen_4/manaphy/footprint.png diff --git a/graphics/pokemon/manaphy/icon.png b/graphics/pokemon/gen_4/manaphy/icon.png similarity index 100% rename from graphics/pokemon/manaphy/icon.png rename to graphics/pokemon/gen_4/manaphy/icon.png diff --git a/graphics/pokemon/manaphy/normal.pal b/graphics/pokemon/gen_4/manaphy/normal.pal similarity index 100% rename from graphics/pokemon/manaphy/normal.pal rename to graphics/pokemon/gen_4/manaphy/normal.pal diff --git a/graphics/pokemon/manaphy/shiny.pal b/graphics/pokemon/gen_4/manaphy/shiny.pal similarity index 100% rename from graphics/pokemon/manaphy/shiny.pal rename to graphics/pokemon/gen_4/manaphy/shiny.pal diff --git a/graphics/pokemon/mantyke/anim_front.png b/graphics/pokemon/gen_4/mantyke/anim_front.png similarity index 100% rename from graphics/pokemon/mantyke/anim_front.png rename to graphics/pokemon/gen_4/mantyke/anim_front.png diff --git a/graphics/pokemon/mantyke/back.png b/graphics/pokemon/gen_4/mantyke/back.png similarity index 100% rename from graphics/pokemon/mantyke/back.png rename to graphics/pokemon/gen_4/mantyke/back.png diff --git a/graphics/pokemon/klink/footprint.png b/graphics/pokemon/gen_4/mantyke/footprint.png similarity index 100% rename from graphics/pokemon/klink/footprint.png rename to graphics/pokemon/gen_4/mantyke/footprint.png diff --git a/graphics/pokemon/mantyke/icon.png b/graphics/pokemon/gen_4/mantyke/icon.png similarity index 100% rename from graphics/pokemon/mantyke/icon.png rename to graphics/pokemon/gen_4/mantyke/icon.png diff --git a/graphics/pokemon/mantyke/normal.pal b/graphics/pokemon/gen_4/mantyke/normal.pal similarity index 100% rename from graphics/pokemon/mantyke/normal.pal rename to graphics/pokemon/gen_4/mantyke/normal.pal diff --git a/graphics/pokemon/mantyke/shiny.pal b/graphics/pokemon/gen_4/mantyke/shiny.pal similarity index 100% rename from graphics/pokemon/mantyke/shiny.pal rename to graphics/pokemon/gen_4/mantyke/shiny.pal diff --git a/graphics/pokemon/mesprit/anim_front.png b/graphics/pokemon/gen_4/mesprit/anim_front.png similarity index 100% rename from graphics/pokemon/mesprit/anim_front.png rename to graphics/pokemon/gen_4/mesprit/anim_front.png diff --git a/graphics/pokemon/mesprit/back.png b/graphics/pokemon/gen_4/mesprit/back.png similarity index 100% rename from graphics/pokemon/mesprit/back.png rename to graphics/pokemon/gen_4/mesprit/back.png diff --git a/graphics/pokemon/mesprit/footprint.png b/graphics/pokemon/gen_4/mesprit/footprint.png similarity index 100% rename from graphics/pokemon/mesprit/footprint.png rename to graphics/pokemon/gen_4/mesprit/footprint.png diff --git a/graphics/pokemon/mesprit/icon.png b/graphics/pokemon/gen_4/mesprit/icon.png similarity index 100% rename from graphics/pokemon/mesprit/icon.png rename to graphics/pokemon/gen_4/mesprit/icon.png diff --git a/graphics/pokemon/mesprit/normal.pal b/graphics/pokemon/gen_4/mesprit/normal.pal similarity index 100% rename from graphics/pokemon/mesprit/normal.pal rename to graphics/pokemon/gen_4/mesprit/normal.pal diff --git a/graphics/pokemon/mesprit/shiny.pal b/graphics/pokemon/gen_4/mesprit/shiny.pal similarity index 100% rename from graphics/pokemon/mesprit/shiny.pal rename to graphics/pokemon/gen_4/mesprit/shiny.pal diff --git a/graphics/pokemon/mime_jr/anim_front.png b/graphics/pokemon/gen_4/mime_jr/anim_front.png similarity index 100% rename from graphics/pokemon/mime_jr/anim_front.png rename to graphics/pokemon/gen_4/mime_jr/anim_front.png diff --git a/graphics/pokemon/mime_jr/back.png b/graphics/pokemon/gen_4/mime_jr/back.png similarity index 100% rename from graphics/pokemon/mime_jr/back.png rename to graphics/pokemon/gen_4/mime_jr/back.png diff --git a/graphics/pokemon/cursola/footprint.png b/graphics/pokemon/gen_4/mime_jr/footprint.png similarity index 100% rename from graphics/pokemon/cursola/footprint.png rename to graphics/pokemon/gen_4/mime_jr/footprint.png diff --git a/graphics/pokemon/mime_jr/icon.png b/graphics/pokemon/gen_4/mime_jr/icon.png similarity index 100% rename from graphics/pokemon/mime_jr/icon.png rename to graphics/pokemon/gen_4/mime_jr/icon.png diff --git a/graphics/pokemon/mime_jr/normal.pal b/graphics/pokemon/gen_4/mime_jr/normal.pal similarity index 100% rename from graphics/pokemon/mime_jr/normal.pal rename to graphics/pokemon/gen_4/mime_jr/normal.pal diff --git a/graphics/pokemon/mime_jr/shiny.pal b/graphics/pokemon/gen_4/mime_jr/shiny.pal similarity index 100% rename from graphics/pokemon/mime_jr/shiny.pal rename to graphics/pokemon/gen_4/mime_jr/shiny.pal diff --git a/graphics/pokemon/mismagius/anim_front.png b/graphics/pokemon/gen_4/mismagius/anim_front.png similarity index 100% rename from graphics/pokemon/mismagius/anim_front.png rename to graphics/pokemon/gen_4/mismagius/anim_front.png diff --git a/graphics/pokemon/mismagius/back.png b/graphics/pokemon/gen_4/mismagius/back.png similarity index 100% rename from graphics/pokemon/mismagius/back.png rename to graphics/pokemon/gen_4/mismagius/back.png diff --git a/graphics/pokemon/klinklang/footprint.png b/graphics/pokemon/gen_4/mismagius/footprint.png similarity index 100% rename from graphics/pokemon/klinklang/footprint.png rename to graphics/pokemon/gen_4/mismagius/footprint.png diff --git a/graphics/pokemon/mismagius/icon.png b/graphics/pokemon/gen_4/mismagius/icon.png similarity index 100% rename from graphics/pokemon/mismagius/icon.png rename to graphics/pokemon/gen_4/mismagius/icon.png diff --git a/graphics/pokemon/mismagius/normal.pal b/graphics/pokemon/gen_4/mismagius/normal.pal similarity index 100% rename from graphics/pokemon/mismagius/normal.pal rename to graphics/pokemon/gen_4/mismagius/normal.pal diff --git a/graphics/pokemon/mismagius/shiny.pal b/graphics/pokemon/gen_4/mismagius/shiny.pal similarity index 100% rename from graphics/pokemon/mismagius/shiny.pal rename to graphics/pokemon/gen_4/mismagius/shiny.pal diff --git a/graphics/pokemon/monferno/anim_front.png b/graphics/pokemon/gen_4/monferno/anim_front.png similarity index 100% rename from graphics/pokemon/monferno/anim_front.png rename to graphics/pokemon/gen_4/monferno/anim_front.png diff --git a/graphics/pokemon/monferno/back.png b/graphics/pokemon/gen_4/monferno/back.png similarity index 100% rename from graphics/pokemon/monferno/back.png rename to graphics/pokemon/gen_4/monferno/back.png diff --git a/graphics/pokemon/monferno/footprint.png b/graphics/pokemon/gen_4/monferno/footprint.png similarity index 100% rename from graphics/pokemon/monferno/footprint.png rename to graphics/pokemon/gen_4/monferno/footprint.png diff --git a/graphics/pokemon/monferno/icon.png b/graphics/pokemon/gen_4/monferno/icon.png similarity index 100% rename from graphics/pokemon/monferno/icon.png rename to graphics/pokemon/gen_4/monferno/icon.png diff --git a/graphics/pokemon/monferno/normal.pal b/graphics/pokemon/gen_4/monferno/normal.pal similarity index 100% rename from graphics/pokemon/monferno/normal.pal rename to graphics/pokemon/gen_4/monferno/normal.pal diff --git a/graphics/pokemon/monferno/shiny.pal b/graphics/pokemon/gen_4/monferno/shiny.pal similarity index 100% rename from graphics/pokemon/monferno/shiny.pal rename to graphics/pokemon/gen_4/monferno/shiny.pal diff --git a/graphics/pokemon/mothim/anim_front.png b/graphics/pokemon/gen_4/mothim/anim_front.png similarity index 100% rename from graphics/pokemon/mothim/anim_front.png rename to graphics/pokemon/gen_4/mothim/anim_front.png diff --git a/graphics/pokemon/mothim/back.png b/graphics/pokemon/gen_4/mothim/back.png similarity index 100% rename from graphics/pokemon/mothim/back.png rename to graphics/pokemon/gen_4/mothim/back.png diff --git a/graphics/pokemon/kabuto/footprint.png b/graphics/pokemon/gen_4/mothim/footprint.png similarity index 100% rename from graphics/pokemon/kabuto/footprint.png rename to graphics/pokemon/gen_4/mothim/footprint.png diff --git a/graphics/pokemon/mothim/icon.png b/graphics/pokemon/gen_4/mothim/icon.png similarity index 100% rename from graphics/pokemon/mothim/icon.png rename to graphics/pokemon/gen_4/mothim/icon.png diff --git a/graphics/pokemon/mothim/normal.pal b/graphics/pokemon/gen_4/mothim/normal.pal similarity index 100% rename from graphics/pokemon/mothim/normal.pal rename to graphics/pokemon/gen_4/mothim/normal.pal diff --git a/graphics/pokemon/mothim/shiny.pal b/graphics/pokemon/gen_4/mothim/shiny.pal similarity index 100% rename from graphics/pokemon/mothim/shiny.pal rename to graphics/pokemon/gen_4/mothim/shiny.pal diff --git a/graphics/pokemon/munchlax/anim_front.png b/graphics/pokemon/gen_4/munchlax/anim_front.png similarity index 100% rename from graphics/pokemon/munchlax/anim_front.png rename to graphics/pokemon/gen_4/munchlax/anim_front.png diff --git a/graphics/pokemon/munchlax/back.png b/graphics/pokemon/gen_4/munchlax/back.png similarity index 100% rename from graphics/pokemon/munchlax/back.png rename to graphics/pokemon/gen_4/munchlax/back.png diff --git a/graphics/pokemon/munchlax/footprint.png b/graphics/pokemon/gen_4/munchlax/footprint.png similarity index 100% rename from graphics/pokemon/munchlax/footprint.png rename to graphics/pokemon/gen_4/munchlax/footprint.png diff --git a/graphics/pokemon/munchlax/icon.png b/graphics/pokemon/gen_4/munchlax/icon.png similarity index 100% rename from graphics/pokemon/munchlax/icon.png rename to graphics/pokemon/gen_4/munchlax/icon.png diff --git a/graphics/pokemon/munchlax/normal.pal b/graphics/pokemon/gen_4/munchlax/normal.pal similarity index 100% rename from graphics/pokemon/munchlax/normal.pal rename to graphics/pokemon/gen_4/munchlax/normal.pal diff --git a/graphics/pokemon/munchlax/shiny.pal b/graphics/pokemon/gen_4/munchlax/shiny.pal similarity index 100% rename from graphics/pokemon/munchlax/shiny.pal rename to graphics/pokemon/gen_4/munchlax/shiny.pal diff --git a/graphics/pokemon/pachirisu/anim_front.png b/graphics/pokemon/gen_4/pachirisu/anim_front.png similarity index 100% rename from graphics/pokemon/pachirisu/anim_front.png rename to graphics/pokemon/gen_4/pachirisu/anim_front.png diff --git a/graphics/pokemon/pachirisu/anim_frontf.png b/graphics/pokemon/gen_4/pachirisu/anim_frontf.png similarity index 100% rename from graphics/pokemon/pachirisu/anim_frontf.png rename to graphics/pokemon/gen_4/pachirisu/anim_frontf.png diff --git a/graphics/pokemon/pachirisu/back.png b/graphics/pokemon/gen_4/pachirisu/back.png similarity index 100% rename from graphics/pokemon/pachirisu/back.png rename to graphics/pokemon/gen_4/pachirisu/back.png diff --git a/graphics/pokemon/pachirisu/footprint.png b/graphics/pokemon/gen_4/pachirisu/footprint.png similarity index 100% rename from graphics/pokemon/pachirisu/footprint.png rename to graphics/pokemon/gen_4/pachirisu/footprint.png diff --git a/graphics/pokemon/pachirisu/icon.png b/graphics/pokemon/gen_4/pachirisu/icon.png similarity index 100% rename from graphics/pokemon/pachirisu/icon.png rename to graphics/pokemon/gen_4/pachirisu/icon.png diff --git a/graphics/pokemon/pachirisu/normal.pal b/graphics/pokemon/gen_4/pachirisu/normal.pal similarity index 100% rename from graphics/pokemon/pachirisu/normal.pal rename to graphics/pokemon/gen_4/pachirisu/normal.pal diff --git a/graphics/pokemon/pachirisu/shiny.pal b/graphics/pokemon/gen_4/pachirisu/shiny.pal similarity index 100% rename from graphics/pokemon/pachirisu/shiny.pal rename to graphics/pokemon/gen_4/pachirisu/shiny.pal diff --git a/graphics/pokemon/palkia/anim_front.png b/graphics/pokemon/gen_4/palkia/anim_front.png similarity index 100% rename from graphics/pokemon/palkia/anim_front.png rename to graphics/pokemon/gen_4/palkia/anim_front.png diff --git a/graphics/pokemon/palkia/back.png b/graphics/pokemon/gen_4/palkia/back.png similarity index 100% rename from graphics/pokemon/palkia/back.png rename to graphics/pokemon/gen_4/palkia/back.png diff --git a/graphics/pokemon/palkia/footprint.png b/graphics/pokemon/gen_4/palkia/footprint.png similarity index 100% rename from graphics/pokemon/palkia/footprint.png rename to graphics/pokemon/gen_4/palkia/footprint.png diff --git a/graphics/pokemon/palkia/icon.png b/graphics/pokemon/gen_4/palkia/icon.png similarity index 100% rename from graphics/pokemon/palkia/icon.png rename to graphics/pokemon/gen_4/palkia/icon.png diff --git a/graphics/pokemon/palkia/normal.pal b/graphics/pokemon/gen_4/palkia/normal.pal similarity index 100% rename from graphics/pokemon/palkia/normal.pal rename to graphics/pokemon/gen_4/palkia/normal.pal diff --git a/graphics/pokemon/palkia/origin/back.png b/graphics/pokemon/gen_4/palkia/origin/back.png similarity index 100% rename from graphics/pokemon/palkia/origin/back.png rename to graphics/pokemon/gen_4/palkia/origin/back.png diff --git a/graphics/pokemon/palkia/origin/front.png b/graphics/pokemon/gen_4/palkia/origin/front.png similarity index 100% rename from graphics/pokemon/palkia/origin/front.png rename to graphics/pokemon/gen_4/palkia/origin/front.png diff --git a/graphics/pokemon/palkia/origin/icon.png b/graphics/pokemon/gen_4/palkia/origin/icon.png similarity index 100% rename from graphics/pokemon/palkia/origin/icon.png rename to graphics/pokemon/gen_4/palkia/origin/icon.png diff --git a/graphics/pokemon/palkia/origin/normal.pal b/graphics/pokemon/gen_4/palkia/origin/normal.pal similarity index 100% rename from graphics/pokemon/palkia/origin/normal.pal rename to graphics/pokemon/gen_4/palkia/origin/normal.pal diff --git a/graphics/pokemon/palkia/origin/shiny.pal b/graphics/pokemon/gen_4/palkia/origin/shiny.pal similarity index 100% rename from graphics/pokemon/palkia/origin/shiny.pal rename to graphics/pokemon/gen_4/palkia/origin/shiny.pal diff --git a/graphics/pokemon/palkia/shiny.pal b/graphics/pokemon/gen_4/palkia/shiny.pal similarity index 100% rename from graphics/pokemon/palkia/shiny.pal rename to graphics/pokemon/gen_4/palkia/shiny.pal diff --git a/graphics/pokemon/phione/anim_front.png b/graphics/pokemon/gen_4/phione/anim_front.png similarity index 100% rename from graphics/pokemon/phione/anim_front.png rename to graphics/pokemon/gen_4/phione/anim_front.png diff --git a/graphics/pokemon/phione/back.png b/graphics/pokemon/gen_4/phione/back.png similarity index 100% rename from graphics/pokemon/phione/back.png rename to graphics/pokemon/gen_4/phione/back.png diff --git a/graphics/pokemon/koffing/footprint.png b/graphics/pokemon/gen_4/phione/footprint.png similarity index 100% rename from graphics/pokemon/koffing/footprint.png rename to graphics/pokemon/gen_4/phione/footprint.png diff --git a/graphics/pokemon/phione/icon.png b/graphics/pokemon/gen_4/phione/icon.png similarity index 100% rename from graphics/pokemon/phione/icon.png rename to graphics/pokemon/gen_4/phione/icon.png diff --git a/graphics/pokemon/phione/normal.pal b/graphics/pokemon/gen_4/phione/normal.pal similarity index 100% rename from graphics/pokemon/phione/normal.pal rename to graphics/pokemon/gen_4/phione/normal.pal diff --git a/graphics/pokemon/phione/shiny.pal b/graphics/pokemon/gen_4/phione/shiny.pal similarity index 100% rename from graphics/pokemon/phione/shiny.pal rename to graphics/pokemon/gen_4/phione/shiny.pal diff --git a/graphics/pokemon/piplup/anim_front.png b/graphics/pokemon/gen_4/piplup/anim_front.png similarity index 100% rename from graphics/pokemon/piplup/anim_front.png rename to graphics/pokemon/gen_4/piplup/anim_front.png diff --git a/graphics/pokemon/piplup/back.png b/graphics/pokemon/gen_4/piplup/back.png similarity index 100% rename from graphics/pokemon/piplup/back.png rename to graphics/pokemon/gen_4/piplup/back.png diff --git a/graphics/pokemon/piplup/footprint.png b/graphics/pokemon/gen_4/piplup/footprint.png similarity index 100% rename from graphics/pokemon/piplup/footprint.png rename to graphics/pokemon/gen_4/piplup/footprint.png diff --git a/graphics/pokemon/piplup/icon.png b/graphics/pokemon/gen_4/piplup/icon.png similarity index 100% rename from graphics/pokemon/piplup/icon.png rename to graphics/pokemon/gen_4/piplup/icon.png diff --git a/graphics/pokemon/piplup/normal.pal b/graphics/pokemon/gen_4/piplup/normal.pal similarity index 100% rename from graphics/pokemon/piplup/normal.pal rename to graphics/pokemon/gen_4/piplup/normal.pal diff --git a/graphics/pokemon/piplup/shiny.pal b/graphics/pokemon/gen_4/piplup/shiny.pal similarity index 100% rename from graphics/pokemon/piplup/shiny.pal rename to graphics/pokemon/gen_4/piplup/shiny.pal diff --git a/graphics/pokemon/porygon_z/anim_front.png b/graphics/pokemon/gen_4/porygon_z/anim_front.png similarity index 100% rename from graphics/pokemon/porygon_z/anim_front.png rename to graphics/pokemon/gen_4/porygon_z/anim_front.png diff --git a/graphics/pokemon/porygon_z/back.png b/graphics/pokemon/gen_4/porygon_z/back.png similarity index 100% rename from graphics/pokemon/porygon_z/back.png rename to graphics/pokemon/gen_4/porygon_z/back.png diff --git a/graphics/pokemon/cherrim/footprint.png b/graphics/pokemon/gen_4/porygon_z/footprint.png similarity index 100% rename from graphics/pokemon/cherrim/footprint.png rename to graphics/pokemon/gen_4/porygon_z/footprint.png diff --git a/graphics/pokemon/porygon_z/icon.png b/graphics/pokemon/gen_4/porygon_z/icon.png similarity index 100% rename from graphics/pokemon/porygon_z/icon.png rename to graphics/pokemon/gen_4/porygon_z/icon.png diff --git a/graphics/pokemon/porygon_z/normal.pal b/graphics/pokemon/gen_4/porygon_z/normal.pal similarity index 100% rename from graphics/pokemon/porygon_z/normal.pal rename to graphics/pokemon/gen_4/porygon_z/normal.pal diff --git a/graphics/pokemon/porygon_z/shiny.pal b/graphics/pokemon/gen_4/porygon_z/shiny.pal similarity index 100% rename from graphics/pokemon/porygon_z/shiny.pal rename to graphics/pokemon/gen_4/porygon_z/shiny.pal diff --git a/graphics/pokemon/prinplup/anim_front.png b/graphics/pokemon/gen_4/prinplup/anim_front.png similarity index 100% rename from graphics/pokemon/prinplup/anim_front.png rename to graphics/pokemon/gen_4/prinplup/anim_front.png diff --git a/graphics/pokemon/prinplup/back.png b/graphics/pokemon/gen_4/prinplup/back.png similarity index 100% rename from graphics/pokemon/prinplup/back.png rename to graphics/pokemon/gen_4/prinplup/back.png diff --git a/graphics/pokemon/prinplup/footprint.png b/graphics/pokemon/gen_4/prinplup/footprint.png similarity index 100% rename from graphics/pokemon/prinplup/footprint.png rename to graphics/pokemon/gen_4/prinplup/footprint.png diff --git a/graphics/pokemon/prinplup/icon.png b/graphics/pokemon/gen_4/prinplup/icon.png similarity index 100% rename from graphics/pokemon/prinplup/icon.png rename to graphics/pokemon/gen_4/prinplup/icon.png diff --git a/graphics/pokemon/prinplup/normal.pal b/graphics/pokemon/gen_4/prinplup/normal.pal similarity index 100% rename from graphics/pokemon/prinplup/normal.pal rename to graphics/pokemon/gen_4/prinplup/normal.pal diff --git a/graphics/pokemon/prinplup/shiny.pal b/graphics/pokemon/gen_4/prinplup/shiny.pal similarity index 100% rename from graphics/pokemon/prinplup/shiny.pal rename to graphics/pokemon/gen_4/prinplup/shiny.pal diff --git a/graphics/pokemon/probopass/anim_front.png b/graphics/pokemon/gen_4/probopass/anim_front.png similarity index 100% rename from graphics/pokemon/probopass/anim_front.png rename to graphics/pokemon/gen_4/probopass/anim_front.png diff --git a/graphics/pokemon/probopass/back.png b/graphics/pokemon/gen_4/probopass/back.png similarity index 100% rename from graphics/pokemon/probopass/back.png rename to graphics/pokemon/gen_4/probopass/back.png diff --git a/graphics/pokemon/probopass/footprint.png b/graphics/pokemon/gen_4/probopass/footprint.png similarity index 100% rename from graphics/pokemon/probopass/footprint.png rename to graphics/pokemon/gen_4/probopass/footprint.png diff --git a/graphics/pokemon/probopass/icon.png b/graphics/pokemon/gen_4/probopass/icon.png similarity index 100% rename from graphics/pokemon/probopass/icon.png rename to graphics/pokemon/gen_4/probopass/icon.png diff --git a/graphics/pokemon/probopass/normal.pal b/graphics/pokemon/gen_4/probopass/normal.pal similarity index 100% rename from graphics/pokemon/probopass/normal.pal rename to graphics/pokemon/gen_4/probopass/normal.pal diff --git a/graphics/pokemon/probopass/shiny.pal b/graphics/pokemon/gen_4/probopass/shiny.pal similarity index 100% rename from graphics/pokemon/probopass/shiny.pal rename to graphics/pokemon/gen_4/probopass/shiny.pal diff --git a/graphics/pokemon/purugly/anim_front.png b/graphics/pokemon/gen_4/purugly/anim_front.png similarity index 100% rename from graphics/pokemon/purugly/anim_front.png rename to graphics/pokemon/gen_4/purugly/anim_front.png diff --git a/graphics/pokemon/purugly/back.png b/graphics/pokemon/gen_4/purugly/back.png similarity index 100% rename from graphics/pokemon/purugly/back.png rename to graphics/pokemon/gen_4/purugly/back.png diff --git a/graphics/pokemon/purugly/footprint.png b/graphics/pokemon/gen_4/purugly/footprint.png similarity index 100% rename from graphics/pokemon/purugly/footprint.png rename to graphics/pokemon/gen_4/purugly/footprint.png diff --git a/graphics/pokemon/purugly/icon.png b/graphics/pokemon/gen_4/purugly/icon.png similarity index 100% rename from graphics/pokemon/purugly/icon.png rename to graphics/pokemon/gen_4/purugly/icon.png diff --git a/graphics/pokemon/purugly/normal.pal b/graphics/pokemon/gen_4/purugly/normal.pal similarity index 100% rename from graphics/pokemon/purugly/normal.pal rename to graphics/pokemon/gen_4/purugly/normal.pal diff --git a/graphics/pokemon/purugly/shiny.pal b/graphics/pokemon/gen_4/purugly/shiny.pal similarity index 100% rename from graphics/pokemon/purugly/shiny.pal rename to graphics/pokemon/gen_4/purugly/shiny.pal diff --git a/graphics/pokemon/rampardos/anim_front.png b/graphics/pokemon/gen_4/rampardos/anim_front.png similarity index 100% rename from graphics/pokemon/rampardos/anim_front.png rename to graphics/pokemon/gen_4/rampardos/anim_front.png diff --git a/graphics/pokemon/rampardos/back.png b/graphics/pokemon/gen_4/rampardos/back.png similarity index 100% rename from graphics/pokemon/rampardos/back.png rename to graphics/pokemon/gen_4/rampardos/back.png diff --git a/graphics/pokemon/rampardos/footprint.png b/graphics/pokemon/gen_4/rampardos/footprint.png similarity index 100% rename from graphics/pokemon/rampardos/footprint.png rename to graphics/pokemon/gen_4/rampardos/footprint.png diff --git a/graphics/pokemon/rampardos/icon.png b/graphics/pokemon/gen_4/rampardos/icon.png similarity index 100% rename from graphics/pokemon/rampardos/icon.png rename to graphics/pokemon/gen_4/rampardos/icon.png diff --git a/graphics/pokemon/rampardos/normal.pal b/graphics/pokemon/gen_4/rampardos/normal.pal similarity index 100% rename from graphics/pokemon/rampardos/normal.pal rename to graphics/pokemon/gen_4/rampardos/normal.pal diff --git a/graphics/pokemon/rampardos/shiny.pal b/graphics/pokemon/gen_4/rampardos/shiny.pal similarity index 100% rename from graphics/pokemon/rampardos/shiny.pal rename to graphics/pokemon/gen_4/rampardos/shiny.pal diff --git a/graphics/pokemon/regigigas/anim_front.png b/graphics/pokemon/gen_4/regigigas/anim_front.png similarity index 100% rename from graphics/pokemon/regigigas/anim_front.png rename to graphics/pokemon/gen_4/regigigas/anim_front.png diff --git a/graphics/pokemon/regigigas/back.png b/graphics/pokemon/gen_4/regigigas/back.png similarity index 100% rename from graphics/pokemon/regigigas/back.png rename to graphics/pokemon/gen_4/regigigas/back.png diff --git a/graphics/pokemon/regigigas/footprint.png b/graphics/pokemon/gen_4/regigigas/footprint.png similarity index 100% rename from graphics/pokemon/regigigas/footprint.png rename to graphics/pokemon/gen_4/regigigas/footprint.png diff --git a/graphics/pokemon/regigigas/icon.png b/graphics/pokemon/gen_4/regigigas/icon.png similarity index 100% rename from graphics/pokemon/regigigas/icon.png rename to graphics/pokemon/gen_4/regigigas/icon.png diff --git a/graphics/pokemon/regigigas/normal.pal b/graphics/pokemon/gen_4/regigigas/normal.pal similarity index 100% rename from graphics/pokemon/regigigas/normal.pal rename to graphics/pokemon/gen_4/regigigas/normal.pal diff --git a/graphics/pokemon/regigigas/shiny.pal b/graphics/pokemon/gen_4/regigigas/shiny.pal similarity index 100% rename from graphics/pokemon/regigigas/shiny.pal rename to graphics/pokemon/gen_4/regigigas/shiny.pal diff --git a/graphics/pokemon/rhyperior/anim_front.png b/graphics/pokemon/gen_4/rhyperior/anim_front.png similarity index 100% rename from graphics/pokemon/rhyperior/anim_front.png rename to graphics/pokemon/gen_4/rhyperior/anim_front.png diff --git a/graphics/pokemon/rhyperior/anim_frontf.png b/graphics/pokemon/gen_4/rhyperior/anim_frontf.png similarity index 100% rename from graphics/pokemon/rhyperior/anim_frontf.png rename to graphics/pokemon/gen_4/rhyperior/anim_frontf.png diff --git a/graphics/pokemon/rhyperior/back.png b/graphics/pokemon/gen_4/rhyperior/back.png similarity index 100% rename from graphics/pokemon/rhyperior/back.png rename to graphics/pokemon/gen_4/rhyperior/back.png diff --git a/graphics/pokemon/rhyperior/backf.png b/graphics/pokemon/gen_4/rhyperior/backf.png similarity index 100% rename from graphics/pokemon/rhyperior/backf.png rename to graphics/pokemon/gen_4/rhyperior/backf.png diff --git a/graphics/pokemon/rhyperior/footprint.png b/graphics/pokemon/gen_4/rhyperior/footprint.png similarity index 100% rename from graphics/pokemon/rhyperior/footprint.png rename to graphics/pokemon/gen_4/rhyperior/footprint.png diff --git a/graphics/pokemon/rhyperior/icon.png b/graphics/pokemon/gen_4/rhyperior/icon.png similarity index 100% rename from graphics/pokemon/rhyperior/icon.png rename to graphics/pokemon/gen_4/rhyperior/icon.png diff --git a/graphics/pokemon/rhyperior/normal.pal b/graphics/pokemon/gen_4/rhyperior/normal.pal similarity index 100% rename from graphics/pokemon/rhyperior/normal.pal rename to graphics/pokemon/gen_4/rhyperior/normal.pal diff --git a/graphics/pokemon/rhyperior/shiny.pal b/graphics/pokemon/gen_4/rhyperior/shiny.pal similarity index 100% rename from graphics/pokemon/rhyperior/shiny.pal rename to graphics/pokemon/gen_4/rhyperior/shiny.pal diff --git a/graphics/pokemon/riolu/anim_front.png b/graphics/pokemon/gen_4/riolu/anim_front.png similarity index 100% rename from graphics/pokemon/riolu/anim_front.png rename to graphics/pokemon/gen_4/riolu/anim_front.png diff --git a/graphics/pokemon/riolu/back.png b/graphics/pokemon/gen_4/riolu/back.png similarity index 100% rename from graphics/pokemon/riolu/back.png rename to graphics/pokemon/gen_4/riolu/back.png diff --git a/graphics/pokemon/riolu/footprint.png b/graphics/pokemon/gen_4/riolu/footprint.png similarity index 100% rename from graphics/pokemon/riolu/footprint.png rename to graphics/pokemon/gen_4/riolu/footprint.png diff --git a/graphics/pokemon/riolu/icon.png b/graphics/pokemon/gen_4/riolu/icon.png similarity index 100% rename from graphics/pokemon/riolu/icon.png rename to graphics/pokemon/gen_4/riolu/icon.png diff --git a/graphics/pokemon/riolu/normal.pal b/graphics/pokemon/gen_4/riolu/normal.pal similarity index 100% rename from graphics/pokemon/riolu/normal.pal rename to graphics/pokemon/gen_4/riolu/normal.pal diff --git a/graphics/pokemon/riolu/shiny.pal b/graphics/pokemon/gen_4/riolu/shiny.pal similarity index 100% rename from graphics/pokemon/riolu/shiny.pal rename to graphics/pokemon/gen_4/riolu/shiny.pal diff --git a/graphics/pokemon/roserade/anim_front.png b/graphics/pokemon/gen_4/roserade/anim_front.png similarity index 100% rename from graphics/pokemon/roserade/anim_front.png rename to graphics/pokemon/gen_4/roserade/anim_front.png diff --git a/graphics/pokemon/roserade/anim_frontf.png b/graphics/pokemon/gen_4/roserade/anim_frontf.png similarity index 100% rename from graphics/pokemon/roserade/anim_frontf.png rename to graphics/pokemon/gen_4/roserade/anim_frontf.png diff --git a/graphics/pokemon/roserade/back.png b/graphics/pokemon/gen_4/roserade/back.png similarity index 100% rename from graphics/pokemon/roserade/back.png rename to graphics/pokemon/gen_4/roserade/back.png diff --git a/graphics/pokemon/roserade/backf.png b/graphics/pokemon/gen_4/roserade/backf.png similarity index 100% rename from graphics/pokemon/roserade/backf.png rename to graphics/pokemon/gen_4/roserade/backf.png diff --git a/graphics/pokemon/karrablast/footprint.png b/graphics/pokemon/gen_4/roserade/footprint.png similarity index 100% rename from graphics/pokemon/karrablast/footprint.png rename to graphics/pokemon/gen_4/roserade/footprint.png diff --git a/graphics/pokemon/roserade/icon.png b/graphics/pokemon/gen_4/roserade/icon.png similarity index 100% rename from graphics/pokemon/roserade/icon.png rename to graphics/pokemon/gen_4/roserade/icon.png diff --git a/graphics/pokemon/roserade/normal.pal b/graphics/pokemon/gen_4/roserade/normal.pal similarity index 100% rename from graphics/pokemon/roserade/normal.pal rename to graphics/pokemon/gen_4/roserade/normal.pal diff --git a/graphics/pokemon/roserade/shiny.pal b/graphics/pokemon/gen_4/roserade/shiny.pal similarity index 100% rename from graphics/pokemon/roserade/shiny.pal rename to graphics/pokemon/gen_4/roserade/shiny.pal diff --git a/graphics/pokemon/rotom/anim_front.png b/graphics/pokemon/gen_4/rotom/anim_front.png similarity index 100% rename from graphics/pokemon/rotom/anim_front.png rename to graphics/pokemon/gen_4/rotom/anim_front.png diff --git a/graphics/pokemon/rotom/back.png b/graphics/pokemon/gen_4/rotom/back.png similarity index 100% rename from graphics/pokemon/rotom/back.png rename to graphics/pokemon/gen_4/rotom/back.png diff --git a/graphics/pokemon/rotom/fan/anim_front.png b/graphics/pokemon/gen_4/rotom/fan/anim_front.png similarity index 100% rename from graphics/pokemon/rotom/fan/anim_front.png rename to graphics/pokemon/gen_4/rotom/fan/anim_front.png diff --git a/graphics/pokemon/rotom/fan/back.png b/graphics/pokemon/gen_4/rotom/fan/back.png similarity index 100% rename from graphics/pokemon/rotom/fan/back.png rename to graphics/pokemon/gen_4/rotom/fan/back.png diff --git a/graphics/pokemon/rotom/fan/icon.png b/graphics/pokemon/gen_4/rotom/fan/icon.png similarity index 100% rename from graphics/pokemon/rotom/fan/icon.png rename to graphics/pokemon/gen_4/rotom/fan/icon.png diff --git a/graphics/pokemon/rotom/fan/normal.pal b/graphics/pokemon/gen_4/rotom/fan/normal.pal similarity index 100% rename from graphics/pokemon/rotom/fan/normal.pal rename to graphics/pokemon/gen_4/rotom/fan/normal.pal diff --git a/graphics/pokemon/rotom/fan/shiny.pal b/graphics/pokemon/gen_4/rotom/fan/shiny.pal similarity index 100% rename from graphics/pokemon/rotom/fan/shiny.pal rename to graphics/pokemon/gen_4/rotom/fan/shiny.pal diff --git a/graphics/pokemon/rotom/frost/anim_front.png b/graphics/pokemon/gen_4/rotom/frost/anim_front.png similarity index 100% rename from graphics/pokemon/rotom/frost/anim_front.png rename to graphics/pokemon/gen_4/rotom/frost/anim_front.png diff --git a/graphics/pokemon/rotom/frost/back.png b/graphics/pokemon/gen_4/rotom/frost/back.png similarity index 100% rename from graphics/pokemon/rotom/frost/back.png rename to graphics/pokemon/gen_4/rotom/frost/back.png diff --git a/graphics/pokemon/rotom/frost/icon.png b/graphics/pokemon/gen_4/rotom/frost/icon.png similarity index 100% rename from graphics/pokemon/rotom/frost/icon.png rename to graphics/pokemon/gen_4/rotom/frost/icon.png diff --git a/graphics/pokemon/rotom/frost/normal.pal b/graphics/pokemon/gen_4/rotom/frost/normal.pal similarity index 100% rename from graphics/pokemon/rotom/frost/normal.pal rename to graphics/pokemon/gen_4/rotom/frost/normal.pal diff --git a/graphics/pokemon/rotom/frost/shiny.pal b/graphics/pokemon/gen_4/rotom/frost/shiny.pal similarity index 100% rename from graphics/pokemon/rotom/frost/shiny.pal rename to graphics/pokemon/gen_4/rotom/frost/shiny.pal diff --git a/graphics/pokemon/rotom/heat/anim_front.png b/graphics/pokemon/gen_4/rotom/heat/anim_front.png similarity index 100% rename from graphics/pokemon/rotom/heat/anim_front.png rename to graphics/pokemon/gen_4/rotom/heat/anim_front.png diff --git a/graphics/pokemon/rotom/heat/back.png b/graphics/pokemon/gen_4/rotom/heat/back.png similarity index 100% rename from graphics/pokemon/rotom/heat/back.png rename to graphics/pokemon/gen_4/rotom/heat/back.png diff --git a/graphics/pokemon/rotom/heat/icon.png b/graphics/pokemon/gen_4/rotom/heat/icon.png similarity index 100% rename from graphics/pokemon/rotom/heat/icon.png rename to graphics/pokemon/gen_4/rotom/heat/icon.png diff --git a/graphics/pokemon/rotom/heat/normal.pal b/graphics/pokemon/gen_4/rotom/heat/normal.pal similarity index 100% rename from graphics/pokemon/rotom/heat/normal.pal rename to graphics/pokemon/gen_4/rotom/heat/normal.pal diff --git a/graphics/pokemon/rotom/heat/shiny.pal b/graphics/pokemon/gen_4/rotom/heat/shiny.pal similarity index 100% rename from graphics/pokemon/rotom/heat/shiny.pal rename to graphics/pokemon/gen_4/rotom/heat/shiny.pal diff --git a/graphics/pokemon/rotom/icon.png b/graphics/pokemon/gen_4/rotom/icon.png similarity index 100% rename from graphics/pokemon/rotom/icon.png rename to graphics/pokemon/gen_4/rotom/icon.png diff --git a/graphics/pokemon/rotom/mow/anim_front.png b/graphics/pokemon/gen_4/rotom/mow/anim_front.png similarity index 100% rename from graphics/pokemon/rotom/mow/anim_front.png rename to graphics/pokemon/gen_4/rotom/mow/anim_front.png diff --git a/graphics/pokemon/rotom/mow/back.png b/graphics/pokemon/gen_4/rotom/mow/back.png similarity index 100% rename from graphics/pokemon/rotom/mow/back.png rename to graphics/pokemon/gen_4/rotom/mow/back.png diff --git a/graphics/pokemon/rotom/mow/icon.png b/graphics/pokemon/gen_4/rotom/mow/icon.png similarity index 100% rename from graphics/pokemon/rotom/mow/icon.png rename to graphics/pokemon/gen_4/rotom/mow/icon.png diff --git a/graphics/pokemon/rotom/mow/normal.pal b/graphics/pokemon/gen_4/rotom/mow/normal.pal similarity index 100% rename from graphics/pokemon/rotom/mow/normal.pal rename to graphics/pokemon/gen_4/rotom/mow/normal.pal diff --git a/graphics/pokemon/rotom/mow/shiny.pal b/graphics/pokemon/gen_4/rotom/mow/shiny.pal similarity index 100% rename from graphics/pokemon/rotom/mow/shiny.pal rename to graphics/pokemon/gen_4/rotom/mow/shiny.pal diff --git a/graphics/pokemon/rotom/normal.pal b/graphics/pokemon/gen_4/rotom/normal.pal similarity index 100% rename from graphics/pokemon/rotom/normal.pal rename to graphics/pokemon/gen_4/rotom/normal.pal diff --git a/graphics/pokemon/lampent/footprint.png b/graphics/pokemon/gen_4/rotom/normal/footprint.png similarity index 100% rename from graphics/pokemon/lampent/footprint.png rename to graphics/pokemon/gen_4/rotom/normal/footprint.png diff --git a/graphics/pokemon/rotom/shiny.pal b/graphics/pokemon/gen_4/rotom/shiny.pal similarity index 100% rename from graphics/pokemon/rotom/shiny.pal rename to graphics/pokemon/gen_4/rotom/shiny.pal diff --git a/graphics/pokemon/rotom/wash/anim_front.png b/graphics/pokemon/gen_4/rotom/wash/anim_front.png similarity index 100% rename from graphics/pokemon/rotom/wash/anim_front.png rename to graphics/pokemon/gen_4/rotom/wash/anim_front.png diff --git a/graphics/pokemon/rotom/wash/back.png b/graphics/pokemon/gen_4/rotom/wash/back.png similarity index 100% rename from graphics/pokemon/rotom/wash/back.png rename to graphics/pokemon/gen_4/rotom/wash/back.png diff --git a/graphics/pokemon/rotom/wash/icon.png b/graphics/pokemon/gen_4/rotom/wash/icon.png similarity index 100% rename from graphics/pokemon/rotom/wash/icon.png rename to graphics/pokemon/gen_4/rotom/wash/icon.png diff --git a/graphics/pokemon/rotom/wash/normal.pal b/graphics/pokemon/gen_4/rotom/wash/normal.pal similarity index 100% rename from graphics/pokemon/rotom/wash/normal.pal rename to graphics/pokemon/gen_4/rotom/wash/normal.pal diff --git a/graphics/pokemon/rotom/wash/shiny.pal b/graphics/pokemon/gen_4/rotom/wash/shiny.pal similarity index 100% rename from graphics/pokemon/rotom/wash/shiny.pal rename to graphics/pokemon/gen_4/rotom/wash/shiny.pal diff --git a/graphics/pokemon/shaymin/anim_front.png b/graphics/pokemon/gen_4/shaymin/anim_front.png similarity index 100% rename from graphics/pokemon/shaymin/anim_front.png rename to graphics/pokemon/gen_4/shaymin/anim_front.png diff --git a/graphics/pokemon/shaymin/back.png b/graphics/pokemon/gen_4/shaymin/back.png similarity index 100% rename from graphics/pokemon/shaymin/back.png rename to graphics/pokemon/gen_4/shaymin/back.png diff --git a/graphics/pokemon/shaymin/footprint.png b/graphics/pokemon/gen_4/shaymin/footprint.png similarity index 100% rename from graphics/pokemon/shaymin/footprint.png rename to graphics/pokemon/gen_4/shaymin/footprint.png diff --git a/graphics/pokemon/shaymin/icon.png b/graphics/pokemon/gen_4/shaymin/icon.png similarity index 100% rename from graphics/pokemon/shaymin/icon.png rename to graphics/pokemon/gen_4/shaymin/icon.png diff --git a/graphics/pokemon/shaymin/normal.pal b/graphics/pokemon/gen_4/shaymin/normal.pal similarity index 100% rename from graphics/pokemon/shaymin/normal.pal rename to graphics/pokemon/gen_4/shaymin/normal.pal diff --git a/graphics/pokemon/shaymin/shiny.pal b/graphics/pokemon/gen_4/shaymin/shiny.pal similarity index 100% rename from graphics/pokemon/shaymin/shiny.pal rename to graphics/pokemon/gen_4/shaymin/shiny.pal diff --git a/graphics/pokemon/shaymin/sky/anim_front.png b/graphics/pokemon/gen_4/shaymin/sky/anim_front.png similarity index 100% rename from graphics/pokemon/shaymin/sky/anim_front.png rename to graphics/pokemon/gen_4/shaymin/sky/anim_front.png diff --git a/graphics/pokemon/shaymin/sky/back.png b/graphics/pokemon/gen_4/shaymin/sky/back.png similarity index 100% rename from graphics/pokemon/shaymin/sky/back.png rename to graphics/pokemon/gen_4/shaymin/sky/back.png diff --git a/graphics/pokemon/shaymin/sky/icon.png b/graphics/pokemon/gen_4/shaymin/sky/icon.png similarity index 100% rename from graphics/pokemon/shaymin/sky/icon.png rename to graphics/pokemon/gen_4/shaymin/sky/icon.png diff --git a/graphics/pokemon/shaymin/sky/normal.pal b/graphics/pokemon/gen_4/shaymin/sky/normal.pal similarity index 100% rename from graphics/pokemon/shaymin/sky/normal.pal rename to graphics/pokemon/gen_4/shaymin/sky/normal.pal diff --git a/graphics/pokemon/shaymin/sky/shiny.pal b/graphics/pokemon/gen_4/shaymin/sky/shiny.pal similarity index 100% rename from graphics/pokemon/shaymin/sky/shiny.pal rename to graphics/pokemon/gen_4/shaymin/sky/shiny.pal diff --git a/graphics/pokemon/shellos/anim_front.png b/graphics/pokemon/gen_4/shellos/anim_front.png similarity index 100% rename from graphics/pokemon/shellos/anim_front.png rename to graphics/pokemon/gen_4/shellos/anim_front.png diff --git a/graphics/pokemon/shellos/back.png b/graphics/pokemon/gen_4/shellos/back.png similarity index 100% rename from graphics/pokemon/shellos/back.png rename to graphics/pokemon/gen_4/shellos/back.png diff --git a/graphics/pokemon/shellos/east_sea/anim_front.png b/graphics/pokemon/gen_4/shellos/east_sea/anim_front.png similarity index 100% rename from graphics/pokemon/shellos/east_sea/anim_front.png rename to graphics/pokemon/gen_4/shellos/east_sea/anim_front.png diff --git a/graphics/pokemon/shellos/east_sea/back.png b/graphics/pokemon/gen_4/shellos/east_sea/back.png similarity index 100% rename from graphics/pokemon/shellos/east_sea/back.png rename to graphics/pokemon/gen_4/shellos/east_sea/back.png diff --git a/graphics/pokemon/shellos/east_sea/icon.png b/graphics/pokemon/gen_4/shellos/east_sea/icon.png similarity index 100% rename from graphics/pokemon/shellos/east_sea/icon.png rename to graphics/pokemon/gen_4/shellos/east_sea/icon.png diff --git a/graphics/pokemon/shellos/east_sea/normal.pal b/graphics/pokemon/gen_4/shellos/east_sea/normal.pal similarity index 100% rename from graphics/pokemon/shellos/east_sea/normal.pal rename to graphics/pokemon/gen_4/shellos/east_sea/normal.pal diff --git a/graphics/pokemon/shellos/east_sea/shiny.pal b/graphics/pokemon/gen_4/shellos/east_sea/shiny.pal similarity index 100% rename from graphics/pokemon/shellos/east_sea/shiny.pal rename to graphics/pokemon/gen_4/shellos/east_sea/shiny.pal diff --git a/graphics/pokemon/shellos/footprint.png b/graphics/pokemon/gen_4/shellos/footprint.png similarity index 100% rename from graphics/pokemon/shellos/footprint.png rename to graphics/pokemon/gen_4/shellos/footprint.png diff --git a/graphics/pokemon/shellos/icon.png b/graphics/pokemon/gen_4/shellos/icon.png similarity index 100% rename from graphics/pokemon/shellos/icon.png rename to graphics/pokemon/gen_4/shellos/icon.png diff --git a/graphics/pokemon/shellos/normal.pal b/graphics/pokemon/gen_4/shellos/normal.pal similarity index 100% rename from graphics/pokemon/shellos/normal.pal rename to graphics/pokemon/gen_4/shellos/normal.pal diff --git a/graphics/pokemon/shellos/shiny.pal b/graphics/pokemon/gen_4/shellos/shiny.pal similarity index 100% rename from graphics/pokemon/shellos/shiny.pal rename to graphics/pokemon/gen_4/shellos/shiny.pal diff --git a/graphics/pokemon/shieldon/anim_front.png b/graphics/pokemon/gen_4/shieldon/anim_front.png similarity index 100% rename from graphics/pokemon/shieldon/anim_front.png rename to graphics/pokemon/gen_4/shieldon/anim_front.png diff --git a/graphics/pokemon/shieldon/back.png b/graphics/pokemon/gen_4/shieldon/back.png similarity index 100% rename from graphics/pokemon/shieldon/back.png rename to graphics/pokemon/gen_4/shieldon/back.png diff --git a/graphics/pokemon/shieldon/footprint.png b/graphics/pokemon/gen_4/shieldon/footprint.png similarity index 100% rename from graphics/pokemon/shieldon/footprint.png rename to graphics/pokemon/gen_4/shieldon/footprint.png diff --git a/graphics/pokemon/shieldon/icon.png b/graphics/pokemon/gen_4/shieldon/icon.png similarity index 100% rename from graphics/pokemon/shieldon/icon.png rename to graphics/pokemon/gen_4/shieldon/icon.png diff --git a/graphics/pokemon/shieldon/normal.pal b/graphics/pokemon/gen_4/shieldon/normal.pal similarity index 100% rename from graphics/pokemon/shieldon/normal.pal rename to graphics/pokemon/gen_4/shieldon/normal.pal diff --git a/graphics/pokemon/shieldon/shiny.pal b/graphics/pokemon/gen_4/shieldon/shiny.pal similarity index 100% rename from graphics/pokemon/shieldon/shiny.pal rename to graphics/pokemon/gen_4/shieldon/shiny.pal diff --git a/graphics/pokemon/shinx/anim_front.png b/graphics/pokemon/gen_4/shinx/anim_front.png similarity index 100% rename from graphics/pokemon/shinx/anim_front.png rename to graphics/pokemon/gen_4/shinx/anim_front.png diff --git a/graphics/pokemon/shinx/anim_frontf.png b/graphics/pokemon/gen_4/shinx/anim_frontf.png similarity index 100% rename from graphics/pokemon/shinx/anim_frontf.png rename to graphics/pokemon/gen_4/shinx/anim_frontf.png diff --git a/graphics/pokemon/shinx/back.png b/graphics/pokemon/gen_4/shinx/back.png similarity index 100% rename from graphics/pokemon/shinx/back.png rename to graphics/pokemon/gen_4/shinx/back.png diff --git a/graphics/pokemon/shinx/backf.png b/graphics/pokemon/gen_4/shinx/backf.png similarity index 100% rename from graphics/pokemon/shinx/backf.png rename to graphics/pokemon/gen_4/shinx/backf.png diff --git a/graphics/pokemon/shinx/footprint.png b/graphics/pokemon/gen_4/shinx/footprint.png similarity index 100% rename from graphics/pokemon/shinx/footprint.png rename to graphics/pokemon/gen_4/shinx/footprint.png diff --git a/graphics/pokemon/shinx/icon.png b/graphics/pokemon/gen_4/shinx/icon.png similarity index 100% rename from graphics/pokemon/shinx/icon.png rename to graphics/pokemon/gen_4/shinx/icon.png diff --git a/graphics/pokemon/shinx/normal.pal b/graphics/pokemon/gen_4/shinx/normal.pal similarity index 100% rename from graphics/pokemon/shinx/normal.pal rename to graphics/pokemon/gen_4/shinx/normal.pal diff --git a/graphics/pokemon/shinx/shiny.pal b/graphics/pokemon/gen_4/shinx/shiny.pal similarity index 100% rename from graphics/pokemon/shinx/shiny.pal rename to graphics/pokemon/gen_4/shinx/shiny.pal diff --git a/graphics/pokemon/skorupi/anim_front.png b/graphics/pokemon/gen_4/skorupi/anim_front.png similarity index 100% rename from graphics/pokemon/skorupi/anim_front.png rename to graphics/pokemon/gen_4/skorupi/anim_front.png diff --git a/graphics/pokemon/skorupi/back.png b/graphics/pokemon/gen_4/skorupi/back.png similarity index 100% rename from graphics/pokemon/skorupi/back.png rename to graphics/pokemon/gen_4/skorupi/back.png diff --git a/graphics/pokemon/kricketune/footprint.png b/graphics/pokemon/gen_4/skorupi/footprint.png similarity index 100% rename from graphics/pokemon/kricketune/footprint.png rename to graphics/pokemon/gen_4/skorupi/footprint.png diff --git a/graphics/pokemon/skorupi/icon.png b/graphics/pokemon/gen_4/skorupi/icon.png similarity index 100% rename from graphics/pokemon/skorupi/icon.png rename to graphics/pokemon/gen_4/skorupi/icon.png diff --git a/graphics/pokemon/skorupi/normal.pal b/graphics/pokemon/gen_4/skorupi/normal.pal similarity index 100% rename from graphics/pokemon/skorupi/normal.pal rename to graphics/pokemon/gen_4/skorupi/normal.pal diff --git a/graphics/pokemon/skorupi/shiny.pal b/graphics/pokemon/gen_4/skorupi/shiny.pal similarity index 100% rename from graphics/pokemon/skorupi/shiny.pal rename to graphics/pokemon/gen_4/skorupi/shiny.pal diff --git a/graphics/pokemon/skuntank/anim_front.png b/graphics/pokemon/gen_4/skuntank/anim_front.png similarity index 100% rename from graphics/pokemon/skuntank/anim_front.png rename to graphics/pokemon/gen_4/skuntank/anim_front.png diff --git a/graphics/pokemon/skuntank/back.png b/graphics/pokemon/gen_4/skuntank/back.png similarity index 100% rename from graphics/pokemon/skuntank/back.png rename to graphics/pokemon/gen_4/skuntank/back.png diff --git a/graphics/pokemon/skuntank/footprint.png b/graphics/pokemon/gen_4/skuntank/footprint.png similarity index 100% rename from graphics/pokemon/skuntank/footprint.png rename to graphics/pokemon/gen_4/skuntank/footprint.png diff --git a/graphics/pokemon/skuntank/icon.png b/graphics/pokemon/gen_4/skuntank/icon.png similarity index 100% rename from graphics/pokemon/skuntank/icon.png rename to graphics/pokemon/gen_4/skuntank/icon.png diff --git a/graphics/pokemon/skuntank/normal.pal b/graphics/pokemon/gen_4/skuntank/normal.pal similarity index 100% rename from graphics/pokemon/skuntank/normal.pal rename to graphics/pokemon/gen_4/skuntank/normal.pal diff --git a/graphics/pokemon/skuntank/shiny.pal b/graphics/pokemon/gen_4/skuntank/shiny.pal similarity index 100% rename from graphics/pokemon/skuntank/shiny.pal rename to graphics/pokemon/gen_4/skuntank/shiny.pal diff --git a/graphics/pokemon/snover/anim_front.png b/graphics/pokemon/gen_4/snover/anim_front.png similarity index 100% rename from graphics/pokemon/snover/anim_front.png rename to graphics/pokemon/gen_4/snover/anim_front.png diff --git a/graphics/pokemon/snover/anim_frontf.png b/graphics/pokemon/gen_4/snover/anim_frontf.png similarity index 100% rename from graphics/pokemon/snover/anim_frontf.png rename to graphics/pokemon/gen_4/snover/anim_frontf.png diff --git a/graphics/pokemon/snover/back.png b/graphics/pokemon/gen_4/snover/back.png similarity index 100% rename from graphics/pokemon/snover/back.png rename to graphics/pokemon/gen_4/snover/back.png diff --git a/graphics/pokemon/snover/backf.png b/graphics/pokemon/gen_4/snover/backf.png similarity index 100% rename from graphics/pokemon/snover/backf.png rename to graphics/pokemon/gen_4/snover/backf.png diff --git a/graphics/pokemon/snover/footprint.png b/graphics/pokemon/gen_4/snover/footprint.png similarity index 100% rename from graphics/pokemon/snover/footprint.png rename to graphics/pokemon/gen_4/snover/footprint.png diff --git a/graphics/pokemon/snover/icon.png b/graphics/pokemon/gen_4/snover/icon.png similarity index 100% rename from graphics/pokemon/snover/icon.png rename to graphics/pokemon/gen_4/snover/icon.png diff --git a/graphics/pokemon/snover/normal.pal b/graphics/pokemon/gen_4/snover/normal.pal similarity index 100% rename from graphics/pokemon/snover/normal.pal rename to graphics/pokemon/gen_4/snover/normal.pal diff --git a/graphics/pokemon/snover/shiny.pal b/graphics/pokemon/gen_4/snover/shiny.pal similarity index 100% rename from graphics/pokemon/snover/shiny.pal rename to graphics/pokemon/gen_4/snover/shiny.pal diff --git a/graphics/pokemon/spiritomb/anim_front.png b/graphics/pokemon/gen_4/spiritomb/anim_front.png similarity index 100% rename from graphics/pokemon/spiritomb/anim_front.png rename to graphics/pokemon/gen_4/spiritomb/anim_front.png diff --git a/graphics/pokemon/spiritomb/back.png b/graphics/pokemon/gen_4/spiritomb/back.png similarity index 100% rename from graphics/pokemon/spiritomb/back.png rename to graphics/pokemon/gen_4/spiritomb/back.png diff --git a/graphics/pokemon/landorus/footprint.png b/graphics/pokemon/gen_4/spiritomb/footprint.png similarity index 100% rename from graphics/pokemon/landorus/footprint.png rename to graphics/pokemon/gen_4/spiritomb/footprint.png diff --git a/graphics/pokemon/spiritomb/icon.png b/graphics/pokemon/gen_4/spiritomb/icon.png similarity index 100% rename from graphics/pokemon/spiritomb/icon.png rename to graphics/pokemon/gen_4/spiritomb/icon.png diff --git a/graphics/pokemon/spiritomb/normal.pal b/graphics/pokemon/gen_4/spiritomb/normal.pal similarity index 100% rename from graphics/pokemon/spiritomb/normal.pal rename to graphics/pokemon/gen_4/spiritomb/normal.pal diff --git a/graphics/pokemon/spiritomb/shiny.pal b/graphics/pokemon/gen_4/spiritomb/shiny.pal similarity index 100% rename from graphics/pokemon/spiritomb/shiny.pal rename to graphics/pokemon/gen_4/spiritomb/shiny.pal diff --git a/graphics/pokemon/staraptor/anim_front.png b/graphics/pokemon/gen_4/staraptor/anim_front.png similarity index 100% rename from graphics/pokemon/staraptor/anim_front.png rename to graphics/pokemon/gen_4/staraptor/anim_front.png diff --git a/graphics/pokemon/staraptor/anim_frontf.png b/graphics/pokemon/gen_4/staraptor/anim_frontf.png similarity index 100% rename from graphics/pokemon/staraptor/anim_frontf.png rename to graphics/pokemon/gen_4/staraptor/anim_frontf.png diff --git a/graphics/pokemon/staraptor/back.png b/graphics/pokemon/gen_4/staraptor/back.png similarity index 100% rename from graphics/pokemon/staraptor/back.png rename to graphics/pokemon/gen_4/staraptor/back.png diff --git a/graphics/pokemon/staraptor/footprint.png b/graphics/pokemon/gen_4/staraptor/footprint.png similarity index 100% rename from graphics/pokemon/staraptor/footprint.png rename to graphics/pokemon/gen_4/staraptor/footprint.png diff --git a/graphics/pokemon/staraptor/icon.png b/graphics/pokemon/gen_4/staraptor/icon.png similarity index 100% rename from graphics/pokemon/staraptor/icon.png rename to graphics/pokemon/gen_4/staraptor/icon.png diff --git a/graphics/pokemon/staraptor/normal.pal b/graphics/pokemon/gen_4/staraptor/normal.pal similarity index 100% rename from graphics/pokemon/staraptor/normal.pal rename to graphics/pokemon/gen_4/staraptor/normal.pal diff --git a/graphics/pokemon/staraptor/shiny.pal b/graphics/pokemon/gen_4/staraptor/shiny.pal similarity index 100% rename from graphics/pokemon/staraptor/shiny.pal rename to graphics/pokemon/gen_4/staraptor/shiny.pal diff --git a/graphics/pokemon/staravia/anim_front.png b/graphics/pokemon/gen_4/staravia/anim_front.png similarity index 100% rename from graphics/pokemon/staravia/anim_front.png rename to graphics/pokemon/gen_4/staravia/anim_front.png diff --git a/graphics/pokemon/staravia/anim_frontf.png b/graphics/pokemon/gen_4/staravia/anim_frontf.png similarity index 100% rename from graphics/pokemon/staravia/anim_frontf.png rename to graphics/pokemon/gen_4/staravia/anim_frontf.png diff --git a/graphics/pokemon/staravia/back.png b/graphics/pokemon/gen_4/staravia/back.png similarity index 100% rename from graphics/pokemon/staravia/back.png rename to graphics/pokemon/gen_4/staravia/back.png diff --git a/graphics/pokemon/staravia/backf.png b/graphics/pokemon/gen_4/staravia/backf.png similarity index 100% rename from graphics/pokemon/staravia/backf.png rename to graphics/pokemon/gen_4/staravia/backf.png diff --git a/graphics/pokemon/staravia/footprint.png b/graphics/pokemon/gen_4/staravia/footprint.png similarity index 100% rename from graphics/pokemon/staravia/footprint.png rename to graphics/pokemon/gen_4/staravia/footprint.png diff --git a/graphics/pokemon/staravia/icon.png b/graphics/pokemon/gen_4/staravia/icon.png similarity index 100% rename from graphics/pokemon/staravia/icon.png rename to graphics/pokemon/gen_4/staravia/icon.png diff --git a/graphics/pokemon/staravia/normal.pal b/graphics/pokemon/gen_4/staravia/normal.pal similarity index 100% rename from graphics/pokemon/staravia/normal.pal rename to graphics/pokemon/gen_4/staravia/normal.pal diff --git a/graphics/pokemon/staravia/shiny.pal b/graphics/pokemon/gen_4/staravia/shiny.pal similarity index 100% rename from graphics/pokemon/staravia/shiny.pal rename to graphics/pokemon/gen_4/staravia/shiny.pal diff --git a/graphics/pokemon/starly/anim_front.png b/graphics/pokemon/gen_4/starly/anim_front.png similarity index 100% rename from graphics/pokemon/starly/anim_front.png rename to graphics/pokemon/gen_4/starly/anim_front.png diff --git a/graphics/pokemon/starly/anim_frontf.png b/graphics/pokemon/gen_4/starly/anim_frontf.png similarity index 100% rename from graphics/pokemon/starly/anim_frontf.png rename to graphics/pokemon/gen_4/starly/anim_frontf.png diff --git a/graphics/pokemon/starly/back.png b/graphics/pokemon/gen_4/starly/back.png similarity index 100% rename from graphics/pokemon/starly/back.png rename to graphics/pokemon/gen_4/starly/back.png diff --git a/graphics/pokemon/starly/backf.png b/graphics/pokemon/gen_4/starly/backf.png similarity index 100% rename from graphics/pokemon/starly/backf.png rename to graphics/pokemon/gen_4/starly/backf.png diff --git a/graphics/pokemon/starly/footprint.png b/graphics/pokemon/gen_4/starly/footprint.png similarity index 100% rename from graphics/pokemon/starly/footprint.png rename to graphics/pokemon/gen_4/starly/footprint.png diff --git a/graphics/pokemon/starly/icon.png b/graphics/pokemon/gen_4/starly/icon.png similarity index 100% rename from graphics/pokemon/starly/icon.png rename to graphics/pokemon/gen_4/starly/icon.png diff --git a/graphics/pokemon/starly/normal.pal b/graphics/pokemon/gen_4/starly/normal.pal similarity index 100% rename from graphics/pokemon/starly/normal.pal rename to graphics/pokemon/gen_4/starly/normal.pal diff --git a/graphics/pokemon/starly/shiny.pal b/graphics/pokemon/gen_4/starly/shiny.pal similarity index 100% rename from graphics/pokemon/starly/shiny.pal rename to graphics/pokemon/gen_4/starly/shiny.pal diff --git a/graphics/pokemon/stunky/anim_front.png b/graphics/pokemon/gen_4/stunky/anim_front.png similarity index 100% rename from graphics/pokemon/stunky/anim_front.png rename to graphics/pokemon/gen_4/stunky/anim_front.png diff --git a/graphics/pokemon/stunky/back.png b/graphics/pokemon/gen_4/stunky/back.png similarity index 100% rename from graphics/pokemon/stunky/back.png rename to graphics/pokemon/gen_4/stunky/back.png diff --git a/graphics/pokemon/stunky/footprint.png b/graphics/pokemon/gen_4/stunky/footprint.png similarity index 100% rename from graphics/pokemon/stunky/footprint.png rename to graphics/pokemon/gen_4/stunky/footprint.png diff --git a/graphics/pokemon/stunky/icon.png b/graphics/pokemon/gen_4/stunky/icon.png similarity index 100% rename from graphics/pokemon/stunky/icon.png rename to graphics/pokemon/gen_4/stunky/icon.png diff --git a/graphics/pokemon/stunky/normal.pal b/graphics/pokemon/gen_4/stunky/normal.pal similarity index 100% rename from graphics/pokemon/stunky/normal.pal rename to graphics/pokemon/gen_4/stunky/normal.pal diff --git a/graphics/pokemon/stunky/shiny.pal b/graphics/pokemon/gen_4/stunky/shiny.pal similarity index 100% rename from graphics/pokemon/stunky/shiny.pal rename to graphics/pokemon/gen_4/stunky/shiny.pal diff --git a/graphics/pokemon/tangrowth/anim_front.png b/graphics/pokemon/gen_4/tangrowth/anim_front.png similarity index 100% rename from graphics/pokemon/tangrowth/anim_front.png rename to graphics/pokemon/gen_4/tangrowth/anim_front.png diff --git a/graphics/pokemon/tangrowth/anim_frontf.png b/graphics/pokemon/gen_4/tangrowth/anim_frontf.png similarity index 100% rename from graphics/pokemon/tangrowth/anim_frontf.png rename to graphics/pokemon/gen_4/tangrowth/anim_frontf.png diff --git a/graphics/pokemon/tangrowth/back.png b/graphics/pokemon/gen_4/tangrowth/back.png similarity index 100% rename from graphics/pokemon/tangrowth/back.png rename to graphics/pokemon/gen_4/tangrowth/back.png diff --git a/graphics/pokemon/tangrowth/footprint.png b/graphics/pokemon/gen_4/tangrowth/footprint.png similarity index 100% rename from graphics/pokemon/tangrowth/footprint.png rename to graphics/pokemon/gen_4/tangrowth/footprint.png diff --git a/graphics/pokemon/tangrowth/icon.png b/graphics/pokemon/gen_4/tangrowth/icon.png similarity index 100% rename from graphics/pokemon/tangrowth/icon.png rename to graphics/pokemon/gen_4/tangrowth/icon.png diff --git a/graphics/pokemon/tangrowth/normal.pal b/graphics/pokemon/gen_4/tangrowth/normal.pal similarity index 100% rename from graphics/pokemon/tangrowth/normal.pal rename to graphics/pokemon/gen_4/tangrowth/normal.pal diff --git a/graphics/pokemon/tangrowth/shiny.pal b/graphics/pokemon/gen_4/tangrowth/shiny.pal similarity index 100% rename from graphics/pokemon/tangrowth/shiny.pal rename to graphics/pokemon/gen_4/tangrowth/shiny.pal diff --git a/graphics/pokemon/togekiss/anim_front.png b/graphics/pokemon/gen_4/togekiss/anim_front.png similarity index 100% rename from graphics/pokemon/togekiss/anim_front.png rename to graphics/pokemon/gen_4/togekiss/anim_front.png diff --git a/graphics/pokemon/togekiss/back.png b/graphics/pokemon/gen_4/togekiss/back.png similarity index 100% rename from graphics/pokemon/togekiss/back.png rename to graphics/pokemon/gen_4/togekiss/back.png diff --git a/graphics/pokemon/togekiss/footprint.png b/graphics/pokemon/gen_4/togekiss/footprint.png similarity index 100% rename from graphics/pokemon/togekiss/footprint.png rename to graphics/pokemon/gen_4/togekiss/footprint.png diff --git a/graphics/pokemon/togekiss/icon.png b/graphics/pokemon/gen_4/togekiss/icon.png similarity index 100% rename from graphics/pokemon/togekiss/icon.png rename to graphics/pokemon/gen_4/togekiss/icon.png diff --git a/graphics/pokemon/togekiss/normal.pal b/graphics/pokemon/gen_4/togekiss/normal.pal similarity index 100% rename from graphics/pokemon/togekiss/normal.pal rename to graphics/pokemon/gen_4/togekiss/normal.pal diff --git a/graphics/pokemon/togekiss/shiny.pal b/graphics/pokemon/gen_4/togekiss/shiny.pal similarity index 100% rename from graphics/pokemon/togekiss/shiny.pal rename to graphics/pokemon/gen_4/togekiss/shiny.pal diff --git a/graphics/pokemon/torterra/anim_front.png b/graphics/pokemon/gen_4/torterra/anim_front.png similarity index 100% rename from graphics/pokemon/torterra/anim_front.png rename to graphics/pokemon/gen_4/torterra/anim_front.png diff --git a/graphics/pokemon/torterra/back.png b/graphics/pokemon/gen_4/torterra/back.png similarity index 100% rename from graphics/pokemon/torterra/back.png rename to graphics/pokemon/gen_4/torterra/back.png diff --git a/graphics/pokemon/torterra/footprint.png b/graphics/pokemon/gen_4/torterra/footprint.png similarity index 100% rename from graphics/pokemon/torterra/footprint.png rename to graphics/pokemon/gen_4/torterra/footprint.png diff --git a/graphics/pokemon/torterra/icon.png b/graphics/pokemon/gen_4/torterra/icon.png similarity index 100% rename from graphics/pokemon/torterra/icon.png rename to graphics/pokemon/gen_4/torterra/icon.png diff --git a/graphics/pokemon/torterra/normal.pal b/graphics/pokemon/gen_4/torterra/normal.pal similarity index 100% rename from graphics/pokemon/torterra/normal.pal rename to graphics/pokemon/gen_4/torterra/normal.pal diff --git a/graphics/pokemon/torterra/shiny.pal b/graphics/pokemon/gen_4/torterra/shiny.pal similarity index 100% rename from graphics/pokemon/torterra/shiny.pal rename to graphics/pokemon/gen_4/torterra/shiny.pal diff --git a/graphics/pokemon/toxicroak/anim_front.png b/graphics/pokemon/gen_4/toxicroak/anim_front.png similarity index 100% rename from graphics/pokemon/toxicroak/anim_front.png rename to graphics/pokemon/gen_4/toxicroak/anim_front.png diff --git a/graphics/pokemon/toxicroak/anim_frontf.png b/graphics/pokemon/gen_4/toxicroak/anim_frontf.png similarity index 100% rename from graphics/pokemon/toxicroak/anim_frontf.png rename to graphics/pokemon/gen_4/toxicroak/anim_frontf.png diff --git a/graphics/pokemon/toxicroak/back.png b/graphics/pokemon/gen_4/toxicroak/back.png similarity index 100% rename from graphics/pokemon/toxicroak/back.png rename to graphics/pokemon/gen_4/toxicroak/back.png diff --git a/graphics/pokemon/toxicroak/backf.png b/graphics/pokemon/gen_4/toxicroak/backf.png similarity index 100% rename from graphics/pokemon/toxicroak/backf.png rename to graphics/pokemon/gen_4/toxicroak/backf.png diff --git a/graphics/pokemon/toxicroak/footprint.png b/graphics/pokemon/gen_4/toxicroak/footprint.png similarity index 100% rename from graphics/pokemon/toxicroak/footprint.png rename to graphics/pokemon/gen_4/toxicroak/footprint.png diff --git a/graphics/pokemon/toxicroak/icon.png b/graphics/pokemon/gen_4/toxicroak/icon.png similarity index 100% rename from graphics/pokemon/toxicroak/icon.png rename to graphics/pokemon/gen_4/toxicroak/icon.png diff --git a/graphics/pokemon/toxicroak/normal.pal b/graphics/pokemon/gen_4/toxicroak/normal.pal similarity index 100% rename from graphics/pokemon/toxicroak/normal.pal rename to graphics/pokemon/gen_4/toxicroak/normal.pal diff --git a/graphics/pokemon/toxicroak/shiny.pal b/graphics/pokemon/gen_4/toxicroak/shiny.pal similarity index 100% rename from graphics/pokemon/toxicroak/shiny.pal rename to graphics/pokemon/gen_4/toxicroak/shiny.pal diff --git a/graphics/pokemon/turtwig/anim_front.png b/graphics/pokemon/gen_4/turtwig/anim_front.png similarity index 100% rename from graphics/pokemon/turtwig/anim_front.png rename to graphics/pokemon/gen_4/turtwig/anim_front.png diff --git a/graphics/pokemon/turtwig/back.png b/graphics/pokemon/gen_4/turtwig/back.png similarity index 100% rename from graphics/pokemon/turtwig/back.png rename to graphics/pokemon/gen_4/turtwig/back.png diff --git a/graphics/pokemon/turtwig/footprint.png b/graphics/pokemon/gen_4/turtwig/footprint.png similarity index 100% rename from graphics/pokemon/turtwig/footprint.png rename to graphics/pokemon/gen_4/turtwig/footprint.png diff --git a/graphics/pokemon/turtwig/icon.png b/graphics/pokemon/gen_4/turtwig/icon.png similarity index 100% rename from graphics/pokemon/turtwig/icon.png rename to graphics/pokemon/gen_4/turtwig/icon.png diff --git a/graphics/pokemon/turtwig/normal.pal b/graphics/pokemon/gen_4/turtwig/normal.pal similarity index 100% rename from graphics/pokemon/turtwig/normal.pal rename to graphics/pokemon/gen_4/turtwig/normal.pal diff --git a/graphics/pokemon/turtwig/shiny.pal b/graphics/pokemon/gen_4/turtwig/shiny.pal similarity index 100% rename from graphics/pokemon/turtwig/shiny.pal rename to graphics/pokemon/gen_4/turtwig/shiny.pal diff --git a/graphics/pokemon/uxie/anim_front.png b/graphics/pokemon/gen_4/uxie/anim_front.png similarity index 100% rename from graphics/pokemon/uxie/anim_front.png rename to graphics/pokemon/gen_4/uxie/anim_front.png diff --git a/graphics/pokemon/uxie/back.png b/graphics/pokemon/gen_4/uxie/back.png similarity index 100% rename from graphics/pokemon/uxie/back.png rename to graphics/pokemon/gen_4/uxie/back.png diff --git a/graphics/pokemon/uxie/footprint.png b/graphics/pokemon/gen_4/uxie/footprint.png similarity index 100% rename from graphics/pokemon/uxie/footprint.png rename to graphics/pokemon/gen_4/uxie/footprint.png diff --git a/graphics/pokemon/uxie/icon.png b/graphics/pokemon/gen_4/uxie/icon.png similarity index 100% rename from graphics/pokemon/uxie/icon.png rename to graphics/pokemon/gen_4/uxie/icon.png diff --git a/graphics/pokemon/uxie/normal.pal b/graphics/pokemon/gen_4/uxie/normal.pal similarity index 100% rename from graphics/pokemon/uxie/normal.pal rename to graphics/pokemon/gen_4/uxie/normal.pal diff --git a/graphics/pokemon/uxie/shiny.pal b/graphics/pokemon/gen_4/uxie/shiny.pal similarity index 100% rename from graphics/pokemon/uxie/shiny.pal rename to graphics/pokemon/gen_4/uxie/shiny.pal diff --git a/graphics/pokemon/vespiquen/anim_front.png b/graphics/pokemon/gen_4/vespiquen/anim_front.png similarity index 100% rename from graphics/pokemon/vespiquen/anim_front.png rename to graphics/pokemon/gen_4/vespiquen/anim_front.png diff --git a/graphics/pokemon/vespiquen/back.png b/graphics/pokemon/gen_4/vespiquen/back.png similarity index 100% rename from graphics/pokemon/vespiquen/back.png rename to graphics/pokemon/gen_4/vespiquen/back.png diff --git a/graphics/pokemon/lanturn/footprint.png b/graphics/pokemon/gen_4/vespiquen/footprint.png similarity index 100% rename from graphics/pokemon/lanturn/footprint.png rename to graphics/pokemon/gen_4/vespiquen/footprint.png diff --git a/graphics/pokemon/vespiquen/icon.png b/graphics/pokemon/gen_4/vespiquen/icon.png similarity index 100% rename from graphics/pokemon/vespiquen/icon.png rename to graphics/pokemon/gen_4/vespiquen/icon.png diff --git a/graphics/pokemon/vespiquen/normal.pal b/graphics/pokemon/gen_4/vespiquen/normal.pal similarity index 100% rename from graphics/pokemon/vespiquen/normal.pal rename to graphics/pokemon/gen_4/vespiquen/normal.pal diff --git a/graphics/pokemon/vespiquen/shiny.pal b/graphics/pokemon/gen_4/vespiquen/shiny.pal similarity index 100% rename from graphics/pokemon/vespiquen/shiny.pal rename to graphics/pokemon/gen_4/vespiquen/shiny.pal diff --git a/graphics/pokemon/weavile/anim_front.png b/graphics/pokemon/gen_4/weavile/anim_front.png similarity index 100% rename from graphics/pokemon/weavile/anim_front.png rename to graphics/pokemon/gen_4/weavile/anim_front.png diff --git a/graphics/pokemon/weavile/anim_frontf.png b/graphics/pokemon/gen_4/weavile/anim_frontf.png similarity index 100% rename from graphics/pokemon/weavile/anim_frontf.png rename to graphics/pokemon/gen_4/weavile/anim_frontf.png diff --git a/graphics/pokemon/weavile/back.png b/graphics/pokemon/gen_4/weavile/back.png similarity index 100% rename from graphics/pokemon/weavile/back.png rename to graphics/pokemon/gen_4/weavile/back.png diff --git a/graphics/pokemon/weavile/backf.png b/graphics/pokemon/gen_4/weavile/backf.png similarity index 100% rename from graphics/pokemon/weavile/backf.png rename to graphics/pokemon/gen_4/weavile/backf.png diff --git a/graphics/pokemon/weavile/footprint.png b/graphics/pokemon/gen_4/weavile/footprint.png similarity index 100% rename from graphics/pokemon/weavile/footprint.png rename to graphics/pokemon/gen_4/weavile/footprint.png diff --git a/graphics/pokemon/weavile/icon.png b/graphics/pokemon/gen_4/weavile/icon.png similarity index 100% rename from graphics/pokemon/weavile/icon.png rename to graphics/pokemon/gen_4/weavile/icon.png diff --git a/graphics/pokemon/weavile/normal.pal b/graphics/pokemon/gen_4/weavile/normal.pal similarity index 100% rename from graphics/pokemon/weavile/normal.pal rename to graphics/pokemon/gen_4/weavile/normal.pal diff --git a/graphics/pokemon/weavile/shiny.pal b/graphics/pokemon/gen_4/weavile/shiny.pal similarity index 100% rename from graphics/pokemon/weavile/shiny.pal rename to graphics/pokemon/gen_4/weavile/shiny.pal diff --git a/graphics/pokemon/wormadam/anim_front.png b/graphics/pokemon/gen_4/wormadam/anim_front.png similarity index 100% rename from graphics/pokemon/wormadam/anim_front.png rename to graphics/pokemon/gen_4/wormadam/anim_front.png diff --git a/graphics/pokemon/wormadam/back.png b/graphics/pokemon/gen_4/wormadam/back.png similarity index 100% rename from graphics/pokemon/wormadam/back.png rename to graphics/pokemon/gen_4/wormadam/back.png diff --git a/graphics/pokemon/wormadam/icon.png b/graphics/pokemon/gen_4/wormadam/icon.png similarity index 100% rename from graphics/pokemon/wormadam/icon.png rename to graphics/pokemon/gen_4/wormadam/icon.png diff --git a/graphics/pokemon/wormadam/normal.pal b/graphics/pokemon/gen_4/wormadam/normal.pal similarity index 100% rename from graphics/pokemon/wormadam/normal.pal rename to graphics/pokemon/gen_4/wormadam/normal.pal diff --git a/graphics/pokemon/lapras/footprint.png b/graphics/pokemon/gen_4/wormadam/plant/footprint.png similarity index 100% rename from graphics/pokemon/lapras/footprint.png rename to graphics/pokemon/gen_4/wormadam/plant/footprint.png diff --git a/graphics/pokemon/wormadam/sandy_cloak/anim_front.png b/graphics/pokemon/gen_4/wormadam/sandy_cloak/anim_front.png similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/anim_front.png rename to graphics/pokemon/gen_4/wormadam/sandy_cloak/anim_front.png diff --git a/graphics/pokemon/wormadam/sandy_cloak/back.png b/graphics/pokemon/gen_4/wormadam/sandy_cloak/back.png similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/back.png rename to graphics/pokemon/gen_4/wormadam/sandy_cloak/back.png diff --git a/graphics/pokemon/wormadam/sandy_cloak/icon.png b/graphics/pokemon/gen_4/wormadam/sandy_cloak/icon.png similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/icon.png rename to graphics/pokemon/gen_4/wormadam/sandy_cloak/icon.png diff --git a/graphics/pokemon/wormadam/sandy_cloak/normal.pal b/graphics/pokemon/gen_4/wormadam/sandy_cloak/normal.pal similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/normal.pal rename to graphics/pokemon/gen_4/wormadam/sandy_cloak/normal.pal diff --git a/graphics/pokemon/wormadam/sandy_cloak/shiny.pal b/graphics/pokemon/gen_4/wormadam/sandy_cloak/shiny.pal similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/shiny.pal rename to graphics/pokemon/gen_4/wormadam/sandy_cloak/shiny.pal diff --git a/graphics/pokemon/wormadam/shiny.pal b/graphics/pokemon/gen_4/wormadam/shiny.pal similarity index 100% rename from graphics/pokemon/wormadam/shiny.pal rename to graphics/pokemon/gen_4/wormadam/shiny.pal diff --git a/graphics/pokemon/wormadam/trash_cloak/anim_front.png b/graphics/pokemon/gen_4/wormadam/trash_cloak/anim_front.png similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/anim_front.png rename to graphics/pokemon/gen_4/wormadam/trash_cloak/anim_front.png diff --git a/graphics/pokemon/wormadam/trash_cloak/back.png b/graphics/pokemon/gen_4/wormadam/trash_cloak/back.png similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/back.png rename to graphics/pokemon/gen_4/wormadam/trash_cloak/back.png diff --git a/graphics/pokemon/wormadam/trash_cloak/icon.png b/graphics/pokemon/gen_4/wormadam/trash_cloak/icon.png similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/icon.png rename to graphics/pokemon/gen_4/wormadam/trash_cloak/icon.png diff --git a/graphics/pokemon/wormadam/trash_cloak/normal.pal b/graphics/pokemon/gen_4/wormadam/trash_cloak/normal.pal similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/normal.pal rename to graphics/pokemon/gen_4/wormadam/trash_cloak/normal.pal diff --git a/graphics/pokemon/wormadam/trash_cloak/shiny.pal b/graphics/pokemon/gen_4/wormadam/trash_cloak/shiny.pal similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/shiny.pal rename to graphics/pokemon/gen_4/wormadam/trash_cloak/shiny.pal diff --git a/graphics/pokemon/yanmega/anim_front.png b/graphics/pokemon/gen_4/yanmega/anim_front.png similarity index 100% rename from graphics/pokemon/yanmega/anim_front.png rename to graphics/pokemon/gen_4/yanmega/anim_front.png diff --git a/graphics/pokemon/yanmega/back.png b/graphics/pokemon/gen_4/yanmega/back.png similarity index 100% rename from graphics/pokemon/yanmega/back.png rename to graphics/pokemon/gen_4/yanmega/back.png diff --git a/graphics/pokemon/yanmega/footprint.png b/graphics/pokemon/gen_4/yanmega/footprint.png similarity index 100% rename from graphics/pokemon/yanmega/footprint.png rename to graphics/pokemon/gen_4/yanmega/footprint.png diff --git a/graphics/pokemon/yanmega/icon.png b/graphics/pokemon/gen_4/yanmega/icon.png similarity index 100% rename from graphics/pokemon/yanmega/icon.png rename to graphics/pokemon/gen_4/yanmega/icon.png diff --git a/graphics/pokemon/yanmega/normal.pal b/graphics/pokemon/gen_4/yanmega/normal.pal similarity index 100% rename from graphics/pokemon/yanmega/normal.pal rename to graphics/pokemon/gen_4/yanmega/normal.pal diff --git a/graphics/pokemon/yanmega/shiny.pal b/graphics/pokemon/gen_4/yanmega/shiny.pal similarity index 100% rename from graphics/pokemon/yanmega/shiny.pal rename to graphics/pokemon/gen_4/yanmega/shiny.pal diff --git a/graphics/pokemon/accelgor/anim_front.png b/graphics/pokemon/gen_5/accelgor/anim_front.png similarity index 100% rename from graphics/pokemon/accelgor/anim_front.png rename to graphics/pokemon/gen_5/accelgor/anim_front.png diff --git a/graphics/pokemon/accelgor/back.png b/graphics/pokemon/gen_5/accelgor/back.png similarity index 100% rename from graphics/pokemon/accelgor/back.png rename to graphics/pokemon/gen_5/accelgor/back.png diff --git a/graphics/pokemon/litwick/footprint.png b/graphics/pokemon/gen_5/accelgor/footprint.png similarity index 100% rename from graphics/pokemon/litwick/footprint.png rename to graphics/pokemon/gen_5/accelgor/footprint.png diff --git a/graphics/pokemon/accelgor/icon.png b/graphics/pokemon/gen_5/accelgor/icon.png similarity index 100% rename from graphics/pokemon/accelgor/icon.png rename to graphics/pokemon/gen_5/accelgor/icon.png diff --git a/graphics/pokemon/accelgor/normal.pal b/graphics/pokemon/gen_5/accelgor/normal.pal similarity index 100% rename from graphics/pokemon/accelgor/normal.pal rename to graphics/pokemon/gen_5/accelgor/normal.pal diff --git a/graphics/pokemon/accelgor/shiny.pal b/graphics/pokemon/gen_5/accelgor/shiny.pal similarity index 100% rename from graphics/pokemon/accelgor/shiny.pal rename to graphics/pokemon/gen_5/accelgor/shiny.pal diff --git a/graphics/pokemon/alomomola/anim_front.png b/graphics/pokemon/gen_5/alomomola/anim_front.png similarity index 100% rename from graphics/pokemon/alomomola/anim_front.png rename to graphics/pokemon/gen_5/alomomola/anim_front.png diff --git a/graphics/pokemon/alomomola/back.png b/graphics/pokemon/gen_5/alomomola/back.png similarity index 100% rename from graphics/pokemon/alomomola/back.png rename to graphics/pokemon/gen_5/alomomola/back.png diff --git a/graphics/pokemon/lumineon/footprint.png b/graphics/pokemon/gen_5/alomomola/footprint.png similarity index 100% rename from graphics/pokemon/lumineon/footprint.png rename to graphics/pokemon/gen_5/alomomola/footprint.png diff --git a/graphics/pokemon/alomomola/icon.png b/graphics/pokemon/gen_5/alomomola/icon.png similarity index 100% rename from graphics/pokemon/alomomola/icon.png rename to graphics/pokemon/gen_5/alomomola/icon.png diff --git a/graphics/pokemon/alomomola/normal.pal b/graphics/pokemon/gen_5/alomomola/normal.pal similarity index 100% rename from graphics/pokemon/alomomola/normal.pal rename to graphics/pokemon/gen_5/alomomola/normal.pal diff --git a/graphics/pokemon/alomomola/shiny.pal b/graphics/pokemon/gen_5/alomomola/shiny.pal similarity index 100% rename from graphics/pokemon/alomomola/shiny.pal rename to graphics/pokemon/gen_5/alomomola/shiny.pal diff --git a/graphics/pokemon/amoonguss/anim_front.png b/graphics/pokemon/gen_5/amoonguss/anim_front.png similarity index 100% rename from graphics/pokemon/amoonguss/anim_front.png rename to graphics/pokemon/gen_5/amoonguss/anim_front.png diff --git a/graphics/pokemon/amoonguss/back.png b/graphics/pokemon/gen_5/amoonguss/back.png similarity index 100% rename from graphics/pokemon/amoonguss/back.png rename to graphics/pokemon/gen_5/amoonguss/back.png diff --git a/graphics/pokemon/lunala/footprint.png b/graphics/pokemon/gen_5/amoonguss/footprint.png similarity index 100% rename from graphics/pokemon/lunala/footprint.png rename to graphics/pokemon/gen_5/amoonguss/footprint.png diff --git a/graphics/pokemon/amoonguss/icon.png b/graphics/pokemon/gen_5/amoonguss/icon.png similarity index 100% rename from graphics/pokemon/amoonguss/icon.png rename to graphics/pokemon/gen_5/amoonguss/icon.png diff --git a/graphics/pokemon/amoonguss/normal.pal b/graphics/pokemon/gen_5/amoonguss/normal.pal similarity index 100% rename from graphics/pokemon/amoonguss/normal.pal rename to graphics/pokemon/gen_5/amoonguss/normal.pal diff --git a/graphics/pokemon/amoonguss/shiny.pal b/graphics/pokemon/gen_5/amoonguss/shiny.pal similarity index 100% rename from graphics/pokemon/amoonguss/shiny.pal rename to graphics/pokemon/gen_5/amoonguss/shiny.pal diff --git a/graphics/pokemon/archen/anim_front.png b/graphics/pokemon/gen_5/archen/anim_front.png similarity index 100% rename from graphics/pokemon/archen/anim_front.png rename to graphics/pokemon/gen_5/archen/anim_front.png diff --git a/graphics/pokemon/archen/back.png b/graphics/pokemon/gen_5/archen/back.png similarity index 100% rename from graphics/pokemon/archen/back.png rename to graphics/pokemon/gen_5/archen/back.png diff --git a/graphics/pokemon/archen/footprint.png b/graphics/pokemon/gen_5/archen/footprint.png similarity index 100% rename from graphics/pokemon/archen/footprint.png rename to graphics/pokemon/gen_5/archen/footprint.png diff --git a/graphics/pokemon/archen/icon.png b/graphics/pokemon/gen_5/archen/icon.png similarity index 100% rename from graphics/pokemon/archen/icon.png rename to graphics/pokemon/gen_5/archen/icon.png diff --git a/graphics/pokemon/archen/normal.pal b/graphics/pokemon/gen_5/archen/normal.pal similarity index 100% rename from graphics/pokemon/archen/normal.pal rename to graphics/pokemon/gen_5/archen/normal.pal diff --git a/graphics/pokemon/archen/shiny.pal b/graphics/pokemon/gen_5/archen/shiny.pal similarity index 100% rename from graphics/pokemon/archen/shiny.pal rename to graphics/pokemon/gen_5/archen/shiny.pal diff --git a/graphics/pokemon/archeops/anim_front.png b/graphics/pokemon/gen_5/archeops/anim_front.png similarity index 100% rename from graphics/pokemon/archeops/anim_front.png rename to graphics/pokemon/gen_5/archeops/anim_front.png diff --git a/graphics/pokemon/archeops/back.png b/graphics/pokemon/gen_5/archeops/back.png similarity index 100% rename from graphics/pokemon/archeops/back.png rename to graphics/pokemon/gen_5/archeops/back.png diff --git a/graphics/pokemon/archeops/footprint.png b/graphics/pokemon/gen_5/archeops/footprint.png similarity index 100% rename from graphics/pokemon/archeops/footprint.png rename to graphics/pokemon/gen_5/archeops/footprint.png diff --git a/graphics/pokemon/archeops/icon.png b/graphics/pokemon/gen_5/archeops/icon.png similarity index 100% rename from graphics/pokemon/archeops/icon.png rename to graphics/pokemon/gen_5/archeops/icon.png diff --git a/graphics/pokemon/archeops/normal.pal b/graphics/pokemon/gen_5/archeops/normal.pal similarity index 100% rename from graphics/pokemon/archeops/normal.pal rename to graphics/pokemon/gen_5/archeops/normal.pal diff --git a/graphics/pokemon/archeops/shiny.pal b/graphics/pokemon/gen_5/archeops/shiny.pal similarity index 100% rename from graphics/pokemon/archeops/shiny.pal rename to graphics/pokemon/gen_5/archeops/shiny.pal diff --git a/graphics/pokemon/audino/anim_front.png b/graphics/pokemon/gen_5/audino/anim_front.png similarity index 100% rename from graphics/pokemon/audino/anim_front.png rename to graphics/pokemon/gen_5/audino/anim_front.png diff --git a/graphics/pokemon/audino/back.png b/graphics/pokemon/gen_5/audino/back.png similarity index 100% rename from graphics/pokemon/audino/back.png rename to graphics/pokemon/gen_5/audino/back.png diff --git a/graphics/pokemon/audino/footprint.png b/graphics/pokemon/gen_5/audino/footprint.png similarity index 100% rename from graphics/pokemon/audino/footprint.png rename to graphics/pokemon/gen_5/audino/footprint.png diff --git a/graphics/pokemon/audino/icon.png b/graphics/pokemon/gen_5/audino/icon.png similarity index 100% rename from graphics/pokemon/audino/icon.png rename to graphics/pokemon/gen_5/audino/icon.png diff --git a/graphics/pokemon/audino/mega/back.png b/graphics/pokemon/gen_5/audino/mega/back.png similarity index 100% rename from graphics/pokemon/audino/mega/back.png rename to graphics/pokemon/gen_5/audino/mega/back.png diff --git a/graphics/pokemon/audino/mega/front.png b/graphics/pokemon/gen_5/audino/mega/front.png similarity index 100% rename from graphics/pokemon/audino/mega/front.png rename to graphics/pokemon/gen_5/audino/mega/front.png diff --git a/graphics/pokemon/audino/mega/icon.png b/graphics/pokemon/gen_5/audino/mega/icon.png similarity index 100% rename from graphics/pokemon/audino/mega/icon.png rename to graphics/pokemon/gen_5/audino/mega/icon.png diff --git a/graphics/pokemon/audino/mega/normal.pal b/graphics/pokemon/gen_5/audino/mega/normal.pal similarity index 100% rename from graphics/pokemon/audino/mega/normal.pal rename to graphics/pokemon/gen_5/audino/mega/normal.pal diff --git a/graphics/pokemon/audino/mega/shiny.pal b/graphics/pokemon/gen_5/audino/mega/shiny.pal similarity index 100% rename from graphics/pokemon/audino/mega/shiny.pal rename to graphics/pokemon/gen_5/audino/mega/shiny.pal diff --git a/graphics/pokemon/audino/normal.pal b/graphics/pokemon/gen_5/audino/normal.pal similarity index 100% rename from graphics/pokemon/audino/normal.pal rename to graphics/pokemon/gen_5/audino/normal.pal diff --git a/graphics/pokemon/audino/shiny.pal b/graphics/pokemon/gen_5/audino/shiny.pal similarity index 100% rename from graphics/pokemon/audino/shiny.pal rename to graphics/pokemon/gen_5/audino/shiny.pal diff --git a/graphics/pokemon/axew/anim_front.png b/graphics/pokemon/gen_5/axew/anim_front.png similarity index 100% rename from graphics/pokemon/axew/anim_front.png rename to graphics/pokemon/gen_5/axew/anim_front.png diff --git a/graphics/pokemon/axew/back.png b/graphics/pokemon/gen_5/axew/back.png similarity index 100% rename from graphics/pokemon/axew/back.png rename to graphics/pokemon/gen_5/axew/back.png diff --git a/graphics/pokemon/axew/footprint.png b/graphics/pokemon/gen_5/axew/footprint.png similarity index 100% rename from graphics/pokemon/axew/footprint.png rename to graphics/pokemon/gen_5/axew/footprint.png diff --git a/graphics/pokemon/axew/icon.png b/graphics/pokemon/gen_5/axew/icon.png similarity index 100% rename from graphics/pokemon/axew/icon.png rename to graphics/pokemon/gen_5/axew/icon.png diff --git a/graphics/pokemon/axew/normal.pal b/graphics/pokemon/gen_5/axew/normal.pal similarity index 100% rename from graphics/pokemon/axew/normal.pal rename to graphics/pokemon/gen_5/axew/normal.pal diff --git a/graphics/pokemon/axew/shiny.pal b/graphics/pokemon/gen_5/axew/shiny.pal similarity index 100% rename from graphics/pokemon/axew/shiny.pal rename to graphics/pokemon/gen_5/axew/shiny.pal diff --git a/graphics/pokemon/basculin/anim_front.png b/graphics/pokemon/gen_5/basculin/anim_front.png similarity index 100% rename from graphics/pokemon/basculin/anim_front.png rename to graphics/pokemon/gen_5/basculin/anim_front.png diff --git a/graphics/pokemon/basculin/back.png b/graphics/pokemon/gen_5/basculin/back.png similarity index 100% rename from graphics/pokemon/basculin/back.png rename to graphics/pokemon/gen_5/basculin/back.png diff --git a/graphics/pokemon/basculin/blue_striped/back.png b/graphics/pokemon/gen_5/basculin/blue_striped/back.png similarity index 100% rename from graphics/pokemon/basculin/blue_striped/back.png rename to graphics/pokemon/gen_5/basculin/blue_striped/back.png diff --git a/graphics/pokemon/basculin/blue_striped/front.png b/graphics/pokemon/gen_5/basculin/blue_striped/front.png similarity index 100% rename from graphics/pokemon/basculin/blue_striped/front.png rename to graphics/pokemon/gen_5/basculin/blue_striped/front.png diff --git a/graphics/pokemon/basculin/blue_striped/icon.png b/graphics/pokemon/gen_5/basculin/blue_striped/icon.png similarity index 100% rename from graphics/pokemon/basculin/blue_striped/icon.png rename to graphics/pokemon/gen_5/basculin/blue_striped/icon.png diff --git a/graphics/pokemon/basculin/blue_striped/normal.pal b/graphics/pokemon/gen_5/basculin/blue_striped/normal.pal similarity index 100% rename from graphics/pokemon/basculin/blue_striped/normal.pal rename to graphics/pokemon/gen_5/basculin/blue_striped/normal.pal diff --git a/graphics/pokemon/basculin/blue_striped/shiny.pal b/graphics/pokemon/gen_5/basculin/blue_striped/shiny.pal similarity index 100% rename from graphics/pokemon/basculin/blue_striped/shiny.pal rename to graphics/pokemon/gen_5/basculin/blue_striped/shiny.pal diff --git a/graphics/pokemon/lunatone/footprint.png b/graphics/pokemon/gen_5/basculin/footprint.png similarity index 100% rename from graphics/pokemon/lunatone/footprint.png rename to graphics/pokemon/gen_5/basculin/footprint.png diff --git a/graphics/pokemon/basculin/icon.png b/graphics/pokemon/gen_5/basculin/icon.png similarity index 100% rename from graphics/pokemon/basculin/icon.png rename to graphics/pokemon/gen_5/basculin/icon.png diff --git a/graphics/pokemon/basculin/normal.pal b/graphics/pokemon/gen_5/basculin/normal.pal similarity index 100% rename from graphics/pokemon/basculin/normal.pal rename to graphics/pokemon/gen_5/basculin/normal.pal diff --git a/graphics/pokemon/basculin/shiny.pal b/graphics/pokemon/gen_5/basculin/shiny.pal similarity index 100% rename from graphics/pokemon/basculin/shiny.pal rename to graphics/pokemon/gen_5/basculin/shiny.pal diff --git a/graphics/pokemon/basculin/white_striped/back.png b/graphics/pokemon/gen_5/basculin/white_striped/back.png similarity index 100% rename from graphics/pokemon/basculin/white_striped/back.png rename to graphics/pokemon/gen_5/basculin/white_striped/back.png diff --git a/graphics/pokemon/basculin/white_striped/front.png b/graphics/pokemon/gen_5/basculin/white_striped/front.png similarity index 100% rename from graphics/pokemon/basculin/white_striped/front.png rename to graphics/pokemon/gen_5/basculin/white_striped/front.png diff --git a/graphics/pokemon/basculin/white_striped/icon.png b/graphics/pokemon/gen_5/basculin/white_striped/icon.png similarity index 100% rename from graphics/pokemon/basculin/white_striped/icon.png rename to graphics/pokemon/gen_5/basculin/white_striped/icon.png diff --git a/graphics/pokemon/basculin/white_striped/normal.pal b/graphics/pokemon/gen_5/basculin/white_striped/normal.pal similarity index 100% rename from graphics/pokemon/basculin/white_striped/normal.pal rename to graphics/pokemon/gen_5/basculin/white_striped/normal.pal diff --git a/graphics/pokemon/basculin/white_striped/shiny.pal b/graphics/pokemon/gen_5/basculin/white_striped/shiny.pal similarity index 100% rename from graphics/pokemon/basculin/white_striped/shiny.pal rename to graphics/pokemon/gen_5/basculin/white_striped/shiny.pal diff --git a/graphics/pokemon/beartic/anim_front.png b/graphics/pokemon/gen_5/beartic/anim_front.png similarity index 100% rename from graphics/pokemon/beartic/anim_front.png rename to graphics/pokemon/gen_5/beartic/anim_front.png diff --git a/graphics/pokemon/beartic/back.png b/graphics/pokemon/gen_5/beartic/back.png similarity index 100% rename from graphics/pokemon/beartic/back.png rename to graphics/pokemon/gen_5/beartic/back.png diff --git a/graphics/pokemon/beartic/footprint.png b/graphics/pokemon/gen_5/beartic/footprint.png similarity index 100% rename from graphics/pokemon/beartic/footprint.png rename to graphics/pokemon/gen_5/beartic/footprint.png diff --git a/graphics/pokemon/beartic/icon.png b/graphics/pokemon/gen_5/beartic/icon.png similarity index 100% rename from graphics/pokemon/beartic/icon.png rename to graphics/pokemon/gen_5/beartic/icon.png diff --git a/graphics/pokemon/beartic/normal.pal b/graphics/pokemon/gen_5/beartic/normal.pal similarity index 100% rename from graphics/pokemon/beartic/normal.pal rename to graphics/pokemon/gen_5/beartic/normal.pal diff --git a/graphics/pokemon/beartic/shiny.pal b/graphics/pokemon/gen_5/beartic/shiny.pal similarity index 100% rename from graphics/pokemon/beartic/shiny.pal rename to graphics/pokemon/gen_5/beartic/shiny.pal diff --git a/graphics/pokemon/beheeyem/anim_front.png b/graphics/pokemon/gen_5/beheeyem/anim_front.png similarity index 100% rename from graphics/pokemon/beheeyem/anim_front.png rename to graphics/pokemon/gen_5/beheeyem/anim_front.png diff --git a/graphics/pokemon/beheeyem/back.png b/graphics/pokemon/gen_5/beheeyem/back.png similarity index 100% rename from graphics/pokemon/beheeyem/back.png rename to graphics/pokemon/gen_5/beheeyem/back.png diff --git a/graphics/pokemon/beheeyem/footprint.png b/graphics/pokemon/gen_5/beheeyem/footprint.png similarity index 100% rename from graphics/pokemon/beheeyem/footprint.png rename to graphics/pokemon/gen_5/beheeyem/footprint.png diff --git a/graphics/pokemon/beheeyem/icon.png b/graphics/pokemon/gen_5/beheeyem/icon.png similarity index 100% rename from graphics/pokemon/beheeyem/icon.png rename to graphics/pokemon/gen_5/beheeyem/icon.png diff --git a/graphics/pokemon/beheeyem/normal.pal b/graphics/pokemon/gen_5/beheeyem/normal.pal similarity index 100% rename from graphics/pokemon/beheeyem/normal.pal rename to graphics/pokemon/gen_5/beheeyem/normal.pal diff --git a/graphics/pokemon/beheeyem/shiny.pal b/graphics/pokemon/gen_5/beheeyem/shiny.pal similarity index 100% rename from graphics/pokemon/beheeyem/shiny.pal rename to graphics/pokemon/gen_5/beheeyem/shiny.pal diff --git a/graphics/pokemon/bisharp/anim_front.png b/graphics/pokemon/gen_5/bisharp/anim_front.png similarity index 100% rename from graphics/pokemon/bisharp/anim_front.png rename to graphics/pokemon/gen_5/bisharp/anim_front.png diff --git a/graphics/pokemon/bisharp/back.png b/graphics/pokemon/gen_5/bisharp/back.png similarity index 100% rename from graphics/pokemon/bisharp/back.png rename to graphics/pokemon/gen_5/bisharp/back.png diff --git a/graphics/pokemon/bisharp/footprint.png b/graphics/pokemon/gen_5/bisharp/footprint.png similarity index 100% rename from graphics/pokemon/bisharp/footprint.png rename to graphics/pokemon/gen_5/bisharp/footprint.png diff --git a/graphics/pokemon/bisharp/icon.png b/graphics/pokemon/gen_5/bisharp/icon.png similarity index 100% rename from graphics/pokemon/bisharp/icon.png rename to graphics/pokemon/gen_5/bisharp/icon.png diff --git a/graphics/pokemon/bisharp/normal.pal b/graphics/pokemon/gen_5/bisharp/normal.pal similarity index 100% rename from graphics/pokemon/bisharp/normal.pal rename to graphics/pokemon/gen_5/bisharp/normal.pal diff --git a/graphics/pokemon/bisharp/shiny.pal b/graphics/pokemon/gen_5/bisharp/shiny.pal similarity index 100% rename from graphics/pokemon/bisharp/shiny.pal rename to graphics/pokemon/gen_5/bisharp/shiny.pal diff --git a/graphics/pokemon/blitzle/anim_front.png b/graphics/pokemon/gen_5/blitzle/anim_front.png similarity index 100% rename from graphics/pokemon/blitzle/anim_front.png rename to graphics/pokemon/gen_5/blitzle/anim_front.png diff --git a/graphics/pokemon/blitzle/back.png b/graphics/pokemon/gen_5/blitzle/back.png similarity index 100% rename from graphics/pokemon/blitzle/back.png rename to graphics/pokemon/gen_5/blitzle/back.png diff --git a/graphics/pokemon/blitzle/footprint.png b/graphics/pokemon/gen_5/blitzle/footprint.png similarity index 100% rename from graphics/pokemon/blitzle/footprint.png rename to graphics/pokemon/gen_5/blitzle/footprint.png diff --git a/graphics/pokemon/blitzle/icon.png b/graphics/pokemon/gen_5/blitzle/icon.png similarity index 100% rename from graphics/pokemon/blitzle/icon.png rename to graphics/pokemon/gen_5/blitzle/icon.png diff --git a/graphics/pokemon/blitzle/normal.pal b/graphics/pokemon/gen_5/blitzle/normal.pal similarity index 100% rename from graphics/pokemon/blitzle/normal.pal rename to graphics/pokemon/gen_5/blitzle/normal.pal diff --git a/graphics/pokemon/blitzle/shiny.pal b/graphics/pokemon/gen_5/blitzle/shiny.pal similarity index 100% rename from graphics/pokemon/blitzle/shiny.pal rename to graphics/pokemon/gen_5/blitzle/shiny.pal diff --git a/graphics/pokemon/boldore/anim_front.png b/graphics/pokemon/gen_5/boldore/anim_front.png similarity index 100% rename from graphics/pokemon/boldore/anim_front.png rename to graphics/pokemon/gen_5/boldore/anim_front.png diff --git a/graphics/pokemon/boldore/back.png b/graphics/pokemon/gen_5/boldore/back.png similarity index 100% rename from graphics/pokemon/boldore/back.png rename to graphics/pokemon/gen_5/boldore/back.png diff --git a/graphics/pokemon/boldore/footprint.png b/graphics/pokemon/gen_5/boldore/footprint.png similarity index 100% rename from graphics/pokemon/boldore/footprint.png rename to graphics/pokemon/gen_5/boldore/footprint.png diff --git a/graphics/pokemon/boldore/icon.png b/graphics/pokemon/gen_5/boldore/icon.png similarity index 100% rename from graphics/pokemon/boldore/icon.png rename to graphics/pokemon/gen_5/boldore/icon.png diff --git a/graphics/pokemon/boldore/normal.pal b/graphics/pokemon/gen_5/boldore/normal.pal similarity index 100% rename from graphics/pokemon/boldore/normal.pal rename to graphics/pokemon/gen_5/boldore/normal.pal diff --git a/graphics/pokemon/boldore/shiny.pal b/graphics/pokemon/gen_5/boldore/shiny.pal similarity index 100% rename from graphics/pokemon/boldore/shiny.pal rename to graphics/pokemon/gen_5/boldore/shiny.pal diff --git a/graphics/pokemon/bouffalant/anim_front.png b/graphics/pokemon/gen_5/bouffalant/anim_front.png similarity index 100% rename from graphics/pokemon/bouffalant/anim_front.png rename to graphics/pokemon/gen_5/bouffalant/anim_front.png diff --git a/graphics/pokemon/bouffalant/back.png b/graphics/pokemon/gen_5/bouffalant/back.png similarity index 100% rename from graphics/pokemon/bouffalant/back.png rename to graphics/pokemon/gen_5/bouffalant/back.png diff --git a/graphics/pokemon/bouffalant/footprint.png b/graphics/pokemon/gen_5/bouffalant/footprint.png similarity index 100% rename from graphics/pokemon/bouffalant/footprint.png rename to graphics/pokemon/gen_5/bouffalant/footprint.png diff --git a/graphics/pokemon/bouffalant/icon.png b/graphics/pokemon/gen_5/bouffalant/icon.png similarity index 100% rename from graphics/pokemon/bouffalant/icon.png rename to graphics/pokemon/gen_5/bouffalant/icon.png diff --git a/graphics/pokemon/bouffalant/normal.pal b/graphics/pokemon/gen_5/bouffalant/normal.pal similarity index 100% rename from graphics/pokemon/bouffalant/normal.pal rename to graphics/pokemon/gen_5/bouffalant/normal.pal diff --git a/graphics/pokemon/bouffalant/shiny.pal b/graphics/pokemon/gen_5/bouffalant/shiny.pal similarity index 100% rename from graphics/pokemon/bouffalant/shiny.pal rename to graphics/pokemon/gen_5/bouffalant/shiny.pal diff --git a/graphics/pokemon/braviary/anim_front.png b/graphics/pokemon/gen_5/braviary/anim_front.png similarity index 100% rename from graphics/pokemon/braviary/anim_front.png rename to graphics/pokemon/gen_5/braviary/anim_front.png diff --git a/graphics/pokemon/braviary/back.png b/graphics/pokemon/gen_5/braviary/back.png similarity index 100% rename from graphics/pokemon/braviary/back.png rename to graphics/pokemon/gen_5/braviary/back.png diff --git a/graphics/pokemon/braviary/footprint.png b/graphics/pokemon/gen_5/braviary/footprint.png similarity index 100% rename from graphics/pokemon/braviary/footprint.png rename to graphics/pokemon/gen_5/braviary/footprint.png diff --git a/graphics/pokemon/braviary/hisuian/back.png b/graphics/pokemon/gen_5/braviary/hisuian/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/braviary/hisuian/back.png rename to graphics/pokemon/gen_5/braviary/hisuian/back.png diff --git a/graphics/pokemon/braviary/hisuian/front.png b/graphics/pokemon/gen_5/braviary/hisuian/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/braviary/hisuian/front.png rename to graphics/pokemon/gen_5/braviary/hisuian/front.png diff --git a/graphics/pokemon/braviary/hisuian/icon.png b/graphics/pokemon/gen_5/braviary/hisuian/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/braviary/hisuian/icon.png rename to graphics/pokemon/gen_5/braviary/hisuian/icon.png diff --git a/graphics/pokemon/braviary/hisuian/normal.pal b/graphics/pokemon/gen_5/braviary/hisuian/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/braviary/hisuian/normal.pal rename to graphics/pokemon/gen_5/braviary/hisuian/normal.pal diff --git a/graphics/pokemon/braviary/hisuian/shiny.pal b/graphics/pokemon/gen_5/braviary/hisuian/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/braviary/hisuian/shiny.pal rename to graphics/pokemon/gen_5/braviary/hisuian/shiny.pal diff --git a/graphics/pokemon/braviary/icon.png b/graphics/pokemon/gen_5/braviary/icon.png similarity index 100% rename from graphics/pokemon/braviary/icon.png rename to graphics/pokemon/gen_5/braviary/icon.png diff --git a/graphics/pokemon/braviary/normal.pal b/graphics/pokemon/gen_5/braviary/normal.pal similarity index 100% rename from graphics/pokemon/braviary/normal.pal rename to graphics/pokemon/gen_5/braviary/normal.pal diff --git a/graphics/pokemon/braviary/shiny.pal b/graphics/pokemon/gen_5/braviary/shiny.pal similarity index 100% rename from graphics/pokemon/braviary/shiny.pal rename to graphics/pokemon/gen_5/braviary/shiny.pal diff --git a/graphics/pokemon/carracosta/anim_front.png b/graphics/pokemon/gen_5/carracosta/anim_front.png similarity index 100% rename from graphics/pokemon/carracosta/anim_front.png rename to graphics/pokemon/gen_5/carracosta/anim_front.png diff --git a/graphics/pokemon/carracosta/back.png b/graphics/pokemon/gen_5/carracosta/back.png similarity index 100% rename from graphics/pokemon/carracosta/back.png rename to graphics/pokemon/gen_5/carracosta/back.png diff --git a/graphics/pokemon/carracosta/footprint.png b/graphics/pokemon/gen_5/carracosta/footprint.png similarity index 100% rename from graphics/pokemon/carracosta/footprint.png rename to graphics/pokemon/gen_5/carracosta/footprint.png diff --git a/graphics/pokemon/carracosta/icon.png b/graphics/pokemon/gen_5/carracosta/icon.png similarity index 100% rename from graphics/pokemon/carracosta/icon.png rename to graphics/pokemon/gen_5/carracosta/icon.png diff --git a/graphics/pokemon/carracosta/normal.pal b/graphics/pokemon/gen_5/carracosta/normal.pal similarity index 100% rename from graphics/pokemon/carracosta/normal.pal rename to graphics/pokemon/gen_5/carracosta/normal.pal diff --git a/graphics/pokemon/carracosta/shiny.pal b/graphics/pokemon/gen_5/carracosta/shiny.pal similarity index 100% rename from graphics/pokemon/carracosta/shiny.pal rename to graphics/pokemon/gen_5/carracosta/shiny.pal diff --git a/graphics/pokemon/chandelure/anim_front.png b/graphics/pokemon/gen_5/chandelure/anim_front.png similarity index 100% rename from graphics/pokemon/chandelure/anim_front.png rename to graphics/pokemon/gen_5/chandelure/anim_front.png diff --git a/graphics/pokemon/chandelure/back.png b/graphics/pokemon/gen_5/chandelure/back.png similarity index 100% rename from graphics/pokemon/chandelure/back.png rename to graphics/pokemon/gen_5/chandelure/back.png diff --git a/graphics/pokemon/luvdisc/footprint.png b/graphics/pokemon/gen_5/chandelure/footprint.png similarity index 100% rename from graphics/pokemon/luvdisc/footprint.png rename to graphics/pokemon/gen_5/chandelure/footprint.png diff --git a/graphics/pokemon/chandelure/icon.png b/graphics/pokemon/gen_5/chandelure/icon.png similarity index 100% rename from graphics/pokemon/chandelure/icon.png rename to graphics/pokemon/gen_5/chandelure/icon.png diff --git a/graphics/pokemon/chandelure/normal.pal b/graphics/pokemon/gen_5/chandelure/normal.pal similarity index 100% rename from graphics/pokemon/chandelure/normal.pal rename to graphics/pokemon/gen_5/chandelure/normal.pal diff --git a/graphics/pokemon/chandelure/shiny.pal b/graphics/pokemon/gen_5/chandelure/shiny.pal similarity index 100% rename from graphics/pokemon/chandelure/shiny.pal rename to graphics/pokemon/gen_5/chandelure/shiny.pal diff --git a/graphics/pokemon/cinccino/anim_front.png b/graphics/pokemon/gen_5/cinccino/anim_front.png similarity index 100% rename from graphics/pokemon/cinccino/anim_front.png rename to graphics/pokemon/gen_5/cinccino/anim_front.png diff --git a/graphics/pokemon/cinccino/back.png b/graphics/pokemon/gen_5/cinccino/back.png similarity index 100% rename from graphics/pokemon/cinccino/back.png rename to graphics/pokemon/gen_5/cinccino/back.png diff --git a/graphics/pokemon/cinccino/footprint.png b/graphics/pokemon/gen_5/cinccino/footprint.png similarity index 100% rename from graphics/pokemon/cinccino/footprint.png rename to graphics/pokemon/gen_5/cinccino/footprint.png diff --git a/graphics/pokemon/cinccino/icon.png b/graphics/pokemon/gen_5/cinccino/icon.png similarity index 100% rename from graphics/pokemon/cinccino/icon.png rename to graphics/pokemon/gen_5/cinccino/icon.png diff --git a/graphics/pokemon/cinccino/normal.pal b/graphics/pokemon/gen_5/cinccino/normal.pal similarity index 100% rename from graphics/pokemon/cinccino/normal.pal rename to graphics/pokemon/gen_5/cinccino/normal.pal diff --git a/graphics/pokemon/cinccino/shiny.pal b/graphics/pokemon/gen_5/cinccino/shiny.pal similarity index 100% rename from graphics/pokemon/cinccino/shiny.pal rename to graphics/pokemon/gen_5/cinccino/shiny.pal diff --git a/graphics/pokemon/cobalion/anim_front.png b/graphics/pokemon/gen_5/cobalion/anim_front.png similarity index 100% rename from graphics/pokemon/cobalion/anim_front.png rename to graphics/pokemon/gen_5/cobalion/anim_front.png diff --git a/graphics/pokemon/cobalion/back.png b/graphics/pokemon/gen_5/cobalion/back.png similarity index 100% rename from graphics/pokemon/cobalion/back.png rename to graphics/pokemon/gen_5/cobalion/back.png diff --git a/graphics/pokemon/cobalion/footprint.png b/graphics/pokemon/gen_5/cobalion/footprint.png similarity index 100% rename from graphics/pokemon/cobalion/footprint.png rename to graphics/pokemon/gen_5/cobalion/footprint.png diff --git a/graphics/pokemon/cobalion/icon.png b/graphics/pokemon/gen_5/cobalion/icon.png similarity index 100% rename from graphics/pokemon/cobalion/icon.png rename to graphics/pokemon/gen_5/cobalion/icon.png diff --git a/graphics/pokemon/cobalion/normal.pal b/graphics/pokemon/gen_5/cobalion/normal.pal similarity index 100% rename from graphics/pokemon/cobalion/normal.pal rename to graphics/pokemon/gen_5/cobalion/normal.pal diff --git a/graphics/pokemon/cobalion/shiny.pal b/graphics/pokemon/gen_5/cobalion/shiny.pal similarity index 100% rename from graphics/pokemon/cobalion/shiny.pal rename to graphics/pokemon/gen_5/cobalion/shiny.pal diff --git a/graphics/pokemon/cofagrigus/anim_front.png b/graphics/pokemon/gen_5/cofagrigus/anim_front.png similarity index 100% rename from graphics/pokemon/cofagrigus/anim_front.png rename to graphics/pokemon/gen_5/cofagrigus/anim_front.png diff --git a/graphics/pokemon/cofagrigus/back.png b/graphics/pokemon/gen_5/cofagrigus/back.png similarity index 100% rename from graphics/pokemon/cofagrigus/back.png rename to graphics/pokemon/gen_5/cofagrigus/back.png diff --git a/graphics/pokemon/magcargo/footprint.png b/graphics/pokemon/gen_5/cofagrigus/footprint.png similarity index 100% rename from graphics/pokemon/magcargo/footprint.png rename to graphics/pokemon/gen_5/cofagrigus/footprint.png diff --git a/graphics/pokemon/cofagrigus/icon.png b/graphics/pokemon/gen_5/cofagrigus/icon.png similarity index 100% rename from graphics/pokemon/cofagrigus/icon.png rename to graphics/pokemon/gen_5/cofagrigus/icon.png diff --git a/graphics/pokemon/cofagrigus/normal.pal b/graphics/pokemon/gen_5/cofagrigus/normal.pal similarity index 100% rename from graphics/pokemon/cofagrigus/normal.pal rename to graphics/pokemon/gen_5/cofagrigus/normal.pal diff --git a/graphics/pokemon/cofagrigus/shiny.pal b/graphics/pokemon/gen_5/cofagrigus/shiny.pal similarity index 100% rename from graphics/pokemon/cofagrigus/shiny.pal rename to graphics/pokemon/gen_5/cofagrigus/shiny.pal diff --git a/graphics/pokemon/conkeldurr/anim_front.png b/graphics/pokemon/gen_5/conkeldurr/anim_front.png similarity index 100% rename from graphics/pokemon/conkeldurr/anim_front.png rename to graphics/pokemon/gen_5/conkeldurr/anim_front.png diff --git a/graphics/pokemon/conkeldurr/back.png b/graphics/pokemon/gen_5/conkeldurr/back.png similarity index 100% rename from graphics/pokemon/conkeldurr/back.png rename to graphics/pokemon/gen_5/conkeldurr/back.png diff --git a/graphics/pokemon/conkeldurr/footprint.png b/graphics/pokemon/gen_5/conkeldurr/footprint.png similarity index 100% rename from graphics/pokemon/conkeldurr/footprint.png rename to graphics/pokemon/gen_5/conkeldurr/footprint.png diff --git a/graphics/pokemon/conkeldurr/icon.png b/graphics/pokemon/gen_5/conkeldurr/icon.png similarity index 100% rename from graphics/pokemon/conkeldurr/icon.png rename to graphics/pokemon/gen_5/conkeldurr/icon.png diff --git a/graphics/pokemon/conkeldurr/normal.pal b/graphics/pokemon/gen_5/conkeldurr/normal.pal similarity index 100% rename from graphics/pokemon/conkeldurr/normal.pal rename to graphics/pokemon/gen_5/conkeldurr/normal.pal diff --git a/graphics/pokemon/conkeldurr/shiny.pal b/graphics/pokemon/gen_5/conkeldurr/shiny.pal similarity index 100% rename from graphics/pokemon/conkeldurr/shiny.pal rename to graphics/pokemon/gen_5/conkeldurr/shiny.pal diff --git a/graphics/pokemon/cottonee/anim_front.png b/graphics/pokemon/gen_5/cottonee/anim_front.png similarity index 100% rename from graphics/pokemon/cottonee/anim_front.png rename to graphics/pokemon/gen_5/cottonee/anim_front.png diff --git a/graphics/pokemon/cottonee/back.png b/graphics/pokemon/gen_5/cottonee/back.png similarity index 100% rename from graphics/pokemon/cottonee/back.png rename to graphics/pokemon/gen_5/cottonee/back.png diff --git a/graphics/pokemon/magikarp/footprint.png b/graphics/pokemon/gen_5/cottonee/footprint.png similarity index 100% rename from graphics/pokemon/magikarp/footprint.png rename to graphics/pokemon/gen_5/cottonee/footprint.png diff --git a/graphics/pokemon/cottonee/icon.png b/graphics/pokemon/gen_5/cottonee/icon.png similarity index 100% rename from graphics/pokemon/cottonee/icon.png rename to graphics/pokemon/gen_5/cottonee/icon.png diff --git a/graphics/pokemon/cottonee/normal.pal b/graphics/pokemon/gen_5/cottonee/normal.pal similarity index 100% rename from graphics/pokemon/cottonee/normal.pal rename to graphics/pokemon/gen_5/cottonee/normal.pal diff --git a/graphics/pokemon/cottonee/shiny.pal b/graphics/pokemon/gen_5/cottonee/shiny.pal similarity index 100% rename from graphics/pokemon/cottonee/shiny.pal rename to graphics/pokemon/gen_5/cottonee/shiny.pal diff --git a/graphics/pokemon/crustle/anim_front.png b/graphics/pokemon/gen_5/crustle/anim_front.png similarity index 100% rename from graphics/pokemon/crustle/anim_front.png rename to graphics/pokemon/gen_5/crustle/anim_front.png diff --git a/graphics/pokemon/crustle/back.png b/graphics/pokemon/gen_5/crustle/back.png similarity index 100% rename from graphics/pokemon/crustle/back.png rename to graphics/pokemon/gen_5/crustle/back.png diff --git a/graphics/pokemon/cherubi/footprint.png b/graphics/pokemon/gen_5/crustle/footprint.png similarity index 100% rename from graphics/pokemon/cherubi/footprint.png rename to graphics/pokemon/gen_5/crustle/footprint.png diff --git a/graphics/pokemon/crustle/icon.png b/graphics/pokemon/gen_5/crustle/icon.png similarity index 100% rename from graphics/pokemon/crustle/icon.png rename to graphics/pokemon/gen_5/crustle/icon.png diff --git a/graphics/pokemon/crustle/normal.pal b/graphics/pokemon/gen_5/crustle/normal.pal similarity index 100% rename from graphics/pokemon/crustle/normal.pal rename to graphics/pokemon/gen_5/crustle/normal.pal diff --git a/graphics/pokemon/crustle/shiny.pal b/graphics/pokemon/gen_5/crustle/shiny.pal similarity index 100% rename from graphics/pokemon/crustle/shiny.pal rename to graphics/pokemon/gen_5/crustle/shiny.pal diff --git a/graphics/pokemon/cryogonal/anim_front.png b/graphics/pokemon/gen_5/cryogonal/anim_front.png similarity index 100% rename from graphics/pokemon/cryogonal/anim_front.png rename to graphics/pokemon/gen_5/cryogonal/anim_front.png diff --git a/graphics/pokemon/cryogonal/back.png b/graphics/pokemon/gen_5/cryogonal/back.png similarity index 100% rename from graphics/pokemon/cryogonal/back.png rename to graphics/pokemon/gen_5/cryogonal/back.png diff --git a/graphics/pokemon/magnezone/footprint.png b/graphics/pokemon/gen_5/cryogonal/footprint.png similarity index 100% rename from graphics/pokemon/magnezone/footprint.png rename to graphics/pokemon/gen_5/cryogonal/footprint.png diff --git a/graphics/pokemon/cryogonal/icon.png b/graphics/pokemon/gen_5/cryogonal/icon.png similarity index 100% rename from graphics/pokemon/cryogonal/icon.png rename to graphics/pokemon/gen_5/cryogonal/icon.png diff --git a/graphics/pokemon/cryogonal/normal.pal b/graphics/pokemon/gen_5/cryogonal/normal.pal similarity index 100% rename from graphics/pokemon/cryogonal/normal.pal rename to graphics/pokemon/gen_5/cryogonal/normal.pal diff --git a/graphics/pokemon/cryogonal/shiny.pal b/graphics/pokemon/gen_5/cryogonal/shiny.pal similarity index 100% rename from graphics/pokemon/cryogonal/shiny.pal rename to graphics/pokemon/gen_5/cryogonal/shiny.pal diff --git a/graphics/pokemon/cubchoo/anim_front.png b/graphics/pokemon/gen_5/cubchoo/anim_front.png similarity index 100% rename from graphics/pokemon/cubchoo/anim_front.png rename to graphics/pokemon/gen_5/cubchoo/anim_front.png diff --git a/graphics/pokemon/cubchoo/back.png b/graphics/pokemon/gen_5/cubchoo/back.png similarity index 100% rename from graphics/pokemon/cubchoo/back.png rename to graphics/pokemon/gen_5/cubchoo/back.png diff --git a/graphics/pokemon/cubchoo/footprint.png b/graphics/pokemon/gen_5/cubchoo/footprint.png similarity index 100% rename from graphics/pokemon/cubchoo/footprint.png rename to graphics/pokemon/gen_5/cubchoo/footprint.png diff --git a/graphics/pokemon/cubchoo/icon.png b/graphics/pokemon/gen_5/cubchoo/icon.png similarity index 100% rename from graphics/pokemon/cubchoo/icon.png rename to graphics/pokemon/gen_5/cubchoo/icon.png diff --git a/graphics/pokemon/cubchoo/normal.pal b/graphics/pokemon/gen_5/cubchoo/normal.pal similarity index 100% rename from graphics/pokemon/cubchoo/normal.pal rename to graphics/pokemon/gen_5/cubchoo/normal.pal diff --git a/graphics/pokemon/cubchoo/shiny.pal b/graphics/pokemon/gen_5/cubchoo/shiny.pal similarity index 100% rename from graphics/pokemon/cubchoo/shiny.pal rename to graphics/pokemon/gen_5/cubchoo/shiny.pal diff --git a/graphics/pokemon/darmanitan/anim_front.png b/graphics/pokemon/gen_5/darmanitan/anim_front.png similarity index 100% rename from graphics/pokemon/darmanitan/anim_front.png rename to graphics/pokemon/gen_5/darmanitan/anim_front.png diff --git a/graphics/pokemon/darmanitan/back.png b/graphics/pokemon/gen_5/darmanitan/back.png similarity index 100% rename from graphics/pokemon/darmanitan/back.png rename to graphics/pokemon/gen_5/darmanitan/back.png diff --git a/graphics/pokemon/darmanitan/footprint.png b/graphics/pokemon/gen_5/darmanitan/footprint.png similarity index 100% rename from graphics/pokemon/darmanitan/footprint.png rename to graphics/pokemon/gen_5/darmanitan/footprint.png diff --git a/graphics/pokemon/darmanitan/galarian/back.png b/graphics/pokemon/gen_5/darmanitan/galarian/back.png similarity index 100% rename from graphics/pokemon/darmanitan/galarian/back.png rename to graphics/pokemon/gen_5/darmanitan/galarian/back.png diff --git a/graphics/pokemon/darmanitan/galarian/front.png b/graphics/pokemon/gen_5/darmanitan/galarian/front.png similarity index 100% rename from graphics/pokemon/darmanitan/galarian/front.png rename to graphics/pokemon/gen_5/darmanitan/galarian/front.png diff --git a/graphics/pokemon/darmanitan/galarian/icon.png b/graphics/pokemon/gen_5/darmanitan/galarian/icon.png similarity index 100% rename from graphics/pokemon/darmanitan/galarian/icon.png rename to graphics/pokemon/gen_5/darmanitan/galarian/icon.png diff --git a/graphics/pokemon/darmanitan/galarian/normal.pal b/graphics/pokemon/gen_5/darmanitan/galarian/normal.pal similarity index 100% rename from graphics/pokemon/darmanitan/galarian/normal.pal rename to graphics/pokemon/gen_5/darmanitan/galarian/normal.pal diff --git a/graphics/pokemon/darmanitan/galarian/shiny.pal b/graphics/pokemon/gen_5/darmanitan/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/darmanitan/galarian/shiny.pal rename to graphics/pokemon/gen_5/darmanitan/galarian/shiny.pal diff --git a/graphics/pokemon/darmanitan/icon.png b/graphics/pokemon/gen_5/darmanitan/icon.png similarity index 100% rename from graphics/pokemon/darmanitan/icon.png rename to graphics/pokemon/gen_5/darmanitan/icon.png diff --git a/graphics/pokemon/darmanitan/normal.pal b/graphics/pokemon/gen_5/darmanitan/normal.pal similarity index 100% rename from graphics/pokemon/darmanitan/normal.pal rename to graphics/pokemon/gen_5/darmanitan/normal.pal diff --git a/graphics/pokemon/darmanitan/shiny.pal b/graphics/pokemon/gen_5/darmanitan/shiny.pal similarity index 100% rename from graphics/pokemon/darmanitan/shiny.pal rename to graphics/pokemon/gen_5/darmanitan/shiny.pal diff --git a/graphics/pokemon/darmanitan/zen_mode/anim_front.png b/graphics/pokemon/gen_5/darmanitan/zen_mode/anim_front.png similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/anim_front.png rename to graphics/pokemon/gen_5/darmanitan/zen_mode/anim_front.png diff --git a/graphics/pokemon/darmanitan/zen_mode/back.png b/graphics/pokemon/gen_5/darmanitan/zen_mode/back.png similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/back.png rename to graphics/pokemon/gen_5/darmanitan/zen_mode/back.png diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/back.png b/graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/back.png similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/galarian/back.png rename to graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/back.png diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/front.png b/graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/front.png similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/galarian/front.png rename to graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/front.png diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/icon.png b/graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/icon.png similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/galarian/icon.png rename to graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/icon.png diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/normal.pal b/graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/normal.pal similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/galarian/normal.pal rename to graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/normal.pal diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/shiny.pal b/graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/galarian/shiny.pal rename to graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/shiny.pal diff --git a/graphics/pokemon/darmanitan/zen_mode/icon.png b/graphics/pokemon/gen_5/darmanitan/zen_mode/icon.png similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/icon.png rename to graphics/pokemon/gen_5/darmanitan/zen_mode/icon.png diff --git a/graphics/pokemon/darmanitan/zen_mode/normal.pal b/graphics/pokemon/gen_5/darmanitan/zen_mode/normal.pal similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/normal.pal rename to graphics/pokemon/gen_5/darmanitan/zen_mode/normal.pal diff --git a/graphics/pokemon/darmanitan/zen_mode/shiny.pal b/graphics/pokemon/gen_5/darmanitan/zen_mode/shiny.pal similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/shiny.pal rename to graphics/pokemon/gen_5/darmanitan/zen_mode/shiny.pal diff --git a/graphics/pokemon/darumaka/anim_front.png b/graphics/pokemon/gen_5/darumaka/anim_front.png similarity index 100% rename from graphics/pokemon/darumaka/anim_front.png rename to graphics/pokemon/gen_5/darumaka/anim_front.png diff --git a/graphics/pokemon/darumaka/back.png b/graphics/pokemon/gen_5/darumaka/back.png similarity index 100% rename from graphics/pokemon/darumaka/back.png rename to graphics/pokemon/gen_5/darumaka/back.png diff --git a/graphics/pokemon/darumaka/footprint.png b/graphics/pokemon/gen_5/darumaka/footprint.png similarity index 100% rename from graphics/pokemon/darumaka/footprint.png rename to graphics/pokemon/gen_5/darumaka/footprint.png diff --git a/graphics/pokemon/darumaka/galarian/back.png b/graphics/pokemon/gen_5/darumaka/galarian/back.png similarity index 100% rename from graphics/pokemon/darumaka/galarian/back.png rename to graphics/pokemon/gen_5/darumaka/galarian/back.png diff --git a/graphics/pokemon/darumaka/galarian/front.png b/graphics/pokemon/gen_5/darumaka/galarian/front.png similarity index 100% rename from graphics/pokemon/darumaka/galarian/front.png rename to graphics/pokemon/gen_5/darumaka/galarian/front.png diff --git a/graphics/pokemon/darumaka/galarian/icon.png b/graphics/pokemon/gen_5/darumaka/galarian/icon.png similarity index 100% rename from graphics/pokemon/darumaka/galarian/icon.png rename to graphics/pokemon/gen_5/darumaka/galarian/icon.png diff --git a/graphics/pokemon/darumaka/galarian/normal.pal b/graphics/pokemon/gen_5/darumaka/galarian/normal.pal similarity index 100% rename from graphics/pokemon/darumaka/galarian/normal.pal rename to graphics/pokemon/gen_5/darumaka/galarian/normal.pal diff --git a/graphics/pokemon/darumaka/galarian/shiny.pal b/graphics/pokemon/gen_5/darumaka/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/darumaka/galarian/shiny.pal rename to graphics/pokemon/gen_5/darumaka/galarian/shiny.pal diff --git a/graphics/pokemon/darumaka/icon.png b/graphics/pokemon/gen_5/darumaka/icon.png similarity index 100% rename from graphics/pokemon/darumaka/icon.png rename to graphics/pokemon/gen_5/darumaka/icon.png diff --git a/graphics/pokemon/darumaka/normal.pal b/graphics/pokemon/gen_5/darumaka/normal.pal similarity index 100% rename from graphics/pokemon/darumaka/normal.pal rename to graphics/pokemon/gen_5/darumaka/normal.pal diff --git a/graphics/pokemon/darumaka/shiny.pal b/graphics/pokemon/gen_5/darumaka/shiny.pal similarity index 100% rename from graphics/pokemon/darumaka/shiny.pal rename to graphics/pokemon/gen_5/darumaka/shiny.pal diff --git a/graphics/pokemon/deerling/anim_front.png b/graphics/pokemon/gen_5/deerling/anim_front.png similarity index 100% rename from graphics/pokemon/deerling/anim_front.png rename to graphics/pokemon/gen_5/deerling/anim_front.png diff --git a/graphics/pokemon/deerling/autumn/icon.png b/graphics/pokemon/gen_5/deerling/autumn/icon.png similarity index 100% rename from graphics/pokemon/deerling/autumn/icon.png rename to graphics/pokemon/gen_5/deerling/autumn/icon.png diff --git a/graphics/pokemon/deerling/autumn/normal.pal b/graphics/pokemon/gen_5/deerling/autumn/normal.pal similarity index 100% rename from graphics/pokemon/deerling/autumn/normal.pal rename to graphics/pokemon/gen_5/deerling/autumn/normal.pal diff --git a/graphics/pokemon/deerling/autumn/shiny.pal b/graphics/pokemon/gen_5/deerling/autumn/shiny.pal similarity index 100% rename from graphics/pokemon/deerling/autumn/shiny.pal rename to graphics/pokemon/gen_5/deerling/autumn/shiny.pal diff --git a/graphics/pokemon/deerling/back.png b/graphics/pokemon/gen_5/deerling/back.png similarity index 100% rename from graphics/pokemon/deerling/back.png rename to graphics/pokemon/gen_5/deerling/back.png diff --git a/graphics/pokemon/deerling/footprint.png b/graphics/pokemon/gen_5/deerling/footprint.png similarity index 100% rename from graphics/pokemon/deerling/footprint.png rename to graphics/pokemon/gen_5/deerling/footprint.png diff --git a/graphics/pokemon/deerling/icon.png b/graphics/pokemon/gen_5/deerling/icon.png similarity index 100% rename from graphics/pokemon/deerling/icon.png rename to graphics/pokemon/gen_5/deerling/icon.png diff --git a/graphics/pokemon/deerling/normal.pal b/graphics/pokemon/gen_5/deerling/normal.pal similarity index 100% rename from graphics/pokemon/deerling/normal.pal rename to graphics/pokemon/gen_5/deerling/normal.pal diff --git a/graphics/pokemon/deerling/shiny.pal b/graphics/pokemon/gen_5/deerling/shiny.pal similarity index 100% rename from graphics/pokemon/deerling/shiny.pal rename to graphics/pokemon/gen_5/deerling/shiny.pal diff --git a/graphics/pokemon/deerling/summer/icon.png b/graphics/pokemon/gen_5/deerling/summer/icon.png similarity index 100% rename from graphics/pokemon/deerling/summer/icon.png rename to graphics/pokemon/gen_5/deerling/summer/icon.png diff --git a/graphics/pokemon/deerling/summer/normal.pal b/graphics/pokemon/gen_5/deerling/summer/normal.pal similarity index 100% rename from graphics/pokemon/deerling/summer/normal.pal rename to graphics/pokemon/gen_5/deerling/summer/normal.pal diff --git a/graphics/pokemon/deerling/summer/shiny.pal b/graphics/pokemon/gen_5/deerling/summer/shiny.pal similarity index 100% rename from graphics/pokemon/deerling/summer/shiny.pal rename to graphics/pokemon/gen_5/deerling/summer/shiny.pal diff --git a/graphics/pokemon/deerling/winter/icon.png b/graphics/pokemon/gen_5/deerling/winter/icon.png similarity index 100% rename from graphics/pokemon/deerling/winter/icon.png rename to graphics/pokemon/gen_5/deerling/winter/icon.png diff --git a/graphics/pokemon/deerling/winter/normal.pal b/graphics/pokemon/gen_5/deerling/winter/normal.pal similarity index 100% rename from graphics/pokemon/deerling/winter/normal.pal rename to graphics/pokemon/gen_5/deerling/winter/normal.pal diff --git a/graphics/pokemon/deerling/winter/shiny.pal b/graphics/pokemon/gen_5/deerling/winter/shiny.pal similarity index 100% rename from graphics/pokemon/deerling/winter/shiny.pal rename to graphics/pokemon/gen_5/deerling/winter/shiny.pal diff --git a/graphics/pokemon/deino/anim_front.png b/graphics/pokemon/gen_5/deino/anim_front.png similarity index 100% rename from graphics/pokemon/deino/anim_front.png rename to graphics/pokemon/gen_5/deino/anim_front.png diff --git a/graphics/pokemon/deino/back.png b/graphics/pokemon/gen_5/deino/back.png similarity index 100% rename from graphics/pokemon/deino/back.png rename to graphics/pokemon/gen_5/deino/back.png diff --git a/graphics/pokemon/deino/footprint.png b/graphics/pokemon/gen_5/deino/footprint.png similarity index 100% rename from graphics/pokemon/deino/footprint.png rename to graphics/pokemon/gen_5/deino/footprint.png diff --git a/graphics/pokemon/deino/icon.png b/graphics/pokemon/gen_5/deino/icon.png similarity index 100% rename from graphics/pokemon/deino/icon.png rename to graphics/pokemon/gen_5/deino/icon.png diff --git a/graphics/pokemon/deino/normal.pal b/graphics/pokemon/gen_5/deino/normal.pal similarity index 100% rename from graphics/pokemon/deino/normal.pal rename to graphics/pokemon/gen_5/deino/normal.pal diff --git a/graphics/pokemon/deino/shiny.pal b/graphics/pokemon/gen_5/deino/shiny.pal similarity index 100% rename from graphics/pokemon/deino/shiny.pal rename to graphics/pokemon/gen_5/deino/shiny.pal diff --git a/graphics/pokemon/dewott/anim_front.png b/graphics/pokemon/gen_5/dewott/anim_front.png similarity index 100% rename from graphics/pokemon/dewott/anim_front.png rename to graphics/pokemon/gen_5/dewott/anim_front.png diff --git a/graphics/pokemon/dewott/back.png b/graphics/pokemon/gen_5/dewott/back.png similarity index 100% rename from graphics/pokemon/dewott/back.png rename to graphics/pokemon/gen_5/dewott/back.png diff --git a/graphics/pokemon/dewott/footprint.png b/graphics/pokemon/gen_5/dewott/footprint.png similarity index 100% rename from graphics/pokemon/dewott/footprint.png rename to graphics/pokemon/gen_5/dewott/footprint.png diff --git a/graphics/pokemon/dewott/icon.png b/graphics/pokemon/gen_5/dewott/icon.png similarity index 100% rename from graphics/pokemon/dewott/icon.png rename to graphics/pokemon/gen_5/dewott/icon.png diff --git a/graphics/pokemon/dewott/normal.pal b/graphics/pokemon/gen_5/dewott/normal.pal similarity index 100% rename from graphics/pokemon/dewott/normal.pal rename to graphics/pokemon/gen_5/dewott/normal.pal diff --git a/graphics/pokemon/dewott/shiny.pal b/graphics/pokemon/gen_5/dewott/shiny.pal similarity index 100% rename from graphics/pokemon/dewott/shiny.pal rename to graphics/pokemon/gen_5/dewott/shiny.pal diff --git a/graphics/pokemon/drilbur/anim_front.png b/graphics/pokemon/gen_5/drilbur/anim_front.png similarity index 100% rename from graphics/pokemon/drilbur/anim_front.png rename to graphics/pokemon/gen_5/drilbur/anim_front.png diff --git a/graphics/pokemon/drilbur/back.png b/graphics/pokemon/gen_5/drilbur/back.png similarity index 100% rename from graphics/pokemon/drilbur/back.png rename to graphics/pokemon/gen_5/drilbur/back.png diff --git a/graphics/pokemon/drilbur/footprint.png b/graphics/pokemon/gen_5/drilbur/footprint.png similarity index 100% rename from graphics/pokemon/drilbur/footprint.png rename to graphics/pokemon/gen_5/drilbur/footprint.png diff --git a/graphics/pokemon/drilbur/icon.png b/graphics/pokemon/gen_5/drilbur/icon.png similarity index 100% rename from graphics/pokemon/drilbur/icon.png rename to graphics/pokemon/gen_5/drilbur/icon.png diff --git a/graphics/pokemon/drilbur/normal.pal b/graphics/pokemon/gen_5/drilbur/normal.pal similarity index 100% rename from graphics/pokemon/drilbur/normal.pal rename to graphics/pokemon/gen_5/drilbur/normal.pal diff --git a/graphics/pokemon/drilbur/shiny.pal b/graphics/pokemon/gen_5/drilbur/shiny.pal similarity index 100% rename from graphics/pokemon/drilbur/shiny.pal rename to graphics/pokemon/gen_5/drilbur/shiny.pal diff --git a/graphics/pokemon/druddigon/anim_front.png b/graphics/pokemon/gen_5/druddigon/anim_front.png similarity index 100% rename from graphics/pokemon/druddigon/anim_front.png rename to graphics/pokemon/gen_5/druddigon/anim_front.png diff --git a/graphics/pokemon/druddigon/back.png b/graphics/pokemon/gen_5/druddigon/back.png similarity index 100% rename from graphics/pokemon/druddigon/back.png rename to graphics/pokemon/gen_5/druddigon/back.png diff --git a/graphics/pokemon/druddigon/footprint.png b/graphics/pokemon/gen_5/druddigon/footprint.png similarity index 100% rename from graphics/pokemon/druddigon/footprint.png rename to graphics/pokemon/gen_5/druddigon/footprint.png diff --git a/graphics/pokemon/druddigon/icon.png b/graphics/pokemon/gen_5/druddigon/icon.png similarity index 100% rename from graphics/pokemon/druddigon/icon.png rename to graphics/pokemon/gen_5/druddigon/icon.png diff --git a/graphics/pokemon/druddigon/normal.pal b/graphics/pokemon/gen_5/druddigon/normal.pal similarity index 100% rename from graphics/pokemon/druddigon/normal.pal rename to graphics/pokemon/gen_5/druddigon/normal.pal diff --git a/graphics/pokemon/druddigon/shiny.pal b/graphics/pokemon/gen_5/druddigon/shiny.pal similarity index 100% rename from graphics/pokemon/druddigon/shiny.pal rename to graphics/pokemon/gen_5/druddigon/shiny.pal diff --git a/graphics/pokemon/ducklett/anim_front.png b/graphics/pokemon/gen_5/ducklett/anim_front.png similarity index 100% rename from graphics/pokemon/ducklett/anim_front.png rename to graphics/pokemon/gen_5/ducklett/anim_front.png diff --git a/graphics/pokemon/ducklett/back.png b/graphics/pokemon/gen_5/ducklett/back.png similarity index 100% rename from graphics/pokemon/ducklett/back.png rename to graphics/pokemon/gen_5/ducklett/back.png diff --git a/graphics/pokemon/ducklett/footprint.png b/graphics/pokemon/gen_5/ducklett/footprint.png similarity index 100% rename from graphics/pokemon/ducklett/footprint.png rename to graphics/pokemon/gen_5/ducklett/footprint.png diff --git a/graphics/pokemon/ducklett/icon.png b/graphics/pokemon/gen_5/ducklett/icon.png similarity index 100% rename from graphics/pokemon/ducklett/icon.png rename to graphics/pokemon/gen_5/ducklett/icon.png diff --git a/graphics/pokemon/ducklett/normal.pal b/graphics/pokemon/gen_5/ducklett/normal.pal similarity index 100% rename from graphics/pokemon/ducklett/normal.pal rename to graphics/pokemon/gen_5/ducklett/normal.pal diff --git a/graphics/pokemon/ducklett/shiny.pal b/graphics/pokemon/gen_5/ducklett/shiny.pal similarity index 100% rename from graphics/pokemon/ducklett/shiny.pal rename to graphics/pokemon/gen_5/ducklett/shiny.pal diff --git a/graphics/pokemon/duosion/anim_front.png b/graphics/pokemon/gen_5/duosion/anim_front.png similarity index 100% rename from graphics/pokemon/duosion/anim_front.png rename to graphics/pokemon/gen_5/duosion/anim_front.png diff --git a/graphics/pokemon/duosion/back.png b/graphics/pokemon/gen_5/duosion/back.png similarity index 100% rename from graphics/pokemon/duosion/back.png rename to graphics/pokemon/gen_5/duosion/back.png diff --git a/graphics/pokemon/manaphy/footprint.png b/graphics/pokemon/gen_5/duosion/footprint.png similarity index 100% rename from graphics/pokemon/manaphy/footprint.png rename to graphics/pokemon/gen_5/duosion/footprint.png diff --git a/graphics/pokemon/duosion/icon.png b/graphics/pokemon/gen_5/duosion/icon.png similarity index 100% rename from graphics/pokemon/duosion/icon.png rename to graphics/pokemon/gen_5/duosion/icon.png diff --git a/graphics/pokemon/duosion/normal.pal b/graphics/pokemon/gen_5/duosion/normal.pal similarity index 100% rename from graphics/pokemon/duosion/normal.pal rename to graphics/pokemon/gen_5/duosion/normal.pal diff --git a/graphics/pokemon/duosion/shiny.pal b/graphics/pokemon/gen_5/duosion/shiny.pal similarity index 100% rename from graphics/pokemon/duosion/shiny.pal rename to graphics/pokemon/gen_5/duosion/shiny.pal diff --git a/graphics/pokemon/durant/anim_front.png b/graphics/pokemon/gen_5/durant/anim_front.png similarity index 100% rename from graphics/pokemon/durant/anim_front.png rename to graphics/pokemon/gen_5/durant/anim_front.png diff --git a/graphics/pokemon/durant/back.png b/graphics/pokemon/gen_5/durant/back.png similarity index 100% rename from graphics/pokemon/durant/back.png rename to graphics/pokemon/gen_5/durant/back.png diff --git a/graphics/pokemon/leavanny/footprint.png b/graphics/pokemon/gen_5/durant/footprint.png similarity index 100% rename from graphics/pokemon/leavanny/footprint.png rename to graphics/pokemon/gen_5/durant/footprint.png diff --git a/graphics/pokemon/durant/icon.png b/graphics/pokemon/gen_5/durant/icon.png similarity index 100% rename from graphics/pokemon/durant/icon.png rename to graphics/pokemon/gen_5/durant/icon.png diff --git a/graphics/pokemon/durant/normal.pal b/graphics/pokemon/gen_5/durant/normal.pal similarity index 100% rename from graphics/pokemon/durant/normal.pal rename to graphics/pokemon/gen_5/durant/normal.pal diff --git a/graphics/pokemon/durant/shiny.pal b/graphics/pokemon/gen_5/durant/shiny.pal similarity index 100% rename from graphics/pokemon/durant/shiny.pal rename to graphics/pokemon/gen_5/durant/shiny.pal diff --git a/graphics/pokemon/dwebble/anim_front.png b/graphics/pokemon/gen_5/dwebble/anim_front.png similarity index 100% rename from graphics/pokemon/dwebble/anim_front.png rename to graphics/pokemon/gen_5/dwebble/anim_front.png diff --git a/graphics/pokemon/dwebble/back.png b/graphics/pokemon/gen_5/dwebble/back.png similarity index 100% rename from graphics/pokemon/dwebble/back.png rename to graphics/pokemon/gen_5/dwebble/back.png diff --git a/graphics/pokemon/meowstic/footprint.png b/graphics/pokemon/gen_5/dwebble/footprint.png similarity index 100% rename from graphics/pokemon/meowstic/footprint.png rename to graphics/pokemon/gen_5/dwebble/footprint.png diff --git a/graphics/pokemon/dwebble/icon.png b/graphics/pokemon/gen_5/dwebble/icon.png similarity index 100% rename from graphics/pokemon/dwebble/icon.png rename to graphics/pokemon/gen_5/dwebble/icon.png diff --git a/graphics/pokemon/dwebble/normal.pal b/graphics/pokemon/gen_5/dwebble/normal.pal similarity index 100% rename from graphics/pokemon/dwebble/normal.pal rename to graphics/pokemon/gen_5/dwebble/normal.pal diff --git a/graphics/pokemon/dwebble/shiny.pal b/graphics/pokemon/gen_5/dwebble/shiny.pal similarity index 100% rename from graphics/pokemon/dwebble/shiny.pal rename to graphics/pokemon/gen_5/dwebble/shiny.pal diff --git a/graphics/pokemon/eelektrik/anim_front.png b/graphics/pokemon/gen_5/eelektrik/anim_front.png similarity index 100% rename from graphics/pokemon/eelektrik/anim_front.png rename to graphics/pokemon/gen_5/eelektrik/anim_front.png diff --git a/graphics/pokemon/eelektrik/back.png b/graphics/pokemon/gen_5/eelektrik/back.png similarity index 100% rename from graphics/pokemon/eelektrik/back.png rename to graphics/pokemon/gen_5/eelektrik/back.png diff --git a/graphics/pokemon/mantine/footprint.png b/graphics/pokemon/gen_5/eelektrik/footprint.png similarity index 100% rename from graphics/pokemon/mantine/footprint.png rename to graphics/pokemon/gen_5/eelektrik/footprint.png diff --git a/graphics/pokemon/eelektrik/icon.png b/graphics/pokemon/gen_5/eelektrik/icon.png similarity index 100% rename from graphics/pokemon/eelektrik/icon.png rename to graphics/pokemon/gen_5/eelektrik/icon.png diff --git a/graphics/pokemon/eelektrik/normal.pal b/graphics/pokemon/gen_5/eelektrik/normal.pal similarity index 100% rename from graphics/pokemon/eelektrik/normal.pal rename to graphics/pokemon/gen_5/eelektrik/normal.pal diff --git a/graphics/pokemon/eelektrik/shiny.pal b/graphics/pokemon/gen_5/eelektrik/shiny.pal similarity index 100% rename from graphics/pokemon/eelektrik/shiny.pal rename to graphics/pokemon/gen_5/eelektrik/shiny.pal diff --git a/graphics/pokemon/eelektross/anim_front.png b/graphics/pokemon/gen_5/eelektross/anim_front.png similarity index 100% rename from graphics/pokemon/eelektross/anim_front.png rename to graphics/pokemon/gen_5/eelektross/anim_front.png diff --git a/graphics/pokemon/eelektross/back.png b/graphics/pokemon/gen_5/eelektross/back.png similarity index 100% rename from graphics/pokemon/eelektross/back.png rename to graphics/pokemon/gen_5/eelektross/back.png diff --git a/graphics/pokemon/mantyke/footprint.png b/graphics/pokemon/gen_5/eelektross/footprint.png similarity index 100% rename from graphics/pokemon/mantyke/footprint.png rename to graphics/pokemon/gen_5/eelektross/footprint.png diff --git a/graphics/pokemon/eelektross/icon.png b/graphics/pokemon/gen_5/eelektross/icon.png similarity index 100% rename from graphics/pokemon/eelektross/icon.png rename to graphics/pokemon/gen_5/eelektross/icon.png diff --git a/graphics/pokemon/eelektross/normal.pal b/graphics/pokemon/gen_5/eelektross/normal.pal similarity index 100% rename from graphics/pokemon/eelektross/normal.pal rename to graphics/pokemon/gen_5/eelektross/normal.pal diff --git a/graphics/pokemon/eelektross/shiny.pal b/graphics/pokemon/gen_5/eelektross/shiny.pal similarity index 100% rename from graphics/pokemon/eelektross/shiny.pal rename to graphics/pokemon/gen_5/eelektross/shiny.pal diff --git a/graphics/pokemon/elgyem/anim_front.png b/graphics/pokemon/gen_5/elgyem/anim_front.png similarity index 100% rename from graphics/pokemon/elgyem/anim_front.png rename to graphics/pokemon/gen_5/elgyem/anim_front.png diff --git a/graphics/pokemon/elgyem/back.png b/graphics/pokemon/gen_5/elgyem/back.png similarity index 100% rename from graphics/pokemon/elgyem/back.png rename to graphics/pokemon/gen_5/elgyem/back.png diff --git a/graphics/pokemon/bunnelby/footprint.png b/graphics/pokemon/gen_5/elgyem/footprint.png similarity index 100% rename from graphics/pokemon/bunnelby/footprint.png rename to graphics/pokemon/gen_5/elgyem/footprint.png diff --git a/graphics/pokemon/elgyem/icon.png b/graphics/pokemon/gen_5/elgyem/icon.png similarity index 100% rename from graphics/pokemon/elgyem/icon.png rename to graphics/pokemon/gen_5/elgyem/icon.png diff --git a/graphics/pokemon/elgyem/normal.pal b/graphics/pokemon/gen_5/elgyem/normal.pal similarity index 100% rename from graphics/pokemon/elgyem/normal.pal rename to graphics/pokemon/gen_5/elgyem/normal.pal diff --git a/graphics/pokemon/elgyem/shiny.pal b/graphics/pokemon/gen_5/elgyem/shiny.pal similarity index 100% rename from graphics/pokemon/elgyem/shiny.pal rename to graphics/pokemon/gen_5/elgyem/shiny.pal diff --git a/graphics/pokemon/emboar/anim_front.png b/graphics/pokemon/gen_5/emboar/anim_front.png similarity index 100% rename from graphics/pokemon/emboar/anim_front.png rename to graphics/pokemon/gen_5/emboar/anim_front.png diff --git a/graphics/pokemon/emboar/back.png b/graphics/pokemon/gen_5/emboar/back.png similarity index 100% rename from graphics/pokemon/emboar/back.png rename to graphics/pokemon/gen_5/emboar/back.png diff --git a/graphics/pokemon/emboar/footprint.png b/graphics/pokemon/gen_5/emboar/footprint.png similarity index 100% rename from graphics/pokemon/emboar/footprint.png rename to graphics/pokemon/gen_5/emboar/footprint.png diff --git a/graphics/pokemon/emboar/icon.png b/graphics/pokemon/gen_5/emboar/icon.png similarity index 100% rename from graphics/pokemon/emboar/icon.png rename to graphics/pokemon/gen_5/emboar/icon.png diff --git a/graphics/pokemon/emboar/normal.pal b/graphics/pokemon/gen_5/emboar/normal.pal similarity index 100% rename from graphics/pokemon/emboar/normal.pal rename to graphics/pokemon/gen_5/emboar/normal.pal diff --git a/graphics/pokemon/emboar/shiny.pal b/graphics/pokemon/gen_5/emboar/shiny.pal similarity index 100% rename from graphics/pokemon/emboar/shiny.pal rename to graphics/pokemon/gen_5/emboar/shiny.pal diff --git a/graphics/pokemon/emolga/anim_front.png b/graphics/pokemon/gen_5/emolga/anim_front.png similarity index 100% rename from graphics/pokemon/emolga/anim_front.png rename to graphics/pokemon/gen_5/emolga/anim_front.png diff --git a/graphics/pokemon/emolga/back.png b/graphics/pokemon/gen_5/emolga/back.png similarity index 100% rename from graphics/pokemon/emolga/back.png rename to graphics/pokemon/gen_5/emolga/back.png diff --git a/graphics/pokemon/emolga/footprint.png b/graphics/pokemon/gen_5/emolga/footprint.png similarity index 100% rename from graphics/pokemon/emolga/footprint.png rename to graphics/pokemon/gen_5/emolga/footprint.png diff --git a/graphics/pokemon/emolga/icon.png b/graphics/pokemon/gen_5/emolga/icon.png similarity index 100% rename from graphics/pokemon/emolga/icon.png rename to graphics/pokemon/gen_5/emolga/icon.png diff --git a/graphics/pokemon/emolga/normal.pal b/graphics/pokemon/gen_5/emolga/normal.pal similarity index 100% rename from graphics/pokemon/emolga/normal.pal rename to graphics/pokemon/gen_5/emolga/normal.pal diff --git a/graphics/pokemon/emolga/shiny.pal b/graphics/pokemon/gen_5/emolga/shiny.pal similarity index 100% rename from graphics/pokemon/emolga/shiny.pal rename to graphics/pokemon/gen_5/emolga/shiny.pal diff --git a/graphics/pokemon/escavalier/anim_front.png b/graphics/pokemon/gen_5/escavalier/anim_front.png similarity index 100% rename from graphics/pokemon/escavalier/anim_front.png rename to graphics/pokemon/gen_5/escavalier/anim_front.png diff --git a/graphics/pokemon/escavalier/back.png b/graphics/pokemon/gen_5/escavalier/back.png similarity index 100% rename from graphics/pokemon/escavalier/back.png rename to graphics/pokemon/gen_5/escavalier/back.png diff --git a/graphics/pokemon/mareanie/footprint.png b/graphics/pokemon/gen_5/escavalier/footprint.png similarity index 100% rename from graphics/pokemon/mareanie/footprint.png rename to graphics/pokemon/gen_5/escavalier/footprint.png diff --git a/graphics/pokemon/escavalier/icon.png b/graphics/pokemon/gen_5/escavalier/icon.png similarity index 100% rename from graphics/pokemon/escavalier/icon.png rename to graphics/pokemon/gen_5/escavalier/icon.png diff --git a/graphics/pokemon/escavalier/normal.pal b/graphics/pokemon/gen_5/escavalier/normal.pal similarity index 100% rename from graphics/pokemon/escavalier/normal.pal rename to graphics/pokemon/gen_5/escavalier/normal.pal diff --git a/graphics/pokemon/escavalier/shiny.pal b/graphics/pokemon/gen_5/escavalier/shiny.pal similarity index 100% rename from graphics/pokemon/escavalier/shiny.pal rename to graphics/pokemon/gen_5/escavalier/shiny.pal diff --git a/graphics/pokemon/excadrill/anim_front.png b/graphics/pokemon/gen_5/excadrill/anim_front.png similarity index 100% rename from graphics/pokemon/excadrill/anim_front.png rename to graphics/pokemon/gen_5/excadrill/anim_front.png diff --git a/graphics/pokemon/excadrill/back.png b/graphics/pokemon/gen_5/excadrill/back.png similarity index 100% rename from graphics/pokemon/excadrill/back.png rename to graphics/pokemon/gen_5/excadrill/back.png diff --git a/graphics/pokemon/excadrill/footprint.png b/graphics/pokemon/gen_5/excadrill/footprint.png similarity index 100% rename from graphics/pokemon/excadrill/footprint.png rename to graphics/pokemon/gen_5/excadrill/footprint.png diff --git a/graphics/pokemon/excadrill/icon.png b/graphics/pokemon/gen_5/excadrill/icon.png similarity index 100% rename from graphics/pokemon/excadrill/icon.png rename to graphics/pokemon/gen_5/excadrill/icon.png diff --git a/graphics/pokemon/excadrill/normal.pal b/graphics/pokemon/gen_5/excadrill/normal.pal similarity index 100% rename from graphics/pokemon/excadrill/normal.pal rename to graphics/pokemon/gen_5/excadrill/normal.pal diff --git a/graphics/pokemon/excadrill/shiny.pal b/graphics/pokemon/gen_5/excadrill/shiny.pal similarity index 100% rename from graphics/pokemon/excadrill/shiny.pal rename to graphics/pokemon/gen_5/excadrill/shiny.pal diff --git a/graphics/pokemon/ferroseed/anim_front.png b/graphics/pokemon/gen_5/ferroseed/anim_front.png similarity index 100% rename from graphics/pokemon/ferroseed/anim_front.png rename to graphics/pokemon/gen_5/ferroseed/anim_front.png diff --git a/graphics/pokemon/ferroseed/back.png b/graphics/pokemon/gen_5/ferroseed/back.png similarity index 100% rename from graphics/pokemon/ferroseed/back.png rename to graphics/pokemon/gen_5/ferroseed/back.png diff --git a/graphics/pokemon/masquerain/footprint.png b/graphics/pokemon/gen_5/ferroseed/footprint.png similarity index 100% rename from graphics/pokemon/masquerain/footprint.png rename to graphics/pokemon/gen_5/ferroseed/footprint.png diff --git a/graphics/pokemon/ferroseed/icon.png b/graphics/pokemon/gen_5/ferroseed/icon.png similarity index 100% rename from graphics/pokemon/ferroseed/icon.png rename to graphics/pokemon/gen_5/ferroseed/icon.png diff --git a/graphics/pokemon/ferroseed/normal.pal b/graphics/pokemon/gen_5/ferroseed/normal.pal similarity index 100% rename from graphics/pokemon/ferroseed/normal.pal rename to graphics/pokemon/gen_5/ferroseed/normal.pal diff --git a/graphics/pokemon/ferroseed/shiny.pal b/graphics/pokemon/gen_5/ferroseed/shiny.pal similarity index 100% rename from graphics/pokemon/ferroseed/shiny.pal rename to graphics/pokemon/gen_5/ferroseed/shiny.pal diff --git a/graphics/pokemon/ferrothorn/anim_front.png b/graphics/pokemon/gen_5/ferrothorn/anim_front.png similarity index 100% rename from graphics/pokemon/ferrothorn/anim_front.png rename to graphics/pokemon/gen_5/ferrothorn/anim_front.png diff --git a/graphics/pokemon/ferrothorn/back.png b/graphics/pokemon/gen_5/ferrothorn/back.png similarity index 100% rename from graphics/pokemon/ferrothorn/back.png rename to graphics/pokemon/gen_5/ferrothorn/back.png diff --git a/graphics/pokemon/ferrothorn/footprint.png b/graphics/pokemon/gen_5/ferrothorn/footprint.png similarity index 100% rename from graphics/pokemon/ferrothorn/footprint.png rename to graphics/pokemon/gen_5/ferrothorn/footprint.png diff --git a/graphics/pokemon/ferrothorn/icon.png b/graphics/pokemon/gen_5/ferrothorn/icon.png similarity index 100% rename from graphics/pokemon/ferrothorn/icon.png rename to graphics/pokemon/gen_5/ferrothorn/icon.png diff --git a/graphics/pokemon/ferrothorn/normal.pal b/graphics/pokemon/gen_5/ferrothorn/normal.pal similarity index 100% rename from graphics/pokemon/ferrothorn/normal.pal rename to graphics/pokemon/gen_5/ferrothorn/normal.pal diff --git a/graphics/pokemon/ferrothorn/shiny.pal b/graphics/pokemon/gen_5/ferrothorn/shiny.pal similarity index 100% rename from graphics/pokemon/ferrothorn/shiny.pal rename to graphics/pokemon/gen_5/ferrothorn/shiny.pal diff --git a/graphics/pokemon/foongus/anim_front.png b/graphics/pokemon/gen_5/foongus/anim_front.png similarity index 100% rename from graphics/pokemon/foongus/anim_front.png rename to graphics/pokemon/gen_5/foongus/anim_front.png diff --git a/graphics/pokemon/foongus/back.png b/graphics/pokemon/gen_5/foongus/back.png similarity index 100% rename from graphics/pokemon/foongus/back.png rename to graphics/pokemon/gen_5/foongus/back.png diff --git a/graphics/pokemon/meltan/footprint.png b/graphics/pokemon/gen_5/foongus/footprint.png similarity index 100% rename from graphics/pokemon/meltan/footprint.png rename to graphics/pokemon/gen_5/foongus/footprint.png diff --git a/graphics/pokemon/foongus/icon.png b/graphics/pokemon/gen_5/foongus/icon.png similarity index 100% rename from graphics/pokemon/foongus/icon.png rename to graphics/pokemon/gen_5/foongus/icon.png diff --git a/graphics/pokemon/foongus/normal.pal b/graphics/pokemon/gen_5/foongus/normal.pal similarity index 100% rename from graphics/pokemon/foongus/normal.pal rename to graphics/pokemon/gen_5/foongus/normal.pal diff --git a/graphics/pokemon/foongus/shiny.pal b/graphics/pokemon/gen_5/foongus/shiny.pal similarity index 100% rename from graphics/pokemon/foongus/shiny.pal rename to graphics/pokemon/gen_5/foongus/shiny.pal diff --git a/graphics/pokemon/fraxure/anim_front.png b/graphics/pokemon/gen_5/fraxure/anim_front.png similarity index 100% rename from graphics/pokemon/fraxure/anim_front.png rename to graphics/pokemon/gen_5/fraxure/anim_front.png diff --git a/graphics/pokemon/fraxure/back.png b/graphics/pokemon/gen_5/fraxure/back.png similarity index 100% rename from graphics/pokemon/fraxure/back.png rename to graphics/pokemon/gen_5/fraxure/back.png diff --git a/graphics/pokemon/fraxure/footprint.png b/graphics/pokemon/gen_5/fraxure/footprint.png similarity index 100% rename from graphics/pokemon/fraxure/footprint.png rename to graphics/pokemon/gen_5/fraxure/footprint.png diff --git a/graphics/pokemon/fraxure/icon.png b/graphics/pokemon/gen_5/fraxure/icon.png similarity index 100% rename from graphics/pokemon/fraxure/icon.png rename to graphics/pokemon/gen_5/fraxure/icon.png diff --git a/graphics/pokemon/fraxure/normal.pal b/graphics/pokemon/gen_5/fraxure/normal.pal similarity index 100% rename from graphics/pokemon/fraxure/normal.pal rename to graphics/pokemon/gen_5/fraxure/normal.pal diff --git a/graphics/pokemon/fraxure/shiny.pal b/graphics/pokemon/gen_5/fraxure/shiny.pal similarity index 100% rename from graphics/pokemon/fraxure/shiny.pal rename to graphics/pokemon/gen_5/fraxure/shiny.pal diff --git a/graphics/pokemon/frillish/anim_front.png b/graphics/pokemon/gen_5/frillish/anim_front.png similarity index 100% rename from graphics/pokemon/frillish/anim_front.png rename to graphics/pokemon/gen_5/frillish/anim_front.png diff --git a/graphics/pokemon/frillish/anim_frontf.png b/graphics/pokemon/gen_5/frillish/anim_frontf.png similarity index 100% rename from graphics/pokemon/frillish/anim_frontf.png rename to graphics/pokemon/gen_5/frillish/anim_frontf.png diff --git a/graphics/pokemon/frillish/back.png b/graphics/pokemon/gen_5/frillish/back.png similarity index 100% rename from graphics/pokemon/frillish/back.png rename to graphics/pokemon/gen_5/frillish/back.png diff --git a/graphics/pokemon/frillish/backf.png b/graphics/pokemon/gen_5/frillish/backf.png similarity index 100% rename from graphics/pokemon/frillish/backf.png rename to graphics/pokemon/gen_5/frillish/backf.png diff --git a/graphics/pokemon/metapod/footprint.png b/graphics/pokemon/gen_5/frillish/footprint.png similarity index 100% rename from graphics/pokemon/metapod/footprint.png rename to graphics/pokemon/gen_5/frillish/footprint.png diff --git a/graphics/pokemon/frillish/frontf.png b/graphics/pokemon/gen_5/frillish/frontf.png similarity index 100% rename from graphics/pokemon/frillish/frontf.png rename to graphics/pokemon/gen_5/frillish/frontf.png diff --git a/graphics/pokemon/frillish/icon.png b/graphics/pokemon/gen_5/frillish/icon.png similarity index 100% rename from graphics/pokemon/frillish/icon.png rename to graphics/pokemon/gen_5/frillish/icon.png diff --git a/graphics/pokemon/frillish/iconf.png b/graphics/pokemon/gen_5/frillish/iconf.png similarity index 100% rename from graphics/pokemon/frillish/iconf.png rename to graphics/pokemon/gen_5/frillish/iconf.png diff --git a/graphics/pokemon/frillish/normal.pal b/graphics/pokemon/gen_5/frillish/normal.pal similarity index 100% rename from graphics/pokemon/frillish/normal.pal rename to graphics/pokemon/gen_5/frillish/normal.pal diff --git a/graphics/pokemon/frillish/normalf.pal b/graphics/pokemon/gen_5/frillish/normalf.pal similarity index 100% rename from graphics/pokemon/frillish/normalf.pal rename to graphics/pokemon/gen_5/frillish/normalf.pal diff --git a/graphics/pokemon/frillish/shiny.pal b/graphics/pokemon/gen_5/frillish/shiny.pal similarity index 100% rename from graphics/pokemon/frillish/shiny.pal rename to graphics/pokemon/gen_5/frillish/shiny.pal diff --git a/graphics/pokemon/frillish/shinyf.pal b/graphics/pokemon/gen_5/frillish/shinyf.pal similarity index 100% rename from graphics/pokemon/frillish/shinyf.pal rename to graphics/pokemon/gen_5/frillish/shinyf.pal diff --git a/graphics/pokemon/galvantula/anim_front.png b/graphics/pokemon/gen_5/galvantula/anim_front.png similarity index 100% rename from graphics/pokemon/galvantula/anim_front.png rename to graphics/pokemon/gen_5/galvantula/anim_front.png diff --git a/graphics/pokemon/galvantula/back.png b/graphics/pokemon/gen_5/galvantula/back.png similarity index 100% rename from graphics/pokemon/galvantula/back.png rename to graphics/pokemon/gen_5/galvantula/back.png diff --git a/graphics/pokemon/galvantula/footprint.png b/graphics/pokemon/gen_5/galvantula/footprint.png similarity index 100% rename from graphics/pokemon/galvantula/footprint.png rename to graphics/pokemon/gen_5/galvantula/footprint.png diff --git a/graphics/pokemon/galvantula/icon.png b/graphics/pokemon/gen_5/galvantula/icon.png similarity index 100% rename from graphics/pokemon/galvantula/icon.png rename to graphics/pokemon/gen_5/galvantula/icon.png diff --git a/graphics/pokemon/galvantula/normal.pal b/graphics/pokemon/gen_5/galvantula/normal.pal similarity index 100% rename from graphics/pokemon/galvantula/normal.pal rename to graphics/pokemon/gen_5/galvantula/normal.pal diff --git a/graphics/pokemon/galvantula/shiny.pal b/graphics/pokemon/gen_5/galvantula/shiny.pal similarity index 100% rename from graphics/pokemon/galvantula/shiny.pal rename to graphics/pokemon/gen_5/galvantula/shiny.pal diff --git a/graphics/pokemon/garbodor/anim_front.png b/graphics/pokemon/gen_5/garbodor/anim_front.png similarity index 100% rename from graphics/pokemon/garbodor/anim_front.png rename to graphics/pokemon/gen_5/garbodor/anim_front.png diff --git a/graphics/pokemon/garbodor/back.png b/graphics/pokemon/gen_5/garbodor/back.png similarity index 100% rename from graphics/pokemon/garbodor/back.png rename to graphics/pokemon/gen_5/garbodor/back.png diff --git a/graphics/pokemon/garbodor/footprint.png b/graphics/pokemon/gen_5/garbodor/footprint.png similarity index 100% rename from graphics/pokemon/garbodor/footprint.png rename to graphics/pokemon/gen_5/garbodor/footprint.png diff --git a/graphics/pokemon/garbodor/gigantamax/back.png b/graphics/pokemon/gen_5/garbodor/gigantamax/back.png similarity index 100% rename from graphics/pokemon/garbodor/gigantamax/back.png rename to graphics/pokemon/gen_5/garbodor/gigantamax/back.png diff --git a/graphics/pokemon/garbodor/gigantamax/front.png b/graphics/pokemon/gen_5/garbodor/gigantamax/front.png similarity index 100% rename from graphics/pokemon/garbodor/gigantamax/front.png rename to graphics/pokemon/gen_5/garbodor/gigantamax/front.png diff --git a/graphics/pokemon/garbodor/gigantamax/icon.png b/graphics/pokemon/gen_5/garbodor/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/garbodor/gigantamax/icon.png rename to graphics/pokemon/gen_5/garbodor/gigantamax/icon.png diff --git a/graphics/pokemon/garbodor/gigantamax/normal.pal b/graphics/pokemon/gen_5/garbodor/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/garbodor/gigantamax/normal.pal rename to graphics/pokemon/gen_5/garbodor/gigantamax/normal.pal diff --git a/graphics/pokemon/garbodor/gigantamax/shiny.pal b/graphics/pokemon/gen_5/garbodor/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/garbodor/gigantamax/shiny.pal rename to graphics/pokemon/gen_5/garbodor/gigantamax/shiny.pal diff --git a/graphics/pokemon/garbodor/icon.png b/graphics/pokemon/gen_5/garbodor/icon.png similarity index 100% rename from graphics/pokemon/garbodor/icon.png rename to graphics/pokemon/gen_5/garbodor/icon.png diff --git a/graphics/pokemon/garbodor/normal.pal b/graphics/pokemon/gen_5/garbodor/normal.pal similarity index 100% rename from graphics/pokemon/garbodor/normal.pal rename to graphics/pokemon/gen_5/garbodor/normal.pal diff --git a/graphics/pokemon/garbodor/shiny.pal b/graphics/pokemon/gen_5/garbodor/shiny.pal similarity index 100% rename from graphics/pokemon/garbodor/shiny.pal rename to graphics/pokemon/gen_5/garbodor/shiny.pal diff --git a/graphics/pokemon/genesect/anim_front.png b/graphics/pokemon/gen_5/genesect/anim_front.png similarity index 100% rename from graphics/pokemon/genesect/anim_front.png rename to graphics/pokemon/gen_5/genesect/anim_front.png diff --git a/graphics/pokemon/genesect/back.png b/graphics/pokemon/gen_5/genesect/back.png similarity index 100% rename from graphics/pokemon/genesect/back.png rename to graphics/pokemon/gen_5/genesect/back.png diff --git a/graphics/pokemon/genesect/burn_drive/normal.pal b/graphics/pokemon/gen_5/genesect/burn_drive/normal.pal similarity index 100% rename from graphics/pokemon/genesect/burn_drive/normal.pal rename to graphics/pokemon/gen_5/genesect/burn_drive/normal.pal diff --git a/graphics/pokemon/genesect/burn_drive/shiny.pal b/graphics/pokemon/gen_5/genesect/burn_drive/shiny.pal similarity index 100% rename from graphics/pokemon/genesect/burn_drive/shiny.pal rename to graphics/pokemon/gen_5/genesect/burn_drive/shiny.pal diff --git a/graphics/pokemon/genesect/chill_drive/normal.pal b/graphics/pokemon/gen_5/genesect/chill_drive/normal.pal similarity index 100% rename from graphics/pokemon/genesect/chill_drive/normal.pal rename to graphics/pokemon/gen_5/genesect/chill_drive/normal.pal diff --git a/graphics/pokemon/genesect/chill_drive/shiny.pal b/graphics/pokemon/gen_5/genesect/chill_drive/shiny.pal similarity index 100% rename from graphics/pokemon/genesect/chill_drive/shiny.pal rename to graphics/pokemon/gen_5/genesect/chill_drive/shiny.pal diff --git a/graphics/pokemon/genesect/douse_drive/normal.pal b/graphics/pokemon/gen_5/genesect/douse_drive/normal.pal similarity index 100% rename from graphics/pokemon/genesect/douse_drive/normal.pal rename to graphics/pokemon/gen_5/genesect/douse_drive/normal.pal diff --git a/graphics/pokemon/genesect/douse_drive/shiny.pal b/graphics/pokemon/gen_5/genesect/douse_drive/shiny.pal similarity index 100% rename from graphics/pokemon/genesect/douse_drive/shiny.pal rename to graphics/pokemon/gen_5/genesect/douse_drive/shiny.pal diff --git a/graphics/pokemon/genesect/footprint.png b/graphics/pokemon/gen_5/genesect/footprint.png similarity index 100% rename from graphics/pokemon/genesect/footprint.png rename to graphics/pokemon/gen_5/genesect/footprint.png diff --git a/graphics/pokemon/genesect/icon.png b/graphics/pokemon/gen_5/genesect/icon.png similarity index 100% rename from graphics/pokemon/genesect/icon.png rename to graphics/pokemon/gen_5/genesect/icon.png diff --git a/graphics/pokemon/genesect/normal.pal b/graphics/pokemon/gen_5/genesect/normal.pal similarity index 100% rename from graphics/pokemon/genesect/normal.pal rename to graphics/pokemon/gen_5/genesect/normal.pal diff --git a/graphics/pokemon/genesect/shiny.pal b/graphics/pokemon/gen_5/genesect/shiny.pal similarity index 100% rename from graphics/pokemon/genesect/shiny.pal rename to graphics/pokemon/gen_5/genesect/shiny.pal diff --git a/graphics/pokemon/genesect/shock_drive/normal.pal b/graphics/pokemon/gen_5/genesect/shock_drive/normal.pal similarity index 100% rename from graphics/pokemon/genesect/shock_drive/normal.pal rename to graphics/pokemon/gen_5/genesect/shock_drive/normal.pal diff --git a/graphics/pokemon/genesect/shock_drive/shiny.pal b/graphics/pokemon/gen_5/genesect/shock_drive/shiny.pal similarity index 100% rename from graphics/pokemon/genesect/shock_drive/shiny.pal rename to graphics/pokemon/gen_5/genesect/shock_drive/shiny.pal diff --git a/graphics/pokemon/gigalith/anim_front.png b/graphics/pokemon/gen_5/gigalith/anim_front.png similarity index 100% rename from graphics/pokemon/gigalith/anim_front.png rename to graphics/pokemon/gen_5/gigalith/anim_front.png diff --git a/graphics/pokemon/gigalith/back.png b/graphics/pokemon/gen_5/gigalith/back.png similarity index 100% rename from graphics/pokemon/gigalith/back.png rename to graphics/pokemon/gen_5/gigalith/back.png diff --git a/graphics/pokemon/gigalith/footprint.png b/graphics/pokemon/gen_5/gigalith/footprint.png similarity index 100% rename from graphics/pokemon/gigalith/footprint.png rename to graphics/pokemon/gen_5/gigalith/footprint.png diff --git a/graphics/pokemon/gigalith/icon.png b/graphics/pokemon/gen_5/gigalith/icon.png similarity index 100% rename from graphics/pokemon/gigalith/icon.png rename to graphics/pokemon/gen_5/gigalith/icon.png diff --git a/graphics/pokemon/gigalith/normal.pal b/graphics/pokemon/gen_5/gigalith/normal.pal similarity index 100% rename from graphics/pokemon/gigalith/normal.pal rename to graphics/pokemon/gen_5/gigalith/normal.pal diff --git a/graphics/pokemon/gigalith/shiny.pal b/graphics/pokemon/gen_5/gigalith/shiny.pal similarity index 100% rename from graphics/pokemon/gigalith/shiny.pal rename to graphics/pokemon/gen_5/gigalith/shiny.pal diff --git a/graphics/pokemon/golett/anim_front.png b/graphics/pokemon/gen_5/golett/anim_front.png similarity index 100% rename from graphics/pokemon/golett/anim_front.png rename to graphics/pokemon/gen_5/golett/anim_front.png diff --git a/graphics/pokemon/golett/back.png b/graphics/pokemon/gen_5/golett/back.png similarity index 100% rename from graphics/pokemon/golett/back.png rename to graphics/pokemon/gen_5/golett/back.png diff --git a/graphics/pokemon/golett/footprint.png b/graphics/pokemon/gen_5/golett/footprint.png similarity index 100% rename from graphics/pokemon/golett/footprint.png rename to graphics/pokemon/gen_5/golett/footprint.png diff --git a/graphics/pokemon/golett/icon.png b/graphics/pokemon/gen_5/golett/icon.png similarity index 100% rename from graphics/pokemon/golett/icon.png rename to graphics/pokemon/gen_5/golett/icon.png diff --git a/graphics/pokemon/golett/normal.pal b/graphics/pokemon/gen_5/golett/normal.pal similarity index 100% rename from graphics/pokemon/golett/normal.pal rename to graphics/pokemon/gen_5/golett/normal.pal diff --git a/graphics/pokemon/golett/shiny.pal b/graphics/pokemon/gen_5/golett/shiny.pal similarity index 100% rename from graphics/pokemon/golett/shiny.pal rename to graphics/pokemon/gen_5/golett/shiny.pal diff --git a/graphics/pokemon/golurk/anim_front.png b/graphics/pokemon/gen_5/golurk/anim_front.png similarity index 100% rename from graphics/pokemon/golurk/anim_front.png rename to graphics/pokemon/gen_5/golurk/anim_front.png diff --git a/graphics/pokemon/golurk/back.png b/graphics/pokemon/gen_5/golurk/back.png similarity index 100% rename from graphics/pokemon/golurk/back.png rename to graphics/pokemon/gen_5/golurk/back.png diff --git a/graphics/pokemon/golurk/footprint.png b/graphics/pokemon/gen_5/golurk/footprint.png similarity index 100% rename from graphics/pokemon/golurk/footprint.png rename to graphics/pokemon/gen_5/golurk/footprint.png diff --git a/graphics/pokemon/golurk/icon.png b/graphics/pokemon/gen_5/golurk/icon.png similarity index 100% rename from graphics/pokemon/golurk/icon.png rename to graphics/pokemon/gen_5/golurk/icon.png diff --git a/graphics/pokemon/golurk/normal.pal b/graphics/pokemon/gen_5/golurk/normal.pal similarity index 100% rename from graphics/pokemon/golurk/normal.pal rename to graphics/pokemon/gen_5/golurk/normal.pal diff --git a/graphics/pokemon/golurk/shiny.pal b/graphics/pokemon/gen_5/golurk/shiny.pal similarity index 100% rename from graphics/pokemon/golurk/shiny.pal rename to graphics/pokemon/gen_5/golurk/shiny.pal diff --git a/graphics/pokemon/gothita/anim_front.png b/graphics/pokemon/gen_5/gothita/anim_front.png similarity index 100% rename from graphics/pokemon/gothita/anim_front.png rename to graphics/pokemon/gen_5/gothita/anim_front.png diff --git a/graphics/pokemon/gothita/back.png b/graphics/pokemon/gen_5/gothita/back.png similarity index 100% rename from graphics/pokemon/gothita/back.png rename to graphics/pokemon/gen_5/gothita/back.png diff --git a/graphics/pokemon/crabrawler/footprint.png b/graphics/pokemon/gen_5/gothita/footprint.png similarity index 100% rename from graphics/pokemon/crabrawler/footprint.png rename to graphics/pokemon/gen_5/gothita/footprint.png diff --git a/graphics/pokemon/gothita/icon.png b/graphics/pokemon/gen_5/gothita/icon.png similarity index 100% rename from graphics/pokemon/gothita/icon.png rename to graphics/pokemon/gen_5/gothita/icon.png diff --git a/graphics/pokemon/gothita/normal.pal b/graphics/pokemon/gen_5/gothita/normal.pal similarity index 100% rename from graphics/pokemon/gothita/normal.pal rename to graphics/pokemon/gen_5/gothita/normal.pal diff --git a/graphics/pokemon/gothita/shiny.pal b/graphics/pokemon/gen_5/gothita/shiny.pal similarity index 100% rename from graphics/pokemon/gothita/shiny.pal rename to graphics/pokemon/gen_5/gothita/shiny.pal diff --git a/graphics/pokemon/gothitelle/anim_front.png b/graphics/pokemon/gen_5/gothitelle/anim_front.png similarity index 100% rename from graphics/pokemon/gothitelle/anim_front.png rename to graphics/pokemon/gen_5/gothitelle/anim_front.png diff --git a/graphics/pokemon/gothitelle/back.png b/graphics/pokemon/gen_5/gothitelle/back.png similarity index 100% rename from graphics/pokemon/gothitelle/back.png rename to graphics/pokemon/gen_5/gothitelle/back.png diff --git a/graphics/pokemon/gothitelle/footprint.png b/graphics/pokemon/gen_5/gothitelle/footprint.png similarity index 100% rename from graphics/pokemon/gothitelle/footprint.png rename to graphics/pokemon/gen_5/gothitelle/footprint.png diff --git a/graphics/pokemon/gothitelle/icon.png b/graphics/pokemon/gen_5/gothitelle/icon.png similarity index 100% rename from graphics/pokemon/gothitelle/icon.png rename to graphics/pokemon/gen_5/gothitelle/icon.png diff --git a/graphics/pokemon/gothitelle/normal.pal b/graphics/pokemon/gen_5/gothitelle/normal.pal similarity index 100% rename from graphics/pokemon/gothitelle/normal.pal rename to graphics/pokemon/gen_5/gothitelle/normal.pal diff --git a/graphics/pokemon/gothitelle/shiny.pal b/graphics/pokemon/gen_5/gothitelle/shiny.pal similarity index 100% rename from graphics/pokemon/gothitelle/shiny.pal rename to graphics/pokemon/gen_5/gothitelle/shiny.pal diff --git a/graphics/pokemon/gothorita/anim_front.png b/graphics/pokemon/gen_5/gothorita/anim_front.png similarity index 100% rename from graphics/pokemon/gothorita/anim_front.png rename to graphics/pokemon/gen_5/gothorita/anim_front.png diff --git a/graphics/pokemon/gothorita/back.png b/graphics/pokemon/gen_5/gothorita/back.png similarity index 100% rename from graphics/pokemon/gothorita/back.png rename to graphics/pokemon/gen_5/gothorita/back.png diff --git a/graphics/pokemon/gothorita/footprint.png b/graphics/pokemon/gen_5/gothorita/footprint.png similarity index 100% rename from graphics/pokemon/gothorita/footprint.png rename to graphics/pokemon/gen_5/gothorita/footprint.png diff --git a/graphics/pokemon/gothorita/icon.png b/graphics/pokemon/gen_5/gothorita/icon.png similarity index 100% rename from graphics/pokemon/gothorita/icon.png rename to graphics/pokemon/gen_5/gothorita/icon.png diff --git a/graphics/pokemon/gothorita/normal.pal b/graphics/pokemon/gen_5/gothorita/normal.pal similarity index 100% rename from graphics/pokemon/gothorita/normal.pal rename to graphics/pokemon/gen_5/gothorita/normal.pal diff --git a/graphics/pokemon/gothorita/shiny.pal b/graphics/pokemon/gen_5/gothorita/shiny.pal similarity index 100% rename from graphics/pokemon/gothorita/shiny.pal rename to graphics/pokemon/gen_5/gothorita/shiny.pal diff --git a/graphics/pokemon/gurdurr/anim_front.png b/graphics/pokemon/gen_5/gurdurr/anim_front.png similarity index 100% rename from graphics/pokemon/gurdurr/anim_front.png rename to graphics/pokemon/gen_5/gurdurr/anim_front.png diff --git a/graphics/pokemon/gurdurr/back.png b/graphics/pokemon/gen_5/gurdurr/back.png similarity index 100% rename from graphics/pokemon/gurdurr/back.png rename to graphics/pokemon/gen_5/gurdurr/back.png diff --git a/graphics/pokemon/gurdurr/footprint.png b/graphics/pokemon/gen_5/gurdurr/footprint.png similarity index 100% rename from graphics/pokemon/gurdurr/footprint.png rename to graphics/pokemon/gen_5/gurdurr/footprint.png diff --git a/graphics/pokemon/gurdurr/icon.png b/graphics/pokemon/gen_5/gurdurr/icon.png similarity index 100% rename from graphics/pokemon/gurdurr/icon.png rename to graphics/pokemon/gen_5/gurdurr/icon.png diff --git a/graphics/pokemon/gurdurr/normal.pal b/graphics/pokemon/gen_5/gurdurr/normal.pal similarity index 100% rename from graphics/pokemon/gurdurr/normal.pal rename to graphics/pokemon/gen_5/gurdurr/normal.pal diff --git a/graphics/pokemon/gurdurr/shiny.pal b/graphics/pokemon/gen_5/gurdurr/shiny.pal similarity index 100% rename from graphics/pokemon/gurdurr/shiny.pal rename to graphics/pokemon/gen_5/gurdurr/shiny.pal diff --git a/graphics/pokemon/haxorus/anim_front.png b/graphics/pokemon/gen_5/haxorus/anim_front.png similarity index 100% rename from graphics/pokemon/haxorus/anim_front.png rename to graphics/pokemon/gen_5/haxorus/anim_front.png diff --git a/graphics/pokemon/haxorus/back.png b/graphics/pokemon/gen_5/haxorus/back.png similarity index 100% rename from graphics/pokemon/haxorus/back.png rename to graphics/pokemon/gen_5/haxorus/back.png diff --git a/graphics/pokemon/haxorus/footprint.png b/graphics/pokemon/gen_5/haxorus/footprint.png similarity index 100% rename from graphics/pokemon/haxorus/footprint.png rename to graphics/pokemon/gen_5/haxorus/footprint.png diff --git a/graphics/pokemon/haxorus/icon.png b/graphics/pokemon/gen_5/haxorus/icon.png similarity index 100% rename from graphics/pokemon/haxorus/icon.png rename to graphics/pokemon/gen_5/haxorus/icon.png diff --git a/graphics/pokemon/haxorus/normal.pal b/graphics/pokemon/gen_5/haxorus/normal.pal similarity index 100% rename from graphics/pokemon/haxorus/normal.pal rename to graphics/pokemon/gen_5/haxorus/normal.pal diff --git a/graphics/pokemon/haxorus/shiny.pal b/graphics/pokemon/gen_5/haxorus/shiny.pal similarity index 100% rename from graphics/pokemon/haxorus/shiny.pal rename to graphics/pokemon/gen_5/haxorus/shiny.pal diff --git a/graphics/pokemon/heatmor/anim_front.png b/graphics/pokemon/gen_5/heatmor/anim_front.png similarity index 100% rename from graphics/pokemon/heatmor/anim_front.png rename to graphics/pokemon/gen_5/heatmor/anim_front.png diff --git a/graphics/pokemon/heatmor/back.png b/graphics/pokemon/gen_5/heatmor/back.png similarity index 100% rename from graphics/pokemon/heatmor/back.png rename to graphics/pokemon/gen_5/heatmor/back.png diff --git a/graphics/pokemon/heatmor/footprint.png b/graphics/pokemon/gen_5/heatmor/footprint.png similarity index 100% rename from graphics/pokemon/heatmor/footprint.png rename to graphics/pokemon/gen_5/heatmor/footprint.png diff --git a/graphics/pokemon/heatmor/icon.png b/graphics/pokemon/gen_5/heatmor/icon.png similarity index 100% rename from graphics/pokemon/heatmor/icon.png rename to graphics/pokemon/gen_5/heatmor/icon.png diff --git a/graphics/pokemon/heatmor/normal.pal b/graphics/pokemon/gen_5/heatmor/normal.pal similarity index 100% rename from graphics/pokemon/heatmor/normal.pal rename to graphics/pokemon/gen_5/heatmor/normal.pal diff --git a/graphics/pokemon/heatmor/shiny.pal b/graphics/pokemon/gen_5/heatmor/shiny.pal similarity index 100% rename from graphics/pokemon/heatmor/shiny.pal rename to graphics/pokemon/gen_5/heatmor/shiny.pal diff --git a/graphics/pokemon/herdier/anim_front.png b/graphics/pokemon/gen_5/herdier/anim_front.png similarity index 100% rename from graphics/pokemon/herdier/anim_front.png rename to graphics/pokemon/gen_5/herdier/anim_front.png diff --git a/graphics/pokemon/herdier/back.png b/graphics/pokemon/gen_5/herdier/back.png similarity index 100% rename from graphics/pokemon/herdier/back.png rename to graphics/pokemon/gen_5/herdier/back.png diff --git a/graphics/pokemon/elgyem/footprint.png b/graphics/pokemon/gen_5/herdier/footprint.png similarity index 100% rename from graphics/pokemon/elgyem/footprint.png rename to graphics/pokemon/gen_5/herdier/footprint.png diff --git a/graphics/pokemon/herdier/icon.png b/graphics/pokemon/gen_5/herdier/icon.png similarity index 100% rename from graphics/pokemon/herdier/icon.png rename to graphics/pokemon/gen_5/herdier/icon.png diff --git a/graphics/pokemon/herdier/normal.pal b/graphics/pokemon/gen_5/herdier/normal.pal similarity index 100% rename from graphics/pokemon/herdier/normal.pal rename to graphics/pokemon/gen_5/herdier/normal.pal diff --git a/graphics/pokemon/herdier/shiny.pal b/graphics/pokemon/gen_5/herdier/shiny.pal similarity index 100% rename from graphics/pokemon/herdier/shiny.pal rename to graphics/pokemon/gen_5/herdier/shiny.pal diff --git a/graphics/pokemon/hydreigon/anim_front.png b/graphics/pokemon/gen_5/hydreigon/anim_front.png similarity index 100% rename from graphics/pokemon/hydreigon/anim_front.png rename to graphics/pokemon/gen_5/hydreigon/anim_front.png diff --git a/graphics/pokemon/hydreigon/back.png b/graphics/pokemon/gen_5/hydreigon/back.png similarity index 100% rename from graphics/pokemon/hydreigon/back.png rename to graphics/pokemon/gen_5/hydreigon/back.png diff --git a/graphics/pokemon/milcery/footprint.png b/graphics/pokemon/gen_5/hydreigon/footprint.png similarity index 100% rename from graphics/pokemon/milcery/footprint.png rename to graphics/pokemon/gen_5/hydreigon/footprint.png diff --git a/graphics/pokemon/hydreigon/icon.png b/graphics/pokemon/gen_5/hydreigon/icon.png similarity index 100% rename from graphics/pokemon/hydreigon/icon.png rename to graphics/pokemon/gen_5/hydreigon/icon.png diff --git a/graphics/pokemon/hydreigon/normal.pal b/graphics/pokemon/gen_5/hydreigon/normal.pal similarity index 100% rename from graphics/pokemon/hydreigon/normal.pal rename to graphics/pokemon/gen_5/hydreigon/normal.pal diff --git a/graphics/pokemon/hydreigon/shiny.pal b/graphics/pokemon/gen_5/hydreigon/shiny.pal similarity index 100% rename from graphics/pokemon/hydreigon/shiny.pal rename to graphics/pokemon/gen_5/hydreigon/shiny.pal diff --git a/graphics/pokemon/jellicent/anim_front.png b/graphics/pokemon/gen_5/jellicent/anim_front.png similarity index 100% rename from graphics/pokemon/jellicent/anim_front.png rename to graphics/pokemon/gen_5/jellicent/anim_front.png diff --git a/graphics/pokemon/jellicent/anim_frontf.png b/graphics/pokemon/gen_5/jellicent/anim_frontf.png similarity index 100% rename from graphics/pokemon/jellicent/anim_frontf.png rename to graphics/pokemon/gen_5/jellicent/anim_frontf.png diff --git a/graphics/pokemon/jellicent/back.png b/graphics/pokemon/gen_5/jellicent/back.png similarity index 100% rename from graphics/pokemon/jellicent/back.png rename to graphics/pokemon/gen_5/jellicent/back.png diff --git a/graphics/pokemon/jellicent/backf.png b/graphics/pokemon/gen_5/jellicent/backf.png similarity index 100% rename from graphics/pokemon/jellicent/backf.png rename to graphics/pokemon/gen_5/jellicent/backf.png diff --git a/graphics/pokemon/milotic/footprint.png b/graphics/pokemon/gen_5/jellicent/footprint.png similarity index 100% rename from graphics/pokemon/milotic/footprint.png rename to graphics/pokemon/gen_5/jellicent/footprint.png diff --git a/graphics/pokemon/jellicent/frontf.png b/graphics/pokemon/gen_5/jellicent/frontf.png similarity index 100% rename from graphics/pokemon/jellicent/frontf.png rename to graphics/pokemon/gen_5/jellicent/frontf.png diff --git a/graphics/pokemon/jellicent/icon.png b/graphics/pokemon/gen_5/jellicent/icon.png similarity index 100% rename from graphics/pokemon/jellicent/icon.png rename to graphics/pokemon/gen_5/jellicent/icon.png diff --git a/graphics/pokemon/jellicent/iconf.png b/graphics/pokemon/gen_5/jellicent/iconf.png similarity index 100% rename from graphics/pokemon/jellicent/iconf.png rename to graphics/pokemon/gen_5/jellicent/iconf.png diff --git a/graphics/pokemon/jellicent/normal.pal b/graphics/pokemon/gen_5/jellicent/normal.pal similarity index 100% rename from graphics/pokemon/jellicent/normal.pal rename to graphics/pokemon/gen_5/jellicent/normal.pal diff --git a/graphics/pokemon/jellicent/normalf.pal b/graphics/pokemon/gen_5/jellicent/normalf.pal similarity index 100% rename from graphics/pokemon/jellicent/normalf.pal rename to graphics/pokemon/gen_5/jellicent/normalf.pal diff --git a/graphics/pokemon/jellicent/shiny.pal b/graphics/pokemon/gen_5/jellicent/shiny.pal similarity index 100% rename from graphics/pokemon/jellicent/shiny.pal rename to graphics/pokemon/gen_5/jellicent/shiny.pal diff --git a/graphics/pokemon/jellicent/shinyf.pal b/graphics/pokemon/gen_5/jellicent/shinyf.pal similarity index 100% rename from graphics/pokemon/jellicent/shinyf.pal rename to graphics/pokemon/gen_5/jellicent/shinyf.pal diff --git a/graphics/pokemon/joltik/anim_front.png b/graphics/pokemon/gen_5/joltik/anim_front.png similarity index 100% rename from graphics/pokemon/joltik/anim_front.png rename to graphics/pokemon/gen_5/joltik/anim_front.png diff --git a/graphics/pokemon/joltik/back.png b/graphics/pokemon/gen_5/joltik/back.png similarity index 100% rename from graphics/pokemon/joltik/back.png rename to graphics/pokemon/gen_5/joltik/back.png diff --git a/graphics/pokemon/crustle/footprint.png b/graphics/pokemon/gen_5/joltik/footprint.png similarity index 100% rename from graphics/pokemon/crustle/footprint.png rename to graphics/pokemon/gen_5/joltik/footprint.png diff --git a/graphics/pokemon/joltik/icon.png b/graphics/pokemon/gen_5/joltik/icon.png similarity index 100% rename from graphics/pokemon/joltik/icon.png rename to graphics/pokemon/gen_5/joltik/icon.png diff --git a/graphics/pokemon/joltik/normal.pal b/graphics/pokemon/gen_5/joltik/normal.pal similarity index 100% rename from graphics/pokemon/joltik/normal.pal rename to graphics/pokemon/gen_5/joltik/normal.pal diff --git a/graphics/pokemon/joltik/shiny.pal b/graphics/pokemon/gen_5/joltik/shiny.pal similarity index 100% rename from graphics/pokemon/joltik/shiny.pal rename to graphics/pokemon/gen_5/joltik/shiny.pal diff --git a/graphics/pokemon/karrablast/anim_front.png b/graphics/pokemon/gen_5/karrablast/anim_front.png similarity index 100% rename from graphics/pokemon/karrablast/anim_front.png rename to graphics/pokemon/gen_5/karrablast/anim_front.png diff --git a/graphics/pokemon/karrablast/back.png b/graphics/pokemon/gen_5/karrablast/back.png similarity index 100% rename from graphics/pokemon/karrablast/back.png rename to graphics/pokemon/gen_5/karrablast/back.png diff --git a/graphics/pokemon/roserade/footprint.png b/graphics/pokemon/gen_5/karrablast/footprint.png similarity index 100% rename from graphics/pokemon/roserade/footprint.png rename to graphics/pokemon/gen_5/karrablast/footprint.png diff --git a/graphics/pokemon/karrablast/icon.png b/graphics/pokemon/gen_5/karrablast/icon.png similarity index 100% rename from graphics/pokemon/karrablast/icon.png rename to graphics/pokemon/gen_5/karrablast/icon.png diff --git a/graphics/pokemon/karrablast/normal.pal b/graphics/pokemon/gen_5/karrablast/normal.pal similarity index 100% rename from graphics/pokemon/karrablast/normal.pal rename to graphics/pokemon/gen_5/karrablast/normal.pal diff --git a/graphics/pokemon/karrablast/shiny.pal b/graphics/pokemon/gen_5/karrablast/shiny.pal similarity index 100% rename from graphics/pokemon/karrablast/shiny.pal rename to graphics/pokemon/gen_5/karrablast/shiny.pal diff --git a/graphics/pokemon/keldeo/anim_front.png b/graphics/pokemon/gen_5/keldeo/anim_front.png similarity index 100% rename from graphics/pokemon/keldeo/anim_front.png rename to graphics/pokemon/gen_5/keldeo/anim_front.png diff --git a/graphics/pokemon/keldeo/back.png b/graphics/pokemon/gen_5/keldeo/back.png similarity index 100% rename from graphics/pokemon/keldeo/back.png rename to graphics/pokemon/gen_5/keldeo/back.png diff --git a/graphics/pokemon/keldeo/footprint.png b/graphics/pokemon/gen_5/keldeo/footprint.png similarity index 100% rename from graphics/pokemon/keldeo/footprint.png rename to graphics/pokemon/gen_5/keldeo/footprint.png diff --git a/graphics/pokemon/keldeo/icon.png b/graphics/pokemon/gen_5/keldeo/icon.png similarity index 100% rename from graphics/pokemon/keldeo/icon.png rename to graphics/pokemon/gen_5/keldeo/icon.png diff --git a/graphics/pokemon/keldeo/normal.pal b/graphics/pokemon/gen_5/keldeo/normal.pal similarity index 100% rename from graphics/pokemon/keldeo/normal.pal rename to graphics/pokemon/gen_5/keldeo/normal.pal diff --git a/graphics/pokemon/keldeo/resolute/back.png b/graphics/pokemon/gen_5/keldeo/resolute/back.png similarity index 100% rename from graphics/pokemon/keldeo/resolute/back.png rename to graphics/pokemon/gen_5/keldeo/resolute/back.png diff --git a/graphics/pokemon/keldeo/resolute/front.png b/graphics/pokemon/gen_5/keldeo/resolute/front.png similarity index 100% rename from graphics/pokemon/keldeo/resolute/front.png rename to graphics/pokemon/gen_5/keldeo/resolute/front.png diff --git a/graphics/pokemon/keldeo/resolute/icon.png b/graphics/pokemon/gen_5/keldeo/resolute/icon.png similarity index 100% rename from graphics/pokemon/keldeo/resolute/icon.png rename to graphics/pokemon/gen_5/keldeo/resolute/icon.png diff --git a/graphics/pokemon/keldeo/resolute/normal.pal b/graphics/pokemon/gen_5/keldeo/resolute/normal.pal similarity index 100% rename from graphics/pokemon/keldeo/resolute/normal.pal rename to graphics/pokemon/gen_5/keldeo/resolute/normal.pal diff --git a/graphics/pokemon/keldeo/resolute/shiny.pal b/graphics/pokemon/gen_5/keldeo/resolute/shiny.pal similarity index 100% rename from graphics/pokemon/keldeo/resolute/shiny.pal rename to graphics/pokemon/gen_5/keldeo/resolute/shiny.pal diff --git a/graphics/pokemon/keldeo/shiny.pal b/graphics/pokemon/gen_5/keldeo/shiny.pal similarity index 100% rename from graphics/pokemon/keldeo/shiny.pal rename to graphics/pokemon/gen_5/keldeo/shiny.pal diff --git a/graphics/pokemon/klang/anim_front.png b/graphics/pokemon/gen_5/klang/anim_front.png similarity index 100% rename from graphics/pokemon/klang/anim_front.png rename to graphics/pokemon/gen_5/klang/anim_front.png diff --git a/graphics/pokemon/klang/back.png b/graphics/pokemon/gen_5/klang/back.png similarity index 100% rename from graphics/pokemon/klang/back.png rename to graphics/pokemon/gen_5/klang/back.png diff --git a/graphics/pokemon/mimikyu/footprint.png b/graphics/pokemon/gen_5/klang/footprint.png similarity index 100% rename from graphics/pokemon/mimikyu/footprint.png rename to graphics/pokemon/gen_5/klang/footprint.png diff --git a/graphics/pokemon/klang/icon.png b/graphics/pokemon/gen_5/klang/icon.png similarity index 100% rename from graphics/pokemon/klang/icon.png rename to graphics/pokemon/gen_5/klang/icon.png diff --git a/graphics/pokemon/klang/normal.pal b/graphics/pokemon/gen_5/klang/normal.pal similarity index 100% rename from graphics/pokemon/klang/normal.pal rename to graphics/pokemon/gen_5/klang/normal.pal diff --git a/graphics/pokemon/klang/shiny.pal b/graphics/pokemon/gen_5/klang/shiny.pal similarity index 100% rename from graphics/pokemon/klang/shiny.pal rename to graphics/pokemon/gen_5/klang/shiny.pal diff --git a/graphics/pokemon/klink/anim_front.png b/graphics/pokemon/gen_5/klink/anim_front.png similarity index 100% rename from graphics/pokemon/klink/anim_front.png rename to graphics/pokemon/gen_5/klink/anim_front.png diff --git a/graphics/pokemon/klink/back.png b/graphics/pokemon/gen_5/klink/back.png similarity index 100% rename from graphics/pokemon/klink/back.png rename to graphics/pokemon/gen_5/klink/back.png diff --git a/graphics/pokemon/minior/footprint.png b/graphics/pokemon/gen_5/klink/footprint.png similarity index 100% rename from graphics/pokemon/minior/footprint.png rename to graphics/pokemon/gen_5/klink/footprint.png diff --git a/graphics/pokemon/klink/icon.png b/graphics/pokemon/gen_5/klink/icon.png similarity index 100% rename from graphics/pokemon/klink/icon.png rename to graphics/pokemon/gen_5/klink/icon.png diff --git a/graphics/pokemon/klink/normal.pal b/graphics/pokemon/gen_5/klink/normal.pal similarity index 100% rename from graphics/pokemon/klink/normal.pal rename to graphics/pokemon/gen_5/klink/normal.pal diff --git a/graphics/pokemon/klink/shiny.pal b/graphics/pokemon/gen_5/klink/shiny.pal similarity index 100% rename from graphics/pokemon/klink/shiny.pal rename to graphics/pokemon/gen_5/klink/shiny.pal diff --git a/graphics/pokemon/klinklang/anim_front.png b/graphics/pokemon/gen_5/klinklang/anim_front.png similarity index 100% rename from graphics/pokemon/klinklang/anim_front.png rename to graphics/pokemon/gen_5/klinklang/anim_front.png diff --git a/graphics/pokemon/klinklang/back.png b/graphics/pokemon/gen_5/klinklang/back.png similarity index 100% rename from graphics/pokemon/klinklang/back.png rename to graphics/pokemon/gen_5/klinklang/back.png diff --git a/graphics/pokemon/misdreavus/footprint.png b/graphics/pokemon/gen_5/klinklang/footprint.png similarity index 100% rename from graphics/pokemon/misdreavus/footprint.png rename to graphics/pokemon/gen_5/klinklang/footprint.png diff --git a/graphics/pokemon/klinklang/icon.png b/graphics/pokemon/gen_5/klinklang/icon.png similarity index 100% rename from graphics/pokemon/klinklang/icon.png rename to graphics/pokemon/gen_5/klinklang/icon.png diff --git a/graphics/pokemon/klinklang/normal.pal b/graphics/pokemon/gen_5/klinklang/normal.pal similarity index 100% rename from graphics/pokemon/klinklang/normal.pal rename to graphics/pokemon/gen_5/klinklang/normal.pal diff --git a/graphics/pokemon/klinklang/shiny.pal b/graphics/pokemon/gen_5/klinklang/shiny.pal similarity index 100% rename from graphics/pokemon/klinklang/shiny.pal rename to graphics/pokemon/gen_5/klinklang/shiny.pal diff --git a/graphics/pokemon/krokorok/anim_front.png b/graphics/pokemon/gen_5/krokorok/anim_front.png similarity index 100% rename from graphics/pokemon/krokorok/anim_front.png rename to graphics/pokemon/gen_5/krokorok/anim_front.png diff --git a/graphics/pokemon/krokorok/back.png b/graphics/pokemon/gen_5/krokorok/back.png similarity index 100% rename from graphics/pokemon/krokorok/back.png rename to graphics/pokemon/gen_5/krokorok/back.png diff --git a/graphics/pokemon/krokorok/footprint.png b/graphics/pokemon/gen_5/krokorok/footprint.png similarity index 100% rename from graphics/pokemon/krokorok/footprint.png rename to graphics/pokemon/gen_5/krokorok/footprint.png diff --git a/graphics/pokemon/krokorok/icon.png b/graphics/pokemon/gen_5/krokorok/icon.png similarity index 100% rename from graphics/pokemon/krokorok/icon.png rename to graphics/pokemon/gen_5/krokorok/icon.png diff --git a/graphics/pokemon/krokorok/normal.pal b/graphics/pokemon/gen_5/krokorok/normal.pal similarity index 100% rename from graphics/pokemon/krokorok/normal.pal rename to graphics/pokemon/gen_5/krokorok/normal.pal diff --git a/graphics/pokemon/krokorok/shiny.pal b/graphics/pokemon/gen_5/krokorok/shiny.pal similarity index 100% rename from graphics/pokemon/krokorok/shiny.pal rename to graphics/pokemon/gen_5/krokorok/shiny.pal diff --git a/graphics/pokemon/krookodile/anim_front.png b/graphics/pokemon/gen_5/krookodile/anim_front.png similarity index 100% rename from graphics/pokemon/krookodile/anim_front.png rename to graphics/pokemon/gen_5/krookodile/anim_front.png diff --git a/graphics/pokemon/krookodile/back.png b/graphics/pokemon/gen_5/krookodile/back.png similarity index 100% rename from graphics/pokemon/krookodile/back.png rename to graphics/pokemon/gen_5/krookodile/back.png diff --git a/graphics/pokemon/krookodile/footprint.png b/graphics/pokemon/gen_5/krookodile/footprint.png similarity index 100% rename from graphics/pokemon/krookodile/footprint.png rename to graphics/pokemon/gen_5/krookodile/footprint.png diff --git a/graphics/pokemon/krookodile/icon.png b/graphics/pokemon/gen_5/krookodile/icon.png similarity index 100% rename from graphics/pokemon/krookodile/icon.png rename to graphics/pokemon/gen_5/krookodile/icon.png diff --git a/graphics/pokemon/krookodile/normal.pal b/graphics/pokemon/gen_5/krookodile/normal.pal similarity index 100% rename from graphics/pokemon/krookodile/normal.pal rename to graphics/pokemon/gen_5/krookodile/normal.pal diff --git a/graphics/pokemon/krookodile/shiny.pal b/graphics/pokemon/gen_5/krookodile/shiny.pal similarity index 100% rename from graphics/pokemon/krookodile/shiny.pal rename to graphics/pokemon/gen_5/krookodile/shiny.pal diff --git a/graphics/pokemon/kyurem/anim_front.png b/graphics/pokemon/gen_5/kyurem/anim_front.png similarity index 100% rename from graphics/pokemon/kyurem/anim_front.png rename to graphics/pokemon/gen_5/kyurem/anim_front.png diff --git a/graphics/pokemon/kyurem/back.png b/graphics/pokemon/gen_5/kyurem/back.png similarity index 100% rename from graphics/pokemon/kyurem/back.png rename to graphics/pokemon/gen_5/kyurem/back.png diff --git a/graphics/pokemon/kyurem/black/anim_front.png b/graphics/pokemon/gen_5/kyurem/black/anim_front.png similarity index 100% rename from graphics/pokemon/kyurem/black/anim_front.png rename to graphics/pokemon/gen_5/kyurem/black/anim_front.png diff --git a/graphics/pokemon/kyurem/black/back.png b/graphics/pokemon/gen_5/kyurem/black/back.png similarity index 100% rename from graphics/pokemon/kyurem/black/back.png rename to graphics/pokemon/gen_5/kyurem/black/back.png diff --git a/graphics/pokemon/kyurem/black/icon.png b/graphics/pokemon/gen_5/kyurem/black/icon.png similarity index 100% rename from graphics/pokemon/kyurem/black/icon.png rename to graphics/pokemon/gen_5/kyurem/black/icon.png diff --git a/graphics/pokemon/kyurem/black/normal.pal b/graphics/pokemon/gen_5/kyurem/black/normal.pal similarity index 100% rename from graphics/pokemon/kyurem/black/normal.pal rename to graphics/pokemon/gen_5/kyurem/black/normal.pal diff --git a/graphics/pokemon/kyurem/black/shiny.pal b/graphics/pokemon/gen_5/kyurem/black/shiny.pal similarity index 100% rename from graphics/pokemon/kyurem/black/shiny.pal rename to graphics/pokemon/gen_5/kyurem/black/shiny.pal diff --git a/graphics/pokemon/kyurem/footprint.png b/graphics/pokemon/gen_5/kyurem/footprint.png similarity index 100% rename from graphics/pokemon/kyurem/footprint.png rename to graphics/pokemon/gen_5/kyurem/footprint.png diff --git a/graphics/pokemon/kyurem/icon.png b/graphics/pokemon/gen_5/kyurem/icon.png similarity index 100% rename from graphics/pokemon/kyurem/icon.png rename to graphics/pokemon/gen_5/kyurem/icon.png diff --git a/graphics/pokemon/kyurem/normal.pal b/graphics/pokemon/gen_5/kyurem/normal.pal similarity index 100% rename from graphics/pokemon/kyurem/normal.pal rename to graphics/pokemon/gen_5/kyurem/normal.pal diff --git a/graphics/pokemon/kyurem/shiny.pal b/graphics/pokemon/gen_5/kyurem/shiny.pal similarity index 100% rename from graphics/pokemon/kyurem/shiny.pal rename to graphics/pokemon/gen_5/kyurem/shiny.pal diff --git a/graphics/pokemon/kyurem/white/anim_front.png b/graphics/pokemon/gen_5/kyurem/white/anim_front.png similarity index 100% rename from graphics/pokemon/kyurem/white/anim_front.png rename to graphics/pokemon/gen_5/kyurem/white/anim_front.png diff --git a/graphics/pokemon/kyurem/white/back.png b/graphics/pokemon/gen_5/kyurem/white/back.png similarity index 100% rename from graphics/pokemon/kyurem/white/back.png rename to graphics/pokemon/gen_5/kyurem/white/back.png diff --git a/graphics/pokemon/kyurem/white/icon.png b/graphics/pokemon/gen_5/kyurem/white/icon.png similarity index 100% rename from graphics/pokemon/kyurem/white/icon.png rename to graphics/pokemon/gen_5/kyurem/white/icon.png diff --git a/graphics/pokemon/kyurem/white/normal.pal b/graphics/pokemon/gen_5/kyurem/white/normal.pal similarity index 100% rename from graphics/pokemon/kyurem/white/normal.pal rename to graphics/pokemon/gen_5/kyurem/white/normal.pal diff --git a/graphics/pokemon/kyurem/white/shiny.pal b/graphics/pokemon/gen_5/kyurem/white/shiny.pal similarity index 100% rename from graphics/pokemon/kyurem/white/shiny.pal rename to graphics/pokemon/gen_5/kyurem/white/shiny.pal diff --git a/graphics/pokemon/lampent/anim_front.png b/graphics/pokemon/gen_5/lampent/anim_front.png similarity index 100% rename from graphics/pokemon/lampent/anim_front.png rename to graphics/pokemon/gen_5/lampent/anim_front.png diff --git a/graphics/pokemon/lampent/back.png b/graphics/pokemon/gen_5/lampent/back.png similarity index 100% rename from graphics/pokemon/lampent/back.png rename to graphics/pokemon/gen_5/lampent/back.png diff --git a/graphics/pokemon/mismagius/footprint.png b/graphics/pokemon/gen_5/lampent/footprint.png similarity index 100% rename from graphics/pokemon/mismagius/footprint.png rename to graphics/pokemon/gen_5/lampent/footprint.png diff --git a/graphics/pokemon/lampent/icon.png b/graphics/pokemon/gen_5/lampent/icon.png similarity index 100% rename from graphics/pokemon/lampent/icon.png rename to graphics/pokemon/gen_5/lampent/icon.png diff --git a/graphics/pokemon/lampent/normal.pal b/graphics/pokemon/gen_5/lampent/normal.pal similarity index 100% rename from graphics/pokemon/lampent/normal.pal rename to graphics/pokemon/gen_5/lampent/normal.pal diff --git a/graphics/pokemon/lampent/shiny.pal b/graphics/pokemon/gen_5/lampent/shiny.pal similarity index 100% rename from graphics/pokemon/lampent/shiny.pal rename to graphics/pokemon/gen_5/lampent/shiny.pal diff --git a/graphics/pokemon/landorus/anim_front.png b/graphics/pokemon/gen_5/landorus/anim_front.png similarity index 100% rename from graphics/pokemon/landorus/anim_front.png rename to graphics/pokemon/gen_5/landorus/anim_front.png diff --git a/graphics/pokemon/landorus/back.png b/graphics/pokemon/gen_5/landorus/back.png similarity index 100% rename from graphics/pokemon/landorus/back.png rename to graphics/pokemon/gen_5/landorus/back.png diff --git a/graphics/pokemon/muk/footprint.png b/graphics/pokemon/gen_5/landorus/footprint.png similarity index 100% rename from graphics/pokemon/muk/footprint.png rename to graphics/pokemon/gen_5/landorus/footprint.png diff --git a/graphics/pokemon/landorus/icon.png b/graphics/pokemon/gen_5/landorus/icon.png similarity index 100% rename from graphics/pokemon/landorus/icon.png rename to graphics/pokemon/gen_5/landorus/icon.png diff --git a/graphics/pokemon/landorus/normal.pal b/graphics/pokemon/gen_5/landorus/normal.pal similarity index 100% rename from graphics/pokemon/landorus/normal.pal rename to graphics/pokemon/gen_5/landorus/normal.pal diff --git a/graphics/pokemon/landorus/shiny.pal b/graphics/pokemon/gen_5/landorus/shiny.pal similarity index 100% rename from graphics/pokemon/landorus/shiny.pal rename to graphics/pokemon/gen_5/landorus/shiny.pal diff --git a/graphics/pokemon/landorus/therian/anim_front.png b/graphics/pokemon/gen_5/landorus/therian/anim_front.png similarity index 100% rename from graphics/pokemon/landorus/therian/anim_front.png rename to graphics/pokemon/gen_5/landorus/therian/anim_front.png diff --git a/graphics/pokemon/landorus/therian/back.png b/graphics/pokemon/gen_5/landorus/therian/back.png similarity index 100% rename from graphics/pokemon/landorus/therian/back.png rename to graphics/pokemon/gen_5/landorus/therian/back.png diff --git a/graphics/pokemon/landorus/therian/icon.png b/graphics/pokemon/gen_5/landorus/therian/icon.png similarity index 100% rename from graphics/pokemon/landorus/therian/icon.png rename to graphics/pokemon/gen_5/landorus/therian/icon.png diff --git a/graphics/pokemon/landorus/therian/normal.pal b/graphics/pokemon/gen_5/landorus/therian/normal.pal similarity index 100% rename from graphics/pokemon/landorus/therian/normal.pal rename to graphics/pokemon/gen_5/landorus/therian/normal.pal diff --git a/graphics/pokemon/landorus/therian/shiny.pal b/graphics/pokemon/gen_5/landorus/therian/shiny.pal similarity index 100% rename from graphics/pokemon/landorus/therian/shiny.pal rename to graphics/pokemon/gen_5/landorus/therian/shiny.pal diff --git a/graphics/pokemon/larvesta/anim_front.png b/graphics/pokemon/gen_5/larvesta/anim_front.png similarity index 100% rename from graphics/pokemon/larvesta/anim_front.png rename to graphics/pokemon/gen_5/larvesta/anim_front.png diff --git a/graphics/pokemon/larvesta/back.png b/graphics/pokemon/gen_5/larvesta/back.png similarity index 100% rename from graphics/pokemon/larvesta/back.png rename to graphics/pokemon/gen_5/larvesta/back.png diff --git a/graphics/pokemon/cutiefly/footprint.png b/graphics/pokemon/gen_5/larvesta/footprint.png similarity index 100% rename from graphics/pokemon/cutiefly/footprint.png rename to graphics/pokemon/gen_5/larvesta/footprint.png diff --git a/graphics/pokemon/larvesta/icon.png b/graphics/pokemon/gen_5/larvesta/icon.png similarity index 100% rename from graphics/pokemon/larvesta/icon.png rename to graphics/pokemon/gen_5/larvesta/icon.png diff --git a/graphics/pokemon/larvesta/normal.pal b/graphics/pokemon/gen_5/larvesta/normal.pal similarity index 100% rename from graphics/pokemon/larvesta/normal.pal rename to graphics/pokemon/gen_5/larvesta/normal.pal diff --git a/graphics/pokemon/larvesta/shiny.pal b/graphics/pokemon/gen_5/larvesta/shiny.pal similarity index 100% rename from graphics/pokemon/larvesta/shiny.pal rename to graphics/pokemon/gen_5/larvesta/shiny.pal diff --git a/graphics/pokemon/leavanny/anim_front.png b/graphics/pokemon/gen_5/leavanny/anim_front.png similarity index 100% rename from graphics/pokemon/leavanny/anim_front.png rename to graphics/pokemon/gen_5/leavanny/anim_front.png diff --git a/graphics/pokemon/leavanny/back.png b/graphics/pokemon/gen_5/leavanny/back.png similarity index 100% rename from graphics/pokemon/leavanny/back.png rename to graphics/pokemon/gen_5/leavanny/back.png diff --git a/graphics/pokemon/mothim/footprint.png b/graphics/pokemon/gen_5/leavanny/footprint.png similarity index 100% rename from graphics/pokemon/mothim/footprint.png rename to graphics/pokemon/gen_5/leavanny/footprint.png diff --git a/graphics/pokemon/leavanny/icon.png b/graphics/pokemon/gen_5/leavanny/icon.png similarity index 100% rename from graphics/pokemon/leavanny/icon.png rename to graphics/pokemon/gen_5/leavanny/icon.png diff --git a/graphics/pokemon/leavanny/normal.pal b/graphics/pokemon/gen_5/leavanny/normal.pal similarity index 100% rename from graphics/pokemon/leavanny/normal.pal rename to graphics/pokemon/gen_5/leavanny/normal.pal diff --git a/graphics/pokemon/leavanny/shiny.pal b/graphics/pokemon/gen_5/leavanny/shiny.pal similarity index 100% rename from graphics/pokemon/leavanny/shiny.pal rename to graphics/pokemon/gen_5/leavanny/shiny.pal diff --git a/graphics/pokemon/liepard/anim_front.png b/graphics/pokemon/gen_5/liepard/anim_front.png similarity index 100% rename from graphics/pokemon/liepard/anim_front.png rename to graphics/pokemon/gen_5/liepard/anim_front.png diff --git a/graphics/pokemon/liepard/back.png b/graphics/pokemon/gen_5/liepard/back.png similarity index 100% rename from graphics/pokemon/liepard/back.png rename to graphics/pokemon/gen_5/liepard/back.png diff --git a/graphics/pokemon/liepard/footprint.png b/graphics/pokemon/gen_5/liepard/footprint.png similarity index 100% rename from graphics/pokemon/liepard/footprint.png rename to graphics/pokemon/gen_5/liepard/footprint.png diff --git a/graphics/pokemon/liepard/icon.png b/graphics/pokemon/gen_5/liepard/icon.png similarity index 100% rename from graphics/pokemon/liepard/icon.png rename to graphics/pokemon/gen_5/liepard/icon.png diff --git a/graphics/pokemon/liepard/normal.pal b/graphics/pokemon/gen_5/liepard/normal.pal similarity index 100% rename from graphics/pokemon/liepard/normal.pal rename to graphics/pokemon/gen_5/liepard/normal.pal diff --git a/graphics/pokemon/liepard/shiny.pal b/graphics/pokemon/gen_5/liepard/shiny.pal similarity index 100% rename from graphics/pokemon/liepard/shiny.pal rename to graphics/pokemon/gen_5/liepard/shiny.pal diff --git a/graphics/pokemon/lilligant/anim_front.png b/graphics/pokemon/gen_5/lilligant/anim_front.png similarity index 100% rename from graphics/pokemon/lilligant/anim_front.png rename to graphics/pokemon/gen_5/lilligant/anim_front.png diff --git a/graphics/pokemon/lilligant/back.png b/graphics/pokemon/gen_5/lilligant/back.png similarity index 100% rename from graphics/pokemon/lilligant/back.png rename to graphics/pokemon/gen_5/lilligant/back.png diff --git a/graphics/pokemon/lilligant/footprint.png b/graphics/pokemon/gen_5/lilligant/footprint.png similarity index 100% rename from graphics/pokemon/lilligant/footprint.png rename to graphics/pokemon/gen_5/lilligant/footprint.png diff --git a/graphics/pokemon/lilligant/hisuian/back.png b/graphics/pokemon/gen_5/lilligant/hisuian/back.png similarity index 100% rename from graphics/pokemon/lilligant/hisuian/back.png rename to graphics/pokemon/gen_5/lilligant/hisuian/back.png diff --git a/graphics/pokemon/lilligant/hisuian/front.png b/graphics/pokemon/gen_5/lilligant/hisuian/front.png similarity index 100% rename from graphics/pokemon/lilligant/hisuian/front.png rename to graphics/pokemon/gen_5/lilligant/hisuian/front.png diff --git a/graphics/pokemon/lilligant/hisuian/icon.png b/graphics/pokemon/gen_5/lilligant/hisuian/icon.png similarity index 100% rename from graphics/pokemon/lilligant/hisuian/icon.png rename to graphics/pokemon/gen_5/lilligant/hisuian/icon.png diff --git a/graphics/pokemon/lilligant/hisuian/normal.pal b/graphics/pokemon/gen_5/lilligant/hisuian/normal.pal similarity index 100% rename from graphics/pokemon/lilligant/hisuian/normal.pal rename to graphics/pokemon/gen_5/lilligant/hisuian/normal.pal diff --git a/graphics/pokemon/lilligant/hisuian/shiny.pal b/graphics/pokemon/gen_5/lilligant/hisuian/shiny.pal similarity index 100% rename from graphics/pokemon/lilligant/hisuian/shiny.pal rename to graphics/pokemon/gen_5/lilligant/hisuian/shiny.pal diff --git a/graphics/pokemon/lilligant/icon.png b/graphics/pokemon/gen_5/lilligant/icon.png similarity index 100% rename from graphics/pokemon/lilligant/icon.png rename to graphics/pokemon/gen_5/lilligant/icon.png diff --git a/graphics/pokemon/lilligant/normal.pal b/graphics/pokemon/gen_5/lilligant/normal.pal similarity index 100% rename from graphics/pokemon/lilligant/normal.pal rename to graphics/pokemon/gen_5/lilligant/normal.pal diff --git a/graphics/pokemon/lilligant/shiny.pal b/graphics/pokemon/gen_5/lilligant/shiny.pal similarity index 100% rename from graphics/pokemon/lilligant/shiny.pal rename to graphics/pokemon/gen_5/lilligant/shiny.pal diff --git a/graphics/pokemon/lillipup/anim_front.png b/graphics/pokemon/gen_5/lillipup/anim_front.png similarity index 100% rename from graphics/pokemon/lillipup/anim_front.png rename to graphics/pokemon/gen_5/lillipup/anim_front.png diff --git a/graphics/pokemon/lillipup/back.png b/graphics/pokemon/gen_5/lillipup/back.png similarity index 100% rename from graphics/pokemon/lillipup/back.png rename to graphics/pokemon/gen_5/lillipup/back.png diff --git a/graphics/pokemon/lillipup/footprint.png b/graphics/pokemon/gen_5/lillipup/footprint.png similarity index 100% rename from graphics/pokemon/lillipup/footprint.png rename to graphics/pokemon/gen_5/lillipup/footprint.png diff --git a/graphics/pokemon/lillipup/icon.png b/graphics/pokemon/gen_5/lillipup/icon.png similarity index 100% rename from graphics/pokemon/lillipup/icon.png rename to graphics/pokemon/gen_5/lillipup/icon.png diff --git a/graphics/pokemon/lillipup/normal.pal b/graphics/pokemon/gen_5/lillipup/normal.pal similarity index 100% rename from graphics/pokemon/lillipup/normal.pal rename to graphics/pokemon/gen_5/lillipup/normal.pal diff --git a/graphics/pokemon/lillipup/shiny.pal b/graphics/pokemon/gen_5/lillipup/shiny.pal similarity index 100% rename from graphics/pokemon/lillipup/shiny.pal rename to graphics/pokemon/gen_5/lillipup/shiny.pal diff --git a/graphics/pokemon/litwick/anim_front.png b/graphics/pokemon/gen_5/litwick/anim_front.png similarity index 100% rename from graphics/pokemon/litwick/anim_front.png rename to graphics/pokemon/gen_5/litwick/anim_front.png diff --git a/graphics/pokemon/litwick/back.png b/graphics/pokemon/gen_5/litwick/back.png similarity index 100% rename from graphics/pokemon/litwick/back.png rename to graphics/pokemon/gen_5/litwick/back.png diff --git a/graphics/pokemon/naganadel/footprint.png b/graphics/pokemon/gen_5/litwick/footprint.png similarity index 100% rename from graphics/pokemon/naganadel/footprint.png rename to graphics/pokemon/gen_5/litwick/footprint.png diff --git a/graphics/pokemon/litwick/icon.png b/graphics/pokemon/gen_5/litwick/icon.png similarity index 100% rename from graphics/pokemon/litwick/icon.png rename to graphics/pokemon/gen_5/litwick/icon.png diff --git a/graphics/pokemon/litwick/normal.pal b/graphics/pokemon/gen_5/litwick/normal.pal similarity index 100% rename from graphics/pokemon/litwick/normal.pal rename to graphics/pokemon/gen_5/litwick/normal.pal diff --git a/graphics/pokemon/litwick/shiny.pal b/graphics/pokemon/gen_5/litwick/shiny.pal similarity index 100% rename from graphics/pokemon/litwick/shiny.pal rename to graphics/pokemon/gen_5/litwick/shiny.pal diff --git a/graphics/pokemon/mandibuzz/anim_front.png b/graphics/pokemon/gen_5/mandibuzz/anim_front.png similarity index 100% rename from graphics/pokemon/mandibuzz/anim_front.png rename to graphics/pokemon/gen_5/mandibuzz/anim_front.png diff --git a/graphics/pokemon/mandibuzz/back.png b/graphics/pokemon/gen_5/mandibuzz/back.png similarity index 100% rename from graphics/pokemon/mandibuzz/back.png rename to graphics/pokemon/gen_5/mandibuzz/back.png diff --git a/graphics/pokemon/mandibuzz/footprint.png b/graphics/pokemon/gen_5/mandibuzz/footprint.png similarity index 100% rename from graphics/pokemon/mandibuzz/footprint.png rename to graphics/pokemon/gen_5/mandibuzz/footprint.png diff --git a/graphics/pokemon/mandibuzz/icon.png b/graphics/pokemon/gen_5/mandibuzz/icon.png similarity index 100% rename from graphics/pokemon/mandibuzz/icon.png rename to graphics/pokemon/gen_5/mandibuzz/icon.png diff --git a/graphics/pokemon/mandibuzz/normal.pal b/graphics/pokemon/gen_5/mandibuzz/normal.pal similarity index 100% rename from graphics/pokemon/mandibuzz/normal.pal rename to graphics/pokemon/gen_5/mandibuzz/normal.pal diff --git a/graphics/pokemon/mandibuzz/shiny.pal b/graphics/pokemon/gen_5/mandibuzz/shiny.pal similarity index 100% rename from graphics/pokemon/mandibuzz/shiny.pal rename to graphics/pokemon/gen_5/mandibuzz/shiny.pal diff --git a/graphics/pokemon/maractus/anim_front.png b/graphics/pokemon/gen_5/maractus/anim_front.png similarity index 100% rename from graphics/pokemon/maractus/anim_front.png rename to graphics/pokemon/gen_5/maractus/anim_front.png diff --git a/graphics/pokemon/maractus/back.png b/graphics/pokemon/gen_5/maractus/back.png similarity index 100% rename from graphics/pokemon/maractus/back.png rename to graphics/pokemon/gen_5/maractus/back.png diff --git a/graphics/pokemon/maractus/footprint.png b/graphics/pokemon/gen_5/maractus/footprint.png similarity index 100% rename from graphics/pokemon/maractus/footprint.png rename to graphics/pokemon/gen_5/maractus/footprint.png diff --git a/graphics/pokemon/maractus/icon.png b/graphics/pokemon/gen_5/maractus/icon.png similarity index 100% rename from graphics/pokemon/maractus/icon.png rename to graphics/pokemon/gen_5/maractus/icon.png diff --git a/graphics/pokemon/maractus/normal.pal b/graphics/pokemon/gen_5/maractus/normal.pal similarity index 100% rename from graphics/pokemon/maractus/normal.pal rename to graphics/pokemon/gen_5/maractus/normal.pal diff --git a/graphics/pokemon/maractus/shiny.pal b/graphics/pokemon/gen_5/maractus/shiny.pal similarity index 100% rename from graphics/pokemon/maractus/shiny.pal rename to graphics/pokemon/gen_5/maractus/shiny.pal diff --git a/graphics/pokemon/meloetta/anim_front.png b/graphics/pokemon/gen_5/meloetta/anim_front.png similarity index 100% rename from graphics/pokemon/meloetta/anim_front.png rename to graphics/pokemon/gen_5/meloetta/anim_front.png diff --git a/graphics/pokemon/meloetta/back.png b/graphics/pokemon/gen_5/meloetta/back.png similarity index 100% rename from graphics/pokemon/meloetta/back.png rename to graphics/pokemon/gen_5/meloetta/back.png diff --git a/graphics/pokemon/darkrai/footprint.png b/graphics/pokemon/gen_5/meloetta/footprint.png similarity index 100% rename from graphics/pokemon/darkrai/footprint.png rename to graphics/pokemon/gen_5/meloetta/footprint.png diff --git a/graphics/pokemon/meloetta/icon.png b/graphics/pokemon/gen_5/meloetta/icon.png similarity index 100% rename from graphics/pokemon/meloetta/icon.png rename to graphics/pokemon/gen_5/meloetta/icon.png diff --git a/graphics/pokemon/meloetta/normal.pal b/graphics/pokemon/gen_5/meloetta/normal.pal similarity index 100% rename from graphics/pokemon/meloetta/normal.pal rename to graphics/pokemon/gen_5/meloetta/normal.pal diff --git a/graphics/pokemon/meloetta/pirouette/back.png b/graphics/pokemon/gen_5/meloetta/pirouette/back.png similarity index 100% rename from graphics/pokemon/meloetta/pirouette/back.png rename to graphics/pokemon/gen_5/meloetta/pirouette/back.png diff --git a/graphics/pokemon/meloetta/pirouette/front.png b/graphics/pokemon/gen_5/meloetta/pirouette/front.png similarity index 100% rename from graphics/pokemon/meloetta/pirouette/front.png rename to graphics/pokemon/gen_5/meloetta/pirouette/front.png diff --git a/graphics/pokemon/meloetta/pirouette/icon.png b/graphics/pokemon/gen_5/meloetta/pirouette/icon.png similarity index 100% rename from graphics/pokemon/meloetta/pirouette/icon.png rename to graphics/pokemon/gen_5/meloetta/pirouette/icon.png diff --git a/graphics/pokemon/meloetta/pirouette/normal.pal b/graphics/pokemon/gen_5/meloetta/pirouette/normal.pal similarity index 100% rename from graphics/pokemon/meloetta/pirouette/normal.pal rename to graphics/pokemon/gen_5/meloetta/pirouette/normal.pal diff --git a/graphics/pokemon/meloetta/pirouette/shiny.pal b/graphics/pokemon/gen_5/meloetta/pirouette/shiny.pal similarity index 100% rename from graphics/pokemon/meloetta/pirouette/shiny.pal rename to graphics/pokemon/gen_5/meloetta/pirouette/shiny.pal diff --git a/graphics/pokemon/meloetta/shiny.pal b/graphics/pokemon/gen_5/meloetta/shiny.pal similarity index 100% rename from graphics/pokemon/meloetta/shiny.pal rename to graphics/pokemon/gen_5/meloetta/shiny.pal diff --git a/graphics/pokemon/mienfoo/anim_front.png b/graphics/pokemon/gen_5/mienfoo/anim_front.png similarity index 100% rename from graphics/pokemon/mienfoo/anim_front.png rename to graphics/pokemon/gen_5/mienfoo/anim_front.png diff --git a/graphics/pokemon/mienfoo/back.png b/graphics/pokemon/gen_5/mienfoo/back.png similarity index 100% rename from graphics/pokemon/mienfoo/back.png rename to graphics/pokemon/gen_5/mienfoo/back.png diff --git a/graphics/pokemon/mienfoo/footprint.png b/graphics/pokemon/gen_5/mienfoo/footprint.png similarity index 100% rename from graphics/pokemon/mienfoo/footprint.png rename to graphics/pokemon/gen_5/mienfoo/footprint.png diff --git a/graphics/pokemon/mienfoo/icon.png b/graphics/pokemon/gen_5/mienfoo/icon.png similarity index 100% rename from graphics/pokemon/mienfoo/icon.png rename to graphics/pokemon/gen_5/mienfoo/icon.png diff --git a/graphics/pokemon/mienfoo/normal.pal b/graphics/pokemon/gen_5/mienfoo/normal.pal similarity index 100% rename from graphics/pokemon/mienfoo/normal.pal rename to graphics/pokemon/gen_5/mienfoo/normal.pal diff --git a/graphics/pokemon/mienfoo/shiny.pal b/graphics/pokemon/gen_5/mienfoo/shiny.pal similarity index 100% rename from graphics/pokemon/mienfoo/shiny.pal rename to graphics/pokemon/gen_5/mienfoo/shiny.pal diff --git a/graphics/pokemon/mienshao/anim_front.png b/graphics/pokemon/gen_5/mienshao/anim_front.png similarity index 100% rename from graphics/pokemon/mienshao/anim_front.png rename to graphics/pokemon/gen_5/mienshao/anim_front.png diff --git a/graphics/pokemon/mienshao/back.png b/graphics/pokemon/gen_5/mienshao/back.png similarity index 100% rename from graphics/pokemon/mienshao/back.png rename to graphics/pokemon/gen_5/mienshao/back.png diff --git a/graphics/pokemon/mienshao/footprint.png b/graphics/pokemon/gen_5/mienshao/footprint.png similarity index 100% rename from graphics/pokemon/mienshao/footprint.png rename to graphics/pokemon/gen_5/mienshao/footprint.png diff --git a/graphics/pokemon/mienshao/icon.png b/graphics/pokemon/gen_5/mienshao/icon.png similarity index 100% rename from graphics/pokemon/mienshao/icon.png rename to graphics/pokemon/gen_5/mienshao/icon.png diff --git a/graphics/pokemon/mienshao/normal.pal b/graphics/pokemon/gen_5/mienshao/normal.pal similarity index 100% rename from graphics/pokemon/mienshao/normal.pal rename to graphics/pokemon/gen_5/mienshao/normal.pal diff --git a/graphics/pokemon/mienshao/shiny.pal b/graphics/pokemon/gen_5/mienshao/shiny.pal similarity index 100% rename from graphics/pokemon/mienshao/shiny.pal rename to graphics/pokemon/gen_5/mienshao/shiny.pal diff --git a/graphics/pokemon/minccino/anim_front.png b/graphics/pokemon/gen_5/minccino/anim_front.png similarity index 100% rename from graphics/pokemon/minccino/anim_front.png rename to graphics/pokemon/gen_5/minccino/anim_front.png diff --git a/graphics/pokemon/minccino/back.png b/graphics/pokemon/gen_5/minccino/back.png similarity index 100% rename from graphics/pokemon/minccino/back.png rename to graphics/pokemon/gen_5/minccino/back.png diff --git a/graphics/pokemon/minccino/footprint.png b/graphics/pokemon/gen_5/minccino/footprint.png similarity index 100% rename from graphics/pokemon/minccino/footprint.png rename to graphics/pokemon/gen_5/minccino/footprint.png diff --git a/graphics/pokemon/minccino/icon.png b/graphics/pokemon/gen_5/minccino/icon.png similarity index 100% rename from graphics/pokemon/minccino/icon.png rename to graphics/pokemon/gen_5/minccino/icon.png diff --git a/graphics/pokemon/minccino/normal.pal b/graphics/pokemon/gen_5/minccino/normal.pal similarity index 100% rename from graphics/pokemon/minccino/normal.pal rename to graphics/pokemon/gen_5/minccino/normal.pal diff --git a/graphics/pokemon/minccino/shiny.pal b/graphics/pokemon/gen_5/minccino/shiny.pal similarity index 100% rename from graphics/pokemon/minccino/shiny.pal rename to graphics/pokemon/gen_5/minccino/shiny.pal diff --git a/graphics/pokemon/munna/anim_front.png b/graphics/pokemon/gen_5/munna/anim_front.png similarity index 100% rename from graphics/pokemon/munna/anim_front.png rename to graphics/pokemon/gen_5/munna/anim_front.png diff --git a/graphics/pokemon/munna/back.png b/graphics/pokemon/gen_5/munna/back.png similarity index 100% rename from graphics/pokemon/munna/back.png rename to graphics/pokemon/gen_5/munna/back.png diff --git a/graphics/pokemon/dewpider/footprint.png b/graphics/pokemon/gen_5/munna/footprint.png similarity index 100% rename from graphics/pokemon/dewpider/footprint.png rename to graphics/pokemon/gen_5/munna/footprint.png diff --git a/graphics/pokemon/munna/icon.png b/graphics/pokemon/gen_5/munna/icon.png similarity index 100% rename from graphics/pokemon/munna/icon.png rename to graphics/pokemon/gen_5/munna/icon.png diff --git a/graphics/pokemon/munna/normal.pal b/graphics/pokemon/gen_5/munna/normal.pal similarity index 100% rename from graphics/pokemon/munna/normal.pal rename to graphics/pokemon/gen_5/munna/normal.pal diff --git a/graphics/pokemon/munna/shiny.pal b/graphics/pokemon/gen_5/munna/shiny.pal similarity index 100% rename from graphics/pokemon/munna/shiny.pal rename to graphics/pokemon/gen_5/munna/shiny.pal diff --git a/graphics/pokemon/musharna/anim_front.png b/graphics/pokemon/gen_5/musharna/anim_front.png similarity index 100% rename from graphics/pokemon/musharna/anim_front.png rename to graphics/pokemon/gen_5/musharna/anim_front.png diff --git a/graphics/pokemon/musharna/back.png b/graphics/pokemon/gen_5/musharna/back.png similarity index 100% rename from graphics/pokemon/musharna/back.png rename to graphics/pokemon/gen_5/musharna/back.png diff --git a/graphics/pokemon/drakloak/footprint.png b/graphics/pokemon/gen_5/musharna/footprint.png similarity index 100% rename from graphics/pokemon/drakloak/footprint.png rename to graphics/pokemon/gen_5/musharna/footprint.png diff --git a/graphics/pokemon/musharna/icon.png b/graphics/pokemon/gen_5/musharna/icon.png similarity index 100% rename from graphics/pokemon/musharna/icon.png rename to graphics/pokemon/gen_5/musharna/icon.png diff --git a/graphics/pokemon/musharna/normal.pal b/graphics/pokemon/gen_5/musharna/normal.pal similarity index 100% rename from graphics/pokemon/musharna/normal.pal rename to graphics/pokemon/gen_5/musharna/normal.pal diff --git a/graphics/pokemon/musharna/shiny.pal b/graphics/pokemon/gen_5/musharna/shiny.pal similarity index 100% rename from graphics/pokemon/musharna/shiny.pal rename to graphics/pokemon/gen_5/musharna/shiny.pal diff --git a/graphics/pokemon/oshawott/anim_front.png b/graphics/pokemon/gen_5/oshawott/anim_front.png similarity index 100% rename from graphics/pokemon/oshawott/anim_front.png rename to graphics/pokemon/gen_5/oshawott/anim_front.png diff --git a/graphics/pokemon/oshawott/back.png b/graphics/pokemon/gen_5/oshawott/back.png similarity index 100% rename from graphics/pokemon/oshawott/back.png rename to graphics/pokemon/gen_5/oshawott/back.png diff --git a/graphics/pokemon/oshawott/footprint.png b/graphics/pokemon/gen_5/oshawott/footprint.png similarity index 100% rename from graphics/pokemon/oshawott/footprint.png rename to graphics/pokemon/gen_5/oshawott/footprint.png diff --git a/graphics/pokemon/oshawott/icon.png b/graphics/pokemon/gen_5/oshawott/icon.png similarity index 100% rename from graphics/pokemon/oshawott/icon.png rename to graphics/pokemon/gen_5/oshawott/icon.png diff --git a/graphics/pokemon/oshawott/normal.pal b/graphics/pokemon/gen_5/oshawott/normal.pal similarity index 100% rename from graphics/pokemon/oshawott/normal.pal rename to graphics/pokemon/gen_5/oshawott/normal.pal diff --git a/graphics/pokemon/oshawott/shiny.pal b/graphics/pokemon/gen_5/oshawott/shiny.pal similarity index 100% rename from graphics/pokemon/oshawott/shiny.pal rename to graphics/pokemon/gen_5/oshawott/shiny.pal diff --git a/graphics/pokemon/palpitoad/anim_front.png b/graphics/pokemon/gen_5/palpitoad/anim_front.png similarity index 100% rename from graphics/pokemon/palpitoad/anim_front.png rename to graphics/pokemon/gen_5/palpitoad/anim_front.png diff --git a/graphics/pokemon/palpitoad/back.png b/graphics/pokemon/gen_5/palpitoad/back.png similarity index 100% rename from graphics/pokemon/palpitoad/back.png rename to graphics/pokemon/gen_5/palpitoad/back.png diff --git a/graphics/pokemon/palpitoad/footprint.png b/graphics/pokemon/gen_5/palpitoad/footprint.png similarity index 100% rename from graphics/pokemon/palpitoad/footprint.png rename to graphics/pokemon/gen_5/palpitoad/footprint.png diff --git a/graphics/pokemon/palpitoad/icon.png b/graphics/pokemon/gen_5/palpitoad/icon.png similarity index 100% rename from graphics/pokemon/palpitoad/icon.png rename to graphics/pokemon/gen_5/palpitoad/icon.png diff --git a/graphics/pokemon/palpitoad/normal.pal b/graphics/pokemon/gen_5/palpitoad/normal.pal similarity index 100% rename from graphics/pokemon/palpitoad/normal.pal rename to graphics/pokemon/gen_5/palpitoad/normal.pal diff --git a/graphics/pokemon/palpitoad/shiny.pal b/graphics/pokemon/gen_5/palpitoad/shiny.pal similarity index 100% rename from graphics/pokemon/palpitoad/shiny.pal rename to graphics/pokemon/gen_5/palpitoad/shiny.pal diff --git a/graphics/pokemon/panpour/anim_front.png b/graphics/pokemon/gen_5/panpour/anim_front.png similarity index 100% rename from graphics/pokemon/panpour/anim_front.png rename to graphics/pokemon/gen_5/panpour/anim_front.png diff --git a/graphics/pokemon/panpour/back.png b/graphics/pokemon/gen_5/panpour/back.png similarity index 100% rename from graphics/pokemon/panpour/back.png rename to graphics/pokemon/gen_5/panpour/back.png diff --git a/graphics/pokemon/panpour/footprint.png b/graphics/pokemon/gen_5/panpour/footprint.png similarity index 100% rename from graphics/pokemon/panpour/footprint.png rename to graphics/pokemon/gen_5/panpour/footprint.png diff --git a/graphics/pokemon/panpour/icon.png b/graphics/pokemon/gen_5/panpour/icon.png similarity index 100% rename from graphics/pokemon/panpour/icon.png rename to graphics/pokemon/gen_5/panpour/icon.png diff --git a/graphics/pokemon/panpour/normal.pal b/graphics/pokemon/gen_5/panpour/normal.pal similarity index 100% rename from graphics/pokemon/panpour/normal.pal rename to graphics/pokemon/gen_5/panpour/normal.pal diff --git a/graphics/pokemon/panpour/shiny.pal b/graphics/pokemon/gen_5/panpour/shiny.pal similarity index 100% rename from graphics/pokemon/panpour/shiny.pal rename to graphics/pokemon/gen_5/panpour/shiny.pal diff --git a/graphics/pokemon/pansage/anim_front.png b/graphics/pokemon/gen_5/pansage/anim_front.png similarity index 100% rename from graphics/pokemon/pansage/anim_front.png rename to graphics/pokemon/gen_5/pansage/anim_front.png diff --git a/graphics/pokemon/pansage/back.png b/graphics/pokemon/gen_5/pansage/back.png similarity index 100% rename from graphics/pokemon/pansage/back.png rename to graphics/pokemon/gen_5/pansage/back.png diff --git a/graphics/pokemon/pansage/footprint.png b/graphics/pokemon/gen_5/pansage/footprint.png similarity index 100% rename from graphics/pokemon/pansage/footprint.png rename to graphics/pokemon/gen_5/pansage/footprint.png diff --git a/graphics/pokemon/pansage/icon.png b/graphics/pokemon/gen_5/pansage/icon.png similarity index 100% rename from graphics/pokemon/pansage/icon.png rename to graphics/pokemon/gen_5/pansage/icon.png diff --git a/graphics/pokemon/pansage/normal.pal b/graphics/pokemon/gen_5/pansage/normal.pal similarity index 100% rename from graphics/pokemon/pansage/normal.pal rename to graphics/pokemon/gen_5/pansage/normal.pal diff --git a/graphics/pokemon/pansage/shiny.pal b/graphics/pokemon/gen_5/pansage/shiny.pal similarity index 100% rename from graphics/pokemon/pansage/shiny.pal rename to graphics/pokemon/gen_5/pansage/shiny.pal diff --git a/graphics/pokemon/pansear/anim_front.png b/graphics/pokemon/gen_5/pansear/anim_front.png similarity index 100% rename from graphics/pokemon/pansear/anim_front.png rename to graphics/pokemon/gen_5/pansear/anim_front.png diff --git a/graphics/pokemon/pansear/back.png b/graphics/pokemon/gen_5/pansear/back.png similarity index 100% rename from graphics/pokemon/pansear/back.png rename to graphics/pokemon/gen_5/pansear/back.png diff --git a/graphics/pokemon/pansear/footprint.png b/graphics/pokemon/gen_5/pansear/footprint.png similarity index 100% rename from graphics/pokemon/pansear/footprint.png rename to graphics/pokemon/gen_5/pansear/footprint.png diff --git a/graphics/pokemon/pansear/icon.png b/graphics/pokemon/gen_5/pansear/icon.png similarity index 100% rename from graphics/pokemon/pansear/icon.png rename to graphics/pokemon/gen_5/pansear/icon.png diff --git a/graphics/pokemon/pansear/normal.pal b/graphics/pokemon/gen_5/pansear/normal.pal similarity index 100% rename from graphics/pokemon/pansear/normal.pal rename to graphics/pokemon/gen_5/pansear/normal.pal diff --git a/graphics/pokemon/pansear/shiny.pal b/graphics/pokemon/gen_5/pansear/shiny.pal similarity index 100% rename from graphics/pokemon/pansear/shiny.pal rename to graphics/pokemon/gen_5/pansear/shiny.pal diff --git a/graphics/pokemon/patrat/anim_front.png b/graphics/pokemon/gen_5/patrat/anim_front.png similarity index 100% rename from graphics/pokemon/patrat/anim_front.png rename to graphics/pokemon/gen_5/patrat/anim_front.png diff --git a/graphics/pokemon/patrat/back.png b/graphics/pokemon/gen_5/patrat/back.png similarity index 100% rename from graphics/pokemon/patrat/back.png rename to graphics/pokemon/gen_5/patrat/back.png diff --git a/graphics/pokemon/patrat/footprint.png b/graphics/pokemon/gen_5/patrat/footprint.png similarity index 100% rename from graphics/pokemon/patrat/footprint.png rename to graphics/pokemon/gen_5/patrat/footprint.png diff --git a/graphics/pokemon/patrat/icon.png b/graphics/pokemon/gen_5/patrat/icon.png similarity index 100% rename from graphics/pokemon/patrat/icon.png rename to graphics/pokemon/gen_5/patrat/icon.png diff --git a/graphics/pokemon/patrat/normal.pal b/graphics/pokemon/gen_5/patrat/normal.pal similarity index 100% rename from graphics/pokemon/patrat/normal.pal rename to graphics/pokemon/gen_5/patrat/normal.pal diff --git a/graphics/pokemon/patrat/shiny.pal b/graphics/pokemon/gen_5/patrat/shiny.pal similarity index 100% rename from graphics/pokemon/patrat/shiny.pal rename to graphics/pokemon/gen_5/patrat/shiny.pal diff --git a/graphics/pokemon/pawniard/anim_front.png b/graphics/pokemon/gen_5/pawniard/anim_front.png similarity index 100% rename from graphics/pokemon/pawniard/anim_front.png rename to graphics/pokemon/gen_5/pawniard/anim_front.png diff --git a/graphics/pokemon/pawniard/back.png b/graphics/pokemon/gen_5/pawniard/back.png similarity index 100% rename from graphics/pokemon/pawniard/back.png rename to graphics/pokemon/gen_5/pawniard/back.png diff --git a/graphics/pokemon/pawniard/footprint.png b/graphics/pokemon/gen_5/pawniard/footprint.png similarity index 100% rename from graphics/pokemon/pawniard/footprint.png rename to graphics/pokemon/gen_5/pawniard/footprint.png diff --git a/graphics/pokemon/pawniard/icon.png b/graphics/pokemon/gen_5/pawniard/icon.png similarity index 100% rename from graphics/pokemon/pawniard/icon.png rename to graphics/pokemon/gen_5/pawniard/icon.png diff --git a/graphics/pokemon/pawniard/normal.pal b/graphics/pokemon/gen_5/pawniard/normal.pal similarity index 100% rename from graphics/pokemon/pawniard/normal.pal rename to graphics/pokemon/gen_5/pawniard/normal.pal diff --git a/graphics/pokemon/pawniard/shiny.pal b/graphics/pokemon/gen_5/pawniard/shiny.pal similarity index 100% rename from graphics/pokemon/pawniard/shiny.pal rename to graphics/pokemon/gen_5/pawniard/shiny.pal diff --git a/graphics/pokemon/petilil/anim_front.png b/graphics/pokemon/gen_5/petilil/anim_front.png similarity index 100% rename from graphics/pokemon/petilil/anim_front.png rename to graphics/pokemon/gen_5/petilil/anim_front.png diff --git a/graphics/pokemon/petilil/back.png b/graphics/pokemon/gen_5/petilil/back.png similarity index 100% rename from graphics/pokemon/petilil/back.png rename to graphics/pokemon/gen_5/petilil/back.png diff --git a/graphics/pokemon/necrozma/footprint.png b/graphics/pokemon/gen_5/petilil/footprint.png similarity index 100% rename from graphics/pokemon/necrozma/footprint.png rename to graphics/pokemon/gen_5/petilil/footprint.png diff --git a/graphics/pokemon/petilil/icon.png b/graphics/pokemon/gen_5/petilil/icon.png similarity index 100% rename from graphics/pokemon/petilil/icon.png rename to graphics/pokemon/gen_5/petilil/icon.png diff --git a/graphics/pokemon/petilil/normal.pal b/graphics/pokemon/gen_5/petilil/normal.pal similarity index 100% rename from graphics/pokemon/petilil/normal.pal rename to graphics/pokemon/gen_5/petilil/normal.pal diff --git a/graphics/pokemon/petilil/shiny.pal b/graphics/pokemon/gen_5/petilil/shiny.pal similarity index 100% rename from graphics/pokemon/petilil/shiny.pal rename to graphics/pokemon/gen_5/petilil/shiny.pal diff --git a/graphics/pokemon/pidove/anim_front.png b/graphics/pokemon/gen_5/pidove/anim_front.png similarity index 100% rename from graphics/pokemon/pidove/anim_front.png rename to graphics/pokemon/gen_5/pidove/anim_front.png diff --git a/graphics/pokemon/pidove/back.png b/graphics/pokemon/gen_5/pidove/back.png similarity index 100% rename from graphics/pokemon/pidove/back.png rename to graphics/pokemon/gen_5/pidove/back.png diff --git a/graphics/pokemon/pidove/footprint.png b/graphics/pokemon/gen_5/pidove/footprint.png similarity index 100% rename from graphics/pokemon/pidove/footprint.png rename to graphics/pokemon/gen_5/pidove/footprint.png diff --git a/graphics/pokemon/pidove/icon.png b/graphics/pokemon/gen_5/pidove/icon.png similarity index 100% rename from graphics/pokemon/pidove/icon.png rename to graphics/pokemon/gen_5/pidove/icon.png diff --git a/graphics/pokemon/pidove/normal.pal b/graphics/pokemon/gen_5/pidove/normal.pal similarity index 100% rename from graphics/pokemon/pidove/normal.pal rename to graphics/pokemon/gen_5/pidove/normal.pal diff --git a/graphics/pokemon/pidove/shiny.pal b/graphics/pokemon/gen_5/pidove/shiny.pal similarity index 100% rename from graphics/pokemon/pidove/shiny.pal rename to graphics/pokemon/gen_5/pidove/shiny.pal diff --git a/graphics/pokemon/pignite/anim_front.png b/graphics/pokemon/gen_5/pignite/anim_front.png similarity index 100% rename from graphics/pokemon/pignite/anim_front.png rename to graphics/pokemon/gen_5/pignite/anim_front.png diff --git a/graphics/pokemon/pignite/back.png b/graphics/pokemon/gen_5/pignite/back.png similarity index 100% rename from graphics/pokemon/pignite/back.png rename to graphics/pokemon/gen_5/pignite/back.png diff --git a/graphics/pokemon/pignite/footprint.png b/graphics/pokemon/gen_5/pignite/footprint.png similarity index 100% rename from graphics/pokemon/pignite/footprint.png rename to graphics/pokemon/gen_5/pignite/footprint.png diff --git a/graphics/pokemon/pignite/icon.png b/graphics/pokemon/gen_5/pignite/icon.png similarity index 100% rename from graphics/pokemon/pignite/icon.png rename to graphics/pokemon/gen_5/pignite/icon.png diff --git a/graphics/pokemon/pignite/normal.pal b/graphics/pokemon/gen_5/pignite/normal.pal similarity index 100% rename from graphics/pokemon/pignite/normal.pal rename to graphics/pokemon/gen_5/pignite/normal.pal diff --git a/graphics/pokemon/pignite/shiny.pal b/graphics/pokemon/gen_5/pignite/shiny.pal similarity index 100% rename from graphics/pokemon/pignite/shiny.pal rename to graphics/pokemon/gen_5/pignite/shiny.pal diff --git a/graphics/pokemon/purrloin/anim_front.png b/graphics/pokemon/gen_5/purrloin/anim_front.png similarity index 100% rename from graphics/pokemon/purrloin/anim_front.png rename to graphics/pokemon/gen_5/purrloin/anim_front.png diff --git a/graphics/pokemon/purrloin/back.png b/graphics/pokemon/gen_5/purrloin/back.png similarity index 100% rename from graphics/pokemon/purrloin/back.png rename to graphics/pokemon/gen_5/purrloin/back.png diff --git a/graphics/pokemon/purrloin/footprint.png b/graphics/pokemon/gen_5/purrloin/footprint.png similarity index 100% rename from graphics/pokemon/purrloin/footprint.png rename to graphics/pokemon/gen_5/purrloin/footprint.png diff --git a/graphics/pokemon/purrloin/icon.png b/graphics/pokemon/gen_5/purrloin/icon.png similarity index 100% rename from graphics/pokemon/purrloin/icon.png rename to graphics/pokemon/gen_5/purrloin/icon.png diff --git a/graphics/pokemon/purrloin/normal.pal b/graphics/pokemon/gen_5/purrloin/normal.pal similarity index 100% rename from graphics/pokemon/purrloin/normal.pal rename to graphics/pokemon/gen_5/purrloin/normal.pal diff --git a/graphics/pokemon/purrloin/shiny.pal b/graphics/pokemon/gen_5/purrloin/shiny.pal similarity index 100% rename from graphics/pokemon/purrloin/shiny.pal rename to graphics/pokemon/gen_5/purrloin/shiny.pal diff --git a/graphics/pokemon/reshiram/anim_front.png b/graphics/pokemon/gen_5/reshiram/anim_front.png similarity index 100% rename from graphics/pokemon/reshiram/anim_front.png rename to graphics/pokemon/gen_5/reshiram/anim_front.png diff --git a/graphics/pokemon/reshiram/back.png b/graphics/pokemon/gen_5/reshiram/back.png similarity index 100% rename from graphics/pokemon/reshiram/back.png rename to graphics/pokemon/gen_5/reshiram/back.png diff --git a/graphics/pokemon/reshiram/footprint.png b/graphics/pokemon/gen_5/reshiram/footprint.png similarity index 100% rename from graphics/pokemon/reshiram/footprint.png rename to graphics/pokemon/gen_5/reshiram/footprint.png diff --git a/graphics/pokemon/reshiram/icon.png b/graphics/pokemon/gen_5/reshiram/icon.png similarity index 100% rename from graphics/pokemon/reshiram/icon.png rename to graphics/pokemon/gen_5/reshiram/icon.png diff --git a/graphics/pokemon/reshiram/normal.pal b/graphics/pokemon/gen_5/reshiram/normal.pal similarity index 100% rename from graphics/pokemon/reshiram/normal.pal rename to graphics/pokemon/gen_5/reshiram/normal.pal diff --git a/graphics/pokemon/reshiram/shiny.pal b/graphics/pokemon/gen_5/reshiram/shiny.pal similarity index 100% rename from graphics/pokemon/reshiram/shiny.pal rename to graphics/pokemon/gen_5/reshiram/shiny.pal diff --git a/graphics/pokemon/reuniclus/anim_front.png b/graphics/pokemon/gen_5/reuniclus/anim_front.png similarity index 100% rename from graphics/pokemon/reuniclus/anim_front.png rename to graphics/pokemon/gen_5/reuniclus/anim_front.png diff --git a/graphics/pokemon/reuniclus/back.png b/graphics/pokemon/gen_5/reuniclus/back.png similarity index 100% rename from graphics/pokemon/reuniclus/back.png rename to graphics/pokemon/gen_5/reuniclus/back.png diff --git a/graphics/pokemon/nihilego/footprint.png b/graphics/pokemon/gen_5/reuniclus/footprint.png similarity index 100% rename from graphics/pokemon/nihilego/footprint.png rename to graphics/pokemon/gen_5/reuniclus/footprint.png diff --git a/graphics/pokemon/reuniclus/icon.png b/graphics/pokemon/gen_5/reuniclus/icon.png similarity index 100% rename from graphics/pokemon/reuniclus/icon.png rename to graphics/pokemon/gen_5/reuniclus/icon.png diff --git a/graphics/pokemon/reuniclus/normal.pal b/graphics/pokemon/gen_5/reuniclus/normal.pal similarity index 100% rename from graphics/pokemon/reuniclus/normal.pal rename to graphics/pokemon/gen_5/reuniclus/normal.pal diff --git a/graphics/pokemon/reuniclus/shiny.pal b/graphics/pokemon/gen_5/reuniclus/shiny.pal similarity index 100% rename from graphics/pokemon/reuniclus/shiny.pal rename to graphics/pokemon/gen_5/reuniclus/shiny.pal diff --git a/graphics/pokemon/roggenrola/anim_front.png b/graphics/pokemon/gen_5/roggenrola/anim_front.png similarity index 100% rename from graphics/pokemon/roggenrola/anim_front.png rename to graphics/pokemon/gen_5/roggenrola/anim_front.png diff --git a/graphics/pokemon/roggenrola/back.png b/graphics/pokemon/gen_5/roggenrola/back.png similarity index 100% rename from graphics/pokemon/roggenrola/back.png rename to graphics/pokemon/gen_5/roggenrola/back.png diff --git a/graphics/pokemon/roggenrola/footprint.png b/graphics/pokemon/gen_5/roggenrola/footprint.png similarity index 100% rename from graphics/pokemon/roggenrola/footprint.png rename to graphics/pokemon/gen_5/roggenrola/footprint.png diff --git a/graphics/pokemon/roggenrola/icon.png b/graphics/pokemon/gen_5/roggenrola/icon.png similarity index 100% rename from graphics/pokemon/roggenrola/icon.png rename to graphics/pokemon/gen_5/roggenrola/icon.png diff --git a/graphics/pokemon/roggenrola/normal.pal b/graphics/pokemon/gen_5/roggenrola/normal.pal similarity index 100% rename from graphics/pokemon/roggenrola/normal.pal rename to graphics/pokemon/gen_5/roggenrola/normal.pal diff --git a/graphics/pokemon/roggenrola/shiny.pal b/graphics/pokemon/gen_5/roggenrola/shiny.pal similarity index 100% rename from graphics/pokemon/roggenrola/shiny.pal rename to graphics/pokemon/gen_5/roggenrola/shiny.pal diff --git a/graphics/pokemon/rufflet/anim_front.png b/graphics/pokemon/gen_5/rufflet/anim_front.png similarity index 100% rename from graphics/pokemon/rufflet/anim_front.png rename to graphics/pokemon/gen_5/rufflet/anim_front.png diff --git a/graphics/pokemon/rufflet/back.png b/graphics/pokemon/gen_5/rufflet/back.png similarity index 100% rename from graphics/pokemon/rufflet/back.png rename to graphics/pokemon/gen_5/rufflet/back.png diff --git a/graphics/pokemon/rufflet/footprint.png b/graphics/pokemon/gen_5/rufflet/footprint.png similarity index 100% rename from graphics/pokemon/rufflet/footprint.png rename to graphics/pokemon/gen_5/rufflet/footprint.png diff --git a/graphics/pokemon/rufflet/icon.png b/graphics/pokemon/gen_5/rufflet/icon.png similarity index 100% rename from graphics/pokemon/rufflet/icon.png rename to graphics/pokemon/gen_5/rufflet/icon.png diff --git a/graphics/pokemon/rufflet/normal.pal b/graphics/pokemon/gen_5/rufflet/normal.pal similarity index 100% rename from graphics/pokemon/rufflet/normal.pal rename to graphics/pokemon/gen_5/rufflet/normal.pal diff --git a/graphics/pokemon/rufflet/shiny.pal b/graphics/pokemon/gen_5/rufflet/shiny.pal similarity index 100% rename from graphics/pokemon/rufflet/shiny.pal rename to graphics/pokemon/gen_5/rufflet/shiny.pal diff --git a/graphics/pokemon/samurott/anim_front.png b/graphics/pokemon/gen_5/samurott/anim_front.png similarity index 100% rename from graphics/pokemon/samurott/anim_front.png rename to graphics/pokemon/gen_5/samurott/anim_front.png diff --git a/graphics/pokemon/samurott/back.png b/graphics/pokemon/gen_5/samurott/back.png similarity index 100% rename from graphics/pokemon/samurott/back.png rename to graphics/pokemon/gen_5/samurott/back.png diff --git a/graphics/pokemon/samurott/footprint.png b/graphics/pokemon/gen_5/samurott/footprint.png similarity index 100% rename from graphics/pokemon/samurott/footprint.png rename to graphics/pokemon/gen_5/samurott/footprint.png diff --git a/graphics/pokemon/samurott/hisuian/back.png b/graphics/pokemon/gen_5/samurott/hisuian/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/samurott/hisuian/back.png rename to graphics/pokemon/gen_5/samurott/hisuian/back.png diff --git a/graphics/pokemon/samurott/hisuian/front.png b/graphics/pokemon/gen_5/samurott/hisuian/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/samurott/hisuian/front.png rename to graphics/pokemon/gen_5/samurott/hisuian/front.png diff --git a/graphics/pokemon/samurott/hisuian/icon.png b/graphics/pokemon/gen_5/samurott/hisuian/icon.png similarity index 100% rename from graphics/pokemon/samurott/hisuian/icon.png rename to graphics/pokemon/gen_5/samurott/hisuian/icon.png diff --git a/graphics/pokemon/samurott/hisuian/normal.pal b/graphics/pokemon/gen_5/samurott/hisuian/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/samurott/hisuian/normal.pal rename to graphics/pokemon/gen_5/samurott/hisuian/normal.pal diff --git a/graphics/pokemon/samurott/hisuian/shiny.pal b/graphics/pokemon/gen_5/samurott/hisuian/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/samurott/hisuian/shiny.pal rename to graphics/pokemon/gen_5/samurott/hisuian/shiny.pal diff --git a/graphics/pokemon/samurott/icon.png b/graphics/pokemon/gen_5/samurott/icon.png similarity index 100% rename from graphics/pokemon/samurott/icon.png rename to graphics/pokemon/gen_5/samurott/icon.png diff --git a/graphics/pokemon/samurott/normal.pal b/graphics/pokemon/gen_5/samurott/normal.pal similarity index 100% rename from graphics/pokemon/samurott/normal.pal rename to graphics/pokemon/gen_5/samurott/normal.pal diff --git a/graphics/pokemon/samurott/shiny.pal b/graphics/pokemon/gen_5/samurott/shiny.pal similarity index 100% rename from graphics/pokemon/samurott/shiny.pal rename to graphics/pokemon/gen_5/samurott/shiny.pal diff --git a/graphics/pokemon/sandile/anim_front.png b/graphics/pokemon/gen_5/sandile/anim_front.png similarity index 100% rename from graphics/pokemon/sandile/anim_front.png rename to graphics/pokemon/gen_5/sandile/anim_front.png diff --git a/graphics/pokemon/sandile/back.png b/graphics/pokemon/gen_5/sandile/back.png similarity index 100% rename from graphics/pokemon/sandile/back.png rename to graphics/pokemon/gen_5/sandile/back.png diff --git a/graphics/pokemon/sandile/footprint.png b/graphics/pokemon/gen_5/sandile/footprint.png similarity index 100% rename from graphics/pokemon/sandile/footprint.png rename to graphics/pokemon/gen_5/sandile/footprint.png diff --git a/graphics/pokemon/sandile/icon.png b/graphics/pokemon/gen_5/sandile/icon.png similarity index 100% rename from graphics/pokemon/sandile/icon.png rename to graphics/pokemon/gen_5/sandile/icon.png diff --git a/graphics/pokemon/sandile/normal.pal b/graphics/pokemon/gen_5/sandile/normal.pal similarity index 100% rename from graphics/pokemon/sandile/normal.pal rename to graphics/pokemon/gen_5/sandile/normal.pal diff --git a/graphics/pokemon/sandile/shiny.pal b/graphics/pokemon/gen_5/sandile/shiny.pal similarity index 100% rename from graphics/pokemon/sandile/shiny.pal rename to graphics/pokemon/gen_5/sandile/shiny.pal diff --git a/graphics/pokemon/sawk/anim_front.png b/graphics/pokemon/gen_5/sawk/anim_front.png similarity index 100% rename from graphics/pokemon/sawk/anim_front.png rename to graphics/pokemon/gen_5/sawk/anim_front.png diff --git a/graphics/pokemon/sawk/back.png b/graphics/pokemon/gen_5/sawk/back.png similarity index 100% rename from graphics/pokemon/sawk/back.png rename to graphics/pokemon/gen_5/sawk/back.png diff --git a/graphics/pokemon/sawk/footprint.png b/graphics/pokemon/gen_5/sawk/footprint.png similarity index 100% rename from graphics/pokemon/sawk/footprint.png rename to graphics/pokemon/gen_5/sawk/footprint.png diff --git a/graphics/pokemon/sawk/icon.png b/graphics/pokemon/gen_5/sawk/icon.png similarity index 100% rename from graphics/pokemon/sawk/icon.png rename to graphics/pokemon/gen_5/sawk/icon.png diff --git a/graphics/pokemon/sawk/normal.pal b/graphics/pokemon/gen_5/sawk/normal.pal similarity index 100% rename from graphics/pokemon/sawk/normal.pal rename to graphics/pokemon/gen_5/sawk/normal.pal diff --git a/graphics/pokemon/sawk/shiny.pal b/graphics/pokemon/gen_5/sawk/shiny.pal similarity index 100% rename from graphics/pokemon/sawk/shiny.pal rename to graphics/pokemon/gen_5/sawk/shiny.pal diff --git a/graphics/pokemon/sawsbuck/anim_front.png b/graphics/pokemon/gen_5/sawsbuck/anim_front.png similarity index 100% rename from graphics/pokemon/sawsbuck/anim_front.png rename to graphics/pokemon/gen_5/sawsbuck/anim_front.png diff --git a/graphics/pokemon/sawsbuck/autumn/back.png b/graphics/pokemon/gen_5/sawsbuck/autumn/back.png similarity index 100% rename from graphics/pokemon/sawsbuck/autumn/back.png rename to graphics/pokemon/gen_5/sawsbuck/autumn/back.png diff --git a/graphics/pokemon/sawsbuck/autumn/front.png b/graphics/pokemon/gen_5/sawsbuck/autumn/front.png similarity index 100% rename from graphics/pokemon/sawsbuck/autumn/front.png rename to graphics/pokemon/gen_5/sawsbuck/autumn/front.png diff --git a/graphics/pokemon/sawsbuck/autumn/icon.png b/graphics/pokemon/gen_5/sawsbuck/autumn/icon.png similarity index 100% rename from graphics/pokemon/sawsbuck/autumn/icon.png rename to graphics/pokemon/gen_5/sawsbuck/autumn/icon.png diff --git a/graphics/pokemon/sawsbuck/autumn/normal.pal b/graphics/pokemon/gen_5/sawsbuck/autumn/normal.pal similarity index 100% rename from graphics/pokemon/sawsbuck/autumn/normal.pal rename to graphics/pokemon/gen_5/sawsbuck/autumn/normal.pal diff --git a/graphics/pokemon/sawsbuck/autumn/shiny.pal b/graphics/pokemon/gen_5/sawsbuck/autumn/shiny.pal similarity index 100% rename from graphics/pokemon/sawsbuck/autumn/shiny.pal rename to graphics/pokemon/gen_5/sawsbuck/autumn/shiny.pal diff --git a/graphics/pokemon/sawsbuck/back.png b/graphics/pokemon/gen_5/sawsbuck/back.png similarity index 100% rename from graphics/pokemon/sawsbuck/back.png rename to graphics/pokemon/gen_5/sawsbuck/back.png diff --git a/graphics/pokemon/sawsbuck/footprint.png b/graphics/pokemon/gen_5/sawsbuck/footprint.png similarity index 100% rename from graphics/pokemon/sawsbuck/footprint.png rename to graphics/pokemon/gen_5/sawsbuck/footprint.png diff --git a/graphics/pokemon/sawsbuck/icon.png b/graphics/pokemon/gen_5/sawsbuck/icon.png similarity index 100% rename from graphics/pokemon/sawsbuck/icon.png rename to graphics/pokemon/gen_5/sawsbuck/icon.png diff --git a/graphics/pokemon/sawsbuck/normal.pal b/graphics/pokemon/gen_5/sawsbuck/normal.pal similarity index 100% rename from graphics/pokemon/sawsbuck/normal.pal rename to graphics/pokemon/gen_5/sawsbuck/normal.pal diff --git a/graphics/pokemon/sawsbuck/shiny.pal b/graphics/pokemon/gen_5/sawsbuck/shiny.pal similarity index 100% rename from graphics/pokemon/sawsbuck/shiny.pal rename to graphics/pokemon/gen_5/sawsbuck/shiny.pal diff --git a/graphics/pokemon/sawsbuck/summer/back.png b/graphics/pokemon/gen_5/sawsbuck/summer/back.png similarity index 100% rename from graphics/pokemon/sawsbuck/summer/back.png rename to graphics/pokemon/gen_5/sawsbuck/summer/back.png diff --git a/graphics/pokemon/sawsbuck/summer/front.png b/graphics/pokemon/gen_5/sawsbuck/summer/front.png similarity index 100% rename from graphics/pokemon/sawsbuck/summer/front.png rename to graphics/pokemon/gen_5/sawsbuck/summer/front.png diff --git a/graphics/pokemon/sawsbuck/summer/icon.png b/graphics/pokemon/gen_5/sawsbuck/summer/icon.png similarity index 100% rename from graphics/pokemon/sawsbuck/summer/icon.png rename to graphics/pokemon/gen_5/sawsbuck/summer/icon.png diff --git a/graphics/pokemon/sawsbuck/summer/normal.pal b/graphics/pokemon/gen_5/sawsbuck/summer/normal.pal similarity index 100% rename from graphics/pokemon/sawsbuck/summer/normal.pal rename to graphics/pokemon/gen_5/sawsbuck/summer/normal.pal diff --git a/graphics/pokemon/sawsbuck/summer/shiny.pal b/graphics/pokemon/gen_5/sawsbuck/summer/shiny.pal similarity index 100% rename from graphics/pokemon/sawsbuck/summer/shiny.pal rename to graphics/pokemon/gen_5/sawsbuck/summer/shiny.pal diff --git a/graphics/pokemon/sawsbuck/winter/back.png b/graphics/pokemon/gen_5/sawsbuck/winter/back.png similarity index 100% rename from graphics/pokemon/sawsbuck/winter/back.png rename to graphics/pokemon/gen_5/sawsbuck/winter/back.png diff --git a/graphics/pokemon/sawsbuck/winter/front.png b/graphics/pokemon/gen_5/sawsbuck/winter/front.png similarity index 100% rename from graphics/pokemon/sawsbuck/winter/front.png rename to graphics/pokemon/gen_5/sawsbuck/winter/front.png diff --git a/graphics/pokemon/sawsbuck/winter/icon.png b/graphics/pokemon/gen_5/sawsbuck/winter/icon.png similarity index 100% rename from graphics/pokemon/sawsbuck/winter/icon.png rename to graphics/pokemon/gen_5/sawsbuck/winter/icon.png diff --git a/graphics/pokemon/sawsbuck/winter/normal.pal b/graphics/pokemon/gen_5/sawsbuck/winter/normal.pal similarity index 100% rename from graphics/pokemon/sawsbuck/winter/normal.pal rename to graphics/pokemon/gen_5/sawsbuck/winter/normal.pal diff --git a/graphics/pokemon/sawsbuck/winter/shiny.pal b/graphics/pokemon/gen_5/sawsbuck/winter/shiny.pal similarity index 100% rename from graphics/pokemon/sawsbuck/winter/shiny.pal rename to graphics/pokemon/gen_5/sawsbuck/winter/shiny.pal diff --git a/graphics/pokemon/scolipede/anim_front.png b/graphics/pokemon/gen_5/scolipede/anim_front.png similarity index 100% rename from graphics/pokemon/scolipede/anim_front.png rename to graphics/pokemon/gen_5/scolipede/anim_front.png diff --git a/graphics/pokemon/scolipede/back.png b/graphics/pokemon/gen_5/scolipede/back.png similarity index 100% rename from graphics/pokemon/scolipede/back.png rename to graphics/pokemon/gen_5/scolipede/back.png diff --git a/graphics/pokemon/scolipede/footprint.png b/graphics/pokemon/gen_5/scolipede/footprint.png similarity index 100% rename from graphics/pokemon/scolipede/footprint.png rename to graphics/pokemon/gen_5/scolipede/footprint.png diff --git a/graphics/pokemon/scolipede/icon.png b/graphics/pokemon/gen_5/scolipede/icon.png similarity index 100% rename from graphics/pokemon/scolipede/icon.png rename to graphics/pokemon/gen_5/scolipede/icon.png diff --git a/graphics/pokemon/scolipede/normal.pal b/graphics/pokemon/gen_5/scolipede/normal.pal similarity index 100% rename from graphics/pokemon/scolipede/normal.pal rename to graphics/pokemon/gen_5/scolipede/normal.pal diff --git a/graphics/pokemon/scolipede/shiny.pal b/graphics/pokemon/gen_5/scolipede/shiny.pal similarity index 100% rename from graphics/pokemon/scolipede/shiny.pal rename to graphics/pokemon/gen_5/scolipede/shiny.pal diff --git a/graphics/pokemon/scrafty/anim_front.png b/graphics/pokemon/gen_5/scrafty/anim_front.png similarity index 100% rename from graphics/pokemon/scrafty/anim_front.png rename to graphics/pokemon/gen_5/scrafty/anim_front.png diff --git a/graphics/pokemon/scrafty/back.png b/graphics/pokemon/gen_5/scrafty/back.png similarity index 100% rename from graphics/pokemon/scrafty/back.png rename to graphics/pokemon/gen_5/scrafty/back.png diff --git a/graphics/pokemon/scrafty/footprint.png b/graphics/pokemon/gen_5/scrafty/footprint.png similarity index 100% rename from graphics/pokemon/scrafty/footprint.png rename to graphics/pokemon/gen_5/scrafty/footprint.png diff --git a/graphics/pokemon/scrafty/icon.png b/graphics/pokemon/gen_5/scrafty/icon.png similarity index 100% rename from graphics/pokemon/scrafty/icon.png rename to graphics/pokemon/gen_5/scrafty/icon.png diff --git a/graphics/pokemon/scrafty/normal.pal b/graphics/pokemon/gen_5/scrafty/normal.pal similarity index 100% rename from graphics/pokemon/scrafty/normal.pal rename to graphics/pokemon/gen_5/scrafty/normal.pal diff --git a/graphics/pokemon/scrafty/shiny.pal b/graphics/pokemon/gen_5/scrafty/shiny.pal similarity index 100% rename from graphics/pokemon/scrafty/shiny.pal rename to graphics/pokemon/gen_5/scrafty/shiny.pal diff --git a/graphics/pokemon/scraggy/anim_front.png b/graphics/pokemon/gen_5/scraggy/anim_front.png similarity index 100% rename from graphics/pokemon/scraggy/anim_front.png rename to graphics/pokemon/gen_5/scraggy/anim_front.png diff --git a/graphics/pokemon/scraggy/back.png b/graphics/pokemon/gen_5/scraggy/back.png similarity index 100% rename from graphics/pokemon/scraggy/back.png rename to graphics/pokemon/gen_5/scraggy/back.png diff --git a/graphics/pokemon/herdier/footprint.png b/graphics/pokemon/gen_5/scraggy/footprint.png similarity index 100% rename from graphics/pokemon/herdier/footprint.png rename to graphics/pokemon/gen_5/scraggy/footprint.png diff --git a/graphics/pokemon/scraggy/icon.png b/graphics/pokemon/gen_5/scraggy/icon.png similarity index 100% rename from graphics/pokemon/scraggy/icon.png rename to graphics/pokemon/gen_5/scraggy/icon.png diff --git a/graphics/pokemon/scraggy/normal.pal b/graphics/pokemon/gen_5/scraggy/normal.pal similarity index 100% rename from graphics/pokemon/scraggy/normal.pal rename to graphics/pokemon/gen_5/scraggy/normal.pal diff --git a/graphics/pokemon/scraggy/shiny.pal b/graphics/pokemon/gen_5/scraggy/shiny.pal similarity index 100% rename from graphics/pokemon/scraggy/shiny.pal rename to graphics/pokemon/gen_5/scraggy/shiny.pal diff --git a/graphics/pokemon/seismitoad/anim_front.png b/graphics/pokemon/gen_5/seismitoad/anim_front.png similarity index 100% rename from graphics/pokemon/seismitoad/anim_front.png rename to graphics/pokemon/gen_5/seismitoad/anim_front.png diff --git a/graphics/pokemon/seismitoad/back.png b/graphics/pokemon/gen_5/seismitoad/back.png similarity index 100% rename from graphics/pokemon/seismitoad/back.png rename to graphics/pokemon/gen_5/seismitoad/back.png diff --git a/graphics/pokemon/seismitoad/footprint.png b/graphics/pokemon/gen_5/seismitoad/footprint.png similarity index 100% rename from graphics/pokemon/seismitoad/footprint.png rename to graphics/pokemon/gen_5/seismitoad/footprint.png diff --git a/graphics/pokemon/seismitoad/icon.png b/graphics/pokemon/gen_5/seismitoad/icon.png similarity index 100% rename from graphics/pokemon/seismitoad/icon.png rename to graphics/pokemon/gen_5/seismitoad/icon.png diff --git a/graphics/pokemon/seismitoad/normal.pal b/graphics/pokemon/gen_5/seismitoad/normal.pal similarity index 100% rename from graphics/pokemon/seismitoad/normal.pal rename to graphics/pokemon/gen_5/seismitoad/normal.pal diff --git a/graphics/pokemon/seismitoad/shiny.pal b/graphics/pokemon/gen_5/seismitoad/shiny.pal similarity index 100% rename from graphics/pokemon/seismitoad/shiny.pal rename to graphics/pokemon/gen_5/seismitoad/shiny.pal diff --git a/graphics/pokemon/serperior/anim_front.png b/graphics/pokemon/gen_5/serperior/anim_front.png similarity index 100% rename from graphics/pokemon/serperior/anim_front.png rename to graphics/pokemon/gen_5/serperior/anim_front.png diff --git a/graphics/pokemon/serperior/back.png b/graphics/pokemon/gen_5/serperior/back.png similarity index 100% rename from graphics/pokemon/serperior/back.png rename to graphics/pokemon/gen_5/serperior/back.png diff --git a/graphics/pokemon/onix/footprint.png b/graphics/pokemon/gen_5/serperior/footprint.png similarity index 100% rename from graphics/pokemon/onix/footprint.png rename to graphics/pokemon/gen_5/serperior/footprint.png diff --git a/graphics/pokemon/serperior/icon.png b/graphics/pokemon/gen_5/serperior/icon.png similarity index 100% rename from graphics/pokemon/serperior/icon.png rename to graphics/pokemon/gen_5/serperior/icon.png diff --git a/graphics/pokemon/serperior/normal.pal b/graphics/pokemon/gen_5/serperior/normal.pal similarity index 100% rename from graphics/pokemon/serperior/normal.pal rename to graphics/pokemon/gen_5/serperior/normal.pal diff --git a/graphics/pokemon/serperior/shiny.pal b/graphics/pokemon/gen_5/serperior/shiny.pal similarity index 100% rename from graphics/pokemon/serperior/shiny.pal rename to graphics/pokemon/gen_5/serperior/shiny.pal diff --git a/graphics/pokemon/servine/anim_front.png b/graphics/pokemon/gen_5/servine/anim_front.png similarity index 100% rename from graphics/pokemon/servine/anim_front.png rename to graphics/pokemon/gen_5/servine/anim_front.png diff --git a/graphics/pokemon/servine/back.png b/graphics/pokemon/gen_5/servine/back.png similarity index 100% rename from graphics/pokemon/servine/back.png rename to graphics/pokemon/gen_5/servine/back.png diff --git a/graphics/pokemon/servine/footprint.png b/graphics/pokemon/gen_5/servine/footprint.png similarity index 100% rename from graphics/pokemon/servine/footprint.png rename to graphics/pokemon/gen_5/servine/footprint.png diff --git a/graphics/pokemon/servine/icon.png b/graphics/pokemon/gen_5/servine/icon.png similarity index 100% rename from graphics/pokemon/servine/icon.png rename to graphics/pokemon/gen_5/servine/icon.png diff --git a/graphics/pokemon/servine/normal.pal b/graphics/pokemon/gen_5/servine/normal.pal similarity index 100% rename from graphics/pokemon/servine/normal.pal rename to graphics/pokemon/gen_5/servine/normal.pal diff --git a/graphics/pokemon/servine/shiny.pal b/graphics/pokemon/gen_5/servine/shiny.pal similarity index 100% rename from graphics/pokemon/servine/shiny.pal rename to graphics/pokemon/gen_5/servine/shiny.pal diff --git a/graphics/pokemon/sewaddle/anim_front.png b/graphics/pokemon/gen_5/sewaddle/anim_front.png similarity index 100% rename from graphics/pokemon/sewaddle/anim_front.png rename to graphics/pokemon/gen_5/sewaddle/anim_front.png diff --git a/graphics/pokemon/sewaddle/back.png b/graphics/pokemon/gen_5/sewaddle/back.png similarity index 100% rename from graphics/pokemon/sewaddle/back.png rename to graphics/pokemon/gen_5/sewaddle/back.png diff --git a/graphics/pokemon/fennekin/footprint.png b/graphics/pokemon/gen_5/sewaddle/footprint.png similarity index 100% rename from graphics/pokemon/fennekin/footprint.png rename to graphics/pokemon/gen_5/sewaddle/footprint.png diff --git a/graphics/pokemon/sewaddle/icon.png b/graphics/pokemon/gen_5/sewaddle/icon.png similarity index 100% rename from graphics/pokemon/sewaddle/icon.png rename to graphics/pokemon/gen_5/sewaddle/icon.png diff --git a/graphics/pokemon/sewaddle/normal.pal b/graphics/pokemon/gen_5/sewaddle/normal.pal similarity index 100% rename from graphics/pokemon/sewaddle/normal.pal rename to graphics/pokemon/gen_5/sewaddle/normal.pal diff --git a/graphics/pokemon/sewaddle/shiny.pal b/graphics/pokemon/gen_5/sewaddle/shiny.pal similarity index 100% rename from graphics/pokemon/sewaddle/shiny.pal rename to graphics/pokemon/gen_5/sewaddle/shiny.pal diff --git a/graphics/pokemon/shelmet/anim_front.png b/graphics/pokemon/gen_5/shelmet/anim_front.png similarity index 100% rename from graphics/pokemon/shelmet/anim_front.png rename to graphics/pokemon/gen_5/shelmet/anim_front.png diff --git a/graphics/pokemon/shelmet/back.png b/graphics/pokemon/gen_5/shelmet/back.png similarity index 100% rename from graphics/pokemon/shelmet/back.png rename to graphics/pokemon/gen_5/shelmet/back.png diff --git a/graphics/pokemon/fomantis/footprint.png b/graphics/pokemon/gen_5/shelmet/footprint.png similarity index 100% rename from graphics/pokemon/fomantis/footprint.png rename to graphics/pokemon/gen_5/shelmet/footprint.png diff --git a/graphics/pokemon/shelmet/icon.png b/graphics/pokemon/gen_5/shelmet/icon.png similarity index 100% rename from graphics/pokemon/shelmet/icon.png rename to graphics/pokemon/gen_5/shelmet/icon.png diff --git a/graphics/pokemon/shelmet/normal.pal b/graphics/pokemon/gen_5/shelmet/normal.pal similarity index 100% rename from graphics/pokemon/shelmet/normal.pal rename to graphics/pokemon/gen_5/shelmet/normal.pal diff --git a/graphics/pokemon/shelmet/shiny.pal b/graphics/pokemon/gen_5/shelmet/shiny.pal similarity index 100% rename from graphics/pokemon/shelmet/shiny.pal rename to graphics/pokemon/gen_5/shelmet/shiny.pal diff --git a/graphics/pokemon/sigilyph/anim_front.png b/graphics/pokemon/gen_5/sigilyph/anim_front.png similarity index 100% rename from graphics/pokemon/sigilyph/anim_front.png rename to graphics/pokemon/gen_5/sigilyph/anim_front.png diff --git a/graphics/pokemon/sigilyph/back.png b/graphics/pokemon/gen_5/sigilyph/back.png similarity index 100% rename from graphics/pokemon/sigilyph/back.png rename to graphics/pokemon/gen_5/sigilyph/back.png diff --git a/graphics/pokemon/palossand/footprint.png b/graphics/pokemon/gen_5/sigilyph/footprint.png similarity index 100% rename from graphics/pokemon/palossand/footprint.png rename to graphics/pokemon/gen_5/sigilyph/footprint.png diff --git a/graphics/pokemon/sigilyph/icon.png b/graphics/pokemon/gen_5/sigilyph/icon.png similarity index 100% rename from graphics/pokemon/sigilyph/icon.png rename to graphics/pokemon/gen_5/sigilyph/icon.png diff --git a/graphics/pokemon/sigilyph/normal.pal b/graphics/pokemon/gen_5/sigilyph/normal.pal similarity index 100% rename from graphics/pokemon/sigilyph/normal.pal rename to graphics/pokemon/gen_5/sigilyph/normal.pal diff --git a/graphics/pokemon/sigilyph/shiny.pal b/graphics/pokemon/gen_5/sigilyph/shiny.pal similarity index 100% rename from graphics/pokemon/sigilyph/shiny.pal rename to graphics/pokemon/gen_5/sigilyph/shiny.pal diff --git a/graphics/pokemon/simipour/anim_front.png b/graphics/pokemon/gen_5/simipour/anim_front.png similarity index 100% rename from graphics/pokemon/simipour/anim_front.png rename to graphics/pokemon/gen_5/simipour/anim_front.png diff --git a/graphics/pokemon/simipour/back.png b/graphics/pokemon/gen_5/simipour/back.png similarity index 100% rename from graphics/pokemon/simipour/back.png rename to graphics/pokemon/gen_5/simipour/back.png diff --git a/graphics/pokemon/simipour/footprint.png b/graphics/pokemon/gen_5/simipour/footprint.png similarity index 100% rename from graphics/pokemon/simipour/footprint.png rename to graphics/pokemon/gen_5/simipour/footprint.png diff --git a/graphics/pokemon/simipour/icon.png b/graphics/pokemon/gen_5/simipour/icon.png similarity index 100% rename from graphics/pokemon/simipour/icon.png rename to graphics/pokemon/gen_5/simipour/icon.png diff --git a/graphics/pokemon/simipour/normal.pal b/graphics/pokemon/gen_5/simipour/normal.pal similarity index 100% rename from graphics/pokemon/simipour/normal.pal rename to graphics/pokemon/gen_5/simipour/normal.pal diff --git a/graphics/pokemon/simipour/shiny.pal b/graphics/pokemon/gen_5/simipour/shiny.pal similarity index 100% rename from graphics/pokemon/simipour/shiny.pal rename to graphics/pokemon/gen_5/simipour/shiny.pal diff --git a/graphics/pokemon/simisage/anim_front.png b/graphics/pokemon/gen_5/simisage/anim_front.png similarity index 100% rename from graphics/pokemon/simisage/anim_front.png rename to graphics/pokemon/gen_5/simisage/anim_front.png diff --git a/graphics/pokemon/simisage/back.png b/graphics/pokemon/gen_5/simisage/back.png similarity index 100% rename from graphics/pokemon/simisage/back.png rename to graphics/pokemon/gen_5/simisage/back.png diff --git a/graphics/pokemon/simisage/footprint.png b/graphics/pokemon/gen_5/simisage/footprint.png similarity index 100% rename from graphics/pokemon/simisage/footprint.png rename to graphics/pokemon/gen_5/simisage/footprint.png diff --git a/graphics/pokemon/simisage/icon.png b/graphics/pokemon/gen_5/simisage/icon.png similarity index 100% rename from graphics/pokemon/simisage/icon.png rename to graphics/pokemon/gen_5/simisage/icon.png diff --git a/graphics/pokemon/simisage/normal.pal b/graphics/pokemon/gen_5/simisage/normal.pal similarity index 100% rename from graphics/pokemon/simisage/normal.pal rename to graphics/pokemon/gen_5/simisage/normal.pal diff --git a/graphics/pokemon/simisage/shiny.pal b/graphics/pokemon/gen_5/simisage/shiny.pal similarity index 100% rename from graphics/pokemon/simisage/shiny.pal rename to graphics/pokemon/gen_5/simisage/shiny.pal diff --git a/graphics/pokemon/simisear/anim_front.png b/graphics/pokemon/gen_5/simisear/anim_front.png similarity index 100% rename from graphics/pokemon/simisear/anim_front.png rename to graphics/pokemon/gen_5/simisear/anim_front.png diff --git a/graphics/pokemon/simisear/back.png b/graphics/pokemon/gen_5/simisear/back.png similarity index 100% rename from graphics/pokemon/simisear/back.png rename to graphics/pokemon/gen_5/simisear/back.png diff --git a/graphics/pokemon/simisear/footprint.png b/graphics/pokemon/gen_5/simisear/footprint.png similarity index 100% rename from graphics/pokemon/simisear/footprint.png rename to graphics/pokemon/gen_5/simisear/footprint.png diff --git a/graphics/pokemon/simisear/icon.png b/graphics/pokemon/gen_5/simisear/icon.png similarity index 100% rename from graphics/pokemon/simisear/icon.png rename to graphics/pokemon/gen_5/simisear/icon.png diff --git a/graphics/pokemon/simisear/normal.pal b/graphics/pokemon/gen_5/simisear/normal.pal similarity index 100% rename from graphics/pokemon/simisear/normal.pal rename to graphics/pokemon/gen_5/simisear/normal.pal diff --git a/graphics/pokemon/simisear/shiny.pal b/graphics/pokemon/gen_5/simisear/shiny.pal similarity index 100% rename from graphics/pokemon/simisear/shiny.pal rename to graphics/pokemon/gen_5/simisear/shiny.pal diff --git a/graphics/pokemon/snivy/anim_front.png b/graphics/pokemon/gen_5/snivy/anim_front.png similarity index 100% rename from graphics/pokemon/snivy/anim_front.png rename to graphics/pokemon/gen_5/snivy/anim_front.png diff --git a/graphics/pokemon/snivy/back.png b/graphics/pokemon/gen_5/snivy/back.png similarity index 100% rename from graphics/pokemon/snivy/back.png rename to graphics/pokemon/gen_5/snivy/back.png diff --git a/graphics/pokemon/snivy/footprint.png b/graphics/pokemon/gen_5/snivy/footprint.png similarity index 100% rename from graphics/pokemon/snivy/footprint.png rename to graphics/pokemon/gen_5/snivy/footprint.png diff --git a/graphics/pokemon/snivy/icon.png b/graphics/pokemon/gen_5/snivy/icon.png similarity index 100% rename from graphics/pokemon/snivy/icon.png rename to graphics/pokemon/gen_5/snivy/icon.png diff --git a/graphics/pokemon/snivy/normal.pal b/graphics/pokemon/gen_5/snivy/normal.pal similarity index 100% rename from graphics/pokemon/snivy/normal.pal rename to graphics/pokemon/gen_5/snivy/normal.pal diff --git a/graphics/pokemon/snivy/shiny.pal b/graphics/pokemon/gen_5/snivy/shiny.pal similarity index 100% rename from graphics/pokemon/snivy/shiny.pal rename to graphics/pokemon/gen_5/snivy/shiny.pal diff --git a/graphics/pokemon/solosis/anim_front.png b/graphics/pokemon/gen_5/solosis/anim_front.png similarity index 100% rename from graphics/pokemon/solosis/anim_front.png rename to graphics/pokemon/gen_5/solosis/anim_front.png diff --git a/graphics/pokemon/solosis/back.png b/graphics/pokemon/gen_5/solosis/back.png similarity index 100% rename from graphics/pokemon/solosis/back.png rename to graphics/pokemon/gen_5/solosis/back.png diff --git a/graphics/pokemon/petilil/footprint.png b/graphics/pokemon/gen_5/solosis/footprint.png similarity index 100% rename from graphics/pokemon/petilil/footprint.png rename to graphics/pokemon/gen_5/solosis/footprint.png diff --git a/graphics/pokemon/solosis/icon.png b/graphics/pokemon/gen_5/solosis/icon.png similarity index 100% rename from graphics/pokemon/solosis/icon.png rename to graphics/pokemon/gen_5/solosis/icon.png diff --git a/graphics/pokemon/solosis/normal.pal b/graphics/pokemon/gen_5/solosis/normal.pal similarity index 100% rename from graphics/pokemon/solosis/normal.pal rename to graphics/pokemon/gen_5/solosis/normal.pal diff --git a/graphics/pokemon/solosis/shiny.pal b/graphics/pokemon/gen_5/solosis/shiny.pal similarity index 100% rename from graphics/pokemon/solosis/shiny.pal rename to graphics/pokemon/gen_5/solosis/shiny.pal diff --git a/graphics/pokemon/stoutland/anim_front.png b/graphics/pokemon/gen_5/stoutland/anim_front.png similarity index 100% rename from graphics/pokemon/stoutland/anim_front.png rename to graphics/pokemon/gen_5/stoutland/anim_front.png diff --git a/graphics/pokemon/stoutland/back.png b/graphics/pokemon/gen_5/stoutland/back.png similarity index 100% rename from graphics/pokemon/stoutland/back.png rename to graphics/pokemon/gen_5/stoutland/back.png diff --git a/graphics/pokemon/stoutland/footprint.png b/graphics/pokemon/gen_5/stoutland/footprint.png similarity index 100% rename from graphics/pokemon/stoutland/footprint.png rename to graphics/pokemon/gen_5/stoutland/footprint.png diff --git a/graphics/pokemon/stoutland/icon.png b/graphics/pokemon/gen_5/stoutland/icon.png similarity index 100% rename from graphics/pokemon/stoutland/icon.png rename to graphics/pokemon/gen_5/stoutland/icon.png diff --git a/graphics/pokemon/stoutland/normal.pal b/graphics/pokemon/gen_5/stoutland/normal.pal similarity index 100% rename from graphics/pokemon/stoutland/normal.pal rename to graphics/pokemon/gen_5/stoutland/normal.pal diff --git a/graphics/pokemon/stoutland/shiny.pal b/graphics/pokemon/gen_5/stoutland/shiny.pal similarity index 100% rename from graphics/pokemon/stoutland/shiny.pal rename to graphics/pokemon/gen_5/stoutland/shiny.pal diff --git a/graphics/pokemon/stunfisk/anim_front.png b/graphics/pokemon/gen_5/stunfisk/anim_front.png similarity index 100% rename from graphics/pokemon/stunfisk/anim_front.png rename to graphics/pokemon/gen_5/stunfisk/anim_front.png diff --git a/graphics/pokemon/stunfisk/back.png b/graphics/pokemon/gen_5/stunfisk/back.png similarity index 100% rename from graphics/pokemon/stunfisk/back.png rename to graphics/pokemon/gen_5/stunfisk/back.png diff --git a/graphics/pokemon/phantump/footprint.png b/graphics/pokemon/gen_5/stunfisk/footprint.png similarity index 100% rename from graphics/pokemon/phantump/footprint.png rename to graphics/pokemon/gen_5/stunfisk/footprint.png diff --git a/graphics/pokemon/stunfisk/galarian/back.png b/graphics/pokemon/gen_5/stunfisk/galarian/back.png similarity index 100% rename from graphics/pokemon/stunfisk/galarian/back.png rename to graphics/pokemon/gen_5/stunfisk/galarian/back.png diff --git a/graphics/pokemon/stunfisk/galarian/front.png b/graphics/pokemon/gen_5/stunfisk/galarian/front.png similarity index 100% rename from graphics/pokemon/stunfisk/galarian/front.png rename to graphics/pokemon/gen_5/stunfisk/galarian/front.png diff --git a/graphics/pokemon/stunfisk/galarian/icon.png b/graphics/pokemon/gen_5/stunfisk/galarian/icon.png similarity index 100% rename from graphics/pokemon/stunfisk/galarian/icon.png rename to graphics/pokemon/gen_5/stunfisk/galarian/icon.png diff --git a/graphics/pokemon/stunfisk/galarian/normal.pal b/graphics/pokemon/gen_5/stunfisk/galarian/normal.pal similarity index 100% rename from graphics/pokemon/stunfisk/galarian/normal.pal rename to graphics/pokemon/gen_5/stunfisk/galarian/normal.pal diff --git a/graphics/pokemon/stunfisk/galarian/shiny.pal b/graphics/pokemon/gen_5/stunfisk/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/stunfisk/galarian/shiny.pal rename to graphics/pokemon/gen_5/stunfisk/galarian/shiny.pal diff --git a/graphics/pokemon/stunfisk/icon.png b/graphics/pokemon/gen_5/stunfisk/icon.png similarity index 100% rename from graphics/pokemon/stunfisk/icon.png rename to graphics/pokemon/gen_5/stunfisk/icon.png diff --git a/graphics/pokemon/stunfisk/normal.pal b/graphics/pokemon/gen_5/stunfisk/normal.pal similarity index 100% rename from graphics/pokemon/stunfisk/normal.pal rename to graphics/pokemon/gen_5/stunfisk/normal.pal diff --git a/graphics/pokemon/stunfisk/shiny.pal b/graphics/pokemon/gen_5/stunfisk/shiny.pal similarity index 100% rename from graphics/pokemon/stunfisk/shiny.pal rename to graphics/pokemon/gen_5/stunfisk/shiny.pal diff --git a/graphics/pokemon/swadloon/anim_front.png b/graphics/pokemon/gen_5/swadloon/anim_front.png similarity index 100% rename from graphics/pokemon/swadloon/anim_front.png rename to graphics/pokemon/gen_5/swadloon/anim_front.png diff --git a/graphics/pokemon/swadloon/back.png b/graphics/pokemon/gen_5/swadloon/back.png similarity index 100% rename from graphics/pokemon/swadloon/back.png rename to graphics/pokemon/gen_5/swadloon/back.png diff --git a/graphics/pokemon/phione/footprint.png b/graphics/pokemon/gen_5/swadloon/footprint.png similarity index 100% rename from graphics/pokemon/phione/footprint.png rename to graphics/pokemon/gen_5/swadloon/footprint.png diff --git a/graphics/pokemon/swadloon/icon.png b/graphics/pokemon/gen_5/swadloon/icon.png similarity index 100% rename from graphics/pokemon/swadloon/icon.png rename to graphics/pokemon/gen_5/swadloon/icon.png diff --git a/graphics/pokemon/swadloon/normal.pal b/graphics/pokemon/gen_5/swadloon/normal.pal similarity index 100% rename from graphics/pokemon/swadloon/normal.pal rename to graphics/pokemon/gen_5/swadloon/normal.pal diff --git a/graphics/pokemon/swadloon/shiny.pal b/graphics/pokemon/gen_5/swadloon/shiny.pal similarity index 100% rename from graphics/pokemon/swadloon/shiny.pal rename to graphics/pokemon/gen_5/swadloon/shiny.pal diff --git a/graphics/pokemon/swanna/anim_front.png b/graphics/pokemon/gen_5/swanna/anim_front.png similarity index 100% rename from graphics/pokemon/swanna/anim_front.png rename to graphics/pokemon/gen_5/swanna/anim_front.png diff --git a/graphics/pokemon/swanna/back.png b/graphics/pokemon/gen_5/swanna/back.png similarity index 100% rename from graphics/pokemon/swanna/back.png rename to graphics/pokemon/gen_5/swanna/back.png diff --git a/graphics/pokemon/swanna/footprint.png b/graphics/pokemon/gen_5/swanna/footprint.png similarity index 100% rename from graphics/pokemon/swanna/footprint.png rename to graphics/pokemon/gen_5/swanna/footprint.png diff --git a/graphics/pokemon/swanna/icon.png b/graphics/pokemon/gen_5/swanna/icon.png similarity index 100% rename from graphics/pokemon/swanna/icon.png rename to graphics/pokemon/gen_5/swanna/icon.png diff --git a/graphics/pokemon/swanna/normal.pal b/graphics/pokemon/gen_5/swanna/normal.pal similarity index 100% rename from graphics/pokemon/swanna/normal.pal rename to graphics/pokemon/gen_5/swanna/normal.pal diff --git a/graphics/pokemon/swanna/shiny.pal b/graphics/pokemon/gen_5/swanna/shiny.pal similarity index 100% rename from graphics/pokemon/swanna/shiny.pal rename to graphics/pokemon/gen_5/swanna/shiny.pal diff --git a/graphics/pokemon/swoobat/anim_front.png b/graphics/pokemon/gen_5/swoobat/anim_front.png similarity index 100% rename from graphics/pokemon/swoobat/anim_front.png rename to graphics/pokemon/gen_5/swoobat/anim_front.png diff --git a/graphics/pokemon/swoobat/back.png b/graphics/pokemon/gen_5/swoobat/back.png similarity index 100% rename from graphics/pokemon/swoobat/back.png rename to graphics/pokemon/gen_5/swoobat/back.png diff --git a/graphics/pokemon/swoobat/footprint.png b/graphics/pokemon/gen_5/swoobat/footprint.png similarity index 100% rename from graphics/pokemon/swoobat/footprint.png rename to graphics/pokemon/gen_5/swoobat/footprint.png diff --git a/graphics/pokemon/swoobat/icon.png b/graphics/pokemon/gen_5/swoobat/icon.png similarity index 100% rename from graphics/pokemon/swoobat/icon.png rename to graphics/pokemon/gen_5/swoobat/icon.png diff --git a/graphics/pokemon/swoobat/normal.pal b/graphics/pokemon/gen_5/swoobat/normal.pal similarity index 100% rename from graphics/pokemon/swoobat/normal.pal rename to graphics/pokemon/gen_5/swoobat/normal.pal diff --git a/graphics/pokemon/swoobat/shiny.pal b/graphics/pokemon/gen_5/swoobat/shiny.pal similarity index 100% rename from graphics/pokemon/swoobat/shiny.pal rename to graphics/pokemon/gen_5/swoobat/shiny.pal diff --git a/graphics/pokemon/tepig/anim_front.png b/graphics/pokemon/gen_5/tepig/anim_front.png similarity index 100% rename from graphics/pokemon/tepig/anim_front.png rename to graphics/pokemon/gen_5/tepig/anim_front.png diff --git a/graphics/pokemon/tepig/back.png b/graphics/pokemon/gen_5/tepig/back.png similarity index 100% rename from graphics/pokemon/tepig/back.png rename to graphics/pokemon/gen_5/tepig/back.png diff --git a/graphics/pokemon/tepig/footprint.png b/graphics/pokemon/gen_5/tepig/footprint.png similarity index 100% rename from graphics/pokemon/tepig/footprint.png rename to graphics/pokemon/gen_5/tepig/footprint.png diff --git a/graphics/pokemon/tepig/icon.png b/graphics/pokemon/gen_5/tepig/icon.png similarity index 100% rename from graphics/pokemon/tepig/icon.png rename to graphics/pokemon/gen_5/tepig/icon.png diff --git a/graphics/pokemon/tepig/normal.pal b/graphics/pokemon/gen_5/tepig/normal.pal similarity index 100% rename from graphics/pokemon/tepig/normal.pal rename to graphics/pokemon/gen_5/tepig/normal.pal diff --git a/graphics/pokemon/tepig/shiny.pal b/graphics/pokemon/gen_5/tepig/shiny.pal similarity index 100% rename from graphics/pokemon/tepig/shiny.pal rename to graphics/pokemon/gen_5/tepig/shiny.pal diff --git a/graphics/pokemon/terrakion/anim_front.png b/graphics/pokemon/gen_5/terrakion/anim_front.png similarity index 100% rename from graphics/pokemon/terrakion/anim_front.png rename to graphics/pokemon/gen_5/terrakion/anim_front.png diff --git a/graphics/pokemon/terrakion/back.png b/graphics/pokemon/gen_5/terrakion/back.png similarity index 100% rename from graphics/pokemon/terrakion/back.png rename to graphics/pokemon/gen_5/terrakion/back.png diff --git a/graphics/pokemon/terrakion/footprint.png b/graphics/pokemon/gen_5/terrakion/footprint.png similarity index 100% rename from graphics/pokemon/terrakion/footprint.png rename to graphics/pokemon/gen_5/terrakion/footprint.png diff --git a/graphics/pokemon/terrakion/icon.png b/graphics/pokemon/gen_5/terrakion/icon.png similarity index 100% rename from graphics/pokemon/terrakion/icon.png rename to graphics/pokemon/gen_5/terrakion/icon.png diff --git a/graphics/pokemon/terrakion/normal.pal b/graphics/pokemon/gen_5/terrakion/normal.pal similarity index 100% rename from graphics/pokemon/terrakion/normal.pal rename to graphics/pokemon/gen_5/terrakion/normal.pal diff --git a/graphics/pokemon/terrakion/shiny.pal b/graphics/pokemon/gen_5/terrakion/shiny.pal similarity index 100% rename from graphics/pokemon/terrakion/shiny.pal rename to graphics/pokemon/gen_5/terrakion/shiny.pal diff --git a/graphics/pokemon/throh/anim_front.png b/graphics/pokemon/gen_5/throh/anim_front.png similarity index 100% rename from graphics/pokemon/throh/anim_front.png rename to graphics/pokemon/gen_5/throh/anim_front.png diff --git a/graphics/pokemon/throh/back.png b/graphics/pokemon/gen_5/throh/back.png similarity index 100% rename from graphics/pokemon/throh/back.png rename to graphics/pokemon/gen_5/throh/back.png diff --git a/graphics/pokemon/throh/footprint.png b/graphics/pokemon/gen_5/throh/footprint.png similarity index 100% rename from graphics/pokemon/throh/footprint.png rename to graphics/pokemon/gen_5/throh/footprint.png diff --git a/graphics/pokemon/throh/icon.png b/graphics/pokemon/gen_5/throh/icon.png similarity index 100% rename from graphics/pokemon/throh/icon.png rename to graphics/pokemon/gen_5/throh/icon.png diff --git a/graphics/pokemon/throh/normal.pal b/graphics/pokemon/gen_5/throh/normal.pal similarity index 100% rename from graphics/pokemon/throh/normal.pal rename to graphics/pokemon/gen_5/throh/normal.pal diff --git a/graphics/pokemon/throh/shiny.pal b/graphics/pokemon/gen_5/throh/shiny.pal similarity index 100% rename from graphics/pokemon/throh/shiny.pal rename to graphics/pokemon/gen_5/throh/shiny.pal diff --git a/graphics/pokemon/thundurus/anim_front.png b/graphics/pokemon/gen_5/thundurus/anim_front.png similarity index 100% rename from graphics/pokemon/thundurus/anim_front.png rename to graphics/pokemon/gen_5/thundurus/anim_front.png diff --git a/graphics/pokemon/thundurus/back.png b/graphics/pokemon/gen_5/thundurus/back.png similarity index 100% rename from graphics/pokemon/thundurus/back.png rename to graphics/pokemon/gen_5/thundurus/back.png diff --git a/graphics/pokemon/pineco/footprint.png b/graphics/pokemon/gen_5/thundurus/footprint.png similarity index 100% rename from graphics/pokemon/pineco/footprint.png rename to graphics/pokemon/gen_5/thundurus/footprint.png diff --git a/graphics/pokemon/thundurus/icon.png b/graphics/pokemon/gen_5/thundurus/icon.png similarity index 100% rename from graphics/pokemon/thundurus/icon.png rename to graphics/pokemon/gen_5/thundurus/icon.png diff --git a/graphics/pokemon/thundurus/normal.pal b/graphics/pokemon/gen_5/thundurus/normal.pal similarity index 100% rename from graphics/pokemon/thundurus/normal.pal rename to graphics/pokemon/gen_5/thundurus/normal.pal diff --git a/graphics/pokemon/thundurus/shiny.pal b/graphics/pokemon/gen_5/thundurus/shiny.pal similarity index 100% rename from graphics/pokemon/thundurus/shiny.pal rename to graphics/pokemon/gen_5/thundurus/shiny.pal diff --git a/graphics/pokemon/thundurus/therian/anim_front.png b/graphics/pokemon/gen_5/thundurus/therian/anim_front.png similarity index 100% rename from graphics/pokemon/thundurus/therian/anim_front.png rename to graphics/pokemon/gen_5/thundurus/therian/anim_front.png diff --git a/graphics/pokemon/thundurus/therian/back.png b/graphics/pokemon/gen_5/thundurus/therian/back.png similarity index 100% rename from graphics/pokemon/thundurus/therian/back.png rename to graphics/pokemon/gen_5/thundurus/therian/back.png diff --git a/graphics/pokemon/thundurus/therian/icon.png b/graphics/pokemon/gen_5/thundurus/therian/icon.png similarity index 100% rename from graphics/pokemon/thundurus/therian/icon.png rename to graphics/pokemon/gen_5/thundurus/therian/icon.png diff --git a/graphics/pokemon/thundurus/therian/normal.pal b/graphics/pokemon/gen_5/thundurus/therian/normal.pal similarity index 100% rename from graphics/pokemon/thundurus/therian/normal.pal rename to graphics/pokemon/gen_5/thundurus/therian/normal.pal diff --git a/graphics/pokemon/thundurus/therian/shiny.pal b/graphics/pokemon/gen_5/thundurus/therian/shiny.pal similarity index 100% rename from graphics/pokemon/thundurus/therian/shiny.pal rename to graphics/pokemon/gen_5/thundurus/therian/shiny.pal diff --git a/graphics/pokemon/timburr/anim_front.png b/graphics/pokemon/gen_5/timburr/anim_front.png similarity index 100% rename from graphics/pokemon/timburr/anim_front.png rename to graphics/pokemon/gen_5/timburr/anim_front.png diff --git a/graphics/pokemon/timburr/back.png b/graphics/pokemon/gen_5/timburr/back.png similarity index 100% rename from graphics/pokemon/timburr/back.png rename to graphics/pokemon/gen_5/timburr/back.png diff --git a/graphics/pokemon/timburr/footprint.png b/graphics/pokemon/gen_5/timburr/footprint.png similarity index 100% rename from graphics/pokemon/timburr/footprint.png rename to graphics/pokemon/gen_5/timburr/footprint.png diff --git a/graphics/pokemon/timburr/icon.png b/graphics/pokemon/gen_5/timburr/icon.png similarity index 100% rename from graphics/pokemon/timburr/icon.png rename to graphics/pokemon/gen_5/timburr/icon.png diff --git a/graphics/pokemon/timburr/normal.pal b/graphics/pokemon/gen_5/timburr/normal.pal similarity index 100% rename from graphics/pokemon/timburr/normal.pal rename to graphics/pokemon/gen_5/timburr/normal.pal diff --git a/graphics/pokemon/timburr/shiny.pal b/graphics/pokemon/gen_5/timburr/shiny.pal similarity index 100% rename from graphics/pokemon/timburr/shiny.pal rename to graphics/pokemon/gen_5/timburr/shiny.pal diff --git a/graphics/pokemon/tirtouga/anim_front.png b/graphics/pokemon/gen_5/tirtouga/anim_front.png similarity index 100% rename from graphics/pokemon/tirtouga/anim_front.png rename to graphics/pokemon/gen_5/tirtouga/anim_front.png diff --git a/graphics/pokemon/tirtouga/back.png b/graphics/pokemon/gen_5/tirtouga/back.png similarity index 100% rename from graphics/pokemon/tirtouga/back.png rename to graphics/pokemon/gen_5/tirtouga/back.png diff --git a/graphics/pokemon/popplio/footprint.png b/graphics/pokemon/gen_5/tirtouga/footprint.png similarity index 100% rename from graphics/pokemon/popplio/footprint.png rename to graphics/pokemon/gen_5/tirtouga/footprint.png diff --git a/graphics/pokemon/tirtouga/icon.png b/graphics/pokemon/gen_5/tirtouga/icon.png similarity index 100% rename from graphics/pokemon/tirtouga/icon.png rename to graphics/pokemon/gen_5/tirtouga/icon.png diff --git a/graphics/pokemon/tirtouga/normal.pal b/graphics/pokemon/gen_5/tirtouga/normal.pal similarity index 100% rename from graphics/pokemon/tirtouga/normal.pal rename to graphics/pokemon/gen_5/tirtouga/normal.pal diff --git a/graphics/pokemon/tirtouga/shiny.pal b/graphics/pokemon/gen_5/tirtouga/shiny.pal similarity index 100% rename from graphics/pokemon/tirtouga/shiny.pal rename to graphics/pokemon/gen_5/tirtouga/shiny.pal diff --git a/graphics/pokemon/tornadus/anim_front.png b/graphics/pokemon/gen_5/tornadus/anim_front.png similarity index 100% rename from graphics/pokemon/tornadus/anim_front.png rename to graphics/pokemon/gen_5/tornadus/anim_front.png diff --git a/graphics/pokemon/tornadus/back.png b/graphics/pokemon/gen_5/tornadus/back.png similarity index 100% rename from graphics/pokemon/tornadus/back.png rename to graphics/pokemon/gen_5/tornadus/back.png diff --git a/graphics/pokemon/primarina/footprint.png b/graphics/pokemon/gen_5/tornadus/footprint.png similarity index 100% rename from graphics/pokemon/primarina/footprint.png rename to graphics/pokemon/gen_5/tornadus/footprint.png diff --git a/graphics/pokemon/tornadus/icon.png b/graphics/pokemon/gen_5/tornadus/icon.png similarity index 100% rename from graphics/pokemon/tornadus/icon.png rename to graphics/pokemon/gen_5/tornadus/icon.png diff --git a/graphics/pokemon/tornadus/normal.pal b/graphics/pokemon/gen_5/tornadus/normal.pal similarity index 100% rename from graphics/pokemon/tornadus/normal.pal rename to graphics/pokemon/gen_5/tornadus/normal.pal diff --git a/graphics/pokemon/tornadus/shiny.pal b/graphics/pokemon/gen_5/tornadus/shiny.pal similarity index 100% rename from graphics/pokemon/tornadus/shiny.pal rename to graphics/pokemon/gen_5/tornadus/shiny.pal diff --git a/graphics/pokemon/tornadus/therian/anim_front.png b/graphics/pokemon/gen_5/tornadus/therian/anim_front.png similarity index 100% rename from graphics/pokemon/tornadus/therian/anim_front.png rename to graphics/pokemon/gen_5/tornadus/therian/anim_front.png diff --git a/graphics/pokemon/tornadus/therian/back.png b/graphics/pokemon/gen_5/tornadus/therian/back.png similarity index 100% rename from graphics/pokemon/tornadus/therian/back.png rename to graphics/pokemon/gen_5/tornadus/therian/back.png diff --git a/graphics/pokemon/tornadus/therian/icon.png b/graphics/pokemon/gen_5/tornadus/therian/icon.png similarity index 100% rename from graphics/pokemon/tornadus/therian/icon.png rename to graphics/pokemon/gen_5/tornadus/therian/icon.png diff --git a/graphics/pokemon/tornadus/therian/normal.pal b/graphics/pokemon/gen_5/tornadus/therian/normal.pal similarity index 100% rename from graphics/pokemon/tornadus/therian/normal.pal rename to graphics/pokemon/gen_5/tornadus/therian/normal.pal diff --git a/graphics/pokemon/tornadus/therian/shiny.pal b/graphics/pokemon/gen_5/tornadus/therian/shiny.pal similarity index 100% rename from graphics/pokemon/tornadus/therian/shiny.pal rename to graphics/pokemon/gen_5/tornadus/therian/shiny.pal diff --git a/graphics/pokemon/tranquill/anim_front.png b/graphics/pokemon/gen_5/tranquill/anim_front.png similarity index 100% rename from graphics/pokemon/tranquill/anim_front.png rename to graphics/pokemon/gen_5/tranquill/anim_front.png diff --git a/graphics/pokemon/tranquill/back.png b/graphics/pokemon/gen_5/tranquill/back.png similarity index 100% rename from graphics/pokemon/tranquill/back.png rename to graphics/pokemon/gen_5/tranquill/back.png diff --git a/graphics/pokemon/tranquill/footprint.png b/graphics/pokemon/gen_5/tranquill/footprint.png similarity index 100% rename from graphics/pokemon/tranquill/footprint.png rename to graphics/pokemon/gen_5/tranquill/footprint.png diff --git a/graphics/pokemon/tranquill/icon.png b/graphics/pokemon/gen_5/tranquill/icon.png similarity index 100% rename from graphics/pokemon/tranquill/icon.png rename to graphics/pokemon/gen_5/tranquill/icon.png diff --git a/graphics/pokemon/tranquill/normal.pal b/graphics/pokemon/gen_5/tranquill/normal.pal similarity index 100% rename from graphics/pokemon/tranquill/normal.pal rename to graphics/pokemon/gen_5/tranquill/normal.pal diff --git a/graphics/pokemon/tranquill/shiny.pal b/graphics/pokemon/gen_5/tranquill/shiny.pal similarity index 100% rename from graphics/pokemon/tranquill/shiny.pal rename to graphics/pokemon/gen_5/tranquill/shiny.pal diff --git a/graphics/pokemon/trubbish/anim_front.png b/graphics/pokemon/gen_5/trubbish/anim_front.png similarity index 100% rename from graphics/pokemon/trubbish/anim_front.png rename to graphics/pokemon/gen_5/trubbish/anim_front.png diff --git a/graphics/pokemon/trubbish/back.png b/graphics/pokemon/gen_5/trubbish/back.png similarity index 100% rename from graphics/pokemon/trubbish/back.png rename to graphics/pokemon/gen_5/trubbish/back.png diff --git a/graphics/pokemon/trubbish/footprint.png b/graphics/pokemon/gen_5/trubbish/footprint.png similarity index 100% rename from graphics/pokemon/trubbish/footprint.png rename to graphics/pokemon/gen_5/trubbish/footprint.png diff --git a/graphics/pokemon/trubbish/icon.png b/graphics/pokemon/gen_5/trubbish/icon.png similarity index 100% rename from graphics/pokemon/trubbish/icon.png rename to graphics/pokemon/gen_5/trubbish/icon.png diff --git a/graphics/pokemon/trubbish/normal.pal b/graphics/pokemon/gen_5/trubbish/normal.pal similarity index 100% rename from graphics/pokemon/trubbish/normal.pal rename to graphics/pokemon/gen_5/trubbish/normal.pal diff --git a/graphics/pokemon/trubbish/shiny.pal b/graphics/pokemon/gen_5/trubbish/shiny.pal similarity index 100% rename from graphics/pokemon/trubbish/shiny.pal rename to graphics/pokemon/gen_5/trubbish/shiny.pal diff --git a/graphics/pokemon/tympole/anim_front.png b/graphics/pokemon/gen_5/tympole/anim_front.png similarity index 100% rename from graphics/pokemon/tympole/anim_front.png rename to graphics/pokemon/gen_5/tympole/anim_front.png diff --git a/graphics/pokemon/tympole/back.png b/graphics/pokemon/gen_5/tympole/back.png similarity index 100% rename from graphics/pokemon/tympole/back.png rename to graphics/pokemon/gen_5/tympole/back.png diff --git a/graphics/pokemon/pupitar/footprint.png b/graphics/pokemon/gen_5/tympole/footprint.png similarity index 100% rename from graphics/pokemon/pupitar/footprint.png rename to graphics/pokemon/gen_5/tympole/footprint.png diff --git a/graphics/pokemon/tympole/icon.png b/graphics/pokemon/gen_5/tympole/icon.png similarity index 100% rename from graphics/pokemon/tympole/icon.png rename to graphics/pokemon/gen_5/tympole/icon.png diff --git a/graphics/pokemon/tympole/normal.pal b/graphics/pokemon/gen_5/tympole/normal.pal similarity index 100% rename from graphics/pokemon/tympole/normal.pal rename to graphics/pokemon/gen_5/tympole/normal.pal diff --git a/graphics/pokemon/tympole/shiny.pal b/graphics/pokemon/gen_5/tympole/shiny.pal similarity index 100% rename from graphics/pokemon/tympole/shiny.pal rename to graphics/pokemon/gen_5/tympole/shiny.pal diff --git a/graphics/pokemon/tynamo/anim_front.png b/graphics/pokemon/gen_5/tynamo/anim_front.png similarity index 100% rename from graphics/pokemon/tynamo/anim_front.png rename to graphics/pokemon/gen_5/tynamo/anim_front.png diff --git a/graphics/pokemon/tynamo/back.png b/graphics/pokemon/gen_5/tynamo/back.png similarity index 100% rename from graphics/pokemon/tynamo/back.png rename to graphics/pokemon/gen_5/tynamo/back.png diff --git a/graphics/pokemon/pyukumuku/footprint.png b/graphics/pokemon/gen_5/tynamo/footprint.png similarity index 100% rename from graphics/pokemon/pyukumuku/footprint.png rename to graphics/pokemon/gen_5/tynamo/footprint.png diff --git a/graphics/pokemon/tynamo/icon.png b/graphics/pokemon/gen_5/tynamo/icon.png similarity index 100% rename from graphics/pokemon/tynamo/icon.png rename to graphics/pokemon/gen_5/tynamo/icon.png diff --git a/graphics/pokemon/tynamo/normal.pal b/graphics/pokemon/gen_5/tynamo/normal.pal similarity index 100% rename from graphics/pokemon/tynamo/normal.pal rename to graphics/pokemon/gen_5/tynamo/normal.pal diff --git a/graphics/pokemon/tynamo/shiny.pal b/graphics/pokemon/gen_5/tynamo/shiny.pal similarity index 100% rename from graphics/pokemon/tynamo/shiny.pal rename to graphics/pokemon/gen_5/tynamo/shiny.pal diff --git a/graphics/pokemon/unfezant/anim_front.png b/graphics/pokemon/gen_5/unfezant/anim_front.png similarity index 100% rename from graphics/pokemon/unfezant/anim_front.png rename to graphics/pokemon/gen_5/unfezant/anim_front.png diff --git a/graphics/pokemon/unfezant/anim_frontf.png b/graphics/pokemon/gen_5/unfezant/anim_frontf.png similarity index 100% rename from graphics/pokemon/unfezant/anim_frontf.png rename to graphics/pokemon/gen_5/unfezant/anim_frontf.png diff --git a/graphics/pokemon/unfezant/back.png b/graphics/pokemon/gen_5/unfezant/back.png similarity index 100% rename from graphics/pokemon/unfezant/back.png rename to graphics/pokemon/gen_5/unfezant/back.png diff --git a/graphics/pokemon/unfezant/backf.png b/graphics/pokemon/gen_5/unfezant/backf.png similarity index 100% rename from graphics/pokemon/unfezant/backf.png rename to graphics/pokemon/gen_5/unfezant/backf.png diff --git a/graphics/pokemon/unfezant/footprint.png b/graphics/pokemon/gen_5/unfezant/footprint.png similarity index 100% rename from graphics/pokemon/unfezant/footprint.png rename to graphics/pokemon/gen_5/unfezant/footprint.png diff --git a/graphics/pokemon/unfezant/frontf.png b/graphics/pokemon/gen_5/unfezant/frontf.png similarity index 100% rename from graphics/pokemon/unfezant/frontf.png rename to graphics/pokemon/gen_5/unfezant/frontf.png diff --git a/graphics/pokemon/unfezant/icon.png b/graphics/pokemon/gen_5/unfezant/icon.png similarity index 100% rename from graphics/pokemon/unfezant/icon.png rename to graphics/pokemon/gen_5/unfezant/icon.png diff --git a/graphics/pokemon/unfezant/iconf.png b/graphics/pokemon/gen_5/unfezant/iconf.png similarity index 100% rename from graphics/pokemon/unfezant/iconf.png rename to graphics/pokemon/gen_5/unfezant/iconf.png diff --git a/graphics/pokemon/unfezant/normal.pal b/graphics/pokemon/gen_5/unfezant/normal.pal similarity index 100% rename from graphics/pokemon/unfezant/normal.pal rename to graphics/pokemon/gen_5/unfezant/normal.pal diff --git a/graphics/pokemon/unfezant/normalf.pal b/graphics/pokemon/gen_5/unfezant/normalf.pal similarity index 100% rename from graphics/pokemon/unfezant/normalf.pal rename to graphics/pokemon/gen_5/unfezant/normalf.pal diff --git a/graphics/pokemon/unfezant/shiny.pal b/graphics/pokemon/gen_5/unfezant/shiny.pal similarity index 100% rename from graphics/pokemon/unfezant/shiny.pal rename to graphics/pokemon/gen_5/unfezant/shiny.pal diff --git a/graphics/pokemon/unfezant/shinyf.pal b/graphics/pokemon/gen_5/unfezant/shinyf.pal similarity index 100% rename from graphics/pokemon/unfezant/shinyf.pal rename to graphics/pokemon/gen_5/unfezant/shinyf.pal diff --git a/graphics/pokemon/vanillish/anim_front.png b/graphics/pokemon/gen_5/vanillish/anim_front.png similarity index 100% rename from graphics/pokemon/vanillish/anim_front.png rename to graphics/pokemon/gen_5/vanillish/anim_front.png diff --git a/graphics/pokemon/vanillish/back.png b/graphics/pokemon/gen_5/vanillish/back.png similarity index 100% rename from graphics/pokemon/vanillish/back.png rename to graphics/pokemon/gen_5/vanillish/back.png diff --git a/graphics/pokemon/qwilfish/footprint.png b/graphics/pokemon/gen_5/vanillish/footprint.png similarity index 100% rename from graphics/pokemon/qwilfish/footprint.png rename to graphics/pokemon/gen_5/vanillish/footprint.png diff --git a/graphics/pokemon/vanillish/icon.png b/graphics/pokemon/gen_5/vanillish/icon.png similarity index 100% rename from graphics/pokemon/vanillish/icon.png rename to graphics/pokemon/gen_5/vanillish/icon.png diff --git a/graphics/pokemon/vanillish/normal.pal b/graphics/pokemon/gen_5/vanillish/normal.pal similarity index 100% rename from graphics/pokemon/vanillish/normal.pal rename to graphics/pokemon/gen_5/vanillish/normal.pal diff --git a/graphics/pokemon/vanillish/shiny.pal b/graphics/pokemon/gen_5/vanillish/shiny.pal similarity index 100% rename from graphics/pokemon/vanillish/shiny.pal rename to graphics/pokemon/gen_5/vanillish/shiny.pal diff --git a/graphics/pokemon/vanillite/anim_front.png b/graphics/pokemon/gen_5/vanillite/anim_front.png similarity index 100% rename from graphics/pokemon/vanillite/anim_front.png rename to graphics/pokemon/gen_5/vanillite/anim_front.png diff --git a/graphics/pokemon/vanillite/back.png b/graphics/pokemon/gen_5/vanillite/back.png similarity index 100% rename from graphics/pokemon/vanillite/back.png rename to graphics/pokemon/gen_5/vanillite/back.png diff --git a/graphics/pokemon/rayquaza/footprint.png b/graphics/pokemon/gen_5/vanillite/footprint.png similarity index 100% rename from graphics/pokemon/rayquaza/footprint.png rename to graphics/pokemon/gen_5/vanillite/footprint.png diff --git a/graphics/pokemon/vanillite/icon.png b/graphics/pokemon/gen_5/vanillite/icon.png similarity index 100% rename from graphics/pokemon/vanillite/icon.png rename to graphics/pokemon/gen_5/vanillite/icon.png diff --git a/graphics/pokemon/vanillite/normal.pal b/graphics/pokemon/gen_5/vanillite/normal.pal similarity index 100% rename from graphics/pokemon/vanillite/normal.pal rename to graphics/pokemon/gen_5/vanillite/normal.pal diff --git a/graphics/pokemon/vanillite/shiny.pal b/graphics/pokemon/gen_5/vanillite/shiny.pal similarity index 100% rename from graphics/pokemon/vanillite/shiny.pal rename to graphics/pokemon/gen_5/vanillite/shiny.pal diff --git a/graphics/pokemon/vanilluxe/anim_front.png b/graphics/pokemon/gen_5/vanilluxe/anim_front.png similarity index 100% rename from graphics/pokemon/vanilluxe/anim_front.png rename to graphics/pokemon/gen_5/vanilluxe/anim_front.png diff --git a/graphics/pokemon/vanilluxe/back.png b/graphics/pokemon/gen_5/vanilluxe/back.png similarity index 100% rename from graphics/pokemon/vanilluxe/back.png rename to graphics/pokemon/gen_5/vanilluxe/back.png diff --git a/graphics/pokemon/relicanth/footprint.png b/graphics/pokemon/gen_5/vanilluxe/footprint.png similarity index 100% rename from graphics/pokemon/relicanth/footprint.png rename to graphics/pokemon/gen_5/vanilluxe/footprint.png diff --git a/graphics/pokemon/vanilluxe/icon.png b/graphics/pokemon/gen_5/vanilluxe/icon.png similarity index 100% rename from graphics/pokemon/vanilluxe/icon.png rename to graphics/pokemon/gen_5/vanilluxe/icon.png diff --git a/graphics/pokemon/vanilluxe/normal.pal b/graphics/pokemon/gen_5/vanilluxe/normal.pal similarity index 100% rename from graphics/pokemon/vanilluxe/normal.pal rename to graphics/pokemon/gen_5/vanilluxe/normal.pal diff --git a/graphics/pokemon/vanilluxe/shiny.pal b/graphics/pokemon/gen_5/vanilluxe/shiny.pal similarity index 100% rename from graphics/pokemon/vanilluxe/shiny.pal rename to graphics/pokemon/gen_5/vanilluxe/shiny.pal diff --git a/graphics/pokemon/venipede/anim_front.png b/graphics/pokemon/gen_5/venipede/anim_front.png similarity index 100% rename from graphics/pokemon/venipede/anim_front.png rename to graphics/pokemon/gen_5/venipede/anim_front.png diff --git a/graphics/pokemon/venipede/back.png b/graphics/pokemon/gen_5/venipede/back.png similarity index 100% rename from graphics/pokemon/venipede/back.png rename to graphics/pokemon/gen_5/venipede/back.png diff --git a/graphics/pokemon/gothita/footprint.png b/graphics/pokemon/gen_5/venipede/footprint.png similarity index 100% rename from graphics/pokemon/gothita/footprint.png rename to graphics/pokemon/gen_5/venipede/footprint.png diff --git a/graphics/pokemon/venipede/icon.png b/graphics/pokemon/gen_5/venipede/icon.png similarity index 100% rename from graphics/pokemon/venipede/icon.png rename to graphics/pokemon/gen_5/venipede/icon.png diff --git a/graphics/pokemon/venipede/normal.pal b/graphics/pokemon/gen_5/venipede/normal.pal similarity index 100% rename from graphics/pokemon/venipede/normal.pal rename to graphics/pokemon/gen_5/venipede/normal.pal diff --git a/graphics/pokemon/venipede/shiny.pal b/graphics/pokemon/gen_5/venipede/shiny.pal similarity index 100% rename from graphics/pokemon/venipede/shiny.pal rename to graphics/pokemon/gen_5/venipede/shiny.pal diff --git a/graphics/pokemon/victini/anim_front.png b/graphics/pokemon/gen_5/victini/anim_front.png similarity index 100% rename from graphics/pokemon/victini/anim_front.png rename to graphics/pokemon/gen_5/victini/anim_front.png diff --git a/graphics/pokemon/victini/back.png b/graphics/pokemon/gen_5/victini/back.png similarity index 100% rename from graphics/pokemon/victini/back.png rename to graphics/pokemon/gen_5/victini/back.png diff --git a/graphics/pokemon/victini/footprint.png b/graphics/pokemon/gen_5/victini/footprint.png similarity index 100% rename from graphics/pokemon/victini/footprint.png rename to graphics/pokemon/gen_5/victini/footprint.png diff --git a/graphics/pokemon/victini/icon.png b/graphics/pokemon/gen_5/victini/icon.png similarity index 100% rename from graphics/pokemon/victini/icon.png rename to graphics/pokemon/gen_5/victini/icon.png diff --git a/graphics/pokemon/victini/normal.pal b/graphics/pokemon/gen_5/victini/normal.pal similarity index 100% rename from graphics/pokemon/victini/normal.pal rename to graphics/pokemon/gen_5/victini/normal.pal diff --git a/graphics/pokemon/victini/shiny.pal b/graphics/pokemon/gen_5/victini/shiny.pal similarity index 100% rename from graphics/pokemon/victini/shiny.pal rename to graphics/pokemon/gen_5/victini/shiny.pal diff --git a/graphics/pokemon/virizion/anim_front.png b/graphics/pokemon/gen_5/virizion/anim_front.png similarity index 100% rename from graphics/pokemon/virizion/anim_front.png rename to graphics/pokemon/gen_5/virizion/anim_front.png diff --git a/graphics/pokemon/virizion/back.png b/graphics/pokemon/gen_5/virizion/back.png similarity index 100% rename from graphics/pokemon/virizion/back.png rename to graphics/pokemon/gen_5/virizion/back.png diff --git a/graphics/pokemon/virizion/footprint.png b/graphics/pokemon/gen_5/virizion/footprint.png similarity index 100% rename from graphics/pokemon/virizion/footprint.png rename to graphics/pokemon/gen_5/virizion/footprint.png diff --git a/graphics/pokemon/virizion/icon.png b/graphics/pokemon/gen_5/virizion/icon.png similarity index 100% rename from graphics/pokemon/virizion/icon.png rename to graphics/pokemon/gen_5/virizion/icon.png diff --git a/graphics/pokemon/virizion/normal.pal b/graphics/pokemon/gen_5/virizion/normal.pal similarity index 100% rename from graphics/pokemon/virizion/normal.pal rename to graphics/pokemon/gen_5/virizion/normal.pal diff --git a/graphics/pokemon/virizion/shiny.pal b/graphics/pokemon/gen_5/virizion/shiny.pal similarity index 100% rename from graphics/pokemon/virizion/shiny.pal rename to graphics/pokemon/gen_5/virizion/shiny.pal diff --git a/graphics/pokemon/volcarona/anim_front.png b/graphics/pokemon/gen_5/volcarona/anim_front.png similarity index 100% rename from graphics/pokemon/volcarona/anim_front.png rename to graphics/pokemon/gen_5/volcarona/anim_front.png diff --git a/graphics/pokemon/volcarona/back.png b/graphics/pokemon/gen_5/volcarona/back.png similarity index 100% rename from graphics/pokemon/volcarona/back.png rename to graphics/pokemon/gen_5/volcarona/back.png diff --git a/graphics/pokemon/remoraid/footprint.png b/graphics/pokemon/gen_5/volcarona/footprint.png similarity index 100% rename from graphics/pokemon/remoraid/footprint.png rename to graphics/pokemon/gen_5/volcarona/footprint.png diff --git a/graphics/pokemon/volcarona/icon.png b/graphics/pokemon/gen_5/volcarona/icon.png similarity index 100% rename from graphics/pokemon/volcarona/icon.png rename to graphics/pokemon/gen_5/volcarona/icon.png diff --git a/graphics/pokemon/volcarona/normal.pal b/graphics/pokemon/gen_5/volcarona/normal.pal similarity index 100% rename from graphics/pokemon/volcarona/normal.pal rename to graphics/pokemon/gen_5/volcarona/normal.pal diff --git a/graphics/pokemon/volcarona/shiny.pal b/graphics/pokemon/gen_5/volcarona/shiny.pal similarity index 100% rename from graphics/pokemon/volcarona/shiny.pal rename to graphics/pokemon/gen_5/volcarona/shiny.pal diff --git a/graphics/pokemon/vullaby/anim_front.png b/graphics/pokemon/gen_5/vullaby/anim_front.png similarity index 100% rename from graphics/pokemon/vullaby/anim_front.png rename to graphics/pokemon/gen_5/vullaby/anim_front.png diff --git a/graphics/pokemon/vullaby/back.png b/graphics/pokemon/gen_5/vullaby/back.png similarity index 100% rename from graphics/pokemon/vullaby/back.png rename to graphics/pokemon/gen_5/vullaby/back.png diff --git a/graphics/pokemon/vullaby/footprint.png b/graphics/pokemon/gen_5/vullaby/footprint.png similarity index 100% rename from graphics/pokemon/vullaby/footprint.png rename to graphics/pokemon/gen_5/vullaby/footprint.png diff --git a/graphics/pokemon/vullaby/icon.png b/graphics/pokemon/gen_5/vullaby/icon.png similarity index 100% rename from graphics/pokemon/vullaby/icon.png rename to graphics/pokemon/gen_5/vullaby/icon.png diff --git a/graphics/pokemon/vullaby/normal.pal b/graphics/pokemon/gen_5/vullaby/normal.pal similarity index 100% rename from graphics/pokemon/vullaby/normal.pal rename to graphics/pokemon/gen_5/vullaby/normal.pal diff --git a/graphics/pokemon/vullaby/shiny.pal b/graphics/pokemon/gen_5/vullaby/shiny.pal similarity index 100% rename from graphics/pokemon/vullaby/shiny.pal rename to graphics/pokemon/gen_5/vullaby/shiny.pal diff --git a/graphics/pokemon/watchog/anim_front.png b/graphics/pokemon/gen_5/watchog/anim_front.png similarity index 100% rename from graphics/pokemon/watchog/anim_front.png rename to graphics/pokemon/gen_5/watchog/anim_front.png diff --git a/graphics/pokemon/watchog/back.png b/graphics/pokemon/gen_5/watchog/back.png similarity index 100% rename from graphics/pokemon/watchog/back.png rename to graphics/pokemon/gen_5/watchog/back.png diff --git a/graphics/pokemon/watchog/footprint.png b/graphics/pokemon/gen_5/watchog/footprint.png similarity index 100% rename from graphics/pokemon/watchog/footprint.png rename to graphics/pokemon/gen_5/watchog/footprint.png diff --git a/graphics/pokemon/watchog/icon.png b/graphics/pokemon/gen_5/watchog/icon.png similarity index 100% rename from graphics/pokemon/watchog/icon.png rename to graphics/pokemon/gen_5/watchog/icon.png diff --git a/graphics/pokemon/watchog/normal.pal b/graphics/pokemon/gen_5/watchog/normal.pal similarity index 100% rename from graphics/pokemon/watchog/normal.pal rename to graphics/pokemon/gen_5/watchog/normal.pal diff --git a/graphics/pokemon/watchog/shiny.pal b/graphics/pokemon/gen_5/watchog/shiny.pal similarity index 100% rename from graphics/pokemon/watchog/shiny.pal rename to graphics/pokemon/gen_5/watchog/shiny.pal diff --git a/graphics/pokemon/whimsicott/anim_front.png b/graphics/pokemon/gen_5/whimsicott/anim_front.png similarity index 100% rename from graphics/pokemon/whimsicott/anim_front.png rename to graphics/pokemon/gen_5/whimsicott/anim_front.png diff --git a/graphics/pokemon/whimsicott/back.png b/graphics/pokemon/gen_5/whimsicott/back.png similarity index 100% rename from graphics/pokemon/whimsicott/back.png rename to graphics/pokemon/gen_5/whimsicott/back.png diff --git a/graphics/pokemon/grubbin/footprint.png b/graphics/pokemon/gen_5/whimsicott/footprint.png similarity index 100% rename from graphics/pokemon/grubbin/footprint.png rename to graphics/pokemon/gen_5/whimsicott/footprint.png diff --git a/graphics/pokemon/whimsicott/icon.png b/graphics/pokemon/gen_5/whimsicott/icon.png similarity index 100% rename from graphics/pokemon/whimsicott/icon.png rename to graphics/pokemon/gen_5/whimsicott/icon.png diff --git a/graphics/pokemon/whimsicott/normal.pal b/graphics/pokemon/gen_5/whimsicott/normal.pal similarity index 100% rename from graphics/pokemon/whimsicott/normal.pal rename to graphics/pokemon/gen_5/whimsicott/normal.pal diff --git a/graphics/pokemon/whimsicott/shiny.pal b/graphics/pokemon/gen_5/whimsicott/shiny.pal similarity index 100% rename from graphics/pokemon/whimsicott/shiny.pal rename to graphics/pokemon/gen_5/whimsicott/shiny.pal diff --git a/graphics/pokemon/whirlipede/anim_front.png b/graphics/pokemon/gen_5/whirlipede/anim_front.png similarity index 100% rename from graphics/pokemon/whirlipede/anim_front.png rename to graphics/pokemon/gen_5/whirlipede/anim_front.png diff --git a/graphics/pokemon/whirlipede/back.png b/graphics/pokemon/gen_5/whirlipede/back.png similarity index 100% rename from graphics/pokemon/whirlipede/back.png rename to graphics/pokemon/gen_5/whirlipede/back.png diff --git a/graphics/pokemon/reuniclus/footprint.png b/graphics/pokemon/gen_5/whirlipede/footprint.png similarity index 100% rename from graphics/pokemon/reuniclus/footprint.png rename to graphics/pokemon/gen_5/whirlipede/footprint.png diff --git a/graphics/pokemon/whirlipede/icon.png b/graphics/pokemon/gen_5/whirlipede/icon.png similarity index 100% rename from graphics/pokemon/whirlipede/icon.png rename to graphics/pokemon/gen_5/whirlipede/icon.png diff --git a/graphics/pokemon/whirlipede/normal.pal b/graphics/pokemon/gen_5/whirlipede/normal.pal similarity index 100% rename from graphics/pokemon/whirlipede/normal.pal rename to graphics/pokemon/gen_5/whirlipede/normal.pal diff --git a/graphics/pokemon/whirlipede/shiny.pal b/graphics/pokemon/gen_5/whirlipede/shiny.pal similarity index 100% rename from graphics/pokemon/whirlipede/shiny.pal rename to graphics/pokemon/gen_5/whirlipede/shiny.pal diff --git a/graphics/pokemon/woobat/anim_front.png b/graphics/pokemon/gen_5/woobat/anim_front.png similarity index 100% rename from graphics/pokemon/woobat/anim_front.png rename to graphics/pokemon/gen_5/woobat/anim_front.png diff --git a/graphics/pokemon/woobat/back.png b/graphics/pokemon/gen_5/woobat/back.png similarity index 100% rename from graphics/pokemon/woobat/back.png rename to graphics/pokemon/gen_5/woobat/back.png diff --git a/graphics/pokemon/rotom/normal/footprint.png b/graphics/pokemon/gen_5/woobat/footprint.png similarity index 100% rename from graphics/pokemon/rotom/normal/footprint.png rename to graphics/pokemon/gen_5/woobat/footprint.png diff --git a/graphics/pokemon/woobat/icon.png b/graphics/pokemon/gen_5/woobat/icon.png similarity index 100% rename from graphics/pokemon/woobat/icon.png rename to graphics/pokemon/gen_5/woobat/icon.png diff --git a/graphics/pokemon/woobat/normal.pal b/graphics/pokemon/gen_5/woobat/normal.pal similarity index 100% rename from graphics/pokemon/woobat/normal.pal rename to graphics/pokemon/gen_5/woobat/normal.pal diff --git a/graphics/pokemon/woobat/shiny.pal b/graphics/pokemon/gen_5/woobat/shiny.pal similarity index 100% rename from graphics/pokemon/woobat/shiny.pal rename to graphics/pokemon/gen_5/woobat/shiny.pal diff --git a/graphics/pokemon/yamask/anim_front.png b/graphics/pokemon/gen_5/yamask/anim_front.png similarity index 100% rename from graphics/pokemon/yamask/anim_front.png rename to graphics/pokemon/gen_5/yamask/anim_front.png diff --git a/graphics/pokemon/yamask/back.png b/graphics/pokemon/gen_5/yamask/back.png similarity index 100% rename from graphics/pokemon/yamask/back.png rename to graphics/pokemon/gen_5/yamask/back.png diff --git a/graphics/pokemon/runerigus/footprint.png b/graphics/pokemon/gen_5/yamask/footprint.png similarity index 100% rename from graphics/pokemon/runerigus/footprint.png rename to graphics/pokemon/gen_5/yamask/footprint.png diff --git a/graphics/pokemon/yamask/galarian/back.png b/graphics/pokemon/gen_5/yamask/galarian/back.png similarity index 100% rename from graphics/pokemon/yamask/galarian/back.png rename to graphics/pokemon/gen_5/yamask/galarian/back.png diff --git a/graphics/pokemon/yamask/galarian/front.png b/graphics/pokemon/gen_5/yamask/galarian/front.png similarity index 100% rename from graphics/pokemon/yamask/galarian/front.png rename to graphics/pokemon/gen_5/yamask/galarian/front.png diff --git a/graphics/pokemon/yamask/galarian/icon.png b/graphics/pokemon/gen_5/yamask/galarian/icon.png similarity index 100% rename from graphics/pokemon/yamask/galarian/icon.png rename to graphics/pokemon/gen_5/yamask/galarian/icon.png diff --git a/graphics/pokemon/yamask/galarian/normal.pal b/graphics/pokemon/gen_5/yamask/galarian/normal.pal similarity index 100% rename from graphics/pokemon/yamask/galarian/normal.pal rename to graphics/pokemon/gen_5/yamask/galarian/normal.pal diff --git a/graphics/pokemon/yamask/galarian/shiny.pal b/graphics/pokemon/gen_5/yamask/galarian/shiny.pal similarity index 100% rename from graphics/pokemon/yamask/galarian/shiny.pal rename to graphics/pokemon/gen_5/yamask/galarian/shiny.pal diff --git a/graphics/pokemon/yamask/icon.png b/graphics/pokemon/gen_5/yamask/icon.png similarity index 100% rename from graphics/pokemon/yamask/icon.png rename to graphics/pokemon/gen_5/yamask/icon.png diff --git a/graphics/pokemon/yamask/normal.pal b/graphics/pokemon/gen_5/yamask/normal.pal similarity index 100% rename from graphics/pokemon/yamask/normal.pal rename to graphics/pokemon/gen_5/yamask/normal.pal diff --git a/graphics/pokemon/yamask/shiny.pal b/graphics/pokemon/gen_5/yamask/shiny.pal similarity index 100% rename from graphics/pokemon/yamask/shiny.pal rename to graphics/pokemon/gen_5/yamask/shiny.pal diff --git a/graphics/pokemon/zebstrika/anim_front.png b/graphics/pokemon/gen_5/zebstrika/anim_front.png similarity index 100% rename from graphics/pokemon/zebstrika/anim_front.png rename to graphics/pokemon/gen_5/zebstrika/anim_front.png diff --git a/graphics/pokemon/zebstrika/back.png b/graphics/pokemon/gen_5/zebstrika/back.png similarity index 100% rename from graphics/pokemon/zebstrika/back.png rename to graphics/pokemon/gen_5/zebstrika/back.png diff --git a/graphics/pokemon/zebstrika/footprint.png b/graphics/pokemon/gen_5/zebstrika/footprint.png similarity index 100% rename from graphics/pokemon/zebstrika/footprint.png rename to graphics/pokemon/gen_5/zebstrika/footprint.png diff --git a/graphics/pokemon/zebstrika/icon.png b/graphics/pokemon/gen_5/zebstrika/icon.png similarity index 100% rename from graphics/pokemon/zebstrika/icon.png rename to graphics/pokemon/gen_5/zebstrika/icon.png diff --git a/graphics/pokemon/zebstrika/normal.pal b/graphics/pokemon/gen_5/zebstrika/normal.pal similarity index 100% rename from graphics/pokemon/zebstrika/normal.pal rename to graphics/pokemon/gen_5/zebstrika/normal.pal diff --git a/graphics/pokemon/zebstrika/shiny.pal b/graphics/pokemon/gen_5/zebstrika/shiny.pal similarity index 100% rename from graphics/pokemon/zebstrika/shiny.pal rename to graphics/pokemon/gen_5/zebstrika/shiny.pal diff --git a/graphics/pokemon/zekrom/anim_front.png b/graphics/pokemon/gen_5/zekrom/anim_front.png similarity index 100% rename from graphics/pokemon/zekrom/anim_front.png rename to graphics/pokemon/gen_5/zekrom/anim_front.png diff --git a/graphics/pokemon/zekrom/back.png b/graphics/pokemon/gen_5/zekrom/back.png similarity index 100% rename from graphics/pokemon/zekrom/back.png rename to graphics/pokemon/gen_5/zekrom/back.png diff --git a/graphics/pokemon/zekrom/footprint.png b/graphics/pokemon/gen_5/zekrom/footprint.png similarity index 100% rename from graphics/pokemon/zekrom/footprint.png rename to graphics/pokemon/gen_5/zekrom/footprint.png diff --git a/graphics/pokemon/zekrom/icon.png b/graphics/pokemon/gen_5/zekrom/icon.png similarity index 100% rename from graphics/pokemon/zekrom/icon.png rename to graphics/pokemon/gen_5/zekrom/icon.png diff --git a/graphics/pokemon/zekrom/normal.pal b/graphics/pokemon/gen_5/zekrom/normal.pal similarity index 100% rename from graphics/pokemon/zekrom/normal.pal rename to graphics/pokemon/gen_5/zekrom/normal.pal diff --git a/graphics/pokemon/zekrom/shiny.pal b/graphics/pokemon/gen_5/zekrom/shiny.pal similarity index 100% rename from graphics/pokemon/zekrom/shiny.pal rename to graphics/pokemon/gen_5/zekrom/shiny.pal diff --git a/graphics/pokemon/zoroark/anim_front.png b/graphics/pokemon/gen_5/zoroark/anim_front.png similarity index 100% rename from graphics/pokemon/zoroark/anim_front.png rename to graphics/pokemon/gen_5/zoroark/anim_front.png diff --git a/graphics/pokemon/zoroark/back.png b/graphics/pokemon/gen_5/zoroark/back.png similarity index 100% rename from graphics/pokemon/zoroark/back.png rename to graphics/pokemon/gen_5/zoroark/back.png diff --git a/graphics/pokemon/zoroark/footprint.png b/graphics/pokemon/gen_5/zoroark/footprint.png similarity index 100% rename from graphics/pokemon/zoroark/footprint.png rename to graphics/pokemon/gen_5/zoroark/footprint.png diff --git a/graphics/pokemon/zoroark/hisuian/back.png b/graphics/pokemon/gen_5/zoroark/hisuian/back.png similarity index 100% rename from graphics/pokemon/zoroark/hisuian/back.png rename to graphics/pokemon/gen_5/zoroark/hisuian/back.png diff --git a/graphics/pokemon/zoroark/hisuian/front.png b/graphics/pokemon/gen_5/zoroark/hisuian/front.png similarity index 100% rename from graphics/pokemon/zoroark/hisuian/front.png rename to graphics/pokemon/gen_5/zoroark/hisuian/front.png diff --git a/graphics/pokemon/zoroark/hisuian/icon.png b/graphics/pokemon/gen_5/zoroark/hisuian/icon.png similarity index 100% rename from graphics/pokemon/zoroark/hisuian/icon.png rename to graphics/pokemon/gen_5/zoroark/hisuian/icon.png diff --git a/graphics/pokemon/zoroark/hisuian/normal.pal b/graphics/pokemon/gen_5/zoroark/hisuian/normal.pal similarity index 100% rename from graphics/pokemon/zoroark/hisuian/normal.pal rename to graphics/pokemon/gen_5/zoroark/hisuian/normal.pal diff --git a/graphics/pokemon/zoroark/hisuian/shiny.pal b/graphics/pokemon/gen_5/zoroark/hisuian/shiny.pal similarity index 100% rename from graphics/pokemon/zoroark/hisuian/shiny.pal rename to graphics/pokemon/gen_5/zoroark/hisuian/shiny.pal diff --git a/graphics/pokemon/zoroark/icon.png b/graphics/pokemon/gen_5/zoroark/icon.png similarity index 100% rename from graphics/pokemon/zoroark/icon.png rename to graphics/pokemon/gen_5/zoroark/icon.png diff --git a/graphics/pokemon/zoroark/normal.pal b/graphics/pokemon/gen_5/zoroark/normal.pal similarity index 100% rename from graphics/pokemon/zoroark/normal.pal rename to graphics/pokemon/gen_5/zoroark/normal.pal diff --git a/graphics/pokemon/zoroark/shiny.pal b/graphics/pokemon/gen_5/zoroark/shiny.pal similarity index 100% rename from graphics/pokemon/zoroark/shiny.pal rename to graphics/pokemon/gen_5/zoroark/shiny.pal diff --git a/graphics/pokemon/zorua/anim_front.png b/graphics/pokemon/gen_5/zorua/anim_front.png similarity index 100% rename from graphics/pokemon/zorua/anim_front.png rename to graphics/pokemon/gen_5/zorua/anim_front.png diff --git a/graphics/pokemon/zorua/back.png b/graphics/pokemon/gen_5/zorua/back.png similarity index 100% rename from graphics/pokemon/zorua/back.png rename to graphics/pokemon/gen_5/zorua/back.png diff --git a/graphics/pokemon/goodra/footprint.png b/graphics/pokemon/gen_5/zorua/footprint.png similarity index 100% rename from graphics/pokemon/goodra/footprint.png rename to graphics/pokemon/gen_5/zorua/footprint.png diff --git a/graphics/pokemon/zorua/hisuian/back.png b/graphics/pokemon/gen_5/zorua/hisuian/back.png similarity index 100% rename from graphics/pokemon/zorua/hisuian/back.png rename to graphics/pokemon/gen_5/zorua/hisuian/back.png diff --git a/graphics/pokemon/zorua/hisuian/front.png b/graphics/pokemon/gen_5/zorua/hisuian/front.png similarity index 100% rename from graphics/pokemon/zorua/hisuian/front.png rename to graphics/pokemon/gen_5/zorua/hisuian/front.png diff --git a/graphics/pokemon/zorua/hisuian/icon.png b/graphics/pokemon/gen_5/zorua/hisuian/icon.png similarity index 100% rename from graphics/pokemon/zorua/hisuian/icon.png rename to graphics/pokemon/gen_5/zorua/hisuian/icon.png diff --git a/graphics/pokemon/zorua/hisuian/normal.pal b/graphics/pokemon/gen_5/zorua/hisuian/normal.pal similarity index 100% rename from graphics/pokemon/zorua/hisuian/normal.pal rename to graphics/pokemon/gen_5/zorua/hisuian/normal.pal diff --git a/graphics/pokemon/zorua/hisuian/shiny.pal b/graphics/pokemon/gen_5/zorua/hisuian/shiny.pal similarity index 100% rename from graphics/pokemon/zorua/hisuian/shiny.pal rename to graphics/pokemon/gen_5/zorua/hisuian/shiny.pal diff --git a/graphics/pokemon/zorua/icon.png b/graphics/pokemon/gen_5/zorua/icon.png similarity index 100% rename from graphics/pokemon/zorua/icon.png rename to graphics/pokemon/gen_5/zorua/icon.png diff --git a/graphics/pokemon/zorua/normal.pal b/graphics/pokemon/gen_5/zorua/normal.pal similarity index 100% rename from graphics/pokemon/zorua/normal.pal rename to graphics/pokemon/gen_5/zorua/normal.pal diff --git a/graphics/pokemon/zorua/shiny.pal b/graphics/pokemon/gen_5/zorua/shiny.pal similarity index 100% rename from graphics/pokemon/zorua/shiny.pal rename to graphics/pokemon/gen_5/zorua/shiny.pal diff --git a/graphics/pokemon/zweilous/anim_front.png b/graphics/pokemon/gen_5/zweilous/anim_front.png similarity index 100% rename from graphics/pokemon/zweilous/anim_front.png rename to graphics/pokemon/gen_5/zweilous/anim_front.png diff --git a/graphics/pokemon/zweilous/back.png b/graphics/pokemon/gen_5/zweilous/back.png similarity index 100% rename from graphics/pokemon/zweilous/back.png rename to graphics/pokemon/gen_5/zweilous/back.png diff --git a/graphics/pokemon/zweilous/footprint.png b/graphics/pokemon/gen_5/zweilous/footprint.png similarity index 100% rename from graphics/pokemon/zweilous/footprint.png rename to graphics/pokemon/gen_5/zweilous/footprint.png diff --git a/graphics/pokemon/zweilous/icon.png b/graphics/pokemon/gen_5/zweilous/icon.png similarity index 100% rename from graphics/pokemon/zweilous/icon.png rename to graphics/pokemon/gen_5/zweilous/icon.png diff --git a/graphics/pokemon/zweilous/normal.pal b/graphics/pokemon/gen_5/zweilous/normal.pal similarity index 100% rename from graphics/pokemon/zweilous/normal.pal rename to graphics/pokemon/gen_5/zweilous/normal.pal diff --git a/graphics/pokemon/zweilous/shiny.pal b/graphics/pokemon/gen_5/zweilous/shiny.pal similarity index 100% rename from graphics/pokemon/zweilous/shiny.pal rename to graphics/pokemon/gen_5/zweilous/shiny.pal diff --git a/graphics/pokemon/aegislash/anim_front.png b/graphics/pokemon/gen_6/aegislash/anim_front.png similarity index 100% rename from graphics/pokemon/aegislash/anim_front.png rename to graphics/pokemon/gen_6/aegislash/anim_front.png diff --git a/graphics/pokemon/aegislash/back.png b/graphics/pokemon/gen_6/aegislash/back.png similarity index 100% rename from graphics/pokemon/aegislash/back.png rename to graphics/pokemon/gen_6/aegislash/back.png diff --git a/graphics/pokemon/aegislash/blade/anim_front.png b/graphics/pokemon/gen_6/aegislash/blade/anim_front.png similarity index 100% rename from graphics/pokemon/aegislash/blade/anim_front.png rename to graphics/pokemon/gen_6/aegislash/blade/anim_front.png diff --git a/graphics/pokemon/aegislash/blade/back.png b/graphics/pokemon/gen_6/aegislash/blade/back.png similarity index 100% rename from graphics/pokemon/aegislash/blade/back.png rename to graphics/pokemon/gen_6/aegislash/blade/back.png diff --git a/graphics/pokemon/aegislash/blade/icon.png b/graphics/pokemon/gen_6/aegislash/blade/icon.png similarity index 100% rename from graphics/pokemon/aegislash/blade/icon.png rename to graphics/pokemon/gen_6/aegislash/blade/icon.png diff --git a/graphics/pokemon/aegislash/blade/normal.pal b/graphics/pokemon/gen_6/aegislash/blade/normal.pal similarity index 100% rename from graphics/pokemon/aegislash/blade/normal.pal rename to graphics/pokemon/gen_6/aegislash/blade/normal.pal diff --git a/graphics/pokemon/aegislash/blade/shiny.pal b/graphics/pokemon/gen_6/aegislash/blade/shiny.pal similarity index 100% rename from graphics/pokemon/aegislash/blade/shiny.pal rename to graphics/pokemon/gen_6/aegislash/blade/shiny.pal diff --git a/graphics/pokemon/sandaconda/footprint.png b/graphics/pokemon/gen_6/aegislash/footprint.png similarity index 100% rename from graphics/pokemon/sandaconda/footprint.png rename to graphics/pokemon/gen_6/aegislash/footprint.png diff --git a/graphics/pokemon/aegislash/icon.png b/graphics/pokemon/gen_6/aegislash/icon.png similarity index 100% rename from graphics/pokemon/aegislash/icon.png rename to graphics/pokemon/gen_6/aegislash/icon.png diff --git a/graphics/pokemon/aegislash/normal.pal b/graphics/pokemon/gen_6/aegislash/normal.pal similarity index 100% rename from graphics/pokemon/aegislash/normal.pal rename to graphics/pokemon/gen_6/aegislash/normal.pal diff --git a/graphics/pokemon/aegislash/shiny.pal b/graphics/pokemon/gen_6/aegislash/shiny.pal similarity index 100% rename from graphics/pokemon/aegislash/shiny.pal rename to graphics/pokemon/gen_6/aegislash/shiny.pal diff --git a/graphics/pokemon/amaura/anim_front.png b/graphics/pokemon/gen_6/amaura/anim_front.png similarity index 100% rename from graphics/pokemon/amaura/anim_front.png rename to graphics/pokemon/gen_6/amaura/anim_front.png diff --git a/graphics/pokemon/amaura/back.png b/graphics/pokemon/gen_6/amaura/back.png similarity index 100% rename from graphics/pokemon/amaura/back.png rename to graphics/pokemon/gen_6/amaura/back.png diff --git a/graphics/pokemon/shuckle/footprint.png b/graphics/pokemon/gen_6/amaura/footprint.png similarity index 100% rename from graphics/pokemon/shuckle/footprint.png rename to graphics/pokemon/gen_6/amaura/footprint.png diff --git a/graphics/pokemon/amaura/icon.png b/graphics/pokemon/gen_6/amaura/icon.png similarity index 100% rename from graphics/pokemon/amaura/icon.png rename to graphics/pokemon/gen_6/amaura/icon.png diff --git a/graphics/pokemon/amaura/normal.pal b/graphics/pokemon/gen_6/amaura/normal.pal similarity index 100% rename from graphics/pokemon/amaura/normal.pal rename to graphics/pokemon/gen_6/amaura/normal.pal diff --git a/graphics/pokemon/amaura/shiny.pal b/graphics/pokemon/gen_6/amaura/shiny.pal similarity index 100% rename from graphics/pokemon/amaura/shiny.pal rename to graphics/pokemon/gen_6/amaura/shiny.pal diff --git a/graphics/pokemon/aromatisse/anim_front.png b/graphics/pokemon/gen_6/aromatisse/anim_front.png similarity index 100% rename from graphics/pokemon/aromatisse/anim_front.png rename to graphics/pokemon/gen_6/aromatisse/anim_front.png diff --git a/graphics/pokemon/aromatisse/back.png b/graphics/pokemon/gen_6/aromatisse/back.png similarity index 100% rename from graphics/pokemon/aromatisse/back.png rename to graphics/pokemon/gen_6/aromatisse/back.png diff --git a/graphics/pokemon/hattrem/footprint.png b/graphics/pokemon/gen_6/aromatisse/footprint.png similarity index 100% rename from graphics/pokemon/hattrem/footprint.png rename to graphics/pokemon/gen_6/aromatisse/footprint.png diff --git a/graphics/pokemon/aromatisse/icon.png b/graphics/pokemon/gen_6/aromatisse/icon.png similarity index 100% rename from graphics/pokemon/aromatisse/icon.png rename to graphics/pokemon/gen_6/aromatisse/icon.png diff --git a/graphics/pokemon/aromatisse/normal.pal b/graphics/pokemon/gen_6/aromatisse/normal.pal similarity index 100% rename from graphics/pokemon/aromatisse/normal.pal rename to graphics/pokemon/gen_6/aromatisse/normal.pal diff --git a/graphics/pokemon/aromatisse/shiny.pal b/graphics/pokemon/gen_6/aromatisse/shiny.pal similarity index 100% rename from graphics/pokemon/aromatisse/shiny.pal rename to graphics/pokemon/gen_6/aromatisse/shiny.pal diff --git a/graphics/pokemon/aurorus/anim_front.png b/graphics/pokemon/gen_6/aurorus/anim_front.png similarity index 100% rename from graphics/pokemon/aurorus/anim_front.png rename to graphics/pokemon/gen_6/aurorus/anim_front.png diff --git a/graphics/pokemon/aurorus/back.png b/graphics/pokemon/gen_6/aurorus/back.png similarity index 100% rename from graphics/pokemon/aurorus/back.png rename to graphics/pokemon/gen_6/aurorus/back.png diff --git a/graphics/pokemon/aurorus/footprint.png b/graphics/pokemon/gen_6/aurorus/footprint.png similarity index 100% rename from graphics/pokemon/aurorus/footprint.png rename to graphics/pokemon/gen_6/aurorus/footprint.png diff --git a/graphics/pokemon/aurorus/icon.png b/graphics/pokemon/gen_6/aurorus/icon.png similarity index 100% rename from graphics/pokemon/aurorus/icon.png rename to graphics/pokemon/gen_6/aurorus/icon.png diff --git a/graphics/pokemon/aurorus/normal.pal b/graphics/pokemon/gen_6/aurorus/normal.pal similarity index 100% rename from graphics/pokemon/aurorus/normal.pal rename to graphics/pokemon/gen_6/aurorus/normal.pal diff --git a/graphics/pokemon/aurorus/shiny.pal b/graphics/pokemon/gen_6/aurorus/shiny.pal similarity index 100% rename from graphics/pokemon/aurorus/shiny.pal rename to graphics/pokemon/gen_6/aurorus/shiny.pal diff --git a/graphics/pokemon/avalugg/anim_front.png b/graphics/pokemon/gen_6/avalugg/anim_front.png similarity index 100% rename from graphics/pokemon/avalugg/anim_front.png rename to graphics/pokemon/gen_6/avalugg/anim_front.png diff --git a/graphics/pokemon/avalugg/back.png b/graphics/pokemon/gen_6/avalugg/back.png similarity index 100% rename from graphics/pokemon/avalugg/back.png rename to graphics/pokemon/gen_6/avalugg/back.png diff --git a/graphics/pokemon/avalugg/footprint.png b/graphics/pokemon/gen_6/avalugg/footprint.png similarity index 100% rename from graphics/pokemon/avalugg/footprint.png rename to graphics/pokemon/gen_6/avalugg/footprint.png diff --git a/graphics/pokemon/avalugg/hisuian/back.png b/graphics/pokemon/gen_6/avalugg/hisuian/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/avalugg/hisuian/back.png rename to graphics/pokemon/gen_6/avalugg/hisuian/back.png diff --git a/graphics/pokemon/avalugg/hisuian/front.png b/graphics/pokemon/gen_6/avalugg/hisuian/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/avalugg/hisuian/front.png rename to graphics/pokemon/gen_6/avalugg/hisuian/front.png diff --git a/graphics/pokemon/avalugg/hisuian/icon.png b/graphics/pokemon/gen_6/avalugg/hisuian/icon.png similarity index 100% rename from graphics/pokemon/avalugg/hisuian/icon.png rename to graphics/pokemon/gen_6/avalugg/hisuian/icon.png diff --git a/graphics/pokemon/avalugg/hisuian/normal.pal b/graphics/pokemon/gen_6/avalugg/hisuian/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/avalugg/hisuian/normal.pal rename to graphics/pokemon/gen_6/avalugg/hisuian/normal.pal diff --git a/graphics/pokemon/avalugg/hisuian/shiny.pal b/graphics/pokemon/gen_6/avalugg/hisuian/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/avalugg/hisuian/shiny.pal rename to graphics/pokemon/gen_6/avalugg/hisuian/shiny.pal diff --git a/graphics/pokemon/avalugg/icon.png b/graphics/pokemon/gen_6/avalugg/icon.png similarity index 100% rename from graphics/pokemon/avalugg/icon.png rename to graphics/pokemon/gen_6/avalugg/icon.png diff --git a/graphics/pokemon/avalugg/normal.pal b/graphics/pokemon/gen_6/avalugg/normal.pal similarity index 100% rename from graphics/pokemon/avalugg/normal.pal rename to graphics/pokemon/gen_6/avalugg/normal.pal diff --git a/graphics/pokemon/avalugg/shiny.pal b/graphics/pokemon/gen_6/avalugg/shiny.pal similarity index 100% rename from graphics/pokemon/avalugg/shiny.pal rename to graphics/pokemon/gen_6/avalugg/shiny.pal diff --git a/graphics/pokemon/barbaracle/anim_front.png b/graphics/pokemon/gen_6/barbaracle/anim_front.png similarity index 100% rename from graphics/pokemon/barbaracle/anim_front.png rename to graphics/pokemon/gen_6/barbaracle/anim_front.png diff --git a/graphics/pokemon/barbaracle/back.png b/graphics/pokemon/gen_6/barbaracle/back.png similarity index 100% rename from graphics/pokemon/barbaracle/back.png rename to graphics/pokemon/gen_6/barbaracle/back.png diff --git a/graphics/pokemon/barbaracle/footprint.png b/graphics/pokemon/gen_6/barbaracle/footprint.png similarity index 100% rename from graphics/pokemon/barbaracle/footprint.png rename to graphics/pokemon/gen_6/barbaracle/footprint.png diff --git a/graphics/pokemon/barbaracle/icon.png b/graphics/pokemon/gen_6/barbaracle/icon.png similarity index 100% rename from graphics/pokemon/barbaracle/icon.png rename to graphics/pokemon/gen_6/barbaracle/icon.png diff --git a/graphics/pokemon/barbaracle/normal.pal b/graphics/pokemon/gen_6/barbaracle/normal.pal similarity index 100% rename from graphics/pokemon/barbaracle/normal.pal rename to graphics/pokemon/gen_6/barbaracle/normal.pal diff --git a/graphics/pokemon/barbaracle/shiny.pal b/graphics/pokemon/gen_6/barbaracle/shiny.pal similarity index 100% rename from graphics/pokemon/barbaracle/shiny.pal rename to graphics/pokemon/gen_6/barbaracle/shiny.pal diff --git a/graphics/pokemon/bergmite/anim_front.png b/graphics/pokemon/gen_6/bergmite/anim_front.png similarity index 100% rename from graphics/pokemon/bergmite/anim_front.png rename to graphics/pokemon/gen_6/bergmite/anim_front.png diff --git a/graphics/pokemon/bergmite/back.png b/graphics/pokemon/gen_6/bergmite/back.png similarity index 100% rename from graphics/pokemon/bergmite/back.png rename to graphics/pokemon/gen_6/bergmite/back.png diff --git a/graphics/pokemon/pincurchin/footprint.png b/graphics/pokemon/gen_6/bergmite/footprint.png similarity index 100% rename from graphics/pokemon/pincurchin/footprint.png rename to graphics/pokemon/gen_6/bergmite/footprint.png diff --git a/graphics/pokemon/bergmite/icon.png b/graphics/pokemon/gen_6/bergmite/icon.png similarity index 100% rename from graphics/pokemon/bergmite/icon.png rename to graphics/pokemon/gen_6/bergmite/icon.png diff --git a/graphics/pokemon/bergmite/normal.pal b/graphics/pokemon/gen_6/bergmite/normal.pal similarity index 100% rename from graphics/pokemon/bergmite/normal.pal rename to graphics/pokemon/gen_6/bergmite/normal.pal diff --git a/graphics/pokemon/bergmite/shiny.pal b/graphics/pokemon/gen_6/bergmite/shiny.pal similarity index 100% rename from graphics/pokemon/bergmite/shiny.pal rename to graphics/pokemon/gen_6/bergmite/shiny.pal diff --git a/graphics/pokemon/binacle/anim_front.png b/graphics/pokemon/gen_6/binacle/anim_front.png similarity index 100% rename from graphics/pokemon/binacle/anim_front.png rename to graphics/pokemon/gen_6/binacle/anim_front.png diff --git a/graphics/pokemon/binacle/back.png b/graphics/pokemon/gen_6/binacle/back.png similarity index 100% rename from graphics/pokemon/binacle/back.png rename to graphics/pokemon/gen_6/binacle/back.png diff --git a/graphics/pokemon/sandygast/footprint.png b/graphics/pokemon/gen_6/binacle/footprint.png similarity index 100% rename from graphics/pokemon/sandygast/footprint.png rename to graphics/pokemon/gen_6/binacle/footprint.png diff --git a/graphics/pokemon/binacle/icon.png b/graphics/pokemon/gen_6/binacle/icon.png similarity index 100% rename from graphics/pokemon/binacle/icon.png rename to graphics/pokemon/gen_6/binacle/icon.png diff --git a/graphics/pokemon/binacle/normal.pal b/graphics/pokemon/gen_6/binacle/normal.pal similarity index 100% rename from graphics/pokemon/binacle/normal.pal rename to graphics/pokemon/gen_6/binacle/normal.pal diff --git a/graphics/pokemon/binacle/shiny.pal b/graphics/pokemon/gen_6/binacle/shiny.pal similarity index 100% rename from graphics/pokemon/binacle/shiny.pal rename to graphics/pokemon/gen_6/binacle/shiny.pal diff --git a/graphics/pokemon/braixen/anim_front.png b/graphics/pokemon/gen_6/braixen/anim_front.png similarity index 100% rename from graphics/pokemon/braixen/anim_front.png rename to graphics/pokemon/gen_6/braixen/anim_front.png diff --git a/graphics/pokemon/braixen/back.png b/graphics/pokemon/gen_6/braixen/back.png similarity index 100% rename from graphics/pokemon/braixen/back.png rename to graphics/pokemon/gen_6/braixen/back.png diff --git a/graphics/pokemon/braixen/footprint.png b/graphics/pokemon/gen_6/braixen/footprint.png similarity index 100% rename from graphics/pokemon/braixen/footprint.png rename to graphics/pokemon/gen_6/braixen/footprint.png diff --git a/graphics/pokemon/braixen/icon.png b/graphics/pokemon/gen_6/braixen/icon.png similarity index 100% rename from graphics/pokemon/braixen/icon.png rename to graphics/pokemon/gen_6/braixen/icon.png diff --git a/graphics/pokemon/braixen/normal.pal b/graphics/pokemon/gen_6/braixen/normal.pal similarity index 100% rename from graphics/pokemon/braixen/normal.pal rename to graphics/pokemon/gen_6/braixen/normal.pal diff --git a/graphics/pokemon/braixen/shiny.pal b/graphics/pokemon/gen_6/braixen/shiny.pal similarity index 100% rename from graphics/pokemon/braixen/shiny.pal rename to graphics/pokemon/gen_6/braixen/shiny.pal diff --git a/graphics/pokemon/bunnelby/anim_front.png b/graphics/pokemon/gen_6/bunnelby/anim_front.png similarity index 100% rename from graphics/pokemon/bunnelby/anim_front.png rename to graphics/pokemon/gen_6/bunnelby/anim_front.png diff --git a/graphics/pokemon/bunnelby/back.png b/graphics/pokemon/gen_6/bunnelby/back.png similarity index 100% rename from graphics/pokemon/bunnelby/back.png rename to graphics/pokemon/gen_6/bunnelby/back.png diff --git a/graphics/pokemon/scraggy/footprint.png b/graphics/pokemon/gen_6/bunnelby/footprint.png similarity index 100% rename from graphics/pokemon/scraggy/footprint.png rename to graphics/pokemon/gen_6/bunnelby/footprint.png diff --git a/graphics/pokemon/bunnelby/icon.png b/graphics/pokemon/gen_6/bunnelby/icon.png similarity index 100% rename from graphics/pokemon/bunnelby/icon.png rename to graphics/pokemon/gen_6/bunnelby/icon.png diff --git a/graphics/pokemon/bunnelby/normal.pal b/graphics/pokemon/gen_6/bunnelby/normal.pal similarity index 100% rename from graphics/pokemon/bunnelby/normal.pal rename to graphics/pokemon/gen_6/bunnelby/normal.pal diff --git a/graphics/pokemon/bunnelby/shiny.pal b/graphics/pokemon/gen_6/bunnelby/shiny.pal similarity index 100% rename from graphics/pokemon/bunnelby/shiny.pal rename to graphics/pokemon/gen_6/bunnelby/shiny.pal diff --git a/graphics/pokemon/carbink/anim_front.png b/graphics/pokemon/gen_6/carbink/anim_front.png similarity index 100% rename from graphics/pokemon/carbink/anim_front.png rename to graphics/pokemon/gen_6/carbink/anim_front.png diff --git a/graphics/pokemon/carbink/back.png b/graphics/pokemon/gen_6/carbink/back.png similarity index 100% rename from graphics/pokemon/carbink/back.png rename to graphics/pokemon/gen_6/carbink/back.png diff --git a/graphics/pokemon/seadra/footprint.png b/graphics/pokemon/gen_6/carbink/footprint.png similarity index 100% rename from graphics/pokemon/seadra/footprint.png rename to graphics/pokemon/gen_6/carbink/footprint.png diff --git a/graphics/pokemon/carbink/icon.png b/graphics/pokemon/gen_6/carbink/icon.png similarity index 100% rename from graphics/pokemon/carbink/icon.png rename to graphics/pokemon/gen_6/carbink/icon.png diff --git a/graphics/pokemon/carbink/normal.pal b/graphics/pokemon/gen_6/carbink/normal.pal similarity index 100% rename from graphics/pokemon/carbink/normal.pal rename to graphics/pokemon/gen_6/carbink/normal.pal diff --git a/graphics/pokemon/carbink/shiny.pal b/graphics/pokemon/gen_6/carbink/shiny.pal similarity index 100% rename from graphics/pokemon/carbink/shiny.pal rename to graphics/pokemon/gen_6/carbink/shiny.pal diff --git a/graphics/pokemon/chesnaught/anim_front.png b/graphics/pokemon/gen_6/chesnaught/anim_front.png similarity index 100% rename from graphics/pokemon/chesnaught/anim_front.png rename to graphics/pokemon/gen_6/chesnaught/anim_front.png diff --git a/graphics/pokemon/chesnaught/back.png b/graphics/pokemon/gen_6/chesnaught/back.png similarity index 100% rename from graphics/pokemon/chesnaught/back.png rename to graphics/pokemon/gen_6/chesnaught/back.png diff --git a/graphics/pokemon/chesnaught/footprint.png b/graphics/pokemon/gen_6/chesnaught/footprint.png similarity index 100% rename from graphics/pokemon/chesnaught/footprint.png rename to graphics/pokemon/gen_6/chesnaught/footprint.png diff --git a/graphics/pokemon/chesnaught/icon.png b/graphics/pokemon/gen_6/chesnaught/icon.png similarity index 100% rename from graphics/pokemon/chesnaught/icon.png rename to graphics/pokemon/gen_6/chesnaught/icon.png diff --git a/graphics/pokemon/chesnaught/normal.pal b/graphics/pokemon/gen_6/chesnaught/normal.pal similarity index 100% rename from graphics/pokemon/chesnaught/normal.pal rename to graphics/pokemon/gen_6/chesnaught/normal.pal diff --git a/graphics/pokemon/chesnaught/shiny.pal b/graphics/pokemon/gen_6/chesnaught/shiny.pal similarity index 100% rename from graphics/pokemon/chesnaught/shiny.pal rename to graphics/pokemon/gen_6/chesnaught/shiny.pal diff --git a/graphics/pokemon/chespin/anim_front.png b/graphics/pokemon/gen_6/chespin/anim_front.png similarity index 100% rename from graphics/pokemon/chespin/anim_front.png rename to graphics/pokemon/gen_6/chespin/anim_front.png diff --git a/graphics/pokemon/chespin/back.png b/graphics/pokemon/gen_6/chespin/back.png similarity index 100% rename from graphics/pokemon/chespin/back.png rename to graphics/pokemon/gen_6/chespin/back.png diff --git a/graphics/pokemon/chespin/footprint.png b/graphics/pokemon/gen_6/chespin/footprint.png similarity index 100% rename from graphics/pokemon/chespin/footprint.png rename to graphics/pokemon/gen_6/chespin/footprint.png diff --git a/graphics/pokemon/chespin/icon.png b/graphics/pokemon/gen_6/chespin/icon.png similarity index 100% rename from graphics/pokemon/chespin/icon.png rename to graphics/pokemon/gen_6/chespin/icon.png diff --git a/graphics/pokemon/chespin/normal.pal b/graphics/pokemon/gen_6/chespin/normal.pal similarity index 100% rename from graphics/pokemon/chespin/normal.pal rename to graphics/pokemon/gen_6/chespin/normal.pal diff --git a/graphics/pokemon/chespin/shiny.pal b/graphics/pokemon/gen_6/chespin/shiny.pal similarity index 100% rename from graphics/pokemon/chespin/shiny.pal rename to graphics/pokemon/gen_6/chespin/shiny.pal diff --git a/graphics/pokemon/clauncher/anim_front.png b/graphics/pokemon/gen_6/clauncher/anim_front.png similarity index 100% rename from graphics/pokemon/clauncher/anim_front.png rename to graphics/pokemon/gen_6/clauncher/anim_front.png diff --git a/graphics/pokemon/clauncher/back.png b/graphics/pokemon/gen_6/clauncher/back.png similarity index 100% rename from graphics/pokemon/clauncher/back.png rename to graphics/pokemon/gen_6/clauncher/back.png diff --git a/graphics/pokemon/pumpkaboo/footprint.png b/graphics/pokemon/gen_6/clauncher/footprint.png similarity index 100% rename from graphics/pokemon/pumpkaboo/footprint.png rename to graphics/pokemon/gen_6/clauncher/footprint.png diff --git a/graphics/pokemon/clauncher/icon.png b/graphics/pokemon/gen_6/clauncher/icon.png similarity index 100% rename from graphics/pokemon/clauncher/icon.png rename to graphics/pokemon/gen_6/clauncher/icon.png diff --git a/graphics/pokemon/clauncher/normal.pal b/graphics/pokemon/gen_6/clauncher/normal.pal similarity index 100% rename from graphics/pokemon/clauncher/normal.pal rename to graphics/pokemon/gen_6/clauncher/normal.pal diff --git a/graphics/pokemon/clauncher/shiny.pal b/graphics/pokemon/gen_6/clauncher/shiny.pal similarity index 100% rename from graphics/pokemon/clauncher/shiny.pal rename to graphics/pokemon/gen_6/clauncher/shiny.pal diff --git a/graphics/pokemon/clawitzer/anim_front.png b/graphics/pokemon/gen_6/clawitzer/anim_front.png similarity index 100% rename from graphics/pokemon/clawitzer/anim_front.png rename to graphics/pokemon/gen_6/clawitzer/anim_front.png diff --git a/graphics/pokemon/clawitzer/back.png b/graphics/pokemon/gen_6/clawitzer/back.png similarity index 100% rename from graphics/pokemon/clawitzer/back.png rename to graphics/pokemon/gen_6/clawitzer/back.png diff --git a/graphics/pokemon/seaking/footprint.png b/graphics/pokemon/gen_6/clawitzer/footprint.png similarity index 100% rename from graphics/pokemon/seaking/footprint.png rename to graphics/pokemon/gen_6/clawitzer/footprint.png diff --git a/graphics/pokemon/clawitzer/icon.png b/graphics/pokemon/gen_6/clawitzer/icon.png similarity index 100% rename from graphics/pokemon/clawitzer/icon.png rename to graphics/pokemon/gen_6/clawitzer/icon.png diff --git a/graphics/pokemon/clawitzer/normal.pal b/graphics/pokemon/gen_6/clawitzer/normal.pal similarity index 100% rename from graphics/pokemon/clawitzer/normal.pal rename to graphics/pokemon/gen_6/clawitzer/normal.pal diff --git a/graphics/pokemon/clawitzer/shiny.pal b/graphics/pokemon/gen_6/clawitzer/shiny.pal similarity index 100% rename from graphics/pokemon/clawitzer/shiny.pal rename to graphics/pokemon/gen_6/clawitzer/shiny.pal diff --git a/graphics/pokemon/dedenne/anim_front.png b/graphics/pokemon/gen_6/dedenne/anim_front.png similarity index 100% rename from graphics/pokemon/dedenne/anim_front.png rename to graphics/pokemon/gen_6/dedenne/anim_front.png diff --git a/graphics/pokemon/dedenne/back.png b/graphics/pokemon/gen_6/dedenne/back.png similarity index 100% rename from graphics/pokemon/dedenne/back.png rename to graphics/pokemon/gen_6/dedenne/back.png diff --git a/graphics/pokemon/dedenne/footprint.png b/graphics/pokemon/gen_6/dedenne/footprint.png similarity index 100% rename from graphics/pokemon/dedenne/footprint.png rename to graphics/pokemon/gen_6/dedenne/footprint.png diff --git a/graphics/pokemon/dedenne/icon.png b/graphics/pokemon/gen_6/dedenne/icon.png similarity index 100% rename from graphics/pokemon/dedenne/icon.png rename to graphics/pokemon/gen_6/dedenne/icon.png diff --git a/graphics/pokemon/dedenne/normal.pal b/graphics/pokemon/gen_6/dedenne/normal.pal similarity index 100% rename from graphics/pokemon/dedenne/normal.pal rename to graphics/pokemon/gen_6/dedenne/normal.pal diff --git a/graphics/pokemon/dedenne/shiny.pal b/graphics/pokemon/gen_6/dedenne/shiny.pal similarity index 100% rename from graphics/pokemon/dedenne/shiny.pal rename to graphics/pokemon/gen_6/dedenne/shiny.pal diff --git a/graphics/pokemon/delphox/anim_front.png b/graphics/pokemon/gen_6/delphox/anim_front.png similarity index 100% rename from graphics/pokemon/delphox/anim_front.png rename to graphics/pokemon/gen_6/delphox/anim_front.png diff --git a/graphics/pokemon/delphox/back.png b/graphics/pokemon/gen_6/delphox/back.png similarity index 100% rename from graphics/pokemon/delphox/back.png rename to graphics/pokemon/gen_6/delphox/back.png diff --git a/graphics/pokemon/delphox/footprint.png b/graphics/pokemon/gen_6/delphox/footprint.png similarity index 100% rename from graphics/pokemon/delphox/footprint.png rename to graphics/pokemon/gen_6/delphox/footprint.png diff --git a/graphics/pokemon/delphox/icon.png b/graphics/pokemon/gen_6/delphox/icon.png similarity index 100% rename from graphics/pokemon/delphox/icon.png rename to graphics/pokemon/gen_6/delphox/icon.png diff --git a/graphics/pokemon/delphox/normal.pal b/graphics/pokemon/gen_6/delphox/normal.pal similarity index 100% rename from graphics/pokemon/delphox/normal.pal rename to graphics/pokemon/gen_6/delphox/normal.pal diff --git a/graphics/pokemon/delphox/shiny.pal b/graphics/pokemon/gen_6/delphox/shiny.pal similarity index 100% rename from graphics/pokemon/delphox/shiny.pal rename to graphics/pokemon/gen_6/delphox/shiny.pal diff --git a/graphics/pokemon/diancie/anim_front.png b/graphics/pokemon/gen_6/diancie/anim_front.png similarity index 100% rename from graphics/pokemon/diancie/anim_front.png rename to graphics/pokemon/gen_6/diancie/anim_front.png diff --git a/graphics/pokemon/diancie/back.png b/graphics/pokemon/gen_6/diancie/back.png similarity index 100% rename from graphics/pokemon/diancie/back.png rename to graphics/pokemon/gen_6/diancie/back.png diff --git a/graphics/pokemon/sealeo/footprint.png b/graphics/pokemon/gen_6/diancie/footprint.png similarity index 100% rename from graphics/pokemon/sealeo/footprint.png rename to graphics/pokemon/gen_6/diancie/footprint.png diff --git a/graphics/pokemon/diancie/icon.png b/graphics/pokemon/gen_6/diancie/icon.png similarity index 100% rename from graphics/pokemon/diancie/icon.png rename to graphics/pokemon/gen_6/diancie/icon.png diff --git a/graphics/pokemon/diancie/mega/back.png b/graphics/pokemon/gen_6/diancie/mega/back.png similarity index 100% rename from graphics/pokemon/diancie/mega/back.png rename to graphics/pokemon/gen_6/diancie/mega/back.png diff --git a/graphics/pokemon/diancie/mega/front.png b/graphics/pokemon/gen_6/diancie/mega/front.png similarity index 100% rename from graphics/pokemon/diancie/mega/front.png rename to graphics/pokemon/gen_6/diancie/mega/front.png diff --git a/graphics/pokemon/diancie/mega/icon.png b/graphics/pokemon/gen_6/diancie/mega/icon.png similarity index 100% rename from graphics/pokemon/diancie/mega/icon.png rename to graphics/pokemon/gen_6/diancie/mega/icon.png diff --git a/graphics/pokemon/diancie/mega/normal.pal b/graphics/pokemon/gen_6/diancie/mega/normal.pal similarity index 100% rename from graphics/pokemon/diancie/mega/normal.pal rename to graphics/pokemon/gen_6/diancie/mega/normal.pal diff --git a/graphics/pokemon/diancie/mega/shiny.pal b/graphics/pokemon/gen_6/diancie/mega/shiny.pal similarity index 100% rename from graphics/pokemon/diancie/mega/shiny.pal rename to graphics/pokemon/gen_6/diancie/mega/shiny.pal diff --git a/graphics/pokemon/diancie/normal.pal b/graphics/pokemon/gen_6/diancie/normal.pal similarity index 100% rename from graphics/pokemon/diancie/normal.pal rename to graphics/pokemon/gen_6/diancie/normal.pal diff --git a/graphics/pokemon/diancie/shiny.pal b/graphics/pokemon/gen_6/diancie/shiny.pal similarity index 100% rename from graphics/pokemon/diancie/shiny.pal rename to graphics/pokemon/gen_6/diancie/shiny.pal diff --git a/graphics/pokemon/diggersby/anim_front.png b/graphics/pokemon/gen_6/diggersby/anim_front.png similarity index 100% rename from graphics/pokemon/diggersby/anim_front.png rename to graphics/pokemon/gen_6/diggersby/anim_front.png diff --git a/graphics/pokemon/diggersby/back.png b/graphics/pokemon/gen_6/diggersby/back.png similarity index 100% rename from graphics/pokemon/diggersby/back.png rename to graphics/pokemon/gen_6/diggersby/back.png diff --git a/graphics/pokemon/diggersby/footprint.png b/graphics/pokemon/gen_6/diggersby/footprint.png similarity index 100% rename from graphics/pokemon/diggersby/footprint.png rename to graphics/pokemon/gen_6/diggersby/footprint.png diff --git a/graphics/pokemon/diggersby/icon.png b/graphics/pokemon/gen_6/diggersby/icon.png similarity index 100% rename from graphics/pokemon/diggersby/icon.png rename to graphics/pokemon/gen_6/diggersby/icon.png diff --git a/graphics/pokemon/diggersby/normal.pal b/graphics/pokemon/gen_6/diggersby/normal.pal similarity index 100% rename from graphics/pokemon/diggersby/normal.pal rename to graphics/pokemon/gen_6/diggersby/normal.pal diff --git a/graphics/pokemon/diggersby/shiny.pal b/graphics/pokemon/gen_6/diggersby/shiny.pal similarity index 100% rename from graphics/pokemon/diggersby/shiny.pal rename to graphics/pokemon/gen_6/diggersby/shiny.pal diff --git a/graphics/pokemon/doublade/anim_front.png b/graphics/pokemon/gen_6/doublade/anim_front.png similarity index 100% rename from graphics/pokemon/doublade/anim_front.png rename to graphics/pokemon/gen_6/doublade/anim_front.png diff --git a/graphics/pokemon/doublade/back.png b/graphics/pokemon/gen_6/doublade/back.png similarity index 100% rename from graphics/pokemon/doublade/back.png rename to graphics/pokemon/gen_6/doublade/back.png diff --git a/graphics/pokemon/seel/footprint.png b/graphics/pokemon/gen_6/doublade/footprint.png similarity index 100% rename from graphics/pokemon/seel/footprint.png rename to graphics/pokemon/gen_6/doublade/footprint.png diff --git a/graphics/pokemon/doublade/icon.png b/graphics/pokemon/gen_6/doublade/icon.png similarity index 100% rename from graphics/pokemon/doublade/icon.png rename to graphics/pokemon/gen_6/doublade/icon.png diff --git a/graphics/pokemon/doublade/normal.pal b/graphics/pokemon/gen_6/doublade/normal.pal similarity index 100% rename from graphics/pokemon/doublade/normal.pal rename to graphics/pokemon/gen_6/doublade/normal.pal diff --git a/graphics/pokemon/doublade/shiny.pal b/graphics/pokemon/gen_6/doublade/shiny.pal similarity index 100% rename from graphics/pokemon/doublade/shiny.pal rename to graphics/pokemon/gen_6/doublade/shiny.pal diff --git a/graphics/pokemon/dragalge/anim_front.png b/graphics/pokemon/gen_6/dragalge/anim_front.png similarity index 100% rename from graphics/pokemon/dragalge/anim_front.png rename to graphics/pokemon/gen_6/dragalge/anim_front.png diff --git a/graphics/pokemon/dragalge/back.png b/graphics/pokemon/gen_6/dragalge/back.png similarity index 100% rename from graphics/pokemon/dragalge/back.png rename to graphics/pokemon/gen_6/dragalge/back.png diff --git a/graphics/pokemon/serperior/footprint.png b/graphics/pokemon/gen_6/dragalge/footprint.png similarity index 100% rename from graphics/pokemon/serperior/footprint.png rename to graphics/pokemon/gen_6/dragalge/footprint.png diff --git a/graphics/pokemon/dragalge/icon.png b/graphics/pokemon/gen_6/dragalge/icon.png similarity index 100% rename from graphics/pokemon/dragalge/icon.png rename to graphics/pokemon/gen_6/dragalge/icon.png diff --git a/graphics/pokemon/dragalge/normal.pal b/graphics/pokemon/gen_6/dragalge/normal.pal similarity index 100% rename from graphics/pokemon/dragalge/normal.pal rename to graphics/pokemon/gen_6/dragalge/normal.pal diff --git a/graphics/pokemon/dragalge/shiny.pal b/graphics/pokemon/gen_6/dragalge/shiny.pal similarity index 100% rename from graphics/pokemon/dragalge/shiny.pal rename to graphics/pokemon/gen_6/dragalge/shiny.pal diff --git a/graphics/pokemon/espurr/anim_front.png b/graphics/pokemon/gen_6/espurr/anim_front.png similarity index 100% rename from graphics/pokemon/espurr/anim_front.png rename to graphics/pokemon/gen_6/espurr/anim_front.png diff --git a/graphics/pokemon/espurr/back.png b/graphics/pokemon/gen_6/espurr/back.png similarity index 100% rename from graphics/pokemon/espurr/back.png rename to graphics/pokemon/gen_6/espurr/back.png diff --git a/graphics/pokemon/ralts/footprint.png b/graphics/pokemon/gen_6/espurr/footprint.png similarity index 100% rename from graphics/pokemon/ralts/footprint.png rename to graphics/pokemon/gen_6/espurr/footprint.png diff --git a/graphics/pokemon/espurr/icon.png b/graphics/pokemon/gen_6/espurr/icon.png similarity index 100% rename from graphics/pokemon/espurr/icon.png rename to graphics/pokemon/gen_6/espurr/icon.png diff --git a/graphics/pokemon/espurr/normal.pal b/graphics/pokemon/gen_6/espurr/normal.pal similarity index 100% rename from graphics/pokemon/espurr/normal.pal rename to graphics/pokemon/gen_6/espurr/normal.pal diff --git a/graphics/pokemon/espurr/shiny.pal b/graphics/pokemon/gen_6/espurr/shiny.pal similarity index 100% rename from graphics/pokemon/espurr/shiny.pal rename to graphics/pokemon/gen_6/espurr/shiny.pal diff --git a/graphics/pokemon/fennekin/anim_front.png b/graphics/pokemon/gen_6/fennekin/anim_front.png similarity index 100% rename from graphics/pokemon/fennekin/anim_front.png rename to graphics/pokemon/gen_6/fennekin/anim_front.png diff --git a/graphics/pokemon/fennekin/back.png b/graphics/pokemon/gen_6/fennekin/back.png similarity index 100% rename from graphics/pokemon/fennekin/back.png rename to graphics/pokemon/gen_6/fennekin/back.png diff --git a/graphics/pokemon/joltik/footprint.png b/graphics/pokemon/gen_6/fennekin/footprint.png similarity index 100% rename from graphics/pokemon/joltik/footprint.png rename to graphics/pokemon/gen_6/fennekin/footprint.png diff --git a/graphics/pokemon/fennekin/icon.png b/graphics/pokemon/gen_6/fennekin/icon.png similarity index 100% rename from graphics/pokemon/fennekin/icon.png rename to graphics/pokemon/gen_6/fennekin/icon.png diff --git a/graphics/pokemon/fennekin/normal.pal b/graphics/pokemon/gen_6/fennekin/normal.pal similarity index 100% rename from graphics/pokemon/fennekin/normal.pal rename to graphics/pokemon/gen_6/fennekin/normal.pal diff --git a/graphics/pokemon/fennekin/shiny.pal b/graphics/pokemon/gen_6/fennekin/shiny.pal similarity index 100% rename from graphics/pokemon/fennekin/shiny.pal rename to graphics/pokemon/gen_6/fennekin/shiny.pal diff --git a/graphics/pokemon/flabebe/anim_front.png b/graphics/pokemon/gen_6/flabebe/anim_front.png similarity index 100% rename from graphics/pokemon/flabebe/anim_front.png rename to graphics/pokemon/gen_6/flabebe/anim_front.png diff --git a/graphics/pokemon/flabebe/back.png b/graphics/pokemon/gen_6/flabebe/back.png similarity index 100% rename from graphics/pokemon/flabebe/back.png rename to graphics/pokemon/gen_6/flabebe/back.png diff --git a/graphics/pokemon/flabebe/blue_flower/icon.png b/graphics/pokemon/gen_6/flabebe/blue_flower/icon.png similarity index 100% rename from graphics/pokemon/flabebe/blue_flower/icon.png rename to graphics/pokemon/gen_6/flabebe/blue_flower/icon.png diff --git a/graphics/pokemon/flabebe/blue_flower/normal.pal b/graphics/pokemon/gen_6/flabebe/blue_flower/normal.pal similarity index 100% rename from graphics/pokemon/flabebe/blue_flower/normal.pal rename to graphics/pokemon/gen_6/flabebe/blue_flower/normal.pal diff --git a/graphics/pokemon/flabebe/blue_flower/shiny.pal b/graphics/pokemon/gen_6/flabebe/blue_flower/shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/blue_flower/shiny.pal rename to graphics/pokemon/gen_6/flabebe/blue_flower/shiny.pal diff --git a/graphics/pokemon/seviper/footprint.png b/graphics/pokemon/gen_6/flabebe/footprint.png similarity index 100% rename from graphics/pokemon/seviper/footprint.png rename to graphics/pokemon/gen_6/flabebe/footprint.png diff --git a/graphics/pokemon/flabebe/icon.png b/graphics/pokemon/gen_6/flabebe/icon.png similarity index 100% rename from graphics/pokemon/flabebe/icon.png rename to graphics/pokemon/gen_6/flabebe/icon.png diff --git a/graphics/pokemon/flabebe/normal.pal b/graphics/pokemon/gen_6/flabebe/normal.pal similarity index 100% rename from graphics/pokemon/flabebe/normal.pal rename to graphics/pokemon/gen_6/flabebe/normal.pal diff --git a/graphics/pokemon/flabebe/orange_flower/icon.png b/graphics/pokemon/gen_6/flabebe/orange_flower/icon.png similarity index 100% rename from graphics/pokemon/flabebe/orange_flower/icon.png rename to graphics/pokemon/gen_6/flabebe/orange_flower/icon.png diff --git a/graphics/pokemon/flabebe/orange_flower/normal.pal b/graphics/pokemon/gen_6/flabebe/orange_flower/normal.pal similarity index 100% rename from graphics/pokemon/flabebe/orange_flower/normal.pal rename to graphics/pokemon/gen_6/flabebe/orange_flower/normal.pal diff --git a/graphics/pokemon/flabebe/orange_flower/shiny.pal b/graphics/pokemon/gen_6/flabebe/orange_flower/shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/orange_flower/shiny.pal rename to graphics/pokemon/gen_6/flabebe/orange_flower/shiny.pal diff --git a/graphics/pokemon/flabebe/shiny.pal b/graphics/pokemon/gen_6/flabebe/shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/shiny.pal rename to graphics/pokemon/gen_6/flabebe/shiny.pal diff --git a/graphics/pokemon/flabebe/white_flower/icon.png b/graphics/pokemon/gen_6/flabebe/white_flower/icon.png similarity index 100% rename from graphics/pokemon/flabebe/white_flower/icon.png rename to graphics/pokemon/gen_6/flabebe/white_flower/icon.png diff --git a/graphics/pokemon/flabebe/white_flower/normal.pal b/graphics/pokemon/gen_6/flabebe/white_flower/normal.pal similarity index 100% rename from graphics/pokemon/flabebe/white_flower/normal.pal rename to graphics/pokemon/gen_6/flabebe/white_flower/normal.pal diff --git a/graphics/pokemon/flabebe/white_flower/shiny.pal b/graphics/pokemon/gen_6/flabebe/white_flower/shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/white_flower/shiny.pal rename to graphics/pokemon/gen_6/flabebe/white_flower/shiny.pal diff --git a/graphics/pokemon/flabebe/yellow_flower/icon.png b/graphics/pokemon/gen_6/flabebe/yellow_flower/icon.png similarity index 100% rename from graphics/pokemon/flabebe/yellow_flower/icon.png rename to graphics/pokemon/gen_6/flabebe/yellow_flower/icon.png diff --git a/graphics/pokemon/flabebe/yellow_flower/normal.pal b/graphics/pokemon/gen_6/flabebe/yellow_flower/normal.pal similarity index 100% rename from graphics/pokemon/flabebe/yellow_flower/normal.pal rename to graphics/pokemon/gen_6/flabebe/yellow_flower/normal.pal diff --git a/graphics/pokemon/flabebe/yellow_flower/shiny.pal b/graphics/pokemon/gen_6/flabebe/yellow_flower/shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/yellow_flower/shiny.pal rename to graphics/pokemon/gen_6/flabebe/yellow_flower/shiny.pal diff --git a/graphics/pokemon/fletchinder/anim_front.png b/graphics/pokemon/gen_6/fletchinder/anim_front.png similarity index 100% rename from graphics/pokemon/fletchinder/anim_front.png rename to graphics/pokemon/gen_6/fletchinder/anim_front.png diff --git a/graphics/pokemon/fletchinder/back.png b/graphics/pokemon/gen_6/fletchinder/back.png similarity index 100% rename from graphics/pokemon/fletchinder/back.png rename to graphics/pokemon/gen_6/fletchinder/back.png diff --git a/graphics/pokemon/fletchinder/footprint.png b/graphics/pokemon/gen_6/fletchinder/footprint.png similarity index 100% rename from graphics/pokemon/fletchinder/footprint.png rename to graphics/pokemon/gen_6/fletchinder/footprint.png diff --git a/graphics/pokemon/fletchinder/icon.png b/graphics/pokemon/gen_6/fletchinder/icon.png similarity index 100% rename from graphics/pokemon/fletchinder/icon.png rename to graphics/pokemon/gen_6/fletchinder/icon.png diff --git a/graphics/pokemon/fletchinder/normal.pal b/graphics/pokemon/gen_6/fletchinder/normal.pal similarity index 100% rename from graphics/pokemon/fletchinder/normal.pal rename to graphics/pokemon/gen_6/fletchinder/normal.pal diff --git a/graphics/pokemon/fletchinder/shiny.pal b/graphics/pokemon/gen_6/fletchinder/shiny.pal similarity index 100% rename from graphics/pokemon/fletchinder/shiny.pal rename to graphics/pokemon/gen_6/fletchinder/shiny.pal diff --git a/graphics/pokemon/fletchling/anim_front.png b/graphics/pokemon/gen_6/fletchling/anim_front.png similarity index 100% rename from graphics/pokemon/fletchling/anim_front.png rename to graphics/pokemon/gen_6/fletchling/anim_front.png diff --git a/graphics/pokemon/fletchling/back.png b/graphics/pokemon/gen_6/fletchling/back.png similarity index 100% rename from graphics/pokemon/fletchling/back.png rename to graphics/pokemon/gen_6/fletchling/back.png diff --git a/graphics/pokemon/fletchling/footprint.png b/graphics/pokemon/gen_6/fletchling/footprint.png similarity index 100% rename from graphics/pokemon/fletchling/footprint.png rename to graphics/pokemon/gen_6/fletchling/footprint.png diff --git a/graphics/pokemon/fletchling/icon.png b/graphics/pokemon/gen_6/fletchling/icon.png similarity index 100% rename from graphics/pokemon/fletchling/icon.png rename to graphics/pokemon/gen_6/fletchling/icon.png diff --git a/graphics/pokemon/fletchling/normal.pal b/graphics/pokemon/gen_6/fletchling/normal.pal similarity index 100% rename from graphics/pokemon/fletchling/normal.pal rename to graphics/pokemon/gen_6/fletchling/normal.pal diff --git a/graphics/pokemon/fletchling/shiny.pal b/graphics/pokemon/gen_6/fletchling/shiny.pal similarity index 100% rename from graphics/pokemon/fletchling/shiny.pal rename to graphics/pokemon/gen_6/fletchling/shiny.pal diff --git a/graphics/pokemon/floette/anim_front.png b/graphics/pokemon/gen_6/floette/anim_front.png similarity index 100% rename from graphics/pokemon/floette/anim_front.png rename to graphics/pokemon/gen_6/floette/anim_front.png diff --git a/graphics/pokemon/floette/back.png b/graphics/pokemon/gen_6/floette/back.png similarity index 100% rename from graphics/pokemon/floette/back.png rename to graphics/pokemon/gen_6/floette/back.png diff --git a/graphics/pokemon/floette/blue_flower/icon.png b/graphics/pokemon/gen_6/floette/blue_flower/icon.png similarity index 100% rename from graphics/pokemon/floette/blue_flower/icon.png rename to graphics/pokemon/gen_6/floette/blue_flower/icon.png diff --git a/graphics/pokemon/floette/blue_flower/normal.pal b/graphics/pokemon/gen_6/floette/blue_flower/normal.pal similarity index 100% rename from graphics/pokemon/floette/blue_flower/normal.pal rename to graphics/pokemon/gen_6/floette/blue_flower/normal.pal diff --git a/graphics/pokemon/floette/blue_flower/shiny.pal b/graphics/pokemon/gen_6/floette/blue_flower/shiny.pal similarity index 100% rename from graphics/pokemon/floette/blue_flower/shiny.pal rename to graphics/pokemon/gen_6/floette/blue_flower/shiny.pal diff --git a/graphics/pokemon/floette/eternal_flower/anim_front.png b/graphics/pokemon/gen_6/floette/eternal_flower/anim_front.png similarity index 100% rename from graphics/pokemon/floette/eternal_flower/anim_front.png rename to graphics/pokemon/gen_6/floette/eternal_flower/anim_front.png diff --git a/graphics/pokemon/floette/eternal_flower/back.png b/graphics/pokemon/gen_6/floette/eternal_flower/back.png similarity index 100% rename from graphics/pokemon/floette/eternal_flower/back.png rename to graphics/pokemon/gen_6/floette/eternal_flower/back.png diff --git a/graphics/pokemon/floette/eternal_flower/icon.png b/graphics/pokemon/gen_6/floette/eternal_flower/icon.png similarity index 100% rename from graphics/pokemon/floette/eternal_flower/icon.png rename to graphics/pokemon/gen_6/floette/eternal_flower/icon.png diff --git a/graphics/pokemon/floette/eternal_flower/normal.pal b/graphics/pokemon/gen_6/floette/eternal_flower/normal.pal similarity index 100% rename from graphics/pokemon/floette/eternal_flower/normal.pal rename to graphics/pokemon/gen_6/floette/eternal_flower/normal.pal diff --git a/graphics/pokemon/floette/eternal_flower/shiny.pal b/graphics/pokemon/gen_6/floette/eternal_flower/shiny.pal similarity index 100% rename from graphics/pokemon/floette/eternal_flower/shiny.pal rename to graphics/pokemon/gen_6/floette/eternal_flower/shiny.pal diff --git a/graphics/pokemon/sharpedo/footprint.png b/graphics/pokemon/gen_6/floette/footprint.png similarity index 100% rename from graphics/pokemon/sharpedo/footprint.png rename to graphics/pokemon/gen_6/floette/footprint.png diff --git a/graphics/pokemon/floette/icon.png b/graphics/pokemon/gen_6/floette/icon.png similarity index 100% rename from graphics/pokemon/floette/icon.png rename to graphics/pokemon/gen_6/floette/icon.png diff --git a/graphics/pokemon/floette/normal.pal b/graphics/pokemon/gen_6/floette/normal.pal similarity index 100% rename from graphics/pokemon/floette/normal.pal rename to graphics/pokemon/gen_6/floette/normal.pal diff --git a/graphics/pokemon/floette/orange_flower/icon.png b/graphics/pokemon/gen_6/floette/orange_flower/icon.png similarity index 100% rename from graphics/pokemon/floette/orange_flower/icon.png rename to graphics/pokemon/gen_6/floette/orange_flower/icon.png diff --git a/graphics/pokemon/floette/orange_flower/normal.pal b/graphics/pokemon/gen_6/floette/orange_flower/normal.pal similarity index 100% rename from graphics/pokemon/floette/orange_flower/normal.pal rename to graphics/pokemon/gen_6/floette/orange_flower/normal.pal diff --git a/graphics/pokemon/floette/orange_flower/shiny.pal b/graphics/pokemon/gen_6/floette/orange_flower/shiny.pal similarity index 100% rename from graphics/pokemon/floette/orange_flower/shiny.pal rename to graphics/pokemon/gen_6/floette/orange_flower/shiny.pal diff --git a/graphics/pokemon/floette/shiny.pal b/graphics/pokemon/gen_6/floette/shiny.pal similarity index 100% rename from graphics/pokemon/floette/shiny.pal rename to graphics/pokemon/gen_6/floette/shiny.pal diff --git a/graphics/pokemon/floette/white_flower/icon.png b/graphics/pokemon/gen_6/floette/white_flower/icon.png similarity index 100% rename from graphics/pokemon/floette/white_flower/icon.png rename to graphics/pokemon/gen_6/floette/white_flower/icon.png diff --git a/graphics/pokemon/floette/white_flower/normal.pal b/graphics/pokemon/gen_6/floette/white_flower/normal.pal similarity index 100% rename from graphics/pokemon/floette/white_flower/normal.pal rename to graphics/pokemon/gen_6/floette/white_flower/normal.pal diff --git a/graphics/pokemon/floette/white_flower/shiny.pal b/graphics/pokemon/gen_6/floette/white_flower/shiny.pal similarity index 100% rename from graphics/pokemon/floette/white_flower/shiny.pal rename to graphics/pokemon/gen_6/floette/white_flower/shiny.pal diff --git a/graphics/pokemon/floette/yellow_flower/icon.png b/graphics/pokemon/gen_6/floette/yellow_flower/icon.png similarity index 100% rename from graphics/pokemon/floette/yellow_flower/icon.png rename to graphics/pokemon/gen_6/floette/yellow_flower/icon.png diff --git a/graphics/pokemon/floette/yellow_flower/normal.pal b/graphics/pokemon/gen_6/floette/yellow_flower/normal.pal similarity index 100% rename from graphics/pokemon/floette/yellow_flower/normal.pal rename to graphics/pokemon/gen_6/floette/yellow_flower/normal.pal diff --git a/graphics/pokemon/floette/yellow_flower/shiny.pal b/graphics/pokemon/gen_6/floette/yellow_flower/shiny.pal similarity index 100% rename from graphics/pokemon/floette/yellow_flower/shiny.pal rename to graphics/pokemon/gen_6/floette/yellow_flower/shiny.pal diff --git a/graphics/pokemon/florges/anim_front.png b/graphics/pokemon/gen_6/florges/anim_front.png similarity index 100% rename from graphics/pokemon/florges/anim_front.png rename to graphics/pokemon/gen_6/florges/anim_front.png diff --git a/graphics/pokemon/florges/back.png b/graphics/pokemon/gen_6/florges/back.png similarity index 100% rename from graphics/pokemon/florges/back.png rename to graphics/pokemon/gen_6/florges/back.png diff --git a/graphics/pokemon/florges/blue_flower/icon.png b/graphics/pokemon/gen_6/florges/blue_flower/icon.png similarity index 100% rename from graphics/pokemon/florges/blue_flower/icon.png rename to graphics/pokemon/gen_6/florges/blue_flower/icon.png diff --git a/graphics/pokemon/florges/blue_flower/normal.pal b/graphics/pokemon/gen_6/florges/blue_flower/normal.pal similarity index 100% rename from graphics/pokemon/florges/blue_flower/normal.pal rename to graphics/pokemon/gen_6/florges/blue_flower/normal.pal diff --git a/graphics/pokemon/florges/blue_flower/shiny.pal b/graphics/pokemon/gen_6/florges/blue_flower/shiny.pal similarity index 100% rename from graphics/pokemon/florges/blue_flower/shiny.pal rename to graphics/pokemon/gen_6/florges/blue_flower/shiny.pal diff --git a/graphics/pokemon/shellder/footprint.png b/graphics/pokemon/gen_6/florges/footprint.png similarity index 100% rename from graphics/pokemon/shellder/footprint.png rename to graphics/pokemon/gen_6/florges/footprint.png diff --git a/graphics/pokemon/florges/icon.png b/graphics/pokemon/gen_6/florges/icon.png similarity index 100% rename from graphics/pokemon/florges/icon.png rename to graphics/pokemon/gen_6/florges/icon.png diff --git a/graphics/pokemon/florges/normal.pal b/graphics/pokemon/gen_6/florges/normal.pal similarity index 100% rename from graphics/pokemon/florges/normal.pal rename to graphics/pokemon/gen_6/florges/normal.pal diff --git a/graphics/pokemon/florges/orange_flower/icon.png b/graphics/pokemon/gen_6/florges/orange_flower/icon.png similarity index 100% rename from graphics/pokemon/florges/orange_flower/icon.png rename to graphics/pokemon/gen_6/florges/orange_flower/icon.png diff --git a/graphics/pokemon/florges/orange_flower/normal.pal b/graphics/pokemon/gen_6/florges/orange_flower/normal.pal similarity index 100% rename from graphics/pokemon/florges/orange_flower/normal.pal rename to graphics/pokemon/gen_6/florges/orange_flower/normal.pal diff --git a/graphics/pokemon/florges/orange_flower/shiny.pal b/graphics/pokemon/gen_6/florges/orange_flower/shiny.pal similarity index 100% rename from graphics/pokemon/florges/orange_flower/shiny.pal rename to graphics/pokemon/gen_6/florges/orange_flower/shiny.pal diff --git a/graphics/pokemon/florges/shiny.pal b/graphics/pokemon/gen_6/florges/shiny.pal similarity index 100% rename from graphics/pokemon/florges/shiny.pal rename to graphics/pokemon/gen_6/florges/shiny.pal diff --git a/graphics/pokemon/florges/white_flower/icon.png b/graphics/pokemon/gen_6/florges/white_flower/icon.png similarity index 100% rename from graphics/pokemon/florges/white_flower/icon.png rename to graphics/pokemon/gen_6/florges/white_flower/icon.png diff --git a/graphics/pokemon/florges/white_flower/normal.pal b/graphics/pokemon/gen_6/florges/white_flower/normal.pal similarity index 100% rename from graphics/pokemon/florges/white_flower/normal.pal rename to graphics/pokemon/gen_6/florges/white_flower/normal.pal diff --git a/graphics/pokemon/florges/white_flower/shiny.pal b/graphics/pokemon/gen_6/florges/white_flower/shiny.pal similarity index 100% rename from graphics/pokemon/florges/white_flower/shiny.pal rename to graphics/pokemon/gen_6/florges/white_flower/shiny.pal diff --git a/graphics/pokemon/florges/yellow_flower/icon.png b/graphics/pokemon/gen_6/florges/yellow_flower/icon.png similarity index 100% rename from graphics/pokemon/florges/yellow_flower/icon.png rename to graphics/pokemon/gen_6/florges/yellow_flower/icon.png diff --git a/graphics/pokemon/florges/yellow_flower/normal.pal b/graphics/pokemon/gen_6/florges/yellow_flower/normal.pal similarity index 100% rename from graphics/pokemon/florges/yellow_flower/normal.pal rename to graphics/pokemon/gen_6/florges/yellow_flower/normal.pal diff --git a/graphics/pokemon/florges/yellow_flower/shiny.pal b/graphics/pokemon/gen_6/florges/yellow_flower/shiny.pal similarity index 100% rename from graphics/pokemon/florges/yellow_flower/shiny.pal rename to graphics/pokemon/gen_6/florges/yellow_flower/shiny.pal diff --git a/graphics/pokemon/froakie/anim_front.png b/graphics/pokemon/gen_6/froakie/anim_front.png similarity index 100% rename from graphics/pokemon/froakie/anim_front.png rename to graphics/pokemon/gen_6/froakie/anim_front.png diff --git a/graphics/pokemon/froakie/back.png b/graphics/pokemon/gen_6/froakie/back.png similarity index 100% rename from graphics/pokemon/froakie/back.png rename to graphics/pokemon/gen_6/froakie/back.png diff --git a/graphics/pokemon/froakie/footprint.png b/graphics/pokemon/gen_6/froakie/footprint.png similarity index 100% rename from graphics/pokemon/froakie/footprint.png rename to graphics/pokemon/gen_6/froakie/footprint.png diff --git a/graphics/pokemon/froakie/icon.png b/graphics/pokemon/gen_6/froakie/icon.png similarity index 100% rename from graphics/pokemon/froakie/icon.png rename to graphics/pokemon/gen_6/froakie/icon.png diff --git a/graphics/pokemon/froakie/normal.pal b/graphics/pokemon/gen_6/froakie/normal.pal similarity index 100% rename from graphics/pokemon/froakie/normal.pal rename to graphics/pokemon/gen_6/froakie/normal.pal diff --git a/graphics/pokemon/froakie/shiny.pal b/graphics/pokemon/gen_6/froakie/shiny.pal similarity index 100% rename from graphics/pokemon/froakie/shiny.pal rename to graphics/pokemon/gen_6/froakie/shiny.pal diff --git a/graphics/pokemon/frogadier/anim_front.png b/graphics/pokemon/gen_6/frogadier/anim_front.png similarity index 100% rename from graphics/pokemon/frogadier/anim_front.png rename to graphics/pokemon/gen_6/frogadier/anim_front.png diff --git a/graphics/pokemon/frogadier/back.png b/graphics/pokemon/gen_6/frogadier/back.png similarity index 100% rename from graphics/pokemon/frogadier/back.png rename to graphics/pokemon/gen_6/frogadier/back.png diff --git a/graphics/pokemon/frogadier/footprint.png b/graphics/pokemon/gen_6/frogadier/footprint.png similarity index 100% rename from graphics/pokemon/frogadier/footprint.png rename to graphics/pokemon/gen_6/frogadier/footprint.png diff --git a/graphics/pokemon/frogadier/icon.png b/graphics/pokemon/gen_6/frogadier/icon.png similarity index 100% rename from graphics/pokemon/frogadier/icon.png rename to graphics/pokemon/gen_6/frogadier/icon.png diff --git a/graphics/pokemon/frogadier/normal.pal b/graphics/pokemon/gen_6/frogadier/normal.pal similarity index 100% rename from graphics/pokemon/frogadier/normal.pal rename to graphics/pokemon/gen_6/frogadier/normal.pal diff --git a/graphics/pokemon/frogadier/shiny.pal b/graphics/pokemon/gen_6/frogadier/shiny.pal similarity index 100% rename from graphics/pokemon/frogadier/shiny.pal rename to graphics/pokemon/gen_6/frogadier/shiny.pal diff --git a/graphics/pokemon/furfrou/anim_front.png b/graphics/pokemon/gen_6/furfrou/anim_front.png similarity index 100% rename from graphics/pokemon/furfrou/anim_front.png rename to graphics/pokemon/gen_6/furfrou/anim_front.png diff --git a/graphics/pokemon/furfrou/back.png b/graphics/pokemon/gen_6/furfrou/back.png similarity index 100% rename from graphics/pokemon/furfrou/back.png rename to graphics/pokemon/gen_6/furfrou/back.png diff --git a/graphics/pokemon/furfrou/dandy_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/dandy_trim/anim_front.png similarity index 100% rename from graphics/pokemon/furfrou/dandy_trim/anim_front.png rename to graphics/pokemon/gen_6/furfrou/dandy_trim/anim_front.png diff --git a/graphics/pokemon/furfrou/dandy_trim/back.png b/graphics/pokemon/gen_6/furfrou/dandy_trim/back.png similarity index 100% rename from graphics/pokemon/furfrou/dandy_trim/back.png rename to graphics/pokemon/gen_6/furfrou/dandy_trim/back.png diff --git a/graphics/pokemon/furfrou/dandy_trim/icon.png b/graphics/pokemon/gen_6/furfrou/dandy_trim/icon.png similarity index 100% rename from graphics/pokemon/furfrou/dandy_trim/icon.png rename to graphics/pokemon/gen_6/furfrou/dandy_trim/icon.png diff --git a/graphics/pokemon/furfrou/dandy_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/dandy_trim/normal.pal similarity index 100% rename from graphics/pokemon/furfrou/dandy_trim/normal.pal rename to graphics/pokemon/gen_6/furfrou/dandy_trim/normal.pal diff --git a/graphics/pokemon/furfrou/dandy_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/dandy_trim/shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/dandy_trim/shiny.pal rename to graphics/pokemon/gen_6/furfrou/dandy_trim/shiny.pal diff --git a/graphics/pokemon/furfrou/debutante_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/debutante_trim/anim_front.png similarity index 100% rename from graphics/pokemon/furfrou/debutante_trim/anim_front.png rename to graphics/pokemon/gen_6/furfrou/debutante_trim/anim_front.png diff --git a/graphics/pokemon/furfrou/debutante_trim/back.png b/graphics/pokemon/gen_6/furfrou/debutante_trim/back.png similarity index 100% rename from graphics/pokemon/furfrou/debutante_trim/back.png rename to graphics/pokemon/gen_6/furfrou/debutante_trim/back.png diff --git a/graphics/pokemon/furfrou/debutante_trim/icon.png b/graphics/pokemon/gen_6/furfrou/debutante_trim/icon.png similarity index 100% rename from graphics/pokemon/furfrou/debutante_trim/icon.png rename to graphics/pokemon/gen_6/furfrou/debutante_trim/icon.png diff --git a/graphics/pokemon/furfrou/debutante_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/debutante_trim/normal.pal similarity index 100% rename from graphics/pokemon/furfrou/debutante_trim/normal.pal rename to graphics/pokemon/gen_6/furfrou/debutante_trim/normal.pal diff --git a/graphics/pokemon/furfrou/debutante_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/debutante_trim/shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/debutante_trim/shiny.pal rename to graphics/pokemon/gen_6/furfrou/debutante_trim/shiny.pal diff --git a/graphics/pokemon/furfrou/diamond_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/diamond_trim/anim_front.png similarity index 100% rename from graphics/pokemon/furfrou/diamond_trim/anim_front.png rename to graphics/pokemon/gen_6/furfrou/diamond_trim/anim_front.png diff --git a/graphics/pokemon/furfrou/diamond_trim/back.png b/graphics/pokemon/gen_6/furfrou/diamond_trim/back.png similarity index 100% rename from graphics/pokemon/furfrou/diamond_trim/back.png rename to graphics/pokemon/gen_6/furfrou/diamond_trim/back.png diff --git a/graphics/pokemon/furfrou/diamond_trim/icon.png b/graphics/pokemon/gen_6/furfrou/diamond_trim/icon.png similarity index 100% rename from graphics/pokemon/furfrou/diamond_trim/icon.png rename to graphics/pokemon/gen_6/furfrou/diamond_trim/icon.png diff --git a/graphics/pokemon/furfrou/diamond_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/diamond_trim/normal.pal similarity index 100% rename from graphics/pokemon/furfrou/diamond_trim/normal.pal rename to graphics/pokemon/gen_6/furfrou/diamond_trim/normal.pal diff --git a/graphics/pokemon/furfrou/diamond_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/diamond_trim/shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/diamond_trim/shiny.pal rename to graphics/pokemon/gen_6/furfrou/diamond_trim/shiny.pal diff --git a/graphics/pokemon/crabominable/footprint.png b/graphics/pokemon/gen_6/furfrou/footprint.png similarity index 100% rename from graphics/pokemon/crabominable/footprint.png rename to graphics/pokemon/gen_6/furfrou/footprint.png diff --git a/graphics/pokemon/furfrou/heart_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/heart_trim/anim_front.png similarity index 100% rename from graphics/pokemon/furfrou/heart_trim/anim_front.png rename to graphics/pokemon/gen_6/furfrou/heart_trim/anim_front.png diff --git a/graphics/pokemon/furfrou/heart_trim/back.png b/graphics/pokemon/gen_6/furfrou/heart_trim/back.png similarity index 100% rename from graphics/pokemon/furfrou/heart_trim/back.png rename to graphics/pokemon/gen_6/furfrou/heart_trim/back.png diff --git a/graphics/pokemon/furfrou/heart_trim/icon.png b/graphics/pokemon/gen_6/furfrou/heart_trim/icon.png similarity index 100% rename from graphics/pokemon/furfrou/heart_trim/icon.png rename to graphics/pokemon/gen_6/furfrou/heart_trim/icon.png diff --git a/graphics/pokemon/furfrou/heart_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/heart_trim/normal.pal similarity index 100% rename from graphics/pokemon/furfrou/heart_trim/normal.pal rename to graphics/pokemon/gen_6/furfrou/heart_trim/normal.pal diff --git a/graphics/pokemon/furfrou/heart_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/heart_trim/shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/heart_trim/shiny.pal rename to graphics/pokemon/gen_6/furfrou/heart_trim/shiny.pal diff --git a/graphics/pokemon/furfrou/icon.png b/graphics/pokemon/gen_6/furfrou/icon.png similarity index 100% rename from graphics/pokemon/furfrou/icon.png rename to graphics/pokemon/gen_6/furfrou/icon.png diff --git a/graphics/pokemon/furfrou/kabuki_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/kabuki_trim/anim_front.png similarity index 100% rename from graphics/pokemon/furfrou/kabuki_trim/anim_front.png rename to graphics/pokemon/gen_6/furfrou/kabuki_trim/anim_front.png diff --git a/graphics/pokemon/furfrou/kabuki_trim/back.png b/graphics/pokemon/gen_6/furfrou/kabuki_trim/back.png similarity index 100% rename from graphics/pokemon/furfrou/kabuki_trim/back.png rename to graphics/pokemon/gen_6/furfrou/kabuki_trim/back.png diff --git a/graphics/pokemon/furfrou/kabuki_trim/icon.png b/graphics/pokemon/gen_6/furfrou/kabuki_trim/icon.png similarity index 100% rename from graphics/pokemon/furfrou/kabuki_trim/icon.png rename to graphics/pokemon/gen_6/furfrou/kabuki_trim/icon.png diff --git a/graphics/pokemon/furfrou/kabuki_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/kabuki_trim/normal.pal similarity index 100% rename from graphics/pokemon/furfrou/kabuki_trim/normal.pal rename to graphics/pokemon/gen_6/furfrou/kabuki_trim/normal.pal diff --git a/graphics/pokemon/furfrou/kabuki_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/kabuki_trim/shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/kabuki_trim/shiny.pal rename to graphics/pokemon/gen_6/furfrou/kabuki_trim/shiny.pal diff --git a/graphics/pokemon/furfrou/la_reine_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/la_reine_trim/anim_front.png similarity index 100% rename from graphics/pokemon/furfrou/la_reine_trim/anim_front.png rename to graphics/pokemon/gen_6/furfrou/la_reine_trim/anim_front.png diff --git a/graphics/pokemon/furfrou/la_reine_trim/back.png b/graphics/pokemon/gen_6/furfrou/la_reine_trim/back.png similarity index 100% rename from graphics/pokemon/furfrou/la_reine_trim/back.png rename to graphics/pokemon/gen_6/furfrou/la_reine_trim/back.png diff --git a/graphics/pokemon/furfrou/la_reine_trim/icon.png b/graphics/pokemon/gen_6/furfrou/la_reine_trim/icon.png similarity index 100% rename from graphics/pokemon/furfrou/la_reine_trim/icon.png rename to graphics/pokemon/gen_6/furfrou/la_reine_trim/icon.png diff --git a/graphics/pokemon/furfrou/la_reine_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/la_reine_trim/normal.pal similarity index 100% rename from graphics/pokemon/furfrou/la_reine_trim/normal.pal rename to graphics/pokemon/gen_6/furfrou/la_reine_trim/normal.pal diff --git a/graphics/pokemon/furfrou/la_reine_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/la_reine_trim/shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/la_reine_trim/shiny.pal rename to graphics/pokemon/gen_6/furfrou/la_reine_trim/shiny.pal diff --git a/graphics/pokemon/furfrou/matron_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/matron_trim/anim_front.png similarity index 100% rename from graphics/pokemon/furfrou/matron_trim/anim_front.png rename to graphics/pokemon/gen_6/furfrou/matron_trim/anim_front.png diff --git a/graphics/pokemon/furfrou/matron_trim/back.png b/graphics/pokemon/gen_6/furfrou/matron_trim/back.png similarity index 100% rename from graphics/pokemon/furfrou/matron_trim/back.png rename to graphics/pokemon/gen_6/furfrou/matron_trim/back.png diff --git a/graphics/pokemon/furfrou/matron_trim/icon.png b/graphics/pokemon/gen_6/furfrou/matron_trim/icon.png similarity index 100% rename from graphics/pokemon/furfrou/matron_trim/icon.png rename to graphics/pokemon/gen_6/furfrou/matron_trim/icon.png diff --git a/graphics/pokemon/furfrou/matron_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/matron_trim/normal.pal similarity index 100% rename from graphics/pokemon/furfrou/matron_trim/normal.pal rename to graphics/pokemon/gen_6/furfrou/matron_trim/normal.pal diff --git a/graphics/pokemon/furfrou/matron_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/matron_trim/shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/matron_trim/shiny.pal rename to graphics/pokemon/gen_6/furfrou/matron_trim/shiny.pal diff --git a/graphics/pokemon/furfrou/normal.pal b/graphics/pokemon/gen_6/furfrou/normal.pal similarity index 100% rename from graphics/pokemon/furfrou/normal.pal rename to graphics/pokemon/gen_6/furfrou/normal.pal diff --git a/graphics/pokemon/furfrou/pharaoh_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/pharaoh_trim/anim_front.png similarity index 100% rename from graphics/pokemon/furfrou/pharaoh_trim/anim_front.png rename to graphics/pokemon/gen_6/furfrou/pharaoh_trim/anim_front.png diff --git a/graphics/pokemon/furfrou/pharaoh_trim/back.png b/graphics/pokemon/gen_6/furfrou/pharaoh_trim/back.png similarity index 100% rename from graphics/pokemon/furfrou/pharaoh_trim/back.png rename to graphics/pokemon/gen_6/furfrou/pharaoh_trim/back.png diff --git a/graphics/pokemon/furfrou/pharaoh_trim/icon.png b/graphics/pokemon/gen_6/furfrou/pharaoh_trim/icon.png similarity index 100% rename from graphics/pokemon/furfrou/pharaoh_trim/icon.png rename to graphics/pokemon/gen_6/furfrou/pharaoh_trim/icon.png diff --git a/graphics/pokemon/furfrou/pharaoh_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/pharaoh_trim/normal.pal similarity index 100% rename from graphics/pokemon/furfrou/pharaoh_trim/normal.pal rename to graphics/pokemon/gen_6/furfrou/pharaoh_trim/normal.pal diff --git a/graphics/pokemon/furfrou/pharaoh_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/pharaoh_trim/shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/pharaoh_trim/shiny.pal rename to graphics/pokemon/gen_6/furfrou/pharaoh_trim/shiny.pal diff --git a/graphics/pokemon/furfrou/shiny.pal b/graphics/pokemon/gen_6/furfrou/shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/shiny.pal rename to graphics/pokemon/gen_6/furfrou/shiny.pal diff --git a/graphics/pokemon/furfrou/star_trim/anim_front.png b/graphics/pokemon/gen_6/furfrou/star_trim/anim_front.png similarity index 100% rename from graphics/pokemon/furfrou/star_trim/anim_front.png rename to graphics/pokemon/gen_6/furfrou/star_trim/anim_front.png diff --git a/graphics/pokemon/furfrou/star_trim/back.png b/graphics/pokemon/gen_6/furfrou/star_trim/back.png similarity index 100% rename from graphics/pokemon/furfrou/star_trim/back.png rename to graphics/pokemon/gen_6/furfrou/star_trim/back.png diff --git a/graphics/pokemon/furfrou/star_trim/icon.png b/graphics/pokemon/gen_6/furfrou/star_trim/icon.png similarity index 100% rename from graphics/pokemon/furfrou/star_trim/icon.png rename to graphics/pokemon/gen_6/furfrou/star_trim/icon.png diff --git a/graphics/pokemon/furfrou/star_trim/normal.pal b/graphics/pokemon/gen_6/furfrou/star_trim/normal.pal similarity index 100% rename from graphics/pokemon/furfrou/star_trim/normal.pal rename to graphics/pokemon/gen_6/furfrou/star_trim/normal.pal diff --git a/graphics/pokemon/furfrou/star_trim/shiny.pal b/graphics/pokemon/gen_6/furfrou/star_trim/shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/star_trim/shiny.pal rename to graphics/pokemon/gen_6/furfrou/star_trim/shiny.pal diff --git a/graphics/pokemon/gogoat/anim_front.png b/graphics/pokemon/gen_6/gogoat/anim_front.png similarity index 100% rename from graphics/pokemon/gogoat/anim_front.png rename to graphics/pokemon/gen_6/gogoat/anim_front.png diff --git a/graphics/pokemon/gogoat/back.png b/graphics/pokemon/gen_6/gogoat/back.png similarity index 100% rename from graphics/pokemon/gogoat/back.png rename to graphics/pokemon/gen_6/gogoat/back.png diff --git a/graphics/pokemon/gogoat/footprint.png b/graphics/pokemon/gen_6/gogoat/footprint.png similarity index 100% rename from graphics/pokemon/gogoat/footprint.png rename to graphics/pokemon/gen_6/gogoat/footprint.png diff --git a/graphics/pokemon/gogoat/icon.png b/graphics/pokemon/gen_6/gogoat/icon.png similarity index 100% rename from graphics/pokemon/gogoat/icon.png rename to graphics/pokemon/gen_6/gogoat/icon.png diff --git a/graphics/pokemon/gogoat/normal.pal b/graphics/pokemon/gen_6/gogoat/normal.pal similarity index 100% rename from graphics/pokemon/gogoat/normal.pal rename to graphics/pokemon/gen_6/gogoat/normal.pal diff --git a/graphics/pokemon/gogoat/shiny.pal b/graphics/pokemon/gen_6/gogoat/shiny.pal similarity index 100% rename from graphics/pokemon/gogoat/shiny.pal rename to graphics/pokemon/gen_6/gogoat/shiny.pal diff --git a/graphics/pokemon/goodra/anim_front.png b/graphics/pokemon/gen_6/goodra/anim_front.png similarity index 100% rename from graphics/pokemon/goodra/anim_front.png rename to graphics/pokemon/gen_6/goodra/anim_front.png diff --git a/graphics/pokemon/goodra/back.png b/graphics/pokemon/gen_6/goodra/back.png similarity index 100% rename from graphics/pokemon/goodra/back.png rename to graphics/pokemon/gen_6/goodra/back.png diff --git a/graphics/pokemon/zorua/footprint.png b/graphics/pokemon/gen_6/goodra/footprint.png similarity index 100% rename from graphics/pokemon/zorua/footprint.png rename to graphics/pokemon/gen_6/goodra/footprint.png diff --git a/graphics/pokemon/goodra/hisuian/back.png b/graphics/pokemon/gen_6/goodra/hisuian/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/goodra/hisuian/back.png rename to graphics/pokemon/gen_6/goodra/hisuian/back.png diff --git a/graphics/pokemon/goodra/hisuian/front.png b/graphics/pokemon/gen_6/goodra/hisuian/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/goodra/hisuian/front.png rename to graphics/pokemon/gen_6/goodra/hisuian/front.png diff --git a/graphics/pokemon/goodra/hisuian/icon.png b/graphics/pokemon/gen_6/goodra/hisuian/icon.png similarity index 100% rename from graphics/pokemon/goodra/hisuian/icon.png rename to graphics/pokemon/gen_6/goodra/hisuian/icon.png diff --git a/graphics/pokemon/goodra/hisuian/normal.pal b/graphics/pokemon/gen_6/goodra/hisuian/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/goodra/hisuian/normal.pal rename to graphics/pokemon/gen_6/goodra/hisuian/normal.pal diff --git a/graphics/pokemon/goodra/hisuian/shiny.pal b/graphics/pokemon/gen_6/goodra/hisuian/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/goodra/hisuian/shiny.pal rename to graphics/pokemon/gen_6/goodra/hisuian/shiny.pal diff --git a/graphics/pokemon/goodra/icon.png b/graphics/pokemon/gen_6/goodra/icon.png similarity index 100% rename from graphics/pokemon/goodra/icon.png rename to graphics/pokemon/gen_6/goodra/icon.png diff --git a/graphics/pokemon/goodra/normal.pal b/graphics/pokemon/gen_6/goodra/normal.pal similarity index 100% rename from graphics/pokemon/goodra/normal.pal rename to graphics/pokemon/gen_6/goodra/normal.pal diff --git a/graphics/pokemon/goodra/shiny.pal b/graphics/pokemon/gen_6/goodra/shiny.pal similarity index 100% rename from graphics/pokemon/goodra/shiny.pal rename to graphics/pokemon/gen_6/goodra/shiny.pal diff --git a/graphics/pokemon/goomy/anim_front.png b/graphics/pokemon/gen_6/goomy/anim_front.png similarity index 100% rename from graphics/pokemon/goomy/anim_front.png rename to graphics/pokemon/gen_6/goomy/anim_front.png diff --git a/graphics/pokemon/goomy/back.png b/graphics/pokemon/gen_6/goomy/back.png similarity index 100% rename from graphics/pokemon/goomy/back.png rename to graphics/pokemon/gen_6/goomy/back.png diff --git a/graphics/pokemon/shuppet/footprint.png b/graphics/pokemon/gen_6/goomy/footprint.png similarity index 100% rename from graphics/pokemon/shuppet/footprint.png rename to graphics/pokemon/gen_6/goomy/footprint.png diff --git a/graphics/pokemon/goomy/icon.png b/graphics/pokemon/gen_6/goomy/icon.png similarity index 100% rename from graphics/pokemon/goomy/icon.png rename to graphics/pokemon/gen_6/goomy/icon.png diff --git a/graphics/pokemon/goomy/normal.pal b/graphics/pokemon/gen_6/goomy/normal.pal similarity index 100% rename from graphics/pokemon/goomy/normal.pal rename to graphics/pokemon/gen_6/goomy/normal.pal diff --git a/graphics/pokemon/goomy/shiny.pal b/graphics/pokemon/gen_6/goomy/shiny.pal similarity index 100% rename from graphics/pokemon/goomy/shiny.pal rename to graphics/pokemon/gen_6/goomy/shiny.pal diff --git a/graphics/pokemon/gourgeist/anim_front.png b/graphics/pokemon/gen_6/gourgeist/anim_front.png similarity index 100% rename from graphics/pokemon/gourgeist/anim_front.png rename to graphics/pokemon/gen_6/gourgeist/anim_front.png diff --git a/graphics/pokemon/gourgeist/back.png b/graphics/pokemon/gen_6/gourgeist/back.png similarity index 100% rename from graphics/pokemon/gourgeist/back.png rename to graphics/pokemon/gen_6/gourgeist/back.png diff --git a/graphics/pokemon/regice/footprint.png b/graphics/pokemon/gen_6/gourgeist/footprint.png similarity index 100% rename from graphics/pokemon/regice/footprint.png rename to graphics/pokemon/gen_6/gourgeist/footprint.png diff --git a/graphics/pokemon/gourgeist/icon.png b/graphics/pokemon/gen_6/gourgeist/icon.png similarity index 100% rename from graphics/pokemon/gourgeist/icon.png rename to graphics/pokemon/gen_6/gourgeist/icon.png diff --git a/graphics/pokemon/gourgeist/large/anim_front.png b/graphics/pokemon/gen_6/gourgeist/large/anim_front.png similarity index 100% rename from graphics/pokemon/gourgeist/large/anim_front.png rename to graphics/pokemon/gen_6/gourgeist/large/anim_front.png diff --git a/graphics/pokemon/gourgeist/large/back.png b/graphics/pokemon/gen_6/gourgeist/large/back.png similarity index 100% rename from graphics/pokemon/gourgeist/large/back.png rename to graphics/pokemon/gen_6/gourgeist/large/back.png diff --git a/graphics/pokemon/gourgeist/normal.pal b/graphics/pokemon/gen_6/gourgeist/normal.pal similarity index 100% rename from graphics/pokemon/gourgeist/normal.pal rename to graphics/pokemon/gen_6/gourgeist/normal.pal diff --git a/graphics/pokemon/gourgeist/shiny.pal b/graphics/pokemon/gen_6/gourgeist/shiny.pal similarity index 100% rename from graphics/pokemon/gourgeist/shiny.pal rename to graphics/pokemon/gen_6/gourgeist/shiny.pal diff --git a/graphics/pokemon/gourgeist/small/anim_front.png b/graphics/pokemon/gen_6/gourgeist/small/anim_front.png similarity index 100% rename from graphics/pokemon/gourgeist/small/anim_front.png rename to graphics/pokemon/gen_6/gourgeist/small/anim_front.png diff --git a/graphics/pokemon/gourgeist/small/back.png b/graphics/pokemon/gen_6/gourgeist/small/back.png similarity index 100% rename from graphics/pokemon/gourgeist/small/back.png rename to graphics/pokemon/gen_6/gourgeist/small/back.png diff --git a/graphics/pokemon/gourgeist/super/anim_front.png b/graphics/pokemon/gen_6/gourgeist/super/anim_front.png similarity index 100% rename from graphics/pokemon/gourgeist/super/anim_front.png rename to graphics/pokemon/gen_6/gourgeist/super/anim_front.png diff --git a/graphics/pokemon/gourgeist/super/back.png b/graphics/pokemon/gen_6/gourgeist/super/back.png similarity index 100% rename from graphics/pokemon/gourgeist/super/back.png rename to graphics/pokemon/gen_6/gourgeist/super/back.png diff --git a/graphics/pokemon/greninja/anim_front.png b/graphics/pokemon/gen_6/greninja/anim_front.png similarity index 100% rename from graphics/pokemon/greninja/anim_front.png rename to graphics/pokemon/gen_6/greninja/anim_front.png diff --git a/graphics/pokemon/greninja/ash/anim_front.png b/graphics/pokemon/gen_6/greninja/ash/anim_front.png similarity index 100% rename from graphics/pokemon/greninja/ash/anim_front.png rename to graphics/pokemon/gen_6/greninja/ash/anim_front.png diff --git a/graphics/pokemon/greninja/ash/back.png b/graphics/pokemon/gen_6/greninja/ash/back.png similarity index 100% rename from graphics/pokemon/greninja/ash/back.png rename to graphics/pokemon/gen_6/greninja/ash/back.png diff --git a/graphics/pokemon/greninja/ash/icon.png b/graphics/pokemon/gen_6/greninja/ash/icon.png similarity index 100% rename from graphics/pokemon/greninja/ash/icon.png rename to graphics/pokemon/gen_6/greninja/ash/icon.png diff --git a/graphics/pokemon/greninja/ash/normal.pal b/graphics/pokemon/gen_6/greninja/ash/normal.pal similarity index 100% rename from graphics/pokemon/greninja/ash/normal.pal rename to graphics/pokemon/gen_6/greninja/ash/normal.pal diff --git a/graphics/pokemon/greninja/ash/shiny.pal b/graphics/pokemon/gen_6/greninja/ash/shiny.pal similarity index 100% rename from graphics/pokemon/greninja/ash/shiny.pal rename to graphics/pokemon/gen_6/greninja/ash/shiny.pal diff --git a/graphics/pokemon/greninja/back.png b/graphics/pokemon/gen_6/greninja/back.png similarity index 100% rename from graphics/pokemon/greninja/back.png rename to graphics/pokemon/gen_6/greninja/back.png diff --git a/graphics/pokemon/greninja/footprint.png b/graphics/pokemon/gen_6/greninja/footprint.png similarity index 100% rename from graphics/pokemon/greninja/footprint.png rename to graphics/pokemon/gen_6/greninja/footprint.png diff --git a/graphics/pokemon/greninja/icon.png b/graphics/pokemon/gen_6/greninja/icon.png similarity index 100% rename from graphics/pokemon/greninja/icon.png rename to graphics/pokemon/gen_6/greninja/icon.png diff --git a/graphics/pokemon/greninja/normal.pal b/graphics/pokemon/gen_6/greninja/normal.pal similarity index 100% rename from graphics/pokemon/greninja/normal.pal rename to graphics/pokemon/gen_6/greninja/normal.pal diff --git a/graphics/pokemon/greninja/shiny.pal b/graphics/pokemon/gen_6/greninja/shiny.pal similarity index 100% rename from graphics/pokemon/greninja/shiny.pal rename to graphics/pokemon/gen_6/greninja/shiny.pal diff --git a/graphics/pokemon/hawlucha/anim_front.png b/graphics/pokemon/gen_6/hawlucha/anim_front.png similarity index 100% rename from graphics/pokemon/hawlucha/anim_front.png rename to graphics/pokemon/gen_6/hawlucha/anim_front.png diff --git a/graphics/pokemon/hawlucha/back.png b/graphics/pokemon/gen_6/hawlucha/back.png similarity index 100% rename from graphics/pokemon/hawlucha/back.png rename to graphics/pokemon/gen_6/hawlucha/back.png diff --git a/graphics/pokemon/hawlucha/footprint.png b/graphics/pokemon/gen_6/hawlucha/footprint.png similarity index 100% rename from graphics/pokemon/hawlucha/footprint.png rename to graphics/pokemon/gen_6/hawlucha/footprint.png diff --git a/graphics/pokemon/hawlucha/icon.png b/graphics/pokemon/gen_6/hawlucha/icon.png similarity index 100% rename from graphics/pokemon/hawlucha/icon.png rename to graphics/pokemon/gen_6/hawlucha/icon.png diff --git a/graphics/pokemon/hawlucha/normal.pal b/graphics/pokemon/gen_6/hawlucha/normal.pal similarity index 100% rename from graphics/pokemon/hawlucha/normal.pal rename to graphics/pokemon/gen_6/hawlucha/normal.pal diff --git a/graphics/pokemon/hawlucha/shiny.pal b/graphics/pokemon/gen_6/hawlucha/shiny.pal similarity index 100% rename from graphics/pokemon/hawlucha/shiny.pal rename to graphics/pokemon/gen_6/hawlucha/shiny.pal diff --git a/graphics/pokemon/heliolisk/anim_front.png b/graphics/pokemon/gen_6/heliolisk/anim_front.png similarity index 100% rename from graphics/pokemon/heliolisk/anim_front.png rename to graphics/pokemon/gen_6/heliolisk/anim_front.png diff --git a/graphics/pokemon/heliolisk/back.png b/graphics/pokemon/gen_6/heliolisk/back.png similarity index 100% rename from graphics/pokemon/heliolisk/back.png rename to graphics/pokemon/gen_6/heliolisk/back.png diff --git a/graphics/pokemon/heliolisk/footprint.png b/graphics/pokemon/gen_6/heliolisk/footprint.png similarity index 100% rename from graphics/pokemon/heliolisk/footprint.png rename to graphics/pokemon/gen_6/heliolisk/footprint.png diff --git a/graphics/pokemon/heliolisk/icon.png b/graphics/pokemon/gen_6/heliolisk/icon.png similarity index 100% rename from graphics/pokemon/heliolisk/icon.png rename to graphics/pokemon/gen_6/heliolisk/icon.png diff --git a/graphics/pokemon/heliolisk/normal.pal b/graphics/pokemon/gen_6/heliolisk/normal.pal similarity index 100% rename from graphics/pokemon/heliolisk/normal.pal rename to graphics/pokemon/gen_6/heliolisk/normal.pal diff --git a/graphics/pokemon/heliolisk/shiny.pal b/graphics/pokemon/gen_6/heliolisk/shiny.pal similarity index 100% rename from graphics/pokemon/heliolisk/shiny.pal rename to graphics/pokemon/gen_6/heliolisk/shiny.pal diff --git a/graphics/pokemon/helioptile/anim_front.png b/graphics/pokemon/gen_6/helioptile/anim_front.png similarity index 100% rename from graphics/pokemon/helioptile/anim_front.png rename to graphics/pokemon/gen_6/helioptile/anim_front.png diff --git a/graphics/pokemon/helioptile/back.png b/graphics/pokemon/gen_6/helioptile/back.png similarity index 100% rename from graphics/pokemon/helioptile/back.png rename to graphics/pokemon/gen_6/helioptile/back.png diff --git a/graphics/pokemon/helioptile/footprint.png b/graphics/pokemon/gen_6/helioptile/footprint.png similarity index 100% rename from graphics/pokemon/helioptile/footprint.png rename to graphics/pokemon/gen_6/helioptile/footprint.png diff --git a/graphics/pokemon/helioptile/icon.png b/graphics/pokemon/gen_6/helioptile/icon.png similarity index 100% rename from graphics/pokemon/helioptile/icon.png rename to graphics/pokemon/gen_6/helioptile/icon.png diff --git a/graphics/pokemon/helioptile/normal.pal b/graphics/pokemon/gen_6/helioptile/normal.pal similarity index 100% rename from graphics/pokemon/helioptile/normal.pal rename to graphics/pokemon/gen_6/helioptile/normal.pal diff --git a/graphics/pokemon/helioptile/shiny.pal b/graphics/pokemon/gen_6/helioptile/shiny.pal similarity index 100% rename from graphics/pokemon/helioptile/shiny.pal rename to graphics/pokemon/gen_6/helioptile/shiny.pal diff --git a/graphics/pokemon/honedge/anim_front.png b/graphics/pokemon/gen_6/honedge/anim_front.png similarity index 100% rename from graphics/pokemon/honedge/anim_front.png rename to graphics/pokemon/gen_6/honedge/anim_front.png diff --git a/graphics/pokemon/honedge/back.png b/graphics/pokemon/gen_6/honedge/back.png similarity index 100% rename from graphics/pokemon/honedge/back.png rename to graphics/pokemon/gen_6/honedge/back.png diff --git a/graphics/pokemon/sigilyph/footprint.png b/graphics/pokemon/gen_6/honedge/footprint.png similarity index 100% rename from graphics/pokemon/sigilyph/footprint.png rename to graphics/pokemon/gen_6/honedge/footprint.png diff --git a/graphics/pokemon/honedge/icon.png b/graphics/pokemon/gen_6/honedge/icon.png similarity index 100% rename from graphics/pokemon/honedge/icon.png rename to graphics/pokemon/gen_6/honedge/icon.png diff --git a/graphics/pokemon/honedge/normal.pal b/graphics/pokemon/gen_6/honedge/normal.pal similarity index 100% rename from graphics/pokemon/honedge/normal.pal rename to graphics/pokemon/gen_6/honedge/normal.pal diff --git a/graphics/pokemon/honedge/shiny.pal b/graphics/pokemon/gen_6/honedge/shiny.pal similarity index 100% rename from graphics/pokemon/honedge/shiny.pal rename to graphics/pokemon/gen_6/honedge/shiny.pal diff --git a/graphics/pokemon/hoopa/anim_front.png b/graphics/pokemon/gen_6/hoopa/anim_front.png similarity index 100% rename from graphics/pokemon/hoopa/anim_front.png rename to graphics/pokemon/gen_6/hoopa/anim_front.png diff --git a/graphics/pokemon/hoopa/back.png b/graphics/pokemon/gen_6/hoopa/back.png similarity index 100% rename from graphics/pokemon/hoopa/back.png rename to graphics/pokemon/gen_6/hoopa/back.png diff --git a/graphics/pokemon/silcoon/footprint.png b/graphics/pokemon/gen_6/hoopa/footprint.png similarity index 100% rename from graphics/pokemon/silcoon/footprint.png rename to graphics/pokemon/gen_6/hoopa/footprint.png diff --git a/graphics/pokemon/hoopa/icon.png b/graphics/pokemon/gen_6/hoopa/icon.png similarity index 100% rename from graphics/pokemon/hoopa/icon.png rename to graphics/pokemon/gen_6/hoopa/icon.png diff --git a/graphics/pokemon/hoopa/normal.pal b/graphics/pokemon/gen_6/hoopa/normal.pal similarity index 100% rename from graphics/pokemon/hoopa/normal.pal rename to graphics/pokemon/gen_6/hoopa/normal.pal diff --git a/graphics/pokemon/hoopa/shiny.pal b/graphics/pokemon/gen_6/hoopa/shiny.pal similarity index 100% rename from graphics/pokemon/hoopa/shiny.pal rename to graphics/pokemon/gen_6/hoopa/shiny.pal diff --git a/graphics/pokemon/hoopa/unbound/anim_front.png b/graphics/pokemon/gen_6/hoopa/unbound/anim_front.png similarity index 100% rename from graphics/pokemon/hoopa/unbound/anim_front.png rename to graphics/pokemon/gen_6/hoopa/unbound/anim_front.png diff --git a/graphics/pokemon/hoopa/unbound/back.png b/graphics/pokemon/gen_6/hoopa/unbound/back.png similarity index 100% rename from graphics/pokemon/hoopa/unbound/back.png rename to graphics/pokemon/gen_6/hoopa/unbound/back.png diff --git a/graphics/pokemon/hoopa/unbound/icon.png b/graphics/pokemon/gen_6/hoopa/unbound/icon.png similarity index 100% rename from graphics/pokemon/hoopa/unbound/icon.png rename to graphics/pokemon/gen_6/hoopa/unbound/icon.png diff --git a/graphics/pokemon/hoopa/unbound/normal.pal b/graphics/pokemon/gen_6/hoopa/unbound/normal.pal similarity index 100% rename from graphics/pokemon/hoopa/unbound/normal.pal rename to graphics/pokemon/gen_6/hoopa/unbound/normal.pal diff --git a/graphics/pokemon/hoopa/unbound/shiny.pal b/graphics/pokemon/gen_6/hoopa/unbound/shiny.pal similarity index 100% rename from graphics/pokemon/hoopa/unbound/shiny.pal rename to graphics/pokemon/gen_6/hoopa/unbound/shiny.pal diff --git a/graphics/pokemon/inkay/anim_front.png b/graphics/pokemon/gen_6/inkay/anim_front.png similarity index 100% rename from graphics/pokemon/inkay/anim_front.png rename to graphics/pokemon/gen_6/inkay/anim_front.png diff --git a/graphics/pokemon/inkay/back.png b/graphics/pokemon/gen_6/inkay/back.png similarity index 100% rename from graphics/pokemon/inkay/back.png rename to graphics/pokemon/gen_6/inkay/back.png diff --git a/graphics/pokemon/silicobra/footprint.png b/graphics/pokemon/gen_6/inkay/footprint.png similarity index 100% rename from graphics/pokemon/silicobra/footprint.png rename to graphics/pokemon/gen_6/inkay/footprint.png diff --git a/graphics/pokemon/inkay/icon.png b/graphics/pokemon/gen_6/inkay/icon.png similarity index 100% rename from graphics/pokemon/inkay/icon.png rename to graphics/pokemon/gen_6/inkay/icon.png diff --git a/graphics/pokemon/inkay/normal.pal b/graphics/pokemon/gen_6/inkay/normal.pal similarity index 100% rename from graphics/pokemon/inkay/normal.pal rename to graphics/pokemon/gen_6/inkay/normal.pal diff --git a/graphics/pokemon/inkay/shiny.pal b/graphics/pokemon/gen_6/inkay/shiny.pal similarity index 100% rename from graphics/pokemon/inkay/shiny.pal rename to graphics/pokemon/gen_6/inkay/shiny.pal diff --git a/graphics/pokemon/klefki/anim_front.png b/graphics/pokemon/gen_6/klefki/anim_front.png similarity index 100% rename from graphics/pokemon/klefki/anim_front.png rename to graphics/pokemon/gen_6/klefki/anim_front.png diff --git a/graphics/pokemon/klefki/back.png b/graphics/pokemon/gen_6/klefki/back.png similarity index 100% rename from graphics/pokemon/klefki/back.png rename to graphics/pokemon/gen_6/klefki/back.png diff --git a/graphics/pokemon/sinistea/footprint.png b/graphics/pokemon/gen_6/klefki/footprint.png similarity index 100% rename from graphics/pokemon/sinistea/footprint.png rename to graphics/pokemon/gen_6/klefki/footprint.png diff --git a/graphics/pokemon/klefki/icon.png b/graphics/pokemon/gen_6/klefki/icon.png similarity index 100% rename from graphics/pokemon/klefki/icon.png rename to graphics/pokemon/gen_6/klefki/icon.png diff --git a/graphics/pokemon/klefki/normal.pal b/graphics/pokemon/gen_6/klefki/normal.pal similarity index 100% rename from graphics/pokemon/klefki/normal.pal rename to graphics/pokemon/gen_6/klefki/normal.pal diff --git a/graphics/pokemon/klefki/shiny.pal b/graphics/pokemon/gen_6/klefki/shiny.pal similarity index 100% rename from graphics/pokemon/klefki/shiny.pal rename to graphics/pokemon/gen_6/klefki/shiny.pal diff --git a/graphics/pokemon/litleo/anim_front.png b/graphics/pokemon/gen_6/litleo/anim_front.png similarity index 100% rename from graphics/pokemon/litleo/anim_front.png rename to graphics/pokemon/gen_6/litleo/anim_front.png diff --git a/graphics/pokemon/litleo/back.png b/graphics/pokemon/gen_6/litleo/back.png similarity index 100% rename from graphics/pokemon/litleo/back.png rename to graphics/pokemon/gen_6/litleo/back.png diff --git a/graphics/pokemon/litleo/footprint.png b/graphics/pokemon/gen_6/litleo/footprint.png similarity index 100% rename from graphics/pokemon/litleo/footprint.png rename to graphics/pokemon/gen_6/litleo/footprint.png diff --git a/graphics/pokemon/litleo/icon.png b/graphics/pokemon/gen_6/litleo/icon.png similarity index 100% rename from graphics/pokemon/litleo/icon.png rename to graphics/pokemon/gen_6/litleo/icon.png diff --git a/graphics/pokemon/litleo/normal.pal b/graphics/pokemon/gen_6/litleo/normal.pal similarity index 100% rename from graphics/pokemon/litleo/normal.pal rename to graphics/pokemon/gen_6/litleo/normal.pal diff --git a/graphics/pokemon/litleo/shiny.pal b/graphics/pokemon/gen_6/litleo/shiny.pal similarity index 100% rename from graphics/pokemon/litleo/shiny.pal rename to graphics/pokemon/gen_6/litleo/shiny.pal diff --git a/graphics/pokemon/malamar/anim_front.png b/graphics/pokemon/gen_6/malamar/anim_front.png similarity index 100% rename from graphics/pokemon/malamar/anim_front.png rename to graphics/pokemon/gen_6/malamar/anim_front.png diff --git a/graphics/pokemon/malamar/back.png b/graphics/pokemon/gen_6/malamar/back.png similarity index 100% rename from graphics/pokemon/malamar/back.png rename to graphics/pokemon/gen_6/malamar/back.png diff --git a/graphics/pokemon/malamar/footprint.png b/graphics/pokemon/gen_6/malamar/footprint.png similarity index 100% rename from graphics/pokemon/malamar/footprint.png rename to graphics/pokemon/gen_6/malamar/footprint.png diff --git a/graphics/pokemon/malamar/icon.png b/graphics/pokemon/gen_6/malamar/icon.png similarity index 100% rename from graphics/pokemon/malamar/icon.png rename to graphics/pokemon/gen_6/malamar/icon.png diff --git a/graphics/pokemon/malamar/normal.pal b/graphics/pokemon/gen_6/malamar/normal.pal similarity index 100% rename from graphics/pokemon/malamar/normal.pal rename to graphics/pokemon/gen_6/malamar/normal.pal diff --git a/graphics/pokemon/malamar/shiny.pal b/graphics/pokemon/gen_6/malamar/shiny.pal similarity index 100% rename from graphics/pokemon/malamar/shiny.pal rename to graphics/pokemon/gen_6/malamar/shiny.pal diff --git a/graphics/pokemon/meowstic/anim_front.png b/graphics/pokemon/gen_6/meowstic/anim_front.png similarity index 100% rename from graphics/pokemon/meowstic/anim_front.png rename to graphics/pokemon/gen_6/meowstic/anim_front.png diff --git a/graphics/pokemon/meowstic/back.png b/graphics/pokemon/gen_6/meowstic/back.png similarity index 100% rename from graphics/pokemon/meowstic/back.png rename to graphics/pokemon/gen_6/meowstic/back.png diff --git a/graphics/pokemon/meowstic/female/anim_front.png b/graphics/pokemon/gen_6/meowstic/female/anim_front.png similarity index 100% rename from graphics/pokemon/meowstic/female/anim_front.png rename to graphics/pokemon/gen_6/meowstic/female/anim_front.png diff --git a/graphics/pokemon/meowstic/female/back.png b/graphics/pokemon/gen_6/meowstic/female/back.png similarity index 100% rename from graphics/pokemon/meowstic/female/back.png rename to graphics/pokemon/gen_6/meowstic/female/back.png diff --git a/graphics/pokemon/meowstic/female/icon.png b/graphics/pokemon/gen_6/meowstic/female/icon.png similarity index 100% rename from graphics/pokemon/meowstic/female/icon.png rename to graphics/pokemon/gen_6/meowstic/female/icon.png diff --git a/graphics/pokemon/meowstic/female/normal.pal b/graphics/pokemon/gen_6/meowstic/female/normal.pal similarity index 100% rename from graphics/pokemon/meowstic/female/normal.pal rename to graphics/pokemon/gen_6/meowstic/female/normal.pal diff --git a/graphics/pokemon/meowstic/female/shiny.pal b/graphics/pokemon/gen_6/meowstic/female/shiny.pal similarity index 100% rename from graphics/pokemon/meowstic/female/shiny.pal rename to graphics/pokemon/gen_6/meowstic/female/shiny.pal diff --git a/graphics/pokemon/regieleki/footprint.png b/graphics/pokemon/gen_6/meowstic/footprint.png similarity index 100% rename from graphics/pokemon/regieleki/footprint.png rename to graphics/pokemon/gen_6/meowstic/footprint.png diff --git a/graphics/pokemon/meowstic/icon.png b/graphics/pokemon/gen_6/meowstic/icon.png similarity index 100% rename from graphics/pokemon/meowstic/icon.png rename to graphics/pokemon/gen_6/meowstic/icon.png diff --git a/graphics/pokemon/meowstic/normal.pal b/graphics/pokemon/gen_6/meowstic/normal.pal similarity index 100% rename from graphics/pokemon/meowstic/normal.pal rename to graphics/pokemon/gen_6/meowstic/normal.pal diff --git a/graphics/pokemon/meowstic/shiny.pal b/graphics/pokemon/gen_6/meowstic/shiny.pal similarity index 100% rename from graphics/pokemon/meowstic/shiny.pal rename to graphics/pokemon/gen_6/meowstic/shiny.pal diff --git a/graphics/pokemon/noibat/anim_front.png b/graphics/pokemon/gen_6/noibat/anim_front.png similarity index 100% rename from graphics/pokemon/noibat/anim_front.png rename to graphics/pokemon/gen_6/noibat/anim_front.png diff --git a/graphics/pokemon/noibat/back.png b/graphics/pokemon/gen_6/noibat/back.png similarity index 100% rename from graphics/pokemon/noibat/back.png rename to graphics/pokemon/gen_6/noibat/back.png diff --git a/graphics/pokemon/noibat/footprint.png b/graphics/pokemon/gen_6/noibat/footprint.png similarity index 100% rename from graphics/pokemon/noibat/footprint.png rename to graphics/pokemon/gen_6/noibat/footprint.png diff --git a/graphics/pokemon/noibat/icon.png b/graphics/pokemon/gen_6/noibat/icon.png similarity index 100% rename from graphics/pokemon/noibat/icon.png rename to graphics/pokemon/gen_6/noibat/icon.png diff --git a/graphics/pokemon/noibat/normal.pal b/graphics/pokemon/gen_6/noibat/normal.pal similarity index 100% rename from graphics/pokemon/noibat/normal.pal rename to graphics/pokemon/gen_6/noibat/normal.pal diff --git a/graphics/pokemon/noibat/shiny.pal b/graphics/pokemon/gen_6/noibat/shiny.pal similarity index 100% rename from graphics/pokemon/noibat/shiny.pal rename to graphics/pokemon/gen_6/noibat/shiny.pal diff --git a/graphics/pokemon/noivern/anim_front.png b/graphics/pokemon/gen_6/noivern/anim_front.png similarity index 100% rename from graphics/pokemon/noivern/anim_front.png rename to graphics/pokemon/gen_6/noivern/anim_front.png diff --git a/graphics/pokemon/noivern/back.png b/graphics/pokemon/gen_6/noivern/back.png similarity index 100% rename from graphics/pokemon/noivern/back.png rename to graphics/pokemon/gen_6/noivern/back.png diff --git a/graphics/pokemon/noivern/footprint.png b/graphics/pokemon/gen_6/noivern/footprint.png similarity index 100% rename from graphics/pokemon/noivern/footprint.png rename to graphics/pokemon/gen_6/noivern/footprint.png diff --git a/graphics/pokemon/noivern/icon.png b/graphics/pokemon/gen_6/noivern/icon.png similarity index 100% rename from graphics/pokemon/noivern/icon.png rename to graphics/pokemon/gen_6/noivern/icon.png diff --git a/graphics/pokemon/noivern/normal.pal b/graphics/pokemon/gen_6/noivern/normal.pal similarity index 100% rename from graphics/pokemon/noivern/normal.pal rename to graphics/pokemon/gen_6/noivern/normal.pal diff --git a/graphics/pokemon/noivern/shiny.pal b/graphics/pokemon/gen_6/noivern/shiny.pal similarity index 100% rename from graphics/pokemon/noivern/shiny.pal rename to graphics/pokemon/gen_6/noivern/shiny.pal diff --git a/graphics/pokemon/pancham/anim_front.png b/graphics/pokemon/gen_6/pancham/anim_front.png similarity index 100% rename from graphics/pokemon/pancham/anim_front.png rename to graphics/pokemon/gen_6/pancham/anim_front.png diff --git a/graphics/pokemon/pancham/back.png b/graphics/pokemon/gen_6/pancham/back.png similarity index 100% rename from graphics/pokemon/pancham/back.png rename to graphics/pokemon/gen_6/pancham/back.png diff --git a/graphics/pokemon/pancham/footprint.png b/graphics/pokemon/gen_6/pancham/footprint.png similarity index 100% rename from graphics/pokemon/pancham/footprint.png rename to graphics/pokemon/gen_6/pancham/footprint.png diff --git a/graphics/pokemon/pancham/icon.png b/graphics/pokemon/gen_6/pancham/icon.png similarity index 100% rename from graphics/pokemon/pancham/icon.png rename to graphics/pokemon/gen_6/pancham/icon.png diff --git a/graphics/pokemon/pancham/normal.pal b/graphics/pokemon/gen_6/pancham/normal.pal similarity index 100% rename from graphics/pokemon/pancham/normal.pal rename to graphics/pokemon/gen_6/pancham/normal.pal diff --git a/graphics/pokemon/pancham/shiny.pal b/graphics/pokemon/gen_6/pancham/shiny.pal similarity index 100% rename from graphics/pokemon/pancham/shiny.pal rename to graphics/pokemon/gen_6/pancham/shiny.pal diff --git a/graphics/pokemon/pangoro/anim_front.png b/graphics/pokemon/gen_6/pangoro/anim_front.png similarity index 100% rename from graphics/pokemon/pangoro/anim_front.png rename to graphics/pokemon/gen_6/pangoro/anim_front.png diff --git a/graphics/pokemon/pangoro/back.png b/graphics/pokemon/gen_6/pangoro/back.png similarity index 100% rename from graphics/pokemon/pangoro/back.png rename to graphics/pokemon/gen_6/pangoro/back.png diff --git a/graphics/pokemon/pangoro/footprint.png b/graphics/pokemon/gen_6/pangoro/footprint.png similarity index 100% rename from graphics/pokemon/pangoro/footprint.png rename to graphics/pokemon/gen_6/pangoro/footprint.png diff --git a/graphics/pokemon/pangoro/icon.png b/graphics/pokemon/gen_6/pangoro/icon.png similarity index 100% rename from graphics/pokemon/pangoro/icon.png rename to graphics/pokemon/gen_6/pangoro/icon.png diff --git a/graphics/pokemon/pangoro/normal.pal b/graphics/pokemon/gen_6/pangoro/normal.pal similarity index 100% rename from graphics/pokemon/pangoro/normal.pal rename to graphics/pokemon/gen_6/pangoro/normal.pal diff --git a/graphics/pokemon/pangoro/shiny.pal b/graphics/pokemon/gen_6/pangoro/shiny.pal similarity index 100% rename from graphics/pokemon/pangoro/shiny.pal rename to graphics/pokemon/gen_6/pangoro/shiny.pal diff --git a/graphics/pokemon/phantump/anim_front.png b/graphics/pokemon/gen_6/phantump/anim_front.png similarity index 100% rename from graphics/pokemon/phantump/anim_front.png rename to graphics/pokemon/gen_6/phantump/anim_front.png diff --git a/graphics/pokemon/phantump/back.png b/graphics/pokemon/gen_6/phantump/back.png similarity index 100% rename from graphics/pokemon/phantump/back.png rename to graphics/pokemon/gen_6/phantump/back.png diff --git a/graphics/pokemon/skrelp/footprint.png b/graphics/pokemon/gen_6/phantump/footprint.png similarity index 100% rename from graphics/pokemon/skrelp/footprint.png rename to graphics/pokemon/gen_6/phantump/footprint.png diff --git a/graphics/pokemon/phantump/icon.png b/graphics/pokemon/gen_6/phantump/icon.png similarity index 100% rename from graphics/pokemon/phantump/icon.png rename to graphics/pokemon/gen_6/phantump/icon.png diff --git a/graphics/pokemon/phantump/normal.pal b/graphics/pokemon/gen_6/phantump/normal.pal similarity index 100% rename from graphics/pokemon/phantump/normal.pal rename to graphics/pokemon/gen_6/phantump/normal.pal diff --git a/graphics/pokemon/phantump/shiny.pal b/graphics/pokemon/gen_6/phantump/shiny.pal similarity index 100% rename from graphics/pokemon/phantump/shiny.pal rename to graphics/pokemon/gen_6/phantump/shiny.pal diff --git a/graphics/pokemon/pumpkaboo/anim_front.png b/graphics/pokemon/gen_6/pumpkaboo/anim_front.png similarity index 100% rename from graphics/pokemon/pumpkaboo/anim_front.png rename to graphics/pokemon/gen_6/pumpkaboo/anim_front.png diff --git a/graphics/pokemon/pumpkaboo/back.png b/graphics/pokemon/gen_6/pumpkaboo/back.png similarity index 100% rename from graphics/pokemon/pumpkaboo/back.png rename to graphics/pokemon/gen_6/pumpkaboo/back.png diff --git a/graphics/pokemon/scatterbug/footprint.png b/graphics/pokemon/gen_6/pumpkaboo/footprint.png similarity index 100% rename from graphics/pokemon/scatterbug/footprint.png rename to graphics/pokemon/gen_6/pumpkaboo/footprint.png diff --git a/graphics/pokemon/pumpkaboo/icon.png b/graphics/pokemon/gen_6/pumpkaboo/icon.png similarity index 100% rename from graphics/pokemon/pumpkaboo/icon.png rename to graphics/pokemon/gen_6/pumpkaboo/icon.png diff --git a/graphics/pokemon/pumpkaboo/large/anim_front.png b/graphics/pokemon/gen_6/pumpkaboo/large/anim_front.png similarity index 100% rename from graphics/pokemon/pumpkaboo/large/anim_front.png rename to graphics/pokemon/gen_6/pumpkaboo/large/anim_front.png diff --git a/graphics/pokemon/pumpkaboo/large/back.png b/graphics/pokemon/gen_6/pumpkaboo/large/back.png similarity index 100% rename from graphics/pokemon/pumpkaboo/large/back.png rename to graphics/pokemon/gen_6/pumpkaboo/large/back.png diff --git a/graphics/pokemon/pumpkaboo/normal.pal b/graphics/pokemon/gen_6/pumpkaboo/normal.pal similarity index 100% rename from graphics/pokemon/pumpkaboo/normal.pal rename to graphics/pokemon/gen_6/pumpkaboo/normal.pal diff --git a/graphics/pokemon/pumpkaboo/shiny.pal b/graphics/pokemon/gen_6/pumpkaboo/shiny.pal similarity index 100% rename from graphics/pokemon/pumpkaboo/shiny.pal rename to graphics/pokemon/gen_6/pumpkaboo/shiny.pal diff --git a/graphics/pokemon/pumpkaboo/small/anim_front.png b/graphics/pokemon/gen_6/pumpkaboo/small/anim_front.png similarity index 100% rename from graphics/pokemon/pumpkaboo/small/anim_front.png rename to graphics/pokemon/gen_6/pumpkaboo/small/anim_front.png diff --git a/graphics/pokemon/pumpkaboo/small/back.png b/graphics/pokemon/gen_6/pumpkaboo/small/back.png similarity index 100% rename from graphics/pokemon/pumpkaboo/small/back.png rename to graphics/pokemon/gen_6/pumpkaboo/small/back.png diff --git a/graphics/pokemon/pumpkaboo/super/anim_front.png b/graphics/pokemon/gen_6/pumpkaboo/super/anim_front.png similarity index 100% rename from graphics/pokemon/pumpkaboo/super/anim_front.png rename to graphics/pokemon/gen_6/pumpkaboo/super/anim_front.png diff --git a/graphics/pokemon/pumpkaboo/super/back.png b/graphics/pokemon/gen_6/pumpkaboo/super/back.png similarity index 100% rename from graphics/pokemon/pumpkaboo/super/back.png rename to graphics/pokemon/gen_6/pumpkaboo/super/back.png diff --git a/graphics/pokemon/pyroar/anim_front.png b/graphics/pokemon/gen_6/pyroar/anim_front.png similarity index 100% rename from graphics/pokemon/pyroar/anim_front.png rename to graphics/pokemon/gen_6/pyroar/anim_front.png diff --git a/graphics/pokemon/pyroar/anim_frontf.png b/graphics/pokemon/gen_6/pyroar/anim_frontf.png similarity index 100% rename from graphics/pokemon/pyroar/anim_frontf.png rename to graphics/pokemon/gen_6/pyroar/anim_frontf.png diff --git a/graphics/pokemon/pyroar/back.png b/graphics/pokemon/gen_6/pyroar/back.png similarity index 100% rename from graphics/pokemon/pyroar/back.png rename to graphics/pokemon/gen_6/pyroar/back.png diff --git a/graphics/pokemon/pyroar/backf.png b/graphics/pokemon/gen_6/pyroar/backf.png similarity index 100% rename from graphics/pokemon/pyroar/backf.png rename to graphics/pokemon/gen_6/pyroar/backf.png diff --git a/graphics/pokemon/pyroar/footprint.png b/graphics/pokemon/gen_6/pyroar/footprint.png similarity index 100% rename from graphics/pokemon/pyroar/footprint.png rename to graphics/pokemon/gen_6/pyroar/footprint.png diff --git a/graphics/pokemon/pyroar/frontf.png b/graphics/pokemon/gen_6/pyroar/frontf.png similarity index 100% rename from graphics/pokemon/pyroar/frontf.png rename to graphics/pokemon/gen_6/pyroar/frontf.png diff --git a/graphics/pokemon/pyroar/icon.png b/graphics/pokemon/gen_6/pyroar/icon.png similarity index 100% rename from graphics/pokemon/pyroar/icon.png rename to graphics/pokemon/gen_6/pyroar/icon.png diff --git a/graphics/pokemon/pyroar/iconf.png b/graphics/pokemon/gen_6/pyroar/iconf.png similarity index 100% rename from graphics/pokemon/pyroar/iconf.png rename to graphics/pokemon/gen_6/pyroar/iconf.png diff --git a/graphics/pokemon/pyroar/normal.pal b/graphics/pokemon/gen_6/pyroar/normal.pal similarity index 100% rename from graphics/pokemon/pyroar/normal.pal rename to graphics/pokemon/gen_6/pyroar/normal.pal diff --git a/graphics/pokemon/pyroar/shiny.pal b/graphics/pokemon/gen_6/pyroar/shiny.pal similarity index 100% rename from graphics/pokemon/pyroar/shiny.pal rename to graphics/pokemon/gen_6/pyroar/shiny.pal diff --git a/graphics/pokemon/quilladin/anim_front.png b/graphics/pokemon/gen_6/quilladin/anim_front.png similarity index 100% rename from graphics/pokemon/quilladin/anim_front.png rename to graphics/pokemon/gen_6/quilladin/anim_front.png diff --git a/graphics/pokemon/quilladin/back.png b/graphics/pokemon/gen_6/quilladin/back.png similarity index 100% rename from graphics/pokemon/quilladin/back.png rename to graphics/pokemon/gen_6/quilladin/back.png diff --git a/graphics/pokemon/quilladin/footprint.png b/graphics/pokemon/gen_6/quilladin/footprint.png similarity index 100% rename from graphics/pokemon/quilladin/footprint.png rename to graphics/pokemon/gen_6/quilladin/footprint.png diff --git a/graphics/pokemon/quilladin/icon.png b/graphics/pokemon/gen_6/quilladin/icon.png similarity index 100% rename from graphics/pokemon/quilladin/icon.png rename to graphics/pokemon/gen_6/quilladin/icon.png diff --git a/graphics/pokemon/quilladin/normal.pal b/graphics/pokemon/gen_6/quilladin/normal.pal similarity index 100% rename from graphics/pokemon/quilladin/normal.pal rename to graphics/pokemon/gen_6/quilladin/normal.pal diff --git a/graphics/pokemon/quilladin/shiny.pal b/graphics/pokemon/gen_6/quilladin/shiny.pal similarity index 100% rename from graphics/pokemon/quilladin/shiny.pal rename to graphics/pokemon/gen_6/quilladin/shiny.pal diff --git a/graphics/pokemon/scatterbug/anim_front.png b/graphics/pokemon/gen_6/scatterbug/anim_front.png similarity index 100% rename from graphics/pokemon/scatterbug/anim_front.png rename to graphics/pokemon/gen_6/scatterbug/anim_front.png diff --git a/graphics/pokemon/scatterbug/back.png b/graphics/pokemon/gen_6/scatterbug/back.png similarity index 100% rename from graphics/pokemon/scatterbug/back.png rename to graphics/pokemon/gen_6/scatterbug/back.png diff --git a/graphics/pokemon/sizzlipede/footprint.png b/graphics/pokemon/gen_6/scatterbug/footprint.png similarity index 100% rename from graphics/pokemon/sizzlipede/footprint.png rename to graphics/pokemon/gen_6/scatterbug/footprint.png diff --git a/graphics/pokemon/scatterbug/icon.png b/graphics/pokemon/gen_6/scatterbug/icon.png similarity index 100% rename from graphics/pokemon/scatterbug/icon.png rename to graphics/pokemon/gen_6/scatterbug/icon.png diff --git a/graphics/pokemon/scatterbug/normal.pal b/graphics/pokemon/gen_6/scatterbug/normal.pal similarity index 100% rename from graphics/pokemon/scatterbug/normal.pal rename to graphics/pokemon/gen_6/scatterbug/normal.pal diff --git a/graphics/pokemon/scatterbug/shiny.pal b/graphics/pokemon/gen_6/scatterbug/shiny.pal similarity index 100% rename from graphics/pokemon/scatterbug/shiny.pal rename to graphics/pokemon/gen_6/scatterbug/shiny.pal diff --git a/graphics/pokemon/skiddo/anim_front.png b/graphics/pokemon/gen_6/skiddo/anim_front.png similarity index 100% rename from graphics/pokemon/skiddo/anim_front.png rename to graphics/pokemon/gen_6/skiddo/anim_front.png diff --git a/graphics/pokemon/skiddo/back.png b/graphics/pokemon/gen_6/skiddo/back.png similarity index 100% rename from graphics/pokemon/skiddo/back.png rename to graphics/pokemon/gen_6/skiddo/back.png diff --git a/graphics/pokemon/skiddo/footprint.png b/graphics/pokemon/gen_6/skiddo/footprint.png similarity index 100% rename from graphics/pokemon/skiddo/footprint.png rename to graphics/pokemon/gen_6/skiddo/footprint.png diff --git a/graphics/pokemon/skiddo/icon.png b/graphics/pokemon/gen_6/skiddo/icon.png similarity index 100% rename from graphics/pokemon/skiddo/icon.png rename to graphics/pokemon/gen_6/skiddo/icon.png diff --git a/graphics/pokemon/skiddo/normal.pal b/graphics/pokemon/gen_6/skiddo/normal.pal similarity index 100% rename from graphics/pokemon/skiddo/normal.pal rename to graphics/pokemon/gen_6/skiddo/normal.pal diff --git a/graphics/pokemon/skiddo/shiny.pal b/graphics/pokemon/gen_6/skiddo/shiny.pal similarity index 100% rename from graphics/pokemon/skiddo/shiny.pal rename to graphics/pokemon/gen_6/skiddo/shiny.pal diff --git a/graphics/pokemon/skrelp/anim_front.png b/graphics/pokemon/gen_6/skrelp/anim_front.png similarity index 100% rename from graphics/pokemon/skrelp/anim_front.png rename to graphics/pokemon/gen_6/skrelp/anim_front.png diff --git a/graphics/pokemon/skrelp/back.png b/graphics/pokemon/gen_6/skrelp/back.png similarity index 100% rename from graphics/pokemon/skrelp/back.png rename to graphics/pokemon/gen_6/skrelp/back.png diff --git a/graphics/pokemon/sliggoo/footprint.png b/graphics/pokemon/gen_6/skrelp/footprint.png similarity index 100% rename from graphics/pokemon/sliggoo/footprint.png rename to graphics/pokemon/gen_6/skrelp/footprint.png diff --git a/graphics/pokemon/skrelp/icon.png b/graphics/pokemon/gen_6/skrelp/icon.png similarity index 100% rename from graphics/pokemon/skrelp/icon.png rename to graphics/pokemon/gen_6/skrelp/icon.png diff --git a/graphics/pokemon/skrelp/normal.pal b/graphics/pokemon/gen_6/skrelp/normal.pal similarity index 100% rename from graphics/pokemon/skrelp/normal.pal rename to graphics/pokemon/gen_6/skrelp/normal.pal diff --git a/graphics/pokemon/skrelp/shiny.pal b/graphics/pokemon/gen_6/skrelp/shiny.pal similarity index 100% rename from graphics/pokemon/skrelp/shiny.pal rename to graphics/pokemon/gen_6/skrelp/shiny.pal diff --git a/graphics/pokemon/sliggoo/anim_front.png b/graphics/pokemon/gen_6/sliggoo/anim_front.png similarity index 100% rename from graphics/pokemon/sliggoo/anim_front.png rename to graphics/pokemon/gen_6/sliggoo/anim_front.png diff --git a/graphics/pokemon/sliggoo/back.png b/graphics/pokemon/gen_6/sliggoo/back.png similarity index 100% rename from graphics/pokemon/sliggoo/back.png rename to graphics/pokemon/gen_6/sliggoo/back.png diff --git a/graphics/pokemon/slugma/footprint.png b/graphics/pokemon/gen_6/sliggoo/footprint.png similarity index 100% rename from graphics/pokemon/slugma/footprint.png rename to graphics/pokemon/gen_6/sliggoo/footprint.png diff --git a/graphics/pokemon/sliggoo/hisuian/back.png b/graphics/pokemon/gen_6/sliggoo/hisuian/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/back.png rename to graphics/pokemon/gen_6/sliggoo/hisuian/back.png diff --git a/graphics/pokemon/sliggoo/hisuian/front.png b/graphics/pokemon/gen_6/sliggoo/hisuian/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/front.png rename to graphics/pokemon/gen_6/sliggoo/hisuian/front.png diff --git a/graphics/pokemon/sliggoo/hisuian/icon.png b/graphics/pokemon/gen_6/sliggoo/hisuian/icon.png similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/icon.png rename to graphics/pokemon/gen_6/sliggoo/hisuian/icon.png diff --git a/graphics/pokemon/sliggoo/hisuian/normal.pal b/graphics/pokemon/gen_6/sliggoo/hisuian/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/normal.pal rename to graphics/pokemon/gen_6/sliggoo/hisuian/normal.pal diff --git a/graphics/pokemon/sliggoo/hisuian/shiny.pal b/graphics/pokemon/gen_6/sliggoo/hisuian/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/shiny.pal rename to graphics/pokemon/gen_6/sliggoo/hisuian/shiny.pal diff --git a/graphics/pokemon/sliggoo/icon.png b/graphics/pokemon/gen_6/sliggoo/icon.png similarity index 100% rename from graphics/pokemon/sliggoo/icon.png rename to graphics/pokemon/gen_6/sliggoo/icon.png diff --git a/graphics/pokemon/sliggoo/normal.pal b/graphics/pokemon/gen_6/sliggoo/normal.pal similarity index 100% rename from graphics/pokemon/sliggoo/normal.pal rename to graphics/pokemon/gen_6/sliggoo/normal.pal diff --git a/graphics/pokemon/sliggoo/shiny.pal b/graphics/pokemon/gen_6/sliggoo/shiny.pal similarity index 100% rename from graphics/pokemon/sliggoo/shiny.pal rename to graphics/pokemon/gen_6/sliggoo/shiny.pal diff --git a/graphics/pokemon/slurpuff/anim_front.png b/graphics/pokemon/gen_6/slurpuff/anim_front.png similarity index 100% rename from graphics/pokemon/slurpuff/anim_front.png rename to graphics/pokemon/gen_6/slurpuff/anim_front.png diff --git a/graphics/pokemon/slurpuff/back.png b/graphics/pokemon/gen_6/slurpuff/back.png similarity index 100% rename from graphics/pokemon/slurpuff/back.png rename to graphics/pokemon/gen_6/slurpuff/back.png diff --git a/graphics/pokemon/kirlia/footprint.png b/graphics/pokemon/gen_6/slurpuff/footprint.png similarity index 100% rename from graphics/pokemon/kirlia/footprint.png rename to graphics/pokemon/gen_6/slurpuff/footprint.png diff --git a/graphics/pokemon/slurpuff/icon.png b/graphics/pokemon/gen_6/slurpuff/icon.png similarity index 100% rename from graphics/pokemon/slurpuff/icon.png rename to graphics/pokemon/gen_6/slurpuff/icon.png diff --git a/graphics/pokemon/slurpuff/normal.pal b/graphics/pokemon/gen_6/slurpuff/normal.pal similarity index 100% rename from graphics/pokemon/slurpuff/normal.pal rename to graphics/pokemon/gen_6/slurpuff/normal.pal diff --git a/graphics/pokemon/slurpuff/shiny.pal b/graphics/pokemon/gen_6/slurpuff/shiny.pal similarity index 100% rename from graphics/pokemon/slurpuff/shiny.pal rename to graphics/pokemon/gen_6/slurpuff/shiny.pal diff --git a/graphics/pokemon/spewpa/anim_front.png b/graphics/pokemon/gen_6/spewpa/anim_front.png similarity index 100% rename from graphics/pokemon/spewpa/anim_front.png rename to graphics/pokemon/gen_6/spewpa/anim_front.png diff --git a/graphics/pokemon/spewpa/back.png b/graphics/pokemon/gen_6/spewpa/back.png similarity index 100% rename from graphics/pokemon/spewpa/back.png rename to graphics/pokemon/gen_6/spewpa/back.png diff --git a/graphics/pokemon/snom/footprint.png b/graphics/pokemon/gen_6/spewpa/footprint.png similarity index 100% rename from graphics/pokemon/snom/footprint.png rename to graphics/pokemon/gen_6/spewpa/footprint.png diff --git a/graphics/pokemon/spewpa/icon.png b/graphics/pokemon/gen_6/spewpa/icon.png similarity index 100% rename from graphics/pokemon/spewpa/icon.png rename to graphics/pokemon/gen_6/spewpa/icon.png diff --git a/graphics/pokemon/spewpa/normal.pal b/graphics/pokemon/gen_6/spewpa/normal.pal similarity index 100% rename from graphics/pokemon/spewpa/normal.pal rename to graphics/pokemon/gen_6/spewpa/normal.pal diff --git a/graphics/pokemon/spewpa/shiny.pal b/graphics/pokemon/gen_6/spewpa/shiny.pal similarity index 100% rename from graphics/pokemon/spewpa/shiny.pal rename to graphics/pokemon/gen_6/spewpa/shiny.pal diff --git a/graphics/pokemon/spritzee/anim_front.png b/graphics/pokemon/gen_6/spritzee/anim_front.png similarity index 100% rename from graphics/pokemon/spritzee/anim_front.png rename to graphics/pokemon/gen_6/spritzee/anim_front.png diff --git a/graphics/pokemon/spritzee/back.png b/graphics/pokemon/gen_6/spritzee/back.png similarity index 100% rename from graphics/pokemon/spritzee/back.png rename to graphics/pokemon/gen_6/spritzee/back.png diff --git a/graphics/pokemon/skorupi/footprint.png b/graphics/pokemon/gen_6/spritzee/footprint.png similarity index 100% rename from graphics/pokemon/skorupi/footprint.png rename to graphics/pokemon/gen_6/spritzee/footprint.png diff --git a/graphics/pokemon/spritzee/icon.png b/graphics/pokemon/gen_6/spritzee/icon.png similarity index 100% rename from graphics/pokemon/spritzee/icon.png rename to graphics/pokemon/gen_6/spritzee/icon.png diff --git a/graphics/pokemon/spritzee/normal.pal b/graphics/pokemon/gen_6/spritzee/normal.pal similarity index 100% rename from graphics/pokemon/spritzee/normal.pal rename to graphics/pokemon/gen_6/spritzee/normal.pal diff --git a/graphics/pokemon/spritzee/shiny.pal b/graphics/pokemon/gen_6/spritzee/shiny.pal similarity index 100% rename from graphics/pokemon/spritzee/shiny.pal rename to graphics/pokemon/gen_6/spritzee/shiny.pal diff --git a/graphics/pokemon/swirlix/anim_front.png b/graphics/pokemon/gen_6/swirlix/anim_front.png similarity index 100% rename from graphics/pokemon/swirlix/anim_front.png rename to graphics/pokemon/gen_6/swirlix/anim_front.png diff --git a/graphics/pokemon/swirlix/back.png b/graphics/pokemon/gen_6/swirlix/back.png similarity index 100% rename from graphics/pokemon/swirlix/back.png rename to graphics/pokemon/gen_6/swirlix/back.png diff --git a/graphics/pokemon/solosis/footprint.png b/graphics/pokemon/gen_6/swirlix/footprint.png similarity index 100% rename from graphics/pokemon/solosis/footprint.png rename to graphics/pokemon/gen_6/swirlix/footprint.png diff --git a/graphics/pokemon/swirlix/icon.png b/graphics/pokemon/gen_6/swirlix/icon.png similarity index 100% rename from graphics/pokemon/swirlix/icon.png rename to graphics/pokemon/gen_6/swirlix/icon.png diff --git a/graphics/pokemon/swirlix/normal.pal b/graphics/pokemon/gen_6/swirlix/normal.pal similarity index 100% rename from graphics/pokemon/swirlix/normal.pal rename to graphics/pokemon/gen_6/swirlix/normal.pal diff --git a/graphics/pokemon/swirlix/shiny.pal b/graphics/pokemon/gen_6/swirlix/shiny.pal similarity index 100% rename from graphics/pokemon/swirlix/shiny.pal rename to graphics/pokemon/gen_6/swirlix/shiny.pal diff --git a/graphics/pokemon/sylveon/anim_front.png b/graphics/pokemon/gen_6/sylveon/anim_front.png similarity index 100% rename from graphics/pokemon/sylveon/anim_front.png rename to graphics/pokemon/gen_6/sylveon/anim_front.png diff --git a/graphics/pokemon/sylveon/back.png b/graphics/pokemon/gen_6/sylveon/back.png similarity index 100% rename from graphics/pokemon/sylveon/back.png rename to graphics/pokemon/gen_6/sylveon/back.png diff --git a/graphics/pokemon/sylveon/footprint.png b/graphics/pokemon/gen_6/sylveon/footprint.png similarity index 100% rename from graphics/pokemon/sylveon/footprint.png rename to graphics/pokemon/gen_6/sylveon/footprint.png diff --git a/graphics/pokemon/sylveon/icon.png b/graphics/pokemon/gen_6/sylveon/icon.png similarity index 100% rename from graphics/pokemon/sylveon/icon.png rename to graphics/pokemon/gen_6/sylveon/icon.png diff --git a/graphics/pokemon/sylveon/normal.pal b/graphics/pokemon/gen_6/sylveon/normal.pal similarity index 100% rename from graphics/pokemon/sylveon/normal.pal rename to graphics/pokemon/gen_6/sylveon/normal.pal diff --git a/graphics/pokemon/sylveon/shiny.pal b/graphics/pokemon/gen_6/sylveon/shiny.pal similarity index 100% rename from graphics/pokemon/sylveon/shiny.pal rename to graphics/pokemon/gen_6/sylveon/shiny.pal diff --git a/graphics/pokemon/talonflame/anim_front.png b/graphics/pokemon/gen_6/talonflame/anim_front.png similarity index 100% rename from graphics/pokemon/talonflame/anim_front.png rename to graphics/pokemon/gen_6/talonflame/anim_front.png diff --git a/graphics/pokemon/talonflame/back.png b/graphics/pokemon/gen_6/talonflame/back.png similarity index 100% rename from graphics/pokemon/talonflame/back.png rename to graphics/pokemon/gen_6/talonflame/back.png diff --git a/graphics/pokemon/talonflame/footprint.png b/graphics/pokemon/gen_6/talonflame/footprint.png similarity index 100% rename from graphics/pokemon/talonflame/footprint.png rename to graphics/pokemon/gen_6/talonflame/footprint.png diff --git a/graphics/pokemon/talonflame/icon.png b/graphics/pokemon/gen_6/talonflame/icon.png similarity index 100% rename from graphics/pokemon/talonflame/icon.png rename to graphics/pokemon/gen_6/talonflame/icon.png diff --git a/graphics/pokemon/talonflame/normal.pal b/graphics/pokemon/gen_6/talonflame/normal.pal similarity index 100% rename from graphics/pokemon/talonflame/normal.pal rename to graphics/pokemon/gen_6/talonflame/normal.pal diff --git a/graphics/pokemon/talonflame/shiny.pal b/graphics/pokemon/gen_6/talonflame/shiny.pal similarity index 100% rename from graphics/pokemon/talonflame/shiny.pal rename to graphics/pokemon/gen_6/talonflame/shiny.pal diff --git a/graphics/pokemon/trevenant/anim_front.png b/graphics/pokemon/gen_6/trevenant/anim_front.png similarity index 100% rename from graphics/pokemon/trevenant/anim_front.png rename to graphics/pokemon/gen_6/trevenant/anim_front.png diff --git a/graphics/pokemon/trevenant/back.png b/graphics/pokemon/gen_6/trevenant/back.png similarity index 100% rename from graphics/pokemon/trevenant/back.png rename to graphics/pokemon/gen_6/trevenant/back.png diff --git a/graphics/pokemon/larvesta/footprint.png b/graphics/pokemon/gen_6/trevenant/footprint.png similarity index 100% rename from graphics/pokemon/larvesta/footprint.png rename to graphics/pokemon/gen_6/trevenant/footprint.png diff --git a/graphics/pokemon/trevenant/icon.png b/graphics/pokemon/gen_6/trevenant/icon.png similarity index 100% rename from graphics/pokemon/trevenant/icon.png rename to graphics/pokemon/gen_6/trevenant/icon.png diff --git a/graphics/pokemon/trevenant/normal.pal b/graphics/pokemon/gen_6/trevenant/normal.pal similarity index 100% rename from graphics/pokemon/trevenant/normal.pal rename to graphics/pokemon/gen_6/trevenant/normal.pal diff --git a/graphics/pokemon/trevenant/shiny.pal b/graphics/pokemon/gen_6/trevenant/shiny.pal similarity index 100% rename from graphics/pokemon/trevenant/shiny.pal rename to graphics/pokemon/gen_6/trevenant/shiny.pal diff --git a/graphics/pokemon/tyrantrum/anim_front.png b/graphics/pokemon/gen_6/tyrantrum/anim_front.png similarity index 100% rename from graphics/pokemon/tyrantrum/anim_front.png rename to graphics/pokemon/gen_6/tyrantrum/anim_front.png diff --git a/graphics/pokemon/tyrantrum/back.png b/graphics/pokemon/gen_6/tyrantrum/back.png similarity index 100% rename from graphics/pokemon/tyrantrum/back.png rename to graphics/pokemon/gen_6/tyrantrum/back.png diff --git a/graphics/pokemon/tyrantrum/footprint.png b/graphics/pokemon/gen_6/tyrantrum/footprint.png similarity index 100% rename from graphics/pokemon/tyrantrum/footprint.png rename to graphics/pokemon/gen_6/tyrantrum/footprint.png diff --git a/graphics/pokemon/tyrantrum/icon.png b/graphics/pokemon/gen_6/tyrantrum/icon.png similarity index 100% rename from graphics/pokemon/tyrantrum/icon.png rename to graphics/pokemon/gen_6/tyrantrum/icon.png diff --git a/graphics/pokemon/tyrantrum/normal.pal b/graphics/pokemon/gen_6/tyrantrum/normal.pal similarity index 100% rename from graphics/pokemon/tyrantrum/normal.pal rename to graphics/pokemon/gen_6/tyrantrum/normal.pal diff --git a/graphics/pokemon/tyrantrum/shiny.pal b/graphics/pokemon/gen_6/tyrantrum/shiny.pal similarity index 100% rename from graphics/pokemon/tyrantrum/shiny.pal rename to graphics/pokemon/gen_6/tyrantrum/shiny.pal diff --git a/graphics/pokemon/tyrunt/anim_front.png b/graphics/pokemon/gen_6/tyrunt/anim_front.png similarity index 100% rename from graphics/pokemon/tyrunt/anim_front.png rename to graphics/pokemon/gen_6/tyrunt/anim_front.png diff --git a/graphics/pokemon/tyrunt/back.png b/graphics/pokemon/gen_6/tyrunt/back.png similarity index 100% rename from graphics/pokemon/tyrunt/back.png rename to graphics/pokemon/gen_6/tyrunt/back.png diff --git a/graphics/pokemon/tyrunt/footprint.png b/graphics/pokemon/gen_6/tyrunt/footprint.png similarity index 100% rename from graphics/pokemon/tyrunt/footprint.png rename to graphics/pokemon/gen_6/tyrunt/footprint.png diff --git a/graphics/pokemon/tyrunt/icon.png b/graphics/pokemon/gen_6/tyrunt/icon.png similarity index 100% rename from graphics/pokemon/tyrunt/icon.png rename to graphics/pokemon/gen_6/tyrunt/icon.png diff --git a/graphics/pokemon/tyrunt/normal.pal b/graphics/pokemon/gen_6/tyrunt/normal.pal similarity index 100% rename from graphics/pokemon/tyrunt/normal.pal rename to graphics/pokemon/gen_6/tyrunt/normal.pal diff --git a/graphics/pokemon/tyrunt/shiny.pal b/graphics/pokemon/gen_6/tyrunt/shiny.pal similarity index 100% rename from graphics/pokemon/tyrunt/shiny.pal rename to graphics/pokemon/gen_6/tyrunt/shiny.pal diff --git a/graphics/pokemon/vivillon/anim_front.png b/graphics/pokemon/gen_6/vivillon/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/anim_front.png rename to graphics/pokemon/gen_6/vivillon/anim_front.png diff --git a/graphics/pokemon/vivillon/archipelago/anim_front.png b/graphics/pokemon/gen_6/vivillon/archipelago/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/archipelago/anim_front.png rename to graphics/pokemon/gen_6/vivillon/archipelago/anim_front.png diff --git a/graphics/pokemon/vivillon/archipelago/back.png b/graphics/pokemon/gen_6/vivillon/archipelago/back.png similarity index 100% rename from graphics/pokemon/vivillon/archipelago/back.png rename to graphics/pokemon/gen_6/vivillon/archipelago/back.png diff --git a/graphics/pokemon/vivillon/archipelago/icon.png b/graphics/pokemon/gen_6/vivillon/archipelago/icon.png similarity index 100% rename from graphics/pokemon/vivillon/archipelago/icon.png rename to graphics/pokemon/gen_6/vivillon/archipelago/icon.png diff --git a/graphics/pokemon/vivillon/archipelago/normal.pal b/graphics/pokemon/gen_6/vivillon/archipelago/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/archipelago/normal.pal rename to graphics/pokemon/gen_6/vivillon/archipelago/normal.pal diff --git a/graphics/pokemon/vivillon/archipelago/shiny.pal b/graphics/pokemon/gen_6/vivillon/archipelago/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/archipelago/shiny.pal rename to graphics/pokemon/gen_6/vivillon/archipelago/shiny.pal diff --git a/graphics/pokemon/vivillon/back.png b/graphics/pokemon/gen_6/vivillon/back.png similarity index 100% rename from graphics/pokemon/vivillon/back.png rename to graphics/pokemon/gen_6/vivillon/back.png diff --git a/graphics/pokemon/vivillon/continental/anim_front.png b/graphics/pokemon/gen_6/vivillon/continental/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/continental/anim_front.png rename to graphics/pokemon/gen_6/vivillon/continental/anim_front.png diff --git a/graphics/pokemon/vivillon/continental/back.png b/graphics/pokemon/gen_6/vivillon/continental/back.png similarity index 100% rename from graphics/pokemon/vivillon/continental/back.png rename to graphics/pokemon/gen_6/vivillon/continental/back.png diff --git a/graphics/pokemon/vivillon/continental/icon.png b/graphics/pokemon/gen_6/vivillon/continental/icon.png similarity index 100% rename from graphics/pokemon/vivillon/continental/icon.png rename to graphics/pokemon/gen_6/vivillon/continental/icon.png diff --git a/graphics/pokemon/vivillon/continental/normal.pal b/graphics/pokemon/gen_6/vivillon/continental/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/continental/normal.pal rename to graphics/pokemon/gen_6/vivillon/continental/normal.pal diff --git a/graphics/pokemon/vivillon/continental/shiny.pal b/graphics/pokemon/gen_6/vivillon/continental/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/continental/shiny.pal rename to graphics/pokemon/gen_6/vivillon/continental/shiny.pal diff --git a/graphics/pokemon/vivillon/elegant/anim_front.png b/graphics/pokemon/gen_6/vivillon/elegant/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/elegant/anim_front.png rename to graphics/pokemon/gen_6/vivillon/elegant/anim_front.png diff --git a/graphics/pokemon/vivillon/elegant/back.png b/graphics/pokemon/gen_6/vivillon/elegant/back.png similarity index 100% rename from graphics/pokemon/vivillon/elegant/back.png rename to graphics/pokemon/gen_6/vivillon/elegant/back.png diff --git a/graphics/pokemon/vivillon/elegant/icon.png b/graphics/pokemon/gen_6/vivillon/elegant/icon.png similarity index 100% rename from graphics/pokemon/vivillon/elegant/icon.png rename to graphics/pokemon/gen_6/vivillon/elegant/icon.png diff --git a/graphics/pokemon/vivillon/elegant/normal.pal b/graphics/pokemon/gen_6/vivillon/elegant/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/elegant/normal.pal rename to graphics/pokemon/gen_6/vivillon/elegant/normal.pal diff --git a/graphics/pokemon/vivillon/elegant/shiny.pal b/graphics/pokemon/gen_6/vivillon/elegant/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/elegant/shiny.pal rename to graphics/pokemon/gen_6/vivillon/elegant/shiny.pal diff --git a/graphics/pokemon/vivillon/fancy/anim_front.png b/graphics/pokemon/gen_6/vivillon/fancy/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/fancy/anim_front.png rename to graphics/pokemon/gen_6/vivillon/fancy/anim_front.png diff --git a/graphics/pokemon/vivillon/fancy/back.png b/graphics/pokemon/gen_6/vivillon/fancy/back.png similarity index 100% rename from graphics/pokemon/vivillon/fancy/back.png rename to graphics/pokemon/gen_6/vivillon/fancy/back.png diff --git a/graphics/pokemon/vivillon/fancy/icon.png b/graphics/pokemon/gen_6/vivillon/fancy/icon.png similarity index 100% rename from graphics/pokemon/vivillon/fancy/icon.png rename to graphics/pokemon/gen_6/vivillon/fancy/icon.png diff --git a/graphics/pokemon/vivillon/fancy/normal.pal b/graphics/pokemon/gen_6/vivillon/fancy/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/fancy/normal.pal rename to graphics/pokemon/gen_6/vivillon/fancy/normal.pal diff --git a/graphics/pokemon/vivillon/fancy/shiny.pal b/graphics/pokemon/gen_6/vivillon/fancy/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/fancy/shiny.pal rename to graphics/pokemon/gen_6/vivillon/fancy/shiny.pal diff --git a/graphics/pokemon/solrock/footprint.png b/graphics/pokemon/gen_6/vivillon/footprint.png similarity index 100% rename from graphics/pokemon/solrock/footprint.png rename to graphics/pokemon/gen_6/vivillon/footprint.png diff --git a/graphics/pokemon/vivillon/garden/anim_front.png b/graphics/pokemon/gen_6/vivillon/garden/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/garden/anim_front.png rename to graphics/pokemon/gen_6/vivillon/garden/anim_front.png diff --git a/graphics/pokemon/vivillon/garden/back.png b/graphics/pokemon/gen_6/vivillon/garden/back.png similarity index 100% rename from graphics/pokemon/vivillon/garden/back.png rename to graphics/pokemon/gen_6/vivillon/garden/back.png diff --git a/graphics/pokemon/vivillon/garden/icon.png b/graphics/pokemon/gen_6/vivillon/garden/icon.png similarity index 100% rename from graphics/pokemon/vivillon/garden/icon.png rename to graphics/pokemon/gen_6/vivillon/garden/icon.png diff --git a/graphics/pokemon/vivillon/garden/normal.pal b/graphics/pokemon/gen_6/vivillon/garden/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/garden/normal.pal rename to graphics/pokemon/gen_6/vivillon/garden/normal.pal diff --git a/graphics/pokemon/vivillon/garden/shiny.pal b/graphics/pokemon/gen_6/vivillon/garden/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/garden/shiny.pal rename to graphics/pokemon/gen_6/vivillon/garden/shiny.pal diff --git a/graphics/pokemon/vivillon/high_plains/anim_front.png b/graphics/pokemon/gen_6/vivillon/high_plains/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/high_plains/anim_front.png rename to graphics/pokemon/gen_6/vivillon/high_plains/anim_front.png diff --git a/graphics/pokemon/vivillon/high_plains/back.png b/graphics/pokemon/gen_6/vivillon/high_plains/back.png similarity index 100% rename from graphics/pokemon/vivillon/high_plains/back.png rename to graphics/pokemon/gen_6/vivillon/high_plains/back.png diff --git a/graphics/pokemon/vivillon/high_plains/icon.png b/graphics/pokemon/gen_6/vivillon/high_plains/icon.png similarity index 100% rename from graphics/pokemon/vivillon/high_plains/icon.png rename to graphics/pokemon/gen_6/vivillon/high_plains/icon.png diff --git a/graphics/pokemon/vivillon/high_plains/normal.pal b/graphics/pokemon/gen_6/vivillon/high_plains/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/high_plains/normal.pal rename to graphics/pokemon/gen_6/vivillon/high_plains/normal.pal diff --git a/graphics/pokemon/vivillon/high_plains/shiny.pal b/graphics/pokemon/gen_6/vivillon/high_plains/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/high_plains/shiny.pal rename to graphics/pokemon/gen_6/vivillon/high_plains/shiny.pal diff --git a/graphics/pokemon/vivillon/icon.png b/graphics/pokemon/gen_6/vivillon/icon.png similarity index 100% rename from graphics/pokemon/vivillon/icon.png rename to graphics/pokemon/gen_6/vivillon/icon.png diff --git a/graphics/pokemon/vivillon/jungle/anim_front.png b/graphics/pokemon/gen_6/vivillon/jungle/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/jungle/anim_front.png rename to graphics/pokemon/gen_6/vivillon/jungle/anim_front.png diff --git a/graphics/pokemon/vivillon/jungle/back.png b/graphics/pokemon/gen_6/vivillon/jungle/back.png similarity index 100% rename from graphics/pokemon/vivillon/jungle/back.png rename to graphics/pokemon/gen_6/vivillon/jungle/back.png diff --git a/graphics/pokemon/vivillon/jungle/icon.png b/graphics/pokemon/gen_6/vivillon/jungle/icon.png similarity index 100% rename from graphics/pokemon/vivillon/jungle/icon.png rename to graphics/pokemon/gen_6/vivillon/jungle/icon.png diff --git a/graphics/pokemon/vivillon/jungle/normal.pal b/graphics/pokemon/gen_6/vivillon/jungle/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/jungle/normal.pal rename to graphics/pokemon/gen_6/vivillon/jungle/normal.pal diff --git a/graphics/pokemon/vivillon/jungle/shiny.pal b/graphics/pokemon/gen_6/vivillon/jungle/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/jungle/shiny.pal rename to graphics/pokemon/gen_6/vivillon/jungle/shiny.pal diff --git a/graphics/pokemon/vivillon/marine/anim_front.png b/graphics/pokemon/gen_6/vivillon/marine/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/marine/anim_front.png rename to graphics/pokemon/gen_6/vivillon/marine/anim_front.png diff --git a/graphics/pokemon/vivillon/marine/back.png b/graphics/pokemon/gen_6/vivillon/marine/back.png similarity index 100% rename from graphics/pokemon/vivillon/marine/back.png rename to graphics/pokemon/gen_6/vivillon/marine/back.png diff --git a/graphics/pokemon/vivillon/marine/icon.png b/graphics/pokemon/gen_6/vivillon/marine/icon.png similarity index 100% rename from graphics/pokemon/vivillon/marine/icon.png rename to graphics/pokemon/gen_6/vivillon/marine/icon.png diff --git a/graphics/pokemon/vivillon/marine/normal.pal b/graphics/pokemon/gen_6/vivillon/marine/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/marine/normal.pal rename to graphics/pokemon/gen_6/vivillon/marine/normal.pal diff --git a/graphics/pokemon/vivillon/marine/shiny.pal b/graphics/pokemon/gen_6/vivillon/marine/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/marine/shiny.pal rename to graphics/pokemon/gen_6/vivillon/marine/shiny.pal diff --git a/graphics/pokemon/vivillon/meadow/anim_front.png b/graphics/pokemon/gen_6/vivillon/meadow/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/meadow/anim_front.png rename to graphics/pokemon/gen_6/vivillon/meadow/anim_front.png diff --git a/graphics/pokemon/vivillon/meadow/back.png b/graphics/pokemon/gen_6/vivillon/meadow/back.png similarity index 100% rename from graphics/pokemon/vivillon/meadow/back.png rename to graphics/pokemon/gen_6/vivillon/meadow/back.png diff --git a/graphics/pokemon/vivillon/meadow/icon.png b/graphics/pokemon/gen_6/vivillon/meadow/icon.png similarity index 100% rename from graphics/pokemon/vivillon/meadow/icon.png rename to graphics/pokemon/gen_6/vivillon/meadow/icon.png diff --git a/graphics/pokemon/vivillon/meadow/normal.pal b/graphics/pokemon/gen_6/vivillon/meadow/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/meadow/normal.pal rename to graphics/pokemon/gen_6/vivillon/meadow/normal.pal diff --git a/graphics/pokemon/vivillon/meadow/shiny.pal b/graphics/pokemon/gen_6/vivillon/meadow/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/meadow/shiny.pal rename to graphics/pokemon/gen_6/vivillon/meadow/shiny.pal diff --git a/graphics/pokemon/vivillon/modern/anim_front.png b/graphics/pokemon/gen_6/vivillon/modern/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/modern/anim_front.png rename to graphics/pokemon/gen_6/vivillon/modern/anim_front.png diff --git a/graphics/pokemon/vivillon/modern/back.png b/graphics/pokemon/gen_6/vivillon/modern/back.png similarity index 100% rename from graphics/pokemon/vivillon/modern/back.png rename to graphics/pokemon/gen_6/vivillon/modern/back.png diff --git a/graphics/pokemon/vivillon/modern/icon.png b/graphics/pokemon/gen_6/vivillon/modern/icon.png similarity index 100% rename from graphics/pokemon/vivillon/modern/icon.png rename to graphics/pokemon/gen_6/vivillon/modern/icon.png diff --git a/graphics/pokemon/vivillon/modern/normal.pal b/graphics/pokemon/gen_6/vivillon/modern/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/modern/normal.pal rename to graphics/pokemon/gen_6/vivillon/modern/normal.pal diff --git a/graphics/pokemon/vivillon/modern/shiny.pal b/graphics/pokemon/gen_6/vivillon/modern/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/modern/shiny.pal rename to graphics/pokemon/gen_6/vivillon/modern/shiny.pal diff --git a/graphics/pokemon/vivillon/monsoon/anim_front.png b/graphics/pokemon/gen_6/vivillon/monsoon/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/monsoon/anim_front.png rename to graphics/pokemon/gen_6/vivillon/monsoon/anim_front.png diff --git a/graphics/pokemon/vivillon/monsoon/back.png b/graphics/pokemon/gen_6/vivillon/monsoon/back.png similarity index 100% rename from graphics/pokemon/vivillon/monsoon/back.png rename to graphics/pokemon/gen_6/vivillon/monsoon/back.png diff --git a/graphics/pokemon/vivillon/monsoon/icon.png b/graphics/pokemon/gen_6/vivillon/monsoon/icon.png similarity index 100% rename from graphics/pokemon/vivillon/monsoon/icon.png rename to graphics/pokemon/gen_6/vivillon/monsoon/icon.png diff --git a/graphics/pokemon/vivillon/monsoon/normal.pal b/graphics/pokemon/gen_6/vivillon/monsoon/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/monsoon/normal.pal rename to graphics/pokemon/gen_6/vivillon/monsoon/normal.pal diff --git a/graphics/pokemon/vivillon/monsoon/shiny.pal b/graphics/pokemon/gen_6/vivillon/monsoon/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/monsoon/shiny.pal rename to graphics/pokemon/gen_6/vivillon/monsoon/shiny.pal diff --git a/graphics/pokemon/vivillon/normal.pal b/graphics/pokemon/gen_6/vivillon/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/normal.pal rename to graphics/pokemon/gen_6/vivillon/normal.pal diff --git a/graphics/pokemon/vivillon/ocean/anim_front.png b/graphics/pokemon/gen_6/vivillon/ocean/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/ocean/anim_front.png rename to graphics/pokemon/gen_6/vivillon/ocean/anim_front.png diff --git a/graphics/pokemon/vivillon/ocean/back.png b/graphics/pokemon/gen_6/vivillon/ocean/back.png similarity index 100% rename from graphics/pokemon/vivillon/ocean/back.png rename to graphics/pokemon/gen_6/vivillon/ocean/back.png diff --git a/graphics/pokemon/vivillon/ocean/icon.png b/graphics/pokemon/gen_6/vivillon/ocean/icon.png similarity index 100% rename from graphics/pokemon/vivillon/ocean/icon.png rename to graphics/pokemon/gen_6/vivillon/ocean/icon.png diff --git a/graphics/pokemon/vivillon/ocean/normal.pal b/graphics/pokemon/gen_6/vivillon/ocean/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/ocean/normal.pal rename to graphics/pokemon/gen_6/vivillon/ocean/normal.pal diff --git a/graphics/pokemon/vivillon/ocean/shiny.pal b/graphics/pokemon/gen_6/vivillon/ocean/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/ocean/shiny.pal rename to graphics/pokemon/gen_6/vivillon/ocean/shiny.pal diff --git a/graphics/pokemon/vivillon/poke_ball/anim_front.png b/graphics/pokemon/gen_6/vivillon/poke_ball/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/poke_ball/anim_front.png rename to graphics/pokemon/gen_6/vivillon/poke_ball/anim_front.png diff --git a/graphics/pokemon/vivillon/poke_ball/back.png b/graphics/pokemon/gen_6/vivillon/poke_ball/back.png similarity index 100% rename from graphics/pokemon/vivillon/poke_ball/back.png rename to graphics/pokemon/gen_6/vivillon/poke_ball/back.png diff --git a/graphics/pokemon/vivillon/poke_ball/icon.png b/graphics/pokemon/gen_6/vivillon/poke_ball/icon.png similarity index 100% rename from graphics/pokemon/vivillon/poke_ball/icon.png rename to graphics/pokemon/gen_6/vivillon/poke_ball/icon.png diff --git a/graphics/pokemon/vivillon/poke_ball/normal.pal b/graphics/pokemon/gen_6/vivillon/poke_ball/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/poke_ball/normal.pal rename to graphics/pokemon/gen_6/vivillon/poke_ball/normal.pal diff --git a/graphics/pokemon/vivillon/poke_ball/shiny.pal b/graphics/pokemon/gen_6/vivillon/poke_ball/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/poke_ball/shiny.pal rename to graphics/pokemon/gen_6/vivillon/poke_ball/shiny.pal diff --git a/graphics/pokemon/vivillon/polar/anim_front.png b/graphics/pokemon/gen_6/vivillon/polar/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/polar/anim_front.png rename to graphics/pokemon/gen_6/vivillon/polar/anim_front.png diff --git a/graphics/pokemon/vivillon/polar/back.png b/graphics/pokemon/gen_6/vivillon/polar/back.png similarity index 100% rename from graphics/pokemon/vivillon/polar/back.png rename to graphics/pokemon/gen_6/vivillon/polar/back.png diff --git a/graphics/pokemon/vivillon/polar/icon.png b/graphics/pokemon/gen_6/vivillon/polar/icon.png similarity index 100% rename from graphics/pokemon/vivillon/polar/icon.png rename to graphics/pokemon/gen_6/vivillon/polar/icon.png diff --git a/graphics/pokemon/vivillon/polar/normal.pal b/graphics/pokemon/gen_6/vivillon/polar/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/polar/normal.pal rename to graphics/pokemon/gen_6/vivillon/polar/normal.pal diff --git a/graphics/pokemon/vivillon/polar/shiny.pal b/graphics/pokemon/gen_6/vivillon/polar/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/polar/shiny.pal rename to graphics/pokemon/gen_6/vivillon/polar/shiny.pal diff --git a/graphics/pokemon/vivillon/river/anim_front.png b/graphics/pokemon/gen_6/vivillon/river/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/river/anim_front.png rename to graphics/pokemon/gen_6/vivillon/river/anim_front.png diff --git a/graphics/pokemon/vivillon/river/back.png b/graphics/pokemon/gen_6/vivillon/river/back.png similarity index 100% rename from graphics/pokemon/vivillon/river/back.png rename to graphics/pokemon/gen_6/vivillon/river/back.png diff --git a/graphics/pokemon/vivillon/river/icon.png b/graphics/pokemon/gen_6/vivillon/river/icon.png similarity index 100% rename from graphics/pokemon/vivillon/river/icon.png rename to graphics/pokemon/gen_6/vivillon/river/icon.png diff --git a/graphics/pokemon/vivillon/river/normal.pal b/graphics/pokemon/gen_6/vivillon/river/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/river/normal.pal rename to graphics/pokemon/gen_6/vivillon/river/normal.pal diff --git a/graphics/pokemon/vivillon/river/shiny.pal b/graphics/pokemon/gen_6/vivillon/river/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/river/shiny.pal rename to graphics/pokemon/gen_6/vivillon/river/shiny.pal diff --git a/graphics/pokemon/vivillon/sandstorm/anim_front.png b/graphics/pokemon/gen_6/vivillon/sandstorm/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/sandstorm/anim_front.png rename to graphics/pokemon/gen_6/vivillon/sandstorm/anim_front.png diff --git a/graphics/pokemon/vivillon/sandstorm/back.png b/graphics/pokemon/gen_6/vivillon/sandstorm/back.png similarity index 100% rename from graphics/pokemon/vivillon/sandstorm/back.png rename to graphics/pokemon/gen_6/vivillon/sandstorm/back.png diff --git a/graphics/pokemon/vivillon/sandstorm/icon.png b/graphics/pokemon/gen_6/vivillon/sandstorm/icon.png similarity index 100% rename from graphics/pokemon/vivillon/sandstorm/icon.png rename to graphics/pokemon/gen_6/vivillon/sandstorm/icon.png diff --git a/graphics/pokemon/vivillon/sandstorm/normal.pal b/graphics/pokemon/gen_6/vivillon/sandstorm/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/sandstorm/normal.pal rename to graphics/pokemon/gen_6/vivillon/sandstorm/normal.pal diff --git a/graphics/pokemon/vivillon/sandstorm/shiny.pal b/graphics/pokemon/gen_6/vivillon/sandstorm/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/sandstorm/shiny.pal rename to graphics/pokemon/gen_6/vivillon/sandstorm/shiny.pal diff --git a/graphics/pokemon/vivillon/savanna/anim_front.png b/graphics/pokemon/gen_6/vivillon/savanna/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/savanna/anim_front.png rename to graphics/pokemon/gen_6/vivillon/savanna/anim_front.png diff --git a/graphics/pokemon/vivillon/savanna/back.png b/graphics/pokemon/gen_6/vivillon/savanna/back.png similarity index 100% rename from graphics/pokemon/vivillon/savanna/back.png rename to graphics/pokemon/gen_6/vivillon/savanna/back.png diff --git a/graphics/pokemon/vivillon/savanna/icon.png b/graphics/pokemon/gen_6/vivillon/savanna/icon.png similarity index 100% rename from graphics/pokemon/vivillon/savanna/icon.png rename to graphics/pokemon/gen_6/vivillon/savanna/icon.png diff --git a/graphics/pokemon/vivillon/savanna/normal.pal b/graphics/pokemon/gen_6/vivillon/savanna/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/savanna/normal.pal rename to graphics/pokemon/gen_6/vivillon/savanna/normal.pal diff --git a/graphics/pokemon/vivillon/savanna/shiny.pal b/graphics/pokemon/gen_6/vivillon/savanna/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/savanna/shiny.pal rename to graphics/pokemon/gen_6/vivillon/savanna/shiny.pal diff --git a/graphics/pokemon/vivillon/shiny.pal b/graphics/pokemon/gen_6/vivillon/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/shiny.pal rename to graphics/pokemon/gen_6/vivillon/shiny.pal diff --git a/graphics/pokemon/vivillon/sun/anim_front.png b/graphics/pokemon/gen_6/vivillon/sun/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/sun/anim_front.png rename to graphics/pokemon/gen_6/vivillon/sun/anim_front.png diff --git a/graphics/pokemon/vivillon/sun/back.png b/graphics/pokemon/gen_6/vivillon/sun/back.png similarity index 100% rename from graphics/pokemon/vivillon/sun/back.png rename to graphics/pokemon/gen_6/vivillon/sun/back.png diff --git a/graphics/pokemon/vivillon/sun/icon.png b/graphics/pokemon/gen_6/vivillon/sun/icon.png similarity index 100% rename from graphics/pokemon/vivillon/sun/icon.png rename to graphics/pokemon/gen_6/vivillon/sun/icon.png diff --git a/graphics/pokemon/vivillon/sun/normal.pal b/graphics/pokemon/gen_6/vivillon/sun/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/sun/normal.pal rename to graphics/pokemon/gen_6/vivillon/sun/normal.pal diff --git a/graphics/pokemon/vivillon/sun/shiny.pal b/graphics/pokemon/gen_6/vivillon/sun/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/sun/shiny.pal rename to graphics/pokemon/gen_6/vivillon/sun/shiny.pal diff --git a/graphics/pokemon/vivillon/tundra/anim_front.png b/graphics/pokemon/gen_6/vivillon/tundra/anim_front.png similarity index 100% rename from graphics/pokemon/vivillon/tundra/anim_front.png rename to graphics/pokemon/gen_6/vivillon/tundra/anim_front.png diff --git a/graphics/pokemon/vivillon/tundra/back.png b/graphics/pokemon/gen_6/vivillon/tundra/back.png similarity index 100% rename from graphics/pokemon/vivillon/tundra/back.png rename to graphics/pokemon/gen_6/vivillon/tundra/back.png diff --git a/graphics/pokemon/vivillon/tundra/icon.png b/graphics/pokemon/gen_6/vivillon/tundra/icon.png similarity index 100% rename from graphics/pokemon/vivillon/tundra/icon.png rename to graphics/pokemon/gen_6/vivillon/tundra/icon.png diff --git a/graphics/pokemon/vivillon/tundra/normal.pal b/graphics/pokemon/gen_6/vivillon/tundra/normal.pal similarity index 100% rename from graphics/pokemon/vivillon/tundra/normal.pal rename to graphics/pokemon/gen_6/vivillon/tundra/normal.pal diff --git a/graphics/pokemon/vivillon/tundra/shiny.pal b/graphics/pokemon/gen_6/vivillon/tundra/shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/tundra/shiny.pal rename to graphics/pokemon/gen_6/vivillon/tundra/shiny.pal diff --git a/graphics/pokemon/volcanion/anim_front.png b/graphics/pokemon/gen_6/volcanion/anim_front.png similarity index 100% rename from graphics/pokemon/volcanion/anim_front.png rename to graphics/pokemon/gen_6/volcanion/anim_front.png diff --git a/graphics/pokemon/volcanion/back.png b/graphics/pokemon/gen_6/volcanion/back.png similarity index 100% rename from graphics/pokemon/volcanion/back.png rename to graphics/pokemon/gen_6/volcanion/back.png diff --git a/graphics/pokemon/volcanion/footprint.png b/graphics/pokemon/gen_6/volcanion/footprint.png similarity index 100% rename from graphics/pokemon/volcanion/footprint.png rename to graphics/pokemon/gen_6/volcanion/footprint.png diff --git a/graphics/pokemon/volcanion/icon.png b/graphics/pokemon/gen_6/volcanion/icon.png similarity index 100% rename from graphics/pokemon/volcanion/icon.png rename to graphics/pokemon/gen_6/volcanion/icon.png diff --git a/graphics/pokemon/volcanion/normal.pal b/graphics/pokemon/gen_6/volcanion/normal.pal similarity index 100% rename from graphics/pokemon/volcanion/normal.pal rename to graphics/pokemon/gen_6/volcanion/normal.pal diff --git a/graphics/pokemon/volcanion/shiny.pal b/graphics/pokemon/gen_6/volcanion/shiny.pal similarity index 100% rename from graphics/pokemon/volcanion/shiny.pal rename to graphics/pokemon/gen_6/volcanion/shiny.pal diff --git a/graphics/pokemon/xerneas/active/anim_front.png b/graphics/pokemon/gen_6/xerneas/active/anim_front.png similarity index 100% rename from graphics/pokemon/xerneas/active/anim_front.png rename to graphics/pokemon/gen_6/xerneas/active/anim_front.png diff --git a/graphics/pokemon/xerneas/active/back.png b/graphics/pokemon/gen_6/xerneas/active/back.png similarity index 100% rename from graphics/pokemon/xerneas/active/back.png rename to graphics/pokemon/gen_6/xerneas/active/back.png diff --git a/graphics/pokemon/xerneas/active/icon.png b/graphics/pokemon/gen_6/xerneas/active/icon.png similarity index 100% rename from graphics/pokemon/xerneas/active/icon.png rename to graphics/pokemon/gen_6/xerneas/active/icon.png diff --git a/graphics/pokemon/xerneas/active/normal.pal b/graphics/pokemon/gen_6/xerneas/active/normal.pal similarity index 100% rename from graphics/pokemon/xerneas/active/normal.pal rename to graphics/pokemon/gen_6/xerneas/active/normal.pal diff --git a/graphics/pokemon/xerneas/active/shiny.pal b/graphics/pokemon/gen_6/xerneas/active/shiny.pal similarity index 100% rename from graphics/pokemon/xerneas/active/shiny.pal rename to graphics/pokemon/gen_6/xerneas/active/shiny.pal diff --git a/graphics/pokemon/xerneas/back.png b/graphics/pokemon/gen_6/xerneas/back.png similarity index 100% rename from graphics/pokemon/xerneas/back.png rename to graphics/pokemon/gen_6/xerneas/back.png diff --git a/graphics/pokemon/lurantis/footprint.png b/graphics/pokemon/gen_6/xerneas/footprint.png similarity index 100% rename from graphics/pokemon/lurantis/footprint.png rename to graphics/pokemon/gen_6/xerneas/footprint.png diff --git a/graphics/pokemon/xerneas/front.png b/graphics/pokemon/gen_6/xerneas/front.png similarity index 100% rename from graphics/pokemon/xerneas/front.png rename to graphics/pokemon/gen_6/xerneas/front.png diff --git a/graphics/pokemon/xerneas/icon.png b/graphics/pokemon/gen_6/xerneas/icon.png similarity index 100% rename from graphics/pokemon/xerneas/icon.png rename to graphics/pokemon/gen_6/xerneas/icon.png diff --git a/graphics/pokemon/xerneas/normal.pal b/graphics/pokemon/gen_6/xerneas/normal.pal similarity index 100% rename from graphics/pokemon/xerneas/normal.pal rename to graphics/pokemon/gen_6/xerneas/normal.pal diff --git a/graphics/pokemon/xerneas/shiny.pal b/graphics/pokemon/gen_6/xerneas/shiny.pal similarity index 100% rename from graphics/pokemon/xerneas/shiny.pal rename to graphics/pokemon/gen_6/xerneas/shiny.pal diff --git a/graphics/pokemon/yveltal/anim_front.png b/graphics/pokemon/gen_6/yveltal/anim_front.png similarity index 100% rename from graphics/pokemon/yveltal/anim_front.png rename to graphics/pokemon/gen_6/yveltal/anim_front.png diff --git a/graphics/pokemon/yveltal/back.png b/graphics/pokemon/gen_6/yveltal/back.png similarity index 100% rename from graphics/pokemon/yveltal/back.png rename to graphics/pokemon/gen_6/yveltal/back.png diff --git a/graphics/pokemon/yveltal/footprint.png b/graphics/pokemon/gen_6/yveltal/footprint.png similarity index 100% rename from graphics/pokemon/yveltal/footprint.png rename to graphics/pokemon/gen_6/yveltal/footprint.png diff --git a/graphics/pokemon/yveltal/icon.png b/graphics/pokemon/gen_6/yveltal/icon.png similarity index 100% rename from graphics/pokemon/yveltal/icon.png rename to graphics/pokemon/gen_6/yveltal/icon.png diff --git a/graphics/pokemon/yveltal/normal.pal b/graphics/pokemon/gen_6/yveltal/normal.pal similarity index 100% rename from graphics/pokemon/yveltal/normal.pal rename to graphics/pokemon/gen_6/yveltal/normal.pal diff --git a/graphics/pokemon/yveltal/shiny.pal b/graphics/pokemon/gen_6/yveltal/shiny.pal similarity index 100% rename from graphics/pokemon/yveltal/shiny.pal rename to graphics/pokemon/gen_6/yveltal/shiny.pal diff --git a/graphics/pokemon/zygarde/10_percent/anim_front.png b/graphics/pokemon/gen_6/zygarde/10_percent/anim_front.png similarity index 100% rename from graphics/pokemon/zygarde/10_percent/anim_front.png rename to graphics/pokemon/gen_6/zygarde/10_percent/anim_front.png diff --git a/graphics/pokemon/zygarde/10_percent/back.png b/graphics/pokemon/gen_6/zygarde/10_percent/back.png similarity index 100% rename from graphics/pokemon/zygarde/10_percent/back.png rename to graphics/pokemon/gen_6/zygarde/10_percent/back.png diff --git a/graphics/pokemon/zygarde/10_percent/icon.png b/graphics/pokemon/gen_6/zygarde/10_percent/icon.png similarity index 100% rename from graphics/pokemon/zygarde/10_percent/icon.png rename to graphics/pokemon/gen_6/zygarde/10_percent/icon.png diff --git a/graphics/pokemon/zygarde/10_percent/normal.pal b/graphics/pokemon/gen_6/zygarde/10_percent/normal.pal similarity index 100% rename from graphics/pokemon/zygarde/10_percent/normal.pal rename to graphics/pokemon/gen_6/zygarde/10_percent/normal.pal diff --git a/graphics/pokemon/zygarde/10_percent/shiny.pal b/graphics/pokemon/gen_6/zygarde/10_percent/shiny.pal similarity index 100% rename from graphics/pokemon/zygarde/10_percent/shiny.pal rename to graphics/pokemon/gen_6/zygarde/10_percent/shiny.pal diff --git a/graphics/pokemon/zygarde/anim_front.png b/graphics/pokemon/gen_6/zygarde/anim_front.png similarity index 100% rename from graphics/pokemon/zygarde/anim_front.png rename to graphics/pokemon/gen_6/zygarde/anim_front.png diff --git a/graphics/pokemon/zygarde/back.png b/graphics/pokemon/gen_6/zygarde/back.png similarity index 100% rename from graphics/pokemon/zygarde/back.png rename to graphics/pokemon/gen_6/zygarde/back.png diff --git a/graphics/pokemon/zygarde/complete/anim_front.png b/graphics/pokemon/gen_6/zygarde/complete/anim_front.png similarity index 100% rename from graphics/pokemon/zygarde/complete/anim_front.png rename to graphics/pokemon/gen_6/zygarde/complete/anim_front.png diff --git a/graphics/pokemon/zygarde/complete/back.png b/graphics/pokemon/gen_6/zygarde/complete/back.png similarity index 100% rename from graphics/pokemon/zygarde/complete/back.png rename to graphics/pokemon/gen_6/zygarde/complete/back.png diff --git a/graphics/pokemon/zygarde/complete/icon.png b/graphics/pokemon/gen_6/zygarde/complete/icon.png similarity index 100% rename from graphics/pokemon/zygarde/complete/icon.png rename to graphics/pokemon/gen_6/zygarde/complete/icon.png diff --git a/graphics/pokemon/zygarde/complete/normal.pal b/graphics/pokemon/gen_6/zygarde/complete/normal.pal similarity index 100% rename from graphics/pokemon/zygarde/complete/normal.pal rename to graphics/pokemon/gen_6/zygarde/complete/normal.pal diff --git a/graphics/pokemon/zygarde/complete/shiny.pal b/graphics/pokemon/gen_6/zygarde/complete/shiny.pal similarity index 100% rename from graphics/pokemon/zygarde/complete/shiny.pal rename to graphics/pokemon/gen_6/zygarde/complete/shiny.pal diff --git a/graphics/pokemon/zygarde/footprint.png b/graphics/pokemon/gen_6/zygarde/footprint.png similarity index 100% rename from graphics/pokemon/zygarde/footprint.png rename to graphics/pokemon/gen_6/zygarde/footprint.png diff --git a/graphics/pokemon/zygarde/icon.png b/graphics/pokemon/gen_6/zygarde/icon.png similarity index 100% rename from graphics/pokemon/zygarde/icon.png rename to graphics/pokemon/gen_6/zygarde/icon.png diff --git a/graphics/pokemon/zygarde/normal.pal b/graphics/pokemon/gen_6/zygarde/normal.pal similarity index 100% rename from graphics/pokemon/zygarde/normal.pal rename to graphics/pokemon/gen_6/zygarde/normal.pal diff --git a/graphics/pokemon/zygarde/shiny.pal b/graphics/pokemon/gen_6/zygarde/shiny.pal similarity index 100% rename from graphics/pokemon/zygarde/shiny.pal rename to graphics/pokemon/gen_6/zygarde/shiny.pal diff --git a/graphics/pokemon/araquanid/anim_front.png b/graphics/pokemon/gen_7/araquanid/anim_front.png similarity index 100% rename from graphics/pokemon/araquanid/anim_front.png rename to graphics/pokemon/gen_7/araquanid/anim_front.png diff --git a/graphics/pokemon/araquanid/back.png b/graphics/pokemon/gen_7/araquanid/back.png similarity index 100% rename from graphics/pokemon/araquanid/back.png rename to graphics/pokemon/gen_7/araquanid/back.png diff --git a/graphics/pokemon/magearna/footprint.png b/graphics/pokemon/gen_7/araquanid/footprint.png similarity index 100% rename from graphics/pokemon/magearna/footprint.png rename to graphics/pokemon/gen_7/araquanid/footprint.png diff --git a/graphics/pokemon/araquanid/icon.png b/graphics/pokemon/gen_7/araquanid/icon.png similarity index 100% rename from graphics/pokemon/araquanid/icon.png rename to graphics/pokemon/gen_7/araquanid/icon.png diff --git a/graphics/pokemon/araquanid/normal.pal b/graphics/pokemon/gen_7/araquanid/normal.pal similarity index 100% rename from graphics/pokemon/araquanid/normal.pal rename to graphics/pokemon/gen_7/araquanid/normal.pal diff --git a/graphics/pokemon/araquanid/shiny.pal b/graphics/pokemon/gen_7/araquanid/shiny.pal similarity index 100% rename from graphics/pokemon/araquanid/shiny.pal rename to graphics/pokemon/gen_7/araquanid/shiny.pal diff --git a/graphics/pokemon/bewear/anim_front.png b/graphics/pokemon/gen_7/bewear/anim_front.png similarity index 100% rename from graphics/pokemon/bewear/anim_front.png rename to graphics/pokemon/gen_7/bewear/anim_front.png diff --git a/graphics/pokemon/bewear/back.png b/graphics/pokemon/gen_7/bewear/back.png similarity index 100% rename from graphics/pokemon/bewear/back.png rename to graphics/pokemon/gen_7/bewear/back.png diff --git a/graphics/pokemon/bewear/footprint.png b/graphics/pokemon/gen_7/bewear/footprint.png similarity index 100% rename from graphics/pokemon/bewear/footprint.png rename to graphics/pokemon/gen_7/bewear/footprint.png diff --git a/graphics/pokemon/bewear/icon.png b/graphics/pokemon/gen_7/bewear/icon.png similarity index 100% rename from graphics/pokemon/bewear/icon.png rename to graphics/pokemon/gen_7/bewear/icon.png diff --git a/graphics/pokemon/bewear/normal.pal b/graphics/pokemon/gen_7/bewear/normal.pal similarity index 100% rename from graphics/pokemon/bewear/normal.pal rename to graphics/pokemon/gen_7/bewear/normal.pal diff --git a/graphics/pokemon/bewear/shiny.pal b/graphics/pokemon/gen_7/bewear/shiny.pal similarity index 100% rename from graphics/pokemon/bewear/shiny.pal rename to graphics/pokemon/gen_7/bewear/shiny.pal diff --git a/graphics/pokemon/blacephalon/back.png b/graphics/pokemon/gen_7/blacephalon/back.png similarity index 100% rename from graphics/pokemon/blacephalon/back.png rename to graphics/pokemon/gen_7/blacephalon/back.png diff --git a/graphics/pokemon/mr_mime/footprint.png b/graphics/pokemon/gen_7/blacephalon/footprint.png similarity index 100% rename from graphics/pokemon/mr_mime/footprint.png rename to graphics/pokemon/gen_7/blacephalon/footprint.png diff --git a/graphics/pokemon/blacephalon/front.png b/graphics/pokemon/gen_7/blacephalon/front.png similarity index 100% rename from graphics/pokemon/blacephalon/front.png rename to graphics/pokemon/gen_7/blacephalon/front.png diff --git a/graphics/pokemon/blacephalon/icon.png b/graphics/pokemon/gen_7/blacephalon/icon.png similarity index 100% rename from graphics/pokemon/blacephalon/icon.png rename to graphics/pokemon/gen_7/blacephalon/icon.png diff --git a/graphics/pokemon/blacephalon/normal.pal b/graphics/pokemon/gen_7/blacephalon/normal.pal similarity index 100% rename from graphics/pokemon/blacephalon/normal.pal rename to graphics/pokemon/gen_7/blacephalon/normal.pal diff --git a/graphics/pokemon/blacephalon/shiny.pal b/graphics/pokemon/gen_7/blacephalon/shiny.pal similarity index 100% rename from graphics/pokemon/blacephalon/shiny.pal rename to graphics/pokemon/gen_7/blacephalon/shiny.pal diff --git a/graphics/pokemon/bounsweet/back.png b/graphics/pokemon/gen_7/bounsweet/back.png similarity index 100% rename from graphics/pokemon/bounsweet/back.png rename to graphics/pokemon/gen_7/bounsweet/back.png diff --git a/graphics/pokemon/meloetta/footprint.png b/graphics/pokemon/gen_7/bounsweet/footprint.png similarity index 100% rename from graphics/pokemon/meloetta/footprint.png rename to graphics/pokemon/gen_7/bounsweet/footprint.png diff --git a/graphics/pokemon/bounsweet/front.png b/graphics/pokemon/gen_7/bounsweet/front.png similarity index 100% rename from graphics/pokemon/bounsweet/front.png rename to graphics/pokemon/gen_7/bounsweet/front.png diff --git a/graphics/pokemon/bounsweet/icon.png b/graphics/pokemon/gen_7/bounsweet/icon.png similarity index 100% rename from graphics/pokemon/bounsweet/icon.png rename to graphics/pokemon/gen_7/bounsweet/icon.png diff --git a/graphics/pokemon/bounsweet/normal.pal b/graphics/pokemon/gen_7/bounsweet/normal.pal similarity index 100% rename from graphics/pokemon/bounsweet/normal.pal rename to graphics/pokemon/gen_7/bounsweet/normal.pal diff --git a/graphics/pokemon/bounsweet/shiny.pal b/graphics/pokemon/gen_7/bounsweet/shiny.pal similarity index 100% rename from graphics/pokemon/bounsweet/shiny.pal rename to graphics/pokemon/gen_7/bounsweet/shiny.pal diff --git a/graphics/pokemon/brionne/back.png b/graphics/pokemon/gen_7/brionne/back.png similarity index 100% rename from graphics/pokemon/brionne/back.png rename to graphics/pokemon/gen_7/brionne/back.png diff --git a/graphics/pokemon/spewpa/footprint.png b/graphics/pokemon/gen_7/brionne/footprint.png similarity index 100% rename from graphics/pokemon/spewpa/footprint.png rename to graphics/pokemon/gen_7/brionne/footprint.png diff --git a/graphics/pokemon/brionne/front.png b/graphics/pokemon/gen_7/brionne/front.png similarity index 100% rename from graphics/pokemon/brionne/front.png rename to graphics/pokemon/gen_7/brionne/front.png diff --git a/graphics/pokemon/brionne/icon.png b/graphics/pokemon/gen_7/brionne/icon.png similarity index 100% rename from graphics/pokemon/brionne/icon.png rename to graphics/pokemon/gen_7/brionne/icon.png diff --git a/graphics/pokemon/brionne/normal.pal b/graphics/pokemon/gen_7/brionne/normal.pal similarity index 100% rename from graphics/pokemon/brionne/normal.pal rename to graphics/pokemon/gen_7/brionne/normal.pal diff --git a/graphics/pokemon/brionne/shiny.pal b/graphics/pokemon/gen_7/brionne/shiny.pal similarity index 100% rename from graphics/pokemon/brionne/shiny.pal rename to graphics/pokemon/gen_7/brionne/shiny.pal diff --git a/graphics/pokemon/bruxish/back.png b/graphics/pokemon/gen_7/bruxish/back.png similarity index 100% rename from graphics/pokemon/bruxish/back.png rename to graphics/pokemon/gen_7/bruxish/back.png diff --git a/graphics/pokemon/spheal/footprint.png b/graphics/pokemon/gen_7/bruxish/footprint.png similarity index 100% rename from graphics/pokemon/spheal/footprint.png rename to graphics/pokemon/gen_7/bruxish/footprint.png diff --git a/graphics/pokemon/bruxish/front.png b/graphics/pokemon/gen_7/bruxish/front.png similarity index 100% rename from graphics/pokemon/bruxish/front.png rename to graphics/pokemon/gen_7/bruxish/front.png diff --git a/graphics/pokemon/bruxish/icon.png b/graphics/pokemon/gen_7/bruxish/icon.png similarity index 100% rename from graphics/pokemon/bruxish/icon.png rename to graphics/pokemon/gen_7/bruxish/icon.png diff --git a/graphics/pokemon/bruxish/normal.pal b/graphics/pokemon/gen_7/bruxish/normal.pal similarity index 100% rename from graphics/pokemon/bruxish/normal.pal rename to graphics/pokemon/gen_7/bruxish/normal.pal diff --git a/graphics/pokemon/bruxish/shiny.pal b/graphics/pokemon/gen_7/bruxish/shiny.pal similarity index 100% rename from graphics/pokemon/bruxish/shiny.pal rename to graphics/pokemon/gen_7/bruxish/shiny.pal diff --git a/graphics/pokemon/buzzwole/back.png b/graphics/pokemon/gen_7/buzzwole/back.png similarity index 100% rename from graphics/pokemon/buzzwole/back.png rename to graphics/pokemon/gen_7/buzzwole/back.png diff --git a/graphics/pokemon/munna/footprint.png b/graphics/pokemon/gen_7/buzzwole/footprint.png similarity index 100% rename from graphics/pokemon/munna/footprint.png rename to graphics/pokemon/gen_7/buzzwole/footprint.png diff --git a/graphics/pokemon/buzzwole/front.png b/graphics/pokemon/gen_7/buzzwole/front.png similarity index 100% rename from graphics/pokemon/buzzwole/front.png rename to graphics/pokemon/gen_7/buzzwole/front.png diff --git a/graphics/pokemon/buzzwole/icon.png b/graphics/pokemon/gen_7/buzzwole/icon.png similarity index 100% rename from graphics/pokemon/buzzwole/icon.png rename to graphics/pokemon/gen_7/buzzwole/icon.png diff --git a/graphics/pokemon/buzzwole/normal.pal b/graphics/pokemon/gen_7/buzzwole/normal.pal similarity index 100% rename from graphics/pokemon/buzzwole/normal.pal rename to graphics/pokemon/gen_7/buzzwole/normal.pal diff --git a/graphics/pokemon/buzzwole/shiny.pal b/graphics/pokemon/gen_7/buzzwole/shiny.pal similarity index 100% rename from graphics/pokemon/buzzwole/shiny.pal rename to graphics/pokemon/gen_7/buzzwole/shiny.pal diff --git a/graphics/pokemon/celesteela/back.png b/graphics/pokemon/gen_7/celesteela/back.png similarity index 100% rename from graphics/pokemon/celesteela/back.png rename to graphics/pokemon/gen_7/celesteela/back.png diff --git a/graphics/pokemon/celesteela/footprint.png b/graphics/pokemon/gen_7/celesteela/footprint.png similarity index 100% rename from graphics/pokemon/celesteela/footprint.png rename to graphics/pokemon/gen_7/celesteela/footprint.png diff --git a/graphics/pokemon/celesteela/front.png b/graphics/pokemon/gen_7/celesteela/front.png similarity index 100% rename from graphics/pokemon/celesteela/front.png rename to graphics/pokemon/gen_7/celesteela/front.png diff --git a/graphics/pokemon/celesteela/icon.png b/graphics/pokemon/gen_7/celesteela/icon.png similarity index 100% rename from graphics/pokemon/celesteela/icon.png rename to graphics/pokemon/gen_7/celesteela/icon.png diff --git a/graphics/pokemon/celesteela/normal.pal b/graphics/pokemon/gen_7/celesteela/normal.pal similarity index 100% rename from graphics/pokemon/celesteela/normal.pal rename to graphics/pokemon/gen_7/celesteela/normal.pal diff --git a/graphics/pokemon/celesteela/shiny.pal b/graphics/pokemon/gen_7/celesteela/shiny.pal similarity index 100% rename from graphics/pokemon/celesteela/shiny.pal rename to graphics/pokemon/gen_7/celesteela/shiny.pal diff --git a/graphics/pokemon/charjabug/anim_front.png b/graphics/pokemon/gen_7/charjabug/anim_front.png similarity index 100% rename from graphics/pokemon/charjabug/anim_front.png rename to graphics/pokemon/gen_7/charjabug/anim_front.png diff --git a/graphics/pokemon/charjabug/back.png b/graphics/pokemon/gen_7/charjabug/back.png similarity index 100% rename from graphics/pokemon/charjabug/back.png rename to graphics/pokemon/gen_7/charjabug/back.png diff --git a/graphics/pokemon/spiritomb/footprint.png b/graphics/pokemon/gen_7/charjabug/footprint.png similarity index 100% rename from graphics/pokemon/spiritomb/footprint.png rename to graphics/pokemon/gen_7/charjabug/footprint.png diff --git a/graphics/pokemon/charjabug/icon.png b/graphics/pokemon/gen_7/charjabug/icon.png similarity index 100% rename from graphics/pokemon/charjabug/icon.png rename to graphics/pokemon/gen_7/charjabug/icon.png diff --git a/graphics/pokemon/charjabug/normal.pal b/graphics/pokemon/gen_7/charjabug/normal.pal similarity index 100% rename from graphics/pokemon/charjabug/normal.pal rename to graphics/pokemon/gen_7/charjabug/normal.pal diff --git a/graphics/pokemon/charjabug/shiny.pal b/graphics/pokemon/gen_7/charjabug/shiny.pal similarity index 100% rename from graphics/pokemon/charjabug/shiny.pal rename to graphics/pokemon/gen_7/charjabug/shiny.pal diff --git a/graphics/pokemon/comfey/back.png b/graphics/pokemon/gen_7/comfey/back.png similarity index 100% rename from graphics/pokemon/comfey/back.png rename to graphics/pokemon/gen_7/comfey/back.png diff --git a/graphics/pokemon/spoink/footprint.png b/graphics/pokemon/gen_7/comfey/footprint.png similarity index 100% rename from graphics/pokemon/spoink/footprint.png rename to graphics/pokemon/gen_7/comfey/footprint.png diff --git a/graphics/pokemon/comfey/front.png b/graphics/pokemon/gen_7/comfey/front.png similarity index 100% rename from graphics/pokemon/comfey/front.png rename to graphics/pokemon/gen_7/comfey/front.png diff --git a/graphics/pokemon/comfey/icon.png b/graphics/pokemon/gen_7/comfey/icon.png similarity index 100% rename from graphics/pokemon/comfey/icon.png rename to graphics/pokemon/gen_7/comfey/icon.png diff --git a/graphics/pokemon/comfey/normal.pal b/graphics/pokemon/gen_7/comfey/normal.pal similarity index 100% rename from graphics/pokemon/comfey/normal.pal rename to graphics/pokemon/gen_7/comfey/normal.pal diff --git a/graphics/pokemon/comfey/shiny.pal b/graphics/pokemon/gen_7/comfey/shiny.pal similarity index 100% rename from graphics/pokemon/comfey/shiny.pal rename to graphics/pokemon/gen_7/comfey/shiny.pal diff --git a/graphics/pokemon/cosmoem/back.png b/graphics/pokemon/gen_7/cosmoem/back.png similarity index 100% rename from graphics/pokemon/cosmoem/back.png rename to graphics/pokemon/gen_7/cosmoem/back.png diff --git a/graphics/pokemon/stakataka/footprint.png b/graphics/pokemon/gen_7/cosmoem/footprint.png similarity index 100% rename from graphics/pokemon/stakataka/footprint.png rename to graphics/pokemon/gen_7/cosmoem/footprint.png diff --git a/graphics/pokemon/cosmoem/front.png b/graphics/pokemon/gen_7/cosmoem/front.png similarity index 100% rename from graphics/pokemon/cosmoem/front.png rename to graphics/pokemon/gen_7/cosmoem/front.png diff --git a/graphics/pokemon/cosmoem/icon.png b/graphics/pokemon/gen_7/cosmoem/icon.png similarity index 100% rename from graphics/pokemon/cosmoem/icon.png rename to graphics/pokemon/gen_7/cosmoem/icon.png diff --git a/graphics/pokemon/cosmoem/normal.pal b/graphics/pokemon/gen_7/cosmoem/normal.pal similarity index 100% rename from graphics/pokemon/cosmoem/normal.pal rename to graphics/pokemon/gen_7/cosmoem/normal.pal diff --git a/graphics/pokemon/cosmoem/shiny.pal b/graphics/pokemon/gen_7/cosmoem/shiny.pal similarity index 100% rename from graphics/pokemon/cosmoem/shiny.pal rename to graphics/pokemon/gen_7/cosmoem/shiny.pal diff --git a/graphics/pokemon/cosmog/back.png b/graphics/pokemon/gen_7/cosmog/back.png similarity index 100% rename from graphics/pokemon/cosmog/back.png rename to graphics/pokemon/gen_7/cosmog/back.png diff --git a/graphics/pokemon/steelix/footprint.png b/graphics/pokemon/gen_7/cosmog/footprint.png similarity index 100% rename from graphics/pokemon/steelix/footprint.png rename to graphics/pokemon/gen_7/cosmog/footprint.png diff --git a/graphics/pokemon/cosmog/front.png b/graphics/pokemon/gen_7/cosmog/front.png similarity index 100% rename from graphics/pokemon/cosmog/front.png rename to graphics/pokemon/gen_7/cosmog/front.png diff --git a/graphics/pokemon/cosmog/icon.png b/graphics/pokemon/gen_7/cosmog/icon.png similarity index 100% rename from graphics/pokemon/cosmog/icon.png rename to graphics/pokemon/gen_7/cosmog/icon.png diff --git a/graphics/pokemon/cosmog/normal.pal b/graphics/pokemon/gen_7/cosmog/normal.pal similarity index 100% rename from graphics/pokemon/cosmog/normal.pal rename to graphics/pokemon/gen_7/cosmog/normal.pal diff --git a/graphics/pokemon/cosmog/shiny.pal b/graphics/pokemon/gen_7/cosmog/shiny.pal similarity index 100% rename from graphics/pokemon/cosmog/shiny.pal rename to graphics/pokemon/gen_7/cosmog/shiny.pal diff --git a/graphics/pokemon/crabominable/back.png b/graphics/pokemon/gen_7/crabominable/back.png similarity index 100% rename from graphics/pokemon/crabominable/back.png rename to graphics/pokemon/gen_7/crabominable/back.png diff --git a/graphics/pokemon/furfrou/footprint.png b/graphics/pokemon/gen_7/crabominable/footprint.png similarity index 100% rename from graphics/pokemon/furfrou/footprint.png rename to graphics/pokemon/gen_7/crabominable/footprint.png diff --git a/graphics/pokemon/crabominable/front.png b/graphics/pokemon/gen_7/crabominable/front.png similarity index 100% rename from graphics/pokemon/crabominable/front.png rename to graphics/pokemon/gen_7/crabominable/front.png diff --git a/graphics/pokemon/crabominable/icon.png b/graphics/pokemon/gen_7/crabominable/icon.png similarity index 100% rename from graphics/pokemon/crabominable/icon.png rename to graphics/pokemon/gen_7/crabominable/icon.png diff --git a/graphics/pokemon/crabominable/normal.pal b/graphics/pokemon/gen_7/crabominable/normal.pal similarity index 100% rename from graphics/pokemon/crabominable/normal.pal rename to graphics/pokemon/gen_7/crabominable/normal.pal diff --git a/graphics/pokemon/crabominable/shiny.pal b/graphics/pokemon/gen_7/crabominable/shiny.pal similarity index 100% rename from graphics/pokemon/crabominable/shiny.pal rename to graphics/pokemon/gen_7/crabominable/shiny.pal diff --git a/graphics/pokemon/crabrawler/back.png b/graphics/pokemon/gen_7/crabrawler/back.png similarity index 100% rename from graphics/pokemon/crabrawler/back.png rename to graphics/pokemon/gen_7/crabrawler/back.png diff --git a/graphics/pokemon/musharna/footprint.png b/graphics/pokemon/gen_7/crabrawler/footprint.png similarity index 100% rename from graphics/pokemon/musharna/footprint.png rename to graphics/pokemon/gen_7/crabrawler/footprint.png diff --git a/graphics/pokemon/crabrawler/front.png b/graphics/pokemon/gen_7/crabrawler/front.png similarity index 100% rename from graphics/pokemon/crabrawler/front.png rename to graphics/pokemon/gen_7/crabrawler/front.png diff --git a/graphics/pokemon/crabrawler/icon.png b/graphics/pokemon/gen_7/crabrawler/icon.png similarity index 100% rename from graphics/pokemon/crabrawler/icon.png rename to graphics/pokemon/gen_7/crabrawler/icon.png diff --git a/graphics/pokemon/crabrawler/normal.pal b/graphics/pokemon/gen_7/crabrawler/normal.pal similarity index 100% rename from graphics/pokemon/crabrawler/normal.pal rename to graphics/pokemon/gen_7/crabrawler/normal.pal diff --git a/graphics/pokemon/crabrawler/shiny.pal b/graphics/pokemon/gen_7/crabrawler/shiny.pal similarity index 100% rename from graphics/pokemon/crabrawler/shiny.pal rename to graphics/pokemon/gen_7/crabrawler/shiny.pal diff --git a/graphics/pokemon/cutiefly/anim_front.png b/graphics/pokemon/gen_7/cutiefly/anim_front.png similarity index 100% rename from graphics/pokemon/cutiefly/anim_front.png rename to graphics/pokemon/gen_7/cutiefly/anim_front.png diff --git a/graphics/pokemon/cutiefly/back.png b/graphics/pokemon/gen_7/cutiefly/back.png similarity index 100% rename from graphics/pokemon/cutiefly/back.png rename to graphics/pokemon/gen_7/cutiefly/back.png diff --git a/graphics/pokemon/poipole/footprint.png b/graphics/pokemon/gen_7/cutiefly/footprint.png similarity index 100% rename from graphics/pokemon/poipole/footprint.png rename to graphics/pokemon/gen_7/cutiefly/footprint.png diff --git a/graphics/pokemon/cutiefly/icon.png b/graphics/pokemon/gen_7/cutiefly/icon.png similarity index 100% rename from graphics/pokemon/cutiefly/icon.png rename to graphics/pokemon/gen_7/cutiefly/icon.png diff --git a/graphics/pokemon/cutiefly/normal.pal b/graphics/pokemon/gen_7/cutiefly/normal.pal similarity index 100% rename from graphics/pokemon/cutiefly/normal.pal rename to graphics/pokemon/gen_7/cutiefly/normal.pal diff --git a/graphics/pokemon/cutiefly/shiny.pal b/graphics/pokemon/gen_7/cutiefly/shiny.pal similarity index 100% rename from graphics/pokemon/cutiefly/shiny.pal rename to graphics/pokemon/gen_7/cutiefly/shiny.pal diff --git a/graphics/pokemon/dartrix/anim_front.png b/graphics/pokemon/gen_7/dartrix/anim_front.png similarity index 100% rename from graphics/pokemon/dartrix/anim_front.png rename to graphics/pokemon/gen_7/dartrix/anim_front.png diff --git a/graphics/pokemon/dartrix/back.png b/graphics/pokemon/gen_7/dartrix/back.png similarity index 100% rename from graphics/pokemon/dartrix/back.png rename to graphics/pokemon/gen_7/dartrix/back.png diff --git a/graphics/pokemon/dartrix/footprint.png b/graphics/pokemon/gen_7/dartrix/footprint.png similarity index 100% rename from graphics/pokemon/dartrix/footprint.png rename to graphics/pokemon/gen_7/dartrix/footprint.png diff --git a/graphics/pokemon/dartrix/icon.png b/graphics/pokemon/gen_7/dartrix/icon.png similarity index 100% rename from graphics/pokemon/dartrix/icon.png rename to graphics/pokemon/gen_7/dartrix/icon.png diff --git a/graphics/pokemon/dartrix/normal.pal b/graphics/pokemon/gen_7/dartrix/normal.pal similarity index 100% rename from graphics/pokemon/dartrix/normal.pal rename to graphics/pokemon/gen_7/dartrix/normal.pal diff --git a/graphics/pokemon/dartrix/shiny.pal b/graphics/pokemon/gen_7/dartrix/shiny.pal similarity index 100% rename from graphics/pokemon/dartrix/shiny.pal rename to graphics/pokemon/gen_7/dartrix/shiny.pal diff --git a/graphics/pokemon/decidueye/anim_front.png b/graphics/pokemon/gen_7/decidueye/anim_front.png similarity index 100% rename from graphics/pokemon/decidueye/anim_front.png rename to graphics/pokemon/gen_7/decidueye/anim_front.png diff --git a/graphics/pokemon/decidueye/back.png b/graphics/pokemon/gen_7/decidueye/back.png similarity index 100% rename from graphics/pokemon/decidueye/back.png rename to graphics/pokemon/gen_7/decidueye/back.png diff --git a/graphics/pokemon/decidueye/footprint.png b/graphics/pokemon/gen_7/decidueye/footprint.png similarity index 100% rename from graphics/pokemon/decidueye/footprint.png rename to graphics/pokemon/gen_7/decidueye/footprint.png diff --git a/graphics/pokemon/decidueye/hisuian/back.png b/graphics/pokemon/gen_7/decidueye/hisuian/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/decidueye/hisuian/back.png rename to graphics/pokemon/gen_7/decidueye/hisuian/back.png diff --git a/graphics/pokemon/decidueye/hisuian/front.png b/graphics/pokemon/gen_7/decidueye/hisuian/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/decidueye/hisuian/front.png rename to graphics/pokemon/gen_7/decidueye/hisuian/front.png diff --git a/graphics/pokemon/decidueye/hisuian/icon.png b/graphics/pokemon/gen_7/decidueye/hisuian/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/decidueye/hisuian/icon.png rename to graphics/pokemon/gen_7/decidueye/hisuian/icon.png diff --git a/graphics/pokemon/decidueye/hisuian/normal.pal b/graphics/pokemon/gen_7/decidueye/hisuian/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/decidueye/hisuian/normal.pal rename to graphics/pokemon/gen_7/decidueye/hisuian/normal.pal diff --git a/graphics/pokemon/decidueye/hisuian/shiny.pal b/graphics/pokemon/gen_7/decidueye/hisuian/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/decidueye/hisuian/shiny.pal rename to graphics/pokemon/gen_7/decidueye/hisuian/shiny.pal diff --git a/graphics/pokemon/decidueye/icon.png b/graphics/pokemon/gen_7/decidueye/icon.png similarity index 100% rename from graphics/pokemon/decidueye/icon.png rename to graphics/pokemon/gen_7/decidueye/icon.png diff --git a/graphics/pokemon/decidueye/normal.pal b/graphics/pokemon/gen_7/decidueye/normal.pal similarity index 100% rename from graphics/pokemon/decidueye/normal.pal rename to graphics/pokemon/gen_7/decidueye/normal.pal diff --git a/graphics/pokemon/decidueye/shiny.pal b/graphics/pokemon/gen_7/decidueye/shiny.pal similarity index 100% rename from graphics/pokemon/decidueye/shiny.pal rename to graphics/pokemon/gen_7/decidueye/shiny.pal diff --git a/graphics/pokemon/dewpider/anim_front.png b/graphics/pokemon/gen_7/dewpider/anim_front.png similarity index 100% rename from graphics/pokemon/dewpider/anim_front.png rename to graphics/pokemon/gen_7/dewpider/anim_front.png diff --git a/graphics/pokemon/dewpider/back.png b/graphics/pokemon/gen_7/dewpider/back.png similarity index 100% rename from graphics/pokemon/dewpider/back.png rename to graphics/pokemon/gen_7/dewpider/back.png diff --git a/graphics/pokemon/polteageist/footprint.png b/graphics/pokemon/gen_7/dewpider/footprint.png similarity index 100% rename from graphics/pokemon/polteageist/footprint.png rename to graphics/pokemon/gen_7/dewpider/footprint.png diff --git a/graphics/pokemon/dewpider/icon.png b/graphics/pokemon/gen_7/dewpider/icon.png similarity index 100% rename from graphics/pokemon/dewpider/icon.png rename to graphics/pokemon/gen_7/dewpider/icon.png diff --git a/graphics/pokemon/dewpider/normal.pal b/graphics/pokemon/gen_7/dewpider/normal.pal similarity index 100% rename from graphics/pokemon/dewpider/normal.pal rename to graphics/pokemon/gen_7/dewpider/normal.pal diff --git a/graphics/pokemon/dewpider/shiny.pal b/graphics/pokemon/gen_7/dewpider/shiny.pal similarity index 100% rename from graphics/pokemon/dewpider/shiny.pal rename to graphics/pokemon/gen_7/dewpider/shiny.pal diff --git a/graphics/pokemon/dhelmise/back.png b/graphics/pokemon/gen_7/dhelmise/back.png similarity index 100% rename from graphics/pokemon/dhelmise/back.png rename to graphics/pokemon/gen_7/dhelmise/back.png diff --git a/graphics/pokemon/stunfisk/footprint.png b/graphics/pokemon/gen_7/dhelmise/footprint.png similarity index 100% rename from graphics/pokemon/stunfisk/footprint.png rename to graphics/pokemon/gen_7/dhelmise/footprint.png diff --git a/graphics/pokemon/dhelmise/front.png b/graphics/pokemon/gen_7/dhelmise/front.png similarity index 100% rename from graphics/pokemon/dhelmise/front.png rename to graphics/pokemon/gen_7/dhelmise/front.png diff --git a/graphics/pokemon/dhelmise/icon.png b/graphics/pokemon/gen_7/dhelmise/icon.png similarity index 100% rename from graphics/pokemon/dhelmise/icon.png rename to graphics/pokemon/gen_7/dhelmise/icon.png diff --git a/graphics/pokemon/dhelmise/normal.pal b/graphics/pokemon/gen_7/dhelmise/normal.pal similarity index 100% rename from graphics/pokemon/dhelmise/normal.pal rename to graphics/pokemon/gen_7/dhelmise/normal.pal diff --git a/graphics/pokemon/dhelmise/shiny.pal b/graphics/pokemon/gen_7/dhelmise/shiny.pal similarity index 100% rename from graphics/pokemon/dhelmise/shiny.pal rename to graphics/pokemon/gen_7/dhelmise/shiny.pal diff --git a/graphics/pokemon/drampa/anim_front.png b/graphics/pokemon/gen_7/drampa/anim_front.png similarity index 100% rename from graphics/pokemon/drampa/anim_front.png rename to graphics/pokemon/gen_7/drampa/anim_front.png diff --git a/graphics/pokemon/drampa/back.png b/graphics/pokemon/gen_7/drampa/back.png similarity index 100% rename from graphics/pokemon/drampa/back.png rename to graphics/pokemon/gen_7/drampa/back.png diff --git a/graphics/pokemon/sunkern/footprint.png b/graphics/pokemon/gen_7/drampa/footprint.png similarity index 100% rename from graphics/pokemon/sunkern/footprint.png rename to graphics/pokemon/gen_7/drampa/footprint.png diff --git a/graphics/pokemon/drampa/icon.png b/graphics/pokemon/gen_7/drampa/icon.png similarity index 100% rename from graphics/pokemon/drampa/icon.png rename to graphics/pokemon/gen_7/drampa/icon.png diff --git a/graphics/pokemon/drampa/normal.pal b/graphics/pokemon/gen_7/drampa/normal.pal similarity index 100% rename from graphics/pokemon/drampa/normal.pal rename to graphics/pokemon/gen_7/drampa/normal.pal diff --git a/graphics/pokemon/drampa/shiny.pal b/graphics/pokemon/gen_7/drampa/shiny.pal similarity index 100% rename from graphics/pokemon/drampa/shiny.pal rename to graphics/pokemon/gen_7/drampa/shiny.pal diff --git a/graphics/pokemon/fomantis/back.png b/graphics/pokemon/gen_7/fomantis/back.png similarity index 100% rename from graphics/pokemon/fomantis/back.png rename to graphics/pokemon/gen_7/fomantis/back.png diff --git a/graphics/pokemon/porygon_z/footprint.png b/graphics/pokemon/gen_7/fomantis/footprint.png similarity index 100% rename from graphics/pokemon/porygon_z/footprint.png rename to graphics/pokemon/gen_7/fomantis/footprint.png diff --git a/graphics/pokemon/fomantis/front.png b/graphics/pokemon/gen_7/fomantis/front.png similarity index 100% rename from graphics/pokemon/fomantis/front.png rename to graphics/pokemon/gen_7/fomantis/front.png diff --git a/graphics/pokemon/fomantis/icon.png b/graphics/pokemon/gen_7/fomantis/icon.png similarity index 100% rename from graphics/pokemon/fomantis/icon.png rename to graphics/pokemon/gen_7/fomantis/icon.png diff --git a/graphics/pokemon/fomantis/normal.pal b/graphics/pokemon/gen_7/fomantis/normal.pal similarity index 100% rename from graphics/pokemon/fomantis/normal.pal rename to graphics/pokemon/gen_7/fomantis/normal.pal diff --git a/graphics/pokemon/fomantis/shiny.pal b/graphics/pokemon/gen_7/fomantis/shiny.pal similarity index 100% rename from graphics/pokemon/fomantis/shiny.pal rename to graphics/pokemon/gen_7/fomantis/shiny.pal diff --git a/graphics/pokemon/golisopod/anim_front.png b/graphics/pokemon/gen_7/golisopod/anim_front.png similarity index 100% rename from graphics/pokemon/golisopod/anim_front.png rename to graphics/pokemon/gen_7/golisopod/anim_front.png diff --git a/graphics/pokemon/golisopod/back.png b/graphics/pokemon/gen_7/golisopod/back.png similarity index 100% rename from graphics/pokemon/golisopod/back.png rename to graphics/pokemon/gen_7/golisopod/back.png diff --git a/graphics/pokemon/golisopod/footprint.png b/graphics/pokemon/gen_7/golisopod/footprint.png similarity index 100% rename from graphics/pokemon/golisopod/footprint.png rename to graphics/pokemon/gen_7/golisopod/footprint.png diff --git a/graphics/pokemon/golisopod/icon.png b/graphics/pokemon/gen_7/golisopod/icon.png similarity index 100% rename from graphics/pokemon/golisopod/icon.png rename to graphics/pokemon/gen_7/golisopod/icon.png diff --git a/graphics/pokemon/golisopod/normal.pal b/graphics/pokemon/gen_7/golisopod/normal.pal similarity index 100% rename from graphics/pokemon/golisopod/normal.pal rename to graphics/pokemon/gen_7/golisopod/normal.pal diff --git a/graphics/pokemon/golisopod/shiny.pal b/graphics/pokemon/gen_7/golisopod/shiny.pal similarity index 100% rename from graphics/pokemon/golisopod/shiny.pal rename to graphics/pokemon/gen_7/golisopod/shiny.pal diff --git a/graphics/pokemon/grubbin/anim_front.png b/graphics/pokemon/gen_7/grubbin/anim_front.png similarity index 100% rename from graphics/pokemon/grubbin/anim_front.png rename to graphics/pokemon/gen_7/grubbin/anim_front.png diff --git a/graphics/pokemon/grubbin/back.png b/graphics/pokemon/gen_7/grubbin/back.png similarity index 100% rename from graphics/pokemon/grubbin/back.png rename to graphics/pokemon/gen_7/grubbin/back.png diff --git a/graphics/pokemon/sewaddle/footprint.png b/graphics/pokemon/gen_7/grubbin/footprint.png similarity index 100% rename from graphics/pokemon/sewaddle/footprint.png rename to graphics/pokemon/gen_7/grubbin/footprint.png diff --git a/graphics/pokemon/grubbin/icon.png b/graphics/pokemon/gen_7/grubbin/icon.png similarity index 100% rename from graphics/pokemon/grubbin/icon.png rename to graphics/pokemon/gen_7/grubbin/icon.png diff --git a/graphics/pokemon/grubbin/normal.pal b/graphics/pokemon/gen_7/grubbin/normal.pal similarity index 100% rename from graphics/pokemon/grubbin/normal.pal rename to graphics/pokemon/gen_7/grubbin/normal.pal diff --git a/graphics/pokemon/grubbin/shiny.pal b/graphics/pokemon/gen_7/grubbin/shiny.pal similarity index 100% rename from graphics/pokemon/grubbin/shiny.pal rename to graphics/pokemon/gen_7/grubbin/shiny.pal diff --git a/graphics/pokemon/gumshoos/back.png b/graphics/pokemon/gen_7/gumshoos/back.png similarity index 100% rename from graphics/pokemon/gumshoos/back.png rename to graphics/pokemon/gen_7/gumshoos/back.png diff --git a/graphics/pokemon/raticate/footprint.png b/graphics/pokemon/gen_7/gumshoos/footprint.png similarity index 100% rename from graphics/pokemon/raticate/footprint.png rename to graphics/pokemon/gen_7/gumshoos/footprint.png diff --git a/graphics/pokemon/gumshoos/front.png b/graphics/pokemon/gen_7/gumshoos/front.png similarity index 100% rename from graphics/pokemon/gumshoos/front.png rename to graphics/pokemon/gen_7/gumshoos/front.png diff --git a/graphics/pokemon/gumshoos/icon.png b/graphics/pokemon/gen_7/gumshoos/icon.png similarity index 100% rename from graphics/pokemon/gumshoos/icon.png rename to graphics/pokemon/gen_7/gumshoos/icon.png diff --git a/graphics/pokemon/gumshoos/normal.pal b/graphics/pokemon/gen_7/gumshoos/normal.pal similarity index 100% rename from graphics/pokemon/gumshoos/normal.pal rename to graphics/pokemon/gen_7/gumshoos/normal.pal diff --git a/graphics/pokemon/gumshoos/shiny.pal b/graphics/pokemon/gen_7/gumshoos/shiny.pal similarity index 100% rename from graphics/pokemon/gumshoos/shiny.pal rename to graphics/pokemon/gen_7/gumshoos/shiny.pal diff --git a/graphics/pokemon/guzzlord/back.png b/graphics/pokemon/gen_7/guzzlord/back.png similarity index 100% rename from graphics/pokemon/guzzlord/back.png rename to graphics/pokemon/gen_7/guzzlord/back.png diff --git a/graphics/pokemon/guzzlord/footprint.png b/graphics/pokemon/gen_7/guzzlord/footprint.png similarity index 100% rename from graphics/pokemon/guzzlord/footprint.png rename to graphics/pokemon/gen_7/guzzlord/footprint.png diff --git a/graphics/pokemon/guzzlord/front.png b/graphics/pokemon/gen_7/guzzlord/front.png similarity index 100% rename from graphics/pokemon/guzzlord/front.png rename to graphics/pokemon/gen_7/guzzlord/front.png diff --git a/graphics/pokemon/guzzlord/icon.png b/graphics/pokemon/gen_7/guzzlord/icon.png similarity index 100% rename from graphics/pokemon/guzzlord/icon.png rename to graphics/pokemon/gen_7/guzzlord/icon.png diff --git a/graphics/pokemon/guzzlord/normal.pal b/graphics/pokemon/gen_7/guzzlord/normal.pal similarity index 100% rename from graphics/pokemon/guzzlord/normal.pal rename to graphics/pokemon/gen_7/guzzlord/normal.pal diff --git a/graphics/pokemon/guzzlord/shiny.pal b/graphics/pokemon/gen_7/guzzlord/shiny.pal similarity index 100% rename from graphics/pokemon/guzzlord/shiny.pal rename to graphics/pokemon/gen_7/guzzlord/shiny.pal diff --git a/graphics/pokemon/hakamo_o/anim_front.png b/graphics/pokemon/gen_7/hakamo_o/anim_front.png similarity index 100% rename from graphics/pokemon/hakamo_o/anim_front.png rename to graphics/pokemon/gen_7/hakamo_o/anim_front.png diff --git a/graphics/pokemon/hakamo_o/back.png b/graphics/pokemon/gen_7/hakamo_o/back.png similarity index 100% rename from graphics/pokemon/hakamo_o/back.png rename to graphics/pokemon/gen_7/hakamo_o/back.png diff --git a/graphics/pokemon/hakamo_o/footprint.png b/graphics/pokemon/gen_7/hakamo_o/footprint.png similarity index 100% rename from graphics/pokemon/hakamo_o/footprint.png rename to graphics/pokemon/gen_7/hakamo_o/footprint.png diff --git a/graphics/pokemon/hakamo_o/icon.png b/graphics/pokemon/gen_7/hakamo_o/icon.png similarity index 100% rename from graphics/pokemon/hakamo_o/icon.png rename to graphics/pokemon/gen_7/hakamo_o/icon.png diff --git a/graphics/pokemon/hakamo_o/normal.pal b/graphics/pokemon/gen_7/hakamo_o/normal.pal similarity index 100% rename from graphics/pokemon/hakamo_o/normal.pal rename to graphics/pokemon/gen_7/hakamo_o/normal.pal diff --git a/graphics/pokemon/hakamo_o/shiny.pal b/graphics/pokemon/gen_7/hakamo_o/shiny.pal similarity index 100% rename from graphics/pokemon/hakamo_o/shiny.pal rename to graphics/pokemon/gen_7/hakamo_o/shiny.pal diff --git a/graphics/pokemon/incineroar/back.png b/graphics/pokemon/gen_7/incineroar/back.png similarity index 100% rename from graphics/pokemon/incineroar/back.png rename to graphics/pokemon/gen_7/incineroar/back.png diff --git a/graphics/pokemon/vaporeon/footprint.png b/graphics/pokemon/gen_7/incineroar/footprint.png similarity index 100% rename from graphics/pokemon/vaporeon/footprint.png rename to graphics/pokemon/gen_7/incineroar/footprint.png diff --git a/graphics/pokemon/incineroar/front.png b/graphics/pokemon/gen_7/incineroar/front.png similarity index 100% rename from graphics/pokemon/incineroar/front.png rename to graphics/pokemon/gen_7/incineroar/front.png diff --git a/graphics/pokemon/incineroar/icon.png b/graphics/pokemon/gen_7/incineroar/icon.png similarity index 100% rename from graphics/pokemon/incineroar/icon.png rename to graphics/pokemon/gen_7/incineroar/icon.png diff --git a/graphics/pokemon/incineroar/normal.pal b/graphics/pokemon/gen_7/incineroar/normal.pal similarity index 100% rename from graphics/pokemon/incineroar/normal.pal rename to graphics/pokemon/gen_7/incineroar/normal.pal diff --git a/graphics/pokemon/incineroar/shiny.pal b/graphics/pokemon/gen_7/incineroar/shiny.pal similarity index 100% rename from graphics/pokemon/incineroar/shiny.pal rename to graphics/pokemon/gen_7/incineroar/shiny.pal diff --git a/graphics/pokemon/jangmo_o/anim_front.png b/graphics/pokemon/gen_7/jangmo_o/anim_front.png similarity index 100% rename from graphics/pokemon/jangmo_o/anim_front.png rename to graphics/pokemon/gen_7/jangmo_o/anim_front.png diff --git a/graphics/pokemon/jangmo_o/back.png b/graphics/pokemon/gen_7/jangmo_o/back.png similarity index 100% rename from graphics/pokemon/jangmo_o/back.png rename to graphics/pokemon/gen_7/jangmo_o/back.png diff --git a/graphics/pokemon/jangmo_o/footprint.png b/graphics/pokemon/gen_7/jangmo_o/footprint.png similarity index 100% rename from graphics/pokemon/jangmo_o/footprint.png rename to graphics/pokemon/gen_7/jangmo_o/footprint.png diff --git a/graphics/pokemon/jangmo_o/icon.png b/graphics/pokemon/gen_7/jangmo_o/icon.png similarity index 100% rename from graphics/pokemon/jangmo_o/icon.png rename to graphics/pokemon/gen_7/jangmo_o/icon.png diff --git a/graphics/pokemon/jangmo_o/normal.pal b/graphics/pokemon/gen_7/jangmo_o/normal.pal similarity index 100% rename from graphics/pokemon/jangmo_o/normal.pal rename to graphics/pokemon/gen_7/jangmo_o/normal.pal diff --git a/graphics/pokemon/jangmo_o/shiny.pal b/graphics/pokemon/gen_7/jangmo_o/shiny.pal similarity index 100% rename from graphics/pokemon/jangmo_o/shiny.pal rename to graphics/pokemon/gen_7/jangmo_o/shiny.pal diff --git a/graphics/pokemon/kartana/back.png b/graphics/pokemon/gen_7/kartana/back.png similarity index 100% rename from graphics/pokemon/kartana/back.png rename to graphics/pokemon/gen_7/kartana/back.png diff --git a/graphics/pokemon/swadloon/footprint.png b/graphics/pokemon/gen_7/kartana/footprint.png similarity index 100% rename from graphics/pokemon/swadloon/footprint.png rename to graphics/pokemon/gen_7/kartana/footprint.png diff --git a/graphics/pokemon/kartana/front.png b/graphics/pokemon/gen_7/kartana/front.png similarity index 100% rename from graphics/pokemon/kartana/front.png rename to graphics/pokemon/gen_7/kartana/front.png diff --git a/graphics/pokemon/kartana/icon.png b/graphics/pokemon/gen_7/kartana/icon.png similarity index 100% rename from graphics/pokemon/kartana/icon.png rename to graphics/pokemon/gen_7/kartana/icon.png diff --git a/graphics/pokemon/kartana/normal.pal b/graphics/pokemon/gen_7/kartana/normal.pal similarity index 100% rename from graphics/pokemon/kartana/normal.pal rename to graphics/pokemon/gen_7/kartana/normal.pal diff --git a/graphics/pokemon/kartana/shiny.pal b/graphics/pokemon/gen_7/kartana/shiny.pal similarity index 100% rename from graphics/pokemon/kartana/shiny.pal rename to graphics/pokemon/gen_7/kartana/shiny.pal diff --git a/graphics/pokemon/komala/back.png b/graphics/pokemon/gen_7/komala/back.png similarity index 100% rename from graphics/pokemon/komala/back.png rename to graphics/pokemon/gen_7/komala/back.png diff --git a/graphics/pokemon/komala/footprint.png b/graphics/pokemon/gen_7/komala/footprint.png similarity index 100% rename from graphics/pokemon/komala/footprint.png rename to graphics/pokemon/gen_7/komala/footprint.png diff --git a/graphics/pokemon/komala/front.png b/graphics/pokemon/gen_7/komala/front.png similarity index 100% rename from graphics/pokemon/komala/front.png rename to graphics/pokemon/gen_7/komala/front.png diff --git a/graphics/pokemon/komala/icon.png b/graphics/pokemon/gen_7/komala/icon.png similarity index 100% rename from graphics/pokemon/komala/icon.png rename to graphics/pokemon/gen_7/komala/icon.png diff --git a/graphics/pokemon/komala/normal.pal b/graphics/pokemon/gen_7/komala/normal.pal similarity index 100% rename from graphics/pokemon/komala/normal.pal rename to graphics/pokemon/gen_7/komala/normal.pal diff --git a/graphics/pokemon/komala/shiny.pal b/graphics/pokemon/gen_7/komala/shiny.pal similarity index 100% rename from graphics/pokemon/komala/shiny.pal rename to graphics/pokemon/gen_7/komala/shiny.pal diff --git a/graphics/pokemon/kommo_o/anim_front.png b/graphics/pokemon/gen_7/kommo_o/anim_front.png similarity index 100% rename from graphics/pokemon/kommo_o/anim_front.png rename to graphics/pokemon/gen_7/kommo_o/anim_front.png diff --git a/graphics/pokemon/kommo_o/back.png b/graphics/pokemon/gen_7/kommo_o/back.png similarity index 100% rename from graphics/pokemon/kommo_o/back.png rename to graphics/pokemon/gen_7/kommo_o/back.png diff --git a/graphics/pokemon/kommo_o/footprint.png b/graphics/pokemon/gen_7/kommo_o/footprint.png similarity index 100% rename from graphics/pokemon/kommo_o/footprint.png rename to graphics/pokemon/gen_7/kommo_o/footprint.png diff --git a/graphics/pokemon/kommo_o/icon.png b/graphics/pokemon/gen_7/kommo_o/icon.png similarity index 100% rename from graphics/pokemon/kommo_o/icon.png rename to graphics/pokemon/gen_7/kommo_o/icon.png diff --git a/graphics/pokemon/kommo_o/normal.pal b/graphics/pokemon/gen_7/kommo_o/normal.pal similarity index 100% rename from graphics/pokemon/kommo_o/normal.pal rename to graphics/pokemon/gen_7/kommo_o/normal.pal diff --git a/graphics/pokemon/kommo_o/shiny.pal b/graphics/pokemon/gen_7/kommo_o/shiny.pal similarity index 100% rename from graphics/pokemon/kommo_o/shiny.pal rename to graphics/pokemon/gen_7/kommo_o/shiny.pal diff --git a/graphics/pokemon/litten/back.png b/graphics/pokemon/gen_7/litten/back.png similarity index 100% rename from graphics/pokemon/litten/back.png rename to graphics/pokemon/gen_7/litten/back.png diff --git a/graphics/pokemon/appletun/footprint.png b/graphics/pokemon/gen_7/litten/footprint.png similarity index 100% rename from graphics/pokemon/appletun/footprint.png rename to graphics/pokemon/gen_7/litten/footprint.png diff --git a/graphics/pokemon/litten/front.png b/graphics/pokemon/gen_7/litten/front.png similarity index 100% rename from graphics/pokemon/litten/front.png rename to graphics/pokemon/gen_7/litten/front.png diff --git a/graphics/pokemon/litten/icon.png b/graphics/pokemon/gen_7/litten/icon.png similarity index 100% rename from graphics/pokemon/litten/icon.png rename to graphics/pokemon/gen_7/litten/icon.png diff --git a/graphics/pokemon/litten/normal.pal b/graphics/pokemon/gen_7/litten/normal.pal similarity index 100% rename from graphics/pokemon/litten/normal.pal rename to graphics/pokemon/gen_7/litten/normal.pal diff --git a/graphics/pokemon/litten/shiny.pal b/graphics/pokemon/gen_7/litten/shiny.pal similarity index 100% rename from graphics/pokemon/litten/shiny.pal rename to graphics/pokemon/gen_7/litten/shiny.pal diff --git a/graphics/pokemon/lunala/back.png b/graphics/pokemon/gen_7/lunala/back.png similarity index 100% rename from graphics/pokemon/lunala/back.png rename to graphics/pokemon/gen_7/lunala/back.png diff --git a/graphics/pokemon/swalot/footprint.png b/graphics/pokemon/gen_7/lunala/footprint.png similarity index 100% rename from graphics/pokemon/swalot/footprint.png rename to graphics/pokemon/gen_7/lunala/footprint.png diff --git a/graphics/pokemon/lunala/front.png b/graphics/pokemon/gen_7/lunala/front.png similarity index 100% rename from graphics/pokemon/lunala/front.png rename to graphics/pokemon/gen_7/lunala/front.png diff --git a/graphics/pokemon/lunala/icon.png b/graphics/pokemon/gen_7/lunala/icon.png similarity index 100% rename from graphics/pokemon/lunala/icon.png rename to graphics/pokemon/gen_7/lunala/icon.png diff --git a/graphics/pokemon/lunala/normal.pal b/graphics/pokemon/gen_7/lunala/normal.pal similarity index 100% rename from graphics/pokemon/lunala/normal.pal rename to graphics/pokemon/gen_7/lunala/normal.pal diff --git a/graphics/pokemon/lunala/shiny.pal b/graphics/pokemon/gen_7/lunala/shiny.pal similarity index 100% rename from graphics/pokemon/lunala/shiny.pal rename to graphics/pokemon/gen_7/lunala/shiny.pal diff --git a/graphics/pokemon/lurantis/back.png b/graphics/pokemon/gen_7/lurantis/back.png similarity index 100% rename from graphics/pokemon/lurantis/back.png rename to graphics/pokemon/gen_7/lurantis/back.png diff --git a/graphics/pokemon/shelmet/footprint.png b/graphics/pokemon/gen_7/lurantis/footprint.png similarity index 100% rename from graphics/pokemon/shelmet/footprint.png rename to graphics/pokemon/gen_7/lurantis/footprint.png diff --git a/graphics/pokemon/lurantis/front.png b/graphics/pokemon/gen_7/lurantis/front.png similarity index 100% rename from graphics/pokemon/lurantis/front.png rename to graphics/pokemon/gen_7/lurantis/front.png diff --git a/graphics/pokemon/lurantis/icon.png b/graphics/pokemon/gen_7/lurantis/icon.png similarity index 100% rename from graphics/pokemon/lurantis/icon.png rename to graphics/pokemon/gen_7/lurantis/icon.png diff --git a/graphics/pokemon/lurantis/normal.pal b/graphics/pokemon/gen_7/lurantis/normal.pal similarity index 100% rename from graphics/pokemon/lurantis/normal.pal rename to graphics/pokemon/gen_7/lurantis/normal.pal diff --git a/graphics/pokemon/lurantis/shiny.pal b/graphics/pokemon/gen_7/lurantis/shiny.pal similarity index 100% rename from graphics/pokemon/lurantis/shiny.pal rename to graphics/pokemon/gen_7/lurantis/shiny.pal diff --git a/graphics/pokemon/lycanroc/anim_front.png b/graphics/pokemon/gen_7/lycanroc/anim_front.png similarity index 100% rename from graphics/pokemon/lycanroc/anim_front.png rename to graphics/pokemon/gen_7/lycanroc/anim_front.png diff --git a/graphics/pokemon/lycanroc/back.png b/graphics/pokemon/gen_7/lycanroc/back.png similarity index 100% rename from graphics/pokemon/lycanroc/back.png rename to graphics/pokemon/gen_7/lycanroc/back.png diff --git a/graphics/pokemon/lycanroc/dusk/anim_front.png b/graphics/pokemon/gen_7/lycanroc/dusk/anim_front.png similarity index 100% rename from graphics/pokemon/lycanroc/dusk/anim_front.png rename to graphics/pokemon/gen_7/lycanroc/dusk/anim_front.png diff --git a/graphics/pokemon/lycanroc/dusk/back.png b/graphics/pokemon/gen_7/lycanroc/dusk/back.png similarity index 100% rename from graphics/pokemon/lycanroc/dusk/back.png rename to graphics/pokemon/gen_7/lycanroc/dusk/back.png diff --git a/graphics/pokemon/lycanroc/dusk/icon.png b/graphics/pokemon/gen_7/lycanroc/dusk/icon.png similarity index 100% rename from graphics/pokemon/lycanroc/dusk/icon.png rename to graphics/pokemon/gen_7/lycanroc/dusk/icon.png diff --git a/graphics/pokemon/lycanroc/dusk/normal.pal b/graphics/pokemon/gen_7/lycanroc/dusk/normal.pal similarity index 100% rename from graphics/pokemon/lycanroc/dusk/normal.pal rename to graphics/pokemon/gen_7/lycanroc/dusk/normal.pal diff --git a/graphics/pokemon/lycanroc/dusk/shiny.pal b/graphics/pokemon/gen_7/lycanroc/dusk/shiny.pal similarity index 100% rename from graphics/pokemon/lycanroc/dusk/shiny.pal rename to graphics/pokemon/gen_7/lycanroc/dusk/shiny.pal diff --git a/graphics/pokemon/lycanroc/footprint.png b/graphics/pokemon/gen_7/lycanroc/footprint.png similarity index 100% rename from graphics/pokemon/lycanroc/footprint.png rename to graphics/pokemon/gen_7/lycanroc/footprint.png diff --git a/graphics/pokemon/lycanroc/icon.png b/graphics/pokemon/gen_7/lycanroc/icon.png similarity index 100% rename from graphics/pokemon/lycanroc/icon.png rename to graphics/pokemon/gen_7/lycanroc/icon.png diff --git a/graphics/pokemon/lycanroc/midnight/anim_front.png b/graphics/pokemon/gen_7/lycanroc/midnight/anim_front.png similarity index 100% rename from graphics/pokemon/lycanroc/midnight/anim_front.png rename to graphics/pokemon/gen_7/lycanroc/midnight/anim_front.png diff --git a/graphics/pokemon/lycanroc/midnight/back.png b/graphics/pokemon/gen_7/lycanroc/midnight/back.png similarity index 100% rename from graphics/pokemon/lycanroc/midnight/back.png rename to graphics/pokemon/gen_7/lycanroc/midnight/back.png diff --git a/graphics/pokemon/lycanroc/midnight/icon.png b/graphics/pokemon/gen_7/lycanroc/midnight/icon.png similarity index 100% rename from graphics/pokemon/lycanroc/midnight/icon.png rename to graphics/pokemon/gen_7/lycanroc/midnight/icon.png diff --git a/graphics/pokemon/lycanroc/midnight/normal.pal b/graphics/pokemon/gen_7/lycanroc/midnight/normal.pal similarity index 100% rename from graphics/pokemon/lycanroc/midnight/normal.pal rename to graphics/pokemon/gen_7/lycanroc/midnight/normal.pal diff --git a/graphics/pokemon/lycanroc/midnight/shiny.pal b/graphics/pokemon/gen_7/lycanroc/midnight/shiny.pal similarity index 100% rename from graphics/pokemon/lycanroc/midnight/shiny.pal rename to graphics/pokemon/gen_7/lycanroc/midnight/shiny.pal diff --git a/graphics/pokemon/lycanroc/normal.pal b/graphics/pokemon/gen_7/lycanroc/normal.pal similarity index 100% rename from graphics/pokemon/lycanroc/normal.pal rename to graphics/pokemon/gen_7/lycanroc/normal.pal diff --git a/graphics/pokemon/lycanroc/shiny.pal b/graphics/pokemon/gen_7/lycanroc/shiny.pal similarity index 100% rename from graphics/pokemon/lycanroc/shiny.pal rename to graphics/pokemon/gen_7/lycanroc/shiny.pal diff --git a/graphics/pokemon/magearna/back.png b/graphics/pokemon/gen_7/magearna/back.png similarity index 100% rename from graphics/pokemon/magearna/back.png rename to graphics/pokemon/gen_7/magearna/back.png diff --git a/graphics/pokemon/slurpuff/footprint.png b/graphics/pokemon/gen_7/magearna/footprint.png similarity index 100% rename from graphics/pokemon/slurpuff/footprint.png rename to graphics/pokemon/gen_7/magearna/footprint.png diff --git a/graphics/pokemon/magearna/front.png b/graphics/pokemon/gen_7/magearna/front.png similarity index 100% rename from graphics/pokemon/magearna/front.png rename to graphics/pokemon/gen_7/magearna/front.png diff --git a/graphics/pokemon/magearna/icon.png b/graphics/pokemon/gen_7/magearna/icon.png similarity index 100% rename from graphics/pokemon/magearna/icon.png rename to graphics/pokemon/gen_7/magearna/icon.png diff --git a/graphics/pokemon/magearna/normal.pal b/graphics/pokemon/gen_7/magearna/normal.pal similarity index 100% rename from graphics/pokemon/magearna/normal.pal rename to graphics/pokemon/gen_7/magearna/normal.pal diff --git a/graphics/pokemon/magearna/original_color/back.png b/graphics/pokemon/gen_7/magearna/original_color/back.png similarity index 100% rename from graphics/pokemon/magearna/original_color/back.png rename to graphics/pokemon/gen_7/magearna/original_color/back.png diff --git a/graphics/pokemon/magearna/original_color/front.png b/graphics/pokemon/gen_7/magearna/original_color/front.png similarity index 100% rename from graphics/pokemon/magearna/original_color/front.png rename to graphics/pokemon/gen_7/magearna/original_color/front.png diff --git a/graphics/pokemon/magearna/original_color/icon.png b/graphics/pokemon/gen_7/magearna/original_color/icon.png similarity index 100% rename from graphics/pokemon/magearna/original_color/icon.png rename to graphics/pokemon/gen_7/magearna/original_color/icon.png diff --git a/graphics/pokemon/magearna/original_color/normal.pal b/graphics/pokemon/gen_7/magearna/original_color/normal.pal similarity index 100% rename from graphics/pokemon/magearna/original_color/normal.pal rename to graphics/pokemon/gen_7/magearna/original_color/normal.pal diff --git a/graphics/pokemon/magearna/original_color/shiny.pal b/graphics/pokemon/gen_7/magearna/original_color/shiny.pal similarity index 100% rename from graphics/pokemon/magearna/original_color/shiny.pal rename to graphics/pokemon/gen_7/magearna/original_color/shiny.pal diff --git a/graphics/pokemon/magearna/shiny.pal b/graphics/pokemon/gen_7/magearna/shiny.pal similarity index 100% rename from graphics/pokemon/magearna/shiny.pal rename to graphics/pokemon/gen_7/magearna/shiny.pal diff --git a/graphics/pokemon/mareanie/back.png b/graphics/pokemon/gen_7/mareanie/back.png similarity index 100% rename from graphics/pokemon/mareanie/back.png rename to graphics/pokemon/gen_7/mareanie/back.png diff --git a/graphics/pokemon/swirlix/footprint.png b/graphics/pokemon/gen_7/mareanie/footprint.png similarity index 100% rename from graphics/pokemon/swirlix/footprint.png rename to graphics/pokemon/gen_7/mareanie/footprint.png diff --git a/graphics/pokemon/mareanie/front.png b/graphics/pokemon/gen_7/mareanie/front.png similarity index 100% rename from graphics/pokemon/mareanie/front.png rename to graphics/pokemon/gen_7/mareanie/front.png diff --git a/graphics/pokemon/mareanie/icon.png b/graphics/pokemon/gen_7/mareanie/icon.png similarity index 100% rename from graphics/pokemon/mareanie/icon.png rename to graphics/pokemon/gen_7/mareanie/icon.png diff --git a/graphics/pokemon/mareanie/normal.pal b/graphics/pokemon/gen_7/mareanie/normal.pal similarity index 100% rename from graphics/pokemon/mareanie/normal.pal rename to graphics/pokemon/gen_7/mareanie/normal.pal diff --git a/graphics/pokemon/mareanie/shiny.pal b/graphics/pokemon/gen_7/mareanie/shiny.pal similarity index 100% rename from graphics/pokemon/mareanie/shiny.pal rename to graphics/pokemon/gen_7/mareanie/shiny.pal diff --git a/graphics/pokemon/marshadow/anim_front.png b/graphics/pokemon/gen_7/marshadow/anim_front.png similarity index 100% rename from graphics/pokemon/marshadow/anim_front.png rename to graphics/pokemon/gen_7/marshadow/anim_front.png diff --git a/graphics/pokemon/marshadow/back.png b/graphics/pokemon/gen_7/marshadow/back.png similarity index 100% rename from graphics/pokemon/marshadow/back.png rename to graphics/pokemon/gen_7/marshadow/back.png diff --git a/graphics/pokemon/marshadow/footprint.png b/graphics/pokemon/gen_7/marshadow/footprint.png similarity index 100% rename from graphics/pokemon/marshadow/footprint.png rename to graphics/pokemon/gen_7/marshadow/footprint.png diff --git a/graphics/pokemon/marshadow/icon.png b/graphics/pokemon/gen_7/marshadow/icon.png similarity index 100% rename from graphics/pokemon/marshadow/icon.png rename to graphics/pokemon/gen_7/marshadow/icon.png diff --git a/graphics/pokemon/marshadow/normal.pal b/graphics/pokemon/gen_7/marshadow/normal.pal similarity index 100% rename from graphics/pokemon/marshadow/normal.pal rename to graphics/pokemon/gen_7/marshadow/normal.pal diff --git a/graphics/pokemon/marshadow/shiny.pal b/graphics/pokemon/gen_7/marshadow/shiny.pal similarity index 100% rename from graphics/pokemon/marshadow/shiny.pal rename to graphics/pokemon/gen_7/marshadow/shiny.pal diff --git a/graphics/pokemon/melmetal/back.png b/graphics/pokemon/gen_7/melmetal/back.png similarity index 100% rename from graphics/pokemon/melmetal/back.png rename to graphics/pokemon/gen_7/melmetal/back.png diff --git a/graphics/pokemon/melmetal/footprint.png b/graphics/pokemon/gen_7/melmetal/footprint.png similarity index 100% rename from graphics/pokemon/melmetal/footprint.png rename to graphics/pokemon/gen_7/melmetal/footprint.png diff --git a/graphics/pokemon/melmetal/front.png b/graphics/pokemon/gen_7/melmetal/front.png similarity index 100% rename from graphics/pokemon/melmetal/front.png rename to graphics/pokemon/gen_7/melmetal/front.png diff --git a/graphics/pokemon/melmetal/gigantamax/back.png b/graphics/pokemon/gen_7/melmetal/gigantamax/back.png similarity index 100% rename from graphics/pokemon/melmetal/gigantamax/back.png rename to graphics/pokemon/gen_7/melmetal/gigantamax/back.png diff --git a/graphics/pokemon/melmetal/gigantamax/front.png b/graphics/pokemon/gen_7/melmetal/gigantamax/front.png similarity index 100% rename from graphics/pokemon/melmetal/gigantamax/front.png rename to graphics/pokemon/gen_7/melmetal/gigantamax/front.png diff --git a/graphics/pokemon/melmetal/gigantamax/icon.png b/graphics/pokemon/gen_7/melmetal/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/melmetal/gigantamax/icon.png rename to graphics/pokemon/gen_7/melmetal/gigantamax/icon.png diff --git a/graphics/pokemon/melmetal/gigantamax/normal.pal b/graphics/pokemon/gen_7/melmetal/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/melmetal/gigantamax/normal.pal rename to graphics/pokemon/gen_7/melmetal/gigantamax/normal.pal diff --git a/graphics/pokemon/melmetal/gigantamax/shiny.pal b/graphics/pokemon/gen_7/melmetal/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/melmetal/gigantamax/shiny.pal rename to graphics/pokemon/gen_7/melmetal/gigantamax/shiny.pal diff --git a/graphics/pokemon/melmetal/icon.png b/graphics/pokemon/gen_7/melmetal/icon.png similarity index 100% rename from graphics/pokemon/melmetal/icon.png rename to graphics/pokemon/gen_7/melmetal/icon.png diff --git a/graphics/pokemon/melmetal/normal.pal b/graphics/pokemon/gen_7/melmetal/normal.pal similarity index 100% rename from graphics/pokemon/melmetal/normal.pal rename to graphics/pokemon/gen_7/melmetal/normal.pal diff --git a/graphics/pokemon/melmetal/shiny.pal b/graphics/pokemon/gen_7/melmetal/shiny.pal similarity index 100% rename from graphics/pokemon/melmetal/shiny.pal rename to graphics/pokemon/gen_7/melmetal/shiny.pal diff --git a/graphics/pokemon/meltan/back.png b/graphics/pokemon/gen_7/meltan/back.png similarity index 100% rename from graphics/pokemon/meltan/back.png rename to graphics/pokemon/gen_7/meltan/back.png diff --git a/graphics/pokemon/tapu_bulu/footprint.png b/graphics/pokemon/gen_7/meltan/footprint.png similarity index 100% rename from graphics/pokemon/tapu_bulu/footprint.png rename to graphics/pokemon/gen_7/meltan/footprint.png diff --git a/graphics/pokemon/meltan/front.png b/graphics/pokemon/gen_7/meltan/front.png similarity index 100% rename from graphics/pokemon/meltan/front.png rename to graphics/pokemon/gen_7/meltan/front.png diff --git a/graphics/pokemon/meltan/icon.png b/graphics/pokemon/gen_7/meltan/icon.png similarity index 100% rename from graphics/pokemon/meltan/icon.png rename to graphics/pokemon/gen_7/meltan/icon.png diff --git a/graphics/pokemon/meltan/normal.pal b/graphics/pokemon/gen_7/meltan/normal.pal similarity index 100% rename from graphics/pokemon/meltan/normal.pal rename to graphics/pokemon/gen_7/meltan/normal.pal diff --git a/graphics/pokemon/meltan/shiny.pal b/graphics/pokemon/gen_7/meltan/shiny.pal similarity index 100% rename from graphics/pokemon/meltan/shiny.pal rename to graphics/pokemon/gen_7/meltan/shiny.pal diff --git a/graphics/pokemon/mimikyu/back.png b/graphics/pokemon/gen_7/mimikyu/back.png similarity index 100% rename from graphics/pokemon/mimikyu/back.png rename to graphics/pokemon/gen_7/mimikyu/back.png diff --git a/graphics/pokemon/mimikyu/busted/back.png b/graphics/pokemon/gen_7/mimikyu/busted/back.png similarity index 100% rename from graphics/pokemon/mimikyu/busted/back.png rename to graphics/pokemon/gen_7/mimikyu/busted/back.png diff --git a/graphics/pokemon/mimikyu/busted/front.png b/graphics/pokemon/gen_7/mimikyu/busted/front.png similarity index 100% rename from graphics/pokemon/mimikyu/busted/front.png rename to graphics/pokemon/gen_7/mimikyu/busted/front.png diff --git a/graphics/pokemon/mimikyu/busted/icon.png b/graphics/pokemon/gen_7/mimikyu/busted/icon.png similarity index 100% rename from graphics/pokemon/mimikyu/busted/icon.png rename to graphics/pokemon/gen_7/mimikyu/busted/icon.png diff --git a/graphics/pokemon/mimikyu/busted/normal.pal b/graphics/pokemon/gen_7/mimikyu/busted/normal.pal similarity index 100% rename from graphics/pokemon/mimikyu/busted/normal.pal rename to graphics/pokemon/gen_7/mimikyu/busted/normal.pal diff --git a/graphics/pokemon/mimikyu/busted/shiny.pal b/graphics/pokemon/gen_7/mimikyu/busted/shiny.pal similarity index 100% rename from graphics/pokemon/mimikyu/busted/shiny.pal rename to graphics/pokemon/gen_7/mimikyu/busted/shiny.pal diff --git a/graphics/pokemon/tapu_fini/footprint.png b/graphics/pokemon/gen_7/mimikyu/footprint.png similarity index 100% rename from graphics/pokemon/tapu_fini/footprint.png rename to graphics/pokemon/gen_7/mimikyu/footprint.png diff --git a/graphics/pokemon/mimikyu/front.png b/graphics/pokemon/gen_7/mimikyu/front.png similarity index 100% rename from graphics/pokemon/mimikyu/front.png rename to graphics/pokemon/gen_7/mimikyu/front.png diff --git a/graphics/pokemon/mimikyu/icon.png b/graphics/pokemon/gen_7/mimikyu/icon.png similarity index 100% rename from graphics/pokemon/mimikyu/icon.png rename to graphics/pokemon/gen_7/mimikyu/icon.png diff --git a/graphics/pokemon/mimikyu/normal.pal b/graphics/pokemon/gen_7/mimikyu/normal.pal similarity index 100% rename from graphics/pokemon/mimikyu/normal.pal rename to graphics/pokemon/gen_7/mimikyu/normal.pal diff --git a/graphics/pokemon/mimikyu/shiny.pal b/graphics/pokemon/gen_7/mimikyu/shiny.pal similarity index 100% rename from graphics/pokemon/mimikyu/shiny.pal rename to graphics/pokemon/gen_7/mimikyu/shiny.pal diff --git a/graphics/pokemon/minior/back.png b/graphics/pokemon/gen_7/minior/back.png similarity index 100% rename from graphics/pokemon/minior/back.png rename to graphics/pokemon/gen_7/minior/back.png diff --git a/graphics/pokemon/minior/core/back.png b/graphics/pokemon/gen_7/minior/core/back.png similarity index 100% rename from graphics/pokemon/minior/core/back.png rename to graphics/pokemon/gen_7/minior/core/back.png diff --git a/graphics/pokemon/minior/core/blue/icon.png b/graphics/pokemon/gen_7/minior/core/blue/icon.png similarity index 100% rename from graphics/pokemon/minior/core/blue/icon.png rename to graphics/pokemon/gen_7/minior/core/blue/icon.png diff --git a/graphics/pokemon/minior/core/blue/normal.pal b/graphics/pokemon/gen_7/minior/core/blue/normal.pal similarity index 100% rename from graphics/pokemon/minior/core/blue/normal.pal rename to graphics/pokemon/gen_7/minior/core/blue/normal.pal diff --git a/graphics/pokemon/minior/core/front.png b/graphics/pokemon/gen_7/minior/core/front.png similarity index 100% rename from graphics/pokemon/minior/core/front.png rename to graphics/pokemon/gen_7/minior/core/front.png diff --git a/graphics/pokemon/minior/core/green/icon.png b/graphics/pokemon/gen_7/minior/core/green/icon.png similarity index 100% rename from graphics/pokemon/minior/core/green/icon.png rename to graphics/pokemon/gen_7/minior/core/green/icon.png diff --git a/graphics/pokemon/minior/core/green/normal.pal b/graphics/pokemon/gen_7/minior/core/green/normal.pal similarity index 100% rename from graphics/pokemon/minior/core/green/normal.pal rename to graphics/pokemon/gen_7/minior/core/green/normal.pal diff --git a/graphics/pokemon/minior/core/indigo/icon.png b/graphics/pokemon/gen_7/minior/core/indigo/icon.png similarity index 100% rename from graphics/pokemon/minior/core/indigo/icon.png rename to graphics/pokemon/gen_7/minior/core/indigo/icon.png diff --git a/graphics/pokemon/minior/core/indigo/normal.pal b/graphics/pokemon/gen_7/minior/core/indigo/normal.pal similarity index 100% rename from graphics/pokemon/minior/core/indigo/normal.pal rename to graphics/pokemon/gen_7/minior/core/indigo/normal.pal diff --git a/graphics/pokemon/minior/core/orange/icon.png b/graphics/pokemon/gen_7/minior/core/orange/icon.png similarity index 100% rename from graphics/pokemon/minior/core/orange/icon.png rename to graphics/pokemon/gen_7/minior/core/orange/icon.png diff --git a/graphics/pokemon/minior/core/orange/normal.pal b/graphics/pokemon/gen_7/minior/core/orange/normal.pal similarity index 100% rename from graphics/pokemon/minior/core/orange/normal.pal rename to graphics/pokemon/gen_7/minior/core/orange/normal.pal diff --git a/graphics/pokemon/minior/core/red/icon.png b/graphics/pokemon/gen_7/minior/core/red/icon.png similarity index 100% rename from graphics/pokemon/minior/core/red/icon.png rename to graphics/pokemon/gen_7/minior/core/red/icon.png diff --git a/graphics/pokemon/minior/core/red/normal.pal b/graphics/pokemon/gen_7/minior/core/red/normal.pal similarity index 100% rename from graphics/pokemon/minior/core/red/normal.pal rename to graphics/pokemon/gen_7/minior/core/red/normal.pal diff --git a/graphics/pokemon/minior/core/shiny.pal b/graphics/pokemon/gen_7/minior/core/shiny.pal similarity index 100% rename from graphics/pokemon/minior/core/shiny.pal rename to graphics/pokemon/gen_7/minior/core/shiny.pal diff --git a/graphics/pokemon/minior/core/violet/icon.png b/graphics/pokemon/gen_7/minior/core/violet/icon.png similarity index 100% rename from graphics/pokemon/minior/core/violet/icon.png rename to graphics/pokemon/gen_7/minior/core/violet/icon.png diff --git a/graphics/pokemon/minior/core/violet/normal.pal b/graphics/pokemon/gen_7/minior/core/violet/normal.pal similarity index 100% rename from graphics/pokemon/minior/core/violet/normal.pal rename to graphics/pokemon/gen_7/minior/core/violet/normal.pal diff --git a/graphics/pokemon/minior/core/yellow/icon.png b/graphics/pokemon/gen_7/minior/core/yellow/icon.png similarity index 100% rename from graphics/pokemon/minior/core/yellow/icon.png rename to graphics/pokemon/gen_7/minior/core/yellow/icon.png diff --git a/graphics/pokemon/minior/core/yellow/normal.pal b/graphics/pokemon/gen_7/minior/core/yellow/normal.pal similarity index 100% rename from graphics/pokemon/minior/core/yellow/normal.pal rename to graphics/pokemon/gen_7/minior/core/yellow/normal.pal diff --git a/graphics/pokemon/tapu_koko/footprint.png b/graphics/pokemon/gen_7/minior/footprint.png similarity index 100% rename from graphics/pokemon/tapu_koko/footprint.png rename to graphics/pokemon/gen_7/minior/footprint.png diff --git a/graphics/pokemon/minior/front.png b/graphics/pokemon/gen_7/minior/front.png similarity index 100% rename from graphics/pokemon/minior/front.png rename to graphics/pokemon/gen_7/minior/front.png diff --git a/graphics/pokemon/minior/icon.png b/graphics/pokemon/gen_7/minior/icon.png similarity index 100% rename from graphics/pokemon/minior/icon.png rename to graphics/pokemon/gen_7/minior/icon.png diff --git a/graphics/pokemon/minior/normal.pal b/graphics/pokemon/gen_7/minior/normal.pal similarity index 100% rename from graphics/pokemon/minior/normal.pal rename to graphics/pokemon/gen_7/minior/normal.pal diff --git a/graphics/pokemon/minior/shiny.pal b/graphics/pokemon/gen_7/minior/shiny.pal similarity index 100% rename from graphics/pokemon/minior/shiny.pal rename to graphics/pokemon/gen_7/minior/shiny.pal diff --git a/graphics/pokemon/morelull/back.png b/graphics/pokemon/gen_7/morelull/back.png similarity index 100% rename from graphics/pokemon/morelull/back.png rename to graphics/pokemon/gen_7/morelull/back.png diff --git a/graphics/pokemon/morelull/footprint.png b/graphics/pokemon/gen_7/morelull/footprint.png similarity index 100% rename from graphics/pokemon/morelull/footprint.png rename to graphics/pokemon/gen_7/morelull/footprint.png diff --git a/graphics/pokemon/morelull/front.png b/graphics/pokemon/gen_7/morelull/front.png similarity index 100% rename from graphics/pokemon/morelull/front.png rename to graphics/pokemon/gen_7/morelull/front.png diff --git a/graphics/pokemon/morelull/icon.png b/graphics/pokemon/gen_7/morelull/icon.png similarity index 100% rename from graphics/pokemon/morelull/icon.png rename to graphics/pokemon/gen_7/morelull/icon.png diff --git a/graphics/pokemon/morelull/normal.pal b/graphics/pokemon/gen_7/morelull/normal.pal similarity index 100% rename from graphics/pokemon/morelull/normal.pal rename to graphics/pokemon/gen_7/morelull/normal.pal diff --git a/graphics/pokemon/morelull/shiny.pal b/graphics/pokemon/gen_7/morelull/shiny.pal similarity index 100% rename from graphics/pokemon/morelull/shiny.pal rename to graphics/pokemon/gen_7/morelull/shiny.pal diff --git a/graphics/pokemon/mudbray/back.png b/graphics/pokemon/gen_7/mudbray/back.png similarity index 100% rename from graphics/pokemon/mudbray/back.png rename to graphics/pokemon/gen_7/mudbray/back.png diff --git a/graphics/pokemon/mudbray/footprint.png b/graphics/pokemon/gen_7/mudbray/footprint.png similarity index 100% rename from graphics/pokemon/mudbray/footprint.png rename to graphics/pokemon/gen_7/mudbray/footprint.png diff --git a/graphics/pokemon/mudbray/front.png b/graphics/pokemon/gen_7/mudbray/front.png similarity index 100% rename from graphics/pokemon/mudbray/front.png rename to graphics/pokemon/gen_7/mudbray/front.png diff --git a/graphics/pokemon/mudbray/icon.png b/graphics/pokemon/gen_7/mudbray/icon.png similarity index 100% rename from graphics/pokemon/mudbray/icon.png rename to graphics/pokemon/gen_7/mudbray/icon.png diff --git a/graphics/pokemon/mudbray/normal.pal b/graphics/pokemon/gen_7/mudbray/normal.pal similarity index 100% rename from graphics/pokemon/mudbray/normal.pal rename to graphics/pokemon/gen_7/mudbray/normal.pal diff --git a/graphics/pokemon/mudbray/shiny.pal b/graphics/pokemon/gen_7/mudbray/shiny.pal similarity index 100% rename from graphics/pokemon/mudbray/shiny.pal rename to graphics/pokemon/gen_7/mudbray/shiny.pal diff --git a/graphics/pokemon/mudsdale/back.png b/graphics/pokemon/gen_7/mudsdale/back.png similarity index 100% rename from graphics/pokemon/mudsdale/back.png rename to graphics/pokemon/gen_7/mudsdale/back.png diff --git a/graphics/pokemon/mudsdale/footprint.png b/graphics/pokemon/gen_7/mudsdale/footprint.png similarity index 100% rename from graphics/pokemon/mudsdale/footprint.png rename to graphics/pokemon/gen_7/mudsdale/footprint.png diff --git a/graphics/pokemon/mudsdale/front.png b/graphics/pokemon/gen_7/mudsdale/front.png similarity index 100% rename from graphics/pokemon/mudsdale/front.png rename to graphics/pokemon/gen_7/mudsdale/front.png diff --git a/graphics/pokemon/mudsdale/icon.png b/graphics/pokemon/gen_7/mudsdale/icon.png similarity index 100% rename from graphics/pokemon/mudsdale/icon.png rename to graphics/pokemon/gen_7/mudsdale/icon.png diff --git a/graphics/pokemon/mudsdale/normal.pal b/graphics/pokemon/gen_7/mudsdale/normal.pal similarity index 100% rename from graphics/pokemon/mudsdale/normal.pal rename to graphics/pokemon/gen_7/mudsdale/normal.pal diff --git a/graphics/pokemon/mudsdale/shiny.pal b/graphics/pokemon/gen_7/mudsdale/shiny.pal similarity index 100% rename from graphics/pokemon/mudsdale/shiny.pal rename to graphics/pokemon/gen_7/mudsdale/shiny.pal diff --git a/graphics/pokemon/naganadel/back.png b/graphics/pokemon/gen_7/naganadel/back.png similarity index 100% rename from graphics/pokemon/naganadel/back.png rename to graphics/pokemon/gen_7/naganadel/back.png diff --git a/graphics/pokemon/tapu_lele/footprint.png b/graphics/pokemon/gen_7/naganadel/footprint.png similarity index 100% rename from graphics/pokemon/tapu_lele/footprint.png rename to graphics/pokemon/gen_7/naganadel/footprint.png diff --git a/graphics/pokemon/naganadel/front.png b/graphics/pokemon/gen_7/naganadel/front.png similarity index 100% rename from graphics/pokemon/naganadel/front.png rename to graphics/pokemon/gen_7/naganadel/front.png diff --git a/graphics/pokemon/naganadel/icon.png b/graphics/pokemon/gen_7/naganadel/icon.png similarity index 100% rename from graphics/pokemon/naganadel/icon.png rename to graphics/pokemon/gen_7/naganadel/icon.png diff --git a/graphics/pokemon/naganadel/normal.pal b/graphics/pokemon/gen_7/naganadel/normal.pal similarity index 100% rename from graphics/pokemon/naganadel/normal.pal rename to graphics/pokemon/gen_7/naganadel/normal.pal diff --git a/graphics/pokemon/naganadel/shiny.pal b/graphics/pokemon/gen_7/naganadel/shiny.pal similarity index 100% rename from graphics/pokemon/naganadel/shiny.pal rename to graphics/pokemon/gen_7/naganadel/shiny.pal diff --git a/graphics/pokemon/necrozma/back.png b/graphics/pokemon/gen_7/necrozma/back.png similarity index 100% rename from graphics/pokemon/necrozma/back.png rename to graphics/pokemon/gen_7/necrozma/back.png diff --git a/graphics/pokemon/necrozma/dawn_wings/back.png b/graphics/pokemon/gen_7/necrozma/dawn_wings/back.png similarity index 100% rename from graphics/pokemon/necrozma/dawn_wings/back.png rename to graphics/pokemon/gen_7/necrozma/dawn_wings/back.png diff --git a/graphics/pokemon/necrozma/dawn_wings/front.png b/graphics/pokemon/gen_7/necrozma/dawn_wings/front.png similarity index 100% rename from graphics/pokemon/necrozma/dawn_wings/front.png rename to graphics/pokemon/gen_7/necrozma/dawn_wings/front.png diff --git a/graphics/pokemon/necrozma/dawn_wings/icon.png b/graphics/pokemon/gen_7/necrozma/dawn_wings/icon.png similarity index 100% rename from graphics/pokemon/necrozma/dawn_wings/icon.png rename to graphics/pokemon/gen_7/necrozma/dawn_wings/icon.png diff --git a/graphics/pokemon/necrozma/dawn_wings/normal.pal b/graphics/pokemon/gen_7/necrozma/dawn_wings/normal.pal similarity index 100% rename from graphics/pokemon/necrozma/dawn_wings/normal.pal rename to graphics/pokemon/gen_7/necrozma/dawn_wings/normal.pal diff --git a/graphics/pokemon/necrozma/dawn_wings/shiny.pal b/graphics/pokemon/gen_7/necrozma/dawn_wings/shiny.pal similarity index 100% rename from graphics/pokemon/necrozma/dawn_wings/shiny.pal rename to graphics/pokemon/gen_7/necrozma/dawn_wings/shiny.pal diff --git a/graphics/pokemon/necrozma/dusk_mane/back.png b/graphics/pokemon/gen_7/necrozma/dusk_mane/back.png similarity index 100% rename from graphics/pokemon/necrozma/dusk_mane/back.png rename to graphics/pokemon/gen_7/necrozma/dusk_mane/back.png diff --git a/graphics/pokemon/necrozma/dusk_mane/front.png b/graphics/pokemon/gen_7/necrozma/dusk_mane/front.png similarity index 100% rename from graphics/pokemon/necrozma/dusk_mane/front.png rename to graphics/pokemon/gen_7/necrozma/dusk_mane/front.png diff --git a/graphics/pokemon/necrozma/dusk_mane/icon.png b/graphics/pokemon/gen_7/necrozma/dusk_mane/icon.png similarity index 100% rename from graphics/pokemon/necrozma/dusk_mane/icon.png rename to graphics/pokemon/gen_7/necrozma/dusk_mane/icon.png diff --git a/graphics/pokemon/necrozma/dusk_mane/normal.pal b/graphics/pokemon/gen_7/necrozma/dusk_mane/normal.pal similarity index 100% rename from graphics/pokemon/necrozma/dusk_mane/normal.pal rename to graphics/pokemon/gen_7/necrozma/dusk_mane/normal.pal diff --git a/graphics/pokemon/necrozma/dusk_mane/shiny.pal b/graphics/pokemon/gen_7/necrozma/dusk_mane/shiny.pal similarity index 100% rename from graphics/pokemon/necrozma/dusk_mane/shiny.pal rename to graphics/pokemon/gen_7/necrozma/dusk_mane/shiny.pal diff --git a/graphics/pokemon/tentacool/footprint.png b/graphics/pokemon/gen_7/necrozma/footprint.png similarity index 100% rename from graphics/pokemon/tentacool/footprint.png rename to graphics/pokemon/gen_7/necrozma/footprint.png diff --git a/graphics/pokemon/necrozma/front.png b/graphics/pokemon/gen_7/necrozma/front.png similarity index 100% rename from graphics/pokemon/necrozma/front.png rename to graphics/pokemon/gen_7/necrozma/front.png diff --git a/graphics/pokemon/necrozma/icon.png b/graphics/pokemon/gen_7/necrozma/icon.png similarity index 100% rename from graphics/pokemon/necrozma/icon.png rename to graphics/pokemon/gen_7/necrozma/icon.png diff --git a/graphics/pokemon/necrozma/normal.pal b/graphics/pokemon/gen_7/necrozma/normal.pal similarity index 100% rename from graphics/pokemon/necrozma/normal.pal rename to graphics/pokemon/gen_7/necrozma/normal.pal diff --git a/graphics/pokemon/necrozma/shiny.pal b/graphics/pokemon/gen_7/necrozma/shiny.pal similarity index 100% rename from graphics/pokemon/necrozma/shiny.pal rename to graphics/pokemon/gen_7/necrozma/shiny.pal diff --git a/graphics/pokemon/necrozma/ultra/back.png b/graphics/pokemon/gen_7/necrozma/ultra/back.png similarity index 100% rename from graphics/pokemon/necrozma/ultra/back.png rename to graphics/pokemon/gen_7/necrozma/ultra/back.png diff --git a/graphics/pokemon/necrozma/ultra/front.png b/graphics/pokemon/gen_7/necrozma/ultra/front.png similarity index 100% rename from graphics/pokemon/necrozma/ultra/front.png rename to graphics/pokemon/gen_7/necrozma/ultra/front.png diff --git a/graphics/pokemon/necrozma/ultra/icon.png b/graphics/pokemon/gen_7/necrozma/ultra/icon.png similarity index 100% rename from graphics/pokemon/necrozma/ultra/icon.png rename to graphics/pokemon/gen_7/necrozma/ultra/icon.png diff --git a/graphics/pokemon/necrozma/ultra/normal.pal b/graphics/pokemon/gen_7/necrozma/ultra/normal.pal similarity index 100% rename from graphics/pokemon/necrozma/ultra/normal.pal rename to graphics/pokemon/gen_7/necrozma/ultra/normal.pal diff --git a/graphics/pokemon/necrozma/ultra/shiny.pal b/graphics/pokemon/gen_7/necrozma/ultra/shiny.pal similarity index 100% rename from graphics/pokemon/necrozma/ultra/shiny.pal rename to graphics/pokemon/gen_7/necrozma/ultra/shiny.pal diff --git a/graphics/pokemon/nihilego/back.png b/graphics/pokemon/gen_7/nihilego/back.png similarity index 100% rename from graphics/pokemon/nihilego/back.png rename to graphics/pokemon/gen_7/nihilego/back.png diff --git a/graphics/pokemon/tentacruel/footprint.png b/graphics/pokemon/gen_7/nihilego/footprint.png similarity index 100% rename from graphics/pokemon/tentacruel/footprint.png rename to graphics/pokemon/gen_7/nihilego/footprint.png diff --git a/graphics/pokemon/nihilego/front.png b/graphics/pokemon/gen_7/nihilego/front.png similarity index 100% rename from graphics/pokemon/nihilego/front.png rename to graphics/pokemon/gen_7/nihilego/front.png diff --git a/graphics/pokemon/nihilego/icon.png b/graphics/pokemon/gen_7/nihilego/icon.png similarity index 100% rename from graphics/pokemon/nihilego/icon.png rename to graphics/pokemon/gen_7/nihilego/icon.png diff --git a/graphics/pokemon/nihilego/normal.pal b/graphics/pokemon/gen_7/nihilego/normal.pal similarity index 100% rename from graphics/pokemon/nihilego/normal.pal rename to graphics/pokemon/gen_7/nihilego/normal.pal diff --git a/graphics/pokemon/nihilego/shiny.pal b/graphics/pokemon/gen_7/nihilego/shiny.pal similarity index 100% rename from graphics/pokemon/nihilego/shiny.pal rename to graphics/pokemon/gen_7/nihilego/shiny.pal diff --git a/graphics/pokemon/oranguru/anim_front.png b/graphics/pokemon/gen_7/oranguru/anim_front.png similarity index 100% rename from graphics/pokemon/oranguru/anim_front.png rename to graphics/pokemon/gen_7/oranguru/anim_front.png diff --git a/graphics/pokemon/oranguru/back.png b/graphics/pokemon/gen_7/oranguru/back.png similarity index 100% rename from graphics/pokemon/oranguru/back.png rename to graphics/pokemon/gen_7/oranguru/back.png diff --git a/graphics/pokemon/oranguru/footprint.png b/graphics/pokemon/gen_7/oranguru/footprint.png similarity index 100% rename from graphics/pokemon/oranguru/footprint.png rename to graphics/pokemon/gen_7/oranguru/footprint.png diff --git a/graphics/pokemon/oranguru/icon.png b/graphics/pokemon/gen_7/oranguru/icon.png similarity index 100% rename from graphics/pokemon/oranguru/icon.png rename to graphics/pokemon/gen_7/oranguru/icon.png diff --git a/graphics/pokemon/oranguru/normal.pal b/graphics/pokemon/gen_7/oranguru/normal.pal similarity index 100% rename from graphics/pokemon/oranguru/normal.pal rename to graphics/pokemon/gen_7/oranguru/normal.pal diff --git a/graphics/pokemon/oranguru/shiny.pal b/graphics/pokemon/gen_7/oranguru/shiny.pal similarity index 100% rename from graphics/pokemon/oranguru/shiny.pal rename to graphics/pokemon/gen_7/oranguru/shiny.pal diff --git a/graphics/pokemon/oricorio/back.png b/graphics/pokemon/gen_7/oricorio/back.png similarity index 100% rename from graphics/pokemon/oricorio/back.png rename to graphics/pokemon/gen_7/oricorio/back.png diff --git a/graphics/pokemon/oricorio/footprint.png b/graphics/pokemon/gen_7/oricorio/footprint.png similarity index 100% rename from graphics/pokemon/oricorio/footprint.png rename to graphics/pokemon/gen_7/oricorio/footprint.png diff --git a/graphics/pokemon/oricorio/front.png b/graphics/pokemon/gen_7/oricorio/front.png similarity index 100% rename from graphics/pokemon/oricorio/front.png rename to graphics/pokemon/gen_7/oricorio/front.png diff --git a/graphics/pokemon/oricorio/icon.png b/graphics/pokemon/gen_7/oricorio/icon.png similarity index 100% rename from graphics/pokemon/oricorio/icon.png rename to graphics/pokemon/gen_7/oricorio/icon.png diff --git a/graphics/pokemon/oricorio/normal.pal b/graphics/pokemon/gen_7/oricorio/normal.pal similarity index 100% rename from graphics/pokemon/oricorio/normal.pal rename to graphics/pokemon/gen_7/oricorio/normal.pal diff --git a/graphics/pokemon/oricorio/pau/back.png b/graphics/pokemon/gen_7/oricorio/pau/back.png similarity index 100% rename from graphics/pokemon/oricorio/pau/back.png rename to graphics/pokemon/gen_7/oricorio/pau/back.png diff --git a/graphics/pokemon/oricorio/pau/front.png b/graphics/pokemon/gen_7/oricorio/pau/front.png similarity index 100% rename from graphics/pokemon/oricorio/pau/front.png rename to graphics/pokemon/gen_7/oricorio/pau/front.png diff --git a/graphics/pokemon/oricorio/pau/icon.png b/graphics/pokemon/gen_7/oricorio/pau/icon.png similarity index 100% rename from graphics/pokemon/oricorio/pau/icon.png rename to graphics/pokemon/gen_7/oricorio/pau/icon.png diff --git a/graphics/pokemon/oricorio/pau/normal.pal b/graphics/pokemon/gen_7/oricorio/pau/normal.pal similarity index 100% rename from graphics/pokemon/oricorio/pau/normal.pal rename to graphics/pokemon/gen_7/oricorio/pau/normal.pal diff --git a/graphics/pokemon/oricorio/pau/shiny.pal b/graphics/pokemon/gen_7/oricorio/pau/shiny.pal similarity index 100% rename from graphics/pokemon/oricorio/pau/shiny.pal rename to graphics/pokemon/gen_7/oricorio/pau/shiny.pal diff --git a/graphics/pokemon/oricorio/pom_pom/back.png b/graphics/pokemon/gen_7/oricorio/pom_pom/back.png similarity index 100% rename from graphics/pokemon/oricorio/pom_pom/back.png rename to graphics/pokemon/gen_7/oricorio/pom_pom/back.png diff --git a/graphics/pokemon/oricorio/pom_pom/front.png b/graphics/pokemon/gen_7/oricorio/pom_pom/front.png similarity index 100% rename from graphics/pokemon/oricorio/pom_pom/front.png rename to graphics/pokemon/gen_7/oricorio/pom_pom/front.png diff --git a/graphics/pokemon/oricorio/pom_pom/icon.png b/graphics/pokemon/gen_7/oricorio/pom_pom/icon.png similarity index 100% rename from graphics/pokemon/oricorio/pom_pom/icon.png rename to graphics/pokemon/gen_7/oricorio/pom_pom/icon.png diff --git a/graphics/pokemon/oricorio/pom_pom/normal.pal b/graphics/pokemon/gen_7/oricorio/pom_pom/normal.pal similarity index 100% rename from graphics/pokemon/oricorio/pom_pom/normal.pal rename to graphics/pokemon/gen_7/oricorio/pom_pom/normal.pal diff --git a/graphics/pokemon/oricorio/pom_pom/shiny.pal b/graphics/pokemon/gen_7/oricorio/pom_pom/shiny.pal similarity index 100% rename from graphics/pokemon/oricorio/pom_pom/shiny.pal rename to graphics/pokemon/gen_7/oricorio/pom_pom/shiny.pal diff --git a/graphics/pokemon/oricorio/sensu/back.png b/graphics/pokemon/gen_7/oricorio/sensu/back.png similarity index 100% rename from graphics/pokemon/oricorio/sensu/back.png rename to graphics/pokemon/gen_7/oricorio/sensu/back.png diff --git a/graphics/pokemon/oricorio/sensu/front.png b/graphics/pokemon/gen_7/oricorio/sensu/front.png similarity index 100% rename from graphics/pokemon/oricorio/sensu/front.png rename to graphics/pokemon/gen_7/oricorio/sensu/front.png diff --git a/graphics/pokemon/oricorio/sensu/icon.png b/graphics/pokemon/gen_7/oricorio/sensu/icon.png similarity index 100% rename from graphics/pokemon/oricorio/sensu/icon.png rename to graphics/pokemon/gen_7/oricorio/sensu/icon.png diff --git a/graphics/pokemon/oricorio/sensu/normal.pal b/graphics/pokemon/gen_7/oricorio/sensu/normal.pal similarity index 100% rename from graphics/pokemon/oricorio/sensu/normal.pal rename to graphics/pokemon/gen_7/oricorio/sensu/normal.pal diff --git a/graphics/pokemon/oricorio/sensu/shiny.pal b/graphics/pokemon/gen_7/oricorio/sensu/shiny.pal similarity index 100% rename from graphics/pokemon/oricorio/sensu/shiny.pal rename to graphics/pokemon/gen_7/oricorio/sensu/shiny.pal diff --git a/graphics/pokemon/oricorio/shiny.pal b/graphics/pokemon/gen_7/oricorio/shiny.pal similarity index 100% rename from graphics/pokemon/oricorio/shiny.pal rename to graphics/pokemon/gen_7/oricorio/shiny.pal diff --git a/graphics/pokemon/palossand/back.png b/graphics/pokemon/gen_7/palossand/back.png similarity index 100% rename from graphics/pokemon/palossand/back.png rename to graphics/pokemon/gen_7/palossand/back.png diff --git a/graphics/pokemon/thundurus/footprint.png b/graphics/pokemon/gen_7/palossand/footprint.png similarity index 100% rename from graphics/pokemon/thundurus/footprint.png rename to graphics/pokemon/gen_7/palossand/footprint.png diff --git a/graphics/pokemon/palossand/front.png b/graphics/pokemon/gen_7/palossand/front.png similarity index 100% rename from graphics/pokemon/palossand/front.png rename to graphics/pokemon/gen_7/palossand/front.png diff --git a/graphics/pokemon/palossand/icon.png b/graphics/pokemon/gen_7/palossand/icon.png similarity index 100% rename from graphics/pokemon/palossand/icon.png rename to graphics/pokemon/gen_7/palossand/icon.png diff --git a/graphics/pokemon/palossand/normal.pal b/graphics/pokemon/gen_7/palossand/normal.pal similarity index 100% rename from graphics/pokemon/palossand/normal.pal rename to graphics/pokemon/gen_7/palossand/normal.pal diff --git a/graphics/pokemon/palossand/shiny.pal b/graphics/pokemon/gen_7/palossand/shiny.pal similarity index 100% rename from graphics/pokemon/palossand/shiny.pal rename to graphics/pokemon/gen_7/palossand/shiny.pal diff --git a/graphics/pokemon/passimian/anim_front.png b/graphics/pokemon/gen_7/passimian/anim_front.png similarity index 100% rename from graphics/pokemon/passimian/anim_front.png rename to graphics/pokemon/gen_7/passimian/anim_front.png diff --git a/graphics/pokemon/passimian/back.png b/graphics/pokemon/gen_7/passimian/back.png similarity index 100% rename from graphics/pokemon/passimian/back.png rename to graphics/pokemon/gen_7/passimian/back.png diff --git a/graphics/pokemon/passimian/footprint.png b/graphics/pokemon/gen_7/passimian/footprint.png similarity index 100% rename from graphics/pokemon/passimian/footprint.png rename to graphics/pokemon/gen_7/passimian/footprint.png diff --git a/graphics/pokemon/passimian/icon.png b/graphics/pokemon/gen_7/passimian/icon.png similarity index 100% rename from graphics/pokemon/passimian/icon.png rename to graphics/pokemon/gen_7/passimian/icon.png diff --git a/graphics/pokemon/passimian/normal.pal b/graphics/pokemon/gen_7/passimian/normal.pal similarity index 100% rename from graphics/pokemon/passimian/normal.pal rename to graphics/pokemon/gen_7/passimian/normal.pal diff --git a/graphics/pokemon/passimian/shiny.pal b/graphics/pokemon/gen_7/passimian/shiny.pal similarity index 100% rename from graphics/pokemon/passimian/shiny.pal rename to graphics/pokemon/gen_7/passimian/shiny.pal diff --git a/graphics/pokemon/pheromosa/back.png b/graphics/pokemon/gen_7/pheromosa/back.png similarity index 100% rename from graphics/pokemon/pheromosa/back.png rename to graphics/pokemon/gen_7/pheromosa/back.png diff --git a/graphics/pokemon/pheromosa/footprint.png b/graphics/pokemon/gen_7/pheromosa/footprint.png similarity index 100% rename from graphics/pokemon/pheromosa/footprint.png rename to graphics/pokemon/gen_7/pheromosa/footprint.png diff --git a/graphics/pokemon/pheromosa/front.png b/graphics/pokemon/gen_7/pheromosa/front.png similarity index 100% rename from graphics/pokemon/pheromosa/front.png rename to graphics/pokemon/gen_7/pheromosa/front.png diff --git a/graphics/pokemon/pheromosa/icon.png b/graphics/pokemon/gen_7/pheromosa/icon.png similarity index 100% rename from graphics/pokemon/pheromosa/icon.png rename to graphics/pokemon/gen_7/pheromosa/icon.png diff --git a/graphics/pokemon/pheromosa/normal.pal b/graphics/pokemon/gen_7/pheromosa/normal.pal similarity index 100% rename from graphics/pokemon/pheromosa/normal.pal rename to graphics/pokemon/gen_7/pheromosa/normal.pal diff --git a/graphics/pokemon/pheromosa/shiny.pal b/graphics/pokemon/gen_7/pheromosa/shiny.pal similarity index 100% rename from graphics/pokemon/pheromosa/shiny.pal rename to graphics/pokemon/gen_7/pheromosa/shiny.pal diff --git a/graphics/pokemon/pikipek/anim_front.png b/graphics/pokemon/gen_7/pikipek/anim_front.png similarity index 100% rename from graphics/pokemon/pikipek/anim_front.png rename to graphics/pokemon/gen_7/pikipek/anim_front.png diff --git a/graphics/pokemon/pikipek/back.png b/graphics/pokemon/gen_7/pikipek/back.png similarity index 100% rename from graphics/pokemon/pikipek/back.png rename to graphics/pokemon/gen_7/pikipek/back.png diff --git a/graphics/pokemon/pikipek/footprint.png b/graphics/pokemon/gen_7/pikipek/footprint.png similarity index 100% rename from graphics/pokemon/pikipek/footprint.png rename to graphics/pokemon/gen_7/pikipek/footprint.png diff --git a/graphics/pokemon/pikipek/icon.png b/graphics/pokemon/gen_7/pikipek/icon.png similarity index 100% rename from graphics/pokemon/pikipek/icon.png rename to graphics/pokemon/gen_7/pikipek/icon.png diff --git a/graphics/pokemon/pikipek/normal.pal b/graphics/pokemon/gen_7/pikipek/normal.pal similarity index 100% rename from graphics/pokemon/pikipek/normal.pal rename to graphics/pokemon/gen_7/pikipek/normal.pal diff --git a/graphics/pokemon/pikipek/shiny.pal b/graphics/pokemon/gen_7/pikipek/shiny.pal similarity index 100% rename from graphics/pokemon/pikipek/shiny.pal rename to graphics/pokemon/gen_7/pikipek/shiny.pal diff --git a/graphics/pokemon/poipole/back.png b/graphics/pokemon/gen_7/poipole/back.png similarity index 100% rename from graphics/pokemon/poipole/back.png rename to graphics/pokemon/gen_7/poipole/back.png diff --git a/graphics/pokemon/starmie/footprint.png b/graphics/pokemon/gen_7/poipole/footprint.png similarity index 100% rename from graphics/pokemon/starmie/footprint.png rename to graphics/pokemon/gen_7/poipole/footprint.png diff --git a/graphics/pokemon/poipole/front.png b/graphics/pokemon/gen_7/poipole/front.png similarity index 100% rename from graphics/pokemon/poipole/front.png rename to graphics/pokemon/gen_7/poipole/front.png diff --git a/graphics/pokemon/poipole/icon.png b/graphics/pokemon/gen_7/poipole/icon.png similarity index 100% rename from graphics/pokemon/poipole/icon.png rename to graphics/pokemon/gen_7/poipole/icon.png diff --git a/graphics/pokemon/poipole/normal.pal b/graphics/pokemon/gen_7/poipole/normal.pal similarity index 100% rename from graphics/pokemon/poipole/normal.pal rename to graphics/pokemon/gen_7/poipole/normal.pal diff --git a/graphics/pokemon/poipole/shiny.pal b/graphics/pokemon/gen_7/poipole/shiny.pal similarity index 100% rename from graphics/pokemon/poipole/shiny.pal rename to graphics/pokemon/gen_7/poipole/shiny.pal diff --git a/graphics/pokemon/popplio/back.png b/graphics/pokemon/gen_7/popplio/back.png similarity index 100% rename from graphics/pokemon/popplio/back.png rename to graphics/pokemon/gen_7/popplio/back.png diff --git a/graphics/pokemon/tirtouga/footprint.png b/graphics/pokemon/gen_7/popplio/footprint.png similarity index 100% rename from graphics/pokemon/tirtouga/footprint.png rename to graphics/pokemon/gen_7/popplio/footprint.png diff --git a/graphics/pokemon/popplio/front.png b/graphics/pokemon/gen_7/popplio/front.png similarity index 100% rename from graphics/pokemon/popplio/front.png rename to graphics/pokemon/gen_7/popplio/front.png diff --git a/graphics/pokemon/popplio/icon.png b/graphics/pokemon/gen_7/popplio/icon.png similarity index 100% rename from graphics/pokemon/popplio/icon.png rename to graphics/pokemon/gen_7/popplio/icon.png diff --git a/graphics/pokemon/popplio/normal.pal b/graphics/pokemon/gen_7/popplio/normal.pal similarity index 100% rename from graphics/pokemon/popplio/normal.pal rename to graphics/pokemon/gen_7/popplio/normal.pal diff --git a/graphics/pokemon/popplio/shiny.pal b/graphics/pokemon/gen_7/popplio/shiny.pal similarity index 100% rename from graphics/pokemon/popplio/shiny.pal rename to graphics/pokemon/gen_7/popplio/shiny.pal diff --git a/graphics/pokemon/primarina/back.png b/graphics/pokemon/gen_7/primarina/back.png similarity index 100% rename from graphics/pokemon/primarina/back.png rename to graphics/pokemon/gen_7/primarina/back.png diff --git a/graphics/pokemon/tornadus/footprint.png b/graphics/pokemon/gen_7/primarina/footprint.png similarity index 100% rename from graphics/pokemon/tornadus/footprint.png rename to graphics/pokemon/gen_7/primarina/footprint.png diff --git a/graphics/pokemon/primarina/front.png b/graphics/pokemon/gen_7/primarina/front.png similarity index 100% rename from graphics/pokemon/primarina/front.png rename to graphics/pokemon/gen_7/primarina/front.png diff --git a/graphics/pokemon/primarina/icon.png b/graphics/pokemon/gen_7/primarina/icon.png similarity index 100% rename from graphics/pokemon/primarina/icon.png rename to graphics/pokemon/gen_7/primarina/icon.png diff --git a/graphics/pokemon/primarina/normal.pal b/graphics/pokemon/gen_7/primarina/normal.pal similarity index 100% rename from graphics/pokemon/primarina/normal.pal rename to graphics/pokemon/gen_7/primarina/normal.pal diff --git a/graphics/pokemon/primarina/shiny.pal b/graphics/pokemon/gen_7/primarina/shiny.pal similarity index 100% rename from graphics/pokemon/primarina/shiny.pal rename to graphics/pokemon/gen_7/primarina/shiny.pal diff --git a/graphics/pokemon/pyukumuku/anim_front.png b/graphics/pokemon/gen_7/pyukumuku/anim_front.png similarity index 100% rename from graphics/pokemon/pyukumuku/anim_front.png rename to graphics/pokemon/gen_7/pyukumuku/anim_front.png diff --git a/graphics/pokemon/pyukumuku/back.png b/graphics/pokemon/gen_7/pyukumuku/back.png similarity index 100% rename from graphics/pokemon/pyukumuku/back.png rename to graphics/pokemon/gen_7/pyukumuku/back.png diff --git a/graphics/pokemon/tympole/footprint.png b/graphics/pokemon/gen_7/pyukumuku/footprint.png similarity index 100% rename from graphics/pokemon/tympole/footprint.png rename to graphics/pokemon/gen_7/pyukumuku/footprint.png diff --git a/graphics/pokemon/pyukumuku/icon.png b/graphics/pokemon/gen_7/pyukumuku/icon.png similarity index 100% rename from graphics/pokemon/pyukumuku/icon.png rename to graphics/pokemon/gen_7/pyukumuku/icon.png diff --git a/graphics/pokemon/pyukumuku/normal.pal b/graphics/pokemon/gen_7/pyukumuku/normal.pal similarity index 100% rename from graphics/pokemon/pyukumuku/normal.pal rename to graphics/pokemon/gen_7/pyukumuku/normal.pal diff --git a/graphics/pokemon/pyukumuku/shiny.pal b/graphics/pokemon/gen_7/pyukumuku/shiny.pal similarity index 100% rename from graphics/pokemon/pyukumuku/shiny.pal rename to graphics/pokemon/gen_7/pyukumuku/shiny.pal diff --git a/graphics/pokemon/ribombee/anim_front.png b/graphics/pokemon/gen_7/ribombee/anim_front.png similarity index 100% rename from graphics/pokemon/ribombee/anim_front.png rename to graphics/pokemon/gen_7/ribombee/anim_front.png diff --git a/graphics/pokemon/ribombee/back.png b/graphics/pokemon/gen_7/ribombee/back.png similarity index 100% rename from graphics/pokemon/ribombee/back.png rename to graphics/pokemon/gen_7/ribombee/back.png diff --git a/graphics/pokemon/ribombee/footprint.png b/graphics/pokemon/gen_7/ribombee/footprint.png similarity index 100% rename from graphics/pokemon/ribombee/footprint.png rename to graphics/pokemon/gen_7/ribombee/footprint.png diff --git a/graphics/pokemon/ribombee/icon.png b/graphics/pokemon/gen_7/ribombee/icon.png similarity index 100% rename from graphics/pokemon/ribombee/icon.png rename to graphics/pokemon/gen_7/ribombee/icon.png diff --git a/graphics/pokemon/ribombee/normal.pal b/graphics/pokemon/gen_7/ribombee/normal.pal similarity index 100% rename from graphics/pokemon/ribombee/normal.pal rename to graphics/pokemon/gen_7/ribombee/normal.pal diff --git a/graphics/pokemon/ribombee/shiny.pal b/graphics/pokemon/gen_7/ribombee/shiny.pal similarity index 100% rename from graphics/pokemon/ribombee/shiny.pal rename to graphics/pokemon/gen_7/ribombee/shiny.pal diff --git a/graphics/pokemon/rockruff/anim_front.png b/graphics/pokemon/gen_7/rockruff/anim_front.png similarity index 100% rename from graphics/pokemon/rockruff/anim_front.png rename to graphics/pokemon/gen_7/rockruff/anim_front.png diff --git a/graphics/pokemon/rockruff/back.png b/graphics/pokemon/gen_7/rockruff/back.png similarity index 100% rename from graphics/pokemon/rockruff/back.png rename to graphics/pokemon/gen_7/rockruff/back.png diff --git a/graphics/pokemon/rockruff/footprint.png b/graphics/pokemon/gen_7/rockruff/footprint.png similarity index 100% rename from graphics/pokemon/rockruff/footprint.png rename to graphics/pokemon/gen_7/rockruff/footprint.png diff --git a/graphics/pokemon/rockruff/icon.png b/graphics/pokemon/gen_7/rockruff/icon.png similarity index 100% rename from graphics/pokemon/rockruff/icon.png rename to graphics/pokemon/gen_7/rockruff/icon.png diff --git a/graphics/pokemon/rockruff/normal.pal b/graphics/pokemon/gen_7/rockruff/normal.pal similarity index 100% rename from graphics/pokemon/rockruff/normal.pal rename to graphics/pokemon/gen_7/rockruff/normal.pal diff --git a/graphics/pokemon/rockruff/shiny.pal b/graphics/pokemon/gen_7/rockruff/shiny.pal similarity index 100% rename from graphics/pokemon/rockruff/shiny.pal rename to graphics/pokemon/gen_7/rockruff/shiny.pal diff --git a/graphics/pokemon/rowlet/anim_front.png b/graphics/pokemon/gen_7/rowlet/anim_front.png similarity index 100% rename from graphics/pokemon/rowlet/anim_front.png rename to graphics/pokemon/gen_7/rowlet/anim_front.png diff --git a/graphics/pokemon/rowlet/back.png b/graphics/pokemon/gen_7/rowlet/back.png similarity index 100% rename from graphics/pokemon/rowlet/back.png rename to graphics/pokemon/gen_7/rowlet/back.png diff --git a/graphics/pokemon/rowlet/footprint.png b/graphics/pokemon/gen_7/rowlet/footprint.png similarity index 100% rename from graphics/pokemon/rowlet/footprint.png rename to graphics/pokemon/gen_7/rowlet/footprint.png diff --git a/graphics/pokemon/rowlet/icon.png b/graphics/pokemon/gen_7/rowlet/icon.png similarity index 100% rename from graphics/pokemon/rowlet/icon.png rename to graphics/pokemon/gen_7/rowlet/icon.png diff --git a/graphics/pokemon/rowlet/normal.pal b/graphics/pokemon/gen_7/rowlet/normal.pal similarity index 100% rename from graphics/pokemon/rowlet/normal.pal rename to graphics/pokemon/gen_7/rowlet/normal.pal diff --git a/graphics/pokemon/rowlet/shiny.pal b/graphics/pokemon/gen_7/rowlet/shiny.pal similarity index 100% rename from graphics/pokemon/rowlet/shiny.pal rename to graphics/pokemon/gen_7/rowlet/shiny.pal diff --git a/graphics/pokemon/salandit/anim_front.png b/graphics/pokemon/gen_7/salandit/anim_front.png similarity index 100% rename from graphics/pokemon/salandit/anim_front.png rename to graphics/pokemon/gen_7/salandit/anim_front.png diff --git a/graphics/pokemon/salandit/back.png b/graphics/pokemon/gen_7/salandit/back.png similarity index 100% rename from graphics/pokemon/salandit/back.png rename to graphics/pokemon/gen_7/salandit/back.png diff --git a/graphics/pokemon/salandit/footprint.png b/graphics/pokemon/gen_7/salandit/footprint.png similarity index 100% rename from graphics/pokemon/salandit/footprint.png rename to graphics/pokemon/gen_7/salandit/footprint.png diff --git a/graphics/pokemon/salandit/icon.png b/graphics/pokemon/gen_7/salandit/icon.png similarity index 100% rename from graphics/pokemon/salandit/icon.png rename to graphics/pokemon/gen_7/salandit/icon.png diff --git a/graphics/pokemon/salandit/normal.pal b/graphics/pokemon/gen_7/salandit/normal.pal similarity index 100% rename from graphics/pokemon/salandit/normal.pal rename to graphics/pokemon/gen_7/salandit/normal.pal diff --git a/graphics/pokemon/salandit/shiny.pal b/graphics/pokemon/gen_7/salandit/shiny.pal similarity index 100% rename from graphics/pokemon/salandit/shiny.pal rename to graphics/pokemon/gen_7/salandit/shiny.pal diff --git a/graphics/pokemon/salazzle/anim_front.png b/graphics/pokemon/gen_7/salazzle/anim_front.png similarity index 100% rename from graphics/pokemon/salazzle/anim_front.png rename to graphics/pokemon/gen_7/salazzle/anim_front.png diff --git a/graphics/pokemon/salazzle/back.png b/graphics/pokemon/gen_7/salazzle/back.png similarity index 100% rename from graphics/pokemon/salazzle/back.png rename to graphics/pokemon/gen_7/salazzle/back.png diff --git a/graphics/pokemon/salazzle/footprint.png b/graphics/pokemon/gen_7/salazzle/footprint.png similarity index 100% rename from graphics/pokemon/salazzle/footprint.png rename to graphics/pokemon/gen_7/salazzle/footprint.png diff --git a/graphics/pokemon/salazzle/icon.png b/graphics/pokemon/gen_7/salazzle/icon.png similarity index 100% rename from graphics/pokemon/salazzle/icon.png rename to graphics/pokemon/gen_7/salazzle/icon.png diff --git a/graphics/pokemon/salazzle/normal.pal b/graphics/pokemon/gen_7/salazzle/normal.pal similarity index 100% rename from graphics/pokemon/salazzle/normal.pal rename to graphics/pokemon/gen_7/salazzle/normal.pal diff --git a/graphics/pokemon/salazzle/shiny.pal b/graphics/pokemon/gen_7/salazzle/shiny.pal similarity index 100% rename from graphics/pokemon/salazzle/shiny.pal rename to graphics/pokemon/gen_7/salazzle/shiny.pal diff --git a/graphics/pokemon/sandygast/back.png b/graphics/pokemon/gen_7/sandygast/back.png similarity index 100% rename from graphics/pokemon/sandygast/back.png rename to graphics/pokemon/gen_7/sandygast/back.png diff --git a/graphics/pokemon/tynamo/footprint.png b/graphics/pokemon/gen_7/sandygast/footprint.png similarity index 100% rename from graphics/pokemon/tynamo/footprint.png rename to graphics/pokemon/gen_7/sandygast/footprint.png diff --git a/graphics/pokemon/sandygast/front.png b/graphics/pokemon/gen_7/sandygast/front.png similarity index 100% rename from graphics/pokemon/sandygast/front.png rename to graphics/pokemon/gen_7/sandygast/front.png diff --git a/graphics/pokemon/sandygast/icon.png b/graphics/pokemon/gen_7/sandygast/icon.png similarity index 100% rename from graphics/pokemon/sandygast/icon.png rename to graphics/pokemon/gen_7/sandygast/icon.png diff --git a/graphics/pokemon/sandygast/normal.pal b/graphics/pokemon/gen_7/sandygast/normal.pal similarity index 100% rename from graphics/pokemon/sandygast/normal.pal rename to graphics/pokemon/gen_7/sandygast/normal.pal diff --git a/graphics/pokemon/sandygast/shiny.pal b/graphics/pokemon/gen_7/sandygast/shiny.pal similarity index 100% rename from graphics/pokemon/sandygast/shiny.pal rename to graphics/pokemon/gen_7/sandygast/shiny.pal diff --git a/graphics/pokemon/shiinotic/back.png b/graphics/pokemon/gen_7/shiinotic/back.png similarity index 100% rename from graphics/pokemon/shiinotic/back.png rename to graphics/pokemon/gen_7/shiinotic/back.png diff --git a/graphics/pokemon/hatenna/footprint.png b/graphics/pokemon/gen_7/shiinotic/footprint.png similarity index 100% rename from graphics/pokemon/hatenna/footprint.png rename to graphics/pokemon/gen_7/shiinotic/footprint.png diff --git a/graphics/pokemon/shiinotic/front.png b/graphics/pokemon/gen_7/shiinotic/front.png similarity index 100% rename from graphics/pokemon/shiinotic/front.png rename to graphics/pokemon/gen_7/shiinotic/front.png diff --git a/graphics/pokemon/shiinotic/icon.png b/graphics/pokemon/gen_7/shiinotic/icon.png similarity index 100% rename from graphics/pokemon/shiinotic/icon.png rename to graphics/pokemon/gen_7/shiinotic/icon.png diff --git a/graphics/pokemon/shiinotic/normal.pal b/graphics/pokemon/gen_7/shiinotic/normal.pal similarity index 100% rename from graphics/pokemon/shiinotic/normal.pal rename to graphics/pokemon/gen_7/shiinotic/normal.pal diff --git a/graphics/pokemon/shiinotic/shiny.pal b/graphics/pokemon/gen_7/shiinotic/shiny.pal similarity index 100% rename from graphics/pokemon/shiinotic/shiny.pal rename to graphics/pokemon/gen_7/shiinotic/shiny.pal diff --git a/graphics/pokemon/silvally/back.png b/graphics/pokemon/gen_7/silvally/back.png similarity index 100% rename from graphics/pokemon/silvally/back.png rename to graphics/pokemon/gen_7/silvally/back.png diff --git a/graphics/pokemon/silvally/bug/normal.pal b/graphics/pokemon/gen_7/silvally/bug/normal.pal similarity index 100% rename from graphics/pokemon/silvally/bug/normal.pal rename to graphics/pokemon/gen_7/silvally/bug/normal.pal diff --git a/graphics/pokemon/silvally/bug/shiny.pal b/graphics/pokemon/gen_7/silvally/bug/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/bug/shiny.pal rename to graphics/pokemon/gen_7/silvally/bug/shiny.pal diff --git a/graphics/pokemon/silvally/dark/normal.pal b/graphics/pokemon/gen_7/silvally/dark/normal.pal similarity index 100% rename from graphics/pokemon/silvally/dark/normal.pal rename to graphics/pokemon/gen_7/silvally/dark/normal.pal diff --git a/graphics/pokemon/silvally/dark/shiny.pal b/graphics/pokemon/gen_7/silvally/dark/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/dark/shiny.pal rename to graphics/pokemon/gen_7/silvally/dark/shiny.pal diff --git a/graphics/pokemon/silvally/dragon/normal.pal b/graphics/pokemon/gen_7/silvally/dragon/normal.pal similarity index 100% rename from graphics/pokemon/silvally/dragon/normal.pal rename to graphics/pokemon/gen_7/silvally/dragon/normal.pal diff --git a/graphics/pokemon/silvally/dragon/shiny.pal b/graphics/pokemon/gen_7/silvally/dragon/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/dragon/shiny.pal rename to graphics/pokemon/gen_7/silvally/dragon/shiny.pal diff --git a/graphics/pokemon/silvally/electric/normal.pal b/graphics/pokemon/gen_7/silvally/electric/normal.pal similarity index 100% rename from graphics/pokemon/silvally/electric/normal.pal rename to graphics/pokemon/gen_7/silvally/electric/normal.pal diff --git a/graphics/pokemon/silvally/electric/shiny.pal b/graphics/pokemon/gen_7/silvally/electric/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/electric/shiny.pal rename to graphics/pokemon/gen_7/silvally/electric/shiny.pal diff --git a/graphics/pokemon/silvally/fairy/normal.pal b/graphics/pokemon/gen_7/silvally/fairy/normal.pal similarity index 100% rename from graphics/pokemon/silvally/fairy/normal.pal rename to graphics/pokemon/gen_7/silvally/fairy/normal.pal diff --git a/graphics/pokemon/silvally/fairy/shiny.pal b/graphics/pokemon/gen_7/silvally/fairy/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/fairy/shiny.pal rename to graphics/pokemon/gen_7/silvally/fairy/shiny.pal diff --git a/graphics/pokemon/silvally/fighting/normal.pal b/graphics/pokemon/gen_7/silvally/fighting/normal.pal similarity index 100% rename from graphics/pokemon/silvally/fighting/normal.pal rename to graphics/pokemon/gen_7/silvally/fighting/normal.pal diff --git a/graphics/pokemon/silvally/fighting/shiny.pal b/graphics/pokemon/gen_7/silvally/fighting/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/fighting/shiny.pal rename to graphics/pokemon/gen_7/silvally/fighting/shiny.pal diff --git a/graphics/pokemon/silvally/fire/normal.pal b/graphics/pokemon/gen_7/silvally/fire/normal.pal similarity index 100% rename from graphics/pokemon/silvally/fire/normal.pal rename to graphics/pokemon/gen_7/silvally/fire/normal.pal diff --git a/graphics/pokemon/silvally/fire/shiny.pal b/graphics/pokemon/gen_7/silvally/fire/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/fire/shiny.pal rename to graphics/pokemon/gen_7/silvally/fire/shiny.pal diff --git a/graphics/pokemon/silvally/flying/normal.pal b/graphics/pokemon/gen_7/silvally/flying/normal.pal similarity index 100% rename from graphics/pokemon/silvally/flying/normal.pal rename to graphics/pokemon/gen_7/silvally/flying/normal.pal diff --git a/graphics/pokemon/silvally/flying/shiny.pal b/graphics/pokemon/gen_7/silvally/flying/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/flying/shiny.pal rename to graphics/pokemon/gen_7/silvally/flying/shiny.pal diff --git a/graphics/pokemon/silvally/footprint.png b/graphics/pokemon/gen_7/silvally/footprint.png similarity index 100% rename from graphics/pokemon/silvally/footprint.png rename to graphics/pokemon/gen_7/silvally/footprint.png diff --git a/graphics/pokemon/silvally/front.png b/graphics/pokemon/gen_7/silvally/front.png similarity index 100% rename from graphics/pokemon/silvally/front.png rename to graphics/pokemon/gen_7/silvally/front.png diff --git a/graphics/pokemon/silvally/ghost/normal.pal b/graphics/pokemon/gen_7/silvally/ghost/normal.pal similarity index 100% rename from graphics/pokemon/silvally/ghost/normal.pal rename to graphics/pokemon/gen_7/silvally/ghost/normal.pal diff --git a/graphics/pokemon/silvally/ghost/shiny.pal b/graphics/pokemon/gen_7/silvally/ghost/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/ghost/shiny.pal rename to graphics/pokemon/gen_7/silvally/ghost/shiny.pal diff --git a/graphics/pokemon/silvally/grass/normal.pal b/graphics/pokemon/gen_7/silvally/grass/normal.pal similarity index 100% rename from graphics/pokemon/silvally/grass/normal.pal rename to graphics/pokemon/gen_7/silvally/grass/normal.pal diff --git a/graphics/pokemon/silvally/grass/shiny.pal b/graphics/pokemon/gen_7/silvally/grass/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/grass/shiny.pal rename to graphics/pokemon/gen_7/silvally/grass/shiny.pal diff --git a/graphics/pokemon/silvally/ground/normal.pal b/graphics/pokemon/gen_7/silvally/ground/normal.pal similarity index 100% rename from graphics/pokemon/silvally/ground/normal.pal rename to graphics/pokemon/gen_7/silvally/ground/normal.pal diff --git a/graphics/pokemon/silvally/ground/shiny.pal b/graphics/pokemon/gen_7/silvally/ground/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/ground/shiny.pal rename to graphics/pokemon/gen_7/silvally/ground/shiny.pal diff --git a/graphics/pokemon/silvally/ice/normal.pal b/graphics/pokemon/gen_7/silvally/ice/normal.pal similarity index 100% rename from graphics/pokemon/silvally/ice/normal.pal rename to graphics/pokemon/gen_7/silvally/ice/normal.pal diff --git a/graphics/pokemon/silvally/ice/shiny.pal b/graphics/pokemon/gen_7/silvally/ice/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/ice/shiny.pal rename to graphics/pokemon/gen_7/silvally/ice/shiny.pal diff --git a/graphics/pokemon/silvally/icon.png b/graphics/pokemon/gen_7/silvally/icon.png similarity index 100% rename from graphics/pokemon/silvally/icon.png rename to graphics/pokemon/gen_7/silvally/icon.png diff --git a/graphics/pokemon/silvally/normal.pal b/graphics/pokemon/gen_7/silvally/normal.pal similarity index 100% rename from graphics/pokemon/silvally/normal.pal rename to graphics/pokemon/gen_7/silvally/normal.pal diff --git a/graphics/pokemon/silvally/poison/normal.pal b/graphics/pokemon/gen_7/silvally/poison/normal.pal similarity index 100% rename from graphics/pokemon/silvally/poison/normal.pal rename to graphics/pokemon/gen_7/silvally/poison/normal.pal diff --git a/graphics/pokemon/silvally/poison/shiny.pal b/graphics/pokemon/gen_7/silvally/poison/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/poison/shiny.pal rename to graphics/pokemon/gen_7/silvally/poison/shiny.pal diff --git a/graphics/pokemon/silvally/psychic/normal.pal b/graphics/pokemon/gen_7/silvally/psychic/normal.pal similarity index 100% rename from graphics/pokemon/silvally/psychic/normal.pal rename to graphics/pokemon/gen_7/silvally/psychic/normal.pal diff --git a/graphics/pokemon/silvally/psychic/shiny.pal b/graphics/pokemon/gen_7/silvally/psychic/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/psychic/shiny.pal rename to graphics/pokemon/gen_7/silvally/psychic/shiny.pal diff --git a/graphics/pokemon/silvally/rock/normal.pal b/graphics/pokemon/gen_7/silvally/rock/normal.pal similarity index 100% rename from graphics/pokemon/silvally/rock/normal.pal rename to graphics/pokemon/gen_7/silvally/rock/normal.pal diff --git a/graphics/pokemon/silvally/rock/shiny.pal b/graphics/pokemon/gen_7/silvally/rock/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/rock/shiny.pal rename to graphics/pokemon/gen_7/silvally/rock/shiny.pal diff --git a/graphics/pokemon/silvally/shiny.pal b/graphics/pokemon/gen_7/silvally/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/shiny.pal rename to graphics/pokemon/gen_7/silvally/shiny.pal diff --git a/graphics/pokemon/silvally/steel/normal.pal b/graphics/pokemon/gen_7/silvally/steel/normal.pal similarity index 100% rename from graphics/pokemon/silvally/steel/normal.pal rename to graphics/pokemon/gen_7/silvally/steel/normal.pal diff --git a/graphics/pokemon/silvally/steel/shiny.pal b/graphics/pokemon/gen_7/silvally/steel/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/steel/shiny.pal rename to graphics/pokemon/gen_7/silvally/steel/shiny.pal diff --git a/graphics/pokemon/silvally/water/normal.pal b/graphics/pokemon/gen_7/silvally/water/normal.pal similarity index 100% rename from graphics/pokemon/silvally/water/normal.pal rename to graphics/pokemon/gen_7/silvally/water/normal.pal diff --git a/graphics/pokemon/silvally/water/shiny.pal b/graphics/pokemon/gen_7/silvally/water/shiny.pal similarity index 100% rename from graphics/pokemon/silvally/water/shiny.pal rename to graphics/pokemon/gen_7/silvally/water/shiny.pal diff --git a/graphics/pokemon/solgaleo/back.png b/graphics/pokemon/gen_7/solgaleo/back.png similarity index 100% rename from graphics/pokemon/solgaleo/back.png rename to graphics/pokemon/gen_7/solgaleo/back.png diff --git a/graphics/pokemon/solgaleo/footprint.png b/graphics/pokemon/gen_7/solgaleo/footprint.png similarity index 100% rename from graphics/pokemon/solgaleo/footprint.png rename to graphics/pokemon/gen_7/solgaleo/footprint.png diff --git a/graphics/pokemon/solgaleo/front.png b/graphics/pokemon/gen_7/solgaleo/front.png similarity index 100% rename from graphics/pokemon/solgaleo/front.png rename to graphics/pokemon/gen_7/solgaleo/front.png diff --git a/graphics/pokemon/solgaleo/icon.png b/graphics/pokemon/gen_7/solgaleo/icon.png similarity index 100% rename from graphics/pokemon/solgaleo/icon.png rename to graphics/pokemon/gen_7/solgaleo/icon.png diff --git a/graphics/pokemon/solgaleo/normal.pal b/graphics/pokemon/gen_7/solgaleo/normal.pal similarity index 100% rename from graphics/pokemon/solgaleo/normal.pal rename to graphics/pokemon/gen_7/solgaleo/normal.pal diff --git a/graphics/pokemon/solgaleo/shiny.pal b/graphics/pokemon/gen_7/solgaleo/shiny.pal similarity index 100% rename from graphics/pokemon/solgaleo/shiny.pal rename to graphics/pokemon/gen_7/solgaleo/shiny.pal diff --git a/graphics/pokemon/stakataka/back.png b/graphics/pokemon/gen_7/stakataka/back.png similarity index 100% rename from graphics/pokemon/stakataka/back.png rename to graphics/pokemon/gen_7/stakataka/back.png diff --git a/graphics/pokemon/unown/footprint.png b/graphics/pokemon/gen_7/stakataka/footprint.png similarity index 100% rename from graphics/pokemon/unown/footprint.png rename to graphics/pokemon/gen_7/stakataka/footprint.png diff --git a/graphics/pokemon/stakataka/front.png b/graphics/pokemon/gen_7/stakataka/front.png similarity index 100% rename from graphics/pokemon/stakataka/front.png rename to graphics/pokemon/gen_7/stakataka/front.png diff --git a/graphics/pokemon/stakataka/icon.png b/graphics/pokemon/gen_7/stakataka/icon.png similarity index 100% rename from graphics/pokemon/stakataka/icon.png rename to graphics/pokemon/gen_7/stakataka/icon.png diff --git a/graphics/pokemon/stakataka/normal.pal b/graphics/pokemon/gen_7/stakataka/normal.pal similarity index 100% rename from graphics/pokemon/stakataka/normal.pal rename to graphics/pokemon/gen_7/stakataka/normal.pal diff --git a/graphics/pokemon/stakataka/shiny.pal b/graphics/pokemon/gen_7/stakataka/shiny.pal similarity index 100% rename from graphics/pokemon/stakataka/shiny.pal rename to graphics/pokemon/gen_7/stakataka/shiny.pal diff --git a/graphics/pokemon/steenee/back.png b/graphics/pokemon/gen_7/steenee/back.png similarity index 100% rename from graphics/pokemon/steenee/back.png rename to graphics/pokemon/gen_7/steenee/back.png diff --git a/graphics/pokemon/staryu/footprint.png b/graphics/pokemon/gen_7/steenee/footprint.png similarity index 100% rename from graphics/pokemon/staryu/footprint.png rename to graphics/pokemon/gen_7/steenee/footprint.png diff --git a/graphics/pokemon/steenee/front.png b/graphics/pokemon/gen_7/steenee/front.png similarity index 100% rename from graphics/pokemon/steenee/front.png rename to graphics/pokemon/gen_7/steenee/front.png diff --git a/graphics/pokemon/steenee/icon.png b/graphics/pokemon/gen_7/steenee/icon.png similarity index 100% rename from graphics/pokemon/steenee/icon.png rename to graphics/pokemon/gen_7/steenee/icon.png diff --git a/graphics/pokemon/steenee/normal.pal b/graphics/pokemon/gen_7/steenee/normal.pal similarity index 100% rename from graphics/pokemon/steenee/normal.pal rename to graphics/pokemon/gen_7/steenee/normal.pal diff --git a/graphics/pokemon/steenee/shiny.pal b/graphics/pokemon/gen_7/steenee/shiny.pal similarity index 100% rename from graphics/pokemon/steenee/shiny.pal rename to graphics/pokemon/gen_7/steenee/shiny.pal diff --git a/graphics/pokemon/stufful/anim_front.png b/graphics/pokemon/gen_7/stufful/anim_front.png similarity index 100% rename from graphics/pokemon/stufful/anim_front.png rename to graphics/pokemon/gen_7/stufful/anim_front.png diff --git a/graphics/pokemon/stufful/back.png b/graphics/pokemon/gen_7/stufful/back.png similarity index 100% rename from graphics/pokemon/stufful/back.png rename to graphics/pokemon/gen_7/stufful/back.png diff --git a/graphics/pokemon/stufful/footprint.png b/graphics/pokemon/gen_7/stufful/footprint.png similarity index 100% rename from graphics/pokemon/stufful/footprint.png rename to graphics/pokemon/gen_7/stufful/footprint.png diff --git a/graphics/pokemon/stufful/icon.png b/graphics/pokemon/gen_7/stufful/icon.png similarity index 100% rename from graphics/pokemon/stufful/icon.png rename to graphics/pokemon/gen_7/stufful/icon.png diff --git a/graphics/pokemon/stufful/normal.pal b/graphics/pokemon/gen_7/stufful/normal.pal similarity index 100% rename from graphics/pokemon/stufful/normal.pal rename to graphics/pokemon/gen_7/stufful/normal.pal diff --git a/graphics/pokemon/stufful/shiny.pal b/graphics/pokemon/gen_7/stufful/shiny.pal similarity index 100% rename from graphics/pokemon/stufful/shiny.pal rename to graphics/pokemon/gen_7/stufful/shiny.pal diff --git a/graphics/pokemon/tapu_bulu/anim_front.png b/graphics/pokemon/gen_7/tapu_bulu/anim_front.png similarity index 100% rename from graphics/pokemon/tapu_bulu/anim_front.png rename to graphics/pokemon/gen_7/tapu_bulu/anim_front.png diff --git a/graphics/pokemon/tapu_bulu/back.png b/graphics/pokemon/gen_7/tapu_bulu/back.png similarity index 100% rename from graphics/pokemon/tapu_bulu/back.png rename to graphics/pokemon/gen_7/tapu_bulu/back.png diff --git a/graphics/pokemon/vanillish/footprint.png b/graphics/pokemon/gen_7/tapu_bulu/footprint.png similarity index 100% rename from graphics/pokemon/vanillish/footprint.png rename to graphics/pokemon/gen_7/tapu_bulu/footprint.png diff --git a/graphics/pokemon/tapu_bulu/icon.png b/graphics/pokemon/gen_7/tapu_bulu/icon.png similarity index 100% rename from graphics/pokemon/tapu_bulu/icon.png rename to graphics/pokemon/gen_7/tapu_bulu/icon.png diff --git a/graphics/pokemon/tapu_bulu/normal.pal b/graphics/pokemon/gen_7/tapu_bulu/normal.pal similarity index 100% rename from graphics/pokemon/tapu_bulu/normal.pal rename to graphics/pokemon/gen_7/tapu_bulu/normal.pal diff --git a/graphics/pokemon/tapu_bulu/shiny.pal b/graphics/pokemon/gen_7/tapu_bulu/shiny.pal similarity index 100% rename from graphics/pokemon/tapu_bulu/shiny.pal rename to graphics/pokemon/gen_7/tapu_bulu/shiny.pal diff --git a/graphics/pokemon/tapu_fini/anim_front.png b/graphics/pokemon/gen_7/tapu_fini/anim_front.png similarity index 100% rename from graphics/pokemon/tapu_fini/anim_front.png rename to graphics/pokemon/gen_7/tapu_fini/anim_front.png diff --git a/graphics/pokemon/tapu_fini/back.png b/graphics/pokemon/gen_7/tapu_fini/back.png similarity index 100% rename from graphics/pokemon/tapu_fini/back.png rename to graphics/pokemon/gen_7/tapu_fini/back.png diff --git a/graphics/pokemon/vanillite/footprint.png b/graphics/pokemon/gen_7/tapu_fini/footprint.png similarity index 100% rename from graphics/pokemon/vanillite/footprint.png rename to graphics/pokemon/gen_7/tapu_fini/footprint.png diff --git a/graphics/pokemon/tapu_fini/icon.png b/graphics/pokemon/gen_7/tapu_fini/icon.png similarity index 100% rename from graphics/pokemon/tapu_fini/icon.png rename to graphics/pokemon/gen_7/tapu_fini/icon.png diff --git a/graphics/pokemon/tapu_fini/normal.pal b/graphics/pokemon/gen_7/tapu_fini/normal.pal similarity index 100% rename from graphics/pokemon/tapu_fini/normal.pal rename to graphics/pokemon/gen_7/tapu_fini/normal.pal diff --git a/graphics/pokemon/tapu_fini/shiny.pal b/graphics/pokemon/gen_7/tapu_fini/shiny.pal similarity index 100% rename from graphics/pokemon/tapu_fini/shiny.pal rename to graphics/pokemon/gen_7/tapu_fini/shiny.pal diff --git a/graphics/pokemon/tapu_koko/anim_front.png b/graphics/pokemon/gen_7/tapu_koko/anim_front.png similarity index 100% rename from graphics/pokemon/tapu_koko/anim_front.png rename to graphics/pokemon/gen_7/tapu_koko/anim_front.png diff --git a/graphics/pokemon/tapu_koko/back.png b/graphics/pokemon/gen_7/tapu_koko/back.png similarity index 100% rename from graphics/pokemon/tapu_koko/back.png rename to graphics/pokemon/gen_7/tapu_koko/back.png diff --git a/graphics/pokemon/vanilluxe/footprint.png b/graphics/pokemon/gen_7/tapu_koko/footprint.png similarity index 100% rename from graphics/pokemon/vanilluxe/footprint.png rename to graphics/pokemon/gen_7/tapu_koko/footprint.png diff --git a/graphics/pokemon/tapu_koko/icon.png b/graphics/pokemon/gen_7/tapu_koko/icon.png similarity index 100% rename from graphics/pokemon/tapu_koko/icon.png rename to graphics/pokemon/gen_7/tapu_koko/icon.png diff --git a/graphics/pokemon/tapu_koko/normal.pal b/graphics/pokemon/gen_7/tapu_koko/normal.pal similarity index 100% rename from graphics/pokemon/tapu_koko/normal.pal rename to graphics/pokemon/gen_7/tapu_koko/normal.pal diff --git a/graphics/pokemon/tapu_koko/shiny.pal b/graphics/pokemon/gen_7/tapu_koko/shiny.pal similarity index 100% rename from graphics/pokemon/tapu_koko/shiny.pal rename to graphics/pokemon/gen_7/tapu_koko/shiny.pal diff --git a/graphics/pokemon/tapu_lele/anim_front.png b/graphics/pokemon/gen_7/tapu_lele/anim_front.png similarity index 100% rename from graphics/pokemon/tapu_lele/anim_front.png rename to graphics/pokemon/gen_7/tapu_lele/anim_front.png diff --git a/graphics/pokemon/tapu_lele/back.png b/graphics/pokemon/gen_7/tapu_lele/back.png similarity index 100% rename from graphics/pokemon/tapu_lele/back.png rename to graphics/pokemon/gen_7/tapu_lele/back.png diff --git a/graphics/pokemon/vespiquen/footprint.png b/graphics/pokemon/gen_7/tapu_lele/footprint.png similarity index 100% rename from graphics/pokemon/vespiquen/footprint.png rename to graphics/pokemon/gen_7/tapu_lele/footprint.png diff --git a/graphics/pokemon/tapu_lele/icon.png b/graphics/pokemon/gen_7/tapu_lele/icon.png similarity index 100% rename from graphics/pokemon/tapu_lele/icon.png rename to graphics/pokemon/gen_7/tapu_lele/icon.png diff --git a/graphics/pokemon/tapu_lele/normal.pal b/graphics/pokemon/gen_7/tapu_lele/normal.pal similarity index 100% rename from graphics/pokemon/tapu_lele/normal.pal rename to graphics/pokemon/gen_7/tapu_lele/normal.pal diff --git a/graphics/pokemon/tapu_lele/shiny.pal b/graphics/pokemon/gen_7/tapu_lele/shiny.pal similarity index 100% rename from graphics/pokemon/tapu_lele/shiny.pal rename to graphics/pokemon/gen_7/tapu_lele/shiny.pal diff --git a/graphics/pokemon/togedemaru/anim_front.png b/graphics/pokemon/gen_7/togedemaru/anim_front.png similarity index 100% rename from graphics/pokemon/togedemaru/anim_front.png rename to graphics/pokemon/gen_7/togedemaru/anim_front.png diff --git a/graphics/pokemon/togedemaru/back.png b/graphics/pokemon/gen_7/togedemaru/back.png similarity index 100% rename from graphics/pokemon/togedemaru/back.png rename to graphics/pokemon/gen_7/togedemaru/back.png diff --git a/graphics/pokemon/impidimp/footprint.png b/graphics/pokemon/gen_7/togedemaru/footprint.png similarity index 100% rename from graphics/pokemon/impidimp/footprint.png rename to graphics/pokemon/gen_7/togedemaru/footprint.png diff --git a/graphics/pokemon/togedemaru/icon.png b/graphics/pokemon/gen_7/togedemaru/icon.png similarity index 100% rename from graphics/pokemon/togedemaru/icon.png rename to graphics/pokemon/gen_7/togedemaru/icon.png diff --git a/graphics/pokemon/togedemaru/normal.pal b/graphics/pokemon/gen_7/togedemaru/normal.pal similarity index 100% rename from graphics/pokemon/togedemaru/normal.pal rename to graphics/pokemon/gen_7/togedemaru/normal.pal diff --git a/graphics/pokemon/togedemaru/shiny.pal b/graphics/pokemon/gen_7/togedemaru/shiny.pal similarity index 100% rename from graphics/pokemon/togedemaru/shiny.pal rename to graphics/pokemon/gen_7/togedemaru/shiny.pal diff --git a/graphics/pokemon/torracat/back.png b/graphics/pokemon/gen_7/torracat/back.png similarity index 100% rename from graphics/pokemon/torracat/back.png rename to graphics/pokemon/gen_7/torracat/back.png diff --git a/graphics/pokemon/torracat/footprint.png b/graphics/pokemon/gen_7/torracat/footprint.png similarity index 100% rename from graphics/pokemon/torracat/footprint.png rename to graphics/pokemon/gen_7/torracat/footprint.png diff --git a/graphics/pokemon/torracat/front.png b/graphics/pokemon/gen_7/torracat/front.png similarity index 100% rename from graphics/pokemon/torracat/front.png rename to graphics/pokemon/gen_7/torracat/front.png diff --git a/graphics/pokemon/torracat/icon.png b/graphics/pokemon/gen_7/torracat/icon.png similarity index 100% rename from graphics/pokemon/torracat/icon.png rename to graphics/pokemon/gen_7/torracat/icon.png diff --git a/graphics/pokemon/torracat/normal.pal b/graphics/pokemon/gen_7/torracat/normal.pal similarity index 100% rename from graphics/pokemon/torracat/normal.pal rename to graphics/pokemon/gen_7/torracat/normal.pal diff --git a/graphics/pokemon/torracat/shiny.pal b/graphics/pokemon/gen_7/torracat/shiny.pal similarity index 100% rename from graphics/pokemon/torracat/shiny.pal rename to graphics/pokemon/gen_7/torracat/shiny.pal diff --git a/graphics/pokemon/toucannon/anim_front.png b/graphics/pokemon/gen_7/toucannon/anim_front.png similarity index 100% rename from graphics/pokemon/toucannon/anim_front.png rename to graphics/pokemon/gen_7/toucannon/anim_front.png diff --git a/graphics/pokemon/toucannon/back.png b/graphics/pokemon/gen_7/toucannon/back.png similarity index 100% rename from graphics/pokemon/toucannon/back.png rename to graphics/pokemon/gen_7/toucannon/back.png diff --git a/graphics/pokemon/toucannon/footprint.png b/graphics/pokemon/gen_7/toucannon/footprint.png similarity index 100% rename from graphics/pokemon/toucannon/footprint.png rename to graphics/pokemon/gen_7/toucannon/footprint.png diff --git a/graphics/pokemon/toucannon/icon.png b/graphics/pokemon/gen_7/toucannon/icon.png similarity index 100% rename from graphics/pokemon/toucannon/icon.png rename to graphics/pokemon/gen_7/toucannon/icon.png diff --git a/graphics/pokemon/toucannon/normal.pal b/graphics/pokemon/gen_7/toucannon/normal.pal similarity index 100% rename from graphics/pokemon/toucannon/normal.pal rename to graphics/pokemon/gen_7/toucannon/normal.pal diff --git a/graphics/pokemon/toucannon/shiny.pal b/graphics/pokemon/gen_7/toucannon/shiny.pal similarity index 100% rename from graphics/pokemon/toucannon/shiny.pal rename to graphics/pokemon/gen_7/toucannon/shiny.pal diff --git a/graphics/pokemon/toxapex/back.png b/graphics/pokemon/gen_7/toxapex/back.png similarity index 100% rename from graphics/pokemon/toxapex/back.png rename to graphics/pokemon/gen_7/toxapex/back.png diff --git a/graphics/pokemon/toxapex/footprint.png b/graphics/pokemon/gen_7/toxapex/footprint.png similarity index 100% rename from graphics/pokemon/toxapex/footprint.png rename to graphics/pokemon/gen_7/toxapex/footprint.png diff --git a/graphics/pokemon/toxapex/front.png b/graphics/pokemon/gen_7/toxapex/front.png similarity index 100% rename from graphics/pokemon/toxapex/front.png rename to graphics/pokemon/gen_7/toxapex/front.png diff --git a/graphics/pokemon/toxapex/icon.png b/graphics/pokemon/gen_7/toxapex/icon.png similarity index 100% rename from graphics/pokemon/toxapex/icon.png rename to graphics/pokemon/gen_7/toxapex/icon.png diff --git a/graphics/pokemon/toxapex/normal.pal b/graphics/pokemon/gen_7/toxapex/normal.pal similarity index 100% rename from graphics/pokemon/toxapex/normal.pal rename to graphics/pokemon/gen_7/toxapex/normal.pal diff --git a/graphics/pokemon/toxapex/shiny.pal b/graphics/pokemon/gen_7/toxapex/shiny.pal similarity index 100% rename from graphics/pokemon/toxapex/shiny.pal rename to graphics/pokemon/gen_7/toxapex/shiny.pal diff --git a/graphics/pokemon/trumbeak/anim_front.png b/graphics/pokemon/gen_7/trumbeak/anim_front.png similarity index 100% rename from graphics/pokemon/trumbeak/anim_front.png rename to graphics/pokemon/gen_7/trumbeak/anim_front.png diff --git a/graphics/pokemon/trumbeak/back.png b/graphics/pokemon/gen_7/trumbeak/back.png similarity index 100% rename from graphics/pokemon/trumbeak/back.png rename to graphics/pokemon/gen_7/trumbeak/back.png diff --git a/graphics/pokemon/trumbeak/footprint.png b/graphics/pokemon/gen_7/trumbeak/footprint.png similarity index 100% rename from graphics/pokemon/trumbeak/footprint.png rename to graphics/pokemon/gen_7/trumbeak/footprint.png diff --git a/graphics/pokemon/trumbeak/icon.png b/graphics/pokemon/gen_7/trumbeak/icon.png similarity index 100% rename from graphics/pokemon/trumbeak/icon.png rename to graphics/pokemon/gen_7/trumbeak/icon.png diff --git a/graphics/pokemon/trumbeak/normal.pal b/graphics/pokemon/gen_7/trumbeak/normal.pal similarity index 100% rename from graphics/pokemon/trumbeak/normal.pal rename to graphics/pokemon/gen_7/trumbeak/normal.pal diff --git a/graphics/pokemon/trumbeak/shiny.pal b/graphics/pokemon/gen_7/trumbeak/shiny.pal similarity index 100% rename from graphics/pokemon/trumbeak/shiny.pal rename to graphics/pokemon/gen_7/trumbeak/shiny.pal diff --git a/graphics/pokemon/tsareena/back.png b/graphics/pokemon/gen_7/tsareena/back.png similarity index 100% rename from graphics/pokemon/tsareena/back.png rename to graphics/pokemon/gen_7/tsareena/back.png diff --git a/graphics/pokemon/steenee/footprint.png b/graphics/pokemon/gen_7/tsareena/footprint.png similarity index 100% rename from graphics/pokemon/steenee/footprint.png rename to graphics/pokemon/gen_7/tsareena/footprint.png diff --git a/graphics/pokemon/tsareena/front.png b/graphics/pokemon/gen_7/tsareena/front.png similarity index 100% rename from graphics/pokemon/tsareena/front.png rename to graphics/pokemon/gen_7/tsareena/front.png diff --git a/graphics/pokemon/tsareena/icon.png b/graphics/pokemon/gen_7/tsareena/icon.png similarity index 100% rename from graphics/pokemon/tsareena/icon.png rename to graphics/pokemon/gen_7/tsareena/icon.png diff --git a/graphics/pokemon/tsareena/normal.pal b/graphics/pokemon/gen_7/tsareena/normal.pal similarity index 100% rename from graphics/pokemon/tsareena/normal.pal rename to graphics/pokemon/gen_7/tsareena/normal.pal diff --git a/graphics/pokemon/tsareena/shiny.pal b/graphics/pokemon/gen_7/tsareena/shiny.pal similarity index 100% rename from graphics/pokemon/tsareena/shiny.pal rename to graphics/pokemon/gen_7/tsareena/shiny.pal diff --git a/graphics/pokemon/turtonator/anim_front.png b/graphics/pokemon/gen_7/turtonator/anim_front.png similarity index 100% rename from graphics/pokemon/turtonator/anim_front.png rename to graphics/pokemon/gen_7/turtonator/anim_front.png diff --git a/graphics/pokemon/turtonator/back.png b/graphics/pokemon/gen_7/turtonator/back.png similarity index 100% rename from graphics/pokemon/turtonator/back.png rename to graphics/pokemon/gen_7/turtonator/back.png diff --git a/graphics/pokemon/turtonator/footprint.png b/graphics/pokemon/gen_7/turtonator/footprint.png similarity index 100% rename from graphics/pokemon/turtonator/footprint.png rename to graphics/pokemon/gen_7/turtonator/footprint.png diff --git a/graphics/pokemon/turtonator/icon.png b/graphics/pokemon/gen_7/turtonator/icon.png similarity index 100% rename from graphics/pokemon/turtonator/icon.png rename to graphics/pokemon/gen_7/turtonator/icon.png diff --git a/graphics/pokemon/turtonator/normal.pal b/graphics/pokemon/gen_7/turtonator/normal.pal similarity index 100% rename from graphics/pokemon/turtonator/normal.pal rename to graphics/pokemon/gen_7/turtonator/normal.pal diff --git a/graphics/pokemon/turtonator/shiny.pal b/graphics/pokemon/gen_7/turtonator/shiny.pal similarity index 100% rename from graphics/pokemon/turtonator/shiny.pal rename to graphics/pokemon/gen_7/turtonator/shiny.pal diff --git a/graphics/pokemon/type_null/back.png b/graphics/pokemon/gen_7/type_null/back.png similarity index 100% rename from graphics/pokemon/type_null/back.png rename to graphics/pokemon/gen_7/type_null/back.png diff --git a/graphics/pokemon/type_null/footprint.png b/graphics/pokemon/gen_7/type_null/footprint.png similarity index 100% rename from graphics/pokemon/type_null/footprint.png rename to graphics/pokemon/gen_7/type_null/footprint.png diff --git a/graphics/pokemon/type_null/front.png b/graphics/pokemon/gen_7/type_null/front.png similarity index 100% rename from graphics/pokemon/type_null/front.png rename to graphics/pokemon/gen_7/type_null/front.png diff --git a/graphics/pokemon/type_null/icon.png b/graphics/pokemon/gen_7/type_null/icon.png similarity index 100% rename from graphics/pokemon/type_null/icon.png rename to graphics/pokemon/gen_7/type_null/icon.png diff --git a/graphics/pokemon/type_null/normal.pal b/graphics/pokemon/gen_7/type_null/normal.pal similarity index 100% rename from graphics/pokemon/type_null/normal.pal rename to graphics/pokemon/gen_7/type_null/normal.pal diff --git a/graphics/pokemon/type_null/shiny.pal b/graphics/pokemon/gen_7/type_null/shiny.pal similarity index 100% rename from graphics/pokemon/type_null/shiny.pal rename to graphics/pokemon/gen_7/type_null/shiny.pal diff --git a/graphics/pokemon/vikavolt/anim_front.png b/graphics/pokemon/gen_7/vikavolt/anim_front.png similarity index 100% rename from graphics/pokemon/vikavolt/anim_front.png rename to graphics/pokemon/gen_7/vikavolt/anim_front.png diff --git a/graphics/pokemon/vikavolt/back.png b/graphics/pokemon/gen_7/vikavolt/back.png similarity index 100% rename from graphics/pokemon/vikavolt/back.png rename to graphics/pokemon/gen_7/vikavolt/back.png diff --git a/graphics/pokemon/vikavolt/footprint.png b/graphics/pokemon/gen_7/vikavolt/footprint.png similarity index 100% rename from graphics/pokemon/vikavolt/footprint.png rename to graphics/pokemon/gen_7/vikavolt/footprint.png diff --git a/graphics/pokemon/vikavolt/icon.png b/graphics/pokemon/gen_7/vikavolt/icon.png similarity index 100% rename from graphics/pokemon/vikavolt/icon.png rename to graphics/pokemon/gen_7/vikavolt/icon.png diff --git a/graphics/pokemon/vikavolt/normal.pal b/graphics/pokemon/gen_7/vikavolt/normal.pal similarity index 100% rename from graphics/pokemon/vikavolt/normal.pal rename to graphics/pokemon/gen_7/vikavolt/normal.pal diff --git a/graphics/pokemon/vikavolt/shiny.pal b/graphics/pokemon/gen_7/vikavolt/shiny.pal similarity index 100% rename from graphics/pokemon/vikavolt/shiny.pal rename to graphics/pokemon/gen_7/vikavolt/shiny.pal diff --git a/graphics/pokemon/wimpod/anim_front.png b/graphics/pokemon/gen_7/wimpod/anim_front.png similarity index 100% rename from graphics/pokemon/wimpod/anim_front.png rename to graphics/pokemon/gen_7/wimpod/anim_front.png diff --git a/graphics/pokemon/wimpod/back.png b/graphics/pokemon/gen_7/wimpod/back.png similarity index 100% rename from graphics/pokemon/wimpod/back.png rename to graphics/pokemon/gen_7/wimpod/back.png diff --git a/graphics/pokemon/trevenant/footprint.png b/graphics/pokemon/gen_7/wimpod/footprint.png similarity index 100% rename from graphics/pokemon/trevenant/footprint.png rename to graphics/pokemon/gen_7/wimpod/footprint.png diff --git a/graphics/pokemon/wimpod/icon.png b/graphics/pokemon/gen_7/wimpod/icon.png similarity index 100% rename from graphics/pokemon/wimpod/icon.png rename to graphics/pokemon/gen_7/wimpod/icon.png diff --git a/graphics/pokemon/wimpod/normal.pal b/graphics/pokemon/gen_7/wimpod/normal.pal similarity index 100% rename from graphics/pokemon/wimpod/normal.pal rename to graphics/pokemon/gen_7/wimpod/normal.pal diff --git a/graphics/pokemon/wimpod/shiny.pal b/graphics/pokemon/gen_7/wimpod/shiny.pal similarity index 100% rename from graphics/pokemon/wimpod/shiny.pal rename to graphics/pokemon/gen_7/wimpod/shiny.pal diff --git a/graphics/pokemon/wishiwashi/back.png b/graphics/pokemon/gen_7/wishiwashi/back.png similarity index 100% rename from graphics/pokemon/wishiwashi/back.png rename to graphics/pokemon/gen_7/wishiwashi/back.png diff --git a/graphics/pokemon/victreebel/footprint.png b/graphics/pokemon/gen_7/wishiwashi/footprint.png similarity index 100% rename from graphics/pokemon/victreebel/footprint.png rename to graphics/pokemon/gen_7/wishiwashi/footprint.png diff --git a/graphics/pokemon/wishiwashi/front.png b/graphics/pokemon/gen_7/wishiwashi/front.png similarity index 100% rename from graphics/pokemon/wishiwashi/front.png rename to graphics/pokemon/gen_7/wishiwashi/front.png diff --git a/graphics/pokemon/wishiwashi/icon.png b/graphics/pokemon/gen_7/wishiwashi/icon.png similarity index 100% rename from graphics/pokemon/wishiwashi/icon.png rename to graphics/pokemon/gen_7/wishiwashi/icon.png diff --git a/graphics/pokemon/wishiwashi/normal.pal b/graphics/pokemon/gen_7/wishiwashi/normal.pal similarity index 100% rename from graphics/pokemon/wishiwashi/normal.pal rename to graphics/pokemon/gen_7/wishiwashi/normal.pal diff --git a/graphics/pokemon/wishiwashi/school/back.png b/graphics/pokemon/gen_7/wishiwashi/school/back.png similarity index 100% rename from graphics/pokemon/wishiwashi/school/back.png rename to graphics/pokemon/gen_7/wishiwashi/school/back.png diff --git a/graphics/pokemon/wishiwashi/school/front.png b/graphics/pokemon/gen_7/wishiwashi/school/front.png similarity index 100% rename from graphics/pokemon/wishiwashi/school/front.png rename to graphics/pokemon/gen_7/wishiwashi/school/front.png diff --git a/graphics/pokemon/wishiwashi/school/icon.png b/graphics/pokemon/gen_7/wishiwashi/school/icon.png similarity index 100% rename from graphics/pokemon/wishiwashi/school/icon.png rename to graphics/pokemon/gen_7/wishiwashi/school/icon.png diff --git a/graphics/pokemon/wishiwashi/school/normal.pal b/graphics/pokemon/gen_7/wishiwashi/school/normal.pal similarity index 100% rename from graphics/pokemon/wishiwashi/school/normal.pal rename to graphics/pokemon/gen_7/wishiwashi/school/normal.pal diff --git a/graphics/pokemon/wishiwashi/school/shiny.pal b/graphics/pokemon/gen_7/wishiwashi/school/shiny.pal similarity index 100% rename from graphics/pokemon/wishiwashi/school/shiny.pal rename to graphics/pokemon/gen_7/wishiwashi/school/shiny.pal diff --git a/graphics/pokemon/wishiwashi/shiny.pal b/graphics/pokemon/gen_7/wishiwashi/shiny.pal similarity index 100% rename from graphics/pokemon/wishiwashi/shiny.pal rename to graphics/pokemon/gen_7/wishiwashi/shiny.pal diff --git a/graphics/pokemon/xurkitree/back.png b/graphics/pokemon/gen_7/xurkitree/back.png similarity index 100% rename from graphics/pokemon/xurkitree/back.png rename to graphics/pokemon/gen_7/xurkitree/back.png diff --git a/graphics/pokemon/xurkitree/footprint.png b/graphics/pokemon/gen_7/xurkitree/footprint.png similarity index 100% rename from graphics/pokemon/xurkitree/footprint.png rename to graphics/pokemon/gen_7/xurkitree/footprint.png diff --git a/graphics/pokemon/xurkitree/front.png b/graphics/pokemon/gen_7/xurkitree/front.png similarity index 100% rename from graphics/pokemon/xurkitree/front.png rename to graphics/pokemon/gen_7/xurkitree/front.png diff --git a/graphics/pokemon/xurkitree/icon.png b/graphics/pokemon/gen_7/xurkitree/icon.png similarity index 100% rename from graphics/pokemon/xurkitree/icon.png rename to graphics/pokemon/gen_7/xurkitree/icon.png diff --git a/graphics/pokemon/xurkitree/normal.pal b/graphics/pokemon/gen_7/xurkitree/normal.pal similarity index 100% rename from graphics/pokemon/xurkitree/normal.pal rename to graphics/pokemon/gen_7/xurkitree/normal.pal diff --git a/graphics/pokemon/xurkitree/shiny.pal b/graphics/pokemon/gen_7/xurkitree/shiny.pal similarity index 100% rename from graphics/pokemon/xurkitree/shiny.pal rename to graphics/pokemon/gen_7/xurkitree/shiny.pal diff --git a/graphics/pokemon/yungoos/back.png b/graphics/pokemon/gen_7/yungoos/back.png similarity index 100% rename from graphics/pokemon/yungoos/back.png rename to graphics/pokemon/gen_7/yungoos/back.png diff --git a/graphics/pokemon/yungoos/footprint.png b/graphics/pokemon/gen_7/yungoos/footprint.png similarity index 100% rename from graphics/pokemon/yungoos/footprint.png rename to graphics/pokemon/gen_7/yungoos/footprint.png diff --git a/graphics/pokemon/yungoos/front.png b/graphics/pokemon/gen_7/yungoos/front.png similarity index 100% rename from graphics/pokemon/yungoos/front.png rename to graphics/pokemon/gen_7/yungoos/front.png diff --git a/graphics/pokemon/yungoos/icon.png b/graphics/pokemon/gen_7/yungoos/icon.png similarity index 100% rename from graphics/pokemon/yungoos/icon.png rename to graphics/pokemon/gen_7/yungoos/icon.png diff --git a/graphics/pokemon/yungoos/normal.pal b/graphics/pokemon/gen_7/yungoos/normal.pal similarity index 100% rename from graphics/pokemon/yungoos/normal.pal rename to graphics/pokemon/gen_7/yungoos/normal.pal diff --git a/graphics/pokemon/yungoos/shiny.pal b/graphics/pokemon/gen_7/yungoos/shiny.pal similarity index 100% rename from graphics/pokemon/yungoos/shiny.pal rename to graphics/pokemon/gen_7/yungoos/shiny.pal diff --git a/graphics/pokemon/zeraora/back.png b/graphics/pokemon/gen_7/zeraora/back.png similarity index 100% rename from graphics/pokemon/zeraora/back.png rename to graphics/pokemon/gen_7/zeraora/back.png diff --git a/graphics/pokemon/zeraora/footprint.png b/graphics/pokemon/gen_7/zeraora/footprint.png similarity index 100% rename from graphics/pokemon/zeraora/footprint.png rename to graphics/pokemon/gen_7/zeraora/footprint.png diff --git a/graphics/pokemon/zeraora/front.png b/graphics/pokemon/gen_7/zeraora/front.png similarity index 100% rename from graphics/pokemon/zeraora/front.png rename to graphics/pokemon/gen_7/zeraora/front.png diff --git a/graphics/pokemon/zeraora/icon.png b/graphics/pokemon/gen_7/zeraora/icon.png similarity index 100% rename from graphics/pokemon/zeraora/icon.png rename to graphics/pokemon/gen_7/zeraora/icon.png diff --git a/graphics/pokemon/zeraora/normal.pal b/graphics/pokemon/gen_7/zeraora/normal.pal similarity index 100% rename from graphics/pokemon/zeraora/normal.pal rename to graphics/pokemon/gen_7/zeraora/normal.pal diff --git a/graphics/pokemon/zeraora/shiny.pal b/graphics/pokemon/gen_7/zeraora/shiny.pal similarity index 100% rename from graphics/pokemon/zeraora/shiny.pal rename to graphics/pokemon/gen_7/zeraora/shiny.pal diff --git a/graphics/pokemon/alcremie/back.png b/graphics/pokemon/gen_8/alcremie/back.png similarity index 100% rename from graphics/pokemon/alcremie/back.png rename to graphics/pokemon/gen_8/alcremie/back.png diff --git a/graphics/pokemon/alcremie/berry/back.png b/graphics/pokemon/gen_8/alcremie/berry/back.png similarity index 100% rename from graphics/pokemon/alcremie/berry/back.png rename to graphics/pokemon/gen_8/alcremie/berry/back.png diff --git a/graphics/pokemon/alcremie/berry/berry_caramel_swirl.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_caramel_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/berry/berry_caramel_swirl.pal rename to graphics/pokemon/gen_8/alcremie/berry/berry_caramel_swirl.pal diff --git a/graphics/pokemon/alcremie/berry/berry_default.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_default.pal similarity index 100% rename from graphics/pokemon/alcremie/berry/berry_default.pal rename to graphics/pokemon/gen_8/alcremie/berry/berry_default.pal diff --git a/graphics/pokemon/alcremie/berry/berry_lemon_cream.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_lemon_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/berry/berry_lemon_cream.pal rename to graphics/pokemon/gen_8/alcremie/berry/berry_lemon_cream.pal diff --git a/graphics/pokemon/alcremie/berry/berry_matcha_cream.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_matcha_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/berry/berry_matcha_cream.pal rename to graphics/pokemon/gen_8/alcremie/berry/berry_matcha_cream.pal diff --git a/graphics/pokemon/alcremie/berry/berry_mint_cream.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_mint_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/berry/berry_mint_cream.pal rename to graphics/pokemon/gen_8/alcremie/berry/berry_mint_cream.pal diff --git a/graphics/pokemon/alcremie/berry/berry_rainbow_swirl.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_rainbow_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/berry/berry_rainbow_swirl.pal rename to graphics/pokemon/gen_8/alcremie/berry/berry_rainbow_swirl.pal diff --git a/graphics/pokemon/alcremie/berry/berry_ruby_cream.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_ruby_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/berry/berry_ruby_cream.pal rename to graphics/pokemon/gen_8/alcremie/berry/berry_ruby_cream.pal diff --git a/graphics/pokemon/alcremie/berry/berry_ruby_swirl.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_ruby_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/berry/berry_ruby_swirl.pal rename to graphics/pokemon/gen_8/alcremie/berry/berry_ruby_swirl.pal diff --git a/graphics/pokemon/alcremie/berry/berry_salted_cream.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_salted_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/berry/berry_salted_cream.pal rename to graphics/pokemon/gen_8/alcremie/berry/berry_salted_cream.pal diff --git a/graphics/pokemon/alcremie/berry/berry_shiny.pal b/graphics/pokemon/gen_8/alcremie/berry/berry_shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/berry/berry_shiny.pal rename to graphics/pokemon/gen_8/alcremie/berry/berry_shiny.pal diff --git a/graphics/pokemon/alcremie/berry/front.png b/graphics/pokemon/gen_8/alcremie/berry/front.png similarity index 100% rename from graphics/pokemon/alcremie/berry/front.png rename to graphics/pokemon/gen_8/alcremie/berry/front.png diff --git a/graphics/pokemon/alcremie/caramel_swirl/back.png b/graphics/pokemon/gen_8/alcremie/caramel_swirl/back.png similarity index 100% rename from graphics/pokemon/alcremie/caramel_swirl/back.png rename to graphics/pokemon/gen_8/alcremie/caramel_swirl/back.png diff --git a/graphics/pokemon/alcremie/caramel_swirl/front.png b/graphics/pokemon/gen_8/alcremie/caramel_swirl/front.png similarity index 100% rename from graphics/pokemon/alcremie/caramel_swirl/front.png rename to graphics/pokemon/gen_8/alcremie/caramel_swirl/front.png diff --git a/graphics/pokemon/alcremie/caramel_swirl/normal.pal b/graphics/pokemon/gen_8/alcremie/caramel_swirl/normal.pal similarity index 100% rename from graphics/pokemon/alcremie/caramel_swirl/normal.pal rename to graphics/pokemon/gen_8/alcremie/caramel_swirl/normal.pal diff --git a/graphics/pokemon/alcremie/caramel_swirl/shiny.pal b/graphics/pokemon/gen_8/alcremie/caramel_swirl/shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/caramel_swirl/shiny.pal rename to graphics/pokemon/gen_8/alcremie/caramel_swirl/shiny.pal diff --git a/graphics/pokemon/alcremie/clover/back.png b/graphics/pokemon/gen_8/alcremie/clover/back.png similarity index 100% rename from graphics/pokemon/alcremie/clover/back.png rename to graphics/pokemon/gen_8/alcremie/clover/back.png diff --git a/graphics/pokemon/alcremie/clover/clover_caramel_swirl.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_caramel_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/clover/clover_caramel_swirl.pal rename to graphics/pokemon/gen_8/alcremie/clover/clover_caramel_swirl.pal diff --git a/graphics/pokemon/alcremie/clover/clover_default.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_default.pal similarity index 100% rename from graphics/pokemon/alcremie/clover/clover_default.pal rename to graphics/pokemon/gen_8/alcremie/clover/clover_default.pal diff --git a/graphics/pokemon/alcremie/clover/clover_lemon_cream.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_lemon_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/clover/clover_lemon_cream.pal rename to graphics/pokemon/gen_8/alcremie/clover/clover_lemon_cream.pal diff --git a/graphics/pokemon/alcremie/clover/clover_matcha_cream.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_matcha_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/clover/clover_matcha_cream.pal rename to graphics/pokemon/gen_8/alcremie/clover/clover_matcha_cream.pal diff --git a/graphics/pokemon/alcremie/clover/clover_mint_cream.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_mint_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/clover/clover_mint_cream.pal rename to graphics/pokemon/gen_8/alcremie/clover/clover_mint_cream.pal diff --git a/graphics/pokemon/alcremie/clover/clover_rainbow_swirl.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_rainbow_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/clover/clover_rainbow_swirl.pal rename to graphics/pokemon/gen_8/alcremie/clover/clover_rainbow_swirl.pal diff --git a/graphics/pokemon/alcremie/clover/clover_ruby_cream.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_ruby_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/clover/clover_ruby_cream.pal rename to graphics/pokemon/gen_8/alcremie/clover/clover_ruby_cream.pal diff --git a/graphics/pokemon/alcremie/clover/clover_ruby_swirl.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_ruby_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/clover/clover_ruby_swirl.pal rename to graphics/pokemon/gen_8/alcremie/clover/clover_ruby_swirl.pal diff --git a/graphics/pokemon/alcremie/clover/clover_salted_cream.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_salted_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/clover/clover_salted_cream.pal rename to graphics/pokemon/gen_8/alcremie/clover/clover_salted_cream.pal diff --git a/graphics/pokemon/alcremie/clover/clover_shiny.pal b/graphics/pokemon/gen_8/alcremie/clover/clover_shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/clover/clover_shiny.pal rename to graphics/pokemon/gen_8/alcremie/clover/clover_shiny.pal diff --git a/graphics/pokemon/alcremie/clover/front.png b/graphics/pokemon/gen_8/alcremie/clover/front.png similarity index 100% rename from graphics/pokemon/alcremie/clover/front.png rename to graphics/pokemon/gen_8/alcremie/clover/front.png diff --git a/graphics/pokemon/alcremie/flower/back.png b/graphics/pokemon/gen_8/alcremie/flower/back.png similarity index 100% rename from graphics/pokemon/alcremie/flower/back.png rename to graphics/pokemon/gen_8/alcremie/flower/back.png diff --git a/graphics/pokemon/alcremie/flower/flower_caramel_swirl.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_caramel_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/flower/flower_caramel_swirl.pal rename to graphics/pokemon/gen_8/alcremie/flower/flower_caramel_swirl.pal diff --git a/graphics/pokemon/alcremie/flower/flower_default.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_default.pal similarity index 100% rename from graphics/pokemon/alcremie/flower/flower_default.pal rename to graphics/pokemon/gen_8/alcremie/flower/flower_default.pal diff --git a/graphics/pokemon/alcremie/flower/flower_lemon_cream.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_lemon_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/flower/flower_lemon_cream.pal rename to graphics/pokemon/gen_8/alcremie/flower/flower_lemon_cream.pal diff --git a/graphics/pokemon/alcremie/flower/flower_matcha_cream.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_matcha_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/flower/flower_matcha_cream.pal rename to graphics/pokemon/gen_8/alcremie/flower/flower_matcha_cream.pal diff --git a/graphics/pokemon/alcremie/flower/flower_mint_cream.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_mint_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/flower/flower_mint_cream.pal rename to graphics/pokemon/gen_8/alcremie/flower/flower_mint_cream.pal diff --git a/graphics/pokemon/alcremie/flower/flower_rainbow_swirl.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_rainbow_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/flower/flower_rainbow_swirl.pal rename to graphics/pokemon/gen_8/alcremie/flower/flower_rainbow_swirl.pal diff --git a/graphics/pokemon/alcremie/flower/flower_ruby_cream.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_ruby_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/flower/flower_ruby_cream.pal rename to graphics/pokemon/gen_8/alcremie/flower/flower_ruby_cream.pal diff --git a/graphics/pokemon/alcremie/flower/flower_ruby_swirl.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_ruby_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/flower/flower_ruby_swirl.pal rename to graphics/pokemon/gen_8/alcremie/flower/flower_ruby_swirl.pal diff --git a/graphics/pokemon/alcremie/flower/flower_salted_cream.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_salted_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/flower/flower_salted_cream.pal rename to graphics/pokemon/gen_8/alcremie/flower/flower_salted_cream.pal diff --git a/graphics/pokemon/alcremie/flower/flower_shiny.pal b/graphics/pokemon/gen_8/alcremie/flower/flower_shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/flower/flower_shiny.pal rename to graphics/pokemon/gen_8/alcremie/flower/flower_shiny.pal diff --git a/graphics/pokemon/alcremie/flower/front.png b/graphics/pokemon/gen_8/alcremie/flower/front.png similarity index 100% rename from graphics/pokemon/alcremie/flower/front.png rename to graphics/pokemon/gen_8/alcremie/flower/front.png diff --git a/graphics/pokemon/vivillon/footprint.png b/graphics/pokemon/gen_8/alcremie/footprint.png similarity index 100% rename from graphics/pokemon/vivillon/footprint.png rename to graphics/pokemon/gen_8/alcremie/footprint.png diff --git a/graphics/pokemon/alcremie/front.png b/graphics/pokemon/gen_8/alcremie/front.png similarity index 100% rename from graphics/pokemon/alcremie/front.png rename to graphics/pokemon/gen_8/alcremie/front.png diff --git a/graphics/pokemon/alcremie/gigantamax/back.png b/graphics/pokemon/gen_8/alcremie/gigantamax/back.png similarity index 100% rename from graphics/pokemon/alcremie/gigantamax/back.png rename to graphics/pokemon/gen_8/alcremie/gigantamax/back.png diff --git a/graphics/pokemon/alcremie/gigantamax/front.png b/graphics/pokemon/gen_8/alcremie/gigantamax/front.png similarity index 100% rename from graphics/pokemon/alcremie/gigantamax/front.png rename to graphics/pokemon/gen_8/alcremie/gigantamax/front.png diff --git a/graphics/pokemon/alcremie/gigantamax/icon.png b/graphics/pokemon/gen_8/alcremie/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/alcremie/gigantamax/icon.png rename to graphics/pokemon/gen_8/alcremie/gigantamax/icon.png diff --git a/graphics/pokemon/alcremie/gigantamax/normal.pal b/graphics/pokemon/gen_8/alcremie/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/alcremie/gigantamax/normal.pal rename to graphics/pokemon/gen_8/alcremie/gigantamax/normal.pal diff --git a/graphics/pokemon/alcremie/gigantamax/shiny.pal b/graphics/pokemon/gen_8/alcremie/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/alcremie/gigantamax/shiny.pal diff --git a/graphics/pokemon/alcremie/icon.png b/graphics/pokemon/gen_8/alcremie/icon.png similarity index 100% rename from graphics/pokemon/alcremie/icon.png rename to graphics/pokemon/gen_8/alcremie/icon.png diff --git a/graphics/pokemon/alcremie/love/back.png b/graphics/pokemon/gen_8/alcremie/love/back.png similarity index 100% rename from graphics/pokemon/alcremie/love/back.png rename to graphics/pokemon/gen_8/alcremie/love/back.png diff --git a/graphics/pokemon/alcremie/love/front.png b/graphics/pokemon/gen_8/alcremie/love/front.png similarity index 100% rename from graphics/pokemon/alcremie/love/front.png rename to graphics/pokemon/gen_8/alcremie/love/front.png diff --git a/graphics/pokemon/alcremie/love/love_caramel_swirl.pal b/graphics/pokemon/gen_8/alcremie/love/love_caramel_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/love/love_caramel_swirl.pal rename to graphics/pokemon/gen_8/alcremie/love/love_caramel_swirl.pal diff --git a/graphics/pokemon/alcremie/love/love_default.pal b/graphics/pokemon/gen_8/alcremie/love/love_default.pal similarity index 100% rename from graphics/pokemon/alcremie/love/love_default.pal rename to graphics/pokemon/gen_8/alcremie/love/love_default.pal diff --git a/graphics/pokemon/alcremie/love/love_lemon_cream.pal b/graphics/pokemon/gen_8/alcremie/love/love_lemon_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/love/love_lemon_cream.pal rename to graphics/pokemon/gen_8/alcremie/love/love_lemon_cream.pal diff --git a/graphics/pokemon/alcremie/love/love_matcha_cream.pal b/graphics/pokemon/gen_8/alcremie/love/love_matcha_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/love/love_matcha_cream.pal rename to graphics/pokemon/gen_8/alcremie/love/love_matcha_cream.pal diff --git a/graphics/pokemon/alcremie/love/love_mint_cream.pal b/graphics/pokemon/gen_8/alcremie/love/love_mint_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/love/love_mint_cream.pal rename to graphics/pokemon/gen_8/alcremie/love/love_mint_cream.pal diff --git a/graphics/pokemon/alcremie/love/love_rainbow_swirl.pal b/graphics/pokemon/gen_8/alcremie/love/love_rainbow_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/love/love_rainbow_swirl.pal rename to graphics/pokemon/gen_8/alcremie/love/love_rainbow_swirl.pal diff --git a/graphics/pokemon/alcremie/love/love_ruby_cream.pal b/graphics/pokemon/gen_8/alcremie/love/love_ruby_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/love/love_ruby_cream.pal rename to graphics/pokemon/gen_8/alcremie/love/love_ruby_cream.pal diff --git a/graphics/pokemon/alcremie/love/love_ruby_swirl.pal b/graphics/pokemon/gen_8/alcremie/love/love_ruby_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/love/love_ruby_swirl.pal rename to graphics/pokemon/gen_8/alcremie/love/love_ruby_swirl.pal diff --git a/graphics/pokemon/alcremie/love/love_salted_cream.pal b/graphics/pokemon/gen_8/alcremie/love/love_salted_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/love/love_salted_cream.pal rename to graphics/pokemon/gen_8/alcremie/love/love_salted_cream.pal diff --git a/graphics/pokemon/alcremie/love/love_shiny.pal b/graphics/pokemon/gen_8/alcremie/love/love_shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/love/love_shiny.pal rename to graphics/pokemon/gen_8/alcremie/love/love_shiny.pal diff --git a/graphics/pokemon/alcremie/normal.pal b/graphics/pokemon/gen_8/alcremie/normal.pal similarity index 100% rename from graphics/pokemon/alcremie/normal.pal rename to graphics/pokemon/gen_8/alcremie/normal.pal diff --git a/graphics/pokemon/alcremie/rainbow_swirl/back.png b/graphics/pokemon/gen_8/alcremie/rainbow_swirl/back.png similarity index 100% rename from graphics/pokemon/alcremie/rainbow_swirl/back.png rename to graphics/pokemon/gen_8/alcremie/rainbow_swirl/back.png diff --git a/graphics/pokemon/alcremie/rainbow_swirl/front.png b/graphics/pokemon/gen_8/alcremie/rainbow_swirl/front.png similarity index 100% rename from graphics/pokemon/alcremie/rainbow_swirl/front.png rename to graphics/pokemon/gen_8/alcremie/rainbow_swirl/front.png diff --git a/graphics/pokemon/alcremie/rainbow_swirl/normal.pal b/graphics/pokemon/gen_8/alcremie/rainbow_swirl/normal.pal similarity index 100% rename from graphics/pokemon/alcremie/rainbow_swirl/normal.pal rename to graphics/pokemon/gen_8/alcremie/rainbow_swirl/normal.pal diff --git a/graphics/pokemon/alcremie/rainbow_swirl/shiny.pal b/graphics/pokemon/gen_8/alcremie/rainbow_swirl/shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/rainbow_swirl/shiny.pal rename to graphics/pokemon/gen_8/alcremie/rainbow_swirl/shiny.pal diff --git a/graphics/pokemon/alcremie/ribbon/back.png b/graphics/pokemon/gen_8/alcremie/ribbon/back.png similarity index 100% rename from graphics/pokemon/alcremie/ribbon/back.png rename to graphics/pokemon/gen_8/alcremie/ribbon/back.png diff --git a/graphics/pokemon/alcremie/ribbon/front.png b/graphics/pokemon/gen_8/alcremie/ribbon/front.png similarity index 100% rename from graphics/pokemon/alcremie/ribbon/front.png rename to graphics/pokemon/gen_8/alcremie/ribbon/front.png diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_caramel_swirl.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_caramel_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/ribbon/ribbon_caramel_swirl.pal rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_caramel_swirl.pal diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_default.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_default.pal similarity index 100% rename from graphics/pokemon/alcremie/ribbon/ribbon_default.pal rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_default.pal diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_lemon_cream.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_lemon_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/ribbon/ribbon_lemon_cream.pal rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_lemon_cream.pal diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_matcha_cream.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_matcha_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/ribbon/ribbon_matcha_cream.pal rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_matcha_cream.pal diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_mint_cream.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_mint_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/ribbon/ribbon_mint_cream.pal rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_mint_cream.pal diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_rainbow_swirl.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_rainbow_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/ribbon/ribbon_rainbow_swirl.pal rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_rainbow_swirl.pal diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_ruby_cream.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_ruby_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/ribbon/ribbon_ruby_cream.pal rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_ruby_cream.pal diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_ruby_swirl.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_ruby_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/ribbon/ribbon_ruby_swirl.pal rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_ruby_swirl.pal diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_salted_cream.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_salted_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/ribbon/ribbon_salted_cream.pal rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_salted_cream.pal diff --git a/graphics/pokemon/alcremie/ribbon/ribbon_shiny.pal b/graphics/pokemon/gen_8/alcremie/ribbon/ribbon_shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/ribbon/ribbon_shiny.pal rename to graphics/pokemon/gen_8/alcremie/ribbon/ribbon_shiny.pal diff --git a/graphics/pokemon/alcremie/shiny.pal b/graphics/pokemon/gen_8/alcremie/shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/shiny.pal rename to graphics/pokemon/gen_8/alcremie/shiny.pal diff --git a/graphics/pokemon/alcremie/star/back.png b/graphics/pokemon/gen_8/alcremie/star/back.png similarity index 100% rename from graphics/pokemon/alcremie/star/back.png rename to graphics/pokemon/gen_8/alcremie/star/back.png diff --git a/graphics/pokemon/alcremie/star/front.png b/graphics/pokemon/gen_8/alcremie/star/front.png similarity index 100% rename from graphics/pokemon/alcremie/star/front.png rename to graphics/pokemon/gen_8/alcremie/star/front.png diff --git a/graphics/pokemon/alcremie/star/star_caramel_swirl.pal b/graphics/pokemon/gen_8/alcremie/star/star_caramel_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/star/star_caramel_swirl.pal rename to graphics/pokemon/gen_8/alcremie/star/star_caramel_swirl.pal diff --git a/graphics/pokemon/alcremie/star/star_default.pal b/graphics/pokemon/gen_8/alcremie/star/star_default.pal similarity index 100% rename from graphics/pokemon/alcremie/star/star_default.pal rename to graphics/pokemon/gen_8/alcremie/star/star_default.pal diff --git a/graphics/pokemon/alcremie/star/star_lemon_cream.pal b/graphics/pokemon/gen_8/alcremie/star/star_lemon_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/star/star_lemon_cream.pal rename to graphics/pokemon/gen_8/alcremie/star/star_lemon_cream.pal diff --git a/graphics/pokemon/alcremie/star/star_matcha_cream.pal b/graphics/pokemon/gen_8/alcremie/star/star_matcha_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/star/star_matcha_cream.pal rename to graphics/pokemon/gen_8/alcremie/star/star_matcha_cream.pal diff --git a/graphics/pokemon/alcremie/star/star_mint_cream.pal b/graphics/pokemon/gen_8/alcremie/star/star_mint_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/star/star_mint_cream.pal rename to graphics/pokemon/gen_8/alcremie/star/star_mint_cream.pal diff --git a/graphics/pokemon/alcremie/star/star_rainbow_swirl.pal b/graphics/pokemon/gen_8/alcremie/star/star_rainbow_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/star/star_rainbow_swirl.pal rename to graphics/pokemon/gen_8/alcremie/star/star_rainbow_swirl.pal diff --git a/graphics/pokemon/alcremie/star/star_ruby_cream.pal b/graphics/pokemon/gen_8/alcremie/star/star_ruby_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/star/star_ruby_cream.pal rename to graphics/pokemon/gen_8/alcremie/star/star_ruby_cream.pal diff --git a/graphics/pokemon/alcremie/star/star_ruby_swirl.pal b/graphics/pokemon/gen_8/alcremie/star/star_ruby_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/star/star_ruby_swirl.pal rename to graphics/pokemon/gen_8/alcremie/star/star_ruby_swirl.pal diff --git a/graphics/pokemon/alcremie/star/star_salted_cream.pal b/graphics/pokemon/gen_8/alcremie/star/star_salted_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/star/star_salted_cream.pal rename to graphics/pokemon/gen_8/alcremie/star/star_salted_cream.pal diff --git a/graphics/pokemon/alcremie/star/star_shiny.pal b/graphics/pokemon/gen_8/alcremie/star/star_shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/star/star_shiny.pal rename to graphics/pokemon/gen_8/alcremie/star/star_shiny.pal diff --git a/graphics/pokemon/alcremie/strawberry/back.png b/graphics/pokemon/gen_8/alcremie/strawberry/back.png similarity index 100% rename from graphics/pokemon/alcremie/strawberry/back.png rename to graphics/pokemon/gen_8/alcremie/strawberry/back.png diff --git a/graphics/pokemon/alcremie/strawberry/front.png b/graphics/pokemon/gen_8/alcremie/strawberry/front.png similarity index 100% rename from graphics/pokemon/alcremie/strawberry/front.png rename to graphics/pokemon/gen_8/alcremie/strawberry/front.png diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_caramel_swirl.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_caramel_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/strawberry/strawberry_caramel_swirl.pal rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_caramel_swirl.pal diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_default.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_default.pal similarity index 100% rename from graphics/pokemon/alcremie/strawberry/strawberry_default.pal rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_default.pal diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_lemon_cream.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_lemon_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/strawberry/strawberry_lemon_cream.pal rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_lemon_cream.pal diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_matcha_cream.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_matcha_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/strawberry/strawberry_matcha_cream.pal rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_matcha_cream.pal diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_mint_cream.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_mint_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/strawberry/strawberry_mint_cream.pal rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_mint_cream.pal diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_rainbow_swirl.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_rainbow_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/strawberry/strawberry_rainbow_swirl.pal rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_rainbow_swirl.pal diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_ruby_cream.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_ruby_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/strawberry/strawberry_ruby_cream.pal rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_ruby_cream.pal diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_ruby_swirl.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_ruby_swirl.pal similarity index 100% rename from graphics/pokemon/alcremie/strawberry/strawberry_ruby_swirl.pal rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_ruby_swirl.pal diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_salted_cream.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_salted_cream.pal similarity index 100% rename from graphics/pokemon/alcremie/strawberry/strawberry_salted_cream.pal rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_salted_cream.pal diff --git a/graphics/pokemon/alcremie/strawberry/strawberry_shiny.pal b/graphics/pokemon/gen_8/alcremie/strawberry/strawberry_shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/strawberry/strawberry_shiny.pal rename to graphics/pokemon/gen_8/alcremie/strawberry/strawberry_shiny.pal diff --git a/graphics/pokemon/appletun/anim_front.png b/graphics/pokemon/gen_8/appletun/anim_front.png similarity index 100% rename from graphics/pokemon/appletun/anim_front.png rename to graphics/pokemon/gen_8/appletun/anim_front.png diff --git a/graphics/pokemon/appletun/back.png b/graphics/pokemon/gen_8/appletun/back.png similarity index 100% rename from graphics/pokemon/appletun/back.png rename to graphics/pokemon/gen_8/appletun/back.png diff --git a/graphics/pokemon/litten/footprint.png b/graphics/pokemon/gen_8/appletun/footprint.png similarity index 100% rename from graphics/pokemon/litten/footprint.png rename to graphics/pokemon/gen_8/appletun/footprint.png diff --git a/graphics/pokemon/appletun/gigantamax/back.png b/graphics/pokemon/gen_8/appletun/gigantamax/back.png similarity index 100% rename from graphics/pokemon/appletun/gigantamax/back.png rename to graphics/pokemon/gen_8/appletun/gigantamax/back.png diff --git a/graphics/pokemon/appletun/gigantamax/front.png b/graphics/pokemon/gen_8/appletun/gigantamax/front.png similarity index 100% rename from graphics/pokemon/appletun/gigantamax/front.png rename to graphics/pokemon/gen_8/appletun/gigantamax/front.png diff --git a/graphics/pokemon/appletun/gigantamax/icon.png b/graphics/pokemon/gen_8/appletun/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/appletun/gigantamax/icon.png rename to graphics/pokemon/gen_8/appletun/gigantamax/icon.png diff --git a/graphics/pokemon/appletun/gigantamax/normal.pal b/graphics/pokemon/gen_8/appletun/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/appletun/gigantamax/normal.pal rename to graphics/pokemon/gen_8/appletun/gigantamax/normal.pal diff --git a/graphics/pokemon/appletun/gigantamax/shiny.pal b/graphics/pokemon/gen_8/appletun/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/appletun/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/appletun/gigantamax/shiny.pal diff --git a/graphics/pokemon/appletun/icon.png b/graphics/pokemon/gen_8/appletun/icon.png similarity index 100% rename from graphics/pokemon/appletun/icon.png rename to graphics/pokemon/gen_8/appletun/icon.png diff --git a/graphics/pokemon/appletun/normal.pal b/graphics/pokemon/gen_8/appletun/normal.pal similarity index 100% rename from graphics/pokemon/appletun/normal.pal rename to graphics/pokemon/gen_8/appletun/normal.pal diff --git a/graphics/pokemon/appletun/shiny.pal b/graphics/pokemon/gen_8/appletun/shiny.pal similarity index 100% rename from graphics/pokemon/appletun/shiny.pal rename to graphics/pokemon/gen_8/appletun/shiny.pal diff --git a/graphics/pokemon/applin/anim_front.png b/graphics/pokemon/gen_8/applin/anim_front.png similarity index 100% rename from graphics/pokemon/applin/anim_front.png rename to graphics/pokemon/gen_8/applin/anim_front.png diff --git a/graphics/pokemon/applin/back.png b/graphics/pokemon/gen_8/applin/back.png similarity index 100% rename from graphics/pokemon/applin/back.png rename to graphics/pokemon/gen_8/applin/back.png diff --git a/graphics/pokemon/volcarona/footprint.png b/graphics/pokemon/gen_8/applin/footprint.png similarity index 100% rename from graphics/pokemon/volcarona/footprint.png rename to graphics/pokemon/gen_8/applin/footprint.png diff --git a/graphics/pokemon/applin/icon.png b/graphics/pokemon/gen_8/applin/icon.png similarity index 100% rename from graphics/pokemon/applin/icon.png rename to graphics/pokemon/gen_8/applin/icon.png diff --git a/graphics/pokemon/applin/normal.pal b/graphics/pokemon/gen_8/applin/normal.pal similarity index 100% rename from graphics/pokemon/applin/normal.pal rename to graphics/pokemon/gen_8/applin/normal.pal diff --git a/graphics/pokemon/applin/shiny.pal b/graphics/pokemon/gen_8/applin/shiny.pal similarity index 100% rename from graphics/pokemon/applin/shiny.pal rename to graphics/pokemon/gen_8/applin/shiny.pal diff --git a/graphics/pokemon/arctovish/back.png b/graphics/pokemon/gen_8/arctovish/back.png similarity index 100% rename from graphics/pokemon/arctovish/back.png rename to graphics/pokemon/gen_8/arctovish/back.png diff --git a/graphics/pokemon/arctozolt/footprint.png b/graphics/pokemon/gen_8/arctovish/footprint.png similarity index 100% rename from graphics/pokemon/arctozolt/footprint.png rename to graphics/pokemon/gen_8/arctovish/footprint.png diff --git a/graphics/pokemon/arctovish/front.png b/graphics/pokemon/gen_8/arctovish/front.png similarity index 100% rename from graphics/pokemon/arctovish/front.png rename to graphics/pokemon/gen_8/arctovish/front.png diff --git a/graphics/pokemon/arctovish/icon.png b/graphics/pokemon/gen_8/arctovish/icon.png similarity index 100% rename from graphics/pokemon/arctovish/icon.png rename to graphics/pokemon/gen_8/arctovish/icon.png diff --git a/graphics/pokemon/arctovish/normal.pal b/graphics/pokemon/gen_8/arctovish/normal.pal similarity index 100% rename from graphics/pokemon/arctovish/normal.pal rename to graphics/pokemon/gen_8/arctovish/normal.pal diff --git a/graphics/pokemon/arctovish/shiny.pal b/graphics/pokemon/gen_8/arctovish/shiny.pal similarity index 100% rename from graphics/pokemon/arctovish/shiny.pal rename to graphics/pokemon/gen_8/arctovish/shiny.pal diff --git a/graphics/pokemon/arctozolt/back.png b/graphics/pokemon/gen_8/arctozolt/back.png similarity index 100% rename from graphics/pokemon/arctozolt/back.png rename to graphics/pokemon/gen_8/arctozolt/back.png diff --git a/graphics/pokemon/porygon2/footprint.png b/graphics/pokemon/gen_8/arctozolt/footprint.png similarity index 100% rename from graphics/pokemon/porygon2/footprint.png rename to graphics/pokemon/gen_8/arctozolt/footprint.png diff --git a/graphics/pokemon/arctozolt/front.png b/graphics/pokemon/gen_8/arctozolt/front.png similarity index 100% rename from graphics/pokemon/arctozolt/front.png rename to graphics/pokemon/gen_8/arctozolt/front.png diff --git a/graphics/pokemon/arctozolt/icon.png b/graphics/pokemon/gen_8/arctozolt/icon.png similarity index 100% rename from graphics/pokemon/arctozolt/icon.png rename to graphics/pokemon/gen_8/arctozolt/icon.png diff --git a/graphics/pokemon/arctozolt/normal.pal b/graphics/pokemon/gen_8/arctozolt/normal.pal similarity index 100% rename from graphics/pokemon/arctozolt/normal.pal rename to graphics/pokemon/gen_8/arctozolt/normal.pal diff --git a/graphics/pokemon/arctozolt/shiny.pal b/graphics/pokemon/gen_8/arctozolt/shiny.pal similarity index 100% rename from graphics/pokemon/arctozolt/shiny.pal rename to graphics/pokemon/gen_8/arctozolt/shiny.pal diff --git a/graphics/pokemon/arrokuda/back.png b/graphics/pokemon/gen_8/arrokuda/back.png similarity index 100% rename from graphics/pokemon/arrokuda/back.png rename to graphics/pokemon/gen_8/arrokuda/back.png diff --git a/graphics/pokemon/voltorb/footprint.png b/graphics/pokemon/gen_8/arrokuda/footprint.png similarity index 100% rename from graphics/pokemon/voltorb/footprint.png rename to graphics/pokemon/gen_8/arrokuda/footprint.png diff --git a/graphics/pokemon/arrokuda/front.png b/graphics/pokemon/gen_8/arrokuda/front.png similarity index 100% rename from graphics/pokemon/arrokuda/front.png rename to graphics/pokemon/gen_8/arrokuda/front.png diff --git a/graphics/pokemon/arrokuda/icon.png b/graphics/pokemon/gen_8/arrokuda/icon.png similarity index 100% rename from graphics/pokemon/arrokuda/icon.png rename to graphics/pokemon/gen_8/arrokuda/icon.png diff --git a/graphics/pokemon/arrokuda/normal.pal b/graphics/pokemon/gen_8/arrokuda/normal.pal similarity index 100% rename from graphics/pokemon/arrokuda/normal.pal rename to graphics/pokemon/gen_8/arrokuda/normal.pal diff --git a/graphics/pokemon/arrokuda/shiny.pal b/graphics/pokemon/gen_8/arrokuda/shiny.pal similarity index 100% rename from graphics/pokemon/arrokuda/shiny.pal rename to graphics/pokemon/gen_8/arrokuda/shiny.pal diff --git a/graphics/pokemon/barraskewda/back.png b/graphics/pokemon/gen_8/barraskewda/back.png similarity index 100% rename from graphics/pokemon/barraskewda/back.png rename to graphics/pokemon/gen_8/barraskewda/back.png diff --git a/graphics/pokemon/wailmer/footprint.png b/graphics/pokemon/gen_8/barraskewda/footprint.png similarity index 100% rename from graphics/pokemon/wailmer/footprint.png rename to graphics/pokemon/gen_8/barraskewda/footprint.png diff --git a/graphics/pokemon/barraskewda/front.png b/graphics/pokemon/gen_8/barraskewda/front.png similarity index 100% rename from graphics/pokemon/barraskewda/front.png rename to graphics/pokemon/gen_8/barraskewda/front.png diff --git a/graphics/pokemon/barraskewda/icon.png b/graphics/pokemon/gen_8/barraskewda/icon.png similarity index 100% rename from graphics/pokemon/barraskewda/icon.png rename to graphics/pokemon/gen_8/barraskewda/icon.png diff --git a/graphics/pokemon/barraskewda/normal.pal b/graphics/pokemon/gen_8/barraskewda/normal.pal similarity index 100% rename from graphics/pokemon/barraskewda/normal.pal rename to graphics/pokemon/gen_8/barraskewda/normal.pal diff --git a/graphics/pokemon/barraskewda/shiny.pal b/graphics/pokemon/gen_8/barraskewda/shiny.pal similarity index 100% rename from graphics/pokemon/barraskewda/shiny.pal rename to graphics/pokemon/gen_8/barraskewda/shiny.pal diff --git a/graphics/pokemon/basculegion/back.png b/graphics/pokemon/gen_8/basculegion/back.png similarity index 100% rename from graphics/pokemon/basculegion/back.png rename to graphics/pokemon/gen_8/basculegion/back.png diff --git a/graphics/pokemon/basculegion/female/back.png b/graphics/pokemon/gen_8/basculegion/female/back.png similarity index 100% rename from graphics/pokemon/basculegion/female/back.png rename to graphics/pokemon/gen_8/basculegion/female/back.png diff --git a/graphics/pokemon/basculegion/female/front.png b/graphics/pokemon/gen_8/basculegion/female/front.png similarity index 100% rename from graphics/pokemon/basculegion/female/front.png rename to graphics/pokemon/gen_8/basculegion/female/front.png diff --git a/graphics/pokemon/basculegion/female/icon.png b/graphics/pokemon/gen_8/basculegion/female/icon.png similarity index 100% rename from graphics/pokemon/basculegion/female/icon.png rename to graphics/pokemon/gen_8/basculegion/female/icon.png diff --git a/graphics/pokemon/basculegion/female/normal.pal b/graphics/pokemon/gen_8/basculegion/female/normal.pal similarity index 100% rename from graphics/pokemon/basculegion/female/normal.pal rename to graphics/pokemon/gen_8/basculegion/female/normal.pal diff --git a/graphics/pokemon/basculegion/female/shiny.pal b/graphics/pokemon/gen_8/basculegion/female/shiny.pal similarity index 100% rename from graphics/pokemon/basculegion/female/shiny.pal rename to graphics/pokemon/gen_8/basculegion/female/shiny.pal diff --git a/graphics/pokemon/basculegion/front.png b/graphics/pokemon/gen_8/basculegion/front.png similarity index 100% rename from graphics/pokemon/basculegion/front.png rename to graphics/pokemon/gen_8/basculegion/front.png diff --git a/graphics/pokemon/basculegion/icon.png b/graphics/pokemon/gen_8/basculegion/icon.png similarity index 100% rename from graphics/pokemon/basculegion/icon.png rename to graphics/pokemon/gen_8/basculegion/icon.png diff --git a/graphics/pokemon/basculegion/normal.pal b/graphics/pokemon/gen_8/basculegion/normal.pal similarity index 100% rename from graphics/pokemon/basculegion/normal.pal rename to graphics/pokemon/gen_8/basculegion/normal.pal diff --git a/graphics/pokemon/basculegion/shiny.pal b/graphics/pokemon/gen_8/basculegion/shiny.pal similarity index 100% rename from graphics/pokemon/basculegion/shiny.pal rename to graphics/pokemon/gen_8/basculegion/shiny.pal diff --git a/graphics/pokemon/blipbug/back.png b/graphics/pokemon/gen_8/blipbug/back.png similarity index 100% rename from graphics/pokemon/blipbug/back.png rename to graphics/pokemon/gen_8/blipbug/back.png diff --git a/graphics/pokemon/tsareena/footprint.png b/graphics/pokemon/gen_8/blipbug/footprint.png similarity index 100% rename from graphics/pokemon/tsareena/footprint.png rename to graphics/pokemon/gen_8/blipbug/footprint.png diff --git a/graphics/pokemon/blipbug/front.png b/graphics/pokemon/gen_8/blipbug/front.png similarity index 100% rename from graphics/pokemon/blipbug/front.png rename to graphics/pokemon/gen_8/blipbug/front.png diff --git a/graphics/pokemon/blipbug/icon.png b/graphics/pokemon/gen_8/blipbug/icon.png similarity index 100% rename from graphics/pokemon/blipbug/icon.png rename to graphics/pokemon/gen_8/blipbug/icon.png diff --git a/graphics/pokemon/blipbug/normal.pal b/graphics/pokemon/gen_8/blipbug/normal.pal similarity index 100% rename from graphics/pokemon/blipbug/normal.pal rename to graphics/pokemon/gen_8/blipbug/normal.pal diff --git a/graphics/pokemon/blipbug/shiny.pal b/graphics/pokemon/gen_8/blipbug/shiny.pal similarity index 100% rename from graphics/pokemon/blipbug/shiny.pal rename to graphics/pokemon/gen_8/blipbug/shiny.pal diff --git a/graphics/pokemon/boltund/back.png b/graphics/pokemon/gen_8/boltund/back.png similarity index 100% rename from graphics/pokemon/boltund/back.png rename to graphics/pokemon/gen_8/boltund/back.png diff --git a/graphics/pokemon/flareon/footprint.png b/graphics/pokemon/gen_8/boltund/footprint.png similarity index 100% rename from graphics/pokemon/flareon/footprint.png rename to graphics/pokemon/gen_8/boltund/footprint.png diff --git a/graphics/pokemon/boltund/front.png b/graphics/pokemon/gen_8/boltund/front.png similarity index 100% rename from graphics/pokemon/boltund/front.png rename to graphics/pokemon/gen_8/boltund/front.png diff --git a/graphics/pokemon/boltund/icon.png b/graphics/pokemon/gen_8/boltund/icon.png similarity index 100% rename from graphics/pokemon/boltund/icon.png rename to graphics/pokemon/gen_8/boltund/icon.png diff --git a/graphics/pokemon/boltund/normal.pal b/graphics/pokemon/gen_8/boltund/normal.pal similarity index 100% rename from graphics/pokemon/boltund/normal.pal rename to graphics/pokemon/gen_8/boltund/normal.pal diff --git a/graphics/pokemon/boltund/shiny.pal b/graphics/pokemon/gen_8/boltund/shiny.pal similarity index 100% rename from graphics/pokemon/boltund/shiny.pal rename to graphics/pokemon/gen_8/boltund/shiny.pal diff --git a/graphics/pokemon/calyrex/back.png b/graphics/pokemon/gen_8/calyrex/back.png similarity index 100% rename from graphics/pokemon/calyrex/back.png rename to graphics/pokemon/gen_8/calyrex/back.png diff --git a/graphics/pokemon/venipede/footprint.png b/graphics/pokemon/gen_8/calyrex/footprint.png similarity index 100% rename from graphics/pokemon/venipede/footprint.png rename to graphics/pokemon/gen_8/calyrex/footprint.png diff --git a/graphics/pokemon/calyrex/front.png b/graphics/pokemon/gen_8/calyrex/front.png similarity index 100% rename from graphics/pokemon/calyrex/front.png rename to graphics/pokemon/gen_8/calyrex/front.png diff --git a/graphics/pokemon/calyrex/ice_rider/back.png b/graphics/pokemon/gen_8/calyrex/ice_rider/back.png similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/back.png rename to graphics/pokemon/gen_8/calyrex/ice_rider/back.png diff --git a/graphics/pokemon/calyrex/ice_rider/front.png b/graphics/pokemon/gen_8/calyrex/ice_rider/front.png similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/front.png rename to graphics/pokemon/gen_8/calyrex/ice_rider/front.png diff --git a/graphics/pokemon/calyrex/ice_rider/icon.png b/graphics/pokemon/gen_8/calyrex/ice_rider/icon.png similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/icon.png rename to graphics/pokemon/gen_8/calyrex/ice_rider/icon.png diff --git a/graphics/pokemon/calyrex/ice_rider/normal.pal b/graphics/pokemon/gen_8/calyrex/ice_rider/normal.pal similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/normal.pal rename to graphics/pokemon/gen_8/calyrex/ice_rider/normal.pal diff --git a/graphics/pokemon/calyrex/ice_rider/shiny.pal b/graphics/pokemon/gen_8/calyrex/ice_rider/shiny.pal similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/shiny.pal rename to graphics/pokemon/gen_8/calyrex/ice_rider/shiny.pal diff --git a/graphics/pokemon/calyrex/icon.png b/graphics/pokemon/gen_8/calyrex/icon.png similarity index 100% rename from graphics/pokemon/calyrex/icon.png rename to graphics/pokemon/gen_8/calyrex/icon.png diff --git a/graphics/pokemon/calyrex/normal.pal b/graphics/pokemon/gen_8/calyrex/normal.pal similarity index 100% rename from graphics/pokemon/calyrex/normal.pal rename to graphics/pokemon/gen_8/calyrex/normal.pal diff --git a/graphics/pokemon/calyrex/shadow_rider/back.png b/graphics/pokemon/gen_8/calyrex/shadow_rider/back.png similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/back.png rename to graphics/pokemon/gen_8/calyrex/shadow_rider/back.png diff --git a/graphics/pokemon/calyrex/shadow_rider/front.png b/graphics/pokemon/gen_8/calyrex/shadow_rider/front.png similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/front.png rename to graphics/pokemon/gen_8/calyrex/shadow_rider/front.png diff --git a/graphics/pokemon/calyrex/shadow_rider/icon.png b/graphics/pokemon/gen_8/calyrex/shadow_rider/icon.png similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/icon.png rename to graphics/pokemon/gen_8/calyrex/shadow_rider/icon.png diff --git a/graphics/pokemon/calyrex/shadow_rider/normal.pal b/graphics/pokemon/gen_8/calyrex/shadow_rider/normal.pal similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/normal.pal rename to graphics/pokemon/gen_8/calyrex/shadow_rider/normal.pal diff --git a/graphics/pokemon/calyrex/shadow_rider/shiny.pal b/graphics/pokemon/gen_8/calyrex/shadow_rider/shiny.pal similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/shiny.pal rename to graphics/pokemon/gen_8/calyrex/shadow_rider/shiny.pal diff --git a/graphics/pokemon/calyrex/shiny.pal b/graphics/pokemon/gen_8/calyrex/shiny.pal similarity index 100% rename from graphics/pokemon/calyrex/shiny.pal rename to graphics/pokemon/gen_8/calyrex/shiny.pal diff --git a/graphics/pokemon/carkol/anim_front.png b/graphics/pokemon/gen_8/carkol/anim_front.png similarity index 100% rename from graphics/pokemon/carkol/anim_front.png rename to graphics/pokemon/gen_8/carkol/anim_front.png diff --git a/graphics/pokemon/carkol/back.png b/graphics/pokemon/gen_8/carkol/back.png similarity index 100% rename from graphics/pokemon/carkol/back.png rename to graphics/pokemon/gen_8/carkol/back.png diff --git a/graphics/pokemon/carkol/footprint.png b/graphics/pokemon/gen_8/carkol/footprint.png similarity index 100% rename from graphics/pokemon/carkol/footprint.png rename to graphics/pokemon/gen_8/carkol/footprint.png diff --git a/graphics/pokemon/carkol/icon.png b/graphics/pokemon/gen_8/carkol/icon.png similarity index 100% rename from graphics/pokemon/carkol/icon.png rename to graphics/pokemon/gen_8/carkol/icon.png diff --git a/graphics/pokemon/carkol/normal.pal b/graphics/pokemon/gen_8/carkol/normal.pal similarity index 100% rename from graphics/pokemon/carkol/normal.pal rename to graphics/pokemon/gen_8/carkol/normal.pal diff --git a/graphics/pokemon/carkol/shiny.pal b/graphics/pokemon/gen_8/carkol/shiny.pal similarity index 100% rename from graphics/pokemon/carkol/shiny.pal rename to graphics/pokemon/gen_8/carkol/shiny.pal diff --git a/graphics/pokemon/centiskorch/anim_front.png b/graphics/pokemon/gen_8/centiskorch/anim_front.png similarity index 100% rename from graphics/pokemon/centiskorch/anim_front.png rename to graphics/pokemon/gen_8/centiskorch/anim_front.png diff --git a/graphics/pokemon/centiskorch/back.png b/graphics/pokemon/gen_8/centiskorch/back.png similarity index 100% rename from graphics/pokemon/centiskorch/back.png rename to graphics/pokemon/gen_8/centiskorch/back.png diff --git a/graphics/pokemon/weedle/footprint.png b/graphics/pokemon/gen_8/centiskorch/footprint.png similarity index 100% rename from graphics/pokemon/weedle/footprint.png rename to graphics/pokemon/gen_8/centiskorch/footprint.png diff --git a/graphics/pokemon/centiskorch/gigantamax/back.png b/graphics/pokemon/gen_8/centiskorch/gigantamax/back.png similarity index 100% rename from graphics/pokemon/centiskorch/gigantamax/back.png rename to graphics/pokemon/gen_8/centiskorch/gigantamax/back.png diff --git a/graphics/pokemon/centiskorch/gigantamax/front.png b/graphics/pokemon/gen_8/centiskorch/gigantamax/front.png similarity index 100% rename from graphics/pokemon/centiskorch/gigantamax/front.png rename to graphics/pokemon/gen_8/centiskorch/gigantamax/front.png diff --git a/graphics/pokemon/centiskorch/gigantamax/icon.png b/graphics/pokemon/gen_8/centiskorch/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/centiskorch/gigantamax/icon.png rename to graphics/pokemon/gen_8/centiskorch/gigantamax/icon.png diff --git a/graphics/pokemon/centiskorch/gigantamax/normal.pal b/graphics/pokemon/gen_8/centiskorch/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/centiskorch/gigantamax/normal.pal rename to graphics/pokemon/gen_8/centiskorch/gigantamax/normal.pal diff --git a/graphics/pokemon/centiskorch/gigantamax/shiny.pal b/graphics/pokemon/gen_8/centiskorch/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/centiskorch/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/centiskorch/gigantamax/shiny.pal diff --git a/graphics/pokemon/centiskorch/icon.png b/graphics/pokemon/gen_8/centiskorch/icon.png similarity index 100% rename from graphics/pokemon/centiskorch/icon.png rename to graphics/pokemon/gen_8/centiskorch/icon.png diff --git a/graphics/pokemon/centiskorch/normal.pal b/graphics/pokemon/gen_8/centiskorch/normal.pal similarity index 100% rename from graphics/pokemon/centiskorch/normal.pal rename to graphics/pokemon/gen_8/centiskorch/normal.pal diff --git a/graphics/pokemon/centiskorch/shiny.pal b/graphics/pokemon/gen_8/centiskorch/shiny.pal similarity index 100% rename from graphics/pokemon/centiskorch/shiny.pal rename to graphics/pokemon/gen_8/centiskorch/shiny.pal diff --git a/graphics/pokemon/chewtle/anim_front.png b/graphics/pokemon/gen_8/chewtle/anim_front.png similarity index 100% rename from graphics/pokemon/chewtle/anim_front.png rename to graphics/pokemon/gen_8/chewtle/anim_front.png diff --git a/graphics/pokemon/chewtle/back.png b/graphics/pokemon/gen_8/chewtle/back.png similarity index 100% rename from graphics/pokemon/chewtle/back.png rename to graphics/pokemon/gen_8/chewtle/back.png diff --git a/graphics/pokemon/clefairy/footprint.png b/graphics/pokemon/gen_8/chewtle/footprint.png similarity index 100% rename from graphics/pokemon/clefairy/footprint.png rename to graphics/pokemon/gen_8/chewtle/footprint.png diff --git a/graphics/pokemon/chewtle/icon.png b/graphics/pokemon/gen_8/chewtle/icon.png similarity index 100% rename from graphics/pokemon/chewtle/icon.png rename to graphics/pokemon/gen_8/chewtle/icon.png diff --git a/graphics/pokemon/chewtle/normal.pal b/graphics/pokemon/gen_8/chewtle/normal.pal similarity index 100% rename from graphics/pokemon/chewtle/normal.pal rename to graphics/pokemon/gen_8/chewtle/normal.pal diff --git a/graphics/pokemon/chewtle/shiny.pal b/graphics/pokemon/gen_8/chewtle/shiny.pal similarity index 100% rename from graphics/pokemon/chewtle/shiny.pal rename to graphics/pokemon/gen_8/chewtle/shiny.pal diff --git a/graphics/pokemon/cinderace/back.png b/graphics/pokemon/gen_8/cinderace/back.png similarity index 100% rename from graphics/pokemon/cinderace/back.png rename to graphics/pokemon/gen_8/cinderace/back.png diff --git a/graphics/pokemon/cinderace/footprint.png b/graphics/pokemon/gen_8/cinderace/footprint.png similarity index 100% rename from graphics/pokemon/cinderace/footprint.png rename to graphics/pokemon/gen_8/cinderace/footprint.png diff --git a/graphics/pokemon/cinderace/front.png b/graphics/pokemon/gen_8/cinderace/front.png similarity index 100% rename from graphics/pokemon/cinderace/front.png rename to graphics/pokemon/gen_8/cinderace/front.png diff --git a/graphics/pokemon/cinderace/gigantamax/back.png b/graphics/pokemon/gen_8/cinderace/gigantamax/back.png similarity index 100% rename from graphics/pokemon/cinderace/gigantamax/back.png rename to graphics/pokemon/gen_8/cinderace/gigantamax/back.png diff --git a/graphics/pokemon/cinderace/gigantamax/front.png b/graphics/pokemon/gen_8/cinderace/gigantamax/front.png similarity index 100% rename from graphics/pokemon/cinderace/gigantamax/front.png rename to graphics/pokemon/gen_8/cinderace/gigantamax/front.png diff --git a/graphics/pokemon/cinderace/gigantamax/icon.png b/graphics/pokemon/gen_8/cinderace/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/cinderace/gigantamax/icon.png rename to graphics/pokemon/gen_8/cinderace/gigantamax/icon.png diff --git a/graphics/pokemon/cinderace/gigantamax/normal.pal b/graphics/pokemon/gen_8/cinderace/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/cinderace/gigantamax/normal.pal rename to graphics/pokemon/gen_8/cinderace/gigantamax/normal.pal diff --git a/graphics/pokemon/cinderace/gigantamax/shiny.pal b/graphics/pokemon/gen_8/cinderace/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/cinderace/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/cinderace/gigantamax/shiny.pal diff --git a/graphics/pokemon/cinderace/icon.png b/graphics/pokemon/gen_8/cinderace/icon.png similarity index 100% rename from graphics/pokemon/cinderace/icon.png rename to graphics/pokemon/gen_8/cinderace/icon.png diff --git a/graphics/pokemon/cinderace/normal.pal b/graphics/pokemon/gen_8/cinderace/normal.pal similarity index 100% rename from graphics/pokemon/cinderace/normal.pal rename to graphics/pokemon/gen_8/cinderace/normal.pal diff --git a/graphics/pokemon/cinderace/shiny.pal b/graphics/pokemon/gen_8/cinderace/shiny.pal similarity index 100% rename from graphics/pokemon/cinderace/shiny.pal rename to graphics/pokemon/gen_8/cinderace/shiny.pal diff --git a/graphics/pokemon/clobbopus/back.png b/graphics/pokemon/gen_8/clobbopus/back.png similarity index 100% rename from graphics/pokemon/clobbopus/back.png rename to graphics/pokemon/gen_8/clobbopus/back.png diff --git a/graphics/pokemon/poliwag/footprint.png b/graphics/pokemon/gen_8/clobbopus/footprint.png similarity index 100% rename from graphics/pokemon/poliwag/footprint.png rename to graphics/pokemon/gen_8/clobbopus/footprint.png diff --git a/graphics/pokemon/clobbopus/front.png b/graphics/pokemon/gen_8/clobbopus/front.png similarity index 100% rename from graphics/pokemon/clobbopus/front.png rename to graphics/pokemon/gen_8/clobbopus/front.png diff --git a/graphics/pokemon/clobbopus/icon.png b/graphics/pokemon/gen_8/clobbopus/icon.png similarity index 100% rename from graphics/pokemon/clobbopus/icon.png rename to graphics/pokemon/gen_8/clobbopus/icon.png diff --git a/graphics/pokemon/clobbopus/normal.pal b/graphics/pokemon/gen_8/clobbopus/normal.pal similarity index 100% rename from graphics/pokemon/clobbopus/normal.pal rename to graphics/pokemon/gen_8/clobbopus/normal.pal diff --git a/graphics/pokemon/clobbopus/shiny.pal b/graphics/pokemon/gen_8/clobbopus/shiny.pal similarity index 100% rename from graphics/pokemon/clobbopus/shiny.pal rename to graphics/pokemon/gen_8/clobbopus/shiny.pal diff --git a/graphics/pokemon/coalossal/anim_front.png b/graphics/pokemon/gen_8/coalossal/anim_front.png similarity index 100% rename from graphics/pokemon/coalossal/anim_front.png rename to graphics/pokemon/gen_8/coalossal/anim_front.png diff --git a/graphics/pokemon/coalossal/back.png b/graphics/pokemon/gen_8/coalossal/back.png similarity index 100% rename from graphics/pokemon/coalossal/back.png rename to graphics/pokemon/gen_8/coalossal/back.png diff --git a/graphics/pokemon/coalossal/footprint.png b/graphics/pokemon/gen_8/coalossal/footprint.png similarity index 100% rename from graphics/pokemon/coalossal/footprint.png rename to graphics/pokemon/gen_8/coalossal/footprint.png diff --git a/graphics/pokemon/coalossal/gigantamax/back.png b/graphics/pokemon/gen_8/coalossal/gigantamax/back.png similarity index 100% rename from graphics/pokemon/coalossal/gigantamax/back.png rename to graphics/pokemon/gen_8/coalossal/gigantamax/back.png diff --git a/graphics/pokemon/coalossal/gigantamax/front.png b/graphics/pokemon/gen_8/coalossal/gigantamax/front.png similarity index 100% rename from graphics/pokemon/coalossal/gigantamax/front.png rename to graphics/pokemon/gen_8/coalossal/gigantamax/front.png diff --git a/graphics/pokemon/coalossal/gigantamax/icon.png b/graphics/pokemon/gen_8/coalossal/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/coalossal/gigantamax/icon.png rename to graphics/pokemon/gen_8/coalossal/gigantamax/icon.png diff --git a/graphics/pokemon/coalossal/gigantamax/normal.pal b/graphics/pokemon/gen_8/coalossal/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/coalossal/gigantamax/normal.pal rename to graphics/pokemon/gen_8/coalossal/gigantamax/normal.pal diff --git a/graphics/pokemon/coalossal/gigantamax/shiny.pal b/graphics/pokemon/gen_8/coalossal/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/coalossal/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/coalossal/gigantamax/shiny.pal diff --git a/graphics/pokemon/coalossal/icon.png b/graphics/pokemon/gen_8/coalossal/icon.png similarity index 100% rename from graphics/pokemon/coalossal/icon.png rename to graphics/pokemon/gen_8/coalossal/icon.png diff --git a/graphics/pokemon/coalossal/normal.pal b/graphics/pokemon/gen_8/coalossal/normal.pal similarity index 100% rename from graphics/pokemon/coalossal/normal.pal rename to graphics/pokemon/gen_8/coalossal/normal.pal diff --git a/graphics/pokemon/coalossal/shiny.pal b/graphics/pokemon/gen_8/coalossal/shiny.pal similarity index 100% rename from graphics/pokemon/coalossal/shiny.pal rename to graphics/pokemon/gen_8/coalossal/shiny.pal diff --git a/graphics/pokemon/copperajah/back.png b/graphics/pokemon/gen_8/copperajah/back.png similarity index 100% rename from graphics/pokemon/copperajah/back.png rename to graphics/pokemon/gen_8/copperajah/back.png diff --git a/graphics/pokemon/copperajah/footprint.png b/graphics/pokemon/gen_8/copperajah/footprint.png similarity index 100% rename from graphics/pokemon/copperajah/footprint.png rename to graphics/pokemon/gen_8/copperajah/footprint.png diff --git a/graphics/pokemon/copperajah/front.png b/graphics/pokemon/gen_8/copperajah/front.png similarity index 100% rename from graphics/pokemon/copperajah/front.png rename to graphics/pokemon/gen_8/copperajah/front.png diff --git a/graphics/pokemon/copperajah/gigantamax/back.png b/graphics/pokemon/gen_8/copperajah/gigantamax/back.png similarity index 100% rename from graphics/pokemon/copperajah/gigantamax/back.png rename to graphics/pokemon/gen_8/copperajah/gigantamax/back.png diff --git a/graphics/pokemon/copperajah/gigantamax/front.png b/graphics/pokemon/gen_8/copperajah/gigantamax/front.png similarity index 100% rename from graphics/pokemon/copperajah/gigantamax/front.png rename to graphics/pokemon/gen_8/copperajah/gigantamax/front.png diff --git a/graphics/pokemon/copperajah/gigantamax/icon.png b/graphics/pokemon/gen_8/copperajah/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/copperajah/gigantamax/icon.png rename to graphics/pokemon/gen_8/copperajah/gigantamax/icon.png diff --git a/graphics/pokemon/copperajah/gigantamax/normal.pal b/graphics/pokemon/gen_8/copperajah/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/copperajah/gigantamax/normal.pal rename to graphics/pokemon/gen_8/copperajah/gigantamax/normal.pal diff --git a/graphics/pokemon/copperajah/gigantamax/shiny.pal b/graphics/pokemon/gen_8/copperajah/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/copperajah/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/copperajah/gigantamax/shiny.pal diff --git a/graphics/pokemon/copperajah/icon.png b/graphics/pokemon/gen_8/copperajah/icon.png similarity index 100% rename from graphics/pokemon/copperajah/icon.png rename to graphics/pokemon/gen_8/copperajah/icon.png diff --git a/graphics/pokemon/copperajah/normal.pal b/graphics/pokemon/gen_8/copperajah/normal.pal similarity index 100% rename from graphics/pokemon/copperajah/normal.pal rename to graphics/pokemon/gen_8/copperajah/normal.pal diff --git a/graphics/pokemon/copperajah/shiny.pal b/graphics/pokemon/gen_8/copperajah/shiny.pal similarity index 100% rename from graphics/pokemon/copperajah/shiny.pal rename to graphics/pokemon/gen_8/copperajah/shiny.pal diff --git a/graphics/pokemon/corviknight/anim_front.png b/graphics/pokemon/gen_8/corviknight/anim_front.png similarity index 100% rename from graphics/pokemon/corviknight/anim_front.png rename to graphics/pokemon/gen_8/corviknight/anim_front.png diff --git a/graphics/pokemon/corviknight/back.png b/graphics/pokemon/gen_8/corviknight/back.png similarity index 100% rename from graphics/pokemon/corviknight/back.png rename to graphics/pokemon/gen_8/corviknight/back.png diff --git a/graphics/pokemon/pidgeot/footprint.png b/graphics/pokemon/gen_8/corviknight/footprint.png similarity index 100% rename from graphics/pokemon/pidgeot/footprint.png rename to graphics/pokemon/gen_8/corviknight/footprint.png diff --git a/graphics/pokemon/corviknight/gigantamax/back.png b/graphics/pokemon/gen_8/corviknight/gigantamax/back.png similarity index 100% rename from graphics/pokemon/corviknight/gigantamax/back.png rename to graphics/pokemon/gen_8/corviknight/gigantamax/back.png diff --git a/graphics/pokemon/corviknight/gigantamax/front.png b/graphics/pokemon/gen_8/corviknight/gigantamax/front.png similarity index 100% rename from graphics/pokemon/corviknight/gigantamax/front.png rename to graphics/pokemon/gen_8/corviknight/gigantamax/front.png diff --git a/graphics/pokemon/corviknight/gigantamax/icon.png b/graphics/pokemon/gen_8/corviknight/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/corviknight/gigantamax/icon.png rename to graphics/pokemon/gen_8/corviknight/gigantamax/icon.png diff --git a/graphics/pokemon/corviknight/gigantamax/normal.pal b/graphics/pokemon/gen_8/corviknight/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/corviknight/gigantamax/normal.pal rename to graphics/pokemon/gen_8/corviknight/gigantamax/normal.pal diff --git a/graphics/pokemon/corviknight/gigantamax/shiny.pal b/graphics/pokemon/gen_8/corviknight/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/corviknight/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/corviknight/gigantamax/shiny.pal diff --git a/graphics/pokemon/corviknight/icon.png b/graphics/pokemon/gen_8/corviknight/icon.png similarity index 100% rename from graphics/pokemon/corviknight/icon.png rename to graphics/pokemon/gen_8/corviknight/icon.png diff --git a/graphics/pokemon/corviknight/normal.pal b/graphics/pokemon/gen_8/corviknight/normal.pal similarity index 100% rename from graphics/pokemon/corviknight/normal.pal rename to graphics/pokemon/gen_8/corviknight/normal.pal diff --git a/graphics/pokemon/corviknight/shiny.pal b/graphics/pokemon/gen_8/corviknight/shiny.pal similarity index 100% rename from graphics/pokemon/corviknight/shiny.pal rename to graphics/pokemon/gen_8/corviknight/shiny.pal diff --git a/graphics/pokemon/corvisquire/anim_front.png b/graphics/pokemon/gen_8/corvisquire/anim_front.png similarity index 100% rename from graphics/pokemon/corvisquire/anim_front.png rename to graphics/pokemon/gen_8/corvisquire/anim_front.png diff --git a/graphics/pokemon/corvisquire/back.png b/graphics/pokemon/gen_8/corvisquire/back.png similarity index 100% rename from graphics/pokemon/corvisquire/back.png rename to graphics/pokemon/gen_8/corvisquire/back.png diff --git a/graphics/pokemon/pidgeotto/footprint.png b/graphics/pokemon/gen_8/corvisquire/footprint.png similarity index 100% rename from graphics/pokemon/pidgeotto/footprint.png rename to graphics/pokemon/gen_8/corvisquire/footprint.png diff --git a/graphics/pokemon/corvisquire/icon.png b/graphics/pokemon/gen_8/corvisquire/icon.png similarity index 100% rename from graphics/pokemon/corvisquire/icon.png rename to graphics/pokemon/gen_8/corvisquire/icon.png diff --git a/graphics/pokemon/corvisquire/normal.pal b/graphics/pokemon/gen_8/corvisquire/normal.pal similarity index 100% rename from graphics/pokemon/corvisquire/normal.pal rename to graphics/pokemon/gen_8/corvisquire/normal.pal diff --git a/graphics/pokemon/corvisquire/shiny.pal b/graphics/pokemon/gen_8/corvisquire/shiny.pal similarity index 100% rename from graphics/pokemon/corvisquire/shiny.pal rename to graphics/pokemon/gen_8/corvisquire/shiny.pal diff --git a/graphics/pokemon/cramorant/back.png b/graphics/pokemon/gen_8/cramorant/back.png similarity index 100% rename from graphics/pokemon/cramorant/back.png rename to graphics/pokemon/gen_8/cramorant/back.png diff --git a/graphics/pokemon/psyduck/footprint.png b/graphics/pokemon/gen_8/cramorant/footprint.png similarity index 100% rename from graphics/pokemon/psyduck/footprint.png rename to graphics/pokemon/gen_8/cramorant/footprint.png diff --git a/graphics/pokemon/cramorant/front.png b/graphics/pokemon/gen_8/cramorant/front.png similarity index 100% rename from graphics/pokemon/cramorant/front.png rename to graphics/pokemon/gen_8/cramorant/front.png diff --git a/graphics/pokemon/cramorant/gorging/back.png b/graphics/pokemon/gen_8/cramorant/gorging/back.png similarity index 100% rename from graphics/pokemon/cramorant/gorging/back.png rename to graphics/pokemon/gen_8/cramorant/gorging/back.png diff --git a/graphics/pokemon/cramorant/gorging/front.png b/graphics/pokemon/gen_8/cramorant/gorging/front.png similarity index 100% rename from graphics/pokemon/cramorant/gorging/front.png rename to graphics/pokemon/gen_8/cramorant/gorging/front.png diff --git a/graphics/pokemon/cramorant/gorging/icon.png b/graphics/pokemon/gen_8/cramorant/gorging/icon.png similarity index 100% rename from graphics/pokemon/cramorant/gorging/icon.png rename to graphics/pokemon/gen_8/cramorant/gorging/icon.png diff --git a/graphics/pokemon/cramorant/gorging/normal.pal b/graphics/pokemon/gen_8/cramorant/gorging/normal.pal similarity index 100% rename from graphics/pokemon/cramorant/gorging/normal.pal rename to graphics/pokemon/gen_8/cramorant/gorging/normal.pal diff --git a/graphics/pokemon/cramorant/gorging/shiny.pal b/graphics/pokemon/gen_8/cramorant/gorging/shiny.pal similarity index 100% rename from graphics/pokemon/cramorant/gorging/shiny.pal rename to graphics/pokemon/gen_8/cramorant/gorging/shiny.pal diff --git a/graphics/pokemon/cramorant/gulping/back.png b/graphics/pokemon/gen_8/cramorant/gulping/back.png similarity index 100% rename from graphics/pokemon/cramorant/gulping/back.png rename to graphics/pokemon/gen_8/cramorant/gulping/back.png diff --git a/graphics/pokemon/cramorant/gulping/front.png b/graphics/pokemon/gen_8/cramorant/gulping/front.png similarity index 100% rename from graphics/pokemon/cramorant/gulping/front.png rename to graphics/pokemon/gen_8/cramorant/gulping/front.png diff --git a/graphics/pokemon/cramorant/gulping/icon.png b/graphics/pokemon/gen_8/cramorant/gulping/icon.png similarity index 100% rename from graphics/pokemon/cramorant/gulping/icon.png rename to graphics/pokemon/gen_8/cramorant/gulping/icon.png diff --git a/graphics/pokemon/cramorant/gulping/normal.pal b/graphics/pokemon/gen_8/cramorant/gulping/normal.pal similarity index 100% rename from graphics/pokemon/cramorant/gulping/normal.pal rename to graphics/pokemon/gen_8/cramorant/gulping/normal.pal diff --git a/graphics/pokemon/cramorant/gulping/shiny.pal b/graphics/pokemon/gen_8/cramorant/gulping/shiny.pal similarity index 100% rename from graphics/pokemon/cramorant/gulping/shiny.pal rename to graphics/pokemon/gen_8/cramorant/gulping/shiny.pal diff --git a/graphics/pokemon/cramorant/icon.png b/graphics/pokemon/gen_8/cramorant/icon.png similarity index 100% rename from graphics/pokemon/cramorant/icon.png rename to graphics/pokemon/gen_8/cramorant/icon.png diff --git a/graphics/pokemon/cramorant/normal.pal b/graphics/pokemon/gen_8/cramorant/normal.pal similarity index 100% rename from graphics/pokemon/cramorant/normal.pal rename to graphics/pokemon/gen_8/cramorant/normal.pal diff --git a/graphics/pokemon/cramorant/shiny.pal b/graphics/pokemon/gen_8/cramorant/shiny.pal similarity index 100% rename from graphics/pokemon/cramorant/shiny.pal rename to graphics/pokemon/gen_8/cramorant/shiny.pal diff --git a/graphics/pokemon/cufant/back.png b/graphics/pokemon/gen_8/cufant/back.png similarity index 100% rename from graphics/pokemon/cufant/back.png rename to graphics/pokemon/gen_8/cufant/back.png diff --git a/graphics/pokemon/cyndaquil/footprint.png b/graphics/pokemon/gen_8/cufant/footprint.png similarity index 100% rename from graphics/pokemon/cyndaquil/footprint.png rename to graphics/pokemon/gen_8/cufant/footprint.png diff --git a/graphics/pokemon/cufant/front.png b/graphics/pokemon/gen_8/cufant/front.png similarity index 100% rename from graphics/pokemon/cufant/front.png rename to graphics/pokemon/gen_8/cufant/front.png diff --git a/graphics/pokemon/cufant/icon.png b/graphics/pokemon/gen_8/cufant/icon.png similarity index 100% rename from graphics/pokemon/cufant/icon.png rename to graphics/pokemon/gen_8/cufant/icon.png diff --git a/graphics/pokemon/cufant/normal.pal b/graphics/pokemon/gen_8/cufant/normal.pal similarity index 100% rename from graphics/pokemon/cufant/normal.pal rename to graphics/pokemon/gen_8/cufant/normal.pal diff --git a/graphics/pokemon/cufant/shiny.pal b/graphics/pokemon/gen_8/cufant/shiny.pal similarity index 100% rename from graphics/pokemon/cufant/shiny.pal rename to graphics/pokemon/gen_8/cufant/shiny.pal diff --git a/graphics/pokemon/cursola/back.png b/graphics/pokemon/gen_8/cursola/back.png similarity index 100% rename from graphics/pokemon/cursola/back.png rename to graphics/pokemon/gen_8/cursola/back.png diff --git a/graphics/pokemon/falinks/footprint.png b/graphics/pokemon/gen_8/cursola/footprint.png similarity index 100% rename from graphics/pokemon/falinks/footprint.png rename to graphics/pokemon/gen_8/cursola/footprint.png diff --git a/graphics/pokemon/cursola/front.png b/graphics/pokemon/gen_8/cursola/front.png similarity index 100% rename from graphics/pokemon/cursola/front.png rename to graphics/pokemon/gen_8/cursola/front.png diff --git a/graphics/pokemon/cursola/icon.png b/graphics/pokemon/gen_8/cursola/icon.png similarity index 100% rename from graphics/pokemon/cursola/icon.png rename to graphics/pokemon/gen_8/cursola/icon.png diff --git a/graphics/pokemon/cursola/normal.pal b/graphics/pokemon/gen_8/cursola/normal.pal similarity index 100% rename from graphics/pokemon/cursola/normal.pal rename to graphics/pokemon/gen_8/cursola/normal.pal diff --git a/graphics/pokemon/cursola/shiny.pal b/graphics/pokemon/gen_8/cursola/shiny.pal similarity index 100% rename from graphics/pokemon/cursola/shiny.pal rename to graphics/pokemon/gen_8/cursola/shiny.pal diff --git a/graphics/pokemon/dottler/back.png b/graphics/pokemon/gen_8/dottler/back.png similarity index 100% rename from graphics/pokemon/dottler/back.png rename to graphics/pokemon/gen_8/dottler/back.png diff --git a/graphics/pokemon/jumpluff/footprint.png b/graphics/pokemon/gen_8/dottler/footprint.png similarity index 100% rename from graphics/pokemon/jumpluff/footprint.png rename to graphics/pokemon/gen_8/dottler/footprint.png diff --git a/graphics/pokemon/dottler/front.png b/graphics/pokemon/gen_8/dottler/front.png similarity index 100% rename from graphics/pokemon/dottler/front.png rename to graphics/pokemon/gen_8/dottler/front.png diff --git a/graphics/pokemon/dottler/icon.png b/graphics/pokemon/gen_8/dottler/icon.png similarity index 100% rename from graphics/pokemon/dottler/icon.png rename to graphics/pokemon/gen_8/dottler/icon.png diff --git a/graphics/pokemon/dottler/normal.pal b/graphics/pokemon/gen_8/dottler/normal.pal similarity index 100% rename from graphics/pokemon/dottler/normal.pal rename to graphics/pokemon/gen_8/dottler/normal.pal diff --git a/graphics/pokemon/dottler/shiny.pal b/graphics/pokemon/gen_8/dottler/shiny.pal similarity index 100% rename from graphics/pokemon/dottler/shiny.pal rename to graphics/pokemon/gen_8/dottler/shiny.pal diff --git a/graphics/pokemon/dracovish/back.png b/graphics/pokemon/gen_8/dracovish/back.png similarity index 100% rename from graphics/pokemon/dracovish/back.png rename to graphics/pokemon/gen_8/dracovish/back.png diff --git a/graphics/pokemon/dracozolt/footprint.png b/graphics/pokemon/gen_8/dracovish/footprint.png similarity index 100% rename from graphics/pokemon/dracozolt/footprint.png rename to graphics/pokemon/gen_8/dracovish/footprint.png diff --git a/graphics/pokemon/dracovish/front.png b/graphics/pokemon/gen_8/dracovish/front.png similarity index 100% rename from graphics/pokemon/dracovish/front.png rename to graphics/pokemon/gen_8/dracovish/front.png diff --git a/graphics/pokemon/dracovish/icon.png b/graphics/pokemon/gen_8/dracovish/icon.png similarity index 100% rename from graphics/pokemon/dracovish/icon.png rename to graphics/pokemon/gen_8/dracovish/icon.png diff --git a/graphics/pokemon/dracovish/normal.pal b/graphics/pokemon/gen_8/dracovish/normal.pal similarity index 100% rename from graphics/pokemon/dracovish/normal.pal rename to graphics/pokemon/gen_8/dracovish/normal.pal diff --git a/graphics/pokemon/dracovish/shiny.pal b/graphics/pokemon/gen_8/dracovish/shiny.pal similarity index 100% rename from graphics/pokemon/dracovish/shiny.pal rename to graphics/pokemon/gen_8/dracovish/shiny.pal diff --git a/graphics/pokemon/dracozolt/back.png b/graphics/pokemon/gen_8/dracozolt/back.png similarity index 100% rename from graphics/pokemon/dracozolt/back.png rename to graphics/pokemon/gen_8/dracozolt/back.png diff --git a/graphics/pokemon/dragonite/footprint.png b/graphics/pokemon/gen_8/dracozolt/footprint.png similarity index 100% rename from graphics/pokemon/dragonite/footprint.png rename to graphics/pokemon/gen_8/dracozolt/footprint.png diff --git a/graphics/pokemon/dracozolt/front.png b/graphics/pokemon/gen_8/dracozolt/front.png similarity index 100% rename from graphics/pokemon/dracozolt/front.png rename to graphics/pokemon/gen_8/dracozolt/front.png diff --git a/graphics/pokemon/dracozolt/icon.png b/graphics/pokemon/gen_8/dracozolt/icon.png similarity index 100% rename from graphics/pokemon/dracozolt/icon.png rename to graphics/pokemon/gen_8/dracozolt/icon.png diff --git a/graphics/pokemon/dracozolt/normal.pal b/graphics/pokemon/gen_8/dracozolt/normal.pal similarity index 100% rename from graphics/pokemon/dracozolt/normal.pal rename to graphics/pokemon/gen_8/dracozolt/normal.pal diff --git a/graphics/pokemon/dracozolt/shiny.pal b/graphics/pokemon/gen_8/dracozolt/shiny.pal similarity index 100% rename from graphics/pokemon/dracozolt/shiny.pal rename to graphics/pokemon/gen_8/dracozolt/shiny.pal diff --git a/graphics/pokemon/dragapult/back.png b/graphics/pokemon/gen_8/dragapult/back.png similarity index 100% rename from graphics/pokemon/dragapult/back.png rename to graphics/pokemon/gen_8/dragapult/back.png diff --git a/graphics/pokemon/dragapult/footprint.png b/graphics/pokemon/gen_8/dragapult/footprint.png similarity index 100% rename from graphics/pokemon/dragapult/footprint.png rename to graphics/pokemon/gen_8/dragapult/footprint.png diff --git a/graphics/pokemon/dragapult/front.png b/graphics/pokemon/gen_8/dragapult/front.png similarity index 100% rename from graphics/pokemon/dragapult/front.png rename to graphics/pokemon/gen_8/dragapult/front.png diff --git a/graphics/pokemon/dragapult/icon.png b/graphics/pokemon/gen_8/dragapult/icon.png similarity index 100% rename from graphics/pokemon/dragapult/icon.png rename to graphics/pokemon/gen_8/dragapult/icon.png diff --git a/graphics/pokemon/dragapult/normal.pal b/graphics/pokemon/gen_8/dragapult/normal.pal similarity index 100% rename from graphics/pokemon/dragapult/normal.pal rename to graphics/pokemon/gen_8/dragapult/normal.pal diff --git a/graphics/pokemon/dragapult/shiny.pal b/graphics/pokemon/gen_8/dragapult/shiny.pal similarity index 100% rename from graphics/pokemon/dragapult/shiny.pal rename to graphics/pokemon/gen_8/dragapult/shiny.pal diff --git a/graphics/pokemon/drakloak/back.png b/graphics/pokemon/gen_8/drakloak/back.png similarity index 100% rename from graphics/pokemon/drakloak/back.png rename to graphics/pokemon/gen_8/drakloak/back.png diff --git a/graphics/pokemon/whimsicott/footprint.png b/graphics/pokemon/gen_8/drakloak/footprint.png similarity index 100% rename from graphics/pokemon/whimsicott/footprint.png rename to graphics/pokemon/gen_8/drakloak/footprint.png diff --git a/graphics/pokemon/drakloak/front.png b/graphics/pokemon/gen_8/drakloak/front.png similarity index 100% rename from graphics/pokemon/drakloak/front.png rename to graphics/pokemon/gen_8/drakloak/front.png diff --git a/graphics/pokemon/drakloak/icon.png b/graphics/pokemon/gen_8/drakloak/icon.png similarity index 100% rename from graphics/pokemon/drakloak/icon.png rename to graphics/pokemon/gen_8/drakloak/icon.png diff --git a/graphics/pokemon/drakloak/normal.pal b/graphics/pokemon/gen_8/drakloak/normal.pal similarity index 100% rename from graphics/pokemon/drakloak/normal.pal rename to graphics/pokemon/gen_8/drakloak/normal.pal diff --git a/graphics/pokemon/drakloak/shiny.pal b/graphics/pokemon/gen_8/drakloak/shiny.pal similarity index 100% rename from graphics/pokemon/drakloak/shiny.pal rename to graphics/pokemon/gen_8/drakloak/shiny.pal diff --git a/graphics/pokemon/drednaw/anim_front.png b/graphics/pokemon/gen_8/drednaw/anim_front.png similarity index 100% rename from graphics/pokemon/drednaw/anim_front.png rename to graphics/pokemon/gen_8/drednaw/anim_front.png diff --git a/graphics/pokemon/drednaw/back.png b/graphics/pokemon/gen_8/drednaw/back.png similarity index 100% rename from graphics/pokemon/drednaw/back.png rename to graphics/pokemon/gen_8/drednaw/back.png diff --git a/graphics/pokemon/ivysaur/footprint.png b/graphics/pokemon/gen_8/drednaw/footprint.png similarity index 100% rename from graphics/pokemon/ivysaur/footprint.png rename to graphics/pokemon/gen_8/drednaw/footprint.png diff --git a/graphics/pokemon/drednaw/gigantamax/back.png b/graphics/pokemon/gen_8/drednaw/gigantamax/back.png similarity index 100% rename from graphics/pokemon/drednaw/gigantamax/back.png rename to graphics/pokemon/gen_8/drednaw/gigantamax/back.png diff --git a/graphics/pokemon/drednaw/gigantamax/front.png b/graphics/pokemon/gen_8/drednaw/gigantamax/front.png similarity index 100% rename from graphics/pokemon/drednaw/gigantamax/front.png rename to graphics/pokemon/gen_8/drednaw/gigantamax/front.png diff --git a/graphics/pokemon/drednaw/gigantamax/icon.png b/graphics/pokemon/gen_8/drednaw/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/drednaw/gigantamax/icon.png rename to graphics/pokemon/gen_8/drednaw/gigantamax/icon.png diff --git a/graphics/pokemon/drednaw/gigantamax/normal.pal b/graphics/pokemon/gen_8/drednaw/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/drednaw/gigantamax/normal.pal rename to graphics/pokemon/gen_8/drednaw/gigantamax/normal.pal diff --git a/graphics/pokemon/drednaw/gigantamax/shiny.pal b/graphics/pokemon/gen_8/drednaw/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/drednaw/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/drednaw/gigantamax/shiny.pal diff --git a/graphics/pokemon/drednaw/icon.png b/graphics/pokemon/gen_8/drednaw/icon.png similarity index 100% rename from graphics/pokemon/drednaw/icon.png rename to graphics/pokemon/gen_8/drednaw/icon.png diff --git a/graphics/pokemon/drednaw/normal.pal b/graphics/pokemon/gen_8/drednaw/normal.pal similarity index 100% rename from graphics/pokemon/drednaw/normal.pal rename to graphics/pokemon/gen_8/drednaw/normal.pal diff --git a/graphics/pokemon/drednaw/shiny.pal b/graphics/pokemon/gen_8/drednaw/shiny.pal similarity index 100% rename from graphics/pokemon/drednaw/shiny.pal rename to graphics/pokemon/gen_8/drednaw/shiny.pal diff --git a/graphics/pokemon/dreepy/back.png b/graphics/pokemon/gen_8/dreepy/back.png similarity index 100% rename from graphics/pokemon/dreepy/back.png rename to graphics/pokemon/gen_8/dreepy/back.png diff --git a/graphics/pokemon/wailord/footprint.png b/graphics/pokemon/gen_8/dreepy/footprint.png similarity index 100% rename from graphics/pokemon/wailord/footprint.png rename to graphics/pokemon/gen_8/dreepy/footprint.png diff --git a/graphics/pokemon/dreepy/front.png b/graphics/pokemon/gen_8/dreepy/front.png similarity index 100% rename from graphics/pokemon/dreepy/front.png rename to graphics/pokemon/gen_8/dreepy/front.png diff --git a/graphics/pokemon/dreepy/icon.png b/graphics/pokemon/gen_8/dreepy/icon.png similarity index 100% rename from graphics/pokemon/dreepy/icon.png rename to graphics/pokemon/gen_8/dreepy/icon.png diff --git a/graphics/pokemon/dreepy/normal.pal b/graphics/pokemon/gen_8/dreepy/normal.pal similarity index 100% rename from graphics/pokemon/dreepy/normal.pal rename to graphics/pokemon/gen_8/dreepy/normal.pal diff --git a/graphics/pokemon/dreepy/shiny.pal b/graphics/pokemon/gen_8/dreepy/shiny.pal similarity index 100% rename from graphics/pokemon/dreepy/shiny.pal rename to graphics/pokemon/gen_8/dreepy/shiny.pal diff --git a/graphics/pokemon/drizzile/back.png b/graphics/pokemon/gen_8/drizzile/back.png similarity index 100% rename from graphics/pokemon/drizzile/back.png rename to graphics/pokemon/gen_8/drizzile/back.png diff --git a/graphics/pokemon/drizzile/footprint.png b/graphics/pokemon/gen_8/drizzile/footprint.png similarity index 100% rename from graphics/pokemon/drizzile/footprint.png rename to graphics/pokemon/gen_8/drizzile/footprint.png diff --git a/graphics/pokemon/drizzile/front.png b/graphics/pokemon/gen_8/drizzile/front.png similarity index 100% rename from graphics/pokemon/drizzile/front.png rename to graphics/pokemon/gen_8/drizzile/front.png diff --git a/graphics/pokemon/drizzile/icon.png b/graphics/pokemon/gen_8/drizzile/icon.png similarity index 100% rename from graphics/pokemon/drizzile/icon.png rename to graphics/pokemon/gen_8/drizzile/icon.png diff --git a/graphics/pokemon/drizzile/normal.pal b/graphics/pokemon/gen_8/drizzile/normal.pal similarity index 100% rename from graphics/pokemon/drizzile/normal.pal rename to graphics/pokemon/gen_8/drizzile/normal.pal diff --git a/graphics/pokemon/drizzile/shiny.pal b/graphics/pokemon/gen_8/drizzile/shiny.pal similarity index 100% rename from graphics/pokemon/drizzile/shiny.pal rename to graphics/pokemon/gen_8/drizzile/shiny.pal diff --git a/graphics/pokemon/dubwool/back.png b/graphics/pokemon/gen_8/dubwool/back.png similarity index 100% rename from graphics/pokemon/dubwool/back.png rename to graphics/pokemon/gen_8/dubwool/back.png diff --git a/graphics/pokemon/dubwool/footprint.png b/graphics/pokemon/gen_8/dubwool/footprint.png similarity index 100% rename from graphics/pokemon/dubwool/footprint.png rename to graphics/pokemon/gen_8/dubwool/footprint.png diff --git a/graphics/pokemon/dubwool/front.png b/graphics/pokemon/gen_8/dubwool/front.png similarity index 100% rename from graphics/pokemon/dubwool/front.png rename to graphics/pokemon/gen_8/dubwool/front.png diff --git a/graphics/pokemon/dubwool/icon.png b/graphics/pokemon/gen_8/dubwool/icon.png similarity index 100% rename from graphics/pokemon/dubwool/icon.png rename to graphics/pokemon/gen_8/dubwool/icon.png diff --git a/graphics/pokemon/dubwool/normal.pal b/graphics/pokemon/gen_8/dubwool/normal.pal similarity index 100% rename from graphics/pokemon/dubwool/normal.pal rename to graphics/pokemon/gen_8/dubwool/normal.pal diff --git a/graphics/pokemon/dubwool/shiny.pal b/graphics/pokemon/gen_8/dubwool/shiny.pal similarity index 100% rename from graphics/pokemon/dubwool/shiny.pal rename to graphics/pokemon/gen_8/dubwool/shiny.pal diff --git a/graphics/pokemon/duraludon/back.png b/graphics/pokemon/gen_8/duraludon/back.png similarity index 100% rename from graphics/pokemon/duraludon/back.png rename to graphics/pokemon/gen_8/duraludon/back.png diff --git a/graphics/pokemon/duraludon/footprint.png b/graphics/pokemon/gen_8/duraludon/footprint.png similarity index 100% rename from graphics/pokemon/duraludon/footprint.png rename to graphics/pokemon/gen_8/duraludon/footprint.png diff --git a/graphics/pokemon/duraludon/front.png b/graphics/pokemon/gen_8/duraludon/front.png similarity index 100% rename from graphics/pokemon/duraludon/front.png rename to graphics/pokemon/gen_8/duraludon/front.png diff --git a/graphics/pokemon/duraludon/gigantamax/back.png b/graphics/pokemon/gen_8/duraludon/gigantamax/back.png similarity index 100% rename from graphics/pokemon/duraludon/gigantamax/back.png rename to graphics/pokemon/gen_8/duraludon/gigantamax/back.png diff --git a/graphics/pokemon/duraludon/gigantamax/front.png b/graphics/pokemon/gen_8/duraludon/gigantamax/front.png similarity index 100% rename from graphics/pokemon/duraludon/gigantamax/front.png rename to graphics/pokemon/gen_8/duraludon/gigantamax/front.png diff --git a/graphics/pokemon/duraludon/gigantamax/icon.png b/graphics/pokemon/gen_8/duraludon/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/duraludon/gigantamax/icon.png rename to graphics/pokemon/gen_8/duraludon/gigantamax/icon.png diff --git a/graphics/pokemon/duraludon/gigantamax/normal.pal b/graphics/pokemon/gen_8/duraludon/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/duraludon/gigantamax/normal.pal rename to graphics/pokemon/gen_8/duraludon/gigantamax/normal.pal diff --git a/graphics/pokemon/duraludon/gigantamax/shiny.pal b/graphics/pokemon/gen_8/duraludon/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/duraludon/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/duraludon/gigantamax/shiny.pal diff --git a/graphics/pokemon/duraludon/icon.png b/graphics/pokemon/gen_8/duraludon/icon.png similarity index 100% rename from graphics/pokemon/duraludon/icon.png rename to graphics/pokemon/gen_8/duraludon/icon.png diff --git a/graphics/pokemon/duraludon/normal.pal b/graphics/pokemon/gen_8/duraludon/normal.pal similarity index 100% rename from graphics/pokemon/duraludon/normal.pal rename to graphics/pokemon/gen_8/duraludon/normal.pal diff --git a/graphics/pokemon/duraludon/shiny.pal b/graphics/pokemon/gen_8/duraludon/shiny.pal similarity index 100% rename from graphics/pokemon/duraludon/shiny.pal rename to graphics/pokemon/gen_8/duraludon/shiny.pal diff --git a/graphics/pokemon/eiscue/back.png b/graphics/pokemon/gen_8/eiscue/back.png similarity index 100% rename from graphics/pokemon/eiscue/back.png rename to graphics/pokemon/gen_8/eiscue/back.png diff --git a/graphics/pokemon/eiscue/footprint.png b/graphics/pokemon/gen_8/eiscue/footprint.png similarity index 100% rename from graphics/pokemon/eiscue/footprint.png rename to graphics/pokemon/gen_8/eiscue/footprint.png diff --git a/graphics/pokemon/eiscue/front.png b/graphics/pokemon/gen_8/eiscue/front.png similarity index 100% rename from graphics/pokemon/eiscue/front.png rename to graphics/pokemon/gen_8/eiscue/front.png diff --git a/graphics/pokemon/eiscue/icon.png b/graphics/pokemon/gen_8/eiscue/icon.png similarity index 100% rename from graphics/pokemon/eiscue/icon.png rename to graphics/pokemon/gen_8/eiscue/icon.png diff --git a/graphics/pokemon/eiscue/noice_face/back.png b/graphics/pokemon/gen_8/eiscue/noice_face/back.png similarity index 100% rename from graphics/pokemon/eiscue/noice_face/back.png rename to graphics/pokemon/gen_8/eiscue/noice_face/back.png diff --git a/graphics/pokemon/eiscue/noice_face/front.png b/graphics/pokemon/gen_8/eiscue/noice_face/front.png similarity index 100% rename from graphics/pokemon/eiscue/noice_face/front.png rename to graphics/pokemon/gen_8/eiscue/noice_face/front.png diff --git a/graphics/pokemon/eiscue/noice_face/icon.png b/graphics/pokemon/gen_8/eiscue/noice_face/icon.png similarity index 100% rename from graphics/pokemon/eiscue/noice_face/icon.png rename to graphics/pokemon/gen_8/eiscue/noice_face/icon.png diff --git a/graphics/pokemon/eiscue/noice_face/normal.pal b/graphics/pokemon/gen_8/eiscue/noice_face/normal.pal similarity index 100% rename from graphics/pokemon/eiscue/noice_face/normal.pal rename to graphics/pokemon/gen_8/eiscue/noice_face/normal.pal diff --git a/graphics/pokemon/eiscue/noice_face/shiny.pal b/graphics/pokemon/gen_8/eiscue/noice_face/shiny.pal similarity index 100% rename from graphics/pokemon/eiscue/noice_face/shiny.pal rename to graphics/pokemon/gen_8/eiscue/noice_face/shiny.pal diff --git a/graphics/pokemon/eiscue/normal.pal b/graphics/pokemon/gen_8/eiscue/normal.pal similarity index 100% rename from graphics/pokemon/eiscue/normal.pal rename to graphics/pokemon/gen_8/eiscue/normal.pal diff --git a/graphics/pokemon/eiscue/shiny.pal b/graphics/pokemon/gen_8/eiscue/shiny.pal similarity index 100% rename from graphics/pokemon/eiscue/shiny.pal rename to graphics/pokemon/gen_8/eiscue/shiny.pal diff --git a/graphics/pokemon/eldegoss/back.png b/graphics/pokemon/gen_8/eldegoss/back.png similarity index 100% rename from graphics/pokemon/eldegoss/back.png rename to graphics/pokemon/gen_8/eldegoss/back.png diff --git a/graphics/pokemon/walrein/footprint.png b/graphics/pokemon/gen_8/eldegoss/footprint.png similarity index 100% rename from graphics/pokemon/walrein/footprint.png rename to graphics/pokemon/gen_8/eldegoss/footprint.png diff --git a/graphics/pokemon/eldegoss/front.png b/graphics/pokemon/gen_8/eldegoss/front.png similarity index 100% rename from graphics/pokemon/eldegoss/front.png rename to graphics/pokemon/gen_8/eldegoss/front.png diff --git a/graphics/pokemon/eldegoss/icon.png b/graphics/pokemon/gen_8/eldegoss/icon.png similarity index 100% rename from graphics/pokemon/eldegoss/icon.png rename to graphics/pokemon/gen_8/eldegoss/icon.png diff --git a/graphics/pokemon/eldegoss/normal.pal b/graphics/pokemon/gen_8/eldegoss/normal.pal similarity index 100% rename from graphics/pokemon/eldegoss/normal.pal rename to graphics/pokemon/gen_8/eldegoss/normal.pal diff --git a/graphics/pokemon/eldegoss/shiny.pal b/graphics/pokemon/gen_8/eldegoss/shiny.pal similarity index 100% rename from graphics/pokemon/eldegoss/shiny.pal rename to graphics/pokemon/gen_8/eldegoss/shiny.pal diff --git a/graphics/pokemon/enamorus/back.png b/graphics/pokemon/gen_8/enamorus/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/enamorus/back.png rename to graphics/pokemon/gen_8/enamorus/back.png diff --git a/graphics/pokemon/enamorus/front.png b/graphics/pokemon/gen_8/enamorus/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/enamorus/front.png rename to graphics/pokemon/gen_8/enamorus/front.png diff --git a/graphics/pokemon/enamorus/icon.png b/graphics/pokemon/gen_8/enamorus/icon.png similarity index 100% rename from graphics/pokemon/enamorus/icon.png rename to graphics/pokemon/gen_8/enamorus/icon.png diff --git a/graphics/pokemon/enamorus/normal.pal b/graphics/pokemon/gen_8/enamorus/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/enamorus/normal.pal rename to graphics/pokemon/gen_8/enamorus/normal.pal diff --git a/graphics/pokemon/enamorus/shiny.pal b/graphics/pokemon/gen_8/enamorus/shiny.pal similarity index 100% rename from graphics/pokemon/enamorus/shiny.pal rename to graphics/pokemon/gen_8/enamorus/shiny.pal diff --git a/graphics/pokemon/enamorus/therian/back.png b/graphics/pokemon/gen_8/enamorus/therian/back.png similarity index 100% rename from graphics/pokemon/enamorus/therian/back.png rename to graphics/pokemon/gen_8/enamorus/therian/back.png diff --git a/graphics/pokemon/enamorus/therian/front.png b/graphics/pokemon/gen_8/enamorus/therian/front.png similarity index 100% rename from graphics/pokemon/enamorus/therian/front.png rename to graphics/pokemon/gen_8/enamorus/therian/front.png diff --git a/graphics/pokemon/enamorus/therian/icon.png b/graphics/pokemon/gen_8/enamorus/therian/icon.png similarity index 100% rename from graphics/pokemon/enamorus/therian/icon.png rename to graphics/pokemon/gen_8/enamorus/therian/icon.png diff --git a/graphics/pokemon/enamorus/therian/normal.pal b/graphics/pokemon/gen_8/enamorus/therian/normal.pal similarity index 100% rename from graphics/pokemon/enamorus/therian/normal.pal rename to graphics/pokemon/gen_8/enamorus/therian/normal.pal diff --git a/graphics/pokemon/enamorus/therian/shiny.pal b/graphics/pokemon/gen_8/enamorus/therian/shiny.pal similarity index 100% rename from graphics/pokemon/enamorus/therian/shiny.pal rename to graphics/pokemon/gen_8/enamorus/therian/shiny.pal diff --git a/graphics/pokemon/eternatus/back.png b/graphics/pokemon/gen_8/eternatus/back.png similarity index 100% rename from graphics/pokemon/eternatus/back.png rename to graphics/pokemon/gen_8/eternatus/back.png diff --git a/graphics/pokemon/eternatus/eternamax/back.png b/graphics/pokemon/gen_8/eternatus/eternamax/back.png similarity index 100% rename from graphics/pokemon/eternatus/eternamax/back.png rename to graphics/pokemon/gen_8/eternatus/eternamax/back.png diff --git a/graphics/pokemon/eternatus/eternamax/front.png b/graphics/pokemon/gen_8/eternatus/eternamax/front.png similarity index 100% rename from graphics/pokemon/eternatus/eternamax/front.png rename to graphics/pokemon/gen_8/eternatus/eternamax/front.png diff --git a/graphics/pokemon/eternatus/eternamax/icon.png b/graphics/pokemon/gen_8/eternatus/eternamax/icon.png similarity index 100% rename from graphics/pokemon/eternatus/eternamax/icon.png rename to graphics/pokemon/gen_8/eternatus/eternamax/icon.png diff --git a/graphics/pokemon/eternatus/eternamax/normal.pal b/graphics/pokemon/gen_8/eternatus/eternamax/normal.pal similarity index 100% rename from graphics/pokemon/eternatus/eternamax/normal.pal rename to graphics/pokemon/gen_8/eternatus/eternamax/normal.pal diff --git a/graphics/pokemon/eternatus/eternamax/shiny.pal b/graphics/pokemon/gen_8/eternatus/eternamax/shiny.pal similarity index 100% rename from graphics/pokemon/eternatus/eternamax/shiny.pal rename to graphics/pokemon/gen_8/eternatus/eternamax/shiny.pal diff --git a/graphics/pokemon/eternatus/footprint.png b/graphics/pokemon/gen_8/eternatus/footprint.png similarity index 100% rename from graphics/pokemon/eternatus/footprint.png rename to graphics/pokemon/gen_8/eternatus/footprint.png diff --git a/graphics/pokemon/eternatus/front.png b/graphics/pokemon/gen_8/eternatus/front.png similarity index 100% rename from graphics/pokemon/eternatus/front.png rename to graphics/pokemon/gen_8/eternatus/front.png diff --git a/graphics/pokemon/eternatus/icon.png b/graphics/pokemon/gen_8/eternatus/icon.png similarity index 100% rename from graphics/pokemon/eternatus/icon.png rename to graphics/pokemon/gen_8/eternatus/icon.png diff --git a/graphics/pokemon/eternatus/normal.pal b/graphics/pokemon/gen_8/eternatus/normal.pal similarity index 100% rename from graphics/pokemon/eternatus/normal.pal rename to graphics/pokemon/gen_8/eternatus/normal.pal diff --git a/graphics/pokemon/eternatus/shiny.pal b/graphics/pokemon/gen_8/eternatus/shiny.pal similarity index 100% rename from graphics/pokemon/eternatus/shiny.pal rename to graphics/pokemon/gen_8/eternatus/shiny.pal diff --git a/graphics/pokemon/falinks/back.png b/graphics/pokemon/gen_8/falinks/back.png similarity index 100% rename from graphics/pokemon/falinks/back.png rename to graphics/pokemon/gen_8/falinks/back.png diff --git a/graphics/pokemon/mime_jr/footprint.png b/graphics/pokemon/gen_8/falinks/footprint.png similarity index 100% rename from graphics/pokemon/mime_jr/footprint.png rename to graphics/pokemon/gen_8/falinks/footprint.png diff --git a/graphics/pokemon/falinks/front.png b/graphics/pokemon/gen_8/falinks/front.png similarity index 100% rename from graphics/pokemon/falinks/front.png rename to graphics/pokemon/gen_8/falinks/front.png diff --git a/graphics/pokemon/falinks/icon.png b/graphics/pokemon/gen_8/falinks/icon.png similarity index 100% rename from graphics/pokemon/falinks/icon.png rename to graphics/pokemon/gen_8/falinks/icon.png diff --git a/graphics/pokemon/falinks/normal.pal b/graphics/pokemon/gen_8/falinks/normal.pal similarity index 100% rename from graphics/pokemon/falinks/normal.pal rename to graphics/pokemon/gen_8/falinks/normal.pal diff --git a/graphics/pokemon/falinks/shiny.pal b/graphics/pokemon/gen_8/falinks/shiny.pal similarity index 100% rename from graphics/pokemon/falinks/shiny.pal rename to graphics/pokemon/gen_8/falinks/shiny.pal diff --git a/graphics/pokemon/flapple/anim_front.png b/graphics/pokemon/gen_8/flapple/anim_front.png similarity index 100% rename from graphics/pokemon/flapple/anim_front.png rename to graphics/pokemon/gen_8/flapple/anim_front.png diff --git a/graphics/pokemon/flapple/back.png b/graphics/pokemon/gen_8/flapple/back.png similarity index 100% rename from graphics/pokemon/flapple/back.png rename to graphics/pokemon/gen_8/flapple/back.png diff --git a/graphics/pokemon/weepinbell/footprint.png b/graphics/pokemon/gen_8/flapple/footprint.png similarity index 100% rename from graphics/pokemon/weepinbell/footprint.png rename to graphics/pokemon/gen_8/flapple/footprint.png diff --git a/graphics/pokemon/flapple/gigantamax/back.png b/graphics/pokemon/gen_8/flapple/gigantamax/back.png similarity index 100% rename from graphics/pokemon/flapple/gigantamax/back.png rename to graphics/pokemon/gen_8/flapple/gigantamax/back.png diff --git a/graphics/pokemon/flapple/gigantamax/front.png b/graphics/pokemon/gen_8/flapple/gigantamax/front.png similarity index 100% rename from graphics/pokemon/flapple/gigantamax/front.png rename to graphics/pokemon/gen_8/flapple/gigantamax/front.png diff --git a/graphics/pokemon/flapple/gigantamax/icon.png b/graphics/pokemon/gen_8/flapple/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/flapple/gigantamax/icon.png rename to graphics/pokemon/gen_8/flapple/gigantamax/icon.png diff --git a/graphics/pokemon/flapple/gigantamax/normal.pal b/graphics/pokemon/gen_8/flapple/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/flapple/gigantamax/normal.pal rename to graphics/pokemon/gen_8/flapple/gigantamax/normal.pal diff --git a/graphics/pokemon/flapple/gigantamax/shiny.pal b/graphics/pokemon/gen_8/flapple/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/flapple/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/flapple/gigantamax/shiny.pal diff --git a/graphics/pokemon/flapple/icon.png b/graphics/pokemon/gen_8/flapple/icon.png similarity index 100% rename from graphics/pokemon/flapple/icon.png rename to graphics/pokemon/gen_8/flapple/icon.png diff --git a/graphics/pokemon/flapple/normal.pal b/graphics/pokemon/gen_8/flapple/normal.pal similarity index 100% rename from graphics/pokemon/flapple/normal.pal rename to graphics/pokemon/gen_8/flapple/normal.pal diff --git a/graphics/pokemon/flapple/shiny.pal b/graphics/pokemon/gen_8/flapple/shiny.pal similarity index 100% rename from graphics/pokemon/flapple/shiny.pal rename to graphics/pokemon/gen_8/flapple/shiny.pal diff --git a/graphics/pokemon/frosmoth/back.png b/graphics/pokemon/gen_8/frosmoth/back.png similarity index 100% rename from graphics/pokemon/frosmoth/back.png rename to graphics/pokemon/gen_8/frosmoth/back.png diff --git a/graphics/pokemon/weezing/footprint.png b/graphics/pokemon/gen_8/frosmoth/footprint.png similarity index 100% rename from graphics/pokemon/weezing/footprint.png rename to graphics/pokemon/gen_8/frosmoth/footprint.png diff --git a/graphics/pokemon/frosmoth/front.png b/graphics/pokemon/gen_8/frosmoth/front.png similarity index 100% rename from graphics/pokemon/frosmoth/front.png rename to graphics/pokemon/gen_8/frosmoth/front.png diff --git a/graphics/pokemon/frosmoth/icon.png b/graphics/pokemon/gen_8/frosmoth/icon.png similarity index 100% rename from graphics/pokemon/frosmoth/icon.png rename to graphics/pokemon/gen_8/frosmoth/icon.png diff --git a/graphics/pokemon/frosmoth/normal.pal b/graphics/pokemon/gen_8/frosmoth/normal.pal similarity index 100% rename from graphics/pokemon/frosmoth/normal.pal rename to graphics/pokemon/gen_8/frosmoth/normal.pal diff --git a/graphics/pokemon/frosmoth/shiny.pal b/graphics/pokemon/gen_8/frosmoth/shiny.pal similarity index 100% rename from graphics/pokemon/frosmoth/shiny.pal rename to graphics/pokemon/gen_8/frosmoth/shiny.pal diff --git a/graphics/pokemon/glastrier/back.png b/graphics/pokemon/gen_8/glastrier/back.png similarity index 100% rename from graphics/pokemon/glastrier/back.png rename to graphics/pokemon/gen_8/glastrier/back.png diff --git a/graphics/pokemon/glastrier/footprint.png b/graphics/pokemon/gen_8/glastrier/footprint.png similarity index 100% rename from graphics/pokemon/glastrier/footprint.png rename to graphics/pokemon/gen_8/glastrier/footprint.png diff --git a/graphics/pokemon/glastrier/front.png b/graphics/pokemon/gen_8/glastrier/front.png similarity index 100% rename from graphics/pokemon/glastrier/front.png rename to graphics/pokemon/gen_8/glastrier/front.png diff --git a/graphics/pokemon/glastrier/icon.png b/graphics/pokemon/gen_8/glastrier/icon.png similarity index 100% rename from graphics/pokemon/glastrier/icon.png rename to graphics/pokemon/gen_8/glastrier/icon.png diff --git a/graphics/pokemon/glastrier/normal.pal b/graphics/pokemon/gen_8/glastrier/normal.pal similarity index 100% rename from graphics/pokemon/glastrier/normal.pal rename to graphics/pokemon/gen_8/glastrier/normal.pal diff --git a/graphics/pokemon/glastrier/shiny.pal b/graphics/pokemon/gen_8/glastrier/shiny.pal similarity index 100% rename from graphics/pokemon/glastrier/shiny.pal rename to graphics/pokemon/gen_8/glastrier/shiny.pal diff --git a/graphics/pokemon/gossifleur/back.png b/graphics/pokemon/gen_8/gossifleur/back.png similarity index 100% rename from graphics/pokemon/gossifleur/back.png rename to graphics/pokemon/gen_8/gossifleur/back.png diff --git a/graphics/pokemon/paras/footprint.png b/graphics/pokemon/gen_8/gossifleur/footprint.png similarity index 100% rename from graphics/pokemon/paras/footprint.png rename to graphics/pokemon/gen_8/gossifleur/footprint.png diff --git a/graphics/pokemon/gossifleur/front.png b/graphics/pokemon/gen_8/gossifleur/front.png similarity index 100% rename from graphics/pokemon/gossifleur/front.png rename to graphics/pokemon/gen_8/gossifleur/front.png diff --git a/graphics/pokemon/gossifleur/icon.png b/graphics/pokemon/gen_8/gossifleur/icon.png similarity index 100% rename from graphics/pokemon/gossifleur/icon.png rename to graphics/pokemon/gen_8/gossifleur/icon.png diff --git a/graphics/pokemon/gossifleur/normal.pal b/graphics/pokemon/gen_8/gossifleur/normal.pal similarity index 100% rename from graphics/pokemon/gossifleur/normal.pal rename to graphics/pokemon/gen_8/gossifleur/normal.pal diff --git a/graphics/pokemon/gossifleur/shiny.pal b/graphics/pokemon/gen_8/gossifleur/shiny.pal similarity index 100% rename from graphics/pokemon/gossifleur/shiny.pal rename to graphics/pokemon/gen_8/gossifleur/shiny.pal diff --git a/graphics/pokemon/grapploct/back.png b/graphics/pokemon/gen_8/grapploct/back.png similarity index 100% rename from graphics/pokemon/grapploct/back.png rename to graphics/pokemon/gen_8/grapploct/back.png diff --git a/graphics/pokemon/octillery/footprint.png b/graphics/pokemon/gen_8/grapploct/footprint.png similarity index 100% rename from graphics/pokemon/octillery/footprint.png rename to graphics/pokemon/gen_8/grapploct/footprint.png diff --git a/graphics/pokemon/grapploct/front.png b/graphics/pokemon/gen_8/grapploct/front.png similarity index 100% rename from graphics/pokemon/grapploct/front.png rename to graphics/pokemon/gen_8/grapploct/front.png diff --git a/graphics/pokemon/grapploct/icon.png b/graphics/pokemon/gen_8/grapploct/icon.png similarity index 100% rename from graphics/pokemon/grapploct/icon.png rename to graphics/pokemon/gen_8/grapploct/icon.png diff --git a/graphics/pokemon/grapploct/normal.pal b/graphics/pokemon/gen_8/grapploct/normal.pal similarity index 100% rename from graphics/pokemon/grapploct/normal.pal rename to graphics/pokemon/gen_8/grapploct/normal.pal diff --git a/graphics/pokemon/grapploct/shiny.pal b/graphics/pokemon/gen_8/grapploct/shiny.pal similarity index 100% rename from graphics/pokemon/grapploct/shiny.pal rename to graphics/pokemon/gen_8/grapploct/shiny.pal diff --git a/graphics/pokemon/greedent/back.png b/graphics/pokemon/gen_8/greedent/back.png similarity index 100% rename from graphics/pokemon/greedent/back.png rename to graphics/pokemon/gen_8/greedent/back.png diff --git a/graphics/pokemon/greedent/footprint.png b/graphics/pokemon/gen_8/greedent/footprint.png similarity index 100% rename from graphics/pokemon/greedent/footprint.png rename to graphics/pokemon/gen_8/greedent/footprint.png diff --git a/graphics/pokemon/greedent/front.png b/graphics/pokemon/gen_8/greedent/front.png similarity index 100% rename from graphics/pokemon/greedent/front.png rename to graphics/pokemon/gen_8/greedent/front.png diff --git a/graphics/pokemon/greedent/icon.png b/graphics/pokemon/gen_8/greedent/icon.png similarity index 100% rename from graphics/pokemon/greedent/icon.png rename to graphics/pokemon/gen_8/greedent/icon.png diff --git a/graphics/pokemon/greedent/normal.pal b/graphics/pokemon/gen_8/greedent/normal.pal similarity index 100% rename from graphics/pokemon/greedent/normal.pal rename to graphics/pokemon/gen_8/greedent/normal.pal diff --git a/graphics/pokemon/greedent/shiny.pal b/graphics/pokemon/gen_8/greedent/shiny.pal similarity index 100% rename from graphics/pokemon/greedent/shiny.pal rename to graphics/pokemon/gen_8/greedent/shiny.pal diff --git a/graphics/pokemon/grimmsnarl/back.png b/graphics/pokemon/gen_8/grimmsnarl/back.png similarity index 100% rename from graphics/pokemon/grimmsnarl/back.png rename to graphics/pokemon/gen_8/grimmsnarl/back.png diff --git a/graphics/pokemon/grimmsnarl/footprint.png b/graphics/pokemon/gen_8/grimmsnarl/footprint.png similarity index 100% rename from graphics/pokemon/grimmsnarl/footprint.png rename to graphics/pokemon/gen_8/grimmsnarl/footprint.png diff --git a/graphics/pokemon/grimmsnarl/front.png b/graphics/pokemon/gen_8/grimmsnarl/front.png similarity index 100% rename from graphics/pokemon/grimmsnarl/front.png rename to graphics/pokemon/gen_8/grimmsnarl/front.png diff --git a/graphics/pokemon/grimmsnarl/gigantamax/back.png b/graphics/pokemon/gen_8/grimmsnarl/gigantamax/back.png similarity index 100% rename from graphics/pokemon/grimmsnarl/gigantamax/back.png rename to graphics/pokemon/gen_8/grimmsnarl/gigantamax/back.png diff --git a/graphics/pokemon/grimmsnarl/gigantamax/front.png b/graphics/pokemon/gen_8/grimmsnarl/gigantamax/front.png similarity index 100% rename from graphics/pokemon/grimmsnarl/gigantamax/front.png rename to graphics/pokemon/gen_8/grimmsnarl/gigantamax/front.png diff --git a/graphics/pokemon/grimmsnarl/gigantamax/icon.png b/graphics/pokemon/gen_8/grimmsnarl/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/grimmsnarl/gigantamax/icon.png rename to graphics/pokemon/gen_8/grimmsnarl/gigantamax/icon.png diff --git a/graphics/pokemon/grimmsnarl/gigantamax/normal.pal b/graphics/pokemon/gen_8/grimmsnarl/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/grimmsnarl/gigantamax/normal.pal rename to graphics/pokemon/gen_8/grimmsnarl/gigantamax/normal.pal diff --git a/graphics/pokemon/grimmsnarl/gigantamax/shiny.pal b/graphics/pokemon/gen_8/grimmsnarl/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/grimmsnarl/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/grimmsnarl/gigantamax/shiny.pal diff --git a/graphics/pokemon/grimmsnarl/icon.png b/graphics/pokemon/gen_8/grimmsnarl/icon.png similarity index 100% rename from graphics/pokemon/grimmsnarl/icon.png rename to graphics/pokemon/gen_8/grimmsnarl/icon.png diff --git a/graphics/pokemon/grimmsnarl/normal.pal b/graphics/pokemon/gen_8/grimmsnarl/normal.pal similarity index 100% rename from graphics/pokemon/grimmsnarl/normal.pal rename to graphics/pokemon/gen_8/grimmsnarl/normal.pal diff --git a/graphics/pokemon/grimmsnarl/shiny.pal b/graphics/pokemon/gen_8/grimmsnarl/shiny.pal similarity index 100% rename from graphics/pokemon/grimmsnarl/shiny.pal rename to graphics/pokemon/gen_8/grimmsnarl/shiny.pal diff --git a/graphics/pokemon/grookey/back.png b/graphics/pokemon/gen_8/grookey/back.png similarity index 100% rename from graphics/pokemon/grookey/back.png rename to graphics/pokemon/gen_8/grookey/back.png diff --git a/graphics/pokemon/grookey/footprint.png b/graphics/pokemon/gen_8/grookey/footprint.png similarity index 100% rename from graphics/pokemon/grookey/footprint.png rename to graphics/pokemon/gen_8/grookey/footprint.png diff --git a/graphics/pokemon/grookey/front.png b/graphics/pokemon/gen_8/grookey/front.png similarity index 100% rename from graphics/pokemon/grookey/front.png rename to graphics/pokemon/gen_8/grookey/front.png diff --git a/graphics/pokemon/grookey/icon.png b/graphics/pokemon/gen_8/grookey/icon.png similarity index 100% rename from graphics/pokemon/grookey/icon.png rename to graphics/pokemon/gen_8/grookey/icon.png diff --git a/graphics/pokemon/grookey/normal.pal b/graphics/pokemon/gen_8/grookey/normal.pal similarity index 100% rename from graphics/pokemon/grookey/normal.pal rename to graphics/pokemon/gen_8/grookey/normal.pal diff --git a/graphics/pokemon/grookey/shiny.pal b/graphics/pokemon/gen_8/grookey/shiny.pal similarity index 100% rename from graphics/pokemon/grookey/shiny.pal rename to graphics/pokemon/gen_8/grookey/shiny.pal diff --git a/graphics/pokemon/hatenna/back.png b/graphics/pokemon/gen_8/hatenna/back.png similarity index 100% rename from graphics/pokemon/hatenna/back.png rename to graphics/pokemon/gen_8/hatenna/back.png diff --git a/graphics/pokemon/morpeko/footprint.png b/graphics/pokemon/gen_8/hatenna/footprint.png similarity index 100% rename from graphics/pokemon/morpeko/footprint.png rename to graphics/pokemon/gen_8/hatenna/footprint.png diff --git a/graphics/pokemon/hatenna/front.png b/graphics/pokemon/gen_8/hatenna/front.png similarity index 100% rename from graphics/pokemon/hatenna/front.png rename to graphics/pokemon/gen_8/hatenna/front.png diff --git a/graphics/pokemon/hatenna/icon.png b/graphics/pokemon/gen_8/hatenna/icon.png similarity index 100% rename from graphics/pokemon/hatenna/icon.png rename to graphics/pokemon/gen_8/hatenna/icon.png diff --git a/graphics/pokemon/hatenna/normal.pal b/graphics/pokemon/gen_8/hatenna/normal.pal similarity index 100% rename from graphics/pokemon/hatenna/normal.pal rename to graphics/pokemon/gen_8/hatenna/normal.pal diff --git a/graphics/pokemon/hatenna/shiny.pal b/graphics/pokemon/gen_8/hatenna/shiny.pal similarity index 100% rename from graphics/pokemon/hatenna/shiny.pal rename to graphics/pokemon/gen_8/hatenna/shiny.pal diff --git a/graphics/pokemon/hatterene/back.png b/graphics/pokemon/gen_8/hatterene/back.png similarity index 100% rename from graphics/pokemon/hatterene/back.png rename to graphics/pokemon/gen_8/hatterene/back.png diff --git a/graphics/pokemon/whirlipede/footprint.png b/graphics/pokemon/gen_8/hatterene/footprint.png similarity index 100% rename from graphics/pokemon/whirlipede/footprint.png rename to graphics/pokemon/gen_8/hatterene/footprint.png diff --git a/graphics/pokemon/hatterene/front.png b/graphics/pokemon/gen_8/hatterene/front.png similarity index 100% rename from graphics/pokemon/hatterene/front.png rename to graphics/pokemon/gen_8/hatterene/front.png diff --git a/graphics/pokemon/hatterene/gigantamax/back.png b/graphics/pokemon/gen_8/hatterene/gigantamax/back.png similarity index 100% rename from graphics/pokemon/hatterene/gigantamax/back.png rename to graphics/pokemon/gen_8/hatterene/gigantamax/back.png diff --git a/graphics/pokemon/hatterene/gigantamax/front.png b/graphics/pokemon/gen_8/hatterene/gigantamax/front.png similarity index 100% rename from graphics/pokemon/hatterene/gigantamax/front.png rename to graphics/pokemon/gen_8/hatterene/gigantamax/front.png diff --git a/graphics/pokemon/hatterene/gigantamax/icon.png b/graphics/pokemon/gen_8/hatterene/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/hatterene/gigantamax/icon.png rename to graphics/pokemon/gen_8/hatterene/gigantamax/icon.png diff --git a/graphics/pokemon/hatterene/gigantamax/normal.pal b/graphics/pokemon/gen_8/hatterene/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/hatterene/gigantamax/normal.pal rename to graphics/pokemon/gen_8/hatterene/gigantamax/normal.pal diff --git a/graphics/pokemon/hatterene/gigantamax/shiny.pal b/graphics/pokemon/gen_8/hatterene/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/hatterene/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/hatterene/gigantamax/shiny.pal diff --git a/graphics/pokemon/hatterene/icon.png b/graphics/pokemon/gen_8/hatterene/icon.png similarity index 100% rename from graphics/pokemon/hatterene/icon.png rename to graphics/pokemon/gen_8/hatterene/icon.png diff --git a/graphics/pokemon/hatterene/normal.pal b/graphics/pokemon/gen_8/hatterene/normal.pal similarity index 100% rename from graphics/pokemon/hatterene/normal.pal rename to graphics/pokemon/gen_8/hatterene/normal.pal diff --git a/graphics/pokemon/hatterene/shiny.pal b/graphics/pokemon/gen_8/hatterene/shiny.pal similarity index 100% rename from graphics/pokemon/hatterene/shiny.pal rename to graphics/pokemon/gen_8/hatterene/shiny.pal diff --git a/graphics/pokemon/hattrem/back.png b/graphics/pokemon/gen_8/hattrem/back.png similarity index 100% rename from graphics/pokemon/hattrem/back.png rename to graphics/pokemon/gen_8/hattrem/back.png diff --git a/graphics/pokemon/wimpod/footprint.png b/graphics/pokemon/gen_8/hattrem/footprint.png similarity index 100% rename from graphics/pokemon/wimpod/footprint.png rename to graphics/pokemon/gen_8/hattrem/footprint.png diff --git a/graphics/pokemon/hattrem/front.png b/graphics/pokemon/gen_8/hattrem/front.png similarity index 100% rename from graphics/pokemon/hattrem/front.png rename to graphics/pokemon/gen_8/hattrem/front.png diff --git a/graphics/pokemon/hattrem/icon.png b/graphics/pokemon/gen_8/hattrem/icon.png similarity index 100% rename from graphics/pokemon/hattrem/icon.png rename to graphics/pokemon/gen_8/hattrem/icon.png diff --git a/graphics/pokemon/hattrem/normal.pal b/graphics/pokemon/gen_8/hattrem/normal.pal similarity index 100% rename from graphics/pokemon/hattrem/normal.pal rename to graphics/pokemon/gen_8/hattrem/normal.pal diff --git a/graphics/pokemon/hattrem/shiny.pal b/graphics/pokemon/gen_8/hattrem/shiny.pal similarity index 100% rename from graphics/pokemon/hattrem/shiny.pal rename to graphics/pokemon/gen_8/hattrem/shiny.pal diff --git a/graphics/pokemon/impidimp/back.png b/graphics/pokemon/gen_8/impidimp/back.png similarity index 100% rename from graphics/pokemon/impidimp/back.png rename to graphics/pokemon/gen_8/impidimp/back.png diff --git a/graphics/pokemon/shiinotic/footprint.png b/graphics/pokemon/gen_8/impidimp/footprint.png similarity index 100% rename from graphics/pokemon/shiinotic/footprint.png rename to graphics/pokemon/gen_8/impidimp/footprint.png diff --git a/graphics/pokemon/impidimp/front.png b/graphics/pokemon/gen_8/impidimp/front.png similarity index 100% rename from graphics/pokemon/impidimp/front.png rename to graphics/pokemon/gen_8/impidimp/front.png diff --git a/graphics/pokemon/impidimp/icon.png b/graphics/pokemon/gen_8/impidimp/icon.png similarity index 100% rename from graphics/pokemon/impidimp/icon.png rename to graphics/pokemon/gen_8/impidimp/icon.png diff --git a/graphics/pokemon/impidimp/normal.pal b/graphics/pokemon/gen_8/impidimp/normal.pal similarity index 100% rename from graphics/pokemon/impidimp/normal.pal rename to graphics/pokemon/gen_8/impidimp/normal.pal diff --git a/graphics/pokemon/impidimp/shiny.pal b/graphics/pokemon/gen_8/impidimp/shiny.pal similarity index 100% rename from graphics/pokemon/impidimp/shiny.pal rename to graphics/pokemon/gen_8/impidimp/shiny.pal diff --git a/graphics/pokemon/indeedee/back.png b/graphics/pokemon/gen_8/indeedee/back.png similarity index 100% rename from graphics/pokemon/indeedee/back.png rename to graphics/pokemon/gen_8/indeedee/back.png diff --git a/graphics/pokemon/indeedee/female/back.png b/graphics/pokemon/gen_8/indeedee/female/back.png similarity index 100% rename from graphics/pokemon/indeedee/female/back.png rename to graphics/pokemon/gen_8/indeedee/female/back.png diff --git a/graphics/pokemon/indeedee/female/front.png b/graphics/pokemon/gen_8/indeedee/female/front.png similarity index 100% rename from graphics/pokemon/indeedee/female/front.png rename to graphics/pokemon/gen_8/indeedee/female/front.png diff --git a/graphics/pokemon/indeedee/female/icon.png b/graphics/pokemon/gen_8/indeedee/female/icon.png similarity index 100% rename from graphics/pokemon/indeedee/female/icon.png rename to graphics/pokemon/gen_8/indeedee/female/icon.png diff --git a/graphics/pokemon/indeedee/female/normal.pal b/graphics/pokemon/gen_8/indeedee/female/normal.pal similarity index 100% rename from graphics/pokemon/indeedee/female/normal.pal rename to graphics/pokemon/gen_8/indeedee/female/normal.pal diff --git a/graphics/pokemon/indeedee/female/shiny.pal b/graphics/pokemon/gen_8/indeedee/female/shiny.pal similarity index 100% rename from graphics/pokemon/indeedee/female/shiny.pal rename to graphics/pokemon/gen_8/indeedee/female/shiny.pal diff --git a/graphics/pokemon/indeedee/footprint.png b/graphics/pokemon/gen_8/indeedee/footprint.png similarity index 100% rename from graphics/pokemon/indeedee/footprint.png rename to graphics/pokemon/gen_8/indeedee/footprint.png diff --git a/graphics/pokemon/indeedee/front.png b/graphics/pokemon/gen_8/indeedee/front.png similarity index 100% rename from graphics/pokemon/indeedee/front.png rename to graphics/pokemon/gen_8/indeedee/front.png diff --git a/graphics/pokemon/indeedee/icon.png b/graphics/pokemon/gen_8/indeedee/icon.png similarity index 100% rename from graphics/pokemon/indeedee/icon.png rename to graphics/pokemon/gen_8/indeedee/icon.png diff --git a/graphics/pokemon/indeedee/normal.pal b/graphics/pokemon/gen_8/indeedee/normal.pal similarity index 100% rename from graphics/pokemon/indeedee/normal.pal rename to graphics/pokemon/gen_8/indeedee/normal.pal diff --git a/graphics/pokemon/indeedee/shiny.pal b/graphics/pokemon/gen_8/indeedee/shiny.pal similarity index 100% rename from graphics/pokemon/indeedee/shiny.pal rename to graphics/pokemon/gen_8/indeedee/shiny.pal diff --git a/graphics/pokemon/inteleon/back.png b/graphics/pokemon/gen_8/inteleon/back.png similarity index 100% rename from graphics/pokemon/inteleon/back.png rename to graphics/pokemon/gen_8/inteleon/back.png diff --git a/graphics/pokemon/inteleon/footprint.png b/graphics/pokemon/gen_8/inteleon/footprint.png similarity index 100% rename from graphics/pokemon/inteleon/footprint.png rename to graphics/pokemon/gen_8/inteleon/footprint.png diff --git a/graphics/pokemon/inteleon/front.png b/graphics/pokemon/gen_8/inteleon/front.png similarity index 100% rename from graphics/pokemon/inteleon/front.png rename to graphics/pokemon/gen_8/inteleon/front.png diff --git a/graphics/pokemon/inteleon/gigantamax/back.png b/graphics/pokemon/gen_8/inteleon/gigantamax/back.png similarity index 100% rename from graphics/pokemon/inteleon/gigantamax/back.png rename to graphics/pokemon/gen_8/inteleon/gigantamax/back.png diff --git a/graphics/pokemon/inteleon/gigantamax/front.png b/graphics/pokemon/gen_8/inteleon/gigantamax/front.png similarity index 100% rename from graphics/pokemon/inteleon/gigantamax/front.png rename to graphics/pokemon/gen_8/inteleon/gigantamax/front.png diff --git a/graphics/pokemon/inteleon/gigantamax/icon.png b/graphics/pokemon/gen_8/inteleon/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/inteleon/gigantamax/icon.png rename to graphics/pokemon/gen_8/inteleon/gigantamax/icon.png diff --git a/graphics/pokemon/inteleon/gigantamax/normal.pal b/graphics/pokemon/gen_8/inteleon/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/inteleon/gigantamax/normal.pal rename to graphics/pokemon/gen_8/inteleon/gigantamax/normal.pal diff --git a/graphics/pokemon/inteleon/gigantamax/shiny.pal b/graphics/pokemon/gen_8/inteleon/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/inteleon/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/inteleon/gigantamax/shiny.pal diff --git a/graphics/pokemon/inteleon/icon.png b/graphics/pokemon/gen_8/inteleon/icon.png similarity index 100% rename from graphics/pokemon/inteleon/icon.png rename to graphics/pokemon/gen_8/inteleon/icon.png diff --git a/graphics/pokemon/inteleon/normal.pal b/graphics/pokemon/gen_8/inteleon/normal.pal similarity index 100% rename from graphics/pokemon/inteleon/normal.pal rename to graphics/pokemon/gen_8/inteleon/normal.pal diff --git a/graphics/pokemon/inteleon/shiny.pal b/graphics/pokemon/gen_8/inteleon/shiny.pal similarity index 100% rename from graphics/pokemon/inteleon/shiny.pal rename to graphics/pokemon/gen_8/inteleon/shiny.pal diff --git a/graphics/pokemon/kleavor/back.png b/graphics/pokemon/gen_8/kleavor/back.png similarity index 100% rename from graphics/pokemon/kleavor/back.png rename to graphics/pokemon/gen_8/kleavor/back.png diff --git a/graphics/pokemon/kleavor/front.png b/graphics/pokemon/gen_8/kleavor/front.png similarity index 100% rename from graphics/pokemon/kleavor/front.png rename to graphics/pokemon/gen_8/kleavor/front.png diff --git a/graphics/pokemon/kleavor/icon.png b/graphics/pokemon/gen_8/kleavor/icon.png similarity index 100% rename from graphics/pokemon/kleavor/icon.png rename to graphics/pokemon/gen_8/kleavor/icon.png diff --git a/graphics/pokemon/kleavor/normal.pal b/graphics/pokemon/gen_8/kleavor/normal.pal similarity index 100% rename from graphics/pokemon/kleavor/normal.pal rename to graphics/pokemon/gen_8/kleavor/normal.pal diff --git a/graphics/pokemon/kleavor/shiny.pal b/graphics/pokemon/gen_8/kleavor/shiny.pal similarity index 100% rename from graphics/pokemon/kleavor/shiny.pal rename to graphics/pokemon/gen_8/kleavor/shiny.pal diff --git a/graphics/pokemon/kubfu/back.png b/graphics/pokemon/gen_8/kubfu/back.png similarity index 100% rename from graphics/pokemon/kubfu/back.png rename to graphics/pokemon/gen_8/kubfu/back.png diff --git a/graphics/pokemon/kubfu/footprint.png b/graphics/pokemon/gen_8/kubfu/footprint.png similarity index 100% rename from graphics/pokemon/kubfu/footprint.png rename to graphics/pokemon/gen_8/kubfu/footprint.png diff --git a/graphics/pokemon/kubfu/front.png b/graphics/pokemon/gen_8/kubfu/front.png similarity index 100% rename from graphics/pokemon/kubfu/front.png rename to graphics/pokemon/gen_8/kubfu/front.png diff --git a/graphics/pokemon/kubfu/icon.png b/graphics/pokemon/gen_8/kubfu/icon.png similarity index 100% rename from graphics/pokemon/kubfu/icon.png rename to graphics/pokemon/gen_8/kubfu/icon.png diff --git a/graphics/pokemon/kubfu/normal.pal b/graphics/pokemon/gen_8/kubfu/normal.pal similarity index 100% rename from graphics/pokemon/kubfu/normal.pal rename to graphics/pokemon/gen_8/kubfu/normal.pal diff --git a/graphics/pokemon/kubfu/shiny.pal b/graphics/pokemon/gen_8/kubfu/shiny.pal similarity index 100% rename from graphics/pokemon/kubfu/shiny.pal rename to graphics/pokemon/gen_8/kubfu/shiny.pal diff --git a/graphics/pokemon/milcery/back.png b/graphics/pokemon/gen_8/milcery/back.png similarity index 100% rename from graphics/pokemon/milcery/back.png rename to graphics/pokemon/gen_8/milcery/back.png diff --git a/graphics/pokemon/whiscash/footprint.png b/graphics/pokemon/gen_8/milcery/footprint.png similarity index 100% rename from graphics/pokemon/whiscash/footprint.png rename to graphics/pokemon/gen_8/milcery/footprint.png diff --git a/graphics/pokemon/milcery/front.png b/graphics/pokemon/gen_8/milcery/front.png similarity index 100% rename from graphics/pokemon/milcery/front.png rename to graphics/pokemon/gen_8/milcery/front.png diff --git a/graphics/pokemon/milcery/icon.png b/graphics/pokemon/gen_8/milcery/icon.png similarity index 100% rename from graphics/pokemon/milcery/icon.png rename to graphics/pokemon/gen_8/milcery/icon.png diff --git a/graphics/pokemon/milcery/normal.pal b/graphics/pokemon/gen_8/milcery/normal.pal similarity index 100% rename from graphics/pokemon/milcery/normal.pal rename to graphics/pokemon/gen_8/milcery/normal.pal diff --git a/graphics/pokemon/milcery/shiny.pal b/graphics/pokemon/gen_8/milcery/shiny.pal similarity index 100% rename from graphics/pokemon/milcery/shiny.pal rename to graphics/pokemon/gen_8/milcery/shiny.pal diff --git a/graphics/pokemon/morgrem/back.png b/graphics/pokemon/gen_8/morgrem/back.png similarity index 100% rename from graphics/pokemon/morgrem/back.png rename to graphics/pokemon/gen_8/morgrem/back.png diff --git a/graphics/pokemon/morgrem/footprint.png b/graphics/pokemon/gen_8/morgrem/footprint.png similarity index 100% rename from graphics/pokemon/morgrem/footprint.png rename to graphics/pokemon/gen_8/morgrem/footprint.png diff --git a/graphics/pokemon/morgrem/front.png b/graphics/pokemon/gen_8/morgrem/front.png similarity index 100% rename from graphics/pokemon/morgrem/front.png rename to graphics/pokemon/gen_8/morgrem/front.png diff --git a/graphics/pokemon/morgrem/icon.png b/graphics/pokemon/gen_8/morgrem/icon.png similarity index 100% rename from graphics/pokemon/morgrem/icon.png rename to graphics/pokemon/gen_8/morgrem/icon.png diff --git a/graphics/pokemon/morgrem/normal.pal b/graphics/pokemon/gen_8/morgrem/normal.pal similarity index 100% rename from graphics/pokemon/morgrem/normal.pal rename to graphics/pokemon/gen_8/morgrem/normal.pal diff --git a/graphics/pokemon/morgrem/shiny.pal b/graphics/pokemon/gen_8/morgrem/shiny.pal similarity index 100% rename from graphics/pokemon/morgrem/shiny.pal rename to graphics/pokemon/gen_8/morgrem/shiny.pal diff --git a/graphics/pokemon/morpeko/back.png b/graphics/pokemon/gen_8/morpeko/back.png similarity index 100% rename from graphics/pokemon/morpeko/back.png rename to graphics/pokemon/gen_8/morpeko/back.png diff --git a/graphics/pokemon/togedemaru/footprint.png b/graphics/pokemon/gen_8/morpeko/footprint.png similarity index 100% rename from graphics/pokemon/togedemaru/footprint.png rename to graphics/pokemon/gen_8/morpeko/footprint.png diff --git a/graphics/pokemon/morpeko/front.png b/graphics/pokemon/gen_8/morpeko/front.png similarity index 100% rename from graphics/pokemon/morpeko/front.png rename to graphics/pokemon/gen_8/morpeko/front.png diff --git a/graphics/pokemon/morpeko/hangry/back.png b/graphics/pokemon/gen_8/morpeko/hangry/back.png similarity index 100% rename from graphics/pokemon/morpeko/hangry/back.png rename to graphics/pokemon/gen_8/morpeko/hangry/back.png diff --git a/graphics/pokemon/morpeko/hangry/front.png b/graphics/pokemon/gen_8/morpeko/hangry/front.png similarity index 100% rename from graphics/pokemon/morpeko/hangry/front.png rename to graphics/pokemon/gen_8/morpeko/hangry/front.png diff --git a/graphics/pokemon/morpeko/hangry/icon.png b/graphics/pokemon/gen_8/morpeko/hangry/icon.png similarity index 100% rename from graphics/pokemon/morpeko/hangry/icon.png rename to graphics/pokemon/gen_8/morpeko/hangry/icon.png diff --git a/graphics/pokemon/morpeko/hangry/normal.pal b/graphics/pokemon/gen_8/morpeko/hangry/normal.pal similarity index 100% rename from graphics/pokemon/morpeko/hangry/normal.pal rename to graphics/pokemon/gen_8/morpeko/hangry/normal.pal diff --git a/graphics/pokemon/morpeko/hangry/shiny.pal b/graphics/pokemon/gen_8/morpeko/hangry/shiny.pal similarity index 100% rename from graphics/pokemon/morpeko/hangry/shiny.pal rename to graphics/pokemon/gen_8/morpeko/hangry/shiny.pal diff --git a/graphics/pokemon/morpeko/icon.png b/graphics/pokemon/gen_8/morpeko/icon.png similarity index 100% rename from graphics/pokemon/morpeko/icon.png rename to graphics/pokemon/gen_8/morpeko/icon.png diff --git a/graphics/pokemon/morpeko/normal.pal b/graphics/pokemon/gen_8/morpeko/normal.pal similarity index 100% rename from graphics/pokemon/morpeko/normal.pal rename to graphics/pokemon/gen_8/morpeko/normal.pal diff --git a/graphics/pokemon/morpeko/shiny.pal b/graphics/pokemon/gen_8/morpeko/shiny.pal similarity index 100% rename from graphics/pokemon/morpeko/shiny.pal rename to graphics/pokemon/gen_8/morpeko/shiny.pal diff --git a/graphics/pokemon/mr_rime/back.png b/graphics/pokemon/gen_8/mr_rime/back.png similarity index 100% rename from graphics/pokemon/mr_rime/back.png rename to graphics/pokemon/gen_8/mr_rime/back.png diff --git a/graphics/pokemon/mr_rime/footprint.png b/graphics/pokemon/gen_8/mr_rime/footprint.png similarity index 100% rename from graphics/pokemon/mr_rime/footprint.png rename to graphics/pokemon/gen_8/mr_rime/footprint.png diff --git a/graphics/pokemon/mr_rime/front.png b/graphics/pokemon/gen_8/mr_rime/front.png similarity index 100% rename from graphics/pokemon/mr_rime/front.png rename to graphics/pokemon/gen_8/mr_rime/front.png diff --git a/graphics/pokemon/mr_rime/icon.png b/graphics/pokemon/gen_8/mr_rime/icon.png similarity index 100% rename from graphics/pokemon/mr_rime/icon.png rename to graphics/pokemon/gen_8/mr_rime/icon.png diff --git a/graphics/pokemon/mr_rime/normal.pal b/graphics/pokemon/gen_8/mr_rime/normal.pal similarity index 100% rename from graphics/pokemon/mr_rime/normal.pal rename to graphics/pokemon/gen_8/mr_rime/normal.pal diff --git a/graphics/pokemon/mr_rime/shiny.pal b/graphics/pokemon/gen_8/mr_rime/shiny.pal similarity index 100% rename from graphics/pokemon/mr_rime/shiny.pal rename to graphics/pokemon/gen_8/mr_rime/shiny.pal diff --git a/graphics/pokemon/nickit/back.png b/graphics/pokemon/gen_8/nickit/back.png similarity index 100% rename from graphics/pokemon/nickit/back.png rename to graphics/pokemon/gen_8/nickit/back.png diff --git a/graphics/pokemon/nickit/footprint.png b/graphics/pokemon/gen_8/nickit/footprint.png similarity index 100% rename from graphics/pokemon/nickit/footprint.png rename to graphics/pokemon/gen_8/nickit/footprint.png diff --git a/graphics/pokemon/nickit/front.png b/graphics/pokemon/gen_8/nickit/front.png similarity index 100% rename from graphics/pokemon/nickit/front.png rename to graphics/pokemon/gen_8/nickit/front.png diff --git a/graphics/pokemon/nickit/icon.png b/graphics/pokemon/gen_8/nickit/icon.png similarity index 100% rename from graphics/pokemon/nickit/icon.png rename to graphics/pokemon/gen_8/nickit/icon.png diff --git a/graphics/pokemon/nickit/normal.pal b/graphics/pokemon/gen_8/nickit/normal.pal similarity index 100% rename from graphics/pokemon/nickit/normal.pal rename to graphics/pokemon/gen_8/nickit/normal.pal diff --git a/graphics/pokemon/nickit/shiny.pal b/graphics/pokemon/gen_8/nickit/shiny.pal similarity index 100% rename from graphics/pokemon/nickit/shiny.pal rename to graphics/pokemon/gen_8/nickit/shiny.pal diff --git a/graphics/pokemon/obstagoon/back.png b/graphics/pokemon/gen_8/obstagoon/back.png similarity index 100% rename from graphics/pokemon/obstagoon/back.png rename to graphics/pokemon/gen_8/obstagoon/back.png diff --git a/graphics/pokemon/obstagoon/footprint.png b/graphics/pokemon/gen_8/obstagoon/footprint.png similarity index 100% rename from graphics/pokemon/obstagoon/footprint.png rename to graphics/pokemon/gen_8/obstagoon/footprint.png diff --git a/graphics/pokemon/obstagoon/front.png b/graphics/pokemon/gen_8/obstagoon/front.png similarity index 100% rename from graphics/pokemon/obstagoon/front.png rename to graphics/pokemon/gen_8/obstagoon/front.png diff --git a/graphics/pokemon/obstagoon/icon.png b/graphics/pokemon/gen_8/obstagoon/icon.png similarity index 100% rename from graphics/pokemon/obstagoon/icon.png rename to graphics/pokemon/gen_8/obstagoon/icon.png diff --git a/graphics/pokemon/obstagoon/normal.pal b/graphics/pokemon/gen_8/obstagoon/normal.pal similarity index 100% rename from graphics/pokemon/obstagoon/normal.pal rename to graphics/pokemon/gen_8/obstagoon/normal.pal diff --git a/graphics/pokemon/obstagoon/shiny.pal b/graphics/pokemon/gen_8/obstagoon/shiny.pal similarity index 100% rename from graphics/pokemon/obstagoon/shiny.pal rename to graphics/pokemon/gen_8/obstagoon/shiny.pal diff --git a/graphics/pokemon/orbeetle/back.png b/graphics/pokemon/gen_8/orbeetle/back.png similarity index 100% rename from graphics/pokemon/orbeetle/back.png rename to graphics/pokemon/gen_8/orbeetle/back.png diff --git a/graphics/pokemon/orbeetle/footprint.png b/graphics/pokemon/gen_8/orbeetle/footprint.png similarity index 100% rename from graphics/pokemon/orbeetle/footprint.png rename to graphics/pokemon/gen_8/orbeetle/footprint.png diff --git a/graphics/pokemon/orbeetle/front.png b/graphics/pokemon/gen_8/orbeetle/front.png similarity index 100% rename from graphics/pokemon/orbeetle/front.png rename to graphics/pokemon/gen_8/orbeetle/front.png diff --git a/graphics/pokemon/orbeetle/gigantamax/back.png b/graphics/pokemon/gen_8/orbeetle/gigantamax/back.png similarity index 100% rename from graphics/pokemon/orbeetle/gigantamax/back.png rename to graphics/pokemon/gen_8/orbeetle/gigantamax/back.png diff --git a/graphics/pokemon/orbeetle/gigantamax/front.png b/graphics/pokemon/gen_8/orbeetle/gigantamax/front.png similarity index 100% rename from graphics/pokemon/orbeetle/gigantamax/front.png rename to graphics/pokemon/gen_8/orbeetle/gigantamax/front.png diff --git a/graphics/pokemon/orbeetle/gigantamax/icon.png b/graphics/pokemon/gen_8/orbeetle/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/orbeetle/gigantamax/icon.png rename to graphics/pokemon/gen_8/orbeetle/gigantamax/icon.png diff --git a/graphics/pokemon/orbeetle/gigantamax/normal.pal b/graphics/pokemon/gen_8/orbeetle/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/orbeetle/gigantamax/normal.pal rename to graphics/pokemon/gen_8/orbeetle/gigantamax/normal.pal diff --git a/graphics/pokemon/orbeetle/gigantamax/shiny.pal b/graphics/pokemon/gen_8/orbeetle/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/orbeetle/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/orbeetle/gigantamax/shiny.pal diff --git a/graphics/pokemon/orbeetle/icon.png b/graphics/pokemon/gen_8/orbeetle/icon.png similarity index 100% rename from graphics/pokemon/orbeetle/icon.png rename to graphics/pokemon/gen_8/orbeetle/icon.png diff --git a/graphics/pokemon/orbeetle/normal.pal b/graphics/pokemon/gen_8/orbeetle/normal.pal similarity index 100% rename from graphics/pokemon/orbeetle/normal.pal rename to graphics/pokemon/gen_8/orbeetle/normal.pal diff --git a/graphics/pokemon/orbeetle/shiny.pal b/graphics/pokemon/gen_8/orbeetle/shiny.pal similarity index 100% rename from graphics/pokemon/orbeetle/shiny.pal rename to graphics/pokemon/gen_8/orbeetle/shiny.pal diff --git a/graphics/pokemon/overqwil/back.png b/graphics/pokemon/gen_8/overqwil/back.png similarity index 100% rename from graphics/pokemon/overqwil/back.png rename to graphics/pokemon/gen_8/overqwil/back.png diff --git a/graphics/pokemon/overqwil/front.png b/graphics/pokemon/gen_8/overqwil/front.png similarity index 100% rename from graphics/pokemon/overqwil/front.png rename to graphics/pokemon/gen_8/overqwil/front.png diff --git a/graphics/pokemon/overqwil/icon.png b/graphics/pokemon/gen_8/overqwil/icon.png similarity index 100% rename from graphics/pokemon/overqwil/icon.png rename to graphics/pokemon/gen_8/overqwil/icon.png diff --git a/graphics/pokemon/overqwil/normal.pal b/graphics/pokemon/gen_8/overqwil/normal.pal similarity index 100% rename from graphics/pokemon/overqwil/normal.pal rename to graphics/pokemon/gen_8/overqwil/normal.pal diff --git a/graphics/pokemon/overqwil/shiny.pal b/graphics/pokemon/gen_8/overqwil/shiny.pal similarity index 100% rename from graphics/pokemon/overqwil/shiny.pal rename to graphics/pokemon/gen_8/overqwil/shiny.pal diff --git a/graphics/pokemon/perrserker/back.png b/graphics/pokemon/gen_8/perrserker/back.png similarity index 100% rename from graphics/pokemon/perrserker/back.png rename to graphics/pokemon/gen_8/perrserker/back.png diff --git a/graphics/pokemon/perrserker/footprint.png b/graphics/pokemon/gen_8/perrserker/footprint.png similarity index 100% rename from graphics/pokemon/perrserker/footprint.png rename to graphics/pokemon/gen_8/perrserker/footprint.png diff --git a/graphics/pokemon/perrserker/front.png b/graphics/pokemon/gen_8/perrserker/front.png similarity index 100% rename from graphics/pokemon/perrserker/front.png rename to graphics/pokemon/gen_8/perrserker/front.png diff --git a/graphics/pokemon/perrserker/icon.png b/graphics/pokemon/gen_8/perrserker/icon.png similarity index 100% rename from graphics/pokemon/perrserker/icon.png rename to graphics/pokemon/gen_8/perrserker/icon.png diff --git a/graphics/pokemon/perrserker/normal.pal b/graphics/pokemon/gen_8/perrserker/normal.pal similarity index 100% rename from graphics/pokemon/perrserker/normal.pal rename to graphics/pokemon/gen_8/perrserker/normal.pal diff --git a/graphics/pokemon/perrserker/shiny.pal b/graphics/pokemon/gen_8/perrserker/shiny.pal similarity index 100% rename from graphics/pokemon/perrserker/shiny.pal rename to graphics/pokemon/gen_8/perrserker/shiny.pal diff --git a/graphics/pokemon/pincurchin/anim_front.png b/graphics/pokemon/gen_8/pincurchin/anim_front.png similarity index 100% rename from graphics/pokemon/pincurchin/anim_front.png rename to graphics/pokemon/gen_8/pincurchin/anim_front.png diff --git a/graphics/pokemon/pincurchin/back.png b/graphics/pokemon/gen_8/pincurchin/back.png similarity index 100% rename from graphics/pokemon/pincurchin/back.png rename to graphics/pokemon/gen_8/pincurchin/back.png diff --git a/graphics/pokemon/spinarak/footprint.png b/graphics/pokemon/gen_8/pincurchin/footprint.png similarity index 100% rename from graphics/pokemon/spinarak/footprint.png rename to graphics/pokemon/gen_8/pincurchin/footprint.png diff --git a/graphics/pokemon/pincurchin/icon.png b/graphics/pokemon/gen_8/pincurchin/icon.png similarity index 100% rename from graphics/pokemon/pincurchin/icon.png rename to graphics/pokemon/gen_8/pincurchin/icon.png diff --git a/graphics/pokemon/pincurchin/normal.pal b/graphics/pokemon/gen_8/pincurchin/normal.pal similarity index 100% rename from graphics/pokemon/pincurchin/normal.pal rename to graphics/pokemon/gen_8/pincurchin/normal.pal diff --git a/graphics/pokemon/pincurchin/shiny.pal b/graphics/pokemon/gen_8/pincurchin/shiny.pal similarity index 100% rename from graphics/pokemon/pincurchin/shiny.pal rename to graphics/pokemon/gen_8/pincurchin/shiny.pal diff --git a/graphics/pokemon/polteageist/back.png b/graphics/pokemon/gen_8/polteageist/back.png similarity index 100% rename from graphics/pokemon/polteageist/back.png rename to graphics/pokemon/gen_8/polteageist/back.png diff --git a/graphics/pokemon/xerneas/footprint.png b/graphics/pokemon/gen_8/polteageist/footprint.png similarity index 100% rename from graphics/pokemon/xerneas/footprint.png rename to graphics/pokemon/gen_8/polteageist/footprint.png diff --git a/graphics/pokemon/polteageist/front.png b/graphics/pokemon/gen_8/polteageist/front.png similarity index 100% rename from graphics/pokemon/polteageist/front.png rename to graphics/pokemon/gen_8/polteageist/front.png diff --git a/graphics/pokemon/polteageist/icon.png b/graphics/pokemon/gen_8/polteageist/icon.png similarity index 100% rename from graphics/pokemon/polteageist/icon.png rename to graphics/pokemon/gen_8/polteageist/icon.png diff --git a/graphics/pokemon/polteageist/normal.pal b/graphics/pokemon/gen_8/polteageist/normal.pal similarity index 100% rename from graphics/pokemon/polteageist/normal.pal rename to graphics/pokemon/gen_8/polteageist/normal.pal diff --git a/graphics/pokemon/polteageist/shiny.pal b/graphics/pokemon/gen_8/polteageist/shiny.pal similarity index 100% rename from graphics/pokemon/polteageist/shiny.pal rename to graphics/pokemon/gen_8/polteageist/shiny.pal diff --git a/graphics/pokemon/raboot/back.png b/graphics/pokemon/gen_8/raboot/back.png similarity index 100% rename from graphics/pokemon/raboot/back.png rename to graphics/pokemon/gen_8/raboot/back.png diff --git a/graphics/pokemon/raboot/footprint.png b/graphics/pokemon/gen_8/raboot/footprint.png similarity index 100% rename from graphics/pokemon/raboot/footprint.png rename to graphics/pokemon/gen_8/raboot/footprint.png diff --git a/graphics/pokemon/raboot/front.png b/graphics/pokemon/gen_8/raboot/front.png similarity index 100% rename from graphics/pokemon/raboot/front.png rename to graphics/pokemon/gen_8/raboot/front.png diff --git a/graphics/pokemon/raboot/icon.png b/graphics/pokemon/gen_8/raboot/icon.png similarity index 100% rename from graphics/pokemon/raboot/icon.png rename to graphics/pokemon/gen_8/raboot/icon.png diff --git a/graphics/pokemon/raboot/normal.pal b/graphics/pokemon/gen_8/raboot/normal.pal similarity index 100% rename from graphics/pokemon/raboot/normal.pal rename to graphics/pokemon/gen_8/raboot/normal.pal diff --git a/graphics/pokemon/raboot/shiny.pal b/graphics/pokemon/gen_8/raboot/shiny.pal similarity index 100% rename from graphics/pokemon/raboot/shiny.pal rename to graphics/pokemon/gen_8/raboot/shiny.pal diff --git a/graphics/pokemon/regidrago/back.png b/graphics/pokemon/gen_8/regidrago/back.png similarity index 100% rename from graphics/pokemon/regidrago/back.png rename to graphics/pokemon/gen_8/regidrago/back.png diff --git a/graphics/pokemon/regidrago/footprint.png b/graphics/pokemon/gen_8/regidrago/footprint.png similarity index 100% rename from graphics/pokemon/regidrago/footprint.png rename to graphics/pokemon/gen_8/regidrago/footprint.png diff --git a/graphics/pokemon/regidrago/front.png b/graphics/pokemon/gen_8/regidrago/front.png similarity index 100% rename from graphics/pokemon/regidrago/front.png rename to graphics/pokemon/gen_8/regidrago/front.png diff --git a/graphics/pokemon/regidrago/icon.png b/graphics/pokemon/gen_8/regidrago/icon.png similarity index 100% rename from graphics/pokemon/regidrago/icon.png rename to graphics/pokemon/gen_8/regidrago/icon.png diff --git a/graphics/pokemon/regidrago/normal.pal b/graphics/pokemon/gen_8/regidrago/normal.pal similarity index 100% rename from graphics/pokemon/regidrago/normal.pal rename to graphics/pokemon/gen_8/regidrago/normal.pal diff --git a/graphics/pokemon/regidrago/shiny.pal b/graphics/pokemon/gen_8/regidrago/shiny.pal similarity index 100% rename from graphics/pokemon/regidrago/shiny.pal rename to graphics/pokemon/gen_8/regidrago/shiny.pal diff --git a/graphics/pokemon/regieleki/back.png b/graphics/pokemon/gen_8/regieleki/back.png similarity index 100% rename from graphics/pokemon/regieleki/back.png rename to graphics/pokemon/gen_8/regieleki/back.png diff --git a/graphics/pokemon/spritzee/footprint.png b/graphics/pokemon/gen_8/regieleki/footprint.png similarity index 100% rename from graphics/pokemon/spritzee/footprint.png rename to graphics/pokemon/gen_8/regieleki/footprint.png diff --git a/graphics/pokemon/regieleki/front.png b/graphics/pokemon/gen_8/regieleki/front.png similarity index 100% rename from graphics/pokemon/regieleki/front.png rename to graphics/pokemon/gen_8/regieleki/front.png diff --git a/graphics/pokemon/regieleki/icon.png b/graphics/pokemon/gen_8/regieleki/icon.png similarity index 100% rename from graphics/pokemon/regieleki/icon.png rename to graphics/pokemon/gen_8/regieleki/icon.png diff --git a/graphics/pokemon/regieleki/normal.pal b/graphics/pokemon/gen_8/regieleki/normal.pal similarity index 100% rename from graphics/pokemon/regieleki/normal.pal rename to graphics/pokemon/gen_8/regieleki/normal.pal diff --git a/graphics/pokemon/regieleki/shiny.pal b/graphics/pokemon/gen_8/regieleki/shiny.pal similarity index 100% rename from graphics/pokemon/regieleki/shiny.pal rename to graphics/pokemon/gen_8/regieleki/shiny.pal diff --git a/graphics/pokemon/rillaboom/back.png b/graphics/pokemon/gen_8/rillaboom/back.png similarity index 100% rename from graphics/pokemon/rillaboom/back.png rename to graphics/pokemon/gen_8/rillaboom/back.png diff --git a/graphics/pokemon/rillaboom/footprint.png b/graphics/pokemon/gen_8/rillaboom/footprint.png similarity index 100% rename from graphics/pokemon/rillaboom/footprint.png rename to graphics/pokemon/gen_8/rillaboom/footprint.png diff --git a/graphics/pokemon/rillaboom/front.png b/graphics/pokemon/gen_8/rillaboom/front.png similarity index 100% rename from graphics/pokemon/rillaboom/front.png rename to graphics/pokemon/gen_8/rillaboom/front.png diff --git a/graphics/pokemon/rillaboom/gigantamax/back.png b/graphics/pokemon/gen_8/rillaboom/gigantamax/back.png similarity index 100% rename from graphics/pokemon/rillaboom/gigantamax/back.png rename to graphics/pokemon/gen_8/rillaboom/gigantamax/back.png diff --git a/graphics/pokemon/rillaboom/gigantamax/front.png b/graphics/pokemon/gen_8/rillaboom/gigantamax/front.png similarity index 100% rename from graphics/pokemon/rillaboom/gigantamax/front.png rename to graphics/pokemon/gen_8/rillaboom/gigantamax/front.png diff --git a/graphics/pokemon/rillaboom/gigantamax/icon.png b/graphics/pokemon/gen_8/rillaboom/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/rillaboom/gigantamax/icon.png rename to graphics/pokemon/gen_8/rillaboom/gigantamax/icon.png diff --git a/graphics/pokemon/rillaboom/gigantamax/normal.pal b/graphics/pokemon/gen_8/rillaboom/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/rillaboom/gigantamax/normal.pal rename to graphics/pokemon/gen_8/rillaboom/gigantamax/normal.pal diff --git a/graphics/pokemon/rillaboom/gigantamax/shiny.pal b/graphics/pokemon/gen_8/rillaboom/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/rillaboom/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/rillaboom/gigantamax/shiny.pal diff --git a/graphics/pokemon/rillaboom/icon.png b/graphics/pokemon/gen_8/rillaboom/icon.png similarity index 100% rename from graphics/pokemon/rillaboom/icon.png rename to graphics/pokemon/gen_8/rillaboom/icon.png diff --git a/graphics/pokemon/rillaboom/normal.pal b/graphics/pokemon/gen_8/rillaboom/normal.pal similarity index 100% rename from graphics/pokemon/rillaboom/normal.pal rename to graphics/pokemon/gen_8/rillaboom/normal.pal diff --git a/graphics/pokemon/rillaboom/shiny.pal b/graphics/pokemon/gen_8/rillaboom/shiny.pal similarity index 100% rename from graphics/pokemon/rillaboom/shiny.pal rename to graphics/pokemon/gen_8/rillaboom/shiny.pal diff --git a/graphics/pokemon/rolycoly/anim_front.png b/graphics/pokemon/gen_8/rolycoly/anim_front.png similarity index 100% rename from graphics/pokemon/rolycoly/anim_front.png rename to graphics/pokemon/gen_8/rolycoly/anim_front.png diff --git a/graphics/pokemon/rolycoly/back.png b/graphics/pokemon/gen_8/rolycoly/back.png similarity index 100% rename from graphics/pokemon/rolycoly/back.png rename to graphics/pokemon/gen_8/rolycoly/back.png diff --git a/graphics/pokemon/rolycoly/footprint.png b/graphics/pokemon/gen_8/rolycoly/footprint.png similarity index 100% rename from graphics/pokemon/rolycoly/footprint.png rename to graphics/pokemon/gen_8/rolycoly/footprint.png diff --git a/graphics/pokemon/rolycoly/icon.png b/graphics/pokemon/gen_8/rolycoly/icon.png similarity index 100% rename from graphics/pokemon/rolycoly/icon.png rename to graphics/pokemon/gen_8/rolycoly/icon.png diff --git a/graphics/pokemon/rolycoly/normal.pal b/graphics/pokemon/gen_8/rolycoly/normal.pal similarity index 100% rename from graphics/pokemon/rolycoly/normal.pal rename to graphics/pokemon/gen_8/rolycoly/normal.pal diff --git a/graphics/pokemon/rolycoly/shiny.pal b/graphics/pokemon/gen_8/rolycoly/shiny.pal similarity index 100% rename from graphics/pokemon/rolycoly/shiny.pal rename to graphics/pokemon/gen_8/rolycoly/shiny.pal diff --git a/graphics/pokemon/rookidee/anim_front.png b/graphics/pokemon/gen_8/rookidee/anim_front.png similarity index 100% rename from graphics/pokemon/rookidee/anim_front.png rename to graphics/pokemon/gen_8/rookidee/anim_front.png diff --git a/graphics/pokemon/rookidee/back.png b/graphics/pokemon/gen_8/rookidee/back.png similarity index 100% rename from graphics/pokemon/rookidee/back.png rename to graphics/pokemon/gen_8/rookidee/back.png diff --git a/graphics/pokemon/spearow/footprint.png b/graphics/pokemon/gen_8/rookidee/footprint.png similarity index 100% rename from graphics/pokemon/spearow/footprint.png rename to graphics/pokemon/gen_8/rookidee/footprint.png diff --git a/graphics/pokemon/rookidee/icon.png b/graphics/pokemon/gen_8/rookidee/icon.png similarity index 100% rename from graphics/pokemon/rookidee/icon.png rename to graphics/pokemon/gen_8/rookidee/icon.png diff --git a/graphics/pokemon/rookidee/normal.pal b/graphics/pokemon/gen_8/rookidee/normal.pal similarity index 100% rename from graphics/pokemon/rookidee/normal.pal rename to graphics/pokemon/gen_8/rookidee/normal.pal diff --git a/graphics/pokemon/rookidee/shiny.pal b/graphics/pokemon/gen_8/rookidee/shiny.pal similarity index 100% rename from graphics/pokemon/rookidee/shiny.pal rename to graphics/pokemon/gen_8/rookidee/shiny.pal diff --git a/graphics/pokemon/runerigus/back.png b/graphics/pokemon/gen_8/runerigus/back.png similarity index 100% rename from graphics/pokemon/runerigus/back.png rename to graphics/pokemon/gen_8/runerigus/back.png diff --git a/graphics/pokemon/wishiwashi/footprint.png b/graphics/pokemon/gen_8/runerigus/footprint.png similarity index 100% rename from graphics/pokemon/wishiwashi/footprint.png rename to graphics/pokemon/gen_8/runerigus/footprint.png diff --git a/graphics/pokemon/runerigus/front.png b/graphics/pokemon/gen_8/runerigus/front.png similarity index 100% rename from graphics/pokemon/runerigus/front.png rename to graphics/pokemon/gen_8/runerigus/front.png diff --git a/graphics/pokemon/runerigus/icon.png b/graphics/pokemon/gen_8/runerigus/icon.png similarity index 100% rename from graphics/pokemon/runerigus/icon.png rename to graphics/pokemon/gen_8/runerigus/icon.png diff --git a/graphics/pokemon/runerigus/normal.pal b/graphics/pokemon/gen_8/runerigus/normal.pal similarity index 100% rename from graphics/pokemon/runerigus/normal.pal rename to graphics/pokemon/gen_8/runerigus/normal.pal diff --git a/graphics/pokemon/runerigus/shiny.pal b/graphics/pokemon/gen_8/runerigus/shiny.pal similarity index 100% rename from graphics/pokemon/runerigus/shiny.pal rename to graphics/pokemon/gen_8/runerigus/shiny.pal diff --git a/graphics/pokemon/sandaconda/back.png b/graphics/pokemon/gen_8/sandaconda/back.png similarity index 100% rename from graphics/pokemon/sandaconda/back.png rename to graphics/pokemon/gen_8/sandaconda/back.png diff --git a/graphics/pokemon/woobat/footprint.png b/graphics/pokemon/gen_8/sandaconda/footprint.png similarity index 100% rename from graphics/pokemon/woobat/footprint.png rename to graphics/pokemon/gen_8/sandaconda/footprint.png diff --git a/graphics/pokemon/sandaconda/front.png b/graphics/pokemon/gen_8/sandaconda/front.png similarity index 100% rename from graphics/pokemon/sandaconda/front.png rename to graphics/pokemon/gen_8/sandaconda/front.png diff --git a/graphics/pokemon/sandaconda/gigantamax/back.png b/graphics/pokemon/gen_8/sandaconda/gigantamax/back.png similarity index 100% rename from graphics/pokemon/sandaconda/gigantamax/back.png rename to graphics/pokemon/gen_8/sandaconda/gigantamax/back.png diff --git a/graphics/pokemon/sandaconda/gigantamax/front.png b/graphics/pokemon/gen_8/sandaconda/gigantamax/front.png similarity index 100% rename from graphics/pokemon/sandaconda/gigantamax/front.png rename to graphics/pokemon/gen_8/sandaconda/gigantamax/front.png diff --git a/graphics/pokemon/sandaconda/gigantamax/icon.png b/graphics/pokemon/gen_8/sandaconda/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/sandaconda/gigantamax/icon.png rename to graphics/pokemon/gen_8/sandaconda/gigantamax/icon.png diff --git a/graphics/pokemon/sandaconda/gigantamax/normal.pal b/graphics/pokemon/gen_8/sandaconda/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/sandaconda/gigantamax/normal.pal rename to graphics/pokemon/gen_8/sandaconda/gigantamax/normal.pal diff --git a/graphics/pokemon/sandaconda/gigantamax/shiny.pal b/graphics/pokemon/gen_8/sandaconda/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/sandaconda/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/sandaconda/gigantamax/shiny.pal diff --git a/graphics/pokemon/sandaconda/icon.png b/graphics/pokemon/gen_8/sandaconda/icon.png similarity index 100% rename from graphics/pokemon/sandaconda/icon.png rename to graphics/pokemon/gen_8/sandaconda/icon.png diff --git a/graphics/pokemon/sandaconda/normal.pal b/graphics/pokemon/gen_8/sandaconda/normal.pal similarity index 100% rename from graphics/pokemon/sandaconda/normal.pal rename to graphics/pokemon/gen_8/sandaconda/normal.pal diff --git a/graphics/pokemon/sandaconda/shiny.pal b/graphics/pokemon/gen_8/sandaconda/shiny.pal similarity index 100% rename from graphics/pokemon/sandaconda/shiny.pal rename to graphics/pokemon/gen_8/sandaconda/shiny.pal diff --git a/graphics/pokemon/scorbunny/back.png b/graphics/pokemon/gen_8/scorbunny/back.png similarity index 100% rename from graphics/pokemon/scorbunny/back.png rename to graphics/pokemon/gen_8/scorbunny/back.png diff --git a/graphics/pokemon/scorbunny/footprint.png b/graphics/pokemon/gen_8/scorbunny/footprint.png similarity index 100% rename from graphics/pokemon/scorbunny/footprint.png rename to graphics/pokemon/gen_8/scorbunny/footprint.png diff --git a/graphics/pokemon/scorbunny/front.png b/graphics/pokemon/gen_8/scorbunny/front.png similarity index 100% rename from graphics/pokemon/scorbunny/front.png rename to graphics/pokemon/gen_8/scorbunny/front.png diff --git a/graphics/pokemon/scorbunny/icon.png b/graphics/pokemon/gen_8/scorbunny/icon.png similarity index 100% rename from graphics/pokemon/scorbunny/icon.png rename to graphics/pokemon/gen_8/scorbunny/icon.png diff --git a/graphics/pokemon/scorbunny/normal.pal b/graphics/pokemon/gen_8/scorbunny/normal.pal similarity index 100% rename from graphics/pokemon/scorbunny/normal.pal rename to graphics/pokemon/gen_8/scorbunny/normal.pal diff --git a/graphics/pokemon/scorbunny/shiny.pal b/graphics/pokemon/gen_8/scorbunny/shiny.pal similarity index 100% rename from graphics/pokemon/scorbunny/shiny.pal rename to graphics/pokemon/gen_8/scorbunny/shiny.pal diff --git a/graphics/pokemon/silicobra/back.png b/graphics/pokemon/gen_8/silicobra/back.png similarity index 100% rename from graphics/pokemon/silicobra/back.png rename to graphics/pokemon/gen_8/silicobra/back.png diff --git a/graphics/pokemon/wormadam/plant/footprint.png b/graphics/pokemon/gen_8/silicobra/footprint.png similarity index 100% rename from graphics/pokemon/wormadam/plant/footprint.png rename to graphics/pokemon/gen_8/silicobra/footprint.png diff --git a/graphics/pokemon/silicobra/front.png b/graphics/pokemon/gen_8/silicobra/front.png similarity index 100% rename from graphics/pokemon/silicobra/front.png rename to graphics/pokemon/gen_8/silicobra/front.png diff --git a/graphics/pokemon/silicobra/icon.png b/graphics/pokemon/gen_8/silicobra/icon.png similarity index 100% rename from graphics/pokemon/silicobra/icon.png rename to graphics/pokemon/gen_8/silicobra/icon.png diff --git a/graphics/pokemon/silicobra/normal.pal b/graphics/pokemon/gen_8/silicobra/normal.pal similarity index 100% rename from graphics/pokemon/silicobra/normal.pal rename to graphics/pokemon/gen_8/silicobra/normal.pal diff --git a/graphics/pokemon/silicobra/shiny.pal b/graphics/pokemon/gen_8/silicobra/shiny.pal similarity index 100% rename from graphics/pokemon/silicobra/shiny.pal rename to graphics/pokemon/gen_8/silicobra/shiny.pal diff --git a/graphics/pokemon/sinistea/back.png b/graphics/pokemon/gen_8/sinistea/back.png similarity index 100% rename from graphics/pokemon/sinistea/back.png rename to graphics/pokemon/gen_8/sinistea/back.png diff --git a/graphics/pokemon/yamask/footprint.png b/graphics/pokemon/gen_8/sinistea/footprint.png similarity index 100% rename from graphics/pokemon/yamask/footprint.png rename to graphics/pokemon/gen_8/sinistea/footprint.png diff --git a/graphics/pokemon/sinistea/front.png b/graphics/pokemon/gen_8/sinistea/front.png similarity index 100% rename from graphics/pokemon/sinistea/front.png rename to graphics/pokemon/gen_8/sinistea/front.png diff --git a/graphics/pokemon/sinistea/icon.png b/graphics/pokemon/gen_8/sinistea/icon.png similarity index 100% rename from graphics/pokemon/sinistea/icon.png rename to graphics/pokemon/gen_8/sinistea/icon.png diff --git a/graphics/pokemon/sinistea/normal.pal b/graphics/pokemon/gen_8/sinistea/normal.pal similarity index 100% rename from graphics/pokemon/sinistea/normal.pal rename to graphics/pokemon/gen_8/sinistea/normal.pal diff --git a/graphics/pokemon/sinistea/shiny.pal b/graphics/pokemon/gen_8/sinistea/shiny.pal similarity index 100% rename from graphics/pokemon/sinistea/shiny.pal rename to graphics/pokemon/gen_8/sinistea/shiny.pal diff --git a/graphics/pokemon/sirfetchd/back.png b/graphics/pokemon/gen_8/sirfetchd/back.png similarity index 100% rename from graphics/pokemon/sirfetchd/back.png rename to graphics/pokemon/gen_8/sirfetchd/back.png diff --git a/graphics/pokemon/sirfetchd/footprint.png b/graphics/pokemon/gen_8/sirfetchd/footprint.png similarity index 100% rename from graphics/pokemon/sirfetchd/footprint.png rename to graphics/pokemon/gen_8/sirfetchd/footprint.png diff --git a/graphics/pokemon/sirfetchd/front.png b/graphics/pokemon/gen_8/sirfetchd/front.png similarity index 100% rename from graphics/pokemon/sirfetchd/front.png rename to graphics/pokemon/gen_8/sirfetchd/front.png diff --git a/graphics/pokemon/sirfetchd/icon.png b/graphics/pokemon/gen_8/sirfetchd/icon.png similarity index 100% rename from graphics/pokemon/sirfetchd/icon.png rename to graphics/pokemon/gen_8/sirfetchd/icon.png diff --git a/graphics/pokemon/sirfetchd/normal.pal b/graphics/pokemon/gen_8/sirfetchd/normal.pal similarity index 100% rename from graphics/pokemon/sirfetchd/normal.pal rename to graphics/pokemon/gen_8/sirfetchd/normal.pal diff --git a/graphics/pokemon/sirfetchd/shiny.pal b/graphics/pokemon/gen_8/sirfetchd/shiny.pal similarity index 100% rename from graphics/pokemon/sirfetchd/shiny.pal rename to graphics/pokemon/gen_8/sirfetchd/shiny.pal diff --git a/graphics/pokemon/sizzlipede/anim_front.png b/graphics/pokemon/gen_8/sizzlipede/anim_front.png similarity index 100% rename from graphics/pokemon/sizzlipede/anim_front.png rename to graphics/pokemon/gen_8/sizzlipede/anim_front.png diff --git a/graphics/pokemon/sizzlipede/back.png b/graphics/pokemon/gen_8/sizzlipede/back.png similarity index 100% rename from graphics/pokemon/sizzlipede/back.png rename to graphics/pokemon/gen_8/sizzlipede/back.png diff --git a/graphics/pokemon/venomoth/footprint.png b/graphics/pokemon/gen_8/sizzlipede/footprint.png similarity index 100% rename from graphics/pokemon/venomoth/footprint.png rename to graphics/pokemon/gen_8/sizzlipede/footprint.png diff --git a/graphics/pokemon/sizzlipede/icon.png b/graphics/pokemon/gen_8/sizzlipede/icon.png similarity index 100% rename from graphics/pokemon/sizzlipede/icon.png rename to graphics/pokemon/gen_8/sizzlipede/icon.png diff --git a/graphics/pokemon/sizzlipede/normal.pal b/graphics/pokemon/gen_8/sizzlipede/normal.pal similarity index 100% rename from graphics/pokemon/sizzlipede/normal.pal rename to graphics/pokemon/gen_8/sizzlipede/normal.pal diff --git a/graphics/pokemon/sizzlipede/shiny.pal b/graphics/pokemon/gen_8/sizzlipede/shiny.pal similarity index 100% rename from graphics/pokemon/sizzlipede/shiny.pal rename to graphics/pokemon/gen_8/sizzlipede/shiny.pal diff --git a/graphics/pokemon/skwovet/back.png b/graphics/pokemon/gen_8/skwovet/back.png similarity index 100% rename from graphics/pokemon/skwovet/back.png rename to graphics/pokemon/gen_8/skwovet/back.png diff --git a/graphics/pokemon/skwovet/footprint.png b/graphics/pokemon/gen_8/skwovet/footprint.png similarity index 100% rename from graphics/pokemon/skwovet/footprint.png rename to graphics/pokemon/gen_8/skwovet/footprint.png diff --git a/graphics/pokemon/skwovet/front.png b/graphics/pokemon/gen_8/skwovet/front.png similarity index 100% rename from graphics/pokemon/skwovet/front.png rename to graphics/pokemon/gen_8/skwovet/front.png diff --git a/graphics/pokemon/skwovet/icon.png b/graphics/pokemon/gen_8/skwovet/icon.png similarity index 100% rename from graphics/pokemon/skwovet/icon.png rename to graphics/pokemon/gen_8/skwovet/icon.png diff --git a/graphics/pokemon/skwovet/normal.pal b/graphics/pokemon/gen_8/skwovet/normal.pal similarity index 100% rename from graphics/pokemon/skwovet/normal.pal rename to graphics/pokemon/gen_8/skwovet/normal.pal diff --git a/graphics/pokemon/skwovet/shiny.pal b/graphics/pokemon/gen_8/skwovet/shiny.pal similarity index 100% rename from graphics/pokemon/skwovet/shiny.pal rename to graphics/pokemon/gen_8/skwovet/shiny.pal diff --git a/graphics/pokemon/sneasler/back.png b/graphics/pokemon/gen_8/sneasler/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/sneasler/back.png rename to graphics/pokemon/gen_8/sneasler/back.png diff --git a/graphics/pokemon/sneasler/front.png b/graphics/pokemon/gen_8/sneasler/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/sneasler/front.png rename to graphics/pokemon/gen_8/sneasler/front.png diff --git a/graphics/pokemon/sneasler/icon.png b/graphics/pokemon/gen_8/sneasler/icon.png similarity index 100% rename from graphics/pokemon/sneasler/icon.png rename to graphics/pokemon/gen_8/sneasler/icon.png diff --git a/graphics/pokemon/sneasler/normal.pal b/graphics/pokemon/gen_8/sneasler/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/sneasler/normal.pal rename to graphics/pokemon/gen_8/sneasler/normal.pal diff --git a/graphics/pokemon/sneasler/shiny.pal b/graphics/pokemon/gen_8/sneasler/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/sneasler/shiny.pal rename to graphics/pokemon/gen_8/sneasler/shiny.pal diff --git a/graphics/pokemon/snom/back.png b/graphics/pokemon/gen_8/snom/back.png similarity index 100% rename from graphics/pokemon/snom/back.png rename to graphics/pokemon/gen_8/snom/back.png diff --git a/graphics/pokemon/zubat/footprint.png b/graphics/pokemon/gen_8/snom/footprint.png similarity index 100% rename from graphics/pokemon/zubat/footprint.png rename to graphics/pokemon/gen_8/snom/footprint.png diff --git a/graphics/pokemon/snom/front.png b/graphics/pokemon/gen_8/snom/front.png similarity index 100% rename from graphics/pokemon/snom/front.png rename to graphics/pokemon/gen_8/snom/front.png diff --git a/graphics/pokemon/snom/icon.png b/graphics/pokemon/gen_8/snom/icon.png similarity index 100% rename from graphics/pokemon/snom/icon.png rename to graphics/pokemon/gen_8/snom/icon.png diff --git a/graphics/pokemon/snom/normal.pal b/graphics/pokemon/gen_8/snom/normal.pal similarity index 100% rename from graphics/pokemon/snom/normal.pal rename to graphics/pokemon/gen_8/snom/normal.pal diff --git a/graphics/pokemon/snom/shiny.pal b/graphics/pokemon/gen_8/snom/shiny.pal similarity index 100% rename from graphics/pokemon/snom/shiny.pal rename to graphics/pokemon/gen_8/snom/shiny.pal diff --git a/graphics/pokemon/sobble/back.png b/graphics/pokemon/gen_8/sobble/back.png similarity index 100% rename from graphics/pokemon/sobble/back.png rename to graphics/pokemon/gen_8/sobble/back.png diff --git a/graphics/pokemon/sobble/footprint.png b/graphics/pokemon/gen_8/sobble/footprint.png similarity index 100% rename from graphics/pokemon/sobble/footprint.png rename to graphics/pokemon/gen_8/sobble/footprint.png diff --git a/graphics/pokemon/sobble/front.png b/graphics/pokemon/gen_8/sobble/front.png similarity index 100% rename from graphics/pokemon/sobble/front.png rename to graphics/pokemon/gen_8/sobble/front.png diff --git a/graphics/pokemon/sobble/icon.png b/graphics/pokemon/gen_8/sobble/icon.png similarity index 100% rename from graphics/pokemon/sobble/icon.png rename to graphics/pokemon/gen_8/sobble/icon.png diff --git a/graphics/pokemon/sobble/normal.pal b/graphics/pokemon/gen_8/sobble/normal.pal similarity index 100% rename from graphics/pokemon/sobble/normal.pal rename to graphics/pokemon/gen_8/sobble/normal.pal diff --git a/graphics/pokemon/sobble/shiny.pal b/graphics/pokemon/gen_8/sobble/shiny.pal similarity index 100% rename from graphics/pokemon/sobble/shiny.pal rename to graphics/pokemon/gen_8/sobble/shiny.pal diff --git a/graphics/pokemon/spectrier/back.png b/graphics/pokemon/gen_8/spectrier/back.png similarity index 100% rename from graphics/pokemon/spectrier/back.png rename to graphics/pokemon/gen_8/spectrier/back.png diff --git a/graphics/pokemon/spectrier/footprint.png b/graphics/pokemon/gen_8/spectrier/footprint.png similarity index 100% rename from graphics/pokemon/spectrier/footprint.png rename to graphics/pokemon/gen_8/spectrier/footprint.png diff --git a/graphics/pokemon/spectrier/front.png b/graphics/pokemon/gen_8/spectrier/front.png similarity index 100% rename from graphics/pokemon/spectrier/front.png rename to graphics/pokemon/gen_8/spectrier/front.png diff --git a/graphics/pokemon/spectrier/icon.png b/graphics/pokemon/gen_8/spectrier/icon.png similarity index 100% rename from graphics/pokemon/spectrier/icon.png rename to graphics/pokemon/gen_8/spectrier/icon.png diff --git a/graphics/pokemon/spectrier/normal.pal b/graphics/pokemon/gen_8/spectrier/normal.pal similarity index 100% rename from graphics/pokemon/spectrier/normal.pal rename to graphics/pokemon/gen_8/spectrier/normal.pal diff --git a/graphics/pokemon/spectrier/shiny.pal b/graphics/pokemon/gen_8/spectrier/shiny.pal similarity index 100% rename from graphics/pokemon/spectrier/shiny.pal rename to graphics/pokemon/gen_8/spectrier/shiny.pal diff --git a/graphics/pokemon/stonjourner/back.png b/graphics/pokemon/gen_8/stonjourner/back.png similarity index 100% rename from graphics/pokemon/stonjourner/back.png rename to graphics/pokemon/gen_8/stonjourner/back.png diff --git a/graphics/pokemon/stonjourner/footprint.png b/graphics/pokemon/gen_8/stonjourner/footprint.png similarity index 100% rename from graphics/pokemon/stonjourner/footprint.png rename to graphics/pokemon/gen_8/stonjourner/footprint.png diff --git a/graphics/pokemon/stonjourner/front.png b/graphics/pokemon/gen_8/stonjourner/front.png similarity index 100% rename from graphics/pokemon/stonjourner/front.png rename to graphics/pokemon/gen_8/stonjourner/front.png diff --git a/graphics/pokemon/stonjourner/icon.png b/graphics/pokemon/gen_8/stonjourner/icon.png similarity index 100% rename from graphics/pokemon/stonjourner/icon.png rename to graphics/pokemon/gen_8/stonjourner/icon.png diff --git a/graphics/pokemon/stonjourner/normal.pal b/graphics/pokemon/gen_8/stonjourner/normal.pal similarity index 100% rename from graphics/pokemon/stonjourner/normal.pal rename to graphics/pokemon/gen_8/stonjourner/normal.pal diff --git a/graphics/pokemon/stonjourner/shiny.pal b/graphics/pokemon/gen_8/stonjourner/shiny.pal similarity index 100% rename from graphics/pokemon/stonjourner/shiny.pal rename to graphics/pokemon/gen_8/stonjourner/shiny.pal diff --git a/graphics/pokemon/thievul/back.png b/graphics/pokemon/gen_8/thievul/back.png similarity index 100% rename from graphics/pokemon/thievul/back.png rename to graphics/pokemon/gen_8/thievul/back.png diff --git a/graphics/pokemon/thievul/footprint.png b/graphics/pokemon/gen_8/thievul/footprint.png similarity index 100% rename from graphics/pokemon/thievul/footprint.png rename to graphics/pokemon/gen_8/thievul/footprint.png diff --git a/graphics/pokemon/thievul/front.png b/graphics/pokemon/gen_8/thievul/front.png similarity index 100% rename from graphics/pokemon/thievul/front.png rename to graphics/pokemon/gen_8/thievul/front.png diff --git a/graphics/pokemon/thievul/icon.png b/graphics/pokemon/gen_8/thievul/icon.png similarity index 100% rename from graphics/pokemon/thievul/icon.png rename to graphics/pokemon/gen_8/thievul/icon.png diff --git a/graphics/pokemon/thievul/normal.pal b/graphics/pokemon/gen_8/thievul/normal.pal similarity index 100% rename from graphics/pokemon/thievul/normal.pal rename to graphics/pokemon/gen_8/thievul/normal.pal diff --git a/graphics/pokemon/thievul/shiny.pal b/graphics/pokemon/gen_8/thievul/shiny.pal similarity index 100% rename from graphics/pokemon/thievul/shiny.pal rename to graphics/pokemon/gen_8/thievul/shiny.pal diff --git a/graphics/pokemon/thwackey/back.png b/graphics/pokemon/gen_8/thwackey/back.png similarity index 100% rename from graphics/pokemon/thwackey/back.png rename to graphics/pokemon/gen_8/thwackey/back.png diff --git a/graphics/pokemon/thwackey/footprint.png b/graphics/pokemon/gen_8/thwackey/footprint.png similarity index 100% rename from graphics/pokemon/thwackey/footprint.png rename to graphics/pokemon/gen_8/thwackey/footprint.png diff --git a/graphics/pokemon/thwackey/front.png b/graphics/pokemon/gen_8/thwackey/front.png similarity index 100% rename from graphics/pokemon/thwackey/front.png rename to graphics/pokemon/gen_8/thwackey/front.png diff --git a/graphics/pokemon/thwackey/icon.png b/graphics/pokemon/gen_8/thwackey/icon.png similarity index 100% rename from graphics/pokemon/thwackey/icon.png rename to graphics/pokemon/gen_8/thwackey/icon.png diff --git a/graphics/pokemon/thwackey/normal.pal b/graphics/pokemon/gen_8/thwackey/normal.pal similarity index 100% rename from graphics/pokemon/thwackey/normal.pal rename to graphics/pokemon/gen_8/thwackey/normal.pal diff --git a/graphics/pokemon/thwackey/shiny.pal b/graphics/pokemon/gen_8/thwackey/shiny.pal similarity index 100% rename from graphics/pokemon/thwackey/shiny.pal rename to graphics/pokemon/gen_8/thwackey/shiny.pal diff --git a/graphics/pokemon/toxel/back.png b/graphics/pokemon/gen_8/toxel/back.png similarity index 100% rename from graphics/pokemon/toxel/back.png rename to graphics/pokemon/gen_8/toxel/back.png diff --git a/graphics/pokemon/toxel/footprint.png b/graphics/pokemon/gen_8/toxel/footprint.png similarity index 100% rename from graphics/pokemon/toxel/footprint.png rename to graphics/pokemon/gen_8/toxel/footprint.png diff --git a/graphics/pokemon/toxel/front.png b/graphics/pokemon/gen_8/toxel/front.png similarity index 100% rename from graphics/pokemon/toxel/front.png rename to graphics/pokemon/gen_8/toxel/front.png diff --git a/graphics/pokemon/toxel/icon.png b/graphics/pokemon/gen_8/toxel/icon.png similarity index 100% rename from graphics/pokemon/toxel/icon.png rename to graphics/pokemon/gen_8/toxel/icon.png diff --git a/graphics/pokemon/toxel/normal.pal b/graphics/pokemon/gen_8/toxel/normal.pal similarity index 100% rename from graphics/pokemon/toxel/normal.pal rename to graphics/pokemon/gen_8/toxel/normal.pal diff --git a/graphics/pokemon/toxel/shiny.pal b/graphics/pokemon/gen_8/toxel/shiny.pal similarity index 100% rename from graphics/pokemon/toxel/shiny.pal rename to graphics/pokemon/gen_8/toxel/shiny.pal diff --git a/graphics/pokemon/toxtricity/back.png b/graphics/pokemon/gen_8/toxtricity/back.png similarity index 100% rename from graphics/pokemon/toxtricity/back.png rename to graphics/pokemon/gen_8/toxtricity/back.png diff --git a/graphics/pokemon/toxtricity/footprint.png b/graphics/pokemon/gen_8/toxtricity/footprint.png similarity index 100% rename from graphics/pokemon/toxtricity/footprint.png rename to graphics/pokemon/gen_8/toxtricity/footprint.png diff --git a/graphics/pokemon/toxtricity/front.png b/graphics/pokemon/gen_8/toxtricity/front.png similarity index 100% rename from graphics/pokemon/toxtricity/front.png rename to graphics/pokemon/gen_8/toxtricity/front.png diff --git a/graphics/pokemon/toxtricity/gigantamax/back.png b/graphics/pokemon/gen_8/toxtricity/gigantamax/back.png similarity index 100% rename from graphics/pokemon/toxtricity/gigantamax/back.png rename to graphics/pokemon/gen_8/toxtricity/gigantamax/back.png diff --git a/graphics/pokemon/toxtricity/gigantamax/front.png b/graphics/pokemon/gen_8/toxtricity/gigantamax/front.png similarity index 100% rename from graphics/pokemon/toxtricity/gigantamax/front.png rename to graphics/pokemon/gen_8/toxtricity/gigantamax/front.png diff --git a/graphics/pokemon/toxtricity/gigantamax/icon.png b/graphics/pokemon/gen_8/toxtricity/gigantamax/icon.png similarity index 100% rename from graphics/pokemon/toxtricity/gigantamax/icon.png rename to graphics/pokemon/gen_8/toxtricity/gigantamax/icon.png diff --git a/graphics/pokemon/toxtricity/gigantamax/normal.pal b/graphics/pokemon/gen_8/toxtricity/gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/toxtricity/gigantamax/normal.pal rename to graphics/pokemon/gen_8/toxtricity/gigantamax/normal.pal diff --git a/graphics/pokemon/toxtricity/gigantamax/shiny.pal b/graphics/pokemon/gen_8/toxtricity/gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/toxtricity/gigantamax/shiny.pal rename to graphics/pokemon/gen_8/toxtricity/gigantamax/shiny.pal diff --git a/graphics/pokemon/toxtricity/icon.png b/graphics/pokemon/gen_8/toxtricity/icon.png similarity index 100% rename from graphics/pokemon/toxtricity/icon.png rename to graphics/pokemon/gen_8/toxtricity/icon.png diff --git a/graphics/pokemon/toxtricity/low_key/back.png b/graphics/pokemon/gen_8/toxtricity/low_key/back.png similarity index 100% rename from graphics/pokemon/toxtricity/low_key/back.png rename to graphics/pokemon/gen_8/toxtricity/low_key/back.png diff --git a/graphics/pokemon/toxtricity/low_key/front.png b/graphics/pokemon/gen_8/toxtricity/low_key/front.png similarity index 100% rename from graphics/pokemon/toxtricity/low_key/front.png rename to graphics/pokemon/gen_8/toxtricity/low_key/front.png diff --git a/graphics/pokemon/toxtricity/low_key/icon.png b/graphics/pokemon/gen_8/toxtricity/low_key/icon.png similarity index 100% rename from graphics/pokemon/toxtricity/low_key/icon.png rename to graphics/pokemon/gen_8/toxtricity/low_key/icon.png diff --git a/graphics/pokemon/toxtricity/low_key/normal.pal b/graphics/pokemon/gen_8/toxtricity/low_key/normal.pal similarity index 100% rename from graphics/pokemon/toxtricity/low_key/normal.pal rename to graphics/pokemon/gen_8/toxtricity/low_key/normal.pal diff --git a/graphics/pokemon/toxtricity/low_key/shiny.pal b/graphics/pokemon/gen_8/toxtricity/low_key/shiny.pal similarity index 100% rename from graphics/pokemon/toxtricity/low_key/shiny.pal rename to graphics/pokemon/gen_8/toxtricity/low_key/shiny.pal diff --git a/graphics/pokemon/toxtricity/normal.pal b/graphics/pokemon/gen_8/toxtricity/normal.pal similarity index 100% rename from graphics/pokemon/toxtricity/normal.pal rename to graphics/pokemon/gen_8/toxtricity/normal.pal diff --git a/graphics/pokemon/toxtricity/shiny.pal b/graphics/pokemon/gen_8/toxtricity/shiny.pal similarity index 100% rename from graphics/pokemon/toxtricity/shiny.pal rename to graphics/pokemon/gen_8/toxtricity/shiny.pal diff --git a/graphics/pokemon/ursaluna/back.png b/graphics/pokemon/gen_8/ursaluna/back.png similarity index 100% rename from graphics/pokemon/ursaluna/back.png rename to graphics/pokemon/gen_8/ursaluna/back.png diff --git a/graphics/pokemon/ursaluna/bloodmoon/back.png b/graphics/pokemon/gen_8/ursaluna/bloodmoon/back.png similarity index 100% rename from graphics/pokemon/ursaluna/bloodmoon/back.png rename to graphics/pokemon/gen_8/ursaluna/bloodmoon/back.png diff --git a/graphics/pokemon/ursaluna/bloodmoon/front.png b/graphics/pokemon/gen_8/ursaluna/bloodmoon/front.png similarity index 100% rename from graphics/pokemon/ursaluna/bloodmoon/front.png rename to graphics/pokemon/gen_8/ursaluna/bloodmoon/front.png diff --git a/graphics/pokemon/ursaluna/bloodmoon/normal.pal b/graphics/pokemon/gen_8/ursaluna/bloodmoon/normal.pal similarity index 100% rename from graphics/pokemon/ursaluna/bloodmoon/normal.pal rename to graphics/pokemon/gen_8/ursaluna/bloodmoon/normal.pal diff --git a/graphics/pokemon/ursaluna/bloodmoon/shiny.pal b/graphics/pokemon/gen_8/ursaluna/bloodmoon/shiny.pal similarity index 100% rename from graphics/pokemon/ursaluna/bloodmoon/shiny.pal rename to graphics/pokemon/gen_8/ursaluna/bloodmoon/shiny.pal diff --git a/graphics/pokemon/ursaluna/front.png b/graphics/pokemon/gen_8/ursaluna/front.png similarity index 100% rename from graphics/pokemon/ursaluna/front.png rename to graphics/pokemon/gen_8/ursaluna/front.png diff --git a/graphics/pokemon/ursaluna/icon.png b/graphics/pokemon/gen_8/ursaluna/icon.png similarity index 100% rename from graphics/pokemon/ursaluna/icon.png rename to graphics/pokemon/gen_8/ursaluna/icon.png diff --git a/graphics/pokemon/ursaluna/normal.pal b/graphics/pokemon/gen_8/ursaluna/normal.pal similarity index 100% rename from graphics/pokemon/ursaluna/normal.pal rename to graphics/pokemon/gen_8/ursaluna/normal.pal diff --git a/graphics/pokemon/ursaluna/shiny.pal b/graphics/pokemon/gen_8/ursaluna/shiny.pal similarity index 100% rename from graphics/pokemon/ursaluna/shiny.pal rename to graphics/pokemon/gen_8/ursaluna/shiny.pal diff --git a/graphics/pokemon/urshifu/back.png b/graphics/pokemon/gen_8/urshifu/back.png similarity index 100% rename from graphics/pokemon/urshifu/back.png rename to graphics/pokemon/gen_8/urshifu/back.png diff --git a/graphics/pokemon/urshifu/footprint.png b/graphics/pokemon/gen_8/urshifu/footprint.png similarity index 100% rename from graphics/pokemon/urshifu/footprint.png rename to graphics/pokemon/gen_8/urshifu/footprint.png diff --git a/graphics/pokemon/urshifu/front.png b/graphics/pokemon/gen_8/urshifu/front.png similarity index 100% rename from graphics/pokemon/urshifu/front.png rename to graphics/pokemon/gen_8/urshifu/front.png diff --git a/graphics/pokemon/urshifu/icon.png b/graphics/pokemon/gen_8/urshifu/icon.png similarity index 100% rename from graphics/pokemon/urshifu/icon.png rename to graphics/pokemon/gen_8/urshifu/icon.png diff --git a/graphics/pokemon/urshifu/normal.pal b/graphics/pokemon/gen_8/urshifu/normal.pal similarity index 100% rename from graphics/pokemon/urshifu/normal.pal rename to graphics/pokemon/gen_8/urshifu/normal.pal diff --git a/graphics/pokemon/urshifu/rapid_strike_style/back.png b/graphics/pokemon/gen_8/urshifu/rapid_strike_style/back.png similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style/back.png rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style/back.png diff --git a/graphics/pokemon/urshifu/rapid_strike_style/front.png b/graphics/pokemon/gen_8/urshifu/rapid_strike_style/front.png similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style/front.png rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style/front.png diff --git a/graphics/pokemon/urshifu/rapid_strike_style/normal.pal b/graphics/pokemon/gen_8/urshifu/rapid_strike_style/normal.pal similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style/normal.pal rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style/normal.pal diff --git a/graphics/pokemon/urshifu/rapid_strike_style/shiny.pal b/graphics/pokemon/gen_8/urshifu/rapid_strike_style/shiny.pal similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style/shiny.pal rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style/shiny.pal diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/back.png b/graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/back.png similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/back.png rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/back.png diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/front.png b/graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/front.png similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/front.png rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/front.png diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/icon.png b/graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/icon.png similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/icon.png rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/icon.png diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/normal.pal b/graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/normal.pal rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/normal.pal diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/shiny.pal b/graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/shiny.pal rename to graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/shiny.pal diff --git a/graphics/pokemon/urshifu/shiny.pal b/graphics/pokemon/gen_8/urshifu/shiny.pal similarity index 100% rename from graphics/pokemon/urshifu/shiny.pal rename to graphics/pokemon/gen_8/urshifu/shiny.pal diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/back.png b/graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/back.png similarity index 100% rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/back.png rename to graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/back.png diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/front.png b/graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/front.png similarity index 100% rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/front.png rename to graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/front.png diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/icon.png b/graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/icon.png similarity index 100% rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/icon.png rename to graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/icon.png diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/normal.pal b/graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/normal.pal similarity index 100% rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/normal.pal rename to graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/normal.pal diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/shiny.pal b/graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/shiny.pal similarity index 100% rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/shiny.pal rename to graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/shiny.pal diff --git a/graphics/pokemon/wooloo/back.png b/graphics/pokemon/gen_8/wooloo/back.png similarity index 100% rename from graphics/pokemon/wooloo/back.png rename to graphics/pokemon/gen_8/wooloo/back.png diff --git a/graphics/pokemon/wooloo/footprint.png b/graphics/pokemon/gen_8/wooloo/footprint.png similarity index 100% rename from graphics/pokemon/wooloo/footprint.png rename to graphics/pokemon/gen_8/wooloo/footprint.png diff --git a/graphics/pokemon/wooloo/front.png b/graphics/pokemon/gen_8/wooloo/front.png similarity index 100% rename from graphics/pokemon/wooloo/front.png rename to graphics/pokemon/gen_8/wooloo/front.png diff --git a/graphics/pokemon/wooloo/icon.png b/graphics/pokemon/gen_8/wooloo/icon.png similarity index 100% rename from graphics/pokemon/wooloo/icon.png rename to graphics/pokemon/gen_8/wooloo/icon.png diff --git a/graphics/pokemon/wooloo/normal.pal b/graphics/pokemon/gen_8/wooloo/normal.pal similarity index 100% rename from graphics/pokemon/wooloo/normal.pal rename to graphics/pokemon/gen_8/wooloo/normal.pal diff --git a/graphics/pokemon/wooloo/shiny.pal b/graphics/pokemon/gen_8/wooloo/shiny.pal similarity index 100% rename from graphics/pokemon/wooloo/shiny.pal rename to graphics/pokemon/gen_8/wooloo/shiny.pal diff --git a/graphics/pokemon/wyrdeer/back.png b/graphics/pokemon/gen_8/wyrdeer/back.png similarity index 100% rename from graphics/pokemon/wyrdeer/back.png rename to graphics/pokemon/gen_8/wyrdeer/back.png diff --git a/graphics/pokemon/wyrdeer/front.png b/graphics/pokemon/gen_8/wyrdeer/front.png similarity index 100% rename from graphics/pokemon/wyrdeer/front.png rename to graphics/pokemon/gen_8/wyrdeer/front.png diff --git a/graphics/pokemon/wyrdeer/icon.png b/graphics/pokemon/gen_8/wyrdeer/icon.png similarity index 100% rename from graphics/pokemon/wyrdeer/icon.png rename to graphics/pokemon/gen_8/wyrdeer/icon.png diff --git a/graphics/pokemon/wyrdeer/normal.pal b/graphics/pokemon/gen_8/wyrdeer/normal.pal similarity index 100% rename from graphics/pokemon/wyrdeer/normal.pal rename to graphics/pokemon/gen_8/wyrdeer/normal.pal diff --git a/graphics/pokemon/wyrdeer/shiny.pal b/graphics/pokemon/gen_8/wyrdeer/shiny.pal similarity index 100% rename from graphics/pokemon/wyrdeer/shiny.pal rename to graphics/pokemon/gen_8/wyrdeer/shiny.pal diff --git a/graphics/pokemon/yamper/back.png b/graphics/pokemon/gen_8/yamper/back.png similarity index 100% rename from graphics/pokemon/yamper/back.png rename to graphics/pokemon/gen_8/yamper/back.png diff --git a/graphics/pokemon/yamper/footprint.png b/graphics/pokemon/gen_8/yamper/footprint.png similarity index 100% rename from graphics/pokemon/yamper/footprint.png rename to graphics/pokemon/gen_8/yamper/footprint.png diff --git a/graphics/pokemon/yamper/front.png b/graphics/pokemon/gen_8/yamper/front.png similarity index 100% rename from graphics/pokemon/yamper/front.png rename to graphics/pokemon/gen_8/yamper/front.png diff --git a/graphics/pokemon/yamper/icon.png b/graphics/pokemon/gen_8/yamper/icon.png similarity index 100% rename from graphics/pokemon/yamper/icon.png rename to graphics/pokemon/gen_8/yamper/icon.png diff --git a/graphics/pokemon/yamper/normal.pal b/graphics/pokemon/gen_8/yamper/normal.pal similarity index 100% rename from graphics/pokemon/yamper/normal.pal rename to graphics/pokemon/gen_8/yamper/normal.pal diff --git a/graphics/pokemon/yamper/shiny.pal b/graphics/pokemon/gen_8/yamper/shiny.pal similarity index 100% rename from graphics/pokemon/yamper/shiny.pal rename to graphics/pokemon/gen_8/yamper/shiny.pal diff --git a/graphics/pokemon/zacian/back.png b/graphics/pokemon/gen_8/zacian/back.png similarity index 100% rename from graphics/pokemon/zacian/back.png rename to graphics/pokemon/gen_8/zacian/back.png diff --git a/graphics/pokemon/zacian/crowned_sword/back.png b/graphics/pokemon/gen_8/zacian/crowned_sword/back.png similarity index 100% rename from graphics/pokemon/zacian/crowned_sword/back.png rename to graphics/pokemon/gen_8/zacian/crowned_sword/back.png diff --git a/graphics/pokemon/zacian/crowned_sword/front.png b/graphics/pokemon/gen_8/zacian/crowned_sword/front.png similarity index 100% rename from graphics/pokemon/zacian/crowned_sword/front.png rename to graphics/pokemon/gen_8/zacian/crowned_sword/front.png diff --git a/graphics/pokemon/zacian/crowned_sword/icon.png b/graphics/pokemon/gen_8/zacian/crowned_sword/icon.png similarity index 100% rename from graphics/pokemon/zacian/crowned_sword/icon.png rename to graphics/pokemon/gen_8/zacian/crowned_sword/icon.png diff --git a/graphics/pokemon/zacian/crowned_sword/normal.pal b/graphics/pokemon/gen_8/zacian/crowned_sword/normal.pal similarity index 100% rename from graphics/pokemon/zacian/crowned_sword/normal.pal rename to graphics/pokemon/gen_8/zacian/crowned_sword/normal.pal diff --git a/graphics/pokemon/zacian/crowned_sword/shiny.pal b/graphics/pokemon/gen_8/zacian/crowned_sword/shiny.pal similarity index 100% rename from graphics/pokemon/zacian/crowned_sword/shiny.pal rename to graphics/pokemon/gen_8/zacian/crowned_sword/shiny.pal diff --git a/graphics/pokemon/zacian/footprint.png b/graphics/pokemon/gen_8/zacian/footprint.png similarity index 100% rename from graphics/pokemon/zacian/footprint.png rename to graphics/pokemon/gen_8/zacian/footprint.png diff --git a/graphics/pokemon/zacian/front.png b/graphics/pokemon/gen_8/zacian/front.png similarity index 100% rename from graphics/pokemon/zacian/front.png rename to graphics/pokemon/gen_8/zacian/front.png diff --git a/graphics/pokemon/zacian/icon.png b/graphics/pokemon/gen_8/zacian/icon.png similarity index 100% rename from graphics/pokemon/zacian/icon.png rename to graphics/pokemon/gen_8/zacian/icon.png diff --git a/graphics/pokemon/zacian/normal.pal b/graphics/pokemon/gen_8/zacian/normal.pal similarity index 100% rename from graphics/pokemon/zacian/normal.pal rename to graphics/pokemon/gen_8/zacian/normal.pal diff --git a/graphics/pokemon/zacian/shiny.pal b/graphics/pokemon/gen_8/zacian/shiny.pal similarity index 100% rename from graphics/pokemon/zacian/shiny.pal rename to graphics/pokemon/gen_8/zacian/shiny.pal diff --git a/graphics/pokemon/zamazenta/back.png b/graphics/pokemon/gen_8/zamazenta/back.png similarity index 100% rename from graphics/pokemon/zamazenta/back.png rename to graphics/pokemon/gen_8/zamazenta/back.png diff --git a/graphics/pokemon/zamazenta/crowned_shield/back.png b/graphics/pokemon/gen_8/zamazenta/crowned_shield/back.png similarity index 100% rename from graphics/pokemon/zamazenta/crowned_shield/back.png rename to graphics/pokemon/gen_8/zamazenta/crowned_shield/back.png diff --git a/graphics/pokemon/zamazenta/crowned_shield/front.png b/graphics/pokemon/gen_8/zamazenta/crowned_shield/front.png similarity index 100% rename from graphics/pokemon/zamazenta/crowned_shield/front.png rename to graphics/pokemon/gen_8/zamazenta/crowned_shield/front.png diff --git a/graphics/pokemon/zamazenta/crowned_shield/icon.png b/graphics/pokemon/gen_8/zamazenta/crowned_shield/icon.png similarity index 100% rename from graphics/pokemon/zamazenta/crowned_shield/icon.png rename to graphics/pokemon/gen_8/zamazenta/crowned_shield/icon.png diff --git a/graphics/pokemon/zamazenta/crowned_shield/normal.pal b/graphics/pokemon/gen_8/zamazenta/crowned_shield/normal.pal similarity index 100% rename from graphics/pokemon/zamazenta/crowned_shield/normal.pal rename to graphics/pokemon/gen_8/zamazenta/crowned_shield/normal.pal diff --git a/graphics/pokemon/zamazenta/crowned_shield/shiny.pal b/graphics/pokemon/gen_8/zamazenta/crowned_shield/shiny.pal similarity index 100% rename from graphics/pokemon/zamazenta/crowned_shield/shiny.pal rename to graphics/pokemon/gen_8/zamazenta/crowned_shield/shiny.pal diff --git a/graphics/pokemon/zamazenta/footprint.png b/graphics/pokemon/gen_8/zamazenta/footprint.png similarity index 100% rename from graphics/pokemon/zamazenta/footprint.png rename to graphics/pokemon/gen_8/zamazenta/footprint.png diff --git a/graphics/pokemon/zamazenta/front.png b/graphics/pokemon/gen_8/zamazenta/front.png similarity index 100% rename from graphics/pokemon/zamazenta/front.png rename to graphics/pokemon/gen_8/zamazenta/front.png diff --git a/graphics/pokemon/zamazenta/icon.png b/graphics/pokemon/gen_8/zamazenta/icon.png similarity index 100% rename from graphics/pokemon/zamazenta/icon.png rename to graphics/pokemon/gen_8/zamazenta/icon.png diff --git a/graphics/pokemon/zamazenta/normal.pal b/graphics/pokemon/gen_8/zamazenta/normal.pal similarity index 100% rename from graphics/pokemon/zamazenta/normal.pal rename to graphics/pokemon/gen_8/zamazenta/normal.pal diff --git a/graphics/pokemon/zamazenta/shiny.pal b/graphics/pokemon/gen_8/zamazenta/shiny.pal similarity index 100% rename from graphics/pokemon/zamazenta/shiny.pal rename to graphics/pokemon/gen_8/zamazenta/shiny.pal diff --git a/graphics/pokemon/zarude/back.png b/graphics/pokemon/gen_8/zarude/back.png similarity index 100% rename from graphics/pokemon/zarude/back.png rename to graphics/pokemon/gen_8/zarude/back.png diff --git a/graphics/pokemon/zarude/dada/back.png b/graphics/pokemon/gen_8/zarude/dada/back.png similarity index 100% rename from graphics/pokemon/zarude/dada/back.png rename to graphics/pokemon/gen_8/zarude/dada/back.png diff --git a/graphics/pokemon/zarude/dada/front.png b/graphics/pokemon/gen_8/zarude/dada/front.png similarity index 100% rename from graphics/pokemon/zarude/dada/front.png rename to graphics/pokemon/gen_8/zarude/dada/front.png diff --git a/graphics/pokemon/zarude/dada/icon.png b/graphics/pokemon/gen_8/zarude/dada/icon.png similarity index 100% rename from graphics/pokemon/zarude/dada/icon.png rename to graphics/pokemon/gen_8/zarude/dada/icon.png diff --git a/graphics/pokemon/zarude/dada/normal.pal b/graphics/pokemon/gen_8/zarude/dada/normal.pal similarity index 100% rename from graphics/pokemon/zarude/dada/normal.pal rename to graphics/pokemon/gen_8/zarude/dada/normal.pal diff --git a/graphics/pokemon/zarude/dada/shiny.pal b/graphics/pokemon/gen_8/zarude/dada/shiny.pal similarity index 100% rename from graphics/pokemon/zarude/dada/shiny.pal rename to graphics/pokemon/gen_8/zarude/dada/shiny.pal diff --git a/graphics/pokemon/zarude/footprint.png b/graphics/pokemon/gen_8/zarude/footprint.png similarity index 100% rename from graphics/pokemon/zarude/footprint.png rename to graphics/pokemon/gen_8/zarude/footprint.png diff --git a/graphics/pokemon/zarude/front.png b/graphics/pokemon/gen_8/zarude/front.png similarity index 100% rename from graphics/pokemon/zarude/front.png rename to graphics/pokemon/gen_8/zarude/front.png diff --git a/graphics/pokemon/zarude/icon.png b/graphics/pokemon/gen_8/zarude/icon.png similarity index 100% rename from graphics/pokemon/zarude/icon.png rename to graphics/pokemon/gen_8/zarude/icon.png diff --git a/graphics/pokemon/zarude/normal.pal b/graphics/pokemon/gen_8/zarude/normal.pal similarity index 100% rename from graphics/pokemon/zarude/normal.pal rename to graphics/pokemon/gen_8/zarude/normal.pal diff --git a/graphics/pokemon/zarude/shiny.pal b/graphics/pokemon/gen_8/zarude/shiny.pal similarity index 100% rename from graphics/pokemon/zarude/shiny.pal rename to graphics/pokemon/gen_8/zarude/shiny.pal diff --git a/graphics/pokemon/annihilape/back.png b/graphics/pokemon/gen_9/annihilape/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/annihilape/back.png rename to graphics/pokemon/gen_9/annihilape/back.png diff --git a/graphics/pokemon/annihilape/front.png b/graphics/pokemon/gen_9/annihilape/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/annihilape/front.png rename to graphics/pokemon/gen_9/annihilape/front.png diff --git a/graphics/pokemon/annihilape/icon.png b/graphics/pokemon/gen_9/annihilape/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/annihilape/icon.png rename to graphics/pokemon/gen_9/annihilape/icon.png diff --git a/graphics/pokemon/annihilape/normal.pal b/graphics/pokemon/gen_9/annihilape/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/annihilape/normal.pal rename to graphics/pokemon/gen_9/annihilape/normal.pal diff --git a/graphics/pokemon/annihilape/shiny.pal b/graphics/pokemon/gen_9/annihilape/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/annihilape/shiny.pal rename to graphics/pokemon/gen_9/annihilape/shiny.pal diff --git a/graphics/pokemon/arboliva/back.png b/graphics/pokemon/gen_9/arboliva/back.png similarity index 100% rename from graphics/pokemon/arboliva/back.png rename to graphics/pokemon/gen_9/arboliva/back.png diff --git a/graphics/pokemon/arboliva/front.png b/graphics/pokemon/gen_9/arboliva/front.png similarity index 100% rename from graphics/pokemon/arboliva/front.png rename to graphics/pokemon/gen_9/arboliva/front.png diff --git a/graphics/pokemon/arboliva/icon.png b/graphics/pokemon/gen_9/arboliva/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/arboliva/icon.png rename to graphics/pokemon/gen_9/arboliva/icon.png diff --git a/graphics/pokemon/arboliva/normal.pal b/graphics/pokemon/gen_9/arboliva/normal.pal similarity index 100% rename from graphics/pokemon/arboliva/normal.pal rename to graphics/pokemon/gen_9/arboliva/normal.pal diff --git a/graphics/pokemon/arboliva/shiny.pal b/graphics/pokemon/gen_9/arboliva/shiny.pal similarity index 100% rename from graphics/pokemon/arboliva/shiny.pal rename to graphics/pokemon/gen_9/arboliva/shiny.pal diff --git a/graphics/pokemon/arctibax/back.png b/graphics/pokemon/gen_9/arctibax/back.png similarity index 100% rename from graphics/pokemon/arctibax/back.png rename to graphics/pokemon/gen_9/arctibax/back.png diff --git a/graphics/pokemon/arctibax/front.png b/graphics/pokemon/gen_9/arctibax/front.png similarity index 100% rename from graphics/pokemon/arctibax/front.png rename to graphics/pokemon/gen_9/arctibax/front.png diff --git a/graphics/pokemon/arctibax/icon.png b/graphics/pokemon/gen_9/arctibax/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/arctibax/icon.png rename to graphics/pokemon/gen_9/arctibax/icon.png diff --git a/graphics/pokemon/arctibax/normal.pal b/graphics/pokemon/gen_9/arctibax/normal.pal similarity index 100% rename from graphics/pokemon/arctibax/normal.pal rename to graphics/pokemon/gen_9/arctibax/normal.pal diff --git a/graphics/pokemon/arctibax/shiny.pal b/graphics/pokemon/gen_9/arctibax/shiny.pal similarity index 100% rename from graphics/pokemon/arctibax/shiny.pal rename to graphics/pokemon/gen_9/arctibax/shiny.pal diff --git a/graphics/pokemon/armarouge/back.png b/graphics/pokemon/gen_9/armarouge/back.png similarity index 100% rename from graphics/pokemon/armarouge/back.png rename to graphics/pokemon/gen_9/armarouge/back.png diff --git a/graphics/pokemon/armarouge/front.png b/graphics/pokemon/gen_9/armarouge/front.png similarity index 100% rename from graphics/pokemon/armarouge/front.png rename to graphics/pokemon/gen_9/armarouge/front.png diff --git a/graphics/pokemon/armarouge/icon.png b/graphics/pokemon/gen_9/armarouge/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/armarouge/icon.png rename to graphics/pokemon/gen_9/armarouge/icon.png diff --git a/graphics/pokemon/armarouge/normal.pal b/graphics/pokemon/gen_9/armarouge/normal.pal similarity index 100% rename from graphics/pokemon/armarouge/normal.pal rename to graphics/pokemon/gen_9/armarouge/normal.pal diff --git a/graphics/pokemon/armarouge/shiny.pal b/graphics/pokemon/gen_9/armarouge/shiny.pal similarity index 100% rename from graphics/pokemon/armarouge/shiny.pal rename to graphics/pokemon/gen_9/armarouge/shiny.pal diff --git a/graphics/pokemon/baxcalibur/back.png b/graphics/pokemon/gen_9/baxcalibur/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/baxcalibur/back.png rename to graphics/pokemon/gen_9/baxcalibur/back.png diff --git a/graphics/pokemon/baxcalibur/front.png b/graphics/pokemon/gen_9/baxcalibur/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/baxcalibur/front.png rename to graphics/pokemon/gen_9/baxcalibur/front.png diff --git a/graphics/pokemon/baxcalibur/icon.png b/graphics/pokemon/gen_9/baxcalibur/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/baxcalibur/icon.png rename to graphics/pokemon/gen_9/baxcalibur/icon.png diff --git a/graphics/pokemon/baxcalibur/normal.pal b/graphics/pokemon/gen_9/baxcalibur/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/baxcalibur/normal.pal rename to graphics/pokemon/gen_9/baxcalibur/normal.pal diff --git a/graphics/pokemon/baxcalibur/shiny.pal b/graphics/pokemon/gen_9/baxcalibur/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/baxcalibur/shiny.pal rename to graphics/pokemon/gen_9/baxcalibur/shiny.pal diff --git a/graphics/pokemon/bellibolt/back.png b/graphics/pokemon/gen_9/bellibolt/back.png similarity index 100% rename from graphics/pokemon/bellibolt/back.png rename to graphics/pokemon/gen_9/bellibolt/back.png diff --git a/graphics/pokemon/bellibolt/front.png b/graphics/pokemon/gen_9/bellibolt/front.png similarity index 100% rename from graphics/pokemon/bellibolt/front.png rename to graphics/pokemon/gen_9/bellibolt/front.png diff --git a/graphics/pokemon/bellibolt/icon.png b/graphics/pokemon/gen_9/bellibolt/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/bellibolt/icon.png rename to graphics/pokemon/gen_9/bellibolt/icon.png diff --git a/graphics/pokemon/bellibolt/normal.pal b/graphics/pokemon/gen_9/bellibolt/normal.pal similarity index 100% rename from graphics/pokemon/bellibolt/normal.pal rename to graphics/pokemon/gen_9/bellibolt/normal.pal diff --git a/graphics/pokemon/bellibolt/shiny.pal b/graphics/pokemon/gen_9/bellibolt/shiny.pal similarity index 100% rename from graphics/pokemon/bellibolt/shiny.pal rename to graphics/pokemon/gen_9/bellibolt/shiny.pal diff --git a/graphics/pokemon/bombirdier/back.png b/graphics/pokemon/gen_9/bombirdier/back.png similarity index 100% rename from graphics/pokemon/bombirdier/back.png rename to graphics/pokemon/gen_9/bombirdier/back.png diff --git a/graphics/pokemon/bombirdier/front.png b/graphics/pokemon/gen_9/bombirdier/front.png similarity index 100% rename from graphics/pokemon/bombirdier/front.png rename to graphics/pokemon/gen_9/bombirdier/front.png diff --git a/graphics/pokemon/bombirdier/icon.png b/graphics/pokemon/gen_9/bombirdier/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/bombirdier/icon.png rename to graphics/pokemon/gen_9/bombirdier/icon.png diff --git a/graphics/pokemon/bombirdier/normal.pal b/graphics/pokemon/gen_9/bombirdier/normal.pal similarity index 100% rename from graphics/pokemon/bombirdier/normal.pal rename to graphics/pokemon/gen_9/bombirdier/normal.pal diff --git a/graphics/pokemon/bombirdier/shiny.pal b/graphics/pokemon/gen_9/bombirdier/shiny.pal similarity index 100% rename from graphics/pokemon/bombirdier/shiny.pal rename to graphics/pokemon/gen_9/bombirdier/shiny.pal diff --git a/graphics/pokemon/brambleghast/back.png b/graphics/pokemon/gen_9/brambleghast/back.png similarity index 100% rename from graphics/pokemon/brambleghast/back.png rename to graphics/pokemon/gen_9/brambleghast/back.png diff --git a/graphics/pokemon/brambleghast/front.png b/graphics/pokemon/gen_9/brambleghast/front.png similarity index 100% rename from graphics/pokemon/brambleghast/front.png rename to graphics/pokemon/gen_9/brambleghast/front.png diff --git a/graphics/pokemon/brambleghast/icon.png b/graphics/pokemon/gen_9/brambleghast/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/brambleghast/icon.png rename to graphics/pokemon/gen_9/brambleghast/icon.png diff --git a/graphics/pokemon/brambleghast/normal.pal b/graphics/pokemon/gen_9/brambleghast/normal.pal similarity index 100% rename from graphics/pokemon/brambleghast/normal.pal rename to graphics/pokemon/gen_9/brambleghast/normal.pal diff --git a/graphics/pokemon/brambleghast/shiny.pal b/graphics/pokemon/gen_9/brambleghast/shiny.pal similarity index 100% rename from graphics/pokemon/brambleghast/shiny.pal rename to graphics/pokemon/gen_9/brambleghast/shiny.pal diff --git a/graphics/pokemon/bramblin/back.png b/graphics/pokemon/gen_9/bramblin/back.png similarity index 100% rename from graphics/pokemon/bramblin/back.png rename to graphics/pokemon/gen_9/bramblin/back.png diff --git a/graphics/pokemon/bramblin/front.png b/graphics/pokemon/gen_9/bramblin/front.png similarity index 100% rename from graphics/pokemon/bramblin/front.png rename to graphics/pokemon/gen_9/bramblin/front.png diff --git a/graphics/pokemon/bramblin/icon.png b/graphics/pokemon/gen_9/bramblin/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/bramblin/icon.png rename to graphics/pokemon/gen_9/bramblin/icon.png diff --git a/graphics/pokemon/bramblin/normal.pal b/graphics/pokemon/gen_9/bramblin/normal.pal similarity index 100% rename from graphics/pokemon/bramblin/normal.pal rename to graphics/pokemon/gen_9/bramblin/normal.pal diff --git a/graphics/pokemon/bramblin/shiny.pal b/graphics/pokemon/gen_9/bramblin/shiny.pal similarity index 100% rename from graphics/pokemon/bramblin/shiny.pal rename to graphics/pokemon/gen_9/bramblin/shiny.pal diff --git a/graphics/pokemon/brute_bonnet/back.png b/graphics/pokemon/gen_9/brute_bonnet/back.png similarity index 100% rename from graphics/pokemon/brute_bonnet/back.png rename to graphics/pokemon/gen_9/brute_bonnet/back.png diff --git a/graphics/pokemon/brute_bonnet/front.png b/graphics/pokemon/gen_9/brute_bonnet/front.png similarity index 100% rename from graphics/pokemon/brute_bonnet/front.png rename to graphics/pokemon/gen_9/brute_bonnet/front.png diff --git a/graphics/pokemon/brute_bonnet/icon.png b/graphics/pokemon/gen_9/brute_bonnet/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/brute_bonnet/icon.png rename to graphics/pokemon/gen_9/brute_bonnet/icon.png diff --git a/graphics/pokemon/brute_bonnet/normal.pal b/graphics/pokemon/gen_9/brute_bonnet/normal.pal similarity index 100% rename from graphics/pokemon/brute_bonnet/normal.pal rename to graphics/pokemon/gen_9/brute_bonnet/normal.pal diff --git a/graphics/pokemon/brute_bonnet/shiny.pal b/graphics/pokemon/gen_9/brute_bonnet/shiny.pal similarity index 100% rename from graphics/pokemon/brute_bonnet/shiny.pal rename to graphics/pokemon/gen_9/brute_bonnet/shiny.pal diff --git a/graphics/pokemon/capsakid/back.png b/graphics/pokemon/gen_9/capsakid/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/capsakid/back.png rename to graphics/pokemon/gen_9/capsakid/back.png diff --git a/graphics/pokemon/capsakid/front.png b/graphics/pokemon/gen_9/capsakid/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/capsakid/front.png rename to graphics/pokemon/gen_9/capsakid/front.png diff --git a/graphics/pokemon/capsakid/icon.png b/graphics/pokemon/gen_9/capsakid/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/capsakid/icon.png rename to graphics/pokemon/gen_9/capsakid/icon.png diff --git a/graphics/pokemon/capsakid/normal.pal b/graphics/pokemon/gen_9/capsakid/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/capsakid/normal.pal rename to graphics/pokemon/gen_9/capsakid/normal.pal diff --git a/graphics/pokemon/capsakid/shiny.pal b/graphics/pokemon/gen_9/capsakid/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/capsakid/shiny.pal rename to graphics/pokemon/gen_9/capsakid/shiny.pal diff --git a/graphics/pokemon/ceruledge/back.png b/graphics/pokemon/gen_9/ceruledge/back.png similarity index 100% rename from graphics/pokemon/ceruledge/back.png rename to graphics/pokemon/gen_9/ceruledge/back.png diff --git a/graphics/pokemon/ceruledge/front.png b/graphics/pokemon/gen_9/ceruledge/front.png similarity index 100% rename from graphics/pokemon/ceruledge/front.png rename to graphics/pokemon/gen_9/ceruledge/front.png diff --git a/graphics/pokemon/ceruledge/icon.png b/graphics/pokemon/gen_9/ceruledge/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/ceruledge/icon.png rename to graphics/pokemon/gen_9/ceruledge/icon.png diff --git a/graphics/pokemon/ceruledge/normal.pal b/graphics/pokemon/gen_9/ceruledge/normal.pal similarity index 100% rename from graphics/pokemon/ceruledge/normal.pal rename to graphics/pokemon/gen_9/ceruledge/normal.pal diff --git a/graphics/pokemon/ceruledge/shiny.pal b/graphics/pokemon/gen_9/ceruledge/shiny.pal similarity index 100% rename from graphics/pokemon/ceruledge/shiny.pal rename to graphics/pokemon/gen_9/ceruledge/shiny.pal diff --git a/graphics/pokemon/cetitan/back.png b/graphics/pokemon/gen_9/cetitan/back.png similarity index 100% rename from graphics/pokemon/cetitan/back.png rename to graphics/pokemon/gen_9/cetitan/back.png diff --git a/graphics/pokemon/cetitan/front.png b/graphics/pokemon/gen_9/cetitan/front.png similarity index 100% rename from graphics/pokemon/cetitan/front.png rename to graphics/pokemon/gen_9/cetitan/front.png diff --git a/graphics/pokemon/cetitan/icon.png b/graphics/pokemon/gen_9/cetitan/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/cetitan/icon.png rename to graphics/pokemon/gen_9/cetitan/icon.png diff --git a/graphics/pokemon/cetitan/normal.pal b/graphics/pokemon/gen_9/cetitan/normal.pal similarity index 100% rename from graphics/pokemon/cetitan/normal.pal rename to graphics/pokemon/gen_9/cetitan/normal.pal diff --git a/graphics/pokemon/cetitan/shiny.pal b/graphics/pokemon/gen_9/cetitan/shiny.pal similarity index 100% rename from graphics/pokemon/cetitan/shiny.pal rename to graphics/pokemon/gen_9/cetitan/shiny.pal diff --git a/graphics/pokemon/cetoddle/back.png b/graphics/pokemon/gen_9/cetoddle/back.png similarity index 100% rename from graphics/pokemon/cetoddle/back.png rename to graphics/pokemon/gen_9/cetoddle/back.png diff --git a/graphics/pokemon/cetoddle/front.png b/graphics/pokemon/gen_9/cetoddle/front.png similarity index 100% rename from graphics/pokemon/cetoddle/front.png rename to graphics/pokemon/gen_9/cetoddle/front.png diff --git a/graphics/pokemon/cetoddle/icon.png b/graphics/pokemon/gen_9/cetoddle/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/cetoddle/icon.png rename to graphics/pokemon/gen_9/cetoddle/icon.png diff --git a/graphics/pokemon/cetoddle/normal.pal b/graphics/pokemon/gen_9/cetoddle/normal.pal similarity index 100% rename from graphics/pokemon/cetoddle/normal.pal rename to graphics/pokemon/gen_9/cetoddle/normal.pal diff --git a/graphics/pokemon/cetoddle/shiny.pal b/graphics/pokemon/gen_9/cetoddle/shiny.pal similarity index 100% rename from graphics/pokemon/cetoddle/shiny.pal rename to graphics/pokemon/gen_9/cetoddle/shiny.pal diff --git a/graphics/pokemon/charcadet/back.png b/graphics/pokemon/gen_9/charcadet/back.png similarity index 100% rename from graphics/pokemon/charcadet/back.png rename to graphics/pokemon/gen_9/charcadet/back.png diff --git a/graphics/pokemon/charcadet/front.png b/graphics/pokemon/gen_9/charcadet/front.png similarity index 100% rename from graphics/pokemon/charcadet/front.png rename to graphics/pokemon/gen_9/charcadet/front.png diff --git a/graphics/pokemon/charcadet/icon.png b/graphics/pokemon/gen_9/charcadet/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/charcadet/icon.png rename to graphics/pokemon/gen_9/charcadet/icon.png diff --git a/graphics/pokemon/charcadet/normal.pal b/graphics/pokemon/gen_9/charcadet/normal.pal similarity index 100% rename from graphics/pokemon/charcadet/normal.pal rename to graphics/pokemon/gen_9/charcadet/normal.pal diff --git a/graphics/pokemon/charcadet/shiny.pal b/graphics/pokemon/gen_9/charcadet/shiny.pal similarity index 100% rename from graphics/pokemon/charcadet/shiny.pal rename to graphics/pokemon/gen_9/charcadet/shiny.pal diff --git a/graphics/pokemon/chi_yu/back.png b/graphics/pokemon/gen_9/chi_yu/back.png similarity index 100% rename from graphics/pokemon/chi_yu/back.png rename to graphics/pokemon/gen_9/chi_yu/back.png diff --git a/graphics/pokemon/chi_yu/front.png b/graphics/pokemon/gen_9/chi_yu/front.png similarity index 100% rename from graphics/pokemon/chi_yu/front.png rename to graphics/pokemon/gen_9/chi_yu/front.png diff --git a/graphics/pokemon/chi_yu/icon.png b/graphics/pokemon/gen_9/chi_yu/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/chi_yu/icon.png rename to graphics/pokemon/gen_9/chi_yu/icon.png diff --git a/graphics/pokemon/chi_yu/normal.pal b/graphics/pokemon/gen_9/chi_yu/normal.pal similarity index 100% rename from graphics/pokemon/chi_yu/normal.pal rename to graphics/pokemon/gen_9/chi_yu/normal.pal diff --git a/graphics/pokemon/chi_yu/shiny.pal b/graphics/pokemon/gen_9/chi_yu/shiny.pal similarity index 100% rename from graphics/pokemon/chi_yu/shiny.pal rename to graphics/pokemon/gen_9/chi_yu/shiny.pal diff --git a/graphics/pokemon/chien_pao/back.png b/graphics/pokemon/gen_9/chien_pao/back.png similarity index 100% rename from graphics/pokemon/chien_pao/back.png rename to graphics/pokemon/gen_9/chien_pao/back.png diff --git a/graphics/pokemon/chien_pao/front.png b/graphics/pokemon/gen_9/chien_pao/front.png similarity index 100% rename from graphics/pokemon/chien_pao/front.png rename to graphics/pokemon/gen_9/chien_pao/front.png diff --git a/graphics/pokemon/chien_pao/icon.png b/graphics/pokemon/gen_9/chien_pao/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/chien_pao/icon.png rename to graphics/pokemon/gen_9/chien_pao/icon.png diff --git a/graphics/pokemon/chien_pao/normal.pal b/graphics/pokemon/gen_9/chien_pao/normal.pal similarity index 100% rename from graphics/pokemon/chien_pao/normal.pal rename to graphics/pokemon/gen_9/chien_pao/normal.pal diff --git a/graphics/pokemon/chien_pao/shiny.pal b/graphics/pokemon/gen_9/chien_pao/shiny.pal similarity index 100% rename from graphics/pokemon/chien_pao/shiny.pal rename to graphics/pokemon/gen_9/chien_pao/shiny.pal diff --git a/graphics/pokemon/clodsire/back.png b/graphics/pokemon/gen_9/clodsire/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/clodsire/back.png rename to graphics/pokemon/gen_9/clodsire/back.png diff --git a/graphics/pokemon/clodsire/front.png b/graphics/pokemon/gen_9/clodsire/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/clodsire/front.png rename to graphics/pokemon/gen_9/clodsire/front.png diff --git a/graphics/pokemon/clodsire/icon.png b/graphics/pokemon/gen_9/clodsire/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/clodsire/icon.png rename to graphics/pokemon/gen_9/clodsire/icon.png diff --git a/graphics/pokemon/clodsire/normal.pal b/graphics/pokemon/gen_9/clodsire/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/clodsire/normal.pal rename to graphics/pokemon/gen_9/clodsire/normal.pal diff --git a/graphics/pokemon/clodsire/shiny.pal b/graphics/pokemon/gen_9/clodsire/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/clodsire/shiny.pal rename to graphics/pokemon/gen_9/clodsire/shiny.pal diff --git a/graphics/pokemon/crocalor/back.png b/graphics/pokemon/gen_9/crocalor/back.png similarity index 100% rename from graphics/pokemon/crocalor/back.png rename to graphics/pokemon/gen_9/crocalor/back.png diff --git a/graphics/pokemon/crocalor/front.png b/graphics/pokemon/gen_9/crocalor/front.png similarity index 100% rename from graphics/pokemon/crocalor/front.png rename to graphics/pokemon/gen_9/crocalor/front.png diff --git a/graphics/pokemon/crocalor/icon.png b/graphics/pokemon/gen_9/crocalor/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/crocalor/icon.png rename to graphics/pokemon/gen_9/crocalor/icon.png diff --git a/graphics/pokemon/crocalor/normal.pal b/graphics/pokemon/gen_9/crocalor/normal.pal similarity index 100% rename from graphics/pokemon/crocalor/normal.pal rename to graphics/pokemon/gen_9/crocalor/normal.pal diff --git a/graphics/pokemon/crocalor/shiny.pal b/graphics/pokemon/gen_9/crocalor/shiny.pal similarity index 100% rename from graphics/pokemon/crocalor/shiny.pal rename to graphics/pokemon/gen_9/crocalor/shiny.pal diff --git a/graphics/pokemon/cyclizar/back.png b/graphics/pokemon/gen_9/cyclizar/back.png similarity index 100% rename from graphics/pokemon/cyclizar/back.png rename to graphics/pokemon/gen_9/cyclizar/back.png diff --git a/graphics/pokemon/cyclizar/front.png b/graphics/pokemon/gen_9/cyclizar/front.png similarity index 100% rename from graphics/pokemon/cyclizar/front.png rename to graphics/pokemon/gen_9/cyclizar/front.png diff --git a/graphics/pokemon/cyclizar/icon.png b/graphics/pokemon/gen_9/cyclizar/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/cyclizar/icon.png rename to graphics/pokemon/gen_9/cyclizar/icon.png diff --git a/graphics/pokemon/cyclizar/normal.pal b/graphics/pokemon/gen_9/cyclizar/normal.pal similarity index 100% rename from graphics/pokemon/cyclizar/normal.pal rename to graphics/pokemon/gen_9/cyclizar/normal.pal diff --git a/graphics/pokemon/cyclizar/shiny.pal b/graphics/pokemon/gen_9/cyclizar/shiny.pal similarity index 100% rename from graphics/pokemon/cyclizar/shiny.pal rename to graphics/pokemon/gen_9/cyclizar/shiny.pal diff --git a/graphics/pokemon/dachsbun/back.png b/graphics/pokemon/gen_9/dachsbun/back.png similarity index 100% rename from graphics/pokemon/dachsbun/back.png rename to graphics/pokemon/gen_9/dachsbun/back.png diff --git a/graphics/pokemon/dachsbun/front.png b/graphics/pokemon/gen_9/dachsbun/front.png similarity index 100% rename from graphics/pokemon/dachsbun/front.png rename to graphics/pokemon/gen_9/dachsbun/front.png diff --git a/graphics/pokemon/dachsbun/icon.png b/graphics/pokemon/gen_9/dachsbun/icon.png similarity index 100% rename from graphics/pokemon/dachsbun/icon.png rename to graphics/pokemon/gen_9/dachsbun/icon.png diff --git a/graphics/pokemon/dachsbun/normal.pal b/graphics/pokemon/gen_9/dachsbun/normal.pal similarity index 100% rename from graphics/pokemon/dachsbun/normal.pal rename to graphics/pokemon/gen_9/dachsbun/normal.pal diff --git a/graphics/pokemon/dachsbun/shiny.pal b/graphics/pokemon/gen_9/dachsbun/shiny.pal similarity index 100% rename from graphics/pokemon/dachsbun/shiny.pal rename to graphics/pokemon/gen_9/dachsbun/shiny.pal diff --git a/graphics/pokemon/dipplin/back.png b/graphics/pokemon/gen_9/dipplin/back.png similarity index 100% rename from graphics/pokemon/dipplin/back.png rename to graphics/pokemon/gen_9/dipplin/back.png diff --git a/graphics/pokemon/dipplin/front.png b/graphics/pokemon/gen_9/dipplin/front.png similarity index 100% rename from graphics/pokemon/dipplin/front.png rename to graphics/pokemon/gen_9/dipplin/front.png diff --git a/graphics/pokemon/dipplin/icon.png b/graphics/pokemon/gen_9/dipplin/icon.png similarity index 100% rename from graphics/pokemon/dipplin/icon.png rename to graphics/pokemon/gen_9/dipplin/icon.png diff --git a/graphics/pokemon/dipplin/normal.pal b/graphics/pokemon/gen_9/dipplin/normal.pal similarity index 100% rename from graphics/pokemon/dipplin/normal.pal rename to graphics/pokemon/gen_9/dipplin/normal.pal diff --git a/graphics/pokemon/dipplin/shiny.pal b/graphics/pokemon/gen_9/dipplin/shiny.pal similarity index 100% rename from graphics/pokemon/dipplin/shiny.pal rename to graphics/pokemon/gen_9/dipplin/shiny.pal diff --git a/graphics/pokemon/dolliv/back.png b/graphics/pokemon/gen_9/dolliv/back.png similarity index 100% rename from graphics/pokemon/dolliv/back.png rename to graphics/pokemon/gen_9/dolliv/back.png diff --git a/graphics/pokemon/dolliv/front.png b/graphics/pokemon/gen_9/dolliv/front.png similarity index 100% rename from graphics/pokemon/dolliv/front.png rename to graphics/pokemon/gen_9/dolliv/front.png diff --git a/graphics/pokemon/dolliv/icon.png b/graphics/pokemon/gen_9/dolliv/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/dolliv/icon.png rename to graphics/pokemon/gen_9/dolliv/icon.png diff --git a/graphics/pokemon/dolliv/normal.pal b/graphics/pokemon/gen_9/dolliv/normal.pal similarity index 100% rename from graphics/pokemon/dolliv/normal.pal rename to graphics/pokemon/gen_9/dolliv/normal.pal diff --git a/graphics/pokemon/dolliv/shiny.pal b/graphics/pokemon/gen_9/dolliv/shiny.pal similarity index 100% rename from graphics/pokemon/dolliv/shiny.pal rename to graphics/pokemon/gen_9/dolliv/shiny.pal diff --git a/graphics/pokemon/dondozo/back.png b/graphics/pokemon/gen_9/dondozo/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/dondozo/back.png rename to graphics/pokemon/gen_9/dondozo/back.png diff --git a/graphics/pokemon/dondozo/front.png b/graphics/pokemon/gen_9/dondozo/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/dondozo/front.png rename to graphics/pokemon/gen_9/dondozo/front.png diff --git a/graphics/pokemon/dondozo/icon.png b/graphics/pokemon/gen_9/dondozo/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/dondozo/icon.png rename to graphics/pokemon/gen_9/dondozo/icon.png diff --git a/graphics/pokemon/dondozo/normal.pal b/graphics/pokemon/gen_9/dondozo/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/dondozo/normal.pal rename to graphics/pokemon/gen_9/dondozo/normal.pal diff --git a/graphics/pokemon/dondozo/shiny.pal b/graphics/pokemon/gen_9/dondozo/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/dondozo/shiny.pal rename to graphics/pokemon/gen_9/dondozo/shiny.pal diff --git a/graphics/pokemon/dudunsparce/back.png b/graphics/pokemon/gen_9/dudunsparce/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/dudunsparce/back.png rename to graphics/pokemon/gen_9/dudunsparce/back.png diff --git a/graphics/pokemon/dudunsparce/front.png b/graphics/pokemon/gen_9/dudunsparce/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/dudunsparce/front.png rename to graphics/pokemon/gen_9/dudunsparce/front.png diff --git a/graphics/pokemon/dudunsparce/icon.png b/graphics/pokemon/gen_9/dudunsparce/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/dudunsparce/icon.png rename to graphics/pokemon/gen_9/dudunsparce/icon.png diff --git a/graphics/pokemon/dudunsparce/normal.pal b/graphics/pokemon/gen_9/dudunsparce/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/dudunsparce/normal.pal rename to graphics/pokemon/gen_9/dudunsparce/normal.pal diff --git a/graphics/pokemon/dudunsparce/shiny.pal b/graphics/pokemon/gen_9/dudunsparce/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/dudunsparce/shiny.pal rename to graphics/pokemon/gen_9/dudunsparce/shiny.pal diff --git a/graphics/pokemon/dudunsparce/three_segment/back.png b/graphics/pokemon/gen_9/dudunsparce/three_segment/back.png similarity index 100% rename from graphics/pokemon/dudunsparce/three_segment/back.png rename to graphics/pokemon/gen_9/dudunsparce/three_segment/back.png diff --git a/graphics/pokemon/dudunsparce/three_segment/front.png b/graphics/pokemon/gen_9/dudunsparce/three_segment/front.png similarity index 100% rename from graphics/pokemon/dudunsparce/three_segment/front.png rename to graphics/pokemon/gen_9/dudunsparce/three_segment/front.png diff --git a/graphics/pokemon/espathra/back.png b/graphics/pokemon/gen_9/espathra/back.png similarity index 100% rename from graphics/pokemon/espathra/back.png rename to graphics/pokemon/gen_9/espathra/back.png diff --git a/graphics/pokemon/espathra/front.png b/graphics/pokemon/gen_9/espathra/front.png similarity index 100% rename from graphics/pokemon/espathra/front.png rename to graphics/pokemon/gen_9/espathra/front.png diff --git a/graphics/pokemon/espathra/icon.png b/graphics/pokemon/gen_9/espathra/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/espathra/icon.png rename to graphics/pokemon/gen_9/espathra/icon.png diff --git a/graphics/pokemon/espathra/normal.pal b/graphics/pokemon/gen_9/espathra/normal.pal similarity index 100% rename from graphics/pokemon/espathra/normal.pal rename to graphics/pokemon/gen_9/espathra/normal.pal diff --git a/graphics/pokemon/espathra/shiny.pal b/graphics/pokemon/gen_9/espathra/shiny.pal similarity index 100% rename from graphics/pokemon/espathra/shiny.pal rename to graphics/pokemon/gen_9/espathra/shiny.pal diff --git a/graphics/pokemon/farigiraf/back.png b/graphics/pokemon/gen_9/farigiraf/back.png similarity index 100% rename from graphics/pokemon/farigiraf/back.png rename to graphics/pokemon/gen_9/farigiraf/back.png diff --git a/graphics/pokemon/farigiraf/front.png b/graphics/pokemon/gen_9/farigiraf/front.png similarity index 100% rename from graphics/pokemon/farigiraf/front.png rename to graphics/pokemon/gen_9/farigiraf/front.png diff --git a/graphics/pokemon/farigiraf/icon.png b/graphics/pokemon/gen_9/farigiraf/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/farigiraf/icon.png rename to graphics/pokemon/gen_9/farigiraf/icon.png diff --git a/graphics/pokemon/farigiraf/normal.pal b/graphics/pokemon/gen_9/farigiraf/normal.pal similarity index 100% rename from graphics/pokemon/farigiraf/normal.pal rename to graphics/pokemon/gen_9/farigiraf/normal.pal diff --git a/graphics/pokemon/farigiraf/shiny.pal b/graphics/pokemon/gen_9/farigiraf/shiny.pal similarity index 100% rename from graphics/pokemon/farigiraf/shiny.pal rename to graphics/pokemon/gen_9/farigiraf/shiny.pal diff --git a/graphics/pokemon/fezandipiti/back.png b/graphics/pokemon/gen_9/fezandipiti/back.png similarity index 100% rename from graphics/pokemon/fezandipiti/back.png rename to graphics/pokemon/gen_9/fezandipiti/back.png diff --git a/graphics/pokemon/fezandipiti/front.png b/graphics/pokemon/gen_9/fezandipiti/front.png similarity index 100% rename from graphics/pokemon/fezandipiti/front.png rename to graphics/pokemon/gen_9/fezandipiti/front.png diff --git a/graphics/pokemon/fezandipiti/icon.png b/graphics/pokemon/gen_9/fezandipiti/icon.png similarity index 100% rename from graphics/pokemon/fezandipiti/icon.png rename to graphics/pokemon/gen_9/fezandipiti/icon.png diff --git a/graphics/pokemon/fezandipiti/normal.pal b/graphics/pokemon/gen_9/fezandipiti/normal.pal similarity index 100% rename from graphics/pokemon/fezandipiti/normal.pal rename to graphics/pokemon/gen_9/fezandipiti/normal.pal diff --git a/graphics/pokemon/fezandipiti/shiny.pal b/graphics/pokemon/gen_9/fezandipiti/shiny.pal similarity index 100% rename from graphics/pokemon/fezandipiti/shiny.pal rename to graphics/pokemon/gen_9/fezandipiti/shiny.pal diff --git a/graphics/pokemon/fidough/back.png b/graphics/pokemon/gen_9/fidough/back.png similarity index 100% rename from graphics/pokemon/fidough/back.png rename to graphics/pokemon/gen_9/fidough/back.png diff --git a/graphics/pokemon/fidough/front.png b/graphics/pokemon/gen_9/fidough/front.png similarity index 100% rename from graphics/pokemon/fidough/front.png rename to graphics/pokemon/gen_9/fidough/front.png diff --git a/graphics/pokemon/fidough/icon.png b/graphics/pokemon/gen_9/fidough/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/fidough/icon.png rename to graphics/pokemon/gen_9/fidough/icon.png diff --git a/graphics/pokemon/fidough/normal.pal b/graphics/pokemon/gen_9/fidough/normal.pal similarity index 100% rename from graphics/pokemon/fidough/normal.pal rename to graphics/pokemon/gen_9/fidough/normal.pal diff --git a/graphics/pokemon/fidough/shiny.pal b/graphics/pokemon/gen_9/fidough/shiny.pal similarity index 100% rename from graphics/pokemon/fidough/shiny.pal rename to graphics/pokemon/gen_9/fidough/shiny.pal diff --git a/graphics/pokemon/finizen/back.png b/graphics/pokemon/gen_9/finizen/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/finizen/back.png rename to graphics/pokemon/gen_9/finizen/back.png diff --git a/graphics/pokemon/finizen/front.png b/graphics/pokemon/gen_9/finizen/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/finizen/front.png rename to graphics/pokemon/gen_9/finizen/front.png diff --git a/graphics/pokemon/finizen/icon.png b/graphics/pokemon/gen_9/finizen/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/finizen/icon.png rename to graphics/pokemon/gen_9/finizen/icon.png diff --git a/graphics/pokemon/finizen/normal.pal b/graphics/pokemon/gen_9/finizen/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/finizen/normal.pal rename to graphics/pokemon/gen_9/finizen/normal.pal diff --git a/graphics/pokemon/finizen/shiny.pal b/graphics/pokemon/gen_9/finizen/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/finizen/shiny.pal rename to graphics/pokemon/gen_9/finizen/shiny.pal diff --git a/graphics/pokemon/flamigo/back.png b/graphics/pokemon/gen_9/flamigo/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/flamigo/back.png rename to graphics/pokemon/gen_9/flamigo/back.png diff --git a/graphics/pokemon/flamigo/front.png b/graphics/pokemon/gen_9/flamigo/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/flamigo/front.png rename to graphics/pokemon/gen_9/flamigo/front.png diff --git a/graphics/pokemon/flamigo/icon.png b/graphics/pokemon/gen_9/flamigo/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/flamigo/icon.png rename to graphics/pokemon/gen_9/flamigo/icon.png diff --git a/graphics/pokemon/flamigo/normal.pal b/graphics/pokemon/gen_9/flamigo/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/flamigo/normal.pal rename to graphics/pokemon/gen_9/flamigo/normal.pal diff --git a/graphics/pokemon/flamigo/shiny.pal b/graphics/pokemon/gen_9/flamigo/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/flamigo/shiny.pal rename to graphics/pokemon/gen_9/flamigo/shiny.pal diff --git a/graphics/pokemon/flittle/back.png b/graphics/pokemon/gen_9/flittle/back.png similarity index 100% rename from graphics/pokemon/flittle/back.png rename to graphics/pokemon/gen_9/flittle/back.png diff --git a/graphics/pokemon/flittle/front.png b/graphics/pokemon/gen_9/flittle/front.png similarity index 100% rename from graphics/pokemon/flittle/front.png rename to graphics/pokemon/gen_9/flittle/front.png diff --git a/graphics/pokemon/flittle/icon.png b/graphics/pokemon/gen_9/flittle/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/flittle/icon.png rename to graphics/pokemon/gen_9/flittle/icon.png diff --git a/graphics/pokemon/flittle/normal.pal b/graphics/pokemon/gen_9/flittle/normal.pal similarity index 100% rename from graphics/pokemon/flittle/normal.pal rename to graphics/pokemon/gen_9/flittle/normal.pal diff --git a/graphics/pokemon/flittle/shiny.pal b/graphics/pokemon/gen_9/flittle/shiny.pal similarity index 100% rename from graphics/pokemon/flittle/shiny.pal rename to graphics/pokemon/gen_9/flittle/shiny.pal diff --git a/graphics/pokemon/floragato/back.png b/graphics/pokemon/gen_9/floragato/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/floragato/back.png rename to graphics/pokemon/gen_9/floragato/back.png diff --git a/graphics/pokemon/floragato/front.png b/graphics/pokemon/gen_9/floragato/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/floragato/front.png rename to graphics/pokemon/gen_9/floragato/front.png diff --git a/graphics/pokemon/floragato/icon.png b/graphics/pokemon/gen_9/floragato/icon.png similarity index 100% rename from graphics/pokemon/floragato/icon.png rename to graphics/pokemon/gen_9/floragato/icon.png diff --git a/graphics/pokemon/floragato/normal.pal b/graphics/pokemon/gen_9/floragato/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/floragato/normal.pal rename to graphics/pokemon/gen_9/floragato/normal.pal diff --git a/graphics/pokemon/floragato/shiny.pal b/graphics/pokemon/gen_9/floragato/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/floragato/shiny.pal rename to graphics/pokemon/gen_9/floragato/shiny.pal diff --git a/graphics/pokemon/flutter_mane/back.png b/graphics/pokemon/gen_9/flutter_mane/back.png similarity index 100% rename from graphics/pokemon/flutter_mane/back.png rename to graphics/pokemon/gen_9/flutter_mane/back.png diff --git a/graphics/pokemon/flutter_mane/front.png b/graphics/pokemon/gen_9/flutter_mane/front.png similarity index 100% rename from graphics/pokemon/flutter_mane/front.png rename to graphics/pokemon/gen_9/flutter_mane/front.png diff --git a/graphics/pokemon/flutter_mane/icon.png b/graphics/pokemon/gen_9/flutter_mane/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/flutter_mane/icon.png rename to graphics/pokemon/gen_9/flutter_mane/icon.png diff --git a/graphics/pokemon/flutter_mane/normal.pal b/graphics/pokemon/gen_9/flutter_mane/normal.pal similarity index 100% rename from graphics/pokemon/flutter_mane/normal.pal rename to graphics/pokemon/gen_9/flutter_mane/normal.pal diff --git a/graphics/pokemon/flutter_mane/shiny.pal b/graphics/pokemon/gen_9/flutter_mane/shiny.pal similarity index 100% rename from graphics/pokemon/flutter_mane/shiny.pal rename to graphics/pokemon/gen_9/flutter_mane/shiny.pal diff --git a/graphics/pokemon/frigibax/anim_front.png b/graphics/pokemon/gen_9/frigibax/anim_front.png similarity index 100% rename from graphics/pokemon/frigibax/anim_front.png rename to graphics/pokemon/gen_9/frigibax/anim_front.png diff --git a/graphics/pokemon/frigibax/back.png b/graphics/pokemon/gen_9/frigibax/back.png similarity index 100% rename from graphics/pokemon/frigibax/back.png rename to graphics/pokemon/gen_9/frigibax/back.png diff --git a/graphics/pokemon/frigibax/icon.png b/graphics/pokemon/gen_9/frigibax/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/frigibax/icon.png rename to graphics/pokemon/gen_9/frigibax/icon.png diff --git a/graphics/pokemon/frigibax/normal.pal b/graphics/pokemon/gen_9/frigibax/normal.pal similarity index 100% rename from graphics/pokemon/frigibax/normal.pal rename to graphics/pokemon/gen_9/frigibax/normal.pal diff --git a/graphics/pokemon/frigibax/shiny.pal b/graphics/pokemon/gen_9/frigibax/shiny.pal similarity index 100% rename from graphics/pokemon/frigibax/shiny.pal rename to graphics/pokemon/gen_9/frigibax/shiny.pal diff --git a/graphics/pokemon/fuecoco/back.png b/graphics/pokemon/gen_9/fuecoco/back.png similarity index 100% rename from graphics/pokemon/fuecoco/back.png rename to graphics/pokemon/gen_9/fuecoco/back.png diff --git a/graphics/pokemon/fuecoco/front.png b/graphics/pokemon/gen_9/fuecoco/front.png similarity index 100% rename from graphics/pokemon/fuecoco/front.png rename to graphics/pokemon/gen_9/fuecoco/front.png diff --git a/graphics/pokemon/fuecoco/icon.png b/graphics/pokemon/gen_9/fuecoco/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/fuecoco/icon.png rename to graphics/pokemon/gen_9/fuecoco/icon.png diff --git a/graphics/pokemon/fuecoco/normal.pal b/graphics/pokemon/gen_9/fuecoco/normal.pal similarity index 100% rename from graphics/pokemon/fuecoco/normal.pal rename to graphics/pokemon/gen_9/fuecoco/normal.pal diff --git a/graphics/pokemon/fuecoco/shiny.pal b/graphics/pokemon/gen_9/fuecoco/shiny.pal similarity index 100% rename from graphics/pokemon/fuecoco/shiny.pal rename to graphics/pokemon/gen_9/fuecoco/shiny.pal diff --git a/graphics/pokemon/garganacl/back.png b/graphics/pokemon/gen_9/garganacl/back.png similarity index 100% rename from graphics/pokemon/garganacl/back.png rename to graphics/pokemon/gen_9/garganacl/back.png diff --git a/graphics/pokemon/garganacl/front.png b/graphics/pokemon/gen_9/garganacl/front.png similarity index 100% rename from graphics/pokemon/garganacl/front.png rename to graphics/pokemon/gen_9/garganacl/front.png diff --git a/graphics/pokemon/garganacl/icon.png b/graphics/pokemon/gen_9/garganacl/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/garganacl/icon.png rename to graphics/pokemon/gen_9/garganacl/icon.png diff --git a/graphics/pokemon/garganacl/normal.pal b/graphics/pokemon/gen_9/garganacl/normal.pal similarity index 100% rename from graphics/pokemon/garganacl/normal.pal rename to graphics/pokemon/gen_9/garganacl/normal.pal diff --git a/graphics/pokemon/garganacl/shiny.pal b/graphics/pokemon/gen_9/garganacl/shiny.pal similarity index 100% rename from graphics/pokemon/garganacl/shiny.pal rename to graphics/pokemon/gen_9/garganacl/shiny.pal diff --git a/graphics/pokemon/gholdengo/back.png b/graphics/pokemon/gen_9/gholdengo/back.png similarity index 100% rename from graphics/pokemon/gholdengo/back.png rename to graphics/pokemon/gen_9/gholdengo/back.png diff --git a/graphics/pokemon/gholdengo/front.png b/graphics/pokemon/gen_9/gholdengo/front.png similarity index 100% rename from graphics/pokemon/gholdengo/front.png rename to graphics/pokemon/gen_9/gholdengo/front.png diff --git a/graphics/pokemon/gholdengo/icon.png b/graphics/pokemon/gen_9/gholdengo/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/gholdengo/icon.png rename to graphics/pokemon/gen_9/gholdengo/icon.png diff --git a/graphics/pokemon/gholdengo/normal.pal b/graphics/pokemon/gen_9/gholdengo/normal.pal similarity index 100% rename from graphics/pokemon/gholdengo/normal.pal rename to graphics/pokemon/gen_9/gholdengo/normal.pal diff --git a/graphics/pokemon/gholdengo/shiny.pal b/graphics/pokemon/gen_9/gholdengo/shiny.pal similarity index 100% rename from graphics/pokemon/gholdengo/shiny.pal rename to graphics/pokemon/gen_9/gholdengo/shiny.pal diff --git a/graphics/pokemon/gimmighoul/back.png b/graphics/pokemon/gen_9/gimmighoul/back.png similarity index 100% rename from graphics/pokemon/gimmighoul/back.png rename to graphics/pokemon/gen_9/gimmighoul/back.png diff --git a/graphics/pokemon/gimmighoul/front.png b/graphics/pokemon/gen_9/gimmighoul/front.png similarity index 100% rename from graphics/pokemon/gimmighoul/front.png rename to graphics/pokemon/gen_9/gimmighoul/front.png diff --git a/graphics/pokemon/gimmighoul/icon.png b/graphics/pokemon/gen_9/gimmighoul/icon.png similarity index 100% rename from graphics/pokemon/gimmighoul/icon.png rename to graphics/pokemon/gen_9/gimmighoul/icon.png diff --git a/graphics/pokemon/gimmighoul/normal.pal b/graphics/pokemon/gen_9/gimmighoul/normal.pal similarity index 100% rename from graphics/pokemon/gimmighoul/normal.pal rename to graphics/pokemon/gen_9/gimmighoul/normal.pal diff --git a/graphics/pokemon/gimmighoul/roaming/back.png b/graphics/pokemon/gen_9/gimmighoul/roaming/back.png similarity index 100% rename from graphics/pokemon/gimmighoul/roaming/back.png rename to graphics/pokemon/gen_9/gimmighoul/roaming/back.png diff --git a/graphics/pokemon/gimmighoul/roaming/front.png b/graphics/pokemon/gen_9/gimmighoul/roaming/front.png similarity index 100% rename from graphics/pokemon/gimmighoul/roaming/front.png rename to graphics/pokemon/gen_9/gimmighoul/roaming/front.png diff --git a/graphics/pokemon/gimmighoul/roaming/icon.png b/graphics/pokemon/gen_9/gimmighoul/roaming/icon.png similarity index 100% rename from graphics/pokemon/gimmighoul/roaming/icon.png rename to graphics/pokemon/gen_9/gimmighoul/roaming/icon.png diff --git a/graphics/pokemon/gimmighoul/roaming/normal.pal b/graphics/pokemon/gen_9/gimmighoul/roaming/normal.pal similarity index 100% rename from graphics/pokemon/gimmighoul/roaming/normal.pal rename to graphics/pokemon/gen_9/gimmighoul/roaming/normal.pal diff --git a/graphics/pokemon/gimmighoul/roaming/shiny.pal b/graphics/pokemon/gen_9/gimmighoul/roaming/shiny.pal similarity index 100% rename from graphics/pokemon/gimmighoul/roaming/shiny.pal rename to graphics/pokemon/gen_9/gimmighoul/roaming/shiny.pal diff --git a/graphics/pokemon/gimmighoul/shiny.pal b/graphics/pokemon/gen_9/gimmighoul/shiny.pal similarity index 100% rename from graphics/pokemon/gimmighoul/shiny.pal rename to graphics/pokemon/gen_9/gimmighoul/shiny.pal diff --git a/graphics/pokemon/glimmet/back.png b/graphics/pokemon/gen_9/glimmet/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/glimmet/back.png rename to graphics/pokemon/gen_9/glimmet/back.png diff --git a/graphics/pokemon/glimmet/front.png b/graphics/pokemon/gen_9/glimmet/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/glimmet/front.png rename to graphics/pokemon/gen_9/glimmet/front.png diff --git a/graphics/pokemon/glimmet/icon.png b/graphics/pokemon/gen_9/glimmet/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/glimmet/icon.png rename to graphics/pokemon/gen_9/glimmet/icon.png diff --git a/graphics/pokemon/glimmet/normal.pal b/graphics/pokemon/gen_9/glimmet/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/glimmet/normal.pal rename to graphics/pokemon/gen_9/glimmet/normal.pal diff --git a/graphics/pokemon/glimmet/shiny.pal b/graphics/pokemon/gen_9/glimmet/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/glimmet/shiny.pal rename to graphics/pokemon/gen_9/glimmet/shiny.pal diff --git a/graphics/pokemon/glimmora/back.png b/graphics/pokemon/gen_9/glimmora/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/glimmora/back.png rename to graphics/pokemon/gen_9/glimmora/back.png diff --git a/graphics/pokemon/glimmora/front.png b/graphics/pokemon/gen_9/glimmora/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/glimmora/front.png rename to graphics/pokemon/gen_9/glimmora/front.png diff --git a/graphics/pokemon/glimmora/icon.png b/graphics/pokemon/gen_9/glimmora/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/glimmora/icon.png rename to graphics/pokemon/gen_9/glimmora/icon.png diff --git a/graphics/pokemon/glimmora/normal.pal b/graphics/pokemon/gen_9/glimmora/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/glimmora/normal.pal rename to graphics/pokemon/gen_9/glimmora/normal.pal diff --git a/graphics/pokemon/glimmora/shiny.pal b/graphics/pokemon/gen_9/glimmora/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/glimmora/shiny.pal rename to graphics/pokemon/gen_9/glimmora/shiny.pal diff --git a/graphics/pokemon/grafaiai/back.png b/graphics/pokemon/gen_9/grafaiai/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/grafaiai/back.png rename to graphics/pokemon/gen_9/grafaiai/back.png diff --git a/graphics/pokemon/grafaiai/front.png b/graphics/pokemon/gen_9/grafaiai/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/grafaiai/front.png rename to graphics/pokemon/gen_9/grafaiai/front.png diff --git a/graphics/pokemon/grafaiai/icon.png b/graphics/pokemon/gen_9/grafaiai/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/grafaiai/icon.png rename to graphics/pokemon/gen_9/grafaiai/icon.png diff --git a/graphics/pokemon/grafaiai/normal.pal b/graphics/pokemon/gen_9/grafaiai/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/grafaiai/normal.pal rename to graphics/pokemon/gen_9/grafaiai/normal.pal diff --git a/graphics/pokemon/grafaiai/shiny.pal b/graphics/pokemon/gen_9/grafaiai/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/grafaiai/shiny.pal rename to graphics/pokemon/gen_9/grafaiai/shiny.pal diff --git a/graphics/pokemon/great_tusk/anim_front.png b/graphics/pokemon/gen_9/great_tusk/anim_front.png similarity index 100% rename from graphics/pokemon/great_tusk/anim_front.png rename to graphics/pokemon/gen_9/great_tusk/anim_front.png diff --git a/graphics/pokemon/great_tusk/back.png b/graphics/pokemon/gen_9/great_tusk/back.png similarity index 100% rename from graphics/pokemon/great_tusk/back.png rename to graphics/pokemon/gen_9/great_tusk/back.png diff --git a/graphics/pokemon/great_tusk/icon.png b/graphics/pokemon/gen_9/great_tusk/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/great_tusk/icon.png rename to graphics/pokemon/gen_9/great_tusk/icon.png diff --git a/graphics/pokemon/great_tusk/normal.pal b/graphics/pokemon/gen_9/great_tusk/normal.pal similarity index 100% rename from graphics/pokemon/great_tusk/normal.pal rename to graphics/pokemon/gen_9/great_tusk/normal.pal diff --git a/graphics/pokemon/great_tusk/shiny.pal b/graphics/pokemon/gen_9/great_tusk/shiny.pal similarity index 100% rename from graphics/pokemon/great_tusk/shiny.pal rename to graphics/pokemon/gen_9/great_tusk/shiny.pal diff --git a/graphics/pokemon/greavard/back.png b/graphics/pokemon/gen_9/greavard/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/greavard/back.png rename to graphics/pokemon/gen_9/greavard/back.png diff --git a/graphics/pokemon/greavard/front.png b/graphics/pokemon/gen_9/greavard/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/greavard/front.png rename to graphics/pokemon/gen_9/greavard/front.png diff --git a/graphics/pokemon/greavard/icon.png b/graphics/pokemon/gen_9/greavard/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/greavard/icon.png rename to graphics/pokemon/gen_9/greavard/icon.png diff --git a/graphics/pokemon/greavard/normal.pal b/graphics/pokemon/gen_9/greavard/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/greavard/normal.pal rename to graphics/pokemon/gen_9/greavard/normal.pal diff --git a/graphics/pokemon/greavard/shiny.pal b/graphics/pokemon/gen_9/greavard/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/greavard/shiny.pal rename to graphics/pokemon/gen_9/greavard/shiny.pal diff --git a/graphics/pokemon/houndstone/back.png b/graphics/pokemon/gen_9/houndstone/back.png similarity index 100% rename from graphics/pokemon/houndstone/back.png rename to graphics/pokemon/gen_9/houndstone/back.png diff --git a/graphics/pokemon/houndstone/front.png b/graphics/pokemon/gen_9/houndstone/front.png similarity index 100% rename from graphics/pokemon/houndstone/front.png rename to graphics/pokemon/gen_9/houndstone/front.png diff --git a/graphics/pokemon/houndstone/icon.png b/graphics/pokemon/gen_9/houndstone/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/houndstone/icon.png rename to graphics/pokemon/gen_9/houndstone/icon.png diff --git a/graphics/pokemon/houndstone/normal.pal b/graphics/pokemon/gen_9/houndstone/normal.pal similarity index 100% rename from graphics/pokemon/houndstone/normal.pal rename to graphics/pokemon/gen_9/houndstone/normal.pal diff --git a/graphics/pokemon/houndstone/shiny.pal b/graphics/pokemon/gen_9/houndstone/shiny.pal similarity index 100% rename from graphics/pokemon/houndstone/shiny.pal rename to graphics/pokemon/gen_9/houndstone/shiny.pal diff --git a/graphics/pokemon/iron_bundle/back.png b/graphics/pokemon/gen_9/iron_bundle/back.png similarity index 100% rename from graphics/pokemon/iron_bundle/back.png rename to graphics/pokemon/gen_9/iron_bundle/back.png diff --git a/graphics/pokemon/iron_bundle/front.png b/graphics/pokemon/gen_9/iron_bundle/front.png similarity index 100% rename from graphics/pokemon/iron_bundle/front.png rename to graphics/pokemon/gen_9/iron_bundle/front.png diff --git a/graphics/pokemon/iron_bundle/icon.png b/graphics/pokemon/gen_9/iron_bundle/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/iron_bundle/icon.png rename to graphics/pokemon/gen_9/iron_bundle/icon.png diff --git a/graphics/pokemon/iron_bundle/normal.pal b/graphics/pokemon/gen_9/iron_bundle/normal.pal similarity index 100% rename from graphics/pokemon/iron_bundle/normal.pal rename to graphics/pokemon/gen_9/iron_bundle/normal.pal diff --git a/graphics/pokemon/iron_bundle/shiny.pal b/graphics/pokemon/gen_9/iron_bundle/shiny.pal similarity index 100% rename from graphics/pokemon/iron_bundle/shiny.pal rename to graphics/pokemon/gen_9/iron_bundle/shiny.pal diff --git a/graphics/pokemon/iron_hands/back.png b/graphics/pokemon/gen_9/iron_hands/back.png similarity index 100% rename from graphics/pokemon/iron_hands/back.png rename to graphics/pokemon/gen_9/iron_hands/back.png diff --git a/graphics/pokemon/iron_hands/front.png b/graphics/pokemon/gen_9/iron_hands/front.png similarity index 100% rename from graphics/pokemon/iron_hands/front.png rename to graphics/pokemon/gen_9/iron_hands/front.png diff --git a/graphics/pokemon/iron_hands/icon.png b/graphics/pokemon/gen_9/iron_hands/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/iron_hands/icon.png rename to graphics/pokemon/gen_9/iron_hands/icon.png diff --git a/graphics/pokemon/iron_hands/normal.pal b/graphics/pokemon/gen_9/iron_hands/normal.pal similarity index 100% rename from graphics/pokemon/iron_hands/normal.pal rename to graphics/pokemon/gen_9/iron_hands/normal.pal diff --git a/graphics/pokemon/iron_hands/shiny.pal b/graphics/pokemon/gen_9/iron_hands/shiny.pal similarity index 100% rename from graphics/pokemon/iron_hands/shiny.pal rename to graphics/pokemon/gen_9/iron_hands/shiny.pal diff --git a/graphics/pokemon/iron_jugulis/back.png b/graphics/pokemon/gen_9/iron_jugulis/back.png similarity index 100% rename from graphics/pokemon/iron_jugulis/back.png rename to graphics/pokemon/gen_9/iron_jugulis/back.png diff --git a/graphics/pokemon/iron_jugulis/front.png b/graphics/pokemon/gen_9/iron_jugulis/front.png similarity index 100% rename from graphics/pokemon/iron_jugulis/front.png rename to graphics/pokemon/gen_9/iron_jugulis/front.png diff --git a/graphics/pokemon/iron_jugulis/icon.png b/graphics/pokemon/gen_9/iron_jugulis/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/iron_jugulis/icon.png rename to graphics/pokemon/gen_9/iron_jugulis/icon.png diff --git a/graphics/pokemon/iron_jugulis/normal.pal b/graphics/pokemon/gen_9/iron_jugulis/normal.pal similarity index 100% rename from graphics/pokemon/iron_jugulis/normal.pal rename to graphics/pokemon/gen_9/iron_jugulis/normal.pal diff --git a/graphics/pokemon/iron_jugulis/shiny.pal b/graphics/pokemon/gen_9/iron_jugulis/shiny.pal similarity index 100% rename from graphics/pokemon/iron_jugulis/shiny.pal rename to graphics/pokemon/gen_9/iron_jugulis/shiny.pal diff --git a/graphics/pokemon/iron_leaves/back.png b/graphics/pokemon/gen_9/iron_leaves/back.png similarity index 100% rename from graphics/pokemon/iron_leaves/back.png rename to graphics/pokemon/gen_9/iron_leaves/back.png diff --git a/graphics/pokemon/iron_leaves/front.png b/graphics/pokemon/gen_9/iron_leaves/front.png similarity index 100% rename from graphics/pokemon/iron_leaves/front.png rename to graphics/pokemon/gen_9/iron_leaves/front.png diff --git a/graphics/pokemon/iron_leaves/icon.png b/graphics/pokemon/gen_9/iron_leaves/icon.png similarity index 100% rename from graphics/pokemon/iron_leaves/icon.png rename to graphics/pokemon/gen_9/iron_leaves/icon.png diff --git a/graphics/pokemon/iron_leaves/normal.pal b/graphics/pokemon/gen_9/iron_leaves/normal.pal similarity index 100% rename from graphics/pokemon/iron_leaves/normal.pal rename to graphics/pokemon/gen_9/iron_leaves/normal.pal diff --git a/graphics/pokemon/iron_leaves/shiny.pal b/graphics/pokemon/gen_9/iron_leaves/shiny.pal similarity index 100% rename from graphics/pokemon/iron_leaves/shiny.pal rename to graphics/pokemon/gen_9/iron_leaves/shiny.pal diff --git a/graphics/pokemon/iron_moth/back.png b/graphics/pokemon/gen_9/iron_moth/back.png similarity index 100% rename from graphics/pokemon/iron_moth/back.png rename to graphics/pokemon/gen_9/iron_moth/back.png diff --git a/graphics/pokemon/iron_moth/front.png b/graphics/pokemon/gen_9/iron_moth/front.png similarity index 100% rename from graphics/pokemon/iron_moth/front.png rename to graphics/pokemon/gen_9/iron_moth/front.png diff --git a/graphics/pokemon/iron_moth/icon.png b/graphics/pokemon/gen_9/iron_moth/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/iron_moth/icon.png rename to graphics/pokemon/gen_9/iron_moth/icon.png diff --git a/graphics/pokemon/iron_moth/normal.pal b/graphics/pokemon/gen_9/iron_moth/normal.pal similarity index 100% rename from graphics/pokemon/iron_moth/normal.pal rename to graphics/pokemon/gen_9/iron_moth/normal.pal diff --git a/graphics/pokemon/iron_moth/shiny.pal b/graphics/pokemon/gen_9/iron_moth/shiny.pal similarity index 100% rename from graphics/pokemon/iron_moth/shiny.pal rename to graphics/pokemon/gen_9/iron_moth/shiny.pal diff --git a/graphics/pokemon/iron_thorns/back.png b/graphics/pokemon/gen_9/iron_thorns/back.png similarity index 100% rename from graphics/pokemon/iron_thorns/back.png rename to graphics/pokemon/gen_9/iron_thorns/back.png diff --git a/graphics/pokemon/iron_thorns/front.png b/graphics/pokemon/gen_9/iron_thorns/front.png similarity index 100% rename from graphics/pokemon/iron_thorns/front.png rename to graphics/pokemon/gen_9/iron_thorns/front.png diff --git a/graphics/pokemon/iron_thorns/icon.png b/graphics/pokemon/gen_9/iron_thorns/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/iron_thorns/icon.png rename to graphics/pokemon/gen_9/iron_thorns/icon.png diff --git a/graphics/pokemon/iron_thorns/normal.pal b/graphics/pokemon/gen_9/iron_thorns/normal.pal similarity index 100% rename from graphics/pokemon/iron_thorns/normal.pal rename to graphics/pokemon/gen_9/iron_thorns/normal.pal diff --git a/graphics/pokemon/iron_thorns/shiny.pal b/graphics/pokemon/gen_9/iron_thorns/shiny.pal similarity index 100% rename from graphics/pokemon/iron_thorns/shiny.pal rename to graphics/pokemon/gen_9/iron_thorns/shiny.pal diff --git a/graphics/pokemon/iron_treads/back.png b/graphics/pokemon/gen_9/iron_treads/back.png similarity index 100% rename from graphics/pokemon/iron_treads/back.png rename to graphics/pokemon/gen_9/iron_treads/back.png diff --git a/graphics/pokemon/iron_treads/front.png b/graphics/pokemon/gen_9/iron_treads/front.png similarity index 100% rename from graphics/pokemon/iron_treads/front.png rename to graphics/pokemon/gen_9/iron_treads/front.png diff --git a/graphics/pokemon/iron_treads/icon.png b/graphics/pokemon/gen_9/iron_treads/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/iron_treads/icon.png rename to graphics/pokemon/gen_9/iron_treads/icon.png diff --git a/graphics/pokemon/iron_treads/normal.pal b/graphics/pokemon/gen_9/iron_treads/normal.pal similarity index 100% rename from graphics/pokemon/iron_treads/normal.pal rename to graphics/pokemon/gen_9/iron_treads/normal.pal diff --git a/graphics/pokemon/iron_treads/shiny.pal b/graphics/pokemon/gen_9/iron_treads/shiny.pal similarity index 100% rename from graphics/pokemon/iron_treads/shiny.pal rename to graphics/pokemon/gen_9/iron_treads/shiny.pal diff --git a/graphics/pokemon/iron_valiant/back.png b/graphics/pokemon/gen_9/iron_valiant/back.png similarity index 100% rename from graphics/pokemon/iron_valiant/back.png rename to graphics/pokemon/gen_9/iron_valiant/back.png diff --git a/graphics/pokemon/iron_valiant/front.png b/graphics/pokemon/gen_9/iron_valiant/front.png similarity index 100% rename from graphics/pokemon/iron_valiant/front.png rename to graphics/pokemon/gen_9/iron_valiant/front.png diff --git a/graphics/pokemon/iron_valiant/icon.png b/graphics/pokemon/gen_9/iron_valiant/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/iron_valiant/icon.png rename to graphics/pokemon/gen_9/iron_valiant/icon.png diff --git a/graphics/pokemon/iron_valiant/normal.pal b/graphics/pokemon/gen_9/iron_valiant/normal.pal similarity index 100% rename from graphics/pokemon/iron_valiant/normal.pal rename to graphics/pokemon/gen_9/iron_valiant/normal.pal diff --git a/graphics/pokemon/iron_valiant/shiny.pal b/graphics/pokemon/gen_9/iron_valiant/shiny.pal similarity index 100% rename from graphics/pokemon/iron_valiant/shiny.pal rename to graphics/pokemon/gen_9/iron_valiant/shiny.pal diff --git a/graphics/pokemon/kilowattrel/back.png b/graphics/pokemon/gen_9/kilowattrel/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/kilowattrel/back.png rename to graphics/pokemon/gen_9/kilowattrel/back.png diff --git a/graphics/pokemon/kilowattrel/front.png b/graphics/pokemon/gen_9/kilowattrel/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/kilowattrel/front.png rename to graphics/pokemon/gen_9/kilowattrel/front.png diff --git a/graphics/pokemon/kilowattrel/icon.png b/graphics/pokemon/gen_9/kilowattrel/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/kilowattrel/icon.png rename to graphics/pokemon/gen_9/kilowattrel/icon.png diff --git a/graphics/pokemon/kilowattrel/normal.pal b/graphics/pokemon/gen_9/kilowattrel/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/kilowattrel/normal.pal rename to graphics/pokemon/gen_9/kilowattrel/normal.pal diff --git a/graphics/pokemon/kilowattrel/shiny.pal b/graphics/pokemon/gen_9/kilowattrel/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/kilowattrel/shiny.pal rename to graphics/pokemon/gen_9/kilowattrel/shiny.pal diff --git a/graphics/pokemon/kingambit/back.png b/graphics/pokemon/gen_9/kingambit/back.png similarity index 100% rename from graphics/pokemon/kingambit/back.png rename to graphics/pokemon/gen_9/kingambit/back.png diff --git a/graphics/pokemon/kingambit/front.png b/graphics/pokemon/gen_9/kingambit/front.png similarity index 100% rename from graphics/pokemon/kingambit/front.png rename to graphics/pokemon/gen_9/kingambit/front.png diff --git a/graphics/pokemon/kingambit/icon.png b/graphics/pokemon/gen_9/kingambit/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/kingambit/icon.png rename to graphics/pokemon/gen_9/kingambit/icon.png diff --git a/graphics/pokemon/kingambit/normal.pal b/graphics/pokemon/gen_9/kingambit/normal.pal similarity index 100% rename from graphics/pokemon/kingambit/normal.pal rename to graphics/pokemon/gen_9/kingambit/normal.pal diff --git a/graphics/pokemon/kingambit/shiny.pal b/graphics/pokemon/gen_9/kingambit/shiny.pal similarity index 100% rename from graphics/pokemon/kingambit/shiny.pal rename to graphics/pokemon/gen_9/kingambit/shiny.pal diff --git a/graphics/pokemon/klawf/back.png b/graphics/pokemon/gen_9/klawf/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/klawf/back.png rename to graphics/pokemon/gen_9/klawf/back.png diff --git a/graphics/pokemon/klawf/front.png b/graphics/pokemon/gen_9/klawf/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/klawf/front.png rename to graphics/pokemon/gen_9/klawf/front.png diff --git a/graphics/pokemon/klawf/icon.png b/graphics/pokemon/gen_9/klawf/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/klawf/icon.png rename to graphics/pokemon/gen_9/klawf/icon.png diff --git a/graphics/pokemon/klawf/normal.pal b/graphics/pokemon/gen_9/klawf/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/klawf/normal.pal rename to graphics/pokemon/gen_9/klawf/normal.pal diff --git a/graphics/pokemon/klawf/shiny.pal b/graphics/pokemon/gen_9/klawf/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/klawf/shiny.pal rename to graphics/pokemon/gen_9/klawf/shiny.pal diff --git a/graphics/pokemon/koraidon/back.png b/graphics/pokemon/gen_9/koraidon/back.png similarity index 100% rename from graphics/pokemon/koraidon/back.png rename to graphics/pokemon/gen_9/koraidon/back.png diff --git a/graphics/pokemon/koraidon/front.png b/graphics/pokemon/gen_9/koraidon/front.png similarity index 100% rename from graphics/pokemon/koraidon/front.png rename to graphics/pokemon/gen_9/koraidon/front.png diff --git a/graphics/pokemon/koraidon/icon.png b/graphics/pokemon/gen_9/koraidon/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/koraidon/icon.png rename to graphics/pokemon/gen_9/koraidon/icon.png diff --git a/graphics/pokemon/koraidon/normal.pal b/graphics/pokemon/gen_9/koraidon/normal.pal similarity index 100% rename from graphics/pokemon/koraidon/normal.pal rename to graphics/pokemon/gen_9/koraidon/normal.pal diff --git a/graphics/pokemon/koraidon/shiny.pal b/graphics/pokemon/gen_9/koraidon/shiny.pal similarity index 100% rename from graphics/pokemon/koraidon/shiny.pal rename to graphics/pokemon/gen_9/koraidon/shiny.pal diff --git a/graphics/pokemon/lechonk/back.png b/graphics/pokemon/gen_9/lechonk/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/lechonk/back.png rename to graphics/pokemon/gen_9/lechonk/back.png diff --git a/graphics/pokemon/lechonk/front.png b/graphics/pokemon/gen_9/lechonk/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/lechonk/front.png rename to graphics/pokemon/gen_9/lechonk/front.png diff --git a/graphics/pokemon/lechonk/icon.png b/graphics/pokemon/gen_9/lechonk/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/lechonk/icon.png rename to graphics/pokemon/gen_9/lechonk/icon.png diff --git a/graphics/pokemon/lechonk/normal.pal b/graphics/pokemon/gen_9/lechonk/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/lechonk/normal.pal rename to graphics/pokemon/gen_9/lechonk/normal.pal diff --git a/graphics/pokemon/lechonk/shiny.pal b/graphics/pokemon/gen_9/lechonk/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/lechonk/shiny.pal rename to graphics/pokemon/gen_9/lechonk/shiny.pal diff --git a/graphics/pokemon/lokix/back.png b/graphics/pokemon/gen_9/lokix/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/lokix/back.png rename to graphics/pokemon/gen_9/lokix/back.png diff --git a/graphics/pokemon/lokix/front.png b/graphics/pokemon/gen_9/lokix/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/lokix/front.png rename to graphics/pokemon/gen_9/lokix/front.png diff --git a/graphics/pokemon/lokix/icon.png b/graphics/pokemon/gen_9/lokix/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/lokix/icon.png rename to graphics/pokemon/gen_9/lokix/icon.png diff --git a/graphics/pokemon/lokix/normal.pal b/graphics/pokemon/gen_9/lokix/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/lokix/normal.pal rename to graphics/pokemon/gen_9/lokix/normal.pal diff --git a/graphics/pokemon/lokix/shiny.pal b/graphics/pokemon/gen_9/lokix/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/lokix/shiny.pal rename to graphics/pokemon/gen_9/lokix/shiny.pal diff --git a/graphics/pokemon/mabosstiff/back.png b/graphics/pokemon/gen_9/mabosstiff/back.png similarity index 100% rename from graphics/pokemon/mabosstiff/back.png rename to graphics/pokemon/gen_9/mabosstiff/back.png diff --git a/graphics/pokemon/mabosstiff/front.png b/graphics/pokemon/gen_9/mabosstiff/front.png similarity index 100% rename from graphics/pokemon/mabosstiff/front.png rename to graphics/pokemon/gen_9/mabosstiff/front.png diff --git a/graphics/pokemon/mabosstiff/icon.png b/graphics/pokemon/gen_9/mabosstiff/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/mabosstiff/icon.png rename to graphics/pokemon/gen_9/mabosstiff/icon.png diff --git a/graphics/pokemon/mabosstiff/normal.pal b/graphics/pokemon/gen_9/mabosstiff/normal.pal similarity index 100% rename from graphics/pokemon/mabosstiff/normal.pal rename to graphics/pokemon/gen_9/mabosstiff/normal.pal diff --git a/graphics/pokemon/mabosstiff/shiny.pal b/graphics/pokemon/gen_9/mabosstiff/shiny.pal similarity index 100% rename from graphics/pokemon/mabosstiff/shiny.pal rename to graphics/pokemon/gen_9/mabosstiff/shiny.pal diff --git a/graphics/pokemon/maschiff/back.png b/graphics/pokemon/gen_9/maschiff/back.png similarity index 100% rename from graphics/pokemon/maschiff/back.png rename to graphics/pokemon/gen_9/maschiff/back.png diff --git a/graphics/pokemon/maschiff/front.png b/graphics/pokemon/gen_9/maschiff/front.png similarity index 100% rename from graphics/pokemon/maschiff/front.png rename to graphics/pokemon/gen_9/maschiff/front.png diff --git a/graphics/pokemon/maschiff/icon.png b/graphics/pokemon/gen_9/maschiff/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/maschiff/icon.png rename to graphics/pokemon/gen_9/maschiff/icon.png diff --git a/graphics/pokemon/maschiff/normal.pal b/graphics/pokemon/gen_9/maschiff/normal.pal similarity index 100% rename from graphics/pokemon/maschiff/normal.pal rename to graphics/pokemon/gen_9/maschiff/normal.pal diff --git a/graphics/pokemon/maschiff/shiny.pal b/graphics/pokemon/gen_9/maschiff/shiny.pal similarity index 100% rename from graphics/pokemon/maschiff/shiny.pal rename to graphics/pokemon/gen_9/maschiff/shiny.pal diff --git a/graphics/pokemon/maushold/back.png b/graphics/pokemon/gen_9/maushold/back.png similarity index 100% rename from graphics/pokemon/maushold/back.png rename to graphics/pokemon/gen_9/maushold/back.png diff --git a/graphics/pokemon/maushold/four/back.png b/graphics/pokemon/gen_9/maushold/four/back.png similarity index 100% rename from graphics/pokemon/maushold/four/back.png rename to graphics/pokemon/gen_9/maushold/four/back.png diff --git a/graphics/pokemon/maushold/four/front.png b/graphics/pokemon/gen_9/maushold/four/front.png similarity index 100% rename from graphics/pokemon/maushold/four/front.png rename to graphics/pokemon/gen_9/maushold/four/front.png diff --git a/graphics/pokemon/maushold/four/icon.png b/graphics/pokemon/gen_9/maushold/four/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/maushold/four/icon.png rename to graphics/pokemon/gen_9/maushold/four/icon.png diff --git a/graphics/pokemon/maushold/front.png b/graphics/pokemon/gen_9/maushold/front.png similarity index 100% rename from graphics/pokemon/maushold/front.png rename to graphics/pokemon/gen_9/maushold/front.png diff --git a/graphics/pokemon/maushold/icon.png b/graphics/pokemon/gen_9/maushold/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/maushold/icon.png rename to graphics/pokemon/gen_9/maushold/icon.png diff --git a/graphics/pokemon/maushold/normal.pal b/graphics/pokemon/gen_9/maushold/normal.pal similarity index 100% rename from graphics/pokemon/maushold/normal.pal rename to graphics/pokemon/gen_9/maushold/normal.pal diff --git a/graphics/pokemon/maushold/shiny.pal b/graphics/pokemon/gen_9/maushold/shiny.pal similarity index 100% rename from graphics/pokemon/maushold/shiny.pal rename to graphics/pokemon/gen_9/maushold/shiny.pal diff --git a/graphics/pokemon/meowscarada/back.png b/graphics/pokemon/gen_9/meowscarada/back.png similarity index 100% rename from graphics/pokemon/meowscarada/back.png rename to graphics/pokemon/gen_9/meowscarada/back.png diff --git a/graphics/pokemon/meowscarada/front.png b/graphics/pokemon/gen_9/meowscarada/front.png similarity index 100% rename from graphics/pokemon/meowscarada/front.png rename to graphics/pokemon/gen_9/meowscarada/front.png diff --git a/graphics/pokemon/meowscarada/icon.png b/graphics/pokemon/gen_9/meowscarada/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/meowscarada/icon.png rename to graphics/pokemon/gen_9/meowscarada/icon.png diff --git a/graphics/pokemon/meowscarada/normal.pal b/graphics/pokemon/gen_9/meowscarada/normal.pal similarity index 100% rename from graphics/pokemon/meowscarada/normal.pal rename to graphics/pokemon/gen_9/meowscarada/normal.pal diff --git a/graphics/pokemon/meowscarada/shiny.pal b/graphics/pokemon/gen_9/meowscarada/shiny.pal similarity index 100% rename from graphics/pokemon/meowscarada/shiny.pal rename to graphics/pokemon/gen_9/meowscarada/shiny.pal diff --git a/graphics/pokemon/miraidon/back.png b/graphics/pokemon/gen_9/miraidon/back.png similarity index 100% rename from graphics/pokemon/miraidon/back.png rename to graphics/pokemon/gen_9/miraidon/back.png diff --git a/graphics/pokemon/miraidon/front.png b/graphics/pokemon/gen_9/miraidon/front.png similarity index 100% rename from graphics/pokemon/miraidon/front.png rename to graphics/pokemon/gen_9/miraidon/front.png diff --git a/graphics/pokemon/miraidon/icon.png b/graphics/pokemon/gen_9/miraidon/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/miraidon/icon.png rename to graphics/pokemon/gen_9/miraidon/icon.png diff --git a/graphics/pokemon/miraidon/normal.pal b/graphics/pokemon/gen_9/miraidon/normal.pal similarity index 100% rename from graphics/pokemon/miraidon/normal.pal rename to graphics/pokemon/gen_9/miraidon/normal.pal diff --git a/graphics/pokemon/miraidon/shiny.pal b/graphics/pokemon/gen_9/miraidon/shiny.pal similarity index 100% rename from graphics/pokemon/miraidon/shiny.pal rename to graphics/pokemon/gen_9/miraidon/shiny.pal diff --git a/graphics/pokemon/munkidori/back.png b/graphics/pokemon/gen_9/munkidori/back.png similarity index 100% rename from graphics/pokemon/munkidori/back.png rename to graphics/pokemon/gen_9/munkidori/back.png diff --git a/graphics/pokemon/munkidori/front.png b/graphics/pokemon/gen_9/munkidori/front.png similarity index 100% rename from graphics/pokemon/munkidori/front.png rename to graphics/pokemon/gen_9/munkidori/front.png diff --git a/graphics/pokemon/munkidori/icon.png b/graphics/pokemon/gen_9/munkidori/icon.png similarity index 100% rename from graphics/pokemon/munkidori/icon.png rename to graphics/pokemon/gen_9/munkidori/icon.png diff --git a/graphics/pokemon/munkidori/normal.pal b/graphics/pokemon/gen_9/munkidori/normal.pal similarity index 100% rename from graphics/pokemon/munkidori/normal.pal rename to graphics/pokemon/gen_9/munkidori/normal.pal diff --git a/graphics/pokemon/munkidori/shiny.pal b/graphics/pokemon/gen_9/munkidori/shiny.pal similarity index 100% rename from graphics/pokemon/munkidori/shiny.pal rename to graphics/pokemon/gen_9/munkidori/shiny.pal diff --git a/graphics/pokemon/nacli/back.png b/graphics/pokemon/gen_9/nacli/back.png similarity index 100% rename from graphics/pokemon/nacli/back.png rename to graphics/pokemon/gen_9/nacli/back.png diff --git a/graphics/pokemon/nacli/front.png b/graphics/pokemon/gen_9/nacli/front.png similarity index 100% rename from graphics/pokemon/nacli/front.png rename to graphics/pokemon/gen_9/nacli/front.png diff --git a/graphics/pokemon/nacli/icon.png b/graphics/pokemon/gen_9/nacli/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/nacli/icon.png rename to graphics/pokemon/gen_9/nacli/icon.png diff --git a/graphics/pokemon/nacli/normal.pal b/graphics/pokemon/gen_9/nacli/normal.pal similarity index 100% rename from graphics/pokemon/nacli/normal.pal rename to graphics/pokemon/gen_9/nacli/normal.pal diff --git a/graphics/pokemon/nacli/shiny.pal b/graphics/pokemon/gen_9/nacli/shiny.pal similarity index 100% rename from graphics/pokemon/nacli/shiny.pal rename to graphics/pokemon/gen_9/nacli/shiny.pal diff --git a/graphics/pokemon/naclstack/back.png b/graphics/pokemon/gen_9/naclstack/back.png similarity index 100% rename from graphics/pokemon/naclstack/back.png rename to graphics/pokemon/gen_9/naclstack/back.png diff --git a/graphics/pokemon/naclstack/front.png b/graphics/pokemon/gen_9/naclstack/front.png similarity index 100% rename from graphics/pokemon/naclstack/front.png rename to graphics/pokemon/gen_9/naclstack/front.png diff --git a/graphics/pokemon/naclstack/icon.png b/graphics/pokemon/gen_9/naclstack/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/naclstack/icon.png rename to graphics/pokemon/gen_9/naclstack/icon.png diff --git a/graphics/pokemon/naclstack/normal.pal b/graphics/pokemon/gen_9/naclstack/normal.pal similarity index 100% rename from graphics/pokemon/naclstack/normal.pal rename to graphics/pokemon/gen_9/naclstack/normal.pal diff --git a/graphics/pokemon/naclstack/shiny.pal b/graphics/pokemon/gen_9/naclstack/shiny.pal similarity index 100% rename from graphics/pokemon/naclstack/shiny.pal rename to graphics/pokemon/gen_9/naclstack/shiny.pal diff --git a/graphics/pokemon/nymble/back.png b/graphics/pokemon/gen_9/nymble/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/nymble/back.png rename to graphics/pokemon/gen_9/nymble/back.png diff --git a/graphics/pokemon/nymble/front.png b/graphics/pokemon/gen_9/nymble/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/nymble/front.png rename to graphics/pokemon/gen_9/nymble/front.png diff --git a/graphics/pokemon/nymble/icon.png b/graphics/pokemon/gen_9/nymble/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/nymble/icon.png rename to graphics/pokemon/gen_9/nymble/icon.png diff --git a/graphics/pokemon/nymble/normal.pal b/graphics/pokemon/gen_9/nymble/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/nymble/normal.pal rename to graphics/pokemon/gen_9/nymble/normal.pal diff --git a/graphics/pokemon/nymble/shiny.pal b/graphics/pokemon/gen_9/nymble/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/nymble/shiny.pal rename to graphics/pokemon/gen_9/nymble/shiny.pal diff --git a/graphics/pokemon/ogerpon/back.png b/graphics/pokemon/gen_9/ogerpon/back.png similarity index 100% rename from graphics/pokemon/ogerpon/back.png rename to graphics/pokemon/gen_9/ogerpon/back.png diff --git a/graphics/pokemon/ogerpon/cornerstone/back.png b/graphics/pokemon/gen_9/ogerpon/cornerstone/back.png similarity index 100% rename from graphics/pokemon/ogerpon/cornerstone/back.png rename to graphics/pokemon/gen_9/ogerpon/cornerstone/back.png diff --git a/graphics/pokemon/ogerpon/cornerstone/front.png b/graphics/pokemon/gen_9/ogerpon/cornerstone/front.png similarity index 100% rename from graphics/pokemon/ogerpon/cornerstone/front.png rename to graphics/pokemon/gen_9/ogerpon/cornerstone/front.png diff --git a/graphics/pokemon/ogerpon/cornerstone/normal.pal b/graphics/pokemon/gen_9/ogerpon/cornerstone/normal.pal similarity index 100% rename from graphics/pokemon/ogerpon/cornerstone/normal.pal rename to graphics/pokemon/gen_9/ogerpon/cornerstone/normal.pal diff --git a/graphics/pokemon/ogerpon/front.png b/graphics/pokemon/gen_9/ogerpon/front.png similarity index 100% rename from graphics/pokemon/ogerpon/front.png rename to graphics/pokemon/gen_9/ogerpon/front.png diff --git a/graphics/pokemon/ogerpon/hearthflame/back.png b/graphics/pokemon/gen_9/ogerpon/hearthflame/back.png similarity index 100% rename from graphics/pokemon/ogerpon/hearthflame/back.png rename to graphics/pokemon/gen_9/ogerpon/hearthflame/back.png diff --git a/graphics/pokemon/ogerpon/hearthflame/front.png b/graphics/pokemon/gen_9/ogerpon/hearthflame/front.png similarity index 100% rename from graphics/pokemon/ogerpon/hearthflame/front.png rename to graphics/pokemon/gen_9/ogerpon/hearthflame/front.png diff --git a/graphics/pokemon/ogerpon/hearthflame/normal.pal b/graphics/pokemon/gen_9/ogerpon/hearthflame/normal.pal similarity index 100% rename from graphics/pokemon/ogerpon/hearthflame/normal.pal rename to graphics/pokemon/gen_9/ogerpon/hearthflame/normal.pal diff --git a/graphics/pokemon/ogerpon/icon.png b/graphics/pokemon/gen_9/ogerpon/icon.png similarity index 100% rename from graphics/pokemon/ogerpon/icon.png rename to graphics/pokemon/gen_9/ogerpon/icon.png diff --git a/graphics/pokemon/ogerpon/normal.pal b/graphics/pokemon/gen_9/ogerpon/normal.pal similarity index 100% rename from graphics/pokemon/ogerpon/normal.pal rename to graphics/pokemon/gen_9/ogerpon/normal.pal diff --git a/graphics/pokemon/ogerpon/wellspring/back.png b/graphics/pokemon/gen_9/ogerpon/wellspring/back.png similarity index 100% rename from graphics/pokemon/ogerpon/wellspring/back.png rename to graphics/pokemon/gen_9/ogerpon/wellspring/back.png diff --git a/graphics/pokemon/ogerpon/wellspring/front.png b/graphics/pokemon/gen_9/ogerpon/wellspring/front.png similarity index 100% rename from graphics/pokemon/ogerpon/wellspring/front.png rename to graphics/pokemon/gen_9/ogerpon/wellspring/front.png diff --git a/graphics/pokemon/ogerpon/wellspring/normal.pal b/graphics/pokemon/gen_9/ogerpon/wellspring/normal.pal similarity index 100% rename from graphics/pokemon/ogerpon/wellspring/normal.pal rename to graphics/pokemon/gen_9/ogerpon/wellspring/normal.pal diff --git a/graphics/pokemon/oinkologne/back.png b/graphics/pokemon/gen_9/oinkologne/back.png similarity index 100% rename from graphics/pokemon/oinkologne/back.png rename to graphics/pokemon/gen_9/oinkologne/back.png diff --git a/graphics/pokemon/oinkologne/female/back.png b/graphics/pokemon/gen_9/oinkologne/female/back.png similarity index 100% rename from graphics/pokemon/oinkologne/female/back.png rename to graphics/pokemon/gen_9/oinkologne/female/back.png diff --git a/graphics/pokemon/oinkologne/female/front.png b/graphics/pokemon/gen_9/oinkologne/female/front.png similarity index 100% rename from graphics/pokemon/oinkologne/female/front.png rename to graphics/pokemon/gen_9/oinkologne/female/front.png diff --git a/graphics/pokemon/oinkologne/female/icon.png b/graphics/pokemon/gen_9/oinkologne/female/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/oinkologne/female/icon.png rename to graphics/pokemon/gen_9/oinkologne/female/icon.png diff --git a/graphics/pokemon/oinkologne/female/iconTODO.png b/graphics/pokemon/gen_9/oinkologne/female/iconTODO.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/oinkologne/female/iconTODO.png rename to graphics/pokemon/gen_9/oinkologne/female/iconTODO.png diff --git a/graphics/pokemon/oinkologne/female/normal.pal b/graphics/pokemon/gen_9/oinkologne/female/normal.pal similarity index 100% rename from graphics/pokemon/oinkologne/female/normal.pal rename to graphics/pokemon/gen_9/oinkologne/female/normal.pal diff --git a/graphics/pokemon/oinkologne/female/shiny.pal b/graphics/pokemon/gen_9/oinkologne/female/shiny.pal similarity index 100% rename from graphics/pokemon/oinkologne/female/shiny.pal rename to graphics/pokemon/gen_9/oinkologne/female/shiny.pal diff --git a/graphics/pokemon/oinkologne/front.png b/graphics/pokemon/gen_9/oinkologne/front.png similarity index 100% rename from graphics/pokemon/oinkologne/front.png rename to graphics/pokemon/gen_9/oinkologne/front.png diff --git a/graphics/pokemon/oinkologne/icon.png b/graphics/pokemon/gen_9/oinkologne/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/oinkologne/icon.png rename to graphics/pokemon/gen_9/oinkologne/icon.png diff --git a/graphics/pokemon/oinkologne/normal.pal b/graphics/pokemon/gen_9/oinkologne/normal.pal similarity index 100% rename from graphics/pokemon/oinkologne/normal.pal rename to graphics/pokemon/gen_9/oinkologne/normal.pal diff --git a/graphics/pokemon/oinkologne/shiny.pal b/graphics/pokemon/gen_9/oinkologne/shiny.pal similarity index 100% rename from graphics/pokemon/oinkologne/shiny.pal rename to graphics/pokemon/gen_9/oinkologne/shiny.pal diff --git a/graphics/pokemon/okidogi/back.png b/graphics/pokemon/gen_9/okidogi/back.png similarity index 100% rename from graphics/pokemon/okidogi/back.png rename to graphics/pokemon/gen_9/okidogi/back.png diff --git a/graphics/pokemon/okidogi/front.png b/graphics/pokemon/gen_9/okidogi/front.png similarity index 100% rename from graphics/pokemon/okidogi/front.png rename to graphics/pokemon/gen_9/okidogi/front.png diff --git a/graphics/pokemon/okidogi/icon.png b/graphics/pokemon/gen_9/okidogi/icon.png similarity index 100% rename from graphics/pokemon/okidogi/icon.png rename to graphics/pokemon/gen_9/okidogi/icon.png diff --git a/graphics/pokemon/okidogi/normal.pal b/graphics/pokemon/gen_9/okidogi/normal.pal similarity index 100% rename from graphics/pokemon/okidogi/normal.pal rename to graphics/pokemon/gen_9/okidogi/normal.pal diff --git a/graphics/pokemon/okidogi/shiny.pal b/graphics/pokemon/gen_9/okidogi/shiny.pal similarity index 100% rename from graphics/pokemon/okidogi/shiny.pal rename to graphics/pokemon/gen_9/okidogi/shiny.pal diff --git a/graphics/pokemon/orthworm/back.png b/graphics/pokemon/gen_9/orthworm/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/orthworm/back.png rename to graphics/pokemon/gen_9/orthworm/back.png diff --git a/graphics/pokemon/orthworm/front.png b/graphics/pokemon/gen_9/orthworm/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/orthworm/front.png rename to graphics/pokemon/gen_9/orthworm/front.png diff --git a/graphics/pokemon/orthworm/icon.png b/graphics/pokemon/gen_9/orthworm/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/orthworm/icon.png rename to graphics/pokemon/gen_9/orthworm/icon.png diff --git a/graphics/pokemon/orthworm/normal.pal b/graphics/pokemon/gen_9/orthworm/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/orthworm/normal.pal rename to graphics/pokemon/gen_9/orthworm/normal.pal diff --git a/graphics/pokemon/orthworm/shiny.pal b/graphics/pokemon/gen_9/orthworm/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/orthworm/shiny.pal rename to graphics/pokemon/gen_9/orthworm/shiny.pal diff --git a/graphics/pokemon/palafin/back.png b/graphics/pokemon/gen_9/palafin/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/palafin/back.png rename to graphics/pokemon/gen_9/palafin/back.png diff --git a/graphics/pokemon/palafin/front.png b/graphics/pokemon/gen_9/palafin/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/palafin/front.png rename to graphics/pokemon/gen_9/palafin/front.png diff --git a/graphics/pokemon/palafin/hero/back.png b/graphics/pokemon/gen_9/palafin/hero/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/palafin/hero/back.png rename to graphics/pokemon/gen_9/palafin/hero/back.png diff --git a/graphics/pokemon/palafin/hero/front.png b/graphics/pokemon/gen_9/palafin/hero/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/palafin/hero/front.png rename to graphics/pokemon/gen_9/palafin/hero/front.png diff --git a/graphics/pokemon/palafin/hero/icon.png b/graphics/pokemon/gen_9/palafin/hero/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/palafin/hero/icon.png rename to graphics/pokemon/gen_9/palafin/hero/icon.png diff --git a/graphics/pokemon/palafin/hero/normal.pal b/graphics/pokemon/gen_9/palafin/hero/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/palafin/hero/normal.pal rename to graphics/pokemon/gen_9/palafin/hero/normal.pal diff --git a/graphics/pokemon/palafin/hero/shiny.pal b/graphics/pokemon/gen_9/palafin/hero/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/palafin/hero/shiny.pal rename to graphics/pokemon/gen_9/palafin/hero/shiny.pal diff --git a/graphics/pokemon/palafin/icon.png b/graphics/pokemon/gen_9/palafin/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/palafin/icon.png rename to graphics/pokemon/gen_9/palafin/icon.png diff --git a/graphics/pokemon/palafin/normal.pal b/graphics/pokemon/gen_9/palafin/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/palafin/normal.pal rename to graphics/pokemon/gen_9/palafin/normal.pal diff --git a/graphics/pokemon/palafin/shiny.pal b/graphics/pokemon/gen_9/palafin/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/palafin/shiny.pal rename to graphics/pokemon/gen_9/palafin/shiny.pal diff --git a/graphics/pokemon/pawmi/back.png b/graphics/pokemon/gen_9/pawmi/back.png similarity index 100% rename from graphics/pokemon/pawmi/back.png rename to graphics/pokemon/gen_9/pawmi/back.png diff --git a/graphics/pokemon/pawmi/front.png b/graphics/pokemon/gen_9/pawmi/front.png similarity index 100% rename from graphics/pokemon/pawmi/front.png rename to graphics/pokemon/gen_9/pawmi/front.png diff --git a/graphics/pokemon/pawmi/icon.png b/graphics/pokemon/gen_9/pawmi/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/pawmi/icon.png rename to graphics/pokemon/gen_9/pawmi/icon.png diff --git a/graphics/pokemon/pawmi/normal.pal b/graphics/pokemon/gen_9/pawmi/normal.pal similarity index 100% rename from graphics/pokemon/pawmi/normal.pal rename to graphics/pokemon/gen_9/pawmi/normal.pal diff --git a/graphics/pokemon/pawmi/normal.png b/graphics/pokemon/gen_9/pawmi/normal.png similarity index 100% rename from graphics/pokemon/pawmi/normal.png rename to graphics/pokemon/gen_9/pawmi/normal.png diff --git a/graphics/pokemon/pawmi/shiny.pal b/graphics/pokemon/gen_9/pawmi/shiny.pal similarity index 100% rename from graphics/pokemon/pawmi/shiny.pal rename to graphics/pokemon/gen_9/pawmi/shiny.pal diff --git a/graphics/pokemon/pawmo/back.png b/graphics/pokemon/gen_9/pawmo/back.png similarity index 100% rename from graphics/pokemon/pawmo/back.png rename to graphics/pokemon/gen_9/pawmo/back.png diff --git a/graphics/pokemon/pawmo/front.png b/graphics/pokemon/gen_9/pawmo/front.png similarity index 100% rename from graphics/pokemon/pawmo/front.png rename to graphics/pokemon/gen_9/pawmo/front.png diff --git a/graphics/pokemon/pawmo/icon.png b/graphics/pokemon/gen_9/pawmo/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/pawmo/icon.png rename to graphics/pokemon/gen_9/pawmo/icon.png diff --git a/graphics/pokemon/pawmo/normal.pal b/graphics/pokemon/gen_9/pawmo/normal.pal similarity index 100% rename from graphics/pokemon/pawmo/normal.pal rename to graphics/pokemon/gen_9/pawmo/normal.pal diff --git a/graphics/pokemon/pawmo/shiny.pal b/graphics/pokemon/gen_9/pawmo/shiny.pal similarity index 100% rename from graphics/pokemon/pawmo/shiny.pal rename to graphics/pokemon/gen_9/pawmo/shiny.pal diff --git a/graphics/pokemon/pawmot/back.png b/graphics/pokemon/gen_9/pawmot/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/pawmot/back.png rename to graphics/pokemon/gen_9/pawmot/back.png diff --git a/graphics/pokemon/pawmot/front.png b/graphics/pokemon/gen_9/pawmot/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/pawmot/front.png rename to graphics/pokemon/gen_9/pawmot/front.png diff --git a/graphics/pokemon/pawmot/icon.png b/graphics/pokemon/gen_9/pawmot/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/pawmot/icon.png rename to graphics/pokemon/gen_9/pawmot/icon.png diff --git a/graphics/pokemon/pawmot/normal.pal b/graphics/pokemon/gen_9/pawmot/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/pawmot/normal.pal rename to graphics/pokemon/gen_9/pawmot/normal.pal diff --git a/graphics/pokemon/pawmot/shiny.pal b/graphics/pokemon/gen_9/pawmot/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/pawmot/shiny.pal rename to graphics/pokemon/gen_9/pawmot/shiny.pal diff --git a/graphics/pokemon/poltchageist/back.png b/graphics/pokemon/gen_9/poltchageist/back.png similarity index 100% rename from graphics/pokemon/poltchageist/back.png rename to graphics/pokemon/gen_9/poltchageist/back.png diff --git a/graphics/pokemon/poltchageist/front.png b/graphics/pokemon/gen_9/poltchageist/front.png similarity index 100% rename from graphics/pokemon/poltchageist/front.png rename to graphics/pokemon/gen_9/poltchageist/front.png diff --git a/graphics/pokemon/poltchageist/icon.png b/graphics/pokemon/gen_9/poltchageist/icon.png similarity index 100% rename from graphics/pokemon/poltchageist/icon.png rename to graphics/pokemon/gen_9/poltchageist/icon.png diff --git a/graphics/pokemon/poltchageist/normal.pal b/graphics/pokemon/gen_9/poltchageist/normal.pal similarity index 100% rename from graphics/pokemon/poltchageist/normal.pal rename to graphics/pokemon/gen_9/poltchageist/normal.pal diff --git a/graphics/pokemon/poltchageist/shiny.pal b/graphics/pokemon/gen_9/poltchageist/shiny.pal similarity index 100% rename from graphics/pokemon/poltchageist/shiny.pal rename to graphics/pokemon/gen_9/poltchageist/shiny.pal diff --git a/graphics/pokemon/quaquaval/back.png b/graphics/pokemon/gen_9/quaquaval/back.png similarity index 100% rename from graphics/pokemon/quaquaval/back.png rename to graphics/pokemon/gen_9/quaquaval/back.png diff --git a/graphics/pokemon/quaquaval/front.png b/graphics/pokemon/gen_9/quaquaval/front.png similarity index 100% rename from graphics/pokemon/quaquaval/front.png rename to graphics/pokemon/gen_9/quaquaval/front.png diff --git a/graphics/pokemon/quaquaval/icon.png b/graphics/pokemon/gen_9/quaquaval/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/quaquaval/icon.png rename to graphics/pokemon/gen_9/quaquaval/icon.png diff --git a/graphics/pokemon/quaquaval/normal.pal b/graphics/pokemon/gen_9/quaquaval/normal.pal similarity index 100% rename from graphics/pokemon/quaquaval/normal.pal rename to graphics/pokemon/gen_9/quaquaval/normal.pal diff --git a/graphics/pokemon/quaquaval/shiny.pal b/graphics/pokemon/gen_9/quaquaval/shiny.pal similarity index 100% rename from graphics/pokemon/quaquaval/shiny.pal rename to graphics/pokemon/gen_9/quaquaval/shiny.pal diff --git a/graphics/pokemon/quaxly/back.png b/graphics/pokemon/gen_9/quaxly/back.png similarity index 100% rename from graphics/pokemon/quaxly/back.png rename to graphics/pokemon/gen_9/quaxly/back.png diff --git a/graphics/pokemon/quaxly/front.png b/graphics/pokemon/gen_9/quaxly/front.png similarity index 100% rename from graphics/pokemon/quaxly/front.png rename to graphics/pokemon/gen_9/quaxly/front.png diff --git a/graphics/pokemon/quaxly/icon.png b/graphics/pokemon/gen_9/quaxly/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/quaxly/icon.png rename to graphics/pokemon/gen_9/quaxly/icon.png diff --git a/graphics/pokemon/quaxly/normal.pal b/graphics/pokemon/gen_9/quaxly/normal.pal similarity index 100% rename from graphics/pokemon/quaxly/normal.pal rename to graphics/pokemon/gen_9/quaxly/normal.pal diff --git a/graphics/pokemon/quaxly/shiny.pal b/graphics/pokemon/gen_9/quaxly/shiny.pal similarity index 100% rename from graphics/pokemon/quaxly/shiny.pal rename to graphics/pokemon/gen_9/quaxly/shiny.pal diff --git a/graphics/pokemon/quaxwell/back.png b/graphics/pokemon/gen_9/quaxwell/back.png similarity index 100% rename from graphics/pokemon/quaxwell/back.png rename to graphics/pokemon/gen_9/quaxwell/back.png diff --git a/graphics/pokemon/quaxwell/front.png b/graphics/pokemon/gen_9/quaxwell/front.png similarity index 100% rename from graphics/pokemon/quaxwell/front.png rename to graphics/pokemon/gen_9/quaxwell/front.png diff --git a/graphics/pokemon/quaxwell/icon.png b/graphics/pokemon/gen_9/quaxwell/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/quaxwell/icon.png rename to graphics/pokemon/gen_9/quaxwell/icon.png diff --git a/graphics/pokemon/quaxwell/normal.pal b/graphics/pokemon/gen_9/quaxwell/normal.pal similarity index 100% rename from graphics/pokemon/quaxwell/normal.pal rename to graphics/pokemon/gen_9/quaxwell/normal.pal diff --git a/graphics/pokemon/quaxwell/shiny.pal b/graphics/pokemon/gen_9/quaxwell/shiny.pal similarity index 100% rename from graphics/pokemon/quaxwell/shiny.pal rename to graphics/pokemon/gen_9/quaxwell/shiny.pal diff --git a/graphics/pokemon/rabsca/back.png b/graphics/pokemon/gen_9/rabsca/back.png similarity index 100% rename from graphics/pokemon/rabsca/back.png rename to graphics/pokemon/gen_9/rabsca/back.png diff --git a/graphics/pokemon/rabsca/front.png b/graphics/pokemon/gen_9/rabsca/front.png similarity index 100% rename from graphics/pokemon/rabsca/front.png rename to graphics/pokemon/gen_9/rabsca/front.png diff --git a/graphics/pokemon/rabsca/icon.png b/graphics/pokemon/gen_9/rabsca/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/rabsca/icon.png rename to graphics/pokemon/gen_9/rabsca/icon.png diff --git a/graphics/pokemon/rabsca/normal.pal b/graphics/pokemon/gen_9/rabsca/normal.pal similarity index 100% rename from graphics/pokemon/rabsca/normal.pal rename to graphics/pokemon/gen_9/rabsca/normal.pal diff --git a/graphics/pokemon/rabsca/shiny.pal b/graphics/pokemon/gen_9/rabsca/shiny.pal similarity index 100% rename from graphics/pokemon/rabsca/shiny.pal rename to graphics/pokemon/gen_9/rabsca/shiny.pal diff --git a/graphics/pokemon/rellor/back.png b/graphics/pokemon/gen_9/rellor/back.png similarity index 100% rename from graphics/pokemon/rellor/back.png rename to graphics/pokemon/gen_9/rellor/back.png diff --git a/graphics/pokemon/rellor/front.png b/graphics/pokemon/gen_9/rellor/front.png similarity index 100% rename from graphics/pokemon/rellor/front.png rename to graphics/pokemon/gen_9/rellor/front.png diff --git a/graphics/pokemon/rellor/icon.png b/graphics/pokemon/gen_9/rellor/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/rellor/icon.png rename to graphics/pokemon/gen_9/rellor/icon.png diff --git a/graphics/pokemon/rellor/normal.pal b/graphics/pokemon/gen_9/rellor/normal.pal similarity index 100% rename from graphics/pokemon/rellor/normal.pal rename to graphics/pokemon/gen_9/rellor/normal.pal diff --git a/graphics/pokemon/rellor/shiny.pal b/graphics/pokemon/gen_9/rellor/shiny.pal similarity index 100% rename from graphics/pokemon/rellor/shiny.pal rename to graphics/pokemon/gen_9/rellor/shiny.pal diff --git a/graphics/pokemon/revavroom/back.png b/graphics/pokemon/gen_9/revavroom/back.png similarity index 100% rename from graphics/pokemon/revavroom/back.png rename to graphics/pokemon/gen_9/revavroom/back.png diff --git a/graphics/pokemon/revavroom/front.png b/graphics/pokemon/gen_9/revavroom/front.png similarity index 100% rename from graphics/pokemon/revavroom/front.png rename to graphics/pokemon/gen_9/revavroom/front.png diff --git a/graphics/pokemon/revavroom/icon.png b/graphics/pokemon/gen_9/revavroom/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/revavroom/icon.png rename to graphics/pokemon/gen_9/revavroom/icon.png diff --git a/graphics/pokemon/revavroom/normal.pal b/graphics/pokemon/gen_9/revavroom/normal.pal similarity index 100% rename from graphics/pokemon/revavroom/normal.pal rename to graphics/pokemon/gen_9/revavroom/normal.pal diff --git a/graphics/pokemon/revavroom/shiny.pal b/graphics/pokemon/gen_9/revavroom/shiny.pal similarity index 100% rename from graphics/pokemon/revavroom/shiny.pal rename to graphics/pokemon/gen_9/revavroom/shiny.pal diff --git a/graphics/pokemon/roaring_moon/back.png b/graphics/pokemon/gen_9/roaring_moon/back.png similarity index 100% rename from graphics/pokemon/roaring_moon/back.png rename to graphics/pokemon/gen_9/roaring_moon/back.png diff --git a/graphics/pokemon/roaring_moon/front.png b/graphics/pokemon/gen_9/roaring_moon/front.png similarity index 100% rename from graphics/pokemon/roaring_moon/front.png rename to graphics/pokemon/gen_9/roaring_moon/front.png diff --git a/graphics/pokemon/roaring_moon/icon.png b/graphics/pokemon/gen_9/roaring_moon/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/roaring_moon/icon.png rename to graphics/pokemon/gen_9/roaring_moon/icon.png diff --git a/graphics/pokemon/roaring_moon/normal.pal b/graphics/pokemon/gen_9/roaring_moon/normal.pal similarity index 100% rename from graphics/pokemon/roaring_moon/normal.pal rename to graphics/pokemon/gen_9/roaring_moon/normal.pal diff --git a/graphics/pokemon/roaring_moon/shiny.pal b/graphics/pokemon/gen_9/roaring_moon/shiny.pal similarity index 100% rename from graphics/pokemon/roaring_moon/shiny.pal rename to graphics/pokemon/gen_9/roaring_moon/shiny.pal diff --git a/graphics/pokemon/sandy_shocks/back.png b/graphics/pokemon/gen_9/sandy_shocks/back.png similarity index 100% rename from graphics/pokemon/sandy_shocks/back.png rename to graphics/pokemon/gen_9/sandy_shocks/back.png diff --git a/graphics/pokemon/sandy_shocks/front.png b/graphics/pokemon/gen_9/sandy_shocks/front.png similarity index 100% rename from graphics/pokemon/sandy_shocks/front.png rename to graphics/pokemon/gen_9/sandy_shocks/front.png diff --git a/graphics/pokemon/sandy_shocks/icon.png b/graphics/pokemon/gen_9/sandy_shocks/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/sandy_shocks/icon.png rename to graphics/pokemon/gen_9/sandy_shocks/icon.png diff --git a/graphics/pokemon/sandy_shocks/normal.pal b/graphics/pokemon/gen_9/sandy_shocks/normal.pal similarity index 100% rename from graphics/pokemon/sandy_shocks/normal.pal rename to graphics/pokemon/gen_9/sandy_shocks/normal.pal diff --git a/graphics/pokemon/sandy_shocks/shiny.pal b/graphics/pokemon/gen_9/sandy_shocks/shiny.pal similarity index 100% rename from graphics/pokemon/sandy_shocks/shiny.pal rename to graphics/pokemon/gen_9/sandy_shocks/shiny.pal diff --git a/graphics/pokemon/scovillain/back.png b/graphics/pokemon/gen_9/scovillain/back.png similarity index 100% rename from graphics/pokemon/scovillain/back.png rename to graphics/pokemon/gen_9/scovillain/back.png diff --git a/graphics/pokemon/scovillain/front.png b/graphics/pokemon/gen_9/scovillain/front.png similarity index 100% rename from graphics/pokemon/scovillain/front.png rename to graphics/pokemon/gen_9/scovillain/front.png diff --git a/graphics/pokemon/scovillain/icon.png b/graphics/pokemon/gen_9/scovillain/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/scovillain/icon.png rename to graphics/pokemon/gen_9/scovillain/icon.png diff --git a/graphics/pokemon/scovillain/normal.pal b/graphics/pokemon/gen_9/scovillain/normal.pal similarity index 100% rename from graphics/pokemon/scovillain/normal.pal rename to graphics/pokemon/gen_9/scovillain/normal.pal diff --git a/graphics/pokemon/scovillain/shiny.pal b/graphics/pokemon/gen_9/scovillain/shiny.pal similarity index 100% rename from graphics/pokemon/scovillain/shiny.pal rename to graphics/pokemon/gen_9/scovillain/shiny.pal diff --git a/graphics/pokemon/scream_tail/back.png b/graphics/pokemon/gen_9/scream_tail/back.png similarity index 100% rename from graphics/pokemon/scream_tail/back.png rename to graphics/pokemon/gen_9/scream_tail/back.png diff --git a/graphics/pokemon/scream_tail/front.png b/graphics/pokemon/gen_9/scream_tail/front.png similarity index 100% rename from graphics/pokemon/scream_tail/front.png rename to graphics/pokemon/gen_9/scream_tail/front.png diff --git a/graphics/pokemon/scream_tail/icon.png b/graphics/pokemon/gen_9/scream_tail/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/scream_tail/icon.png rename to graphics/pokemon/gen_9/scream_tail/icon.png diff --git a/graphics/pokemon/scream_tail/normal.pal b/graphics/pokemon/gen_9/scream_tail/normal.pal similarity index 100% rename from graphics/pokemon/scream_tail/normal.pal rename to graphics/pokemon/gen_9/scream_tail/normal.pal diff --git a/graphics/pokemon/scream_tail/shiny.pal b/graphics/pokemon/gen_9/scream_tail/shiny.pal similarity index 100% rename from graphics/pokemon/scream_tail/shiny.pal rename to graphics/pokemon/gen_9/scream_tail/shiny.pal diff --git a/graphics/pokemon/shroodle/back.png b/graphics/pokemon/gen_9/shroodle/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/shroodle/back.png rename to graphics/pokemon/gen_9/shroodle/back.png diff --git a/graphics/pokemon/shroodle/front.png b/graphics/pokemon/gen_9/shroodle/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/shroodle/front.png rename to graphics/pokemon/gen_9/shroodle/front.png diff --git a/graphics/pokemon/shroodle/icon.png b/graphics/pokemon/gen_9/shroodle/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/shroodle/icon.png rename to graphics/pokemon/gen_9/shroodle/icon.png diff --git a/graphics/pokemon/shroodle/normal.pal b/graphics/pokemon/gen_9/shroodle/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/shroodle/normal.pal rename to graphics/pokemon/gen_9/shroodle/normal.pal diff --git a/graphics/pokemon/shroodle/shiny.pal b/graphics/pokemon/gen_9/shroodle/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/shroodle/shiny.pal rename to graphics/pokemon/gen_9/shroodle/shiny.pal diff --git a/graphics/pokemon/sinistcha/back.png b/graphics/pokemon/gen_9/sinistcha/back.png similarity index 100% rename from graphics/pokemon/sinistcha/back.png rename to graphics/pokemon/gen_9/sinistcha/back.png diff --git a/graphics/pokemon/sinistcha/front.png b/graphics/pokemon/gen_9/sinistcha/front.png similarity index 100% rename from graphics/pokemon/sinistcha/front.png rename to graphics/pokemon/gen_9/sinistcha/front.png diff --git a/graphics/pokemon/sinistcha/icon.png b/graphics/pokemon/gen_9/sinistcha/icon.png similarity index 100% rename from graphics/pokemon/sinistcha/icon.png rename to graphics/pokemon/gen_9/sinistcha/icon.png diff --git a/graphics/pokemon/sinistcha/normal.pal b/graphics/pokemon/gen_9/sinistcha/normal.pal similarity index 100% rename from graphics/pokemon/sinistcha/normal.pal rename to graphics/pokemon/gen_9/sinistcha/normal.pal diff --git a/graphics/pokemon/sinistcha/shiny.pal b/graphics/pokemon/gen_9/sinistcha/shiny.pal similarity index 100% rename from graphics/pokemon/sinistcha/shiny.pal rename to graphics/pokemon/gen_9/sinistcha/shiny.pal diff --git a/graphics/pokemon/skeledirge/back.png b/graphics/pokemon/gen_9/skeledirge/back.png similarity index 100% rename from graphics/pokemon/skeledirge/back.png rename to graphics/pokemon/gen_9/skeledirge/back.png diff --git a/graphics/pokemon/skeledirge/front.png b/graphics/pokemon/gen_9/skeledirge/front.png similarity index 100% rename from graphics/pokemon/skeledirge/front.png rename to graphics/pokemon/gen_9/skeledirge/front.png diff --git a/graphics/pokemon/skeledirge/icon.png b/graphics/pokemon/gen_9/skeledirge/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/skeledirge/icon.png rename to graphics/pokemon/gen_9/skeledirge/icon.png diff --git a/graphics/pokemon/skeledirge/normal.pal b/graphics/pokemon/gen_9/skeledirge/normal.pal similarity index 100% rename from graphics/pokemon/skeledirge/normal.pal rename to graphics/pokemon/gen_9/skeledirge/normal.pal diff --git a/graphics/pokemon/skeledirge/shiny.pal b/graphics/pokemon/gen_9/skeledirge/shiny.pal similarity index 100% rename from graphics/pokemon/skeledirge/shiny.pal rename to graphics/pokemon/gen_9/skeledirge/shiny.pal diff --git a/graphics/pokemon/slither_wing/back.png b/graphics/pokemon/gen_9/slither_wing/back.png similarity index 100% rename from graphics/pokemon/slither_wing/back.png rename to graphics/pokemon/gen_9/slither_wing/back.png diff --git a/graphics/pokemon/slither_wing/front.png b/graphics/pokemon/gen_9/slither_wing/front.png similarity index 100% rename from graphics/pokemon/slither_wing/front.png rename to graphics/pokemon/gen_9/slither_wing/front.png diff --git a/graphics/pokemon/slither_wing/icon.png b/graphics/pokemon/gen_9/slither_wing/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/slither_wing/icon.png rename to graphics/pokemon/gen_9/slither_wing/icon.png diff --git a/graphics/pokemon/slither_wing/normal.pal b/graphics/pokemon/gen_9/slither_wing/normal.pal similarity index 100% rename from graphics/pokemon/slither_wing/normal.pal rename to graphics/pokemon/gen_9/slither_wing/normal.pal diff --git a/graphics/pokemon/slither_wing/shiny.pal b/graphics/pokemon/gen_9/slither_wing/shiny.pal similarity index 100% rename from graphics/pokemon/slither_wing/shiny.pal rename to graphics/pokemon/gen_9/slither_wing/shiny.pal diff --git a/graphics/pokemon/smoliv/back.png b/graphics/pokemon/gen_9/smoliv/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/smoliv/back.png rename to graphics/pokemon/gen_9/smoliv/back.png diff --git a/graphics/pokemon/smoliv/front.png b/graphics/pokemon/gen_9/smoliv/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/smoliv/front.png rename to graphics/pokemon/gen_9/smoliv/front.png diff --git a/graphics/pokemon/smoliv/icon.png b/graphics/pokemon/gen_9/smoliv/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/smoliv/icon.png rename to graphics/pokemon/gen_9/smoliv/icon.png diff --git a/graphics/pokemon/smoliv/normal.pal b/graphics/pokemon/gen_9/smoliv/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/smoliv/normal.pal rename to graphics/pokemon/gen_9/smoliv/normal.pal diff --git a/graphics/pokemon/smoliv/shiny.pal b/graphics/pokemon/gen_9/smoliv/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/smoliv/shiny.pal rename to graphics/pokemon/gen_9/smoliv/shiny.pal diff --git a/graphics/pokemon/spidops/back.png b/graphics/pokemon/gen_9/spidops/back.png similarity index 100% rename from graphics/pokemon/spidops/back.png rename to graphics/pokemon/gen_9/spidops/back.png diff --git a/graphics/pokemon/spidops/front.png b/graphics/pokemon/gen_9/spidops/front.png similarity index 100% rename from graphics/pokemon/spidops/front.png rename to graphics/pokemon/gen_9/spidops/front.png diff --git a/graphics/pokemon/spidops/icon.png b/graphics/pokemon/gen_9/spidops/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/spidops/icon.png rename to graphics/pokemon/gen_9/spidops/icon.png diff --git a/graphics/pokemon/spidops/normal.pal b/graphics/pokemon/gen_9/spidops/normal.pal similarity index 100% rename from graphics/pokemon/spidops/normal.pal rename to graphics/pokemon/gen_9/spidops/normal.pal diff --git a/graphics/pokemon/spidops/shiny.pal b/graphics/pokemon/gen_9/spidops/shiny.pal similarity index 100% rename from graphics/pokemon/spidops/shiny.pal rename to graphics/pokemon/gen_9/spidops/shiny.pal diff --git a/graphics/pokemon/sprigatito/back.png b/graphics/pokemon/gen_9/sprigatito/back.png similarity index 100% rename from graphics/pokemon/sprigatito/back.png rename to graphics/pokemon/gen_9/sprigatito/back.png diff --git a/graphics/pokemon/sprigatito/front.png b/graphics/pokemon/gen_9/sprigatito/front.png similarity index 100% rename from graphics/pokemon/sprigatito/front.png rename to graphics/pokemon/gen_9/sprigatito/front.png diff --git a/graphics/pokemon/sprigatito/icon.png b/graphics/pokemon/gen_9/sprigatito/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/sprigatito/icon.png rename to graphics/pokemon/gen_9/sprigatito/icon.png diff --git a/graphics/pokemon/sprigatito/normal.pal b/graphics/pokemon/gen_9/sprigatito/normal.pal similarity index 100% rename from graphics/pokemon/sprigatito/normal.pal rename to graphics/pokemon/gen_9/sprigatito/normal.pal diff --git a/graphics/pokemon/sprigatito/shiny.pal b/graphics/pokemon/gen_9/sprigatito/shiny.pal similarity index 100% rename from graphics/pokemon/sprigatito/shiny.pal rename to graphics/pokemon/gen_9/sprigatito/shiny.pal diff --git a/graphics/pokemon/squawkabilly/back.png b/graphics/pokemon/gen_9/squawkabilly/back.png similarity index 100% rename from graphics/pokemon/squawkabilly/back.png rename to graphics/pokemon/gen_9/squawkabilly/back.png diff --git a/graphics/pokemon/squawkabilly/blue_plumage/icon.png b/graphics/pokemon/gen_9/squawkabilly/blue_plumage/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/squawkabilly/blue_plumage/icon.png rename to graphics/pokemon/gen_9/squawkabilly/blue_plumage/icon.png diff --git a/graphics/pokemon/squawkabilly/blue_plumage/normal.pal b/graphics/pokemon/gen_9/squawkabilly/blue_plumage/normal.pal similarity index 100% rename from graphics/pokemon/squawkabilly/blue_plumage/normal.pal rename to graphics/pokemon/gen_9/squawkabilly/blue_plumage/normal.pal diff --git a/graphics/pokemon/squawkabilly/blue_plumage/shiny.pal b/graphics/pokemon/gen_9/squawkabilly/blue_plumage/shiny.pal similarity index 100% rename from graphics/pokemon/squawkabilly/blue_plumage/shiny.pal rename to graphics/pokemon/gen_9/squawkabilly/blue_plumage/shiny.pal diff --git a/graphics/pokemon/squawkabilly/front.png b/graphics/pokemon/gen_9/squawkabilly/front.png similarity index 100% rename from graphics/pokemon/squawkabilly/front.png rename to graphics/pokemon/gen_9/squawkabilly/front.png diff --git a/graphics/pokemon/squawkabilly/green_plumage/icon.png b/graphics/pokemon/gen_9/squawkabilly/green_plumage/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/squawkabilly/green_plumage/icon.png rename to graphics/pokemon/gen_9/squawkabilly/green_plumage/icon.png diff --git a/graphics/pokemon/squawkabilly/green_plumage/normal.pal b/graphics/pokemon/gen_9/squawkabilly/green_plumage/normal.pal similarity index 100% rename from graphics/pokemon/squawkabilly/green_plumage/normal.pal rename to graphics/pokemon/gen_9/squawkabilly/green_plumage/normal.pal diff --git a/graphics/pokemon/squawkabilly/green_plumage/shiny.pal b/graphics/pokemon/gen_9/squawkabilly/green_plumage/shiny.pal similarity index 100% rename from graphics/pokemon/squawkabilly/green_plumage/shiny.pal rename to graphics/pokemon/gen_9/squawkabilly/green_plumage/shiny.pal diff --git a/graphics/pokemon/squawkabilly/white_plumage/icon.png b/graphics/pokemon/gen_9/squawkabilly/white_plumage/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/squawkabilly/white_plumage/icon.png rename to graphics/pokemon/gen_9/squawkabilly/white_plumage/icon.png diff --git a/graphics/pokemon/squawkabilly/white_plumage/normal.pal b/graphics/pokemon/gen_9/squawkabilly/white_plumage/normal.pal similarity index 100% rename from graphics/pokemon/squawkabilly/white_plumage/normal.pal rename to graphics/pokemon/gen_9/squawkabilly/white_plumage/normal.pal diff --git a/graphics/pokemon/squawkabilly/white_plumage/shiny.pal b/graphics/pokemon/gen_9/squawkabilly/white_plumage/shiny.pal similarity index 100% rename from graphics/pokemon/squawkabilly/white_plumage/shiny.pal rename to graphics/pokemon/gen_9/squawkabilly/white_plumage/shiny.pal diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/icon.png b/graphics/pokemon/gen_9/squawkabilly/yellow_plumage/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/squawkabilly/yellow_plumage/icon.png rename to graphics/pokemon/gen_9/squawkabilly/yellow_plumage/icon.png diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/normal.pal b/graphics/pokemon/gen_9/squawkabilly/yellow_plumage/normal.pal similarity index 100% rename from graphics/pokemon/squawkabilly/yellow_plumage/normal.pal rename to graphics/pokemon/gen_9/squawkabilly/yellow_plumage/normal.pal diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/shiny.pal b/graphics/pokemon/gen_9/squawkabilly/yellow_plumage/shiny.pal similarity index 100% rename from graphics/pokemon/squawkabilly/yellow_plumage/shiny.pal rename to graphics/pokemon/gen_9/squawkabilly/yellow_plumage/shiny.pal diff --git a/graphics/pokemon/tadbulb/back.png b/graphics/pokemon/gen_9/tadbulb/back.png similarity index 100% rename from graphics/pokemon/tadbulb/back.png rename to graphics/pokemon/gen_9/tadbulb/back.png diff --git a/graphics/pokemon/tadbulb/front.png b/graphics/pokemon/gen_9/tadbulb/front.png similarity index 100% rename from graphics/pokemon/tadbulb/front.png rename to graphics/pokemon/gen_9/tadbulb/front.png diff --git a/graphics/pokemon/tadbulb/icon.png b/graphics/pokemon/gen_9/tadbulb/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/tadbulb/icon.png rename to graphics/pokemon/gen_9/tadbulb/icon.png diff --git a/graphics/pokemon/tadbulb/normal.pal b/graphics/pokemon/gen_9/tadbulb/normal.pal similarity index 100% rename from graphics/pokemon/tadbulb/normal.pal rename to graphics/pokemon/gen_9/tadbulb/normal.pal diff --git a/graphics/pokemon/tadbulb/shiny.pal b/graphics/pokemon/gen_9/tadbulb/shiny.pal similarity index 100% rename from graphics/pokemon/tadbulb/shiny.pal rename to graphics/pokemon/gen_9/tadbulb/shiny.pal diff --git a/graphics/pokemon/tandemaus/back.png b/graphics/pokemon/gen_9/tandemaus/back.png similarity index 100% rename from graphics/pokemon/tandemaus/back.png rename to graphics/pokemon/gen_9/tandemaus/back.png diff --git a/graphics/pokemon/tandemaus/front.png b/graphics/pokemon/gen_9/tandemaus/front.png similarity index 100% rename from graphics/pokemon/tandemaus/front.png rename to graphics/pokemon/gen_9/tandemaus/front.png diff --git a/graphics/pokemon/tandemaus/icon.png b/graphics/pokemon/gen_9/tandemaus/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/tandemaus/icon.png rename to graphics/pokemon/gen_9/tandemaus/icon.png diff --git a/graphics/pokemon/tandemaus/normal.pal b/graphics/pokemon/gen_9/tandemaus/normal.pal similarity index 100% rename from graphics/pokemon/tandemaus/normal.pal rename to graphics/pokemon/gen_9/tandemaus/normal.pal diff --git a/graphics/pokemon/tandemaus/shiny.pal b/graphics/pokemon/gen_9/tandemaus/shiny.pal similarity index 100% rename from graphics/pokemon/tandemaus/shiny.pal rename to graphics/pokemon/gen_9/tandemaus/shiny.pal diff --git a/graphics/pokemon/tarountula/back.png b/graphics/pokemon/gen_9/tarountula/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/tarountula/back.png rename to graphics/pokemon/gen_9/tarountula/back.png diff --git a/graphics/pokemon/tarountula/front.png b/graphics/pokemon/gen_9/tarountula/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/tarountula/front.png rename to graphics/pokemon/gen_9/tarountula/front.png diff --git a/graphics/pokemon/tarountula/icon.png b/graphics/pokemon/gen_9/tarountula/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/tarountula/icon.png rename to graphics/pokemon/gen_9/tarountula/icon.png diff --git a/graphics/pokemon/tarountula/normal.pal b/graphics/pokemon/gen_9/tarountula/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/tarountula/normal.pal rename to graphics/pokemon/gen_9/tarountula/normal.pal diff --git a/graphics/pokemon/tarountula/shiny.pal b/graphics/pokemon/gen_9/tarountula/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/tarountula/shiny.pal rename to graphics/pokemon/gen_9/tarountula/shiny.pal diff --git a/graphics/pokemon/tatsugiri/curly/back.png b/graphics/pokemon/gen_9/tatsugiri/curly/back.png similarity index 100% rename from graphics/pokemon/tatsugiri/curly/back.png rename to graphics/pokemon/gen_9/tatsugiri/curly/back.png diff --git a/graphics/pokemon/tatsugiri/curly/front.png b/graphics/pokemon/gen_9/tatsugiri/curly/front.png similarity index 100% rename from graphics/pokemon/tatsugiri/curly/front.png rename to graphics/pokemon/gen_9/tatsugiri/curly/front.png diff --git a/graphics/pokemon/tatsugiri/curly/icon.png b/graphics/pokemon/gen_9/tatsugiri/curly/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/tatsugiri/curly/icon.png rename to graphics/pokemon/gen_9/tatsugiri/curly/icon.png diff --git a/graphics/pokemon/tatsugiri/curly/normal.pal b/graphics/pokemon/gen_9/tatsugiri/curly/normal.pal similarity index 100% rename from graphics/pokemon/tatsugiri/curly/normal.pal rename to graphics/pokemon/gen_9/tatsugiri/curly/normal.pal diff --git a/graphics/pokemon/tatsugiri/curly/shiny.pal b/graphics/pokemon/gen_9/tatsugiri/curly/shiny.pal similarity index 100% rename from graphics/pokemon/tatsugiri/curly/shiny.pal rename to graphics/pokemon/gen_9/tatsugiri/curly/shiny.pal diff --git a/graphics/pokemon/tatsugiri/droopy/back.png b/graphics/pokemon/gen_9/tatsugiri/droopy/back.png similarity index 100% rename from graphics/pokemon/tatsugiri/droopy/back.png rename to graphics/pokemon/gen_9/tatsugiri/droopy/back.png diff --git a/graphics/pokemon/tatsugiri/droopy/front.png b/graphics/pokemon/gen_9/tatsugiri/droopy/front.png similarity index 100% rename from graphics/pokemon/tatsugiri/droopy/front.png rename to graphics/pokemon/gen_9/tatsugiri/droopy/front.png diff --git a/graphics/pokemon/tatsugiri/droopy/icon.png b/graphics/pokemon/gen_9/tatsugiri/droopy/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/tatsugiri/droopy/icon.png rename to graphics/pokemon/gen_9/tatsugiri/droopy/icon.png diff --git a/graphics/pokemon/tatsugiri/droopy/normal.pal b/graphics/pokemon/gen_9/tatsugiri/droopy/normal.pal similarity index 100% rename from graphics/pokemon/tatsugiri/droopy/normal.pal rename to graphics/pokemon/gen_9/tatsugiri/droopy/normal.pal diff --git a/graphics/pokemon/tatsugiri/droopy/shiny.pal b/graphics/pokemon/gen_9/tatsugiri/droopy/shiny.pal similarity index 100% rename from graphics/pokemon/tatsugiri/droopy/shiny.pal rename to graphics/pokemon/gen_9/tatsugiri/droopy/shiny.pal diff --git a/graphics/pokemon/tatsugiri/stretchy/back.png b/graphics/pokemon/gen_9/tatsugiri/stretchy/back.png similarity index 100% rename from graphics/pokemon/tatsugiri/stretchy/back.png rename to graphics/pokemon/gen_9/tatsugiri/stretchy/back.png diff --git a/graphics/pokemon/tatsugiri/stretchy/front.png b/graphics/pokemon/gen_9/tatsugiri/stretchy/front.png similarity index 100% rename from graphics/pokemon/tatsugiri/stretchy/front.png rename to graphics/pokemon/gen_9/tatsugiri/stretchy/front.png diff --git a/graphics/pokemon/tatsugiri/stretchy/icon.png b/graphics/pokemon/gen_9/tatsugiri/stretchy/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/tatsugiri/stretchy/icon.png rename to graphics/pokemon/gen_9/tatsugiri/stretchy/icon.png diff --git a/graphics/pokemon/tatsugiri/stretchy/normal.pal b/graphics/pokemon/gen_9/tatsugiri/stretchy/normal.pal similarity index 100% rename from graphics/pokemon/tatsugiri/stretchy/normal.pal rename to graphics/pokemon/gen_9/tatsugiri/stretchy/normal.pal diff --git a/graphics/pokemon/tatsugiri/stretchy/shiny.pal b/graphics/pokemon/gen_9/tatsugiri/stretchy/shiny.pal similarity index 100% rename from graphics/pokemon/tatsugiri/stretchy/shiny.pal rename to graphics/pokemon/gen_9/tatsugiri/stretchy/shiny.pal diff --git a/graphics/pokemon/ting_lu/back.png b/graphics/pokemon/gen_9/ting_lu/back.png similarity index 100% rename from graphics/pokemon/ting_lu/back.png rename to graphics/pokemon/gen_9/ting_lu/back.png diff --git a/graphics/pokemon/ting_lu/front.png b/graphics/pokemon/gen_9/ting_lu/front.png similarity index 100% rename from graphics/pokemon/ting_lu/front.png rename to graphics/pokemon/gen_9/ting_lu/front.png diff --git a/graphics/pokemon/ting_lu/icon.png b/graphics/pokemon/gen_9/ting_lu/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/ting_lu/icon.png rename to graphics/pokemon/gen_9/ting_lu/icon.png diff --git a/graphics/pokemon/ting_lu/normal.pal b/graphics/pokemon/gen_9/ting_lu/normal.pal similarity index 100% rename from graphics/pokemon/ting_lu/normal.pal rename to graphics/pokemon/gen_9/ting_lu/normal.pal diff --git a/graphics/pokemon/ting_lu/shiny.pal b/graphics/pokemon/gen_9/ting_lu/shiny.pal similarity index 100% rename from graphics/pokemon/ting_lu/shiny.pal rename to graphics/pokemon/gen_9/ting_lu/shiny.pal diff --git a/graphics/pokemon/tinkatink/back.png b/graphics/pokemon/gen_9/tinkatink/back.png similarity index 100% rename from graphics/pokemon/tinkatink/back.png rename to graphics/pokemon/gen_9/tinkatink/back.png diff --git a/graphics/pokemon/tinkatink/front.png b/graphics/pokemon/gen_9/tinkatink/front.png similarity index 100% rename from graphics/pokemon/tinkatink/front.png rename to graphics/pokemon/gen_9/tinkatink/front.png diff --git a/graphics/pokemon/tinkatink/icon.png b/graphics/pokemon/gen_9/tinkatink/icon.png similarity index 100% rename from graphics/pokemon/tinkatink/icon.png rename to graphics/pokemon/gen_9/tinkatink/icon.png diff --git a/graphics/pokemon/tinkatink/normal.pal b/graphics/pokemon/gen_9/tinkatink/normal.pal similarity index 100% rename from graphics/pokemon/tinkatink/normal.pal rename to graphics/pokemon/gen_9/tinkatink/normal.pal diff --git a/graphics/pokemon/tinkatink/shiny.pal b/graphics/pokemon/gen_9/tinkatink/shiny.pal similarity index 100% rename from graphics/pokemon/tinkatink/shiny.pal rename to graphics/pokemon/gen_9/tinkatink/shiny.pal diff --git a/graphics/pokemon/tinkaton/back.png b/graphics/pokemon/gen_9/tinkaton/back.png similarity index 100% rename from graphics/pokemon/tinkaton/back.png rename to graphics/pokemon/gen_9/tinkaton/back.png diff --git a/graphics/pokemon/tinkaton/front.png b/graphics/pokemon/gen_9/tinkaton/front.png similarity index 100% rename from graphics/pokemon/tinkaton/front.png rename to graphics/pokemon/gen_9/tinkaton/front.png diff --git a/graphics/pokemon/tinkaton/icon.png b/graphics/pokemon/gen_9/tinkaton/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/tinkaton/icon.png rename to graphics/pokemon/gen_9/tinkaton/icon.png diff --git a/graphics/pokemon/tinkaton/normal.pal b/graphics/pokemon/gen_9/tinkaton/normal.pal similarity index 100% rename from graphics/pokemon/tinkaton/normal.pal rename to graphics/pokemon/gen_9/tinkaton/normal.pal diff --git a/graphics/pokemon/tinkaton/shiny.pal b/graphics/pokemon/gen_9/tinkaton/shiny.pal similarity index 100% rename from graphics/pokemon/tinkaton/shiny.pal rename to graphics/pokemon/gen_9/tinkaton/shiny.pal diff --git a/graphics/pokemon/tinkatuff/back.png b/graphics/pokemon/gen_9/tinkatuff/back.png similarity index 100% rename from graphics/pokemon/tinkatuff/back.png rename to graphics/pokemon/gen_9/tinkatuff/back.png diff --git a/graphics/pokemon/tinkatuff/front.png b/graphics/pokemon/gen_9/tinkatuff/front.png similarity index 100% rename from graphics/pokemon/tinkatuff/front.png rename to graphics/pokemon/gen_9/tinkatuff/front.png diff --git a/graphics/pokemon/tinkatuff/icon.png b/graphics/pokemon/gen_9/tinkatuff/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/tinkatuff/icon.png rename to graphics/pokemon/gen_9/tinkatuff/icon.png diff --git a/graphics/pokemon/tinkatuff/normal.pal b/graphics/pokemon/gen_9/tinkatuff/normal.pal similarity index 100% rename from graphics/pokemon/tinkatuff/normal.pal rename to graphics/pokemon/gen_9/tinkatuff/normal.pal diff --git a/graphics/pokemon/tinkatuff/shiny.pal b/graphics/pokemon/gen_9/tinkatuff/shiny.pal similarity index 100% rename from graphics/pokemon/tinkatuff/shiny.pal rename to graphics/pokemon/gen_9/tinkatuff/shiny.pal diff --git a/graphics/pokemon/toedscool/back.png b/graphics/pokemon/gen_9/toedscool/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/toedscool/back.png rename to graphics/pokemon/gen_9/toedscool/back.png diff --git a/graphics/pokemon/toedscool/front.png b/graphics/pokemon/gen_9/toedscool/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/toedscool/front.png rename to graphics/pokemon/gen_9/toedscool/front.png diff --git a/graphics/pokemon/toedscool/icon.png b/graphics/pokemon/gen_9/toedscool/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/toedscool/icon.png rename to graphics/pokemon/gen_9/toedscool/icon.png diff --git a/graphics/pokemon/toedscool/normal.pal b/graphics/pokemon/gen_9/toedscool/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/toedscool/normal.pal rename to graphics/pokemon/gen_9/toedscool/normal.pal diff --git a/graphics/pokemon/toedscool/shiny.pal b/graphics/pokemon/gen_9/toedscool/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/toedscool/shiny.pal rename to graphics/pokemon/gen_9/toedscool/shiny.pal diff --git a/graphics/pokemon/toedscruel/back.png b/graphics/pokemon/gen_9/toedscruel/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/toedscruel/back.png rename to graphics/pokemon/gen_9/toedscruel/back.png diff --git a/graphics/pokemon/toedscruel/front.png b/graphics/pokemon/gen_9/toedscruel/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/toedscruel/front.png rename to graphics/pokemon/gen_9/toedscruel/front.png diff --git a/graphics/pokemon/toedscruel/icon.png b/graphics/pokemon/gen_9/toedscruel/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/toedscruel/icon.png rename to graphics/pokemon/gen_9/toedscruel/icon.png diff --git a/graphics/pokemon/toedscruel/normal.pal b/graphics/pokemon/gen_9/toedscruel/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/toedscruel/normal.pal rename to graphics/pokemon/gen_9/toedscruel/normal.pal diff --git a/graphics/pokemon/toedscruel/shiny.pal b/graphics/pokemon/gen_9/toedscruel/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/toedscruel/shiny.pal rename to graphics/pokemon/gen_9/toedscruel/shiny.pal diff --git a/graphics/pokemon/varoom/back.png b/graphics/pokemon/gen_9/varoom/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/varoom/back.png rename to graphics/pokemon/gen_9/varoom/back.png diff --git a/graphics/pokemon/varoom/front.png b/graphics/pokemon/gen_9/varoom/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/varoom/front.png rename to graphics/pokemon/gen_9/varoom/front.png diff --git a/graphics/pokemon/varoom/icon.png b/graphics/pokemon/gen_9/varoom/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/varoom/icon.png rename to graphics/pokemon/gen_9/varoom/icon.png diff --git a/graphics/pokemon/varoom/normal.pal b/graphics/pokemon/gen_9/varoom/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/varoom/normal.pal rename to graphics/pokemon/gen_9/varoom/normal.pal diff --git a/graphics/pokemon/varoom/shiny.pal b/graphics/pokemon/gen_9/varoom/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/varoom/shiny.pal rename to graphics/pokemon/gen_9/varoom/shiny.pal diff --git a/graphics/pokemon/veluza/back.png b/graphics/pokemon/gen_9/veluza/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/veluza/back.png rename to graphics/pokemon/gen_9/veluza/back.png diff --git a/graphics/pokemon/veluza/front.png b/graphics/pokemon/gen_9/veluza/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/veluza/front.png rename to graphics/pokemon/gen_9/veluza/front.png diff --git a/graphics/pokemon/veluza/icon.png b/graphics/pokemon/gen_9/veluza/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/veluza/icon.png rename to graphics/pokemon/gen_9/veluza/icon.png diff --git a/graphics/pokemon/veluza/normal.pal b/graphics/pokemon/gen_9/veluza/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/veluza/normal.pal rename to graphics/pokemon/gen_9/veluza/normal.pal diff --git a/graphics/pokemon/veluza/shiny.pal b/graphics/pokemon/gen_9/veluza/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/veluza/shiny.pal rename to graphics/pokemon/gen_9/veluza/shiny.pal diff --git a/graphics/pokemon/walking_wake/back.png b/graphics/pokemon/gen_9/walking_wake/back.png similarity index 100% rename from graphics/pokemon/walking_wake/back.png rename to graphics/pokemon/gen_9/walking_wake/back.png diff --git a/graphics/pokemon/walking_wake/front.png b/graphics/pokemon/gen_9/walking_wake/front.png similarity index 100% rename from graphics/pokemon/walking_wake/front.png rename to graphics/pokemon/gen_9/walking_wake/front.png diff --git a/graphics/pokemon/walking_wake/icon.png b/graphics/pokemon/gen_9/walking_wake/icon.png similarity index 100% rename from graphics/pokemon/walking_wake/icon.png rename to graphics/pokemon/gen_9/walking_wake/icon.png diff --git a/graphics/pokemon/walking_wake/normal.pal b/graphics/pokemon/gen_9/walking_wake/normal.pal similarity index 100% rename from graphics/pokemon/walking_wake/normal.pal rename to graphics/pokemon/gen_9/walking_wake/normal.pal diff --git a/graphics/pokemon/walking_wake/shiny.pal b/graphics/pokemon/gen_9/walking_wake/shiny.pal similarity index 100% rename from graphics/pokemon/walking_wake/shiny.pal rename to graphics/pokemon/gen_9/walking_wake/shiny.pal diff --git a/graphics/pokemon/wattrel/back.png b/graphics/pokemon/gen_9/wattrel/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wattrel/back.png rename to graphics/pokemon/gen_9/wattrel/back.png diff --git a/graphics/pokemon/wattrel/front.png b/graphics/pokemon/gen_9/wattrel/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wattrel/front.png rename to graphics/pokemon/gen_9/wattrel/front.png diff --git a/graphics/pokemon/wattrel/icon.png b/graphics/pokemon/gen_9/wattrel/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wattrel/icon.png rename to graphics/pokemon/gen_9/wattrel/icon.png diff --git a/graphics/pokemon/wattrel/normal.pal b/graphics/pokemon/gen_9/wattrel/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wattrel/normal.pal rename to graphics/pokemon/gen_9/wattrel/normal.pal diff --git a/graphics/pokemon/wattrel/shiny.pal b/graphics/pokemon/gen_9/wattrel/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wattrel/shiny.pal rename to graphics/pokemon/gen_9/wattrel/shiny.pal diff --git a/graphics/pokemon/wiglett/back.png b/graphics/pokemon/gen_9/wiglett/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wiglett/back.png rename to graphics/pokemon/gen_9/wiglett/back.png diff --git a/graphics/pokemon/wiglett/front.png b/graphics/pokemon/gen_9/wiglett/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wiglett/front.png rename to graphics/pokemon/gen_9/wiglett/front.png diff --git a/graphics/pokemon/wiglett/icon.png b/graphics/pokemon/gen_9/wiglett/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wiglett/icon.png rename to graphics/pokemon/gen_9/wiglett/icon.png diff --git a/graphics/pokemon/wiglett/normal.pal b/graphics/pokemon/gen_9/wiglett/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wiglett/normal.pal rename to graphics/pokemon/gen_9/wiglett/normal.pal diff --git a/graphics/pokemon/wiglett/shiny.pal b/graphics/pokemon/gen_9/wiglett/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wiglett/shiny.pal rename to graphics/pokemon/gen_9/wiglett/shiny.pal diff --git a/graphics/pokemon/wo_chien/back.png b/graphics/pokemon/gen_9/wo_chien/back.png similarity index 100% rename from graphics/pokemon/wo_chien/back.png rename to graphics/pokemon/gen_9/wo_chien/back.png diff --git a/graphics/pokemon/wo_chien/front.png b/graphics/pokemon/gen_9/wo_chien/front.png similarity index 100% rename from graphics/pokemon/wo_chien/front.png rename to graphics/pokemon/gen_9/wo_chien/front.png diff --git a/graphics/pokemon/wo_chien/icon.png b/graphics/pokemon/gen_9/wo_chien/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wo_chien/icon.png rename to graphics/pokemon/gen_9/wo_chien/icon.png diff --git a/graphics/pokemon/wo_chien/normal.pal b/graphics/pokemon/gen_9/wo_chien/normal.pal similarity index 100% rename from graphics/pokemon/wo_chien/normal.pal rename to graphics/pokemon/gen_9/wo_chien/normal.pal diff --git a/graphics/pokemon/wo_chien/shiny.pal b/graphics/pokemon/gen_9/wo_chien/shiny.pal similarity index 100% rename from graphics/pokemon/wo_chien/shiny.pal rename to graphics/pokemon/gen_9/wo_chien/shiny.pal diff --git a/graphics/pokemon/wugtrio/back.png b/graphics/pokemon/gen_9/wugtrio/back.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wugtrio/back.png rename to graphics/pokemon/gen_9/wugtrio/back.png diff --git a/graphics/pokemon/wugtrio/front.png b/graphics/pokemon/gen_9/wugtrio/front.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wugtrio/front.png rename to graphics/pokemon/gen_9/wugtrio/front.png diff --git a/graphics/pokemon/wugtrio/icon.png b/graphics/pokemon/gen_9/wugtrio/icon.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wugtrio/icon.png rename to graphics/pokemon/gen_9/wugtrio/icon.png diff --git a/graphics/pokemon/wugtrio/normal.pal b/graphics/pokemon/gen_9/wugtrio/normal.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wugtrio/normal.pal rename to graphics/pokemon/gen_9/wugtrio/normal.pal diff --git a/graphics/pokemon/wugtrio/shiny.pal b/graphics/pokemon/gen_9/wugtrio/shiny.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon/wugtrio/shiny.pal rename to graphics/pokemon/gen_9/wugtrio/shiny.pal diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 6a2728aff4..8aa873ee06 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -20,7 +20,7 @@ JPCONTESTGFXDIR := graphics/contest/japanese POKEDEXGFXDIR := graphics/pokedex STARTERGFXDIR := graphics/starter_choose NAMINGGFXDIR := graphics/naming_screen -SPINDAGFXDIR := graphics/pokemon/spinda/spots +SPINDAGFXDIR := graphics/pokemon/gen_3/spinda/spots types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark fairy contest_types := cool beauty cute smart tough diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index de164520d2..daa1a29784 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -8,11569 +8,11571 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar #endif //P_FOOTPRINTS #if P_FAMILY_BULBASAUR - const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/anim_front.4bpp.lz"); - const u32 gMonPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/normal.gbapal.lz"); - const u32 gMonBackPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/back.4bpp.lz"); - const u32 gMonShinyPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/shiny.gbapal.lz"); - const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/icon.4bpp"); + const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/gen_1/bulbasaur/anim_front.4bpp.lz"); + const u32 gMonPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/gen_1/bulbasaur/normal.gbapal.lz"); + const u32 gMonBackPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/gen_1/bulbasaur/back.4bpp.lz"); + const u32 gMonShinyPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/gen_1/bulbasaur/shiny.gbapal.lz"); + const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/gen_1/bulbasaur/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/footprint.1bpp"); + const u8 gMonFootprint_Bulbasaur[] = INCBIN_U8("graphics/pokemon/gen_1/bulbasaur/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/anim_front.4bpp.lz"); - const u32 gMonPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/normal.gbapal.lz"); - const u32 gMonBackPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/back.4bpp.lz"); - const u32 gMonShinyPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/shiny.gbapal.lz"); - const u8 gMonIcon_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/icon.4bpp"); + const u32 gMonFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/gen_1/ivysaur/anim_front.4bpp.lz"); + const u32 gMonPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/gen_1/ivysaur/normal.gbapal.lz"); + const u32 gMonBackPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/gen_1/ivysaur/back.4bpp.lz"); + const u32 gMonShinyPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/gen_1/ivysaur/shiny.gbapal.lz"); + const u8 gMonIcon_Ivysaur[] = INCBIN_U8("graphics/pokemon/gen_1/ivysaur/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/footprint.1bpp"); + const u8 gMonFootprint_Ivysaur[] = INCBIN_U8("graphics/pokemon/gen_1/ivysaur/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/anim_front.4bpp.lz"); - const u32 gMonPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/normal.gbapal.lz"); - const u32 gMonBackPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/back.4bpp.lz"); - const u32 gMonShinyPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/shiny.gbapal.lz"); - const u8 gMonIcon_Venusaur[] = INCBIN_U8("graphics/pokemon/venusaur/icon.4bpp"); + const u32 gMonFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/anim_front.4bpp.lz"); + const u32 gMonPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/normal.gbapal.lz"); + const u32 gMonBackPic_Venusaur[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/back.4bpp.lz"); + const u32 gMonShinyPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/shiny.gbapal.lz"); + const u8 gMonIcon_Venusaur[] = INCBIN_U8("graphics/pokemon/gen_1/venusaur/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Venusaur[] = INCBIN_U8("graphics/pokemon/venusaur/footprint.1bpp"); + const u8 gMonFootprint_Venusaur[] = INCBIN_U8("graphics/pokemon/gen_1/venusaur/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_VenusaurF[] = INCBIN_U32("graphics/pokemon/venusaur/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_VenusaurF[] = INCBIN_U32("graphics/pokemon/venusaur/backf.4bpp.lz"); + const u32 gMonFrontPic_VenusaurF[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_VenusaurF[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/backf.4bpp.lz"); + #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/front.4bpp.lz"); - const u32 gMonPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/normal.gbapal.lz"); - const u32 gMonBackPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/shiny.gbapal.lz"); - const u8 gMonIcon_VenusaurMega[] = INCBIN_U8("graphics/pokemon/venusaur/mega/icon.4bpp"); + const u32 gMonFrontPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/mega/front.4bpp.lz"); + const u32 gMonPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/mega/normal.gbapal.lz"); + const u32 gMonBackPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/mega/shiny.gbapal.lz"); + const u8 gMonIcon_VenusaurMega[] = INCBIN_U8("graphics/pokemon/gen_1/venusaur/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_VenusaurGigantamax[] = INCBIN_U8("graphics/pokemon/venusaur/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/venusaur/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_VenusaurGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/venusaur/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_BULBASAUR #if P_FAMILY_CHARMANDER - const u32 gMonFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/anim_front.4bpp.lz"); - const u32 gMonPalette_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/normal.gbapal.lz"); - const u32 gMonBackPic_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/back.4bpp.lz"); - const u32 gMonShinyPalette_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/shiny.gbapal.lz"); - const u8 gMonIcon_Charmander[] = INCBIN_U8("graphics/pokemon/charmander/icon.4bpp"); + const u32 gMonFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/gen_1/charmander/anim_front.4bpp.lz"); + const u32 gMonPalette_Charmander[] = INCBIN_U32("graphics/pokemon/gen_1/charmander/normal.gbapal.lz"); + const u32 gMonBackPic_Charmander[] = INCBIN_U32("graphics/pokemon/gen_1/charmander/back.4bpp.lz"); + const u32 gMonShinyPalette_Charmander[] = INCBIN_U32("graphics/pokemon/gen_1/charmander/shiny.gbapal.lz"); + const u8 gMonIcon_Charmander[] = INCBIN_U8("graphics/pokemon/gen_1/charmander/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Charmander[] = INCBIN_U8("graphics/pokemon/charmander/footprint.1bpp"); + const u8 gMonFootprint_Charmander[] = INCBIN_U8("graphics/pokemon/gen_1/charmander/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/anim_front.4bpp.lz"); - const u32 gMonPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/normal.gbapal.lz"); - const u32 gMonBackPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/back.4bpp.lz"); - const u32 gMonShinyPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/shiny.gbapal.lz"); - const u8 gMonIcon_Charmeleon[] = INCBIN_U8("graphics/pokemon/charmeleon/icon.4bpp"); + const u32 gMonFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/gen_1/charmeleon/anim_front.4bpp.lz"); + const u32 gMonPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/gen_1/charmeleon/normal.gbapal.lz"); + const u32 gMonBackPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/gen_1/charmeleon/back.4bpp.lz"); + const u32 gMonShinyPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/gen_1/charmeleon/shiny.gbapal.lz"); + const u8 gMonIcon_Charmeleon[] = INCBIN_U8("graphics/pokemon/gen_1/charmeleon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Charmeleon[] = INCBIN_U8("graphics/pokemon/charmeleon/footprint.1bpp"); + const u8 gMonFootprint_Charmeleon[] = INCBIN_U8("graphics/pokemon/gen_1/charmeleon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/anim_front.4bpp.lz"); - const u32 gMonPalette_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/normal.gbapal.lz"); - const u32 gMonBackPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/back.4bpp.lz"); - const u32 gMonShinyPalette_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/shiny.gbapal.lz"); - const u8 gMonIcon_Charizard[] = INCBIN_U8("graphics/pokemon/charizard/icon.4bpp"); + const u32 gMonFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/anim_front.4bpp.lz"); + const u32 gMonPalette_Charizard[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/normal.gbapal.lz"); + const u32 gMonBackPic_Charizard[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/back.4bpp.lz"); + const u32 gMonShinyPalette_Charizard[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/shiny.gbapal.lz"); + const u8 gMonIcon_Charizard[] = INCBIN_U8("graphics/pokemon/gen_1/charizard/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Charizard[] = INCBIN_U8("graphics/pokemon/charizard/footprint.1bpp"); + const u8 gMonFootprint_Charizard[] = INCBIN_U8("graphics/pokemon/gen_1/charizard/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/front.4bpp.lz"); - const u32 gMonPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/normal.gbapal.lz"); - const u32 gMonBackPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/back.4bpp.lz"); - const u32 gMonShinyPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/shiny.gbapal.lz"); - const u8 gMonIcon_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/charizard/mega_x/icon.4bpp"); + const u32 gMonFrontPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_x/front.4bpp.lz"); + const u32 gMonPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_x/normal.gbapal.lz"); + const u32 gMonBackPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_x/back.4bpp.lz"); + const u32 gMonShinyPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_x/shiny.gbapal.lz"); + const u8 gMonIcon_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/gen_1/charizard/mega_x/icon.4bpp"); - const u32 gMonFrontPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/front.4bpp.lz"); - const u32 gMonPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/normal.gbapal.lz"); - const u32 gMonBackPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/back.4bpp.lz"); - const u32 gMonShinyPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/shiny.gbapal.lz"); - const u8 gMonIcon_CharizardMegaY[] = INCBIN_U8("graphics/pokemon/charizard/mega_y/icon.4bpp"); + const u32 gMonFrontPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_y/front.4bpp.lz"); + const u32 gMonPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_y/normal.gbapal.lz"); + const u32 gMonBackPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_y/back.4bpp.lz"); + const u32 gMonShinyPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/mega_y/shiny.gbapal.lz"); + const u8 gMonIcon_CharizardMegaY[] = INCBIN_U8("graphics/pokemon/gen_1/charizard/mega_y/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_CharizardGigantamax[] = INCBIN_U8("graphics/pokemon/charizard/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/charizard/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_CharizardGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/charizard/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHARMANDER #if P_FAMILY_SQUIRTLE - const u32 gMonFrontPic_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/anim_front.4bpp.lz"); - const u32 gMonPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/normal.gbapal.lz"); - const u32 gMonBackPic_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/back.4bpp.lz"); - const u32 gMonShinyPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/shiny.gbapal.lz"); - const u8 gMonIcon_Squirtle[] = INCBIN_U8("graphics/pokemon/squirtle/icon.4bpp"); + const u32 gMonFrontPic_Squirtle[] = INCBIN_U32("graphics/pokemon/gen_1/squirtle/anim_front.4bpp.lz"); + const u32 gMonPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/gen_1/squirtle/normal.gbapal.lz"); + const u32 gMonBackPic_Squirtle[] = INCBIN_U32("graphics/pokemon/gen_1/squirtle/back.4bpp.lz"); + const u32 gMonShinyPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/gen_1/squirtle/shiny.gbapal.lz"); + const u8 gMonIcon_Squirtle[] = INCBIN_U8("graphics/pokemon/gen_1/squirtle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Squirtle[] = INCBIN_U8("graphics/pokemon/squirtle/footprint.1bpp"); + const u8 gMonFootprint_Squirtle[] = INCBIN_U8("graphics/pokemon/gen_1/squirtle/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/anim_front.4bpp.lz"); - const u32 gMonPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/normal.gbapal.lz"); - const u32 gMonBackPic_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/back.4bpp.lz"); - const u32 gMonShinyPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/shiny.gbapal.lz"); - const u8 gMonIcon_Wartortle[] = INCBIN_U8("graphics/pokemon/wartortle/icon.4bpp"); + const u32 gMonFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/gen_1/wartortle/anim_front.4bpp.lz"); + const u32 gMonPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/gen_1/wartortle/normal.gbapal.lz"); + const u32 gMonBackPic_Wartortle[] = INCBIN_U32("graphics/pokemon/gen_1/wartortle/back.4bpp.lz"); + const u32 gMonShinyPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/gen_1/wartortle/shiny.gbapal.lz"); + const u8 gMonIcon_Wartortle[] = INCBIN_U8("graphics/pokemon/gen_1/wartortle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Wartortle[] = INCBIN_U8("graphics/pokemon/wartortle/footprint.1bpp"); + const u8 gMonFootprint_Wartortle[] = INCBIN_U8("graphics/pokemon/gen_1/wartortle/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/anim_front.4bpp.lz"); - const u32 gMonPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/normal.gbapal.lz"); - const u32 gMonBackPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/back.4bpp.lz"); - const u32 gMonShinyPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/shiny.gbapal.lz"); - const u8 gMonIcon_Blastoise[] = INCBIN_U8("graphics/pokemon/blastoise/icon.4bpp"); + const u32 gMonFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/anim_front.4bpp.lz"); + const u32 gMonPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/normal.gbapal.lz"); + const u32 gMonBackPic_Blastoise[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/back.4bpp.lz"); + const u32 gMonShinyPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/shiny.gbapal.lz"); + const u8 gMonIcon_Blastoise[] = INCBIN_U8("graphics/pokemon/gen_1/blastoise/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Blastoise[] = INCBIN_U8("graphics/pokemon/blastoise/footprint.1bpp"); + const u8 gMonFootprint_Blastoise[] = INCBIN_U8("graphics/pokemon/gen_1/blastoise/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/front.4bpp.lz"); - const u32 gMonPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/normal.gbapal.lz"); - const u32 gMonBackPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/shiny.gbapal.lz"); - const u8 gMonIcon_BlastoiseMega[] = INCBIN_U8("graphics/pokemon/blastoise/mega/icon.4bpp"); + const u32 gMonFrontPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/mega/front.4bpp.lz"); + const u32 gMonPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/mega/normal.gbapal.lz"); + const u32 gMonBackPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/mega/shiny.gbapal.lz"); + const u8 gMonIcon_BlastoiseMega[] = INCBIN_U8("graphics/pokemon/gen_1/blastoise/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_BlastoiseGigantamax[] = INCBIN_U8("graphics/pokemon/blastoise/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/blastoise/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_BlastoiseGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/blastoise/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SQUIRTLE #if P_FAMILY_CATERPIE - const u32 gMonFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/anim_front.4bpp.lz"); - const u32 gMonPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/normal.gbapal.lz"); - const u32 gMonBackPic_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/back.4bpp.lz"); - const u32 gMonShinyPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/shiny.gbapal.lz"); - const u8 gMonIcon_Caterpie[] = INCBIN_U8("graphics/pokemon/caterpie/icon.4bpp"); + const u32 gMonFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/gen_1/caterpie/anim_front.4bpp.lz"); + const u32 gMonPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/gen_1/caterpie/normal.gbapal.lz"); + const u32 gMonBackPic_Caterpie[] = INCBIN_U32("graphics/pokemon/gen_1/caterpie/back.4bpp.lz"); + const u32 gMonShinyPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/gen_1/caterpie/shiny.gbapal.lz"); + const u8 gMonIcon_Caterpie[] = INCBIN_U8("graphics/pokemon/gen_1/caterpie/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Caterpie[] = INCBIN_U8("graphics/pokemon/caterpie/footprint.1bpp"); + const u8 gMonFootprint_Caterpie[] = INCBIN_U8("graphics/pokemon/gen_1/caterpie/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/anim_front.4bpp.lz"); - const u32 gMonPalette_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/normal.gbapal.lz"); - const u32 gMonBackPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/back.4bpp.lz"); - const u32 gMonShinyPalette_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/shiny.gbapal.lz"); - const u8 gMonIcon_Metapod[] = INCBIN_U8( "graphics/pokemon/metapod/icon.4bpp"); + const u32 gMonFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/gen_1/metapod/anim_front.4bpp.lz"); + const u32 gMonPalette_Metapod[] = INCBIN_U32("graphics/pokemon/gen_1/metapod/normal.gbapal.lz"); + const u32 gMonBackPic_Metapod[] = INCBIN_U32("graphics/pokemon/gen_1/metapod/back.4bpp.lz"); + const u32 gMonShinyPalette_Metapod[] = INCBIN_U32("graphics/pokemon/gen_1/metapod/shiny.gbapal.lz"); + const u8 gMonIcon_Metapod[] = INCBIN_U8( "graphics/pokemon/gen_1/metapod/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Metapod[] = INCBIN_U8("graphics/pokemon/metapod/footprint.1bpp"); + const u8 gMonFootprint_Metapod[] = INCBIN_U8("graphics/pokemon/gen_1/metapod/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/anim_front.4bpp.lz"); - const u32 gMonPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/normal.gbapal.lz"); - const u32 gMonBackPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/back.4bpp.lz"); - const u32 gMonShinyPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/shiny.gbapal.lz"); - const u8 gMonIcon_Butterfree[] = INCBIN_U8("graphics/pokemon/butterfree/icon.4bpp"); + const u32 gMonFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/anim_front.4bpp.lz"); + const u32 gMonPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/normal.gbapal.lz"); + const u32 gMonBackPic_Butterfree[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/back.4bpp.lz"); + const u32 gMonShinyPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/shiny.gbapal.lz"); + const u8 gMonIcon_Butterfree[] = INCBIN_U8("graphics/pokemon/gen_1/butterfree/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Butterfree[] = INCBIN_U8("graphics/pokemon/butterfree/footprint.1bpp"); + const u8 gMonFootprint_Butterfree[] = INCBIN_U8("graphics/pokemon/gen_1/butterfree/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ButterfreeF[] = INCBIN_U32("graphics/pokemon/butterfree/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_ButterfreeF[] = INCBIN_U32("graphics/pokemon/butterfree/backf.4bpp.lz"); + const u32 gMonFrontPic_ButterfreeF[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_ButterfreeF[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/backf.4bpp.lz"); #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_ButterfreeGigantamax[] = INCBIN_U8("graphics/pokemon/butterfree/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/butterfree/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_ButterfreeGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/butterfree/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CATERPIE #if P_FAMILY_WEEDLE - const u32 gMonFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/anim_front.4bpp.lz"); - const u32 gMonPalette_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/normal.gbapal.lz"); - const u32 gMonBackPic_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/back.4bpp.lz"); - const u32 gMonShinyPalette_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/shiny.gbapal.lz"); - const u8 gMonIcon_Weedle[] = INCBIN_U8("graphics/pokemon/weedle/icon.4bpp"); + const u32 gMonFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/gen_1/weedle/anim_front.4bpp.lz"); + const u32 gMonPalette_Weedle[] = INCBIN_U32("graphics/pokemon/gen_1/weedle/normal.gbapal.lz"); + const u32 gMonBackPic_Weedle[] = INCBIN_U32("graphics/pokemon/gen_1/weedle/back.4bpp.lz"); + const u32 gMonShinyPalette_Weedle[] = INCBIN_U32("graphics/pokemon/gen_1/weedle/shiny.gbapal.lz"); + const u8 gMonIcon_Weedle[] = INCBIN_U8("graphics/pokemon/gen_1/weedle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Weedle[] = INCBIN_U8("graphics/pokemon/weedle/footprint.1bpp"); + const u8 gMonFootprint_Weedle[] = INCBIN_U8("graphics/pokemon/gen_1/weedle/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/anim_front.4bpp.lz"); - const u32 gMonPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/normal.gbapal.lz"); - const u32 gMonBackPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/back.4bpp.lz"); - const u32 gMonShinyPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/shiny.gbapal.lz"); - const u8 gMonIcon_Kakuna[] = INCBIN_U8("graphics/pokemon/kakuna/icon.4bpp"); + const u32 gMonFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/gen_1/kakuna/anim_front.4bpp.lz"); + const u32 gMonPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/gen_1/kakuna/normal.gbapal.lz"); + const u32 gMonBackPic_Kakuna[] = INCBIN_U32("graphics/pokemon/gen_1/kakuna/back.4bpp.lz"); + const u32 gMonShinyPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/gen_1/kakuna/shiny.gbapal.lz"); + const u8 gMonIcon_Kakuna[] = INCBIN_U8("graphics/pokemon/gen_1/kakuna/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kakuna[] = INCBIN_U8("graphics/pokemon/kakuna/footprint.1bpp"); + const u8 gMonFootprint_Kakuna[] = INCBIN_U8("graphics/pokemon/gen_1/kakuna/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/anim_front.4bpp.lz"); - const u32 gMonPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/normal.gbapal.lz"); - const u32 gMonBackPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/back.4bpp.lz"); - const u32 gMonShinyPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/shiny.gbapal.lz"); - const u8 gMonIcon_Beedrill[] = INCBIN_U8("graphics/pokemon/beedrill/icon.4bpp"); + const u32 gMonFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/anim_front.4bpp.lz"); + const u32 gMonPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/normal.gbapal.lz"); + const u32 gMonBackPic_Beedrill[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/back.4bpp.lz"); + const u32 gMonShinyPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/shiny.gbapal.lz"); + const u8 gMonIcon_Beedrill[] = INCBIN_U8("graphics/pokemon/gen_1/beedrill/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Beedrill[] = INCBIN_U8("graphics/pokemon/beedrill/footprint.1bpp"); + const u8 gMonFootprint_Beedrill[] = INCBIN_U8("graphics/pokemon/gen_1/beedrill/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/front.4bpp.lz"); - const u32 gMonPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/normal.gbapal.lz"); - const u32 gMonBackPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/shiny.gbapal.lz"); - const u8 gMonIcon_BeedrillMega[] = INCBIN_U8("graphics/pokemon/beedrill/mega/icon.4bpp"); + const u32 gMonFrontPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/mega/front.4bpp.lz"); + const u32 gMonPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/mega/normal.gbapal.lz"); + const u32 gMonBackPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/gen_1/beedrill/mega/shiny.gbapal.lz"); + const u8 gMonIcon_BeedrillMega[] = INCBIN_U8("graphics/pokemon/gen_1/beedrill/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_WEEDLE #if P_FAMILY_PIDGEY - const u32 gMonFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/anim_front.4bpp.lz"); - const u32 gMonPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/normal.gbapal.lz"); - const u32 gMonBackPic_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/back.4bpp.lz"); - const u32 gMonShinyPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/shiny.gbapal.lz"); - const u8 gMonIcon_Pidgey[] = INCBIN_U8("graphics/pokemon/pidgey/icon.4bpp"); + const u32 gMonFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/gen_1/pidgey/anim_front.4bpp.lz"); + const u32 gMonPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/gen_1/pidgey/normal.gbapal.lz"); + const u32 gMonBackPic_Pidgey[] = INCBIN_U32("graphics/pokemon/gen_1/pidgey/back.4bpp.lz"); + const u32 gMonShinyPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/gen_1/pidgey/shiny.gbapal.lz"); + const u8 gMonIcon_Pidgey[] = INCBIN_U8("graphics/pokemon/gen_1/pidgey/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pidgey[] = INCBIN_U8("graphics/pokemon/pidgey/footprint.1bpp"); + const u8 gMonFootprint_Pidgey[] = INCBIN_U8("graphics/pokemon/gen_1/pidgey/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/anim_front.4bpp.lz"); - const u32 gMonPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/normal.gbapal.lz"); - const u32 gMonBackPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/back.4bpp.lz"); - const u32 gMonShinyPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/shiny.gbapal.lz"); - const u8 gMonIcon_Pidgeotto[] = INCBIN_U8("graphics/pokemon/pidgeotto/icon.4bpp"); + const u32 gMonFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeotto/anim_front.4bpp.lz"); + const u32 gMonPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeotto/normal.gbapal.lz"); + const u32 gMonBackPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeotto/back.4bpp.lz"); + const u32 gMonShinyPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeotto/shiny.gbapal.lz"); + const u8 gMonIcon_Pidgeotto[] = INCBIN_U8("graphics/pokemon/gen_1/pidgeotto/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pidgeotto[] = INCBIN_U8("graphics/pokemon/pidgeotto/footprint.1bpp"); + const u8 gMonFootprint_Pidgeotto[] = INCBIN_U8("graphics/pokemon/gen_1/pidgeotto/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/anim_front.4bpp.lz"); - const u32 gMonPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/normal.gbapal.lz"); - const u32 gMonBackPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/back.4bpp.lz"); - const u32 gMonShinyPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/shiny.gbapal.lz"); - const u8 gMonIcon_Pidgeot[] = INCBIN_U8("graphics/pokemon/pidgeot/icon.4bpp"); + const u32 gMonFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/anim_front.4bpp.lz"); + const u32 gMonPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/normal.gbapal.lz"); + const u32 gMonBackPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/back.4bpp.lz"); + const u32 gMonShinyPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/shiny.gbapal.lz"); + const u8 gMonIcon_Pidgeot[] = INCBIN_U8("graphics/pokemon/gen_1/pidgeot/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pidgeot[] = INCBIN_U8("graphics/pokemon/pidgeot/footprint.1bpp"); + const u8 gMonFootprint_Pidgeot[] = INCBIN_U8("graphics/pokemon/gen_1/pidgeot/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/front.4bpp.lz"); - const u32 gMonPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/normal.gbapal.lz"); - const u32 gMonBackPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/shiny.gbapal.lz"); - const u8 gMonIcon_PidgeotMega[] = INCBIN_U8("graphics/pokemon/pidgeot/mega/icon.4bpp"); + const u32 gMonFrontPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/mega/front.4bpp.lz"); + const u32 gMonPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/mega/normal.gbapal.lz"); + const u32 gMonBackPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/gen_1/pidgeot/mega/shiny.gbapal.lz"); + const u8 gMonIcon_PidgeotMega[] = INCBIN_U8("graphics/pokemon/gen_1/pidgeot/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_PIDGEY #if P_FAMILY_RATTATA - const u32 gMonFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/anim_front.4bpp.lz"); - const u32 gMonPalette_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/normal.gbapal.lz"); - const u32 gMonBackPic_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/back.4bpp.lz"); - const u32 gMonShinyPalette_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/shiny.gbapal.lz"); - const u8 gMonIcon_Rattata[] = INCBIN_U8("graphics/pokemon/rattata/icon.4bpp"); + const u32 gMonFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/anim_front.4bpp.lz"); + const u32 gMonPalette_Rattata[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/normal.gbapal.lz"); + const u32 gMonBackPic_Rattata[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/back.4bpp.lz"); + const u32 gMonShinyPalette_Rattata[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/shiny.gbapal.lz"); + const u8 gMonIcon_Rattata[] = INCBIN_U8("graphics/pokemon/gen_1/rattata/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Rattata[] = INCBIN_U8("graphics/pokemon/rattata/footprint.1bpp"); + const u8 gMonFootprint_Rattata[] = INCBIN_U8("graphics/pokemon/gen_1/rattata/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_RattataF[] = INCBIN_U32("graphics/pokemon/rattata/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_RattataF[] = INCBIN_U32("graphics/pokemon/rattata/backf.4bpp.lz"); + const u32 gMonFrontPic_RattataF[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_RattataF[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/backf.4bpp.lz"); - const u32 gMonFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/anim_front.4bpp.lz"); - const u32 gMonPalette_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/normal.gbapal.lz"); - const u32 gMonBackPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/back.4bpp.lz"); - const u32 gMonShinyPalette_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/shiny.gbapal.lz"); - const u8 gMonIcon_Raticate[] = INCBIN_U8("graphics/pokemon/raticate/icon.4bpp"); + const u32 gMonFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/anim_front.4bpp.lz"); + const u32 gMonPalette_Raticate[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/normal.gbapal.lz"); + const u32 gMonBackPic_Raticate[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/back.4bpp.lz"); + const u32 gMonShinyPalette_Raticate[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/shiny.gbapal.lz"); + const u8 gMonIcon_Raticate[] = INCBIN_U8("graphics/pokemon/gen_1/raticate/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Raticate[] = INCBIN_U8("graphics/pokemon/raticate/footprint.1bpp"); + const u8 gMonFootprint_Raticate[] = INCBIN_U8("graphics/pokemon/gen_1/raticate/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_RaticateF[] = INCBIN_U32("graphics/pokemon/raticate/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_RaticateF[] = INCBIN_U32("graphics/pokemon/raticate/backf.4bpp.lz"); + const u32 gMonFrontPic_RaticateF[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_RaticateF[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/backf.4bpp.lz"); #if P_ALOLAN_FORMS - const u32 gMonFrontPic_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/front.4bpp.lz"); - const u32 gMonPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_RattataAlolan[] = INCBIN_U8("graphics/pokemon/rattata/alolan/icon.4bpp"); + const u32 gMonFrontPic_RattataAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/alolan/front.4bpp.lz"); + const u32 gMonPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_RattataAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/rattata/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_RattataAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/rattata/alolan/icon.4bpp"); - const u32 gMonFrontPic_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/front.4bpp.lz"); - const u32 gMonPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_RaticateAlolan[] = INCBIN_U8("graphics/pokemon/raticate/alolan/icon.4bpp"); + const u32 gMonFrontPic_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/alolan/front.4bpp.lz"); + const u32 gMonPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raticate/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_RaticateAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/raticate/alolan/icon.4bpp"); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_RATTATA #if P_FAMILY_SPEAROW - const u32 gMonFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/anim_front.4bpp.lz"); - const u32 gMonPalette_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/normal.gbapal.lz"); - const u32 gMonBackPic_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/back.4bpp.lz"); - const u32 gMonShinyPalette_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/shiny.gbapal.lz"); - const u8 gMonIcon_Spearow[] = INCBIN_U8("graphics/pokemon/spearow/icon.4bpp"); + const u32 gMonFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/gen_1/spearow/anim_front.4bpp.lz"); + const u32 gMonPalette_Spearow[] = INCBIN_U32("graphics/pokemon/gen_1/spearow/normal.gbapal.lz"); + const u32 gMonBackPic_Spearow[] = INCBIN_U32("graphics/pokemon/gen_1/spearow/back.4bpp.lz"); + const u32 gMonShinyPalette_Spearow[] = INCBIN_U32("graphics/pokemon/gen_1/spearow/shiny.gbapal.lz"); + const u8 gMonIcon_Spearow[] = INCBIN_U8("graphics/pokemon/gen_1/spearow/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Spearow[] = INCBIN_U8("graphics/pokemon/spearow/footprint.1bpp"); + const u8 gMonFootprint_Spearow[] = INCBIN_U8("graphics/pokemon/gen_1/spearow/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/anim_front.4bpp.lz"); - const u32 gMonPalette_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/normal.gbapal.lz"); - const u32 gMonBackPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/back.4bpp.lz"); - const u32 gMonShinyPalette_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/shiny.gbapal.lz"); - const u8 gMonIcon_Fearow[] = INCBIN_U8("graphics/pokemon/fearow/icon.4bpp"); + const u32 gMonFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/gen_1/fearow/anim_front.4bpp.lz"); + const u32 gMonPalette_Fearow[] = INCBIN_U32("graphics/pokemon/gen_1/fearow/normal.gbapal.lz"); + const u32 gMonBackPic_Fearow[] = INCBIN_U32("graphics/pokemon/gen_1/fearow/back.4bpp.lz"); + const u32 gMonShinyPalette_Fearow[] = INCBIN_U32("graphics/pokemon/gen_1/fearow/shiny.gbapal.lz"); + const u8 gMonIcon_Fearow[] = INCBIN_U8("graphics/pokemon/gen_1/fearow/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Fearow[] = INCBIN_U8("graphics/pokemon/fearow/footprint.1bpp"); + const u8 gMonFootprint_Fearow[] = INCBIN_U8("graphics/pokemon/gen_1/fearow/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SPEAROW #if P_FAMILY_EKANS - const u32 gMonFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/anim_front.4bpp.lz"); - const u32 gMonPalette_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/normal.gbapal.lz"); - const u32 gMonBackPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/back.4bpp.lz"); - const u32 gMonShinyPalette_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/shiny.gbapal.lz"); - const u8 gMonIcon_Ekans[] = INCBIN_U8("graphics/pokemon/ekans/icon.4bpp"); + const u32 gMonFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/gen_1/ekans/anim_front.4bpp.lz"); + const u32 gMonPalette_Ekans[] = INCBIN_U32("graphics/pokemon/gen_1/ekans/normal.gbapal.lz"); + const u32 gMonBackPic_Ekans[] = INCBIN_U32("graphics/pokemon/gen_1/ekans/back.4bpp.lz"); + const u32 gMonShinyPalette_Ekans[] = INCBIN_U32("graphics/pokemon/gen_1/ekans/shiny.gbapal.lz"); + const u8 gMonIcon_Ekans[] = INCBIN_U8("graphics/pokemon/gen_1/ekans/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ekans[] = INCBIN_U8("graphics/pokemon/ekans/footprint.1bpp"); + const u8 gMonFootprint_Ekans[] = INCBIN_U8("graphics/pokemon/gen_1/ekans/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/anim_front.4bpp.lz"); - const u32 gMonPalette_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/normal.gbapal.lz"); - const u32 gMonBackPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/back.4bpp.lz"); - const u32 gMonShinyPalette_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/shiny.gbapal.lz"); - const u8 gMonIcon_Arbok[] = INCBIN_U8("graphics/pokemon/arbok/icon.4bpp"); + const u32 gMonFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/gen_1/arbok/anim_front.4bpp.lz"); + const u32 gMonPalette_Arbok[] = INCBIN_U32("graphics/pokemon/gen_1/arbok/normal.gbapal.lz"); + const u32 gMonBackPic_Arbok[] = INCBIN_U32("graphics/pokemon/gen_1/arbok/back.4bpp.lz"); + const u32 gMonShinyPalette_Arbok[] = INCBIN_U32("graphics/pokemon/gen_1/arbok/shiny.gbapal.lz"); + const u8 gMonIcon_Arbok[] = INCBIN_U8("graphics/pokemon/gen_1/arbok/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Arbok[] = INCBIN_U8("graphics/pokemon/arbok/footprint.1bpp"); + const u8 gMonFootprint_Arbok[] = INCBIN_U8("graphics/pokemon/gen_1/arbok/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_EKANS #if P_FAMILY_PIKACHU #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/anim_front.4bpp.lz"); - const u32 gMonPalette_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/normal.gbapal.lz"); - const u32 gMonBackPic_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/back.4bpp.lz"); - const u32 gMonShinyPalette_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/shiny.gbapal.lz"); - const u8 gMonIcon_Pichu[] = INCBIN_U8("graphics/pokemon/pichu/icon.4bpp"); + const u32 gMonFrontPic_Pichu[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/anim_front.4bpp.lz"); + const u32 gMonPalette_Pichu[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/normal.gbapal.lz"); + const u32 gMonBackPic_Pichu[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/back.4bpp.lz"); + const u32 gMonShinyPalette_Pichu[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/shiny.gbapal.lz"); + const u8 gMonIcon_Pichu[] = INCBIN_U8("graphics/pokemon/gen_2/pichu/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pichu[] = INCBIN_U8("graphics/pokemon/pichu/footprint.1bpp"); + const u8 gMonFootprint_Pichu[] = INCBIN_U8("graphics/pokemon/gen_2/pichu/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/anim_front.4bpp.lz"); - const u32 gMonPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/normal.gbapal.lz"); - const u32 gMonBackPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/back.4bpp.lz"); - const u32 gMonShinyPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/shiny.gbapal.lz"); - const u8 gMonIcon_PichuSpikyEared[] = INCBIN_U8("graphics/pokemon/pichu/spiky_eared/icon.4bpp"); + const u32 gMonFrontPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/spiky_eared/anim_front.4bpp.lz"); + const u32 gMonPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/spiky_eared/normal.gbapal.lz"); + const u32 gMonBackPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/spiky_eared/back.4bpp.lz"); + const u32 gMonShinyPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/gen_2/pichu/spiky_eared/shiny.gbapal.lz"); + const u8 gMonIcon_PichuSpikyEared[] = INCBIN_U8("graphics/pokemon/gen_2/pichu/spiky_eared/icon.4bpp"); #endif //P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/anim_front.4bpp.lz"); - const u32 gMonPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/normal.gbapal.lz"); - const u32 gMonBackPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/back.4bpp.lz"); - const u32 gMonShinyPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/shiny.gbapal.lz"); - const u8 gMonIcon_Pikachu[] = INCBIN_U8("graphics/pokemon/pikachu/icon.4bpp"); + const u32 gMonFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/anim_front.4bpp.lz"); + const u32 gMonPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/normal.gbapal.lz"); + const u32 gMonBackPic_Pikachu[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/back.4bpp.lz"); + const u32 gMonShinyPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/shiny.gbapal.lz"); + const u8 gMonIcon_Pikachu[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pikachu[] = INCBIN_U8("graphics/pokemon/pikachu/footprint.1bpp"); + const u8 gMonFootprint_Pikachu[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_PikachuF[] = INCBIN_U32("graphics/pokemon/pikachu/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_PikachuF[] = INCBIN_U32("graphics/pokemon/pikachu/backf.4bpp.lz"); + const u32 gMonFrontPic_PikachuF[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_PikachuF[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/backf.4bpp.lz"); #if P_CUSTOM_GENDER_DIFF_ICONS - const u8 gMonIcon_PikachuF[] = INCBIN_U8("graphics/pokemon/pikachu/iconf.4bpp"); + const u8 gMonIcon_PikachuF[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/iconf.4bpp"); #endif #if P_COSPLAY_PIKACHU_FORMS - const u32 gMonFrontPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/front.4bpp.lz"); - const u32 gMonPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuCosplay[] = INCBIN_U8("graphics/pokemon/pikachu/cosplay/icon.4bpp"); + const u32 gMonFrontPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/cosplay/front.4bpp.lz"); + const u32 gMonPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/cosplay/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/cosplay/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/cosplay/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuCosplay[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/cosplay/icon.4bpp"); - const u32 gMonFrontPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/front.4bpp.lz"); - const u32 gMonPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuRockStar[] = INCBIN_U8("graphics/pokemon/pikachu/rock_star/icon.4bpp"); + const u32 gMonFrontPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/rock_star/front.4bpp.lz"); + const u32 gMonPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/rock_star/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/rock_star/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/rock_star/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuRockStar[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/rock_star/icon.4bpp"); - const u32 gMonFrontPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/front.4bpp.lz"); - const u32 gMonPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuBelle[] = INCBIN_U8("graphics/pokemon/pikachu/belle/icon.4bpp"); + const u32 gMonFrontPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/belle/front.4bpp.lz"); + const u32 gMonPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/belle/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/belle/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/belle/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuBelle[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/belle/icon.4bpp"); - const u32 gMonFrontPic_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/pikachu/pop_star/front.4bpp.lz"); - const u32 gMonPalette_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/pikachu/pop_star/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/pikachu/pop_star/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/pikachu/pop_star/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuPopStar[] = INCBIN_U8("graphics/pokemon/pikachu/pop_star/icon.4bpp"); + const u32 gMonFrontPic_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/pop_star/front.4bpp.lz"); + const u32 gMonPalette_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/pop_star/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/pop_star/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/pop_star/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuPopStar[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/pop_star/icon.4bpp"); - const u32 gMonFrontPic_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/ph_d/front.4bpp.lz"); - const u32 gMonPalette_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/ph_d/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/ph_d/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/ph_d/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuPhD[] = INCBIN_U8("graphics/pokemon/pikachu/ph_d/icon.4bpp"); + const u32 gMonFrontPic_PikachuPhD[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/ph_d/front.4bpp.lz"); + const u32 gMonPalette_PikachuPhD[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/ph_d/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuPhD[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/ph_d/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuPhD[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/ph_d/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuPhD[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/ph_d/icon.4bpp"); - const u32 gMonFrontPic_PikachuLibre[] = INCBIN_U32("graphics/pokemon/pikachu/libre/front.4bpp.lz"); - const u32 gMonPalette_PikachuLibre[] = INCBIN_U32("graphics/pokemon/pikachu/libre/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuLibre[] = INCBIN_U32("graphics/pokemon/pikachu/libre/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuLibre[] = INCBIN_U32("graphics/pokemon/pikachu/libre/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuLibre[] = INCBIN_U8("graphics/pokemon/pikachu/libre/icon.4bpp"); + const u32 gMonFrontPic_PikachuLibre[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/libre/front.4bpp.lz"); + const u32 gMonPalette_PikachuLibre[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/libre/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuLibre[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/libre/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuLibre[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/libre/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuLibre[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/libre/icon.4bpp"); #endif //P_COSPLAY_PIKACHU_FORMS #if P_CAP_PIKACHU_FORMS - const u32 gMonFrontPic_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/pikachu/original_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/pikachu/original_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/pikachu/original_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/pikachu/original_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuOriginalCap[] = INCBIN_U8("graphics/pokemon/pikachu/original_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/original_cap/front.4bpp.lz"); + const u32 gMonPalette_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/original_cap/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/original_cap/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/original_cap/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuOriginalCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/original_cap/icon.4bpp"); - const u32 gMonFrontPic_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuHoennCap[] = INCBIN_U8("graphics/pokemon/pikachu/hoenn_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/hoenn_cap/front.4bpp.lz"); + const u32 gMonPalette_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/hoenn_cap/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/hoenn_cap/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/hoenn_cap/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuHoennCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/hoenn_cap/icon.4bpp"); - const u32 gMonFrontPic_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuSinnohCap[] = INCBIN_U8("graphics/pokemon/pikachu/sinnoh_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/sinnoh_cap/front.4bpp.lz"); + const u32 gMonPalette_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/sinnoh_cap/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/sinnoh_cap/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/sinnoh_cap/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuSinnohCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/sinnoh_cap/icon.4bpp"); - const u32 gMonFrontPic_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/pikachu/unova_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/pikachu/unova_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/pikachu/unova_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/pikachu/unova_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuUnovaCap[] = INCBIN_U8("graphics/pokemon/pikachu/unova_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/unova_cap/front.4bpp.lz"); + const u32 gMonPalette_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/unova_cap/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/unova_cap/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/unova_cap/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuUnovaCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/unova_cap/icon.4bpp"); - const u32 gMonFrontPic_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/pikachu/kalos_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/pikachu/kalos_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/pikachu/kalos_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/pikachu/kalos_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuKalosCap[] = INCBIN_U8("graphics/pokemon/pikachu/kalos_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/kalos_cap/front.4bpp.lz"); + const u32 gMonPalette_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/kalos_cap/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/kalos_cap/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/kalos_cap/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuKalosCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/kalos_cap/icon.4bpp"); - const u32 gMonFrontPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/alola_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/alola_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/alola_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/alola_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuAlolaCap[] = INCBIN_U8("graphics/pokemon/pikachu/alola_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/alola_cap/front.4bpp.lz"); + const u32 gMonPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/alola_cap/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/alola_cap/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/alola_cap/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuAlolaCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/alola_cap/icon.4bpp"); - const u32 gMonFrontPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuPartnerCap[] = INCBIN_U8("graphics/pokemon/pikachu/partner_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/partner_cap/front.4bpp.lz"); + const u32 gMonPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/partner_cap/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/partner_cap/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/partner_cap/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuPartnerCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/partner_cap/icon.4bpp"); - const u32 gMonFrontPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuWorldCap[] = INCBIN_U8("graphics/pokemon/pikachu/world_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/world_cap/front.4bpp.lz"); + const u32 gMonPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/world_cap/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/world_cap/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/world_cap/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuWorldCap[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/world_cap/icon.4bpp"); #endif //P_CAP_PIKACHU_FORMS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuGigantamax[] = INCBIN_U8("graphics/pokemon/pikachu/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/pikachu/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/pikachu/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/anim_front.4bpp.lz"); - const u32 gMonPalette_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/normal.gbapal.lz"); - const u32 gMonBackPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/back.4bpp.lz"); - const u32 gMonShinyPalette_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/shiny.gbapal.lz"); - const u8 gMonIcon_Raichu[] = INCBIN_U8("graphics/pokemon/raichu/icon.4bpp"); + const u32 gMonFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/anim_front.4bpp.lz"); + const u32 gMonPalette_Raichu[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/normal.gbapal.lz"); + const u32 gMonBackPic_Raichu[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/back.4bpp.lz"); + const u32 gMonShinyPalette_Raichu[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/shiny.gbapal.lz"); + const u8 gMonIcon_Raichu[] = INCBIN_U8("graphics/pokemon/gen_1/raichu/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Raichu[] = INCBIN_U8("graphics/pokemon/raichu/footprint.1bpp"); + const u8 gMonFootprint_Raichu[] = INCBIN_U8("graphics/pokemon/gen_1/raichu/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_RaichuF[] = INCBIN_U32("graphics/pokemon/raichu/anim_frontf.4bpp.lz"); + const u32 gMonFrontPic_RaichuF[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/anim_frontf.4bpp.lz"); #if P_ALOLAN_FORMS - const u32 gMonFrontPic_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/front.4bpp.lz"); - const u32 gMonPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_RaichuAlolan[] = INCBIN_U8("graphics/pokemon/raichu/alolan/icon.4bpp"); + const u32 gMonFrontPic_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/alolan/front.4bpp.lz"); + const u32 gMonPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/raichu/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_RaichuAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/raichu/alolan/icon.4bpp"); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_PIKACHU #if P_FAMILY_SANDSHREW - const u32 gMonFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/anim_front.4bpp.lz"); - const u32 gMonPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/normal.gbapal.lz"); - const u32 gMonBackPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/back.4bpp.lz"); - const u32 gMonShinyPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/shiny.gbapal.lz"); - const u8 gMonIcon_Sandshrew[] = INCBIN_U8("graphics/pokemon/sandshrew/icon.4bpp"); + const u32 gMonFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/anim_front.4bpp.lz"); + const u32 gMonPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/normal.gbapal.lz"); + const u32 gMonBackPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/back.4bpp.lz"); + const u32 gMonShinyPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/shiny.gbapal.lz"); + const u8 gMonIcon_Sandshrew[] = INCBIN_U8("graphics/pokemon/gen_1/sandshrew/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sandshrew[] = INCBIN_U8("graphics/pokemon/sandshrew/footprint.1bpp"); + const u8 gMonFootprint_Sandshrew[] = INCBIN_U8("graphics/pokemon/gen_1/sandshrew/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/anim_front.4bpp.lz"); - const u32 gMonPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/normal.gbapal.lz"); - const u32 gMonBackPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/back.4bpp.lz"); - const u32 gMonShinyPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/shiny.gbapal.lz"); - const u8 gMonIcon_Sandslash[] = INCBIN_U8("graphics/pokemon/sandslash/icon.4bpp"); + const u32 gMonFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/anim_front.4bpp.lz"); + const u32 gMonPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/normal.gbapal.lz"); + const u32 gMonBackPic_Sandslash[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/back.4bpp.lz"); + const u32 gMonShinyPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/shiny.gbapal.lz"); + const u8 gMonIcon_Sandslash[] = INCBIN_U8("graphics/pokemon/gen_1/sandslash/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sandslash[] = INCBIN_U8("graphics/pokemon/sandslash/footprint.1bpp"); + const u8 gMonFootprint_Sandslash[] = INCBIN_U8("graphics/pokemon/gen_1/sandslash/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/front.4bpp.lz"); - const u32 gMonPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_SandshrewAlolan[] = INCBIN_U8("graphics/pokemon/sandshrew/alolan/icon.4bpp"); + const u32 gMonFrontPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/alolan/front.4bpp.lz"); + const u32 gMonPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandshrew/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_SandshrewAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/sandshrew/alolan/icon.4bpp"); - const u32 gMonFrontPic_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/front.4bpp.lz"); - const u32 gMonPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_SandslashAlolan[] = INCBIN_U8("graphics/pokemon/sandslash/alolan/icon.4bpp"); + const u32 gMonFrontPic_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/alolan/front.4bpp.lz"); + const u32 gMonPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/sandslash/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_SandslashAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/sandslash/alolan/icon.4bpp"); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_SANDSHREW #if P_FAMILY_NIDORAN - const u32 gMonFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/anim_front.4bpp.lz"); - const u32 gMonPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/normal.gbapal.lz"); - const u32 gMonBackPic_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/back.4bpp.lz"); - const u32 gMonShinyPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/shiny.gbapal.lz"); - const u8 gMonIcon_NidoranF[] = INCBIN_U8("graphics/pokemon/nidoran_f/icon.4bpp"); + const u32 gMonFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_f/anim_front.4bpp.lz"); + const u32 gMonPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_f/normal.gbapal.lz"); + const u32 gMonBackPic_NidoranF[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_f/back.4bpp.lz"); + const u32 gMonShinyPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_f/shiny.gbapal.lz"); + const u8 gMonIcon_NidoranF[] = INCBIN_U8("graphics/pokemon/gen_1/nidoran_f/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_NidoranF[] = INCBIN_U8("graphics/pokemon/nidoran_f/footprint.1bpp"); + const u8 gMonFootprint_NidoranF[] = INCBIN_U8("graphics/pokemon/gen_1/nidoran_f/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/anim_front.4bpp.lz"); - const u32 gMonPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/normal.gbapal.lz"); - const u32 gMonBackPic_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/back.4bpp.lz"); - const u32 gMonShinyPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/shiny.gbapal.lz"); - const u8 gMonIcon_Nidorina[] = INCBIN_U8("graphics/pokemon/nidorina/icon.4bpp"); + const u32 gMonFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/gen_1/nidorina/anim_front.4bpp.lz"); + const u32 gMonPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/gen_1/nidorina/normal.gbapal.lz"); + const u32 gMonBackPic_Nidorina[] = INCBIN_U32("graphics/pokemon/gen_1/nidorina/back.4bpp.lz"); + const u32 gMonShinyPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/gen_1/nidorina/shiny.gbapal.lz"); + const u8 gMonIcon_Nidorina[] = INCBIN_U8("graphics/pokemon/gen_1/nidorina/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Nidorina[] = INCBIN_U8("graphics/pokemon/nidorina/footprint.1bpp"); + const u8 gMonFootprint_Nidorina[] = INCBIN_U8("graphics/pokemon/gen_1/nidorina/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/anim_front.4bpp.lz"); - const u32 gMonPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/normal.gbapal.lz"); - const u32 gMonBackPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/back.4bpp.lz"); - const u32 gMonShinyPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/shiny.gbapal.lz"); - const u8 gMonIcon_Nidoqueen[] = INCBIN_U8("graphics/pokemon/nidoqueen/icon.4bpp"); + const u32 gMonFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/gen_1/nidoqueen/anim_front.4bpp.lz"); + const u32 gMonPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/gen_1/nidoqueen/normal.gbapal.lz"); + const u32 gMonBackPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/gen_1/nidoqueen/back.4bpp.lz"); + const u32 gMonShinyPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/gen_1/nidoqueen/shiny.gbapal.lz"); + const u8 gMonIcon_Nidoqueen[] = INCBIN_U8("graphics/pokemon/gen_1/nidoqueen/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Nidoqueen[] = INCBIN_U8("graphics/pokemon/nidoqueen/footprint.1bpp"); + const u8 gMonFootprint_Nidoqueen[] = INCBIN_U8("graphics/pokemon/gen_1/nidoqueen/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/anim_front.4bpp.lz"); - const u32 gMonPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/normal.gbapal.lz"); - const u32 gMonBackPic_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/back.4bpp.lz"); - const u32 gMonShinyPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/shiny.gbapal.lz"); - const u8 gMonIcon_NidoranM[] = INCBIN_U8("graphics/pokemon/nidoran_m/icon.4bpp"); + const u32 gMonFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_m/anim_front.4bpp.lz"); + const u32 gMonPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_m/normal.gbapal.lz"); + const u32 gMonBackPic_NidoranM[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_m/back.4bpp.lz"); + const u32 gMonShinyPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/gen_1/nidoran_m/shiny.gbapal.lz"); + const u8 gMonIcon_NidoranM[] = INCBIN_U8("graphics/pokemon/gen_1/nidoran_m/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_NidoranM[] = INCBIN_U8("graphics/pokemon/nidoran_m/footprint.1bpp"); + const u8 gMonFootprint_NidoranM[] = INCBIN_U8("graphics/pokemon/gen_1/nidoran_m/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/anim_front.4bpp.lz"); - const u32 gMonPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/normal.gbapal.lz"); - const u32 gMonBackPic_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/back.4bpp.lz"); - const u32 gMonShinyPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/shiny.gbapal.lz"); - const u8 gMonIcon_Nidorino[] = INCBIN_U8("graphics/pokemon/nidorino/icon.4bpp"); + const u32 gMonFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/gen_1/nidorino/anim_front.4bpp.lz"); + const u32 gMonPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/gen_1/nidorino/normal.gbapal.lz"); + const u32 gMonBackPic_Nidorino[] = INCBIN_U32("graphics/pokemon/gen_1/nidorino/back.4bpp.lz"); + const u32 gMonShinyPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/gen_1/nidorino/shiny.gbapal.lz"); + const u8 gMonIcon_Nidorino[] = INCBIN_U8("graphics/pokemon/gen_1/nidorino/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Nidorino[] = INCBIN_U8("graphics/pokemon/nidorino/footprint.1bpp"); + const u8 gMonFootprint_Nidorino[] = INCBIN_U8("graphics/pokemon/gen_1/nidorino/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/anim_front.4bpp.lz"); - const u32 gMonPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/normal.gbapal.lz"); - const u32 gMonBackPic_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/back.4bpp.lz"); - const u32 gMonShinyPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/shiny.gbapal.lz"); - const u8 gMonIcon_Nidoking[] = INCBIN_U8("graphics/pokemon/nidoking/icon.4bpp"); + const u32 gMonFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/gen_1/nidoking/anim_front.4bpp.lz"); + const u32 gMonPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/gen_1/nidoking/normal.gbapal.lz"); + const u32 gMonBackPic_Nidoking[] = INCBIN_U32("graphics/pokemon/gen_1/nidoking/back.4bpp.lz"); + const u32 gMonShinyPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/gen_1/nidoking/shiny.gbapal.lz"); + const u8 gMonIcon_Nidoking[] = INCBIN_U8("graphics/pokemon/gen_1/nidoking/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Nidoking[] = INCBIN_U8("graphics/pokemon/nidoking/footprint.1bpp"); + const u8 gMonFootprint_Nidoking[] = INCBIN_U8("graphics/pokemon/gen_1/nidoking/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_NIDORAN #if P_FAMILY_CLEFAIRY #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/anim_front.4bpp.lz"); - const u32 gMonPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/normal.gbapal.lz"); - const u32 gMonBackPic_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/back.4bpp.lz"); - const u32 gMonShinyPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/shiny.gbapal.lz"); - const u8 gMonIcon_Cleffa[] = INCBIN_U8("graphics/pokemon/cleffa/icon.4bpp"); + const u32 gMonFrontPic_Cleffa[] = INCBIN_U32("graphics/pokemon/gen_2/cleffa/anim_front.4bpp.lz"); + const u32 gMonPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/gen_2/cleffa/normal.gbapal.lz"); + const u32 gMonBackPic_Cleffa[] = INCBIN_U32("graphics/pokemon/gen_2/cleffa/back.4bpp.lz"); + const u32 gMonShinyPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/gen_2/cleffa/shiny.gbapal.lz"); + const u8 gMonIcon_Cleffa[] = INCBIN_U8("graphics/pokemon/gen_2/cleffa/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cleffa[] = INCBIN_U8("graphics/pokemon/cleffa/footprint.1bpp"); + const u8 gMonFootprint_Cleffa[] = INCBIN_U8("graphics/pokemon/gen_2/cleffa/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/anim_front.4bpp.lz"); - const u32 gMonPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/normal.gbapal.lz"); - const u32 gMonBackPic_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/back.4bpp.lz"); - const u32 gMonShinyPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/shiny.gbapal.lz"); - const u8 gMonIcon_Clefairy[] = INCBIN_U8("graphics/pokemon/clefairy/icon.4bpp"); + const u32 gMonFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/gen_1/clefairy/anim_front.4bpp.lz"); + const u32 gMonPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/gen_1/clefairy/normal.gbapal.lz"); + const u32 gMonBackPic_Clefairy[] = INCBIN_U32("graphics/pokemon/gen_1/clefairy/back.4bpp.lz"); + const u32 gMonShinyPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/gen_1/clefairy/shiny.gbapal.lz"); + const u8 gMonIcon_Clefairy[] = INCBIN_U8("graphics/pokemon/gen_1/clefairy/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Clefairy[] = INCBIN_U8("graphics/pokemon/clefairy/footprint.1bpp"); + const u8 gMonFootprint_Clefairy[] = INCBIN_U8("graphics/pokemon/gen_1/clefairy/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/anim_front.4bpp.lz"); - const u32 gMonPalette_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/normal.gbapal.lz"); - const u32 gMonBackPic_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/back.4bpp.lz"); - const u32 gMonShinyPalette_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/shiny.gbapal.lz"); - const u8 gMonIcon_Clefable[] = INCBIN_U8("graphics/pokemon/clefable/icon.4bpp"); + const u32 gMonFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/gen_1/clefable/anim_front.4bpp.lz"); + const u32 gMonPalette_Clefable[] = INCBIN_U32("graphics/pokemon/gen_1/clefable/normal.gbapal.lz"); + const u32 gMonBackPic_Clefable[] = INCBIN_U32("graphics/pokemon/gen_1/clefable/back.4bpp.lz"); + const u32 gMonShinyPalette_Clefable[] = INCBIN_U32("graphics/pokemon/gen_1/clefable/shiny.gbapal.lz"); + const u8 gMonIcon_Clefable[] = INCBIN_U8("graphics/pokemon/gen_1/clefable/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Clefable[] = INCBIN_U8("graphics/pokemon/clefable/footprint.1bpp"); + const u8 gMonFootprint_Clefable[] = INCBIN_U8("graphics/pokemon/gen_1/clefable/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CLEFAIRY #if P_FAMILY_VULPIX - const u32 gMonFrontPic_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/anim_front.4bpp.lz"); - const u32 gMonPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/normal.gbapal.lz"); - const u32 gMonBackPic_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/back.4bpp.lz"); - const u32 gMonShinyPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/shiny.gbapal.lz"); - const u8 gMonIcon_Vulpix[] = INCBIN_U8("graphics/pokemon/vulpix/icon.4bpp"); + const u32 gMonFrontPic_Vulpix[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/anim_front.4bpp.lz"); + const u32 gMonPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/normal.gbapal.lz"); + const u32 gMonBackPic_Vulpix[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/back.4bpp.lz"); + const u32 gMonShinyPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/shiny.gbapal.lz"); + const u8 gMonIcon_Vulpix[] = INCBIN_U8("graphics/pokemon/gen_1/vulpix/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Vulpix[] = INCBIN_U8("graphics/pokemon/vulpix/footprint.1bpp"); + const u8 gMonFootprint_Vulpix[] = INCBIN_U8("graphics/pokemon/gen_1/vulpix/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/anim_front.4bpp.lz"); - const u32 gMonPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/normal.gbapal.lz"); - const u32 gMonBackPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/back.4bpp.lz"); - const u32 gMonShinyPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/shiny.gbapal.lz"); - const u8 gMonIcon_Ninetales[] = INCBIN_U8("graphics/pokemon/ninetales/icon.4bpp"); + const u32 gMonFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/anim_front.4bpp.lz"); + const u32 gMonPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/normal.gbapal.lz"); + const u32 gMonBackPic_Ninetales[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/back.4bpp.lz"); + const u32 gMonShinyPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/shiny.gbapal.lz"); + const u8 gMonIcon_Ninetales[] = INCBIN_U8("graphics/pokemon/gen_1/ninetales/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ninetales[] = INCBIN_U8("graphics/pokemon/ninetales/footprint.1bpp"); + const u8 gMonFootprint_Ninetales[] = INCBIN_U8("graphics/pokemon/gen_1/ninetales/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/front.4bpp.lz"); - const u32 gMonPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_VulpixAlolan[] = INCBIN_U8("graphics/pokemon/vulpix/alolan/icon.4bpp"); + const u32 gMonFrontPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/alolan/front.4bpp.lz"); + const u32 gMonPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/vulpix/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_VulpixAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/vulpix/alolan/icon.4bpp"); - const u32 gMonFrontPic_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/front.4bpp.lz"); - const u32 gMonPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_NinetalesAlolan[] = INCBIN_U8("graphics/pokemon/ninetales/alolan/icon.4bpp"); + const u32 gMonFrontPic_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/alolan/front.4bpp.lz"); + const u32 gMonPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/ninetales/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_NinetalesAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/ninetales/alolan/icon.4bpp"); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_VULPIX #if P_FAMILY_JIGGLYPUFF #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/anim_front.4bpp.lz"); - const u32 gMonPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/normal.gbapal.lz"); - const u32 gMonBackPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/back.4bpp.lz"); - const u32 gMonShinyPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/shiny.gbapal.lz"); - const u8 gMonIcon_Igglybuff[] = INCBIN_U8("graphics/pokemon/igglybuff/icon.4bpp"); + const u32 gMonFrontPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/gen_2/igglybuff/anim_front.4bpp.lz"); + const u32 gMonPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/gen_2/igglybuff/normal.gbapal.lz"); + const u32 gMonBackPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/gen_2/igglybuff/back.4bpp.lz"); + const u32 gMonShinyPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/gen_2/igglybuff/shiny.gbapal.lz"); + const u8 gMonIcon_Igglybuff[] = INCBIN_U8("graphics/pokemon/gen_2/igglybuff/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Igglybuff[] = INCBIN_U8("graphics/pokemon/igglybuff/footprint.1bpp"); + const u8 gMonFootprint_Igglybuff[] = INCBIN_U8("graphics/pokemon/gen_2/igglybuff/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/anim_front.4bpp.lz"); - const u32 gMonPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/normal.gbapal.lz"); - const u32 gMonBackPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/back.4bpp.lz"); - const u32 gMonShinyPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/shiny.gbapal.lz"); - const u8 gMonIcon_Jigglypuff[] = INCBIN_U8("graphics/pokemon/jigglypuff/icon.4bpp"); + const u32 gMonFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/gen_1/jigglypuff/anim_front.4bpp.lz"); + const u32 gMonPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/gen_1/jigglypuff/normal.gbapal.lz"); + const u32 gMonBackPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/gen_1/jigglypuff/back.4bpp.lz"); + const u32 gMonShinyPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/gen_1/jigglypuff/shiny.gbapal.lz"); + const u8 gMonIcon_Jigglypuff[] = INCBIN_U8("graphics/pokemon/gen_1/jigglypuff/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Jigglypuff[] = INCBIN_U8("graphics/pokemon/jigglypuff/footprint.1bpp"); + const u8 gMonFootprint_Jigglypuff[] = INCBIN_U8("graphics/pokemon/gen_1/jigglypuff/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/anim_front.4bpp.lz"); - const u32 gMonPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/normal.gbapal.lz"); - const u32 gMonBackPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/back.4bpp.lz"); - const u32 gMonShinyPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/shiny.gbapal.lz"); - const u8 gMonIcon_Wigglytuff[] = INCBIN_U8("graphics/pokemon/wigglytuff/icon.4bpp"); + const u32 gMonFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/gen_1/wigglytuff/anim_front.4bpp.lz"); + const u32 gMonPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/gen_1/wigglytuff/normal.gbapal.lz"); + const u32 gMonBackPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/gen_1/wigglytuff/back.4bpp.lz"); + const u32 gMonShinyPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/gen_1/wigglytuff/shiny.gbapal.lz"); + const u8 gMonIcon_Wigglytuff[] = INCBIN_U8("graphics/pokemon/gen_1/wigglytuff/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Wigglytuff[] = INCBIN_U8("graphics/pokemon/wigglytuff/footprint.1bpp"); + const u8 gMonFootprint_Wigglytuff[] = INCBIN_U8("graphics/pokemon/gen_1/wigglytuff/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_JIGGLYPUFF #if P_FAMILY_ZUBAT - const u32 gMonFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/anim_front.4bpp.lz"); - const u32 gMonPalette_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/normal.gbapal.lz"); - const u32 gMonBackPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/back.4bpp.lz"); - const u32 gMonShinyPalette_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/shiny.gbapal.lz"); - const u8 gMonIcon_Zubat[] = INCBIN_U8("graphics/pokemon/zubat/icon.4bpp"); + const u32 gMonFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/gen_1/zubat/anim_front.4bpp.lz"); + const u32 gMonPalette_Zubat[] = INCBIN_U32("graphics/pokemon/gen_1/zubat/normal.gbapal.lz"); + const u32 gMonBackPic_Zubat[] = INCBIN_U32("graphics/pokemon/gen_1/zubat/back.4bpp.lz"); + const u32 gMonShinyPalette_Zubat[] = INCBIN_U32("graphics/pokemon/gen_1/zubat/shiny.gbapal.lz"); + const u8 gMonIcon_Zubat[] = INCBIN_U8("graphics/pokemon/gen_1/zubat/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Zubat[] = INCBIN_U8("graphics/pokemon/zubat/footprint.1bpp"); + const u8 gMonFootprint_Zubat[] = INCBIN_U8("graphics/pokemon/gen_1/zubat/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ZubatF[] = INCBIN_U32("graphics/pokemon/zubat/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_ZubatF[] = INCBIN_U32("graphics/pokemon/zubat/backf.4bpp.lz"); + const u32 gMonFrontPic_ZubatF[] = INCBIN_U32("graphics/pokemon/gen_1/zubat/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_ZubatF[] = INCBIN_U32("graphics/pokemon/gen_1/zubat/backf.4bpp.lz"); - const u32 gMonFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/anim_front.4bpp.lz"); - const u32 gMonPalette_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/normal.gbapal.lz"); - const u32 gMonBackPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/back.4bpp.lz"); - const u32 gMonShinyPalette_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/shiny.gbapal.lz"); - const u8 gMonIcon_Golbat[] = INCBIN_U8("graphics/pokemon/golbat/icon.4bpp"); + const u32 gMonFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/gen_1/golbat/anim_front.4bpp.lz"); + const u32 gMonPalette_Golbat[] = INCBIN_U32("graphics/pokemon/gen_1/golbat/normal.gbapal.lz"); + const u32 gMonBackPic_Golbat[] = INCBIN_U32("graphics/pokemon/gen_1/golbat/back.4bpp.lz"); + const u32 gMonShinyPalette_Golbat[] = INCBIN_U32("graphics/pokemon/gen_1/golbat/shiny.gbapal.lz"); + const u8 gMonIcon_Golbat[] = INCBIN_U8("graphics/pokemon/gen_1/golbat/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Golbat[] = INCBIN_U8("graphics/pokemon/golbat/footprint.1bpp"); + const u8 gMonFootprint_Golbat[] = INCBIN_U8("graphics/pokemon/gen_1/golbat/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GolbatF[] = INCBIN_U32("graphics/pokemon/golbat/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_GolbatF[] = INCBIN_U32("graphics/pokemon/golbat/backf.4bpp.lz"); + const u32 gMonFrontPic_GolbatF[] = INCBIN_U32("graphics/pokemon/gen_1/golbat/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_GolbatF[] = INCBIN_U32("graphics/pokemon/gen_1/golbat/backf.4bpp.lz"); #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/anim_front.4bpp.lz"); - const u32 gMonPalette_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/normal.gbapal.lz"); - const u32 gMonBackPic_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/back.4bpp.lz"); - const u32 gMonShinyPalette_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/shiny.gbapal.lz"); - const u8 gMonIcon_Crobat[] = INCBIN_U8("graphics/pokemon/crobat/icon.4bpp"); + const u32 gMonFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/gen_2/crobat/anim_front.4bpp.lz"); + const u32 gMonPalette_Crobat[] = INCBIN_U32("graphics/pokemon/gen_2/crobat/normal.gbapal.lz"); + const u32 gMonBackPic_Crobat[] = INCBIN_U32("graphics/pokemon/gen_2/crobat/back.4bpp.lz"); + const u32 gMonShinyPalette_Crobat[] = INCBIN_U32("graphics/pokemon/gen_2/crobat/shiny.gbapal.lz"); + const u8 gMonIcon_Crobat[] = INCBIN_U8("graphics/pokemon/gen_2/crobat/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Crobat[] = INCBIN_U8("graphics/pokemon/crobat/footprint.1bpp"); + const u8 gMonFootprint_Crobat[] = INCBIN_U8("graphics/pokemon/gen_2/crobat/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_ZUBAT #if P_FAMILY_ODDISH - const u32 gMonFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/anim_front.4bpp.lz"); - const u32 gMonPalette_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/normal.gbapal.lz"); - const u32 gMonBackPic_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/back.4bpp.lz"); - const u32 gMonShinyPalette_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/shiny.gbapal.lz"); - const u8 gMonIcon_Oddish[] = INCBIN_U8("graphics/pokemon/oddish/icon.4bpp"); + const u32 gMonFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/gen_1/oddish/anim_front.4bpp.lz"); + const u32 gMonPalette_Oddish[] = INCBIN_U32("graphics/pokemon/gen_1/oddish/normal.gbapal.lz"); + const u32 gMonBackPic_Oddish[] = INCBIN_U32("graphics/pokemon/gen_1/oddish/back.4bpp.lz"); + const u32 gMonShinyPalette_Oddish[] = INCBIN_U32("graphics/pokemon/gen_1/oddish/shiny.gbapal.lz"); + const u8 gMonIcon_Oddish[] = INCBIN_U8("graphics/pokemon/gen_1/oddish/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Oddish[] = INCBIN_U8("graphics/pokemon/oddish/footprint.1bpp"); + const u8 gMonFootprint_Oddish[] = INCBIN_U8("graphics/pokemon/gen_1/oddish/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/anim_front.4bpp.lz"); - const u32 gMonPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/normal.gbapal.lz"); - const u32 gMonBackPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/back.4bpp.lz"); - const u32 gMonShinyPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/shiny.gbapal.lz"); - const u8 gMonIcon_Gloom[] = INCBIN_U8("graphics/pokemon/gloom/icon.4bpp"); + const u32 gMonFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/gen_1/gloom/anim_front.4bpp.lz"); + const u32 gMonPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gen_1/gloom/normal.gbapal.lz"); + const u32 gMonBackPic_Gloom[] = INCBIN_U32("graphics/pokemon/gen_1/gloom/back.4bpp.lz"); + const u32 gMonShinyPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gen_1/gloom/shiny.gbapal.lz"); + const u8 gMonIcon_Gloom[] = INCBIN_U8("graphics/pokemon/gen_1/gloom/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gloom[] = INCBIN_U8("graphics/pokemon/gloom/footprint.1bpp"); + const u8 gMonFootprint_Gloom[] = INCBIN_U8("graphics/pokemon/gen_1/gloom/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GloomF[] = INCBIN_U32("graphics/pokemon/gloom/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_GloomF[] = INCBIN_U32("graphics/pokemon/gloom/backf.4bpp.lz"); + const u32 gMonFrontPic_GloomF[] = INCBIN_U32("graphics/pokemon/gen_1/gloom/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_GloomF[] = INCBIN_U32("graphics/pokemon/gen_1/gloom/backf.4bpp.lz"); - const u32 gMonFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/anim_front.4bpp.lz"); - const u32 gMonPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/normal.gbapal.lz"); - const u32 gMonBackPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/back.4bpp.lz"); - const u32 gMonShinyPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/shiny.gbapal.lz"); - const u8 gMonIcon_Vileplume[] = INCBIN_U8("graphics/pokemon/vileplume/icon.4bpp"); + const u32 gMonFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/gen_1/vileplume/anim_front.4bpp.lz"); + const u32 gMonPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/gen_1/vileplume/normal.gbapal.lz"); + const u32 gMonBackPic_Vileplume[] = INCBIN_U32("graphics/pokemon/gen_1/vileplume/back.4bpp.lz"); + const u32 gMonShinyPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/gen_1/vileplume/shiny.gbapal.lz"); + const u8 gMonIcon_Vileplume[] = INCBIN_U8("graphics/pokemon/gen_1/vileplume/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Vileplume[] = INCBIN_U8("graphics/pokemon/vileplume/footprint.1bpp"); + const u8 gMonFootprint_Vileplume[] = INCBIN_U8("graphics/pokemon/gen_1/vileplume/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_VileplumeF[] = INCBIN_U32("graphics/pokemon/vileplume/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_VileplumeF[] = INCBIN_U32("graphics/pokemon/vileplume/backf.4bpp.lz"); + const u32 gMonFrontPic_VileplumeF[] = INCBIN_U32("graphics/pokemon/gen_1/vileplume/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_VileplumeF[] = INCBIN_U32("graphics/pokemon/gen_1/vileplume/backf.4bpp.lz"); #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/anim_front.4bpp.lz"); - const u32 gMonPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/normal.gbapal.lz"); - const u32 gMonBackPic_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/back.4bpp.lz"); - const u32 gMonShinyPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/shiny.gbapal.lz"); - const u8 gMonIcon_Bellossom[] = INCBIN_U8("graphics/pokemon/bellossom/icon.4bpp"); + const u32 gMonFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/gen_2/bellossom/anim_front.4bpp.lz"); + const u32 gMonPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/gen_2/bellossom/normal.gbapal.lz"); + const u32 gMonBackPic_Bellossom[] = INCBIN_U32("graphics/pokemon/gen_2/bellossom/back.4bpp.lz"); + const u32 gMonShinyPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/gen_2/bellossom/shiny.gbapal.lz"); + const u8 gMonIcon_Bellossom[] = INCBIN_U8("graphics/pokemon/gen_2/bellossom/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bellossom[] = INCBIN_U8("graphics/pokemon/bellossom/footprint.1bpp"); + const u8 gMonFootprint_Bellossom[] = INCBIN_U8("graphics/pokemon/gen_2/bellossom/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_ODDISH #if P_FAMILY_PARAS - const u32 gMonFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/paras/anim_front.4bpp.lz"); - const u32 gMonPalette_Paras[] = INCBIN_U32("graphics/pokemon/paras/normal.gbapal.lz"); - const u32 gMonBackPic_Paras[] = INCBIN_U32("graphics/pokemon/paras/back.4bpp.lz"); - const u32 gMonShinyPalette_Paras[] = INCBIN_U32("graphics/pokemon/paras/shiny.gbapal.lz"); - const u8 gMonIcon_Paras[] = INCBIN_U8("graphics/pokemon/paras/icon.4bpp"); + const u32 gMonFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/gen_1/paras/anim_front.4bpp.lz"); + const u32 gMonPalette_Paras[] = INCBIN_U32("graphics/pokemon/gen_1/paras/normal.gbapal.lz"); + const u32 gMonBackPic_Paras[] = INCBIN_U32("graphics/pokemon/gen_1/paras/back.4bpp.lz"); + const u32 gMonShinyPalette_Paras[] = INCBIN_U32("graphics/pokemon/gen_1/paras/shiny.gbapal.lz"); + const u8 gMonIcon_Paras[] = INCBIN_U8("graphics/pokemon/gen_1/paras/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Paras[] = INCBIN_U8("graphics/pokemon/paras/footprint.1bpp"); + const u8 gMonFootprint_Paras[] = INCBIN_U8("graphics/pokemon/gen_1/paras/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/anim_front.4bpp.lz"); - const u32 gMonPalette_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/normal.gbapal.lz"); - const u32 gMonBackPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/back.4bpp.lz"); - const u32 gMonShinyPalette_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/shiny.gbapal.lz"); - const u8 gMonIcon_Parasect[] = INCBIN_U8("graphics/pokemon/parasect/icon.4bpp"); + const u32 gMonFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/gen_1/parasect/anim_front.4bpp.lz"); + const u32 gMonPalette_Parasect[] = INCBIN_U32("graphics/pokemon/gen_1/parasect/normal.gbapal.lz"); + const u32 gMonBackPic_Parasect[] = INCBIN_U32("graphics/pokemon/gen_1/parasect/back.4bpp.lz"); + const u32 gMonShinyPalette_Parasect[] = INCBIN_U32("graphics/pokemon/gen_1/parasect/shiny.gbapal.lz"); + const u8 gMonIcon_Parasect[] = INCBIN_U8("graphics/pokemon/gen_1/parasect/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Parasect[] = INCBIN_U8("graphics/pokemon/parasect/footprint.1bpp"); + const u8 gMonFootprint_Parasect[] = INCBIN_U8("graphics/pokemon/gen_1/parasect/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PARAS #if P_FAMILY_VENONAT - const u32 gMonFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/anim_front.4bpp.lz"); - const u32 gMonPalette_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/normal.gbapal.lz"); - const u32 gMonBackPic_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/back.4bpp.lz"); - const u32 gMonShinyPalette_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/shiny.gbapal.lz"); - const u8 gMonIcon_Venonat[] = INCBIN_U8("graphics/pokemon/venonat/icon.4bpp"); + const u32 gMonFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/gen_1/venonat/anim_front.4bpp.lz"); + const u32 gMonPalette_Venonat[] = INCBIN_U32("graphics/pokemon/gen_1/venonat/normal.gbapal.lz"); + const u32 gMonBackPic_Venonat[] = INCBIN_U32("graphics/pokemon/gen_1/venonat/back.4bpp.lz"); + const u32 gMonShinyPalette_Venonat[] = INCBIN_U32("graphics/pokemon/gen_1/venonat/shiny.gbapal.lz"); + const u8 gMonIcon_Venonat[] = INCBIN_U8("graphics/pokemon/gen_1/venonat/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Venonat[] = INCBIN_U8("graphics/pokemon/venonat/footprint.1bpp"); + const u8 gMonFootprint_Venonat[] = INCBIN_U8("graphics/pokemon/gen_1/venonat/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/anim_front.4bpp.lz"); - const u32 gMonPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/normal.gbapal.lz"); - const u32 gMonBackPic_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/back.4bpp.lz"); - const u32 gMonShinyPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/shiny.gbapal.lz"); - const u8 gMonIcon_Venomoth[] = INCBIN_U8("graphics/pokemon/venomoth/icon.4bpp"); + const u32 gMonFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/gen_1/venomoth/anim_front.4bpp.lz"); + const u32 gMonPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/gen_1/venomoth/normal.gbapal.lz"); + const u32 gMonBackPic_Venomoth[] = INCBIN_U32("graphics/pokemon/gen_1/venomoth/back.4bpp.lz"); + const u32 gMonShinyPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/gen_1/venomoth/shiny.gbapal.lz"); + const u8 gMonIcon_Venomoth[] = INCBIN_U8("graphics/pokemon/gen_1/venomoth/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Venomoth[] = INCBIN_U8("graphics/pokemon/venomoth/footprint.1bpp"); + const u8 gMonFootprint_Venomoth[] = INCBIN_U8("graphics/pokemon/gen_1/venomoth/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_VENONAT #if P_FAMILY_DIGLETT - const u32 gMonFrontPic_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/anim_front.4bpp.lz"); - const u32 gMonPalette_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/normal.gbapal.lz"); - const u32 gMonBackPic_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/back.4bpp.lz"); - const u32 gMonShinyPalette_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/shiny.gbapal.lz"); - const u8 gMonIcon_Diglett[] = INCBIN_U8("graphics/pokemon/diglett/icon.4bpp"); + const u32 gMonFrontPic_Diglett[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/anim_front.4bpp.lz"); + const u32 gMonPalette_Diglett[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/normal.gbapal.lz"); + const u32 gMonBackPic_Diglett[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/back.4bpp.lz"); + const u32 gMonShinyPalette_Diglett[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/shiny.gbapal.lz"); + const u8 gMonIcon_Diglett[] = INCBIN_U8("graphics/pokemon/gen_1/diglett/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Diglett[] = INCBIN_U8("graphics/pokemon/diglett/footprint.1bpp"); + const u8 gMonFootprint_Diglett[] = INCBIN_U8("graphics/pokemon/gen_1/diglett/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/anim_front.4bpp.lz"); - const u32 gMonPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/normal.gbapal.lz"); - const u32 gMonBackPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/back.4bpp.lz"); - const u32 gMonShinyPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/shiny.gbapal.lz"); - const u8 gMonIcon_Dugtrio[] = INCBIN_U8("graphics/pokemon/dugtrio/icon.4bpp"); + const u32 gMonFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/anim_front.4bpp.lz"); + const u32 gMonPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/normal.gbapal.lz"); + const u32 gMonBackPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/back.4bpp.lz"); + const u32 gMonShinyPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/shiny.gbapal.lz"); + const u8 gMonIcon_Dugtrio[] = INCBIN_U8("graphics/pokemon/gen_1/dugtrio/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dugtrio[] = INCBIN_U8("graphics/pokemon/dugtrio/footprint.1bpp"); + const u8 gMonFootprint_Dugtrio[] = INCBIN_U8("graphics/pokemon/gen_1/dugtrio/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/front.4bpp.lz"); - const u32 gMonPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_DiglettAlolan[] = INCBIN_U8("graphics/pokemon/diglett/alolan/icon.4bpp"); + const u32 gMonFrontPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/alolan/front.4bpp.lz"); + const u32 gMonPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/diglett/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_DiglettAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/diglett/alolan/icon.4bpp"); - const u32 gMonFrontPic_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/front.4bpp.lz"); - const u32 gMonPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_DugtrioAlolan[] = INCBIN_U8("graphics/pokemon/dugtrio/alolan/icon.4bpp"); + const u32 gMonFrontPic_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/alolan/front.4bpp.lz"); + const u32 gMonPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/dugtrio/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_DugtrioAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/dugtrio/alolan/icon.4bpp"); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_DIGLETT #if P_FAMILY_MEOWTH - const u32 gMonFrontPic_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/anim_front.4bpp.lz"); - const u32 gMonPalette_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/normal.gbapal.lz"); - const u32 gMonBackPic_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/back.4bpp.lz"); - const u32 gMonShinyPalette_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/shiny.gbapal.lz"); - const u8 gMonIcon_Meowth[] = INCBIN_U8("graphics/pokemon/meowth/icon.4bpp"); + const u32 gMonFrontPic_Meowth[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/anim_front.4bpp.lz"); + const u32 gMonPalette_Meowth[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/normal.gbapal.lz"); + const u32 gMonBackPic_Meowth[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/back.4bpp.lz"); + const u32 gMonShinyPalette_Meowth[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/shiny.gbapal.lz"); + const u8 gMonIcon_Meowth[] = INCBIN_U8("graphics/pokemon/gen_1/meowth/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Meowth[] = INCBIN_U8("graphics/pokemon/meowth/footprint.1bpp"); + const u8 gMonFootprint_Meowth[] = INCBIN_U8("graphics/pokemon/gen_1/meowth/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/persian/anim_front.4bpp.lz"); - const u32 gMonPalette_Persian[] = INCBIN_U32("graphics/pokemon/persian/normal.gbapal.lz"); - const u32 gMonBackPic_Persian[] = INCBIN_U32("graphics/pokemon/persian/back.4bpp.lz"); - const u32 gMonShinyPalette_Persian[] = INCBIN_U32("graphics/pokemon/persian/shiny.gbapal.lz"); - const u8 gMonIcon_Persian[] = INCBIN_U8("graphics/pokemon/persian/icon.4bpp"); + const u32 gMonFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/gen_1/persian/anim_front.4bpp.lz"); + const u32 gMonPalette_Persian[] = INCBIN_U32("graphics/pokemon/gen_1/persian/normal.gbapal.lz"); + const u32 gMonBackPic_Persian[] = INCBIN_U32("graphics/pokemon/gen_1/persian/back.4bpp.lz"); + const u32 gMonShinyPalette_Persian[] = INCBIN_U32("graphics/pokemon/gen_1/persian/shiny.gbapal.lz"); + const u8 gMonIcon_Persian[] = INCBIN_U8("graphics/pokemon/gen_1/persian/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Persian[] = INCBIN_U8("graphics/pokemon/persian/footprint.1bpp"); + const u8 gMonFootprint_Persian[] = INCBIN_U8("graphics/pokemon/gen_1/persian/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/front.4bpp.lz"); - const u32 gMonPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_MeowthAlolan[] = INCBIN_U8("graphics/pokemon/meowth/alolan/icon.4bpp"); + const u32 gMonFrontPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/alolan/front.4bpp.lz"); + const u32 gMonPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_MeowthAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/meowth/alolan/icon.4bpp"); - const u32 gMonFrontPic_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/front.4bpp.lz"); - const u32 gMonPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_PersianAlolan[] = INCBIN_U8("graphics/pokemon/persian/alolan/icon.4bpp"); + const u32 gMonFrontPic_PersianAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/persian/alolan/front.4bpp.lz"); + const u32 gMonPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/persian/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_PersianAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/persian/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/persian/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_PersianAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/persian/alolan/icon.4bpp"); #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/front.4bpp.lz"); - const u32 gMonPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_MeowthGalarian[] = INCBIN_U8("graphics/pokemon/meowth/galarian/icon.4bpp"); + const u32 gMonFrontPic_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/galarian/front.4bpp.lz"); + const u32 gMonPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_MeowthGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/meowth/galarian/icon.4bpp"); - const u32 gMonFrontPic_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/front.4bpp.lz"); - const u32 gMonPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/normal.gbapal.lz"); - const u32 gMonBackPic_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/back.4bpp.lz"); - const u32 gMonShinyPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/shiny.gbapal.lz"); - const u8 gMonIcon_Perrserker[] = INCBIN_U8("graphics/pokemon/perrserker/icon.4bpp"); + const u32 gMonFrontPic_Perrserker[] = INCBIN_U32("graphics/pokemon/gen_8/perrserker/front.4bpp.lz"); + const u32 gMonPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/gen_8/perrserker/normal.gbapal.lz"); + const u32 gMonBackPic_Perrserker[] = INCBIN_U32("graphics/pokemon/gen_8/perrserker/back.4bpp.lz"); + const u32 gMonShinyPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/gen_8/perrserker/shiny.gbapal.lz"); + const u8 gMonIcon_Perrserker[] = INCBIN_U8("graphics/pokemon/gen_8/perrserker/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Perrserker[] = INCBIN_U8("graphics/pokemon/perrserker/footprint.1bpp"); + const u8 gMonFootprint_Perrserker[] = INCBIN_U8("graphics/pokemon/gen_8/perrserker/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GALARIAN_FORMS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_MeowthGigantamax[] = INCBIN_U8("graphics/pokemon/meowth/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/meowth/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_MeowthGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/meowth/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MEOWTH #if P_FAMILY_PSYDUCK - const u32 gMonFrontPic_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/anim_front.4bpp.lz"); - const u32 gMonPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/normal.gbapal.lz"); - const u32 gMonBackPic_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/back.4bpp.lz"); - const u32 gMonShinyPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/shiny.gbapal.lz"); - const u8 gMonIcon_Psyduck[] = INCBIN_U8("graphics/pokemon/psyduck/icon.4bpp"); + const u32 gMonFrontPic_Psyduck[] = INCBIN_U32("graphics/pokemon/gen_1/psyduck/anim_front.4bpp.lz"); + const u32 gMonPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/gen_1/psyduck/normal.gbapal.lz"); + const u32 gMonBackPic_Psyduck[] = INCBIN_U32("graphics/pokemon/gen_1/psyduck/back.4bpp.lz"); + const u32 gMonShinyPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/gen_1/psyduck/shiny.gbapal.lz"); + const u8 gMonIcon_Psyduck[] = INCBIN_U8("graphics/pokemon/gen_1/psyduck/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Psyduck[] = INCBIN_U8("graphics/pokemon/psyduck/footprint.1bpp"); + const u8 gMonFootprint_Psyduck[] = INCBIN_U8("graphics/pokemon/gen_1/psyduck/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/anim_front.4bpp.lz"); - const u32 gMonPalette_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/normal.gbapal.lz"); - const u32 gMonBackPic_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/back.4bpp.lz"); - const u32 gMonShinyPalette_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/shiny.gbapal.lz"); - const u8 gMonIcon_Golduck[] = INCBIN_U8("graphics/pokemon/golduck/icon.4bpp"); + const u32 gMonFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/gen_1/golduck/anim_front.4bpp.lz"); + const u32 gMonPalette_Golduck[] = INCBIN_U32("graphics/pokemon/gen_1/golduck/normal.gbapal.lz"); + const u32 gMonBackPic_Golduck[] = INCBIN_U32("graphics/pokemon/gen_1/golduck/back.4bpp.lz"); + const u32 gMonShinyPalette_Golduck[] = INCBIN_U32("graphics/pokemon/gen_1/golduck/shiny.gbapal.lz"); + const u8 gMonIcon_Golduck[] = INCBIN_U8("graphics/pokemon/gen_1/golduck/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Golduck[] = INCBIN_U8("graphics/pokemon/golduck/footprint.1bpp"); + const u8 gMonFootprint_Golduck[] = INCBIN_U8("graphics/pokemon/gen_1/golduck/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PSYDUCK #if P_FAMILY_MANKEY - const u32 gMonFrontPic_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/anim_front.4bpp.lz"); - const u32 gMonPalette_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/normal.gbapal.lz"); - const u32 gMonBackPic_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/back.4bpp.lz"); - const u32 gMonShinyPalette_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/shiny.gbapal.lz"); - const u8 gMonIcon_Mankey[] = INCBIN_U8("graphics/pokemon/mankey/icon.4bpp"); + const u32 gMonFrontPic_Mankey[] = INCBIN_U32("graphics/pokemon/gen_1/mankey/anim_front.4bpp.lz"); + const u32 gMonPalette_Mankey[] = INCBIN_U32("graphics/pokemon/gen_1/mankey/normal.gbapal.lz"); + const u32 gMonBackPic_Mankey[] = INCBIN_U32("graphics/pokemon/gen_1/mankey/back.4bpp.lz"); + const u32 gMonShinyPalette_Mankey[] = INCBIN_U32("graphics/pokemon/gen_1/mankey/shiny.gbapal.lz"); + const u8 gMonIcon_Mankey[] = INCBIN_U8("graphics/pokemon/gen_1/mankey/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mankey[] = INCBIN_U8("graphics/pokemon/mankey/footprint.1bpp"); + const u8 gMonFootprint_Mankey[] = INCBIN_U8("graphics/pokemon/gen_1/mankey/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/anim_front.4bpp.lz"); - const u32 gMonPalette_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/normal.gbapal.lz"); - const u32 gMonBackPic_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/back.4bpp.lz"); - const u32 gMonShinyPalette_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/shiny.gbapal.lz"); - const u8 gMonIcon_Primeape[] = INCBIN_U8("graphics/pokemon/primeape/icon.4bpp"); + const u32 gMonFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/gen_1/primeape/anim_front.4bpp.lz"); + const u32 gMonPalette_Primeape[] = INCBIN_U32("graphics/pokemon/gen_1/primeape/normal.gbapal.lz"); + const u32 gMonBackPic_Primeape[] = INCBIN_U32("graphics/pokemon/gen_1/primeape/back.4bpp.lz"); + const u32 gMonShinyPalette_Primeape[] = INCBIN_U32("graphics/pokemon/gen_1/primeape/shiny.gbapal.lz"); + const u8 gMonIcon_Primeape[] = INCBIN_U8("graphics/pokemon/gen_1/primeape/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Primeape[] = INCBIN_U8("graphics/pokemon/primeape/footprint.1bpp"); + const u8 gMonFootprint_Primeape[] = INCBIN_U8("graphics/pokemon/gen_1/primeape/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_9_CROSS_EVOS - const u32 gMonFrontPic_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/front.4bpp.lz"); - const u32 gMonPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/normal.gbapal.lz"); - const u32 gMonBackPic_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/back.4bpp.lz"); - const u32 gMonShinyPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/shiny.gbapal.lz"); - const u8 gMonIcon_Annihilape[] = INCBIN_U8("graphics/pokemon/annihilape/icon.4bpp"); + const u32 gMonFrontPic_Annihilape[] = INCBIN_U32("graphics/pokemon/gen_9/annihilape/front.4bpp.lz"); + const u32 gMonPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/gen_9/annihilape/normal.gbapal.lz"); + const u32 gMonBackPic_Annihilape[] = INCBIN_U32("graphics/pokemon/gen_9/annihilape/back.4bpp.lz"); + const u32 gMonShinyPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/gen_9/annihilape/shiny.gbapal.lz"); + const u8 gMonIcon_Annihilape[] = INCBIN_U8("graphics/pokemon/gen_9/annihilape/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Annihilape[] = INCBIN_U8("graphics/pokemon/annihilape/footprint.1bpp"); + // const u8 gMonFootprint_Annihilape[] = INCBIN_U8("graphics/pokemon/gen_9/annihilape/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_MANKEY #if P_FAMILY_GROWLITHE - const u32 gMonFrontPic_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/anim_front.4bpp.lz"); - const u32 gMonPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/normal.gbapal.lz"); - const u32 gMonBackPic_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/back.4bpp.lz"); - const u32 gMonShinyPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/shiny.gbapal.lz"); - const u8 gMonIcon_Growlithe[] = INCBIN_U8("graphics/pokemon/growlithe/icon.4bpp"); + const u32 gMonFrontPic_Growlithe[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/anim_front.4bpp.lz"); + const u32 gMonPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/normal.gbapal.lz"); + const u32 gMonBackPic_Growlithe[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/back.4bpp.lz"); + const u32 gMonShinyPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/shiny.gbapal.lz"); + const u8 gMonIcon_Growlithe[] = INCBIN_U8("graphics/pokemon/gen_1/growlithe/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Growlithe[] = INCBIN_U8("graphics/pokemon/growlithe/footprint.1bpp"); + const u8 gMonFootprint_Growlithe[] = INCBIN_U8("graphics/pokemon/gen_1/growlithe/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/anim_front.4bpp.lz"); - const u32 gMonPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/normal.gbapal.lz"); - const u32 gMonBackPic_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/back.4bpp.lz"); - const u32 gMonShinyPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/shiny.gbapal.lz"); - const u8 gMonIcon_Arcanine[] = INCBIN_U8("graphics/pokemon/arcanine/icon.4bpp"); + const u32 gMonFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/anim_front.4bpp.lz"); + const u32 gMonPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/normal.gbapal.lz"); + const u32 gMonBackPic_Arcanine[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/back.4bpp.lz"); + const u32 gMonShinyPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/shiny.gbapal.lz"); + const u8 gMonIcon_Arcanine[] = INCBIN_U8("graphics/pokemon/gen_1/arcanine/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Arcanine[] = INCBIN_U8("graphics/pokemon/arcanine/footprint.1bpp"); + const u8 gMonFootprint_Arcanine[] = INCBIN_U8("graphics/pokemon/gen_1/arcanine/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/front.4bpp.lz"); - const u32 gMonPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_GrowlitheHisuian[] = INCBIN_U8("graphics/pokemon/growlithe/hisuian/icon.4bpp"); + const u32 gMonFrontPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/hisuian/front.4bpp.lz"); + const u32 gMonPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/growlithe/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_GrowlitheHisuian[] = INCBIN_U8("graphics/pokemon/gen_1/growlithe/hisuian/icon.4bpp"); - const u32 gMonFrontPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/front.4bpp.lz"); - const u32 gMonPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_ArcanineHisuian[] = INCBIN_U8("graphics/pokemon/arcanine/hisuian/icon.4bpp"); + const u32 gMonFrontPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/hisuian/front.4bpp.lz"); + const u32 gMonPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/arcanine/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_ArcanineHisuian[] = INCBIN_U8("graphics/pokemon/gen_1/arcanine/hisuian/icon.4bpp"); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_GROWLITHE #if P_FAMILY_POLIWAG - const u32 gMonFrontPic_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/anim_front.4bpp.lz"); - const u32 gMonPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/normal.gbapal.lz"); - const u32 gMonBackPic_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/back.4bpp.lz"); - const u32 gMonShinyPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/shiny.gbapal.lz"); - const u8 gMonIcon_Poliwag[] = INCBIN_U8("graphics/pokemon/poliwag/icon.4bpp"); + const u32 gMonFrontPic_Poliwag[] = INCBIN_U32("graphics/pokemon/gen_1/poliwag/anim_front.4bpp.lz"); + const u32 gMonPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/gen_1/poliwag/normal.gbapal.lz"); + const u32 gMonBackPic_Poliwag[] = INCBIN_U32("graphics/pokemon/gen_1/poliwag/back.4bpp.lz"); + const u32 gMonShinyPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/gen_1/poliwag/shiny.gbapal.lz"); + const u8 gMonIcon_Poliwag[] = INCBIN_U8("graphics/pokemon/gen_1/poliwag/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Poliwag[] = INCBIN_U8("graphics/pokemon/poliwag/footprint.1bpp"); + const u8 gMonFootprint_Poliwag[] = INCBIN_U8("graphics/pokemon/gen_1/poliwag/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/anim_front.4bpp.lz"); - const u32 gMonPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/normal.gbapal.lz"); - const u32 gMonBackPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/back.4bpp.lz"); - const u32 gMonShinyPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/shiny.gbapal.lz"); - const u8 gMonIcon_Poliwhirl[] = INCBIN_U8("graphics/pokemon/poliwhirl/icon.4bpp"); + const u32 gMonFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/gen_1/poliwhirl/anim_front.4bpp.lz"); + const u32 gMonPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/gen_1/poliwhirl/normal.gbapal.lz"); + const u32 gMonBackPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/gen_1/poliwhirl/back.4bpp.lz"); + const u32 gMonShinyPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/gen_1/poliwhirl/shiny.gbapal.lz"); + const u8 gMonIcon_Poliwhirl[] = INCBIN_U8("graphics/pokemon/gen_1/poliwhirl/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Poliwhirl[] = INCBIN_U8("graphics/pokemon/poliwhirl/footprint.1bpp"); + const u8 gMonFootprint_Poliwhirl[] = INCBIN_U8("graphics/pokemon/gen_1/poliwhirl/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/anim_front.4bpp.lz"); - const u32 gMonPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/normal.gbapal.lz"); - const u32 gMonBackPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/back.4bpp.lz"); - const u32 gMonShinyPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/shiny.gbapal.lz"); - const u8 gMonIcon_Poliwrath[] = INCBIN_U8("graphics/pokemon/poliwrath/icon.4bpp"); + const u32 gMonFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/gen_1/poliwrath/anim_front.4bpp.lz"); + const u32 gMonPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/gen_1/poliwrath/normal.gbapal.lz"); + const u32 gMonBackPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/gen_1/poliwrath/back.4bpp.lz"); + const u32 gMonShinyPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/gen_1/poliwrath/shiny.gbapal.lz"); + const u8 gMonIcon_Poliwrath[] = INCBIN_U8("graphics/pokemon/gen_1/poliwrath/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Poliwrath[] = INCBIN_U8("graphics/pokemon/poliwrath/footprint.1bpp"); + const u8 gMonFootprint_Poliwrath[] = INCBIN_U8("graphics/pokemon/gen_1/poliwrath/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/anim_front.4bpp.lz"); - const u32 gMonPalette_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/normal.gbapal.lz"); - const u32 gMonBackPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/back.4bpp.lz"); - const u32 gMonShinyPalette_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/shiny.gbapal.lz"); - const u8 gMonIcon_Politoed[] = INCBIN_U8("graphics/pokemon/politoed/icon.4bpp"); + const u32 gMonFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/gen_2/politoed/anim_front.4bpp.lz"); + const u32 gMonPalette_Politoed[] = INCBIN_U32("graphics/pokemon/gen_2/politoed/normal.gbapal.lz"); + const u32 gMonBackPic_Politoed[] = INCBIN_U32("graphics/pokemon/gen_2/politoed/back.4bpp.lz"); + const u32 gMonShinyPalette_Politoed[] = INCBIN_U32("graphics/pokemon/gen_2/politoed/shiny.gbapal.lz"); + const u8 gMonIcon_Politoed[] = INCBIN_U8("graphics/pokemon/gen_2/politoed/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Politoed[] = INCBIN_U8("graphics/pokemon/politoed/footprint.1bpp"); + const u8 gMonFootprint_Politoed[] = INCBIN_U8("graphics/pokemon/gen_2/politoed/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_PolitoedF[] = INCBIN_U32("graphics/pokemon/politoed/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_PolitoedF[] = INCBIN_U32("graphics/pokemon/politoed/backf.4bpp.lz"); + const u32 gMonFrontPic_PolitoedF[] = INCBIN_U32("graphics/pokemon/gen_2/politoed/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_PolitoedF[] = INCBIN_U32("graphics/pokemon/gen_2/politoed/backf.4bpp.lz"); #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_POLIWAG #if P_FAMILY_ABRA - const u32 gMonFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/abra/anim_front.4bpp.lz"); - const u32 gMonPalette_Abra[] = INCBIN_U32("graphics/pokemon/abra/normal.gbapal.lz"); - const u32 gMonBackPic_Abra[] = INCBIN_U32("graphics/pokemon/abra/back.4bpp.lz"); - const u32 gMonShinyPalette_Abra[] = INCBIN_U32("graphics/pokemon/abra/shiny.gbapal.lz"); - const u8 gMonIcon_Abra[] = INCBIN_U8("graphics/pokemon/abra/icon.4bpp"); + const u32 gMonFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/gen_1/abra/anim_front.4bpp.lz"); + const u32 gMonPalette_Abra[] = INCBIN_U32("graphics/pokemon/gen_1/abra/normal.gbapal.lz"); + const u32 gMonBackPic_Abra[] = INCBIN_U32("graphics/pokemon/gen_1/abra/back.4bpp.lz"); + const u32 gMonShinyPalette_Abra[] = INCBIN_U32("graphics/pokemon/gen_1/abra/shiny.gbapal.lz"); + const u8 gMonIcon_Abra[] = INCBIN_U8("graphics/pokemon/gen_1/abra/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Abra[] = INCBIN_U8("graphics/pokemon/abra/footprint.1bpp"); + const u8 gMonFootprint_Abra[] = INCBIN_U8("graphics/pokemon/gen_1/abra/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/anim_front.4bpp.lz"); - const u32 gMonPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/normal.gbapal.lz"); - const u32 gMonBackPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/back.4bpp.lz"); - const u32 gMonShinyPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/shiny.gbapal.lz"); - const u8 gMonIcon_Kadabra[] = INCBIN_U8("graphics/pokemon/kadabra/icon.4bpp"); + const u32 gMonFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/gen_1/kadabra/anim_front.4bpp.lz"); + const u32 gMonPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/gen_1/kadabra/normal.gbapal.lz"); + const u32 gMonBackPic_Kadabra[] = INCBIN_U32("graphics/pokemon/gen_1/kadabra/back.4bpp.lz"); + const u32 gMonShinyPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/gen_1/kadabra/shiny.gbapal.lz"); + const u8 gMonIcon_Kadabra[] = INCBIN_U8("graphics/pokemon/gen_1/kadabra/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kadabra[] = INCBIN_U8("graphics/pokemon/kadabra/footprint.1bpp"); + const u8 gMonFootprint_Kadabra[] = INCBIN_U8("graphics/pokemon/gen_1/kadabra/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_KadabraF[] = INCBIN_U32("graphics/pokemon/kadabra/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_KadabraF[] = INCBIN_U32("graphics/pokemon/kadabra/backf.4bpp.lz"); + const u32 gMonFrontPic_KadabraF[] = INCBIN_U32("graphics/pokemon/gen_1/kadabra/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_KadabraF[] = INCBIN_U32("graphics/pokemon/gen_1/kadabra/backf.4bpp.lz"); - const u32 gMonFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/anim_front.4bpp.lz"); - const u32 gMonPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/normal.gbapal.lz"); - const u32 gMonBackPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/back.4bpp.lz"); - const u32 gMonShinyPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/shiny.gbapal.lz"); - const u8 gMonIcon_Alakazam[] = INCBIN_U8("graphics/pokemon/alakazam/icon.4bpp"); + const u32 gMonFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/anim_front.4bpp.lz"); + const u32 gMonPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/normal.gbapal.lz"); + const u32 gMonBackPic_Alakazam[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/back.4bpp.lz"); + const u32 gMonShinyPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/shiny.gbapal.lz"); + const u8 gMonIcon_Alakazam[] = INCBIN_U8("graphics/pokemon/gen_1/alakazam/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Alakazam[] = INCBIN_U8("graphics/pokemon/alakazam/footprint.1bpp"); + const u8 gMonFootprint_Alakazam[] = INCBIN_U8("graphics/pokemon/gen_1/alakazam/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_AlakazamF[] = INCBIN_U32("graphics/pokemon/alakazam/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_AlakazamF[] = INCBIN_U32("graphics/pokemon/alakazam/backf.4bpp.lz"); + const u32 gMonFrontPic_AlakazamF[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_AlakazamF[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/backf.4bpp.lz"); #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/front.4bpp.lz"); - const u32 gMonPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/normal.gbapal.lz"); - const u32 gMonBackPic_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/shiny.gbapal.lz"); - const u8 gMonIcon_AlakazamMega[] = INCBIN_U8("graphics/pokemon/alakazam/mega/icon.4bpp"); + const u32 gMonFrontPic_AlakazamMega[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/mega/front.4bpp.lz"); + const u32 gMonPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/mega/normal.gbapal.lz"); + const u32 gMonBackPic_AlakazamMega[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/gen_1/alakazam/mega/shiny.gbapal.lz"); + const u8 gMonIcon_AlakazamMega[] = INCBIN_U8("graphics/pokemon/gen_1/alakazam/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ABRA #if P_FAMILY_MACHOP - const u32 gMonFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/machop/anim_front.4bpp.lz"); - const u32 gMonPalette_Machop[] = INCBIN_U32("graphics/pokemon/machop/normal.gbapal.lz"); - const u32 gMonBackPic_Machop[] = INCBIN_U32("graphics/pokemon/machop/back.4bpp.lz"); - const u32 gMonShinyPalette_Machop[] = INCBIN_U32("graphics/pokemon/machop/shiny.gbapal.lz"); - const u8 gMonIcon_Machop[] = INCBIN_U8("graphics/pokemon/machop/icon.4bpp"); + const u32 gMonFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/gen_1/machop/anim_front.4bpp.lz"); + const u32 gMonPalette_Machop[] = INCBIN_U32("graphics/pokemon/gen_1/machop/normal.gbapal.lz"); + const u32 gMonBackPic_Machop[] = INCBIN_U32("graphics/pokemon/gen_1/machop/back.4bpp.lz"); + const u32 gMonShinyPalette_Machop[] = INCBIN_U32("graphics/pokemon/gen_1/machop/shiny.gbapal.lz"); + const u8 gMonIcon_Machop[] = INCBIN_U8("graphics/pokemon/gen_1/machop/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Machop[] = INCBIN_U8("graphics/pokemon/machop/footprint.1bpp"); + const u8 gMonFootprint_Machop[] = INCBIN_U8("graphics/pokemon/gen_1/machop/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/anim_front.4bpp.lz"); - const u32 gMonPalette_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/normal.gbapal.lz"); - const u32 gMonBackPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/back.4bpp.lz"); - const u32 gMonShinyPalette_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/shiny.gbapal.lz"); - const u8 gMonIcon_Machoke[] = INCBIN_U8("graphics/pokemon/machoke/icon.4bpp"); + const u32 gMonFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/gen_1/machoke/anim_front.4bpp.lz"); + const u32 gMonPalette_Machoke[] = INCBIN_U32("graphics/pokemon/gen_1/machoke/normal.gbapal.lz"); + const u32 gMonBackPic_Machoke[] = INCBIN_U32("graphics/pokemon/gen_1/machoke/back.4bpp.lz"); + const u32 gMonShinyPalette_Machoke[] = INCBIN_U32("graphics/pokemon/gen_1/machoke/shiny.gbapal.lz"); + const u8 gMonIcon_Machoke[] = INCBIN_U8("graphics/pokemon/gen_1/machoke/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Machoke[] = INCBIN_U8("graphics/pokemon/machoke/footprint.1bpp"); + const u8 gMonFootprint_Machoke[] = INCBIN_U8("graphics/pokemon/gen_1/machoke/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/anim_front.4bpp.lz"); - const u32 gMonPalette_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/normal.gbapal.lz"); - const u32 gMonBackPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/back.4bpp.lz"); - const u32 gMonShinyPalette_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/shiny.gbapal.lz"); - const u8 gMonIcon_Machamp[] = INCBIN_U8("graphics/pokemon/machamp/icon.4bpp"); + const u32 gMonFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/anim_front.4bpp.lz"); + const u32 gMonPalette_Machamp[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/normal.gbapal.lz"); + const u32 gMonBackPic_Machamp[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/back.4bpp.lz"); + const u32 gMonShinyPalette_Machamp[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/shiny.gbapal.lz"); + const u8 gMonIcon_Machamp[] = INCBIN_U8("graphics/pokemon/gen_1/machamp/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Machamp[] = INCBIN_U8("graphics/pokemon/machamp/footprint.1bpp"); + const u8 gMonFootprint_Machamp[] = INCBIN_U8("graphics/pokemon/gen_1/machamp/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_MachampGigantamax[] = INCBIN_U8("graphics/pokemon/machamp/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/machamp/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_MachampGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/machamp/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MACHOP #if P_FAMILY_BELLSPROUT - const u32 gMonFrontPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/anim_front.4bpp.lz"); - const u32 gMonPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/normal.gbapal.lz"); - const u32 gMonBackPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/back.4bpp.lz"); - const u32 gMonShinyPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/shiny.gbapal.lz"); - const u8 gMonIcon_Bellsprout[] = INCBIN_U8("graphics/pokemon/bellsprout/icon.4bpp"); + const u32 gMonFrontPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/gen_1/bellsprout/anim_front.4bpp.lz"); + const u32 gMonPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/gen_1/bellsprout/normal.gbapal.lz"); + const u32 gMonBackPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/gen_1/bellsprout/back.4bpp.lz"); + const u32 gMonShinyPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/gen_1/bellsprout/shiny.gbapal.lz"); + const u8 gMonIcon_Bellsprout[] = INCBIN_U8("graphics/pokemon/gen_1/bellsprout/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bellsprout[] = INCBIN_U8("graphics/pokemon/bellsprout/footprint.1bpp"); + const u8 gMonFootprint_Bellsprout[] = INCBIN_U8("graphics/pokemon/gen_1/bellsprout/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/anim_front.4bpp.lz"); - const u32 gMonPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/normal.gbapal.lz"); - const u32 gMonBackPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/back.4bpp.lz"); - const u32 gMonShinyPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/shiny.gbapal.lz"); - const u8 gMonIcon_Weepinbell[] = INCBIN_U8("graphics/pokemon/weepinbell/icon.4bpp"); + const u32 gMonFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/gen_1/weepinbell/anim_front.4bpp.lz"); + const u32 gMonPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/gen_1/weepinbell/normal.gbapal.lz"); + const u32 gMonBackPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/gen_1/weepinbell/back.4bpp.lz"); + const u32 gMonShinyPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/gen_1/weepinbell/shiny.gbapal.lz"); + const u8 gMonIcon_Weepinbell[] = INCBIN_U8("graphics/pokemon/gen_1/weepinbell/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Weepinbell[] = INCBIN_U8("graphics/pokemon/weepinbell/footprint.1bpp"); + const u8 gMonFootprint_Weepinbell[] = INCBIN_U8("graphics/pokemon/gen_1/weepinbell/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/anim_front.4bpp.lz"); - const u32 gMonPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/normal.gbapal.lz"); - const u32 gMonBackPic_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/back.4bpp.lz"); - const u32 gMonShinyPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/shiny.gbapal.lz"); - const u8 gMonIcon_Victreebel[] = INCBIN_U8("graphics/pokemon/victreebel/icon.4bpp"); + const u32 gMonFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/gen_1/victreebel/anim_front.4bpp.lz"); + const u32 gMonPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/gen_1/victreebel/normal.gbapal.lz"); + const u32 gMonBackPic_Victreebel[] = INCBIN_U32("graphics/pokemon/gen_1/victreebel/back.4bpp.lz"); + const u32 gMonShinyPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/gen_1/victreebel/shiny.gbapal.lz"); + const u8 gMonIcon_Victreebel[] = INCBIN_U8("graphics/pokemon/gen_1/victreebel/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Victreebel[] = INCBIN_U8("graphics/pokemon/victreebel/footprint.1bpp"); + const u8 gMonFootprint_Victreebel[] = INCBIN_U8("graphics/pokemon/gen_1/victreebel/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BELLSPROUT #if P_FAMILY_TENTACOOL - const u32 gMonFrontPic_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/anim_front.4bpp.lz"); - const u32 gMonPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/normal.gbapal.lz"); - const u32 gMonBackPic_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/back.4bpp.lz"); - const u32 gMonShinyPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/shiny.gbapal.lz"); - const u8 gMonIcon_Tentacool[] = INCBIN_U8("graphics/pokemon/tentacool/icon.4bpp"); + const u32 gMonFrontPic_Tentacool[] = INCBIN_U32("graphics/pokemon/gen_1/tentacool/anim_front.4bpp.lz"); + const u32 gMonPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/gen_1/tentacool/normal.gbapal.lz"); + const u32 gMonBackPic_Tentacool[] = INCBIN_U32("graphics/pokemon/gen_1/tentacool/back.4bpp.lz"); + const u32 gMonShinyPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/gen_1/tentacool/shiny.gbapal.lz"); + const u8 gMonIcon_Tentacool[] = INCBIN_U8("graphics/pokemon/gen_1/tentacool/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tentacool[] = INCBIN_U8("graphics/pokemon/tentacool/footprint.1bpp"); + const u8 gMonFootprint_Tentacool[] = INCBIN_U8("graphics/pokemon/gen_1/tentacool/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/anim_front.4bpp.lz"); - const u32 gMonPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/normal.gbapal.lz"); - const u32 gMonBackPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/back.4bpp.lz"); - const u32 gMonShinyPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/shiny.gbapal.lz"); - const u8 gMonIcon_Tentacruel[] = INCBIN_U8("graphics/pokemon/tentacruel/icon.4bpp"); + const u32 gMonFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/gen_1/tentacruel/anim_front.4bpp.lz"); + const u32 gMonPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/gen_1/tentacruel/normal.gbapal.lz"); + const u32 gMonBackPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/gen_1/tentacruel/back.4bpp.lz"); + const u32 gMonShinyPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/gen_1/tentacruel/shiny.gbapal.lz"); + const u8 gMonIcon_Tentacruel[] = INCBIN_U8("graphics/pokemon/gen_1/tentacruel/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tentacruel[] = INCBIN_U8("graphics/pokemon/tentacruel/footprint.1bpp"); + const u8 gMonFootprint_Tentacruel[] = INCBIN_U8("graphics/pokemon/gen_1/tentacruel/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TENTACOOL #if P_FAMILY_GEODUDE - const u32 gMonFrontPic_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/anim_front.4bpp.lz"); - const u32 gMonPalette_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/normal.gbapal.lz"); - const u32 gMonBackPic_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/back.4bpp.lz"); - const u32 gMonShinyPalette_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/shiny.gbapal.lz"); - const u8 gMonIcon_Geodude[] = INCBIN_U8("graphics/pokemon/geodude/icon.4bpp"); + const u32 gMonFrontPic_Geodude[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/anim_front.4bpp.lz"); + const u32 gMonPalette_Geodude[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/normal.gbapal.lz"); + const u32 gMonBackPic_Geodude[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/back.4bpp.lz"); + const u32 gMonShinyPalette_Geodude[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/shiny.gbapal.lz"); + const u8 gMonIcon_Geodude[] = INCBIN_U8("graphics/pokemon/gen_1/geodude/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Geodude[] = INCBIN_U8("graphics/pokemon/geodude/footprint.1bpp"); + const u8 gMonFootprint_Geodude[] = INCBIN_U8("graphics/pokemon/gen_1/geodude/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/anim_front.4bpp.lz"); - const u32 gMonPalette_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/normal.gbapal.lz"); - const u32 gMonBackPic_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/back.4bpp.lz"); - const u32 gMonShinyPalette_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/shiny.gbapal.lz"); - const u8 gMonIcon_Graveler[] = INCBIN_U8("graphics/pokemon/graveler/icon.4bpp"); + const u32 gMonFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/anim_front.4bpp.lz"); + const u32 gMonPalette_Graveler[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/normal.gbapal.lz"); + const u32 gMonBackPic_Graveler[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/back.4bpp.lz"); + const u32 gMonShinyPalette_Graveler[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/shiny.gbapal.lz"); + const u8 gMonIcon_Graveler[] = INCBIN_U8("graphics/pokemon/gen_1/graveler/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Graveler[] = INCBIN_U8("graphics/pokemon/graveler/footprint.1bpp"); + const u8 gMonFootprint_Graveler[] = INCBIN_U8("graphics/pokemon/gen_1/graveler/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/golem/anim_front.4bpp.lz"); - const u32 gMonPalette_Golem[] = INCBIN_U32("graphics/pokemon/golem/normal.gbapal.lz"); - const u32 gMonBackPic_Golem[] = INCBIN_U32("graphics/pokemon/golem/back.4bpp.lz"); - const u32 gMonShinyPalette_Golem[] = INCBIN_U32("graphics/pokemon/golem/shiny.gbapal.lz"); - const u8 gMonIcon_Golem[] = INCBIN_U8("graphics/pokemon/golem/icon.4bpp"); + const u32 gMonFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/gen_1/golem/anim_front.4bpp.lz"); + const u32 gMonPalette_Golem[] = INCBIN_U32("graphics/pokemon/gen_1/golem/normal.gbapal.lz"); + const u32 gMonBackPic_Golem[] = INCBIN_U32("graphics/pokemon/gen_1/golem/back.4bpp.lz"); + const u32 gMonShinyPalette_Golem[] = INCBIN_U32("graphics/pokemon/gen_1/golem/shiny.gbapal.lz"); + const u8 gMonIcon_Golem[] = INCBIN_U8("graphics/pokemon/gen_1/golem/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Golem[] = INCBIN_U8("graphics/pokemon/golem/footprint.1bpp"); + const u8 gMonFootprint_Golem[] = INCBIN_U8("graphics/pokemon/gen_1/golem/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/front.4bpp.lz"); - const u32 gMonPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_GeodudeAlolan[] = INCBIN_U8("graphics/pokemon/geodude/alolan/icon.4bpp"); + const u32 gMonFrontPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/alolan/front.4bpp.lz"); + const u32 gMonPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/geodude/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_GeodudeAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/geodude/alolan/icon.4bpp"); - const u32 gMonFrontPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/front.4bpp.lz"); - const u32 gMonPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_GravelerAlolan[] = INCBIN_U8("graphics/pokemon/graveler/alolan/icon.4bpp"); + const u32 gMonFrontPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/alolan/front.4bpp.lz"); + const u32 gMonPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/graveler/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_GravelerAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/graveler/alolan/icon.4bpp"); - const u32 gMonFrontPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/front.4bpp.lz"); - const u32 gMonPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_GolemAlolan[] = INCBIN_U8("graphics/pokemon/golem/alolan/icon.4bpp"); + const u32 gMonFrontPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/golem/alolan/front.4bpp.lz"); + const u32 gMonPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/golem/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/golem/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/golem/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_GolemAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/golem/alolan/icon.4bpp"); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_GEODUDE #if P_FAMILY_PONYTA - const u32 gMonFrontPic_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/anim_front.4bpp.lz"); - const u32 gMonPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/normal.gbapal.lz"); - const u32 gMonBackPic_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/back.4bpp.lz"); - const u32 gMonShinyPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/shiny.gbapal.lz"); - const u8 gMonIcon_Ponyta[] = INCBIN_U8("graphics/pokemon/ponyta/icon.4bpp"); + const u32 gMonFrontPic_Ponyta[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/anim_front.4bpp.lz"); + const u32 gMonPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/normal.gbapal.lz"); + const u32 gMonBackPic_Ponyta[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/back.4bpp.lz"); + const u32 gMonShinyPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/shiny.gbapal.lz"); + const u8 gMonIcon_Ponyta[] = INCBIN_U8("graphics/pokemon/gen_1/ponyta/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ponyta[] = INCBIN_U8("graphics/pokemon/ponyta/footprint.1bpp"); + const u8 gMonFootprint_Ponyta[] = INCBIN_U8("graphics/pokemon/gen_1/ponyta/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/anim_front.4bpp.lz"); - const u32 gMonPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/normal.gbapal.lz"); - const u32 gMonBackPic_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/back.4bpp.lz"); - const u32 gMonShinyPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/shiny.gbapal.lz"); - const u8 gMonIcon_Rapidash[] = INCBIN_U8("graphics/pokemon/rapidash/icon.4bpp"); + const u32 gMonFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/anim_front.4bpp.lz"); + const u32 gMonPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/normal.gbapal.lz"); + const u32 gMonBackPic_Rapidash[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/back.4bpp.lz"); + const u32 gMonShinyPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/shiny.gbapal.lz"); + const u8 gMonIcon_Rapidash[] = INCBIN_U8("graphics/pokemon/gen_1/rapidash/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Rapidash[] = INCBIN_U8("graphics/pokemon/rapidash/footprint.1bpp"); + const u8 gMonFootprint_Rapidash[] = INCBIN_U8("graphics/pokemon/gen_1/rapidash/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/front.4bpp.lz"); - const u32 gMonPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_PonytaGalarian[] = INCBIN_U8("graphics/pokemon/ponyta/galarian/icon.4bpp"); + const u32 gMonFrontPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/galarian/front.4bpp.lz"); + const u32 gMonPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/ponyta/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_PonytaGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/ponyta/galarian/icon.4bpp"); - const u32 gMonFrontPic_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/front.4bpp.lz"); - const u32 gMonPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_RapidashGalarian[] = INCBIN_U8("graphics/pokemon/rapidash/galarian/icon.4bpp"); + const u32 gMonFrontPic_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/galarian/front.4bpp.lz"); + const u32 gMonPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/rapidash/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_RapidashGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/rapidash/galarian/icon.4bpp"); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_PONYTA #if P_FAMILY_SLOWPOKE - const u32 gMonFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/anim_front.4bpp.lz"); - const u32 gMonPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/normal.gbapal.lz"); - const u32 gMonBackPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/back.4bpp.lz"); - const u32 gMonShinyPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/shiny.gbapal.lz"); - const u8 gMonIcon_Slowpoke[] = INCBIN_U8("graphics/pokemon/slowpoke/icon.4bpp"); + const u32 gMonFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/anim_front.4bpp.lz"); + const u32 gMonPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/normal.gbapal.lz"); + const u32 gMonBackPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/back.4bpp.lz"); + const u32 gMonShinyPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/shiny.gbapal.lz"); + const u8 gMonIcon_Slowpoke[] = INCBIN_U8("graphics/pokemon/gen_1/slowpoke/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Slowpoke[] = INCBIN_U8("graphics/pokemon/slowpoke/footprint.1bpp"); + const u8 gMonFootprint_Slowpoke[] = INCBIN_U8("graphics/pokemon/gen_1/slowpoke/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/anim_front.4bpp.lz"); - const u32 gMonPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/normal.gbapal.lz"); - const u32 gMonBackPic_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/back.4bpp.lz"); - const u32 gMonShinyPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/shiny.gbapal.lz"); - const u8 gMonIcon_Slowbro[] = INCBIN_U8("graphics/pokemon/slowbro/icon.4bpp"); + const u32 gMonFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/anim_front.4bpp.lz"); + const u32 gMonPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/normal.gbapal.lz"); + const u32 gMonBackPic_Slowbro[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/back.4bpp.lz"); + const u32 gMonShinyPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/shiny.gbapal.lz"); + const u8 gMonIcon_Slowbro[] = INCBIN_U8("graphics/pokemon/gen_1/slowbro/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Slowbro[] = INCBIN_U8("graphics/pokemon/slowbro/footprint.1bpp"); + const u8 gMonFootprint_Slowbro[] = INCBIN_U8("graphics/pokemon/gen_1/slowbro/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/anim_front.4bpp.lz"); - const u32 gMonPalette_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/normal.gbapal.lz"); - const u32 gMonBackPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/back.4bpp.lz"); - const u32 gMonShinyPalette_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/shiny.gbapal.lz"); - const u8 gMonIcon_Slowking[] = INCBIN_U8("graphics/pokemon/slowking/icon.4bpp"); + const u32 gMonFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/anim_front.4bpp.lz"); + const u32 gMonPalette_Slowking[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/normal.gbapal.lz"); + const u32 gMonBackPic_Slowking[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/back.4bpp.lz"); + const u32 gMonShinyPalette_Slowking[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/shiny.gbapal.lz"); + const u8 gMonIcon_Slowking[] = INCBIN_U8("graphics/pokemon/gen_2/slowking/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Slowking[] = INCBIN_U8("graphics/pokemon/slowking/footprint.1bpp"); + const u8 gMonFootprint_Slowking[] = INCBIN_U8("graphics/pokemon/gen_2/slowking/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/front.4bpp.lz"); - const u32 gMonPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/normal.gbapal.lz"); - const u32 gMonBackPic_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/shiny.gbapal.lz"); - const u8 gMonIcon_SlowbroMega[] = INCBIN_U8("graphics/pokemon/slowbro/mega/icon.4bpp"); + const u32 gMonFrontPic_SlowbroMega[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/mega/front.4bpp.lz"); + const u32 gMonPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/mega/normal.gbapal.lz"); + const u32 gMonBackPic_SlowbroMega[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/mega/shiny.gbapal.lz"); + const u8 gMonIcon_SlowbroMega[] = INCBIN_U8("graphics/pokemon/gen_1/slowbro/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/front.4bpp.lz"); - const u32 gMonPalette_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_SlowpokeGalarian[] = INCBIN_U8("graphics/pokemon/slowpoke/galarian/icon.4bpp"); + const u32 gMonFrontPic_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/galarian/front.4bpp.lz"); + const u32 gMonPalette_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowpoke/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_SlowpokeGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/slowpoke/galarian/icon.4bpp"); - const u32 gMonFrontPic_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/front.4bpp.lz"); - const u32 gMonPalette_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_SlowbroGalarian[] = INCBIN_U8("graphics/pokemon/slowbro/galarian/icon.4bpp"); + const u32 gMonFrontPic_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/galarian/front.4bpp.lz"); + const u32 gMonPalette_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/slowbro/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_SlowbroGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/slowbro/galarian/icon.4bpp"); #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/front.4bpp.lz"); - const u32 gMonPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_SlowkingGalarian[] = INCBIN_U8("graphics/pokemon/slowking/galarian/icon.4bpp"); + const u32 gMonFrontPic_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/galarian/front.4bpp.lz"); + const u32 gMonPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/slowking/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_SlowkingGalarian[] = INCBIN_U8("graphics/pokemon/gen_2/slowking/galarian/icon.4bpp"); #endif //P_GEN_2_CROSS_EVOS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_SLOWPOKE #if P_FAMILY_MAGNEMITE - const u32 gMonFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/anim_front.4bpp.lz"); - const u32 gMonPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/normal.gbapal.lz"); - const u32 gMonBackPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/back.4bpp.lz"); - const u32 gMonShinyPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/shiny.gbapal.lz"); - const u8 gMonIcon_Magnemite[] = INCBIN_U8("graphics/pokemon/magnemite/icon.4bpp"); + const u32 gMonFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/gen_1/magnemite/anim_front.4bpp.lz"); + const u32 gMonPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/gen_1/magnemite/normal.gbapal.lz"); + const u32 gMonBackPic_Magnemite[] = INCBIN_U32("graphics/pokemon/gen_1/magnemite/back.4bpp.lz"); + const u32 gMonShinyPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/gen_1/magnemite/shiny.gbapal.lz"); + const u8 gMonIcon_Magnemite[] = INCBIN_U8("graphics/pokemon/gen_1/magnemite/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Magnemite[] = INCBIN_U8("graphics/pokemon/magnemite/footprint.1bpp"); + const u8 gMonFootprint_Magnemite[] = INCBIN_U8("graphics/pokemon/gen_1/magnemite/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/anim_front.4bpp.lz"); - const u32 gMonPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/normal.gbapal.lz"); - const u32 gMonBackPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/back.4bpp.lz"); - const u32 gMonShinyPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/shiny.gbapal.lz"); - const u8 gMonIcon_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/icon.4bpp"); + const u32 gMonFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/gen_1/magneton/anim_front.4bpp.lz"); + const u32 gMonPalette_Magneton[] = INCBIN_U32("graphics/pokemon/gen_1/magneton/normal.gbapal.lz"); + const u32 gMonBackPic_Magneton[] = INCBIN_U32("graphics/pokemon/gen_1/magneton/back.4bpp.lz"); + const u32 gMonShinyPalette_Magneton[] = INCBIN_U32("graphics/pokemon/gen_1/magneton/shiny.gbapal.lz"); + const u8 gMonIcon_Magneton[] = INCBIN_U8("graphics/pokemon/gen_1/magneton/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/footprint.1bpp"); + const u8 gMonFootprint_Magneton[] = INCBIN_U8("graphics/pokemon/gen_1/magneton/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/anim_front.4bpp.lz"); - const u32 gMonPalette_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/normal.gbapal.lz"); - const u32 gMonBackPic_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/back.4bpp.lz"); - const u32 gMonShinyPalette_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/shiny.gbapal.lz"); - const u8 gMonIcon_Magnezone[] = INCBIN_U8("graphics/pokemon/magnezone/icon.4bpp"); + const u32 gMonFrontPic_Magnezone[] = INCBIN_U32("graphics/pokemon/gen_4/magnezone/anim_front.4bpp.lz"); + const u32 gMonPalette_Magnezone[] = INCBIN_U32("graphics/pokemon/gen_4/magnezone/normal.gbapal.lz"); + const u32 gMonBackPic_Magnezone[] = INCBIN_U32("graphics/pokemon/gen_4/magnezone/back.4bpp.lz"); + const u32 gMonShinyPalette_Magnezone[] = INCBIN_U32("graphics/pokemon/gen_4/magnezone/shiny.gbapal.lz"); + const u8 gMonIcon_Magnezone[] = INCBIN_U8("graphics/pokemon/gen_4/magnezone/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Magnezone[] = INCBIN_U8("graphics/pokemon/magnezone/footprint.1bpp"); + const u8 gMonFootprint_Magnezone[] = INCBIN_U8("graphics/pokemon/gen_4/magnezone/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MAGNEMITE #if P_FAMILY_FARFETCHD - const u32 gMonFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/anim_front.4bpp.lz"); - const u32 gMonPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/normal.gbapal.lz"); - const u32 gMonBackPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/back.4bpp.lz"); - const u32 gMonShinyPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/shiny.gbapal.lz"); - const u8 gMonIcon_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetchd/icon.4bpp"); + const u32 gMonFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/anim_front.4bpp.lz"); + const u32 gMonPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/normal.gbapal.lz"); + const u32 gMonBackPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/back.4bpp.lz"); + const u32 gMonShinyPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/shiny.gbapal.lz"); + const u8 gMonIcon_Farfetchd[] = INCBIN_U8("graphics/pokemon/gen_1/farfetchd/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetchd/footprint.1bpp"); + const u8 gMonFootprint_Farfetchd[] = INCBIN_U8("graphics/pokemon/gen_1/farfetchd/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/front.4bpp.lz"); - const u32 gMonPalette_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_FarfetchdGalarian[] = INCBIN_U8("graphics/pokemon/farfetchd/galarian/icon.4bpp"); + const u32 gMonFrontPic_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/galarian/front.4bpp.lz"); + const u32 gMonPalette_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/farfetchd/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_FarfetchdGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/farfetchd/galarian/icon.4bpp"); - const u32 gMonFrontPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/front.4bpp.lz"); - const u32 gMonPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/normal.gbapal.lz"); - const u32 gMonBackPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/back.4bpp.lz"); - const u32 gMonShinyPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/shiny.gbapal.lz"); - const u8 gMonIcon_Sirfetchd[] = INCBIN_U8("graphics/pokemon/sirfetchd/icon.4bpp"); + const u32 gMonFrontPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/gen_8/sirfetchd/front.4bpp.lz"); + const u32 gMonPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/gen_8/sirfetchd/normal.gbapal.lz"); + const u32 gMonBackPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/gen_8/sirfetchd/back.4bpp.lz"); + const u32 gMonShinyPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/gen_8/sirfetchd/shiny.gbapal.lz"); + const u8 gMonIcon_Sirfetchd[] = INCBIN_U8("graphics/pokemon/gen_8/sirfetchd/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sirfetchd[] = INCBIN_U8("graphics/pokemon/sirfetchd/footprint.1bpp"); + const u8 gMonFootprint_Sirfetchd[] = INCBIN_U8("graphics/pokemon/gen_8/sirfetchd/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_FARFETCHD #if P_FAMILY_DODUO - const u32 gMonFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/anim_front.4bpp.lz"); - const u32 gMonPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/normal.gbapal.lz"); - const u32 gMonBackPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/back.4bpp.lz"); - const u32 gMonShinyPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/shiny.gbapal.lz"); - const u8 gMonIcon_Doduo[] = INCBIN_U8("graphics/pokemon/doduo/icon.4bpp"); + const u32 gMonFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/gen_1/doduo/anim_front.4bpp.lz"); + const u32 gMonPalette_Doduo[] = INCBIN_U32("graphics/pokemon/gen_1/doduo/normal.gbapal.lz"); + const u32 gMonBackPic_Doduo[] = INCBIN_U32("graphics/pokemon/gen_1/doduo/back.4bpp.lz"); + const u32 gMonShinyPalette_Doduo[] = INCBIN_U32("graphics/pokemon/gen_1/doduo/shiny.gbapal.lz"); + const u8 gMonIcon_Doduo[] = INCBIN_U8("graphics/pokemon/gen_1/doduo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Doduo[] = INCBIN_U8("graphics/pokemon/doduo/footprint.1bpp"); + const u8 gMonFootprint_Doduo[] = INCBIN_U8("graphics/pokemon/gen_1/doduo/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_DoduoF[] = INCBIN_U32("graphics/pokemon/doduo/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_DoduoF[] = INCBIN_U32("graphics/pokemon/doduo/backf.4bpp.lz"); + const u32 gMonFrontPic_DoduoF[] = INCBIN_U32("graphics/pokemon/gen_1/doduo/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_DoduoF[] = INCBIN_U32("graphics/pokemon/gen_1/doduo/backf.4bpp.lz"); - const u32 gMonFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/anim_front.4bpp.lz"); - const u32 gMonPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/normal.gbapal.lz"); - const u32 gMonBackPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/back.4bpp.lz"); - const u32 gMonShinyPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/shiny.gbapal.lz"); - const u8 gMonIcon_Dodrio[] = INCBIN_U8("graphics/pokemon/dodrio/icon.4bpp"); + const u32 gMonFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/gen_1/dodrio/anim_front.4bpp.lz"); + const u32 gMonPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/gen_1/dodrio/normal.gbapal.lz"); + const u32 gMonBackPic_Dodrio[] = INCBIN_U32("graphics/pokemon/gen_1/dodrio/back.4bpp.lz"); + const u32 gMonShinyPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/gen_1/dodrio/shiny.gbapal.lz"); + const u8 gMonIcon_Dodrio[] = INCBIN_U8("graphics/pokemon/gen_1/dodrio/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dodrio[] = INCBIN_U8("graphics/pokemon/dodrio/footprint.1bpp"); + const u8 gMonFootprint_Dodrio[] = INCBIN_U8("graphics/pokemon/gen_1/dodrio/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_DodrioF[] = INCBIN_U32("graphics/pokemon/dodrio/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_DodrioF[] = INCBIN_U32("graphics/pokemon/dodrio/backf.4bpp.lz"); + const u32 gMonFrontPic_DodrioF[] = INCBIN_U32("graphics/pokemon/gen_1/dodrio/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_DodrioF[] = INCBIN_U32("graphics/pokemon/gen_1/dodrio/backf.4bpp.lz"); #endif //P_FAMILY_DODUO #if P_FAMILY_SEEL - const u32 gMonFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/anim_front.4bpp.lz"); - const u32 gMonPalette_Seel[] = INCBIN_U32("graphics/pokemon/seel/normal.gbapal.lz"); - const u32 gMonBackPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/back.4bpp.lz"); - const u32 gMonShinyPalette_Seel[] = INCBIN_U32("graphics/pokemon/seel/shiny.gbapal.lz"); - const u8 gMonIcon_Seel[] = INCBIN_U8("graphics/pokemon/seel/icon.4bpp"); + const u32 gMonFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/gen_1/seel/anim_front.4bpp.lz"); + const u32 gMonPalette_Seel[] = INCBIN_U32("graphics/pokemon/gen_1/seel/normal.gbapal.lz"); + const u32 gMonBackPic_Seel[] = INCBIN_U32("graphics/pokemon/gen_1/seel/back.4bpp.lz"); + const u32 gMonShinyPalette_Seel[] = INCBIN_U32("graphics/pokemon/gen_1/seel/shiny.gbapal.lz"); + const u8 gMonIcon_Seel[] = INCBIN_U8("graphics/pokemon/gen_1/seel/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Seel[] = INCBIN_U8("graphics/pokemon/seel/footprint.1bpp"); + const u8 gMonFootprint_Seel[] = INCBIN_U8("graphics/pokemon/gen_1/seel/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/anim_front.4bpp.lz"); - const u32 gMonPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/normal.gbapal.lz"); - const u32 gMonBackPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/back.4bpp.lz"); - const u32 gMonShinyPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/shiny.gbapal.lz"); - const u8 gMonIcon_Dewgong[] = INCBIN_U8("graphics/pokemon/dewgong/icon.4bpp"); + const u32 gMonFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/gen_1/dewgong/anim_front.4bpp.lz"); + const u32 gMonPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/gen_1/dewgong/normal.gbapal.lz"); + const u32 gMonBackPic_Dewgong[] = INCBIN_U32("graphics/pokemon/gen_1/dewgong/back.4bpp.lz"); + const u32 gMonShinyPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/gen_1/dewgong/shiny.gbapal.lz"); + const u8 gMonIcon_Dewgong[] = INCBIN_U8("graphics/pokemon/gen_1/dewgong/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dewgong[] = INCBIN_U8("graphics/pokemon/dewgong/footprint.1bpp"); + const u8 gMonFootprint_Dewgong[] = INCBIN_U8("graphics/pokemon/gen_1/dewgong/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SEEL #if P_FAMILY_GRIMER - const u32 gMonFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/anim_front.4bpp.lz"); - const u32 gMonPalette_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/normal.gbapal.lz"); - const u32 gMonBackPic_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/back.4bpp.lz"); - const u32 gMonShinyPalette_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/shiny.gbapal.lz"); - const u8 gMonIcon_Grimer[] = INCBIN_U8("graphics/pokemon/grimer/icon.4bpp"); + const u32 gMonFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/anim_front.4bpp.lz"); + const u32 gMonPalette_Grimer[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/normal.gbapal.lz"); + const u32 gMonBackPic_Grimer[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/back.4bpp.lz"); + const u32 gMonShinyPalette_Grimer[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/shiny.gbapal.lz"); + const u8 gMonIcon_Grimer[] = INCBIN_U8("graphics/pokemon/gen_1/grimer/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Grimer[] = INCBIN_U8("graphics/pokemon/grimer/footprint.1bpp"); + const u8 gMonFootprint_Grimer[] = INCBIN_U8("graphics/pokemon/gen_1/grimer/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/muk/anim_front.4bpp.lz"); - const u32 gMonPalette_Muk[] = INCBIN_U32("graphics/pokemon/muk/normal.gbapal.lz"); - const u32 gMonBackPic_Muk[] = INCBIN_U32("graphics/pokemon/muk/back.4bpp.lz"); - const u32 gMonShinyPalette_Muk[] = INCBIN_U32("graphics/pokemon/muk/shiny.gbapal.lz"); - const u8 gMonIcon_Muk[] = INCBIN_U8("graphics/pokemon/muk/icon.4bpp"); + const u32 gMonFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/gen_1/muk/anim_front.4bpp.lz"); + const u32 gMonPalette_Muk[] = INCBIN_U32("graphics/pokemon/gen_1/muk/normal.gbapal.lz"); + const u32 gMonBackPic_Muk[] = INCBIN_U32("graphics/pokemon/gen_1/muk/back.4bpp.lz"); + const u32 gMonShinyPalette_Muk[] = INCBIN_U32("graphics/pokemon/gen_1/muk/shiny.gbapal.lz"); + const u8 gMonIcon_Muk[] = INCBIN_U8("graphics/pokemon/gen_1/muk/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Muk[] = INCBIN_U8("graphics/pokemon/muk/footprint.1bpp"); + const u8 gMonFootprint_Muk[] = INCBIN_U8("graphics/pokemon/gen_1/muk/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/front.4bpp.lz"); - const u32 gMonPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_GrimerAlolan[] = INCBIN_U8("graphics/pokemon/grimer/alolan/icon.4bpp"); + const u32 gMonFrontPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/alolan/front.4bpp.lz"); + const u32 gMonPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/grimer/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_GrimerAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/grimer/alolan/icon.4bpp"); - const u32 gMonFrontPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/front.4bpp.lz"); - const u32 gMonPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_MukAlolan[] = INCBIN_U8("graphics/pokemon/muk/alolan/icon.4bpp"); + const u32 gMonFrontPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/muk/alolan/front.4bpp.lz"); + const u32 gMonPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/muk/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/muk/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/muk/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_MukAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/muk/alolan/icon.4bpp"); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_GRIMER #if P_FAMILY_SHELLDER - const u32 gMonFrontPic_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/anim_front.4bpp.lz"); - const u32 gMonPalette_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/normal.gbapal.lz"); - const u32 gMonBackPic_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/back.4bpp.lz"); - const u32 gMonShinyPalette_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/shiny.gbapal.lz"); - const u8 gMonIcon_Shellder[] = INCBIN_U8("graphics/pokemon/shellder/icon.4bpp"); + const u32 gMonFrontPic_Shellder[] = INCBIN_U32("graphics/pokemon/gen_1/shellder/anim_front.4bpp.lz"); + const u32 gMonPalette_Shellder[] = INCBIN_U32("graphics/pokemon/gen_1/shellder/normal.gbapal.lz"); + const u32 gMonBackPic_Shellder[] = INCBIN_U32("graphics/pokemon/gen_1/shellder/back.4bpp.lz"); + const u32 gMonShinyPalette_Shellder[] = INCBIN_U32("graphics/pokemon/gen_1/shellder/shiny.gbapal.lz"); + const u8 gMonIcon_Shellder[] = INCBIN_U8("graphics/pokemon/gen_1/shellder/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Shellder[] = INCBIN_U8("graphics/pokemon/shellder/footprint.1bpp"); + const u8 gMonFootprint_Shellder[] = INCBIN_U8("graphics/pokemon/gen_1/shellder/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/anim_front.4bpp.lz"); - const u32 gMonPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/normal.gbapal.lz"); - const u32 gMonBackPic_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/back.4bpp.lz"); - const u32 gMonShinyPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/shiny.gbapal.lz"); - const u8 gMonIcon_Cloyster[] = INCBIN_U8("graphics/pokemon/cloyster/icon.4bpp"); + const u32 gMonFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/gen_1/cloyster/anim_front.4bpp.lz"); + const u32 gMonPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/gen_1/cloyster/normal.gbapal.lz"); + const u32 gMonBackPic_Cloyster[] = INCBIN_U32("graphics/pokemon/gen_1/cloyster/back.4bpp.lz"); + const u32 gMonShinyPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/gen_1/cloyster/shiny.gbapal.lz"); + const u8 gMonIcon_Cloyster[] = INCBIN_U8("graphics/pokemon/gen_1/cloyster/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cloyster[] = INCBIN_U8("graphics/pokemon/cloyster/footprint.1bpp"); + const u8 gMonFootprint_Cloyster[] = INCBIN_U8("graphics/pokemon/gen_1/cloyster/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SHELLDER #if P_FAMILY_GASTLY - const u32 gMonFrontPic_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/anim_front.4bpp.lz"); - const u32 gMonPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/normal.gbapal.lz"); - const u32 gMonBackPic_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/back.4bpp.lz"); - const u32 gMonShinyPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/shiny.gbapal.lz"); - const u8 gMonIcon_Gastly[] = INCBIN_U8("graphics/pokemon/gastly/icon.4bpp"); + const u32 gMonFrontPic_Gastly[] = INCBIN_U32("graphics/pokemon/gen_1/gastly/anim_front.4bpp.lz"); + const u32 gMonPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gen_1/gastly/normal.gbapal.lz"); + const u32 gMonBackPic_Gastly[] = INCBIN_U32("graphics/pokemon/gen_1/gastly/back.4bpp.lz"); + const u32 gMonShinyPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gen_1/gastly/shiny.gbapal.lz"); + const u8 gMonIcon_Gastly[] = INCBIN_U8("graphics/pokemon/gen_1/gastly/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gastly[] = INCBIN_U8("graphics/pokemon/gastly/footprint.1bpp"); + const u8 gMonFootprint_Gastly[] = INCBIN_U8("graphics/pokemon/gen_1/gastly/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/anim_front.4bpp.lz"); - const u32 gMonPalette_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/normal.gbapal.lz"); - const u32 gMonBackPic_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/back.4bpp.lz"); - const u32 gMonShinyPalette_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/shiny.gbapal.lz"); - const u8 gMonIcon_Haunter[] = INCBIN_U8("graphics/pokemon/haunter/icon.4bpp"); + const u32 gMonFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/gen_1/haunter/anim_front.4bpp.lz"); + const u32 gMonPalette_Haunter[] = INCBIN_U32("graphics/pokemon/gen_1/haunter/normal.gbapal.lz"); + const u32 gMonBackPic_Haunter[] = INCBIN_U32("graphics/pokemon/gen_1/haunter/back.4bpp.lz"); + const u32 gMonShinyPalette_Haunter[] = INCBIN_U32("graphics/pokemon/gen_1/haunter/shiny.gbapal.lz"); + const u8 gMonIcon_Haunter[] = INCBIN_U8("graphics/pokemon/gen_1/haunter/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Haunter[] = INCBIN_U8("graphics/pokemon/haunter/footprint.1bpp"); + const u8 gMonFootprint_Haunter[] = INCBIN_U8("graphics/pokemon/gen_1/haunter/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/anim_front.4bpp.lz"); - const u32 gMonPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/normal.gbapal.lz"); - const u32 gMonBackPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/back.4bpp.lz"); - const u32 gMonShinyPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/shiny.gbapal.lz"); - const u8 gMonIcon_Gengar[] = INCBIN_U8("graphics/pokemon/gengar/icon.4bpp"); + const u32 gMonFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/anim_front.4bpp.lz"); + const u32 gMonPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/normal.gbapal.lz"); + const u32 gMonBackPic_Gengar[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/back.4bpp.lz"); + const u32 gMonShinyPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/shiny.gbapal.lz"); + const u8 gMonIcon_Gengar[] = INCBIN_U8("graphics/pokemon/gen_1/gengar/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gengar[] = INCBIN_U8("graphics/pokemon/gengar/footprint.1bpp"); + const u8 gMonFootprint_Gengar[] = INCBIN_U8("graphics/pokemon/gen_1/gengar/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/front.4bpp.lz"); - const u32 gMonPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/normal.gbapal.lz"); - const u32 gMonBackPic_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/shiny.gbapal.lz"); - const u8 gMonIcon_GengarMega[] = INCBIN_U8("graphics/pokemon/gengar/mega/icon.4bpp"); + const u32 gMonFrontPic_GengarMega[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/mega/front.4bpp.lz"); + const u32 gMonPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/mega/normal.gbapal.lz"); + const u32 gMonBackPic_GengarMega[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/mega/shiny.gbapal.lz"); + const u8 gMonIcon_GengarMega[] = INCBIN_U8("graphics/pokemon/gen_1/gengar/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_GengarGigantamax[] = INCBIN_U8("graphics/pokemon/gengar/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/gengar/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_GengarGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/gengar/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GASTLY #if P_FAMILY_ONIX - const u32 gMonFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/onix/anim_front.4bpp.lz"); - const u32 gMonPalette_Onix[] = INCBIN_U32("graphics/pokemon/onix/normal.gbapal.lz"); - const u32 gMonBackPic_Onix[] = INCBIN_U32("graphics/pokemon/onix/back.4bpp.lz"); - const u32 gMonShinyPalette_Onix[] = INCBIN_U32("graphics/pokemon/onix/shiny.gbapal.lz"); - const u8 gMonIcon_Onix[] = INCBIN_U8("graphics/pokemon/onix/icon.4bpp"); + const u32 gMonFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/gen_1/onix/anim_front.4bpp.lz"); + const u32 gMonPalette_Onix[] = INCBIN_U32("graphics/pokemon/gen_1/onix/normal.gbapal.lz"); + const u32 gMonBackPic_Onix[] = INCBIN_U32("graphics/pokemon/gen_1/onix/back.4bpp.lz"); + const u32 gMonShinyPalette_Onix[] = INCBIN_U32("graphics/pokemon/gen_1/onix/shiny.gbapal.lz"); + const u8 gMonIcon_Onix[] = INCBIN_U8("graphics/pokemon/gen_1/onix/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Onix[] = INCBIN_U8("graphics/pokemon/onix/footprint.1bpp"); + const u8 gMonFootprint_Onix[] = INCBIN_U8("graphics/pokemon/gen_1/onix/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/anim_front.4bpp.lz"); - const u32 gMonPalette_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/normal.gbapal.lz"); - const u32 gMonBackPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/back.4bpp.lz"); - const u32 gMonShinyPalette_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/shiny.gbapal.lz"); - const u8 gMonIcon_Steelix[] = INCBIN_U8("graphics/pokemon/steelix/icon.4bpp"); + const u32 gMonFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/anim_front.4bpp.lz"); + const u32 gMonPalette_Steelix[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/normal.gbapal.lz"); + const u32 gMonBackPic_Steelix[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/back.4bpp.lz"); + const u32 gMonShinyPalette_Steelix[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/shiny.gbapal.lz"); + const u8 gMonIcon_Steelix[] = INCBIN_U8("graphics/pokemon/gen_2/steelix/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Steelix[] = INCBIN_U8("graphics/pokemon/steelix/footprint.1bpp"); + const u8 gMonFootprint_Steelix[] = INCBIN_U8("graphics/pokemon/gen_2/steelix/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_SteelixF[] = INCBIN_U32("graphics/pokemon/steelix/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_SteelixF[] = INCBIN_U32("graphics/pokemon/steelix/backf.4bpp.lz"); + const u32 gMonFrontPic_SteelixF[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_SteelixF[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/backf.4bpp.lz"); #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/front.4bpp.lz"); - const u32 gMonPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/normal.gbapal.lz"); - const u32 gMonBackPic_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/shiny.gbapal.lz"); - const u8 gMonIcon_SteelixMega[] = INCBIN_U8("graphics/pokemon/steelix/mega/icon.4bpp"); + const u32 gMonFrontPic_SteelixMega[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/mega/front.4bpp.lz"); + const u32 gMonPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/mega/normal.gbapal.lz"); + const u32 gMonBackPic_SteelixMega[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/gen_2/steelix/mega/shiny.gbapal.lz"); + const u8 gMonIcon_SteelixMega[] = INCBIN_U8("graphics/pokemon/gen_2/steelix/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_ONIX #if P_FAMILY_DROWZEE - const u32 gMonFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/anim_front.4bpp.lz"); - const u32 gMonPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/normal.gbapal.lz"); - const u32 gMonBackPic_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/back.4bpp.lz"); - const u32 gMonShinyPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/shiny.gbapal.lz"); - const u8 gMonIcon_Drowzee[] = INCBIN_U8("graphics/pokemon/drowzee/icon.4bpp"); + const u32 gMonFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/gen_1/drowzee/anim_front.4bpp.lz"); + const u32 gMonPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/gen_1/drowzee/normal.gbapal.lz"); + const u32 gMonBackPic_Drowzee[] = INCBIN_U32("graphics/pokemon/gen_1/drowzee/back.4bpp.lz"); + const u32 gMonShinyPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/gen_1/drowzee/shiny.gbapal.lz"); + const u8 gMonIcon_Drowzee[] = INCBIN_U8("graphics/pokemon/gen_1/drowzee/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Drowzee[] = INCBIN_U8("graphics/pokemon/drowzee/footprint.1bpp"); + const u8 gMonFootprint_Drowzee[] = INCBIN_U8("graphics/pokemon/gen_1/drowzee/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/anim_front.4bpp.lz"); - const u32 gMonPalette_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/normal.gbapal.lz"); - const u32 gMonBackPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/back.4bpp.lz"); - const u32 gMonShinyPalette_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/shiny.gbapal.lz"); - const u8 gMonIcon_Hypno[] = INCBIN_U8("graphics/pokemon/hypno/icon.4bpp"); + const u32 gMonFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/gen_1/hypno/anim_front.4bpp.lz"); + const u32 gMonPalette_Hypno[] = INCBIN_U32("graphics/pokemon/gen_1/hypno/normal.gbapal.lz"); + const u32 gMonBackPic_Hypno[] = INCBIN_U32("graphics/pokemon/gen_1/hypno/back.4bpp.lz"); + const u32 gMonShinyPalette_Hypno[] = INCBIN_U32("graphics/pokemon/gen_1/hypno/shiny.gbapal.lz"); + const u8 gMonIcon_Hypno[] = INCBIN_U8("graphics/pokemon/gen_1/hypno/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hypno[] = INCBIN_U8("graphics/pokemon/hypno/footprint.1bpp"); + const u8 gMonFootprint_Hypno[] = INCBIN_U8("graphics/pokemon/gen_1/hypno/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_HypnoF[] = INCBIN_U32("graphics/pokemon/hypno/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_HypnoF[] = INCBIN_U32("graphics/pokemon/hypno/backf.4bpp.lz"); + const u32 gMonFrontPic_HypnoF[] = INCBIN_U32("graphics/pokemon/gen_1/hypno/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_HypnoF[] = INCBIN_U32("graphics/pokemon/gen_1/hypno/backf.4bpp.lz"); #endif //P_FAMILY_DROWZEE #if P_FAMILY_KRABBY - const u32 gMonFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/anim_front.4bpp.lz"); - const u32 gMonPalette_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/normal.gbapal.lz"); - const u32 gMonBackPic_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/back.4bpp.lz"); - const u32 gMonShinyPalette_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/shiny.gbapal.lz"); - const u8 gMonIcon_Krabby[] = INCBIN_U8("graphics/pokemon/krabby/icon.4bpp"); + const u32 gMonFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/gen_1/krabby/anim_front.4bpp.lz"); + const u32 gMonPalette_Krabby[] = INCBIN_U32("graphics/pokemon/gen_1/krabby/normal.gbapal.lz"); + const u32 gMonBackPic_Krabby[] = INCBIN_U32("graphics/pokemon/gen_1/krabby/back.4bpp.lz"); + const u32 gMonShinyPalette_Krabby[] = INCBIN_U32("graphics/pokemon/gen_1/krabby/shiny.gbapal.lz"); + const u8 gMonIcon_Krabby[] = INCBIN_U8("graphics/pokemon/gen_1/krabby/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Krabby[] = INCBIN_U8("graphics/pokemon/krabby/footprint.1bpp"); + const u8 gMonFootprint_Krabby[] = INCBIN_U8("graphics/pokemon/gen_1/krabby/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/anim_front.4bpp.lz"); - const u32 gMonPalette_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/normal.gbapal.lz"); - const u32 gMonBackPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/back.4bpp.lz"); - const u32 gMonShinyPalette_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/shiny.gbapal.lz"); - const u8 gMonIcon_Kingler[] = INCBIN_U8("graphics/pokemon/kingler/icon.4bpp"); + const u32 gMonFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/anim_front.4bpp.lz"); + const u32 gMonPalette_Kingler[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/normal.gbapal.lz"); + const u32 gMonBackPic_Kingler[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/back.4bpp.lz"); + const u32 gMonShinyPalette_Kingler[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/shiny.gbapal.lz"); + const u8 gMonIcon_Kingler[] = INCBIN_U8("graphics/pokemon/gen_1/kingler/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kingler[] = INCBIN_U8("graphics/pokemon/kingler/footprint.1bpp"); + const u8 gMonFootprint_Kingler[] = INCBIN_U8("graphics/pokemon/gen_1/kingler/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_KinglerGigantamax[] = INCBIN_U8("graphics/pokemon/kingler/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/kingler/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_KinglerGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/kingler/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_KRABBY #if P_FAMILY_VOLTORB - const u32 gMonFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/anim_front.4bpp.lz"); - const u32 gMonPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/normal.gbapal.lz"); - const u32 gMonBackPic_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/back.4bpp.lz"); - const u32 gMonShinyPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/shiny.gbapal.lz"); - const u8 gMonIcon_Voltorb[] = INCBIN_U8("graphics/pokemon/voltorb/icon.4bpp"); + const u32 gMonFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/anim_front.4bpp.lz"); + const u32 gMonPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/normal.gbapal.lz"); + const u32 gMonBackPic_Voltorb[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/back.4bpp.lz"); + const u32 gMonShinyPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/shiny.gbapal.lz"); + const u8 gMonIcon_Voltorb[] = INCBIN_U8("graphics/pokemon/gen_1/voltorb/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Voltorb[] = INCBIN_U8("graphics/pokemon/voltorb/footprint.1bpp"); + const u8 gMonFootprint_Voltorb[] = INCBIN_U8("graphics/pokemon/gen_1/voltorb/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/anim_front.4bpp.lz"); - const u32 gMonPalette_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/normal.gbapal.lz"); - const u32 gMonBackPic_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/back.4bpp.lz"); - const u32 gMonShinyPalette_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/shiny.gbapal.lz"); - const u8 gMonIcon_Electrode[] = INCBIN_U8("graphics/pokemon/electrode/icon.4bpp"); + const u32 gMonFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/anim_front.4bpp.lz"); + const u32 gMonPalette_Electrode[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/normal.gbapal.lz"); + const u32 gMonBackPic_Electrode[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/back.4bpp.lz"); + const u32 gMonShinyPalette_Electrode[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/shiny.gbapal.lz"); + const u8 gMonIcon_Electrode[] = INCBIN_U8("graphics/pokemon/gen_1/electrode/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Electrode[] = INCBIN_U8("graphics/pokemon/electrode/footprint.1bpp"); + const u8 gMonFootprint_Electrode[] = INCBIN_U8("graphics/pokemon/gen_1/electrode/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/front.4bpp.lz"); - const u32 gMonPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_VoltorbHisuian[] = INCBIN_U8("graphics/pokemon/voltorb/hisuian/icon.4bpp"); + const u32 gMonFrontPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/hisuian/front.4bpp.lz"); + const u32 gMonPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/voltorb/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_VoltorbHisuian[] = INCBIN_U8("graphics/pokemon/gen_1/voltorb/hisuian/icon.4bpp"); - const u32 gMonFrontPic_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/front.4bpp.lz"); - const u32 gMonPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_ElectrodeHisuian[] = INCBIN_U8("graphics/pokemon/electrode/hisuian/icon.4bpp"); + const u32 gMonFrontPic_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/hisuian/front.4bpp.lz"); + const u32 gMonPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/gen_1/electrode/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_ElectrodeHisuian[] = INCBIN_U8("graphics/pokemon/gen_1/electrode/hisuian/icon.4bpp"); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_VOLTORB #if P_FAMILY_EXEGGCUTE - const u32 gMonFrontPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/anim_front.4bpp.lz"); - const u32 gMonPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/normal.gbapal.lz"); - const u32 gMonBackPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/back.4bpp.lz"); - const u32 gMonShinyPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/shiny.gbapal.lz"); - const u8 gMonIcon_Exeggcute[] = INCBIN_U8("graphics/pokemon/exeggcute/icon.4bpp"); + const u32 gMonFrontPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/gen_1/exeggcute/anim_front.4bpp.lz"); + const u32 gMonPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/gen_1/exeggcute/normal.gbapal.lz"); + const u32 gMonBackPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/gen_1/exeggcute/back.4bpp.lz"); + const u32 gMonShinyPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/gen_1/exeggcute/shiny.gbapal.lz"); + const u8 gMonIcon_Exeggcute[] = INCBIN_U8("graphics/pokemon/gen_1/exeggcute/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Exeggcute[] = INCBIN_U8("graphics/pokemon/exeggcute/footprint.1bpp"); + const u8 gMonFootprint_Exeggcute[] = INCBIN_U8("graphics/pokemon/gen_1/exeggcute/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/anim_front.4bpp.lz"); - const u32 gMonPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/normal.gbapal.lz"); - const u32 gMonBackPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/back.4bpp.lz"); - const u32 gMonShinyPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/shiny.gbapal.lz"); - const u8 gMonIcon_Exeggutor[] = INCBIN_U8("graphics/pokemon/exeggutor/icon.4bpp"); + const u32 gMonFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/anim_front.4bpp.lz"); + const u32 gMonPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/normal.gbapal.lz"); + const u32 gMonBackPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/back.4bpp.lz"); + const u32 gMonShinyPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/shiny.gbapal.lz"); + const u8 gMonIcon_Exeggutor[] = INCBIN_U8("graphics/pokemon/gen_1/exeggutor/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Exeggutor[] = INCBIN_U8("graphics/pokemon/exeggutor/footprint.1bpp"); + const u8 gMonFootprint_Exeggutor[] = INCBIN_U8("graphics/pokemon/gen_1/exeggutor/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/anim_front.4bpp.lz"); - const u32 gMonPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_ExeggutorAlolan[] = INCBIN_U8("graphics/pokemon/exeggutor/alolan/icon.4bpp"); + const u32 gMonFrontPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/alolan/anim_front.4bpp.lz"); + const u32 gMonPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/exeggutor/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_ExeggutorAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/exeggutor/alolan/icon.4bpp"); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_EXEGGCUTE #if P_FAMILY_CUBONE - const u32 gMonFrontPic_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/anim_front.4bpp.lz"); - const u32 gMonPalette_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/normal.gbapal.lz"); - const u32 gMonBackPic_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/back.4bpp.lz"); - const u32 gMonShinyPalette_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/shiny.gbapal.lz"); - const u8 gMonIcon_Cubone[] = INCBIN_U8("graphics/pokemon/cubone/icon.4bpp"); + const u32 gMonFrontPic_Cubone[] = INCBIN_U32("graphics/pokemon/gen_1/cubone/anim_front.4bpp.lz"); + const u32 gMonPalette_Cubone[] = INCBIN_U32("graphics/pokemon/gen_1/cubone/normal.gbapal.lz"); + const u32 gMonBackPic_Cubone[] = INCBIN_U32("graphics/pokemon/gen_1/cubone/back.4bpp.lz"); + const u32 gMonShinyPalette_Cubone[] = INCBIN_U32("graphics/pokemon/gen_1/cubone/shiny.gbapal.lz"); + const u8 gMonIcon_Cubone[] = INCBIN_U8("graphics/pokemon/gen_1/cubone/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cubone[] = INCBIN_U8("graphics/pokemon/cubone/footprint.1bpp"); + const u8 gMonFootprint_Cubone[] = INCBIN_U8("graphics/pokemon/gen_1/cubone/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/anim_front.4bpp.lz"); - const u32 gMonPalette_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/normal.gbapal.lz"); - const u32 gMonBackPic_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/back.4bpp.lz"); - const u32 gMonShinyPalette_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/shiny.gbapal.lz"); - const u8 gMonIcon_Marowak[] = INCBIN_U8("graphics/pokemon/marowak/icon.4bpp"); + const u32 gMonFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/anim_front.4bpp.lz"); + const u32 gMonPalette_Marowak[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/normal.gbapal.lz"); + const u32 gMonBackPic_Marowak[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/back.4bpp.lz"); + const u32 gMonShinyPalette_Marowak[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/shiny.gbapal.lz"); + const u8 gMonIcon_Marowak[] = INCBIN_U8("graphics/pokemon/gen_1/marowak/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Marowak[] = INCBIN_U8("graphics/pokemon/marowak/footprint.1bpp"); + const u8 gMonFootprint_Marowak[] = INCBIN_U8("graphics/pokemon/gen_1/marowak/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/front.4bpp.lz"); - const u32 gMonPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_MarowakAlolan[] = INCBIN_U8("graphics/pokemon/marowak/alolan/icon.4bpp"); + const u32 gMonFrontPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/alolan/front.4bpp.lz"); + const u32 gMonPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/alolan/normal.gbapal.lz"); + const u32 gMonBackPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/alolan/back.4bpp.lz"); + const u32 gMonShinyPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/gen_1/marowak/alolan/shiny.gbapal.lz"); + const u8 gMonIcon_MarowakAlolan[] = INCBIN_U8("graphics/pokemon/gen_1/marowak/alolan/icon.4bpp"); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_CUBONE #if P_FAMILY_HITMONS #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/anim_front.4bpp.lz"); - const u32 gMonPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/normal.gbapal.lz"); - const u32 gMonBackPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/back.4bpp.lz"); - const u32 gMonShinyPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/shiny.gbapal.lz"); - const u8 gMonIcon_Tyrogue[] = INCBIN_U8("graphics/pokemon/tyrogue/icon.4bpp"); + const u32 gMonFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/gen_2/tyrogue/anim_front.4bpp.lz"); + const u32 gMonPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/gen_2/tyrogue/normal.gbapal.lz"); + const u32 gMonBackPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/gen_2/tyrogue/back.4bpp.lz"); + const u32 gMonShinyPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/gen_2/tyrogue/shiny.gbapal.lz"); + const u8 gMonIcon_Tyrogue[] = INCBIN_U8("graphics/pokemon/gen_2/tyrogue/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tyrogue[] = INCBIN_U8("graphics/pokemon/tyrogue/footprint.1bpp"); + const u8 gMonFootprint_Tyrogue[] = INCBIN_U8("graphics/pokemon/gen_2/tyrogue/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/anim_front.4bpp.lz"); - const u32 gMonPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/normal.gbapal.lz"); - const u32 gMonBackPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/back.4bpp.lz"); - const u32 gMonShinyPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/shiny.gbapal.lz"); - const u8 gMonIcon_Hitmonlee[] = INCBIN_U8("graphics/pokemon/hitmonlee/icon.4bpp"); + const u32 gMonFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonlee/anim_front.4bpp.lz"); + const u32 gMonPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonlee/normal.gbapal.lz"); + const u32 gMonBackPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonlee/back.4bpp.lz"); + const u32 gMonShinyPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonlee/shiny.gbapal.lz"); + const u8 gMonIcon_Hitmonlee[] = INCBIN_U8("graphics/pokemon/gen_1/hitmonlee/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hitmonlee[] = INCBIN_U8("graphics/pokemon/hitmonlee/footprint.1bpp"); + const u8 gMonFootprint_Hitmonlee[] = INCBIN_U8("graphics/pokemon/gen_1/hitmonlee/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/anim_front.4bpp.lz"); - const u32 gMonPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/normal.gbapal.lz"); - const u32 gMonBackPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/back.4bpp.lz"); - const u32 gMonShinyPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/shiny.gbapal.lz"); - const u8 gMonIcon_Hitmonchan[] = INCBIN_U8("graphics/pokemon/hitmonchan/icon.4bpp"); + const u32 gMonFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonchan/anim_front.4bpp.lz"); + const u32 gMonPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonchan/normal.gbapal.lz"); + const u32 gMonBackPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonchan/back.4bpp.lz"); + const u32 gMonShinyPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/gen_1/hitmonchan/shiny.gbapal.lz"); + const u8 gMonIcon_Hitmonchan[] = INCBIN_U8("graphics/pokemon/gen_1/hitmonchan/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hitmonchan[] = INCBIN_U8("graphics/pokemon/hitmonchan/footprint.1bpp"); + const u8 gMonFootprint_Hitmonchan[] = INCBIN_U8("graphics/pokemon/gen_1/hitmonchan/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/anim_front.4bpp.lz"); - const u32 gMonPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/normal.gbapal.lz"); - const u32 gMonBackPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/back.4bpp.lz"); - const u32 gMonShinyPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/shiny.gbapal.lz"); - const u8 gMonIcon_Hitmontop[] = INCBIN_U8("graphics/pokemon/hitmontop/icon.4bpp"); + const u32 gMonFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/gen_2/hitmontop/anim_front.4bpp.lz"); + const u32 gMonPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/gen_2/hitmontop/normal.gbapal.lz"); + const u32 gMonBackPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/gen_2/hitmontop/back.4bpp.lz"); + const u32 gMonShinyPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/gen_2/hitmontop/shiny.gbapal.lz"); + const u8 gMonIcon_Hitmontop[] = INCBIN_U8("graphics/pokemon/gen_2/hitmontop/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hitmontop[] = INCBIN_U8("graphics/pokemon/hitmontop/footprint.1bpp"); + const u8 gMonFootprint_Hitmontop[] = INCBIN_U8("graphics/pokemon/gen_2/hitmontop/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_HITMONS #if P_FAMILY_LICKITUNG - const u32 gMonFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/anim_front.4bpp.lz"); - const u32 gMonPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/normal.gbapal.lz"); - const u32 gMonBackPic_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/back.4bpp.lz"); - const u32 gMonShinyPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/shiny.gbapal.lz"); - const u8 gMonIcon_Lickitung[] = INCBIN_U8("graphics/pokemon/lickitung/icon.4bpp"); + const u32 gMonFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/gen_1/lickitung/anim_front.4bpp.lz"); + const u32 gMonPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/gen_1/lickitung/normal.gbapal.lz"); + const u32 gMonBackPic_Lickitung[] = INCBIN_U32("graphics/pokemon/gen_1/lickitung/back.4bpp.lz"); + const u32 gMonShinyPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/gen_1/lickitung/shiny.gbapal.lz"); + const u8 gMonIcon_Lickitung[] = INCBIN_U8("graphics/pokemon/gen_1/lickitung/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lickitung[] = INCBIN_U8("graphics/pokemon/lickitung/footprint.1bpp"); + const u8 gMonFootprint_Lickitung[] = INCBIN_U8("graphics/pokemon/gen_1/lickitung/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/anim_front.4bpp.lz"); - const u32 gMonPalette_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/normal.gbapal.lz"); - const u32 gMonBackPic_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/back.4bpp.lz"); - const u32 gMonShinyPalette_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/shiny.gbapal.lz"); - const u8 gMonIcon_Lickilicky[] = INCBIN_U8("graphics/pokemon/lickilicky/icon.4bpp"); + const u32 gMonFrontPic_Lickilicky[] = INCBIN_U32("graphics/pokemon/gen_4/lickilicky/anim_front.4bpp.lz"); + const u32 gMonPalette_Lickilicky[] = INCBIN_U32("graphics/pokemon/gen_4/lickilicky/normal.gbapal.lz"); + const u32 gMonBackPic_Lickilicky[] = INCBIN_U32("graphics/pokemon/gen_4/lickilicky/back.4bpp.lz"); + const u32 gMonShinyPalette_Lickilicky[] = INCBIN_U32("graphics/pokemon/gen_4/lickilicky/shiny.gbapal.lz"); + const u8 gMonIcon_Lickilicky[] = INCBIN_U8("graphics/pokemon/gen_4/lickilicky/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lickilicky[] = INCBIN_U8("graphics/pokemon/lickilicky/footprint.1bpp"); + const u8 gMonFootprint_Lickilicky[] = INCBIN_U8("graphics/pokemon/gen_4/lickilicky/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_LICKITUNG #if P_FAMILY_KOFFING - const u32 gMonFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/anim_front.4bpp.lz"); - const u32 gMonPalette_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/normal.gbapal.lz"); - const u32 gMonBackPic_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/back.4bpp.lz"); - const u32 gMonShinyPalette_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/shiny.gbapal.lz"); - const u8 gMonIcon_Koffing[] = INCBIN_U8("graphics/pokemon/koffing/icon.4bpp"); + const u32 gMonFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/gen_1/koffing/anim_front.4bpp.lz"); + const u32 gMonPalette_Koffing[] = INCBIN_U32("graphics/pokemon/gen_1/koffing/normal.gbapal.lz"); + const u32 gMonBackPic_Koffing[] = INCBIN_U32("graphics/pokemon/gen_1/koffing/back.4bpp.lz"); + const u32 gMonShinyPalette_Koffing[] = INCBIN_U32("graphics/pokemon/gen_1/koffing/shiny.gbapal.lz"); + const u8 gMonIcon_Koffing[] = INCBIN_U8("graphics/pokemon/gen_1/koffing/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Koffing[] = INCBIN_U8("graphics/pokemon/koffing/footprint.1bpp"); + const u8 gMonFootprint_Koffing[] = INCBIN_U8("graphics/pokemon/gen_1/koffing/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/anim_front.4bpp.lz"); - const u32 gMonPalette_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/normal.gbapal.lz"); - const u32 gMonBackPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/back.4bpp.lz"); - const u32 gMonShinyPalette_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/shiny.gbapal.lz"); - const u8 gMonIcon_Weezing[] = INCBIN_U8("graphics/pokemon/weezing/icon.4bpp"); + const u32 gMonFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/anim_front.4bpp.lz"); + const u32 gMonPalette_Weezing[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/normal.gbapal.lz"); + const u32 gMonBackPic_Weezing[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/back.4bpp.lz"); + const u32 gMonShinyPalette_Weezing[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/shiny.gbapal.lz"); + const u8 gMonIcon_Weezing[] = INCBIN_U8("graphics/pokemon/gen_1/weezing/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Weezing[] = INCBIN_U8("graphics/pokemon/weezing/footprint.1bpp"); + const u8 gMonFootprint_Weezing[] = INCBIN_U8("graphics/pokemon/gen_1/weezing/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/front.4bpp.lz"); - const u32 gMonPalette_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_WeezingGalarian[] = INCBIN_U8("graphics/pokemon/weezing/galarian/icon.4bpp"); + const u32 gMonFrontPic_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/galarian/front.4bpp.lz"); + const u32 gMonPalette_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/weezing/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_WeezingGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/weezing/galarian/icon.4bpp"); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_KOFFING #if P_FAMILY_RHYHORN - const u32 gMonFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/anim_front.4bpp.lz"); - const u32 gMonPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/normal.gbapal.lz"); - const u32 gMonBackPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/back.4bpp.lz"); - const u32 gMonShinyPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/shiny.gbapal.lz"); - const u8 gMonIcon_Rhyhorn[] = INCBIN_U8("graphics/pokemon/rhyhorn/icon.4bpp"); + const u32 gMonFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/gen_1/rhyhorn/anim_front.4bpp.lz"); + const u32 gMonPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/gen_1/rhyhorn/normal.gbapal.lz"); + const u32 gMonBackPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/gen_1/rhyhorn/back.4bpp.lz"); + const u32 gMonShinyPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/gen_1/rhyhorn/shiny.gbapal.lz"); + const u8 gMonIcon_Rhyhorn[] = INCBIN_U8("graphics/pokemon/gen_1/rhyhorn/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Rhyhorn[] = INCBIN_U8("graphics/pokemon/rhyhorn/footprint.1bpp"); + const u8 gMonFootprint_Rhyhorn[] = INCBIN_U8("graphics/pokemon/gen_1/rhyhorn/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_RhyhornF[] = INCBIN_U32("graphics/pokemon/rhyhorn/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_RhyhornF[] = INCBIN_U32("graphics/pokemon/rhyhorn/backf.4bpp.lz"); + const u32 gMonFrontPic_RhyhornF[] = INCBIN_U32("graphics/pokemon/gen_1/rhyhorn/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_RhyhornF[] = INCBIN_U32("graphics/pokemon/gen_1/rhyhorn/backf.4bpp.lz"); - const u32 gMonFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/anim_front.4bpp.lz"); - const u32 gMonPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/normal.gbapal.lz"); - const u32 gMonBackPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/back.4bpp.lz"); - const u32 gMonShinyPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/shiny.gbapal.lz"); - const u8 gMonIcon_Rhydon[] = INCBIN_U8("graphics/pokemon/rhydon/icon.4bpp"); + const u32 gMonFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/gen_1/rhydon/anim_front.4bpp.lz"); + const u32 gMonPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/gen_1/rhydon/normal.gbapal.lz"); + const u32 gMonBackPic_Rhydon[] = INCBIN_U32("graphics/pokemon/gen_1/rhydon/back.4bpp.lz"); + const u32 gMonShinyPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/gen_1/rhydon/shiny.gbapal.lz"); + const u8 gMonIcon_Rhydon[] = INCBIN_U8("graphics/pokemon/gen_1/rhydon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Rhydon[] = INCBIN_U8("graphics/pokemon/rhydon/footprint.1bpp"); + const u8 gMonFootprint_Rhydon[] = INCBIN_U8("graphics/pokemon/gen_1/rhydon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_RhydonF[] = INCBIN_U32("graphics/pokemon/rhydon/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_RhydonF[] = INCBIN_U32("graphics/pokemon/rhydon/backf.4bpp.lz"); + const u32 gMonFrontPic_RhydonF[] = INCBIN_U32("graphics/pokemon/gen_1/rhydon/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_RhydonF[] = INCBIN_U32("graphics/pokemon/gen_1/rhydon/backf.4bpp.lz"); #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/anim_front.4bpp.lz"); - const u32 gMonPalette_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/normal.gbapal.lz"); - const u32 gMonBackPic_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/back.4bpp.lz"); - const u32 gMonShinyPalette_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/shiny.gbapal.lz"); - const u8 gMonIcon_Rhyperior[] = INCBIN_U8("graphics/pokemon/rhyperior/icon.4bpp"); + const u32 gMonFrontPic_Rhyperior[] = INCBIN_U32("graphics/pokemon/gen_4/rhyperior/anim_front.4bpp.lz"); + const u32 gMonPalette_Rhyperior[] = INCBIN_U32("graphics/pokemon/gen_4/rhyperior/normal.gbapal.lz"); + const u32 gMonBackPic_Rhyperior[] = INCBIN_U32("graphics/pokemon/gen_4/rhyperior/back.4bpp.lz"); + const u32 gMonShinyPalette_Rhyperior[] = INCBIN_U32("graphics/pokemon/gen_4/rhyperior/shiny.gbapal.lz"); + const u8 gMonIcon_Rhyperior[] = INCBIN_U8("graphics/pokemon/gen_4/rhyperior/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Rhyperior[] = INCBIN_U8("graphics/pokemon/rhyperior/footprint.1bpp"); + const u8 gMonFootprint_Rhyperior[] = INCBIN_U8("graphics/pokemon/gen_4/rhyperior/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_RhyperiorF[] = INCBIN_U32("graphics/pokemon/rhyperior/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_RhyperiorF[] = INCBIN_U32("graphics/pokemon/rhyperior/backf.4bpp.lz"); + const u32 gMonFrontPic_RhyperiorF[] = INCBIN_U32("graphics/pokemon/gen_4/rhyperior/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_RhyperiorF[] = INCBIN_U32("graphics/pokemon/gen_4/rhyperior/backf.4bpp.lz"); #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_RHYHORN #if P_FAMILY_CHANSEY #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/anim_front.4bpp.lz"); - const u32 gMonPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/normal.gbapal.lz"); - const u32 gMonBackPic_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/back.4bpp.lz"); - const u32 gMonShinyPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/shiny.gbapal.lz"); - const u8 gMonIcon_Happiny[] = INCBIN_U8("graphics/pokemon/happiny/icon.4bpp"); + const u32 gMonFrontPic_Happiny[] = INCBIN_U32("graphics/pokemon/gen_4/happiny/anim_front.4bpp.lz"); + const u32 gMonPalette_Happiny[] = INCBIN_U32("graphics/pokemon/gen_4/happiny/normal.gbapal.lz"); + const u32 gMonBackPic_Happiny[] = INCBIN_U32("graphics/pokemon/gen_4/happiny/back.4bpp.lz"); + const u32 gMonShinyPalette_Happiny[] = INCBIN_U32("graphics/pokemon/gen_4/happiny/shiny.gbapal.lz"); + const u8 gMonIcon_Happiny[] = INCBIN_U8("graphics/pokemon/gen_4/happiny/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Happiny[] = INCBIN_U8("graphics/pokemon/happiny/footprint.1bpp"); + const u8 gMonFootprint_Happiny[] = INCBIN_U8("graphics/pokemon/gen_4/happiny/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/anim_front.4bpp.lz"); - const u32 gMonPalette_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/normal.gbapal.lz"); - const u32 gMonBackPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/back.4bpp.lz"); - const u32 gMonShinyPalette_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/shiny.gbapal.lz"); - const u8 gMonIcon_Chansey[] = INCBIN_U8("graphics/pokemon/chansey/icon.4bpp"); + const u32 gMonFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/gen_1/chansey/anim_front.4bpp.lz"); + const u32 gMonPalette_Chansey[] = INCBIN_U32("graphics/pokemon/gen_1/chansey/normal.gbapal.lz"); + const u32 gMonBackPic_Chansey[] = INCBIN_U32("graphics/pokemon/gen_1/chansey/back.4bpp.lz"); + const u32 gMonShinyPalette_Chansey[] = INCBIN_U32("graphics/pokemon/gen_1/chansey/shiny.gbapal.lz"); + const u8 gMonIcon_Chansey[] = INCBIN_U8("graphics/pokemon/gen_1/chansey/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Chansey[] = INCBIN_U8("graphics/pokemon/chansey/footprint.1bpp"); + const u8 gMonFootprint_Chansey[] = INCBIN_U8("graphics/pokemon/gen_1/chansey/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/anim_front.4bpp.lz"); - const u32 gMonPalette_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/normal.gbapal.lz"); - const u32 gMonBackPic_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/back.4bpp.lz"); - const u32 gMonShinyPalette_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/shiny.gbapal.lz"); - const u8 gMonIcon_Blissey[] = INCBIN_U8("graphics/pokemon/blissey/icon.4bpp"); + const u32 gMonFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/gen_2/blissey/anim_front.4bpp.lz"); + const u32 gMonPalette_Blissey[] = INCBIN_U32("graphics/pokemon/gen_2/blissey/normal.gbapal.lz"); + const u32 gMonBackPic_Blissey[] = INCBIN_U32("graphics/pokemon/gen_2/blissey/back.4bpp.lz"); + const u32 gMonShinyPalette_Blissey[] = INCBIN_U32("graphics/pokemon/gen_2/blissey/shiny.gbapal.lz"); + const u8 gMonIcon_Blissey[] = INCBIN_U8("graphics/pokemon/gen_2/blissey/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Blissey[] = INCBIN_U8("graphics/pokemon/blissey/footprint.1bpp"); + const u8 gMonFootprint_Blissey[] = INCBIN_U8("graphics/pokemon/gen_2/blissey/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_CHANSEY #if P_FAMILY_TANGELA - const u32 gMonFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/anim_front.4bpp.lz"); - const u32 gMonPalette_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/normal.gbapal.lz"); - const u32 gMonBackPic_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/back.4bpp.lz"); - const u32 gMonShinyPalette_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/shiny.gbapal.lz"); - const u8 gMonIcon_Tangela[] = INCBIN_U8("graphics/pokemon/tangela/icon.4bpp"); + const u32 gMonFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/gen_1/tangela/anim_front.4bpp.lz"); + const u32 gMonPalette_Tangela[] = INCBIN_U32("graphics/pokemon/gen_1/tangela/normal.gbapal.lz"); + const u32 gMonBackPic_Tangela[] = INCBIN_U32("graphics/pokemon/gen_1/tangela/back.4bpp.lz"); + const u32 gMonShinyPalette_Tangela[] = INCBIN_U32("graphics/pokemon/gen_1/tangela/shiny.gbapal.lz"); + const u8 gMonIcon_Tangela[] = INCBIN_U8("graphics/pokemon/gen_1/tangela/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tangela[] = INCBIN_U8("graphics/pokemon/tangela/footprint.1bpp"); + const u8 gMonFootprint_Tangela[] = INCBIN_U8("graphics/pokemon/gen_1/tangela/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/anim_front.4bpp.lz"); - const u32 gMonPalette_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/normal.gbapal.lz"); - const u32 gMonBackPic_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/back.4bpp.lz"); - const u32 gMonShinyPalette_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/shiny.gbapal.lz"); - const u8 gMonIcon_Tangrowth[] = INCBIN_U8("graphics/pokemon/tangrowth/icon.4bpp"); + const u32 gMonFrontPic_Tangrowth[] = INCBIN_U32("graphics/pokemon/gen_4/tangrowth/anim_front.4bpp.lz"); + const u32 gMonPalette_Tangrowth[] = INCBIN_U32("graphics/pokemon/gen_4/tangrowth/normal.gbapal.lz"); + const u32 gMonBackPic_Tangrowth[] = INCBIN_U32("graphics/pokemon/gen_4/tangrowth/back.4bpp.lz"); + const u32 gMonShinyPalette_Tangrowth[] = INCBIN_U32("graphics/pokemon/gen_4/tangrowth/shiny.gbapal.lz"); + const u8 gMonIcon_Tangrowth[] = INCBIN_U8("graphics/pokemon/gen_4/tangrowth/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tangrowth[] = INCBIN_U8("graphics/pokemon/tangrowth/footprint.1bpp"); + const u8 gMonFootprint_Tangrowth[] = INCBIN_U8("graphics/pokemon/gen_4/tangrowth/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_TangrowthF[] = INCBIN_U32("graphics/pokemon/tangrowth/anim_frontf.4bpp.lz"); + const u32 gMonFrontPic_TangrowthF[] = INCBIN_U32("graphics/pokemon/gen_4/tangrowth/anim_frontf.4bpp.lz"); #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_TANGELA #if P_FAMILY_KANGASKHAN - const u32 gMonFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/anim_front.4bpp.lz"); - const u32 gMonPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/normal.gbapal.lz"); - const u32 gMonBackPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/back.4bpp.lz"); - const u32 gMonShinyPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/shiny.gbapal.lz"); - const u8 gMonIcon_Kangaskhan[] = INCBIN_U8("graphics/pokemon/kangaskhan/icon.4bpp"); + const u32 gMonFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/anim_front.4bpp.lz"); + const u32 gMonPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/normal.gbapal.lz"); + const u32 gMonBackPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/back.4bpp.lz"); + const u32 gMonShinyPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/shiny.gbapal.lz"); + const u8 gMonIcon_Kangaskhan[] = INCBIN_U8("graphics/pokemon/gen_1/kangaskhan/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kangaskhan[] = INCBIN_U8("graphics/pokemon/kangaskhan/footprint.1bpp"); + const u8 gMonFootprint_Kangaskhan[] = INCBIN_U8("graphics/pokemon/gen_1/kangaskhan/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/front.4bpp.lz"); - const u32 gMonPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/normal.gbapal.lz"); - const u32 gMonBackPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/shiny.gbapal.lz"); - const u8 gMonIcon_KangaskhanMega[] = INCBIN_U8("graphics/pokemon/kangaskhan/mega/icon.4bpp"); + const u32 gMonFrontPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/mega/front.4bpp.lz"); + const u32 gMonPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/mega/normal.gbapal.lz"); + const u32 gMonBackPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/gen_1/kangaskhan/mega/shiny.gbapal.lz"); + const u8 gMonIcon_KangaskhanMega[] = INCBIN_U8("graphics/pokemon/gen_1/kangaskhan/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_KANGASKHAN #if P_FAMILY_HORSEA - const u32 gMonFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/anim_front.4bpp.lz"); - const u32 gMonPalette_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/normal.gbapal.lz"); - const u32 gMonBackPic_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/back.4bpp.lz"); - const u32 gMonShinyPalette_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/shiny.gbapal.lz"); - const u8 gMonIcon_Horsea[] = INCBIN_U8("graphics/pokemon/horsea/icon.4bpp"); + const u32 gMonFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/gen_1/horsea/anim_front.4bpp.lz"); + const u32 gMonPalette_Horsea[] = INCBIN_U32("graphics/pokemon/gen_1/horsea/normal.gbapal.lz"); + const u32 gMonBackPic_Horsea[] = INCBIN_U32("graphics/pokemon/gen_1/horsea/back.4bpp.lz"); + const u32 gMonShinyPalette_Horsea[] = INCBIN_U32("graphics/pokemon/gen_1/horsea/shiny.gbapal.lz"); + const u8 gMonIcon_Horsea[] = INCBIN_U8("graphics/pokemon/gen_1/horsea/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Horsea[] = INCBIN_U8("graphics/pokemon/horsea/footprint.1bpp"); + const u8 gMonFootprint_Horsea[] = INCBIN_U8("graphics/pokemon/gen_1/horsea/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/anim_front.4bpp.lz"); - const u32 gMonPalette_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/normal.gbapal.lz"); - const u32 gMonBackPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/back.4bpp.lz"); - const u32 gMonShinyPalette_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/shiny.gbapal.lz"); - const u8 gMonIcon_Seadra[] = INCBIN_U8("graphics/pokemon/seadra/icon.4bpp"); + const u32 gMonFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/gen_1/seadra/anim_front.4bpp.lz"); + const u32 gMonPalette_Seadra[] = INCBIN_U32("graphics/pokemon/gen_1/seadra/normal.gbapal.lz"); + const u32 gMonBackPic_Seadra[] = INCBIN_U32("graphics/pokemon/gen_1/seadra/back.4bpp.lz"); + const u32 gMonShinyPalette_Seadra[] = INCBIN_U32("graphics/pokemon/gen_1/seadra/shiny.gbapal.lz"); + const u8 gMonIcon_Seadra[] = INCBIN_U8("graphics/pokemon/gen_1/seadra/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Seadra[] = INCBIN_U8("graphics/pokemon/seadra/footprint.1bpp"); + const u8 gMonFootprint_Seadra[] = INCBIN_U8("graphics/pokemon/gen_1/seadra/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/anim_front.4bpp.lz"); - const u32 gMonPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/normal.gbapal.lz"); - const u32 gMonBackPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/back.4bpp.lz"); - const u32 gMonShinyPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/shiny.gbapal.lz"); - const u8 gMonIcon_Kingdra[] = INCBIN_U8("graphics/pokemon/kingdra/icon.4bpp"); + const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/gen_2/kingdra/anim_front.4bpp.lz"); + const u32 gMonPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/gen_2/kingdra/normal.gbapal.lz"); + const u32 gMonBackPic_Kingdra[] = INCBIN_U32("graphics/pokemon/gen_2/kingdra/back.4bpp.lz"); + const u32 gMonShinyPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/gen_2/kingdra/shiny.gbapal.lz"); + const u8 gMonIcon_Kingdra[] = INCBIN_U8("graphics/pokemon/gen_2/kingdra/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kingdra[] = INCBIN_U8("graphics/pokemon/kingdra/footprint.1bpp"); + const u8 gMonFootprint_Kingdra[] = INCBIN_U8("graphics/pokemon/gen_2/kingdra/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_HORSEA #if P_FAMILY_GOLDEEN - const u32 gMonFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/anim_front.4bpp.lz"); - const u32 gMonPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/normal.gbapal.lz"); - const u32 gMonBackPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/back.4bpp.lz"); - const u32 gMonShinyPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/shiny.gbapal.lz"); - const u8 gMonIcon_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/icon.4bpp"); + const u32 gMonFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/gen_1/goldeen/anim_front.4bpp.lz"); + const u32 gMonPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/gen_1/goldeen/normal.gbapal.lz"); + const u32 gMonBackPic_Goldeen[] = INCBIN_U32("graphics/pokemon/gen_1/goldeen/back.4bpp.lz"); + const u32 gMonShinyPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/gen_1/goldeen/shiny.gbapal.lz"); + const u8 gMonIcon_Goldeen[] = INCBIN_U8("graphics/pokemon/gen_1/goldeen/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/footprint.1bpp"); + const u8 gMonFootprint_Goldeen[] = INCBIN_U8("graphics/pokemon/gen_1/goldeen/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GoldeenF[] = INCBIN_U32("graphics/pokemon/goldeen/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_GoldeenF[] = INCBIN_U32("graphics/pokemon/goldeen/backf.4bpp.lz"); + const u32 gMonFrontPic_GoldeenF[] = INCBIN_U32("graphics/pokemon/gen_1/goldeen/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_GoldeenF[] = INCBIN_U32("graphics/pokemon/gen_1/goldeen/backf.4bpp.lz"); - const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/anim_front.4bpp.lz"); - const u32 gMonPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/normal.gbapal.lz"); - const u32 gMonBackPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/back.4bpp.lz"); - const u32 gMonShinyPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/shiny.gbapal.lz"); - const u8 gMonIcon_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/icon.4bpp"); + const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/gen_1/seaking/anim_front.4bpp.lz"); + const u32 gMonPalette_Seaking[] = INCBIN_U32("graphics/pokemon/gen_1/seaking/normal.gbapal.lz"); + const u32 gMonBackPic_Seaking[] = INCBIN_U32("graphics/pokemon/gen_1/seaking/back.4bpp.lz"); + const u32 gMonShinyPalette_Seaking[] = INCBIN_U32("graphics/pokemon/gen_1/seaking/shiny.gbapal.lz"); + const u8 gMonIcon_Seaking[] = INCBIN_U8("graphics/pokemon/gen_1/seaking/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/footprint.1bpp"); + const u8 gMonFootprint_Seaking[] = INCBIN_U8("graphics/pokemon/gen_1/seaking/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_SeakingF[] = INCBIN_U32("graphics/pokemon/seaking/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_SeakingF[] = INCBIN_U32("graphics/pokemon/seaking/backf.4bpp.lz"); + const u32 gMonFrontPic_SeakingF[] = INCBIN_U32("graphics/pokemon/gen_1/seaking/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_SeakingF[] = INCBIN_U32("graphics/pokemon/gen_1/seaking/backf.4bpp.lz"); #endif //P_FAMILY_GOLDEEN #if P_FAMILY_STARYU - const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/anim_front.4bpp.lz"); - const u32 gMonPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/normal.gbapal.lz"); - const u32 gMonBackPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/back.4bpp.lz"); - const u32 gMonShinyPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/shiny.gbapal.lz"); - const u8 gMonIcon_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/icon.4bpp"); + const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/gen_1/staryu/anim_front.4bpp.lz"); + const u32 gMonPalette_Staryu[] = INCBIN_U32("graphics/pokemon/gen_1/staryu/normal.gbapal.lz"); + const u32 gMonBackPic_Staryu[] = INCBIN_U32("graphics/pokemon/gen_1/staryu/back.4bpp.lz"); + const u32 gMonShinyPalette_Staryu[] = INCBIN_U32("graphics/pokemon/gen_1/staryu/shiny.gbapal.lz"); + const u8 gMonIcon_Staryu[] = INCBIN_U8("graphics/pokemon/gen_1/staryu/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/footprint.1bpp"); + const u8 gMonFootprint_Staryu[] = INCBIN_U8("graphics/pokemon/gen_1/staryu/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/anim_front.4bpp.lz"); - const u32 gMonPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/normal.gbapal.lz"); - const u32 gMonBackPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/back.4bpp.lz"); - const u32 gMonShinyPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/shiny.gbapal.lz"); - const u8 gMonIcon_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/icon.4bpp"); + const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/gen_1/starmie/anim_front.4bpp.lz"); + const u32 gMonPalette_Starmie[] = INCBIN_U32("graphics/pokemon/gen_1/starmie/normal.gbapal.lz"); + const u32 gMonBackPic_Starmie[] = INCBIN_U32("graphics/pokemon/gen_1/starmie/back.4bpp.lz"); + const u32 gMonShinyPalette_Starmie[] = INCBIN_U32("graphics/pokemon/gen_1/starmie/shiny.gbapal.lz"); + const u8 gMonIcon_Starmie[] = INCBIN_U8("graphics/pokemon/gen_1/starmie/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/footprint.1bpp"); + const u8 gMonFootprint_Starmie[] = INCBIN_U8("graphics/pokemon/gen_1/starmie/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_STARYU #if P_FAMILY_MR_MIME #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/anim_front.4bpp.lz"); - const u32 gMonPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/normal.gbapal.lz"); - const u32 gMonBackPic_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/back.4bpp.lz"); - const u32 gMonShinyPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/shiny.gbapal.lz"); - const u8 gMonIcon_MimeJr[] = INCBIN_U8("graphics/pokemon/mime_jr/icon.4bpp"); + const u32 gMonFrontPic_MimeJr[] = INCBIN_U32("graphics/pokemon/gen_4/mime_jr/anim_front.4bpp.lz"); + const u32 gMonPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/gen_4/mime_jr/normal.gbapal.lz"); + const u32 gMonBackPic_MimeJr[] = INCBIN_U32("graphics/pokemon/gen_4/mime_jr/back.4bpp.lz"); + const u32 gMonShinyPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/gen_4/mime_jr/shiny.gbapal.lz"); + const u8 gMonIcon_MimeJr[] = INCBIN_U8("graphics/pokemon/gen_4/mime_jr/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_MimeJr[] = INCBIN_U8("graphics/pokemon/mime_jr/footprint.1bpp"); + const u8 gMonFootprint_MimeJr[] = INCBIN_U8("graphics/pokemon/gen_4/mime_jr/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/anim_front.4bpp.lz"); - const u32 gMonPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/normal.gbapal.lz"); - const u32 gMonBackPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/back.4bpp.lz"); - const u32 gMonShinyPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/shiny.gbapal.lz"); - const u8 gMonIcon_MrMime[] = INCBIN_U8("graphics/pokemon/mr_mime/icon.4bpp"); + const u32 gMonFrontPic_MrMime[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/anim_front.4bpp.lz"); + const u32 gMonPalette_MrMime[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/normal.gbapal.lz"); + const u32 gMonBackPic_MrMime[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/back.4bpp.lz"); + const u32 gMonShinyPalette_MrMime[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/shiny.gbapal.lz"); + const u8 gMonIcon_MrMime[] = INCBIN_U8("graphics/pokemon/gen_1/mr_mime/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_MrMime[] = INCBIN_U8("graphics/pokemon/mr_mime/footprint.1bpp"); + const u8 gMonFootprint_MrMime[] = INCBIN_U8("graphics/pokemon/gen_1/mr_mime/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/front.4bpp.lz"); - const u32 gMonPalette_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_MrMimeGalarian[] = INCBIN_U8("graphics/pokemon/mr_mime/galarian/icon.4bpp"); + const u32 gMonFrontPic_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/galarian/front.4bpp.lz"); + const u32 gMonPalette_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/mr_mime/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_MrMimeGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/mr_mime/galarian/icon.4bpp"); - const u32 gMonFrontPic_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/front.4bpp.lz"); - const u32 gMonPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/normal.gbapal.lz"); - const u32 gMonBackPic_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/back.4bpp.lz"); - const u32 gMonShinyPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/shiny.gbapal.lz"); - const u8 gMonIcon_MrRime[] = INCBIN_U8("graphics/pokemon/mr_rime/icon.4bpp"); + const u32 gMonFrontPic_MrRime[] = INCBIN_U32("graphics/pokemon/gen_8/mr_rime/front.4bpp.lz"); + const u32 gMonPalette_MrRime[] = INCBIN_U32("graphics/pokemon/gen_8/mr_rime/normal.gbapal.lz"); + const u32 gMonBackPic_MrRime[] = INCBIN_U32("graphics/pokemon/gen_8/mr_rime/back.4bpp.lz"); + const u32 gMonShinyPalette_MrRime[] = INCBIN_U32("graphics/pokemon/gen_8/mr_rime/shiny.gbapal.lz"); + const u8 gMonIcon_MrRime[] = INCBIN_U8("graphics/pokemon/gen_8/mr_rime/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_MrRime[] = INCBIN_U8("graphics/pokemon/mr_rime/footprint.1bpp"); + const u8 gMonFootprint_MrRime[] = INCBIN_U8("graphics/pokemon/gen_8/mr_rime/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_MR_MIME #if P_FAMILY_SCYTHER - const u32 gMonFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/anim_front.4bpp.lz"); - const u32 gMonPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/normal.gbapal.lz"); - const u32 gMonBackPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/back.4bpp.lz"); - const u32 gMonShinyPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/shiny.gbapal.lz"); - const u8 gMonIcon_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/icon.4bpp"); + const u32 gMonFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/gen_1/scyther/anim_front.4bpp.lz"); + const u32 gMonPalette_Scyther[] = INCBIN_U32("graphics/pokemon/gen_1/scyther/normal.gbapal.lz"); + const u32 gMonBackPic_Scyther[] = INCBIN_U32("graphics/pokemon/gen_1/scyther/back.4bpp.lz"); + const u32 gMonShinyPalette_Scyther[] = INCBIN_U32("graphics/pokemon/gen_1/scyther/shiny.gbapal.lz"); + const u8 gMonIcon_Scyther[] = INCBIN_U8("graphics/pokemon/gen_1/scyther/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/footprint.1bpp"); + const u8 gMonFootprint_Scyther[] = INCBIN_U8("graphics/pokemon/gen_1/scyther/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ScytherF[] = INCBIN_U32("graphics/pokemon/scyther/anim_frontf.4bpp.lz"); + const u32 gMonFrontPic_ScytherF[] = INCBIN_U32("graphics/pokemon/gen_1/scyther/anim_frontf.4bpp.lz"); #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/anim_front.4bpp.lz"); - const u32 gMonPalette_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/normal.gbapal.lz"); - const u32 gMonBackPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/back.4bpp.lz"); - const u32 gMonShinyPalette_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/shiny.gbapal.lz"); - const u8 gMonIcon_Scizor[] = INCBIN_U8("graphics/pokemon/scizor/icon.4bpp"); + const u32 gMonFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/anim_front.4bpp.lz"); + const u32 gMonPalette_Scizor[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/normal.gbapal.lz"); + const u32 gMonBackPic_Scizor[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/back.4bpp.lz"); + const u32 gMonShinyPalette_Scizor[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/shiny.gbapal.lz"); + const u8 gMonIcon_Scizor[] = INCBIN_U8("graphics/pokemon/gen_2/scizor/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Scizor[] = INCBIN_U8("graphics/pokemon/scizor/footprint.1bpp"); + const u8 gMonFootprint_Scizor[] = INCBIN_U8("graphics/pokemon/gen_2/scizor/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ScizorF[] = INCBIN_U32("graphics/pokemon/scizor/anim_frontf.4bpp.lz"); + const u32 gMonFrontPic_ScizorF[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/anim_frontf.4bpp.lz"); #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/front.4bpp.lz"); - const u32 gMonPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/normal.gbapal.lz"); - const u32 gMonBackPic_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/shiny.gbapal.lz"); - const u8 gMonIcon_ScizorMega[] = INCBIN_U8("graphics/pokemon/scizor/mega/icon.4bpp"); + const u32 gMonFrontPic_ScizorMega[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/mega/front.4bpp.lz"); + const u32 gMonPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/mega/normal.gbapal.lz"); + const u32 gMonBackPic_ScizorMega[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/gen_2/scizor/mega/shiny.gbapal.lz"); + const u8 gMonIcon_ScizorMega[] = INCBIN_U8("graphics/pokemon/gen_2/scizor/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_GEN_2_CROSS_EVOS #if P_GEN_8_CROSS_EVOS - const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/front.4bpp.lz"); - const u32 gMonPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/normal.gbapal.lz"); - const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/back.4bpp.lz"); - const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/shiny.gbapal.lz"); - const u8 gMonIcon_Kleavor[] = INCBIN_U8("graphics/pokemon/kleavor/icon.4bpp"); + const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/gen_8/kleavor/front.4bpp.lz"); + const u32 gMonPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/gen_8/kleavor/normal.gbapal.lz"); + const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/gen_8/kleavor/back.4bpp.lz"); + const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/gen_8/kleavor/shiny.gbapal.lz"); + const u8 gMonIcon_Kleavor[] = INCBIN_U8("graphics/pokemon/gen_8/kleavor/icon.4bpp"); #if P_FOOTPRINTS - //const u8 gMonFootprint_Kleavor[] = INCBIN_U8("graphics/pokemon/kleavor/footprint.1bpp"); + //const u8 gMonFootprint_Kleavor[] = INCBIN_U8("graphics/pokemon/gen_8/kleavor/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_SCYTHER #if P_FAMILY_JYNX #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/anim_front.4bpp.lz"); - const u32 gMonPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/normal.gbapal.lz"); - const u32 gMonBackPic_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/back.4bpp.lz"); - const u32 gMonShinyPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/shiny.gbapal.lz"); - const u8 gMonIcon_Smoochum[] = INCBIN_U8("graphics/pokemon/smoochum/icon.4bpp"); + const u32 gMonFrontPic_Smoochum[] = INCBIN_U32("graphics/pokemon/gen_2/smoochum/anim_front.4bpp.lz"); + const u32 gMonPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/gen_2/smoochum/normal.gbapal.lz"); + const u32 gMonBackPic_Smoochum[] = INCBIN_U32("graphics/pokemon/gen_2/smoochum/back.4bpp.lz"); + const u32 gMonShinyPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/gen_2/smoochum/shiny.gbapal.lz"); + const u8 gMonIcon_Smoochum[] = INCBIN_U8("graphics/pokemon/gen_2/smoochum/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Smoochum[] = INCBIN_U8("graphics/pokemon/smoochum/footprint.1bpp"); + const u8 gMonFootprint_Smoochum[] = INCBIN_U8("graphics/pokemon/gen_2/smoochum/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/anim_front.4bpp.lz"); - const u32 gMonPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/normal.gbapal.lz"); - const u32 gMonBackPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/back.4bpp.lz"); - const u32 gMonShinyPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/shiny.gbapal.lz"); - const u8 gMonIcon_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/icon.4bpp"); + const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/gen_1/jynx/anim_front.4bpp.lz"); + const u32 gMonPalette_Jynx[] = INCBIN_U32("graphics/pokemon/gen_1/jynx/normal.gbapal.lz"); + const u32 gMonBackPic_Jynx[] = INCBIN_U32("graphics/pokemon/gen_1/jynx/back.4bpp.lz"); + const u32 gMonShinyPalette_Jynx[] = INCBIN_U32("graphics/pokemon/gen_1/jynx/shiny.gbapal.lz"); + const u8 gMonIcon_Jynx[] = INCBIN_U8("graphics/pokemon/gen_1/jynx/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/footprint.1bpp"); + const u8 gMonFootprint_Jynx[] = INCBIN_U8("graphics/pokemon/gen_1/jynx/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_JYNX #if P_FAMILY_ELECTABUZZ #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/anim_front.4bpp.lz"); - const u32 gMonPalette_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/normal.gbapal.lz"); - const u32 gMonBackPic_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/back.4bpp.lz"); - const u32 gMonShinyPalette_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/shiny.gbapal.lz"); - const u8 gMonIcon_Elekid[] = INCBIN_U8("graphics/pokemon/elekid/icon.4bpp"); + const u32 gMonFrontPic_Elekid[] = INCBIN_U32("graphics/pokemon/gen_2/elekid/anim_front.4bpp.lz"); + const u32 gMonPalette_Elekid[] = INCBIN_U32("graphics/pokemon/gen_2/elekid/normal.gbapal.lz"); + const u32 gMonBackPic_Elekid[] = INCBIN_U32("graphics/pokemon/gen_2/elekid/back.4bpp.lz"); + const u32 gMonShinyPalette_Elekid[] = INCBIN_U32("graphics/pokemon/gen_2/elekid/shiny.gbapal.lz"); + const u8 gMonIcon_Elekid[] = INCBIN_U8("graphics/pokemon/gen_2/elekid/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Elekid[] = INCBIN_U8("graphics/pokemon/elekid/footprint.1bpp"); + const u8 gMonFootprint_Elekid[] = INCBIN_U8("graphics/pokemon/gen_2/elekid/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/anim_front.4bpp.lz"); - const u32 gMonPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/normal.gbapal.lz"); - const u32 gMonBackPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/back.4bpp.lz"); - const u32 gMonShinyPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/shiny.gbapal.lz"); - const u8 gMonIcon_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/icon.4bpp"); + const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/gen_1/electabuzz/anim_front.4bpp.lz"); + const u32 gMonPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/gen_1/electabuzz/normal.gbapal.lz"); + const u32 gMonBackPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/gen_1/electabuzz/back.4bpp.lz"); + const u32 gMonShinyPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/gen_1/electabuzz/shiny.gbapal.lz"); + const u8 gMonIcon_Electabuzz[] = INCBIN_U8("graphics/pokemon/gen_1/electabuzz/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/footprint.1bpp"); + const u8 gMonFootprint_Electabuzz[] = INCBIN_U8("graphics/pokemon/gen_1/electabuzz/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/anim_front.4bpp.lz"); - const u32 gMonPalette_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/normal.gbapal.lz"); - const u32 gMonBackPic_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/back.4bpp.lz"); - const u32 gMonShinyPalette_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/shiny.gbapal.lz"); - const u8 gMonIcon_Electivire[] = INCBIN_U8("graphics/pokemon/electivire/icon.4bpp"); + const u32 gMonFrontPic_Electivire[] = INCBIN_U32("graphics/pokemon/gen_4/electivire/anim_front.4bpp.lz"); + const u32 gMonPalette_Electivire[] = INCBIN_U32("graphics/pokemon/gen_4/electivire/normal.gbapal.lz"); + const u32 gMonBackPic_Electivire[] = INCBIN_U32("graphics/pokemon/gen_4/electivire/back.4bpp.lz"); + const u32 gMonShinyPalette_Electivire[] = INCBIN_U32("graphics/pokemon/gen_4/electivire/shiny.gbapal.lz"); + const u8 gMonIcon_Electivire[] = INCBIN_U8("graphics/pokemon/gen_4/electivire/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Electivire[] = INCBIN_U8("graphics/pokemon/electivire/footprint.1bpp"); + const u8 gMonFootprint_Electivire[] = INCBIN_U8("graphics/pokemon/gen_4/electivire/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_ELECTABUZZ #if P_FAMILY_MAGMAR #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Magby[] = INCBIN_U32("graphics/pokemon/magby/anim_front.4bpp.lz"); - const u32 gMonPalette_Magby[] = INCBIN_U32("graphics/pokemon/magby/normal.gbapal.lz"); - const u32 gMonBackPic_Magby[] = INCBIN_U32("graphics/pokemon/magby/back.4bpp.lz"); - const u32 gMonShinyPalette_Magby[] = INCBIN_U32("graphics/pokemon/magby/shiny.gbapal.lz"); - const u8 gMonIcon_Magby[] = INCBIN_U8("graphics/pokemon/magby/icon.4bpp"); + const u32 gMonFrontPic_Magby[] = INCBIN_U32("graphics/pokemon/gen_2/magby/anim_front.4bpp.lz"); + const u32 gMonPalette_Magby[] = INCBIN_U32("graphics/pokemon/gen_2/magby/normal.gbapal.lz"); + const u32 gMonBackPic_Magby[] = INCBIN_U32("graphics/pokemon/gen_2/magby/back.4bpp.lz"); + const u32 gMonShinyPalette_Magby[] = INCBIN_U32("graphics/pokemon/gen_2/magby/shiny.gbapal.lz"); + const u8 gMonIcon_Magby[] = INCBIN_U8("graphics/pokemon/gen_2/magby/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Magby[] = INCBIN_U8("graphics/pokemon/magby/footprint.1bpp"); + const u8 gMonFootprint_Magby[] = INCBIN_U8("graphics/pokemon/gen_2/magby/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/anim_front.4bpp.lz"); - const u32 gMonPalette_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/normal.gbapal.lz"); - const u32 gMonBackPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/back.4bpp.lz"); - const u32 gMonShinyPalette_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/shiny.gbapal.lz"); - const u8 gMonIcon_Magmar[] = INCBIN_U8("graphics/pokemon/magmar/icon.4bpp"); + const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/gen_1/magmar/anim_front.4bpp.lz"); + const u32 gMonPalette_Magmar[] = INCBIN_U32("graphics/pokemon/gen_1/magmar/normal.gbapal.lz"); + const u32 gMonBackPic_Magmar[] = INCBIN_U32("graphics/pokemon/gen_1/magmar/back.4bpp.lz"); + const u32 gMonShinyPalette_Magmar[] = INCBIN_U32("graphics/pokemon/gen_1/magmar/shiny.gbapal.lz"); + const u8 gMonIcon_Magmar[] = INCBIN_U8("graphics/pokemon/gen_1/magmar/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Magmar[] = INCBIN_U8("graphics/pokemon/magmar/footprint.1bpp"); + const u8 gMonFootprint_Magmar[] = INCBIN_U8("graphics/pokemon/gen_1/magmar/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/anim_front.4bpp.lz"); - const u32 gMonPalette_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/normal.gbapal.lz"); - const u32 gMonBackPic_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/back.4bpp.lz"); - const u32 gMonShinyPalette_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/shiny.gbapal.lz"); - const u8 gMonIcon_Magmortar[] = INCBIN_U8("graphics/pokemon/magmortar/icon.4bpp"); + const u32 gMonFrontPic_Magmortar[] = INCBIN_U32("graphics/pokemon/gen_4/magmortar/anim_front.4bpp.lz"); + const u32 gMonPalette_Magmortar[] = INCBIN_U32("graphics/pokemon/gen_4/magmortar/normal.gbapal.lz"); + const u32 gMonBackPic_Magmortar[] = INCBIN_U32("graphics/pokemon/gen_4/magmortar/back.4bpp.lz"); + const u32 gMonShinyPalette_Magmortar[] = INCBIN_U32("graphics/pokemon/gen_4/magmortar/shiny.gbapal.lz"); + const u8 gMonIcon_Magmortar[] = INCBIN_U8("graphics/pokemon/gen_4/magmortar/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Magmortar[] = INCBIN_U8("graphics/pokemon/magmortar/footprint.1bpp"); + const u8 gMonFootprint_Magmortar[] = INCBIN_U8("graphics/pokemon/gen_4/magmortar/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MAGMAR #if P_FAMILY_PINSIR - const u32 gMonFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/anim_front.4bpp.lz"); - const u32 gMonPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/normal.gbapal.lz"); - const u32 gMonBackPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/back.4bpp.lz"); - const u32 gMonShinyPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/shiny.gbapal.lz"); - const u8 gMonIcon_Pinsir[] = INCBIN_U8("graphics/pokemon/pinsir/icon.4bpp"); + const u32 gMonFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/anim_front.4bpp.lz"); + const u32 gMonPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/normal.gbapal.lz"); + const u32 gMonBackPic_Pinsir[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/back.4bpp.lz"); + const u32 gMonShinyPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/shiny.gbapal.lz"); + const u8 gMonIcon_Pinsir[] = INCBIN_U8("graphics/pokemon/gen_1/pinsir/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pinsir[] = INCBIN_U8("graphics/pokemon/pinsir/footprint.1bpp"); + const u8 gMonFootprint_Pinsir[] = INCBIN_U8("graphics/pokemon/gen_1/pinsir/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/front.4bpp.lz"); - const u32 gMonPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/normal.gbapal.lz"); - const u32 gMonBackPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/shiny.gbapal.lz"); - const u8 gMonIcon_PinsirMega[] = INCBIN_U8("graphics/pokemon/pinsir/mega/icon.4bpp"); + const u32 gMonFrontPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/mega/front.4bpp.lz"); + const u32 gMonPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/mega/normal.gbapal.lz"); + const u32 gMonBackPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/gen_1/pinsir/mega/shiny.gbapal.lz"); + const u8 gMonIcon_PinsirMega[] = INCBIN_U8("graphics/pokemon/gen_1/pinsir/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_PINSIR #if P_FAMILY_TAUROS - const u32 gMonFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/anim_front.4bpp.lz"); - const u32 gMonPalette_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/normal.gbapal.lz"); - const u32 gMonBackPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/back.4bpp.lz"); - const u32 gMonShinyPalette_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/shiny.gbapal.lz"); - const u8 gMonIcon_Tauros[] = INCBIN_U8("graphics/pokemon/tauros/icon.4bpp"); + const u32 gMonFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/anim_front.4bpp.lz"); + const u32 gMonPalette_Tauros[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/normal.gbapal.lz"); + const u32 gMonBackPic_Tauros[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/back.4bpp.lz"); + const u32 gMonShinyPalette_Tauros[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/shiny.gbapal.lz"); + const u8 gMonIcon_Tauros[] = INCBIN_U8("graphics/pokemon/gen_1/tauros/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tauros[] = INCBIN_U8("graphics/pokemon/tauros/footprint.1bpp"); + const u8 gMonFootprint_Tauros[] = INCBIN_U8("graphics/pokemon/gen_1/tauros/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_PALDEAN_FORMS - const u32 gMonFrontPic_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/front.4bpp.lz"); - const u32 gMonPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/normal.gbapal.lz"); - const u32 gMonBackPic_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/back.4bpp.lz"); - const u32 gMonShinyPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/shiny.gbapal.lz"); - const u8 gMonIcon_TaurosPaldeanCombatBreed[] = INCBIN_U8("graphics/pokemon/tauros/paldean_combat_breed/icon.4bpp"); + const u32 gMonFrontPic_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_combat_breed/front.4bpp.lz"); + const u32 gMonPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_combat_breed/normal.gbapal.lz"); + const u32 gMonBackPic_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_combat_breed/back.4bpp.lz"); + const u32 gMonShinyPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_combat_breed/shiny.gbapal.lz"); + const u8 gMonIcon_TaurosPaldeanCombatBreed[] = INCBIN_U8("graphics/pokemon/gen_1/tauros/paldean_combat_breed/icon.4bpp"); - const u32 gMonFrontPic_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/front.4bpp.lz"); - const u32 gMonPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/normal.gbapal.lz"); - const u32 gMonBackPic_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/back.4bpp.lz"); - const u32 gMonShinyPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/shiny.gbapal.lz"); - const u8 gMonIcon_TaurosPaldeanBlazeBreed[] = INCBIN_U8("graphics/pokemon/tauros/paldean_blaze_breed/icon.4bpp"); + const u32 gMonFrontPic_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_blaze_breed/front.4bpp.lz"); + const u32 gMonPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_blaze_breed/normal.gbapal.lz"); + const u32 gMonBackPic_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_blaze_breed/back.4bpp.lz"); + const u32 gMonShinyPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_blaze_breed/shiny.gbapal.lz"); + const u8 gMonIcon_TaurosPaldeanBlazeBreed[] = INCBIN_U8("graphics/pokemon/gen_1/tauros/paldean_blaze_breed/icon.4bpp"); - const u32 gMonFrontPic_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/front.4bpp.lz"); - const u32 gMonPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/normal.gbapal.lz"); - const u32 gMonBackPic_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/back.4bpp.lz"); - const u32 gMonShinyPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/shiny.gbapal.lz"); - const u8 gMonIcon_TaurosPaldeanAquaBreed[] = INCBIN_U8("graphics/pokemon/tauros/paldean_aqua_breed/icon.4bpp"); + const u32 gMonFrontPic_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_aqua_breed/front.4bpp.lz"); + const u32 gMonPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_aqua_breed/normal.gbapal.lz"); + const u32 gMonBackPic_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_aqua_breed/back.4bpp.lz"); + const u32 gMonShinyPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/gen_1/tauros/paldean_aqua_breed/shiny.gbapal.lz"); + const u8 gMonIcon_TaurosPaldeanAquaBreed[] = INCBIN_U8("graphics/pokemon/gen_1/tauros/paldean_aqua_breed/icon.4bpp"); #endif //P_PALDEAN_FORMS #endif //P_FAMILY_TAUROS #if P_FAMILY_MAGIKARP - const u32 gMonFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/anim_front.4bpp.lz"); - const u32 gMonPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/normal.gbapal.lz"); - const u32 gMonBackPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/back.4bpp.lz"); - const u32 gMonShinyPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/shiny.gbapal.lz"); - const u8 gMonIcon_Magikarp[] = INCBIN_U8("graphics/pokemon/magikarp/icon.4bpp"); + const u32 gMonFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/gen_1/magikarp/anim_front.4bpp.lz"); + const u32 gMonPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/gen_1/magikarp/normal.gbapal.lz"); + const u32 gMonBackPic_Magikarp[] = INCBIN_U32("graphics/pokemon/gen_1/magikarp/back.4bpp.lz"); + const u32 gMonShinyPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/gen_1/magikarp/shiny.gbapal.lz"); + const u8 gMonIcon_Magikarp[] = INCBIN_U8("graphics/pokemon/gen_1/magikarp/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Magikarp[] = INCBIN_U8("graphics/pokemon/magikarp/footprint.1bpp"); + const u8 gMonFootprint_Magikarp[] = INCBIN_U8("graphics/pokemon/gen_1/magikarp/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/magikarp/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/magikarp/backf.4bpp.lz"); + const u32 gMonFrontPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/gen_1/magikarp/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/gen_1/magikarp/backf.4bpp.lz"); - const u32 gMonFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/anim_front.4bpp.lz"); - const u32 gMonPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/normal.gbapal.lz"); - const u32 gMonBackPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/back.4bpp.lz"); - const u32 gMonShinyPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/shiny.gbapal.lz"); - const u8 gMonIcon_Gyarados[] = INCBIN_U8("graphics/pokemon/gyarados/icon.4bpp"); + const u32 gMonFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/anim_front.4bpp.lz"); + const u32 gMonPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/normal.gbapal.lz"); + const u32 gMonBackPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/back.4bpp.lz"); + const u32 gMonShinyPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/shiny.gbapal.lz"); + const u8 gMonIcon_Gyarados[] = INCBIN_U8("graphics/pokemon/gen_1/gyarados/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gyarados[] = INCBIN_U8("graphics/pokemon/gyarados/footprint.1bpp"); + const u8 gMonFootprint_Gyarados[] = INCBIN_U8("graphics/pokemon/gen_1/gyarados/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GyaradosF[] = INCBIN_U32("graphics/pokemon/gyarados/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_GyaradosF[] = INCBIN_U32("graphics/pokemon/gyarados/backf.4bpp.lz"); + const u32 gMonFrontPic_GyaradosF[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_GyaradosF[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/backf.4bpp.lz"); #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/front.4bpp.lz"); - const u32 gMonPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/normal.gbapal.lz"); - const u32 gMonBackPic_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/shiny.gbapal.lz"); - const u8 gMonIcon_GyaradosMega[] = INCBIN_U8("graphics/pokemon/gyarados/mega/icon.4bpp"); + const u32 gMonFrontPic_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/mega/front.4bpp.lz"); + const u32 gMonPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/mega/normal.gbapal.lz"); + const u32 gMonBackPic_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gen_1/gyarados/mega/shiny.gbapal.lz"); + const u8 gMonIcon_GyaradosMega[] = INCBIN_U8("graphics/pokemon/gen_1/gyarados/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAGIKARP #if P_FAMILY_LAPRAS - const u32 gMonFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/anim_front.4bpp.lz"); - const u32 gMonPalette_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/normal.gbapal.lz"); - const u32 gMonBackPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/back.4bpp.lz"); - const u32 gMonShinyPalette_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/shiny.gbapal.lz"); - const u8 gMonIcon_Lapras[] = INCBIN_U8("graphics/pokemon/lapras/icon.4bpp"); + const u32 gMonFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/anim_front.4bpp.lz"); + const u32 gMonPalette_Lapras[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/normal.gbapal.lz"); + const u32 gMonBackPic_Lapras[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/back.4bpp.lz"); + const u32 gMonShinyPalette_Lapras[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/shiny.gbapal.lz"); + const u8 gMonIcon_Lapras[] = INCBIN_U8("graphics/pokemon/gen_1/lapras/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lapras[] = INCBIN_U8("graphics/pokemon/lapras/footprint.1bpp"); + const u8 gMonFootprint_Lapras[] = INCBIN_U8("graphics/pokemon/gen_1/lapras/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_LaprasGigantamax[] = INCBIN_U8("graphics/pokemon/lapras/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/lapras/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_LaprasGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/lapras/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_LAPRAS #if P_FAMILY_DITTO - const u32 gMonFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/anim_front.4bpp.lz"); - const u32 gMonPalette_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/normal.gbapal.lz"); - const u32 gMonBackPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/back.4bpp.lz"); - const u32 gMonShinyPalette_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/shiny.gbapal.lz"); - const u8 gMonIcon_Ditto[] = INCBIN_U8("graphics/pokemon/ditto/icon.4bpp"); + const u32 gMonFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/gen_1/ditto/anim_front.4bpp.lz"); + const u32 gMonPalette_Ditto[] = INCBIN_U32("graphics/pokemon/gen_1/ditto/normal.gbapal.lz"); + const u32 gMonBackPic_Ditto[] = INCBIN_U32("graphics/pokemon/gen_1/ditto/back.4bpp.lz"); + const u32 gMonShinyPalette_Ditto[] = INCBIN_U32("graphics/pokemon/gen_1/ditto/shiny.gbapal.lz"); + const u8 gMonIcon_Ditto[] = INCBIN_U8("graphics/pokemon/gen_1/ditto/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ditto[] = INCBIN_U8("graphics/pokemon/ditto/footprint.1bpp"); + const u8 gMonFootprint_Ditto[] = INCBIN_U8("graphics/pokemon/gen_1/ditto/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DITTO #if P_FAMILY_EEVEE - const u32 gMonFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/anim_front.4bpp.lz"); - const u32 gMonPalette_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/normal.gbapal.lz"); - const u32 gMonBackPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/back.4bpp.lz"); - const u32 gMonShinyPalette_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/shiny.gbapal.lz"); - const u8 gMonIcon_Eevee[] = INCBIN_U8("graphics/pokemon/eevee/icon.4bpp"); + const u32 gMonFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/anim_front.4bpp.lz"); + const u32 gMonPalette_Eevee[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/normal.gbapal.lz"); + const u32 gMonBackPic_Eevee[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/back.4bpp.lz"); + const u32 gMonShinyPalette_Eevee[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/shiny.gbapal.lz"); + const u8 gMonIcon_Eevee[] = INCBIN_U8("graphics/pokemon/gen_1/eevee/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Eevee[] = INCBIN_U8("graphics/pokemon/eevee/footprint.1bpp"); + const u8 gMonFootprint_Eevee[] = INCBIN_U8("graphics/pokemon/gen_1/eevee/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_EeveeF[] = INCBIN_U32("graphics/pokemon/eevee/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_EeveeF[] = INCBIN_U32("graphics/pokemon/eevee/backf.4bpp.lz"); + const u32 gMonFrontPic_EeveeF[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_EeveeF[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/backf.4bpp.lz"); #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_EeveeGigantamax[] = INCBIN_U8("graphics/pokemon/eevee/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/eevee/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_EeveeGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/eevee/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/anim_front.4bpp.lz"); - const u32 gMonPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/normal.gbapal.lz"); - const u32 gMonBackPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/back.4bpp.lz"); - const u32 gMonShinyPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/shiny.gbapal.lz"); - const u8 gMonIcon_Vaporeon[] = INCBIN_U8("graphics/pokemon/vaporeon/icon.4bpp"); + const u32 gMonFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/gen_1/vaporeon/anim_front.4bpp.lz"); + const u32 gMonPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/gen_1/vaporeon/normal.gbapal.lz"); + const u32 gMonBackPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/gen_1/vaporeon/back.4bpp.lz"); + const u32 gMonShinyPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/gen_1/vaporeon/shiny.gbapal.lz"); + const u8 gMonIcon_Vaporeon[] = INCBIN_U8("graphics/pokemon/gen_1/vaporeon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Vaporeon[] = INCBIN_U8("graphics/pokemon/vaporeon/footprint.1bpp"); + const u8 gMonFootprint_Vaporeon[] = INCBIN_U8("graphics/pokemon/gen_1/vaporeon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/anim_front.4bpp.lz"); - const u32 gMonPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/normal.gbapal.lz"); - const u32 gMonBackPic_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/back.4bpp.lz"); - const u32 gMonShinyPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/shiny.gbapal.lz"); - const u8 gMonIcon_Jolteon[] = INCBIN_U8("graphics/pokemon/jolteon/icon.4bpp"); + const u32 gMonFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/gen_1/jolteon/anim_front.4bpp.lz"); + const u32 gMonPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/gen_1/jolteon/normal.gbapal.lz"); + const u32 gMonBackPic_Jolteon[] = INCBIN_U32("graphics/pokemon/gen_1/jolteon/back.4bpp.lz"); + const u32 gMonShinyPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/gen_1/jolteon/shiny.gbapal.lz"); + const u8 gMonIcon_Jolteon[] = INCBIN_U8("graphics/pokemon/gen_1/jolteon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Jolteon[] = INCBIN_U8("graphics/pokemon/jolteon/footprint.1bpp"); + const u8 gMonFootprint_Jolteon[] = INCBIN_U8("graphics/pokemon/gen_1/jolteon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/anim_front.4bpp.lz"); - const u32 gMonPalette_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/normal.gbapal.lz"); - const u32 gMonBackPic_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/back.4bpp.lz"); - const u32 gMonShinyPalette_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/shiny.gbapal.lz"); - const u8 gMonIcon_Flareon[] = INCBIN_U8("graphics/pokemon/flareon/icon.4bpp"); + const u32 gMonFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/gen_1/flareon/anim_front.4bpp.lz"); + const u32 gMonPalette_Flareon[] = INCBIN_U32("graphics/pokemon/gen_1/flareon/normal.gbapal.lz"); + const u32 gMonBackPic_Flareon[] = INCBIN_U32("graphics/pokemon/gen_1/flareon/back.4bpp.lz"); + const u32 gMonShinyPalette_Flareon[] = INCBIN_U32("graphics/pokemon/gen_1/flareon/shiny.gbapal.lz"); + const u8 gMonIcon_Flareon[] = INCBIN_U8("graphics/pokemon/gen_1/flareon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Flareon[] = INCBIN_U8("graphics/pokemon/flareon/footprint.1bpp"); + const u8 gMonFootprint_Flareon[] = INCBIN_U8("graphics/pokemon/gen_1/flareon/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/anim_front.4bpp.lz"); - const u32 gMonPalette_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/normal.gbapal.lz"); - const u32 gMonBackPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/back.4bpp.lz"); - const u32 gMonShinyPalette_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/shiny.gbapal.lz"); - const u8 gMonIcon_Espeon[] = INCBIN_U8("graphics/pokemon/espeon/icon.4bpp"); + const u32 gMonFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/gen_2/espeon/anim_front.4bpp.lz"); + const u32 gMonPalette_Espeon[] = INCBIN_U32("graphics/pokemon/gen_2/espeon/normal.gbapal.lz"); + const u32 gMonBackPic_Espeon[] = INCBIN_U32("graphics/pokemon/gen_2/espeon/back.4bpp.lz"); + const u32 gMonShinyPalette_Espeon[] = INCBIN_U32("graphics/pokemon/gen_2/espeon/shiny.gbapal.lz"); + const u8 gMonIcon_Espeon[] = INCBIN_U8("graphics/pokemon/gen_2/espeon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Espeon[] = INCBIN_U8("graphics/pokemon/espeon/footprint.1bpp"); + const u8 gMonFootprint_Espeon[] = INCBIN_U8("graphics/pokemon/gen_2/espeon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/anim_front.4bpp.lz"); - const u32 gMonPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/normal.gbapal.lz"); - const u32 gMonBackPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/back.4bpp.lz"); - const u32 gMonShinyPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/shiny.gbapal.lz"); - const u8 gMonIcon_Umbreon[] = INCBIN_U8("graphics/pokemon/umbreon/icon.4bpp"); + const u32 gMonFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/gen_2/umbreon/anim_front.4bpp.lz"); + const u32 gMonPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/gen_2/umbreon/normal.gbapal.lz"); + const u32 gMonBackPic_Umbreon[] = INCBIN_U32("graphics/pokemon/gen_2/umbreon/back.4bpp.lz"); + const u32 gMonShinyPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/gen_2/umbreon/shiny.gbapal.lz"); + const u8 gMonIcon_Umbreon[] = INCBIN_U8("graphics/pokemon/gen_2/umbreon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Umbreon[] = INCBIN_U8("graphics/pokemon/umbreon/footprint.1bpp"); + const u8 gMonFootprint_Umbreon[] = INCBIN_U8("graphics/pokemon/gen_2/umbreon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_2_CROSS_EVOS #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/anim_front.4bpp.lz"); - const u32 gMonPalette_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/normal.gbapal.lz"); - const u32 gMonBackPic_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/back.4bpp.lz"); - const u32 gMonShinyPalette_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/shiny.gbapal.lz"); - const u8 gMonIcon_Leafeon[] = INCBIN_U8("graphics/pokemon/leafeon/icon.4bpp"); + const u32 gMonFrontPic_Leafeon[] = INCBIN_U32("graphics/pokemon/gen_4/leafeon/anim_front.4bpp.lz"); + const u32 gMonPalette_Leafeon[] = INCBIN_U32("graphics/pokemon/gen_4/leafeon/normal.gbapal.lz"); + const u32 gMonBackPic_Leafeon[] = INCBIN_U32("graphics/pokemon/gen_4/leafeon/back.4bpp.lz"); + const u32 gMonShinyPalette_Leafeon[] = INCBIN_U32("graphics/pokemon/gen_4/leafeon/shiny.gbapal.lz"); + const u8 gMonIcon_Leafeon[] = INCBIN_U8("graphics/pokemon/gen_4/leafeon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Leafeon[] = INCBIN_U8("graphics/pokemon/leafeon/footprint.1bpp"); + const u8 gMonFootprint_Leafeon[] = INCBIN_U8("graphics/pokemon/gen_4/leafeon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/anim_front.4bpp.lz"); - const u32 gMonPalette_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/normal.gbapal.lz"); - const u32 gMonBackPic_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/back.4bpp.lz"); - const u32 gMonShinyPalette_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/shiny.gbapal.lz"); - const u8 gMonIcon_Glaceon[] = INCBIN_U8("graphics/pokemon/glaceon/icon.4bpp"); + const u32 gMonFrontPic_Glaceon[] = INCBIN_U32("graphics/pokemon/gen_4/glaceon/anim_front.4bpp.lz"); + const u32 gMonPalette_Glaceon[] = INCBIN_U32("graphics/pokemon/gen_4/glaceon/normal.gbapal.lz"); + const u32 gMonBackPic_Glaceon[] = INCBIN_U32("graphics/pokemon/gen_4/glaceon/back.4bpp.lz"); + const u32 gMonShinyPalette_Glaceon[] = INCBIN_U32("graphics/pokemon/gen_4/glaceon/shiny.gbapal.lz"); + const u8 gMonIcon_Glaceon[] = INCBIN_U8("graphics/pokemon/gen_4/glaceon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Glaceon[] = INCBIN_U8("graphics/pokemon/glaceon/footprint.1bpp"); + const u8 gMonFootprint_Glaceon[] = INCBIN_U8("graphics/pokemon/gen_4/glaceon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #if P_GEN_6_CROSS_EVOS - const u32 gMonFrontPic_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/anim_front.4bpp.lz"); - const u32 gMonPalette_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/normal.gbapal.lz"); - const u32 gMonBackPic_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/back.4bpp.lz"); - const u32 gMonShinyPalette_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/shiny.gbapal.lz"); - const u8 gMonIcon_Sylveon[] = INCBIN_U8("graphics/pokemon/sylveon/icon.4bpp"); + const u32 gMonFrontPic_Sylveon[] = INCBIN_U32("graphics/pokemon/gen_6/sylveon/anim_front.4bpp.lz"); + const u32 gMonPalette_Sylveon[] = INCBIN_U32("graphics/pokemon/gen_6/sylveon/normal.gbapal.lz"); + const u32 gMonBackPic_Sylveon[] = INCBIN_U32("graphics/pokemon/gen_6/sylveon/back.4bpp.lz"); + const u32 gMonShinyPalette_Sylveon[] = INCBIN_U32("graphics/pokemon/gen_6/sylveon/shiny.gbapal.lz"); + const u8 gMonIcon_Sylveon[] = INCBIN_U8("graphics/pokemon/gen_6/sylveon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sylveon[] = INCBIN_U8("graphics/pokemon/sylveon/footprint.1bpp"); + const u8 gMonFootprint_Sylveon[] = INCBIN_U8("graphics/pokemon/gen_6/sylveon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_6_CROSS_EVOS #endif //P_FAMILY_EEVEE #if P_FAMILY_PORYGON - const u32 gMonFrontPic_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/anim_front.4bpp.lz"); - const u32 gMonPalette_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/normal.gbapal.lz"); - const u32 gMonBackPic_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/back.4bpp.lz"); - const u32 gMonShinyPalette_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/shiny.gbapal.lz"); - const u8 gMonIcon_Porygon[] = INCBIN_U8("graphics/pokemon/porygon/icon.4bpp"); + const u32 gMonFrontPic_Porygon[] = INCBIN_U32("graphics/pokemon/gen_1/porygon/anim_front.4bpp.lz"); + const u32 gMonPalette_Porygon[] = INCBIN_U32("graphics/pokemon/gen_1/porygon/normal.gbapal.lz"); + const u32 gMonBackPic_Porygon[] = INCBIN_U32("graphics/pokemon/gen_1/porygon/back.4bpp.lz"); + const u32 gMonShinyPalette_Porygon[] = INCBIN_U32("graphics/pokemon/gen_1/porygon/shiny.gbapal.lz"); + const u8 gMonIcon_Porygon[] = INCBIN_U8("graphics/pokemon/gen_1/porygon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Porygon[] = INCBIN_U8("graphics/pokemon/porygon/footprint.1bpp"); + const u8 gMonFootprint_Porygon[] = INCBIN_U8("graphics/pokemon/gen_1/porygon/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/anim_front.4bpp.lz"); - const u32 gMonPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/normal.gbapal.lz"); - const u32 gMonBackPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/back.4bpp.lz"); - const u32 gMonShinyPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/shiny.gbapal.lz"); - const u8 gMonIcon_Porygon2[] = INCBIN_U8("graphics/pokemon/porygon2/icon.4bpp"); + const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/gen_2/porygon2/anim_front.4bpp.lz"); + const u32 gMonPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/gen_2/porygon2/normal.gbapal.lz"); + const u32 gMonBackPic_Porygon2[] = INCBIN_U32("graphics/pokemon/gen_2/porygon2/back.4bpp.lz"); + const u32 gMonShinyPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/gen_2/porygon2/shiny.gbapal.lz"); + const u8 gMonIcon_Porygon2[] = INCBIN_U8("graphics/pokemon/gen_2/porygon2/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Porygon2[] = INCBIN_U8("graphics/pokemon/porygon2/footprint.1bpp"); + const u8 gMonFootprint_Porygon2[] = INCBIN_U8("graphics/pokemon/gen_2/porygon2/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/anim_front.4bpp.lz"); - const u32 gMonPalette_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/normal.gbapal.lz"); - const u32 gMonBackPic_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/back.4bpp.lz"); - const u32 gMonShinyPalette_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/shiny.gbapal.lz"); - const u8 gMonIcon_PorygonZ[] = INCBIN_U8("graphics/pokemon/porygon_z/icon.4bpp"); + const u32 gMonFrontPic_PorygonZ[] = INCBIN_U32("graphics/pokemon/gen_4/porygon_z/anim_front.4bpp.lz"); + const u32 gMonPalette_PorygonZ[] = INCBIN_U32("graphics/pokemon/gen_4/porygon_z/normal.gbapal.lz"); + const u32 gMonBackPic_PorygonZ[] = INCBIN_U32("graphics/pokemon/gen_4/porygon_z/back.4bpp.lz"); + const u32 gMonShinyPalette_PorygonZ[] = INCBIN_U32("graphics/pokemon/gen_4/porygon_z/shiny.gbapal.lz"); + const u8 gMonIcon_PorygonZ[] = INCBIN_U8("graphics/pokemon/gen_4/porygon_z/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_PorygonZ[] = INCBIN_U8("graphics/pokemon/porygon_z/footprint.1bpp"); + const u8 gMonFootprint_PorygonZ[] = INCBIN_U8("graphics/pokemon/gen_4/porygon_z/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_PORYGON #if P_FAMILY_OMANYTE - const u32 gMonFrontPic_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/anim_front.4bpp.lz"); - const u32 gMonPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/normal.gbapal.lz"); - const u32 gMonBackPic_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/back.4bpp.lz"); - const u32 gMonShinyPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/shiny.gbapal.lz"); - const u8 gMonIcon_Omanyte[] = INCBIN_U8("graphics/pokemon/omanyte/icon.4bpp"); + const u32 gMonFrontPic_Omanyte[] = INCBIN_U32("graphics/pokemon/gen_1/omanyte/anim_front.4bpp.lz"); + const u32 gMonPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/gen_1/omanyte/normal.gbapal.lz"); + const u32 gMonBackPic_Omanyte[] = INCBIN_U32("graphics/pokemon/gen_1/omanyte/back.4bpp.lz"); + const u32 gMonShinyPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/gen_1/omanyte/shiny.gbapal.lz"); + const u8 gMonIcon_Omanyte[] = INCBIN_U8("graphics/pokemon/gen_1/omanyte/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Omanyte[] = INCBIN_U8("graphics/pokemon/omanyte/footprint.1bpp"); + const u8 gMonFootprint_Omanyte[] = INCBIN_U8("graphics/pokemon/gen_1/omanyte/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/anim_front.4bpp.lz"); - const u32 gMonPalette_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/normal.gbapal.lz"); - const u32 gMonBackPic_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/back.4bpp.lz"); - const u32 gMonShinyPalette_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/shiny.gbapal.lz"); - const u8 gMonIcon_Omastar[] = INCBIN_U8("graphics/pokemon/omastar/icon.4bpp"); + const u32 gMonFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/gen_1/omastar/anim_front.4bpp.lz"); + const u32 gMonPalette_Omastar[] = INCBIN_U32("graphics/pokemon/gen_1/omastar/normal.gbapal.lz"); + const u32 gMonBackPic_Omastar[] = INCBIN_U32("graphics/pokemon/gen_1/omastar/back.4bpp.lz"); + const u32 gMonShinyPalette_Omastar[] = INCBIN_U32("graphics/pokemon/gen_1/omastar/shiny.gbapal.lz"); + const u8 gMonIcon_Omastar[] = INCBIN_U8("graphics/pokemon/gen_1/omastar/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Omastar[] = INCBIN_U8("graphics/pokemon/omastar/footprint.1bpp"); + const u8 gMonFootprint_Omastar[] = INCBIN_U8("graphics/pokemon/gen_1/omastar/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_OMANYTE #if P_FAMILY_KABUTO - const u32 gMonFrontPic_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/anim_front.4bpp.lz"); - const u32 gMonPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/normal.gbapal.lz"); - const u32 gMonBackPic_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/back.4bpp.lz"); - const u32 gMonShinyPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/shiny.gbapal.lz"); - const u8 gMonIcon_Kabuto[] = INCBIN_U8("graphics/pokemon/kabuto/icon.4bpp"); + const u32 gMonFrontPic_Kabuto[] = INCBIN_U32("graphics/pokemon/gen_1/kabuto/anim_front.4bpp.lz"); + const u32 gMonPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/gen_1/kabuto/normal.gbapal.lz"); + const u32 gMonBackPic_Kabuto[] = INCBIN_U32("graphics/pokemon/gen_1/kabuto/back.4bpp.lz"); + const u32 gMonShinyPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/gen_1/kabuto/shiny.gbapal.lz"); + const u8 gMonIcon_Kabuto[] = INCBIN_U8("graphics/pokemon/gen_1/kabuto/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kabuto[] = INCBIN_U8("graphics/pokemon/kabuto/footprint.1bpp"); + const u8 gMonFootprint_Kabuto[] = INCBIN_U8("graphics/pokemon/gen_1/kabuto/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/anim_front.4bpp.lz"); - const u32 gMonPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/normal.gbapal.lz"); - const u32 gMonBackPic_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/back.4bpp.lz"); - const u32 gMonShinyPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/shiny.gbapal.lz"); - const u8 gMonIcon_Kabutops[] = INCBIN_U8("graphics/pokemon/kabutops/icon.4bpp"); + const u32 gMonFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/gen_1/kabutops/anim_front.4bpp.lz"); + const u32 gMonPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/gen_1/kabutops/normal.gbapal.lz"); + const u32 gMonBackPic_Kabutops[] = INCBIN_U32("graphics/pokemon/gen_1/kabutops/back.4bpp.lz"); + const u32 gMonShinyPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/gen_1/kabutops/shiny.gbapal.lz"); + const u8 gMonIcon_Kabutops[] = INCBIN_U8("graphics/pokemon/gen_1/kabutops/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kabutops[] = INCBIN_U8("graphics/pokemon/kabutops/footprint.1bpp"); + const u8 gMonFootprint_Kabutops[] = INCBIN_U8("graphics/pokemon/gen_1/kabutops/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_KABUTO #if P_FAMILY_AERODACTYL - const u32 gMonFrontPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/anim_front.4bpp.lz"); - const u32 gMonPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/normal.gbapal.lz"); - const u32 gMonBackPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/back.4bpp.lz"); - const u32 gMonShinyPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/shiny.gbapal.lz"); - const u8 gMonIcon_Aerodactyl[] = INCBIN_U8("graphics/pokemon/aerodactyl/icon.4bpp"); + const u32 gMonFrontPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/anim_front.4bpp.lz"); + const u32 gMonPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/normal.gbapal.lz"); + const u32 gMonBackPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/back.4bpp.lz"); + const u32 gMonShinyPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/shiny.gbapal.lz"); + const u8 gMonIcon_Aerodactyl[] = INCBIN_U8("graphics/pokemon/gen_1/aerodactyl/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Aerodactyl[] = INCBIN_U8("graphics/pokemon/aerodactyl/footprint.1bpp"); + const u8 gMonFootprint_Aerodactyl[] = INCBIN_U8("graphics/pokemon/gen_1/aerodactyl/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/front.4bpp.lz"); - const u32 gMonPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/normal.gbapal.lz"); - const u32 gMonBackPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/shiny.gbapal.lz"); - const u8 gMonIcon_AerodactylMega[] = INCBIN_U8("graphics/pokemon/aerodactyl/mega/icon.4bpp"); + const u32 gMonFrontPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/mega/front.4bpp.lz"); + const u32 gMonPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/mega/normal.gbapal.lz"); + const u32 gMonBackPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/gen_1/aerodactyl/mega/shiny.gbapal.lz"); + const u8 gMonIcon_AerodactylMega[] = INCBIN_U8("graphics/pokemon/gen_1/aerodactyl/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_AERODACTYL #if P_FAMILY_SNORLAX #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/anim_front.4bpp.lz"); - const u32 gMonPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/normal.gbapal.lz"); - const u32 gMonBackPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/back.4bpp.lz"); - const u32 gMonShinyPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/shiny.gbapal.lz"); - const u8 gMonIcon_Munchlax[] = INCBIN_U8("graphics/pokemon/munchlax/icon.4bpp"); + const u32 gMonFrontPic_Munchlax[] = INCBIN_U32("graphics/pokemon/gen_4/munchlax/anim_front.4bpp.lz"); + const u32 gMonPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/gen_4/munchlax/normal.gbapal.lz"); + const u32 gMonBackPic_Munchlax[] = INCBIN_U32("graphics/pokemon/gen_4/munchlax/back.4bpp.lz"); + const u32 gMonShinyPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/gen_4/munchlax/shiny.gbapal.lz"); + const u8 gMonIcon_Munchlax[] = INCBIN_U8("graphics/pokemon/gen_4/munchlax/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Munchlax[] = INCBIN_U8("graphics/pokemon/munchlax/footprint.1bpp"); + const u8 gMonFootprint_Munchlax[] = INCBIN_U8("graphics/pokemon/gen_4/munchlax/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/anim_front.4bpp.lz"); - const u32 gMonPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/normal.gbapal.lz"); - const u32 gMonBackPic_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/back.4bpp.lz"); - const u32 gMonShinyPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/shiny.gbapal.lz"); - const u8 gMonIcon_Snorlax[] = INCBIN_U8("graphics/pokemon/snorlax/icon.4bpp"); + const u32 gMonFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/anim_front.4bpp.lz"); + const u32 gMonPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/normal.gbapal.lz"); + const u32 gMonBackPic_Snorlax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/back.4bpp.lz"); + const u32 gMonShinyPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/shiny.gbapal.lz"); + const u8 gMonIcon_Snorlax[] = INCBIN_U8("graphics/pokemon/gen_1/snorlax/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Snorlax[] = INCBIN_U8("graphics/pokemon/snorlax/footprint.1bpp"); + const u8 gMonFootprint_Snorlax[] = INCBIN_U8("graphics/pokemon/gen_1/snorlax/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_SnorlaxGigantamax[] = INCBIN_U8("graphics/pokemon/snorlax/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/gen_1/snorlax/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_SnorlaxGigantamax[] = INCBIN_U8("graphics/pokemon/gen_1/snorlax/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SNORLAX #if P_FAMILY_ARTICUNO - const u32 gMonFrontPic_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/anim_front.4bpp.lz"); - const u32 gMonPalette_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/normal.gbapal.lz"); - const u32 gMonBackPic_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/back.4bpp.lz"); - const u32 gMonShinyPalette_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/shiny.gbapal.lz"); - const u8 gMonIcon_Articuno[] = INCBIN_U8("graphics/pokemon/articuno/icon.4bpp"); + const u32 gMonFrontPic_Articuno[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/anim_front.4bpp.lz"); + const u32 gMonPalette_Articuno[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/normal.gbapal.lz"); + const u32 gMonBackPic_Articuno[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/back.4bpp.lz"); + const u32 gMonShinyPalette_Articuno[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/shiny.gbapal.lz"); + const u8 gMonIcon_Articuno[] = INCBIN_U8("graphics/pokemon/gen_1/articuno/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Articuno[] = INCBIN_U8("graphics/pokemon/articuno/footprint.1bpp"); + const u8 gMonFootprint_Articuno[] = INCBIN_U8("graphics/pokemon/gen_1/articuno/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/front.4bpp.lz"); - const u32 gMonPalette_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_ArticunoGalarian[] = INCBIN_U8("graphics/pokemon/articuno/galarian/icon.4bpp"); + const u32 gMonFrontPic_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/galarian/front.4bpp.lz"); + const u32 gMonPalette_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/articuno/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_ArticunoGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/articuno/galarian/icon.4bpp"); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ARTICUNO #if P_FAMILY_ZAPDOS - const u32 gMonFrontPic_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/anim_front.4bpp.lz"); - const u32 gMonPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/normal.gbapal.lz"); - const u32 gMonBackPic_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/back.4bpp.lz"); - const u32 gMonShinyPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/shiny.gbapal.lz"); - const u8 gMonIcon_Zapdos[] = INCBIN_U8("graphics/pokemon/zapdos/icon.4bpp"); + const u32 gMonFrontPic_Zapdos[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/anim_front.4bpp.lz"); + const u32 gMonPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/normal.gbapal.lz"); + const u32 gMonBackPic_Zapdos[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/back.4bpp.lz"); + const u32 gMonShinyPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/shiny.gbapal.lz"); + const u8 gMonIcon_Zapdos[] = INCBIN_U8("graphics/pokemon/gen_1/zapdos/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Zapdos[] = INCBIN_U8("graphics/pokemon/zapdos/footprint.1bpp"); + const u8 gMonFootprint_Zapdos[] = INCBIN_U8("graphics/pokemon/gen_1/zapdos/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/front.4bpp.lz"); - const u32 gMonPalette_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_ZapdosGalarian[] = INCBIN_U8("graphics/pokemon/zapdos/galarian/icon.4bpp"); + const u32 gMonFrontPic_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/galarian/front.4bpp.lz"); + const u32 gMonPalette_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/zapdos/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_ZapdosGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/zapdos/galarian/icon.4bpp"); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZAPDOS #if P_FAMILY_MOLTRES - const u32 gMonFrontPic_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/anim_front.4bpp.lz"); - const u32 gMonPalette_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/normal.gbapal.lz"); - const u32 gMonBackPic_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/back.4bpp.lz"); - const u32 gMonShinyPalette_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/shiny.gbapal.lz"); - const u8 gMonIcon_Moltres[] = INCBIN_U8("graphics/pokemon/moltres/icon.4bpp"); + const u32 gMonFrontPic_Moltres[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/anim_front.4bpp.lz"); + const u32 gMonPalette_Moltres[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/normal.gbapal.lz"); + const u32 gMonBackPic_Moltres[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/back.4bpp.lz"); + const u32 gMonShinyPalette_Moltres[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/shiny.gbapal.lz"); + const u8 gMonIcon_Moltres[] = INCBIN_U8("graphics/pokemon/gen_1/moltres/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Moltres[] = INCBIN_U8("graphics/pokemon/moltres/footprint.1bpp"); + const u8 gMonFootprint_Moltres[] = INCBIN_U8("graphics/pokemon/gen_1/moltres/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/front.4bpp.lz"); - const u32 gMonPalette_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_MoltresGalarian[] = INCBIN_U8("graphics/pokemon/moltres/galarian/icon.4bpp"); + const u32 gMonFrontPic_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/galarian/front.4bpp.lz"); + const u32 gMonPalette_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/gen_1/moltres/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_MoltresGalarian[] = INCBIN_U8("graphics/pokemon/gen_1/moltres/galarian/icon.4bpp"); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_MOLTRES #if P_FAMILY_DRATINI - const u32 gMonFrontPic_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/anim_front.4bpp.lz"); - const u32 gMonPalette_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/normal.gbapal.lz"); - const u32 gMonBackPic_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/back.4bpp.lz"); - const u32 gMonShinyPalette_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/shiny.gbapal.lz"); - const u8 gMonIcon_Dratini[] = INCBIN_U8("graphics/pokemon/dratini/icon.4bpp"); + const u32 gMonFrontPic_Dratini[] = INCBIN_U32("graphics/pokemon/gen_1/dratini/anim_front.4bpp.lz"); + const u32 gMonPalette_Dratini[] = INCBIN_U32("graphics/pokemon/gen_1/dratini/normal.gbapal.lz"); + const u32 gMonBackPic_Dratini[] = INCBIN_U32("graphics/pokemon/gen_1/dratini/back.4bpp.lz"); + const u32 gMonShinyPalette_Dratini[] = INCBIN_U32("graphics/pokemon/gen_1/dratini/shiny.gbapal.lz"); + const u8 gMonIcon_Dratini[] = INCBIN_U8("graphics/pokemon/gen_1/dratini/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dratini[] = INCBIN_U8("graphics/pokemon/dratini/footprint.1bpp"); + const u8 gMonFootprint_Dratini[] = INCBIN_U8("graphics/pokemon/gen_1/dratini/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/anim_front.4bpp.lz"); - const u32 gMonPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/normal.gbapal.lz"); - const u32 gMonBackPic_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/back.4bpp.lz"); - const u32 gMonShinyPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/shiny.gbapal.lz"); - const u8 gMonIcon_Dragonair[] = INCBIN_U8("graphics/pokemon/dragonair/icon.4bpp"); + const u32 gMonFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/gen_1/dragonair/anim_front.4bpp.lz"); + const u32 gMonPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/gen_1/dragonair/normal.gbapal.lz"); + const u32 gMonBackPic_Dragonair[] = INCBIN_U32("graphics/pokemon/gen_1/dragonair/back.4bpp.lz"); + const u32 gMonShinyPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/gen_1/dragonair/shiny.gbapal.lz"); + const u8 gMonIcon_Dragonair[] = INCBIN_U8("graphics/pokemon/gen_1/dragonair/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dragonair[] = INCBIN_U8("graphics/pokemon/dragonair/footprint.1bpp"); + const u8 gMonFootprint_Dragonair[] = INCBIN_U8("graphics/pokemon/gen_1/dragonair/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/anim_front.4bpp.lz"); - const u32 gMonPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/normal.gbapal.lz"); - const u32 gMonBackPic_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/back.4bpp.lz"); - const u32 gMonShinyPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/shiny.gbapal.lz"); - const u8 gMonIcon_Dragonite[] = INCBIN_U8("graphics/pokemon/dragonite/icon.4bpp"); + const u32 gMonFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/gen_1/dragonite/anim_front.4bpp.lz"); + const u32 gMonPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/gen_1/dragonite/normal.gbapal.lz"); + const u32 gMonBackPic_Dragonite[] = INCBIN_U32("graphics/pokemon/gen_1/dragonite/back.4bpp.lz"); + const u32 gMonShinyPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/gen_1/dragonite/shiny.gbapal.lz"); + const u8 gMonIcon_Dragonite[] = INCBIN_U8("graphics/pokemon/gen_1/dragonite/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dragonite[] = INCBIN_U8("graphics/pokemon/dragonite/footprint.1bpp"); + const u8 gMonFootprint_Dragonite[] = INCBIN_U8("graphics/pokemon/gen_1/dragonite/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DRATINI #if P_FAMILY_MEWTWO - const u32 gMonFrontPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/anim_front.4bpp.lz"); - const u32 gMonPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/normal.gbapal.lz"); - const u32 gMonBackPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/back.4bpp.lz"); - const u32 gMonShinyPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/shiny.gbapal.lz"); - const u8 gMonIcon_Mewtwo[] = INCBIN_U8("graphics/pokemon/mewtwo/icon.4bpp"); + const u32 gMonFrontPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/anim_front.4bpp.lz"); + const u32 gMonPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/normal.gbapal.lz"); + const u32 gMonBackPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/back.4bpp.lz"); + const u32 gMonShinyPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/shiny.gbapal.lz"); + const u8 gMonIcon_Mewtwo[] = INCBIN_U8("graphics/pokemon/gen_1/mewtwo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mewtwo[] = INCBIN_U8("graphics/pokemon/mewtwo/footprint.1bpp"); + const u8 gMonFootprint_Mewtwo[] = INCBIN_U8("graphics/pokemon/gen_1/mewtwo/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/front.4bpp.lz"); - const u32 gMonPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/normal.gbapal.lz"); - const u32 gMonBackPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/back.4bpp.lz"); - const u32 gMonShinyPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/shiny.gbapal.lz"); - const u8 gMonIcon_MewtwoMegaX[] = INCBIN_U8("graphics/pokemon/mewtwo/mega_x/icon.4bpp"); + const u32 gMonFrontPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_x/front.4bpp.lz"); + const u32 gMonPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_x/normal.gbapal.lz"); + const u32 gMonBackPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_x/back.4bpp.lz"); + const u32 gMonShinyPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_x/shiny.gbapal.lz"); + const u8 gMonIcon_MewtwoMegaX[] = INCBIN_U8("graphics/pokemon/gen_1/mewtwo/mega_x/icon.4bpp"); - const u32 gMonFrontPic_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/front.4bpp.lz"); - const u32 gMonPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/normal.gbapal.lz"); - const u32 gMonBackPic_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/back.4bpp.lz"); - const u32 gMonShinyPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/shiny.gbapal.lz"); - const u8 gMonIcon_MewtwoMegaY[] = INCBIN_U8("graphics/pokemon/mewtwo/mega_y/icon.4bpp"); + const u32 gMonFrontPic_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_y/front.4bpp.lz"); + const u32 gMonPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_y/normal.gbapal.lz"); + const u32 gMonBackPic_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_y/back.4bpp.lz"); + const u32 gMonShinyPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/gen_1/mewtwo/mega_y/shiny.gbapal.lz"); + const u8 gMonIcon_MewtwoMegaY[] = INCBIN_U8("graphics/pokemon/gen_1/mewtwo/mega_y/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MEWTWO #if P_FAMILY_MEW - const u32 gMonFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/mew/anim_front.4bpp.lz"); - const u32 gMonPalette_Mew[] = INCBIN_U32("graphics/pokemon/mew/normal.gbapal.lz"); - const u32 gMonBackPic_Mew[] = INCBIN_U32("graphics/pokemon/mew/back.4bpp.lz"); - const u32 gMonShinyPalette_Mew[] = INCBIN_U32("graphics/pokemon/mew/shiny.gbapal.lz"); - const u8 gMonIcon_Mew[] = INCBIN_U8("graphics/pokemon/mew/icon.4bpp"); + const u32 gMonFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/gen_1/mew/anim_front.4bpp.lz"); + const u32 gMonPalette_Mew[] = INCBIN_U32("graphics/pokemon/gen_1/mew/normal.gbapal.lz"); + const u32 gMonBackPic_Mew[] = INCBIN_U32("graphics/pokemon/gen_1/mew/back.4bpp.lz"); + const u32 gMonShinyPalette_Mew[] = INCBIN_U32("graphics/pokemon/gen_1/mew/shiny.gbapal.lz"); + const u8 gMonIcon_Mew[] = INCBIN_U8("graphics/pokemon/gen_1/mew/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mew[] = INCBIN_U8("graphics/pokemon/mew/footprint.1bpp"); + const u8 gMonFootprint_Mew[] = INCBIN_U8("graphics/pokemon/gen_1/mew/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MEW #if P_FAMILY_CHIKORITA - const u32 gMonFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/anim_front.4bpp.lz"); - const u32 gMonPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/normal.gbapal.lz"); - const u32 gMonBackPic_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/back.4bpp.lz"); - const u32 gMonShinyPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/shiny.gbapal.lz"); - const u8 gMonIcon_Chikorita[] = INCBIN_U8("graphics/pokemon/chikorita/icon.4bpp"); + const u32 gMonFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/gen_2/chikorita/anim_front.4bpp.lz"); + const u32 gMonPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/gen_2/chikorita/normal.gbapal.lz"); + const u32 gMonBackPic_Chikorita[] = INCBIN_U32("graphics/pokemon/gen_2/chikorita/back.4bpp.lz"); + const u32 gMonShinyPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/gen_2/chikorita/shiny.gbapal.lz"); + const u8 gMonIcon_Chikorita[] = INCBIN_U8("graphics/pokemon/gen_2/chikorita/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Chikorita[] = INCBIN_U8("graphics/pokemon/chikorita/footprint.1bpp"); + const u8 gMonFootprint_Chikorita[] = INCBIN_U8("graphics/pokemon/gen_2/chikorita/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/anim_front.4bpp.lz"); - const u32 gMonPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/normal.gbapal.lz"); - const u32 gMonBackPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/back.4bpp.lz"); - const u32 gMonShinyPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/shiny.gbapal.lz"); - const u8 gMonIcon_Bayleef[] = INCBIN_U8("graphics/pokemon/bayleef/icon.4bpp"); + const u32 gMonFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/gen_2/bayleef/anim_front.4bpp.lz"); + const u32 gMonPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/gen_2/bayleef/normal.gbapal.lz"); + const u32 gMonBackPic_Bayleef[] = INCBIN_U32("graphics/pokemon/gen_2/bayleef/back.4bpp.lz"); + const u32 gMonShinyPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/gen_2/bayleef/shiny.gbapal.lz"); + const u8 gMonIcon_Bayleef[] = INCBIN_U8("graphics/pokemon/gen_2/bayleef/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bayleef[] = INCBIN_U8("graphics/pokemon/bayleef/footprint.1bpp"); + const u8 gMonFootprint_Bayleef[] = INCBIN_U8("graphics/pokemon/gen_2/bayleef/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/anim_front.4bpp.lz"); - const u32 gMonPalette_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/normal.gbapal.lz"); - const u32 gMonBackPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/back.4bpp.lz"); - const u32 gMonShinyPalette_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/shiny.gbapal.lz"); - const u8 gMonIcon_Meganium[] = INCBIN_U8("graphics/pokemon/meganium/icon.4bpp"); + const u32 gMonFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/gen_2/meganium/anim_front.4bpp.lz"); + const u32 gMonPalette_Meganium[] = INCBIN_U32("graphics/pokemon/gen_2/meganium/normal.gbapal.lz"); + const u32 gMonBackPic_Meganium[] = INCBIN_U32("graphics/pokemon/gen_2/meganium/back.4bpp.lz"); + const u32 gMonShinyPalette_Meganium[] = INCBIN_U32("graphics/pokemon/gen_2/meganium/shiny.gbapal.lz"); + const u8 gMonIcon_Meganium[] = INCBIN_U8("graphics/pokemon/gen_2/meganium/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Meganium[] = INCBIN_U8("graphics/pokemon/meganium/footprint.1bpp"); + const u8 gMonFootprint_Meganium[] = INCBIN_U8("graphics/pokemon/gen_2/meganium/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MeganiumF[] = INCBIN_U32("graphics/pokemon/meganium/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_MeganiumF[] = INCBIN_U32("graphics/pokemon/meganium/backf.4bpp.lz"); + const u32 gMonFrontPic_MeganiumF[] = INCBIN_U32("graphics/pokemon/gen_2/meganium/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_MeganiumF[] = INCBIN_U32("graphics/pokemon/gen_2/meganium/backf.4bpp.lz"); #endif //P_FAMILY_CHIKORITA #if P_FAMILY_CYNDAQUIL - const u32 gMonFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/anim_front.4bpp.lz"); - const u32 gMonPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/normal.gbapal.lz"); - const u32 gMonBackPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/back.4bpp.lz"); - const u32 gMonShinyPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/shiny.gbapal.lz"); - const u8 gMonIcon_Cyndaquil[] = INCBIN_U8("graphics/pokemon/cyndaquil/icon.4bpp"); + const u32 gMonFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/gen_2/cyndaquil/anim_front.4bpp.lz"); + const u32 gMonPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/gen_2/cyndaquil/normal.gbapal.lz"); + const u32 gMonBackPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/gen_2/cyndaquil/back.4bpp.lz"); + const u32 gMonShinyPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/gen_2/cyndaquil/shiny.gbapal.lz"); + const u8 gMonIcon_Cyndaquil[] = INCBIN_U8("graphics/pokemon/gen_2/cyndaquil/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cyndaquil[] = INCBIN_U8("graphics/pokemon/cyndaquil/footprint.1bpp"); + const u8 gMonFootprint_Cyndaquil[] = INCBIN_U8("graphics/pokemon/gen_2/cyndaquil/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/anim_front.4bpp.lz"); - const u32 gMonPalette_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/normal.gbapal.lz"); - const u32 gMonBackPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/back.4bpp.lz"); - const u32 gMonShinyPalette_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/shiny.gbapal.lz"); - const u8 gMonIcon_Quilava[] = INCBIN_U8("graphics/pokemon/quilava/icon.4bpp"); + const u32 gMonFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/gen_2/quilava/anim_front.4bpp.lz"); + const u32 gMonPalette_Quilava[] = INCBIN_U32("graphics/pokemon/gen_2/quilava/normal.gbapal.lz"); + const u32 gMonBackPic_Quilava[] = INCBIN_U32("graphics/pokemon/gen_2/quilava/back.4bpp.lz"); + const u32 gMonShinyPalette_Quilava[] = INCBIN_U32("graphics/pokemon/gen_2/quilava/shiny.gbapal.lz"); + const u8 gMonIcon_Quilava[] = INCBIN_U8("graphics/pokemon/gen_2/quilava/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Quilava[] = INCBIN_U8("graphics/pokemon/quilava/footprint.1bpp"); + const u8 gMonFootprint_Quilava[] = INCBIN_U8("graphics/pokemon/gen_2/quilava/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/anim_front.4bpp.lz"); - const u32 gMonPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/normal.gbapal.lz"); - const u32 gMonBackPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/back.4bpp.lz"); - const u32 gMonShinyPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/shiny.gbapal.lz"); - const u8 gMonIcon_Typhlosion[] = INCBIN_U8("graphics/pokemon/typhlosion/icon.4bpp"); + const u32 gMonFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/anim_front.4bpp.lz"); + const u32 gMonPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/normal.gbapal.lz"); + const u32 gMonBackPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/back.4bpp.lz"); + const u32 gMonShinyPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/shiny.gbapal.lz"); + const u8 gMonIcon_Typhlosion[] = INCBIN_U8("graphics/pokemon/gen_2/typhlosion/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Typhlosion[] = INCBIN_U8("graphics/pokemon/typhlosion/footprint.1bpp"); + const u8 gMonFootprint_Typhlosion[] = INCBIN_U8("graphics/pokemon/gen_2/typhlosion/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/front.4bpp.lz"); - const u32 gMonPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_TyphlosionHisuian[] = INCBIN_U8("graphics/pokemon/typhlosion/hisuian/icon.4bpp"); + const u32 gMonFrontPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/hisuian/front.4bpp.lz"); + const u32 gMonPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/typhlosion/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_TyphlosionHisuian[] = INCBIN_U8("graphics/pokemon/gen_2/typhlosion/hisuian/icon.4bpp"); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_CYNDAQUIL #if P_FAMILY_TOTODILE - const u32 gMonFrontPic_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/anim_front.4bpp.lz"); - const u32 gMonPalette_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/normal.gbapal.lz"); - const u32 gMonBackPic_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/back.4bpp.lz"); - const u32 gMonShinyPalette_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/shiny.gbapal.lz"); - const u8 gMonIcon_Totodile[] = INCBIN_U8("graphics/pokemon/totodile/icon.4bpp"); + const u32 gMonFrontPic_Totodile[] = INCBIN_U32("graphics/pokemon/gen_2/totodile/anim_front.4bpp.lz"); + const u32 gMonPalette_Totodile[] = INCBIN_U32("graphics/pokemon/gen_2/totodile/normal.gbapal.lz"); + const u32 gMonBackPic_Totodile[] = INCBIN_U32("graphics/pokemon/gen_2/totodile/back.4bpp.lz"); + const u32 gMonShinyPalette_Totodile[] = INCBIN_U32("graphics/pokemon/gen_2/totodile/shiny.gbapal.lz"); + const u8 gMonIcon_Totodile[] = INCBIN_U8("graphics/pokemon/gen_2/totodile/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Totodile[] = INCBIN_U8("graphics/pokemon/totodile/footprint.1bpp"); + const u8 gMonFootprint_Totodile[] = INCBIN_U8("graphics/pokemon/gen_2/totodile/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/anim_front.4bpp.lz"); - const u32 gMonPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/normal.gbapal.lz"); - const u32 gMonBackPic_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/back.4bpp.lz"); - const u32 gMonShinyPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/shiny.gbapal.lz"); - const u8 gMonIcon_Croconaw[] = INCBIN_U8("graphics/pokemon/croconaw/icon.4bpp"); + const u32 gMonFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/gen_2/croconaw/anim_front.4bpp.lz"); + const u32 gMonPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/gen_2/croconaw/normal.gbapal.lz"); + const u32 gMonBackPic_Croconaw[] = INCBIN_U32("graphics/pokemon/gen_2/croconaw/back.4bpp.lz"); + const u32 gMonShinyPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/gen_2/croconaw/shiny.gbapal.lz"); + const u8 gMonIcon_Croconaw[] = INCBIN_U8("graphics/pokemon/gen_2/croconaw/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Croconaw[] = INCBIN_U8("graphics/pokemon/croconaw/footprint.1bpp"); + const u8 gMonFootprint_Croconaw[] = INCBIN_U8("graphics/pokemon/gen_2/croconaw/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/anim_front.4bpp.lz"); - const u32 gMonPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/normal.gbapal.lz"); - const u32 gMonBackPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/back.4bpp.lz"); - const u32 gMonShinyPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/shiny.gbapal.lz"); - const u8 gMonIcon_Feraligatr[] = INCBIN_U8("graphics/pokemon/feraligatr/icon.4bpp"); + const u32 gMonFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/gen_2/feraligatr/anim_front.4bpp.lz"); + const u32 gMonPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/gen_2/feraligatr/normal.gbapal.lz"); + const u32 gMonBackPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/gen_2/feraligatr/back.4bpp.lz"); + const u32 gMonShinyPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/gen_2/feraligatr/shiny.gbapal.lz"); + const u8 gMonIcon_Feraligatr[] = INCBIN_U8("graphics/pokemon/gen_2/feraligatr/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Feraligatr[] = INCBIN_U8("graphics/pokemon/feraligatr/footprint.1bpp"); + const u8 gMonFootprint_Feraligatr[] = INCBIN_U8("graphics/pokemon/gen_2/feraligatr/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TOTODILE #if P_FAMILY_SENTRET - const u32 gMonFrontPic_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/anim_front.4bpp.lz"); - const u32 gMonPalette_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/normal.gbapal.lz"); - const u32 gMonBackPic_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/back.4bpp.lz"); - const u32 gMonShinyPalette_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/shiny.gbapal.lz"); - const u8 gMonIcon_Sentret[] = INCBIN_U8("graphics/pokemon/sentret/icon.4bpp"); + const u32 gMonFrontPic_Sentret[] = INCBIN_U32("graphics/pokemon/gen_2/sentret/anim_front.4bpp.lz"); + const u32 gMonPalette_Sentret[] = INCBIN_U32("graphics/pokemon/gen_2/sentret/normal.gbapal.lz"); + const u32 gMonBackPic_Sentret[] = INCBIN_U32("graphics/pokemon/gen_2/sentret/back.4bpp.lz"); + const u32 gMonShinyPalette_Sentret[] = INCBIN_U32("graphics/pokemon/gen_2/sentret/shiny.gbapal.lz"); + const u8 gMonIcon_Sentret[] = INCBIN_U8("graphics/pokemon/gen_2/sentret/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sentret[] = INCBIN_U8("graphics/pokemon/sentret/footprint.1bpp"); + const u8 gMonFootprint_Sentret[] = INCBIN_U8("graphics/pokemon/gen_2/sentret/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/anim_front.4bpp.lz"); - const u32 gMonPalette_Furret[] = INCBIN_U32("graphics/pokemon/furret/normal.gbapal.lz"); - const u32 gMonBackPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/back.4bpp.lz"); - const u32 gMonShinyPalette_Furret[] = INCBIN_U32("graphics/pokemon/furret/shiny.gbapal.lz"); - const u8 gMonIcon_Furret[] = INCBIN_U8("graphics/pokemon/furret/icon.4bpp"); + const u32 gMonFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/gen_2/furret/anim_front.4bpp.lz"); + const u32 gMonPalette_Furret[] = INCBIN_U32("graphics/pokemon/gen_2/furret/normal.gbapal.lz"); + const u32 gMonBackPic_Furret[] = INCBIN_U32("graphics/pokemon/gen_2/furret/back.4bpp.lz"); + const u32 gMonShinyPalette_Furret[] = INCBIN_U32("graphics/pokemon/gen_2/furret/shiny.gbapal.lz"); + const u8 gMonIcon_Furret[] = INCBIN_U8("graphics/pokemon/gen_2/furret/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Furret[] = INCBIN_U8("graphics/pokemon/furret/footprint.1bpp"); + const u8 gMonFootprint_Furret[] = INCBIN_U8("graphics/pokemon/gen_2/furret/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SENTRET #if P_FAMILY_HOOTHOOT - const u32 gMonFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/anim_front.4bpp.lz"); - const u32 gMonPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/normal.gbapal.lz"); - const u32 gMonBackPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/back.4bpp.lz"); - const u32 gMonShinyPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/shiny.gbapal.lz"); - const u8 gMonIcon_Hoothoot[] = INCBIN_U8("graphics/pokemon/hoothoot/icon.4bpp"); + const u32 gMonFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/gen_2/hoothoot/anim_front.4bpp.lz"); + const u32 gMonPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/gen_2/hoothoot/normal.gbapal.lz"); + const u32 gMonBackPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/gen_2/hoothoot/back.4bpp.lz"); + const u32 gMonShinyPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/gen_2/hoothoot/shiny.gbapal.lz"); + const u8 gMonIcon_Hoothoot[] = INCBIN_U8("graphics/pokemon/gen_2/hoothoot/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hoothoot[] = INCBIN_U8("graphics/pokemon/hoothoot/footprint.1bpp"); + const u8 gMonFootprint_Hoothoot[] = INCBIN_U8("graphics/pokemon/gen_2/hoothoot/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/anim_front.4bpp.lz"); - const u32 gMonPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/normal.gbapal.lz"); - const u32 gMonBackPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/back.4bpp.lz"); - const u32 gMonShinyPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/shiny.gbapal.lz"); - const u8 gMonIcon_Noctowl[] = INCBIN_U8("graphics/pokemon/noctowl/icon.4bpp"); + const u32 gMonFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/gen_2/noctowl/anim_front.4bpp.lz"); + const u32 gMonPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/gen_2/noctowl/normal.gbapal.lz"); + const u32 gMonBackPic_Noctowl[] = INCBIN_U32("graphics/pokemon/gen_2/noctowl/back.4bpp.lz"); + const u32 gMonShinyPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/gen_2/noctowl/shiny.gbapal.lz"); + const u8 gMonIcon_Noctowl[] = INCBIN_U8("graphics/pokemon/gen_2/noctowl/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Noctowl[] = INCBIN_U8("graphics/pokemon/noctowl/footprint.1bpp"); + const u8 gMonFootprint_Noctowl[] = INCBIN_U8("graphics/pokemon/gen_2/noctowl/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_HOOTHOOT #if P_FAMILY_LEDYBA - const u32 gMonFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/anim_front.4bpp.lz"); - const u32 gMonPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/normal.gbapal.lz"); - const u32 gMonBackPic_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/back.4bpp.lz"); - const u32 gMonShinyPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/shiny.gbapal.lz"); - const u8 gMonIcon_Ledyba[] = INCBIN_U8("graphics/pokemon/ledyba/icon.4bpp"); + const u32 gMonFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/gen_2/ledyba/anim_front.4bpp.lz"); + const u32 gMonPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/gen_2/ledyba/normal.gbapal.lz"); + const u32 gMonBackPic_Ledyba[] = INCBIN_U32("graphics/pokemon/gen_2/ledyba/back.4bpp.lz"); + const u32 gMonShinyPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/gen_2/ledyba/shiny.gbapal.lz"); + const u8 gMonIcon_Ledyba[] = INCBIN_U8("graphics/pokemon/gen_2/ledyba/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ledyba[] = INCBIN_U8("graphics/pokemon/ledyba/footprint.1bpp"); + const u8 gMonFootprint_Ledyba[] = INCBIN_U8("graphics/pokemon/gen_2/ledyba/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_LedybaF[] = INCBIN_U32("graphics/pokemon/ledyba/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_LedybaF[] = INCBIN_U32("graphics/pokemon/ledyba/backf.4bpp.lz"); + const u32 gMonFrontPic_LedybaF[] = INCBIN_U32("graphics/pokemon/gen_2/ledyba/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_LedybaF[] = INCBIN_U32("graphics/pokemon/gen_2/ledyba/backf.4bpp.lz"); - const u32 gMonFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/anim_front.4bpp.lz"); - const u32 gMonPalette_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/normal.gbapal.lz"); - const u32 gMonBackPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/back.4bpp.lz"); - const u32 gMonShinyPalette_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/shiny.gbapal.lz"); - const u8 gMonIcon_Ledian[] = INCBIN_U8("graphics/pokemon/ledian/icon.4bpp"); + const u32 gMonFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/gen_2/ledian/anim_front.4bpp.lz"); + const u32 gMonPalette_Ledian[] = INCBIN_U32("graphics/pokemon/gen_2/ledian/normal.gbapal.lz"); + const u32 gMonBackPic_Ledian[] = INCBIN_U32("graphics/pokemon/gen_2/ledian/back.4bpp.lz"); + const u32 gMonShinyPalette_Ledian[] = INCBIN_U32("graphics/pokemon/gen_2/ledian/shiny.gbapal.lz"); + const u8 gMonIcon_Ledian[] = INCBIN_U8("graphics/pokemon/gen_2/ledian/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ledian[] = INCBIN_U8("graphics/pokemon/ledian/footprint.1bpp"); + const u8 gMonFootprint_Ledian[] = INCBIN_U8("graphics/pokemon/gen_2/ledian/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_LedianF[] = INCBIN_U32("graphics/pokemon/ledian/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_LedianF[] = INCBIN_U32("graphics/pokemon/ledian/backf.4bpp.lz"); + const u32 gMonFrontPic_LedianF[] = INCBIN_U32("graphics/pokemon/gen_2/ledian/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_LedianF[] = INCBIN_U32("graphics/pokemon/gen_2/ledian/backf.4bpp.lz"); #endif //P_FAMILY_LEDYBA #if P_FAMILY_SPINARAK - const u32 gMonFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/anim_front.4bpp.lz"); - const u32 gMonPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/normal.gbapal.lz"); - const u32 gMonBackPic_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/back.4bpp.lz"); - const u32 gMonShinyPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/shiny.gbapal.lz"); - const u8 gMonIcon_Spinarak[] = INCBIN_U8("graphics/pokemon/spinarak/icon.4bpp"); + const u32 gMonFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/gen_2/spinarak/anim_front.4bpp.lz"); + const u32 gMonPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/gen_2/spinarak/normal.gbapal.lz"); + const u32 gMonBackPic_Spinarak[] = INCBIN_U32("graphics/pokemon/gen_2/spinarak/back.4bpp.lz"); + const u32 gMonShinyPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/gen_2/spinarak/shiny.gbapal.lz"); + const u8 gMonIcon_Spinarak[] = INCBIN_U8("graphics/pokemon/gen_2/spinarak/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Spinarak[] = INCBIN_U8("graphics/pokemon/spinarak/footprint.1bpp"); + const u8 gMonFootprint_Spinarak[] = INCBIN_U8("graphics/pokemon/gen_2/spinarak/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/anim_front.4bpp.lz"); - const u32 gMonPalette_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/normal.gbapal.lz"); - const u32 gMonBackPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/back.4bpp.lz"); - const u32 gMonShinyPalette_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/shiny.gbapal.lz"); - const u8 gMonIcon_Ariados[] = INCBIN_U8("graphics/pokemon/ariados/icon.4bpp"); + const u32 gMonFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/gen_2/ariados/anim_front.4bpp.lz"); + const u32 gMonPalette_Ariados[] = INCBIN_U32("graphics/pokemon/gen_2/ariados/normal.gbapal.lz"); + const u32 gMonBackPic_Ariados[] = INCBIN_U32("graphics/pokemon/gen_2/ariados/back.4bpp.lz"); + const u32 gMonShinyPalette_Ariados[] = INCBIN_U32("graphics/pokemon/gen_2/ariados/shiny.gbapal.lz"); + const u8 gMonIcon_Ariados[] = INCBIN_U8("graphics/pokemon/gen_2/ariados/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ariados[] = INCBIN_U8("graphics/pokemon/ariados/footprint.1bpp"); + const u8 gMonFootprint_Ariados[] = INCBIN_U8("graphics/pokemon/gen_2/ariados/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SPINARAK #if P_FAMILY_CHINCHOU - const u32 gMonFrontPic_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/anim_front.4bpp.lz"); - const u32 gMonPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/normal.gbapal.lz"); - const u32 gMonBackPic_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/back.4bpp.lz"); - const u32 gMonShinyPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/shiny.gbapal.lz"); - const u8 gMonIcon_Chinchou[] = INCBIN_U8("graphics/pokemon/chinchou/icon.4bpp"); + const u32 gMonFrontPic_Chinchou[] = INCBIN_U32("graphics/pokemon/gen_2/chinchou/anim_front.4bpp.lz"); + const u32 gMonPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/gen_2/chinchou/normal.gbapal.lz"); + const u32 gMonBackPic_Chinchou[] = INCBIN_U32("graphics/pokemon/gen_2/chinchou/back.4bpp.lz"); + const u32 gMonShinyPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/gen_2/chinchou/shiny.gbapal.lz"); + const u8 gMonIcon_Chinchou[] = INCBIN_U8("graphics/pokemon/gen_2/chinchou/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Chinchou[] = INCBIN_U8("graphics/pokemon/chinchou/footprint.1bpp"); + const u8 gMonFootprint_Chinchou[] = INCBIN_U8("graphics/pokemon/gen_2/chinchou/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/anim_front.4bpp.lz"); - const u32 gMonPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/normal.gbapal.lz"); - const u32 gMonBackPic_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/back.4bpp.lz"); - const u32 gMonShinyPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/shiny.gbapal.lz"); - const u8 gMonIcon_Lanturn[] = INCBIN_U8("graphics/pokemon/lanturn/icon.4bpp"); + const u32 gMonFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/gen_2/lanturn/anim_front.4bpp.lz"); + const u32 gMonPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/gen_2/lanturn/normal.gbapal.lz"); + const u32 gMonBackPic_Lanturn[] = INCBIN_U32("graphics/pokemon/gen_2/lanturn/back.4bpp.lz"); + const u32 gMonShinyPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/gen_2/lanturn/shiny.gbapal.lz"); + const u8 gMonIcon_Lanturn[] = INCBIN_U8("graphics/pokemon/gen_2/lanturn/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lanturn[] = INCBIN_U8("graphics/pokemon/lanturn/footprint.1bpp"); + const u8 gMonFootprint_Lanturn[] = INCBIN_U8("graphics/pokemon/gen_2/lanturn/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CHINCHOU #if P_FAMILY_TOGEPI - const u32 gMonFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/anim_front.4bpp.lz"); - const u32 gMonPalette_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/normal.gbapal.lz"); - const u32 gMonBackPic_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/back.4bpp.lz"); - const u32 gMonShinyPalette_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/shiny.gbapal.lz"); - const u8 gMonIcon_Togepi[] = INCBIN_U8("graphics/pokemon/togepi/icon.4bpp"); + const u32 gMonFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/gen_2/togepi/anim_front.4bpp.lz"); + const u32 gMonPalette_Togepi[] = INCBIN_U32("graphics/pokemon/gen_2/togepi/normal.gbapal.lz"); + const u32 gMonBackPic_Togepi[] = INCBIN_U32("graphics/pokemon/gen_2/togepi/back.4bpp.lz"); + const u32 gMonShinyPalette_Togepi[] = INCBIN_U32("graphics/pokemon/gen_2/togepi/shiny.gbapal.lz"); + const u8 gMonIcon_Togepi[] = INCBIN_U8("graphics/pokemon/gen_2/togepi/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Togepi[] = INCBIN_U8("graphics/pokemon/togepi/footprint.1bpp"); + const u8 gMonFootprint_Togepi[] = INCBIN_U8("graphics/pokemon/gen_2/togepi/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/anim_front.4bpp.lz"); - const u32 gMonPalette_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/normal.gbapal.lz"); - const u32 gMonBackPic_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/back.4bpp.lz"); - const u32 gMonShinyPalette_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/shiny.gbapal.lz"); - const u8 gMonIcon_Togetic[] = INCBIN_U8("graphics/pokemon/togetic/icon.4bpp"); + const u32 gMonFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/gen_2/togetic/anim_front.4bpp.lz"); + const u32 gMonPalette_Togetic[] = INCBIN_U32("graphics/pokemon/gen_2/togetic/normal.gbapal.lz"); + const u32 gMonBackPic_Togetic[] = INCBIN_U32("graphics/pokemon/gen_2/togetic/back.4bpp.lz"); + const u32 gMonShinyPalette_Togetic[] = INCBIN_U32("graphics/pokemon/gen_2/togetic/shiny.gbapal.lz"); + const u8 gMonIcon_Togetic[] = INCBIN_U8("graphics/pokemon/gen_2/togetic/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Togetic[] = INCBIN_U8("graphics/pokemon/togetic/footprint.1bpp"); + const u8 gMonFootprint_Togetic[] = INCBIN_U8("graphics/pokemon/gen_2/togetic/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/anim_front.4bpp.lz"); - const u32 gMonPalette_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/normal.gbapal.lz"); - const u32 gMonBackPic_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/back.4bpp.lz"); - const u32 gMonShinyPalette_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/shiny.gbapal.lz"); - const u8 gMonIcon_Togekiss[] = INCBIN_U8("graphics/pokemon/togekiss/icon.4bpp"); + const u32 gMonFrontPic_Togekiss[] = INCBIN_U32("graphics/pokemon/gen_4/togekiss/anim_front.4bpp.lz"); + const u32 gMonPalette_Togekiss[] = INCBIN_U32("graphics/pokemon/gen_4/togekiss/normal.gbapal.lz"); + const u32 gMonBackPic_Togekiss[] = INCBIN_U32("graphics/pokemon/gen_4/togekiss/back.4bpp.lz"); + const u32 gMonShinyPalette_Togekiss[] = INCBIN_U32("graphics/pokemon/gen_4/togekiss/shiny.gbapal.lz"); + const u8 gMonIcon_Togekiss[] = INCBIN_U8("graphics/pokemon/gen_4/togekiss/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Togekiss[] = INCBIN_U8("graphics/pokemon/togekiss/footprint.1bpp"); + const u8 gMonFootprint_Togekiss[] = INCBIN_U8("graphics/pokemon/gen_4/togekiss/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_TOGEPI #if P_FAMILY_NATU - const u32 gMonFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/natu/anim_front.4bpp.lz"); - const u32 gMonPalette_Natu[] = INCBIN_U32("graphics/pokemon/natu/normal.gbapal.lz"); - const u32 gMonBackPic_Natu[] = INCBIN_U32("graphics/pokemon/natu/back.4bpp.lz"); - const u32 gMonShinyPalette_Natu[] = INCBIN_U32("graphics/pokemon/natu/shiny.gbapal.lz"); - const u8 gMonIcon_Natu[] = INCBIN_U8("graphics/pokemon/natu/icon.4bpp"); + const u32 gMonFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/gen_2/natu/anim_front.4bpp.lz"); + const u32 gMonPalette_Natu[] = INCBIN_U32("graphics/pokemon/gen_2/natu/normal.gbapal.lz"); + const u32 gMonBackPic_Natu[] = INCBIN_U32("graphics/pokemon/gen_2/natu/back.4bpp.lz"); + const u32 gMonShinyPalette_Natu[] = INCBIN_U32("graphics/pokemon/gen_2/natu/shiny.gbapal.lz"); + const u8 gMonIcon_Natu[] = INCBIN_U8("graphics/pokemon/gen_2/natu/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Natu[] = INCBIN_U8("graphics/pokemon/natu/footprint.1bpp"); + const u8 gMonFootprint_Natu[] = INCBIN_U8("graphics/pokemon/gen_2/natu/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/anim_front.4bpp.lz"); - const u32 gMonPalette_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/normal.gbapal.lz"); - const u32 gMonBackPic_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/back.4bpp.lz"); - const u32 gMonShinyPalette_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/shiny.gbapal.lz"); - const u8 gMonIcon_Xatu[] = INCBIN_U8("graphics/pokemon/xatu/icon.4bpp"); + const u32 gMonFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/gen_2/xatu/anim_front.4bpp.lz"); + const u32 gMonPalette_Xatu[] = INCBIN_U32("graphics/pokemon/gen_2/xatu/normal.gbapal.lz"); + const u32 gMonBackPic_Xatu[] = INCBIN_U32("graphics/pokemon/gen_2/xatu/back.4bpp.lz"); + const u32 gMonShinyPalette_Xatu[] = INCBIN_U32("graphics/pokemon/gen_2/xatu/shiny.gbapal.lz"); + const u8 gMonIcon_Xatu[] = INCBIN_U8("graphics/pokemon/gen_2/xatu/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Xatu[] = INCBIN_U8("graphics/pokemon/xatu/footprint.1bpp"); + const u8 gMonFootprint_Xatu[] = INCBIN_U8("graphics/pokemon/gen_2/xatu/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_XatuF[] = INCBIN_U32("graphics/pokemon/xatu/anim_frontf.4bpp.lz"); + const u32 gMonFrontPic_XatuF[] = INCBIN_U32("graphics/pokemon/gen_2/xatu/anim_frontf.4bpp.lz"); #endif //P_FAMILY_NATU #if P_FAMILY_MAREEP - const u32 gMonFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/anim_front.4bpp.lz"); - const u32 gMonPalette_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/normal.gbapal.lz"); - const u32 gMonBackPic_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/back.4bpp.lz"); - const u32 gMonShinyPalette_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/shiny.gbapal.lz"); - const u8 gMonIcon_Mareep[] = INCBIN_U8("graphics/pokemon/mareep/icon.4bpp"); + const u32 gMonFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/gen_2/mareep/anim_front.4bpp.lz"); + const u32 gMonPalette_Mareep[] = INCBIN_U32("graphics/pokemon/gen_2/mareep/normal.gbapal.lz"); + const u32 gMonBackPic_Mareep[] = INCBIN_U32("graphics/pokemon/gen_2/mareep/back.4bpp.lz"); + const u32 gMonShinyPalette_Mareep[] = INCBIN_U32("graphics/pokemon/gen_2/mareep/shiny.gbapal.lz"); + const u8 gMonIcon_Mareep[] = INCBIN_U8("graphics/pokemon/gen_2/mareep/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mareep[] = INCBIN_U8("graphics/pokemon/mareep/footprint.1bpp"); + const u8 gMonFootprint_Mareep[] = INCBIN_U8("graphics/pokemon/gen_2/mareep/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/anim_front.4bpp.lz"); - const u32 gMonPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/normal.gbapal.lz"); - const u32 gMonBackPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/back.4bpp.lz"); - const u32 gMonShinyPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/shiny.gbapal.lz"); - const u8 gMonIcon_Flaaffy[] = INCBIN_U8("graphics/pokemon/flaaffy/icon.4bpp"); + const u32 gMonFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/gen_2/flaaffy/anim_front.4bpp.lz"); + const u32 gMonPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/gen_2/flaaffy/normal.gbapal.lz"); + const u32 gMonBackPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/gen_2/flaaffy/back.4bpp.lz"); + const u32 gMonShinyPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/gen_2/flaaffy/shiny.gbapal.lz"); + const u8 gMonIcon_Flaaffy[] = INCBIN_U8("graphics/pokemon/gen_2/flaaffy/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Flaaffy[] = INCBIN_U8("graphics/pokemon/flaaffy/footprint.1bpp"); + const u8 gMonFootprint_Flaaffy[] = INCBIN_U8("graphics/pokemon/gen_2/flaaffy/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/anim_front.4bpp.lz"); - const u32 gMonPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/normal.gbapal.lz"); - const u32 gMonBackPic_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/back.4bpp.lz"); - const u32 gMonShinyPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/shiny.gbapal.lz"); - const u8 gMonIcon_Ampharos[] = INCBIN_U8("graphics/pokemon/ampharos/icon.4bpp"); + const u32 gMonFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/anim_front.4bpp.lz"); + const u32 gMonPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/normal.gbapal.lz"); + const u32 gMonBackPic_Ampharos[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/back.4bpp.lz"); + const u32 gMonShinyPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/shiny.gbapal.lz"); + const u8 gMonIcon_Ampharos[] = INCBIN_U8("graphics/pokemon/gen_2/ampharos/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ampharos[] = INCBIN_U8("graphics/pokemon/ampharos/footprint.1bpp"); + const u8 gMonFootprint_Ampharos[] = INCBIN_U8("graphics/pokemon/gen_2/ampharos/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/front.4bpp.lz"); - const u32 gMonPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/normal.gbapal.lz"); - const u32 gMonBackPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/shiny.gbapal.lz"); - const u8 gMonIcon_AmpharosMega[] = INCBIN_U8("graphics/pokemon/ampharos/mega/icon.4bpp"); + const u32 gMonFrontPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/mega/front.4bpp.lz"); + const u32 gMonPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/mega/normal.gbapal.lz"); + const u32 gMonBackPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/gen_2/ampharos/mega/shiny.gbapal.lz"); + const u8 gMonIcon_AmpharosMega[] = INCBIN_U8("graphics/pokemon/gen_2/ampharos/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAREEP #if P_FAMILY_MARILL #if P_GEN_3_CROSS_EVOS - const u32 gMonFrontPic_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/anim_front.4bpp.lz"); - const u32 gMonPalette_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/normal.gbapal.lz"); - const u32 gMonBackPic_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/back.4bpp.lz"); - const u32 gMonShinyPalette_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/shiny.gbapal.lz"); - const u8 gMonIcon_Azurill[] = INCBIN_U8("graphics/pokemon/azurill/icon.4bpp"); + const u32 gMonFrontPic_Azurill[] = INCBIN_U32("graphics/pokemon/gen_3/azurill/anim_front.4bpp.lz"); + const u32 gMonPalette_Azurill[] = INCBIN_U32("graphics/pokemon/gen_3/azurill/normal.gbapal.lz"); + const u32 gMonBackPic_Azurill[] = INCBIN_U32("graphics/pokemon/gen_3/azurill/back.4bpp.lz"); + const u32 gMonShinyPalette_Azurill[] = INCBIN_U32("graphics/pokemon/gen_3/azurill/shiny.gbapal.lz"); + const u8 gMonIcon_Azurill[] = INCBIN_U8("graphics/pokemon/gen_3/azurill/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Azurill[] = INCBIN_U8("graphics/pokemon/azurill/footprint.1bpp"); + const u8 gMonFootprint_Azurill[] = INCBIN_U8("graphics/pokemon/gen_3/azurill/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_3_CROSS_EVOS - const u32 gMonFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/anim_front.4bpp.lz"); - const u32 gMonPalette_Marill[] = INCBIN_U32("graphics/pokemon/marill/normal.gbapal.lz"); - const u32 gMonBackPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/back.4bpp.lz"); - const u32 gMonShinyPalette_Marill[] = INCBIN_U32("graphics/pokemon/marill/shiny.gbapal.lz"); - const u8 gMonIcon_Marill[] = INCBIN_U8("graphics/pokemon/marill/icon.4bpp"); + const u32 gMonFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/gen_2/marill/anim_front.4bpp.lz"); + const u32 gMonPalette_Marill[] = INCBIN_U32("graphics/pokemon/gen_2/marill/normal.gbapal.lz"); + const u32 gMonBackPic_Marill[] = INCBIN_U32("graphics/pokemon/gen_2/marill/back.4bpp.lz"); + const u32 gMonShinyPalette_Marill[] = INCBIN_U32("graphics/pokemon/gen_2/marill/shiny.gbapal.lz"); + const u8 gMonIcon_Marill[] = INCBIN_U8("graphics/pokemon/gen_2/marill/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Marill[] = INCBIN_U8("graphics/pokemon/marill/footprint.1bpp"); + const u8 gMonFootprint_Marill[] = INCBIN_U8("graphics/pokemon/gen_2/marill/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/anim_front.4bpp.lz"); - const u32 gMonPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/normal.gbapal.lz"); - const u32 gMonBackPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/back.4bpp.lz"); - const u32 gMonShinyPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/shiny.gbapal.lz"); - const u8 gMonIcon_Azumarill[] = INCBIN_U8("graphics/pokemon/azumarill/icon.4bpp"); + const u32 gMonFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/gen_2/azumarill/anim_front.4bpp.lz"); + const u32 gMonPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/gen_2/azumarill/normal.gbapal.lz"); + const u32 gMonBackPic_Azumarill[] = INCBIN_U32("graphics/pokemon/gen_2/azumarill/back.4bpp.lz"); + const u32 gMonShinyPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/gen_2/azumarill/shiny.gbapal.lz"); + const u8 gMonIcon_Azumarill[] = INCBIN_U8("graphics/pokemon/gen_2/azumarill/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Azumarill[] = INCBIN_U8("graphics/pokemon/azumarill/footprint.1bpp"); + const u8 gMonFootprint_Azumarill[] = INCBIN_U8("graphics/pokemon/gen_2/azumarill/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MARILL #if P_FAMILY_SUDOWOODO #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/anim_front.4bpp.lz"); - const u32 gMonPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/normal.gbapal.lz"); - const u32 gMonBackPic_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/back.4bpp.lz"); - const u32 gMonShinyPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/shiny.gbapal.lz"); - const u8 gMonIcon_Bonsly[] = INCBIN_U8("graphics/pokemon/bonsly/icon.4bpp"); + const u32 gMonFrontPic_Bonsly[] = INCBIN_U32("graphics/pokemon/gen_4/bonsly/anim_front.4bpp.lz"); + const u32 gMonPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/gen_4/bonsly/normal.gbapal.lz"); + const u32 gMonBackPic_Bonsly[] = INCBIN_U32("graphics/pokemon/gen_4/bonsly/back.4bpp.lz"); + const u32 gMonShinyPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/gen_4/bonsly/shiny.gbapal.lz"); + const u8 gMonIcon_Bonsly[] = INCBIN_U8("graphics/pokemon/gen_4/bonsly/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bonsly[] = INCBIN_U8("graphics/pokemon/bonsly/footprint.1bpp"); + const u8 gMonFootprint_Bonsly[] = INCBIN_U8("graphics/pokemon/gen_4/bonsly/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/anim_front.4bpp.lz"); - const u32 gMonPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/normal.gbapal.lz"); - const u32 gMonBackPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/back.4bpp.lz"); - const u32 gMonShinyPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/shiny.gbapal.lz"); - const u8 gMonIcon_Sudowoodo[] = INCBIN_U8("graphics/pokemon/sudowoodo/icon.4bpp"); + const u32 gMonFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/gen_2/sudowoodo/anim_front.4bpp.lz"); + const u32 gMonPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/gen_2/sudowoodo/normal.gbapal.lz"); + const u32 gMonBackPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/gen_2/sudowoodo/back.4bpp.lz"); + const u32 gMonShinyPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/gen_2/sudowoodo/shiny.gbapal.lz"); + const u8 gMonIcon_Sudowoodo[] = INCBIN_U8("graphics/pokemon/gen_2/sudowoodo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sudowoodo[] = INCBIN_U8("graphics/pokemon/sudowoodo/footprint.1bpp"); + const u8 gMonFootprint_Sudowoodo[] = INCBIN_U8("graphics/pokemon/gen_2/sudowoodo/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_SudowoodoF[] = INCBIN_U32("graphics/pokemon/sudowoodo/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_SudowoodoF[] = INCBIN_U32("graphics/pokemon/sudowoodo/backf.4bpp.lz"); + const u32 gMonFrontPic_SudowoodoF[] = INCBIN_U32("graphics/pokemon/gen_2/sudowoodo/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_SudowoodoF[] = INCBIN_U32("graphics/pokemon/gen_2/sudowoodo/backf.4bpp.lz"); #endif //P_FAMILY_SUDOWOODO #if P_FAMILY_HOPPIP - const u32 gMonFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/anim_front.4bpp.lz"); - const u32 gMonPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/normal.gbapal.lz"); - const u32 gMonBackPic_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/back.4bpp.lz"); - const u32 gMonShinyPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/shiny.gbapal.lz"); - const u8 gMonIcon_Hoppip[] = INCBIN_U8("graphics/pokemon/hoppip/icon.4bpp"); + const u32 gMonFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/gen_2/hoppip/anim_front.4bpp.lz"); + const u32 gMonPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/gen_2/hoppip/normal.gbapal.lz"); + const u32 gMonBackPic_Hoppip[] = INCBIN_U32("graphics/pokemon/gen_2/hoppip/back.4bpp.lz"); + const u32 gMonShinyPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/gen_2/hoppip/shiny.gbapal.lz"); + const u8 gMonIcon_Hoppip[] = INCBIN_U8("graphics/pokemon/gen_2/hoppip/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hoppip[] = INCBIN_U8("graphics/pokemon/hoppip/footprint.1bpp"); + const u8 gMonFootprint_Hoppip[] = INCBIN_U8("graphics/pokemon/gen_2/hoppip/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/anim_front.4bpp.lz"); - const u32 gMonPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/normal.gbapal.lz"); - const u32 gMonBackPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/back.4bpp.lz"); - const u32 gMonShinyPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/shiny.gbapal.lz"); - const u8 gMonIcon_Skiploom[] = INCBIN_U8("graphics/pokemon/skiploom/icon.4bpp"); + const u32 gMonFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/gen_2/skiploom/anim_front.4bpp.lz"); + const u32 gMonPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/gen_2/skiploom/normal.gbapal.lz"); + const u32 gMonBackPic_Skiploom[] = INCBIN_U32("graphics/pokemon/gen_2/skiploom/back.4bpp.lz"); + const u32 gMonShinyPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/gen_2/skiploom/shiny.gbapal.lz"); + const u8 gMonIcon_Skiploom[] = INCBIN_U8("graphics/pokemon/gen_2/skiploom/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Skiploom[] = INCBIN_U8("graphics/pokemon/skiploom/footprint.1bpp"); + const u8 gMonFootprint_Skiploom[] = INCBIN_U8("graphics/pokemon/gen_2/skiploom/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/anim_front.4bpp.lz"); - const u32 gMonPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/normal.gbapal.lz"); - const u32 gMonBackPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/back.4bpp.lz"); - const u32 gMonShinyPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/shiny.gbapal.lz"); - const u8 gMonIcon_Jumpluff[] = INCBIN_U8("graphics/pokemon/jumpluff/icon.4bpp"); + const u32 gMonFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/gen_2/jumpluff/anim_front.4bpp.lz"); + const u32 gMonPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/gen_2/jumpluff/normal.gbapal.lz"); + const u32 gMonBackPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/gen_2/jumpluff/back.4bpp.lz"); + const u32 gMonShinyPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/gen_2/jumpluff/shiny.gbapal.lz"); + const u8 gMonIcon_Jumpluff[] = INCBIN_U8("graphics/pokemon/gen_2/jumpluff/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Jumpluff[] = INCBIN_U8("graphics/pokemon/jumpluff/footprint.1bpp"); + const u8 gMonFootprint_Jumpluff[] = INCBIN_U8("graphics/pokemon/gen_2/jumpluff/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_HOPPIP #if P_FAMILY_AIPOM - const u32 gMonFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/anim_front.4bpp.lz"); - const u32 gMonPalette_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/normal.gbapal.lz"); - const u32 gMonBackPic_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/back.4bpp.lz"); - const u32 gMonShinyPalette_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/shiny.gbapal.lz"); - const u8 gMonIcon_Aipom[] = INCBIN_U8("graphics/pokemon/aipom/icon.4bpp"); + const u32 gMonFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/gen_2/aipom/anim_front.4bpp.lz"); + const u32 gMonPalette_Aipom[] = INCBIN_U32("graphics/pokemon/gen_2/aipom/normal.gbapal.lz"); + const u32 gMonBackPic_Aipom[] = INCBIN_U32("graphics/pokemon/gen_2/aipom/back.4bpp.lz"); + const u32 gMonShinyPalette_Aipom[] = INCBIN_U32("graphics/pokemon/gen_2/aipom/shiny.gbapal.lz"); + const u8 gMonIcon_Aipom[] = INCBIN_U8("graphics/pokemon/gen_2/aipom/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Aipom[] = INCBIN_U8("graphics/pokemon/aipom/footprint.1bpp"); + const u8 gMonFootprint_Aipom[] = INCBIN_U8("graphics/pokemon/gen_2/aipom/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_AipomF[] = INCBIN_U32("graphics/pokemon/aipom/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_AipomF[] = INCBIN_U32("graphics/pokemon/aipom/backf.4bpp.lz"); + const u32 gMonFrontPic_AipomF[] = INCBIN_U32("graphics/pokemon/gen_2/aipom/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_AipomF[] = INCBIN_U32("graphics/pokemon/gen_2/aipom/backf.4bpp.lz"); #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/anim_front.4bpp.lz"); - const u32 gMonPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/normal.gbapal.lz"); - const u32 gMonBackPic_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/back.4bpp.lz"); - const u32 gMonShinyPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/shiny.gbapal.lz"); - const u8 gMonIcon_Ambipom[] = INCBIN_U8("graphics/pokemon/ambipom/icon.4bpp"); + const u32 gMonFrontPic_Ambipom[] = INCBIN_U32("graphics/pokemon/gen_4/ambipom/anim_front.4bpp.lz"); + const u32 gMonPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/gen_4/ambipom/normal.gbapal.lz"); + const u32 gMonBackPic_Ambipom[] = INCBIN_U32("graphics/pokemon/gen_4/ambipom/back.4bpp.lz"); + const u32 gMonShinyPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/gen_4/ambipom/shiny.gbapal.lz"); + const u8 gMonIcon_Ambipom[] = INCBIN_U8("graphics/pokemon/gen_4/ambipom/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ambipom[] = INCBIN_U8("graphics/pokemon/ambipom/footprint.1bpp"); + const u8 gMonFootprint_Ambipom[] = INCBIN_U8("graphics/pokemon/gen_4/ambipom/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/ambipom/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/ambipom/backf.4bpp.lz"); + const u32 gMonFrontPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/gen_4/ambipom/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/gen_4/ambipom/backf.4bpp.lz"); #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_AIPOM #if P_FAMILY_SUNKERN - const u32 gMonFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/anim_front.4bpp.lz"); - const u32 gMonPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/normal.gbapal.lz"); - const u32 gMonBackPic_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/back.4bpp.lz"); - const u32 gMonShinyPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/shiny.gbapal.lz"); - const u8 gMonIcon_Sunkern[] = INCBIN_U8("graphics/pokemon/sunkern/icon.4bpp"); + const u32 gMonFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/gen_2/sunkern/anim_front.4bpp.lz"); + const u32 gMonPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/gen_2/sunkern/normal.gbapal.lz"); + const u32 gMonBackPic_Sunkern[] = INCBIN_U32("graphics/pokemon/gen_2/sunkern/back.4bpp.lz"); + const u32 gMonShinyPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/gen_2/sunkern/shiny.gbapal.lz"); + const u8 gMonIcon_Sunkern[] = INCBIN_U8("graphics/pokemon/gen_2/sunkern/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sunkern[] = INCBIN_U8("graphics/pokemon/sunkern/footprint.1bpp"); + const u8 gMonFootprint_Sunkern[] = INCBIN_U8("graphics/pokemon/gen_2/sunkern/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/anim_front.4bpp.lz"); - const u32 gMonPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/normal.gbapal.lz"); - const u32 gMonBackPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/back.4bpp.lz"); - const u32 gMonShinyPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/shiny.gbapal.lz"); - const u8 gMonIcon_Sunflora[] = INCBIN_U8("graphics/pokemon/sunflora/icon.4bpp"); + const u32 gMonFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/gen_2/sunflora/anim_front.4bpp.lz"); + const u32 gMonPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/gen_2/sunflora/normal.gbapal.lz"); + const u32 gMonBackPic_Sunflora[] = INCBIN_U32("graphics/pokemon/gen_2/sunflora/back.4bpp.lz"); + const u32 gMonShinyPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/gen_2/sunflora/shiny.gbapal.lz"); + const u8 gMonIcon_Sunflora[] = INCBIN_U8("graphics/pokemon/gen_2/sunflora/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sunflora[] = INCBIN_U8("graphics/pokemon/sunflora/footprint.1bpp"); + const u8 gMonFootprint_Sunflora[] = INCBIN_U8("graphics/pokemon/gen_2/sunflora/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SUNKERN #if P_FAMILY_YANMA - const u32 gMonFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/anim_front.4bpp.lz"); - const u32 gMonPalette_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/normal.gbapal.lz"); - const u32 gMonBackPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/back.4bpp.lz"); - const u32 gMonShinyPalette_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/shiny.gbapal.lz"); - const u8 gMonIcon_Yanma[] = INCBIN_U8("graphics/pokemon/yanma/icon.4bpp"); + const u32 gMonFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/gen_2/yanma/anim_front.4bpp.lz"); + const u32 gMonPalette_Yanma[] = INCBIN_U32("graphics/pokemon/gen_2/yanma/normal.gbapal.lz"); + const u32 gMonBackPic_Yanma[] = INCBIN_U32("graphics/pokemon/gen_2/yanma/back.4bpp.lz"); + const u32 gMonShinyPalette_Yanma[] = INCBIN_U32("graphics/pokemon/gen_2/yanma/shiny.gbapal.lz"); + const u8 gMonIcon_Yanma[] = INCBIN_U8("graphics/pokemon/gen_2/yanma/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Yanma[] = INCBIN_U8("graphics/pokemon/yanma/footprint.1bpp"); + const u8 gMonFootprint_Yanma[] = INCBIN_U8("graphics/pokemon/gen_2/yanma/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/anim_front.4bpp.lz"); - const u32 gMonPalette_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/normal.gbapal.lz"); - const u32 gMonBackPic_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/back.4bpp.lz"); - const u32 gMonShinyPalette_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/shiny.gbapal.lz"); - const u8 gMonIcon_Yanmega[] = INCBIN_U8("graphics/pokemon/yanmega/icon.4bpp"); + const u32 gMonFrontPic_Yanmega[] = INCBIN_U32("graphics/pokemon/gen_4/yanmega/anim_front.4bpp.lz"); + const u32 gMonPalette_Yanmega[] = INCBIN_U32("graphics/pokemon/gen_4/yanmega/normal.gbapal.lz"); + const u32 gMonBackPic_Yanmega[] = INCBIN_U32("graphics/pokemon/gen_4/yanmega/back.4bpp.lz"); + const u32 gMonShinyPalette_Yanmega[] = INCBIN_U32("graphics/pokemon/gen_4/yanmega/shiny.gbapal.lz"); + const u8 gMonIcon_Yanmega[] = INCBIN_U8("graphics/pokemon/gen_4/yanmega/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Yanmega[] = INCBIN_U8("graphics/pokemon/yanmega/footprint.1bpp"); + const u8 gMonFootprint_Yanmega[] = INCBIN_U8("graphics/pokemon/gen_4/yanmega/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_YANMA #if P_FAMILY_WOOPER - const u32 gMonFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/anim_front.4bpp.lz"); - const u32 gMonPalette_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/normal.gbapal.lz"); - const u32 gMonBackPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/back.4bpp.lz"); - const u32 gMonShinyPalette_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/shiny.gbapal.lz"); - const u8 gMonIcon_Wooper[] = INCBIN_U8("graphics/pokemon/wooper/icon.4bpp"); + const u32 gMonFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/anim_front.4bpp.lz"); + const u32 gMonPalette_Wooper[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/normal.gbapal.lz"); + const u32 gMonBackPic_Wooper[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/back.4bpp.lz"); + const u32 gMonShinyPalette_Wooper[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/shiny.gbapal.lz"); + const u8 gMonIcon_Wooper[] = INCBIN_U8("graphics/pokemon/gen_2/wooper/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Wooper[] = INCBIN_U8("graphics/pokemon/wooper/footprint.1bpp"); + const u8 gMonFootprint_Wooper[] = INCBIN_U8("graphics/pokemon/gen_2/wooper/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_WooperF[] = INCBIN_U32("graphics/pokemon/wooper/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_WooperF[] = INCBIN_U32("graphics/pokemon/wooper/backf.4bpp.lz"); + const u32 gMonFrontPic_WooperF[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_WooperF[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/backf.4bpp.lz"); - const u32 gMonFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/anim_front.4bpp.lz"); - const u32 gMonPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/normal.gbapal.lz"); - const u32 gMonBackPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/back.4bpp.lz"); - const u32 gMonShinyPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/shiny.gbapal.lz"); - const u8 gMonIcon_Quagsire[] = INCBIN_U8("graphics/pokemon/quagsire/icon.4bpp"); + const u32 gMonFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/gen_2/quagsire/anim_front.4bpp.lz"); + const u32 gMonPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/gen_2/quagsire/normal.gbapal.lz"); + const u32 gMonBackPic_Quagsire[] = INCBIN_U32("graphics/pokemon/gen_2/quagsire/back.4bpp.lz"); + const u32 gMonShinyPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/gen_2/quagsire/shiny.gbapal.lz"); + const u8 gMonIcon_Quagsire[] = INCBIN_U8("graphics/pokemon/gen_2/quagsire/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Quagsire[] = INCBIN_U8("graphics/pokemon/quagsire/footprint.1bpp"); + const u8 gMonFootprint_Quagsire[] = INCBIN_U8("graphics/pokemon/gen_2/quagsire/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/quagsire/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/quagsire/backf.4bpp.lz"); + const u32 gMonFrontPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/gen_2/quagsire/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/gen_2/quagsire/backf.4bpp.lz"); #if P_PALDEAN_FORMS - const u32 gMonFrontPic_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/front.4bpp.lz"); - const u32 gMonPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/normal.gbapal.lz"); - const u32 gMonBackPic_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/back.4bpp.lz"); - const u32 gMonShinyPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/shiny.gbapal.lz"); - // const u8 gMonIcon_WooperPaldean[] = INCBIN_U8("graphics/pokemon/wooper/wooper_paldean/icon.4bpp"); + const u32 gMonFrontPic_WooperPaldean[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/wooper_paldean/front.4bpp.lz"); + const u32 gMonPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/wooper_paldean/normal.gbapal.lz"); + const u32 gMonBackPic_WooperPaldean[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/wooper_paldean/back.4bpp.lz"); + const u32 gMonShinyPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/gen_2/wooper/wooper_paldean/shiny.gbapal.lz"); + // const u8 gMonIcon_WooperPaldean[] = INCBIN_U8("graphics/pokemon/gen_2/wooper/wooper_paldean/icon.4bpp"); - const u32 gMonFrontPic_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/front.4bpp.lz"); - const u32 gMonPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/normal.gbapal.lz"); - const u32 gMonBackPic_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/back.4bpp.lz"); - const u32 gMonShinyPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/shiny.gbapal.lz"); - const u8 gMonIcon_Clodsire[] = INCBIN_U8("graphics/pokemon/clodsire/icon.4bpp"); + const u32 gMonFrontPic_Clodsire[] = INCBIN_U32("graphics/pokemon/gen_9/clodsire/front.4bpp.lz"); + const u32 gMonPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/gen_9/clodsire/normal.gbapal.lz"); + const u32 gMonBackPic_Clodsire[] = INCBIN_U32("graphics/pokemon/gen_9/clodsire/back.4bpp.lz"); + const u32 gMonShinyPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/gen_9/clodsire/shiny.gbapal.lz"); + const u8 gMonIcon_Clodsire[] = INCBIN_U8("graphics/pokemon/gen_9/clodsire/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Clodsire[] = INCBIN_U8("graphics/pokemon/clodsire/footprint.1bpp"); + // const u8 gMonFootprint_Clodsire[] = INCBIN_U8("graphics/pokemon/gen_9/clodsire/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_PALDEAN_FORMS #endif //P_FAMILY_WOOPER #if P_FAMILY_MURKROW - const u32 gMonFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/anim_front.4bpp.lz"); - const u32 gMonPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/normal.gbapal.lz"); - const u32 gMonBackPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/back.4bpp.lz"); - const u32 gMonShinyPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/shiny.gbapal.lz"); - const u8 gMonIcon_Murkrow[] = INCBIN_U8("graphics/pokemon/murkrow/icon.4bpp"); + const u32 gMonFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/gen_2/murkrow/anim_front.4bpp.lz"); + const u32 gMonPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/gen_2/murkrow/normal.gbapal.lz"); + const u32 gMonBackPic_Murkrow[] = INCBIN_U32("graphics/pokemon/gen_2/murkrow/back.4bpp.lz"); + const u32 gMonShinyPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/gen_2/murkrow/shiny.gbapal.lz"); + const u8 gMonIcon_Murkrow[] = INCBIN_U8("graphics/pokemon/gen_2/murkrow/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Murkrow[] = INCBIN_U8("graphics/pokemon/murkrow/footprint.1bpp"); + const u8 gMonFootprint_Murkrow[] = INCBIN_U8("graphics/pokemon/gen_2/murkrow/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MurkrowF[] = INCBIN_U32("graphics/pokemon/murkrow/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_MurkrowF[] = INCBIN_U32("graphics/pokemon/murkrow/backf.4bpp.lz"); + const u32 gMonFrontPic_MurkrowF[] = INCBIN_U32("graphics/pokemon/gen_2/murkrow/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_MurkrowF[] = INCBIN_U32("graphics/pokemon/gen_2/murkrow/backf.4bpp.lz"); #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/anim_front.4bpp.lz"); - const u32 gMonPalette_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/normal.gbapal.lz"); - const u32 gMonBackPic_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/back.4bpp.lz"); - const u32 gMonShinyPalette_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/shiny.gbapal.lz"); - const u8 gMonIcon_Honchkrow[] = INCBIN_U8("graphics/pokemon/honchkrow/icon.4bpp"); + const u32 gMonFrontPic_Honchkrow[] = INCBIN_U32("graphics/pokemon/gen_4/honchkrow/anim_front.4bpp.lz"); + const u32 gMonPalette_Honchkrow[] = INCBIN_U32("graphics/pokemon/gen_4/honchkrow/normal.gbapal.lz"); + const u32 gMonBackPic_Honchkrow[] = INCBIN_U32("graphics/pokemon/gen_4/honchkrow/back.4bpp.lz"); + const u32 gMonShinyPalette_Honchkrow[] = INCBIN_U32("graphics/pokemon/gen_4/honchkrow/shiny.gbapal.lz"); + const u8 gMonIcon_Honchkrow[] = INCBIN_U8("graphics/pokemon/gen_4/honchkrow/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Honchkrow[] = INCBIN_U8("graphics/pokemon/honchkrow/footprint.1bpp"); + const u8 gMonFootprint_Honchkrow[] = INCBIN_U8("graphics/pokemon/gen_4/honchkrow/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MURKROW #if P_FAMILY_MISDREAVUS - const u32 gMonFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/anim_front.4bpp.lz"); - const u32 gMonPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/normal.gbapal.lz"); - const u32 gMonBackPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/back.4bpp.lz"); - const u32 gMonShinyPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/shiny.gbapal.lz"); - const u8 gMonIcon_Misdreavus[] = INCBIN_U8("graphics/pokemon/misdreavus/icon.4bpp"); + const u32 gMonFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/gen_2/misdreavus/anim_front.4bpp.lz"); + const u32 gMonPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/gen_2/misdreavus/normal.gbapal.lz"); + const u32 gMonBackPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/gen_2/misdreavus/back.4bpp.lz"); + const u32 gMonShinyPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/gen_2/misdreavus/shiny.gbapal.lz"); + const u8 gMonIcon_Misdreavus[] = INCBIN_U8("graphics/pokemon/gen_2/misdreavus/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Misdreavus[] = INCBIN_U8("graphics/pokemon/misdreavus/footprint.1bpp"); + const u8 gMonFootprint_Misdreavus[] = INCBIN_U8("graphics/pokemon/gen_2/misdreavus/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/anim_front.4bpp.lz"); - const u32 gMonPalette_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/normal.gbapal.lz"); - const u32 gMonBackPic_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/back.4bpp.lz"); - const u32 gMonShinyPalette_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/shiny.gbapal.lz"); - const u8 gMonIcon_Mismagius[] = INCBIN_U8("graphics/pokemon/mismagius/icon.4bpp"); + const u32 gMonFrontPic_Mismagius[] = INCBIN_U32("graphics/pokemon/gen_4/mismagius/anim_front.4bpp.lz"); + const u32 gMonPalette_Mismagius[] = INCBIN_U32("graphics/pokemon/gen_4/mismagius/normal.gbapal.lz"); + const u32 gMonBackPic_Mismagius[] = INCBIN_U32("graphics/pokemon/gen_4/mismagius/back.4bpp.lz"); + const u32 gMonShinyPalette_Mismagius[] = INCBIN_U32("graphics/pokemon/gen_4/mismagius/shiny.gbapal.lz"); + const u8 gMonIcon_Mismagius[] = INCBIN_U8("graphics/pokemon/gen_4/mismagius/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mismagius[] = INCBIN_U8("graphics/pokemon/mismagius/footprint.1bpp"); + const u8 gMonFootprint_Mismagius[] = INCBIN_U8("graphics/pokemon/gen_4/mismagius/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MISDREAVUS #if P_FAMILY_UNOWN - const u32 gMonPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/normal.gbapal.lz"); - const u32 gMonShinyPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/shiny.gbapal.lz"); + const u32 gMonPalette_Unown[] = INCBIN_U32("graphics/pokemon/gen_2/unown/normal.gbapal.lz"); + const u32 gMonShinyPalette_Unown[] = INCBIN_U32("graphics/pokemon/gen_2/unown/shiny.gbapal.lz"); #if P_FOOTPRINTS - const u8 gMonFootprint_Unown[] = INCBIN_U8("graphics/pokemon/unown/footprint.1bpp"); + const u8 gMonFootprint_Unown[] = INCBIN_U8("graphics/pokemon/gen_2/unown/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/back.4bpp.lz"); - const u8 gMonIcon_UnownA[] = INCBIN_U8("graphics/pokemon/unown/icon.4bpp"); + const u32 gMonFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/gen_2/unown/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownA[] = INCBIN_U32("graphics/pokemon/gen_2/unown/back.4bpp.lz"); + const u8 gMonIcon_UnownA[] = INCBIN_U8("graphics/pokemon/gen_2/unown/icon.4bpp"); - const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/b/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/b/back.4bpp.lz"); - const u8 gMonIcon_UnownB[] = INCBIN_U8("graphics/pokemon/unown/b/icon.4bpp"); + const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/gen_2/unown/b/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownB[] = INCBIN_U32("graphics/pokemon/gen_2/unown/b/back.4bpp.lz"); + const u8 gMonIcon_UnownB[] = INCBIN_U8("graphics/pokemon/gen_2/unown/b/icon.4bpp"); - const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/c/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/c/back.4bpp.lz"); - const u8 gMonIcon_UnownC[] = INCBIN_U8("graphics/pokemon/unown/c/icon.4bpp"); + const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/gen_2/unown/c/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownC[] = INCBIN_U32("graphics/pokemon/gen_2/unown/c/back.4bpp.lz"); + const u8 gMonIcon_UnownC[] = INCBIN_U8("graphics/pokemon/gen_2/unown/c/icon.4bpp"); - const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/d/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/d/back.4bpp.lz"); - const u8 gMonIcon_UnownD[] = INCBIN_U8("graphics/pokemon/unown/d/icon.4bpp"); + const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/gen_2/unown/d/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownD[] = INCBIN_U32("graphics/pokemon/gen_2/unown/d/back.4bpp.lz"); + const u8 gMonIcon_UnownD[] = INCBIN_U8("graphics/pokemon/gen_2/unown/d/icon.4bpp"); - const u32 gMonFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/e/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/e/back.4bpp.lz"); - const u8 gMonIcon_UnownE[] = INCBIN_U8("graphics/pokemon/unown/e/icon.4bpp"); + const u32 gMonFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/gen_2/unown/e/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownE[] = INCBIN_U32("graphics/pokemon/gen_2/unown/e/back.4bpp.lz"); + const u8 gMonIcon_UnownE[] = INCBIN_U8("graphics/pokemon/gen_2/unown/e/icon.4bpp"); - const u32 gMonFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/f/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/f/back.4bpp.lz"); - const u8 gMonIcon_UnownF[] = INCBIN_U8("graphics/pokemon/unown/f/icon.4bpp"); + const u32 gMonFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/gen_2/unown/f/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownF[] = INCBIN_U32("graphics/pokemon/gen_2/unown/f/back.4bpp.lz"); + const u8 gMonIcon_UnownF[] = INCBIN_U8("graphics/pokemon/gen_2/unown/f/icon.4bpp"); - const u32 gMonFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/g/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/g/back.4bpp.lz"); - const u8 gMonIcon_UnownG[] = INCBIN_U8("graphics/pokemon/unown/g/icon.4bpp"); + const u32 gMonFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/gen_2/unown/g/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownG[] = INCBIN_U32("graphics/pokemon/gen_2/unown/g/back.4bpp.lz"); + const u8 gMonIcon_UnownG[] = INCBIN_U8("graphics/pokemon/gen_2/unown/g/icon.4bpp"); - const u32 gMonFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/h/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/h/back.4bpp.lz"); - const u8 gMonIcon_UnownH[] = INCBIN_U8("graphics/pokemon/unown/h/icon.4bpp"); + const u32 gMonFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/gen_2/unown/h/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownH[] = INCBIN_U32("graphics/pokemon/gen_2/unown/h/back.4bpp.lz"); + const u8 gMonIcon_UnownH[] = INCBIN_U8("graphics/pokemon/gen_2/unown/h/icon.4bpp"); - const u32 gMonFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/i/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/i/back.4bpp.lz"); - const u8 gMonIcon_UnownI[] = INCBIN_U8("graphics/pokemon/unown/i/icon.4bpp"); + const u32 gMonFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/gen_2/unown/i/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownI[] = INCBIN_U32("graphics/pokemon/gen_2/unown/i/back.4bpp.lz"); + const u8 gMonIcon_UnownI[] = INCBIN_U8("graphics/pokemon/gen_2/unown/i/icon.4bpp"); - const u32 gMonFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/j/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/j/back.4bpp.lz"); - const u8 gMonIcon_UnownJ[] = INCBIN_U8("graphics/pokemon/unown/j/icon.4bpp"); + const u32 gMonFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/gen_2/unown/j/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownJ[] = INCBIN_U32("graphics/pokemon/gen_2/unown/j/back.4bpp.lz"); + const u8 gMonIcon_UnownJ[] = INCBIN_U8("graphics/pokemon/gen_2/unown/j/icon.4bpp"); - const u32 gMonFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/k/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/k/back.4bpp.lz"); - const u8 gMonIcon_UnownK[] = INCBIN_U8("graphics/pokemon/unown/k/icon.4bpp"); + const u32 gMonFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/gen_2/unown/k/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownK[] = INCBIN_U32("graphics/pokemon/gen_2/unown/k/back.4bpp.lz"); + const u8 gMonIcon_UnownK[] = INCBIN_U8("graphics/pokemon/gen_2/unown/k/icon.4bpp"); - const u32 gMonFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/l/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/l/back.4bpp.lz"); - const u8 gMonIcon_UnownL[] = INCBIN_U8("graphics/pokemon/unown/l/icon.4bpp"); + const u32 gMonFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/gen_2/unown/l/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownL[] = INCBIN_U32("graphics/pokemon/gen_2/unown/l/back.4bpp.lz"); + const u8 gMonIcon_UnownL[] = INCBIN_U8("graphics/pokemon/gen_2/unown/l/icon.4bpp"); - const u32 gMonFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/m/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/m/back.4bpp.lz"); - const u8 gMonIcon_UnownM[] = INCBIN_U8("graphics/pokemon/unown/m/icon.4bpp"); + const u32 gMonFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/gen_2/unown/m/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownM[] = INCBIN_U32("graphics/pokemon/gen_2/unown/m/back.4bpp.lz"); + const u8 gMonIcon_UnownM[] = INCBIN_U8("graphics/pokemon/gen_2/unown/m/icon.4bpp"); - const u32 gMonFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/n/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/n/back.4bpp.lz"); - const u8 gMonIcon_UnownN[] = INCBIN_U8("graphics/pokemon/unown/n/icon.4bpp"); + const u32 gMonFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/gen_2/unown/n/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownN[] = INCBIN_U32("graphics/pokemon/gen_2/unown/n/back.4bpp.lz"); + const u8 gMonIcon_UnownN[] = INCBIN_U8("graphics/pokemon/gen_2/unown/n/icon.4bpp"); - const u32 gMonFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/o/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/o/back.4bpp.lz"); - const u8 gMonIcon_UnownO[] = INCBIN_U8("graphics/pokemon/unown/o/icon.4bpp"); + const u32 gMonFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/gen_2/unown/o/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownO[] = INCBIN_U32("graphics/pokemon/gen_2/unown/o/back.4bpp.lz"); + const u8 gMonIcon_UnownO[] = INCBIN_U8("graphics/pokemon/gen_2/unown/o/icon.4bpp"); - const u32 gMonFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/p/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/p/back.4bpp.lz"); - const u8 gMonIcon_UnownP[] = INCBIN_U8("graphics/pokemon/unown/p/icon.4bpp"); + const u32 gMonFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/gen_2/unown/p/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownP[] = INCBIN_U32("graphics/pokemon/gen_2/unown/p/back.4bpp.lz"); + const u8 gMonIcon_UnownP[] = INCBIN_U8("graphics/pokemon/gen_2/unown/p/icon.4bpp"); - const u32 gMonFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/q/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/q/back.4bpp.lz"); - const u8 gMonIcon_UnownQ[] = INCBIN_U8("graphics/pokemon/unown/q/icon.4bpp"); + const u32 gMonFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/gen_2/unown/q/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownQ[] = INCBIN_U32("graphics/pokemon/gen_2/unown/q/back.4bpp.lz"); + const u8 gMonIcon_UnownQ[] = INCBIN_U8("graphics/pokemon/gen_2/unown/q/icon.4bpp"); - const u32 gMonFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/r/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/r/back.4bpp.lz"); - const u8 gMonIcon_UnownR[] = INCBIN_U8("graphics/pokemon/unown/r/icon.4bpp"); + const u32 gMonFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/gen_2/unown/r/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownR[] = INCBIN_U32("graphics/pokemon/gen_2/unown/r/back.4bpp.lz"); + const u8 gMonIcon_UnownR[] = INCBIN_U8("graphics/pokemon/gen_2/unown/r/icon.4bpp"); - const u32 gMonFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/s/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/s/back.4bpp.lz"); - const u8 gMonIcon_UnownS[] = INCBIN_U8("graphics/pokemon/unown/s/icon.4bpp"); + const u32 gMonFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/gen_2/unown/s/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownS[] = INCBIN_U32("graphics/pokemon/gen_2/unown/s/back.4bpp.lz"); + const u8 gMonIcon_UnownS[] = INCBIN_U8("graphics/pokemon/gen_2/unown/s/icon.4bpp"); - const u32 gMonFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/t/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/t/back.4bpp.lz"); - const u8 gMonIcon_UnownT[] = INCBIN_U8("graphics/pokemon/unown/t/icon.4bpp"); + const u32 gMonFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/gen_2/unown/t/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownT[] = INCBIN_U32("graphics/pokemon/gen_2/unown/t/back.4bpp.lz"); + const u8 gMonIcon_UnownT[] = INCBIN_U8("graphics/pokemon/gen_2/unown/t/icon.4bpp"); - const u32 gMonFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/u/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/u/back.4bpp.lz"); - const u8 gMonIcon_UnownU[] = INCBIN_U8("graphics/pokemon/unown/u/icon.4bpp"); + const u32 gMonFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/gen_2/unown/u/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownU[] = INCBIN_U32("graphics/pokemon/gen_2/unown/u/back.4bpp.lz"); + const u8 gMonIcon_UnownU[] = INCBIN_U8("graphics/pokemon/gen_2/unown/u/icon.4bpp"); - const u32 gMonFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/v/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/v/back.4bpp.lz"); - const u8 gMonIcon_UnownV[] = INCBIN_U8("graphics/pokemon/unown/v/icon.4bpp"); + const u32 gMonFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/gen_2/unown/v/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownV[] = INCBIN_U32("graphics/pokemon/gen_2/unown/v/back.4bpp.lz"); + const u8 gMonIcon_UnownV[] = INCBIN_U8("graphics/pokemon/gen_2/unown/v/icon.4bpp"); - const u32 gMonFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/w/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/w/back.4bpp.lz"); - const u8 gMonIcon_UnownW[] = INCBIN_U8("graphics/pokemon/unown/w/icon.4bpp"); + const u32 gMonFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/gen_2/unown/w/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownW[] = INCBIN_U32("graphics/pokemon/gen_2/unown/w/back.4bpp.lz"); + const u8 gMonIcon_UnownW[] = INCBIN_U8("graphics/pokemon/gen_2/unown/w/icon.4bpp"); - const u32 gMonFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/x/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/x/back.4bpp.lz"); - const u8 gMonIcon_UnownX[] = INCBIN_U8("graphics/pokemon/unown/x/icon.4bpp"); + const u32 gMonFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/gen_2/unown/x/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownX[] = INCBIN_U32("graphics/pokemon/gen_2/unown/x/back.4bpp.lz"); + const u8 gMonIcon_UnownX[] = INCBIN_U8("graphics/pokemon/gen_2/unown/x/icon.4bpp"); - const u32 gMonFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/y/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/y/back.4bpp.lz"); - const u8 gMonIcon_UnownY[] = INCBIN_U8("graphics/pokemon/unown/y/icon.4bpp"); + const u32 gMonFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/gen_2/unown/y/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownY[] = INCBIN_U32("graphics/pokemon/gen_2/unown/y/back.4bpp.lz"); + const u8 gMonIcon_UnownY[] = INCBIN_U8("graphics/pokemon/gen_2/unown/y/icon.4bpp"); - const u32 gMonFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/z/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/z/back.4bpp.lz"); - const u8 gMonIcon_UnownZ[] = INCBIN_U8("graphics/pokemon/unown/z/icon.4bpp"); + const u32 gMonFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/gen_2/unown/z/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownZ[] = INCBIN_U32("graphics/pokemon/gen_2/unown/z/back.4bpp.lz"); + const u8 gMonIcon_UnownZ[] = INCBIN_U8("graphics/pokemon/gen_2/unown/z/icon.4bpp"); - const u32 gMonFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/exclamation_mark/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/exclamation_mark/back.4bpp.lz"); - const u8 gMonIcon_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/unown/exclamation_mark/icon.4bpp"); + const u32 gMonFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/gen_2/unown/exclamation_mark/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/gen_2/unown/exclamation_mark/back.4bpp.lz"); + const u8 gMonIcon_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/gen_2/unown/exclamation_mark/icon.4bpp"); - const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/question_mark/anim_front.4bpp.lz"); - const u32 gMonBackPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/question_mark/back.4bpp.lz"); - const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/question_mark/icon.4bpp"); + const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/gen_2/unown/question_mark/anim_front.4bpp.lz"); + const u32 gMonBackPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/gen_2/unown/question_mark/back.4bpp.lz"); + const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/gen_2/unown/question_mark/icon.4bpp"); #endif //P_FAMILY_UNOWN #if P_FAMILY_WOBBUFFET #if P_GEN_3_CROSS_EVOS - const u32 gMonFrontPic_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/anim_front.4bpp.lz"); - const u32 gMonPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/normal.gbapal.lz"); - const u32 gMonBackPic_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/back.4bpp.lz"); - const u32 gMonShinyPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/shiny.gbapal.lz"); - const u8 gMonIcon_Wynaut[] = INCBIN_U8("graphics/pokemon/wynaut/icon.4bpp"); + const u32 gMonFrontPic_Wynaut[] = INCBIN_U32("graphics/pokemon/gen_3/wynaut/anim_front.4bpp.lz"); + const u32 gMonPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/gen_3/wynaut/normal.gbapal.lz"); + const u32 gMonBackPic_Wynaut[] = INCBIN_U32("graphics/pokemon/gen_3/wynaut/back.4bpp.lz"); + const u32 gMonShinyPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/gen_3/wynaut/shiny.gbapal.lz"); + const u8 gMonIcon_Wynaut[] = INCBIN_U8("graphics/pokemon/gen_3/wynaut/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Wynaut[] = INCBIN_U8("graphics/pokemon/wynaut/footprint.1bpp"); + const u8 gMonFootprint_Wynaut[] = INCBIN_U8("graphics/pokemon/gen_3/wynaut/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_3_CROSS_EVOS - const u32 gMonFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/anim_front.4bpp.lz"); - const u32 gMonPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/normal.gbapal.lz"); - const u32 gMonBackPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/back.4bpp.lz"); - const u32 gMonShinyPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/shiny.gbapal.lz"); - const u8 gMonIcon_Wobbuffet[] = INCBIN_U8("graphics/pokemon/wobbuffet/icon.4bpp"); + const u32 gMonFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/gen_2/wobbuffet/anim_front.4bpp.lz"); + const u32 gMonPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/gen_2/wobbuffet/normal.gbapal.lz"); + const u32 gMonBackPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/gen_2/wobbuffet/back.4bpp.lz"); + const u32 gMonShinyPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/gen_2/wobbuffet/shiny.gbapal.lz"); + const u8 gMonIcon_Wobbuffet[] = INCBIN_U8("graphics/pokemon/gen_2/wobbuffet/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Wobbuffet[] = INCBIN_U8("graphics/pokemon/wobbuffet/footprint.1bpp"); + const u8 gMonFootprint_Wobbuffet[] = INCBIN_U8("graphics/pokemon/gen_2/wobbuffet/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_WobbuffetF[] = INCBIN_U32("graphics/pokemon/wobbuffet/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_WobbuffetF[] = INCBIN_U32("graphics/pokemon/wobbuffet/backf.4bpp.lz"); + const u32 gMonFrontPic_WobbuffetF[] = INCBIN_U32("graphics/pokemon/gen_2/wobbuffet/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_WobbuffetF[] = INCBIN_U32("graphics/pokemon/gen_2/wobbuffet/backf.4bpp.lz"); #if P_CUSTOM_GENDER_DIFF_ICONS - const u8 gMonIcon_WobbuffetF[] = INCBIN_U8("graphics/pokemon/wobbuffet/iconf.4bpp"); + const u8 gMonIcon_WobbuffetF[] = INCBIN_U8("graphics/pokemon/gen_2/wobbuffet/iconf.4bpp"); #endif #endif //P_FAMILY_WOBBUFFET #if P_FAMILY_GIRAFARIG - const u32 gMonFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/anim_front.4bpp.lz"); - const u32 gMonPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/normal.gbapal.lz"); - const u32 gMonBackPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/back.4bpp.lz"); - const u32 gMonShinyPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/shiny.gbapal.lz"); - const u8 gMonIcon_Girafarig[] = INCBIN_U8("graphics/pokemon/girafarig/icon.4bpp"); + const u32 gMonFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/gen_2/girafarig/anim_front.4bpp.lz"); + const u32 gMonPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/gen_2/girafarig/normal.gbapal.lz"); + const u32 gMonBackPic_Girafarig[] = INCBIN_U32("graphics/pokemon/gen_2/girafarig/back.4bpp.lz"); + const u32 gMonShinyPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/gen_2/girafarig/shiny.gbapal.lz"); + const u8 gMonIcon_Girafarig[] = INCBIN_U8("graphics/pokemon/gen_2/girafarig/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Girafarig[] = INCBIN_U8("graphics/pokemon/girafarig/footprint.1bpp"); + const u8 gMonFootprint_Girafarig[] = INCBIN_U8("graphics/pokemon/gen_2/girafarig/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GirafarigF[] = INCBIN_U32("graphics/pokemon/girafarig/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_GirafarigF[] = INCBIN_U32("graphics/pokemon/girafarig/backf.4bpp.lz"); + const u32 gMonFrontPic_GirafarigF[] = INCBIN_U32("graphics/pokemon/gen_2/girafarig/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_GirafarigF[] = INCBIN_U32("graphics/pokemon/gen_2/girafarig/backf.4bpp.lz"); #if P_GEN_9_CROSS_EVOS - const u32 gMonFrontPic_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/front.4bpp.lz"); - const u32 gMonPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/normal.gbapal.lz"); - const u32 gMonBackPic_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/back.4bpp.lz"); - const u32 gMonShinyPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/shiny.gbapal.lz"); - const u8 gMonIcon_Farigiraf[] = INCBIN_U8("graphics/pokemon/farigiraf/icon.4bpp"); + const u32 gMonFrontPic_Farigiraf[] = INCBIN_U32("graphics/pokemon/gen_9/farigiraf/front.4bpp.lz"); + const u32 gMonPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/gen_9/farigiraf/normal.gbapal.lz"); + const u32 gMonBackPic_Farigiraf[] = INCBIN_U32("graphics/pokemon/gen_9/farigiraf/back.4bpp.lz"); + const u32 gMonShinyPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/gen_9/farigiraf/shiny.gbapal.lz"); + const u8 gMonIcon_Farigiraf[] = INCBIN_U8("graphics/pokemon/gen_9/farigiraf/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Farigiraf[] = INCBIN_U8("graphics/pokemon/farigiraf/footprint.1bpp"); + // const u8 gMonFootprint_Farigiraf[] = INCBIN_U8("graphics/pokemon/gen_9/farigiraf/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_GIRAFARIG #if P_FAMILY_PINECO - const u32 gMonFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/anim_front.4bpp.lz"); - const u32 gMonPalette_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/normal.gbapal.lz"); - const u32 gMonBackPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/back.4bpp.lz"); - const u32 gMonShinyPalette_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/shiny.gbapal.lz"); - const u8 gMonIcon_Pineco[] = INCBIN_U8("graphics/pokemon/pineco/icon.4bpp"); + const u32 gMonFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/gen_2/pineco/anim_front.4bpp.lz"); + const u32 gMonPalette_Pineco[] = INCBIN_U32("graphics/pokemon/gen_2/pineco/normal.gbapal.lz"); + const u32 gMonBackPic_Pineco[] = INCBIN_U32("graphics/pokemon/gen_2/pineco/back.4bpp.lz"); + const u32 gMonShinyPalette_Pineco[] = INCBIN_U32("graphics/pokemon/gen_2/pineco/shiny.gbapal.lz"); + const u8 gMonIcon_Pineco[] = INCBIN_U8("graphics/pokemon/gen_2/pineco/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pineco[] = INCBIN_U8("graphics/pokemon/pineco/footprint.1bpp"); + const u8 gMonFootprint_Pineco[] = INCBIN_U8("graphics/pokemon/gen_2/pineco/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/anim_front.4bpp.lz"); - const u32 gMonPalette_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/normal.gbapal.lz"); - const u32 gMonBackPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/back.4bpp.lz"); - const u32 gMonShinyPalette_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/shiny.gbapal.lz"); - const u8 gMonIcon_Forretress[] = INCBIN_U8("graphics/pokemon/forretress/icon.4bpp"); + const u32 gMonFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/gen_2/forretress/anim_front.4bpp.lz"); + const u32 gMonPalette_Forretress[] = INCBIN_U32("graphics/pokemon/gen_2/forretress/normal.gbapal.lz"); + const u32 gMonBackPic_Forretress[] = INCBIN_U32("graphics/pokemon/gen_2/forretress/back.4bpp.lz"); + const u32 gMonShinyPalette_Forretress[] = INCBIN_U32("graphics/pokemon/gen_2/forretress/shiny.gbapal.lz"); + const u8 gMonIcon_Forretress[] = INCBIN_U8("graphics/pokemon/gen_2/forretress/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Forretress[] = INCBIN_U8("graphics/pokemon/forretress/footprint.1bpp"); + const u8 gMonFootprint_Forretress[] = INCBIN_U8("graphics/pokemon/gen_2/forretress/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PINECO #if P_FAMILY_DUNSPARCE - const u32 gMonFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/anim_front.4bpp.lz"); - const u32 gMonPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/normal.gbapal.lz"); - const u32 gMonBackPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/back.4bpp.lz"); - const u32 gMonShinyPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/shiny.gbapal.lz"); - const u8 gMonIcon_Dunsparce[] = INCBIN_U8("graphics/pokemon/dunsparce/icon.4bpp"); + const u32 gMonFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/gen_2/dunsparce/anim_front.4bpp.lz"); + const u32 gMonPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/gen_2/dunsparce/normal.gbapal.lz"); + const u32 gMonBackPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/gen_2/dunsparce/back.4bpp.lz"); + const u32 gMonShinyPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/gen_2/dunsparce/shiny.gbapal.lz"); + const u8 gMonIcon_Dunsparce[] = INCBIN_U8("graphics/pokemon/gen_2/dunsparce/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dunsparce[] = INCBIN_U8("graphics/pokemon/dunsparce/footprint.1bpp"); + const u8 gMonFootprint_Dunsparce[] = INCBIN_U8("graphics/pokemon/gen_2/dunsparce/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_9_CROSS_EVOS - const u32 gMonPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/normal.gbapal.lz"); - const u32 gMonShinyPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/shiny.gbapal.lz"); - const u8 gMonIcon_Dudunsparce[] = INCBIN_U8("graphics/pokemon/dudunsparce/icon.4bpp"); + const u32 gMonPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/gen_9/dudunsparce/normal.gbapal.lz"); + const u32 gMonShinyPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/gen_9/dudunsparce/shiny.gbapal.lz"); + const u8 gMonIcon_Dudunsparce[] = INCBIN_U8("graphics/pokemon/gen_9/dudunsparce/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Dudunsparce[] = INCBIN_U8("graphics/pokemon/dudunsparce/footprint.1bpp"); + // const u8 gMonFootprint_Dudunsparce[] = INCBIN_U8("graphics/pokemon/gen_9/dudunsparce/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_DudunsparceTwoSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/front.4bpp.lz"); - const u32 gMonBackPic_DudunsparceTwoSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/back.4bpp.lz"); + const u32 gMonFrontPic_DudunsparceTwoSegment[] = INCBIN_U32("graphics/pokemon/gen_9/dudunsparce/front.4bpp.lz"); + const u32 gMonBackPic_DudunsparceTwoSegment[] = INCBIN_U32("graphics/pokemon/gen_9/dudunsparce/back.4bpp.lz"); - const u32 gMonFrontPic_DudunsparceThreeSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/three_segment/front.4bpp.lz"); - const u32 gMonBackPic_DudunsparceThreeSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/three_segment/back.4bpp.lz"); + const u32 gMonFrontPic_DudunsparceThreeSegment[] = INCBIN_U32("graphics/pokemon/gen_9/dudunsparce/three_segment/front.4bpp.lz"); + const u32 gMonBackPic_DudunsparceThreeSegment[] = INCBIN_U32("graphics/pokemon/gen_9/dudunsparce/three_segment/back.4bpp.lz"); #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DUNSPARCE #if P_FAMILY_GLIGAR - const u32 gMonFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/anim_front.4bpp.lz"); - const u32 gMonPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/normal.gbapal.lz"); - const u32 gMonBackPic_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/back.4bpp.lz"); - const u32 gMonShinyPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/shiny.gbapal.lz"); - const u8 gMonIcon_Gligar[] = INCBIN_U8("graphics/pokemon/gligar/icon.4bpp"); + const u32 gMonFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/gen_2/gligar/anim_front.4bpp.lz"); + const u32 gMonPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gen_2/gligar/normal.gbapal.lz"); + const u32 gMonBackPic_Gligar[] = INCBIN_U32("graphics/pokemon/gen_2/gligar/back.4bpp.lz"); + const u32 gMonShinyPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gen_2/gligar/shiny.gbapal.lz"); + const u8 gMonIcon_Gligar[] = INCBIN_U8("graphics/pokemon/gen_2/gligar/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gligar[] = INCBIN_U8("graphics/pokemon/gligar/footprint.1bpp"); + const u8 gMonFootprint_Gligar[] = INCBIN_U8("graphics/pokemon/gen_2/gligar/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GligarF[] = INCBIN_U32("graphics/pokemon/gligar/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_GligarF[] = INCBIN_U32("graphics/pokemon/gligar/backf.4bpp.lz"); + const u32 gMonFrontPic_GligarF[] = INCBIN_U32("graphics/pokemon/gen_2/gligar/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_GligarF[] = INCBIN_U32("graphics/pokemon/gen_2/gligar/backf.4bpp.lz"); #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/anim_front.4bpp.lz"); - const u32 gMonPalette_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/normal.gbapal.lz"); - const u32 gMonBackPic_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/back.4bpp.lz"); - const u32 gMonShinyPalette_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/shiny.gbapal.lz"); - const u8 gMonIcon_Gliscor[] = INCBIN_U8("graphics/pokemon/gliscor/icon.4bpp"); + const u32 gMonFrontPic_Gliscor[] = INCBIN_U32("graphics/pokemon/gen_4/gliscor/anim_front.4bpp.lz"); + const u32 gMonPalette_Gliscor[] = INCBIN_U32("graphics/pokemon/gen_4/gliscor/normal.gbapal.lz"); + const u32 gMonBackPic_Gliscor[] = INCBIN_U32("graphics/pokemon/gen_4/gliscor/back.4bpp.lz"); + const u32 gMonShinyPalette_Gliscor[] = INCBIN_U32("graphics/pokemon/gen_4/gliscor/shiny.gbapal.lz"); + const u8 gMonIcon_Gliscor[] = INCBIN_U8("graphics/pokemon/gen_4/gliscor/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gliscor[] = INCBIN_U8("graphics/pokemon/gliscor/footprint.1bpp"); + const u8 gMonFootprint_Gliscor[] = INCBIN_U8("graphics/pokemon/gen_4/gliscor/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_GLIGAR #if P_FAMILY_SNUBBULL - const u32 gMonFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/anim_front.4bpp.lz"); - const u32 gMonPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/normal.gbapal.lz"); - const u32 gMonBackPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/back.4bpp.lz"); - const u32 gMonShinyPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/shiny.gbapal.lz"); - const u8 gMonIcon_Snubbull[] = INCBIN_U8("graphics/pokemon/snubbull/icon.4bpp"); + const u32 gMonFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/gen_2/snubbull/anim_front.4bpp.lz"); + const u32 gMonPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/gen_2/snubbull/normal.gbapal.lz"); + const u32 gMonBackPic_Snubbull[] = INCBIN_U32("graphics/pokemon/gen_2/snubbull/back.4bpp.lz"); + const u32 gMonShinyPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/gen_2/snubbull/shiny.gbapal.lz"); + const u8 gMonIcon_Snubbull[] = INCBIN_U8("graphics/pokemon/gen_2/snubbull/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Snubbull[] = INCBIN_U8("graphics/pokemon/snubbull/footprint.1bpp"); + const u8 gMonFootprint_Snubbull[] = INCBIN_U8("graphics/pokemon/gen_2/snubbull/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/anim_front.4bpp.lz"); - const u32 gMonPalette_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/normal.gbapal.lz"); - const u32 gMonBackPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/back.4bpp.lz"); - const u32 gMonShinyPalette_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/shiny.gbapal.lz"); - const u8 gMonIcon_Granbull[] = INCBIN_U8("graphics/pokemon/granbull/icon.4bpp"); + const u32 gMonFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/gen_2/granbull/anim_front.4bpp.lz"); + const u32 gMonPalette_Granbull[] = INCBIN_U32("graphics/pokemon/gen_2/granbull/normal.gbapal.lz"); + const u32 gMonBackPic_Granbull[] = INCBIN_U32("graphics/pokemon/gen_2/granbull/back.4bpp.lz"); + const u32 gMonShinyPalette_Granbull[] = INCBIN_U32("graphics/pokemon/gen_2/granbull/shiny.gbapal.lz"); + const u8 gMonIcon_Granbull[] = INCBIN_U8("graphics/pokemon/gen_2/granbull/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Granbull[] = INCBIN_U8("graphics/pokemon/granbull/footprint.1bpp"); + const u8 gMonFootprint_Granbull[] = INCBIN_U8("graphics/pokemon/gen_2/granbull/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SNUBBULL #if P_FAMILY_QWILFISH - const u32 gMonFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/anim_front.4bpp.lz"); - const u32 gMonPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/normal.gbapal.lz"); - const u32 gMonBackPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/back.4bpp.lz"); - const u32 gMonShinyPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/shiny.gbapal.lz"); - const u8 gMonIcon_Qwilfish[] = INCBIN_U8("graphics/pokemon/qwilfish/icon.4bpp"); + const u32 gMonFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/anim_front.4bpp.lz"); + const u32 gMonPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/normal.gbapal.lz"); + const u32 gMonBackPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/back.4bpp.lz"); + const u32 gMonShinyPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/shiny.gbapal.lz"); + const u8 gMonIcon_Qwilfish[] = INCBIN_U8("graphics/pokemon/gen_2/qwilfish/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Qwilfish[] = INCBIN_U8("graphics/pokemon/qwilfish/footprint.1bpp"); + const u8 gMonFootprint_Qwilfish[] = INCBIN_U8("graphics/pokemon/gen_2/qwilfish/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/front.4bpp.lz"); - const u32 gMonPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_QwilfishHisuian[] = INCBIN_U8("graphics/pokemon/qwilfish/hisuian/icon.4bpp"); + const u32 gMonFrontPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/hisuian/front.4bpp.lz"); + const u32 gMonPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/qwilfish/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_QwilfishHisuian[] = INCBIN_U8("graphics/pokemon/gen_2/qwilfish/hisuian/icon.4bpp"); - const u32 gMonFrontPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/front.4bpp.lz"); - const u32 gMonPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/normal.gbapal.lz"); - const u32 gMonBackPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/back.4bpp.lz"); - const u32 gMonShinyPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/shiny.gbapal.lz"); - const u8 gMonIcon_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/icon.4bpp"); + const u32 gMonFrontPic_Overqwil[] = INCBIN_U32("graphics/pokemon/gen_8/overqwil/front.4bpp.lz"); + const u32 gMonPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/gen_8/overqwil/normal.gbapal.lz"); + const u32 gMonBackPic_Overqwil[] = INCBIN_U32("graphics/pokemon/gen_8/overqwil/back.4bpp.lz"); + const u32 gMonShinyPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/gen_8/overqwil/shiny.gbapal.lz"); + const u8 gMonIcon_Overqwil[] = INCBIN_U8("graphics/pokemon/gen_8/overqwil/icon.4bpp"); #if P_FOOTPRINTS - //const u8 gMonFootprint_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/footprint.1bpp"); + //const u8 gMonFootprint_Overqwil[] = INCBIN_U8("graphics/pokemon/gen_8/overqwil/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_QWILFISH #if P_FAMILY_SHUCKLE - const u32 gMonFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/anim_front.4bpp.lz"); - const u32 gMonPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/normal.gbapal.lz"); - const u32 gMonBackPic_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/back.4bpp.lz"); - const u32 gMonShinyPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/shiny.gbapal.lz"); - const u8 gMonIcon_Shuckle[] = INCBIN_U8("graphics/pokemon/shuckle/icon.4bpp"); + const u32 gMonFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/gen_2/shuckle/anim_front.4bpp.lz"); + const u32 gMonPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/gen_2/shuckle/normal.gbapal.lz"); + const u32 gMonBackPic_Shuckle[] = INCBIN_U32("graphics/pokemon/gen_2/shuckle/back.4bpp.lz"); + const u32 gMonShinyPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/gen_2/shuckle/shiny.gbapal.lz"); + const u8 gMonIcon_Shuckle[] = INCBIN_U8("graphics/pokemon/gen_2/shuckle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Shuckle[] = INCBIN_U8("graphics/pokemon/shuckle/footprint.1bpp"); + const u8 gMonFootprint_Shuckle[] = INCBIN_U8("graphics/pokemon/gen_2/shuckle/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SHUCKLE #if P_FAMILY_HERACROSS - const u32 gMonFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/anim_front.4bpp.lz"); - const u32 gMonPalette_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/normal.gbapal.lz"); - const u32 gMonBackPic_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/back.4bpp.lz"); - const u32 gMonShinyPalette_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/shiny.gbapal.lz"); - const u8 gMonIcon_Heracross[] = INCBIN_U8("graphics/pokemon/heracross/icon.4bpp"); + const u32 gMonFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/anim_front.4bpp.lz"); + const u32 gMonPalette_Heracross[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/normal.gbapal.lz"); + const u32 gMonBackPic_Heracross[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/back.4bpp.lz"); + const u32 gMonShinyPalette_Heracross[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/shiny.gbapal.lz"); + const u8 gMonIcon_Heracross[] = INCBIN_U8("graphics/pokemon/gen_2/heracross/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Heracross[] = INCBIN_U8("graphics/pokemon/heracross/footprint.1bpp"); + const u8 gMonFootprint_Heracross[] = INCBIN_U8("graphics/pokemon/gen_2/heracross/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_HeracrossF[] = INCBIN_U32("graphics/pokemon/heracross/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_HeracrossF[] = INCBIN_U32("graphics/pokemon/heracross/backf.4bpp.lz"); + const u32 gMonFrontPic_HeracrossF[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_HeracrossF[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/backf.4bpp.lz"); #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/front.4bpp.lz"); - const u32 gMonPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/normal.gbapal.lz"); - const u32 gMonBackPic_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/shiny.gbapal.lz"); - const u8 gMonIcon_HeracrossMega[] = INCBIN_U8("graphics/pokemon/heracross/mega/icon.4bpp"); + const u32 gMonFrontPic_HeracrossMega[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/mega/front.4bpp.lz"); + const u32 gMonPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/mega/normal.gbapal.lz"); + const u32 gMonBackPic_HeracrossMega[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/gen_2/heracross/mega/shiny.gbapal.lz"); + const u8 gMonIcon_HeracrossMega[] = INCBIN_U8("graphics/pokemon/gen_2/heracross/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_HERACROSS #if P_FAMILY_SNEASEL - const u32 gMonFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/anim_front.4bpp.lz"); - const u32 gMonPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/normal.gbapal.lz"); - const u32 gMonBackPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/back.4bpp.lz"); - const u32 gMonShinyPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/shiny.gbapal.lz"); - const u8 gMonIcon_Sneasel[] = INCBIN_U8("graphics/pokemon/sneasel/icon.4bpp"); + const u32 gMonFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/anim_front.4bpp.lz"); + const u32 gMonPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/normal.gbapal.lz"); + const u32 gMonBackPic_Sneasel[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/back.4bpp.lz"); + const u32 gMonShinyPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/shiny.gbapal.lz"); + const u8 gMonIcon_Sneasel[] = INCBIN_U8("graphics/pokemon/gen_2/sneasel/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sneasel[] = INCBIN_U8("graphics/pokemon/sneasel/footprint.1bpp"); + const u8 gMonFootprint_Sneasel[] = INCBIN_U8("graphics/pokemon/gen_2/sneasel/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_SneaselF[] = INCBIN_U32("graphics/pokemon/sneasel/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_SneaselF[] = INCBIN_U32("graphics/pokemon/sneasel/backf.4bpp.lz"); + const u32 gMonFrontPic_SneaselF[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_SneaselF[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/backf.4bpp.lz"); #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/anim_front.4bpp.lz"); - const u32 gMonPalette_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/normal.gbapal.lz"); - const u32 gMonBackPic_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/back.4bpp.lz"); - const u32 gMonShinyPalette_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/shiny.gbapal.lz"); - const u8 gMonIcon_Weavile[] = INCBIN_U8("graphics/pokemon/weavile/icon.4bpp"); + const u32 gMonFrontPic_Weavile[] = INCBIN_U32("graphics/pokemon/gen_4/weavile/anim_front.4bpp.lz"); + const u32 gMonPalette_Weavile[] = INCBIN_U32("graphics/pokemon/gen_4/weavile/normal.gbapal.lz"); + const u32 gMonBackPic_Weavile[] = INCBIN_U32("graphics/pokemon/gen_4/weavile/back.4bpp.lz"); + const u32 gMonShinyPalette_Weavile[] = INCBIN_U32("graphics/pokemon/gen_4/weavile/shiny.gbapal.lz"); + const u8 gMonIcon_Weavile[] = INCBIN_U8("graphics/pokemon/gen_4/weavile/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Weavile[] = INCBIN_U8("graphics/pokemon/weavile/footprint.1bpp"); + const u8 gMonFootprint_Weavile[] = INCBIN_U8("graphics/pokemon/gen_4/weavile/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_WeavileF[] = INCBIN_U32("graphics/pokemon/weavile/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_WeavileF[] = INCBIN_U32("graphics/pokemon/weavile/backf.4bpp.lz"); + const u32 gMonFrontPic_WeavileF[] = INCBIN_U32("graphics/pokemon/gen_4/weavile/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_WeavileF[] = INCBIN_U32("graphics/pokemon/gen_4/weavile/backf.4bpp.lz"); #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/front.4bpp.lz"); - const u32 gMonPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_SneaselHisuian[] = INCBIN_U8("graphics/pokemon/sneasel/hisuian/icon.4bpp"); + const u32 gMonFrontPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/hisuian/front.4bpp.lz"); + const u32 gMonPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_SneaselHisuian[] = INCBIN_U8("graphics/pokemon/gen_2/sneasel/hisuian/icon.4bpp"); - const u32 gMonFrontPic_SneaselHisuianF[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/frontf.4bpp.lz"); - const u32 gMonBackPic_SneaselHisuianF[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/backf.4bpp.lz"); + const u32 gMonFrontPic_SneaselHisuianF[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/hisuian/frontf.4bpp.lz"); + const u32 gMonBackPic_SneaselHisuianF[] = INCBIN_U32("graphics/pokemon/gen_2/sneasel/hisuian/backf.4bpp.lz"); - const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz"); - const u32 gMonPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/normal.gbapal.lz"); - const u32 gMonBackPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/back.4bpp.lz"); - const u32 gMonShinyPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/shiny.gbapal.lz"); - const u8 gMonIcon_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/icon.4bpp"); + const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/gen_8/sneasler/front.4bpp.lz"); + const u32 gMonPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/gen_8/sneasler/normal.gbapal.lz"); + const u32 gMonBackPic_Sneasler[] = INCBIN_U32("graphics/pokemon/gen_8/sneasler/back.4bpp.lz"); + const u32 gMonShinyPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/gen_8/sneasler/shiny.gbapal.lz"); + const u8 gMonIcon_Sneasler[] = INCBIN_U8("graphics/pokemon/gen_8/sneasler/icon.4bpp"); #if P_FOOTPRINTS - //const u8 gMonFootprint_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/footprint.1bpp"); + //const u8 gMonFootprint_Sneasler[] = INCBIN_U8("graphics/pokemon/gen_8/sneasler/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_SNEASEL #if P_FAMILY_TEDDIURSA - const u32 gMonFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/anim_front.4bpp.lz"); - const u32 gMonPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/normal.gbapal.lz"); - const u32 gMonBackPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/back.4bpp.lz"); - const u32 gMonShinyPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/shiny.gbapal.lz"); - const u8 gMonIcon_Teddiursa[] = INCBIN_U8("graphics/pokemon/teddiursa/icon.4bpp"); + const u32 gMonFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/gen_2/teddiursa/anim_front.4bpp.lz"); + const u32 gMonPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/gen_2/teddiursa/normal.gbapal.lz"); + const u32 gMonBackPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/gen_2/teddiursa/back.4bpp.lz"); + const u32 gMonShinyPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/gen_2/teddiursa/shiny.gbapal.lz"); + const u8 gMonIcon_Teddiursa[] = INCBIN_U8("graphics/pokemon/gen_2/teddiursa/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Teddiursa[] = INCBIN_U8("graphics/pokemon/teddiursa/footprint.1bpp"); + const u8 gMonFootprint_Teddiursa[] = INCBIN_U8("graphics/pokemon/gen_2/teddiursa/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/anim_front.4bpp.lz"); - const u32 gMonPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/normal.gbapal.lz"); - const u32 gMonBackPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/back.4bpp.lz"); - const u32 gMonShinyPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/shiny.gbapal.lz"); - const u8 gMonIcon_Ursaring[] = INCBIN_U8("graphics/pokemon/ursaring/icon.4bpp"); + const u32 gMonFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/gen_2/ursaring/anim_front.4bpp.lz"); + const u32 gMonPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/gen_2/ursaring/normal.gbapal.lz"); + const u32 gMonBackPic_Ursaring[] = INCBIN_U32("graphics/pokemon/gen_2/ursaring/back.4bpp.lz"); + const u32 gMonShinyPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/gen_2/ursaring/shiny.gbapal.lz"); + const u8 gMonIcon_Ursaring[] = INCBIN_U8("graphics/pokemon/gen_2/ursaring/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ursaring[] = INCBIN_U8("graphics/pokemon/ursaring/footprint.1bpp"); + const u8 gMonFootprint_Ursaring[] = INCBIN_U8("graphics/pokemon/gen_2/ursaring/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_UrsaringF[] = INCBIN_U32("graphics/pokemon/ursaring/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_UrsaringF[] = INCBIN_U32("graphics/pokemon/ursaring/backf.4bpp.lz"); + const u32 gMonFrontPic_UrsaringF[] = INCBIN_U32("graphics/pokemon/gen_2/ursaring/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_UrsaringF[] = INCBIN_U32("graphics/pokemon/gen_2/ursaring/backf.4bpp.lz"); #if P_GEN_8_CROSS_EVOS - const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/front.4bpp.lz"); - const u32 gMonPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/normal.gbapal.lz"); - const u32 gMonBackPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/back.4bpp.lz"); - const u32 gMonShinyPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/shiny.gbapal.lz"); - const u8 gMonIcon_Ursaluna[] = INCBIN_U8("graphics/pokemon/ursaluna/icon.4bpp"); + const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/front.4bpp.lz"); + const u32 gMonPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/normal.gbapal.lz"); + const u32 gMonBackPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/back.4bpp.lz"); + const u32 gMonShinyPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/shiny.gbapal.lz"); + const u8 gMonIcon_Ursaluna[] = INCBIN_U8("graphics/pokemon/gen_8/ursaluna/icon.4bpp"); #if P_FOOTPRINTS - //const u8 gMonFootprint_Ursaluna[] = INCBIN_U8("graphics/pokemon/ursaluna/footprint.1bpp"); + //const u8 gMonFootprint_Ursaluna[] = INCBIN_U8("graphics/pokemon/gen_8/ursaluna/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/front.4bpp.lz"); - const u32 gMonPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/normal.gbapal.lz"); - const u32 gMonBackPic_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/back.4bpp.lz"); - const u32 gMonShinyPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/shiny.gbapal.lz"); - // const u8 gMonIcon_UrsalunaBloodmoon[] = INCBIN_U8("graphics/pokemon/ursaluna/bloodmoon/icon.4bpp"); + const u32 gMonFrontPic_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/bloodmoon/front.4bpp.lz"); + const u32 gMonPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/bloodmoon/normal.gbapal.lz"); + const u32 gMonBackPic_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/bloodmoon/back.4bpp.lz"); + const u32 gMonShinyPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/gen_8/ursaluna/bloodmoon/shiny.gbapal.lz"); + // const u8 gMonIcon_UrsalunaBloodmoon[] = INCBIN_U8("graphics/pokemon/gen_8/ursaluna/bloodmoon/icon.4bpp"); #endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_TEDDIURSA #if P_FAMILY_SLUGMA - const u32 gMonFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/anim_front.4bpp.lz"); - const u32 gMonPalette_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/normal.gbapal.lz"); - const u32 gMonBackPic_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/back.4bpp.lz"); - const u32 gMonShinyPalette_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/shiny.gbapal.lz"); - const u8 gMonIcon_Slugma[] = INCBIN_U8("graphics/pokemon/slugma/icon.4bpp"); + const u32 gMonFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/gen_2/slugma/anim_front.4bpp.lz"); + const u32 gMonPalette_Slugma[] = INCBIN_U32("graphics/pokemon/gen_2/slugma/normal.gbapal.lz"); + const u32 gMonBackPic_Slugma[] = INCBIN_U32("graphics/pokemon/gen_2/slugma/back.4bpp.lz"); + const u32 gMonShinyPalette_Slugma[] = INCBIN_U32("graphics/pokemon/gen_2/slugma/shiny.gbapal.lz"); + const u8 gMonIcon_Slugma[] = INCBIN_U8("graphics/pokemon/gen_2/slugma/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Slugma[] = INCBIN_U8("graphics/pokemon/slugma/footprint.1bpp"); + const u8 gMonFootprint_Slugma[] = INCBIN_U8("graphics/pokemon/gen_2/slugma/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/anim_front.4bpp.lz"); - const u32 gMonPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/normal.gbapal.lz"); - const u32 gMonBackPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/back.4bpp.lz"); - const u32 gMonShinyPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/shiny.gbapal.lz"); - const u8 gMonIcon_Magcargo[] = INCBIN_U8("graphics/pokemon/magcargo/icon.4bpp"); + const u32 gMonFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/gen_2/magcargo/anim_front.4bpp.lz"); + const u32 gMonPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/gen_2/magcargo/normal.gbapal.lz"); + const u32 gMonBackPic_Magcargo[] = INCBIN_U32("graphics/pokemon/gen_2/magcargo/back.4bpp.lz"); + const u32 gMonShinyPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/gen_2/magcargo/shiny.gbapal.lz"); + const u8 gMonIcon_Magcargo[] = INCBIN_U8("graphics/pokemon/gen_2/magcargo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Magcargo[] = INCBIN_U8("graphics/pokemon/magcargo/footprint.1bpp"); + const u8 gMonFootprint_Magcargo[] = INCBIN_U8("graphics/pokemon/gen_2/magcargo/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SLUGMA #if P_FAMILY_SWINUB - const u32 gMonFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/anim_front.4bpp.lz"); - const u32 gMonPalette_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/normal.gbapal.lz"); - const u32 gMonBackPic_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/back.4bpp.lz"); - const u32 gMonShinyPalette_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/shiny.gbapal.lz"); - const u8 gMonIcon_Swinub[] = INCBIN_U8("graphics/pokemon/swinub/icon.4bpp"); + const u32 gMonFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/gen_2/swinub/anim_front.4bpp.lz"); + const u32 gMonPalette_Swinub[] = INCBIN_U32("graphics/pokemon/gen_2/swinub/normal.gbapal.lz"); + const u32 gMonBackPic_Swinub[] = INCBIN_U32("graphics/pokemon/gen_2/swinub/back.4bpp.lz"); + const u32 gMonShinyPalette_Swinub[] = INCBIN_U32("graphics/pokemon/gen_2/swinub/shiny.gbapal.lz"); + const u8 gMonIcon_Swinub[] = INCBIN_U8("graphics/pokemon/gen_2/swinub/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Swinub[] = INCBIN_U8("graphics/pokemon/swinub/footprint.1bpp"); + const u8 gMonFootprint_Swinub[] = INCBIN_U8("graphics/pokemon/gen_2/swinub/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/anim_front.4bpp.lz"); - const u32 gMonPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/normal.gbapal.lz"); - const u32 gMonBackPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/back.4bpp.lz"); - const u32 gMonShinyPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/shiny.gbapal.lz"); - const u8 gMonIcon_Piloswine[] = INCBIN_U8("graphics/pokemon/piloswine/icon.4bpp"); + const u32 gMonFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/gen_2/piloswine/anim_front.4bpp.lz"); + const u32 gMonPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/gen_2/piloswine/normal.gbapal.lz"); + const u32 gMonBackPic_Piloswine[] = INCBIN_U32("graphics/pokemon/gen_2/piloswine/back.4bpp.lz"); + const u32 gMonShinyPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/gen_2/piloswine/shiny.gbapal.lz"); + const u8 gMonIcon_Piloswine[] = INCBIN_U8("graphics/pokemon/gen_2/piloswine/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Piloswine[] = INCBIN_U8("graphics/pokemon/piloswine/footprint.1bpp"); + const u8 gMonFootprint_Piloswine[] = INCBIN_U8("graphics/pokemon/gen_2/piloswine/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_PiloswineF[] = INCBIN_U32("graphics/pokemon/piloswine/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_PiloswineF[] = INCBIN_U32("graphics/pokemon/piloswine/backf.4bpp.lz"); + const u32 gMonFrontPic_PiloswineF[] = INCBIN_U32("graphics/pokemon/gen_2/piloswine/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_PiloswineF[] = INCBIN_U32("graphics/pokemon/gen_2/piloswine/backf.4bpp.lz"); #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/anim_front.4bpp.lz"); - const u32 gMonPalette_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/normal.gbapal.lz"); - const u32 gMonBackPic_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/back.4bpp.lz"); - const u32 gMonShinyPalette_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/shiny.gbapal.lz"); - const u8 gMonIcon_Mamoswine[] = INCBIN_U8("graphics/pokemon/mamoswine/icon.4bpp"); + const u32 gMonFrontPic_Mamoswine[] = INCBIN_U32("graphics/pokemon/gen_4/mamoswine/anim_front.4bpp.lz"); + const u32 gMonPalette_Mamoswine[] = INCBIN_U32("graphics/pokemon/gen_4/mamoswine/normal.gbapal.lz"); + const u32 gMonBackPic_Mamoswine[] = INCBIN_U32("graphics/pokemon/gen_4/mamoswine/back.4bpp.lz"); + const u32 gMonShinyPalette_Mamoswine[] = INCBIN_U32("graphics/pokemon/gen_4/mamoswine/shiny.gbapal.lz"); + const u8 gMonIcon_Mamoswine[] = INCBIN_U8("graphics/pokemon/gen_4/mamoswine/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mamoswine[] = INCBIN_U8("graphics/pokemon/mamoswine/footprint.1bpp"); + const u8 gMonFootprint_Mamoswine[] = INCBIN_U8("graphics/pokemon/gen_4/mamoswine/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MamoswineF[] = INCBIN_U32("graphics/pokemon/mamoswine/anim_frontf.4bpp.lz"); + const u32 gMonFrontPic_MamoswineF[] = INCBIN_U32("graphics/pokemon/gen_4/mamoswine/anim_frontf.4bpp.lz"); #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_SWINUB #if P_FAMILY_CORSOLA - const u32 gMonFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/anim_front.4bpp.lz"); - const u32 gMonPalette_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/normal.gbapal.lz"); - const u32 gMonBackPic_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/back.4bpp.lz"); - const u32 gMonShinyPalette_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/shiny.gbapal.lz"); - const u8 gMonIcon_Corsola[] = INCBIN_U8("graphics/pokemon/corsola/icon.4bpp"); + const u32 gMonFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/anim_front.4bpp.lz"); + const u32 gMonPalette_Corsola[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/normal.gbapal.lz"); + const u32 gMonBackPic_Corsola[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/back.4bpp.lz"); + const u32 gMonShinyPalette_Corsola[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/shiny.gbapal.lz"); + const u8 gMonIcon_Corsola[] = INCBIN_U8("graphics/pokemon/gen_2/corsola/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Corsola[] = INCBIN_U8("graphics/pokemon/corsola/footprint.1bpp"); + const u8 gMonFootprint_Corsola[] = INCBIN_U8("graphics/pokemon/gen_2/corsola/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/front.4bpp.lz"); - const u32 gMonPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_CorsolaGalarian[] = INCBIN_U8("graphics/pokemon/corsola/galarian/icon.4bpp"); + const u32 gMonFrontPic_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/galarian/front.4bpp.lz"); + const u32 gMonPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/gen_2/corsola/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_CorsolaGalarian[] = INCBIN_U8("graphics/pokemon/gen_2/corsola/galarian/icon.4bpp"); - const u32 gMonFrontPic_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/front.4bpp.lz"); - const u32 gMonPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/normal.gbapal.lz"); - const u32 gMonBackPic_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/back.4bpp.lz"); - const u32 gMonShinyPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/shiny.gbapal.lz"); - const u8 gMonIcon_Cursola[] = INCBIN_U8("graphics/pokemon/cursola/icon.4bpp"); + const u32 gMonFrontPic_Cursola[] = INCBIN_U32("graphics/pokemon/gen_8/cursola/front.4bpp.lz"); + const u32 gMonPalette_Cursola[] = INCBIN_U32("graphics/pokemon/gen_8/cursola/normal.gbapal.lz"); + const u32 gMonBackPic_Cursola[] = INCBIN_U32("graphics/pokemon/gen_8/cursola/back.4bpp.lz"); + const u32 gMonShinyPalette_Cursola[] = INCBIN_U32("graphics/pokemon/gen_8/cursola/shiny.gbapal.lz"); + const u8 gMonIcon_Cursola[] = INCBIN_U8("graphics/pokemon/gen_8/cursola/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cursola[] = INCBIN_U8("graphics/pokemon/cursola/footprint.1bpp"); + const u8 gMonFootprint_Cursola[] = INCBIN_U8("graphics/pokemon/gen_8/cursola/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_CORSOLA #if P_FAMILY_REMORAID - const u32 gMonFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/anim_front.4bpp.lz"); - const u32 gMonPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/normal.gbapal.lz"); - const u32 gMonBackPic_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/back.4bpp.lz"); - const u32 gMonShinyPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/shiny.gbapal.lz"); - const u8 gMonIcon_Remoraid[] = INCBIN_U8("graphics/pokemon/remoraid/icon.4bpp"); + const u32 gMonFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/gen_2/remoraid/anim_front.4bpp.lz"); + const u32 gMonPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/gen_2/remoraid/normal.gbapal.lz"); + const u32 gMonBackPic_Remoraid[] = INCBIN_U32("graphics/pokemon/gen_2/remoraid/back.4bpp.lz"); + const u32 gMonShinyPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/gen_2/remoraid/shiny.gbapal.lz"); + const u8 gMonIcon_Remoraid[] = INCBIN_U8("graphics/pokemon/gen_2/remoraid/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Remoraid[] = INCBIN_U8("graphics/pokemon/remoraid/footprint.1bpp"); + const u8 gMonFootprint_Remoraid[] = INCBIN_U8("graphics/pokemon/gen_2/remoraid/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/anim_front.4bpp.lz"); - const u32 gMonPalette_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/normal.gbapal.lz"); - const u32 gMonBackPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/back.4bpp.lz"); - const u32 gMonShinyPalette_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/shiny.gbapal.lz"); - const u8 gMonIcon_Octillery[] = INCBIN_U8("graphics/pokemon/octillery/icon.4bpp"); + const u32 gMonFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/gen_2/octillery/anim_front.4bpp.lz"); + const u32 gMonPalette_Octillery[] = INCBIN_U32("graphics/pokemon/gen_2/octillery/normal.gbapal.lz"); + const u32 gMonBackPic_Octillery[] = INCBIN_U32("graphics/pokemon/gen_2/octillery/back.4bpp.lz"); + const u32 gMonShinyPalette_Octillery[] = INCBIN_U32("graphics/pokemon/gen_2/octillery/shiny.gbapal.lz"); + const u8 gMonIcon_Octillery[] = INCBIN_U8("graphics/pokemon/gen_2/octillery/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Octillery[] = INCBIN_U8("graphics/pokemon/octillery/footprint.1bpp"); + const u8 gMonFootprint_Octillery[] = INCBIN_U8("graphics/pokemon/gen_2/octillery/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_OctilleryF[] = INCBIN_U32("graphics/pokemon/octillery/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_OctilleryF[] = INCBIN_U32("graphics/pokemon/octillery/backf.4bpp.lz"); + const u32 gMonFrontPic_OctilleryF[] = INCBIN_U32("graphics/pokemon/gen_2/octillery/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_OctilleryF[] = INCBIN_U32("graphics/pokemon/gen_2/octillery/backf.4bpp.lz"); #endif //P_FAMILY_REMORAID #if P_FAMILY_DELIBIRD - const u32 gMonFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/anim_front.4bpp.lz"); - const u32 gMonPalette_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/normal.gbapal.lz"); - const u32 gMonBackPic_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/back.4bpp.lz"); - const u32 gMonShinyPalette_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/shiny.gbapal.lz"); - const u8 gMonIcon_Delibird[] = INCBIN_U8("graphics/pokemon/delibird/icon.4bpp"); + const u32 gMonFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/gen_2/delibird/anim_front.4bpp.lz"); + const u32 gMonPalette_Delibird[] = INCBIN_U32("graphics/pokemon/gen_2/delibird/normal.gbapal.lz"); + const u32 gMonBackPic_Delibird[] = INCBIN_U32("graphics/pokemon/gen_2/delibird/back.4bpp.lz"); + const u32 gMonShinyPalette_Delibird[] = INCBIN_U32("graphics/pokemon/gen_2/delibird/shiny.gbapal.lz"); + const u8 gMonIcon_Delibird[] = INCBIN_U8("graphics/pokemon/gen_2/delibird/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Delibird[] = INCBIN_U8("graphics/pokemon/delibird/footprint.1bpp"); + const u8 gMonFootprint_Delibird[] = INCBIN_U8("graphics/pokemon/gen_2/delibird/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DELIBIRD #if P_FAMILY_MANTINE #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/anim_front.4bpp.lz"); - const u32 gMonPalette_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/normal.gbapal.lz"); - const u32 gMonBackPic_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/back.4bpp.lz"); - const u32 gMonShinyPalette_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/shiny.gbapal.lz"); - const u8 gMonIcon_Mantyke[] = INCBIN_U8("graphics/pokemon/mantyke/icon.4bpp"); + const u32 gMonFrontPic_Mantyke[] = INCBIN_U32("graphics/pokemon/gen_4/mantyke/anim_front.4bpp.lz"); + const u32 gMonPalette_Mantyke[] = INCBIN_U32("graphics/pokemon/gen_4/mantyke/normal.gbapal.lz"); + const u32 gMonBackPic_Mantyke[] = INCBIN_U32("graphics/pokemon/gen_4/mantyke/back.4bpp.lz"); + const u32 gMonShinyPalette_Mantyke[] = INCBIN_U32("graphics/pokemon/gen_4/mantyke/shiny.gbapal.lz"); + const u8 gMonIcon_Mantyke[] = INCBIN_U8("graphics/pokemon/gen_4/mantyke/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mantyke[] = INCBIN_U8("graphics/pokemon/mantyke/footprint.1bpp"); + const u8 gMonFootprint_Mantyke[] = INCBIN_U8("graphics/pokemon/gen_4/mantyke/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/anim_front.4bpp.lz"); - const u32 gMonPalette_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/normal.gbapal.lz"); - const u32 gMonBackPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/back.4bpp.lz"); - const u32 gMonShinyPalette_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/shiny.gbapal.lz"); - const u8 gMonIcon_Mantine[] = INCBIN_U8("graphics/pokemon/mantine/icon.4bpp"); + const u32 gMonFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/gen_2/mantine/anim_front.4bpp.lz"); + const u32 gMonPalette_Mantine[] = INCBIN_U32("graphics/pokemon/gen_2/mantine/normal.gbapal.lz"); + const u32 gMonBackPic_Mantine[] = INCBIN_U32("graphics/pokemon/gen_2/mantine/back.4bpp.lz"); + const u32 gMonShinyPalette_Mantine[] = INCBIN_U32("graphics/pokemon/gen_2/mantine/shiny.gbapal.lz"); + const u8 gMonIcon_Mantine[] = INCBIN_U8("graphics/pokemon/gen_2/mantine/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mantine[] = INCBIN_U8("graphics/pokemon/mantine/footprint.1bpp"); + const u8 gMonFootprint_Mantine[] = INCBIN_U8("graphics/pokemon/gen_2/mantine/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MANTINE #if P_FAMILY_SKARMORY - const u32 gMonFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/anim_front.4bpp.lz"); - const u32 gMonPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/normal.gbapal.lz"); - const u32 gMonBackPic_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/back.4bpp.lz"); - const u32 gMonShinyPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/shiny.gbapal.lz"); - const u8 gMonIcon_Skarmory[] = INCBIN_U8("graphics/pokemon/skarmory/icon.4bpp"); + const u32 gMonFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/gen_2/skarmory/anim_front.4bpp.lz"); + const u32 gMonPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/gen_2/skarmory/normal.gbapal.lz"); + const u32 gMonBackPic_Skarmory[] = INCBIN_U32("graphics/pokemon/gen_2/skarmory/back.4bpp.lz"); + const u32 gMonShinyPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/gen_2/skarmory/shiny.gbapal.lz"); + const u8 gMonIcon_Skarmory[] = INCBIN_U8("graphics/pokemon/gen_2/skarmory/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Skarmory[] = INCBIN_U8("graphics/pokemon/skarmory/footprint.1bpp"); + const u8 gMonFootprint_Skarmory[] = INCBIN_U8("graphics/pokemon/gen_2/skarmory/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SKARMORY #if P_FAMILY_HOUNDOUR - const u32 gMonFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/anim_front.4bpp.lz"); - const u32 gMonPalette_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/normal.gbapal.lz"); - const u32 gMonBackPic_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/back.4bpp.lz"); - const u32 gMonShinyPalette_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/shiny.gbapal.lz"); - const u8 gMonIcon_Houndour[] = INCBIN_U8("graphics/pokemon/houndour/icon.4bpp"); + const u32 gMonFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/gen_2/houndour/anim_front.4bpp.lz"); + const u32 gMonPalette_Houndour[] = INCBIN_U32("graphics/pokemon/gen_2/houndour/normal.gbapal.lz"); + const u32 gMonBackPic_Houndour[] = INCBIN_U32("graphics/pokemon/gen_2/houndour/back.4bpp.lz"); + const u32 gMonShinyPalette_Houndour[] = INCBIN_U32("graphics/pokemon/gen_2/houndour/shiny.gbapal.lz"); + const u8 gMonIcon_Houndour[] = INCBIN_U8("graphics/pokemon/gen_2/houndour/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Houndour[] = INCBIN_U8("graphics/pokemon/houndour/footprint.1bpp"); + const u8 gMonFootprint_Houndour[] = INCBIN_U8("graphics/pokemon/gen_2/houndour/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/anim_front.4bpp.lz"); - const u32 gMonPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/normal.gbapal.lz"); - const u32 gMonBackPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/back.4bpp.lz"); - const u32 gMonShinyPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/shiny.gbapal.lz"); - const u8 gMonIcon_Houndoom[] = INCBIN_U8("graphics/pokemon/houndoom/icon.4bpp"); + const u32 gMonFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/anim_front.4bpp.lz"); + const u32 gMonPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/normal.gbapal.lz"); + const u32 gMonBackPic_Houndoom[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/back.4bpp.lz"); + const u32 gMonShinyPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/shiny.gbapal.lz"); + const u8 gMonIcon_Houndoom[] = INCBIN_U8("graphics/pokemon/gen_2/houndoom/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Houndoom[] = INCBIN_U8("graphics/pokemon/houndoom/footprint.1bpp"); + const u8 gMonFootprint_Houndoom[] = INCBIN_U8("graphics/pokemon/gen_2/houndoom/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_HoundoomF[] = INCBIN_U32("graphics/pokemon/houndoom/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_HoundoomF[] = INCBIN_U32("graphics/pokemon/houndoom/backf.4bpp.lz"); + const u32 gMonFrontPic_HoundoomF[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_HoundoomF[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/backf.4bpp.lz"); #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/front.4bpp.lz"); - const u32 gMonPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/normal.gbapal.lz"); - const u32 gMonBackPic_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/shiny.gbapal.lz"); - const u8 gMonIcon_HoundoomMega[] = INCBIN_U8("graphics/pokemon/houndoom/mega/icon.4bpp"); + const u32 gMonFrontPic_HoundoomMega[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/mega/front.4bpp.lz"); + const u32 gMonPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/mega/normal.gbapal.lz"); + const u32 gMonBackPic_HoundoomMega[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/gen_2/houndoom/mega/shiny.gbapal.lz"); + const u8 gMonIcon_HoundoomMega[] = INCBIN_U8("graphics/pokemon/gen_2/houndoom/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_HOUNDOUR #if P_FAMILY_PHANPY - const u32 gMonFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/anim_front.4bpp.lz"); - const u32 gMonPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/normal.gbapal.lz"); - const u32 gMonBackPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/back.4bpp.lz"); - const u32 gMonShinyPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/shiny.gbapal.lz"); - const u8 gMonIcon_Phanpy[] = INCBIN_U8("graphics/pokemon/phanpy/icon.4bpp"); + const u32 gMonFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/gen_2/phanpy/anim_front.4bpp.lz"); + const u32 gMonPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/gen_2/phanpy/normal.gbapal.lz"); + const u32 gMonBackPic_Phanpy[] = INCBIN_U32("graphics/pokemon/gen_2/phanpy/back.4bpp.lz"); + const u32 gMonShinyPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/gen_2/phanpy/shiny.gbapal.lz"); + const u8 gMonIcon_Phanpy[] = INCBIN_U8("graphics/pokemon/gen_2/phanpy/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Phanpy[] = INCBIN_U8("graphics/pokemon/phanpy/footprint.1bpp"); + const u8 gMonFootprint_Phanpy[] = INCBIN_U8("graphics/pokemon/gen_2/phanpy/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/anim_front.4bpp.lz"); - const u32 gMonPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/normal.gbapal.lz"); - const u32 gMonBackPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/back.4bpp.lz"); - const u32 gMonShinyPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/shiny.gbapal.lz"); - const u8 gMonIcon_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/icon.4bpp"); + const u32 gMonFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/gen_2/donphan/anim_front.4bpp.lz"); + const u32 gMonPalette_Donphan[] = INCBIN_U32("graphics/pokemon/gen_2/donphan/normal.gbapal.lz"); + const u32 gMonBackPic_Donphan[] = INCBIN_U32("graphics/pokemon/gen_2/donphan/back.4bpp.lz"); + const u32 gMonShinyPalette_Donphan[] = INCBIN_U32("graphics/pokemon/gen_2/donphan/shiny.gbapal.lz"); + const u8 gMonIcon_Donphan[] = INCBIN_U8("graphics/pokemon/gen_2/donphan/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/footprint.1bpp"); + const u8 gMonFootprint_Donphan[] = INCBIN_U8("graphics/pokemon/gen_2/donphan/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_DonphanF[] = INCBIN_U32("graphics/pokemon/donphan/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_DonphanF[] = INCBIN_U32("graphics/pokemon/donphan/backf.4bpp.lz"); + const u32 gMonFrontPic_DonphanF[] = INCBIN_U32("graphics/pokemon/gen_2/donphan/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_DonphanF[] = INCBIN_U32("graphics/pokemon/gen_2/donphan/backf.4bpp.lz"); #endif //P_FAMILY_PHANPY #if P_FAMILY_STANTLER - const u32 gMonFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/anim_front.4bpp.lz"); - const u32 gMonPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/normal.gbapal.lz"); - const u32 gMonBackPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/back.4bpp.lz"); - const u32 gMonShinyPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/shiny.gbapal.lz"); - const u8 gMonIcon_Stantler[] = INCBIN_U8("graphics/pokemon/stantler/icon.4bpp"); + const u32 gMonFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/gen_2/stantler/anim_front.4bpp.lz"); + const u32 gMonPalette_Stantler[] = INCBIN_U32("graphics/pokemon/gen_2/stantler/normal.gbapal.lz"); + const u32 gMonBackPic_Stantler[] = INCBIN_U32("graphics/pokemon/gen_2/stantler/back.4bpp.lz"); + const u32 gMonShinyPalette_Stantler[] = INCBIN_U32("graphics/pokemon/gen_2/stantler/shiny.gbapal.lz"); + const u8 gMonIcon_Stantler[] = INCBIN_U8("graphics/pokemon/gen_2/stantler/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Stantler[] = INCBIN_U8("graphics/pokemon/stantler/footprint.1bpp"); + const u8 gMonFootprint_Stantler[] = INCBIN_U8("graphics/pokemon/gen_2/stantler/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_8_CROSS_EVOS - const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4bpp.lz"); - const u32 gMonPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/normal.gbapal.lz"); - const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/back.4bpp.lz"); - const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/shiny.gbapal.lz"); - const u8 gMonIcon_Wyrdeer[] = INCBIN_U8("graphics/pokemon/wyrdeer/icon.4bpp"); + const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/gen_8/wyrdeer/front.4bpp.lz"); + const u32 gMonPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/gen_8/wyrdeer/normal.gbapal.lz"); + const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/gen_8/wyrdeer/back.4bpp.lz"); + const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/gen_8/wyrdeer/shiny.gbapal.lz"); + const u8 gMonIcon_Wyrdeer[] = INCBIN_U8("graphics/pokemon/gen_8/wyrdeer/icon.4bpp"); #if P_FOOTPRINTS - //const u8 gMonFootprint_Wyrdeer[] = INCBIN_U8("graphics/pokemon/wyrdeer/footprint.1bpp"); + //const u8 gMonFootprint_Wyrdeer[] = INCBIN_U8("graphics/pokemon/gen_8/wyrdeer/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_STANTLER #if P_FAMILY_SMEARGLE - const u32 gMonFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/anim_front.4bpp.lz"); - const u32 gMonPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/normal.gbapal.lz"); - const u32 gMonBackPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/back.4bpp.lz"); - const u32 gMonShinyPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/shiny.gbapal.lz"); - const u8 gMonIcon_Smeargle[] = INCBIN_U8("graphics/pokemon/smeargle/icon.4bpp"); + const u32 gMonFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/gen_2/smeargle/anim_front.4bpp.lz"); + const u32 gMonPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/gen_2/smeargle/normal.gbapal.lz"); + const u32 gMonBackPic_Smeargle[] = INCBIN_U32("graphics/pokemon/gen_2/smeargle/back.4bpp.lz"); + const u32 gMonShinyPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/gen_2/smeargle/shiny.gbapal.lz"); + const u8 gMonIcon_Smeargle[] = INCBIN_U8("graphics/pokemon/gen_2/smeargle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Smeargle[] = INCBIN_U8("graphics/pokemon/smeargle/footprint.1bpp"); + const u8 gMonFootprint_Smeargle[] = INCBIN_U8("graphics/pokemon/gen_2/smeargle/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SMEARGLE #if P_FAMILY_MILTANK - const u32 gMonFrontPic_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/anim_front.4bpp.lz"); - const u32 gMonPalette_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/normal.gbapal.lz"); - const u32 gMonBackPic_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/back.4bpp.lz"); - const u32 gMonShinyPalette_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/shiny.gbapal.lz"); - const u8 gMonIcon_Miltank[] = INCBIN_U8("graphics/pokemon/miltank/icon.4bpp"); + const u32 gMonFrontPic_Miltank[] = INCBIN_U32("graphics/pokemon/gen_2/miltank/anim_front.4bpp.lz"); + const u32 gMonPalette_Miltank[] = INCBIN_U32("graphics/pokemon/gen_2/miltank/normal.gbapal.lz"); + const u32 gMonBackPic_Miltank[] = INCBIN_U32("graphics/pokemon/gen_2/miltank/back.4bpp.lz"); + const u32 gMonShinyPalette_Miltank[] = INCBIN_U32("graphics/pokemon/gen_2/miltank/shiny.gbapal.lz"); + const u8 gMonIcon_Miltank[] = INCBIN_U8("graphics/pokemon/gen_2/miltank/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Miltank[] = INCBIN_U8("graphics/pokemon/miltank/footprint.1bpp"); + const u8 gMonFootprint_Miltank[] = INCBIN_U8("graphics/pokemon/gen_2/miltank/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MILTANK #if P_FAMILY_RAIKOU - const u32 gMonFrontPic_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/anim_front.4bpp.lz"); - const u32 gMonPalette_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/normal.gbapal.lz"); - const u32 gMonBackPic_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/back.4bpp.lz"); - const u32 gMonShinyPalette_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/shiny.gbapal.lz"); - const u8 gMonIcon_Raikou[] = INCBIN_U8("graphics/pokemon/raikou/icon.4bpp"); + const u32 gMonFrontPic_Raikou[] = INCBIN_U32("graphics/pokemon/gen_2/raikou/anim_front.4bpp.lz"); + const u32 gMonPalette_Raikou[] = INCBIN_U32("graphics/pokemon/gen_2/raikou/normal.gbapal.lz"); + const u32 gMonBackPic_Raikou[] = INCBIN_U32("graphics/pokemon/gen_2/raikou/back.4bpp.lz"); + const u32 gMonShinyPalette_Raikou[] = INCBIN_U32("graphics/pokemon/gen_2/raikou/shiny.gbapal.lz"); + const u8 gMonIcon_Raikou[] = INCBIN_U8("graphics/pokemon/gen_2/raikou/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Raikou[] = INCBIN_U8("graphics/pokemon/raikou/footprint.1bpp"); + const u8 gMonFootprint_Raikou[] = INCBIN_U8("graphics/pokemon/gen_2/raikou/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_RAIKOU #if P_FAMILY_ENTEI - const u32 gMonFrontPic_Entei[] = INCBIN_U32("graphics/pokemon/entei/anim_front.4bpp.lz"); - const u32 gMonPalette_Entei[] = INCBIN_U32("graphics/pokemon/entei/normal.gbapal.lz"); - const u32 gMonBackPic_Entei[] = INCBIN_U32("graphics/pokemon/entei/back.4bpp.lz"); - const u32 gMonShinyPalette_Entei[] = INCBIN_U32("graphics/pokemon/entei/shiny.gbapal.lz"); - const u8 gMonIcon_Entei[] = INCBIN_U8("graphics/pokemon/entei/icon.4bpp"); + const u32 gMonFrontPic_Entei[] = INCBIN_U32("graphics/pokemon/gen_2/entei/anim_front.4bpp.lz"); + const u32 gMonPalette_Entei[] = INCBIN_U32("graphics/pokemon/gen_2/entei/normal.gbapal.lz"); + const u32 gMonBackPic_Entei[] = INCBIN_U32("graphics/pokemon/gen_2/entei/back.4bpp.lz"); + const u32 gMonShinyPalette_Entei[] = INCBIN_U32("graphics/pokemon/gen_2/entei/shiny.gbapal.lz"); + const u8 gMonIcon_Entei[] = INCBIN_U8("graphics/pokemon/gen_2/entei/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Entei[] = INCBIN_U8("graphics/pokemon/entei/footprint.1bpp"); + const u8 gMonFootprint_Entei[] = INCBIN_U8("graphics/pokemon/gen_2/entei/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ENTEI #if P_FAMILY_SUICUNE - const u32 gMonFrontPic_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/anim_front.4bpp.lz"); - const u32 gMonPalette_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/normal.gbapal.lz"); - const u32 gMonBackPic_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/back.4bpp.lz"); - const u32 gMonShinyPalette_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/shiny.gbapal.lz"); - const u8 gMonIcon_Suicune[] = INCBIN_U8("graphics/pokemon/suicune/icon.4bpp"); + const u32 gMonFrontPic_Suicune[] = INCBIN_U32("graphics/pokemon/gen_2/suicune/anim_front.4bpp.lz"); + const u32 gMonPalette_Suicune[] = INCBIN_U32("graphics/pokemon/gen_2/suicune/normal.gbapal.lz"); + const u32 gMonBackPic_Suicune[] = INCBIN_U32("graphics/pokemon/gen_2/suicune/back.4bpp.lz"); + const u32 gMonShinyPalette_Suicune[] = INCBIN_U32("graphics/pokemon/gen_2/suicune/shiny.gbapal.lz"); + const u8 gMonIcon_Suicune[] = INCBIN_U8("graphics/pokemon/gen_2/suicune/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Suicune[] = INCBIN_U8("graphics/pokemon/suicune/footprint.1bpp"); + const u8 gMonFootprint_Suicune[] = INCBIN_U8("graphics/pokemon/gen_2/suicune/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SUICUNE #if P_FAMILY_LARVITAR - const u32 gMonFrontPic_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/anim_front.4bpp.lz"); - const u32 gMonPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/normal.gbapal.lz"); - const u32 gMonBackPic_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/back.4bpp.lz"); - const u32 gMonShinyPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/shiny.gbapal.lz"); - const u8 gMonIcon_Larvitar[] = INCBIN_U8("graphics/pokemon/larvitar/icon.4bpp"); + const u32 gMonFrontPic_Larvitar[] = INCBIN_U32("graphics/pokemon/gen_2/larvitar/anim_front.4bpp.lz"); + const u32 gMonPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/gen_2/larvitar/normal.gbapal.lz"); + const u32 gMonBackPic_Larvitar[] = INCBIN_U32("graphics/pokemon/gen_2/larvitar/back.4bpp.lz"); + const u32 gMonShinyPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/gen_2/larvitar/shiny.gbapal.lz"); + const u8 gMonIcon_Larvitar[] = INCBIN_U8("graphics/pokemon/gen_2/larvitar/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Larvitar[] = INCBIN_U8("graphics/pokemon/larvitar/footprint.1bpp"); + const u8 gMonFootprint_Larvitar[] = INCBIN_U8("graphics/pokemon/gen_2/larvitar/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/anim_front.4bpp.lz"); - const u32 gMonPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/normal.gbapal.lz"); - const u32 gMonBackPic_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/back.4bpp.lz"); - const u32 gMonShinyPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/shiny.gbapal.lz"); - const u8 gMonIcon_Pupitar[] = INCBIN_U8("graphics/pokemon/pupitar/icon.4bpp"); + const u32 gMonFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/gen_2/pupitar/anim_front.4bpp.lz"); + const u32 gMonPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/gen_2/pupitar/normal.gbapal.lz"); + const u32 gMonBackPic_Pupitar[] = INCBIN_U32("graphics/pokemon/gen_2/pupitar/back.4bpp.lz"); + const u32 gMonShinyPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/gen_2/pupitar/shiny.gbapal.lz"); + const u8 gMonIcon_Pupitar[] = INCBIN_U8("graphics/pokemon/gen_2/pupitar/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pupitar[] = INCBIN_U8("graphics/pokemon/pupitar/footprint.1bpp"); + const u8 gMonFootprint_Pupitar[] = INCBIN_U8("graphics/pokemon/gen_2/pupitar/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/anim_front.4bpp.lz"); - const u32 gMonPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/normal.gbapal.lz"); - const u32 gMonBackPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/back.4bpp.lz"); - const u32 gMonShinyPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/shiny.gbapal.lz"); - const u8 gMonIcon_Tyranitar[] = INCBIN_U8("graphics/pokemon/tyranitar/icon.4bpp"); + const u32 gMonFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/anim_front.4bpp.lz"); + const u32 gMonPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/normal.gbapal.lz"); + const u32 gMonBackPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/back.4bpp.lz"); + const u32 gMonShinyPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/shiny.gbapal.lz"); + const u8 gMonIcon_Tyranitar[] = INCBIN_U8("graphics/pokemon/gen_2/tyranitar/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tyranitar[] = INCBIN_U8("graphics/pokemon/tyranitar/footprint.1bpp"); + const u8 gMonFootprint_Tyranitar[] = INCBIN_U8("graphics/pokemon/gen_2/tyranitar/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/front.4bpp.lz"); - const u32 gMonPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/normal.gbapal.lz"); - const u32 gMonBackPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/shiny.gbapal.lz"); - const u8 gMonIcon_TyranitarMega[] = INCBIN_U8("graphics/pokemon/tyranitar/mega/icon.4bpp"); + const u32 gMonFrontPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/mega/front.4bpp.lz"); + const u32 gMonPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/mega/normal.gbapal.lz"); + const u32 gMonBackPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/gen_2/tyranitar/mega/shiny.gbapal.lz"); + const u8 gMonIcon_TyranitarMega[] = INCBIN_U8("graphics/pokemon/gen_2/tyranitar/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LARVITAR #if P_FAMILY_LUGIA - const u32 gMonFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/anim_front.4bpp.lz"); - const u32 gMonPalette_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/normal.gbapal.lz"); - const u32 gMonBackPic_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/back.4bpp.lz"); - const u32 gMonShinyPalette_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/shiny.gbapal.lz"); - const u8 gMonIcon_Lugia[] = INCBIN_U8("graphics/pokemon/lugia/icon.4bpp"); + const u32 gMonFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/gen_2/lugia/anim_front.4bpp.lz"); + const u32 gMonPalette_Lugia[] = INCBIN_U32("graphics/pokemon/gen_2/lugia/normal.gbapal.lz"); + const u32 gMonBackPic_Lugia[] = INCBIN_U32("graphics/pokemon/gen_2/lugia/back.4bpp.lz"); + const u32 gMonShinyPalette_Lugia[] = INCBIN_U32("graphics/pokemon/gen_2/lugia/shiny.gbapal.lz"); + const u8 gMonIcon_Lugia[] = INCBIN_U8("graphics/pokemon/gen_2/lugia/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lugia[] = INCBIN_U8("graphics/pokemon/lugia/footprint.1bpp"); + const u8 gMonFootprint_Lugia[] = INCBIN_U8("graphics/pokemon/gen_2/lugia/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_LUGIA #if P_FAMILY_HO_OH - const u32 gMonFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/anim_front.4bpp.lz"); - const u32 gMonPalette_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/normal.gbapal.lz"); - const u32 gMonBackPic_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/back.4bpp.lz"); - const u32 gMonShinyPalette_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/shiny.gbapal.lz"); - const u8 gMonIcon_HoOh[] = INCBIN_U8("graphics/pokemon/ho_oh/icon.4bpp"); + const u32 gMonFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/gen_2/ho_oh/anim_front.4bpp.lz"); + const u32 gMonPalette_HoOh[] = INCBIN_U32("graphics/pokemon/gen_2/ho_oh/normal.gbapal.lz"); + const u32 gMonBackPic_HoOh[] = INCBIN_U32("graphics/pokemon/gen_2/ho_oh/back.4bpp.lz"); + const u32 gMonShinyPalette_HoOh[] = INCBIN_U32("graphics/pokemon/gen_2/ho_oh/shiny.gbapal.lz"); + const u8 gMonIcon_HoOh[] = INCBIN_U8("graphics/pokemon/gen_2/ho_oh/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_HoOh[] = INCBIN_U8("graphics/pokemon/ho_oh/footprint.1bpp"); + const u8 gMonFootprint_HoOh[] = INCBIN_U8("graphics/pokemon/gen_2/ho_oh/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_HO_OH #if P_FAMILY_CELEBI - const u32 gMonFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/anim_front.4bpp.lz"); - const u32 gMonPalette_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/normal.gbapal.lz"); - const u32 gMonBackPic_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/back.4bpp.lz"); - const u32 gMonShinyPalette_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/shiny.gbapal.lz"); - const u8 gMonIcon_Celebi[] = INCBIN_U8("graphics/pokemon/celebi/icon.4bpp"); + const u32 gMonFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/gen_2/celebi/anim_front.4bpp.lz"); + const u32 gMonPalette_Celebi[] = INCBIN_U32("graphics/pokemon/gen_2/celebi/normal.gbapal.lz"); + const u32 gMonBackPic_Celebi[] = INCBIN_U32("graphics/pokemon/gen_2/celebi/back.4bpp.lz"); + const u32 gMonShinyPalette_Celebi[] = INCBIN_U32("graphics/pokemon/gen_2/celebi/shiny.gbapal.lz"); + const u8 gMonIcon_Celebi[] = INCBIN_U8("graphics/pokemon/gen_2/celebi/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Celebi[] = INCBIN_U8("graphics/pokemon/celebi/footprint.1bpp"); + const u8 gMonFootprint_Celebi[] = INCBIN_U8("graphics/pokemon/gen_2/celebi/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CELEBI #if P_FAMILY_TREECKO - const u32 gMonFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/anim_front.4bpp.lz"); - const u32 gMonPalette_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/normal.gbapal.lz"); - const u32 gMonBackPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/back.4bpp.lz"); - const u32 gMonShinyPalette_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/shiny.gbapal.lz"); - const u8 gMonIcon_Treecko[] = INCBIN_U8("graphics/pokemon/treecko/icon.4bpp"); + const u32 gMonFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/gen_3/treecko/anim_front.4bpp.lz"); + const u32 gMonPalette_Treecko[] = INCBIN_U32("graphics/pokemon/gen_3/treecko/normal.gbapal.lz"); + const u32 gMonBackPic_Treecko[] = INCBIN_U32("graphics/pokemon/gen_3/treecko/back.4bpp.lz"); + const u32 gMonShinyPalette_Treecko[] = INCBIN_U32("graphics/pokemon/gen_3/treecko/shiny.gbapal.lz"); + const u8 gMonIcon_Treecko[] = INCBIN_U8("graphics/pokemon/gen_3/treecko/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Treecko[] = INCBIN_U8("graphics/pokemon/treecko/footprint.1bpp"); + const u8 gMonFootprint_Treecko[] = INCBIN_U8("graphics/pokemon/gen_3/treecko/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/anim_front.4bpp.lz"); - const u32 gMonPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/normal.gbapal.lz"); - const u32 gMonBackPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/back.4bpp.lz"); - const u32 gMonShinyPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/shiny.gbapal.lz"); - const u8 gMonIcon_Grovyle[] = INCBIN_U8("graphics/pokemon/grovyle/icon.4bpp"); + const u32 gMonFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/gen_3/grovyle/anim_front.4bpp.lz"); + const u32 gMonPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/gen_3/grovyle/normal.gbapal.lz"); + const u32 gMonBackPic_Grovyle[] = INCBIN_U32("graphics/pokemon/gen_3/grovyle/back.4bpp.lz"); + const u32 gMonShinyPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/gen_3/grovyle/shiny.gbapal.lz"); + const u8 gMonIcon_Grovyle[] = INCBIN_U8("graphics/pokemon/gen_3/grovyle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Grovyle[] = INCBIN_U8("graphics/pokemon/grovyle/footprint.1bpp"); + const u8 gMonFootprint_Grovyle[] = INCBIN_U8("graphics/pokemon/gen_3/grovyle/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/anim_front.4bpp.lz"); - const u32 gMonPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/normal.gbapal.lz"); - const u32 gMonBackPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/back.4bpp.lz"); - const u32 gMonShinyPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/shiny.gbapal.lz"); - const u8 gMonIcon_Sceptile[] = INCBIN_U8("graphics/pokemon/sceptile/icon.4bpp"); + const u32 gMonFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/anim_front.4bpp.lz"); + const u32 gMonPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/normal.gbapal.lz"); + const u32 gMonBackPic_Sceptile[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/back.4bpp.lz"); + const u32 gMonShinyPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/shiny.gbapal.lz"); + const u8 gMonIcon_Sceptile[] = INCBIN_U8("graphics/pokemon/gen_3/sceptile/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sceptile[] = INCBIN_U8("graphics/pokemon/sceptile/footprint.1bpp"); + const u8 gMonFootprint_Sceptile[] = INCBIN_U8("graphics/pokemon/gen_3/sceptile/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/front.4bpp.lz"); - const u32 gMonPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/normal.gbapal.lz"); - const u32 gMonBackPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/shiny.gbapal.lz"); - const u8 gMonIcon_SceptileMega[] = INCBIN_U8("graphics/pokemon/sceptile/mega/icon.4bpp"); + const u32 gMonFrontPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/mega/front.4bpp.lz"); + const u32 gMonPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/mega/normal.gbapal.lz"); + const u32 gMonBackPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/gen_3/sceptile/mega/shiny.gbapal.lz"); + const u8 gMonIcon_SceptileMega[] = INCBIN_U8("graphics/pokemon/gen_3/sceptile/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_TREECKO #if P_FAMILY_TORCHIC - const u32 gMonFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/anim_front.4bpp.lz"); - const u32 gMonPalette_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/normal.gbapal.lz"); - const u32 gMonBackPic_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/back.4bpp.lz"); - const u32 gMonShinyPalette_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/shiny.gbapal.lz"); - const u8 gMonIcon_Torchic[] = INCBIN_U8("graphics/pokemon/torchic/icon.4bpp"); + const u32 gMonFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/gen_3/torchic/anim_front.4bpp.lz"); + const u32 gMonPalette_Torchic[] = INCBIN_U32("graphics/pokemon/gen_3/torchic/normal.gbapal.lz"); + const u32 gMonBackPic_Torchic[] = INCBIN_U32("graphics/pokemon/gen_3/torchic/back.4bpp.lz"); + const u32 gMonShinyPalette_Torchic[] = INCBIN_U32("graphics/pokemon/gen_3/torchic/shiny.gbapal.lz"); + const u8 gMonIcon_Torchic[] = INCBIN_U8("graphics/pokemon/gen_3/torchic/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Torchic[] = INCBIN_U8("graphics/pokemon/torchic/footprint.1bpp"); + const u8 gMonFootprint_Torchic[] = INCBIN_U8("graphics/pokemon/gen_3/torchic/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonBackPic_TorchicF[] = INCBIN_U32("graphics/pokemon/torchic/backf.4bpp.lz"); + const u32 gMonBackPic_TorchicF[] = INCBIN_U32("graphics/pokemon/gen_3/torchic/backf.4bpp.lz"); - const u32 gMonFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/anim_front.4bpp.lz"); - const u32 gMonPalette_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/normal.gbapal.lz"); - const u32 gMonBackPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/back.4bpp.lz"); - const u32 gMonShinyPalette_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/shiny.gbapal.lz"); - const u8 gMonIcon_Combusken[] = INCBIN_U8("graphics/pokemon/combusken/icon.4bpp"); + const u32 gMonFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/gen_3/combusken/anim_front.4bpp.lz"); + const u32 gMonPalette_Combusken[] = INCBIN_U32("graphics/pokemon/gen_3/combusken/normal.gbapal.lz"); + const u32 gMonBackPic_Combusken[] = INCBIN_U32("graphics/pokemon/gen_3/combusken/back.4bpp.lz"); + const u32 gMonShinyPalette_Combusken[] = INCBIN_U32("graphics/pokemon/gen_3/combusken/shiny.gbapal.lz"); + const u8 gMonIcon_Combusken[] = INCBIN_U8("graphics/pokemon/gen_3/combusken/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Combusken[] = INCBIN_U8("graphics/pokemon/combusken/footprint.1bpp"); + const u8 gMonFootprint_Combusken[] = INCBIN_U8("graphics/pokemon/gen_3/combusken/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_CombuskenF[] = INCBIN_U32("graphics/pokemon/combusken/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_CombuskenF[] = INCBIN_U32("graphics/pokemon/combusken/backf.4bpp.lz"); + const u32 gMonFrontPic_CombuskenF[] = INCBIN_U32("graphics/pokemon/gen_3/combusken/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_CombuskenF[] = INCBIN_U32("graphics/pokemon/gen_3/combusken/backf.4bpp.lz"); - const u32 gMonFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/anim_front.4bpp.lz"); - const u32 gMonPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/normal.gbapal.lz"); - const u32 gMonBackPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/back.4bpp.lz"); - const u32 gMonShinyPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/shiny.gbapal.lz"); - const u8 gMonIcon_Blaziken[] = INCBIN_U8("graphics/pokemon/blaziken/icon.4bpp"); + const u32 gMonFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/anim_front.4bpp.lz"); + const u32 gMonPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/normal.gbapal.lz"); + const u32 gMonBackPic_Blaziken[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/back.4bpp.lz"); + const u32 gMonShinyPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/shiny.gbapal.lz"); + const u8 gMonIcon_Blaziken[] = INCBIN_U8("graphics/pokemon/gen_3/blaziken/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Blaziken[] = INCBIN_U8("graphics/pokemon/blaziken/footprint.1bpp"); + const u8 gMonFootprint_Blaziken[] = INCBIN_U8("graphics/pokemon/gen_3/blaziken/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_BlazikenF[] = INCBIN_U32("graphics/pokemon/blaziken/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_BlazikenF[] = INCBIN_U32("graphics/pokemon/blaziken/backf.4bpp.lz"); + const u32 gMonFrontPic_BlazikenF[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_BlazikenF[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/backf.4bpp.lz"); #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/front.4bpp.lz"); - const u32 gMonPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/normal.gbapal.lz"); - const u32 gMonBackPic_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/shiny.gbapal.lz"); - const u8 gMonIcon_BlazikenMega[] = INCBIN_U8("graphics/pokemon/blaziken/mega/icon.4bpp"); + const u32 gMonFrontPic_BlazikenMega[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/mega/front.4bpp.lz"); + const u32 gMonPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/mega/normal.gbapal.lz"); + const u32 gMonBackPic_BlazikenMega[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/gen_3/blaziken/mega/shiny.gbapal.lz"); + const u8 gMonIcon_BlazikenMega[] = INCBIN_U8("graphics/pokemon/gen_3/blaziken/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_TORCHIC #if P_FAMILY_MUDKIP - const u32 gMonFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/anim_front.4bpp.lz"); - const u32 gMonPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/normal.gbapal.lz"); - const u32 gMonBackPic_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/back.4bpp.lz"); - const u32 gMonShinyPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/shiny.gbapal.lz"); - const u8 gMonIcon_Mudkip[] = INCBIN_U8("graphics/pokemon/mudkip/icon.4bpp"); + const u32 gMonFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/gen_3/mudkip/anim_front.4bpp.lz"); + const u32 gMonPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/gen_3/mudkip/normal.gbapal.lz"); + const u32 gMonBackPic_Mudkip[] = INCBIN_U32("graphics/pokemon/gen_3/mudkip/back.4bpp.lz"); + const u32 gMonShinyPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/gen_3/mudkip/shiny.gbapal.lz"); + const u8 gMonIcon_Mudkip[] = INCBIN_U8("graphics/pokemon/gen_3/mudkip/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mudkip[] = INCBIN_U8("graphics/pokemon/mudkip/footprint.1bpp"); + const u8 gMonFootprint_Mudkip[] = INCBIN_U8("graphics/pokemon/gen_3/mudkip/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/anim_front.4bpp.lz"); - const u32 gMonPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/normal.gbapal.lz"); - const u32 gMonBackPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/back.4bpp.lz"); - const u32 gMonShinyPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/shiny.gbapal.lz"); - const u8 gMonIcon_Marshtomp[] = INCBIN_U8("graphics/pokemon/marshtomp/icon.4bpp"); + const u32 gMonFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/gen_3/marshtomp/anim_front.4bpp.lz"); + const u32 gMonPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/gen_3/marshtomp/normal.gbapal.lz"); + const u32 gMonBackPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/gen_3/marshtomp/back.4bpp.lz"); + const u32 gMonShinyPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/gen_3/marshtomp/shiny.gbapal.lz"); + const u8 gMonIcon_Marshtomp[] = INCBIN_U8("graphics/pokemon/gen_3/marshtomp/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Marshtomp[] = INCBIN_U8("graphics/pokemon/marshtomp/footprint.1bpp"); + const u8 gMonFootprint_Marshtomp[] = INCBIN_U8("graphics/pokemon/gen_3/marshtomp/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/anim_front.4bpp.lz"); - const u32 gMonPalette_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/normal.gbapal.lz"); - const u32 gMonBackPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/back.4bpp.lz"); - const u32 gMonShinyPalette_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/shiny.gbapal.lz"); - const u8 gMonIcon_Swampert[] = INCBIN_U8("graphics/pokemon/swampert/icon.4bpp"); + const u32 gMonFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/anim_front.4bpp.lz"); + const u32 gMonPalette_Swampert[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/normal.gbapal.lz"); + const u32 gMonBackPic_Swampert[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/back.4bpp.lz"); + const u32 gMonShinyPalette_Swampert[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/shiny.gbapal.lz"); + const u8 gMonIcon_Swampert[] = INCBIN_U8("graphics/pokemon/gen_3/swampert/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Swampert[] = INCBIN_U8("graphics/pokemon/swampert/footprint.1bpp"); + const u8 gMonFootprint_Swampert[] = INCBIN_U8("graphics/pokemon/gen_3/swampert/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/front.4bpp.lz"); - const u32 gMonPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/normal.gbapal.lz"); - const u32 gMonBackPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/shiny.gbapal.lz"); - const u8 gMonIcon_SwampertMega[] = INCBIN_U8("graphics/pokemon/swampert/mega/icon.4bpp"); + const u32 gMonFrontPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/mega/front.4bpp.lz"); + const u32 gMonPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/mega/normal.gbapal.lz"); + const u32 gMonBackPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/gen_3/swampert/mega/shiny.gbapal.lz"); + const u8 gMonIcon_SwampertMega[] = INCBIN_U8("graphics/pokemon/gen_3/swampert/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MUDKIP #if P_FAMILY_POOCHYENA - const u32 gMonFrontPic_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/anim_front.4bpp.lz"); - const u32 gMonPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/normal.gbapal.lz"); - const u32 gMonBackPic_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/back.4bpp.lz"); - const u32 gMonShinyPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/shiny.gbapal.lz"); - const u8 gMonIcon_Poochyena[] = INCBIN_U8("graphics/pokemon/poochyena/icon.4bpp"); + const u32 gMonFrontPic_Poochyena[] = INCBIN_U32("graphics/pokemon/gen_3/poochyena/anim_front.4bpp.lz"); + const u32 gMonPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/gen_3/poochyena/normal.gbapal.lz"); + const u32 gMonBackPic_Poochyena[] = INCBIN_U32("graphics/pokemon/gen_3/poochyena/back.4bpp.lz"); + const u32 gMonShinyPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/gen_3/poochyena/shiny.gbapal.lz"); + const u8 gMonIcon_Poochyena[] = INCBIN_U8("graphics/pokemon/gen_3/poochyena/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Poochyena[] = INCBIN_U8("graphics/pokemon/poochyena/footprint.1bpp"); + const u8 gMonFootprint_Poochyena[] = INCBIN_U8("graphics/pokemon/gen_3/poochyena/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/anim_front.4bpp.lz"); - const u32 gMonPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/normal.gbapal.lz"); - const u32 gMonBackPic_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/back.4bpp.lz"); - const u32 gMonShinyPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/shiny.gbapal.lz"); - const u8 gMonIcon_Mightyena[] = INCBIN_U8("graphics/pokemon/mightyena/icon.4bpp"); + const u32 gMonFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/gen_3/mightyena/anim_front.4bpp.lz"); + const u32 gMonPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/gen_3/mightyena/normal.gbapal.lz"); + const u32 gMonBackPic_Mightyena[] = INCBIN_U32("graphics/pokemon/gen_3/mightyena/back.4bpp.lz"); + const u32 gMonShinyPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/gen_3/mightyena/shiny.gbapal.lz"); + const u8 gMonIcon_Mightyena[] = INCBIN_U8("graphics/pokemon/gen_3/mightyena/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mightyena[] = INCBIN_U8("graphics/pokemon/mightyena/footprint.1bpp"); + const u8 gMonFootprint_Mightyena[] = INCBIN_U8("graphics/pokemon/gen_3/mightyena/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_POOCHYENA #if P_FAMILY_ZIGZAGOON - const u32 gMonFrontPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/anim_front.4bpp.lz"); - const u32 gMonPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/normal.gbapal.lz"); - const u32 gMonBackPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/back.4bpp.lz"); - const u32 gMonShinyPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/shiny.gbapal.lz"); - const u8 gMonIcon_Zigzagoon[] = INCBIN_U8("graphics/pokemon/zigzagoon/icon.4bpp"); + const u32 gMonFrontPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/anim_front.4bpp.lz"); + const u32 gMonPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/normal.gbapal.lz"); + const u32 gMonBackPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/back.4bpp.lz"); + const u32 gMonShinyPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/shiny.gbapal.lz"); + const u8 gMonIcon_Zigzagoon[] = INCBIN_U8("graphics/pokemon/gen_3/zigzagoon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Zigzagoon[] = INCBIN_U8("graphics/pokemon/zigzagoon/footprint.1bpp"); + const u8 gMonFootprint_Zigzagoon[] = INCBIN_U8("graphics/pokemon/gen_3/zigzagoon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/anim_front.4bpp.lz"); - const u32 gMonPalette_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/normal.gbapal.lz"); - const u32 gMonBackPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/back.4bpp.lz"); - const u32 gMonShinyPalette_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/shiny.gbapal.lz"); - const u8 gMonIcon_Linoone[] = INCBIN_U8("graphics/pokemon/linoone/icon.4bpp"); + const u32 gMonFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/anim_front.4bpp.lz"); + const u32 gMonPalette_Linoone[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/normal.gbapal.lz"); + const u32 gMonBackPic_Linoone[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/back.4bpp.lz"); + const u32 gMonShinyPalette_Linoone[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/shiny.gbapal.lz"); + const u8 gMonIcon_Linoone[] = INCBIN_U8("graphics/pokemon/gen_3/linoone/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Linoone[] = INCBIN_U8("graphics/pokemon/linoone/footprint.1bpp"); + const u8 gMonFootprint_Linoone[] = INCBIN_U8("graphics/pokemon/gen_3/linoone/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/front.4bpp.lz"); - const u32 gMonPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_ZigzagoonGalarian[] = INCBIN_U8("graphics/pokemon/zigzagoon/galarian/icon.4bpp"); + const u32 gMonFrontPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/galarian/front.4bpp.lz"); + const u32 gMonPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/zigzagoon/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_ZigzagoonGalarian[] = INCBIN_U8("graphics/pokemon/gen_3/zigzagoon/galarian/icon.4bpp"); - const u32 gMonFrontPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/front.4bpp.lz"); - const u32 gMonPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_LinooneGalarian[] = INCBIN_U8("graphics/pokemon/linoone/galarian/icon.4bpp"); + const u32 gMonFrontPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/galarian/front.4bpp.lz"); + const u32 gMonPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/gen_3/linoone/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_LinooneGalarian[] = INCBIN_U8("graphics/pokemon/gen_3/linoone/galarian/icon.4bpp"); - const u32 gMonFrontPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/front.4bpp.lz"); - const u32 gMonPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/normal.gbapal.lz"); - const u32 gMonBackPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/back.4bpp.lz"); - const u32 gMonShinyPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/shiny.gbapal.lz"); - const u8 gMonIcon_Obstagoon[] = INCBIN_U8("graphics/pokemon/obstagoon/icon.4bpp"); + const u32 gMonFrontPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/gen_8/obstagoon/front.4bpp.lz"); + const u32 gMonPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/gen_8/obstagoon/normal.gbapal.lz"); + const u32 gMonBackPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/gen_8/obstagoon/back.4bpp.lz"); + const u32 gMonShinyPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/gen_8/obstagoon/shiny.gbapal.lz"); + const u8 gMonIcon_Obstagoon[] = INCBIN_U8("graphics/pokemon/gen_8/obstagoon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Obstagoon[] = INCBIN_U8("graphics/pokemon/obstagoon/footprint.1bpp"); + const u8 gMonFootprint_Obstagoon[] = INCBIN_U8("graphics/pokemon/gen_8/obstagoon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZIGZAGOON #if P_FAMILY_WURMPLE - const u32 gMonFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/anim_front.4bpp.lz"); - const u32 gMonPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/normal.gbapal.lz"); - const u32 gMonBackPic_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/back.4bpp.lz"); - const u32 gMonShinyPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/shiny.gbapal.lz"); - const u8 gMonIcon_Wurmple[] = INCBIN_U8("graphics/pokemon/wurmple/icon.4bpp"); + const u32 gMonFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/gen_3/wurmple/anim_front.4bpp.lz"); + const u32 gMonPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/gen_3/wurmple/normal.gbapal.lz"); + const u32 gMonBackPic_Wurmple[] = INCBIN_U32("graphics/pokemon/gen_3/wurmple/back.4bpp.lz"); + const u32 gMonShinyPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/gen_3/wurmple/shiny.gbapal.lz"); + const u8 gMonIcon_Wurmple[] = INCBIN_U8("graphics/pokemon/gen_3/wurmple/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Wurmple[] = INCBIN_U8("graphics/pokemon/wurmple/footprint.1bpp"); + const u8 gMonFootprint_Wurmple[] = INCBIN_U8("graphics/pokemon/gen_3/wurmple/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/anim_front.4bpp.lz"); - const u32 gMonPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/normal.gbapal.lz"); - const u32 gMonBackPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/back.4bpp.lz"); - const u32 gMonShinyPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/shiny.gbapal.lz"); - const u8 gMonIcon_Silcoon[] = INCBIN_U8("graphics/pokemon/silcoon/icon.4bpp"); + const u32 gMonFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/gen_3/silcoon/anim_front.4bpp.lz"); + const u32 gMonPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/gen_3/silcoon/normal.gbapal.lz"); + const u32 gMonBackPic_Silcoon[] = INCBIN_U32("graphics/pokemon/gen_3/silcoon/back.4bpp.lz"); + const u32 gMonShinyPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/gen_3/silcoon/shiny.gbapal.lz"); + const u8 gMonIcon_Silcoon[] = INCBIN_U8("graphics/pokemon/gen_3/silcoon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Silcoon[] = INCBIN_U8("graphics/pokemon/silcoon/footprint.1bpp"); + const u8 gMonFootprint_Silcoon[] = INCBIN_U8("graphics/pokemon/gen_3/silcoon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/anim_front.4bpp.lz"); - const u32 gMonPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/normal.gbapal.lz"); - const u32 gMonBackPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/back.4bpp.lz"); - const u32 gMonShinyPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/shiny.gbapal.lz"); - const u8 gMonIcon_Beautifly[] = INCBIN_U8("graphics/pokemon/beautifly/icon.4bpp"); + const u32 gMonFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/gen_3/beautifly/anim_front.4bpp.lz"); + const u32 gMonPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/gen_3/beautifly/normal.gbapal.lz"); + const u32 gMonBackPic_Beautifly[] = INCBIN_U32("graphics/pokemon/gen_3/beautifly/back.4bpp.lz"); + const u32 gMonShinyPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/gen_3/beautifly/shiny.gbapal.lz"); + const u8 gMonIcon_Beautifly[] = INCBIN_U8("graphics/pokemon/gen_3/beautifly/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Beautifly[] = INCBIN_U8("graphics/pokemon/beautifly/footprint.1bpp"); + const u8 gMonFootprint_Beautifly[] = INCBIN_U8("graphics/pokemon/gen_3/beautifly/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_BeautiflyF[] = INCBIN_U32("graphics/pokemon/beautifly/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_BeautiflyF[] = INCBIN_U32("graphics/pokemon/beautifly/backf.4bpp.lz"); + const u32 gMonFrontPic_BeautiflyF[] = INCBIN_U32("graphics/pokemon/gen_3/beautifly/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_BeautiflyF[] = INCBIN_U32("graphics/pokemon/gen_3/beautifly/backf.4bpp.lz"); - const u32 gMonFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/anim_front.4bpp.lz"); - const u32 gMonPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/normal.gbapal.lz"); - const u32 gMonBackPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/back.4bpp.lz"); - const u32 gMonShinyPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/shiny.gbapal.lz"); - const u8 gMonIcon_Cascoon[] = INCBIN_U8("graphics/pokemon/cascoon/icon.4bpp"); + const u32 gMonFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/gen_3/cascoon/anim_front.4bpp.lz"); + const u32 gMonPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/gen_3/cascoon/normal.gbapal.lz"); + const u32 gMonBackPic_Cascoon[] = INCBIN_U32("graphics/pokemon/gen_3/cascoon/back.4bpp.lz"); + const u32 gMonShinyPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/gen_3/cascoon/shiny.gbapal.lz"); + const u8 gMonIcon_Cascoon[] = INCBIN_U8("graphics/pokemon/gen_3/cascoon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cascoon[] = INCBIN_U8("graphics/pokemon/cascoon/footprint.1bpp"); + const u8 gMonFootprint_Cascoon[] = INCBIN_U8("graphics/pokemon/gen_3/cascoon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/anim_front.4bpp.lz"); - const u32 gMonPalette_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/normal.gbapal.lz"); - const u32 gMonBackPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/back.4bpp.lz"); - const u32 gMonShinyPalette_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/shiny.gbapal.lz"); - const u8 gMonIcon_Dustox[] = INCBIN_U8("graphics/pokemon/dustox/icon.4bpp"); + const u32 gMonFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/gen_3/dustox/anim_front.4bpp.lz"); + const u32 gMonPalette_Dustox[] = INCBIN_U32("graphics/pokemon/gen_3/dustox/normal.gbapal.lz"); + const u32 gMonBackPic_Dustox[] = INCBIN_U32("graphics/pokemon/gen_3/dustox/back.4bpp.lz"); + const u32 gMonShinyPalette_Dustox[] = INCBIN_U32("graphics/pokemon/gen_3/dustox/shiny.gbapal.lz"); + const u8 gMonIcon_Dustox[] = INCBIN_U8("graphics/pokemon/gen_3/dustox/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dustox[] = INCBIN_U8("graphics/pokemon/dustox/footprint.1bpp"); + const u8 gMonFootprint_Dustox[] = INCBIN_U8("graphics/pokemon/gen_3/dustox/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_DustoxF[] = INCBIN_U32("graphics/pokemon/dustox/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_DustoxF[] = INCBIN_U32("graphics/pokemon/dustox/backf.4bpp.lz"); + const u32 gMonFrontPic_DustoxF[] = INCBIN_U32("graphics/pokemon/gen_3/dustox/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_DustoxF[] = INCBIN_U32("graphics/pokemon/gen_3/dustox/backf.4bpp.lz"); #endif //P_FAMILY_WURMPLE #if P_FAMILY_LOTAD - const u32 gMonFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/anim_front.4bpp.lz"); - const u32 gMonPalette_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/normal.gbapal.lz"); - const u32 gMonBackPic_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/back.4bpp.lz"); - const u32 gMonShinyPalette_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/shiny.gbapal.lz"); - const u8 gMonIcon_Lotad[] = INCBIN_U8("graphics/pokemon/lotad/icon.4bpp"); + const u32 gMonFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/gen_3/lotad/anim_front.4bpp.lz"); + const u32 gMonPalette_Lotad[] = INCBIN_U32("graphics/pokemon/gen_3/lotad/normal.gbapal.lz"); + const u32 gMonBackPic_Lotad[] = INCBIN_U32("graphics/pokemon/gen_3/lotad/back.4bpp.lz"); + const u32 gMonShinyPalette_Lotad[] = INCBIN_U32("graphics/pokemon/gen_3/lotad/shiny.gbapal.lz"); + const u8 gMonIcon_Lotad[] = INCBIN_U8("graphics/pokemon/gen_3/lotad/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lotad[] = INCBIN_U8("graphics/pokemon/lotad/footprint.1bpp"); + const u8 gMonFootprint_Lotad[] = INCBIN_U8("graphics/pokemon/gen_3/lotad/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/anim_front.4bpp.lz"); - const u32 gMonPalette_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/normal.gbapal.lz"); - const u32 gMonBackPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/back.4bpp.lz"); - const u32 gMonShinyPalette_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/shiny.gbapal.lz"); - const u8 gMonIcon_Lombre[] = INCBIN_U8("graphics/pokemon/lombre/icon.4bpp"); + const u32 gMonFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/gen_3/lombre/anim_front.4bpp.lz"); + const u32 gMonPalette_Lombre[] = INCBIN_U32("graphics/pokemon/gen_3/lombre/normal.gbapal.lz"); + const u32 gMonBackPic_Lombre[] = INCBIN_U32("graphics/pokemon/gen_3/lombre/back.4bpp.lz"); + const u32 gMonShinyPalette_Lombre[] = INCBIN_U32("graphics/pokemon/gen_3/lombre/shiny.gbapal.lz"); + const u8 gMonIcon_Lombre[] = INCBIN_U8("graphics/pokemon/gen_3/lombre/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lombre[] = INCBIN_U8("graphics/pokemon/lombre/footprint.1bpp"); + const u8 gMonFootprint_Lombre[] = INCBIN_U8("graphics/pokemon/gen_3/lombre/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/anim_front.4bpp.lz"); - const u32 gMonPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/normal.gbapal.lz"); - const u32 gMonBackPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/back.4bpp.lz"); - const u32 gMonShinyPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/shiny.gbapal.lz"); - const u8 gMonIcon_Ludicolo[] = INCBIN_U8("graphics/pokemon/ludicolo/icon.4bpp"); + const u32 gMonFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/gen_3/ludicolo/anim_front.4bpp.lz"); + const u32 gMonPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/gen_3/ludicolo/normal.gbapal.lz"); + const u32 gMonBackPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/gen_3/ludicolo/back.4bpp.lz"); + const u32 gMonShinyPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/gen_3/ludicolo/shiny.gbapal.lz"); + const u8 gMonIcon_Ludicolo[] = INCBIN_U8("graphics/pokemon/gen_3/ludicolo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ludicolo[] = INCBIN_U8("graphics/pokemon/ludicolo/footprint.1bpp"); + const u8 gMonFootprint_Ludicolo[] = INCBIN_U8("graphics/pokemon/gen_3/ludicolo/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_LudicoloF[] = INCBIN_U32("graphics/pokemon/ludicolo/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_LudicoloF[] = INCBIN_U32("graphics/pokemon/ludicolo/backf.4bpp.lz"); + const u32 gMonFrontPic_LudicoloF[] = INCBIN_U32("graphics/pokemon/gen_3/ludicolo/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_LudicoloF[] = INCBIN_U32("graphics/pokemon/gen_3/ludicolo/backf.4bpp.lz"); #endif //P_FAMILY_LOTAD #if P_FAMILY_SEEDOT - const u32 gMonFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/anim_front.4bpp.lz"); - const u32 gMonPalette_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/normal.gbapal.lz"); - const u32 gMonBackPic_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/back.4bpp.lz"); - const u32 gMonShinyPalette_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/shiny.gbapal.lz"); - const u8 gMonIcon_Seedot[] = INCBIN_U8("graphics/pokemon/seedot/icon.4bpp"); + const u32 gMonFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/gen_3/seedot/anim_front.4bpp.lz"); + const u32 gMonPalette_Seedot[] = INCBIN_U32("graphics/pokemon/gen_3/seedot/normal.gbapal.lz"); + const u32 gMonBackPic_Seedot[] = INCBIN_U32("graphics/pokemon/gen_3/seedot/back.4bpp.lz"); + const u32 gMonShinyPalette_Seedot[] = INCBIN_U32("graphics/pokemon/gen_3/seedot/shiny.gbapal.lz"); + const u8 gMonIcon_Seedot[] = INCBIN_U8("graphics/pokemon/gen_3/seedot/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Seedot[] = INCBIN_U8("graphics/pokemon/seedot/footprint.1bpp"); + const u8 gMonFootprint_Seedot[] = INCBIN_U8("graphics/pokemon/gen_3/seedot/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/anim_front.4bpp.lz"); - const u32 gMonPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/normal.gbapal.lz"); - const u32 gMonBackPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/back.4bpp.lz"); - const u32 gMonShinyPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/shiny.gbapal.lz"); - const u8 gMonIcon_Nuzleaf[] = INCBIN_U8("graphics/pokemon/nuzleaf/icon.4bpp"); + const u32 gMonFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/gen_3/nuzleaf/anim_front.4bpp.lz"); + const u32 gMonPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/gen_3/nuzleaf/normal.gbapal.lz"); + const u32 gMonBackPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/gen_3/nuzleaf/back.4bpp.lz"); + const u32 gMonShinyPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/gen_3/nuzleaf/shiny.gbapal.lz"); + const u8 gMonIcon_Nuzleaf[] = INCBIN_U8("graphics/pokemon/gen_3/nuzleaf/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Nuzleaf[] = INCBIN_U8("graphics/pokemon/nuzleaf/footprint.1bpp"); + const u8 gMonFootprint_Nuzleaf[] = INCBIN_U8("graphics/pokemon/gen_3/nuzleaf/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_NuzleafF[] = INCBIN_U32("graphics/pokemon/nuzleaf/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_NuzleafF[] = INCBIN_U32("graphics/pokemon/nuzleaf/backf.4bpp.lz"); + const u32 gMonFrontPic_NuzleafF[] = INCBIN_U32("graphics/pokemon/gen_3/nuzleaf/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_NuzleafF[] = INCBIN_U32("graphics/pokemon/gen_3/nuzleaf/backf.4bpp.lz"); - const u32 gMonFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/anim_front.4bpp.lz"); - const u32 gMonPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/normal.gbapal.lz"); - const u32 gMonBackPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/back.4bpp.lz"); - const u32 gMonShinyPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/shiny.gbapal.lz"); - const u8 gMonIcon_Shiftry[] = INCBIN_U8("graphics/pokemon/shiftry/icon.4bpp"); + const u32 gMonFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/gen_3/shiftry/anim_front.4bpp.lz"); + const u32 gMonPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/gen_3/shiftry/normal.gbapal.lz"); + const u32 gMonBackPic_Shiftry[] = INCBIN_U32("graphics/pokemon/gen_3/shiftry/back.4bpp.lz"); + const u32 gMonShinyPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/gen_3/shiftry/shiny.gbapal.lz"); + const u8 gMonIcon_Shiftry[] = INCBIN_U8("graphics/pokemon/gen_3/shiftry/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Shiftry[] = INCBIN_U8("graphics/pokemon/shiftry/footprint.1bpp"); + const u8 gMonFootprint_Shiftry[] = INCBIN_U8("graphics/pokemon/gen_3/shiftry/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ShiftryF[] = INCBIN_U32("graphics/pokemon/shiftry/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_ShiftryF[] = INCBIN_U32("graphics/pokemon/shiftry/backf.4bpp.lz"); + const u32 gMonFrontPic_ShiftryF[] = INCBIN_U32("graphics/pokemon/gen_3/shiftry/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_ShiftryF[] = INCBIN_U32("graphics/pokemon/gen_3/shiftry/backf.4bpp.lz"); #endif //P_FAMILY_SEEDOT #if P_FAMILY_TAILLOW - const u32 gMonFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/anim_front.4bpp.lz"); - const u32 gMonPalette_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/normal.gbapal.lz"); - const u32 gMonBackPic_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/back.4bpp.lz"); - const u32 gMonShinyPalette_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/shiny.gbapal.lz"); - const u8 gMonIcon_Taillow[] = INCBIN_U8("graphics/pokemon/taillow/icon.4bpp"); + const u32 gMonFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/gen_3/taillow/anim_front.4bpp.lz"); + const u32 gMonPalette_Taillow[] = INCBIN_U32("graphics/pokemon/gen_3/taillow/normal.gbapal.lz"); + const u32 gMonBackPic_Taillow[] = INCBIN_U32("graphics/pokemon/gen_3/taillow/back.4bpp.lz"); + const u32 gMonShinyPalette_Taillow[] = INCBIN_U32("graphics/pokemon/gen_3/taillow/shiny.gbapal.lz"); + const u8 gMonIcon_Taillow[] = INCBIN_U8("graphics/pokemon/gen_3/taillow/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Taillow[] = INCBIN_U8("graphics/pokemon/taillow/footprint.1bpp"); + const u8 gMonFootprint_Taillow[] = INCBIN_U8("graphics/pokemon/gen_3/taillow/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/anim_front.4bpp.lz"); - const u32 gMonPalette_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/normal.gbapal.lz"); - const u32 gMonBackPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/back.4bpp.lz"); - const u32 gMonShinyPalette_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/shiny.gbapal.lz"); - const u8 gMonIcon_Swellow[] = INCBIN_U8("graphics/pokemon/swellow/icon.4bpp"); + const u32 gMonFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/gen_3/swellow/anim_front.4bpp.lz"); + const u32 gMonPalette_Swellow[] = INCBIN_U32("graphics/pokemon/gen_3/swellow/normal.gbapal.lz"); + const u32 gMonBackPic_Swellow[] = INCBIN_U32("graphics/pokemon/gen_3/swellow/back.4bpp.lz"); + const u32 gMonShinyPalette_Swellow[] = INCBIN_U32("graphics/pokemon/gen_3/swellow/shiny.gbapal.lz"); + const u8 gMonIcon_Swellow[] = INCBIN_U8("graphics/pokemon/gen_3/swellow/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Swellow[] = INCBIN_U8("graphics/pokemon/swellow/footprint.1bpp"); + const u8 gMonFootprint_Swellow[] = INCBIN_U8("graphics/pokemon/gen_3/swellow/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TAILLOW #if P_FAMILY_WINGULL - const u32 gMonFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/anim_front.4bpp.lz"); - const u32 gMonPalette_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/normal.gbapal.lz"); - const u32 gMonBackPic_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/back.4bpp.lz"); - const u32 gMonShinyPalette_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/shiny.gbapal.lz"); - const u8 gMonIcon_Wingull[] = INCBIN_U8("graphics/pokemon/wingull/icon.4bpp"); + const u32 gMonFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/gen_3/wingull/anim_front.4bpp.lz"); + const u32 gMonPalette_Wingull[] = INCBIN_U32("graphics/pokemon/gen_3/wingull/normal.gbapal.lz"); + const u32 gMonBackPic_Wingull[] = INCBIN_U32("graphics/pokemon/gen_3/wingull/back.4bpp.lz"); + const u32 gMonShinyPalette_Wingull[] = INCBIN_U32("graphics/pokemon/gen_3/wingull/shiny.gbapal.lz"); + const u8 gMonIcon_Wingull[] = INCBIN_U8("graphics/pokemon/gen_3/wingull/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Wingull[] = INCBIN_U8("graphics/pokemon/wingull/footprint.1bpp"); + const u8 gMonFootprint_Wingull[] = INCBIN_U8("graphics/pokemon/gen_3/wingull/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/anim_front.4bpp.lz"); - const u32 gMonPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/normal.gbapal.lz"); - const u32 gMonBackPic_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/back.4bpp.lz"); - const u32 gMonShinyPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/shiny.gbapal.lz"); - const u8 gMonIcon_Pelipper[] = INCBIN_U8("graphics/pokemon/pelipper/icon.4bpp"); + const u32 gMonFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/gen_3/pelipper/anim_front.4bpp.lz"); + const u32 gMonPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/gen_3/pelipper/normal.gbapal.lz"); + const u32 gMonBackPic_Pelipper[] = INCBIN_U32("graphics/pokemon/gen_3/pelipper/back.4bpp.lz"); + const u32 gMonShinyPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/gen_3/pelipper/shiny.gbapal.lz"); + const u8 gMonIcon_Pelipper[] = INCBIN_U8("graphics/pokemon/gen_3/pelipper/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pelipper[] = INCBIN_U8("graphics/pokemon/pelipper/footprint.1bpp"); + const u8 gMonFootprint_Pelipper[] = INCBIN_U8("graphics/pokemon/gen_3/pelipper/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_WINGULL #if P_FAMILY_RALTS - const u32 gMonFrontPic_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/anim_front.4bpp.lz"); - const u32 gMonPalette_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/normal.gbapal.lz"); - const u32 gMonBackPic_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/back.4bpp.lz"); - const u32 gMonShinyPalette_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/shiny.gbapal.lz"); - const u8 gMonIcon_Ralts[] = INCBIN_U8("graphics/pokemon/ralts/icon.4bpp"); + const u32 gMonFrontPic_Ralts[] = INCBIN_U32("graphics/pokemon/gen_3/ralts/anim_front.4bpp.lz"); + const u32 gMonPalette_Ralts[] = INCBIN_U32("graphics/pokemon/gen_3/ralts/normal.gbapal.lz"); + const u32 gMonBackPic_Ralts[] = INCBIN_U32("graphics/pokemon/gen_3/ralts/back.4bpp.lz"); + const u32 gMonShinyPalette_Ralts[] = INCBIN_U32("graphics/pokemon/gen_3/ralts/shiny.gbapal.lz"); + const u8 gMonIcon_Ralts[] = INCBIN_U8("graphics/pokemon/gen_3/ralts/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ralts[] = INCBIN_U8("graphics/pokemon/ralts/footprint.1bpp"); + const u8 gMonFootprint_Ralts[] = INCBIN_U8("graphics/pokemon/gen_3/ralts/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/anim_front.4bpp.lz"); - const u32 gMonPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/normal.gbapal.lz"); - const u32 gMonBackPic_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/back.4bpp.lz"); - const u32 gMonShinyPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/shiny.gbapal.lz"); - const u8 gMonIcon_Kirlia[] = INCBIN_U8("graphics/pokemon/kirlia/icon.4bpp"); + const u32 gMonFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/gen_3/kirlia/anim_front.4bpp.lz"); + const u32 gMonPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/gen_3/kirlia/normal.gbapal.lz"); + const u32 gMonBackPic_Kirlia[] = INCBIN_U32("graphics/pokemon/gen_3/kirlia/back.4bpp.lz"); + const u32 gMonShinyPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/gen_3/kirlia/shiny.gbapal.lz"); + const u8 gMonIcon_Kirlia[] = INCBIN_U8("graphics/pokemon/gen_3/kirlia/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kirlia[] = INCBIN_U8("graphics/pokemon/kirlia/footprint.1bpp"); + const u8 gMonFootprint_Kirlia[] = INCBIN_U8("graphics/pokemon/gen_3/kirlia/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/anim_front.4bpp.lz"); - const u32 gMonPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/normal.gbapal.lz"); - const u32 gMonBackPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/back.4bpp.lz"); - const u32 gMonShinyPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/shiny.gbapal.lz"); - const u8 gMonIcon_Gardevoir[] = INCBIN_U8("graphics/pokemon/gardevoir/icon.4bpp"); + const u32 gMonFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/anim_front.4bpp.lz"); + const u32 gMonPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/normal.gbapal.lz"); + const u32 gMonBackPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/back.4bpp.lz"); + const u32 gMonShinyPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/shiny.gbapal.lz"); + const u8 gMonIcon_Gardevoir[] = INCBIN_U8("graphics/pokemon/gen_3/gardevoir/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gardevoir[] = INCBIN_U8("graphics/pokemon/gardevoir/footprint.1bpp"); + const u8 gMonFootprint_Gardevoir[] = INCBIN_U8("graphics/pokemon/gen_3/gardevoir/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/front.4bpp.lz"); - const u32 gMonPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/normal.gbapal.lz"); - const u32 gMonBackPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/shiny.gbapal.lz"); - const u8 gMonIcon_GardevoirMega[] = INCBIN_U8("graphics/pokemon/gardevoir/mega/icon.4bpp"); + const u32 gMonFrontPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/mega/front.4bpp.lz"); + const u32 gMonPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/mega/normal.gbapal.lz"); + const u32 gMonBackPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gen_3/gardevoir/mega/shiny.gbapal.lz"); + const u8 gMonIcon_GardevoirMega[] = INCBIN_U8("graphics/pokemon/gen_3/gardevoir/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/anim_front.4bpp.lz"); - const u32 gMonPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/normal.gbapal.lz"); - const u32 gMonBackPic_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/back.4bpp.lz"); - const u32 gMonShinyPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/shiny.gbapal.lz"); - const u8 gMonIcon_Gallade[] = INCBIN_U8("graphics/pokemon/gallade/icon.4bpp"); + const u32 gMonFrontPic_Gallade[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/anim_front.4bpp.lz"); + const u32 gMonPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/normal.gbapal.lz"); + const u32 gMonBackPic_Gallade[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/back.4bpp.lz"); + const u32 gMonShinyPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/shiny.gbapal.lz"); + const u8 gMonIcon_Gallade[] = INCBIN_U8("graphics/pokemon/gen_4/gallade/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gallade[] = INCBIN_U8("graphics/pokemon/gallade/footprint.1bpp"); + const u8 gMonFootprint_Gallade[] = INCBIN_U8("graphics/pokemon/gen_4/gallade/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/front.4bpp.lz"); - const u32 gMonPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/normal.gbapal.lz"); - const u32 gMonBackPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/shiny.gbapal.lz"); - const u8 gMonIcon_GalladeMega[] = INCBIN_U8("graphics/pokemon/gallade/mega/icon.4bpp"); + const u32 gMonFrontPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/mega/front.4bpp.lz"); + const u32 gMonPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/mega/normal.gbapal.lz"); + const u32 gMonBackPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gen_4/gallade/mega/shiny.gbapal.lz"); + const u8 gMonIcon_GalladeMega[] = INCBIN_U8("graphics/pokemon/gen_4/gallade/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_RALTS #if P_FAMILY_SURSKIT - const u32 gMonFrontPic_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/anim_front.4bpp.lz"); - const u32 gMonPalette_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/normal.gbapal.lz"); - const u32 gMonBackPic_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/back.4bpp.lz"); - const u32 gMonShinyPalette_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/shiny.gbapal.lz"); - const u8 gMonIcon_Surskit[] = INCBIN_U8("graphics/pokemon/surskit/icon.4bpp"); + const u32 gMonFrontPic_Surskit[] = INCBIN_U32("graphics/pokemon/gen_3/surskit/anim_front.4bpp.lz"); + const u32 gMonPalette_Surskit[] = INCBIN_U32("graphics/pokemon/gen_3/surskit/normal.gbapal.lz"); + const u32 gMonBackPic_Surskit[] = INCBIN_U32("graphics/pokemon/gen_3/surskit/back.4bpp.lz"); + const u32 gMonShinyPalette_Surskit[] = INCBIN_U32("graphics/pokemon/gen_3/surskit/shiny.gbapal.lz"); + const u8 gMonIcon_Surskit[] = INCBIN_U8("graphics/pokemon/gen_3/surskit/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Surskit[] = INCBIN_U8("graphics/pokemon/surskit/footprint.1bpp"); + const u8 gMonFootprint_Surskit[] = INCBIN_U8("graphics/pokemon/gen_3/surskit/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/anim_front.4bpp.lz"); - const u32 gMonPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/normal.gbapal.lz"); - const u32 gMonBackPic_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/back.4bpp.lz"); - const u32 gMonShinyPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/shiny.gbapal.lz"); - const u8 gMonIcon_Masquerain[] = INCBIN_U8("graphics/pokemon/masquerain/icon.4bpp"); + const u32 gMonFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/gen_3/masquerain/anim_front.4bpp.lz"); + const u32 gMonPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/gen_3/masquerain/normal.gbapal.lz"); + const u32 gMonBackPic_Masquerain[] = INCBIN_U32("graphics/pokemon/gen_3/masquerain/back.4bpp.lz"); + const u32 gMonShinyPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/gen_3/masquerain/shiny.gbapal.lz"); + const u8 gMonIcon_Masquerain[] = INCBIN_U8("graphics/pokemon/gen_3/masquerain/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Masquerain[] = INCBIN_U8("graphics/pokemon/masquerain/footprint.1bpp"); + const u8 gMonFootprint_Masquerain[] = INCBIN_U8("graphics/pokemon/gen_3/masquerain/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SURSKIT #if P_FAMILY_SHROOMISH - const u32 gMonFrontPic_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/anim_front.4bpp.lz"); - const u32 gMonPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/normal.gbapal.lz"); - const u32 gMonBackPic_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/back.4bpp.lz"); - const u32 gMonShinyPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/shiny.gbapal.lz"); - const u8 gMonIcon_Shroomish[] = INCBIN_U8("graphics/pokemon/shroomish/icon.4bpp"); + const u32 gMonFrontPic_Shroomish[] = INCBIN_U32("graphics/pokemon/gen_3/shroomish/anim_front.4bpp.lz"); + const u32 gMonPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/gen_3/shroomish/normal.gbapal.lz"); + const u32 gMonBackPic_Shroomish[] = INCBIN_U32("graphics/pokemon/gen_3/shroomish/back.4bpp.lz"); + const u32 gMonShinyPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/gen_3/shroomish/shiny.gbapal.lz"); + const u8 gMonIcon_Shroomish[] = INCBIN_U8("graphics/pokemon/gen_3/shroomish/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Shroomish[] = INCBIN_U8("graphics/pokemon/shroomish/footprint.1bpp"); + const u8 gMonFootprint_Shroomish[] = INCBIN_U8("graphics/pokemon/gen_3/shroomish/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/anim_front.4bpp.lz"); - const u32 gMonPalette_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/normal.gbapal.lz"); - const u32 gMonBackPic_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/back.4bpp.lz"); - const u32 gMonShinyPalette_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/shiny.gbapal.lz"); - const u8 gMonIcon_Breloom[] = INCBIN_U8("graphics/pokemon/breloom/icon.4bpp"); + const u32 gMonFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/gen_3/breloom/anim_front.4bpp.lz"); + const u32 gMonPalette_Breloom[] = INCBIN_U32("graphics/pokemon/gen_3/breloom/normal.gbapal.lz"); + const u32 gMonBackPic_Breloom[] = INCBIN_U32("graphics/pokemon/gen_3/breloom/back.4bpp.lz"); + const u32 gMonShinyPalette_Breloom[] = INCBIN_U32("graphics/pokemon/gen_3/breloom/shiny.gbapal.lz"); + const u8 gMonIcon_Breloom[] = INCBIN_U8("graphics/pokemon/gen_3/breloom/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Breloom[] = INCBIN_U8("graphics/pokemon/breloom/footprint.1bpp"); + const u8 gMonFootprint_Breloom[] = INCBIN_U8("graphics/pokemon/gen_3/breloom/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SHROOMISH #if P_FAMILY_SLAKOTH - const u32 gMonFrontPic_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/anim_front.4bpp.lz"); - const u32 gMonPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/normal.gbapal.lz"); - const u32 gMonBackPic_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/back.4bpp.lz"); - const u32 gMonShinyPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/shiny.gbapal.lz"); - const u8 gMonIcon_Slakoth[] = INCBIN_U8("graphics/pokemon/slakoth/icon.4bpp"); + const u32 gMonFrontPic_Slakoth[] = INCBIN_U32("graphics/pokemon/gen_3/slakoth/anim_front.4bpp.lz"); + const u32 gMonPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/gen_3/slakoth/normal.gbapal.lz"); + const u32 gMonBackPic_Slakoth[] = INCBIN_U32("graphics/pokemon/gen_3/slakoth/back.4bpp.lz"); + const u32 gMonShinyPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/gen_3/slakoth/shiny.gbapal.lz"); + const u8 gMonIcon_Slakoth[] = INCBIN_U8("graphics/pokemon/gen_3/slakoth/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Slakoth[] = INCBIN_U8("graphics/pokemon/slakoth/footprint.1bpp"); + const u8 gMonFootprint_Slakoth[] = INCBIN_U8("graphics/pokemon/gen_3/slakoth/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/anim_front.4bpp.lz"); - const u32 gMonPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/normal.gbapal.lz"); - const u32 gMonBackPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/back.4bpp.lz"); - const u32 gMonShinyPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/shiny.gbapal.lz"); - const u8 gMonIcon_Vigoroth[] = INCBIN_U8("graphics/pokemon/vigoroth/icon.4bpp"); + const u32 gMonFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/gen_3/vigoroth/anim_front.4bpp.lz"); + const u32 gMonPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/gen_3/vigoroth/normal.gbapal.lz"); + const u32 gMonBackPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/gen_3/vigoroth/back.4bpp.lz"); + const u32 gMonShinyPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/gen_3/vigoroth/shiny.gbapal.lz"); + const u8 gMonIcon_Vigoroth[] = INCBIN_U8("graphics/pokemon/gen_3/vigoroth/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Vigoroth[] = INCBIN_U8("graphics/pokemon/vigoroth/footprint.1bpp"); + const u8 gMonFootprint_Vigoroth[] = INCBIN_U8("graphics/pokemon/gen_3/vigoroth/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/anim_front.4bpp.lz"); - const u32 gMonPalette_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/normal.gbapal.lz"); - const u32 gMonBackPic_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/back.4bpp.lz"); - const u32 gMonShinyPalette_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/shiny.gbapal.lz"); - const u8 gMonIcon_Slaking[] = INCBIN_U8("graphics/pokemon/slaking/icon.4bpp"); + const u32 gMonFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/gen_3/slaking/anim_front.4bpp.lz"); + const u32 gMonPalette_Slaking[] = INCBIN_U32("graphics/pokemon/gen_3/slaking/normal.gbapal.lz"); + const u32 gMonBackPic_Slaking[] = INCBIN_U32("graphics/pokemon/gen_3/slaking/back.4bpp.lz"); + const u32 gMonShinyPalette_Slaking[] = INCBIN_U32("graphics/pokemon/gen_3/slaking/shiny.gbapal.lz"); + const u8 gMonIcon_Slaking[] = INCBIN_U8("graphics/pokemon/gen_3/slaking/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Slaking[] = INCBIN_U8("graphics/pokemon/slaking/footprint.1bpp"); + const u8 gMonFootprint_Slaking[] = INCBIN_U8("graphics/pokemon/gen_3/slaking/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SLAKOTH #if P_FAMILY_NINCADA - const u32 gMonFrontPic_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/anim_front.4bpp.lz"); - const u32 gMonPalette_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/normal.gbapal.lz"); - const u32 gMonBackPic_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/back.4bpp.lz"); - const u32 gMonShinyPalette_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/shiny.gbapal.lz"); - const u8 gMonIcon_Nincada[] = INCBIN_U8("graphics/pokemon/nincada/icon.4bpp"); + const u32 gMonFrontPic_Nincada[] = INCBIN_U32("graphics/pokemon/gen_3/nincada/anim_front.4bpp.lz"); + const u32 gMonPalette_Nincada[] = INCBIN_U32("graphics/pokemon/gen_3/nincada/normal.gbapal.lz"); + const u32 gMonBackPic_Nincada[] = INCBIN_U32("graphics/pokemon/gen_3/nincada/back.4bpp.lz"); + const u32 gMonShinyPalette_Nincada[] = INCBIN_U32("graphics/pokemon/gen_3/nincada/shiny.gbapal.lz"); + const u8 gMonIcon_Nincada[] = INCBIN_U8("graphics/pokemon/gen_3/nincada/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Nincada[] = INCBIN_U8("graphics/pokemon/nincada/footprint.1bpp"); + const u8 gMonFootprint_Nincada[] = INCBIN_U8("graphics/pokemon/gen_3/nincada/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/anim_front.4bpp.lz"); - const u32 gMonPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/normal.gbapal.lz"); - const u32 gMonBackPic_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/back.4bpp.lz"); - const u32 gMonShinyPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/shiny.gbapal.lz"); - const u8 gMonIcon_Ninjask[] = INCBIN_U8("graphics/pokemon/ninjask/icon.4bpp"); + const u32 gMonFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/gen_3/ninjask/anim_front.4bpp.lz"); + const u32 gMonPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/gen_3/ninjask/normal.gbapal.lz"); + const u32 gMonBackPic_Ninjask[] = INCBIN_U32("graphics/pokemon/gen_3/ninjask/back.4bpp.lz"); + const u32 gMonShinyPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/gen_3/ninjask/shiny.gbapal.lz"); + const u8 gMonIcon_Ninjask[] = INCBIN_U8("graphics/pokemon/gen_3/ninjask/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ninjask[] = INCBIN_U8("graphics/pokemon/ninjask/footprint.1bpp"); + const u8 gMonFootprint_Ninjask[] = INCBIN_U8("graphics/pokemon/gen_3/ninjask/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/anim_front.4bpp.lz"); - const u32 gMonPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/normal.gbapal.lz"); - const u32 gMonBackPic_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/back.4bpp.lz"); - const u32 gMonShinyPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/shiny.gbapal.lz"); - const u8 gMonIcon_Shedinja[] = INCBIN_U8("graphics/pokemon/shedinja/icon.4bpp"); + const u32 gMonFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/gen_3/shedinja/anim_front.4bpp.lz"); + const u32 gMonPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/gen_3/shedinja/normal.gbapal.lz"); + const u32 gMonBackPic_Shedinja[] = INCBIN_U32("graphics/pokemon/gen_3/shedinja/back.4bpp.lz"); + const u32 gMonShinyPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/gen_3/shedinja/shiny.gbapal.lz"); + const u8 gMonIcon_Shedinja[] = INCBIN_U8("graphics/pokemon/gen_3/shedinja/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Shedinja[] = INCBIN_U8("graphics/pokemon/shedinja/footprint.1bpp"); + const u8 gMonFootprint_Shedinja[] = INCBIN_U8("graphics/pokemon/gen_3/shedinja/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_NINCADA #if P_FAMILY_WHISMUR - const u32 gMonFrontPic_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/anim_front.4bpp.lz"); - const u32 gMonPalette_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/normal.gbapal.lz"); - const u32 gMonBackPic_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/back.4bpp.lz"); - const u32 gMonShinyPalette_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/shiny.gbapal.lz"); - const u8 gMonIcon_Whismur[] = INCBIN_U8("graphics/pokemon/whismur/icon.4bpp"); + const u32 gMonFrontPic_Whismur[] = INCBIN_U32("graphics/pokemon/gen_3/whismur/anim_front.4bpp.lz"); + const u32 gMonPalette_Whismur[] = INCBIN_U32("graphics/pokemon/gen_3/whismur/normal.gbapal.lz"); + const u32 gMonBackPic_Whismur[] = INCBIN_U32("graphics/pokemon/gen_3/whismur/back.4bpp.lz"); + const u32 gMonShinyPalette_Whismur[] = INCBIN_U32("graphics/pokemon/gen_3/whismur/shiny.gbapal.lz"); + const u8 gMonIcon_Whismur[] = INCBIN_U8("graphics/pokemon/gen_3/whismur/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Whismur[] = INCBIN_U8("graphics/pokemon/whismur/footprint.1bpp"); + const u8 gMonFootprint_Whismur[] = INCBIN_U8("graphics/pokemon/gen_3/whismur/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/anim_front.4bpp.lz"); - const u32 gMonPalette_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/normal.gbapal.lz"); - const u32 gMonBackPic_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/back.4bpp.lz"); - const u32 gMonShinyPalette_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/shiny.gbapal.lz"); - const u8 gMonIcon_Loudred[] = INCBIN_U8("graphics/pokemon/loudred/icon.4bpp"); + const u32 gMonFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/gen_3/loudred/anim_front.4bpp.lz"); + const u32 gMonPalette_Loudred[] = INCBIN_U32("graphics/pokemon/gen_3/loudred/normal.gbapal.lz"); + const u32 gMonBackPic_Loudred[] = INCBIN_U32("graphics/pokemon/gen_3/loudred/back.4bpp.lz"); + const u32 gMonShinyPalette_Loudred[] = INCBIN_U32("graphics/pokemon/gen_3/loudred/shiny.gbapal.lz"); + const u8 gMonIcon_Loudred[] = INCBIN_U8("graphics/pokemon/gen_3/loudred/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Loudred[] = INCBIN_U8("graphics/pokemon/loudred/footprint.1bpp"); + const u8 gMonFootprint_Loudred[] = INCBIN_U8("graphics/pokemon/gen_3/loudred/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/anim_front.4bpp.lz"); - const u32 gMonPalette_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/normal.gbapal.lz"); - const u32 gMonBackPic_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/back.4bpp.lz"); - const u32 gMonShinyPalette_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/shiny.gbapal.lz"); - const u8 gMonIcon_Exploud[] = INCBIN_U8("graphics/pokemon/exploud/icon.4bpp"); + const u32 gMonFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/gen_3/exploud/anim_front.4bpp.lz"); + const u32 gMonPalette_Exploud[] = INCBIN_U32("graphics/pokemon/gen_3/exploud/normal.gbapal.lz"); + const u32 gMonBackPic_Exploud[] = INCBIN_U32("graphics/pokemon/gen_3/exploud/back.4bpp.lz"); + const u32 gMonShinyPalette_Exploud[] = INCBIN_U32("graphics/pokemon/gen_3/exploud/shiny.gbapal.lz"); + const u8 gMonIcon_Exploud[] = INCBIN_U8("graphics/pokemon/gen_3/exploud/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Exploud[] = INCBIN_U8("graphics/pokemon/exploud/footprint.1bpp"); + const u8 gMonFootprint_Exploud[] = INCBIN_U8("graphics/pokemon/gen_3/exploud/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_WHISMUR #if P_FAMILY_MAKUHITA - const u32 gMonFrontPic_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/anim_front.4bpp.lz"); - const u32 gMonPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/normal.gbapal.lz"); - const u32 gMonBackPic_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/back.4bpp.lz"); - const u32 gMonShinyPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/shiny.gbapal.lz"); - const u8 gMonIcon_Makuhita[] = INCBIN_U8("graphics/pokemon/makuhita/icon.4bpp"); + const u32 gMonFrontPic_Makuhita[] = INCBIN_U32("graphics/pokemon/gen_3/makuhita/anim_front.4bpp.lz"); + const u32 gMonPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/gen_3/makuhita/normal.gbapal.lz"); + const u32 gMonBackPic_Makuhita[] = INCBIN_U32("graphics/pokemon/gen_3/makuhita/back.4bpp.lz"); + const u32 gMonShinyPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/gen_3/makuhita/shiny.gbapal.lz"); + const u8 gMonIcon_Makuhita[] = INCBIN_U8("graphics/pokemon/gen_3/makuhita/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Makuhita[] = INCBIN_U8("graphics/pokemon/makuhita/footprint.1bpp"); + const u8 gMonFootprint_Makuhita[] = INCBIN_U8("graphics/pokemon/gen_3/makuhita/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/anim_front.4bpp.lz"); - const u32 gMonPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/normal.gbapal.lz"); - const u32 gMonBackPic_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/back.4bpp.lz"); - const u32 gMonShinyPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/shiny.gbapal.lz"); - const u8 gMonIcon_Hariyama[] = INCBIN_U8("graphics/pokemon/hariyama/icon.4bpp"); + const u32 gMonFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/gen_3/hariyama/anim_front.4bpp.lz"); + const u32 gMonPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/gen_3/hariyama/normal.gbapal.lz"); + const u32 gMonBackPic_Hariyama[] = INCBIN_U32("graphics/pokemon/gen_3/hariyama/back.4bpp.lz"); + const u32 gMonShinyPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/gen_3/hariyama/shiny.gbapal.lz"); + const u8 gMonIcon_Hariyama[] = INCBIN_U8("graphics/pokemon/gen_3/hariyama/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hariyama[] = INCBIN_U8("graphics/pokemon/hariyama/footprint.1bpp"); + const u8 gMonFootprint_Hariyama[] = INCBIN_U8("graphics/pokemon/gen_3/hariyama/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MAKUHITA #if P_FAMILY_NOSEPASS - const u32 gMonFrontPic_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/anim_front.4bpp.lz"); - const u32 gMonPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/normal.gbapal.lz"); - const u32 gMonBackPic_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/back.4bpp.lz"); - const u32 gMonShinyPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/shiny.gbapal.lz"); - const u8 gMonIcon_Nosepass[] = INCBIN_U8("graphics/pokemon/nosepass/icon.4bpp"); + const u32 gMonFrontPic_Nosepass[] = INCBIN_U32("graphics/pokemon/gen_3/nosepass/anim_front.4bpp.lz"); + const u32 gMonPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/gen_3/nosepass/normal.gbapal.lz"); + const u32 gMonBackPic_Nosepass[] = INCBIN_U32("graphics/pokemon/gen_3/nosepass/back.4bpp.lz"); + const u32 gMonShinyPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/gen_3/nosepass/shiny.gbapal.lz"); + const u8 gMonIcon_Nosepass[] = INCBIN_U8("graphics/pokemon/gen_3/nosepass/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Nosepass[] = INCBIN_U8("graphics/pokemon/nosepass/footprint.1bpp"); + const u8 gMonFootprint_Nosepass[] = INCBIN_U8("graphics/pokemon/gen_3/nosepass/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/anim_front.4bpp.lz"); - const u32 gMonPalette_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/normal.gbapal.lz"); - const u32 gMonBackPic_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/back.4bpp.lz"); - const u32 gMonShinyPalette_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/shiny.gbapal.lz"); - const u8 gMonIcon_Probopass[] = INCBIN_U8("graphics/pokemon/probopass/icon.4bpp"); + const u32 gMonFrontPic_Probopass[] = INCBIN_U32("graphics/pokemon/gen_4/probopass/anim_front.4bpp.lz"); + const u32 gMonPalette_Probopass[] = INCBIN_U32("graphics/pokemon/gen_4/probopass/normal.gbapal.lz"); + const u32 gMonBackPic_Probopass[] = INCBIN_U32("graphics/pokemon/gen_4/probopass/back.4bpp.lz"); + const u32 gMonShinyPalette_Probopass[] = INCBIN_U32("graphics/pokemon/gen_4/probopass/shiny.gbapal.lz"); + const u8 gMonIcon_Probopass[] = INCBIN_U8("graphics/pokemon/gen_4/probopass/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Probopass[] = INCBIN_U8("graphics/pokemon/probopass/footprint.1bpp"); + const u8 gMonFootprint_Probopass[] = INCBIN_U8("graphics/pokemon/gen_4/probopass/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_NOSEPASS #if P_FAMILY_SKITTY - const u32 gMonFrontPic_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/anim_front.4bpp.lz"); - const u32 gMonPalette_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/normal.gbapal.lz"); - const u32 gMonBackPic_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/back.4bpp.lz"); - const u32 gMonShinyPalette_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/shiny.gbapal.lz"); - const u8 gMonIcon_Skitty[] = INCBIN_U8("graphics/pokemon/skitty/icon.4bpp"); + const u32 gMonFrontPic_Skitty[] = INCBIN_U32("graphics/pokemon/gen_3/skitty/anim_front.4bpp.lz"); + const u32 gMonPalette_Skitty[] = INCBIN_U32("graphics/pokemon/gen_3/skitty/normal.gbapal.lz"); + const u32 gMonBackPic_Skitty[] = INCBIN_U32("graphics/pokemon/gen_3/skitty/back.4bpp.lz"); + const u32 gMonShinyPalette_Skitty[] = INCBIN_U32("graphics/pokemon/gen_3/skitty/shiny.gbapal.lz"); + const u8 gMonIcon_Skitty[] = INCBIN_U8("graphics/pokemon/gen_3/skitty/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Skitty[] = INCBIN_U8("graphics/pokemon/skitty/footprint.1bpp"); + const u8 gMonFootprint_Skitty[] = INCBIN_U8("graphics/pokemon/gen_3/skitty/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/anim_front.4bpp.lz"); - const u32 gMonPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/normal.gbapal.lz"); - const u32 gMonBackPic_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/back.4bpp.lz"); - const u32 gMonShinyPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/shiny.gbapal.lz"); - const u8 gMonIcon_Delcatty[] = INCBIN_U8("graphics/pokemon/delcatty/icon.4bpp"); + const u32 gMonFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/gen_3/delcatty/anim_front.4bpp.lz"); + const u32 gMonPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/gen_3/delcatty/normal.gbapal.lz"); + const u32 gMonBackPic_Delcatty[] = INCBIN_U32("graphics/pokemon/gen_3/delcatty/back.4bpp.lz"); + const u32 gMonShinyPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/gen_3/delcatty/shiny.gbapal.lz"); + const u8 gMonIcon_Delcatty[] = INCBIN_U8("graphics/pokemon/gen_3/delcatty/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Delcatty[] = INCBIN_U8("graphics/pokemon/delcatty/footprint.1bpp"); + const u8 gMonFootprint_Delcatty[] = INCBIN_U8("graphics/pokemon/gen_3/delcatty/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SKITTY #if P_FAMILY_SABLEYE - const u32 gMonFrontPic_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/anim_front.4bpp.lz"); - const u32 gMonPalette_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/normal.gbapal.lz"); - const u32 gMonBackPic_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/back.4bpp.lz"); - const u32 gMonShinyPalette_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/shiny.gbapal.lz"); - const u8 gMonIcon_Sableye[] = INCBIN_U8("graphics/pokemon/sableye/icon.4bpp"); + const u32 gMonFrontPic_Sableye[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/anim_front.4bpp.lz"); + const u32 gMonPalette_Sableye[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/normal.gbapal.lz"); + const u32 gMonBackPic_Sableye[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/back.4bpp.lz"); + const u32 gMonShinyPalette_Sableye[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/shiny.gbapal.lz"); + const u8 gMonIcon_Sableye[] = INCBIN_U8("graphics/pokemon/gen_3/sableye/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sableye[] = INCBIN_U8("graphics/pokemon/sableye/footprint.1bpp"); + const u8 gMonFootprint_Sableye[] = INCBIN_U8("graphics/pokemon/gen_3/sableye/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/front.4bpp.lz"); - const u32 gMonPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/normal.gbapal.lz"); - const u32 gMonBackPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/shiny.gbapal.lz"); - const u8 gMonIcon_SableyeMega[] = INCBIN_U8("graphics/pokemon/sableye/mega/icon.4bpp"); + const u32 gMonFrontPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/mega/front.4bpp.lz"); + const u32 gMonPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/mega/normal.gbapal.lz"); + const u32 gMonBackPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/gen_3/sableye/mega/shiny.gbapal.lz"); + const u8 gMonIcon_SableyeMega[] = INCBIN_U8("graphics/pokemon/gen_3/sableye/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SABLEYE #if P_FAMILY_MAWILE - const u32 gMonFrontPic_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/anim_front.4bpp.lz"); - const u32 gMonPalette_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/normal.gbapal.lz"); - const u32 gMonBackPic_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/back.4bpp.lz"); - const u32 gMonShinyPalette_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/shiny.gbapal.lz"); - const u8 gMonIcon_Mawile[] = INCBIN_U8("graphics/pokemon/mawile/icon.4bpp"); + const u32 gMonFrontPic_Mawile[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/anim_front.4bpp.lz"); + const u32 gMonPalette_Mawile[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/normal.gbapal.lz"); + const u32 gMonBackPic_Mawile[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/back.4bpp.lz"); + const u32 gMonShinyPalette_Mawile[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/shiny.gbapal.lz"); + const u8 gMonIcon_Mawile[] = INCBIN_U8("graphics/pokemon/gen_3/mawile/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mawile[] = INCBIN_U8("graphics/pokemon/mawile/footprint.1bpp"); + const u8 gMonFootprint_Mawile[] = INCBIN_U8("graphics/pokemon/gen_3/mawile/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/front.4bpp.lz"); - const u32 gMonPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/normal.gbapal.lz"); - const u32 gMonBackPic_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/shiny.gbapal.lz"); - const u8 gMonIcon_MawileMega[] = INCBIN_U8("graphics/pokemon/mawile/mega/icon.4bpp"); + const u32 gMonFrontPic_MawileMega[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/mega/front.4bpp.lz"); + const u32 gMonPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/mega/normal.gbapal.lz"); + const u32 gMonBackPic_MawileMega[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/gen_3/mawile/mega/shiny.gbapal.lz"); + const u8 gMonIcon_MawileMega[] = INCBIN_U8("graphics/pokemon/gen_3/mawile/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAWILE #if P_FAMILY_ARON - const u32 gMonFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/aron/anim_front.4bpp.lz"); - const u32 gMonPalette_Aron[] = INCBIN_U32("graphics/pokemon/aron/normal.gbapal.lz"); - const u32 gMonBackPic_Aron[] = INCBIN_U32("graphics/pokemon/aron/back.4bpp.lz"); - const u32 gMonShinyPalette_Aron[] = INCBIN_U32("graphics/pokemon/aron/shiny.gbapal.lz"); - const u8 gMonIcon_Aron[] = INCBIN_U8("graphics/pokemon/aron/icon.4bpp"); + const u32 gMonFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/gen_3/aron/anim_front.4bpp.lz"); + const u32 gMonPalette_Aron[] = INCBIN_U32("graphics/pokemon/gen_3/aron/normal.gbapal.lz"); + const u32 gMonBackPic_Aron[] = INCBIN_U32("graphics/pokemon/gen_3/aron/back.4bpp.lz"); + const u32 gMonShinyPalette_Aron[] = INCBIN_U32("graphics/pokemon/gen_3/aron/shiny.gbapal.lz"); + const u8 gMonIcon_Aron[] = INCBIN_U8("graphics/pokemon/gen_3/aron/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Aron[] = INCBIN_U8("graphics/pokemon/aron/footprint.1bpp"); + const u8 gMonFootprint_Aron[] = INCBIN_U8("graphics/pokemon/gen_3/aron/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/anim_front.4bpp.lz"); - const u32 gMonPalette_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/normal.gbapal.lz"); - const u32 gMonBackPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/back.4bpp.lz"); - const u32 gMonShinyPalette_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/shiny.gbapal.lz"); - const u8 gMonIcon_Lairon[] = INCBIN_U8("graphics/pokemon/lairon/icon.4bpp"); + const u32 gMonFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/gen_3/lairon/anim_front.4bpp.lz"); + const u32 gMonPalette_Lairon[] = INCBIN_U32("graphics/pokemon/gen_3/lairon/normal.gbapal.lz"); + const u32 gMonBackPic_Lairon[] = INCBIN_U32("graphics/pokemon/gen_3/lairon/back.4bpp.lz"); + const u32 gMonShinyPalette_Lairon[] = INCBIN_U32("graphics/pokemon/gen_3/lairon/shiny.gbapal.lz"); + const u8 gMonIcon_Lairon[] = INCBIN_U8("graphics/pokemon/gen_3/lairon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lairon[] = INCBIN_U8("graphics/pokemon/lairon/footprint.1bpp"); + const u8 gMonFootprint_Lairon[] = INCBIN_U8("graphics/pokemon/gen_3/lairon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/anim_front.4bpp.lz"); - const u32 gMonPalette_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/normal.gbapal.lz"); - const u32 gMonBackPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/back.4bpp.lz"); - const u32 gMonShinyPalette_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/shiny.gbapal.lz"); - const u8 gMonIcon_Aggron[] = INCBIN_U8("graphics/pokemon/aggron/icon.4bpp"); + const u32 gMonFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/anim_front.4bpp.lz"); + const u32 gMonPalette_Aggron[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/normal.gbapal.lz"); + const u32 gMonBackPic_Aggron[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/back.4bpp.lz"); + const u32 gMonShinyPalette_Aggron[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/shiny.gbapal.lz"); + const u8 gMonIcon_Aggron[] = INCBIN_U8("graphics/pokemon/gen_3/aggron/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Aggron[] = INCBIN_U8("graphics/pokemon/aggron/footprint.1bpp"); + const u8 gMonFootprint_Aggron[] = INCBIN_U8("graphics/pokemon/gen_3/aggron/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/front.4bpp.lz"); - const u32 gMonPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/normal.gbapal.lz"); - const u32 gMonBackPic_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/shiny.gbapal.lz"); - const u8 gMonIcon_AggronMega[] = INCBIN_U8("graphics/pokemon/aggron/mega/icon.4bpp"); + const u32 gMonFrontPic_AggronMega[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/mega/front.4bpp.lz"); + const u32 gMonPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/mega/normal.gbapal.lz"); + const u32 gMonBackPic_AggronMega[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/gen_3/aggron/mega/shiny.gbapal.lz"); + const u8 gMonIcon_AggronMega[] = INCBIN_U8("graphics/pokemon/gen_3/aggron/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ARON #if P_FAMILY_MEDITITE - const u32 gMonFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/anim_front.4bpp.lz"); - const u32 gMonPalette_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/normal.gbapal.lz"); - const u32 gMonBackPic_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/back.4bpp.lz"); - const u32 gMonShinyPalette_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/shiny.gbapal.lz"); - const u8 gMonIcon_Meditite[] = INCBIN_U8("graphics/pokemon/meditite/icon.4bpp"); + const u32 gMonFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/gen_3/meditite/anim_front.4bpp.lz"); + const u32 gMonPalette_Meditite[] = INCBIN_U32("graphics/pokemon/gen_3/meditite/normal.gbapal.lz"); + const u32 gMonBackPic_Meditite[] = INCBIN_U32("graphics/pokemon/gen_3/meditite/back.4bpp.lz"); + const u32 gMonShinyPalette_Meditite[] = INCBIN_U32("graphics/pokemon/gen_3/meditite/shiny.gbapal.lz"); + const u8 gMonIcon_Meditite[] = INCBIN_U8("graphics/pokemon/gen_3/meditite/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Meditite[] = INCBIN_U8("graphics/pokemon/meditite/footprint.1bpp"); + const u8 gMonFootprint_Meditite[] = INCBIN_U8("graphics/pokemon/gen_3/meditite/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MedititeF[] = INCBIN_U32("graphics/pokemon/meditite/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_MedititeF[] = INCBIN_U32("graphics/pokemon/meditite/backf.4bpp.lz"); + const u32 gMonFrontPic_MedititeF[] = INCBIN_U32("graphics/pokemon/gen_3/meditite/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_MedititeF[] = INCBIN_U32("graphics/pokemon/gen_3/meditite/backf.4bpp.lz"); - const u32 gMonFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/anim_front.4bpp.lz"); - const u32 gMonPalette_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/normal.gbapal.lz"); - const u32 gMonBackPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/back.4bpp.lz"); - const u32 gMonShinyPalette_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/shiny.gbapal.lz"); - const u8 gMonIcon_Medicham[] = INCBIN_U8("graphics/pokemon/medicham/icon.4bpp"); + const u32 gMonFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/anim_front.4bpp.lz"); + const u32 gMonPalette_Medicham[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/normal.gbapal.lz"); + const u32 gMonBackPic_Medicham[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/back.4bpp.lz"); + const u32 gMonShinyPalette_Medicham[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/shiny.gbapal.lz"); + const u8 gMonIcon_Medicham[] = INCBIN_U8("graphics/pokemon/gen_3/medicham/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Medicham[] = INCBIN_U8("graphics/pokemon/medicham/footprint.1bpp"); + const u8 gMonFootprint_Medicham[] = INCBIN_U8("graphics/pokemon/gen_3/medicham/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MedichamF[] = INCBIN_U32("graphics/pokemon/medicham/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_MedichamF[] = INCBIN_U32("graphics/pokemon/medicham/backf.4bpp.lz"); + const u32 gMonFrontPic_MedichamF[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_MedichamF[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/backf.4bpp.lz"); #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/front.4bpp.lz"); - const u32 gMonPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/normal.gbapal.lz"); - const u32 gMonBackPic_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/shiny.gbapal.lz"); - const u8 gMonIcon_MedichamMega[] = INCBIN_U8("graphics/pokemon/medicham/mega/icon.4bpp"); + const u32 gMonFrontPic_MedichamMega[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/mega/front.4bpp.lz"); + const u32 gMonPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/mega/normal.gbapal.lz"); + const u32 gMonBackPic_MedichamMega[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/gen_3/medicham/mega/shiny.gbapal.lz"); + const u8 gMonIcon_MedichamMega[] = INCBIN_U8("graphics/pokemon/gen_3/medicham/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MEDITITE #if P_FAMILY_ELECTRIKE - const u32 gMonFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/anim_front.4bpp.lz"); - const u32 gMonPalette_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/normal.gbapal.lz"); - const u32 gMonBackPic_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/back.4bpp.lz"); - const u32 gMonShinyPalette_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/shiny.gbapal.lz"); - const u8 gMonIcon_Electrike[] = INCBIN_U8("graphics/pokemon/electrike/icon.4bpp"); + const u32 gMonFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/gen_3/electrike/anim_front.4bpp.lz"); + const u32 gMonPalette_Electrike[] = INCBIN_U32("graphics/pokemon/gen_3/electrike/normal.gbapal.lz"); + const u32 gMonBackPic_Electrike[] = INCBIN_U32("graphics/pokemon/gen_3/electrike/back.4bpp.lz"); + const u32 gMonShinyPalette_Electrike[] = INCBIN_U32("graphics/pokemon/gen_3/electrike/shiny.gbapal.lz"); + const u8 gMonIcon_Electrike[] = INCBIN_U8("graphics/pokemon/gen_3/electrike/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Electrike[] = INCBIN_U8("graphics/pokemon/electrike/footprint.1bpp"); + const u8 gMonFootprint_Electrike[] = INCBIN_U8("graphics/pokemon/gen_3/electrike/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/anim_front.4bpp.lz"); - const u32 gMonPalette_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/normal.gbapal.lz"); - const u32 gMonBackPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/back.4bpp.lz"); - const u32 gMonShinyPalette_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/shiny.gbapal.lz"); - const u8 gMonIcon_Manectric[] = INCBIN_U8("graphics/pokemon/manectric/icon.4bpp"); + const u32 gMonFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/anim_front.4bpp.lz"); + const u32 gMonPalette_Manectric[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/normal.gbapal.lz"); + const u32 gMonBackPic_Manectric[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/back.4bpp.lz"); + const u32 gMonShinyPalette_Manectric[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/shiny.gbapal.lz"); + const u8 gMonIcon_Manectric[] = INCBIN_U8("graphics/pokemon/gen_3/manectric/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Manectric[] = INCBIN_U8("graphics/pokemon/manectric/footprint.1bpp"); + const u8 gMonFootprint_Manectric[] = INCBIN_U8("graphics/pokemon/gen_3/manectric/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/front.4bpp.lz"); - const u32 gMonPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/normal.gbapal.lz"); - const u32 gMonBackPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/shiny.gbapal.lz"); - const u8 gMonIcon_ManectricMega[] = INCBIN_U8("graphics/pokemon/manectric/mega/icon.4bpp"); + const u32 gMonFrontPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/mega/front.4bpp.lz"); + const u32 gMonPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/mega/normal.gbapal.lz"); + const u32 gMonBackPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/gen_3/manectric/mega/shiny.gbapal.lz"); + const u8 gMonIcon_ManectricMega[] = INCBIN_U8("graphics/pokemon/gen_3/manectric/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ELECTRIKE #if P_FAMILY_PLUSLE - const u32 gMonFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/anim_front.4bpp.lz"); - const u32 gMonPalette_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/normal.gbapal.lz"); - const u32 gMonBackPic_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/back.4bpp.lz"); - const u32 gMonShinyPalette_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/shiny.gbapal.lz"); - const u8 gMonIcon_Plusle[] = INCBIN_U8("graphics/pokemon/plusle/icon.4bpp"); + const u32 gMonFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/gen_3/plusle/anim_front.4bpp.lz"); + const u32 gMonPalette_Plusle[] = INCBIN_U32("graphics/pokemon/gen_3/plusle/normal.gbapal.lz"); + const u32 gMonBackPic_Plusle[] = INCBIN_U32("graphics/pokemon/gen_3/plusle/back.4bpp.lz"); + const u32 gMonShinyPalette_Plusle[] = INCBIN_U32("graphics/pokemon/gen_3/plusle/shiny.gbapal.lz"); + const u8 gMonIcon_Plusle[] = INCBIN_U8("graphics/pokemon/gen_3/plusle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Plusle[] = INCBIN_U8("graphics/pokemon/plusle/footprint.1bpp"); + const u8 gMonFootprint_Plusle[] = INCBIN_U8("graphics/pokemon/gen_3/plusle/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PLUSLE #if P_FAMILY_MINUN - const u32 gMonFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/minun/anim_front.4bpp.lz"); - const u32 gMonPalette_Minun[] = INCBIN_U32("graphics/pokemon/minun/normal.gbapal.lz"); - const u32 gMonBackPic_Minun[] = INCBIN_U32("graphics/pokemon/minun/back.4bpp.lz"); - const u32 gMonShinyPalette_Minun[] = INCBIN_U32("graphics/pokemon/minun/shiny.gbapal.lz"); - const u8 gMonIcon_Minun[] = INCBIN_U8("graphics/pokemon/minun/icon.4bpp"); + const u32 gMonFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/gen_3/minun/anim_front.4bpp.lz"); + const u32 gMonPalette_Minun[] = INCBIN_U32("graphics/pokemon/gen_3/minun/normal.gbapal.lz"); + const u32 gMonBackPic_Minun[] = INCBIN_U32("graphics/pokemon/gen_3/minun/back.4bpp.lz"); + const u32 gMonShinyPalette_Minun[] = INCBIN_U32("graphics/pokemon/gen_3/minun/shiny.gbapal.lz"); + const u8 gMonIcon_Minun[] = INCBIN_U8("graphics/pokemon/gen_3/minun/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Minun[] = INCBIN_U8("graphics/pokemon/minun/footprint.1bpp"); + const u8 gMonFootprint_Minun[] = INCBIN_U8("graphics/pokemon/gen_3/minun/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MINUN #if P_FAMILY_VOLBEAT_ILLUMISE - const u32 gMonFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/anim_front.4bpp.lz"); - const u32 gMonPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/normal.gbapal.lz"); - const u32 gMonBackPic_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/back.4bpp.lz"); - const u32 gMonShinyPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/shiny.gbapal.lz"); - const u8 gMonIcon_Volbeat[] = INCBIN_U8("graphics/pokemon/volbeat/icon.4bpp"); + const u32 gMonFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/gen_3/volbeat/anim_front.4bpp.lz"); + const u32 gMonPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/gen_3/volbeat/normal.gbapal.lz"); + const u32 gMonBackPic_Volbeat[] = INCBIN_U32("graphics/pokemon/gen_3/volbeat/back.4bpp.lz"); + const u32 gMonShinyPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/gen_3/volbeat/shiny.gbapal.lz"); + const u8 gMonIcon_Volbeat[] = INCBIN_U8("graphics/pokemon/gen_3/volbeat/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Volbeat[] = INCBIN_U8("graphics/pokemon/volbeat/footprint.1bpp"); + const u8 gMonFootprint_Volbeat[] = INCBIN_U8("graphics/pokemon/gen_3/volbeat/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/anim_front.4bpp.lz"); - const u32 gMonPalette_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/normal.gbapal.lz"); - const u32 gMonBackPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/back.4bpp.lz"); - const u32 gMonShinyPalette_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/shiny.gbapal.lz"); - const u8 gMonIcon_Illumise[] = INCBIN_U8("graphics/pokemon/illumise/icon.4bpp"); + const u32 gMonFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/gen_3/illumise/anim_front.4bpp.lz"); + const u32 gMonPalette_Illumise[] = INCBIN_U32("graphics/pokemon/gen_3/illumise/normal.gbapal.lz"); + const u32 gMonBackPic_Illumise[] = INCBIN_U32("graphics/pokemon/gen_3/illumise/back.4bpp.lz"); + const u32 gMonShinyPalette_Illumise[] = INCBIN_U32("graphics/pokemon/gen_3/illumise/shiny.gbapal.lz"); + const u8 gMonIcon_Illumise[] = INCBIN_U8("graphics/pokemon/gen_3/illumise/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Illumise[] = INCBIN_U8("graphics/pokemon/illumise/footprint.1bpp"); + const u8 gMonFootprint_Illumise[] = INCBIN_U8("graphics/pokemon/gen_3/illumise/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_VOLBEAT_ILLUMISE #if P_FAMILY_ROSELIA #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Budew[] = INCBIN_U32("graphics/pokemon/budew/anim_front.4bpp.lz"); - const u32 gMonPalette_Budew[] = INCBIN_U32("graphics/pokemon/budew/normal.gbapal.lz"); - const u32 gMonBackPic_Budew[] = INCBIN_U32("graphics/pokemon/budew/back.4bpp.lz"); - const u32 gMonShinyPalette_Budew[] = INCBIN_U32("graphics/pokemon/budew/shiny.gbapal.lz"); - const u8 gMonIcon_Budew[] = INCBIN_U8("graphics/pokemon/budew/icon.4bpp"); + const u32 gMonFrontPic_Budew[] = INCBIN_U32("graphics/pokemon/gen_4/budew/anim_front.4bpp.lz"); + const u32 gMonPalette_Budew[] = INCBIN_U32("graphics/pokemon/gen_4/budew/normal.gbapal.lz"); + const u32 gMonBackPic_Budew[] = INCBIN_U32("graphics/pokemon/gen_4/budew/back.4bpp.lz"); + const u32 gMonShinyPalette_Budew[] = INCBIN_U32("graphics/pokemon/gen_4/budew/shiny.gbapal.lz"); + const u8 gMonIcon_Budew[] = INCBIN_U8("graphics/pokemon/gen_4/budew/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Budew[] = INCBIN_U8("graphics/pokemon/budew/footprint.1bpp"); + const u8 gMonFootprint_Budew[] = INCBIN_U8("graphics/pokemon/gen_4/budew/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/anim_front.4bpp.lz"); - const u32 gMonPalette_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/normal.gbapal.lz"); - const u32 gMonBackPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/back.4bpp.lz"); - const u32 gMonShinyPalette_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/shiny.gbapal.lz"); - const u8 gMonIcon_Roselia[] = INCBIN_U8("graphics/pokemon/roselia/icon.4bpp"); + const u32 gMonFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/gen_3/roselia/anim_front.4bpp.lz"); + const u32 gMonPalette_Roselia[] = INCBIN_U32("graphics/pokemon/gen_3/roselia/normal.gbapal.lz"); + const u32 gMonBackPic_Roselia[] = INCBIN_U32("graphics/pokemon/gen_3/roselia/back.4bpp.lz"); + const u32 gMonShinyPalette_Roselia[] = INCBIN_U32("graphics/pokemon/gen_3/roselia/shiny.gbapal.lz"); + const u8 gMonIcon_Roselia[] = INCBIN_U8("graphics/pokemon/gen_3/roselia/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Roselia[] = INCBIN_U8("graphics/pokemon/roselia/footprint.1bpp"); + const u8 gMonFootprint_Roselia[] = INCBIN_U8("graphics/pokemon/gen_3/roselia/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_RoseliaF[] = INCBIN_U32("graphics/pokemon/roselia/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_RoseliaF[] = INCBIN_U32("graphics/pokemon/roselia/backf.4bpp.lz"); + const u32 gMonFrontPic_RoseliaF[] = INCBIN_U32("graphics/pokemon/gen_3/roselia/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_RoseliaF[] = INCBIN_U32("graphics/pokemon/gen_3/roselia/backf.4bpp.lz"); #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/anim_front.4bpp.lz"); - const u32 gMonPalette_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/normal.gbapal.lz"); - const u32 gMonBackPic_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/back.4bpp.lz"); - const u32 gMonShinyPalette_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/shiny.gbapal.lz"); - const u8 gMonIcon_Roserade[] = INCBIN_U8("graphics/pokemon/roserade/icon.4bpp"); + const u32 gMonFrontPic_Roserade[] = INCBIN_U32("graphics/pokemon/gen_4/roserade/anim_front.4bpp.lz"); + const u32 gMonPalette_Roserade[] = INCBIN_U32("graphics/pokemon/gen_4/roserade/normal.gbapal.lz"); + const u32 gMonBackPic_Roserade[] = INCBIN_U32("graphics/pokemon/gen_4/roserade/back.4bpp.lz"); + const u32 gMonShinyPalette_Roserade[] = INCBIN_U32("graphics/pokemon/gen_4/roserade/shiny.gbapal.lz"); + const u8 gMonIcon_Roserade[] = INCBIN_U8("graphics/pokemon/gen_4/roserade/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Roserade[] = INCBIN_U8("graphics/pokemon/roserade/footprint.1bpp"); + const u8 gMonFootprint_Roserade[] = INCBIN_U8("graphics/pokemon/gen_4/roserade/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_RoseradeF[] = INCBIN_U32("graphics/pokemon/roserade/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_RoseradeF[] = INCBIN_U32("graphics/pokemon/roserade/backf.4bpp.lz"); + const u32 gMonFrontPic_RoseradeF[] = INCBIN_U32("graphics/pokemon/gen_4/roserade/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_RoseradeF[] = INCBIN_U32("graphics/pokemon/gen_4/roserade/backf.4bpp.lz"); #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_ROSELIA #if P_FAMILY_GULPIN - const u32 gMonFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/anim_front.4bpp.lz"); - const u32 gMonPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/normal.gbapal.lz"); - const u32 gMonBackPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/back.4bpp.lz"); - const u32 gMonShinyPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/shiny.gbapal.lz"); - const u8 gMonIcon_Gulpin[] = INCBIN_U8("graphics/pokemon/gulpin/icon.4bpp"); + const u32 gMonFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gen_3/gulpin/anim_front.4bpp.lz"); + const u32 gMonPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gen_3/gulpin/normal.gbapal.lz"); + const u32 gMonBackPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gen_3/gulpin/back.4bpp.lz"); + const u32 gMonShinyPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gen_3/gulpin/shiny.gbapal.lz"); + const u8 gMonIcon_Gulpin[] = INCBIN_U8("graphics/pokemon/gen_3/gulpin/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gulpin[] = INCBIN_U8("graphics/pokemon/gulpin/footprint.1bpp"); + const u8 gMonFootprint_Gulpin[] = INCBIN_U8("graphics/pokemon/gen_3/gulpin/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GulpinF[] = INCBIN_U32("graphics/pokemon/gulpin/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_GulpinF[] = INCBIN_U32("graphics/pokemon/gulpin/backf.4bpp.lz"); + const u32 gMonFrontPic_GulpinF[] = INCBIN_U32("graphics/pokemon/gen_3/gulpin/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_GulpinF[] = INCBIN_U32("graphics/pokemon/gen_3/gulpin/backf.4bpp.lz"); - const u32 gMonFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/anim_front.4bpp.lz"); - const u32 gMonPalette_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/normal.gbapal.lz"); - const u32 gMonBackPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/back.4bpp.lz"); - const u32 gMonShinyPalette_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/shiny.gbapal.lz"); - const u8 gMonIcon_Swalot[] = INCBIN_U8("graphics/pokemon/swalot/icon.4bpp"); + const u32 gMonFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/gen_3/swalot/anim_front.4bpp.lz"); + const u32 gMonPalette_Swalot[] = INCBIN_U32("graphics/pokemon/gen_3/swalot/normal.gbapal.lz"); + const u32 gMonBackPic_Swalot[] = INCBIN_U32("graphics/pokemon/gen_3/swalot/back.4bpp.lz"); + const u32 gMonShinyPalette_Swalot[] = INCBIN_U32("graphics/pokemon/gen_3/swalot/shiny.gbapal.lz"); + const u8 gMonIcon_Swalot[] = INCBIN_U8("graphics/pokemon/gen_3/swalot/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Swalot[] = INCBIN_U8("graphics/pokemon/swalot/footprint.1bpp"); + const u8 gMonFootprint_Swalot[] = INCBIN_U8("graphics/pokemon/gen_3/swalot/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_SwalotF[] = INCBIN_U32("graphics/pokemon/swalot/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_SwalotF[] = INCBIN_U32("graphics/pokemon/swalot/backf.4bpp.lz"); + const u32 gMonFrontPic_SwalotF[] = INCBIN_U32("graphics/pokemon/gen_3/swalot/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_SwalotF[] = INCBIN_U32("graphics/pokemon/gen_3/swalot/backf.4bpp.lz"); #endif //P_FAMILY_GULPIN #if P_FAMILY_CARVANHA - const u32 gMonFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/anim_front.4bpp.lz"); - const u32 gMonPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/normal.gbapal.lz"); - const u32 gMonBackPic_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/back.4bpp.lz"); - const u32 gMonShinyPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/shiny.gbapal.lz"); - const u8 gMonIcon_Carvanha[] = INCBIN_U8("graphics/pokemon/carvanha/icon.4bpp"); + const u32 gMonFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/gen_3/carvanha/anim_front.4bpp.lz"); + const u32 gMonPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/gen_3/carvanha/normal.gbapal.lz"); + const u32 gMonBackPic_Carvanha[] = INCBIN_U32("graphics/pokemon/gen_3/carvanha/back.4bpp.lz"); + const u32 gMonShinyPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/gen_3/carvanha/shiny.gbapal.lz"); + const u8 gMonIcon_Carvanha[] = INCBIN_U8("graphics/pokemon/gen_3/carvanha/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Carvanha[] = INCBIN_U8("graphics/pokemon/carvanha/footprint.1bpp"); + const u8 gMonFootprint_Carvanha[] = INCBIN_U8("graphics/pokemon/gen_3/carvanha/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/anim_front.4bpp.lz"); - const u32 gMonPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/normal.gbapal.lz"); - const u32 gMonBackPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/back.4bpp.lz"); - const u32 gMonShinyPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/shiny.gbapal.lz"); - const u8 gMonIcon_Sharpedo[] = INCBIN_U8("graphics/pokemon/sharpedo/icon.4bpp"); + const u32 gMonFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/anim_front.4bpp.lz"); + const u32 gMonPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/normal.gbapal.lz"); + const u32 gMonBackPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/back.4bpp.lz"); + const u32 gMonShinyPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/shiny.gbapal.lz"); + const u8 gMonIcon_Sharpedo[] = INCBIN_U8("graphics/pokemon/gen_3/sharpedo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sharpedo[] = INCBIN_U8("graphics/pokemon/sharpedo/footprint.1bpp"); + const u8 gMonFootprint_Sharpedo[] = INCBIN_U8("graphics/pokemon/gen_3/sharpedo/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/front.4bpp.lz"); - const u32 gMonPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/normal.gbapal.lz"); - const u32 gMonBackPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/shiny.gbapal.lz"); - const u8 gMonIcon_SharpedoMega[] = INCBIN_U8("graphics/pokemon/sharpedo/mega/icon.4bpp"); + const u32 gMonFrontPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/mega/front.4bpp.lz"); + const u32 gMonPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/mega/normal.gbapal.lz"); + const u32 gMonBackPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/gen_3/sharpedo/mega/shiny.gbapal.lz"); + const u8 gMonIcon_SharpedoMega[] = INCBIN_U8("graphics/pokemon/gen_3/sharpedo/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_CARVANHA #if P_FAMILY_WAILMER - const u32 gMonFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/anim_front.4bpp.lz"); - const u32 gMonPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/normal.gbapal.lz"); - const u32 gMonBackPic_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/back.4bpp.lz"); - const u32 gMonShinyPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/shiny.gbapal.lz"); - const u8 gMonIcon_Wailmer[] = INCBIN_U8("graphics/pokemon/wailmer/icon.4bpp"); + const u32 gMonFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/gen_3/wailmer/anim_front.4bpp.lz"); + const u32 gMonPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/gen_3/wailmer/normal.gbapal.lz"); + const u32 gMonBackPic_Wailmer[] = INCBIN_U32("graphics/pokemon/gen_3/wailmer/back.4bpp.lz"); + const u32 gMonShinyPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/gen_3/wailmer/shiny.gbapal.lz"); + const u8 gMonIcon_Wailmer[] = INCBIN_U8("graphics/pokemon/gen_3/wailmer/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Wailmer[] = INCBIN_U8("graphics/pokemon/wailmer/footprint.1bpp"); + const u8 gMonFootprint_Wailmer[] = INCBIN_U8("graphics/pokemon/gen_3/wailmer/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/anim_front.4bpp.lz"); - const u32 gMonPalette_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/normal.gbapal.lz"); - const u32 gMonBackPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/back.4bpp.lz"); - const u32 gMonShinyPalette_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/shiny.gbapal.lz"); - const u8 gMonIcon_Wailord[] = INCBIN_U8("graphics/pokemon/wailord/icon.4bpp"); + const u32 gMonFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/gen_3/wailord/anim_front.4bpp.lz"); + const u32 gMonPalette_Wailord[] = INCBIN_U32("graphics/pokemon/gen_3/wailord/normal.gbapal.lz"); + const u32 gMonBackPic_Wailord[] = INCBIN_U32("graphics/pokemon/gen_3/wailord/back.4bpp.lz"); + const u32 gMonShinyPalette_Wailord[] = INCBIN_U32("graphics/pokemon/gen_3/wailord/shiny.gbapal.lz"); + const u8 gMonIcon_Wailord[] = INCBIN_U8("graphics/pokemon/gen_3/wailord/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Wailord[] = INCBIN_U8("graphics/pokemon/wailord/footprint.1bpp"); + const u8 gMonFootprint_Wailord[] = INCBIN_U8("graphics/pokemon/gen_3/wailord/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_WAILMER #if P_FAMILY_NUMEL - const u32 gMonFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/numel/anim_front.4bpp.lz"); - const u32 gMonPalette_Numel[] = INCBIN_U32("graphics/pokemon/numel/normal.gbapal.lz"); - const u32 gMonBackPic_Numel[] = INCBIN_U32("graphics/pokemon/numel/back.4bpp.lz"); - const u32 gMonShinyPalette_Numel[] = INCBIN_U32("graphics/pokemon/numel/shiny.gbapal.lz"); - const u8 gMonIcon_Numel[] = INCBIN_U8("graphics/pokemon/numel/icon.4bpp"); + const u32 gMonFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/gen_3/numel/anim_front.4bpp.lz"); + const u32 gMonPalette_Numel[] = INCBIN_U32("graphics/pokemon/gen_3/numel/normal.gbapal.lz"); + const u32 gMonBackPic_Numel[] = INCBIN_U32("graphics/pokemon/gen_3/numel/back.4bpp.lz"); + const u32 gMonShinyPalette_Numel[] = INCBIN_U32("graphics/pokemon/gen_3/numel/shiny.gbapal.lz"); + const u8 gMonIcon_Numel[] = INCBIN_U8("graphics/pokemon/gen_3/numel/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Numel[] = INCBIN_U8("graphics/pokemon/numel/footprint.1bpp"); + const u8 gMonFootprint_Numel[] = INCBIN_U8("graphics/pokemon/gen_3/numel/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_NumelF[] = INCBIN_U32("graphics/pokemon/numel/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_NumelF[] = INCBIN_U32("graphics/pokemon/numel/backf.4bpp.lz"); + const u32 gMonFrontPic_NumelF[] = INCBIN_U32("graphics/pokemon/gen_3/numel/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_NumelF[] = INCBIN_U32("graphics/pokemon/gen_3/numel/backf.4bpp.lz"); - const u32 gMonFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/anim_front.4bpp.lz"); - const u32 gMonPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/normal.gbapal.lz"); - const u32 gMonBackPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/back.4bpp.lz"); - const u32 gMonShinyPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/shiny.gbapal.lz"); - const u8 gMonIcon_Camerupt[] = INCBIN_U8("graphics/pokemon/camerupt/icon.4bpp"); + const u32 gMonFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/anim_front.4bpp.lz"); + const u32 gMonPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/normal.gbapal.lz"); + const u32 gMonBackPic_Camerupt[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/back.4bpp.lz"); + const u32 gMonShinyPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/shiny.gbapal.lz"); + const u8 gMonIcon_Camerupt[] = INCBIN_U8("graphics/pokemon/gen_3/camerupt/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Camerupt[] = INCBIN_U8("graphics/pokemon/camerupt/footprint.1bpp"); + const u8 gMonFootprint_Camerupt[] = INCBIN_U8("graphics/pokemon/gen_3/camerupt/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_CameruptF[] = INCBIN_U32("graphics/pokemon/camerupt/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_CameruptF[] = INCBIN_U32("graphics/pokemon/camerupt/backf.4bpp.lz"); + const u32 gMonFrontPic_CameruptF[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_CameruptF[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/backf.4bpp.lz"); #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/front.4bpp.lz"); - const u32 gMonPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/normal.gbapal.lz"); - const u32 gMonBackPic_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/shiny.gbapal.lz"); - const u8 gMonIcon_CameruptMega[] = INCBIN_U8("graphics/pokemon/camerupt/mega/icon.4bpp"); + const u32 gMonFrontPic_CameruptMega[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/mega/front.4bpp.lz"); + const u32 gMonPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/mega/normal.gbapal.lz"); + const u32 gMonBackPic_CameruptMega[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/gen_3/camerupt/mega/shiny.gbapal.lz"); + const u8 gMonIcon_CameruptMega[] = INCBIN_U8("graphics/pokemon/gen_3/camerupt/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_NUMEL #if P_FAMILY_TORKOAL - const u32 gMonFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/anim_front.4bpp.lz"); - const u32 gMonPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/normal.gbapal.lz"); - const u32 gMonBackPic_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/back.4bpp.lz"); - const u32 gMonShinyPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/shiny.gbapal.lz"); - const u8 gMonIcon_Torkoal[] = INCBIN_U8("graphics/pokemon/torkoal/icon.4bpp"); + const u32 gMonFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/gen_3/torkoal/anim_front.4bpp.lz"); + const u32 gMonPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/gen_3/torkoal/normal.gbapal.lz"); + const u32 gMonBackPic_Torkoal[] = INCBIN_U32("graphics/pokemon/gen_3/torkoal/back.4bpp.lz"); + const u32 gMonShinyPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/gen_3/torkoal/shiny.gbapal.lz"); + const u8 gMonIcon_Torkoal[] = INCBIN_U8("graphics/pokemon/gen_3/torkoal/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Torkoal[] = INCBIN_U8("graphics/pokemon/torkoal/footprint.1bpp"); + const u8 gMonFootprint_Torkoal[] = INCBIN_U8("graphics/pokemon/gen_3/torkoal/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TORKOAL #if P_FAMILY_SPOINK - const u32 gMonFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/anim_front.4bpp.lz"); - const u32 gMonPalette_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/normal.gbapal.lz"); - const u32 gMonBackPic_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/back.4bpp.lz"); - const u32 gMonShinyPalette_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/shiny.gbapal.lz"); - const u8 gMonIcon_Spoink[] = INCBIN_U8("graphics/pokemon/spoink/icon.4bpp"); + const u32 gMonFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/gen_3/spoink/anim_front.4bpp.lz"); + const u32 gMonPalette_Spoink[] = INCBIN_U32("graphics/pokemon/gen_3/spoink/normal.gbapal.lz"); + const u32 gMonBackPic_Spoink[] = INCBIN_U32("graphics/pokemon/gen_3/spoink/back.4bpp.lz"); + const u32 gMonShinyPalette_Spoink[] = INCBIN_U32("graphics/pokemon/gen_3/spoink/shiny.gbapal.lz"); + const u8 gMonIcon_Spoink[] = INCBIN_U8("graphics/pokemon/gen_3/spoink/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Spoink[] = INCBIN_U8("graphics/pokemon/spoink/footprint.1bpp"); + const u8 gMonFootprint_Spoink[] = INCBIN_U8("graphics/pokemon/gen_3/spoink/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/anim_front.4bpp.lz"); - const u32 gMonPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/normal.gbapal.lz"); - const u32 gMonBackPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/back.4bpp.lz"); - const u32 gMonShinyPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/shiny.gbapal.lz"); - const u8 gMonIcon_Grumpig[] = INCBIN_U8("graphics/pokemon/grumpig/icon.4bpp"); + const u32 gMonFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/gen_3/grumpig/anim_front.4bpp.lz"); + const u32 gMonPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/gen_3/grumpig/normal.gbapal.lz"); + const u32 gMonBackPic_Grumpig[] = INCBIN_U32("graphics/pokemon/gen_3/grumpig/back.4bpp.lz"); + const u32 gMonShinyPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/gen_3/grumpig/shiny.gbapal.lz"); + const u8 gMonIcon_Grumpig[] = INCBIN_U8("graphics/pokemon/gen_3/grumpig/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Grumpig[] = INCBIN_U8("graphics/pokemon/grumpig/footprint.1bpp"); + const u8 gMonFootprint_Grumpig[] = INCBIN_U8("graphics/pokemon/gen_3/grumpig/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SPOINK #if P_FAMILY_SPINDA - const u32 gMonFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/anim_front.4bpp.lz"); - const u32 gMonPalette_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/normal.gbapal.lz"); - const u32 gMonBackPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/back.4bpp.lz"); - const u32 gMonShinyPalette_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/shiny.gbapal.lz"); - const u8 gMonIcon_Spinda[] = INCBIN_U8("graphics/pokemon/spinda/icon.4bpp"); + const u32 gMonFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/gen_3/spinda/anim_front.4bpp.lz"); + const u32 gMonPalette_Spinda[] = INCBIN_U32("graphics/pokemon/gen_3/spinda/normal.gbapal.lz"); + const u32 gMonBackPic_Spinda[] = INCBIN_U32("graphics/pokemon/gen_3/spinda/back.4bpp.lz"); + const u32 gMonShinyPalette_Spinda[] = INCBIN_U32("graphics/pokemon/gen_3/spinda/shiny.gbapal.lz"); + const u8 gMonIcon_Spinda[] = INCBIN_U8("graphics/pokemon/gen_3/spinda/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Spinda[] = INCBIN_U8("graphics/pokemon/spinda/footprint.1bpp"); + const u8 gMonFootprint_Spinda[] = INCBIN_U8("graphics/pokemon/gen_3/spinda/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SPINDA #if P_FAMILY_TRAPINCH - const u32 gMonFrontPic_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/anim_front.4bpp.lz"); - const u32 gMonPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/normal.gbapal.lz"); - const u32 gMonBackPic_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/back.4bpp.lz"); - const u32 gMonShinyPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/shiny.gbapal.lz"); - const u8 gMonIcon_Trapinch[] = INCBIN_U8("graphics/pokemon/trapinch/icon.4bpp"); + const u32 gMonFrontPic_Trapinch[] = INCBIN_U32("graphics/pokemon/gen_3/trapinch/anim_front.4bpp.lz"); + const u32 gMonPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/gen_3/trapinch/normal.gbapal.lz"); + const u32 gMonBackPic_Trapinch[] = INCBIN_U32("graphics/pokemon/gen_3/trapinch/back.4bpp.lz"); + const u32 gMonShinyPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/gen_3/trapinch/shiny.gbapal.lz"); + const u8 gMonIcon_Trapinch[] = INCBIN_U8("graphics/pokemon/gen_3/trapinch/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Trapinch[] = INCBIN_U8("graphics/pokemon/trapinch/footprint.1bpp"); + const u8 gMonFootprint_Trapinch[] = INCBIN_U8("graphics/pokemon/gen_3/trapinch/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/anim_front.4bpp.lz"); - const u32 gMonPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/normal.gbapal.lz"); - const u32 gMonBackPic_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/back.4bpp.lz"); - const u32 gMonShinyPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/shiny.gbapal.lz"); - const u8 gMonIcon_Vibrava[] = INCBIN_U8("graphics/pokemon/vibrava/icon.4bpp"); + const u32 gMonFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/gen_3/vibrava/anim_front.4bpp.lz"); + const u32 gMonPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/gen_3/vibrava/normal.gbapal.lz"); + const u32 gMonBackPic_Vibrava[] = INCBIN_U32("graphics/pokemon/gen_3/vibrava/back.4bpp.lz"); + const u32 gMonShinyPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/gen_3/vibrava/shiny.gbapal.lz"); + const u8 gMonIcon_Vibrava[] = INCBIN_U8("graphics/pokemon/gen_3/vibrava/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Vibrava[] = INCBIN_U8("graphics/pokemon/vibrava/footprint.1bpp"); + const u8 gMonFootprint_Vibrava[] = INCBIN_U8("graphics/pokemon/gen_3/vibrava/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/anim_front.4bpp.lz"); - const u32 gMonPalette_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/normal.gbapal.lz"); - const u32 gMonBackPic_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/back.4bpp.lz"); - const u32 gMonShinyPalette_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/shiny.gbapal.lz"); - const u8 gMonIcon_Flygon[] = INCBIN_U8("graphics/pokemon/flygon/icon.4bpp"); + const u32 gMonFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/gen_3/flygon/anim_front.4bpp.lz"); + const u32 gMonPalette_Flygon[] = INCBIN_U32("graphics/pokemon/gen_3/flygon/normal.gbapal.lz"); + const u32 gMonBackPic_Flygon[] = INCBIN_U32("graphics/pokemon/gen_3/flygon/back.4bpp.lz"); + const u32 gMonShinyPalette_Flygon[] = INCBIN_U32("graphics/pokemon/gen_3/flygon/shiny.gbapal.lz"); + const u8 gMonIcon_Flygon[] = INCBIN_U8("graphics/pokemon/gen_3/flygon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Flygon[] = INCBIN_U8("graphics/pokemon/flygon/footprint.1bpp"); + const u8 gMonFootprint_Flygon[] = INCBIN_U8("graphics/pokemon/gen_3/flygon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TRAPINCH #if P_FAMILY_CACNEA - const u32 gMonFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/anim_front.4bpp.lz"); - const u32 gMonPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/normal.gbapal.lz"); - const u32 gMonBackPic_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/back.4bpp.lz"); - const u32 gMonShinyPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/shiny.gbapal.lz"); - const u8 gMonIcon_Cacnea[] = INCBIN_U8("graphics/pokemon/cacnea/icon.4bpp"); + const u32 gMonFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/gen_3/cacnea/anim_front.4bpp.lz"); + const u32 gMonPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/gen_3/cacnea/normal.gbapal.lz"); + const u32 gMonBackPic_Cacnea[] = INCBIN_U32("graphics/pokemon/gen_3/cacnea/back.4bpp.lz"); + const u32 gMonShinyPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/gen_3/cacnea/shiny.gbapal.lz"); + const u8 gMonIcon_Cacnea[] = INCBIN_U8("graphics/pokemon/gen_3/cacnea/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cacnea[] = INCBIN_U8("graphics/pokemon/cacnea/footprint.1bpp"); + const u8 gMonFootprint_Cacnea[] = INCBIN_U8("graphics/pokemon/gen_3/cacnea/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/anim_front.4bpp.lz"); - const u32 gMonPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/normal.gbapal.lz"); - const u32 gMonBackPic_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/back.4bpp.lz"); - const u32 gMonShinyPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/shiny.gbapal.lz"); - const u8 gMonIcon_Cacturne[] = INCBIN_U8("graphics/pokemon/cacturne/icon.4bpp"); + const u32 gMonFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/gen_3/cacturne/anim_front.4bpp.lz"); + const u32 gMonPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/gen_3/cacturne/normal.gbapal.lz"); + const u32 gMonBackPic_Cacturne[] = INCBIN_U32("graphics/pokemon/gen_3/cacturne/back.4bpp.lz"); + const u32 gMonShinyPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/gen_3/cacturne/shiny.gbapal.lz"); + const u8 gMonIcon_Cacturne[] = INCBIN_U8("graphics/pokemon/gen_3/cacturne/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cacturne[] = INCBIN_U8("graphics/pokemon/cacturne/footprint.1bpp"); + const u8 gMonFootprint_Cacturne[] = INCBIN_U8("graphics/pokemon/gen_3/cacturne/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_CacturneF[] = INCBIN_U32("graphics/pokemon/cacturne/anim_frontf.4bpp.lz"); + const u32 gMonFrontPic_CacturneF[] = INCBIN_U32("graphics/pokemon/gen_3/cacturne/anim_frontf.4bpp.lz"); #endif //P_FAMILY_CACNEA #if P_FAMILY_SWABLU - const u32 gMonFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/anim_front.4bpp.lz"); - const u32 gMonPalette_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/normal.gbapal.lz"); - const u32 gMonBackPic_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/back.4bpp.lz"); - const u32 gMonShinyPalette_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/shiny.gbapal.lz"); - const u8 gMonIcon_Swablu[] = INCBIN_U8("graphics/pokemon/swablu/icon.4bpp"); + const u32 gMonFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/gen_3/swablu/anim_front.4bpp.lz"); + const u32 gMonPalette_Swablu[] = INCBIN_U32("graphics/pokemon/gen_3/swablu/normal.gbapal.lz"); + const u32 gMonBackPic_Swablu[] = INCBIN_U32("graphics/pokemon/gen_3/swablu/back.4bpp.lz"); + const u32 gMonShinyPalette_Swablu[] = INCBIN_U32("graphics/pokemon/gen_3/swablu/shiny.gbapal.lz"); + const u8 gMonIcon_Swablu[] = INCBIN_U8("graphics/pokemon/gen_3/swablu/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Swablu[] = INCBIN_U8("graphics/pokemon/swablu/footprint.1bpp"); + const u8 gMonFootprint_Swablu[] = INCBIN_U8("graphics/pokemon/gen_3/swablu/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/anim_front.4bpp.lz"); - const u32 gMonPalette_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/normal.gbapal.lz"); - const u32 gMonBackPic_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/back.4bpp.lz"); - const u32 gMonShinyPalette_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/shiny.gbapal.lz"); - const u8 gMonIcon_Altaria[] = INCBIN_U8("graphics/pokemon/altaria/icon.4bpp"); + const u32 gMonFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/anim_front.4bpp.lz"); + const u32 gMonPalette_Altaria[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/normal.gbapal.lz"); + const u32 gMonBackPic_Altaria[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/back.4bpp.lz"); + const u32 gMonShinyPalette_Altaria[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/shiny.gbapal.lz"); + const u8 gMonIcon_Altaria[] = INCBIN_U8("graphics/pokemon/gen_3/altaria/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Altaria[] = INCBIN_U8("graphics/pokemon/altaria/footprint.1bpp"); + const u8 gMonFootprint_Altaria[] = INCBIN_U8("graphics/pokemon/gen_3/altaria/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/front.4bpp.lz"); - const u32 gMonPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/normal.gbapal.lz"); - const u32 gMonBackPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/shiny.gbapal.lz"); - const u8 gMonIcon_AltariaMega[] = INCBIN_U8("graphics/pokemon/altaria/mega/icon.4bpp"); + const u32 gMonFrontPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/mega/front.4bpp.lz"); + const u32 gMonPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/mega/normal.gbapal.lz"); + const u32 gMonBackPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/gen_3/altaria/mega/shiny.gbapal.lz"); + const u8 gMonIcon_AltariaMega[] = INCBIN_U8("graphics/pokemon/gen_3/altaria/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SWABLU #if P_FAMILY_ZANGOOSE - const u32 gMonFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/anim_front.4bpp.lz"); - const u32 gMonPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/normal.gbapal.lz"); - const u32 gMonBackPic_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/back.4bpp.lz"); - const u32 gMonShinyPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/shiny.gbapal.lz"); - const u8 gMonIcon_Zangoose[] = INCBIN_U8("graphics/pokemon/zangoose/icon.4bpp"); + const u32 gMonFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/gen_3/zangoose/anim_front.4bpp.lz"); + const u32 gMonPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/gen_3/zangoose/normal.gbapal.lz"); + const u32 gMonBackPic_Zangoose[] = INCBIN_U32("graphics/pokemon/gen_3/zangoose/back.4bpp.lz"); + const u32 gMonShinyPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/gen_3/zangoose/shiny.gbapal.lz"); + const u8 gMonIcon_Zangoose[] = INCBIN_U8("graphics/pokemon/gen_3/zangoose/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Zangoose[] = INCBIN_U8("graphics/pokemon/zangoose/footprint.1bpp"); + const u8 gMonFootprint_Zangoose[] = INCBIN_U8("graphics/pokemon/gen_3/zangoose/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ZANGOOSE #if P_FAMILY_SEVIPER - const u32 gMonFrontPic_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/anim_front.4bpp.lz"); - const u32 gMonPalette_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/normal.gbapal.lz"); - const u32 gMonBackPic_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/back.4bpp.lz"); - const u32 gMonShinyPalette_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/shiny.gbapal.lz"); - const u8 gMonIcon_Seviper[] = INCBIN_U8("graphics/pokemon/seviper/icon.4bpp"); + const u32 gMonFrontPic_Seviper[] = INCBIN_U32("graphics/pokemon/gen_3/seviper/anim_front.4bpp.lz"); + const u32 gMonPalette_Seviper[] = INCBIN_U32("graphics/pokemon/gen_3/seviper/normal.gbapal.lz"); + const u32 gMonBackPic_Seviper[] = INCBIN_U32("graphics/pokemon/gen_3/seviper/back.4bpp.lz"); + const u32 gMonShinyPalette_Seviper[] = INCBIN_U32("graphics/pokemon/gen_3/seviper/shiny.gbapal.lz"); + const u8 gMonIcon_Seviper[] = INCBIN_U8("graphics/pokemon/gen_3/seviper/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Seviper[] = INCBIN_U8("graphics/pokemon/seviper/footprint.1bpp"); + const u8 gMonFootprint_Seviper[] = INCBIN_U8("graphics/pokemon/gen_3/seviper/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SEVIPER #if P_FAMILY_LUNATONE - const u32 gMonFrontPic_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/anim_front.4bpp.lz"); - const u32 gMonPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/normal.gbapal.lz"); - const u32 gMonBackPic_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/back.4bpp.lz"); - const u32 gMonShinyPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/shiny.gbapal.lz"); - const u8 gMonIcon_Lunatone[] = INCBIN_U8("graphics/pokemon/lunatone/icon.4bpp"); + const u32 gMonFrontPic_Lunatone[] = INCBIN_U32("graphics/pokemon/gen_3/lunatone/anim_front.4bpp.lz"); + const u32 gMonPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/gen_3/lunatone/normal.gbapal.lz"); + const u32 gMonBackPic_Lunatone[] = INCBIN_U32("graphics/pokemon/gen_3/lunatone/back.4bpp.lz"); + const u32 gMonShinyPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/gen_3/lunatone/shiny.gbapal.lz"); + const u8 gMonIcon_Lunatone[] = INCBIN_U8("graphics/pokemon/gen_3/lunatone/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lunatone[] = INCBIN_U8("graphics/pokemon/lunatone/footprint.1bpp"); + const u8 gMonFootprint_Lunatone[] = INCBIN_U8("graphics/pokemon/gen_3/lunatone/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_LUNATONE #if P_FAMILY_SOLROCK - const u32 gMonFrontPic_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/anim_front.4bpp.lz"); - const u32 gMonPalette_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/normal.gbapal.lz"); - const u32 gMonBackPic_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/back.4bpp.lz"); - const u32 gMonShinyPalette_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/shiny.gbapal.lz"); - const u8 gMonIcon_Solrock[] = INCBIN_U8("graphics/pokemon/solrock/icon.4bpp"); + const u32 gMonFrontPic_Solrock[] = INCBIN_U32("graphics/pokemon/gen_3/solrock/anim_front.4bpp.lz"); + const u32 gMonPalette_Solrock[] = INCBIN_U32("graphics/pokemon/gen_3/solrock/normal.gbapal.lz"); + const u32 gMonBackPic_Solrock[] = INCBIN_U32("graphics/pokemon/gen_3/solrock/back.4bpp.lz"); + const u32 gMonShinyPalette_Solrock[] = INCBIN_U32("graphics/pokemon/gen_3/solrock/shiny.gbapal.lz"); + const u8 gMonIcon_Solrock[] = INCBIN_U8("graphics/pokemon/gen_3/solrock/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Solrock[] = INCBIN_U8("graphics/pokemon/solrock/footprint.1bpp"); + const u8 gMonFootprint_Solrock[] = INCBIN_U8("graphics/pokemon/gen_3/solrock/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SOLROCK #if P_FAMILY_BARBOACH - const u32 gMonFrontPic_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/anim_front.4bpp.lz"); - const u32 gMonPalette_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/normal.gbapal.lz"); - const u32 gMonBackPic_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/back.4bpp.lz"); - const u32 gMonShinyPalette_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/shiny.gbapal.lz"); - const u8 gMonIcon_Barboach[] = INCBIN_U8("graphics/pokemon/barboach/icon.4bpp"); + const u32 gMonFrontPic_Barboach[] = INCBIN_U32("graphics/pokemon/gen_3/barboach/anim_front.4bpp.lz"); + const u32 gMonPalette_Barboach[] = INCBIN_U32("graphics/pokemon/gen_3/barboach/normal.gbapal.lz"); + const u32 gMonBackPic_Barboach[] = INCBIN_U32("graphics/pokemon/gen_3/barboach/back.4bpp.lz"); + const u32 gMonShinyPalette_Barboach[] = INCBIN_U32("graphics/pokemon/gen_3/barboach/shiny.gbapal.lz"); + const u8 gMonIcon_Barboach[] = INCBIN_U8("graphics/pokemon/gen_3/barboach/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Barboach[] = INCBIN_U8("graphics/pokemon/barboach/footprint.1bpp"); + const u8 gMonFootprint_Barboach[] = INCBIN_U8("graphics/pokemon/gen_3/barboach/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/anim_front.4bpp.lz"); - const u32 gMonPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/normal.gbapal.lz"); - const u32 gMonBackPic_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/back.4bpp.lz"); - const u32 gMonShinyPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/shiny.gbapal.lz"); - const u8 gMonIcon_Whiscash[] = INCBIN_U8("graphics/pokemon/whiscash/icon.4bpp"); + const u32 gMonFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/gen_3/whiscash/anim_front.4bpp.lz"); + const u32 gMonPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/gen_3/whiscash/normal.gbapal.lz"); + const u32 gMonBackPic_Whiscash[] = INCBIN_U32("graphics/pokemon/gen_3/whiscash/back.4bpp.lz"); + const u32 gMonShinyPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/gen_3/whiscash/shiny.gbapal.lz"); + const u8 gMonIcon_Whiscash[] = INCBIN_U8("graphics/pokemon/gen_3/whiscash/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Whiscash[] = INCBIN_U8("graphics/pokemon/whiscash/footprint.1bpp"); + const u8 gMonFootprint_Whiscash[] = INCBIN_U8("graphics/pokemon/gen_3/whiscash/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BARBOACH #if P_FAMILY_CORPHISH - const u32 gMonFrontPic_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/anim_front.4bpp.lz"); - const u32 gMonPalette_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/normal.gbapal.lz"); - const u32 gMonBackPic_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/back.4bpp.lz"); - const u32 gMonShinyPalette_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/shiny.gbapal.lz"); - const u8 gMonIcon_Corphish[] = INCBIN_U8("graphics/pokemon/corphish/icon.4bpp"); + const u32 gMonFrontPic_Corphish[] = INCBIN_U32("graphics/pokemon/gen_3/corphish/anim_front.4bpp.lz"); + const u32 gMonPalette_Corphish[] = INCBIN_U32("graphics/pokemon/gen_3/corphish/normal.gbapal.lz"); + const u32 gMonBackPic_Corphish[] = INCBIN_U32("graphics/pokemon/gen_3/corphish/back.4bpp.lz"); + const u32 gMonShinyPalette_Corphish[] = INCBIN_U32("graphics/pokemon/gen_3/corphish/shiny.gbapal.lz"); + const u8 gMonIcon_Corphish[] = INCBIN_U8("graphics/pokemon/gen_3/corphish/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Corphish[] = INCBIN_U8("graphics/pokemon/corphish/footprint.1bpp"); + const u8 gMonFootprint_Corphish[] = INCBIN_U8("graphics/pokemon/gen_3/corphish/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/anim_front.4bpp.lz"); - const u32 gMonPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/normal.gbapal.lz"); - const u32 gMonBackPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/back.4bpp.lz"); - const u32 gMonShinyPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/shiny.gbapal.lz"); - const u8 gMonIcon_Crawdaunt[] = INCBIN_U8("graphics/pokemon/crawdaunt/icon.4bpp"); + const u32 gMonFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/gen_3/crawdaunt/anim_front.4bpp.lz"); + const u32 gMonPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/gen_3/crawdaunt/normal.gbapal.lz"); + const u32 gMonBackPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/gen_3/crawdaunt/back.4bpp.lz"); + const u32 gMonShinyPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/gen_3/crawdaunt/shiny.gbapal.lz"); + const u8 gMonIcon_Crawdaunt[] = INCBIN_U8("graphics/pokemon/gen_3/crawdaunt/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Crawdaunt[] = INCBIN_U8("graphics/pokemon/crawdaunt/footprint.1bpp"); + const u8 gMonFootprint_Crawdaunt[] = INCBIN_U8("graphics/pokemon/gen_3/crawdaunt/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CORPHISH #if P_FAMILY_BALTOY - const u32 gMonFrontPic_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/anim_front.4bpp.lz"); - const u32 gMonPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/normal.gbapal.lz"); - const u32 gMonBackPic_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/back.4bpp.lz"); - const u32 gMonShinyPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/shiny.gbapal.lz"); - const u8 gMonIcon_Baltoy[] = INCBIN_U8("graphics/pokemon/baltoy/icon.4bpp"); + const u32 gMonFrontPic_Baltoy[] = INCBIN_U32("graphics/pokemon/gen_3/baltoy/anim_front.4bpp.lz"); + const u32 gMonPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/gen_3/baltoy/normal.gbapal.lz"); + const u32 gMonBackPic_Baltoy[] = INCBIN_U32("graphics/pokemon/gen_3/baltoy/back.4bpp.lz"); + const u32 gMonShinyPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/gen_3/baltoy/shiny.gbapal.lz"); + const u8 gMonIcon_Baltoy[] = INCBIN_U8("graphics/pokemon/gen_3/baltoy/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Baltoy[] = INCBIN_U8("graphics/pokemon/baltoy/footprint.1bpp"); + const u8 gMonFootprint_Baltoy[] = INCBIN_U8("graphics/pokemon/gen_3/baltoy/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/anim_front.4bpp.lz"); - const u32 gMonPalette_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/normal.gbapal.lz"); - const u32 gMonBackPic_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/back.4bpp.lz"); - const u32 gMonShinyPalette_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/shiny.gbapal.lz"); - const u8 gMonIcon_Claydol[] = INCBIN_U8("graphics/pokemon/claydol/icon.4bpp"); + const u32 gMonFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/gen_3/claydol/anim_front.4bpp.lz"); + const u32 gMonPalette_Claydol[] = INCBIN_U32("graphics/pokemon/gen_3/claydol/normal.gbapal.lz"); + const u32 gMonBackPic_Claydol[] = INCBIN_U32("graphics/pokemon/gen_3/claydol/back.4bpp.lz"); + const u32 gMonShinyPalette_Claydol[] = INCBIN_U32("graphics/pokemon/gen_3/claydol/shiny.gbapal.lz"); + const u8 gMonIcon_Claydol[] = INCBIN_U8("graphics/pokemon/gen_3/claydol/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Claydol[] = INCBIN_U8("graphics/pokemon/claydol/footprint.1bpp"); + const u8 gMonFootprint_Claydol[] = INCBIN_U8("graphics/pokemon/gen_3/claydol/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BALTOY #if P_FAMILY_LILEEP - const u32 gMonFrontPic_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/anim_front.4bpp.lz"); - const u32 gMonPalette_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/normal.gbapal.lz"); - const u32 gMonBackPic_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/back.4bpp.lz"); - const u32 gMonShinyPalette_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/shiny.gbapal.lz"); - const u8 gMonIcon_Lileep[] = INCBIN_U8("graphics/pokemon/lileep/icon.4bpp"); + const u32 gMonFrontPic_Lileep[] = INCBIN_U32("graphics/pokemon/gen_3/lileep/anim_front.4bpp.lz"); + const u32 gMonPalette_Lileep[] = INCBIN_U32("graphics/pokemon/gen_3/lileep/normal.gbapal.lz"); + const u32 gMonBackPic_Lileep[] = INCBIN_U32("graphics/pokemon/gen_3/lileep/back.4bpp.lz"); + const u32 gMonShinyPalette_Lileep[] = INCBIN_U32("graphics/pokemon/gen_3/lileep/shiny.gbapal.lz"); + const u8 gMonIcon_Lileep[] = INCBIN_U8("graphics/pokemon/gen_3/lileep/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lileep[] = INCBIN_U8("graphics/pokemon/lileep/footprint.1bpp"); + const u8 gMonFootprint_Lileep[] = INCBIN_U8("graphics/pokemon/gen_3/lileep/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/anim_front.4bpp.lz"); - const u32 gMonPalette_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/normal.gbapal.lz"); - const u32 gMonBackPic_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/back.4bpp.lz"); - const u32 gMonShinyPalette_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/shiny.gbapal.lz"); - const u8 gMonIcon_Cradily[] = INCBIN_U8("graphics/pokemon/cradily/icon.4bpp"); + const u32 gMonFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/gen_3/cradily/anim_front.4bpp.lz"); + const u32 gMonPalette_Cradily[] = INCBIN_U32("graphics/pokemon/gen_3/cradily/normal.gbapal.lz"); + const u32 gMonBackPic_Cradily[] = INCBIN_U32("graphics/pokemon/gen_3/cradily/back.4bpp.lz"); + const u32 gMonShinyPalette_Cradily[] = INCBIN_U32("graphics/pokemon/gen_3/cradily/shiny.gbapal.lz"); + const u8 gMonIcon_Cradily[] = INCBIN_U8("graphics/pokemon/gen_3/cradily/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cradily[] = INCBIN_U8("graphics/pokemon/cradily/footprint.1bpp"); + const u8 gMonFootprint_Cradily[] = INCBIN_U8("graphics/pokemon/gen_3/cradily/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_LILEEP #if P_FAMILY_ANORITH - const u32 gMonFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/anim_front.4bpp.lz"); - const u32 gMonPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/normal.gbapal.lz"); - const u32 gMonBackPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/back.4bpp.lz"); - const u32 gMonShinyPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/shiny.gbapal.lz"); - const u8 gMonIcon_Anorith[] = INCBIN_U8("graphics/pokemon/anorith/icon.4bpp"); + const u32 gMonFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/gen_3/anorith/anim_front.4bpp.lz"); + const u32 gMonPalette_Anorith[] = INCBIN_U32("graphics/pokemon/gen_3/anorith/normal.gbapal.lz"); + const u32 gMonBackPic_Anorith[] = INCBIN_U32("graphics/pokemon/gen_3/anorith/back.4bpp.lz"); + const u32 gMonShinyPalette_Anorith[] = INCBIN_U32("graphics/pokemon/gen_3/anorith/shiny.gbapal.lz"); + const u8 gMonIcon_Anorith[] = INCBIN_U8("graphics/pokemon/gen_3/anorith/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Anorith[] = INCBIN_U8("graphics/pokemon/anorith/footprint.1bpp"); + const u8 gMonFootprint_Anorith[] = INCBIN_U8("graphics/pokemon/gen_3/anorith/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/anim_front.4bpp.lz"); - const u32 gMonPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/normal.gbapal.lz"); - const u32 gMonBackPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/back.4bpp.lz"); - const u32 gMonShinyPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/shiny.gbapal.lz"); - const u8 gMonIcon_Armaldo[] = INCBIN_U8("graphics/pokemon/armaldo/icon.4bpp"); + const u32 gMonFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/gen_3/armaldo/anim_front.4bpp.lz"); + const u32 gMonPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/gen_3/armaldo/normal.gbapal.lz"); + const u32 gMonBackPic_Armaldo[] = INCBIN_U32("graphics/pokemon/gen_3/armaldo/back.4bpp.lz"); + const u32 gMonShinyPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/gen_3/armaldo/shiny.gbapal.lz"); + const u8 gMonIcon_Armaldo[] = INCBIN_U8("graphics/pokemon/gen_3/armaldo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Armaldo[] = INCBIN_U8("graphics/pokemon/armaldo/footprint.1bpp"); + const u8 gMonFootprint_Armaldo[] = INCBIN_U8("graphics/pokemon/gen_3/armaldo/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ANORITH #if P_FAMILY_FEEBAS - const u32 gMonFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/anim_front.4bpp.lz"); - const u32 gMonPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/normal.gbapal.lz"); - const u32 gMonBackPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/back.4bpp.lz"); - const u32 gMonShinyPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/shiny.gbapal.lz"); - const u8 gMonIcon_Feebas[] = INCBIN_U8("graphics/pokemon/feebas/icon.4bpp"); + const u32 gMonFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/gen_3/feebas/anim_front.4bpp.lz"); + const u32 gMonPalette_Feebas[] = INCBIN_U32("graphics/pokemon/gen_3/feebas/normal.gbapal.lz"); + const u32 gMonBackPic_Feebas[] = INCBIN_U32("graphics/pokemon/gen_3/feebas/back.4bpp.lz"); + const u32 gMonShinyPalette_Feebas[] = INCBIN_U32("graphics/pokemon/gen_3/feebas/shiny.gbapal.lz"); + const u8 gMonIcon_Feebas[] = INCBIN_U8("graphics/pokemon/gen_3/feebas/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Feebas[] = INCBIN_U8("graphics/pokemon/feebas/footprint.1bpp"); + const u8 gMonFootprint_Feebas[] = INCBIN_U8("graphics/pokemon/gen_3/feebas/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/anim_front.4bpp.lz"); - const u32 gMonPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/normal.gbapal.lz"); - const u32 gMonBackPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/back.4bpp.lz"); - const u32 gMonShinyPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/shiny.gbapal.lz"); - const u8 gMonIcon_Milotic[] = INCBIN_U8("graphics/pokemon/milotic/icon.4bpp"); + const u32 gMonFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/gen_3/milotic/anim_front.4bpp.lz"); + const u32 gMonPalette_Milotic[] = INCBIN_U32("graphics/pokemon/gen_3/milotic/normal.gbapal.lz"); + const u32 gMonBackPic_Milotic[] = INCBIN_U32("graphics/pokemon/gen_3/milotic/back.4bpp.lz"); + const u32 gMonShinyPalette_Milotic[] = INCBIN_U32("graphics/pokemon/gen_3/milotic/shiny.gbapal.lz"); + const u8 gMonIcon_Milotic[] = INCBIN_U8("graphics/pokemon/gen_3/milotic/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Milotic[] = INCBIN_U8("graphics/pokemon/milotic/footprint.1bpp"); + const u8 gMonFootprint_Milotic[] = INCBIN_U8("graphics/pokemon/gen_3/milotic/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MiloticF[] = INCBIN_U32("graphics/pokemon/milotic/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_MiloticF[] = INCBIN_U32("graphics/pokemon/milotic/backf.4bpp.lz"); + const u32 gMonFrontPic_MiloticF[] = INCBIN_U32("graphics/pokemon/gen_3/milotic/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_MiloticF[] = INCBIN_U32("graphics/pokemon/gen_3/milotic/backf.4bpp.lz"); #endif //P_FAMILY_FEEBAS #if P_FAMILY_CASTFORM - const u32 gMonFrontPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/anim_front.4bpp.lz"); - const u32 gMonPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/normal.gbapal.lz"); - const u32 gMonBackPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/back.4bpp.lz"); - const u32 gMonShinyPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/shiny.gbapal.lz"); - const u8 gMonIcon_CastformNormal[] = INCBIN_U8("graphics/pokemon/castform/icon.4bpp"); + const u32 gMonFrontPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/gen_3/castform/anim_front.4bpp.lz"); + const u32 gMonPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/gen_3/castform/normal.gbapal.lz"); + const u32 gMonBackPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/gen_3/castform/back.4bpp.lz"); + const u32 gMonShinyPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/gen_3/castform/shiny.gbapal.lz"); + const u8 gMonIcon_CastformNormal[] = INCBIN_U8("graphics/pokemon/gen_3/castform/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Castform[] = INCBIN_U8("graphics/pokemon/castform/footprint.1bpp"); + const u8 gMonFootprint_Castform[] = INCBIN_U8("graphics/pokemon/gen_3/castform/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/anim_front.4bpp.lz"); - const u32 gMonPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/normal.gbapal.lz"); - const u32 gMonBackPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/back.4bpp.lz"); - const u32 gMonShinyPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/shiny.gbapal.lz"); - const u8 gMonIcon_CastformSunny[] = INCBIN_U8("graphics/pokemon/castform/sunny/icon.4bpp"); + const u32 gMonFrontPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/gen_3/castform/sunny/anim_front.4bpp.lz"); + const u32 gMonPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/gen_3/castform/sunny/normal.gbapal.lz"); + const u32 gMonBackPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/gen_3/castform/sunny/back.4bpp.lz"); + const u32 gMonShinyPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/gen_3/castform/sunny/shiny.gbapal.lz"); + const u8 gMonIcon_CastformSunny[] = INCBIN_U8("graphics/pokemon/gen_3/castform/sunny/icon.4bpp"); - const u32 gMonFrontPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/anim_front.4bpp.lz"); - const u32 gMonPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/normal.gbapal.lz"); - const u32 gMonBackPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/back.4bpp.lz"); - const u32 gMonShinyPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/shiny.gbapal.lz"); - const u8 gMonIcon_CastformRainy[] = INCBIN_U8("graphics/pokemon/castform/rainy/icon.4bpp"); + const u32 gMonFrontPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/rainy/anim_front.4bpp.lz"); + const u32 gMonPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/rainy/normal.gbapal.lz"); + const u32 gMonBackPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/rainy/back.4bpp.lz"); + const u32 gMonShinyPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/rainy/shiny.gbapal.lz"); + const u8 gMonIcon_CastformRainy[] = INCBIN_U8("graphics/pokemon/gen_3/castform/rainy/icon.4bpp"); - const u32 gMonFrontPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/anim_front.4bpp.lz"); - const u32 gMonPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/normal.gbapal.lz"); - const u32 gMonBackPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/back.4bpp.lz"); - const u32 gMonShinyPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/shiny.gbapal.lz"); - const u8 gMonIcon_CastformSnowy[] = INCBIN_U8("graphics/pokemon/castform/snowy/icon.4bpp"); + const u32 gMonFrontPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/snowy/anim_front.4bpp.lz"); + const u32 gMonPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/snowy/normal.gbapal.lz"); + const u32 gMonBackPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/snowy/back.4bpp.lz"); + const u32 gMonShinyPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/gen_3/castform/snowy/shiny.gbapal.lz"); + const u8 gMonIcon_CastformSnowy[] = INCBIN_U8("graphics/pokemon/gen_3/castform/snowy/icon.4bpp"); #endif //P_FAMILY_CASTFORM #if P_FAMILY_KECLEON - const u32 gMonFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/anim_front.4bpp.lz"); - const u32 gMonPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/normal.gbapal.lz"); - const u32 gMonBackPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/back.4bpp.lz"); - const u32 gMonShinyPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/shiny.gbapal.lz"); - const u8 gMonIcon_Kecleon[] = INCBIN_U8("graphics/pokemon/kecleon/icon.4bpp"); + const u32 gMonFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/gen_3/kecleon/anim_front.4bpp.lz"); + const u32 gMonPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/gen_3/kecleon/normal.gbapal.lz"); + const u32 gMonBackPic_Kecleon[] = INCBIN_U32("graphics/pokemon/gen_3/kecleon/back.4bpp.lz"); + const u32 gMonShinyPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/gen_3/kecleon/shiny.gbapal.lz"); + const u8 gMonIcon_Kecleon[] = INCBIN_U8("graphics/pokemon/gen_3/kecleon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kecleon[] = INCBIN_U8("graphics/pokemon/kecleon/footprint.1bpp"); + const u8 gMonFootprint_Kecleon[] = INCBIN_U8("graphics/pokemon/gen_3/kecleon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_KECLEON #if P_FAMILY_SHUPPET - const u32 gMonFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/anim_front.4bpp.lz"); - const u32 gMonPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/normal.gbapal.lz"); - const u32 gMonBackPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/back.4bpp.lz"); - const u32 gMonShinyPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/shiny.gbapal.lz"); - const u8 gMonIcon_Shuppet[] = INCBIN_U8("graphics/pokemon/shuppet/icon.4bpp"); + const u32 gMonFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/gen_3/shuppet/anim_front.4bpp.lz"); + const u32 gMonPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/gen_3/shuppet/normal.gbapal.lz"); + const u32 gMonBackPic_Shuppet[] = INCBIN_U32("graphics/pokemon/gen_3/shuppet/back.4bpp.lz"); + const u32 gMonShinyPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/gen_3/shuppet/shiny.gbapal.lz"); + const u8 gMonIcon_Shuppet[] = INCBIN_U8("graphics/pokemon/gen_3/shuppet/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Shuppet[] = INCBIN_U8("graphics/pokemon/shuppet/footprint.1bpp"); + const u8 gMonFootprint_Shuppet[] = INCBIN_U8("graphics/pokemon/gen_3/shuppet/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/anim_front.4bpp.lz"); - const u32 gMonPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/normal.gbapal.lz"); - const u32 gMonBackPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/back.4bpp.lz"); - const u32 gMonShinyPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/shiny.gbapal.lz"); - const u8 gMonIcon_Banette[] = INCBIN_U8("graphics/pokemon/banette/icon.4bpp"); + const u32 gMonFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/gen_3/banette/anim_front.4bpp.lz"); + const u32 gMonPalette_Banette[] = INCBIN_U32("graphics/pokemon/gen_3/banette/normal.gbapal.lz"); + const u32 gMonBackPic_Banette[] = INCBIN_U32("graphics/pokemon/gen_3/banette/back.4bpp.lz"); + const u32 gMonShinyPalette_Banette[] = INCBIN_U32("graphics/pokemon/gen_3/banette/shiny.gbapal.lz"); + const u8 gMonIcon_Banette[] = INCBIN_U8("graphics/pokemon/gen_3/banette/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Banette[] = INCBIN_U8("graphics/pokemon/banette/footprint.1bpp"); + const u8 gMonFootprint_Banette[] = INCBIN_U8("graphics/pokemon/gen_3/banette/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/front.4bpp.lz"); - const u32 gMonPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/normal.gbapal.lz"); - const u32 gMonBackPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/shiny.gbapal.lz"); - const u8 gMonIcon_BanetteMega[] = INCBIN_U8("graphics/pokemon/banette/mega/icon.4bpp"); + const u32 gMonFrontPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/gen_3/banette/mega/front.4bpp.lz"); + const u32 gMonPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/gen_3/banette/mega/normal.gbapal.lz"); + const u32 gMonBackPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/gen_3/banette/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/gen_3/banette/mega/shiny.gbapal.lz"); + const u8 gMonIcon_BanetteMega[] = INCBIN_U8("graphics/pokemon/gen_3/banette/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SHUPPET #if P_FAMILY_DUSKULL - const u32 gMonFrontPic_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/anim_front.4bpp.lz"); - const u32 gMonPalette_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/normal.gbapal.lz"); - const u32 gMonBackPic_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/back.4bpp.lz"); - const u32 gMonShinyPalette_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/shiny.gbapal.lz"); - const u8 gMonIcon_Duskull[] = INCBIN_U8("graphics/pokemon/duskull/icon.4bpp"); + const u32 gMonFrontPic_Duskull[] = INCBIN_U32("graphics/pokemon/gen_3/duskull/anim_front.4bpp.lz"); + const u32 gMonPalette_Duskull[] = INCBIN_U32("graphics/pokemon/gen_3/duskull/normal.gbapal.lz"); + const u32 gMonBackPic_Duskull[] = INCBIN_U32("graphics/pokemon/gen_3/duskull/back.4bpp.lz"); + const u32 gMonShinyPalette_Duskull[] = INCBIN_U32("graphics/pokemon/gen_3/duskull/shiny.gbapal.lz"); + const u8 gMonIcon_Duskull[] = INCBIN_U8("graphics/pokemon/gen_3/duskull/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Duskull[] = INCBIN_U8("graphics/pokemon/duskull/footprint.1bpp"); + const u8 gMonFootprint_Duskull[] = INCBIN_U8("graphics/pokemon/gen_3/duskull/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/anim_front.4bpp.lz"); - const u32 gMonPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/normal.gbapal.lz"); - const u32 gMonBackPic_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/back.4bpp.lz"); - const u32 gMonShinyPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/shiny.gbapal.lz"); - const u8 gMonIcon_Dusclops[] = INCBIN_U8("graphics/pokemon/dusclops/icon.4bpp"); + const u32 gMonFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/gen_3/dusclops/anim_front.4bpp.lz"); + const u32 gMonPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/gen_3/dusclops/normal.gbapal.lz"); + const u32 gMonBackPic_Dusclops[] = INCBIN_U32("graphics/pokemon/gen_3/dusclops/back.4bpp.lz"); + const u32 gMonShinyPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/gen_3/dusclops/shiny.gbapal.lz"); + const u8 gMonIcon_Dusclops[] = INCBIN_U8("graphics/pokemon/gen_3/dusclops/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dusclops[] = INCBIN_U8("graphics/pokemon/dusclops/footprint.1bpp"); + const u8 gMonFootprint_Dusclops[] = INCBIN_U8("graphics/pokemon/gen_3/dusclops/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/anim_front.4bpp.lz"); - const u32 gMonPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/normal.gbapal.lz"); - const u32 gMonBackPic_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/back.4bpp.lz"); - const u32 gMonShinyPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/shiny.gbapal.lz"); - const u8 gMonIcon_Dusknoir[] = INCBIN_U8("graphics/pokemon/dusknoir/icon.4bpp"); + const u32 gMonFrontPic_Dusknoir[] = INCBIN_U32("graphics/pokemon/gen_4/dusknoir/anim_front.4bpp.lz"); + const u32 gMonPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/gen_4/dusknoir/normal.gbapal.lz"); + const u32 gMonBackPic_Dusknoir[] = INCBIN_U32("graphics/pokemon/gen_4/dusknoir/back.4bpp.lz"); + const u32 gMonShinyPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/gen_4/dusknoir/shiny.gbapal.lz"); + const u8 gMonIcon_Dusknoir[] = INCBIN_U8("graphics/pokemon/gen_4/dusknoir/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dusknoir[] = INCBIN_U8("graphics/pokemon/dusknoir/footprint.1bpp"); + const u8 gMonFootprint_Dusknoir[] = INCBIN_U8("graphics/pokemon/gen_4/dusknoir/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_DUSKULL #if P_FAMILY_TROPIUS - const u32 gMonFrontPic_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/anim_front.4bpp.lz"); - const u32 gMonPalette_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/normal.gbapal.lz"); - const u32 gMonBackPic_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/back.4bpp.lz"); - const u32 gMonShinyPalette_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/shiny.gbapal.lz"); - const u8 gMonIcon_Tropius[] = INCBIN_U8("graphics/pokemon/tropius/icon.4bpp"); + const u32 gMonFrontPic_Tropius[] = INCBIN_U32("graphics/pokemon/gen_3/tropius/anim_front.4bpp.lz"); + const u32 gMonPalette_Tropius[] = INCBIN_U32("graphics/pokemon/gen_3/tropius/normal.gbapal.lz"); + const u32 gMonBackPic_Tropius[] = INCBIN_U32("graphics/pokemon/gen_3/tropius/back.4bpp.lz"); + const u32 gMonShinyPalette_Tropius[] = INCBIN_U32("graphics/pokemon/gen_3/tropius/shiny.gbapal.lz"); + const u8 gMonIcon_Tropius[] = INCBIN_U8("graphics/pokemon/gen_3/tropius/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tropius[] = INCBIN_U8("graphics/pokemon/tropius/footprint.1bpp"); + const u8 gMonFootprint_Tropius[] = INCBIN_U8("graphics/pokemon/gen_3/tropius/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TROPIUS #if P_FAMILY_CHIMECHO #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Chingling[] = INCBIN_U32("graphics/pokemon/chingling/anim_front.4bpp.lz"); - const u32 gMonPalette_Chingling[] = INCBIN_U32("graphics/pokemon/chingling/normal.gbapal.lz"); - const u32 gMonBackPic_Chingling[] = INCBIN_U32("graphics/pokemon/chingling/back.4bpp.lz"); - const u32 gMonShinyPalette_Chingling[] = INCBIN_U32("graphics/pokemon/chingling/shiny.gbapal.lz"); - const u8 gMonIcon_Chingling[] = INCBIN_U8("graphics/pokemon/chingling/icon.4bpp"); + const u32 gMonFrontPic_Chingling[] = INCBIN_U32("graphics/pokemon/gen_4/chingling/anim_front.4bpp.lz"); + const u32 gMonPalette_Chingling[] = INCBIN_U32("graphics/pokemon/gen_4/chingling/normal.gbapal.lz"); + const u32 gMonBackPic_Chingling[] = INCBIN_U32("graphics/pokemon/gen_4/chingling/back.4bpp.lz"); + const u32 gMonShinyPalette_Chingling[] = INCBIN_U32("graphics/pokemon/gen_4/chingling/shiny.gbapal.lz"); + const u8 gMonIcon_Chingling[] = INCBIN_U8("graphics/pokemon/gen_4/chingling/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Chingling[] = INCBIN_U8("graphics/pokemon/chingling/footprint.1bpp"); + const u8 gMonFootprint_Chingling[] = INCBIN_U8("graphics/pokemon/gen_4/chingling/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/anim_front.4bpp.lz"); - const u32 gMonPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/normal.gbapal.lz"); - const u32 gMonBackPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/back.4bpp.lz"); - const u32 gMonShinyPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/shiny.gbapal.lz"); - const u8 gMonIcon_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/icon.4bpp"); + const u32 gMonFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/gen_3/chimecho/anim_front.4bpp.lz"); + const u32 gMonPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/gen_3/chimecho/normal.gbapal.lz"); + const u32 gMonBackPic_Chimecho[] = INCBIN_U32("graphics/pokemon/gen_3/chimecho/back.4bpp.lz"); + const u32 gMonShinyPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/gen_3/chimecho/shiny.gbapal.lz"); + const u8 gMonIcon_Chimecho[] = INCBIN_U8("graphics/pokemon/gen_3/chimecho/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/footprint.1bpp"); + const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/gen_3/chimecho/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CHIMECHO #if P_FAMILY_ABSOL - const u32 gMonFrontPic_Absol[] = INCBIN_U32("graphics/pokemon/absol/anim_front.4bpp.lz"); - const u32 gMonPalette_Absol[] = INCBIN_U32("graphics/pokemon/absol/normal.gbapal.lz"); - const u32 gMonBackPic_Absol[] = INCBIN_U32("graphics/pokemon/absol/back.4bpp.lz"); - const u32 gMonShinyPalette_Absol[] = INCBIN_U32("graphics/pokemon/absol/shiny.gbapal.lz"); - const u8 gMonIcon_Absol[] = INCBIN_U8("graphics/pokemon/absol/icon.4bpp"); + const u32 gMonFrontPic_Absol[] = INCBIN_U32("graphics/pokemon/gen_3/absol/anim_front.4bpp.lz"); + const u32 gMonPalette_Absol[] = INCBIN_U32("graphics/pokemon/gen_3/absol/normal.gbapal.lz"); + const u32 gMonBackPic_Absol[] = INCBIN_U32("graphics/pokemon/gen_3/absol/back.4bpp.lz"); + const u32 gMonShinyPalette_Absol[] = INCBIN_U32("graphics/pokemon/gen_3/absol/shiny.gbapal.lz"); + const u8 gMonIcon_Absol[] = INCBIN_U8("graphics/pokemon/gen_3/absol/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Absol[] = INCBIN_U8("graphics/pokemon/absol/footprint.1bpp"); + const u8 gMonFootprint_Absol[] = INCBIN_U8("graphics/pokemon/gen_3/absol/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/front.4bpp.lz"); - const u32 gMonPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/normal.gbapal.lz"); - const u32 gMonBackPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/shiny.gbapal.lz"); - const u8 gMonIcon_AbsolMega[] = INCBIN_U8("graphics/pokemon/absol/mega/icon.4bpp"); + const u32 gMonFrontPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/gen_3/absol/mega/front.4bpp.lz"); + const u32 gMonPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/gen_3/absol/mega/normal.gbapal.lz"); + const u32 gMonBackPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/gen_3/absol/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/gen_3/absol/mega/shiny.gbapal.lz"); + const u8 gMonIcon_AbsolMega[] = INCBIN_U8("graphics/pokemon/gen_3/absol/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ABSOL #if P_FAMILY_SNORUNT - const u32 gMonFrontPic_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/anim_front.4bpp.lz"); - const u32 gMonPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/normal.gbapal.lz"); - const u32 gMonBackPic_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/back.4bpp.lz"); - const u32 gMonShinyPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/shiny.gbapal.lz"); - const u8 gMonIcon_Snorunt[] = INCBIN_U8("graphics/pokemon/snorunt/icon.4bpp"); + const u32 gMonFrontPic_Snorunt[] = INCBIN_U32("graphics/pokemon/gen_3/snorunt/anim_front.4bpp.lz"); + const u32 gMonPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/gen_3/snorunt/normal.gbapal.lz"); + const u32 gMonBackPic_Snorunt[] = INCBIN_U32("graphics/pokemon/gen_3/snorunt/back.4bpp.lz"); + const u32 gMonShinyPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/gen_3/snorunt/shiny.gbapal.lz"); + const u8 gMonIcon_Snorunt[] = INCBIN_U8("graphics/pokemon/gen_3/snorunt/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Snorunt[] = INCBIN_U8("graphics/pokemon/snorunt/footprint.1bpp"); + const u8 gMonFootprint_Snorunt[] = INCBIN_U8("graphics/pokemon/gen_3/snorunt/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/anim_front.4bpp.lz"); - const u32 gMonPalette_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/normal.gbapal.lz"); - const u32 gMonBackPic_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/back.4bpp.lz"); - const u32 gMonShinyPalette_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/shiny.gbapal.lz"); - const u8 gMonIcon_Glalie[] = INCBIN_U8("graphics/pokemon/glalie/icon.4bpp"); + const u32 gMonFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/anim_front.4bpp.lz"); + const u32 gMonPalette_Glalie[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/normal.gbapal.lz"); + const u32 gMonBackPic_Glalie[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/back.4bpp.lz"); + const u32 gMonShinyPalette_Glalie[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/shiny.gbapal.lz"); + const u8 gMonIcon_Glalie[] = INCBIN_U8("graphics/pokemon/gen_3/glalie/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Glalie[] = INCBIN_U8("graphics/pokemon/glalie/footprint.1bpp"); + const u8 gMonFootprint_Glalie[] = INCBIN_U8("graphics/pokemon/gen_3/glalie/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/front.4bpp.lz"); - const u32 gMonPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/normal.gbapal.lz"); - const u32 gMonBackPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/shiny.gbapal.lz"); - const u8 gMonIcon_GlalieMega[] = INCBIN_U8("graphics/pokemon/glalie/mega/icon.4bpp"); + const u32 gMonFrontPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/mega/front.4bpp.lz"); + const u32 gMonPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/mega/normal.gbapal.lz"); + const u32 gMonBackPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/gen_3/glalie/mega/shiny.gbapal.lz"); + const u8 gMonIcon_GlalieMega[] = INCBIN_U8("graphics/pokemon/gen_3/glalie/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #if P_GEN_4_CROSS_EVOS - const u32 gMonFrontPic_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/anim_front.4bpp.lz"); - const u32 gMonPalette_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/normal.gbapal.lz"); - const u32 gMonBackPic_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/back.4bpp.lz"); - const u32 gMonShinyPalette_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/shiny.gbapal.lz"); - const u8 gMonIcon_Froslass[] = INCBIN_U8("graphics/pokemon/froslass/icon.4bpp"); + const u32 gMonFrontPic_Froslass[] = INCBIN_U32("graphics/pokemon/gen_4/froslass/anim_front.4bpp.lz"); + const u32 gMonPalette_Froslass[] = INCBIN_U32("graphics/pokemon/gen_4/froslass/normal.gbapal.lz"); + const u32 gMonBackPic_Froslass[] = INCBIN_U32("graphics/pokemon/gen_4/froslass/back.4bpp.lz"); + const u32 gMonShinyPalette_Froslass[] = INCBIN_U32("graphics/pokemon/gen_4/froslass/shiny.gbapal.lz"); + const u8 gMonIcon_Froslass[] = INCBIN_U8("graphics/pokemon/gen_4/froslass/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Froslass[] = INCBIN_U8("graphics/pokemon/froslass/footprint.1bpp"); + const u8 gMonFootprint_Froslass[] = INCBIN_U8("graphics/pokemon/gen_4/froslass/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_SNORUNT #if P_FAMILY_SPHEAL - const u32 gMonFrontPic_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/anim_front.4bpp.lz"); - const u32 gMonPalette_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/normal.gbapal.lz"); - const u32 gMonBackPic_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/back.4bpp.lz"); - const u32 gMonShinyPalette_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/shiny.gbapal.lz"); - const u8 gMonIcon_Spheal[] = INCBIN_U8("graphics/pokemon/spheal/icon.4bpp"); + const u32 gMonFrontPic_Spheal[] = INCBIN_U32("graphics/pokemon/gen_3/spheal/anim_front.4bpp.lz"); + const u32 gMonPalette_Spheal[] = INCBIN_U32("graphics/pokemon/gen_3/spheal/normal.gbapal.lz"); + const u32 gMonBackPic_Spheal[] = INCBIN_U32("graphics/pokemon/gen_3/spheal/back.4bpp.lz"); + const u32 gMonShinyPalette_Spheal[] = INCBIN_U32("graphics/pokemon/gen_3/spheal/shiny.gbapal.lz"); + const u8 gMonIcon_Spheal[] = INCBIN_U8("graphics/pokemon/gen_3/spheal/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Spheal[] = INCBIN_U8("graphics/pokemon/spheal/footprint.1bpp"); + const u8 gMonFootprint_Spheal[] = INCBIN_U8("graphics/pokemon/gen_3/spheal/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/anim_front.4bpp.lz"); - const u32 gMonPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/normal.gbapal.lz"); - const u32 gMonBackPic_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/back.4bpp.lz"); - const u32 gMonShinyPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/shiny.gbapal.lz"); - const u8 gMonIcon_Sealeo[] = INCBIN_U8("graphics/pokemon/sealeo/icon.4bpp"); + const u32 gMonFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/gen_3/sealeo/anim_front.4bpp.lz"); + const u32 gMonPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/gen_3/sealeo/normal.gbapal.lz"); + const u32 gMonBackPic_Sealeo[] = INCBIN_U32("graphics/pokemon/gen_3/sealeo/back.4bpp.lz"); + const u32 gMonShinyPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/gen_3/sealeo/shiny.gbapal.lz"); + const u8 gMonIcon_Sealeo[] = INCBIN_U8("graphics/pokemon/gen_3/sealeo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sealeo[] = INCBIN_U8("graphics/pokemon/sealeo/footprint.1bpp"); + const u8 gMonFootprint_Sealeo[] = INCBIN_U8("graphics/pokemon/gen_3/sealeo/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/anim_front.4bpp.lz"); - const u32 gMonPalette_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/normal.gbapal.lz"); - const u32 gMonBackPic_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/back.4bpp.lz"); - const u32 gMonShinyPalette_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/shiny.gbapal.lz"); - const u8 gMonIcon_Walrein[] = INCBIN_U8("graphics/pokemon/walrein/icon.4bpp"); + const u32 gMonFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/gen_3/walrein/anim_front.4bpp.lz"); + const u32 gMonPalette_Walrein[] = INCBIN_U32("graphics/pokemon/gen_3/walrein/normal.gbapal.lz"); + const u32 gMonBackPic_Walrein[] = INCBIN_U32("graphics/pokemon/gen_3/walrein/back.4bpp.lz"); + const u32 gMonShinyPalette_Walrein[] = INCBIN_U32("graphics/pokemon/gen_3/walrein/shiny.gbapal.lz"); + const u8 gMonIcon_Walrein[] = INCBIN_U8("graphics/pokemon/gen_3/walrein/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Walrein[] = INCBIN_U8("graphics/pokemon/walrein/footprint.1bpp"); + const u8 gMonFootprint_Walrein[] = INCBIN_U8("graphics/pokemon/gen_3/walrein/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SPHEAL #if P_FAMILY_CLAMPERL - const u32 gMonFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/anim_front.4bpp.lz"); - const u32 gMonPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/normal.gbapal.lz"); - const u32 gMonBackPic_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/back.4bpp.lz"); - const u32 gMonShinyPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/shiny.gbapal.lz"); - const u8 gMonIcon_Clamperl[] = INCBIN_U8("graphics/pokemon/clamperl/icon.4bpp"); + const u32 gMonFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/gen_3/clamperl/anim_front.4bpp.lz"); + const u32 gMonPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/gen_3/clamperl/normal.gbapal.lz"); + const u32 gMonBackPic_Clamperl[] = INCBIN_U32("graphics/pokemon/gen_3/clamperl/back.4bpp.lz"); + const u32 gMonShinyPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/gen_3/clamperl/shiny.gbapal.lz"); + const u8 gMonIcon_Clamperl[] = INCBIN_U8("graphics/pokemon/gen_3/clamperl/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Clamperl[] = INCBIN_U8("graphics/pokemon/clamperl/footprint.1bpp"); + const u8 gMonFootprint_Clamperl[] = INCBIN_U8("graphics/pokemon/gen_3/clamperl/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/anim_front.4bpp.lz"); - const u32 gMonPalette_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/normal.gbapal.lz"); - const u32 gMonBackPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/back.4bpp.lz"); - const u32 gMonShinyPalette_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/shiny.gbapal.lz"); - const u8 gMonIcon_Huntail[] = INCBIN_U8("graphics/pokemon/huntail/icon.4bpp"); + const u32 gMonFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/gen_3/huntail/anim_front.4bpp.lz"); + const u32 gMonPalette_Huntail[] = INCBIN_U32("graphics/pokemon/gen_3/huntail/normal.gbapal.lz"); + const u32 gMonBackPic_Huntail[] = INCBIN_U32("graphics/pokemon/gen_3/huntail/back.4bpp.lz"); + const u32 gMonShinyPalette_Huntail[] = INCBIN_U32("graphics/pokemon/gen_3/huntail/shiny.gbapal.lz"); + const u8 gMonIcon_Huntail[] = INCBIN_U8("graphics/pokemon/gen_3/huntail/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Huntail[] = INCBIN_U8("graphics/pokemon/huntail/footprint.1bpp"); + const u8 gMonFootprint_Huntail[] = INCBIN_U8("graphics/pokemon/gen_3/huntail/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/anim_front.4bpp.lz"); - const u32 gMonPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/normal.gbapal.lz"); - const u32 gMonBackPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/back.4bpp.lz"); - const u32 gMonShinyPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/shiny.gbapal.lz"); - const u8 gMonIcon_Gorebyss[] = INCBIN_U8("graphics/pokemon/gorebyss/icon.4bpp"); + const u32 gMonFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gen_3/gorebyss/anim_front.4bpp.lz"); + const u32 gMonPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gen_3/gorebyss/normal.gbapal.lz"); + const u32 gMonBackPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gen_3/gorebyss/back.4bpp.lz"); + const u32 gMonShinyPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gen_3/gorebyss/shiny.gbapal.lz"); + const u8 gMonIcon_Gorebyss[] = INCBIN_U8("graphics/pokemon/gen_3/gorebyss/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gorebyss[] = INCBIN_U8("graphics/pokemon/gorebyss/footprint.1bpp"); + const u8 gMonFootprint_Gorebyss[] = INCBIN_U8("graphics/pokemon/gen_3/gorebyss/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CLAMPERL #if P_FAMILY_RELICANTH - const u32 gMonFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/anim_front.4bpp.lz"); - const u32 gMonPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/normal.gbapal.lz"); - const u32 gMonBackPic_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/back.4bpp.lz"); - const u32 gMonShinyPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/shiny.gbapal.lz"); - const u8 gMonIcon_Relicanth[] = INCBIN_U8("graphics/pokemon/relicanth/icon.4bpp"); + const u32 gMonFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/gen_3/relicanth/anim_front.4bpp.lz"); + const u32 gMonPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/gen_3/relicanth/normal.gbapal.lz"); + const u32 gMonBackPic_Relicanth[] = INCBIN_U32("graphics/pokemon/gen_3/relicanth/back.4bpp.lz"); + const u32 gMonShinyPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/gen_3/relicanth/shiny.gbapal.lz"); + const u8 gMonIcon_Relicanth[] = INCBIN_U8("graphics/pokemon/gen_3/relicanth/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Relicanth[] = INCBIN_U8("graphics/pokemon/relicanth/footprint.1bpp"); + const u8 gMonFootprint_Relicanth[] = INCBIN_U8("graphics/pokemon/gen_3/relicanth/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_RelicanthF[] = INCBIN_U32("graphics/pokemon/relicanth/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_RelicanthF[] = INCBIN_U32("graphics/pokemon/relicanth/backf.4bpp.lz"); + const u32 gMonFrontPic_RelicanthF[] = INCBIN_U32("graphics/pokemon/gen_3/relicanth/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_RelicanthF[] = INCBIN_U32("graphics/pokemon/gen_3/relicanth/backf.4bpp.lz"); #endif //P_FAMILY_RELICANTH #if P_FAMILY_LUVDISC - const u32 gMonFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/anim_front.4bpp.lz"); - const u32 gMonPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/normal.gbapal.lz"); - const u32 gMonBackPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/back.4bpp.lz"); - const u32 gMonShinyPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/shiny.gbapal.lz"); - const u8 gMonIcon_Luvdisc[] = INCBIN_U8("graphics/pokemon/luvdisc/icon.4bpp"); + const u32 gMonFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/gen_3/luvdisc/anim_front.4bpp.lz"); + const u32 gMonPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/gen_3/luvdisc/normal.gbapal.lz"); + const u32 gMonBackPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/gen_3/luvdisc/back.4bpp.lz"); + const u32 gMonShinyPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/gen_3/luvdisc/shiny.gbapal.lz"); + const u8 gMonIcon_Luvdisc[] = INCBIN_U8("graphics/pokemon/gen_3/luvdisc/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Luvdisc[] = INCBIN_U8("graphics/pokemon/luvdisc/footprint.1bpp"); + const u8 gMonFootprint_Luvdisc[] = INCBIN_U8("graphics/pokemon/gen_3/luvdisc/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_LUVDISC #if P_FAMILY_BAGON - const u32 gMonFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/anim_front.4bpp.lz"); - const u32 gMonPalette_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/normal.gbapal.lz"); - const u32 gMonBackPic_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/back.4bpp.lz"); - const u32 gMonShinyPalette_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/shiny.gbapal.lz"); - const u8 gMonIcon_Bagon[] = INCBIN_U8("graphics/pokemon/bagon/icon.4bpp"); + const u32 gMonFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/gen_3/bagon/anim_front.4bpp.lz"); + const u32 gMonPalette_Bagon[] = INCBIN_U32("graphics/pokemon/gen_3/bagon/normal.gbapal.lz"); + const u32 gMonBackPic_Bagon[] = INCBIN_U32("graphics/pokemon/gen_3/bagon/back.4bpp.lz"); + const u32 gMonShinyPalette_Bagon[] = INCBIN_U32("graphics/pokemon/gen_3/bagon/shiny.gbapal.lz"); + const u8 gMonIcon_Bagon[] = INCBIN_U8("graphics/pokemon/gen_3/bagon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bagon[] = INCBIN_U8("graphics/pokemon/bagon/footprint.1bpp"); + const u8 gMonFootprint_Bagon[] = INCBIN_U8("graphics/pokemon/gen_3/bagon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/anim_front.4bpp.lz"); - const u32 gMonPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/normal.gbapal.lz"); - const u32 gMonBackPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/back.4bpp.lz"); - const u32 gMonShinyPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/shiny.gbapal.lz"); - const u8 gMonIcon_Shelgon[] = INCBIN_U8("graphics/pokemon/shelgon/icon.4bpp"); + const u32 gMonFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/gen_3/shelgon/anim_front.4bpp.lz"); + const u32 gMonPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/gen_3/shelgon/normal.gbapal.lz"); + const u32 gMonBackPic_Shelgon[] = INCBIN_U32("graphics/pokemon/gen_3/shelgon/back.4bpp.lz"); + const u32 gMonShinyPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/gen_3/shelgon/shiny.gbapal.lz"); + const u8 gMonIcon_Shelgon[] = INCBIN_U8("graphics/pokemon/gen_3/shelgon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Shelgon[] = INCBIN_U8("graphics/pokemon/shelgon/footprint.1bpp"); + const u8 gMonFootprint_Shelgon[] = INCBIN_U8("graphics/pokemon/gen_3/shelgon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/anim_front.4bpp.lz"); - const u32 gMonPalette_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/normal.gbapal.lz"); - const u32 gMonBackPic_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/back.4bpp.lz"); - const u32 gMonShinyPalette_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/shiny.gbapal.lz"); - const u8 gMonIcon_Salamence[] = INCBIN_U8("graphics/pokemon/salamence/icon.4bpp"); + const u32 gMonFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/anim_front.4bpp.lz"); + const u32 gMonPalette_Salamence[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/normal.gbapal.lz"); + const u32 gMonBackPic_Salamence[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/back.4bpp.lz"); + const u32 gMonShinyPalette_Salamence[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/shiny.gbapal.lz"); + const u8 gMonIcon_Salamence[] = INCBIN_U8("graphics/pokemon/gen_3/salamence/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Salamence[] = INCBIN_U8("graphics/pokemon/salamence/footprint.1bpp"); + const u8 gMonFootprint_Salamence[] = INCBIN_U8("graphics/pokemon/gen_3/salamence/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/front.4bpp.lz"); - const u32 gMonPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/normal.gbapal.lz"); - const u32 gMonBackPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/shiny.gbapal.lz"); - const u8 gMonIcon_SalamenceMega[] = INCBIN_U8("graphics/pokemon/salamence/mega/icon.4bpp"); + const u32 gMonFrontPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/mega/front.4bpp.lz"); + const u32 gMonPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/mega/normal.gbapal.lz"); + const u32 gMonBackPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/gen_3/salamence/mega/shiny.gbapal.lz"); + const u8 gMonIcon_SalamenceMega[] = INCBIN_U8("graphics/pokemon/gen_3/salamence/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BAGON #if P_FAMILY_BELDUM - const u32 gMonFrontPic_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/anim_front.4bpp.lz"); - const u32 gMonPalette_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/normal.gbapal.lz"); - const u32 gMonBackPic_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/back.4bpp.lz"); - const u32 gMonShinyPalette_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/shiny.gbapal.lz"); - const u8 gMonIcon_Beldum[] = INCBIN_U8("graphics/pokemon/beldum/icon.4bpp"); + const u32 gMonFrontPic_Beldum[] = INCBIN_U32("graphics/pokemon/gen_3/beldum/anim_front.4bpp.lz"); + const u32 gMonPalette_Beldum[] = INCBIN_U32("graphics/pokemon/gen_3/beldum/normal.gbapal.lz"); + const u32 gMonBackPic_Beldum[] = INCBIN_U32("graphics/pokemon/gen_3/beldum/back.4bpp.lz"); + const u32 gMonShinyPalette_Beldum[] = INCBIN_U32("graphics/pokemon/gen_3/beldum/shiny.gbapal.lz"); + const u8 gMonIcon_Beldum[] = INCBIN_U8("graphics/pokemon/gen_3/beldum/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Beldum[] = INCBIN_U8("graphics/pokemon/beldum/footprint.1bpp"); + const u8 gMonFootprint_Beldum[] = INCBIN_U8("graphics/pokemon/gen_3/beldum/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/metang/anim_front.4bpp.lz"); - const u32 gMonPalette_Metang[] = INCBIN_U32("graphics/pokemon/metang/normal.gbapal.lz"); - const u32 gMonBackPic_Metang[] = INCBIN_U32("graphics/pokemon/metang/back.4bpp.lz"); - const u32 gMonShinyPalette_Metang[] = INCBIN_U32("graphics/pokemon/metang/shiny.gbapal.lz"); - const u8 gMonIcon_Metang[] = INCBIN_U8("graphics/pokemon/metang/icon.4bpp"); + const u32 gMonFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/gen_3/metang/anim_front.4bpp.lz"); + const u32 gMonPalette_Metang[] = INCBIN_U32("graphics/pokemon/gen_3/metang/normal.gbapal.lz"); + const u32 gMonBackPic_Metang[] = INCBIN_U32("graphics/pokemon/gen_3/metang/back.4bpp.lz"); + const u32 gMonShinyPalette_Metang[] = INCBIN_U32("graphics/pokemon/gen_3/metang/shiny.gbapal.lz"); + const u8 gMonIcon_Metang[] = INCBIN_U8("graphics/pokemon/gen_3/metang/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Metang[] = INCBIN_U8("graphics/pokemon/metang/footprint.1bpp"); + const u8 gMonFootprint_Metang[] = INCBIN_U8("graphics/pokemon/gen_3/metang/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/anim_front.4bpp.lz"); - const u32 gMonPalette_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/normal.gbapal.lz"); - const u32 gMonBackPic_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/back.4bpp.lz"); - const u32 gMonShinyPalette_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/shiny.gbapal.lz"); - const u8 gMonIcon_Metagross[] = INCBIN_U8("graphics/pokemon/metagross/icon.4bpp"); + const u32 gMonFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/anim_front.4bpp.lz"); + const u32 gMonPalette_Metagross[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/normal.gbapal.lz"); + const u32 gMonBackPic_Metagross[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/back.4bpp.lz"); + const u32 gMonShinyPalette_Metagross[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/shiny.gbapal.lz"); + const u8 gMonIcon_Metagross[] = INCBIN_U8("graphics/pokemon/gen_3/metagross/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Metagross[] = INCBIN_U8("graphics/pokemon/metagross/footprint.1bpp"); + const u8 gMonFootprint_Metagross[] = INCBIN_U8("graphics/pokemon/gen_3/metagross/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/front.4bpp.lz"); - const u32 gMonPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/normal.gbapal.lz"); - const u32 gMonBackPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/shiny.gbapal.lz"); - const u8 gMonIcon_MetagrossMega[] = INCBIN_U8("graphics/pokemon/metagross/mega/icon.4bpp"); + const u32 gMonFrontPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/mega/front.4bpp.lz"); + const u32 gMonPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/mega/normal.gbapal.lz"); + const u32 gMonBackPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/gen_3/metagross/mega/shiny.gbapal.lz"); + const u8 gMonIcon_MetagrossMega[] = INCBIN_U8("graphics/pokemon/gen_3/metagross/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BELDUM #if P_FAMILY_REGIROCK - const u32 gMonFrontPic_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/anim_front.4bpp.lz"); - const u32 gMonPalette_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/normal.gbapal.lz"); - const u32 gMonBackPic_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/back.4bpp.lz"); - const u32 gMonShinyPalette_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/shiny.gbapal.lz"); - const u8 gMonIcon_Regirock[] = INCBIN_U8("graphics/pokemon/regirock/icon.4bpp"); + const u32 gMonFrontPic_Regirock[] = INCBIN_U32("graphics/pokemon/gen_3/regirock/anim_front.4bpp.lz"); + const u32 gMonPalette_Regirock[] = INCBIN_U32("graphics/pokemon/gen_3/regirock/normal.gbapal.lz"); + const u32 gMonBackPic_Regirock[] = INCBIN_U32("graphics/pokemon/gen_3/regirock/back.4bpp.lz"); + const u32 gMonShinyPalette_Regirock[] = INCBIN_U32("graphics/pokemon/gen_3/regirock/shiny.gbapal.lz"); + const u8 gMonIcon_Regirock[] = INCBIN_U8("graphics/pokemon/gen_3/regirock/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Regirock[] = INCBIN_U8("graphics/pokemon/regirock/footprint.1bpp"); + const u8 gMonFootprint_Regirock[] = INCBIN_U8("graphics/pokemon/gen_3/regirock/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_REGIROCK #if P_FAMILY_REGICE - const u32 gMonFrontPic_Regice[] = INCBIN_U32("graphics/pokemon/regice/anim_front.4bpp.lz"); - const u32 gMonPalette_Regice[] = INCBIN_U32("graphics/pokemon/regice/normal.gbapal.lz"); - const u32 gMonBackPic_Regice[] = INCBIN_U32("graphics/pokemon/regice/back.4bpp.lz"); - const u32 gMonShinyPalette_Regice[] = INCBIN_U32("graphics/pokemon/regice/shiny.gbapal.lz"); - const u8 gMonIcon_Regice[] = INCBIN_U8("graphics/pokemon/regice/icon.4bpp"); + const u32 gMonFrontPic_Regice[] = INCBIN_U32("graphics/pokemon/gen_3/regice/anim_front.4bpp.lz"); + const u32 gMonPalette_Regice[] = INCBIN_U32("graphics/pokemon/gen_3/regice/normal.gbapal.lz"); + const u32 gMonBackPic_Regice[] = INCBIN_U32("graphics/pokemon/gen_3/regice/back.4bpp.lz"); + const u32 gMonShinyPalette_Regice[] = INCBIN_U32("graphics/pokemon/gen_3/regice/shiny.gbapal.lz"); + const u8 gMonIcon_Regice[] = INCBIN_U8("graphics/pokemon/gen_3/regice/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Regice[] = INCBIN_U8("graphics/pokemon/regice/footprint.1bpp"); + const u8 gMonFootprint_Regice[] = INCBIN_U8("graphics/pokemon/gen_3/regice/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_REGICE #if P_FAMILY_REGISTEEL - const u32 gMonFrontPic_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/anim_front.4bpp.lz"); - const u32 gMonPalette_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/normal.gbapal.lz"); - const u32 gMonBackPic_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/back.4bpp.lz"); - const u32 gMonShinyPalette_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/shiny.gbapal.lz"); - const u8 gMonIcon_Registeel[] = INCBIN_U8("graphics/pokemon/registeel/icon.4bpp"); + const u32 gMonFrontPic_Registeel[] = INCBIN_U32("graphics/pokemon/gen_3/registeel/anim_front.4bpp.lz"); + const u32 gMonPalette_Registeel[] = INCBIN_U32("graphics/pokemon/gen_3/registeel/normal.gbapal.lz"); + const u32 gMonBackPic_Registeel[] = INCBIN_U32("graphics/pokemon/gen_3/registeel/back.4bpp.lz"); + const u32 gMonShinyPalette_Registeel[] = INCBIN_U32("graphics/pokemon/gen_3/registeel/shiny.gbapal.lz"); + const u8 gMonIcon_Registeel[] = INCBIN_U8("graphics/pokemon/gen_3/registeel/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Registeel[] = INCBIN_U8("graphics/pokemon/registeel/footprint.1bpp"); + const u8 gMonFootprint_Registeel[] = INCBIN_U8("graphics/pokemon/gen_3/registeel/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_REGISTEEL #if P_FAMILY_LATIAS - const u32 gMonFrontPic_Latias[] = INCBIN_U32("graphics/pokemon/latias/anim_front.4bpp.lz"); - const u32 gMonPalette_Latias[] = INCBIN_U32("graphics/pokemon/latias/normal.gbapal.lz"); - const u32 gMonBackPic_Latias[] = INCBIN_U32("graphics/pokemon/latias/back.4bpp.lz"); - const u32 gMonShinyPalette_Latias[] = INCBIN_U32("graphics/pokemon/latias/shiny.gbapal.lz"); - const u8 gMonIcon_Latias[] = INCBIN_U8("graphics/pokemon/latias/icon.4bpp"); + const u32 gMonFrontPic_Latias[] = INCBIN_U32("graphics/pokemon/gen_3/latias/anim_front.4bpp.lz"); + const u32 gMonPalette_Latias[] = INCBIN_U32("graphics/pokemon/gen_3/latias/normal.gbapal.lz"); + const u32 gMonBackPic_Latias[] = INCBIN_U32("graphics/pokemon/gen_3/latias/back.4bpp.lz"); + const u32 gMonShinyPalette_Latias[] = INCBIN_U32("graphics/pokemon/gen_3/latias/shiny.gbapal.lz"); + const u8 gMonIcon_Latias[] = INCBIN_U8("graphics/pokemon/gen_3/latias/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Latias[] = INCBIN_U8("graphics/pokemon/latias/footprint.1bpp"); + const u8 gMonFootprint_Latias[] = INCBIN_U8("graphics/pokemon/gen_3/latias/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/front.4bpp.lz"); - const u32 gMonPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/normal.gbapal.lz"); - const u32 gMonBackPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/shiny.gbapal.lz"); - const u8 gMonIcon_LatiasMega[] = INCBIN_U8("graphics/pokemon/latias/mega/icon.4bpp"); + const u32 gMonFrontPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/gen_3/latias/mega/front.4bpp.lz"); + const u32 gMonPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/gen_3/latias/mega/normal.gbapal.lz"); + const u32 gMonBackPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/gen_3/latias/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/gen_3/latias/mega/shiny.gbapal.lz"); + const u8 gMonIcon_LatiasMega[] = INCBIN_U8("graphics/pokemon/gen_3/latias/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LATIAS #if P_FAMILY_LATIOS - const u32 gMonFrontPic_Latios[] = INCBIN_U32("graphics/pokemon/latios/anim_front.4bpp.lz"); - const u32 gMonPalette_Latios[] = INCBIN_U32("graphics/pokemon/latios/normal.gbapal.lz"); - const u32 gMonBackPic_Latios[] = INCBIN_U32("graphics/pokemon/latios/back.4bpp.lz"); - const u32 gMonShinyPalette_Latios[] = INCBIN_U32("graphics/pokemon/latios/shiny.gbapal.lz"); - const u8 gMonIcon_Latios[] = INCBIN_U8("graphics/pokemon/latios/icon.4bpp"); + const u32 gMonFrontPic_Latios[] = INCBIN_U32("graphics/pokemon/gen_3/latios/anim_front.4bpp.lz"); + const u32 gMonPalette_Latios[] = INCBIN_U32("graphics/pokemon/gen_3/latios/normal.gbapal.lz"); + const u32 gMonBackPic_Latios[] = INCBIN_U32("graphics/pokemon/gen_3/latios/back.4bpp.lz"); + const u32 gMonShinyPalette_Latios[] = INCBIN_U32("graphics/pokemon/gen_3/latios/shiny.gbapal.lz"); + const u8 gMonIcon_Latios[] = INCBIN_U8("graphics/pokemon/gen_3/latios/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Latios[] = INCBIN_U8("graphics/pokemon/latios/footprint.1bpp"); + const u8 gMonFootprint_Latios[] = INCBIN_U8("graphics/pokemon/gen_3/latios/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/front.4bpp.lz"); - const u32 gMonPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/normal.gbapal.lz"); - const u32 gMonBackPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/shiny.gbapal.lz"); - const u8 gMonIcon_LatiosMega[] = INCBIN_U8("graphics/pokemon/latios/mega/icon.4bpp"); + const u32 gMonFrontPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/gen_3/latios/mega/front.4bpp.lz"); + const u32 gMonPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/gen_3/latios/mega/normal.gbapal.lz"); + const u32 gMonBackPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/gen_3/latios/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/gen_3/latios/mega/shiny.gbapal.lz"); + const u8 gMonIcon_LatiosMega[] = INCBIN_U8("graphics/pokemon/gen_3/latios/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LATIOS #if P_FAMILY_KYOGRE - const u32 gMonFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/anim_front.4bpp.lz"); - const u32 gMonPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/normal.gbapal.lz"); - const u32 gMonBackPic_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/back.4bpp.lz"); - const u32 gMonShinyPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/shiny.gbapal.lz"); - const u8 gMonIcon_Kyogre[] = INCBIN_U8("graphics/pokemon/kyogre/icon.4bpp"); + const u32 gMonFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/anim_front.4bpp.lz"); + const u32 gMonPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/normal.gbapal.lz"); + const u32 gMonBackPic_Kyogre[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/back.4bpp.lz"); + const u32 gMonShinyPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/shiny.gbapal.lz"); + const u8 gMonIcon_Kyogre[] = INCBIN_U8("graphics/pokemon/gen_3/kyogre/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kyogre[] = INCBIN_U8("graphics/pokemon/kyogre/footprint.1bpp"); + const u8 gMonFootprint_Kyogre[] = INCBIN_U8("graphics/pokemon/gen_3/kyogre/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_PRIMAL_REVERSIONS - const u32 gMonFrontPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/front.4bpp.lz"); - const u32 gMonPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/normal.gbapal.lz"); - const u32 gMonBackPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/back.4bpp.lz"); - const u32 gMonShinyPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/shiny.gbapal.lz"); - const u8 gMonIcon_KyogrePrimal[] = INCBIN_U8("graphics/pokemon/kyogre/primal/icon.4bpp"); + const u32 gMonFrontPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/primal/front.4bpp.lz"); + const u32 gMonPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/primal/normal.gbapal.lz"); + const u32 gMonBackPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/primal/back.4bpp.lz"); + const u32 gMonShinyPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/gen_3/kyogre/primal/shiny.gbapal.lz"); + const u8 gMonIcon_KyogrePrimal[] = INCBIN_U8("graphics/pokemon/gen_3/kyogre/primal/icon.4bpp"); #endif //P_PRIMAL_REVERSIONS #endif //P_FAMILY_KYOGRE #if P_FAMILY_GROUDON - const u32 gMonFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/anim_front.4bpp.lz"); - const u32 gMonPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/normal.gbapal.lz"); - const u32 gMonBackPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/back.4bpp.lz"); - const u32 gMonShinyPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/shiny.gbapal.lz"); - const u8 gMonIcon_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/icon.4bpp"); + const u32 gMonFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/anim_front.4bpp.lz"); + const u32 gMonPalette_Groudon[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/normal.gbapal.lz"); + const u32 gMonBackPic_Groudon[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/back.4bpp.lz"); + const u32 gMonShinyPalette_Groudon[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/shiny.gbapal.lz"); + const u8 gMonIcon_Groudon[] = INCBIN_U8("graphics/pokemon/gen_3/groudon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/footprint.1bpp"); + const u8 gMonFootprint_Groudon[] = INCBIN_U8("graphics/pokemon/gen_3/groudon/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_PRIMAL_REVERSIONS - const u32 gMonFrontPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/front.4bpp.lz"); - const u32 gMonPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/normal.gbapal.lz"); - const u32 gMonBackPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/back.4bpp.lz"); - const u32 gMonShinyPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/shiny.gbapal.lz"); - const u8 gMonIcon_GroudonPrimal[] = INCBIN_U8("graphics/pokemon/groudon/primal/icon.4bpp"); + const u32 gMonFrontPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/primal/front.4bpp.lz"); + const u32 gMonPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/primal/normal.gbapal.lz"); + const u32 gMonBackPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/primal/back.4bpp.lz"); + const u32 gMonShinyPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/gen_3/groudon/primal/shiny.gbapal.lz"); + const u8 gMonIcon_GroudonPrimal[] = INCBIN_U8("graphics/pokemon/gen_3/groudon/primal/icon.4bpp"); #endif //P_PRIMAL_REVERSIONS #endif //P_FAMILY_GROUDON #if P_FAMILY_RAYQUAZA - const u32 gMonFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/anim_front.4bpp.lz"); - const u32 gMonPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/normal.gbapal.lz"); - const u32 gMonBackPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/back.4bpp.lz"); - const u32 gMonShinyPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/shiny.gbapal.lz"); - const u8 gMonIcon_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/icon.4bpp"); + const u32 gMonFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/anim_front.4bpp.lz"); + const u32 gMonPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/normal.gbapal.lz"); + const u32 gMonBackPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/back.4bpp.lz"); + const u32 gMonShinyPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/shiny.gbapal.lz"); + const u8 gMonIcon_Rayquaza[] = INCBIN_U8("graphics/pokemon/gen_3/rayquaza/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/footprint.1bpp"); + const u8 gMonFootprint_Rayquaza[] = INCBIN_U8("graphics/pokemon/gen_3/rayquaza/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/front.4bpp.lz"); - const u32 gMonPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/normal.gbapal.lz"); - const u32 gMonBackPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/shiny.gbapal.lz"); - const u8 gMonIcon_RayquazaMega[] = INCBIN_U8("graphics/pokemon/rayquaza/mega/icon.4bpp"); + const u32 gMonFrontPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/mega/front.4bpp.lz"); + const u32 gMonPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/mega/normal.gbapal.lz"); + const u32 gMonBackPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/gen_3/rayquaza/mega/shiny.gbapal.lz"); + const u8 gMonIcon_RayquazaMega[] = INCBIN_U8("graphics/pokemon/gen_3/rayquaza/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_RAYQUAZA #if P_FAMILY_JIRACHI - const u32 gMonFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/anim_front.4bpp.lz"); - const u32 gMonPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/normal.gbapal.lz"); - const u32 gMonBackPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/back.4bpp.lz"); - const u32 gMonShinyPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/shiny.gbapal.lz"); - const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/icon.4bpp"); + const u32 gMonFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/gen_3/jirachi/anim_front.4bpp.lz"); + const u32 gMonPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/gen_3/jirachi/normal.gbapal.lz"); + const u32 gMonBackPic_Jirachi[] = INCBIN_U32("graphics/pokemon/gen_3/jirachi/back.4bpp.lz"); + const u32 gMonShinyPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/gen_3/jirachi/shiny.gbapal.lz"); + const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/gen_3/jirachi/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/footprint.1bpp"); + const u8 gMonFootprint_Jirachi[] = INCBIN_U8("graphics/pokemon/gen_3/jirachi/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_JIRACHI #if P_FAMILY_DEOXYS - const u32 gMonFrontPic_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/anim_front.4bpp.lz"); - const u32 gMonPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/normal.gbapal.lz"); - const u32 gMonBackPic_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/back.4bpp.lz"); - const u32 gMonShinyPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/shiny.gbapal.lz"); - const u8 gMonIcon_DeoxysNormal[] = INCBIN_U8("graphics/pokemon/deoxys/icon.4bpp"); + const u32 gMonFrontPic_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/anim_front.4bpp.lz"); + const u32 gMonPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/normal.gbapal.lz"); + const u32 gMonBackPic_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/back.4bpp.lz"); + const u32 gMonShinyPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/shiny.gbapal.lz"); + const u8 gMonIcon_DeoxysNormal[] = INCBIN_U8("graphics/pokemon/gen_3/deoxys/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/footprint.1bpp"); + const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/gen_3/deoxys/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/anim_front.4bpp.lz"); - const u32 gMonPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/normal.gbapal.lz"); - const u32 gMonBackPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/back.4bpp.lz"); - const u32 gMonShinyPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/shiny.gbapal.lz"); - const u8 gMonIcon_DeoxysAttack[] = INCBIN_U8("graphics/pokemon/deoxys/attack/icon.4bpp"); + const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/attack/anim_front.4bpp.lz"); + const u32 gMonPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/attack/normal.gbapal.lz"); + const u32 gMonBackPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/attack/back.4bpp.lz"); + const u32 gMonShinyPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/attack/shiny.gbapal.lz"); + const u8 gMonIcon_DeoxysAttack[] = INCBIN_U8("graphics/pokemon/gen_3/deoxys/attack/icon.4bpp"); - const u32 gMonFrontPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/anim_front.4bpp.lz"); - const u32 gMonPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/normal.gbapal.lz"); - const u32 gMonBackPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/back.4bpp.lz"); - const u32 gMonShinyPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/shiny.gbapal.lz"); - const u8 gMonIcon_DeoxysDefense[] = INCBIN_U8("graphics/pokemon/deoxys/defense/icon.4bpp"); + const u32 gMonFrontPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/defense/anim_front.4bpp.lz"); + const u32 gMonPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/defense/normal.gbapal.lz"); + const u32 gMonBackPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/defense/back.4bpp.lz"); + const u32 gMonShinyPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/defense/shiny.gbapal.lz"); + const u8 gMonIcon_DeoxysDefense[] = INCBIN_U8("graphics/pokemon/gen_3/deoxys/defense/icon.4bpp"); - const u32 gMonFrontPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/anim_front.4bpp.lz"); - const u32 gMonPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/normal.gbapal.lz"); - const u32 gMonBackPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/back.4bpp.lz"); - const u32 gMonShinyPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/shiny.gbapal.lz"); - const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys/speed/icon.4bpp"); + const u32 gMonFrontPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/speed/anim_front.4bpp.lz"); + const u32 gMonPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/speed/normal.gbapal.lz"); + const u32 gMonBackPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/speed/back.4bpp.lz"); + const u32 gMonShinyPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/gen_3/deoxys/speed/shiny.gbapal.lz"); + const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/gen_3/deoxys/speed/icon.4bpp"); #endif //P_FAMILY_DEOXYS #if P_FAMILY_TURTWIG - const u32 gMonFrontPic_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/anim_front.4bpp.lz"); - const u32 gMonPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/normal.gbapal.lz"); - const u32 gMonBackPic_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/back.4bpp.lz"); - const u32 gMonShinyPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/shiny.gbapal.lz"); - const u8 gMonIcon_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/icon.4bpp"); + const u32 gMonFrontPic_Turtwig[] = INCBIN_U32("graphics/pokemon/gen_4/turtwig/anim_front.4bpp.lz"); + const u32 gMonPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/gen_4/turtwig/normal.gbapal.lz"); + const u32 gMonBackPic_Turtwig[] = INCBIN_U32("graphics/pokemon/gen_4/turtwig/back.4bpp.lz"); + const u32 gMonShinyPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/gen_4/turtwig/shiny.gbapal.lz"); + const u8 gMonIcon_Turtwig[] = INCBIN_U8("graphics/pokemon/gen_4/turtwig/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/footprint.1bpp"); + const u8 gMonFootprint_Turtwig[] = INCBIN_U8("graphics/pokemon/gen_4/turtwig/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/anim_front.4bpp.lz"); - const u32 gMonPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/normal.gbapal.lz"); - const u32 gMonBackPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/back.4bpp.lz"); - const u32 gMonShinyPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/shiny.gbapal.lz"); - const u8 gMonIcon_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/icon.4bpp"); + const u32 gMonFrontPic_Grotle[] = INCBIN_U32("graphics/pokemon/gen_4/grotle/anim_front.4bpp.lz"); + const u32 gMonPalette_Grotle[] = INCBIN_U32("graphics/pokemon/gen_4/grotle/normal.gbapal.lz"); + const u32 gMonBackPic_Grotle[] = INCBIN_U32("graphics/pokemon/gen_4/grotle/back.4bpp.lz"); + const u32 gMonShinyPalette_Grotle[] = INCBIN_U32("graphics/pokemon/gen_4/grotle/shiny.gbapal.lz"); + const u8 gMonIcon_Grotle[] = INCBIN_U8("graphics/pokemon/gen_4/grotle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/footprint.1bpp"); + const u8 gMonFootprint_Grotle[] = INCBIN_U8("graphics/pokemon/gen_4/grotle/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/anim_front.4bpp.lz"); - const u32 gMonPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/normal.gbapal.lz"); - const u32 gMonBackPic_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/back.4bpp.lz"); - const u32 gMonShinyPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/shiny.gbapal.lz"); - const u8 gMonIcon_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/icon.4bpp"); + const u32 gMonFrontPic_Torterra[] = INCBIN_U32("graphics/pokemon/gen_4/torterra/anim_front.4bpp.lz"); + const u32 gMonPalette_Torterra[] = INCBIN_U32("graphics/pokemon/gen_4/torterra/normal.gbapal.lz"); + const u32 gMonBackPic_Torterra[] = INCBIN_U32("graphics/pokemon/gen_4/torterra/back.4bpp.lz"); + const u32 gMonShinyPalette_Torterra[] = INCBIN_U32("graphics/pokemon/gen_4/torterra/shiny.gbapal.lz"); + const u8 gMonIcon_Torterra[] = INCBIN_U8("graphics/pokemon/gen_4/torterra/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/footprint.1bpp"); + const u8 gMonFootprint_Torterra[] = INCBIN_U8("graphics/pokemon/gen_4/torterra/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TURTWIG #if P_FAMILY_CHIMCHAR - const u32 gMonFrontPic_Chimchar[] = INCBIN_U32("graphics/pokemon/chimchar/anim_front.4bpp.lz"); - const u32 gMonPalette_Chimchar[] = INCBIN_U32("graphics/pokemon/chimchar/normal.gbapal.lz"); - const u32 gMonBackPic_Chimchar[] = INCBIN_U32("graphics/pokemon/chimchar/back.4bpp.lz"); - const u32 gMonShinyPalette_Chimchar[] = INCBIN_U32("graphics/pokemon/chimchar/shiny.gbapal.lz"); - const u8 gMonIcon_Chimchar[] = INCBIN_U8("graphics/pokemon/chimchar/icon.4bpp"); + const u32 gMonFrontPic_Chimchar[] = INCBIN_U32("graphics/pokemon/gen_4/chimchar/anim_front.4bpp.lz"); + const u32 gMonPalette_Chimchar[] = INCBIN_U32("graphics/pokemon/gen_4/chimchar/normal.gbapal.lz"); + const u32 gMonBackPic_Chimchar[] = INCBIN_U32("graphics/pokemon/gen_4/chimchar/back.4bpp.lz"); + const u32 gMonShinyPalette_Chimchar[] = INCBIN_U32("graphics/pokemon/gen_4/chimchar/shiny.gbapal.lz"); + const u8 gMonIcon_Chimchar[] = INCBIN_U8("graphics/pokemon/gen_4/chimchar/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Chimchar[] = INCBIN_U8("graphics/pokemon/chimchar/footprint.1bpp"); + const u8 gMonFootprint_Chimchar[] = INCBIN_U8("graphics/pokemon/gen_4/chimchar/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/anim_front.4bpp.lz"); - const u32 gMonPalette_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/normal.gbapal.lz"); - const u32 gMonBackPic_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/back.4bpp.lz"); - const u32 gMonShinyPalette_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/shiny.gbapal.lz"); - const u8 gMonIcon_Monferno[] = INCBIN_U8("graphics/pokemon/monferno/icon.4bpp"); + const u32 gMonFrontPic_Monferno[] = INCBIN_U32("graphics/pokemon/gen_4/monferno/anim_front.4bpp.lz"); + const u32 gMonPalette_Monferno[] = INCBIN_U32("graphics/pokemon/gen_4/monferno/normal.gbapal.lz"); + const u32 gMonBackPic_Monferno[] = INCBIN_U32("graphics/pokemon/gen_4/monferno/back.4bpp.lz"); + const u32 gMonShinyPalette_Monferno[] = INCBIN_U32("graphics/pokemon/gen_4/monferno/shiny.gbapal.lz"); + const u8 gMonIcon_Monferno[] = INCBIN_U8("graphics/pokemon/gen_4/monferno/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Monferno[] = INCBIN_U8("graphics/pokemon/monferno/footprint.1bpp"); + const u8 gMonFootprint_Monferno[] = INCBIN_U8("graphics/pokemon/gen_4/monferno/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/anim_front.4bpp.lz"); - const u32 gMonPalette_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/normal.gbapal.lz"); - const u32 gMonBackPic_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/back.4bpp.lz"); - const u32 gMonShinyPalette_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/shiny.gbapal.lz"); - const u8 gMonIcon_Infernape[] = INCBIN_U8("graphics/pokemon/infernape/icon.4bpp"); + const u32 gMonFrontPic_Infernape[] = INCBIN_U32("graphics/pokemon/gen_4/infernape/anim_front.4bpp.lz"); + const u32 gMonPalette_Infernape[] = INCBIN_U32("graphics/pokemon/gen_4/infernape/normal.gbapal.lz"); + const u32 gMonBackPic_Infernape[] = INCBIN_U32("graphics/pokemon/gen_4/infernape/back.4bpp.lz"); + const u32 gMonShinyPalette_Infernape[] = INCBIN_U32("graphics/pokemon/gen_4/infernape/shiny.gbapal.lz"); + const u8 gMonIcon_Infernape[] = INCBIN_U8("graphics/pokemon/gen_4/infernape/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Infernape[] = INCBIN_U8("graphics/pokemon/infernape/footprint.1bpp"); + const u8 gMonFootprint_Infernape[] = INCBIN_U8("graphics/pokemon/gen_4/infernape/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CHIMCHAR #if P_FAMILY_PIPLUP - const u32 gMonFrontPic_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/anim_front.4bpp.lz"); - const u32 gMonPalette_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/normal.gbapal.lz"); - const u32 gMonBackPic_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/back.4bpp.lz"); - const u32 gMonShinyPalette_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/shiny.gbapal.lz"); - const u8 gMonIcon_Piplup[] = INCBIN_U8("graphics/pokemon/piplup/icon.4bpp"); + const u32 gMonFrontPic_Piplup[] = INCBIN_U32("graphics/pokemon/gen_4/piplup/anim_front.4bpp.lz"); + const u32 gMonPalette_Piplup[] = INCBIN_U32("graphics/pokemon/gen_4/piplup/normal.gbapal.lz"); + const u32 gMonBackPic_Piplup[] = INCBIN_U32("graphics/pokemon/gen_4/piplup/back.4bpp.lz"); + const u32 gMonShinyPalette_Piplup[] = INCBIN_U32("graphics/pokemon/gen_4/piplup/shiny.gbapal.lz"); + const u8 gMonIcon_Piplup[] = INCBIN_U8("graphics/pokemon/gen_4/piplup/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Piplup[] = INCBIN_U8("graphics/pokemon/piplup/footprint.1bpp"); + const u8 gMonFootprint_Piplup[] = INCBIN_U8("graphics/pokemon/gen_4/piplup/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/anim_front.4bpp.lz"); - const u32 gMonPalette_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/normal.gbapal.lz"); - const u32 gMonBackPic_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/back.4bpp.lz"); - const u32 gMonShinyPalette_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/shiny.gbapal.lz"); - const u8 gMonIcon_Prinplup[] = INCBIN_U8("graphics/pokemon/prinplup/icon.4bpp"); + const u32 gMonFrontPic_Prinplup[] = INCBIN_U32("graphics/pokemon/gen_4/prinplup/anim_front.4bpp.lz"); + const u32 gMonPalette_Prinplup[] = INCBIN_U32("graphics/pokemon/gen_4/prinplup/normal.gbapal.lz"); + const u32 gMonBackPic_Prinplup[] = INCBIN_U32("graphics/pokemon/gen_4/prinplup/back.4bpp.lz"); + const u32 gMonShinyPalette_Prinplup[] = INCBIN_U32("graphics/pokemon/gen_4/prinplup/shiny.gbapal.lz"); + const u8 gMonIcon_Prinplup[] = INCBIN_U8("graphics/pokemon/gen_4/prinplup/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Prinplup[] = INCBIN_U8("graphics/pokemon/prinplup/footprint.1bpp"); + const u8 gMonFootprint_Prinplup[] = INCBIN_U8("graphics/pokemon/gen_4/prinplup/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/anim_front.4bpp.lz"); - const u32 gMonPalette_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/normal.gbapal.lz"); - const u32 gMonBackPic_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/back.4bpp.lz"); - const u32 gMonShinyPalette_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/shiny.gbapal.lz"); - const u8 gMonIcon_Empoleon[] = INCBIN_U8("graphics/pokemon/empoleon/icon.4bpp"); + const u32 gMonFrontPic_Empoleon[] = INCBIN_U32("graphics/pokemon/gen_4/empoleon/anim_front.4bpp.lz"); + const u32 gMonPalette_Empoleon[] = INCBIN_U32("graphics/pokemon/gen_4/empoleon/normal.gbapal.lz"); + const u32 gMonBackPic_Empoleon[] = INCBIN_U32("graphics/pokemon/gen_4/empoleon/back.4bpp.lz"); + const u32 gMonShinyPalette_Empoleon[] = INCBIN_U32("graphics/pokemon/gen_4/empoleon/shiny.gbapal.lz"); + const u8 gMonIcon_Empoleon[] = INCBIN_U8("graphics/pokemon/gen_4/empoleon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Empoleon[] = INCBIN_U8("graphics/pokemon/empoleon/footprint.1bpp"); + const u8 gMonFootprint_Empoleon[] = INCBIN_U8("graphics/pokemon/gen_4/empoleon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PIPLUP #if P_FAMILY_STARLY - const u32 gMonFrontPic_Starly[] = INCBIN_U32("graphics/pokemon/starly/anim_front.4bpp.lz"); - const u32 gMonPalette_Starly[] = INCBIN_U32("graphics/pokemon/starly/normal.gbapal.lz"); - const u32 gMonBackPic_Starly[] = INCBIN_U32("graphics/pokemon/starly/back.4bpp.lz"); - const u32 gMonShinyPalette_Starly[] = INCBIN_U32("graphics/pokemon/starly/shiny.gbapal.lz"); - const u8 gMonIcon_Starly[] = INCBIN_U8("graphics/pokemon/starly/icon.4bpp"); + const u32 gMonFrontPic_Starly[] = INCBIN_U32("graphics/pokemon/gen_4/starly/anim_front.4bpp.lz"); + const u32 gMonPalette_Starly[] = INCBIN_U32("graphics/pokemon/gen_4/starly/normal.gbapal.lz"); + const u32 gMonBackPic_Starly[] = INCBIN_U32("graphics/pokemon/gen_4/starly/back.4bpp.lz"); + const u32 gMonShinyPalette_Starly[] = INCBIN_U32("graphics/pokemon/gen_4/starly/shiny.gbapal.lz"); + const u8 gMonIcon_Starly[] = INCBIN_U8("graphics/pokemon/gen_4/starly/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Starly[] = INCBIN_U8("graphics/pokemon/starly/footprint.1bpp"); + const u8 gMonFootprint_Starly[] = INCBIN_U8("graphics/pokemon/gen_4/starly/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_StarlyF[] = INCBIN_U32("graphics/pokemon/starly/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_StarlyF[] = INCBIN_U32("graphics/pokemon/starly/backf.4bpp.lz"); + const u32 gMonFrontPic_StarlyF[] = INCBIN_U32("graphics/pokemon/gen_4/starly/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_StarlyF[] = INCBIN_U32("graphics/pokemon/gen_4/starly/backf.4bpp.lz"); - const u32 gMonFrontPic_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/anim_front.4bpp.lz"); - const u32 gMonPalette_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/normal.gbapal.lz"); - const u32 gMonBackPic_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/back.4bpp.lz"); - const u32 gMonShinyPalette_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/shiny.gbapal.lz"); - const u8 gMonIcon_Staravia[] = INCBIN_U8("graphics/pokemon/staravia/icon.4bpp"); + const u32 gMonFrontPic_Staravia[] = INCBIN_U32("graphics/pokemon/gen_4/staravia/anim_front.4bpp.lz"); + const u32 gMonPalette_Staravia[] = INCBIN_U32("graphics/pokemon/gen_4/staravia/normal.gbapal.lz"); + const u32 gMonBackPic_Staravia[] = INCBIN_U32("graphics/pokemon/gen_4/staravia/back.4bpp.lz"); + const u32 gMonShinyPalette_Staravia[] = INCBIN_U32("graphics/pokemon/gen_4/staravia/shiny.gbapal.lz"); + const u8 gMonIcon_Staravia[] = INCBIN_U8("graphics/pokemon/gen_4/staravia/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Staravia[] = INCBIN_U8("graphics/pokemon/staravia/footprint.1bpp"); + const u8 gMonFootprint_Staravia[] = INCBIN_U8("graphics/pokemon/gen_4/staravia/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_StaraviaF[] = INCBIN_U32("graphics/pokemon/staravia/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_StaraviaF[] = INCBIN_U32("graphics/pokemon/staravia/back.4bpp.lz"); + const u32 gMonFrontPic_StaraviaF[] = INCBIN_U32("graphics/pokemon/gen_4/staravia/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_StaraviaF[] = INCBIN_U32("graphics/pokemon/gen_4/staravia/back.4bpp.lz"); - const u32 gMonFrontPic_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/anim_front.4bpp.lz"); - const u32 gMonPalette_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/normal.gbapal.lz"); - const u32 gMonBackPic_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/back.4bpp.lz"); - const u32 gMonShinyPalette_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/shiny.gbapal.lz"); - const u8 gMonIcon_Staraptor[] = INCBIN_U8("graphics/pokemon/staraptor/icon.4bpp"); + const u32 gMonFrontPic_Staraptor[] = INCBIN_U32("graphics/pokemon/gen_4/staraptor/anim_front.4bpp.lz"); + const u32 gMonPalette_Staraptor[] = INCBIN_U32("graphics/pokemon/gen_4/staraptor/normal.gbapal.lz"); + const u32 gMonBackPic_Staraptor[] = INCBIN_U32("graphics/pokemon/gen_4/staraptor/back.4bpp.lz"); + const u32 gMonShinyPalette_Staraptor[] = INCBIN_U32("graphics/pokemon/gen_4/staraptor/shiny.gbapal.lz"); + const u8 gMonIcon_Staraptor[] = INCBIN_U8("graphics/pokemon/gen_4/staraptor/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Staraptor[] = INCBIN_U8("graphics/pokemon/staraptor/footprint.1bpp"); + const u8 gMonFootprint_Staraptor[] = INCBIN_U8("graphics/pokemon/gen_4/staraptor/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_StaraptorF[] = INCBIN_U32("graphics/pokemon/staraptor/anim_frontf.4bpp.lz"); + const u32 gMonFrontPic_StaraptorF[] = INCBIN_U32("graphics/pokemon/gen_4/staraptor/anim_frontf.4bpp.lz"); #endif //P_FAMILY_STARLY #if P_FAMILY_BIDOOF - const u32 gMonFrontPic_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/anim_front.4bpp.lz"); - const u32 gMonPalette_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/normal.gbapal.lz"); - const u32 gMonBackPic_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/back.4bpp.lz"); - const u32 gMonShinyPalette_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/shiny.gbapal.lz"); - const u8 gMonIcon_Bidoof[] = INCBIN_U8("graphics/pokemon/bidoof/icon.4bpp"); + const u32 gMonFrontPic_Bidoof[] = INCBIN_U32("graphics/pokemon/gen_4/bidoof/anim_front.4bpp.lz"); + const u32 gMonPalette_Bidoof[] = INCBIN_U32("graphics/pokemon/gen_4/bidoof/normal.gbapal.lz"); + const u32 gMonBackPic_Bidoof[] = INCBIN_U32("graphics/pokemon/gen_4/bidoof/back.4bpp.lz"); + const u32 gMonShinyPalette_Bidoof[] = INCBIN_U32("graphics/pokemon/gen_4/bidoof/shiny.gbapal.lz"); + const u8 gMonIcon_Bidoof[] = INCBIN_U8("graphics/pokemon/gen_4/bidoof/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bidoof[] = INCBIN_U8("graphics/pokemon/bidoof/footprint.1bpp"); + const u8 gMonFootprint_Bidoof[] = INCBIN_U8("graphics/pokemon/gen_4/bidoof/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_BidoofF[] = INCBIN_U32("graphics/pokemon/bidoof/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_BidoofF[] = INCBIN_U32("graphics/pokemon/bidoof/backf.4bpp.lz"); + const u32 gMonFrontPic_BidoofF[] = INCBIN_U32("graphics/pokemon/gen_4/bidoof/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_BidoofF[] = INCBIN_U32("graphics/pokemon/gen_4/bidoof/backf.4bpp.lz"); - const u32 gMonFrontPic_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/anim_front.4bpp.lz"); - const u32 gMonPalette_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/normal.gbapal.lz"); - const u32 gMonBackPic_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/back.4bpp.lz"); - const u32 gMonShinyPalette_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/shiny.gbapal.lz"); - const u8 gMonIcon_Bibarel[] = INCBIN_U8("graphics/pokemon/bibarel/icon.4bpp"); + const u32 gMonFrontPic_Bibarel[] = INCBIN_U32("graphics/pokemon/gen_4/bibarel/anim_front.4bpp.lz"); + const u32 gMonPalette_Bibarel[] = INCBIN_U32("graphics/pokemon/gen_4/bibarel/normal.gbapal.lz"); + const u32 gMonBackPic_Bibarel[] = INCBIN_U32("graphics/pokemon/gen_4/bibarel/back.4bpp.lz"); + const u32 gMonShinyPalette_Bibarel[] = INCBIN_U32("graphics/pokemon/gen_4/bibarel/shiny.gbapal.lz"); + const u8 gMonIcon_Bibarel[] = INCBIN_U8("graphics/pokemon/gen_4/bibarel/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bibarel[] = INCBIN_U8("graphics/pokemon/bibarel/footprint.1bpp"); + const u8 gMonFootprint_Bibarel[] = INCBIN_U8("graphics/pokemon/gen_4/bibarel/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_BibarelF[] = INCBIN_U32("graphics/pokemon/bibarel/anim_frontf.4bpp.lz"); + const u32 gMonFrontPic_BibarelF[] = INCBIN_U32("graphics/pokemon/gen_4/bibarel/anim_frontf.4bpp.lz"); #endif //P_FAMILY_BIDOOF #if P_FAMILY_KRICKETOT - const u32 gMonFrontPic_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/anim_front.4bpp.lz"); - const u32 gMonPalette_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/normal.gbapal.lz"); - const u32 gMonBackPic_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/back.4bpp.lz"); - const u32 gMonShinyPalette_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/shiny.gbapal.lz"); - const u8 gMonIcon_Kricketot[] = INCBIN_U8("graphics/pokemon/kricketot/icon.4bpp"); + const u32 gMonFrontPic_Kricketot[] = INCBIN_U32("graphics/pokemon/gen_4/kricketot/anim_front.4bpp.lz"); + const u32 gMonPalette_Kricketot[] = INCBIN_U32("graphics/pokemon/gen_4/kricketot/normal.gbapal.lz"); + const u32 gMonBackPic_Kricketot[] = INCBIN_U32("graphics/pokemon/gen_4/kricketot/back.4bpp.lz"); + const u32 gMonShinyPalette_Kricketot[] = INCBIN_U32("graphics/pokemon/gen_4/kricketot/shiny.gbapal.lz"); + const u8 gMonIcon_Kricketot[] = INCBIN_U8("graphics/pokemon/gen_4/kricketot/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kricketot[] = INCBIN_U8("graphics/pokemon/kricketot/footprint.1bpp"); + const u8 gMonFootprint_Kricketot[] = INCBIN_U8("graphics/pokemon/gen_4/kricketot/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_KricketotF[] = INCBIN_U32("graphics/pokemon/kricketot/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_KricketotF[] = INCBIN_U32("graphics/pokemon/kricketot/backf.4bpp.lz"); + const u32 gMonFrontPic_KricketotF[] = INCBIN_U32("graphics/pokemon/gen_4/kricketot/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_KricketotF[] = INCBIN_U32("graphics/pokemon/gen_4/kricketot/backf.4bpp.lz"); - const u32 gMonFrontPic_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/anim_front.4bpp.lz"); - const u32 gMonPalette_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/normal.gbapal.lz"); - const u32 gMonBackPic_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/back.4bpp.lz"); - const u32 gMonShinyPalette_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/shiny.gbapal.lz"); - const u8 gMonIcon_Kricketune[] = INCBIN_U8("graphics/pokemon/kricketune/icon.4bpp"); + const u32 gMonFrontPic_Kricketune[] = INCBIN_U32("graphics/pokemon/gen_4/kricketune/anim_front.4bpp.lz"); + const u32 gMonPalette_Kricketune[] = INCBIN_U32("graphics/pokemon/gen_4/kricketune/normal.gbapal.lz"); + const u32 gMonBackPic_Kricketune[] = INCBIN_U32("graphics/pokemon/gen_4/kricketune/back.4bpp.lz"); + const u32 gMonShinyPalette_Kricketune[] = INCBIN_U32("graphics/pokemon/gen_4/kricketune/shiny.gbapal.lz"); + const u8 gMonIcon_Kricketune[] = INCBIN_U8("graphics/pokemon/gen_4/kricketune/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kricketune[] = INCBIN_U8("graphics/pokemon/kricketune/footprint.1bpp"); + const u8 gMonFootprint_Kricketune[] = INCBIN_U8("graphics/pokemon/gen_4/kricketune/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_KricketuneF[] = INCBIN_U32("graphics/pokemon/kricketune/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_KricketuneF[] = INCBIN_U32("graphics/pokemon/kricketune/backf.4bpp.lz"); + const u32 gMonFrontPic_KricketuneF[] = INCBIN_U32("graphics/pokemon/gen_4/kricketune/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_KricketuneF[] = INCBIN_U32("graphics/pokemon/gen_4/kricketune/backf.4bpp.lz"); #endif //P_FAMILY_KRICKETOT #if P_FAMILY_SHINX - const u32 gMonFrontPic_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/anim_front.4bpp.lz"); - const u32 gMonPalette_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/normal.gbapal.lz"); - const u32 gMonBackPic_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/back.4bpp.lz"); - const u32 gMonShinyPalette_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/shiny.gbapal.lz"); - const u8 gMonIcon_Shinx[] = INCBIN_U8("graphics/pokemon/shinx/icon.4bpp"); + const u32 gMonFrontPic_Shinx[] = INCBIN_U32("graphics/pokemon/gen_4/shinx/anim_front.4bpp.lz"); + const u32 gMonPalette_Shinx[] = INCBIN_U32("graphics/pokemon/gen_4/shinx/normal.gbapal.lz"); + const u32 gMonBackPic_Shinx[] = INCBIN_U32("graphics/pokemon/gen_4/shinx/back.4bpp.lz"); + const u32 gMonShinyPalette_Shinx[] = INCBIN_U32("graphics/pokemon/gen_4/shinx/shiny.gbapal.lz"); + const u8 gMonIcon_Shinx[] = INCBIN_U8("graphics/pokemon/gen_4/shinx/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Shinx[] = INCBIN_U8("graphics/pokemon/shinx/footprint.1bpp"); + const u8 gMonFootprint_Shinx[] = INCBIN_U8("graphics/pokemon/gen_4/shinx/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ShinxF[] = INCBIN_U32("graphics/pokemon/shinx/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_ShinxF[] = INCBIN_U32("graphics/pokemon/shinx/backf.4bpp.lz"); + const u32 gMonFrontPic_ShinxF[] = INCBIN_U32("graphics/pokemon/gen_4/shinx/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_ShinxF[] = INCBIN_U32("graphics/pokemon/gen_4/shinx/backf.4bpp.lz"); - const u32 gMonFrontPic_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/anim_front.4bpp.lz"); - const u32 gMonPalette_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/normal.gbapal.lz"); - const u32 gMonBackPic_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/back.4bpp.lz"); - const u32 gMonShinyPalette_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/shiny.gbapal.lz"); - const u8 gMonIcon_Luxio[] = INCBIN_U8("graphics/pokemon/luxio/icon.4bpp"); + const u32 gMonFrontPic_Luxio[] = INCBIN_U32("graphics/pokemon/gen_4/luxio/anim_front.4bpp.lz"); + const u32 gMonPalette_Luxio[] = INCBIN_U32("graphics/pokemon/gen_4/luxio/normal.gbapal.lz"); + const u32 gMonBackPic_Luxio[] = INCBIN_U32("graphics/pokemon/gen_4/luxio/back.4bpp.lz"); + const u32 gMonShinyPalette_Luxio[] = INCBIN_U32("graphics/pokemon/gen_4/luxio/shiny.gbapal.lz"); + const u8 gMonIcon_Luxio[] = INCBIN_U8("graphics/pokemon/gen_4/luxio/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Luxio[] = INCBIN_U8("graphics/pokemon/luxio/footprint.1bpp"); + const u8 gMonFootprint_Luxio[] = INCBIN_U8("graphics/pokemon/gen_4/luxio/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_LuxioF[] = INCBIN_U32("graphics/pokemon/luxio/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_LuxioF[] = INCBIN_U32("graphics/pokemon/luxio/backf.4bpp.lz"); + const u32 gMonFrontPic_LuxioF[] = INCBIN_U32("graphics/pokemon/gen_4/luxio/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_LuxioF[] = INCBIN_U32("graphics/pokemon/gen_4/luxio/backf.4bpp.lz"); - const u32 gMonFrontPic_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/anim_front.4bpp.lz"); - const u32 gMonPalette_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/normal.gbapal.lz"); - const u32 gMonBackPic_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/back.4bpp.lz"); - const u32 gMonShinyPalette_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/shiny.gbapal.lz"); - const u8 gMonIcon_Luxray[] = INCBIN_U8("graphics/pokemon/luxray/icon.4bpp"); + const u32 gMonFrontPic_Luxray[] = INCBIN_U32("graphics/pokemon/gen_4/luxray/anim_front.4bpp.lz"); + const u32 gMonPalette_Luxray[] = INCBIN_U32("graphics/pokemon/gen_4/luxray/normal.gbapal.lz"); + const u32 gMonBackPic_Luxray[] = INCBIN_U32("graphics/pokemon/gen_4/luxray/back.4bpp.lz"); + const u32 gMonShinyPalette_Luxray[] = INCBIN_U32("graphics/pokemon/gen_4/luxray/shiny.gbapal.lz"); + const u8 gMonIcon_Luxray[] = INCBIN_U8("graphics/pokemon/gen_4/luxray/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Luxray[] = INCBIN_U8("graphics/pokemon/luxray/footprint.1bpp"); + const u8 gMonFootprint_Luxray[] = INCBIN_U8("graphics/pokemon/gen_4/luxray/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_LuxrayF[] = INCBIN_U32("graphics/pokemon/luxray/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_LuxrayF[] = INCBIN_U32("graphics/pokemon/luxray/backf.4bpp.lz"); + const u32 gMonFrontPic_LuxrayF[] = INCBIN_U32("graphics/pokemon/gen_4/luxray/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_LuxrayF[] = INCBIN_U32("graphics/pokemon/gen_4/luxray/backf.4bpp.lz"); #endif //P_FAMILY_SHINX #if P_FAMILY_CRANIDOS - const u32 gMonFrontPic_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/anim_front.4bpp.lz"); - const u32 gMonPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/normal.gbapal.lz"); - const u32 gMonBackPic_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/back.4bpp.lz"); - const u32 gMonShinyPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/shiny.gbapal.lz"); - const u8 gMonIcon_Cranidos[] = INCBIN_U8("graphics/pokemon/cranidos/icon.4bpp"); + const u32 gMonFrontPic_Cranidos[] = INCBIN_U32("graphics/pokemon/gen_4/cranidos/anim_front.4bpp.lz"); + const u32 gMonPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/gen_4/cranidos/normal.gbapal.lz"); + const u32 gMonBackPic_Cranidos[] = INCBIN_U32("graphics/pokemon/gen_4/cranidos/back.4bpp.lz"); + const u32 gMonShinyPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/gen_4/cranidos/shiny.gbapal.lz"); + const u8 gMonIcon_Cranidos[] = INCBIN_U8("graphics/pokemon/gen_4/cranidos/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cranidos[] = INCBIN_U8("graphics/pokemon/cranidos/footprint.1bpp"); + const u8 gMonFootprint_Cranidos[] = INCBIN_U8("graphics/pokemon/gen_4/cranidos/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/anim_front.4bpp.lz"); - const u32 gMonPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/normal.gbapal.lz"); - const u32 gMonBackPic_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/back.4bpp.lz"); - const u32 gMonShinyPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/shiny.gbapal.lz"); - const u8 gMonIcon_Rampardos[] = INCBIN_U8("graphics/pokemon/rampardos/icon.4bpp"); + const u32 gMonFrontPic_Rampardos[] = INCBIN_U32("graphics/pokemon/gen_4/rampardos/anim_front.4bpp.lz"); + const u32 gMonPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/gen_4/rampardos/normal.gbapal.lz"); + const u32 gMonBackPic_Rampardos[] = INCBIN_U32("graphics/pokemon/gen_4/rampardos/back.4bpp.lz"); + const u32 gMonShinyPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/gen_4/rampardos/shiny.gbapal.lz"); + const u8 gMonIcon_Rampardos[] = INCBIN_U8("graphics/pokemon/gen_4/rampardos/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Rampardos[] = INCBIN_U8("graphics/pokemon/rampardos/footprint.1bpp"); + const u8 gMonFootprint_Rampardos[] = INCBIN_U8("graphics/pokemon/gen_4/rampardos/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CRANIDOS #if P_FAMILY_SHIELDON - const u32 gMonFrontPic_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/anim_front.4bpp.lz"); - const u32 gMonPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/normal.gbapal.lz"); - const u32 gMonBackPic_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/back.4bpp.lz"); - const u32 gMonShinyPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/shiny.gbapal.lz"); - const u8 gMonIcon_Shieldon[] = INCBIN_U8("graphics/pokemon/shieldon/icon.4bpp"); + const u32 gMonFrontPic_Shieldon[] = INCBIN_U32("graphics/pokemon/gen_4/shieldon/anim_front.4bpp.lz"); + const u32 gMonPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/gen_4/shieldon/normal.gbapal.lz"); + const u32 gMonBackPic_Shieldon[] = INCBIN_U32("graphics/pokemon/gen_4/shieldon/back.4bpp.lz"); + const u32 gMonShinyPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/gen_4/shieldon/shiny.gbapal.lz"); + const u8 gMonIcon_Shieldon[] = INCBIN_U8("graphics/pokemon/gen_4/shieldon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Shieldon[] = INCBIN_U8("graphics/pokemon/shieldon/footprint.1bpp"); + const u8 gMonFootprint_Shieldon[] = INCBIN_U8("graphics/pokemon/gen_4/shieldon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/anim_front.4bpp.lz"); - const u32 gMonPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/normal.gbapal.lz"); - const u32 gMonBackPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/back.4bpp.lz"); - const u32 gMonShinyPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/shiny.gbapal.lz"); - const u8 gMonIcon_Bastiodon[] = INCBIN_U8("graphics/pokemon/bastiodon/icon.4bpp"); + const u32 gMonFrontPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/gen_4/bastiodon/anim_front.4bpp.lz"); + const u32 gMonPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/gen_4/bastiodon/normal.gbapal.lz"); + const u32 gMonBackPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/gen_4/bastiodon/back.4bpp.lz"); + const u32 gMonShinyPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/gen_4/bastiodon/shiny.gbapal.lz"); + const u8 gMonIcon_Bastiodon[] = INCBIN_U8("graphics/pokemon/gen_4/bastiodon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bastiodon[] = INCBIN_U8("graphics/pokemon/bastiodon/footprint.1bpp"); + const u8 gMonFootprint_Bastiodon[] = INCBIN_U8("graphics/pokemon/gen_4/bastiodon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SHIELDON #if P_FAMILY_BURMY - const u32 gMonFrontPic_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/anim_front.4bpp.lz"); - const u32 gMonPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/normal.gbapal.lz"); - const u32 gMonBackPic_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/back.4bpp.lz"); - const u32 gMonShinyPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/shiny.gbapal.lz"); - const u8 gMonIcon_BurmyPlantCloak[] = INCBIN_U8("graphics/pokemon/burmy/icon.4bpp"); + const u32 gMonFrontPic_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/anim_front.4bpp.lz"); + const u32 gMonPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/normal.gbapal.lz"); + const u32 gMonBackPic_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/back.4bpp.lz"); + const u32 gMonShinyPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/shiny.gbapal.lz"); + const u8 gMonIcon_BurmyPlantCloak[] = INCBIN_U8("graphics/pokemon/gen_4/burmy/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Burmy[] = INCBIN_U8("graphics/pokemon/burmy/plant/footprint.1bpp"); + const u8 gMonFootprint_Burmy[] = INCBIN_U8("graphics/pokemon/gen_4/burmy/plant/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/anim_front.4bpp.lz"); - const u32 gMonPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/normal.gbapal.lz"); - const u32 gMonBackPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/back.4bpp.lz"); - const u32 gMonShinyPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/shiny.gbapal.lz"); - const u8 gMonIcon_BurmySandyCloak[] = INCBIN_U8("graphics/pokemon/burmy/sandy_cloak/icon.4bpp"); + const u32 gMonFrontPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/sandy_cloak/anim_front.4bpp.lz"); + const u32 gMonPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/sandy_cloak/normal.gbapal.lz"); + const u32 gMonBackPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/sandy_cloak/back.4bpp.lz"); + const u32 gMonShinyPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/sandy_cloak/shiny.gbapal.lz"); + const u8 gMonIcon_BurmySandyCloak[] = INCBIN_U8("graphics/pokemon/gen_4/burmy/sandy_cloak/icon.4bpp"); - const u32 gMonFrontPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/anim_front.4bpp.lz"); - const u32 gMonPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/normal.gbapal.lz"); - const u32 gMonBackPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/back.4bpp.lz"); - const u32 gMonShinyPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/shiny.gbapal.lz"); - const u8 gMonIcon_BurmyTrashCloak[] = INCBIN_U8("graphics/pokemon/burmy/trash_cloak/icon.4bpp"); + const u32 gMonFrontPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/trash_cloak/anim_front.4bpp.lz"); + const u32 gMonPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/trash_cloak/normal.gbapal.lz"); + const u32 gMonBackPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/trash_cloak/back.4bpp.lz"); + const u32 gMonShinyPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/burmy/trash_cloak/shiny.gbapal.lz"); + const u8 gMonIcon_BurmyTrashCloak[] = INCBIN_U8("graphics/pokemon/gen_4/burmy/trash_cloak/icon.4bpp"); - const u32 gMonFrontPic_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/anim_front.4bpp.lz"); - const u32 gMonPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/normal.gbapal.lz"); - const u32 gMonBackPic_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/back.4bpp.lz"); - const u32 gMonShinyPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/shiny.gbapal.lz"); - const u8 gMonIcon_WormadamPlantCloak[] = INCBIN_U8("graphics/pokemon/wormadam/icon.4bpp"); + const u32 gMonFrontPic_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/anim_front.4bpp.lz"); + const u32 gMonPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/normal.gbapal.lz"); + const u32 gMonBackPic_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/back.4bpp.lz"); + const u32 gMonShinyPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/shiny.gbapal.lz"); + const u8 gMonIcon_WormadamPlantCloak[] = INCBIN_U8("graphics/pokemon/gen_4/wormadam/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Wormadam[] = INCBIN_U8("graphics/pokemon/wormadam/plant/footprint.1bpp"); + const u8 gMonFootprint_Wormadam[] = INCBIN_U8("graphics/pokemon/gen_4/wormadam/plant/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/anim_front.4bpp.lz"); - const u32 gMonPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/normal.gbapal.lz"); - const u32 gMonBackPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/back.4bpp.lz"); - const u32 gMonShinyPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/shiny.gbapal.lz"); - const u8 gMonIcon_WormadamSandyCloak[] = INCBIN_U8("graphics/pokemon/wormadam/sandy_cloak/icon.4bpp"); + const u32 gMonFrontPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/sandy_cloak/anim_front.4bpp.lz"); + const u32 gMonPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/sandy_cloak/normal.gbapal.lz"); + const u32 gMonBackPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/sandy_cloak/back.4bpp.lz"); + const u32 gMonShinyPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/sandy_cloak/shiny.gbapal.lz"); + const u8 gMonIcon_WormadamSandyCloak[] = INCBIN_U8("graphics/pokemon/gen_4/wormadam/sandy_cloak/icon.4bpp"); - const u32 gMonFrontPic_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/anim_front.4bpp.lz"); - const u32 gMonPalette_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/normal.gbapal.lz"); - const u32 gMonBackPic_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/back.4bpp.lz"); - const u32 gMonShinyPalette_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/shiny.gbapal.lz"); - const u8 gMonIcon_WormadamTrashCloak[] = INCBIN_U8("graphics/pokemon/wormadam/trash_cloak/icon.4bpp"); + const u32 gMonFrontPic_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/trash_cloak/anim_front.4bpp.lz"); + const u32 gMonPalette_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/trash_cloak/normal.gbapal.lz"); + const u32 gMonBackPic_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/trash_cloak/back.4bpp.lz"); + const u32 gMonShinyPalette_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/gen_4/wormadam/trash_cloak/shiny.gbapal.lz"); + const u8 gMonIcon_WormadamTrashCloak[] = INCBIN_U8("graphics/pokemon/gen_4/wormadam/trash_cloak/icon.4bpp"); - const u32 gMonFrontPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/anim_front.4bpp.lz"); - const u32 gMonPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/normal.gbapal.lz"); - const u32 gMonBackPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/back.4bpp.lz"); - const u32 gMonShinyPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/shiny.gbapal.lz"); - const u8 gMonIcon_Mothim[] = INCBIN_U8("graphics/pokemon/mothim/icon.4bpp"); + const u32 gMonFrontPic_Mothim[] = INCBIN_U32("graphics/pokemon/gen_4/mothim/anim_front.4bpp.lz"); + const u32 gMonPalette_Mothim[] = INCBIN_U32("graphics/pokemon/gen_4/mothim/normal.gbapal.lz"); + const u32 gMonBackPic_Mothim[] = INCBIN_U32("graphics/pokemon/gen_4/mothim/back.4bpp.lz"); + const u32 gMonShinyPalette_Mothim[] = INCBIN_U32("graphics/pokemon/gen_4/mothim/shiny.gbapal.lz"); + const u8 gMonIcon_Mothim[] = INCBIN_U8("graphics/pokemon/gen_4/mothim/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mothim[] = INCBIN_U8("graphics/pokemon/mothim/footprint.1bpp"); + const u8 gMonFootprint_Mothim[] = INCBIN_U8("graphics/pokemon/gen_4/mothim/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BURMY #if P_FAMILY_COMBEE - const u32 gMonFrontPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/anim_front.4bpp.lz"); - const u32 gMonPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/normal.gbapal.lz"); - const u32 gMonBackPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/back.4bpp.lz"); - const u32 gMonShinyPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/shiny.gbapal.lz"); - const u8 gMonIcon_Combee[] = INCBIN_U8("graphics/pokemon/combee/icon.4bpp"); + const u32 gMonFrontPic_Combee[] = INCBIN_U32("graphics/pokemon/gen_4/combee/anim_front.4bpp.lz"); + const u32 gMonPalette_Combee[] = INCBIN_U32("graphics/pokemon/gen_4/combee/normal.gbapal.lz"); + const u32 gMonBackPic_Combee[] = INCBIN_U32("graphics/pokemon/gen_4/combee/back.4bpp.lz"); + const u32 gMonShinyPalette_Combee[] = INCBIN_U32("graphics/pokemon/gen_4/combee/shiny.gbapal.lz"); + const u8 gMonIcon_Combee[] = INCBIN_U8("graphics/pokemon/gen_4/combee/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Combee[] = INCBIN_U8("graphics/pokemon/combee/footprint.1bpp"); + const u8 gMonFootprint_Combee[] = INCBIN_U8("graphics/pokemon/gen_4/combee/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/normalf.gbapal.lz"); - const u32 gMonShinyPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/shinyf.gbapal.lz"); + const u32 gMonPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/gen_4/combee/normalf.gbapal.lz"); + const u32 gMonShinyPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/gen_4/combee/shinyf.gbapal.lz"); - const u32 gMonFrontPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/anim_front.4bpp.lz"); - const u32 gMonPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/normal.gbapal.lz"); - const u32 gMonBackPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/back.4bpp.lz"); - const u32 gMonShinyPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/shiny.gbapal.lz"); - const u8 gMonIcon_Vespiquen[] = INCBIN_U8("graphics/pokemon/vespiquen/icon.4bpp"); + const u32 gMonFrontPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/gen_4/vespiquen/anim_front.4bpp.lz"); + const u32 gMonPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/gen_4/vespiquen/normal.gbapal.lz"); + const u32 gMonBackPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/gen_4/vespiquen/back.4bpp.lz"); + const u32 gMonShinyPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/gen_4/vespiquen/shiny.gbapal.lz"); + const u8 gMonIcon_Vespiquen[] = INCBIN_U8("graphics/pokemon/gen_4/vespiquen/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Vespiquen[] = INCBIN_U8("graphics/pokemon/vespiquen/footprint.1bpp"); + const u8 gMonFootprint_Vespiquen[] = INCBIN_U8("graphics/pokemon/gen_4/vespiquen/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_COMBEE #if P_FAMILY_PACHIRISU - const u32 gMonFrontPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/anim_front.4bpp.lz"); - const u32 gMonPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/normal.gbapal.lz"); - const u32 gMonBackPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/back.4bpp.lz"); - const u32 gMonShinyPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/shiny.gbapal.lz"); - const u8 gMonIcon_Pachirisu[] = INCBIN_U8("graphics/pokemon/pachirisu/icon.4bpp"); + const u32 gMonFrontPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/gen_4/pachirisu/anim_front.4bpp.lz"); + const u32 gMonPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/gen_4/pachirisu/normal.gbapal.lz"); + const u32 gMonBackPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/gen_4/pachirisu/back.4bpp.lz"); + const u32 gMonShinyPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/gen_4/pachirisu/shiny.gbapal.lz"); + const u8 gMonIcon_Pachirisu[] = INCBIN_U8("graphics/pokemon/gen_4/pachirisu/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pachirisu[] = INCBIN_U8("graphics/pokemon/pachirisu/footprint.1bpp"); + const u8 gMonFootprint_Pachirisu[] = INCBIN_U8("graphics/pokemon/gen_4/pachirisu/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_PachirisuF[] = INCBIN_U32("graphics/pokemon/pachirisu/anim_frontf.4bpp.lz"); + const u32 gMonFrontPic_PachirisuF[] = INCBIN_U32("graphics/pokemon/gen_4/pachirisu/anim_frontf.4bpp.lz"); #endif //P_FAMILY_PACHIRISU #if P_FAMILY_BUIZEL - const u32 gMonFrontPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/anim_front.4bpp.lz"); - const u32 gMonPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/normal.gbapal.lz"); - const u32 gMonBackPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/back.4bpp.lz"); - const u32 gMonShinyPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/shiny.gbapal.lz"); - const u8 gMonIcon_Buizel[] = INCBIN_U8("graphics/pokemon/buizel/icon.4bpp"); + const u32 gMonFrontPic_Buizel[] = INCBIN_U32("graphics/pokemon/gen_4/buizel/anim_front.4bpp.lz"); + const u32 gMonPalette_Buizel[] = INCBIN_U32("graphics/pokemon/gen_4/buizel/normal.gbapal.lz"); + const u32 gMonBackPic_Buizel[] = INCBIN_U32("graphics/pokemon/gen_4/buizel/back.4bpp.lz"); + const u32 gMonShinyPalette_Buizel[] = INCBIN_U32("graphics/pokemon/gen_4/buizel/shiny.gbapal.lz"); + const u8 gMonIcon_Buizel[] = INCBIN_U8("graphics/pokemon/gen_4/buizel/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Buizel[] = INCBIN_U8("graphics/pokemon/buizel/footprint.1bpp"); + const u8 gMonFootprint_Buizel[] = INCBIN_U8("graphics/pokemon/gen_4/buizel/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonBackPic_BuizelF[] = INCBIN_U32("graphics/pokemon/buizel/backf.4bpp.lz"); + const u32 gMonBackPic_BuizelF[] = INCBIN_U32("graphics/pokemon/gen_4/buizel/backf.4bpp.lz"); - const u32 gMonFrontPic_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/anim_front.4bpp.lz"); - const u32 gMonPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/normal.gbapal.lz"); - const u32 gMonBackPic_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/back.4bpp.lz"); - const u32 gMonShinyPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/shiny.gbapal.lz"); - const u8 gMonIcon_Floatzel[] = INCBIN_U8("graphics/pokemon/floatzel/icon.4bpp"); + const u32 gMonFrontPic_Floatzel[] = INCBIN_U32("graphics/pokemon/gen_4/floatzel/anim_front.4bpp.lz"); + const u32 gMonPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/gen_4/floatzel/normal.gbapal.lz"); + const u32 gMonBackPic_Floatzel[] = INCBIN_U32("graphics/pokemon/gen_4/floatzel/back.4bpp.lz"); + const u32 gMonShinyPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/gen_4/floatzel/shiny.gbapal.lz"); + const u8 gMonIcon_Floatzel[] = INCBIN_U8("graphics/pokemon/gen_4/floatzel/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Floatzel[] = INCBIN_U8("graphics/pokemon/floatzel/footprint.1bpp"); + const u8 gMonFootprint_Floatzel[] = INCBIN_U8("graphics/pokemon/gen_4/floatzel/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonBackPic_FloatzelF[] = INCBIN_U32("graphics/pokemon/floatzel/backf.4bpp.lz"); + const u32 gMonBackPic_FloatzelF[] = INCBIN_U32("graphics/pokemon/gen_4/floatzel/backf.4bpp.lz"); #endif //P_FAMILY_BUIZEL #if P_FAMILY_CHERUBI - const u32 gMonFrontPic_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/anim_front.4bpp.lz"); - const u32 gMonPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/normal.gbapal.lz"); - const u32 gMonBackPic_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/back.4bpp.lz"); - const u32 gMonShinyPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/shiny.gbapal.lz"); - const u8 gMonIcon_Cherubi[] = INCBIN_U8("graphics/pokemon/cherubi/icon.4bpp"); + const u32 gMonFrontPic_Cherubi[] = INCBIN_U32("graphics/pokemon/gen_4/cherubi/anim_front.4bpp.lz"); + const u32 gMonPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/gen_4/cherubi/normal.gbapal.lz"); + const u32 gMonBackPic_Cherubi[] = INCBIN_U32("graphics/pokemon/gen_4/cherubi/back.4bpp.lz"); + const u32 gMonShinyPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/gen_4/cherubi/shiny.gbapal.lz"); + const u8 gMonIcon_Cherubi[] = INCBIN_U8("graphics/pokemon/gen_4/cherubi/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cherubi[] = INCBIN_U8("graphics/pokemon/cherubi/footprint.1bpp"); + const u8 gMonFootprint_Cherubi[] = INCBIN_U8("graphics/pokemon/gen_4/cherubi/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/anim_front.4bpp.lz"); - const u32 gMonPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/normal.gbapal.lz"); - const u32 gMonBackPic_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/back.4bpp.lz"); - const u32 gMonShinyPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/shiny.gbapal.lz"); - const u8 gMonIcon_CherrimOvercast[] = INCBIN_U8("graphics/pokemon/cherrim/icon.4bpp"); + const u32 gMonFrontPic_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/anim_front.4bpp.lz"); + const u32 gMonPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/normal.gbapal.lz"); + const u32 gMonBackPic_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/back.4bpp.lz"); + const u32 gMonShinyPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/shiny.gbapal.lz"); + const u8 gMonIcon_CherrimOvercast[] = INCBIN_U8("graphics/pokemon/gen_4/cherrim/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cherrim[] = INCBIN_U8("graphics/pokemon/cherrim/footprint.1bpp"); + const u8 gMonFootprint_Cherrim[] = INCBIN_U8("graphics/pokemon/gen_4/cherrim/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/anim_front.4bpp.lz"); - const u32 gMonPalette_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/normal.gbapal.lz"); - const u32 gMonBackPic_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/back.4bpp.lz"); - const u32 gMonShinyPalette_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/shiny.gbapal.lz"); - const u8 gMonIcon_CherrimSunshine[] = INCBIN_U8("graphics/pokemon/cherrim/sunshine/icon.4bpp"); + const u32 gMonFrontPic_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/sunshine/anim_front.4bpp.lz"); + const u32 gMonPalette_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/sunshine/normal.gbapal.lz"); + const u32 gMonBackPic_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/sunshine/back.4bpp.lz"); + const u32 gMonShinyPalette_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/gen_4/cherrim/sunshine/shiny.gbapal.lz"); + const u8 gMonIcon_CherrimSunshine[] = INCBIN_U8("graphics/pokemon/gen_4/cherrim/sunshine/icon.4bpp"); #endif //P_FAMILY_CHERUBI #if P_FAMILY_SHELLOS - const u32 gMonFrontPic_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/anim_front.4bpp.lz"); - const u32 gMonPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/normal.gbapal.lz"); - const u32 gMonBackPic_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/back.4bpp.lz"); - const u32 gMonShinyPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/shiny.gbapal.lz"); - const u8 gMonIcon_ShellosWestSea[] = INCBIN_U8("graphics/pokemon/shellos/icon.4bpp"); + const u32 gMonFrontPic_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/anim_front.4bpp.lz"); + const u32 gMonPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/normal.gbapal.lz"); + const u32 gMonBackPic_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/back.4bpp.lz"); + const u32 gMonShinyPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/shiny.gbapal.lz"); + const u8 gMonIcon_ShellosWestSea[] = INCBIN_U8("graphics/pokemon/gen_4/shellos/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Shellos[] = INCBIN_U8("graphics/pokemon/shellos/footprint.1bpp"); + const u8 gMonFootprint_Shellos[] = INCBIN_U8("graphics/pokemon/gen_4/shellos/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/anim_front.4bpp.lz"); - const u32 gMonPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/normal.gbapal.lz"); - const u32 gMonBackPic_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/back.4bpp.lz"); - const u32 gMonShinyPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/shiny.gbapal.lz"); - const u8 gMonIcon_ShellosEastSea[] = INCBIN_U8("graphics/pokemon/shellos/east_sea/icon.4bpp"); + const u32 gMonFrontPic_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/east_sea/anim_front.4bpp.lz"); + const u32 gMonPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/east_sea/normal.gbapal.lz"); + const u32 gMonBackPic_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/east_sea/back.4bpp.lz"); + const u32 gMonShinyPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/shellos/east_sea/shiny.gbapal.lz"); + const u8 gMonIcon_ShellosEastSea[] = INCBIN_U8("graphics/pokemon/gen_4/shellos/east_sea/icon.4bpp"); - const u32 gMonFrontPic_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/anim_front.4bpp.lz"); - const u32 gMonPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/normal.gbapal.lz"); - const u32 gMonBackPic_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/back.4bpp.lz"); - const u32 gMonShinyPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/shiny.gbapal.lz"); - const u8 gMonIcon_GastrodonWestSea[] = INCBIN_U8("graphics/pokemon/gastrodon/icon.4bpp"); + const u32 gMonFrontPic_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/anim_front.4bpp.lz"); + const u32 gMonPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/normal.gbapal.lz"); + const u32 gMonBackPic_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/back.4bpp.lz"); + const u32 gMonShinyPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/shiny.gbapal.lz"); + const u8 gMonIcon_GastrodonWestSea[] = INCBIN_U8("graphics/pokemon/gen_4/gastrodon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gastrodon[] = INCBIN_U8("graphics/pokemon/gastrodon/footprint.1bpp"); + const u8 gMonFootprint_Gastrodon[] = INCBIN_U8("graphics/pokemon/gen_4/gastrodon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/anim_front.4bpp.lz"); - const u32 gMonPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/normal.gbapal.lz"); - const u32 gMonBackPic_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/back.4bpp.lz"); - const u32 gMonShinyPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/shiny.gbapal.lz"); - const u8 gMonIcon_GastrodonEastSea[] = INCBIN_U8("graphics/pokemon/gastrodon/east_sea/icon.4bpp"); + const u32 gMonFrontPic_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/east_sea/anim_front.4bpp.lz"); + const u32 gMonPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/east_sea/normal.gbapal.lz"); + const u32 gMonBackPic_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/east_sea/back.4bpp.lz"); + const u32 gMonShinyPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gen_4/gastrodon/east_sea/shiny.gbapal.lz"); + const u8 gMonIcon_GastrodonEastSea[] = INCBIN_U8("graphics/pokemon/gen_4/gastrodon/east_sea/icon.4bpp"); #endif //P_FAMILY_SHELLOS #if P_FAMILY_DRIFLOON - const u32 gMonFrontPic_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/anim_front.4bpp.lz"); - const u32 gMonPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/normal.gbapal.lz"); - const u32 gMonBackPic_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/back.4bpp.lz"); - const u32 gMonShinyPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/shiny.gbapal.lz"); - const u8 gMonIcon_Drifloon[] = INCBIN_U8("graphics/pokemon/drifloon/icon.4bpp"); + const u32 gMonFrontPic_Drifloon[] = INCBIN_U32("graphics/pokemon/gen_4/drifloon/anim_front.4bpp.lz"); + const u32 gMonPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/gen_4/drifloon/normal.gbapal.lz"); + const u32 gMonBackPic_Drifloon[] = INCBIN_U32("graphics/pokemon/gen_4/drifloon/back.4bpp.lz"); + const u32 gMonShinyPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/gen_4/drifloon/shiny.gbapal.lz"); + const u8 gMonIcon_Drifloon[] = INCBIN_U8("graphics/pokemon/gen_4/drifloon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Drifloon[] = INCBIN_U8("graphics/pokemon/drifloon/footprint.1bpp"); + const u8 gMonFootprint_Drifloon[] = INCBIN_U8("graphics/pokemon/gen_4/drifloon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/anim_front.4bpp.lz"); - const u32 gMonPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/normal.gbapal.lz"); - const u32 gMonBackPic_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/back.4bpp.lz"); - const u32 gMonShinyPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/shiny.gbapal.lz"); - const u8 gMonIcon_Drifblim[] = INCBIN_U8("graphics/pokemon/drifblim/icon.4bpp"); + const u32 gMonFrontPic_Drifblim[] = INCBIN_U32("graphics/pokemon/gen_4/drifblim/anim_front.4bpp.lz"); + const u32 gMonPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/gen_4/drifblim/normal.gbapal.lz"); + const u32 gMonBackPic_Drifblim[] = INCBIN_U32("graphics/pokemon/gen_4/drifblim/back.4bpp.lz"); + const u32 gMonShinyPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/gen_4/drifblim/shiny.gbapal.lz"); + const u8 gMonIcon_Drifblim[] = INCBIN_U8("graphics/pokemon/gen_4/drifblim/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Drifblim[] = INCBIN_U8("graphics/pokemon/drifblim/footprint.1bpp"); + const u8 gMonFootprint_Drifblim[] = INCBIN_U8("graphics/pokemon/gen_4/drifblim/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DRIFLOON #if P_FAMILY_BUNEARY - const u32 gMonFrontPic_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/anim_front.4bpp.lz"); - const u32 gMonPalette_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/normal.gbapal.lz"); - const u32 gMonBackPic_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/back.4bpp.lz"); - const u32 gMonShinyPalette_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/shiny.gbapal.lz"); - const u8 gMonIcon_Buneary[] = INCBIN_U8("graphics/pokemon/buneary/icon.4bpp"); + const u32 gMonFrontPic_Buneary[] = INCBIN_U32("graphics/pokemon/gen_4/buneary/anim_front.4bpp.lz"); + const u32 gMonPalette_Buneary[] = INCBIN_U32("graphics/pokemon/gen_4/buneary/normal.gbapal.lz"); + const u32 gMonBackPic_Buneary[] = INCBIN_U32("graphics/pokemon/gen_4/buneary/back.4bpp.lz"); + const u32 gMonShinyPalette_Buneary[] = INCBIN_U32("graphics/pokemon/gen_4/buneary/shiny.gbapal.lz"); + const u8 gMonIcon_Buneary[] = INCBIN_U8("graphics/pokemon/gen_4/buneary/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Buneary[] = INCBIN_U8("graphics/pokemon/buneary/footprint.1bpp"); + const u8 gMonFootprint_Buneary[] = INCBIN_U8("graphics/pokemon/gen_4/buneary/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/anim_front.4bpp.lz"); - const u32 gMonPalette_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/normal.gbapal.lz"); - const u32 gMonBackPic_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/back.4bpp.lz"); - const u32 gMonShinyPalette_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/shiny.gbapal.lz"); - const u8 gMonIcon_Lopunny[] = INCBIN_U8("graphics/pokemon/lopunny/icon.4bpp"); + const u32 gMonFrontPic_Lopunny[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/anim_front.4bpp.lz"); + const u32 gMonPalette_Lopunny[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/normal.gbapal.lz"); + const u32 gMonBackPic_Lopunny[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/back.4bpp.lz"); + const u32 gMonShinyPalette_Lopunny[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/shiny.gbapal.lz"); + const u8 gMonIcon_Lopunny[] = INCBIN_U8("graphics/pokemon/gen_4/lopunny/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lopunny[] = INCBIN_U8("graphics/pokemon/lopunny/footprint.1bpp"); -#endif //P_FOOTPRINTS - + const u8 gMonFootprint_Lopunny[] = INCBIN_U8("graphics/pokemon/gen_4/lopunny/footprint.1bpp"); +#endif //P_FOOTPRINTS + #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/front.4bpp.lz"); - const u32 gMonPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/normal.gbapal.lz"); - const u32 gMonBackPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/shiny.gbapal.lz"); - const u8 gMonIcon_LopunnyMega[] = INCBIN_U8("graphics/pokemon/lopunny/mega/icon.4bpp"); + const u32 gMonFrontPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/mega/front.4bpp.lz"); + const u32 gMonPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/mega/normal.gbapal.lz"); + const u32 gMonBackPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/gen_4/lopunny/mega/shiny.gbapal.lz"); + const u8 gMonIcon_LopunnyMega[] = INCBIN_U8("graphics/pokemon/gen_4/lopunny/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BUNEARY #if P_FAMILY_GLAMEOW - const u32 gMonFrontPic_Glameow[] = INCBIN_U32("graphics/pokemon/glameow/anim_front.4bpp.lz"); - const u32 gMonPalette_Glameow[] = INCBIN_U32("graphics/pokemon/glameow/normal.gbapal.lz"); - const u32 gMonBackPic_Glameow[] = INCBIN_U32("graphics/pokemon/glameow/back.4bpp.lz"); - const u32 gMonShinyPalette_Glameow[] = INCBIN_U32("graphics/pokemon/glameow/shiny.gbapal.lz"); - const u8 gMonIcon_Glameow[] = INCBIN_U8("graphics/pokemon/glameow/icon.4bpp"); + const u32 gMonFrontPic_Glameow[] = INCBIN_U32("graphics/pokemon/gen_4/glameow/anim_front.4bpp.lz"); + const u32 gMonPalette_Glameow[] = INCBIN_U32("graphics/pokemon/gen_4/glameow/normal.gbapal.lz"); + const u32 gMonBackPic_Glameow[] = INCBIN_U32("graphics/pokemon/gen_4/glameow/back.4bpp.lz"); + const u32 gMonShinyPalette_Glameow[] = INCBIN_U32("graphics/pokemon/gen_4/glameow/shiny.gbapal.lz"); + const u8 gMonIcon_Glameow[] = INCBIN_U8("graphics/pokemon/gen_4/glameow/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Glameow[] = INCBIN_U8("graphics/pokemon/glameow/footprint.1bpp"); + const u8 gMonFootprint_Glameow[] = INCBIN_U8("graphics/pokemon/gen_4/glameow/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/anim_front.4bpp.lz"); - const u32 gMonPalette_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/normal.gbapal.lz"); - const u32 gMonBackPic_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/back.4bpp.lz"); - const u32 gMonShinyPalette_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/shiny.gbapal.lz"); - const u8 gMonIcon_Purugly[] = INCBIN_U8("graphics/pokemon/purugly/icon.4bpp"); + const u32 gMonFrontPic_Purugly[] = INCBIN_U32("graphics/pokemon/gen_4/purugly/anim_front.4bpp.lz"); + const u32 gMonPalette_Purugly[] = INCBIN_U32("graphics/pokemon/gen_4/purugly/normal.gbapal.lz"); + const u32 gMonBackPic_Purugly[] = INCBIN_U32("graphics/pokemon/gen_4/purugly/back.4bpp.lz"); + const u32 gMonShinyPalette_Purugly[] = INCBIN_U32("graphics/pokemon/gen_4/purugly/shiny.gbapal.lz"); + const u8 gMonIcon_Purugly[] = INCBIN_U8("graphics/pokemon/gen_4/purugly/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Purugly[] = INCBIN_U8("graphics/pokemon/purugly/footprint.1bpp"); + const u8 gMonFootprint_Purugly[] = INCBIN_U8("graphics/pokemon/gen_4/purugly/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_GLAMEOW #if P_FAMILY_STUNKY - const u32 gMonFrontPic_Stunky[] = INCBIN_U32("graphics/pokemon/stunky/anim_front.4bpp.lz"); - const u32 gMonPalette_Stunky[] = INCBIN_U32("graphics/pokemon/stunky/normal.gbapal.lz"); - const u32 gMonBackPic_Stunky[] = INCBIN_U32("graphics/pokemon/stunky/back.4bpp.lz"); - const u32 gMonShinyPalette_Stunky[] = INCBIN_U32("graphics/pokemon/stunky/shiny.gbapal.lz"); - const u8 gMonIcon_Stunky[] = INCBIN_U8("graphics/pokemon/stunky/icon.4bpp"); + const u32 gMonFrontPic_Stunky[] = INCBIN_U32("graphics/pokemon/gen_4/stunky/anim_front.4bpp.lz"); + const u32 gMonPalette_Stunky[] = INCBIN_U32("graphics/pokemon/gen_4/stunky/normal.gbapal.lz"); + const u32 gMonBackPic_Stunky[] = INCBIN_U32("graphics/pokemon/gen_4/stunky/back.4bpp.lz"); + const u32 gMonShinyPalette_Stunky[] = INCBIN_U32("graphics/pokemon/gen_4/stunky/shiny.gbapal.lz"); + const u8 gMonIcon_Stunky[] = INCBIN_U8("graphics/pokemon/gen_4/stunky/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Stunky[] = INCBIN_U8("graphics/pokemon/stunky/footprint.1bpp"); + const u8 gMonFootprint_Stunky[] = INCBIN_U8("graphics/pokemon/gen_4/stunky/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/anim_front.4bpp.lz"); - const u32 gMonPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/normal.gbapal.lz"); - const u32 gMonBackPic_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/back.4bpp.lz"); - const u32 gMonShinyPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/shiny.gbapal.lz"); - const u8 gMonIcon_Skuntank[] = INCBIN_U8("graphics/pokemon/skuntank/icon.4bpp"); + const u32 gMonFrontPic_Skuntank[] = INCBIN_U32("graphics/pokemon/gen_4/skuntank/anim_front.4bpp.lz"); + const u32 gMonPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/gen_4/skuntank/normal.gbapal.lz"); + const u32 gMonBackPic_Skuntank[] = INCBIN_U32("graphics/pokemon/gen_4/skuntank/back.4bpp.lz"); + const u32 gMonShinyPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/gen_4/skuntank/shiny.gbapal.lz"); + const u8 gMonIcon_Skuntank[] = INCBIN_U8("graphics/pokemon/gen_4/skuntank/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Skuntank[] = INCBIN_U8("graphics/pokemon/skuntank/footprint.1bpp"); + const u8 gMonFootprint_Skuntank[] = INCBIN_U8("graphics/pokemon/gen_4/skuntank/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_STUNKY #if P_FAMILY_BRONZOR - const u32 gMonFrontPic_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/anim_front.4bpp.lz"); - const u32 gMonPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/normal.gbapal.lz"); - const u32 gMonBackPic_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/back.4bpp.lz"); - const u32 gMonShinyPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/shiny.gbapal.lz"); - const u8 gMonIcon_Bronzor[] = INCBIN_U8("graphics/pokemon/bronzor/icon.4bpp"); + const u32 gMonFrontPic_Bronzor[] = INCBIN_U32("graphics/pokemon/gen_4/bronzor/anim_front.4bpp.lz"); + const u32 gMonPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/gen_4/bronzor/normal.gbapal.lz"); + const u32 gMonBackPic_Bronzor[] = INCBIN_U32("graphics/pokemon/gen_4/bronzor/back.4bpp.lz"); + const u32 gMonShinyPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/gen_4/bronzor/shiny.gbapal.lz"); + const u8 gMonIcon_Bronzor[] = INCBIN_U8("graphics/pokemon/gen_4/bronzor/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bronzor[] = INCBIN_U8("graphics/pokemon/bronzor/footprint.1bpp"); + const u8 gMonFootprint_Bronzor[] = INCBIN_U8("graphics/pokemon/gen_4/bronzor/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/anim_front.4bpp.lz"); - const u32 gMonPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/normal.gbapal.lz"); - const u32 gMonBackPic_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/back.4bpp.lz"); - const u32 gMonShinyPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/shiny.gbapal.lz"); - const u8 gMonIcon_Bronzong[] = INCBIN_U8("graphics/pokemon/bronzong/icon.4bpp"); + const u32 gMonFrontPic_Bronzong[] = INCBIN_U32("graphics/pokemon/gen_4/bronzong/anim_front.4bpp.lz"); + const u32 gMonPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/gen_4/bronzong/normal.gbapal.lz"); + const u32 gMonBackPic_Bronzong[] = INCBIN_U32("graphics/pokemon/gen_4/bronzong/back.4bpp.lz"); + const u32 gMonShinyPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/gen_4/bronzong/shiny.gbapal.lz"); + const u8 gMonIcon_Bronzong[] = INCBIN_U8("graphics/pokemon/gen_4/bronzong/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bronzong[] = INCBIN_U8("graphics/pokemon/bronzong/footprint.1bpp"); + const u8 gMonFootprint_Bronzong[] = INCBIN_U8("graphics/pokemon/gen_4/bronzong/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BRONZOR #if P_FAMILY_CHATOT - const u32 gMonFrontPic_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/anim_front.4bpp.lz"); - const u32 gMonPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/normal.gbapal.lz"); - const u32 gMonBackPic_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/back.4bpp.lz"); - const u32 gMonShinyPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/shiny.gbapal.lz"); - const u8 gMonIcon_Chatot[] = INCBIN_U8("graphics/pokemon/chatot/icon.4bpp"); + const u32 gMonFrontPic_Chatot[] = INCBIN_U32("graphics/pokemon/gen_4/chatot/anim_front.4bpp.lz"); + const u32 gMonPalette_Chatot[] = INCBIN_U32("graphics/pokemon/gen_4/chatot/normal.gbapal.lz"); + const u32 gMonBackPic_Chatot[] = INCBIN_U32("graphics/pokemon/gen_4/chatot/back.4bpp.lz"); + const u32 gMonShinyPalette_Chatot[] = INCBIN_U32("graphics/pokemon/gen_4/chatot/shiny.gbapal.lz"); + const u8 gMonIcon_Chatot[] = INCBIN_U8("graphics/pokemon/gen_4/chatot/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Chatot[] = INCBIN_U8("graphics/pokemon/chatot/footprint.1bpp"); + const u8 gMonFootprint_Chatot[] = INCBIN_U8("graphics/pokemon/gen_4/chatot/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CHATOT #if P_FAMILY_SPIRITOMB - const u32 gMonFrontPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/anim_front.4bpp.lz"); - const u32 gMonPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/normal.gbapal.lz"); - const u32 gMonBackPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/back.4bpp.lz"); - const u32 gMonShinyPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/shiny.gbapal.lz"); - const u8 gMonIcon_Spiritomb[] = INCBIN_U8("graphics/pokemon/spiritomb/icon.4bpp"); + const u32 gMonFrontPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/gen_4/spiritomb/anim_front.4bpp.lz"); + const u32 gMonPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/gen_4/spiritomb/normal.gbapal.lz"); + const u32 gMonBackPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/gen_4/spiritomb/back.4bpp.lz"); + const u32 gMonShinyPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/gen_4/spiritomb/shiny.gbapal.lz"); + const u8 gMonIcon_Spiritomb[] = INCBIN_U8("graphics/pokemon/gen_4/spiritomb/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Spiritomb[] = INCBIN_U8("graphics/pokemon/spiritomb/footprint.1bpp"); + const u8 gMonFootprint_Spiritomb[] = INCBIN_U8("graphics/pokemon/gen_4/spiritomb/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SPIRITOMB #if P_FAMILY_GIBLE - const u32 gMonFrontPic_Gible[] = INCBIN_U32("graphics/pokemon/gible/anim_front.4bpp.lz"); - const u32 gMonPalette_Gible[] = INCBIN_U32("graphics/pokemon/gible/normal.gbapal.lz"); - const u32 gMonBackPic_Gible[] = INCBIN_U32("graphics/pokemon/gible/back.4bpp.lz"); - const u32 gMonShinyPalette_Gible[] = INCBIN_U32("graphics/pokemon/gible/shiny.gbapal.lz"); - const u8 gMonIcon_Gible[] = INCBIN_U8("graphics/pokemon/gible/icon.4bpp"); + const u32 gMonFrontPic_Gible[] = INCBIN_U32("graphics/pokemon/gen_4/gible/anim_front.4bpp.lz"); + const u32 gMonPalette_Gible[] = INCBIN_U32("graphics/pokemon/gen_4/gible/normal.gbapal.lz"); + const u32 gMonBackPic_Gible[] = INCBIN_U32("graphics/pokemon/gen_4/gible/back.4bpp.lz"); + const u32 gMonShinyPalette_Gible[] = INCBIN_U32("graphics/pokemon/gen_4/gible/shiny.gbapal.lz"); + const u8 gMonIcon_Gible[] = INCBIN_U8("graphics/pokemon/gen_4/gible/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gible[] = INCBIN_U8("graphics/pokemon/gible/footprint.1bpp"); + const u8 gMonFootprint_Gible[] = INCBIN_U8("graphics/pokemon/gen_4/gible/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GibleF[] = INCBIN_U32("graphics/pokemon/gible/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_GibleF[] = INCBIN_U32("graphics/pokemon/gible/backf.4bpp.lz"); + const u32 gMonFrontPic_GibleF[] = INCBIN_U32("graphics/pokemon/gen_4/gible/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_GibleF[] = INCBIN_U32("graphics/pokemon/gen_4/gible/backf.4bpp.lz"); - const u32 gMonFrontPic_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/anim_front.4bpp.lz"); - const u32 gMonPalette_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/normal.gbapal.lz"); - const u32 gMonBackPic_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/back.4bpp.lz"); - const u32 gMonShinyPalette_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/shiny.gbapal.lz"); - const u8 gMonIcon_Gabite[] = INCBIN_U8("graphics/pokemon/gabite/icon.4bpp"); + const u32 gMonFrontPic_Gabite[] = INCBIN_U32("graphics/pokemon/gen_4/gabite/anim_front.4bpp.lz"); + const u32 gMonPalette_Gabite[] = INCBIN_U32("graphics/pokemon/gen_4/gabite/normal.gbapal.lz"); + const u32 gMonBackPic_Gabite[] = INCBIN_U32("graphics/pokemon/gen_4/gabite/back.4bpp.lz"); + const u32 gMonShinyPalette_Gabite[] = INCBIN_U32("graphics/pokemon/gen_4/gabite/shiny.gbapal.lz"); + const u8 gMonIcon_Gabite[] = INCBIN_U8("graphics/pokemon/gen_4/gabite/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gabite[] = INCBIN_U8("graphics/pokemon/gabite/footprint.1bpp"); + const u8 gMonFootprint_Gabite[] = INCBIN_U8("graphics/pokemon/gen_4/gabite/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GabiteF[] = INCBIN_U32("graphics/pokemon/gabite/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_GabiteF[] = INCBIN_U32("graphics/pokemon/gabite/backf.4bpp.lz"); + const u32 gMonFrontPic_GabiteF[] = INCBIN_U32("graphics/pokemon/gen_4/gabite/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_GabiteF[] = INCBIN_U32("graphics/pokemon/gen_4/gabite/backf.4bpp.lz"); - const u32 gMonFrontPic_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/anim_front.4bpp.lz"); - const u32 gMonPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/normal.gbapal.lz"); - const u32 gMonBackPic_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/back.4bpp.lz"); - const u32 gMonShinyPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/shiny.gbapal.lz"); - const u8 gMonIcon_Garchomp[] = INCBIN_U8("graphics/pokemon/garchomp/icon.4bpp"); + const u32 gMonFrontPic_Garchomp[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/anim_front.4bpp.lz"); + const u32 gMonPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/normal.gbapal.lz"); + const u32 gMonBackPic_Garchomp[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/back.4bpp.lz"); + const u32 gMonShinyPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/shiny.gbapal.lz"); + const u8 gMonIcon_Garchomp[] = INCBIN_U8("graphics/pokemon/gen_4/garchomp/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Garchomp[] = INCBIN_U8("graphics/pokemon/garchomp/footprint.1bpp"); + const u8 gMonFootprint_Garchomp[] = INCBIN_U8("graphics/pokemon/gen_4/garchomp/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GarchompF[] = INCBIN_U32("graphics/pokemon/garchomp/anim_frontf.4bpp.lz"); + const u32 gMonFrontPic_GarchompF[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/anim_frontf.4bpp.lz"); #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/front.4bpp.lz"); - const u32 gMonPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/normal.gbapal.lz"); - const u32 gMonBackPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/shiny.gbapal.lz"); - const u8 gMonIcon_GarchompMega[] = INCBIN_U8("graphics/pokemon/garchomp/mega/icon.4bpp"); + const u32 gMonFrontPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/mega/front.4bpp.lz"); + const u32 gMonPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/mega/normal.gbapal.lz"); + const u32 gMonBackPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/gen_4/garchomp/mega/shiny.gbapal.lz"); + const u8 gMonIcon_GarchompMega[] = INCBIN_U8("graphics/pokemon/gen_4/garchomp/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_GIBLE #if P_FAMILY_RIOLU - const u32 gMonFrontPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/anim_front.4bpp.lz"); - const u32 gMonPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/normal.gbapal.lz"); - const u32 gMonBackPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/back.4bpp.lz"); - const u32 gMonShinyPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/shiny.gbapal.lz"); - const u8 gMonIcon_Riolu[] = INCBIN_U8("graphics/pokemon/riolu/icon.4bpp"); + const u32 gMonFrontPic_Riolu[] = INCBIN_U32("graphics/pokemon/gen_4/riolu/anim_front.4bpp.lz"); + const u32 gMonPalette_Riolu[] = INCBIN_U32("graphics/pokemon/gen_4/riolu/normal.gbapal.lz"); + const u32 gMonBackPic_Riolu[] = INCBIN_U32("graphics/pokemon/gen_4/riolu/back.4bpp.lz"); + const u32 gMonShinyPalette_Riolu[] = INCBIN_U32("graphics/pokemon/gen_4/riolu/shiny.gbapal.lz"); + const u8 gMonIcon_Riolu[] = INCBIN_U8("graphics/pokemon/gen_4/riolu/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Riolu[] = INCBIN_U8("graphics/pokemon/riolu/footprint.1bpp"); + const u8 gMonFootprint_Riolu[] = INCBIN_U8("graphics/pokemon/gen_4/riolu/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/anim_front.4bpp.lz"); - const u32 gMonPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/normal.gbapal.lz"); - const u32 gMonBackPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/back.4bpp.lz"); - const u32 gMonShinyPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/shiny.gbapal.lz"); - const u8 gMonIcon_Lucario[] = INCBIN_U8("graphics/pokemon/lucario/icon.4bpp"); + const u32 gMonFrontPic_Lucario[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/anim_front.4bpp.lz"); + const u32 gMonPalette_Lucario[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/normal.gbapal.lz"); + const u32 gMonBackPic_Lucario[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/back.4bpp.lz"); + const u32 gMonShinyPalette_Lucario[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/shiny.gbapal.lz"); + const u8 gMonIcon_Lucario[] = INCBIN_U8("graphics/pokemon/gen_4/lucario/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lucario[] = INCBIN_U8("graphics/pokemon/lucario/footprint.1bpp"); + const u8 gMonFootprint_Lucario[] = INCBIN_U8("graphics/pokemon/gen_4/lucario/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/front.4bpp.lz"); - const u32 gMonPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/normal.gbapal.lz"); - const u32 gMonBackPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/shiny.gbapal.lz"); - const u8 gMonIcon_LucarioMega[] = INCBIN_U8("graphics/pokemon/lucario/mega/icon.4bpp"); + const u32 gMonFrontPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/mega/front.4bpp.lz"); + const u32 gMonPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/mega/normal.gbapal.lz"); + const u32 gMonBackPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/gen_4/lucario/mega/shiny.gbapal.lz"); + const u8 gMonIcon_LucarioMega[] = INCBIN_U8("graphics/pokemon/gen_4/lucario/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_RIOLU #if P_FAMILY_HIPPOPOTAS - const u32 gMonFrontPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/anim_front.4bpp.lz"); - const u32 gMonPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/normal.gbapal.lz"); - const u32 gMonBackPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/back.4bpp.lz"); - const u32 gMonShinyPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/shiny.gbapal.lz"); - const u8 gMonIcon_Hippopotas[] = INCBIN_U8("graphics/pokemon/hippopotas/icon.4bpp"); + const u32 gMonFrontPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/gen_4/hippopotas/anim_front.4bpp.lz"); + const u32 gMonPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/gen_4/hippopotas/normal.gbapal.lz"); + const u32 gMonBackPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/gen_4/hippopotas/back.4bpp.lz"); + const u32 gMonShinyPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/gen_4/hippopotas/shiny.gbapal.lz"); + const u8 gMonIcon_Hippopotas[] = INCBIN_U8("graphics/pokemon/gen_4/hippopotas/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hippopotas[] = INCBIN_U8("graphics/pokemon/hippopotas/footprint.1bpp"); + const u8 gMonFootprint_Hippopotas[] = INCBIN_U8("graphics/pokemon/gen_4/hippopotas/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/normalf.gbapal.lz"); - const u32 gMonShinyPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/shinyf.gbapal.lz"); + const u32 gMonPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/gen_4/hippopotas/normalf.gbapal.lz"); + const u32 gMonShinyPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/gen_4/hippopotas/shinyf.gbapal.lz"); #if P_CUSTOM_GENDER_DIFF_ICONS - const u8 gMonIcon_HippopotasF[] = INCBIN_U8("graphics/pokemon/hippopotas/iconf.4bpp"); + const u8 gMonIcon_HippopotasF[] = INCBIN_U8("graphics/pokemon/gen_4/hippopotas/iconf.4bpp"); #endif - const u32 gMonFrontPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/anim_front.4bpp.lz"); - const u32 gMonPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/normal.gbapal.lz"); - const u32 gMonBackPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/back.4bpp.lz"); - const u32 gMonShinyPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/shiny.gbapal.lz"); - const u8 gMonIcon_Hippowdon[] = INCBIN_U8("graphics/pokemon/hippowdon/icon.4bpp"); + const u32 gMonFrontPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/gen_4/hippowdon/anim_front.4bpp.lz"); + const u32 gMonPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/gen_4/hippowdon/normal.gbapal.lz"); + const u32 gMonBackPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/gen_4/hippowdon/back.4bpp.lz"); + const u32 gMonShinyPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/gen_4/hippowdon/shiny.gbapal.lz"); + const u8 gMonIcon_Hippowdon[] = INCBIN_U8("graphics/pokemon/gen_4/hippowdon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hippowdon[] = INCBIN_U8("graphics/pokemon/hippowdon/footprint.1bpp"); + const u8 gMonFootprint_Hippowdon[] = INCBIN_U8("graphics/pokemon/gen_4/hippowdon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/normalf.gbapal.lz"); - const u32 gMonShinyPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/shinyf.gbapal.lz"); + const u32 gMonPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/gen_4/hippowdon/normalf.gbapal.lz"); + const u32 gMonShinyPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/gen_4/hippowdon/shinyf.gbapal.lz"); #if P_CUSTOM_GENDER_DIFF_ICONS - const u8 gMonIcon_HippowdonF[] = INCBIN_U8("graphics/pokemon/hippowdon/iconf.4bpp"); + const u8 gMonIcon_HippowdonF[] = INCBIN_U8("graphics/pokemon/gen_4/hippowdon/iconf.4bpp"); #endif #endif //P_FAMILY_HIPPOPOTAS #if P_FAMILY_SKORUPI - const u32 gMonFrontPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/anim_front.4bpp.lz"); - const u32 gMonPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/normal.gbapal.lz"); - const u32 gMonBackPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/back.4bpp.lz"); - const u32 gMonShinyPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/shiny.gbapal.lz"); - const u8 gMonIcon_Skorupi[] = INCBIN_U8("graphics/pokemon/skorupi/icon.4bpp"); + const u32 gMonFrontPic_Skorupi[] = INCBIN_U32("graphics/pokemon/gen_4/skorupi/anim_front.4bpp.lz"); + const u32 gMonPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/gen_4/skorupi/normal.gbapal.lz"); + const u32 gMonBackPic_Skorupi[] = INCBIN_U32("graphics/pokemon/gen_4/skorupi/back.4bpp.lz"); + const u32 gMonShinyPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/gen_4/skorupi/shiny.gbapal.lz"); + const u8 gMonIcon_Skorupi[] = INCBIN_U8("graphics/pokemon/gen_4/skorupi/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Skorupi[] = INCBIN_U8("graphics/pokemon/skorupi/footprint.1bpp"); + const u8 gMonFootprint_Skorupi[] = INCBIN_U8("graphics/pokemon/gen_4/skorupi/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/anim_front.4bpp.lz"); - const u32 gMonPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/normal.gbapal.lz"); - const u32 gMonBackPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/back.4bpp.lz"); - const u32 gMonShinyPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/shiny.gbapal.lz"); - const u8 gMonIcon_Drapion[] = INCBIN_U8("graphics/pokemon/drapion/icon.4bpp"); + const u32 gMonFrontPic_Drapion[] = INCBIN_U32("graphics/pokemon/gen_4/drapion/anim_front.4bpp.lz"); + const u32 gMonPalette_Drapion[] = INCBIN_U32("graphics/pokemon/gen_4/drapion/normal.gbapal.lz"); + const u32 gMonBackPic_Drapion[] = INCBIN_U32("graphics/pokemon/gen_4/drapion/back.4bpp.lz"); + const u32 gMonShinyPalette_Drapion[] = INCBIN_U32("graphics/pokemon/gen_4/drapion/shiny.gbapal.lz"); + const u8 gMonIcon_Drapion[] = INCBIN_U8("graphics/pokemon/gen_4/drapion/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Drapion[] = INCBIN_U8("graphics/pokemon/drapion/footprint.1bpp"); + const u8 gMonFootprint_Drapion[] = INCBIN_U8("graphics/pokemon/gen_4/drapion/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SKORUPI #if P_FAMILY_CROAGUNK - const u32 gMonFrontPic_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/anim_front.4bpp.lz"); - const u32 gMonPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/normal.gbapal.lz"); - const u32 gMonBackPic_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/back.4bpp.lz"); - const u32 gMonShinyPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/shiny.gbapal.lz"); - const u8 gMonIcon_Croagunk[] = INCBIN_U8("graphics/pokemon/croagunk/icon.4bpp"); + const u32 gMonFrontPic_Croagunk[] = INCBIN_U32("graphics/pokemon/gen_4/croagunk/anim_front.4bpp.lz"); + const u32 gMonPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/gen_4/croagunk/normal.gbapal.lz"); + const u32 gMonBackPic_Croagunk[] = INCBIN_U32("graphics/pokemon/gen_4/croagunk/back.4bpp.lz"); + const u32 gMonShinyPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/gen_4/croagunk/shiny.gbapal.lz"); + const u8 gMonIcon_Croagunk[] = INCBIN_U8("graphics/pokemon/gen_4/croagunk/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Croagunk[] = INCBIN_U8("graphics/pokemon/croagunk/footprint.1bpp"); + const u8 gMonFootprint_Croagunk[] = INCBIN_U8("graphics/pokemon/gen_4/croagunk/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_CroagunkF[] = INCBIN_U32("graphics/pokemon/croagunk/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_CroagunkF[] = INCBIN_U32("graphics/pokemon/croagunk/backf.4bpp.lz"); + const u32 gMonFrontPic_CroagunkF[] = INCBIN_U32("graphics/pokemon/gen_4/croagunk/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_CroagunkF[] = INCBIN_U32("graphics/pokemon/gen_4/croagunk/backf.4bpp.lz"); - const u32 gMonFrontPic_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/anim_front.4bpp.lz"); - const u32 gMonPalette_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/normal.gbapal.lz"); - const u32 gMonBackPic_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/back.4bpp.lz"); - const u32 gMonShinyPalette_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/shiny.gbapal.lz"); - const u8 gMonIcon_Toxicroak[] = INCBIN_U8("graphics/pokemon/toxicroak/icon.4bpp"); + const u32 gMonFrontPic_Toxicroak[] = INCBIN_U32("graphics/pokemon/gen_4/toxicroak/anim_front.4bpp.lz"); + const u32 gMonPalette_Toxicroak[] = INCBIN_U32("graphics/pokemon/gen_4/toxicroak/normal.gbapal.lz"); + const u32 gMonBackPic_Toxicroak[] = INCBIN_U32("graphics/pokemon/gen_4/toxicroak/back.4bpp.lz"); + const u32 gMonShinyPalette_Toxicroak[] = INCBIN_U32("graphics/pokemon/gen_4/toxicroak/shiny.gbapal.lz"); + const u8 gMonIcon_Toxicroak[] = INCBIN_U8("graphics/pokemon/gen_4/toxicroak/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Toxicroak[] = INCBIN_U8("graphics/pokemon/toxicroak/footprint.1bpp"); + const u8 gMonFootprint_Toxicroak[] = INCBIN_U8("graphics/pokemon/gen_4/toxicroak/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ToxicroakF[] = INCBIN_U32("graphics/pokemon/toxicroak/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_ToxicroakF[] = INCBIN_U32("graphics/pokemon/toxicroak/backf.4bpp.lz"); + const u32 gMonFrontPic_ToxicroakF[] = INCBIN_U32("graphics/pokemon/gen_4/toxicroak/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_ToxicroakF[] = INCBIN_U32("graphics/pokemon/gen_4/toxicroak/backf.4bpp.lz"); #endif //P_FAMILY_CROAGUNK #if P_FAMILY_CARNIVINE - const u32 gMonFrontPic_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/anim_front.4bpp.lz"); - const u32 gMonPalette_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/normal.gbapal.lz"); - const u32 gMonBackPic_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/back.4bpp.lz"); - const u32 gMonShinyPalette_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/shiny.gbapal.lz"); - const u8 gMonIcon_Carnivine[] = INCBIN_U8("graphics/pokemon/carnivine/icon.4bpp"); + const u32 gMonFrontPic_Carnivine[] = INCBIN_U32("graphics/pokemon/gen_4/carnivine/anim_front.4bpp.lz"); + const u32 gMonPalette_Carnivine[] = INCBIN_U32("graphics/pokemon/gen_4/carnivine/normal.gbapal.lz"); + const u32 gMonBackPic_Carnivine[] = INCBIN_U32("graphics/pokemon/gen_4/carnivine/back.4bpp.lz"); + const u32 gMonShinyPalette_Carnivine[] = INCBIN_U32("graphics/pokemon/gen_4/carnivine/shiny.gbapal.lz"); + const u8 gMonIcon_Carnivine[] = INCBIN_U8("graphics/pokemon/gen_4/carnivine/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Carnivine[] = INCBIN_U8("graphics/pokemon/carnivine/footprint.1bpp"); + const u8 gMonFootprint_Carnivine[] = INCBIN_U8("graphics/pokemon/gen_4/carnivine/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CARNIVINE #if P_FAMILY_FINNEON - const u32 gMonFrontPic_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/anim_front.4bpp.lz"); - const u32 gMonPalette_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/normal.gbapal.lz"); - const u32 gMonBackPic_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/back.4bpp.lz"); - const u32 gMonShinyPalette_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/shiny.gbapal.lz"); - const u8 gMonIcon_Finneon[] = INCBIN_U8("graphics/pokemon/finneon/icon.4bpp"); + const u32 gMonFrontPic_Finneon[] = INCBIN_U32("graphics/pokemon/gen_4/finneon/anim_front.4bpp.lz"); + const u32 gMonPalette_Finneon[] = INCBIN_U32("graphics/pokemon/gen_4/finneon/normal.gbapal.lz"); + const u32 gMonBackPic_Finneon[] = INCBIN_U32("graphics/pokemon/gen_4/finneon/back.4bpp.lz"); + const u32 gMonShinyPalette_Finneon[] = INCBIN_U32("graphics/pokemon/gen_4/finneon/shiny.gbapal.lz"); + const u8 gMonIcon_Finneon[] = INCBIN_U8("graphics/pokemon/gen_4/finneon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Finneon[] = INCBIN_U8("graphics/pokemon/finneon/footprint.1bpp"); + const u8 gMonFootprint_Finneon[] = INCBIN_U8("graphics/pokemon/gen_4/finneon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_FinneonF[] = INCBIN_U32("graphics/pokemon/finneon/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_FinneonF[] = INCBIN_U32("graphics/pokemon/finneon/backf.4bpp.lz"); + const u32 gMonFrontPic_FinneonF[] = INCBIN_U32("graphics/pokemon/gen_4/finneon/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_FinneonF[] = INCBIN_U32("graphics/pokemon/gen_4/finneon/backf.4bpp.lz"); - const u32 gMonFrontPic_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/anim_front.4bpp.lz"); - const u32 gMonPalette_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/normal.gbapal.lz"); - const u32 gMonBackPic_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/back.4bpp.lz"); - const u32 gMonShinyPalette_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/shiny.gbapal.lz"); - const u8 gMonIcon_Lumineon[] = INCBIN_U8("graphics/pokemon/lumineon/icon.4bpp"); + const u32 gMonFrontPic_Lumineon[] = INCBIN_U32("graphics/pokemon/gen_4/lumineon/anim_front.4bpp.lz"); + const u32 gMonPalette_Lumineon[] = INCBIN_U32("graphics/pokemon/gen_4/lumineon/normal.gbapal.lz"); + const u32 gMonBackPic_Lumineon[] = INCBIN_U32("graphics/pokemon/gen_4/lumineon/back.4bpp.lz"); + const u32 gMonShinyPalette_Lumineon[] = INCBIN_U32("graphics/pokemon/gen_4/lumineon/shiny.gbapal.lz"); + const u8 gMonIcon_Lumineon[] = INCBIN_U8("graphics/pokemon/gen_4/lumineon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lumineon[] = INCBIN_U8("graphics/pokemon/lumineon/footprint.1bpp"); + const u8 gMonFootprint_Lumineon[] = INCBIN_U8("graphics/pokemon/gen_4/lumineon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_LumineonF[] = INCBIN_U32("graphics/pokemon/lumineon/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_LumineonF[] = INCBIN_U32("graphics/pokemon/lumineon/backf.4bpp.lz"); + const u32 gMonFrontPic_LumineonF[] = INCBIN_U32("graphics/pokemon/gen_4/lumineon/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_LumineonF[] = INCBIN_U32("graphics/pokemon/gen_4/lumineon/backf.4bpp.lz"); #endif //P_FAMILY_FINNEON #if P_FAMILY_SNOVER - const u32 gMonFrontPic_Snover[] = INCBIN_U32("graphics/pokemon/snover/anim_front.4bpp.lz"); - const u32 gMonPalette_Snover[] = INCBIN_U32("graphics/pokemon/snover/normal.gbapal.lz"); - const u32 gMonBackPic_Snover[] = INCBIN_U32("graphics/pokemon/snover/back.4bpp.lz"); - const u32 gMonShinyPalette_Snover[] = INCBIN_U32("graphics/pokemon/snover/shiny.gbapal.lz"); - const u8 gMonIcon_Snover[] = INCBIN_U8("graphics/pokemon/snover/icon.4bpp"); + const u32 gMonFrontPic_Snover[] = INCBIN_U32("graphics/pokemon/gen_4/snover/anim_front.4bpp.lz"); + const u32 gMonPalette_Snover[] = INCBIN_U32("graphics/pokemon/gen_4/snover/normal.gbapal.lz"); + const u32 gMonBackPic_Snover[] = INCBIN_U32("graphics/pokemon/gen_4/snover/back.4bpp.lz"); + const u32 gMonShinyPalette_Snover[] = INCBIN_U32("graphics/pokemon/gen_4/snover/shiny.gbapal.lz"); + const u8 gMonIcon_Snover[] = INCBIN_U8("graphics/pokemon/gen_4/snover/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Snover[] = INCBIN_U8("graphics/pokemon/snover/footprint.1bpp"); + const u8 gMonFootprint_Snover[] = INCBIN_U8("graphics/pokemon/gen_4/snover/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_SnoverF[] = INCBIN_U32("graphics/pokemon/snover/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_SnoverF[] = INCBIN_U32("graphics/pokemon/snover/backf.4bpp.lz"); + const u32 gMonFrontPic_SnoverF[] = INCBIN_U32("graphics/pokemon/gen_4/snover/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_SnoverF[] = INCBIN_U32("graphics/pokemon/gen_4/snover/backf.4bpp.lz"); - const u32 gMonFrontPic_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/anim_front.4bpp.lz"); - const u32 gMonPalette_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/normal.gbapal.lz"); - const u32 gMonBackPic_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/back.4bpp.lz"); - const u32 gMonShinyPalette_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/shiny.gbapal.lz"); - const u8 gMonIcon_Abomasnow[] = INCBIN_U8("graphics/pokemon/abomasnow/icon.4bpp"); + const u32 gMonFrontPic_Abomasnow[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/anim_front.4bpp.lz"); + const u32 gMonPalette_Abomasnow[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/normal.gbapal.lz"); + const u32 gMonBackPic_Abomasnow[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/back.4bpp.lz"); + const u32 gMonShinyPalette_Abomasnow[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/shiny.gbapal.lz"); + const u8 gMonIcon_Abomasnow[] = INCBIN_U8("graphics/pokemon/gen_4/abomasnow/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Abomasnow[] = INCBIN_U8("graphics/pokemon/abomasnow/footprint.1bpp"); + const u8 gMonFootprint_Abomasnow[] = INCBIN_U8("graphics/pokemon/gen_4/abomasnow/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_AbomasnowF[] = INCBIN_U32("graphics/pokemon/abomasnow/anim_frontf.4bpp.lz"); + const u32 gMonFrontPic_AbomasnowF[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/anim_frontf.4bpp.lz"); #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/front.4bpp.lz"); - const u32 gMonPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/normal.gbapal.lz"); - const u32 gMonBackPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/shiny.gbapal.lz"); - const u8 gMonIcon_AbomasnowMega[] = INCBIN_U8("graphics/pokemon/abomasnow/mega/icon.4bpp"); + const u32 gMonFrontPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/mega/front.4bpp.lz"); + const u32 gMonPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/mega/normal.gbapal.lz"); + const u32 gMonBackPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/gen_4/abomasnow/mega/shiny.gbapal.lz"); + const u8 gMonIcon_AbomasnowMega[] = INCBIN_U8("graphics/pokemon/gen_4/abomasnow/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SNOVER #if P_FAMILY_ROTOM - const u32 gMonFrontPic_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/anim_front.4bpp.lz"); - const u32 gMonPalette_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/normal.gbapal.lz"); - const u32 gMonBackPic_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/back.4bpp.lz"); - const u32 gMonShinyPalette_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/shiny.gbapal.lz"); - const u8 gMonIcon_Rotom[] = INCBIN_U8("graphics/pokemon/rotom/icon.4bpp"); + const u32 gMonFrontPic_Rotom[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/anim_front.4bpp.lz"); + const u32 gMonPalette_Rotom[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/normal.gbapal.lz"); + const u32 gMonBackPic_Rotom[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/back.4bpp.lz"); + const u32 gMonShinyPalette_Rotom[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/shiny.gbapal.lz"); + const u8 gMonIcon_Rotom[] = INCBIN_U8("graphics/pokemon/gen_4/rotom/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Rotom[] = INCBIN_U8("graphics/pokemon/rotom/normal/footprint.1bpp"); + const u8 gMonFootprint_Rotom[] = INCBIN_U8("graphics/pokemon/gen_4/rotom/normal/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/anim_front.4bpp.lz"); - const u32 gMonPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/normal.gbapal.lz"); - const u32 gMonBackPic_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/back.4bpp.lz"); - const u32 gMonShinyPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/shiny.gbapal.lz"); - const u8 gMonIcon_RotomHeat[] = INCBIN_U8("graphics/pokemon/rotom/heat/icon.4bpp"); + const u32 gMonFrontPic_RotomHeat[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/heat/anim_front.4bpp.lz"); + const u32 gMonPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/heat/normal.gbapal.lz"); + const u32 gMonBackPic_RotomHeat[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/heat/back.4bpp.lz"); + const u32 gMonShinyPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/heat/shiny.gbapal.lz"); + const u8 gMonIcon_RotomHeat[] = INCBIN_U8("graphics/pokemon/gen_4/rotom/heat/icon.4bpp"); - const u32 gMonFrontPic_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/anim_front.4bpp.lz"); - const u32 gMonPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/normal.gbapal.lz"); - const u32 gMonBackPic_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/back.4bpp.lz"); - const u32 gMonShinyPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/shiny.gbapal.lz"); - const u8 gMonIcon_RotomWash[] = INCBIN_U8("graphics/pokemon/rotom/wash/icon.4bpp"); + const u32 gMonFrontPic_RotomWash[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/wash/anim_front.4bpp.lz"); + const u32 gMonPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/wash/normal.gbapal.lz"); + const u32 gMonBackPic_RotomWash[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/wash/back.4bpp.lz"); + const u32 gMonShinyPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/wash/shiny.gbapal.lz"); + const u8 gMonIcon_RotomWash[] = INCBIN_U8("graphics/pokemon/gen_4/rotom/wash/icon.4bpp"); - const u32 gMonFrontPic_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/anim_front.4bpp.lz"); - const u32 gMonPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/normal.gbapal.lz"); - const u32 gMonBackPic_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/back.4bpp.lz"); - const u32 gMonShinyPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/shiny.gbapal.lz"); - const u8 gMonIcon_RotomFrost[] = INCBIN_U8("graphics/pokemon/rotom/frost/icon.4bpp"); + const u32 gMonFrontPic_RotomFrost[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/frost/anim_front.4bpp.lz"); + const u32 gMonPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/frost/normal.gbapal.lz"); + const u32 gMonBackPic_RotomFrost[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/frost/back.4bpp.lz"); + const u32 gMonShinyPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/frost/shiny.gbapal.lz"); + const u8 gMonIcon_RotomFrost[] = INCBIN_U8("graphics/pokemon/gen_4/rotom/frost/icon.4bpp"); - const u32 gMonFrontPic_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/anim_front.4bpp.lz"); - const u32 gMonPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/normal.gbapal.lz"); - const u32 gMonBackPic_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/back.4bpp.lz"); - const u32 gMonShinyPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/shiny.gbapal.lz"); - const u8 gMonIcon_RotomFan[] = INCBIN_U8("graphics/pokemon/rotom/fan/icon.4bpp"); + const u32 gMonFrontPic_RotomFan[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/fan/anim_front.4bpp.lz"); + const u32 gMonPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/fan/normal.gbapal.lz"); + const u32 gMonBackPic_RotomFan[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/fan/back.4bpp.lz"); + const u32 gMonShinyPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/fan/shiny.gbapal.lz"); + const u8 gMonIcon_RotomFan[] = INCBIN_U8("graphics/pokemon/gen_4/rotom/fan/icon.4bpp"); - const u32 gMonFrontPic_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/anim_front.4bpp.lz"); - const u32 gMonPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/normal.gbapal.lz"); - const u32 gMonBackPic_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/back.4bpp.lz"); - const u32 gMonShinyPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/shiny.gbapal.lz"); - const u8 gMonIcon_RotomMow[] = INCBIN_U8("graphics/pokemon/rotom/mow/icon.4bpp"); + const u32 gMonFrontPic_RotomMow[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/mow/anim_front.4bpp.lz"); + const u32 gMonPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/mow/normal.gbapal.lz"); + const u32 gMonBackPic_RotomMow[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/mow/back.4bpp.lz"); + const u32 gMonShinyPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/gen_4/rotom/mow/shiny.gbapal.lz"); + const u8 gMonIcon_RotomMow[] = INCBIN_U8("graphics/pokemon/gen_4/rotom/mow/icon.4bpp"); #endif //P_FAMILY_ROTOM #if P_FAMILY_UXIE - const u32 gMonFrontPic_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/anim_front.4bpp.lz"); - const u32 gMonPalette_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/normal.gbapal.lz"); - const u32 gMonBackPic_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/back.4bpp.lz"); - const u32 gMonShinyPalette_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/shiny.gbapal.lz"); - const u8 gMonIcon_Uxie[] = INCBIN_U8("graphics/pokemon/uxie/icon.4bpp"); + const u32 gMonFrontPic_Uxie[] = INCBIN_U32("graphics/pokemon/gen_4/uxie/anim_front.4bpp.lz"); + const u32 gMonPalette_Uxie[] = INCBIN_U32("graphics/pokemon/gen_4/uxie/normal.gbapal.lz"); + const u32 gMonBackPic_Uxie[] = INCBIN_U32("graphics/pokemon/gen_4/uxie/back.4bpp.lz"); + const u32 gMonShinyPalette_Uxie[] = INCBIN_U32("graphics/pokemon/gen_4/uxie/shiny.gbapal.lz"); + const u8 gMonIcon_Uxie[] = INCBIN_U8("graphics/pokemon/gen_4/uxie/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Uxie[] = INCBIN_U8("graphics/pokemon/uxie/footprint.1bpp"); + const u8 gMonFootprint_Uxie[] = INCBIN_U8("graphics/pokemon/gen_4/uxie/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_UXIE #if P_FAMILY_MESPRIT - const u32 gMonFrontPic_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/anim_front.4bpp.lz"); - const u32 gMonPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/normal.gbapal.lz"); - const u32 gMonBackPic_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/back.4bpp.lz"); - const u32 gMonShinyPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/shiny.gbapal.lz"); - const u8 gMonIcon_Mesprit[] = INCBIN_U8("graphics/pokemon/mesprit/icon.4bpp"); + const u32 gMonFrontPic_Mesprit[] = INCBIN_U32("graphics/pokemon/gen_4/mesprit/anim_front.4bpp.lz"); + const u32 gMonPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/gen_4/mesprit/normal.gbapal.lz"); + const u32 gMonBackPic_Mesprit[] = INCBIN_U32("graphics/pokemon/gen_4/mesprit/back.4bpp.lz"); + const u32 gMonShinyPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/gen_4/mesprit/shiny.gbapal.lz"); + const u8 gMonIcon_Mesprit[] = INCBIN_U8("graphics/pokemon/gen_4/mesprit/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mesprit[] = INCBIN_U8("graphics/pokemon/mesprit/footprint.1bpp"); + const u8 gMonFootprint_Mesprit[] = INCBIN_U8("graphics/pokemon/gen_4/mesprit/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MESPRIT #if P_FAMILY_AZELF - const u32 gMonFrontPic_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/anim_front.4bpp.lz"); - const u32 gMonPalette_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/normal.gbapal.lz"); - const u32 gMonBackPic_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/back.4bpp.lz"); - const u32 gMonShinyPalette_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/shiny.gbapal.lz"); - const u8 gMonIcon_Azelf[] = INCBIN_U8("graphics/pokemon/azelf/icon.4bpp"); + const u32 gMonFrontPic_Azelf[] = INCBIN_U32("graphics/pokemon/gen_4/azelf/anim_front.4bpp.lz"); + const u32 gMonPalette_Azelf[] = INCBIN_U32("graphics/pokemon/gen_4/azelf/normal.gbapal.lz"); + const u32 gMonBackPic_Azelf[] = INCBIN_U32("graphics/pokemon/gen_4/azelf/back.4bpp.lz"); + const u32 gMonShinyPalette_Azelf[] = INCBIN_U32("graphics/pokemon/gen_4/azelf/shiny.gbapal.lz"); + const u8 gMonIcon_Azelf[] = INCBIN_U8("graphics/pokemon/gen_4/azelf/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Azelf[] = INCBIN_U8("graphics/pokemon/azelf/footprint.1bpp"); + const u8 gMonFootprint_Azelf[] = INCBIN_U8("graphics/pokemon/gen_4/azelf/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_AZELF #if P_FAMILY_DIALGA - const u32 gMonFrontPic_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/anim_front.4bpp.lz"); - const u32 gMonPalette_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/normal.gbapal.lz"); - const u32 gMonBackPic_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/back.4bpp.lz"); - const u32 gMonShinyPalette_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/shiny.gbapal.lz"); - const u8 gMonIcon_Dialga[] = INCBIN_U8("graphics/pokemon/dialga/icon.4bpp"); + const u32 gMonFrontPic_Dialga[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/anim_front.4bpp.lz"); + const u32 gMonPalette_Dialga[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/normal.gbapal.lz"); + const u32 gMonBackPic_Dialga[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/back.4bpp.lz"); + const u32 gMonShinyPalette_Dialga[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/shiny.gbapal.lz"); + const u8 gMonIcon_Dialga[] = INCBIN_U8("graphics/pokemon/gen_4/dialga/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dialga[] = INCBIN_U8("graphics/pokemon/dialga/footprint.1bpp"); + const u8 gMonFootprint_Dialga[] = INCBIN_U8("graphics/pokemon/gen_4/dialga/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/front.4bpp.lz"); - const u32 gMonPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/normal.gbapal.lz"); - const u32 gMonBackPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/back.4bpp.lz"); - const u32 gMonShinyPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/shiny.gbapal.lz"); - const u8 gMonIcon_DialgaOrigin[] = INCBIN_U8("graphics/pokemon/dialga/origin/icon.4bpp"); + const u32 gMonFrontPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/origin/front.4bpp.lz"); + const u32 gMonPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/origin/normal.gbapal.lz"); + const u32 gMonBackPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/origin/back.4bpp.lz"); + const u32 gMonShinyPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/dialga/origin/shiny.gbapal.lz"); + const u8 gMonIcon_DialgaOrigin[] = INCBIN_U8("graphics/pokemon/gen_4/dialga/origin/icon.4bpp"); #endif //P_FAMILY_DIALGA #if P_FAMILY_PALKIA - const u32 gMonFrontPic_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/anim_front.4bpp.lz"); - const u32 gMonPalette_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/normal.gbapal.lz"); - const u32 gMonBackPic_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/back.4bpp.lz"); - const u32 gMonShinyPalette_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/shiny.gbapal.lz"); - const u8 gMonIcon_Palkia[] = INCBIN_U8("graphics/pokemon/palkia/icon.4bpp"); + const u32 gMonFrontPic_Palkia[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/anim_front.4bpp.lz"); + const u32 gMonPalette_Palkia[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/normal.gbapal.lz"); + const u32 gMonBackPic_Palkia[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/back.4bpp.lz"); + const u32 gMonShinyPalette_Palkia[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/shiny.gbapal.lz"); + const u8 gMonIcon_Palkia[] = INCBIN_U8("graphics/pokemon/gen_4/palkia/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Palkia[] = INCBIN_U8("graphics/pokemon/palkia/footprint.1bpp"); + const u8 gMonFootprint_Palkia[] = INCBIN_U8("graphics/pokemon/gen_4/palkia/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/front.4bpp.lz"); - const u32 gMonPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/normal.gbapal.lz"); - const u32 gMonBackPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/back.4bpp.lz"); - const u32 gMonShinyPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/shiny.gbapal.lz"); - const u8 gMonIcon_PalkiaOrigin[] = INCBIN_U8("graphics/pokemon/palkia/origin/icon.4bpp"); + const u32 gMonFrontPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/origin/front.4bpp.lz"); + const u32 gMonPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/origin/normal.gbapal.lz"); + const u32 gMonBackPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/origin/back.4bpp.lz"); + const u32 gMonShinyPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/palkia/origin/shiny.gbapal.lz"); + const u8 gMonIcon_PalkiaOrigin[] = INCBIN_U8("graphics/pokemon/gen_4/palkia/origin/icon.4bpp"); #endif //P_FAMILY_PALKIA #if P_FAMILY_HEATRAN - const u32 gMonFrontPic_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/anim_front.4bpp.lz"); - const u32 gMonPalette_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/normal.gbapal.lz"); - const u32 gMonBackPic_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/back.4bpp.lz"); - const u32 gMonShinyPalette_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/shiny.gbapal.lz"); - const u8 gMonIcon_Heatran[] = INCBIN_U8("graphics/pokemon/heatran/icon.4bpp"); + const u32 gMonFrontPic_Heatran[] = INCBIN_U32("graphics/pokemon/gen_4/heatran/anim_front.4bpp.lz"); + const u32 gMonPalette_Heatran[] = INCBIN_U32("graphics/pokemon/gen_4/heatran/normal.gbapal.lz"); + const u32 gMonBackPic_Heatran[] = INCBIN_U32("graphics/pokemon/gen_4/heatran/back.4bpp.lz"); + const u32 gMonShinyPalette_Heatran[] = INCBIN_U32("graphics/pokemon/gen_4/heatran/shiny.gbapal.lz"); + const u8 gMonIcon_Heatran[] = INCBIN_U8("graphics/pokemon/gen_4/heatran/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Heatran[] = INCBIN_U8("graphics/pokemon/heatran/footprint.1bpp"); + const u8 gMonFootprint_Heatran[] = INCBIN_U8("graphics/pokemon/gen_4/heatran/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_HEATRAN #if P_FAMILY_REGIGIGAS - const u32 gMonFrontPic_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/anim_front.4bpp.lz"); - const u32 gMonPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/normal.gbapal.lz"); - const u32 gMonBackPic_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/back.4bpp.lz"); - const u32 gMonShinyPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/shiny.gbapal.lz"); - const u8 gMonIcon_Regigigas[] = INCBIN_U8("graphics/pokemon/regigigas/icon.4bpp"); + const u32 gMonFrontPic_Regigigas[] = INCBIN_U32("graphics/pokemon/gen_4/regigigas/anim_front.4bpp.lz"); + const u32 gMonPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/gen_4/regigigas/normal.gbapal.lz"); + const u32 gMonBackPic_Regigigas[] = INCBIN_U32("graphics/pokemon/gen_4/regigigas/back.4bpp.lz"); + const u32 gMonShinyPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/gen_4/regigigas/shiny.gbapal.lz"); + const u8 gMonIcon_Regigigas[] = INCBIN_U8("graphics/pokemon/gen_4/regigigas/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Regigigas[] = INCBIN_U8("graphics/pokemon/regigigas/footprint.1bpp"); + const u8 gMonFootprint_Regigigas[] = INCBIN_U8("graphics/pokemon/gen_4/regigigas/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_REGIGIGAS #if P_FAMILY_GIRATINA - const u32 gMonFrontPic_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/anim_front.4bpp.lz"); - const u32 gMonPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/normal.gbapal.lz"); - const u32 gMonBackPic_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/back.4bpp.lz"); - const u32 gMonShinyPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/shiny.gbapal.lz"); - const u8 gMonIcon_GiratinaAltered[] = INCBIN_U8("graphics/pokemon/giratina/icon.4bpp"); + const u32 gMonFrontPic_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/anim_front.4bpp.lz"); + const u32 gMonPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/normal.gbapal.lz"); + const u32 gMonBackPic_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/back.4bpp.lz"); + const u32 gMonShinyPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/shiny.gbapal.lz"); + const u8 gMonIcon_GiratinaAltered[] = INCBIN_U8("graphics/pokemon/gen_4/giratina/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Giratina[] = INCBIN_U8("graphics/pokemon/giratina/footprint.1bpp"); + const u8 gMonFootprint_Giratina[] = INCBIN_U8("graphics/pokemon/gen_4/giratina/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/anim_front.4bpp.lz"); - const u32 gMonPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/normal.gbapal.lz"); - const u32 gMonBackPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/back.4bpp.lz"); - const u32 gMonShinyPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/shiny.gbapal.lz"); - const u8 gMonIcon_GiratinaOrigin[] = INCBIN_U8("graphics/pokemon/giratina/origin/icon.4bpp"); + const u32 gMonFrontPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/origin/anim_front.4bpp.lz"); + const u32 gMonPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/origin/normal.gbapal.lz"); + const u32 gMonBackPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/origin/back.4bpp.lz"); + const u32 gMonShinyPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/gen_4/giratina/origin/shiny.gbapal.lz"); + const u8 gMonIcon_GiratinaOrigin[] = INCBIN_U8("graphics/pokemon/gen_4/giratina/origin/icon.4bpp"); #endif //P_FAMILY_GIRATINA #if P_FAMILY_CRESSELIA - const u32 gMonFrontPic_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/anim_front.4bpp.lz"); - const u32 gMonPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/normal.gbapal.lz"); - const u32 gMonBackPic_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/back.4bpp.lz"); - const u32 gMonShinyPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/shiny.gbapal.lz"); - const u8 gMonIcon_Cresselia[] = INCBIN_U8("graphics/pokemon/cresselia/icon.4bpp"); + const u32 gMonFrontPic_Cresselia[] = INCBIN_U32("graphics/pokemon/gen_4/cresselia/anim_front.4bpp.lz"); + const u32 gMonPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/gen_4/cresselia/normal.gbapal.lz"); + const u32 gMonBackPic_Cresselia[] = INCBIN_U32("graphics/pokemon/gen_4/cresselia/back.4bpp.lz"); + const u32 gMonShinyPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/gen_4/cresselia/shiny.gbapal.lz"); + const u8 gMonIcon_Cresselia[] = INCBIN_U8("graphics/pokemon/gen_4/cresselia/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cresselia[] = INCBIN_U8("graphics/pokemon/cresselia/footprint.1bpp"); + const u8 gMonFootprint_Cresselia[] = INCBIN_U8("graphics/pokemon/gen_4/cresselia/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CRESSELIA #if P_FAMILY_MANAPHY - const u32 gMonFrontPic_Phione[] = INCBIN_U32("graphics/pokemon/phione/anim_front.4bpp.lz"); - const u32 gMonPalette_Phione[] = INCBIN_U32("graphics/pokemon/phione/normal.gbapal.lz"); - const u32 gMonBackPic_Phione[] = INCBIN_U32("graphics/pokemon/phione/back.4bpp.lz"); - const u32 gMonShinyPalette_Phione[] = INCBIN_U32("graphics/pokemon/phione/shiny.gbapal.lz"); - const u8 gMonIcon_Phione[] = INCBIN_U8("graphics/pokemon/phione/icon.4bpp"); + const u32 gMonFrontPic_Phione[] = INCBIN_U32("graphics/pokemon/gen_4/phione/anim_front.4bpp.lz"); + const u32 gMonPalette_Phione[] = INCBIN_U32("graphics/pokemon/gen_4/phione/normal.gbapal.lz"); + const u32 gMonBackPic_Phione[] = INCBIN_U32("graphics/pokemon/gen_4/phione/back.4bpp.lz"); + const u32 gMonShinyPalette_Phione[] = INCBIN_U32("graphics/pokemon/gen_4/phione/shiny.gbapal.lz"); + const u8 gMonIcon_Phione[] = INCBIN_U8("graphics/pokemon/gen_4/phione/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Phione[] = INCBIN_U8("graphics/pokemon/phione/footprint.1bpp"); + const u8 gMonFootprint_Phione[] = INCBIN_U8("graphics/pokemon/gen_4/phione/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/anim_front.4bpp.lz"); - const u32 gMonPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/normal.gbapal.lz"); - const u32 gMonBackPic_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/back.4bpp.lz"); - const u32 gMonShinyPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/shiny.gbapal.lz"); - const u8 gMonIcon_Manaphy[] = INCBIN_U8("graphics/pokemon/manaphy/icon.4bpp"); + const u32 gMonFrontPic_Manaphy[] = INCBIN_U32("graphics/pokemon/gen_4/manaphy/anim_front.4bpp.lz"); + const u32 gMonPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/gen_4/manaphy/normal.gbapal.lz"); + const u32 gMonBackPic_Manaphy[] = INCBIN_U32("graphics/pokemon/gen_4/manaphy/back.4bpp.lz"); + const u32 gMonShinyPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/gen_4/manaphy/shiny.gbapal.lz"); + const u8 gMonIcon_Manaphy[] = INCBIN_U8("graphics/pokemon/gen_4/manaphy/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Manaphy[] = INCBIN_U8("graphics/pokemon/manaphy/footprint.1bpp"); + const u8 gMonFootprint_Manaphy[] = INCBIN_U8("graphics/pokemon/gen_4/manaphy/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MANAPHY #if P_FAMILY_DARKRAI - const u32 gMonFrontPic_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/anim_front.4bpp.lz"); - const u32 gMonPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/normal.gbapal.lz"); - const u32 gMonBackPic_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/back.4bpp.lz"); - const u32 gMonShinyPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/shiny.gbapal.lz"); - const u8 gMonIcon_Darkrai[] = INCBIN_U8("graphics/pokemon/darkrai/icon.4bpp"); + const u32 gMonFrontPic_Darkrai[] = INCBIN_U32("graphics/pokemon/gen_4/darkrai/anim_front.4bpp.lz"); + const u32 gMonPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/gen_4/darkrai/normal.gbapal.lz"); + const u32 gMonBackPic_Darkrai[] = INCBIN_U32("graphics/pokemon/gen_4/darkrai/back.4bpp.lz"); + const u32 gMonShinyPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/gen_4/darkrai/shiny.gbapal.lz"); + const u8 gMonIcon_Darkrai[] = INCBIN_U8("graphics/pokemon/gen_4/darkrai/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Darkrai[] = INCBIN_U8("graphics/pokemon/darkrai/footprint.1bpp"); + const u8 gMonFootprint_Darkrai[] = INCBIN_U8("graphics/pokemon/gen_4/darkrai/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DARKRAI #if P_FAMILY_SHAYMIN - const u32 gMonFrontPic_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/anim_front.4bpp.lz"); - const u32 gMonPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/normal.gbapal.lz"); - const u32 gMonBackPic_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/back.4bpp.lz"); - const u32 gMonShinyPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/shiny.gbapal.lz"); - const u8 gMonIcon_ShayminLand[] = INCBIN_U8("graphics/pokemon/shaymin/icon.4bpp"); + const u32 gMonFrontPic_ShayminLand[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/anim_front.4bpp.lz"); + const u32 gMonPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/normal.gbapal.lz"); + const u32 gMonBackPic_ShayminLand[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/back.4bpp.lz"); + const u32 gMonShinyPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/shiny.gbapal.lz"); + const u8 gMonIcon_ShayminLand[] = INCBIN_U8("graphics/pokemon/gen_4/shaymin/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Shaymin[] = INCBIN_U8("graphics/pokemon/shaymin/footprint.1bpp"); + const u8 gMonFootprint_Shaymin[] = INCBIN_U8("graphics/pokemon/gen_4/shaymin/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/anim_front.4bpp.lz"); - const u32 gMonPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/normal.gbapal.lz"); - const u32 gMonBackPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/back.4bpp.lz"); - const u32 gMonShinyPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/shiny.gbapal.lz"); - const u8 gMonIcon_ShayminSky[] = INCBIN_U8("graphics/pokemon/shaymin/sky/icon.4bpp"); + const u32 gMonFrontPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/sky/anim_front.4bpp.lz"); + const u32 gMonPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/sky/normal.gbapal.lz"); + const u32 gMonBackPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/sky/back.4bpp.lz"); + const u32 gMonShinyPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/gen_4/shaymin/sky/shiny.gbapal.lz"); + const u8 gMonIcon_ShayminSky[] = INCBIN_U8("graphics/pokemon/gen_4/shaymin/sky/icon.4bpp"); #endif //P_FAMILY_SHAYMIN #if P_FAMILY_ARCEUS - const u32 gMonFrontPic_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/anim_front.4bpp.lz"); - const u32 gMonBackPic_Arceus[] = INCBIN_U32("graphics/pokemon/arceus/back.4bpp.lz"); - const u8 gMonIcon_Arceus[] = INCBIN_U8("graphics/pokemon/arceus/icon.4bpp"); + const u32 gMonFrontPic_Arceus[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/anim_front.4bpp.lz"); + const u32 gMonBackPic_Arceus[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/back.4bpp.lz"); + const u8 gMonIcon_Arceus[] = INCBIN_U8("graphics/pokemon/gen_4/arceus/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Arceus[] = INCBIN_U8("graphics/pokemon/arceus/footprint.1bpp"); + const u8 gMonFootprint_Arceus[] = INCBIN_U8("graphics/pokemon/gen_4/arceus/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_ArceusNormal[] = INCBIN_U32("graphics/pokemon/arceus/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusNormal[] = INCBIN_U32("graphics/pokemon/arceus/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusNormal[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusNormal[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/arceus/fighting/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/arceus/fighting/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/fighting/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/fighting/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusFlying[] = INCBIN_U32("graphics/pokemon/arceus/flying/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusFlying[] = INCBIN_U32("graphics/pokemon/arceus/flying/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusFlying[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/flying/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusFlying[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/flying/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusPoison[] = INCBIN_U32("graphics/pokemon/arceus/poison/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusPoison[] = INCBIN_U32("graphics/pokemon/arceus/poison/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusPoison[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/poison/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusPoison[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/poison/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusGround[] = INCBIN_U32("graphics/pokemon/arceus/ground/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusGround[] = INCBIN_U32("graphics/pokemon/arceus/ground/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusGround[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/ground/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusGround[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/ground/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusRock[] = INCBIN_U32("graphics/pokemon/arceus/rock/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusRock[] = INCBIN_U32("graphics/pokemon/arceus/rock/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusRock[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/rock/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusRock[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/rock/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusBug[] = INCBIN_U32("graphics/pokemon/arceus/bug/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusBug[] = INCBIN_U32("graphics/pokemon/arceus/bug/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusBug[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/bug/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusBug[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/bug/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusGhost[] = INCBIN_U32("graphics/pokemon/arceus/ghost/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusGhost[] = INCBIN_U32("graphics/pokemon/arceus/ghost/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusGhost[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/ghost/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusGhost[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/ghost/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusSteel[] = INCBIN_U32("graphics/pokemon/arceus/steel/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusSteel[] = INCBIN_U32("graphics/pokemon/arceus/steel/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusSteel[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/steel/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusSteel[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/steel/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusFire[] = INCBIN_U32("graphics/pokemon/arceus/fire/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusFire[] = INCBIN_U32("graphics/pokemon/arceus/fire/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusFire[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/fire/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusFire[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/fire/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusWater[] = INCBIN_U32("graphics/pokemon/arceus/water/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusWater[] = INCBIN_U32("graphics/pokemon/arceus/water/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusWater[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/water/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusWater[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/water/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusGrass[] = INCBIN_U32("graphics/pokemon/arceus/grass/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusGrass[] = INCBIN_U32("graphics/pokemon/arceus/grass/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusGrass[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/grass/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusGrass[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/grass/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusElectric[] = INCBIN_U32("graphics/pokemon/arceus/electric/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusElectric[] = INCBIN_U32("graphics/pokemon/arceus/electric/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusElectric[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/electric/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusElectric[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/electric/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusPsychic[] = INCBIN_U32("graphics/pokemon/arceus/psychic/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusPsychic[] = INCBIN_U32("graphics/pokemon/arceus/psychic/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusPsychic[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/psychic/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusPsychic[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/psychic/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusIce[] = INCBIN_U32("graphics/pokemon/arceus/ice/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusIce[] = INCBIN_U32("graphics/pokemon/arceus/ice/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusIce[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/ice/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusIce[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/ice/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/dragon/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/dragon/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/dragon/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/dragon/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/dark/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/dark/shiny.gbapal.lz"); - const u32 gMonPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/normal.gbapal.lz"); - const u32 gMonShinyPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/shiny.gbapal.lz"); + const u32 gMonPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/fairy/normal.gbapal.lz"); + const u32 gMonShinyPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/gen_4/arceus/fairy/shiny.gbapal.lz"); #endif //P_FAMILY_ARCEUS #if P_FAMILY_VICTINI - const u32 gMonFrontPic_Victini[] = INCBIN_U32("graphics/pokemon/victini/anim_front.4bpp.lz"); - const u32 gMonPalette_Victini[] = INCBIN_U32("graphics/pokemon/victini/normal.gbapal.lz"); - const u32 gMonBackPic_Victini[] = INCBIN_U32("graphics/pokemon/victini/back.4bpp.lz"); - const u32 gMonShinyPalette_Victini[] = INCBIN_U32("graphics/pokemon/victini/shiny.gbapal.lz"); - const u8 gMonIcon_Victini[] = INCBIN_U8("graphics/pokemon/victini/icon.4bpp"); + const u32 gMonFrontPic_Victini[] = INCBIN_U32("graphics/pokemon/gen_5/victini/anim_front.4bpp.lz"); + const u32 gMonPalette_Victini[] = INCBIN_U32("graphics/pokemon/gen_5/victini/normal.gbapal.lz"); + const u32 gMonBackPic_Victini[] = INCBIN_U32("graphics/pokemon/gen_5/victini/back.4bpp.lz"); + const u32 gMonShinyPalette_Victini[] = INCBIN_U32("graphics/pokemon/gen_5/victini/shiny.gbapal.lz"); + const u8 gMonIcon_Victini[] = INCBIN_U8("graphics/pokemon/gen_5/victini/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Victini[] = INCBIN_U8("graphics/pokemon/victini/footprint.1bpp"); + const u8 gMonFootprint_Victini[] = INCBIN_U8("graphics/pokemon/gen_5/victini/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_VICTINI #if P_FAMILY_SNIVY - const u32 gMonFrontPic_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/anim_front.4bpp.lz"); - const u32 gMonPalette_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/normal.gbapal.lz"); - const u32 gMonBackPic_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/back.4bpp.lz"); - const u32 gMonShinyPalette_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/shiny.gbapal.lz"); - const u8 gMonIcon_Snivy[] = INCBIN_U8("graphics/pokemon/snivy/icon.4bpp"); + const u32 gMonFrontPic_Snivy[] = INCBIN_U32("graphics/pokemon/gen_5/snivy/anim_front.4bpp.lz"); + const u32 gMonPalette_Snivy[] = INCBIN_U32("graphics/pokemon/gen_5/snivy/normal.gbapal.lz"); + const u32 gMonBackPic_Snivy[] = INCBIN_U32("graphics/pokemon/gen_5/snivy/back.4bpp.lz"); + const u32 gMonShinyPalette_Snivy[] = INCBIN_U32("graphics/pokemon/gen_5/snivy/shiny.gbapal.lz"); + const u8 gMonIcon_Snivy[] = INCBIN_U8("graphics/pokemon/gen_5/snivy/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Snivy[] = INCBIN_U8("graphics/pokemon/snivy/footprint.1bpp"); + const u8 gMonFootprint_Snivy[] = INCBIN_U8("graphics/pokemon/gen_5/snivy/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Servine[] = INCBIN_U32("graphics/pokemon/servine/anim_front.4bpp.lz"); - const u32 gMonPalette_Servine[] = INCBIN_U32("graphics/pokemon/servine/normal.gbapal.lz"); - const u32 gMonBackPic_Servine[] = INCBIN_U32("graphics/pokemon/servine/back.4bpp.lz"); - const u32 gMonShinyPalette_Servine[] = INCBIN_U32("graphics/pokemon/servine/shiny.gbapal.lz"); - const u8 gMonIcon_Servine[] = INCBIN_U8("graphics/pokemon/servine/icon.4bpp"); + const u32 gMonFrontPic_Servine[] = INCBIN_U32("graphics/pokemon/gen_5/servine/anim_front.4bpp.lz"); + const u32 gMonPalette_Servine[] = INCBIN_U32("graphics/pokemon/gen_5/servine/normal.gbapal.lz"); + const u32 gMonBackPic_Servine[] = INCBIN_U32("graphics/pokemon/gen_5/servine/back.4bpp.lz"); + const u32 gMonShinyPalette_Servine[] = INCBIN_U32("graphics/pokemon/gen_5/servine/shiny.gbapal.lz"); + const u8 gMonIcon_Servine[] = INCBIN_U8("graphics/pokemon/gen_5/servine/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Servine[] = INCBIN_U8("graphics/pokemon/servine/footprint.1bpp"); + const u8 gMonFootprint_Servine[] = INCBIN_U8("graphics/pokemon/gen_5/servine/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/anim_front.4bpp.lz"); - const u32 gMonPalette_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/normal.gbapal.lz"); - const u32 gMonBackPic_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/back.4bpp.lz"); - const u32 gMonShinyPalette_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/shiny.gbapal.lz"); - const u8 gMonIcon_Serperior[] = INCBIN_U8("graphics/pokemon/serperior/icon.4bpp"); + const u32 gMonFrontPic_Serperior[] = INCBIN_U32("graphics/pokemon/gen_5/serperior/anim_front.4bpp.lz"); + const u32 gMonPalette_Serperior[] = INCBIN_U32("graphics/pokemon/gen_5/serperior/normal.gbapal.lz"); + const u32 gMonBackPic_Serperior[] = INCBIN_U32("graphics/pokemon/gen_5/serperior/back.4bpp.lz"); + const u32 gMonShinyPalette_Serperior[] = INCBIN_U32("graphics/pokemon/gen_5/serperior/shiny.gbapal.lz"); + const u8 gMonIcon_Serperior[] = INCBIN_U8("graphics/pokemon/gen_5/serperior/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Serperior[] = INCBIN_U8("graphics/pokemon/serperior/footprint.1bpp"); + const u8 gMonFootprint_Serperior[] = INCBIN_U8("graphics/pokemon/gen_5/serperior/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SNIVY #if P_FAMILY_TEPIG - const u32 gMonFrontPic_Tepig[] = INCBIN_U32("graphics/pokemon/tepig/anim_front.4bpp.lz"); - const u32 gMonPalette_Tepig[] = INCBIN_U32("graphics/pokemon/tepig/normal.gbapal.lz"); - const u32 gMonBackPic_Tepig[] = INCBIN_U32("graphics/pokemon/tepig/back.4bpp.lz"); - const u32 gMonShinyPalette_Tepig[] = INCBIN_U32("graphics/pokemon/tepig/shiny.gbapal.lz"); - const u8 gMonIcon_Tepig[] = INCBIN_U8("graphics/pokemon/tepig/icon.4bpp"); + const u32 gMonFrontPic_Tepig[] = INCBIN_U32("graphics/pokemon/gen_5/tepig/anim_front.4bpp.lz"); + const u32 gMonPalette_Tepig[] = INCBIN_U32("graphics/pokemon/gen_5/tepig/normal.gbapal.lz"); + const u32 gMonBackPic_Tepig[] = INCBIN_U32("graphics/pokemon/gen_5/tepig/back.4bpp.lz"); + const u32 gMonShinyPalette_Tepig[] = INCBIN_U32("graphics/pokemon/gen_5/tepig/shiny.gbapal.lz"); + const u8 gMonIcon_Tepig[] = INCBIN_U8("graphics/pokemon/gen_5/tepig/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tepig[] = INCBIN_U8("graphics/pokemon/tepig/footprint.1bpp"); + const u8 gMonFootprint_Tepig[] = INCBIN_U8("graphics/pokemon/gen_5/tepig/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/anim_front.4bpp.lz"); - const u32 gMonPalette_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/normal.gbapal.lz"); - const u32 gMonBackPic_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/back.4bpp.lz"); - const u32 gMonShinyPalette_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/shiny.gbapal.lz"); - const u8 gMonIcon_Pignite[] = INCBIN_U8("graphics/pokemon/pignite/icon.4bpp"); + const u32 gMonFrontPic_Pignite[] = INCBIN_U32("graphics/pokemon/gen_5/pignite/anim_front.4bpp.lz"); + const u32 gMonPalette_Pignite[] = INCBIN_U32("graphics/pokemon/gen_5/pignite/normal.gbapal.lz"); + const u32 gMonBackPic_Pignite[] = INCBIN_U32("graphics/pokemon/gen_5/pignite/back.4bpp.lz"); + const u32 gMonShinyPalette_Pignite[] = INCBIN_U32("graphics/pokemon/gen_5/pignite/shiny.gbapal.lz"); + const u8 gMonIcon_Pignite[] = INCBIN_U8("graphics/pokemon/gen_5/pignite/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pignite[] = INCBIN_U8("graphics/pokemon/pignite/footprint.1bpp"); + const u8 gMonFootprint_Pignite[] = INCBIN_U8("graphics/pokemon/gen_5/pignite/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/anim_front.4bpp.lz"); - const u32 gMonPalette_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/normal.gbapal.lz"); - const u32 gMonBackPic_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/back.4bpp.lz"); - const u32 gMonShinyPalette_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/shiny.gbapal.lz"); - const u8 gMonIcon_Emboar[] = INCBIN_U8("graphics/pokemon/emboar/icon.4bpp"); + const u32 gMonFrontPic_Emboar[] = INCBIN_U32("graphics/pokemon/gen_5/emboar/anim_front.4bpp.lz"); + const u32 gMonPalette_Emboar[] = INCBIN_U32("graphics/pokemon/gen_5/emboar/normal.gbapal.lz"); + const u32 gMonBackPic_Emboar[] = INCBIN_U32("graphics/pokemon/gen_5/emboar/back.4bpp.lz"); + const u32 gMonShinyPalette_Emboar[] = INCBIN_U32("graphics/pokemon/gen_5/emboar/shiny.gbapal.lz"); + const u8 gMonIcon_Emboar[] = INCBIN_U8("graphics/pokemon/gen_5/emboar/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Emboar[] = INCBIN_U8("graphics/pokemon/emboar/footprint.1bpp"); + const u8 gMonFootprint_Emboar[] = INCBIN_U8("graphics/pokemon/gen_5/emboar/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TEPIG #if P_FAMILY_OSHAWOTT - const u32 gMonFrontPic_Oshawott[] = INCBIN_U32("graphics/pokemon/oshawott/anim_front.4bpp.lz"); - const u32 gMonPalette_Oshawott[] = INCBIN_U32("graphics/pokemon/oshawott/normal.gbapal.lz"); - const u32 gMonBackPic_Oshawott[] = INCBIN_U32("graphics/pokemon/oshawott/back.4bpp.lz"); - const u32 gMonShinyPalette_Oshawott[] = INCBIN_U32("graphics/pokemon/oshawott/shiny.gbapal.lz"); - const u8 gMonIcon_Oshawott[] = INCBIN_U8("graphics/pokemon/oshawott/icon.4bpp"); + const u32 gMonFrontPic_Oshawott[] = INCBIN_U32("graphics/pokemon/gen_5/oshawott/anim_front.4bpp.lz"); + const u32 gMonPalette_Oshawott[] = INCBIN_U32("graphics/pokemon/gen_5/oshawott/normal.gbapal.lz"); + const u32 gMonBackPic_Oshawott[] = INCBIN_U32("graphics/pokemon/gen_5/oshawott/back.4bpp.lz"); + const u32 gMonShinyPalette_Oshawott[] = INCBIN_U32("graphics/pokemon/gen_5/oshawott/shiny.gbapal.lz"); + const u8 gMonIcon_Oshawott[] = INCBIN_U8("graphics/pokemon/gen_5/oshawott/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Oshawott[] = INCBIN_U8("graphics/pokemon/oshawott/footprint.1bpp"); + const u8 gMonFootprint_Oshawott[] = INCBIN_U8("graphics/pokemon/gen_5/oshawott/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/anim_front.4bpp.lz"); - const u32 gMonPalette_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/normal.gbapal.lz"); - const u32 gMonBackPic_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/back.4bpp.lz"); - const u32 gMonShinyPalette_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/shiny.gbapal.lz"); - const u8 gMonIcon_Dewott[] = INCBIN_U8("graphics/pokemon/dewott/icon.4bpp"); + const u32 gMonFrontPic_Dewott[] = INCBIN_U32("graphics/pokemon/gen_5/dewott/anim_front.4bpp.lz"); + const u32 gMonPalette_Dewott[] = INCBIN_U32("graphics/pokemon/gen_5/dewott/normal.gbapal.lz"); + const u32 gMonBackPic_Dewott[] = INCBIN_U32("graphics/pokemon/gen_5/dewott/back.4bpp.lz"); + const u32 gMonShinyPalette_Dewott[] = INCBIN_U32("graphics/pokemon/gen_5/dewott/shiny.gbapal.lz"); + const u8 gMonIcon_Dewott[] = INCBIN_U8("graphics/pokemon/gen_5/dewott/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dewott[] = INCBIN_U8("graphics/pokemon/dewott/footprint.1bpp"); + const u8 gMonFootprint_Dewott[] = INCBIN_U8("graphics/pokemon/gen_5/dewott/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/anim_front.4bpp.lz"); - const u32 gMonPalette_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/normal.gbapal.lz"); - const u32 gMonBackPic_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/back.4bpp.lz"); - const u32 gMonShinyPalette_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/shiny.gbapal.lz"); - const u8 gMonIcon_Samurott[] = INCBIN_U8("graphics/pokemon/samurott/icon.4bpp"); + const u32 gMonFrontPic_Samurott[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/anim_front.4bpp.lz"); + const u32 gMonPalette_Samurott[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/normal.gbapal.lz"); + const u32 gMonBackPic_Samurott[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/back.4bpp.lz"); + const u32 gMonShinyPalette_Samurott[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/shiny.gbapal.lz"); + const u8 gMonIcon_Samurott[] = INCBIN_U8("graphics/pokemon/gen_5/samurott/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Samurott[] = INCBIN_U8("graphics/pokemon/samurott/footprint.1bpp"); + const u8 gMonFootprint_Samurott[] = INCBIN_U8("graphics/pokemon/gen_5/samurott/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/front.4bpp.lz"); - const u32 gMonPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_SamurottHisuian[] = INCBIN_U8("graphics/pokemon/samurott/hisuian/icon.4bpp"); + const u32 gMonFrontPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/hisuian/front.4bpp.lz"); + const u32 gMonPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/samurott/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_SamurottHisuian[] = INCBIN_U8("graphics/pokemon/gen_5/samurott/hisuian/icon.4bpp"); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_OSHAWOTT #if P_FAMILY_PATRAT - const u32 gMonFrontPic_Patrat[] = INCBIN_U32("graphics/pokemon/patrat/anim_front.4bpp.lz"); - const u32 gMonPalette_Patrat[] = INCBIN_U32("graphics/pokemon/patrat/normal.gbapal.lz"); - const u32 gMonBackPic_Patrat[] = INCBIN_U32("graphics/pokemon/patrat/back.4bpp.lz"); - const u32 gMonShinyPalette_Patrat[] = INCBIN_U32("graphics/pokemon/patrat/shiny.gbapal.lz"); - const u8 gMonIcon_Patrat[] = INCBIN_U8("graphics/pokemon/patrat/icon.4bpp"); + const u32 gMonFrontPic_Patrat[] = INCBIN_U32("graphics/pokemon/gen_5/patrat/anim_front.4bpp.lz"); + const u32 gMonPalette_Patrat[] = INCBIN_U32("graphics/pokemon/gen_5/patrat/normal.gbapal.lz"); + const u32 gMonBackPic_Patrat[] = INCBIN_U32("graphics/pokemon/gen_5/patrat/back.4bpp.lz"); + const u32 gMonShinyPalette_Patrat[] = INCBIN_U32("graphics/pokemon/gen_5/patrat/shiny.gbapal.lz"); + const u8 gMonIcon_Patrat[] = INCBIN_U8("graphics/pokemon/gen_5/patrat/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Patrat[] = INCBIN_U8("graphics/pokemon/patrat/footprint.1bpp"); + const u8 gMonFootprint_Patrat[] = INCBIN_U8("graphics/pokemon/gen_5/patrat/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/anim_front.4bpp.lz"); - const u32 gMonPalette_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/normal.gbapal.lz"); - const u32 gMonBackPic_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/back.4bpp.lz"); - const u32 gMonShinyPalette_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/shiny.gbapal.lz"); - const u8 gMonIcon_Watchog[] = INCBIN_U8("graphics/pokemon/watchog/icon.4bpp"); + const u32 gMonFrontPic_Watchog[] = INCBIN_U32("graphics/pokemon/gen_5/watchog/anim_front.4bpp.lz"); + const u32 gMonPalette_Watchog[] = INCBIN_U32("graphics/pokemon/gen_5/watchog/normal.gbapal.lz"); + const u32 gMonBackPic_Watchog[] = INCBIN_U32("graphics/pokemon/gen_5/watchog/back.4bpp.lz"); + const u32 gMonShinyPalette_Watchog[] = INCBIN_U32("graphics/pokemon/gen_5/watchog/shiny.gbapal.lz"); + const u8 gMonIcon_Watchog[] = INCBIN_U8("graphics/pokemon/gen_5/watchog/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Watchog[] = INCBIN_U8("graphics/pokemon/watchog/footprint.1bpp"); + const u8 gMonFootprint_Watchog[] = INCBIN_U8("graphics/pokemon/gen_5/watchog/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PATRAT #if P_FAMILY_LILLIPUP - const u32 gMonFrontPic_Lillipup[] = INCBIN_U32("graphics/pokemon/lillipup/anim_front.4bpp.lz"); - const u32 gMonPalette_Lillipup[] = INCBIN_U32("graphics/pokemon/lillipup/normal.gbapal.lz"); - const u32 gMonBackPic_Lillipup[] = INCBIN_U32("graphics/pokemon/lillipup/back.4bpp.lz"); - const u32 gMonShinyPalette_Lillipup[] = INCBIN_U32("graphics/pokemon/lillipup/shiny.gbapal.lz"); - const u8 gMonIcon_Lillipup[] = INCBIN_U8("graphics/pokemon/lillipup/icon.4bpp"); + const u32 gMonFrontPic_Lillipup[] = INCBIN_U32("graphics/pokemon/gen_5/lillipup/anim_front.4bpp.lz"); + const u32 gMonPalette_Lillipup[] = INCBIN_U32("graphics/pokemon/gen_5/lillipup/normal.gbapal.lz"); + const u32 gMonBackPic_Lillipup[] = INCBIN_U32("graphics/pokemon/gen_5/lillipup/back.4bpp.lz"); + const u32 gMonShinyPalette_Lillipup[] = INCBIN_U32("graphics/pokemon/gen_5/lillipup/shiny.gbapal.lz"); + const u8 gMonIcon_Lillipup[] = INCBIN_U8("graphics/pokemon/gen_5/lillipup/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lillipup[] = INCBIN_U8("graphics/pokemon/lillipup/footprint.1bpp"); + const u8 gMonFootprint_Lillipup[] = INCBIN_U8("graphics/pokemon/gen_5/lillipup/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/anim_front.4bpp.lz"); - const u32 gMonPalette_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/normal.gbapal.lz"); - const u32 gMonBackPic_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/back.4bpp.lz"); - const u32 gMonShinyPalette_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/shiny.gbapal.lz"); - const u8 gMonIcon_Herdier[] = INCBIN_U8("graphics/pokemon/herdier/icon.4bpp"); + const u32 gMonFrontPic_Herdier[] = INCBIN_U32("graphics/pokemon/gen_5/herdier/anim_front.4bpp.lz"); + const u32 gMonPalette_Herdier[] = INCBIN_U32("graphics/pokemon/gen_5/herdier/normal.gbapal.lz"); + const u32 gMonBackPic_Herdier[] = INCBIN_U32("graphics/pokemon/gen_5/herdier/back.4bpp.lz"); + const u32 gMonShinyPalette_Herdier[] = INCBIN_U32("graphics/pokemon/gen_5/herdier/shiny.gbapal.lz"); + const u8 gMonIcon_Herdier[] = INCBIN_U8("graphics/pokemon/gen_5/herdier/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Herdier[] = INCBIN_U8("graphics/pokemon/herdier/footprint.1bpp"); + const u8 gMonFootprint_Herdier[] = INCBIN_U8("graphics/pokemon/gen_5/herdier/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/anim_front.4bpp.lz"); - const u32 gMonPalette_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/normal.gbapal.lz"); - const u32 gMonBackPic_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/back.4bpp.lz"); - const u32 gMonShinyPalette_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/shiny.gbapal.lz"); - const u8 gMonIcon_Stoutland[] = INCBIN_U8("graphics/pokemon/stoutland/icon.4bpp"); + const u32 gMonFrontPic_Stoutland[] = INCBIN_U32("graphics/pokemon/gen_5/stoutland/anim_front.4bpp.lz"); + const u32 gMonPalette_Stoutland[] = INCBIN_U32("graphics/pokemon/gen_5/stoutland/normal.gbapal.lz"); + const u32 gMonBackPic_Stoutland[] = INCBIN_U32("graphics/pokemon/gen_5/stoutland/back.4bpp.lz"); + const u32 gMonShinyPalette_Stoutland[] = INCBIN_U32("graphics/pokemon/gen_5/stoutland/shiny.gbapal.lz"); + const u8 gMonIcon_Stoutland[] = INCBIN_U8("graphics/pokemon/gen_5/stoutland/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Stoutland[] = INCBIN_U8("graphics/pokemon/stoutland/footprint.1bpp"); + const u8 gMonFootprint_Stoutland[] = INCBIN_U8("graphics/pokemon/gen_5/stoutland/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_LILLIPUP #if P_FAMILY_PURRLOIN - const u32 gMonFrontPic_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/anim_front.4bpp.lz"); - const u32 gMonPalette_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/normal.gbapal.lz"); - const u32 gMonBackPic_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/back.4bpp.lz"); - const u32 gMonShinyPalette_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/shiny.gbapal.lz"); - const u8 gMonIcon_Purrloin[] = INCBIN_U8("graphics/pokemon/purrloin/icon.4bpp"); + const u32 gMonFrontPic_Purrloin[] = INCBIN_U32("graphics/pokemon/gen_5/purrloin/anim_front.4bpp.lz"); + const u32 gMonPalette_Purrloin[] = INCBIN_U32("graphics/pokemon/gen_5/purrloin/normal.gbapal.lz"); + const u32 gMonBackPic_Purrloin[] = INCBIN_U32("graphics/pokemon/gen_5/purrloin/back.4bpp.lz"); + const u32 gMonShinyPalette_Purrloin[] = INCBIN_U32("graphics/pokemon/gen_5/purrloin/shiny.gbapal.lz"); + const u8 gMonIcon_Purrloin[] = INCBIN_U8("graphics/pokemon/gen_5/purrloin/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Purrloin[] = INCBIN_U8("graphics/pokemon/purrloin/footprint.1bpp"); + const u8 gMonFootprint_Purrloin[] = INCBIN_U8("graphics/pokemon/gen_5/purrloin/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/anim_front.4bpp.lz"); - const u32 gMonPalette_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/normal.gbapal.lz"); - const u32 gMonBackPic_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/back.4bpp.lz"); - const u32 gMonShinyPalette_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/shiny.gbapal.lz"); - const u8 gMonIcon_Liepard[] = INCBIN_U8("graphics/pokemon/liepard/icon.4bpp"); + const u32 gMonFrontPic_Liepard[] = INCBIN_U32("graphics/pokemon/gen_5/liepard/anim_front.4bpp.lz"); + const u32 gMonPalette_Liepard[] = INCBIN_U32("graphics/pokemon/gen_5/liepard/normal.gbapal.lz"); + const u32 gMonBackPic_Liepard[] = INCBIN_U32("graphics/pokemon/gen_5/liepard/back.4bpp.lz"); + const u32 gMonShinyPalette_Liepard[] = INCBIN_U32("graphics/pokemon/gen_5/liepard/shiny.gbapal.lz"); + const u8 gMonIcon_Liepard[] = INCBIN_U8("graphics/pokemon/gen_5/liepard/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Liepard[] = INCBIN_U8("graphics/pokemon/liepard/footprint.1bpp"); + const u8 gMonFootprint_Liepard[] = INCBIN_U8("graphics/pokemon/gen_5/liepard/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PURRLOIN #if P_FAMILY_PANSAGE - const u32 gMonFrontPic_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/anim_front.4bpp.lz"); - const u32 gMonPalette_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/normal.gbapal.lz"); - const u32 gMonBackPic_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/back.4bpp.lz"); - const u32 gMonShinyPalette_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/shiny.gbapal.lz"); - const u8 gMonIcon_Pansage[] = INCBIN_U8("graphics/pokemon/pansage/icon.4bpp"); + const u32 gMonFrontPic_Pansage[] = INCBIN_U32("graphics/pokemon/gen_5/pansage/anim_front.4bpp.lz"); + const u32 gMonPalette_Pansage[] = INCBIN_U32("graphics/pokemon/gen_5/pansage/normal.gbapal.lz"); + const u32 gMonBackPic_Pansage[] = INCBIN_U32("graphics/pokemon/gen_5/pansage/back.4bpp.lz"); + const u32 gMonShinyPalette_Pansage[] = INCBIN_U32("graphics/pokemon/gen_5/pansage/shiny.gbapal.lz"); + const u8 gMonIcon_Pansage[] = INCBIN_U8("graphics/pokemon/gen_5/pansage/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pansage[] = INCBIN_U8("graphics/pokemon/pansage/footprint.1bpp"); + const u8 gMonFootprint_Pansage[] = INCBIN_U8("graphics/pokemon/gen_5/pansage/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/anim_front.4bpp.lz"); - const u32 gMonPalette_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/normal.gbapal.lz"); - const u32 gMonBackPic_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/back.4bpp.lz"); - const u32 gMonShinyPalette_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/shiny.gbapal.lz"); - const u8 gMonIcon_Simisage[] = INCBIN_U8("graphics/pokemon/simisage/icon.4bpp"); + const u32 gMonFrontPic_Simisage[] = INCBIN_U32("graphics/pokemon/gen_5/simisage/anim_front.4bpp.lz"); + const u32 gMonPalette_Simisage[] = INCBIN_U32("graphics/pokemon/gen_5/simisage/normal.gbapal.lz"); + const u32 gMonBackPic_Simisage[] = INCBIN_U32("graphics/pokemon/gen_5/simisage/back.4bpp.lz"); + const u32 gMonShinyPalette_Simisage[] = INCBIN_U32("graphics/pokemon/gen_5/simisage/shiny.gbapal.lz"); + const u8 gMonIcon_Simisage[] = INCBIN_U8("graphics/pokemon/gen_5/simisage/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Simisage[] = INCBIN_U8("graphics/pokemon/simisage/footprint.1bpp"); + const u8 gMonFootprint_Simisage[] = INCBIN_U8("graphics/pokemon/gen_5/simisage/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PANSAGE #if P_FAMILY_PANSEAR - const u32 gMonFrontPic_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/anim_front.4bpp.lz"); - const u32 gMonPalette_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/normal.gbapal.lz"); - const u32 gMonBackPic_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/back.4bpp.lz"); - const u32 gMonShinyPalette_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/shiny.gbapal.lz"); - const u8 gMonIcon_Pansear[] = INCBIN_U8("graphics/pokemon/pansear/icon.4bpp"); + const u32 gMonFrontPic_Pansear[] = INCBIN_U32("graphics/pokemon/gen_5/pansear/anim_front.4bpp.lz"); + const u32 gMonPalette_Pansear[] = INCBIN_U32("graphics/pokemon/gen_5/pansear/normal.gbapal.lz"); + const u32 gMonBackPic_Pansear[] = INCBIN_U32("graphics/pokemon/gen_5/pansear/back.4bpp.lz"); + const u32 gMonShinyPalette_Pansear[] = INCBIN_U32("graphics/pokemon/gen_5/pansear/shiny.gbapal.lz"); + const u8 gMonIcon_Pansear[] = INCBIN_U8("graphics/pokemon/gen_5/pansear/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pansear[] = INCBIN_U8("graphics/pokemon/pansear/footprint.1bpp"); + const u8 gMonFootprint_Pansear[] = INCBIN_U8("graphics/pokemon/gen_5/pansear/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/anim_front.4bpp.lz"); - const u32 gMonPalette_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/normal.gbapal.lz"); - const u32 gMonBackPic_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/back.4bpp.lz"); - const u32 gMonShinyPalette_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/shiny.gbapal.lz"); - const u8 gMonIcon_Simisear[] = INCBIN_U8("graphics/pokemon/simisear/icon.4bpp"); + const u32 gMonFrontPic_Simisear[] = INCBIN_U32("graphics/pokemon/gen_5/simisear/anim_front.4bpp.lz"); + const u32 gMonPalette_Simisear[] = INCBIN_U32("graphics/pokemon/gen_5/simisear/normal.gbapal.lz"); + const u32 gMonBackPic_Simisear[] = INCBIN_U32("graphics/pokemon/gen_5/simisear/back.4bpp.lz"); + const u32 gMonShinyPalette_Simisear[] = INCBIN_U32("graphics/pokemon/gen_5/simisear/shiny.gbapal.lz"); + const u8 gMonIcon_Simisear[] = INCBIN_U8("graphics/pokemon/gen_5/simisear/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Simisear[] = INCBIN_U8("graphics/pokemon/simisear/footprint.1bpp"); + const u8 gMonFootprint_Simisear[] = INCBIN_U8("graphics/pokemon/gen_5/simisear/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PANSEAR #if P_FAMILY_PANPOUR - const u32 gMonFrontPic_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/anim_front.4bpp.lz"); - const u32 gMonPalette_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/normal.gbapal.lz"); - const u32 gMonBackPic_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/back.4bpp.lz"); - const u32 gMonShinyPalette_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/shiny.gbapal.lz"); - const u8 gMonIcon_Panpour[] = INCBIN_U8("graphics/pokemon/panpour/icon.4bpp"); + const u32 gMonFrontPic_Panpour[] = INCBIN_U32("graphics/pokemon/gen_5/panpour/anim_front.4bpp.lz"); + const u32 gMonPalette_Panpour[] = INCBIN_U32("graphics/pokemon/gen_5/panpour/normal.gbapal.lz"); + const u32 gMonBackPic_Panpour[] = INCBIN_U32("graphics/pokemon/gen_5/panpour/back.4bpp.lz"); + const u32 gMonShinyPalette_Panpour[] = INCBIN_U32("graphics/pokemon/gen_5/panpour/shiny.gbapal.lz"); + const u8 gMonIcon_Panpour[] = INCBIN_U8("graphics/pokemon/gen_5/panpour/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Panpour[] = INCBIN_U8("graphics/pokemon/panpour/footprint.1bpp"); + const u8 gMonFootprint_Panpour[] = INCBIN_U8("graphics/pokemon/gen_5/panpour/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/anim_front.4bpp.lz"); - const u32 gMonPalette_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/normal.gbapal.lz"); - const u32 gMonBackPic_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/back.4bpp.lz"); - const u32 gMonShinyPalette_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/shiny.gbapal.lz"); - const u8 gMonIcon_Simipour[] = INCBIN_U8("graphics/pokemon/simipour/icon.4bpp"); + const u32 gMonFrontPic_Simipour[] = INCBIN_U32("graphics/pokemon/gen_5/simipour/anim_front.4bpp.lz"); + const u32 gMonPalette_Simipour[] = INCBIN_U32("graphics/pokemon/gen_5/simipour/normal.gbapal.lz"); + const u32 gMonBackPic_Simipour[] = INCBIN_U32("graphics/pokemon/gen_5/simipour/back.4bpp.lz"); + const u32 gMonShinyPalette_Simipour[] = INCBIN_U32("graphics/pokemon/gen_5/simipour/shiny.gbapal.lz"); + const u8 gMonIcon_Simipour[] = INCBIN_U8("graphics/pokemon/gen_5/simipour/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Simipour[] = INCBIN_U8("graphics/pokemon/simipour/footprint.1bpp"); + const u8 gMonFootprint_Simipour[] = INCBIN_U8("graphics/pokemon/gen_5/simipour/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PANPOUR #if P_FAMILY_MUNNA - const u32 gMonFrontPic_Munna[] = INCBIN_U32("graphics/pokemon/munna/anim_front.4bpp.lz"); - const u32 gMonPalette_Munna[] = INCBIN_U32("graphics/pokemon/munna/normal.gbapal.lz"); - const u32 gMonBackPic_Munna[] = INCBIN_U32("graphics/pokemon/munna/back.4bpp.lz"); - const u32 gMonShinyPalette_Munna[] = INCBIN_U32("graphics/pokemon/munna/shiny.gbapal.lz"); - const u8 gMonIcon_Munna[] = INCBIN_U8("graphics/pokemon/munna/icon.4bpp"); + const u32 gMonFrontPic_Munna[] = INCBIN_U32("graphics/pokemon/gen_5/munna/anim_front.4bpp.lz"); + const u32 gMonPalette_Munna[] = INCBIN_U32("graphics/pokemon/gen_5/munna/normal.gbapal.lz"); + const u32 gMonBackPic_Munna[] = INCBIN_U32("graphics/pokemon/gen_5/munna/back.4bpp.lz"); + const u32 gMonShinyPalette_Munna[] = INCBIN_U32("graphics/pokemon/gen_5/munna/shiny.gbapal.lz"); + const u8 gMonIcon_Munna[] = INCBIN_U8("graphics/pokemon/gen_5/munna/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Munna[] = INCBIN_U8("graphics/pokemon/munna/footprint.1bpp"); + const u8 gMonFootprint_Munna[] = INCBIN_U8("graphics/pokemon/gen_5/munna/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/anim_front.4bpp.lz"); - const u32 gMonPalette_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/normal.gbapal.lz"); - const u32 gMonBackPic_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/back.4bpp.lz"); - const u32 gMonShinyPalette_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/shiny.gbapal.lz"); - const u8 gMonIcon_Musharna[] = INCBIN_U8("graphics/pokemon/musharna/icon.4bpp"); + const u32 gMonFrontPic_Musharna[] = INCBIN_U32("graphics/pokemon/gen_5/musharna/anim_front.4bpp.lz"); + const u32 gMonPalette_Musharna[] = INCBIN_U32("graphics/pokemon/gen_5/musharna/normal.gbapal.lz"); + const u32 gMonBackPic_Musharna[] = INCBIN_U32("graphics/pokemon/gen_5/musharna/back.4bpp.lz"); + const u32 gMonShinyPalette_Musharna[] = INCBIN_U32("graphics/pokemon/gen_5/musharna/shiny.gbapal.lz"); + const u8 gMonIcon_Musharna[] = INCBIN_U8("graphics/pokemon/gen_5/musharna/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Musharna[] = INCBIN_U8("graphics/pokemon/musharna/footprint.1bpp"); + const u8 gMonFootprint_Musharna[] = INCBIN_U8("graphics/pokemon/gen_5/musharna/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MUNNA #if P_FAMILY_PIDOVE - const u32 gMonFrontPic_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/anim_front.4bpp.lz"); - const u32 gMonPalette_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/normal.gbapal.lz"); - const u32 gMonBackPic_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/back.4bpp.lz"); - const u32 gMonShinyPalette_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/shiny.gbapal.lz"); - const u8 gMonIcon_Pidove[] = INCBIN_U8("graphics/pokemon/pidove/icon.4bpp"); + const u32 gMonFrontPic_Pidove[] = INCBIN_U32("graphics/pokemon/gen_5/pidove/anim_front.4bpp.lz"); + const u32 gMonPalette_Pidove[] = INCBIN_U32("graphics/pokemon/gen_5/pidove/normal.gbapal.lz"); + const u32 gMonBackPic_Pidove[] = INCBIN_U32("graphics/pokemon/gen_5/pidove/back.4bpp.lz"); + const u32 gMonShinyPalette_Pidove[] = INCBIN_U32("graphics/pokemon/gen_5/pidove/shiny.gbapal.lz"); + const u8 gMonIcon_Pidove[] = INCBIN_U8("graphics/pokemon/gen_5/pidove/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pidove[] = INCBIN_U8("graphics/pokemon/pidove/footprint.1bpp"); + const u8 gMonFootprint_Pidove[] = INCBIN_U8("graphics/pokemon/gen_5/pidove/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/anim_front.4bpp.lz"); - const u32 gMonPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/normal.gbapal.lz"); - const u32 gMonBackPic_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/back.4bpp.lz"); - const u32 gMonShinyPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/shiny.gbapal.lz"); - const u8 gMonIcon_Tranquill[] = INCBIN_U8("graphics/pokemon/tranquill/icon.4bpp"); + const u32 gMonFrontPic_Tranquill[] = INCBIN_U32("graphics/pokemon/gen_5/tranquill/anim_front.4bpp.lz"); + const u32 gMonPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/gen_5/tranquill/normal.gbapal.lz"); + const u32 gMonBackPic_Tranquill[] = INCBIN_U32("graphics/pokemon/gen_5/tranquill/back.4bpp.lz"); + const u32 gMonShinyPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/gen_5/tranquill/shiny.gbapal.lz"); + const u8 gMonIcon_Tranquill[] = INCBIN_U8("graphics/pokemon/gen_5/tranquill/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tranquill[] = INCBIN_U8("graphics/pokemon/tranquill/footprint.1bpp"); + const u8 gMonFootprint_Tranquill[] = INCBIN_U8("graphics/pokemon/gen_5/tranquill/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/anim_front.4bpp.lz"); - const u32 gMonPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/normal.gbapal.lz"); - const u32 gMonBackPic_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/back.4bpp.lz"); - const u32 gMonShinyPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/shiny.gbapal.lz"); - const u8 gMonIcon_Unfezant[] = INCBIN_U8("graphics/pokemon/unfezant/icon.4bpp"); + const u32 gMonFrontPic_Unfezant[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/anim_front.4bpp.lz"); + const u32 gMonPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/normal.gbapal.lz"); + const u32 gMonBackPic_Unfezant[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/back.4bpp.lz"); + const u32 gMonShinyPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/shiny.gbapal.lz"); + const u8 gMonIcon_Unfezant[] = INCBIN_U8("graphics/pokemon/gen_5/unfezant/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Unfezant[] = INCBIN_U8("graphics/pokemon/unfezant/footprint.1bpp"); + const u8 gMonFootprint_Unfezant[] = INCBIN_U8("graphics/pokemon/gen_5/unfezant/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/anim_frontf.4bpp.lz"); - const u32 gMonPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/normalf.gbapal.lz"); - const u32 gMonBackPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/backf.4bpp.lz"); - const u32 gMonShinyPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/shinyf.gbapal.lz"); - const u8 gMonIcon_UnfezantF[] = INCBIN_U8("graphics/pokemon/unfezant/iconf.4bpp"); + const u32 gMonFrontPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/anim_frontf.4bpp.lz"); + const u32 gMonPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/normalf.gbapal.lz"); + const u32 gMonBackPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/backf.4bpp.lz"); + const u32 gMonShinyPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/gen_5/unfezant/shinyf.gbapal.lz"); + const u8 gMonIcon_UnfezantF[] = INCBIN_U8("graphics/pokemon/gen_5/unfezant/iconf.4bpp"); #endif //P_FAMILY_PIDOVE #if P_FAMILY_BLITZLE - const u32 gMonFrontPic_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/anim_front.4bpp.lz"); - const u32 gMonPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/normal.gbapal.lz"); - const u32 gMonBackPic_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/back.4bpp.lz"); - const u32 gMonShinyPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/shiny.gbapal.lz"); - const u8 gMonIcon_Blitzle[] = INCBIN_U8("graphics/pokemon/blitzle/icon.4bpp"); + const u32 gMonFrontPic_Blitzle[] = INCBIN_U32("graphics/pokemon/gen_5/blitzle/anim_front.4bpp.lz"); + const u32 gMonPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/gen_5/blitzle/normal.gbapal.lz"); + const u32 gMonBackPic_Blitzle[] = INCBIN_U32("graphics/pokemon/gen_5/blitzle/back.4bpp.lz"); + const u32 gMonShinyPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/gen_5/blitzle/shiny.gbapal.lz"); + const u8 gMonIcon_Blitzle[] = INCBIN_U8("graphics/pokemon/gen_5/blitzle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Blitzle[] = INCBIN_U8("graphics/pokemon/blitzle/footprint.1bpp"); + const u8 gMonFootprint_Blitzle[] = INCBIN_U8("graphics/pokemon/gen_5/blitzle/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/anim_front.4bpp.lz"); - const u32 gMonPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/normal.gbapal.lz"); - const u32 gMonBackPic_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/back.4bpp.lz"); - const u32 gMonShinyPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/shiny.gbapal.lz"); - const u8 gMonIcon_Zebstrika[] = INCBIN_U8("graphics/pokemon/zebstrika/icon.4bpp"); + const u32 gMonFrontPic_Zebstrika[] = INCBIN_U32("graphics/pokemon/gen_5/zebstrika/anim_front.4bpp.lz"); + const u32 gMonPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/gen_5/zebstrika/normal.gbapal.lz"); + const u32 gMonBackPic_Zebstrika[] = INCBIN_U32("graphics/pokemon/gen_5/zebstrika/back.4bpp.lz"); + const u32 gMonShinyPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/gen_5/zebstrika/shiny.gbapal.lz"); + const u8 gMonIcon_Zebstrika[] = INCBIN_U8("graphics/pokemon/gen_5/zebstrika/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Zebstrika[] = INCBIN_U8("graphics/pokemon/zebstrika/footprint.1bpp"); + const u8 gMonFootprint_Zebstrika[] = INCBIN_U8("graphics/pokemon/gen_5/zebstrika/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BLITZLE #if P_FAMILY_ROGGENROLA - const u32 gMonFrontPic_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/anim_front.4bpp.lz"); - const u32 gMonPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/normal.gbapal.lz"); - const u32 gMonBackPic_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/back.4bpp.lz"); - const u32 gMonShinyPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/shiny.gbapal.lz"); - const u8 gMonIcon_Roggenrola[] = INCBIN_U8("graphics/pokemon/roggenrola/icon.4bpp"); + const u32 gMonFrontPic_Roggenrola[] = INCBIN_U32("graphics/pokemon/gen_5/roggenrola/anim_front.4bpp.lz"); + const u32 gMonPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/gen_5/roggenrola/normal.gbapal.lz"); + const u32 gMonBackPic_Roggenrola[] = INCBIN_U32("graphics/pokemon/gen_5/roggenrola/back.4bpp.lz"); + const u32 gMonShinyPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/gen_5/roggenrola/shiny.gbapal.lz"); + const u8 gMonIcon_Roggenrola[] = INCBIN_U8("graphics/pokemon/gen_5/roggenrola/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Roggenrola[] = INCBIN_U8("graphics/pokemon/roggenrola/footprint.1bpp"); + const u8 gMonFootprint_Roggenrola[] = INCBIN_U8("graphics/pokemon/gen_5/roggenrola/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/anim_front.4bpp.lz"); - const u32 gMonPalette_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/normal.gbapal.lz"); - const u32 gMonBackPic_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/back.4bpp.lz"); - const u32 gMonShinyPalette_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/shiny.gbapal.lz"); - const u8 gMonIcon_Boldore[] = INCBIN_U8("graphics/pokemon/boldore/icon.4bpp"); + const u32 gMonFrontPic_Boldore[] = INCBIN_U32("graphics/pokemon/gen_5/boldore/anim_front.4bpp.lz"); + const u32 gMonPalette_Boldore[] = INCBIN_U32("graphics/pokemon/gen_5/boldore/normal.gbapal.lz"); + const u32 gMonBackPic_Boldore[] = INCBIN_U32("graphics/pokemon/gen_5/boldore/back.4bpp.lz"); + const u32 gMonShinyPalette_Boldore[] = INCBIN_U32("graphics/pokemon/gen_5/boldore/shiny.gbapal.lz"); + const u8 gMonIcon_Boldore[] = INCBIN_U8("graphics/pokemon/gen_5/boldore/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Boldore[] = INCBIN_U8("graphics/pokemon/boldore/footprint.1bpp"); + const u8 gMonFootprint_Boldore[] = INCBIN_U8("graphics/pokemon/gen_5/boldore/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/anim_front.4bpp.lz"); - const u32 gMonPalette_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/normal.gbapal.lz"); - const u32 gMonBackPic_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/back.4bpp.lz"); - const u32 gMonShinyPalette_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/shiny.gbapal.lz"); - const u8 gMonIcon_Gigalith[] = INCBIN_U8("graphics/pokemon/gigalith/icon.4bpp"); + const u32 gMonFrontPic_Gigalith[] = INCBIN_U32("graphics/pokemon/gen_5/gigalith/anim_front.4bpp.lz"); + const u32 gMonPalette_Gigalith[] = INCBIN_U32("graphics/pokemon/gen_5/gigalith/normal.gbapal.lz"); + const u32 gMonBackPic_Gigalith[] = INCBIN_U32("graphics/pokemon/gen_5/gigalith/back.4bpp.lz"); + const u32 gMonShinyPalette_Gigalith[] = INCBIN_U32("graphics/pokemon/gen_5/gigalith/shiny.gbapal.lz"); + const u8 gMonIcon_Gigalith[] = INCBIN_U8("graphics/pokemon/gen_5/gigalith/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gigalith[] = INCBIN_U8("graphics/pokemon/gigalith/footprint.1bpp"); + const u8 gMonFootprint_Gigalith[] = INCBIN_U8("graphics/pokemon/gen_5/gigalith/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ROGGENROLA #if P_FAMILY_WOOBAT - const u32 gMonFrontPic_Woobat[] = INCBIN_U32("graphics/pokemon/woobat/anim_front.4bpp.lz"); - const u32 gMonPalette_Woobat[] = INCBIN_U32("graphics/pokemon/woobat/normal.gbapal.lz"); - const u32 gMonBackPic_Woobat[] = INCBIN_U32("graphics/pokemon/woobat/back.4bpp.lz"); - const u32 gMonShinyPalette_Woobat[] = INCBIN_U32("graphics/pokemon/woobat/shiny.gbapal.lz"); - const u8 gMonIcon_Woobat[] = INCBIN_U8("graphics/pokemon/woobat/icon.4bpp"); + const u32 gMonFrontPic_Woobat[] = INCBIN_U32("graphics/pokemon/gen_5/woobat/anim_front.4bpp.lz"); + const u32 gMonPalette_Woobat[] = INCBIN_U32("graphics/pokemon/gen_5/woobat/normal.gbapal.lz"); + const u32 gMonBackPic_Woobat[] = INCBIN_U32("graphics/pokemon/gen_5/woobat/back.4bpp.lz"); + const u32 gMonShinyPalette_Woobat[] = INCBIN_U32("graphics/pokemon/gen_5/woobat/shiny.gbapal.lz"); + const u8 gMonIcon_Woobat[] = INCBIN_U8("graphics/pokemon/gen_5/woobat/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Woobat[] = INCBIN_U8("graphics/pokemon/woobat/footprint.1bpp"); + const u8 gMonFootprint_Woobat[] = INCBIN_U8("graphics/pokemon/gen_5/woobat/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/anim_front.4bpp.lz"); - const u32 gMonPalette_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/normal.gbapal.lz"); - const u32 gMonBackPic_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/back.4bpp.lz"); - const u32 gMonShinyPalette_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/shiny.gbapal.lz"); - const u8 gMonIcon_Swoobat[] = INCBIN_U8("graphics/pokemon/swoobat/icon.4bpp"); + const u32 gMonFrontPic_Swoobat[] = INCBIN_U32("graphics/pokemon/gen_5/swoobat/anim_front.4bpp.lz"); + const u32 gMonPalette_Swoobat[] = INCBIN_U32("graphics/pokemon/gen_5/swoobat/normal.gbapal.lz"); + const u32 gMonBackPic_Swoobat[] = INCBIN_U32("graphics/pokemon/gen_5/swoobat/back.4bpp.lz"); + const u32 gMonShinyPalette_Swoobat[] = INCBIN_U32("graphics/pokemon/gen_5/swoobat/shiny.gbapal.lz"); + const u8 gMonIcon_Swoobat[] = INCBIN_U8("graphics/pokemon/gen_5/swoobat/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Swoobat[] = INCBIN_U8("graphics/pokemon/swoobat/footprint.1bpp"); + const u8 gMonFootprint_Swoobat[] = INCBIN_U8("graphics/pokemon/gen_5/swoobat/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_WOOBAT #if P_FAMILY_DRILBUR - const u32 gMonFrontPic_Drilbur[] = INCBIN_U32("graphics/pokemon/drilbur/anim_front.4bpp.lz"); - const u32 gMonPalette_Drilbur[] = INCBIN_U32("graphics/pokemon/drilbur/normal.gbapal.lz"); - const u32 gMonBackPic_Drilbur[] = INCBIN_U32("graphics/pokemon/drilbur/back.4bpp.lz"); - const u32 gMonShinyPalette_Drilbur[] = INCBIN_U32("graphics/pokemon/drilbur/shiny.gbapal.lz"); - const u8 gMonIcon_Drilbur[] = INCBIN_U8("graphics/pokemon/drilbur/icon.4bpp"); + const u32 gMonFrontPic_Drilbur[] = INCBIN_U32("graphics/pokemon/gen_5/drilbur/anim_front.4bpp.lz"); + const u32 gMonPalette_Drilbur[] = INCBIN_U32("graphics/pokemon/gen_5/drilbur/normal.gbapal.lz"); + const u32 gMonBackPic_Drilbur[] = INCBIN_U32("graphics/pokemon/gen_5/drilbur/back.4bpp.lz"); + const u32 gMonShinyPalette_Drilbur[] = INCBIN_U32("graphics/pokemon/gen_5/drilbur/shiny.gbapal.lz"); + const u8 gMonIcon_Drilbur[] = INCBIN_U8("graphics/pokemon/gen_5/drilbur/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Drilbur[] = INCBIN_U8("graphics/pokemon/drilbur/footprint.1bpp"); + const u8 gMonFootprint_Drilbur[] = INCBIN_U8("graphics/pokemon/gen_5/drilbur/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/anim_front.4bpp.lz"); - const u32 gMonPalette_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/normal.gbapal.lz"); - const u32 gMonBackPic_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/back.4bpp.lz"); - const u32 gMonShinyPalette_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/shiny.gbapal.lz"); - const u8 gMonIcon_Excadrill[] = INCBIN_U8("graphics/pokemon/excadrill/icon.4bpp"); + const u32 gMonFrontPic_Excadrill[] = INCBIN_U32("graphics/pokemon/gen_5/excadrill/anim_front.4bpp.lz"); + const u32 gMonPalette_Excadrill[] = INCBIN_U32("graphics/pokemon/gen_5/excadrill/normal.gbapal.lz"); + const u32 gMonBackPic_Excadrill[] = INCBIN_U32("graphics/pokemon/gen_5/excadrill/back.4bpp.lz"); + const u32 gMonShinyPalette_Excadrill[] = INCBIN_U32("graphics/pokemon/gen_5/excadrill/shiny.gbapal.lz"); + const u8 gMonIcon_Excadrill[] = INCBIN_U8("graphics/pokemon/gen_5/excadrill/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Excadrill[] = INCBIN_U8("graphics/pokemon/excadrill/footprint.1bpp"); + const u8 gMonFootprint_Excadrill[] = INCBIN_U8("graphics/pokemon/gen_5/excadrill/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DRILBUR #if P_FAMILY_AUDINO - const u32 gMonFrontPic_Audino[] = INCBIN_U32("graphics/pokemon/audino/anim_front.4bpp.lz"); - const u32 gMonPalette_Audino[] = INCBIN_U32("graphics/pokemon/audino/normal.gbapal.lz"); - const u32 gMonBackPic_Audino[] = INCBIN_U32("graphics/pokemon/audino/back.4bpp.lz"); - const u32 gMonShinyPalette_Audino[] = INCBIN_U32("graphics/pokemon/audino/shiny.gbapal.lz"); - const u8 gMonIcon_Audino[] = INCBIN_U8("graphics/pokemon/audino/icon.4bpp"); + const u32 gMonFrontPic_Audino[] = INCBIN_U32("graphics/pokemon/gen_5/audino/anim_front.4bpp.lz"); + const u32 gMonPalette_Audino[] = INCBIN_U32("graphics/pokemon/gen_5/audino/normal.gbapal.lz"); + const u32 gMonBackPic_Audino[] = INCBIN_U32("graphics/pokemon/gen_5/audino/back.4bpp.lz"); + const u32 gMonShinyPalette_Audino[] = INCBIN_U32("graphics/pokemon/gen_5/audino/shiny.gbapal.lz"); + const u8 gMonIcon_Audino[] = INCBIN_U8("graphics/pokemon/gen_5/audino/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Audino[] = INCBIN_U8("graphics/pokemon/audino/footprint.1bpp"); + const u8 gMonFootprint_Audino[] = INCBIN_U8("graphics/pokemon/gen_5/audino/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/front.4bpp.lz"); - const u32 gMonPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/normal.gbapal.lz"); - const u32 gMonBackPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/shiny.gbapal.lz"); - const u8 gMonIcon_AudinoMega[] = INCBIN_U8("graphics/pokemon/audino/mega/icon.4bpp"); + const u32 gMonFrontPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/gen_5/audino/mega/front.4bpp.lz"); + const u32 gMonPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/gen_5/audino/mega/normal.gbapal.lz"); + const u32 gMonBackPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/gen_5/audino/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/gen_5/audino/mega/shiny.gbapal.lz"); + const u8 gMonIcon_AudinoMega[] = INCBIN_U8("graphics/pokemon/gen_5/audino/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_AUDINO #if P_FAMILY_TIMBURR - const u32 gMonFrontPic_Timburr[] = INCBIN_U32("graphics/pokemon/timburr/anim_front.4bpp.lz"); - const u32 gMonPalette_Timburr[] = INCBIN_U32("graphics/pokemon/timburr/normal.gbapal.lz"); - const u32 gMonBackPic_Timburr[] = INCBIN_U32("graphics/pokemon/timburr/back.4bpp.lz"); - const u32 gMonShinyPalette_Timburr[] = INCBIN_U32("graphics/pokemon/timburr/shiny.gbapal.lz"); - const u8 gMonIcon_Timburr[] = INCBIN_U8("graphics/pokemon/timburr/icon.4bpp"); + const u32 gMonFrontPic_Timburr[] = INCBIN_U32("graphics/pokemon/gen_5/timburr/anim_front.4bpp.lz"); + const u32 gMonPalette_Timburr[] = INCBIN_U32("graphics/pokemon/gen_5/timburr/normal.gbapal.lz"); + const u32 gMonBackPic_Timburr[] = INCBIN_U32("graphics/pokemon/gen_5/timburr/back.4bpp.lz"); + const u32 gMonShinyPalette_Timburr[] = INCBIN_U32("graphics/pokemon/gen_5/timburr/shiny.gbapal.lz"); + const u8 gMonIcon_Timburr[] = INCBIN_U8("graphics/pokemon/gen_5/timburr/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Timburr[] = INCBIN_U8("graphics/pokemon/timburr/footprint.1bpp"); + const u8 gMonFootprint_Timburr[] = INCBIN_U8("graphics/pokemon/gen_5/timburr/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/anim_front.4bpp.lz"); - const u32 gMonPalette_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/normal.gbapal.lz"); - const u32 gMonBackPic_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/back.4bpp.lz"); - const u32 gMonShinyPalette_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/shiny.gbapal.lz"); - const u8 gMonIcon_Gurdurr[] = INCBIN_U8("graphics/pokemon/gurdurr/icon.4bpp"); + const u32 gMonFrontPic_Gurdurr[] = INCBIN_U32("graphics/pokemon/gen_5/gurdurr/anim_front.4bpp.lz"); + const u32 gMonPalette_Gurdurr[] = INCBIN_U32("graphics/pokemon/gen_5/gurdurr/normal.gbapal.lz"); + const u32 gMonBackPic_Gurdurr[] = INCBIN_U32("graphics/pokemon/gen_5/gurdurr/back.4bpp.lz"); + const u32 gMonShinyPalette_Gurdurr[] = INCBIN_U32("graphics/pokemon/gen_5/gurdurr/shiny.gbapal.lz"); + const u8 gMonIcon_Gurdurr[] = INCBIN_U8("graphics/pokemon/gen_5/gurdurr/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gurdurr[] = INCBIN_U8("graphics/pokemon/gurdurr/footprint.1bpp"); + const u8 gMonFootprint_Gurdurr[] = INCBIN_U8("graphics/pokemon/gen_5/gurdurr/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/anim_front.4bpp.lz"); - const u32 gMonPalette_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/normal.gbapal.lz"); - const u32 gMonBackPic_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/back.4bpp.lz"); - const u32 gMonShinyPalette_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/shiny.gbapal.lz"); - const u8 gMonIcon_Conkeldurr[] = INCBIN_U8("graphics/pokemon/conkeldurr/icon.4bpp"); + const u32 gMonFrontPic_Conkeldurr[] = INCBIN_U32("graphics/pokemon/gen_5/conkeldurr/anim_front.4bpp.lz"); + const u32 gMonPalette_Conkeldurr[] = INCBIN_U32("graphics/pokemon/gen_5/conkeldurr/normal.gbapal.lz"); + const u32 gMonBackPic_Conkeldurr[] = INCBIN_U32("graphics/pokemon/gen_5/conkeldurr/back.4bpp.lz"); + const u32 gMonShinyPalette_Conkeldurr[] = INCBIN_U32("graphics/pokemon/gen_5/conkeldurr/shiny.gbapal.lz"); + const u8 gMonIcon_Conkeldurr[] = INCBIN_U8("graphics/pokemon/gen_5/conkeldurr/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Conkeldurr[] = INCBIN_U8("graphics/pokemon/conkeldurr/footprint.1bpp"); + const u8 gMonFootprint_Conkeldurr[] = INCBIN_U8("graphics/pokemon/gen_5/conkeldurr/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TIMBURR #if P_FAMILY_TYMPOLE - const u32 gMonFrontPic_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/anim_front.4bpp.lz"); - const u32 gMonPalette_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/normal.gbapal.lz"); - const u32 gMonBackPic_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/back.4bpp.lz"); - const u32 gMonShinyPalette_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/shiny.gbapal.lz"); - const u8 gMonIcon_Tympole[] = INCBIN_U8("graphics/pokemon/tympole/icon.4bpp"); + const u32 gMonFrontPic_Tympole[] = INCBIN_U32("graphics/pokemon/gen_5/tympole/anim_front.4bpp.lz"); + const u32 gMonPalette_Tympole[] = INCBIN_U32("graphics/pokemon/gen_5/tympole/normal.gbapal.lz"); + const u32 gMonBackPic_Tympole[] = INCBIN_U32("graphics/pokemon/gen_5/tympole/back.4bpp.lz"); + const u32 gMonShinyPalette_Tympole[] = INCBIN_U32("graphics/pokemon/gen_5/tympole/shiny.gbapal.lz"); + const u8 gMonIcon_Tympole[] = INCBIN_U8("graphics/pokemon/gen_5/tympole/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tympole[] = INCBIN_U8("graphics/pokemon/tympole/footprint.1bpp"); + const u8 gMonFootprint_Tympole[] = INCBIN_U8("graphics/pokemon/gen_5/tympole/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/anim_front.4bpp.lz"); - const u32 gMonPalette_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/normal.gbapal.lz"); - const u32 gMonBackPic_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/back.4bpp.lz"); - const u32 gMonShinyPalette_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/shiny.gbapal.lz"); - const u8 gMonIcon_Palpitoad[] = INCBIN_U8("graphics/pokemon/palpitoad/icon.4bpp"); + const u32 gMonFrontPic_Palpitoad[] = INCBIN_U32("graphics/pokemon/gen_5/palpitoad/anim_front.4bpp.lz"); + const u32 gMonPalette_Palpitoad[] = INCBIN_U32("graphics/pokemon/gen_5/palpitoad/normal.gbapal.lz"); + const u32 gMonBackPic_Palpitoad[] = INCBIN_U32("graphics/pokemon/gen_5/palpitoad/back.4bpp.lz"); + const u32 gMonShinyPalette_Palpitoad[] = INCBIN_U32("graphics/pokemon/gen_5/palpitoad/shiny.gbapal.lz"); + const u8 gMonIcon_Palpitoad[] = INCBIN_U8("graphics/pokemon/gen_5/palpitoad/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Palpitoad[] = INCBIN_U8("graphics/pokemon/palpitoad/footprint.1bpp"); + const u8 gMonFootprint_Palpitoad[] = INCBIN_U8("graphics/pokemon/gen_5/palpitoad/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/anim_front.4bpp.lz"); - const u32 gMonPalette_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/normal.gbapal.lz"); - const u32 gMonBackPic_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/back.4bpp.lz"); - const u32 gMonShinyPalette_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/shiny.gbapal.lz"); - const u8 gMonIcon_Seismitoad[] = INCBIN_U8("graphics/pokemon/seismitoad/icon.4bpp"); + const u32 gMonFrontPic_Seismitoad[] = INCBIN_U32("graphics/pokemon/gen_5/seismitoad/anim_front.4bpp.lz"); + const u32 gMonPalette_Seismitoad[] = INCBIN_U32("graphics/pokemon/gen_5/seismitoad/normal.gbapal.lz"); + const u32 gMonBackPic_Seismitoad[] = INCBIN_U32("graphics/pokemon/gen_5/seismitoad/back.4bpp.lz"); + const u32 gMonShinyPalette_Seismitoad[] = INCBIN_U32("graphics/pokemon/gen_5/seismitoad/shiny.gbapal.lz"); + const u8 gMonIcon_Seismitoad[] = INCBIN_U8("graphics/pokemon/gen_5/seismitoad/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Seismitoad[] = INCBIN_U8("graphics/pokemon/seismitoad/footprint.1bpp"); + const u8 gMonFootprint_Seismitoad[] = INCBIN_U8("graphics/pokemon/gen_5/seismitoad/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TYMPOLE #if P_FAMILY_THROH - const u32 gMonFrontPic_Throh[] = INCBIN_U32("graphics/pokemon/throh/anim_front.4bpp.lz"); - const u32 gMonPalette_Throh[] = INCBIN_U32("graphics/pokemon/throh/normal.gbapal.lz"); - const u32 gMonBackPic_Throh[] = INCBIN_U32("graphics/pokemon/throh/back.4bpp.lz"); - const u32 gMonShinyPalette_Throh[] = INCBIN_U32("graphics/pokemon/throh/shiny.gbapal.lz"); - const u8 gMonIcon_Throh[] = INCBIN_U8("graphics/pokemon/throh/icon.4bpp"); + const u32 gMonFrontPic_Throh[] = INCBIN_U32("graphics/pokemon/gen_5/throh/anim_front.4bpp.lz"); + const u32 gMonPalette_Throh[] = INCBIN_U32("graphics/pokemon/gen_5/throh/normal.gbapal.lz"); + const u32 gMonBackPic_Throh[] = INCBIN_U32("graphics/pokemon/gen_5/throh/back.4bpp.lz"); + const u32 gMonShinyPalette_Throh[] = INCBIN_U32("graphics/pokemon/gen_5/throh/shiny.gbapal.lz"); + const u8 gMonIcon_Throh[] = INCBIN_U8("graphics/pokemon/gen_5/throh/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Throh[] = INCBIN_U8("graphics/pokemon/throh/footprint.1bpp"); + const u8 gMonFootprint_Throh[] = INCBIN_U8("graphics/pokemon/gen_5/throh/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_THROH #if P_FAMILY_SAWK - const u32 gMonFrontPic_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/anim_front.4bpp.lz"); - const u32 gMonPalette_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/normal.gbapal.lz"); - const u32 gMonBackPic_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/back.4bpp.lz"); - const u32 gMonShinyPalette_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/shiny.gbapal.lz"); - const u8 gMonIcon_Sawk[] = INCBIN_U8("graphics/pokemon/sawk/icon.4bpp"); + const u32 gMonFrontPic_Sawk[] = INCBIN_U32("graphics/pokemon/gen_5/sawk/anim_front.4bpp.lz"); + const u32 gMonPalette_Sawk[] = INCBIN_U32("graphics/pokemon/gen_5/sawk/normal.gbapal.lz"); + const u32 gMonBackPic_Sawk[] = INCBIN_U32("graphics/pokemon/gen_5/sawk/back.4bpp.lz"); + const u32 gMonShinyPalette_Sawk[] = INCBIN_U32("graphics/pokemon/gen_5/sawk/shiny.gbapal.lz"); + const u8 gMonIcon_Sawk[] = INCBIN_U8("graphics/pokemon/gen_5/sawk/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sawk[] = INCBIN_U8("graphics/pokemon/sawk/footprint.1bpp"); + const u8 gMonFootprint_Sawk[] = INCBIN_U8("graphics/pokemon/gen_5/sawk/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SAWK #if P_FAMILY_SEWADDLE - const u32 gMonFrontPic_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/anim_front.4bpp.lz"); - const u32 gMonPalette_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/normal.gbapal.lz"); - const u32 gMonBackPic_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/back.4bpp.lz"); - const u32 gMonShinyPalette_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/shiny.gbapal.lz"); - const u8 gMonIcon_Sewaddle[] = INCBIN_U8("graphics/pokemon/sewaddle/icon.4bpp"); + const u32 gMonFrontPic_Sewaddle[] = INCBIN_U32("graphics/pokemon/gen_5/sewaddle/anim_front.4bpp.lz"); + const u32 gMonPalette_Sewaddle[] = INCBIN_U32("graphics/pokemon/gen_5/sewaddle/normal.gbapal.lz"); + const u32 gMonBackPic_Sewaddle[] = INCBIN_U32("graphics/pokemon/gen_5/sewaddle/back.4bpp.lz"); + const u32 gMonShinyPalette_Sewaddle[] = INCBIN_U32("graphics/pokemon/gen_5/sewaddle/shiny.gbapal.lz"); + const u8 gMonIcon_Sewaddle[] = INCBIN_U8("graphics/pokemon/gen_5/sewaddle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sewaddle[] = INCBIN_U8("graphics/pokemon/sewaddle/footprint.1bpp"); + const u8 gMonFootprint_Sewaddle[] = INCBIN_U8("graphics/pokemon/gen_5/sewaddle/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/anim_front.4bpp.lz"); - const u32 gMonPalette_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/normal.gbapal.lz"); - const u32 gMonBackPic_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/back.4bpp.lz"); - const u32 gMonShinyPalette_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/shiny.gbapal.lz"); - const u8 gMonIcon_Swadloon[] = INCBIN_U8("graphics/pokemon/swadloon/icon.4bpp"); + const u32 gMonFrontPic_Swadloon[] = INCBIN_U32("graphics/pokemon/gen_5/swadloon/anim_front.4bpp.lz"); + const u32 gMonPalette_Swadloon[] = INCBIN_U32("graphics/pokemon/gen_5/swadloon/normal.gbapal.lz"); + const u32 gMonBackPic_Swadloon[] = INCBIN_U32("graphics/pokemon/gen_5/swadloon/back.4bpp.lz"); + const u32 gMonShinyPalette_Swadloon[] = INCBIN_U32("graphics/pokemon/gen_5/swadloon/shiny.gbapal.lz"); + const u8 gMonIcon_Swadloon[] = INCBIN_U8("graphics/pokemon/gen_5/swadloon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Swadloon[] = INCBIN_U8("graphics/pokemon/swadloon/footprint.1bpp"); + const u8 gMonFootprint_Swadloon[] = INCBIN_U8("graphics/pokemon/gen_5/swadloon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/anim_front.4bpp.lz"); - const u32 gMonPalette_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/normal.gbapal.lz"); - const u32 gMonBackPic_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/back.4bpp.lz"); - const u32 gMonShinyPalette_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/shiny.gbapal.lz"); - const u8 gMonIcon_Leavanny[] = INCBIN_U8("graphics/pokemon/leavanny/icon.4bpp"); + const u32 gMonFrontPic_Leavanny[] = INCBIN_U32("graphics/pokemon/gen_5/leavanny/anim_front.4bpp.lz"); + const u32 gMonPalette_Leavanny[] = INCBIN_U32("graphics/pokemon/gen_5/leavanny/normal.gbapal.lz"); + const u32 gMonBackPic_Leavanny[] = INCBIN_U32("graphics/pokemon/gen_5/leavanny/back.4bpp.lz"); + const u32 gMonShinyPalette_Leavanny[] = INCBIN_U32("graphics/pokemon/gen_5/leavanny/shiny.gbapal.lz"); + const u8 gMonIcon_Leavanny[] = INCBIN_U8("graphics/pokemon/gen_5/leavanny/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Leavanny[] = INCBIN_U8("graphics/pokemon/leavanny/footprint.1bpp"); + const u8 gMonFootprint_Leavanny[] = INCBIN_U8("graphics/pokemon/gen_5/leavanny/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SEWADDLE #if P_FAMILY_VENIPEDE - const u32 gMonFrontPic_Venipede[] = INCBIN_U32("graphics/pokemon/venipede/anim_front.4bpp.lz"); - const u32 gMonPalette_Venipede[] = INCBIN_U32("graphics/pokemon/venipede/normal.gbapal.lz"); - const u32 gMonBackPic_Venipede[] = INCBIN_U32("graphics/pokemon/venipede/back.4bpp.lz"); - const u32 gMonShinyPalette_Venipede[] = INCBIN_U32("graphics/pokemon/venipede/shiny.gbapal.lz"); - const u8 gMonIcon_Venipede[] = INCBIN_U8("graphics/pokemon/venipede/icon.4bpp"); + const u32 gMonFrontPic_Venipede[] = INCBIN_U32("graphics/pokemon/gen_5/venipede/anim_front.4bpp.lz"); + const u32 gMonPalette_Venipede[] = INCBIN_U32("graphics/pokemon/gen_5/venipede/normal.gbapal.lz"); + const u32 gMonBackPic_Venipede[] = INCBIN_U32("graphics/pokemon/gen_5/venipede/back.4bpp.lz"); + const u32 gMonShinyPalette_Venipede[] = INCBIN_U32("graphics/pokemon/gen_5/venipede/shiny.gbapal.lz"); + const u8 gMonIcon_Venipede[] = INCBIN_U8("graphics/pokemon/gen_5/venipede/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Venipede[] = INCBIN_U8("graphics/pokemon/venipede/footprint.1bpp"); + const u8 gMonFootprint_Venipede[] = INCBIN_U8("graphics/pokemon/gen_5/venipede/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/anim_front.4bpp.lz"); - const u32 gMonPalette_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/normal.gbapal.lz"); - const u32 gMonBackPic_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/back.4bpp.lz"); - const u32 gMonShinyPalette_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/shiny.gbapal.lz"); - const u8 gMonIcon_Whirlipede[] = INCBIN_U8("graphics/pokemon/whirlipede/icon.4bpp"); + const u32 gMonFrontPic_Whirlipede[] = INCBIN_U32("graphics/pokemon/gen_5/whirlipede/anim_front.4bpp.lz"); + const u32 gMonPalette_Whirlipede[] = INCBIN_U32("graphics/pokemon/gen_5/whirlipede/normal.gbapal.lz"); + const u32 gMonBackPic_Whirlipede[] = INCBIN_U32("graphics/pokemon/gen_5/whirlipede/back.4bpp.lz"); + const u32 gMonShinyPalette_Whirlipede[] = INCBIN_U32("graphics/pokemon/gen_5/whirlipede/shiny.gbapal.lz"); + const u8 gMonIcon_Whirlipede[] = INCBIN_U8("graphics/pokemon/gen_5/whirlipede/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Whirlipede[] = INCBIN_U8("graphics/pokemon/whirlipede/footprint.1bpp"); + const u8 gMonFootprint_Whirlipede[] = INCBIN_U8("graphics/pokemon/gen_5/whirlipede/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/anim_front.4bpp.lz"); - const u32 gMonPalette_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/normal.gbapal.lz"); - const u32 gMonBackPic_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/back.4bpp.lz"); - const u32 gMonShinyPalette_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/shiny.gbapal.lz"); - const u8 gMonIcon_Scolipede[] = INCBIN_U8("graphics/pokemon/scolipede/icon.4bpp"); + const u32 gMonFrontPic_Scolipede[] = INCBIN_U32("graphics/pokemon/gen_5/scolipede/anim_front.4bpp.lz"); + const u32 gMonPalette_Scolipede[] = INCBIN_U32("graphics/pokemon/gen_5/scolipede/normal.gbapal.lz"); + const u32 gMonBackPic_Scolipede[] = INCBIN_U32("graphics/pokemon/gen_5/scolipede/back.4bpp.lz"); + const u32 gMonShinyPalette_Scolipede[] = INCBIN_U32("graphics/pokemon/gen_5/scolipede/shiny.gbapal.lz"); + const u8 gMonIcon_Scolipede[] = INCBIN_U8("graphics/pokemon/gen_5/scolipede/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Scolipede[] = INCBIN_U8("graphics/pokemon/scolipede/footprint.1bpp"); + const u8 gMonFootprint_Scolipede[] = INCBIN_U8("graphics/pokemon/gen_5/scolipede/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_VENIPEDE #if P_FAMILY_COTTONEE - const u32 gMonFrontPic_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/anim_front.4bpp.lz"); - const u32 gMonPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/normal.gbapal.lz"); - const u32 gMonBackPic_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/back.4bpp.lz"); - const u32 gMonShinyPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/shiny.gbapal.lz"); - const u8 gMonIcon_Cottonee[] = INCBIN_U8("graphics/pokemon/cottonee/icon.4bpp"); + const u32 gMonFrontPic_Cottonee[] = INCBIN_U32("graphics/pokemon/gen_5/cottonee/anim_front.4bpp.lz"); + const u32 gMonPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/gen_5/cottonee/normal.gbapal.lz"); + const u32 gMonBackPic_Cottonee[] = INCBIN_U32("graphics/pokemon/gen_5/cottonee/back.4bpp.lz"); + const u32 gMonShinyPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/gen_5/cottonee/shiny.gbapal.lz"); + const u8 gMonIcon_Cottonee[] = INCBIN_U8("graphics/pokemon/gen_5/cottonee/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cottonee[] = INCBIN_U8("graphics/pokemon/cottonee/footprint.1bpp"); + const u8 gMonFootprint_Cottonee[] = INCBIN_U8("graphics/pokemon/gen_5/cottonee/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/anim_front.4bpp.lz"); - const u32 gMonPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/normal.gbapal.lz"); - const u32 gMonBackPic_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/back.4bpp.lz"); - const u32 gMonShinyPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/shiny.gbapal.lz"); - const u8 gMonIcon_Whimsicott[] = INCBIN_U8("graphics/pokemon/whimsicott/icon.4bpp"); + const u32 gMonFrontPic_Whimsicott[] = INCBIN_U32("graphics/pokemon/gen_5/whimsicott/anim_front.4bpp.lz"); + const u32 gMonPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/gen_5/whimsicott/normal.gbapal.lz"); + const u32 gMonBackPic_Whimsicott[] = INCBIN_U32("graphics/pokemon/gen_5/whimsicott/back.4bpp.lz"); + const u32 gMonShinyPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/gen_5/whimsicott/shiny.gbapal.lz"); + const u8 gMonIcon_Whimsicott[] = INCBIN_U8("graphics/pokemon/gen_5/whimsicott/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Whimsicott[] = INCBIN_U8("graphics/pokemon/whimsicott/footprint.1bpp"); + const u8 gMonFootprint_Whimsicott[] = INCBIN_U8("graphics/pokemon/gen_5/whimsicott/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_COTTONEE #if P_FAMILY_PETILIL - const u32 gMonFrontPic_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/anim_front.4bpp.lz"); - const u32 gMonPalette_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/normal.gbapal.lz"); - const u32 gMonBackPic_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/back.4bpp.lz"); - const u32 gMonShinyPalette_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/shiny.gbapal.lz"); - const u8 gMonIcon_Petilil[] = INCBIN_U8("graphics/pokemon/petilil/icon.4bpp"); + const u32 gMonFrontPic_Petilil[] = INCBIN_U32("graphics/pokemon/gen_5/petilil/anim_front.4bpp.lz"); + const u32 gMonPalette_Petilil[] = INCBIN_U32("graphics/pokemon/gen_5/petilil/normal.gbapal.lz"); + const u32 gMonBackPic_Petilil[] = INCBIN_U32("graphics/pokemon/gen_5/petilil/back.4bpp.lz"); + const u32 gMonShinyPalette_Petilil[] = INCBIN_U32("graphics/pokemon/gen_5/petilil/shiny.gbapal.lz"); + const u8 gMonIcon_Petilil[] = INCBIN_U8("graphics/pokemon/gen_5/petilil/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Petilil[] = INCBIN_U8("graphics/pokemon/petilil/footprint.1bpp"); + const u8 gMonFootprint_Petilil[] = INCBIN_U8("graphics/pokemon/gen_5/petilil/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/anim_front.4bpp.lz"); - const u32 gMonPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/normal.gbapal.lz"); - const u32 gMonBackPic_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/back.4bpp.lz"); - const u32 gMonShinyPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/shiny.gbapal.lz"); - const u8 gMonIcon_Lilligant[] = INCBIN_U8("graphics/pokemon/lilligant/icon.4bpp"); + const u32 gMonFrontPic_Lilligant[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/anim_front.4bpp.lz"); + const u32 gMonPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/normal.gbapal.lz"); + const u32 gMonBackPic_Lilligant[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/back.4bpp.lz"); + const u32 gMonShinyPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/shiny.gbapal.lz"); + const u8 gMonIcon_Lilligant[] = INCBIN_U8("graphics/pokemon/gen_5/lilligant/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lilligant[] = INCBIN_U8("graphics/pokemon/lilligant/footprint.1bpp"); + const u8 gMonFootprint_Lilligant[] = INCBIN_U8("graphics/pokemon/gen_5/lilligant/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/front.4bpp.lz"); - const u32 gMonPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_LilligantHisuian[] = INCBIN_U8("graphics/pokemon/lilligant/hisuian/icon.4bpp"); + const u32 gMonFrontPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/hisuian/front.4bpp.lz"); + const u32 gMonPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/lilligant/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_LilligantHisuian[] = INCBIN_U8("graphics/pokemon/gen_5/lilligant/hisuian/icon.4bpp"); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_PETILIL #if P_FAMILY_BASCULIN - const u32 gMonFrontPic_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/anim_front.4bpp.lz"); - const u32 gMonPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/normal.gbapal.lz"); - const u32 gMonBackPic_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/back.4bpp.lz"); - const u32 gMonShinyPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/shiny.gbapal.lz"); - const u8 gMonIcon_BasculinRedStriped[] = INCBIN_U8("graphics/pokemon/basculin/icon.4bpp"); + const u32 gMonFrontPic_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/anim_front.4bpp.lz"); + const u32 gMonPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/normal.gbapal.lz"); + const u32 gMonBackPic_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/back.4bpp.lz"); + const u32 gMonShinyPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/shiny.gbapal.lz"); + const u8 gMonIcon_BasculinRedStriped[] = INCBIN_U8("graphics/pokemon/gen_5/basculin/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Basculin[] = INCBIN_U8("graphics/pokemon/basculin/footprint.1bpp"); + const u8 gMonFootprint_Basculin[] = INCBIN_U8("graphics/pokemon/gen_5/basculin/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/front.4bpp.lz"); - const u32 gMonPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/normal.gbapal.lz"); - const u32 gMonBackPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/back.4bpp.lz"); - const u32 gMonShinyPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/shiny.gbapal.lz"); - const u8 gMonIcon_BasculinBlueStriped[] = INCBIN_U8("graphics/pokemon/basculin/blue_striped/icon.4bpp"); + const u32 gMonFrontPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/blue_striped/front.4bpp.lz"); + const u32 gMonPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/blue_striped/normal.gbapal.lz"); + const u32 gMonBackPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/blue_striped/back.4bpp.lz"); + const u32 gMonShinyPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/blue_striped/shiny.gbapal.lz"); + const u8 gMonIcon_BasculinBlueStriped[] = INCBIN_U8("graphics/pokemon/gen_5/basculin/blue_striped/icon.4bpp"); #if P_HISUIAN_FORMS - const u32 gMonFrontPic_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/front.4bpp.lz"); - const u32 gMonPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/normal.gbapal.lz"); - const u32 gMonBackPic_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/back.4bpp.lz"); - const u32 gMonShinyPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/shiny.gbapal.lz"); - const u8 gMonIcon_BasculinWhiteStriped[] = INCBIN_U8("graphics/pokemon/basculin/white_striped/icon.4bpp"); + const u32 gMonFrontPic_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/white_striped/front.4bpp.lz"); + const u32 gMonPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/white_striped/normal.gbapal.lz"); + const u32 gMonBackPic_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/white_striped/back.4bpp.lz"); + const u32 gMonShinyPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/gen_5/basculin/white_striped/shiny.gbapal.lz"); + const u8 gMonIcon_BasculinWhiteStriped[] = INCBIN_U8("graphics/pokemon/gen_5/basculin/white_striped/icon.4bpp"); - const u32 gMonFrontPic_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz"); - const u32 gMonPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/normal.gbapal.lz"); - const u32 gMonBackPic_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz"); - const u32 gMonShinyPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz"); - const u8 gMonIcon_BasculegionMale[] = INCBIN_U8("graphics/pokemon/basculegion/icon.4bpp"); + const u32 gMonFrontPic_BasculegionMale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/front.4bpp.lz"); + const u32 gMonPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/normal.gbapal.lz"); + const u32 gMonBackPic_BasculegionMale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/back.4bpp.lz"); + const u32 gMonShinyPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/shiny.gbapal.lz"); + const u8 gMonIcon_BasculegionMale[] = INCBIN_U8("graphics/pokemon/gen_8/basculegion/icon.4bpp"); #if P_FOOTPRINTS - //const u8 gMonFootprint_Basculegion[] = INCBIN_U8("graphics/pokemon/basculegion/footprint.1bpp"); + //const u8 gMonFootprint_Basculegion[] = INCBIN_U8("graphics/pokemon/gen_8/basculegion/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/front.4bpp.lz"); - const u32 gMonPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/normal.gbapal.lz"); - const u32 gMonBackPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/back.4bpp.lz"); - const u32 gMonShinyPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/shiny.gbapal.lz"); - const u8 gMonIcon_BasculegionFemale[] = INCBIN_U8("graphics/pokemon/basculegion/female/icon.4bpp"); + const u32 gMonFrontPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/female/front.4bpp.lz"); + const u32 gMonPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/female/normal.gbapal.lz"); + const u32 gMonBackPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/female/back.4bpp.lz"); + const u32 gMonShinyPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/gen_8/basculegion/female/shiny.gbapal.lz"); + const u8 gMonIcon_BasculegionFemale[] = INCBIN_U8("graphics/pokemon/gen_8/basculegion/female/icon.4bpp"); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_BASCULIN #if P_FAMILY_SANDILE - const u32 gMonFrontPic_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/anim_front.4bpp.lz"); - const u32 gMonPalette_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/normal.gbapal.lz"); - const u32 gMonBackPic_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/back.4bpp.lz"); - const u32 gMonShinyPalette_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/shiny.gbapal.lz"); - const u8 gMonIcon_Sandile[] = INCBIN_U8("graphics/pokemon/sandile/icon.4bpp"); + const u32 gMonFrontPic_Sandile[] = INCBIN_U32("graphics/pokemon/gen_5/sandile/anim_front.4bpp.lz"); + const u32 gMonPalette_Sandile[] = INCBIN_U32("graphics/pokemon/gen_5/sandile/normal.gbapal.lz"); + const u32 gMonBackPic_Sandile[] = INCBIN_U32("graphics/pokemon/gen_5/sandile/back.4bpp.lz"); + const u32 gMonShinyPalette_Sandile[] = INCBIN_U32("graphics/pokemon/gen_5/sandile/shiny.gbapal.lz"); + const u8 gMonIcon_Sandile[] = INCBIN_U8("graphics/pokemon/gen_5/sandile/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sandile[] = INCBIN_U8("graphics/pokemon/sandile/footprint.1bpp"); + const u8 gMonFootprint_Sandile[] = INCBIN_U8("graphics/pokemon/gen_5/sandile/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/anim_front.4bpp.lz"); - const u32 gMonPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/normal.gbapal.lz"); - const u32 gMonBackPic_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/back.4bpp.lz"); - const u32 gMonShinyPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/shiny.gbapal.lz"); - const u8 gMonIcon_Krokorok[] = INCBIN_U8("graphics/pokemon/krokorok/icon.4bpp"); + const u32 gMonFrontPic_Krokorok[] = INCBIN_U32("graphics/pokemon/gen_5/krokorok/anim_front.4bpp.lz"); + const u32 gMonPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/gen_5/krokorok/normal.gbapal.lz"); + const u32 gMonBackPic_Krokorok[] = INCBIN_U32("graphics/pokemon/gen_5/krokorok/back.4bpp.lz"); + const u32 gMonShinyPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/gen_5/krokorok/shiny.gbapal.lz"); + const u8 gMonIcon_Krokorok[] = INCBIN_U8("graphics/pokemon/gen_5/krokorok/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Krokorok[] = INCBIN_U8("graphics/pokemon/krokorok/footprint.1bpp"); + const u8 gMonFootprint_Krokorok[] = INCBIN_U8("graphics/pokemon/gen_5/krokorok/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/anim_front.4bpp.lz"); - const u32 gMonPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/normal.gbapal.lz"); - const u32 gMonBackPic_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/back.4bpp.lz"); - const u32 gMonShinyPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/shiny.gbapal.lz"); - const u8 gMonIcon_Krookodile[] = INCBIN_U8("graphics/pokemon/krookodile/icon.4bpp"); + const u32 gMonFrontPic_Krookodile[] = INCBIN_U32("graphics/pokemon/gen_5/krookodile/anim_front.4bpp.lz"); + const u32 gMonPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/gen_5/krookodile/normal.gbapal.lz"); + const u32 gMonBackPic_Krookodile[] = INCBIN_U32("graphics/pokemon/gen_5/krookodile/back.4bpp.lz"); + const u32 gMonShinyPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/gen_5/krookodile/shiny.gbapal.lz"); + const u8 gMonIcon_Krookodile[] = INCBIN_U8("graphics/pokemon/gen_5/krookodile/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Krookodile[] = INCBIN_U8("graphics/pokemon/krookodile/footprint.1bpp"); + const u8 gMonFootprint_Krookodile[] = INCBIN_U8("graphics/pokemon/gen_5/krookodile/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SANDILE #if P_FAMILY_DARUMAKA - const u32 gMonFrontPic_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/anim_front.4bpp.lz"); - const u32 gMonPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/normal.gbapal.lz"); - const u32 gMonBackPic_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/back.4bpp.lz"); - const u32 gMonShinyPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/shiny.gbapal.lz"); - const u8 gMonIcon_Darumaka[] = INCBIN_U8("graphics/pokemon/darumaka/icon.4bpp"); + const u32 gMonFrontPic_Darumaka[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/anim_front.4bpp.lz"); + const u32 gMonPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/normal.gbapal.lz"); + const u32 gMonBackPic_Darumaka[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/back.4bpp.lz"); + const u32 gMonShinyPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/shiny.gbapal.lz"); + const u8 gMonIcon_Darumaka[] = INCBIN_U8("graphics/pokemon/gen_5/darumaka/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Darumaka[] = INCBIN_U8("graphics/pokemon/darumaka/footprint.1bpp"); + const u8 gMonFootprint_Darumaka[] = INCBIN_U8("graphics/pokemon/gen_5/darumaka/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/anim_front.4bpp.lz"); - const u32 gMonPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/normal.gbapal.lz"); - const u32 gMonBackPic_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/back.4bpp.lz"); - const u32 gMonShinyPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/shiny.gbapal.lz"); - const u8 gMonIcon_DarmanitanStandardMode[] = INCBIN_U8("graphics/pokemon/darmanitan/icon.4bpp"); + const u32 gMonFrontPic_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/anim_front.4bpp.lz"); + const u32 gMonPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/normal.gbapal.lz"); + const u32 gMonBackPic_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/back.4bpp.lz"); + const u32 gMonShinyPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/shiny.gbapal.lz"); + const u8 gMonIcon_DarmanitanStandardMode[] = INCBIN_U8("graphics/pokemon/gen_5/darmanitan/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Darmanitan[] = INCBIN_U8("graphics/pokemon/darmanitan/footprint.1bpp"); + const u8 gMonFootprint_Darmanitan[] = INCBIN_U8("graphics/pokemon/gen_5/darmanitan/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/anim_front.4bpp.lz"); - const u32 gMonPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/normal.gbapal.lz"); - const u32 gMonBackPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/back.4bpp.lz"); - const u32 gMonShinyPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/shiny.gbapal.lz"); - const u8 gMonIcon_DarmanitanZenMode[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/icon.4bpp"); + const u32 gMonFrontPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/anim_front.4bpp.lz"); + const u32 gMonPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/normal.gbapal.lz"); + const u32 gMonBackPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/back.4bpp.lz"); + const u32 gMonShinyPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/shiny.gbapal.lz"); + const u8 gMonIcon_DarmanitanZenMode[] = INCBIN_U8("graphics/pokemon/gen_5/darmanitan/zen_mode/icon.4bpp"); #if P_GALARIAN_FORMS - const u32 gMonFrontPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/front.4bpp.lz"); - const u32 gMonPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_DarumakaGalarian[] = INCBIN_U8("graphics/pokemon/darumaka/galarian/icon.4bpp"); + const u32 gMonFrontPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/galarian/front.4bpp.lz"); + const u32 gMonPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/darumaka/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_DarumakaGalarian[] = INCBIN_U8("graphics/pokemon/gen_5/darumaka/galarian/icon.4bpp"); - const u32 gMonFrontPic_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/front.4bpp.lz"); - const u32 gMonPalette_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_DarmanitanGalarianStandardMode[] = INCBIN_U8("graphics/pokemon/darmanitan/galarian/icon.4bpp"); + const u32 gMonFrontPic_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/galarian/front.4bpp.lz"); + const u32 gMonPalette_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_DarmanitanGalarianStandardMode[] = INCBIN_U8("graphics/pokemon/gen_5/darmanitan/galarian/icon.4bpp"); - const u32 gMonFrontPic_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/front.4bpp.lz"); - const u32 gMonPalette_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_DarmanitanGalarianZenMode[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/galarian/icon.4bpp"); + const u32 gMonFrontPic_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/front.4bpp.lz"); + const u32 gMonPalette_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_DarmanitanGalarianZenMode[] = INCBIN_U8("graphics/pokemon/gen_5/darmanitan/zen_mode/galarian/icon.4bpp"); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_DARUMAKA #if P_FAMILY_MARACTUS - const u32 gMonFrontPic_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/anim_front.4bpp.lz"); - const u32 gMonPalette_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/normal.gbapal.lz"); - const u32 gMonBackPic_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/back.4bpp.lz"); - const u32 gMonShinyPalette_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/shiny.gbapal.lz"); - const u8 gMonIcon_Maractus[] = INCBIN_U8("graphics/pokemon/maractus/icon.4bpp"); + const u32 gMonFrontPic_Maractus[] = INCBIN_U32("graphics/pokemon/gen_5/maractus/anim_front.4bpp.lz"); + const u32 gMonPalette_Maractus[] = INCBIN_U32("graphics/pokemon/gen_5/maractus/normal.gbapal.lz"); + const u32 gMonBackPic_Maractus[] = INCBIN_U32("graphics/pokemon/gen_5/maractus/back.4bpp.lz"); + const u32 gMonShinyPalette_Maractus[] = INCBIN_U32("graphics/pokemon/gen_5/maractus/shiny.gbapal.lz"); + const u8 gMonIcon_Maractus[] = INCBIN_U8("graphics/pokemon/gen_5/maractus/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Maractus[] = INCBIN_U8("graphics/pokemon/maractus/footprint.1bpp"); + const u8 gMonFootprint_Maractus[] = INCBIN_U8("graphics/pokemon/gen_5/maractus/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MARACTUS #if P_FAMILY_DWEBBLE - const u32 gMonFrontPic_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/anim_front.4bpp.lz"); - const u32 gMonPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/normal.gbapal.lz"); - const u32 gMonBackPic_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/back.4bpp.lz"); - const u32 gMonShinyPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/shiny.gbapal.lz"); - const u8 gMonIcon_Dwebble[] = INCBIN_U8("graphics/pokemon/dwebble/icon.4bpp"); + const u32 gMonFrontPic_Dwebble[] = INCBIN_U32("graphics/pokemon/gen_5/dwebble/anim_front.4bpp.lz"); + const u32 gMonPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/gen_5/dwebble/normal.gbapal.lz"); + const u32 gMonBackPic_Dwebble[] = INCBIN_U32("graphics/pokemon/gen_5/dwebble/back.4bpp.lz"); + const u32 gMonShinyPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/gen_5/dwebble/shiny.gbapal.lz"); + const u8 gMonIcon_Dwebble[] = INCBIN_U8("graphics/pokemon/gen_5/dwebble/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dwebble[] = INCBIN_U8("graphics/pokemon/dwebble/footprint.1bpp"); + const u8 gMonFootprint_Dwebble[] = INCBIN_U8("graphics/pokemon/gen_5/dwebble/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/anim_front.4bpp.lz"); - const u32 gMonPalette_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/normal.gbapal.lz"); - const u32 gMonBackPic_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/back.4bpp.lz"); - const u32 gMonShinyPalette_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/shiny.gbapal.lz"); - const u8 gMonIcon_Crustle[] = INCBIN_U8("graphics/pokemon/crustle/icon.4bpp"); + const u32 gMonFrontPic_Crustle[] = INCBIN_U32("graphics/pokemon/gen_5/crustle/anim_front.4bpp.lz"); + const u32 gMonPalette_Crustle[] = INCBIN_U32("graphics/pokemon/gen_5/crustle/normal.gbapal.lz"); + const u32 gMonBackPic_Crustle[] = INCBIN_U32("graphics/pokemon/gen_5/crustle/back.4bpp.lz"); + const u32 gMonShinyPalette_Crustle[] = INCBIN_U32("graphics/pokemon/gen_5/crustle/shiny.gbapal.lz"); + const u8 gMonIcon_Crustle[] = INCBIN_U8("graphics/pokemon/gen_5/crustle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Crustle[] = INCBIN_U8("graphics/pokemon/crustle/footprint.1bpp"); + const u8 gMonFootprint_Crustle[] = INCBIN_U8("graphics/pokemon/gen_5/crustle/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DWEBBLE #if P_FAMILY_SCRAGGY - const u32 gMonFrontPic_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/anim_front.4bpp.lz"); - const u32 gMonPalette_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/normal.gbapal.lz"); - const u32 gMonBackPic_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/back.4bpp.lz"); - const u32 gMonShinyPalette_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/shiny.gbapal.lz"); - const u8 gMonIcon_Scraggy[] = INCBIN_U8("graphics/pokemon/scraggy/icon.4bpp"); + const u32 gMonFrontPic_Scraggy[] = INCBIN_U32("graphics/pokemon/gen_5/scraggy/anim_front.4bpp.lz"); + const u32 gMonPalette_Scraggy[] = INCBIN_U32("graphics/pokemon/gen_5/scraggy/normal.gbapal.lz"); + const u32 gMonBackPic_Scraggy[] = INCBIN_U32("graphics/pokemon/gen_5/scraggy/back.4bpp.lz"); + const u32 gMonShinyPalette_Scraggy[] = INCBIN_U32("graphics/pokemon/gen_5/scraggy/shiny.gbapal.lz"); + const u8 gMonIcon_Scraggy[] = INCBIN_U8("graphics/pokemon/gen_5/scraggy/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Scraggy[] = INCBIN_U8("graphics/pokemon/scraggy/footprint.1bpp"); + const u8 gMonFootprint_Scraggy[] = INCBIN_U8("graphics/pokemon/gen_5/scraggy/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/anim_front.4bpp.lz"); - const u32 gMonPalette_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/normal.gbapal.lz"); - const u32 gMonBackPic_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/back.4bpp.lz"); - const u32 gMonShinyPalette_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/shiny.gbapal.lz"); - const u8 gMonIcon_Scrafty[] = INCBIN_U8("graphics/pokemon/scrafty/icon.4bpp"); + const u32 gMonFrontPic_Scrafty[] = INCBIN_U32("graphics/pokemon/gen_5/scrafty/anim_front.4bpp.lz"); + const u32 gMonPalette_Scrafty[] = INCBIN_U32("graphics/pokemon/gen_5/scrafty/normal.gbapal.lz"); + const u32 gMonBackPic_Scrafty[] = INCBIN_U32("graphics/pokemon/gen_5/scrafty/back.4bpp.lz"); + const u32 gMonShinyPalette_Scrafty[] = INCBIN_U32("graphics/pokemon/gen_5/scrafty/shiny.gbapal.lz"); + const u8 gMonIcon_Scrafty[] = INCBIN_U8("graphics/pokemon/gen_5/scrafty/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Scrafty[] = INCBIN_U8("graphics/pokemon/scrafty/footprint.1bpp"); + const u8 gMonFootprint_Scrafty[] = INCBIN_U8("graphics/pokemon/gen_5/scrafty/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SCRAGGY #if P_FAMILY_SIGILYPH - const u32 gMonFrontPic_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/anim_front.4bpp.lz"); - const u32 gMonPalette_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/normal.gbapal.lz"); - const u32 gMonBackPic_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/back.4bpp.lz"); - const u32 gMonShinyPalette_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/shiny.gbapal.lz"); - const u8 gMonIcon_Sigilyph[] = INCBIN_U8("graphics/pokemon/sigilyph/icon.4bpp"); + const u32 gMonFrontPic_Sigilyph[] = INCBIN_U32("graphics/pokemon/gen_5/sigilyph/anim_front.4bpp.lz"); + const u32 gMonPalette_Sigilyph[] = INCBIN_U32("graphics/pokemon/gen_5/sigilyph/normal.gbapal.lz"); + const u32 gMonBackPic_Sigilyph[] = INCBIN_U32("graphics/pokemon/gen_5/sigilyph/back.4bpp.lz"); + const u32 gMonShinyPalette_Sigilyph[] = INCBIN_U32("graphics/pokemon/gen_5/sigilyph/shiny.gbapal.lz"); + const u8 gMonIcon_Sigilyph[] = INCBIN_U8("graphics/pokemon/gen_5/sigilyph/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sigilyph[] = INCBIN_U8("graphics/pokemon/sigilyph/footprint.1bpp"); + const u8 gMonFootprint_Sigilyph[] = INCBIN_U8("graphics/pokemon/gen_5/sigilyph/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SIGILYPH #if P_FAMILY_YAMASK - const u32 gMonFrontPic_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/anim_front.4bpp.lz"); - const u32 gMonPalette_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/normal.gbapal.lz"); - const u32 gMonBackPic_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/back.4bpp.lz"); - const u32 gMonShinyPalette_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/shiny.gbapal.lz"); - const u8 gMonIcon_Yamask[] = INCBIN_U8("graphics/pokemon/yamask/icon.4bpp"); + const u32 gMonFrontPic_Yamask[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/anim_front.4bpp.lz"); + const u32 gMonPalette_Yamask[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/normal.gbapal.lz"); + const u32 gMonBackPic_Yamask[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/back.4bpp.lz"); + const u32 gMonShinyPalette_Yamask[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/shiny.gbapal.lz"); + const u8 gMonIcon_Yamask[] = INCBIN_U8("graphics/pokemon/gen_5/yamask/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Yamask[] = INCBIN_U8("graphics/pokemon/yamask/footprint.1bpp"); + const u8 gMonFootprint_Yamask[] = INCBIN_U8("graphics/pokemon/gen_5/yamask/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/anim_front.4bpp.lz"); - const u32 gMonPalette_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/normal.gbapal.lz"); - const u32 gMonBackPic_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/back.4bpp.lz"); - const u32 gMonShinyPalette_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/shiny.gbapal.lz"); - const u8 gMonIcon_Cofagrigus[] = INCBIN_U8("graphics/pokemon/cofagrigus/icon.4bpp"); + const u32 gMonFrontPic_Cofagrigus[] = INCBIN_U32("graphics/pokemon/gen_5/cofagrigus/anim_front.4bpp.lz"); + const u32 gMonPalette_Cofagrigus[] = INCBIN_U32("graphics/pokemon/gen_5/cofagrigus/normal.gbapal.lz"); + const u32 gMonBackPic_Cofagrigus[] = INCBIN_U32("graphics/pokemon/gen_5/cofagrigus/back.4bpp.lz"); + const u32 gMonShinyPalette_Cofagrigus[] = INCBIN_U32("graphics/pokemon/gen_5/cofagrigus/shiny.gbapal.lz"); + const u8 gMonIcon_Cofagrigus[] = INCBIN_U8("graphics/pokemon/gen_5/cofagrigus/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cofagrigus[] = INCBIN_U8("graphics/pokemon/cofagrigus/footprint.1bpp"); + const u8 gMonFootprint_Cofagrigus[] = INCBIN_U8("graphics/pokemon/gen_5/cofagrigus/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/front.4bpp.lz"); - const u32 gMonPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_YamaskGalarian[] = INCBIN_U8("graphics/pokemon/yamask/galarian/icon.4bpp"); + const u32 gMonFrontPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/galarian/front.4bpp.lz"); + const u32 gMonPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/yamask/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_YamaskGalarian[] = INCBIN_U8("graphics/pokemon/gen_5/yamask/galarian/icon.4bpp"); - const u32 gMonFrontPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/front.4bpp.lz"); - const u32 gMonPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/normal.gbapal.lz"); - const u32 gMonBackPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/back.4bpp.lz"); - const u32 gMonShinyPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/shiny.gbapal.lz"); - const u8 gMonIcon_Runerigus[] = INCBIN_U8("graphics/pokemon/runerigus/icon.4bpp"); + const u32 gMonFrontPic_Runerigus[] = INCBIN_U32("graphics/pokemon/gen_8/runerigus/front.4bpp.lz"); + const u32 gMonPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/gen_8/runerigus/normal.gbapal.lz"); + const u32 gMonBackPic_Runerigus[] = INCBIN_U32("graphics/pokemon/gen_8/runerigus/back.4bpp.lz"); + const u32 gMonShinyPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/gen_8/runerigus/shiny.gbapal.lz"); + const u8 gMonIcon_Runerigus[] = INCBIN_U8("graphics/pokemon/gen_8/runerigus/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Runerigus[] = INCBIN_U8("graphics/pokemon/runerigus/footprint.1bpp"); + const u8 gMonFootprint_Runerigus[] = INCBIN_U8("graphics/pokemon/gen_8/runerigus/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_YAMASK #if P_FAMILY_TIRTOUGA - const u32 gMonFrontPic_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/anim_front.4bpp.lz"); - const u32 gMonPalette_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/normal.gbapal.lz"); - const u32 gMonBackPic_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/back.4bpp.lz"); - const u32 gMonShinyPalette_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/shiny.gbapal.lz"); - const u8 gMonIcon_Tirtouga[] = INCBIN_U8("graphics/pokemon/tirtouga/icon.4bpp"); + const u32 gMonFrontPic_Tirtouga[] = INCBIN_U32("graphics/pokemon/gen_5/tirtouga/anim_front.4bpp.lz"); + const u32 gMonPalette_Tirtouga[] = INCBIN_U32("graphics/pokemon/gen_5/tirtouga/normal.gbapal.lz"); + const u32 gMonBackPic_Tirtouga[] = INCBIN_U32("graphics/pokemon/gen_5/tirtouga/back.4bpp.lz"); + const u32 gMonShinyPalette_Tirtouga[] = INCBIN_U32("graphics/pokemon/gen_5/tirtouga/shiny.gbapal.lz"); + const u8 gMonIcon_Tirtouga[] = INCBIN_U8("graphics/pokemon/gen_5/tirtouga/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tirtouga[] = INCBIN_U8("graphics/pokemon/tirtouga/footprint.1bpp"); + const u8 gMonFootprint_Tirtouga[] = INCBIN_U8("graphics/pokemon/gen_5/tirtouga/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/anim_front.4bpp.lz"); - const u32 gMonPalette_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/normal.gbapal.lz"); - const u32 gMonBackPic_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/back.4bpp.lz"); - const u32 gMonShinyPalette_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/shiny.gbapal.lz"); - const u8 gMonIcon_Carracosta[] = INCBIN_U8("graphics/pokemon/carracosta/icon.4bpp"); + const u32 gMonFrontPic_Carracosta[] = INCBIN_U32("graphics/pokemon/gen_5/carracosta/anim_front.4bpp.lz"); + const u32 gMonPalette_Carracosta[] = INCBIN_U32("graphics/pokemon/gen_5/carracosta/normal.gbapal.lz"); + const u32 gMonBackPic_Carracosta[] = INCBIN_U32("graphics/pokemon/gen_5/carracosta/back.4bpp.lz"); + const u32 gMonShinyPalette_Carracosta[] = INCBIN_U32("graphics/pokemon/gen_5/carracosta/shiny.gbapal.lz"); + const u8 gMonIcon_Carracosta[] = INCBIN_U8("graphics/pokemon/gen_5/carracosta/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Carracosta[] = INCBIN_U8("graphics/pokemon/carracosta/footprint.1bpp"); + const u8 gMonFootprint_Carracosta[] = INCBIN_U8("graphics/pokemon/gen_5/carracosta/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TIRTOUGA #if P_FAMILY_ARCHEN - const u32 gMonFrontPic_Archen[] = INCBIN_U32("graphics/pokemon/archen/anim_front.4bpp.lz"); - const u32 gMonPalette_Archen[] = INCBIN_U32("graphics/pokemon/archen/normal.gbapal.lz"); - const u32 gMonBackPic_Archen[] = INCBIN_U32("graphics/pokemon/archen/back.4bpp.lz"); - const u32 gMonShinyPalette_Archen[] = INCBIN_U32("graphics/pokemon/archen/shiny.gbapal.lz"); - const u8 gMonIcon_Archen[] = INCBIN_U8("graphics/pokemon/archen/icon.4bpp"); + const u32 gMonFrontPic_Archen[] = INCBIN_U32("graphics/pokemon/gen_5/archen/anim_front.4bpp.lz"); + const u32 gMonPalette_Archen[] = INCBIN_U32("graphics/pokemon/gen_5/archen/normal.gbapal.lz"); + const u32 gMonBackPic_Archen[] = INCBIN_U32("graphics/pokemon/gen_5/archen/back.4bpp.lz"); + const u32 gMonShinyPalette_Archen[] = INCBIN_U32("graphics/pokemon/gen_5/archen/shiny.gbapal.lz"); + const u8 gMonIcon_Archen[] = INCBIN_U8("graphics/pokemon/gen_5/archen/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Archen[] = INCBIN_U8("graphics/pokemon/archen/footprint.1bpp"); + const u8 gMonFootprint_Archen[] = INCBIN_U8("graphics/pokemon/gen_5/archen/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/anim_front.4bpp.lz"); - const u32 gMonPalette_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/normal.gbapal.lz"); - const u32 gMonBackPic_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/back.4bpp.lz"); - const u32 gMonShinyPalette_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/shiny.gbapal.lz"); - const u8 gMonIcon_Archeops[] = INCBIN_U8("graphics/pokemon/archeops/icon.4bpp"); + const u32 gMonFrontPic_Archeops[] = INCBIN_U32("graphics/pokemon/gen_5/archeops/anim_front.4bpp.lz"); + const u32 gMonPalette_Archeops[] = INCBIN_U32("graphics/pokemon/gen_5/archeops/normal.gbapal.lz"); + const u32 gMonBackPic_Archeops[] = INCBIN_U32("graphics/pokemon/gen_5/archeops/back.4bpp.lz"); + const u32 gMonShinyPalette_Archeops[] = INCBIN_U32("graphics/pokemon/gen_5/archeops/shiny.gbapal.lz"); + const u8 gMonIcon_Archeops[] = INCBIN_U8("graphics/pokemon/gen_5/archeops/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Archeops[] = INCBIN_U8("graphics/pokemon/archeops/footprint.1bpp"); + const u8 gMonFootprint_Archeops[] = INCBIN_U8("graphics/pokemon/gen_5/archeops/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ARCHEN #if P_FAMILY_TRUBBISH - const u32 gMonFrontPic_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/anim_front.4bpp.lz"); - const u32 gMonPalette_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/normal.gbapal.lz"); - const u32 gMonBackPic_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/back.4bpp.lz"); - const u32 gMonShinyPalette_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/shiny.gbapal.lz"); - const u8 gMonIcon_Trubbish[] = INCBIN_U8("graphics/pokemon/trubbish/icon.4bpp"); + const u32 gMonFrontPic_Trubbish[] = INCBIN_U32("graphics/pokemon/gen_5/trubbish/anim_front.4bpp.lz"); + const u32 gMonPalette_Trubbish[] = INCBIN_U32("graphics/pokemon/gen_5/trubbish/normal.gbapal.lz"); + const u32 gMonBackPic_Trubbish[] = INCBIN_U32("graphics/pokemon/gen_5/trubbish/back.4bpp.lz"); + const u32 gMonShinyPalette_Trubbish[] = INCBIN_U32("graphics/pokemon/gen_5/trubbish/shiny.gbapal.lz"); + const u8 gMonIcon_Trubbish[] = INCBIN_U8("graphics/pokemon/gen_5/trubbish/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Trubbish[] = INCBIN_U8("graphics/pokemon/trubbish/footprint.1bpp"); + const u8 gMonFootprint_Trubbish[] = INCBIN_U8("graphics/pokemon/gen_5/trubbish/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/anim_front.4bpp.lz"); - const u32 gMonPalette_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/normal.gbapal.lz"); - const u32 gMonBackPic_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/back.4bpp.lz"); - const u32 gMonShinyPalette_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/shiny.gbapal.lz"); - const u8 gMonIcon_Garbodor[] = INCBIN_U8("graphics/pokemon/garbodor/icon.4bpp"); + const u32 gMonFrontPic_Garbodor[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/anim_front.4bpp.lz"); + const u32 gMonPalette_Garbodor[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/normal.gbapal.lz"); + const u32 gMonBackPic_Garbodor[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/back.4bpp.lz"); + const u32 gMonShinyPalette_Garbodor[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/shiny.gbapal.lz"); + const u8 gMonIcon_Garbodor[] = INCBIN_U8("graphics/pokemon/gen_5/garbodor/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Garbodor[] = INCBIN_U8("graphics/pokemon/garbodor/footprint.1bpp"); + const u8 gMonFootprint_Garbodor[] = INCBIN_U8("graphics/pokemon/gen_5/garbodor/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_GarbodorGigantamax[] = INCBIN_U8("graphics/pokemon/garbodor/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/gen_5/garbodor/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_GarbodorGigantamax[] = INCBIN_U8("graphics/pokemon/gen_5/garbodor/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_TRUBBISH #if P_FAMILY_ZORUA - const u32 gMonFrontPic_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/anim_front.4bpp.lz"); - const u32 gMonPalette_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/normal.gbapal.lz"); - const u32 gMonBackPic_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/back.4bpp.lz"); - const u32 gMonShinyPalette_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/shiny.gbapal.lz"); - const u8 gMonIcon_Zorua[] = INCBIN_U8("graphics/pokemon/zorua/icon.4bpp"); + const u32 gMonFrontPic_Zorua[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/anim_front.4bpp.lz"); + const u32 gMonPalette_Zorua[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/normal.gbapal.lz"); + const u32 gMonBackPic_Zorua[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/back.4bpp.lz"); + const u32 gMonShinyPalette_Zorua[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/shiny.gbapal.lz"); + const u8 gMonIcon_Zorua[] = INCBIN_U8("graphics/pokemon/gen_5/zorua/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Zorua[] = INCBIN_U8("graphics/pokemon/zorua/footprint.1bpp"); + const u8 gMonFootprint_Zorua[] = INCBIN_U8("graphics/pokemon/gen_5/zorua/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/anim_front.4bpp.lz"); - const u32 gMonPalette_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/normal.gbapal.lz"); - const u32 gMonBackPic_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/back.4bpp.lz"); - const u32 gMonShinyPalette_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/shiny.gbapal.lz"); - const u8 gMonIcon_Zoroark[] = INCBIN_U8("graphics/pokemon/zoroark/icon.4bpp"); + const u32 gMonFrontPic_Zoroark[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/anim_front.4bpp.lz"); + const u32 gMonPalette_Zoroark[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/normal.gbapal.lz"); + const u32 gMonBackPic_Zoroark[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/back.4bpp.lz"); + const u32 gMonShinyPalette_Zoroark[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/shiny.gbapal.lz"); + const u8 gMonIcon_Zoroark[] = INCBIN_U8("graphics/pokemon/gen_5/zoroark/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Zoroark[] = INCBIN_U8("graphics/pokemon/zoroark/footprint.1bpp"); + const u8 gMonFootprint_Zoroark[] = INCBIN_U8("graphics/pokemon/gen_5/zoroark/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/front.4bpp.lz"); - const u32 gMonPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_ZoruaHisuian[] = INCBIN_U8("graphics/pokemon/zorua/hisuian/icon.4bpp"); + const u32 gMonFrontPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/hisuian/front.4bpp.lz"); + const u32 gMonPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zorua/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_ZoruaHisuian[] = INCBIN_U8("graphics/pokemon/gen_5/zorua/hisuian/icon.4bpp"); - const u32 gMonFrontPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/front.4bpp.lz"); - const u32 gMonPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_ZoroarkHisuian[] = INCBIN_U8("graphics/pokemon/zoroark/hisuian/icon.4bpp"); + const u32 gMonFrontPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/hisuian/front.4bpp.lz"); + const u32 gMonPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/zoroark/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_ZoroarkHisuian[] = INCBIN_U8("graphics/pokemon/gen_5/zoroark/hisuian/icon.4bpp"); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_ZORUA #if P_FAMILY_MINCCINO - const u32 gMonFrontPic_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/anim_front.4bpp.lz"); - const u32 gMonPalette_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/normal.gbapal.lz"); - const u32 gMonBackPic_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/back.4bpp.lz"); - const u32 gMonShinyPalette_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/shiny.gbapal.lz"); - const u8 gMonIcon_Minccino[] = INCBIN_U8("graphics/pokemon/minccino/icon.4bpp"); + const u32 gMonFrontPic_Minccino[] = INCBIN_U32("graphics/pokemon/gen_5/minccino/anim_front.4bpp.lz"); + const u32 gMonPalette_Minccino[] = INCBIN_U32("graphics/pokemon/gen_5/minccino/normal.gbapal.lz"); + const u32 gMonBackPic_Minccino[] = INCBIN_U32("graphics/pokemon/gen_5/minccino/back.4bpp.lz"); + const u32 gMonShinyPalette_Minccino[] = INCBIN_U32("graphics/pokemon/gen_5/minccino/shiny.gbapal.lz"); + const u8 gMonIcon_Minccino[] = INCBIN_U8("graphics/pokemon/gen_5/minccino/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Minccino[] = INCBIN_U8("graphics/pokemon/minccino/footprint.1bpp"); + const u8 gMonFootprint_Minccino[] = INCBIN_U8("graphics/pokemon/gen_5/minccino/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/anim_front.4bpp.lz"); - const u32 gMonPalette_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/normal.gbapal.lz"); - const u32 gMonBackPic_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/back.4bpp.lz"); - const u32 gMonShinyPalette_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/shiny.gbapal.lz"); - const u8 gMonIcon_Cinccino[] = INCBIN_U8("graphics/pokemon/cinccino/icon.4bpp"); + const u32 gMonFrontPic_Cinccino[] = INCBIN_U32("graphics/pokemon/gen_5/cinccino/anim_front.4bpp.lz"); + const u32 gMonPalette_Cinccino[] = INCBIN_U32("graphics/pokemon/gen_5/cinccino/normal.gbapal.lz"); + const u32 gMonBackPic_Cinccino[] = INCBIN_U32("graphics/pokemon/gen_5/cinccino/back.4bpp.lz"); + const u32 gMonShinyPalette_Cinccino[] = INCBIN_U32("graphics/pokemon/gen_5/cinccino/shiny.gbapal.lz"); + const u8 gMonIcon_Cinccino[] = INCBIN_U8("graphics/pokemon/gen_5/cinccino/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cinccino[] = INCBIN_U8("graphics/pokemon/cinccino/footprint.1bpp"); + const u8 gMonFootprint_Cinccino[] = INCBIN_U8("graphics/pokemon/gen_5/cinccino/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MINCCINO #if P_FAMILY_GOTHITA - const u32 gMonFrontPic_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/anim_front.4bpp.lz"); - const u32 gMonPalette_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/normal.gbapal.lz"); - const u32 gMonBackPic_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/back.4bpp.lz"); - const u32 gMonShinyPalette_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/shiny.gbapal.lz"); - const u8 gMonIcon_Gothita[] = INCBIN_U8("graphics/pokemon/gothita/icon.4bpp"); + const u32 gMonFrontPic_Gothita[] = INCBIN_U32("graphics/pokemon/gen_5/gothita/anim_front.4bpp.lz"); + const u32 gMonPalette_Gothita[] = INCBIN_U32("graphics/pokemon/gen_5/gothita/normal.gbapal.lz"); + const u32 gMonBackPic_Gothita[] = INCBIN_U32("graphics/pokemon/gen_5/gothita/back.4bpp.lz"); + const u32 gMonShinyPalette_Gothita[] = INCBIN_U32("graphics/pokemon/gen_5/gothita/shiny.gbapal.lz"); + const u8 gMonIcon_Gothita[] = INCBIN_U8("graphics/pokemon/gen_5/gothita/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gothita[] = INCBIN_U8("graphics/pokemon/gothita/footprint.1bpp"); + const u8 gMonFootprint_Gothita[] = INCBIN_U8("graphics/pokemon/gen_5/gothita/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/anim_front.4bpp.lz"); - const u32 gMonPalette_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/normal.gbapal.lz"); - const u32 gMonBackPic_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/back.4bpp.lz"); - const u32 gMonShinyPalette_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/shiny.gbapal.lz"); - const u8 gMonIcon_Gothorita[] = INCBIN_U8("graphics/pokemon/gothorita/icon.4bpp"); + const u32 gMonFrontPic_Gothorita[] = INCBIN_U32("graphics/pokemon/gen_5/gothorita/anim_front.4bpp.lz"); + const u32 gMonPalette_Gothorita[] = INCBIN_U32("graphics/pokemon/gen_5/gothorita/normal.gbapal.lz"); + const u32 gMonBackPic_Gothorita[] = INCBIN_U32("graphics/pokemon/gen_5/gothorita/back.4bpp.lz"); + const u32 gMonShinyPalette_Gothorita[] = INCBIN_U32("graphics/pokemon/gen_5/gothorita/shiny.gbapal.lz"); + const u8 gMonIcon_Gothorita[] = INCBIN_U8("graphics/pokemon/gen_5/gothorita/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gothorita[] = INCBIN_U8("graphics/pokemon/gothorita/footprint.1bpp"); + const u8 gMonFootprint_Gothorita[] = INCBIN_U8("graphics/pokemon/gen_5/gothorita/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/anim_front.4bpp.lz"); - const u32 gMonPalette_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/normal.gbapal.lz"); - const u32 gMonBackPic_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/back.4bpp.lz"); - const u32 gMonShinyPalette_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/shiny.gbapal.lz"); - const u8 gMonIcon_Gothitelle[] = INCBIN_U8("graphics/pokemon/gothitelle/icon.4bpp"); + const u32 gMonFrontPic_Gothitelle[] = INCBIN_U32("graphics/pokemon/gen_5/gothitelle/anim_front.4bpp.lz"); + const u32 gMonPalette_Gothitelle[] = INCBIN_U32("graphics/pokemon/gen_5/gothitelle/normal.gbapal.lz"); + const u32 gMonBackPic_Gothitelle[] = INCBIN_U32("graphics/pokemon/gen_5/gothitelle/back.4bpp.lz"); + const u32 gMonShinyPalette_Gothitelle[] = INCBIN_U32("graphics/pokemon/gen_5/gothitelle/shiny.gbapal.lz"); + const u8 gMonIcon_Gothitelle[] = INCBIN_U8("graphics/pokemon/gen_5/gothitelle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gothitelle[] = INCBIN_U8("graphics/pokemon/gothitelle/footprint.1bpp"); + const u8 gMonFootprint_Gothitelle[] = INCBIN_U8("graphics/pokemon/gen_5/gothitelle/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_GOTHITA #if P_FAMILY_SOLOSIS - const u32 gMonFrontPic_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/anim_front.4bpp.lz"); - const u32 gMonPalette_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/normal.gbapal.lz"); - const u32 gMonBackPic_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/back.4bpp.lz"); - const u32 gMonShinyPalette_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/shiny.gbapal.lz"); - const u8 gMonIcon_Solosis[] = INCBIN_U8("graphics/pokemon/solosis/icon.4bpp"); + const u32 gMonFrontPic_Solosis[] = INCBIN_U32("graphics/pokemon/gen_5/solosis/anim_front.4bpp.lz"); + const u32 gMonPalette_Solosis[] = INCBIN_U32("graphics/pokemon/gen_5/solosis/normal.gbapal.lz"); + const u32 gMonBackPic_Solosis[] = INCBIN_U32("graphics/pokemon/gen_5/solosis/back.4bpp.lz"); + const u32 gMonShinyPalette_Solosis[] = INCBIN_U32("graphics/pokemon/gen_5/solosis/shiny.gbapal.lz"); + const u8 gMonIcon_Solosis[] = INCBIN_U8("graphics/pokemon/gen_5/solosis/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Solosis[] = INCBIN_U8("graphics/pokemon/solosis/footprint.1bpp"); + const u8 gMonFootprint_Solosis[] = INCBIN_U8("graphics/pokemon/gen_5/solosis/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/anim_front.4bpp.lz"); - const u32 gMonPalette_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/normal.gbapal.lz"); - const u32 gMonBackPic_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/back.4bpp.lz"); - const u32 gMonShinyPalette_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/shiny.gbapal.lz"); - const u8 gMonIcon_Duosion[] = INCBIN_U8("graphics/pokemon/duosion/icon.4bpp"); + const u32 gMonFrontPic_Duosion[] = INCBIN_U32("graphics/pokemon/gen_5/duosion/anim_front.4bpp.lz"); + const u32 gMonPalette_Duosion[] = INCBIN_U32("graphics/pokemon/gen_5/duosion/normal.gbapal.lz"); + const u32 gMonBackPic_Duosion[] = INCBIN_U32("graphics/pokemon/gen_5/duosion/back.4bpp.lz"); + const u32 gMonShinyPalette_Duosion[] = INCBIN_U32("graphics/pokemon/gen_5/duosion/shiny.gbapal.lz"); + const u8 gMonIcon_Duosion[] = INCBIN_U8("graphics/pokemon/gen_5/duosion/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Duosion[] = INCBIN_U8("graphics/pokemon/duosion/footprint.1bpp"); + const u8 gMonFootprint_Duosion[] = INCBIN_U8("graphics/pokemon/gen_5/duosion/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/anim_front.4bpp.lz"); - const u32 gMonPalette_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/normal.gbapal.lz"); - const u32 gMonBackPic_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/back.4bpp.lz"); - const u32 gMonShinyPalette_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/shiny.gbapal.lz"); - const u8 gMonIcon_Reuniclus[] = INCBIN_U8("graphics/pokemon/reuniclus/icon.4bpp"); + const u32 gMonFrontPic_Reuniclus[] = INCBIN_U32("graphics/pokemon/gen_5/reuniclus/anim_front.4bpp.lz"); + const u32 gMonPalette_Reuniclus[] = INCBIN_U32("graphics/pokemon/gen_5/reuniclus/normal.gbapal.lz"); + const u32 gMonBackPic_Reuniclus[] = INCBIN_U32("graphics/pokemon/gen_5/reuniclus/back.4bpp.lz"); + const u32 gMonShinyPalette_Reuniclus[] = INCBIN_U32("graphics/pokemon/gen_5/reuniclus/shiny.gbapal.lz"); + const u8 gMonIcon_Reuniclus[] = INCBIN_U8("graphics/pokemon/gen_5/reuniclus/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Reuniclus[] = INCBIN_U8("graphics/pokemon/reuniclus/footprint.1bpp"); + const u8 gMonFootprint_Reuniclus[] = INCBIN_U8("graphics/pokemon/gen_5/reuniclus/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SOLOSIS #if P_FAMILY_DUCKLETT - const u32 gMonFrontPic_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/anim_front.4bpp.lz"); - const u32 gMonPalette_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/normal.gbapal.lz"); - const u32 gMonBackPic_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/back.4bpp.lz"); - const u32 gMonShinyPalette_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/shiny.gbapal.lz"); - const u8 gMonIcon_Ducklett[] = INCBIN_U8("graphics/pokemon/ducklett/icon.4bpp"); + const u32 gMonFrontPic_Ducklett[] = INCBIN_U32("graphics/pokemon/gen_5/ducklett/anim_front.4bpp.lz"); + const u32 gMonPalette_Ducklett[] = INCBIN_U32("graphics/pokemon/gen_5/ducklett/normal.gbapal.lz"); + const u32 gMonBackPic_Ducklett[] = INCBIN_U32("graphics/pokemon/gen_5/ducklett/back.4bpp.lz"); + const u32 gMonShinyPalette_Ducklett[] = INCBIN_U32("graphics/pokemon/gen_5/ducklett/shiny.gbapal.lz"); + const u8 gMonIcon_Ducklett[] = INCBIN_U8("graphics/pokemon/gen_5/ducklett/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ducklett[] = INCBIN_U8("graphics/pokemon/ducklett/footprint.1bpp"); + const u8 gMonFootprint_Ducklett[] = INCBIN_U8("graphics/pokemon/gen_5/ducklett/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/anim_front.4bpp.lz"); - const u32 gMonPalette_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/normal.gbapal.lz"); - const u32 gMonBackPic_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/back.4bpp.lz"); - const u32 gMonShinyPalette_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/shiny.gbapal.lz"); - const u8 gMonIcon_Swanna[] = INCBIN_U8("graphics/pokemon/swanna/icon.4bpp"); + const u32 gMonFrontPic_Swanna[] = INCBIN_U32("graphics/pokemon/gen_5/swanna/anim_front.4bpp.lz"); + const u32 gMonPalette_Swanna[] = INCBIN_U32("graphics/pokemon/gen_5/swanna/normal.gbapal.lz"); + const u32 gMonBackPic_Swanna[] = INCBIN_U32("graphics/pokemon/gen_5/swanna/back.4bpp.lz"); + const u32 gMonShinyPalette_Swanna[] = INCBIN_U32("graphics/pokemon/gen_5/swanna/shiny.gbapal.lz"); + const u8 gMonIcon_Swanna[] = INCBIN_U8("graphics/pokemon/gen_5/swanna/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Swanna[] = INCBIN_U8("graphics/pokemon/swanna/footprint.1bpp"); + const u8 gMonFootprint_Swanna[] = INCBIN_U8("graphics/pokemon/gen_5/swanna/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DUCKLETT #if P_FAMILY_VANILLITE - const u32 gMonFrontPic_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/anim_front.4bpp.lz"); - const u32 gMonPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/normal.gbapal.lz"); - const u32 gMonBackPic_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/back.4bpp.lz"); - const u32 gMonShinyPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/shiny.gbapal.lz"); - const u8 gMonIcon_Vanillite[] = INCBIN_U8("graphics/pokemon/vanillite/icon.4bpp"); + const u32 gMonFrontPic_Vanillite[] = INCBIN_U32("graphics/pokemon/gen_5/vanillite/anim_front.4bpp.lz"); + const u32 gMonPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/gen_5/vanillite/normal.gbapal.lz"); + const u32 gMonBackPic_Vanillite[] = INCBIN_U32("graphics/pokemon/gen_5/vanillite/back.4bpp.lz"); + const u32 gMonShinyPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/gen_5/vanillite/shiny.gbapal.lz"); + const u8 gMonIcon_Vanillite[] = INCBIN_U8("graphics/pokemon/gen_5/vanillite/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Vanillite[] = INCBIN_U8("graphics/pokemon/vanillite/footprint.1bpp"); + const u8 gMonFootprint_Vanillite[] = INCBIN_U8("graphics/pokemon/gen_5/vanillite/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/anim_front.4bpp.lz"); - const u32 gMonPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/normal.gbapal.lz"); - const u32 gMonBackPic_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/back.4bpp.lz"); - const u32 gMonShinyPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/shiny.gbapal.lz"); - const u8 gMonIcon_Vanillish[] = INCBIN_U8("graphics/pokemon/vanillish/icon.4bpp"); + const u32 gMonFrontPic_Vanillish[] = INCBIN_U32("graphics/pokemon/gen_5/vanillish/anim_front.4bpp.lz"); + const u32 gMonPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/gen_5/vanillish/normal.gbapal.lz"); + const u32 gMonBackPic_Vanillish[] = INCBIN_U32("graphics/pokemon/gen_5/vanillish/back.4bpp.lz"); + const u32 gMonShinyPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/gen_5/vanillish/shiny.gbapal.lz"); + const u8 gMonIcon_Vanillish[] = INCBIN_U8("graphics/pokemon/gen_5/vanillish/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Vanillish[] = INCBIN_U8("graphics/pokemon/vanillish/footprint.1bpp"); + const u8 gMonFootprint_Vanillish[] = INCBIN_U8("graphics/pokemon/gen_5/vanillish/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/anim_front.4bpp.lz"); - const u32 gMonPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/normal.gbapal.lz"); - const u32 gMonBackPic_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/back.4bpp.lz"); - const u32 gMonShinyPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/shiny.gbapal.lz"); - const u8 gMonIcon_Vanilluxe[] = INCBIN_U8("graphics/pokemon/vanilluxe/icon.4bpp"); + const u32 gMonFrontPic_Vanilluxe[] = INCBIN_U32("graphics/pokemon/gen_5/vanilluxe/anim_front.4bpp.lz"); + const u32 gMonPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/gen_5/vanilluxe/normal.gbapal.lz"); + const u32 gMonBackPic_Vanilluxe[] = INCBIN_U32("graphics/pokemon/gen_5/vanilluxe/back.4bpp.lz"); + const u32 gMonShinyPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/gen_5/vanilluxe/shiny.gbapal.lz"); + const u8 gMonIcon_Vanilluxe[] = INCBIN_U8("graphics/pokemon/gen_5/vanilluxe/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Vanilluxe[] = INCBIN_U8("graphics/pokemon/vanilluxe/footprint.1bpp"); + const u8 gMonFootprint_Vanilluxe[] = INCBIN_U8("graphics/pokemon/gen_5/vanilluxe/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_VANILLITE #if P_FAMILY_DEERLING - const u32 gMonFrontPic_Deerling[] = INCBIN_U32("graphics/pokemon/deerling/anim_front.4bpp.lz"); - const u32 gMonBackPic_Deerling[] = INCBIN_U32("graphics/pokemon/deerling/back.4bpp.lz"); + const u32 gMonFrontPic_Deerling[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/anim_front.4bpp.lz"); + const u32 gMonBackPic_Deerling[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/back.4bpp.lz"); #if P_FOOTPRINTS - const u8 gMonFootprint_Deerling[] = INCBIN_U8("graphics/pokemon/deerling/footprint.1bpp"); + const u8 gMonFootprint_Deerling[] = INCBIN_U8("graphics/pokemon/gen_5/deerling/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/deerling/normal.gbapal.lz"); - const u32 gMonShinyPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/deerling/shiny.gbapal.lz"); - const u8 gMonIcon_DeerlingSpring[] = INCBIN_U8("graphics/pokemon/deerling/icon.4bpp"); + const u32 gMonPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/normal.gbapal.lz"); + const u32 gMonShinyPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/shiny.gbapal.lz"); + const u8 gMonIcon_DeerlingSpring[] = INCBIN_U8("graphics/pokemon/gen_5/deerling/icon.4bpp"); - const u32 gMonPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/deerling/summer/normal.gbapal.lz"); - const u32 gMonShinyPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/deerling/summer/shiny.gbapal.lz"); - const u8 gMonIcon_DeerlingSummer[] = INCBIN_U8("graphics/pokemon/deerling/summer/icon.4bpp"); + const u32 gMonPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/summer/normal.gbapal.lz"); + const u32 gMonShinyPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/summer/shiny.gbapal.lz"); + const u8 gMonIcon_DeerlingSummer[] = INCBIN_U8("graphics/pokemon/gen_5/deerling/summer/icon.4bpp"); - const u32 gMonPalette_DeerlingAutumn[] = INCBIN_U32("graphics/pokemon/deerling/autumn/normal.gbapal.lz"); - const u32 gMonShinyPalette_DeerlingAutumn[] = INCBIN_U32("graphics/pokemon/deerling/autumn/shiny.gbapal.lz"); - const u8 gMonIcon_DeerlingAutumn[] = INCBIN_U8("graphics/pokemon/deerling/autumn/icon.4bpp"); + const u32 gMonPalette_DeerlingAutumn[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/autumn/normal.gbapal.lz"); + const u32 gMonShinyPalette_DeerlingAutumn[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/autumn/shiny.gbapal.lz"); + const u8 gMonIcon_DeerlingAutumn[] = INCBIN_U8("graphics/pokemon/gen_5/deerling/autumn/icon.4bpp"); - const u32 gMonPalette_DeerlingWinter[] = INCBIN_U32("graphics/pokemon/deerling/winter/normal.gbapal.lz"); - const u32 gMonShinyPalette_DeerlingWinter[] = INCBIN_U32("graphics/pokemon/deerling/winter/shiny.gbapal.lz"); - const u8 gMonIcon_DeerlingWinter[] = INCBIN_U8("graphics/pokemon/deerling/winter/icon.4bpp"); + const u32 gMonPalette_DeerlingWinter[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/winter/normal.gbapal.lz"); + const u32 gMonShinyPalette_DeerlingWinter[] = INCBIN_U32("graphics/pokemon/gen_5/deerling/winter/shiny.gbapal.lz"); + const u8 gMonIcon_DeerlingWinter[] = INCBIN_U8("graphics/pokemon/gen_5/deerling/winter/icon.4bpp"); - const u32 gMonFrontPic_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/anim_front.4bpp.lz"); - const u32 gMonPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/normal.gbapal.lz"); - const u32 gMonBackPic_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/back.4bpp.lz"); - const u32 gMonShinyPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/shiny.gbapal.lz"); - const u8 gMonIcon_SawsbuckSpring[] = INCBIN_U8("graphics/pokemon/sawsbuck/icon.4bpp"); + const u32 gMonFrontPic_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/anim_front.4bpp.lz"); + const u32 gMonPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/normal.gbapal.lz"); + const u32 gMonBackPic_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/back.4bpp.lz"); + const u32 gMonShinyPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/shiny.gbapal.lz"); + const u8 gMonIcon_SawsbuckSpring[] = INCBIN_U8("graphics/pokemon/gen_5/sawsbuck/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sawsbuck[] = INCBIN_U8("graphics/pokemon/sawsbuck/footprint.1bpp"); + const u8 gMonFootprint_Sawsbuck[] = INCBIN_U8("graphics/pokemon/gen_5/sawsbuck/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/front.4bpp.lz"); - const u32 gMonPalette_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/normal.gbapal.lz"); - const u32 gMonBackPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/back.4bpp.lz"); - const u32 gMonShinyPalette_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/shiny.gbapal.lz"); - const u8 gMonIcon_SawsbuckSummer[] = INCBIN_U8("graphics/pokemon/sawsbuck/summer/icon.4bpp"); + const u32 gMonFrontPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/summer/front.4bpp.lz"); + const u32 gMonPalette_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/summer/normal.gbapal.lz"); + const u32 gMonBackPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/summer/back.4bpp.lz"); + const u32 gMonShinyPalette_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/summer/shiny.gbapal.lz"); + const u8 gMonIcon_SawsbuckSummer[] = INCBIN_U8("graphics/pokemon/gen_5/sawsbuck/summer/icon.4bpp"); - const u32 gMonFrontPic_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/sawsbuck/autumn/front.4bpp.lz"); - const u32 gMonPalette_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/sawsbuck/autumn/normal.gbapal.lz"); - const u32 gMonBackPic_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/sawsbuck/autumn/back.4bpp.lz"); - const u32 gMonShinyPalette_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/sawsbuck/autumn/shiny.gbapal.lz"); - const u8 gMonIcon_SawsbuckAutumn[] = INCBIN_U8("graphics/pokemon/sawsbuck/autumn/icon.4bpp"); + const u32 gMonFrontPic_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/autumn/front.4bpp.lz"); + const u32 gMonPalette_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/autumn/normal.gbapal.lz"); + const u32 gMonBackPic_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/autumn/back.4bpp.lz"); + const u32 gMonShinyPalette_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/autumn/shiny.gbapal.lz"); + const u8 gMonIcon_SawsbuckAutumn[] = INCBIN_U8("graphics/pokemon/gen_5/sawsbuck/autumn/icon.4bpp"); - const u32 gMonFrontPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/winter/front.4bpp.lz"); - const u32 gMonPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/winter/normal.gbapal.lz"); - const u32 gMonBackPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/winter/back.4bpp.lz"); - const u32 gMonShinyPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/winter/shiny.gbapal.lz"); - const u8 gMonIcon_SawsbuckWinter[] = INCBIN_U8("graphics/pokemon/sawsbuck/winter/icon.4bpp"); + const u32 gMonFrontPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/winter/front.4bpp.lz"); + const u32 gMonPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/winter/normal.gbapal.lz"); + const u32 gMonBackPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/winter/back.4bpp.lz"); + const u32 gMonShinyPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/gen_5/sawsbuck/winter/shiny.gbapal.lz"); + const u8 gMonIcon_SawsbuckWinter[] = INCBIN_U8("graphics/pokemon/gen_5/sawsbuck/winter/icon.4bpp"); #endif //P_FAMILY_DEERLING #if P_FAMILY_EMOLGA - const u32 gMonFrontPic_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/anim_front.4bpp.lz"); - const u32 gMonPalette_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/normal.gbapal.lz"); - const u32 gMonBackPic_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/back.4bpp.lz"); - const u32 gMonShinyPalette_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/shiny.gbapal.lz"); - const u8 gMonIcon_Emolga[] = INCBIN_U8("graphics/pokemon/emolga/icon.4bpp"); + const u32 gMonFrontPic_Emolga[] = INCBIN_U32("graphics/pokemon/gen_5/emolga/anim_front.4bpp.lz"); + const u32 gMonPalette_Emolga[] = INCBIN_U32("graphics/pokemon/gen_5/emolga/normal.gbapal.lz"); + const u32 gMonBackPic_Emolga[] = INCBIN_U32("graphics/pokemon/gen_5/emolga/back.4bpp.lz"); + const u32 gMonShinyPalette_Emolga[] = INCBIN_U32("graphics/pokemon/gen_5/emolga/shiny.gbapal.lz"); + const u8 gMonIcon_Emolga[] = INCBIN_U8("graphics/pokemon/gen_5/emolga/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Emolga[] = INCBIN_U8("graphics/pokemon/emolga/footprint.1bpp"); + const u8 gMonFootprint_Emolga[] = INCBIN_U8("graphics/pokemon/gen_5/emolga/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_EMOLGA #if P_FAMILY_KARRABLAST - const u32 gMonFrontPic_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/anim_front.4bpp.lz"); - const u32 gMonPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/normal.gbapal.lz"); - const u32 gMonBackPic_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/back.4bpp.lz"); - const u32 gMonShinyPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/shiny.gbapal.lz"); - const u8 gMonIcon_Karrablast[] = INCBIN_U8("graphics/pokemon/karrablast/icon.4bpp"); + const u32 gMonFrontPic_Karrablast[] = INCBIN_U32("graphics/pokemon/gen_5/karrablast/anim_front.4bpp.lz"); + const u32 gMonPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/gen_5/karrablast/normal.gbapal.lz"); + const u32 gMonBackPic_Karrablast[] = INCBIN_U32("graphics/pokemon/gen_5/karrablast/back.4bpp.lz"); + const u32 gMonShinyPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/gen_5/karrablast/shiny.gbapal.lz"); + const u8 gMonIcon_Karrablast[] = INCBIN_U8("graphics/pokemon/gen_5/karrablast/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Karrablast[] = INCBIN_U8("graphics/pokemon/karrablast/footprint.1bpp"); + const u8 gMonFootprint_Karrablast[] = INCBIN_U8("graphics/pokemon/gen_5/karrablast/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/anim_front.4bpp.lz"); - const u32 gMonPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/normal.gbapal.lz"); - const u32 gMonBackPic_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/back.4bpp.lz"); - const u32 gMonShinyPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/shiny.gbapal.lz"); - const u8 gMonIcon_Escavalier[] = INCBIN_U8("graphics/pokemon/escavalier/icon.4bpp"); + const u32 gMonFrontPic_Escavalier[] = INCBIN_U32("graphics/pokemon/gen_5/escavalier/anim_front.4bpp.lz"); + const u32 gMonPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/gen_5/escavalier/normal.gbapal.lz"); + const u32 gMonBackPic_Escavalier[] = INCBIN_U32("graphics/pokemon/gen_5/escavalier/back.4bpp.lz"); + const u32 gMonShinyPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/gen_5/escavalier/shiny.gbapal.lz"); + const u8 gMonIcon_Escavalier[] = INCBIN_U8("graphics/pokemon/gen_5/escavalier/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Escavalier[] = INCBIN_U8("graphics/pokemon/escavalier/footprint.1bpp"); + const u8 gMonFootprint_Escavalier[] = INCBIN_U8("graphics/pokemon/gen_5/escavalier/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_KARRABLAST #if P_FAMILY_FOONGUS - const u32 gMonFrontPic_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/anim_front.4bpp.lz"); - const u32 gMonPalette_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/normal.gbapal.lz"); - const u32 gMonBackPic_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/back.4bpp.lz"); - const u32 gMonShinyPalette_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/shiny.gbapal.lz"); - const u8 gMonIcon_Foongus[] = INCBIN_U8("graphics/pokemon/foongus/icon.4bpp"); + const u32 gMonFrontPic_Foongus[] = INCBIN_U32("graphics/pokemon/gen_5/foongus/anim_front.4bpp.lz"); + const u32 gMonPalette_Foongus[] = INCBIN_U32("graphics/pokemon/gen_5/foongus/normal.gbapal.lz"); + const u32 gMonBackPic_Foongus[] = INCBIN_U32("graphics/pokemon/gen_5/foongus/back.4bpp.lz"); + const u32 gMonShinyPalette_Foongus[] = INCBIN_U32("graphics/pokemon/gen_5/foongus/shiny.gbapal.lz"); + const u8 gMonIcon_Foongus[] = INCBIN_U8("graphics/pokemon/gen_5/foongus/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Foongus[] = INCBIN_U8("graphics/pokemon/foongus/footprint.1bpp"); + const u8 gMonFootprint_Foongus[] = INCBIN_U8("graphics/pokemon/gen_5/foongus/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/anim_front.4bpp.lz"); - const u32 gMonPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/normal.gbapal.lz"); - const u32 gMonBackPic_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/back.4bpp.lz"); - const u32 gMonShinyPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/shiny.gbapal.lz"); - const u8 gMonIcon_Amoonguss[] = INCBIN_U8("graphics/pokemon/amoonguss/icon.4bpp"); + const u32 gMonFrontPic_Amoonguss[] = INCBIN_U32("graphics/pokemon/gen_5/amoonguss/anim_front.4bpp.lz"); + const u32 gMonPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/gen_5/amoonguss/normal.gbapal.lz"); + const u32 gMonBackPic_Amoonguss[] = INCBIN_U32("graphics/pokemon/gen_5/amoonguss/back.4bpp.lz"); + const u32 gMonShinyPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/gen_5/amoonguss/shiny.gbapal.lz"); + const u8 gMonIcon_Amoonguss[] = INCBIN_U8("graphics/pokemon/gen_5/amoonguss/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Amoonguss[] = INCBIN_U8("graphics/pokemon/amoonguss/footprint.1bpp"); + const u8 gMonFootprint_Amoonguss[] = INCBIN_U8("graphics/pokemon/gen_5/amoonguss/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_FOONGUS #if P_FAMILY_FRILLISH - const u32 gMonFrontPic_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/anim_front.4bpp.lz"); - const u32 gMonPalette_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/normal.gbapal.lz"); - const u32 gMonBackPic_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/back.4bpp.lz"); - const u32 gMonShinyPalette_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/shiny.gbapal.lz"); - const u8 gMonIcon_Frillish[] = INCBIN_U8("graphics/pokemon/frillish/icon.4bpp"); + const u32 gMonFrontPic_Frillish[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/anim_front.4bpp.lz"); + const u32 gMonPalette_Frillish[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/normal.gbapal.lz"); + const u32 gMonBackPic_Frillish[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/back.4bpp.lz"); + const u32 gMonShinyPalette_Frillish[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/shiny.gbapal.lz"); + const u8 gMonIcon_Frillish[] = INCBIN_U8("graphics/pokemon/gen_5/frillish/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Frillish[] = INCBIN_U8("graphics/pokemon/frillish/footprint.1bpp"); + const u8 gMonFootprint_Frillish[] = INCBIN_U8("graphics/pokemon/gen_5/frillish/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/anim_frontf.4bpp.lz"); - const u32 gMonPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/normalf.gbapal.lz"); - const u32 gMonBackPic_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/backf.4bpp.lz"); - const u32 gMonShinyPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/shinyf.gbapal.lz"); - const u8 gMonIcon_FrillishF[] = INCBIN_U8("graphics/pokemon/frillish/iconf.4bpp"); + const u32 gMonFrontPic_FrillishF[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/anim_frontf.4bpp.lz"); + const u32 gMonPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/normalf.gbapal.lz"); + const u32 gMonBackPic_FrillishF[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/backf.4bpp.lz"); + const u32 gMonShinyPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/gen_5/frillish/shinyf.gbapal.lz"); + const u8 gMonIcon_FrillishF[] = INCBIN_U8("graphics/pokemon/gen_5/frillish/iconf.4bpp"); - const u32 gMonFrontPic_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/anim_front.4bpp.lz"); - const u32 gMonPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/normal.gbapal.lz"); - const u32 gMonBackPic_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/back.4bpp.lz"); - const u32 gMonShinyPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/shiny.gbapal.lz"); - const u8 gMonIcon_Jellicent[] = INCBIN_U8("graphics/pokemon/jellicent/icon.4bpp"); + const u32 gMonFrontPic_Jellicent[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/anim_front.4bpp.lz"); + const u32 gMonPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/normal.gbapal.lz"); + const u32 gMonBackPic_Jellicent[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/back.4bpp.lz"); + const u32 gMonShinyPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/shiny.gbapal.lz"); + const u8 gMonIcon_Jellicent[] = INCBIN_U8("graphics/pokemon/gen_5/jellicent/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Jellicent[] = INCBIN_U8("graphics/pokemon/jellicent/footprint.1bpp"); + const u8 gMonFootprint_Jellicent[] = INCBIN_U8("graphics/pokemon/gen_5/jellicent/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/anim_frontf.4bpp.lz"); - const u32 gMonPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/normalf.gbapal.lz"); - const u32 gMonBackPic_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/backf.4bpp.lz"); - const u32 gMonShinyPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/shinyf.gbapal.lz"); - const u8 gMonIcon_JellicentF[] = INCBIN_U8("graphics/pokemon/jellicent/iconf.4bpp"); + const u32 gMonFrontPic_JellicentF[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/anim_frontf.4bpp.lz"); + const u32 gMonPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/normalf.gbapal.lz"); + const u32 gMonBackPic_JellicentF[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/backf.4bpp.lz"); + const u32 gMonShinyPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/gen_5/jellicent/shinyf.gbapal.lz"); + const u8 gMonIcon_JellicentF[] = INCBIN_U8("graphics/pokemon/gen_5/jellicent/iconf.4bpp"); #endif //P_FAMILY_FRILLISH #if P_FAMILY_ALOMOMOLA - const u32 gMonFrontPic_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/anim_front.4bpp.lz"); - const u32 gMonPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/normal.gbapal.lz"); - const u32 gMonBackPic_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/back.4bpp.lz"); - const u32 gMonShinyPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/shiny.gbapal.lz"); - const u8 gMonIcon_Alomomola[] = INCBIN_U8("graphics/pokemon/alomomola/icon.4bpp"); + const u32 gMonFrontPic_Alomomola[] = INCBIN_U32("graphics/pokemon/gen_5/alomomola/anim_front.4bpp.lz"); + const u32 gMonPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/gen_5/alomomola/normal.gbapal.lz"); + const u32 gMonBackPic_Alomomola[] = INCBIN_U32("graphics/pokemon/gen_5/alomomola/back.4bpp.lz"); + const u32 gMonShinyPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/gen_5/alomomola/shiny.gbapal.lz"); + const u8 gMonIcon_Alomomola[] = INCBIN_U8("graphics/pokemon/gen_5/alomomola/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Alomomola[] = INCBIN_U8("graphics/pokemon/alomomola/footprint.1bpp"); + const u8 gMonFootprint_Alomomola[] = INCBIN_U8("graphics/pokemon/gen_5/alomomola/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ALOMOMOLA #if P_FAMILY_JOLTIK - const u32 gMonFrontPic_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/anim_front.4bpp.lz"); - const u32 gMonPalette_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/normal.gbapal.lz"); - const u32 gMonBackPic_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/back.4bpp.lz"); - const u32 gMonShinyPalette_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/shiny.gbapal.lz"); - const u8 gMonIcon_Joltik[] = INCBIN_U8("graphics/pokemon/joltik/icon.4bpp"); + const u32 gMonFrontPic_Joltik[] = INCBIN_U32("graphics/pokemon/gen_5/joltik/anim_front.4bpp.lz"); + const u32 gMonPalette_Joltik[] = INCBIN_U32("graphics/pokemon/gen_5/joltik/normal.gbapal.lz"); + const u32 gMonBackPic_Joltik[] = INCBIN_U32("graphics/pokemon/gen_5/joltik/back.4bpp.lz"); + const u32 gMonShinyPalette_Joltik[] = INCBIN_U32("graphics/pokemon/gen_5/joltik/shiny.gbapal.lz"); + const u8 gMonIcon_Joltik[] = INCBIN_U8("graphics/pokemon/gen_5/joltik/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Joltik[] = INCBIN_U8("graphics/pokemon/joltik/footprint.1bpp"); + const u8 gMonFootprint_Joltik[] = INCBIN_U8("graphics/pokemon/gen_5/joltik/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/anim_front.4bpp.lz"); - const u32 gMonPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/normal.gbapal.lz"); - const u32 gMonBackPic_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/back.4bpp.lz"); - const u32 gMonShinyPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/shiny.gbapal.lz"); - const u8 gMonIcon_Galvantula[] = INCBIN_U8("graphics/pokemon/galvantula/icon.4bpp"); + const u32 gMonFrontPic_Galvantula[] = INCBIN_U32("graphics/pokemon/gen_5/galvantula/anim_front.4bpp.lz"); + const u32 gMonPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/gen_5/galvantula/normal.gbapal.lz"); + const u32 gMonBackPic_Galvantula[] = INCBIN_U32("graphics/pokemon/gen_5/galvantula/back.4bpp.lz"); + const u32 gMonShinyPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/gen_5/galvantula/shiny.gbapal.lz"); + const u8 gMonIcon_Galvantula[] = INCBIN_U8("graphics/pokemon/gen_5/galvantula/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Galvantula[] = INCBIN_U8("graphics/pokemon/galvantula/footprint.1bpp"); + const u8 gMonFootprint_Galvantula[] = INCBIN_U8("graphics/pokemon/gen_5/galvantula/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_JOLTIK #if P_FAMILY_FERROSEED - const u32 gMonFrontPic_Ferroseed[] = INCBIN_U32("graphics/pokemon/ferroseed/anim_front.4bpp.lz"); - const u32 gMonPalette_Ferroseed[] = INCBIN_U32("graphics/pokemon/ferroseed/normal.gbapal.lz"); - const u32 gMonBackPic_Ferroseed[] = INCBIN_U32("graphics/pokemon/ferroseed/back.4bpp.lz"); - const u32 gMonShinyPalette_Ferroseed[] = INCBIN_U32("graphics/pokemon/ferroseed/shiny.gbapal.lz"); - const u8 gMonIcon_Ferroseed[] = INCBIN_U8("graphics/pokemon/ferroseed/icon.4bpp"); + const u32 gMonFrontPic_Ferroseed[] = INCBIN_U32("graphics/pokemon/gen_5/ferroseed/anim_front.4bpp.lz"); + const u32 gMonPalette_Ferroseed[] = INCBIN_U32("graphics/pokemon/gen_5/ferroseed/normal.gbapal.lz"); + const u32 gMonBackPic_Ferroseed[] = INCBIN_U32("graphics/pokemon/gen_5/ferroseed/back.4bpp.lz"); + const u32 gMonShinyPalette_Ferroseed[] = INCBIN_U32("graphics/pokemon/gen_5/ferroseed/shiny.gbapal.lz"); + const u8 gMonIcon_Ferroseed[] = INCBIN_U8("graphics/pokemon/gen_5/ferroseed/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ferroseed[] = INCBIN_U8("graphics/pokemon/ferroseed/footprint.1bpp"); + const u8 gMonFootprint_Ferroseed[] = INCBIN_U8("graphics/pokemon/gen_5/ferroseed/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/anim_front.4bpp.lz"); - const u32 gMonPalette_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/normal.gbapal.lz"); - const u32 gMonBackPic_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/back.4bpp.lz"); - const u32 gMonShinyPalette_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/shiny.gbapal.lz"); - const u8 gMonIcon_Ferrothorn[] = INCBIN_U8("graphics/pokemon/ferrothorn/icon.4bpp"); + const u32 gMonFrontPic_Ferrothorn[] = INCBIN_U32("graphics/pokemon/gen_5/ferrothorn/anim_front.4bpp.lz"); + const u32 gMonPalette_Ferrothorn[] = INCBIN_U32("graphics/pokemon/gen_5/ferrothorn/normal.gbapal.lz"); + const u32 gMonBackPic_Ferrothorn[] = INCBIN_U32("graphics/pokemon/gen_5/ferrothorn/back.4bpp.lz"); + const u32 gMonShinyPalette_Ferrothorn[] = INCBIN_U32("graphics/pokemon/gen_5/ferrothorn/shiny.gbapal.lz"); + const u8 gMonIcon_Ferrothorn[] = INCBIN_U8("graphics/pokemon/gen_5/ferrothorn/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ferrothorn[] = INCBIN_U8("graphics/pokemon/ferrothorn/footprint.1bpp"); + const u8 gMonFootprint_Ferrothorn[] = INCBIN_U8("graphics/pokemon/gen_5/ferrothorn/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_FERROSEED #if P_FAMILY_KLINK - const u32 gMonFrontPic_Klink[] = INCBIN_U32("graphics/pokemon/klink/anim_front.4bpp.lz"); - const u32 gMonPalette_Klink[] = INCBIN_U32("graphics/pokemon/klink/normal.gbapal.lz"); - const u32 gMonBackPic_Klink[] = INCBIN_U32("graphics/pokemon/klink/back.4bpp.lz"); - const u32 gMonShinyPalette_Klink[] = INCBIN_U32("graphics/pokemon/klink/shiny.gbapal.lz"); - const u8 gMonIcon_Klink[] = INCBIN_U8("graphics/pokemon/klink/icon.4bpp"); + const u32 gMonFrontPic_Klink[] = INCBIN_U32("graphics/pokemon/gen_5/klink/anim_front.4bpp.lz"); + const u32 gMonPalette_Klink[] = INCBIN_U32("graphics/pokemon/gen_5/klink/normal.gbapal.lz"); + const u32 gMonBackPic_Klink[] = INCBIN_U32("graphics/pokemon/gen_5/klink/back.4bpp.lz"); + const u32 gMonShinyPalette_Klink[] = INCBIN_U32("graphics/pokemon/gen_5/klink/shiny.gbapal.lz"); + const u8 gMonIcon_Klink[] = INCBIN_U8("graphics/pokemon/gen_5/klink/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Klink[] = INCBIN_U8("graphics/pokemon/klink/footprint.1bpp"); + const u8 gMonFootprint_Klink[] = INCBIN_U8("graphics/pokemon/gen_5/klink/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Klang[] = INCBIN_U32("graphics/pokemon/klang/anim_front.4bpp.lz"); - const u32 gMonPalette_Klang[] = INCBIN_U32("graphics/pokemon/klang/normal.gbapal.lz"); - const u32 gMonBackPic_Klang[] = INCBIN_U32("graphics/pokemon/klang/back.4bpp.lz"); - const u32 gMonShinyPalette_Klang[] = INCBIN_U32("graphics/pokemon/klang/shiny.gbapal.lz"); - const u8 gMonIcon_Klang[] = INCBIN_U8("graphics/pokemon/klang/icon.4bpp"); + const u32 gMonFrontPic_Klang[] = INCBIN_U32("graphics/pokemon/gen_5/klang/anim_front.4bpp.lz"); + const u32 gMonPalette_Klang[] = INCBIN_U32("graphics/pokemon/gen_5/klang/normal.gbapal.lz"); + const u32 gMonBackPic_Klang[] = INCBIN_U32("graphics/pokemon/gen_5/klang/back.4bpp.lz"); + const u32 gMonShinyPalette_Klang[] = INCBIN_U32("graphics/pokemon/gen_5/klang/shiny.gbapal.lz"); + const u8 gMonIcon_Klang[] = INCBIN_U8("graphics/pokemon/gen_5/klang/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Klang[] = INCBIN_U8("graphics/pokemon/klang/footprint.1bpp"); + const u8 gMonFootprint_Klang[] = INCBIN_U8("graphics/pokemon/gen_5/klang/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/anim_front.4bpp.lz"); - const u32 gMonPalette_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/normal.gbapal.lz"); - const u32 gMonBackPic_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/back.4bpp.lz"); - const u32 gMonShinyPalette_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/shiny.gbapal.lz"); - const u8 gMonIcon_Klinklang[] = INCBIN_U8("graphics/pokemon/klinklang/icon.4bpp"); + const u32 gMonFrontPic_Klinklang[] = INCBIN_U32("graphics/pokemon/gen_5/klinklang/anim_front.4bpp.lz"); + const u32 gMonPalette_Klinklang[] = INCBIN_U32("graphics/pokemon/gen_5/klinklang/normal.gbapal.lz"); + const u32 gMonBackPic_Klinklang[] = INCBIN_U32("graphics/pokemon/gen_5/klinklang/back.4bpp.lz"); + const u32 gMonShinyPalette_Klinklang[] = INCBIN_U32("graphics/pokemon/gen_5/klinklang/shiny.gbapal.lz"); + const u8 gMonIcon_Klinklang[] = INCBIN_U8("graphics/pokemon/gen_5/klinklang/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Klinklang[] = INCBIN_U8("graphics/pokemon/klinklang/footprint.1bpp"); + const u8 gMonFootprint_Klinklang[] = INCBIN_U8("graphics/pokemon/gen_5/klinklang/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_KLINK #if P_FAMILY_TYNAMO - const u32 gMonFrontPic_Tynamo[] = INCBIN_U32("graphics/pokemon/tynamo/anim_front.4bpp.lz"); - const u32 gMonPalette_Tynamo[] = INCBIN_U32("graphics/pokemon/tynamo/normal.gbapal.lz"); - const u32 gMonBackPic_Tynamo[] = INCBIN_U32("graphics/pokemon/tynamo/back.4bpp.lz"); - const u32 gMonShinyPalette_Tynamo[] = INCBIN_U32("graphics/pokemon/tynamo/shiny.gbapal.lz"); - const u8 gMonIcon_Tynamo[] = INCBIN_U8("graphics/pokemon/tynamo/icon.4bpp"); + const u32 gMonFrontPic_Tynamo[] = INCBIN_U32("graphics/pokemon/gen_5/tynamo/anim_front.4bpp.lz"); + const u32 gMonPalette_Tynamo[] = INCBIN_U32("graphics/pokemon/gen_5/tynamo/normal.gbapal.lz"); + const u32 gMonBackPic_Tynamo[] = INCBIN_U32("graphics/pokemon/gen_5/tynamo/back.4bpp.lz"); + const u32 gMonShinyPalette_Tynamo[] = INCBIN_U32("graphics/pokemon/gen_5/tynamo/shiny.gbapal.lz"); + const u8 gMonIcon_Tynamo[] = INCBIN_U8("graphics/pokemon/gen_5/tynamo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tynamo[] = INCBIN_U8("graphics/pokemon/tynamo/footprint.1bpp"); + const u8 gMonFootprint_Tynamo[] = INCBIN_U8("graphics/pokemon/gen_5/tynamo/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/anim_front.4bpp.lz"); - const u32 gMonPalette_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/normal.gbapal.lz"); - const u32 gMonBackPic_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/back.4bpp.lz"); - const u32 gMonShinyPalette_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/shiny.gbapal.lz"); - const u8 gMonIcon_Eelektrik[] = INCBIN_U8("graphics/pokemon/eelektrik/icon.4bpp"); + const u32 gMonFrontPic_Eelektrik[] = INCBIN_U32("graphics/pokemon/gen_5/eelektrik/anim_front.4bpp.lz"); + const u32 gMonPalette_Eelektrik[] = INCBIN_U32("graphics/pokemon/gen_5/eelektrik/normal.gbapal.lz"); + const u32 gMonBackPic_Eelektrik[] = INCBIN_U32("graphics/pokemon/gen_5/eelektrik/back.4bpp.lz"); + const u32 gMonShinyPalette_Eelektrik[] = INCBIN_U32("graphics/pokemon/gen_5/eelektrik/shiny.gbapal.lz"); + const u8 gMonIcon_Eelektrik[] = INCBIN_U8("graphics/pokemon/gen_5/eelektrik/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Eelektrik[] = INCBIN_U8("graphics/pokemon/eelektrik/footprint.1bpp"); + const u8 gMonFootprint_Eelektrik[] = INCBIN_U8("graphics/pokemon/gen_5/eelektrik/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/anim_front.4bpp.lz"); - const u32 gMonPalette_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/normal.gbapal.lz"); - const u32 gMonBackPic_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/back.4bpp.lz"); - const u32 gMonShinyPalette_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/shiny.gbapal.lz"); - const u8 gMonIcon_Eelektross[] = INCBIN_U8("graphics/pokemon/eelektross/icon.4bpp"); + const u32 gMonFrontPic_Eelektross[] = INCBIN_U32("graphics/pokemon/gen_5/eelektross/anim_front.4bpp.lz"); + const u32 gMonPalette_Eelektross[] = INCBIN_U32("graphics/pokemon/gen_5/eelektross/normal.gbapal.lz"); + const u32 gMonBackPic_Eelektross[] = INCBIN_U32("graphics/pokemon/gen_5/eelektross/back.4bpp.lz"); + const u32 gMonShinyPalette_Eelektross[] = INCBIN_U32("graphics/pokemon/gen_5/eelektross/shiny.gbapal.lz"); + const u8 gMonIcon_Eelektross[] = INCBIN_U8("graphics/pokemon/gen_5/eelektross/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Eelektross[] = INCBIN_U8("graphics/pokemon/eelektross/footprint.1bpp"); + const u8 gMonFootprint_Eelektross[] = INCBIN_U8("graphics/pokemon/gen_5/eelektross/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TYNAMO #if P_FAMILY_ELGYEM - const u32 gMonFrontPic_Elgyem[] = INCBIN_U32("graphics/pokemon/elgyem/anim_front.4bpp.lz"); - const u32 gMonPalette_Elgyem[] = INCBIN_U32("graphics/pokemon/elgyem/normal.gbapal.lz"); - const u32 gMonBackPic_Elgyem[] = INCBIN_U32("graphics/pokemon/elgyem/back.4bpp.lz"); - const u32 gMonShinyPalette_Elgyem[] = INCBIN_U32("graphics/pokemon/elgyem/shiny.gbapal.lz"); - const u8 gMonIcon_Elgyem[] = INCBIN_U8("graphics/pokemon/elgyem/icon.4bpp"); + const u32 gMonFrontPic_Elgyem[] = INCBIN_U32("graphics/pokemon/gen_5/elgyem/anim_front.4bpp.lz"); + const u32 gMonPalette_Elgyem[] = INCBIN_U32("graphics/pokemon/gen_5/elgyem/normal.gbapal.lz"); + const u32 gMonBackPic_Elgyem[] = INCBIN_U32("graphics/pokemon/gen_5/elgyem/back.4bpp.lz"); + const u32 gMonShinyPalette_Elgyem[] = INCBIN_U32("graphics/pokemon/gen_5/elgyem/shiny.gbapal.lz"); + const u8 gMonIcon_Elgyem[] = INCBIN_U8("graphics/pokemon/gen_5/elgyem/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Elgyem[] = INCBIN_U8("graphics/pokemon/elgyem/footprint.1bpp"); + const u8 gMonFootprint_Elgyem[] = INCBIN_U8("graphics/pokemon/gen_5/elgyem/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/anim_front.4bpp.lz"); - const u32 gMonPalette_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/normal.gbapal.lz"); - const u32 gMonBackPic_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/back.4bpp.lz"); - const u32 gMonShinyPalette_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/shiny.gbapal.lz"); - const u8 gMonIcon_Beheeyem[] = INCBIN_U8("graphics/pokemon/beheeyem/icon.4bpp"); + const u32 gMonFrontPic_Beheeyem[] = INCBIN_U32("graphics/pokemon/gen_5/beheeyem/anim_front.4bpp.lz"); + const u32 gMonPalette_Beheeyem[] = INCBIN_U32("graphics/pokemon/gen_5/beheeyem/normal.gbapal.lz"); + const u32 gMonBackPic_Beheeyem[] = INCBIN_U32("graphics/pokemon/gen_5/beheeyem/back.4bpp.lz"); + const u32 gMonShinyPalette_Beheeyem[] = INCBIN_U32("graphics/pokemon/gen_5/beheeyem/shiny.gbapal.lz"); + const u8 gMonIcon_Beheeyem[] = INCBIN_U8("graphics/pokemon/gen_5/beheeyem/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Beheeyem[] = INCBIN_U8("graphics/pokemon/beheeyem/footprint.1bpp"); + const u8 gMonFootprint_Beheeyem[] = INCBIN_U8("graphics/pokemon/gen_5/beheeyem/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ELGYEM #if P_FAMILY_LITWICK - const u32 gMonFrontPic_Litwick[] = INCBIN_U32("graphics/pokemon/litwick/anim_front.4bpp.lz"); - const u32 gMonPalette_Litwick[] = INCBIN_U32("graphics/pokemon/litwick/normal.gbapal.lz"); - const u32 gMonBackPic_Litwick[] = INCBIN_U32("graphics/pokemon/litwick/back.4bpp.lz"); - const u32 gMonShinyPalette_Litwick[] = INCBIN_U32("graphics/pokemon/litwick/shiny.gbapal.lz"); - const u8 gMonIcon_Litwick[] = INCBIN_U8("graphics/pokemon/litwick/icon.4bpp"); + const u32 gMonFrontPic_Litwick[] = INCBIN_U32("graphics/pokemon/gen_5/litwick/anim_front.4bpp.lz"); + const u32 gMonPalette_Litwick[] = INCBIN_U32("graphics/pokemon/gen_5/litwick/normal.gbapal.lz"); + const u32 gMonBackPic_Litwick[] = INCBIN_U32("graphics/pokemon/gen_5/litwick/back.4bpp.lz"); + const u32 gMonShinyPalette_Litwick[] = INCBIN_U32("graphics/pokemon/gen_5/litwick/shiny.gbapal.lz"); + const u8 gMonIcon_Litwick[] = INCBIN_U8("graphics/pokemon/gen_5/litwick/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Litwick[] = INCBIN_U8("graphics/pokemon/litwick/footprint.1bpp"); + const u8 gMonFootprint_Litwick[] = INCBIN_U8("graphics/pokemon/gen_5/litwick/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/anim_front.4bpp.lz"); - const u32 gMonPalette_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/normal.gbapal.lz"); - const u32 gMonBackPic_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/back.4bpp.lz"); - const u32 gMonShinyPalette_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/shiny.gbapal.lz"); - const u8 gMonIcon_Lampent[] = INCBIN_U8("graphics/pokemon/lampent/icon.4bpp"); + const u32 gMonFrontPic_Lampent[] = INCBIN_U32("graphics/pokemon/gen_5/lampent/anim_front.4bpp.lz"); + const u32 gMonPalette_Lampent[] = INCBIN_U32("graphics/pokemon/gen_5/lampent/normal.gbapal.lz"); + const u32 gMonBackPic_Lampent[] = INCBIN_U32("graphics/pokemon/gen_5/lampent/back.4bpp.lz"); + const u32 gMonShinyPalette_Lampent[] = INCBIN_U32("graphics/pokemon/gen_5/lampent/shiny.gbapal.lz"); + const u8 gMonIcon_Lampent[] = INCBIN_U8("graphics/pokemon/gen_5/lampent/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lampent[] = INCBIN_U8("graphics/pokemon/lampent/footprint.1bpp"); + const u8 gMonFootprint_Lampent[] = INCBIN_U8("graphics/pokemon/gen_5/lampent/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/anim_front.4bpp.lz"); - const u32 gMonPalette_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/normal.gbapal.lz"); - const u32 gMonBackPic_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/back.4bpp.lz"); - const u32 gMonShinyPalette_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/shiny.gbapal.lz"); - const u8 gMonIcon_Chandelure[] = INCBIN_U8("graphics/pokemon/chandelure/icon.4bpp"); + const u32 gMonFrontPic_Chandelure[] = INCBIN_U32("graphics/pokemon/gen_5/chandelure/anim_front.4bpp.lz"); + const u32 gMonPalette_Chandelure[] = INCBIN_U32("graphics/pokemon/gen_5/chandelure/normal.gbapal.lz"); + const u32 gMonBackPic_Chandelure[] = INCBIN_U32("graphics/pokemon/gen_5/chandelure/back.4bpp.lz"); + const u32 gMonShinyPalette_Chandelure[] = INCBIN_U32("graphics/pokemon/gen_5/chandelure/shiny.gbapal.lz"); + const u8 gMonIcon_Chandelure[] = INCBIN_U8("graphics/pokemon/gen_5/chandelure/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Chandelure[] = INCBIN_U8("graphics/pokemon/chandelure/footprint.1bpp"); + const u8 gMonFootprint_Chandelure[] = INCBIN_U8("graphics/pokemon/gen_5/chandelure/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_LITWICK #if P_FAMILY_AXEW - const u32 gMonFrontPic_Axew[] = INCBIN_U32("graphics/pokemon/axew/anim_front.4bpp.lz"); - const u32 gMonPalette_Axew[] = INCBIN_U32("graphics/pokemon/axew/normal.gbapal.lz"); - const u32 gMonBackPic_Axew[] = INCBIN_U32("graphics/pokemon/axew/back.4bpp.lz"); - const u32 gMonShinyPalette_Axew[] = INCBIN_U32("graphics/pokemon/axew/shiny.gbapal.lz"); - const u8 gMonIcon_Axew[] = INCBIN_U8("graphics/pokemon/axew/icon.4bpp"); + const u32 gMonFrontPic_Axew[] = INCBIN_U32("graphics/pokemon/gen_5/axew/anim_front.4bpp.lz"); + const u32 gMonPalette_Axew[] = INCBIN_U32("graphics/pokemon/gen_5/axew/normal.gbapal.lz"); + const u32 gMonBackPic_Axew[] = INCBIN_U32("graphics/pokemon/gen_5/axew/back.4bpp.lz"); + const u32 gMonShinyPalette_Axew[] = INCBIN_U32("graphics/pokemon/gen_5/axew/shiny.gbapal.lz"); + const u8 gMonIcon_Axew[] = INCBIN_U8("graphics/pokemon/gen_5/axew/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Axew[] = INCBIN_U8("graphics/pokemon/axew/footprint.1bpp"); + const u8 gMonFootprint_Axew[] = INCBIN_U8("graphics/pokemon/gen_5/axew/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/anim_front.4bpp.lz"); - const u32 gMonPalette_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/normal.gbapal.lz"); - const u32 gMonBackPic_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/back.4bpp.lz"); - const u32 gMonShinyPalette_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/shiny.gbapal.lz"); - const u8 gMonIcon_Fraxure[] = INCBIN_U8("graphics/pokemon/fraxure/icon.4bpp"); + const u32 gMonFrontPic_Fraxure[] = INCBIN_U32("graphics/pokemon/gen_5/fraxure/anim_front.4bpp.lz"); + const u32 gMonPalette_Fraxure[] = INCBIN_U32("graphics/pokemon/gen_5/fraxure/normal.gbapal.lz"); + const u32 gMonBackPic_Fraxure[] = INCBIN_U32("graphics/pokemon/gen_5/fraxure/back.4bpp.lz"); + const u32 gMonShinyPalette_Fraxure[] = INCBIN_U32("graphics/pokemon/gen_5/fraxure/shiny.gbapal.lz"); + const u8 gMonIcon_Fraxure[] = INCBIN_U8("graphics/pokemon/gen_5/fraxure/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Fraxure[] = INCBIN_U8("graphics/pokemon/fraxure/footprint.1bpp"); + const u8 gMonFootprint_Fraxure[] = INCBIN_U8("graphics/pokemon/gen_5/fraxure/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/anim_front.4bpp.lz"); - const u32 gMonPalette_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/normal.gbapal.lz"); - const u32 gMonBackPic_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/back.4bpp.lz"); - const u32 gMonShinyPalette_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/shiny.gbapal.lz"); - const u8 gMonIcon_Haxorus[] = INCBIN_U8("graphics/pokemon/haxorus/icon.4bpp"); + const u32 gMonFrontPic_Haxorus[] = INCBIN_U32("graphics/pokemon/gen_5/haxorus/anim_front.4bpp.lz"); + const u32 gMonPalette_Haxorus[] = INCBIN_U32("graphics/pokemon/gen_5/haxorus/normal.gbapal.lz"); + const u32 gMonBackPic_Haxorus[] = INCBIN_U32("graphics/pokemon/gen_5/haxorus/back.4bpp.lz"); + const u32 gMonShinyPalette_Haxorus[] = INCBIN_U32("graphics/pokemon/gen_5/haxorus/shiny.gbapal.lz"); + const u8 gMonIcon_Haxorus[] = INCBIN_U8("graphics/pokemon/gen_5/haxorus/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Haxorus[] = INCBIN_U8("graphics/pokemon/haxorus/footprint.1bpp"); + const u8 gMonFootprint_Haxorus[] = INCBIN_U8("graphics/pokemon/gen_5/haxorus/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_AXEW #if P_FAMILY_CUBCHOO - const u32 gMonFrontPic_Cubchoo[] = INCBIN_U32("graphics/pokemon/cubchoo/anim_front.4bpp.lz"); - const u32 gMonPalette_Cubchoo[] = INCBIN_U32("graphics/pokemon/cubchoo/normal.gbapal.lz"); - const u32 gMonBackPic_Cubchoo[] = INCBIN_U32("graphics/pokemon/cubchoo/back.4bpp.lz"); - const u32 gMonShinyPalette_Cubchoo[] = INCBIN_U32("graphics/pokemon/cubchoo/shiny.gbapal.lz"); - const u8 gMonIcon_Cubchoo[] = INCBIN_U8("graphics/pokemon/cubchoo/icon.4bpp"); + const u32 gMonFrontPic_Cubchoo[] = INCBIN_U32("graphics/pokemon/gen_5/cubchoo/anim_front.4bpp.lz"); + const u32 gMonPalette_Cubchoo[] = INCBIN_U32("graphics/pokemon/gen_5/cubchoo/normal.gbapal.lz"); + const u32 gMonBackPic_Cubchoo[] = INCBIN_U32("graphics/pokemon/gen_5/cubchoo/back.4bpp.lz"); + const u32 gMonShinyPalette_Cubchoo[] = INCBIN_U32("graphics/pokemon/gen_5/cubchoo/shiny.gbapal.lz"); + const u8 gMonIcon_Cubchoo[] = INCBIN_U8("graphics/pokemon/gen_5/cubchoo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cubchoo[] = INCBIN_U8("graphics/pokemon/cubchoo/footprint.1bpp"); + const u8 gMonFootprint_Cubchoo[] = INCBIN_U8("graphics/pokemon/gen_5/cubchoo/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/anim_front.4bpp.lz"); - const u32 gMonPalette_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/normal.gbapal.lz"); - const u32 gMonBackPic_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/back.4bpp.lz"); - const u32 gMonShinyPalette_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/shiny.gbapal.lz"); - const u8 gMonIcon_Beartic[] = INCBIN_U8("graphics/pokemon/beartic/icon.4bpp"); + const u32 gMonFrontPic_Beartic[] = INCBIN_U32("graphics/pokemon/gen_5/beartic/anim_front.4bpp.lz"); + const u32 gMonPalette_Beartic[] = INCBIN_U32("graphics/pokemon/gen_5/beartic/normal.gbapal.lz"); + const u32 gMonBackPic_Beartic[] = INCBIN_U32("graphics/pokemon/gen_5/beartic/back.4bpp.lz"); + const u32 gMonShinyPalette_Beartic[] = INCBIN_U32("graphics/pokemon/gen_5/beartic/shiny.gbapal.lz"); + const u8 gMonIcon_Beartic[] = INCBIN_U8("graphics/pokemon/gen_5/beartic/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Beartic[] = INCBIN_U8("graphics/pokemon/beartic/footprint.1bpp"); + const u8 gMonFootprint_Beartic[] = INCBIN_U8("graphics/pokemon/gen_5/beartic/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CUBCHOO #if P_FAMILY_CRYOGONAL - const u32 gMonFrontPic_Cryogonal[] = INCBIN_U32("graphics/pokemon/cryogonal/anim_front.4bpp.lz"); - const u32 gMonPalette_Cryogonal[] = INCBIN_U32("graphics/pokemon/cryogonal/normal.gbapal.lz"); - const u32 gMonBackPic_Cryogonal[] = INCBIN_U32("graphics/pokemon/cryogonal/back.4bpp.lz"); - const u32 gMonShinyPalette_Cryogonal[] = INCBIN_U32("graphics/pokemon/cryogonal/shiny.gbapal.lz"); - const u8 gMonIcon_Cryogonal[] = INCBIN_U8("graphics/pokemon/cryogonal/icon.4bpp"); + const u32 gMonFrontPic_Cryogonal[] = INCBIN_U32("graphics/pokemon/gen_5/cryogonal/anim_front.4bpp.lz"); + const u32 gMonPalette_Cryogonal[] = INCBIN_U32("graphics/pokemon/gen_5/cryogonal/normal.gbapal.lz"); + const u32 gMonBackPic_Cryogonal[] = INCBIN_U32("graphics/pokemon/gen_5/cryogonal/back.4bpp.lz"); + const u32 gMonShinyPalette_Cryogonal[] = INCBIN_U32("graphics/pokemon/gen_5/cryogonal/shiny.gbapal.lz"); + const u8 gMonIcon_Cryogonal[] = INCBIN_U8("graphics/pokemon/gen_5/cryogonal/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cryogonal[] = INCBIN_U8("graphics/pokemon/cryogonal/footprint.1bpp"); + const u8 gMonFootprint_Cryogonal[] = INCBIN_U8("graphics/pokemon/gen_5/cryogonal/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CRYOGONAL #if P_FAMILY_SHELMET - const u32 gMonFrontPic_Shelmet[] = INCBIN_U32("graphics/pokemon/shelmet/anim_front.4bpp.lz"); - const u32 gMonPalette_Shelmet[] = INCBIN_U32("graphics/pokemon/shelmet/normal.gbapal.lz"); - const u32 gMonBackPic_Shelmet[] = INCBIN_U32("graphics/pokemon/shelmet/back.4bpp.lz"); - const u32 gMonShinyPalette_Shelmet[] = INCBIN_U32("graphics/pokemon/shelmet/shiny.gbapal.lz"); - const u8 gMonIcon_Shelmet[] = INCBIN_U8("graphics/pokemon/shelmet/icon.4bpp"); + const u32 gMonFrontPic_Shelmet[] = INCBIN_U32("graphics/pokemon/gen_5/shelmet/anim_front.4bpp.lz"); + const u32 gMonPalette_Shelmet[] = INCBIN_U32("graphics/pokemon/gen_5/shelmet/normal.gbapal.lz"); + const u32 gMonBackPic_Shelmet[] = INCBIN_U32("graphics/pokemon/gen_5/shelmet/back.4bpp.lz"); + const u32 gMonShinyPalette_Shelmet[] = INCBIN_U32("graphics/pokemon/gen_5/shelmet/shiny.gbapal.lz"); + const u8 gMonIcon_Shelmet[] = INCBIN_U8("graphics/pokemon/gen_5/shelmet/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Shelmet[] = INCBIN_U8("graphics/pokemon/shelmet/footprint.1bpp"); + const u8 gMonFootprint_Shelmet[] = INCBIN_U8("graphics/pokemon/gen_5/shelmet/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/anim_front.4bpp.lz"); - const u32 gMonPalette_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/normal.gbapal.lz"); - const u32 gMonBackPic_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/back.4bpp.lz"); - const u32 gMonShinyPalette_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/shiny.gbapal.lz"); - const u8 gMonIcon_Accelgor[] = INCBIN_U8("graphics/pokemon/accelgor/icon.4bpp"); + const u32 gMonFrontPic_Accelgor[] = INCBIN_U32("graphics/pokemon/gen_5/accelgor/anim_front.4bpp.lz"); + const u32 gMonPalette_Accelgor[] = INCBIN_U32("graphics/pokemon/gen_5/accelgor/normal.gbapal.lz"); + const u32 gMonBackPic_Accelgor[] = INCBIN_U32("graphics/pokemon/gen_5/accelgor/back.4bpp.lz"); + const u32 gMonShinyPalette_Accelgor[] = INCBIN_U32("graphics/pokemon/gen_5/accelgor/shiny.gbapal.lz"); + const u8 gMonIcon_Accelgor[] = INCBIN_U8("graphics/pokemon/gen_5/accelgor/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Accelgor[] = INCBIN_U8("graphics/pokemon/accelgor/footprint.1bpp"); + const u8 gMonFootprint_Accelgor[] = INCBIN_U8("graphics/pokemon/gen_5/accelgor/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SHELMET #if P_FAMILY_STUNFISK - const u32 gMonFrontPic_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/anim_front.4bpp.lz"); - const u32 gMonPalette_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/normal.gbapal.lz"); - const u32 gMonBackPic_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/back.4bpp.lz"); - const u32 gMonShinyPalette_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/shiny.gbapal.lz"); - const u8 gMonIcon_Stunfisk[] = INCBIN_U8("graphics/pokemon/stunfisk/icon.4bpp"); + const u32 gMonFrontPic_Stunfisk[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/anim_front.4bpp.lz"); + const u32 gMonPalette_Stunfisk[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/normal.gbapal.lz"); + const u32 gMonBackPic_Stunfisk[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/back.4bpp.lz"); + const u32 gMonShinyPalette_Stunfisk[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/shiny.gbapal.lz"); + const u8 gMonIcon_Stunfisk[] = INCBIN_U8("graphics/pokemon/gen_5/stunfisk/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Stunfisk[] = INCBIN_U8("graphics/pokemon/stunfisk/footprint.1bpp"); + const u8 gMonFootprint_Stunfisk[] = INCBIN_U8("graphics/pokemon/gen_5/stunfisk/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/front.4bpp.lz"); - const u32 gMonPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_StunfiskGalarian[] = INCBIN_U8("graphics/pokemon/stunfisk/galarian/icon.4bpp"); + const u32 gMonFrontPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/galarian/front.4bpp.lz"); + const u32 gMonPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/galarian/normal.gbapal.lz"); + const u32 gMonBackPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/galarian/back.4bpp.lz"); + const u32 gMonShinyPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/gen_5/stunfisk/galarian/shiny.gbapal.lz"); + const u8 gMonIcon_StunfiskGalarian[] = INCBIN_U8("graphics/pokemon/gen_5/stunfisk/galarian/icon.4bpp"); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_STUNFISK #if P_FAMILY_MIENFOO - const u32 gMonFrontPic_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/anim_front.4bpp.lz"); - const u32 gMonPalette_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/normal.gbapal.lz"); - const u32 gMonBackPic_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/back.4bpp.lz"); - const u32 gMonShinyPalette_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/shiny.gbapal.lz"); - const u8 gMonIcon_Mienfoo[] = INCBIN_U8("graphics/pokemon/mienfoo/icon.4bpp"); + const u32 gMonFrontPic_Mienfoo[] = INCBIN_U32("graphics/pokemon/gen_5/mienfoo/anim_front.4bpp.lz"); + const u32 gMonPalette_Mienfoo[] = INCBIN_U32("graphics/pokemon/gen_5/mienfoo/normal.gbapal.lz"); + const u32 gMonBackPic_Mienfoo[] = INCBIN_U32("graphics/pokemon/gen_5/mienfoo/back.4bpp.lz"); + const u32 gMonShinyPalette_Mienfoo[] = INCBIN_U32("graphics/pokemon/gen_5/mienfoo/shiny.gbapal.lz"); + const u8 gMonIcon_Mienfoo[] = INCBIN_U8("graphics/pokemon/gen_5/mienfoo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mienfoo[] = INCBIN_U8("graphics/pokemon/mienfoo/footprint.1bpp"); + const u8 gMonFootprint_Mienfoo[] = INCBIN_U8("graphics/pokemon/gen_5/mienfoo/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/anim_front.4bpp.lz"); - const u32 gMonPalette_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/normal.gbapal.lz"); - const u32 gMonBackPic_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/back.4bpp.lz"); - const u32 gMonShinyPalette_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/shiny.gbapal.lz"); - const u8 gMonIcon_Mienshao[] = INCBIN_U8("graphics/pokemon/mienshao/icon.4bpp"); + const u32 gMonFrontPic_Mienshao[] = INCBIN_U32("graphics/pokemon/gen_5/mienshao/anim_front.4bpp.lz"); + const u32 gMonPalette_Mienshao[] = INCBIN_U32("graphics/pokemon/gen_5/mienshao/normal.gbapal.lz"); + const u32 gMonBackPic_Mienshao[] = INCBIN_U32("graphics/pokemon/gen_5/mienshao/back.4bpp.lz"); + const u32 gMonShinyPalette_Mienshao[] = INCBIN_U32("graphics/pokemon/gen_5/mienshao/shiny.gbapal.lz"); + const u8 gMonIcon_Mienshao[] = INCBIN_U8("graphics/pokemon/gen_5/mienshao/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mienshao[] = INCBIN_U8("graphics/pokemon/mienshao/footprint.1bpp"); + const u8 gMonFootprint_Mienshao[] = INCBIN_U8("graphics/pokemon/gen_5/mienshao/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MIENFOO #if P_FAMILY_DRUDDIGON - const u32 gMonFrontPic_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/anim_front.4bpp.lz"); - const u32 gMonPalette_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/normal.gbapal.lz"); - const u32 gMonBackPic_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/back.4bpp.lz"); - const u32 gMonShinyPalette_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/shiny.gbapal.lz"); - const u8 gMonIcon_Druddigon[] = INCBIN_U8("graphics/pokemon/druddigon/icon.4bpp"); + const u32 gMonFrontPic_Druddigon[] = INCBIN_U32("graphics/pokemon/gen_5/druddigon/anim_front.4bpp.lz"); + const u32 gMonPalette_Druddigon[] = INCBIN_U32("graphics/pokemon/gen_5/druddigon/normal.gbapal.lz"); + const u32 gMonBackPic_Druddigon[] = INCBIN_U32("graphics/pokemon/gen_5/druddigon/back.4bpp.lz"); + const u32 gMonShinyPalette_Druddigon[] = INCBIN_U32("graphics/pokemon/gen_5/druddigon/shiny.gbapal.lz"); + const u8 gMonIcon_Druddigon[] = INCBIN_U8("graphics/pokemon/gen_5/druddigon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Druddigon[] = INCBIN_U8("graphics/pokemon/druddigon/footprint.1bpp"); + const u8 gMonFootprint_Druddigon[] = INCBIN_U8("graphics/pokemon/gen_5/druddigon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DRUDDIGON #if P_FAMILY_GOLETT - const u32 gMonFrontPic_Golett[] = INCBIN_U32("graphics/pokemon/golett/anim_front.4bpp.lz"); - const u32 gMonPalette_Golett[] = INCBIN_U32("graphics/pokemon/golett/normal.gbapal.lz"); - const u32 gMonBackPic_Golett[] = INCBIN_U32("graphics/pokemon/golett/back.4bpp.lz"); - const u32 gMonShinyPalette_Golett[] = INCBIN_U32("graphics/pokemon/golett/shiny.gbapal.lz"); - const u8 gMonIcon_Golett[] = INCBIN_U8("graphics/pokemon/golett/icon.4bpp"); + const u32 gMonFrontPic_Golett[] = INCBIN_U32("graphics/pokemon/gen_5/golett/anim_front.4bpp.lz"); + const u32 gMonPalette_Golett[] = INCBIN_U32("graphics/pokemon/gen_5/golett/normal.gbapal.lz"); + const u32 gMonBackPic_Golett[] = INCBIN_U32("graphics/pokemon/gen_5/golett/back.4bpp.lz"); + const u32 gMonShinyPalette_Golett[] = INCBIN_U32("graphics/pokemon/gen_5/golett/shiny.gbapal.lz"); + const u8 gMonIcon_Golett[] = INCBIN_U8("graphics/pokemon/gen_5/golett/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Golett[] = INCBIN_U8("graphics/pokemon/golett/footprint.1bpp"); + const u8 gMonFootprint_Golett[] = INCBIN_U8("graphics/pokemon/gen_5/golett/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/anim_front.4bpp.lz"); - const u32 gMonPalette_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/normal.gbapal.lz"); - const u32 gMonBackPic_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/back.4bpp.lz"); - const u32 gMonShinyPalette_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/shiny.gbapal.lz"); - const u8 gMonIcon_Golurk[] = INCBIN_U8("graphics/pokemon/golurk/icon.4bpp"); + const u32 gMonFrontPic_Golurk[] = INCBIN_U32("graphics/pokemon/gen_5/golurk/anim_front.4bpp.lz"); + const u32 gMonPalette_Golurk[] = INCBIN_U32("graphics/pokemon/gen_5/golurk/normal.gbapal.lz"); + const u32 gMonBackPic_Golurk[] = INCBIN_U32("graphics/pokemon/gen_5/golurk/back.4bpp.lz"); + const u32 gMonShinyPalette_Golurk[] = INCBIN_U32("graphics/pokemon/gen_5/golurk/shiny.gbapal.lz"); + const u8 gMonIcon_Golurk[] = INCBIN_U8("graphics/pokemon/gen_5/golurk/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Golurk[] = INCBIN_U8("graphics/pokemon/golurk/footprint.1bpp"); + const u8 gMonFootprint_Golurk[] = INCBIN_U8("graphics/pokemon/gen_5/golurk/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_GOLETT #if P_FAMILY_PAWNIARD - const u32 gMonFrontPic_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/anim_front.4bpp.lz"); - const u32 gMonPalette_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/normal.gbapal.lz"); - const u32 gMonBackPic_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/back.4bpp.lz"); - const u32 gMonShinyPalette_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/shiny.gbapal.lz"); - const u8 gMonIcon_Pawniard[] = INCBIN_U8("graphics/pokemon/pawniard/icon.4bpp"); + const u32 gMonFrontPic_Pawniard[] = INCBIN_U32("graphics/pokemon/gen_5/pawniard/anim_front.4bpp.lz"); + const u32 gMonPalette_Pawniard[] = INCBIN_U32("graphics/pokemon/gen_5/pawniard/normal.gbapal.lz"); + const u32 gMonBackPic_Pawniard[] = INCBIN_U32("graphics/pokemon/gen_5/pawniard/back.4bpp.lz"); + const u32 gMonShinyPalette_Pawniard[] = INCBIN_U32("graphics/pokemon/gen_5/pawniard/shiny.gbapal.lz"); + const u8 gMonIcon_Pawniard[] = INCBIN_U8("graphics/pokemon/gen_5/pawniard/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pawniard[] = INCBIN_U8("graphics/pokemon/pawniard/footprint.1bpp"); + const u8 gMonFootprint_Pawniard[] = INCBIN_U8("graphics/pokemon/gen_5/pawniard/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/anim_front.4bpp.lz"); - const u32 gMonPalette_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/normal.gbapal.lz"); - const u32 gMonBackPic_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/back.4bpp.lz"); - const u32 gMonShinyPalette_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/shiny.gbapal.lz"); - const u8 gMonIcon_Bisharp[] = INCBIN_U8("graphics/pokemon/bisharp/icon.4bpp"); + const u32 gMonFrontPic_Bisharp[] = INCBIN_U32("graphics/pokemon/gen_5/bisharp/anim_front.4bpp.lz"); + const u32 gMonPalette_Bisharp[] = INCBIN_U32("graphics/pokemon/gen_5/bisharp/normal.gbapal.lz"); + const u32 gMonBackPic_Bisharp[] = INCBIN_U32("graphics/pokemon/gen_5/bisharp/back.4bpp.lz"); + const u32 gMonShinyPalette_Bisharp[] = INCBIN_U32("graphics/pokemon/gen_5/bisharp/shiny.gbapal.lz"); + const u8 gMonIcon_Bisharp[] = INCBIN_U8("graphics/pokemon/gen_5/bisharp/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bisharp[] = INCBIN_U8("graphics/pokemon/bisharp/footprint.1bpp"); + const u8 gMonFootprint_Bisharp[] = INCBIN_U8("graphics/pokemon/gen_5/bisharp/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GEN_9_CROSS_EVOS - const u32 gMonFrontPic_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/front.4bpp.lz"); - const u32 gMonPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/normal.gbapal.lz"); - const u32 gMonBackPic_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/back.4bpp.lz"); - const u32 gMonShinyPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/shiny.gbapal.lz"); - const u8 gMonIcon_Kingambit[] = INCBIN_U8("graphics/pokemon/kingambit/icon.4bpp"); + const u32 gMonFrontPic_Kingambit[] = INCBIN_U32("graphics/pokemon/gen_9/kingambit/front.4bpp.lz"); + const u32 gMonPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/gen_9/kingambit/normal.gbapal.lz"); + const u32 gMonBackPic_Kingambit[] = INCBIN_U32("graphics/pokemon/gen_9/kingambit/back.4bpp.lz"); + const u32 gMonShinyPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/gen_9/kingambit/shiny.gbapal.lz"); + const u8 gMonIcon_Kingambit[] = INCBIN_U8("graphics/pokemon/gen_9/kingambit/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Kingambit[] = INCBIN_U8("graphics/pokemon/kingambit/footprint.1bpp"); + // const u8 gMonFootprint_Kingambit[] = INCBIN_U8("graphics/pokemon/gen_9/kingambit/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_PAWNIARD #if P_FAMILY_BOUFFALANT - const u32 gMonFrontPic_Bouffalant[] = INCBIN_U32("graphics/pokemon/bouffalant/anim_front.4bpp.lz"); - const u32 gMonPalette_Bouffalant[] = INCBIN_U32("graphics/pokemon/bouffalant/normal.gbapal.lz"); - const u32 gMonBackPic_Bouffalant[] = INCBIN_U32("graphics/pokemon/bouffalant/back.4bpp.lz"); - const u32 gMonShinyPalette_Bouffalant[] = INCBIN_U32("graphics/pokemon/bouffalant/shiny.gbapal.lz"); - const u8 gMonIcon_Bouffalant[] = INCBIN_U8("graphics/pokemon/bouffalant/icon.4bpp"); + const u32 gMonFrontPic_Bouffalant[] = INCBIN_U32("graphics/pokemon/gen_5/bouffalant/anim_front.4bpp.lz"); + const u32 gMonPalette_Bouffalant[] = INCBIN_U32("graphics/pokemon/gen_5/bouffalant/normal.gbapal.lz"); + const u32 gMonBackPic_Bouffalant[] = INCBIN_U32("graphics/pokemon/gen_5/bouffalant/back.4bpp.lz"); + const u32 gMonShinyPalette_Bouffalant[] = INCBIN_U32("graphics/pokemon/gen_5/bouffalant/shiny.gbapal.lz"); + const u8 gMonIcon_Bouffalant[] = INCBIN_U8("graphics/pokemon/gen_5/bouffalant/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bouffalant[] = INCBIN_U8("graphics/pokemon/bouffalant/footprint.1bpp"); + const u8 gMonFootprint_Bouffalant[] = INCBIN_U8("graphics/pokemon/gen_5/bouffalant/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BOUFFALANT #if P_FAMILY_RUFFLET - const u32 gMonFrontPic_Rufflet[] = INCBIN_U32("graphics/pokemon/rufflet/anim_front.4bpp.lz"); - const u32 gMonPalette_Rufflet[] = INCBIN_U32("graphics/pokemon/rufflet/normal.gbapal.lz"); - const u32 gMonBackPic_Rufflet[] = INCBIN_U32("graphics/pokemon/rufflet/back.4bpp.lz"); - const u32 gMonShinyPalette_Rufflet[] = INCBIN_U32("graphics/pokemon/rufflet/shiny.gbapal.lz"); - const u8 gMonIcon_Rufflet[] = INCBIN_U8("graphics/pokemon/rufflet/icon.4bpp"); + const u32 gMonFrontPic_Rufflet[] = INCBIN_U32("graphics/pokemon/gen_5/rufflet/anim_front.4bpp.lz"); + const u32 gMonPalette_Rufflet[] = INCBIN_U32("graphics/pokemon/gen_5/rufflet/normal.gbapal.lz"); + const u32 gMonBackPic_Rufflet[] = INCBIN_U32("graphics/pokemon/gen_5/rufflet/back.4bpp.lz"); + const u32 gMonShinyPalette_Rufflet[] = INCBIN_U32("graphics/pokemon/gen_5/rufflet/shiny.gbapal.lz"); + const u8 gMonIcon_Rufflet[] = INCBIN_U8("graphics/pokemon/gen_5/rufflet/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Rufflet[] = INCBIN_U8("graphics/pokemon/rufflet/footprint.1bpp"); + const u8 gMonFootprint_Rufflet[] = INCBIN_U8("graphics/pokemon/gen_5/rufflet/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/anim_front.4bpp.lz"); - const u32 gMonPalette_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/normal.gbapal.lz"); - const u32 gMonBackPic_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/back.4bpp.lz"); - const u32 gMonShinyPalette_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/shiny.gbapal.lz"); - const u8 gMonIcon_Braviary[] = INCBIN_U8("graphics/pokemon/braviary/icon.4bpp"); + const u32 gMonFrontPic_Braviary[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/anim_front.4bpp.lz"); + const u32 gMonPalette_Braviary[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/normal.gbapal.lz"); + const u32 gMonBackPic_Braviary[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/back.4bpp.lz"); + const u32 gMonShinyPalette_Braviary[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/shiny.gbapal.lz"); + const u8 gMonIcon_Braviary[] = INCBIN_U8("graphics/pokemon/gen_5/braviary/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Braviary[] = INCBIN_U8("graphics/pokemon/braviary/footprint.1bpp"); + const u8 gMonFootprint_Braviary[] = INCBIN_U8("graphics/pokemon/gen_5/braviary/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/front.4bpp.lz"); - const u32 gMonPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_BraviaryHisuian[] = INCBIN_U8("graphics/pokemon/braviary/hisuian/icon.4bpp"); + const u32 gMonFrontPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/hisuian/front.4bpp.lz"); + const u32 gMonPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/gen_5/braviary/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_BraviaryHisuian[] = INCBIN_U8("graphics/pokemon/gen_5/braviary/hisuian/icon.4bpp"); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_RUFFLET #if P_FAMILY_VULLABY - const u32 gMonFrontPic_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/anim_front.4bpp.lz"); - const u32 gMonPalette_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/normal.gbapal.lz"); - const u32 gMonBackPic_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/back.4bpp.lz"); - const u32 gMonShinyPalette_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/shiny.gbapal.lz"); - const u8 gMonIcon_Vullaby[] = INCBIN_U8("graphics/pokemon/vullaby/icon.4bpp"); + const u32 gMonFrontPic_Vullaby[] = INCBIN_U32("graphics/pokemon/gen_5/vullaby/anim_front.4bpp.lz"); + const u32 gMonPalette_Vullaby[] = INCBIN_U32("graphics/pokemon/gen_5/vullaby/normal.gbapal.lz"); + const u32 gMonBackPic_Vullaby[] = INCBIN_U32("graphics/pokemon/gen_5/vullaby/back.4bpp.lz"); + const u32 gMonShinyPalette_Vullaby[] = INCBIN_U32("graphics/pokemon/gen_5/vullaby/shiny.gbapal.lz"); + const u8 gMonIcon_Vullaby[] = INCBIN_U8("graphics/pokemon/gen_5/vullaby/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Vullaby[] = INCBIN_U8("graphics/pokemon/vullaby/footprint.1bpp"); + const u8 gMonFootprint_Vullaby[] = INCBIN_U8("graphics/pokemon/gen_5/vullaby/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/anim_front.4bpp.lz"); - const u32 gMonPalette_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/normal.gbapal.lz"); - const u32 gMonBackPic_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/back.4bpp.lz"); - const u32 gMonShinyPalette_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/shiny.gbapal.lz"); - const u8 gMonIcon_Mandibuzz[] = INCBIN_U8("graphics/pokemon/mandibuzz/icon.4bpp"); + const u32 gMonFrontPic_Mandibuzz[] = INCBIN_U32("graphics/pokemon/gen_5/mandibuzz/anim_front.4bpp.lz"); + const u32 gMonPalette_Mandibuzz[] = INCBIN_U32("graphics/pokemon/gen_5/mandibuzz/normal.gbapal.lz"); + const u32 gMonBackPic_Mandibuzz[] = INCBIN_U32("graphics/pokemon/gen_5/mandibuzz/back.4bpp.lz"); + const u32 gMonShinyPalette_Mandibuzz[] = INCBIN_U32("graphics/pokemon/gen_5/mandibuzz/shiny.gbapal.lz"); + const u8 gMonIcon_Mandibuzz[] = INCBIN_U8("graphics/pokemon/gen_5/mandibuzz/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mandibuzz[] = INCBIN_U8("graphics/pokemon/mandibuzz/footprint.1bpp"); + const u8 gMonFootprint_Mandibuzz[] = INCBIN_U8("graphics/pokemon/gen_5/mandibuzz/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_VULLABY #if P_FAMILY_HEATMOR - const u32 gMonFrontPic_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/anim_front.4bpp.lz"); - const u32 gMonPalette_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/normal.gbapal.lz"); - const u32 gMonBackPic_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/back.4bpp.lz"); - const u32 gMonShinyPalette_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/shiny.gbapal.lz"); - const u8 gMonIcon_Heatmor[] = INCBIN_U8("graphics/pokemon/heatmor/icon.4bpp"); + const u32 gMonFrontPic_Heatmor[] = INCBIN_U32("graphics/pokemon/gen_5/heatmor/anim_front.4bpp.lz"); + const u32 gMonPalette_Heatmor[] = INCBIN_U32("graphics/pokemon/gen_5/heatmor/normal.gbapal.lz"); + const u32 gMonBackPic_Heatmor[] = INCBIN_U32("graphics/pokemon/gen_5/heatmor/back.4bpp.lz"); + const u32 gMonShinyPalette_Heatmor[] = INCBIN_U32("graphics/pokemon/gen_5/heatmor/shiny.gbapal.lz"); + const u8 gMonIcon_Heatmor[] = INCBIN_U8("graphics/pokemon/gen_5/heatmor/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Heatmor[] = INCBIN_U8("graphics/pokemon/heatmor/footprint.1bpp"); + const u8 gMonFootprint_Heatmor[] = INCBIN_U8("graphics/pokemon/gen_5/heatmor/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_HEATMOR #if P_FAMILY_DURANT - const u32 gMonFrontPic_Durant[] = INCBIN_U32("graphics/pokemon/durant/anim_front.4bpp.lz"); - const u32 gMonPalette_Durant[] = INCBIN_U32("graphics/pokemon/durant/normal.gbapal.lz"); - const u32 gMonBackPic_Durant[] = INCBIN_U32("graphics/pokemon/durant/back.4bpp.lz"); - const u32 gMonShinyPalette_Durant[] = INCBIN_U32("graphics/pokemon/durant/shiny.gbapal.lz"); - const u8 gMonIcon_Durant[] = INCBIN_U8("graphics/pokemon/durant/icon.4bpp"); + const u32 gMonFrontPic_Durant[] = INCBIN_U32("graphics/pokemon/gen_5/durant/anim_front.4bpp.lz"); + const u32 gMonPalette_Durant[] = INCBIN_U32("graphics/pokemon/gen_5/durant/normal.gbapal.lz"); + const u32 gMonBackPic_Durant[] = INCBIN_U32("graphics/pokemon/gen_5/durant/back.4bpp.lz"); + const u32 gMonShinyPalette_Durant[] = INCBIN_U32("graphics/pokemon/gen_5/durant/shiny.gbapal.lz"); + const u8 gMonIcon_Durant[] = INCBIN_U8("graphics/pokemon/gen_5/durant/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Durant[] = INCBIN_U8("graphics/pokemon/durant/footprint.1bpp"); + const u8 gMonFootprint_Durant[] = INCBIN_U8("graphics/pokemon/gen_5/durant/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DURANT #if P_FAMILY_DEINO - const u32 gMonFrontPic_Deino[] = INCBIN_U32("graphics/pokemon/deino/anim_front.4bpp.lz"); - const u32 gMonPalette_Deino[] = INCBIN_U32("graphics/pokemon/deino/normal.gbapal.lz"); - const u32 gMonBackPic_Deino[] = INCBIN_U32("graphics/pokemon/deino/back.4bpp.lz"); - const u32 gMonShinyPalette_Deino[] = INCBIN_U32("graphics/pokemon/deino/shiny.gbapal.lz"); - const u8 gMonIcon_Deino[] = INCBIN_U8("graphics/pokemon/deino/icon.4bpp"); + const u32 gMonFrontPic_Deino[] = INCBIN_U32("graphics/pokemon/gen_5/deino/anim_front.4bpp.lz"); + const u32 gMonPalette_Deino[] = INCBIN_U32("graphics/pokemon/gen_5/deino/normal.gbapal.lz"); + const u32 gMonBackPic_Deino[] = INCBIN_U32("graphics/pokemon/gen_5/deino/back.4bpp.lz"); + const u32 gMonShinyPalette_Deino[] = INCBIN_U32("graphics/pokemon/gen_5/deino/shiny.gbapal.lz"); + const u8 gMonIcon_Deino[] = INCBIN_U8("graphics/pokemon/gen_5/deino/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Deino[] = INCBIN_U8("graphics/pokemon/deino/footprint.1bpp"); + const u8 gMonFootprint_Deino[] = INCBIN_U8("graphics/pokemon/gen_5/deino/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/anim_front.4bpp.lz"); - const u32 gMonPalette_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/normal.gbapal.lz"); - const u32 gMonBackPic_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/back.4bpp.lz"); - const u32 gMonShinyPalette_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/shiny.gbapal.lz"); - const u8 gMonIcon_Zweilous[] = INCBIN_U8("graphics/pokemon/zweilous/icon.4bpp"); + const u32 gMonFrontPic_Zweilous[] = INCBIN_U32("graphics/pokemon/gen_5/zweilous/anim_front.4bpp.lz"); + const u32 gMonPalette_Zweilous[] = INCBIN_U32("graphics/pokemon/gen_5/zweilous/normal.gbapal.lz"); + const u32 gMonBackPic_Zweilous[] = INCBIN_U32("graphics/pokemon/gen_5/zweilous/back.4bpp.lz"); + const u32 gMonShinyPalette_Zweilous[] = INCBIN_U32("graphics/pokemon/gen_5/zweilous/shiny.gbapal.lz"); + const u8 gMonIcon_Zweilous[] = INCBIN_U8("graphics/pokemon/gen_5/zweilous/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Zweilous[] = INCBIN_U8("graphics/pokemon/zweilous/footprint.1bpp"); + const u8 gMonFootprint_Zweilous[] = INCBIN_U8("graphics/pokemon/gen_5/zweilous/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/anim_front.4bpp.lz"); - const u32 gMonPalette_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/normal.gbapal.lz"); - const u32 gMonBackPic_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/back.4bpp.lz"); - const u32 gMonShinyPalette_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/shiny.gbapal.lz"); - const u8 gMonIcon_Hydreigon[] = INCBIN_U8("graphics/pokemon/hydreigon/icon.4bpp"); + const u32 gMonFrontPic_Hydreigon[] = INCBIN_U32("graphics/pokemon/gen_5/hydreigon/anim_front.4bpp.lz"); + const u32 gMonPalette_Hydreigon[] = INCBIN_U32("graphics/pokemon/gen_5/hydreigon/normal.gbapal.lz"); + const u32 gMonBackPic_Hydreigon[] = INCBIN_U32("graphics/pokemon/gen_5/hydreigon/back.4bpp.lz"); + const u32 gMonShinyPalette_Hydreigon[] = INCBIN_U32("graphics/pokemon/gen_5/hydreigon/shiny.gbapal.lz"); + const u8 gMonIcon_Hydreigon[] = INCBIN_U8("graphics/pokemon/gen_5/hydreigon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hydreigon[] = INCBIN_U8("graphics/pokemon/hydreigon/footprint.1bpp"); + const u8 gMonFootprint_Hydreigon[] = INCBIN_U8("graphics/pokemon/gen_5/hydreigon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DEINO #if P_FAMILY_LARVESTA - const u32 gMonFrontPic_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/anim_front.4bpp.lz"); - const u32 gMonPalette_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/normal.gbapal.lz"); - const u32 gMonBackPic_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/back.4bpp.lz"); - const u32 gMonShinyPalette_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/shiny.gbapal.lz"); - const u8 gMonIcon_Larvesta[] = INCBIN_U8("graphics/pokemon/larvesta/icon.4bpp"); + const u32 gMonFrontPic_Larvesta[] = INCBIN_U32("graphics/pokemon/gen_5/larvesta/anim_front.4bpp.lz"); + const u32 gMonPalette_Larvesta[] = INCBIN_U32("graphics/pokemon/gen_5/larvesta/normal.gbapal.lz"); + const u32 gMonBackPic_Larvesta[] = INCBIN_U32("graphics/pokemon/gen_5/larvesta/back.4bpp.lz"); + const u32 gMonShinyPalette_Larvesta[] = INCBIN_U32("graphics/pokemon/gen_5/larvesta/shiny.gbapal.lz"); + const u8 gMonIcon_Larvesta[] = INCBIN_U8("graphics/pokemon/gen_5/larvesta/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Larvesta[] = INCBIN_U8("graphics/pokemon/larvesta/footprint.1bpp"); + const u8 gMonFootprint_Larvesta[] = INCBIN_U8("graphics/pokemon/gen_5/larvesta/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/anim_front.4bpp.lz"); - const u32 gMonPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/normal.gbapal.lz"); - const u32 gMonBackPic_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/back.4bpp.lz"); - const u32 gMonShinyPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/shiny.gbapal.lz"); - const u8 gMonIcon_Volcarona[] = INCBIN_U8("graphics/pokemon/volcarona/icon.4bpp"); + const u32 gMonFrontPic_Volcarona[] = INCBIN_U32("graphics/pokemon/gen_5/volcarona/anim_front.4bpp.lz"); + const u32 gMonPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/gen_5/volcarona/normal.gbapal.lz"); + const u32 gMonBackPic_Volcarona[] = INCBIN_U32("graphics/pokemon/gen_5/volcarona/back.4bpp.lz"); + const u32 gMonShinyPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/gen_5/volcarona/shiny.gbapal.lz"); + const u8 gMonIcon_Volcarona[] = INCBIN_U8("graphics/pokemon/gen_5/volcarona/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Volcarona[] = INCBIN_U8("graphics/pokemon/volcarona/footprint.1bpp"); + const u8 gMonFootprint_Volcarona[] = INCBIN_U8("graphics/pokemon/gen_5/volcarona/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_LARVESTA #if P_FAMILY_COBALION - const u32 gMonFrontPic_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/anim_front.4bpp.lz"); - const u32 gMonPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/normal.gbapal.lz"); - const u32 gMonBackPic_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/back.4bpp.lz"); - const u32 gMonShinyPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/shiny.gbapal.lz"); - const u8 gMonIcon_Cobalion[] = INCBIN_U8("graphics/pokemon/cobalion/icon.4bpp"); + const u32 gMonFrontPic_Cobalion[] = INCBIN_U32("graphics/pokemon/gen_5/cobalion/anim_front.4bpp.lz"); + const u32 gMonPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/gen_5/cobalion/normal.gbapal.lz"); + const u32 gMonBackPic_Cobalion[] = INCBIN_U32("graphics/pokemon/gen_5/cobalion/back.4bpp.lz"); + const u32 gMonShinyPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/gen_5/cobalion/shiny.gbapal.lz"); + const u8 gMonIcon_Cobalion[] = INCBIN_U8("graphics/pokemon/gen_5/cobalion/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cobalion[] = INCBIN_U8("graphics/pokemon/cobalion/footprint.1bpp"); + const u8 gMonFootprint_Cobalion[] = INCBIN_U8("graphics/pokemon/gen_5/cobalion/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_COBALION #if P_FAMILY_TERRAKION - const u32 gMonFrontPic_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/anim_front.4bpp.lz"); - const u32 gMonPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/normal.gbapal.lz"); - const u32 gMonBackPic_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/back.4bpp.lz"); - const u32 gMonShinyPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/shiny.gbapal.lz"); - const u8 gMonIcon_Terrakion[] = INCBIN_U8("graphics/pokemon/terrakion/icon.4bpp"); + const u32 gMonFrontPic_Terrakion[] = INCBIN_U32("graphics/pokemon/gen_5/terrakion/anim_front.4bpp.lz"); + const u32 gMonPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/gen_5/terrakion/normal.gbapal.lz"); + const u32 gMonBackPic_Terrakion[] = INCBIN_U32("graphics/pokemon/gen_5/terrakion/back.4bpp.lz"); + const u32 gMonShinyPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/gen_5/terrakion/shiny.gbapal.lz"); + const u8 gMonIcon_Terrakion[] = INCBIN_U8("graphics/pokemon/gen_5/terrakion/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Terrakion[] = INCBIN_U8("graphics/pokemon/terrakion/footprint.1bpp"); + const u8 gMonFootprint_Terrakion[] = INCBIN_U8("graphics/pokemon/gen_5/terrakion/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TERRAKION #if P_FAMILY_VIRIZION - const u32 gMonFrontPic_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/anim_front.4bpp.lz"); - const u32 gMonPalette_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/normal.gbapal.lz"); - const u32 gMonBackPic_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/back.4bpp.lz"); - const u32 gMonShinyPalette_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/shiny.gbapal.lz"); - const u8 gMonIcon_Virizion[] = INCBIN_U8("graphics/pokemon/virizion/icon.4bpp"); + const u32 gMonFrontPic_Virizion[] = INCBIN_U32("graphics/pokemon/gen_5/virizion/anim_front.4bpp.lz"); + const u32 gMonPalette_Virizion[] = INCBIN_U32("graphics/pokemon/gen_5/virizion/normal.gbapal.lz"); + const u32 gMonBackPic_Virizion[] = INCBIN_U32("graphics/pokemon/gen_5/virizion/back.4bpp.lz"); + const u32 gMonShinyPalette_Virizion[] = INCBIN_U32("graphics/pokemon/gen_5/virizion/shiny.gbapal.lz"); + const u8 gMonIcon_Virizion[] = INCBIN_U8("graphics/pokemon/gen_5/virizion/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Virizion[] = INCBIN_U8("graphics/pokemon/virizion/footprint.1bpp"); + const u8 gMonFootprint_Virizion[] = INCBIN_U8("graphics/pokemon/gen_5/virizion/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_VIRIZION #if P_FAMILY_TORNADUS - const u32 gMonFrontPic_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/anim_front.4bpp.lz"); - const u32 gMonPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/normal.gbapal.lz"); - const u32 gMonBackPic_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/back.4bpp.lz"); - const u32 gMonShinyPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/shiny.gbapal.lz"); - const u8 gMonIcon_TornadusIncarnate[] = INCBIN_U8("graphics/pokemon/tornadus/icon.4bpp"); + const u32 gMonFrontPic_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/anim_front.4bpp.lz"); + const u32 gMonPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/normal.gbapal.lz"); + const u32 gMonBackPic_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/back.4bpp.lz"); + const u32 gMonShinyPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/shiny.gbapal.lz"); + const u8 gMonIcon_TornadusIncarnate[] = INCBIN_U8("graphics/pokemon/gen_5/tornadus/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tornadus[] = INCBIN_U8("graphics/pokemon/tornadus/footprint.1bpp"); + const u8 gMonFootprint_Tornadus[] = INCBIN_U8("graphics/pokemon/gen_5/tornadus/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/anim_front.4bpp.lz"); - const u32 gMonPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/normal.gbapal.lz"); - const u32 gMonBackPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/back.4bpp.lz"); - const u32 gMonShinyPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/shiny.gbapal.lz"); - const u8 gMonIcon_TornadusTherian[] = INCBIN_U8("graphics/pokemon/tornadus/therian/icon.4bpp"); + const u32 gMonFrontPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/therian/anim_front.4bpp.lz"); + const u32 gMonPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/therian/normal.gbapal.lz"); + const u32 gMonBackPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/therian/back.4bpp.lz"); + const u32 gMonShinyPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/tornadus/therian/shiny.gbapal.lz"); + const u8 gMonIcon_TornadusTherian[] = INCBIN_U8("graphics/pokemon/gen_5/tornadus/therian/icon.4bpp"); #endif //P_FAMILY_TORNADUS #if P_FAMILY_THUNDURUS - const u32 gMonFrontPic_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/anim_front.4bpp.lz"); - const u32 gMonPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/normal.gbapal.lz"); - const u32 gMonBackPic_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/back.4bpp.lz"); - const u32 gMonShinyPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/shiny.gbapal.lz"); - const u8 gMonIcon_ThundurusIncarnate[] = INCBIN_U8("graphics/pokemon/thundurus/icon.4bpp"); + const u32 gMonFrontPic_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/anim_front.4bpp.lz"); + const u32 gMonPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/normal.gbapal.lz"); + const u32 gMonBackPic_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/back.4bpp.lz"); + const u32 gMonShinyPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/shiny.gbapal.lz"); + const u8 gMonIcon_ThundurusIncarnate[] = INCBIN_U8("graphics/pokemon/gen_5/thundurus/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Thundurus[] = INCBIN_U8("graphics/pokemon/thundurus/footprint.1bpp"); + const u8 gMonFootprint_Thundurus[] = INCBIN_U8("graphics/pokemon/gen_5/thundurus/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/anim_front.4bpp.lz"); - const u32 gMonPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/normal.gbapal.lz"); - const u32 gMonBackPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/back.4bpp.lz"); - const u32 gMonShinyPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/shiny.gbapal.lz"); - const u8 gMonIcon_ThundurusTherian[] = INCBIN_U8("graphics/pokemon/thundurus/therian/icon.4bpp"); + const u32 gMonFrontPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/therian/anim_front.4bpp.lz"); + const u32 gMonPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/therian/normal.gbapal.lz"); + const u32 gMonBackPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/therian/back.4bpp.lz"); + const u32 gMonShinyPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/thundurus/therian/shiny.gbapal.lz"); + const u8 gMonIcon_ThundurusTherian[] = INCBIN_U8("graphics/pokemon/gen_5/thundurus/therian/icon.4bpp"); #endif //P_FAMILY_THUNDURUS #if P_FAMILY_RESHIRAM - const u32 gMonFrontPic_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/anim_front.4bpp.lz"); - const u32 gMonPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/normal.gbapal.lz"); - const u32 gMonBackPic_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/back.4bpp.lz"); - const u32 gMonShinyPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/shiny.gbapal.lz"); - const u8 gMonIcon_Reshiram[] = INCBIN_U8("graphics/pokemon/reshiram/icon.4bpp"); + const u32 gMonFrontPic_Reshiram[] = INCBIN_U32("graphics/pokemon/gen_5/reshiram/anim_front.4bpp.lz"); + const u32 gMonPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/gen_5/reshiram/normal.gbapal.lz"); + const u32 gMonBackPic_Reshiram[] = INCBIN_U32("graphics/pokemon/gen_5/reshiram/back.4bpp.lz"); + const u32 gMonShinyPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/gen_5/reshiram/shiny.gbapal.lz"); + const u8 gMonIcon_Reshiram[] = INCBIN_U8("graphics/pokemon/gen_5/reshiram/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Reshiram[] = INCBIN_U8("graphics/pokemon/reshiram/footprint.1bpp"); + const u8 gMonFootprint_Reshiram[] = INCBIN_U8("graphics/pokemon/gen_5/reshiram/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_RESHIRAM #if P_FAMILY_ZEKROM - const u32 gMonFrontPic_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/anim_front.4bpp.lz"); - const u32 gMonPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/normal.gbapal.lz"); - const u32 gMonBackPic_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/back.4bpp.lz"); - const u32 gMonShinyPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/shiny.gbapal.lz"); - const u8 gMonIcon_Zekrom[] = INCBIN_U8("graphics/pokemon/zekrom/icon.4bpp"); + const u32 gMonFrontPic_Zekrom[] = INCBIN_U32("graphics/pokemon/gen_5/zekrom/anim_front.4bpp.lz"); + const u32 gMonPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/gen_5/zekrom/normal.gbapal.lz"); + const u32 gMonBackPic_Zekrom[] = INCBIN_U32("graphics/pokemon/gen_5/zekrom/back.4bpp.lz"); + const u32 gMonShinyPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/gen_5/zekrom/shiny.gbapal.lz"); + const u8 gMonIcon_Zekrom[] = INCBIN_U8("graphics/pokemon/gen_5/zekrom/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Zekrom[] = INCBIN_U8("graphics/pokemon/zekrom/footprint.1bpp"); + const u8 gMonFootprint_Zekrom[] = INCBIN_U8("graphics/pokemon/gen_5/zekrom/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ZEKROM #if P_FAMILY_LANDORUS - const u32 gMonFrontPic_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/anim_front.4bpp.lz"); - const u32 gMonPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/normal.gbapal.lz"); - const u32 gMonBackPic_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/back.4bpp.lz"); - const u32 gMonShinyPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/shiny.gbapal.lz"); - const u8 gMonIcon_LandorusIncarnate[] = INCBIN_U8("graphics/pokemon/landorus/icon.4bpp"); + const u32 gMonFrontPic_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/anim_front.4bpp.lz"); + const u32 gMonPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/normal.gbapal.lz"); + const u32 gMonBackPic_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/back.4bpp.lz"); + const u32 gMonShinyPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/shiny.gbapal.lz"); + const u8 gMonIcon_LandorusIncarnate[] = INCBIN_U8("graphics/pokemon/gen_5/landorus/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Landorus[] = INCBIN_U8("graphics/pokemon/landorus/footprint.1bpp"); + const u8 gMonFootprint_Landorus[] = INCBIN_U8("graphics/pokemon/gen_5/landorus/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/anim_front.4bpp.lz"); - const u32 gMonPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/normal.gbapal.lz"); - const u32 gMonBackPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/back.4bpp.lz"); - const u32 gMonShinyPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/shiny.gbapal.lz"); - const u8 gMonIcon_LandorusTherian[] = INCBIN_U8("graphics/pokemon/landorus/therian/icon.4bpp"); + const u32 gMonFrontPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/therian/anim_front.4bpp.lz"); + const u32 gMonPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/therian/normal.gbapal.lz"); + const u32 gMonBackPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/therian/back.4bpp.lz"); + const u32 gMonShinyPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/gen_5/landorus/therian/shiny.gbapal.lz"); + const u8 gMonIcon_LandorusTherian[] = INCBIN_U8("graphics/pokemon/gen_5/landorus/therian/icon.4bpp"); #endif //P_FAMILY_LANDORUS #if P_FAMILY_ENAMORUS - const u32 gMonFrontPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz"); - const u32 gMonPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz"); - const u32 gMonBackPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz"); - const u32 gMonShinyPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz"); - const u8 gMonIcon_EnamorusIncarnate[] = INCBIN_U8("graphics/pokemon/enamorus/icon.4bpp"); + const u32 gMonFrontPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/front.4bpp.lz"); + const u32 gMonPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/normal.gbapal.lz"); + const u32 gMonBackPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/back.4bpp.lz"); + const u32 gMonShinyPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/shiny.gbapal.lz"); + const u8 gMonIcon_EnamorusIncarnate[] = INCBIN_U8("graphics/pokemon/gen_8/enamorus/icon.4bpp"); #if P_FOOTPRINTS - //const u8 gMonFootprint_Enamorus[] = INCBIN_U8("graphics/pokemon/enamorus/footprint.1bpp"); + //const u8 gMonFootprint_Enamorus[] = INCBIN_U8("graphics/pokemon/gen_8/enamorus/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/front.4bpp.lz"); - const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/normal.gbapal.lz"); - const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/back.4bpp.lz"); - const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/shiny.gbapal.lz"); - const u8 gMonIcon_EnamorusTherian[] = INCBIN_U8("graphics/pokemon/enamorus/therian/icon.4bpp"); + const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/therian/front.4bpp.lz"); + const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/therian/normal.gbapal.lz"); + const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/therian/back.4bpp.lz"); + const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/gen_8/enamorus/therian/shiny.gbapal.lz"); + const u8 gMonIcon_EnamorusTherian[] = INCBIN_U8("graphics/pokemon/gen_8/enamorus/therian/icon.4bpp"); #endif //P_FAMILY_ENAMORUS #if P_FAMILY_KYUREM - const u32 gMonFrontPic_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/anim_front.4bpp.lz"); - const u32 gMonPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/normal.gbapal.lz"); - const u32 gMonBackPic_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/back.4bpp.lz"); - const u32 gMonShinyPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/shiny.gbapal.lz"); - const u8 gMonIcon_Kyurem[] = INCBIN_U8("graphics/pokemon/kyurem/icon.4bpp"); + const u32 gMonFrontPic_Kyurem[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/anim_front.4bpp.lz"); + const u32 gMonPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/normal.gbapal.lz"); + const u32 gMonBackPic_Kyurem[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/back.4bpp.lz"); + const u32 gMonShinyPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/shiny.gbapal.lz"); + const u8 gMonIcon_Kyurem[] = INCBIN_U8("graphics/pokemon/gen_5/kyurem/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kyurem[] = INCBIN_U8("graphics/pokemon/kyurem/footprint.1bpp"); + const u8 gMonFootprint_Kyurem[] = INCBIN_U8("graphics/pokemon/gen_5/kyurem/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_FUSION_FORMS - const u32 gMonFrontPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/anim_front.4bpp.lz"); - const u32 gMonPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/normal.gbapal.lz"); - const u32 gMonBackPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/back.4bpp.lz"); - const u32 gMonShinyPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/shiny.gbapal.lz"); - const u8 gMonIcon_KyuremWhite[] = INCBIN_U8("graphics/pokemon/kyurem/white/icon.4bpp"); + const u32 gMonFrontPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/white/anim_front.4bpp.lz"); + const u32 gMonPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/white/normal.gbapal.lz"); + const u32 gMonBackPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/white/back.4bpp.lz"); + const u32 gMonShinyPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/white/shiny.gbapal.lz"); + const u8 gMonIcon_KyuremWhite[] = INCBIN_U8("graphics/pokemon/gen_5/kyurem/white/icon.4bpp"); - const u32 gMonFrontPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/anim_front.4bpp.lz"); - const u32 gMonPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/normal.gbapal.lz"); - const u32 gMonBackPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/back.4bpp.lz"); - const u32 gMonShinyPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/shiny.gbapal.lz"); - const u8 gMonIcon_KyuremBlack[] = INCBIN_U8("graphics/pokemon/kyurem/black/icon.4bpp"); + const u32 gMonFrontPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/black/anim_front.4bpp.lz"); + const u32 gMonPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/black/normal.gbapal.lz"); + const u32 gMonBackPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/black/back.4bpp.lz"); + const u32 gMonShinyPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/gen_5/kyurem/black/shiny.gbapal.lz"); + const u8 gMonIcon_KyuremBlack[] = INCBIN_U8("graphics/pokemon/gen_5/kyurem/black/icon.4bpp"); #endif //P_FUSION_FORMS #endif //P_FAMILY_KYUREM #if P_FAMILY_KELDEO - const u32 gMonFrontPic_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/anim_front.4bpp.lz"); - const u32 gMonPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/normal.gbapal.lz"); - const u32 gMonBackPic_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/back.4bpp.lz"); - const u32 gMonShinyPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/shiny.gbapal.lz"); - const u8 gMonIcon_KeldeoOrdinary[] = INCBIN_U8("graphics/pokemon/keldeo/icon.4bpp"); + const u32 gMonFrontPic_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/anim_front.4bpp.lz"); + const u32 gMonPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/normal.gbapal.lz"); + const u32 gMonBackPic_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/back.4bpp.lz"); + const u32 gMonShinyPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/shiny.gbapal.lz"); + const u8 gMonIcon_KeldeoOrdinary[] = INCBIN_U8("graphics/pokemon/gen_5/keldeo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Keldeo[] = INCBIN_U8("graphics/pokemon/keldeo/footprint.1bpp"); + const u8 gMonFootprint_Keldeo[] = INCBIN_U8("graphics/pokemon/gen_5/keldeo/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/front.4bpp.lz"); - const u32 gMonPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/normal.gbapal.lz"); - const u32 gMonBackPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/back.4bpp.lz"); - const u32 gMonShinyPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/shiny.gbapal.lz"); - const u8 gMonIcon_KeldeoResolute[] = INCBIN_U8("graphics/pokemon/keldeo/resolute/icon.4bpp"); + const u32 gMonFrontPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/resolute/front.4bpp.lz"); + const u32 gMonPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/resolute/normal.gbapal.lz"); + const u32 gMonBackPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/resolute/back.4bpp.lz"); + const u32 gMonShinyPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/gen_5/keldeo/resolute/shiny.gbapal.lz"); + const u8 gMonIcon_KeldeoResolute[] = INCBIN_U8("graphics/pokemon/gen_5/keldeo/resolute/icon.4bpp"); #endif //P_FAMILY_KELDEO #if P_FAMILY_MELOETTA - const u32 gMonFrontPic_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/anim_front.4bpp.lz"); - const u32 gMonPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/normal.gbapal.lz"); - const u32 gMonBackPic_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/back.4bpp.lz"); - const u32 gMonShinyPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/shiny.gbapal.lz"); - const u8 gMonIcon_MeloettaAria[] = INCBIN_U8("graphics/pokemon/meloetta/icon.4bpp"); + const u32 gMonFrontPic_MeloettaAria[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/anim_front.4bpp.lz"); + const u32 gMonPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/normal.gbapal.lz"); + const u32 gMonBackPic_MeloettaAria[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/back.4bpp.lz"); + const u32 gMonShinyPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/shiny.gbapal.lz"); + const u8 gMonIcon_MeloettaAria[] = INCBIN_U8("graphics/pokemon/gen_5/meloetta/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Meloetta[] = INCBIN_U8("graphics/pokemon/meloetta/footprint.1bpp"); + const u8 gMonFootprint_Meloetta[] = INCBIN_U8("graphics/pokemon/gen_5/meloetta/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/front.4bpp.lz"); - const u32 gMonPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/normal.gbapal.lz"); - const u32 gMonBackPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/back.4bpp.lz"); - const u32 gMonShinyPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/shiny.gbapal.lz"); - const u8 gMonIcon_MeloettaPirouette[] = INCBIN_U8("graphics/pokemon/meloetta/pirouette/icon.4bpp"); + const u32 gMonFrontPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/pirouette/front.4bpp.lz"); + const u32 gMonPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/pirouette/normal.gbapal.lz"); + const u32 gMonBackPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/pirouette/back.4bpp.lz"); + const u32 gMonShinyPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/gen_5/meloetta/pirouette/shiny.gbapal.lz"); + const u8 gMonIcon_MeloettaPirouette[] = INCBIN_U8("graphics/pokemon/gen_5/meloetta/pirouette/icon.4bpp"); #endif //P_FAMILY_MELOETTA #if P_FAMILY_GENESECT - const u32 gMonFrontPic_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/anim_front.4bpp.lz"); - const u32 gMonPalette_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/normal.gbapal.lz"); - const u32 gMonBackPic_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/back.4bpp.lz"); - const u32 gMonShinyPalette_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/shiny.gbapal.lz"); - const u8 gMonIcon_Genesect[] = INCBIN_U8("graphics/pokemon/genesect/icon.4bpp"); + const u32 gMonFrontPic_Genesect[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/anim_front.4bpp.lz"); + const u32 gMonPalette_Genesect[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/normal.gbapal.lz"); + const u32 gMonBackPic_Genesect[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/back.4bpp.lz"); + const u32 gMonShinyPalette_Genesect[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/shiny.gbapal.lz"); + const u8 gMonIcon_Genesect[] = INCBIN_U8("graphics/pokemon/gen_5/genesect/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Genesect[] = INCBIN_U8("graphics/pokemon/genesect/footprint.1bpp"); + const u8 gMonFootprint_Genesect[] = INCBIN_U8("graphics/pokemon/gen_5/genesect/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_GenesectDouseDrive[] = INCBIN_U32("graphics/pokemon/genesect/douse_drive/normal.gbapal.lz"); - const u32 gMonShinyPalette_GenesectDouseDrive[] = INCBIN_U32("graphics/pokemon/genesect/douse_drive/shiny.gbapal.lz"); + const u32 gMonPalette_GenesectDouseDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/douse_drive/normal.gbapal.lz"); + const u32 gMonShinyPalette_GenesectDouseDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/douse_drive/shiny.gbapal.lz"); - const u32 gMonPalette_GenesectShockDrive[] = INCBIN_U32("graphics/pokemon/genesect/shock_drive/normal.gbapal.lz"); - const u32 gMonShinyPalette_GenesectShockDrive[] = INCBIN_U32("graphics/pokemon/genesect/shock_drive/shiny.gbapal.lz"); + const u32 gMonPalette_GenesectShockDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/shock_drive/normal.gbapal.lz"); + const u32 gMonShinyPalette_GenesectShockDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/shock_drive/shiny.gbapal.lz"); - const u32 gMonPalette_GenesectBurnDrive[] = INCBIN_U32("graphics/pokemon/genesect/burn_drive/normal.gbapal.lz"); - const u32 gMonShinyPalette_GenesectBurnDrive[] = INCBIN_U32("graphics/pokemon/genesect/burn_drive/shiny.gbapal.lz"); + const u32 gMonPalette_GenesectBurnDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/burn_drive/normal.gbapal.lz"); + const u32 gMonShinyPalette_GenesectBurnDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/burn_drive/shiny.gbapal.lz"); - const u32 gMonPalette_GenesectChillDrive[] = INCBIN_U32("graphics/pokemon/genesect/chill_drive/normal.gbapal.lz"); - const u32 gMonShinyPalette_GenesectChillDrive[] = INCBIN_U32("graphics/pokemon/genesect/chill_drive/shiny.gbapal.lz"); + const u32 gMonPalette_GenesectChillDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/chill_drive/normal.gbapal.lz"); + const u32 gMonShinyPalette_GenesectChillDrive[] = INCBIN_U32("graphics/pokemon/gen_5/genesect/chill_drive/shiny.gbapal.lz"); #endif //P_FAMILY_GENESECT #if P_FAMILY_CHESPIN - const u32 gMonFrontPic_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/anim_front.4bpp.lz"); - const u32 gMonPalette_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/normal.gbapal.lz"); - const u32 gMonBackPic_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/back.4bpp.lz"); - const u32 gMonShinyPalette_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/shiny.gbapal.lz"); - const u8 gMonIcon_Chespin[] = INCBIN_U8("graphics/pokemon/chespin/icon.4bpp"); + const u32 gMonFrontPic_Chespin[] = INCBIN_U32("graphics/pokemon/gen_6/chespin/anim_front.4bpp.lz"); + const u32 gMonPalette_Chespin[] = INCBIN_U32("graphics/pokemon/gen_6/chespin/normal.gbapal.lz"); + const u32 gMonBackPic_Chespin[] = INCBIN_U32("graphics/pokemon/gen_6/chespin/back.4bpp.lz"); + const u32 gMonShinyPalette_Chespin[] = INCBIN_U32("graphics/pokemon/gen_6/chespin/shiny.gbapal.lz"); + const u8 gMonIcon_Chespin[] = INCBIN_U8("graphics/pokemon/gen_6/chespin/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Chespin[] = INCBIN_U8("graphics/pokemon/chespin/footprint.1bpp"); + const u8 gMonFootprint_Chespin[] = INCBIN_U8("graphics/pokemon/gen_6/chespin/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/anim_front.4bpp.lz"); - const u32 gMonPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/normal.gbapal.lz"); - const u32 gMonBackPic_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/back.4bpp.lz"); - const u32 gMonShinyPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/shiny.gbapal.lz"); - const u8 gMonIcon_Quilladin[] = INCBIN_U8("graphics/pokemon/quilladin/icon.4bpp"); + const u32 gMonFrontPic_Quilladin[] = INCBIN_U32("graphics/pokemon/gen_6/quilladin/anim_front.4bpp.lz"); + const u32 gMonPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/gen_6/quilladin/normal.gbapal.lz"); + const u32 gMonBackPic_Quilladin[] = INCBIN_U32("graphics/pokemon/gen_6/quilladin/back.4bpp.lz"); + const u32 gMonShinyPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/gen_6/quilladin/shiny.gbapal.lz"); + const u8 gMonIcon_Quilladin[] = INCBIN_U8("graphics/pokemon/gen_6/quilladin/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Quilladin[] = INCBIN_U8("graphics/pokemon/quilladin/footprint.1bpp"); + const u8 gMonFootprint_Quilladin[] = INCBIN_U8("graphics/pokemon/gen_6/quilladin/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/anim_front.4bpp.lz"); - const u32 gMonPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/normal.gbapal.lz"); - const u32 gMonBackPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/back.4bpp.lz"); - const u32 gMonShinyPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/shiny.gbapal.lz"); - const u8 gMonIcon_Chesnaught[] = INCBIN_U8("graphics/pokemon/chesnaught/icon.4bpp"); + const u32 gMonFrontPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/gen_6/chesnaught/anim_front.4bpp.lz"); + const u32 gMonPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/gen_6/chesnaught/normal.gbapal.lz"); + const u32 gMonBackPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/gen_6/chesnaught/back.4bpp.lz"); + const u32 gMonShinyPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/gen_6/chesnaught/shiny.gbapal.lz"); + const u8 gMonIcon_Chesnaught[] = INCBIN_U8("graphics/pokemon/gen_6/chesnaught/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Chesnaught[] = INCBIN_U8("graphics/pokemon/chesnaught/footprint.1bpp"); + const u8 gMonFootprint_Chesnaught[] = INCBIN_U8("graphics/pokemon/gen_6/chesnaught/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CHESPIN #if P_FAMILY_FENNEKIN - const u32 gMonFrontPic_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/anim_front.4bpp.lz"); - const u32 gMonPalette_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/normal.gbapal.lz"); - const u32 gMonBackPic_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/back.4bpp.lz"); - const u32 gMonShinyPalette_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/shiny.gbapal.lz"); - const u8 gMonIcon_Fennekin[] = INCBIN_U8("graphics/pokemon/fennekin/icon.4bpp"); + const u32 gMonFrontPic_Fennekin[] = INCBIN_U32("graphics/pokemon/gen_6/fennekin/anim_front.4bpp.lz"); + const u32 gMonPalette_Fennekin[] = INCBIN_U32("graphics/pokemon/gen_6/fennekin/normal.gbapal.lz"); + const u32 gMonBackPic_Fennekin[] = INCBIN_U32("graphics/pokemon/gen_6/fennekin/back.4bpp.lz"); + const u32 gMonShinyPalette_Fennekin[] = INCBIN_U32("graphics/pokemon/gen_6/fennekin/shiny.gbapal.lz"); + const u8 gMonIcon_Fennekin[] = INCBIN_U8("graphics/pokemon/gen_6/fennekin/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Fennekin[] = INCBIN_U8("graphics/pokemon/fennekin/footprint.1bpp"); + const u8 gMonFootprint_Fennekin[] = INCBIN_U8("graphics/pokemon/gen_6/fennekin/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/anim_front.4bpp.lz"); - const u32 gMonPalette_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/normal.gbapal.lz"); - const u32 gMonBackPic_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/back.4bpp.lz"); - const u32 gMonShinyPalette_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/shiny.gbapal.lz"); - const u8 gMonIcon_Braixen[] = INCBIN_U8("graphics/pokemon/braixen/icon.4bpp"); + const u32 gMonFrontPic_Braixen[] = INCBIN_U32("graphics/pokemon/gen_6/braixen/anim_front.4bpp.lz"); + const u32 gMonPalette_Braixen[] = INCBIN_U32("graphics/pokemon/gen_6/braixen/normal.gbapal.lz"); + const u32 gMonBackPic_Braixen[] = INCBIN_U32("graphics/pokemon/gen_6/braixen/back.4bpp.lz"); + const u32 gMonShinyPalette_Braixen[] = INCBIN_U32("graphics/pokemon/gen_6/braixen/shiny.gbapal.lz"); + const u8 gMonIcon_Braixen[] = INCBIN_U8("graphics/pokemon/gen_6/braixen/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Braixen[] = INCBIN_U8("graphics/pokemon/braixen/footprint.1bpp"); + const u8 gMonFootprint_Braixen[] = INCBIN_U8("graphics/pokemon/gen_6/braixen/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/anim_front.4bpp.lz"); - const u32 gMonPalette_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/normal.gbapal.lz"); - const u32 gMonBackPic_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/back.4bpp.lz"); - const u32 gMonShinyPalette_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/shiny.gbapal.lz"); - const u8 gMonIcon_Delphox[] = INCBIN_U8("graphics/pokemon/delphox/icon.4bpp"); + const u32 gMonFrontPic_Delphox[] = INCBIN_U32("graphics/pokemon/gen_6/delphox/anim_front.4bpp.lz"); + const u32 gMonPalette_Delphox[] = INCBIN_U32("graphics/pokemon/gen_6/delphox/normal.gbapal.lz"); + const u32 gMonBackPic_Delphox[] = INCBIN_U32("graphics/pokemon/gen_6/delphox/back.4bpp.lz"); + const u32 gMonShinyPalette_Delphox[] = INCBIN_U32("graphics/pokemon/gen_6/delphox/shiny.gbapal.lz"); + const u8 gMonIcon_Delphox[] = INCBIN_U8("graphics/pokemon/gen_6/delphox/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Delphox[] = INCBIN_U8("graphics/pokemon/delphox/footprint.1bpp"); + const u8 gMonFootprint_Delphox[] = INCBIN_U8("graphics/pokemon/gen_6/delphox/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_FENNEKIN #if P_FAMILY_FROAKIE - const u32 gMonFrontPic_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/anim_front.4bpp.lz"); - const u32 gMonPalette_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/normal.gbapal.lz"); - const u32 gMonBackPic_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/back.4bpp.lz"); - const u32 gMonShinyPalette_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/shiny.gbapal.lz"); - const u8 gMonIcon_Froakie[] = INCBIN_U8("graphics/pokemon/froakie/icon.4bpp"); + const u32 gMonFrontPic_Froakie[] = INCBIN_U32("graphics/pokemon/gen_6/froakie/anim_front.4bpp.lz"); + const u32 gMonPalette_Froakie[] = INCBIN_U32("graphics/pokemon/gen_6/froakie/normal.gbapal.lz"); + const u32 gMonBackPic_Froakie[] = INCBIN_U32("graphics/pokemon/gen_6/froakie/back.4bpp.lz"); + const u32 gMonShinyPalette_Froakie[] = INCBIN_U32("graphics/pokemon/gen_6/froakie/shiny.gbapal.lz"); + const u8 gMonIcon_Froakie[] = INCBIN_U8("graphics/pokemon/gen_6/froakie/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Froakie[] = INCBIN_U8("graphics/pokemon/froakie/footprint.1bpp"); + const u8 gMonFootprint_Froakie[] = INCBIN_U8("graphics/pokemon/gen_6/froakie/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/anim_front.4bpp.lz"); - const u32 gMonPalette_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/normal.gbapal.lz"); - const u32 gMonBackPic_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/back.4bpp.lz"); - const u32 gMonShinyPalette_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/shiny.gbapal.lz"); - const u8 gMonIcon_Frogadier[] = INCBIN_U8("graphics/pokemon/frogadier/icon.4bpp"); + const u32 gMonFrontPic_Frogadier[] = INCBIN_U32("graphics/pokemon/gen_6/frogadier/anim_front.4bpp.lz"); + const u32 gMonPalette_Frogadier[] = INCBIN_U32("graphics/pokemon/gen_6/frogadier/normal.gbapal.lz"); + const u32 gMonBackPic_Frogadier[] = INCBIN_U32("graphics/pokemon/gen_6/frogadier/back.4bpp.lz"); + const u32 gMonShinyPalette_Frogadier[] = INCBIN_U32("graphics/pokemon/gen_6/frogadier/shiny.gbapal.lz"); + const u8 gMonIcon_Frogadier[] = INCBIN_U8("graphics/pokemon/gen_6/frogadier/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Frogadier[] = INCBIN_U8("graphics/pokemon/frogadier/footprint.1bpp"); + const u8 gMonFootprint_Frogadier[] = INCBIN_U8("graphics/pokemon/gen_6/frogadier/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/anim_front.4bpp.lz"); - const u32 gMonPalette_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/normal.gbapal.lz"); - const u32 gMonBackPic_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/back.4bpp.lz"); - const u32 gMonShinyPalette_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/shiny.gbapal.lz"); - const u8 gMonIcon_Greninja[] = INCBIN_U8("graphics/pokemon/greninja/icon.4bpp"); + const u32 gMonFrontPic_Greninja[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/anim_front.4bpp.lz"); + const u32 gMonPalette_Greninja[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/normal.gbapal.lz"); + const u32 gMonBackPic_Greninja[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/back.4bpp.lz"); + const u32 gMonShinyPalette_Greninja[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/shiny.gbapal.lz"); + const u8 gMonIcon_Greninja[] = INCBIN_U8("graphics/pokemon/gen_6/greninja/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Greninja[] = INCBIN_U8("graphics/pokemon/greninja/footprint.1bpp"); + const u8 gMonFootprint_Greninja[] = INCBIN_U8("graphics/pokemon/gen_6/greninja/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/anim_front.4bpp.lz"); - const u32 gMonPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/normal.gbapal.lz"); - const u32 gMonBackPic_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/back.4bpp.lz"); - const u32 gMonShinyPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/shiny.gbapal.lz"); - const u8 gMonIcon_GreninjaAsh[] = INCBIN_U8("graphics/pokemon/greninja/ash/icon.4bpp"); + const u32 gMonFrontPic_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/ash/anim_front.4bpp.lz"); + const u32 gMonPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/ash/normal.gbapal.lz"); + const u32 gMonBackPic_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/ash/back.4bpp.lz"); + const u32 gMonShinyPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/gen_6/greninja/ash/shiny.gbapal.lz"); + const u8 gMonIcon_GreninjaAsh[] = INCBIN_U8("graphics/pokemon/gen_6/greninja/ash/icon.4bpp"); #endif //P_FAMILY_FROAKIE #if P_FAMILY_BUNNELBY - const u32 gMonFrontPic_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/anim_front.4bpp.lz"); - const u32 gMonPalette_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/normal.gbapal.lz"); - const u32 gMonBackPic_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/back.4bpp.lz"); - const u32 gMonShinyPalette_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/shiny.gbapal.lz"); - const u8 gMonIcon_Bunnelby[] = INCBIN_U8("graphics/pokemon/bunnelby/icon.4bpp"); + const u32 gMonFrontPic_Bunnelby[] = INCBIN_U32("graphics/pokemon/gen_6/bunnelby/anim_front.4bpp.lz"); + const u32 gMonPalette_Bunnelby[] = INCBIN_U32("graphics/pokemon/gen_6/bunnelby/normal.gbapal.lz"); + const u32 gMonBackPic_Bunnelby[] = INCBIN_U32("graphics/pokemon/gen_6/bunnelby/back.4bpp.lz"); + const u32 gMonShinyPalette_Bunnelby[] = INCBIN_U32("graphics/pokemon/gen_6/bunnelby/shiny.gbapal.lz"); + const u8 gMonIcon_Bunnelby[] = INCBIN_U8("graphics/pokemon/gen_6/bunnelby/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bunnelby[] = INCBIN_U8("graphics/pokemon/bunnelby/footprint.1bpp"); + const u8 gMonFootprint_Bunnelby[] = INCBIN_U8("graphics/pokemon/gen_6/bunnelby/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/anim_front.4bpp.lz"); - const u32 gMonPalette_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/normal.gbapal.lz"); - const u32 gMonBackPic_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/back.4bpp.lz"); - const u32 gMonShinyPalette_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/shiny.gbapal.lz"); - const u8 gMonIcon_Diggersby[] = INCBIN_U8("graphics/pokemon/diggersby/icon.4bpp"); + const u32 gMonFrontPic_Diggersby[] = INCBIN_U32("graphics/pokemon/gen_6/diggersby/anim_front.4bpp.lz"); + const u32 gMonPalette_Diggersby[] = INCBIN_U32("graphics/pokemon/gen_6/diggersby/normal.gbapal.lz"); + const u32 gMonBackPic_Diggersby[] = INCBIN_U32("graphics/pokemon/gen_6/diggersby/back.4bpp.lz"); + const u32 gMonShinyPalette_Diggersby[] = INCBIN_U32("graphics/pokemon/gen_6/diggersby/shiny.gbapal.lz"); + const u8 gMonIcon_Diggersby[] = INCBIN_U8("graphics/pokemon/gen_6/diggersby/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Diggersby[] = INCBIN_U8("graphics/pokemon/diggersby/footprint.1bpp"); + const u8 gMonFootprint_Diggersby[] = INCBIN_U8("graphics/pokemon/gen_6/diggersby/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BUNNELBY #if P_FAMILY_FLETCHLING - const u32 gMonFrontPic_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/anim_front.4bpp.lz"); - const u32 gMonPalette_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/normal.gbapal.lz"); - const u32 gMonBackPic_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/back.4bpp.lz"); - const u32 gMonShinyPalette_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/shiny.gbapal.lz"); - const u8 gMonIcon_Fletchling[] = INCBIN_U8("graphics/pokemon/fletchling/icon.4bpp"); + const u32 gMonFrontPic_Fletchling[] = INCBIN_U32("graphics/pokemon/gen_6/fletchling/anim_front.4bpp.lz"); + const u32 gMonPalette_Fletchling[] = INCBIN_U32("graphics/pokemon/gen_6/fletchling/normal.gbapal.lz"); + const u32 gMonBackPic_Fletchling[] = INCBIN_U32("graphics/pokemon/gen_6/fletchling/back.4bpp.lz"); + const u32 gMonShinyPalette_Fletchling[] = INCBIN_U32("graphics/pokemon/gen_6/fletchling/shiny.gbapal.lz"); + const u8 gMonIcon_Fletchling[] = INCBIN_U8("graphics/pokemon/gen_6/fletchling/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Fletchling[] = INCBIN_U8("graphics/pokemon/fletchling/footprint.1bpp"); + const u8 gMonFootprint_Fletchling[] = INCBIN_U8("graphics/pokemon/gen_6/fletchling/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/anim_front.4bpp.lz"); - const u32 gMonPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/normal.gbapal.lz"); - const u32 gMonBackPic_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/back.4bpp.lz"); - const u32 gMonShinyPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/shiny.gbapal.lz"); - const u8 gMonIcon_Fletchinder[] = INCBIN_U8("graphics/pokemon/fletchinder/icon.4bpp"); + const u32 gMonFrontPic_Fletchinder[] = INCBIN_U32("graphics/pokemon/gen_6/fletchinder/anim_front.4bpp.lz"); + const u32 gMonPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/gen_6/fletchinder/normal.gbapal.lz"); + const u32 gMonBackPic_Fletchinder[] = INCBIN_U32("graphics/pokemon/gen_6/fletchinder/back.4bpp.lz"); + const u32 gMonShinyPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/gen_6/fletchinder/shiny.gbapal.lz"); + const u8 gMonIcon_Fletchinder[] = INCBIN_U8("graphics/pokemon/gen_6/fletchinder/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Fletchinder[] = INCBIN_U8("graphics/pokemon/fletchinder/footprint.1bpp"); + const u8 gMonFootprint_Fletchinder[] = INCBIN_U8("graphics/pokemon/gen_6/fletchinder/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/anim_front.4bpp.lz"); - const u32 gMonPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/normal.gbapal.lz"); - const u32 gMonBackPic_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/back.4bpp.lz"); - const u32 gMonShinyPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/shiny.gbapal.lz"); - const u8 gMonIcon_Talonflame[] = INCBIN_U8("graphics/pokemon/talonflame/icon.4bpp"); + const u32 gMonFrontPic_Talonflame[] = INCBIN_U32("graphics/pokemon/gen_6/talonflame/anim_front.4bpp.lz"); + const u32 gMonPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/gen_6/talonflame/normal.gbapal.lz"); + const u32 gMonBackPic_Talonflame[] = INCBIN_U32("graphics/pokemon/gen_6/talonflame/back.4bpp.lz"); + const u32 gMonShinyPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/gen_6/talonflame/shiny.gbapal.lz"); + const u8 gMonIcon_Talonflame[] = INCBIN_U8("graphics/pokemon/gen_6/talonflame/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Talonflame[] = INCBIN_U8("graphics/pokemon/talonflame/footprint.1bpp"); + const u8 gMonFootprint_Talonflame[] = INCBIN_U8("graphics/pokemon/gen_6/talonflame/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_FLETCHLING #if P_FAMILY_SCATTERBUG - const u32 gMonFrontPic_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/anim_front.4bpp.lz"); - const u32 gMonPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/normal.gbapal.lz"); - const u32 gMonBackPic_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/back.4bpp.lz"); - const u32 gMonShinyPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/shiny.gbapal.lz"); - const u8 gMonIcon_Scatterbug[] = INCBIN_U8("graphics/pokemon/scatterbug/icon.4bpp"); + const u32 gMonFrontPic_Scatterbug[] = INCBIN_U32("graphics/pokemon/gen_6/scatterbug/anim_front.4bpp.lz"); + const u32 gMonPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/gen_6/scatterbug/normal.gbapal.lz"); + const u32 gMonBackPic_Scatterbug[] = INCBIN_U32("graphics/pokemon/gen_6/scatterbug/back.4bpp.lz"); + const u32 gMonShinyPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/gen_6/scatterbug/shiny.gbapal.lz"); + const u8 gMonIcon_Scatterbug[] = INCBIN_U8("graphics/pokemon/gen_6/scatterbug/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Scatterbug[] = INCBIN_U8("graphics/pokemon/scatterbug/footprint.1bpp"); + const u8 gMonFootprint_Scatterbug[] = INCBIN_U8("graphics/pokemon/gen_6/scatterbug/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/anim_front.4bpp.lz"); - const u32 gMonPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/normal.gbapal.lz"); - const u32 gMonBackPic_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/back.4bpp.lz"); - const u32 gMonShinyPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/shiny.gbapal.lz"); - const u8 gMonIcon_Spewpa[] = INCBIN_U8("graphics/pokemon/spewpa/icon.4bpp"); + const u32 gMonFrontPic_Spewpa[] = INCBIN_U32("graphics/pokemon/gen_6/spewpa/anim_front.4bpp.lz"); + const u32 gMonPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/gen_6/spewpa/normal.gbapal.lz"); + const u32 gMonBackPic_Spewpa[] = INCBIN_U32("graphics/pokemon/gen_6/spewpa/back.4bpp.lz"); + const u32 gMonShinyPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/gen_6/spewpa/shiny.gbapal.lz"); + const u8 gMonIcon_Spewpa[] = INCBIN_U8("graphics/pokemon/gen_6/spewpa/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Spewpa[] = INCBIN_U8("graphics/pokemon/spewpa/footprint.1bpp"); + const u8 gMonFootprint_Spewpa[] = INCBIN_U8("graphics/pokemon/gen_6/spewpa/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonIcySnow[] = INCBIN_U8("graphics/pokemon/vivillon/meadow/icon.4bpp"); + const u32 gMonFrontPic_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonIcySnow[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/meadow/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Vivillon[] = INCBIN_U8("graphics/pokemon/vivillon/footprint.1bpp"); + const u8 gMonFootprint_Vivillon[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonPolar[] = INCBIN_U8("graphics/pokemon/vivillon/polar/icon.4bpp"); + const u32 gMonFrontPic_VivillonPolar[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/polar/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/polar/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonPolar[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/polar/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/polar/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonPolar[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/polar/icon.4bpp"); - const u32 gMonFrontPic_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonTundra[] = INCBIN_U8("graphics/pokemon/vivillon/tundra/icon.4bpp"); + const u32 gMonFrontPic_VivillonTundra[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/tundra/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/tundra/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonTundra[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/tundra/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/tundra/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonTundra[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/tundra/icon.4bpp"); - const u32 gMonFrontPic_VivillonContinental[] = INCBIN_U32("graphics/pokemon/vivillon/continental/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonContinental[] = INCBIN_U32("graphics/pokemon/vivillon/continental/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonContinental[] = INCBIN_U32("graphics/pokemon/vivillon/continental/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonContinental[] = INCBIN_U32("graphics/pokemon/vivillon/continental/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonContinental[] = INCBIN_U8("graphics/pokemon/vivillon/continental/icon.4bpp"); + const u32 gMonFrontPic_VivillonContinental[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/continental/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonContinental[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/continental/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonContinental[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/continental/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonContinental[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/continental/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonContinental[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/continental/icon.4bpp"); - const u32 gMonFrontPic_VivillonGarden[] = INCBIN_U32("graphics/pokemon/vivillon/garden/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonGarden[] = INCBIN_U32("graphics/pokemon/vivillon/garden/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonGarden[] = INCBIN_U32("graphics/pokemon/vivillon/garden/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonGarden[] = INCBIN_U32("graphics/pokemon/vivillon/garden/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonGarden[] = INCBIN_U8("graphics/pokemon/vivillon/garden/icon.4bpp"); + const u32 gMonFrontPic_VivillonGarden[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/garden/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonGarden[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/garden/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonGarden[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/garden/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonGarden[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/garden/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonGarden[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/garden/icon.4bpp"); - const u32 gMonFrontPic_VivillonElegant[] = INCBIN_U32("graphics/pokemon/vivillon/elegant/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonElegant[] = INCBIN_U32("graphics/pokemon/vivillon/elegant/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonElegant[] = INCBIN_U32("graphics/pokemon/vivillon/elegant/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonElegant[] = INCBIN_U32("graphics/pokemon/vivillon/elegant/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonElegant[] = INCBIN_U8("graphics/pokemon/vivillon/elegant/icon.4bpp"); + const u32 gMonFrontPic_VivillonElegant[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/elegant/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonElegant[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/elegant/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonElegant[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/elegant/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonElegant[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/elegant/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonElegant[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/elegant/icon.4bpp"); - const u32 gMonFrontPic_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonMeadow[] = INCBIN_U8("graphics/pokemon/vivillon/meadow/icon.4bpp"); + const u32 gMonFrontPic_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/meadow/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/meadow/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/meadow/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/meadow/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonMeadow[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/meadow/icon.4bpp"); - const u32 gMonFrontPic_VivillonModern[] = INCBIN_U32("graphics/pokemon/vivillon/modern/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonModern[] = INCBIN_U32("graphics/pokemon/vivillon/modern/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonModern[] = INCBIN_U32("graphics/pokemon/vivillon/modern/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonModern[] = INCBIN_U32("graphics/pokemon/vivillon/modern/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonModern[] = INCBIN_U8("graphics/pokemon/vivillon/modern/icon.4bpp"); + const u32 gMonFrontPic_VivillonModern[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/modern/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonModern[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/modern/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonModern[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/modern/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonModern[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/modern/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonModern[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/modern/icon.4bpp"); - const u32 gMonFrontPic_VivillonMarine[] = INCBIN_U32("graphics/pokemon/vivillon/marine/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonMarine[] = INCBIN_U32("graphics/pokemon/vivillon/marine/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonMarine[] = INCBIN_U32("graphics/pokemon/vivillon/marine/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonMarine[] = INCBIN_U32("graphics/pokemon/vivillon/marine/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonMarine[] = INCBIN_U8("graphics/pokemon/vivillon/marine/icon.4bpp"); + const u32 gMonFrontPic_VivillonMarine[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/marine/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonMarine[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/marine/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonMarine[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/marine/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonMarine[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/marine/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonMarine[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/marine/icon.4bpp"); - const u32 gMonFrontPic_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/vivillon/archipelago/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/vivillon/archipelago/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/vivillon/archipelago/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/vivillon/archipelago/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonArchipelago[] = INCBIN_U8("graphics/pokemon/vivillon/archipelago/icon.4bpp"); + const u32 gMonFrontPic_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/archipelago/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/archipelago/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/archipelago/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/archipelago/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonArchipelago[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/archipelago/icon.4bpp"); - const u32 gMonFrontPic_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/vivillon/high_plains/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/vivillon/high_plains/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/vivillon/high_plains/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/vivillon/high_plains/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonHighPlains[] = INCBIN_U8("graphics/pokemon/vivillon/high_plains/icon.4bpp"); + const u32 gMonFrontPic_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/high_plains/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/high_plains/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/high_plains/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/high_plains/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonHighPlains[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/high_plains/icon.4bpp"); - const u32 gMonFrontPic_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/vivillon/sandstorm/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/vivillon/sandstorm/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/vivillon/sandstorm/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/vivillon/sandstorm/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonSandstorm[] = INCBIN_U8("graphics/pokemon/vivillon/sandstorm/icon.4bpp"); + const u32 gMonFrontPic_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sandstorm/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sandstorm/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sandstorm/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sandstorm/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonSandstorm[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/sandstorm/icon.4bpp"); - const u32 gMonFrontPic_VivillonRiver[] = INCBIN_U32("graphics/pokemon/vivillon/river/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonRiver[] = INCBIN_U32("graphics/pokemon/vivillon/river/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonRiver[] = INCBIN_U32("graphics/pokemon/vivillon/river/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonRiver[] = INCBIN_U32("graphics/pokemon/vivillon/river/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonRiver[] = INCBIN_U8("graphics/pokemon/vivillon/river/icon.4bpp"); + const u32 gMonFrontPic_VivillonRiver[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/river/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonRiver[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/river/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonRiver[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/river/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonRiver[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/river/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonRiver[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/river/icon.4bpp"); - const u32 gMonFrontPic_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/vivillon/monsoon/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/vivillon/monsoon/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/vivillon/monsoon/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/vivillon/monsoon/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonMonsoon[] = INCBIN_U8("graphics/pokemon/vivillon/monsoon/icon.4bpp"); + const u32 gMonFrontPic_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/monsoon/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/monsoon/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/monsoon/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/monsoon/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonMonsoon[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/monsoon/icon.4bpp"); - const u32 gMonFrontPic_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/vivillon/savanna/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/vivillon/savanna/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/vivillon/savanna/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/vivillon/savanna/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonSavanna[] = INCBIN_U8("graphics/pokemon/vivillon/savanna/icon.4bpp"); + const u32 gMonFrontPic_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/savanna/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/savanna/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/savanna/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/savanna/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonSavanna[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/savanna/icon.4bpp"); - const u32 gMonFrontPic_VivillonSun[] = INCBIN_U32("graphics/pokemon/vivillon/sun/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonSun[] = INCBIN_U32("graphics/pokemon/vivillon/sun/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonSun[] = INCBIN_U32("graphics/pokemon/vivillon/sun/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonSun[] = INCBIN_U32("graphics/pokemon/vivillon/sun/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonSun[] = INCBIN_U8("graphics/pokemon/vivillon/sun/icon.4bpp"); + const u32 gMonFrontPic_VivillonSun[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sun/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonSun[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sun/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonSun[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sun/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonSun[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/sun/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonSun[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/sun/icon.4bpp"); - const u32 gMonFrontPic_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/ocean/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/ocean/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/ocean/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/ocean/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonOcean[] = INCBIN_U8("graphics/pokemon/vivillon/ocean/icon.4bpp"); + const u32 gMonFrontPic_VivillonOcean[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/ocean/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonOcean[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/ocean/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonOcean[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/ocean/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonOcean[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/ocean/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonOcean[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/ocean/icon.4bpp"); - const u32 gMonFrontPic_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonJungle[] = INCBIN_U8("graphics/pokemon/vivillon/jungle/icon.4bpp"); + const u32 gMonFrontPic_VivillonJungle[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/jungle/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonJungle[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/jungle/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonJungle[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/jungle/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonJungle[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/jungle/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonJungle[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/jungle/icon.4bpp"); - const u32 gMonFrontPic_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonFancy[] = INCBIN_U8("graphics/pokemon/vivillon/fancy/icon.4bpp"); + const u32 gMonFrontPic_VivillonFancy[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/fancy/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonFancy[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/fancy/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonFancy[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/fancy/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonFancy[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/fancy/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonFancy[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/fancy/icon.4bpp"); - const u32 gMonFrontPic_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/anim_front.4bpp.lz"); - const u32 gMonPalette_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/normal.gbapal.lz"); - const u32 gMonBackPic_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/back.4bpp.lz"); - const u32 gMonShinyPalette_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/shiny.gbapal.lz"); - const u8 gMonIcon_VivillonPokeBall[] = INCBIN_U8("graphics/pokemon/vivillon/poke_ball/icon.4bpp"); + const u32 gMonFrontPic_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/poke_ball/anim_front.4bpp.lz"); + const u32 gMonPalette_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/poke_ball/normal.gbapal.lz"); + const u32 gMonBackPic_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/poke_ball/back.4bpp.lz"); + const u32 gMonShinyPalette_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/gen_6/vivillon/poke_ball/shiny.gbapal.lz"); + const u8 gMonIcon_VivillonPokeBall[] = INCBIN_U8("graphics/pokemon/gen_6/vivillon/poke_ball/icon.4bpp"); #endif //P_FAMILY_SCATTERBUG #if P_FAMILY_LITLEO - const u32 gMonFrontPic_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/anim_front.4bpp.lz"); - const u32 gMonPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/normal.gbapal.lz"); - const u32 gMonBackPic_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/back.4bpp.lz"); - const u32 gMonShinyPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/shiny.gbapal.lz"); - const u8 gMonIcon_Litleo[] = INCBIN_U8("graphics/pokemon/litleo/icon.4bpp"); + const u32 gMonFrontPic_Litleo[] = INCBIN_U32("graphics/pokemon/gen_6/litleo/anim_front.4bpp.lz"); + const u32 gMonPalette_Litleo[] = INCBIN_U32("graphics/pokemon/gen_6/litleo/normal.gbapal.lz"); + const u32 gMonBackPic_Litleo[] = INCBIN_U32("graphics/pokemon/gen_6/litleo/back.4bpp.lz"); + const u32 gMonShinyPalette_Litleo[] = INCBIN_U32("graphics/pokemon/gen_6/litleo/shiny.gbapal.lz"); + const u8 gMonIcon_Litleo[] = INCBIN_U8("graphics/pokemon/gen_6/litleo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Litleo[] = INCBIN_U8("graphics/pokemon/litleo/footprint.1bpp"); + const u8 gMonFootprint_Litleo[] = INCBIN_U8("graphics/pokemon/gen_6/litleo/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/anim_front.4bpp.lz"); - const u32 gMonPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/normal.gbapal.lz"); - const u32 gMonBackPic_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/back.4bpp.lz"); - const u32 gMonShinyPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/shiny.gbapal.lz"); - const u8 gMonIcon_Pyroar[] = INCBIN_U8("graphics/pokemon/pyroar/icon.4bpp"); + const u32 gMonFrontPic_Pyroar[] = INCBIN_U32("graphics/pokemon/gen_6/pyroar/anim_front.4bpp.lz"); + const u32 gMonPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/gen_6/pyroar/normal.gbapal.lz"); + const u32 gMonBackPic_Pyroar[] = INCBIN_U32("graphics/pokemon/gen_6/pyroar/back.4bpp.lz"); + const u32 gMonShinyPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/gen_6/pyroar/shiny.gbapal.lz"); + const u8 gMonIcon_Pyroar[] = INCBIN_U8("graphics/pokemon/gen_6/pyroar/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pyroar[] = INCBIN_U8("graphics/pokemon/pyroar/footprint.1bpp"); + const u8 gMonFootprint_Pyroar[] = INCBIN_U8("graphics/pokemon/gen_6/pyroar/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/anim_frontf.4bpp.lz"); - const u32 gMonBackPic_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/backf.4bpp.lz"); - const u8 gMonIcon_PyroarF[] = INCBIN_U8("graphics/pokemon/pyroar/iconf.4bpp"); + const u32 gMonFrontPic_PyroarF[] = INCBIN_U32("graphics/pokemon/gen_6/pyroar/anim_frontf.4bpp.lz"); + const u32 gMonBackPic_PyroarF[] = INCBIN_U32("graphics/pokemon/gen_6/pyroar/backf.4bpp.lz"); + const u8 gMonIcon_PyroarF[] = INCBIN_U8("graphics/pokemon/gen_6/pyroar/iconf.4bpp"); #endif //P_FAMILY_LITLEO #if P_FAMILY_FLABEBE - const u32 gMonFrontPic_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/anim_front.4bpp.lz"); - const u32 gMonBackPic_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/back.4bpp.lz"); + const u32 gMonFrontPic_Flabebe[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/anim_front.4bpp.lz"); + const u32 gMonBackPic_Flabebe[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/back.4bpp.lz"); #if P_FOOTPRINTS - const u8 gMonFootprint_Flabebe[] = INCBIN_U8("graphics/pokemon/flabebe/footprint.1bpp"); + const u8 gMonFootprint_Flabebe[] = INCBIN_U8("graphics/pokemon/gen_6/flabebe/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/flabebe/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/flabebe/shiny.gbapal.lz"); - const u8 gMonIcon_FlabebeRedFlower[] = INCBIN_U8("graphics/pokemon/flabebe/icon.4bpp"); + const u32 gMonPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/shiny.gbapal.lz"); + const u8 gMonIcon_FlabebeRedFlower[] = INCBIN_U8("graphics/pokemon/gen_6/flabebe/icon.4bpp"); - const u32 gMonPalette_FlabebeYellowFlower[] = INCBIN_U32("graphics/pokemon/flabebe/yellow_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlabebeYellowFlower[] = INCBIN_U32("graphics/pokemon/flabebe/yellow_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlabebeYellowFlower[] = INCBIN_U8("graphics/pokemon/flabebe/yellow_flower/icon.4bpp"); + const u32 gMonPalette_FlabebeYellowFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/yellow_flower/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlabebeYellowFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/yellow_flower/shiny.gbapal.lz"); + const u8 gMonIcon_FlabebeYellowFlower[] = INCBIN_U8("graphics/pokemon/gen_6/flabebe/yellow_flower/icon.4bpp"); - const u32 gMonPalette_FlabebeOrangeFlower[] = INCBIN_U32("graphics/pokemon/flabebe/orange_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlabebeOrangeFlower[] = INCBIN_U32("graphics/pokemon/flabebe/orange_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlabebeOrangeFlower[] = INCBIN_U8("graphics/pokemon/flabebe/orange_flower/icon.4bpp"); + const u32 gMonPalette_FlabebeOrangeFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/orange_flower/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlabebeOrangeFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/orange_flower/shiny.gbapal.lz"); + const u8 gMonIcon_FlabebeOrangeFlower[] = INCBIN_U8("graphics/pokemon/gen_6/flabebe/orange_flower/icon.4bpp"); - const u32 gMonPalette_FlabebeBlueFlower[] = INCBIN_U32("graphics/pokemon/flabebe/blue_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlabebeBlueFlower[] = INCBIN_U32("graphics/pokemon/flabebe/blue_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlabebeBlueFlower[] = INCBIN_U8("graphics/pokemon/flabebe/blue_flower/icon.4bpp"); + const u32 gMonPalette_FlabebeBlueFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/blue_flower/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlabebeBlueFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/blue_flower/shiny.gbapal.lz"); + const u8 gMonIcon_FlabebeBlueFlower[] = INCBIN_U8("graphics/pokemon/gen_6/flabebe/blue_flower/icon.4bpp"); - const u32 gMonPalette_FlabebeWhiteFlower[] = INCBIN_U32("graphics/pokemon/flabebe/white_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlabebeWhiteFlower[] = INCBIN_U32("graphics/pokemon/flabebe/white_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlabebeWhiteFlower[] = INCBIN_U8("graphics/pokemon/flabebe/white_flower/icon.4bpp"); + const u32 gMonPalette_FlabebeWhiteFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/white_flower/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlabebeWhiteFlower[] = INCBIN_U32("graphics/pokemon/gen_6/flabebe/white_flower/shiny.gbapal.lz"); + const u8 gMonIcon_FlabebeWhiteFlower[] = INCBIN_U8("graphics/pokemon/gen_6/flabebe/white_flower/icon.4bpp"); - const u32 gMonFrontPic_Floette[] = INCBIN_U32("graphics/pokemon/floette/anim_front.4bpp.lz"); - const u32 gMonBackPic_Floette[] = INCBIN_U32("graphics/pokemon/floette/back.4bpp.lz"); + const u32 gMonFrontPic_Floette[] = INCBIN_U32("graphics/pokemon/gen_6/floette/anim_front.4bpp.lz"); + const u32 gMonBackPic_Floette[] = INCBIN_U32("graphics/pokemon/gen_6/floette/back.4bpp.lz"); #if P_FOOTPRINTS - const u8 gMonFootprint_Floette[] = INCBIN_U8("graphics/pokemon/floette/footprint.1bpp"); + const u8 gMonFootprint_Floette[] = INCBIN_U8("graphics/pokemon/gen_6/floette/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/floette/normal.gbapal.lz"); - const u32 gMonShinyPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/floette/shiny.gbapal.lz"); - const u8 gMonIcon_FloetteRedFlower[] = INCBIN_U8("graphics/pokemon/floette/icon.4bpp"); + const u32 gMonPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/normal.gbapal.lz"); + const u32 gMonShinyPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/shiny.gbapal.lz"); + const u8 gMonIcon_FloetteRedFlower[] = INCBIN_U8("graphics/pokemon/gen_6/floette/icon.4bpp"); - const u32 gMonPalette_FloetteYellowFlower[] = INCBIN_U32("graphics/pokemon/floette/yellow_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FloetteYellowFlower[] = INCBIN_U32("graphics/pokemon/floette/yellow_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FloetteYellowFlower[] = INCBIN_U8("graphics/pokemon/floette/yellow_flower/icon.4bpp"); + const u32 gMonPalette_FloetteYellowFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/yellow_flower/normal.gbapal.lz"); + const u32 gMonShinyPalette_FloetteYellowFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/yellow_flower/shiny.gbapal.lz"); + const u8 gMonIcon_FloetteYellowFlower[] = INCBIN_U8("graphics/pokemon/gen_6/floette/yellow_flower/icon.4bpp"); - const u32 gMonPalette_FloetteOrangeFlower[] = INCBIN_U32("graphics/pokemon/floette/orange_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FloetteOrangeFlower[] = INCBIN_U32("graphics/pokemon/floette/orange_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FloetteOrangeFlower[] = INCBIN_U8("graphics/pokemon/floette/orange_flower/icon.4bpp"); + const u32 gMonPalette_FloetteOrangeFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/orange_flower/normal.gbapal.lz"); + const u32 gMonShinyPalette_FloetteOrangeFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/orange_flower/shiny.gbapal.lz"); + const u8 gMonIcon_FloetteOrangeFlower[] = INCBIN_U8("graphics/pokemon/gen_6/floette/orange_flower/icon.4bpp"); - const u32 gMonPalette_FloetteBlueFlower[] = INCBIN_U32("graphics/pokemon/floette/blue_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FloetteBlueFlower[] = INCBIN_U32("graphics/pokemon/floette/blue_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FloetteBlueFlower[] = INCBIN_U8("graphics/pokemon/floette/blue_flower/icon.4bpp"); + const u32 gMonPalette_FloetteBlueFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/blue_flower/normal.gbapal.lz"); + const u32 gMonShinyPalette_FloetteBlueFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/blue_flower/shiny.gbapal.lz"); + const u8 gMonIcon_FloetteBlueFlower[] = INCBIN_U8("graphics/pokemon/gen_6/floette/blue_flower/icon.4bpp"); - const u32 gMonPalette_FloetteWhiteFlower[] = INCBIN_U32("graphics/pokemon/floette/white_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FloetteWhiteFlower[] = INCBIN_U32("graphics/pokemon/floette/white_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FloetteWhiteFlower[] = INCBIN_U8("graphics/pokemon/floette/white_flower/icon.4bpp"); + const u32 gMonPalette_FloetteWhiteFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/white_flower/normal.gbapal.lz"); + const u32 gMonShinyPalette_FloetteWhiteFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/white_flower/shiny.gbapal.lz"); + const u8 gMonIcon_FloetteWhiteFlower[] = INCBIN_U8("graphics/pokemon/gen_6/floette/white_flower/icon.4bpp"); - const u32 gMonFrontPic_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/anim_front.4bpp.lz"); - const u32 gMonPalette_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/normal.gbapal.lz"); - const u32 gMonBackPic_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/back.4bpp.lz"); - const u32 gMonShinyPalette_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FloetteEternalFlower[] = INCBIN_U8("graphics/pokemon/floette/eternal_flower/icon.4bpp"); + const u32 gMonFrontPic_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/eternal_flower/anim_front.4bpp.lz"); + const u32 gMonPalette_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/eternal_flower/normal.gbapal.lz"); + const u32 gMonBackPic_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/eternal_flower/back.4bpp.lz"); + const u32 gMonShinyPalette_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/gen_6/floette/eternal_flower/shiny.gbapal.lz"); + const u8 gMonIcon_FloetteEternalFlower[] = INCBIN_U8("graphics/pokemon/gen_6/floette/eternal_flower/icon.4bpp"); - const u32 gMonFrontPic_Florges[] = INCBIN_U32("graphics/pokemon/florges/anim_front.4bpp.lz"); - const u32 gMonBackPic_Florges[] = INCBIN_U32("graphics/pokemon/florges/back.4bpp.lz"); + const u32 gMonFrontPic_Florges[] = INCBIN_U32("graphics/pokemon/gen_6/florges/anim_front.4bpp.lz"); + const u32 gMonBackPic_Florges[] = INCBIN_U32("graphics/pokemon/gen_6/florges/back.4bpp.lz"); #if P_FOOTPRINTS - const u8 gMonFootprint_Florges[] = INCBIN_U8("graphics/pokemon/florges/footprint.1bpp"); + const u8 gMonFootprint_Florges[] = INCBIN_U8("graphics/pokemon/gen_6/florges/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/florges/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/florges/shiny.gbapal.lz"); - const u8 gMonIcon_FlorgesRedFlower[] = INCBIN_U8("graphics/pokemon/florges/icon.4bpp"); + const u32 gMonPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/shiny.gbapal.lz"); + const u8 gMonIcon_FlorgesRedFlower[] = INCBIN_U8("graphics/pokemon/gen_6/florges/icon.4bpp"); - const u32 gMonPalette_FlorgesYellowFlower[] = INCBIN_U32("graphics/pokemon/florges/yellow_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlorgesYellowFlower[] = INCBIN_U32("graphics/pokemon/florges/yellow_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlorgesYellowFlower[] = INCBIN_U8("graphics/pokemon/florges/yellow_flower/icon.4bpp"); + const u32 gMonPalette_FlorgesYellowFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/yellow_flower/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlorgesYellowFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/yellow_flower/shiny.gbapal.lz"); + const u8 gMonIcon_FlorgesYellowFlower[] = INCBIN_U8("graphics/pokemon/gen_6/florges/yellow_flower/icon.4bpp"); - const u32 gMonPalette_FlorgesOrangeFlower[] = INCBIN_U32("graphics/pokemon/florges/orange_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlorgesOrangeFlower[] = INCBIN_U32("graphics/pokemon/florges/orange_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlorgesOrangeFlower[] = INCBIN_U8("graphics/pokemon/florges/orange_flower/icon.4bpp"); + const u32 gMonPalette_FlorgesOrangeFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/orange_flower/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlorgesOrangeFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/orange_flower/shiny.gbapal.lz"); + const u8 gMonIcon_FlorgesOrangeFlower[] = INCBIN_U8("graphics/pokemon/gen_6/florges/orange_flower/icon.4bpp"); - const u32 gMonPalette_FlorgesBlueFlower[] = INCBIN_U32("graphics/pokemon/florges/blue_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlorgesBlueFlower[] = INCBIN_U32("graphics/pokemon/florges/blue_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlorgesBlueFlower[] = INCBIN_U8("graphics/pokemon/florges/blue_flower/icon.4bpp"); + const u32 gMonPalette_FlorgesBlueFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/blue_flower/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlorgesBlueFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/blue_flower/shiny.gbapal.lz"); + const u8 gMonIcon_FlorgesBlueFlower[] = INCBIN_U8("graphics/pokemon/gen_6/florges/blue_flower/icon.4bpp"); - const u32 gMonPalette_FlorgesWhiteFlower[] = INCBIN_U32("graphics/pokemon/florges/white_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlorgesWhiteFlower[] = INCBIN_U32("graphics/pokemon/florges/white_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlorgesWhiteFlower[] = INCBIN_U8("graphics/pokemon/florges/white_flower/icon.4bpp"); + const u32 gMonPalette_FlorgesWhiteFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/white_flower/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlorgesWhiteFlower[] = INCBIN_U32("graphics/pokemon/gen_6/florges/white_flower/shiny.gbapal.lz"); + const u8 gMonIcon_FlorgesWhiteFlower[] = INCBIN_U8("graphics/pokemon/gen_6/florges/white_flower/icon.4bpp"); #endif //P_FAMILY_FLABEBE #if P_FAMILY_SKIDDO - const u32 gMonFrontPic_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/anim_front.4bpp.lz"); - const u32 gMonPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/normal.gbapal.lz"); - const u32 gMonBackPic_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/back.4bpp.lz"); - const u32 gMonShinyPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/shiny.gbapal.lz"); - const u8 gMonIcon_Skiddo[] = INCBIN_U8("graphics/pokemon/skiddo/icon.4bpp"); + const u32 gMonFrontPic_Skiddo[] = INCBIN_U32("graphics/pokemon/gen_6/skiddo/anim_front.4bpp.lz"); + const u32 gMonPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/gen_6/skiddo/normal.gbapal.lz"); + const u32 gMonBackPic_Skiddo[] = INCBIN_U32("graphics/pokemon/gen_6/skiddo/back.4bpp.lz"); + const u32 gMonShinyPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/gen_6/skiddo/shiny.gbapal.lz"); + const u8 gMonIcon_Skiddo[] = INCBIN_U8("graphics/pokemon/gen_6/skiddo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Skiddo[] = INCBIN_U8("graphics/pokemon/skiddo/footprint.1bpp"); + const u8 gMonFootprint_Skiddo[] = INCBIN_U8("graphics/pokemon/gen_6/skiddo/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/anim_front.4bpp.lz"); - const u32 gMonPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/normal.gbapal.lz"); - const u32 gMonBackPic_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/back.4bpp.lz"); - const u32 gMonShinyPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/shiny.gbapal.lz"); - const u8 gMonIcon_Gogoat[] = INCBIN_U8("graphics/pokemon/gogoat/icon.4bpp"); + const u32 gMonFrontPic_Gogoat[] = INCBIN_U32("graphics/pokemon/gen_6/gogoat/anim_front.4bpp.lz"); + const u32 gMonPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gen_6/gogoat/normal.gbapal.lz"); + const u32 gMonBackPic_Gogoat[] = INCBIN_U32("graphics/pokemon/gen_6/gogoat/back.4bpp.lz"); + const u32 gMonShinyPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gen_6/gogoat/shiny.gbapal.lz"); + const u8 gMonIcon_Gogoat[] = INCBIN_U8("graphics/pokemon/gen_6/gogoat/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gogoat[] = INCBIN_U8("graphics/pokemon/gogoat/footprint.1bpp"); + const u8 gMonFootprint_Gogoat[] = INCBIN_U8("graphics/pokemon/gen_6/gogoat/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SKIDDO #if P_FAMILY_PANCHAM - const u32 gMonFrontPic_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/anim_front.4bpp.lz"); - const u32 gMonPalette_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/normal.gbapal.lz"); - const u32 gMonBackPic_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/back.4bpp.lz"); - const u32 gMonShinyPalette_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/shiny.gbapal.lz"); - const u8 gMonIcon_Pancham[] = INCBIN_U8("graphics/pokemon/pancham/icon.4bpp"); + const u32 gMonFrontPic_Pancham[] = INCBIN_U32("graphics/pokemon/gen_6/pancham/anim_front.4bpp.lz"); + const u32 gMonPalette_Pancham[] = INCBIN_U32("graphics/pokemon/gen_6/pancham/normal.gbapal.lz"); + const u32 gMonBackPic_Pancham[] = INCBIN_U32("graphics/pokemon/gen_6/pancham/back.4bpp.lz"); + const u32 gMonShinyPalette_Pancham[] = INCBIN_U32("graphics/pokemon/gen_6/pancham/shiny.gbapal.lz"); + const u8 gMonIcon_Pancham[] = INCBIN_U8("graphics/pokemon/gen_6/pancham/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pancham[] = INCBIN_U8("graphics/pokemon/pancham/footprint.1bpp"); + const u8 gMonFootprint_Pancham[] = INCBIN_U8("graphics/pokemon/gen_6/pancham/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/anim_front.4bpp.lz"); - const u32 gMonPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/normal.gbapal.lz"); - const u32 gMonBackPic_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/back.4bpp.lz"); - const u32 gMonShinyPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/shiny.gbapal.lz"); - const u8 gMonIcon_Pangoro[] = INCBIN_U8("graphics/pokemon/pangoro/icon.4bpp"); + const u32 gMonFrontPic_Pangoro[] = INCBIN_U32("graphics/pokemon/gen_6/pangoro/anim_front.4bpp.lz"); + const u32 gMonPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/gen_6/pangoro/normal.gbapal.lz"); + const u32 gMonBackPic_Pangoro[] = INCBIN_U32("graphics/pokemon/gen_6/pangoro/back.4bpp.lz"); + const u32 gMonShinyPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/gen_6/pangoro/shiny.gbapal.lz"); + const u8 gMonIcon_Pangoro[] = INCBIN_U8("graphics/pokemon/gen_6/pangoro/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pangoro[] = INCBIN_U8("graphics/pokemon/pangoro/footprint.1bpp"); + const u8 gMonFootprint_Pangoro[] = INCBIN_U8("graphics/pokemon/gen_6/pangoro/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PANCHAM #if P_FAMILY_FURFROU - const u32 gMonFrontPic_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouNatural[] = INCBIN_U8("graphics/pokemon/furfrou/icon.4bpp"); + const u32 gMonFrontPic_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouNatural[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Furfrou[] = INCBIN_U8("graphics/pokemon/furfrou/footprint.1bpp"); + const u8 gMonFootprint_Furfrou[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouHeartTrim[] = INCBIN_U8("graphics/pokemon/furfrou/heart_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/heart_trim/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/heart_trim/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/heart_trim/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/heart_trim/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouHeartTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/heart_trim/icon.4bpp"); - const u32 gMonFrontPic_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouStarTrim[] = INCBIN_U8("graphics/pokemon/furfrou/star_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/star_trim/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/star_trim/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/star_trim/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/star_trim/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouStarTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/star_trim/icon.4bpp"); - const u32 gMonFrontPic_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouDiamondTrim[] = INCBIN_U8("graphics/pokemon/furfrou/diamond_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/diamond_trim/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/diamond_trim/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/diamond_trim/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/diamond_trim/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouDiamondTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/diamond_trim/icon.4bpp"); - const u32 gMonFrontPic_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouDebutanteTrim[] = INCBIN_U8("graphics/pokemon/furfrou/debutante_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/debutante_trim/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/debutante_trim/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/debutante_trim/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/debutante_trim/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouDebutanteTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/debutante_trim/icon.4bpp"); - const u32 gMonFrontPic_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouMatronTrim[] = INCBIN_U8("graphics/pokemon/furfrou/matron_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/matron_trim/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/matron_trim/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/matron_trim/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/matron_trim/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouMatronTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/matron_trim/icon.4bpp"); - const u32 gMonFrontPic_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouDandyTrim[] = INCBIN_U8("graphics/pokemon/furfrou/dandy_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/dandy_trim/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/dandy_trim/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/dandy_trim/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/dandy_trim/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouDandyTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/dandy_trim/icon.4bpp"); - const u32 gMonFrontPic_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouLaReineTrim[] = INCBIN_U8("graphics/pokemon/furfrou/la_reine_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/la_reine_trim/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/la_reine_trim/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/la_reine_trim/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/la_reine_trim/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouLaReineTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/la_reine_trim/icon.4bpp"); - const u32 gMonFrontPic_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouKabukiTrim[] = INCBIN_U8("graphics/pokemon/furfrou/kabuki_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/kabuki_trim/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/kabuki_trim/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/kabuki_trim/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/kabuki_trim/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouKabukiTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/kabuki_trim/icon.4bpp"); - const u32 gMonFrontPic_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/anim_front.4bpp.lz"); - const u32 gMonPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/normal.gbapal.lz"); - const u32 gMonBackPic_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/back.4bpp.lz"); - const u32 gMonShinyPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/shiny.gbapal.lz"); - const u8 gMonIcon_FurfrouPharaohTrim[] = INCBIN_U8("graphics/pokemon/furfrou/pharaoh_trim/icon.4bpp"); + const u32 gMonFrontPic_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/pharaoh_trim/anim_front.4bpp.lz"); + const u32 gMonPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/pharaoh_trim/normal.gbapal.lz"); + const u32 gMonBackPic_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/pharaoh_trim/back.4bpp.lz"); + const u32 gMonShinyPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/gen_6/furfrou/pharaoh_trim/shiny.gbapal.lz"); + const u8 gMonIcon_FurfrouPharaohTrim[] = INCBIN_U8("graphics/pokemon/gen_6/furfrou/pharaoh_trim/icon.4bpp"); #endif //P_FAMILY_FURFROU #if P_FAMILY_ESPURR - const u32 gMonFrontPic_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/anim_front.4bpp.lz"); - const u32 gMonPalette_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/normal.gbapal.lz"); - const u32 gMonBackPic_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/back.4bpp.lz"); - const u32 gMonShinyPalette_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/shiny.gbapal.lz"); - const u8 gMonIcon_Espurr[] = INCBIN_U8("graphics/pokemon/espurr/icon.4bpp"); + const u32 gMonFrontPic_Espurr[] = INCBIN_U32("graphics/pokemon/gen_6/espurr/anim_front.4bpp.lz"); + const u32 gMonPalette_Espurr[] = INCBIN_U32("graphics/pokemon/gen_6/espurr/normal.gbapal.lz"); + const u32 gMonBackPic_Espurr[] = INCBIN_U32("graphics/pokemon/gen_6/espurr/back.4bpp.lz"); + const u32 gMonShinyPalette_Espurr[] = INCBIN_U32("graphics/pokemon/gen_6/espurr/shiny.gbapal.lz"); + const u8 gMonIcon_Espurr[] = INCBIN_U8("graphics/pokemon/gen_6/espurr/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Espurr[] = INCBIN_U8("graphics/pokemon/espurr/footprint.1bpp"); + const u8 gMonFootprint_Espurr[] = INCBIN_U8("graphics/pokemon/gen_6/espurr/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/anim_front.4bpp.lz"); - const u32 gMonPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/normal.gbapal.lz"); - const u32 gMonBackPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/back.4bpp.lz"); - const u32 gMonShinyPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/shiny.gbapal.lz"); - const u8 gMonIcon_MeowsticMale[] = INCBIN_U8("graphics/pokemon/meowstic/icon.4bpp"); + const u32 gMonFrontPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/anim_front.4bpp.lz"); + const u32 gMonPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/normal.gbapal.lz"); + const u32 gMonBackPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/back.4bpp.lz"); + const u32 gMonShinyPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/shiny.gbapal.lz"); + const u8 gMonIcon_MeowsticMale[] = INCBIN_U8("graphics/pokemon/gen_6/meowstic/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Meowstic[] = INCBIN_U8("graphics/pokemon/meowstic/footprint.1bpp"); + const u8 gMonFootprint_Meowstic[] = INCBIN_U8("graphics/pokemon/gen_6/meowstic/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/anim_front.4bpp.lz"); - const u32 gMonPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/normal.gbapal.lz"); - const u32 gMonBackPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/back.4bpp.lz"); - const u32 gMonShinyPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/shiny.gbapal.lz"); - const u8 gMonIcon_MeowsticFemale[] = INCBIN_U8("graphics/pokemon/meowstic/female/icon.4bpp"); + const u32 gMonFrontPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/female/anim_front.4bpp.lz"); + const u32 gMonPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/female/normal.gbapal.lz"); + const u32 gMonBackPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/female/back.4bpp.lz"); + const u32 gMonShinyPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/gen_6/meowstic/female/shiny.gbapal.lz"); + const u8 gMonIcon_MeowsticFemale[] = INCBIN_U8("graphics/pokemon/gen_6/meowstic/female/icon.4bpp"); #endif //P_FAMILY_ESPURR #if P_FAMILY_HONEDGE - const u32 gMonFrontPic_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/anim_front.4bpp.lz"); - const u32 gMonPalette_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/normal.gbapal.lz"); - const u32 gMonBackPic_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/back.4bpp.lz"); - const u32 gMonShinyPalette_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/shiny.gbapal.lz"); - const u8 gMonIcon_Honedge[] = INCBIN_U8("graphics/pokemon/honedge/icon.4bpp"); + const u32 gMonFrontPic_Honedge[] = INCBIN_U32("graphics/pokemon/gen_6/honedge/anim_front.4bpp.lz"); + const u32 gMonPalette_Honedge[] = INCBIN_U32("graphics/pokemon/gen_6/honedge/normal.gbapal.lz"); + const u32 gMonBackPic_Honedge[] = INCBIN_U32("graphics/pokemon/gen_6/honedge/back.4bpp.lz"); + const u32 gMonShinyPalette_Honedge[] = INCBIN_U32("graphics/pokemon/gen_6/honedge/shiny.gbapal.lz"); + const u8 gMonIcon_Honedge[] = INCBIN_U8("graphics/pokemon/gen_6/honedge/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Honedge[] = INCBIN_U8("graphics/pokemon/honedge/footprint.1bpp"); + const u8 gMonFootprint_Honedge[] = INCBIN_U8("graphics/pokemon/gen_6/honedge/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/anim_front.4bpp.lz"); - const u32 gMonPalette_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/normal.gbapal.lz"); - const u32 gMonBackPic_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/back.4bpp.lz"); - const u32 gMonShinyPalette_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/shiny.gbapal.lz"); - const u8 gMonIcon_Doublade[] = INCBIN_U8("graphics/pokemon/doublade/icon.4bpp"); + const u32 gMonFrontPic_Doublade[] = INCBIN_U32("graphics/pokemon/gen_6/doublade/anim_front.4bpp.lz"); + const u32 gMonPalette_Doublade[] = INCBIN_U32("graphics/pokemon/gen_6/doublade/normal.gbapal.lz"); + const u32 gMonBackPic_Doublade[] = INCBIN_U32("graphics/pokemon/gen_6/doublade/back.4bpp.lz"); + const u32 gMonShinyPalette_Doublade[] = INCBIN_U32("graphics/pokemon/gen_6/doublade/shiny.gbapal.lz"); + const u8 gMonIcon_Doublade[] = INCBIN_U8("graphics/pokemon/gen_6/doublade/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Doublade[] = INCBIN_U8("graphics/pokemon/doublade/footprint.1bpp"); + const u8 gMonFootprint_Doublade[] = INCBIN_U8("graphics/pokemon/gen_6/doublade/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/anim_front.4bpp.lz"); - const u32 gMonPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/normal.gbapal.lz"); - const u32 gMonBackPic_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/back.4bpp.lz"); - const u32 gMonShinyPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/shiny.gbapal.lz"); - const u8 gMonIcon_AegislashShield[] = INCBIN_U8("graphics/pokemon/aegislash/icon.4bpp"); + const u32 gMonFrontPic_AegislashShield[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/anim_front.4bpp.lz"); + const u32 gMonPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/normal.gbapal.lz"); + const u32 gMonBackPic_AegislashShield[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/back.4bpp.lz"); + const u32 gMonShinyPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/shiny.gbapal.lz"); + const u8 gMonIcon_AegislashShield[] = INCBIN_U8("graphics/pokemon/gen_6/aegislash/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Aegislash[] = INCBIN_U8("graphics/pokemon/aegislash/footprint.1bpp"); + const u8 gMonFootprint_Aegislash[] = INCBIN_U8("graphics/pokemon/gen_6/aegislash/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/anim_front.4bpp.lz"); - const u32 gMonPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/normal.gbapal.lz"); - const u32 gMonBackPic_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/back.4bpp.lz"); - const u32 gMonShinyPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/shiny.gbapal.lz"); - const u8 gMonIcon_AegislashBlade[] = INCBIN_U8("graphics/pokemon/aegislash/blade/icon.4bpp"); + const u32 gMonFrontPic_AegislashBlade[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/blade/anim_front.4bpp.lz"); + const u32 gMonPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/blade/normal.gbapal.lz"); + const u32 gMonBackPic_AegislashBlade[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/blade/back.4bpp.lz"); + const u32 gMonShinyPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/gen_6/aegislash/blade/shiny.gbapal.lz"); + const u8 gMonIcon_AegislashBlade[] = INCBIN_U8("graphics/pokemon/gen_6/aegislash/blade/icon.4bpp"); #endif //P_FAMILY_HONEDGE #if P_FAMILY_SPRITZEE - const u32 gMonFrontPic_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/anim_front.4bpp.lz"); - const u32 gMonPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/normal.gbapal.lz"); - const u32 gMonBackPic_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/back.4bpp.lz"); - const u32 gMonShinyPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/shiny.gbapal.lz"); - const u8 gMonIcon_Spritzee[] = INCBIN_U8("graphics/pokemon/spritzee/icon.4bpp"); + const u32 gMonFrontPic_Spritzee[] = INCBIN_U32("graphics/pokemon/gen_6/spritzee/anim_front.4bpp.lz"); + const u32 gMonPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/gen_6/spritzee/normal.gbapal.lz"); + const u32 gMonBackPic_Spritzee[] = INCBIN_U32("graphics/pokemon/gen_6/spritzee/back.4bpp.lz"); + const u32 gMonShinyPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/gen_6/spritzee/shiny.gbapal.lz"); + const u8 gMonIcon_Spritzee[] = INCBIN_U8("graphics/pokemon/gen_6/spritzee/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Spritzee[] = INCBIN_U8("graphics/pokemon/spritzee/footprint.1bpp"); + const u8 gMonFootprint_Spritzee[] = INCBIN_U8("graphics/pokemon/gen_6/spritzee/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/anim_front.4bpp.lz"); - const u32 gMonPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/normal.gbapal.lz"); - const u32 gMonBackPic_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/back.4bpp.lz"); - const u32 gMonShinyPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/shiny.gbapal.lz"); - const u8 gMonIcon_Aromatisse[] = INCBIN_U8("graphics/pokemon/aromatisse/icon.4bpp"); + const u32 gMonFrontPic_Aromatisse[] = INCBIN_U32("graphics/pokemon/gen_6/aromatisse/anim_front.4bpp.lz"); + const u32 gMonPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/gen_6/aromatisse/normal.gbapal.lz"); + const u32 gMonBackPic_Aromatisse[] = INCBIN_U32("graphics/pokemon/gen_6/aromatisse/back.4bpp.lz"); + const u32 gMonShinyPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/gen_6/aromatisse/shiny.gbapal.lz"); + const u8 gMonIcon_Aromatisse[] = INCBIN_U8("graphics/pokemon/gen_6/aromatisse/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Aromatisse[] = INCBIN_U8("graphics/pokemon/aromatisse/footprint.1bpp"); + const u8 gMonFootprint_Aromatisse[] = INCBIN_U8("graphics/pokemon/gen_6/aromatisse/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SPRITZEE #if P_FAMILY_SWIRLIX - const u32 gMonFrontPic_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/anim_front.4bpp.lz"); - const u32 gMonPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/normal.gbapal.lz"); - const u32 gMonBackPic_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/back.4bpp.lz"); - const u32 gMonShinyPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/shiny.gbapal.lz"); - const u8 gMonIcon_Swirlix[] = INCBIN_U8("graphics/pokemon/swirlix/icon.4bpp"); + const u32 gMonFrontPic_Swirlix[] = INCBIN_U32("graphics/pokemon/gen_6/swirlix/anim_front.4bpp.lz"); + const u32 gMonPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/gen_6/swirlix/normal.gbapal.lz"); + const u32 gMonBackPic_Swirlix[] = INCBIN_U32("graphics/pokemon/gen_6/swirlix/back.4bpp.lz"); + const u32 gMonShinyPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/gen_6/swirlix/shiny.gbapal.lz"); + const u8 gMonIcon_Swirlix[] = INCBIN_U8("graphics/pokemon/gen_6/swirlix/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Swirlix[] = INCBIN_U8("graphics/pokemon/swirlix/footprint.1bpp"); + const u8 gMonFootprint_Swirlix[] = INCBIN_U8("graphics/pokemon/gen_6/swirlix/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/anim_front.4bpp.lz"); - const u32 gMonPalette_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/normal.gbapal.lz"); - const u32 gMonBackPic_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/back.4bpp.lz"); - const u32 gMonShinyPalette_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/shiny.gbapal.lz"); - const u8 gMonIcon_Slurpuff[] = INCBIN_U8("graphics/pokemon/slurpuff/icon.4bpp"); + const u32 gMonFrontPic_Slurpuff[] = INCBIN_U32("graphics/pokemon/gen_6/slurpuff/anim_front.4bpp.lz"); + const u32 gMonPalette_Slurpuff[] = INCBIN_U32("graphics/pokemon/gen_6/slurpuff/normal.gbapal.lz"); + const u32 gMonBackPic_Slurpuff[] = INCBIN_U32("graphics/pokemon/gen_6/slurpuff/back.4bpp.lz"); + const u32 gMonShinyPalette_Slurpuff[] = INCBIN_U32("graphics/pokemon/gen_6/slurpuff/shiny.gbapal.lz"); + const u8 gMonIcon_Slurpuff[] = INCBIN_U8("graphics/pokemon/gen_6/slurpuff/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Slurpuff[] = INCBIN_U8("graphics/pokemon/slurpuff/footprint.1bpp"); + const u8 gMonFootprint_Slurpuff[] = INCBIN_U8("graphics/pokemon/gen_6/slurpuff/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SWIRLIX #if P_FAMILY_INKAY - const u32 gMonFrontPic_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/anim_front.4bpp.lz"); - const u32 gMonPalette_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/normal.gbapal.lz"); - const u32 gMonBackPic_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/back.4bpp.lz"); - const u32 gMonShinyPalette_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/shiny.gbapal.lz"); - const u8 gMonIcon_Inkay[] = INCBIN_U8("graphics/pokemon/inkay/icon.4bpp"); + const u32 gMonFrontPic_Inkay[] = INCBIN_U32("graphics/pokemon/gen_6/inkay/anim_front.4bpp.lz"); + const u32 gMonPalette_Inkay[] = INCBIN_U32("graphics/pokemon/gen_6/inkay/normal.gbapal.lz"); + const u32 gMonBackPic_Inkay[] = INCBIN_U32("graphics/pokemon/gen_6/inkay/back.4bpp.lz"); + const u32 gMonShinyPalette_Inkay[] = INCBIN_U32("graphics/pokemon/gen_6/inkay/shiny.gbapal.lz"); + const u8 gMonIcon_Inkay[] = INCBIN_U8("graphics/pokemon/gen_6/inkay/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Inkay[] = INCBIN_U8("graphics/pokemon/inkay/footprint.1bpp"); + const u8 gMonFootprint_Inkay[] = INCBIN_U8("graphics/pokemon/gen_6/inkay/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/anim_front.4bpp.lz"); - const u32 gMonPalette_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/normal.gbapal.lz"); - const u32 gMonBackPic_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/back.4bpp.lz"); - const u32 gMonShinyPalette_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/shiny.gbapal.lz"); - const u8 gMonIcon_Malamar[] = INCBIN_U8("graphics/pokemon/malamar/icon.4bpp"); + const u32 gMonFrontPic_Malamar[] = INCBIN_U32("graphics/pokemon/gen_6/malamar/anim_front.4bpp.lz"); + const u32 gMonPalette_Malamar[] = INCBIN_U32("graphics/pokemon/gen_6/malamar/normal.gbapal.lz"); + const u32 gMonBackPic_Malamar[] = INCBIN_U32("graphics/pokemon/gen_6/malamar/back.4bpp.lz"); + const u32 gMonShinyPalette_Malamar[] = INCBIN_U32("graphics/pokemon/gen_6/malamar/shiny.gbapal.lz"); + const u8 gMonIcon_Malamar[] = INCBIN_U8("graphics/pokemon/gen_6/malamar/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Malamar[] = INCBIN_U8("graphics/pokemon/malamar/footprint.1bpp"); + const u8 gMonFootprint_Malamar[] = INCBIN_U8("graphics/pokemon/gen_6/malamar/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_INKAY #if P_FAMILY_BINACLE - const u32 gMonFrontPic_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/anim_front.4bpp.lz"); - const u32 gMonPalette_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/normal.gbapal.lz"); - const u32 gMonBackPic_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/back.4bpp.lz"); - const u32 gMonShinyPalette_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/shiny.gbapal.lz"); - const u8 gMonIcon_Binacle[] = INCBIN_U8("graphics/pokemon/binacle/icon.4bpp"); + const u32 gMonFrontPic_Binacle[] = INCBIN_U32("graphics/pokemon/gen_6/binacle/anim_front.4bpp.lz"); + const u32 gMonPalette_Binacle[] = INCBIN_U32("graphics/pokemon/gen_6/binacle/normal.gbapal.lz"); + const u32 gMonBackPic_Binacle[] = INCBIN_U32("graphics/pokemon/gen_6/binacle/back.4bpp.lz"); + const u32 gMonShinyPalette_Binacle[] = INCBIN_U32("graphics/pokemon/gen_6/binacle/shiny.gbapal.lz"); + const u8 gMonIcon_Binacle[] = INCBIN_U8("graphics/pokemon/gen_6/binacle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Binacle[] = INCBIN_U8("graphics/pokemon/binacle/footprint.1bpp"); + const u8 gMonFootprint_Binacle[] = INCBIN_U8("graphics/pokemon/gen_6/binacle/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/anim_front.4bpp.lz"); - const u32 gMonPalette_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/normal.gbapal.lz"); - const u32 gMonBackPic_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/back.4bpp.lz"); - const u32 gMonShinyPalette_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/shiny.gbapal.lz"); - const u8 gMonIcon_Barbaracle[] = INCBIN_U8("graphics/pokemon/barbaracle/icon.4bpp"); + const u32 gMonFrontPic_Barbaracle[] = INCBIN_U32("graphics/pokemon/gen_6/barbaracle/anim_front.4bpp.lz"); + const u32 gMonPalette_Barbaracle[] = INCBIN_U32("graphics/pokemon/gen_6/barbaracle/normal.gbapal.lz"); + const u32 gMonBackPic_Barbaracle[] = INCBIN_U32("graphics/pokemon/gen_6/barbaracle/back.4bpp.lz"); + const u32 gMonShinyPalette_Barbaracle[] = INCBIN_U32("graphics/pokemon/gen_6/barbaracle/shiny.gbapal.lz"); + const u8 gMonIcon_Barbaracle[] = INCBIN_U8("graphics/pokemon/gen_6/barbaracle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Barbaracle[] = INCBIN_U8("graphics/pokemon/barbaracle/footprint.1bpp"); + const u8 gMonFootprint_Barbaracle[] = INCBIN_U8("graphics/pokemon/gen_6/barbaracle/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BINACLE #if P_FAMILY_SKRELP - const u32 gMonFrontPic_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/anim_front.4bpp.lz"); - const u32 gMonPalette_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/normal.gbapal.lz"); - const u32 gMonBackPic_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/back.4bpp.lz"); - const u32 gMonShinyPalette_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/shiny.gbapal.lz"); - const u8 gMonIcon_Skrelp[] = INCBIN_U8("graphics/pokemon/skrelp/icon.4bpp"); + const u32 gMonFrontPic_Skrelp[] = INCBIN_U32("graphics/pokemon/gen_6/skrelp/anim_front.4bpp.lz"); + const u32 gMonPalette_Skrelp[] = INCBIN_U32("graphics/pokemon/gen_6/skrelp/normal.gbapal.lz"); + const u32 gMonBackPic_Skrelp[] = INCBIN_U32("graphics/pokemon/gen_6/skrelp/back.4bpp.lz"); + const u32 gMonShinyPalette_Skrelp[] = INCBIN_U32("graphics/pokemon/gen_6/skrelp/shiny.gbapal.lz"); + const u8 gMonIcon_Skrelp[] = INCBIN_U8("graphics/pokemon/gen_6/skrelp/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Skrelp[] = INCBIN_U8("graphics/pokemon/skrelp/footprint.1bpp"); + const u8 gMonFootprint_Skrelp[] = INCBIN_U8("graphics/pokemon/gen_6/skrelp/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/anim_front.4bpp.lz"); - const u32 gMonPalette_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/normal.gbapal.lz"); - const u32 gMonBackPic_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/back.4bpp.lz"); - const u32 gMonShinyPalette_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/shiny.gbapal.lz"); - const u8 gMonIcon_Dragalge[] = INCBIN_U8("graphics/pokemon/dragalge/icon.4bpp"); + const u32 gMonFrontPic_Dragalge[] = INCBIN_U32("graphics/pokemon/gen_6/dragalge/anim_front.4bpp.lz"); + const u32 gMonPalette_Dragalge[] = INCBIN_U32("graphics/pokemon/gen_6/dragalge/normal.gbapal.lz"); + const u32 gMonBackPic_Dragalge[] = INCBIN_U32("graphics/pokemon/gen_6/dragalge/back.4bpp.lz"); + const u32 gMonShinyPalette_Dragalge[] = INCBIN_U32("graphics/pokemon/gen_6/dragalge/shiny.gbapal.lz"); + const u8 gMonIcon_Dragalge[] = INCBIN_U8("graphics/pokemon/gen_6/dragalge/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dragalge[] = INCBIN_U8("graphics/pokemon/dragalge/footprint.1bpp"); + const u8 gMonFootprint_Dragalge[] = INCBIN_U8("graphics/pokemon/gen_6/dragalge/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SKRELP #if P_FAMILY_CLAUNCHER - const u32 gMonFrontPic_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/anim_front.4bpp.lz"); - const u32 gMonPalette_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/normal.gbapal.lz"); - const u32 gMonBackPic_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/back.4bpp.lz"); - const u32 gMonShinyPalette_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/shiny.gbapal.lz"); - const u8 gMonIcon_Clauncher[] = INCBIN_U8("graphics/pokemon/clauncher/icon.4bpp"); + const u32 gMonFrontPic_Clauncher[] = INCBIN_U32("graphics/pokemon/gen_6/clauncher/anim_front.4bpp.lz"); + const u32 gMonPalette_Clauncher[] = INCBIN_U32("graphics/pokemon/gen_6/clauncher/normal.gbapal.lz"); + const u32 gMonBackPic_Clauncher[] = INCBIN_U32("graphics/pokemon/gen_6/clauncher/back.4bpp.lz"); + const u32 gMonShinyPalette_Clauncher[] = INCBIN_U32("graphics/pokemon/gen_6/clauncher/shiny.gbapal.lz"); + const u8 gMonIcon_Clauncher[] = INCBIN_U8("graphics/pokemon/gen_6/clauncher/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Clauncher[] = INCBIN_U8("graphics/pokemon/clauncher/footprint.1bpp"); + const u8 gMonFootprint_Clauncher[] = INCBIN_U8("graphics/pokemon/gen_6/clauncher/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/anim_front.4bpp.lz"); - const u32 gMonPalette_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/normal.gbapal.lz"); - const u32 gMonBackPic_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/back.4bpp.lz"); - const u32 gMonShinyPalette_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/shiny.gbapal.lz"); - const u8 gMonIcon_Clawitzer[] = INCBIN_U8("graphics/pokemon/clawitzer/icon.4bpp"); + const u32 gMonFrontPic_Clawitzer[] = INCBIN_U32("graphics/pokemon/gen_6/clawitzer/anim_front.4bpp.lz"); + const u32 gMonPalette_Clawitzer[] = INCBIN_U32("graphics/pokemon/gen_6/clawitzer/normal.gbapal.lz"); + const u32 gMonBackPic_Clawitzer[] = INCBIN_U32("graphics/pokemon/gen_6/clawitzer/back.4bpp.lz"); + const u32 gMonShinyPalette_Clawitzer[] = INCBIN_U32("graphics/pokemon/gen_6/clawitzer/shiny.gbapal.lz"); + const u8 gMonIcon_Clawitzer[] = INCBIN_U8("graphics/pokemon/gen_6/clawitzer/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Clawitzer[] = INCBIN_U8("graphics/pokemon/clawitzer/footprint.1bpp"); + const u8 gMonFootprint_Clawitzer[] = INCBIN_U8("graphics/pokemon/gen_6/clawitzer/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CLAUNCHER #if P_FAMILY_HELIOPTILE - const u32 gMonFrontPic_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/anim_front.4bpp.lz"); - const u32 gMonPalette_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/normal.gbapal.lz"); - const u32 gMonBackPic_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/back.4bpp.lz"); - const u32 gMonShinyPalette_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/shiny.gbapal.lz"); - const u8 gMonIcon_Helioptile[] = INCBIN_U8("graphics/pokemon/helioptile/icon.4bpp"); + const u32 gMonFrontPic_Helioptile[] = INCBIN_U32("graphics/pokemon/gen_6/helioptile/anim_front.4bpp.lz"); + const u32 gMonPalette_Helioptile[] = INCBIN_U32("graphics/pokemon/gen_6/helioptile/normal.gbapal.lz"); + const u32 gMonBackPic_Helioptile[] = INCBIN_U32("graphics/pokemon/gen_6/helioptile/back.4bpp.lz"); + const u32 gMonShinyPalette_Helioptile[] = INCBIN_U32("graphics/pokemon/gen_6/helioptile/shiny.gbapal.lz"); + const u8 gMonIcon_Helioptile[] = INCBIN_U8("graphics/pokemon/gen_6/helioptile/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Helioptile[] = INCBIN_U8("graphics/pokemon/helioptile/footprint.1bpp"); + const u8 gMonFootprint_Helioptile[] = INCBIN_U8("graphics/pokemon/gen_6/helioptile/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/anim_front.4bpp.lz"); - const u32 gMonPalette_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/normal.gbapal.lz"); - const u32 gMonBackPic_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/back.4bpp.lz"); - const u32 gMonShinyPalette_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/shiny.gbapal.lz"); - const u8 gMonIcon_Heliolisk[] = INCBIN_U8("graphics/pokemon/heliolisk/icon.4bpp"); + const u32 gMonFrontPic_Heliolisk[] = INCBIN_U32("graphics/pokemon/gen_6/heliolisk/anim_front.4bpp.lz"); + const u32 gMonPalette_Heliolisk[] = INCBIN_U32("graphics/pokemon/gen_6/heliolisk/normal.gbapal.lz"); + const u32 gMonBackPic_Heliolisk[] = INCBIN_U32("graphics/pokemon/gen_6/heliolisk/back.4bpp.lz"); + const u32 gMonShinyPalette_Heliolisk[] = INCBIN_U32("graphics/pokemon/gen_6/heliolisk/shiny.gbapal.lz"); + const u8 gMonIcon_Heliolisk[] = INCBIN_U8("graphics/pokemon/gen_6/heliolisk/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Heliolisk[] = INCBIN_U8("graphics/pokemon/heliolisk/footprint.1bpp"); + const u8 gMonFootprint_Heliolisk[] = INCBIN_U8("graphics/pokemon/gen_6/heliolisk/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_HELIOPTILE #if P_FAMILY_TYRUNT - const u32 gMonFrontPic_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/anim_front.4bpp.lz"); - const u32 gMonPalette_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/normal.gbapal.lz"); - const u32 gMonBackPic_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/back.4bpp.lz"); - const u32 gMonShinyPalette_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/shiny.gbapal.lz"); - const u8 gMonIcon_Tyrunt[] = INCBIN_U8("graphics/pokemon/tyrunt/icon.4bpp"); + const u32 gMonFrontPic_Tyrunt[] = INCBIN_U32("graphics/pokemon/gen_6/tyrunt/anim_front.4bpp.lz"); + const u32 gMonPalette_Tyrunt[] = INCBIN_U32("graphics/pokemon/gen_6/tyrunt/normal.gbapal.lz"); + const u32 gMonBackPic_Tyrunt[] = INCBIN_U32("graphics/pokemon/gen_6/tyrunt/back.4bpp.lz"); + const u32 gMonShinyPalette_Tyrunt[] = INCBIN_U32("graphics/pokemon/gen_6/tyrunt/shiny.gbapal.lz"); + const u8 gMonIcon_Tyrunt[] = INCBIN_U8("graphics/pokemon/gen_6/tyrunt/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tyrunt[] = INCBIN_U8("graphics/pokemon/tyrunt/footprint.1bpp"); + const u8 gMonFootprint_Tyrunt[] = INCBIN_U8("graphics/pokemon/gen_6/tyrunt/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/anim_front.4bpp.lz"); - const u32 gMonPalette_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/normal.gbapal.lz"); - const u32 gMonBackPic_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/back.4bpp.lz"); - const u32 gMonShinyPalette_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/shiny.gbapal.lz"); - const u8 gMonIcon_Tyrantrum[] = INCBIN_U8("graphics/pokemon/tyrantrum/icon.4bpp"); + const u32 gMonFrontPic_Tyrantrum[] = INCBIN_U32("graphics/pokemon/gen_6/tyrantrum/anim_front.4bpp.lz"); + const u32 gMonPalette_Tyrantrum[] = INCBIN_U32("graphics/pokemon/gen_6/tyrantrum/normal.gbapal.lz"); + const u32 gMonBackPic_Tyrantrum[] = INCBIN_U32("graphics/pokemon/gen_6/tyrantrum/back.4bpp.lz"); + const u32 gMonShinyPalette_Tyrantrum[] = INCBIN_U32("graphics/pokemon/gen_6/tyrantrum/shiny.gbapal.lz"); + const u8 gMonIcon_Tyrantrum[] = INCBIN_U8("graphics/pokemon/gen_6/tyrantrum/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tyrantrum[] = INCBIN_U8("graphics/pokemon/tyrantrum/footprint.1bpp"); + const u8 gMonFootprint_Tyrantrum[] = INCBIN_U8("graphics/pokemon/gen_6/tyrantrum/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TYRUNT #if P_FAMILY_AMAURA - const u32 gMonFrontPic_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/anim_front.4bpp.lz"); - const u32 gMonPalette_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/normal.gbapal.lz"); - const u32 gMonBackPic_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/back.4bpp.lz"); - const u32 gMonShinyPalette_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/shiny.gbapal.lz"); - const u8 gMonIcon_Amaura[] = INCBIN_U8("graphics/pokemon/amaura/icon.4bpp"); + const u32 gMonFrontPic_Amaura[] = INCBIN_U32("graphics/pokemon/gen_6/amaura/anim_front.4bpp.lz"); + const u32 gMonPalette_Amaura[] = INCBIN_U32("graphics/pokemon/gen_6/amaura/normal.gbapal.lz"); + const u32 gMonBackPic_Amaura[] = INCBIN_U32("graphics/pokemon/gen_6/amaura/back.4bpp.lz"); + const u32 gMonShinyPalette_Amaura[] = INCBIN_U32("graphics/pokemon/gen_6/amaura/shiny.gbapal.lz"); + const u8 gMonIcon_Amaura[] = INCBIN_U8("graphics/pokemon/gen_6/amaura/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Amaura[] = INCBIN_U8("graphics/pokemon/amaura/footprint.1bpp"); + const u8 gMonFootprint_Amaura[] = INCBIN_U8("graphics/pokemon/gen_6/amaura/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/anim_front.4bpp.lz"); - const u32 gMonPalette_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/normal.gbapal.lz"); - const u32 gMonBackPic_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/back.4bpp.lz"); - const u32 gMonShinyPalette_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/shiny.gbapal.lz"); - const u8 gMonIcon_Aurorus[] = INCBIN_U8("graphics/pokemon/aurorus/icon.4bpp"); + const u32 gMonFrontPic_Aurorus[] = INCBIN_U32("graphics/pokemon/gen_6/aurorus/anim_front.4bpp.lz"); + const u32 gMonPalette_Aurorus[] = INCBIN_U32("graphics/pokemon/gen_6/aurorus/normal.gbapal.lz"); + const u32 gMonBackPic_Aurorus[] = INCBIN_U32("graphics/pokemon/gen_6/aurorus/back.4bpp.lz"); + const u32 gMonShinyPalette_Aurorus[] = INCBIN_U32("graphics/pokemon/gen_6/aurorus/shiny.gbapal.lz"); + const u8 gMonIcon_Aurorus[] = INCBIN_U8("graphics/pokemon/gen_6/aurorus/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Aurorus[] = INCBIN_U8("graphics/pokemon/aurorus/footprint.1bpp"); + const u8 gMonFootprint_Aurorus[] = INCBIN_U8("graphics/pokemon/gen_6/aurorus/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_AMAURA #if P_FAMILY_HAWLUCHA - const u32 gMonFrontPic_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/anim_front.4bpp.lz"); - const u32 gMonPalette_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/normal.gbapal.lz"); - const u32 gMonBackPic_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/back.4bpp.lz"); - const u32 gMonShinyPalette_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/shiny.gbapal.lz"); - const u8 gMonIcon_Hawlucha[] = INCBIN_U8("graphics/pokemon/hawlucha/icon.4bpp"); + const u32 gMonFrontPic_Hawlucha[] = INCBIN_U32("graphics/pokemon/gen_6/hawlucha/anim_front.4bpp.lz"); + const u32 gMonPalette_Hawlucha[] = INCBIN_U32("graphics/pokemon/gen_6/hawlucha/normal.gbapal.lz"); + const u32 gMonBackPic_Hawlucha[] = INCBIN_U32("graphics/pokemon/gen_6/hawlucha/back.4bpp.lz"); + const u32 gMonShinyPalette_Hawlucha[] = INCBIN_U32("graphics/pokemon/gen_6/hawlucha/shiny.gbapal.lz"); + const u8 gMonIcon_Hawlucha[] = INCBIN_U8("graphics/pokemon/gen_6/hawlucha/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hawlucha[] = INCBIN_U8("graphics/pokemon/hawlucha/footprint.1bpp"); + const u8 gMonFootprint_Hawlucha[] = INCBIN_U8("graphics/pokemon/gen_6/hawlucha/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_HAWLUCHA #if P_FAMILY_DEDENNE - const u32 gMonFrontPic_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/anim_front.4bpp.lz"); - const u32 gMonPalette_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/normal.gbapal.lz"); - const u32 gMonBackPic_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/back.4bpp.lz"); - const u32 gMonShinyPalette_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/shiny.gbapal.lz"); - const u8 gMonIcon_Dedenne[] = INCBIN_U8("graphics/pokemon/dedenne/icon.4bpp"); + const u32 gMonFrontPic_Dedenne[] = INCBIN_U32("graphics/pokemon/gen_6/dedenne/anim_front.4bpp.lz"); + const u32 gMonPalette_Dedenne[] = INCBIN_U32("graphics/pokemon/gen_6/dedenne/normal.gbapal.lz"); + const u32 gMonBackPic_Dedenne[] = INCBIN_U32("graphics/pokemon/gen_6/dedenne/back.4bpp.lz"); + const u32 gMonShinyPalette_Dedenne[] = INCBIN_U32("graphics/pokemon/gen_6/dedenne/shiny.gbapal.lz"); + const u8 gMonIcon_Dedenne[] = INCBIN_U8("graphics/pokemon/gen_6/dedenne/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dedenne[] = INCBIN_U8("graphics/pokemon/dedenne/footprint.1bpp"); + const u8 gMonFootprint_Dedenne[] = INCBIN_U8("graphics/pokemon/gen_6/dedenne/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DEDENNE #if P_FAMILY_CARBINK - const u32 gMonFrontPic_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/anim_front.4bpp.lz"); - const u32 gMonPalette_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/normal.gbapal.lz"); - const u32 gMonBackPic_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/back.4bpp.lz"); - const u32 gMonShinyPalette_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/shiny.gbapal.lz"); - const u8 gMonIcon_Carbink[] = INCBIN_U8("graphics/pokemon/carbink/icon.4bpp"); + const u32 gMonFrontPic_Carbink[] = INCBIN_U32("graphics/pokemon/gen_6/carbink/anim_front.4bpp.lz"); + const u32 gMonPalette_Carbink[] = INCBIN_U32("graphics/pokemon/gen_6/carbink/normal.gbapal.lz"); + const u32 gMonBackPic_Carbink[] = INCBIN_U32("graphics/pokemon/gen_6/carbink/back.4bpp.lz"); + const u32 gMonShinyPalette_Carbink[] = INCBIN_U32("graphics/pokemon/gen_6/carbink/shiny.gbapal.lz"); + const u8 gMonIcon_Carbink[] = INCBIN_U8("graphics/pokemon/gen_6/carbink/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Carbink[] = INCBIN_U8("graphics/pokemon/carbink/footprint.1bpp"); + const u8 gMonFootprint_Carbink[] = INCBIN_U8("graphics/pokemon/gen_6/carbink/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CARBINK #if P_FAMILY_GOOMY - const u32 gMonFrontPic_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/anim_front.4bpp.lz"); - const u32 gMonPalette_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/normal.gbapal.lz"); - const u32 gMonBackPic_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/back.4bpp.lz"); - const u32 gMonShinyPalette_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/shiny.gbapal.lz"); - const u8 gMonIcon_Goomy[] = INCBIN_U8("graphics/pokemon/goomy/icon.4bpp"); + const u32 gMonFrontPic_Goomy[] = INCBIN_U32("graphics/pokemon/gen_6/goomy/anim_front.4bpp.lz"); + const u32 gMonPalette_Goomy[] = INCBIN_U32("graphics/pokemon/gen_6/goomy/normal.gbapal.lz"); + const u32 gMonBackPic_Goomy[] = INCBIN_U32("graphics/pokemon/gen_6/goomy/back.4bpp.lz"); + const u32 gMonShinyPalette_Goomy[] = INCBIN_U32("graphics/pokemon/gen_6/goomy/shiny.gbapal.lz"); + const u8 gMonIcon_Goomy[] = INCBIN_U8("graphics/pokemon/gen_6/goomy/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Goomy[] = INCBIN_U8("graphics/pokemon/goomy/footprint.1bpp"); + const u8 gMonFootprint_Goomy[] = INCBIN_U8("graphics/pokemon/gen_6/goomy/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/anim_front.4bpp.lz"); - const u32 gMonPalette_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/normal.gbapal.lz"); - const u32 gMonBackPic_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/back.4bpp.lz"); - const u32 gMonShinyPalette_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/shiny.gbapal.lz"); - const u8 gMonIcon_Sliggoo[] = INCBIN_U8("graphics/pokemon/sliggoo/icon.4bpp"); + const u32 gMonFrontPic_Sliggoo[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/anim_front.4bpp.lz"); + const u32 gMonPalette_Sliggoo[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/normal.gbapal.lz"); + const u32 gMonBackPic_Sliggoo[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/back.4bpp.lz"); + const u32 gMonShinyPalette_Sliggoo[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/shiny.gbapal.lz"); + const u8 gMonIcon_Sliggoo[] = INCBIN_U8("graphics/pokemon/gen_6/sliggoo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sliggoo[] = INCBIN_U8("graphics/pokemon/sliggoo/footprint.1bpp"); + const u8 gMonFootprint_Sliggoo[] = INCBIN_U8("graphics/pokemon/gen_6/sliggoo/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/front.4bpp.lz"); - const u32 gMonPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_SliggooHisuian[] = INCBIN_U8("graphics/pokemon/sliggoo/hisuian/icon.4bpp"); + const u32 gMonFrontPic_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/hisuian/front.4bpp.lz"); + const u32 gMonPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/sliggoo/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_SliggooHisuian[] = INCBIN_U8("graphics/pokemon/gen_6/sliggoo/hisuian/icon.4bpp"); #endif //P_HISUIAN_FORMS - const u32 gMonFrontPic_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/anim_front.4bpp.lz"); - const u32 gMonPalette_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/normal.gbapal.lz"); - const u32 gMonBackPic_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/back.4bpp.lz"); - const u32 gMonShinyPalette_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/shiny.gbapal.lz"); - const u8 gMonIcon_Goodra[] = INCBIN_U8("graphics/pokemon/goodra/icon.4bpp"); + const u32 gMonFrontPic_Goodra[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/anim_front.4bpp.lz"); + const u32 gMonPalette_Goodra[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/normal.gbapal.lz"); + const u32 gMonBackPic_Goodra[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/back.4bpp.lz"); + const u32 gMonShinyPalette_Goodra[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/shiny.gbapal.lz"); + const u8 gMonIcon_Goodra[] = INCBIN_U8("graphics/pokemon/gen_6/goodra/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Goodra[] = INCBIN_U8("graphics/pokemon/goodra/footprint.1bpp"); + const u8 gMonFootprint_Goodra[] = INCBIN_U8("graphics/pokemon/gen_6/goodra/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/front.4bpp.lz"); - const u32 gMonPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_GoodraHisuian[] = INCBIN_U8("graphics/pokemon/goodra/hisuian/icon.4bpp"); + const u32 gMonFrontPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/hisuian/front.4bpp.lz"); + const u32 gMonPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/goodra/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_GoodraHisuian[] = INCBIN_U8("graphics/pokemon/gen_6/goodra/hisuian/icon.4bpp"); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_GOOMY #if P_FAMILY_KLEFKI - const u32 gMonFrontPic_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/anim_front.4bpp.lz"); - const u32 gMonPalette_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/normal.gbapal.lz"); - const u32 gMonBackPic_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/back.4bpp.lz"); - const u32 gMonShinyPalette_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/shiny.gbapal.lz"); - const u8 gMonIcon_Klefki[] = INCBIN_U8("graphics/pokemon/klefki/icon.4bpp"); + const u32 gMonFrontPic_Klefki[] = INCBIN_U32("graphics/pokemon/gen_6/klefki/anim_front.4bpp.lz"); + const u32 gMonPalette_Klefki[] = INCBIN_U32("graphics/pokemon/gen_6/klefki/normal.gbapal.lz"); + const u32 gMonBackPic_Klefki[] = INCBIN_U32("graphics/pokemon/gen_6/klefki/back.4bpp.lz"); + const u32 gMonShinyPalette_Klefki[] = INCBIN_U32("graphics/pokemon/gen_6/klefki/shiny.gbapal.lz"); + const u8 gMonIcon_Klefki[] = INCBIN_U8("graphics/pokemon/gen_6/klefki/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Klefki[] = INCBIN_U8("graphics/pokemon/klefki/footprint.1bpp"); + const u8 gMonFootprint_Klefki[] = INCBIN_U8("graphics/pokemon/gen_6/klefki/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_KLEFKI #if P_FAMILY_PHANTUMP - const u32 gMonFrontPic_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/anim_front.4bpp.lz"); - const u32 gMonPalette_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/normal.gbapal.lz"); - const u32 gMonBackPic_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/back.4bpp.lz"); - const u32 gMonShinyPalette_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/shiny.gbapal.lz"); - const u8 gMonIcon_Phantump[] = INCBIN_U8("graphics/pokemon/phantump/icon.4bpp"); + const u32 gMonFrontPic_Phantump[] = INCBIN_U32("graphics/pokemon/gen_6/phantump/anim_front.4bpp.lz"); + const u32 gMonPalette_Phantump[] = INCBIN_U32("graphics/pokemon/gen_6/phantump/normal.gbapal.lz"); + const u32 gMonBackPic_Phantump[] = INCBIN_U32("graphics/pokemon/gen_6/phantump/back.4bpp.lz"); + const u32 gMonShinyPalette_Phantump[] = INCBIN_U32("graphics/pokemon/gen_6/phantump/shiny.gbapal.lz"); + const u8 gMonIcon_Phantump[] = INCBIN_U8("graphics/pokemon/gen_6/phantump/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Phantump[] = INCBIN_U8("graphics/pokemon/phantump/footprint.1bpp"); + const u8 gMonFootprint_Phantump[] = INCBIN_U8("graphics/pokemon/gen_6/phantump/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/anim_front.4bpp.lz"); - const u32 gMonPalette_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/normal.gbapal.lz"); - const u32 gMonBackPic_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/back.4bpp.lz"); - const u32 gMonShinyPalette_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/shiny.gbapal.lz"); - const u8 gMonIcon_Trevenant[] = INCBIN_U8("graphics/pokemon/trevenant/icon.4bpp"); + const u32 gMonFrontPic_Trevenant[] = INCBIN_U32("graphics/pokemon/gen_6/trevenant/anim_front.4bpp.lz"); + const u32 gMonPalette_Trevenant[] = INCBIN_U32("graphics/pokemon/gen_6/trevenant/normal.gbapal.lz"); + const u32 gMonBackPic_Trevenant[] = INCBIN_U32("graphics/pokemon/gen_6/trevenant/back.4bpp.lz"); + const u32 gMonShinyPalette_Trevenant[] = INCBIN_U32("graphics/pokemon/gen_6/trevenant/shiny.gbapal.lz"); + const u8 gMonIcon_Trevenant[] = INCBIN_U8("graphics/pokemon/gen_6/trevenant/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Trevenant[] = INCBIN_U8("graphics/pokemon/trevenant/footprint.1bpp"); + const u8 gMonFootprint_Trevenant[] = INCBIN_U8("graphics/pokemon/gen_6/trevenant/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PHANTUMP #if P_FAMILY_PUMPKABOO - const u32 gMonPalette_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/pumpkaboo/normal.gbapal.lz"); - const u32 gMonShinyPalette_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/pumpkaboo/shiny.gbapal.lz"); - const u8 gMonIcon_Pumpkaboo[] = INCBIN_U8("graphics/pokemon/pumpkaboo/icon.4bpp"); + const u32 gMonPalette_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/normal.gbapal.lz"); + const u32 gMonShinyPalette_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/shiny.gbapal.lz"); + const u8 gMonIcon_Pumpkaboo[] = INCBIN_U8("graphics/pokemon/gen_6/pumpkaboo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pumpkaboo[] = INCBIN_U8("graphics/pokemon/pumpkaboo/footprint.1bpp"); + const u8 gMonFootprint_Pumpkaboo[] = INCBIN_U8("graphics/pokemon/gen_6/pumpkaboo/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_PumpkabooAverage[] = INCBIN_U32("graphics/pokemon/pumpkaboo/anim_front.4bpp.lz"); - const u32 gMonBackPic_PumpkabooAverage[] = INCBIN_U32("graphics/pokemon/pumpkaboo/back.4bpp.lz"); + const u32 gMonFrontPic_PumpkabooAverage[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/anim_front.4bpp.lz"); + const u32 gMonBackPic_PumpkabooAverage[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/back.4bpp.lz"); - const u32 gMonFrontPic_PumpkabooSmall[] = INCBIN_U32("graphics/pokemon/pumpkaboo/small/anim_front.4bpp.lz"); - const u32 gMonBackPic_PumpkabooSmall[] = INCBIN_U32("graphics/pokemon/pumpkaboo/small/back.4bpp.lz"); + const u32 gMonFrontPic_PumpkabooSmall[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/small/anim_front.4bpp.lz"); + const u32 gMonBackPic_PumpkabooSmall[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/small/back.4bpp.lz"); - const u32 gMonFrontPic_PumpkabooLarge[] = INCBIN_U32("graphics/pokemon/pumpkaboo/large/anim_front.4bpp.lz"); - const u32 gMonBackPic_PumpkabooLarge[] = INCBIN_U32("graphics/pokemon/pumpkaboo/large/back.4bpp.lz"); + const u32 gMonFrontPic_PumpkabooLarge[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/large/anim_front.4bpp.lz"); + const u32 gMonBackPic_PumpkabooLarge[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/large/back.4bpp.lz"); - const u32 gMonFrontPic_PumpkabooSuper[] = INCBIN_U32("graphics/pokemon/pumpkaboo/super/anim_front.4bpp.lz"); - const u32 gMonBackPic_PumpkabooSuper[] = INCBIN_U32("graphics/pokemon/pumpkaboo/super/back.4bpp.lz"); + const u32 gMonFrontPic_PumpkabooSuper[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/super/anim_front.4bpp.lz"); + const u32 gMonBackPic_PumpkabooSuper[] = INCBIN_U32("graphics/pokemon/gen_6/pumpkaboo/super/back.4bpp.lz"); - const u32 gMonPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/normal.gbapal.lz"); - const u32 gMonShinyPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/shiny.gbapal.lz"); - const u8 gMonIcon_Gourgeist[] = INCBIN_U8("graphics/pokemon/gourgeist/icon.4bpp"); + const u32 gMonPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/normal.gbapal.lz"); + const u32 gMonShinyPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/shiny.gbapal.lz"); + const u8 gMonIcon_Gourgeist[] = INCBIN_U8("graphics/pokemon/gen_6/gourgeist/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gourgeist[] = INCBIN_U8("graphics/pokemon/gourgeist/footprint.1bpp"); + const u8 gMonFootprint_Gourgeist[] = INCBIN_U8("graphics/pokemon/gen_6/gourgeist/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GourgeistAverage[] = INCBIN_U32("graphics/pokemon/gourgeist/anim_front.4bpp.lz"); - const u32 gMonBackPic_GourgeistAverage[] = INCBIN_U32("graphics/pokemon/gourgeist/back.4bpp.lz"); + const u32 gMonFrontPic_GourgeistAverage[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/anim_front.4bpp.lz"); + const u32 gMonBackPic_GourgeistAverage[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/back.4bpp.lz"); - const u32 gMonFrontPic_GourgeistSmall[] = INCBIN_U32("graphics/pokemon/gourgeist/small/anim_front.4bpp.lz"); - const u32 gMonBackPic_GourgeistSmall[] = INCBIN_U32("graphics/pokemon/gourgeist/small/back.4bpp.lz"); + const u32 gMonFrontPic_GourgeistSmall[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/small/anim_front.4bpp.lz"); + const u32 gMonBackPic_GourgeistSmall[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/small/back.4bpp.lz"); - const u32 gMonFrontPic_GourgeistLarge[] = INCBIN_U32("graphics/pokemon/gourgeist/large/anim_front.4bpp.lz"); - const u32 gMonBackPic_GourgeistLarge[] = INCBIN_U32("graphics/pokemon/gourgeist/large/back.4bpp.lz"); + const u32 gMonFrontPic_GourgeistLarge[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/large/anim_front.4bpp.lz"); + const u32 gMonBackPic_GourgeistLarge[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/large/back.4bpp.lz"); - const u32 gMonFrontPic_GourgeistSuper[] = INCBIN_U32("graphics/pokemon/gourgeist/super/anim_front.4bpp.lz"); - const u32 gMonBackPic_GourgeistSuper[] = INCBIN_U32("graphics/pokemon/gourgeist/super/back.4bpp.lz"); + const u32 gMonFrontPic_GourgeistSuper[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/super/anim_front.4bpp.lz"); + const u32 gMonBackPic_GourgeistSuper[] = INCBIN_U32("graphics/pokemon/gen_6/gourgeist/super/back.4bpp.lz"); #endif //P_FAMILY_PUMPKABOO #if P_FAMILY_BERGMITE - const u32 gMonFrontPic_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/anim_front.4bpp.lz"); - const u32 gMonPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/normal.gbapal.lz"); - const u32 gMonBackPic_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/back.4bpp.lz"); - const u32 gMonShinyPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/shiny.gbapal.lz"); - const u8 gMonIcon_Bergmite[] = INCBIN_U8("graphics/pokemon/bergmite/icon.4bpp"); + const u32 gMonFrontPic_Bergmite[] = INCBIN_U32("graphics/pokemon/gen_6/bergmite/anim_front.4bpp.lz"); + const u32 gMonPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/gen_6/bergmite/normal.gbapal.lz"); + const u32 gMonBackPic_Bergmite[] = INCBIN_U32("graphics/pokemon/gen_6/bergmite/back.4bpp.lz"); + const u32 gMonShinyPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/gen_6/bergmite/shiny.gbapal.lz"); + const u8 gMonIcon_Bergmite[] = INCBIN_U8("graphics/pokemon/gen_6/bergmite/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bergmite[] = INCBIN_U8("graphics/pokemon/bergmite/footprint.1bpp"); + const u8 gMonFootprint_Bergmite[] = INCBIN_U8("graphics/pokemon/gen_6/bergmite/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/anim_front.4bpp.lz"); - const u32 gMonPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/normal.gbapal.lz"); - const u32 gMonBackPic_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/back.4bpp.lz"); - const u32 gMonShinyPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/shiny.gbapal.lz"); - const u8 gMonIcon_Avalugg[] = INCBIN_U8("graphics/pokemon/avalugg/icon.4bpp"); + const u32 gMonFrontPic_Avalugg[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/anim_front.4bpp.lz"); + const u32 gMonPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/normal.gbapal.lz"); + const u32 gMonBackPic_Avalugg[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/back.4bpp.lz"); + const u32 gMonShinyPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/shiny.gbapal.lz"); + const u8 gMonIcon_Avalugg[] = INCBIN_U8("graphics/pokemon/gen_6/avalugg/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Avalugg[] = INCBIN_U8("graphics/pokemon/avalugg/footprint.1bpp"); + const u8 gMonFootprint_Avalugg[] = INCBIN_U8("graphics/pokemon/gen_6/avalugg/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/front.4bpp.lz"); - const u32 gMonPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_AvaluggHisuian[] = INCBIN_U8("graphics/pokemon/avalugg/hisuian/icon.4bpp"); + const u32 gMonFrontPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/hisuian/front.4bpp.lz"); + const u32 gMonPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/gen_6/avalugg/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_AvaluggHisuian[] = INCBIN_U8("graphics/pokemon/gen_6/avalugg/hisuian/icon.4bpp"); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_BERGMITE #if P_FAMILY_NOIBAT - const u32 gMonFrontPic_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/anim_front.4bpp.lz"); - const u32 gMonPalette_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/normal.gbapal.lz"); - const u32 gMonBackPic_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/back.4bpp.lz"); - const u32 gMonShinyPalette_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/shiny.gbapal.lz"); - const u8 gMonIcon_Noibat[] = INCBIN_U8("graphics/pokemon/noibat/icon.4bpp"); + const u32 gMonFrontPic_Noibat[] = INCBIN_U32("graphics/pokemon/gen_6/noibat/anim_front.4bpp.lz"); + const u32 gMonPalette_Noibat[] = INCBIN_U32("graphics/pokemon/gen_6/noibat/normal.gbapal.lz"); + const u32 gMonBackPic_Noibat[] = INCBIN_U32("graphics/pokemon/gen_6/noibat/back.4bpp.lz"); + const u32 gMonShinyPalette_Noibat[] = INCBIN_U32("graphics/pokemon/gen_6/noibat/shiny.gbapal.lz"); + const u8 gMonIcon_Noibat[] = INCBIN_U8("graphics/pokemon/gen_6/noibat/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Noibat[] = INCBIN_U8("graphics/pokemon/noibat/footprint.1bpp"); + const u8 gMonFootprint_Noibat[] = INCBIN_U8("graphics/pokemon/gen_6/noibat/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/anim_front.4bpp.lz"); - const u32 gMonPalette_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/normal.gbapal.lz"); - const u32 gMonBackPic_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/back.4bpp.lz"); - const u32 gMonShinyPalette_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/shiny.gbapal.lz"); - const u8 gMonIcon_Noivern[] = INCBIN_U8("graphics/pokemon/noivern/icon.4bpp"); + const u32 gMonFrontPic_Noivern[] = INCBIN_U32("graphics/pokemon/gen_6/noivern/anim_front.4bpp.lz"); + const u32 gMonPalette_Noivern[] = INCBIN_U32("graphics/pokemon/gen_6/noivern/normal.gbapal.lz"); + const u32 gMonBackPic_Noivern[] = INCBIN_U32("graphics/pokemon/gen_6/noivern/back.4bpp.lz"); + const u32 gMonShinyPalette_Noivern[] = INCBIN_U32("graphics/pokemon/gen_6/noivern/shiny.gbapal.lz"); + const u8 gMonIcon_Noivern[] = INCBIN_U8("graphics/pokemon/gen_6/noivern/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Noivern[] = INCBIN_U8("graphics/pokemon/noivern/footprint.1bpp"); + const u8 gMonFootprint_Noivern[] = INCBIN_U8("graphics/pokemon/gen_6/noivern/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_NOIBAT #if P_FAMILY_XERNEAS - const u32 gMonFrontPic_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/front.4bpp.lz"); - const u32 gMonPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/normal.gbapal.lz"); - const u32 gMonBackPic_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/back.4bpp.lz"); - const u32 gMonShinyPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/shiny.gbapal.lz"); - const u8 gMonIcon_XerneasNeutral[] = INCBIN_U8("graphics/pokemon/xerneas/icon.4bpp"); + const u32 gMonFrontPic_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/front.4bpp.lz"); + const u32 gMonPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/normal.gbapal.lz"); + const u32 gMonBackPic_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/back.4bpp.lz"); + const u32 gMonShinyPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/shiny.gbapal.lz"); + const u8 gMonIcon_XerneasNeutral[] = INCBIN_U8("graphics/pokemon/gen_6/xerneas/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Xerneas[] = INCBIN_U8("graphics/pokemon/xerneas/footprint.1bpp"); + const u8 gMonFootprint_Xerneas[] = INCBIN_U8("graphics/pokemon/gen_6/xerneas/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/anim_front.4bpp.lz"); - const u32 gMonPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/normal.gbapal.lz"); - const u32 gMonBackPic_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/back.4bpp.lz"); - const u32 gMonShinyPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/shiny.gbapal.lz"); - const u8 gMonIcon_XerneasActive[] = INCBIN_U8("graphics/pokemon/xerneas/active/icon.4bpp"); + const u32 gMonFrontPic_XerneasActive[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/active/anim_front.4bpp.lz"); + const u32 gMonPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/active/normal.gbapal.lz"); + const u32 gMonBackPic_XerneasActive[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/active/back.4bpp.lz"); + const u32 gMonShinyPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/gen_6/xerneas/active/shiny.gbapal.lz"); + const u8 gMonIcon_XerneasActive[] = INCBIN_U8("graphics/pokemon/gen_6/xerneas/active/icon.4bpp"); #endif //P_FAMILY_XERNEAS #if P_FAMILY_YVELTAL - const u32 gMonFrontPic_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/anim_front.4bpp.lz"); - const u32 gMonPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/normal.gbapal.lz"); - const u32 gMonBackPic_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/back.4bpp.lz"); - const u32 gMonShinyPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/shiny.gbapal.lz"); - const u8 gMonIcon_Yveltal[] = INCBIN_U8("graphics/pokemon/yveltal/icon.4bpp"); + const u32 gMonFrontPic_Yveltal[] = INCBIN_U32("graphics/pokemon/gen_6/yveltal/anim_front.4bpp.lz"); + const u32 gMonPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/gen_6/yveltal/normal.gbapal.lz"); + const u32 gMonBackPic_Yveltal[] = INCBIN_U32("graphics/pokemon/gen_6/yveltal/back.4bpp.lz"); + const u32 gMonShinyPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/gen_6/yveltal/shiny.gbapal.lz"); + const u8 gMonIcon_Yveltal[] = INCBIN_U8("graphics/pokemon/gen_6/yveltal/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Yveltal[] = INCBIN_U8("graphics/pokemon/yveltal/footprint.1bpp"); + const u8 gMonFootprint_Yveltal[] = INCBIN_U8("graphics/pokemon/gen_6/yveltal/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_YVELTAL #if P_FAMILY_ZYGARDE - const u32 gMonFrontPic_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/anim_front.4bpp.lz"); - const u32 gMonPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/normal.gbapal.lz"); - const u32 gMonBackPic_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/back.4bpp.lz"); - const u32 gMonShinyPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/shiny.gbapal.lz"); - const u8 gMonIcon_Zygarde50[] = INCBIN_U8("graphics/pokemon/zygarde/icon.4bpp"); + const u32 gMonFrontPic_Zygarde50[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/anim_front.4bpp.lz"); + const u32 gMonPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/normal.gbapal.lz"); + const u32 gMonBackPic_Zygarde50[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/back.4bpp.lz"); + const u32 gMonShinyPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/shiny.gbapal.lz"); + const u8 gMonIcon_Zygarde50[] = INCBIN_U8("graphics/pokemon/gen_6/zygarde/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Zygarde[] = INCBIN_U8("graphics/pokemon/zygarde/footprint.1bpp"); + const u8 gMonFootprint_Zygarde[] = INCBIN_U8("graphics/pokemon/gen_6/zygarde/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/anim_front.4bpp.lz"); - const u32 gMonPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/normal.gbapal.lz"); - const u32 gMonBackPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/back.4bpp.lz"); - const u32 gMonShinyPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/shiny.gbapal.lz"); - const u8 gMonIcon_Zygarde10[] = INCBIN_U8("graphics/pokemon/zygarde/10_percent/icon.4bpp"); + const u32 gMonFrontPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/10_percent/anim_front.4bpp.lz"); + const u32 gMonPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/10_percent/normal.gbapal.lz"); + const u32 gMonBackPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/10_percent/back.4bpp.lz"); + const u32 gMonShinyPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/10_percent/shiny.gbapal.lz"); + const u8 gMonIcon_Zygarde10[] = INCBIN_U8("graphics/pokemon/gen_6/zygarde/10_percent/icon.4bpp"); - const u32 gMonFrontPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/anim_front.4bpp.lz"); - const u32 gMonPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/normal.gbapal.lz"); - const u32 gMonBackPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/back.4bpp.lz"); - const u32 gMonShinyPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/shiny.gbapal.lz"); - const u8 gMonIcon_ZygardeComplete[] = INCBIN_U8("graphics/pokemon/zygarde/complete/icon.4bpp"); + const u32 gMonFrontPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/complete/anim_front.4bpp.lz"); + const u32 gMonPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/complete/normal.gbapal.lz"); + const u32 gMonBackPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/complete/back.4bpp.lz"); + const u32 gMonShinyPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/gen_6/zygarde/complete/shiny.gbapal.lz"); + const u8 gMonIcon_ZygardeComplete[] = INCBIN_U8("graphics/pokemon/gen_6/zygarde/complete/icon.4bpp"); #endif //P_FAMILY_ZYGARDE #if P_FAMILY_DIANCIE - const u32 gMonFrontPic_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/anim_front.4bpp.lz"); - const u32 gMonPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/normal.gbapal.lz"); - const u32 gMonBackPic_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/back.4bpp.lz"); - const u32 gMonShinyPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/shiny.gbapal.lz"); - const u8 gMonIcon_Diancie[] = INCBIN_U8("graphics/pokemon/diancie/icon.4bpp"); + const u32 gMonFrontPic_Diancie[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/anim_front.4bpp.lz"); + const u32 gMonPalette_Diancie[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/normal.gbapal.lz"); + const u32 gMonBackPic_Diancie[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/back.4bpp.lz"); + const u32 gMonShinyPalette_Diancie[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/shiny.gbapal.lz"); + const u8 gMonIcon_Diancie[] = INCBIN_U8("graphics/pokemon/gen_6/diancie/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Diancie[] = INCBIN_U8("graphics/pokemon/diancie/footprint.1bpp"); + const u8 gMonFootprint_Diancie[] = INCBIN_U8("graphics/pokemon/gen_6/diancie/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_MEGA_EVOLUTIONS - const u32 gMonFrontPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/front.4bpp.lz"); - const u32 gMonPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/normal.gbapal.lz"); - const u32 gMonBackPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/back.4bpp.lz"); - const u32 gMonShinyPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/shiny.gbapal.lz"); - const u8 gMonIcon_DiancieMega[] = INCBIN_U8("graphics/pokemon/diancie/mega/icon.4bpp"); + const u32 gMonFrontPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/mega/front.4bpp.lz"); + const u32 gMonPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/mega/normal.gbapal.lz"); + const u32 gMonBackPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/mega/back.4bpp.lz"); + const u32 gMonShinyPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/gen_6/diancie/mega/shiny.gbapal.lz"); + const u8 gMonIcon_DiancieMega[] = INCBIN_U8("graphics/pokemon/gen_6/diancie/mega/icon.4bpp"); #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_DIANCIE #if P_FAMILY_HOOPA - const u32 gMonFrontPic_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/anim_front.4bpp.lz"); - const u32 gMonPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/normal.gbapal.lz"); - const u32 gMonBackPic_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/back.4bpp.lz"); - const u32 gMonShinyPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/shiny.gbapal.lz"); - const u8 gMonIcon_HoopaConfined[] = INCBIN_U8("graphics/pokemon/hoopa/icon.4bpp"); + const u32 gMonFrontPic_HoopaConfined[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/anim_front.4bpp.lz"); + const u32 gMonPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/normal.gbapal.lz"); + const u32 gMonBackPic_HoopaConfined[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/back.4bpp.lz"); + const u32 gMonShinyPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/shiny.gbapal.lz"); + const u8 gMonIcon_HoopaConfined[] = INCBIN_U8("graphics/pokemon/gen_6/hoopa/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hoopa[] = INCBIN_U8("graphics/pokemon/hoopa/footprint.1bpp"); + const u8 gMonFootprint_Hoopa[] = INCBIN_U8("graphics/pokemon/gen_6/hoopa/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/anim_front.4bpp.lz"); - const u32 gMonPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/normal.gbapal.lz"); - const u32 gMonBackPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/back.4bpp.lz"); - const u32 gMonShinyPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/shiny.gbapal.lz"); - const u8 gMonIcon_HoopaUnbound[] = INCBIN_U8("graphics/pokemon/hoopa/unbound/icon.4bpp"); + const u32 gMonFrontPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/unbound/anim_front.4bpp.lz"); + const u32 gMonPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/unbound/normal.gbapal.lz"); + const u32 gMonBackPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/unbound/back.4bpp.lz"); + const u32 gMonShinyPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/gen_6/hoopa/unbound/shiny.gbapal.lz"); + const u8 gMonIcon_HoopaUnbound[] = INCBIN_U8("graphics/pokemon/gen_6/hoopa/unbound/icon.4bpp"); #endif //P_FAMILY_HOOPA #if P_FAMILY_VOLCANION - const u32 gMonFrontPic_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/anim_front.4bpp.lz"); - const u32 gMonPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/normal.gbapal.lz"); - const u32 gMonBackPic_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/back.4bpp.lz"); - const u32 gMonShinyPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/shiny.gbapal.lz"); - const u8 gMonIcon_Volcanion[] = INCBIN_U8("graphics/pokemon/volcanion/icon.4bpp"); + const u32 gMonFrontPic_Volcanion[] = INCBIN_U32("graphics/pokemon/gen_6/volcanion/anim_front.4bpp.lz"); + const u32 gMonPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/gen_6/volcanion/normal.gbapal.lz"); + const u32 gMonBackPic_Volcanion[] = INCBIN_U32("graphics/pokemon/gen_6/volcanion/back.4bpp.lz"); + const u32 gMonShinyPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/gen_6/volcanion/shiny.gbapal.lz"); + const u8 gMonIcon_Volcanion[] = INCBIN_U8("graphics/pokemon/gen_6/volcanion/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Volcanion[] = INCBIN_U8("graphics/pokemon/volcanion/footprint.1bpp"); + const u8 gMonFootprint_Volcanion[] = INCBIN_U8("graphics/pokemon/gen_6/volcanion/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_VOLCANION #if P_FAMILY_ROWLET - const u32 gMonFrontPic_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/anim_front.4bpp.lz"); - const u32 gMonPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/normal.gbapal.lz"); - const u32 gMonBackPic_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/back.4bpp.lz"); - const u32 gMonShinyPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/shiny.gbapal.lz"); - const u8 gMonIcon_Rowlet[] = INCBIN_U8("graphics/pokemon/rowlet/icon.4bpp"); + const u32 gMonFrontPic_Rowlet[] = INCBIN_U32("graphics/pokemon/gen_7/rowlet/anim_front.4bpp.lz"); + const u32 gMonPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/gen_7/rowlet/normal.gbapal.lz"); + const u32 gMonBackPic_Rowlet[] = INCBIN_U32("graphics/pokemon/gen_7/rowlet/back.4bpp.lz"); + const u32 gMonShinyPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/gen_7/rowlet/shiny.gbapal.lz"); + const u8 gMonIcon_Rowlet[] = INCBIN_U8("graphics/pokemon/gen_7/rowlet/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Rowlet[] = INCBIN_U8("graphics/pokemon/rowlet/footprint.1bpp"); + const u8 gMonFootprint_Rowlet[] = INCBIN_U8("graphics/pokemon/gen_7/rowlet/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/anim_front.4bpp.lz"); - const u32 gMonPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/normal.gbapal.lz"); - const u32 gMonBackPic_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/back.4bpp.lz"); - const u32 gMonShinyPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/shiny.gbapal.lz"); - const u8 gMonIcon_Dartrix[] = INCBIN_U8("graphics/pokemon/dartrix/icon.4bpp"); + const u32 gMonFrontPic_Dartrix[] = INCBIN_U32("graphics/pokemon/gen_7/dartrix/anim_front.4bpp.lz"); + const u32 gMonPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/gen_7/dartrix/normal.gbapal.lz"); + const u32 gMonBackPic_Dartrix[] = INCBIN_U32("graphics/pokemon/gen_7/dartrix/back.4bpp.lz"); + const u32 gMonShinyPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/gen_7/dartrix/shiny.gbapal.lz"); + const u8 gMonIcon_Dartrix[] = INCBIN_U8("graphics/pokemon/gen_7/dartrix/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dartrix[] = INCBIN_U8("graphics/pokemon/dartrix/footprint.1bpp"); + const u8 gMonFootprint_Dartrix[] = INCBIN_U8("graphics/pokemon/gen_7/dartrix/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/anim_front.4bpp.lz"); - const u32 gMonPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/normal.gbapal.lz"); - const u32 gMonBackPic_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/back.4bpp.lz"); - const u32 gMonShinyPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/shiny.gbapal.lz"); - const u8 gMonIcon_Decidueye[] = INCBIN_U8("graphics/pokemon/decidueye/icon.4bpp"); + const u32 gMonFrontPic_Decidueye[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/anim_front.4bpp.lz"); + const u32 gMonPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/normal.gbapal.lz"); + const u32 gMonBackPic_Decidueye[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/back.4bpp.lz"); + const u32 gMonShinyPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/shiny.gbapal.lz"); + const u8 gMonIcon_Decidueye[] = INCBIN_U8("graphics/pokemon/gen_7/decidueye/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Decidueye[] = INCBIN_U8("graphics/pokemon/decidueye/footprint.1bpp"); + const u8 gMonFootprint_Decidueye[] = INCBIN_U8("graphics/pokemon/gen_7/decidueye/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/front.4bpp.lz"); - const u32 gMonPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_DecidueyeHisuian[] = INCBIN_U8("graphics/pokemon/decidueye/hisuian/icon.4bpp"); + const u32 gMonFrontPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/hisuian/front.4bpp.lz"); + const u32 gMonPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/hisuian/normal.gbapal.lz"); + const u32 gMonBackPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/hisuian/back.4bpp.lz"); + const u32 gMonShinyPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/gen_7/decidueye/hisuian/shiny.gbapal.lz"); + const u8 gMonIcon_DecidueyeHisuian[] = INCBIN_U8("graphics/pokemon/gen_7/decidueye/hisuian/icon.4bpp"); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_ROWLET #if P_FAMILY_LITTEN - const u32 gMonFrontPic_Litten[] = INCBIN_U32("graphics/pokemon/litten/front.4bpp.lz"); - const u32 gMonPalette_Litten[] = INCBIN_U32("graphics/pokemon/litten/normal.gbapal.lz"); - const u32 gMonBackPic_Litten[] = INCBIN_U32("graphics/pokemon/litten/back.4bpp.lz"); - const u32 gMonShinyPalette_Litten[] = INCBIN_U32("graphics/pokemon/litten/shiny.gbapal.lz"); - const u8 gMonIcon_Litten[] = INCBIN_U8("graphics/pokemon/litten/icon.4bpp"); + const u32 gMonFrontPic_Litten[] = INCBIN_U32("graphics/pokemon/gen_7/litten/front.4bpp.lz"); + const u32 gMonPalette_Litten[] = INCBIN_U32("graphics/pokemon/gen_7/litten/normal.gbapal.lz"); + const u32 gMonBackPic_Litten[] = INCBIN_U32("graphics/pokemon/gen_7/litten/back.4bpp.lz"); + const u32 gMonShinyPalette_Litten[] = INCBIN_U32("graphics/pokemon/gen_7/litten/shiny.gbapal.lz"); + const u8 gMonIcon_Litten[] = INCBIN_U8("graphics/pokemon/gen_7/litten/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Litten[] = INCBIN_U8("graphics/pokemon/litten/footprint.1bpp"); + const u8 gMonFootprint_Litten[] = INCBIN_U8("graphics/pokemon/gen_7/litten/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/front.4bpp.lz"); - const u32 gMonPalette_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/normal.gbapal.lz"); - const u32 gMonBackPic_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/back.4bpp.lz"); - const u32 gMonShinyPalette_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/shiny.gbapal.lz"); - const u8 gMonIcon_Torracat[] = INCBIN_U8("graphics/pokemon/torracat/icon.4bpp"); + const u32 gMonFrontPic_Torracat[] = INCBIN_U32("graphics/pokemon/gen_7/torracat/front.4bpp.lz"); + const u32 gMonPalette_Torracat[] = INCBIN_U32("graphics/pokemon/gen_7/torracat/normal.gbapal.lz"); + const u32 gMonBackPic_Torracat[] = INCBIN_U32("graphics/pokemon/gen_7/torracat/back.4bpp.lz"); + const u32 gMonShinyPalette_Torracat[] = INCBIN_U32("graphics/pokemon/gen_7/torracat/shiny.gbapal.lz"); + const u8 gMonIcon_Torracat[] = INCBIN_U8("graphics/pokemon/gen_7/torracat/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Torracat[] = INCBIN_U8("graphics/pokemon/torracat/footprint.1bpp"); + const u8 gMonFootprint_Torracat[] = INCBIN_U8("graphics/pokemon/gen_7/torracat/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/front.4bpp.lz"); - const u32 gMonPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/normal.gbapal.lz"); - const u32 gMonBackPic_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/back.4bpp.lz"); - const u32 gMonShinyPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/shiny.gbapal.lz"); - const u8 gMonIcon_Incineroar[] = INCBIN_U8("graphics/pokemon/incineroar/icon.4bpp"); + const u32 gMonFrontPic_Incineroar[] = INCBIN_U32("graphics/pokemon/gen_7/incineroar/front.4bpp.lz"); + const u32 gMonPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/gen_7/incineroar/normal.gbapal.lz"); + const u32 gMonBackPic_Incineroar[] = INCBIN_U32("graphics/pokemon/gen_7/incineroar/back.4bpp.lz"); + const u32 gMonShinyPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/gen_7/incineroar/shiny.gbapal.lz"); + const u8 gMonIcon_Incineroar[] = INCBIN_U8("graphics/pokemon/gen_7/incineroar/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Incineroar[] = INCBIN_U8("graphics/pokemon/incineroar/footprint.1bpp"); + const u8 gMonFootprint_Incineroar[] = INCBIN_U8("graphics/pokemon/gen_7/incineroar/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_LITTEN #if P_FAMILY_POPPLIO - const u32 gMonFrontPic_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/front.4bpp.lz"); - const u32 gMonPalette_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/normal.gbapal.lz"); - const u32 gMonBackPic_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/back.4bpp.lz"); - const u32 gMonShinyPalette_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/shiny.gbapal.lz"); - const u8 gMonIcon_Popplio[] = INCBIN_U8("graphics/pokemon/popplio/icon.4bpp"); + const u32 gMonFrontPic_Popplio[] = INCBIN_U32("graphics/pokemon/gen_7/popplio/front.4bpp.lz"); + const u32 gMonPalette_Popplio[] = INCBIN_U32("graphics/pokemon/gen_7/popplio/normal.gbapal.lz"); + const u32 gMonBackPic_Popplio[] = INCBIN_U32("graphics/pokemon/gen_7/popplio/back.4bpp.lz"); + const u32 gMonShinyPalette_Popplio[] = INCBIN_U32("graphics/pokemon/gen_7/popplio/shiny.gbapal.lz"); + const u8 gMonIcon_Popplio[] = INCBIN_U8("graphics/pokemon/gen_7/popplio/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Popplio[] = INCBIN_U8("graphics/pokemon/popplio/footprint.1bpp"); + const u8 gMonFootprint_Popplio[] = INCBIN_U8("graphics/pokemon/gen_7/popplio/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/front.4bpp.lz"); - const u32 gMonPalette_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/normal.gbapal.lz"); - const u32 gMonBackPic_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/back.4bpp.lz"); - const u32 gMonShinyPalette_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/shiny.gbapal.lz"); - const u8 gMonIcon_Brionne[] = INCBIN_U8("graphics/pokemon/brionne/icon.4bpp"); + const u32 gMonFrontPic_Brionne[] = INCBIN_U32("graphics/pokemon/gen_7/brionne/front.4bpp.lz"); + const u32 gMonPalette_Brionne[] = INCBIN_U32("graphics/pokemon/gen_7/brionne/normal.gbapal.lz"); + const u32 gMonBackPic_Brionne[] = INCBIN_U32("graphics/pokemon/gen_7/brionne/back.4bpp.lz"); + const u32 gMonShinyPalette_Brionne[] = INCBIN_U32("graphics/pokemon/gen_7/brionne/shiny.gbapal.lz"); + const u8 gMonIcon_Brionne[] = INCBIN_U8("graphics/pokemon/gen_7/brionne/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Brionne[] = INCBIN_U8("graphics/pokemon/brionne/footprint.1bpp"); + const u8 gMonFootprint_Brionne[] = INCBIN_U8("graphics/pokemon/gen_7/brionne/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/front.4bpp.lz"); - const u32 gMonPalette_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/normal.gbapal.lz"); - const u32 gMonBackPic_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/back.4bpp.lz"); - const u32 gMonShinyPalette_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/shiny.gbapal.lz"); - const u8 gMonIcon_Primarina[] = INCBIN_U8("graphics/pokemon/primarina/icon.4bpp"); + const u32 gMonFrontPic_Primarina[] = INCBIN_U32("graphics/pokemon/gen_7/primarina/front.4bpp.lz"); + const u32 gMonPalette_Primarina[] = INCBIN_U32("graphics/pokemon/gen_7/primarina/normal.gbapal.lz"); + const u32 gMonBackPic_Primarina[] = INCBIN_U32("graphics/pokemon/gen_7/primarina/back.4bpp.lz"); + const u32 gMonShinyPalette_Primarina[] = INCBIN_U32("graphics/pokemon/gen_7/primarina/shiny.gbapal.lz"); + const u8 gMonIcon_Primarina[] = INCBIN_U8("graphics/pokemon/gen_7/primarina/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Primarina[] = INCBIN_U8("graphics/pokemon/primarina/footprint.1bpp"); + const u8 gMonFootprint_Primarina[] = INCBIN_U8("graphics/pokemon/gen_7/primarina/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_POPPLIO #if P_FAMILY_PIKIPEK - const u32 gMonFrontPic_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/anim_front.4bpp.lz"); - const u32 gMonPalette_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/normal.gbapal.lz"); - const u32 gMonBackPic_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/back.4bpp.lz"); - const u32 gMonShinyPalette_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/shiny.gbapal.lz"); - const u8 gMonIcon_Pikipek[] = INCBIN_U8("graphics/pokemon/pikipek/icon.4bpp"); + const u32 gMonFrontPic_Pikipek[] = INCBIN_U32("graphics/pokemon/gen_7/pikipek/anim_front.4bpp.lz"); + const u32 gMonPalette_Pikipek[] = INCBIN_U32("graphics/pokemon/gen_7/pikipek/normal.gbapal.lz"); + const u32 gMonBackPic_Pikipek[] = INCBIN_U32("graphics/pokemon/gen_7/pikipek/back.4bpp.lz"); + const u32 gMonShinyPalette_Pikipek[] = INCBIN_U32("graphics/pokemon/gen_7/pikipek/shiny.gbapal.lz"); + const u8 gMonIcon_Pikipek[] = INCBIN_U8("graphics/pokemon/gen_7/pikipek/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pikipek[] = INCBIN_U8("graphics/pokemon/pikipek/footprint.1bpp"); + const u8 gMonFootprint_Pikipek[] = INCBIN_U8("graphics/pokemon/gen_7/pikipek/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/anim_front.4bpp.lz"); - const u32 gMonPalette_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/normal.gbapal.lz"); - const u32 gMonBackPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/back.4bpp.lz"); - const u32 gMonShinyPalette_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/shiny.gbapal.lz"); - const u8 gMonIcon_Trumbeak[] = INCBIN_U8("graphics/pokemon/trumbeak/icon.4bpp"); + const u32 gMonFrontPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/gen_7/trumbeak/anim_front.4bpp.lz"); + const u32 gMonPalette_Trumbeak[] = INCBIN_U32("graphics/pokemon/gen_7/trumbeak/normal.gbapal.lz"); + const u32 gMonBackPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/gen_7/trumbeak/back.4bpp.lz"); + const u32 gMonShinyPalette_Trumbeak[] = INCBIN_U32("graphics/pokemon/gen_7/trumbeak/shiny.gbapal.lz"); + const u8 gMonIcon_Trumbeak[] = INCBIN_U8("graphics/pokemon/gen_7/trumbeak/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Trumbeak[] = INCBIN_U8("graphics/pokemon/trumbeak/footprint.1bpp"); + const u8 gMonFootprint_Trumbeak[] = INCBIN_U8("graphics/pokemon/gen_7/trumbeak/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/anim_front.4bpp.lz"); - const u32 gMonPalette_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/normal.gbapal.lz"); - const u32 gMonBackPic_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/back.4bpp.lz"); - const u32 gMonShinyPalette_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/shiny.gbapal.lz"); - const u8 gMonIcon_Toucannon[] = INCBIN_U8("graphics/pokemon/toucannon/icon.4bpp"); + const u32 gMonFrontPic_Toucannon[] = INCBIN_U32("graphics/pokemon/gen_7/toucannon/anim_front.4bpp.lz"); + const u32 gMonPalette_Toucannon[] = INCBIN_U32("graphics/pokemon/gen_7/toucannon/normal.gbapal.lz"); + const u32 gMonBackPic_Toucannon[] = INCBIN_U32("graphics/pokemon/gen_7/toucannon/back.4bpp.lz"); + const u32 gMonShinyPalette_Toucannon[] = INCBIN_U32("graphics/pokemon/gen_7/toucannon/shiny.gbapal.lz"); + const u8 gMonIcon_Toucannon[] = INCBIN_U8("graphics/pokemon/gen_7/toucannon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Toucannon[] = INCBIN_U8("graphics/pokemon/toucannon/footprint.1bpp"); + const u8 gMonFootprint_Toucannon[] = INCBIN_U8("graphics/pokemon/gen_7/toucannon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PIKIPEK #if P_FAMILY_YUNGOOS - const u32 gMonFrontPic_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/front.4bpp.lz"); - const u32 gMonPalette_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/normal.gbapal.lz"); - const u32 gMonBackPic_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/back.4bpp.lz"); - const u32 gMonShinyPalette_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/shiny.gbapal.lz"); - const u8 gMonIcon_Yungoos[] = INCBIN_U8("graphics/pokemon/yungoos/icon.4bpp"); + const u32 gMonFrontPic_Yungoos[] = INCBIN_U32("graphics/pokemon/gen_7/yungoos/front.4bpp.lz"); + const u32 gMonPalette_Yungoos[] = INCBIN_U32("graphics/pokemon/gen_7/yungoos/normal.gbapal.lz"); + const u32 gMonBackPic_Yungoos[] = INCBIN_U32("graphics/pokemon/gen_7/yungoos/back.4bpp.lz"); + const u32 gMonShinyPalette_Yungoos[] = INCBIN_U32("graphics/pokemon/gen_7/yungoos/shiny.gbapal.lz"); + const u8 gMonIcon_Yungoos[] = INCBIN_U8("graphics/pokemon/gen_7/yungoos/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Yungoos[] = INCBIN_U8("graphics/pokemon/yungoos/footprint.1bpp"); + const u8 gMonFootprint_Yungoos[] = INCBIN_U8("graphics/pokemon/gen_7/yungoos/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/front.4bpp.lz"); - const u32 gMonPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/normal.gbapal.lz"); - const u32 gMonBackPic_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/back.4bpp.lz"); - const u32 gMonShinyPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/shiny.gbapal.lz"); - const u8 gMonIcon_Gumshoos[] = INCBIN_U8("graphics/pokemon/gumshoos/icon.4bpp"); + const u32 gMonFrontPic_Gumshoos[] = INCBIN_U32("graphics/pokemon/gen_7/gumshoos/front.4bpp.lz"); + const u32 gMonPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gen_7/gumshoos/normal.gbapal.lz"); + const u32 gMonBackPic_Gumshoos[] = INCBIN_U32("graphics/pokemon/gen_7/gumshoos/back.4bpp.lz"); + const u32 gMonShinyPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gen_7/gumshoos/shiny.gbapal.lz"); + const u8 gMonIcon_Gumshoos[] = INCBIN_U8("graphics/pokemon/gen_7/gumshoos/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gumshoos[] = INCBIN_U8("graphics/pokemon/gumshoos/footprint.1bpp"); + const u8 gMonFootprint_Gumshoos[] = INCBIN_U8("graphics/pokemon/gen_7/gumshoos/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_YUNGOOS #if P_FAMILY_GRUBBIN - const u32 gMonFrontPic_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/anim_front.4bpp.lz"); - const u32 gMonPalette_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/normal.gbapal.lz"); - const u32 gMonBackPic_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/back.4bpp.lz"); - const u32 gMonShinyPalette_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/shiny.gbapal.lz"); - const u8 gMonIcon_Grubbin[] = INCBIN_U8("graphics/pokemon/grubbin/icon.4bpp"); + const u32 gMonFrontPic_Grubbin[] = INCBIN_U32("graphics/pokemon/gen_7/grubbin/anim_front.4bpp.lz"); + const u32 gMonPalette_Grubbin[] = INCBIN_U32("graphics/pokemon/gen_7/grubbin/normal.gbapal.lz"); + const u32 gMonBackPic_Grubbin[] = INCBIN_U32("graphics/pokemon/gen_7/grubbin/back.4bpp.lz"); + const u32 gMonShinyPalette_Grubbin[] = INCBIN_U32("graphics/pokemon/gen_7/grubbin/shiny.gbapal.lz"); + const u8 gMonIcon_Grubbin[] = INCBIN_U8("graphics/pokemon/gen_7/grubbin/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Grubbin[] = INCBIN_U8("graphics/pokemon/grubbin/footprint.1bpp"); + const u8 gMonFootprint_Grubbin[] = INCBIN_U8("graphics/pokemon/gen_7/grubbin/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/anim_front.4bpp.lz"); - const u32 gMonPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/normal.gbapal.lz"); - const u32 gMonBackPic_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/back.4bpp.lz"); - const u32 gMonShinyPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/shiny.gbapal.lz"); - const u8 gMonIcon_Charjabug[] = INCBIN_U8("graphics/pokemon/charjabug/icon.4bpp"); + const u32 gMonFrontPic_Charjabug[] = INCBIN_U32("graphics/pokemon/gen_7/charjabug/anim_front.4bpp.lz"); + const u32 gMonPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/gen_7/charjabug/normal.gbapal.lz"); + const u32 gMonBackPic_Charjabug[] = INCBIN_U32("graphics/pokemon/gen_7/charjabug/back.4bpp.lz"); + const u32 gMonShinyPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/gen_7/charjabug/shiny.gbapal.lz"); + const u8 gMonIcon_Charjabug[] = INCBIN_U8("graphics/pokemon/gen_7/charjabug/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Charjabug[] = INCBIN_U8("graphics/pokemon/charjabug/footprint.1bpp"); + const u8 gMonFootprint_Charjabug[] = INCBIN_U8("graphics/pokemon/gen_7/charjabug/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/anim_front.4bpp.lz"); - const u32 gMonPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/normal.gbapal.lz"); - const u32 gMonBackPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/back.4bpp.lz"); - const u32 gMonShinyPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/shiny.gbapal.lz"); - const u8 gMonIcon_Vikavolt[] = INCBIN_U8("graphics/pokemon/vikavolt/icon.4bpp"); + const u32 gMonFrontPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/gen_7/vikavolt/anim_front.4bpp.lz"); + const u32 gMonPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/gen_7/vikavolt/normal.gbapal.lz"); + const u32 gMonBackPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/gen_7/vikavolt/back.4bpp.lz"); + const u32 gMonShinyPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/gen_7/vikavolt/shiny.gbapal.lz"); + const u8 gMonIcon_Vikavolt[] = INCBIN_U8("graphics/pokemon/gen_7/vikavolt/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Vikavolt[] = INCBIN_U8("graphics/pokemon/vikavolt/footprint.1bpp"); + const u8 gMonFootprint_Vikavolt[] = INCBIN_U8("graphics/pokemon/gen_7/vikavolt/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_GRUBBIN #if P_FAMILY_CRABRAWLER - const u32 gMonFrontPic_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/front.4bpp.lz"); - const u32 gMonPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/normal.gbapal.lz"); - const u32 gMonBackPic_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/back.4bpp.lz"); - const u32 gMonShinyPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/shiny.gbapal.lz"); - const u8 gMonIcon_Crabrawler[] = INCBIN_U8("graphics/pokemon/crabrawler/icon.4bpp"); + const u32 gMonFrontPic_Crabrawler[] = INCBIN_U32("graphics/pokemon/gen_7/crabrawler/front.4bpp.lz"); + const u32 gMonPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/gen_7/crabrawler/normal.gbapal.lz"); + const u32 gMonBackPic_Crabrawler[] = INCBIN_U32("graphics/pokemon/gen_7/crabrawler/back.4bpp.lz"); + const u32 gMonShinyPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/gen_7/crabrawler/shiny.gbapal.lz"); + const u8 gMonIcon_Crabrawler[] = INCBIN_U8("graphics/pokemon/gen_7/crabrawler/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Crabrawler[] = INCBIN_U8("graphics/pokemon/crabrawler/footprint.1bpp"); + const u8 gMonFootprint_Crabrawler[] = INCBIN_U8("graphics/pokemon/gen_7/crabrawler/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/front.4bpp.lz"); - const u32 gMonPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/normal.gbapal.lz"); - const u32 gMonBackPic_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/back.4bpp.lz"); - const u32 gMonShinyPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/shiny.gbapal.lz"); - const u8 gMonIcon_Crabominable[] = INCBIN_U8("graphics/pokemon/crabominable/icon.4bpp"); + const u32 gMonFrontPic_Crabominable[] = INCBIN_U32("graphics/pokemon/gen_7/crabominable/front.4bpp.lz"); + const u32 gMonPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/gen_7/crabominable/normal.gbapal.lz"); + const u32 gMonBackPic_Crabominable[] = INCBIN_U32("graphics/pokemon/gen_7/crabominable/back.4bpp.lz"); + const u32 gMonShinyPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/gen_7/crabominable/shiny.gbapal.lz"); + const u8 gMonIcon_Crabominable[] = INCBIN_U8("graphics/pokemon/gen_7/crabominable/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Crabominable[] = INCBIN_U8("graphics/pokemon/crabominable/footprint.1bpp"); + const u8 gMonFootprint_Crabominable[] = INCBIN_U8("graphics/pokemon/gen_7/crabominable/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CRABRAWLER #if P_FAMILY_ORICORIO - const u32 gMonFrontPic_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/front.4bpp.lz"); - const u32 gMonPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/normal.gbapal.lz"); - const u32 gMonBackPic_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/back.4bpp.lz"); - const u32 gMonShinyPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/shiny.gbapal.lz"); - const u8 gMonIcon_OricorioBaile[] = INCBIN_U8("graphics/pokemon/oricorio/icon.4bpp"); + const u32 gMonFrontPic_OricorioBaile[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/front.4bpp.lz"); + const u32 gMonPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/normal.gbapal.lz"); + const u32 gMonBackPic_OricorioBaile[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/back.4bpp.lz"); + const u32 gMonShinyPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/shiny.gbapal.lz"); + const u8 gMonIcon_OricorioBaile[] = INCBIN_U8("graphics/pokemon/gen_7/oricorio/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Oricorio[] = INCBIN_U8("graphics/pokemon/oricorio/footprint.1bpp"); + const u8 gMonFootprint_Oricorio[] = INCBIN_U8("graphics/pokemon/gen_7/oricorio/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/front.4bpp.lz"); - const u32 gMonPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/normal.gbapal.lz"); - const u32 gMonBackPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/back.4bpp.lz"); - const u32 gMonShinyPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/shiny.gbapal.lz"); - const u8 gMonIcon_OricorioPomPom[] = INCBIN_U8("graphics/pokemon/oricorio/pom_pom/icon.4bpp"); + const u32 gMonFrontPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pom_pom/front.4bpp.lz"); + const u32 gMonPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pom_pom/normal.gbapal.lz"); + const u32 gMonBackPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pom_pom/back.4bpp.lz"); + const u32 gMonShinyPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pom_pom/shiny.gbapal.lz"); + const u8 gMonIcon_OricorioPomPom[] = INCBIN_U8("graphics/pokemon/gen_7/oricorio/pom_pom/icon.4bpp"); - const u32 gMonFrontPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/front.4bpp.lz"); - const u32 gMonPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/normal.gbapal.lz"); - const u32 gMonBackPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/back.4bpp.lz"); - const u32 gMonShinyPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/shiny.gbapal.lz"); - const u8 gMonIcon_OricorioPau[] = INCBIN_U8("graphics/pokemon/oricorio/pau/icon.4bpp"); + const u32 gMonFrontPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pau/front.4bpp.lz"); + const u32 gMonPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pau/normal.gbapal.lz"); + const u32 gMonBackPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pau/back.4bpp.lz"); + const u32 gMonShinyPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/pau/shiny.gbapal.lz"); + const u8 gMonIcon_OricorioPau[] = INCBIN_U8("graphics/pokemon/gen_7/oricorio/pau/icon.4bpp"); - const u32 gMonFrontPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/front.4bpp.lz"); - const u32 gMonPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/normal.gbapal.lz"); - const u32 gMonBackPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/back.4bpp.lz"); - const u32 gMonShinyPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/shiny.gbapal.lz"); - const u8 gMonIcon_OricorioSensu[] = INCBIN_U8("graphics/pokemon/oricorio/sensu/icon.4bpp"); + const u32 gMonFrontPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/sensu/front.4bpp.lz"); + const u32 gMonPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/sensu/normal.gbapal.lz"); + const u32 gMonBackPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/sensu/back.4bpp.lz"); + const u32 gMonShinyPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/gen_7/oricorio/sensu/shiny.gbapal.lz"); + const u8 gMonIcon_OricorioSensu[] = INCBIN_U8("graphics/pokemon/gen_7/oricorio/sensu/icon.4bpp"); #endif //P_FAMILY_ORICORIO #if P_FAMILY_CUTIEFLY - const u32 gMonFrontPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/anim_front.4bpp.lz"); - const u32 gMonPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/normal.gbapal.lz"); - const u32 gMonBackPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/back.4bpp.lz"); - const u32 gMonShinyPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/shiny.gbapal.lz"); - const u8 gMonIcon_Cutiefly[] = INCBIN_U8("graphics/pokemon/cutiefly/icon.4bpp"); + const u32 gMonFrontPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/gen_7/cutiefly/anim_front.4bpp.lz"); + const u32 gMonPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/gen_7/cutiefly/normal.gbapal.lz"); + const u32 gMonBackPic_Cutiefly[] = INCBIN_U32("graphics/pokemon/gen_7/cutiefly/back.4bpp.lz"); + const u32 gMonShinyPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/gen_7/cutiefly/shiny.gbapal.lz"); + const u8 gMonIcon_Cutiefly[] = INCBIN_U8("graphics/pokemon/gen_7/cutiefly/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cutiefly[] = INCBIN_U8("graphics/pokemon/cutiefly/footprint.1bpp"); + const u8 gMonFootprint_Cutiefly[] = INCBIN_U8("graphics/pokemon/gen_7/cutiefly/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/anim_front.4bpp.lz"); - const u32 gMonPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/normal.gbapal.lz"); - const u32 gMonBackPic_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/back.4bpp.lz"); - const u32 gMonShinyPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/shiny.gbapal.lz"); - const u8 gMonIcon_Ribombee[] = INCBIN_U8("graphics/pokemon/ribombee/icon.4bpp"); + const u32 gMonFrontPic_Ribombee[] = INCBIN_U32("graphics/pokemon/gen_7/ribombee/anim_front.4bpp.lz"); + const u32 gMonPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/gen_7/ribombee/normal.gbapal.lz"); + const u32 gMonBackPic_Ribombee[] = INCBIN_U32("graphics/pokemon/gen_7/ribombee/back.4bpp.lz"); + const u32 gMonShinyPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/gen_7/ribombee/shiny.gbapal.lz"); + const u8 gMonIcon_Ribombee[] = INCBIN_U8("graphics/pokemon/gen_7/ribombee/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Ribombee[] = INCBIN_U8("graphics/pokemon/ribombee/footprint.1bpp"); + const u8 gMonFootprint_Ribombee[] = INCBIN_U8("graphics/pokemon/gen_7/ribombee/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CUTIEFLY #if P_FAMILY_ROCKRUFF - const u32 gMonFrontPic_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/anim_front.4bpp.lz"); - const u32 gMonPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/normal.gbapal.lz"); - const u32 gMonBackPic_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/back.4bpp.lz"); - const u32 gMonShinyPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/shiny.gbapal.lz"); - const u8 gMonIcon_Rockruff[] = INCBIN_U8("graphics/pokemon/rockruff/icon.4bpp"); + const u32 gMonFrontPic_Rockruff[] = INCBIN_U32("graphics/pokemon/gen_7/rockruff/anim_front.4bpp.lz"); + const u32 gMonPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/gen_7/rockruff/normal.gbapal.lz"); + const u32 gMonBackPic_Rockruff[] = INCBIN_U32("graphics/pokemon/gen_7/rockruff/back.4bpp.lz"); + const u32 gMonShinyPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/gen_7/rockruff/shiny.gbapal.lz"); + const u8 gMonIcon_Rockruff[] = INCBIN_U8("graphics/pokemon/gen_7/rockruff/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Rockruff[] = INCBIN_U8("graphics/pokemon/rockruff/footprint.1bpp"); + const u8 gMonFootprint_Rockruff[] = INCBIN_U8("graphics/pokemon/gen_7/rockruff/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/anim_front.4bpp.lz"); - const u32 gMonPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/normal.gbapal.lz"); - const u32 gMonBackPic_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/back.4bpp.lz"); - const u32 gMonShinyPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/shiny.gbapal.lz"); - const u8 gMonIcon_LycanrocMidday[] = INCBIN_U8("graphics/pokemon/lycanroc/icon.4bpp"); + const u32 gMonFrontPic_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/anim_front.4bpp.lz"); + const u32 gMonPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/normal.gbapal.lz"); + const u32 gMonBackPic_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/back.4bpp.lz"); + const u32 gMonShinyPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/shiny.gbapal.lz"); + const u8 gMonIcon_LycanrocMidday[] = INCBIN_U8("graphics/pokemon/gen_7/lycanroc/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lycanroc[] = INCBIN_U8("graphics/pokemon/lycanroc/footprint.1bpp"); + const u8 gMonFootprint_Lycanroc[] = INCBIN_U8("graphics/pokemon/gen_7/lycanroc/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/anim_front.4bpp.lz"); - const u32 gMonPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/normal.gbapal.lz"); - const u32 gMonBackPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/back.4bpp.lz"); - const u32 gMonShinyPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/shiny.gbapal.lz"); - const u8 gMonIcon_LycanrocMidnight[] = INCBIN_U8("graphics/pokemon/lycanroc/midnight/icon.4bpp"); + const u32 gMonFrontPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/midnight/anim_front.4bpp.lz"); + const u32 gMonPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/midnight/normal.gbapal.lz"); + const u32 gMonBackPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/midnight/back.4bpp.lz"); + const u32 gMonShinyPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/midnight/shiny.gbapal.lz"); + const u8 gMonIcon_LycanrocMidnight[] = INCBIN_U8("graphics/pokemon/gen_7/lycanroc/midnight/icon.4bpp"); - const u32 gMonFrontPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/anim_front.4bpp.lz"); - const u32 gMonPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/normal.gbapal.lz"); - const u32 gMonBackPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/back.4bpp.lz"); - const u32 gMonShinyPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/shiny.gbapal.lz"); - const u8 gMonIcon_LycanrocDusk[] = INCBIN_U8("graphics/pokemon/lycanroc/dusk/icon.4bpp"); + const u32 gMonFrontPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/dusk/anim_front.4bpp.lz"); + const u32 gMonPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/dusk/normal.gbapal.lz"); + const u32 gMonBackPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/dusk/back.4bpp.lz"); + const u32 gMonShinyPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/gen_7/lycanroc/dusk/shiny.gbapal.lz"); + const u8 gMonIcon_LycanrocDusk[] = INCBIN_U8("graphics/pokemon/gen_7/lycanroc/dusk/icon.4bpp"); #endif //P_FAMILY_ROCKRUFF #if P_FAMILY_WISHIWASHI - const u32 gMonFrontPic_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/front.4bpp.lz"); - const u32 gMonPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/normal.gbapal.lz"); - const u32 gMonBackPic_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/back.4bpp.lz"); - const u32 gMonShinyPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/shiny.gbapal.lz"); - const u8 gMonIcon_WishiwashiSolo[] = INCBIN_U8("graphics/pokemon/wishiwashi/icon.4bpp"); + const u32 gMonFrontPic_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/front.4bpp.lz"); + const u32 gMonPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/normal.gbapal.lz"); + const u32 gMonBackPic_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/back.4bpp.lz"); + const u32 gMonShinyPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/shiny.gbapal.lz"); + const u8 gMonIcon_WishiwashiSolo[] = INCBIN_U8("graphics/pokemon/gen_7/wishiwashi/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Wishiwashi[] = INCBIN_U8("graphics/pokemon/wishiwashi/footprint.1bpp"); + const u8 gMonFootprint_Wishiwashi[] = INCBIN_U8("graphics/pokemon/gen_7/wishiwashi/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/front.4bpp.lz"); - const u32 gMonPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/normal.gbapal.lz"); - const u32 gMonBackPic_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/back.4bpp.lz"); - const u32 gMonShinyPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/shiny.gbapal.lz"); - const u8 gMonIcon_WishiwashiSchool[] = INCBIN_U8("graphics/pokemon/wishiwashi/school/icon.4bpp"); + const u32 gMonFrontPic_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/school/front.4bpp.lz"); + const u32 gMonPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/school/normal.gbapal.lz"); + const u32 gMonBackPic_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/school/back.4bpp.lz"); + const u32 gMonShinyPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/gen_7/wishiwashi/school/shiny.gbapal.lz"); + const u8 gMonIcon_WishiwashiSchool[] = INCBIN_U8("graphics/pokemon/gen_7/wishiwashi/school/icon.4bpp"); #endif //P_FAMILY_WISHIWASHI #if P_FAMILY_MAREANIE - const u32 gMonFrontPic_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/front.4bpp.lz"); - const u32 gMonPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/normal.gbapal.lz"); - const u32 gMonBackPic_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/back.4bpp.lz"); - const u32 gMonShinyPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/shiny.gbapal.lz"); - const u8 gMonIcon_Mareanie[] = INCBIN_U8("graphics/pokemon/mareanie/icon.4bpp"); + const u32 gMonFrontPic_Mareanie[] = INCBIN_U32("graphics/pokemon/gen_7/mareanie/front.4bpp.lz"); + const u32 gMonPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/gen_7/mareanie/normal.gbapal.lz"); + const u32 gMonBackPic_Mareanie[] = INCBIN_U32("graphics/pokemon/gen_7/mareanie/back.4bpp.lz"); + const u32 gMonShinyPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/gen_7/mareanie/shiny.gbapal.lz"); + const u8 gMonIcon_Mareanie[] = INCBIN_U8("graphics/pokemon/gen_7/mareanie/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mareanie[] = INCBIN_U8("graphics/pokemon/mareanie/footprint.1bpp"); + const u8 gMonFootprint_Mareanie[] = INCBIN_U8("graphics/pokemon/gen_7/mareanie/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/front.4bpp.lz"); - const u32 gMonPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/normal.gbapal.lz"); - const u32 gMonBackPic_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/back.4bpp.lz"); - const u32 gMonShinyPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/shiny.gbapal.lz"); - const u8 gMonIcon_Toxapex[] = INCBIN_U8("graphics/pokemon/toxapex/icon.4bpp"); + const u32 gMonFrontPic_Toxapex[] = INCBIN_U32("graphics/pokemon/gen_7/toxapex/front.4bpp.lz"); + const u32 gMonPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/gen_7/toxapex/normal.gbapal.lz"); + const u32 gMonBackPic_Toxapex[] = INCBIN_U32("graphics/pokemon/gen_7/toxapex/back.4bpp.lz"); + const u32 gMonShinyPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/gen_7/toxapex/shiny.gbapal.lz"); + const u8 gMonIcon_Toxapex[] = INCBIN_U8("graphics/pokemon/gen_7/toxapex/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Toxapex[] = INCBIN_U8("graphics/pokemon/toxapex/footprint.1bpp"); + const u8 gMonFootprint_Toxapex[] = INCBIN_U8("graphics/pokemon/gen_7/toxapex/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MAREANIE #if P_FAMILY_MUDBRAY - const u32 gMonFrontPic_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/front.4bpp.lz"); - const u32 gMonPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/normal.gbapal.lz"); - const u32 gMonBackPic_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/back.4bpp.lz"); - const u32 gMonShinyPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/shiny.gbapal.lz"); - const u8 gMonIcon_Mudbray[] = INCBIN_U8("graphics/pokemon/mudbray/icon.4bpp"); + const u32 gMonFrontPic_Mudbray[] = INCBIN_U32("graphics/pokemon/gen_7/mudbray/front.4bpp.lz"); + const u32 gMonPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/gen_7/mudbray/normal.gbapal.lz"); + const u32 gMonBackPic_Mudbray[] = INCBIN_U32("graphics/pokemon/gen_7/mudbray/back.4bpp.lz"); + const u32 gMonShinyPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/gen_7/mudbray/shiny.gbapal.lz"); + const u8 gMonIcon_Mudbray[] = INCBIN_U8("graphics/pokemon/gen_7/mudbray/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mudbray[] = INCBIN_U8("graphics/pokemon/mudbray/footprint.1bpp"); + const u8 gMonFootprint_Mudbray[] = INCBIN_U8("graphics/pokemon/gen_7/mudbray/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/front.4bpp.lz"); - const u32 gMonPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/normal.gbapal.lz"); - const u32 gMonBackPic_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/back.4bpp.lz"); - const u32 gMonShinyPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/shiny.gbapal.lz"); - const u8 gMonIcon_Mudsdale[] = INCBIN_U8("graphics/pokemon/mudsdale/icon.4bpp"); + const u32 gMonFrontPic_Mudsdale[] = INCBIN_U32("graphics/pokemon/gen_7/mudsdale/front.4bpp.lz"); + const u32 gMonPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/gen_7/mudsdale/normal.gbapal.lz"); + const u32 gMonBackPic_Mudsdale[] = INCBIN_U32("graphics/pokemon/gen_7/mudsdale/back.4bpp.lz"); + const u32 gMonShinyPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/gen_7/mudsdale/shiny.gbapal.lz"); + const u8 gMonIcon_Mudsdale[] = INCBIN_U8("graphics/pokemon/gen_7/mudsdale/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mudsdale[] = INCBIN_U8("graphics/pokemon/mudsdale/footprint.1bpp"); + const u8 gMonFootprint_Mudsdale[] = INCBIN_U8("graphics/pokemon/gen_7/mudsdale/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MUDBRAY #if P_FAMILY_DEWPIDER - const u32 gMonFrontPic_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/anim_front.4bpp.lz"); - const u32 gMonPalette_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/normal.gbapal.lz"); - const u32 gMonBackPic_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/back.4bpp.lz"); - const u32 gMonShinyPalette_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/shiny.gbapal.lz"); - const u8 gMonIcon_Dewpider[] = INCBIN_U8("graphics/pokemon/dewpider/icon.4bpp"); + const u32 gMonFrontPic_Dewpider[] = INCBIN_U32("graphics/pokemon/gen_7/dewpider/anim_front.4bpp.lz"); + const u32 gMonPalette_Dewpider[] = INCBIN_U32("graphics/pokemon/gen_7/dewpider/normal.gbapal.lz"); + const u32 gMonBackPic_Dewpider[] = INCBIN_U32("graphics/pokemon/gen_7/dewpider/back.4bpp.lz"); + const u32 gMonShinyPalette_Dewpider[] = INCBIN_U32("graphics/pokemon/gen_7/dewpider/shiny.gbapal.lz"); + const u8 gMonIcon_Dewpider[] = INCBIN_U8("graphics/pokemon/gen_7/dewpider/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dewpider[] = INCBIN_U8("graphics/pokemon/dewpider/footprint.1bpp"); + const u8 gMonFootprint_Dewpider[] = INCBIN_U8("graphics/pokemon/gen_7/dewpider/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/anim_front.4bpp.lz"); - const u32 gMonPalette_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/normal.gbapal.lz"); - const u32 gMonBackPic_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/back.4bpp.lz"); - const u32 gMonShinyPalette_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/shiny.gbapal.lz"); - const u8 gMonIcon_Araquanid[] = INCBIN_U8("graphics/pokemon/araquanid/icon.4bpp"); + const u32 gMonFrontPic_Araquanid[] = INCBIN_U32("graphics/pokemon/gen_7/araquanid/anim_front.4bpp.lz"); + const u32 gMonPalette_Araquanid[] = INCBIN_U32("graphics/pokemon/gen_7/araquanid/normal.gbapal.lz"); + const u32 gMonBackPic_Araquanid[] = INCBIN_U32("graphics/pokemon/gen_7/araquanid/back.4bpp.lz"); + const u32 gMonShinyPalette_Araquanid[] = INCBIN_U32("graphics/pokemon/gen_7/araquanid/shiny.gbapal.lz"); + const u8 gMonIcon_Araquanid[] = INCBIN_U8("graphics/pokemon/gen_7/araquanid/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Araquanid[] = INCBIN_U8("graphics/pokemon/araquanid/footprint.1bpp"); + const u8 gMonFootprint_Araquanid[] = INCBIN_U8("graphics/pokemon/gen_7/araquanid/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DEWPIDER #if P_FAMILY_FOMANTIS - const u32 gMonFrontPic_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/front.4bpp.lz"); - const u32 gMonPalette_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/normal.gbapal.lz"); - const u32 gMonBackPic_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/back.4bpp.lz"); - const u32 gMonShinyPalette_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/shiny.gbapal.lz"); - const u8 gMonIcon_Fomantis[] = INCBIN_U8("graphics/pokemon/fomantis/icon.4bpp"); + const u32 gMonFrontPic_Fomantis[] = INCBIN_U32("graphics/pokemon/gen_7/fomantis/front.4bpp.lz"); + const u32 gMonPalette_Fomantis[] = INCBIN_U32("graphics/pokemon/gen_7/fomantis/normal.gbapal.lz"); + const u32 gMonBackPic_Fomantis[] = INCBIN_U32("graphics/pokemon/gen_7/fomantis/back.4bpp.lz"); + const u32 gMonShinyPalette_Fomantis[] = INCBIN_U32("graphics/pokemon/gen_7/fomantis/shiny.gbapal.lz"); + const u8 gMonIcon_Fomantis[] = INCBIN_U8("graphics/pokemon/gen_7/fomantis/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Fomantis[] = INCBIN_U8("graphics/pokemon/fomantis/footprint.1bpp"); + const u8 gMonFootprint_Fomantis[] = INCBIN_U8("graphics/pokemon/gen_7/fomantis/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/front.4bpp.lz"); - const u32 gMonPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/normal.gbapal.lz"); - const u32 gMonBackPic_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/back.4bpp.lz"); - const u32 gMonShinyPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/shiny.gbapal.lz"); - const u8 gMonIcon_Lurantis[] = INCBIN_U8("graphics/pokemon/lurantis/icon.4bpp"); + const u32 gMonFrontPic_Lurantis[] = INCBIN_U32("graphics/pokemon/gen_7/lurantis/front.4bpp.lz"); + const u32 gMonPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/gen_7/lurantis/normal.gbapal.lz"); + const u32 gMonBackPic_Lurantis[] = INCBIN_U32("graphics/pokemon/gen_7/lurantis/back.4bpp.lz"); + const u32 gMonShinyPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/gen_7/lurantis/shiny.gbapal.lz"); + const u8 gMonIcon_Lurantis[] = INCBIN_U8("graphics/pokemon/gen_7/lurantis/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lurantis[] = INCBIN_U8("graphics/pokemon/lurantis/footprint.1bpp"); + const u8 gMonFootprint_Lurantis[] = INCBIN_U8("graphics/pokemon/gen_7/lurantis/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_FOMANTIS #if P_FAMILY_MORELULL - const u32 gMonFrontPic_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/front.4bpp.lz"); - const u32 gMonPalette_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/normal.gbapal.lz"); - const u32 gMonBackPic_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/back.4bpp.lz"); - const u32 gMonShinyPalette_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/shiny.gbapal.lz"); - const u8 gMonIcon_Morelull[] = INCBIN_U8("graphics/pokemon/morelull/icon.4bpp"); + const u32 gMonFrontPic_Morelull[] = INCBIN_U32("graphics/pokemon/gen_7/morelull/front.4bpp.lz"); + const u32 gMonPalette_Morelull[] = INCBIN_U32("graphics/pokemon/gen_7/morelull/normal.gbapal.lz"); + const u32 gMonBackPic_Morelull[] = INCBIN_U32("graphics/pokemon/gen_7/morelull/back.4bpp.lz"); + const u32 gMonShinyPalette_Morelull[] = INCBIN_U32("graphics/pokemon/gen_7/morelull/shiny.gbapal.lz"); + const u8 gMonIcon_Morelull[] = INCBIN_U8("graphics/pokemon/gen_7/morelull/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Morelull[] = INCBIN_U8("graphics/pokemon/morelull/footprint.1bpp"); + const u8 gMonFootprint_Morelull[] = INCBIN_U8("graphics/pokemon/gen_7/morelull/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/front.4bpp.lz"); - const u32 gMonPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/normal.gbapal.lz"); - const u32 gMonBackPic_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/back.4bpp.lz"); - const u32 gMonShinyPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/shiny.gbapal.lz"); - const u8 gMonIcon_Shiinotic[] = INCBIN_U8("graphics/pokemon/shiinotic/icon.4bpp"); + const u32 gMonFrontPic_Shiinotic[] = INCBIN_U32("graphics/pokemon/gen_7/shiinotic/front.4bpp.lz"); + const u32 gMonPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/gen_7/shiinotic/normal.gbapal.lz"); + const u32 gMonBackPic_Shiinotic[] = INCBIN_U32("graphics/pokemon/gen_7/shiinotic/back.4bpp.lz"); + const u32 gMonShinyPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/gen_7/shiinotic/shiny.gbapal.lz"); + const u8 gMonIcon_Shiinotic[] = INCBIN_U8("graphics/pokemon/gen_7/shiinotic/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Shiinotic[] = INCBIN_U8("graphics/pokemon/shiinotic/footprint.1bpp"); + const u8 gMonFootprint_Shiinotic[] = INCBIN_U8("graphics/pokemon/gen_7/shiinotic/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MORELULL #if P_FAMILY_SALANDIT - const u32 gMonFrontPic_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/anim_front.4bpp.lz"); - const u32 gMonPalette_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/normal.gbapal.lz"); - const u32 gMonBackPic_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/back.4bpp.lz"); - const u32 gMonShinyPalette_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/shiny.gbapal.lz"); - const u8 gMonIcon_Salandit[] = INCBIN_U8("graphics/pokemon/salandit/icon.4bpp"); + const u32 gMonFrontPic_Salandit[] = INCBIN_U32("graphics/pokemon/gen_7/salandit/anim_front.4bpp.lz"); + const u32 gMonPalette_Salandit[] = INCBIN_U32("graphics/pokemon/gen_7/salandit/normal.gbapal.lz"); + const u32 gMonBackPic_Salandit[] = INCBIN_U32("graphics/pokemon/gen_7/salandit/back.4bpp.lz"); + const u32 gMonShinyPalette_Salandit[] = INCBIN_U32("graphics/pokemon/gen_7/salandit/shiny.gbapal.lz"); + const u8 gMonIcon_Salandit[] = INCBIN_U8("graphics/pokemon/gen_7/salandit/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Salandit[] = INCBIN_U8("graphics/pokemon/salandit/footprint.1bpp"); + const u8 gMonFootprint_Salandit[] = INCBIN_U8("graphics/pokemon/gen_7/salandit/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/anim_front.4bpp.lz"); - const u32 gMonPalette_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/normal.gbapal.lz"); - const u32 gMonBackPic_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/back.4bpp.lz"); - const u32 gMonShinyPalette_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/shiny.gbapal.lz"); - const u8 gMonIcon_Salazzle[] = INCBIN_U8("graphics/pokemon/salazzle/icon.4bpp"); + const u32 gMonFrontPic_Salazzle[] = INCBIN_U32("graphics/pokemon/gen_7/salazzle/anim_front.4bpp.lz"); + const u32 gMonPalette_Salazzle[] = INCBIN_U32("graphics/pokemon/gen_7/salazzle/normal.gbapal.lz"); + const u32 gMonBackPic_Salazzle[] = INCBIN_U32("graphics/pokemon/gen_7/salazzle/back.4bpp.lz"); + const u32 gMonShinyPalette_Salazzle[] = INCBIN_U32("graphics/pokemon/gen_7/salazzle/shiny.gbapal.lz"); + const u8 gMonIcon_Salazzle[] = INCBIN_U8("graphics/pokemon/gen_7/salazzle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Salazzle[] = INCBIN_U8("graphics/pokemon/salazzle/footprint.1bpp"); + const u8 gMonFootprint_Salazzle[] = INCBIN_U8("graphics/pokemon/gen_7/salazzle/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SALANDIT #if P_FAMILY_STUFFUL - const u32 gMonFrontPic_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/anim_front.4bpp.lz"); - const u32 gMonPalette_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/normal.gbapal.lz"); - const u32 gMonBackPic_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/back.4bpp.lz"); - const u32 gMonShinyPalette_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/shiny.gbapal.lz"); - const u8 gMonIcon_Stufful[] = INCBIN_U8("graphics/pokemon/stufful/icon.4bpp"); + const u32 gMonFrontPic_Stufful[] = INCBIN_U32("graphics/pokemon/gen_7/stufful/anim_front.4bpp.lz"); + const u32 gMonPalette_Stufful[] = INCBIN_U32("graphics/pokemon/gen_7/stufful/normal.gbapal.lz"); + const u32 gMonBackPic_Stufful[] = INCBIN_U32("graphics/pokemon/gen_7/stufful/back.4bpp.lz"); + const u32 gMonShinyPalette_Stufful[] = INCBIN_U32("graphics/pokemon/gen_7/stufful/shiny.gbapal.lz"); + const u8 gMonIcon_Stufful[] = INCBIN_U8("graphics/pokemon/gen_7/stufful/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Stufful[] = INCBIN_U8("graphics/pokemon/stufful/footprint.1bpp"); + const u8 gMonFootprint_Stufful[] = INCBIN_U8("graphics/pokemon/gen_7/stufful/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/anim_front.4bpp.lz"); - const u32 gMonPalette_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/normal.gbapal.lz"); - const u32 gMonBackPic_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/back.4bpp.lz"); - const u32 gMonShinyPalette_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/shiny.gbapal.lz"); - const u8 gMonIcon_Bewear[] = INCBIN_U8("graphics/pokemon/bewear/icon.4bpp"); + const u32 gMonFrontPic_Bewear[] = INCBIN_U32("graphics/pokemon/gen_7/bewear/anim_front.4bpp.lz"); + const u32 gMonPalette_Bewear[] = INCBIN_U32("graphics/pokemon/gen_7/bewear/normal.gbapal.lz"); + const u32 gMonBackPic_Bewear[] = INCBIN_U32("graphics/pokemon/gen_7/bewear/back.4bpp.lz"); + const u32 gMonShinyPalette_Bewear[] = INCBIN_U32("graphics/pokemon/gen_7/bewear/shiny.gbapal.lz"); + const u8 gMonIcon_Bewear[] = INCBIN_U8("graphics/pokemon/gen_7/bewear/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bewear[] = INCBIN_U8("graphics/pokemon/bewear/footprint.1bpp"); + const u8 gMonFootprint_Bewear[] = INCBIN_U8("graphics/pokemon/gen_7/bewear/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_STUFFUL #if P_FAMILY_BOUNSWEET - const u32 gMonFrontPic_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/front.4bpp.lz"); - const u32 gMonPalette_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/normal.gbapal.lz"); - const u32 gMonBackPic_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/back.4bpp.lz"); - const u32 gMonShinyPalette_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/shiny.gbapal.lz"); - const u8 gMonIcon_Bounsweet[] = INCBIN_U8("graphics/pokemon/bounsweet/icon.4bpp"); + const u32 gMonFrontPic_Bounsweet[] = INCBIN_U32("graphics/pokemon/gen_7/bounsweet/front.4bpp.lz"); + const u32 gMonPalette_Bounsweet[] = INCBIN_U32("graphics/pokemon/gen_7/bounsweet/normal.gbapal.lz"); + const u32 gMonBackPic_Bounsweet[] = INCBIN_U32("graphics/pokemon/gen_7/bounsweet/back.4bpp.lz"); + const u32 gMonShinyPalette_Bounsweet[] = INCBIN_U32("graphics/pokemon/gen_7/bounsweet/shiny.gbapal.lz"); + const u8 gMonIcon_Bounsweet[] = INCBIN_U8("graphics/pokemon/gen_7/bounsweet/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bounsweet[] = INCBIN_U8("graphics/pokemon/bounsweet/footprint.1bpp"); + const u8 gMonFootprint_Bounsweet[] = INCBIN_U8("graphics/pokemon/gen_7/bounsweet/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/front.4bpp.lz"); - const u32 gMonPalette_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/normal.gbapal.lz"); - const u32 gMonBackPic_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/back.4bpp.lz"); - const u32 gMonShinyPalette_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/shiny.gbapal.lz"); - const u8 gMonIcon_Steenee[] = INCBIN_U8("graphics/pokemon/steenee/icon.4bpp"); + const u32 gMonFrontPic_Steenee[] = INCBIN_U32("graphics/pokemon/gen_7/steenee/front.4bpp.lz"); + const u32 gMonPalette_Steenee[] = INCBIN_U32("graphics/pokemon/gen_7/steenee/normal.gbapal.lz"); + const u32 gMonBackPic_Steenee[] = INCBIN_U32("graphics/pokemon/gen_7/steenee/back.4bpp.lz"); + const u32 gMonShinyPalette_Steenee[] = INCBIN_U32("graphics/pokemon/gen_7/steenee/shiny.gbapal.lz"); + const u8 gMonIcon_Steenee[] = INCBIN_U8("graphics/pokemon/gen_7/steenee/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Steenee[] = INCBIN_U8("graphics/pokemon/steenee/footprint.1bpp"); + const u8 gMonFootprint_Steenee[] = INCBIN_U8("graphics/pokemon/gen_7/steenee/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/front.4bpp.lz"); - const u32 gMonPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/normal.gbapal.lz"); - const u32 gMonBackPic_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/back.4bpp.lz"); - const u32 gMonShinyPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/shiny.gbapal.lz"); - const u8 gMonIcon_Tsareena[] = INCBIN_U8("graphics/pokemon/tsareena/icon.4bpp"); + const u32 gMonFrontPic_Tsareena[] = INCBIN_U32("graphics/pokemon/gen_7/tsareena/front.4bpp.lz"); + const u32 gMonPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/gen_7/tsareena/normal.gbapal.lz"); + const u32 gMonBackPic_Tsareena[] = INCBIN_U32("graphics/pokemon/gen_7/tsareena/back.4bpp.lz"); + const u32 gMonShinyPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/gen_7/tsareena/shiny.gbapal.lz"); + const u8 gMonIcon_Tsareena[] = INCBIN_U8("graphics/pokemon/gen_7/tsareena/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tsareena[] = INCBIN_U8("graphics/pokemon/tsareena/footprint.1bpp"); + const u8 gMonFootprint_Tsareena[] = INCBIN_U8("graphics/pokemon/gen_7/tsareena/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BOUNSWEET #if P_FAMILY_COMFEY - const u32 gMonFrontPic_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/front.4bpp.lz"); - const u32 gMonPalette_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/normal.gbapal.lz"); - const u32 gMonBackPic_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/back.4bpp.lz"); - const u32 gMonShinyPalette_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/shiny.gbapal.lz"); - const u8 gMonIcon_Comfey[] = INCBIN_U8("graphics/pokemon/comfey/icon.4bpp"); + const u32 gMonFrontPic_Comfey[] = INCBIN_U32("graphics/pokemon/gen_7/comfey/front.4bpp.lz"); + const u32 gMonPalette_Comfey[] = INCBIN_U32("graphics/pokemon/gen_7/comfey/normal.gbapal.lz"); + const u32 gMonBackPic_Comfey[] = INCBIN_U32("graphics/pokemon/gen_7/comfey/back.4bpp.lz"); + const u32 gMonShinyPalette_Comfey[] = INCBIN_U32("graphics/pokemon/gen_7/comfey/shiny.gbapal.lz"); + const u8 gMonIcon_Comfey[] = INCBIN_U8("graphics/pokemon/gen_7/comfey/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Comfey[] = INCBIN_U8("graphics/pokemon/comfey/footprint.1bpp"); + const u8 gMonFootprint_Comfey[] = INCBIN_U8("graphics/pokemon/gen_7/comfey/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_COMFEY #if P_FAMILY_ORANGURU - const u32 gMonFrontPic_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/anim_front.4bpp.lz"); - const u32 gMonPalette_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/normal.gbapal.lz"); - const u32 gMonBackPic_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/back.4bpp.lz"); - const u32 gMonShinyPalette_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/shiny.gbapal.lz"); - const u8 gMonIcon_Oranguru[] = INCBIN_U8("graphics/pokemon/oranguru/icon.4bpp"); + const u32 gMonFrontPic_Oranguru[] = INCBIN_U32("graphics/pokemon/gen_7/oranguru/anim_front.4bpp.lz"); + const u32 gMonPalette_Oranguru[] = INCBIN_U32("graphics/pokemon/gen_7/oranguru/normal.gbapal.lz"); + const u32 gMonBackPic_Oranguru[] = INCBIN_U32("graphics/pokemon/gen_7/oranguru/back.4bpp.lz"); + const u32 gMonShinyPalette_Oranguru[] = INCBIN_U32("graphics/pokemon/gen_7/oranguru/shiny.gbapal.lz"); + const u8 gMonIcon_Oranguru[] = INCBIN_U8("graphics/pokemon/gen_7/oranguru/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Oranguru[] = INCBIN_U8("graphics/pokemon/oranguru/footprint.1bpp"); + const u8 gMonFootprint_Oranguru[] = INCBIN_U8("graphics/pokemon/gen_7/oranguru/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ORANGURU #if P_FAMILY_PASSIMIAN - const u32 gMonFrontPic_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/anim_front.4bpp.lz"); - const u32 gMonPalette_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/normal.gbapal.lz"); - const u32 gMonBackPic_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/back.4bpp.lz"); - const u32 gMonShinyPalette_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/shiny.gbapal.lz"); - const u8 gMonIcon_Passimian[] = INCBIN_U8("graphics/pokemon/passimian/icon.4bpp"); + const u32 gMonFrontPic_Passimian[] = INCBIN_U32("graphics/pokemon/gen_7/passimian/anim_front.4bpp.lz"); + const u32 gMonPalette_Passimian[] = INCBIN_U32("graphics/pokemon/gen_7/passimian/normal.gbapal.lz"); + const u32 gMonBackPic_Passimian[] = INCBIN_U32("graphics/pokemon/gen_7/passimian/back.4bpp.lz"); + const u32 gMonShinyPalette_Passimian[] = INCBIN_U32("graphics/pokemon/gen_7/passimian/shiny.gbapal.lz"); + const u8 gMonIcon_Passimian[] = INCBIN_U8("graphics/pokemon/gen_7/passimian/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Passimian[] = INCBIN_U8("graphics/pokemon/passimian/footprint.1bpp"); + const u8 gMonFootprint_Passimian[] = INCBIN_U8("graphics/pokemon/gen_7/passimian/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PASSIMIAN #if P_FAMILY_WIMPOD - const u32 gMonFrontPic_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/anim_front.4bpp.lz"); - const u32 gMonPalette_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/normal.gbapal.lz"); - const u32 gMonBackPic_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/back.4bpp.lz"); - const u32 gMonShinyPalette_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/shiny.gbapal.lz"); - const u8 gMonIcon_Wimpod[] = INCBIN_U8("graphics/pokemon/wimpod/icon.4bpp"); + const u32 gMonFrontPic_Wimpod[] = INCBIN_U32("graphics/pokemon/gen_7/wimpod/anim_front.4bpp.lz"); + const u32 gMonPalette_Wimpod[] = INCBIN_U32("graphics/pokemon/gen_7/wimpod/normal.gbapal.lz"); + const u32 gMonBackPic_Wimpod[] = INCBIN_U32("graphics/pokemon/gen_7/wimpod/back.4bpp.lz"); + const u32 gMonShinyPalette_Wimpod[] = INCBIN_U32("graphics/pokemon/gen_7/wimpod/shiny.gbapal.lz"); + const u8 gMonIcon_Wimpod[] = INCBIN_U8("graphics/pokemon/gen_7/wimpod/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Wimpod[] = INCBIN_U8("graphics/pokemon/wimpod/footprint.1bpp"); + const u8 gMonFootprint_Wimpod[] = INCBIN_U8("graphics/pokemon/gen_7/wimpod/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/anim_front.4bpp.lz"); - const u32 gMonPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/normal.gbapal.lz"); - const u32 gMonBackPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/back.4bpp.lz"); - const u32 gMonShinyPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/shiny.gbapal.lz"); - const u8 gMonIcon_Golisopod[] = INCBIN_U8("graphics/pokemon/golisopod/icon.4bpp"); + const u32 gMonFrontPic_Golisopod[] = INCBIN_U32("graphics/pokemon/gen_7/golisopod/anim_front.4bpp.lz"); + const u32 gMonPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/gen_7/golisopod/normal.gbapal.lz"); + const u32 gMonBackPic_Golisopod[] = INCBIN_U32("graphics/pokemon/gen_7/golisopod/back.4bpp.lz"); + const u32 gMonShinyPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/gen_7/golisopod/shiny.gbapal.lz"); + const u8 gMonIcon_Golisopod[] = INCBIN_U8("graphics/pokemon/gen_7/golisopod/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Golisopod[] = INCBIN_U8("graphics/pokemon/golisopod/footprint.1bpp"); + const u8 gMonFootprint_Golisopod[] = INCBIN_U8("graphics/pokemon/gen_7/golisopod/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_WIMPOD #if P_FAMILY_SANDYGAST - const u32 gMonFrontPic_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/front.4bpp.lz"); - const u32 gMonPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/normal.gbapal.lz"); - const u32 gMonBackPic_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/back.4bpp.lz"); - const u32 gMonShinyPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/shiny.gbapal.lz"); - const u8 gMonIcon_Sandygast[] = INCBIN_U8("graphics/pokemon/sandygast/icon.4bpp"); + const u32 gMonFrontPic_Sandygast[] = INCBIN_U32("graphics/pokemon/gen_7/sandygast/front.4bpp.lz"); + const u32 gMonPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/gen_7/sandygast/normal.gbapal.lz"); + const u32 gMonBackPic_Sandygast[] = INCBIN_U32("graphics/pokemon/gen_7/sandygast/back.4bpp.lz"); + const u32 gMonShinyPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/gen_7/sandygast/shiny.gbapal.lz"); + const u8 gMonIcon_Sandygast[] = INCBIN_U8("graphics/pokemon/gen_7/sandygast/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sandygast[] = INCBIN_U8("graphics/pokemon/sandygast/footprint.1bpp"); + const u8 gMonFootprint_Sandygast[] = INCBIN_U8("graphics/pokemon/gen_7/sandygast/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/front.4bpp.lz"); - const u32 gMonPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/normal.gbapal.lz"); - const u32 gMonBackPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/back.4bpp.lz"); - const u32 gMonShinyPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/shiny.gbapal.lz"); - const u8 gMonIcon_Palossand[] = INCBIN_U8("graphics/pokemon/palossand/icon.4bpp"); + const u32 gMonFrontPic_Palossand[] = INCBIN_U32("graphics/pokemon/gen_7/palossand/front.4bpp.lz"); + const u32 gMonPalette_Palossand[] = INCBIN_U32("graphics/pokemon/gen_7/palossand/normal.gbapal.lz"); + const u32 gMonBackPic_Palossand[] = INCBIN_U32("graphics/pokemon/gen_7/palossand/back.4bpp.lz"); + const u32 gMonShinyPalette_Palossand[] = INCBIN_U32("graphics/pokemon/gen_7/palossand/shiny.gbapal.lz"); + const u8 gMonIcon_Palossand[] = INCBIN_U8("graphics/pokemon/gen_7/palossand/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Palossand[] = INCBIN_U8("graphics/pokemon/palossand/footprint.1bpp"); + const u8 gMonFootprint_Palossand[] = INCBIN_U8("graphics/pokemon/gen_7/palossand/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SANDYGAST #if P_FAMILY_PYUKUMUKU - const u32 gMonFrontPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/anim_front.4bpp.lz"); - const u32 gMonPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/normal.gbapal.lz"); - const u32 gMonBackPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/back.4bpp.lz"); - const u32 gMonShinyPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/shiny.gbapal.lz"); - const u8 gMonIcon_Pyukumuku[] = INCBIN_U8("graphics/pokemon/pyukumuku/icon.4bpp"); + const u32 gMonFrontPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/gen_7/pyukumuku/anim_front.4bpp.lz"); + const u32 gMonPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/gen_7/pyukumuku/normal.gbapal.lz"); + const u32 gMonBackPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/gen_7/pyukumuku/back.4bpp.lz"); + const u32 gMonShinyPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/gen_7/pyukumuku/shiny.gbapal.lz"); + const u8 gMonIcon_Pyukumuku[] = INCBIN_U8("graphics/pokemon/gen_7/pyukumuku/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pyukumuku[] = INCBIN_U8("graphics/pokemon/pyukumuku/footprint.1bpp"); + const u8 gMonFootprint_Pyukumuku[] = INCBIN_U8("graphics/pokemon/gen_7/pyukumuku/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PYUKUMUKU #if P_FAMILY_TYPE_NULL - const u32 gMonFrontPic_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/front.4bpp.lz"); - const u32 gMonPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/normal.gbapal.lz"); - const u32 gMonBackPic_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/back.4bpp.lz"); - const u32 gMonShinyPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/shiny.gbapal.lz"); - const u8 gMonIcon_TypeNull[] = INCBIN_U8("graphics/pokemon/type_null/icon.4bpp"); + const u32 gMonFrontPic_TypeNull[] = INCBIN_U32("graphics/pokemon/gen_7/type_null/front.4bpp.lz"); + const u32 gMonPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/gen_7/type_null/normal.gbapal.lz"); + const u32 gMonBackPic_TypeNull[] = INCBIN_U32("graphics/pokemon/gen_7/type_null/back.4bpp.lz"); + const u32 gMonShinyPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/gen_7/type_null/shiny.gbapal.lz"); + const u8 gMonIcon_TypeNull[] = INCBIN_U8("graphics/pokemon/gen_7/type_null/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Type_Null[] = INCBIN_U8("graphics/pokemon/type_null/footprint.1bpp"); + const u8 gMonFootprint_Type_Null[] = INCBIN_U8("graphics/pokemon/gen_7/type_null/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/front.4bpp.lz"); - const u32 gMonBackPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/back.4bpp.lz"); - const u8 gMonIcon_Silvally[] = INCBIN_U8("graphics/pokemon/silvally/icon.4bpp"); + const u32 gMonFrontPic_Silvally[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/front.4bpp.lz"); + const u32 gMonBackPic_Silvally[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/back.4bpp.lz"); + const u8 gMonIcon_Silvally[] = INCBIN_U8("graphics/pokemon/gen_7/silvally/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Silvally[] = INCBIN_U8("graphics/pokemon/silvally/footprint.1bpp"); + const u8 gMonFootprint_Silvally[] = INCBIN_U8("graphics/pokemon/gen_7/silvally/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_SilvallyNormal[] = INCBIN_U32("graphics/pokemon/silvally/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyNormal[] = INCBIN_U32("graphics/pokemon/silvally/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyNormal[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyNormal[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyFighting[] = INCBIN_U32("graphics/pokemon/silvally/fighting/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyFighting[] = INCBIN_U32("graphics/pokemon/silvally/fighting/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyFighting[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/fighting/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyFighting[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/fighting/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyFlying[] = INCBIN_U32("graphics/pokemon/silvally/flying/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyFlying[] = INCBIN_U32("graphics/pokemon/silvally/flying/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyFlying[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/flying/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyFlying[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/flying/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyPoison[] = INCBIN_U32("graphics/pokemon/silvally/poison/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyPoison[] = INCBIN_U32("graphics/pokemon/silvally/poison/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyPoison[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/poison/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyPoison[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/poison/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyGround[] = INCBIN_U32("graphics/pokemon/silvally/ground/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyGround[] = INCBIN_U32("graphics/pokemon/silvally/ground/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyGround[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/ground/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyGround[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/ground/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyRock[] = INCBIN_U32("graphics/pokemon/silvally/rock/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyRock[] = INCBIN_U32("graphics/pokemon/silvally/rock/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyRock[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/rock/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyRock[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/rock/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyBug[] = INCBIN_U32("graphics/pokemon/silvally/bug/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyBug[] = INCBIN_U32("graphics/pokemon/silvally/bug/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyBug[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/bug/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyBug[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/bug/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyGhost[] = INCBIN_U32("graphics/pokemon/silvally/ghost/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyGhost[] = INCBIN_U32("graphics/pokemon/silvally/ghost/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyGhost[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/ghost/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyGhost[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/ghost/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallySteel[] = INCBIN_U32("graphics/pokemon/silvally/steel/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallySteel[] = INCBIN_U32("graphics/pokemon/silvally/steel/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallySteel[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/steel/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallySteel[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/steel/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyFire[] = INCBIN_U32("graphics/pokemon/silvally/fire/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyFire[] = INCBIN_U32("graphics/pokemon/silvally/fire/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyFire[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/fire/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyFire[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/fire/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyWater[] = INCBIN_U32("graphics/pokemon/silvally/water/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyWater[] = INCBIN_U32("graphics/pokemon/silvally/water/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyWater[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/water/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyWater[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/water/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyGrass[] = INCBIN_U32("graphics/pokemon/silvally/grass/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyGrass[] = INCBIN_U32("graphics/pokemon/silvally/grass/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyGrass[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/grass/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyGrass[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/grass/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyElectric[] = INCBIN_U32("graphics/pokemon/silvally/electric/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyElectric[] = INCBIN_U32("graphics/pokemon/silvally/electric/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyElectric[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/electric/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyElectric[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/electric/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyPsychic[] = INCBIN_U32("graphics/pokemon/silvally/psychic/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyPsychic[] = INCBIN_U32("graphics/pokemon/silvally/psychic/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyPsychic[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/psychic/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyPsychic[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/psychic/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyIce[] = INCBIN_U32("graphics/pokemon/silvally/ice/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyIce[] = INCBIN_U32("graphics/pokemon/silvally/ice/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyIce[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/ice/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyIce[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/ice/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyDragon[] = INCBIN_U32("graphics/pokemon/silvally/dragon/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyDragon[] = INCBIN_U32("graphics/pokemon/silvally/dragon/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyDragon[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/dragon/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyDragon[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/dragon/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyDark[] = INCBIN_U32("graphics/pokemon/silvally/dark/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyDark[] = INCBIN_U32("graphics/pokemon/silvally/dark/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyDark[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/dark/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyDark[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/dark/shiny.gbapal.lz"); - const u32 gMonPalette_SilvallyFairy[] = INCBIN_U32("graphics/pokemon/silvally/fairy/normal.gbapal.lz"); - const u32 gMonShinyPalette_SilvallyFairy[] = INCBIN_U32("graphics/pokemon/silvally/fairy/shiny.gbapal.lz"); + const u32 gMonPalette_SilvallyFairy[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/fairy/normal.gbapal.lz"); + const u32 gMonShinyPalette_SilvallyFairy[] = INCBIN_U32("graphics/pokemon/gen_7/silvally/fairy/shiny.gbapal.lz"); #endif //P_FAMILY_TYPE_NULL #if P_FAMILY_MINIOR - const u32 gMonFrontPic_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/front.4bpp.lz"); - const u32 gMonPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/normal.gbapal.lz"); - const u32 gMonBackPic_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/back.4bpp.lz"); - const u32 gMonShinyPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/shiny.gbapal.lz"); - const u8 gMonIcon_MiniorMeteor[] = INCBIN_U8("graphics/pokemon/minior/icon.4bpp"); + const u32 gMonFrontPic_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/gen_7/minior/front.4bpp.lz"); + const u32 gMonPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/gen_7/minior/normal.gbapal.lz"); + const u32 gMonBackPic_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/gen_7/minior/back.4bpp.lz"); + const u32 gMonShinyPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/gen_7/minior/shiny.gbapal.lz"); + const u8 gMonIcon_MiniorMeteor[] = INCBIN_U8("graphics/pokemon/gen_7/minior/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Minior[] = INCBIN_U8("graphics/pokemon/minior/footprint.1bpp"); + const u8 gMonFootprint_Minior[] = INCBIN_U8("graphics/pokemon/gen_7/minior/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MiniorCore[] = INCBIN_U32("graphics/pokemon/minior/core/front.4bpp.lz"); - const u32 gMonBackPic_MiniorCore[] = INCBIN_U32("graphics/pokemon/minior/core/back.4bpp.lz"); - const u32 gMonShinyPalette_MiniorCore[] = INCBIN_U32("graphics/pokemon/minior/core/shiny.gbapal.lz"); + const u32 gMonFrontPic_MiniorCore[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/front.4bpp.lz"); + const u32 gMonBackPic_MiniorCore[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/back.4bpp.lz"); + const u32 gMonShinyPalette_MiniorCore[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/shiny.gbapal.lz"); - const u32 gMonPalette_MiniorCoreRed[] = INCBIN_U32("graphics/pokemon/minior/core/red/normal.gbapal.lz"); - const u8 gMonIcon_MiniorCoreRed[] = INCBIN_U8("graphics/pokemon/minior/core/red/icon.4bpp"); + const u32 gMonPalette_MiniorCoreRed[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/red/normal.gbapal.lz"); + const u8 gMonIcon_MiniorCoreRed[] = INCBIN_U8("graphics/pokemon/gen_7/minior/core/red/icon.4bpp"); - const u32 gMonPalette_MiniorCoreOrange[] = INCBIN_U32("graphics/pokemon/minior/core/orange/normal.gbapal.lz"); - const u8 gMonIcon_MiniorCoreOrange[] = INCBIN_U8("graphics/pokemon/minior/core/orange/icon.4bpp"); + const u32 gMonPalette_MiniorCoreOrange[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/orange/normal.gbapal.lz"); + const u8 gMonIcon_MiniorCoreOrange[] = INCBIN_U8("graphics/pokemon/gen_7/minior/core/orange/icon.4bpp"); - const u32 gMonPalette_MiniorCoreYellow[] = INCBIN_U32("graphics/pokemon/minior/core/yellow/normal.gbapal.lz"); - const u8 gMonIcon_MiniorCoreYellow[] = INCBIN_U8("graphics/pokemon/minior/core/yellow/icon.4bpp"); + const u32 gMonPalette_MiniorCoreYellow[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/yellow/normal.gbapal.lz"); + const u8 gMonIcon_MiniorCoreYellow[] = INCBIN_U8("graphics/pokemon/gen_7/minior/core/yellow/icon.4bpp"); - const u32 gMonPalette_MiniorCoreGreen[] = INCBIN_U32("graphics/pokemon/minior/core/green/normal.gbapal.lz"); - const u8 gMonIcon_MiniorCoreGreen[] = INCBIN_U8("graphics/pokemon/minior/core/green/icon.4bpp"); + const u32 gMonPalette_MiniorCoreGreen[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/green/normal.gbapal.lz"); + const u8 gMonIcon_MiniorCoreGreen[] = INCBIN_U8("graphics/pokemon/gen_7/minior/core/green/icon.4bpp"); - const u32 gMonPalette_MiniorCoreBlue[] = INCBIN_U32("graphics/pokemon/minior/core/blue/normal.gbapal.lz"); - const u8 gMonIcon_MiniorCoreBlue[] = INCBIN_U8("graphics/pokemon/minior/core/blue/icon.4bpp"); + const u32 gMonPalette_MiniorCoreBlue[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/blue/normal.gbapal.lz"); + const u8 gMonIcon_MiniorCoreBlue[] = INCBIN_U8("graphics/pokemon/gen_7/minior/core/blue/icon.4bpp"); - const u32 gMonPalette_MiniorCoreIndigo[] = INCBIN_U32("graphics/pokemon/minior/core/indigo/normal.gbapal.lz"); - const u8 gMonIcon_MiniorCoreIndigo[] = INCBIN_U8("graphics/pokemon/minior/core/indigo/icon.4bpp"); + const u32 gMonPalette_MiniorCoreIndigo[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/indigo/normal.gbapal.lz"); + const u8 gMonIcon_MiniorCoreIndigo[] = INCBIN_U8("graphics/pokemon/gen_7/minior/core/indigo/icon.4bpp"); - const u32 gMonPalette_MiniorCoreViolet[] = INCBIN_U32("graphics/pokemon/minior/core/violet/normal.gbapal.lz"); - const u8 gMonIcon_MiniorCoreViolet[] = INCBIN_U8("graphics/pokemon/minior/core/violet/icon.4bpp"); + const u32 gMonPalette_MiniorCoreViolet[] = INCBIN_U32("graphics/pokemon/gen_7/minior/core/violet/normal.gbapal.lz"); + const u8 gMonIcon_MiniorCoreViolet[] = INCBIN_U8("graphics/pokemon/gen_7/minior/core/violet/icon.4bpp"); #endif //P_FAMILY_MINIOR #if P_FAMILY_KOMALA - const u32 gMonFrontPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/front.4bpp.lz"); - const u32 gMonPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/normal.gbapal.lz"); - const u32 gMonBackPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/back.4bpp.lz"); - const u32 gMonShinyPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/shiny.gbapal.lz"); - const u8 gMonIcon_Komala[] = INCBIN_U8("graphics/pokemon/komala/icon.4bpp"); + const u32 gMonFrontPic_Komala[] = INCBIN_U32("graphics/pokemon/gen_7/komala/front.4bpp.lz"); + const u32 gMonPalette_Komala[] = INCBIN_U32("graphics/pokemon/gen_7/komala/normal.gbapal.lz"); + const u32 gMonBackPic_Komala[] = INCBIN_U32("graphics/pokemon/gen_7/komala/back.4bpp.lz"); + const u32 gMonShinyPalette_Komala[] = INCBIN_U32("graphics/pokemon/gen_7/komala/shiny.gbapal.lz"); + const u8 gMonIcon_Komala[] = INCBIN_U8("graphics/pokemon/gen_7/komala/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Komala[] = INCBIN_U8("graphics/pokemon/komala/footprint.1bpp"); + const u8 gMonFootprint_Komala[] = INCBIN_U8("graphics/pokemon/gen_7/komala/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_KOMALA #if P_FAMILY_TURTONATOR - const u32 gMonFrontPic_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/anim_front.4bpp.lz"); - const u32 gMonPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/normal.gbapal.lz"); - const u32 gMonBackPic_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/back.4bpp.lz"); - const u32 gMonShinyPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/shiny.gbapal.lz"); - const u8 gMonIcon_Turtonator[] = INCBIN_U8("graphics/pokemon/turtonator/icon.4bpp"); + const u32 gMonFrontPic_Turtonator[] = INCBIN_U32("graphics/pokemon/gen_7/turtonator/anim_front.4bpp.lz"); + const u32 gMonPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/gen_7/turtonator/normal.gbapal.lz"); + const u32 gMonBackPic_Turtonator[] = INCBIN_U32("graphics/pokemon/gen_7/turtonator/back.4bpp.lz"); + const u32 gMonShinyPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/gen_7/turtonator/shiny.gbapal.lz"); + const u8 gMonIcon_Turtonator[] = INCBIN_U8("graphics/pokemon/gen_7/turtonator/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Turtonator[] = INCBIN_U8("graphics/pokemon/turtonator/footprint.1bpp"); + const u8 gMonFootprint_Turtonator[] = INCBIN_U8("graphics/pokemon/gen_7/turtonator/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TURTONATOR #if P_FAMILY_TOGEDEMARU - const u32 gMonFrontPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/anim_front.4bpp.lz"); - const u32 gMonPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/normal.gbapal.lz"); - const u32 gMonBackPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/back.4bpp.lz"); - const u32 gMonShinyPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/shiny.gbapal.lz"); - const u8 gMonIcon_Togedemaru[] = INCBIN_U8("graphics/pokemon/togedemaru/icon.4bpp"); + const u32 gMonFrontPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/gen_7/togedemaru/anim_front.4bpp.lz"); + const u32 gMonPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/gen_7/togedemaru/normal.gbapal.lz"); + const u32 gMonBackPic_Togedemaru[] = INCBIN_U32("graphics/pokemon/gen_7/togedemaru/back.4bpp.lz"); + const u32 gMonShinyPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/gen_7/togedemaru/shiny.gbapal.lz"); + const u8 gMonIcon_Togedemaru[] = INCBIN_U8("graphics/pokemon/gen_7/togedemaru/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Togedemaru[] = INCBIN_U8("graphics/pokemon/togedemaru/footprint.1bpp"); + const u8 gMonFootprint_Togedemaru[] = INCBIN_U8("graphics/pokemon/gen_7/togedemaru/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TOGEDEMARU #if P_FAMILY_MIMIKYU - const u32 gMonFrontPic_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/front.4bpp.lz"); - const u32 gMonPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/normal.gbapal.lz"); - const u32 gMonBackPic_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/back.4bpp.lz"); - const u32 gMonShinyPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/shiny.gbapal.lz"); - const u8 gMonIcon_MimikyuDisguised[] = INCBIN_U8("graphics/pokemon/mimikyu/icon.4bpp"); + const u32 gMonFrontPic_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/front.4bpp.lz"); + const u32 gMonPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/normal.gbapal.lz"); + const u32 gMonBackPic_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/back.4bpp.lz"); + const u32 gMonShinyPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/shiny.gbapal.lz"); + const u8 gMonIcon_MimikyuDisguised[] = INCBIN_U8("graphics/pokemon/gen_7/mimikyu/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Mimikyu[] = INCBIN_U8("graphics/pokemon/mimikyu/footprint.1bpp"); + const u8 gMonFootprint_Mimikyu[] = INCBIN_U8("graphics/pokemon/gen_7/mimikyu/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/front.4bpp.lz"); - const u32 gMonPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/normal.gbapal.lz"); - const u32 gMonBackPic_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/back.4bpp.lz"); - const u32 gMonShinyPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/shiny.gbapal.lz"); - const u8 gMonIcon_MimikyuBusted[] = INCBIN_U8("graphics/pokemon/mimikyu/busted/icon.4bpp"); + const u32 gMonFrontPic_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/busted/front.4bpp.lz"); + const u32 gMonPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/busted/normal.gbapal.lz"); + const u32 gMonBackPic_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/busted/back.4bpp.lz"); + const u32 gMonShinyPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/gen_7/mimikyu/busted/shiny.gbapal.lz"); + const u8 gMonIcon_MimikyuBusted[] = INCBIN_U8("graphics/pokemon/gen_7/mimikyu/busted/icon.4bpp"); #endif //P_FAMILY_MIMIKYU #if P_FAMILY_BRUXISH - const u32 gMonFrontPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/front.4bpp.lz"); - const u32 gMonPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/normal.gbapal.lz"); - const u32 gMonBackPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/back.4bpp.lz"); - const u32 gMonShinyPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/shiny.gbapal.lz"); - const u8 gMonIcon_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/icon.4bpp"); + const u32 gMonFrontPic_Bruxish[] = INCBIN_U32("graphics/pokemon/gen_7/bruxish/front.4bpp.lz"); + const u32 gMonPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/gen_7/bruxish/normal.gbapal.lz"); + const u32 gMonBackPic_Bruxish[] = INCBIN_U32("graphics/pokemon/gen_7/bruxish/back.4bpp.lz"); + const u32 gMonShinyPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/gen_7/bruxish/shiny.gbapal.lz"); + const u8 gMonIcon_Bruxish[] = INCBIN_U8("graphics/pokemon/gen_7/bruxish/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/footprint.1bpp"); + const u8 gMonFootprint_Bruxish[] = INCBIN_U8("graphics/pokemon/gen_7/bruxish/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BRUXISH #if P_FAMILY_DRAMPA - const u32 gMonFrontPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/anim_front.4bpp.lz"); - const u32 gMonPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/normal.gbapal.lz"); - const u32 gMonBackPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/back.4bpp.lz"); - const u32 gMonShinyPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/shiny.gbapal.lz"); - const u8 gMonIcon_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/icon.4bpp"); + const u32 gMonFrontPic_Drampa[] = INCBIN_U32("graphics/pokemon/gen_7/drampa/anim_front.4bpp.lz"); + const u32 gMonPalette_Drampa[] = INCBIN_U32("graphics/pokemon/gen_7/drampa/normal.gbapal.lz"); + const u32 gMonBackPic_Drampa[] = INCBIN_U32("graphics/pokemon/gen_7/drampa/back.4bpp.lz"); + const u32 gMonShinyPalette_Drampa[] = INCBIN_U32("graphics/pokemon/gen_7/drampa/shiny.gbapal.lz"); + const u8 gMonIcon_Drampa[] = INCBIN_U8("graphics/pokemon/gen_7/drampa/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/footprint.1bpp"); + const u8 gMonFootprint_Drampa[] = INCBIN_U8("graphics/pokemon/gen_7/drampa/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DRAMPA #if P_FAMILY_DHELMISE - const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/front.4bpp.lz"); - const u32 gMonPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/normal.gbapal.lz"); - const u32 gMonBackPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/back.4bpp.lz"); - const u32 gMonShinyPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/shiny.gbapal.lz"); - const u8 gMonIcon_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/icon.4bpp"); + const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/gen_7/dhelmise/front.4bpp.lz"); + const u32 gMonPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/gen_7/dhelmise/normal.gbapal.lz"); + const u32 gMonBackPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/gen_7/dhelmise/back.4bpp.lz"); + const u32 gMonShinyPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/gen_7/dhelmise/shiny.gbapal.lz"); + const u8 gMonIcon_Dhelmise[] = INCBIN_U8("graphics/pokemon/gen_7/dhelmise/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/footprint.1bpp"); + const u8 gMonFootprint_Dhelmise[] = INCBIN_U8("graphics/pokemon/gen_7/dhelmise/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DHELMISE #if P_FAMILY_JANGMO_O - const u32 gMonFrontPic_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/anim_front.4bpp.lz"); - const u32 gMonPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/normal.gbapal.lz"); - const u32 gMonBackPic_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz"); - const u32 gMonShinyPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz"); - const u8 gMonIcon_JangmoO[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp"); + const u32 gMonFrontPic_JangmoO[] = INCBIN_U32("graphics/pokemon/gen_7/jangmo_o/anim_front.4bpp.lz"); + const u32 gMonPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/gen_7/jangmo_o/normal.gbapal.lz"); + const u32 gMonBackPic_JangmoO[] = INCBIN_U32("graphics/pokemon/gen_7/jangmo_o/back.4bpp.lz"); + const u32 gMonShinyPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/gen_7/jangmo_o/shiny.gbapal.lz"); + const u8 gMonIcon_JangmoO[] = INCBIN_U8("graphics/pokemon/gen_7/jangmo_o/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_JangmoO[] = INCBIN_U8("graphics/pokemon/jangmo_o/footprint.1bpp"); + const u8 gMonFootprint_JangmoO[] = INCBIN_U8("graphics/pokemon/gen_7/jangmo_o/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/anim_front.4bpp.lz"); - const u32 gMonPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz"); - const u32 gMonBackPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz"); - const u32 gMonShinyPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz"); - const u8 gMonIcon_HakamoO[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp"); + const u32 gMonFrontPic_HakamoO[] = INCBIN_U32("graphics/pokemon/gen_7/hakamo_o/anim_front.4bpp.lz"); + const u32 gMonPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/gen_7/hakamo_o/normal.gbapal.lz"); + const u32 gMonBackPic_HakamoO[] = INCBIN_U32("graphics/pokemon/gen_7/hakamo_o/back.4bpp.lz"); + const u32 gMonShinyPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/gen_7/hakamo_o/shiny.gbapal.lz"); + const u8 gMonIcon_HakamoO[] = INCBIN_U8("graphics/pokemon/gen_7/hakamo_o/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_HakamoO[] = INCBIN_U8("graphics/pokemon/hakamo_o/footprint.1bpp"); + const u8 gMonFootprint_HakamoO[] = INCBIN_U8("graphics/pokemon/gen_7/hakamo_o/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/anim_front.4bpp.lz"); - const u32 gMonPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/normal.gbapal.lz"); - const u32 gMonBackPic_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/back.4bpp.lz"); - const u32 gMonShinyPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/shiny.gbapal.lz"); - const u8 gMonIcon_KommoO[] = INCBIN_U8("graphics/pokemon/kommo_o/icon.4bpp"); + const u32 gMonFrontPic_KommoO[] = INCBIN_U32("graphics/pokemon/gen_7/kommo_o/anim_front.4bpp.lz"); + const u32 gMonPalette_KommoO[] = INCBIN_U32("graphics/pokemon/gen_7/kommo_o/normal.gbapal.lz"); + const u32 gMonBackPic_KommoO[] = INCBIN_U32("graphics/pokemon/gen_7/kommo_o/back.4bpp.lz"); + const u32 gMonShinyPalette_KommoO[] = INCBIN_U32("graphics/pokemon/gen_7/kommo_o/shiny.gbapal.lz"); + const u8 gMonIcon_KommoO[] = INCBIN_U8("graphics/pokemon/gen_7/kommo_o/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_KommoO[] = INCBIN_U8("graphics/pokemon/kommo_o/footprint.1bpp"); + const u8 gMonFootprint_KommoO[] = INCBIN_U8("graphics/pokemon/gen_7/kommo_o/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_JANGMO_O #if P_FAMILY_TAPU_KOKO - const u32 gMonFrontPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/anim_front.4bpp.lz"); - const u32 gMonPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/normal.gbapal.lz"); - const u32 gMonBackPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz"); - const u32 gMonShinyPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz"); - const u8 gMonIcon_TapuKoko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp"); + const u32 gMonFrontPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_koko/anim_front.4bpp.lz"); + const u32 gMonPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_koko/normal.gbapal.lz"); + const u32 gMonBackPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_koko/back.4bpp.lz"); + const u32 gMonShinyPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_koko/shiny.gbapal.lz"); + const u8 gMonIcon_TapuKoko[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_koko/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tapu_Koko[] = INCBIN_U8("graphics/pokemon/tapu_koko/footprint.1bpp"); + const u8 gMonFootprint_Tapu_Koko[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_koko/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TAPU_KOKO #if P_FAMILY_TAPU_LELE - const u32 gMonFrontPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/anim_front.4bpp.lz"); - const u32 gMonPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/normal.gbapal.lz"); - const u32 gMonBackPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/back.4bpp.lz"); - const u32 gMonShinyPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/shiny.gbapal.lz"); - const u8 gMonIcon_TapuLele[] = INCBIN_U8("graphics/pokemon/tapu_lele/icon.4bpp"); + const u32 gMonFrontPic_TapuLele[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_lele/anim_front.4bpp.lz"); + const u32 gMonPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_lele/normal.gbapal.lz"); + const u32 gMonBackPic_TapuLele[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_lele/back.4bpp.lz"); + const u32 gMonShinyPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_lele/shiny.gbapal.lz"); + const u8 gMonIcon_TapuLele[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_lele/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tapu_Lele[] = INCBIN_U8("graphics/pokemon/tapu_lele/footprint.1bpp"); + const u8 gMonFootprint_Tapu_Lele[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_lele/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TAPU_LELE #if P_FAMILY_TAPU_BULU - const u32 gMonFrontPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/anim_front.4bpp.lz"); - const u32 gMonPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/normal.gbapal.lz"); - const u32 gMonBackPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/back.4bpp.lz"); - const u32 gMonShinyPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/shiny.gbapal.lz"); - const u8 gMonIcon_TapuBulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/icon.4bpp"); + const u32 gMonFrontPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_bulu/anim_front.4bpp.lz"); + const u32 gMonPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_bulu/normal.gbapal.lz"); + const u32 gMonBackPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_bulu/back.4bpp.lz"); + const u32 gMonShinyPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_bulu/shiny.gbapal.lz"); + const u8 gMonIcon_TapuBulu[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_bulu/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tapu_Bulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/footprint.1bpp"); + const u8 gMonFootprint_Tapu_Bulu[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_bulu/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TAPU_BULU #if P_FAMILY_TAPU_FINI - const u32 gMonFrontPic_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/anim_front.4bpp.lz"); - const u32 gMonPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/normal.gbapal.lz"); - const u32 gMonBackPic_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/back.4bpp.lz"); - const u32 gMonShinyPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/shiny.gbapal.lz"); - const u8 gMonIcon_TapuFini[] = INCBIN_U8("graphics/pokemon/tapu_fini/icon.4bpp"); + const u32 gMonFrontPic_TapuFini[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_fini/anim_front.4bpp.lz"); + const u32 gMonPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_fini/normal.gbapal.lz"); + const u32 gMonBackPic_TapuFini[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_fini/back.4bpp.lz"); + const u32 gMonShinyPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/gen_7/tapu_fini/shiny.gbapal.lz"); + const u8 gMonIcon_TapuFini[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_fini/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Tapu_Fini[] = INCBIN_U8("graphics/pokemon/tapu_fini/footprint.1bpp"); + const u8 gMonFootprint_Tapu_Fini[] = INCBIN_U8("graphics/pokemon/gen_7/tapu_fini/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TAPU_FINI #if P_FAMILY_COSMOG - const u32 gMonFrontPic_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/front.4bpp.lz"); - const u32 gMonPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/normal.gbapal.lz"); - const u32 gMonBackPic_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/back.4bpp.lz"); - const u32 gMonShinyPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/shiny.gbapal.lz"); - const u8 gMonIcon_Cosmog[] = INCBIN_U8("graphics/pokemon/cosmog/icon.4bpp"); + const u32 gMonFrontPic_Cosmog[] = INCBIN_U32("graphics/pokemon/gen_7/cosmog/front.4bpp.lz"); + const u32 gMonPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/gen_7/cosmog/normal.gbapal.lz"); + const u32 gMonBackPic_Cosmog[] = INCBIN_U32("graphics/pokemon/gen_7/cosmog/back.4bpp.lz"); + const u32 gMonShinyPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/gen_7/cosmog/shiny.gbapal.lz"); + const u8 gMonIcon_Cosmog[] = INCBIN_U8("graphics/pokemon/gen_7/cosmog/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cosmog[] = INCBIN_U8("graphics/pokemon/cosmog/footprint.1bpp"); + const u8 gMonFootprint_Cosmog[] = INCBIN_U8("graphics/pokemon/gen_7/cosmog/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/front.4bpp.lz"); - const u32 gMonPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/normal.gbapal.lz"); - const u32 gMonBackPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/back.4bpp.lz"); - const u32 gMonShinyPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/shiny.gbapal.lz"); - const u8 gMonIcon_Cosmoem[] = INCBIN_U8("graphics/pokemon/cosmoem/icon.4bpp"); + const u32 gMonFrontPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/gen_7/cosmoem/front.4bpp.lz"); + const u32 gMonPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/gen_7/cosmoem/normal.gbapal.lz"); + const u32 gMonBackPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/gen_7/cosmoem/back.4bpp.lz"); + const u32 gMonShinyPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/gen_7/cosmoem/shiny.gbapal.lz"); + const u8 gMonIcon_Cosmoem[] = INCBIN_U8("graphics/pokemon/gen_7/cosmoem/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cosmoem[] = INCBIN_U8("graphics/pokemon/cosmoem/footprint.1bpp"); + const u8 gMonFootprint_Cosmoem[] = INCBIN_U8("graphics/pokemon/gen_7/cosmoem/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/front.4bpp.lz"); - const u32 gMonPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/normal.gbapal.lz"); - const u32 gMonBackPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/back.4bpp.lz"); - const u32 gMonShinyPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/shiny.gbapal.lz"); - const u8 gMonIcon_Solgaleo[] = INCBIN_U8("graphics/pokemon/solgaleo/icon.4bpp"); + const u32 gMonFrontPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/gen_7/solgaleo/front.4bpp.lz"); + const u32 gMonPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/gen_7/solgaleo/normal.gbapal.lz"); + const u32 gMonBackPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/gen_7/solgaleo/back.4bpp.lz"); + const u32 gMonShinyPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/gen_7/solgaleo/shiny.gbapal.lz"); + const u8 gMonIcon_Solgaleo[] = INCBIN_U8("graphics/pokemon/gen_7/solgaleo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Solgaleo[] = INCBIN_U8("graphics/pokemon/solgaleo/footprint.1bpp"); + const u8 gMonFootprint_Solgaleo[] = INCBIN_U8("graphics/pokemon/gen_7/solgaleo/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/front.4bpp.lz"); - const u32 gMonPalette_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/normal.gbapal.lz"); - const u32 gMonBackPic_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/back.4bpp.lz"); - const u32 gMonShinyPalette_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/shiny.gbapal.lz"); - const u8 gMonIcon_Lunala[] = INCBIN_U8("graphics/pokemon/lunala/icon.4bpp"); + const u32 gMonFrontPic_Lunala[] = INCBIN_U32("graphics/pokemon/gen_7/lunala/front.4bpp.lz"); + const u32 gMonPalette_Lunala[] = INCBIN_U32("graphics/pokemon/gen_7/lunala/normal.gbapal.lz"); + const u32 gMonBackPic_Lunala[] = INCBIN_U32("graphics/pokemon/gen_7/lunala/back.4bpp.lz"); + const u32 gMonShinyPalette_Lunala[] = INCBIN_U32("graphics/pokemon/gen_7/lunala/shiny.gbapal.lz"); + const u8 gMonIcon_Lunala[] = INCBIN_U8("graphics/pokemon/gen_7/lunala/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Lunala[] = INCBIN_U8("graphics/pokemon/lunala/footprint.1bpp"); + const u8 gMonFootprint_Lunala[] = INCBIN_U8("graphics/pokemon/gen_7/lunala/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_COSMOG #if P_FAMILY_NIHILEGO - const u32 gMonFrontPic_Nihilego[] = INCBIN_U32("graphics/pokemon/nihilego/front.4bpp.lz"); - const u32 gMonPalette_Nihilego[] = INCBIN_U32("graphics/pokemon/nihilego/normal.gbapal.lz"); - const u32 gMonBackPic_Nihilego[] = INCBIN_U32("graphics/pokemon/nihilego/back.4bpp.lz"); - const u32 gMonShinyPalette_Nihilego[] = INCBIN_U32("graphics/pokemon/nihilego/shiny.gbapal.lz"); - const u8 gMonIcon_Nihilego[] = INCBIN_U8("graphics/pokemon/nihilego/icon.4bpp"); + const u32 gMonFrontPic_Nihilego[] = INCBIN_U32("graphics/pokemon/gen_7/nihilego/front.4bpp.lz"); + const u32 gMonPalette_Nihilego[] = INCBIN_U32("graphics/pokemon/gen_7/nihilego/normal.gbapal.lz"); + const u32 gMonBackPic_Nihilego[] = INCBIN_U32("graphics/pokemon/gen_7/nihilego/back.4bpp.lz"); + const u32 gMonShinyPalette_Nihilego[] = INCBIN_U32("graphics/pokemon/gen_7/nihilego/shiny.gbapal.lz"); + const u8 gMonIcon_Nihilego[] = INCBIN_U8("graphics/pokemon/gen_7/nihilego/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Nihilego[] = INCBIN_U8("graphics/pokemon/nihilego/footprint.1bpp"); + const u8 gMonFootprint_Nihilego[] = INCBIN_U8("graphics/pokemon/gen_7/nihilego/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_NIHILEGO #if P_FAMILY_BUZZWOLE - const u32 gMonFrontPic_Buzzwole[] = INCBIN_U32("graphics/pokemon/buzzwole/front.4bpp.lz"); - const u32 gMonPalette_Buzzwole[] = INCBIN_U32("graphics/pokemon/buzzwole/normal.gbapal.lz"); - const u32 gMonBackPic_Buzzwole[] = INCBIN_U32("graphics/pokemon/buzzwole/back.4bpp.lz"); - const u32 gMonShinyPalette_Buzzwole[] = INCBIN_U32("graphics/pokemon/buzzwole/shiny.gbapal.lz"); - const u8 gMonIcon_Buzzwole[] = INCBIN_U8("graphics/pokemon/buzzwole/icon.4bpp"); + const u32 gMonFrontPic_Buzzwole[] = INCBIN_U32("graphics/pokemon/gen_7/buzzwole/front.4bpp.lz"); + const u32 gMonPalette_Buzzwole[] = INCBIN_U32("graphics/pokemon/gen_7/buzzwole/normal.gbapal.lz"); + const u32 gMonBackPic_Buzzwole[] = INCBIN_U32("graphics/pokemon/gen_7/buzzwole/back.4bpp.lz"); + const u32 gMonShinyPalette_Buzzwole[] = INCBIN_U32("graphics/pokemon/gen_7/buzzwole/shiny.gbapal.lz"); + const u8 gMonIcon_Buzzwole[] = INCBIN_U8("graphics/pokemon/gen_7/buzzwole/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Buzzwole[] = INCBIN_U8("graphics/pokemon/buzzwole/footprint.1bpp"); + const u8 gMonFootprint_Buzzwole[] = INCBIN_U8("graphics/pokemon/gen_7/buzzwole/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BUZZWOLE #if P_FAMILY_PHEROMOSA - const u32 gMonFrontPic_Pheromosa[] = INCBIN_U32("graphics/pokemon/pheromosa/front.4bpp.lz"); - const u32 gMonPalette_Pheromosa[] = INCBIN_U32("graphics/pokemon/pheromosa/normal.gbapal.lz"); - const u32 gMonBackPic_Pheromosa[] = INCBIN_U32("graphics/pokemon/pheromosa/back.4bpp.lz"); - const u32 gMonShinyPalette_Pheromosa[] = INCBIN_U32("graphics/pokemon/pheromosa/shiny.gbapal.lz"); - const u8 gMonIcon_Pheromosa[] = INCBIN_U8("graphics/pokemon/pheromosa/icon.4bpp"); + const u32 gMonFrontPic_Pheromosa[] = INCBIN_U32("graphics/pokemon/gen_7/pheromosa/front.4bpp.lz"); + const u32 gMonPalette_Pheromosa[] = INCBIN_U32("graphics/pokemon/gen_7/pheromosa/normal.gbapal.lz"); + const u32 gMonBackPic_Pheromosa[] = INCBIN_U32("graphics/pokemon/gen_7/pheromosa/back.4bpp.lz"); + const u32 gMonShinyPalette_Pheromosa[] = INCBIN_U32("graphics/pokemon/gen_7/pheromosa/shiny.gbapal.lz"); + const u8 gMonIcon_Pheromosa[] = INCBIN_U8("graphics/pokemon/gen_7/pheromosa/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pheromosa[] = INCBIN_U8("graphics/pokemon/pheromosa/footprint.1bpp"); + const u8 gMonFootprint_Pheromosa[] = INCBIN_U8("graphics/pokemon/gen_7/pheromosa/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PHEROMOSA #if P_FAMILY_XURKITREE - const u32 gMonFrontPic_Xurkitree[] = INCBIN_U32("graphics/pokemon/xurkitree/front.4bpp.lz"); - const u32 gMonPalette_Xurkitree[] = INCBIN_U32("graphics/pokemon/xurkitree/normal.gbapal.lz"); - const u32 gMonBackPic_Xurkitree[] = INCBIN_U32("graphics/pokemon/xurkitree/back.4bpp.lz"); - const u32 gMonShinyPalette_Xurkitree[] = INCBIN_U32("graphics/pokemon/xurkitree/shiny.gbapal.lz"); - const u8 gMonIcon_Xurkitree[] = INCBIN_U8("graphics/pokemon/xurkitree/icon.4bpp"); + const u32 gMonFrontPic_Xurkitree[] = INCBIN_U32("graphics/pokemon/gen_7/xurkitree/front.4bpp.lz"); + const u32 gMonPalette_Xurkitree[] = INCBIN_U32("graphics/pokemon/gen_7/xurkitree/normal.gbapal.lz"); + const u32 gMonBackPic_Xurkitree[] = INCBIN_U32("graphics/pokemon/gen_7/xurkitree/back.4bpp.lz"); + const u32 gMonShinyPalette_Xurkitree[] = INCBIN_U32("graphics/pokemon/gen_7/xurkitree/shiny.gbapal.lz"); + const u8 gMonIcon_Xurkitree[] = INCBIN_U8("graphics/pokemon/gen_7/xurkitree/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Xurkitree[] = INCBIN_U8("graphics/pokemon/xurkitree/footprint.1bpp"); + const u8 gMonFootprint_Xurkitree[] = INCBIN_U8("graphics/pokemon/gen_7/xurkitree/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_XURKITREE #if P_FAMILY_CELESTEELA - const u32 gMonFrontPic_Celesteela[] = INCBIN_U32("graphics/pokemon/celesteela/front.4bpp.lz"); - const u32 gMonPalette_Celesteela[] = INCBIN_U32("graphics/pokemon/celesteela/normal.gbapal.lz"); - const u32 gMonBackPic_Celesteela[] = INCBIN_U32("graphics/pokemon/celesteela/back.4bpp.lz"); - const u32 gMonShinyPalette_Celesteela[] = INCBIN_U32("graphics/pokemon/celesteela/shiny.gbapal.lz"); - const u8 gMonIcon_Celesteela[] = INCBIN_U8("graphics/pokemon/celesteela/icon.4bpp"); + const u32 gMonFrontPic_Celesteela[] = INCBIN_U32("graphics/pokemon/gen_7/celesteela/front.4bpp.lz"); + const u32 gMonPalette_Celesteela[] = INCBIN_U32("graphics/pokemon/gen_7/celesteela/normal.gbapal.lz"); + const u32 gMonBackPic_Celesteela[] = INCBIN_U32("graphics/pokemon/gen_7/celesteela/back.4bpp.lz"); + const u32 gMonShinyPalette_Celesteela[] = INCBIN_U32("graphics/pokemon/gen_7/celesteela/shiny.gbapal.lz"); + const u8 gMonIcon_Celesteela[] = INCBIN_U8("graphics/pokemon/gen_7/celesteela/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Celesteela[] = INCBIN_U8("graphics/pokemon/celesteela/footprint.1bpp"); + const u8 gMonFootprint_Celesteela[] = INCBIN_U8("graphics/pokemon/gen_7/celesteela/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CELESTEELA #if P_FAMILY_KARTANA - const u32 gMonFrontPic_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/front.4bpp.lz"); - const u32 gMonPalette_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/normal.gbapal.lz"); - const u32 gMonBackPic_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/back.4bpp.lz"); - const u32 gMonShinyPalette_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/shiny.gbapal.lz"); - const u8 gMonIcon_Kartana[] = INCBIN_U8("graphics/pokemon/kartana/icon.4bpp"); + const u32 gMonFrontPic_Kartana[] = INCBIN_U32("graphics/pokemon/gen_7/kartana/front.4bpp.lz"); + const u32 gMonPalette_Kartana[] = INCBIN_U32("graphics/pokemon/gen_7/kartana/normal.gbapal.lz"); + const u32 gMonBackPic_Kartana[] = INCBIN_U32("graphics/pokemon/gen_7/kartana/back.4bpp.lz"); + const u32 gMonShinyPalette_Kartana[] = INCBIN_U32("graphics/pokemon/gen_7/kartana/shiny.gbapal.lz"); + const u8 gMonIcon_Kartana[] = INCBIN_U8("graphics/pokemon/gen_7/kartana/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kartana[] = INCBIN_U8("graphics/pokemon/kartana/footprint.1bpp"); + const u8 gMonFootprint_Kartana[] = INCBIN_U8("graphics/pokemon/gen_7/kartana/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_KARTANA #if P_FAMILY_GUZZLORD - const u32 gMonFrontPic_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/front.4bpp.lz"); - const u32 gMonPalette_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/normal.gbapal.lz"); - const u32 gMonBackPic_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/back.4bpp.lz"); - const u32 gMonShinyPalette_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/shiny.gbapal.lz"); - const u8 gMonIcon_Guzzlord[] = INCBIN_U8("graphics/pokemon/guzzlord/icon.4bpp"); + const u32 gMonFrontPic_Guzzlord[] = INCBIN_U32("graphics/pokemon/gen_7/guzzlord/front.4bpp.lz"); + const u32 gMonPalette_Guzzlord[] = INCBIN_U32("graphics/pokemon/gen_7/guzzlord/normal.gbapal.lz"); + const u32 gMonBackPic_Guzzlord[] = INCBIN_U32("graphics/pokemon/gen_7/guzzlord/back.4bpp.lz"); + const u32 gMonShinyPalette_Guzzlord[] = INCBIN_U32("graphics/pokemon/gen_7/guzzlord/shiny.gbapal.lz"); + const u8 gMonIcon_Guzzlord[] = INCBIN_U8("graphics/pokemon/gen_7/guzzlord/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Guzzlord[] = INCBIN_U8("graphics/pokemon/guzzlord/footprint.1bpp"); + const u8 gMonFootprint_Guzzlord[] = INCBIN_U8("graphics/pokemon/gen_7/guzzlord/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_GUZZLORD #if P_FAMILY_NECROZMA - const u32 gMonFrontPic_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/front.4bpp.lz"); - const u32 gMonPalette_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/normal.gbapal.lz"); - const u32 gMonBackPic_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/back.4bpp.lz"); - const u32 gMonShinyPalette_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/shiny.gbapal.lz"); - const u8 gMonIcon_Necrozma[] = INCBIN_U8("graphics/pokemon/necrozma/icon.4bpp"); + const u32 gMonFrontPic_Necrozma[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/front.4bpp.lz"); + const u32 gMonPalette_Necrozma[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/normal.gbapal.lz"); + const u32 gMonBackPic_Necrozma[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/back.4bpp.lz"); + const u32 gMonShinyPalette_Necrozma[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/shiny.gbapal.lz"); + const u8 gMonIcon_Necrozma[] = INCBIN_U8("graphics/pokemon/gen_7/necrozma/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Necrozma[] = INCBIN_U8("graphics/pokemon/necrozma/footprint.1bpp"); + const u8 gMonFootprint_Necrozma[] = INCBIN_U8("graphics/pokemon/gen_7/necrozma/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_FUSION_FORMS - const u32 gMonFrontPic_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma/dusk_mane/front.4bpp.lz"); - const u32 gMonPalette_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma/dusk_mane/normal.gbapal.lz"); - const u32 gMonBackPic_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma/dusk_mane/back.4bpp.lz"); - const u32 gMonShinyPalette_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma/dusk_mane/shiny.gbapal.lz"); - const u8 gMonIcon_NecrozmaDuskMane[] = INCBIN_U8("graphics/pokemon/necrozma/dusk_mane/icon.4bpp"); + const u32 gMonFrontPic_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dusk_mane/front.4bpp.lz"); + const u32 gMonPalette_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dusk_mane/normal.gbapal.lz"); + const u32 gMonBackPic_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dusk_mane/back.4bpp.lz"); + const u32 gMonShinyPalette_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dusk_mane/shiny.gbapal.lz"); + const u8 gMonIcon_NecrozmaDuskMane[] = INCBIN_U8("graphics/pokemon/gen_7/necrozma/dusk_mane/icon.4bpp"); - const u32 gMonFrontPic_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/front.4bpp.lz"); - const u32 gMonPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/normal.gbapal.lz"); - const u32 gMonBackPic_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/back.4bpp.lz"); - const u32 gMonShinyPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/shiny.gbapal.lz"); - const u8 gMonIcon_NecrozmaDawnWings[] = INCBIN_U8("graphics/pokemon/necrozma/dawn_wings/icon.4bpp"); + const u32 gMonFrontPic_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dawn_wings/front.4bpp.lz"); + const u32 gMonPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dawn_wings/normal.gbapal.lz"); + const u32 gMonBackPic_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dawn_wings/back.4bpp.lz"); + const u32 gMonShinyPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/dawn_wings/shiny.gbapal.lz"); + const u8 gMonIcon_NecrozmaDawnWings[] = INCBIN_U8("graphics/pokemon/gen_7/necrozma/dawn_wings/icon.4bpp"); #if P_ULTRA_BURST_FORMS - const u32 gMonFrontPic_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/front.4bpp.lz"); - const u32 gMonPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/normal.gbapal.lz"); - const u32 gMonBackPic_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/back.4bpp.lz"); - const u32 gMonShinyPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/shiny.gbapal.lz"); - const u8 gMonIcon_NecrozmaUltra[] = INCBIN_U8("graphics/pokemon/necrozma/ultra/icon.4bpp"); + const u32 gMonFrontPic_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/ultra/front.4bpp.lz"); + const u32 gMonPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/ultra/normal.gbapal.lz"); + const u32 gMonBackPic_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/ultra/back.4bpp.lz"); + const u32 gMonShinyPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/gen_7/necrozma/ultra/shiny.gbapal.lz"); + const u8 gMonIcon_NecrozmaUltra[] = INCBIN_U8("graphics/pokemon/gen_7/necrozma/ultra/icon.4bpp"); #endif //P_ULTRA_BURST_FORMS #endif //P_FUSION_FORMS #endif //P_FAMILY_NECROZMA #if P_FAMILY_MAGEARNA - const u32 gMonFrontPic_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/front.4bpp.lz"); - const u32 gMonPalette_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/normal.gbapal.lz"); - const u32 gMonBackPic_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/back.4bpp.lz"); - const u32 gMonShinyPalette_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/shiny.gbapal.lz"); - const u8 gMonIcon_Magearna[] = INCBIN_U8("graphics/pokemon/magearna/icon.4bpp"); + const u32 gMonFrontPic_Magearna[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/front.4bpp.lz"); + const u32 gMonPalette_Magearna[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/normal.gbapal.lz"); + const u32 gMonBackPic_Magearna[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/back.4bpp.lz"); + const u32 gMonShinyPalette_Magearna[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/shiny.gbapal.lz"); + const u8 gMonIcon_Magearna[] = INCBIN_U8("graphics/pokemon/gen_7/magearna/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Magearna[] = INCBIN_U8("graphics/pokemon/magearna/footprint.1bpp"); + const u8 gMonFootprint_Magearna[] = INCBIN_U8("graphics/pokemon/gen_7/magearna/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/front.4bpp.lz"); - const u32 gMonPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/normal.gbapal.lz"); - const u32 gMonBackPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/back.4bpp.lz"); - const u32 gMonShinyPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/shiny.gbapal.lz"); - const u8 gMonIcon_MagearnaOriginalColor[] = INCBIN_U8("graphics/pokemon/magearna/original_color/icon.4bpp"); + const u32 gMonFrontPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/original_color/front.4bpp.lz"); + const u32 gMonPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/original_color/normal.gbapal.lz"); + const u32 gMonBackPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/original_color/back.4bpp.lz"); + const u32 gMonShinyPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/gen_7/magearna/original_color/shiny.gbapal.lz"); + const u8 gMonIcon_MagearnaOriginalColor[] = INCBIN_U8("graphics/pokemon/gen_7/magearna/original_color/icon.4bpp"); #endif //P_FAMILY_MAGEARNA #if P_FAMILY_MARSHADOW - const u32 gMonFrontPic_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/anim_front.4bpp.lz"); - const u32 gMonPalette_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/normal.gbapal.lz"); - const u32 gMonBackPic_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/back.4bpp.lz"); - const u32 gMonShinyPalette_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/shiny.gbapal.lz"); - const u8 gMonIcon_Marshadow[] = INCBIN_U8("graphics/pokemon/marshadow/icon.4bpp"); + const u32 gMonFrontPic_Marshadow[] = INCBIN_U32("graphics/pokemon/gen_7/marshadow/anim_front.4bpp.lz"); + const u32 gMonPalette_Marshadow[] = INCBIN_U32("graphics/pokemon/gen_7/marshadow/normal.gbapal.lz"); + const u32 gMonBackPic_Marshadow[] = INCBIN_U32("graphics/pokemon/gen_7/marshadow/back.4bpp.lz"); + const u32 gMonShinyPalette_Marshadow[] = INCBIN_U32("graphics/pokemon/gen_7/marshadow/shiny.gbapal.lz"); + const u8 gMonIcon_Marshadow[] = INCBIN_U8("graphics/pokemon/gen_7/marshadow/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Marshadow[] = INCBIN_U8("graphics/pokemon/marshadow/footprint.1bpp"); + const u8 gMonFootprint_Marshadow[] = INCBIN_U8("graphics/pokemon/gen_7/marshadow/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MARSHADOW #if P_FAMILY_POIPOLE - const u32 gMonFrontPic_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/front.4bpp.lz"); - const u32 gMonPalette_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/normal.gbapal.lz"); - const u32 gMonBackPic_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/back.4bpp.lz"); - const u32 gMonShinyPalette_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/shiny.gbapal.lz"); - const u8 gMonIcon_Poipole[] = INCBIN_U8("graphics/pokemon/poipole/icon.4bpp"); + const u32 gMonFrontPic_Poipole[] = INCBIN_U32("graphics/pokemon/gen_7/poipole/front.4bpp.lz"); + const u32 gMonPalette_Poipole[] = INCBIN_U32("graphics/pokemon/gen_7/poipole/normal.gbapal.lz"); + const u32 gMonBackPic_Poipole[] = INCBIN_U32("graphics/pokemon/gen_7/poipole/back.4bpp.lz"); + const u32 gMonShinyPalette_Poipole[] = INCBIN_U32("graphics/pokemon/gen_7/poipole/shiny.gbapal.lz"); + const u8 gMonIcon_Poipole[] = INCBIN_U8("graphics/pokemon/gen_7/poipole/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Poipole[] = INCBIN_U8("graphics/pokemon/poipole/footprint.1bpp"); + const u8 gMonFootprint_Poipole[] = INCBIN_U8("graphics/pokemon/gen_7/poipole/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/front.4bpp.lz"); - const u32 gMonPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/normal.gbapal.lz"); - const u32 gMonBackPic_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/back.4bpp.lz"); - const u32 gMonShinyPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/shiny.gbapal.lz"); - const u8 gMonIcon_Naganadel[] = INCBIN_U8("graphics/pokemon/naganadel/icon.4bpp"); + const u32 gMonFrontPic_Naganadel[] = INCBIN_U32("graphics/pokemon/gen_7/naganadel/front.4bpp.lz"); + const u32 gMonPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/gen_7/naganadel/normal.gbapal.lz"); + const u32 gMonBackPic_Naganadel[] = INCBIN_U32("graphics/pokemon/gen_7/naganadel/back.4bpp.lz"); + const u32 gMonShinyPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/gen_7/naganadel/shiny.gbapal.lz"); + const u8 gMonIcon_Naganadel[] = INCBIN_U8("graphics/pokemon/gen_7/naganadel/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Naganadel[] = INCBIN_U8("graphics/pokemon/naganadel/footprint.1bpp"); + const u8 gMonFootprint_Naganadel[] = INCBIN_U8("graphics/pokemon/gen_7/naganadel/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_POIPOLE #if P_FAMILY_STAKATAKA - const u32 gMonFrontPic_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/front.4bpp.lz"); - const u32 gMonPalette_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/normal.gbapal.lz"); - const u32 gMonBackPic_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/back.4bpp.lz"); - const u32 gMonShinyPalette_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/shiny.gbapal.lz"); - const u8 gMonIcon_Stakataka[] = INCBIN_U8("graphics/pokemon/stakataka/icon.4bpp"); + const u32 gMonFrontPic_Stakataka[] = INCBIN_U32("graphics/pokemon/gen_7/stakataka/front.4bpp.lz"); + const u32 gMonPalette_Stakataka[] = INCBIN_U32("graphics/pokemon/gen_7/stakataka/normal.gbapal.lz"); + const u32 gMonBackPic_Stakataka[] = INCBIN_U32("graphics/pokemon/gen_7/stakataka/back.4bpp.lz"); + const u32 gMonShinyPalette_Stakataka[] = INCBIN_U32("graphics/pokemon/gen_7/stakataka/shiny.gbapal.lz"); + const u8 gMonIcon_Stakataka[] = INCBIN_U8("graphics/pokemon/gen_7/stakataka/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Stakataka[] = INCBIN_U8("graphics/pokemon/stakataka/footprint.1bpp"); + const u8 gMonFootprint_Stakataka[] = INCBIN_U8("graphics/pokemon/gen_7/stakataka/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_STAKATAKA #if P_FAMILY_BLACEPHALON - const u32 gMonFrontPic_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/front.4bpp.lz"); - const u32 gMonPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/normal.gbapal.lz"); - const u32 gMonBackPic_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/back.4bpp.lz"); - const u32 gMonShinyPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/shiny.gbapal.lz"); - const u8 gMonIcon_Blacephalon[] = INCBIN_U8("graphics/pokemon/blacephalon/icon.4bpp"); + const u32 gMonFrontPic_Blacephalon[] = INCBIN_U32("graphics/pokemon/gen_7/blacephalon/front.4bpp.lz"); + const u32 gMonPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/gen_7/blacephalon/normal.gbapal.lz"); + const u32 gMonBackPic_Blacephalon[] = INCBIN_U32("graphics/pokemon/gen_7/blacephalon/back.4bpp.lz"); + const u32 gMonShinyPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/gen_7/blacephalon/shiny.gbapal.lz"); + const u8 gMonIcon_Blacephalon[] = INCBIN_U8("graphics/pokemon/gen_7/blacephalon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Blacephalon[] = INCBIN_U8("graphics/pokemon/blacephalon/footprint.1bpp"); + const u8 gMonFootprint_Blacephalon[] = INCBIN_U8("graphics/pokemon/gen_7/blacephalon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BLACEPHALON #if P_FAMILY_ZERAORA - const u32 gMonFrontPic_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/front.4bpp.lz"); - const u32 gMonPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/normal.gbapal.lz"); - const u32 gMonBackPic_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/back.4bpp.lz"); - const u32 gMonShinyPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/shiny.gbapal.lz"); - const u8 gMonIcon_Zeraora[] = INCBIN_U8("graphics/pokemon/zeraora/icon.4bpp"); + const u32 gMonFrontPic_Zeraora[] = INCBIN_U32("graphics/pokemon/gen_7/zeraora/front.4bpp.lz"); + const u32 gMonPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/gen_7/zeraora/normal.gbapal.lz"); + const u32 gMonBackPic_Zeraora[] = INCBIN_U32("graphics/pokemon/gen_7/zeraora/back.4bpp.lz"); + const u32 gMonShinyPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/gen_7/zeraora/shiny.gbapal.lz"); + const u8 gMonIcon_Zeraora[] = INCBIN_U8("graphics/pokemon/gen_7/zeraora/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Zeraora[] = INCBIN_U8("graphics/pokemon/zeraora/footprint.1bpp"); + const u8 gMonFootprint_Zeraora[] = INCBIN_U8("graphics/pokemon/gen_7/zeraora/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ZERAORA #if P_FAMILY_MELTAN - const u32 gMonFrontPic_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/front.4bpp.lz"); - const u32 gMonPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/normal.gbapal.lz"); - const u32 gMonBackPic_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/back.4bpp.lz"); - const u32 gMonShinyPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/shiny.gbapal.lz"); - const u8 gMonIcon_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/icon.4bpp"); + const u32 gMonFrontPic_Meltan[] = INCBIN_U32("graphics/pokemon/gen_7/meltan/front.4bpp.lz"); + const u32 gMonPalette_Meltan[] = INCBIN_U32("graphics/pokemon/gen_7/meltan/normal.gbapal.lz"); + const u32 gMonBackPic_Meltan[] = INCBIN_U32("graphics/pokemon/gen_7/meltan/back.4bpp.lz"); + const u32 gMonShinyPalette_Meltan[] = INCBIN_U32("graphics/pokemon/gen_7/meltan/shiny.gbapal.lz"); + const u8 gMonIcon_Meltan[] = INCBIN_U8("graphics/pokemon/gen_7/meltan/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/footprint.1bpp"); + const u8 gMonFootprint_Meltan[] = INCBIN_U8("graphics/pokemon/gen_7/meltan/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/front.4bpp.lz"); - const u32 gMonPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/normal.gbapal.lz"); - const u32 gMonBackPic_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/back.4bpp.lz"); - const u32 gMonShinyPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/shiny.gbapal.lz"); - const u8 gMonIcon_Melmetal[] = INCBIN_U8("graphics/pokemon/melmetal/icon.4bpp"); + const u32 gMonFrontPic_Melmetal[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/front.4bpp.lz"); + const u32 gMonPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/normal.gbapal.lz"); + const u32 gMonBackPic_Melmetal[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/back.4bpp.lz"); + const u32 gMonShinyPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/shiny.gbapal.lz"); + const u8 gMonIcon_Melmetal[] = INCBIN_U8("graphics/pokemon/gen_7/melmetal/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Melmetal[] = INCBIN_U8("graphics/pokemon/melmetal/footprint.1bpp"); + const u8 gMonFootprint_Melmetal[] = INCBIN_U8("graphics/pokemon/gen_7/melmetal/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_MelmetalGigantamax[] = INCBIN_U8("graphics/pokemon/melmetal/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_7/melmetal/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_MelmetalGigantamax[] = INCBIN_U8("graphics/pokemon/gen_7/melmetal/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MELTAN #if P_FAMILY_GROOKEY - const u32 gMonFrontPic_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/front.4bpp.lz"); - const u32 gMonPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/normal.gbapal.lz"); - const u32 gMonBackPic_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/back.4bpp.lz"); - const u32 gMonShinyPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/shiny.gbapal.lz"); - const u8 gMonIcon_Grookey[] = INCBIN_U8("graphics/pokemon/grookey/icon.4bpp"); + const u32 gMonFrontPic_Grookey[] = INCBIN_U32("graphics/pokemon/gen_8/grookey/front.4bpp.lz"); + const u32 gMonPalette_Grookey[] = INCBIN_U32("graphics/pokemon/gen_8/grookey/normal.gbapal.lz"); + const u32 gMonBackPic_Grookey[] = INCBIN_U32("graphics/pokemon/gen_8/grookey/back.4bpp.lz"); + const u32 gMonShinyPalette_Grookey[] = INCBIN_U32("graphics/pokemon/gen_8/grookey/shiny.gbapal.lz"); + const u8 gMonIcon_Grookey[] = INCBIN_U8("graphics/pokemon/gen_8/grookey/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Grookey[] = INCBIN_U8("graphics/pokemon/grookey/footprint.1bpp"); + const u8 gMonFootprint_Grookey[] = INCBIN_U8("graphics/pokemon/gen_8/grookey/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/front.4bpp.lz"); - const u32 gMonPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/normal.gbapal.lz"); - const u32 gMonBackPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/back.4bpp.lz"); - const u32 gMonShinyPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/shiny.gbapal.lz"); - const u8 gMonIcon_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/icon.4bpp"); + const u32 gMonFrontPic_Thwackey[] = INCBIN_U32("graphics/pokemon/gen_8/thwackey/front.4bpp.lz"); + const u32 gMonPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/gen_8/thwackey/normal.gbapal.lz"); + const u32 gMonBackPic_Thwackey[] = INCBIN_U32("graphics/pokemon/gen_8/thwackey/back.4bpp.lz"); + const u32 gMonShinyPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/gen_8/thwackey/shiny.gbapal.lz"); + const u8 gMonIcon_Thwackey[] = INCBIN_U8("graphics/pokemon/gen_8/thwackey/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/footprint.1bpp"); + const u8 gMonFootprint_Thwackey[] = INCBIN_U8("graphics/pokemon/gen_8/thwackey/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/front.4bpp.lz"); - const u32 gMonPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/normal.gbapal.lz"); - const u32 gMonBackPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/back.4bpp.lz"); - const u32 gMonShinyPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/shiny.gbapal.lz"); - const u8 gMonIcon_Rillaboom[] = INCBIN_U8("graphics/pokemon/rillaboom/icon.4bpp"); + const u32 gMonFrontPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/front.4bpp.lz"); + const u32 gMonPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/normal.gbapal.lz"); + const u32 gMonBackPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/back.4bpp.lz"); + const u32 gMonShinyPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/shiny.gbapal.lz"); + const u8 gMonIcon_Rillaboom[] = INCBIN_U8("graphics/pokemon/gen_8/rillaboom/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Rillaboom[] = INCBIN_U8("graphics/pokemon/rillaboom/footprint.1bpp"); + const u8 gMonFootprint_Rillaboom[] = INCBIN_U8("graphics/pokemon/gen_8/rillaboom/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_RillaboomGigantamax[] = INCBIN_U8("graphics/pokemon/rillaboom/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/rillaboom/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_RillaboomGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/rillaboom/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GROOKEY #if P_FAMILY_SCORBUNNY - const u32 gMonFrontPic_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/front.4bpp.lz"); - const u32 gMonPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/normal.gbapal.lz"); - const u32 gMonBackPic_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/back.4bpp.lz"); - const u32 gMonShinyPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/shiny.gbapal.lz"); - const u8 gMonIcon_Scorbunny[] = INCBIN_U8("graphics/pokemon/scorbunny/icon.4bpp"); + const u32 gMonFrontPic_Scorbunny[] = INCBIN_U32("graphics/pokemon/gen_8/scorbunny/front.4bpp.lz"); + const u32 gMonPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/gen_8/scorbunny/normal.gbapal.lz"); + const u32 gMonBackPic_Scorbunny[] = INCBIN_U32("graphics/pokemon/gen_8/scorbunny/back.4bpp.lz"); + const u32 gMonShinyPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/gen_8/scorbunny/shiny.gbapal.lz"); + const u8 gMonIcon_Scorbunny[] = INCBIN_U8("graphics/pokemon/gen_8/scorbunny/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Scorbunny[] = INCBIN_U8("graphics/pokemon/scorbunny/footprint.1bpp"); + const u8 gMonFootprint_Scorbunny[] = INCBIN_U8("graphics/pokemon/gen_8/scorbunny/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/front.4bpp.lz"); - const u32 gMonPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/normal.gbapal.lz"); - const u32 gMonBackPic_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/back.4bpp.lz"); - const u32 gMonShinyPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/shiny.gbapal.lz"); - const u8 gMonIcon_Raboot[] = INCBIN_U8("graphics/pokemon/raboot/icon.4bpp"); + const u32 gMonFrontPic_Raboot[] = INCBIN_U32("graphics/pokemon/gen_8/raboot/front.4bpp.lz"); + const u32 gMonPalette_Raboot[] = INCBIN_U32("graphics/pokemon/gen_8/raboot/normal.gbapal.lz"); + const u32 gMonBackPic_Raboot[] = INCBIN_U32("graphics/pokemon/gen_8/raboot/back.4bpp.lz"); + const u32 gMonShinyPalette_Raboot[] = INCBIN_U32("graphics/pokemon/gen_8/raboot/shiny.gbapal.lz"); + const u8 gMonIcon_Raboot[] = INCBIN_U8("graphics/pokemon/gen_8/raboot/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Raboot[] = INCBIN_U8("graphics/pokemon/raboot/footprint.1bpp"); + const u8 gMonFootprint_Raboot[] = INCBIN_U8("graphics/pokemon/gen_8/raboot/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/front.4bpp.lz"); - const u32 gMonPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/normal.gbapal.lz"); - const u32 gMonBackPic_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/back.4bpp.lz"); - const u32 gMonShinyPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/shiny.gbapal.lz"); - const u8 gMonIcon_Cinderace[] = INCBIN_U8("graphics/pokemon/cinderace/icon.4bpp"); + const u32 gMonFrontPic_Cinderace[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/front.4bpp.lz"); + const u32 gMonPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/normal.gbapal.lz"); + const u32 gMonBackPic_Cinderace[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/back.4bpp.lz"); + const u32 gMonShinyPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/shiny.gbapal.lz"); + const u8 gMonIcon_Cinderace[] = INCBIN_U8("graphics/pokemon/gen_8/cinderace/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cinderace[] = INCBIN_U8("graphics/pokemon/cinderace/footprint.1bpp"); + const u8 gMonFootprint_Cinderace[] = INCBIN_U8("graphics/pokemon/gen_8/cinderace/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_CinderaceGigantamax[] = INCBIN_U8("graphics/pokemon/cinderace/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/cinderace/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_CinderaceGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/cinderace/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SCORBUNNY #if P_FAMILY_SOBBLE - const u32 gMonFrontPic_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/front.4bpp.lz"); - const u32 gMonPalette_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/normal.gbapal.lz"); - const u32 gMonBackPic_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/back.4bpp.lz"); - const u32 gMonShinyPalette_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/shiny.gbapal.lz"); - const u8 gMonIcon_Sobble[] = INCBIN_U8("graphics/pokemon/sobble/icon.4bpp"); + const u32 gMonFrontPic_Sobble[] = INCBIN_U32("graphics/pokemon/gen_8/sobble/front.4bpp.lz"); + const u32 gMonPalette_Sobble[] = INCBIN_U32("graphics/pokemon/gen_8/sobble/normal.gbapal.lz"); + const u32 gMonBackPic_Sobble[] = INCBIN_U32("graphics/pokemon/gen_8/sobble/back.4bpp.lz"); + const u32 gMonShinyPalette_Sobble[] = INCBIN_U32("graphics/pokemon/gen_8/sobble/shiny.gbapal.lz"); + const u8 gMonIcon_Sobble[] = INCBIN_U8("graphics/pokemon/gen_8/sobble/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sobble[] = INCBIN_U8("graphics/pokemon/sobble/footprint.1bpp"); + const u8 gMonFootprint_Sobble[] = INCBIN_U8("graphics/pokemon/gen_8/sobble/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/front.4bpp.lz"); - const u32 gMonPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/normal.gbapal.lz"); - const u32 gMonBackPic_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/back.4bpp.lz"); - const u32 gMonShinyPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/shiny.gbapal.lz"); - const u8 gMonIcon_Drizzile[] = INCBIN_U8("graphics/pokemon/drizzile/icon.4bpp"); + const u32 gMonFrontPic_Drizzile[] = INCBIN_U32("graphics/pokemon/gen_8/drizzile/front.4bpp.lz"); + const u32 gMonPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/gen_8/drizzile/normal.gbapal.lz"); + const u32 gMonBackPic_Drizzile[] = INCBIN_U32("graphics/pokemon/gen_8/drizzile/back.4bpp.lz"); + const u32 gMonShinyPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/gen_8/drizzile/shiny.gbapal.lz"); + const u8 gMonIcon_Drizzile[] = INCBIN_U8("graphics/pokemon/gen_8/drizzile/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Drizzile[] = INCBIN_U8("graphics/pokemon/drizzile/footprint.1bpp"); + const u8 gMonFootprint_Drizzile[] = INCBIN_U8("graphics/pokemon/gen_8/drizzile/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/front.4bpp.lz"); - const u32 gMonPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/normal.gbapal.lz"); - const u32 gMonBackPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/back.4bpp.lz"); - const u32 gMonShinyPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/shiny.gbapal.lz"); - const u8 gMonIcon_Inteleon[] = INCBIN_U8("graphics/pokemon/inteleon/icon.4bpp"); + const u32 gMonFrontPic_Inteleon[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/front.4bpp.lz"); + const u32 gMonPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/normal.gbapal.lz"); + const u32 gMonBackPic_Inteleon[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/back.4bpp.lz"); + const u32 gMonShinyPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/shiny.gbapal.lz"); + const u8 gMonIcon_Inteleon[] = INCBIN_U8("graphics/pokemon/gen_8/inteleon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Inteleon[] = INCBIN_U8("graphics/pokemon/inteleon/footprint.1bpp"); + const u8 gMonFootprint_Inteleon[] = INCBIN_U8("graphics/pokemon/gen_8/inteleon/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_InteleonGigantamax[] = INCBIN_U8("graphics/pokemon/inteleon/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/inteleon/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_InteleonGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/inteleon/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SOBBLE #if P_FAMILY_SKWOVET - const u32 gMonFrontPic_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/front.4bpp.lz"); - const u32 gMonPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/normal.gbapal.lz"); - const u32 gMonBackPic_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/back.4bpp.lz"); - const u32 gMonShinyPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/shiny.gbapal.lz"); - const u8 gMonIcon_Skwovet[] = INCBIN_U8("graphics/pokemon/skwovet/icon.4bpp"); + const u32 gMonFrontPic_Skwovet[] = INCBIN_U32("graphics/pokemon/gen_8/skwovet/front.4bpp.lz"); + const u32 gMonPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/gen_8/skwovet/normal.gbapal.lz"); + const u32 gMonBackPic_Skwovet[] = INCBIN_U32("graphics/pokemon/gen_8/skwovet/back.4bpp.lz"); + const u32 gMonShinyPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/gen_8/skwovet/shiny.gbapal.lz"); + const u8 gMonIcon_Skwovet[] = INCBIN_U8("graphics/pokemon/gen_8/skwovet/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Skwovet[] = INCBIN_U8("graphics/pokemon/skwovet/footprint.1bpp"); + const u8 gMonFootprint_Skwovet[] = INCBIN_U8("graphics/pokemon/gen_8/skwovet/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/front.4bpp.lz"); - const u32 gMonPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/normal.gbapal.lz"); - const u32 gMonBackPic_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/back.4bpp.lz"); - const u32 gMonShinyPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/shiny.gbapal.lz"); - const u8 gMonIcon_Greedent[] = INCBIN_U8("graphics/pokemon/greedent/icon.4bpp"); + const u32 gMonFrontPic_Greedent[] = INCBIN_U32("graphics/pokemon/gen_8/greedent/front.4bpp.lz"); + const u32 gMonPalette_Greedent[] = INCBIN_U32("graphics/pokemon/gen_8/greedent/normal.gbapal.lz"); + const u32 gMonBackPic_Greedent[] = INCBIN_U32("graphics/pokemon/gen_8/greedent/back.4bpp.lz"); + const u32 gMonShinyPalette_Greedent[] = INCBIN_U32("graphics/pokemon/gen_8/greedent/shiny.gbapal.lz"); + const u8 gMonIcon_Greedent[] = INCBIN_U8("graphics/pokemon/gen_8/greedent/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Greedent[] = INCBIN_U8("graphics/pokemon/greedent/footprint.1bpp"); + const u8 gMonFootprint_Greedent[] = INCBIN_U8("graphics/pokemon/gen_8/greedent/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SKWOVET #if P_FAMILY_ROOKIDEE - const u32 gMonFrontPic_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/anim_front.4bpp.lz"); - const u32 gMonPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/normal.gbapal.lz"); - const u32 gMonBackPic_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/back.4bpp.lz"); - const u32 gMonShinyPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/shiny.gbapal.lz"); - const u8 gMonIcon_Rookidee[] = INCBIN_U8("graphics/pokemon/rookidee/icon.4bpp"); + const u32 gMonFrontPic_Rookidee[] = INCBIN_U32("graphics/pokemon/gen_8/rookidee/anim_front.4bpp.lz"); + const u32 gMonPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/gen_8/rookidee/normal.gbapal.lz"); + const u32 gMonBackPic_Rookidee[] = INCBIN_U32("graphics/pokemon/gen_8/rookidee/back.4bpp.lz"); + const u32 gMonShinyPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/gen_8/rookidee/shiny.gbapal.lz"); + const u8 gMonIcon_Rookidee[] = INCBIN_U8("graphics/pokemon/gen_8/rookidee/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Rookidee[] = INCBIN_U8("graphics/pokemon/rookidee/footprint.1bpp"); + const u8 gMonFootprint_Rookidee[] = INCBIN_U8("graphics/pokemon/gen_8/rookidee/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/anim_front.4bpp.lz"); - const u32 gMonPalette_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/normal.gbapal.lz"); - const u32 gMonBackPic_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/back.4bpp.lz"); - const u32 gMonShinyPalette_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/shiny.gbapal.lz"); - const u8 gMonIcon_Corvisquire[] = INCBIN_U8("graphics/pokemon/corvisquire/icon.4bpp"); + const u32 gMonFrontPic_Corvisquire[] = INCBIN_U32("graphics/pokemon/gen_8/corvisquire/anim_front.4bpp.lz"); + const u32 gMonPalette_Corvisquire[] = INCBIN_U32("graphics/pokemon/gen_8/corvisquire/normal.gbapal.lz"); + const u32 gMonBackPic_Corvisquire[] = INCBIN_U32("graphics/pokemon/gen_8/corvisquire/back.4bpp.lz"); + const u32 gMonShinyPalette_Corvisquire[] = INCBIN_U32("graphics/pokemon/gen_8/corvisquire/shiny.gbapal.lz"); + const u8 gMonIcon_Corvisquire[] = INCBIN_U8("graphics/pokemon/gen_8/corvisquire/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Corvisquire[] = INCBIN_U8("graphics/pokemon/corvisquire/footprint.1bpp"); + const u8 gMonFootprint_Corvisquire[] = INCBIN_U8("graphics/pokemon/gen_8/corvisquire/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/anim_front.4bpp.lz"); - const u32 gMonPalette_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/normal.gbapal.lz"); - const u32 gMonBackPic_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/back.4bpp.lz"); - const u32 gMonShinyPalette_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/shiny.gbapal.lz"); - const u8 gMonIcon_Corviknight[] = INCBIN_U8("graphics/pokemon/corviknight/icon.4bpp"); + const u32 gMonFrontPic_Corviknight[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/anim_front.4bpp.lz"); + const u32 gMonPalette_Corviknight[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/normal.gbapal.lz"); + const u32 gMonBackPic_Corviknight[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/back.4bpp.lz"); + const u32 gMonShinyPalette_Corviknight[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/shiny.gbapal.lz"); + const u8 gMonIcon_Corviknight[] = INCBIN_U8("graphics/pokemon/gen_8/corviknight/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Corviknight[] = INCBIN_U8("graphics/pokemon/corviknight/footprint.1bpp"); + const u8 gMonFootprint_Corviknight[] = INCBIN_U8("graphics/pokemon/gen_8/corviknight/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_CorviknightGigantamax[] = INCBIN_U8("graphics/pokemon/corviknight/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/corviknight/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_CorviknightGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/corviknight/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_ROOKIDEE #if P_FAMILY_BLIPBUG - const u32 gMonFrontPic_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/front.4bpp.lz"); - const u32 gMonPalette_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/normal.gbapal.lz"); - const u32 gMonBackPic_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/back.4bpp.lz"); - const u32 gMonShinyPalette_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/shiny.gbapal.lz"); - const u8 gMonIcon_Blipbug[] = INCBIN_U8("graphics/pokemon/blipbug/icon.4bpp"); + const u32 gMonFrontPic_Blipbug[] = INCBIN_U32("graphics/pokemon/gen_8/blipbug/front.4bpp.lz"); + const u32 gMonPalette_Blipbug[] = INCBIN_U32("graphics/pokemon/gen_8/blipbug/normal.gbapal.lz"); + const u32 gMonBackPic_Blipbug[] = INCBIN_U32("graphics/pokemon/gen_8/blipbug/back.4bpp.lz"); + const u32 gMonShinyPalette_Blipbug[] = INCBIN_U32("graphics/pokemon/gen_8/blipbug/shiny.gbapal.lz"); + const u8 gMonIcon_Blipbug[] = INCBIN_U8("graphics/pokemon/gen_8/blipbug/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Blipbug[] = INCBIN_U8("graphics/pokemon/blipbug/footprint.1bpp"); + const u8 gMonFootprint_Blipbug[] = INCBIN_U8("graphics/pokemon/gen_8/blipbug/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/front.4bpp.lz"); - const u32 gMonPalette_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/normal.gbapal.lz"); - const u32 gMonBackPic_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/back.4bpp.lz"); - const u32 gMonShinyPalette_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/shiny.gbapal.lz"); - const u8 gMonIcon_Dottler[] = INCBIN_U8("graphics/pokemon/dottler/icon.4bpp"); + const u32 gMonFrontPic_Dottler[] = INCBIN_U32("graphics/pokemon/gen_8/dottler/front.4bpp.lz"); + const u32 gMonPalette_Dottler[] = INCBIN_U32("graphics/pokemon/gen_8/dottler/normal.gbapal.lz"); + const u32 gMonBackPic_Dottler[] = INCBIN_U32("graphics/pokemon/gen_8/dottler/back.4bpp.lz"); + const u32 gMonShinyPalette_Dottler[] = INCBIN_U32("graphics/pokemon/gen_8/dottler/shiny.gbapal.lz"); + const u8 gMonIcon_Dottler[] = INCBIN_U8("graphics/pokemon/gen_8/dottler/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dottler[] = INCBIN_U8("graphics/pokemon/dottler/footprint.1bpp"); + const u8 gMonFootprint_Dottler[] = INCBIN_U8("graphics/pokemon/gen_8/dottler/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/front.4bpp.lz"); - const u32 gMonPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/normal.gbapal.lz"); - const u32 gMonBackPic_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/back.4bpp.lz"); - const u32 gMonShinyPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/shiny.gbapal.lz"); - const u8 gMonIcon_Orbeetle[] = INCBIN_U8("graphics/pokemon/orbeetle/icon.4bpp"); + const u32 gMonFrontPic_Orbeetle[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/front.4bpp.lz"); + const u32 gMonPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/normal.gbapal.lz"); + const u32 gMonBackPic_Orbeetle[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/back.4bpp.lz"); + const u32 gMonShinyPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/shiny.gbapal.lz"); + const u8 gMonIcon_Orbeetle[] = INCBIN_U8("graphics/pokemon/gen_8/orbeetle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Orbeetle[] = INCBIN_U8("graphics/pokemon/orbeetle/footprint.1bpp"); + const u8 gMonFootprint_Orbeetle[] = INCBIN_U8("graphics/pokemon/gen_8/orbeetle/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_OrbeetleGigantamax[] = INCBIN_U8("graphics/pokemon/orbeetle/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/orbeetle/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_OrbeetleGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/orbeetle/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_BLIPBUG #if P_FAMILY_NICKIT - const u32 gMonFrontPic_Nickit[] = INCBIN_U32("graphics/pokemon/nickit/front.4bpp.lz"); - const u32 gMonPalette_Nickit[] = INCBIN_U32("graphics/pokemon/nickit/normal.gbapal.lz"); - const u32 gMonBackPic_Nickit[] = INCBIN_U32("graphics/pokemon/nickit/back.4bpp.lz"); - const u32 gMonShinyPalette_Nickit[] = INCBIN_U32("graphics/pokemon/nickit/shiny.gbapal.lz"); - const u8 gMonIcon_Nickit[] = INCBIN_U8("graphics/pokemon/nickit/icon.4bpp"); + const u32 gMonFrontPic_Nickit[] = INCBIN_U32("graphics/pokemon/gen_8/nickit/front.4bpp.lz"); + const u32 gMonPalette_Nickit[] = INCBIN_U32("graphics/pokemon/gen_8/nickit/normal.gbapal.lz"); + const u32 gMonBackPic_Nickit[] = INCBIN_U32("graphics/pokemon/gen_8/nickit/back.4bpp.lz"); + const u32 gMonShinyPalette_Nickit[] = INCBIN_U32("graphics/pokemon/gen_8/nickit/shiny.gbapal.lz"); + const u8 gMonIcon_Nickit[] = INCBIN_U8("graphics/pokemon/gen_8/nickit/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Nickit[] = INCBIN_U8("graphics/pokemon/nickit/footprint.1bpp"); + const u8 gMonFootprint_Nickit[] = INCBIN_U8("graphics/pokemon/gen_8/nickit/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/front.4bpp.lz"); - const u32 gMonPalette_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/normal.gbapal.lz"); - const u32 gMonBackPic_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/back.4bpp.lz"); - const u32 gMonShinyPalette_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/shiny.gbapal.lz"); - const u8 gMonIcon_Thievul[] = INCBIN_U8("graphics/pokemon/thievul/icon.4bpp"); + const u32 gMonFrontPic_Thievul[] = INCBIN_U32("graphics/pokemon/gen_8/thievul/front.4bpp.lz"); + const u32 gMonPalette_Thievul[] = INCBIN_U32("graphics/pokemon/gen_8/thievul/normal.gbapal.lz"); + const u32 gMonBackPic_Thievul[] = INCBIN_U32("graphics/pokemon/gen_8/thievul/back.4bpp.lz"); + const u32 gMonShinyPalette_Thievul[] = INCBIN_U32("graphics/pokemon/gen_8/thievul/shiny.gbapal.lz"); + const u8 gMonIcon_Thievul[] = INCBIN_U8("graphics/pokemon/gen_8/thievul/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Thievul[] = INCBIN_U8("graphics/pokemon/thievul/footprint.1bpp"); + const u8 gMonFootprint_Thievul[] = INCBIN_U8("graphics/pokemon/gen_8/thievul/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_NICKIT #if P_FAMILY_GOSSIFLEUR - const u32 gMonFrontPic_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/front.4bpp.lz"); - const u32 gMonPalette_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/normal.gbapal.lz"); - const u32 gMonBackPic_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/back.4bpp.lz"); - const u32 gMonShinyPalette_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/shiny.gbapal.lz"); - const u8 gMonIcon_Gossifleur[] = INCBIN_U8("graphics/pokemon/gossifleur/icon.4bpp"); + const u32 gMonFrontPic_Gossifleur[] = INCBIN_U32("graphics/pokemon/gen_8/gossifleur/front.4bpp.lz"); + const u32 gMonPalette_Gossifleur[] = INCBIN_U32("graphics/pokemon/gen_8/gossifleur/normal.gbapal.lz"); + const u32 gMonBackPic_Gossifleur[] = INCBIN_U32("graphics/pokemon/gen_8/gossifleur/back.4bpp.lz"); + const u32 gMonShinyPalette_Gossifleur[] = INCBIN_U32("graphics/pokemon/gen_8/gossifleur/shiny.gbapal.lz"); + const u8 gMonIcon_Gossifleur[] = INCBIN_U8("graphics/pokemon/gen_8/gossifleur/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Gossifleur[] = INCBIN_U8("graphics/pokemon/gossifleur/footprint.1bpp"); + const u8 gMonFootprint_Gossifleur[] = INCBIN_U8("graphics/pokemon/gen_8/gossifleur/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/front.4bpp.lz"); - const u32 gMonPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/normal.gbapal.lz"); - const u32 gMonBackPic_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/back.4bpp.lz"); - const u32 gMonShinyPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/shiny.gbapal.lz"); - const u8 gMonIcon_Eldegoss[] = INCBIN_U8("graphics/pokemon/eldegoss/icon.4bpp"); + const u32 gMonFrontPic_Eldegoss[] = INCBIN_U32("graphics/pokemon/gen_8/eldegoss/front.4bpp.lz"); + const u32 gMonPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/gen_8/eldegoss/normal.gbapal.lz"); + const u32 gMonBackPic_Eldegoss[] = INCBIN_U32("graphics/pokemon/gen_8/eldegoss/back.4bpp.lz"); + const u32 gMonShinyPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/gen_8/eldegoss/shiny.gbapal.lz"); + const u8 gMonIcon_Eldegoss[] = INCBIN_U8("graphics/pokemon/gen_8/eldegoss/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Eldegoss[] = INCBIN_U8("graphics/pokemon/eldegoss/footprint.1bpp"); + const u8 gMonFootprint_Eldegoss[] = INCBIN_U8("graphics/pokemon/gen_8/eldegoss/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_GOSSIFLEUR #if P_FAMILY_WOOLOO - const u32 gMonFrontPic_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/front.4bpp.lz"); - const u32 gMonPalette_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/normal.gbapal.lz"); - const u32 gMonBackPic_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/back.4bpp.lz"); - const u32 gMonShinyPalette_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/shiny.gbapal.lz"); - const u8 gMonIcon_Wooloo[] = INCBIN_U8("graphics/pokemon/wooloo/icon.4bpp"); + const u32 gMonFrontPic_Wooloo[] = INCBIN_U32("graphics/pokemon/gen_8/wooloo/front.4bpp.lz"); + const u32 gMonPalette_Wooloo[] = INCBIN_U32("graphics/pokemon/gen_8/wooloo/normal.gbapal.lz"); + const u32 gMonBackPic_Wooloo[] = INCBIN_U32("graphics/pokemon/gen_8/wooloo/back.4bpp.lz"); + const u32 gMonShinyPalette_Wooloo[] = INCBIN_U32("graphics/pokemon/gen_8/wooloo/shiny.gbapal.lz"); + const u8 gMonIcon_Wooloo[] = INCBIN_U8("graphics/pokemon/gen_8/wooloo/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Wooloo[] = INCBIN_U8("graphics/pokemon/wooloo/footprint.1bpp"); + const u8 gMonFootprint_Wooloo[] = INCBIN_U8("graphics/pokemon/gen_8/wooloo/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/front.4bpp.lz"); - const u32 gMonPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/normal.gbapal.lz"); - const u32 gMonBackPic_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/back.4bpp.lz"); - const u32 gMonShinyPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/shiny.gbapal.lz"); - const u8 gMonIcon_Dubwool[] = INCBIN_U8("graphics/pokemon/dubwool/icon.4bpp"); + const u32 gMonFrontPic_Dubwool[] = INCBIN_U32("graphics/pokemon/gen_8/dubwool/front.4bpp.lz"); + const u32 gMonPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/gen_8/dubwool/normal.gbapal.lz"); + const u32 gMonBackPic_Dubwool[] = INCBIN_U32("graphics/pokemon/gen_8/dubwool/back.4bpp.lz"); + const u32 gMonShinyPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/gen_8/dubwool/shiny.gbapal.lz"); + const u8 gMonIcon_Dubwool[] = INCBIN_U8("graphics/pokemon/gen_8/dubwool/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dubwool[] = INCBIN_U8("graphics/pokemon/dubwool/footprint.1bpp"); + const u8 gMonFootprint_Dubwool[] = INCBIN_U8("graphics/pokemon/gen_8/dubwool/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_WOOLOO #if P_FAMILY_CHEWTLE - const u32 gMonFrontPic_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/anim_front.4bpp.lz"); - const u32 gMonPalette_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/normal.gbapal.lz"); - const u32 gMonBackPic_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/back.4bpp.lz"); - const u32 gMonShinyPalette_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/shiny.gbapal.lz"); - const u8 gMonIcon_Chewtle[] = INCBIN_U8("graphics/pokemon/chewtle/icon.4bpp"); + const u32 gMonFrontPic_Chewtle[] = INCBIN_U32("graphics/pokemon/gen_8/chewtle/anim_front.4bpp.lz"); + const u32 gMonPalette_Chewtle[] = INCBIN_U32("graphics/pokemon/gen_8/chewtle/normal.gbapal.lz"); + const u32 gMonBackPic_Chewtle[] = INCBIN_U32("graphics/pokemon/gen_8/chewtle/back.4bpp.lz"); + const u32 gMonShinyPalette_Chewtle[] = INCBIN_U32("graphics/pokemon/gen_8/chewtle/shiny.gbapal.lz"); + const u8 gMonIcon_Chewtle[] = INCBIN_U8("graphics/pokemon/gen_8/chewtle/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Chewtle[] = INCBIN_U8("graphics/pokemon/chewtle/footprint.1bpp"); + const u8 gMonFootprint_Chewtle[] = INCBIN_U8("graphics/pokemon/gen_8/chewtle/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/anim_front.4bpp.lz"); - const u32 gMonPalette_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/normal.gbapal.lz"); - const u32 gMonBackPic_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/back.4bpp.lz"); - const u32 gMonShinyPalette_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/shiny.gbapal.lz"); - const u8 gMonIcon_Drednaw[] = INCBIN_U8("graphics/pokemon/drednaw/icon.4bpp"); + const u32 gMonFrontPic_Drednaw[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/anim_front.4bpp.lz"); + const u32 gMonPalette_Drednaw[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/normal.gbapal.lz"); + const u32 gMonBackPic_Drednaw[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/back.4bpp.lz"); + const u32 gMonShinyPalette_Drednaw[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/shiny.gbapal.lz"); + const u8 gMonIcon_Drednaw[] = INCBIN_U8("graphics/pokemon/gen_8/drednaw/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Drednaw[] = INCBIN_U8("graphics/pokemon/drednaw/footprint.1bpp"); + const u8 gMonFootprint_Drednaw[] = INCBIN_U8("graphics/pokemon/gen_8/drednaw/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_DrednawGigantamax[] = INCBIN_U8("graphics/pokemon/drednaw/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/drednaw/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_DrednawGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/drednaw/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHEWTLE #if P_FAMILY_YAMPER - const u32 gMonFrontPic_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/front.4bpp.lz"); - const u32 gMonPalette_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/normal.gbapal.lz"); - const u32 gMonBackPic_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/back.4bpp.lz"); - const u32 gMonShinyPalette_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/shiny.gbapal.lz"); - const u8 gMonIcon_Yamper[] = INCBIN_U8("graphics/pokemon/yamper/icon.4bpp"); + const u32 gMonFrontPic_Yamper[] = INCBIN_U32("graphics/pokemon/gen_8/yamper/front.4bpp.lz"); + const u32 gMonPalette_Yamper[] = INCBIN_U32("graphics/pokemon/gen_8/yamper/normal.gbapal.lz"); + const u32 gMonBackPic_Yamper[] = INCBIN_U32("graphics/pokemon/gen_8/yamper/back.4bpp.lz"); + const u32 gMonShinyPalette_Yamper[] = INCBIN_U32("graphics/pokemon/gen_8/yamper/shiny.gbapal.lz"); + const u8 gMonIcon_Yamper[] = INCBIN_U8("graphics/pokemon/gen_8/yamper/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Yamper[] = INCBIN_U8("graphics/pokemon/yamper/footprint.1bpp"); + const u8 gMonFootprint_Yamper[] = INCBIN_U8("graphics/pokemon/gen_8/yamper/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/front.4bpp.lz"); - const u32 gMonPalette_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/normal.gbapal.lz"); - const u32 gMonBackPic_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/back.4bpp.lz"); - const u32 gMonShinyPalette_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/shiny.gbapal.lz"); - const u8 gMonIcon_Boltund[] = INCBIN_U8("graphics/pokemon/boltund/icon.4bpp"); + const u32 gMonFrontPic_Boltund[] = INCBIN_U32("graphics/pokemon/gen_8/boltund/front.4bpp.lz"); + const u32 gMonPalette_Boltund[] = INCBIN_U32("graphics/pokemon/gen_8/boltund/normal.gbapal.lz"); + const u32 gMonBackPic_Boltund[] = INCBIN_U32("graphics/pokemon/gen_8/boltund/back.4bpp.lz"); + const u32 gMonShinyPalette_Boltund[] = INCBIN_U32("graphics/pokemon/gen_8/boltund/shiny.gbapal.lz"); + const u8 gMonIcon_Boltund[] = INCBIN_U8("graphics/pokemon/gen_8/boltund/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Boltund[] = INCBIN_U8("graphics/pokemon/boltund/footprint.1bpp"); + const u8 gMonFootprint_Boltund[] = INCBIN_U8("graphics/pokemon/gen_8/boltund/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_YAMPER #if P_FAMILY_ROLYCOLY - const u32 gMonFrontPic_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/anim_front.4bpp.lz"); - const u32 gMonPalette_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/normal.gbapal.lz"); - const u32 gMonBackPic_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/back.4bpp.lz"); - const u32 gMonShinyPalette_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/shiny.gbapal.lz"); - const u8 gMonIcon_Rolycoly[] = INCBIN_U8("graphics/pokemon/rolycoly/icon.4bpp"); + const u32 gMonFrontPic_Rolycoly[] = INCBIN_U32("graphics/pokemon/gen_8/rolycoly/anim_front.4bpp.lz"); + const u32 gMonPalette_Rolycoly[] = INCBIN_U32("graphics/pokemon/gen_8/rolycoly/normal.gbapal.lz"); + const u32 gMonBackPic_Rolycoly[] = INCBIN_U32("graphics/pokemon/gen_8/rolycoly/back.4bpp.lz"); + const u32 gMonShinyPalette_Rolycoly[] = INCBIN_U32("graphics/pokemon/gen_8/rolycoly/shiny.gbapal.lz"); + const u8 gMonIcon_Rolycoly[] = INCBIN_U8("graphics/pokemon/gen_8/rolycoly/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Rolycoly[] = INCBIN_U8("graphics/pokemon/rolycoly/footprint.1bpp"); + const u8 gMonFootprint_Rolycoly[] = INCBIN_U8("graphics/pokemon/gen_8/rolycoly/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/anim_front.4bpp.lz"); - const u32 gMonPalette_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/normal.gbapal.lz"); - const u32 gMonBackPic_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/back.4bpp.lz"); - const u32 gMonShinyPalette_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/shiny.gbapal.lz"); - const u8 gMonIcon_Carkol[] = INCBIN_U8("graphics/pokemon/carkol/icon.4bpp"); + const u32 gMonFrontPic_Carkol[] = INCBIN_U32("graphics/pokemon/gen_8/carkol/anim_front.4bpp.lz"); + const u32 gMonPalette_Carkol[] = INCBIN_U32("graphics/pokemon/gen_8/carkol/normal.gbapal.lz"); + const u32 gMonBackPic_Carkol[] = INCBIN_U32("graphics/pokemon/gen_8/carkol/back.4bpp.lz"); + const u32 gMonShinyPalette_Carkol[] = INCBIN_U32("graphics/pokemon/gen_8/carkol/shiny.gbapal.lz"); + const u8 gMonIcon_Carkol[] = INCBIN_U8("graphics/pokemon/gen_8/carkol/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Carkol[] = INCBIN_U8("graphics/pokemon/carkol/footprint.1bpp"); + const u8 gMonFootprint_Carkol[] = INCBIN_U8("graphics/pokemon/gen_8/carkol/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/anim_front.4bpp.lz"); - const u32 gMonPalette_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/normal.gbapal.lz"); - const u32 gMonBackPic_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/back.4bpp.lz"); - const u32 gMonShinyPalette_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/shiny.gbapal.lz"); - const u8 gMonIcon_Coalossal[] = INCBIN_U8("graphics/pokemon/coalossal/icon.4bpp"); + const u32 gMonFrontPic_Coalossal[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/anim_front.4bpp.lz"); + const u32 gMonPalette_Coalossal[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/normal.gbapal.lz"); + const u32 gMonBackPic_Coalossal[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/back.4bpp.lz"); + const u32 gMonShinyPalette_Coalossal[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/shiny.gbapal.lz"); + const u8 gMonIcon_Coalossal[] = INCBIN_U8("graphics/pokemon/gen_8/coalossal/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Coalossal[] = INCBIN_U8("graphics/pokemon/coalossal/footprint.1bpp"); + const u8 gMonFootprint_Coalossal[] = INCBIN_U8("graphics/pokemon/gen_8/coalossal/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_CoalossalGigantamax[] = INCBIN_U8("graphics/pokemon/coalossal/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/coalossal/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_CoalossalGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/coalossal/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_ROLYCOLY #if P_FAMILY_APPLIN - const u32 gMonFrontPic_Applin[] = INCBIN_U32("graphics/pokemon/applin/anim_front.4bpp.lz"); - const u32 gMonPalette_Applin[] = INCBIN_U32("graphics/pokemon/applin/normal.gbapal.lz"); - const u32 gMonBackPic_Applin[] = INCBIN_U32("graphics/pokemon/applin/back.4bpp.lz"); - const u32 gMonShinyPalette_Applin[] = INCBIN_U32("graphics/pokemon/applin/shiny.gbapal.lz"); - const u8 gMonIcon_Applin[] = INCBIN_U8("graphics/pokemon/applin/icon.4bpp"); + const u32 gMonFrontPic_Applin[] = INCBIN_U32("graphics/pokemon/gen_8/applin/anim_front.4bpp.lz"); + const u32 gMonPalette_Applin[] = INCBIN_U32("graphics/pokemon/gen_8/applin/normal.gbapal.lz"); + const u32 gMonBackPic_Applin[] = INCBIN_U32("graphics/pokemon/gen_8/applin/back.4bpp.lz"); + const u32 gMonShinyPalette_Applin[] = INCBIN_U32("graphics/pokemon/gen_8/applin/shiny.gbapal.lz"); + const u8 gMonIcon_Applin[] = INCBIN_U8("graphics/pokemon/gen_8/applin/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Applin[] = INCBIN_U8("graphics/pokemon/applin/footprint.1bpp"); + const u8 gMonFootprint_Applin[] = INCBIN_U8("graphics/pokemon/gen_8/applin/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/anim_front.4bpp.lz"); - const u32 gMonPalette_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/normal.gbapal.lz"); - const u32 gMonBackPic_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/back.4bpp.lz"); - const u32 gMonShinyPalette_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/shiny.gbapal.lz"); - const u8 gMonIcon_Flapple[] = INCBIN_U8("graphics/pokemon/flapple/icon.4bpp"); + const u32 gMonFrontPic_Flapple[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/anim_front.4bpp.lz"); + const u32 gMonPalette_Flapple[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/normal.gbapal.lz"); + const u32 gMonBackPic_Flapple[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/back.4bpp.lz"); + const u32 gMonShinyPalette_Flapple[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/shiny.gbapal.lz"); + const u8 gMonIcon_Flapple[] = INCBIN_U8("graphics/pokemon/gen_8/flapple/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Flapple[] = INCBIN_U8("graphics/pokemon/flapple/footprint.1bpp"); + const u8 gMonFootprint_Flapple[] = INCBIN_U8("graphics/pokemon/gen_8/flapple/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_FlappleGigantamax[] = INCBIN_U8("graphics/pokemon/flapple/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/flapple/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_FlappleGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/flapple/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/anim_front.4bpp.lz"); - const u32 gMonPalette_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/normal.gbapal.lz"); - const u32 gMonBackPic_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/back.4bpp.lz"); - const u32 gMonShinyPalette_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/shiny.gbapal.lz"); - const u8 gMonIcon_Appletun[] = INCBIN_U8("graphics/pokemon/appletun/icon.4bpp"); + const u32 gMonFrontPic_Appletun[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/anim_front.4bpp.lz"); + const u32 gMonPalette_Appletun[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/normal.gbapal.lz"); + const u32 gMonBackPic_Appletun[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/back.4bpp.lz"); + const u32 gMonShinyPalette_Appletun[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/shiny.gbapal.lz"); + const u8 gMonIcon_Appletun[] = INCBIN_U8("graphics/pokemon/gen_8/appletun/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Appletun[] = INCBIN_U8("graphics/pokemon/appletun/footprint.1bpp"); + const u8 gMonFootprint_Appletun[] = INCBIN_U8("graphics/pokemon/gen_8/appletun/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_AppletunGigantamax[] = INCBIN_U8("graphics/pokemon/appletun/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/appletun/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_AppletunGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/appletun/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #if P_GEN_9_CROSS_EVOS - const u32 gMonFrontPic_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/front.4bpp.lz"); - const u32 gMonPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/normal.gbapal.lz"); - const u32 gMonBackPic_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/back.4bpp.lz"); - const u32 gMonShinyPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/shiny.gbapal.lz"); - const u8 gMonIcon_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/icon.4bpp"); + const u32 gMonFrontPic_Dipplin[] = INCBIN_U32("graphics/pokemon/gen_9/dipplin/front.4bpp.lz"); + const u32 gMonPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/gen_9/dipplin/normal.gbapal.lz"); + const u32 gMonBackPic_Dipplin[] = INCBIN_U32("graphics/pokemon/gen_9/dipplin/back.4bpp.lz"); + const u32 gMonShinyPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/gen_9/dipplin/shiny.gbapal.lz"); + const u8 gMonIcon_Dipplin[] = INCBIN_U8("graphics/pokemon/gen_9/dipplin/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/footprint.1bpp"); + // const u8 gMonFootprint_Dipplin[] = INCBIN_U8("graphics/pokemon/gen_9/dipplin/footprint.1bpp"); #endif //P_FOOTPRINTS - // const u32 gMonFrontPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/front.4bpp.lz"); - // const u32 gMonPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/normal.gbapal.lz"); - // const u32 gMonBackPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/back.4bpp.lz"); - // const u32 gMonShinyPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/shiny.gbapal.lz"); - // const u8 gMonIcon_Hydrapple[] = INCBIN_U8("graphics/pokemon/hydrapple/icon.4bpp"); + // const u32 gMonFrontPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/gen_9/hydrapple/front.4bpp.lz"); + // const u32 gMonPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/gen_9/hydrapple/normal.gbapal.lz"); + // const u32 gMonBackPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/gen_9/hydrapple/back.4bpp.lz"); + // const u32 gMonShinyPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/gen_9/hydrapple/shiny.gbapal.lz"); + // const u8 gMonIcon_Hydrapple[] = INCBIN_U8("graphics/pokemon/gen_9/hydrapple/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Hydrapple[] = INCBIN_U8("graphics/pokemon/hydrapple/footprint.1bpp"); + // const u8 gMonFootprint_Hydrapple[] = INCBIN_U8("graphics/pokemon/gen_9/hydrapple/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_APPLIN #if P_FAMILY_SILICOBRA - const u32 gMonFrontPic_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/front.4bpp.lz"); - const u32 gMonPalette_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/normal.gbapal.lz"); - const u32 gMonBackPic_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/back.4bpp.lz"); - const u32 gMonShinyPalette_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/shiny.gbapal.lz"); - const u8 gMonIcon_Silicobra[] = INCBIN_U8("graphics/pokemon/silicobra/icon.4bpp"); + const u32 gMonFrontPic_Silicobra[] = INCBIN_U32("graphics/pokemon/gen_8/silicobra/front.4bpp.lz"); + const u32 gMonPalette_Silicobra[] = INCBIN_U32("graphics/pokemon/gen_8/silicobra/normal.gbapal.lz"); + const u32 gMonBackPic_Silicobra[] = INCBIN_U32("graphics/pokemon/gen_8/silicobra/back.4bpp.lz"); + const u32 gMonShinyPalette_Silicobra[] = INCBIN_U32("graphics/pokemon/gen_8/silicobra/shiny.gbapal.lz"); + const u8 gMonIcon_Silicobra[] = INCBIN_U8("graphics/pokemon/gen_8/silicobra/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Silicobra[] = INCBIN_U8("graphics/pokemon/silicobra/footprint.1bpp"); + const u8 gMonFootprint_Silicobra[] = INCBIN_U8("graphics/pokemon/gen_8/silicobra/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/front.4bpp.lz"); - const u32 gMonPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/normal.gbapal.lz"); - const u32 gMonBackPic_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/back.4bpp.lz"); - const u32 gMonShinyPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/shiny.gbapal.lz"); - const u8 gMonIcon_Sandaconda[] = INCBIN_U8("graphics/pokemon/sandaconda/icon.4bpp"); + const u32 gMonFrontPic_Sandaconda[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/front.4bpp.lz"); + const u32 gMonPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/normal.gbapal.lz"); + const u32 gMonBackPic_Sandaconda[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/back.4bpp.lz"); + const u32 gMonShinyPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/shiny.gbapal.lz"); + const u8 gMonIcon_Sandaconda[] = INCBIN_U8("graphics/pokemon/gen_8/sandaconda/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sandaconda[] = INCBIN_U8("graphics/pokemon/sandaconda/footprint.1bpp"); + const u8 gMonFootprint_Sandaconda[] = INCBIN_U8("graphics/pokemon/gen_8/sandaconda/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_SandacondaGigantamax[] = INCBIN_U8("graphics/pokemon/sandaconda/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/sandaconda/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_SandacondaGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/sandaconda/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SILICOBRA #if P_FAMILY_CRAMORANT - const u32 gMonFrontPic_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/front.4bpp.lz"); - const u32 gMonPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/normal.gbapal.lz"); - const u32 gMonBackPic_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/back.4bpp.lz"); - const u32 gMonShinyPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/shiny.gbapal.lz"); - const u8 gMonIcon_Cramorant[] = INCBIN_U8("graphics/pokemon/cramorant/icon.4bpp"); + const u32 gMonFrontPic_Cramorant[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/front.4bpp.lz"); + const u32 gMonPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/normal.gbapal.lz"); + const u32 gMonBackPic_Cramorant[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/back.4bpp.lz"); + const u32 gMonShinyPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/shiny.gbapal.lz"); + const u8 gMonIcon_Cramorant[] = INCBIN_U8("graphics/pokemon/gen_8/cramorant/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cramorant[] = INCBIN_U8("graphics/pokemon/cramorant/footprint.1bpp"); + const u8 gMonFootprint_Cramorant[] = INCBIN_U8("graphics/pokemon/gen_8/cramorant/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/front.4bpp.lz"); - const u32 gMonPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/normal.gbapal.lz"); - const u32 gMonBackPic_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/back.4bpp.lz"); - const u32 gMonShinyPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/shiny.gbapal.lz"); - const u8 gMonIcon_CramorantGulping[] = INCBIN_U8("graphics/pokemon/cramorant/gulping/icon.4bpp"); + const u32 gMonFrontPic_CramorantGulping[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gulping/front.4bpp.lz"); + const u32 gMonPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gulping/normal.gbapal.lz"); + const u32 gMonBackPic_CramorantGulping[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gulping/back.4bpp.lz"); + const u32 gMonShinyPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gulping/shiny.gbapal.lz"); + const u8 gMonIcon_CramorantGulping[] = INCBIN_U8("graphics/pokemon/gen_8/cramorant/gulping/icon.4bpp"); - const u32 gMonFrontPic_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/front.4bpp.lz"); - const u32 gMonPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/normal.gbapal.lz"); - const u32 gMonBackPic_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/back.4bpp.lz"); - const u32 gMonShinyPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/shiny.gbapal.lz"); - const u8 gMonIcon_CramorantGorging[] = INCBIN_U8("graphics/pokemon/cramorant/gorging/icon.4bpp"); + const u32 gMonFrontPic_CramorantGorging[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gorging/front.4bpp.lz"); + const u32 gMonPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gorging/normal.gbapal.lz"); + const u32 gMonBackPic_CramorantGorging[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gorging/back.4bpp.lz"); + const u32 gMonShinyPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/gen_8/cramorant/gorging/shiny.gbapal.lz"); + const u8 gMonIcon_CramorantGorging[] = INCBIN_U8("graphics/pokemon/gen_8/cramorant/gorging/icon.4bpp"); #endif //P_FAMILY_CRAMORANT #if P_FAMILY_ARROKUDA - const u32 gMonFrontPic_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/front.4bpp.lz"); - const u32 gMonPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/normal.gbapal.lz"); - const u32 gMonBackPic_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/back.4bpp.lz"); - const u32 gMonShinyPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/shiny.gbapal.lz"); - const u8 gMonIcon_Arrokuda[] = INCBIN_U8("graphics/pokemon/arrokuda/icon.4bpp"); + const u32 gMonFrontPic_Arrokuda[] = INCBIN_U32("graphics/pokemon/gen_8/arrokuda/front.4bpp.lz"); + const u32 gMonPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/gen_8/arrokuda/normal.gbapal.lz"); + const u32 gMonBackPic_Arrokuda[] = INCBIN_U32("graphics/pokemon/gen_8/arrokuda/back.4bpp.lz"); + const u32 gMonShinyPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/gen_8/arrokuda/shiny.gbapal.lz"); + const u8 gMonIcon_Arrokuda[] = INCBIN_U8("graphics/pokemon/gen_8/arrokuda/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Arrokuda[] = INCBIN_U8("graphics/pokemon/arrokuda/footprint.1bpp"); + const u8 gMonFootprint_Arrokuda[] = INCBIN_U8("graphics/pokemon/gen_8/arrokuda/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/front.4bpp.lz"); - const u32 gMonPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/normal.gbapal.lz"); - const u32 gMonBackPic_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/back.4bpp.lz"); - const u32 gMonShinyPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/shiny.gbapal.lz"); - const u8 gMonIcon_Barraskewda[] = INCBIN_U8("graphics/pokemon/barraskewda/icon.4bpp"); + const u32 gMonFrontPic_Barraskewda[] = INCBIN_U32("graphics/pokemon/gen_8/barraskewda/front.4bpp.lz"); + const u32 gMonPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/gen_8/barraskewda/normal.gbapal.lz"); + const u32 gMonBackPic_Barraskewda[] = INCBIN_U32("graphics/pokemon/gen_8/barraskewda/back.4bpp.lz"); + const u32 gMonShinyPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/gen_8/barraskewda/shiny.gbapal.lz"); + const u8 gMonIcon_Barraskewda[] = INCBIN_U8("graphics/pokemon/gen_8/barraskewda/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Barraskewda[] = INCBIN_U8("graphics/pokemon/barraskewda/footprint.1bpp"); + const u8 gMonFootprint_Barraskewda[] = INCBIN_U8("graphics/pokemon/gen_8/barraskewda/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ARROKUDA #if P_FAMILY_TOXEL - const u32 gMonFrontPic_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/front.4bpp.lz"); - const u32 gMonPalette_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/normal.gbapal.lz"); - const u32 gMonBackPic_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/back.4bpp.lz"); - const u32 gMonShinyPalette_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/shiny.gbapal.lz"); - const u8 gMonIcon_Toxel[] = INCBIN_U8("graphics/pokemon/toxel/icon.4bpp"); + const u32 gMonFrontPic_Toxel[] = INCBIN_U32("graphics/pokemon/gen_8/toxel/front.4bpp.lz"); + const u32 gMonPalette_Toxel[] = INCBIN_U32("graphics/pokemon/gen_8/toxel/normal.gbapal.lz"); + const u32 gMonBackPic_Toxel[] = INCBIN_U32("graphics/pokemon/gen_8/toxel/back.4bpp.lz"); + const u32 gMonShinyPalette_Toxel[] = INCBIN_U32("graphics/pokemon/gen_8/toxel/shiny.gbapal.lz"); + const u8 gMonIcon_Toxel[] = INCBIN_U8("graphics/pokemon/gen_8/toxel/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Toxel[] = INCBIN_U8("graphics/pokemon/toxel/footprint.1bpp"); + const u8 gMonFootprint_Toxel[] = INCBIN_U8("graphics/pokemon/gen_8/toxel/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/front.4bpp.lz"); - const u32 gMonPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/normal.gbapal.lz"); - const u32 gMonBackPic_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/back.4bpp.lz"); - const u32 gMonShinyPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/shiny.gbapal.lz"); - const u8 gMonIcon_ToxtricityAmped[] = INCBIN_U8("graphics/pokemon/toxtricity/icon.4bpp"); + const u32 gMonFrontPic_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/front.4bpp.lz"); + const u32 gMonPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/normal.gbapal.lz"); + const u32 gMonBackPic_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/back.4bpp.lz"); + const u32 gMonShinyPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/shiny.gbapal.lz"); + const u8 gMonIcon_ToxtricityAmped[] = INCBIN_U8("graphics/pokemon/gen_8/toxtricity/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Toxtricity[] = INCBIN_U8("graphics/pokemon/toxtricity/footprint.1bpp"); + const u8 gMonFootprint_Toxtricity[] = INCBIN_U8("graphics/pokemon/gen_8/toxtricity/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/front.4bpp.lz"); - const u32 gMonPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/normal.gbapal.lz"); - const u32 gMonBackPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/back.4bpp.lz"); - const u32 gMonShinyPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/shiny.gbapal.lz"); - const u8 gMonIcon_ToxtricityLowKey[] = INCBIN_U8("graphics/pokemon/toxtricity/low_key/icon.4bpp"); + const u32 gMonFrontPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/low_key/front.4bpp.lz"); + const u32 gMonPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/low_key/normal.gbapal.lz"); + const u32 gMonBackPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/low_key/back.4bpp.lz"); + const u32 gMonShinyPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/low_key/shiny.gbapal.lz"); + const u8 gMonIcon_ToxtricityLowKey[] = INCBIN_U8("graphics/pokemon/gen_8/toxtricity/low_key/icon.4bpp"); #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_ToxtricityGigantamax[] = INCBIN_U8("graphics/pokemon/toxtricity/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/toxtricity/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_ToxtricityGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/toxtricity/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_TOXEL #if P_FAMILY_SIZZLIPEDE - const u32 gMonFrontPic_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/anim_front.4bpp.lz"); - const u32 gMonPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/normal.gbapal.lz"); - const u32 gMonBackPic_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/back.4bpp.lz"); - const u32 gMonShinyPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/shiny.gbapal.lz"); - const u8 gMonIcon_Sizzlipede[] = INCBIN_U8("graphics/pokemon/sizzlipede/icon.4bpp"); + const u32 gMonFrontPic_Sizzlipede[] = INCBIN_U32("graphics/pokemon/gen_8/sizzlipede/anim_front.4bpp.lz"); + const u32 gMonPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/gen_8/sizzlipede/normal.gbapal.lz"); + const u32 gMonBackPic_Sizzlipede[] = INCBIN_U32("graphics/pokemon/gen_8/sizzlipede/back.4bpp.lz"); + const u32 gMonShinyPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/gen_8/sizzlipede/shiny.gbapal.lz"); + const u8 gMonIcon_Sizzlipede[] = INCBIN_U8("graphics/pokemon/gen_8/sizzlipede/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sizzlipede[] = INCBIN_U8("graphics/pokemon/sizzlipede/footprint.1bpp"); + const u8 gMonFootprint_Sizzlipede[] = INCBIN_U8("graphics/pokemon/gen_8/sizzlipede/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/anim_front.4bpp.lz"); - const u32 gMonPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/normal.gbapal.lz"); - const u32 gMonBackPic_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/back.4bpp.lz"); - const u32 gMonShinyPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/shiny.gbapal.lz"); - const u8 gMonIcon_Centiskorch[] = INCBIN_U8("graphics/pokemon/centiskorch/icon.4bpp"); + const u32 gMonFrontPic_Centiskorch[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/anim_front.4bpp.lz"); + const u32 gMonPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/normal.gbapal.lz"); + const u32 gMonBackPic_Centiskorch[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/back.4bpp.lz"); + const u32 gMonShinyPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/shiny.gbapal.lz"); + const u8 gMonIcon_Centiskorch[] = INCBIN_U8("graphics/pokemon/gen_8/centiskorch/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Centiskorch[] = INCBIN_U8("graphics/pokemon/centiskorch/footprint.1bpp"); + const u8 gMonFootprint_Centiskorch[] = INCBIN_U8("graphics/pokemon/gen_8/centiskorch/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_CentiskorchGigantamax[] = INCBIN_U8("graphics/pokemon/centiskorch/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/centiskorch/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_CentiskorchGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/centiskorch/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SIZZLIPEDE #if P_FAMILY_CLOBBOPUS - const u32 gMonFrontPic_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/front.4bpp.lz"); - const u32 gMonPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/normal.gbapal.lz"); - const u32 gMonBackPic_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/back.4bpp.lz"); - const u32 gMonShinyPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/shiny.gbapal.lz"); - const u8 gMonIcon_Clobbopus[] = INCBIN_U8("graphics/pokemon/clobbopus/icon.4bpp"); + const u32 gMonFrontPic_Clobbopus[] = INCBIN_U32("graphics/pokemon/gen_8/clobbopus/front.4bpp.lz"); + const u32 gMonPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/gen_8/clobbopus/normal.gbapal.lz"); + const u32 gMonBackPic_Clobbopus[] = INCBIN_U32("graphics/pokemon/gen_8/clobbopus/back.4bpp.lz"); + const u32 gMonShinyPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/gen_8/clobbopus/shiny.gbapal.lz"); + const u8 gMonIcon_Clobbopus[] = INCBIN_U8("graphics/pokemon/gen_8/clobbopus/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Clobbopus[] = INCBIN_U8("graphics/pokemon/clobbopus/footprint.1bpp"); + const u8 gMonFootprint_Clobbopus[] = INCBIN_U8("graphics/pokemon/gen_8/clobbopus/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/front.4bpp.lz"); - const u32 gMonPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/normal.gbapal.lz"); - const u32 gMonBackPic_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/back.4bpp.lz"); - const u32 gMonShinyPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/shiny.gbapal.lz"); - const u8 gMonIcon_Grapploct[] = INCBIN_U8("graphics/pokemon/grapploct/icon.4bpp"); + const u32 gMonFrontPic_Grapploct[] = INCBIN_U32("graphics/pokemon/gen_8/grapploct/front.4bpp.lz"); + const u32 gMonPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/gen_8/grapploct/normal.gbapal.lz"); + const u32 gMonBackPic_Grapploct[] = INCBIN_U32("graphics/pokemon/gen_8/grapploct/back.4bpp.lz"); + const u32 gMonShinyPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/gen_8/grapploct/shiny.gbapal.lz"); + const u8 gMonIcon_Grapploct[] = INCBIN_U8("graphics/pokemon/gen_8/grapploct/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Grapploct[] = INCBIN_U8("graphics/pokemon/grapploct/footprint.1bpp"); + const u8 gMonFootprint_Grapploct[] = INCBIN_U8("graphics/pokemon/gen_8/grapploct/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CLOBBOPUS #if P_FAMILY_SINISTEA - const u32 gMonFrontPic_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/front.4bpp.lz"); - const u32 gMonPalette_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/normal.gbapal.lz"); - const u32 gMonBackPic_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/back.4bpp.lz"); - const u32 gMonShinyPalette_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/shiny.gbapal.lz"); - const u8 gMonIcon_Sinistea[] = INCBIN_U8("graphics/pokemon/sinistea/icon.4bpp"); + const u32 gMonFrontPic_Sinistea[] = INCBIN_U32("graphics/pokemon/gen_8/sinistea/front.4bpp.lz"); + const u32 gMonPalette_Sinistea[] = INCBIN_U32("graphics/pokemon/gen_8/sinistea/normal.gbapal.lz"); + const u32 gMonBackPic_Sinistea[] = INCBIN_U32("graphics/pokemon/gen_8/sinistea/back.4bpp.lz"); + const u32 gMonShinyPalette_Sinistea[] = INCBIN_U32("graphics/pokemon/gen_8/sinistea/shiny.gbapal.lz"); + const u8 gMonIcon_Sinistea[] = INCBIN_U8("graphics/pokemon/gen_8/sinistea/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Sinistea[] = INCBIN_U8("graphics/pokemon/sinistea/footprint.1bpp"); + const u8 gMonFootprint_Sinistea[] = INCBIN_U8("graphics/pokemon/gen_8/sinistea/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/front.4bpp.lz"); - const u32 gMonPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/normal.gbapal.lz"); - const u32 gMonBackPic_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/back.4bpp.lz"); - const u32 gMonShinyPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/shiny.gbapal.lz"); - const u8 gMonIcon_Polteageist[] = INCBIN_U8("graphics/pokemon/polteageist/icon.4bpp"); + const u32 gMonFrontPic_Polteageist[] = INCBIN_U32("graphics/pokemon/gen_8/polteageist/front.4bpp.lz"); + const u32 gMonPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/gen_8/polteageist/normal.gbapal.lz"); + const u32 gMonBackPic_Polteageist[] = INCBIN_U32("graphics/pokemon/gen_8/polteageist/back.4bpp.lz"); + const u32 gMonShinyPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/gen_8/polteageist/shiny.gbapal.lz"); + const u8 gMonIcon_Polteageist[] = INCBIN_U8("graphics/pokemon/gen_8/polteageist/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Polteageist[] = INCBIN_U8("graphics/pokemon/polteageist/footprint.1bpp"); + const u8 gMonFootprint_Polteageist[] = INCBIN_U8("graphics/pokemon/gen_8/polteageist/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SINISTEA #if P_FAMILY_HATENNA - const u32 gMonFrontPic_Hatenna[] = INCBIN_U32("graphics/pokemon/hatenna/front.4bpp.lz"); - const u32 gMonPalette_Hatenna[] = INCBIN_U32("graphics/pokemon/hatenna/normal.gbapal.lz"); - const u32 gMonBackPic_Hatenna[] = INCBIN_U32("graphics/pokemon/hatenna/back.4bpp.lz"); - const u32 gMonShinyPalette_Hatenna[] = INCBIN_U32("graphics/pokemon/hatenna/shiny.gbapal.lz"); - const u8 gMonIcon_Hatenna[] = INCBIN_U8("graphics/pokemon/hatenna/icon.4bpp"); + const u32 gMonFrontPic_Hatenna[] = INCBIN_U32("graphics/pokemon/gen_8/hatenna/front.4bpp.lz"); + const u32 gMonPalette_Hatenna[] = INCBIN_U32("graphics/pokemon/gen_8/hatenna/normal.gbapal.lz"); + const u32 gMonBackPic_Hatenna[] = INCBIN_U32("graphics/pokemon/gen_8/hatenna/back.4bpp.lz"); + const u32 gMonShinyPalette_Hatenna[] = INCBIN_U32("graphics/pokemon/gen_8/hatenna/shiny.gbapal.lz"); + const u8 gMonIcon_Hatenna[] = INCBIN_U8("graphics/pokemon/gen_8/hatenna/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hatenna[] = INCBIN_U8("graphics/pokemon/hatenna/footprint.1bpp"); + const u8 gMonFootprint_Hatenna[] = INCBIN_U8("graphics/pokemon/gen_8/hatenna/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/front.4bpp.lz"); - const u32 gMonPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/normal.gbapal.lz"); - const u32 gMonBackPic_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/back.4bpp.lz"); - const u32 gMonShinyPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/shiny.gbapal.lz"); - const u8 gMonIcon_Hattrem[] = INCBIN_U8("graphics/pokemon/hattrem/icon.4bpp"); + const u32 gMonFrontPic_Hattrem[] = INCBIN_U32("graphics/pokemon/gen_8/hattrem/front.4bpp.lz"); + const u32 gMonPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/gen_8/hattrem/normal.gbapal.lz"); + const u32 gMonBackPic_Hattrem[] = INCBIN_U32("graphics/pokemon/gen_8/hattrem/back.4bpp.lz"); + const u32 gMonShinyPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/gen_8/hattrem/shiny.gbapal.lz"); + const u8 gMonIcon_Hattrem[] = INCBIN_U8("graphics/pokemon/gen_8/hattrem/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hattrem[] = INCBIN_U8("graphics/pokemon/hattrem/footprint.1bpp"); + const u8 gMonFootprint_Hattrem[] = INCBIN_U8("graphics/pokemon/gen_8/hattrem/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/front.4bpp.lz"); - const u32 gMonPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/normal.gbapal.lz"); - const u32 gMonBackPic_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/back.4bpp.lz"); - const u32 gMonShinyPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/shiny.gbapal.lz"); - const u8 gMonIcon_Hatterene[] = INCBIN_U8("graphics/pokemon/hatterene/icon.4bpp"); + const u32 gMonFrontPic_Hatterene[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/front.4bpp.lz"); + const u32 gMonPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/normal.gbapal.lz"); + const u32 gMonBackPic_Hatterene[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/back.4bpp.lz"); + const u32 gMonShinyPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/shiny.gbapal.lz"); + const u8 gMonIcon_Hatterene[] = INCBIN_U8("graphics/pokemon/gen_8/hatterene/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Hatterene[] = INCBIN_U8("graphics/pokemon/hatterene/footprint.1bpp"); + const u8 gMonFootprint_Hatterene[] = INCBIN_U8("graphics/pokemon/gen_8/hatterene/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_HattereneGigantamax[] = INCBIN_U8("graphics/pokemon/hatterene/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/hatterene/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_HattereneGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/hatterene/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_HATENNA #if P_FAMILY_IMPIDIMP - const u32 gMonFrontPic_Impidimp[] = INCBIN_U32("graphics/pokemon/impidimp/front.4bpp.lz"); - const u32 gMonPalette_Impidimp[] = INCBIN_U32("graphics/pokemon/impidimp/normal.gbapal.lz"); - const u32 gMonBackPic_Impidimp[] = INCBIN_U32("graphics/pokemon/impidimp/back.4bpp.lz"); - const u32 gMonShinyPalette_Impidimp[] = INCBIN_U32("graphics/pokemon/impidimp/shiny.gbapal.lz"); - const u8 gMonIcon_Impidimp[] = INCBIN_U8("graphics/pokemon/impidimp/icon.4bpp"); + const u32 gMonFrontPic_Impidimp[] = INCBIN_U32("graphics/pokemon/gen_8/impidimp/front.4bpp.lz"); + const u32 gMonPalette_Impidimp[] = INCBIN_U32("graphics/pokemon/gen_8/impidimp/normal.gbapal.lz"); + const u32 gMonBackPic_Impidimp[] = INCBIN_U32("graphics/pokemon/gen_8/impidimp/back.4bpp.lz"); + const u32 gMonShinyPalette_Impidimp[] = INCBIN_U32("graphics/pokemon/gen_8/impidimp/shiny.gbapal.lz"); + const u8 gMonIcon_Impidimp[] = INCBIN_U8("graphics/pokemon/gen_8/impidimp/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Impidimp[] = INCBIN_U8("graphics/pokemon/impidimp/footprint.1bpp"); + const u8 gMonFootprint_Impidimp[] = INCBIN_U8("graphics/pokemon/gen_8/impidimp/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/front.4bpp.lz"); - const u32 gMonPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/normal.gbapal.lz"); - const u32 gMonBackPic_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/back.4bpp.lz"); - const u32 gMonShinyPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/shiny.gbapal.lz"); - const u8 gMonIcon_Morgrem[] = INCBIN_U8("graphics/pokemon/morgrem/icon.4bpp"); + const u32 gMonFrontPic_Morgrem[] = INCBIN_U32("graphics/pokemon/gen_8/morgrem/front.4bpp.lz"); + const u32 gMonPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/gen_8/morgrem/normal.gbapal.lz"); + const u32 gMonBackPic_Morgrem[] = INCBIN_U32("graphics/pokemon/gen_8/morgrem/back.4bpp.lz"); + const u32 gMonShinyPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/gen_8/morgrem/shiny.gbapal.lz"); + const u8 gMonIcon_Morgrem[] = INCBIN_U8("graphics/pokemon/gen_8/morgrem/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Morgrem[] = INCBIN_U8("graphics/pokemon/morgrem/footprint.1bpp"); + const u8 gMonFootprint_Morgrem[] = INCBIN_U8("graphics/pokemon/gen_8/morgrem/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/front.4bpp.lz"); - const u32 gMonPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/normal.gbapal.lz"); - const u32 gMonBackPic_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/back.4bpp.lz"); - const u32 gMonShinyPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/shiny.gbapal.lz"); - const u8 gMonIcon_Grimmsnarl[] = INCBIN_U8("graphics/pokemon/grimmsnarl/icon.4bpp"); + const u32 gMonFrontPic_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/front.4bpp.lz"); + const u32 gMonPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/normal.gbapal.lz"); + const u32 gMonBackPic_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/back.4bpp.lz"); + const u32 gMonShinyPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/shiny.gbapal.lz"); + const u8 gMonIcon_Grimmsnarl[] = INCBIN_U8("graphics/pokemon/gen_8/grimmsnarl/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Grimmsnarl[] = INCBIN_U8("graphics/pokemon/grimmsnarl/footprint.1bpp"); + const u8 gMonFootprint_Grimmsnarl[] = INCBIN_U8("graphics/pokemon/gen_8/grimmsnarl/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_GrimmsnarlGigantamax[] = INCBIN_U8("graphics/pokemon/grimmsnarl/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/grimmsnarl/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_GrimmsnarlGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/grimmsnarl/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_IMPIDIMP #if P_FAMILY_MILCERY - const u32 gMonFrontPic_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/front.4bpp.lz"); - const u32 gMonPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/normal.gbapal.lz"); - const u32 gMonBackPic_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/back.4bpp.lz"); - const u32 gMonShinyPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/shiny.gbapal.lz"); - const u8 gMonIcon_Milcery[] = INCBIN_U8("graphics/pokemon/milcery/icon.4bpp"); + const u32 gMonFrontPic_Milcery[] = INCBIN_U32("graphics/pokemon/gen_8/milcery/front.4bpp.lz"); + const u32 gMonPalette_Milcery[] = INCBIN_U32("graphics/pokemon/gen_8/milcery/normal.gbapal.lz"); + const u32 gMonBackPic_Milcery[] = INCBIN_U32("graphics/pokemon/gen_8/milcery/back.4bpp.lz"); + const u32 gMonShinyPalette_Milcery[] = INCBIN_U32("graphics/pokemon/gen_8/milcery/shiny.gbapal.lz"); + const u8 gMonIcon_Milcery[] = INCBIN_U8("graphics/pokemon/gen_8/milcery/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Milcery[] = INCBIN_U8("graphics/pokemon/milcery/footprint.1bpp"); -#endif //P_FOOTPRINTS - const u32 gMonFrontPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/front.4bpp.lz"); - const u32 gMonBackPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/back.4bpp.lz"); - const u32 gMonPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/normal.gbapal.lz"); - const u32 gMonShinyPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/shiny.gbapal.lz"); - - const u8 gMonIcon_AlcremieStrawberryVanillaCream[] = INCBIN_U8("graphics/pokemon/alcremie/icon.4bpp"); - //const u8 gMonIcon_AlcremieStrawberryRubyCream[] = INCBIN_U8("graphics/pokemon/alcremie/ruby_cream/icon.4bpp"); - //const u8 gMonIcon_AlcremieStrawberryMatchaCream[] = INCBIN_U8("graphics/pokemon/alcremie/matcha_cream/icon.4bpp"); - //const u8 gMonIcon_AlcremieStrawberryMintCream[] = INCBIN_U8("graphics/pokemon/alcremie/mint_cream/icon.4bpp"); - //const u8 gMonIcon_AlcremieStrawberryLemonCream[] = INCBIN_U8("graphics/pokemon/alcremie/lemon_cream/icon.4bpp"); - //const u8 gMonIcon_AlcremieStrawberrySaltedCream[] = INCBIN_U8("graphics/pokemon/alcremie/salted_cream/icon.4bpp"); - //const u8 gMonIcon_AlcremieStrawberryRubySwirl[] = INCBIN_U8("graphics/pokemon/alcremie/ruby_swirl/icon.4bpp"); - //const u8 gMonIcon_AlcremieStrawberryCaramelSwirl[] = INCBIN_U8("graphics/pokemon/alcremie/caramel_swirl/icon.4bpp"); - //const u8 gMonIcon_AlcremieStrawberryRainbowSwirl[] = INCBIN_U8("graphics/pokemon/alcremie/rainbow_swirl/icon.4bpp"); - - const u32 gMonFrontPic_AlcremieStrawberry[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/front.4bpp.lz"); - const u32 gMonPalette_AlcremieStrawberryVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_default.gbapal.lz"); - const u32 gMonPalette_AlcremieStrawberryRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_ruby_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieStrawberryMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_matcha_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieStrawberryMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_mint_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieStrawberryLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_lemon_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieStrawberrySaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_salted_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieStrawberryRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_ruby_swirl.gbapal.lz"); - const u32 gMonPalette_AlcremieStrawberryCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_caramel_swirl.gbapal.lz"); - const u32 gMonPalette_AlcremieStrawberryRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_rainbow_swirl.gbapal.lz"); - const u32 gMonBackPic_AlcremieStrawberry[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/back.4bpp.lz"); - const u32 gMonShinyPalette_AlcremieStrawberry[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/strawberry_shiny.gbapal.lz"); -#if P_FOOTPRINTS - const u8 gMonFootprint_Alcremie[] = INCBIN_U8("graphics/pokemon/alcremie/footprint.1bpp"); + const u8 gMonFootprint_Milcery[] = INCBIN_U8("graphics/pokemon/gen_8/milcery/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/alcremie/berry/front.4bpp.lz"); - const u32 gMonPalette_AlcremieBerryVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_default.gbapal.lz"); - const u32 gMonPalette_AlcremieBerryRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_ruby_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieBerryMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_matcha_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieBerryMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_mint_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieBerryLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_lemon_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieBerrySaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_salted_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieBerryRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_ruby_swirl.gbapal.lz"); - const u32 gMonPalette_AlcremieBerryCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_caramel_swirl.gbapal.lz"); - const u32 gMonPalette_AlcremieBerryRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_rainbow_swirl.gbapal.lz"); - const u32 gMonBackPic_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/alcremie/berry/back.4bpp.lz"); - const u32 gMonShinyPalette_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/alcremie/berry/berry_shiny.gbapal.lz"); + const u32 gMonFrontPic_Alcremie[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/front.4bpp.lz"); + const u32 gMonBackPic_Alcremie[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/back.4bpp.lz"); + const u32 gMonPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/normal.gbapal.lz"); + const u32 gMonShinyPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/shiny.gbapal.lz"); - const u32 gMonFrontPic_AlcremieLove[] = INCBIN_U32("graphics/pokemon/alcremie/love/front.4bpp.lz"); - const u32 gMonPalette_AlcremieLoveVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_default.gbapal.lz"); - const u32 gMonPalette_AlcremieLoveRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_ruby_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieLoveMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_matcha_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieLoveMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_mint_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieLoveLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_lemon_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieLoveSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_salted_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieLoveRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_ruby_swirl.gbapal.lz"); - const u32 gMonPalette_AlcremieLoveCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_caramel_swirl.gbapal.lz"); - const u32 gMonPalette_AlcremieLoveRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_rainbow_swirl.gbapal.lz"); - const u32 gMonBackPic_AlcremieLove[] = INCBIN_U32("graphics/pokemon/alcremie/love/back.4bpp.lz"); - const u32 gMonShinyPalette_AlcremieLove[] = INCBIN_U32("graphics/pokemon/alcremie/love/love_shiny.gbapal.lz"); + const u8 gMonIcon_AlcremieStrawberryVanillaCream[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/icon.4bpp"); + //const u8 gMonIcon_AlcremieStrawberryRubyCream[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/ruby_cream/icon.4bpp"); + //const u8 gMonIcon_AlcremieStrawberryMatchaCream[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/matcha_cream/icon.4bpp"); + //const u8 gMonIcon_AlcremieStrawberryMintCream[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/mint_cream/icon.4bpp"); + //const u8 gMonIcon_AlcremieStrawberryLemonCream[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/lemon_cream/icon.4bpp"); + //const u8 gMonIcon_AlcremieStrawberrySaltedCream[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/salted_cream/icon.4bpp"); + //const u8 gMonIcon_AlcremieStrawberryRubySwirl[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/ruby_swirl/icon.4bpp"); + //const u8 gMonIcon_AlcremieStrawberryCaramelSwirl[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/caramel_swirl/icon.4bpp"); + //const u8 gMonIcon_AlcremieStrawberryRainbowSwirl[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/rainbow_swirl/icon.4bpp"); - const u32 gMonFrontPic_AlcremieStar[] = INCBIN_U32("graphics/pokemon/alcremie/star/front.4bpp.lz"); - const u32 gMonPalette_AlcremieStarVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_default.gbapal.lz"); - const u32 gMonPalette_AlcremieStarRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_ruby_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieStarMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_matcha_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieStarMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_mint_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieStarLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_lemon_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieStarSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_salted_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieStarRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_ruby_swirl.gbapal.lz"); - const u32 gMonPalette_AlcremieStarCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_caramel_swirl.gbapal.lz"); - const u32 gMonPalette_AlcremieStarRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_rainbow_swirl.gbapal.lz"); - const u32 gMonBackPic_AlcremieStar[] = INCBIN_U32("graphics/pokemon/alcremie/star/back.4bpp.lz"); - const u32 gMonShinyPalette_AlcremieStar[] = INCBIN_U32("graphics/pokemon/alcremie/star/star_shiny.gbapal.lz"); + const u32 gMonFrontPic_AlcremieStrawberry[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/front.4bpp.lz"); + const u32 gMonPalette_AlcremieStrawberryVanillaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_default.gbapal.lz"); + const u32 gMonPalette_AlcremieStrawberryRubyCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_ruby_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieStrawberryMatchaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_matcha_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieStrawberryMintCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_mint_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieStrawberryLemonCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_lemon_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieStrawberrySaltedCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_salted_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieStrawberryRubySwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_ruby_swirl.gbapal.lz"); + const u32 gMonPalette_AlcremieStrawberryCaramelSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_caramel_swirl.gbapal.lz"); + const u32 gMonPalette_AlcremieStrawberryRainbowSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_rainbow_swirl.gbapal.lz"); + const u32 gMonBackPic_AlcremieStrawberry[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/back.4bpp.lz"); + const u32 gMonShinyPalette_AlcremieStrawberry[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/strawberry/strawberry_shiny.gbapal.lz"); +#if P_FOOTPRINTS + const u8 gMonFootprint_Alcremie[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/footprint.1bpp"); +#endif //P_FOOTPRINTS - const u32 gMonFrontPic_AlcremieClover[] = INCBIN_U32("graphics/pokemon/alcremie/clover/front.4bpp.lz"); - const u32 gMonPalette_AlcremieCloverVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_default.gbapal.lz"); - const u32 gMonPalette_AlcremieCloverRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_ruby_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieCloverMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_matcha_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieCloverMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_mint_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieCloverLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_lemon_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieCloverSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_salted_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieCloverRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_ruby_swirl.gbapal.lz"); - const u32 gMonPalette_AlcremieCloverCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_caramel_swirl.gbapal.lz"); - const u32 gMonPalette_AlcremieCloverRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_rainbow_swirl.gbapal.lz"); - const u32 gMonBackPic_AlcremieClover[] = INCBIN_U32("graphics/pokemon/alcremie/clover/back.4bpp.lz"); - const u32 gMonShinyPalette_AlcremieClover[] = INCBIN_U32("graphics/pokemon/alcremie/clover/clover_shiny.gbapal.lz"); + const u32 gMonFrontPic_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/front.4bpp.lz"); + const u32 gMonPalette_AlcremieBerryVanillaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_default.gbapal.lz"); + const u32 gMonPalette_AlcremieBerryRubyCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_ruby_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieBerryMatchaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_matcha_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieBerryMintCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_mint_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieBerryLemonCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_lemon_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieBerrySaltedCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_salted_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieBerryRubySwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_ruby_swirl.gbapal.lz"); + const u32 gMonPalette_AlcremieBerryCaramelSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_caramel_swirl.gbapal.lz"); + const u32 gMonPalette_AlcremieBerryRainbowSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_rainbow_swirl.gbapal.lz"); + const u32 gMonBackPic_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/back.4bpp.lz"); + const u32 gMonShinyPalette_AlcremieBerry[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/berry/berry_shiny.gbapal.lz"); - const u32 gMonFrontPic_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/alcremie/flower/front.4bpp.lz"); - const u32 gMonPalette_AlcremieFlowerVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_default.gbapal.lz"); - const u32 gMonPalette_AlcremieFlowerRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_ruby_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieFlowerMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_matcha_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieFlowerMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_mint_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieFlowerLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_lemon_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieFlowerSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_salted_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieFlowerRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_ruby_swirl.gbapal.lz"); - const u32 gMonPalette_AlcremieFlowerCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_caramel_swirl.gbapal.lz"); - const u32 gMonPalette_AlcremieFlowerRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_rainbow_swirl.gbapal.lz"); - const u32 gMonBackPic_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/alcremie/flower/back.4bpp.lz"); - const u32 gMonShinyPalette_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/alcremie/flower/flower_shiny.gbapal.lz"); + const u32 gMonFrontPic_AlcremieLove[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/front.4bpp.lz"); + const u32 gMonPalette_AlcremieLoveVanillaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_default.gbapal.lz"); + const u32 gMonPalette_AlcremieLoveRubyCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_ruby_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieLoveMatchaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_matcha_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieLoveMintCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_mint_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieLoveLemonCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_lemon_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieLoveSaltedCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_salted_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieLoveRubySwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_ruby_swirl.gbapal.lz"); + const u32 gMonPalette_AlcremieLoveCaramelSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_caramel_swirl.gbapal.lz"); + const u32 gMonPalette_AlcremieLoveRainbowSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_rainbow_swirl.gbapal.lz"); + const u32 gMonBackPic_AlcremieLove[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/back.4bpp.lz"); + const u32 gMonShinyPalette_AlcremieLove[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/love/love_shiny.gbapal.lz"); - const u32 gMonFrontPic_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/front.4bpp.lz"); - const u32 gMonPalette_AlcremieRibbonVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_default.gbapal.lz"); - const u32 gMonPalette_AlcremieRibbonRubyCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_ruby_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieRibbonMatchaCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_matcha_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieRibbonMintCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_mint_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieRibbonLemonCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_lemon_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieRibbonSaltedCream[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_salted_cream.gbapal.lz"); - const u32 gMonPalette_AlcremieRibbonRubySwirl[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_ruby_swirl.gbapal.lz"); - const u32 gMonPalette_AlcremieRibbonCaramelSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_caramel_swirl.gbapal.lz"); - const u32 gMonPalette_AlcremieRibbonRainbowSwirl[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_rainbow_swirl.gbapal.lz"); - const u32 gMonBackPic_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/back.4bpp.lz"); - const u32 gMonShinyPalette_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_shiny.gbapal.lz"); + const u32 gMonFrontPic_AlcremieStar[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/front.4bpp.lz"); + const u32 gMonPalette_AlcremieStarVanillaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_default.gbapal.lz"); + const u32 gMonPalette_AlcremieStarRubyCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_ruby_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieStarMatchaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_matcha_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieStarMintCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_mint_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieStarLemonCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_lemon_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieStarSaltedCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_salted_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieStarRubySwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_ruby_swirl.gbapal.lz"); + const u32 gMonPalette_AlcremieStarCaramelSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_caramel_swirl.gbapal.lz"); + const u32 gMonPalette_AlcremieStarRainbowSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_rainbow_swirl.gbapal.lz"); + const u32 gMonBackPic_AlcremieStar[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/back.4bpp.lz"); + const u32 gMonShinyPalette_AlcremieStar[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/star/star_shiny.gbapal.lz"); + + const u32 gMonFrontPic_AlcremieClover[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/front.4bpp.lz"); + const u32 gMonPalette_AlcremieCloverVanillaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_default.gbapal.lz"); + const u32 gMonPalette_AlcremieCloverRubyCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_ruby_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieCloverMatchaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_matcha_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieCloverMintCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_mint_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieCloverLemonCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_lemon_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieCloverSaltedCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_salted_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieCloverRubySwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_ruby_swirl.gbapal.lz"); + const u32 gMonPalette_AlcremieCloverCaramelSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_caramel_swirl.gbapal.lz"); + const u32 gMonPalette_AlcremieCloverRainbowSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_rainbow_swirl.gbapal.lz"); + const u32 gMonBackPic_AlcremieClover[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/back.4bpp.lz"); + const u32 gMonShinyPalette_AlcremieClover[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/clover/clover_shiny.gbapal.lz"); + + const u32 gMonFrontPic_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/front.4bpp.lz"); + const u32 gMonPalette_AlcremieFlowerVanillaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_default.gbapal.lz"); + const u32 gMonPalette_AlcremieFlowerRubyCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_ruby_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieFlowerMatchaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_matcha_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieFlowerMintCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_mint_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieFlowerLemonCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_lemon_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieFlowerSaltedCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_salted_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieFlowerRubySwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_ruby_swirl.gbapal.lz"); + const u32 gMonPalette_AlcremieFlowerCaramelSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_caramel_swirl.gbapal.lz"); + const u32 gMonPalette_AlcremieFlowerRainbowSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_rainbow_swirl.gbapal.lz"); + const u32 gMonBackPic_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/back.4bpp.lz"); + const u32 gMonShinyPalette_AlcremieFlower[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/flower/flower_shiny.gbapal.lz"); + + const u32 gMonFrontPic_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/front.4bpp.lz"); + const u32 gMonPalette_AlcremieRibbonVanillaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_default.gbapal.lz"); + const u32 gMonPalette_AlcremieRibbonRubyCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_ruby_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieRibbonMatchaCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_matcha_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieRibbonMintCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_mint_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieRibbonLemonCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_lemon_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieRibbonSaltedCream[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_salted_cream.gbapal.lz"); + const u32 gMonPalette_AlcremieRibbonRubySwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_ruby_swirl.gbapal.lz"); + const u32 gMonPalette_AlcremieRibbonCaramelSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_caramel_swirl.gbapal.lz"); + const u32 gMonPalette_AlcremieRibbonRainbowSwirl[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_rainbow_swirl.gbapal.lz"); + const u32 gMonBackPic_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/back.4bpp.lz"); + const u32 gMonShinyPalette_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/ribbon/ribbon_shiny.gbapal.lz"); #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_AlcremieGigantamax[] = INCBIN_U8("graphics/pokemon/alcremie/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/alcremie/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_AlcremieGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/alcremie/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MILCERY #if P_FAMILY_FALINKS - const u32 gMonFrontPic_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/front.4bpp.lz"); - const u32 gMonPalette_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/normal.gbapal.lz"); - const u32 gMonBackPic_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/back.4bpp.lz"); - const u32 gMonShinyPalette_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/shiny.gbapal.lz"); - const u8 gMonIcon_Falinks[] = INCBIN_U8("graphics/pokemon/falinks/icon.4bpp"); + const u32 gMonFrontPic_Falinks[] = INCBIN_U32("graphics/pokemon/gen_8/falinks/front.4bpp.lz"); + const u32 gMonPalette_Falinks[] = INCBIN_U32("graphics/pokemon/gen_8/falinks/normal.gbapal.lz"); + const u32 gMonBackPic_Falinks[] = INCBIN_U32("graphics/pokemon/gen_8/falinks/back.4bpp.lz"); + const u32 gMonShinyPalette_Falinks[] = INCBIN_U32("graphics/pokemon/gen_8/falinks/shiny.gbapal.lz"); + const u8 gMonIcon_Falinks[] = INCBIN_U8("graphics/pokemon/gen_8/falinks/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Falinks[] = INCBIN_U8("graphics/pokemon/falinks/footprint.1bpp"); + const u8 gMonFootprint_Falinks[] = INCBIN_U8("graphics/pokemon/gen_8/falinks/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_FALINKS #if P_FAMILY_PINCURCHIN - const u32 gMonFrontPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/anim_front.4bpp.lz"); - const u32 gMonPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/normal.gbapal.lz"); - const u32 gMonBackPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/back.4bpp.lz"); - const u32 gMonShinyPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/shiny.gbapal.lz"); - const u8 gMonIcon_Pincurchin[] = INCBIN_U8("graphics/pokemon/pincurchin/icon.4bpp"); + const u32 gMonFrontPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/gen_8/pincurchin/anim_front.4bpp.lz"); + const u32 gMonPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/gen_8/pincurchin/normal.gbapal.lz"); + const u32 gMonBackPic_Pincurchin[] = INCBIN_U32("graphics/pokemon/gen_8/pincurchin/back.4bpp.lz"); + const u32 gMonShinyPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/gen_8/pincurchin/shiny.gbapal.lz"); + const u8 gMonIcon_Pincurchin[] = INCBIN_U8("graphics/pokemon/gen_8/pincurchin/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Pincurchin[] = INCBIN_U8("graphics/pokemon/pincurchin/footprint.1bpp"); + const u8 gMonFootprint_Pincurchin[] = INCBIN_U8("graphics/pokemon/gen_8/pincurchin/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PINCURCHIN #if P_FAMILY_SNOM - const u32 gMonFrontPic_Snom[] = INCBIN_U32("graphics/pokemon/snom/front.4bpp.lz"); - const u32 gMonPalette_Snom[] = INCBIN_U32("graphics/pokemon/snom/normal.gbapal.lz"); - const u32 gMonBackPic_Snom[] = INCBIN_U32("graphics/pokemon/snom/back.4bpp.lz"); - const u32 gMonShinyPalette_Snom[] = INCBIN_U32("graphics/pokemon/snom/shiny.gbapal.lz"); - const u8 gMonIcon_Snom[] = INCBIN_U8("graphics/pokemon/snom/icon.4bpp"); + const u32 gMonFrontPic_Snom[] = INCBIN_U32("graphics/pokemon/gen_8/snom/front.4bpp.lz"); + const u32 gMonPalette_Snom[] = INCBIN_U32("graphics/pokemon/gen_8/snom/normal.gbapal.lz"); + const u32 gMonBackPic_Snom[] = INCBIN_U32("graphics/pokemon/gen_8/snom/back.4bpp.lz"); + const u32 gMonShinyPalette_Snom[] = INCBIN_U32("graphics/pokemon/gen_8/snom/shiny.gbapal.lz"); + const u8 gMonIcon_Snom[] = INCBIN_U8("graphics/pokemon/gen_8/snom/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Snom[] = INCBIN_U8("graphics/pokemon/snom/footprint.1bpp"); + const u8 gMonFootprint_Snom[] = INCBIN_U8("graphics/pokemon/gen_8/snom/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/front.4bpp.lz"); - const u32 gMonPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/normal.gbapal.lz"); - const u32 gMonBackPic_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/back.4bpp.lz"); - const u32 gMonShinyPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/shiny.gbapal.lz"); - const u8 gMonIcon_Frosmoth[] = INCBIN_U8("graphics/pokemon/frosmoth/icon.4bpp"); + const u32 gMonFrontPic_Frosmoth[] = INCBIN_U32("graphics/pokemon/gen_8/frosmoth/front.4bpp.lz"); + const u32 gMonPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/gen_8/frosmoth/normal.gbapal.lz"); + const u32 gMonBackPic_Frosmoth[] = INCBIN_U32("graphics/pokemon/gen_8/frosmoth/back.4bpp.lz"); + const u32 gMonShinyPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/gen_8/frosmoth/shiny.gbapal.lz"); + const u8 gMonIcon_Frosmoth[] = INCBIN_U8("graphics/pokemon/gen_8/frosmoth/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Frosmoth[] = INCBIN_U8("graphics/pokemon/frosmoth/footprint.1bpp"); + const u8 gMonFootprint_Frosmoth[] = INCBIN_U8("graphics/pokemon/gen_8/frosmoth/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SNOM #if P_FAMILY_STONJOURNER - const u32 gMonFrontPic_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/front.4bpp.lz"); - const u32 gMonPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/normal.gbapal.lz"); - const u32 gMonBackPic_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/back.4bpp.lz"); - const u32 gMonShinyPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/shiny.gbapal.lz"); - const u8 gMonIcon_Stonjourner[] = INCBIN_U8("graphics/pokemon/stonjourner/icon.4bpp"); + const u32 gMonFrontPic_Stonjourner[] = INCBIN_U32("graphics/pokemon/gen_8/stonjourner/front.4bpp.lz"); + const u32 gMonPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/gen_8/stonjourner/normal.gbapal.lz"); + const u32 gMonBackPic_Stonjourner[] = INCBIN_U32("graphics/pokemon/gen_8/stonjourner/back.4bpp.lz"); + const u32 gMonShinyPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/gen_8/stonjourner/shiny.gbapal.lz"); + const u8 gMonIcon_Stonjourner[] = INCBIN_U8("graphics/pokemon/gen_8/stonjourner/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Stonjourner[] = INCBIN_U8("graphics/pokemon/stonjourner/footprint.1bpp"); + const u8 gMonFootprint_Stonjourner[] = INCBIN_U8("graphics/pokemon/gen_8/stonjourner/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_STONJOURNER #if P_FAMILY_EISCUE - const u32 gMonFrontPic_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/front.4bpp.lz"); - const u32 gMonPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/normal.gbapal.lz"); - const u32 gMonBackPic_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/back.4bpp.lz"); - const u32 gMonShinyPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/shiny.gbapal.lz"); - const u8 gMonIcon_EiscueIceFace[] = INCBIN_U8("graphics/pokemon/eiscue/icon.4bpp"); + const u32 gMonFrontPic_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/front.4bpp.lz"); + const u32 gMonPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/normal.gbapal.lz"); + const u32 gMonBackPic_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/back.4bpp.lz"); + const u32 gMonShinyPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/shiny.gbapal.lz"); + const u8 gMonIcon_EiscueIceFace[] = INCBIN_U8("graphics/pokemon/gen_8/eiscue/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Eiscue[] = INCBIN_U8("graphics/pokemon/eiscue/footprint.1bpp"); + const u8 gMonFootprint_Eiscue[] = INCBIN_U8("graphics/pokemon/gen_8/eiscue/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/front.4bpp.lz"); - const u32 gMonPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/normal.gbapal.lz"); - const u32 gMonBackPic_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/back.4bpp.lz"); - const u32 gMonShinyPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/shiny.gbapal.lz"); - const u8 gMonIcon_EiscueNoiceFace[] = INCBIN_U8("graphics/pokemon/eiscue/noice_face/icon.4bpp"); + const u32 gMonFrontPic_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/noice_face/front.4bpp.lz"); + const u32 gMonPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/noice_face/normal.gbapal.lz"); + const u32 gMonBackPic_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/noice_face/back.4bpp.lz"); + const u32 gMonShinyPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/gen_8/eiscue/noice_face/shiny.gbapal.lz"); + const u8 gMonIcon_EiscueNoiceFace[] = INCBIN_U8("graphics/pokemon/gen_8/eiscue/noice_face/icon.4bpp"); #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE - const u32 gMonFrontPic_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/front.4bpp.lz"); - const u32 gMonPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/normal.gbapal.lz"); - const u32 gMonBackPic_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/back.4bpp.lz"); - const u32 gMonShinyPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/shiny.gbapal.lz"); - const u8 gMonIcon_IndeedeeMale[] = INCBIN_U8("graphics/pokemon/indeedee/icon.4bpp"); + const u32 gMonFrontPic_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/front.4bpp.lz"); + const u32 gMonPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/normal.gbapal.lz"); + const u32 gMonBackPic_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/back.4bpp.lz"); + const u32 gMonShinyPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/shiny.gbapal.lz"); + const u8 gMonIcon_IndeedeeMale[] = INCBIN_U8("graphics/pokemon/gen_8/indeedee/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Indeedee[] = INCBIN_U8("graphics/pokemon/indeedee/footprint.1bpp"); + const u8 gMonFootprint_Indeedee[] = INCBIN_U8("graphics/pokemon/gen_8/indeedee/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/front.4bpp.lz"); - const u32 gMonPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/normal.gbapal.lz"); - const u32 gMonBackPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/back.4bpp.lz"); - const u32 gMonShinyPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/shiny.gbapal.lz"); - const u8 gMonIcon_IndeedeeFemale[] = INCBIN_U8("graphics/pokemon/indeedee/female/icon.4bpp"); + const u32 gMonFrontPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/female/front.4bpp.lz"); + const u32 gMonPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/female/normal.gbapal.lz"); + const u32 gMonBackPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/female/back.4bpp.lz"); + const u32 gMonShinyPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/gen_8/indeedee/female/shiny.gbapal.lz"); + const u8 gMonIcon_IndeedeeFemale[] = INCBIN_U8("graphics/pokemon/gen_8/indeedee/female/icon.4bpp"); #endif //P_FAMILY_INDEEDEE #if P_FAMILY_MORPEKO - const u32 gMonFrontPic_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/front.4bpp.lz"); - const u32 gMonPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/normal.gbapal.lz"); - const u32 gMonBackPic_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/back.4bpp.lz"); - const u32 gMonShinyPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/shiny.gbapal.lz"); - const u8 gMonIcon_MorpekoFullBelly[] = INCBIN_U8("graphics/pokemon/morpeko/icon.4bpp"); + const u32 gMonFrontPic_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/front.4bpp.lz"); + const u32 gMonPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/normal.gbapal.lz"); + const u32 gMonBackPic_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/back.4bpp.lz"); + const u32 gMonShinyPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/shiny.gbapal.lz"); + const u8 gMonIcon_MorpekoFullBelly[] = INCBIN_U8("graphics/pokemon/gen_8/morpeko/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Morpeko[] = INCBIN_U8("graphics/pokemon/morpeko/footprint.1bpp"); + const u8 gMonFootprint_Morpeko[] = INCBIN_U8("graphics/pokemon/gen_8/morpeko/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/front.4bpp.lz"); - const u32 gMonPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/normal.gbapal.lz"); - const u32 gMonBackPic_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/back.4bpp.lz"); - const u32 gMonShinyPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/shiny.gbapal.lz"); - const u8 gMonIcon_MorpekoHangry[] = INCBIN_U8("graphics/pokemon/morpeko/hangry/icon.4bpp"); + const u32 gMonFrontPic_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/hangry/front.4bpp.lz"); + const u32 gMonPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/hangry/normal.gbapal.lz"); + const u32 gMonBackPic_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/hangry/back.4bpp.lz"); + const u32 gMonShinyPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/gen_8/morpeko/hangry/shiny.gbapal.lz"); + const u8 gMonIcon_MorpekoHangry[] = INCBIN_U8("graphics/pokemon/gen_8/morpeko/hangry/icon.4bpp"); #endif //P_FAMILY_MORPEKO #if P_FAMILY_CUFANT - const u32 gMonFrontPic_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/front.4bpp.lz"); - const u32 gMonPalette_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/normal.gbapal.lz"); - const u32 gMonBackPic_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/back.4bpp.lz"); - const u32 gMonShinyPalette_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/shiny.gbapal.lz"); - const u8 gMonIcon_Cufant[] = INCBIN_U8("graphics/pokemon/cufant/icon.4bpp"); + const u32 gMonFrontPic_Cufant[] = INCBIN_U32("graphics/pokemon/gen_8/cufant/front.4bpp.lz"); + const u32 gMonPalette_Cufant[] = INCBIN_U32("graphics/pokemon/gen_8/cufant/normal.gbapal.lz"); + const u32 gMonBackPic_Cufant[] = INCBIN_U32("graphics/pokemon/gen_8/cufant/back.4bpp.lz"); + const u32 gMonShinyPalette_Cufant[] = INCBIN_U32("graphics/pokemon/gen_8/cufant/shiny.gbapal.lz"); + const u8 gMonIcon_Cufant[] = INCBIN_U8("graphics/pokemon/gen_8/cufant/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Cufant[] = INCBIN_U8("graphics/pokemon/cufant/footprint.1bpp"); + const u8 gMonFootprint_Cufant[] = INCBIN_U8("graphics/pokemon/gen_8/cufant/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/front.4bpp.lz"); - const u32 gMonPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/normal.gbapal.lz"); - const u32 gMonBackPic_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/back.4bpp.lz"); - const u32 gMonShinyPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/shiny.gbapal.lz"); - const u8 gMonIcon_Copperajah[] = INCBIN_U8("graphics/pokemon/copperajah/icon.4bpp"); + const u32 gMonFrontPic_Copperajah[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/front.4bpp.lz"); + const u32 gMonPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/normal.gbapal.lz"); + const u32 gMonBackPic_Copperajah[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/back.4bpp.lz"); + const u32 gMonShinyPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/shiny.gbapal.lz"); + const u8 gMonIcon_Copperajah[] = INCBIN_U8("graphics/pokemon/gen_8/copperajah/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Copperajah[] = INCBIN_U8("graphics/pokemon/copperajah/footprint.1bpp"); + const u8 gMonFootprint_Copperajah[] = INCBIN_U8("graphics/pokemon/gen_8/copperajah/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_CopperajahGigantamax[] = INCBIN_U8("graphics/pokemon/copperajah/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/copperajah/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_CopperajahGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/copperajah/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CUFANT #if P_FAMILY_DRACOZOLT - const u32 gMonFrontPic_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/front.4bpp.lz"); - const u32 gMonPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/normal.gbapal.lz"); - const u32 gMonBackPic_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/back.4bpp.lz"); - const u32 gMonShinyPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/shiny.gbapal.lz"); - const u8 gMonIcon_Dracozolt[] = INCBIN_U8("graphics/pokemon/dracozolt/icon.4bpp"); + const u32 gMonFrontPic_Dracozolt[] = INCBIN_U32("graphics/pokemon/gen_8/dracozolt/front.4bpp.lz"); + const u32 gMonPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/gen_8/dracozolt/normal.gbapal.lz"); + const u32 gMonBackPic_Dracozolt[] = INCBIN_U32("graphics/pokemon/gen_8/dracozolt/back.4bpp.lz"); + const u32 gMonShinyPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/gen_8/dracozolt/shiny.gbapal.lz"); + const u8 gMonIcon_Dracozolt[] = INCBIN_U8("graphics/pokemon/gen_8/dracozolt/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dracozolt[] = INCBIN_U8("graphics/pokemon/dracozolt/footprint.1bpp"); + const u8 gMonFootprint_Dracozolt[] = INCBIN_U8("graphics/pokemon/gen_8/dracozolt/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DRACOZOLT #if P_FAMILY_ARCTOZOLT - const u32 gMonFrontPic_Arctozolt[] = INCBIN_U32("graphics/pokemon/arctozolt/front.4bpp.lz"); - const u32 gMonPalette_Arctozolt[] = INCBIN_U32("graphics/pokemon/arctozolt/normal.gbapal.lz"); - const u32 gMonBackPic_Arctozolt[] = INCBIN_U32("graphics/pokemon/arctozolt/back.4bpp.lz"); - const u32 gMonShinyPalette_Arctozolt[] = INCBIN_U32("graphics/pokemon/arctozolt/shiny.gbapal.lz"); - const u8 gMonIcon_Arctozolt[] = INCBIN_U8("graphics/pokemon/arctozolt/icon.4bpp"); + const u32 gMonFrontPic_Arctozolt[] = INCBIN_U32("graphics/pokemon/gen_8/arctozolt/front.4bpp.lz"); + const u32 gMonPalette_Arctozolt[] = INCBIN_U32("graphics/pokemon/gen_8/arctozolt/normal.gbapal.lz"); + const u32 gMonBackPic_Arctozolt[] = INCBIN_U32("graphics/pokemon/gen_8/arctozolt/back.4bpp.lz"); + const u32 gMonShinyPalette_Arctozolt[] = INCBIN_U32("graphics/pokemon/gen_8/arctozolt/shiny.gbapal.lz"); + const u8 gMonIcon_Arctozolt[] = INCBIN_U8("graphics/pokemon/gen_8/arctozolt/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Arctozolt[] = INCBIN_U8("graphics/pokemon/arctozolt/footprint.1bpp"); + const u8 gMonFootprint_Arctozolt[] = INCBIN_U8("graphics/pokemon/gen_8/arctozolt/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ARCTOZOLT #if P_FAMILY_DRACOVISH - const u32 gMonFrontPic_Dracovish[] = INCBIN_U32("graphics/pokemon/dracovish/front.4bpp.lz"); - const u32 gMonPalette_Dracovish[] = INCBIN_U32("graphics/pokemon/dracovish/normal.gbapal.lz"); - const u32 gMonBackPic_Dracovish[] = INCBIN_U32("graphics/pokemon/dracovish/back.4bpp.lz"); - const u32 gMonShinyPalette_Dracovish[] = INCBIN_U32("graphics/pokemon/dracovish/shiny.gbapal.lz"); - const u8 gMonIcon_Dracovish[] = INCBIN_U8("graphics/pokemon/dracovish/icon.4bpp"); + const u32 gMonFrontPic_Dracovish[] = INCBIN_U32("graphics/pokemon/gen_8/dracovish/front.4bpp.lz"); + const u32 gMonPalette_Dracovish[] = INCBIN_U32("graphics/pokemon/gen_8/dracovish/normal.gbapal.lz"); + const u32 gMonBackPic_Dracovish[] = INCBIN_U32("graphics/pokemon/gen_8/dracovish/back.4bpp.lz"); + const u32 gMonShinyPalette_Dracovish[] = INCBIN_U32("graphics/pokemon/gen_8/dracovish/shiny.gbapal.lz"); + const u8 gMonIcon_Dracovish[] = INCBIN_U8("graphics/pokemon/gen_8/dracovish/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dracovish[] = INCBIN_U8("graphics/pokemon/dracovish/footprint.1bpp"); + const u8 gMonFootprint_Dracovish[] = INCBIN_U8("graphics/pokemon/gen_8/dracovish/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DRACOVISH #if P_FAMILY_ARCTOVISH - const u32 gMonFrontPic_Arctovish[] = INCBIN_U32("graphics/pokemon/arctovish/front.4bpp.lz"); - const u32 gMonPalette_Arctovish[] = INCBIN_U32("graphics/pokemon/arctovish/normal.gbapal.lz"); - const u32 gMonBackPic_Arctovish[] = INCBIN_U32("graphics/pokemon/arctovish/back.4bpp.lz"); - const u32 gMonShinyPalette_Arctovish[] = INCBIN_U32("graphics/pokemon/arctovish/shiny.gbapal.lz"); - const u8 gMonIcon_Arctovish[] = INCBIN_U8("graphics/pokemon/arctovish/icon.4bpp"); + const u32 gMonFrontPic_Arctovish[] = INCBIN_U32("graphics/pokemon/gen_8/arctovish/front.4bpp.lz"); + const u32 gMonPalette_Arctovish[] = INCBIN_U32("graphics/pokemon/gen_8/arctovish/normal.gbapal.lz"); + const u32 gMonBackPic_Arctovish[] = INCBIN_U32("graphics/pokemon/gen_8/arctovish/back.4bpp.lz"); + const u32 gMonShinyPalette_Arctovish[] = INCBIN_U32("graphics/pokemon/gen_8/arctovish/shiny.gbapal.lz"); + const u8 gMonIcon_Arctovish[] = INCBIN_U8("graphics/pokemon/gen_8/arctovish/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Arctovish[] = INCBIN_U8("graphics/pokemon/arctovish/footprint.1bpp"); + const u8 gMonFootprint_Arctovish[] = INCBIN_U8("graphics/pokemon/gen_8/arctovish/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ARCTOVISH #if P_FAMILY_DURALUDON - const u32 gMonFrontPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/front.4bpp.lz"); - const u32 gMonPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/normal.gbapal.lz"); - const u32 gMonBackPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/back.4bpp.lz"); - const u32 gMonShinyPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/shiny.gbapal.lz"); - const u8 gMonIcon_Duraludon[] = INCBIN_U8("graphics/pokemon/duraludon/icon.4bpp"); + const u32 gMonFrontPic_Duraludon[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/front.4bpp.lz"); + const u32 gMonPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/normal.gbapal.lz"); + const u32 gMonBackPic_Duraludon[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/back.4bpp.lz"); + const u32 gMonShinyPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/shiny.gbapal.lz"); + const u8 gMonIcon_Duraludon[] = INCBIN_U8("graphics/pokemon/gen_8/duraludon/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Duraludon[] = INCBIN_U8("graphics/pokemon/duraludon/footprint.1bpp"); + const u8 gMonFootprint_Duraludon[] = INCBIN_U8("graphics/pokemon/gen_8/duraludon/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_DuraludonGigantamax[] = INCBIN_U8("graphics/pokemon/duraludon/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/gigantamax/back.4bpp.lz"); + const u32 gMonPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/duraludon/gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_DuraludonGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/duraludon/gigantamax/icon.4bpp"); #endif //P_GIGANTAMAX_FORMS #if P_GEN_9_CROSS_EVOS @@ -11586,1457 +11588,1457 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar #endif //P_FAMILY_DURALUDON #if P_FAMILY_DREEPY - const u32 gMonFrontPic_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/front.4bpp.lz"); - const u32 gMonPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/normal.gbapal.lz"); - const u32 gMonBackPic_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/back.4bpp.lz"); - const u32 gMonShinyPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/shiny.gbapal.lz"); - const u8 gMonIcon_Dreepy[] = INCBIN_U8("graphics/pokemon/dreepy/icon.4bpp"); + const u32 gMonFrontPic_Dreepy[] = INCBIN_U32("graphics/pokemon/gen_8/dreepy/front.4bpp.lz"); + const u32 gMonPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/gen_8/dreepy/normal.gbapal.lz"); + const u32 gMonBackPic_Dreepy[] = INCBIN_U32("graphics/pokemon/gen_8/dreepy/back.4bpp.lz"); + const u32 gMonShinyPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/gen_8/dreepy/shiny.gbapal.lz"); + const u8 gMonIcon_Dreepy[] = INCBIN_U8("graphics/pokemon/gen_8/dreepy/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dreepy[] = INCBIN_U8("graphics/pokemon/dreepy/footprint.1bpp"); + const u8 gMonFootprint_Dreepy[] = INCBIN_U8("graphics/pokemon/gen_8/dreepy/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/front.4bpp.lz"); - const u32 gMonPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/normal.gbapal.lz"); - const u32 gMonBackPic_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/back.4bpp.lz"); - const u32 gMonShinyPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/shiny.gbapal.lz"); - const u8 gMonIcon_Drakloak[] = INCBIN_U8("graphics/pokemon/drakloak/icon.4bpp"); + const u32 gMonFrontPic_Drakloak[] = INCBIN_U32("graphics/pokemon/gen_8/drakloak/front.4bpp.lz"); + const u32 gMonPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/gen_8/drakloak/normal.gbapal.lz"); + const u32 gMonBackPic_Drakloak[] = INCBIN_U32("graphics/pokemon/gen_8/drakloak/back.4bpp.lz"); + const u32 gMonShinyPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/gen_8/drakloak/shiny.gbapal.lz"); + const u8 gMonIcon_Drakloak[] = INCBIN_U8("graphics/pokemon/gen_8/drakloak/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Drakloak[] = INCBIN_U8("graphics/pokemon/drakloak/footprint.1bpp"); + const u8 gMonFootprint_Drakloak[] = INCBIN_U8("graphics/pokemon/gen_8/drakloak/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/front.4bpp.lz"); - const u32 gMonPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/normal.gbapal.lz"); - const u32 gMonBackPic_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/back.4bpp.lz"); - const u32 gMonShinyPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/shiny.gbapal.lz"); - const u8 gMonIcon_Dragapult[] = INCBIN_U8("graphics/pokemon/dragapult/icon.4bpp"); + const u32 gMonFrontPic_Dragapult[] = INCBIN_U32("graphics/pokemon/gen_8/dragapult/front.4bpp.lz"); + const u32 gMonPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/gen_8/dragapult/normal.gbapal.lz"); + const u32 gMonBackPic_Dragapult[] = INCBIN_U32("graphics/pokemon/gen_8/dragapult/back.4bpp.lz"); + const u32 gMonShinyPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/gen_8/dragapult/shiny.gbapal.lz"); + const u8 gMonIcon_Dragapult[] = INCBIN_U8("graphics/pokemon/gen_8/dragapult/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Dragapult[] = INCBIN_U8("graphics/pokemon/dragapult/footprint.1bpp"); + const u8 gMonFootprint_Dragapult[] = INCBIN_U8("graphics/pokemon/gen_8/dragapult/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DREEPY #if P_FAMILY_ZACIAN - const u32 gMonFrontPic_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/front.4bpp.lz"); - const u32 gMonPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/normal.gbapal.lz"); - const u32 gMonBackPic_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/back.4bpp.lz"); - const u32 gMonShinyPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/shiny.gbapal.lz"); - const u8 gMonIcon_ZacianHeroOfManyBattles[] = INCBIN_U8("graphics/pokemon/zacian/icon.4bpp"); + const u32 gMonFrontPic_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/front.4bpp.lz"); + const u32 gMonPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/normal.gbapal.lz"); + const u32 gMonBackPic_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/back.4bpp.lz"); + const u32 gMonShinyPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/shiny.gbapal.lz"); + const u8 gMonIcon_ZacianHeroOfManyBattles[] = INCBIN_U8("graphics/pokemon/gen_8/zacian/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Zacian[] = INCBIN_U8("graphics/pokemon/zacian/footprint.1bpp"); + const u8 gMonFootprint_Zacian[] = INCBIN_U8("graphics/pokemon/gen_8/zacian/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/front.4bpp.lz"); - const u32 gMonPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/normal.gbapal.lz"); - const u32 gMonBackPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/back.4bpp.lz"); - const u32 gMonShinyPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/shiny.gbapal.lz"); - const u8 gMonIcon_ZacianCrownedSword[] = INCBIN_U8("graphics/pokemon/zacian/crowned_sword/icon.4bpp"); + const u32 gMonFrontPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/crowned_sword/front.4bpp.lz"); + const u32 gMonPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/crowned_sword/normal.gbapal.lz"); + const u32 gMonBackPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/crowned_sword/back.4bpp.lz"); + const u32 gMonShinyPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/gen_8/zacian/crowned_sword/shiny.gbapal.lz"); + const u8 gMonIcon_ZacianCrownedSword[] = INCBIN_U8("graphics/pokemon/gen_8/zacian/crowned_sword/icon.4bpp"); #endif //P_FAMILY_ZACIAN #if P_FAMILY_ZAMAZENTA - const u32 gMonFrontPic_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/front.4bpp.lz"); - const u32 gMonPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/normal.gbapal.lz"); - const u32 gMonBackPic_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/back.4bpp.lz"); - const u32 gMonShinyPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/shiny.gbapal.lz"); - const u8 gMonIcon_ZamazentaHeroOfManyBattles[] = INCBIN_U8("graphics/pokemon/zamazenta/icon.4bpp"); + const u32 gMonFrontPic_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/front.4bpp.lz"); + const u32 gMonPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/normal.gbapal.lz"); + const u32 gMonBackPic_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/back.4bpp.lz"); + const u32 gMonShinyPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/shiny.gbapal.lz"); + const u8 gMonIcon_ZamazentaHeroOfManyBattles[] = INCBIN_U8("graphics/pokemon/gen_8/zamazenta/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Zamazenta[] = INCBIN_U8("graphics/pokemon/zamazenta/footprint.1bpp"); + const u8 gMonFootprint_Zamazenta[] = INCBIN_U8("graphics/pokemon/gen_8/zamazenta/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/front.4bpp.lz"); - const u32 gMonPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/normal.gbapal.lz"); - const u32 gMonBackPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/back.4bpp.lz"); - const u32 gMonShinyPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/shiny.gbapal.lz"); - const u8 gMonIcon_ZamazentaCrownedShield[] = INCBIN_U8("graphics/pokemon/zamazenta/crowned_shield/icon.4bpp"); + const u32 gMonFrontPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/crowned_shield/front.4bpp.lz"); + const u32 gMonPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/crowned_shield/normal.gbapal.lz"); + const u32 gMonBackPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/crowned_shield/back.4bpp.lz"); + const u32 gMonShinyPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/gen_8/zamazenta/crowned_shield/shiny.gbapal.lz"); + const u8 gMonIcon_ZamazentaCrownedShield[] = INCBIN_U8("graphics/pokemon/gen_8/zamazenta/crowned_shield/icon.4bpp"); #endif //P_FAMILY_ZAMAZENTA #if P_FAMILY_ETERNATUS - const u32 gMonFrontPic_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/front.4bpp.lz"); - const u32 gMonPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/normal.gbapal.lz"); - const u32 gMonBackPic_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/back.4bpp.lz"); - const u32 gMonShinyPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/shiny.gbapal.lz"); - const u8 gMonIcon_Eternatus[] = INCBIN_U8("graphics/pokemon/eternatus/icon.4bpp"); + const u32 gMonFrontPic_Eternatus[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/front.4bpp.lz"); + const u32 gMonPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/normal.gbapal.lz"); + const u32 gMonBackPic_Eternatus[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/back.4bpp.lz"); + const u32 gMonShinyPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/shiny.gbapal.lz"); + const u8 gMonIcon_Eternatus[] = INCBIN_U8("graphics/pokemon/gen_8/eternatus/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Eternatus[] = INCBIN_U8("graphics/pokemon/eternatus/footprint.1bpp"); + const u8 gMonFootprint_Eternatus[] = INCBIN_U8("graphics/pokemon/gen_8/eternatus/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/front.4bpp.lz"); - const u32 gMonPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/normal.gbapal.lz"); - const u32 gMonBackPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/back.4bpp.lz"); - const u32 gMonShinyPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/shiny.gbapal.lz"); - const u8 gMonIcon_EternatusEternamax[] = INCBIN_U8("graphics/pokemon/eternatus/eternamax/icon.4bpp"); + const u32 gMonFrontPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/eternamax/front.4bpp.lz"); + const u32 gMonPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/eternamax/normal.gbapal.lz"); + const u32 gMonBackPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/eternamax/back.4bpp.lz"); + const u32 gMonShinyPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/gen_8/eternatus/eternamax/shiny.gbapal.lz"); + const u8 gMonIcon_EternatusEternamax[] = INCBIN_U8("graphics/pokemon/gen_8/eternatus/eternamax/icon.4bpp"); #endif //P_FAMILY_ETERNATUS #if P_FAMILY_KUBFU - const u32 gMonFrontPic_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/front.4bpp.lz"); - const u32 gMonPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/normal.gbapal.lz"); - const u32 gMonBackPic_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/back.4bpp.lz"); - const u32 gMonShinyPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/shiny.gbapal.lz"); - const u8 gMonIcon_Kubfu[] = INCBIN_U8("graphics/pokemon/kubfu/icon.4bpp"); + const u32 gMonFrontPic_Kubfu[] = INCBIN_U32("graphics/pokemon/gen_8/kubfu/front.4bpp.lz"); + const u32 gMonPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/gen_8/kubfu/normal.gbapal.lz"); + const u32 gMonBackPic_Kubfu[] = INCBIN_U32("graphics/pokemon/gen_8/kubfu/back.4bpp.lz"); + const u32 gMonShinyPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/gen_8/kubfu/shiny.gbapal.lz"); + const u8 gMonIcon_Kubfu[] = INCBIN_U8("graphics/pokemon/gen_8/kubfu/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Kubfu[] = INCBIN_U8("graphics/pokemon/kubfu/footprint.1bpp"); + const u8 gMonFootprint_Kubfu[] = INCBIN_U8("graphics/pokemon/gen_8/kubfu/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/front.4bpp.lz"); - const u32 gMonPalette_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/normal.gbapal.lz"); - const u32 gMonBackPic_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/back.4bpp.lz"); - const u32 gMonShinyPalette_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/shiny.gbapal.lz"); - const u8 gMonIcon_Urshifu[] = INCBIN_U8("graphics/pokemon/urshifu/icon.4bpp"); + const u32 gMonFrontPic_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/front.4bpp.lz"); + const u32 gMonPalette_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/normal.gbapal.lz"); + const u32 gMonBackPic_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/back.4bpp.lz"); + const u32 gMonShinyPalette_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/shiny.gbapal.lz"); + const u8 gMonIcon_Urshifu[] = INCBIN_U8("graphics/pokemon/gen_8/urshifu/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Urshifu[] = INCBIN_U8("graphics/pokemon/urshifu/footprint.1bpp"); + const u8 gMonFootprint_Urshifu[] = INCBIN_U8("graphics/pokemon/gen_8/urshifu/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/front.4bpp.lz"); - const u32 gMonPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/normal.gbapal.lz"); - const u32 gMonBackPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/back.4bpp.lz"); - const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/shiny.gbapal.lz"); + const u32 gMonFrontPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style/front.4bpp.lz"); + const u32 gMonPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style/normal.gbapal.lz"); + const u32 gMonBackPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style/back.4bpp.lz"); + const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style/shiny.gbapal.lz"); - const u32 gMonFrontPic_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/back.4bpp.lz"); - const u32 gMonPalette_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U8("graphics/pokemon/urshifu/single_strike_style_gigantamax/icon.4bpp"); + const u32 gMonFrontPic_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/back.4bpp.lz"); + const u32 gMonPalette_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/urshifu/single_strike_style_gigantamax/icon.4bpp"); - const u32 gMonFrontPic_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/back.4bpp.lz"); - const u32 gMonPalette_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U8("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/icon.4bpp"); + const u32 gMonFrontPic_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/front.4bpp.lz"); + const u32 gMonBackPic_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/back.4bpp.lz"); + const u32 gMonPalette_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/normal.gbapal.lz"); + const u32 gMonShinyPalette_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/shiny.gbapal.lz"); + const u8 gMonIcon_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U8("graphics/pokemon/gen_8/urshifu/rapid_strike_style_gigantamax/icon.4bpp"); #endif //P_FAMILY_KUBFU #if P_FAMILY_ZARUDE - const u32 gMonFrontPic_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/front.4bpp.lz"); - const u32 gMonPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/normal.gbapal.lz"); - const u32 gMonBackPic_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/back.4bpp.lz"); - const u32 gMonShinyPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/shiny.gbapal.lz"); - const u8 gMonIcon_Zarude[] = INCBIN_U8("graphics/pokemon/zarude/icon.4bpp"); + const u32 gMonFrontPic_Zarude[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/front.4bpp.lz"); + const u32 gMonPalette_Zarude[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/normal.gbapal.lz"); + const u32 gMonBackPic_Zarude[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/back.4bpp.lz"); + const u32 gMonShinyPalette_Zarude[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/shiny.gbapal.lz"); + const u8 gMonIcon_Zarude[] = INCBIN_U8("graphics/pokemon/gen_8/zarude/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Zarude[] = INCBIN_U8("graphics/pokemon/zarude/footprint.1bpp"); + const u8 gMonFootprint_Zarude[] = INCBIN_U8("graphics/pokemon/gen_8/zarude/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/front.4bpp.lz"); - const u32 gMonPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/normal.gbapal.lz"); - const u32 gMonBackPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/back.4bpp.lz"); - const u32 gMonShinyPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/shiny.gbapal.lz"); - const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/zarude/dada/icon.4bpp"); + const u32 gMonFrontPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/dada/front.4bpp.lz"); + const u32 gMonPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/dada/normal.gbapal.lz"); + const u32 gMonBackPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/dada/back.4bpp.lz"); + const u32 gMonShinyPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/gen_8/zarude/dada/shiny.gbapal.lz"); + const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/gen_8/zarude/dada/icon.4bpp"); #endif //P_FAMILY_ZARUDE #if P_FAMILY_REGIELEKI - const u32 gMonFrontPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/front.4bpp.lz"); - const u32 gMonPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/normal.gbapal.lz"); - const u32 gMonBackPic_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/back.4bpp.lz"); - const u32 gMonShinyPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/shiny.gbapal.lz"); - const u8 gMonIcon_Regieleki[] = INCBIN_U8("graphics/pokemon/regieleki/icon.4bpp"); + const u32 gMonFrontPic_Regieleki[] = INCBIN_U32("graphics/pokemon/gen_8/regieleki/front.4bpp.lz"); + const u32 gMonPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/gen_8/regieleki/normal.gbapal.lz"); + const u32 gMonBackPic_Regieleki[] = INCBIN_U32("graphics/pokemon/gen_8/regieleki/back.4bpp.lz"); + const u32 gMonShinyPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/gen_8/regieleki/shiny.gbapal.lz"); + const u8 gMonIcon_Regieleki[] = INCBIN_U8("graphics/pokemon/gen_8/regieleki/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Regieleki[] = INCBIN_U8("graphics/pokemon/regieleki/footprint.1bpp"); + const u8 gMonFootprint_Regieleki[] = INCBIN_U8("graphics/pokemon/gen_8/regieleki/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_REGIELEKI #if P_FAMILY_REGIDRAGO - const u32 gMonFrontPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/front.4bpp.lz"); - const u32 gMonPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/normal.gbapal.lz"); - const u32 gMonBackPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/back.4bpp.lz"); - const u32 gMonShinyPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/shiny.gbapal.lz"); - const u8 gMonIcon_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/icon.4bpp"); + const u32 gMonFrontPic_Regidrago[] = INCBIN_U32("graphics/pokemon/gen_8/regidrago/front.4bpp.lz"); + const u32 gMonPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/gen_8/regidrago/normal.gbapal.lz"); + const u32 gMonBackPic_Regidrago[] = INCBIN_U32("graphics/pokemon/gen_8/regidrago/back.4bpp.lz"); + const u32 gMonShinyPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/gen_8/regidrago/shiny.gbapal.lz"); + const u8 gMonIcon_Regidrago[] = INCBIN_U8("graphics/pokemon/gen_8/regidrago/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/footprint.1bpp"); + const u8 gMonFootprint_Regidrago[] = INCBIN_U8("graphics/pokemon/gen_8/regidrago/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_REGIDRAGO #if P_FAMILY_GLASTRIER - const u32 gMonFrontPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/front.4bpp.lz"); - const u32 gMonPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/normal.gbapal.lz"); - const u32 gMonBackPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/back.4bpp.lz"); - const u32 gMonShinyPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/shiny.gbapal.lz"); - const u8 gMonIcon_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/icon.4bpp"); + const u32 gMonFrontPic_Glastrier[] = INCBIN_U32("graphics/pokemon/gen_8/glastrier/front.4bpp.lz"); + const u32 gMonPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/gen_8/glastrier/normal.gbapal.lz"); + const u32 gMonBackPic_Glastrier[] = INCBIN_U32("graphics/pokemon/gen_8/glastrier/back.4bpp.lz"); + const u32 gMonShinyPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/gen_8/glastrier/shiny.gbapal.lz"); + const u8 gMonIcon_Glastrier[] = INCBIN_U8("graphics/pokemon/gen_8/glastrier/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/footprint.1bpp"); + const u8 gMonFootprint_Glastrier[] = INCBIN_U8("graphics/pokemon/gen_8/glastrier/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_GLASTRIER #if P_FAMILY_SPECTRIER - const u32 gMonFrontPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/front.4bpp.lz"); - const u32 gMonPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/normal.gbapal.lz"); - const u32 gMonBackPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/back.4bpp.lz"); - const u32 gMonShinyPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/shiny.gbapal.lz"); - const u8 gMonIcon_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/icon.4bpp"); + const u32 gMonFrontPic_Spectrier[] = INCBIN_U32("graphics/pokemon/gen_8/spectrier/front.4bpp.lz"); + const u32 gMonPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/gen_8/spectrier/normal.gbapal.lz"); + const u32 gMonBackPic_Spectrier[] = INCBIN_U32("graphics/pokemon/gen_8/spectrier/back.4bpp.lz"); + const u32 gMonShinyPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/gen_8/spectrier/shiny.gbapal.lz"); + const u8 gMonIcon_Spectrier[] = INCBIN_U8("graphics/pokemon/gen_8/spectrier/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/footprint.1bpp"); + const u8 gMonFootprint_Spectrier[] = INCBIN_U8("graphics/pokemon/gen_8/spectrier/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SPECTRIER #if P_FAMILY_CALYREX - const u32 gMonFrontPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/front.4bpp.lz"); - const u32 gMonPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/normal.gbapal.lz"); - const u32 gMonBackPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/back.4bpp.lz"); - const u32 gMonShinyPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/shiny.gbapal.lz"); - const u8 gMonIcon_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/icon.4bpp"); + const u32 gMonFrontPic_Calyrex[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/front.4bpp.lz"); + const u32 gMonPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/normal.gbapal.lz"); + const u32 gMonBackPic_Calyrex[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/back.4bpp.lz"); + const u32 gMonShinyPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/shiny.gbapal.lz"); + const u8 gMonIcon_Calyrex[] = INCBIN_U8("graphics/pokemon/gen_8/calyrex/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/footprint.1bpp"); + const u8 gMonFootprint_Calyrex[] = INCBIN_U8("graphics/pokemon/gen_8/calyrex/footprint.1bpp"); #endif //P_FOOTPRINTS #if P_FUSION_FORMS - const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/front.4bpp.lz"); - const u32 gMonPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/normal.gbapal.lz"); - const u32 gMonBackPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/back.4bpp.lz"); - const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/shiny.gbapal.lz"); - const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/calyrex/ice_rider/icon.4bpp"); + const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/ice_rider/front.4bpp.lz"); + const u32 gMonPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/ice_rider/normal.gbapal.lz"); + const u32 gMonBackPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/ice_rider/back.4bpp.lz"); + const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/ice_rider/shiny.gbapal.lz"); + const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/gen_8/calyrex/ice_rider/icon.4bpp"); #endif //P_FUSION_FORMS #if P_FUSION_FORMS - const u32 gMonFrontPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/front.4bpp.lz"); - const u32 gMonPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/normal.gbapal.lz"); - const u32 gMonBackPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/back.4bpp.lz"); - const u32 gMonShinyPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/shiny.gbapal.lz"); - const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/calyrex/shadow_rider/icon.4bpp"); + const u32 gMonFrontPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/shadow_rider/front.4bpp.lz"); + const u32 gMonPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/shadow_rider/normal.gbapal.lz"); + const u32 gMonBackPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/shadow_rider/back.4bpp.lz"); + const u32 gMonShinyPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/gen_8/calyrex/shadow_rider/shiny.gbapal.lz"); + const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/gen_8/calyrex/shadow_rider/icon.4bpp"); #endif //P_FUSION_FORMS #endif //P_FAMILY_CALYREX #if P_FAMILY_SPRIGATITO - const u32 gMonFrontPic_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/front.4bpp.lz"); - const u32 gMonPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/normal.gbapal.lz"); - const u32 gMonBackPic_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/back.4bpp.lz"); - const u32 gMonShinyPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/shiny.gbapal.lz"); - const u8 gMonIcon_Sprigatito[] = INCBIN_U8("graphics/pokemon/sprigatito/icon.4bpp"); + const u32 gMonFrontPic_Sprigatito[] = INCBIN_U32("graphics/pokemon/gen_9/sprigatito/front.4bpp.lz"); + const u32 gMonPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/gen_9/sprigatito/normal.gbapal.lz"); + const u32 gMonBackPic_Sprigatito[] = INCBIN_U32("graphics/pokemon/gen_9/sprigatito/back.4bpp.lz"); + const u32 gMonShinyPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/gen_9/sprigatito/shiny.gbapal.lz"); + const u8 gMonIcon_Sprigatito[] = INCBIN_U8("graphics/pokemon/gen_9/sprigatito/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Sprigatito[] = INCBIN_U8("graphics/pokemon/sprigatito/footprint.1bpp"); + // const u8 gMonFootprint_Sprigatito[] = INCBIN_U8("graphics/pokemon/gen_9/sprigatito/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/front.4bpp.lz"); - const u32 gMonPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/normal.gbapal.lz"); - const u32 gMonBackPic_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/back.4bpp.lz"); - const u32 gMonShinyPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/shiny.gbapal.lz"); - const u8 gMonIcon_Floragato[] = INCBIN_U8("graphics/pokemon/floragato/icon.4bpp"); + const u32 gMonFrontPic_Floragato[] = INCBIN_U32("graphics/pokemon/gen_9/floragato/front.4bpp.lz"); + const u32 gMonPalette_Floragato[] = INCBIN_U32("graphics/pokemon/gen_9/floragato/normal.gbapal.lz"); + const u32 gMonBackPic_Floragato[] = INCBIN_U32("graphics/pokemon/gen_9/floragato/back.4bpp.lz"); + const u32 gMonShinyPalette_Floragato[] = INCBIN_U32("graphics/pokemon/gen_9/floragato/shiny.gbapal.lz"); + const u8 gMonIcon_Floragato[] = INCBIN_U8("graphics/pokemon/gen_9/floragato/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Floragato[] = INCBIN_U8("graphics/pokemon/floragato/footprint.1bpp"); + // const u8 gMonFootprint_Floragato[] = INCBIN_U8("graphics/pokemon/gen_9/floragato/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/front.4bpp.lz"); - const u32 gMonPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/normal.gbapal.lz"); - const u32 gMonBackPic_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/back.4bpp.lz"); - const u32 gMonShinyPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/shiny.gbapal.lz"); - const u8 gMonIcon_Meowscarada[] = INCBIN_U8("graphics/pokemon/meowscarada/icon.4bpp"); + const u32 gMonFrontPic_Meowscarada[] = INCBIN_U32("graphics/pokemon/gen_9/meowscarada/front.4bpp.lz"); + const u32 gMonPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/gen_9/meowscarada/normal.gbapal.lz"); + const u32 gMonBackPic_Meowscarada[] = INCBIN_U32("graphics/pokemon/gen_9/meowscarada/back.4bpp.lz"); + const u32 gMonShinyPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/gen_9/meowscarada/shiny.gbapal.lz"); + const u8 gMonIcon_Meowscarada[] = INCBIN_U8("graphics/pokemon/gen_9/meowscarada/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Meowscarada[] = INCBIN_U8("graphics/pokemon/meowscarada/footprint.1bpp"); + // const u8 gMonFootprint_Meowscarada[] = INCBIN_U8("graphics/pokemon/gen_9/meowscarada/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SPRIGATITO #if P_FAMILY_FUECOCO - const u32 gMonFrontPic_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/front.4bpp.lz"); - const u32 gMonPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/normal.gbapal.lz"); - const u32 gMonBackPic_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/back.4bpp.lz"); - const u32 gMonShinyPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/shiny.gbapal.lz"); - const u8 gMonIcon_Fuecoco[] = INCBIN_U8("graphics/pokemon/fuecoco/icon.4bpp"); + const u32 gMonFrontPic_Fuecoco[] = INCBIN_U32("graphics/pokemon/gen_9/fuecoco/front.4bpp.lz"); + const u32 gMonPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/gen_9/fuecoco/normal.gbapal.lz"); + const u32 gMonBackPic_Fuecoco[] = INCBIN_U32("graphics/pokemon/gen_9/fuecoco/back.4bpp.lz"); + const u32 gMonShinyPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/gen_9/fuecoco/shiny.gbapal.lz"); + const u8 gMonIcon_Fuecoco[] = INCBIN_U8("graphics/pokemon/gen_9/fuecoco/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Fuecoco[] = INCBIN_U8("graphics/pokemon/fuecoco/footprint.1bpp"); + // const u8 gMonFootprint_Fuecoco[] = INCBIN_U8("graphics/pokemon/gen_9/fuecoco/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/front.4bpp.lz"); - const u32 gMonPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/normal.gbapal.lz"); - const u32 gMonBackPic_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/back.4bpp.lz"); - const u32 gMonShinyPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/shiny.gbapal.lz"); - const u8 gMonIcon_Crocalor[] = INCBIN_U8("graphics/pokemon/crocalor/icon.4bpp"); + const u32 gMonFrontPic_Crocalor[] = INCBIN_U32("graphics/pokemon/gen_9/crocalor/front.4bpp.lz"); + const u32 gMonPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/gen_9/crocalor/normal.gbapal.lz"); + const u32 gMonBackPic_Crocalor[] = INCBIN_U32("graphics/pokemon/gen_9/crocalor/back.4bpp.lz"); + const u32 gMonShinyPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/gen_9/crocalor/shiny.gbapal.lz"); + const u8 gMonIcon_Crocalor[] = INCBIN_U8("graphics/pokemon/gen_9/crocalor/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Crocalor[] = INCBIN_U8("graphics/pokemon/crocalor/footprint.1bpp"); + // const u8 gMonFootprint_Crocalor[] = INCBIN_U8("graphics/pokemon/gen_9/crocalor/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/front.4bpp.lz"); - const u32 gMonPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/normal.gbapal.lz"); - const u32 gMonBackPic_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/back.4bpp.lz"); - const u32 gMonShinyPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/shiny.gbapal.lz"); - const u8 gMonIcon_Skeledirge[] = INCBIN_U8("graphics/pokemon/skeledirge/icon.4bpp"); + const u32 gMonFrontPic_Skeledirge[] = INCBIN_U32("graphics/pokemon/gen_9/skeledirge/front.4bpp.lz"); + const u32 gMonPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/gen_9/skeledirge/normal.gbapal.lz"); + const u32 gMonBackPic_Skeledirge[] = INCBIN_U32("graphics/pokemon/gen_9/skeledirge/back.4bpp.lz"); + const u32 gMonShinyPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/gen_9/skeledirge/shiny.gbapal.lz"); + const u8 gMonIcon_Skeledirge[] = INCBIN_U8("graphics/pokemon/gen_9/skeledirge/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Skeledirge[] = INCBIN_U8("graphics/pokemon/skeledirge/footprint.1bpp"); + // const u8 gMonFootprint_Skeledirge[] = INCBIN_U8("graphics/pokemon/gen_9/skeledirge/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_FUECOCO #if P_FAMILY_QUAXLY - const u32 gMonFrontPic_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/front.4bpp.lz"); - const u32 gMonPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/normal.gbapal.lz"); - const u32 gMonBackPic_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/back.4bpp.lz"); - const u32 gMonShinyPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/shiny.gbapal.lz"); - const u8 gMonIcon_Quaxly[] = INCBIN_U8("graphics/pokemon/quaxly/icon.4bpp"); + const u32 gMonFrontPic_Quaxly[] = INCBIN_U32("graphics/pokemon/gen_9/quaxly/front.4bpp.lz"); + const u32 gMonPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/gen_9/quaxly/normal.gbapal.lz"); + const u32 gMonBackPic_Quaxly[] = INCBIN_U32("graphics/pokemon/gen_9/quaxly/back.4bpp.lz"); + const u32 gMonShinyPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/gen_9/quaxly/shiny.gbapal.lz"); + const u8 gMonIcon_Quaxly[] = INCBIN_U8("graphics/pokemon/gen_9/quaxly/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Quaxly[] = INCBIN_U8("graphics/pokemon/quaxly/footprint.1bpp"); + // const u8 gMonFootprint_Quaxly[] = INCBIN_U8("graphics/pokemon/gen_9/quaxly/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/front.4bpp.lz"); - const u32 gMonPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/normal.gbapal.lz"); - const u32 gMonBackPic_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/back.4bpp.lz"); - const u32 gMonShinyPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/shiny.gbapal.lz"); - const u8 gMonIcon_Quaxwell[] = INCBIN_U8("graphics/pokemon/quaxwell/icon.4bpp"); + const u32 gMonFrontPic_Quaxwell[] = INCBIN_U32("graphics/pokemon/gen_9/quaxwell/front.4bpp.lz"); + const u32 gMonPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/gen_9/quaxwell/normal.gbapal.lz"); + const u32 gMonBackPic_Quaxwell[] = INCBIN_U32("graphics/pokemon/gen_9/quaxwell/back.4bpp.lz"); + const u32 gMonShinyPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/gen_9/quaxwell/shiny.gbapal.lz"); + const u8 gMonIcon_Quaxwell[] = INCBIN_U8("graphics/pokemon/gen_9/quaxwell/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Quaxwell[] = INCBIN_U8("graphics/pokemon/quaxwell/footprint.1bpp"); + // const u8 gMonFootprint_Quaxwell[] = INCBIN_U8("graphics/pokemon/gen_9/quaxwell/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/front.4bpp.lz"); - const u32 gMonPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/normal.gbapal.lz"); - const u32 gMonBackPic_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/back.4bpp.lz"); - const u32 gMonShinyPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/shiny.gbapal.lz"); - const u8 gMonIcon_Quaquaval[] = INCBIN_U8("graphics/pokemon/quaquaval/icon.4bpp"); + const u32 gMonFrontPic_Quaquaval[] = INCBIN_U32("graphics/pokemon/gen_9/quaquaval/front.4bpp.lz"); + const u32 gMonPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/gen_9/quaquaval/normal.gbapal.lz"); + const u32 gMonBackPic_Quaquaval[] = INCBIN_U32("graphics/pokemon/gen_9/quaquaval/back.4bpp.lz"); + const u32 gMonShinyPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/gen_9/quaquaval/shiny.gbapal.lz"); + const u8 gMonIcon_Quaquaval[] = INCBIN_U8("graphics/pokemon/gen_9/quaquaval/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Quaquaval[] = INCBIN_U8("graphics/pokemon/quaquaval/footprint.1bpp"); + // const u8 gMonFootprint_Quaquaval[] = INCBIN_U8("graphics/pokemon/gen_9/quaquaval/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_QUAXLY #if P_FAMILY_LECHONK - const u32 gMonFrontPic_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/front.4bpp.lz"); - const u32 gMonPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/normal.gbapal.lz"); - const u32 gMonBackPic_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/back.4bpp.lz"); - const u32 gMonShinyPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/shiny.gbapal.lz"); - const u8 gMonIcon_Lechonk[] = INCBIN_U8("graphics/pokemon/lechonk/icon.4bpp"); + const u32 gMonFrontPic_Lechonk[] = INCBIN_U32("graphics/pokemon/gen_9/lechonk/front.4bpp.lz"); + const u32 gMonPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/gen_9/lechonk/normal.gbapal.lz"); + const u32 gMonBackPic_Lechonk[] = INCBIN_U32("graphics/pokemon/gen_9/lechonk/back.4bpp.lz"); + const u32 gMonShinyPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/gen_9/lechonk/shiny.gbapal.lz"); + const u8 gMonIcon_Lechonk[] = INCBIN_U8("graphics/pokemon/gen_9/lechonk/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Lechonk[] = INCBIN_U8("graphics/pokemon/lechonk/footprint.1bpp"); + // const u8 gMonFootprint_Lechonk[] = INCBIN_U8("graphics/pokemon/gen_9/lechonk/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/front.4bpp.lz"); - const u32 gMonPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/normal.gbapal.lz"); - const u32 gMonBackPic_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/back.4bpp.lz"); - const u32 gMonShinyPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/shiny.gbapal.lz"); - const u8 gMonIcon_OinkologneMale[] = INCBIN_U8("graphics/pokemon/oinkologne/icon.4bpp"); + const u32 gMonFrontPic_OinkologneMale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/front.4bpp.lz"); + const u32 gMonPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/normal.gbapal.lz"); + const u32 gMonBackPic_OinkologneMale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/back.4bpp.lz"); + const u32 gMonShinyPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/shiny.gbapal.lz"); + const u8 gMonIcon_OinkologneMale[] = INCBIN_U8("graphics/pokemon/gen_9/oinkologne/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Oinkologne[] = INCBIN_U8("graphics/pokemon/oinkologne/footprint.1bpp"); + // const u8 gMonFootprint_Oinkologne[] = INCBIN_U8("graphics/pokemon/gen_9/oinkologne/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/front.4bpp.lz"); - const u32 gMonPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/normal.gbapal.lz"); - const u32 gMonBackPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/back.4bpp.lz"); - const u32 gMonShinyPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/shiny.gbapal.lz"); - const u8 gMonIcon_OinkologneFemale[] = INCBIN_U8("graphics/pokemon/oinkologne/female/icon.4bpp"); + const u32 gMonFrontPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/female/front.4bpp.lz"); + const u32 gMonPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/female/normal.gbapal.lz"); + const u32 gMonBackPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/female/back.4bpp.lz"); + const u32 gMonShinyPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/gen_9/oinkologne/female/shiny.gbapal.lz"); + const u8 gMonIcon_OinkologneFemale[] = INCBIN_U8("graphics/pokemon/gen_9/oinkologne/female/icon.4bpp"); #endif //P_FAMILY_LECHONK #if P_FAMILY_TAROUNTULA - const u32 gMonFrontPic_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/front.4bpp.lz"); - const u32 gMonPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/normal.gbapal.lz"); - const u32 gMonBackPic_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/back.4bpp.lz"); - const u32 gMonShinyPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/shiny.gbapal.lz"); - const u8 gMonIcon_Tarountula[] = INCBIN_U8("graphics/pokemon/tarountula/icon.4bpp"); + const u32 gMonFrontPic_Tarountula[] = INCBIN_U32("graphics/pokemon/gen_9/tarountula/front.4bpp.lz"); + const u32 gMonPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/gen_9/tarountula/normal.gbapal.lz"); + const u32 gMonBackPic_Tarountula[] = INCBIN_U32("graphics/pokemon/gen_9/tarountula/back.4bpp.lz"); + const u32 gMonShinyPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/gen_9/tarountula/shiny.gbapal.lz"); + const u8 gMonIcon_Tarountula[] = INCBIN_U8("graphics/pokemon/gen_9/tarountula/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Tarountula[] = INCBIN_U8("graphics/pokemon/tarountula/footprint.1bpp"); + // const u8 gMonFootprint_Tarountula[] = INCBIN_U8("graphics/pokemon/gen_9/tarountula/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/front.4bpp.lz"); - const u32 gMonPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/normal.gbapal.lz"); - const u32 gMonBackPic_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/back.4bpp.lz"); - const u32 gMonShinyPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/shiny.gbapal.lz"); - const u8 gMonIcon_Spidops[] = INCBIN_U8("graphics/pokemon/spidops/icon.4bpp"); + const u32 gMonFrontPic_Spidops[] = INCBIN_U32("graphics/pokemon/gen_9/spidops/front.4bpp.lz"); + const u32 gMonPalette_Spidops[] = INCBIN_U32("graphics/pokemon/gen_9/spidops/normal.gbapal.lz"); + const u32 gMonBackPic_Spidops[] = INCBIN_U32("graphics/pokemon/gen_9/spidops/back.4bpp.lz"); + const u32 gMonShinyPalette_Spidops[] = INCBIN_U32("graphics/pokemon/gen_9/spidops/shiny.gbapal.lz"); + const u8 gMonIcon_Spidops[] = INCBIN_U8("graphics/pokemon/gen_9/spidops/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Spidops[] = INCBIN_U8("graphics/pokemon/spidops/footprint.1bpp"); + // const u8 gMonFootprint_Spidops[] = INCBIN_U8("graphics/pokemon/gen_9/spidops/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TAROUNTULA #if P_FAMILY_NYMBLE - const u32 gMonFrontPic_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/front.4bpp.lz"); - const u32 gMonPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/normal.gbapal.lz"); - const u32 gMonBackPic_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/back.4bpp.lz"); - const u32 gMonShinyPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/shiny.gbapal.lz"); - const u8 gMonIcon_Nymble[] = INCBIN_U8("graphics/pokemon/nymble/icon.4bpp"); + const u32 gMonFrontPic_Nymble[] = INCBIN_U32("graphics/pokemon/gen_9/nymble/front.4bpp.lz"); + const u32 gMonPalette_Nymble[] = INCBIN_U32("graphics/pokemon/gen_9/nymble/normal.gbapal.lz"); + const u32 gMonBackPic_Nymble[] = INCBIN_U32("graphics/pokemon/gen_9/nymble/back.4bpp.lz"); + const u32 gMonShinyPalette_Nymble[] = INCBIN_U32("graphics/pokemon/gen_9/nymble/shiny.gbapal.lz"); + const u8 gMonIcon_Nymble[] = INCBIN_U8("graphics/pokemon/gen_9/nymble/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Nymble[] = INCBIN_U8("graphics/pokemon/nymble/footprint.1bpp"); + // const u8 gMonFootprint_Nymble[] = INCBIN_U8("graphics/pokemon/gen_9/nymble/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/front.4bpp.lz"); - const u32 gMonPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/normal.gbapal.lz"); - const u32 gMonBackPic_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/back.4bpp.lz"); - const u32 gMonShinyPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/shiny.gbapal.lz"); - const u8 gMonIcon_Lokix[] = INCBIN_U8("graphics/pokemon/lokix/icon.4bpp"); + const u32 gMonFrontPic_Lokix[] = INCBIN_U32("graphics/pokemon/gen_9/lokix/front.4bpp.lz"); + const u32 gMonPalette_Lokix[] = INCBIN_U32("graphics/pokemon/gen_9/lokix/normal.gbapal.lz"); + const u32 gMonBackPic_Lokix[] = INCBIN_U32("graphics/pokemon/gen_9/lokix/back.4bpp.lz"); + const u32 gMonShinyPalette_Lokix[] = INCBIN_U32("graphics/pokemon/gen_9/lokix/shiny.gbapal.lz"); + const u8 gMonIcon_Lokix[] = INCBIN_U8("graphics/pokemon/gen_9/lokix/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Lokix[] = INCBIN_U8("graphics/pokemon/lokix/footprint.1bpp"); + // const u8 gMonFootprint_Lokix[] = INCBIN_U8("graphics/pokemon/gen_9/lokix/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_NYMBLE #if P_FAMILY_PAWMI - const u32 gMonFrontPic_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/front.4bpp.lz"); - const u32 gMonPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/normal.gbapal.lz"); - const u32 gMonBackPic_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/back.4bpp.lz"); - const u32 gMonShinyPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/shiny.gbapal.lz"); - const u8 gMonIcon_Pawmi[] = INCBIN_U8("graphics/pokemon/pawmi/icon.4bpp"); + const u32 gMonFrontPic_Pawmi[] = INCBIN_U32("graphics/pokemon/gen_9/pawmi/front.4bpp.lz"); + const u32 gMonPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/gen_9/pawmi/normal.gbapal.lz"); + const u32 gMonBackPic_Pawmi[] = INCBIN_U32("graphics/pokemon/gen_9/pawmi/back.4bpp.lz"); + const u32 gMonShinyPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/gen_9/pawmi/shiny.gbapal.lz"); + const u8 gMonIcon_Pawmi[] = INCBIN_U8("graphics/pokemon/gen_9/pawmi/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Pawmi[] = INCBIN_U8("graphics/pokemon/pawmi/footprint.1bpp"); + // const u8 gMonFootprint_Pawmi[] = INCBIN_U8("graphics/pokemon/gen_9/pawmi/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/front.4bpp.lz"); - const u32 gMonPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/normal.gbapal.lz"); - const u32 gMonBackPic_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/back.4bpp.lz"); - const u32 gMonShinyPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/shiny.gbapal.lz"); - const u8 gMonIcon_Pawmo[] = INCBIN_U8("graphics/pokemon/pawmo/icon.4bpp"); + const u32 gMonFrontPic_Pawmo[] = INCBIN_U32("graphics/pokemon/gen_9/pawmo/front.4bpp.lz"); + const u32 gMonPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/gen_9/pawmo/normal.gbapal.lz"); + const u32 gMonBackPic_Pawmo[] = INCBIN_U32("graphics/pokemon/gen_9/pawmo/back.4bpp.lz"); + const u32 gMonShinyPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/gen_9/pawmo/shiny.gbapal.lz"); + const u8 gMonIcon_Pawmo[] = INCBIN_U8("graphics/pokemon/gen_9/pawmo/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Pawmo[] = INCBIN_U8("graphics/pokemon/pawmo/footprint.1bpp"); + // const u8 gMonFootprint_Pawmo[] = INCBIN_U8("graphics/pokemon/gen_9/pawmo/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/front.4bpp.lz"); - const u32 gMonPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/normal.gbapal.lz"); - const u32 gMonBackPic_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/back.4bpp.lz"); - const u32 gMonShinyPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/shiny.gbapal.lz"); - const u8 gMonIcon_Pawmot[] = INCBIN_U8("graphics/pokemon/pawmot/icon.4bpp"); + const u32 gMonFrontPic_Pawmot[] = INCBIN_U32("graphics/pokemon/gen_9/pawmot/front.4bpp.lz"); + const u32 gMonPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/gen_9/pawmot/normal.gbapal.lz"); + const u32 gMonBackPic_Pawmot[] = INCBIN_U32("graphics/pokemon/gen_9/pawmot/back.4bpp.lz"); + const u32 gMonShinyPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/gen_9/pawmot/shiny.gbapal.lz"); + const u8 gMonIcon_Pawmot[] = INCBIN_U8("graphics/pokemon/gen_9/pawmot/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Pawmot[] = INCBIN_U8("graphics/pokemon/pawmot/footprint.1bpp"); + // const u8 gMonFootprint_Pawmot[] = INCBIN_U8("graphics/pokemon/gen_9/pawmot/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PAWMI #if P_FAMILY_TANDEMAUS - const u32 gMonFrontPic_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/front.4bpp.lz"); - const u32 gMonPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/normal.gbapal.lz"); - const u32 gMonBackPic_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/back.4bpp.lz"); - const u32 gMonShinyPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/shiny.gbapal.lz"); - const u8 gMonIcon_Tandemaus[] = INCBIN_U8("graphics/pokemon/tandemaus/icon.4bpp"); + const u32 gMonFrontPic_Tandemaus[] = INCBIN_U32("graphics/pokemon/gen_9/tandemaus/front.4bpp.lz"); + const u32 gMonPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/gen_9/tandemaus/normal.gbapal.lz"); + const u32 gMonBackPic_Tandemaus[] = INCBIN_U32("graphics/pokemon/gen_9/tandemaus/back.4bpp.lz"); + const u32 gMonShinyPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/gen_9/tandemaus/shiny.gbapal.lz"); + const u8 gMonIcon_Tandemaus[] = INCBIN_U8("graphics/pokemon/gen_9/tandemaus/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Tandemaus[] = INCBIN_U8("graphics/pokemon/tandemaus/footprint.1bpp"); + // const u8 gMonFootprint_Tandemaus[] = INCBIN_U8("graphics/pokemon/gen_9/tandemaus/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/normal.gbapal.lz"); - const u32 gMonShinyPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/shiny.gbapal.lz"); + const u32 gMonPalette_Maushold[] = INCBIN_U32("graphics/pokemon/gen_9/maushold/normal.gbapal.lz"); + const u32 gMonShinyPalette_Maushold[] = INCBIN_U32("graphics/pokemon/gen_9/maushold/shiny.gbapal.lz"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Maushold[] = INCBIN_U8("graphics/pokemon/maushold/footprint.1bpp"); + // const u8 gMonFootprint_Maushold[] = INCBIN_U8("graphics/pokemon/gen_9/maushold/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/front.4bpp.lz"); - const u32 gMonBackPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/back.4bpp.lz"); - const u8 gMonIcon_MausholdFamilyOfThree[] = INCBIN_U8("graphics/pokemon/maushold/icon.4bpp"); + const u32 gMonFrontPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/gen_9/maushold/front.4bpp.lz"); + const u32 gMonBackPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/gen_9/maushold/back.4bpp.lz"); + const u8 gMonIcon_MausholdFamilyOfThree[] = INCBIN_U8("graphics/pokemon/gen_9/maushold/icon.4bpp"); - const u32 gMonFrontPic_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/front.4bpp.lz"); - const u32 gMonBackPic_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/back.4bpp.lz"); - const u8 gMonIcon_MausholdFamilyOfFour[] = INCBIN_U8("graphics/pokemon/maushold/four/icon.4bpp"); + const u32 gMonFrontPic_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/gen_9/maushold/four/front.4bpp.lz"); + const u32 gMonBackPic_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/gen_9/maushold/four/back.4bpp.lz"); + const u8 gMonIcon_MausholdFamilyOfFour[] = INCBIN_U8("graphics/pokemon/gen_9/maushold/four/icon.4bpp"); #endif //P_FAMILY_TANDEMAUS #if P_FAMILY_FIDOUGH - const u32 gMonFrontPic_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/front.4bpp.lz"); - const u32 gMonPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/normal.gbapal.lz"); - const u32 gMonBackPic_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/back.4bpp.lz"); - const u32 gMonShinyPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/shiny.gbapal.lz"); - const u8 gMonIcon_Fidough[] = INCBIN_U8("graphics/pokemon/fidough/icon.4bpp"); + const u32 gMonFrontPic_Fidough[] = INCBIN_U32("graphics/pokemon/gen_9/fidough/front.4bpp.lz"); + const u32 gMonPalette_Fidough[] = INCBIN_U32("graphics/pokemon/gen_9/fidough/normal.gbapal.lz"); + const u32 gMonBackPic_Fidough[] = INCBIN_U32("graphics/pokemon/gen_9/fidough/back.4bpp.lz"); + const u32 gMonShinyPalette_Fidough[] = INCBIN_U32("graphics/pokemon/gen_9/fidough/shiny.gbapal.lz"); + const u8 gMonIcon_Fidough[] = INCBIN_U8("graphics/pokemon/gen_9/fidough/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Fidough[] = INCBIN_U8("graphics/pokemon/fidough/footprint.1bpp"); + // const u8 gMonFootprint_Fidough[] = INCBIN_U8("graphics/pokemon/gen_9/fidough/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/front.4bpp.lz"); - const u32 gMonPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/normal.gbapal.lz"); - const u32 gMonBackPic_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/back.4bpp.lz"); - const u32 gMonShinyPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/shiny.gbapal.lz"); - const u8 gMonIcon_Dachsbun[] = INCBIN_U8("graphics/pokemon/dachsbun/icon.4bpp"); + const u32 gMonFrontPic_Dachsbun[] = INCBIN_U32("graphics/pokemon/gen_9/dachsbun/front.4bpp.lz"); + const u32 gMonPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/gen_9/dachsbun/normal.gbapal.lz"); + const u32 gMonBackPic_Dachsbun[] = INCBIN_U32("graphics/pokemon/gen_9/dachsbun/back.4bpp.lz"); + const u32 gMonShinyPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/gen_9/dachsbun/shiny.gbapal.lz"); + const u8 gMonIcon_Dachsbun[] = INCBIN_U8("graphics/pokemon/gen_9/dachsbun/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Dachsbun[] = INCBIN_U8("graphics/pokemon/dachsbun/footprint.1bpp"); + // const u8 gMonFootprint_Dachsbun[] = INCBIN_U8("graphics/pokemon/gen_9/dachsbun/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_FIDOUGH #if P_FAMILY_SMOLIV - const u32 gMonFrontPic_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/front.4bpp.lz"); - const u32 gMonPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/normal.gbapal.lz"); - const u32 gMonBackPic_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/back.4bpp.lz"); - const u32 gMonShinyPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/shiny.gbapal.lz"); - const u8 gMonIcon_Smoliv[] = INCBIN_U8("graphics/pokemon/smoliv/icon.4bpp"); + const u32 gMonFrontPic_Smoliv[] = INCBIN_U32("graphics/pokemon/gen_9/smoliv/front.4bpp.lz"); + const u32 gMonPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/gen_9/smoliv/normal.gbapal.lz"); + const u32 gMonBackPic_Smoliv[] = INCBIN_U32("graphics/pokemon/gen_9/smoliv/back.4bpp.lz"); + const u32 gMonShinyPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/gen_9/smoliv/shiny.gbapal.lz"); + const u8 gMonIcon_Smoliv[] = INCBIN_U8("graphics/pokemon/gen_9/smoliv/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Smoliv[] = INCBIN_U8("graphics/pokemon/smoliv/footprint.1bpp"); + // const u8 gMonFootprint_Smoliv[] = INCBIN_U8("graphics/pokemon/gen_9/smoliv/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/front.4bpp.lz"); - const u32 gMonPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/normal.gbapal.lz"); - const u32 gMonBackPic_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/back.4bpp.lz"); - const u32 gMonShinyPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/shiny.gbapal.lz"); - const u8 gMonIcon_Dolliv[] = INCBIN_U8("graphics/pokemon/dolliv/icon.4bpp"); + const u32 gMonFrontPic_Dolliv[] = INCBIN_U32("graphics/pokemon/gen_9/dolliv/front.4bpp.lz"); + const u32 gMonPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/gen_9/dolliv/normal.gbapal.lz"); + const u32 gMonBackPic_Dolliv[] = INCBIN_U32("graphics/pokemon/gen_9/dolliv/back.4bpp.lz"); + const u32 gMonShinyPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/gen_9/dolliv/shiny.gbapal.lz"); + const u8 gMonIcon_Dolliv[] = INCBIN_U8("graphics/pokemon/gen_9/dolliv/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Dolliv[] = INCBIN_U8("graphics/pokemon/dolliv/footprint.1bpp"); + // const u8 gMonFootprint_Dolliv[] = INCBIN_U8("graphics/pokemon/gen_9/dolliv/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/front.4bpp.lz"); - const u32 gMonPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/normal.gbapal.lz"); - const u32 gMonBackPic_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/back.4bpp.lz"); - const u32 gMonShinyPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/shiny.gbapal.lz"); - const u8 gMonIcon_Arboliva[] = INCBIN_U8("graphics/pokemon/arboliva/icon.4bpp"); + const u32 gMonFrontPic_Arboliva[] = INCBIN_U32("graphics/pokemon/gen_9/arboliva/front.4bpp.lz"); + const u32 gMonPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/gen_9/arboliva/normal.gbapal.lz"); + const u32 gMonBackPic_Arboliva[] = INCBIN_U32("graphics/pokemon/gen_9/arboliva/back.4bpp.lz"); + const u32 gMonShinyPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/gen_9/arboliva/shiny.gbapal.lz"); + const u8 gMonIcon_Arboliva[] = INCBIN_U8("graphics/pokemon/gen_9/arboliva/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Arboliva[] = INCBIN_U8("graphics/pokemon/arboliva/footprint.1bpp"); + // const u8 gMonFootprint_Arboliva[] = INCBIN_U8("graphics/pokemon/gen_9/arboliva/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SMOLIV #if P_FAMILY_SQUAWKABILLY - const u32 gMonFrontPic_Squawkabilly[] = INCBIN_U32("graphics/pokemon/squawkabilly/front.4bpp.lz"); - const u32 gMonBackPic_Squawkabilly[] = INCBIN_U32("graphics/pokemon/squawkabilly/back.4bpp.lz"); + const u32 gMonFrontPic_Squawkabilly[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/front.4bpp.lz"); + const u32 gMonBackPic_Squawkabilly[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/back.4bpp.lz"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Squawkabilly[] = INCBIN_U8("graphics/pokemon/squawkabilly/footprint.1bpp"); + // const u8 gMonFootprint_Squawkabilly[] = INCBIN_U8("graphics/pokemon/gen_9/squawkabilly/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/normal.gbapal.lz"); - const u32 gMonShinyPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/shiny.gbapal.lz"); - const u8 gMonIcon_SquawkabillyGreenPlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/green_plumage/icon.4bpp"); + const u32 gMonPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/green_plumage/normal.gbapal.lz"); + const u32 gMonShinyPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/green_plumage/shiny.gbapal.lz"); + const u8 gMonIcon_SquawkabillyGreenPlumage[] = INCBIN_U8("graphics/pokemon/gen_9/squawkabilly/green_plumage/icon.4bpp"); - const u32 gMonPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/normal.gbapal.lz"); - const u32 gMonShinyPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/shiny.gbapal.lz"); - const u8 gMonIcon_SquawkabillyBluePlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/blue_plumage/icon.4bpp"); + const u32 gMonPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/blue_plumage/normal.gbapal.lz"); + const u32 gMonShinyPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/blue_plumage/shiny.gbapal.lz"); + const u8 gMonIcon_SquawkabillyBluePlumage[] = INCBIN_U8("graphics/pokemon/gen_9/squawkabilly/blue_plumage/icon.4bpp"); - const u32 gMonPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/normal.gbapal.lz"); - const u32 gMonShinyPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/shiny.gbapal.lz"); - const u8 gMonIcon_SquawkabillyYellowPlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/yellow_plumage/icon.4bpp"); + const u32 gMonPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/yellow_plumage/normal.gbapal.lz"); + const u32 gMonShinyPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/yellow_plumage/shiny.gbapal.lz"); + const u8 gMonIcon_SquawkabillyYellowPlumage[] = INCBIN_U8("graphics/pokemon/gen_9/squawkabilly/yellow_plumage/icon.4bpp"); - const u32 gMonPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/normal.gbapal.lz"); - const u32 gMonShinyPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/shiny.gbapal.lz"); - const u8 gMonIcon_SquawkabillyWhitePlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/white_plumage/icon.4bpp"); + const u32 gMonPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/white_plumage/normal.gbapal.lz"); + const u32 gMonShinyPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/gen_9/squawkabilly/white_plumage/shiny.gbapal.lz"); + const u8 gMonIcon_SquawkabillyWhitePlumage[] = INCBIN_U8("graphics/pokemon/gen_9/squawkabilly/white_plumage/icon.4bpp"); #endif //P_FAMILY_SQUAWKABILLY #if P_FAMILY_NACLI - const u32 gMonFrontPic_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/front.4bpp.lz"); - const u32 gMonPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/normal.gbapal.lz"); - const u32 gMonBackPic_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/back.4bpp.lz"); - const u32 gMonShinyPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/shiny.gbapal.lz"); - const u8 gMonIcon_Nacli[] = INCBIN_U8("graphics/pokemon/nacli/icon.4bpp"); + const u32 gMonFrontPic_Nacli[] = INCBIN_U32("graphics/pokemon/gen_9/nacli/front.4bpp.lz"); + const u32 gMonPalette_Nacli[] = INCBIN_U32("graphics/pokemon/gen_9/nacli/normal.gbapal.lz"); + const u32 gMonBackPic_Nacli[] = INCBIN_U32("graphics/pokemon/gen_9/nacli/back.4bpp.lz"); + const u32 gMonShinyPalette_Nacli[] = INCBIN_U32("graphics/pokemon/gen_9/nacli/shiny.gbapal.lz"); + const u8 gMonIcon_Nacli[] = INCBIN_U8("graphics/pokemon/gen_9/nacli/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Nacli[] = INCBIN_U8("graphics/pokemon/nacli/footprint.1bpp"); + // const u8 gMonFootprint_Nacli[] = INCBIN_U8("graphics/pokemon/gen_9/nacli/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/front.4bpp.lz"); - const u32 gMonPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/normal.gbapal.lz"); - const u32 gMonBackPic_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/back.4bpp.lz"); - const u32 gMonShinyPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/shiny.gbapal.lz"); - const u8 gMonIcon_Naclstack[] = INCBIN_U8("graphics/pokemon/naclstack/icon.4bpp"); + const u32 gMonFrontPic_Naclstack[] = INCBIN_U32("graphics/pokemon/gen_9/naclstack/front.4bpp.lz"); + const u32 gMonPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/gen_9/naclstack/normal.gbapal.lz"); + const u32 gMonBackPic_Naclstack[] = INCBIN_U32("graphics/pokemon/gen_9/naclstack/back.4bpp.lz"); + const u32 gMonShinyPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/gen_9/naclstack/shiny.gbapal.lz"); + const u8 gMonIcon_Naclstack[] = INCBIN_U8("graphics/pokemon/gen_9/naclstack/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Naclstack[] = INCBIN_U8("graphics/pokemon/naclstack/footprint.1bpp"); + // const u8 gMonFootprint_Naclstack[] = INCBIN_U8("graphics/pokemon/gen_9/naclstack/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/front.4bpp.lz"); - const u32 gMonPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/normal.gbapal.lz"); - const u32 gMonBackPic_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/back.4bpp.lz"); - const u32 gMonShinyPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/shiny.gbapal.lz"); - const u8 gMonIcon_Garganacl[] = INCBIN_U8("graphics/pokemon/garganacl/icon.4bpp"); + const u32 gMonFrontPic_Garganacl[] = INCBIN_U32("graphics/pokemon/gen_9/garganacl/front.4bpp.lz"); + const u32 gMonPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/gen_9/garganacl/normal.gbapal.lz"); + const u32 gMonBackPic_Garganacl[] = INCBIN_U32("graphics/pokemon/gen_9/garganacl/back.4bpp.lz"); + const u32 gMonShinyPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/gen_9/garganacl/shiny.gbapal.lz"); + const u8 gMonIcon_Garganacl[] = INCBIN_U8("graphics/pokemon/gen_9/garganacl/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Garganacl[] = INCBIN_U8("graphics/pokemon/garganacl/footprint.1bpp"); + // const u8 gMonFootprint_Garganacl[] = INCBIN_U8("graphics/pokemon/gen_9/garganacl/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_NACLI #if P_FAMILY_CHARCADET - const u32 gMonFrontPic_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/front.4bpp.lz"); - const u32 gMonPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/normal.gbapal.lz"); - const u32 gMonBackPic_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/back.4bpp.lz"); - const u32 gMonShinyPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/shiny.gbapal.lz"); - const u8 gMonIcon_Charcadet[] = INCBIN_U8("graphics/pokemon/charcadet/icon.4bpp"); + const u32 gMonFrontPic_Charcadet[] = INCBIN_U32("graphics/pokemon/gen_9/charcadet/front.4bpp.lz"); + const u32 gMonPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/gen_9/charcadet/normal.gbapal.lz"); + const u32 gMonBackPic_Charcadet[] = INCBIN_U32("graphics/pokemon/gen_9/charcadet/back.4bpp.lz"); + const u32 gMonShinyPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/gen_9/charcadet/shiny.gbapal.lz"); + const u8 gMonIcon_Charcadet[] = INCBIN_U8("graphics/pokemon/gen_9/charcadet/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Charcadet[] = INCBIN_U8("graphics/pokemon/charcadet/footprint.1bpp"); + // const u8 gMonFootprint_Charcadet[] = INCBIN_U8("graphics/pokemon/gen_9/charcadet/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/front.4bpp.lz"); - const u32 gMonPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/normal.gbapal.lz"); - const u32 gMonBackPic_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/back.4bpp.lz"); - const u32 gMonShinyPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/shiny.gbapal.lz"); - const u8 gMonIcon_Armarouge[] = INCBIN_U8("graphics/pokemon/armarouge/icon.4bpp"); + const u32 gMonFrontPic_Armarouge[] = INCBIN_U32("graphics/pokemon/gen_9/armarouge/front.4bpp.lz"); + const u32 gMonPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/gen_9/armarouge/normal.gbapal.lz"); + const u32 gMonBackPic_Armarouge[] = INCBIN_U32("graphics/pokemon/gen_9/armarouge/back.4bpp.lz"); + const u32 gMonShinyPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/gen_9/armarouge/shiny.gbapal.lz"); + const u8 gMonIcon_Armarouge[] = INCBIN_U8("graphics/pokemon/gen_9/armarouge/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Armarouge[] = INCBIN_U8("graphics/pokemon/armarouge/footprint.1bpp"); + // const u8 gMonFootprint_Armarouge[] = INCBIN_U8("graphics/pokemon/gen_9/armarouge/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/front.4bpp.lz"); - const u32 gMonPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/normal.gbapal.lz"); - const u32 gMonBackPic_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/back.4bpp.lz"); - const u32 gMonShinyPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/shiny.gbapal.lz"); - const u8 gMonIcon_Ceruledge[] = INCBIN_U8("graphics/pokemon/ceruledge/icon.4bpp"); + const u32 gMonFrontPic_Ceruledge[] = INCBIN_U32("graphics/pokemon/gen_9/ceruledge/front.4bpp.lz"); + const u32 gMonPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/gen_9/ceruledge/normal.gbapal.lz"); + const u32 gMonBackPic_Ceruledge[] = INCBIN_U32("graphics/pokemon/gen_9/ceruledge/back.4bpp.lz"); + const u32 gMonShinyPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/gen_9/ceruledge/shiny.gbapal.lz"); + const u8 gMonIcon_Ceruledge[] = INCBIN_U8("graphics/pokemon/gen_9/ceruledge/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Ceruledge[] = INCBIN_U8("graphics/pokemon/ceruledge/footprint.1bpp"); + // const u8 gMonFootprint_Ceruledge[] = INCBIN_U8("graphics/pokemon/gen_9/ceruledge/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CHARCADET #if P_FAMILY_TADBULB - const u32 gMonFrontPic_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/front.4bpp.lz"); - const u32 gMonPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/normal.gbapal.lz"); - const u32 gMonBackPic_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/back.4bpp.lz"); - const u32 gMonShinyPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/shiny.gbapal.lz"); - const u8 gMonIcon_Tadbulb[] = INCBIN_U8("graphics/pokemon/tadbulb/icon.4bpp"); + const u32 gMonFrontPic_Tadbulb[] = INCBIN_U32("graphics/pokemon/gen_9/tadbulb/front.4bpp.lz"); + const u32 gMonPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/gen_9/tadbulb/normal.gbapal.lz"); + const u32 gMonBackPic_Tadbulb[] = INCBIN_U32("graphics/pokemon/gen_9/tadbulb/back.4bpp.lz"); + const u32 gMonShinyPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/gen_9/tadbulb/shiny.gbapal.lz"); + const u8 gMonIcon_Tadbulb[] = INCBIN_U8("graphics/pokemon/gen_9/tadbulb/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Tadbulb[] = INCBIN_U8("graphics/pokemon/tadbulb/footprint.1bpp"); + // const u8 gMonFootprint_Tadbulb[] = INCBIN_U8("graphics/pokemon/gen_9/tadbulb/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/front.4bpp.lz"); - const u32 gMonPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/normal.gbapal.lz"); - const u32 gMonBackPic_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/back.4bpp.lz"); - const u32 gMonShinyPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/shiny.gbapal.lz"); - const u8 gMonIcon_Bellibolt[] = INCBIN_U8("graphics/pokemon/bellibolt/icon.4bpp"); + const u32 gMonFrontPic_Bellibolt[] = INCBIN_U32("graphics/pokemon/gen_9/bellibolt/front.4bpp.lz"); + const u32 gMonPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/gen_9/bellibolt/normal.gbapal.lz"); + const u32 gMonBackPic_Bellibolt[] = INCBIN_U32("graphics/pokemon/gen_9/bellibolt/back.4bpp.lz"); + const u32 gMonShinyPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/gen_9/bellibolt/shiny.gbapal.lz"); + const u8 gMonIcon_Bellibolt[] = INCBIN_U8("graphics/pokemon/gen_9/bellibolt/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Bellibolt[] = INCBIN_U8("graphics/pokemon/bellibolt/footprint.1bpp"); + // const u8 gMonFootprint_Bellibolt[] = INCBIN_U8("graphics/pokemon/gen_9/bellibolt/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TADBULB #if P_FAMILY_WATTREL - const u32 gMonFrontPic_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/front.4bpp.lz"); - const u32 gMonPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/normal.gbapal.lz"); - const u32 gMonBackPic_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/back.4bpp.lz"); - const u32 gMonShinyPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/shiny.gbapal.lz"); - const u8 gMonIcon_Wattrel[] = INCBIN_U8("graphics/pokemon/wattrel/icon.4bpp"); + const u32 gMonFrontPic_Wattrel[] = INCBIN_U32("graphics/pokemon/gen_9/wattrel/front.4bpp.lz"); + const u32 gMonPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/gen_9/wattrel/normal.gbapal.lz"); + const u32 gMonBackPic_Wattrel[] = INCBIN_U32("graphics/pokemon/gen_9/wattrel/back.4bpp.lz"); + const u32 gMonShinyPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/gen_9/wattrel/shiny.gbapal.lz"); + const u8 gMonIcon_Wattrel[] = INCBIN_U8("graphics/pokemon/gen_9/wattrel/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Wattrel[] = INCBIN_U8("graphics/pokemon/wattrel/footprint.1bpp"); + // const u8 gMonFootprint_Wattrel[] = INCBIN_U8("graphics/pokemon/gen_9/wattrel/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/front.4bpp.lz"); - const u32 gMonPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/normal.gbapal.lz"); - const u32 gMonBackPic_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/back.4bpp.lz"); - const u32 gMonShinyPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/shiny.gbapal.lz"); - const u8 gMonIcon_Kilowattrel[] = INCBIN_U8("graphics/pokemon/kilowattrel/icon.4bpp"); + const u32 gMonFrontPic_Kilowattrel[] = INCBIN_U32("graphics/pokemon/gen_9/kilowattrel/front.4bpp.lz"); + const u32 gMonPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/gen_9/kilowattrel/normal.gbapal.lz"); + const u32 gMonBackPic_Kilowattrel[] = INCBIN_U32("graphics/pokemon/gen_9/kilowattrel/back.4bpp.lz"); + const u32 gMonShinyPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/gen_9/kilowattrel/shiny.gbapal.lz"); + const u8 gMonIcon_Kilowattrel[] = INCBIN_U8("graphics/pokemon/gen_9/kilowattrel/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Kilowattrel[] = INCBIN_U8("graphics/pokemon/kilowattrel/footprint.1bpp"); + // const u8 gMonFootprint_Kilowattrel[] = INCBIN_U8("graphics/pokemon/gen_9/kilowattrel/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_WATTREL #if P_FAMILY_MASCHIFF - const u32 gMonFrontPic_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/front.4bpp.lz"); - const u32 gMonPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/normal.gbapal.lz"); - const u32 gMonBackPic_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/back.4bpp.lz"); - const u32 gMonShinyPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/shiny.gbapal.lz"); - const u8 gMonIcon_Maschiff[] = INCBIN_U8("graphics/pokemon/maschiff/icon.4bpp"); + const u32 gMonFrontPic_Maschiff[] = INCBIN_U32("graphics/pokemon/gen_9/maschiff/front.4bpp.lz"); + const u32 gMonPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/gen_9/maschiff/normal.gbapal.lz"); + const u32 gMonBackPic_Maschiff[] = INCBIN_U32("graphics/pokemon/gen_9/maschiff/back.4bpp.lz"); + const u32 gMonShinyPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/gen_9/maschiff/shiny.gbapal.lz"); + const u8 gMonIcon_Maschiff[] = INCBIN_U8("graphics/pokemon/gen_9/maschiff/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Maschiff[] = INCBIN_U8("graphics/pokemon/maschiff/footprint.1bpp"); + // const u8 gMonFootprint_Maschiff[] = INCBIN_U8("graphics/pokemon/gen_9/maschiff/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/front.4bpp.lz"); - const u32 gMonPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/normal.gbapal.lz"); - const u32 gMonBackPic_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/back.4bpp.lz"); - const u32 gMonShinyPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/shiny.gbapal.lz"); - const u8 gMonIcon_Mabosstiff[] = INCBIN_U8("graphics/pokemon/mabosstiff/icon.4bpp"); + const u32 gMonFrontPic_Mabosstiff[] = INCBIN_U32("graphics/pokemon/gen_9/mabosstiff/front.4bpp.lz"); + const u32 gMonPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/gen_9/mabosstiff/normal.gbapal.lz"); + const u32 gMonBackPic_Mabosstiff[] = INCBIN_U32("graphics/pokemon/gen_9/mabosstiff/back.4bpp.lz"); + const u32 gMonShinyPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/gen_9/mabosstiff/shiny.gbapal.lz"); + const u8 gMonIcon_Mabosstiff[] = INCBIN_U8("graphics/pokemon/gen_9/mabosstiff/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Mabosstiff[] = INCBIN_U8("graphics/pokemon/mabosstiff/footprint.1bpp"); + // const u8 gMonFootprint_Mabosstiff[] = INCBIN_U8("graphics/pokemon/gen_9/mabosstiff/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MASCHIFF #if P_FAMILY_SHROODLE - const u32 gMonFrontPic_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/front.4bpp.lz"); - const u32 gMonPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/normal.gbapal.lz"); - const u32 gMonBackPic_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/back.4bpp.lz"); - const u32 gMonShinyPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/shiny.gbapal.lz"); - const u8 gMonIcon_Shroodle[] = INCBIN_U8("graphics/pokemon/shroodle/icon.4bpp"); + const u32 gMonFrontPic_Shroodle[] = INCBIN_U32("graphics/pokemon/gen_9/shroodle/front.4bpp.lz"); + const u32 gMonPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/gen_9/shroodle/normal.gbapal.lz"); + const u32 gMonBackPic_Shroodle[] = INCBIN_U32("graphics/pokemon/gen_9/shroodle/back.4bpp.lz"); + const u32 gMonShinyPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/gen_9/shroodle/shiny.gbapal.lz"); + const u8 gMonIcon_Shroodle[] = INCBIN_U8("graphics/pokemon/gen_9/shroodle/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Shroodle[] = INCBIN_U8("graphics/pokemon/shroodle/footprint.1bpp"); + // const u8 gMonFootprint_Shroodle[] = INCBIN_U8("graphics/pokemon/gen_9/shroodle/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/front.4bpp.lz"); - const u32 gMonPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/normal.gbapal.lz"); - const u32 gMonBackPic_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/back.4bpp.lz"); - const u32 gMonShinyPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/shiny.gbapal.lz"); - const u8 gMonIcon_Grafaiai[] = INCBIN_U8("graphics/pokemon/grafaiai/icon.4bpp"); + const u32 gMonFrontPic_Grafaiai[] = INCBIN_U32("graphics/pokemon/gen_9/grafaiai/front.4bpp.lz"); + const u32 gMonPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/gen_9/grafaiai/normal.gbapal.lz"); + const u32 gMonBackPic_Grafaiai[] = INCBIN_U32("graphics/pokemon/gen_9/grafaiai/back.4bpp.lz"); + const u32 gMonShinyPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/gen_9/grafaiai/shiny.gbapal.lz"); + const u8 gMonIcon_Grafaiai[] = INCBIN_U8("graphics/pokemon/gen_9/grafaiai/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Grafaiai[] = INCBIN_U8("graphics/pokemon/grafaiai/footprint.1bpp"); + // const u8 gMonFootprint_Grafaiai[] = INCBIN_U8("graphics/pokemon/gen_9/grafaiai/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SHROODLE #if P_FAMILY_BRAMBLIN - const u32 gMonFrontPic_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/front.4bpp.lz"); - const u32 gMonPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/normal.gbapal.lz"); - const u32 gMonBackPic_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/back.4bpp.lz"); - const u32 gMonShinyPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/shiny.gbapal.lz"); - const u8 gMonIcon_Bramblin[] = INCBIN_U8("graphics/pokemon/bramblin/icon.4bpp"); + const u32 gMonFrontPic_Bramblin[] = INCBIN_U32("graphics/pokemon/gen_9/bramblin/front.4bpp.lz"); + const u32 gMonPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/gen_9/bramblin/normal.gbapal.lz"); + const u32 gMonBackPic_Bramblin[] = INCBIN_U32("graphics/pokemon/gen_9/bramblin/back.4bpp.lz"); + const u32 gMonShinyPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/gen_9/bramblin/shiny.gbapal.lz"); + const u8 gMonIcon_Bramblin[] = INCBIN_U8("graphics/pokemon/gen_9/bramblin/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Bramblin[] = INCBIN_U8("graphics/pokemon/bramblin/footprint.1bpp"); + // const u8 gMonFootprint_Bramblin[] = INCBIN_U8("graphics/pokemon/gen_9/bramblin/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/front.4bpp.lz"); - const u32 gMonPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/normal.gbapal.lz"); - const u32 gMonBackPic_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/back.4bpp.lz"); - const u32 gMonShinyPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/shiny.gbapal.lz"); - const u8 gMonIcon_Brambleghast[] = INCBIN_U8("graphics/pokemon/brambleghast/icon.4bpp"); + const u32 gMonFrontPic_Brambleghast[] = INCBIN_U32("graphics/pokemon/gen_9/brambleghast/front.4bpp.lz"); + const u32 gMonPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/gen_9/brambleghast/normal.gbapal.lz"); + const u32 gMonBackPic_Brambleghast[] = INCBIN_U32("graphics/pokemon/gen_9/brambleghast/back.4bpp.lz"); + const u32 gMonShinyPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/gen_9/brambleghast/shiny.gbapal.lz"); + const u8 gMonIcon_Brambleghast[] = INCBIN_U8("graphics/pokemon/gen_9/brambleghast/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Brambleghast[] = INCBIN_U8("graphics/pokemon/brambleghast/footprint.1bpp"); + // const u8 gMonFootprint_Brambleghast[] = INCBIN_U8("graphics/pokemon/gen_9/brambleghast/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BRAMBLIN #if P_FAMILY_TOEDSCOOL - const u32 gMonFrontPic_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/front.4bpp.lz"); - const u32 gMonPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/normal.gbapal.lz"); - const u32 gMonBackPic_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/back.4bpp.lz"); - const u32 gMonShinyPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/shiny.gbapal.lz"); - const u8 gMonIcon_Toedscool[] = INCBIN_U8("graphics/pokemon/toedscool/icon.4bpp"); + const u32 gMonFrontPic_Toedscool[] = INCBIN_U32("graphics/pokemon/gen_9/toedscool/front.4bpp.lz"); + const u32 gMonPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/gen_9/toedscool/normal.gbapal.lz"); + const u32 gMonBackPic_Toedscool[] = INCBIN_U32("graphics/pokemon/gen_9/toedscool/back.4bpp.lz"); + const u32 gMonShinyPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/gen_9/toedscool/shiny.gbapal.lz"); + const u8 gMonIcon_Toedscool[] = INCBIN_U8("graphics/pokemon/gen_9/toedscool/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Toedscool[] = INCBIN_U8("graphics/pokemon/toedscool/footprint.1bpp"); + // const u8 gMonFootprint_Toedscool[] = INCBIN_U8("graphics/pokemon/gen_9/toedscool/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/front.4bpp.lz"); - const u32 gMonPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/normal.gbapal.lz"); - const u32 gMonBackPic_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/back.4bpp.lz"); - const u32 gMonShinyPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/shiny.gbapal.lz"); - const u8 gMonIcon_Toedscruel[] = INCBIN_U8("graphics/pokemon/toedscruel/icon.4bpp"); + const u32 gMonFrontPic_Toedscruel[] = INCBIN_U32("graphics/pokemon/gen_9/toedscruel/front.4bpp.lz"); + const u32 gMonPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/gen_9/toedscruel/normal.gbapal.lz"); + const u32 gMonBackPic_Toedscruel[] = INCBIN_U32("graphics/pokemon/gen_9/toedscruel/back.4bpp.lz"); + const u32 gMonShinyPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/gen_9/toedscruel/shiny.gbapal.lz"); + const u8 gMonIcon_Toedscruel[] = INCBIN_U8("graphics/pokemon/gen_9/toedscruel/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Toedscruel[] = INCBIN_U8("graphics/pokemon/toedscruel/footprint.1bpp"); + // const u8 gMonFootprint_Toedscruel[] = INCBIN_U8("graphics/pokemon/gen_9/toedscruel/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TOEDSCOOL #if P_FAMILY_KLAWF - const u32 gMonFrontPic_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/front.4bpp.lz"); - const u32 gMonPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/normal.gbapal.lz"); - const u32 gMonBackPic_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/back.4bpp.lz"); - const u32 gMonShinyPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/shiny.gbapal.lz"); - const u8 gMonIcon_Klawf[] = INCBIN_U8("graphics/pokemon/klawf/icon.4bpp"); + const u32 gMonFrontPic_Klawf[] = INCBIN_U32("graphics/pokemon/gen_9/klawf/front.4bpp.lz"); + const u32 gMonPalette_Klawf[] = INCBIN_U32("graphics/pokemon/gen_9/klawf/normal.gbapal.lz"); + const u32 gMonBackPic_Klawf[] = INCBIN_U32("graphics/pokemon/gen_9/klawf/back.4bpp.lz"); + const u32 gMonShinyPalette_Klawf[] = INCBIN_U32("graphics/pokemon/gen_9/klawf/shiny.gbapal.lz"); + const u8 gMonIcon_Klawf[] = INCBIN_U8("graphics/pokemon/gen_9/klawf/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Klawf[] = INCBIN_U8("graphics/pokemon/klawf/footprint.1bpp"); + // const u8 gMonFootprint_Klawf[] = INCBIN_U8("graphics/pokemon/gen_9/klawf/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_KLAWF #if P_FAMILY_CAPSAKID - const u32 gMonFrontPic_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/front.4bpp.lz"); - const u32 gMonPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/normal.gbapal.lz"); - const u32 gMonBackPic_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/back.4bpp.lz"); - const u32 gMonShinyPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/shiny.gbapal.lz"); - const u8 gMonIcon_Capsakid[] = INCBIN_U8("graphics/pokemon/capsakid/icon.4bpp"); + const u32 gMonFrontPic_Capsakid[] = INCBIN_U32("graphics/pokemon/gen_9/capsakid/front.4bpp.lz"); + const u32 gMonPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/gen_9/capsakid/normal.gbapal.lz"); + const u32 gMonBackPic_Capsakid[] = INCBIN_U32("graphics/pokemon/gen_9/capsakid/back.4bpp.lz"); + const u32 gMonShinyPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/gen_9/capsakid/shiny.gbapal.lz"); + const u8 gMonIcon_Capsakid[] = INCBIN_U8("graphics/pokemon/gen_9/capsakid/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Capsakid[] = INCBIN_U8("graphics/pokemon/capsakid/footprint.1bpp"); + // const u8 gMonFootprint_Capsakid[] = INCBIN_U8("graphics/pokemon/gen_9/capsakid/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/front.4bpp.lz"); - const u32 gMonPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/normal.gbapal.lz"); - const u32 gMonBackPic_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/back.4bpp.lz"); - const u32 gMonShinyPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/shiny.gbapal.lz"); - const u8 gMonIcon_Scovillain[] = INCBIN_U8("graphics/pokemon/scovillain/icon.4bpp"); + const u32 gMonFrontPic_Scovillain[] = INCBIN_U32("graphics/pokemon/gen_9/scovillain/front.4bpp.lz"); + const u32 gMonPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/gen_9/scovillain/normal.gbapal.lz"); + const u32 gMonBackPic_Scovillain[] = INCBIN_U32("graphics/pokemon/gen_9/scovillain/back.4bpp.lz"); + const u32 gMonShinyPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/gen_9/scovillain/shiny.gbapal.lz"); + const u8 gMonIcon_Scovillain[] = INCBIN_U8("graphics/pokemon/gen_9/scovillain/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Scovillain[] = INCBIN_U8("graphics/pokemon/scovillain/footprint.1bpp"); + // const u8 gMonFootprint_Scovillain[] = INCBIN_U8("graphics/pokemon/gen_9/scovillain/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CAPSAKID #if P_FAMILY_RELLOR - const u32 gMonFrontPic_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/front.4bpp.lz"); - const u32 gMonPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/normal.gbapal.lz"); - const u32 gMonBackPic_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/back.4bpp.lz"); - const u32 gMonShinyPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/shiny.gbapal.lz"); - const u8 gMonIcon_Rellor[] = INCBIN_U8("graphics/pokemon/rellor/icon.4bpp"); + const u32 gMonFrontPic_Rellor[] = INCBIN_U32("graphics/pokemon/gen_9/rellor/front.4bpp.lz"); + const u32 gMonPalette_Rellor[] = INCBIN_U32("graphics/pokemon/gen_9/rellor/normal.gbapal.lz"); + const u32 gMonBackPic_Rellor[] = INCBIN_U32("graphics/pokemon/gen_9/rellor/back.4bpp.lz"); + const u32 gMonShinyPalette_Rellor[] = INCBIN_U32("graphics/pokemon/gen_9/rellor/shiny.gbapal.lz"); + const u8 gMonIcon_Rellor[] = INCBIN_U8("graphics/pokemon/gen_9/rellor/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Rellor[] = INCBIN_U8("graphics/pokemon/rellor/footprint.1bpp"); + // const u8 gMonFootprint_Rellor[] = INCBIN_U8("graphics/pokemon/gen_9/rellor/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/front.4bpp.lz"); - const u32 gMonPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/normal.gbapal.lz"); - const u32 gMonBackPic_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/back.4bpp.lz"); - const u32 gMonShinyPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/shiny.gbapal.lz"); - const u8 gMonIcon_Rabsca[] = INCBIN_U8("graphics/pokemon/rabsca/icon.4bpp"); + const u32 gMonFrontPic_Rabsca[] = INCBIN_U32("graphics/pokemon/gen_9/rabsca/front.4bpp.lz"); + const u32 gMonPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/gen_9/rabsca/normal.gbapal.lz"); + const u32 gMonBackPic_Rabsca[] = INCBIN_U32("graphics/pokemon/gen_9/rabsca/back.4bpp.lz"); + const u32 gMonShinyPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/gen_9/rabsca/shiny.gbapal.lz"); + const u8 gMonIcon_Rabsca[] = INCBIN_U8("graphics/pokemon/gen_9/rabsca/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Rabsca[] = INCBIN_U8("graphics/pokemon/rabsca/footprint.1bpp"); + // const u8 gMonFootprint_Rabsca[] = INCBIN_U8("graphics/pokemon/gen_9/rabsca/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_RELLOR #if P_FAMILY_FLITTLE - const u32 gMonFrontPic_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/front.4bpp.lz"); - const u32 gMonPalette_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/normal.gbapal.lz"); - const u32 gMonBackPic_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/back.4bpp.lz"); - const u32 gMonShinyPalette_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/shiny.gbapal.lz"); - const u8 gMonIcon_Flittle[] = INCBIN_U8("graphics/pokemon/flittle/icon.4bpp"); + const u32 gMonFrontPic_Flittle[] = INCBIN_U32("graphics/pokemon/gen_9/flittle/front.4bpp.lz"); + const u32 gMonPalette_Flittle[] = INCBIN_U32("graphics/pokemon/gen_9/flittle/normal.gbapal.lz"); + const u32 gMonBackPic_Flittle[] = INCBIN_U32("graphics/pokemon/gen_9/flittle/back.4bpp.lz"); + const u32 gMonShinyPalette_Flittle[] = INCBIN_U32("graphics/pokemon/gen_9/flittle/shiny.gbapal.lz"); + const u8 gMonIcon_Flittle[] = INCBIN_U8("graphics/pokemon/gen_9/flittle/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Flittle[] = INCBIN_U8("graphics/pokemon/flittle/footprint.1bpp"); + // const u8 gMonFootprint_Flittle[] = INCBIN_U8("graphics/pokemon/gen_9/flittle/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/front.4bpp.lz"); - const u32 gMonPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/normal.gbapal.lz"); - const u32 gMonBackPic_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/back.4bpp.lz"); - const u32 gMonShinyPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/shiny.gbapal.lz"); - const u8 gMonIcon_Espathra[] = INCBIN_U8("graphics/pokemon/espathra/icon.4bpp"); + const u32 gMonFrontPic_Espathra[] = INCBIN_U32("graphics/pokemon/gen_9/espathra/front.4bpp.lz"); + const u32 gMonPalette_Espathra[] = INCBIN_U32("graphics/pokemon/gen_9/espathra/normal.gbapal.lz"); + const u32 gMonBackPic_Espathra[] = INCBIN_U32("graphics/pokemon/gen_9/espathra/back.4bpp.lz"); + const u32 gMonShinyPalette_Espathra[] = INCBIN_U32("graphics/pokemon/gen_9/espathra/shiny.gbapal.lz"); + const u8 gMonIcon_Espathra[] = INCBIN_U8("graphics/pokemon/gen_9/espathra/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Espathra[] = INCBIN_U8("graphics/pokemon/espathra/footprint.1bpp"); + // const u8 gMonFootprint_Espathra[] = INCBIN_U8("graphics/pokemon/gen_9/espathra/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_FLITTLE #if P_FAMILY_TINKATINK - const u32 gMonFrontPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/front.4bpp.lz"); - const u32 gMonPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/normal.gbapal.lz"); - const u32 gMonBackPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/back.4bpp.lz"); - const u32 gMonShinyPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/shiny.gbapal.lz"); - const u8 gMonIcon_Tinkatink[] = INCBIN_U8("graphics/pokemon/tinkatink/icon.4bpp"); + const u32 gMonFrontPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatink/front.4bpp.lz"); + const u32 gMonPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatink/normal.gbapal.lz"); + const u32 gMonBackPic_Tinkatink[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatink/back.4bpp.lz"); + const u32 gMonShinyPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatink/shiny.gbapal.lz"); + const u8 gMonIcon_Tinkatink[] = INCBIN_U8("graphics/pokemon/gen_9/tinkatink/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Tinkatink[] = INCBIN_U8("graphics/pokemon/tinkatink/footprint.1bpp"); + // const u8 gMonFootprint_Tinkatink[] = INCBIN_U8("graphics/pokemon/gen_9/tinkatink/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/front.4bpp.lz"); - const u32 gMonPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/normal.gbapal.lz"); - const u32 gMonBackPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/back.4bpp.lz"); - const u32 gMonShinyPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/shiny.gbapal.lz"); - const u8 gMonIcon_Tinkatuff[] = INCBIN_U8("graphics/pokemon/tinkatuff/icon.4bpp"); + const u32 gMonFrontPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatuff/front.4bpp.lz"); + const u32 gMonPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatuff/normal.gbapal.lz"); + const u32 gMonBackPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatuff/back.4bpp.lz"); + const u32 gMonShinyPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/gen_9/tinkatuff/shiny.gbapal.lz"); + const u8 gMonIcon_Tinkatuff[] = INCBIN_U8("graphics/pokemon/gen_9/tinkatuff/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Tinkatuff[] = INCBIN_U8("graphics/pokemon/tinkatuff/footprint.1bpp"); + // const u8 gMonFootprint_Tinkatuff[] = INCBIN_U8("graphics/pokemon/gen_9/tinkatuff/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/front.4bpp.lz"); - const u32 gMonPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/normal.gbapal.lz"); - const u32 gMonBackPic_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/back.4bpp.lz"); - const u32 gMonShinyPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/shiny.gbapal.lz"); - const u8 gMonIcon_Tinkaton[] = INCBIN_U8("graphics/pokemon/tinkaton/icon.4bpp"); + const u32 gMonFrontPic_Tinkaton[] = INCBIN_U32("graphics/pokemon/gen_9/tinkaton/front.4bpp.lz"); + const u32 gMonPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/gen_9/tinkaton/normal.gbapal.lz"); + const u32 gMonBackPic_Tinkaton[] = INCBIN_U32("graphics/pokemon/gen_9/tinkaton/back.4bpp.lz"); + const u32 gMonShinyPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/gen_9/tinkaton/shiny.gbapal.lz"); + const u8 gMonIcon_Tinkaton[] = INCBIN_U8("graphics/pokemon/gen_9/tinkaton/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Tinkaton[] = INCBIN_U8("graphics/pokemon/tinkaton/footprint.1bpp"); + // const u8 gMonFootprint_Tinkaton[] = INCBIN_U8("graphics/pokemon/gen_9/tinkaton/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TINKATINK #if P_FAMILY_WIGLETT - const u32 gMonFrontPic_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/front.4bpp.lz"); - const u32 gMonPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/normal.gbapal.lz"); - const u32 gMonBackPic_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/back.4bpp.lz"); - const u32 gMonShinyPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/shiny.gbapal.lz"); - const u8 gMonIcon_Wiglett[] = INCBIN_U8("graphics/pokemon/wiglett/icon.4bpp"); + const u32 gMonFrontPic_Wiglett[] = INCBIN_U32("graphics/pokemon/gen_9/wiglett/front.4bpp.lz"); + const u32 gMonPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/gen_9/wiglett/normal.gbapal.lz"); + const u32 gMonBackPic_Wiglett[] = INCBIN_U32("graphics/pokemon/gen_9/wiglett/back.4bpp.lz"); + const u32 gMonShinyPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/gen_9/wiglett/shiny.gbapal.lz"); + const u8 gMonIcon_Wiglett[] = INCBIN_U8("graphics/pokemon/gen_9/wiglett/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Wiglett[] = INCBIN_U8("graphics/pokemon/wiglett/footprint.1bpp"); + // const u8 gMonFootprint_Wiglett[] = INCBIN_U8("graphics/pokemon/gen_9/wiglett/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/front.4bpp.lz"); - const u32 gMonPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/normal.gbapal.lz"); - const u32 gMonBackPic_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/back.4bpp.lz"); - const u32 gMonShinyPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/shiny.gbapal.lz"); - const u8 gMonIcon_Wugtrio[] = INCBIN_U8("graphics/pokemon/wugtrio/icon.4bpp"); + const u32 gMonFrontPic_Wugtrio[] = INCBIN_U32("graphics/pokemon/gen_9/wugtrio/front.4bpp.lz"); + const u32 gMonPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/gen_9/wugtrio/normal.gbapal.lz"); + const u32 gMonBackPic_Wugtrio[] = INCBIN_U32("graphics/pokemon/gen_9/wugtrio/back.4bpp.lz"); + const u32 gMonShinyPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/gen_9/wugtrio/shiny.gbapal.lz"); + const u8 gMonIcon_Wugtrio[] = INCBIN_U8("graphics/pokemon/gen_9/wugtrio/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Wugtrio[] = INCBIN_U8("graphics/pokemon/wugtrio/footprint.1bpp"); + // const u8 gMonFootprint_Wugtrio[] = INCBIN_U8("graphics/pokemon/gen_9/wugtrio/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_WIGLETT #if P_FAMILY_BOMBIRDIER - const u32 gMonFrontPic_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/front.4bpp.lz"); - const u32 gMonPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/normal.gbapal.lz"); - const u32 gMonBackPic_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/back.4bpp.lz"); - const u32 gMonShinyPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/shiny.gbapal.lz"); - const u8 gMonIcon_Bombirdier[] = INCBIN_U8("graphics/pokemon/bombirdier/icon.4bpp"); + const u32 gMonFrontPic_Bombirdier[] = INCBIN_U32("graphics/pokemon/gen_9/bombirdier/front.4bpp.lz"); + const u32 gMonPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/gen_9/bombirdier/normal.gbapal.lz"); + const u32 gMonBackPic_Bombirdier[] = INCBIN_U32("graphics/pokemon/gen_9/bombirdier/back.4bpp.lz"); + const u32 gMonShinyPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/gen_9/bombirdier/shiny.gbapal.lz"); + const u8 gMonIcon_Bombirdier[] = INCBIN_U8("graphics/pokemon/gen_9/bombirdier/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Bombirdier[] = INCBIN_U8("graphics/pokemon/bombirdier/footprint.1bpp"); + // const u8 gMonFootprint_Bombirdier[] = INCBIN_U8("graphics/pokemon/gen_9/bombirdier/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BOMBIRDIER #if P_FAMILY_FINIZEN - const u32 gMonFrontPic_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/front.4bpp.lz"); - const u32 gMonPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/normal.gbapal.lz"); - const u32 gMonBackPic_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/back.4bpp.lz"); - const u32 gMonShinyPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/shiny.gbapal.lz"); - const u8 gMonIcon_Finizen[] = INCBIN_U8("graphics/pokemon/finizen/icon.4bpp"); + const u32 gMonFrontPic_Finizen[] = INCBIN_U32("graphics/pokemon/gen_9/finizen/front.4bpp.lz"); + const u32 gMonPalette_Finizen[] = INCBIN_U32("graphics/pokemon/gen_9/finizen/normal.gbapal.lz"); + const u32 gMonBackPic_Finizen[] = INCBIN_U32("graphics/pokemon/gen_9/finizen/back.4bpp.lz"); + const u32 gMonShinyPalette_Finizen[] = INCBIN_U32("graphics/pokemon/gen_9/finizen/shiny.gbapal.lz"); + const u8 gMonIcon_Finizen[] = INCBIN_U8("graphics/pokemon/gen_9/finizen/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Finizen[] = INCBIN_U8("graphics/pokemon/finizen/footprint.1bpp"); + // const u8 gMonFootprint_Finizen[] = INCBIN_U8("graphics/pokemon/gen_9/finizen/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/front.4bpp.lz"); - const u32 gMonPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/normal.gbapal.lz"); - const u32 gMonBackPic_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/back.4bpp.lz"); - const u32 gMonShinyPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/shiny.gbapal.lz"); - const u8 gMonIcon_PalafinZero[] = INCBIN_U8("graphics/pokemon/palafin/icon.4bpp"); + const u32 gMonFrontPic_PalafinZero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/front.4bpp.lz"); + const u32 gMonPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/normal.gbapal.lz"); + const u32 gMonBackPic_PalafinZero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/back.4bpp.lz"); + const u32 gMonShinyPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/shiny.gbapal.lz"); + const u8 gMonIcon_PalafinZero[] = INCBIN_U8("graphics/pokemon/gen_9/palafin/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Palafin[] = INCBIN_U8("graphics/pokemon/palafin/footprint.1bpp"); + // const u8 gMonFootprint_Palafin[] = INCBIN_U8("graphics/pokemon/gen_9/palafin/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/front.4bpp.lz"); - const u32 gMonPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/normal.gbapal.lz"); - const u32 gMonBackPic_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/back.4bpp.lz"); - const u32 gMonShinyPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/shiny.gbapal.lz"); - const u8 gMonIcon_PalafinHero[] = INCBIN_U8("graphics/pokemon/palafin/hero/icon.4bpp"); + const u32 gMonFrontPic_PalafinHero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/hero/front.4bpp.lz"); + const u32 gMonPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/hero/normal.gbapal.lz"); + const u32 gMonBackPic_PalafinHero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/hero/back.4bpp.lz"); + const u32 gMonShinyPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/gen_9/palafin/hero/shiny.gbapal.lz"); + const u8 gMonIcon_PalafinHero[] = INCBIN_U8("graphics/pokemon/gen_9/palafin/hero/icon.4bpp"); #endif //P_FAMILY_FINIZEN #if P_FAMILY_VAROOM - const u32 gMonFrontPic_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/front.4bpp.lz"); - const u32 gMonPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/normal.gbapal.lz"); - const u32 gMonBackPic_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/back.4bpp.lz"); - const u32 gMonShinyPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/shiny.gbapal.lz"); - const u8 gMonIcon_Varoom[] = INCBIN_U8("graphics/pokemon/varoom/icon.4bpp"); + const u32 gMonFrontPic_Varoom[] = INCBIN_U32("graphics/pokemon/gen_9/varoom/front.4bpp.lz"); + const u32 gMonPalette_Varoom[] = INCBIN_U32("graphics/pokemon/gen_9/varoom/normal.gbapal.lz"); + const u32 gMonBackPic_Varoom[] = INCBIN_U32("graphics/pokemon/gen_9/varoom/back.4bpp.lz"); + const u32 gMonShinyPalette_Varoom[] = INCBIN_U32("graphics/pokemon/gen_9/varoom/shiny.gbapal.lz"); + const u8 gMonIcon_Varoom[] = INCBIN_U8("graphics/pokemon/gen_9/varoom/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Varoom[] = INCBIN_U8("graphics/pokemon/varoom/footprint.1bpp"); + // const u8 gMonFootprint_Varoom[] = INCBIN_U8("graphics/pokemon/gen_9/varoom/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/front.4bpp.lz"); - const u32 gMonPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/normal.gbapal.lz"); - const u32 gMonBackPic_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/back.4bpp.lz"); - const u32 gMonShinyPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/shiny.gbapal.lz"); - const u8 gMonIcon_Revavroom[] = INCBIN_U8("graphics/pokemon/revavroom/icon.4bpp"); + const u32 gMonFrontPic_Revavroom[] = INCBIN_U32("graphics/pokemon/gen_9/revavroom/front.4bpp.lz"); + const u32 gMonPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/gen_9/revavroom/normal.gbapal.lz"); + const u32 gMonBackPic_Revavroom[] = INCBIN_U32("graphics/pokemon/gen_9/revavroom/back.4bpp.lz"); + const u32 gMonShinyPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/gen_9/revavroom/shiny.gbapal.lz"); + const u8 gMonIcon_Revavroom[] = INCBIN_U8("graphics/pokemon/gen_9/revavroom/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Revavroom[] = INCBIN_U8("graphics/pokemon/revavroom/footprint.1bpp"); + // const u8 gMonFootprint_Revavroom[] = INCBIN_U8("graphics/pokemon/gen_9/revavroom/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_VAROOM #if P_FAMILY_CYCLIZAR - const u32 gMonFrontPic_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/front.4bpp.lz"); - const u32 gMonPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/normal.gbapal.lz"); - const u32 gMonBackPic_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/back.4bpp.lz"); - const u32 gMonShinyPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/shiny.gbapal.lz"); - const u8 gMonIcon_Cyclizar[] = INCBIN_U8("graphics/pokemon/cyclizar/icon.4bpp"); + const u32 gMonFrontPic_Cyclizar[] = INCBIN_U32("graphics/pokemon/gen_9/cyclizar/front.4bpp.lz"); + const u32 gMonPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/gen_9/cyclizar/normal.gbapal.lz"); + const u32 gMonBackPic_Cyclizar[] = INCBIN_U32("graphics/pokemon/gen_9/cyclizar/back.4bpp.lz"); + const u32 gMonShinyPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/gen_9/cyclizar/shiny.gbapal.lz"); + const u8 gMonIcon_Cyclizar[] = INCBIN_U8("graphics/pokemon/gen_9/cyclizar/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Cyclizar[] = INCBIN_U8("graphics/pokemon/cyclizar/footprint.1bpp"); + // const u8 gMonFootprint_Cyclizar[] = INCBIN_U8("graphics/pokemon/gen_9/cyclizar/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CYCLIZAR #if P_FAMILY_ORTHWORM - const u32 gMonFrontPic_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/front.4bpp.lz"); - const u32 gMonPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/normal.gbapal.lz"); - const u32 gMonBackPic_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/back.4bpp.lz"); - const u32 gMonShinyPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/shiny.gbapal.lz"); - const u8 gMonIcon_Orthworm[] = INCBIN_U8("graphics/pokemon/orthworm/icon.4bpp"); + const u32 gMonFrontPic_Orthworm[] = INCBIN_U32("graphics/pokemon/gen_9/orthworm/front.4bpp.lz"); + const u32 gMonPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/gen_9/orthworm/normal.gbapal.lz"); + const u32 gMonBackPic_Orthworm[] = INCBIN_U32("graphics/pokemon/gen_9/orthworm/back.4bpp.lz"); + const u32 gMonShinyPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/gen_9/orthworm/shiny.gbapal.lz"); + const u8 gMonIcon_Orthworm[] = INCBIN_U8("graphics/pokemon/gen_9/orthworm/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Orthworm[] = INCBIN_U8("graphics/pokemon/orthworm/footprint.1bpp"); + // const u8 gMonFootprint_Orthworm[] = INCBIN_U8("graphics/pokemon/gen_9/orthworm/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ORTHWORM #if P_FAMILY_GLIMMET - const u32 gMonFrontPic_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/front.4bpp.lz"); - const u32 gMonPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/normal.gbapal.lz"); - const u32 gMonBackPic_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/back.4bpp.lz"); - const u32 gMonShinyPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/shiny.gbapal.lz"); - const u8 gMonIcon_Glimmet[] = INCBIN_U8("graphics/pokemon/glimmet/icon.4bpp"); + const u32 gMonFrontPic_Glimmet[] = INCBIN_U32("graphics/pokemon/gen_9/glimmet/front.4bpp.lz"); + const u32 gMonPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/gen_9/glimmet/normal.gbapal.lz"); + const u32 gMonBackPic_Glimmet[] = INCBIN_U32("graphics/pokemon/gen_9/glimmet/back.4bpp.lz"); + const u32 gMonShinyPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/gen_9/glimmet/shiny.gbapal.lz"); + const u8 gMonIcon_Glimmet[] = INCBIN_U8("graphics/pokemon/gen_9/glimmet/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Glimmet[] = INCBIN_U8("graphics/pokemon/glimmet/footprint.1bpp"); + // const u8 gMonFootprint_Glimmet[] = INCBIN_U8("graphics/pokemon/gen_9/glimmet/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/front.4bpp.lz"); - const u32 gMonPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/normal.gbapal.lz"); - const u32 gMonBackPic_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/back.4bpp.lz"); - const u32 gMonShinyPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/shiny.gbapal.lz"); - const u8 gMonIcon_Glimmora[] = INCBIN_U8("graphics/pokemon/glimmora/icon.4bpp"); + const u32 gMonFrontPic_Glimmora[] = INCBIN_U32("graphics/pokemon/gen_9/glimmora/front.4bpp.lz"); + const u32 gMonPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/gen_9/glimmora/normal.gbapal.lz"); + const u32 gMonBackPic_Glimmora[] = INCBIN_U32("graphics/pokemon/gen_9/glimmora/back.4bpp.lz"); + const u32 gMonShinyPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/gen_9/glimmora/shiny.gbapal.lz"); + const u8 gMonIcon_Glimmora[] = INCBIN_U8("graphics/pokemon/gen_9/glimmora/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Glimmora[] = INCBIN_U8("graphics/pokemon/glimmora/footprint.1bpp"); + // const u8 gMonFootprint_Glimmora[] = INCBIN_U8("graphics/pokemon/gen_9/glimmora/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_GLIMMET #if P_FAMILY_GREAVARD - const u32 gMonFrontPic_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/front.4bpp.lz"); - const u32 gMonPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/normal.gbapal.lz"); - const u32 gMonBackPic_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/back.4bpp.lz"); - const u32 gMonShinyPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/shiny.gbapal.lz"); - const u8 gMonIcon_Greavard[] = INCBIN_U8("graphics/pokemon/greavard/icon.4bpp"); + const u32 gMonFrontPic_Greavard[] = INCBIN_U32("graphics/pokemon/gen_9/greavard/front.4bpp.lz"); + const u32 gMonPalette_Greavard[] = INCBIN_U32("graphics/pokemon/gen_9/greavard/normal.gbapal.lz"); + const u32 gMonBackPic_Greavard[] = INCBIN_U32("graphics/pokemon/gen_9/greavard/back.4bpp.lz"); + const u32 gMonShinyPalette_Greavard[] = INCBIN_U32("graphics/pokemon/gen_9/greavard/shiny.gbapal.lz"); + const u8 gMonIcon_Greavard[] = INCBIN_U8("graphics/pokemon/gen_9/greavard/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Greavard[] = INCBIN_U8("graphics/pokemon/greavard/footprint.1bpp"); + // const u8 gMonFootprint_Greavard[] = INCBIN_U8("graphics/pokemon/gen_9/greavard/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/front.4bpp.lz"); - const u32 gMonPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/normal.gbapal.lz"); - const u32 gMonBackPic_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/back.4bpp.lz"); - const u32 gMonShinyPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/shiny.gbapal.lz"); - const u8 gMonIcon_Houndstone[] = INCBIN_U8("graphics/pokemon/houndstone/icon.4bpp"); + const u32 gMonFrontPic_Houndstone[] = INCBIN_U32("graphics/pokemon/gen_9/houndstone/front.4bpp.lz"); + const u32 gMonPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/gen_9/houndstone/normal.gbapal.lz"); + const u32 gMonBackPic_Houndstone[] = INCBIN_U32("graphics/pokemon/gen_9/houndstone/back.4bpp.lz"); + const u32 gMonShinyPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/gen_9/houndstone/shiny.gbapal.lz"); + const u8 gMonIcon_Houndstone[] = INCBIN_U8("graphics/pokemon/gen_9/houndstone/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Houndstone[] = INCBIN_U8("graphics/pokemon/houndstone/footprint.1bpp"); + // const u8 gMonFootprint_Houndstone[] = INCBIN_U8("graphics/pokemon/gen_9/houndstone/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_GREAVARD #if P_FAMILY_FLAMIGO - const u32 gMonFrontPic_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/front.4bpp.lz"); - const u32 gMonPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/normal.gbapal.lz"); - const u32 gMonBackPic_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/back.4bpp.lz"); - const u32 gMonShinyPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/shiny.gbapal.lz"); - const u8 gMonIcon_Flamigo[] = INCBIN_U8("graphics/pokemon/flamigo/icon.4bpp"); + const u32 gMonFrontPic_Flamigo[] = INCBIN_U32("graphics/pokemon/gen_9/flamigo/front.4bpp.lz"); + const u32 gMonPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/gen_9/flamigo/normal.gbapal.lz"); + const u32 gMonBackPic_Flamigo[] = INCBIN_U32("graphics/pokemon/gen_9/flamigo/back.4bpp.lz"); + const u32 gMonShinyPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/gen_9/flamigo/shiny.gbapal.lz"); + const u8 gMonIcon_Flamigo[] = INCBIN_U8("graphics/pokemon/gen_9/flamigo/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Flamigo[] = INCBIN_U8("graphics/pokemon/flamigo/footprint.1bpp"); + // const u8 gMonFootprint_Flamigo[] = INCBIN_U8("graphics/pokemon/gen_9/flamigo/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_FLAMIGO #if P_FAMILY_CETODDLE - const u32 gMonFrontPic_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/front.4bpp.lz"); - const u32 gMonPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/normal.gbapal.lz"); - const u32 gMonBackPic_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/back.4bpp.lz"); - const u32 gMonShinyPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/shiny.gbapal.lz"); - const u8 gMonIcon_Cetoddle[] = INCBIN_U8("graphics/pokemon/cetoddle/icon.4bpp"); + const u32 gMonFrontPic_Cetoddle[] = INCBIN_U32("graphics/pokemon/gen_9/cetoddle/front.4bpp.lz"); + const u32 gMonPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/gen_9/cetoddle/normal.gbapal.lz"); + const u32 gMonBackPic_Cetoddle[] = INCBIN_U32("graphics/pokemon/gen_9/cetoddle/back.4bpp.lz"); + const u32 gMonShinyPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/gen_9/cetoddle/shiny.gbapal.lz"); + const u8 gMonIcon_Cetoddle[] = INCBIN_U8("graphics/pokemon/gen_9/cetoddle/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Cetoddle[] = INCBIN_U8("graphics/pokemon/cetoddle/footprint.1bpp"); + // const u8 gMonFootprint_Cetoddle[] = INCBIN_U8("graphics/pokemon/gen_9/cetoddle/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/front.4bpp.lz"); - const u32 gMonPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/normal.gbapal.lz"); - const u32 gMonBackPic_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/back.4bpp.lz"); - const u32 gMonShinyPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/shiny.gbapal.lz"); - const u8 gMonIcon_Cetitan[] = INCBIN_U8("graphics/pokemon/cetitan/icon.4bpp"); + const u32 gMonFrontPic_Cetitan[] = INCBIN_U32("graphics/pokemon/gen_9/cetitan/front.4bpp.lz"); + const u32 gMonPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/gen_9/cetitan/normal.gbapal.lz"); + const u32 gMonBackPic_Cetitan[] = INCBIN_U32("graphics/pokemon/gen_9/cetitan/back.4bpp.lz"); + const u32 gMonShinyPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/gen_9/cetitan/shiny.gbapal.lz"); + const u8 gMonIcon_Cetitan[] = INCBIN_U8("graphics/pokemon/gen_9/cetitan/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Cetitan[] = INCBIN_U8("graphics/pokemon/cetitan/footprint.1bpp"); + // const u8 gMonFootprint_Cetitan[] = INCBIN_U8("graphics/pokemon/gen_9/cetitan/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CETODDLE #if P_FAMILY_VELUZA - const u32 gMonFrontPic_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/front.4bpp.lz"); - const u32 gMonPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/normal.gbapal.lz"); - const u32 gMonBackPic_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/back.4bpp.lz"); - const u32 gMonShinyPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/shiny.gbapal.lz"); - const u8 gMonIcon_Veluza[] = INCBIN_U8("graphics/pokemon/veluza/icon.4bpp"); + const u32 gMonFrontPic_Veluza[] = INCBIN_U32("graphics/pokemon/gen_9/veluza/front.4bpp.lz"); + const u32 gMonPalette_Veluza[] = INCBIN_U32("graphics/pokemon/gen_9/veluza/normal.gbapal.lz"); + const u32 gMonBackPic_Veluza[] = INCBIN_U32("graphics/pokemon/gen_9/veluza/back.4bpp.lz"); + const u32 gMonShinyPalette_Veluza[] = INCBIN_U32("graphics/pokemon/gen_9/veluza/shiny.gbapal.lz"); + const u8 gMonIcon_Veluza[] = INCBIN_U8("graphics/pokemon/gen_9/veluza/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Veluza[] = INCBIN_U8("graphics/pokemon/veluza/footprint.1bpp"); + // const u8 gMonFootprint_Veluza[] = INCBIN_U8("graphics/pokemon/gen_9/veluza/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_VELUZA #if P_FAMILY_DONDOZO - const u32 gMonFrontPic_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/front.4bpp.lz"); - const u32 gMonPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/normal.gbapal.lz"); - const u32 gMonBackPic_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/back.4bpp.lz"); - const u32 gMonShinyPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/shiny.gbapal.lz"); - const u8 gMonIcon_Dondozo[] = INCBIN_U8("graphics/pokemon/dondozo/icon.4bpp"); + const u32 gMonFrontPic_Dondozo[] = INCBIN_U32("graphics/pokemon/gen_9/dondozo/front.4bpp.lz"); + const u32 gMonPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/gen_9/dondozo/normal.gbapal.lz"); + const u32 gMonBackPic_Dondozo[] = INCBIN_U32("graphics/pokemon/gen_9/dondozo/back.4bpp.lz"); + const u32 gMonShinyPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/gen_9/dondozo/shiny.gbapal.lz"); + const u8 gMonIcon_Dondozo[] = INCBIN_U8("graphics/pokemon/gen_9/dondozo/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Dondozo[] = INCBIN_U8("graphics/pokemon/dondozo/footprint.1bpp"); + // const u8 gMonFootprint_Dondozo[] = INCBIN_U8("graphics/pokemon/gen_9/dondozo/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_DONDOZO #if P_FAMILY_TATSUGIRI - const u32 gMonFrontPic_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/front.4bpp.lz"); - const u32 gMonPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/normal.gbapal.lz"); - const u32 gMonBackPic_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/back.4bpp.lz"); - const u32 gMonShinyPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/shiny.gbapal.lz"); - const u8 gMonIcon_TatsugiriCurly[] = INCBIN_U8("graphics/pokemon/tatsugiri/curly/icon.4bpp"); + const u32 gMonFrontPic_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/curly/front.4bpp.lz"); + const u32 gMonPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/curly/normal.gbapal.lz"); + const u32 gMonBackPic_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/curly/back.4bpp.lz"); + const u32 gMonShinyPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/curly/shiny.gbapal.lz"); + const u8 gMonIcon_TatsugiriCurly[] = INCBIN_U8("graphics/pokemon/gen_9/tatsugiri/curly/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Tatsugiri[] = INCBIN_U8("graphics/pokemon/tatsugiri/footprint.1bpp"); + // const u8 gMonFootprint_Tatsugiri[] = INCBIN_U8("graphics/pokemon/gen_9/tatsugiri/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/front.4bpp.lz"); - const u32 gMonPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/normal.gbapal.lz"); - const u32 gMonBackPic_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/back.4bpp.lz"); - const u32 gMonShinyPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/shiny.gbapal.lz"); - const u8 gMonIcon_TatsugiriDroopy[] = INCBIN_U8("graphics/pokemon/tatsugiri/droopy/icon.4bpp"); + const u32 gMonFrontPic_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/droopy/front.4bpp.lz"); + const u32 gMonPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/droopy/normal.gbapal.lz"); + const u32 gMonBackPic_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/droopy/back.4bpp.lz"); + const u32 gMonShinyPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/droopy/shiny.gbapal.lz"); + const u8 gMonIcon_TatsugiriDroopy[] = INCBIN_U8("graphics/pokemon/gen_9/tatsugiri/droopy/icon.4bpp"); - const u32 gMonFrontPic_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/front.4bpp.lz"); - const u32 gMonPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/normal.gbapal.lz"); - const u32 gMonBackPic_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/back.4bpp.lz"); - const u32 gMonShinyPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/shiny.gbapal.lz"); - const u8 gMonIcon_TatsugiriStretchy[] = INCBIN_U8("graphics/pokemon/tatsugiri/stretchy/icon.4bpp"); + const u32 gMonFrontPic_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/stretchy/front.4bpp.lz"); + const u32 gMonPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/stretchy/normal.gbapal.lz"); + const u32 gMonBackPic_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/stretchy/back.4bpp.lz"); + const u32 gMonShinyPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/gen_9/tatsugiri/stretchy/shiny.gbapal.lz"); + const u8 gMonIcon_TatsugiriStretchy[] = INCBIN_U8("graphics/pokemon/gen_9/tatsugiri/stretchy/icon.4bpp"); #endif //P_FAMILY_DONDOZO #if P_FAMILY_GREAT_TUSK - const u32 gMonFrontPic_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/anim_front.4bpp.lz"); - const u32 gMonPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/normal.gbapal.lz"); - const u32 gMonBackPic_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/back.4bpp.lz"); - const u32 gMonShinyPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/shiny.gbapal.lz"); - const u8 gMonIcon_GreatTusk[] = INCBIN_U8("graphics/pokemon/great_tusk/icon.4bpp"); + const u32 gMonFrontPic_GreatTusk[] = INCBIN_U32("graphics/pokemon/gen_9/great_tusk/anim_front.4bpp.lz"); + const u32 gMonPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/gen_9/great_tusk/normal.gbapal.lz"); + const u32 gMonBackPic_GreatTusk[] = INCBIN_U32("graphics/pokemon/gen_9/great_tusk/back.4bpp.lz"); + const u32 gMonShinyPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/gen_9/great_tusk/shiny.gbapal.lz"); + const u8 gMonIcon_GreatTusk[] = INCBIN_U8("graphics/pokemon/gen_9/great_tusk/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_GreatTusk[] = INCBIN_U8("graphics/pokemon/great_tusk/footprint.1bpp"); + // const u8 gMonFootprint_GreatTusk[] = INCBIN_U8("graphics/pokemon/gen_9/great_tusk/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_GREAT_TUSK #if P_FAMILY_SCREAM_TAIL - const u32 gMonFrontPic_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/front.4bpp.lz"); - const u32 gMonPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/normal.gbapal.lz"); - const u32 gMonBackPic_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/back.4bpp.lz"); - const u32 gMonShinyPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/shiny.gbapal.lz"); - const u8 gMonIcon_ScreamTail[] = INCBIN_U8("graphics/pokemon/scream_tail/icon.4bpp"); + const u32 gMonFrontPic_ScreamTail[] = INCBIN_U32("graphics/pokemon/gen_9/scream_tail/front.4bpp.lz"); + const u32 gMonPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/gen_9/scream_tail/normal.gbapal.lz"); + const u32 gMonBackPic_ScreamTail[] = INCBIN_U32("graphics/pokemon/gen_9/scream_tail/back.4bpp.lz"); + const u32 gMonShinyPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/gen_9/scream_tail/shiny.gbapal.lz"); + const u8 gMonIcon_ScreamTail[] = INCBIN_U8("graphics/pokemon/gen_9/scream_tail/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_ScreamTail[] = INCBIN_U8("graphics/pokemon/scream_tail/footprint.1bpp"); + // const u8 gMonFootprint_ScreamTail[] = INCBIN_U8("graphics/pokemon/gen_9/scream_tail/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SCREAM_TAIL #if P_FAMILY_BRUTE_BONNET - const u32 gMonFrontPic_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/front.4bpp.lz"); - const u32 gMonPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/normal.gbapal.lz"); - const u32 gMonBackPic_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/back.4bpp.lz"); - const u32 gMonShinyPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/shiny.gbapal.lz"); - const u8 gMonIcon_BruteBonnet[] = INCBIN_U8("graphics/pokemon/brute_bonnet/icon.4bpp"); + const u32 gMonFrontPic_BruteBonnet[] = INCBIN_U32("graphics/pokemon/gen_9/brute_bonnet/front.4bpp.lz"); + const u32 gMonPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/gen_9/brute_bonnet/normal.gbapal.lz"); + const u32 gMonBackPic_BruteBonnet[] = INCBIN_U32("graphics/pokemon/gen_9/brute_bonnet/back.4bpp.lz"); + const u32 gMonShinyPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/gen_9/brute_bonnet/shiny.gbapal.lz"); + const u8 gMonIcon_BruteBonnet[] = INCBIN_U8("graphics/pokemon/gen_9/brute_bonnet/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_BruteBonnet[] = INCBIN_U8("graphics/pokemon/brute_bonnet/footprint.1bpp"); + // const u8 gMonFootprint_BruteBonnet[] = INCBIN_U8("graphics/pokemon/gen_9/brute_bonnet/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_BRUTE_BONNET #if P_FAMILY_FLUTTER_MANE - const u32 gMonFrontPic_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/front.4bpp.lz"); - const u32 gMonPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/normal.gbapal.lz"); - const u32 gMonBackPic_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/back.4bpp.lz"); - const u32 gMonShinyPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/shiny.gbapal.lz"); - const u8 gMonIcon_FlutterMane[] = INCBIN_U8("graphics/pokemon/flutter_mane/icon.4bpp"); + const u32 gMonFrontPic_FlutterMane[] = INCBIN_U32("graphics/pokemon/gen_9/flutter_mane/front.4bpp.lz"); + const u32 gMonPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/gen_9/flutter_mane/normal.gbapal.lz"); + const u32 gMonBackPic_FlutterMane[] = INCBIN_U32("graphics/pokemon/gen_9/flutter_mane/back.4bpp.lz"); + const u32 gMonShinyPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/gen_9/flutter_mane/shiny.gbapal.lz"); + const u8 gMonIcon_FlutterMane[] = INCBIN_U8("graphics/pokemon/gen_9/flutter_mane/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_FlutterMane[] = INCBIN_U8("graphics/pokemon/flutter_mane/footprint.1bpp"); + // const u8 gMonFootprint_FlutterMane[] = INCBIN_U8("graphics/pokemon/gen_9/flutter_mane/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_FLUTTER_MANE #if P_FAMILY_SLITHER_WING - const u32 gMonFrontPic_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/front.4bpp.lz"); - const u32 gMonPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/normal.gbapal.lz"); - const u32 gMonBackPic_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/back.4bpp.lz"); - const u32 gMonShinyPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/shiny.gbapal.lz"); - const u8 gMonIcon_SlitherWing[] = INCBIN_U8("graphics/pokemon/slither_wing/icon.4bpp"); + const u32 gMonFrontPic_SlitherWing[] = INCBIN_U32("graphics/pokemon/gen_9/slither_wing/front.4bpp.lz"); + const u32 gMonPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/gen_9/slither_wing/normal.gbapal.lz"); + const u32 gMonBackPic_SlitherWing[] = INCBIN_U32("graphics/pokemon/gen_9/slither_wing/back.4bpp.lz"); + const u32 gMonShinyPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/gen_9/slither_wing/shiny.gbapal.lz"); + const u8 gMonIcon_SlitherWing[] = INCBIN_U8("graphics/pokemon/gen_9/slither_wing/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_SlitherWing[] = INCBIN_U8("graphics/pokemon/slither_wing/footprint.1bpp"); + // const u8 gMonFootprint_SlitherWing[] = INCBIN_U8("graphics/pokemon/gen_9/slither_wing/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SLITHER_WING #if P_FAMILY_SANDY_SHOCKS - const u32 gMonFrontPic_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/front.4bpp.lz"); - const u32 gMonPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/normal.gbapal.lz"); - const u32 gMonBackPic_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/back.4bpp.lz"); - const u32 gMonShinyPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/shiny.gbapal.lz"); - const u8 gMonIcon_SandyShocks[] = INCBIN_U8("graphics/pokemon/sandy_shocks/icon.4bpp"); + const u32 gMonFrontPic_SandyShocks[] = INCBIN_U32("graphics/pokemon/gen_9/sandy_shocks/front.4bpp.lz"); + const u32 gMonPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/gen_9/sandy_shocks/normal.gbapal.lz"); + const u32 gMonBackPic_SandyShocks[] = INCBIN_U32("graphics/pokemon/gen_9/sandy_shocks/back.4bpp.lz"); + const u32 gMonShinyPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/gen_9/sandy_shocks/shiny.gbapal.lz"); + const u8 gMonIcon_SandyShocks[] = INCBIN_U8("graphics/pokemon/gen_9/sandy_shocks/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_SandyShocks[] = INCBIN_U8("graphics/pokemon/sandy_shocks/footprint.1bpp"); + // const u8 gMonFootprint_SandyShocks[] = INCBIN_U8("graphics/pokemon/gen_9/sandy_shocks/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_SANDY_SHOCKS #if P_FAMILY_IRON_TREADS - const u32 gMonFrontPic_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/front.4bpp.lz"); - const u32 gMonPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/normal.gbapal.lz"); - const u32 gMonBackPic_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/back.4bpp.lz"); - const u32 gMonShinyPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/shiny.gbapal.lz"); - const u8 gMonIcon_IronTreads[] = INCBIN_U8("graphics/pokemon/iron_treads/icon.4bpp"); + const u32 gMonFrontPic_IronTreads[] = INCBIN_U32("graphics/pokemon/gen_9/iron_treads/front.4bpp.lz"); + const u32 gMonPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/gen_9/iron_treads/normal.gbapal.lz"); + const u32 gMonBackPic_IronTreads[] = INCBIN_U32("graphics/pokemon/gen_9/iron_treads/back.4bpp.lz"); + const u32 gMonShinyPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/gen_9/iron_treads/shiny.gbapal.lz"); + const u8 gMonIcon_IronTreads[] = INCBIN_U8("graphics/pokemon/gen_9/iron_treads/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_IronTreads[] = INCBIN_U8("graphics/pokemon/iron_treads/footprint.1bpp"); + // const u8 gMonFootprint_IronTreads[] = INCBIN_U8("graphics/pokemon/gen_9/iron_treads/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_TREADS #if P_FAMILY_IRON_BUNDLE - const u32 gMonFrontPic_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/front.4bpp.lz"); - const u32 gMonPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/normal.gbapal.lz"); - const u32 gMonBackPic_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/back.4bpp.lz"); - const u32 gMonShinyPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/shiny.gbapal.lz"); - const u8 gMonIcon_IronBundle[] = INCBIN_U8("graphics/pokemon/iron_bundle/icon.4bpp"); + const u32 gMonFrontPic_IronBundle[] = INCBIN_U32("graphics/pokemon/gen_9/iron_bundle/front.4bpp.lz"); + const u32 gMonPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/gen_9/iron_bundle/normal.gbapal.lz"); + const u32 gMonBackPic_IronBundle[] = INCBIN_U32("graphics/pokemon/gen_9/iron_bundle/back.4bpp.lz"); + const u32 gMonShinyPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/gen_9/iron_bundle/shiny.gbapal.lz"); + const u8 gMonIcon_IronBundle[] = INCBIN_U8("graphics/pokemon/gen_9/iron_bundle/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_IronBundle[] = INCBIN_U8("graphics/pokemon/iron_bundle/footprint.1bpp"); + // const u8 gMonFootprint_IronBundle[] = INCBIN_U8("graphics/pokemon/gen_9/iron_bundle/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_BUNDLE #if P_FAMILY_IRON_HANDS - const u32 gMonFrontPic_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/front.4bpp.lz"); - const u32 gMonPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/normal.gbapal.lz"); - const u32 gMonBackPic_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/back.4bpp.lz"); - const u32 gMonShinyPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/shiny.gbapal.lz"); - const u8 gMonIcon_IronHands[] = INCBIN_U8("graphics/pokemon/iron_hands/icon.4bpp"); + const u32 gMonFrontPic_IronHands[] = INCBIN_U32("graphics/pokemon/gen_9/iron_hands/front.4bpp.lz"); + const u32 gMonPalette_IronHands[] = INCBIN_U32("graphics/pokemon/gen_9/iron_hands/normal.gbapal.lz"); + const u32 gMonBackPic_IronHands[] = INCBIN_U32("graphics/pokemon/gen_9/iron_hands/back.4bpp.lz"); + const u32 gMonShinyPalette_IronHands[] = INCBIN_U32("graphics/pokemon/gen_9/iron_hands/shiny.gbapal.lz"); + const u8 gMonIcon_IronHands[] = INCBIN_U8("graphics/pokemon/gen_9/iron_hands/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_IronHands[] = INCBIN_U8("graphics/pokemon/iron_hands/footprint.1bpp"); + // const u8 gMonFootprint_IronHands[] = INCBIN_U8("graphics/pokemon/gen_9/iron_hands/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_HANDS #if P_FAMILY_IRON_JUGULIS - const u32 gMonFrontPic_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/front.4bpp.lz"); - const u32 gMonPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/normal.gbapal.lz"); - const u32 gMonBackPic_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/back.4bpp.lz"); - const u32 gMonShinyPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/shiny.gbapal.lz"); - const u8 gMonIcon_IronJugulis[] = INCBIN_U8("graphics/pokemon/iron_jugulis/icon.4bpp"); + const u32 gMonFrontPic_IronJugulis[] = INCBIN_U32("graphics/pokemon/gen_9/iron_jugulis/front.4bpp.lz"); + const u32 gMonPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/gen_9/iron_jugulis/normal.gbapal.lz"); + const u32 gMonBackPic_IronJugulis[] = INCBIN_U32("graphics/pokemon/gen_9/iron_jugulis/back.4bpp.lz"); + const u32 gMonShinyPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/gen_9/iron_jugulis/shiny.gbapal.lz"); + const u8 gMonIcon_IronJugulis[] = INCBIN_U8("graphics/pokemon/gen_9/iron_jugulis/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_IronJugulis[] = INCBIN_U8("graphics/pokemon/iron_jugulis/footprint.1bpp"); + // const u8 gMonFootprint_IronJugulis[] = INCBIN_U8("graphics/pokemon/gen_9/iron_jugulis/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_JUGULIS #if P_FAMILY_IRON_MOTH - const u32 gMonFrontPic_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/front.4bpp.lz"); - const u32 gMonPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/normal.gbapal.lz"); - const u32 gMonBackPic_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/back.4bpp.lz"); - const u32 gMonShinyPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/shiny.gbapal.lz"); - const u8 gMonIcon_IronMoth[] = INCBIN_U8("graphics/pokemon/iron_moth/icon.4bpp"); + const u32 gMonFrontPic_IronMoth[] = INCBIN_U32("graphics/pokemon/gen_9/iron_moth/front.4bpp.lz"); + const u32 gMonPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/gen_9/iron_moth/normal.gbapal.lz"); + const u32 gMonBackPic_IronMoth[] = INCBIN_U32("graphics/pokemon/gen_9/iron_moth/back.4bpp.lz"); + const u32 gMonShinyPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/gen_9/iron_moth/shiny.gbapal.lz"); + const u8 gMonIcon_IronMoth[] = INCBIN_U8("graphics/pokemon/gen_9/iron_moth/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_IronMoth[] = INCBIN_U8("graphics/pokemon/iron_moth/footprint.1bpp"); + // const u8 gMonFootprint_IronMoth[] = INCBIN_U8("graphics/pokemon/gen_9/iron_moth/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_MOTH #if P_FAMILY_IRON_THORNS - const u32 gMonFrontPic_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/front.4bpp.lz"); - const u32 gMonPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/normal.gbapal.lz"); - const u32 gMonBackPic_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/back.4bpp.lz"); - const u32 gMonShinyPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/shiny.gbapal.lz"); - const u8 gMonIcon_IronThorns[] = INCBIN_U8("graphics/pokemon/iron_thorns/icon.4bpp"); + const u32 gMonFrontPic_IronThorns[] = INCBIN_U32("graphics/pokemon/gen_9/iron_thorns/front.4bpp.lz"); + const u32 gMonPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/gen_9/iron_thorns/normal.gbapal.lz"); + const u32 gMonBackPic_IronThorns[] = INCBIN_U32("graphics/pokemon/gen_9/iron_thorns/back.4bpp.lz"); + const u32 gMonShinyPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/gen_9/iron_thorns/shiny.gbapal.lz"); + const u8 gMonIcon_IronThorns[] = INCBIN_U8("graphics/pokemon/gen_9/iron_thorns/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_IronThorns[] = INCBIN_U8("graphics/pokemon/iron_thorns/footprint.1bpp"); + // const u8 gMonFootprint_IronThorns[] = INCBIN_U8("graphics/pokemon/gen_9/iron_thorns/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_THORNS #if P_FAMILY_FRIGIBAX - const u32 gMonFrontPic_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/anim_front.4bpp.lz"); - const u32 gMonPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/normal.gbapal.lz"); - const u32 gMonBackPic_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/back.4bpp.lz"); - const u32 gMonShinyPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/shiny.gbapal.lz"); - const u8 gMonIcon_Frigibax[] = INCBIN_U8("graphics/pokemon/frigibax/icon.4bpp"); + const u32 gMonFrontPic_Frigibax[] = INCBIN_U32("graphics/pokemon/gen_9/frigibax/anim_front.4bpp.lz"); + const u32 gMonPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/gen_9/frigibax/normal.gbapal.lz"); + const u32 gMonBackPic_Frigibax[] = INCBIN_U32("graphics/pokemon/gen_9/frigibax/back.4bpp.lz"); + const u32 gMonShinyPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/gen_9/frigibax/shiny.gbapal.lz"); + const u8 gMonIcon_Frigibax[] = INCBIN_U8("graphics/pokemon/gen_9/frigibax/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Frigibax[] = INCBIN_U8("graphics/pokemon/frigibax/footprint.1bpp"); + // const u8 gMonFootprint_Frigibax[] = INCBIN_U8("graphics/pokemon/gen_9/frigibax/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/front.4bpp.lz"); - const u32 gMonPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/normal.gbapal.lz"); - const u32 gMonBackPic_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/back.4bpp.lz"); - const u32 gMonShinyPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/shiny.gbapal.lz"); - const u8 gMonIcon_Arctibax[] = INCBIN_U8("graphics/pokemon/arctibax/icon.4bpp"); + const u32 gMonFrontPic_Arctibax[] = INCBIN_U32("graphics/pokemon/gen_9/arctibax/front.4bpp.lz"); + const u32 gMonPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/gen_9/arctibax/normal.gbapal.lz"); + const u32 gMonBackPic_Arctibax[] = INCBIN_U32("graphics/pokemon/gen_9/arctibax/back.4bpp.lz"); + const u32 gMonShinyPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/gen_9/arctibax/shiny.gbapal.lz"); + const u8 gMonIcon_Arctibax[] = INCBIN_U8("graphics/pokemon/gen_9/arctibax/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Arctibax[] = INCBIN_U8("graphics/pokemon/arctibax/footprint.1bpp"); + // const u8 gMonFootprint_Arctibax[] = INCBIN_U8("graphics/pokemon/gen_9/arctibax/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/front.4bpp.lz"); - const u32 gMonPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/normal.gbapal.lz"); - const u32 gMonBackPic_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/back.4bpp.lz"); - const u32 gMonShinyPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/shiny.gbapal.lz"); - const u8 gMonIcon_Baxcalibur[] = INCBIN_U8("graphics/pokemon/baxcalibur/icon.4bpp"); + const u32 gMonFrontPic_Baxcalibur[] = INCBIN_U32("graphics/pokemon/gen_9/baxcalibur/front.4bpp.lz"); + const u32 gMonPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/gen_9/baxcalibur/normal.gbapal.lz"); + const u32 gMonBackPic_Baxcalibur[] = INCBIN_U32("graphics/pokemon/gen_9/baxcalibur/back.4bpp.lz"); + const u32 gMonShinyPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/gen_9/baxcalibur/shiny.gbapal.lz"); + const u8 gMonIcon_Baxcalibur[] = INCBIN_U8("graphics/pokemon/gen_9/baxcalibur/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Baxcalibur[] = INCBIN_U8("graphics/pokemon/baxcalibur/footprint.1bpp"); + // const u8 gMonFootprint_Baxcalibur[] = INCBIN_U8("graphics/pokemon/gen_9/baxcalibur/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_FRIGIBAX #if P_FAMILY_GIMMIGHOUL - const u32 gMonFrontPic_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/front.4bpp.lz"); - const u32 gMonPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/normal.gbapal.lz"); - const u32 gMonBackPic_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/back.4bpp.lz"); - const u32 gMonShinyPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/shiny.gbapal.lz"); - const u8 gMonIcon_GimmighoulChest[] = INCBIN_U8("graphics/pokemon/gimmighoul/icon.4bpp"); + const u32 gMonFrontPic_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/front.4bpp.lz"); + const u32 gMonPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/normal.gbapal.lz"); + const u32 gMonBackPic_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/back.4bpp.lz"); + const u32 gMonShinyPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/shiny.gbapal.lz"); + const u8 gMonIcon_GimmighoulChest[] = INCBIN_U8("graphics/pokemon/gen_9/gimmighoul/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Gimmighoul[] = INCBIN_U8("graphics/pokemon/gimmighoul/footprint.1bpp"); + // const u8 gMonFootprint_Gimmighoul[] = INCBIN_U8("graphics/pokemon/gen_9/gimmighoul/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/front.4bpp.lz"); - const u32 gMonPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/normal.gbapal.lz"); - const u32 gMonBackPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/back.4bpp.lz"); - const u32 gMonShinyPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/shiny.gbapal.lz"); - const u8 gMonIcon_GimmighoulRoaming[] = INCBIN_U8("graphics/pokemon/gimmighoul/roaming/icon.4bpp"); + const u32 gMonFrontPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/roaming/front.4bpp.lz"); + const u32 gMonPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/roaming/normal.gbapal.lz"); + const u32 gMonBackPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/roaming/back.4bpp.lz"); + const u32 gMonShinyPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gen_9/gimmighoul/roaming/shiny.gbapal.lz"); + const u8 gMonIcon_GimmighoulRoaming[] = INCBIN_U8("graphics/pokemon/gen_9/gimmighoul/roaming/icon.4bpp"); - const u32 gMonFrontPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/front.4bpp.lz"); - const u32 gMonPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/normal.gbapal.lz"); - const u32 gMonBackPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/back.4bpp.lz"); - const u32 gMonShinyPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/shiny.gbapal.lz"); - const u8 gMonIcon_Gholdengo[] = INCBIN_U8("graphics/pokemon/gholdengo/icon.4bpp"); + const u32 gMonFrontPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gen_9/gholdengo/front.4bpp.lz"); + const u32 gMonPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gen_9/gholdengo/normal.gbapal.lz"); + const u32 gMonBackPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gen_9/gholdengo/back.4bpp.lz"); + const u32 gMonShinyPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gen_9/gholdengo/shiny.gbapal.lz"); + const u8 gMonIcon_Gholdengo[] = INCBIN_U8("graphics/pokemon/gen_9/gholdengo/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Gholdengo[] = INCBIN_U8("graphics/pokemon/gholdengo/footprint.1bpp"); + // const u8 gMonFootprint_Gholdengo[] = INCBIN_U8("graphics/pokemon/gen_9/gholdengo/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_GIMMIGHOUL #if P_FAMILY_WO_CHIEN - const u32 gMonFrontPic_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/front.4bpp.lz"); - const u32 gMonPalette_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/normal.gbapal.lz"); - const u32 gMonBackPic_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/back.4bpp.lz"); - const u32 gMonShinyPalette_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/shiny.gbapal.lz"); - const u8 gMonIcon_WoChien[] = INCBIN_U8("graphics/pokemon/wo_chien/icon.4bpp"); + const u32 gMonFrontPic_WoChien[] = INCBIN_U32("graphics/pokemon/gen_9/wo_chien/front.4bpp.lz"); + const u32 gMonPalette_WoChien[] = INCBIN_U32("graphics/pokemon/gen_9/wo_chien/normal.gbapal.lz"); + const u32 gMonBackPic_WoChien[] = INCBIN_U32("graphics/pokemon/gen_9/wo_chien/back.4bpp.lz"); + const u32 gMonShinyPalette_WoChien[] = INCBIN_U32("graphics/pokemon/gen_9/wo_chien/shiny.gbapal.lz"); + const u8 gMonIcon_WoChien[] = INCBIN_U8("graphics/pokemon/gen_9/wo_chien/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_WoChien[] = INCBIN_U8("graphics/pokemon/wo_chien/footprint.1bpp"); + // const u8 gMonFootprint_WoChien[] = INCBIN_U8("graphics/pokemon/gen_9/wo_chien/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_WO_CHIEN #if P_FAMILY_CHIEN_PAO - const u32 gMonFrontPic_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/front.4bpp.lz"); - const u32 gMonPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/normal.gbapal.lz"); - const u32 gMonBackPic_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/back.4bpp.lz"); - const u32 gMonShinyPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/shiny.gbapal.lz"); - const u8 gMonIcon_ChienPao[] = INCBIN_U8("graphics/pokemon/chien_pao/icon.4bpp"); + const u32 gMonFrontPic_ChienPao[] = INCBIN_U32("graphics/pokemon/gen_9/chien_pao/front.4bpp.lz"); + const u32 gMonPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/gen_9/chien_pao/normal.gbapal.lz"); + const u32 gMonBackPic_ChienPao[] = INCBIN_U32("graphics/pokemon/gen_9/chien_pao/back.4bpp.lz"); + const u32 gMonShinyPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/gen_9/chien_pao/shiny.gbapal.lz"); + const u8 gMonIcon_ChienPao[] = INCBIN_U8("graphics/pokemon/gen_9/chien_pao/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_ChienPao[] = INCBIN_U8("graphics/pokemon/chien_pao/footprint.1bpp"); + // const u8 gMonFootprint_ChienPao[] = INCBIN_U8("graphics/pokemon/gen_9/chien_pao/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CHIEN_PAO #if P_FAMILY_TING_LU - const u32 gMonFrontPic_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/front.4bpp.lz"); - const u32 gMonPalette_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/normal.gbapal.lz"); - const u32 gMonBackPic_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/back.4bpp.lz"); - const u32 gMonShinyPalette_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/shiny.gbapal.lz"); - const u8 gMonIcon_TingLu[] = INCBIN_U8("graphics/pokemon/ting_lu/icon.4bpp"); + const u32 gMonFrontPic_TingLu[] = INCBIN_U32("graphics/pokemon/gen_9/ting_lu/front.4bpp.lz"); + const u32 gMonPalette_TingLu[] = INCBIN_U32("graphics/pokemon/gen_9/ting_lu/normal.gbapal.lz"); + const u32 gMonBackPic_TingLu[] = INCBIN_U32("graphics/pokemon/gen_9/ting_lu/back.4bpp.lz"); + const u32 gMonShinyPalette_TingLu[] = INCBIN_U32("graphics/pokemon/gen_9/ting_lu/shiny.gbapal.lz"); + const u8 gMonIcon_TingLu[] = INCBIN_U8("graphics/pokemon/gen_9/ting_lu/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_TingLu[] = INCBIN_U8("graphics/pokemon/ting_lu/footprint.1bpp"); + // const u8 gMonFootprint_TingLu[] = INCBIN_U8("graphics/pokemon/gen_9/ting_lu/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_TING_LU #if P_FAMILY_CHI_YU - const u32 gMonFrontPic_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/front.4bpp.lz"); - const u32 gMonPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/normal.gbapal.lz"); - const u32 gMonBackPic_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/back.4bpp.lz"); - const u32 gMonShinyPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/shiny.gbapal.lz"); - const u8 gMonIcon_ChiYu[] = INCBIN_U8("graphics/pokemon/chi_yu/icon.4bpp"); + const u32 gMonFrontPic_ChiYu[] = INCBIN_U32("graphics/pokemon/gen_9/chi_yu/front.4bpp.lz"); + const u32 gMonPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/gen_9/chi_yu/normal.gbapal.lz"); + const u32 gMonBackPic_ChiYu[] = INCBIN_U32("graphics/pokemon/gen_9/chi_yu/back.4bpp.lz"); + const u32 gMonShinyPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/gen_9/chi_yu/shiny.gbapal.lz"); + const u8 gMonIcon_ChiYu[] = INCBIN_U8("graphics/pokemon/gen_9/chi_yu/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_ChiYu[] = INCBIN_U8("graphics/pokemon/chi_yu/footprint.1bpp"); + // const u8 gMonFootprint_ChiYu[] = INCBIN_U8("graphics/pokemon/gen_9/chi_yu/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_CHI_YU #if P_FAMILY_ROARING_MOON - const u32 gMonFrontPic_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/front.4bpp.lz"); - const u32 gMonPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/normal.gbapal.lz"); - const u32 gMonBackPic_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/back.4bpp.lz"); - const u32 gMonShinyPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/shiny.gbapal.lz"); - const u8 gMonIcon_RoaringMoon[] = INCBIN_U8("graphics/pokemon/roaring_moon/icon.4bpp"); + const u32 gMonFrontPic_RoaringMoon[] = INCBIN_U32("graphics/pokemon/gen_9/roaring_moon/front.4bpp.lz"); + const u32 gMonPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/gen_9/roaring_moon/normal.gbapal.lz"); + const u32 gMonBackPic_RoaringMoon[] = INCBIN_U32("graphics/pokemon/gen_9/roaring_moon/back.4bpp.lz"); + const u32 gMonShinyPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/gen_9/roaring_moon/shiny.gbapal.lz"); + const u8 gMonIcon_RoaringMoon[] = INCBIN_U8("graphics/pokemon/gen_9/roaring_moon/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_RoaringMoon[] = INCBIN_U8("graphics/pokemon/roaring_moon/footprint.1bpp"); + // const u8 gMonFootprint_RoaringMoon[] = INCBIN_U8("graphics/pokemon/gen_9/roaring_moon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_ROARING_MOON #if P_FAMILY_IRON_VALIANT - const u32 gMonFrontPic_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/front.4bpp.lz"); - const u32 gMonPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/normal.gbapal.lz"); - const u32 gMonBackPic_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/back.4bpp.lz"); - const u32 gMonShinyPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/shiny.gbapal.lz"); - const u8 gMonIcon_IronValiant[] = INCBIN_U8("graphics/pokemon/iron_valiant/icon.4bpp"); + const u32 gMonFrontPic_IronValiant[] = INCBIN_U32("graphics/pokemon/gen_9/iron_valiant/front.4bpp.lz"); + const u32 gMonPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/gen_9/iron_valiant/normal.gbapal.lz"); + const u32 gMonBackPic_IronValiant[] = INCBIN_U32("graphics/pokemon/gen_9/iron_valiant/back.4bpp.lz"); + const u32 gMonShinyPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/gen_9/iron_valiant/shiny.gbapal.lz"); + const u8 gMonIcon_IronValiant[] = INCBIN_U8("graphics/pokemon/gen_9/iron_valiant/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_IronValiant[] = INCBIN_U8("graphics/pokemon/iron_valiant/footprint.1bpp"); + // const u8 gMonFootprint_IronValiant[] = INCBIN_U8("graphics/pokemon/gen_9/iron_valiant/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_VALIANT #if P_FAMILY_KORAIDON - const u32 gMonFrontPic_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/front.4bpp.lz"); - const u32 gMonPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/normal.gbapal.lz"); - const u32 gMonBackPic_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/back.4bpp.lz"); - const u32 gMonShinyPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/shiny.gbapal.lz"); - const u8 gMonIcon_Koraidon[] = INCBIN_U8("graphics/pokemon/koraidon/icon.4bpp"); + const u32 gMonFrontPic_Koraidon[] = INCBIN_U32("graphics/pokemon/gen_9/koraidon/front.4bpp.lz"); + const u32 gMonPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/gen_9/koraidon/normal.gbapal.lz"); + const u32 gMonBackPic_Koraidon[] = INCBIN_U32("graphics/pokemon/gen_9/koraidon/back.4bpp.lz"); + const u32 gMonShinyPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/gen_9/koraidon/shiny.gbapal.lz"); + const u8 gMonIcon_Koraidon[] = INCBIN_U8("graphics/pokemon/gen_9/koraidon/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Koraidon[] = INCBIN_U8("graphics/pokemon/koraidon/footprint.1bpp"); + // const u8 gMonFootprint_Koraidon[] = INCBIN_U8("graphics/pokemon/gen_9/koraidon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_KORAIDON #if P_FAMILY_MIRAIDON - const u32 gMonFrontPic_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/front.4bpp.lz"); - const u32 gMonPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/normal.gbapal.lz"); - const u32 gMonBackPic_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/back.4bpp.lz"); - const u32 gMonShinyPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/shiny.gbapal.lz"); - const u8 gMonIcon_Miraidon[] = INCBIN_U8("graphics/pokemon/miraidon/icon.4bpp"); + const u32 gMonFrontPic_Miraidon[] = INCBIN_U32("graphics/pokemon/gen_9/miraidon/front.4bpp.lz"); + const u32 gMonPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/gen_9/miraidon/normal.gbapal.lz"); + const u32 gMonBackPic_Miraidon[] = INCBIN_U32("graphics/pokemon/gen_9/miraidon/back.4bpp.lz"); + const u32 gMonShinyPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/gen_9/miraidon/shiny.gbapal.lz"); + const u8 gMonIcon_Miraidon[] = INCBIN_U8("graphics/pokemon/gen_9/miraidon/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Miraidon[] = INCBIN_U8("graphics/pokemon/miraidon/footprint.1bpp"); + // const u8 gMonFootprint_Miraidon[] = INCBIN_U8("graphics/pokemon/gen_9/miraidon/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MIRAIDON #if P_FAMILY_WALKING_WAKE - const u32 gMonFrontPic_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/front.4bpp.lz"); - const u32 gMonPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/normal.gbapal.lz"); - const u32 gMonBackPic_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/back.4bpp.lz"); - const u32 gMonShinyPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/shiny.gbapal.lz"); - const u8 gMonIcon_WalkingWake[] = INCBIN_U8("graphics/pokemon/walking_wake/icon.4bpp"); + const u32 gMonFrontPic_WalkingWake[] = INCBIN_U32("graphics/pokemon/gen_9/walking_wake/front.4bpp.lz"); + const u32 gMonPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/gen_9/walking_wake/normal.gbapal.lz"); + const u32 gMonBackPic_WalkingWake[] = INCBIN_U32("graphics/pokemon/gen_9/walking_wake/back.4bpp.lz"); + const u32 gMonShinyPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/gen_9/walking_wake/shiny.gbapal.lz"); + const u8 gMonIcon_WalkingWake[] = INCBIN_U8("graphics/pokemon/gen_9/walking_wake/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_WalkingWake[] = INCBIN_U8("graphics/pokemon/walking_wake/footprint.1bpp"); + // const u8 gMonFootprint_WalkingWake[] = INCBIN_U8("graphics/pokemon/gen_9/walking_wake/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_WALKING_WAKE #if P_FAMILY_IRON_LEAVES - const u32 gMonFrontPic_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/front.4bpp.lz"); - const u32 gMonPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/normal.gbapal.lz"); - const u32 gMonBackPic_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/back.4bpp.lz"); - const u32 gMonShinyPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/shiny.gbapal.lz"); - const u8 gMonIcon_IronLeaves[] = INCBIN_U8("graphics/pokemon/iron_leaves/icon.4bpp"); + const u32 gMonFrontPic_IronLeaves[] = INCBIN_U32("graphics/pokemon/gen_9/iron_leaves/front.4bpp.lz"); + const u32 gMonPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/gen_9/iron_leaves/normal.gbapal.lz"); + const u32 gMonBackPic_IronLeaves[] = INCBIN_U32("graphics/pokemon/gen_9/iron_leaves/back.4bpp.lz"); + const u32 gMonShinyPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/gen_9/iron_leaves/shiny.gbapal.lz"); + const u8 gMonIcon_IronLeaves[] = INCBIN_U8("graphics/pokemon/gen_9/iron_leaves/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_IronLeaves[] = INCBIN_U8("graphics/pokemon/iron_leaves/footprint.1bpp"); + // const u8 gMonFootprint_IronLeaves[] = INCBIN_U8("graphics/pokemon/gen_9/iron_leaves/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_LEAVES #if P_FAMILY_POLTCHAGEIST - const u32 gMonFrontPic_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/front.4bpp.lz"); - const u32 gMonPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/normal.gbapal.lz"); - const u32 gMonBackPic_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/back.4bpp.lz"); - const u32 gMonShinyPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/shiny.gbapal.lz"); - const u8 gMonIcon_Poltchageist[] = INCBIN_U8("graphics/pokemon/poltchageist/icon.4bpp"); + const u32 gMonFrontPic_Poltchageist[] = INCBIN_U32("graphics/pokemon/gen_9/poltchageist/front.4bpp.lz"); + const u32 gMonPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/gen_9/poltchageist/normal.gbapal.lz"); + const u32 gMonBackPic_Poltchageist[] = INCBIN_U32("graphics/pokemon/gen_9/poltchageist/back.4bpp.lz"); + const u32 gMonShinyPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/gen_9/poltchageist/shiny.gbapal.lz"); + const u8 gMonIcon_Poltchageist[] = INCBIN_U8("graphics/pokemon/gen_9/poltchageist/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Poltchageist[] = INCBIN_U8("graphics/pokemon/poltchageist/footprint.1bpp"); + // const u8 gMonFootprint_Poltchageist[] = INCBIN_U8("graphics/pokemon/gen_9/poltchageist/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/front.4bpp.lz"); - const u32 gMonPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/normal.gbapal.lz"); - const u32 gMonBackPic_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/back.4bpp.lz"); - const u32 gMonShinyPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/shiny.gbapal.lz"); - const u8 gMonIcon_Sinistcha[] = INCBIN_U8("graphics/pokemon/sinistcha/icon.4bpp"); + const u32 gMonFrontPic_Sinistcha[] = INCBIN_U32("graphics/pokemon/gen_9/sinistcha/front.4bpp.lz"); + const u32 gMonPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/gen_9/sinistcha/normal.gbapal.lz"); + const u32 gMonBackPic_Sinistcha[] = INCBIN_U32("graphics/pokemon/gen_9/sinistcha/back.4bpp.lz"); + const u32 gMonShinyPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/gen_9/sinistcha/shiny.gbapal.lz"); + const u8 gMonIcon_Sinistcha[] = INCBIN_U8("graphics/pokemon/gen_9/sinistcha/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Sinistcha[] = INCBIN_U8("graphics/pokemon/sinistcha/footprint.1bpp"); + // const u8 gMonFootprint_Sinistcha[] = INCBIN_U8("graphics/pokemon/gen_9/sinistcha/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_POLTCHAGEIST #if P_FAMILY_OKIDOGI - const u32 gMonFrontPic_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/front.4bpp.lz"); - const u32 gMonPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/normal.gbapal.lz"); - const u32 gMonBackPic_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/back.4bpp.lz"); - const u32 gMonShinyPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/shiny.gbapal.lz"); - const u8 gMonIcon_Okidogi[] = INCBIN_U8("graphics/pokemon/okidogi/icon.4bpp"); + const u32 gMonFrontPic_Okidogi[] = INCBIN_U32("graphics/pokemon/gen_9/okidogi/front.4bpp.lz"); + const u32 gMonPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/gen_9/okidogi/normal.gbapal.lz"); + const u32 gMonBackPic_Okidogi[] = INCBIN_U32("graphics/pokemon/gen_9/okidogi/back.4bpp.lz"); + const u32 gMonShinyPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/gen_9/okidogi/shiny.gbapal.lz"); + const u8 gMonIcon_Okidogi[] = INCBIN_U8("graphics/pokemon/gen_9/okidogi/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Okidogi[] = INCBIN_U8("graphics/pokemon/okidogi/footprint.1bpp"); + // const u8 gMonFootprint_Okidogi[] = INCBIN_U8("graphics/pokemon/gen_9/okidogi/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_OKIDOGI #if P_FAMILY_MUNKIDORI - const u32 gMonFrontPic_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/front.4bpp.lz"); - const u32 gMonPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/normal.gbapal.lz"); - const u32 gMonBackPic_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/back.4bpp.lz"); - const u32 gMonShinyPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/shiny.gbapal.lz"); - const u8 gMonIcon_Munkidori[] = INCBIN_U8("graphics/pokemon/munkidori/icon.4bpp"); + const u32 gMonFrontPic_Munkidori[] = INCBIN_U32("graphics/pokemon/gen_9/munkidori/front.4bpp.lz"); + const u32 gMonPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/gen_9/munkidori/normal.gbapal.lz"); + const u32 gMonBackPic_Munkidori[] = INCBIN_U32("graphics/pokemon/gen_9/munkidori/back.4bpp.lz"); + const u32 gMonShinyPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/gen_9/munkidori/shiny.gbapal.lz"); + const u8 gMonIcon_Munkidori[] = INCBIN_U8("graphics/pokemon/gen_9/munkidori/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Munkidori[] = INCBIN_U8("graphics/pokemon/munkidori/footprint.1bpp"); + // const u8 gMonFootprint_Munkidori[] = INCBIN_U8("graphics/pokemon/gen_9/munkidori/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_MUNKIDORI #if P_FAMILY_FEZANDIPITI - const u32 gMonFrontPic_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/front.4bpp.lz"); - const u32 gMonPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/normal.gbapal.lz"); - const u32 gMonBackPic_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/back.4bpp.lz"); - const u32 gMonShinyPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/shiny.gbapal.lz"); - const u8 gMonIcon_Fezandipiti[] = INCBIN_U8("graphics/pokemon/fezandipiti/icon.4bpp"); + const u32 gMonFrontPic_Fezandipiti[] = INCBIN_U32("graphics/pokemon/gen_9/fezandipiti/front.4bpp.lz"); + const u32 gMonPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/gen_9/fezandipiti/normal.gbapal.lz"); + const u32 gMonBackPic_Fezandipiti[] = INCBIN_U32("graphics/pokemon/gen_9/fezandipiti/back.4bpp.lz"); + const u32 gMonShinyPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/gen_9/fezandipiti/shiny.gbapal.lz"); + const u8 gMonIcon_Fezandipiti[] = INCBIN_U8("graphics/pokemon/gen_9/fezandipiti/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Fezandipiti[] = INCBIN_U8("graphics/pokemon/fezandipiti/footprint.1bpp"); + // const u8 gMonFootprint_Fezandipiti[] = INCBIN_U8("graphics/pokemon/gen_9/fezandipiti/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_FEZANDIPITI #if P_FAMILY_OGERPON - const u32 gMonFrontPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/front.4bpp.lz"); - const u32 gMonPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/normal.gbapal.lz"); - const u32 gMonBackPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/back.4bpp.lz"); - // const u32 gMonShinyPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/shiny.gbapal.lz"); - const u8 gMonIcon_OgerponTealMask[] = INCBIN_U8("graphics/pokemon/ogerpon/icon.4bpp"); + const u32 gMonFrontPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/front.4bpp.lz"); + const u32 gMonPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/normal.gbapal.lz"); + const u32 gMonBackPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/back.4bpp.lz"); + // const u32 gMonShinyPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/shiny.gbapal.lz"); + const u8 gMonIcon_OgerponTealMask[] = INCBIN_U8("graphics/pokemon/gen_9/ogerpon/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Ogerpon[] = INCBIN_U8("graphics/pokemon/ogerpon/footprint.1bpp"); + // const u8 gMonFootprint_Ogerpon[] = INCBIN_U8("graphics/pokemon/gen_9/ogerpon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/front.4bpp.lz"); - const u32 gMonPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/normal.gbapal.lz"); - const u32 gMonBackPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/back.4bpp.lz"); - // const u32 gMonShinyPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/shiny.gbapal.lz"); - // const u8 gMonIcon_OgerponWellspringMask[] = INCBIN_U8("graphics/pokemon/ogerpon/wellspring/icon.4bpp"); + const u32 gMonFrontPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/front.4bpp.lz"); + const u32 gMonPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/normal.gbapal.lz"); + const u32 gMonBackPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/back.4bpp.lz"); + // const u32 gMonShinyPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/shiny.gbapal.lz"); + // const u8 gMonIcon_OgerponWellspringMask[] = INCBIN_U8("graphics/pokemon/gen_9/ogerpon/wellspring/icon.4bpp"); - const u32 gMonFrontPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/front.4bpp.lz"); - const u32 gMonPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/normal.gbapal.lz"); - const u32 gMonBackPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/back.4bpp.lz"); - // const u32 gMonShinyPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/shiny.gbapal.lz"); - // const u8 gMonIcon_OgerponHearthflameMask[] = INCBIN_U8("graphics/pokemon/ogerpon/hearthflame/icon.4bpp"); + const u32 gMonFrontPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/front.4bpp.lz"); + const u32 gMonPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/normal.gbapal.lz"); + const u32 gMonBackPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/back.4bpp.lz"); + // const u32 gMonShinyPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/shiny.gbapal.lz"); + // const u8 gMonIcon_OgerponHearthflameMask[] = INCBIN_U8("graphics/pokemon/gen_9/ogerpon/hearthflame/icon.4bpp"); - const u32 gMonFrontPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/front.4bpp.lz"); - const u32 gMonPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/normal.gbapal.lz"); - const u32 gMonBackPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/back.4bpp.lz"); - // const u32 gMonShinyPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/shiny.gbapal.lz"); - // const u8 gMonIcon_OgerponCornerstoneMask[] = INCBIN_U8("graphics/pokemon/ogerpon/cornerstone/icon.4bpp"); + const u32 gMonFrontPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/front.4bpp.lz"); + const u32 gMonPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/normal.gbapal.lz"); + const u32 gMonBackPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/back.4bpp.lz"); + // const u32 gMonShinyPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/shiny.gbapal.lz"); + // const u8 gMonIcon_OgerponCornerstoneMask[] = INCBIN_U8("graphics/pokemon/gen_9/ogerpon/cornerstone/icon.4bpp"); - // const u32 gMonFrontPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/front.4bpp.lz"); - // const u32 gMonPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/normal.gbapal.lz"); - // const u32 gMonBackPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/back.4bpp.lz"); - // const u32 gMonShinyPalette_OgerponTealMaskTera[]] = INCBIN_U32("graphics/pokemon/ogerpon/tera/shiny.gbapal.lz"); + // const u32 gMonFrontPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/tera/front.4bpp.lz"); + // const u32 gMonPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/tera/normal.gbapal.lz"); + // const u32 gMonBackPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/tera/back.4bpp.lz"); + // const u32 gMonShinyPalette_OgerponTealMaskTera[]] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/tera/shiny.gbapal.lz"); - // const u32 gMonFrontPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/front.4bpp.lz"); - // const u32 gMonPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/normal.gbapal.lz"); - // const u32 gMonBackPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/back.4bpp.lz"); - // const u32 gMonShinyPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/shiny.gbapal.lz"); + // const u32 gMonFrontPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/tera/front.4bpp.lz"); + // const u32 gMonPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/tera/normal.gbapal.lz"); + // const u32 gMonBackPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/tera/back.4bpp.lz"); + // const u32 gMonShinyPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/wellspring/tera/shiny.gbapal.lz"); - // const u32 gMonFrontPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/front.4bpp.lz"); - // const u32 gMonPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/normal.gbapal.lz"); - // const u32 gMonBackPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/back.4bpp.lz"); - // const u32 gMonShinyPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/shiny.gbapal.lz"); + // const u32 gMonFrontPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/tera/front.4bpp.lz"); + // const u32 gMonPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/tera/normal.gbapal.lz"); + // const u32 gMonBackPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/tera/back.4bpp.lz"); + // const u32 gMonShinyPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/hearthflame/tera/shiny.gbapal.lz"); - // const u32 gMonFrontPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/front.4bpp.lz"); - // const u32 gMonPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/normal.gbapal.lz"); - // const u32 gMonBackPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/back.4bpp.lz"); - // const u32 gMonShinyPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/shiny.gbapal.lz"); + // const u32 gMonFrontPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/tera/front.4bpp.lz"); + // const u32 gMonPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/tera/normal.gbapal.lz"); + // const u32 gMonBackPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/tera/back.4bpp.lz"); + // const u32 gMonShinyPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/gen_9/ogerpon/cornerstone/tera/shiny.gbapal.lz"); #endif //P_FAMILY_OGERPON #if P_FAMILY_GOUGING_FIRE - // const u32 gMonFrontPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/front.4bpp.lz"); - // const u32 gMonPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/normal.gbapal.lz"); - // const u32 gMonBackPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/back.4bpp.lz"); - // const u32 gMonShinyPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/shiny.gbapal.lz"); - // const u8 gMonIcon_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/icon.4bpp"); + // const u32 gMonFrontPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gen_9/gouging_fire/front.4bpp.lz"); + // const u32 gMonPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gen_9/gouging_fire/normal.gbapal.lz"); + // const u32 gMonBackPic_GougingFire[] = INCBIN_U32("graphics/pokemon/gen_9/gouging_fire/back.4bpp.lz"); + // const u32 gMonShinyPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gen_9/gouging_fire/shiny.gbapal.lz"); + // const u8 gMonIcon_GougingFire[] = INCBIN_U8("graphics/pokemon/gen_9/gouging_fire/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/footprint.1bpp"); + // const u8 gMonFootprint_GougingFire[] = INCBIN_U8("graphics/pokemon/gen_9/gouging_fire/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_GOUGING_FIRE #if P_FAMILY_RAGING_BOLT - // const u32 gMonFrontPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/front.4bpp.lz"); - // const u32 gMonPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/normal.gbapal.lz"); - // const u32 gMonBackPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/back.4bpp.lz"); - // const u32 gMonShinyPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/shiny.gbapal.lz"); - // const u8 gMonIcon_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/icon.4bpp"); + // const u32 gMonFrontPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/gen_9/raging_bolt/front.4bpp.lz"); + // const u32 gMonPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/gen_9/raging_bolt/normal.gbapal.lz"); + // const u32 gMonBackPic_RagingBolt[] = INCBIN_U32("graphics/pokemon/gen_9/raging_bolt/back.4bpp.lz"); + // const u32 gMonShinyPalette_RagingBolt[] = INCBIN_U32("graphics/gen_9/pokemon/raging_bolt/shiny.gbapal.lz"); + // const u8 gMonIcon_RagingBolt[] = INCBIN_U8("graphics/pokemon/gen_9/raging_bolt/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/footprint.1bpp"); + // const u8 gMonFootprint_RagingBolt[] = INCBIN_U8("graphics/pokemon/gen_9/raging_bolt/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_RAGING_BOLT #if P_FAMILY_IRON_BOULDER - // const u32 gMonFrontPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/front.4bpp.lz"); - // const u32 gMonPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/normal.gbapal.lz"); - // const u32 gMonBackPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/back.4bpp.lz"); - // const u32 gMonShinyPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/shiny.gbapal.lz"); - // const u8 gMonIcon_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/icon.4bpp"); + // const u32 gMonFrontPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/gen_9/iron_boulder/front.4bpp.lz"); + // const u32 gMonPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/gen_9/iron_boulder/normal.gbapal.lz"); + // const u32 gMonBackPic_IronBoulder[] = INCBIN_U32("graphics/pokemon/gen_9/iron_boulder/back.4bpp.lz"); + // const u32 gMonShinyPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/gen_9/iron_boulder/shiny.gbapal.lz"); + // const u8 gMonIcon_IronBoulder[] = INCBIN_U8("graphics/pokemon/gen_9/iron_boulder/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/footprint.1bpp"); + // const u8 gMonFootprint_IronBoulder[] = INCBIN_U8("graphics/pokemon/gen_9/iron_boulder/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_BOULDER #if P_FAMILY_IRON_CROWN - // const u32 gMonFrontPic_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/front.4bpp.lz"); - // const u32 gMonPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/normal.gbapal.lz"); - // const u32 gMonBackPic_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/back.4bpp.lz"); - // const u32 gMonShinyPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/shiny.gbapal.lz"); - // const u8 gMonIcon_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/icon.4bpp"); + // const u32 gMonFrontPic_IronCrown[] = INCBIN_U32("graphics/pokemon/gen_9/iron_crown/front.4bpp.lz"); + // const u32 gMonPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/gen_9/iron_crown/normal.gbapal.lz"); + // const u32 gMonBackPic_IronCrown[] = INCBIN_U32("graphics/pokemon/gen_9/iron_crown/back.4bpp.lz"); + // const u32 gMonShinyPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/gen_9/iron_crown/shiny.gbapal.lz"); + // const u8 gMonIcon_IronCrown[] = INCBIN_U8("graphics/pokemon/gen_9/iron_crown/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/footprint.1bpp"); + // const u8 gMonFootprint_IronCrown[] = INCBIN_U8("graphics/pokemon/gen_9/iron_crown/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_IRON_CROWN #if P_FAMILY_TERAPAGOS - // const u32 gMonFrontPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/front.4bpp.lz"); - // const u32 gMonPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/normal.gbapal.lz"); - // const u32 gMonBackPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/back.4bpp.lz"); - // const u32 gMonShinyPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/shiny.gbapal.lz"); - // const u8 gMonIcon_TerapagosNormal[] = INCBIN_U8("graphics/pokemon/terapagos/icon.4bpp"); + // const u32 gMonFrontPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/front.4bpp.lz"); + // const u32 gMonPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/normal.gbapal.lz"); + // const u32 gMonBackPic_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/back.4bpp.lz"); + // const u32 gMonShinyPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/shiny.gbapal.lz"); + // const u8 gMonIcon_TerapagosNormal[] = INCBIN_U8("graphics/pokemon/gen_9/terapagos/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Terapagos[] = INCBIN_U8("graphics/pokemon/terapagos/footprint.1bpp"); + // const u8 gMonFootprint_Terapagos[] = INCBIN_U8("graphics/pokemon/gen_9/terapagos/footprint.1bpp"); #endif //P_FOOTPRINTS - // const u32 gMonFrontPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/front.4bpp.lz"); - // const u32 gMonPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/normal.gbapal.lz"); - // const u32 gMonBackPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/back.4bpp.lz"); - // const u32 gMonShinyPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/shiny.gbapal.lz"); - // const u8 gMonIcon_TerapagosTerastal[] = INCBIN_U8("graphics/pokemon/terapagos/terastal/icon.4bpp"); + // const u32 gMonFrontPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/terastal/front.4bpp.lz"); + // const u32 gMonPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/terastal/normal.gbapal.lz"); + // const u32 gMonBackPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/terastal/back.4bpp.lz"); + // const u32 gMonShinyPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/terastal/shiny.gbapal.lz"); + // const u8 gMonIcon_TerapagosTerastal[] = INCBIN_U8("graphics/pokemon/gen_9/terapagos/terastal/icon.4bpp"); - // const u32 gMonFrontPic_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/front.4bpp.lz"); - // const u32 gMonPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/normal.gbapal.lz"); - // const u32 gMonBackPic_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/back.4bpp.lz"); - // const u32 gMonShinyPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/shiny.gbapal.lz"); - // const u8 gMonIcon_TerapagosStellar[] = INCBIN_U8("graphics/pokemon/terapagos/stellar/icon.4bpp"); + // const u32 gMonFrontPic_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/stellar/front.4bpp.lz"); + // const u32 gMonPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/stellar/normal.gbapal.lz"); + // const u32 gMonBackPic_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/stellar/back.4bpp.lz"); + // const u32 gMonShinyPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/gen_9/terapagos/stellar/shiny.gbapal.lz"); + // const u8 gMonIcon_TerapagosStellar[] = INCBIN_U8("graphics/pokemon/gen_9/terapagos/stellar/icon.4bpp"); #endif //P_FAMILY_TERAPAGOS #if P_FAMILY_PECHARUNT - // const u32 gMonFrontPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/front.4bpp.lz"); - // const u32 gMonPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/normal.gbapal.lz"); - // const u32 gMonBackPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/back.4bpp.lz"); - // const u32 gMonShinyPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/shiny.gbapal.lz"); - // const u8 gMonIcon_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/icon.4bpp"); + // const u32 gMonFrontPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/gen_9/pecharunt/front.4bpp.lz"); + // const u32 gMonPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/gen_9/pecharunt/normal.gbapal.lz"); + // const u32 gMonBackPic_Pecharunt[] = INCBIN_U32("graphics/pokemon/gen_9/pecharunt/back.4bpp.lz"); + // const u32 gMonShinyPalette_Pecharunt[] = INCBIN_U32("graphics/gen_9/pokemon/pecharunt/shiny.gbapal.lz"); + // const u8 gMonIcon_Pecharunt[] = INCBIN_U8("graphics/pokemon/gen_9/pecharunt/icon.4bpp"); #if P_FOOTPRINTS - // const u8 gMonFootprint_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/footprint.1bpp"); + // const u8 gMonFootprint_Pecharunt[] = INCBIN_U8("graphics/pokemon/gen_9/pecharunt/footprint.1bpp"); #endif //P_FOOTPRINTS #endif //P_FAMILY_PECHARUNT diff --git a/src/pokemon.c b/src/pokemon.c index d02d2941de..5b055e9e80 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -354,10 +354,10 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = const struct SpindaSpot gSpindaSpotGraphics[] = { - {.x = 16, .y = 7, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_0.1bpp")}, - {.x = 40, .y = 8, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_1.1bpp")}, - {.x = 22, .y = 25, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_2.1bpp")}, - {.x = 34, .y = 26, .image = INCBIN_U16("graphics/pokemon/spinda/spots/spot_3.1bpp")} + {.x = 16, .y = 7, .image = INCBIN_U16("graphics/pokemon/gen_3/spinda/spots/spot_0.1bpp")}, + {.x = 40, .y = 8, .image = INCBIN_U16("graphics/pokemon/gen_3/spinda/spots/spot_1.1bpp")}, + {.x = 22, .y = 25, .image = INCBIN_U16("graphics/pokemon/gen_3/spinda/spots/spot_2.1bpp")}, + {.x = 34, .y = 26, .image = INCBIN_U16("graphics/pokemon/gen_3/spinda/spots/spot_3.1bpp")} }; #include "data/pokemon/item_effects.h" From d73c9b0b9de499d1362470d0caa69955a6fca5a8 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Mon, 8 Jan 2024 22:26:05 +0100 Subject: [PATCH 80/82] Fix some ball multiplier configs (#3939) * Fix some ball multiplier configs * Updated the comment of B_LURE_BALL_MODIFIER * Specified the effects of B_LURE_BALL_MODIFIER in itsa state its effects in a more specific manner Co-authored-by: Eduardo Quezada D'Ottone * Corrected the comments of B_DREAM_BALL_MODIFIER, B_SPORT_BALL_MODIFIER and B_SAFARI_BALL_MODIFIER Co-authored-by: Eduardo Quezada D'Ottone * Turned the ternaries in the case for the Lure Ball's catch rate in Cmd_handleballthrow into a regular if/else if statement Co-authored-by: Eduardo Quezada D'Ottone --------- Co-authored-by: LOuroboros Co-authored-by: Eduardo Quezada D'Ottone --- include/config/battle.h | 7 ++++--- src/battle_script_commands.c | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/include/config/battle.h b/include/config/battle.h index e963dc775b..b25060dcce 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -159,10 +159,11 @@ #define B_TIMER_BALL_MODIFIER GEN_LATEST // In Gen5+, Timer Ball's effectiveness increases by x0.3 per turn instead of x0.1 #define B_DUSK_BALL_MODIFIER GEN_LATEST // In Gen7+, Dusk Ball's catch multiplier is x3 instead of x3.5. #define B_QUICK_BALL_MODIFIER GEN_LATEST // In Gen5+, Quick Ball's catch multiplier is x5 instead of x4. -#define B_LURE_BALL_MODIFIER GEN_LATEST // In Gen7+, Lure Ball's catch multiplier is x5 instead of x3. +#define B_LURE_BALL_MODIFIER GEN_LATEST // In Gen8+, Lure Ball's catch multiplier is x4. In Gen7, it's x5. In Gen6 and earlier, it's x3. #define B_HEAVY_BALL_MODIFIER GEN_LATEST // In Gen7+, Heavy Ball's ranges change. See Cmd_handleballthrow. -#define B_DREAM_BALL_MODIFIER GEN_LATEST // In Gen8, Dream Ball's catch multiplier is x4 when the target is asleep or has the ability Comatose. -#define B_SPORT_BALL_MODIFIER GEN_LATEST // In Gen8, Sport Ball's catch multiplier was reduced from x1.5 to x1. +#define B_DREAM_BALL_MODIFIER GEN_LATEST // In Gen8+, Dream Ball's catch multiplier is x4 when the target is asleep or has the ability Comatose. +#define B_SPORT_BALL_MODIFIER GEN_LATEST // In Gen8+, Sport Ball's catch multiplier was reduced from x1.5 to x1. +#define B_SAFARI_BALL_MODIFIER GEN_LATEST // In Gen8+, Safari Ball's catch multiplier was reduced from x1.5 to x1. #define B_SERENE_GRACE_BOOST GEN_LATEST // In Gen5+, Serene Grace boosts the added flinch chance of King's Rock and Razor Fang. // Flag settings diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 51f6ebfd00..f848753da0 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -14839,10 +14839,14 @@ static void Cmd_handleballthrow(void) case ITEM_SPORT_BALL: if (B_SPORT_BALL_MODIFIER <= GEN_7) ballMultiplier = 150; + break; case ITEM_GREAT_BALL: - case ITEM_SAFARI_BALL: ballMultiplier = 150; break; + case ITEM_SAFARI_BALL: + if (B_SAFARI_BALL_MODIFIER <= GEN_7) + ballMultiplier = 150; + break; case ITEM_NET_BALL: if (IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_WATER) || IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_BUG)) ballMultiplier = B_NET_BALL_MODIFIER >= GEN_7 ? 350 : 300; @@ -14901,7 +14905,14 @@ static void Cmd_handleballthrow(void) break; case ITEM_LURE_BALL: if (gIsFishingEncounter) - ballMultiplier = (B_LURE_BALL_MODIFIER >= GEN_7 ? 500 : 300); + { + if (B_LURE_BALL_MODIFIER >= GEN_8) + ballMultiplier = 400; + else if (B_LURE_BALL_MODIFIER >= GEN_7) + ballMultiplier = 500; + else + ballMultiplier = 300; + } break; case ITEM_MOON_BALL: { From 0d75ccd2d2faedf613c28217c5660825afc704f0 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Tue, 9 Jan 2024 05:15:23 -0300 Subject: [PATCH 81/82] Stuff Cheeks cleanup (#3950) Co-authored-by: Biffalo XIII <--global> --- src/battle_util.c | 41 +++++----- test/battle/move_effect/stuff_cheeks.c | 106 +++++++++++++++++++++++++ test/battle/move_effect/teatime.c | 4 +- 3 files changed, 130 insertions(+), 21 deletions(-) create mode 100644 test/battle/move_effect/stuff_cheeks.c diff --git a/src/battle_util.c b/src/battle_util.c index 04ba26ed86..e61b5048e2 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1409,7 +1409,7 @@ u32 TrySetCantSelectMoveBattleScript(u32 battler) } } - if (DYNAMAX_BYPASS_CHECK && move == MOVE_STUFF_CHEEKS && ItemId_GetPocket(gBattleMons[battler].item) != POCKET_BERRIES) + if (DYNAMAX_BYPASS_CHECK && gBattleMoves[move].effect == EFFECT_STUFF_CHEEKS && ItemId_GetPocket(gBattleMons[battler].item) != POCKET_BERRIES) { gCurrentMove = move; if (gBattleTypeFlags & BATTLE_TYPE_PALACE) @@ -1456,7 +1456,7 @@ u32 TrySetCantSelectMoveBattleScript(u32 battler) limitations++; } } - else if (holdEffect == HOLD_EFFECT_ASSAULT_VEST && IS_MOVE_STATUS(move) && move != MOVE_ME_FIRST) + else if (holdEffect == HOLD_EFFECT_ASSAULT_VEST && IS_MOVE_STATUS(move) && gBattleMoves[move].effect != EFFECT_ME_FIRST) { if (IsDynamaxed(gBattlerAttacker)) gCurrentMove = MOVE_MAX_GUARD; @@ -1523,7 +1523,8 @@ u32 TrySetCantSelectMoveBattleScript(u32 battler) u8 CheckMoveLimitations(u32 battler, u8 unusableMoves, u16 check) { - u8 holdEffect = GetBattlerHoldEffect(battler, TRUE); + u32 move, moveEffect; + u32 holdEffect = GetBattlerHoldEffect(battler, TRUE); u16 *choicedMove = &gBattleStruct->choicedMove[battler]; s32 i; @@ -1531,56 +1532,58 @@ u8 CheckMoveLimitations(u32 battler, u8 unusableMoves, u16 check) for (i = 0; i < MAX_MON_MOVES; i++) { + move = gBattleMons[battler].moves[i]; + moveEffect = gBattleMoves[move].effect; // No move - if (check & MOVE_LIMITATION_ZEROMOVE && gBattleMons[battler].moves[i] == MOVE_NONE) + if (check & MOVE_LIMITATION_ZEROMOVE && move == MOVE_NONE) unusableMoves |= gBitTable[i]; // No PP else if (check & MOVE_LIMITATION_PP && gBattleMons[battler].pp[i] == 0) unusableMoves |= gBitTable[i]; // Placeholder - else if (check & MOVE_LIMITATION_PLACEHOLDER && gBattleMoves[gBattleMons[battler].moves[i]].effect == EFFECT_PLACEHOLDER) + else if (check & MOVE_LIMITATION_PLACEHOLDER && moveEffect == EFFECT_PLACEHOLDER) unusableMoves |= gBitTable[i]; // Disable - else if (check & MOVE_LIMITATION_DISABLED && gBattleMons[battler].moves[i] == gDisableStructs[battler].disabledMove) + else if (check & MOVE_LIMITATION_DISABLED && move == gDisableStructs[battler].disabledMove) unusableMoves |= gBitTable[i]; // Torment - else if (check & MOVE_LIMITATION_TORMENTED && gBattleMons[battler].moves[i] == gLastMoves[battler] && gBattleMons[battler].status2 & STATUS2_TORMENT) + else if (check & MOVE_LIMITATION_TORMENTED && move == gLastMoves[battler] && gBattleMons[battler].status2 & STATUS2_TORMENT) unusableMoves |= gBitTable[i]; // Taunt - else if (check & MOVE_LIMITATION_TAUNT && gDisableStructs[battler].tauntTimer && IS_MOVE_STATUS(gBattleMons[battler].moves[i])) + else if (check & MOVE_LIMITATION_TAUNT && gDisableStructs[battler].tauntTimer && IS_MOVE_STATUS(move)) unusableMoves |= gBitTable[i]; // Imprison - else if (check & MOVE_LIMITATION_IMPRISON && GetImprisonedMovesCount(battler, gBattleMons[battler].moves[i])) + else if (check & MOVE_LIMITATION_IMPRISON && GetImprisonedMovesCount(battler, move)) unusableMoves |= gBitTable[i]; // Encore - else if (check & MOVE_LIMITATION_ENCORE && gDisableStructs[battler].encoreTimer && gDisableStructs[battler].encoredMove != gBattleMons[battler].moves[i]) + else if (check & MOVE_LIMITATION_ENCORE && gDisableStructs[battler].encoreTimer && gDisableStructs[battler].encoredMove != move) unusableMoves |= gBitTable[i]; // Choice Items - else if (check & MOVE_LIMITATION_CHOICE_ITEM && HOLD_EFFECT_CHOICE(holdEffect) && *choicedMove != MOVE_NONE && *choicedMove != MOVE_UNAVAILABLE && *choicedMove != gBattleMons[battler].moves[i]) + else if (check & MOVE_LIMITATION_CHOICE_ITEM && HOLD_EFFECT_CHOICE(holdEffect) && *choicedMove != MOVE_NONE && *choicedMove != MOVE_UNAVAILABLE && *choicedMove != move) unusableMoves |= gBitTable[i]; // Assault Vest - else if (check & MOVE_LIMITATION_ASSAULT_VEST && holdEffect == HOLD_EFFECT_ASSAULT_VEST && IS_MOVE_STATUS(gBattleMons[battler].moves[i]) && gBattleMons[battler].moves[i] != MOVE_ME_FIRST) + else if (check & MOVE_LIMITATION_ASSAULT_VEST && holdEffect == HOLD_EFFECT_ASSAULT_VEST && IS_MOVE_STATUS(move) && gBattleMoves[move].effect != EFFECT_ME_FIRST) unusableMoves |= gBitTable[i]; // Gravity - else if (check & MOVE_LIMITATION_GRAVITY && IsGravityPreventingMove(gBattleMons[battler].moves[i])) + else if (check & MOVE_LIMITATION_GRAVITY && IsGravityPreventingMove(move)) unusableMoves |= gBitTable[i]; // Heal Block - else if (check & MOVE_LIMITATION_HEAL_BLOCK && IsHealBlockPreventingMove(battler, gBattleMons[battler].moves[i])) + else if (check & MOVE_LIMITATION_HEAL_BLOCK && IsHealBlockPreventingMove(battler, move)) unusableMoves |= gBitTable[i]; // Belch - else if (check & MOVE_LIMITATION_BELCH && IsBelchPreventingMove(battler, gBattleMons[battler].moves[i])) + else if (check & MOVE_LIMITATION_BELCH && IsBelchPreventingMove(battler, move)) unusableMoves |= gBitTable[i]; // Throat Chop - else if (check & MOVE_LIMITATION_THROAT_CHOP && gDisableStructs[battler].throatChopTimer && gBattleMoves[gBattleMons[battler].moves[i]].soundMove) + else if (check & MOVE_LIMITATION_THROAT_CHOP && gDisableStructs[battler].throatChopTimer && gBattleMoves[move].soundMove) unusableMoves |= gBitTable[i]; // Stuff Cheeks - else if (check & MOVE_LIMITATION_STUFF_CHEEKS && gBattleMons[battler].moves[i] == MOVE_STUFF_CHEEKS && ItemId_GetPocket(gBattleMons[battler].item) != POCKET_BERRIES) + else if (check & MOVE_LIMITATION_STUFF_CHEEKS && moveEffect == EFFECT_STUFF_CHEEKS && ItemId_GetPocket(gBattleMons[battler].item) != POCKET_BERRIES) unusableMoves |= gBitTable[i]; // Gorilla Tactics - else if (check & MOVE_LIMITATION_CHOICE_ITEM && GetBattlerAbility(battler) == ABILITY_GORILLA_TACTICS && *choicedMove != MOVE_NONE && *choicedMove != MOVE_UNAVAILABLE && *choicedMove != gBattleMons[battler].moves[i]) + else if (check & MOVE_LIMITATION_CHOICE_ITEM && GetBattlerAbility(battler) == ABILITY_GORILLA_TACTICS && *choicedMove != MOVE_NONE && *choicedMove != MOVE_UNAVAILABLE && *choicedMove != move) unusableMoves |= gBitTable[i]; // Can't Use Twice flag - else if (check & MOVE_LIMITATION_CANT_USE_TWICE && gBattleMoves[gBattleMons[battler].moves[i]].cantUseTwice && gBattleMons[battler].moves[i] == gLastResultingMoves[battler]) + else if (check & MOVE_LIMITATION_CANT_USE_TWICE && gBattleMoves[move].cantUseTwice && move == gLastResultingMoves[battler]) unusableMoves |= gBitTable[i]; } return unusableMoves; diff --git a/test/battle/move_effect/stuff_cheeks.c b/test/battle/move_effect/stuff_cheeks.c new file mode 100644 index 0000000000..e0d1e5aadc --- /dev/null +++ b/test/battle/move_effect/stuff_cheeks.c @@ -0,0 +1,106 @@ +#include "global.h" +#include "test/battle.h" + +ASSUMPTIONS +{ + ASSUME(gBattleMoves[MOVE_STUFF_CHEEKS].effect == EFFECT_STUFF_CHEEKS); + ASSUME(gItems[ITEM_LIECHI_BERRY].pocket == POCKET_BERRIES); + ASSUME(gItems[ITEM_LIECHI_BERRY].holdEffect == HOLD_EFFECT_ATTACK_UP); +} + +SINGLE_BATTLE_TEST("Stuff Cheeks cannot be used if the user doesn't hold a berry") +{ + u16 item = 0; + PARAMETRIZE { item = ITEM_NONE; } + PARAMETRIZE { item = ITEM_LIECHI_BERRY; } + GIVEN { + PLAYER(SPECIES_SKWOVET) { Item(item); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + if (item == ITEM_NONE) + TURN { MOVE(player, MOVE_STUFF_CHEEKS, allowed: FALSE); MOVE(player, MOVE_CELEBRATE); } + else + TURN { MOVE(player, MOVE_STUFF_CHEEKS); } + } SCENE { + if (item == ITEM_NONE) + ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, player); + else + ANIMATION(ANIM_TYPE_MOVE, MOVE_STUFF_CHEEKS, player); + } +} + +SINGLE_BATTLE_TEST("Stuff Cheeks forces Struggle if it's the only move is blocked") +{ + GIVEN { + PLAYER(SPECIES_SKWOVET) { Moves(MOVE_STUFF_CHEEKS); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_STUFF_CHEEKS, allowed: FALSE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_STRUGGLE, player); + } +} + +SINGLE_BATTLE_TEST("Stuff Cheeks raises Defense by 2 stages after consuming the berry and gaining its effect") +{ + GIVEN { + PLAYER(SPECIES_SKWOVET) { Item(ITEM_LIECHI_BERRY); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_STUFF_CHEEKS); } + } SCENE { + MESSAGE("Skwovet used Stuff Cheeks!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_STUFF_CHEEKS, player); + MESSAGE("Using Liechi Berry, the Attack of Skwovet rose!"); + MESSAGE("Skwovet's Defense sharply rose!"); + } THEN { + EXPECT_EQ(player->statStages[STAT_DEF], DEFAULT_STAT_STAGE + 2); + EXPECT_EQ(player->item, ITEM_NONE); + } +} + +SINGLE_BATTLE_TEST("Stuff Cheeks can be used even if Unnerve is present") +{ + GIVEN { + PLAYER(SPECIES_SKWOVET) { Item(ITEM_LIECHI_BERRY); } + OPPONENT(SPECIES_EKANS) { Ability(ABILITY_UNNERVE); } + } WHEN { + TURN { MOVE(player, MOVE_STUFF_CHEEKS); } + } SCENE { + MESSAGE("Skwovet used Stuff Cheeks!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_STUFF_CHEEKS, player); + } +} + +SINGLE_BATTLE_TEST("Stuff Cheeks can be used even if Magic Room is active") +{ + GIVEN { + PLAYER(SPECIES_SKWOVET) { Item(ITEM_LIECHI_BERRY); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { + MOVE(opponent, MOVE_MAGIC_ROOM); + MOVE(player, MOVE_STUFF_CHEEKS); + } + } SCENE { + MESSAGE("Skwovet used Stuff Cheeks!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_STUFF_CHEEKS, player); + MESSAGE("Using Liechi Berry, the Attack of Skwovet rose!"); + } +} + +SINGLE_BATTLE_TEST("Stuff Cheeks fails if the user's berry is removed before they use the move") +{ + GIVEN { + ASSUME(gBattleMoves[MOVE_KNOCK_OFF].effect == EFFECT_KNOCK_OFF); + PLAYER(SPECIES_SKWOVET) { Item(ITEM_LIECHI_BERRY); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, MOVE_KNOCK_OFF); MOVE(player, MOVE_STUFF_CHEEKS); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_KNOCK_OFF, opponent); + MESSAGE("Skwovet used Stuff Cheeks!"); + MESSAGE("But it failed!"); + } +} + diff --git a/test/battle/move_effect/teatime.c b/test/battle/move_effect/teatime.c index 2d7c7426e8..4d00205a2d 100644 --- a/test/battle/move_effect/teatime.c +++ b/test/battle/move_effect/teatime.c @@ -35,14 +35,14 @@ SINGLE_BATTLE_TEST("Teatime causes the user to consume its Berry, even in the pr } } -SINGLE_BATTLE_TEST("Teatime causes the user to consume its Berry, even under the effects of Wonder Room") +SINGLE_BATTLE_TEST("Teatime causes the user to consume its Berry, even under the effects of Magic Room") { GIVEN { PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_LIECHI_BERRY); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { - MOVE(opponent, MOVE_WONDER_ROOM); + MOVE(opponent, MOVE_MAGIC_ROOM); MOVE(player, MOVE_TEATIME); } } SCENE { From c56acb944b3e669df37270a86f57f57c12223f64 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Tue, 9 Jan 2024 18:47:23 +0100 Subject: [PATCH 82/82] New Feature: Level Caps (#3632) * New Feature: Level Caps * B_LEVEL_CAP_EXP_UP and fixes * 1 exp fix for hard level caps * remove 1 exp hack * Reviews applied * fix u8/u16 --------- Co-authored-by: Bassoonian --- include/level_caps.h | 37 ++++++++++++++++++ src/battle_controller_player.c | 3 +- src/battle_interface.c | 3 +- src/battle_script_commands.c | 5 ++- src/daycare.c | 5 ++- src/level_caps.c | 71 ++++++++++++++++++++++++++++++++++ src/party_menu.c | 3 +- src/pokemon.c | 3 +- 8 files changed, 123 insertions(+), 7 deletions(-) create mode 100644 include/level_caps.h create mode 100644 src/level_caps.c diff --git a/include/level_caps.h b/include/level_caps.h new file mode 100644 index 0000000000..ed70ac665b --- /dev/null +++ b/include/level_caps.h @@ -0,0 +1,37 @@ +#ifndef GUARD_LEVEL_CAP_H +#define GUARD_LEVEL_CAP_H + +// experience (soft-)caps + +#define EXP_CAP_NONE 0 // Regular behavior, no level caps are applied +#define EXP_CAP_HARD 1 // Pokémon with a level >= the level cap cannot gain any experience +#define EXP_CAP_SOFT 2 // Pokémon with a level >= the level cap will gain reduced experience + +#define LEVEL_CAP_NONE 0 // No level cap, only applicable if B_EXP_CAP_TYPE is EXP_CAP_NONE +#define LEVEL_CAP_FLAG_LIST 1 // Level cap is chosen according to the first unset flag in `sLevelCapFlagMap` +#define LEVEL_CAP_VARIABLE 2 // Level cap is chosen according to the contents of the event variable specified by B_LEVEL_CAP_VARIABLE + +#define B_EXP_CAP_TYPE EXP_CAP_NONE // [EXP_CAP_NONE, EXP_CAP_HARD, EXP_CAP_SOFT] choose the type of level cap to apply +#define B_LEVEL_CAP_TYPE LEVEL_CAP_NONE // [LEVEL_CAP_NONE, LEVEL_CAP_FLAG_LIST, LEVEL_CAP_VARIABLE] choose the method to derive the level cap +#define B_LEVEL_CAP_VARIABLE 0 // event variable used to derive level cap if B_LEVEL_CAP_TYPE is set to LEVEL_CAP_VARIABLE + +#define B_RARE_CANDY_CAP FALSE // If set to true, Rare Candies can't be used to go over the level cap +#define B_LEVEL_CAP_EXP_UP FALSE // If set to true, mons under level cap will receive more experience + +#if B_EXP_CAP_TYPE != EXP_CAP_NONE && B_EXP_CAP_TYPE != EXP_CAP_HARD && B_EXP_CAP_TYPE != EXP_CAP_SOFT +#error "Invalid choice for B_EXP_CAP_TYPE, must be of [EXP_CAP_NONE, EXP_CAP_HARD, EXP_CAP_SOFT]" +#endif + +#if B_EXP_CAP_TYPE == EXP_CAP_HARD || B_EXP_CAP_TYPE == EXP_CAP_SOFT +#if B_LEVEL_CAP_TYPE != LEVEL_CAP_FLAG_LIST && B_LEVEL_CAP_TYPE != LEVEL_CAP_VARIABLE +#error "Invalid choice for B_LEVEL_CAP_TYPE, must be of [LEVEL_CAP_FLAG_LIST, LEVEL_CAP_VARIABLE]" +#endif +#if B_LEVEL_CAP_TYPE == LEVEL_CAP_VARIABLE && B_LEVEL_CAP_VARIABLE == 0 +#error "B_LEVEL_CAP_TYPE set to LEVEL_CAP_VARIABLE, but no variable chosen for B_LEVEL_CAP_VARIABLE, set B_LEVEL_CAP_VARIABLE to a valid event variable" +#endif +#endif + +u32 GetCurrentLevelCap(void); +u32 GetSoftLevelCapExpValue(u32 level, u32 expValue); + +#endif /* GUARD_LEVEL_CAP_H */ diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index ec5945d633..ba16ef2dbb 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -39,6 +39,7 @@ #include "constants/songs.h" #include "constants/trainers.h" #include "constants/rgb.h" +#include "level_caps.h" static void PlayerBufferExecCompleted(u32 battler); static void PlayerHandleLoadMonSprite(u32 battler); @@ -2145,7 +2146,7 @@ void PlayerHandleExpUpdate(u32 battler) u8 monId = gBattleResources->bufferA[battler][1]; s32 taskId, expPointsToGive; - if (GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL) >= MAX_LEVEL) + if (GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL) >= GetCurrentLevelCap()) { PlayerBufferExecCompleted(battler); } diff --git a/src/battle_interface.c b/src/battle_interface.c index 3357fd9939..830c7f41cc 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -33,6 +33,7 @@ #include "constants/rgb.h" #include "constants/songs.h" #include "constants/items.h" +#include "level_caps.h" enum { // Corresponds to gHealthboxElementsGfxTable (and the tables after it) in graphics.c @@ -2687,7 +2688,7 @@ static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar) &gBattleSpritesDataPtr->battleBars[battlerId].currValue, array, B_EXPBAR_PIXELS / 8); level = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_LEVEL); - if (level == MAX_LEVEL) + if (level >= GetCurrentLevelCap()) { for (i = 0; i < 8; i++) array[i] = 0; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 1624a9a7b3..b4ae183f76 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -27,6 +27,7 @@ #include "bg.h" #include "string_util.h" #include "pokemon_icon.h" +#include "level_caps.h" #include "m4a.h" #include "mail.h" #include "event_data.h" @@ -4239,14 +4240,14 @@ static void Cmd_getexp(void) if (IsValidForBattle(&gPlayerParty[*expMonId])) { if (wasSentOut) - gBattleMoveDamage = gBattleStruct->expValue; + gBattleMoveDamage = GetSoftLevelCapExpValue(gPlayerParty[*expMonId].level, gBattleStruct->expValue); else gBattleMoveDamage = 0; if ((holdEffect == HOLD_EFFECT_EXP_SHARE || IsGen6ExpShareEnabled()) && (B_SPLIT_EXP < GEN_6 || gBattleMoveDamage == 0)) // only give exp share bonus in later gens if the mon wasn't sent out { - gBattleMoveDamage += gBattleStruct->expShareExpValue; + gBattleMoveDamage += GetSoftLevelCapExpValue(gPlayerParty[*expMonId].level, gBattleStruct->expShareExpValue);; } ApplyExperienceMultipliers(&gBattleMoveDamage, *expMonId, gBattlerFainted); diff --git a/src/daycare.c b/src/daycare.c index e8426b4c00..6ecc4c7669 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -3,6 +3,7 @@ #include "battle.h" #include "daycare.h" #include "string_util.h" +#include "level_caps.h" #include "mail.h" #include "pokemon_storage_system.h" #include "event_data.h" @@ -316,7 +317,7 @@ static u16 TakeSelectedPokemonFromDaycare(struct DaycareMon *daycareMon) species = newSpecies; } - if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_LEVEL) + if (GetMonData(&pokemon, MON_DATA_LEVEL) < GetCurrentLevelCap()) { experience = GetMonData(&pokemon, MON_DATA_EXP) + daycareMon->steps; SetMonData(&pokemon, MON_DATA_EXP, &experience); @@ -365,6 +366,8 @@ static u8 GetNumLevelsGainedFromSteps(struct DaycareMon *daycareMon) levelBefore = GetLevelFromBoxMonExp(&daycareMon->mon); levelAfter = GetLevelAfterDaycareSteps(&daycareMon->mon, daycareMon->steps); + if (levelAfter > GetCurrentLevelCap()) + levelAfter = GetCurrentLevelCap(); return levelAfter - levelBefore; } diff --git a/src/level_caps.c b/src/level_caps.c new file mode 100644 index 0000000000..9a51edccb0 --- /dev/null +++ b/src/level_caps.c @@ -0,0 +1,71 @@ +#include "global.h" +#include "battle.h" +#include "event_data.h" +#include "level_caps.h" +#include "pokemon.h" + + +u32 GetCurrentLevelCap(void) +{ + static const u32 sLevelCapFlagMap[][2] = + { + {FLAG_BADGE01_GET, 15}, + {FLAG_BADGE02_GET, 19}, + {FLAG_BADGE03_GET, 24}, + {FLAG_BADGE04_GET, 29}, + {FLAG_BADGE05_GET, 31}, + {FLAG_BADGE06_GET, 33}, + {FLAG_BADGE07_GET, 42}, + {FLAG_BADGE08_GET, 46}, + {FLAG_IS_CHAMPION, 58}, + }; + + u32 i; + + if (B_LEVEL_CAP_TYPE == LEVEL_CAP_FLAG_LIST) + { + for (i = 0; i < ARRAY_COUNT(sLevelCapFlagMap); i++) + { + if (!FlagGet(sLevelCapFlagMap[i][0])) + return sLevelCapFlagMap[i][1]; + } + } + else if (B_LEVEL_CAP_TYPE == LEVEL_CAP_VARIABLE) + { + return VarGet(B_LEVEL_CAP_VARIABLE); + } + + return MAX_LEVEL; +} + +u32 GetSoftLevelCapExpValue(u32 level, u32 expValue) +{ + static const u32 sExpScalingDown[5] = { 4, 8, 16, 32, 64 }; + static const u32 sExpScalingUp[5] = { 16, 8, 4, 2, 1 }; + + u32 levelDifference; + u32 currentLevelCap = GetCurrentLevelCap(); + + if (B_EXP_CAP_TYPE == EXP_CAP_NONE) + return expValue; + + if (B_LEVEL_CAP_EXP_UP && level < currentLevelCap) + { + levelDifference = currentLevelCap - level; + if (levelDifference > ARRAY_COUNT(sExpScalingDown)) + return expValue + (expValue / sExpScalingUp[ARRAY_COUNT(sExpScalingDown) - 1]); + else + return expValue + (expValue / sExpScalingUp[levelDifference]); + } + else if (B_EXP_CAP_TYPE == EXP_CAP_SOFT && level >= currentLevelCap) + { + levelDifference = level - currentLevelCap; + if (levelDifference > ARRAY_COUNT(sExpScalingDown)) + return expValue / sExpScalingDown[ARRAY_COUNT(sExpScalingDown) - 1]; + else + return expValue / sExpScalingDown[levelDifference]; + } + else + return 0; + +} diff --git a/src/party_menu.c b/src/party_menu.c index 4eced9536f..54d8ec41b7 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -31,6 +31,7 @@ #include "item.h" #include "item_menu.h" #include "item_use.h" +#include "level_caps.h" #include "link.h" #include "link_rfu.h" #include "mail.h" @@ -5512,7 +5513,7 @@ void ItemUseCB_RareCandy(u8 taskId, TaskFunc task) u8 holdEffectParam = ItemId_GetHoldEffectParam(*itemPtr); sInitialLevel = GetMonData(mon, MON_DATA_LEVEL); - if (sInitialLevel != MAX_LEVEL) + if (!(B_RARE_CANDY_CAP && sInitialLevel >= GetCurrentLevelCap())) { BufferMonStatsToTaskData(mon, arrayPtr); cannotUseEffect = ExecuteTableBasedItemEffect(mon, *itemPtr, gPartyMenu.slotId, 0); diff --git a/src/pokemon.c b/src/pokemon.c index ac70d41d1d..cb4a08366d 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -17,6 +17,7 @@ #include "field_weather.h" #include "graphics.h" #include "item.h" +#include "level_caps.h" #include "link.h" #include "main.h" #include "overworld.h" @@ -5054,7 +5055,7 @@ bool8 TryIncrementMonLevel(struct Pokemon *mon) expPoints = gExperienceTables[gSpeciesInfo[species].growthRate][MAX_LEVEL]; SetMonData(mon, MON_DATA_EXP, &expPoints); } - if (nextLevel > MAX_LEVEL || expPoints < gExperienceTables[gSpeciesInfo[species].growthRate][nextLevel]) + if (nextLevel > GetCurrentLevelCap() || expPoints < gExperienceTables[gSpeciesInfo[species].growthRate][nextLevel]) { return FALSE; }