drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

Squashed 'deps/nostalgia/' changes from 050339ba..e7a66390

Browse Source 
e7a66390 [nostalgia/core/opengl] Fix duplicate and missing symbol
ffdc0ddb [nostalgia/core] Add support for specifying palette banks
e941781f [ox/std] Cleanup Result::copyTo variants
b869f490 [ox/std] Add or_value to Optional, Result
caf8d93c [nostalgia] Delete .gitlab-ci.yml
afbf2caf [nostalgia] Remove conan from devenv
20914eaa [nostalgia] Add Gitea action file
c5f76ff5 [nostalgia/core] Add setBgBpp function

git-subtree-dir: deps/nostalgia
git-subtree-split: e7a663901a4db72b647263c9de2ec4a45dd2e5e5
This commit is contained in:
Gary Talent
2023-12-26 12:15:45 -06:00
parent b7278c3d04
commit cf0d078a1e
13 changed files with 168 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nostalgia/player/app.cpp
View File

@@ -96,14 +96,16 @@ static ox::Error runTileSheetSetTest(turbine::Context &tctx) {
{ .tilesheet = ox::StringLiteral("/TileSheets/AB.ng"), .sections{{.begin = 1, .tiles = 1}} },
},
};
constexpr auto bgPalBank = 1;
oxReturnError(core::loadBgTileSheet(*cctx, 0, set));
oxReturnError(core::loadSpriteTileSheet(*cctx, set));
oxReturnError(core::loadBgPalette(*cctx, PaletteAddr));
oxReturnError(core::loadBgPalette(*cctx, bgPalBank, PaletteAddr));
oxReturnError(core::loadBgPalette(*cctx, 0, ox::StringLiteral("/Palettes/Chester.npal")));
oxReturnError(core::loadSpritePalette(*cctx, PaletteAddr));
core::setBgStatus(*cctx, 0, true);
core::setBgTile(*cctx, 0, 10, 9, 1);
core::setBgTile(*cctx, 0, 11, 9, 2);
core::setBgTile(*cctx, 0, 13, 9, 4);
core::setBgTile(*cctx, 0, 10, 9, 1, bgPalBank);
core::setBgTile(*cctx, 0, 11, 9, 2, bgPalBank);
core::setBgTile(*cctx, 0, 13, 9, 4, bgPalBank);
core::setSprite(*cctx, 16, {
.enabled = true,
.x = 12 * 8,