summaryrefslogtreecommitdiff
path: root/arm9/src
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/src')
-rw-r--r--arm9/src/heap.c40
-rw-r--r--arm9/src/math_util.c6
-rw-r--r--arm9/src/sound.c51
-rw-r--r--arm9/src/unk_02016B94.c8
4 files changed, 53 insertions, 52 deletions
diff --git a/arm9/src/heap.c b/arm9/src/heap.c
index f28b4f88..7ae25c3b 100644
--- a/arm9/src/heap.c
+++ b/arm9/src/heap.c
@@ -3,14 +3,14 @@
#include "unk_02031734.h"
-extern void *tempName_NNS_FndCreateExpHeapEx(void *param0, u32 param1, u32 param2);
-extern void *tempName_NNS_FndAllocFromExpHeapEx(void *param0, u32 param1, s32 param2);
-extern void thunk_FUN_020adc8c();
-extern void FUN_020ADDF0(void *ptr1, void *ptr2);
-extern u32 FUN_020ADDC8(void *param0);
-extern void FUN_020AE82C(u32 param0, void *param1, u32 param2);
-extern u32 FUN_020ADDC0(void *param0);
-extern void FUN_020ADE2C(void *ptr1, void *ptr2, u32 param2);
+extern void *NNS_FndCreateExpHeapEx(void *param0, u32 param1, u32 param2);
+extern void *NNS_FndAllocFromExpHeapEx(void *param0, u32 param1, s32 param2);
+extern void NNS_FndDestroyExpHeap();
+extern void NNS_FndFreeToExpHeap(void *ptr1, void *ptr2);
+extern u32 NNS_FndGetTotalFreeSizeForExpHeap(void *param0);
+extern void NNS_FndInitAllocatorForExpHeap(u32 param0, void *param1, u32 param2);
+extern u32 NNS_FndGetSizeForMBlockExpHeap(void *param0);
+extern void NNS_FndResizeForMBlockExpHeap(void *ptr1, void *ptr2, u32 param2);
struct UnkStruct_020166C8 UNK_021C4D28;
@@ -68,7 +68,7 @@ THUMB_FUNC void FUN_020166C8(u32 *param0, u32 param1, u32 param2, u32 pre_size)
if (ptr != 0)
{
- UNK_021C4D28.unk00[r7] = tempName_NNS_FndCreateExpHeapEx(ptr, param0[0], 0);
+ UNK_021C4D28.unk00[r7] = NNS_FndCreateExpHeapEx(ptr, param0[0], 0);
UNK_021C4D28.unk10[r7] = (u8)r7;
}
else
@@ -143,13 +143,13 @@ THUMB_FUNC u32 FUN_02016834(u32 param0, u32 param1, u32 param2, s32 param3)
void *ptr2 = UNK_021C4D28.unk00[ptr[param0]];
if (ptr2 != 0)
{
- void *ptr3 = tempName_NNS_FndAllocFromExpHeapEx(ptr2, param2, param3);
+ void *ptr3 = NNS_FndAllocFromExpHeapEx(ptr2, param2, param3);
if (ptr3 != 0)
{
param3 = FUN_020167F4();
if (param3 >= 0)
{
- UNK_021C4D28.unk00[param3] = tempName_NNS_FndCreateExpHeapEx(ptr3, param2, 0);
+ UNK_021C4D28.unk00[param3] = NNS_FndCreateExpHeapEx(ptr3, param2, 0);
if (UNK_021C4D28.unk00[param3] != 0)
@@ -193,14 +193,14 @@ THUMB_FUNC void FUN_020168D0(u32 heap_id)
if (UNK_021C4D28.unk00[UNK_021C4D28.unk10[heap_id]] != 0)
{
- thunk_FUN_020adc8c();
+ NNS_FndDestroyExpHeap();
u8 index = UNK_021C4D28.unk10[heap_id];
void *ptr1 = UNK_021C4D28.unk04[index];
void *ptr2 = UNK_021C4D28.unk08[index];
if (ptr1 != 0 && ptr2 != 0)
{
- FUN_020ADDF0(ptr1, ptr2);
+ NNS_FndFreeToExpHeap(ptr1, ptr2);
}
else
{
@@ -221,7 +221,7 @@ THUMB_FUNC u32 *FUN_02016944(void *param0, u32 param1, s32 param2, u32 param3)
OSIntrMode intr_mode = OS_DisableInterrupts();
param1 += 16;
- u32 *ptr = (u32 *)tempName_NNS_FndAllocFromExpHeapEx(param0, param1, param2);
+ u32 *ptr = (u32 *)NNS_FndAllocFromExpHeapEx(param0, param1, param2);
OS_RestoreInterrupts(intr_mode);
if (ptr != 0)
@@ -301,7 +301,7 @@ void FreeToHeap(void *ptr)
UNK_021C4D28.unk0c[heap_id]--;
OSIntrMode intr_mode = OS_DisableInterrupts();
- FUN_020ADDF0(ptr2, ptr - 16);
+ NNS_FndFreeToExpHeap(ptr2, ptr - 16);
OS_RestoreInterrupts(intr_mode);
return;
}
@@ -322,7 +322,7 @@ void FreeToHeapExplicit(u32 param0, void *param1)
u8 heap_id = (u8)((u32 *)param1)[-1];
GF_ASSERT (heap_id == param0);
- FUN_020ADDF0(ptr, param1 - 16);
+ NNS_FndFreeToExpHeap(ptr, param1 - 16);
GF_ASSERT (UNK_021C4D28.unk0c[param0]);
UNK_021C4D28.unk0c[param0]--;
@@ -337,7 +337,7 @@ THUMB_FUNC u32 FUN_02016AF8(u32 param0)
if (param0 < UNK_021C4D28.unk14)
{
u8 index = UNK_021C4D28.unk10[param0];
- return FUN_020ADDC8(UNK_021C4D28.unk00[index]);
+ return NNS_FndGetTotalFreeSizeForExpHeap(UNK_021C4D28.unk00[index]);
}
ErrorHandling();
@@ -350,7 +350,7 @@ THUMB_FUNC void FUN_02016B20(u32 param0, u32 param1, u32 param2)
{
u8 index = UNK_021C4D28.unk10[param1];
- FUN_020AE82C(param0, UNK_021C4D28.unk00[index], param2);
+ NNS_FndInitAllocatorForExpHeap(param0, UNK_021C4D28.unk00[index], param2);
return;
}
@@ -362,13 +362,13 @@ THUMB_FUNC void FUN_02016B44(void *ptr, u32 param1)
GF_ASSERT (OS_GetProcMode() != OS_PROCMODE_IRQ);
param1 += 16;
- if (FUN_020ADDC0(ptr - 16) >= param1)
+ if (NNS_FndGetSizeForMBlockExpHeap(ptr - 16) >= param1)
{
u8 heap_id = (u8)((u32 *)ptr)[-1];
u8 index = UNK_021C4D28.unk10[heap_id];
- FUN_020ADE2C(UNK_021C4D28.unk00[index], ptr - 16, param1);
+ NNS_FndResizeForMBlockExpHeap(UNK_021C4D28.unk00[index], ptr - 16, param1);
return;
}
ErrorHandling();
diff --git a/arm9/src/math_util.c b/arm9/src/math_util.c
index 4ecee59c..ac3b77f0 100644
--- a/arm9/src/math_util.c
+++ b/arm9/src/math_util.c
@@ -1,7 +1,7 @@
#include "global.h"
#include "math_util.h"
-extern const s16 UNK_020FFA38[]; // temporary until further notice
+extern const s16 FX_SinCosTable_[]; // temporary until further notice
/*
* Constant tables
@@ -697,8 +697,8 @@ THUMB_FUNC void MTX22_2DAffine(struct Mtx22 * mtx, u16 radians, fx32 x, fx32 y,
radians = (u16)((u32)(radians * 65535) / 360); // shut up the compiler
MTX_Rot22_(mtx,
- UNK_020FFA38[((radians >> 4) * 2)], // TODO: macros
- UNK_020FFA38[((radians >> 4) * 2) + 1]); // TODO: macros
+ FX_SinCosTable_[((radians >> 4) * 2)], // TODO: macros
+ FX_SinCosTable_[((radians >> 4) * 2) + 1]); // TODO: macros
MTX_ScaleApply22(mtx, mtx, x, y);
}
diff --git a/arm9/src/sound.c b/arm9/src/sound.c
index a1e31bbd..95d14c64 100644
--- a/arm9/src/sound.c
+++ b/arm9/src/sound.c
@@ -6,7 +6,8 @@
#pragma thumb on
static struct SoundData sSoundDataBuffer;
-static u32 UNK_02107070[2];
+static u32 UNK_02107070;
+static u32 UNK_02107074;
void FUN_02003C40(void);
BOOL FUN_02003D04(void);
@@ -28,15 +29,15 @@ extern void FUN_02005CFC(void);
void InitSoundData(void * a0, struct Options * a1)
{
struct SoundData * sdat = GetSoundDataPointer();
- SDAT_Init();
+ NNS_SndInit();
FUN_020040C8();
FUN_02004064(sdat);
- sdat->unk_00090 = FUN_020C2A94(sdat->unk_00094, sizeof(sdat->unk_00094));
- SDAT_Open(&sdat->header, "data/sound/sound_data.sdat", sdat->unk_00090, 0);
- FUN_020C39CC(sdat->unk_00090);
+ sdat->heap = NNS_SndHeapCreate(sdat->unk_00094, sizeof(sdat->unk_00094));
+ NNS_SndArcInit(&sdat->header, "data/sound/sound_data.sdat", sdat->heap, 0);
+ NNS_SndArcPlayerSetup(sdat->heap);
FUN_02004088(sdat);
FUN_020040A4(sdat);
- UNK_02107070[1] = 0;
+ UNK_02107074 = 0;
sdat->unk_BCD4C = a0;
FUN_02004D60(a1->soundMethod);
}
@@ -51,13 +52,13 @@ void DoSoundUpdateFrame(void)
FUN_02003C40();
}
FUN_02005CFC();
- FUN_020C01A0();
+ NNS_SndMain();
}
void FUN_02003C40(void)
{
struct SoundData * sdat = GetSoundDataPointer();
- switch (UNK_02107070[0])
+ switch (UNK_02107070)
{
case 1:
FUN_02003CE8(2);
@@ -92,7 +93,7 @@ void FUN_02003CE8(int a0)
{
struct SoundData * sdat = GetSoundDataPointer();
sdat->unk_BCCFC = 0;
- UNK_02107070[0] = (u32)a0;
+ UNK_02107070 = (u32)a0;
}
BOOL FUN_02003D04(void)
@@ -202,7 +203,7 @@ void * FUN_02003D38(u32 a0)
int FUN_02003F3C(int * a0)
{
struct SoundData * sdat = GetSoundDataPointer();
- int r4 = FUN_020C290C(sdat->unk_00090);
+ int r4 = NNS_SndHeapSaveState(sdat->heap);
GF_ASSERT(r4 != -1);
if (a0 != NULL)
*a0 = r4;
@@ -212,37 +213,37 @@ int FUN_02003F3C(int * a0)
void FUN_02003F64(int a0)
{
struct SoundData * sdat = GetSoundDataPointer();
- FUN_020C2828(sdat->unk_00090, a0);
+ NNS_SndHeapLoadState(sdat->heap, a0);
}
-BOOL FUN_02003F78(u32 * a0)
+BOOL FUN_02003F78(int a0)
{
struct SoundData * sdat = GetSoundDataPointer();
- return FUN_020C36A8(a0, sdat->unk_00090);
+ return NNS_SndArcLoadGroup(a0, sdat->heap);
}
-BOOL FUN_02003F90(u32 * a0)
+BOOL FUN_02003F90(int a0)
{
struct SoundData * sdat = GetSoundDataPointer();
- return FUN_020C3674(a0, sdat->unk_00090);
+ return NNS_SndArcLoadSeq(a0, sdat->heap);
}
-BOOL FUN_02003FA8(u32 * a0, u32 * a1)
+BOOL FUN_02003FA8(int a0, u32 a1)
{
struct SoundData * sdat = GetSoundDataPointer();
- return FUN_020C35E0(a0, a1, sdat->unk_00090);
+ return NNS_SndArcLoadSeqEx(a0, a1, sdat->heap);
}
-BOOL FUN_02003FC4(u32 * a0)
+BOOL FUN_02003FC4(int a0)
{
struct SoundData * sdat = GetSoundDataPointer();
- return FUN_020C360C(a0, sdat->unk_00090);
+ return NNS_SndArcLoadWaveArc(a0, sdat->heap);
}
-BOOL FUN_02003FDC(u32 * a0)
+BOOL FUN_02003FDC(int a0)
{
struct SoundData * sdat = GetSoundDataPointer();
- return FUN_020C3640(a0, sdat->unk_00090);
+ return NNS_SndArcLoadBank(a0, sdat->heap);
}
u32 * FUN_02003FF4(int a0)
@@ -295,14 +296,14 @@ void FUN_02004088(struct SoundData * sdat)
int i;
for (i = 0; i < 9; i++)
{
- FUN_020C0F80(&sdat->unk_BBC94[i]);
+ NNS_SndHandleInit(&sdat->unk_BBC94[i]);
}
}
void FUN_020040A4(struct SoundData * sdat)
{
FUN_02003F3C(&sdat->unk_BCD1C[0]);
- FUN_02003F78(NULL);
+ FUN_02003F78(0);
FUN_02003F3C(&sdat->unk_BCD1C[1]);
}
@@ -315,7 +316,7 @@ void FUN_020040C8(void)
void FUN_020040DC(void)
{
- FUN_020C1040(7, 0);
+ NNS_SndPlayerStopSeqByPlayerNo(7, 0);
FUN_02003FF4(7);
- FUN_020C0F68();
+ NNS_SndHandleReleaseSeq();
}
diff --git a/arm9/src/unk_02016B94.c b/arm9/src/unk_02016B94.c
index 4183087b..a8be5958 100644
--- a/arm9/src/unk_02016B94.c
+++ b/arm9/src/unk_02016B94.c
@@ -5,8 +5,8 @@
#include "gx.h"
#include "heap.h"
-extern void FUN_020B0030(void *param0, u32 *param1);
-extern void FUN_020B0138(void *param0, u32 *param1);
+extern void NNS_G2dGetUnpackedBGCharacterData(void *param0, u32 *param1);
+extern void NNS_G2dGetUnpackedPaletteData(void *param0, u32 *param1);
const u8 UNK_020EDB30[8] = {
0x10,
@@ -7747,7 +7747,7 @@ THUMB_FUNC u32 FUN_0201AB28(struct Window *window, u32 heap_id, const char *path
void *ptr = FUN_020161A4(heap_id, path);
window->unk00 = ptr;
u32 st0;
- FUN_020B0030(ptr, &st0);
+ NNS_G2dGetUnpackedBGCharacterData(ptr, &st0);
return st0;
}
@@ -7757,7 +7757,7 @@ THUMB_FUNC u32 FUN_0201AB44(struct Window *window, u32 heap_id, const char *path
void *ptr = FUN_020161A4(heap_id, path);
window->unk00 = ptr;
u32 st0;
- FUN_020B0138(ptr, &st0);
+ NNS_G2dGetUnpackedPaletteData(ptr, &st0);
return st0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 16:05:03 +0000