diff --git a/deps/ox/deps/jsoncpp/CMakeLists.txt b/deps/ox/deps/jsoncpp/CMakeLists.txt index 678e18fa..0321fb2a 100644 --- a/deps/ox/deps/jsoncpp/CMakeLists.txt +++ b/deps/ox/deps/jsoncpp/CMakeLists.txt @@ -193,7 +193,7 @@ endif() # DrinkingTea - begin if(NOT MSVC) - set(CMAKE_CXX_FLAGS "-Wno-everything") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-everything") endif() # DrinkingTea - end diff --git a/deps/teagba/include/teagba/addresses.hpp b/deps/teagba/include/teagba/addresses.hpp index 6b2e5e20..168c0d5a 100644 --- a/deps/teagba/include/teagba/addresses.hpp +++ b/deps/teagba/include/teagba/addresses.hpp @@ -99,23 +99,23 @@ volatile OffsetPair ®BgOfs(auto const bgIdx) noexcept { ///////////////////////////////////////////////////////////////// // Memory Addresses -#define MEM_EWRAM (*reinterpret_cast*>(0x0200'0000)) +#define MEM_EWRAM (*(reinterpret_cast*>(0x0200'0000))) -#define MEM_IWRAM (*reinterpret_cast*>(0x0300'0000)) +#define MEM_IWRAM (*(reinterpret_cast*>(0x0300'0000))) #define REG_BLNDCTL (*reinterpret_cast(0x0400'0050)) using Palette = ox::Array; -#define MEM_BG_PALETTE (*reinterpret_cast<::Palette*>(0x0500'0000)) -#define MEM_SPRITE_PALETTE (*reinterpret_cast<::Palette*>(0x0500'0200)) +#define MEM_BG_PALETTE (*(reinterpret_cast<::Palette*>(0x0500'0000))) +#define MEM_SPRITE_PALETTE (*(reinterpret_cast<::Palette*>(0x0500'0200))) using BgMapTile = ox::Array; -#define MEM_BG_TILES (*reinterpret_cast*>(0x0600'0000)) -#define MEM_BG_MAP (*reinterpret_cast*>(0x0600'e000)) +#define MEM_BG_TILES (*(reinterpret_cast*>(0x0600'0000))) +#define MEM_BG_MAP (*(reinterpret_cast*>(0x0600'e000))) -#define MEM_SPRITE_TILES (*reinterpret_cast*>(0x0601'0000)) -#define MEM_OAM (*reinterpret_cast*>(0x0700'0000)) +#define MEM_SPRITE_TILES (*(reinterpret_cast*>(0x0601'0000))) +#define MEM_OAM (*(reinterpret_cast*>(0x0700'0000))) -#define MEM_ROM (*reinterpret_cast*>(0x0700'0000)) +#define MEM_ROM (*(reinterpret_cast*>(0x0700'0000))) -#define MEM_SRAM (*reinterpret_cast*>(0x0e00'0000)) +#define MEM_SRAM (*(reinterpret_cast*>(0x0e00'0000))) diff --git a/deps/teagba/include/teagba/gfx.hpp b/deps/teagba/include/teagba/gfx.hpp index 4a252122..3093df85 100644 --- a/deps/teagba/include/teagba/gfx.hpp +++ b/deps/teagba/include/teagba/gfx.hpp @@ -43,6 +43,4 @@ void applySpriteUpdates() noexcept; void setBgOffset(uint16_t bg, int16_t x, int16_t y) noexcept; -void scrollBgOffset(uint16_t bg, int16_t x, int16_t y) noexcept; - } diff --git a/deps/teagba/src/gfx.cpp b/deps/teagba/src/gfx.cpp index cd1e38b3..fde8ec2f 100644 --- a/deps/teagba/src/gfx.cpp +++ b/deps/teagba/src/gfx.cpp @@ -18,7 +18,7 @@ GbaSpriteAttrUpdate &spriteAttr(size_t const i) noexcept { void addSpriteUpdate(GbaSpriteAttrUpdate const &upd) noexcept { const auto ie = REG_IE; // disable vblank interrupt handler - REG_IE = REG_IE & static_cast(~teagba::Int_vblank); // disable vblank interrupt handler + REG_IE = REG_IE & static_cast(~Int_vblank); // disable vblank interrupt handler g_spriteBuffer[upd.idx] = upd; REG_IE = ie; // enable vblank interrupt handler } @@ -35,10 +35,4 @@ void setBgOffset(uint16_t const bg, int16_t const x, int16_t const y) noexcept { o.y = y; } -void scrollBgOffset(uint16_t const bg, int16_t const x, int16_t const y) noexcept { - auto &o = regBgOfs(bg); - o.x = o.x + x; - o.y = o.y + y; -} - }