diff options
Diffstat (limited to 'arm9/src')
| -rw-r--r-- | arm9/src/main.c | 1 | ||||
| -rw-r--r-- | arm9/src/poke_overlay.c | 19 | ||||
| -rw-r--r-- | arm9/src/string_util.c | 16 |
3 files changed, 8 insertions, 28 deletions
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;
|