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

[nostalgia/core/gba] Fix typo

Browse Source
This commit is contained in:
Gary Talent 2019-11-26 23:22:16 -06:00
parent 1d600186cd
commit 69666a0b31
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nostalgia/core/gba/addresses.hpp
View File

@ -39,8 +39,8 @@
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// Memory Addresses // Memory Addresses
#define MEM_PALLETE_BG ((uint16_t*) 0x05000000) #define MEM_PALETTE_BG ((uint16_t*) 0x05000000)
#define MEM_PALLETE_SPRITE ((uint16_t*) 0x05000200) #define MEM_PALETTE_SPRITE ((uint16_t*) 0x05000200)
typedef uint16_t BgMapTile[1024]; typedef uint16_t BgMapTile[1024];
#define MEM_BG_MAP ((BgMapTile*) 0x06000000) #define MEM_BG_MAP ((BgMapTile*) 0x06000000)

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

@ -130,7 +130,7 @@ ox::Error loadTileSheet(Context *ctx,
auto [ts, tserr] = ctx->rom->read(tilesheetAddr); auto [ts, tserr] = ctx->rom->read(tilesheetAddr);
oxReturnError(tserr); oxReturnError(tserr);
GbaTileMapTarget target; GbaTileMapTarget target;
target.pal.palette = &MEM_PALLETE_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 = &TILE_ADDR[section * 512];
oxReturnError(ox::readMC(ts, tsStat.size, &target)); oxReturnError(ox::readMC(ts, tsStat.size, &target));