diff options
| -rw-r--r-- | include/pokenav.h | 2 | ||||
| -rw-r--r-- | src/pokenav_main_menu.c | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/include/pokenav.h b/include/pokenav.h index d40cfea11..ed4e5a906 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -313,7 +313,7 @@ bool32 WaitForHelpBar(void); void sub_81C78A0(void); bool32 MainMenuLoopedTaskIsBusy(void); void sub_81C7FDC(void); -void sub_81C79BC(const u16 *a0, const u16 *a1, s32 a2, s32 a3, s32 a4, u16 *palette); +void sub_81C79BC(const u16 *a0, const u16 *a1, int a2, int a3, int a4, u16 *palette); void sub_81C7B40(void); struct Sprite *PauseSpinningPokenavSprite(void); void ResumeSpinningPokenavSprite(void); diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c index c63349d22..a2adebc27 100644 --- a/src/pokenav_main_menu.c +++ b/src/pokenav_main_menu.c @@ -458,11 +458,9 @@ void Pokenav_AllocAndLoadPalettes(const struct SpritePalette *palettes) { break; } - else - { - index = (index * 16) + 0x100; - CopyPaletteIntoBufferUnfaded(current->data, index, 0x20); - } + + index = (index * 16) + 0x100; + CopyPaletteIntoBufferUnfaded(current->data, index, 0x20); } } @@ -471,7 +469,7 @@ void sub_81C7990(u32 a0, u16 a1) CpuFill16(a1, gPlttBufferFaded + 0x100 + (a0 * 16), 16 * sizeof(u16)); } -void sub_81C79BC(const u16 *a0, const u16 *a1, s32 a2, s32 a3, s32 a4, u16 *palette) +void sub_81C79BC(const u16 *a0, const u16 *a1, int a2, int a3, int a4, u16 *palette) { if (a4 == 0) @@ -484,8 +482,8 @@ void sub_81C79BC(const u16 *a0, const u16 *a1, s32 a2, s32 a3, s32 a4, u16 *pale } else { - s32 r, g, b; - s32 r1, g1, b1; + int r, g, b; + int r1, g1, b1; while (a2--) { |