party_menu second quarter

src/new_menu_helpers.c

@@ -357,7 +357,7 @@ void SetBgTilemapPalette(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palet
     }
 }
 
-void CopyRectIntoAltRect(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height)
+void CopyToBufferFromBgTilemap(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height)
 {
     u8 i,j;
     const u16 *src = GetBgTilemapBuffer(bgId);

src/pokemon_icon.c

@@ -1276,7 +1276,7 @@ static void DestroyMonIconInternal(struct Sprite * sprite)
     DestroySprite(sprite);
 }
 
-void MonIcon_SetAnim(struct Sprite * sprite, u8 animNum)
+void SetPartyHPBarSprite(struct Sprite * sprite, u8 animNum)
 {
     sprite->animNum = animNum;
     sprite->animDelayCounter = 0;

src/quest_log.c

@@ -1972,15 +1972,15 @@ void DestroyHelpMessageWindow(u8 a0)
 }
 
 #ifdef NONMATCHING
-void sub_8112F18(u8 a0)
+void sub_8112F18(u8 windowId)
 {
-    u8 width = GetWindowAttribute(a0, WINDOW_WIDTH);
-    u8 height = GetWindowAttribute(a0, WINDOW_HEIGHT);
+    u8 width = GetWindowAttribute(windowId, WINDOW_WIDTH);
+    u8 height = GetWindowAttribute(windowId, WINDOW_HEIGHT);
     u8 *buffer = Alloc(32 * width * height);
     u8 i, j;
     u8 k;
 
-    if (buffer)
+    if (buffer != NULL)
     {
         for (i = 0; i < height; i++)
         {
@@ -1999,13 +1999,13 @@ void sub_8112F18(u8 a0)
                 );
             }
         }
-        CopyToWindowPixelBuffer(a0, buffer, width * height * 32, 0);
+        CopyToWindowPixelBuffer(windowId, buffer, width * height * 32, 0);
         Free(buffer);
     }
 }
 #else
 NAKED
-void sub_8112F18(u8 a0)
+void sub_8112F18(u8 windowId)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                 "\tmov r7, r10\n"

src/trade.c

@@ -2053,9 +2053,9 @@ void sub_804CF14(void)
         }
 
         if (sTradeMenuResourcesPtr->tradeMenuCursorPosition < 6)
-            sTradeMenuResourcesPtr->tradeMenuCursorPosition = sub_8138B20();
+            sTradeMenuResourcesPtr->tradeMenuCursorPosition = GetLastViewedMonIndex();
         else
-            sTradeMenuResourcesPtr->tradeMenuCursorPosition = sub_8138B20() + 6;
+            sTradeMenuResourcesPtr->tradeMenuCursorPosition = GetLastViewedMonIndex() + 6;
 
         sTradeMenuResourcesPtr->tradeMenuCursorSpriteIdx = CreateSprite(&sSpriteTemplate_TradeButtons, sTradeMonSpriteCoords[sTradeMenuResourcesPtr->tradeMenuCursorPosition][0] * 8 + 32, sTradeMonSpriteCoords[sTradeMenuResourcesPtr->tradeMenuCursorPosition][1] * 8, 2);
         gMain.state = 16;
@@ -2633,14 +2633,14 @@ void sub_804CF14(void)
                 "\tldrb r0, [r0]\n"
                 "\tcmp r0, 0x5\n"
                 "\tbhi _0804D3B8\n"
-                "\tbl sub_8138B20\n"
+                "\tbl GetLastViewedMonIndex\n"
                 "\tldr r1, [r4]\n"
                 "\tb _0804D3C0\n"
                 "\t.align 2, 0\n"
                 "_0804D3B0: .4byte sSpriteTemplate_Text\n"
                 "_0804D3B4: .4byte sTradeMenuResourcesPtr\n"
                 "_0804D3B8:\n"
-                "\tbl sub_8138B20\n"
+                "\tbl GetLastViewedMonIndex\n"
                 "\tldr r1, [r4]\n"
                 "\tadds r0, 0x6\n"
                 "_0804D3C0:\n"
@@ -4243,7 +4243,7 @@ static void sub_804F964(void)
     {
         for (j = 0; j < sTradeMenuResourcesPtr->partyCounts[i]; j++)
         {
-            MonIcon_SetAnim(&gSprites[sTradeMenuResourcesPtr->partyIcons[i][j]], 4 - sTradeMenuResourcesPtr->unk_5D[i][j]);
+            SetPartyHPBarSprite(&gSprites[sTradeMenuResourcesPtr->partyIcons[i][j]], 4 - sTradeMenuResourcesPtr->unk_5D[i][j]);
         }
     }
 }