github-mirror/sa2
1
0 Fork 0
mirror of https://github.com/SAT-R/sa2.git synced 2026-10-28 09:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename sa2__gUnknown_030022AC -> gBgOffsetsHBlankSecondary

Browse Source
This commit is contained in:
JaceCear committed 2025-12-05 16:06:50 +01:00
1 parent baebaf305a
commit d3fc37ac27
4 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/core.h
+1 -1
View File
@@ -340,7 +340,7 @@ extern struct GraphicsData gVramGraphicsCopyQueueBuffer[32];
gBackgroundsCopyQueue[gBackgroundsCopyQueueIndex] = _bg; \
INC_BACKGROUNDS_QUEUE_CURSOR(gBackgroundsCopyQueueIndex);
extern void *sa2__gUnknown_030022AC;
extern void *gBgOffsetsHBlankSecondary;
extern void *sa2__gUnknown_030022C0;
#if (GAME == GAME_SA2)
extern s16 gMosaicReg;
src/core.c
+7 -7
View File
@@ -64,7 +64,7 @@ s32 gNumTasks = 0;
u8 gBgSprites_Unknown2[4][4] = {};
u16 gInput = 0;
u8 gRepeatedKeysTestCounter[] ALIGNED(16) = {};
void *sa2__gUnknown_030022AC = NULL;
void *gBgOffsetsHBlankSecondary = NULL;
u16 gBgCntRegs[] = {};
u16 gRepeatedKeys ALIGNED(4) = 0;
struct Task *gNextTask = NULL;
@@ -126,7 +126,7 @@ Sprite *sa2__gUnknown_03004D10[] ALIGNED(16) = {};
u8 gNumVBlankCallbacks ALIGNED(4) = 0;
#if (ENGINE == ENGINE_2)
void *gUnknown_03004D54 = NULL;
void *SA2_LABEL(gUnknown_03004D54) = NULL;
#endif
u16 sa2__gUnknown_03004D58 ALIGNED(4) = 0;
u8 gVramGraphicsCopyCursor ALIGNED(4) = 0;
@@ -317,7 +317,7 @@ void EngineInit(void)
DmaFill32(3, 0, &gBgOffsetsBuffer, sizeof(gBgOffsetsBuffer));
gBgOffsetsHBlankPrimary = gBgOffsetsBuffer[0];
sa2__gUnknown_030022AC = gBgOffsetsBuffer[1];
gBgOffsetsHBlankSecondary = gBgOffsetsBuffer[1];
gHBlankCopyTarget = NULL;
gHBlankCopySize = 0;
gNumHBlankCallbacks = 0;
@@ -544,10 +544,10 @@ void ClearOamBufferDma(void)
if (!(gFlags & FLAGS_20)) {
if (gBgOffsetsHBlankPrimary == gBgOffsetsBuffer[0]) {
gBgOffsetsHBlankPrimary = gBgOffsetsBuffer[1];
SA2_LABEL(gUnknown_030022AC) = gBgOffsetsBuffer[0];
gBgOffsetsHBlankSecondary = gBgOffsetsBuffer[0];
} else {
gBgOffsetsHBlankPrimary = gBgOffsetsBuffer[0];
SA2_LABEL(gUnknown_030022AC) = gBgOffsetsBuffer[1];
gBgOffsetsHBlankSecondary = gBgOffsetsBuffer[1];
}
}
gFlags &= ~FLAGS_EXECUTE_HBLANK_COPY;
@@ -854,10 +854,10 @@ void ClearOamBufferCpuSet(void)
if (!(gFlags & FLAGS_20)) {
if (gBgOffsetsHBlankPrimary == gBgOffsetsBuffer) {
gBgOffsetsHBlankPrimary = &gBgOffsetsBuffer[1];
sa2__gUnknown_030022AC = (void *)&gBgOffsetsBuffer[0];
gBgOffsetsHBlankSecondary = (void *)&gBgOffsetsBuffer[0];
} else {
gBgOffsetsHBlankPrimary = &gBgOffsetsBuffer[0];
sa2__gUnknown_030022AC = (void *)&gBgOffsetsBuffer[1];
gBgOffsetsHBlankSecondary = (void *)&gBgOffsetsBuffer[1];
}
}
gFlags &= ~4;
src/game/stage/backgrounds/zone_3_firework.c
+1 -1
View File
@@ -14,7 +14,7 @@ void HBlankCallback_803F92C(int_vcount line)
s32 newLine = line - 90;
if ((newLine >= 0) && (line != DISPLAY_HEIGHT - 1)) {
u32 *ptr = SA2_LABEL(gUnknown_030022AC);
u32 *ptr = gBgOffsetsHBlankSecondary;
ptr += 90;
*(vu32 *)&REG_BG1HOFS = ptr[newLine];
src/game/water_effects.c
+1 -1
View File
@@ -476,7 +476,7 @@ void SA2_LABEL(VCountIntr_8011ACC)(void)
#if (GAME == GAME_SA1)
{
DmaSet(0, SA2_LABEL(gUnknown_030022AC), (void *)&REG_BG3HOFS, //
DmaSet(0, gBgOffsetsHBlankSecondary, (void *)&REG_BG3HOFS, //
((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | (gHBlankCopySize >> 1));
}
#endif