diff options
Diffstat (limited to 'arm9/src/poke_overlay.c')
| -rw-r--r-- | arm9/src/poke_overlay.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/arm9/src/poke_overlay.c b/arm9/src/poke_overlay.c index e11ecbb6..bb5bb891 100644 --- a/arm9/src/poke_overlay.c +++ b/arm9/src/poke_overlay.c @@ -8,10 +8,8 @@ static struct LoadedOverlay gLoadedOverlays[3][8]; THUMB_FUNC void FreeOverlayAllocation(struct LoadedOverlay * loaded) { - if (loaded->active != TRUE) - GF_AssertFail(); - if (FS_UnloadOverlay(MI_PROCESSOR_ARM9, loaded->id) != TRUE) - GF_AssertFail(); + GF_ASSERT(loaded->active == TRUE); + GF_ASSERT(FS_UnloadOverlay(MI_PROCESSOR_ARM9, loaded->id) == TRUE); loaded->active = FALSE; } @@ -34,8 +32,7 @@ THUMB_FUNC s32 GetOverlayLoadDestination(FSOverlayID id) FSOverlayInfo info; u8 *end; u8 *start; - if (FS_LoadOverlayInfo(&info, MI_PROCESSOR_ARM9, id) != TRUE) - GF_AssertFail(); + GF_ASSERT(FS_LoadOverlayInfo(&info, MI_PROCESSOR_ARM9, id) == TRUE); start = (u8 *)HW_ITCM_IMAGE; end = (u8 *)HW_ITCM_END; if (info.header.ram_address <= end && info.header.ram_address >= start) @@ -72,7 +69,7 @@ THUMB_FUNC BOOL HandleLoadOverlay(FSOverlayID id, s32 a1) } if (r6 >= 8) { - GF_AssertFail(); + GF_ASSERT(0); return FALSE; } if (r7 == OVERLAY_LOAD_ITCM || r7 == OVERLAY_LOAD_DTCM) @@ -91,7 +88,7 @@ THUMB_FUNC BOOL HandleLoadOverlay(FSOverlayID id, s32 a1) result = LoadOverlayNoInitAsync(MI_PROCESSOR_ARM9, id); break; default: - GF_AssertFail(); + GF_ASSERT(0); return FALSE; } if (r7 == OVERLAY_LOAD_ITCM || r7 == OVERLAY_LOAD_DTCM) @@ -100,7 +97,7 @@ THUMB_FUNC BOOL HandleLoadOverlay(FSOverlayID id, s32 a1) } if (result == 0) { - GF_AssertFail(); + GF_ASSERT(0); return FALSE; } return TRUE; @@ -120,7 +117,7 @@ THUMB_FUNC BOOL CanOverlayBeLoaded(FSOverlayID id) { if ((start >= start2 && start < end2) || (end > start2 && end <= end2) || (start <= start2 && end >= end2)) { - GF_AssertFail(); + GF_ASSERT(0); return FALSE; } } @@ -146,7 +143,7 @@ THUMB_FUNC BOOL GetOverlayRamBounds(FSOverlayID id, void ** start, void ** end) { FSOverlayInfo info; if (!FS_LoadOverlayInfo(&info, MI_PROCESSOR_ARM9, id)) { - GF_AssertFail(); + GF_ASSERT(0); return FALSE; } *start = (void *)info.header.ram_address; |