From 569fa0a60a49fd7794af53c9a77a2fb1fb074200 Mon Sep 17 00:00:00 2001 From: sbird Date: Sun, 15 Jan 2023 13:41:10 +0100 Subject: [PATCH 01/57] [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/57] [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/57] [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/57] [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/57] [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/57] [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/57] [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/57] 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/57] [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 e5ac2fe0b152cb3b51b07ef36d562f1300936802 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Tue, 12 Dec 2023 19:02:36 +0100 Subject: [PATCH 10/57] Clean up pokemon/ball/dex mentions in comments --- include/battle.h | 6 ++-- include/constants/battle_palace.h | 4 +-- include/constants/field_specials.h | 2 +- include/constants/global.h | 4 +-- include/constants/items.h | 4 +-- include/constants/pokedex.h | 6 ++-- include/constants/pokemon.h | 12 +++---- include/constants/tv.h | 2 +- include/contest.h | 2 +- include/global.h | 4 +-- include/graphics.h | 8 ++--- include/pokemon_summary_screen.h | 2 +- include/strings.h | 6 ++-- src/battle_ai_script_commands.c | 8 ++--- src/battle_ai_switch_items.c | 6 ++-- src/battle_anim_mon_movement.c | 2 +- src/battle_anim_mons.c | 4 +-- src/battle_controller_link_opponent.c | 2 +- src/battle_controller_link_partner.c | 2 +- src/battle_controller_opponent.c | 2 +- src/battle_controller_player.c | 6 ++-- src/battle_controller_player_partner.c | 2 +- src/battle_controller_recorded_opponent.c | 2 +- src/battle_controller_recorded_player.c | 2 +- src/battle_controller_wally.c | 2 +- src/battle_dome.c | 16 ++++----- src/battle_factory.c | 8 ++--- src/battle_factory_screen.c | 34 +++++++++--------- src/battle_gfx_sfx_util.c | 6 ++-- src/battle_message.c | 4 +-- src/battle_pike.c | 2 +- src/battle_script_commands.c | 10 +++--- src/battle_setup.c | 4 +-- src/battle_tent.c | 4 +-- src/battle_tower.c | 36 +++++++++---------- src/battle_transition.c | 2 +- src/battle_tv.c | 2 +- src/battle_util.c | 10 +++--- src/birch_pc.c | 2 +- src/contest.c | 10 +++--- src/credits.c | 22 ++++++------ src/data/bard_music/bard_sounds.h | 4 +-- .../battle_frontier_trainer_mons.h | 2 +- src/data/party_menu.h | 6 ++-- src/data/pokemon/pokedex_orders.h | 2 +- src/daycare.c | 6 ++-- src/field_effect.c | 2 +- src/fldeff_misc.c | 2 +- src/frontier_util.c | 4 +-- src/graphics.c | 8 ++--- src/hall_of_fame.c | 2 +- src/lottery_corner.c | 2 +- src/move_relearner.c | 2 +- src/overworld.c | 6 ++-- src/party_menu.c | 6 ++-- src/pokeball.c | 6 ++-- src/pokedex.c | 8 ++--- src/pokemon.c | 2 +- src/pokemon_storage_system.c | 6 ++-- src/pokemon_summary_screen.c | 12 +++---- src/rom_header_gf.c | 2 +- src/roulette.c | 8 ++--- src/save_location.c | 4 +-- src/script_pokemon_util.c | 2 +- src/sound.c | 4 +-- src/start_menu.c | 2 +- src/starter_choose.c | 12 +++---- src/title_screen.c | 6 ++-- src/trade.c | 30 ++++++++-------- src/trainer_pokemon_sprites.c | 2 +- src/tv.c | 2 +- src/use_pokeblock.c | 12 +++---- src/wild_encounter.c | 8 ++--- 73 files changed, 228 insertions(+), 228 deletions(-) diff --git a/include/battle.h b/include/battle.h index 68beaf219f..6c4d780186 100644 --- a/include/battle.h +++ b/include/battle.h @@ -420,7 +420,7 @@ struct BattleStruct u8 arenaTurnCounter; u8 turnSideTracker; u8 unused_6[3]; - u8 givenExpMons; // Bits for enemy party's pokemon that gave exp to player's party. + u8 givenExpMons; // Bits for enemy party's Pokémon that gave exp to player's party. u8 lastTakenMoveFrom[MAX_BATTLERS_COUNT * MAX_BATTLERS_COUNT * 2]; // a 3-D array [target][attacker][byte] u16 castformPalette[NUM_CASTFORM_FORMS][16]; union { @@ -440,7 +440,7 @@ struct BattleStruct u16 arenaStartHp[2]; u8 arenaLostPlayerMons; // Bits for party member, lost as in referee's decision, not by fainting. u8 arenaLostOpponentMons; - u8 alreadyStatusedMoveAttempt; // As bits for battlers; For example when using Thunder Wave on an already paralyzed pokemon. + u8 alreadyStatusedMoveAttempt; // As bits for battlers; For example when using Thunder Wave on an already paralyzed Pokémon. }; // The palaceFlags member of struct BattleStruct contains 1 flag per move to indicate which moves the AI should consider, @@ -595,7 +595,7 @@ struct BattleSpriteData struct MonSpritesGfx { - void *firstDecompressed; // ptr to the decompressed sprite of the first pokemon + void *firstDecompressed; // ptr to the decompressed sprite of the first Pokémon union { void *ptr[MAX_BATTLERS_COUNT]; u8 *byte[MAX_BATTLERS_COUNT]; diff --git a/include/constants/battle_palace.h b/include/constants/battle_palace.h index 8516550892..1d8c2f2dda 100644 --- a/include/constants/battle_palace.h +++ b/include/constants/battle_palace.h @@ -16,12 +16,12 @@ #define PALACE_DATA_WIN_STREAK 1 #define PALACE_DATA_WIN_STREAK_ACTIVE 2 -// Pokemon in Battle Palace have a move "group" type preference depending on nature +// Pokémon in Battle Palace have a move "group" type preference depending on nature #define PALACE_MOVE_GROUP_ATTACK 0 #define PALACE_MOVE_GROUP_DEFENSE 1 #define PALACE_MOVE_GROUP_SUPPORT 2 -// In palace doubles battles pokemon have a target preference depending on nature +// In palace doubles battles Pokémon have a target preference depending on nature #define PALACE_TARGET_STRONGER 0 #define PALACE_TARGET_WEAKER 1 #define PALACE_TARGET_RANDOM 2 diff --git a/include/constants/field_specials.h b/include/constants/field_specials.h index 6659403313..1e08a47f95 100644 --- a/include/constants/field_specials.h +++ b/include/constants/field_specials.h @@ -62,7 +62,7 @@ #define DEPT_STORE_FLOORNUM_11F 14 #define DEPT_STORE_FLOORNUM_ROOFTOP 15 -// Lilycove Pokemon Trainer Fan Club +// Lilycove Pokémon Trainer Fan Club #define NUM_TRAINER_FAN_CLUB_MEMBERS 8 #define FANCLUB_GOT_FIRST_FANS 7 diff --git a/include/constants/global.h b/include/constants/global.h index 2b70378ff5..b409e80eb1 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -2,9 +2,9 @@ #define GUARD_CONSTANTS_GLOBAL_H // Invalid Versions show as "----------" in Gen 4 and Gen 5's summary screen. // In Gens 6 and 7, invalid versions instead show "a distant land" in the summary screen. -// In Gen 4 only, migrated Pokemon with Diamond, Pearl, or Platinum's ID show as "----------". +// In Gen 4 only, migrated Pokémon with Diamond, Pearl, or Platinum's ID show as "----------". // Gen 5 and up read Diamond, Pearl, or Platinum's ID as "Sinnoh". -// In Gen 4 and up, migrated Pokemon with HeartGold or SoulSilver's ID show the otherwise unused "Johto" string. +// In Gen 4 and up, migrated Pokémon with HeartGold or SoulSilver's ID show the otherwise unused "Johto" string. #define VERSION_SAPPHIRE 1 #define VERSION_RUBY 2 #define VERSION_EMERALD 3 diff --git a/include/constants/items.h b/include/constants/items.h index 63cbfe6b97..ed9bfb5ec8 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -23,7 +23,7 @@ #define FIRST_BALL ITEM_MASTER_BALL #define LAST_BALL ITEM_PREMIER_BALL -// Pokemon Items +// Pokémon Items #define ITEM_POTION 13 #define ITEM_ANTIDOTE 14 #define ITEM_BURN_HEAL 15 @@ -476,7 +476,7 @@ #define ITEM_B_USE_MEDICINE 1 #define ITEM_B_USE_OTHER 2 -// Check if the item is one that can be used on a Pokemon. +// Check if the item is one that can be used on a Pokémon. #define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= MAX_BERRY_INDEX) #endif // GUARD_CONSTANTS_ITEMS_H diff --git a/include/constants/pokedex.h b/include/constants/pokedex.h index 7ee1b3760e..c9c51623e5 100644 --- a/include/constants/pokedex.h +++ b/include/constants/pokedex.h @@ -1,7 +1,7 @@ #ifndef GUARD_CONSTANTS_POKEDEX_H #define GUARD_CONSTANTS_POKEDEX_H -// National Pokedex order +// National Pokédex order enum { NATIONAL_DEX_NONE, // Kanto @@ -425,7 +425,7 @@ enum { #define JOHTO_DEX_COUNT NATIONAL_DEX_CELEBI #define NATIONAL_DEX_COUNT NATIONAL_DEX_DEOXYS -// Hoenn Pokedex order +// Hoenn Pokédex order enum { HOENN_DEX_NONE, HOENN_DEX_TREECKO, @@ -631,7 +631,7 @@ enum { HOENN_DEX_JIRACHI, HOENN_DEX_DEOXYS, // End of Hoenn Dex (see HOENN_DEX_COUNT) - // Here below have values but are excluded from the Pokedex + // Here below have values but are excluded from the Pokédex HOENN_DEX_BULBASAUR, HOENN_DEX_IVYSAUR, HOENN_DEX_VENUSAUR, diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 6265c027aa..0d6a20e2b9 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -1,7 +1,7 @@ #ifndef GUARD_CONSTANTS_POKEMON_H #define GUARD_CONSTANTS_POKEMON_H -// Pokemon types +// Pokémon types #define TYPE_NONE 255 #define TYPE_NORMAL 0 #define TYPE_FIGHTING 1 @@ -23,7 +23,7 @@ #define TYPE_DARK 17 #define NUMBER_OF_MON_TYPES 18 -// Pokemon egg groups +// Pokémon egg groups #define EGG_GROUP_NONE 0 #define EGG_GROUP_MONSTER 1 #define EGG_GROUP_WATER_1 2 @@ -43,7 +43,7 @@ #define EGG_GROUPS_PER_MON 2 -// Pokemon natures +// Pokémon natures #define NATURE_HARDY 0 #define NATURE_LONELY 1 #define NATURE_BRAVE 2 @@ -71,7 +71,7 @@ #define NATURE_QUIRKY 24 #define NUM_NATURES 25 -// Pokemon Stats +// Pokémon Stats #define STAT_HP 0 #define STAT_ATK 1 #define STAT_DEF 2 @@ -220,7 +220,7 @@ #define GROWTH_FAST 4 #define GROWTH_SLOW 5 -// Body colors for pokedex search +// Body colors for Pokédex search #define BODY_COLOR_RED 0 #define BODY_COLOR_BLUE 1 #define BODY_COLOR_YELLOW 2 @@ -263,7 +263,7 @@ #define MON_PIC_HEIGHT 64 #define MON_PIC_SIZE (MON_PIC_WIDTH * MON_PIC_HEIGHT / 2) -// Most pokemon have 2 frames (a default and an alternate for their animation). +// Most Pokémon have 2 frames (a default and an alternate for their animation). // There are 4 exceptions: // - Castform has 4 frames, 1 for each form // - Deoxys has 2 frames, 1 for each form diff --git a/include/constants/tv.h b/include/constants/tv.h index 13ec88ecdc..1b629fb039 100644 --- a/include/constants/tv.h +++ b/include/constants/tv.h @@ -170,7 +170,7 @@ #define NUM_SECRET_BASE_FLAGS 32 // by definition, bitfield of 2 u16s -// TV Show states for Pokemon Contest Live Updates +// TV Show states for Pokémon Contest Live Updates #define CONTESTLIVE_STATE_INTRO 0 #define CONTESTLIVE_STATE_WON_BOTH_ROUNDS 1 #define CONTESTLIVE_STATE_BETTER_ROUND2 2 diff --git a/include/contest.h b/include/contest.h index d0630a8011..9328188b97 100644 --- a/include/contest.h +++ b/include/contest.h @@ -209,7 +209,7 @@ struct ContestantStatus u8 comboAppealBonus; u8 repeatJam; u8 nextTurnOrder; // turn position - u8 attentionLevel; // How much the Pokemon "stood out" + u8 attentionLevel; // How much the Pokémon "stood out" u8 contestantAnimTarget; }; diff --git a/include/global.h b/include/global.h index e6d58f36e0..1ea3b65d64 100644 --- a/include/global.h +++ b/include/global.h @@ -135,7 +135,7 @@ #define ROUND_BITS_TO_BYTES(numBits) DIV_ROUND_UP(numBits, 8) // NUM_DEX_FLAG_BYTES allocates more flags than it needs to, as NUM_SPECIES includes the "old unown" -// values that don't appear in the Pokedex. NATIONAL_DEX_COUNT does not include these values. +// values that don't appear in the Pokédex. NATIONAL_DEX_COUNT does not include these values. #define NUM_DEX_FLAG_BYTES ROUND_BITS_TO_BYTES(NUM_SPECIES) #define NUM_FLAG_BYTES ROUND_BITS_TO_BYTES(FLAGS_COUNT) #define NUM_TRENDY_SAYING_BYTES ROUND_BITS_TO_BYTES(NUM_TRENDY_SAYINGS) @@ -520,7 +520,7 @@ struct SaveBlock2 /*0x90*/ u8 filler_90[0x8]; /*0x98*/ struct Time localTimeOffset; /*0xA0*/ struct Time lastBerryTreeUpdate; - /*0xA8*/ u32 gcnLinkFlags; // Read by Pokemon Colosseum/XD + /*0xA8*/ u32 gcnLinkFlags; // Read by Pokémon Colosseum/XD /*0xAC*/ u32 encryptionKey; /*0xB0*/ struct PlayersApprentice playerApprentice; /*0xDC*/ struct Apprentice apprentices[APPRENTICE_COUNT]; diff --git a/include/graphics.h b/include/graphics.h index 5b13ab562f..e98b707957 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -32,7 +32,7 @@ extern const u32 gBallGfx_Premier[]; extern const u32 gBallPal_Premier[]; extern const u32 gOpenPokeballGfx[]; -// pokemon gfx +// Pokémon gfx extern const u32 gMonFrontPic_Bulbasaur[]; extern const u32 gMonPalette_Bulbasaur[]; extern const u32 gMonBackPic_Bulbasaur[]; @@ -3282,7 +3282,7 @@ extern const u32 gBattleTerrainPalette_StadiumGlacia[]; extern const u32 gBattleTerrainPalette_StadiumDrake[]; extern const u32 gBattleTerrainPalette_StadiumWallace[]; -// pokedex +// Pokédex extern const u32 gPokedexInterface_Gfx[]; extern const u16 gPokedexBgHoenn_Pal[]; extern const u32 gPokedexMenu_Gfx[]; @@ -4879,11 +4879,11 @@ extern const u16 gSlotMachineReelTimePikachu_Pal[]; extern const u32 gBattleAnimBgTilemap_Sandstorm[]; extern const u32 gBattleAnimBgImage_Sandstorm[]; -// Pokedex Area Screen +// Pokédex Area Screen extern const u32 gPokedexAreaScreenAreaUnknown_Gfx[]; extern const u16 gPokedexAreaScreenAreaUnknown_Pal[]; -// Pokemon Storage System +// Pokémon Storage System extern const u32 gStorageSystemMenu_Gfx[]; extern const u16 gStorageSystemPartyMenu_Pal[]; extern const u32 gStorageSystemPartyMenu_Tilemap[]; diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index b026baa533..df9e477524 100755 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -14,7 +14,7 @@ void ShowPokemonSummaryScreenHandleDeoxys(u8 mode, struct BoxPokemon *mons, u8 m u8 GetMoveSlotToReplace(void); void SummaryScreen_SetAnimDelayTaskId(u8 taskId); -// The Pokemon Summary Screen can operate in different modes. Certain features, +// The Pokémon Summary Screen can operate in different modes. Certain features, // such as move re-ordering, are available in the different modes. enum PokemonSummaryScreenMode { diff --git a/include/strings.h b/include/strings.h index eeada2b943..914082779b 100644 --- a/include/strings.h +++ b/include/strings.h @@ -519,7 +519,7 @@ extern const u8 gText_Speed[]; extern const u8 gText_Dash[]; extern const u8 gText_Plus[]; -//pokedex text +//Pokédex text extern const u8 gText_CryOf[]; extern const u8 gText_SizeComparedTo[]; extern const u8 gText_PokedexRegistration[]; @@ -1121,7 +1121,7 @@ extern const u8 gTrickHouse_Mechadoll_Six2[]; extern const u8 gTrickHouse_Mechadoll_Seven2[]; extern const u8 gTrickHouse_Mechadoll_Eight2[]; -// Pokedex strings +// Pokédex strings extern const u8 gText_SearchForPkmnBasedOnParameters[]; extern const u8 gText_SwitchPokedexListings[]; extern const u8 gText_ReturnToPokedex[]; @@ -2874,7 +2874,7 @@ extern const u8 gText_WantToPlayAgain[]; extern const u8 gText_CommunicationStandby3[]; extern const u8 gText_SomeoneDroppedOut[]; -// Pokemon jump +// Pokémon jump extern const u8 gText_WantToPlayAgain2[]; extern const u8 gText_SomeoneDroppedOut2[]; extern const u8 gText_CommunicationStandby4[]; diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index d8a9760ff2..4cb4c51654 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -1392,7 +1392,7 @@ static void Cmd_get_ability(void) } else { - AI_THINKING_STRUCT->funcResult = gSpeciesInfo[gBattleMons[battlerId].species].abilities[1]; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1. + AI_THINKING_STRUCT->funcResult = gSpeciesInfo[gBattleMons[battlerId].species].abilities[1]; // AI can't actually reach this part since no Pokémon has ability 2 and no ability 1. } } else @@ -1445,7 +1445,7 @@ static void Cmd_check_ability(void) } else { - ability = gSpeciesInfo[gBattleMons[battlerId].species].abilities[1]; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1. + ability = gSpeciesInfo[gBattleMons[battlerId].species].abilities[1]; // AI can't actually reach this part since no Pokémon has ability 2 and no ability 1. } } else @@ -1457,9 +1457,9 @@ static void Cmd_check_ability(void) if (ability == 0) AI_THINKING_STRUCT->funcResult = 2; // Unable to answer. else if (ability == gAIScriptPtr[2]) - AI_THINKING_STRUCT->funcResult = 1; // Pokemon has the ability we wanted to check. + AI_THINKING_STRUCT->funcResult = 1; // Pokémon has the ability we wanted to check. else - AI_THINKING_STRUCT->funcResult = 0; // Pokemon doesn't have the ability we wanted to check. + AI_THINKING_STRUCT->funcResult = 0; // Pokémon doesn't have the ability we wanted to check. gAIScriptPtr += 3; } diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 06cdd6c82f..5ef15b627a 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -51,7 +51,7 @@ static bool8 ShouldSwitchIfWonderGuard(void) if (gBattleMons[GetBattlerAtPosition(opposingPosition)].ability != ABILITY_WONDER_GUARD) return FALSE; - // Check if Pokemon has a super effective move. + // Check if Pokémon has a super effective move. for (opposingBattler = GetBattlerAtPosition(opposingPosition), i = 0; i < MAX_MON_MOVES; i++) { move = gBattleMons[gActiveBattler].moves[i]; @@ -81,7 +81,7 @@ static bool8 ShouldSwitchIfWonderGuard(void) else party = gEnemyParty; - // Find a Pokemon in the party that has a super effective move. + // Find a Pokémon in the party that has a super effective move. for (i = firstId; i < lastId; i++) { if (GetMonData(&party[i], MON_DATA_HP) == 0) @@ -113,7 +113,7 @@ static bool8 ShouldSwitchIfWonderGuard(void) } } - return FALSE; // There is not a single Pokemon in the party that has a super effective move against a mon with Wonder Guard. + return FALSE; // There is not a single Pokémon in the party that has a super effective move against a mon with Wonder Guard. } static bool8 FindMonThatAbsorbsOpponentsMove(void) diff --git a/src/battle_anim_mon_movement.c b/src/battle_anim_mon_movement.c index 247aba1a42..4c8e79cb9f 100644 --- a/src/battle_anim_mon_movement.c +++ b/src/battle_anim_mon_movement.c @@ -535,7 +535,7 @@ static void SlideMonToOriginalPos_Step(struct Sprite *sprite) } // Linearly translates a mon to a target offset. The horizontal offset -// is mirrored for the opponent's pokemon, and the vertical offset +// is mirrored for the opponent's Pokémon, and the vertical offset // is only mirrored if arg 3 is set to 1. // arg 0: 0 = attacker, 1 = target // arg 1: target x pixel offset diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index 6dd0d20852..d28ec804fe 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -77,7 +77,7 @@ static const u8 sCastformBackSpriteYCoords[NUM_CASTFORM_FORMS] = [CASTFORM_ICE] = 0, }; -// Placeholders for pokemon sprites to be created for a move animation effect (e.g. Role Play / Snatch) +// Placeholders for Pokémon sprites to be created for a move animation effect (e.g. Role Play / Snatch) #define TAG_MOVE_EFFECT_MON_1 55125 #define TAG_MOVE_EFFECT_MON_2 55126 @@ -2085,7 +2085,7 @@ u8 GetBattlerSpriteBGPriorityRank(u8 battlerId) return 1; } -// Create pokemon sprite to be used for a move animation effect (e.g. Role Play / Snatch) +// Create Pokémon sprite to be used for a move animation effect (e.g. Role Play / Snatch) u8 CreateAdditionalMonSpriteForMoveAnim(u16 species, bool8 isBackpic, u8 id, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, bool32 ignoreDeoxysForm) { u8 spriteId; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 2104298775..236db2a428 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -529,7 +529,7 @@ static void LinkOpponentBufferExecCompleted(void) static void LinkOpponentHandleGetMonData(void) { - u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two pokemon, trying to get more will result in overwriting data + u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two Pokémon, trying to get more will result in overwriting data u32 size = 0; u8 monToCheck; s32 i; diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 054563ad3a..7a437b958c 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -423,7 +423,7 @@ static void CompleteOnFinishedBattleAnimation(void) static void LinkPartnerHandleGetMonData(void) { - u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two pokemon, trying to get more will result in overwriting data + u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two Pokémon, trying to get more will result in overwriting data u32 size = 0; u8 monToCheck; s32 i; diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index e434e3ee62..e5284f9abc 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -534,7 +534,7 @@ static void OpponentBufferExecCompleted(void) static void OpponentHandleGetMonData(void) { - u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two pokemon, trying to get more will result in overwriting data + u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two Pokémon, trying to get more will result in overwriting data u32 size = 0; u8 monToCheck; s32 i; diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 357912d4b6..8e09d126c9 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -981,12 +981,12 @@ static void Intro_TryShinyAnimShowHealthbox(void) bool32 bgmRestored = FALSE; bool32 battlerAnimsDone = FALSE; - // Start shiny animation if applicable for 1st pokemon + // Start shiny animation if applicable for 1st Pokémon if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive) TryShinyAnimation(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]); - // Start shiny animation if applicable for 2nd pokemon + // Start shiny animation if applicable for 2nd Pokémon if (!gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].triedShinyMonAnim && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].ballAnimActive) TryShinyAnimation(BATTLE_PARTNER(gActiveBattler), &gPlayerParty[gBattlerPartyIndexes[BATTLE_PARTNER(gActiveBattler)]]); @@ -1581,7 +1581,7 @@ static void PrintLinkStandbyMsg(void) static void PlayerHandleGetMonData(void) { - u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two pokemon, trying to get more will result in overwriting data + u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two Pokémon, trying to get more will result in overwriting data u32 size = 0; u8 monToCheck; s32 i; diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 236a66ce83..307eeca26a 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -607,7 +607,7 @@ static void CompleteOnFinishedBattleAnimation(void) static void PlayerPartnerHandleGetMonData(void) { - u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two pokemon, trying to get more will result in overwriting data + u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two Pokémon, trying to get more will result in overwriting data u32 size = 0; u8 monToCheck; s32 i; diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 9c37cd0a92..7cb5839bc5 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -515,7 +515,7 @@ static void RecordedOpponentBufferExecCompleted(void) static void RecordedOpponentHandleGetMonData(void) { - u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two pokemon, trying to get more will result in overwriting data + u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two Pokémon, trying to get more will result in overwriting data u32 size = 0; u8 monToCheck; s32 i; diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 591ddb67e3..5a7be7f347 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -498,7 +498,7 @@ static void CompleteOnFinishedBattleAnimation(void) static void RecordedPlayerHandleGetMonData(void) { - u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two pokemon, trying to get more will result in overwriting data + u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two Pokémon, trying to get more will result in overwriting data u32 size = 0; u8 monToCheck; s32 i; diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index ce357319a5..67950b8965 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -425,7 +425,7 @@ static void UNUSED CompleteOnFinishedStatusAnimation(void) static void WallyHandleGetMonData(void) { - u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two pokemon, trying to get more will result in overwriting data + u8 monData[sizeof(struct Pokemon) * 2 + 56]; // this allows to get full data of two Pokémon, trying to get more will result in overwriting data u32 size = 0; u8 monToCheck; s32 i; diff --git a/src/battle_dome.c b/src/battle_dome.c index 8364515e59..68cae14a6e 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -2588,7 +2588,7 @@ static void CreateDomeOpponentMon(u8 monPartyId, u16 tournamentTrainerId, u8 tou #ifdef BUGFIX u8 fixedIv = GetDomeTrainerMonIvs(DOME_TRAINERS[tournamentTrainerId].trainerId); #else - u8 fixedIv = GetDomeTrainerMonIvs(tournamentTrainerId); // BUG: Using the wrong ID. As a result, all Pokemon have ivs of 3. + u8 fixedIv = GetDomeTrainerMonIvs(tournamentTrainerId); // BUG: Using the wrong ID. As a result, all Pokémon have ivs of 3. #endif u8 level = SetFacilityPtrsGetLevel(); CreateMonWithEVSpreadNatureOTID(&gEnemyParty[monPartyId], @@ -2650,13 +2650,13 @@ static void CreateDomeOpponentMons(u16 tournamentTrainerId) } } -// Returns a bitmask representing which 2 of the trainer's 3 pokemon to select. +// Returns a bitmask representing which 2 of the trainer's 3 Pokémon to select. // The choice is calculated solely depending on the type effectiveness of their -// movesets against the player's pokemon. +// movesets against the player's Pokémon. // There is a 50% chance of either a "good" or "bad" selection mode being used. // In the good mode movesets are preferred which are more effective against the -// player, and in the bad mode the opposite is true. If all 3 pokemon tie, the -// other mode will be tried. If they tie again, the pokemon selection is random. +// player, and in the bad mode the opposite is true. If all 3 Pokémon tie, the +// other mode will be tried. If they tie again, the Pokémon selection is random. int GetDomeTrainerSelectedMons(u16 tournamentTrainerId) { int selectedMonBits; @@ -4837,7 +4837,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) if (lost[1]) gSprites[sInfoCard->spriteIds[1 + arrId]].oam.paletteNum = 3; - // Draw left trainer's pokemon icons. + // Draw left trainer's Pokémon icons. for (i = 0; i < FRONTIER_PARTY_SIZE; i++) { if (trainerIds[0] == TRAINER_PLAYER) @@ -4877,7 +4877,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) } } - // Draw right trainer's pokemon icons. + // Draw right trainer's Pokémon icons. for (i = 0; i < FRONTIER_PARTY_SIZE; i++) { if (trainerIds[1] == TRAINER_PLAYER) @@ -5228,7 +5228,7 @@ static u16 GetWinningMove(int winnerTournamentId, int loserTournamentId, u8 roun int movePower = 0; SetFacilityPtrsGetLevel(); - // Calc move points of all 4 moves for all 3 pokemon hitting all 3 target mons. + // Calc move points of all 4 moves for all 3 Pokémon hitting all 3 target mons. for (i = 0; i < FRONTIER_PARTY_SIZE; i++) { for (j = 0; j < MAX_MON_MOVES; j++) diff --git a/src/battle_factory.c b/src/battle_factory.c index 0f4ed9816d..faed16ebb0 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -337,7 +337,7 @@ static void GenerateOpponentMons(void) if (gFacilityTrainerMons[monId].species == SPECIES_UNOWN) continue; - // Ensure none of the opponent's pokemon are the same as the potential rental pokemon for the player + // Ensure none of the opponent's Pokémon are the same as the potential rental Pokémon for the player for (j = 0; j < (int)ARRAY_COUNT(gSaveBlock2Ptr->frontier.rentalMons); j++) { if (gFacilityTrainerMons[monId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.rentalMons[j].monId].species) @@ -346,7 +346,7 @@ static void GenerateOpponentMons(void) if (j != (int)ARRAY_COUNT(gSaveBlock2Ptr->frontier.rentalMons)) continue; - // "High tier" pokemon are only allowed on open level mode + // "High tier" Pokémon are only allowed on open level mode if (lvlMode == FRONTIER_LVL_50 && monId > FRONTIER_MONS_HIGH_TIER) continue; @@ -554,7 +554,7 @@ static void GenerateInitialRentalMons(void) i = 0; while (i != PARTY_SIZE) { - if (i < rentalRank) // The more times the player has rented, the more initial rentals are generated from a better set of pokemon + if (i < rentalRank) // The more times the player has rented, the more initial rentals are generated from a better set of Pokémon monId = GetFactoryMonId(factoryLvlMode, challengeNum, TRUE); else monId = GetFactoryMonId(factoryLvlMode, challengeNum, FALSE); @@ -562,7 +562,7 @@ static void GenerateInitialRentalMons(void) if (gFacilityTrainerMons[monId].species == SPECIES_UNOWN) continue; - // Cannot have two pokemon of the same species. + // Cannot have two Pokémon of the same species. for (j = firstMonId; j < firstMonId + i; j++) { u16 existingMonId = monIds[j]; diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index a543e64c93..0533d1e2a3 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -32,15 +32,15 @@ #include "constants/songs.h" #include "constants/rgb.h" -// Select_ refers to the first Pokemon selection screen where you choose your initial 3 rental Pokemon. -// Swap_ refers to the subsequent selection screens where you can swap a Pokemon with one from the beaten trainer +// Select_ refers to the first Pokémon selection screen where you choose your initial 3 rental Pokémon. +// Swap_ refers to the subsequent selection screens where you can swap a Pokémon with one from the beaten trainer // Note that, generally, "Action" will refer to the immediate actions that can be taken on each screen, -// i.e. selecting a pokemon or selecting the Cancel button +// i.e. selecting a Pokémon or selecting the Cancel button // The "Options menu" will refer to the popup menu that shows when some actions have been selected -#define SWAP_PLAYER_SCREEN 0 // The screen where the player selects which of their pokemon to swap away -#define SWAP_ENEMY_SCREEN 1 // The screen where the player selects which new pokemon from the defeated party to swap for +#define SWAP_PLAYER_SCREEN 0 // The screen where the player selects which of their Pokémon to swap away +#define SWAP_ENEMY_SCREEN 1 // The screen where the player selects which new Pokémon from the defeated party to swap for #define SELECTABLE_MONS_COUNT 6 @@ -89,7 +89,7 @@ struct FactorySelectableMon { u16 monId; u16 ballSpriteId; - u8 selectedId; // 0 - not selected, 1 - first pokemon, 2 - second pokemon, 3 - third pokemon + u8 selectedId; // 0 - not selected, 1 - first Pokémon, 2 - second Pokémon, 3 - third Pokémon struct Pokemon monData; }; @@ -1060,7 +1060,7 @@ static void SpriteCB_Pokeball(struct Sprite *sprite) { if (sprite->oam.paletteNum == IndexOfSpritePaletteTag(PALTAG_BALL_SELECTED)) { - // Pokeball selected, do rocking animation + // Poké Ball selected, do rocking animation if (sprite->animEnded) { if (sprite->data[0] != 0) @@ -1084,7 +1084,7 @@ static void SpriteCB_Pokeball(struct Sprite *sprite) } else { - // Pokeball not selected, remain still + // Poké Ball not selected, remain still StartSpriteAnimIfDifferent(sprite, 0); } } @@ -1521,7 +1521,7 @@ static void Select_Task_Exit(u8 taskId) } } -// Handles the Yes/No prompt when confirming the 3 selected rental pokemon +// Handles the Yes/No prompt when confirming the 3 selected rental Pokémon static void Select_Task_HandleYesNo(u8 taskId) { if (sFactorySelectScreen->monPicAnimating == TRUE) @@ -1543,14 +1543,14 @@ static void Select_Task_HandleYesNo(u8 taskId) PlaySE(SE_SELECT); if (sFactorySelectScreen->yesNoCursorPos == 0) { - // Selected Yes, confirmed selected pokemon + // Selected Yes, confirmed selected Pokémon Select_HideChosenMons(); gTasks[taskId].tState = 0; gTasks[taskId].func = Select_Task_Exit; } else { - // Selected No, continue choosing pokemon + // Selected No, continue choosing Pokémon Select_ErasePopupMenu(SELECT_WIN_YES_NO); Select_DeclineChosenMons(); sFactorySelectScreen->fadeSpeciesNameActive = TRUE; @@ -1560,7 +1560,7 @@ static void Select_Task_HandleYesNo(u8 taskId) } else if (JOY_NEW(B_BUTTON)) { - // Pressed B, Continue choosing pokemon + // Pressed B, Continue choosing Pokémon PlaySE(SE_SELECT); Select_ErasePopupMenu(SELECT_WIN_YES_NO); Select_DeclineChosenMons(); @@ -1582,7 +1582,7 @@ static void Select_Task_HandleYesNo(u8 taskId) } } -// Handles the popup menu that shows when a pokemon is selected +// Handles the popup menu that shows when a Pokémon is selected static void Select_Task_HandleMenu(u8 taskId) { switch (gTasks[taskId].tState) @@ -2415,7 +2415,7 @@ static void Swap_Task_Exit(u8 taskId) { case 0: // Set return value for script - // TRUE if player kept their current pokemon + // TRUE if player kept their current Pokémon if (sFactorySwapScreen->monSwapped == TRUE) { gTasks[taskId].tState++; @@ -2630,7 +2630,7 @@ static void Swap_Task_HandleMenu(u8 taskId) } } -// Handles input on the two main swap screens (choosing a current pokeon to get rid of, and choosing a new pokemon to receive) +// Handles input on the two main swap screens (choosing a current pokeon to get rid of, and choosing a new Pokémon to receive) static void Swap_Task_HandleChooseMons(u8 taskId) { switch (gTasks[taskId].tState) @@ -2645,7 +2645,7 @@ static void Swap_Task_HandleChooseMons(u8 taskId) case STATE_CHOOSE_MONS_HANDLE_INPUT: if (JOY_NEW(A_BUTTON)) { - // Run whatever action is currently selected (a pokeball, the Cancel button, etc.) + // Run whatever action is currently selected (a Poké Ball, the Cancel button, etc.) PlaySE(SE_SELECT); sFactorySwapScreen->fadeSpeciesNameActive = FALSE; Swap_PrintMonSpeciesAtFade(); @@ -3553,7 +3553,7 @@ static void Swap_HandleActionCursorChange(u8 cursorId) { if (cursorId < FRONTIER_PARTY_SIZE) { - // Cursor is on one of the pokemon + // Cursor is on one of the Pokémon gSprites[sFactorySwapScreen->cursorSpriteId].invisible = FALSE; Swap_HideActionButtonHighlights(); gSprites[sFactorySwapScreen->cursorSpriteId].x = gSprites[sFactorySwapScreen->ballSpriteIds[cursorId]].x; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index d4326860a9..a17ebcb5ab 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -105,7 +105,7 @@ void FreeBattleSpritesData(void) FREE_AND_SET_NULL(gBattleSpritesDataPtr); } -// Pokemon chooses move to use in Battle Palace rather than player +// Pokémon chooses move to use in Battle Palace rather than player u16 ChooseMoveAndTargetInBattlePalace(void) { s32 i, var1, var2; @@ -165,7 +165,7 @@ u16 ChooseMoveAndTargetInBattlePalace(void) chosenMoveId = BattleAI_ChooseMoveOrAction(); } - // If no moves matched the selected group, pick a new move from groups the pokemon has + // If no moves matched the selected group, pick a new move from groups the Pokémon has // In this case the AI is not checked again, so the choice may be worse // If a move is chosen this way, there's a 50% chance that it will be unable to use it anyway if (chosenMoveId == -1) @@ -357,7 +357,7 @@ static u16 GetBattlePalaceTarget(void) return BATTLE_OPPOSITE(gActiveBattler) << 8; } -// Wait for the pokemon to finish appearing out from the pokeball on send out +// Wait for the Pokémon to finish appearing out from the Poké Ball on send out void SpriteCB_WaitForBattlerBallReleaseAnim(struct Sprite *sprite) { u8 spriteId = sprite->data[1]; diff --git a/src/battle_message.c b/src/battle_message.c index f005404ead..e50fcff3de 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2152,7 +2152,7 @@ void BufferStringBattle(u16 stringID) } } break; - case STRINGID_USEDMOVE: // pokemon used a move msg + case STRINGID_USEDMOVE: // Pokémon used a move msg ChooseMoveUsedParticle(gBattleTextBuff1); // buff1 doesn't appear in the string, leftover from japanese move names if (gBattleMsgDataPtr->currentMove >= MOVES_COUNT) @@ -2313,7 +2313,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) { u32 dstID = 0; // if they used dstID, why not use srcID as well? const u8 *toCpy = NULL; - // This buffer may hold either the name of a trainer, pokemon, or item. + // This buffer may hold either the name of a trainer, Pokémon, or item. u8 text[max(max(max(32, TRAINER_NAME_LENGTH + 1), POKEMON_NAME_LENGTH + 1), ITEM_NAME_LENGTH)]; u8 multiplayerId; s32 i; diff --git a/src/battle_pike.c b/src/battle_pike.c index 7505621201..ba24e58ae7 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -1267,7 +1267,7 @@ static void TryHealMons(u8 healCount) for (i = 0; i < FRONTIER_PARTY_SIZE; i++) indices[i] = i; - // Only 'healCount' number of pokemon will be healed. + // Only 'healCount' number of Pokémon will be healed. // The order in which they're (attempted to be) healed is random, // and determined by performing 10 random swaps to this index array. for (k = 0; k < 10; k++) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 2bc8e73f43..49279bdb9c 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3366,7 +3366,7 @@ static void Cmd_getexp(void) if (IsTradedMon(&gPlayerParty[gBattleStruct->expGetterMonId])) { - // check if the pokemon doesn't belong to the player + // check if the Pokémon doesn't belong to the player if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gBattleStruct->expGetterMonId >= 3) { i = STRINGID_EMPTYSTRING4; @@ -4448,7 +4448,7 @@ static void Cmd_moveend(void) } gBattleScripting.moveendState++; break; - case MOVEEND_NEXT_TARGET: // For moves hitting two opposing Pokemon. + case MOVEEND_NEXT_TARGET: // For moves hitting two opposing Pokémon. if (!(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE) && gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !gProtectStructs[gBattlerAttacker].chargingTurn && gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH && !(gHitMarker & HITMARKER_NO_ATTACKSTRING)) @@ -7270,7 +7270,7 @@ static void Cmd_forcerandomswitch(void) lastMonId = PARTY_SIZE; monsCount = PARTY_SIZE; minNeeded = 1; - battler2PartyId = gBattlerPartyIndexes[gBattlerTarget]; // there is only one pokemon out in single battles + battler2PartyId = gBattlerPartyIndexes[gBattlerTarget]; // there is only one Pokémon out in single battles battler1PartyId = gBattlerPartyIndexes[gBattlerTarget]; } @@ -7761,7 +7761,7 @@ static void Cmd_setsubstitute(void) } else { - gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4; // one bit value will only work for pokemon which max hp can go to 1020(which is more than possible in games) + gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4; // one bit value will only work for Pokémon which max hp can go to 1020(which is more than possible in games) if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; @@ -9142,7 +9142,7 @@ static void Cmd_tryswapitems(void) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } - // can't swap if two pokemon don't have an item + // can't swap if two Pokémon don't have an item // or if either of them is an enigma berry or a mail else if ((gBattleMons[gBattlerAttacker].item == ITEM_NONE && gBattleMons[gBattlerTarget].item == ITEM_NONE) || gBattleMons[gBattlerAttacker].item == ITEM_ENIGMA_BERRY diff --git a/src/battle_setup.c b/src/battle_setup.c index a9cfc48ffb..e87ce6dd27 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -108,7 +108,7 @@ EWRAM_DATA static u8 *sTrainerBBattleScriptRetAddr = NULL; EWRAM_DATA static bool8 sShouldCheckTrainerBScript = FALSE; EWRAM_DATA static u8 sNoOfPossibleTrainerRetScripts = 0; -// The first transition is used if the enemy pokemon are lower level than our pokemon. +// The first transition is used if the enemy Pokémon are lower level than our Pokémon. // Otherwise, the second transition is used. static const u8 sBattleTransitionTable_Wild[][2] = { @@ -845,7 +845,7 @@ static u8 GetTrainerBattleTransition(void) return B_TRANSITION_AQUA; if (gTrainers[gTrainerBattleOpponent_A].doubleBattle == TRUE) - minPartyCount = 2; // double battles always at least have 2 pokemon. + minPartyCount = 2; // double battles always at least have 2 Pokémon. else minPartyCount = 1; diff --git a/src/battle_tent.c b/src/battle_tent.c index b7a9daecba..c003affebe 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -309,7 +309,7 @@ static void GenerateInitialRentalMons(void) i = 0; while (i != PARTY_SIZE) { - // Cannot have two pokemon of the same species. + // Cannot have two Pokémon of the same species. monSetId = Random() % NUM_SLATEPORT_TENT_MONS; for (j = firstMonId; j < firstMonId + i; j++) { @@ -390,7 +390,7 @@ static void GenerateOpponentMons(void) { sRandMonId = monSet[Random() % numMons]; - // Ensure none of the opponent's pokemon are the same as the potential rental pokemon for the player + // Ensure none of the opponent's Pokémon are the same as the potential rental Pokémon for the player for (j = 0; j < (int)ARRAY_COUNT(gSaveBlock2Ptr->frontier.rentalMons); j++) { if (gFacilityTrainerMons[sRandMonId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.rentalMons[j].monId].species) diff --git a/src/battle_tower.c b/src/battle_tower.c index 15509a7dcf..ec6019afb0 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -1680,8 +1680,8 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount) } // Regular battle frontier trainer. - // Attempt to fill the trainer's party with random Pokemon until 3 have been - // successfully chosen. The trainer's party may not have duplicate pokemon species + // Attempt to fill the trainer's party with random Pokémon until 3 have been + // successfully chosen. The trainer's party may not have duplicate Pokémon species // or duplicate held items. for (bfMonCount = 0; monSet[bfMonCount] != 0xFFFF; bfMonCount++) ; @@ -1691,12 +1691,12 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount) { u16 monId = monSet[Random() % bfMonCount]; - // "High tier" pokemon are only allowed on open level mode + // "High tier" Pokémon are only allowed on open level mode // 20 is not a possible value for level here if ((level == FRONTIER_MAX_LEVEL_50 || level == 20) && monId > FRONTIER_MONS_HIGH_TIER) continue; - // Ensure this pokemon species isn't a duplicate. + // Ensure this Pokémon species isn't a duplicate. for (j = 0; j < i + firstMonId; j++) { if (GetMonData(&gEnemyParty[j], MON_DATA_SPECIES, NULL) == gFacilityTrainerMons[monId].species) @@ -1715,7 +1715,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount) if (j != i + firstMonId) continue; - // Ensure this exact pokemon index isn't a duplicate. This check doesn't seem necessary + // Ensure this exact Pokémon index isn't a duplicate. This check doesn't seem necessary // because the species and held items were already checked directly above. for (j = 0; j < i; j++) { @@ -1727,7 +1727,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount) chosenMonIndices[i] = monId; - // Place the chosen pokemon into the trainer's party. + // Place the chosen Pokémon into the trainer's party. CreateMonWithEVSpreadNatureOTID(&gEnemyParty[i + firstMonId], gFacilityTrainerMons[monId].species, level, @@ -1737,7 +1737,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount) otID); friendship = MAX_FRIENDSHIP; - // Give the chosen pokemon its specified moves. + // Give the chosen Pokémon its specified moves. for (j = 0; j < MAX_MON_MOVES; j++) { SetMonMoveSlot(&gEnemyParty[i + firstMonId], gFacilityTrainerMons[monId].moves[j], j); @@ -1748,7 +1748,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount) SetMonData(&gEnemyParty[i + firstMonId], MON_DATA_FRIENDSHIP, &friendship); SetMonData(&gEnemyParty[i + firstMonId], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]); - // The pokemon was successfully added to the trainer's party, so it's safe to move on to + // The Pokémon was successfully added to the trainer's party, so it's safe to move on to // the next party slot. i++; } @@ -1804,7 +1804,7 @@ u16 GetRandomFrontierMonFromSet(u16 trainerId) do { - // "High tier" pokemon are only allowed on open level mode + // "High tier" Pokémon are only allowed on open level mode // 20 is not a possible value for level here monId = monSet[Random() % numMons]; } while((level == FRONTIER_MAX_LEVEL_50 || level == 20) && monId > FRONTIER_MONS_HIGH_TIER); @@ -2454,8 +2454,8 @@ static void GetPotentialPartnerMoveAndSpecies(u16 trainerId, u16 monId) // These partners can be an NPC or a former/record-mixed Apprentice // When talked to, their response consists of: // PARTNER_MSGID_INTRO - A greeting -// PARTNER_MSGID_MON1 - Naming one pokemon on their team, and a move it has -// PARTNER_MSGID_MON2_ASK - Naming a second pokemon on their team, a move it has, and asking if they'd like to be their partner +// PARTNER_MSGID_MON1 - Naming one Pokémon on their team, and a move it has +// PARTNER_MSGID_MON2_ASK - Naming a second Pokémon on their team, a move it has, and asking if they'd like to be their partner // PARTNER_MSGID_ACCEPT - If the player agrees to be their partner // PARTNER_MSGID_REJECT - If the player declines to be their partner static void ShowPartnerCandidateMessage(void) @@ -2773,7 +2773,7 @@ static void AwardBattleTowerRibbons(void) #ifdef BUGFIX struct RibbonCounter ribbons[MAX_FRONTIER_PARTY_SIZE]; #else - struct RibbonCounter ribbons[3]; // BUG: 4 Pokemon can receive ribbons in a double battle mode. + struct RibbonCounter ribbons[3]; // BUG: 4 Pokémon can receive ribbons in a double battle mode. #endif u8 ribbonType = 0; u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; @@ -2982,7 +2982,7 @@ static void FillPartnerParty(u16 trainerId) #ifdef BUGFIX j, #else - i, // BUG: personality was stored in the 'j' variable. As a result, Steven's pokemon do not have the intended natures. + i, // BUG: personality was stored in the 'j' variable. As a result, Steven's Pokémon do not have the intended natures. #endif OT_ID_PRESET, STEVEN_OTID); for (j = 0; j < PARTY_SIZE; j++) @@ -3409,7 +3409,7 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount) { u16 monId = monSet[Random() % bfMonCount]; - // Ensure this pokemon species isn't a duplicate. + // Ensure this Pokémon species isn't a duplicate. for (j = 0; j < i + firstMonId; j++) { if (GetMonData(&gEnemyParty[j], MON_DATA_SPECIES, NULL) == gFacilityTrainerMons[monId].species) @@ -3428,7 +3428,7 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount) if (j != i + firstMonId) continue; - // Ensure this exact pokemon index isn't a duplicate. This check doesn't seem necessary + // Ensure this exact Pokémon index isn't a duplicate. This check doesn't seem necessary // because the species and held items were already checked directly above. for (j = 0; j < i; j++) { @@ -3440,7 +3440,7 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount) chosenMonIndices[i] = monId; - // Place the chosen pokemon into the trainer's party. + // Place the chosen Pokémon into the trainer's party. CreateMonWithEVSpreadNatureOTID(&gEnemyParty[i + firstMonId], gFacilityTrainerMons[monId].species, level, @@ -3450,7 +3450,7 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount) otID); friendship = MAX_FRIENDSHIP; - // Give the chosen pokemon its specified moves. + // Give the chosen Pokémon its specified moves. for (j = 0; j < MAX_MON_MOVES; j++) { SetMonMoveSlot(&gEnemyParty[i + firstMonId], gFacilityTrainerMons[monId].moves[j], j); @@ -3461,7 +3461,7 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount) SetMonData(&gEnemyParty[i + firstMonId], MON_DATA_FRIENDSHIP, &friendship); SetMonData(&gEnemyParty[i + firstMonId], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]); - // The pokemon was successfully added to the trainer's party, so it's safe to move on to + // The Pokémon was successfully added to the trainer's party, so it's safe to move on to // the next party slot. i++; } diff --git a/src/battle_transition.c b/src/battle_transition.c index 11f9cddf4b..1c5b38faf8 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1315,7 +1315,7 @@ static void HBlankCB_Shuffle(void) #undef tAmplitude //------------------------------------------------------------------------ -// B_TRANSITION_BIG_POKEBALL, B_TRANSITION_AQUA, B_TRANSITION_MAGMA, +// B_TRANSITION_BIG_Poké Ball, B_TRANSITION_AQUA, B_TRANSITION_MAGMA, // B_TRANSITION_REGICE, B_TRANSITION_REGISTEEL, B_TRANSITION_REGIROCK // and B_TRANSITION_KYOGRE. // diff --git a/src/battle_tv.c b/src/battle_tv.c index b9008b47a7..e9f518f605 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -526,7 +526,7 @@ static const u16 *const sPointsArray[] = }; // Points will always be calculated for these messages -// even if current pokemon does not have corresponding move +// even if current Pokémon does not have corresponding move static const u16 sSpecialBattleStrings[] = { STRINGID_PKMNPERISHCOUNTFELL, STRINGID_PKMNWISHCAMETRUE, STRINGID_PKMNLOSTPPGRUDGE, diff --git a/src/battle_util.c b/src/battle_util.c index 735d1ba810..d79c61b382 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1545,7 +1545,7 @@ u8 DoBattlerEndTurnEffects(void) if ((gBattleMons[gActiveBattler].status2 & STATUS2_NIGHTMARE) && gBattleMons[gActiveBattler].hp != 0) { // R/S does not perform this sleep check, which causes the nightmare effect to - // persist even after the affected Pokemon has been awakened by Shed Skin. + // persist even after the affected Pokémon has been awakened by Shed Skin. if (gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP) { gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 4; @@ -1625,7 +1625,7 @@ u8 DoBattlerEndTurnEffects(void) } if (gBattlerAttacker != gBattlersCount) { - effect = 2; // a pokemon was awaken + effect = 2; // a Pokémon was awaken break; } else @@ -1685,7 +1685,7 @@ u8 DoBattlerEndTurnEffects(void) if (gDisableStructs[gActiveBattler].disabledMove == gBattleMons[gActiveBattler].moves[i]) break; } - if (i == MAX_MON_MOVES) // pokemon does not have the disabled move anymore + if (i == MAX_MON_MOVES) // Pokémon does not have the disabled move anymore { gDisableStructs[gActiveBattler].disabledMove = MOVE_NONE; gDisableStructs[gActiveBattler].disableTimer = 0; @@ -1702,7 +1702,7 @@ u8 DoBattlerEndTurnEffects(void) case ENDTURN_ENCORE: // encore if (gDisableStructs[gActiveBattler].encoreTimer != 0) { - if (gBattleMons[gActiveBattler].moves[gDisableStructs[gActiveBattler].encoredMovePos] != gDisableStructs[gActiveBattler].encoredMove) // pokemon does not have the encored move anymore + if (gBattleMons[gActiveBattler].moves[gDisableStructs[gActiveBattler].encoredMovePos] != gDisableStructs[gActiveBattler].encoredMove) // Pokémon does not have the encored move anymore { gDisableStructs[gActiveBattler].encoredMove = MOVE_NONE; gDisableStructs[gActiveBattler].encoreTimer = 0; @@ -3003,7 +3003,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA if (gBattleMons[i].ability == ABILITY_TRACE && (gStatuses3[i] & STATUS3_TRACE)) { u8 target2; - side = BATTLE_OPPOSITE(GetBattlerPosition(i)) & BIT_SIDE; // side of the opposing pokemon + side = BATTLE_OPPOSITE(GetBattlerPosition(i)) & BIT_SIDE; // side of the opposing Pokémon target1 = GetBattlerAtPosition(side); target2 = GetBattlerAtPosition(side + BIT_FLANK); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) diff --git a/src/birch_pc.c b/src/birch_pc.c index 1f0ab23498..8256a1378b 100644 --- a/src/birch_pc.c +++ b/src/birch_pc.c @@ -20,7 +20,7 @@ bool16 ScriptGetPokedexInfo(void) return IsNationalPokedexEnabled(); } -// This shows your Hoenn Pokedex rating and not your National Dex. +// This shows your Hoenn Pokédex rating and not your National Dex. const u8 *GetPokedexRatingText(u16 count) { if (count < 10) diff --git a/src/contest.c b/src/contest.c index e183c2bd74..8f0ad7fbfe 100644 --- a/src/contest.c +++ b/src/contest.c @@ -194,7 +194,7 @@ static void SwapMoveDescAndContestTilemaps(void); #define CONTESTANT_TEXT_COLOR_START 10 enum { -// The "{Pokemon Name} / {Trainer Name}" windows. +// The "{Pokémon Name} / {Trainer Name}" windows. WIN_CONTESTANT0_NAME, WIN_CONTESTANT1_NAME, WIN_CONTESTANT2_NAME, @@ -3434,11 +3434,11 @@ static void RankContestants(void) // For each contestant, find the best rank with their point total. // Normally, each point total is different, and this will output the - // rankings as expected. However, if two pokemon are tied, then they + // rankings as expected. However, if two Pokémon are tied, then they // both get the best rank for that point total. // // For example if the point totals are [100, 80, 80, 50], the ranks will - // be [1, 2, 2, 4]. The pokemon with a point total of 80 stop looking + // be [1, 2, 2, 4]. The Pokémon with a point total of 80 stop looking // when they see the first 80 in the array, so they both share the '2' // rank. for (i = 0; i < CONTESTANT_COUNT; i++) @@ -4590,10 +4590,10 @@ void MakeContestantNervous(u8 p) // ContestantStatus::nextTurnOrder field of each contestant. The remaining // turns are assigned such that the turn order will reverse. // -// For example, if no pokemon have a defined nextTurnOrder, then the 4th +// For example, if no Pokémon have a defined nextTurnOrder, then the 4th // will become 1st, the 3rd will become 2nd, etc. // -// Note: This function assumes that multiple pokemon cannot have the same +// Note: This function assumes that multiple Pokémon cannot have the same // nextTurnOrder value. static void ApplyNextTurnOrder(void) { diff --git a/src/credits.c b/src/credits.c index 69a4ebbbf3..c433baf1d1 100644 --- a/src/credits.c +++ b/src/credits.c @@ -63,12 +63,12 @@ enum { struct CreditsData { - u16 monToShow[NUM_MON_SLIDES]; // List of Pokemon species ids that will show during the credits + u16 monToShow[NUM_MON_SLIDES]; // List of Pokémon species ids that will show during the credits u16 imgCounter; //how many mon images have been shown u16 nextImgPos; //if the next image spawns left/center/right u16 currShownMon; //index into monToShow - u16 numMonToShow; //number of pokemon to show, always NUM_MON_SLIDES after determine function - u16 caughtMonIds[NATIONAL_DEX_COUNT]; //temporary location to hold a condensed array of all caught pokemon + u16 numMonToShow; //number of Pokémon to show, always NUM_MON_SLIDES after determine function + u16 caughtMonIds[NATIONAL_DEX_COUNT]; //temporary location to hold a condensed array of all caught Pokémon u16 numCaughtMon; //count of filled spaces in caughtMonIds u16 unused[7]; }; @@ -1555,8 +1555,8 @@ static void DeterminePokemonToShow(void) u16 dexNum; u16 j; - // Go through the Pokedex, and anything that has gotten caught we put into our massive array. - // This basically packs all of the caught pokemon into the front of the array + // Go through the Pokédex, and anything that has gotten caught we put into our massive array. + // This basically packs all of the caught Pokémon into the front of the array for (dexNum = 1, j = 0; dexNum < NATIONAL_DEX_COUNT; dexNum++) { if (GetSetPokedexFlag(dexNum, FLAG_GET_CAUGHT)) @@ -1570,14 +1570,14 @@ static void DeterminePokemonToShow(void) for (dexNum = j; dexNum < NATIONAL_DEX_COUNT; dexNum++) sCreditsData->caughtMonIds[dexNum] = NATIONAL_DEX_NONE; - // Cap the number of pokemon we care about to NUM_MON_SLIDES, the max we show in the credits scene (-1 for the starter) + // Cap the number of Pokémon we care about to NUM_MON_SLIDES, the max we show in the credits scene (-1 for the starter) sCreditsData->numCaughtMon = j; if (sCreditsData->numCaughtMon < NUM_MON_SLIDES) sCreditsData->numMonToShow = j; else sCreditsData->numMonToShow = NUM_MON_SLIDES; - // Loop through our list of caught pokemon and select randomly from it to fill the images to show + // Loop through our list of caught Pokémon and select randomly from it to fill the images to show j = 0; do { @@ -1598,7 +1598,7 @@ static void DeterminePokemonToShow(void) } while (sCreditsData->numCaughtMon != 0 && j < NUM_MON_SLIDES); - // If we don't have enough pokemon in the dex to fill everything, copy the selected mon into the end of the array, so it loops + // If we don't have enough Pokémon in the dex to fill everything, copy the selected mon into the end of the array, so it loops if (sCreditsData->numMonToShow < NUM_MON_SLIDES) { for (j = sCreditsData->numMonToShow, page = 0; j < NUM_MON_SLIDES; j++) @@ -1609,7 +1609,7 @@ static void DeterminePokemonToShow(void) if (page == sCreditsData->numMonToShow) page = 0; } - // Ensure the last pokemon is our starter + // Ensure the last Pokémon is our starter sCreditsData->monToShow[NUM_MON_SLIDES - 1] = starter; } else @@ -1617,7 +1617,7 @@ static void DeterminePokemonToShow(void) // Check to see if our starter has already appeared in this list, break if it has for (dexNum = 0; sCreditsData->monToShow[dexNum] != starter && dexNum < NUM_MON_SLIDES; dexNum++); - // If it has, swap it with the last pokemon, to ensure our starter is the last image + // If it has, swap it with the last Pokémon, to ensure our starter is the last image if (dexNum < sCreditsData->numMonToShow - 1) { sCreditsData->monToShow[dexNum] = sCreditsData->monToShow[NUM_MON_SLIDES-1]; @@ -1625,7 +1625,7 @@ static void DeterminePokemonToShow(void) } else { - // Ensure the last pokemon is our starter + // Ensure the last Pokémon is our starter sCreditsData->monToShow[NUM_MON_SLIDES - 1] = starter; } } diff --git a/src/data/bard_music/bard_sounds.h b/src/data/bard_music/bard_sounds.h index 291d22872a..bc6f88ba57 100644 --- a/src/data/bard_music/bard_sounds.h +++ b/src/data/bard_music/bard_sounds.h @@ -25,7 +25,7 @@ #include "trendysaying.h" const struct BardSound (*const gBardSoundsTable[EC_NUM_GROUPS])[6] = { - [EC_GROUP_POKEMON] = NULL, // Handled by gBardSounds_Pokemon + [EC_GROUP_POKEMON] = NULL, // Handled by gBardSounds_Pokémon [EC_GROUP_TRAINER] = gBardSounds_Trainer, [EC_GROUP_STATUS] = gBardSounds_Status, [EC_GROUP_BATTLE] = gBardSounds_Battle, @@ -46,7 +46,7 @@ const struct BardSound (*const gBardSoundsTable[EC_NUM_GROUPS])[6] = { [EC_GROUP_MOVE_1] = NULL, // Handled by gBardSounds_Moves [EC_GROUP_MOVE_2] = NULL, // Handled by gBardSounds_Moves [EC_GROUP_TRENDY_SAYING] = gBardSounds_TrendySaying, - [EC_GROUP_POKEMON_NATIONAL] = NULL // Handled by gBardSounds_Pokemon + [EC_GROUP_POKEMON_NATIONAL] = NULL // Handled by gBardSounds_Pokémon }; #endif //GUARD_BARD_SOUNDS_TABLE_H diff --git a/src/data/battle_frontier/battle_frontier_trainer_mons.h b/src/data/battle_frontier/battle_frontier_trainer_mons.h index 625a602658..f0a203d56d 100644 --- a/src/data/battle_frontier/battle_frontier_trainer_mons.h +++ b/src/data/battle_frontier/battle_frontier_trainer_mons.h @@ -4172,7 +4172,7 @@ FRONTIER_MON_##lastmon##_10,\ -1 -// The strong Psychic M/F trainers all use the below pokemon +// The strong Psychic M/F trainers all use the below Pokémon // Additionally they use 1 of 3 legendary trios, and Latios or Latias depending on gender #define FRONTIER_MONS_PSYCHIC_2(lati, legend1, legend2, legend3) \ FRONTIER_MON_WOBBUFFET_1, \ diff --git a/src/data/party_menu.h b/src/data/party_menu.h index 90faab0777..04e073df17 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -64,7 +64,7 @@ static const struct PartyMenuBoxInfoRects sPartyBoxInfoRects[] = // Each layout array has an array for each of the 6 party slots // The array for each slot has the sprite coords of its various sprites in the following order -// Pokemon icon (x, y), held item (x, y), status condition (x, y), menu pokeball (x, y) +// Pokémon icon (x, y), held item (x, y), status condition (x, y), menu Poké Ball (x, y) static const u8 sPartyMenuSpriteCoords[PARTY_LAYOUT_COUNT][PARTY_SIZE][4 * 2] = { [PARTY_LAYOUT_SINGLE] = @@ -902,7 +902,7 @@ static const struct CompressedSpritePalette sSpritePalette_MenuPokeball = gPartyMenuPokeball_Pal, TAG_POKEBALL }; -// Used for the pokeball sprite on each party slot / Cancel button +// Used for the Poké Ball sprite on each party slot / Cancel button static const struct SpriteTemplate sSpriteTemplate_MenuPokeball = { .tileTag = TAG_POKEBALL, @@ -983,7 +983,7 @@ static const struct CompressedSpriteSheet sSpriteSheet_MenuPokeballSmall = gPartyMenuPokeballSmall_Gfx, 0x0300, TAG_POKEBALL_SMALL }; -// Used for the pokeball sprite next to Cancel and Confirm when both are present, otherwise sSpriteTemplate_MenuPokeball is used +// Used for the pokeball sprite next to Cancel and Confirm when both are present, otherwise sSpriteTemplate_MenuPoké Ball is used static const struct SpriteTemplate sSpriteTemplate_MenuPokeballSmall = { .tileTag = TAG_POKEBALL_SMALL, diff --git a/src/data/pokemon/pokedex_orders.h b/src/data/pokemon/pokedex_orders.h index 55b0abcea8..aa09948ec0 100644 --- a/src/data/pokemon/pokedex_orders.h +++ b/src/data/pokemon/pokedex_orders.h @@ -25,7 +25,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_OLD_UNOWN_X, NATIONAL_DEX_OLD_UNOWN_Y, NATIONAL_DEX_OLD_UNOWN_Z, - // Actual pokemon start here. + // Actual Pokémon start here. NATIONAL_DEX_ABRA, NATIONAL_DEX_ABSOL, NATIONAL_DEX_AERODACTYL, diff --git a/src/daycare.c b/src/daycare.c index d62bd589d0..5ebe255b39 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -193,10 +193,10 @@ void StoreSelectedPokemonInDaycare(void) StorePokemonInEmptyDaycareSlot(&gPlayerParty[monId], &gSaveBlock1Ptr->daycare); } -// Shifts the second daycare pokemon slot into the first slot. +// Shifts the second daycare Pokémon slot into the first slot. static void ShiftDaycareSlots(struct DayCare *daycare) { - // This condition is only satisfied when the player takes out the first pokemon from the daycare. + // This condition is only satisfied when the player takes out the first Pokémon from the daycare. if (GetBoxMonData(&daycare->mons[1].mon, MON_DATA_SPECIES) != SPECIES_NONE && GetBoxMonData(&daycare->mons[0].mon, MON_DATA_SPECIES) == SPECIES_NONE) { @@ -596,7 +596,7 @@ static void InheritIVs(struct Pokemon *egg, struct DayCare *daycare) } } -// Counts the number of egg moves a pokemon learns and stores the moves in +// Counts the number of egg moves a Pokémon learns and stores the moves in // the given array. static u8 GetEggMoves(struct Pokemon *pokemon, u16 *eggMoves) { diff --git a/src/field_effect.c b/src/field_effect.c index 86f1ca97d2..a906492d13 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -254,7 +254,7 @@ static const u32 sHofMonitorBig_Gfx[] = INCBIN_U32("graphics/field_effects/pics/ static const u8 sHofMonitorSmall_Gfx[] = INCBIN_U8("graphics/field_effects/pics/hof_monitor_small.4bpp"); static const u16 sHofMonitor_Pal[16] = INCBIN_U16("graphics/field_effects/palettes/hof_monitor.gbapal"); -// Graphics for the lights streaking past your Pokemon when it uses a field move. +// Graphics for the lights streaking past your Pokémon when it uses a field move. static const u32 sFieldMoveStreaksOutdoors_Gfx[] = INCBIN_U32("graphics/field_effects/pics/field_move_streaks.4bpp"); static const u16 sFieldMoveStreaksOutdoors_Pal[16] = INCBIN_U16("graphics/field_effects/pics/field_move_streaks.gbapal"); static const u16 sFieldMoveStreaksOutdoors_Tilemap[320] = INCBIN_U16("graphics/field_effects/pics/field_move_streaks.bin"); diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index c01e88b512..513cd13e76 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -308,7 +308,7 @@ static const struct SpriteTemplate sSpriteTemplate_RecordMixLights = .callback = SpriteCallbackDummy, }; -// For accessing pokemon storage PC or the Hall of Fame PC +// For accessing Pokémon storage PC or the Hall of Fame PC void ComputerScreenOpenEffect(u16 increment, u16 unused, u8 priority) { CreateComputerScreenEffectTask(Task_ComputerScreenOpenEffect, increment, unused, priority); diff --git a/src/frontier_util.c b/src/frontier_util.c index 08b0e68d2e..1858792b4e 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -326,7 +326,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ }, [FRONTIER_FACILITY_FACTORY] = { - // Because Factory's pokemon are random, this facility's Brain also uses random pokemon. + // Because Factory's Pokémon are random, this facility's Brain also uses random Pokémon. // What is interesting, this team is actually the one Steven uses in the multi tag battle alongside the player. { { @@ -2006,7 +2006,7 @@ static void AppendIfValid(u16 species, u16 heldItem, u16 hp, u8 lvlMode, u8 monL // gSpecialVar_Result is the level mode before and after calls to this function // gSpecialVar_0x8004 is used to store the return value instead (TRUE if there are insufficient eligible mons) -// The names of ineligible pokemon that have been caught are also buffered to print +// The names of ineligible Pokémon that have been caught are also buffered to print static void CheckPartyIneligibility(void) { u16 speciesArray[PARTY_SIZE]; diff --git a/src/graphics.c b/src/graphics.c index 17ea237df2..39b6c8e680 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -362,7 +362,7 @@ const u8 gHealthboxElementsGfxTable[] = INCBIN_U8("graphics/battle_interface/hpb "graphics/battle_interface/misc_frameend.4bpp", "graphics/battle_interface/ball_display.4bpp", "graphics/battle_interface/ball_caught_indicator.4bpp", - "graphics/battle_interface/status2.4bpp", // these three duplicate sets of graphics are for the opponent/partner pokemon + "graphics/battle_interface/status2.4bpp", // these three duplicate sets of graphics are for the opponent/partner Pokémon "graphics/battle_interface/status3.4bpp", "graphics/battle_interface/status4.4bpp", "graphics/battle_interface/healthbox_doubles_frameend.4bpp", @@ -953,7 +953,7 @@ const u32 gDomeTourneyLineUp_Tilemap[] = INCBIN_U32("graphics/battle_frontier/to const u32 gDomeTourneyInfoCard_Gfx[] = INCBIN_U32("graphics/battle_frontier/tourney_info_card.4bpp.lz"); const u32 gDomeTourneyInfoCard_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_info_card_tilemap.bin.lz"); const u32 gDomeTourneyInfoCardBg_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_info_card_bg.bin.lz"); -const u32 gDomeTourneyTreeButtons_Gfx[] = INCBIN_U32("graphics/battle_frontier/tourney_buttons.4bpp.lz"); // exit/cancel and pokeball buttons +const u32 gDomeTourneyTreeButtons_Gfx[] = INCBIN_U32("graphics/battle_frontier/tourney_buttons.4bpp.lz"); // exit/cancel and Poké Ball buttons const u32 gDomeTourneyTree_Pal[] = INCBIN_U32("graphics/battle_frontier/tourney_tree.gbapal.lz"); const u32 gDomeTourneyTreeButtons_Pal[] = INCBIN_U32("graphics/battle_frontier/tourney_buttons.gbapal.lz"); const u32 gDomeTourneyMatchCardBg_Pal[] = INCBIN_U32("graphics/battle_frontier/tourney_match_card_bg.gbapal.lz"); @@ -1228,7 +1228,7 @@ const u16 gFrontierPassMapCursor_Pal[] = INCBIN_U16("graphics/frontier_pass/map_ const u16 gFrontierPassMedalsSilver_Pal[] = INCBIN_U16("graphics/frontier_pass/silver.gbapal"); const u16 gFrontierPassMedalsGold_Pal[] = INCBIN_U16("graphics/frontier_pass/gold.gbapal"); -// Pokedex +// Pokédex const u16 gPokedexBgHoenn_Pal[] = INCBIN_U16("graphics/pokedex/bg_hoenn.gbapal"); const u16 gPokedexCaughtScreen_Pal[] = INCBIN_U16("graphics/pokedex/caught_screen.gbapal"); const u16 gPokedexSearchResults_Pal[] = INCBIN_U16("graphics/pokedex/search_results_bg.gbapal"); @@ -1383,7 +1383,7 @@ const u32 gKantoTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/f const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/back.bin.lz"); const u32 gKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front_link.bin.lz"); -// pokemon storage system +// Pokémon storage system const u32 gStorageSystemMenu_Gfx[] = INCBIN_U32("graphics/pokemon_storage/menu.4bpp.lz"); const u16 gStorageSystemPartyMenu_Pal[] = INCBIN_U16("graphics/pokemon_storage/party_menu.gbapal"); diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 63c7c30c26..91850ec72e 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -621,7 +621,7 @@ static void Task_Hof_TryDisplayAnotherMon(u8 taskId) else { sHofFadePalettes |= (0x10000 << gSprites[gTasks[taskId].tMonSpriteId(currPokeID)].oam.paletteNum); - if (gTasks[taskId].tDisplayedMonId < PARTY_SIZE - 1 && currMon[1].species != SPECIES_NONE) // there is another pokemon to display + if (gTasks[taskId].tDisplayedMonId < PARTY_SIZE - 1 && currMon[1].species != SPECIES_NONE) // there is another Pokémon to display { gTasks[taskId].tDisplayedMonId++; BeginNormalPaletteFade(sHofFadePalettes, 0, 12, 12, RGB(16, 29, 24)); diff --git a/src/lottery_corner.c b/src/lottery_corner.c index f19e9f7b7b..052e2cfc38 100644 --- a/src/lottery_corner.c +++ b/src/lottery_corner.c @@ -75,7 +75,7 @@ void PickLotteryCornerTicket(void) } } } - else // pokemon are always arranged from populated spots first to unpopulated, so the moment a NONE species is found, that's the end of the list. + else // Pokémon are always arranged from populated spots first to unpopulated, so the moment a NONE species is found, that's the end of the list. break; } diff --git a/src/move_relearner.c b/src/move_relearner.c index af4593e533..975663e4d3 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -369,7 +369,7 @@ static void VBlankCB_MoveRelearner(void) TransferPlttBuffer(); } -// Script arguments: The pokemon to teach is in VAR_0x8004 +// Script arguments: The Pokémon to teach is in VAR_0x8004 void TeachMoveRelearnerMove(void) { LockPlayerFieldControls(); diff --git a/src/overworld.c b/src/overworld.c index e9245ce0a0..2e01a2e52f 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1297,7 +1297,7 @@ void UpdateAmbientCry(s16 *state, u16 *delayCounter) } } // Ambient cries after the first one take between 1200-2399 frames (~20-40 seconds) - // If the player has a pokemon with the ability Swarm in their party, the time is halved to 600-1199 frames (~10-20 seconds) + // If the player has a Pokémon with the ability Swarm in their party, the time is halved to 600-1199 frames (~10-20 seconds) *delayCounter = ((Random() % 1200) + 1200) / divBy; *state = AMB_CRY_WAIT; break; @@ -1309,7 +1309,7 @@ void UpdateAmbientCry(s16 *state, u16 *delayCounter) } break; case AMB_CRY_IDLE: - // No land/water pokemon on this map + // No land/water Pokémon on this map break; } } @@ -1320,7 +1320,7 @@ static void ChooseAmbientCrySpecies(void) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE130)) && !IsMirageIslandPresent()) { - // Only play water pokemon cries on this route + // Only play water Pokémon cries on this route // when Mirage Island is not present sIsAmbientCryWaterMon = TRUE; sAmbientCrySpecies = GetLocalWaterMon(); diff --git a/src/party_menu.c b/src/party_menu.c index 9b076755c8..2abceb50ae 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -169,7 +169,7 @@ enum { }; enum { - // Window ids 0-5 are implicitly assigned to each party pokemon in InitPartyMenuBoxes + // Window ids 0-5 are implicitly assigned to each party Pokémon in InitPartyMenuBoxes WIN_MSG = PARTY_SIZE, }; @@ -3512,7 +3512,7 @@ static void CursorCb_SendMon(u8 taskId) } else { - // gStringVar4 below is the error message buffered by TrySwitchInPokemon + // gStringVar4 below is the error message buffered by TrySwitchInPokémon PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]); DisplayPartyMenuMessage(gStringVar4, TRUE); gTasks[taskId].func = Task_ReturnToChooseMonAfterText; @@ -5801,7 +5801,7 @@ static bool8 TrySwitchInPokemon(void) u8 newSlot; u8 i; - // In a multi battle, slots 1, 4, and 5 are the partner's pokemon + // In a multi battle, slots 1, 4, and 5 are the partner's Pokémon if (IsMultiBattle() == TRUE && (slot == 1 || slot == 4 || slot == 5)) { StringCopy(gStringVar1, GetTrainerPartnerName()); diff --git a/src/pokeball.c b/src/pokeball.c index bdc2b70369..445f048924 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -1014,10 +1014,10 @@ static u8 LaunchBallFadeMonTaskForPokeball(bool8 unFadeLater, u8 spritePalNum, u return LaunchBallFadeMonTask(unFadeLater, spritePalNum, selectedPalettes, BALL_POKE); } -// Sprite data for the pokemon +// Sprite data for the Pokémon #define sSpecies data[7] -// Sprite data for the pokeball +// Sprite data for the Poké Ball #define sMonSpriteId data[0] #define sDelay data[1] #define sMonPalNum data[2] @@ -1027,7 +1027,7 @@ static u8 LaunchBallFadeMonTaskForPokeball(bool8 unFadeLater, u8 spritePalNum, u #define sFinalMonY data[6] #define sTrigIdx data[7] -// Pokeball in Birch intro, and when receiving via trade +// Poké Ball in Birch intro, and when receiving via trade void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 monPalNum, u8 x, u8 y, u8 oamPriority, u8 subpriority, u8 delay, u32 fadePalettes, u16 species) { u8 spriteId; diff --git a/src/pokedex.c b/src/pokedex.c index bd824aa567..d5db9987dd 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1758,7 +1758,7 @@ static void Task_HandlePokedexStartMenuInput(u8 taskId) CreateMonSpritesAtPos(sPokedexView->selectedPokemon, 0xE); gMain.newKeys |= START_BUTTON; //Exit menu break; - case 3: //CLOSE POKEDEX + case 3: //CLOSE Pokédex BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_ClosePokedex; PlaySE(SE_PC_OFF); @@ -1958,12 +1958,12 @@ static void Task_HandleSearchResultsStartMenuInput(u8 taskId) CreateMonSpritesAtPos(sPokedexView->selectedPokemon, 0xE); gMain.newKeys |= START_BUTTON; break; - case 3: //BACK TO POKEDEX + case 3: //BACK TO Pokédex BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_ReturnToPokedexFromSearchResults; PlaySE(SE_TRUCK_DOOR); break; - case 4: //CLOSE POKEDEX + case 4: //CLOSE Pokédex BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_ClosePokedexFromSearchResultsStartMenu; PlaySE(SE_PC_OFF); @@ -2049,7 +2049,7 @@ static void Task_ClosePokedexFromSearchResultsStartMenu(u8 taskId) #undef tLoadScreenTaskId -// For loading main pokedex page or pokedex search results +// For loading main pokedex page or Pokédex search results static bool8 LoadPokedexListPage(u8 page) { switch (gMain.state) diff --git a/src/pokemon.c b/src/pokemon.c index 6ee052fda5..51a512445e 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -98,7 +98,7 @@ static const struct CombinedMove sCombinedMoves[2] = }; // NOTE: The order of the elements in the 3 arrays below is irrelevant. -// To reorder the pokedex, see the values in include/constants/pokedex.h. +// To reorder the pokedex, see the values in include/constants/Pokédex.h. #define SPECIES_TO_HOENN(name) [SPECIES_##name - 1] = HOENN_DEX_##name #define SPECIES_TO_NATIONAL(name) [SPECIES_##name - 1] = NATIONAL_DEX_##name diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 574e6ba51e..92afe8a4bb 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -199,7 +199,7 @@ enum { CURSOR_AREA_IN_BOX, CURSOR_AREA_IN_PARTY, CURSOR_AREA_BOX_TITLE, - CURSOR_AREA_BUTTONS, // Party Pokemon and Close Box + CURSOR_AREA_BUTTONS, // Party Pokémon and Close Box }; #define CURSOR_AREA_IN_HAND CURSOR_AREA_BOX_TITLE // Alt name for cursor area used by Move Items @@ -6687,8 +6687,8 @@ static void LoadSavedMovingMon(void) { if (sIsMonBeingMoved) { - // If it came from the party load a struct Pokemon, - // otherwise load a BoxPokemon + // If it came from the party load a struct Pokémon, + // otherwise load a BoxPokémon if (sMovingMonOrigBoxId == TOTAL_BOXES_COUNT) sStorage->movingMon = sSavedMovingMon; else diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 4545411124..642b176d6b 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -88,13 +88,13 @@ enum { #define PSS_LABEL_WINDOW_PORTRAIT_SPECIES 19 // The lower name #define PSS_LABEL_WINDOW_END 20 -// Dynamic fields for the Pokemon Info page +// Dynamic fields for the Pokémon Info page #define PSS_DATA_WINDOW_INFO_ORIGINAL_TRAINER 0 #define PSS_DATA_WINDOW_INFO_ID 1 #define PSS_DATA_WINDOW_INFO_ABILITY 2 #define PSS_DATA_WINDOW_INFO_MEMO 3 -// Dynamic fields for the Pokemon Skills page +// Dynamic fields for the Pokémon Skills page #define PSS_DATA_WINDOW_SKILLS_HELD_ITEM 0 #define PSS_DATA_WINDOW_SKILLS_RIBBON_COUNT 1 #define PSS_DATA_WINDOW_SKILLS_STATS_LEFT 2 // HP, Attack, Defense @@ -174,7 +174,7 @@ static EWRAM_DATA struct PokemonSummaryScreenData u8 currPageIndex; u8 minPageIndex; u8 maxPageIndex; - bool8 lockMonFlag; // This is used to prevent the player from changing pokemon in the move deleter select, etc, but it is not needed because the input is handled differently there + bool8 lockMonFlag; // This is used to prevent the player from changing Pokémon in the move deleter select, etc, but it is not needed because the input is handled differently there u16 newMove; u8 firstMoveIndex; u8 secondMoveIndex; @@ -184,7 +184,7 @@ static EWRAM_DATA struct PokemonSummaryScreenData u8 windowIds[8]; u8 spriteIds[SPRITE_ARR_ID_COUNT]; bool8 handleDeoxys; - s16 switchCounter; // Used for various switch statement cases that decompress/load graphics or pokemon data + s16 switchCounter; // Used for various switch statement cases that decompress/load graphics or Pokémon data u8 unk_filler4[6]; } *sMonSummaryScreen = NULL; EWRAM_DATA u8 gLastViewedMonIndex = 0; @@ -2682,7 +2682,7 @@ static void DrawContestMoveHearts(u16 move) } } -static void LimitEggSummaryPageDisplay(void) // If the pokemon is an egg, limit the number of pages displayed to 1 +static void LimitEggSummaryPageDisplay(void) // If the Pokémon is an egg, limit the number of pages displayed to 1 { if (sMonSummaryScreen->summary.isEgg) ChangeBgX(3, 0x10000, BG_COORD_SET); @@ -3999,7 +3999,7 @@ static bool32 UNUSED IsMonAnimationFinished(void) return TRUE; } -static void StopPokemonAnimations(void) // A subtle effect, this function stops pokemon animations when leaving the PSS +static void StopPokemonAnimations(void) // A subtle effect, this function stops Pokémon animations when leaving the PSS { u16 i; u16 paletteIndex; diff --git a/src/rom_header_gf.c b/src/rom_header_gf.c index 36ff3401d3..d5f7d7eefc 100644 --- a/src/rom_header_gf.c +++ b/src/rom_header_gf.c @@ -8,7 +8,7 @@ // The purpose of this struct is for outside applications to be // able to access parts of the ROM or its save file, like a public API. -// In vanilla, it was used by Colosseum and XD to access pokemon graphics. +// In vanilla, it was used by Colosseum and XD to access Pokémon graphics. // // If this struct is rearranged in any way, it defeats the purpose of // having it at all. Applications like PKHex or streaming HUDs may find diff --git a/src/roulette.c b/src/roulette.c index 44dac2db6c..ec4c8cfcfe 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -990,8 +990,8 @@ static const struct RouletteFlashSettings sFlashData_Colors[NUM_ROULETTE_SLOTS + }, }; -// Data to flash any pokemon icon (F_FLASH_ICON) on the roulette wheel. One entry for each color row -// Each poke icon flashes with the tint of the row color it belongs to, so the pokemon itself is irrelevant +// Data to flash any Pokémon icon (F_FLASH_ICON) on the roulette wheel. One entry for each color row +// Each poke icon flashes with the tint of the row color it belongs to, so the Pokémon itself is irrelevant static const struct RouletteFlashSettings sFlashData_PokeIcons[NUM_BOARD_COLORS] = { [GET_ROW_IDX(ROW_ORANGE)] = { @@ -2702,7 +2702,7 @@ static const struct SpriteTemplate sSpriteTemplates_GridIcons[NUM_BOARD_POKES] = } }; -// Wheel icons are listed clockwise starting from 1 oclock on the roulette wheel (with pokeball upside right) +// Wheel icons are listed clockwise starting from 1 oclock on the roulette wheel (with Poké Ball upside right) // They go Wynaut -> Azurill -> Skitty -> Makuhita, and Orange -> Green -> Purple static const struct SpriteTemplate sSpriteTemplates_WheelIcons[NUM_ROULETTE_SLOTS] = { @@ -4481,7 +4481,7 @@ static void SetBallStuck(struct Sprite *sprite) // The below slot ids are relative to the slot the ball got stuck on if ((sRoulette->useTaillow + 1) & sRoulette->partySpeciesFlags) { - // If the player has the corresponding pokemon in their party (HAS_SHROOMISH or HAS_TAILLOW), + // If the player has the corresponding Pokémon in their party (HAS_SHROOMISH or HAS_TAILLOW), // there's a 75% chance that the ball will be moved to a spot they bet on // assuming it was one of the slots identified as a candidate if (betSlotId && (rand % 256) < 192) diff --git a/src/save_location.c b/src/save_location.c index 74d2f2c44d..3384200598 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -119,9 +119,9 @@ void TrySetMapSaveWarpStatus(void) TrySetUnknownWarpStatus(); } -// In FRLG, only bits 0, 4, and 5 are set when the pokedex is received. +// In FRLG, only bits 0, 4, and 5 are set when the Pokédex is received. // Bits 1, 2, 3, and 15 are instead set by SetPostgameFlags. -// These flags are read by Pokemon Colosseum/XD for linking. XD Additionally requires FLAG_SYS_GAME_CLEAR +// These flags are read by Pokémon Colosseum/XD for linking. XD Additionally requires FLAG_SYS_GAME_CLEAR void SetUnlockedPokedexFlags(void) { gSaveBlock2Ptr->gcnLinkFlags |= (1 << 15); diff --git a/src/script_pokemon_util.c b/src/script_pokemon_util.c index 6e5653884b..ed28d47c5a 100755 --- a/src/script_pokemon_util.c +++ b/src/script_pokemon_util.c @@ -213,7 +213,7 @@ void ReducePlayerPartyToSelectedMons(void) CpuFill32(0, party, sizeof party); - // copy the selected pokemon according to the order. + // copy the selected Pokémon according to the order. for (i = 0; i < MAX_FRONTIER_PARTY_SIZE; i++) if (gSelectedOrderFromParty[i]) // as long as the order keeps going (did the player select 1 mon? 2? 3?), do not stop party[i] = gPlayerParty[gSelectedOrderFromParty[i] - 1]; // index is 0 based, not literal diff --git a/src/sound.c b/src/sound.c index bef3658ecd..8685383f78 100644 --- a/src/sound.c +++ b/src/sound.c @@ -463,9 +463,9 @@ void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode) SetPokemonCryChorus(chorus); SetPokemonCryPriority(priority); - // This is a fancy way to get a cry of a pokemon. + // This is a fancy way to get a cry of a Pokémon. // It creates 4 sets of 128 mini cry tables. - // If you wish to expand pokemon, you need to + // If you wish to expand Pokémon, you need to // append new cases to the switch. species = SpeciesToCryId(species); index = species % 128; diff --git a/src/start_menu.c b/src/start_menu.c index 2faff8c63d..0c8fe01f0e 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1374,7 +1374,7 @@ static void ShowSaveInfoWindow(void) if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) { - // Print pokedex count + // Print Pokédex count yOffset += 16; AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gText_SavingPokedex, 0, yOffset, TEXT_SKIP_DRAW, NULL); BufferSaveMenuText(SAVE_MENU_CAUGHT, gStringVar4, color); diff --git a/src/starter_choose.c b/src/starter_choose.c index 3d5291e887..ef0b9388bf 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -26,7 +26,7 @@ #define STARTER_MON_COUNT 3 -// Position of the sprite of the selected starter Pokemon +// Position of the sprite of the selected starter Pokémon #define STARTER_PKMN_POS_X (DISPLAY_WIDTH / 2) #define STARTER_PKMN_POS_Y 64 @@ -367,7 +367,7 @@ static void VblankCB_StarterChoose(void) #define tPkmnSpriteId data[1] #define tCircleSpriteId data[2] -// Data for sSpriteTemplate_Pokeball +// Data for sSpriteTemplate_Poké Ball #define sTaskId data[0] #define sBallId data[1] @@ -446,7 +446,7 @@ void CB2_ChooseStarter(void) spriteId = CreateSprite(&sSpriteTemplate_Hand, 120, 56, 2); gSprites[spriteId].data[0] = taskId; - // Create three Pokeball sprites + // Create three Poké Ball sprites spriteId = CreateSprite(&sSpriteTemplate_Pokeball, sPokeballCoords[0][0], sPokeballCoords[0][1], 2); gSprites[spriteId].sTaskId = taskId; gSprites[spriteId].sBallId = 0; @@ -495,7 +495,7 @@ static void Task_HandleStarterChooseInput(u8 taskId) spriteId = CreateSprite(&sSpriteTemplate_StarterCircle, sPokeballCoords[selection][0], sPokeballCoords[selection][1], 1); gTasks[taskId].tCircleSpriteId = spriteId; - // Create Pokemon sprite + // Create Pokémon sprite spriteId = CreatePokemonFrontSprite(GetStarterPokemon(gTasks[taskId].tStarterSelection), sPokeballCoords[selection][0], sPokeballCoords[selection][1]); gSprites[spriteId].affineAnims = &sAffineAnims_StarterPokemon; gSprites[spriteId].callback = SpriteCB_StarterPokemon; @@ -637,7 +637,7 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y) static void SpriteCB_SelectionHand(struct Sprite *sprite) { - // Float up and down above selected pokeball + // Float up and down above selected Poké Ball sprite->x = sCursorCoords[gTasks[sprite->data[0]].tStarterSelection][0]; sprite->y = sCursorCoords[gTasks[sprite->data[0]].tStarterSelection][1]; sprite->y2 = Sin(sprite->data[1], 8); @@ -646,7 +646,7 @@ static void SpriteCB_SelectionHand(struct Sprite *sprite) static void SpriteCB_Pokeball(struct Sprite *sprite) { - // Animate pokeball if currently selected + // Animate Poké Ball if currently selected if (gTasks[sprite->sTaskId].tStarterSelection == sprite->sBallId) StartSpriteAnimIfDifferent(sprite, 1); else diff --git a/src/title_screen.c b/src/title_screen.c index 12015b8bd8..1d605d1fc0 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -680,7 +680,7 @@ static void MainCB2(void) UpdatePaletteFade(); } -// Shine the Pokemon logo two more times, and fade in the version banner +// Shine the Pokémon logo two more times, and fade in the version banner static void Task_TitleScreenPhase1(u8 taskId) { // Skip to next phase when A, B, Start, or Select is pressed @@ -728,7 +728,7 @@ static void Task_TitleScreenPhase1(u8 taskId) #undef sParentTaskId #undef sAlphaBlendIdx -// Create "Press Start" and copyright banners, and slide Pokemon logo up +// Create "Press Start" and copyright banners, and slide Pokémon logo up static void Task_TitleScreenPhase2(u8 taskId) { u32 yPos; @@ -767,7 +767,7 @@ static void Task_TitleScreenPhase2(u8 taskId) if (!(gTasks[taskId].tCounter & 1) && gTasks[taskId].tBg2Y != 0) gTasks[taskId].tBg2Y++; - // Slide Pokemon logo up + // Slide Pokémon logo up yPos = gTasks[taskId].tBg2Y * 256; SetGpuReg(REG_OFFSET_BG2Y_L, yPos); SetGpuReg(REG_OFFSET_BG2Y_H, yPos / 0x10000); diff --git a/src/trade.c b/src/trade.c index ec9486afa1..e07e418d1a 100644 --- a/src/trade.c +++ b/src/trade.c @@ -168,7 +168,7 @@ static EWRAM_DATA u8 *sMenuTextTileBuffer = NULL; // Bytes 0-2 are used for the player's name text // Bytes 3-5 are used for the partner's name text // Bytes 6-7 are used for the Cancel text -// Bytes 8-13 are used for the Choose a Pokemon text +// Bytes 8-13 are used for the Choose a Pokémon text // See the corresponding GFXTAGs in src/data/trade.h static EWRAM_DATA u8 *sMenuTextTileBuffers[NUM_MENU_TEXT_SPRITES] = {NULL}; @@ -1010,25 +1010,25 @@ static void SetActiveMenuOptions(void) { if (i < sTradeMenu->partyCounts[TRADE_PLAYER]) { - // Present player pokemon + // Present player Pokémon gSprites[sTradeMenu->partySpriteIds[TRADE_PLAYER][i]].invisible = FALSE; sTradeMenu->optionsActive[i] = TRUE; } else { - // Absent player pokemon + // Absent player Pokémon sTradeMenu->optionsActive[i] = FALSE; } if (i < sTradeMenu->partyCounts[TRADE_PARTNER]) { - // Present partner pokemon + // Present partner Pokémon gSprites[sTradeMenu->partySpriteIds[TRADE_PARTNER][i]].invisible = FALSE; sTradeMenu->optionsActive[i + PARTY_SIZE] = TRUE; } else { - // Absent partner pokemon + // Absent partner Pokémon sTradeMenu->optionsActive[i + PARTY_SIZE] = FALSE; } } @@ -1285,7 +1285,7 @@ static void Leader_HandleCommunication(void) if (sTradeMenu->playerSelectStatus == STATUS_READY && sTradeMenu->partnerSelectStatus == STATUS_READY) { - // Both players have selected a pokemon to trade + // Both players have selected a Pokémon to trade sTradeMenu->callbackId = CB_SET_SELECTED_MONS; sTradeMenu->linkData[0] = LINKCMD_SET_MONS_TO_TRADE; sTradeMenu->linkData[1] = sTradeMenu->cursorPosition; @@ -1295,7 +1295,7 @@ static void Leader_HandleCommunication(void) else if (sTradeMenu->playerSelectStatus == STATUS_READY && sTradeMenu->partnerSelectStatus == STATUS_CANCEL) { - // The player has selected a pokemon to trade, + // The player has selected a Pokémon to trade, // but the partner has selected Cancel PrintTradeMessage(MSG_CANCELED); sTradeMenu->linkData[0] = LINKCMD_PARTNER_CANCEL_TRADE; @@ -1308,7 +1308,7 @@ static void Leader_HandleCommunication(void) else if (sTradeMenu->playerSelectStatus == STATUS_CANCEL && sTradeMenu->partnerSelectStatus == STATUS_READY) { - // The partner has selected a pokemon to trade, + // The partner has selected a Pokémon to trade, // but the player has selected cancel PrintTradeMessage(MSG_FRIEND_WANTS_TO_TRADE); sTradeMenu->linkData[0] = LINKCMD_PLAYER_CANCEL_TRADE; @@ -1465,7 +1465,7 @@ static void CB_ProcessMenuInput(void) if (sTradeMenu->cursorPosition < PARTY_SIZE) { - // Selected pokemon in player's party + // Selected Pokémon in player's party DrawTextBorderOuter(1, 1, 14); FillWindowPixelBuffer(1, PIXEL_FILL(1)); PrintMenuTable(1, ARRAY_COUNT(sSelectTradeMonActions), sSelectTradeMonActions); @@ -1476,7 +1476,7 @@ static void CB_ProcessMenuInput(void) } else if (sTradeMenu->cursorPosition < PARTY_SIZE * 2) { - // Selected pokemon in partner's party + // Selected Pokémon in partner's party BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTradeMenu->callbackId = CB_SHOW_MON_SUMMARY; } @@ -1855,7 +1855,7 @@ static void SetSelectedMon(u8 cursorPosition) if (sTradeMenu->drawSelectedMonState[whichParty] == 0) { // Start the animation to display just the selected - // pokemon in the middle of the screen + // Pokémon in the middle of the screen sTradeMenu->drawSelectedMonState[whichParty] = 1; sTradeMenu->selectedMonIdx[whichParty] = cursorPosition; } @@ -1889,10 +1889,10 @@ static void DrawSelectedMonScreen(u8 whichParty) for (i = 0; i < PARTY_SIZE; i++) ClearWindowTilemap(i + (whichParty * PARTY_SIZE + 2)); - // Re-display the selected pokemon + // Re-display the selected Pokémon gSprites[sTradeMenu->partySpriteIds[selectedMonParty][partyIdx]].invisible = FALSE; - // Move the selected pokemon to the center + // Move the selected Pokémon to the center gSprites[sTradeMenu->partySpriteIds[selectedMonParty][partyIdx]].data[0] = 20; gSprites[sTradeMenu->partySpriteIds[selectedMonParty][partyIdx]].data[2] = (sTradeMonSpriteCoords[selectedMonParty * PARTY_SIZE][0] + sTradeMonSpriteCoords[selectedMonParty * PARTY_SIZE + 1][0]) / 2 * 8 + 14; @@ -3109,13 +3109,13 @@ static void TradeMons(u8 playerPartyIdx, u8 partnerPartyIdx) struct Pokemon *partnerMon = &gEnemyParty[partnerPartyIdx]; u16 partnerMail = GetMonData(partnerMon, MON_DATA_MAIL); - // The mail attached to the sent Pokemon no longer exists in your file. + // The mail attached to the sent Pokémon no longer exists in your file. if (playerMail != MAIL_NONE) ClearMail(&gSaveBlock1Ptr->mail[playerMail]); SWAP(*playerMon, *partnerMon, sTradeAnim->tempMon); - // By default, a Pokemon received from a trade will have 70 Friendship. + // By default, a Pokémon received from a trade will have 70 Friendship. // Eggs use Friendship to track egg cycles, so don't set this on Eggs. friendship = 70; if (!GetMonData(playerMon, MON_DATA_IS_EGG)) diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index b6e2b63c35..f36060e8d1 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -11,7 +11,7 @@ #define PICS_COUNT 8 -// Needs to be large enough to store either a decompressed pokemon pic or trainer pic +// Needs to be large enough to store either a decompressed Pokémon pic or trainer pic #define PIC_SPRITE_SIZE max(MON_PIC_SIZE, TRAINER_PIC_SIZE) #define MAX_PIC_FRAMES max(MAX_MON_PIC_FRAMES, MAX_TRAINER_PIC_FRAMES) diff --git a/src/tv.c b/src/tv.c index ef493c10ce..0152dffa3e 100644 --- a/src/tv.c +++ b/src/tv.c @@ -6241,7 +6241,7 @@ static void DoTVShowSpotTheCuties(void) TVShowConvertInternationalString(gStringVar1, show->cuties.playerName, show->cuties.language); TVShowConvertInternationalString(gStringVar2, show->cuties.nickname, show->cuties.pokemonNameLanguage); - // Comments following the intro depend on how many ribbons the pokemon has + // Comments following the intro depend on how many ribbons the Pokémon has if (show->cuties.nRibbons < 10) sTVShowState = SPOTCUTIES_STATE_RIBBONS_LOW; else if (show->cuties.nRibbons < 20) diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 2aefdedf38..7a37d88f0d 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -73,7 +73,7 @@ struct UsePokeblockSession u8 natureText[34]; }; -// This struct is identical to PokenavMonListItem, the struct used for managing lists of pokemon in the pokenav +// This struct is identical to PokenavMonListItem, the struct used for managing lists of Pokémon in the pokenav // Given that this screen is essentially duplicated in the poknav, this struct was probably the same one with // a more general name/purpose // TODO: Once the pokenav conditions screens are documented, resolve the above @@ -1259,7 +1259,7 @@ static void LoadAndCreateSelectionIcons(void) LoadSpriteSheets(spriteSheets); LoadSpritePalettes(spritePals); - // Fill pokeball selection icons up to number in party + // Fill Poké Ball selection icons up to number in party for (i = 0; i < sMenu->info.numSelections - 1; i++) { spriteId = CreateSprite(&spriteTemplate, 226, (i * 20) + 8, 0); @@ -1489,7 +1489,7 @@ static bool8 LoadNewSelection_CancelToMon(void) case 2: if (!ConditionMenu_UpdateMonEnter(&sMenu->graph, &sMenu->curMonXOffset)) { - // Load the new adjacent pokemon (not the one being shown) + // Load the new adjacent Pokémon (not the one being shown) LoadMonInfo(sMenu->toLoadSelection, sMenu->toLoadId); sMenu->info.helperState++; } @@ -1552,7 +1552,7 @@ static bool8 LoadNewSelection_MonToMon(void) case 2: if (!ConditionMenu_UpdateMonEnter(&sMenu->graph, &sMenu->curMonXOffset)) { - // Load the new adjacent pokemon (not the one being shown) + // Load the new adjacent Pokémon (not the one being shown) LoadMonInfo(sMenu->toLoadSelection, sMenu->toLoadId); sMenu->info.helperState++; } @@ -1593,8 +1593,8 @@ static void SpriteCB_SelectionIconCancel(struct Sprite *sprite) sprite->oam.paletteNum = IndexOfSpritePaletteTag(TAG_CONDITION_CANCEL); } -// Calculate the max id for sparkles/stars that appear around the pokemon on the condition screen -// All pokemon start with 1 sparkle (added by CreateConditionSparkleSprites), so the number here +1 +// Calculate the max id for sparkles/stars that appear around the Pokémon on the condition screen +// All Pokémon start with 1 sparkle (added by CreateConditionSparkleSprites), so the number here +1 // is the total number of sparkles that appear static void CalculateNumAdditionalSparkles(u8 monIndex) { diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 3a7f6cab23..11d01f04ea 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -364,7 +364,7 @@ static u8 PickWildMonNature(void) } } } - // check synchronize for a pokemon with the same ability + // check synchronize for a Pokémon with the same ability if (!GetMonData(&gPlayerParty[0], MON_DATA_SANITY_IS_EGG) && GetMonAbility(&gPlayerParty[0]) == ABILITY_SYNCHRONIZE && Random() % 2 == 0) @@ -812,16 +812,16 @@ u16 GetLocalWildMon(bool8 *isWaterMon) // Neither if (landMonsInfo == NULL && waterMonsInfo == NULL) return SPECIES_NONE; - // Land Pokemon + // Land Pokémon else if (landMonsInfo != NULL && waterMonsInfo == NULL) return landMonsInfo->wildPokemon[ChooseWildMonIndex_Land()].species; - // Water Pokemon + // Water Pokémon else if (landMonsInfo == NULL && waterMonsInfo != NULL) { *isWaterMon = TRUE; return waterMonsInfo->wildPokemon[ChooseWildMonIndex_WaterRock()].species; } - // Either land or water Pokemon + // Either land or water Pokémon if ((Random() % 100) < 80) { return landMonsInfo->wildPokemon[ChooseWildMonIndex_Land()].species; From bc2a7451715a2a3dacd4c624aa763a480660a0de Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Tue, 12 Dec 2023 23:18:35 +0100 Subject: [PATCH 11/57] Fix accidental symbol replacements --- src/battle_transition.c | 2 +- src/data/bard_music/bard_sounds.h | 4 ++-- src/data/party_menu.h | 2 +- src/party_menu.c | 2 +- src/pokemon.c | 2 +- src/pokemon_storage_system.c | 4 ++-- src/starter_choose.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/battle_transition.c b/src/battle_transition.c index 1c5b38faf8..11f9cddf4b 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1315,7 +1315,7 @@ static void HBlankCB_Shuffle(void) #undef tAmplitude //------------------------------------------------------------------------ -// B_TRANSITION_BIG_Poké Ball, B_TRANSITION_AQUA, B_TRANSITION_MAGMA, +// B_TRANSITION_BIG_POKEBALL, B_TRANSITION_AQUA, B_TRANSITION_MAGMA, // B_TRANSITION_REGICE, B_TRANSITION_REGISTEEL, B_TRANSITION_REGIROCK // and B_TRANSITION_KYOGRE. // diff --git a/src/data/bard_music/bard_sounds.h b/src/data/bard_music/bard_sounds.h index bc6f88ba57..291d22872a 100644 --- a/src/data/bard_music/bard_sounds.h +++ b/src/data/bard_music/bard_sounds.h @@ -25,7 +25,7 @@ #include "trendysaying.h" const struct BardSound (*const gBardSoundsTable[EC_NUM_GROUPS])[6] = { - [EC_GROUP_POKEMON] = NULL, // Handled by gBardSounds_Pokémon + [EC_GROUP_POKEMON] = NULL, // Handled by gBardSounds_Pokemon [EC_GROUP_TRAINER] = gBardSounds_Trainer, [EC_GROUP_STATUS] = gBardSounds_Status, [EC_GROUP_BATTLE] = gBardSounds_Battle, @@ -46,7 +46,7 @@ const struct BardSound (*const gBardSoundsTable[EC_NUM_GROUPS])[6] = { [EC_GROUP_MOVE_1] = NULL, // Handled by gBardSounds_Moves [EC_GROUP_MOVE_2] = NULL, // Handled by gBardSounds_Moves [EC_GROUP_TRENDY_SAYING] = gBardSounds_TrendySaying, - [EC_GROUP_POKEMON_NATIONAL] = NULL // Handled by gBardSounds_Pokémon + [EC_GROUP_POKEMON_NATIONAL] = NULL // Handled by gBardSounds_Pokemon }; #endif //GUARD_BARD_SOUNDS_TABLE_H diff --git a/src/data/party_menu.h b/src/data/party_menu.h index 04e073df17..703e8e406e 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -983,7 +983,7 @@ static const struct CompressedSpriteSheet sSpriteSheet_MenuPokeballSmall = gPartyMenuPokeballSmall_Gfx, 0x0300, TAG_POKEBALL_SMALL }; -// Used for the pokeball sprite next to Cancel and Confirm when both are present, otherwise sSpriteTemplate_MenuPoké Ball is used +// Used for the pokeball sprite next to Cancel and Confirm when both are present, otherwise sSpriteTemplate_MenuPokeball is used static const struct SpriteTemplate sSpriteTemplate_MenuPokeballSmall = { .tileTag = TAG_POKEBALL_SMALL, diff --git a/src/party_menu.c b/src/party_menu.c index 2abceb50ae..adf833fe89 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -3512,7 +3512,7 @@ static void CursorCb_SendMon(u8 taskId) } else { - // gStringVar4 below is the error message buffered by TrySwitchInPokémon + // gStringVar4 below is the error message buffered by TrySwitchInPokemon PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]); DisplayPartyMenuMessage(gStringVar4, TRUE); gTasks[taskId].func = Task_ReturnToChooseMonAfterText; diff --git a/src/pokemon.c b/src/pokemon.c index 51a512445e..6ee052fda5 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -98,7 +98,7 @@ static const struct CombinedMove sCombinedMoves[2] = }; // NOTE: The order of the elements in the 3 arrays below is irrelevant. -// To reorder the pokedex, see the values in include/constants/Pokédex.h. +// To reorder the pokedex, see the values in include/constants/pokedex.h. #define SPECIES_TO_HOENN(name) [SPECIES_##name - 1] = HOENN_DEX_##name #define SPECIES_TO_NATIONAL(name) [SPECIES_##name - 1] = NATIONAL_DEX_##name diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 92afe8a4bb..c8c87961c8 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -6687,8 +6687,8 @@ static void LoadSavedMovingMon(void) { if (sIsMonBeingMoved) { - // If it came from the party load a struct Pokémon, - // otherwise load a BoxPokémon + // If it came from the party load a struct Pokemon, + // otherwise load a BoxPokemon if (sMovingMonOrigBoxId == TOTAL_BOXES_COUNT) sStorage->movingMon = sSavedMovingMon; else diff --git a/src/starter_choose.c b/src/starter_choose.c index ef0b9388bf..cbbd163b03 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -367,7 +367,7 @@ static void VblankCB_StarterChoose(void) #define tPkmnSpriteId data[1] #define tCircleSpriteId data[2] -// Data for sSpriteTemplate_Poké Ball +// Data for sSpriteTemplate_Pokeball #define sTaskId data[0] #define sBallId data[1] From 63654311222936cc7ce18851847ac31b2791eef9 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Tue, 12 Dec 2023 23:20:22 +0100 Subject: [PATCH 12/57] =?UTF-8?q?Add=20Pok=C3=A9Nav=20too?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/graphics.h | 4 ++-- include/pokenav.h | 8 ++++---- include/strings.h | 6 +++--- src/graphics.c | 2 +- src/pokenav_menu_handler.c | 4 ++-- src/start_menu.c | 2 +- src/use_pokeblock.c | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index e98b707957..9e2fb79539 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4005,7 +4005,7 @@ extern const u32 gBerryPalette_Starf[]; extern const u32 gBerryPic_Enigma[]; extern const u32 gBerryPalette_Enigma[]; -//pokenav +//PokéNav extern const u16 gPokenavCondition_Pal[]; extern const u32 gPokenavCondition_Gfx[]; extern const u32 gPokenavCondition_Tilemap[]; @@ -5011,7 +5011,7 @@ extern const u32 gBerryCrush_Crusher_Gfx[]; extern const u16 gBerryCrush_Crusher_Pal[]; extern const u32 gBerryCrush_TextWindows_Tilemap[]; -// Pokenav +// PokéNav extern const u32 gPokenavMessageBox_Gfx[]; extern const u32 gPokenavMessageBox_Tilemap[]; extern const u16 gPokenavMessageBox_Pal[]; diff --git a/include/pokenav.h b/include/pokenav.h index c6a8bb253e..174c338e27 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -65,8 +65,8 @@ struct PokenavMonList enum { POKENAV_MODE_NORMAL, // Chosen from Start menu. - POKENAV_MODE_FORCE_CALL_READY, // Pokenav tutorial before calling Mr. Stone - POKENAV_MODE_FORCE_CALL_EXIT, // Pokenav tutorial after calling Mr. Stone + POKENAV_MODE_FORCE_CALL_READY, // PokéNav tutorial before calling Mr. Stone + POKENAV_MODE_FORCE_CALL_EXIT, // PokéNav tutorial after calling Mr. Stone }; enum @@ -232,8 +232,8 @@ enum [CHECK_PAGE_INTRO_2] = gText_MatchCall##name##_Intro2} -// Pokenav Function IDs -// Indices into the LoopedTask tables for each of the main Pokenav features +// PokéNav Function IDs +// Indices into the LoopedTask tables for each of the main PokéNav features enum RegionMapFuncIds { diff --git a/include/strings.h b/include/strings.h index 914082779b..3215f70c88 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2949,7 +2949,7 @@ extern const u8 gText_CutenessContest[]; extern const u8 gText_SmartnessContest[]; extern const u8 gText_ToughnessContest[]; -// Pokenav Match Call +// PokéNav Match Call extern const u8 gText_CallCantBeMadeHere[]; extern const u8 gText_NumberRegistered[]; extern const u8 gText_NumberOfBattles[]; @@ -2959,7 +2959,7 @@ extern const u8 gText_Call[]; extern const u8 gText_Check[]; extern const u8 gText_Cancel6[]; -// Pokenav Menu Handler +// PokéNav Menu Handler extern const u8 gText_CheckMapOfHoenn[]; extern const u8 gText_CheckPokemonInDetail[]; extern const u8 gText_CallRegisteredTrainer[]; @@ -2976,7 +2976,7 @@ extern const u8 gText_FindToughPokemon[]; extern const u8 gText_ReturnToConditionMenu[]; extern const u8 gText_NoRibbonWinners[]; -// Pokenav +// PokéNav extern const u8 gText_NumberIndex[]; extern const u8 gText_RibbonsF700[]; diff --git a/src/graphics.c b/src/graphics.c index 39b6c8e680..8f1bc89ea6 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1282,7 +1282,7 @@ const u16 gContestResultsTitle_Smart_Tilemap[] = INCBIN_U16("graphics/contest/r const u16 gContestResultsTitle_Tough_Tilemap[] = INCBIN_U16("graphics/contest/results_screen/title_tough.bin"); const u16 gContestResultsTitle_Tilemap[] = INCBIN_U16("graphics/contest/results_screen/title.bin"); -// pokenav +// PokéNav const u16 gPokenavCondition_Pal[] = INCBIN_U16("graphics/pokenav/condition/graph.gbapal"); const u32 gPokenavCondition_Gfx[] = INCBIN_U32("graphics/pokenav/condition/graph.4bpp.lz"); diff --git a/src/pokenav_menu_handler.c b/src/pokenav_menu_handler.c index b81b4c892f..d67f61c1ea 100644 --- a/src/pokenav_menu_handler.c +++ b/src/pokenav_menu_handler.c @@ -257,7 +257,7 @@ static u32 HandleMainMenuInput(struct Pokenav_Menu *menu) return POKENAV_MENU_FUNC_NONE; } -// Force the player to select Match Call during the call Mr. Stone pokenav tutorial +// Force the player to select Match Call during the call Mr. Stone PokéNav tutorial static u32 HandleMainMenuInputTutorial(struct Pokenav_Menu *menu) { if (UpdateMenuCursorPos(menu)) @@ -287,7 +287,7 @@ static u32 HandleMainMenuInputTutorial(struct Pokenav_Menu *menu) return POKENAV_MENU_FUNC_NONE; } -// After calling Mr. Stone during the pokenav tutorial, force player to exit or use Match Call again +// After calling Mr. Stone during the PokéNav tutorial, force player to exit or use Match Call again static u32 HandleMainMenuInputEndTutorial(struct Pokenav_Menu *menu) { if (UpdateMenuCursorPos(menu)) diff --git a/src/start_menu.c b/src/start_menu.c index 0c8fe01f0e..63914cbb72 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -689,7 +689,7 @@ static bool8 StartMenuPokeNavCallback(void) PlayRainStoppingSoundEffect(); RemoveExtraStartMenuWindows(); CleanupOverworldWindowsAndTilemaps(); - SetMainCallback2(CB2_InitPokeNav); // Display PokeNav + SetMainCallback2(CB2_InitPokeNav); // Display PokéNav return TRUE; } diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 7a37d88f0d..c9d5c56e5c 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -73,10 +73,10 @@ struct UsePokeblockSession u8 natureText[34]; }; -// This struct is identical to PokenavMonListItem, the struct used for managing lists of Pokémon in the pokenav +// This struct is identical to PokenavMonListItem, the struct used for managing lists of Pokémon in the PokéNav // Given that this screen is essentially duplicated in the poknav, this struct was probably the same one with // a more general name/purpose -// TODO: Once the pokenav conditions screens are documented, resolve the above +// TODO: Once the PokéNav conditions screens are documented, resolve the above struct UsePokeblockMenuPokemon { u8 boxId; // Because this screen is never used for the PC this is always set to TOTAL_BOXES_COUNT to refer to party From f8a4cf9d85a3ab02ca5d2b0a993acc2b69270119 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Wed, 13 Dec 2023 09:52:04 +0100 Subject: [PATCH 13/57] Update pokedex.c --- src/pokedex.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pokedex.c b/src/pokedex.c index d5db9987dd..0d1520a490 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1758,7 +1758,7 @@ static void Task_HandlePokedexStartMenuInput(u8 taskId) CreateMonSpritesAtPos(sPokedexView->selectedPokemon, 0xE); gMain.newKeys |= START_BUTTON; //Exit menu break; - case 3: //CLOSE Pokédex + case 3: //CLOSE POKéDEX BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_ClosePokedex; PlaySE(SE_PC_OFF); @@ -1958,12 +1958,12 @@ static void Task_HandleSearchResultsStartMenuInput(u8 taskId) CreateMonSpritesAtPos(sPokedexView->selectedPokemon, 0xE); gMain.newKeys |= START_BUTTON; break; - case 3: //BACK TO Pokédex + case 3: //BACK TO POKéDEX BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_ReturnToPokedexFromSearchResults; PlaySE(SE_TRUCK_DOOR); break; - case 4: //CLOSE Pokédex + case 4: //CLOSE POKéDEX BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_ClosePokedexFromSearchResultsStartMenu; PlaySE(SE_PC_OFF); From 027dccfc95ef0712d3b802c791c2589d68d6cb94 Mon Sep 17 00:00:00 2001 From: Jaizu Date: Wed, 20 Dec 2023 12:24:52 +0100 Subject: [PATCH 14/57] Missing constant --- src/field_message_box.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/field_message_box.c b/src/field_message_box.c index 55124e7dfc..b797e1d353 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -84,7 +84,7 @@ bool8 ShowPokenavFieldMessage(const u8 *str) StringExpandPlaceholders(gStringVar4, str); CreateTask(Task_HidePokenavMessageWhenDone, 0); StartMatchCallFromScript(str); - sFieldMessageBoxMode = 2; + sFieldMessageBoxMode = FIELD_MESSAGE_BOX_NORMAL; return TRUE; } From 3a5ca6f8f0b4fd345cf134a04b37361f8f2f776f Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Wed, 20 Dec 2023 16:33:45 +0000 Subject: [PATCH 15/57] Small test runner improvements (#3761) * u16 for FunctionTest PARAMETRIZE * Speed up CB2_TestRunner * Use DACS to handle illegal instructions DACS is available in mgba from https://github.com/mgba-emu/mgba/commit/44e074a15e9651481f7f652ac006a7c9d58cbeb9 This is not 0.10.2, but will presumably be available in the next release. Alternatively, a GBA BIOS could be used. --------- Co-authored-by: DizzyEggg Co-authored-by: Bassoonian --- Makefile | 2 +- include/test/test.h | 4 ++-- ld_script_test.ld | 6 ++++++ test/species.c | 2 ++ test/test_runner.c | 27 +++++++++++++++++++++++++++ 5 files changed, 38 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index db883cb60c..d899015225 100644 --- a/Makefile +++ b/Makefile @@ -495,7 +495,7 @@ $(OBJ_DIR)/ld_script_test.ld: $(LD_SCRIPT_TEST) $(LD_SCRIPT_DEPS) $(TESTELF): $(OBJ_DIR)/ld_script_test.ld $(OBJS) $(TEST_OBJS) libagbsyscall tools check-tools @echo "cd $(OBJ_DIR) && $(LD) -T ld_script_test.ld -o ../../$@ " @cd $(OBJ_DIR) && $(LD) $(TESTLDFLAGS) -T ld_script_test.ld -o ../../$@ $(OBJS_REL) $(TEST_OBJS_REL) $(LIB) - $(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent + $(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) -d0 --silent $(PATCHELF) $(TESTELF) gTestRunnerArgv "$(TESTS)\0" ifeq ($(GITHUB_REPOSITORY_OWNER),rh-hideout) diff --git a/include/test/test.h b/include/test/test.h index e9c920bd0b..918d00399b 100644 --- a/include/test/test.h +++ b/include/test/test.h @@ -59,8 +59,8 @@ extern const struct TestRunner gAssumptionsRunner; struct FunctionTestRunnerState { - u8 parameters; - u8 runParameter; + u16 parameters; + u16 runParameter; }; extern const struct TestRunner gFunctionTestRunner; diff --git a/ld_script_test.ld b/ld_script_test.ld index b86302f8cb..49a0ec35b0 100644 --- a/ld_script_test.ld +++ b/ld_script_test.ld @@ -109,6 +109,12 @@ SECTIONS { __rom_end = .; + dacs 0x9FFC000 : + ALIGN(4) + { + test/*.o(.dacs); + } > ROM =0 + /* DWARF debug sections. Symbols in the DWARF debugging sections are relative to the beginning of the section so we begin them at 0. */ diff --git a/test/species.c b/test/species.c index 9ea20638c8..d412dd005a 100644 --- a/test/species.c +++ b/test/species.c @@ -34,6 +34,8 @@ TEST("Form change tables contain only forms in the form species ID table") for (i = 0; formChangeTable[i].method != FORM_CHANGE_TERMINATOR; i++) { + if (formChangeTable[i].targetSpecies == SPECIES_NONE) + continue; for (j = 0; formSpeciesIdTable[j] != FORM_SPECIES_END; j++) { if (formChangeTable[i].targetSpecies == formSpeciesIdTable[j]) diff --git a/test/test_runner.c b/test/test_runner.c index 93d859654a..5ca397cd6c 100644 --- a/test/test_runner.c +++ b/test/test_runner.c @@ -106,6 +106,8 @@ static u32 AssignCostToRunner(void) void CB2_TestRunner(void) { +top: + switch (gTestRunnerState.state) { case STATE_INIT: @@ -361,6 +363,9 @@ void CB2_TestRunner(void) MgbaExit_(gTestRunnerState.exitCode); break; } + + if (gMain.callback2 == CB2_TestRunner) + goto top; } void Test_ExpectedResult(enum TestResult result) @@ -652,3 +657,25 @@ static s32 MgbaVPrintf_(const char *fmt, va_list va) } return i; } + +/* Entry point for the Debugging and Control System. Handles illegal + * instructions, which are typically caused by branching to an invalid + * address. */ +__attribute__((naked, section(".dacs"), target("arm"))) +void DACSEntry(void) +{ + asm(".arm\n\ + ldr r0, =(DACSHandle + 1)\n\ + bx r0\n"); +} + +#define DACS_LR (*(vu32 *)0x3007FEC) + +void DACSHandle(void) +{ + if (gTestRunnerState.state == STATE_RUN_TEST) + gTestRunnerState.state = STATE_REPORT_RESULT; + gTestRunnerState.result = TEST_RESULT_CRASH; + ReinitCallbacks(); + DACS_LR = ((uintptr_t)JumpToAgbMainLoop & ~1) + 4; +} From fcdc515be2d60436853f649d6c2d6163d3052111 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 21 Dec 2023 13:17:05 +0100 Subject: [PATCH 16/57] Fix rain dance/sunny day not blending opponent sprite (#3785) --- data/battle_anim_scripts.s | 98 ++++++++++++++++----------------- include/constants/battle_anim.h | 3 + 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index e101540851..d9e7df63b6 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -5389,11 +5389,11 @@ Move_FOUL_PLAY: createsprite gFoulPlayImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1, 0x1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_M_VITAL_THROW SOUND_PAN_TARGET - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x3, 0xa, 0x0, 0x0 + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0xa, 0x0, 0x0 createsprite gFoulPlayRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x100, 0x0 delay 0x8 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x3, 0xa, 0x0, 0x0 + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0xa, 0x0, 0x0 createsprite gFoulPlayRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x100, 0x0 waitforvisualfinish clearmonbg ANIM_TARGET @@ -10404,7 +10404,7 @@ Move_LIGHT_OF_RUIN:: delay 0x10 createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x0, 0x7FFF waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS, 0x1, 0x0, 0x0, 0x0 + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x1, 0x0, 0x0, 0x0 waitforvisualfinish end LightOfRuinBeam: @@ -11142,7 +11142,7 @@ SolarBladeUnleash: loadspritegfx ANIM_TAG_SUNLIGHT @sun rays monbg ANIM_ATTACKER setalpha 13, 3 - createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_BG | F_PAL_BATTLERS), 1, 0, 6, 0x7fff + createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 0, 6, 0x7fff waitforvisualfinish playsewithpan SE_M_SWORDS_DANCE, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4 @@ -11159,7 +11159,7 @@ SolarBladeUnleash: delay 0x2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1 waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_BG | F_PAL_BATTLERS), 1, 6, 0, 0x7fff + createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 6, 0, 0x7fff waitforvisualfinish call UnsetPsychicBg clearmonbg ANIM_ATTACKER @@ -15384,7 +15384,7 @@ Move_SILK_TRAP:: Move_SNOWSCAPE:: loadspritegfx ANIM_TAG_SNOWFLAKES playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER - createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 0, 4, RGB(11, 18, 22) + createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 0, 4, RGB(11, 18, 22) waitforvisualfinish createvisualtask AnimTask_CreateSnowflakes, 2, 0, 3, 120 createvisualtask AnimTask_CreateSnowflakes, 2, 0, 3, 120 @@ -15393,7 +15393,7 @@ Move_SNOWSCAPE:: playsewithpan SE_M_GUST2, SOUND_PAN_ATTACKER delay 30 waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 4, 0, RGB(11, 18, 22) + createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 4, 0, RGB(11, 18, 22) waitforvisualfinish end @@ -15555,7 +15555,7 @@ Move_DRAGON_ENERGY:: createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 4, 0, 11, RGB(31, 28, 31) @;Pinkish White waitforvisualfinish playsewithpan SE_M_DETECT, SOUND_PAN_TARGET - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x1, 0x10, 0x0, 0x2C5E @;Regidrago Reddish Reddish, Purple + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x10, 0x0, 0x2C5E @;Regidrago Reddish Reddish, Purple createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -120, 0, 0, 1 @;Slide off off, screen waitforvisualfinish playsewithpan SE_M_SOLAR_BEAM, SOUND_PAN_TARGET @@ -16093,7 +16093,7 @@ Move_CHLOROBLAST:: createvisualtask AnimTask_AllBattlersVisible, 0xA, clearmonbg ANIM_DEF_PARTNER waitbgfadein - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x2, 0x0, 0x0, 0x0 @;From Black + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x0, 0x0 @;From Black end ChloroblastShot: createsprite gSpriteTemplate_ChloroblastShot, ANIM_TARGET, 2, 0, 0, 0x19 @@ -16461,7 +16461,7 @@ Move_CEASELESS_EDGE:: createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x5 waitforvisualfinish createvisualtask AnimTask_AllBattlersVisible, 0xA, - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x1, 0x10, 0x0, 0x7FFF @;From White + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x10, 0x0, 0x7FFF @;From White waitforvisualfinish end @@ -21839,14 +21839,14 @@ Move_DRAGON_RAGE: Move_RAIN_DANCE: loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER - createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 0, 4, RGB_BLACK + createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 delay 120 delay 30 waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 4, 0, RGB_BLACK + createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 4, 0, RGB_BLACK waitforvisualfinish end @@ -23279,7 +23279,7 @@ Move_SUNNY_DAY: loadspritegfx ANIM_TAG_SUNLIGHT monbg ANIM_ATK_PARTNER setalpha 13, 3 - createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 1, 0, 6, RGB_WHITE + createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 0, 6, RGB_WHITE waitforvisualfinish panse_adjustnone SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 call SunnyDayLightRay @@ -23287,7 +23287,7 @@ Move_SUNNY_DAY: call SunnyDayLightRay call SunnyDayLightRay waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 1, 6, 0, RGB_WHITE + createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 6, 0, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -23503,9 +23503,9 @@ Move_HAZE: playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_HazeScrollingFog, 5 delay 30 - createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS, 2, 0, 16, RGB_BLACK + createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS_2, 2, 0, 16, RGB_BLACK delay 90 - createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS, 1, 16, 0, RGB_BLACK + createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS_2, 1, 16, 0, RGB_BLACK end Move_FIRE_PUNCH: @@ -24850,7 +24850,7 @@ Move_MORNING_SUN: loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_MorningSunLightBeam, 5 delay 8 - createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 8, 0, 12, RGB_WHITE + createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 8, 0, 12, RGB_WHITE delay 14 call MorningSunStar call MorningSunStar @@ -24867,7 +24867,7 @@ Move_MORNING_SUN: call MorningSunStar call MorningSunStar call MorningSunStar - createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 3, 12, 0, RGB_WHITE + createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 3, 12, 0, RGB_WHITE waitforvisualfinish waitsound call HealingEffect @@ -27172,13 +27172,13 @@ General_Rain: RainDrops: loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER - createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 0, 4, RGB_BLACK + createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 delay 50 waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 4, 0, RGB_BLACK + createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 4, 0, RGB_BLACK waitforvisualfinish return @@ -27627,14 +27627,14 @@ General_Rainbow:: call RainDrops delay 30 loadspritegfx ANIM_TAG_SUNLIGHT - createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 1, 0, 6, RGB_WHITE + createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 0, 6, RGB_WHITE waitforvisualfinish panse_adjustnone SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 call SunnyDayLightRay call SunnyDayLightRay call SunnyDayLightRay waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 1, 6, 0, RGB_WHITE + createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 6, 0, RGB_WHITE waitforvisualfinish delay 30 fadetobg BG_RAINBOW @@ -28807,7 +28807,7 @@ FinishCorkscrewCrash: call CorkscrewCrashSprayRocks delay 0x6 call CorkscrewCrashSprayRocks - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x2, 0x0, 0x10, 0x7fff + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x7fff waitforvisualfinish delay 0x10 call ResetFromWhiteScreen @@ -28890,7 +28890,7 @@ FinishInfernoOverdrive: call InfernoOverdriveExplosion delay 0x6 call InfernoOverdriveExplosion - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x1, 0x0, 0x10, 0x001b @ red bg pal + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x0, 0x10, 0x001b @ red bg pal delay 0x6 call InfernoOverdriveExplosion waitforvisualfinish @@ -29249,7 +29249,7 @@ BloomDoomPetalBlast: ResetFromGreenScreen: createvisualtask AnimTask_AllBattlersInvisible, 0xA waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS, 0x2, 0x0, 0x0, 0x33ED @Everything from green + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x33ED @Everything from green restorebg waitbgfadeout setarg 0x7 0xffff @@ -29873,7 +29873,7 @@ DevastatingDrakeUniversalEnding: waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x10, 0x0, 0x40c0 @ fade from purple waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS, 0x2, 0x0, 0x0, 0x0 @ reset all colours + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x0 @ reset all colours waitforvisualfinish createvisualtask AnimTask_AllBattlersVisible, 0xA waitforvisualfinish @@ -30066,7 +30066,7 @@ Move_BLACK_HOLE_ECLIPSE:: unloadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_EXPLOSION_2 call BlackHoleEclipseExplosion - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x1, 0x0, 0x10, 0x7fff @ bg to white pal + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x0, 0x10, 0x7fff @ bg to white pal call BlackHoleEclipseExplosion waitforvisualfinish delay 0x18 @@ -30097,7 +30097,7 @@ BlackHoleEclipseExplosion: ResetFromWhiteScreen: createvisualtask AnimTask_AllBattlersInvisible, 0xA waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS, 0x2, 0x0, 0x0, 0x7FFF @everything from white + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x7FFF @everything from white restorebg waitbgfadeout setarg 0x7 0xffff @@ -30416,10 +30416,10 @@ CatastropikaFinish: call CatastropikaThundering call CatastropikaThundering call CatastropikaThundering - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x4, 0x0, 0x10, 0x7fff @ bg to white + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x7fff @ bg to white call CatastropikaThundering waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x4, 0x10, 0x0, 0x7fff @ bg to white + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x10, 0x0, 0x7fff @ bg to white createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x10 @fix tgt position waitforvisualfinish createvisualtask AnimTask_AllBattlersVisible, 0xA @@ -30623,11 +30623,11 @@ Move_10000000_VOLT_THUNDERBOLT:: @ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x37, 0x2c, 0x40, 0x28, 0x1, 0x8003 @ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x37, 0x2c, 0x80, 0x28, 0x0, 0x8003 @ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x00, 0x37, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x8003 - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x2, 0x0, 0x10, 0x7fff + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x7fff call TenMillionVoltThunderboltSparkGeyser waitforvisualfinish delay 0x10 - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x3, 0x10, 0x0, 0x7fff + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0x10, 0x0, 0x7fff waitforvisualfinish createvisualtask AnimTask_AllBattlersVisible, 0xA waitforvisualfinish @@ -30843,10 +30843,10 @@ StokedSparksurferSparkGeyser: Move_EXTREME_EVOBOOST:: loadspritegfx ANIM_TAG_LEER @leer - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x3, 0x0, 0x10, 0x0000 + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0x0, 0x10, 0x0000 waitforvisualfinish createvisualtask AnimTask_AllBattlersInvisible, 0xA - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS, 3, 0, 0, 0 @Remove fading on everyone + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 3, 0, 0, 0 @Remove fading on everyone waitforvisualfinish playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0x18, 0xfff4 @@ -31055,7 +31055,7 @@ PulverizingPancakeFinish: delay 0x5 loadspritegfx ANIM_TAG_EXPLOSION @explosion call PulverizingPancakeExplosion - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x2, 0x0, 0x10, 0x7fff @ everything goes white + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x7fff @ everything goes white call PulverizingPancakeExplosion waitforvisualfinish call ResetFromWhiteScreen @@ -31148,7 +31148,7 @@ GenesisSupernovaFinish: unloadspritegfx ANIM_TAG_METEOR @superpower call GenesisSupernovaBubbleExplosion call GenesisSupernovaBubbleExplosion - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x3, 0x0, 0x10, 0x7fff + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0x0, 0x10, 0x7fff call GenesisSupernovaBubbleExplosion waitforvisualfinish delay 0x10 @@ -31631,7 +31631,7 @@ Move_MALICIOUS_MOONSAULT:: call MaliciousMoonsaultExplosion delay 0x6 call MaliciousMoonsaultExplosion - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x1, 0x0, 0x10, 0x001b @ fade all to red + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x0, 0x10, 0x001b @ fade all to red delay 0x6 call MaliciousMoonsaultExplosion createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x10 @@ -31954,10 +31954,10 @@ SplinteredStormshardsByPlayer: call SplinteredStormshardsExplosionOpponent call SplinteredStormshardsExplosionOpponent SplinteredStormshardsEnd: - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x4, 0x0, 0x10, 0x7fff + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x7fff call SplinteredStormshardsBrownExplode waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x4, 0x10, 0x0, 0x7fff + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x10, 0x0, 0x7fff waitforvisualfinish createvisualtask AnimTask_AllBattlersVisible, 0xA waitforvisualfinish @@ -32203,7 +32203,7 @@ Move_LETS_SNUGGLE_FOREVER:: delay 0x8 call LetsSnuggleForeverTears waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x2, 0x0, 0x10, 0x0000 + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x0000 waitforvisualfinish loadspritegfx ANIM_TAG_SPARKLE_4 @detect playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER @@ -32405,7 +32405,7 @@ ClangorousSoulblazeOnPlayer: createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x60, 0xffe0, ANIM_ATTACKER, 0x1 call ClangorousSoulblazePulse_2 delay 0x5 - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x4, 0x0, 0x10, 0x7fff + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x7fff playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x65, 0xfff0, ANIM_ATTACKER, 0x1 call ClangorousSoulblazePulse_3 @@ -32476,7 +32476,7 @@ ClangorousSoulblazeOnOpponent: createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x60, 0x45, ANIM_ATTACKER, 0x1 call ClangorousSoulblazePulse_2 delay 0x5 - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x4, 0x0, 0x10, 0x7fff + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x7fff playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x65, 0x35, ANIM_ATTACKER, 0x1 call ClangorousSoulblazePulse_3 @@ -32630,7 +32630,7 @@ Move_GUARDIAN_OF_ALOLA:: call GuardianOfAlolaRockGeyser call GuardianOfAlolaRockGeyser call GuardianOfAlolaRocksTarget - createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS), 0x3, 0x0, 0x10, 0x7fff + createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0x0, 0x10, 0x7fff call GuardianOfAlolaRockGeyser call GuardianOfAlolaRockGeyser call GuardianOfAlolaRockGeyser @@ -32801,7 +32801,7 @@ SearingSunrazeSmashImpact: call SearingSunrazeSmashInferno call SearingSunrazeSmashInferno call SearingSunrazeSmashInferno - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x4, 0x0, 0x10, 0x001b @full red + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x001b @full red call SearingSunrazeSmashInferno call SearingSunrazeSmashInferno call SearingSunrazeSmashInferno @@ -32881,7 +32881,7 @@ SearingSunrazeSmashCharge: ResetFromRedScreen: createvisualtask AnimTask_AllBattlersInvisible, 0xA waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS, 0x2, 0x0, 0x0, 0x1B @Everything from red + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x1B @Everything from red restorebg waitbgfadeout setarg 0x7 0xffff @@ -33011,7 +33011,7 @@ MenacingMoonrazeMaelstromFinish: createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 76, 1 call MenacingMoonrazeMaelstromExplosion call MenacingMoonrazeMaelstromExplosion - createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS), 0x2, 0x0, 0x10, 0x7fff + createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x7fff call MenacingMoonrazeMaelstromExplosion waitforvisualfinish call ResetFromWhiteScreen @@ -33158,7 +33158,7 @@ Move_LIGHT_THAT_BURNS_THE_SKY:: clearmonbg ANIM_TARGET waitforvisualfinish delay 0x10 - createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS), 0x0, 0x10, 0x0, 0x43FF + createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS_2), 0x0, 0x10, 0x0, 0x43FF restorebg waitbgfadeout end @@ -33360,9 +33360,9 @@ Move_SOUL_STEALING_7_STAR_STRIKE:: waitforvisualfinish blendoff restorebg - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS), 0x2, 0x10, 0x0, 0x0 @everything from black + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x10, 0x0, 0x0 @everything from black waitforvisualfinish - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS, 0x2, 0x0, 0x0, 0x0 + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x0 waitforvisualfinish createvisualtask AnimTask_AllBattlersVisible, 0xA waitforvisualfinish diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 76e68b2457..ddd7b37843 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -642,5 +642,8 @@ #define F_PAL_ADJACENT (F_PAL_DEF_SIDE | F_PAL_ATK_PARTNER) #define F_PAL_ALL_BUT_DEF (F_PAL_ATK_SIDE | F_PAL_DEF_PARTNER) #define F_PAL_ALL_BUT_ATK_PARTNER (F_PAL_ATTACKER | F_PAL_DEF_SIDE) +// The below are only used by AnimTask_BlendBattleAnimPal to get battler sprite palettes by position rather than by role. +// It's redundant with F_PAL_BATTLERS, because they're only ever used together to refer to all the battlers at once. +#define F_PAL_BATTLERS_2 (1 << 7 | 1 << 8 | 1 << 9 | 1 << 10) #endif // GUARD_CONSTANTS_BATTLE_ANIM_H From cd0b4db09b579a348ca64441ffded80f70520e54 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 21 Dec 2023 14:07:54 +0100 Subject: [PATCH 17/57] same lists for healing moves (#3787) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- include/battle_ai_util.h | 2 +- src/battle_ai_main.c | 2 +- src/battle_ai_util.c | 25 +++---------------------- src/battle_dome.c | 10 +++++----- src/battle_main.c | 2 +- 5 files changed, 11 insertions(+), 30 deletions(-) diff --git a/include/battle_ai_util.h b/include/battle_ai_util.h index 9b30d103e4..9835265109 100644 --- a/include/battle_ai_util.h +++ b/include/battle_ai_util.h @@ -119,7 +119,7 @@ bool32 ShouldSetSnow(u32 battler, u32 ability, u32 holdEffect); bool32 ShouldSetRain(u32 battlerAtk, u32 ability, u32 holdEffect); bool32 ShouldSetSun(u32 battlerAtk, u32 atkAbility, u32 holdEffect); bool32 HasSleepMoveWithLowAccuracy(u32 battlerAtk, u32 battlerDef); -bool32 IsHealingMoveEffect(u32 effect); +bool32 IsHealingMove(u32 move); bool32 HasHealingEffect(u32 battler); bool32 IsTrappingMoveEffect(u32 effect); bool32 HasTrappingMoveEffect(u32 battler); diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 4f7d04438b..d2e3816872 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -4715,7 +4715,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score ADJUST_SCORE(3); break; case EFFECT_HEAL_BLOCK: - if (AI_WhoStrikesFirst(battlerAtk, battlerDef, move) == AI_IS_FASTER && predictedMove != MOVE_NONE && IsHealingMoveEffect(gBattleMoves[predictedMove].effect)) + if (AI_WhoStrikesFirst(battlerAtk, battlerDef, move) == AI_IS_FASTER && predictedMove != MOVE_NONE && IsHealingMove(predictedMove)) ADJUST_SCORE(3); // Try to cancel healing move else if (HasHealingEffect(battlerDef) || aiData->holdEffects[battlerDef] == HOLD_EFFECT_LEFTOVERS || (aiData->holdEffects[battlerDef] == HOLD_EFFECT_BLACK_SLUDGE && IS_BATTLER_OF_TYPE(battlerDef, TYPE_POISON))) diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 967d31bc07..71f3aa7d27 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -2017,28 +2017,9 @@ bool32 HasSleepMoveWithLowAccuracy(u32 battlerAtk, u32 battlerDef) return FALSE; } -bool32 IsHealingMoveEffect(u32 effect) +bool32 IsHealingMove(u32 move) { - switch (effect) - { - case EFFECT_RESTORE_HP: - case EFFECT_MORNING_SUN: - case EFFECT_SYNTHESIS: - case EFFECT_MOONLIGHT: - case EFFECT_SOFTBOILED: - case EFFECT_ROOST: - case EFFECT_SWALLOW: - case EFFECT_WISH: - case EFFECT_HEALING_WISH: - case EFFECT_HEAL_PULSE: - case EFFECT_REST: - case EFFECT_JUNGLE_HEALING: - case EFFECT_ABSORB: - case EFFECT_DREAM_EATER: - return TRUE; - default: - return FALSE; - } + return gBattleMoves[move].healBlockBanned; } bool32 HasHealingEffect(u32 battlerId) @@ -2048,7 +2029,7 @@ bool32 HasHealingEffect(u32 battlerId) for (i = 0; i < MAX_MON_MOVES; i++) { - if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && IsHealingMoveEffect(gBattleMoves[moves[i]].effect)) + if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && IsHealingMove(moves[i])) return TRUE; } diff --git a/src/battle_dome.c b/src/battle_dome.c index 05b8ebec4a..f4563666fc 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -3928,12 +3928,12 @@ static u8 Task_GetInfoCardInput(u8 taskId) #undef tUsingAlternateSlot -static bool32 IsDomeHealingMoveEffect(u32 effect) +static bool32 IsDomeHealingMove(u32 move) { - if (IsHealingMoveEffect(effect)) + if (IsHealingMove(move)) return TRUE; // Check extra effects not considered plain healing by AI - switch(effect) + switch (gBattleMoves[move].effect) { case EFFECT_INGRAIN: case EFFECT_REFRESH: @@ -4343,7 +4343,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId) move = gSaveBlock2Ptr->frontier.domePlayerPartyData[i].moves[j]; else move = gFacilityTrainerMons[DOME_MONS[trainerTourneyId][i]].moves[j]; - + switch (k) { case MOVE_POINTS_COMBO: @@ -4359,7 +4359,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId) allocatedArray[k] = IsDomeRareMove(move) ? 1 : 0; break; case MOVE_POINTS_HEAL: - allocatedArray[k] = IsDomeHealingMoveEffect(gBattleMoves[move].effect) ? 1 : 0; + allocatedArray[k] = IsDomeHealingMove(move) ? 1 : 0; break; case MOVE_POINTS_RISKY: allocatedArray[k] = IsDomeRiskyMoveEffect(gBattleMoves[move].effect) ? 1 : 0; diff --git a/src/battle_main.c b/src/battle_main.c index a6eb17c130..1216d8dd37 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4687,7 +4687,7 @@ s8 GetMovePriority(u32 battler, u16 move) { priority++; } - else if (ability == ABILITY_TRIAGE && IsHealingMoveEffect(gBattleMoves[move].effect)) + else if (ability == ABILITY_TRIAGE && IsHealingMove(move)) priority += 3; if (gProtectStructs[battler].quash) From 96cb4d382311e1a127549d5ee30f72a7c33bc669 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 21 Dec 2023 16:06:12 -0300 Subject: [PATCH 18/57] Added last CannotUseItemsInBattle tests (#3789) * Added missing CannotUseItemsInBattle tests * Removed individual assumptions for the EFFECT_ITEM_ESCAPE tests and added a single global one * Added assumption for the move-related EFFECT_ITEM_ESCAPE test * Moved the Mean Look assumption for consistency with other tests and to be extra safe --- test/battle/item_effect/escape.c | 50 ++++++++++++++++++++++++++++ test/battle/item_effect/restore_pp.c | 2 ++ test/battle/item_effect/revive.c | 2 ++ test/battle/item_effect/throw_ball.c | 7 ++++ 4 files changed, 61 insertions(+) create mode 100644 test/battle/item_effect/escape.c create mode 100644 test/battle/item_effect/throw_ball.c diff --git a/test/battle/item_effect/escape.c b/test/battle/item_effect/escape.c new file mode 100644 index 0000000000..0947a4ff9a --- /dev/null +++ b/test/battle/item_effect/escape.c @@ -0,0 +1,50 @@ +#include "global.h" +#include "test/battle.h" + +ASSUMPTIONS +{ + ASSUME(gItems[ITEM_POKE_TOY].battleUsage == EFFECT_ITEM_ESCAPE); +} + +WILD_BATTLE_TEST("Poke Toy lets the player escape from a wild battle") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { USE_ITEM(player, ITEM_POKE_TOY); } + } SCENE { + MESSAGE("{PLAY_SE SE_FLEE}Got away safely!\p"); + } +} + +WILD_BATTLE_TEST("Poke Toy lets the player escape from a wild battle even if a move forbid them to") +{ + GIVEN { + ASSUME(gBattleMoves[MOVE_MEAN_LOOK].effect == EFFECT_MEAN_LOOK); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, MOVE_MEAN_LOOK); } + TURN { USE_ITEM(player, ITEM_POKE_TOY); } + } SCENE { + // Turn 1 + MESSAGE("Wild Wobbuffet used Mean Look!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_MEAN_LOOK, opponent); + MESSAGE("Wobbuffet can't escape now!"); + // Turn 2 + MESSAGE("{PLAY_SE SE_FLEE}Got away safely!\p"); + } +} + +WILD_BATTLE_TEST("Poke Toy lets the player escape from a wild battle even if an ability forbid them to") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_DIGLETT) { Ability(ABILITY_ARENA_TRAP); } + } WHEN { + TURN { USE_ITEM(player, ITEM_POKE_TOY); } + } SCENE { + MESSAGE("{PLAY_SE SE_FLEE}Got away safely!\p"); + } +} diff --git a/test/battle/item_effect/restore_pp.c b/test/battle/item_effect/restore_pp.c index e998ef3d98..ef621ca0f2 100644 --- a/test/battle/item_effect/restore_pp.c +++ b/test/battle/item_effect/restore_pp.c @@ -64,3 +64,5 @@ SINGLE_BATTLE_TEST("Max Elixir restores the PP of all of a battler's moves fully EXPECT_EQ(player->pp[3], 40); } } + +TO_DO_BATTLE_TEST("Ether won't work if the selected move has all its PP") diff --git a/test/battle/item_effect/revive.c b/test/battle/item_effect/revive.c index 2be2ac4a61..45c57322e8 100644 --- a/test/battle/item_effect/revive.c +++ b/test/battle/item_effect/revive.c @@ -72,3 +72,5 @@ SINGLE_BATTLE_TEST("Max Honey restores a fainted battler's HP fully") EXPECT_EQ(player->hp, 200); } } + +TO_DO_BATTLE_TEST("Revive won't restore a battler's HP if it hasn't fainted") diff --git a/test/battle/item_effect/throw_ball.c b/test/battle/item_effect/throw_ball.c new file mode 100644 index 0000000000..17ba01db50 --- /dev/null +++ b/test/battle/item_effect/throw_ball.c @@ -0,0 +1,7 @@ +#include "global.h" +#include "test/battle.h" + +TO_DO_BATTLE_TEST("Poke Balls can't be thrown when there's 2 opposing wild battlers") +TO_DO_BATTLE_TEST("Poke Balls can't be thrown when there's no space in the Pokemon Storage System") +TO_DO_BATTLE_TEST("Poke Balls can't be thrown when an opposing wild battler is in a semi-invulnerable state") +TO_DO_BATTLE_TEST("Poke Balls can't be thrown when B_FLAG_NO_CATCHING is set") From c9e9b4906a5fd4329ccfc8101bd93c7c60994392 Mon Sep 17 00:00:00 2001 From: ravepossum <145081120+ravepossum@users.noreply.github.com> Date: Fri, 22 Dec 2023 03:43:22 -0500 Subject: [PATCH 19/57] Make overworld weather-based terrain effects use B_MSG_TERRAIN_SET constants for intro text (#3793) Co-authored-by: ravepossum --- src/battle_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index cda38dc988..287c8e2c40 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -4276,7 +4276,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 { // overworld weather started rain, so just do electric terrain anim gFieldStatuses = (STATUS_FIELD_ELECTRIC_TERRAIN | STATUS_FIELD_TERRAIN_PERMANENT); - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_TERRAIN_SET_ELECTRIC; BattleScriptPushCursorAndCallback(BattleScript_OverworldTerrain); effect++; } @@ -4285,7 +4285,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 && !(gFieldStatuses & STATUS_FIELD_MISTY_TERRAIN)) { gFieldStatuses = (STATUS_FIELD_MISTY_TERRAIN | STATUS_FIELD_TERRAIN_PERMANENT); - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_TERRAIN_SET_MISTY; BattleScriptPushCursorAndCallback(BattleScript_OverworldTerrain); effect++; } From 91741cb60f20c052bf3f40c20114d9d579c7f85c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 22 Dec 2023 11:26:43 +0100 Subject: [PATCH 20/57] fix debug menu toggling first flag (#3796) --- src/debug.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/debug.c b/src/debug.c index 1ed438598b..a298e31b0e 100644 --- a/src/debug.c +++ b/src/debug.c @@ -1437,6 +1437,7 @@ static void DebugTask_HandleMenuInput_FlagsVars(u8 taskId) PlaySE(SE_SELECT); if ((func = sDebugMenu_Actions_Flags[input]) != NULL) { + Debug_RedrawListMenu(taskId); func(taskId); // Remove TRUE/FALSE window for functions that haven't been assigned flags @@ -1446,8 +1447,6 @@ static void DebugTask_HandleMenuInput_FlagsVars(u8 taskId) RemoveWindow(gTasks[taskId].tSubWindowId); Free(sDebugMenuListData); } - else - Debug_RedrawListMenu(taskId); } } else if (JOY_NEW(B_BUTTON)) From 38d67d90511edf0e7b760852859e8c6e58f04573 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Fri, 22 Dec 2023 10:24:46 -0500 Subject: [PATCH 21/57] fix exp gain when defeating two opponents at once (#3798) Co-authored-by: ghoulslash --- src/battle_util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index 287c8e2c40..35fce2986f 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3338,7 +3338,8 @@ bool32 HandleFaintedMonActions(void) && gCurrentTurnActionNumber != gBattlersCount) { gAbsentBattlerFlags |= gBitTable[gBattlerFainted]; - return FALSE; + if (gBattleStruct->faintedActionsState != 1) + return FALSE; } break; case 3: From 5651bea82bfb4ff5792082652a66749e8088a725 Mon Sep 17 00:00:00 2001 From: Philipp AUER Date: Fri, 22 Dec 2023 23:24:12 +0100 Subject: [PATCH 22/57] [battle_controller_player.c] refactor and fix buffer overread (#3792) Co-authored-by: sbird --- src/battle_controller_player.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 43e84f1bff..b8ee5e0583 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -225,16 +225,16 @@ static u16 GetPrevBall(u16 ballId) return gBagPockets[BALLS_POCKET].itemSlots[i].itemId; } -static u16 GetNextBall(u16 ballId) +static u32 GetNextBall(u32 ballId) { - u16 ballNext = 0; + u32 ballNext = ITEM_NONE; s32 i; CompactItemsInBagPocket(&gBagPockets[BALLS_POCKET]); - for (i = 0; i < gBagPockets[BALLS_POCKET].capacity; i++) + for (i = 1; i < gBagPockets[BALLS_POCKET].capacity; i++) { - if (ballId == gBagPockets[BALLS_POCKET].itemSlots[i].itemId) + if (ballId == gBagPockets[BALLS_POCKET].itemSlots[i-1].itemId) { - ballNext = gBagPockets[BALLS_POCKET].itemSlots[i+1].itemId; + ballNext = gBagPockets[BALLS_POCKET].itemSlots[i].itemId; break; } } From fd45b383b18fe6134f16dc84614acd0f810fff8b Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Fri, 22 Dec 2023 23:38:57 +0100 Subject: [PATCH 23/57] Fix Photon Geyser (#3803) Co-authored-by: Bassoonian --- src/battle_script_commands.c | 1 + src/data/battle_moves.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index e2705433ca..7ac373b154 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6111,6 +6111,7 @@ static void Cmd_moveend(void) gBattleStruct->zmove.effect = EFFECT_HIT; gBattleStruct->hitSwitchTargetFailed = FALSE; gBattleStruct->isAtkCancelerForCalledMove = FALSE; + gBattleStruct->swapDamageCategory = FALSE; gBattleStruct->enduredDamage = 0; gBattleScripting.moveendState++; break; diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 6710af8e39..49f5a87847 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -11728,7 +11728,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .accuracy = 100, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_FOES_AND_ALLY, + .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, From 61e63654709e977f8e48698d66244059786467ef Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sat, 23 Dec 2023 12:31:40 +0100 Subject: [PATCH 24/57] Fixes Photon Geyeser category + minor AI calc fixes (#3807) --- asm/macros/battle_script.inc | 8 +-- data/battle_scripts_1.s | 24 +-------- include/constants/battle_script_commands.h | 61 +++++++++++----------- src/battle_ai_util.c | 8 ++- src/battle_script_commands.c | 13 ++--- test/battle/move_effect/photon_geyser.c | 51 ++++++++++++++++++ 6 files changed, 100 insertions(+), 65 deletions(-) create mode 100644 test/battle/move_effect/photon_geyser.c diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index de509588bc..dd5d10296d 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1556,6 +1556,10 @@ callnative BS_TryTriggerStatusForm .endm + .macro setphotongeysercategory + callnative BS_SetPhotonGeyserCategory + .endm + @ various command changed to more readable macros .macro cancelmultiturnmoves battler:req various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES @@ -2124,10 +2128,6 @@ .4byte \failInstr .endm - .macro photongeysercheck battler:req - various \battler, VARIOUS_PHOTON_GEYSER_CHECK - .endm - .macro shellsidearmcheck various BS_ATTACKER, VARIOUS_SHELL_SIDE_ARM_CHECK .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 28dcc6842c..2202adb2e8 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1182,28 +1182,8 @@ BattleScript_EffectShellSideArm: goto BattleScript_EffectHit BattleScript_EffectPhotonGeyser: - attackcanceler - accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE - attackstring - ppreduce - critcalc - damagecalc - adjustdamage - photongeysercheck BS_ATTACKER - attackanimation - waitanimation - effectivenesssound - hitanimation BS_TARGET - waitstate - healthbarupdate BS_TARGET - datahpupdate BS_TARGET - critmessage - waitmessage B_WAIT_TIME_LONG - resultmessage - waitmessage B_WAIT_TIME_LONG - seteffectwithchance - tryfaintmon BS_TARGET - goto BattleScript_MoveEnd + setphotongeysercategory + goto BattleScript_EffectHit BattleScript_EffectAuraWheel: @ Aura Wheel can only be used by Morpeko jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_FULL_BELLY, BattleScript_EffectSpeedUpHit diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index 4899d37036..95632f09c7 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -210,37 +210,36 @@ #define VARIOUS_JUMP_IF_WEATHER_AFFECTED 118 #define VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED 119 #define VARIOUS_SET_ATTACKER_STICKY_WEB_USER 120 -#define VARIOUS_PHOTON_GEYSER_CHECK 121 -#define VARIOUS_SHELL_SIDE_ARM_CHECK 122 -#define VARIOUS_TRY_NO_RETREAT 123 -#define VARIOUS_TRY_TAR_SHOT 124 -#define VARIOUS_CAN_TAR_SHOT_WORK 125 -#define VARIOUS_CHECK_POLTERGEIST 126 -#define VARIOUS_CUT_1_3_HP_RAISE_STATS 127 -#define VARIOUS_TRY_END_NEUTRALIZING_GAS 128 -#define VARIOUS_JUMP_IF_UNDER_200 129 -#define VARIOUS_SET_SKY_DROP 130 -#define VARIOUS_CLEAR_SKY_DROP 131 -#define VARIOUS_SKY_DROP_YAWN 132 -#define VARIOUS_JUMP_IF_HOLD_EFFECT 133 -#define VARIOUS_CURE_CERTAIN_STATUSES 134 -#define VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES 135 -#define VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY 136 -#define VARIOUS_JUMP_IF_LAST_USED_ITEM_HOLD_EFFECT 137 -#define VARIOUS_SAVE_BATTLER_ITEM 138 -#define VARIOUS_RESTORE_BATTLER_ITEM 139 -#define VARIOUS_BATTLER_ITEM_TO_LAST_USED_ITEM 140 -#define VARIOUS_SET_BEAK_BLAST 141 -#define VARIOUS_SWAP_SIDE_STATUSES 142 -#define VARIOUS_SWAP_STATS 143 -#define VARIOUS_TEATIME_INVUL 144 -#define VARIOUS_TEATIME_TARGETS 145 -#define VARIOUS_TRY_WIND_RIDER_POWER 146 -#define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES 147 -#define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES 148 -#define VARIOUS_STORE_HEALING_WISH 149 -#define VARIOUS_HIT_SWITCH_TARGET_FAILED 150 -#define VARIOUS_TRY_REVIVAL_BLESSING 151 +#define VARIOUS_SHELL_SIDE_ARM_CHECK 121 +#define VARIOUS_TRY_NO_RETREAT 122 +#define VARIOUS_TRY_TAR_SHOT 123 +#define VARIOUS_CAN_TAR_SHOT_WORK 124 +#define VARIOUS_CHECK_POLTERGEIST 125 +#define VARIOUS_CUT_1_3_HP_RAISE_STATS 126 +#define VARIOUS_TRY_END_NEUTRALIZING_GAS 127 +#define VARIOUS_JUMP_IF_UNDER_200 128 +#define VARIOUS_SET_SKY_DROP 129 +#define VARIOUS_CLEAR_SKY_DROP 130 +#define VARIOUS_SKY_DROP_YAWN 131 +#define VARIOUS_JUMP_IF_HOLD_EFFECT 132 +#define VARIOUS_CURE_CERTAIN_STATUSES 133 +#define VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES 134 +#define VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY 135 +#define VARIOUS_JUMP_IF_LAST_USED_ITEM_HOLD_EFFECT 136 +#define VARIOUS_SAVE_BATTLER_ITEM 137 +#define VARIOUS_RESTORE_BATTLER_ITEM 138 +#define VARIOUS_BATTLER_ITEM_TO_LAST_USED_ITEM 139 +#define VARIOUS_SET_BEAK_BLAST 140 +#define VARIOUS_SWAP_SIDE_STATUSES 141 +#define VARIOUS_SWAP_STATS 142 +#define VARIOUS_TEATIME_INVUL 143 +#define VARIOUS_TEATIME_TARGETS 144 +#define VARIOUS_TRY_WIND_RIDER_POWER 145 +#define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES 146 +#define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES 147 +#define VARIOUS_STORE_HEALING_WISH 148 +#define VARIOUS_HIT_SWITCH_TARGET_FAILED 149 +#define VARIOUS_TRY_REVIVAL_BLESSING 150 // Cmd_manipulatedamage #define DMG_CHANGE_SIGN 0 diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 71f3aa7d27..37abe521a9 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -709,11 +709,14 @@ s32 AI_CalcDamage(u32 move, u32 battlerAtk, u32 battlerDef, u8 *typeEffectivenes gBattleStruct->zmove.baseMoves[battlerAtk] = move; gBattleStruct->zmove.active = TRUE; } + else if (gBattleMoves[move].effect == EFFECT_PHOTON_GEYSER) + gBattleStruct->swapDamageCategory = (GetSplitBasedOnStats(gBattlerAttacker) == SPLIT_PHYSICAL); + + if (gBattleMoves[move].effect == EFFECT_NATURE_POWER) + move = GetNaturePowerMove(); gBattleStruct->dynamicMoveType = 0; - if (move == MOVE_NATURE_POWER) - move = GetNaturePowerMove(); SetTypeBeforeUsingMove(move, battlerAtk); GET_MOVE_TYPE(move, moveType); @@ -825,6 +828,7 @@ s32 AI_CalcDamage(u32 move, u32 battlerAtk, u32 battlerDef, u8 *typeEffectivenes // convert multiper to AI_EFFECTIVENESS_xX *typeEffectiveness = AI_GetEffectiveness(effectivenessMultiplier); + gBattleStruct->swapDamageCategory = FALSE; gBattleStruct->zmove.active = FALSE; gBattleStruct->zmove.baseMoves[battlerAtk] = MOVE_NONE; return dmg; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 7ac373b154..7450f573dc 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -10218,12 +10218,6 @@ static void Cmd_various(void) gBattlescriptCurrInstr = cmd->nextInstr; return; } - case VARIOUS_PHOTON_GEYSER_CHECK: - { - VARIOUS_ARGS(); - gBattleStruct->swapDamageCategory = (GetSplitBasedOnStats(battler) == SPLIT_SPECIAL); - break; - } case VARIOUS_SHELL_SIDE_ARM_CHECK: // 0% chance GameFreak actually checks this way according to DaWobblefet, but this is the only functional explanation at the moment { VARIOUS_ARGS(); @@ -16509,3 +16503,10 @@ void BS_TryTriggerStatusForm(void) } gBattlescriptCurrInstr = cmd->nextInstr; } + +void BS_SetPhotonGeyserCategory(void) +{ + NATIVE_ARGS(); + gBattleStruct->swapDamageCategory = (GetSplitBasedOnStats(gBattlerAttacker) == SPLIT_PHYSICAL); + gBattlescriptCurrInstr = cmd->nextInstr; +} diff --git a/test/battle/move_effect/photon_geyser.c b/test/battle/move_effect/photon_geyser.c new file mode 100644 index 0000000000..4171264a1a --- /dev/null +++ b/test/battle/move_effect/photon_geyser.c @@ -0,0 +1,51 @@ +#include "global.h" +#include "test/battle.h" + +ASSUMPTIONS +{ + ASSUME(gBattleMoves[MOVE_PHOTON_GEYSER].effect == EFFECT_PHOTON_GEYSER); +} + +SINGLE_BATTLE_TEST("Photon Geyser can be mirror coated if it is a special move") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Attack(100); SpAttack(110); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_PHOTON_GEYSER); MOVE(opponent, MOVE_MIRROR_COAT); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_PHOTON_GEYSER, player); + HP_BAR(opponent); + ANIMATION(ANIM_TYPE_MOVE, MOVE_MIRROR_COAT, opponent); + HP_BAR(player); + } +} + +SINGLE_BATTLE_TEST("Photon Geyser can be countered if it is a physcal move") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Attack(110); SpAttack(100); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_PHOTON_GEYSER); MOVE(opponent, MOVE_COUNTER); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_PHOTON_GEYSER, player); + HP_BAR(opponent); + ANIMATION(ANIM_TYPE_MOVE, MOVE_COUNTER, opponent); + HP_BAR(player); + } +} + +SINGLE_BATTLE_TEST("Photon Geyser ignores ignorable Abilities like Battle Armor") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_LAPRAS) { Ability(ABILITY_SHELL_ARMOR); } + } WHEN { + TURN { MOVE(player, MOVE_PHOTON_GEYSER, criticalHit: TRUE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_PHOTON_GEYSER, player, ); + HP_BAR(opponent); + MESSAGE("A critical hit!"); + } +} From d2235a36578dfbfe3a8c13a9cdc94a7d66770f6e Mon Sep 17 00:00:00 2001 From: Zimmermann Gyula Date: Sat, 23 Dec 2023 12:43:46 +0100 Subject: [PATCH 25/57] Depreciate agbcc and clarify gcc version usage in install instructions. (#3788) * Depreciate agbcc in install instructions. * Clarify that Ubuntu 22.04 ships with GCC v10. * Also clarify v13 usage on remote repos. * Typo. * Use Edu's reworded note from the Team Aqua discord. https://discord.com/channels/976252009114140682/1023424424713650196/1187462445762101278 --- INSTALL.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/INSTALL.md b/INSTALL.md index f82649d7e2..0498b468ea 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -89,6 +89,7 @@ Some tips before proceeding: > If the above command does not work, try the above command but replacing `apt` with `apt-get`. + This will install GCC v10 on Ubuntu 22.04. pokeemerald-expansion works with GCC v10, but remote repositories and the RHH Team use GCC v13 for stricter error-checking. If you want to upgrade from v10 to v13, also follow the devkitpro install instructions. ### Choosing where to store pokeemerald (WSL1) WSL has its own file system that's not natively accessible from Windows, but Windows files *are* accessible from WSL. So you're going to want to store pokeemerald within Windows. @@ -408,6 +409,8 @@ If this works, then proceed to [Installation](#installation). Otherwise, ask for > Where *\* is the path of the folder [where you chose to store pokeemerald](#Choosing-where-to-store-pokeemerald-WSL1). Then run the `git clone` command again. +
+ Depreciated; installing agbcc is optional since 1.7.0. 2. Install agbcc into pokeemerald. The commands to run depend on certain conditions. **You should only follow one of the listed instructions**: - If agbcc has **not been built before** in the folder where you chose to store pokeemerald, run the following commands to build and install it into pokeemerald: @@ -445,6 +448,7 @@ If this works, then proceed to [Installation](#installation). Otherwise, ask for ```bash cd .. ``` +
Now you're ready to [build **pokeemerald**](#build-pokeemerald) ## Build pokeemerald From 37f19ed39e462eebbefec8f8f0d21dcc10b6c19f Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Sat, 23 Dec 2023 10:34:52 -0600 Subject: [PATCH 26/57] Fix Maushold-3 and Maushold-4 icons being swapped (#3809) --- graphics/pokemon/maushold/four/icon.png | Bin 424 -> 373 bytes graphics/pokemon/maushold/icon.png | Bin 373 -> 424 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/pokemon/maushold/four/icon.png b/graphics/pokemon/maushold/four/icon.png index 728aca58a1c573be2e9de5008b075d5209caa0d9..97c2d708268e363ee99f827f9e611e2b93330ccc 100755 GIT binary patch delta 299 zcmZ3%{FP~f1SbbG0|SFkK3f5|>NzPzuP+gs!&No0r{z$@WNvkJHiqeMV(RZqUnckPT&={9%NBiH z=MJbYoXmG%9lze+<%VZtH5n&fwP#m-^hE6cV@(UoWx46!S}R!HwO*fl(^{Jt(RFNU zIQO^B502EmujjT|(6stVidFb2;qOOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM??UK1szBL007KML_t(|oZXU53c^4Pg?oe03n+~H4)*OQ z_rFGS0E^jAOzGI*tXv49+2!MrpT`@9uN7Gb6zi)1$eo}#uu$o|m=QQY%79`%Bs7^a zu&l>A12d*<>vNsUjZMK*8>A&~EpV3xlDFb>`LYAL0jQ|LZ_9omRdM+SQX5*OcymW? zYgO|koZ~c7BxIfA9shT(XOrU{HM25~r^A<;lGqgis6bXfHmvk_J8S9H)t{+<%E!>> vgZg|>pO4|~d<59?!B+%m`6yw@hx73OOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM??UK1szBL007KML_t(|oZXU53c^4Pg?oe03n+~H4)*OQ z_rFGS0E^jAOzGI*tXv49+2!MrpT`@9uN7Gb6zi)1$eo}#uu$o|m=QQY%79`%Bs7^a zu&l>A12d*<>vNsUjZMK*8>A&~EpV3xlDFb>`LYAL0jQ|LZ_9omRdM+SQX5*OcymW? zYgO|koZ~c7BxIfA9shT(XOrU{HM25~r^A<;lGqgis6bXfHmvk_J8S9H)t{+<%E!>> vgZg|>pO4|~d<59?!B+%m`6yw@hx73O3f5|>NzPzuP+gs!&No0r{z$@WNvkJHiqeMV(RZqUnckPT&={9%NBiH z=MJbYoXmG%9lze+<%VZtH5n&fwP#m-^hE6cV@(UoWx46!S}R!HwO*fl(^{Jt(RFNU zIQO^B502EmujjT|(6stVidFb2;qO Date: Sun, 24 Dec 2023 17:19:59 -0500 Subject: [PATCH 27/57] fix cotton down overwriting gBattlerAttacker (#3783) Co-authored-by: ghoulslash Co-authored-by: Bassoonian --- data/battle_scripts_1.s | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 2202adb2e8..bffc79a303 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -8016,6 +8016,7 @@ BattleScript_IllusionOff:: return BattleScript_CottonDownActivates:: + copybyte sSAVED_BATTLER, gBattlerAttacker showabilitypopup BS_TARGET pause B_WAIT_TIME_LONG destroyabilitypopup @@ -8040,6 +8041,7 @@ BattleScript_CottonDownLoopIncrement: jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_CottonDownLoop BattleScript_CottonDownReturn: swapattackerwithtarget + copybyte gBattlerAttacker, sSAVED_BATTLER return BattleScript_AnticipationActivates:: From c47a20a446f71e16d7a0eaaf7919e6b2870af8dc Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Mon, 25 Dec 2023 01:14:01 +0100 Subject: [PATCH 28/57] Fix gem boost description + test (#3817) --- include/config/item.h | 2 +- test/battle/hold_effect/gems.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/config/item.h b/include/config/item.h index 195a78e457..119d79a14f 100644 --- a/include/config/item.h +++ b/include/config/item.h @@ -10,7 +10,7 @@ #define I_VITAMIN_EV_CAP GEN_LATEST // In Gen8+, the Vitamins no longer have a cap of 100 EV per stat. #define I_BERRY_EV_JUMP GEN_LATEST // In Gen4 only, EV-lowering Berries lower a stat's EV to 100 if it is above 100. #define I_GRISEOUS_ORB_FORM_CHANGE GEN_LATEST // In Gen9+, the Griseous Orb no longer changes Giratina's form when held. -#define I_GEM_BOOST_POWER GEN_LATEST // In Gen5+, the Gem boost power was reduced from 50% to 30%. +#define I_GEM_BOOST_POWER GEN_LATEST // In Gen6+, the Gem boost power was reduced from 50% to 30%. #define I_USE_EVO_HELD_ITEMS_FROM_BAG FALSE // If TRUE, items such as Razor Claw or Electirizer will be usable from the bag to evolve a Pokémon just like in LA. #define I_TYPE_BOOST_POWER GEN_LATEST // In Gen4+, all regular type boosting held items had their power increased from 10% to 20%. eg. Charcoal #define I_SELL_VALUE_FRACTION GEN_LATEST // In Gen9+, items sell for 1/4 of their value instead of 1/2. diff --git a/test/battle/hold_effect/gems.c b/test/battle/hold_effect/gems.c index c98718313d..c4ef15a0f1 100644 --- a/test/battle/hold_effect/gems.c +++ b/test/battle/hold_effect/gems.c @@ -32,7 +32,7 @@ SINGLE_BATTLE_TEST("Gem boost is only applied once") s16 normalHit; GIVEN { - ASSUME(I_GEM_BOOST_POWER >= GEN_5); + ASSUME(I_GEM_BOOST_POWER >= GEN_6); PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_NORMAL_GEM); }; OPPONENT(SPECIES_WOBBUFFET); } WHEN { From 45da55eb140a702ec8575271de7dc41d22896529 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Mon, 25 Dec 2023 20:18:52 +0100 Subject: [PATCH 29/57] Fixes Minior form change and likely other forms (#3822) * Fixes Minior form change and likely other forms * new fix --------- Co-authored-by: Bassoonian --- src/battle_util.c | 3 +++ test/battle/ability/shields_down.c | 34 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 test/battle/ability/shields_down.c diff --git a/src/battle_util.c b/src/battle_util.c index 35fce2986f..ff8a7f5dc8 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -4701,6 +4701,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 case ABILITY_SHIELDS_DOWN: if (TryBattleFormChange(battler, FORM_CHANGE_BATTLE_HP_PERCENT)) { + gBattlerAttacker = battler; BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeEnd3); effect++; } @@ -4984,6 +4985,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 case ABILITY_POWER_CONSTRUCT: if (TryBattleFormChange(battler, FORM_CHANGE_BATTLE_HP_PERCENT)) { + gBattlerAttacker = battler; BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeEnd3); effect++; } @@ -5005,6 +5007,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 case ABILITY_HUNGER_SWITCH: if (TryBattleFormChange(battler, FORM_CHANGE_BATTLE_TURN_END)) { + gBattlerAttacker = battler; BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeEnd3NoPopup); effect++; } diff --git a/test/battle/ability/shields_down.c b/test/battle/ability/shields_down.c new file mode 100644 index 0000000000..d0149e13f9 --- /dev/null +++ b/test/battle/ability/shields_down.c @@ -0,0 +1,34 @@ +#include "global.h" +#include "test/battle.h" + +SINGLE_BATTLE_TEST("Minior Meteor transforms into Minior Core on switch-in if it has 1/2 or less health") +{ + GIVEN { + PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } + OPPONENT(SPECIES_MINIOR_METEOR) { Ability(ABILITY_SHIELDS_DOWN); HP(1); } + } WHEN { + TURN { MOVE(player, MOVE_TACKLE); SEND_OUT(opponent, 1); } + } SCENE { + ABILITY_POPUP(opponent, ABILITY_SHIELDS_DOWN); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_FORM_CHANGE, opponent); + } THEN { + EXPECT_EQ(opponent->species, SPECIES_MINIOR_CORE); + } +} + +SINGLE_BATTLE_TEST("Minior Core transforms into Minior Meteor on switch-in if it more then 1/2 health") +{ + GIVEN { + PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } + OPPONENT(SPECIES_MINIOR_CORE) { Ability(ABILITY_SHIELDS_DOWN); } + } WHEN { + TURN { MOVE(player, MOVE_TACKLE); SEND_OUT(opponent, 1); } + } SCENE { + ABILITY_POPUP(opponent, ABILITY_SHIELDS_DOWN); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_FORM_CHANGE, opponent); + } THEN { + EXPECT_EQ(opponent->species, SPECIES_MINIOR_METEOR); + } +} From 3bae98f768650623ef701867ec94c5490ec56a0f Mon Sep 17 00:00:00 2001 From: Gabriel Cowley Date: Tue, 26 Dec 2023 09:16:16 +0000 Subject: [PATCH 30/57] Fix P_FAMILY if blocks for Regigigas and Giratina (#3823) --- src/data/pokemon_graphics/front_pic_anims.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 92c8c7729c..75cb52732c 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -6127,7 +6127,9 @@ static const union AnimCmd sAnim_Regigigas_1[] = ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; +#endif //P_FAMILY_REGIGIGAS +#if P_FAMILY_GIRATINA static const union AnimCmd sAnim_GiratinaAltered_1[] = { ANIMCMD_FRAME(0, 12), @@ -6145,7 +6147,7 @@ static const union AnimCmd sAnim_GiratinaOrigin_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; -#endif //P_FAMILY_REGIGIGAS +#endif //P_FAMILY_GIRATINA #if P_FAMILY_CRESSELIA static const union AnimCmd sAnim_Cresselia_1[] = From 7f3264c151a88be3f3b90ffd884fa185f4555cac Mon Sep 17 00:00:00 2001 From: sbird Date: Tue, 26 Dec 2023 14:26:07 +0100 Subject: [PATCH 31/57] [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 41ff985bb6c052ec00611e953250afa695e94055 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Wed, 27 Dec 2023 12:15:16 +0100 Subject: [PATCH 32/57] PCG fix (#3830) --- src/overworld.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/overworld.c b/src/overworld.c index 09e242b217..238e21d8d5 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -414,6 +414,8 @@ void Overworld_ResetStateAfterDigEscRope(void) FlagClear(B_SMART_WILD_AI_FLAG); FlagClear(B_FLAG_NO_BAG_USE); FlagClear(B_FLAG_NO_CATCHING); + FlagClear(B_FLAG_DYNAMAX_BATTLE); + FlagClear(B_FLAG_SKY_BATTLE); } #endif From 7567b0a57ad99a9988039f2434e5ec4622f7775b Mon Sep 17 00:00:00 2001 From: Kurausukun Date: Wed, 27 Dec 2023 17:29:35 -0500 Subject: [PATCH 33/57] safeguard SQUARE and CUBE macro arguments in parentheses --- src/data/pokemon/experience_tables.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/pokemon/experience_tables.h b/src/data/pokemon/experience_tables.h index 15bcadeb29..8f50e10918 100644 --- a/src/data/pokemon/experience_tables.h +++ b/src/data/pokemon/experience_tables.h @@ -1,5 +1,5 @@ -#define SQUARE(n)(n * n) -#define CUBE(n)(n * n * n) +#define SQUARE(n)((n) * (n)) +#define CUBE(n)((n) * (n) * (n)) #define EXP_SLOW(n)((5 * CUBE(n)) / 4) // (5 * (n)^3) / 4 #define EXP_FAST(n)((4 * CUBE(n)) / 5) // (4 * (n)^3) / 5 From fde3fc0a521ad0ce57a548920e27d9532e84629b Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 28 Dec 2023 16:57:29 +0100 Subject: [PATCH 34/57] Metronome move fix (#3852) * Draft Indigo Disk move data * Add basic defines (flags, targets and priority missing) * Update move flags * Temper Flare is Stomping Tantrum * Fix failing tests * Disable Burning Bulwark for now --- data/battle_anim_scripts.s | 45 ++++-- include/config/battle.h | 1 + include/constants/moves.h | 32 ++-- include/pokemon.h | 1 + src/battle_script_commands.c | 4 +- src/data/battle_moves.h | 255 +++++++++++++++++++++++++++++- src/data/contest_moves.h | 30 ++++ src/data/text/move_descriptions.h | 63 ++++++++ src/data/text/move_names.h | 30 ++++ test/battle/ai_check_viability.c | 8 +- 10 files changed, 428 insertions(+), 41 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index d9e7df63b6..70e3018094 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -860,21 +860,21 @@ gBattleAnims_Moves:: .4byte Move_MATCHA_GOTCHA .4byte Move_SYRUP_BOMB .4byte Move_IVY_CUDGEL - .4byte Move_833 - .4byte Move_834 - .4byte Move_835 - .4byte Move_836 - .4byte Move_837 - .4byte Move_838 - .4byte Move_839 - .4byte Move_840 - .4byte Move_841 - .4byte Move_842 - .4byte Move_843 - .4byte Move_844 - .4byte Move_845 - .4byte Move_846 - .4byte Move_847 + .4byte Move_ELECTRO_SHOT + .4byte Move_TERA_STARSTORM + .4byte Move_FICKLE_BEAM + .4byte Move_BURNING_BULWARK + .4byte Move_THUNDERCLAP + .4byte Move_MIGHTY_CLEAVE + .4byte Move_TACHYON_CUTTER + .4byte Move_HARD_PRESS + .4byte Move_DRAGON_CHEER + .4byte Move_ALLURING_VOICE + .4byte Move_TEMPER_FLARE + .4byte Move_SUPERCELL_SLAM + .4byte Move_PSYCHIC_NOISE + .4byte Move_UPPER_HAND + .4byte Move_MALIGNANT_CHAIN @@@@ Z MOVES .4byte Move_BREAKNECK_BLITZ .4byte Move_ALL_OUT_PUMMELING @@ -16972,6 +16972,21 @@ Move_HYDRO_STEAM:: Move_BLOOD_MOON:: Move_MATCHA_GOTCHA:: Move_IVY_CUDGEL:: +Move_ELECTRO_SHOT:: +Move_TERA_STARSTORM:: +Move_FICKLE_BEAM:: +Move_BURNING_BULWARK:: +Move_THUNDERCLAP:: +Move_MIGHTY_CLEAVE:: +Move_TACHYON_CUTTER:: +Move_HARD_PRESS:: +Move_DRAGON_CHEER:: +Move_ALLURING_VOICE:: +Move_TEMPER_FLARE:: +Move_SUPERCELL_SLAM:: +Move_PSYCHIC_NOISE:: +Move_UPPER_HAND:: +Move_MALIGNANT_CHAIN:: end @to do @@@@@@@@@@@@@@@@@@@@@@@ GEN 1-3 @@@@@@@@@@@@@@@@@@@@@@@ diff --git a/include/config/battle.h b/include/config/battle.h index 90c8728dde..9dde3bb0fe 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -111,6 +111,7 @@ #define B_WIDE_GUARD GEN_LATEST // In Gen5 only, Quick Guard has a chance to fail if used consecutively. #define B_QUICK_GUARD GEN_LATEST // In Gen5 only, Wide Guard has a chance to fail if used consecutively. #define B_IMPRISON GEN_LATEST // In Gen5+, Imprison doesn't fail if opposing pokemon don't have any moves the user knows. +#define B_SKETCH_BANS GEN_LATEST // In Gen9+, Sketch is unable to copy more moves than in previous generations. // Ability settings #define B_EXPANDED_ABILITY_NAMES TRUE // If TRUE, ability names are increased from 12 characters to 16 characters. diff --git a/include/constants/moves.h b/include/constants/moves.h index a8fcb01654..b7ded3d513 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -886,25 +886,27 @@ #define MOVE_MAGICAL_TORQUE 826 #define MOVE_PSYBLADE 827 #define MOVE_HYDRO_STEAM 828 +// The Teal Mask Moves #define MOVE_BLOOD_MOON 829 #define MOVE_MATCHA_GOTCHA 830 #define MOVE_SYRUP_BOMB 831 #define MOVE_IVY_CUDGEL 832 -#define MOVE_833 833 -#define MOVE_834 834 -#define MOVE_835 835 -#define MOVE_836 836 -#define MOVE_837 837 -#define MOVE_838 838 -#define MOVE_839 839 -#define MOVE_840 840 -#define MOVE_841 841 -#define MOVE_842 842 -#define MOVE_843 843 -#define MOVE_844 844 -#define MOVE_845 845 -#define MOVE_846 846 -#define MOVE_847 847 +// The Indigo Disk Moves +#define MOVE_ELECTRO_SHOT 833 +#define MOVE_TERA_STARSTORM 834 +#define MOVE_FICKLE_BEAM 835 +#define MOVE_BURNING_BULWARK 836 +#define MOVE_THUNDERCLAP 837 +#define MOVE_MIGHTY_CLEAVE 838 +#define MOVE_TACHYON_CUTTER 839 +#define MOVE_HARD_PRESS 840 +#define MOVE_DRAGON_CHEER 841 +#define MOVE_ALLURING_VOICE 842 +#define MOVE_TEMPER_FLARE 843 +#define MOVE_SUPERCELL_SLAM 844 +#define MOVE_PSYCHIC_NOISE 845 +#define MOVE_UPPER_HAND 846 +#define MOVE_MALIGNANT_CHAIN 847 #define MOVES_COUNT_GEN9 848 diff --git a/include/pokemon.h b/include/pokemon.h index dbf4c41c3b..4bfdd4b117 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -461,6 +461,7 @@ struct BattleMove u32 encoreBanned:1; u32 parentalBondBanned:1; u32 skyBattleBanned:1; + u32 sketchBanned:1; }; #define SPINDA_SPOT_WIDTH 16 diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 7450f573dc..0bcde61666 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -12650,10 +12650,8 @@ static void Cmd_copymovepermanently(void) gChosenMove = MOVE_UNAVAILABLE; if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED) - && gLastPrintedMoves[gBattlerTarget] != MOVE_STRUGGLE - && gLastPrintedMoves[gBattlerTarget] != MOVE_NONE && gLastPrintedMoves[gBattlerTarget] != MOVE_UNAVAILABLE - && gLastPrintedMoves[gBattlerTarget] != MOVE_SKETCH) + && !gBattleMoves[gLastPrintedMoves[gBattlerTarget]].sketchBanned) { s32 i; diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 49f5a87847..1fb2923c53 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -13,6 +13,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .metronomeBanned = TRUE, .mirrorMoveBanned = TRUE, + .sketchBanned = TRUE, }, [MOVE_POUND] = @@ -2951,6 +2952,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, + .sketchBanned = TRUE, }, [MOVE_SKETCH] = @@ -2975,6 +2977,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, + .sketchBanned = TRUE, }, [MOVE_TRIPLE_KICK] = @@ -3176,6 +3179,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, .highCritRatio = TRUE, + .windMove = TRUE, }, [MOVE_COTTON_SPORE] = @@ -5290,7 +5294,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_LUSTER_PURGE] = { .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, - .power = 70, + .power = (B_UPDATED_MOVE_DATA >= GEN_9) ? 95 : 70, .type = TYPE_PSYCHIC, .accuracy = 100, .pp = 5, @@ -5305,7 +5309,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_MIST_BALL] = { .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, - .power = 70, + .power = (B_UPDATED_MOVE_DATA >= GEN_9) ? 95 : 70, .type = TYPE_PSYCHIC, .accuracy = 100, .pp = 5, @@ -8191,6 +8195,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, .magicCoatAffected = TRUE, + .sketchBanned = (B_SKETCH_BANS >= GEN_9), }, [MOVE_SEED_FLARE] = @@ -10849,6 +10854,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, + .sketchBanned = (B_SKETCH_BANS >= GEN_9), }, [MOVE_SHORE_UP] = @@ -13758,6 +13764,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, + .healBlockBanned = TRUE, + .sketchBanned = (B_SKETCH_BANS >= GEN_9), }, [MOVE_SALT_CURE] = @@ -14179,7 +14187,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .slicingMove = TRUE, - .healBlockBanned = B_EXTRAPOLATED_MOVE_FLAGS, + .healBlockBanned = TRUE, }, [MOVE_DOUBLE_SHOCK] = @@ -14268,6 +14276,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, + .sketchBanned = (B_SKETCH_BANS >= GEN_9), }, [MOVE_WICKED_TORQUE] = @@ -14292,6 +14301,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, + .sketchBanned = (B_SKETCH_BANS >= GEN_9), }, [MOVE_NOXIOUS_TORQUE] = @@ -14316,6 +14326,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, + .sketchBanned = (B_SKETCH_BANS >= GEN_9), }, [MOVE_COMBAT_TORQUE] = @@ -14340,6 +14351,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, + .sketchBanned = (B_SKETCH_BANS >= GEN_9), }, [MOVE_MAGICAL_TORQUE] = @@ -14364,6 +14376,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .instructBanned = TRUE, .encoreBanned = TRUE, .assistBanned = TRUE, + .sketchBanned = (B_SKETCH_BANS >= GEN_9), }, [MOVE_PSYBLADE] = @@ -14426,7 +14439,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .zMoveEffect = Z_EFFECT_NONE, .thawsUser = TRUE, .metronomeBanned = TRUE, - .healBlockBanned = B_EXTRAPOLATED_MOVE_FLAGS, + .healBlockBanned = TRUE, }, [MOVE_SYRUP_BOMB] = @@ -14462,6 +14475,240 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, }, + [MOVE_ELECTRO_SHOT] = + { + .effect = EFFECT_PLACEHOLDER, //EFFECT_ELECTRO_SHOT + .power = 130, + .type = TYPE_ELECTRIC, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .split = SPLIT_SPECIAL, + .zMoveEffect = Z_EFFECT_NONE, + //.sheerForceBoost = TRUE, (uncomment when effect is implemented, otherwise it breaks the Sheer Force Test) + }, + + [MOVE_TERA_STARSTORM] = + { + .effect = EFFECT_PLACEHOLDER, //EFFECT_TERA_STARSTORM + .power = 120, + .type = TYPE_NORMAL, // Stellar type if used by Terapagos-Stellar + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, // MOVE_TARGET_BOTH if used by Terapagos-Stellar + .priority = 0, + .split = SPLIT_SPECIAL, + .zMoveEffect = Z_EFFECT_NONE, + .assistBanned = TRUE, + .copycatBanned = TRUE, + .mimicBanned = TRUE, + .sketchBanned = (B_SKETCH_BANS >= GEN_9), + }, + + [MOVE_FICKLE_BEAM] = + { + .effect = EFFECT_PLACEHOLDER, //EFFECT_FICKLE_BEAM + .power = 80, + .type = TYPE_DRAGON, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .split = SPLIT_SPECIAL, + .zMoveEffect = Z_EFFECT_NONE, + }, + + [MOVE_BURNING_BULWARK] = + { + .effect = EFFECT_PLACEHOLDER, // EFFECT_PROTECT with effects + .power = 0, + .type = TYPE_FIRE, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 4, + .split = SPLIT_STATUS, + .zMoveEffect = Z_EFFECT_DEF_UP_1, + .protectionMove = TRUE, + .ignoresProtect = TRUE, + .mirrorMoveBanned = TRUE, + .metronomeBanned = TRUE, + .copycatBanned = TRUE, + .assistBanned = TRUE, + }, + + [MOVE_THUNDERCLAP] = + { + .effect = EFFECT_SUCKER_PUNCH, + .power = 70, + .type = TYPE_ELECTRIC, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 1, + .split = SPLIT_SPECIAL, + .zMoveEffect = Z_EFFECT_NONE, + }, + + [MOVE_MIGHTY_CLEAVE] = + { + .effect = EFFECT_FEINT, + .power = 95, + .type = TYPE_ROCK, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .split = SPLIT_PHYSICAL, + .zMoveEffect = Z_EFFECT_NONE, + .makesContact = TRUE, + .slicingMove = TRUE, + }, + + [MOVE_TACHYON_CUTTER] = + { + .effect = EFFECT_HIT, + .power = 50, + .type = TYPE_STEEL, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .split = SPLIT_SPECIAL, + .zMoveEffect = Z_EFFECT_NONE, + .strikeCount = 2, + .slicingMove = TRUE, + }, + + [MOVE_HARD_PRESS] = + { + .effect = EFFECT_WRING_OUT, + .power = 1, + .type = TYPE_STEEL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .split = SPLIT_PHYSICAL, + .zMoveEffect = Z_EFFECT_NONE, + .makesContact = TRUE, + }, + + [MOVE_DRAGON_CHEER] = + { + .effect = EFFECT_PLACEHOLDER, //EFFECT_DRAGON_CHEER + .power = 0, + .type = TYPE_DRAGON, + .accuracy = 0, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_ALLY, + .priority = 0, + .split = SPLIT_STATUS, + .zMoveEffect = Z_EFFECT_NONE, + .ignoresSubstitute = TRUE, + }, + + [MOVE_ALLURING_VOICE] = + { + .effect = EFFECT_PLACEHOLDER, //EFFECT_ALLURING_VOICE + .power = 80, + .type = TYPE_FAIRY, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .split = SPLIT_SPECIAL, + .zMoveEffect = Z_EFFECT_NONE, + .soundMove = TRUE, + .ignoresSubstitute = TRUE, + }, + + [MOVE_TEMPER_FLARE] = + { + .effect = EFFECT_STOMPING_TANTRUM, + .power = 75, + .type = TYPE_FIRE, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .split = SPLIT_PHYSICAL, + .zMoveEffect = Z_EFFECT_NONE, + .makesContact = TRUE, + }, + + [MOVE_SUPERCELL_SLAM] = + { + .effect = EFFECT_RECOIL_IF_MISS, + .power = 100, + .type = TYPE_ELECTRIC, + .accuracy = 95, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .split = SPLIT_PHYSICAL, + .zMoveEffect = Z_EFFECT_NONE, + .makesContact = TRUE, + }, + + [MOVE_PSYCHIC_NOISE] = + { + .effect = EFFECT_PLACEHOLDER, //EFFECT_PSYCHIC_NOISE + .power = 75, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .split = SPLIT_SPECIAL, + .zMoveEffect = Z_EFFECT_NONE, + .soundMove = TRUE, + .ignoresSubstitute = TRUE, + }, + + [MOVE_UPPER_HAND] = + { + .effect = EFFECT_PLACEHOLDER, //EFFECT_UPPER_HAND + .power = 65, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 3, + .split = SPLIT_PHYSICAL, + .zMoveEffect = Z_EFFECT_NONE, + .makesContact = TRUE, + }, + + [MOVE_MALIGNANT_CHAIN] = + { + .effect = EFFECT_POISON_FANG, + .power = 100, + .type = TYPE_POISON, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 50, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .split = SPLIT_SPECIAL, + .zMoveEffect = Z_EFFECT_NONE, + }, + // Z-Moves [MOVE_BREAKNECK_BLITZ] = { diff --git a/src/data/contest_moves.h b/src/data/contest_moves.h index 6084091683..8167f25104 100644 --- a/src/data/contest_moves.h +++ b/src/data/contest_moves.h @@ -6074,6 +6074,36 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = [MOVE_SYRUP_BOMB] = {0}, // TODO [MOVE_IVY_CUDGEL] = {0}, // TODO + + [MOVE_ELECTRO_SHOT] = {0}, // TODO + + [MOVE_TERA_STARSTORM] = {0}, // TODO + + [MOVE_FICKLE_BEAM] = {0}, // TODO + + [MOVE_BURNING_BULWARK] = {0}, // TODO + + [MOVE_THUNDERCLAP] = {0}, // TODO + + [MOVE_MIGHTY_CLEAVE] = {0}, // TODO + + [MOVE_TACHYON_CUTTER] = {0}, // TODO + + [MOVE_HARD_PRESS] = {0}, // TODO + + [MOVE_DRAGON_CHEER] = {0}, // TODO + + [MOVE_ALLURING_VOICE] = {0}, // TODO + + [MOVE_TEMPER_FLARE] = {0}, // TODO + + [MOVE_SUPERCELL_SLAM] = {0}, // TODO + + [MOVE_PSYCHIC_NOISE] = {0}, // TODO + + [MOVE_UPPER_HAND] = {0}, // TODO + + [MOVE_MALIGNANT_CHAIN] = {0}, // TODO }; const struct ContestEffect gContestEffects[] = diff --git a/src/data/text/move_descriptions.h b/src/data/text/move_descriptions.h index c321a844b1..4aa7293036 100644 --- a/src/data/text/move_descriptions.h +++ b/src/data/text/move_descriptions.h @@ -3284,6 +3284,54 @@ static const u8 sIvyCudgelDescription[] = _( "Type changes with held mask.\n" "High critical-hit ratio."); +static const u8 sElectroShotDescription[] = _( + "Absorbs electricity in one turn,\n" + "then attacks next turn."); + +static const u8 sTeraStarstormDescription[] = _( + "Damages all opponents if user is\n" + "Stellar form Terapagos."); + +static const u8 sFickleBeamDescription[] = _( + "Shoots a beam of light. Sometimes\n" + "twice as strong."); + +static const u8 sBurningBulwarkDescription[] = _( + "Evades attack, and burns\n" + "the foe if struck."); + +static const u8 sTachyonCutterDescription[] = _( + "Launches particle blades at\n" + "the target. Strikes twice."); + +static const u8 sDragonCheerDescription[] = _( + "Increases allies' critical hit\n" + "ration, especially if Dragons."); + +static const u8 sAlluringVoiceDescription[] = _( + "Confuses the target if their\n" + "stats were boosted this turn."); + +static const u8 sTemperFlareDescription[] = _( + "A desperation attack. Power\n" + "doubles if last move failed."); + +static const u8 sSupercellSlamDescription[] = _( + "An electrified slam. If it\n" + "misses, the user is hurt."); + +static const u8 sPsychicNoiseDescription[] = _( + "Unpleasant sound waves that\n" + "damage and prevent healing."); + +static const u8 sUpperHandDescription[] = _( + "Makes the target flinch if\n" + "readying a priority move."); + +static const u8 sMalignantChainDescription[] = _( + "A corrosive chain attack\n" + "that may badly poison."); + const u8 gNotDoneYetDescription[] = _( "This move can't be used. Its\n" "effect is in development."); @@ -4127,4 +4175,19 @@ const u8 *const gMoveDescriptionPointers[MOVES_COUNT - 1] = [MOVE_MATCHA_GOTCHA - 1] = sMatchaGotchaDescription, [MOVE_SYRUP_BOMB - 1] = sSyrupBombDescription, [MOVE_IVY_CUDGEL - 1] = sIvyCudgelDescription, + [MOVE_ELECTRO_SHOT - 1] = sElectroShotDescription, + [MOVE_TERA_STARSTORM - 1] = sTeraStarstormDescription, + [MOVE_FICKLE_BEAM - 1] = sFickleBeamDescription, + [MOVE_BURNING_BULWARK - 1] = sBurningBulwarkDescription, + [MOVE_THUNDERCLAP - 1] = sSuckerPunchDescription, + [MOVE_MIGHTY_CLEAVE - 1] = sFeintDescription, + [MOVE_TACHYON_CUTTER - 1] = sTachyonCutterDescription, + [MOVE_HARD_PRESS - 1] = sWringOutDescription, + [MOVE_DRAGON_CHEER - 1] = sDragonCheerDescription, + [MOVE_ALLURING_VOICE - 1] = sAlluringVoiceDescription, + [MOVE_TEMPER_FLARE - 1] = sTemperFlareDescription, + [MOVE_SUPERCELL_SLAM - 1] = sSupercellSlamDescription, + [MOVE_PSYCHIC_NOISE - 1] = sPsychicNoiseDescription, + [MOVE_UPPER_HAND - 1] = sUpperHandDescription, + [MOVE_MALIGNANT_CHAIN - 1] = sMalignantChainDescription, }; diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h index 01d613751e..f69b1f96a7 100644 --- a/src/data/text/move_names.h +++ b/src/data/text/move_names.h @@ -835,6 +835,21 @@ const u8 gMoveNames[MOVES_COUNT_DYNAMAX][MOVE_NAME_LENGTH + 1] = [MOVE_MATCHA_GOTCHA] = _("Matcha Gotcha"), [MOVE_SYRUP_BOMB] = _("Syrup Bomb"), [MOVE_IVY_CUDGEL] = _("Ivy Cudgel"), + [MOVE_ELECTRO_SHOT] = _("Electro Shot"), + [MOVE_TERA_STARSTORM] = _("Tera Starstorm"), + [MOVE_FICKLE_BEAM] = _("Fickle Beam"), + [MOVE_BURNING_BULWARK] = _("Burning Bulwark"), + [MOVE_THUNDERCLAP] = _("Thunderclap"), + [MOVE_MIGHTY_CLEAVE] = _("Mighty Cleave"), + [MOVE_TACHYON_CUTTER] = _("Tachyon Cutter"), + [MOVE_HARD_PRESS] = _("Hard Press"), + [MOVE_DRAGON_CHEER] = _("Dragon Cheer"), + [MOVE_ALLURING_VOICE] = _("Alluring Voice"), + [MOVE_TEMPER_FLARE] = _("Temper Flare"), + [MOVE_SUPERCELL_SLAM] = _("Supercell Slam"), + [MOVE_PSYCHIC_NOISE] = _("Psychic Noise"), + [MOVE_UPPER_HAND] = _("Upper Hand"), + [MOVE_MALIGNANT_CHAIN] = _("Malignant Chain"), // Max Moves [MOVE_MAX_GUARD] = _("Max Guard"), [MOVE_MAX_STRIKE] = _("Max Strike"), @@ -1727,6 +1742,21 @@ const u8 gMoveNames[MOVES_COUNT_DYNAMAX][MOVE_NAME_LENGTH + 1] = [MOVE_MATCHA_GOTCHA] = _("MatchaGotcha"), [MOVE_SYRUP_BOMB] = _("Syrup Bomb"), [MOVE_IVY_CUDGEL] = _("Ivy Cudgel"), + [MOVE_ELECTRO_SHOT] = _("Electro Shot"), + [MOVE_TERA_STARSTORM] = _("TeraStarstrm"), + [MOVE_FICKLE_BEAM] = _("Fickle Beam"), + [MOVE_BURNING_BULWARK] = _("BurnngBulwrk"), + [MOVE_THUNDERCLAP] = _("Thunderclap"), + [MOVE_MIGHTY_CLEAVE] = _("MightyCleave"), + [MOVE_TACHYON_CUTTER] = _("TachyonCuttr"), + [MOVE_HARD_PRESS] = _("Hard Press"), + [MOVE_DRAGON_CHEER] = _("Dragon Cheer"), + [MOVE_ALLURING_VOICE] = _("AllurngVoice"), + [MOVE_TEMPER_FLARE] = _("Temper Flare"), + [MOVE_SUPERCELL_SLAM] = _("SuprcellSlam"), + [MOVE_PSYCHIC_NOISE] = _("PsychicNoise"), + [MOVE_UPPER_HAND] = _("Upper Hand"), + [MOVE_MALIGNANT_CHAIN] = _("MalignntChan"), // Max Moves [MOVE_MAX_GUARD] = _("M-Guard"), [MOVE_MAX_STRIKE] = _("M-Strike"), diff --git a/test/battle/ai_check_viability.c b/test/battle/ai_check_viability.c index 4666eca7cb..2f229e3aca 100644 --- a/test/battle/ai_check_viability.c +++ b/test/battle/ai_check_viability.c @@ -177,15 +177,15 @@ AI_SINGLE_BATTLE_TEST("AI chooses moves with secondary effect that have a 100% c AI_LOG; ASSUME(gBattleMoves[MOVE_SHADOW_BALL].effect == EFFECT_SPECIAL_DEFENSE_DOWN_HIT); ASSUME(gBattleMoves[MOVE_SHADOW_BALL].secondaryEffectChance == 20); - ASSUME(gBattleMoves[MOVE_LUSTER_PURGE].effect == EFFECT_SPECIAL_DEFENSE_DOWN_HIT); - ASSUME(gBattleMoves[MOVE_LUSTER_PURGE].secondaryEffectChance == 50); + ASSUME(gBattleMoves[MOVE_OCTAZOOKA].effect == EFFECT_ACCURACY_DOWN_HIT); + ASSUME(gBattleMoves[MOVE_OCTAZOOKA].secondaryEffectChance == 50); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_REGICE); - OPPONENT(SPECIES_REGIROCK) { Ability(ability); Moves(MOVE_SHADOW_BALL, MOVE_LUSTER_PURGE); } + OPPONENT(SPECIES_REGIROCK) { Ability(ability); Moves(MOVE_SHADOW_BALL, MOVE_OCTAZOOKA); } } WHEN { if (ability == ABILITY_NONE) TURN { EXPECT_MOVE(opponent, MOVE_SHADOW_BALL); } else - TURN { EXPECT_MOVES(opponent, MOVE_LUSTER_PURGE); } + TURN { EXPECT_MOVES(opponent, MOVE_OCTAZOOKA); } } } From d3f971f0e8c91f169f3825d2ad676aad644e1825 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Thu, 28 Dec 2023 23:50:21 +0100 Subject: [PATCH 35/57] Version 1.7.1 (#3855) --- .../ISSUE_TEMPLATE/01_battle_engine_bugs.yaml | 3 +- .../ISSUE_TEMPLATE/02_battle_ai_issues.yaml | 3 +- .github/ISSUE_TEMPLATE/04_other_errors.yaml | 3 +- CHANGELOG.md | 4 +- README.md | 4 +- docs/changelogs/1.7.1.md | 63 +++++++++++++++++++ include/constants/expansion.h | 4 +- 7 files changed, 76 insertions(+), 8 deletions(-) create mode 100644 docs/changelogs/1.7.1.md diff --git a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml index 109c4a5930..bc9b624f1d 100644 --- a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml +++ b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml @@ -23,8 +23,9 @@ body: label: Version description: What version of pokeemerald-expansion are you using as a base? options: - - 1.7.0 (Default) + - 1.7.1 (Default) - upcoming (Edge) + - 1.7.0 - 1.6.2 - 1.6.1 - 1.6.0 diff --git a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml index 74e13a0a35..512a433eff 100644 --- a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml +++ b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml @@ -23,8 +23,9 @@ body: label: Version description: What version of pokeemerald-expansion are you using as a base? options: - - 1.7.0 (Default) + - 1.7.1 (Default) - upcoming (Edge) + - 1.7.0 - 1.6.2 - 1.6.1 - 1.6.0 diff --git a/.github/ISSUE_TEMPLATE/04_other_errors.yaml b/.github/ISSUE_TEMPLATE/04_other_errors.yaml index c449e8b648..77d9a217de 100644 --- a/.github/ISSUE_TEMPLATE/04_other_errors.yaml +++ b/.github/ISSUE_TEMPLATE/04_other_errors.yaml @@ -23,8 +23,9 @@ body: label: Version description: What version of pokeemerald-expansion are you using as a base? options: - - 1.7.0 (Default) + - 1.7.1 (Default) - upcoming (Edge) + - 1.7.0 - 1.6.2 - 1.6.1 - 1.6.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b56aca136..c18fb7de37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Pokeemerald-Expansion Changelogs +## [Version 1.7.1](docs/changelogs/1.7.1.md) - Bugfix Release + ## [Version 1.7.0](docs/changelogs/1.7.0.md) - Feature Release -## [Version 1.6.2](docs/changelogs/1.6.2.md) - Bugfix release +## [Version 1.6.2](docs/changelogs/1.6.2.md) - Bugfix Release diff --git a/README.md b/README.md index 7eda2621c3..6e3f2e1d33 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ pokeemerald-expansion is a decomp hack base project based off pret's [pokeemeral If you use pokeemerald-expansion in your hack, please add RHH (Rom Hacking Hideout) to your credits list. Optionally, you can list the version used, so it can help players know what features to expect. You can phrase it as the following: ``` -Based off RHH's pokeemerald-expansion v1.7.0 https://github.com/rh-hideout/pokeemerald-expansion/ +Based off RHH's pokeemerald-expansion v1.7.1 https://github.com/rh-hideout/pokeemerald-expansion/ ``` ## What features are included? @@ -166,7 +166,7 @@ With this, you'll get the latest version of pokeemerald-expansion, plus a couple ## **How do I update my version of pokeemerald-expansion?** - If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`. -- Once you have your remote set up, run the command `git pull RHH expansion/1.7.0`. +- Once you have your remote set up, run the command `git pull RHH expansion/1.7.1`. ### Please consider crediting the entire [list of contributors](https://github.com/rh-hideout/pokeemerald-expansion/wiki/Credits) in your project, as they have all worked hard to develop this project :) diff --git a/docs/changelogs/1.7.1.md b/docs/changelogs/1.7.1.md new file mode 100644 index 0000000000..c30c77512f --- /dev/null +++ b/docs/changelogs/1.7.1.md @@ -0,0 +1,63 @@ +# Version 1.7.1 + +```md +## How to update +- If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`. +- Once you have your remote set up, run the command `git pull RHH expansion/1.7.1`. +``` + +## 🧬 General 🧬 +### Changed +* Deprecate agbcc and clarify gcc version usage in install instructions. by @GraionDilach in https://github.com/rh-hideout/pokeemerald-expansion/pull/3788 +### Fixed +* Fix Update Message Saying 1.6.2 by @kaicardenas2 in https://github.com/rh-hideout/pokeemerald-expansion/pull/3759 +* Fix exp gain when defeating two opponents at once by @ghoulslash in https://github.com/rh-hideout/pokeemerald-expansion/pull/3798 +* Fix debug menu toggling first flag by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3796 + +## 🐉 Pokémon 🐉 +### Fixed +* Fix Maushold-3 and Maushold-4 icons being swapped by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/3809 +* Fixes Minior form change and likely other forms by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/3822 +* Fix P_FAMILY #if blocks for Regigigas and Giratina in front_pic_anims.h by @gabrielcowley in https://github.com/rh-hideout/pokeemerald-expansion/pull/3823 + +## 🤹 Moves 🤹 +### Added +* Adds data for The Indigo Disk moves by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/3852 + * Many moves still have placeholder effects. +### Fixed +* Fix Telekinesis not working by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3763 +* Fix Ion Deluge interaction with Volt Absorb andLightning Rod by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3764 +* Fix Max Moves animations by @GraionDilach in https://github.com/rh-hideout/pokeemerald-expansion/pull/3769 +* Fix Cotton Down overwriting gBattlerAttacker by @ghoulslash in https://github.com/rh-hideout/pokeemerald-expansion/pull/3783 +* Fix Photon Geyser by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/3803 and https://github.com/rh-hideout/pokeemerald-expansion/pull/3807 +* Fix Metronome crash by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/3852 + +## 🎭 Abilities 🎭 +### Fixed +* Fix Ice Face ignoring move effects by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3755 +* Fix Frisk ability pop-up showing wrong battler by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3762 +* Prankster tests + fixes by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3766 + +## 🧶 Items 🧶 +### Fixed +* Fixes Item Metronome damage by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/3767 +* Fix gem boost description + test by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/3817 + +## 🧹 Cleanup 🧹 +* Clear BattleScripting struct at the battle start by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3776 +* Fix Rain Dance and Sunny Day not blending opponent sprite by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3785 +* Same lists for healing moves by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3787 +* [battle_controller_player.c] refactor and fix buffer overread by @SBird1337 in https://github.com/rh-hideout/pokeemerald-expansion/pull/3792 +* Make overworld weather-based terrain setting effects use B_MSG_TERRAIN_SET constants for intro text by @ravepossum in https://github.com/rh-hideout/pokeemerald-expansion/pull/3793 +* Clear Sky Battle & Dynamax flags upon whiteout by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/3830 + +## 🧪 Test Runner 🧪 +### Added +* Small test runner improvements by @mrgriffin in https://github.com/rh-hideout/pokeemerald-expansion/pull/3761 +* EXPECT_MUL_EQ thresholds are always at least ±1 by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/3768 +* Added last CannotUseItemsInBattle tests by @LOuroboros in https://github.com/rh-hideout/pokeemerald-expansion/pull/3789 + +## New Contributors +* @kaicardenas2 made their first contribution in https://github.com/rh-hideout/pokeemerald-expansion/pull/3759 + +**Full Changelog**: https://github.com/rh-hideout/pokeemerald-expansion/compare/expansion/1.7.0...expansion/1.7.1 diff --git a/include/constants/expansion.h b/include/constants/expansion.h index 872e5bbd34..71072b9999 100644 --- a/include/constants/expansion.h +++ b/include/constants/expansion.h @@ -3,10 +3,10 @@ #define EXPANSION_VERSION_MAJOR 1 #define EXPANSION_VERSION_MINOR 7 -#define EXPANSION_VERSION_PATCH 0 +#define EXPANSION_VERSION_PATCH 1 // FALSE if this this version of Expansion is not a tagged commit, i.e. // it contains unreleased changes. -#define EXPANSION_TAGGED_RELEASE FALSE +#define EXPANSION_TAGGED_RELEASE TRUE #endif From 0a40cd15d160b9cfc2863114c7a7c113dcfd116a Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Thu, 28 Dec 2023 19:54:06 -0300 Subject: [PATCH 36/57] Non-tagged release --- include/constants/expansion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/constants/expansion.h b/include/constants/expansion.h index 71072b9999..020a76664c 100644 --- a/include/constants/expansion.h +++ b/include/constants/expansion.h @@ -7,6 +7,6 @@ // FALSE if this this version of Expansion is not a tagged commit, i.e. // it contains unreleased changes. -#define EXPANSION_TAGGED_RELEASE TRUE +#define EXPANSION_TAGGED_RELEASE FALSE #endif From bc4d4d21e4e4937bfc6f6ea2d1fa20f427058b36 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 29 Dec 2023 00:33:18 +0100 Subject: [PATCH 37/57] Fix 3851 (#3857) --- include/config/battle.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/config/battle.h b/include/config/battle.h index 9dde3bb0fe..a003b8f5d8 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -108,8 +108,8 @@ #define B_STOCKPILE_RAISES_DEFS GEN_LATEST // In Gen4+, Stockpile also raises Defense and Sp. Defense stats. Once Spit Up / Swallow is used, these stat changes are lost. #define B_TRANSFORM_SHINY GEN_LATEST // In Gen4+, Transform will copy the shiny state of the opponent instead of maintaining its own shiny state. #define B_TRANSFORM_FORM_CHANGES GEN_LATEST // In Gen5+, Transformed Pokemon cannot change forms. -#define B_WIDE_GUARD GEN_LATEST // In Gen5 only, Quick Guard has a chance to fail if used consecutively. -#define B_QUICK_GUARD GEN_LATEST // In Gen5 only, Wide Guard has a chance to fail if used consecutively. +#define B_WIDE_GUARD GEN_LATEST // In Gen5 only, Wide Guard has a chance to fail if used consecutively. +#define B_QUICK_GUARD GEN_LATEST // In Gen5 only, Quick Guard has a chance to fail if used consecutively. #define B_IMPRISON GEN_LATEST // In Gen5+, Imprison doesn't fail if opposing pokemon don't have any moves the user knows. #define B_SKETCH_BANS GEN_LATEST // In Gen9+, Sketch is unable to copy more moves than in previous generations. From 604b823ffda13b441b9b43d932af0eab526a2bba Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 29 Dec 2023 13:39:54 +0100 Subject: [PATCH 38/57] Missing Strength sap tests (#3860) * add missing strength sap tests * a --------- Co-authored-by: Bassoonian --- data/battle_scripts_1.s | 13 +++ src/battle_message.c | 2 +- test/battle/move_effect/strength_sap.c | 139 +++++++++++++++++++++++++ 3 files changed, 153 insertions(+), 1 deletion(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index bffc79a303..13a269dadd 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1613,15 +1613,28 @@ BattleScript_StrengthSapTryHp: attackanimation waitanimation BattleScript_StrengthSapHp: + jumpifability BS_TARGET, ABILITY_LIQUID_OOZE, BattleScript_StrengthSapManipulateDmg jumpifstatus3 BS_ATTACKER, STATUS3_HEAL_BLOCK, BattleScript_MoveEnd jumpiffullhp BS_ATTACKER, BattleScript_MoveEnd +BattleScript_StrengthSapManipulateDmg: manipulatedamage DMG_BIG_ROOT orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + jumpifability BS_TARGET, ABILITY_LIQUID_OOZE, BattleScript_StrengthSapLiquidOoze healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER printstring STRINGID_PKMNENERGYDRAINED waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd +BattleScript_StrengthSapLiquidOoze: + call BattleScript_AbilityPopUpTarget + manipulatedamage DMG_CHANGE_SIGN + setbyte cMULTISTRING_CHOOSER, B_MSG_ABSORB_OOZE + healthbarupdate BS_ATTACKER + datahpupdate BS_ATTACKER + printfromtable gAbsorbDrainStringIds + waitmessage B_WAIT_TIME_LONG + tryfaintmon BS_ATTACKER + goto BattleScript_MoveEnd BattleScript_StrengthSapMustLower: statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_MoveEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_MoveEnd diff --git a/src/battle_message.c b/src/battle_message.c index d8dbceab24..d7ab067eeb 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -304,7 +304,7 @@ static const u8 sText_PkmnsXPreventsYLoss[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} static const u8 sText_PkmnsXInfatuatedY[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\ninfatuated {B_ATK_NAME_WITH_PREFIX}!"); static const u8 sText_PkmnsXMadeYIneffective[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nmade {B_CURRENT_MOVE} ineffective!"); static const u8 sText_PkmnsXCuredYProblem[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\ncured its {B_BUFF1} problem!"); -static const u8 sText_ItSuckedLiquidOoze[] = _("It sucked up the\nLIQUID OOZE!"); +static const u8 sText_ItSuckedLiquidOoze[] = _("It sucked up the\nliquid ooze!"); static const u8 sText_PkmnTransformed[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} transformed!"); static const u8 sText_PkmnsXTookAttack[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\ntook the attack!"); const u8 gText_PkmnsXPreventsSwitching[] = _("{B_BUFF1}'s {B_LAST_ABILITY}\nprevents switching!\p"); diff --git a/test/battle/move_effect/strength_sap.c b/test/battle/move_effect/strength_sap.c index c549e4c332..d8e0b6e74b 100644 --- a/test/battle/move_effect/strength_sap.c +++ b/test/battle/move_effect/strength_sap.c @@ -57,3 +57,142 @@ SINGLE_BATTLE_TEST("Strength Sap works exactly the same when attacker is behind EXPECT_EQ(results[i].hp * -1, atkStat); } } + +// This test checks all stat stages from -6 to +6. +SINGLE_BATTLE_TEST("Strength Sap lowers Attack by 1 and restores HP based on target's Attack Stat and stat Change", s16 hp) +{ + s32 j = 0, statStage = 0; + + for (j = 0; j <= MAX_STAT_STAGE; j++) { + if (j == DEFAULT_STAT_STAGE - 1) { continue; } // Ignore -6, because Strength Sap won't work otherwise + PARAMETRIZE{ statStage = j; } + } + + GIVEN { + ASSUME(gBattleMoves[MOVE_WORK_UP].effect == EFFECT_ATTACK_SPATK_UP); + ASSUME(gBattleMoves[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); + PLAYER(SPECIES_WOBBUFFET) { HP(50); } + OPPONENT(SPECIES_WOBBUFFET) { Attack(60); } + } WHEN { + if (statStage > DEFAULT_STAT_STAGE) { // + + for (j = statStage; j > DEFAULT_STAT_STAGE; j--) { + TURN { MOVE(opponent, MOVE_HOWL); } + } + } else if (statStage < DEFAULT_STAT_STAGE) { // - + for (j = statStage; j < DEFAULT_STAT_STAGE - 1; j++) { // - 1 because Strength Sap always lowers Attack + TURN { MOVE(player, MOVE_GROWL); } + } + } + TURN { MOVE(player, MOVE_STRENGTH_SAP); } + } SCENE { + if (statStage > DEFAULT_STAT_STAGE) { // + + for (j = statStage; j > DEFAULT_STAT_STAGE; j--) { + ANIMATION(ANIM_TYPE_MOVE, MOVE_HOWL, opponent); + } + } else if (statStage < DEFAULT_STAT_STAGE) { // - + for (j = statStage; j < DEFAULT_STAT_STAGE - 1; j++) { + ANIMATION(ANIM_TYPE_MOVE, MOVE_GROWL, player); + } + } + MESSAGE("Wobbuffet used Strength Sap!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_STRENGTH_SAP, player); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); + MESSAGE("Foe Wobbuffet's Attack fell!"); + HP_BAR(player, captureDamage: &results[i].hp); + MESSAGE("Foe Wobbuffet had its energy drained!"); + } THEN { + if (statStage < DEFAULT_STAT_STAGE) { + EXPECT_EQ(results[i].hp * -1, (60 * gStatStageRatios[statStage + 1][0] / gStatStageRatios[statStage + 1][1])); + } else { + EXPECT_EQ(results[i].hp * -1, (60 * gStatStageRatios[statStage][0] / gStatStageRatios[statStage][1])); + } + } FINALLY { + // This makes sure gStatStageRatios works correctly and the lower the attack stage the lower hp obtained. + for (j = 0; j < MAX_STAT_STAGE - 1; j++) { + EXPECT_GT(abs(results[j + 1].hp), abs(results[j].hp)); + } + } +} + +SINGLE_BATTLE_TEST("Strength Sap fails if target is at -6 Atk") +{ + GIVEN { + ASSUME(gBattleMoves[MOVE_CHARM].effect == EFFECT_ATTACK_DOWN_2); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_CHARM); } + TURN { MOVE(player, MOVE_CHARM); } + TURN { MOVE(player, MOVE_CHARM); } + TURN { MOVE(player, MOVE_STRENGTH_SAP); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_CHARM, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CHARM, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CHARM, player); + MESSAGE("Wobbuffet used Strength Sap!"); + NONE_OF { + ANIMATION(ANIM_TYPE_MOVE, MOVE_STRENGTH_SAP, player); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); + MESSAGE("Foe Wobbuffet's Attack fell!"); + HP_BAR(player); + MESSAGE("Foe Wobbuffet had its energy drained!"); + } + MESSAGE("Foe Wobbuffet's Attack won't go lower!"); + } +} + +SINGLE_BATTLE_TEST("Strength Sap restores more HP if Big Root is held", s16 hp) +{ + u32 item; + + PARAMETRIZE { item = ITEM_NONE; } + PARAMETRIZE { item = ITEM_BIG_ROOT; } + + GIVEN { + ASSUME(gItems[ITEM_BIG_ROOT].holdEffect == HOLD_EFFECT_BIG_ROOT); + PLAYER(SPECIES_WOBBUFFET) { HP(200); Item(item); } + OPPONENT(SPECIES_WOBBUFFET) { Attack(100); } + } WHEN { + TURN { MOVE(player, MOVE_STRENGTH_SAP); } + } SCENE { + MESSAGE("Wobbuffet used Strength Sap!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_STRENGTH_SAP, player); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); + MESSAGE("Foe Wobbuffet's Attack fell!"); + HP_BAR(player, captureDamage: &results[i].hp); + MESSAGE("Foe Wobbuffet had its energy drained!"); + } FINALLY { + EXPECT_GT(abs(results[1].hp), abs(results[0].hp)); + } +} + +SINGLE_BATTLE_TEST("Strength Sap makes attacker lose HP if target's ability is Liquid Ooze") +{ + s16 lostHp; + s32 atkStat; + + PARAMETRIZE { atkStat = 100; } + PARAMETRIZE { atkStat = 490; } // Checks that attacker can faint with no problems. + + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET) { Attack(atkStat); Ability(ABILITY_LIQUID_OOZE); } + } WHEN { + TURN { MOVE(player, MOVE_STRENGTH_SAP); if (atkStat == 490) { SEND_OUT(player, 1); } } + } SCENE { + MESSAGE("Wobbuffet used Strength Sap!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_STRENGTH_SAP, player); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); + MESSAGE("Foe Wobbuffet's Attack fell!"); + ABILITY_POPUP(opponent, ABILITY_LIQUID_OOZE); + HP_BAR(player, captureDamage: &lostHp); + MESSAGE("It sucked up the liquid ooze!"); + if (atkStat >= 490) { + MESSAGE("Wobbuffet fainted!"); + MESSAGE("Go! Wobbuffet!"); + } + } THEN { + EXPECT_EQ(lostHp, atkStat); + } +} From ecba468a96fc6517f46b5c78213f3e24bceaf5e4 Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Fri, 29 Dec 2023 08:03:42 -0600 Subject: [PATCH 39/57] Fix item effect for SV evolution items (#3858) Co-authored-by: Bassoonian --- src/data/pokemon/item_effects.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index 2c7401059e..e129d9505a 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -626,6 +626,9 @@ const u8 *const gItemEffectTable[ITEMS_COUNT] = [ITEM_BLACK_AUGURITE] = gItemEffect_EvoItem, [ITEM_LINKING_CORD] = gItemEffect_EvoItem, [ITEM_PEAT_BLOCK] = gItemEffect_EvoItem, + [ITEM_SYRUPY_APPLE] = gItemEffect_EvoItem, + [ITEM_UNREMARKABLE_TEACUP] = gItemEffect_EvoItem, + [ITEM_MASTERPIECE_TEACUP] = gItemEffect_EvoItem, // Berries [ITEM_CHERI_BERRY] = gItemEffect_CheriBerry, From 245026353d79469c4bd91a4755705da125be54c8 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 29 Dec 2023 19:59:14 +0100 Subject: [PATCH 40/57] Remove leftover TID placeholder move defines (#3864) --- data/battle_anim_scripts.s | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 70e3018094..0611dee786 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -16993,21 +16993,6 @@ Move_MALIGNANT_CHAIN:: Move_NONE: Move_MIRROR_MOVE: Move_POUND: -Move_833: -Move_834: -Move_835: -Move_836: -Move_837: -Move_838: -Move_839: -Move_840: -Move_841: -Move_842: -Move_843: -Move_844: -Move_845: -Move_846: -Move_847: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 From ed850d3f6c09aa7fccaf5bdfa073402a4275851f Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Sat, 30 Dec 2023 10:10:40 +0000 Subject: [PATCH 41/57] VSync BENCHMARKs and avoid AdvanceRandom in tests (#3866) --- 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 74e10ec691..790563e772 100644 --- a/include/test/test.h +++ b/include/test/test.h @@ -166,6 +166,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 537af7191b..54d25c1c10 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)))) AdvanceRandom(); UpdateWirelessStatusIndicatorSprite(); From 66a638f7b494db1f084ba5f2aeaa35b5f1454448 Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Sat, 30 Dec 2023 04:40:58 -0600 Subject: [PATCH 42/57] Change Ivy Cudgel to be based on Ogerpon form rather than held item (#3865) * Change Ivy Cudgel to be based on Ogerpon form rather than held item * Update ivy_cudgel.c * Address reviews * Update test/battle/move_effect/ivy_cudgel.c --------- Co-authored-by: Bassoonian --- data/battle_scripts_1.s | 1 + include/constants/battle_move_effects.h | 3 +- include/constants/hold_effects.h | 1 - src/battle_controller_player.c | 10 ++++--- src/battle_main.c | 7 +++++ src/data/battle_moves.h | 3 +- src/data/items.h | 6 ---- src/pokemon_summary_screen.c | 7 ++--- test/battle/move_effect/ivy_cudgel.c | 37 +++++++++++++++++++------ 9 files changed, 48 insertions(+), 27 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index afe7cf2719..9f70bbdf8b 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -441,6 +441,7 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectHit @ EFFECT_RAGE_FIST .4byte BattleScript_EffectDoodle @ EFFECT_DOODLE .4byte BattleScript_EffectFilletAway @ EFFECT_FILLET_AWAY + .4byte BattleScript_EffectHit @ EFFECT_IVY_CUDGEL BattleScript_EffectFilletAway: attackcanceler diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index dbaa21f14d..70d8f11eec 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -418,7 +418,8 @@ #define EFFECT_RAGE_FIST 412 #define EFFECT_DOODLE 413 #define EFFECT_FILLET_AWAY 414 +#define EFFECT_IVY_CUDGEL 415 -#define NUM_BATTLE_MOVE_EFFECTS 415 +#define NUM_BATTLE_MOVE_EFFECTS 416 #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index a54f569cd2..0f364d2462 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -160,7 +160,6 @@ #define HOLD_EFFECT_COVERT_CLOAK 179 #define HOLD_EFFECT_LOADED_DICE 180 #define HOLD_EFFECT_BOOSTER_ENERGY 181 // Not implemented. -#define HOLD_EFFECT_MASK 183 // Gen2 hold effect #define HOLD_EFFECT_BERSERK_GENE 184 diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 6d34badfd0..c039b7c454 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1730,7 +1730,7 @@ static void MoveSelectionDisplayMoveType(u32 battler) { u8 *txtPtr; u8 type; - u32 itemId; + u32 speciesId; struct Pokemon *mon; struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[battler][4]); @@ -1742,10 +1742,12 @@ static void MoveSelectionDisplayMoveType(u32 battler) if (moveInfo->moves[gMoveSelectionCursor[battler]] == MOVE_IVY_CUDGEL) { mon = &GetSideParty(GetBattlerSide(battler))[gBattlerPartyIndexes[battler]]; - itemId = GetMonData(mon, MON_DATA_HELD_ITEM); + speciesId = GetMonData(mon, MON_DATA_SPECIES); - if (ItemId_GetHoldEffect(itemId) == HOLD_EFFECT_MASK) - type = ItemId_GetSecondaryId(itemId); + if (speciesId == SPECIES_OGERPON_WELLSPRING_MASK || speciesId == SPECIES_OGERPON_WELLSPRING_MASK_TERA + || speciesId == SPECIES_OGERPON_HEARTHFLAME_MASK || speciesId == SPECIES_OGERPON_HEARTHFLAME_MASK_TERA + || speciesId == SPECIES_OGERPON_CORNERSTONE_MASK || speciesId == SPECIES_OGERPON_CORNERSTONE_MASK_TERA) + type = gBattleMons[battler].type2; else type = gBattleMoves[MOVE_IVY_CUDGEL].type; } diff --git a/src/battle_main.c b/src/battle_main.c index e47fdd4209..9930fa56fe 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -5667,6 +5667,13 @@ void SetTypeBeforeUsingMove(u32 move, u32 battlerAtk) { gBattleStruct->dynamicMoveType = gBattleMons[battlerAtk].type2 | F_DYNAMIC_TYPE_SET; } + else if (gBattleMoves[move].effect == EFFECT_IVY_CUDGEL + && (gBattleMons[battlerAtk].species == SPECIES_OGERPON_WELLSPRING_MASK || gBattleMons[battlerAtk].species == SPECIES_OGERPON_WELLSPRING_MASK_TERA + || gBattleMons[battlerAtk].species == SPECIES_OGERPON_HEARTHFLAME_MASK || gBattleMons[battlerAtk].species == SPECIES_OGERPON_HEARTHFLAME_MASK_TERA + || gBattleMons[battlerAtk].species == SPECIES_OGERPON_CORNERSTONE_MASK || gBattleMons[battlerAtk].species == SPECIES_OGERPON_CORNERSTONE_MASK_TERA )) + { + gBattleStruct->dynamicMoveType = gBattleMons[battlerAtk].type2 | F_DYNAMIC_TYPE_SET; + } else if (gBattleMoves[move].effect == EFFECT_NATURAL_GIFT) { if (ItemId_GetPocket(gBattleMons[battlerAtk].item) == POCKET_BERRIES) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 94fec5691a..292804138a 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -13887,7 +13887,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_IVY_CUDGEL] = { - .effect = EFFECT_CHANGE_TYPE_ON_ITEM, + .effect = EFFECT_IVY_CUDGEL, .power = 100, .type = TYPE_GRASS, .accuracy = 100, @@ -13897,7 +13897,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_PHYSICAL, - .argument = HOLD_EFFECT_MASK, .metronomeBanned = TRUE, }, diff --git a/src/data/items.h b/src/data/items.h index cc8c646223..39038cb991 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -11248,42 +11248,36 @@ const struct Item gItems[] = { .name = _("CornrstneMask"), .price = 0, - .holdEffect = HOLD_EFFECT_MASK, .description = COMPOUND_STRING("Allows Ogerpon to\n" "wield the Rock-\n" "type in battle."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_ROCK, }, [ITEM_WELLSPRING_MASK] = { .name = _("WellsprngMask"), .price = 0, - .holdEffect = HOLD_EFFECT_MASK, .description = COMPOUND_STRING("Allows Ogerpon to\n" "wield the Water-\n" "type in battle."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_WATER, }, [ITEM_HEARTHFLAME_MASK] = { .name = _("HrthflameMask"), .price = 0, - .holdEffect = HOLD_EFFECT_MASK, .description = COMPOUND_STRING("Allows Ogerpon to\n" "wield the Fire-\n" "type in battle."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_FIRE, }, [ITEM_HEALTH_MOCHI] = diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index a9a70f1279..56e1ea51e9 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2841,7 +2841,7 @@ static void PrintNotEggInfo(void) if (dexNum != 0xFFFF) { - u8 digitCount = (NATIONAL_DEX_COUNT > 999 && IsNationalPokedexEnabled()) ? 4 : 3; + u8 digitCount = (NATIONAL_DEX_COUNT > 999 && IsNationalPokedexEnabled()) ? 4 : 3; StringCopy(gStringVar1, &gText_NumberClear01[0]); ConvertIntToDecimalStringN(gStringVar2, dexNum, STR_CONV_MODE_LEADING_ZEROS, digitCount); StringAppend(gStringVar1, gStringVar2); @@ -3958,10 +3958,7 @@ static void SetMoveTypeIcons(void) { if (summary->moves[i] != MOVE_NONE) { - if (summary->moves[i] == MOVE_IVY_CUDGEL && ItemId_GetHoldEffect(summary->item) == HOLD_EFFECT_MASK) - SetTypeSpritePosAndPal(ItemId_GetSecondaryId(summary->item), 85, 32 + (i * 16), i + SPRITE_ARR_ID_TYPE); - else - SetTypeSpritePosAndPal(gBattleMoves[summary->moves[i]].type, 85, 32 + (i * 16), i + SPRITE_ARR_ID_TYPE); + SetTypeSpritePosAndPal(gBattleMoves[summary->moves[i]].type, 85, 32 + (i * 16), i + SPRITE_ARR_ID_TYPE); } else SetSpriteInvisibility(i + SPRITE_ARR_ID_TYPE, TRUE); diff --git a/test/battle/move_effect/ivy_cudgel.c b/test/battle/move_effect/ivy_cudgel.c index 819047f34a..47db28f50d 100644 --- a/test/battle/move_effect/ivy_cudgel.c +++ b/test/battle/move_effect/ivy_cudgel.c @@ -3,22 +3,22 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_IVY_CUDGEL].effect == EFFECT_CHANGE_TYPE_ON_ITEM); - ASSUME(gBattleMoves[MOVE_IVY_CUDGEL].argument == HOLD_EFFECT_MASK); + ASSUME(gBattleMoves[MOVE_IVY_CUDGEL].effect == EFFECT_IVY_CUDGEL); } -SINGLE_BATTLE_TEST("Ivy Cudgel changes the move type depending on the mask the user holds") +SINGLE_BATTLE_TEST("Ivy Cudgel changes the move type depending on the form of Ogerpon") { u16 species; + u16 ogerpon; u16 item; - PARAMETRIZE { species = SPECIES_BLASTOISE; item = ITEM_NONE; } - PARAMETRIZE { species = SPECIES_CHARIZARD; item = ITEM_CORNERSTONE_MASK; } - PARAMETRIZE { species = SPECIES_CHARIZARD; item = ITEM_WELLSPRING_MASK; } - PARAMETRIZE { species = SPECIES_VENUSAUR; item = ITEM_HEARTHFLAME_MASK; } + PARAMETRIZE { species = SPECIES_BLASTOISE; ogerpon = SPECIES_OGERPON_TEAL_MASK; item = ITEM_NONE; } + PARAMETRIZE { species = SPECIES_CHARIZARD; ogerpon = SPECIES_OGERPON_CORNERSTONE_MASK; item = ITEM_CORNERSTONE_MASK; } + PARAMETRIZE { species = SPECIES_CHARIZARD; ogerpon = SPECIES_OGERPON_WELLSPRING_MASK; item = ITEM_WELLSPRING_MASK; } + PARAMETRIZE { species = SPECIES_VENUSAUR; ogerpon = SPECIES_OGERPON_HEARTHFLAME_MASK; item = ITEM_HEARTHFLAME_MASK; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Item(item); } + PLAYER(ogerpon) { Item(item); } OPPONENT(species); } WHEN { TURN { MOVE(player, MOVE_IVY_CUDGEL); } @@ -28,3 +28,24 @@ SINGLE_BATTLE_TEST("Ivy Cudgel changes the move type depending on the mask the u MESSAGE("It's super effective!"); } } + +SINGLE_BATTLE_TEST("Ivy Cudgel does not change the move type if used by Pokémon other than Ogerpon") +{ + u16 item; + + PARAMETRIZE { item = ITEM_NONE; } + PARAMETRIZE { item = ITEM_CORNERSTONE_MASK; } + PARAMETRIZE { item = ITEM_WELLSPRING_MASK; } + PARAMETRIZE { item = ITEM_HEARTHFLAME_MASK; } + + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(item); } + OPPONENT(SPECIES_BLASTOISE); + } WHEN { + TURN { MOVE(player, MOVE_IVY_CUDGEL); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_IVY_CUDGEL, player); + HP_BAR(opponent); + MESSAGE("It's super effective!"); // Should be super effective everytime if type isnt being changed + } +} From cc32e378d663467f9a549e7f7a3dfd5cf39d6e3e Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sat, 30 Dec 2023 20:20:12 +0100 Subject: [PATCH 43/57] Adds some Indigo Disk moves (#3853) * Burning Bulwark * Fickle Beam * Alluring Voice * Electro Shot * forgot sheer force flag for alluring voice * review changes * additional alluring voice test * Simple Allruing Voice animation * Update battle.h --------- Co-authored-by: Bassoonian --- data/battle_anim_scripts.s | 27 +++++++++-- data/battle_scripts_1.s | 16 ++++++- include/battle.h | 2 + include/constants/battle_move_effects.h | 3 +- include/constants/battle_string_ids.h | 4 +- include/random.h | 1 + src/battle_main.c | 1 + src/battle_message.c | 3 ++ src/battle_script_commands.c | 18 ++++++++ src/battle_util.c | 6 +++ src/data/battle_moves.h | 11 +++-- test/battle/move_effect/confusion_hit.c | 50 ++++++++++++++++++++ test/battle/move_effect/fickle_beam.c | 30 ++++++++++++ test/battle/move_effect/meteor_beam.c | 61 +++++++++++++++++++++++++ test/battle/move_effect/protect.c | 36 ++++++++++++++- 15 files changed, 257 insertions(+), 12 deletions(-) create mode 100644 test/battle/move_effect/confusion_hit.c create mode 100644 test/battle/move_effect/fickle_beam.c create mode 100644 test/battle/move_effect/meteor_beam.c diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index a79fae484d..3943be6278 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -16929,6 +16929,29 @@ ChillyReceptionSnowballs: delay 3 return +Move_BURNING_BULWARK:: + goto Move_PROTECT + +Move_ALLURING_VOICE:: + loadspritegfx ANIM_TAG_THIN_RING + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x8, 0x6e7d + waitforvisualfinish + createvisualtask SoundTask_PlayCryWithEcho, 5, FALSE + createsprite gHyperVoiceRingSpriteTemplate, ANIM_ATTACKER, 0, 45, 0, 0, 0, 0, 0, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 6, 1 + createvisualtask AnimTask_ShakeBattleTerrain, 2, 1, 0, 6, 1 + createvisualtask SoundTask_WaitForCry, 5 + delay 0xA + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 26, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 26, 1 + waitforvisualfinish + createvisualtask SoundTask_WaitForCry, 0x5 + waitforvisualfinish + createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x8, 0x0, 0x6e7d + waitforvisualfinish + end + Move_TERA_BLAST:: Move_AXE_KICK:: Move_LAST_RESPECTS:: @@ -16980,13 +17003,11 @@ Move_IVY_CUDGEL:: Move_ELECTRO_SHOT:: Move_TERA_STARSTORM:: Move_FICKLE_BEAM:: -Move_BURNING_BULWARK:: Move_THUNDERCLAP:: Move_MIGHTY_CLEAVE:: Move_TACHYON_CUTTER:: Move_HARD_PRESS:: Move_DRAGON_CHEER:: -Move_ALLURING_VOICE:: Move_TEMPER_FLARE:: Move_SUPERCELL_SLAM:: Move_PSYCHIC_NOISE:: @@ -19353,7 +19374,7 @@ Move_TELEPORT: call UnsetPsychicBg waitforvisualfinish end - + DoubleTeamAnimRet: setalpha 12, 8 monbg ANIM_ATK_PARTNER diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 9f70bbdf8b..cddbdcc044 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -442,6 +442,7 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectDoodle @ EFFECT_DOODLE .4byte BattleScript_EffectFilletAway @ EFFECT_FILLET_AWAY .4byte BattleScript_EffectHit @ EFFECT_IVY_CUDGEL + .4byte BattleScript_EffectHit @ EFFECT_FICKLE_BEAM BattleScript_EffectFilletAway: attackcanceler @@ -1062,12 +1063,25 @@ BattleScript_EffectMeteorBeam:: @ DecideTurn jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn - setbyte sTWOTURN_STRINGID, B_MSG_TURN1_METEOR_BEAM + jumpifmove MOVE_METEOR_BEAM, BattleScript_SetStringMeteorBeam + jumpifmove MOVE_ELECTRO_SHOT, BattleScript_SetStringElectroShock +BattleScript_TryCharging: call BattleScript_FirstChargingTurnMeteorBeam + jumpifmove MOVE_METEOR_BEAM, BattleScript_TryMeteorBeam + jumpifweatheraffected BS_ATTACKER, B_WEATHER_RAIN, BattleScript_TwoTurnMovesSecondTurn @ Check for move Electro Shot +BattleScript_TryMeteorBeam: jumpifnoholdeffect BS_ATTACKER, HOLD_EFFECT_POWER_HERB, BattleScript_MoveEnd call BattleScript_PowerHerbActivation goto BattleScript_TwoTurnMovesSecondTurn +BattleScript_SetStringMeteorBeam: + setbyte sTWOTURN_STRINGID, B_MSG_TURN1_METEOR_BEAM + goto BattleScript_TryCharging + +BattleScript_SetStringElectroShock: + setbyte sTWOTURN_STRINGID, B_MSG_TURN1_ELECTRO_SHOCK + goto BattleScript_TryCharging + BattleScript_FirstChargingTurnMeteorBeam:: attackcanceler flushtextbox diff --git a/include/battle.h b/include/battle.h index ecf8250774..876ed04772 100644 --- a/include/battle.h +++ b/include/battle.h @@ -162,6 +162,7 @@ struct ProtectStruct u16 shellTrap:1; u16 maxGuarded:1; u16 silkTrapped:1; + u16 burningBulwarked:1; u16 eatMirrorHerb:1; u16 activateOpportunist:2; // 2 - to copy stats. 1 - stats copied (do not repeat). 0 - no stats to copy u16 usedAllySwitch:1; @@ -813,6 +814,7 @@ STATIC_ASSERT(sizeof(((struct BattleStruct *)0)->palaceFlags) * 8 >= MAX_BATTLER || gProtectStructs[battlerId].spikyShielded \ || gProtectStructs[battlerId].kingsShielded \ || gProtectStructs[battlerId].banefulBunkered \ + || gProtectStructs[battlerId].burningBulwarked \ || gProtectStructs[battlerId].obstructed \ || gProtectStructs[battlerId].silkTrapped) diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index 70d8f11eec..b1662469e7 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -419,7 +419,8 @@ #define EFFECT_DOODLE 413 #define EFFECT_FILLET_AWAY 414 #define EFFECT_IVY_CUDGEL 415 +#define EFFECT_FICKLE_BEAM 416 -#define NUM_BATTLE_MOVE_EFFECTS 416 +#define NUM_BATTLE_MOVE_EFFECTS 417 #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index 5b571c9fb2..c4ca5dee43 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -697,8 +697,9 @@ #define STRINGID_THESWAMPDISAPPEARED 695 #define STRINGID_PKMNTELLCHILLINGRECEPTIONJOKE 696 #define STRINGID_HOSPITALITYRESTORATION 697 +#define STRINGID_ELECTROSHOCKCHARGING 698 -#define BATTLESTRINGS_COUNT 698 +#define BATTLESTRINGS_COUNT 699 // This is the string id that gBattleStringsTable starts with. // String ids before this (e.g. STRINGID_INTROMSG) are not in the table, @@ -756,6 +757,7 @@ #define B_MSG_TURN1_FREEZE_SHOCK 10 #define B_MSG_TURN1_SKY_DROP 11 #define B_MSG_TURN1_METEOR_BEAM 12 +#define B_MSG_TURN1_ELECTRO_SHOCK 13 // gMoveWeatherChangeStringIds #define B_MSG_STARTED_RAIN 0 diff --git a/include/random.h b/include/random.h index a13b28674f..8768f7c6dd 100644 --- a/include/random.h +++ b/include/random.h @@ -177,6 +177,7 @@ enum RandomTag RNG_QUICK_DRAW, RNG_QUICK_CLAW, RNG_TRACE, + RNG_FICKLE_BEAM, }; #define RandomWeighted(tag, ...) \ diff --git a/src/battle_main.c b/src/battle_main.c index 9930fa56fe..951766adcd 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3263,6 +3263,7 @@ const u8* FaintClearSetData(u32 battler) gProtectStructs[battler].quash = FALSE; gProtectStructs[battler].obstructed = FALSE; gProtectStructs[battler].silkTrapped = FALSE; + gProtectStructs[battler].burningBulwarked = FALSE; gProtectStructs[battler].endured = FALSE; gProtectStructs[battler].noValidMoves = FALSE; gProtectStructs[battler].helpingHand = FALSE; diff --git a/src/battle_message.c b/src/battle_message.c index c0462846d3..5a52528498 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -834,9 +834,11 @@ static const u8 sText_TheSeaOfFireDisappeared[] = _("The sea of fire around {B_A static const u8 sText_SwampEnvelopedSide[] = _("A swamp enveloped\n{B_DEF_TEAM2} team!"); static const u8 sText_TheSwampDisappeared[] = _("The swamp around {B_ATK_TEAM2}\nteam disappeared!"); static const u8 sText_HospitalityRestoration[] = _("The {B_ATK_PARTNER_NAME} drank down all\nthe matcha that Sinistcha made!"); +static const u8 sText_ElectroShockCharging[] = _("{B_ATK_NAME_WITH_PREFIX} absorbed\nelectricity!"); const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = { + [STRINGID_ELECTROSHOCKCHARGING - BATTLESTRINGS_TABLE_START] = sText_ElectroShockCharging, [STRINGID_HOSPITALITYRESTORATION - BATTLESTRINGS_TABLE_START] = sText_HospitalityRestoration, [STRINGID_THESWAMPDISAPPEARED - BATTLESTRINGS_TABLE_START] = sText_TheSwampDisappeared, [STRINGID_SWAMPENVELOPEDSIDE - BATTLESTRINGS_TABLE_START] = sText_SwampEnvelopedSide, @@ -1764,6 +1766,7 @@ const u16 gFirstTurnOfTwoStringIds[] = [B_MSG_TURN1_FREEZE_SHOCK] = STRINGID_CLOAKEDINAFREEZINGLIGHT, [B_MSG_TURN1_SKY_DROP] = STRINGID_PKMNTOOKTARGETHIGH, [B_MSG_TURN1_METEOR_BEAM] = STRINGID_METEORBEAMCHARGING, + [B_MSG_TURN1_ELECTRO_SHOCK] = STRINGID_ELECTROSHOCKCHARGING, }; // Index copied from move's index in sTrappingMoves diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 77bbbe6ea2..0708a8b34f 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3134,6 +3134,9 @@ void SetMoveEffect(bool32 primary, u32 certain) switch (gBattleScripting.moveEffect) { case MOVE_EFFECT_CONFUSION: + if (gCurrentMove == MOVE_ALLURING_VOICE && !gProtectStructs[gEffectBattler].statRaised) + break; + if (!CanBeConfused(gEffectBattler)) { gBattlescriptCurrInstr++; @@ -3523,6 +3526,7 @@ void SetMoveEffect(bool32 primary, u32 certain) gProtectStructs[gBattlerTarget].banefulBunkered = FALSE; gProtectStructs[gBattlerTarget].obstructed = FALSE; gProtectStructs[gBattlerTarget].silkTrapped = FALSE; + gProtectStructs[gBattlerAttacker].burningBulwarked = FALSE; BattleScriptPush(gBattlescriptCurrInstr + 1); if (gCurrentMove == MOVE_HYPERSPACE_FURY) gBattlescriptCurrInstr = BattleScript_HyperspaceFuryRemoveProtect; @@ -5322,6 +5326,15 @@ static void Cmd_moveend(void) gBattlescriptCurrInstr = BattleScript_KingsShieldEffect; effect = 1; } + else if (gProtectStructs[gBattlerTarget].burningBulwarked) + { + gProtectStructs[gBattlerAttacker].touchedProtectLike = FALSE; + gBattleScripting.moveEffect = MOVE_EFFECT_BURN | MOVE_EFFECT_AFFECTS_USER; + PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_BURNING_BULWARK); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_BanefulBunkerEffect; + effect = 1; + } // Not strictly a protect effect, but works the same way else if (gProtectStructs[gBattlerTarget].beakBlastCharge && CanBeBurned(gBattlerAttacker) @@ -10720,6 +10733,11 @@ static void Cmd_setprotectlike(void) gProtectStructs[gBattlerAttacker].silkTrapped = TRUE; gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_PROTECTED_ITSELF; } + else if (gCurrentMove == MOVE_BURNING_BULWARK) + { + gProtectStructs[gBattlerAttacker].burningBulwarked = TRUE; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_PROTECTED_ITSELF; + } gDisableStructs[gBattlerAttacker].protectUses++; fail = FALSE; diff --git a/src/battle_util.c b/src/battle_util.c index c3a020ace6..9a2a680ac0 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8496,6 +8496,8 @@ bool32 IsBattlerProtected(u32 battler, u32 move) return TRUE; else if (gProtectStructs[battler].banefulBunkered) return TRUE; + else if (gProtectStructs[battler].burningBulwarked) + return TRUE; else if ((gProtectStructs[battler].obstructed || gProtectStructs[battler].silkTrapped) && !IS_MOVE_STATUS(move)) return TRUE; else if (gProtectStructs[battler].spikyShielded) @@ -9002,6 +9004,10 @@ static inline u32 CalcMoveBasePower(u32 move, u32 battlerAtk, u32 battlerDef, u3 basePower += 50 * gBattleStruct->timesGotHit[GetBattlerSide(battlerAtk)][gBattlerPartyIndexes[battlerAtk]]; basePower = (basePower > 350) ? 350 : basePower; break; + case EFFECT_FICKLE_BEAM: + if (RandomPercentage(RNG_FICKLE_BEAM, 30)) + basePower *= 2; + break; } // Move-specific base power changes diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 292804138a..ea4876f67f 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -13902,7 +13902,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ELECTRO_SHOT] = { - .effect = EFFECT_PLACEHOLDER, //EFFECT_ELECTRO_SHOT + .effect = EFFECT_METEOR_BEAM, .power = 130, .type = TYPE_ELECTRIC, .accuracy = 100, @@ -13933,7 +13933,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FICKLE_BEAM] = { - .effect = EFFECT_PLACEHOLDER, //EFFECT_FICKLE_BEAM + .effect = EFFECT_FICKLE_BEAM, .power = 80, .type = TYPE_DRAGON, .accuracy = 100, @@ -13946,7 +13946,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_BURNING_BULWARK] = { - .effect = EFFECT_PROTECT, // NEEDS ACTUAL PROTECT SIDE EFFECT + .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FIRE, .accuracy = 0, @@ -14037,16 +14037,17 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_ALLURING_VOICE] = { - .effect = EFFECT_PLACEHOLDER, //EFFECT_ALLURING_VOICE + .effect = EFFECT_CONFUSE_HIT, .power = 80, .type = TYPE_FAIRY, .accuracy = 100, .pp = 10, - .secondaryEffectChance = 0, + .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .category = BATTLE_CATEGORY_SPECIAL, .soundMove = TRUE, + .sheerForceBoost = TRUE, .ignoresSubstitute = TRUE, }, diff --git a/test/battle/move_effect/confusion_hit.c b/test/battle/move_effect/confusion_hit.c new file mode 100644 index 0000000000..45077f42d0 --- /dev/null +++ b/test/battle/move_effect/confusion_hit.c @@ -0,0 +1,50 @@ +#include "global.h" +#include "test/battle.h" + +SINGLE_BATTLE_TEST("Alluring Voice confuses the target if the target raised a stat this turn") +{ + u16 move; + + PARAMETRIZE { move = MOVE_CELEBRATE; } + PARAMETRIZE { move = MOVE_SWORDS_DANCE; } + + GIVEN { + ASSUME(gBattleMoves[MOVE_ALLURING_VOICE].effect == EFFECT_CONFUSE_HIT); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, move); MOVE(player, MOVE_ALLURING_VOICE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, move, opponent); + ANIMATION(ANIM_TYPE_MOVE, MOVE_ALLURING_VOICE, player); + HP_BAR(opponent); + if (move == MOVE_SWORDS_DANCE) { + ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_CONFUSION, opponent); + MESSAGE("Foe Wobbuffet became confused!"); + } else { + NONE_OF { + ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_CONFUSION, opponent); + MESSAGE("Foe Wobbuffet became confused!"); + } + } + } +} + +SINGLE_BATTLE_TEST("Alluring Voice confuse effect is removed if it is Sheer Force boosted") +{ + GIVEN { + ASSUME(gBattleMoves[MOVE_ALLURING_VOICE].effect == EFFECT_CONFUSE_HIT); + PLAYER(SPECIES_NIDOKING) { Ability(ABILITY_SHEER_FORCE); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, MOVE_SWORDS_DANCE); MOVE(player, MOVE_ALLURING_VOICE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_SWORDS_DANCE, opponent); + ANIMATION(ANIM_TYPE_MOVE, MOVE_ALLURING_VOICE, player); + HP_BAR(opponent); + NONE_OF { + ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_CONFUSION, opponent); + MESSAGE("Foe Wobbuffet became confused!"); + } + } +} diff --git a/test/battle/move_effect/fickle_beam.c b/test/battle/move_effect/fickle_beam.c new file mode 100644 index 0000000000..2732b641a6 --- /dev/null +++ b/test/battle/move_effect/fickle_beam.c @@ -0,0 +1,30 @@ +#include "global.h" +#include "test/battle.h" + +ASSUMPTIONS +{ + ASSUME(gBattleMoves[MOVE_FICKLE_BEAM].effect == EFFECT_FICKLE_BEAM); +} + +SINGLE_BATTLE_TEST("Fickle Beam deals double damage 30% of the time") +{ + s16 damage[2]; + + PASSES_RANDOMLY(30, 100, RNG_FICKLE_BEAM); + GIVEN { + ASSUME(gBattleMoves[MOVE_POWER_GEM].power == 80); + ASSUME(gBattleMoves[MOVE_FICKLE_BEAM].power == 80); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_POWER_GEM); } + TURN { MOVE(player, MOVE_FICKLE_BEAM); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_POWER_GEM, player); + HP_BAR(opponent, captureDamage: &damage[0]); + ANIMATION(ANIM_TYPE_MOVE, MOVE_FICKLE_BEAM, player); + HP_BAR(opponent, captureDamage: &damage[1]); + } THEN { + EXPECT_MUL_EQ(damage[0], Q_4_12(2.0), damage[1]); + } +} diff --git a/test/battle/move_effect/meteor_beam.c b/test/battle/move_effect/meteor_beam.c new file mode 100644 index 0000000000..600de153d4 --- /dev/null +++ b/test/battle/move_effect/meteor_beam.c @@ -0,0 +1,61 @@ +#include "global.h" +#include "test/battle.h" + +ASSUMPTIONS +{ + ASSUME(gBattleMoves[MOVE_ELECTRO_SHOT].effect == EFFECT_METEOR_BEAM); +} + +SINGLE_BATTLE_TEST("Electro Shot needs a charging Turn") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_ELECTRO_SHOT); } + TURN { SKIP_TURN(player); } + } SCENE { + // Charging turn + ANIMATION(ANIM_TYPE_MOVE, MOVE_ELECTRO_SHOT, player); + MESSAGE("Wobbuffet absorbed electricity!"); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + MESSAGE("Wobbuffet's Sp. Atk rose!"); + // Attack turn + MESSAGE("Wobbuffet used Electro Shot!"); + } +} + +SINGLE_BATTLE_TEST("Electro Shot doesn't need to charge when it's raining") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, MOVE_RAIN_DANCE); MOVE(player, MOVE_ELECTRO_SHOT); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_RAIN_DANCE, opponent); + ANIMATION(ANIM_TYPE_MOVE, MOVE_ELECTRO_SHOT, player); + MESSAGE("Wobbuffet absorbed electricity!"); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + MESSAGE("Wobbuffet's Sp. Atk rose!"); + MESSAGE("Wobbuffet used Electro Shot!"); + } +} + +SINGLE_BATTLE_TEST("Electro Shot doesn't need to charge with Power Herb") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_POWER_HERB); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_ELECTRO_SHOT); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_ELECTRO_SHOT, player); + MESSAGE("Wobbuffet absorbed electricity!"); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + MESSAGE("Wobbuffet's Sp. Atk rose!"); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet became fully charged due to its Power Herb!"); + MESSAGE("Wobbuffet used Electro Shot!"); + } +} diff --git a/test/battle/move_effect/protect.c b/test/battle/move_effect/protect.c index 502eab46e0..c527a4881d 100644 --- a/test/battle/move_effect/protect.c +++ b/test/battle/move_effect/protect.c @@ -12,6 +12,7 @@ ASSUMPTIONS ASSUME(gBattleMoves[MOVE_QUICK_GUARD].effect == EFFECT_PROTECT); ASSUME(gBattleMoves[MOVE_CRAFTY_SHIELD].effect == EFFECT_PROTECT); ASSUME(gBattleMoves[MOVE_BANEFUL_BUNKER].effect == EFFECT_PROTECT); + ASSUME(gBattleMoves[MOVE_BURNING_BULWARK].effect == EFFECT_PROTECT); ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); ASSUME(gBattleMoves[MOVE_TACKLE].makesContact); ASSUME(gBattleMoves[MOVE_LEER].category == BATTLE_CATEGORY_STATUS); @@ -19,7 +20,7 @@ ASSUMPTIONS ASSUME(!(gBattleMoves[MOVE_WATER_GUN].makesContact)); } -SINGLE_BATTLE_TEST("Protect, Detect, Spiky Shield and Baneful Bunker protect from all moves") +SINGLE_BATTLE_TEST("Protect, Detect, Spiky Shield, Baneful Bunker and Burning Bulwark protect from all moves") { u32 j; static const u16 protectMoves[] = { @@ -27,6 +28,7 @@ SINGLE_BATTLE_TEST("Protect, Detect, Spiky Shield and Baneful Bunker protect fro MOVE_DETECT, MOVE_SPIKY_SHIELD, MOVE_BANEFUL_BUNKER, + MOVE_BURNING_BULWARK, }; u16 protectMove = MOVE_NONE; u16 usedMove = MOVE_NONE; @@ -188,6 +190,38 @@ SINGLE_BATTLE_TEST("Baneful Bunker poisons pokemon for moves making contact") } } +SINGLE_BATTLE_TEST("Burning Bulwark burns pokemon for moves making contact") +{ + u16 usedMove = MOVE_NONE; + + PARAMETRIZE {usedMove = MOVE_TACKLE; } + PARAMETRIZE {usedMove = MOVE_LEER; } + PARAMETRIZE {usedMove = MOVE_WATER_GUN; } + + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, MOVE_BURNING_BULWARK); MOVE(player, usedMove); } + TURN {} + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_BURNING_BULWARK, opponent); + MESSAGE("Foe Wobbuffet protected itself!"); + NOT ANIMATION(ANIM_TYPE_MOVE, usedMove, player); + MESSAGE("Foe Wobbuffet protected itself!"); + if (usedMove == MOVE_TACKLE) { + NOT HP_BAR(opponent); + STATUS_ICON(player, STATUS1_BURN); + } else { + NONE_OF { + HP_BAR(opponent); + STATUS_ICON(player, STATUS1_BURN); + } + } + } +} + SINGLE_BATTLE_TEST("Recoil damage is not applied if target was protected") { u32 j, k; From a32e2ccc881bd1779289b7b9f42fa1756b164356 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sat, 30 Dec 2023 23:07:18 +0100 Subject: [PATCH 44/57] Move Ability AI scores to gAbilities (#3862) * Ability refactor * Adds abilities to RHH rom header * Move Ability Ratings to gAbilities * Add previously unknown ai ratings --------- Co-authored-by: Martin Griffin Co-authored-by: DizzyEggg --- include/battle_ai_util.h | 1 - include/pokemon.h | 1 + src/battle_ai_main.c | 8 +- src/battle_ai_util.c | 268 +-------------------------------- src/data/abilities.h | 316 ++++++++++++++++++++++++++++++++++++++- 5 files changed, 319 insertions(+), 275 deletions(-) diff --git a/include/battle_ai_util.h b/include/battle_ai_util.h index bfb51d67bd..7207f3b652 100644 --- a/include/battle_ai_util.h +++ b/include/battle_ai_util.h @@ -59,7 +59,6 @@ bool32 ShouldRestoreHpBerry(u32 battlerAtk, u32 item); bool32 IsStatBoostingBerry(u32 item); bool32 CanKnockOffItem(u32 battler, u32 item); bool32 IsAbilityOfRating(u32 ability, s8 rating); -s8 GetAbilityRating(u32 ability); bool32 AI_IsAbilityOnSide(u32 battlerId, u32 ability); bool32 AI_MoveMakesContact(u32 ability, u32 holdEffect, u32 move); u32 AI_GetBattlerMoveTargetType(u32 battlerId, u32 move); diff --git a/include/pokemon.h b/include/pokemon.h index 6ce793a19e..c95ecbf940 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -513,6 +513,7 @@ struct Ability { u8 name[ABILITY_NAME_LENGTH + 1]; const u8 *description; + s8 aiRating; }; #define SPINDA_SPOT_WIDTH 16 diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index b71270a138..6aa8374b6f 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -2730,8 +2730,8 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) u32 atkPartnerAbility = aiData->abilities[BATTLE_PARTNER(battlerAtk)]; u32 atkPartnerHoldEffect = aiData->holdEffects[BATTLE_PARTNER(battlerAtk)]; bool32 partnerProtecting = (gBattleMoves[aiData->partnerMove].effect == EFFECT_PROTECT); - bool32 attackerHasBadAbility = (GetAbilityRating(aiData->abilities[battlerAtk]) < 0); - bool32 partnerHasBadAbility = (GetAbilityRating(atkPartnerAbility) < 0); + bool32 attackerHasBadAbility = (gAbilities[aiData->abilities[battlerAtk]].aiRating < 0); + bool32 partnerHasBadAbility = (gAbilities[atkPartnerAbility].aiRating < 0); u32 predictedMove = aiData->predictedMoves[battlerDef]; SetTypeBeforeUsingMove(move, battlerAtk); @@ -4444,7 +4444,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score } break; case EFFECT_SKILL_SWAP: - if (GetAbilityRating(aiData->abilities[battlerDef]) > GetAbilityRating(aiData->abilities[battlerAtk])) + if (gAbilities[aiData->abilities[battlerDef]].aiRating > gAbilities[aiData->abilities[battlerAtk]].aiRating) ADJUST_SCORE(1); break; case EFFECT_WORRY_SEED: @@ -4454,7 +4454,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score ADJUST_SCORE(2); break; case EFFECT_ENTRAINMENT: - if (IsAbilityOfRating(aiData->abilities[battlerDef], 5) || GetAbilityRating(aiData->abilities[battlerAtk]) <= 0) + if (IsAbilityOfRating(aiData->abilities[battlerDef], 5) || gAbilities[aiData->abilities[battlerAtk]].aiRating <= 0) { if (aiData->abilities[battlerDef] != aiData->abilities[battlerAtk] && !(gStatuses3[battlerDef] & STATUS3_GASTRO_ACID)) ADJUST_SCORE(2); diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index aa994689e5..ed2180b986 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -35,267 +35,6 @@ static u32 AI_GetEffectiveness(uq4_12_t multiplier); // Const Data -static const s8 sAiAbilityRatings[ABILITIES_COUNT] = -{ - [ABILITY_ADAPTABILITY] = 8, - [ABILITY_AFTERMATH] = 5, - [ABILITY_AERILATE] = 8, - [ABILITY_AIR_LOCK] = 5, - [ABILITY_ANALYTIC] = 5, - [ABILITY_ANGER_POINT] = 4, - [ABILITY_ANTICIPATION] = 2, - [ABILITY_ARENA_TRAP] = 9, - [ABILITY_AROMA_VEIL] = 3, - [ABILITY_AURA_BREAK] = 3, - [ABILITY_BAD_DREAMS] = 4, - [ABILITY_BATTERY] = 0, - [ABILITY_BATTLE_ARMOR] = 2, - [ABILITY_BATTLE_BOND] = 6, - [ABILITY_BEAST_BOOST] = 7, - [ABILITY_BERSERK] = 5, - [ABILITY_BIG_PECKS] = 1, - [ABILITY_BLAZE] = 5, - [ABILITY_BULLETPROOF] = 7, - [ABILITY_CHEEK_POUCH] = 4, - [ABILITY_CHLOROPHYLL] = 6, - [ABILITY_CLEAR_BODY] = 4, - [ABILITY_CLOUD_NINE] = 5, - [ABILITY_COLOR_CHANGE] = 2, - [ABILITY_COMATOSE] = 6, - [ABILITY_COMPETITIVE] = 5, - [ABILITY_COMPOUND_EYES] = 7, - [ABILITY_CONTRARY] = 8, - [ABILITY_CORROSION] = 5, - [ABILITY_CURSED_BODY] = 4, - [ABILITY_CUTE_CHARM] = 2, - [ABILITY_DAMP] = 2, - [ABILITY_DANCER] = 5, - [ABILITY_DARK_AURA] = 6, - [ABILITY_DAZZLING] = 5, - [ABILITY_DEFEATIST] = -1, - [ABILITY_DEFIANT] = 5, - [ABILITY_DELTA_STREAM] = 10, - [ABILITY_DESOLATE_LAND] = 10, - [ABILITY_DISGUISE] = 8, - [ABILITY_DOWNLOAD] = 7, - [ABILITY_DRIZZLE] = 9, - [ABILITY_DROUGHT] = 9, - [ABILITY_DRY_SKIN] = 6, - [ABILITY_EARLY_BIRD] = 4, - [ABILITY_EFFECT_SPORE] = 4, - [ABILITY_ELECTRIC_SURGE] = 8, - [ABILITY_EMERGENCY_EXIT] = 3, - [ABILITY_FAIRY_AURA] = 6, - [ABILITY_FILTER] = 6, - [ABILITY_FLAME_BODY] = 4, - [ABILITY_FLARE_BOOST] = 5, - [ABILITY_FLASH_FIRE] = 6, - [ABILITY_FLOWER_GIFT] = 4, - [ABILITY_FLOWER_VEIL] = 0, - [ABILITY_FLUFFY] = 5, - [ABILITY_FORECAST] = 6, - [ABILITY_FOREWARN] = 2, - [ABILITY_FRIEND_GUARD] = 0, - [ABILITY_FRISK] = 3, - [ABILITY_FULL_METAL_BODY] = 4, - [ABILITY_FUR_COAT] = 7, - [ABILITY_GALE_WINGS] = 6, - [ABILITY_GALVANIZE] = 8, - [ABILITY_GLUTTONY] = 3, - [ABILITY_GOOEY] = 5, - [ABILITY_GRASS_PELT] = 2, - [ABILITY_GRASSY_SURGE] = 8, - [ABILITY_GUTS] = 6, - [ABILITY_HARVEST] = 5, - [ABILITY_HEALER] = 0, - [ABILITY_HEATPROOF] = 5, - [ABILITY_HEAVY_METAL] = -1, - [ABILITY_HONEY_GATHER] = 0, - [ABILITY_HUGE_POWER] = 10, - [ABILITY_HUSTLE] = 7, - [ABILITY_HYDRATION] = 4, - [ABILITY_HYPER_CUTTER] = 3, - [ABILITY_ICE_BODY] = 3, - [ABILITY_ILLUMINATE] = 0, - [ABILITY_ILLUSION] = 8, - [ABILITY_IMMUNITY] = 4, - [ABILITY_IMPOSTER] = 9, - [ABILITY_INFILTRATOR] = 6, - [ABILITY_INNARDS_OUT] = 5, - [ABILITY_INNER_FOCUS] = 2, - [ABILITY_INSOMNIA] = 4, - [ABILITY_INTIMIDATE] = 7, - [ABILITY_IRON_BARBS] = 6, - [ABILITY_IRON_FIST] = 6, - [ABILITY_JUSTIFIED] = 4, - [ABILITY_KEEN_EYE] = 1, - [ABILITY_KLUTZ] = -1, - [ABILITY_LEAF_GUARD] = 2, - [ABILITY_LEVITATE] = 7, - [ABILITY_LIGHT_METAL] = 2, - [ABILITY_LIGHTNING_ROD] = 7, - [ABILITY_LIMBER] = 3, - [ABILITY_LIQUID_OOZE] = 3, - [ABILITY_LIQUID_VOICE] = 5, - [ABILITY_LONG_REACH] = 3, - [ABILITY_MAGIC_BOUNCE] = 9, - [ABILITY_MAGIC_GUARD] = 9, - [ABILITY_MAGICIAN] = 3, - [ABILITY_MAGMA_ARMOR] = 1, - [ABILITY_MAGNET_PULL] = 9, - [ABILITY_MARVEL_SCALE] = 5, - [ABILITY_MEGA_LAUNCHER] = 7, - [ABILITY_MERCILESS] = 4, - [ABILITY_MINUS] = 0, - [ABILITY_MISTY_SURGE] = 8, - [ABILITY_MOLD_BREAKER] = 7, - [ABILITY_MOODY] = 10, - [ABILITY_MOTOR_DRIVE] = 6, - [ABILITY_MOXIE] = 7, - [ABILITY_MULTISCALE] = 8, - [ABILITY_MULTITYPE] = 8, - [ABILITY_MUMMY] = 5, - [ABILITY_NATURAL_CURE] = 7, - [ABILITY_NEUROFORCE] = 6, - [ABILITY_NO_GUARD] = 8, - [ABILITY_NORMALIZE] = -1, - [ABILITY_OBLIVIOUS] = 2, - [ABILITY_OVERCOAT] = 5, - [ABILITY_OVERGROW] = 5, - [ABILITY_OWN_TEMPO] = 3, - [ABILITY_PARENTAL_BOND] = 10, - [ABILITY_PICKUP] = 1, - [ABILITY_PICKPOCKET] = 3, - [ABILITY_PIXILATE] = 8, - [ABILITY_PLUS] = 0, - [ABILITY_POISON_HEAL] = 8, - [ABILITY_POISON_POINT] = 4, - [ABILITY_POISON_TOUCH] = 4, - [ABILITY_POWER_CONSTRUCT] = 10, - [ABILITY_POWER_OF_ALCHEMY] = 0, - [ABILITY_PRANKSTER] = 8, - [ABILITY_PRESSURE] = 5, - [ABILITY_PRIMORDIAL_SEA] = 10, - [ABILITY_PRISM_ARMOR] = 6, - [ABILITY_PROTEAN] = 8, - [ABILITY_PSYCHIC_SURGE] = 8, - [ABILITY_PURE_POWER] = 10, - [ABILITY_QUEENLY_MAJESTY] = 6, - [ABILITY_QUICK_FEET] = 5, - [ABILITY_RAIN_DISH] = 3, - [ABILITY_RATTLED] = 3, - [ABILITY_RECEIVER] = 0, - [ABILITY_RECKLESS] = 6, - [ABILITY_REFRIGERATE] = 8, - [ABILITY_REGENERATOR] = 8, - [ABILITY_RIVALRY] = 1, - [ABILITY_RKS_SYSTEM] = 8, - [ABILITY_ROCK_HEAD] = 5, - [ABILITY_ROUGH_SKIN] = 6, - [ABILITY_RUN_AWAY] = 0, - [ABILITY_SAND_FORCE] = 4, - [ABILITY_SAND_RUSH] = 6, - [ABILITY_SAND_STREAM] = 9, - [ABILITY_SAND_VEIL] = 3, - [ABILITY_SAP_SIPPER] = 7, - [ABILITY_SCHOOLING] = 6, - [ABILITY_SCRAPPY] = 6, - [ABILITY_SERENE_GRACE] = 8, - [ABILITY_SHADOW_SHIELD] = 8, - [ABILITY_SHADOW_TAG] = 10, - [ABILITY_SHED_SKIN] = 7, - [ABILITY_SHEER_FORCE] = 8, - [ABILITY_SHELL_ARMOR] = 2, - [ABILITY_SHIELD_DUST] = 5, - [ABILITY_SHIELDS_DOWN] = 6, - [ABILITY_SIMPLE] = 8, - [ABILITY_SKILL_LINK] = 7, - [ABILITY_SLOW_START] = -2, - [ABILITY_SLUSH_RUSH] = 5, - [ABILITY_SNIPER] = 3, - [ABILITY_SNOW_CLOAK] = 3, - [ABILITY_SNOW_WARNING] = 8, - [ABILITY_SOLAR_POWER] = 3, - [ABILITY_SOLID_ROCK] = 6, - [ABILITY_SOUL_HEART] = 7, - [ABILITY_SOUNDPROOF] = 4, - [ABILITY_SPEED_BOOST] = 9, - [ABILITY_STAKEOUT] = 6, - [ABILITY_STALL] = -1, - [ABILITY_STAMINA] = 6, - [ABILITY_STANCE_CHANGE] = 10, - [ABILITY_STATIC] = 4, - [ABILITY_STEADFAST] = 2, - [ABILITY_STEELWORKER] = 6, - [ABILITY_STENCH] = 1, - [ABILITY_STICKY_HOLD] = 3, - [ABILITY_STORM_DRAIN] = 7, - [ABILITY_STRONG_JAW] = 6, - [ABILITY_STURDY] = 6, - [ABILITY_SUCTION_CUPS] = 2, - [ABILITY_SUPER_LUCK] = 3, - [ABILITY_SURGE_SURFER] = 4, - [ABILITY_SWARM] = 5, - [ABILITY_SWEET_VEIL] = 4, - [ABILITY_SWIFT_SWIM] = 6, - [ABILITY_SYMBIOSIS] = 0, - [ABILITY_SYNCHRONIZE] = 4, - [ABILITY_TANGLED_FEET] = 2, - [ABILITY_TANGLING_HAIR] = 5, - [ABILITY_TECHNICIAN] = 8, - [ABILITY_TELEPATHY] = 0, - [ABILITY_TERAVOLT] = 7, - [ABILITY_THICK_FAT] = 7, - [ABILITY_TINTED_LENS] = 7, - [ABILITY_TORRENT] = 5, - [ABILITY_TOXIC_BOOST] = 6, - [ABILITY_TOUGH_CLAWS] = 7, - [ABILITY_TRACE] = 6, - [ABILITY_TRIAGE] = 7, - [ABILITY_TRUANT] = -2, - [ABILITY_TURBOBLAZE] = 7, - [ABILITY_UNAWARE] = 6, - [ABILITY_UNBURDEN] = 7, - [ABILITY_UNNERVE] = 3, - [ABILITY_VICTORY_STAR] = 6, - [ABILITY_VITAL_SPIRIT] = 4, - [ABILITY_VOLT_ABSORB] = 7, - [ABILITY_WATER_ABSORB] = 7, - [ABILITY_WATER_BUBBLE] = 8, - [ABILITY_WATER_COMPACTION] = 4, - [ABILITY_WATER_VEIL] = 4, - [ABILITY_WEAK_ARMOR] = 2, - [ABILITY_WHITE_SMOKE] = 4, - [ABILITY_WIMP_OUT] = 3, - [ABILITY_WONDER_GUARD] = 10, - [ABILITY_WONDER_SKIN] = 4, - [ABILITY_ZEN_MODE] = -1, - [ABILITY_INTREPID_SWORD] = 3, - [ABILITY_DAUNTLESS_SHIELD] = 3, - [ABILITY_BALL_FETCH] = 0, - [ABILITY_COTTON_DOWN] = 3, - [ABILITY_MIRROR_ARMOR] = 6, - [ABILITY_GULP_MISSILE] = 3, - [ABILITY_STALWART] = 2, - [ABILITY_PROPELLER_TAIL] = 2, - [ABILITY_STEAM_ENGINE] = 3, - [ABILITY_PUNK_ROCK] = 2, - [ABILITY_SAND_SPIT] = 5, - [ABILITY_ICE_SCALES] = 7, - [ABILITY_RIPEN] = 4, - [ABILITY_ICE_FACE] = 4, - [ABILITY_POWER_SPOT] = 2, - [ABILITY_MIMICRY] = 2, - [ABILITY_SCREEN_CLEANER] = 3, - [ABILITY_NEUTRALIZING_GAS] = 5, - [ABILITY_HUNGER_SWITCH] = 2, - [ABILITY_PASTEL_VEIL] = 4, - [ABILITY_STEELY_SPIRIT] = 2, - [ABILITY_PERISH_BODY] = -1, - [ABILITY_WANDERING_SPIRIT] = 2, - [ABILITY_GORILLA_TACTICS] = 4, -}; - static const u16 sEncouragedEncoreEffects[] = { EFFECT_DREAM_EATER, @@ -3470,16 +3209,11 @@ bool32 SideHasMoveCategory(u32 battlerId, u32 category) bool32 IsAbilityOfRating(u32 ability, s8 rating) { - if (sAiAbilityRatings[ability] >= rating) + if (gAbilities[ability].aiRating >= rating) return TRUE; return FALSE; } -s8 GetAbilityRating(u32 ability) -{ - return sAiAbilityRatings[ability]; -} - static const u16 sRecycleEncouragedItems[] = { ITEM_CHESTO_BERRY, diff --git a/src/data/abilities.h b/src/data/abilities.h index 2ff80f3ab3..56f7547b23 100644 --- a/src/data/abilities.h +++ b/src/data/abilities.h @@ -4,84 +4,98 @@ const struct Ability gAbilities[ABILITIES_COUNT] = { .name = _("-------"), .description = COMPOUND_STRING("No special ability."), + .aiRating = 0, }, [ABILITY_STENCH] = { .name = _("Stench"), .description = COMPOUND_STRING("May cause a foe to flinch."), + .aiRating = 1, }, [ABILITY_DRIZZLE] = { .name = _("Drizzle"), .description = COMPOUND_STRING("Summons rain in battle."), + .aiRating = 9, }, [ABILITY_SPEED_BOOST] = { .name = _("Speed Boost"), .description = COMPOUND_STRING("Gradually boosts Speed."), + .aiRating = 9, }, [ABILITY_BATTLE_ARMOR] = { .name = _("Battle Armor"), .description = COMPOUND_STRING("Blocks critical hits."), + .aiRating = 2, }, [ABILITY_STURDY] = { .name = _("Sturdy"), .description = COMPOUND_STRING("Negates 1-hit KO attacks."), + .aiRating = 6, }, [ABILITY_DAMP] = { .name = _("Damp"), .description = COMPOUND_STRING("Prevents self-destruction."), + .aiRating = 2, }, [ABILITY_LIMBER] = { .name = _("Limber"), .description = COMPOUND_STRING("Prevents paralysis."), + .aiRating = 3, }, [ABILITY_SAND_VEIL] = { .name = _("Sand Veil"), .description = COMPOUND_STRING("Ups evasion in a sandstorm."), + .aiRating = 3, }, [ABILITY_STATIC] = { .name = _("Static"), .description = COMPOUND_STRING("Paralyzes on contact."), + .aiRating = 4, }, [ABILITY_VOLT_ABSORB] = { .name = _("Volt Absorb"), .description = COMPOUND_STRING("Turns electricity into HP."), + .aiRating = 7, }, [ABILITY_WATER_ABSORB] = { .name = _("Water Absorb"), .description = COMPOUND_STRING("Changes water into HP."), + .aiRating = 7, }, [ABILITY_OBLIVIOUS] = { .name = _("Oblivious"), .description = COMPOUND_STRING("Prevents attraction."), + .aiRating = 2, }, [ABILITY_CLOUD_NINE] = { .name = _("Cloud Nine"), .description = COMPOUND_STRING("Negates weather effects."), + .aiRating = 5, }, [ABILITY_COMPOUND_EYES] = @@ -92,102 +106,119 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("CompoundEyes"), #endif .description = COMPOUND_STRING("Raises accuracy."), + .aiRating = 7, }, [ABILITY_INSOMNIA] = { .name = _("Insomnia"), .description = COMPOUND_STRING("Prevents sleep."), + .aiRating = 4, }, [ABILITY_COLOR_CHANGE] = { .name = _("Color Change"), .description = COMPOUND_STRING("Changes type to foe's move."), + .aiRating = 2, }, [ABILITY_IMMUNITY] = { .name = _("Immunity"), .description = COMPOUND_STRING("Prevents poisoning."), + .aiRating = 4, }, [ABILITY_FLASH_FIRE] = { .name = _("Flash Fire"), .description = COMPOUND_STRING("Powers up if hit by fire."), + .aiRating = 6, }, [ABILITY_SHIELD_DUST] = { .name = _("Shield Dust"), .description = COMPOUND_STRING("Prevents added effects."), + .aiRating = 5, }, [ABILITY_OWN_TEMPO] = { .name = _("Own Tempo"), .description = COMPOUND_STRING("Prevents confusion."), + .aiRating = 3, }, [ABILITY_SUCTION_CUPS] = { .name = _("Suction Cups"), .description = COMPOUND_STRING("Firmly anchors the body."), + .aiRating = 2, }, [ABILITY_INTIMIDATE] = { .name = _("Intimidate"), .description = COMPOUND_STRING("Lowers the foe's Attack."), + .aiRating = 7, }, [ABILITY_SHADOW_TAG] = { .name = _("Shadow Tag"), .description = COMPOUND_STRING("Prevents the foe's escape."), + .aiRating = 10, }, [ABILITY_ROUGH_SKIN] = { .name = _("Rough Skin"), .description = COMPOUND_STRING("Hurts to touch."), + .aiRating = 6, }, [ABILITY_WONDER_GUARD] = { .name = _("Wonder Guard"), .description = COMPOUND_STRING("“Supereffective” hits."), + .aiRating = 10, }, [ABILITY_LEVITATE] = { .name = _("Levitate"), .description = COMPOUND_STRING("Not hit by Ground attacks."), + .aiRating = 7, }, [ABILITY_EFFECT_SPORE] = { .name = _("Effect Spore"), .description = COMPOUND_STRING("Leaves spores on contact."), + .aiRating = 4, }, [ABILITY_SYNCHRONIZE] = { .name = _("Synchronize"), .description = COMPOUND_STRING("Passes on status problems."), + .aiRating = 4, }, [ABILITY_CLEAR_BODY] = { .name = _("Clear Body"), .description = COMPOUND_STRING("Prevents ability reduction."), + .aiRating = 4, }, [ABILITY_NATURAL_CURE] = { .name = _("Natural Cure"), .description = COMPOUND_STRING("Heals upon switching out."), + .aiRating = 7, }, [ABILITY_LIGHTNING_ROD] = @@ -198,870 +229,1015 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("LightningRod"), #endif .description = COMPOUND_STRING("Draws electrical moves."), + .aiRating = 7, }, [ABILITY_SERENE_GRACE] = { .name = _("Serene Grace"), .description = COMPOUND_STRING("Promotes added effects."), + .aiRating = 8, }, [ABILITY_SWIFT_SWIM] = { .name = _("Swift Swim"), .description = COMPOUND_STRING("Raises Speed in rain."), + .aiRating = 6, }, [ABILITY_CHLOROPHYLL] = { .name = _("Chlorophyll"), .description = COMPOUND_STRING("Raises Speed in sunshine."), + .aiRating = 6, }, [ABILITY_ILLUMINATE] = { .name = _("Illuminate"), .description = COMPOUND_STRING("Encounter rate increases."), + .aiRating = 0, }, [ABILITY_TRACE] = { .name = _("Trace"), .description = COMPOUND_STRING("Copies special ability."), + .aiRating = 6, }, [ABILITY_HUGE_POWER] = { .name = _("Huge Power"), .description = COMPOUND_STRING("Raises Attack."), + .aiRating = 10, }, [ABILITY_POISON_POINT] = { .name = _("Poison Point"), .description = COMPOUND_STRING("Poisons foe on contact."), + .aiRating = 4, }, [ABILITY_INNER_FOCUS] = { .name = _("Inner Focus"), .description = COMPOUND_STRING("Prevents flinching."), + .aiRating = 2, }, [ABILITY_MAGMA_ARMOR] = { .name = _("Magma Armor"), .description = COMPOUND_STRING("Prevents freezing."), + .aiRating = 1, }, [ABILITY_WATER_VEIL] = { .name = _("Water Veil"), .description = COMPOUND_STRING("Prevents burns."), + .aiRating = 4, }, [ABILITY_MAGNET_PULL] = { .name = _("Magnet Pull"), .description = COMPOUND_STRING("Traps Steel-type Pokémon."), + .aiRating = 9, }, [ABILITY_SOUNDPROOF] = { .name = _("Soundproof"), .description = COMPOUND_STRING("Avoids sound-based moves."), + .aiRating = 4, }, [ABILITY_RAIN_DISH] = { .name = _("Rain Dish"), .description = COMPOUND_STRING("Slight HP recovery in rain."), + .aiRating = 3, }, [ABILITY_SAND_STREAM] = { .name = _("Sand Stream"), .description = COMPOUND_STRING("Summons a sandstorm."), + .aiRating = 9, }, [ABILITY_PRESSURE] = { .name = _("Pressure"), .description = COMPOUND_STRING("Raises foe's PP usage."), + .aiRating = 5, }, [ABILITY_THICK_FAT] = { .name = _("Thick Fat"), .description = COMPOUND_STRING("Heat-and-cold protection."), + .aiRating = 7, }, [ABILITY_EARLY_BIRD] = { .name = _("Early Bird"), .description = COMPOUND_STRING("Awakens quickly from sleep."), + .aiRating = 4, }, [ABILITY_FLAME_BODY] = { .name = _("Flame Body"), .description = COMPOUND_STRING("Burns the foe on contact."), + .aiRating = 4, }, [ABILITY_RUN_AWAY] = { .name = _("Run Away"), .description = COMPOUND_STRING("Makes escaping easier."), + .aiRating = 0, }, [ABILITY_KEEN_EYE] = { .name = _("Keen Eye"), .description = COMPOUND_STRING("Prevents loss of accuracy."), + .aiRating = 1, }, [ABILITY_HYPER_CUTTER] = { .name = _("Hyper Cutter"), .description = COMPOUND_STRING("Prevents Attack reduction."), + .aiRating = 3, }, [ABILITY_PICKUP] = { .name = _("Pickup"), .description = COMPOUND_STRING("May pick up items."), + .aiRating = 1, }, [ABILITY_TRUANT] = { .name = _("Truant"), .description = COMPOUND_STRING("Moves only every two turns."), + .aiRating = -2, }, [ABILITY_HUSTLE] = { .name = _("Hustle"), .description = COMPOUND_STRING("Trades accuracy for power."), + .aiRating = 7, }, [ABILITY_CUTE_CHARM] = { .name = _("Cute Charm"), .description = COMPOUND_STRING("Infatuates on contact."), + .aiRating = 2, }, [ABILITY_PLUS] = { .name = _("Plus"), .description = COMPOUND_STRING("Powers up with Minus."), + .aiRating = 0, }, [ABILITY_MINUS] = { .name = _("Minus"), .description = COMPOUND_STRING("Powers up with Plus."), + .aiRating = 0, }, [ABILITY_FORECAST] = { .name = _("Forecast"), .description = COMPOUND_STRING("Changes with the weather."), + .aiRating = 6, }, [ABILITY_STICKY_HOLD] = { .name = _("Sticky Hold"), .description = COMPOUND_STRING("Prevents item theft."), + .aiRating = 3, }, [ABILITY_SHED_SKIN] = { .name = _("Shed Skin"), .description = COMPOUND_STRING("Heals the body by shedding."), + .aiRating = 7, }, [ABILITY_GUTS] = { .name = _("Guts"), .description = COMPOUND_STRING("Ups Attack if suffering."), + .aiRating = 6, }, [ABILITY_MARVEL_SCALE] = { .name = _("Marvel Scale"), .description = COMPOUND_STRING("Ups Defense if suffering."), + .aiRating = 5, }, [ABILITY_LIQUID_OOZE] = { .name = _("Liquid Ooze"), .description = COMPOUND_STRING("Draining causes injury."), + .aiRating = 3, }, [ABILITY_OVERGROW] = { .name = _("Overgrow"), .description = COMPOUND_STRING("Ups Grass moves in a pinch."), + .aiRating = 5, }, [ABILITY_BLAZE] = { .name = _("Blaze"), .description = COMPOUND_STRING("Ups Fire moves in a pinch."), + .aiRating = 5, }, [ABILITY_TORRENT] = { .name = _("Torrent"), .description = COMPOUND_STRING("Ups Water moves in a pinch."), + .aiRating = 5, }, [ABILITY_SWARM] = { .name = _("Swarm"), .description = COMPOUND_STRING("Ups Bug moves in a pinch."), + .aiRating = 5, }, [ABILITY_ROCK_HEAD] = { .name = _("Rock Head"), .description = COMPOUND_STRING("Prevents recoil damage."), + .aiRating = 5, }, [ABILITY_DROUGHT] = { .name = _("Drought"), .description = COMPOUND_STRING("Summons sunlight in battle."), + .aiRating = 9, }, [ABILITY_ARENA_TRAP] = { .name = _("Arena Trap"), .description = COMPOUND_STRING("Prevents fleeing."), + .aiRating = 9, }, [ABILITY_VITAL_SPIRIT] = { .name = _("Vital Spirit"), .description = COMPOUND_STRING("Prevents sleep."), + .aiRating = 4, }, [ABILITY_WHITE_SMOKE] = { .name = _("White Smoke"), .description = COMPOUND_STRING("Prevents ability reduction."), + .aiRating = 4, }, [ABILITY_PURE_POWER] = { .name = _("Pure Power"), .description = COMPOUND_STRING("Raises Attack."), + .aiRating = 10, }, [ABILITY_SHELL_ARMOR] = { .name = _("Shell Armor"), .description = COMPOUND_STRING("Blocks critical hits."), + .aiRating = 2, }, [ABILITY_AIR_LOCK] = { .name = _("Air Lock"), .description = COMPOUND_STRING("Negates weather effects."), + .aiRating = 5, }, [ABILITY_TANGLED_FEET] = { .name = _("Tangled Feet"), .description = COMPOUND_STRING("Ups evasion if confused."), + .aiRating = 2, }, [ABILITY_MOTOR_DRIVE] = { .name = _("Motor Drive"), .description = COMPOUND_STRING("Electricity raises Speed."), + .aiRating = 6, }, [ABILITY_RIVALRY] = { .name = _("Rivalry"), .description = COMPOUND_STRING("Powers up against rivals."), + .aiRating = 1, }, [ABILITY_STEADFAST] = { .name = _("Steadfast"), .description = COMPOUND_STRING("Flinching raises Speed."), + .aiRating = 2, }, [ABILITY_SNOW_CLOAK] = { .name = _("Snow Cloak"), .description = COMPOUND_STRING("Ups evasion in Hail or Snow."), + .aiRating = 3, }, [ABILITY_GLUTTONY] = { .name = _("Gluttony"), .description = COMPOUND_STRING("Eats Berries early."), + .aiRating = 3, }, [ABILITY_ANGER_POINT] = { .name = _("Anger Point"), .description = COMPOUND_STRING("Critical hits raise Attack."), + .aiRating = 4, }, [ABILITY_UNBURDEN] = { .name = _("Unburden"), .description = COMPOUND_STRING("Using a hold item ups Speed."), + .aiRating = 7, }, [ABILITY_HEATPROOF] = { .name = _("Heatproof"), .description = COMPOUND_STRING("Heat and burn protection."), + .aiRating = 5, }, [ABILITY_SIMPLE] = { .name = _("Simple"), .description = COMPOUND_STRING("Prone to wild stat changes."), + .aiRating = 8, }, [ABILITY_DRY_SKIN] = { .name = _("Dry Skin"), .description = COMPOUND_STRING("Prefers moisture to heat."), + .aiRating = 6, }, [ABILITY_DOWNLOAD] = { .name = _("Download"), .description = COMPOUND_STRING("Adjusts power favorably."), + .aiRating = 7, }, [ABILITY_IRON_FIST] = { .name = _("Iron Fist"), .description = COMPOUND_STRING("Boosts punching moves."), + .aiRating = 6, }, [ABILITY_POISON_HEAL] = { .name = _("Poison Heal"), .description = COMPOUND_STRING("Restores HP if poisoned."), + .aiRating = 8, }, [ABILITY_ADAPTABILITY] = { .name = _("Adaptability"), .description = COMPOUND_STRING("Boosts same type attacks."), + .aiRating = 8, }, [ABILITY_SKILL_LINK] = { .name = _("Skill Link"), .description = COMPOUND_STRING("Multi-hit moves hit 5 times."), + .aiRating = 7, }, [ABILITY_HYDRATION] = { .name = _("Hydration"), .description = COMPOUND_STRING("Cures status in rain."), + .aiRating = 4, }, [ABILITY_SOLAR_POWER] = { .name = _("Solar Power"), .description = COMPOUND_STRING("Powers up in sunshine."), + .aiRating = 3, }, [ABILITY_QUICK_FEET] = { .name = _("Quick Feet"), .description = COMPOUND_STRING("Ups Speed if suffering."), + .aiRating = 5, }, [ABILITY_NORMALIZE] = { .name = _("Normalize"), .description = COMPOUND_STRING("Moves become Normal-type."), + .aiRating = -1, }, [ABILITY_SNIPER] = { .name = _("Sniper"), .description = COMPOUND_STRING("Boosts critical hits."), + .aiRating = 3, }, [ABILITY_MAGIC_GUARD] = { .name = _("Magic Guard"), .description = COMPOUND_STRING("Only damaged by attacks."), + .aiRating = 9, }, [ABILITY_NO_GUARD] = { .name = _("No Guard"), .description = COMPOUND_STRING("Ensures that all moves hit."), + .aiRating = 8, }, [ABILITY_STALL] = { .name = _("Stall"), .description = COMPOUND_STRING("Always moves last."), + .aiRating = -1, }, [ABILITY_TECHNICIAN] = { .name = _("Technician"), .description = COMPOUND_STRING("Boosts weaker moves."), + .aiRating = 8, }, [ABILITY_LEAF_GUARD] = { .name = _("Leaf Guard"), .description = COMPOUND_STRING("Blocks status in sunshine."), + .aiRating = 2, }, [ABILITY_KLUTZ] = { .name = _("Klutz"), .description = COMPOUND_STRING("Can't use hold items."), + .aiRating = -1, }, [ABILITY_MOLD_BREAKER] = { .name = _("Mold Breaker"), .description = COMPOUND_STRING("Moves hit through abilities."), + .aiRating = 7, }, [ABILITY_SUPER_LUCK] = { .name = _("Super Luck"), .description = COMPOUND_STRING("Critical hits land often."), + .aiRating = 3, }, [ABILITY_AFTERMATH] = { .name = _("Aftermath"), .description = COMPOUND_STRING("Fainting damages the foe."), + .aiRating = 5, }, [ABILITY_ANTICIPATION] = { .name = _("Anticipation"), .description = COMPOUND_STRING("Senses dangerous moves."), + .aiRating = 2, }, [ABILITY_FOREWARN] = { .name = _("Forewarn"), .description = COMPOUND_STRING("Determines a foe's move."), + .aiRating = 2, }, [ABILITY_UNAWARE] = { .name = _("Unaware"), .description = COMPOUND_STRING("Ignores stat changes."), + .aiRating = 6, }, [ABILITY_TINTED_LENS] = { .name = _("Tinted Lens"), .description = COMPOUND_STRING("Ups “not very effective”."), + .aiRating = 7, }, [ABILITY_FILTER] = { .name = _("Filter"), .description = COMPOUND_STRING("Weakens “supereffective”."), + .aiRating = 6, }, [ABILITY_SLOW_START] = { .name = _("Slow Start"), .description = COMPOUND_STRING("Takes a while to get going."), + .aiRating = -2, }, [ABILITY_SCRAPPY] = { .name = _("Scrappy"), .description = COMPOUND_STRING("Hits Ghost-type Pokémon."), + .aiRating = 6, }, [ABILITY_STORM_DRAIN] = { .name = _("Storm Drain"), .description = COMPOUND_STRING("Draws in Water moves."), + .aiRating = 7, }, [ABILITY_ICE_BODY] = { .name = _("Ice Body"), .description = COMPOUND_STRING("HP recovery in Hail or Snow."), + .aiRating = 3, }, [ABILITY_SOLID_ROCK] = { .name = _("Solid Rock"), .description = COMPOUND_STRING("Weakens “supereffective”."), + .aiRating = 6, }, [ABILITY_SNOW_WARNING] = { .name = _("Snow Warning"), .description = COMPOUND_STRING("Summons a Hailstorm."), + .aiRating = 8, }, [ABILITY_HONEY_GATHER] = { .name = _("Honey Gather"), .description = COMPOUND_STRING("May gather Honey."), + .aiRating = 0, }, [ABILITY_FRISK] = { .name = _("Frisk"), .description = COMPOUND_STRING("Checks a foe's item."), + .aiRating = 3, }, [ABILITY_RECKLESS] = { .name = _("Reckless"), .description = COMPOUND_STRING("Boosts moves with recoil."), + .aiRating = 6, }, [ABILITY_MULTITYPE] = { .name = _("Multitype"), .description = COMPOUND_STRING("Changes type to its Plate."), + .aiRating = 8, }, [ABILITY_FLOWER_GIFT] = { .name = _("Flower Gift"), .description = COMPOUND_STRING("Allies power up in sunshine."), + .aiRating = 4, }, [ABILITY_BAD_DREAMS] = { .name = _("Bad Dreams"), .description = COMPOUND_STRING("Damages sleeping Pokémon."), + .aiRating = 4, }, [ABILITY_PICKPOCKET] = { .name = _("Pickpocket"), .description = COMPOUND_STRING("Steals the foe's held item."), + .aiRating = 3, }, [ABILITY_SHEER_FORCE] = { .name = _("Sheer Force"), .description = COMPOUND_STRING("Trades effects for power."), + .aiRating = 8, }, [ABILITY_CONTRARY] = { .name = _("Contrary"), .description = COMPOUND_STRING("Inverts stat changes."), + .aiRating = 8, }, [ABILITY_UNNERVE] = { .name = _("Unnerve"), .description = COMPOUND_STRING("Foes can't eat Berries."), + .aiRating = 3, }, [ABILITY_DEFIANT] = { .name = _("Defiant"), .description = COMPOUND_STRING("Lowered stats up Attack."), + .aiRating = 5, }, [ABILITY_DEFEATIST] = { .name = _("Defeatist"), .description = COMPOUND_STRING("Gives up at half HP."), + .aiRating = -1, }, [ABILITY_CURSED_BODY] = { .name = _("Cursed Body"), .description = COMPOUND_STRING("Disables moves on contact."), + .aiRating = 4, }, [ABILITY_HEALER] = { .name = _("Healer"), .description = COMPOUND_STRING("Heals partner Pokémon."), + .aiRating = 0, }, [ABILITY_FRIEND_GUARD] = { .name = _("Friend Guard"), .description = COMPOUND_STRING("Lowers damage to partner."), + .aiRating = 0, }, [ABILITY_WEAK_ARMOR] = { .name = _("Weak Armor"), .description = COMPOUND_STRING("Its stats change when hit."), + .aiRating = 2, }, [ABILITY_HEAVY_METAL] = { .name = _("Heavy Metal"), .description = COMPOUND_STRING("Doubles weight."), + .aiRating = -1, }, [ABILITY_LIGHT_METAL] = { .name = _("Light Metal"), .description = COMPOUND_STRING("Halves weight."), + .aiRating = 2, }, [ABILITY_MULTISCALE] = { .name = _("Multiscale"), .description = COMPOUND_STRING("Halves damage at full HP."), + .aiRating = 8, }, [ABILITY_TOXIC_BOOST] = { .name = _("Toxic Boost"), .description = COMPOUND_STRING("Ups Attack if poisoned."), + .aiRating = 6, }, [ABILITY_FLARE_BOOST] = { .name = _("Flare Boost"), .description = COMPOUND_STRING("Ups Sp. Atk if burned."), + .aiRating = 5, }, [ABILITY_HARVEST] = { .name = _("Harvest"), .description = COMPOUND_STRING("May recycle a used Berry."), + .aiRating = 5, }, [ABILITY_TELEPATHY] = { .name = _("Telepathy"), .description = COMPOUND_STRING("Can't be damaged by an ally."), + .aiRating = 0, }, [ABILITY_MOODY] = { .name = _("Moody"), .description = COMPOUND_STRING("Stats change gradually."), + .aiRating = 10, }, [ABILITY_OVERCOAT] = { .name = _("Overcoat"), .description = COMPOUND_STRING("Blocks weather and powder."), + .aiRating = 5, }, [ABILITY_POISON_TOUCH] = { .name = _("Poison Touch"), .description = COMPOUND_STRING("Poisons foe on contact."), + .aiRating = 4, }, [ABILITY_REGENERATOR] = { .name = _("Regenerator"), .description = COMPOUND_STRING("Heals upon switching out."), + .aiRating = 8, }, [ABILITY_BIG_PECKS] = { .name = _("Big Pecks"), .description = COMPOUND_STRING("Prevents Defense loss."), + .aiRating = 1, }, [ABILITY_SAND_RUSH] = { .name = _("Sand Rush"), .description = COMPOUND_STRING("Ups Speed in a sandstorm."), + .aiRating = 6, }, [ABILITY_WONDER_SKIN] = { .name = _("Wonder Skin"), .description = COMPOUND_STRING("May avoid status problems."), + .aiRating = 4, }, [ABILITY_ANALYTIC] = { .name = _("Analytic"), .description = COMPOUND_STRING("Moving last boosts power."), + .aiRating = 5, }, [ABILITY_ILLUSION] = { .name = _("Illusion"), .description = COMPOUND_STRING("Appears as a partner."), + .aiRating = 8, }, [ABILITY_IMPOSTER] = { .name = _("Imposter"), .description = COMPOUND_STRING("Transforms into the foe."), + .aiRating = 9, }, [ABILITY_INFILTRATOR] = { .name = _("Infiltrator"), .description = COMPOUND_STRING("Passes through barriers."), + .aiRating = 6, }, [ABILITY_MUMMY] = { .name = _("Mummy"), .description = COMPOUND_STRING("Spreads with contact."), + .aiRating = 5, }, [ABILITY_MOXIE] = { .name = _("Moxie"), .description = COMPOUND_STRING("KOs raise Attack."), + .aiRating = 7, }, [ABILITY_JUSTIFIED] = { .name = _("Justified"), .description = COMPOUND_STRING("Dark hits raise Attack."), + .aiRating = 4, }, [ABILITY_RATTLED] = { .name = _("Rattled"), .description = COMPOUND_STRING("Raises Speed when scared."), + .aiRating = 3, }, [ABILITY_MAGIC_BOUNCE] = { .name = _("Magic Bounce"), .description = COMPOUND_STRING("Reflects status moves."), + .aiRating = 9, }, [ABILITY_SAP_SIPPER] = { .name = _("Sap Sipper"), .description = COMPOUND_STRING("Grass increases Attack."), + .aiRating = 7, }, [ABILITY_PRANKSTER] = { .name = _("Prankster"), .description = COMPOUND_STRING("Status moves go first."), + .aiRating = 8, }, [ABILITY_SAND_FORCE] = { .name = _("Sand Force"), .description = COMPOUND_STRING("Powers up in a sandstorm."), + .aiRating = 4, }, [ABILITY_IRON_BARBS] = { .name = _("Iron Barbs"), .description = COMPOUND_STRING("Hurts to touch."), + .aiRating = 6, }, [ABILITY_ZEN_MODE] = { .name = _("Zen Mode"), .description = COMPOUND_STRING("Transforms at half HP."), + .aiRating = -1, }, [ABILITY_VICTORY_STAR] = { .name = _("Victory Star"), .description = COMPOUND_STRING("Raises party accuracy."), + .aiRating = 6, }, [ABILITY_TURBOBLAZE] = { .name = _("Turboblaze"), .description = COMPOUND_STRING("Moves hit through abilities."), + .aiRating = 7, }, [ABILITY_TERAVOLT] = { .name = _("Teravolt"), .description = COMPOUND_STRING("Moves hit through abilities."), + .aiRating = 7, }, [ABILITY_AROMA_VEIL] = { .name = _("Aroma Veil"), .description = COMPOUND_STRING("Prevents limiting of moves."), + .aiRating = 3, }, [ABILITY_FLOWER_VEIL] = { .name = _("Flower Veil"), .description = COMPOUND_STRING("Protects Grass-types."), + .aiRating = 0, }, [ABILITY_CHEEK_POUCH] = { .name = _("Cheek Pouch"), .description = COMPOUND_STRING("Eating Berries restores HP."), + .aiRating = 4, }, [ABILITY_PROTEAN] = { .name = _("Protean"), .description = COMPOUND_STRING("Changes type to used move."), + .aiRating = 8, }, [ABILITY_FUR_COAT] = { .name = _("Fur Coat"), .description = COMPOUND_STRING("Raises Defense."), + .aiRating = 7, }, [ABILITY_MAGICIAN] = { .name = _("Magician"), .description = COMPOUND_STRING("Steals the foe's held item."), + .aiRating = 3, }, [ABILITY_BULLETPROOF] = { .name = _("Bulletproof"), .description = COMPOUND_STRING("Avoids some projectiles."), + .aiRating = 7, }, [ABILITY_COMPETITIVE] = { .name = _("Competitive"), .description = COMPOUND_STRING("Lowered stats up Sp. Atk."), + .aiRating = 5, }, [ABILITY_STRONG_JAW] = { .name = _("Strong Jaw"), .description = COMPOUND_STRING("Boosts biting moves."), + .aiRating = 6, }, [ABILITY_REFRIGERATE] = { .name = _("Refrigerate"), .description = COMPOUND_STRING("Normal moves become Ice."), + .aiRating = 8, }, [ABILITY_SWEET_VEIL] = { .name = _("Sweet Veil"), .description = COMPOUND_STRING("Prevents party from sleep."), + .aiRating = 4, }, [ABILITY_STANCE_CHANGE] = @@ -1072,12 +1248,14 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("StanceChange"), #endif .description = COMPOUND_STRING("Transforms as it battles."), + .aiRating = 10, }, [ABILITY_GALE_WINGS] = { .name = _("Gale Wings"), .description = COMPOUND_STRING("Flying moves go first."), + .aiRating = 6, }, [ABILITY_MEGA_LAUNCHER] = @@ -1088,42 +1266,49 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("MegaLauncher"), #endif .description = COMPOUND_STRING("Boosts pulse moves."), + .aiRating = 7, }, [ABILITY_GRASS_PELT] = { .name = _("Grass Pelt"), .description = COMPOUND_STRING("Ups Defense in grass."), + .aiRating = 2, }, [ABILITY_SYMBIOSIS] = { .name = _("Symbiosis"), .description = COMPOUND_STRING("Passes its item to an ally."), + .aiRating = 0, }, [ABILITY_TOUGH_CLAWS] = { .name = _("Tough Claws"), .description = COMPOUND_STRING("Boosts contact moves."), + .aiRating = 7, }, [ABILITY_PIXILATE] = { .name = _("Pixilate"), .description = COMPOUND_STRING("Normal moves become Fairy."), + .aiRating = 8, }, [ABILITY_GOOEY] = { .name = _("Gooey"), .description = COMPOUND_STRING("Lowers Speed on contact."), + .aiRating = 5, }, [ABILITY_AERILATE] = { .name = _("Aerilate"), .description = COMPOUND_STRING("Normal moves become Flying."), + .aiRating = 8, }, [ABILITY_PARENTAL_BOND] = @@ -1134,24 +1319,28 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("ParentalBond"), #endif .description = COMPOUND_STRING("Moves hit twice."), + .aiRating = 10, }, [ABILITY_DARK_AURA] = { .name = _("Dark Aura"), .description = COMPOUND_STRING("Boosts Dark moves."), + .aiRating = 6, }, [ABILITY_FAIRY_AURA] = { .name = _("Fairy Aura"), .description = COMPOUND_STRING("Boosts Fairy moves."), + .aiRating = 6, }, [ABILITY_AURA_BREAK] = { .name = _("Aura Break"), .description = COMPOUND_STRING("Reverse aura abilities."), + .aiRating = 3, }, [ABILITY_PRIMORDIAL_SEA] = @@ -1162,6 +1351,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("PrimrdialSea"), #endif .description = COMPOUND_STRING("Summons heavy rain."), + .aiRating = 10, }, [ABILITY_DESOLATE_LAND] = @@ -1172,24 +1362,28 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("DesolateLand"), #endif .description = COMPOUND_STRING("Summons intense sunlight."), + .aiRating = 10, }, [ABILITY_DELTA_STREAM] = { .name = _("Delta Stream"), .description = COMPOUND_STRING("Summons strong winds."), + .aiRating = 10, }, [ABILITY_STAMINA] = { .name = _("Stamina"), .description = COMPOUND_STRING("Boosts Defense when hit."), + .aiRating = 6, }, [ABILITY_WIMP_OUT] = { .name = _("Wimp Out"), .description = COMPOUND_STRING("Flees at half HP."), + .aiRating = 3, }, [ABILITY_EMERGENCY_EXIT] = @@ -1200,6 +1394,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("EmergncyExit"), #endif .description = COMPOUND_STRING("Flees at half HP."), + .aiRating = 3, }, [ABILITY_WATER_COMPACTION] = @@ -1210,96 +1405,112 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("WtrCmpaction"), #endif .description = COMPOUND_STRING("Water boosts Defense."), + .aiRating = 4, }, [ABILITY_MERCILESS] = { .name = _("Merciless"), .description = COMPOUND_STRING("Criticals poisoned foes."), + .aiRating = 4, }, [ABILITY_SHIELDS_DOWN] = { .name = _("Shields Down"), .description = COMPOUND_STRING("Shell breaks at half HP."), + .aiRating = 6, }, [ABILITY_STAKEOUT] = { .name = _("Stakeout"), .description = COMPOUND_STRING("Stronger as foes switch in."), + .aiRating = 6, }, [ABILITY_WATER_BUBBLE] = { .name = _("Water Bubble"), .description = COMPOUND_STRING("Guards from fire and burns."), + .aiRating = 8, }, [ABILITY_STEELWORKER] = { .name = _("Steelworker"), .description = COMPOUND_STRING("Powers up Steel moves."), + .aiRating = 6, }, [ABILITY_BERSERK] = { .name = _("Berserk"), .description = COMPOUND_STRING("Boosts Sp. Atk at low HP."), + .aiRating = 5, }, [ABILITY_SLUSH_RUSH] = { .name = _("Slush Rush"), .description = COMPOUND_STRING("Raises Speed in Hail or Snow."), + .aiRating = 5, }, [ABILITY_LONG_REACH] = { .name = _("Long Reach"), .description = COMPOUND_STRING("Never makes contact."), + .aiRating = 3, }, [ABILITY_LIQUID_VOICE] = { .name = _("Liquid Voice"), .description = COMPOUND_STRING("Makes sound moves Water."), + .aiRating = 5, }, [ABILITY_TRIAGE] = { .name = _("Triage"), .description = COMPOUND_STRING("Healing moves go first."), + .aiRating = 7, }, [ABILITY_GALVANIZE] = { .name = _("Galvanize"), .description = COMPOUND_STRING("Normal moves turn Electric."), + .aiRating = 8, }, [ABILITY_SURGE_SURFER] = { .name = _("Surge Surfer"), .description = COMPOUND_STRING("Faster on electricity."), + .aiRating = 4, }, [ABILITY_SCHOOLING] = { .name = _("Schooling"), .description = COMPOUND_STRING("Forms a school when strong."), + .aiRating = 6, }, [ABILITY_DISGUISE] = { .name = _("Disguise"), .description = COMPOUND_STRING("Decoy protects it once."), + .aiRating = 8, }, [ABILITY_BATTLE_BOND] = { .name = _("Battle Bond"), .description = COMPOUND_STRING("Changes form after a KO."), + .aiRating = 6, }, [ABILITY_POWER_CONSTRUCT] = @@ -1310,18 +1521,21 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("PwrConstruct"), #endif .description = COMPOUND_STRING("Cells aid it when weakened."), + .aiRating = 10, }, [ABILITY_CORROSION] = { .name = _("Corrosion"), .description = COMPOUND_STRING("Poisons any type."), + .aiRating = 5, }, [ABILITY_COMATOSE] = { .name = _("Comatose"), .description = COMPOUND_STRING("Always drowsing."), + .aiRating = 6, }, [ABILITY_QUEENLY_MAJESTY] = @@ -1332,42 +1546,49 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("QueenlyMjsty"), #endif .description = COMPOUND_STRING("Protects from priority."), + .aiRating = 6, }, [ABILITY_INNARDS_OUT] = { .name = _("Innards Out"), .description = COMPOUND_STRING("Hurts foe when defeated."), + .aiRating = 5, }, [ABILITY_DANCER] = { .name = _("Dancer"), .description = COMPOUND_STRING("Dances along with others."), + .aiRating = 5, }, [ABILITY_BATTERY] = { .name = _("Battery"), .description = COMPOUND_STRING("Boosts ally's Sp. Atk."), + .aiRating = 0, }, [ABILITY_FLUFFY] = { .name = _("Fluffy"), .description = COMPOUND_STRING("Tougher but flammable."), + .aiRating = 5, }, [ABILITY_DAZZLING] = { .name = _("Dazzling"), .description = COMPOUND_STRING("Protects from priority."), + .aiRating = 5, }, [ABILITY_SOUL_HEART] = { .name = _("Soul-Heart"), .description = COMPOUND_STRING("KOs raise Sp. Atk."), + .aiRating = 7, }, [ABILITY_TANGLING_HAIR] = @@ -1378,12 +1599,14 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("TanglingHair"), #endif .description = COMPOUND_STRING("Lowers Speed on contact."), + .aiRating = 5, }, [ABILITY_RECEIVER] = { .name = _("Receiver"), .description = COMPOUND_STRING("Copies ally's ability."), + .aiRating = 0, }, [ABILITY_POWER_OF_ALCHEMY] = @@ -1394,18 +1617,21 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("PwrOfAlchemy"), #endif .description = COMPOUND_STRING("Copies ally's ability."), + .aiRating = 0, }, [ABILITY_BEAST_BOOST] = { .name = _("Beast Boost"), .description = COMPOUND_STRING("KOs boost best stat."), + .aiRating = 7, }, [ABILITY_RKS_SYSTEM] = { .name = _("RKS System"), .description = COMPOUND_STRING("Memories change its type."), + .aiRating = 8, }, [ABILITY_ELECTRIC_SURGE] = @@ -1416,6 +1642,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("ElectrcSurge"), #endif .description = COMPOUND_STRING("Field becomes Electric."), + .aiRating = 8, }, [ABILITY_PSYCHIC_SURGE] = @@ -1426,18 +1653,21 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("PsychicSurge"), #endif .description = COMPOUND_STRING("Field becomes weird."), + .aiRating = 8, }, [ABILITY_MISTY_SURGE] = { .name = _("Misty Surge"), .description = COMPOUND_STRING("Field becomes misty."), + .aiRating = 8, }, [ABILITY_GRASSY_SURGE] = { .name = _("Grassy Surge"), .description = COMPOUND_STRING("Field becomes grassy."), + .aiRating = 8, }, [ABILITY_FULL_METAL_BODY] = @@ -1448,6 +1678,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("FullMetalBdy"), #endif .description = COMPOUND_STRING("Prevents stat reduction."), + .aiRating = 4, }, [ABILITY_SHADOW_SHIELD] = @@ -1458,18 +1689,21 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("ShadowShield"), #endif .description = COMPOUND_STRING("Halves damage at full HP."), + .aiRating = 8, }, [ABILITY_PRISM_ARMOR] = { .name = _("Prism Armor"), .description = COMPOUND_STRING("Weakens “supereffective”."), + .aiRating = 6, }, [ABILITY_NEUROFORCE] = { .name = _("Neuroforce"), .description = COMPOUND_STRING("Ups “supereffective”."), + .aiRating = 6, }, [ABILITY_INTREPID_SWORD] = @@ -1480,6 +1714,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("IntrepidSwrd"), #endif .description = COMPOUND_STRING("Ups Attack on entry."), + .aiRating = 3, }, [ABILITY_DAUNTLESS_SHIELD] = @@ -1490,6 +1725,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("DauntlssShld"), #endif .description = COMPOUND_STRING("Ups Defense on entry."), + .aiRating = 3, }, [ABILITY_LIBERO] = @@ -1502,12 +1738,14 @@ const struct Ability gAbilities[ABILITIES_COUNT] = { .name = _("Ball Fetch"), .description = COMPOUND_STRING("Fetches failed Poké Ball."), + .aiRating = 0, }, [ABILITY_COTTON_DOWN] = { .name = _("Cotton Down"), .description = COMPOUND_STRING("Lower Speed of all when hit."), + .aiRating = 3, }, [ABILITY_PROPELLER_TAIL] = @@ -1518,72 +1756,84 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("PropellrTail"), #endif .description = COMPOUND_STRING("Ignores foe's redirection."), + .aiRating = 2, }, [ABILITY_MIRROR_ARMOR] = { .name = _("Mirror Armor"), .description = COMPOUND_STRING("Reflect stat decreases."), + .aiRating = 6, }, [ABILITY_GULP_MISSILE] = { .name = _("Gulp Missile"), .description = COMPOUND_STRING("If hit, spits prey from sea."), + .aiRating = 3, }, [ABILITY_STALWART] = { .name = _("Stalwart"), .description = COMPOUND_STRING("Ignores foe's redirection."), + .aiRating = 2, }, [ABILITY_STEAM_ENGINE] = { .name = _("Steam Engine"), .description = COMPOUND_STRING("Fire or Water hits up Speed."), + .aiRating = 3, }, [ABILITY_PUNK_ROCK] = { .name = _("Punk Rock"), .description = COMPOUND_STRING("Ups and resists sound."), + .aiRating = 2, }, [ABILITY_SAND_SPIT] = { .name = _("Sand Spit"), .description = COMPOUND_STRING("Creates a sandstorm if hit."), + .aiRating = 5, }, [ABILITY_ICE_SCALES] = { .name = _("Ice Scales"), .description = COMPOUND_STRING("Halves special damage."), + .aiRating = 7, }, [ABILITY_RIPEN] = { .name = _("Ripen"), .description = COMPOUND_STRING("Doubles effect of Berries."), + .aiRating = 4, }, [ABILITY_ICE_FACE] = { .name = _("Ice Face"), .description = COMPOUND_STRING("Hail or Snow renew free hit."), + .aiRating = 4, }, [ABILITY_POWER_SPOT] = { .name = _("Power Spot"), .description = COMPOUND_STRING("Powers up ally moves."), + .aiRating = 2, }, [ABILITY_MIMICRY] = { .name = _("Mimicry"), .description = COMPOUND_STRING("Changes type on terrain."), + .aiRating = 2, }, [ABILITY_SCREEN_CLEANER] = @@ -1594,6 +1844,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("ScreenCleanr"), #endif .description = COMPOUND_STRING("Removes walls of light."), + .aiRating = 3, }, [ABILITY_STEELY_SPIRIT] = @@ -1604,12 +1855,14 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("SteelySpirit"), #endif .description = COMPOUND_STRING("Boosts ally's Steel moves."), + .aiRating = 2, }, [ABILITY_PERISH_BODY] = { .name = _("Perish Body"), .description = COMPOUND_STRING("Foe faints in 3 turns if hit."), + .aiRating = -1, }, [ABILITY_WANDERING_SPIRIT] = @@ -1620,6 +1873,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("WandrngSprit"), #endif .description = COMPOUND_STRING("Trade abilities on contact."), + .aiRating = 2, }, [ABILITY_GORILLA_TACTICS] = @@ -1630,6 +1884,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("GorillaTacti"), #endif .description = COMPOUND_STRING("Ups Attack and locks move."), + .aiRating = 4, }, [ABILITY_NEUTRALIZING_GAS] = @@ -1640,12 +1895,14 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("NeutrlzngGas"), #endif .description = COMPOUND_STRING("All Abilities are nullified."), + .aiRating = 5, }, [ABILITY_PASTEL_VEIL] = { .name = _("Pastel Veil"), .description = COMPOUND_STRING("Protects team from poison."), + .aiRating = 4, }, [ABILITY_HUNGER_SWITCH] = @@ -1656,18 +1913,21 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("HungerSwitch"), #endif .description = COMPOUND_STRING("Changes form each turn."), + .aiRating = 2, }, [ABILITY_QUICK_DRAW] = { .name = _("Quick Draw"), .description = COMPOUND_STRING("Moves first occasionally."), + .aiRating = 4, }, [ABILITY_UNSEEN_FIST] = { .name = _("Unseen Fist"), .description = COMPOUND_STRING("Contact evades protection."), + .aiRating = 6, }, [ABILITY_CURIOUS_MEDICINE] = @@ -1678,18 +1938,21 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("CuriusMedicn"), #endif .description = COMPOUND_STRING("Remove ally's stat changes."), + .aiRating = 3, }, [ABILITY_TRANSISTOR] = { .name = _("Transistor"), .description = COMPOUND_STRING("Ups Electric-type moves."), + .aiRating = 6, }, [ABILITY_DRAGONS_MAW] = { .name = _("Dragon's Maw"), .description = COMPOUND_STRING("Ups Dragon-type moves."), + .aiRating = 6, }, [ABILITY_CHILLING_NEIGH] = @@ -1700,24 +1963,28 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("ChillngNeigh"), #endif .description = COMPOUND_STRING("KOs boost Attack stat."), + .aiRating = 7, }, [ABILITY_GRIM_NEIGH] = { .name = _("Grim Neigh"), .description = COMPOUND_STRING("KOs boost Sp. Atk stat."), + .aiRating = 7, }, [ABILITY_AS_ONE_ICE_RIDER] = { .name = _("As One"), .description = COMPOUND_STRING("Unnerve and Chilling Neigh."), + .aiRating = 10, }, [ABILITY_AS_ONE_SHADOW_RIDER] = { .name = _("As One"), .description = COMPOUND_STRING("Unnerve and Grim Neigh."), + .aiRating = 10, }, [ABILITY_LINGERING_AROMA] = @@ -1728,12 +1995,14 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("LngerngAroma"), #endif .description = COMPOUND_STRING("Spreads with contact."), + .aiRating = 5, }, [ABILITY_SEED_SOWER] = { .name = _("Seed Sower"), .description = COMPOUND_STRING("Affects terrain when hit."), + .aiRating = 5, }, [ABILITY_THERMAL_EXCHANGE] = @@ -1744,12 +2013,14 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("ThrmlExchnge"), #endif .description = COMPOUND_STRING("Fire hits up Attack."), + .aiRating = 4, }, [ABILITY_ANGER_SHELL] = { .name = _("Anger Shell"), .description = COMPOUND_STRING("Gets angry at half HP."), + .aiRating = 3, }, [ABILITY_PURIFYING_SALT] = @@ -1760,6 +2031,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("PurfyingSalt"), #endif .description = COMPOUND_STRING("Protected by pure salts."), + .aiRating = 6, }, [ABILITY_WELL_BAKED_BODY] = @@ -1770,18 +2042,21 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("WellBakedBdy"), #endif .description = COMPOUND_STRING("Strengthened by Fire."), + .aiRating = 5, }, [ABILITY_WIND_RIDER] = { .name = _("Wind Rider"), .description = COMPOUND_STRING("Ups Attack if hit by wind."), + .aiRating = 4, }, [ABILITY_GUARD_DOG] = { .name = _("Guard Dog"), .description = COMPOUND_STRING("Cannot be intimidated."), + .aiRating = 5, }, [ABILITY_ROCKY_PAYLOAD] = @@ -1792,24 +2067,28 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("RockyPayload"), #endif .description = COMPOUND_STRING("Powers up Rock moves."), + .aiRating = 6, }, [ABILITY_WIND_POWER] = { .name = _("Wind Power"), .description = COMPOUND_STRING("Gets charged by wind."), + .aiRating = 4, }, [ABILITY_ZERO_TO_HERO] = { .name = _("Zero to Hero"), .description = COMPOUND_STRING("Changes form on switch out."), + .aiRating = 10, }, [ABILITY_COMMANDER] = { .name = _("Commander"), .description = COMPOUND_STRING("Commands from Dondozo."), + .aiRating = 10, }, [ABILITY_ELECTROMORPHOSIS] = @@ -1819,7 +2098,8 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #else .name = _("Elecmrphosis"), #endif - .description = COMPOUND_STRING("Gets Charged on contact."), + .description = COMPOUND_STRING("Gets Charged when hit."), + .aiRating = 5, }, [ABILITY_PROTOSYNTHESIS] = @@ -1830,18 +2110,21 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("Protosnthsis"), #endif .description = COMPOUND_STRING("Sun boosts best stat."), + .aiRating = 7, }, [ABILITY_QUARK_DRIVE] = { .name = _("Quark Drive"), .description = COMPOUND_STRING("Elec. field ups best stat."), + .aiRating = 7, }, [ABILITY_GOOD_AS_GOLD] = { .name = _("Good as Gold"), .description = COMPOUND_STRING("Avoids status problems."), + .aiRating = 8, }, [ABILITY_VESSEL_OF_RUIN] = @@ -1852,6 +2135,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("VesselOfRuin"), #endif .description = COMPOUND_STRING("Lowers foes' sp. damage."), + .aiRating = 5, }, [ABILITY_SWORD_OF_RUIN] = @@ -1861,7 +2145,8 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #else .name = _("SwordOfRuin"), #endif - .description = COMPOUND_STRING("Lowers foes' defense."), + .description = COMPOUND_STRING("Lowers foes' Defense."), + .aiRating = 5, }, [ABILITY_TABLETS_OF_RUIN] = @@ -1872,6 +2157,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("TabltsOfRuin"), #endif .description = COMPOUND_STRING("Lowers foes' damage."), + .aiRating = 5, }, [ABILITY_BEADS_OF_RUIN] = @@ -1881,7 +2167,8 @@ const struct Ability gAbilities[ABILITIES_COUNT] = #else .name = _("BeadsOfRuin"), #endif - .description = COMPOUND_STRING("Lowers foes' sp. defense."), + .description = COMPOUND_STRING("Lowers foes' Sp. Defense."), + .aiRating = 5, }, [ABILITY_ORICHALCUM_PULSE] = @@ -1892,6 +2179,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("OrchlcumPlse"), #endif .description = COMPOUND_STRING("Summons sunlight in battle."), + .aiRating = 8, }, [ABILITY_HADRON_ENGINE] = @@ -1902,24 +2190,28 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("HadronEngine"), #endif .description = COMPOUND_STRING("Field becomes Electric."), + .aiRating = 8, }, [ABILITY_OPPORTUNIST] = { .name = _("Opportunist"), .description = COMPOUND_STRING("Copies foe's stat change."), + .aiRating = 5, }, [ABILITY_CUD_CHEW] = { .name = _("Cud Chew"), .description = COMPOUND_STRING("Eats a used berry again."), + .aiRating = 4, }, [ABILITY_SHARPNESS] = { .name = _("Sharpness"), .description = COMPOUND_STRING("Strengthens slicing moves."), + .aiRating = 7, }, [ABILITY_SUPREME_OVERLORD] = @@ -1930,30 +2222,35 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("SuprmeOvrlrd"), #endif .description = COMPOUND_STRING("Inherits fallen's strength."), + .aiRating = 6, }, [ABILITY_COSTAR] = { .name = _("Costar"), .description = COMPOUND_STRING("Copies ally's stat changes."), + .aiRating = 5, }, [ABILITY_TOXIC_DEBRIS] = { .name = _("Toxic Debris"), .description = COMPOUND_STRING("Throws poison spikes if hit."), + .aiRating = 4, }, [ABILITY_ARMOR_TAIL] = { .name = _("Armor Tail"), .description = COMPOUND_STRING("Protects from priority."), + .aiRating = 5, }, [ABILITY_EARTH_EATER] = { .name = _("Earth Eater"), .description = COMPOUND_STRING("Eats ground to heal HP."), + .aiRating = 7, }, [ABILITY_MYCELIUM_MIGHT] = @@ -1964,18 +2261,21 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("MceliumMight"), #endif .description = COMPOUND_STRING("Status moves never fail."), + .aiRating = 2, }, [ABILITY_HOSPITALITY] = { .name = _("Hospitality"), .description = COMPOUND_STRING("Restores ally's HP."), + .aiRating = 5, }, [ABILITY_MINDS_EYE] = { .name = _("Mind's Eye"), .description = COMPOUND_STRING("Keen Eye and Scrappy."), + .aiRating = 8, }, [ABILITY_EMBODY_ASPECT_TEAL] = @@ -1986,6 +2286,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("EmbodyAspect"), #endif .description = COMPOUND_STRING("Raises Speed."), + .aiRating = 6, }, [ABILITY_EMBODY_ASPECT_HEARTHFLAME] = @@ -1996,6 +2297,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("EmbodyAspect"), #endif .description = COMPOUND_STRING("Raises Attack."), + .aiRating = 6, }, [ABILITY_EMBODY_ASPECT_WELLSPRING] = @@ -2006,6 +2308,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("EmbodyAspect"), #endif .description = COMPOUND_STRING("Raises Sp. Def."), + .aiRating = 6, }, [ABILITY_EMBODY_ASPECT_CORNERSTONE] = @@ -2016,12 +2319,14 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("EmbodyAspect"), #endif .description = COMPOUND_STRING("Raises Defense."), + .aiRating = 6, }, [ABILITY_TOXIC_CHAIN] = { .name = _("Toxic Chain"), .description = COMPOUND_STRING("Moves can poison."), + .aiRating = 8, }, [ABILITY_SUPERSWEET_SYRUP] = @@ -2032,18 +2337,21 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("SuprswtSyrup"), #endif .description = COMPOUND_STRING("Lowers the foe's Speed."), + .aiRating = 5, }, [ABILITY_TERA_SHIFT] = { .name = _("Tera Shift"), .description = COMPOUND_STRING("Terasteralizes upon entry."), + .aiRating = 10, }, [ABILITY_TERA_SHELL] = { .name = _("Tera Shell"), .description = COMPOUND_STRING("Resistant to types at full HP."), + .aiRating = 10, }, [ABILITY_TERAFORM_ZERO] = @@ -2054,6 +2362,7 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("TeraformZero"), #endif .description = COMPOUND_STRING("Removes weather and terrain."), + .aiRating = 10, }, [ABILITY_POISON_PUPPETEER] = @@ -2064,5 +2373,6 @@ const struct Ability gAbilities[ABILITIES_COUNT] = .name = _("PoisnPuppter"), #endif .description = COMPOUND_STRING("Confuses poisoned foes."), + .aiRating = 8, }, }; From f31b4f3bab25220efbb5e88a3966d0d310dbe454 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sun, 31 Dec 2023 11:33:52 +0100 Subject: [PATCH 45/57] Turn nature names into compound strings (#3871) * Turn nature names into compound strings * Move nature names out of dedicated file --- src/data/text/nature_names.h | 54 ------------------------------------ src/pokemon.c | 29 +++++++++++++++++++ src/pokemon_summary_screen.c | 1 - 3 files changed, 29 insertions(+), 55 deletions(-) delete mode 100644 src/data/text/nature_names.h diff --git a/src/data/text/nature_names.h b/src/data/text/nature_names.h deleted file mode 100644 index 5cf2d8024c..0000000000 --- a/src/data/text/nature_names.h +++ /dev/null @@ -1,54 +0,0 @@ -static const u8 sHardyNatureName[] = _("Hardy"); -static const u8 sLonelyNatureName[] = _("Lonely"); -static const u8 sBraveNatureName[] = _("Brave"); -static const u8 sAdamantNatureName[] = _("Adamant"); -static const u8 sNaughtyNatureName[] = _("Naughty"); -static const u8 sBoldNatureName[] = _("Bold"); -static const u8 sDocileNatureName[] = _("Docile"); -static const u8 sRelaxedNatureName[] = _("Relaxed"); -static const u8 sImpishNatureName[] = _("Impish"); -static const u8 sLaxNatureName[] = _("Lax"); -static const u8 sTimidNatureName[] = _("Timid"); -static const u8 sHastyNatureName[] = _("Hasty"); -static const u8 sSeriousNatureName[] = _("Serious"); -static const u8 sJollyNatureName[] = _("Jolly"); -static const u8 sNaiveNatureName[] = _("Naive"); -static const u8 sModestNatureName[] = _("Modest"); -static const u8 sMildNatureName[] = _("Mild"); -static const u8 sQuietNatureName[] = _("Quiet"); -static const u8 sBashfulNatureName[] = _("Bashful"); -static const u8 sRashNatureName[] = _("Rash"); -static const u8 sCalmNatureName[] = _("Calm"); -static const u8 sGentleNatureName[] = _("Gentle"); -static const u8 sSassyNatureName[] = _("Sassy"); -static const u8 sCarefulNatureName[] = _("Careful"); -static const u8 sQuirkyNatureName[] = _("Quirky"); - -const u8 *const gNatureNamePointers[NUM_NATURES] = -{ - [NATURE_HARDY] = sHardyNatureName, - [NATURE_LONELY] = sLonelyNatureName, - [NATURE_BRAVE] = sBraveNatureName, - [NATURE_ADAMANT] = sAdamantNatureName, - [NATURE_NAUGHTY] = sNaughtyNatureName, - [NATURE_BOLD] = sBoldNatureName, - [NATURE_DOCILE] = sDocileNatureName, - [NATURE_RELAXED] = sRelaxedNatureName, - [NATURE_IMPISH] = sImpishNatureName, - [NATURE_LAX] = sLaxNatureName, - [NATURE_TIMID] = sTimidNatureName, - [NATURE_HASTY] = sHastyNatureName, - [NATURE_SERIOUS] = sSeriousNatureName, - [NATURE_JOLLY] = sJollyNatureName, - [NATURE_NAIVE] = sNaiveNatureName, - [NATURE_MODEST] = sModestNatureName, - [NATURE_MILD] = sMildNatureName, - [NATURE_QUIET] = sQuietNatureName, - [NATURE_BASHFUL] = sBashfulNatureName, - [NATURE_RASH] = sRashNatureName, - [NATURE_CALM] = sCalmNatureName, - [NATURE_GENTLE] = sGentleNatureName, - [NATURE_SASSY] = sSassyNatureName, - [NATURE_CAREFUL] = sCarefulNatureName, - [NATURE_QUIRKY] = sQuirkyNatureName, -}; diff --git a/src/pokemon.c b/src/pokemon.c index a2e357f134..96811a92dd 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -362,6 +362,35 @@ const struct SpindaSpot gSpindaSpotGraphics[] = #include "data/pokemon/item_effects.h" +const u8 *const gNatureNamePointers[NUM_NATURES] = +{ + [NATURE_HARDY] = COMPOUND_STRING("Hardy"), + [NATURE_LONELY] = COMPOUND_STRING("Lonely"), + [NATURE_BRAVE] = COMPOUND_STRING("Brave"), + [NATURE_ADAMANT] = COMPOUND_STRING("Adamant"), + [NATURE_NAUGHTY] = COMPOUND_STRING("Naughty"), + [NATURE_BOLD] = COMPOUND_STRING("Bold"), + [NATURE_DOCILE] = COMPOUND_STRING("Docile"), + [NATURE_RELAXED] = COMPOUND_STRING("Relaxed"), + [NATURE_IMPISH] = COMPOUND_STRING("Impish"), + [NATURE_LAX] = COMPOUND_STRING("Lax"), + [NATURE_TIMID] = COMPOUND_STRING("Timid"), + [NATURE_HASTY] = COMPOUND_STRING("Hasty"), + [NATURE_SERIOUS] = COMPOUND_STRING("Serious"), + [NATURE_JOLLY] = COMPOUND_STRING("Jolly"), + [NATURE_NAIVE] = COMPOUND_STRING("Naive"), + [NATURE_MODEST] = COMPOUND_STRING("Modest"), + [NATURE_MILD] = COMPOUND_STRING("Mild"), + [NATURE_QUIET] = COMPOUND_STRING("Quiet"), + [NATURE_BASHFUL] = COMPOUND_STRING("Bashful"), + [NATURE_RASH] = COMPOUND_STRING("Rash"), + [NATURE_CALM] = COMPOUND_STRING("Calm"), + [NATURE_GENTLE] = COMPOUND_STRING("Gentle"), + [NATURE_SASSY] = COMPOUND_STRING("Sassy"), + [NATURE_CAREFUL] = COMPOUND_STRING("Careful"), + [NATURE_QUIRKY] = COMPOUND_STRING("Quirky"), +}; + const s8 gNatureStatTable[NUM_NATURES][NUM_NATURE_STATS] = { // Attack Defense Speed Sp.Atk Sp. Def [NATURE_HARDY] = { 0, 0, 0, 0, 0 }, diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 8502996620..b6a64c0211 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -322,7 +322,6 @@ static void SummaryScreen_DestroyAnimDelayTask(void); // const rom data #include "data/text/move_descriptions.h" -#include "data/text/nature_names.h" static const struct BgTemplate sBgTemplates[] = { From f6f287d63724fb45b57e499184ded48cfe6e69fe Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Sun, 31 Dec 2023 18:38:50 -0600 Subject: [PATCH 46/57] Add Indigo Disk Pokemon data (#3878) * Archaludon? * more archuladon stuff * Hydrapple and Gouging Fire * Raging Bolt * Iron Boulder and Iron Crown * Terapagos * Pecharunt * Update gen_9.h * Pokedex orders --- include/config/species_enabled.h | 6 + include/constants/cries.h | 22 ++ include/constants/pokedex.h | 18 +- include/constants/species.h | 24 +- src/data/graphics/pokemon.h | 82 +++++ src/data/pokemon/form_change_tables.h | 9 + src/data/pokemon/form_species_tables.h | 9 + src/data/pokemon/item_effects.h | 1 + src/data/pokemon/level_up_learnsets.h | 171 ++++++++- src/data/pokemon/pokedex_orders.h | 33 ++ src/data/pokemon/species_info/gen_8.h | 98 +++++ src/data/pokemon/species_info/gen_9.h | 380 +++++++++++++++++++- src/data/pokemon/teachable_learnsets.h | 46 +++ src/data/pokemon_graphics/front_pic_anims.h | 55 +++ 14 files changed, 929 insertions(+), 25 deletions(-) diff --git a/include/config/species_enabled.h b/include/config/species_enabled.h index 8004abc3bb..9720f78f0e 100644 --- a/include/config/species_enabled.h +++ b/include/config/species_enabled.h @@ -594,5 +594,11 @@ #define P_FAMILY_MUNKIDORI P_GEN_9_POKEMON #define P_FAMILY_FEZANDIPITI P_GEN_9_POKEMON #define P_FAMILY_OGERPON P_GEN_9_POKEMON +#define P_FAMILY_GOUGING_FIRE P_GEN_9_POKEMON +#define P_FAMILY_RAGING_BOLT P_GEN_9_POKEMON +#define P_FAMILY_IRON_BOULDER P_GEN_9_POKEMON +#define P_FAMILY_IRON_CROWN P_GEN_9_POKEMON +#define P_FAMILY_TERAPAGOS P_GEN_9_POKEMON +#define P_FAMILY_PECHARUNT P_GEN_9_POKEMON #endif // GUARD_CONFIG_SPECIES_ENABLED_H diff --git a/include/constants/cries.h b/include/constants/cries.h index ddeee56d42..03aa9c558e 100644 --- a/include/constants/cries.h +++ b/include/constants/cries.h @@ -2025,6 +2025,7 @@ enum { CRY_APPLETUN, #if P_GEN_9_CROSS_EVOS CRY_DIPPLIN, + //CRY_HYDRAPPLE, #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_APPLIN #if P_FAMILY_SILICOBRA @@ -2112,6 +2113,9 @@ enum { #endif //P_FAMILY_ARCTOVISH #if P_FAMILY_DURALUDON CRY_DURALUDON, +#if P_GEN_9_CROSS_EVOS + //CRY_ARCHALUDON, +#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DURALUDON #if P_FAMILY_DREEPY CRY_DREEPY, @@ -2404,6 +2408,24 @@ enum { #if P_FAMILY_OGERPON CRY_OGERPON, #endif //P_FAMILY_OGERPON +#if P_FAMILY_GOUGING_FIRE + //CRY_GOUGING_FIRE, +#endif //P_FAMILY_GOUGING_FIRE +#if P_FAMILY_RAGING_BOLT + //CRY_RAGING_BOLT, +#endif //P_FAMILY_RAGING_BOLT +#if P_FAMILY_IRON_BOULDER + //CRY_IRON_BOULDER, +#endif //P_FAMILY_IRON_BOULDER +#if P_FAMILY_IRON_CROWN + //CRY_IRON_CROWN, +#endif //P_FAMILY_IRON_CROWN +#if P_FAMILY_TERAPAGOS + //CRY_TERAPAGOS, +#endif //P_FAMILY_TERAPAGOS +#if P_FAMILY_PECHARUNT + //CRY_PECHARUNT, +#endif //P_FAMILY_PECHARUNT CRY_COUNT, }; diff --git a/include/constants/pokedex.h b/include/constants/pokedex.h index 07e8c02fe2..c03b096f9a 100644 --- a/include/constants/pokedex.h +++ b/include/constants/pokedex.h @@ -1031,21 +1031,21 @@ enum { NATIONAL_DEX_MUNKIDORI, NATIONAL_DEX_FEZANDIPITI, NATIONAL_DEX_OGERPON, - NATIONAL_DEX_1018, - NATIONAL_DEX_1019, - NATIONAL_DEX_1020, - NATIONAL_DEX_1021, - NATIONAL_DEX_1022, - NATIONAL_DEX_1023, - NATIONAL_DEX_1024, - NATIONAL_DEX_1025, + NATIONAL_DEX_ARCHALUDON, + NATIONAL_DEX_HYDRAPPLE, + NATIONAL_DEX_GOUGING_FIRE, + NATIONAL_DEX_RAGING_BOLT, + NATIONAL_DEX_IRON_BOULDER, + NATIONAL_DEX_IRON_CROWN, + NATIONAL_DEX_TERAPAGOS, + NATIONAL_DEX_PECHARUNT, }; #define KANTO_DEX_COUNT NATIONAL_DEX_MEW #define JOHTO_DEX_COUNT NATIONAL_DEX_CELEBI #if P_GEN_9_POKEMON == TRUE - #define NATIONAL_DEX_COUNT NATIONAL_DEX_1025 + #define NATIONAL_DEX_COUNT NATIONAL_DEX_PECHARUNT #elif P_GEN_8_POKEMON == TRUE #define NATIONAL_DEX_COUNT NATIONAL_DEX_ENAMORUS #elif P_GEN_7_POKEMON == TRUE diff --git a/include/constants/species.h b/include/constants/species.h index bcac9ecbc8..4f0e86738d 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1658,19 +1658,19 @@ #define SPECIES_OGERPON_CORNERSTONE_MASK_TERA GEN9_START + 135 #define SPECIES_URSALUNA_BLOODMOON GEN9_START + 136 // Indigo Disk -#define SPECIES_1018 GEN9_START + 137 -#define SPECIES_1019 GEN9_START + 138 -#define SPECIES_1020 GEN9_START + 139 -#define SPECIES_1021 GEN9_START + 140 -#define SPECIES_1022 GEN9_START + 141 -#define SPECIES_1023 GEN9_START + 142 -#define SPECIES_1024 SPECIES_1024_FORM_1 -#define SPECIES_1024_FORM_1 GEN9_START + 143 -#define SPECIES_1024_FORM_2 GEN9_START + 144 -#define SPECIES_1024_FORM_3 GEN9_START + 145 -#define SPECIES_1025 GEN9_START + 146 +#define SPECIES_ARCHALUDON GEN9_START + 137 +#define SPECIES_HYDRAPPLE GEN9_START + 138 +#define SPECIES_GOUGING_FIRE GEN9_START + 139 +#define SPECIES_RAGING_BOLT GEN9_START + 140 +#define SPECIES_IRON_BOULDER GEN9_START + 141 +#define SPECIES_IRON_CROWN GEN9_START + 142 +#define SPECIES_TERAPAGOS SPECIES_TERAPAGOS_NORMAL +#define SPECIES_TERAPAGOS_NORMAL GEN9_START + 143 +#define SPECIES_TERAPAGOS_TERASTAL GEN9_START + 144 +#define SPECIES_TERAPAGOS_STELLAR GEN9_START + 145 +#define SPECIES_PECHARUNT GEN9_START + 146 -#define PLACEHOLDER_START SPECIES_1025 +#define PLACEHOLDER_START SPECIES_PECHARUNT // XD: Gale of Darkness #define SPECIES_LUGIA_SHADOW PLACEHOLDER_START + 1 // Diamond & Pearl diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 68dc952952..643f65e251 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -9269,6 +9269,13 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar const u32 gMonShinyPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/shiny.gbapal.lz"); const u8 gMonIcon_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/icon.4bpp"); // const u8 gMonFootprint_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/footprint.1bpp"); + + // 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 u8 gMonFootprint_Hydrapple[] = INCBIN_U8("graphics/pokemon/hydrapple/footprint.1bpp"); #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_APPLIN @@ -9767,6 +9774,15 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar 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"); #endif //P_GIGANTAMAX_FORMS + +#if P_GEN_9_CROSS_EVOS + // const u32 gMonFrontPic_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/front.4bpp.lz"); + // const u32 gMonPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/normal.gbapal.lz"); + // 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"); + // const u8 gMonFootprint_Archaludon[] = INCBIN_U8("graphics/pokemon/archaludon/footprint.1bpp"); +#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DURALUDON #if P_FAMILY_DREEPY @@ -10906,6 +10922,72 @@ const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mar // const u32 gMonShinyPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/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 u8 gMonFootprint_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/footprint.1bpp"); +#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 u8 gMonFootprint_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/footprint.1bpp"); +#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 u8 gMonFootprint_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/footprint.1bpp"); +#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 u8 gMonFootprint_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/footprint.1bpp"); +#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 u8 gMonFootprint_Terapagos[] = INCBIN_U8("graphics/pokemon/terapagos/footprint.1bpp"); + + // 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_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"); +#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 u8 gMonFootprint_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/footprint.1bpp"); +#endif //P_FAMILY_PECHARUNT + const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz"); const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz"); const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp"); diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h index 2411783728..62ba52dd02 100644 --- a/src/data/pokemon/form_change_tables.h +++ b/src/data/pokemon/form_change_tables.h @@ -1092,5 +1092,14 @@ static const struct FormChange sOgerponFormChangeTable[] = { }; #endif //P_FAMILY_OGERPON +#if P_FAMILY_TERAPAGOS +static const struct FormChange sTerapagosFormChangeTable[] = { + {FORM_CHANGE_BEGIN_BATTLE, SPECIES_TERAPAGOS_TERASTAL}, //needs to be tied to the ability + //{FORM_CHANGE_TERASTALLIZATION, SPECIES_TERAPAGOS_STELLAR}, + {FORM_CHANGE_END_BATTLE, SPECIES_TERAPAGOS_NORMAL}, + {FORM_CHANGE_TERMINATOR}, +}; +#endif //P_FAMILY_TERAPAGOS + #undef WHEN_LEARNED #undef WHEN_FORGOTTEN diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index b9d2631739..3fdd6dcbf5 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -1761,3 +1761,12 @@ static const u16 sOgerponFormSpeciesIdTable[] = { FORM_SPECIES_END, }; #endif //P_FAMILY_OGERPON + +#if P_FAMILY_TERAPAGOS +static const u16 sTerapagosFormSpeciesIdTable[] = { + SPECIES_TERAPAGOS_NORMAL, + SPECIES_TERAPAGOS_TERASTAL, + SPECIES_TERAPAGOS_STELLAR, + FORM_SPECIES_END, +}; +#endif //P_FAMILY_TERAPAGOS diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index e129d9505a..4273610b5e 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -629,6 +629,7 @@ const u8 *const gItemEffectTable[ITEMS_COUNT] = [ITEM_SYRUPY_APPLE] = gItemEffect_EvoItem, [ITEM_UNREMARKABLE_TEACUP] = gItemEffect_EvoItem, [ITEM_MASTERPIECE_TEACUP] = gItemEffect_EvoItem, + [ITEM_METAL_ALLOY] = gItemEffect_EvoItem, // Berries [ITEM_CHERI_BERRY] = gItemEffect_CheriBerry, diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index 3325cb2b8a..e41d0ca937 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -19855,6 +19855,26 @@ static const struct LevelUpMove sDipplinLevelUpLearnset[] = { LEVEL_UP_MOVE(44, MOVE_SUBSTITUTE), LEVEL_UP_END }; + +static const struct LevelUpMove sHydrappleLevelUpLearnset[] = { + LEVEL_UP_MOVE( 0, MOVE_FICKLE_BEAM), + LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), + LEVEL_UP_MOVE( 1, MOVE_SWEET_SCENT), + LEVEL_UP_MOVE( 1, MOVE_RECYCLE), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), + LEVEL_UP_MOVE( 4, MOVE_DRAGON_TAIL), + LEVEL_UP_MOVE( 8, MOVE_GROWTH), + LEVEL_UP_MOVE(12, MOVE_DRAGON_BREATH), + LEVEL_UP_MOVE(16, MOVE_PROTECT), + LEVEL_UP_MOVE(20, MOVE_BULLET_SEED), + LEVEL_UP_MOVE(28, MOVE_SYRUP_BOMB), + LEVEL_UP_MOVE(32, MOVE_DRAGON_PULSE), + LEVEL_UP_MOVE(36, MOVE_RECOVER), + LEVEL_UP_MOVE(40, MOVE_ENERGY_BALL), + LEVEL_UP_MOVE(44, MOVE_SUBSTITUTE), + LEVEL_UP_MOVE(54, MOVE_POWER_WHIP), + LEVEL_UP_END +}; #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_APPLIN @@ -20571,6 +20591,26 @@ static const struct LevelUpMove sDuraludonLevelUpLearnset[] = { LEVEL_UP_MOVE(66, MOVE_HYPER_BEAM), LEVEL_UP_END }; + +#if P_GEN_9_CROSS_EVOS +static const struct LevelUpMove sArchaludonLevelUpLearnset[] = { + LEVEL_UP_MOVE( 0, MOVE_ELECTRO_SHOT), + LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW), + LEVEL_UP_MOVE( 6, MOVE_ROCK_SMASH), + LEVEL_UP_MOVE(12, MOVE_HONE_CLAWS), + LEVEL_UP_MOVE(18, MOVE_METAL_SOUND), + LEVEL_UP_MOVE(24, MOVE_BREAKING_SWIPE), + LEVEL_UP_MOVE(30, MOVE_DRAGON_TAIL), + LEVEL_UP_MOVE(36, MOVE_IRON_DEFENSE), + LEVEL_UP_MOVE(42, MOVE_FOCUS_ENERGY), + LEVEL_UP_MOVE(48, MOVE_DRAGON_CLAW), + LEVEL_UP_MOVE(54, MOVE_FLASH_CANNON), + LEVEL_UP_MOVE(60, MOVE_METAL_BURST), + LEVEL_UP_MOVE(66, MOVE_HYPER_BEAM), + LEVEL_UP_END +}; +#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DURALUDON #if P_FAMILY_DREEPY @@ -23146,4 +23186,133 @@ static const struct LevelUpMove sOgerponLevelUpLearnset[] = { LEVEL_UP_MOVE(66, MOVE_WOOD_HAMMER), LEVEL_UP_END }; -#endif +#endif //P_FAMILY_OGERPON + +#if P_FAMILY_GOUGING_FIRE +static const struct LevelUpMove sGougingFireLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_STOMP), + LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_INCINERATE), + LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY), + LEVEL_UP_MOVE( 7, MOVE_FIRE_FANG), + LEVEL_UP_MOVE(14, MOVE_HOWL), + LEVEL_UP_MOVE(21, MOVE_BITE), + LEVEL_UP_MOVE(28, MOVE_DRAGON_CLAW), + LEVEL_UP_MOVE(35, MOVE_CRUSH_CLAW), + LEVEL_UP_MOVE(42, MOVE_MORNING_SUN), + LEVEL_UP_MOVE(49, MOVE_BURNING_BULWARK), + LEVEL_UP_MOVE(56, MOVE_DRAGON_RUSH), + LEVEL_UP_MOVE(63, MOVE_FIRE_BLAST), + LEVEL_UP_MOVE(70, MOVE_LAVA_PLUME), + LEVEL_UP_MOVE(77, MOVE_OUTRAGE), + LEVEL_UP_MOVE(84, MOVE_FLARE_BLITZ), + LEVEL_UP_MOVE(91, MOVE_RAGING_FURY), + LEVEL_UP_END +}; +#endif //P_FAMILY_GOUGING_FIRE + +#if P_FAMILY_RAGING_BOLT +static const struct LevelUpMove sRagingBoltLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TWISTER), + LEVEL_UP_MOVE( 1, MOVE_SUNNY_DAY), + LEVEL_UP_MOVE( 1, MOVE_SHOCK_WAVE), + LEVEL_UP_MOVE( 1, MOVE_STOMP), + LEVEL_UP_MOVE( 7, MOVE_CHARGE), + LEVEL_UP_MOVE(14, MOVE_DRAGON_BREATH), + LEVEL_UP_MOVE(21, MOVE_ELECTRIC_TERRAIN), + LEVEL_UP_MOVE(28, MOVE_DISCHARGE), + LEVEL_UP_MOVE(35, MOVE_DRAGON_TAIL), + LEVEL_UP_MOVE(42, MOVE_CALM_MIND), + LEVEL_UP_MOVE(49, MOVE_THUNDERCLAP), + LEVEL_UP_MOVE(56, MOVE_DRAGON_HAMMER), + LEVEL_UP_MOVE(63, MOVE_RISING_VOLTAGE), + LEVEL_UP_MOVE(70, MOVE_DRAGON_PULSE), + LEVEL_UP_MOVE(77, MOVE_ZAP_CANNON), + LEVEL_UP_MOVE(84, MOVE_BODY_PRESS), + LEVEL_UP_MOVE(91, MOVE_THUNDER), + LEVEL_UP_END +}; +#endif //P_FAMILY_RAGING_BOLT + +#if P_FAMILY_IRON_BOULDER +static const struct LevelUpMove sIronBoulderLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_HORN_ATTACK), + LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_ROCK_THROW), + LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN), + LEVEL_UP_MOVE( 7, MOVE_QUICK_ATTACK), + LEVEL_UP_MOVE(14, MOVE_SLASH), + LEVEL_UP_MOVE(21, MOVE_AGILITY), + LEVEL_UP_MOVE(28, MOVE_PSYCHO_CUT), + LEVEL_UP_MOVE(35, MOVE_COUNTER), + LEVEL_UP_MOVE(42, MOVE_ROCK_TOMB), + LEVEL_UP_MOVE(49, MOVE_SACRED_SWORD), + LEVEL_UP_MOVE(56, MOVE_MIGHTY_CLEAVE), + LEVEL_UP_MOVE(63, MOVE_SWORDS_DANCE), + LEVEL_UP_MOVE(70, MOVE_MEGAHORN), + LEVEL_UP_MOVE(77, MOVE_QUICK_GUARD), + LEVEL_UP_MOVE(84, MOVE_STONE_EDGE), + LEVEL_UP_MOVE(91, MOVE_GIGA_IMPACT), + LEVEL_UP_END +}; +#endif //P_FAMILY_IRON_BOULDER + +#if P_FAMILY_IRON_CROWN +static const struct LevelUpMove sIronCrownLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_ELECTRIC_TERRAIN), + LEVEL_UP_MOVE( 1, MOVE_CONFUSION), + LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW), + LEVEL_UP_MOVE( 7, MOVE_SMART_STRIKE), + LEVEL_UP_MOVE(14, MOVE_SLASH), + LEVEL_UP_MOVE(21, MOVE_IRON_DEFENSE), + LEVEL_UP_MOVE(28, MOVE_PSYSHOCK), + LEVEL_UP_MOVE(35, MOVE_PSYCHO_CUT), + LEVEL_UP_MOVE(42, MOVE_FLASH_CANNON), + LEVEL_UP_MOVE(49, MOVE_SACRED_SWORD), + LEVEL_UP_MOVE(56, MOVE_TACHYON_CUTTER), + LEVEL_UP_MOVE(63, MOVE_FUTURE_SIGHT), + LEVEL_UP_MOVE(70, MOVE_VOLT_SWITCH), + LEVEL_UP_MOVE(77, MOVE_QUICK_GUARD), + LEVEL_UP_MOVE(84, MOVE_METAL_BURST), + LEVEL_UP_MOVE(91, MOVE_HYPER_BEAM), + LEVEL_UP_END +}; +#endif //P_FAMILY_IRON_CROWN + +#if P_FAMILY_TERAPAGOS +static const struct LevelUpMove sTerapagosLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), + LEVEL_UP_MOVE( 1, MOVE_TRI_ATTACK), + LEVEL_UP_MOVE( 1, MOVE_RAPID_SPIN), + LEVEL_UP_MOVE(10, MOVE_ANCIENT_POWER), + LEVEL_UP_MOVE(20, MOVE_HEADBUTT), + LEVEL_UP_MOVE(30, MOVE_PROTECT), + LEVEL_UP_MOVE(40, MOVE_EARTH_POWER), + LEVEL_UP_MOVE(50, MOVE_HEAVY_SLAM), + LEVEL_UP_MOVE(60, MOVE_TERA_STARSTORM), + LEVEL_UP_MOVE(70, MOVE_DOUBLE_EDGE), + LEVEL_UP_MOVE(80, MOVE_ROCK_POLISH), + LEVEL_UP_MOVE(90, MOVE_GYRO_BALL), + LEVEL_UP_END +}; +#endif //P_FAMILY_TERAPAGOS + +#if P_FAMILY_PECHARUNT +static const struct LevelUpMove sPecharuntLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_SMOG), + LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), + LEVEL_UP_MOVE( 1, MOVE_MEMENTO), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), + LEVEL_UP_MOVE( 8, MOVE_WITHDRAW), + LEVEL_UP_MOVE(16, MOVE_DESTINY_BOND), + LEVEL_UP_MOVE(24, MOVE_FAKE_TEARS), + LEVEL_UP_MOVE(32, MOVE_PARTING_SHOT), + LEVEL_UP_MOVE(40, MOVE_SHADOW_BALL), + LEVEL_UP_MOVE(48, MOVE_MALIGNANT_CHAIN), + LEVEL_UP_MOVE(56, MOVE_TOXIC), + LEVEL_UP_MOVE(64, MOVE_NASTY_PLOT), + LEVEL_UP_MOVE(72, MOVE_RECOVER), + LEVEL_UP_END +}; +#endif //P_FAMILY_PECHARUNT diff --git a/src/data/pokemon/pokedex_orders.h b/src/data/pokemon/pokedex_orders.h index e877bbb17f..f7bd77cf12 100644 --- a/src/data/pokemon/pokedex_orders.h +++ b/src/data/pokemon/pokedex_orders.h @@ -26,6 +26,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_ARBOLIVA, NATIONAL_DEX_ARCANINE, NATIONAL_DEX_ARCEUS, + NATIONAL_DEX_ARCHALUDON, NATIONAL_DEX_ARCHEN, NATIONAL_DEX_ARCHEOPS, NATIONAL_DEX_ARCTIBAX, @@ -361,6 +362,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_GOTHITA, NATIONAL_DEX_GOTHITELLE, NATIONAL_DEX_GOTHORITA, + NATIONAL_DEX_GOUGING_FIRE, NATIONAL_DEX_GOURGEIST, NATIONAL_DEX_GRAFAIAI, NATIONAL_DEX_GRANBULL, @@ -416,6 +418,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_HOUNDOUR, NATIONAL_DEX_HOUNDSTONE, NATIONAL_DEX_HUNTAIL, + NATIONAL_DEX_HYDRAPPLE, NATIONAL_DEX_HYDREIGON, NATIONAL_DEX_HYPNO, @@ -427,7 +430,9 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_INFERNAPE, NATIONAL_DEX_INKAY, NATIONAL_DEX_INTELEON, + NATIONAL_DEX_IRON_BOULDER, NATIONAL_DEX_IRON_BUNDLE, + NATIONAL_DEX_IRON_CROWN, NATIONAL_DEX_IRON_HANDS, NATIONAL_DEX_IRON_JUGULIS, NATIONAL_DEX_IRON_LEAVES, @@ -658,6 +663,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_PAWMO, NATIONAL_DEX_PAWMOT, NATIONAL_DEX_PAWNIARD, + NATIONAL_DEX_PECHARUNT, NATIONAL_DEX_PELIPPER, NATIONAL_DEX_PERRSERKER, NATIONAL_DEX_PERSIAN, @@ -715,6 +721,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_RABOOT, NATIONAL_DEX_RABSCA, + NATIONAL_DEX_RAGING_BOLT, NATIONAL_DEX_RAICHU, NATIONAL_DEX_RAIKOU, NATIONAL_DEX_RALTS, @@ -906,6 +913,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_TENTACOOL, NATIONAL_DEX_TENTACRUEL, NATIONAL_DEX_TEPIG, + NATIONAL_DEX_TERAPAGOS, NATIONAL_DEX_TERRAKION, NATIONAL_DEX_THIEVUL, NATIONAL_DEX_THROH, @@ -1078,6 +1086,7 @@ const u16 gPokedexOrder_Weight[] = //NATIONAL_DEX_MINIOR_CORE_INDIGO, //NATIONAL_DEX_MINIOR_CORE_VIOLET, NATIONAL_DEX_MILCERY, + NATIONAL_DEX_PECHARUNT, // 0.9 lbs / 0.4 kg NATIONAL_DEX_POLTEAGEIST, NATIONAL_DEX_CURSOLA, @@ -1397,6 +1406,7 @@ const u16 gPokedexOrder_Weight[] = //NATIONAL_DEX_MELOETTA_PIROUETTE, NATIONAL_DEX_PAWMO, NATIONAL_DEX_SMOLIV, + NATIONAL_DEX_TERAPAGOS,//_NORMAL // 14.6 lbs / 6.6 kg NATIONAL_DEX_RALTS, NATIONAL_DEX_WHIMSICOTT, @@ -1662,6 +1672,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_CORVISQUIRE, NATIONAL_DEX_NACLI, NATIONAL_DEX_MASCHIFF, + //NATIONAL_DEX_TERAPAGOS_TERASTAL // 35.9 lbs / 16.3 kg NATIONAL_DEX_WHISMUR, NATIONAL_DEX_LILLIGANT, @@ -2281,6 +2292,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_LATIOS, //NATIONAL_DEX_GUMSHOOS_TOTEM_SIZED, NATIONAL_DEX_SANDY_SHOCKS, + NATIONAL_DEX_ARCHALUDON, // 132.7 lbs / 60.2 kg NATIONAL_DEX_FINIZEN, NATIONAL_DEX_PALAFIN,//_ZERO, @@ -2377,6 +2389,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_COFAGRIGUS, // 168.9 lbs / 76.6 kg NATIONAL_DEX_GOLDUCK, + //NATIONAL_DEX_TERAPAGOS_STELLAR // 170.6 lbs / 77.4 kg NATIONAL_DEX_CACTURNE, // 172.0 lbs / 78.0 kg @@ -2477,6 +2490,8 @@ const u16 gPokedexOrder_Weight[] = // 204.8 lbs / 92.9 kg NATIONAL_DEX_DARMANITAN,//_STANDARD_MODE, //NATIONAL_DEX_DARMANITAN_ZEN_MODE, + // 205.0 lbs / 93.0 kg + NATIONAL_DEX_HYDRAPPLE, // 208.6 lbs / 94.6 kg NATIONAL_DEX_BOUFFALANT, NATIONAL_DEX_SAMUROTT, @@ -2659,6 +2674,8 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_ARCANINE, // 342.8 lbs / 155.5 kg //NATIONAL_DEX_VENUSAUR_MEGA, + // 343.9 lbs / 156.0 kg + NATIONAL_DEX_IRON_CROWN, // 352.7 lbs / 160.0 kg NATIONAL_DEX_HYDREIGON, NATIONAL_DEX_FARIGIRAF, @@ -2666,6 +2683,8 @@ const u16 gPokedexOrder_Weight[] = //NATIONAL_DEX_SABLEYE_MEGA, // 357.1 lbs / 162.0 kg NATIONAL_DEX_MILOTIC, + // 358.2 lbs / 162.5 kg + NATIONAL_DEX_IRON_BOULDER, // 370.4 lbs / 168.0 kg //NATIONAL_DEX_ARCANINE_HISUIAN, NATIONAL_DEX_LUNATONE, @@ -2859,6 +2878,8 @@ const u16 gPokedexOrder_Weight[] = // 1014.1 lbs / 460.0 kg NATIONAL_DEX_SNORLAX, //NATIONAL_DEX_NECROZMA_DUSK_MANE, + // 1058.2 lbs / 480.0 kg + NATIONAL_DEX_RAGING_BOLT, // 1080.3 lbs / 490.0 kg //NATIONAL_DEX_HOOPA_UNBOUND, // 1113.3 lbs / 505.0 kg @@ -2867,6 +2888,8 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_STONJOURNER, // 1212.5 lbs / 550.0 kg NATIONAL_DEX_METAGROSS, + // 1300.7 lbs / 590.0 kg + NATIONAL_DEX_GOUGING_FIRE, // 1344.8 lbs / 610.0 kg //NATIONAL_DEX_ZYGARDE_COMPLETE, // 1433.8 lbs / 650.0 kg @@ -2965,6 +2988,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_RELLOR, NATIONAL_DEX_FLITTLE, NATIONAL_DEX_SINISTCHA, + NATIONAL_DEX_TERAPAGOS,//_NORMAL // 1'00" / 0.3m NATIONAL_DEX_CATERPIE, NATIONAL_DEX_WEEDLE, @@ -3129,6 +3153,8 @@ const u16 gPokedexOrder_Height[] = //NATIONAL_DEX_TATSUGIRI_DROOPY, //NATIONAL_DEX_TATSUGIRI_STRETCHY, NATIONAL_DEX_GIMMIGHOUL,//_CHEST, + //NATIONAL_DEX_TERAPAGOS_TERASTAL, + NATIONAL_DEX_PECHARUNT, // 0.4m NATIONAL_DEX_SPRIGATITO, NATIONAL_DEX_FUECOCO, @@ -3871,6 +3897,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_GLIMMORA, NATIONAL_DEX_WO_CHIEN, NATIONAL_DEX_IRON_LEAVES, + NATIONAL_DEX_IRON_BOULDER, // 5'03" / 1.6m NATIONAL_DEX_BLASTOISE, //NATIONAL_DEX_BLASTOISE_MEGA, @@ -3918,6 +3945,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_CYCLIZAR, NATIONAL_DEX_FLAMIGO, NATIONAL_DEX_IRON_THORNS, + NATIONAL_DEX_IRON_CROWN, // 5'07" / 1.7m NATIONAL_DEX_CHARIZARD, //NATIONAL_DEX_CHARIZARD_MEGA_X, @@ -3955,6 +3983,7 @@ const u16 gPokedexOrder_Height[] = //NATIONAL_DEX_GOURGEIST_SUPER, NATIONAL_DEX_VOLCANION, NATIONAL_DEX_CRABOMINABLE, + //NATIONAL_DEX_TERAPAGOS_STELLAR // 5'11" / 1.8m NATIONAL_DEX_DODRIO, NATIONAL_DEX_AERODACTYL, @@ -3993,6 +4022,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_CLODSIRE, NATIONAL_DEX_IRON_HANDS, NATIONAL_DEX_OKIDOGI, + NATIONAL_DEX_HYDRAPPLE, // 6'03" / 1.9m NATIONAL_DEX_ARCANINE, NATIONAL_DEX_RHYDON, @@ -4053,6 +4083,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_HOUNDSTONE, NATIONAL_DEX_KINGAMBIT, NATIONAL_DEX_ROARING_MOON, + NATIONAL_DEX_ARCHALUDON, // 6'11" / 2.1m //NATIONAL_DEX_AERODACTYL_MEGA, NATIONAL_DEX_SNORLAX, @@ -4198,6 +4229,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_GROUDON, NATIONAL_DEX_MIRAIDON, NATIONAL_DEX_WALKING_WAKE, + NATIONAL_DEX_GOUGING_FIRE, // 11'10" / 3.6m //NATIONAL_DEX_KYUREM_WHITE, NATIONAL_DEX_NAGANADEL, @@ -4229,6 +4261,7 @@ const u16 gPokedexOrder_Height[] = //NATIONAL_DEX_ZYGARDE_50_POWER_CONSTRUCT, // 17'01" / 5.2m NATIONAL_DEX_LUGIA, + NATIONAL_DEX_RAGING_BOLT, // 17'09" / 5.4m NATIONAL_DEX_DIALGA, // 18'01" / 5.5m diff --git a/src/data/pokemon/species_info/gen_8.h b/src/data/pokemon/species_info/gen_8.h index bcf77fcfa2..0bbd9b2f3a 100644 --- a/src/data/pokemon/species_info/gen_8.h +++ b/src/data/pokemon/species_info/gen_8.h @@ -1938,6 +1938,54 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = ICON(Dipplin, 1), //.footprint = gMonFootprint_Dipplin, LEARNSETS(Dipplin), + .evolutions = EVOLUTION({EVO_MOVE, MOVE_DRAGON_CHEER, SPECIES_HYDRAPPLE}), + }, + + [SPECIES_HYDRAPPLE] = + { + .baseHP = 106, + .baseAttack = 80, + .baseDefense = 110, + .baseSpeed = 44, + .baseSpAttack = 120, + .baseSpDefense = 80, + .types = { TYPE_GRASS, TYPE_DRAGON }, + .catchRate = 10, + .expYield = 170, //Currently unknown + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_ERRATIC, + .eggGroups = { EGG_GROUP_GRASS, EGG_GROUP_DRAGON }, + .abilities = { ABILITY_SUPERSWEET_SYRUP, ABILITY_REGENERATOR, ABILITY_STICKY_HOLD }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Hydrapple"), + //.cryId = CRY_HYDRAPPLE, + .natDexNum = NATIONAL_DEX_HYDRAPPLE, + .categoryName = _("Apple Hydra"), + .height = 18, + .weight = 930, + .description = COMPOUND_STRING( + "These capricious syrpents have\n" + "banded together. On the rare\n" + "occasion that their moods align,\n" + "their true power is unleashed."), + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + //FRONT_PIC(Hydrapple, 64, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Hydrapple, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //BACK_PIC(Hydrapple, 64, 64), + .backPicYOffset = 0, + //.backAnimId = BACK_ANIM_NONE, + //PALETTES(Hydrapple), + //ICON(Hydrapple, 0), + //.footprint = gMonFootprint_Hydrapple, + LEARNSETS(Hydrapple), }, #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_APPLIN @@ -4215,6 +4263,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(Duraludon), ICON(Duraludon, 0), + .evolutions = EVOLUTION({EVO_ITEM, ITEM_METAL_ALLOY, SPECIES_ARCHALUDON}), }, #if P_GIGANTAMAX_FORMS @@ -4244,6 +4293,55 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS + +#if P_GEN_9_CROSS_EVOS + [SPECIES_ARCHALUDON] = + { + .baseHP = 90, + .baseAttack = 105, + .baseDefense = 130, + .baseSpeed = 85, + .baseSpAttack = 125, + .baseSpDefense = 65, + .types = { TYPE_STEEL, TYPE_DRAGON }, + .catchRate = 10, + .expYield = 187, //Currently unknown + .evYield_Defense = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 30, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = { EGG_GROUP_MINERAL, EGG_GROUP_DRAGON }, + .abilities = { ABILITY_STAMINA, ABILITY_STURDY, ABILITY_STALWART }, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Archaludon"), + //.cryId = CRY_ARCHALUDON, + .natDexNum = NATIONAL_DEX_ARCHALUDON, + .categoryName = _("Alloy"), + .height = 20, + .weight = 600, + .description = COMPOUND_STRING( + "It gathers static electricity\n" + "from its surroundings. The beams\n" + "it launches when down on all fours\n" + "are tremendously powerful."), + .pokemonScale = 267, + .pokemonOffset = 2, + .trainerScale = 286, + .trainerOffset = 1, + //FRONT_PIC(Archaludon, 64, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Archaludon, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //BACK_PIC(Archaludon, 64, 64), + .backPicYOffset = 0, + //.backAnimId = BACK_ANIM_NONE, + //PALETTES(Archaludon), + //ICON(Archaludon, 0), + //.footprint = gMonFootprint_Archaludon, + LEARNSETS(Archaludon), + }, +#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DURALUDON #if P_FAMILY_DREEPY diff --git a/src/data/pokemon/species_info/gen_9.h b/src/data/pokemon/species_info/gen_9.h index 2f5f0ad76a..70e55ae320 100644 --- a/src/data/pokemon/species_info/gen_9.h +++ b/src/data/pokemon/species_info/gen_9.h @@ -5026,7 +5026,9 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .height = 35, .weight = 2800, .description = COMPOUND_STRING( - "Ecology under research."), + "This ferocious creature is shrouded in\n" + "mystery. It's named after an aquatic\n" + "monster mentioned in an old journal."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, @@ -5073,7 +5075,9 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .height = 15, .weight = 1250, .description = COMPOUND_STRING( - "Ecology under analysis."), + "According to the few eyewitness accounts\n" + "that exist, it used its shining blades\n" + "to julienne large trees and boulders."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, @@ -5428,6 +5432,376 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #endif //P_FAMILY_OGERPON +#if P_FAMILY_GOUGING_FIRE + [SPECIES_GOUGING_FIRE] = + { + .baseHP = 105, + .baseAttack = 115, + .baseDefense = 121, + .baseSpeed = 91, + .baseSpAttack = 65, + .baseSpDefense = 93, + .types = { TYPE_FIRE, TYPE_DRAGON }, + .catchRate = 10, + .expYield = 261, //Currently unknown + .evYield_Defense = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 50, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED }, + .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BROWN, + .isParadoxForm = TRUE, + .speciesName = _("GouginFire"), + //.cryId = CRY_GOUGING_FIRE, + .natDexNum = NATIONAL_DEX_GOUGING_FIRE, + .categoryName = _("Paradox"), + .height = 35, + .weight = 5900, + .description = COMPOUND_STRING( + "There are scant few reports of\n" + "this creature being sighted.\n" + "One short video shows it rampaging,\n" + "and spouting pillars of flame."), + .pokemonScale = 259, + .pokemonOffset = 0, + .trainerScale = 345, + .trainerOffset = 7, + //FRONT_PIC(GougingFire, 64, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_GougingFire, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //BACK_PIC(GougingFire, 64, 64), + .backPicYOffset = 0, + //.backAnimId = BACK_ANIM_NONE, + //PALETTES(GougingFire), + //ICON(GougingFire, 0), + //.footprint = gMonFootprint_GougingFire, + LEARNSETS(GougingFire), + }, +#endif //P_FAMILY_GOUGING_FIRE + +#if P_FAMILY_RAGING_BOLT + [SPECIES_RAGING_BOLT] = + { + .baseHP = 125, + .baseAttack = 73, + .baseDefense = 91, + .baseSpeed = 75, + .baseSpAttack = 137, + .baseSpDefense = 89, + .types = { TYPE_ELECTRIC, TYPE_DRAGON }, + .catchRate = 10, + .expYield = 261, //Currently unknown + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 50, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED }, + .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE }, + .bodyColor = BODY_COLOR_YELLOW, + .isParadoxForm = TRUE, + .speciesName = _("RagingBolt"), + //.cryId = CRY_RAGING_BOLT, + .natDexNum = NATIONAL_DEX_RAGING_BOLT, + .categoryName = _("Paradox"), + .height = 52, + .weight = 4800, + .description = COMPOUND_STRING( + "It bears resemblance to a Pokémon\n" + "that became a hot topic for a short\n" + "while after a paranomal magazine\n" + "touted it as Raikou's ancestor."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 345, + .trainerOffset = 7, + //FRONT_PIC(RagingBolt, 64, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_RagingBolt, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //BACK_PIC(RagingBolt, 64, 64), + .backPicYOffset = 0, + //.backAnimId = BACK_ANIM_NONE, + //PALETTES(RagingBolt), + //ICON(RagingBolt, 0), + //.footprint = gMonFootprint_RagingBolt, + LEARNSETS(RagingBolt), + }, +#endif //P_FAMILY_RAGING_BOLT + +#if P_FAMILY_IRON_BOULDER + [SPECIES_IRON_BOULDER] = + { + .baseHP = 90, + .baseAttack = 120, + .baseDefense = 80, + .baseSpeed = 124, + .baseSpAttack = 68, + .baseSpDefense = 108, + .types = { TYPE_ROCK, TYPE_PSYCHIC }, + .catchRate = 10, + .expYield = 261, //Currently unknown + .evYield_Speed = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 50, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED }, + .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, + .isParadoxForm = TRUE, + .speciesName = _("IronBouldr"), + //.cryId = CRY_IRON_BOULDER, + .natDexNum = NATIONAL_DEX_IRON_BOULDER, + .categoryName = _("Paradox"), + .height = 15, + .weight = 1625, + .description = COMPOUND_STRING( + "It was named after a mysterious\n" + "object recorded in an old book.\n" + "Its body seems to be metallic."), + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 336, + .trainerOffset = 4, + //FRONT_PIC(IronBoulder, 64, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_IronBoulder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //BACK_PIC(IronBoulder, 64, 64), + .backPicYOffset = 0, + //.backAnimId = BACK_ANIM_NONE, + //PALETTES(IronBoulder), + //ICON(IronBoulder, 0), + //.footprint = gMonFootprint_IronBoulder, + LEARNSETS(IronBoulder), + }, +#endif //P_FAMILY_IRON_BOULDER + +#if P_FAMILY_IRON_CROWN + [SPECIES_IRON_CROWN] = + { + .baseHP = 90, + .baseAttack = 72, + .baseDefense = 100, + .baseSpeed = 98, + .baseSpAttack = 122, + .baseSpDefense = 108, + .types = { TYPE_STEEL, TYPE_PSYCHIC }, + .catchRate = 10, + .expYield = 261, //Currently unknown + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 50, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED }, + .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, + .isParadoxForm = TRUE, + .speciesName = _("Iron Crown"), + //.cryId = CRY_IRON_CROWN, + .natDexNum = NATIONAL_DEX_IRON_CROWN, + .categoryName = _("Paradox"), + .height = 16, + .weight = 1560, + .description = COMPOUND_STRING( + "It resembles a mysterious object\n" + "introduced in a paranormal magazine\n" + "as a cutting-edge weapon\n" + "shaped like Cobalion."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 365, + .trainerOffset = 7, + //FRONT_PIC(IronCrown, 64, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_IronCrown, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //BACK_PIC(IronCrown, 64, 64), + .backPicYOffset = 0, + //.backAnimId = BACK_ANIM_NONE, + //PALETTES(IronCrown), + //ICON(IronCrown, 0), + //.footprint = gMonFootprint_IronCrown, + LEARNSETS(IronCrown), + }, +#endif //P_FAMILY_IRON_CROWN + +#if P_FAMILY_TERAPAGOS +#define TERAPAGOS_MISC_INFO \ + .types = { TYPE_NORMAL, TYPE_NORMAL }, \ + .catchRate = 255, \ + .expYield = 275, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED }, \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Terapagos"), \ + .natDexNum = NATIONAL_DEX_TERAPAGOS, \ + .categoryName = _("Tera"), \ + LEARNSETS(Terapagos), \ + .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, \ + .formChangeTable = sTerapagosFormChangeTable, \ + .isLegendary = TRUE + //.cryId = CRY_TERAPAGOS, + //.footprint = gMonFootprint_Terapagos, + + [SPECIES_TERAPAGOS_NORMAL] = + { + TERAPAGOS_MISC_INFO, + .baseHP = 90, + .baseAttack = 65, + .baseDefense = 85, + .baseSpeed = 60, + .baseSpAttack = 65, + .baseSpDefense = 85, + .evYield_Defense = 1, + .abilities = { ABILITY_TERA_SHIFT, ABILITY_NONE }, + .height = 2, + .weight = 65, + .description = COMPOUND_STRING( + "Terapagos protects itself using its\n" + "power to transform energy into hard\n" + "crystals. This Pokémon is the source\n" + "of the Terastal phenomenon."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 365, + .trainerOffset = 7, + //FRONT_PIC(TerapagosNormal, 64, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_TerapagosNormal, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //BACK_PIC(TerapagosNormal, 64, 64), + .backPicYOffset = 0, + //.backAnimId = BACK_ANIM_NONE, + //PALETTES(TerapagosNormal), + //ICON(TerapagosNormal, 0), + }, + + [SPECIES_TERAPAGOS_TERASTAL] = + { + TERAPAGOS_MISC_INFO, + .baseHP = 95, + .baseAttack = 95, + .baseDefense = 110, + .baseSpeed = 85, + .baseSpAttack = 105, + .baseSpDefense = 110, + .evYield_Defense = 2, + .abilities = { ABILITY_TERA_SHELL, ABILITY_NONE }, + .height = 3, + .weight = 160, + .description = COMPOUND_STRING( + "The shell is made of crystallized\n" + "Terastal energy. When struck by a move,\n" + "this shell absorbs the move's energy\n" + "and transfers it to Terapagos."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 365, + .trainerOffset = 7, + //FRONT_PIC(TerapagosTerastal, 64, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_TerapagosTerastal, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //BACK_PIC(TerapagosTerastal, 64, 64), + .backPicYOffset = 0, + //.backAnimId = BACK_ANIM_NONE, + //PALETTES(TerapagosTerastal), + //ICON(TerapagosTerastal, 0), + }, + + [SPECIES_TERAPAGOS_STELLAR] = + { + TERAPAGOS_MISC_INFO, + .baseHP = 160, + .baseAttack = 105, + .baseDefense = 110, + .baseSpeed = 85, + .baseSpAttack = 130, + .baseSpDefense = 110, + .evYield_HP = 3, + .abilities = { ABILITY_TERAFORM_ZERO, ABILITY_NONE }, + .height = 17, + .weight = 770, + .description = COMPOUND_STRING( + "An old expedition journal describes the\n" + "sight of this Pokémon buried in the,\n" + "depths of the earth as resembling a\n" + "planet floating in space."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 365, + .trainerOffset = 7, + //FRONT_PIC(TerapagosStellar, 64, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_TerapagosStellar, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //BACK_PIC(TerapagosStellar, 64, 64), + .backPicYOffset = 0, + //.backAnimId = BACK_ANIM_NONE, + //PALETTES(TerapagosStellar), + //ICON(TerapagosStellar, 0), + }, +#endif //P_FAMILY_TERAPAGOS + +#if P_FAMILY_PECHARUNT + [SPECIES_PECHARUNT] = + { + .baseHP = 88, + .baseAttack = 88, + .baseDefense = 160, + .baseSpeed = 88, + .baseSpAttack = 88, + .baseSpDefense = 88, + .types = { TYPE_POISON, TYPE_GHOST }, + .catchRate = 3, + .expYield = 261, //Currently unknown + .evYield_Defense = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 50, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED }, + .abilities = { ABILITY_POISON_PUPPETEER, ABILITY_NONE }, + .bodyColor = BODY_COLOR_PURPLE, + .isMythical = TRUE, + .speciesName = _("Pecharunt"), + //.cryId = CRY_PECHARUNT, + .natDexNum = NATIONAL_DEX_PECHARUNT, + .categoryName = _("Subjugation"), + .height = 3, + .weight = 3, + .description = COMPOUND_STRING( + "It feeds others toxic mochi that\n" + "draw out desires and capabilities.\n" + "Those who eat the mochi fall under\n" + "Pecharunt's control, chained to its will."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 365, + .trainerOffset = 7, + //FRONT_PIC(Pecharunt, 64, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Pecharunt, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //BACK_PIC(Pecharunt, 64, 64), + .backPicYOffset = 0, + //.backAnimId = BACK_ANIM_NONE, + //PALETTES(Pecharunt), + //ICON(Pecharunt, 0), + //.footprint = gMonFootprint_Pecharunt, + LEARNSETS(Pecharunt), + }, +#endif //P_FAMILY_PECHARUNT + #ifdef __INTELLISENSE__ }; -#endif \ No newline at end of file +#endif diff --git a/src/data/pokemon/teachable_learnsets.h b/src/data/pokemon/teachable_learnsets.h index f274363f61..b8f2a39e30 100644 --- a/src/data/pokemon/teachable_learnsets.h +++ b/src/data/pokemon/teachable_learnsets.h @@ -33821,6 +33821,10 @@ static const u16 sAppletunTeachableLearnset[] = { static const u16 sDipplinTeachableLearnset[] = { MOVE_UNAVAILABLE, }; + +static const u16 sHydrappleTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_APPLIN @@ -34654,6 +34658,12 @@ static const u16 sDuraludonTeachableLearnset[] = { MOVE_THUNDER_WAVE, MOVE_UNAVAILABLE, }; + +#if P_GEN_9_CROSS_EVOS +static const u16 sArchaludonTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; +#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DURALUDON #if P_FAMILY_DREEPY @@ -39114,3 +39124,39 @@ static const u16 sOgerponTeachableLearnset[] = { MOVE_UNAVAILABLE, }; #endif //P_FAMILY_OGERPON + +#if P_FAMILY_GOUGING_FIRE +static const u16 sGougingFireTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; +#endif //P_FAMILY_GOUGING_FIRE + +#if P_FAMILY_RAGING_BOLT +static const u16 sRagingBoltTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; +#endif //P_FAMILY_RAGING_BOLT + +#if P_FAMILY_IRON_BOULDER +static const u16 sIronBoulderTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; +#endif //P_FAMILY_IRON_BOULDER + +#if P_FAMILY_IRON_CROWN +static const u16 sIronCrownTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; +#endif //P_FAMILY_IRON_CROWN + +#if P_FAMILY_TERAPAGOS +static const u16 sTerapagosTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; +#endif //P_FAMILY_TERAPAGOS + +#if P_FAMILY_PECHARUNT +static const u16 sPecharuntTeachableLearnset[] = { + MOVE_UNAVAILABLE, +}; +#endif //P_FAMILY_PECHARUNT diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 75cb52732c..77a3ef8d69 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -9567,6 +9567,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(AppletunGigantamax); #if P_GEN_9_CROSS_EVOS PLACEHOLDER_ANIM_SINGLE_FRAME(Dipplin); +PLACEHOLDER_ANIM_SINGLE_FRAME(Hydrapple); #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_APPLIN @@ -9718,6 +9719,10 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Duraludon); #if P_GIGANTAMAX_FORMS PLACEHOLDER_ANIM_SINGLE_FRAME(DuraludonGigantamax); #endif //P_GIGANTAMAX_FORMS + +#if P_GEN_9_CROSS_EVOS +PLACEHOLDER_ANIM_SINGLE_FRAME(Archaludon); +#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DURALUDON #if P_FAMILY_DREEPY @@ -10084,6 +10089,32 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Fezandipiti); PLACEHOLDER_ANIM_SINGLE_FRAME(Ogerpon); #endif //P_FAMILY_OGERPON +#if P_FAMILY_GOUGING_FIRE +PLACEHOLDER_ANIM_SINGLE_FRAME(GougingFire); +#endif //P_FAMILY_GOUGING_FIRE + +#if P_FAMILY_RAGING_BOLT +PLACEHOLDER_ANIM_SINGLE_FRAME(RagingBolt); +#endif //P_FAMILY_RAGING_BOLT + +#if P_FAMILY_IRON_BOULDER +PLACEHOLDER_ANIM_SINGLE_FRAME(IronBoulder); +#endif //P_FAMILY_IRON_BOULDER + +#if P_FAMILY_IRON_CROWN +PLACEHOLDER_ANIM_SINGLE_FRAME(IronCrown); +#endif //P_FAMILY_IRON_CROWN + +#if P_FAMILY_TERAPAGOS +PLACEHOLDER_ANIM_SINGLE_FRAME(TerapagosNormal); +PLACEHOLDER_ANIM_SINGLE_FRAME(TerapagosTerastal); +PLACEHOLDER_ANIM_SINGLE_FRAME(TerapagosStellar); +#endif //P_FAMILY_TERAPAGOS + +#if P_FAMILY_PECHARUNT +PLACEHOLDER_ANIM_SINGLE_FRAME(Pecharunt); +#endif //P_FAMILY_PECHARUNT + static const union AnimCmd sAnim_Egg_1[] = { ANIMCMD_FRAME(0, 6), @@ -12341,6 +12372,7 @@ SINGLE_ANIMATION(AppletunGigantamax); #endif //P_GIGANTAMAX_FORMS #if P_GEN_9_CROSS_EVOS SINGLE_ANIMATION(Dipplin); +SINGLE_ANIMATION(Hydrapple); #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_APPLIN #if P_FAMILY_SILICOBRA @@ -12448,6 +12480,9 @@ SINGLE_ANIMATION(Duraludon); #if P_GIGANTAMAX_FORMS SINGLE_ANIMATION(DuraludonGigantamax); #endif //P_GIGANTAMAX_FORMS +#if P_GEN_9_CROSS_EVOS +SINGLE_ANIMATION(Archaludon); +#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DURALUDON #if P_FAMILY_DREEPY SINGLE_ANIMATION(Dreepy); @@ -12731,4 +12766,24 @@ SINGLE_ANIMATION(Fezandipiti); #if P_FAMILY_OGERPON SINGLE_ANIMATION(Ogerpon); #endif //P_FAMILY_OGERPON +#if P_FAMILY_GOUGING_FIRE +SINGLE_ANIMATION(GougingFire); +#endif //P_FAMILY_GOUGING_FIRE +#if P_FAMILY_RAGING_BOLT +SINGLE_ANIMATION(RagingBolt); +#endif //P_FAMILY_RAGING_BOLT +#if P_FAMILY_IRON_BOULDER +SINGLE_ANIMATION(IronBoulder); +#endif //P_FAMILY_IRON_BOULDER +#if P_FAMILY_IRON_CROWN +SINGLE_ANIMATION(IronCrown); +#endif //P_FAMILY_IRON_CROWN +#if P_FAMILY_TERAPAGOS +SINGLE_ANIMATION(TerapagosNormal); +SINGLE_ANIMATION(TerapagosTerastal); +SINGLE_ANIMATION(TerapagosStellar); +#endif //P_FAMILY_TERAPAGOS +#if P_FAMILY_PECHARUNT +SINGLE_ANIMATION(Pecharunt); +#endif //P_FAMILY_PECHARUNT SINGLE_ANIMATION(Egg); From ab75ad6d0289fe6f4e7eb30e3ef36d9136b5e9b5 Mon Sep 17 00:00:00 2001 From: Nephrite Date: Mon, 1 Jan 2024 14:03:34 +0000 Subject: [PATCH 47/57] 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 48/57] 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 3c21e23555195f5f8643eb95578aae30c885a06f Mon Sep 17 00:00:00 2001 From: aronson Date: Tue, 2 Jan 2024 08:24:52 -0600 Subject: [PATCH 49/57] 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 50/57] 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 e7fac028b15d551634a6dd2e1ac67f67dbee8a9f Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Wed, 3 Jan 2024 17:48:09 +0100 Subject: [PATCH 51/57] 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 f94e65a40058fb2c93da8090147e56074af0b081 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Wed, 3 Jan 2024 20:24:45 +0000 Subject: [PATCH 52/57] 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 53/57] =?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 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 54/57] 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 55/57] 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 56/57] 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 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 57/57] 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); }