Replace explicit GF_AssertFail with GF_ASSERT

8 files changed, 36 insertions, 73 deletions

diff --git a/arm9/src/filesystem.c b/arm9/src/filesystem.c
index ed82acb9..37d381a3 100644
--- a/arm9/src/filesystem.c
+++ b/arm9/src/filesystem.c
@@ -175,8 +175,7 @@ THUMB_FUNC void ReadFromNarcMemberByPathAndId(void * dest, const char * path, s3
     FS_SeekFile(&file, (s32)(chunk_starts[0] + 4), FS_SEEK_SET);
     FS_ReadFile(&file, &chunk_size, 4);
     FS_ReadFile(&file, &num_files, 2);
-    if (num_files <= file_idx)
-        GF_AssertFail();
+    GF_ASSERT(num_files > file_idx);
     chunk_starts[1] = chunk_starts[0] + chunk_size;
     FS_SeekFile(&file, (s32)(chunk_starts[1] + 4), FS_SEEK_SET);
     FS_ReadFile(&file, &chunk_size, 4);
@@ -190,8 +189,7 @@ THUMB_FUNC void ReadFromNarcMemberByPathAndId(void * dest, const char * path, s3
         chunk_size = file_end - file_start;
     else
         chunk_size = size;
-    if (chunk_size == 0)
-        GF_AssertFail();
+    GF_ASSERT(chunk_size != 0);
     FS_ReadFile(&file, dest, (s32)chunk_size);
     FS_CloseFile(&file);
 }
@@ -216,8 +214,7 @@ THUMB_FUNC void * AllocAndReadFromNarcMemberByPathAndId(const char * path, s32 f
     FS_SeekFile(&file, (s32)(chunk_starts[0] + 4), FS_SEEK_SET);
     FS_ReadFile(&file, &chunk_size, 4);
     FS_ReadFile(&file, &num_files, 2);
-    if (num_files <= file_idx)
-        GF_AssertFail();
+    GF_ASSERT(num_files > file_idx);
     chunk_starts[1] = chunk_starts[0] + chunk_size;
     FS_SeekFile(&file, (s32)(chunk_starts[1] + 4), FS_SEEK_SET);
     FS_ReadFile(&file, &chunk_size, 4);
@@ -231,8 +228,7 @@ THUMB_FUNC void * AllocAndReadFromNarcMemberByPathAndId(const char * path, s32 f
         chunk_size = file_end - file_start;
     else
         chunk_size = size;
-    if (chunk_size == 0)
-        GF_AssertFail();
+    GF_ASSERT(chunk_size != 0);
     switch (r4)
     {
     case 0:
@@ -296,8 +292,7 @@ THUMB_FUNC u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx)
     FS_SeekFile(&file, (s32)(chunk_starts[0] + 4), FS_SEEK_SET);
     FS_ReadFile(&file, &chunk_size, 4);
     FS_ReadFile(&file, &num_files, 2);
-    if (num_files <= file_idx)
-        GF_AssertFail();
+    GF_ASSERT(num_files > file_idx);
     chunk_starts[1] = chunk_starts[0] + chunk_size;
     FS_SeekFile(&file, (s32)(chunk_starts[1] + 4), FS_SEEK_SET);
     FS_ReadFile(&file, &chunk_size, 4);
@@ -308,8 +303,7 @@ THUMB_FUNC u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx)
     chunk_starts[2] = chunk_starts[1] + btnf_size;
     FS_SeekFile(&file, (s32)(chunk_starts[2] + 8 + file_start + 0), FS_SEEK_SET);
     chunk_size = file_end - file_start;
-    if (chunk_size == 0)
-        GF_AssertFail();
+    GF_ASSERT(chunk_size != 0);
     // Bug: File is never closed
     return chunk_size;
 }
@@ -348,8 +342,7 @@ THUMB_FUNC void * NARC_AllocAndReadWholeMember(NARC * narc, u32 file_id, u32 hea
     u32 file_start;
     u32 file_end;
     void * dest;
-    if (narc->num_files <= file_id)
-        GF_AssertFail();
+    GF_ASSERT(narc->num_files > file_id);
     FS_SeekFile(&narc->file, (s32)(narc->btaf_start + 12 + 8 * file_id), FS_SEEK_SET);
     FS_ReadFile(&narc->file, &file_start, 4);
     FS_ReadFile(&narc->file, &file_end, 4);
@@ -366,8 +359,7 @@ THUMB_FUNC void NARC_ReadWholeMember(NARC * narc, u32 file_id, void * dest)
 {
     u32 file_start;
     u32 file_end;
-    if (narc->num_files <= file_id)
-        GF_AssertFail();
+    GF_ASSERT(narc->num_files > file_id);
     FS_SeekFile(&narc->file, (s32)(narc->btaf_start + 12 + 8 * file_id), FS_SEEK_SET);
     FS_ReadFile(&narc->file, &file_start, 4);
     FS_ReadFile(&narc->file, &file_end, 4);
@@ -379,8 +371,7 @@ THUMB_FUNC u32 NARC_GetMemberSize(NARC * narc, u32 file_id)
 {
     u32 file_start;
     u32 file_end;
-    if (narc->num_files <= file_id)
-        GF_AssertFail();
+    GF_ASSERT(narc->num_files > file_id);
     FS_SeekFile(&narc->file, (s32)(narc->btaf_start + 12 + 8 * file_id), FS_SEEK_SET);
     FS_ReadFile(&narc->file, &file_start, 4);
     FS_ReadFile(&narc->file, &file_end, 4);
@@ -390,8 +381,7 @@ THUMB_FUNC u32 NARC_GetMemberSize(NARC * narc, u32 file_id)
 THUMB_FUNC void NARC_ReadFromMember(NARC * narc, u32 file_id, u32 pos, u32 size, void * dest)
 {
     u32 file_start;
-    if (narc->num_files <= file_id)
-        GF_AssertFail();
+    GF_ASSERT(narc->num_files > file_id);
     FS_SeekFile(&narc->file, (s32)(narc->btaf_start + 12 + 8 * file_id), FS_SEEK_SET);
     FS_ReadFile(&narc->file, &file_start, 4);
     FS_SeekFile(&narc->file, (s32)(narc->gmif_start + 8 + file_start + pos), FS_SEEK_SET);
diff --git a/arm9/src/main.c b/arm9/src/main.c
index fa35c81c..979fb7ca 100644
--- a/arm9/src/main.c
+++ b/arm9/src/main.c
@@ -168,8 +168,7 @@ THUMB_FUNC void Main_RunOverlayManager(void)
 
 THUMB_FUNC void RegisterMainOverlay(FSOverlayID id, const struct Unk21DBE18 * arg1)
 {
-    if (UNK_02016FA8.unkC != NULL)
-        GF_AssertFail();
+    GF_ASSERT(UNK_02016FA8.unkC == NULL);
     UNK_02016FA8.unk8 = id;
     UNK_02016FA8.unkC = arg1;
 }
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;
diff --git a/arm9/src/script.c b/arm9/src/script.c
index 3de2ee73..3e8cca58 100644
--- a/arm9/src/script.c
+++ b/arm9/src/script.c
@@ -76,7 +76,7 @@ THUMB_FUNC u8 RunScriptCommand(struct ScriptContext *ctx)
             cmdCode = ScriptReadHalfword(ctx);

             if (cmdCode >= ctx->cmdCount)

             {

-                GF_AssertFail();

+                GF_ASSERT(0);

                 ctx->mode = 0;

                 return FALSE;

             }

diff --git a/arm9/src/script_pokemon_util.c b/arm9/src/script_pokemon_util.c
index 55519ca3..de78ae28 100644
--- a/arm9/src/script_pokemon_util.c
+++ b/arm9/src/script_pokemon_util.c
@@ -109,7 +109,7 @@ struct Pokemon * GetFirstAliveMonInParty_CrashIfNone(struct PlayerParty * party)
         if(MonNotFaintedOrEgg(mon))

             return mon;

     }

-    GF_AssertFail();

+    GF_ASSERT(0);

     return 0;

 }

 

diff --git a/arm9/src/unk_0200BB14.c b/arm9/src/unk_0200BB14.c
index 358d21ea..4ed957d6 100644
--- a/arm9/src/unk_0200BB14.c
+++ b/arm9/src/unk_0200BB14.c
@@ -517,13 +517,8 @@ THUMB_FUNC BOOL FUN_0200C00C(u32 *param0,
         return TRUE;
     }
 
-    GF_AssertFail();
-    if (r5 != 0)
-    {
-        return TRUE;
-    }
-
-    return FALSE;
+    GF_ASSERT(0);
+    return r5 != 0 ? TRUE : FALSE;
 }
 
 THUMB_FUNC s32 FUN_0200C06C(u32 *param0,
@@ -549,7 +544,7 @@ THUMB_FUNC s32 FUN_0200C06C(u32 *param0,
         return (s8)FUN_02009E88(r5, param6);
     }
 
-    GF_AssertFail();
+    GF_ASSERT(0);
     return -1;
 }
 
@@ -721,7 +716,7 @@ THUMB_FUNC struct UnkStruct_0200BB14_5 *FUN_0200C154(
     }
     else
     {
-        GF_AssertFail();
+        GF_ASSERT(0);
     }
 
     return ptr;
@@ -805,13 +800,8 @@ THUMB_FUNC BOOL FUN_0200C404(u32 *param0,
         GF_ASSERT(r4 == 1);
         return r4;
     }
-    GF_AssertFail();
-    if (r5 != 0)
-    {
-        return TRUE;
-    }
-
-    return FALSE;
+    GF_ASSERT(0);
+    return r5 != 0 ? TRUE : FALSE;
 }
 
 THUMB_FUNC BOOL FUN_0200C474(u32 *param0, u32 param1)
@@ -1259,13 +1249,8 @@ THUMB_FUNC BOOL FUN_0200C918(u32 *param0,
         return TRUE;
     }
 
-    GF_AssertFail();
-    if (r5 != 0)
-    {
-        return TRUE;
-    }
-
-    return FALSE;
+    GF_ASSERT(0);
+    return r5 != 0 ? TRUE : FALSE;
 }
 
 THUMB_FUNC BOOL FUN_0200C978(u32 *param0,
@@ -1290,13 +1275,8 @@ THUMB_FUNC BOOL FUN_0200C978(u32 *param0,
         return TRUE;
     }
 
-    GF_AssertFail();
-    if (r5 != 0)
-    {
-        return TRUE;
-    }
-
-    return FALSE;
+    GF_ASSERT(0);
+    return r5 != 0 ? TRUE : FALSE;
 }
 
 THUMB_FUNC void FUN_0200C9D8(
diff --git a/arm9/src/unk_0202E29C.c b/arm9/src/unk_0202E29C.c
index 2b088d6f..52ee3143 100644
--- a/arm9/src/unk_0202E29C.c
+++ b/arm9/src/unk_0202E29C.c
@@ -432,7 +432,7 @@ THUMB_FUNC s32 FUN_0202E844(u32 param0)
         count++;
     }
 
-    GF_AssertFail();
+    GF_ASSERT(0);
     return 0;
 }
 
diff --git a/arm9/src/unk_0202F150.c b/arm9/src/unk_0202F150.c
index ef9a6193..e5188db2 100644
--- a/arm9/src/unk_0202F150.c
+++ b/arm9/src/unk_0202F150.c
@@ -93,10 +93,7 @@ THUMB_FUNC u32 FUN_0202F150(u32 param0, u32 param1)
     {
 
         r4 = 1;
-        if (UNK_021C59F4.unk04 == 0)
-        {
-            GF_AssertFail();
-        }
+        GF_ASSERT(UNK_021C59F4.unk04 != 0);
     }
 
     UNK_021C59F4.unk04->unk65C = 0;
@@ -1191,7 +1188,7 @@ THUMB_FUNC void FUN_020304D4(u32 param0)
         return;
     }
 
-    GF_AssertFail();
+    GF_ASSERT(0);
 }
 
 THUMB_FUNC void FUN_020304F0(u32 param0)
@@ -1202,7 +1199,7 @@ THUMB_FUNC void FUN_020304F0(u32 param0)
         return;
     }
 
-    GF_AssertFail();
+    GF_ASSERT(0);
 }
 
 THUMB_FUNC void FUN_0203050C()
@@ -1741,7 +1738,7 @@ THUMB_FUNC u32 FUN_02030B3C(u32 param0, u8 *param1, u32 param2)
 {
     if (FUN_02031190() != 0)
     {
-        GF_AssertFail();
+        GF_ASSERT(0);
         return 0;
     }