dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs

Browse Source
This commit is contained in:
nullableVoidPtr
2018-12-05 22:31:01 +08:00
parent 405f1bb529
commit f9ff7316d5
140 changed files with 27697 additions and 23904 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/link_rfu.c
+17 -17
View File
@@ -276,7 +276,7 @@ const struct {
{ gBlockSendBuffer, 40 }
};
const u16 gUnknown_082ED6E0[] = {
0x0002, 0x7f7d, 0x0000, INVALID_U16
0x0002, 0x7f7d, 0x0000, 0xFFFF
};
const char sUnref_082ED6E8[][15] = {
@@ -436,7 +436,7 @@ u8 sub_800C054(u8 r5, u16 r7, u16 r8, const u16 *r6)
}
for (i = 0, buffer = r6; i < 16; i++)
{
if (*buffer++ == INVALID_U16)
if (*buffer++ == 0xFFFF)
{
break;
}
@@ -754,7 +754,7 @@ void sub_800C54C(u32 a0)
switch (gUnknown_03004140.unk_04)
{
case 23:
r2 = sub_800BEC0() == 0x8001 ? 0x44 : INVALID_U8;
r2 = sub_800BEC0() == 0x8001 ? 0x44 : 0xFF;
gUnknown_03004140.unk_04 = gUnknown_03004140.unk_05 = 0;
sub_800D30C(r2, 0);
break;
@@ -1168,7 +1168,7 @@ static void sub_800C7B4(u16 r8, u16 r6)
gUnknown_03004140.unk_00 &= ~gUnknown_03004140.unk_14;
if (gUnknown_03004140.unk_07)
{
if (gUnknown_03007890->unk_00 == INVALID_U8)
if (gUnknown_03007890->unk_00 == 0xFF)
{
if (gUnknown_03004140.unk_07 == 8)
{
@@ -1183,7 +1183,7 @@ static void sub_800C7B4(u16 r8, u16 r6)
}
}
}
if (gUnknown_03007890->unk_00 == INVALID_U8)
if (gUnknown_03007890->unk_00 == 0xFF)
{
if (gUnknown_03004140.unk_04 == 0)
{
@@ -1198,7 +1198,7 @@ static void sub_800C7B4(u16 r8, u16 r6)
break;
case 38:
sub_800D20C();
if (gUnknown_03007890->unk_00 != INVALID_U8)
if (gUnknown_03007890->unk_00 != 0xFF)
{
sub_800D30C(0x50, 0x00);
}
@@ -1241,7 +1241,7 @@ static void sub_800C7B4(u16 r8, u16 r6)
sub_800D610();
}
}
if (r8 == INVALID_U8)
if (r8 == 0xFF)
{
sub_800D30C(0xf2, 0x00);
sub_800D610();
@@ -1322,7 +1322,7 @@ static void sub_800CF34(void)
if (gUnknown_03007880[i]->unk_61 == 1)
{
r5 = 0x02;
for (ptr = gUnknown_03004140.unk_20; *ptr != INVALID_U16; ptr++)
for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++)
{
if (gUnknown_03007890->unk_14[i].unk_04 == *ptr)
{
@@ -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 != INVALID_U16; ptr++)
for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++)
{
if (gUnknown_03007890->unk_14[i].unk_04 == *ptr)
{
@@ -2242,12 +2242,12 @@ void sub_800E084(void)
void sub_800E0E8(void)
{
if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == INVALID_U16)
if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == 0xFFFF)
{
LoadCompressedObjectPic(&sWirelessStatusIndicatorSpriteSheet);
}
LoadSpritePalette(&sWirelessStatusIndicatorSpritePalette);
gWirelessStatusIndicatorSpriteId = INVALID_U8;
gWirelessStatusIndicatorSpriteId = 0xFF;
}
u8 sub_800E124(void)
@@ -2277,7 +2277,7 @@ void sub_800E15C(struct Sprite *sprite, s32 signalStrengthAnimNum)
void sub_800E174(void)
{
if (gWirelessStatusIndicatorSpriteId != INVALID_U8 && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234)
if (gWirelessStatusIndicatorSpriteId != 0xFF && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234)
{
struct Sprite *sprite = &gSprites[gWirelessStatusIndicatorSpriteId];
u8 signalStrength = 255;
@@ -2461,7 +2461,7 @@ void sub_800E604(void)
u8 unk_ee_bak = gUnknown_03005000.unk_ee;
CpuFill16(0, &gUnknown_03005000, sizeof gUnknown_03005000);
gUnknown_03005000.unk_ee = unk_ee_bak;
gUnknown_03005000.unk_0c = INVALID_U8;
gUnknown_03005000.unk_0c = 0xFF;
if (gUnknown_03005000.unk_ee != 4)
{
gUnknown_03005000.unk_ee = 0;
@@ -3077,7 +3077,7 @@ bool32 sub_800F1E0(void)
{
if (gUnknown_03005000.unk_14[i][1])
{
if (gUnknown_03005000.unk_cee[i] != INVALID_U8 && (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] == INVALID_U16)
if (gUnknown_082ED6E0[i] == 0xFFFF)
return FALSE;
}
return TRUE;
@@ -3881,7 +3881,7 @@ bool32 sub_80105EC(void)
bool32 sub_801064C(u16 a0, const u8 *a1)
{
u8 r1 = sub_8011CE4(a1, a0);
if (r1 == INVALID_U8)
if (r1 == 0xFF)
return TRUE;
if (gUnknown_03005000.unk_cd1[r1] == 9)
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 == INVALID_U8)
if (r0 == 0xFF)
return 2;
if (gUnknown_03007880[r0]->unk_0 == 0)
return 1;