diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-28 17:41:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 17:41:34 -0400 |
| commit | 5eecaf92ba035d7b5ef8c52b5ce99d1868bc6c10 (patch) | |
| tree | 9a90ec855adff455c7b4689efda6737eb46098ef /src/party_menu.c | |
| parent | 1f4813bfd2c9774b4bcbb83e6b27c994d7ad478c (diff) | |
| parent | 96b904bf808805daa3de09080e10cc92e24c1f8e (diff) | |
Merge branch 'master' into doc-slotmachine
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); |