This commit is contained in:
2
deps/teagba/include/teagba/gfx.hpp
vendored
2
deps/teagba/include/teagba/gfx.hpp
vendored
@ -37,7 +37,7 @@ struct OX_ALIGN8 GbaSpriteAttrUpdate {
|
|||||||
|
|
||||||
GbaSpriteAttrUpdate &spriteAttr(size_t i) noexcept;
|
GbaSpriteAttrUpdate &spriteAttr(size_t i) noexcept;
|
||||||
|
|
||||||
void addSpriteUpdate(const GbaSpriteAttrUpdate &upd) noexcept;
|
void addSpriteUpdate(GbaSpriteAttrUpdate const &upd) noexcept;
|
||||||
|
|
||||||
void applySpriteUpdates() noexcept;
|
void applySpriteUpdates() noexcept;
|
||||||
|
|
||||||
|
4
deps/teagba/src/cstartup.cpp
vendored
4
deps/teagba/src/cstartup.cpp
vendored
@ -26,7 +26,7 @@ extern void (*__preinit_array_end[]) (void);
|
|||||||
extern void (*__init_array_start[]) (void);
|
extern void (*__init_array_start[]) (void);
|
||||||
extern void (*__init_array_end[]) (void);
|
extern void (*__init_array_end[]) (void);
|
||||||
|
|
||||||
int main(int argc, const char **argv);
|
int main(int argc, char const **argv);
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
||||||
@ -50,7 +50,7 @@ void __libc_init_array() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int c_start() {
|
int c_start() {
|
||||||
const char *args[2] = {"", "rom.oxfs"};
|
char const *args[2] = {"", "rom.oxfs"};
|
||||||
ox::heapmgr::initHeap(HEAP_BEGIN, HEAP_END);
|
ox::heapmgr::initHeap(HEAP_BEGIN, HEAP_END);
|
||||||
mgba::initConsole();
|
mgba::initConsole();
|
||||||
#pragma GCC diagnostic push
|
#pragma GCC diagnostic push
|
||||||
|
2
deps/teagba/src/gfx.cpp
vendored
2
deps/teagba/src/gfx.cpp
vendored
@ -16,7 +16,7 @@ GbaSpriteAttrUpdate &spriteAttr(size_t i) noexcept {
|
|||||||
return g_spriteBuffer[i];
|
return g_spriteBuffer[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
void addSpriteUpdate(const GbaSpriteAttrUpdate &upd) noexcept {
|
void addSpriteUpdate(GbaSpriteAttrUpdate const &upd) noexcept {
|
||||||
const auto ie = REG_IE; // disable vblank interrupt handler
|
const auto ie = REG_IE; // disable vblank interrupt handler
|
||||||
REG_IE = REG_IE & static_cast<uint16_t>(~teagba::Int_vblank); // disable vblank interrupt handler
|
REG_IE = REG_IE & static_cast<uint16_t>(~teagba::Int_vblank); // disable vblank interrupt handler
|
||||||
g_spriteBuffer[upd.idx] = upd;
|
g_spriteBuffer[upd.idx] = upd;
|
||||||
|
Reference in New Issue
Block a user