diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-12-19 12:34:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-19 12:34:20 -0500 |
| commit | 567589d3ddc30c1a78ce76739f278e4d8f35ef5f (patch) | |
| tree | b44bb56f76662182d7b51302c1817592491d0ca0 /src/malloc.c | |
| parent | 7984a91c0892e0bd96ace89405d565ec0b43e084 (diff) | |
| parent | 3d123182a8fe8182f66d5e265067107bc276b84e (diff) | |
Merge pull request #187 from PikalaxALT/leafgreen
Match Pokemon FireRed 1.1 US
Diffstat (limited to 'src/malloc.c')
| -rw-r--r-- | src/malloc.c | 12 |
1 files changed, 6 insertions, 6 deletions
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; |