summaryrefslogtreecommitdiff
path: root/src/pokenav_before.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pokenav_before.c')
-rw-r--r--src/pokenav_before.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/pokenav_before.c b/src/pokenav_before.c
index 8684f2155..61baea929 100644
--- a/src/pokenav_before.c
+++ b/src/pokenav_before.c
@@ -524,7 +524,7 @@ void sub_80EBDD8()
ewram0_10.var304++;
break;
case 11:
- BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
ewram0_10.var304++;
break;
case 12:
@@ -597,7 +597,7 @@ void sub_80EC00C()
ewram0_10.var304++;
break;
case 6:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(&sub_80EBD18);
ewram0_10.var304++;
break;
@@ -784,7 +784,7 @@ void sub_80EC4A0()
case 2:
if (!sub_80EEF34())
{
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0));
ewram0_10.var304++;
}
break;
@@ -830,7 +830,7 @@ void sub_80EC4A0()
ewram0_10.var304++;
break;
case 0xC:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0));
ewram0_10.var304++;
break;
case 0xD:
@@ -905,7 +905,7 @@ void sub_80EC67C()
}
break;
case 4:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0));
ewram0_10.var304++;
break;
case 5:
@@ -1051,7 +1051,7 @@ void sub_80ECA10()
ewram0_10.var304++;
break;
case 6:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(&sub_80EBD18);
ewram0_10.var304++;
break;
@@ -1152,7 +1152,7 @@ void sub_80ECD80()
switch (ewram0_10.var304)
{
case 0:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0));
ewram0_10.var304++;
break;
case 1:
@@ -1206,7 +1206,7 @@ void sub_80ECD80()
ewram0_10.var304++;
break;
case 12:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(&sub_80EBD18);
ewram0_10.var304++;
break;
@@ -1278,7 +1278,7 @@ void sub_80ED01C()
case 2:
if (!sub_80EEF34())
{
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0));
ewram0_10.var304++;
}
break;
@@ -1330,7 +1330,7 @@ void sub_80ED01C()
ewram0_10.var304++;
break;
case 13:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(&sub_80EBD18);
ewram0_10.var304++;
break;
@@ -1454,7 +1454,7 @@ void sub_80ED3D0()
break;
case 6:
sub_80F3008(0);
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(&sub_80EBD18);
ewram0_10.var304++;
break;
@@ -1478,7 +1478,7 @@ void sub_80ED4D8()
switch (ewram0_10.var304)
{
case 0:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0));
ewram0_10.var304++;
break;
case 1:
@@ -1509,7 +1509,7 @@ void sub_80ED4D8()
case 6:
sub_80F35B4();
sub_80EEFBC(0x2);
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(sub_80EBD4C);
ewram0_10.var304++;
break;
@@ -1547,7 +1547,7 @@ void sub_80ED620()
case 2:
if (!sub_80EEF34())
{
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 16, RGB(0, 0, 0));
ewram0_10.var304++;
}
break;
@@ -1588,7 +1588,7 @@ void sub_80ED620()
break;
case 10:
sub_80F33A8();
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(&sub_80EBD4C);
ewram0_10.var304++;
break;
@@ -2610,7 +2610,7 @@ void sub_80EDB88()
case 2:
if (!sub_80EEF34())
{
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0));
ewram0_10.var304++;
}
break;
@@ -2667,7 +2667,7 @@ void sub_80EDB88()
ewram0_10.var304++;
break;
case 15:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(&sub_80EBD18);
ewram0_10.var304++;
break;
@@ -2741,7 +2741,7 @@ void sub_80EDE70()
switch (ewram0_10.var304)
{
case 0:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0));
ewram0_10.var304++;
break;
case 1:
@@ -2764,7 +2764,7 @@ void sub_80EDEE4()
switch (ewram0_10.var304)
{
case 0:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0));
ewram0_10.var304++;
break;
case 1:
@@ -2798,7 +2798,7 @@ void sub_80EDEE4()
ewram0_10.var304++;
break;
case 7:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(&sub_80EBD18);
ewram0_10.var304++;
break;
@@ -2916,7 +2916,7 @@ void sub_80EE294()
switch (ewram0_10.var304)
{
case 0:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0));
ewram0_10.var304++;
break;
case 1:
@@ -2948,7 +2948,7 @@ void sub_80EE294()
ewram0_10.var304++;
break;
case 6:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0));
ewram0_10.var304++;
break;
case 7:
@@ -2985,7 +2985,7 @@ void sub_80EE3D8()
case 2:
if (!sub_80EEF34())
{
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0));
ewram0_10.var304++;
}
break;
@@ -3027,7 +3027,7 @@ void sub_80EE3D8()
break;
case 11:
sub_80F6F10();
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(&sub_80EBD68);
ewram0_10.var304++;
break;
@@ -3208,7 +3208,7 @@ void sub_80EE8F4()
switch (ewram0_10.var304)
{
case 0:
- BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0);
+ BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0));
ewram0_10.var304++;
break;
case 1:
@@ -3231,7 +3231,7 @@ void sub_80EE96C()
if (!ewram0_10.var304)
{
PlaySE(0x6F);
- BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
ewram0_10.var304++;
}
else
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 08:39:00 +0000