diff --git a/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp b/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp index 454c8745..99149e65 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp @@ -58,8 +58,8 @@ using Palette = PaletteV3; struct CompactPaletteV1 { - static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.Palette"; - static constexpr auto TypeVersion = 2; + static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.CompactPalette"; + static constexpr auto TypeVersion = 1; static constexpr auto Preloadable = true; ox::Vector> pages{}; }; diff --git a/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp b/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp index 5aa926b5..1eaa080c 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp @@ -293,7 +293,7 @@ ox::Vector pixels(TileSheet &ts) noexcept; using TileSheetV4 = TileSheet; -struct CompactTileSheet { +struct CompactTileSheetV1 { static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.CompactTileSheet"; static constexpr auto TypeVersion = 1; int8_t bpp = 0; @@ -301,6 +301,8 @@ struct CompactTileSheet { ox::Vector pixels = {}; }; +using CompactTileSheet = CompactTileSheetV1; + oxModelBegin(TileSheetV1) oxModelField(bpp) oxModelField(rows) @@ -355,7 +357,7 @@ oxModelBegin(TileSheetV4) oxModelField(subsheet) oxModelEnd() -oxModelBegin(CompactTileSheet) +oxModelBegin(CompactTileSheetV1) oxModelField(bpp) oxModelField(defaultPalette) oxModelField(pixels) diff --git a/src/nostalgia/modules/core/src/keel/keelmodule.cpp b/src/nostalgia/modules/core/src/keel/keelmodule.cpp index ff457c4c..bc702029 100644 --- a/src/nostalgia/modules/core/src/keel/keelmodule.cpp +++ b/src/nostalgia/modules/core/src/keel/keelmodule.cpp @@ -38,9 +38,10 @@ static class: public keel::Module { keel::generateTypeDesc, keel::generateTypeDesc, keel::generateTypeDesc, - keel::generateTypeDesc, + keel::generateTypeDesc, keel::generateTypeDesc, keel::generateTypeDesc, + keel::generateTypeDesc, }; }