[nostalgia/core] Make sprite functions take core::Context argument

This commit is contained in:
2020-07-29 00:04:21 -05:00
parent 579b328212
commit 803b90d54c
5 changed files with 18 additions and 16 deletions
+1 -1
View File
@@ -13,7 +13,7 @@
/////////////////////////////////////////////////////////////////
// Interrupt Handler
using interrupt_handler = void (*)(void);
using interrupt_handler = void (*)();
#define REG_ISR *reinterpret_cast<interrupt_handler*>(0x03007FFC)
#define REG_IE *reinterpret_cast<volatile uint16_t*>(0x04000200)
#define REG_IF *reinterpret_cast<volatile uint16_t*>(0x04000202)
+2 -2
View File
@@ -214,7 +214,7 @@ void clearTileLayer(Context*, int layer) {
memset(&MEM_BG_MAP[layer], 0, GbaTileRows * GbaTileColumns);
}
void hideSprite(unsigned idx) {
void hideSprite(Context*, unsigned idx) {
GbaSpriteAttrUpdate oa;
oa.attr0 = 2 << 8;
oa.idx = idx;
@@ -234,7 +234,7 @@ void hideSprite(unsigned idx) {
}
}
void setSprite(unsigned idx, unsigned x, unsigned y, unsigned tileIdx, unsigned spriteShape, unsigned spriteSize, unsigned flipX) {
void setSprite(Context*, unsigned idx, unsigned x, unsigned y, unsigned tileIdx, unsigned spriteShape, unsigned spriteSize, unsigned flipX) {
GbaSpriteAttrUpdate oa;
oa.attr0 = static_cast<uint16_t>(y & ox::onMask<uint8_t>(7))
| (static_cast<uint16_t>(1) << 10) // enable alpha
+3 -1
View File
@@ -127,6 +127,8 @@ void setTile(Context *ctx, int layer, int column, int row, uint8_t tile);
void clearTileLayer(Context*, int layer);
void setSprite(unsigned idx, unsigned x, unsigned y, unsigned tileIdx, unsigned spriteShape = 0, unsigned spriteSize = 0, unsigned flipX = 0);
void hideSprite(Context*, unsigned);
void setSprite(Context*, unsigned idx, unsigned x, unsigned y, unsigned tileIdx, unsigned spriteShape = 0, unsigned spriteSize = 0, unsigned flipX = 0);
}
+2 -2
View File
@@ -200,10 +200,10 @@ void setTile(Context *ctx, int layer, int column, int row, uint8_t tile) {
id->bgTileMaps[z][y][x] = tile;
}
void hideSprite(unsigned) {
void hideSprite(Context*, unsigned) {
}
void setSprite(unsigned, unsigned, unsigned, unsigned, unsigned, unsigned, unsigned) {
void setSprite(Context*, unsigned, unsigned, unsigned, unsigned, unsigned, unsigned, unsigned) {
}
}