summaryrefslogtreecommitdiff
path: root/arm9/src
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/src')
-rw-r--r--arm9/src/main.c3
-rw-r--r--arm9/src/map_header.c88
-rw-r--r--arm9/src/script.c19
-rw-r--r--arm9/src/sound.c6
4 files changed, 57 insertions, 59 deletions
diff --git a/arm9/src/main.c b/arm9/src/main.c
index ec3c358c..874ea224 100644
--- a/arm9/src/main.c
+++ b/arm9/src/main.c
@@ -47,7 +47,6 @@ extern void FUN_02015E60(void);
extern void FUN_020222C4(void);
extern void FUN_0200A318(void);
extern void FUN_0200E2D8(void);
-extern void FUN_02003C10(void);
extern struct Unk21DBE18 MOD63_UNK_021DBE18;
extern struct Unk21DBE18 MOD52_021D76C8;
@@ -137,7 +136,7 @@ THUMB_FUNC void NitroMain(void)
FUN_0200E2D8();
if (gUnknown21C48B8.unk0)
gUnknown21C48B8.unk0(gUnknown21C48B8.unk4);
- FUN_02003C10();
+ DoSoundUpdateFrame();
FUN_0201B5CC(gUnknown21C48B8.unk20);
}
}
diff --git a/arm9/src/map_header.c b/arm9/src/map_header.c
index 7510d6d4..0a5b8987 100644
--- a/arm9/src/map_header.c
+++ b/arm9/src/map_header.c
@@ -5,7 +5,7 @@
#pragma thumb on
// Static decls
-u32 FUN_02034710(u32 mapno);
+u32 MapNumberBoundsCheck(u32 mapno);
const u16 UNK_020EED54[] = {
0x01A5, 0x01AD, 0x01B4, 0x01BC, 0x01C5, 0x01CC, 0x0007, 0x0025,
@@ -33,7 +33,7 @@ const u16 UNK_020EED78[] = {
0x00DD, 0x0018,
};
-const struct MapHeader UNK_020EEDBC[] = {
+const struct MapHeader sMapHeaders[] = {
{ 0x0, 0x0, 0x0, 0x170, 0x33b, 0x12, 0x3e8, 0x3e8, 0xffff, 0x0, MAPSEC_MYSTERY_ZONE, 0x0, 0x0, 0x2, 3, TRUE, TRUE, TRUE, FALSE },
{ 0x0, 0x0, 0x0, 0x170, 0x33b, 0x12, 0x3e8, 0x3e8, 0xffff, 0x0, MAPSEC_MYSTERY_ZONE, 0x0, 0x0, 0x0, 3, FALSE, FALSE, FALSE, FALSE },
{ 0x2, 0x2, 0x2, 0x413, 0x3ca, 0x236, 0x424, 0x424, 0xffff, 0x1, MAPSEC_MYSTERY_ZONE, 0x0, 0x0, 0x6, 3, FALSE, FALSE, FALSE, FALSE },
@@ -595,9 +595,9 @@ const struct MapHeader UNK_020EEDBC[] = {
{ 0x20, 0xf, 0xa6, 0x74, 0x243, 0x79, 0x441, 0x441, 0xffff, 0x1ff, MAPSEC_CONTEST_HALL, 0x0, 0x0, 0x4, 7, FALSE, FALSE, FALSE, FALSE },
};
-u32 FUN_02034710(u32 mapno)
+u32 MapNumberBoundsCheck(u32 mapno)
{
- if (mapno >= NELEMS(UNK_020EEDBC))
+ if (mapno >= NELEMS(sMapHeaders))
{
GF_ASSERT(0);
mapno = 3;
@@ -607,121 +607,121 @@ u32 FUN_02034710(u32 mapno)
u8 FUN_02034724(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unk0;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unk0;
}
u8 FUN_02034738(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unk1;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unk1;
}
u16 FUN_0203474C(u32 mapno)
{
u16 ret;
- mapno = FUN_02034710(mapno);
- ret = UNK_020EEDBC[mapno].unk2;
+ mapno = MapNumberBoundsCheck(mapno);
+ ret = sMapHeaders[mapno].unk2;
// Spear Pillar
if (ret == 22 && gGameVersion == VERSION_PEARL)
ret = 23;
return ret;
}
-u16 FUN_02034774(u32 mapno)
+u16 MapHeader_GetMsgBank(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unk8;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unk8;
}
-u16 FUN_02034788(u32 mapno)
+u16 MapHeader_GetScrSeqReleaseNo(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unk4;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unk4;
}
u16 FUN_0203479C(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unk6;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unk6;
}
u16 FUN_020347B0(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unkA;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unkA;
}
u16 FUN_020347C4(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unkC;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unkC;
}
BOOL FUN_020347D8(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unkE != 0xFFFF;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unkE != 0xFFFF;
}
u16 FUN_020347FC(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unkE;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unkE;
}
u16 FUN_02034810(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unk10;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unk10;
}
u16 FUN_02034824(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].mapsec;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].mapsec;
}
u8 FUN_02034838(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unk14;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unk14;
}
u8 FUN_0203484C(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unk15;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unk15;
}
u8 FUN_02034860(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unk17_0;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unk17_0;
}
u8 FUN_0203487C(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unk17_6;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unk17_6;
}
u8 FUN_02034898(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unk17_7;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unk17_7;
}
u8 FUN_020348B4(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unk17_4;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unk17_4;
}
u8 FUN_020348D0(u32 mapno)
{
- mapno = FUN_02034710(mapno);
- return UNK_020EEDBC[mapno].unk16;
+ mapno = MapNumberBoundsCheck(mapno);
+ return sMapHeaders[mapno].unk16;
}
BOOL FUN_020348E4(u32 mapno)
diff --git a/arm9/src/script.c b/arm9/src/script.c
index 23515e5f..a5a5a6e4 100644
--- a/arm9/src/script.c
+++ b/arm9/src/script.c
@@ -1,21 +1,21 @@
#include "script.h"
-THUMB_FUNC void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd)
+THUMB_FUNC void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, u32 cmdCount)
{
- u32 i;
+ int i;
ctx->mode = 0;
- ctx->scriptPtr = 0;
+ ctx->scriptPtr = NULL;
ctx->stackDepth = 0;
- ctx->nativePtr = 0;
+ ctx->nativePtr = NULL;
ctx->cmdTable = cmdTable;
- ctx->cmdTableEnd = cmdTableEnd;
+ ctx->cmdCount = cmdCount;
- for (i = 0; i < 4; i++)
+ for (i = 0; i < NELEMS(ctx->data); i++)
ctx->data[i] = 0;
- for (i = 0; i < 20; i++)
- ctx->stack[i] = 0;
+ for (i = 0; i < NELEMS(ctx->stack); i++)
+ ctx->stack[i] = NULL;
ctx->unk74 = 0;
}
@@ -74,8 +74,7 @@ THUMB_FUNC u8 RunScriptCommand(struct ScriptContext *ctx)
}
cmdCode = ScriptReadHalfword(ctx);
- u32 cmdTableEnd = (u32)ctx->cmdTableEnd;
- if (cmdCode >= cmdTableEnd)
+ if (cmdCode >= ctx->cmdCount)
{
ErrorHandling();
ctx->mode = 0;
diff --git a/arm9/src/sound.c b/arm9/src/sound.c
index a89d0f56..d971872f 100644
--- a/arm9/src/sound.c
+++ b/arm9/src/sound.c
@@ -28,11 +28,11 @@ extern void FUN_02005CFC(void);
void InitSoundData(u32 a0, struct Options * a1)
{
struct SoundData * sdat = GetSoundDataPointer();
- FUN_020C01D0();
+ SDAT_Init();
FUN_020040C8();
FUN_02004064(sdat);
sdat->unk_00090 = FUN_020C2A94(sdat->unk_00094, sizeof(sdat->unk_00094));
- FUN_020C26F8(&sdat->header, "data/sound/sound_data.sdat", sdat->unk_00090, 0);
+ SDAT_Open(&sdat->header, "data/sound/sound_data.sdat", sdat->unk_00090, 0);
FUN_020C39CC(sdat->unk_00090);
FUN_02004088(sdat);
FUN_020040A4(sdat);
@@ -41,7 +41,7 @@ void InitSoundData(u32 a0, struct Options * a1)
FUN_02004D60(a1->unk0_4);
}
-void FUN_02003C10(void)
+void DoSoundUpdateFrame(void)
{
struct SoundData * sdat = GetSoundDataPointer();
if (!FUN_02003D04())
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 10:40:38 +0000