From caf682d92bfe069c09b7cf024c995255705d33b1 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 24 May 2020 18:28:58 +0100 Subject: fix warnings in script.h --- arm9/src/script.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'arm9/src') diff --git a/arm9/src/script.c b/arm9/src/script.c index 8a36f924..7f15f251 100644 --- a/arm9/src/script.c +++ b/arm9/src/script.c @@ -1,4 +1,3 @@ -#include "global.h" #include "script.h" u16 ScriptReadHalfword(struct ScriptContext *ctx); @@ -42,9 +41,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) -- cgit v1.2.3 From cf80ce7a82b3193261a76caeefd009ca5e862ac5 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 24 May 2020 18:56:21 +0100 Subject: add header for GFLIB_sysctl and fix warnings --- arm9/src/GFLIB_sysctl.c | 32 ++++++++++++-------------------- arm9/src/script.c | 2 -- 2 files changed, 12 insertions(+), 22 deletions(-) (limited to 'arm9/src') diff --git a/arm9/src/GFLIB_sysctl.c b/arm9/src/GFLIB_sysctl.c index bc856768..f77ad2a3 100644 --- a/arm9/src/GFLIB_sysctl.c +++ b/arm9/src/GFLIB_sysctl.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "GFLIB_sysctl.h" #include "SPI_pm.h" #include "OS_interrupt.h" #include "OS_system.h" @@ -6,30 +6,22 @@ #include "CARD_pullOut.h" #include "CTRDG_common.h" #include "PAD_pad.h" -#include "main.h" #include "poke_overlay.h" -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); -void FUN_02000F4C(int arg0, int arg1); -void FUN_02000FE8(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; } @@ -84,7 +76,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: @@ -123,7 +115,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) { @@ -150,17 +142,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); } @@ -169,7 +161,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/script.c b/arm9/src/script.c index 7f15f251..23515e5f 100644 --- a/arm9/src/script.c +++ b/arm9/src/script.c @@ -1,7 +1,5 @@ #include "script.h" -u16 ScriptReadHalfword(struct ScriptContext *ctx); - THUMB_FUNC void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd) { u32 i; -- cgit v1.2.3 From 7fc5b85153fd60c9115ce36c6210a253abb4ae50 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 24 May 2020 20:59:13 +0100 Subject: fix more warnings --- arm9/src/main.c | 1 - arm9/src/poke_overlay.c | 19 +++---------------- arm9/src/string_util.c | 16 +++++----------- 3 files changed, 8 insertions(+), 28 deletions(-) (limited to 'arm9/src') diff --git a/arm9/src/main.c b/arm9/src/main.c index 9e6a6227..14abf075 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -10,7 +10,6 @@ FS_EXTERN_OVERLAY(MODULE_63); extern struct Unk21C48B8 gUnknown21C48B8; -extern void OS_WaitIrq(); extern void FUN_02016438(s32); extern void InitSystemForTheGame(void); extern void InitGraphicMemory(void); diff --git a/arm9/src/poke_overlay.c b/arm9/src/poke_overlay.c index 787cd65a..b557d412 100644 --- a/arm9/src/poke_overlay.c +++ b/arm9/src/poke_overlay.c @@ -3,21 +3,8 @@ #include "FS_file.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 +28,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 +46,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 +127,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/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; -- cgit v1.2.3 From 26e7f74e3b01a6fb65fbb754d181dfee54480c13 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 24 May 2020 21:30:34 +0100 Subject: more warnings --- arm9/src/poke_overlay.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arm9/src') diff --git a/arm9/src/poke_overlay.c b/arm9/src/poke_overlay.c index b557d412..237cdc26 100644 --- a/arm9/src/poke_overlay.c +++ b/arm9/src/poke_overlay.c @@ -1,6 +1,7 @@ #include "global.h" #include "nitro.h" #include "FS_file.h" +#include "FS_rom.h" #include "poke_overlay.h" static struct LoadedOverlay gLoadedOverlays[3][8]; -- cgit v1.2.3