summaryrefslogtreecommitdiff
path: root/arm9/src
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/src')
-rw-r--r--arm9/src/main.c39
-rw-r--r--arm9/src/poke_overlay.c20
-rw-r--r--arm9/src/script.c7
-rw-r--r--arm9/src/string_util.c16
4 files changed, 22 insertions, 60 deletions
diff --git a/arm9/src/main.c b/arm9/src/main.c
index bc3ca71a..a038cd9a 100644
--- a/arm9/src/main.c
+++ b/arm9/src/main.c
@@ -1,6 +1,5 @@
#include "global.h"
#include "SPI_pm.h"
-#include "OS_interrupt.h"
#include "OS_system.h"
#include "CARD_backup.h"
#include "CARD_pullOut.h"
@@ -14,27 +13,22 @@ FS_EXTERN_OVERLAY(MODULE_63);
#define SOFT_RESET_KEY (PAD_BUTTON_L | PAD_BUTTON_R | PAD_BUTTON_START | PAD_BUTTON_SELECT)
-extern struct Unk21C48B8 gUnknown21C48B8;
-
struct Unk2106FA0 gBacklightTop;
extern BOOL FUN_02006234(struct Unk21DBE18 *, s32 *, int);
extern BOOL FUN_02006290(int);
extern void FUN_02006260(int);
extern BOOL FUN_02033678(void);
-extern int FUN_020335B8(void);
+extern u32 FUN_020335B8(void);
extern BOOL FUN_0202FB80(void);
-extern void FUN_02000FE8(void);
extern void FUN_02016464(void);
-extern void OS_WaitIrq();
extern void FUN_02016438(s32);
extern void InitSystemForTheGame(void);
extern void InitGraphicMemory(void);
extern void FUN_020163BC(void);
extern void FUN_02022294(void);
extern void FUN_0201259C(void);
-extern void FUN_02000DF4(void);
extern void FUN_02002C14(void);
extern void FUN_02002C50(int, int);
extern struct UnkStruct_021C59C8 * FUN_0202254C(void);
@@ -46,14 +40,8 @@ extern int FUN_020337E8(int);
extern void FUN_02034188(int, int);
extern int FUN_020227FC(struct UnkStruct_021C59C8 *);
extern void FUN_02089D90(int);
-extern void FUN_02000E7C(FSOverlayID, struct Unk21DBE18 *);
-extern void InitializeMainRNG(void);
extern void FUN_0200A2AC(void);
extern void FUN_02015E30(void);
-extern void FUN_02000EE8(void);
-void DoSoftReset(u32 parameter);
-extern BOOL FUN_0202FB80(void);
-extern void FUN_02000E0C(void);
extern void FUN_0201B5CC(int);
extern void FUN_020125D4(void);
extern void FUN_02015E60(void);
@@ -61,11 +49,6 @@ extern void FUN_020222C4(void);
extern void FUN_0200A318(void);
extern void FUN_0200E2D8(void);
extern void FUN_02003C10(void);
-extern void FUN_02000FE8(void);
-extern void FUN_02016464(void);
-
-void FUN_02000F4C(int arg0, int arg1);
-void FUN_02000FE8(void);
extern struct Unk21DBE18 MOD63_UNK_021DBE18;
extern struct Unk21DBE18 MOD52_UNK_021D76C8;
@@ -162,9 +145,9 @@ THUMB_FUNC void NitroMain(void)
THUMB_FUNC void FUN_02000DF4(void)
{
- gBacklightTop.unk8 = -1;
+ gBacklightTop.unk8 = (FSOverlayID)-1;
gBacklightTop.unkC = 0;
- gBacklightTop.unk10 = -1; // overlay invalid
+ gBacklightTop.unk10 = (FSOverlayID)-1; // overlay invalid
gBacklightTop.unk14 = NULL;
}
@@ -219,7 +202,7 @@ THUMB_FUNC void FUN_02000EC8(u32 parameter)
THUMB_FUNC void FUN_02000EE8(void)
{
- int r1 = FUN_020335B8();
+ u32 r1 = FUN_020335B8();
switch (r1)
{
case 1:
@@ -258,7 +241,7 @@ THUMB_FUNC void DoSoftReset(u32 parameter)
extern void FUN_02033F70(int, int, int);
-THUMB_FUNC void FUN_02000F4C(int arg0, int arg1)
+THUMB_FUNC void FUN_02000F4C(u32 arg0, u32 arg1)
{
if (arg1 == 3)
{
@@ -285,17 +268,17 @@ THUMB_FUNC void FUN_02000F4C(int arg0, int arg1)
}
extern void FUN_0201265C(struct Unk21C4818 *, struct Unk21C4828 *);
-extern void seedr_MT(int);
-extern void seedr_LC(int);
+extern void seedr_MT(u32);
+extern void seedr_LC(u32);
-void InitializeMainRNG(void)
+THUMB_FUNC void InitializeMainRNG(void)
{
struct Unk21C4818 spC;
struct Unk21C4828 sp0;
FUN_0201265C(&spC, &sp0);
{
- int r4 = gUnknown21C48B8.unk2C;
- int r5 = ((sp0.unk4 + sp0.unk8) << 24) + (spC.unk0 + ((256 * spC.unk4 * spC.unk8) << 16) + (sp0.unk0 << 16));
+ u32 r4 = gUnknown21C48B8.unk2C;
+ u32 r5 = ((sp0.unk4 + sp0.unk8) << 24) + (spC.unk0 + ((256 * spC.unk4 * spC.unk8) << 16) + (sp0.unk0 << 16));
seedr_MT(r4 + r5);
seedr_LC(r4 + r5);
}
@@ -304,7 +287,7 @@ void InitializeMainRNG(void)
extern void FUN_0201CE04(void);
extern void FUN_0201CDD0(void);
-void FUN_02000FE8(void)
+THUMB_FUNC void FUN_02000FE8(void)
{
PMBackLightSwitch top, bottom;
if (PAD_DetectFold())
diff --git a/arm9/src/poke_overlay.c b/arm9/src/poke_overlay.c
index 787cd65a..237cdc26 100644
--- a/arm9/src/poke_overlay.c
+++ b/arm9/src/poke_overlay.c
@@ -1,23 +1,11 @@
#include "global.h"
#include "nitro.h"
#include "FS_file.h"
+#include "FS_rom.h"
#include "poke_overlay.h"
-struct LoadedOverlay {
- FSOverlayID id;
- BOOL active;
-};
-
static struct LoadedOverlay gLoadedOverlays[3][8];
-struct LoadedOverlay* GetLoadedOverlaysInRegion(int);
-BOOL GetOverlayRamBounds(FSOverlayID, void**, void**);
-BOOL CanOverlayBeLoaded(FSOverlayID);
-int GetOverlayLoadDestination(FSOverlayID);
-BOOL LoadOverlayNormal(MIProcessor, FSOverlayID);
-BOOL LoadOverlayNoInit(MIProcessor, FSOverlayID);
-BOOL LoadOverlayNoInitAsync(MIProcessor, FSOverlayID);
-
THUMB_FUNC void FreeOverlayAllocation(struct LoadedOverlay * loaded)
{
if (loaded->active != TRUE)
@@ -41,7 +29,7 @@ THUMB_FUNC void UnloadOverlayByID(FSOverlayID id)
}
}
-THUMB_FUNC int GetOverlayLoadDestination(FSOverlayID id)
+THUMB_FUNC s32 GetOverlayLoadDestination(FSOverlayID id)
{
FSOverlayInfo info;
u8 *end;
@@ -59,7 +47,7 @@ THUMB_FUNC int GetOverlayLoadDestination(FSOverlayID id)
return OVERLAY_LOAD_WRAM;
}
-THUMB_FUNC BOOL HandleLoadOverlay(FSOverlayID id, int a1)
+THUMB_FUNC BOOL HandleLoadOverlay(FSOverlayID id, s32 a1)
{
u32 sp0 = FS_DMA_NOT_USE;
struct LoadedOverlay *r3;
@@ -140,7 +128,7 @@ THUMB_FUNC BOOL CanOverlayBeLoaded(FSOverlayID id)
return TRUE;
}
-THUMB_FUNC struct LoadedOverlay* GetLoadedOverlaysInRegion(int a0)
+THUMB_FUNC struct LoadedOverlay* GetLoadedOverlaysInRegion(s32 a0)
{
switch (a0)
{
diff --git a/arm9/src/script.c b/arm9/src/script.c
index 8a36f924..23515e5f 100644
--- a/arm9/src/script.c
+++ b/arm9/src/script.c
@@ -1,8 +1,5 @@
-#include "global.h"
#include "script.h"
-u16 ScriptReadHalfword(struct ScriptContext *ctx);
-
THUMB_FUNC void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd)
{
u32 i;
@@ -42,9 +39,9 @@ THUMB_FUNC void StopScript(struct ScriptContext *ctx)
ctx->scriptPtr = 0;
}
-THUMB_FUNC void FUN_02038B6C(struct ScriptContext *ctx, int r1)
+THUMB_FUNC void FUN_02038B6C(struct ScriptContext *ctx, s32 r1)
{
- ctx->unk74 = r1;
+ ctx->unk74 = (u32)r1;
}
THUMB_FUNC u8 RunScriptCommand(struct ScriptContext *ctx)
diff --git a/arm9/src/string_util.c b/arm9/src/string_util.c
index e6ea85de..e36f1a30 100644
--- a/arm9/src/string_util.c
+++ b/arm9/src/string_util.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "string_util.h"
#define EOS 0xFFFF
#define NON_DIGIT 0xE2
@@ -124,23 +124,17 @@ THUMB_FUNC u16 *StringFillEOS(u16 *dest, u32 num)
return StringFill(dest, EOS, num);
}
-enum PrintingMode {
- NORMAL,
- PAD_SPACE,
- PAD_ZEROES
-};
-
THUMB_FUNC u16 *ConvertUIntToDecimalString(u16 *dest, u32 value, enum PrintingMode mode, u32 n)
{
- for (u32 x = gPowersOfTen[n - 1]; x != 0; x = x / 10) {
- u16 res = value / x;
+ for (u32 x = (u32)gPowersOfTen[n - 1]; x != 0; x = x / 10) {
+ u16 res = (u16)(value / x);
value = value - x * res;
if (mode == PAD_ZEROES) {
- *dest = res >= 10 ? NON_DIGIT : gDigitTable[res];
+ *dest = res >= 10 ? (u16)NON_DIGIT : gDigitTable[res];
dest++;
} else if (res != 0 || x == 1) {
mode = PAD_ZEROES;
- *dest = res >= 10 ? NON_DIGIT : gDigitTable[res];
+ *dest = res >= 10 ? (u16)NON_DIGIT : gDigitTable[res];
dest++;
} else if (mode == PAD_SPACE) {
*dest = 1;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 11:33:07 +0000