atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed SPECIES_NONE's overworld data not compiling when ObjectEventGraphicsInfo gets new fields (#4937)

Browse source
This commit is contained in:
Eduardo Quezada 2024-07-09 19:22:25 -04:00 committed by GitHub
parent e1d8ef8190
commit b5160b7ec8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/data/pokemon/species_info.h
View file

@ -96,7 +96,24 @@ const struct SpeciesInfo gSpeciesInfo[] =
.iconPalIndex = 0, .iconPalIndex = 0,
FOOTPRINT(QuestionMark) FOOTPRINT(QuestionMark)
#if OW_POKEMON_OBJECT_EVENTS #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 #endif
.levelUpLearnset = sNoneLevelUpLearnset, .levelUpLearnset = sNoneLevelUpLearnset,
.teachableLearnset = sNoneTeachableLearnset, .teachableLearnset = sNoneTeachableLearnset,