diff options
| author | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-11-29 19:24:28 +0800 |
|---|---|---|
| committer | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-06 09:44:08 +0800 |
| commit | 3909b6408c0125fe311d49a3029a2806993615f7 (patch) | |
| tree | a02365a6eb268dce08941968e11e319f3a7fe080 /src/rom_8034C54.c | |
| parent | 1b33ad6c26fa83aa7b77055ddde59c61df03d0e4 (diff) | |
Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
Diffstat (limited to 'src/rom_8034C54.c')
| -rw-r--r-- | src/rom_8034C54.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rom_8034C54.c b/src/rom_8034C54.c index be6d6614a..47d9eaf70 100644 --- a/src/rom_8034C54.c +++ b/src/rom_8034C54.c @@ -1,6 +1,6 @@ #include "global.h" #include "rom_8034C54.h" -#include "malloc.h" +#include "alloc.h" #include "decompress.h" #include "main.h" @@ -255,7 +255,7 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2) u32 r5 = arg0->field_14; gUnknown_03000DD4 = arg0->firstOamId; gUnknown_03000DD8 = 0; - gUnknown_03000DDC = -1; + gUnknown_03000DDC = INVALID_S32; while (r5 != 0) { @@ -263,12 +263,12 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2) arg1 -= (r4 * r5); r5 /= 10; - if (r4 != 0 || gUnknown_03000DDC != -1 || r5 == 0) + if (r4 != 0 || gUnknown_03000DDC != INVALID_S32 || r5 == 0) { gMain.oamBuffer[gUnknown_03000DD4].tileNum = (r4 * arg0->field_9) + arg0->tileStart; gMain.oamBuffer[gUnknown_03000DD4].affineMode = 0; - if (gUnknown_03000DDC == -1) + if (gUnknown_03000DDC == INVALID_S32) gUnknown_03000DDC = gUnknown_03000DD8; } else |