From 69666a0b317fc33e473e47e14bab9c320cfe5d97 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 26 Nov 2019 23:22:16 -0600 Subject: [PATCH] [nostalgia/core/gba] Fix typo --- src/nostalgia/core/gba/addresses.hpp | 4 ++-- src/nostalgia/core/gba/gfx.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nostalgia/core/gba/addresses.hpp b/src/nostalgia/core/gba/addresses.hpp index 2b71a1a2..4da3144f 100644 --- a/src/nostalgia/core/gba/addresses.hpp +++ b/src/nostalgia/core/gba/addresses.hpp @@ -39,8 +39,8 @@ ///////////////////////////////////////////////////////////////// // Memory Addresses -#define MEM_PALLETE_BG ((uint16_t*) 0x05000000) -#define MEM_PALLETE_SPRITE ((uint16_t*) 0x05000200) +#define MEM_PALETTE_BG ((uint16_t*) 0x05000000) +#define MEM_PALETTE_SPRITE ((uint16_t*) 0x05000200) typedef uint16_t BgMapTile[1024]; #define MEM_BG_MAP ((BgMapTile*) 0x06000000) diff --git a/src/nostalgia/core/gba/gfx.cpp b/src/nostalgia/core/gba/gfx.cpp index 19b0fc9b..5fa5930d 100644 --- a/src/nostalgia/core/gba/gfx.cpp +++ b/src/nostalgia/core/gba/gfx.cpp @@ -130,7 +130,7 @@ ox::Error loadTileSheet(Context *ctx, auto [ts, tserr] = ctx->rom->read(tilesheetAddr); oxReturnError(tserr); GbaTileMapTarget target; - target.pal.palette = &MEM_PALLETE_BG[section]; + target.pal.palette = &MEM_PALETTE_BG[section]; target.bgCtl = &bgCtl(section); target.tileMap = &TILE_ADDR[section * 512]; oxReturnError(ox::readMC(ts, tsStat.size, &target));