diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-07-28 11:10:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 11:10:00 -0400 |
| commit | 70617d56e4ef0ef1432e0cc7fb3214a63d773578 (patch) | |
| tree | 9f1551240478be6722a0be797d35eb4034e5608c /src/party_menu.c | |
| parent | e8568b79efa2f12ce929a4db15c8786f1dccc359 (diff) | |
| parent | 1e8ffcb8986aa0560bcb1113717ce26a58526be2 (diff) | |
Merge pull request #1104 from PokeCodec/Explcit-Casting
Reduce "Implicit conversion" warnings
Diffstat (limited to 'src/party_menu.c')
| -rwxr-xr-x | src/party_menu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/party_menu.c b/src/party_menu.c index d5bc6dfb6..6a38d9098 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1862,7 +1862,7 @@ u8 GetMonAilment(struct Pokemon *mon) static void SetPartyMonsAllowedInMinigame(void) { - u16 *ptr; + s16 *ptr; if (gPartyMenu.menuType == PARTY_MENU_TYPE_MINIGAME) { @@ -4951,9 +4951,9 @@ static void Task_DisplayLevelUpStatsPg2(u8 taskId) static void DisplayLevelUpStatsPg1(u8 taskId) { - s16 *arrayPtr = sPartyMenuInternal->data; + u16 *arrayPtr = (u16*)sPartyMenuInternal->data; - arrayPtr[12] = CreateLevelUpStatsWindow(); + arrayPtr[12] = (u16)CreateLevelUpStatsWindow(); DrawLevelUpWindowPg1(arrayPtr[12], arrayPtr, &arrayPtr[6], TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY); CopyWindowToVram(arrayPtr[12], 2); ScheduleBgCopyTilemapToVram(2); @@ -4961,7 +4961,7 @@ static void DisplayLevelUpStatsPg1(u8 taskId) static void DisplayLevelUpStatsPg2(u8 taskId) { - s16 *arrayPtr = sPartyMenuInternal->data; + u16 *arrayPtr = (u16 *)sPartyMenuInternal->data; DrawLevelUpWindowPg2(arrayPtr[12], &arrayPtr[6], TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY); CopyWindowToVram(arrayPtr[12], 2); |