summaryrefslogtreecommitdiff
path: root/arm9/src
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/src')
-rw-r--r--arm9/src/palette.c (renamed from arm9/src/unk_020030E8.c)96
-rw-r--r--arm9/src/unk_02002F08.c26
2 files changed, 29 insertions, 93 deletions
diff --git a/arm9/src/unk_020030E8.c b/arm9/src/palette.c
index d9e410dc..5ffab028 100644
--- a/arm9/src/unk_020030E8.c
+++ b/arm9/src/palette.c
@@ -1,5 +1,5 @@
#include "global.h"
-#include "unk_020030E8.h"
+#include "palette.h"
#include "MI_memory.h"
#include "unk_02002F08.h"
#include "unk_0200CA44.h"
@@ -37,8 +37,7 @@ THUMB_FUNC void FUN_02003108(struct PaletteData *paletteData, u32 index, u16 off
PaletteData_LoadPalette(paletteData, ptr + offset, index, offset, (u16)size);
}
-THUMB_FUNC void CopyPaletteFromNarc(
- NarcId narcId, s32 memberId, u32 heap_id, u32 size, u16 offset, void *dest)
+THUMB_FUNC void CopyPaletteFromNarc(NarcId narcId, s32 memberId, u32 heap_id, u32 size, u16 offset, void *dest)
{
NNSG2dPaletteData *pltData;
@@ -55,14 +54,11 @@ THUMB_FUNC void CopyPaletteFromNarc(
FreeToHeap(ptr);
}
-THUMB_FUNC void PaletteData_CopyPalette(
- struct PaletteData *paletteData, u32 srcIdx, u16 srcOffset, u32 destIdx, u16 destOffset, u16 size)
+THUMB_FUNC void PaletteData_CopyPalette(struct PaletteData *paletteData, u32 srcIdx, u16 srcOffset, u32 destIdx, u16 destOffset, u16 size)
{
- MI_CpuCopy16(
- paletteData->pltt[srcIdx].unfadedBuf + srcOffset, paletteData->pltt[destIdx].unfadedBuf + destOffset, size);
- MI_CpuCopy16(
- paletteData->pltt[srcIdx].unfadedBuf + srcOffset, paletteData->pltt[destIdx].fadedBuf + destOffset, size);
+ MI_CpuCopy16(paletteData->pltt[srcIdx].unfadedBuf + srcOffset, paletteData->pltt[destIdx].unfadedBuf + destOffset, size);
+ MI_CpuCopy16(paletteData->pltt[srcIdx].unfadedBuf + srcOffset, paletteData->pltt[destIdx].fadedBuf + destOffset, size);
}
THUMB_FUNC u16 *PaletteData_GetUnfadedBuf(struct PaletteData *paletteData, u32 index)
@@ -75,13 +71,7 @@ THUMB_FUNC u16 *PaletteData_GetFadedBuf(struct PaletteData *paletteData, u32 ind
return paletteData->pltt[index].fadedBuf;
}
-THUMB_FUNC u32 FUN_02003210(struct PaletteData *paletteData,
- u16 param1,
- u16 param2,
- s16 delay,
- u8 startY,
- u8 targetY,
- u16 color)
+THUMB_FUNC u32 FUN_02003210(struct PaletteData *paletteData, u16 param1, u16 param2, s16 delay, u8 startY, u8 targetY, u16 color)
{
u16 stc = param2;
@@ -129,9 +119,7 @@ THUMB_FUNC u32 FUN_02003210(struct PaletteData *paletteData,
paletteData->unk11c = 0;
// wtf is that?
- FUN_0200CA44((void (*)(u32, struct TextPrinter *))FUN_02003464,
- (struct TextPrinter *)paletteData,
- (u32)(-2));
+ FUN_0200CA44((void (*)(u32, struct TextPrinter *))FUN_02003464, (struct TextPrinter *)paletteData, (u32)(-2));
}
}
@@ -178,12 +166,7 @@ THUMB_FUNC void FUN_02003368(s32 param0, struct Palette *param1, u16 *param2)
*param2 &= r4;
}
-THUMB_FUNC void FUN_020033A4(struct PaletteFadeControl *paletteFade,
- u16 selectedPalettes,
- s16 delay,
- u8 startY,
- u8 targetY,
- u16 color)
+THUMB_FUNC void FUN_020033A4(struct PaletteFadeControl *paletteFade, u16 selectedPalettes, s16 delay, u8 startY, u8 targetY, u16 color)
{
if (delay < 0)
{
@@ -275,39 +258,27 @@ THUMB_FUNC void FUN_0200359C(struct PaletteData *paletteData, u32 index, u32 par
{
if (IsPaletteSelected(paletteData->pltt[index].fadeCtrl.selectedPalettes, (u16)i) != 0)
{
- FUN_020035F8(paletteData->pltt[index].unfadedBuf + param2 * i,
- paletteData->pltt[index].fadedBuf + param2 * i,
- &paletteData->pltt[index].fadeCtrl,
- param2);
+ FUN_020035F8(paletteData->pltt[index].unfadedBuf + param2 * i, paletteData->pltt[index].fadedBuf + param2 * i, &paletteData->pltt[index].fadeCtrl, param2);
}
}
FUN_02003684(paletteData, (u8)index, &paletteData->pltt[index].fadeCtrl);
}
-THUMB_FUNC void FUN_020035F8(
- u16 *src, u16 *dest, struct PaletteFadeControl *fadeCtrl, u32 numEntries)
+THUMB_FUNC void FUN_020035F8(u16 *src, u16 *dest, struct PaletteFadeControl *fadeCtrl, u32 numEntries)
{
for (u32 i = 0; i < numEntries; i++)
{
- u8 lo = (u8)((src[i] & 0x1f) +
- ((((fadeCtrl->blendColor & 0x1f) - (src[i] & 0x1f)) * fadeCtrl->y) >> 4));
+ u8 lo = (u8)((src[i] & 0x1f) + ((((fadeCtrl->blendColor & 0x1f) - (src[i] & 0x1f)) * fadeCtrl->y) >> 4));
- u8 hi = (u8)(((src[i] >> 10) & 0x1f) +
- (((((fadeCtrl->blendColor >> 10) & 0x1f) - ((src[i] >> 10) & 0x1f)) *
- fadeCtrl->y) >>
- 4));
- u8 mid = (u8)(((src[i] >> 5) & 0x1f) +
- (((((fadeCtrl->blendColor >> 5) & 0x1f) - ((src[i] >> 5) & 0x1f)) *
- fadeCtrl->y) >>
- 4));
+ u8 hi = (u8)(((src[i] >> 10) & 0x1f) + (((((fadeCtrl->blendColor >> 10) & 0x1f) - ((src[i] >> 10) & 0x1f)) * fadeCtrl->y) >> 4));
+ u8 mid = (u8)(((src[i] >> 5) & 0x1f) + (((((fadeCtrl->blendColor >> 5) & 0x1f) - ((src[i] >> 5) & 0x1f)) * fadeCtrl->y) >> 4));
dest[i] = (u16)((hi << 10) | (mid << 5) | lo);
}
}
-THUMB_FUNC void FUN_02003684(
- struct PaletteData *paletteData, u8 index, struct PaletteFadeControl *fadeCtrl)
+THUMB_FUNC void FUN_02003684(struct PaletteData *paletteData, u8 index, struct PaletteFadeControl *fadeCtrl)
{
if (fadeCtrl->y == fadeCtrl->targetY)
{
@@ -321,7 +292,6 @@ THUMB_FUNC void FUN_02003684(
return;
}
-
s16 val;
if (fadeCtrl->yDec == 0)
{
@@ -355,8 +325,7 @@ THUMB_FUNC void FUN_0200372C(struct PaletteData *paletteData)
for (s32 i = 0; i < 14; i++)
{
- if (paletteData->unk11a_f != 0 ||
- (paletteData->pltt[i].fadedBuf != 0 && IsPaletteSelected(paletteData->unk11a_0, (u16)i) != 0))
+ if (paletteData->unk11a_f != 0 || (paletteData->pltt[i].fadedBuf != 0 && IsPaletteSelected(paletteData->unk11a_0, (u16)i) != 0))
{
DC_FlushRange(paletteData->pltt[i].fadedBuf, paletteData->pltt[i].bufSize);
@@ -445,8 +414,7 @@ THUMB_FUNC void FUN_020038F0(struct PaletteData *paletteData, u32 param1)
paletteData->unk11a_f = param1;
}
-THUMB_FUNC void PaletteData_FillPalette(
- struct PaletteData *paletteData, u32 index, u32 selection, u16 value, u16 startOffset, u16 endOffset)
+THUMB_FUNC void PaletteData_FillPalette(struct PaletteData *paletteData, u32 index, u32 selection, u16 value, u16 startOffset, u16 endOffset)
{
GF_ASSERT(endOffset * 2 <= paletteData->pltt[index].bufSize);
if (selection == 1 || selection == 2)
@@ -474,8 +442,7 @@ THUMB_FUNC void BlendPalette(u16 *src, u16 *dest, u16 numEntries, u8 coeff, u16
mid = (((u32)(src[i] << 0x16)) >> 0x1b);
hi = (((u32)(src[i] << 0x11)) >> 0x1b);
- dest[i] = (lo + ((r12 - lo) * coeff) >> 4) | (mid + ((lr - mid) * coeff) >> 4) << 5 |
- (hi + ((st8 - hi) * coeff) >> 4) << 10;
+ dest[i] = (lo + ((r12 - lo) * coeff) >> 4) | (mid + ((lr - mid) * coeff) >> 4) << 5 | (hi + ((st8 - hi) * coeff) >> 4) << 10;
}
}
#else
@@ -545,8 +512,7 @@ _020039E2:
}
#endif
-THUMB_FUNC void BlendPaletteUnfaded(
- struct PaletteData *paletteData, u32 index, u16 offset, u16 numEntries, u8 coeff, u16 blendColor)
+THUMB_FUNC void BlendPaletteUnfaded(struct PaletteData *paletteData, u32 index, u16 offset, u16 numEntries, u8 coeff, u16 blendColor)
{
BOOL r0 = FALSE;
if (paletteData->pltt[index].unfadedBuf != 0 && paletteData->pltt[index].fadedBuf != 0)
@@ -556,11 +522,7 @@ THUMB_FUNC void BlendPaletteUnfaded(
GF_ASSERT(r0);
- BlendPalette(paletteData->pltt[index].unfadedBuf + offset,
- paletteData->pltt[index].fadedBuf + offset,
- numEntries,
- coeff,
- blendColor);
+ BlendPalette(paletteData->pltt[index].unfadedBuf + offset, paletteData->pltt[index].fadedBuf + offset, numEntries, coeff, blendColor);
}
THUMB_FUNC void BlendPalettes(u16 *src, u16 *dest, u16 selectedPalettes, u8 coeff, u16 blendColor)
@@ -578,8 +540,7 @@ THUMB_FUNC void BlendPalettes(u16 *src, u16 *dest, u16 selectedPalettes, u8 coef
}
}
-THUMB_FUNC void BlendPalettesUnfaded(
- struct PaletteData *paletteData, u32 index, u16 selectedPalettes, u8 coeff, u16 blendColor)
+THUMB_FUNC void BlendPalettesUnfaded(struct PaletteData *paletteData, u32 index, u16 selectedPalettes, u8 coeff, u16 blendColor)
{
u32 r4 = 0;
BOOL r0 = FALSE;
@@ -610,11 +571,11 @@ THUMB_FUNC void TintPalette_CustomTone(u16 *palette, u32 count, u32 rTone, u32 g
for (i = 0; i < count; i++)
{
- r = (*palette >> 0) & 0x1F;
- g = (*palette >> 5) & 0x1F;
+ r = (*palette >> 0) & 0x1F;
+ g = (*palette >> 5) & 0x1F;
b = (*palette >> 10) & 0x1F;
- gray = (r *76 + g * 151 + b * 29) >> 8;
+ gray = (r * 76 + g * 151 + b * 29) >> 8;
r = (u16)((rTone * gray)) >> 8;
g = (u16)((gTone * gray)) >> 8;
@@ -704,16 +665,7 @@ _02003B3C:
}
#endif
-THUMB_FUNC void FUN_02003B40(struct PaletteData *paletteData,
- NarcId narcId,
- s32 memberId,
- u32 heap_id,
- u32 index,
- u32 size,
- u16 offset,
- u32 rTone,
- u32 gTone,
- u32 bTone)
+THUMB_FUNC void FUN_02003B40(struct PaletteData *paletteData, NarcId narcId, s32 memberId, u32 heap_id, u32 index, u32 size, u16 offset, u32 rTone, u32 gTone, u32 bTone)
{
NNSG2dPaletteData *pltData;
void *ptr = GfGfxLoader_GetPlttData(narcId, memberId, &pltData, heap_id);
diff --git a/arm9/src/unk_02002F08.c b/arm9/src/unk_02002F08.c
index 20a22b7d..de1c270c 100644
--- a/arm9/src/unk_02002F08.c
+++ b/arm9/src/unk_02002F08.c
@@ -56,8 +56,7 @@ THUMB_FUNC s32 FUN_02002F9C(u32 param0, struct String *str)
{
GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL);
- return StringGetWidth_SingleLine_HandleClearToControlCode(
- UNK_02106FC8->unk94[param0], String_c_str(str));
+ return StringGetWidth_SingleLine_HandleClearToControlCode(UNK_02106FC8->unk94[param0], String_c_str(str));
}
THUMB_FUNC struct PaletteData *FUN_02002FD0(u32 heap_id)
@@ -73,8 +72,7 @@ THUMB_FUNC void FUN_02002FEC(struct PaletteData *ptr)
FreeToHeap(ptr);
}
-THUMB_FUNC void PaletteData_SetBuffers(
- struct PaletteData *paletteData, u32 index, void *unfadedBuf, void *fadedBuf, u32 size)
+THUMB_FUNC void PaletteData_SetBuffers(struct PaletteData *paletteData, u32 index, void *unfadedBuf, void *fadedBuf, u32 size)
{
paletteData->pltt[index].unfadedBuf = unfadedBuf;
paletteData->pltt[index].fadedBuf = fadedBuf;
@@ -95,21 +93,13 @@ THUMB_FUNC void PaletteData_FreeBuffers(struct PaletteData *paletteData, u32 ind
FreeToHeap(paletteData->pltt[index].fadedBuf);
}
-THUMB_FUNC void PaletteData_LoadPalette(
- struct PaletteData *paletteData, const void *src, u32 index, u32 offset, u16 size)
+THUMB_FUNC void PaletteData_LoadPalette(struct PaletteData *paletteData, const void *src, u32 index, u32 offset, u16 size)
{
MIi_CpuCopy16(src, paletteData->pltt[index].unfadedBuf + offset, size);
MIi_CpuCopy16(src, paletteData->pltt[index].fadedBuf + offset, size);
}
-THUMB_FUNC void PaletteData_LoadFromNarc(struct PaletteData *paletteData,
- NarcId narcId,
- s32 memberId,
- u32 heap_id,
- u32 index,
- u32 size,
- u16 offset,
- u16 param7)
+THUMB_FUNC void PaletteData_LoadFromNarc(struct PaletteData *paletteData, NarcId narcId, s32 memberId, u32 heap_id, u32 index, u32 size, u16 offset, u16 param7)
{
NNSG2dPaletteData *pltData;
void *ptr = GfGfxLoader_GetPlttData(narcId, memberId, &pltData, heap_id);
@@ -127,13 +117,7 @@ THUMB_FUNC void PaletteData_LoadFromNarc(struct PaletteData *paletteData,
FreeToHeap(ptr);
}
-THUMB_FUNC void PaletteData_LoadNarc(struct PaletteData *paletteData,
- NarcId narcId,
- s32 memberId,
- u32 heap_id,
- u32 index,
- u32 size,
- u16 offset)
+THUMB_FUNC void PaletteData_LoadNarc(struct PaletteData *paletteData, NarcId narcId, s32 memberId, u32 heap_id, u32 index, u32 size, u16 offset)
{
PaletteData_LoadFromNarc(paletteData, narcId, memberId, heap_id, index, size, offset, 0);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 05:18:18 +0000