From b5160b7ec889eb35c2ffc2519afa3028efdce1f1 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 9 Jul 2024 19:22:25 -0400 Subject: [PATCH] Fixed SPECIES_NONE's overworld data not compiling when ObjectEventGraphicsInfo gets new fields (#4937) --- src/data/pokemon/species_info.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 9427ad2bc6..4f21223eee 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -96,7 +96,24 @@ const struct SpeciesInfo gSpeciesInfo[] = .iconPalIndex = 0, FOOTPRINT(QuestionMark) #if OW_POKEMON_OBJECT_EVENTS - .overworldData = {TAG_NONE, OBJ_EVENT_PAL_TAG_SUBSTITUTE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, COMP, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Substitute, gDummySpriteAffineAnimTable}, + .overworldData = { + .tileTag = TAG_NONE, + .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, + .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, + .size = 512, + .width = 32, + .height = 32, + .paletteSlot = PALSLOT_NPC_1, + .shadowSize = SHADOW_SIZE_M, + .inanimate = FALSE, + .compressed = COMP, + .tracks = TRACKS_FOOT, + .oam = &gObjectEventBaseOam_32x32, + .subspriteTables = sOamTables_32x32, + .anims = sAnimTable_Following, + .images = sPicTable_Substitute, + .affineAnims = gDummySpriteAffineAnimTable, + }, #endif .levelUpLearnset = sNoneLevelUpLearnset, .teachableLearnset = sNoneTeachableLearnset,