mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-24 05:58:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #550 from hatal175/sub_080AE324

Browse Source 
Match sub_080AE324
This commit is contained in:
notyourav
2022-08-05 11:23:42 -07:00
committed by GitHub
parent eab81dcebb 9a293559eb
commit aa57b04756
2 changed files with 15 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vram.c
+15 -4
View File
@@ -16,7 +16,7 @@ void SetGFXSlotStatus(GfxSlot*, u32);
u32 FindNextOccupiedGFXSlot(u32);
u32 FindFirstFreeGFXSlot(void);
void sub_080AE218(u32, u32);
void sub_080AE324(u32, u32);
void MoveGFXSlots(u32, u32);
void ResetPalettes(void) {
GfxSlot* slots;
@@ -296,7 +296,7 @@ void CleanUpGFXSlots(void) {
firstFreeIndex = FindFirstFreeGFXSlot();
if (firstFreeIndex <= occupiedIndex) {
sub_080AE218(occupiedIndex, firstFreeIndex);
sub_080AE324(occupiedIndex, firstFreeIndex);
MoveGFXSlots(occupiedIndex, firstFreeIndex);
occupiedIndex = firstFreeIndex;
}
}
@@ -306,8 +306,19 @@ void CleanUpGFXSlots(void) {
// Swap gfx
ASM_FUNC("asm/non_matching/vram/sub_080AE218.inc", void sub_080AE218(u32 a, u32 b))
// Swap palettes
ASM_FUNC("asm/non_matching/vram/sub_080AE324.inc", void sub_080AE324(u32 a, u32 b))
void MoveGFXSlots(u32 srcIndex, u32 targetIndex) {
s32 index;
u32 count;
count = gGFXSlots.slots[srcIndex].slotCount;
for (count = count - 1; count != -1; count--) {
gGFXSlots.slots[targetIndex] = gGFXSlots.slots[srcIndex];
MemClear(&gGFXSlots.slots[srcIndex], sizeof(GfxSlot));
srcIndex++;
targetIndex++;
}
gGFXSlots.unk_3 = 1;
}
u32 FindNextOccupiedGFXSlot(u32 index) {
for (; index < MAX_GFX_SLOTS - 1; index++) {