summaryrefslogtreecommitdiff
path: root/src/pokemon_storage_system_2.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-05-21 08:50:36 -0700
committerMarcus Huderle <huderlem@gmail.com>2018-05-21 09:02:30 -0700
commit4ee671c9bf6e4ba920f58cd8d4a6facc8bed431d (patch)
treec27468d8581731d2b035372fcc8a534f552549a0 /src/pokemon_storage_system_2.c
parentbfdd1d2cebd1d4f4469afce5b10b99090df17f45 (diff)
Standardize args to palette blend functions
Diffstat (limited to 'src/pokemon_storage_system_2.c')
-rw-r--r--src/pokemon_storage_system_2.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c
index 762850e06..2cd1a59c6 100644
--- a/src/pokemon_storage_system_2.c
+++ b/src/pokemon_storage_system_2.c
@@ -310,7 +310,7 @@ void sub_80969A0(void)
gMain.state++;
break;
case 9:
- BeginNormalPaletteFade(0xffffffff, 0, 16, 0, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(sub_8096AFC);
gMain.state++;
break;
@@ -352,7 +352,7 @@ void debug_sub_80A435C(void)
{
case 0:
debug_sub_809CB94(unk_2038798);
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gPokemonStorageSystemPtr->unk_0004++;
break;
case 1:
@@ -408,7 +408,7 @@ void sub_8096BF0(void)
switch (gPokemonStorageSystemPtr->unk_0004)
{
case 0:
- BlendPalettes(0xffffffff, 16, 0);
+ BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0));
gPokemonStorageSystemPtr->unk_0004++;
break;
case 1:
@@ -418,7 +418,7 @@ void sub_8096BF0(void)
gPokemonStorageSystemPtr->unk_000c.unk04 = 0;
gPokemonStorageSystemPtr->unk_000c.unk06 = 0;
sub_80C5CD4(&gPokemonStorageSystemPtr->unk_000c);
- BlendPalettes(0xffffffff, 0, 0);
+ BlendPalettes(0xFFFFFFFF, 0, RGB(0, 0, 0));
gPokemonStorageSystemPtr->unk_0004++;
break;
case 2:
@@ -1083,7 +1083,7 @@ void sub_8097788(void)
{
case 0:
sub_809BC18();
- BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gPokemonStorageSystemPtr->unk_0004++;
break;
case 1:
@@ -1284,7 +1284,7 @@ void sub_8097B44(void)
{
case 0:
sub_809BB90();
- BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gPokemonStorageSystemPtr->unk_0004++;
break;
case 1: