diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-08 21:44:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-08 21:44:12 -0600 |
| commit | 0b91d2948a431a5d44166544897a550061c01a31 (patch) | |
| tree | 6e590fbd965b8cd96852ec36474a6841a74dc9b8 /src/link_rfu.c | |
| parent | 88ffb0976571c8782a5e632df79d34b7260882c9 (diff) | |
| parent | cceb8ac3314c9ba5a48d0b69bc39c41080335119 (diff) | |
Merge pull request #429 from nullableVoidPtr/master
Various fixes and cleanups
Diffstat (limited to 'src/link_rfu.c')
| -rw-r--r-- | src/link_rfu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/link_rfu.c b/src/link_rfu.c index 308ad615c..2c6e22475 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -1,4 +1,5 @@ #include "global.h" +#include "alloc.h" #include "battle.h" #include "berry_blender.h" #include "decompress.h" @@ -7,7 +8,6 @@ #include "librfu.h" #include "link.h" #include "link_rfu.h" -#include "malloc.h" #include "overworld.h" #include "random.h" #include "palette.h" @@ -276,7 +276,7 @@ const struct { { gBlockSendBuffer, 40 } }; const u16 gUnknown_082ED6E0[] = { - 0x0002, 0x7f7d, 0x0000, 0xffff + 0x0002, 0x7f7d, 0x0000, 0xFFFF }; const char sUnref_082ED6E8[][15] = { @@ -1469,7 +1469,7 @@ static u8 sub_800D294(void) for (i = 0; i < gUnknown_03007890->unk_08; i++) { - for (ptr = gUnknown_03004140.unk_20; *ptr != 0xffff; ptr++) + for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++) { if (gUnknown_03007890->unk_14[i].unk_04 == *ptr) { @@ -3077,7 +3077,7 @@ bool32 sub_800F1E0(void) { if (gUnknown_03005000.unk_14[i][1]) { - if (gUnknown_03005000.unk_cee[i] != 0xff && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7)) + if (gUnknown_03005000.unk_cee[i] != 0xFF && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7)) { if (++gUnknown_03005000.unk_cea[i] > 4) sub_8011170(0x8100); @@ -3778,7 +3778,7 @@ bool32 sub_8010454(u32 a0) s32 i; for (i = 0; gUnknown_082ED6E0[i] != a0; i++) { - if (gUnknown_082ED6E0[i] == 0xffff) + if (gUnknown_082ED6E0[i] == 0xFFFF) return FALSE; } return TRUE; @@ -3906,7 +3906,7 @@ void sub_80106D4(void) u32 sub_8010714(u16 a0, const u8 *a1) { u8 r0 = sub_8011CE4(a1, a0); - if (r0 == 0xff) + if (r0 == 0xFF) return 2; if (gUnknown_03007880[r0]->unk_0 == 0) return 1; |