summaryrefslogtreecommitdiff
path: root/src/mauville_old_man.c
diff options
context:
space:
mode:
authornullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com>2018-12-05 22:31:01 +0800
committernullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com>2018-12-06 10:38:28 +0800
commitf9ff7316d5c7277eb7482e30121388cd65f4ecfc (patch)
treeee8f4a9c338f880a3585d6e9ed9ed695f27cef3d /src/mauville_old_man.c
parent405f1bb529809b8169364737087189df0fcca1d2 (diff)
Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs
Diffstat (limited to 'src/mauville_old_man.c')
-rw-r--r--src/mauville_old_man.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 2fd60cd5b..110ec068e 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -250,7 +250,7 @@ void ScrSpecial_HipsterTeachWord(void)
{
u16 var = sub_811F01C();
- if (var == INVALID_U16)
+ if (var == 0xFFFF)
{
gSpecialVar_Result = FALSE;
}
@@ -283,7 +283,7 @@ void ScrSpecial_GenerateGiddyLine(void)
if (giddy->taleCounter == 0)
InitGiddyTaleList();
- if (giddy->randomWords[giddy->taleCounter] != INVALID_U16) // is not the last element of the array?
+ if (giddy->randomWords[giddy->taleCounter] != 0xFFFF) // is not the last element of the array?
{
u8 *stringPtr;
u32 adjective = Random();
@@ -348,7 +348,7 @@ static void InitGiddyTaleList(void)
r1 = Random() % 10;
if (r1 < 3 && r7 < 8)
{
- giddy->randomWords[i] = INVALID_U16;
+ giddy->randomWords[i] = 0xFFFF;
r7++;
}
else