Match FireRed Rev1

12 files changed, 67 insertions, 66 deletions

diff --git a/src/cereader_tool.c b/src/cereader_tool.c
index 654a70b48..2c5d05018 100644
--- a/src/cereader_tool.c
+++ b/src/cereader_tool.c
@@ -41,8 +41,8 @@ bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * ttdata)
 
 static bool32 CEReaderTool_SaveTrainerTower_r(struct EReaderTrainerHillSet * ttdata, u8 * buffer)
 {
-    AGB_ASSERT_EX(ttdata->dummy == 0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/cereader_tool.c", 198);
-    AGB_ASSERT_EX(ttdata->id == 0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/cereader_tool.c", 199)
+    AGB_ASSERT_EX(ttdata->dummy == 0, ABSPATH("cereader_tool.c"), 198);
+    AGB_ASSERT_EX(ttdata->id == 0, ABSPATH("cereader_tool.c"), 199)
 
     memset(buffer, 0, 0x1000);
     memcpy(buffer, ttdata, SEC30_SIZE);
diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h
index 3285c8d11..be073876f 100644
--- a/src/data/pokemon/pokedex_text.h
+++ b/src/data/pokemon/pokedex_text.h
@@ -1063,9 +1063,14 @@ const u8 gMewPokedexText[] = _(
 const u8 gMewPokedexTextUnused[] = _("");
 
 const u8 gChikoritaPokedexText[] = _(
+#if REVISION == 0
     "Its pleasantly aromatic leaves have the\n"
+#else
+    "Its pleasantly aromatic leaf has the\n"
+#endif
     "ability to check the humidity and\n"
-    "temperature.");
+    "temperature."
+);
 
 const u8 gChikoritaPokedexTextUnused[] = _("");
 
@@ -1735,9 +1740,16 @@ const u8 gPupitarPokedexText[] = _(
 const u8 gPupitarPokedexTextUnused[] = _("");
 
 const u8 gTyranitarPokedexText[] = _(
+#if REVISION == 0
     "Its body can't be harmed by any sort of\n"
     "attack, so it is very eager to make\n"
-    "challenges against enemies.");
+    "challenges against enemies."
+#else
+    "It has an impudent nature. Having great\n"
+    "strength, it can even change surrounding\n"
+    "landforms."
+#endif
+);
 
 const u8 gTyranitarPokedexTextUnused[] = _("");
 
diff --git a/src/daycare.c b/src/daycare.c
index 8862dfda9..b3e76faba 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -1503,7 +1503,11 @@ static void DaycarePrintMonLvl(struct DayCare *daycare, u8 windowId, u32 daycare
     u8 lvlText[12];
     u8 intText[8];
 
+#if REVISION == 0
     strcpy((char *)lvlText, (const char *)gText_Lv);
+#else
+    StringCopy(lvlText, gText_Lv);
+#endif
     level = GetLevelAfterDaycareSteps(&daycare->mons[daycareSlotId].mon, daycare->mons[daycareSlotId].steps);
     ConvertIntToDecimalStringN(intText, level, STR_CONV_MODE_LEFT_ALIGN, 3);
     StringAppend(lvlText, intText);
diff --git a/src/field_specials.c b/src/field_specials.c
index de3bc7d57..7abc3f5c9 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1915,7 +1915,7 @@ u16 Special_BattleCardAction(void)
     case 4:
         return sub_81445C0(2);
     default:
-        AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c", 3873);
+        AGB_ASSERT_EX(0, ABSPATH("scr_tool.c"), 3873);
         return 0;
     }
 }
diff --git a/src/fieldmap.c b/src/fieldmap.c
index 5582b6977..adb26f230 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -83,7 +83,7 @@ void sub_8058A00(struct MapHeader * mapHeader)
     VMap.map = gBackupMapLayout;
     VMap.Xsize = mapLayout->width + 15;
     VMap.Ysize = mapLayout->height + 14;
-    AGB_ASSERT_EX(VMap.Xsize * VMap.Ysize <= VIRTUAL_MAP_SIZE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/fieldmap.c", 158);
+    AGB_ASSERT_EX(VMap.Xsize * VMap.Ysize <= VIRTUAL_MAP_SIZE, ABSPATH("fieldmap.c"), 158);
     map_copy_with_padding(mapLayout->map, mapLayout->width, mapLayout->height);
     mapheader_copy_mapdata_of_adjacent_maps(mapHeader);
 }
diff --git a/src/intro.c b/src/intro.c
index 8757db81d..cee1c8fec 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1599,31 +1599,12 @@ static struct Sprite * sub_80EDF68(void)
 }
 
 #if REVISION >= 1
-static const struct OamData sOamData_840BD64 = {
-    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = ST_OAM_OBJ_BLEND,
-    .mosaic = FALSE,
-    .bpp = ST_OAM_4BPP,
-    .shape = SPRITE_SHAPE(8x32),
-    .size = SPRITE_SIZE(8x32),
-    .priority = 3
-};
-
-static const struct SpriteTemplate sSprTemplate_rev1_840BD6C = {
-    .tileTag = 4,
-    .paletteTag = 3,
-    .oam = &sOamData_840BD64,
-    .anims = gDummySpriteAnimTable,
-    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = SpriteCallbackDummy
-};
-
 static void sub_rev1_80EDFAC(void)
 {
     int i;
     for (i = 0; i < 2; i++)
     {
-        gSprites[CreateSprite(&sSprTemplate_rev1_840BD6C, 0x68 + 32 * i, 0x6c, 5)].oam.tileNum += i * 4;
+        gSprites[CreateSprite(&gUnknown_840BCFC, 0x68 + 32 * i, 0x6c, 5)].oam.tileNum += i * 4;
     }
 }
 #endif
diff --git a/src/main.c b/src/main.c
index 394a1f42a..6d50e5fd3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -66,7 +66,11 @@ const u8 gGameVersion = GAME_VERSION;
 
 const u8 gGameLanguage = GAME_LANGUAGE;
 
+#if REVISION == 0
 const char BuildDateTime[] = "2004 04 26 11:20";
+#else
+const char BuildDateTime[] = "2004 07 20 09:30";
+#endif
 
 const IntrFunc gIntrTableTemplate[] =
 {
diff --git a/src/malloc.c b/src/malloc.c
index 4768721ba..590d45c05 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -93,7 +93,7 @@ void *AllocInternal(void *heapStart, u32 size)
 
         if (pos->next == head)
         {
-            AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/gflib/malloc.c", 174);
+            AGB_ASSERT_EX(0, ABSPATH("gflib/malloc.c"), 174);
             return NULL;
         }
 
@@ -103,20 +103,20 @@ void *AllocInternal(void *heapStart, u32 size)
 
 void FreeInternal(void *heapStart, void *p)
 {
-    AGB_ASSERT_EX(p != NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/gflib/malloc.c", 195);
+    AGB_ASSERT_EX(p != NULL, ABSPATH("gflib/malloc.c"), 195);
 
     if (p) {
         struct MemBlock *head = (struct MemBlock *)heapStart;
         struct MemBlock *pos = (struct MemBlock *)((u8 *)p - sizeof(struct MemBlock));
-        AGB_ASSERT_EX(pos->magic_number == MALLOC_SYSTEM_ID, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/gflib/malloc.c", 204);
-        AGB_ASSERT_EX(pos->flag == TRUE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/gflib/malloc.c", 205);
+        AGB_ASSERT_EX(pos->magic_number == MALLOC_SYSTEM_ID, ABSPATH("gflib/malloc.c"), 204);
+        AGB_ASSERT_EX(pos->flag == TRUE, ABSPATH("gflib/malloc.c"), 205);
         pos->flag = FALSE;
 
         // If the freed block isn't the last one, merge with the next block
         // if it's not in use.
         if (pos->next != head) {
             if (!pos->next->flag) {
-                AGB_ASSERT_EX(pos->next->magic_number == MALLOC_SYSTEM_ID, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/gflib/malloc.c", 211);
+                AGB_ASSERT_EX(pos->next->magic_number == MALLOC_SYSTEM_ID, ABSPATH("gflib/malloc.c"), 211);
                 pos->size += sizeof(struct MemBlock) + pos->next->size;
                 pos->next->magic_number = 0;
                 pos->next = pos->next->next;
@@ -129,7 +129,7 @@ void FreeInternal(void *heapStart, void *p)
         // if it's not in use.
         if (pos != head) {
             if (!pos->prev->flag) {
-                AGB_ASSERT_EX(pos->prev->magic_number == MALLOC_SYSTEM_ID, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/gflib/malloc.c", 228);
+                AGB_ASSERT_EX(pos->prev->magic_number == MALLOC_SYSTEM_ID, ABSPATH("gflib/malloc.c"), 228);
 
                 pos->prev->next = pos->next;
 
diff --git a/src/menews_jisan.c b/src/menews_jisan.c
index f38de9cfd..d8971f6a2 100644
--- a/src/menews_jisan.c
+++ b/src/menews_jisan.c
@@ -142,7 +142,7 @@ static u32 GetMENewsJisanState(struct MENewsJisanStruct *a0)
             return 4;
         return 5;
     default:
-        AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/menews_jisan.c", 383);
+        AGB_ASSERT_EX(0, ABSPATH("menews_jisan.c"), 383);
         return 0;
     }
 }
diff --git a/src/mevent.c b/src/mevent.c
index 5ed001d09..3eff0c086 100644
--- a/src/mevent.c
+++ b/src/mevent.c
@@ -852,7 +852,7 @@ u16 sub_81444B0(const struct MEventClientHeaderStruct * a0, u32 command)
         case 4:
             return a0->unk_44;
         default:
-             AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 825);
+             AGB_ASSERT_EX(0, ABSPATH("mevent.c"), 825);
             return 0;
     }
 }
@@ -881,7 +881,7 @@ void sub_814451C(u32 command)
         }
         if (dest == NULL)
         {
-             AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 868);
+             AGB_ASSERT_EX(0, ABSPATH("mevent.c"), 868);
         }
         else if (++(*dest) > 999)
         {
@@ -939,7 +939,7 @@ u16 sub_81445C0(u32 command)
             break;
         }
     }
-    AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 913);
+    AGB_ASSERT_EX(0, ABSPATH("mevent.c"), 913);
     return 0;
 }
 
@@ -977,7 +977,7 @@ void sub_8144714(u32 a0, u32 a1)
                 sub_8144824(1, a1, gSaveBlock1Ptr->mysteryEventBuffers.unk_344[0], 5);
                 break;
             default:
-                 AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 988);
+                 AGB_ASSERT_EX(0, ABSPATH("mevent.c"), 988);
         }
     }
 }
diff --git a/src/mevent_server.c b/src/mevent_server.c
index 252a8885f..bebd69fe3 100644
--- a/src/mevent_server.c
+++ b/src/mevent_server.c
@@ -68,7 +68,7 @@ static void mevent_srv_free_resources(struct mevent_srv_common * svr)
 
 static void mevent_srv_common_init_send(struct mevent_srv_common * svr, u32 ident, const void * src, u32 size)
 {
-     AGB_ASSERT_EX(size <= ME_SEND_BUF_SIZE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 257);
+     AGB_ASSERT_EX(size <= ME_SEND_BUF_SIZE, ABSPATH("mevent_server.c"), 257);
     mevent_srv_sub_init_send(&svr->manager, ident, src, size);
 }
 
@@ -129,7 +129,7 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr)
     switch (cmd->instr)
     {
         case 0:
-            AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 354);
+            AGB_ASSERT_EX(cmd->parameter == NULL, ABSPATH("mevent_server.c"), 354);
             svr->mainseqno = 1;
             svr->param = cmd->flag;
             break;
@@ -137,23 +137,23 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr)
             svr->mainseqno = 3;
             break;
         case 2:
-            AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 364);
+            AGB_ASSERT_EX(cmd->parameter == NULL, ABSPATH("mevent_server.c"), 364);
             mevent_srv_sub_init_recv(&svr->manager, cmd->flag, svr->recvBuffer);
             svr->mainseqno = 2;
             break;
         case 3:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 370);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 370);
             svr->cmdidx = 0;
             svr->cmdBuffer = cmd->parameter;
             break;
         case 5:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 376);
-            AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 377);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 376);
+            AGB_ASSERT_EX(cmd->parameter == NULL, ABSPATH("mevent_server.c"), 377);
             memcpy(svr->mevent_unk1442cc, svr->recvBuffer, sizeof(struct MEventClientHeaderStruct));
             break;
         case 6:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 382);
-            AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 383);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 382);
+            AGB_ASSERT_EX(cmd->parameter == NULL, ABSPATH("mevent_server.c"), 383);
             svr->param = ValidateMEventClientHeader(svr->mevent_unk1442cc);
             break;
         case 4:
@@ -164,42 +164,42 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr)
             }
             break;
         case 7:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 396);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 396);
             ptr = mevent_first_if_not_null_else_second(cmd->parameter, svr->card);
             svr->param = sub_8144418(ptr, svr->mevent_unk1442cc, ptr);
             break;
         case 8:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 402);
-            AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 403);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 402);
+            AGB_ASSERT_EX(cmd->parameter == NULL, ABSPATH("mevent_server.c"), 403);
             svr->param = *(u32 *)svr->recvBuffer;
             break;
         case 9:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 408);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 408);
             ptr = mevent_first_if_not_null_else_second(cmd->parameter, &svr->sendWord);
             svr->param = sub_8144434(ptr, svr->mevent_unk1442cc, ptr);
             break;
         case 10:
-            AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 415);
+            AGB_ASSERT_EX(cmd->parameter == NULL, ABSPATH("mevent_server.c"), 415);
             svr->param = sub_81444B0(svr->mevent_unk1442cc, cmd->flag);
             break;
         case 11:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 420);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 420);
             svr->param = sub_8144474(svr->mevent_unk1442cc, cmd->parameter);
             break;
         case 12:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 426);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 426);
             svr->param = mevent_compare_pointers(cmd->parameter, *(void **)svr->recvBuffer);
             break;
         case 14:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 432);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 432);
             mevent_srv_common_init_send(svr, 0x17, mevent_first_if_not_null_else_second(cmd->parameter, svr->news), sizeof(struct MEWonderNewsData));
             break;
         case 13:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 438);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 438);
             mevent_srv_common_init_send(svr, 0x16, mevent_first_if_not_null_else_second(cmd->parameter, svr->card), sizeof(struct MEWonderCardData));
             break;
         case 16:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 444);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 444);
             mevent_srv_common_init_send(svr, 0x18, mevent_first_if_not_null_else_second(cmd->parameter, &svr->sendWord), 4);
             break;
         case 15:
@@ -215,7 +215,7 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr)
                 mevent_srv_common_init_send(svr, 0x10, cmd->parameter, cmd->flag);
             break;
         case 19:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 466);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 466);
             mevent_srv_common_init_send(svr, 0x1a, cmd->parameter, 188);
             break;
         case 20:
@@ -225,15 +225,15 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr)
             mevent_srv_common_init_send(svr, 0x1c, cmd->parameter, cmd->flag);
             break;
         case 22:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 481);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 481);
             memcpy(svr->card, cmd->parameter, 332);
             break;
         case 23:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 486);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 486);
             memcpy(svr->news, cmd->parameter, 444);
             break;
         case 21:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 491);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 491);
             svr->sendWord = *(u32 *)cmd->parameter;
             break;
         case 24:
@@ -245,16 +245,16 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr)
             svr->sendBuffer2Size = cmd->flag;
             break;
         case 26:
-            AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 506);
+            AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, ABSPATH("mevent_server.c"), 506);
             memcpy(svr->card, GetSavedWonderCard(), 332);
             sub_814410C(svr->card);
             break;
         case 27:
-            AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 512);
+            AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, ABSPATH("mevent_server.c"), 512);
             memcpy(svr->news, GetSavedWonderNews(), 444);
             break;
         case 28:
-            AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 517);
+            AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, ABSPATH("mevent_server.c"), 517);
             svr->sendBuffer1 = sub_8069E48();
             break;
         case 29:
@@ -276,8 +276,8 @@ static u32 (*const func_tbl[])(struct mevent_srv_common *) = {
 static u32 mevent_srv_exec_common(struct mevent_srv_common * svr)
 {
     u32 response;
-    AGB_ASSERT_EX(svr->mainseqno < NELEMS(func_tbl), "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 546);
+    AGB_ASSERT_EX(svr->mainseqno < NELEMS(func_tbl), ABSPATH("mevent_server.c"), 546);
     response = func_tbl[svr->mainseqno](svr);
-    AGB_ASSERT_EX(svr->mainseqno < NELEMS(func_tbl), "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 548);
+    AGB_ASSERT_EX(svr->mainseqno < NELEMS(func_tbl), ABSPATH("mevent_server.c"), 548);
     return response;
 }
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 6a5d61227..a88655e17 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -105,7 +105,7 @@ bool8 ScrCmd_special(struct ScriptContext *ctx)
     if (specialPtr < gSpecialsEnd)
         (*specialPtr)();
     else
-        AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c", 241);
+        AGB_ASSERT_EX(0, ABSPATH("scrcmd.c"), 241);
     return FALSE;
 }
 
@@ -116,7 +116,7 @@ bool8 ScrCmd_specialvar(struct ScriptContext *ctx)
     if (specialPtr < gSpecialsEnd)
         *varPtr = (*specialPtr)();
     else
-        AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c", 263);
+        AGB_ASSERT_EX(0, ABSPATH("scrcmd.c"), 263);
     return FALSE;
 }