Merge remote-tracking branch 'upstream/master' into use_pokeblock

# Conflicts:
#	src/use_pokeblock.c

1 files changed, 50 insertions, 47 deletions

diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 78fec2fc5..30f5af14c 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -969,10 +969,10 @@ static const struct OamData sOamData_857286C =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -986,10 +986,10 @@ static const struct OamData sOamData_8572874 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(16x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(16x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -1062,10 +1062,10 @@ static const struct OamData sOamData_85728EC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -1218,7 +1218,7 @@ static const u16 gWallpaperPalettes_Plain[][16] =
 static const u32 gWallpaperTiles_Plain[] = INCBIN_U32("graphics/pokemon_storage/plain.4bpp.lz");
 static const u32 gWallpaperTilemap_Plain[] = INCBIN_U32("graphics/pokemon_storage/plain.bin.lz");
 
-// 12×18 tilemap
+// 12x18 tilemap
 static const u32 gUnknown_085773C4[] = INCBIN_U32("graphics/unused/tilemap_5773C4.bin");
 
 static const u16 gUnknown_08577574[][2] =
@@ -1467,8 +1467,8 @@ static const struct SpriteSheet gUnknown_0857B080 = {gPCGfx_Arrow, 0x80, 6};
 
 static const struct OamData gOamData_83BB298 =
 {
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16),
     .priority = 2
 };
 
@@ -1503,7 +1503,8 @@ static const struct SpriteTemplate gSpriteTemplate_857B0A8 =
 
 static const struct OamData gOamData_83BB2D0 =
 {
-    .shape = ST_OAM_V_RECTANGLE,
+    .shape = SPRITE_SHAPE(8x16),
+    .size = SPRITE_SIZE(8x16),
     .priority = 2
 };
 
@@ -1552,7 +1553,7 @@ void sub_80C6D80(const u8 *string, void *dst, u8 arg2, u8 arg3, s32 arg4)
     winTemplate.width = 24;
     winTemplate.height = 2;
     windowId = AddWindow(&winTemplate);
-    FillWindowPixelBuffer(windowId, (arg3 << 4) | arg3);
+    FillWindowPixelBuffer(windowId, PIXEL_FILL(arg3));
     tileData1 = (u8*) GetWindowAttribute(windowId, WINDOW_TILE_DATA);
     tileData2 = (winTemplate.width * 32) + tileData1;
 
@@ -1599,7 +1600,7 @@ void sub_80C6EAC(const u8 *string, void *dst, u16 arg2, u8 arg3, u8 clr2, u8 clr
     winTemplate.height = 2;
     var = winTemplate.width * 32;
     windowId = AddWindow(&winTemplate);
-    FillWindowPixelBuffer(windowId, (arg3 << 4) | arg3);
+    FillWindowPixelBuffer(windowId, PIXEL_FILL(arg3));
     tileData1 = (u8*) GetWindowAttribute(windowId, WINDOW_TILE_DATA);
     tileData2 = (winTemplate.width * 32) + tileData1;
     txtColor[0] = arg3;
@@ -1736,8 +1737,8 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
     case 0:
         CreatePCMenu(task->data[1], &task->data[15]);
         sub_81973A4();
-        NewMenuHelpers_DrawDialogueFrame(0, 0);
-        FillWindowPixelBuffer(0, 0x11);
+        DrawDialogueFrame(0, 0);
+        FillWindowPixelBuffer(0, PIXEL_FILL(1));
         AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, TEXT_SPEED_FF, NULL, 2, 1, 3);
         CopyWindowToVram(0, 3);
         CopyWindowToVram(task->data[15], 3);
@@ -1753,7 +1754,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
         task->data[2] = Menu_ProcessInput();
         switch(task->data[2])
         {
-        case -2:
+        case MENU_NOTHING_CHOSEN:
             task->data[3] = task->data[1];
             if (gMain.newKeys & DPAD_UP && --task->data[3] < 0)
                 task->data[3] = 4;
@@ -1763,13 +1764,13 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
             if (task->data[1] != task->data[3])
             {
                 task->data[1] = task->data[3];
-                FillWindowPixelBuffer(0, 0x11);
+                FillWindowPixelBuffer(0, PIXEL_FILL(1));
                 AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3);
             }
             break;
-        case -1:
+        case MENU_B_PRESSED:
         case  4:
-            sub_819746C(task->data[15], TRUE);
+            ClearStdWindowAndFrame(task->data[15], TRUE);
             ScriptContext2_Disable();
             EnableBothScriptContexts();
             RemoveWindow(task->data[15]);
@@ -1778,13 +1779,13 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
         default:
             if (task->data[2] == 0 && CountPartyMons() == PARTY_SIZE)
             {
-                FillWindowPixelBuffer(0, 0x11);
+                FillWindowPixelBuffer(0, PIXEL_FILL(1));
                 AddTextPrinterParameterized2(0, 1, gText_PartyFull, 0, NULL, 2, 1, 3);
                 task->data[0] = 3;
             }
             else if (task->data[2] == 1 && CountPartyMons() == 1)
             {
-                FillWindowPixelBuffer(0, 0x11);
+                FillWindowPixelBuffer(0, PIXEL_FILL(1));
                 AddTextPrinterParameterized2(0, 1, gText_JustOnePkmn, 0, NULL, 2, 1, 3);
                 task->data[0] = 3;
             }
@@ -1799,7 +1800,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
     case 3:
         if (gMain.newKeys & (A_BUTTON | B_BUTTON))
         {
-            FillWindowPixelBuffer(0, 0x11);
+            FillWindowPixelBuffer(0, PIXEL_FILL(1));
             AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3);
             task->data[0] = 2;
         }
@@ -1809,7 +1810,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
                 task->data[1] = 4;
             Menu_MoveCursor(-1);
             task->data[1] = Menu_GetCursorPos();
-            FillWindowPixelBuffer(0, 0x11);
+            FillWindowPixelBuffer(0, PIXEL_FILL(1));
             AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3);
             task->data[0] = 2;
         }
@@ -1819,7 +1820,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
                 task->data[1] = 0;
             Menu_MoveCursor(1);
             task->data[1] = Menu_GetCursorPos();
-            FillWindowPixelBuffer(0, 0x11);
+            FillWindowPixelBuffer(0, PIXEL_FILL(1));
             AddTextPrinterParameterized2(0, 1, gUnknown_085716C0[task->data[1]].desc, 0, NULL, 2, 1, 3);
             task->data[0] = 2;
         }
@@ -1865,7 +1866,7 @@ static void CreatePCMenu(u8 whichMenu, s16 *windowIdPtr)
     winTemplate.width = GetMaxWidthInMenuTable((void *)gUnknown_085716C0, ARRAY_COUNT(gUnknown_085716C0));
     windowId = AddWindow(&winTemplate);
 
-    NewMenuHelpers_DrawStdWindowFrame(windowId, FALSE);
+    DrawStdWindowFrame(windowId, FALSE);
     PrintMenuTable(windowId, ARRAY_COUNT(gUnknown_085716C0), (void *)gUnknown_085716C0);
     InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, ARRAY_COUNT(gUnknown_085716C0), whichMenu);
     *windowIdPtr = windowId;
@@ -2004,7 +2005,7 @@ static void sub_80C7958(u8 curBox)
     u8 spriteId;
     struct SpriteTemplate template;
     struct OamData oamData = {};
-    oamData.size = 3;
+    oamData.size = SPRITE_SIZE(64x64);
     oamData.paletteNum = 1;
     template = (struct SpriteTemplate){
         0, 0, &oamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
@@ -2017,8 +2018,8 @@ static void sub_80C7958(u8 curBox)
     spriteId = CreateSprite(&template, 160, 96, 0);
     gUnknown_02039D04->unk_0000 = gSprites + spriteId;
 
-    oamData.shape = ST_OAM_V_RECTANGLE;
-    oamData.size = 1;
+    oamData.shape = SPRITE_SHAPE(8x32);
+    oamData.size = SPRITE_SIZE(8x32);
     template.tileTag = gUnknown_02039D04->unk_0240 + 1;
     template.anims = sSpriteAnimTable_8571710;
     for (i = 0; i < 4; i++)
@@ -2103,7 +2104,7 @@ static void sub_80C7BE4(void)
     winTemplate.height = 4;
 
     windowId = AddWindow(&winTemplate);
-    FillWindowPixelBuffer(windowId, 0x44);
+    FillWindowPixelBuffer(windowId, PIXEL_FILL(4));
 
     center = GetStringCenterAlignXOffset(1, boxName, 64);
     AddTextPrinterParameterized3(windowId, 1, center, 1, gUnknown_08571734, TEXT_SPEED_FF, boxName);
@@ -3927,7 +3928,7 @@ static void SetScrollingBackground(void)
 {
     SetGpuReg(REG_OFFSET_BG3CNT, BGCNT_PRIORITY(3) | BGCNT_CHARBASE(3) | BGCNT_16COLOR | BGCNT_SCREENBASE(31));
     DecompressAndLoadBgGfxUsingHeap(3, gPokemonStorageScrollingBGTileset, 0, 0, 0);
-    LZ77UnCompVram(gPokemonStorageScrollingBGTilemap, (void *)VRAM + 0xF800);
+    LZ77UnCompVram(gPokemonStorageScrollingBGTilemap, (void *)BG_SCREEN_ADDR(31));
 }
 
 static void ScrollBackground(void)
@@ -4107,7 +4108,7 @@ static void LoadCursorMonGfx(u16 species, u32 pid)
 
 static void PrintCursorMonInfo(void)
 {
-    FillWindowPixelBuffer(0, 0x11);
+    FillWindowPixelBuffer(0, PIXEL_FILL(1));
     if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
     {
         AddTextPrinterParameterized(0, 1, sPSSData->cursorMonNickText, 6, 0, TEXT_SPEED_FF, NULL);
@@ -4416,7 +4417,7 @@ static void PrintStorageActionText(u8 id)
     }
 
     DynamicPlaceholderTextUtil_ExpandPlaceholders(sPSSData->field_2190, gPCStorageActionTexts[id].text);
-    FillWindowPixelBuffer(1, 0x11);
+    FillWindowPixelBuffer(1, PIXEL_FILL(1));
     AddTextPrinterParameterized(1, 1, sPSSData->field_2190, 0, 1, TEXT_SPEED_FF, NULL);
     sub_8098858(1, 2, 14);
     PutWindowTilemap(1);
@@ -4432,7 +4433,7 @@ static void ShowYesNoWindow(s8 cursorPos)
 
 static void ClearBottomWindow(void)
 {
-    sub_8198070(1, FALSE);
+    ClearStdWindowAndFrameToTransparent(1, FALSE);
     schedule_bg_copy_tilemap_to_vram(0);
 }
 
@@ -6501,7 +6502,7 @@ static void InitCanRelaseMonVars(void)
     }
 
     sub_80CE350(sPSSData->field_2176);
-    sPSSData->field_2174 = GetMonData(&sPSSData->field_2108, MON_DATA_KNOWN_MOVES, sPSSData->field_2176);
+    sPSSData->field_2174 = GetMonData(&sPSSData->field_2108, MON_DATA_KNOWN_MOVES, (u8*)sPSSData->field_2176);
     if (sPSSData->field_2174 != 0)
     {
         sPSSData->field_216D = 0;
@@ -6559,7 +6560,7 @@ static s8 RunCanReleaseMon(void)
         {
             if (sPSSData->field_2170 != TOTAL_BOXES_COUNT || sPSSData->field_2171 != i)
             {
-                knownMoves = GetMonData(gPlayerParty + i, MON_DATA_KNOWN_MOVES, sPSSData->field_2176);
+                knownMoves = GetMonData(gPlayerParty + i, MON_DATA_KNOWN_MOVES, (u8*)sPSSData->field_2176);
                 sPSSData->field_2174 &= ~(knownMoves);
             }
         }
@@ -6578,7 +6579,7 @@ static s8 RunCanReleaseMon(void)
     case 1:
         for (i = 0; i < IN_BOX_COUNT; i++)
         {
-            knownMoves = GetAndCopyBoxMonDataAt(sPSSData->field_216E, sPSSData->field_216F, MON_DATA_KNOWN_MOVES, sPSSData->field_2176);
+            knownMoves = GetAndCopyBoxMonDataAt(sPSSData->field_216E, sPSSData->field_216F, MON_DATA_KNOWN_MOVES, (u8*)sPSSData->field_2176);
             if (knownMoves != 0
                 && !(sPSSData->field_2170 == sPSSData->field_216E && sPSSData->field_2171 == sPSSData->field_216F))
             {
@@ -6654,7 +6655,7 @@ static void sub_80CE8E4(void)
     if (sIsMonBeingMoved)
         sub_80CE790();
     else
-        sBoxCursorPosition = gUnknown_0203CF20;
+        sBoxCursorPosition = gLastViewedMonIndex;
 }
 
 s16 CompactPartySlots(void)
@@ -8490,12 +8491,14 @@ static void sub_80CFC14(void)
 
     static const struct OamData sOamData_857BA0C =
     {
-        .size = 2,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
         .priority = 1,
     };
     static const struct OamData sOamData_857BA14 =
     {
-        .size = 1,
+        .shape = SPRITE_SHAPE(16x16),
+        .size = SPRITE_SIZE(16x16),
         .priority = 1,
     };
 
@@ -8733,7 +8736,7 @@ static void AddMenu(void)
     sPSSData->menuWindow.tilemapTop = 15 - sPSSData->menuWindow.height;
     sPSSData->field_CB0 = AddWindow(&sPSSData->menuWindow);
     ClearWindowTilemap(sPSSData->field_CB0);
-    SetWindowBorderStyle(sPSSData->field_CB0, FALSE, 11, 14);
+    DrawStdFrameWithCustomTileAndPalette(sPSSData->field_CB0, FALSE, 11, 14);
     PrintMenuTable(sPSSData->field_CB0, sPSSData->menuItemsCount, (void*)sPSSData->menuItems);
     InitMenuInUpperLeftCornerPlaySoundWhenAPressed(sPSSData->field_CB0, sPSSData->menuItemsCount, 0);
     schedule_bg_copy_tilemap_to_vram(0);
@@ -8787,7 +8790,7 @@ static s16 sub_80D00AC(void)
 
 static void sub_80D013C(void)
 {
-    sub_8198070(sPSSData->field_CB0, TRUE);
+    ClearStdWindowAndFrameToTransparent(sPSSData->field_CB0, TRUE);
     RemoveWindow(sPSSData->field_CB0);
 }
 
@@ -8835,7 +8838,7 @@ static bool8 sub_80D0164(void)
         sPSSData->field_2200 = AddWindow8Bit(&gUnknown_0857BB1C);
         if (sPSSData->field_2200 != 0xFF)
         {
-            FillWindowPixelBuffer(sPSSData->field_2200, 0);
+            FillWindowPixelBuffer(sPSSData->field_2200, PIXEL_FILL(0));
             return TRUE;
         }
     }
@@ -8892,7 +8895,7 @@ static bool8 sub_80D024C(void)
         ChangeBgX(0, -1024, 0);
         ChangeBgY(0, -1024, 0);
         FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
-        FillWindowPixelBuffer8Bit(sPSSData->field_2200, 0);
+        FillWindowPixelBuffer8Bit(sPSSData->field_2200, PIXEL_FILL(0));
         sub_80D07B0(sMoveMonsPtr->fromRow, sMoveMonsPtr->fromColumn);
         SetBgAttribute(0, BG_ATTR_PALETTEMODE, 1);
         PutWindowTilemap(sPSSData->field_2200);
@@ -9194,7 +9197,7 @@ static void sub_80D0834(u8 arg0, u8 arg1)
     if (species != SPECIES_NONE)
     {
         FillWindowPixelRect8Bit(sPSSData->field_2200,
-                                0,
+                                PIXEL_FILL(0),
                                 24 * arg0,
                                 24 * arg1,
                                 32,
@@ -9358,10 +9361,10 @@ static const struct OamData sOamData_857BBA4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -9911,7 +9914,7 @@ static void PrintItemDescription(void)
     else
         description = ItemId_GetDescription(sPSSData->cursorMonItem);
 
-    FillWindowPixelBuffer(2, 0x11);
+    FillWindowPixelBuffer(2, PIXEL_FILL(1));
     AddTextPrinterParameterized5(2, 1, description, 4, 0, 0, NULL, 0, 1);
 }
 
@@ -10357,7 +10360,7 @@ bool32 AnyStorageMonWithMove(u16 moveId)
         {
             if (GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_SANITY_HAS_SPECIES)
                 && !GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_SANITY_IS_EGG)
-                && GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_KNOWN_MOVES, moves))
+                && GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_KNOWN_MOVES, (u8*)moves))
                 return TRUE;
         }
     }