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

[nostalgia/core/gba] Cleanup

Browse Source
This commit is contained in:
Gary Talent 2020-06-29 11:38:56 -05:00
parent 6d2d8d77a9
commit 5142b20036
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nostalgia/core/gba/gfx.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2016 - 2019 gtalent2@gmail.com * Copyright 2016 - 2020 gtalent2@gmail.com
* *
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
@ -17,12 +17,11 @@
namespace nostalgia::core { namespace nostalgia::core {
extern char charMap[128];
#define TILE_ADDR reinterpret_cast<uint16_t*>(0x06000000)
constexpr auto GBA_TILE_COLUMNS = 32; constexpr auto GBA_TILE_COLUMNS = 32;
constexpr auto GBA_TILE_ROWS = 32;
using SpriteAttr = uint16_t[4];
SpriteAttr spriteBuffer[128];
struct GbaPaletteTarget { struct GbaPaletteTarget {
static constexpr auto TypeName = NostalgiaPalette::TypeName; static constexpr auto TypeName = NostalgiaPalette::TypeName;
@ -142,7 +141,7 @@ ox::Error loadTileSheet(Context *ctx,
GbaTileMapTarget target; GbaTileMapTarget target;
target.pal.palette = &MEM_PALETTE_BG[section]; target.pal.palette = &MEM_PALETTE_BG[section];
target.bgCtl = &bgCtl(section); target.bgCtl = &bgCtl(section);
target.tileMap = &TILE_ADDR[section * 512]; target.tileMap = &ox::bit_cast<uint16_t*>(MEM_BG_MAP)[section * 512];
oxReturnError(ox::readMC(ts, tsStat.size, &target)); oxReturnError(ox::readMC(ts, tsStat.size, &target));
// load external palette if available // load external palette if available
if (paletteAddr) { if (paletteAddr) {