ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-04 18:30:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make argument int

Browse Source
This commit is contained in:
PokeCodec 2020-09-02 16:35:21 -04:00
parent 52d0b59f5a
commit 1cdd0ac199
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pokenav.h
View File

@ -313,7 +313,7 @@ bool32 WaitForHelpBar(void);
void sub_81C78A0(void); void sub_81C78A0(void);
bool32 MainMenuLoopedTaskIsBusy(void); bool32 MainMenuLoopedTaskIsBusy(void);
void sub_81C7FDC(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); void sub_81C7B40(void);
struct Sprite *PauseSpinningPokenavSprite(void); struct Sprite *PauseSpinningPokenavSprite(void);
void ResumeSpinningPokenavSprite(void); void ResumeSpinningPokenavSprite(void);

14
src/pokenav_main_menu.c
View File

@ -458,11 +458,9 @@ void Pokenav_AllocAndLoadPalettes(const struct SpritePalette *palettes)
{ {
break; break;
} }
else
{ index = (index * 16) + 0x100;
index = (index * 16) + 0x100; CopyPaletteIntoBufferUnfaded(current->data, index, 0x20);
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)); 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) 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 else
{ {
s32 r, g, b; int r, g, b;
s32 r1, g1, b1; int r1, g1, b1;
while (a2--) while (a2--)
{ {