diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-26 09:42:03 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-26 09:42:03 -0400 |
| commit | 8c8a5a07c5e6b1a2d0d0592a30be31ccd140fc1e (patch) | |
| tree | c23120a706d012bd19c4c2584af5009fd2016ecf /arm9/src/poke_overlay.c | |
| parent | e643eddc0def8e4851a4195e8ed4de06c847f52d (diff) | |
| parent | 227da51c377f621f542ffdb52ef56bfb807f29ab (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/src/poke_overlay.c')
| -rw-r--r-- | arm9/src/poke_overlay.c | 20 |
1 files changed, 4 insertions, 16 deletions
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) { |