merge

6 files changed, 1203 insertions, 255 deletions

diff --git a/src/field/field_effect.c b/src/field/field_effect.c
index 3632d7053..cffed2614 100644
--- a/src/field/field_effect.c
+++ b/src/field/field_effect.c
@@ -618,13 +618,13 @@ bool8 FieldEffectActiveListContains(u8 id)
     return FALSE;
 }
 
-u8 CreateTrainerSprite_BirchSpeech(u8 gender, s16 x, s16 y, u8 subpriority, u8 *buffer)
+u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer)
 {
     struct SpriteTemplate spriteTemplate;
-    LoadCompressedObjectPaletteOverrideBuffer(&gTrainerFrontPicPaletteTable[gender], buffer);
-    LoadCompressedObjectPicOverrideBuffer(&gTrainerFrontPicTable[gender], buffer);
-    spriteTemplate.tileTag = gTrainerFrontPicTable[gender].tag;
-    spriteTemplate.paletteTag = gTrainerFrontPicPaletteTable[gender].tag;
+    LoadCompressedObjectPaletteOverrideBuffer(&gTrainerFrontPicPaletteTable[trainerSpriteID], buffer);
+    LoadCompressedObjectPicOverrideBuffer(&gTrainerFrontPicTable[trainerSpriteID], buffer);
+    spriteTemplate.tileTag = gTrainerFrontPicTable[trainerSpriteID].tag;
+    spriteTemplate.paletteTag = gTrainerFrontPicPaletteTable[trainerSpriteID].tag;
     spriteTemplate.oam = &gOamData_839F0F4;
     spriteTemplate.anims = gDummySpriteAnimTable;
     spriteTemplate.images = NULL;
diff --git a/src/field/money.c b/src/field/money.c
index 5d9d0b689..67b7eb03f 100644
--- a/src/field/money.c
+++ b/src/field/money.c
@@ -148,7 +148,7 @@ void sub_80B7AEC(u32 arg0, u8 left, u8 top)
 }
 
 __attribute__((naked))
-void sub_80B7B34(void)
+void sub_80B7B34(u8 var1, u8 var2, int var3)
 {
     asm(".syntax unified\n\
     push {r4-r7,lr}\n\
diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c
index 775280f6e..029bb066f 100644
--- a/src/field/pokeblock.c
+++ b/src/field/pokeblock.c
@@ -25,7 +25,6 @@
 #include "sound.h"
 #include "songs.h"
 #include "safari_zone.h"
-#include "use_pokeblock.h"
 #include "event_data.h"
 #include "pokeblock.h"
 
@@ -582,7 +581,7 @@ static void sub_810BDAC(bool8 flag)
         v0 = ((i % 3) << 6) + 0x1a1 + (i / 3) * 6;
         if (gUnknown_02039248.unk0 + gUnknown_02039248.unk1 != gUnknown_02039248.unk2)
         {
-            if (sub_810CA9C(&gSaveBlock1.pokeblocks[gUnknown_02039248.unk0 + gUnknown_02039248.unk1], i + 1) > 0)
+            if (GetPokeblockData(&gSaveBlock1.pokeblocks[gUnknown_02039248.unk0 + gUnknown_02039248.unk1], i + 1) > 0)
             {
                 gBGTilemapBuffers[2][v0] = (i << 12) + 23;
                 gBGTilemapBuffers[2][v0 + 32] = (i << 12) + 24;
@@ -894,7 +893,7 @@ static void sub_810C5EC(u8 taskId)
 static void sub_810C610(u8 taskId)
 {
     MenuZeroFillWindowRect(7, 6, 13, 11);
-    sub_810CA6C((gUnknown_02039248.unk0 + gUnknown_02039248.unk1));
+    PokeblockClearIfExists((gUnknown_02039248.unk0 + gUnknown_02039248.unk1));
     StringExpandPlaceholders(gStringVar4, gContestStatsText_WasThrownAway);
     DisplayItemMessageOnField(taskId, gStringVar4, sub_810C704, 0);
     sub_810BC98();
@@ -942,9 +941,9 @@ static void sub_810C748(u8 taskId)
 
 static void sub_810C788(u8 taskId)
 {
-    s16 v0 = sub_810CAE4(GetNature(&gEnemyParty[0]), &gSaveBlock1.pokeblocks[gScriptItemId]);
+    s16 v0 = PokeblockGetGain(GetNature(&gEnemyParty[0]), &gSaveBlock1.pokeblocks[gScriptItemId]);
     StringCopy(gBattleTextBuff1, gPokeblockNames[gSaveBlock1.pokeblocks[gScriptItemId].color]);
-    sub_810CA6C(gScriptItemId);
+    PokeblockClearIfExists(gScriptItemId);
     gScriptItemId = gSaveBlock1.pokeblocks[gScriptItemId].color << 8;
     if (v0 == 0)
     {
@@ -967,7 +966,7 @@ static void sub_810C854(u8 taskId)
     SafariZoneActivatePokeblockFeeder(gScriptItemId);
     StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1.pokeblocks[gScriptItemId].color]);
     gScriptResult = gScriptItemId;
-    sub_810CA6C(gScriptItemId);
+    PokeblockClearIfExists(gScriptItemId);
     BeginNormalPaletteFade(-1, 0, 0, 16, 0);
     gTasks[taskId].func = sub_810C2C8;
 }
@@ -1024,10 +1023,10 @@ u8 sub_810C9B0(struct Pokeblock *pokeblock)
 {
     u8 contestStat;
     u8 maxRating;
-    u8 rating = sub_810CA9C(pokeblock, 1);
+    u8 rating = GetPokeblockData(pokeblock, 1);
     for (contestStat=1; contestStat<5; contestStat++)
     {
-        maxRating = sub_810CA9C(pokeblock, contestStat + 1);
+        maxRating = GetPokeblockData(pokeblock, contestStat + 1);
         if (rating < maxRating)
         {
             rating = maxRating;
@@ -1038,7 +1037,7 @@ u8 sub_810C9B0(struct Pokeblock *pokeblock)
 
 u8 sub_810C9E8(struct Pokeblock *pokeblock)
 {
-    u8 feel = sub_810CA9C(pokeblock, 6);
+    u8 feel = GetPokeblockData(pokeblock, 6);
     if (feel > 99)
         feel = 99;
     return feel;
@@ -1068,7 +1067,7 @@ bool8 sub_810CA34(struct Pokeblock *pokeblock)
     return TRUE;
 }
 
-bool8 sub_810CA6C(u8 pokeblockIdx)
+bool8 PokeblockClearIfExists(u8 pokeblockIdx)
 {
     if (gSaveBlock1.pokeblocks[pokeblockIdx].color == 0)
     {
@@ -1078,33 +1077,33 @@ bool8 sub_810CA6C(u8 pokeblockIdx)
     return TRUE;
 }
 
-s16 sub_810CA9C(const struct Pokeblock *pokeblock, u8 field)
+s16 GetPokeblockData(const struct Pokeblock *pokeblock, u8 field)
 {
-    if (field == 0)
+    if (field == PBLOCK_COLOR)
         return pokeblock->color;
-    if (field == 1)
+    if (field == PBLOCK_SPICY)
         return pokeblock->spicy;
-    if (field == 2)
+    if (field == PBLOCK_DRY)
         return pokeblock->dry;
-    if (field == 3)
+    if (field == PBLOCK_SWEET)
         return pokeblock->sweet;
-    if (field == 4)
+    if (field == PBLOCK_BITTER)
         return pokeblock->bitter;
-    if (field == 5)
+    if (field == PBLOCK_SOUR)
         return pokeblock->sour;
-    if (field == 6)
+    if (field == PBLOCK_FEEL)
         return pokeblock->feel;
     return 0;
 }
 
-s16 sub_810CAE4(u8 nature, const struct Pokeblock *pokeblock)
+s16 PokeblockGetGain(u8 nature, const struct Pokeblock *pokeblock)
 {
     u8 flavor;
     s16 curGain;
     s16 totalGain = 0;
     for (flavor=0; flavor<5; flavor++)
     {
-        curGain = sub_810CA9C(pokeblock, flavor + 1);
+        curGain = GetPokeblockData(pokeblock, flavor + 1);
         if (curGain > 0)
         {
             totalGain += curGain * gPokeblockFlavorCompatibilityTable[5 * nature + flavor];
@@ -1113,9 +1112,9 @@ s16 sub_810CAE4(u8 nature, const struct Pokeblock *pokeblock)
     return totalGain;
 }
 
-void sub_810CB44(struct Pokeblock *pokeblock, u8 *dest)
+void PokeblockCopyName(struct Pokeblock *pokeblock, u8 *dest)
 {
-    u8 color = sub_810CA9C(pokeblock, 0);
+    u8 color = GetPokeblockData(pokeblock, PBLOCK_COLOR);
     StringCopy(dest, gPokeblockNames[color]);
 }
 
@@ -1124,7 +1123,7 @@ bool8 sub_810CB68(u8 nature, u8 *dest)
     u8 flavor;
     for (flavor=0; flavor<5; flavor++)
     {
-        if (sub_810CAE4(nature, &gUnknown_083F7F9C[flavor]) > 0)
+        if (PokeblockGetGain(nature, &gUnknown_083F7F9C[flavor]) > 0)
         {
             StringCopy(dest, gPokeblockNames[flavor + 1]);
             return TRUE;
diff --git a/src/field/shop.c b/src/field/shop.c
index d53646a88..6a88f1394 100644
--- a/src/field/shop.c
+++ b/src/field/shop.c
@@ -16,68 +16,106 @@
 #include "task.h"
 #include "tv.h"
 #include "unknown_task.h"
+#include "field_map_obj.h"
+#include "field_player_avatar.h"
+#include "fieldmap.h"
+#include "item.h"
+#include "decoration.h"
+#include "items.h"
+#include "songs.h"
+#include "rom4.h"
+#include "decoration_inventory.h"
+#include "field_camera.h"
 
-struct UnknownShopStruct
-{
-    /* 0x0 */ void (* callback) (void);
-    /* 0x4 */ u16 *itemList;
-    /* 0x8 */ u8 itemCount;
-    /* 0x9 */ u8 unk9;
-    /* 0xA */ u8 unkA;
-    /* 0xB */ u8 unkB;
-    /* 0xC */ bool8 unkC;
-    // unknown size
-};
+#define ewram18000 ((u16 *)(ewram + 0x18000))
+#define ewram18300 ((u16 *)(ewram + 0x18300))
 
-extern struct UnknownShopStruct gUnknown_03000708;
-extern struct MenuAction gUnknown_083CC6D0[];
+extern bool8 sub_80A52C4(u8, u8);
 
-extern u8 gUnknown_083CC6E8[];
-extern u8 gUnknown_083CC6EB[];
+extern u8 ewram[];
 extern u8 gBuyMenuFrame_Gfx[];
-
 extern u16 gBuyMenuFrame_Tilemap[];
 extern u16 gMenuMoneyPal[16];
-extern u16 gUnknown_083CC710[2];
 
-u8 CreateShopMenu(bool8 var)
+void sub_80B39D0(int var1, int var2, bool32 hasControlCode);
+void sub_80B3A70(void);
+void sub_80B4378(u8);
+void sub_80B43F0(u8);
+void Task_ExitBuyMenu(u8);
+void sub_80B4470(u8);
+void sub_80B2EFC(u8 taskId);
+void sub_80B2F30(u8 taskId);
+void HandleShopMenuQuit(u8 taskId);
+void sub_80B3BF4(u8 taskId);
+void sub_80B3D7C(u8 taskId);
+
+// iwram
+static struct MartInfo gMartInfo;
+
+// ewram
+EWRAM_DATA u32 gMartTotalCost = 0;
+EWRAM_DATA s16 gUnknown_020386A4[16][4] = {0}; // game freak barely uses 2d arrays wtf?
+EWRAM_DATA struct ItemSlot gUnknown_02038724[3] = {0}; // tv.c uses this, so it cant be static
+EWRAM_DATA u8 gUnknown_02038730 = 0;
+EWRAM_DATA u8 gUnknown_02038731 = 0;
+
+// rodata
+static const struct MenuAction2 gUnknown_083CC6D0[] =
+{
+    { MartText_Buy, sub_80B2EFC },
+    { MartText_Sell, sub_80B2F30 },
+    { MartText_Quit2, HandleShopMenuQuit },
+};
+
+static const u8 gUnknown_083CC6E8[] = {0, 1, 2}; // BUY SELL EXIT
+static const u8 gUnknown_083CC6EB[] = {0, 2}; // BUY EXIT
+
+static const u16 gUnusedMartArray[] = {0x2, 0x3, 0x4, 0xD, 0x121, 0xE, 0xE, 0xE, 0xE, 0xE, 0xE, 0x0, 0x0};
+
+static const struct YesNoFuncTable gUnknown_083CC708[] =
+{
+    sub_80B3BF4,
+    sub_80B3D7C
+};
+
+u8 CreateShopMenu(u8 martType)
 {
     ScriptContext2_Enable();
-    gUnknown_03000708.unkC = var;
-    gUnknown_03000708.unk9 = 0;
+    gMartInfo.martType = martType;
+    gMartInfo.cursor = 0;
 
-    if(var == FALSE)
+    if (martType == MART_TYPE_0)
     {
-        gUnknown_03000708.unkA = 2;
+        gMartInfo.numChoices = 2;
         MenuDrawTextWindow(0, 0, 10, 7);
-        PrintMenuItemsReordered(1, 1, 3, gUnknown_083CC6D0, (u8 *)gUnknown_083CC6E8);
+        PrintMenuItemsReordered(1, 1, 3, (struct MenuAction *)gUnknown_083CC6D0, (u8 *)gUnknown_083CC6E8);
     }
     else
     {
-        gUnknown_03000708.unkA = 1;
+        gMartInfo.numChoices = 1;
         MenuDrawTextWindow(0, 0, 10, 5);
-        PrintMenuItemsReordered(1, 1, 2, gUnknown_083CC6D0, (u8 *)gUnknown_083CC6EB);
+        PrintMenuItemsReordered(1, 1, 2, (struct MenuAction *)gUnknown_083CC6D0, (u8 *)gUnknown_083CC6EB);
     }
-    InitMenu(0, 1, 1, gUnknown_03000708.unkA + 1, 0, 9);
+    InitMenu(0, 1, 1, gMartInfo.numChoices + 1, 0, 9); // add 1 for cancel
 
     return CreateTask(sub_80B2E38, 8);
 }
 
 void SetShopMenuCallback(void *callbackPtr)
 {
-    gUnknown_03000708.callback = callbackPtr;
+    gMartInfo.callback = callbackPtr;
 }
 
 void SetShopItemsForSale(u16 *items)
 {
     u16 i = 0;
 
-    gUnknown_03000708.itemList = items;
-    gUnknown_03000708.itemCount = 0;
+    gMartInfo.itemList = items;
+    gMartInfo.itemCount = 0;
 
-    while (gUnknown_03000708.itemList[i])
+    while (gMartInfo.itemList[i])
     {
-        gUnknown_03000708.itemCount++;
+        gMartInfo.itemCount++;
         i++;
     }
 }
@@ -86,37 +124,37 @@ void sub_80B2E38(u8 var)
 {
     const u8 local = var;
 
-    if(gMain.newAndRepeatedKeys & 0x40)
+    if (gMain.newAndRepeatedKeys & DPAD_UP)
     {
-        if(gUnknown_03000708.unk9)
+        if (gMartInfo.cursor) // can move cursor up?
         {
-            PlaySE(0x5);
-            gUnknown_03000708.unk9 = MoveMenuCursor(-1);
+            PlaySE(SE_SELECT);
+            gMartInfo.cursor = MoveMenuCursor(-1);
         }
     }
-    else if(gMain.newAndRepeatedKeys & 0x80)
+    else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
     {
-        if(gUnknown_03000708.unk9 != gUnknown_03000708.unkA)
+        if (gMartInfo.cursor != gMartInfo.numChoices) // can move cursor down?
         {
-            PlaySE(0x5);
-            gUnknown_03000708.unk9 = MoveMenuCursor(1);
+            PlaySE(SE_SELECT);
+            gMartInfo.cursor = MoveMenuCursor(1);
         }
     }
-    else if (gMain.newKeys & 1)
+    else if (gMain.newKeys & A_BUTTON)
     {
-        PlaySE(0x5);
-        if(!gUnknown_03000708.unkC)
+        PlaySE(SE_SELECT);
+        if (gMartInfo.martType == MART_TYPE_0)
         {
-            gUnknown_083CC6D0[gUnknown_083CC6E8[gUnknown_03000708.unk9]].func(local);
+            gUnknown_083CC6D0[gUnknown_083CC6E8[gMartInfo.cursor]].func(local);
         }
         else
         {
-            gUnknown_083CC6D0[gUnknown_083CC6EB[gUnknown_03000708.unk9]].func(local);
+            gUnknown_083CC6D0[gUnknown_083CC6EB[gMartInfo.cursor]].func(local);
         }
     }
-    else if(gMain.newKeys & 2)
+    else if (gMain.newKeys & B_BUTTON)
     {
-        PlaySE(0x5);
+        PlaySE(SE_SELECT);
         HandleShopMenuQuit(local);
     }
 }
@@ -141,17 +179,17 @@ void HandleShopMenuQuit(u8 taskId)
 {
     HandleDestroyMenuCursors();
     MenuZeroFillWindowRect(0, 0, 11, 8);
-    sub_80BE3BC(); // in tv.s?
+    sub_80BE3BC();
     ScriptContext2_Disable();
     DestroyTask(taskId);
 
-    if(gUnknown_03000708.callback)
-        gUnknown_03000708.callback(); // run the callback if it exists.
+    if (gMartInfo.callback)
+        gMartInfo.callback(); // run the callback if it exists.
 }
 
 void sub_80B2FA0(u8 taskId)
 {
-    if(!gPaletteFade.active)
+    if (!gPaletteFade.active)
     {
         SetMainCallback2((void *)((u16)gTasks[taskId].data[8] << 16 | (u16)gTasks[taskId].data[9]));
         DestroyTask(taskId);
@@ -160,15 +198,15 @@ void sub_80B2FA0(u8 taskId)
 
 void ReturnToShopMenuAfterExitingSellMenu(u8 taskId)
 {
-    CreateShopMenu(gUnknown_03000708.unkC);
+    CreateShopMenu(gMartInfo.martType);
     DestroyTask(taskId);
 }
 
 void Task_ExitSellMenu(u8 taskId)
 {
-    if(sub_807D770() == 1)
+    if (sub_807D770() == 1)
     {
-        if(gUnknown_03000708.unkC == 2)
+        if (gMartInfo.martType == MART_TYPE_2)
             DisplayItemMessageOnField(taskId, gOtherText_CanIHelpYou, ReturnToShopMenuAfterExitingSellMenu, 0);
         else
             DisplayItemMessageOnField(taskId, gOtherText_AnythingElse, ReturnToShopMenuAfterExitingSellMenu, 0);
@@ -253,8 +291,8 @@ void BuyMenuDrawGraphics(void)
     SetUpWindowConfig(&gWindowConfig_81E6DFC);
     InitMenuWindow(&gWindowConfig_81E6DFC);
     BuyMenuDrawMapGraphics();
-    gUnknown_03000708.unk9 = zero;
-    gUnknown_03000708.unkB = zero2;
+    gMartInfo.cursor = zero;
+    gMartInfo.choicesAbove = zero2;
     MenuZeroFillWindowRect(0, 0, 0x20, 0x20);
     sub_80B7C14(gSaveBlock1.money, 0, 0);
     sub_80B3764(0, 7);
@@ -272,9 +310,8 @@ void BuyMenuDrawGraphics(void)
 
 void sub_80B3240(void)
 {
-    u16 tempArr[2];
+    u16 tempArr[2] = {0x41EE, 0x7FFF};
 
-    memcpy(tempArr, gUnknown_083CC710, sizeof(tempArr));
     LoadPalette(&tempArr[1], 0xD1, 2);
     LoadPalette(&tempArr[0], 0xD8, 2);
 }
@@ -283,7 +320,7 @@ void sub_80B3270(void)
 {
     sub_80F944C();
 
-    if(gUnknown_03000708.itemCount > 7)
+    if (gMartInfo.itemCount > 7)
     {
         CreateVerticalScrollIndicators(0, 172, 12);
         CreateVerticalScrollIndicators(1, 172, 148);
@@ -293,12 +330,12 @@ void sub_80B3270(void)
 
 void sub_80B32A4(void)
 {
-    if(gUnknown_03000708.unkB == 0)
+    if (gMartInfo.choicesAbove == 0)
         sub_80F979C(0, 1);
     else
         sub_80F979C(0, 0);
 
-    if(gUnknown_03000708.unkB + 7 >= gUnknown_03000708.itemCount)
+    if (gMartInfo.choicesAbove + 7 >= gMartInfo.itemCount)
         sub_80F979C(1, 1);
     else
         sub_80F979C(1, 0);
@@ -318,13 +355,13 @@ void BuyMenuDrawMapMetatileLayer(u16 *array, s16 offset1, s16 offset2, u16 *arra
     array[offset1 + offset2 + 33] = array2[3];
 }
 
-void BuyMenuDrawMapMetatile(int var1, int var2, u16 *var3, s8 var4)
+void BuyMenuDrawMapMetatile(int var1, int var2, u16 *var3, s32 var4)
 {
     u8 tempVar4 = var4;
     s16 offset1 = var1 * 2;
     s16 offset2 = (var2 * 0x40) + 0x40;
 
-    switch(tempVar4)
+    switch (tempVar4)
     {
     case 0: // _080B335C
         BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], offset1, offset2, var3);
@@ -340,3 +377,975 @@ void BuyMenuDrawMapMetatile(int var1, int var2, u16 *var3, s8 var4)
         break;
     }
 }
+
+void sub_80B33D0(s16 var1, int var2, u16 *var3)
+{
+    s16 offset1 = var1 * 2;
+    s16 offset2 = (var2 * 0x40) + 0x40;
+
+    BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[3], offset1, offset2, var3);
+    BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], offset1, offset2, var3 + 4);
+}
+
+void sub_80B3420(void)
+{
+    s16 facingX;
+    s16 facingY;
+    s16 x;
+    s16 y;
+
+    GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY);
+    facingX -= 3;
+    facingY -= 3;
+
+    for (y = 0; y < 6; y++)
+    {
+        for (x = 0; x < 7; x++)
+        {
+            u16 metatileId = MapGridGetMetatileIdAt(facingX + x, facingY + y);
+
+            if (y != 5 && x != 6)
+            {
+                s32 r3 = MapGridGetMetatileLayerTypeAt(facingX + x, facingY + y);
+
+                if (metatileId < 512)
+                    BuyMenuDrawMapMetatile(x, y, (u16 *)gMapHeader.mapData->primaryTileset->metatiles + metatileId * 8, r3);
+                else
+                    BuyMenuDrawMapMetatile(x, y, (u16 *)gMapHeader.mapData->secondaryTileset->metatiles + (metatileId - 512) * 8, r3);
+            }
+            else
+            {
+                if (metatileId < 512)
+                    sub_80B33D0(x, y, (u16 *)gMapHeader.mapData->primaryTileset->metatiles + metatileId * 8);
+                else
+                    sub_80B33D0(x, y, (u16 *)gMapHeader.mapData->secondaryTileset->metatiles + (metatileId - 512) * 8);
+            }
+
+            if (y == 0 && x != 0 && x != 6)
+                sub_80B32EC(gBGTilemapBuffers[1], x * 2, 64);
+        }
+    }
+}
+
+void BuyMenuDrawMapGraphics(void)
+{
+    sub_80F9020();
+    sub_80B356C();
+    sub_80B368C();
+    sub_80B3420();
+}
+
+void sub_80B356C(void)
+{
+    s16 facingX;
+    s16 facingY;
+    u8 playerHeight;
+    u8 y;
+    u8 x;
+    u8 r8 = 0;
+
+    GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY);
+    playerHeight = PlayerGetZCoord();
+    for (y = 0; y < 16; y++)
+        gUnknown_020386A4[y][MAP_OBJ_ID] = 16;
+    for (y = 0; y < 5; y++)
+    {
+        for (x = 0; x < 7; x++)
+        {
+            u8 mapObjId = GetFieldObjectIdByXYZ(facingX - 3 + x, facingY - 2 + y, playerHeight);
+
+            if (mapObjId != 16)
+            {
+                gUnknown_020386A4[r8][MAP_OBJ_ID] = mapObjId;
+                gUnknown_020386A4[r8][X_COORD] = x;
+                gUnknown_020386A4[r8][Y_COORD] = y;
+                if (gMapObjects[mapObjId].mapobj_unk_18 == 1)
+                    gUnknown_020386A4[r8][ANIM_NUM] = 0;
+                if (gMapObjects[mapObjId].mapobj_unk_18 == 2)
+                    gUnknown_020386A4[r8][ANIM_NUM] = 1;
+                if (gMapObjects[mapObjId].mapobj_unk_18 == 3)
+                    gUnknown_020386A4[r8][ANIM_NUM] = 2;
+                if (gMapObjects[mapObjId].mapobj_unk_18 == 4)
+                    gUnknown_020386A4[r8][ANIM_NUM] = 3;
+                r8++;
+            }
+        }
+    }
+}
+
+void sub_80B368C(void)
+{
+    u8 i;
+
+    for (i = 0; i < 16; i++) // max objects?
+    {
+        if (gUnknown_020386A4[i][MAP_OBJ_ID] == 16)
+            continue;
+
+        StartSpriteAnim(&gSprites[AddPseudoFieldObject(
+            gMapObjects[gUnknown_020386A4[i][MAP_OBJ_ID]].graphicsId,
+            SpriteCallbackDummy,
+            (u16)gUnknown_020386A4[i][X_COORD] * 16 + 8,
+            (u16)gUnknown_020386A4[i][Y_COORD] * 16 + 32,
+            2)],
+            gUnknown_020386A4[i][ANIM_NUM]);
+    }
+}
+
+void sub_80B3720(void)
+{
+    s16 i;
+    
+    for (i = 0; i < 0x400; i++)
+    {
+        if (ewram18000[i] != 0)
+            gBGTilemapBuffers[1][i] = ewram18000[i] + 0xC3E0;
+    }
+}
+
+void sub_80B3764(int var1, int var2)
+{
+    sub_80B3720();
+    sub_80B39D0(var1, var2, 0);
+    InitMenu(0, 0xE, 0x2, 0x8, gMartInfo.cursor, 0xF);
+}
+
+void sub_80B379C(void)
+{
+    u16 i, j;
+
+    for (i = 0; i < 8; i++)
+        for (j = 0; j < 14; j++)
+            gBGTilemapBuffers[1][32 * (i + 12) + j] = ewram18300[32 * i + j] + 0xC3E0;
+}
+
+void sub_80B37EC(void)
+{
+    sub_80B3A70();
+}
+
+void sub_80B37F8(u8 taskId)
+{
+    u16 itemListIndex = gMartInfo.choicesAbove + gMartInfo.cursor;
+    u16 itemId = gMartInfo.itemList[itemListIndex];
+    u32 price = (ItemId_GetPrice(itemId) >> GetPriceReduction(1));
+
+    sub_80B7A94(gTasks[taskId].data[1] * price, 6, 6, 11);
+    gStringVar1[0] = EXT_CTRL_CODE_BEGIN;
+    gStringVar1[1] = 0x14;
+    gStringVar1[2] = 0x6;
+    ConvertIntToDecimalStringN(&gStringVar1[3], gTasks[taskId].data[1], 1, 2);
+    MenuPrint(gOtherText_xString1, 1, 11);
+    sub_80A3FA0(gBGTilemapBuffers[1], 1, 11, 12, 2, 0xC3E1);
+}
+
+void sub_80B389C(u16 itemId, u8 var2, bool32 hasControlCode)
+{
+    u8 *stringPtr = gStringVar1;
+
+    if (hasControlCode != FALSE)
+    {
+        stringPtr[0] = EXT_CTRL_CODE_BEGIN;
+        stringPtr[1] = 0x1;
+        stringPtr[2] = 0x2;
+        stringPtr += 3;
+    }
+
+    CopyItemName(itemId, stringPtr);
+
+    sub_8072A18(&gStringVar1[0], 0x70, var2 << 3, 0x58, 0x1);
+    stringPtr = gStringVar1;
+
+    if (hasControlCode != FALSE)
+        stringPtr = &gStringVar1[3];
+
+    sub_80B79F8(stringPtr, (ItemId_GetPrice(itemId) >> GetPriceReduction(1)), 0x4);
+    MenuPrint_PixelCoords(&gStringVar1[0], 0xCA, var2 << 3, 1);
+}
+
+void sub_80B3930(u16 itemId, u8 var2, bool32 hasControlCode)
+{
+    u8 *stringPtr = gStringVar1;
+
+    if (hasControlCode != FALSE)
+    {
+        stringPtr[0] = EXT_CTRL_CODE_BEGIN;
+        stringPtr[1] = 0x1;
+        stringPtr[2] = 0x2;
+        stringPtr += 3;
+    }
+
+    StringCopy(stringPtr, gDecorations[itemId].name);
+    sub_8072A18(&gStringVar1[0], 0x70, var2 << 3, 0x58, 0x1);
+    stringPtr = gStringVar1;
+
+    if (hasControlCode != FALSE)
+        stringPtr = &gStringVar1[3];
+
+    if (gDecorations[itemId].price == 10000)
+    {
+        sub_80B7B34(0x19, var2, hasControlCode); // huh???
+    }
+    else
+    {
+        sub_80B79F8(stringPtr, gDecorations[itemId].price, 0x4);
+        MenuPrint_PixelCoords(&gStringVar1[0], 0xCA, var2 << 3, 0x1);
+    }
+}
+
+void sub_80B39D0(int var1, int var2, bool32 hasControlCode)
+{
+    u8 i;
+
+    for (i = var1; i <= var2 && gMartInfo.choicesAbove + i < gMartInfo.itemCount; i++)
+    {
+        if (gMartInfo.martType == MART_TYPE_0)
+            sub_80B389C(gMartInfo.itemList[gMartInfo.choicesAbove + i], (i << 1) + 2, hasControlCode);
+        else
+            sub_80B3930(gMartInfo.itemList[gMartInfo.choicesAbove + i], (i << 1) + 2, hasControlCode);
+    }
+
+    if (i != 8 && gMartInfo.choicesAbove + i == gMartInfo.itemCount)
+    {
+        MenuFillWindowRectWithBlankTile(0xE, (i << 1) + 2, 0x1C, (i << 1) + 3);
+        MenuPrint(gOtherText_CancelNoTerminator, 0xE, (i << 1) + 2);
+    }
+}
+
+void sub_80B3A70(void)
+{
+    if (gMartInfo.choicesAbove + gMartInfo.cursor != gMartInfo.itemCount)
+    {
+        if (gMartInfo.martType == MART_TYPE_0)
+        {
+            sub_8072AB0(ItemId_GetDescription(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]),
+                0x4, 0x68, 0x68, 0x30, 0);
+        }
+        else
+            sub_8072AB0(gDecorations[gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]].description,
+                0x4, 0x68, 0x68, 0x30, 0);
+    }
+    else
+    {
+        sub_8072AB0(gOtherText_QuitShopping, 0x4, 0x68, 0x68, 0x30, 0);
+    }
+}
+
+void sub_80B3AEC(u8 taskId)
+{
+    if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
+    {
+        sub_80B39D0(gMartInfo.cursor, gMartInfo.cursor, 0); // huh???
+        PlaySE(SE_SELECT);
+
+        if (gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor] == ITEM_POKE_BALL && gTasks[taskId].data[1] >= 10 && AddBagItem(ITEM_PREMIER_BALL, 1) == TRUE)
+            DisplayItemMessageOnField(taskId, gOtherText_FreePremierBall, sub_80B4378, 0xC3E1);
+        else
+            sub_80B4378(taskId);
+    }
+}
+
+void sub_80B3B80(u8 taskId)
+{
+    IncrementGameStat(0x26);
+    sub_80B79E0(&gSaveBlock1.money, gMartTotalCost);
+    PlaySE(SE_REGI);
+    sub_80B7BEC(gSaveBlock1.money, 0, 0);
+    gTasks[taskId].func = sub_80B3AEC;
+}
+
+void sub_80B3BD0(u8 taskId)
+{
+    sub_80B39D0(gMartInfo.cursor, gMartInfo.cursor, 0); // same thing as above?
+    sub_80B4378(taskId);
+}
+
+void sub_80B3BF4(u8 taskId)
+{
+    MenuZeroFillWindowRect(0x7, 0x8, 0xD, 0xD);
+    sub_80A3FA0(gBGTilemapBuffers[1], 8, 9, 4, 4, 0);
+    sub_80B379C();
+    sub_80B3420();
+
+    if (IsEnoughMoney(gSaveBlock1.money, gMartTotalCost))
+    {
+        if (gMartInfo.martType == MART_TYPE_0)
+        {
+            if (AddBagItem(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor], gTasks[taskId].data[1]))
+            {
+                DisplayItemMessageOnField(taskId, gOtherText_HereYouGo, sub_80B3B80, 0xC3E1);
+                sub_80B4470(taskId);
+            }
+            else
+                DisplayItemMessageOnField(taskId, gOtherText_NoRoomFor, sub_80B3BD0, 0xC3E1);
+        }
+        else // a normal mart is only type 0, so types 1 and 2 are decoration marts.
+        {
+            if (IsThereStorageSpaceForDecoration(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]))
+            {
+                if (gMartInfo.martType == MART_TYPE_1)
+                    DisplayItemMessageOnField(taskId, gOtherText_HereYouGo2, sub_80B3B80, 0xC3E1);
+                else
+                    DisplayItemMessageOnField(taskId, gOtherText_HereYouGo3, sub_80B3B80, 0xC3E1);
+            }
+            else
+            {
+                StringExpandPlaceholders(gStringVar4, gOtherText_SpaceForIsFull);
+                DisplayItemMessageOnField(taskId, gStringVar4, sub_80B3BD0, 0xC3E1);
+            }
+        }
+    }
+    else
+        DisplayItemMessageOnField(taskId, gOtherText_NotEnoughMoney, sub_80B3BD0, 0xC3E1);
+}
+
+void sub_80B3D38(u8 taskId)
+{
+    DisplayYesNoMenu(7, 8, 1);
+    sub_80A3FA0(gBGTilemapBuffers[1], 8, 9, 4, 4, 0xC3E1);
+    DoYesNoFuncWithChoice(taskId, gUnknown_083CC708);
+}
+
+void sub_80B3D7C(u8 taskId)
+{
+    sub_80B39D0(gMartInfo.cursor, gMartInfo.cursor, 0);
+    MenuZeroFillWindowRect(0x7, 0x8, 0xD, 0xD);
+    sub_80A3FA0(gBGTilemapBuffers[1], 0x8, 0x9, 0x4, 0x4, 0);
+    sub_80B4378(taskId);
+}
+
+void sub_80B3DC8(u8 taskId)
+{
+    if (sub_80A52C4(taskId, gMartInfo.curItemCount) == TRUE)
+        sub_80B37F8(taskId);
+
+    if (gMain.newKeys & A_BUTTON)
+    {
+        gMartTotalCost = (ItemId_GetPrice(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]) >> GetPriceReduction(1)) * gTasks[taskId].data[1]; // set total cost of your purchase.
+        MenuZeroFillWindowRect(0, 0xA, 0xD, 0xD);
+        sub_80A3FA0(gBGTilemapBuffers[1], 0x1, 0xB, 0xC, 0x2, 0);
+        sub_80B379C();
+        sub_80B3420();
+        CopyItemName(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor], gStringVar1);
+        ConvertIntToDecimalStringN(gStringVar2, gTasks[taskId].data[1], 0, 0x2);
+        ConvertIntToDecimalStringN(gStringVar3, gMartTotalCost, 0, 0x8);
+        StringExpandPlaceholders(gStringVar4, gOtherText_ThatWillBe);
+        DisplayItemMessageOnField(taskId, gStringVar4, sub_80B3D38, 0xC3E1);
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        sub_80B39D0(gMartInfo.cursor, gMartInfo.cursor, 0);
+        sub_80B4378(taskId);
+    }
+}
+
+void sub_80B3EFC(u8 taskId)
+{
+    u16 var;
+
+    gTasks[taskId].data[1] = 1;
+    MenuDrawTextWindow(0, 0xA, 0xD, 0xD);
+    sub_80B37F8(taskId);
+
+    var = gSaveBlock1.money / (ItemId_GetPrice(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]) >> GetPriceReduction(1));
+    if (var > 99)
+        gMartInfo.curItemCount = 99;
+    else
+        gMartInfo.curItemCount = var;
+
+    gTasks[taskId].func = sub_80B3DC8;
+}
+
+#ifdef NONMATCHING
+void sub_80B3F88(void)
+{
+    u16 *r1;
+    u16 *r2;
+    register u8 *r10 asm("r10");
+    s32 i;
+    s32 j;
+    struct Window *r8 = &gMenuWindow;
+    
+    r1 = r8->tilemap;
+    r1 += 0x1EF;
+    r2 = r1;
+    r2 += 64;
+    r10 = r8->tileData;
+    
+    for (i = 0; i < 14; i++)
+    {
+        for (j = 0; j < 15; j++)
+        {
+            if ((r1[j] & 0x3FF) <= r8->tileDataStartOffset + 1)
+                r2[j] = r8->tileDataStartOffset + 1;
+            else
+                r2[j] = r1[j] + 0x3C;
+        }
+        
+        r1 -= 32;
+        r2 -= 32;
+    }
+    
+    {
+        u8 *r1 = r10 + 0x3A20;
+        u8 *r2 = r1 + 0x780;
+        for (i = 0; i < 14; i++)
+        {
+            DmaCopy16(3, r1, r2, 0x1E0);
+            r2 -= 0x3C0;
+            r1 -= 0x3C0;
+        }
+    }
+}
+#else
+__attribute__((naked))
+void sub_80B3F88(void)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x4\n\
+    ldr r0, _080B4020 @ =gMenuWindow\n\
+    mov r8, r0\n\
+    ldr r1, [r0, 0x28]\n\
+    ldr r3, _080B4024 @ =0x000003de\n\
+    adds r1, r3\n\
+    adds r2, r1, 0\n\
+    adds r2, 0x80\n\
+    ldr r7, [r0, 0x24]\n\
+    mov r10, r7\n\
+    ldr r0, _080B4028 @ =0x000003ff\n\
+    mov r9, r0\n\
+    movs r6, 0xD\n\
+_080B3FAC:\n\
+    adds r3, r2, 0\n\
+    subs r3, 0x40\n\
+    str r3, [sp]\n\
+    movs r7, 0x40\n\
+    negs r7, r7\n\
+    adds r7, r1\n\
+    mov r12, r7\n\
+    adds r3, r2, 0\n\
+    adds r4, r1, 0\n\
+    movs r5, 0xE\n\
+_080B3FC0:\n\
+    ldrh r2, [r4]\n\
+    mov r1, r9\n\
+    ands r1, r2\n\
+    mov r7, r8\n\
+    ldrh r0, [r7, 0x1A]\n\
+    adds r0, 0x1\n\
+    cmp r1, r0\n\
+    ble _080B3FD4\n\
+    adds r0, r2, 0\n\
+    adds r0, 0x3C\n\
+_080B3FD4:\n\
+    strh r0, [r3]\n\
+    adds r3, 0x2\n\
+    adds r4, 0x2\n\
+    subs r5, 0x1\n\
+    cmp r5, 0\n\
+    bge _080B3FC0\n\
+    ldr r2, [sp]\n\
+    mov r1, r12\n\
+    subs r6, 0x1\n\
+    cmp r6, 0\n\
+    bge _080B3FAC\n\
+    ldr r1, _080B402C @ =0x00003a20\n\
+    add r1, r10\n\
+    movs r0, 0xF0\n\
+    lsls r0, 3\n\
+    adds r2, r1, r0\n\
+    ldr r3, _080B4030 @ =0x040000d4\n\
+    ldr r5, _080B4034 @ =0x800000f0\n\
+    ldr r4, _080B4038 @ =0xfffffc40\n\
+    movs r6, 0xD\n\
+_080B3FFC:\n\
+    str r1, [r3]\n\
+    str r2, [r3, 0x4]\n\
+    str r5, [r3, 0x8]\n\
+    ldr r0, [r3, 0x8]\n\
+    adds r2, r4\n\
+    adds r1, r4\n\
+    subs r6, 0x1\n\
+    cmp r6, 0\n\
+    bge _080B3FFC\n\
+    add sp, 0x4\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
+_080B4020: .4byte gMenuWindow\n\
+_080B4024: .4byte 0x000003de\n\
+_080B4028: .4byte 0x000003ff\n\
+_080B402C: .4byte 0x00003a20\n\
+_080B4030: .4byte 0x040000d4\n\
+_080B4034: .4byte 0x800000f0\n\
+_080B4038: .4byte 0xfffffc40\n\
+    .syntax divided");
+}
+#endif
+
+#ifdef NONMATCHING
+void sub_80B403C(void)
+{
+    u16 *r1;
+    u16 *r2;
+    u8 *r10;
+    s32 i;
+    s32 j;
+    struct Window *r8 = &gMenuWindow;
+    
+    r1 = r8->tilemap;
+    r1 += 0x4F;
+    r2 = r1;
+    r2 += 64;
+    r10 = r8->tileData;
+    
+    for (i = 0; i < 14; i++)
+    {
+        for (j = 0; j < 15; j++)
+        {
+            if ((r1[j] & 0x3FF) <= r8->tileDataStartOffset + 1)
+                r2[j] = r8->tileDataStartOffset + 1;
+            else
+                r2[j] = r1[j] + 0x3C;
+        }
+        
+        r1 += 32;
+        r2 += 32;
+    }
+
+    {
+        register u8 *r1 asm("r1") = r10 + 0x960;
+        register u8 *r2 asm("r2") = r1;
+       
+        r1 += 0x780;
+        for (i = 0; i < 14; i++)
+        {
+            DmaCopy16(3, r1, r2, 0x1E0);
+            r1 += 0x3C0;
+            r2 += 0x3C0;
+        }
+    }
+}
+#else
+__attribute__((naked))
+void sub_80B403C(void)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x4\n\
+    ldr r0, _080B40D8 @ =gMenuWindow\n\
+    mov r8, r0\n\
+    ldr r2, [r0, 0x28]\n\
+    adds r1, r2, 0\n\
+    adds r1, 0x9E\n\
+    adds r2, r1, 0\n\
+    adds r1, 0x80\n\
+    ldr r3, [r0, 0x24]\n\
+    mov r10, r3\n\
+    ldr r7, _080B40DC @ =0x000003ff\n\
+    mov r9, r7\n\
+    movs r6, 0xD\n\
+_080B4060:\n\
+    adds r0, r2, 0\n\
+    adds r0, 0x40\n\
+    str r0, [sp]\n\
+    movs r3, 0x40\n\
+    adds r3, r1\n\
+    mov r12, r3\n\
+    adds r3, r2, 0\n\
+    adds r4, r1, 0\n\
+    movs r5, 0xE\n\
+_080B4072:\n\
+    ldrh r2, [r4]\n\
+    mov r1, r9\n\
+    ands r1, r2\n\
+    mov r7, r8\n\
+    ldrh r0, [r7, 0x1A]\n\
+    adds r0, 0x1\n\
+    cmp r1, r0\n\
+    ble _080B4086\n\
+    adds r0, r2, 0\n\
+    subs r0, 0x3C\n\
+_080B4086:\n\
+    strh r0, [r3]\n\
+    adds r3, 0x2\n\
+    adds r4, 0x2\n\
+    subs r5, 0x1\n\
+    cmp r5, 0\n\
+    bge _080B4072\n\
+    ldr r2, [sp]\n\
+    mov r1, r12\n\
+    subs r6, 0x1\n\
+    cmp r6, 0\n\
+    bge _080B4060\n\
+    movs r1, 0x96\n\
+    lsls r1, 4\n\
+    add r1, r10\n\
+    adds r2, r1, 0\n\
+    movs r0, 0xF0\n\
+    lsls r0, 3\n\
+    adds r1, r0\n\
+    ldr r3, _080B40E0 @ =0x040000d4\n\
+    ldr r5, _080B40E4 @ =0x800000f0\n\
+    movs r4, 0xF0\n\
+    lsls r4, 2\n\
+    movs r6, 0xD\n\
+_080B40B4:\n\
+    str r1, [r3]\n\
+    str r2, [r3, 0x4]\n\
+    str r5, [r3, 0x8]\n\
+    ldr r0, [r3, 0x8]\n\
+    adds r2, r4\n\
+    adds r1, r4\n\
+    subs r6, 0x1\n\
+    cmp r6, 0\n\
+    bge _080B40B4\n\
+    add sp, 0x4\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
+_080B40D8: .4byte gMenuWindow\n\
+_080B40DC: .4byte 0x000003ff\n\
+_080B40E0: .4byte 0x040000d4\n\
+_080B40E4: .4byte 0x800000f0\n\
+    .syntax divided");
+}
+#endif
+
+void sub_80B40E8(u8 taskId) // Mart_DoCursorAction
+{
+    if (!gPaletteFade.active)
+    {
+        if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP) // only up can be pressed
+        {
+            if (gMartInfo.cursor == 0)
+            {
+                if (gMartInfo.choicesAbove == 0) // if there are no choices above, dont bother
+                    return;
+
+                PlaySE(SE_SELECT);
+                gMartInfo.choicesAbove--; // since cursor is at the top and there are choices above the top, scroll the menu up by updating choicesAbove.
+                sub_80B3F88();
+                sub_80B39D0(0, 0, 0);
+                sub_80B3A70();
+                sub_80B32A4();
+            }
+            else // if the cursor is not 0, choicesAbove cannot be updated yet since the cursor is at the top of the menu, so update cursor.
+            {
+                PlaySE(SE_SELECT);
+                gMartInfo.cursor = MoveMenuCursor(-1); // move cursor up
+                sub_80B3A70();
+            }
+        }
+        else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN) // only down can be pressed
+        {
+            if (gMartInfo.cursor == 7) // are you at the bottom of the menu?
+            {
+                if (gMartInfo.choicesAbove + gMartInfo.cursor == gMartInfo.itemCount) // are you at cancel?
+                    return;
+
+                PlaySE(SE_SELECT);
+                gMartInfo.choicesAbove++;
+                sub_80B403C();
+                sub_80B39D0(7, 7, 0);
+                sub_80B3A70();
+                sub_80B32A4();
+            }
+            else if (gMartInfo.cursor != gMartInfo.itemCount)
+            {
+                PlaySE(SE_SELECT);
+                gMartInfo.cursor = MoveMenuCursor(1);
+                sub_80B3A70();
+            }
+        }
+        else if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+
+            if (gMartInfo.choicesAbove + gMartInfo.cursor != gMartInfo.itemCount) // did you not hit CANCEL?
+            {
+                PauseVerticalScrollIndicator(0);
+                PauseVerticalScrollIndicator(1);
+                sub_80F979C(1, 1);
+                sub_80B39D0(gMartInfo.cursor, gMartInfo.cursor, 1);
+                HandleDestroyMenuCursors();
+                MenuZeroFillWindowRect(0, 0xC, 0xD, 0x13);
+
+                if (gMartInfo.martType == MART_TYPE_0)
+                {
+                    gMartTotalCost = (ItemId_GetPrice(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]) >> GetPriceReduction(1)); // set 1x price
+                    if (!IsEnoughMoney(gSaveBlock1.money, gMartTotalCost))
+                    {
+                        DisplayItemMessageOnField(taskId, gOtherText_NotEnoughMoney, sub_80B3BD0, 0xC3E1); // tail merge
+                    }
+                    else // _080B42BA
+                    {
+                        CopyItemName(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor], gStringVar1);
+                        StringExpandPlaceholders(gStringVar4, gOtherText_HowManyYouWant);
+                        DisplayItemMessageOnField(taskId, gStringVar4, sub_80B3EFC, 0xC3E1);                    
+                    }
+                }
+                else // _080B428C
+                {
+                    gMartTotalCost = gDecorations[gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]].price;
+
+                    if (!IsEnoughMoney(gSaveBlock1.money, gMartTotalCost))
+                    {
+                        DisplayItemMessageOnField(taskId, gOtherText_NotEnoughMoney, sub_80B3BD0, 0xC3E1); // tail merge
+                    }
+                    else
+                    {    
+                        StringCopy(gStringVar1, gDecorations[gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]].name);
+                        ConvertIntToDecimalStringN(gStringVar2, gMartTotalCost, 0, 0x8);
+
+                        if (gMartInfo.martType == MART_TYPE_1)
+                        {
+                            StringExpandPlaceholders(gStringVar4, gOtherText_ThatWillBe2);
+                        }
+                        else
+                        {
+                            StringExpandPlaceholders(gStringVar4, gOtherText_ThatWillBe3);
+                        }
+                        DisplayItemMessageOnField(taskId, gStringVar4, sub_80B3D38, 0xC3E1);
+                    }
+                }
+            }
+            else
+                sub_80B43F0(taskId);
+        }
+        else if (gMain.newKeys & B_BUTTON) // go back to buy/sell/exit menu
+        {
+            PlaySE(SE_SELECT);
+            sub_80B43F0(taskId);
+        }
+    }
+}
+
+void sub_80B4378(u8 taskId)
+{
+    MenuZeroFillWindowRect(0, 0xE, 0x1D, 0x13);
+    MenuZeroFillWindowRect(0, 0xA, 0xD, 0xD);
+    sub_80A3FA0(gBGTilemapBuffers[1], 0x1, 0xB, 0xC, 0x2, 0);
+    sub_80B3420();
+    sub_80B3764(6, 7);
+    sub_80B37EC();
+    StartVerticalScrollIndicators(0);
+    StartVerticalScrollIndicators(1);
+    sub_80B32A4();
+    gTasks[taskId].func = sub_80B40E8;
+}
+
+void sub_80B43F0(u8 taskId)
+{
+    gFieldCallback = sub_80B3050;
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskId].func = Task_ExitBuyMenu;
+}
+
+void Task_ExitBuyMenu(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        RemoveMoneyLabelObject(0, 0);
+        BuyMenuFreeMemory();
+        SetMainCallback2(c2_exit_to_overworld_2_switch);
+        DestroyTask(taskId);
+    }
+}
+
+void sub_80B4470(u8 taskId)
+{
+    u16 i;
+
+    for (i = 0; i < 3; i++)
+    {
+        if (gUnknown_02038724[i].itemId == gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]
+         && gUnknown_02038724[i].quantity != 0)
+        {
+            if (gUnknown_02038724[i].quantity + gTasks[taskId].data[1] > 255)
+                gUnknown_02038724[i].quantity = 255;
+            else
+                gUnknown_02038724[i].quantity += gTasks[taskId].data[1];
+            return;
+        }
+    }
+
+    if (gUnknown_02038730 < 3)
+    {
+        gUnknown_02038724[gUnknown_02038730].itemId = gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor];
+        gUnknown_02038724[gUnknown_02038730].quantity = gTasks[taskId].data[1];
+        gUnknown_02038730++;
+    }
+}
+
+void ClearItemPurchases(void)
+{
+    gUnknown_02038730 = 0;
+    ClearItemSlots(gUnknown_02038724, 3);
+}
+
+void CreatePokemartMenu(u16 *itemList)
+{
+    CreateShopMenu(MART_TYPE_0);
+    SetShopItemsForSale(itemList);
+    ClearItemPurchases();
+    SetShopMenuCallback(EnableBothScriptContexts);
+}
+
+void CreateDecorationShop1Menu(u16 *itemList)
+{
+    CreateShopMenu(MART_TYPE_1);
+    SetShopItemsForSale(itemList);
+    SetShopMenuCallback(EnableBothScriptContexts);
+}
+
+void CreateDecorationShop2Menu(u16 *itemList)
+{
+    CreateShopMenu(MART_TYPE_2);
+    SetShopItemsForSale(itemList);
+    SetShopMenuCallback(EnableBothScriptContexts);
+}
+
+void sub_80B45B4(u8 taskId, const s16 *list, u16 c)
+{
+    s16 r5 = gTasks[taskId].data[4] - 1;
+    s16 r3 = gTasks[taskId].data[5] - 1;
+    s16 r4 = gTasks[taskId].data[1];
+    s16 y;
+    s16 x;
+    
+    if (gTasks[taskId].data[2] == 0)
+    {
+        for (y = 0; y < 3; y++)
+        {
+            for (x = 0; x < 3; x++)
+            {
+                s16 metatileId = MapGridGetMetatileIdAt(r5 + x, r3 + y);
+                
+                if (list[r4] == metatileId)
+                {
+                    if (r4 != 2)
+                        MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[r4 + 1]);
+                    else
+                        MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[0]);
+                }
+            }
+        }
+    }
+    else
+    {
+        for (y = 0; y < 3; y++)
+        {
+            for (x = 0; x < 3; x++)
+            {
+                s16 metatileId = MapGridGetMetatileIdAt(r5 + x, r3 + y);
+                
+                if (list[2 - r4] == metatileId)
+                {
+                    if (r4 != 2)
+                        MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[1 - r4]);
+                    else
+                        MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[2]);
+                }
+            }
+        }
+    }
+}
+
+static const u16 gUnknown_083CC714[] = {0x284, 0x282, 0x280};
+static const u16 gUnknown_083CC71A[] = {0x285, 0x283, 0x281};
+static const u16 gUnknown_083CC720[] = {0x28C, 0x28A, 0x288};
+static const u16 gUnknown_083CC726[] = {0x28D, 0x28B, 0x289};
+static const u16 gUnknown_083CC72C[] = {0x2A0, 0x2A2, 0x2A4};
+static const u16 gUnknown_083CC732[] = {0x2A1, 0x2A3, 0x2A5};
+static const u16 gUnknown_083CC738[] = {0x2A8, 0x2AA, 0x2AC};
+
+void sub_80B4710(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    data[3] = 1;
+
+    switch (data[0])
+    {
+        case 0:
+            sub_80B45B4(taskId, gUnknown_083CC714, 0);
+            break;
+        case 1:
+            sub_80B45B4(taskId, gUnknown_083CC71A, 0);
+            break;
+        case 2:
+            sub_80B45B4(taskId, gUnknown_083CC720, 0xC00);
+            break;
+        case 3:
+            sub_80B45B4(taskId, gUnknown_083CC726, 0);
+            break;
+        case 4:
+            sub_80B45B4(taskId, gUnknown_083CC72C, 0xC00);
+            break;
+        case 5:
+            sub_80B45B4(taskId, gUnknown_083CC732, 0);
+            break;
+        case 6:
+            sub_80B45B4(taskId, gUnknown_083CC738, 0);
+            break;
+    }
+
+    data[0] = (data[0] + 1) & 7;
+    if (!data[0])
+    {
+        DrawWholeMapView();
+        data[1] = (data[1] + 1) % 3;
+        data[3] = 0;
+    }
+}
+
+u8 sub_80B47D8(u16 var)
+{
+    u8 taskId = CreateTask(sub_80B4710, 0);
+    s16 *data = gTasks[taskId].data;
+
+    PlayerGetDestCoords(&data[4], &data[5]);
+    data[0] = 0;
+    data[1] = 0;
+    data[2] = var;
+    sub_80B4710(taskId);
+    return taskId;
+}
+
+void sub_80B4824(u8 var)
+{
+    gUnknown_02038731 = sub_80B47D8(var);
+}
+
+void sub_80B483C(void)
+{
+    DestroyTask(gUnknown_02038731);
+}
+
+bool8 sub_80B4850(void)
+{
+    if (gTasks[gUnknown_02038731].data[3] == 0 && gTasks[gUnknown_02038731].data[1] == 2)
+        return FALSE;
+    else
+        return TRUE;
+}
diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c
index 3aa2f1fa5..0c8f59959 100644
--- a/src/field/use_pokeblock.c
+++ b/src/field/use_pokeblock.c
@@ -1,5 +1,6 @@
 //
 // Created by Scott Norton on 5/31/17.
+// Modified by Dizzy Egg on 8/15/17.
 //
 
 #include "global.h"
@@ -16,8 +17,6 @@
 #include "sound.h"
 #include "songs.h"
 #include "pokeblock.h"
-#include "pokeblock_feed.h"
-#include "use_pokeblock.h"
 
 #define GFX_TAG_CONDITIONUPDOWN 0
 
@@ -29,7 +28,7 @@ const u16 ConditionUpDownPalette[] = INCBIN_U16("graphics/misc/condition_up_down
 const u32 ConditionUpDownTiles[] = INCBIN_U32("graphics/misc/condition_up_down.4bpp");
 #endif
 
-const u32 gUnknown_08406118[] = {
+static const u32 sContestStatsMonData[] = {
     MON_DATA_COOL,
     MON_DATA_TOUGH,
     MON_DATA_SMART,
@@ -37,11 +36,11 @@ const u32 gUnknown_08406118[] = {
     MON_DATA_BEAUTY
 };
 
-const u8 gUnknown_0840612C[] = {
+static const u8 gUnknown_0840612C[] = {
     0, 4, 3, 2, 1
 };
 
-const u8 *const gUnknown_08406134[] = {
+static const u8 *const sContextStatNames[] = {
     OtherText_Coolness,
     OtherText_Toughness,
     OtherText_Smartness,
@@ -49,18 +48,18 @@ const u8 *const gUnknown_08406134[] = {
     OtherText_Beauty
 };
 
-const struct SpriteSheet gSpriteSheet_ConditionUpDown = {
+static const struct SpriteSheet gSpriteSheet_ConditionUpDown = {
     (u8 *)ConditionUpDownTiles,
     sizeof ConditionUpDownTiles,
     GFX_TAG_CONDITIONUPDOWN
 };
 
-const struct SpritePalette gSpritePalette_ConditionUpDown = {
+static const struct SpritePalette gSpritePalette_ConditionUpDown = {
     ConditionUpDownPalette,
     GFX_TAG_CONDITIONUPDOWN
 };
 
-const s16 gUnknown_08406158[][2] = {
+static const s16 gUnknown_08406158[][2] = {
     {0x9c, 0x1e},
     {0x75, 0x35},
     {0x75, 0x70},
@@ -68,28 +67,28 @@ const s16 gUnknown_08406158[][2] = {
     {0xc5, 0x35}
 };
 
-const struct OamData gOamData_840616C = {
+static const struct OamData gOamData_840616C = {
     .shape = 1,
     .size = 2,
     .priority = 1
 };
 
-const union AnimCmd gSpriteAnim_8406174[] = {
+static const union AnimCmd gSpriteAnim_8406174[] = {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END
 };
 
-const union AnimCmd gSpriteAnim_840617C[] = {
+static const union AnimCmd gSpriteAnim_840617C[] = {
     ANIMCMD_FRAME(8, 5),
     ANIMCMD_END
 };
 
-const union AnimCmd *const gSpriteAnimTable_8406184[] = {
+static const union AnimCmd *const gSpriteAnimTable_8406184[] = {
     gSpriteAnim_8406174,
     gSpriteAnim_840617C
 };
 
-const struct SpriteTemplate gSpriteTemplate_840618C = {
+static const struct SpriteTemplate gSpriteTemplate_840618C = {
     GFX_TAG_CONDITIONUPDOWN,
     GFX_TAG_CONDITIONUPDOWN,
     &gOamData_840616C,
@@ -99,47 +98,44 @@ const struct SpriteTemplate gSpriteTemplate_840618C = {
     SpriteCallbackDummy
 };
 
-asm(".text\n"
-    ".include \"constants/gba_constants.inc\"");
-
 static EWRAM_DATA struct UnkPokenavStruct_Sub1 *gUnknown_02039304 = NULL;
 static EWRAM_DATA MainCallback gUnknown_02039308 = NULL;
 static EWRAM_DATA struct Pokeblock *gUnknown_0203930C = NULL;
-EWRAM_DATA u8 gUnknown_02039310 = 0;
-EWRAM_DATA s16 gUnknown_02039312 = 0;
+EWRAM_DATA u8 gPokeblockMonID = 0;
+EWRAM_DATA s16 gPokeblockGain = 0;
 
 extern u16 gKeyRepeatStartDelay;
 extern u16 gScriptItemId; // FIXME: remove after merge of #349 Pokeblock
 
-void launch_c3_walk_stairs_and_run_once(void (*const)(void));
-void sub_81361E4(void);
-void sub_813622C(void);
-void sub_8136244(void);
-void sub_8136264(void);
-void sub_8136294(void);
-void sub_81365A0(void);
-void sub_81365C8(void);
-void sub_8136638(void);
-void sub_81368A4(void);
+static void launch_c3_walk_stairs_and_run_once(void (*const)(void));
+static void sub_81361E4(void);
+static void sub_813622C(void);
+static void sub_8136244(void);
+static void sub_8136264(void);
+static void sub_8136294(void);
+static void sub_81365A0(void);
+static void sub_81365C8(void);
+static void sub_8136638(void);
+static void sub_81368A4(void);
 void sub_8089668(void);
-void sub_8136B44(void);
-u8 sub_81370E4(u8);
-void sub_8136BB8(void);
-s8 sub_8136C40(void);
-bool8 sub_8137058(void);
-void sub_8136D60(void);
-void sub_8136808(void);
-void sub_8136D8C(void);
-u8 sub_81370A4(u8);
-void sub_81369CC(void);
-void sub_8136EF0(void);
-void sub_8137138(void);
-void sub_8136C6C(void);
-bool8 sub_8136D00(void);
-void sub_8136DC0(u8 *, u8, s16);
-void sub_8136DA0(const u8 *);
-void sub_8136F74(struct Pokeblock *, struct Pokemon *);
-void sub_81371DC(struct Sprite *);
+static void sub_8136B44(void);
+static u8 sub_81370E4(u8);
+static void sub_8136BB8(void);
+static s8 sub_8136C40(void);
+static bool8 sub_8137058(void);
+static void sub_8136D60(void);
+static void sub_8136808(void);
+static void sub_8136D8C(void);
+static u8 sub_81370A4(u8);
+static void sub_81369CC(void);
+static void sub_8136EF0(void);
+static void sub_8137138(void);
+static void sub_8136C6C(void);
+static bool8 sub_8136D00(void);
+static void Pokeblock_BufferEnhancedStatText(u8 *, u8, s16);
+static void Pokeblock_MenuWindowTextPrint(const u8 *);
+static void sub_8136F74(struct Pokeblock *, struct Pokemon *);
+static void sub_81371DC(struct Sprite *);
 
 void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback)
 {
@@ -151,18 +147,18 @@ void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback)
     SetMainCallback2(sub_8136244);
 }
 
-void sub_8136174(void)
+static void sub_8136174(void)
 {
     gUnknown_02039304->pokeblock = gUnknown_0203930C;
     gUnknown_02039304->callback = gUnknown_02039308;
-    gUnknown_02039310 = sub_81370E4(gUnknown_02039310);
-    gUnknown_02039304->unk56 = gUnknown_02039310 < 4 ? 0 : 1;
+    gPokeblockMonID = sub_81370E4(gPokeblockMonID);
+    gUnknown_02039304->unk56 = gPokeblockMonID < 4 ? 0 : 1;
     gUnknown_083DFEC4->unkD162[0] = 2;
     launch_c3_walk_stairs_and_run_once(sub_8136294);
     SetMainCallback2(sub_81361E4);
 }
 
-void sub_81361E4(void)
+static void sub_81361E4(void)
 {
     gUnknown_02039304->unk0();
     AnimateSprites();
@@ -176,7 +172,7 @@ void sub_81361E4(void)
     }
 }
 
-void sub_813622C(void)
+static void sub_813622C(void)
 {
     sub_81368A4();
     AnimateSprites();
@@ -184,7 +180,7 @@ void sub_813622C(void)
     UpdatePaletteFade();
 }
 
-void sub_8136244(void)
+static void sub_8136244(void)
 {
     gUnknown_02039304->unk0();
     AnimateSprites();
@@ -192,7 +188,7 @@ void sub_8136244(void)
     UpdatePaletteFade();
 }
 
-void sub_8136264(void)
+static void sub_8136264(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
@@ -201,13 +197,13 @@ void sub_8136264(void)
     sub_8089668();
 }
 
-void launch_c3_walk_stairs_and_run_once(void (*const func)(void))
+static void launch_c3_walk_stairs_and_run_once(void (*const func)(void))
 {
     gUnknown_02039304->unk0 = func;
     gUnknown_02039304->unk50 = 0;
 }
 
-void sub_8136294(void)
+static void sub_8136294(void)
 {
     bool32 c1LinkRelatedActive;
     switch (gUnknown_02039304->unk50)
@@ -346,7 +342,7 @@ void sub_8136294(void)
     }
 }
 
-void sub_81365A0(void)
+static void sub_81365A0(void)
 {
     while (!gUnknown_02039304->unk55)
     {
@@ -354,7 +350,7 @@ void sub_81365A0(void)
     }
 }
 
-void sub_81365C8(void)
+static void sub_81365C8(void)
 {
     switch (gUnknown_02039304->unk50)
     {
@@ -374,7 +370,7 @@ void sub_81365C8(void)
     }
 }
 
-void sub_8136638(void)
+static void sub_8136638(void)
 {
     switch (gUnknown_02039304->unk50)
     {
@@ -464,12 +460,12 @@ void sub_8136638(void)
     }
 }
 
-void sub_8136808(void)
+static void sub_8136808(void)
 {
     switch (gUnknown_02039304->unk50)
     {
         case 0:
-            gUnknown_02039310 = sub_81370A4(gUnknown_083DFEC4->unk87DC);
+            gPokeblockMonID = sub_81370A4(gUnknown_083DFEC4->unk87DC);
             gUnknown_02039308 = gUnknown_02039304->callback;
             gUnknown_0203930C = gUnknown_02039304->pokeblock;
             BeginNormalPaletteFade(-1, 0, 0, 16, 0);
@@ -479,18 +475,18 @@ void sub_8136808(void)
             if (!gPaletteFade.active)
             {
                 gMain.savedCallback = sub_8136174;
-                SetMainCallback2(sub_8147ADC);
+                SetMainCallback2(CB2_PreparePokeblockFeedScene);
             }
             break;
     }
 }
 
-void sub_81368A4(void)
+static void sub_81368A4(void)
 {
     switch (gUnknown_02039304->unk50)
     {
         case 0:
-            if (gUnknown_083DFEC4->unk87DC != gUnknown_02039310)
+            if (gUnknown_083DFEC4->unk87DC != gPokeblockMonID)
             {
                 sub_80F5060(gUnknown_02039304->unk56);
                 gUnknown_02039304->unk50++;
@@ -538,7 +534,7 @@ void sub_81368A4(void)
     }
 }
 
-void sub_81369CC(void)
+static void sub_81369CC(void)
 {
     switch (gUnknown_02039304->unk50)
     {
@@ -578,14 +574,14 @@ void sub_81369CC(void)
         case 5:
             if (gMain.newKeys & (A_BUTTON | B_BUTTON) && !sub_8136D00())
             {
-                sub_810CA6C((u8)gScriptItemId);
+                PokeblockClearIfExists((u8)gScriptItemId);
                 launch_c3_walk_stairs_and_run_once(sub_8136B44);
             }
             break;
     }
 }
 
-void sub_8136B44(void)
+static void sub_8136B44(void)
 {
     switch (gUnknown_02039304->unk50)
     {
@@ -609,7 +605,7 @@ void sub_8136B44(void)
     }
 }
 
-void sub_8136BB8(void)
+static void sub_8136BB8(void)
 {
     GetMonData(&gPlayerParty[sub_81370A4(gUnknown_083DFEC4->unk87DC)], MON_DATA_NICKNAME, gUnknown_02039304->stringBuffer);
     StringGetEnd10(gUnknown_02039304->stringBuffer);
@@ -621,7 +617,7 @@ void sub_8136BB8(void)
     MoveMenuCursor(0);
 }
 
-s8 sub_8136C40(void)
+static s8 sub_8136C40(void)
 {
     s8 retval = ProcessMenuInputNoWrap();
     if ((u8)(retval + 1) < 3)
@@ -632,124 +628,68 @@ s8 sub_8136C40(void)
     return retval;
 }
 
-void sub_8136C6C(void)
+static void sub_8136C6C(void)
 {
     BasicInitMenuWindow(&gWindowConfig_81E709C);
     MenuDrawTextWindow(0, 16, 29, 19);
     for (gUnknown_02039304->unk53 = 0; gUnknown_02039304->unk53 < 5 && gUnknown_02039304->unk61[gUnknown_02039304->unk53] == 0; gUnknown_02039304->unk53++);
     if (gUnknown_02039304->unk53 < 5)
     {
-        sub_8136DC0(gUnknown_02039304->stringBuffer, gUnknown_02039304->unk53, gUnknown_02039304->unk61[gUnknown_02039304->unk53]);
+        Pokeblock_BufferEnhancedStatText(gUnknown_02039304->stringBuffer, gUnknown_02039304->unk53, gUnknown_02039304->unk61[gUnknown_02039304->unk53]);
     }
     else
     {
-        sub_8136DC0(gUnknown_02039304->stringBuffer, gUnknown_02039304->unk53, 0);
+        Pokeblock_BufferEnhancedStatText(gUnknown_02039304->stringBuffer, gUnknown_02039304->unk53, 0);
     }
-    sub_8136DA0(gUnknown_02039304->stringBuffer);
+    Pokeblock_MenuWindowTextPrint(gUnknown_02039304->stringBuffer);
 }
 
-#ifdef NONMATCHING
-bool8 sub_8136D00(void)
+static bool8 sub_8136D00(void)
 {
     while (1)
     {
-        if (++gUnknown_02039304->unk53 >= 5)
+        gUnknown_02039304->unk53++;
+        if (gUnknown_02039304->unk53 < 5)
         {
-            break;
+            if (gUnknown_02039304->unk61[gUnknown_02039304->unk53] != 0)
+                break;
         }
-        if (gUnknown_02039304->unk61[gUnknown_02039304->unk53] != 0)
+        else
         {
-            sub_8136DC0(gUnknown_02039304->stringBuffer, gUnknown_02039304->unk53, gUnknown_02039304->unk61[gUnknown_02039304->unk53]);
-            sub_8136DA0(gUnknown_02039304->stringBuffer);
-            return TRUE;
+            gUnknown_02039304->unk53 = 5;
+            return FALSE;
         }
     }
-    gUnknown_02039304->unk53 = 5;
-    return FALSE;
+    Pokeblock_BufferEnhancedStatText(gUnknown_02039304->stringBuffer, gUnknown_02039304->unk53, gUnknown_02039304->unk61[gUnknown_02039304->unk53]);
+    Pokeblock_MenuWindowTextPrint(gUnknown_02039304->stringBuffer);
+    return TRUE;
 }
-#else
-__attribute__((naked))
-bool8 sub_8136D00(void)
-{
-    asm_unified("\tpush {r4,r5,lr}\n"
-                    "\tldr r4, _08136D30 @ =gUnknown_02039304\n"
-                    "\tadds r3, r4, 0\n"
-                    "\tmovs r5, 0x5\n"
-                    "_08136D08:\n"
-                    "\tldr r0, [r3]\n"
-                    "\tadds r0, 0x53\n"
-                    "\tldrb r1, [r0]\n"
-                    "\tadds r1, 0x1\n"
-                    "\tstrb r1, [r0]\n"
-                    "\tldr r2, [r3]\n"
-                    "\tadds r1, r2, 0\n"
-                    "\tadds r1, 0x53\n"
-                    "\tldrb r0, [r1]\n"
-                    "\tcmp r0, 0x4\n"
-                    "\tbhi _08136D34\n"
-                    "\tadds r0, r2, 0\n"
-                    "\tadds r0, 0x61\n"
-                    "\tldrb r1, [r1]\n"
-                    "\tadds r0, r1\n"
-                    "\tldrb r0, [r0]\n"
-                    "\tcmp r0, 0\n"
-                    "\tbne _08136D3A\n"
-                    "\tb _08136D08\n"
-                    "\t.align 2, 0\n"
-                    "_08136D30: .4byte gUnknown_02039304\n"
-                    "_08136D34:\n"
-                    "\tstrb r5, [r1]\n"
-                    "\tmovs r0, 0\n"
-                    "\tb _08136D5A\n"
-                    "_08136D3A:\n"
-                    "\tldr r2, [r4]\n"
-                    "\tadds r0, r2, 0\n"
-                    "\tadds r0, 0x10\n"
-                    "\tadds r1, r2, 0\n"
-                    "\tadds r1, 0x53\n"
-                    "\tldrb r1, [r1]\n"
-                    "\tadds r2, 0x61\n"
-                    "\tadds r2, r1\n"
-                    "\tldrb r2, [r2]\n"
-                    "\tbl sub_8136DC0\n"
-                    "\tldr r0, [r4]\n"
-                    "\tadds r0, 0x10\n"
-                    "\tbl sub_8136DA0\n"
-                    "\tmovs r0, 0x1\n"
-                    "_08136D5A:\n"
-                    "\tpop {r4,r5}\n"
-                    "\tpop {r1}\n"
-                    "\tbx r1");
-}
-#endif
 
-void sub_8136D60(void)
+static void sub_8136D60(void)
 {
     BasicInitMenuWindow(&gWindowConfig_81E709C);
     MenuDrawTextWindow(0, 16, 29, 19);
     MenuPrint(gOtherText_WontEat, 1, 17);
 }
 
-void sub_8136D8C(void)
+static void sub_8136D8C(void)
 {
     MenuZeroFillScreen();
     BasicInitMenuWindow(&gWindowConfig_81E7080);
 }
 
-void sub_8136DA0(const u8 *message)
+static void Pokeblock_MenuWindowTextPrint(const u8 *message)
 {
     MenuDrawTextWindow(0, 16, 29, 19);
     MenuPrint(message, 1, 17);
 }
 
 #ifdef NONMATCHING
-void sub_8136DC0(u8 *dest, u8 a1, s16 a2)
+static void Pokeblock_BufferEnhancedStatText(u8 *dest, u8 statID, s16 a2)
 {
-    u16 v0 = a2;
     if (a2 != 0)
     {
-        if ((v0 = max(a2, 0)) == 0);
-        StringCopy(dest, gUnknown_08406134[a1]);
+        StringCopy(dest, sContextStatNames[statID]);
         StringAppend(dest, gOtherText_WasEnhanced);
     }
     else
@@ -759,7 +699,7 @@ void sub_8136DC0(u8 *dest, u8 a1, s16 a2)
 }
 #else
 __attribute__((naked))
-void sub_8136DC0(u8 *dest, u8 a1, s16 a2)
+static void Pokeblock_BufferEnhancedStatText(u8 *dest, u8 a1, s16 a2)
 {
     asm_unified("\tpush {r4,lr}\n"
                     "\tadds r4, r0, 0\n"
@@ -775,7 +715,7 @@ void sub_8136DC0(u8 *dest, u8 a1, s16 a2)
                     "\tmovs r0, 0\n"
                     "_08136DD8:\n"
                     "\tlsls r0, 16\n"
-                    "\tldr r1, _08136DF4 @ =gUnknown_08406134\n"
+                    "\tldr r1, _08136DF4 @ =sContextStatNames\n"
                     "\tlsls r0, r3, 2\n"
                     "\tadds r0, r1\n"
                     "\tldr r1, [r0]\n"
@@ -786,7 +726,7 @@ void sub_8136DC0(u8 *dest, u8 a1, s16 a2)
                     "\tbl StringAppend\n"
                     "\tb _08136E04\n"
                     "\t.align 2, 0\n"
-                    "_08136DF4: .4byte gUnknown_08406134\n"
+                    "_08136DF4: .4byte sContextStatNames\n"
                     "_08136DF8: .4byte gOtherText_WasEnhanced\n"
                     "_08136DFC:\n"
                     "\tldr r1, _08136E0C @ =gOtherText_NothingChanged\n"
@@ -801,16 +741,16 @@ void sub_8136DC0(u8 *dest, u8 a1, s16 a2)
 }
 #endif
 
-void sub_8136E10(struct Pokemon *pokemon, u8 *data)
+static void Pokeblock_GetMonContestStats(struct Pokemon *pokemon, u8 *data)
 {
     u16 i;
     for (i=0; i<5; i++)
     {
-        data[i] = GetMonData(pokemon, gUnknown_08406118[i]);
+        data[i] = GetMonData(pokemon, sContestStatsMonData[i]);
     }
 }
 
-void sub_8136E40(struct Pokeblock *pokeblock, struct Pokemon *pokemon)
+static void sub_8136E40(struct Pokeblock *pokeblock, struct Pokemon *pokemon)
 {
     u16 i;
     s16 cstat;
@@ -820,14 +760,14 @@ void sub_8136E40(struct Pokeblock *pokeblock, struct Pokemon *pokemon)
         sub_8136F74(pokeblock, pokemon);
         for (i=0; i<5; i++)
         {
-            data = GetMonData(pokemon, gUnknown_08406118[i]);
+            data = GetMonData(pokemon, sContestStatsMonData[i]);
             cstat = data + gUnknown_02039304->unk66[i];
             if (cstat < 0)
                 cstat = 0;
             if (cstat > 255)
                 cstat = 255;
             data = cstat;
-            SetMonData(pokemon, gUnknown_08406118[i], &data);
+            SetMonData(pokemon, sContestStatsMonData[i], &data);
         }
         cstat = (u8)GetMonData(pokemon, MON_DATA_SHEEN);
         cstat = cstat + pokeblock->feel;
@@ -838,21 +778,21 @@ void sub_8136E40(struct Pokeblock *pokeblock, struct Pokemon *pokemon)
     }
 }
 
-void sub_8136EF0(void)
+static void sub_8136EF0(void)
 {
     u16 i;
     struct Pokemon *pokemon = gPlayerParty;
     pokemon += gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].partyIdx;
-    sub_8136E10(pokemon, gUnknown_02039304->unk57);
+    Pokeblock_GetMonContestStats(pokemon, gUnknown_02039304->unk57);
     sub_8136E40(gUnknown_02039304->pokeblock, pokemon);
-    sub_8136E10(pokemon, gUnknown_02039304->unk5c);
+    Pokeblock_GetMonContestStats(pokemon, gUnknown_02039304->unk5c);
     for (i=0; i<5; i++)
     {
         gUnknown_02039304->unk61[i] = gUnknown_02039304->unk5c[i] - gUnknown_02039304->unk57[i];
     }
 }
 
-void sub_8136F74(struct Pokeblock *pokeblock, struct Pokemon *pokemon)
+static void sub_8136F74(struct Pokeblock *pokeblock, struct Pokemon *pokemon)
 {
     s8 direction;
     s8 i;
@@ -864,9 +804,9 @@ void sub_8136F74(struct Pokeblock *pokeblock, struct Pokemon *pokemon)
     gUnknown_02039304->unk66[2] = pokeblock->bitter;
     gUnknown_02039304->unk66[3] = pokeblock->sweet;
     gUnknown_02039304->unk66[4] = pokeblock->dry;
-    if (gUnknown_02039312 > 0)
+    if (gPokeblockGain > 0)
         direction = 1;
-    else if (gUnknown_02039312 < 0)
+    else if (gPokeblockGain < 0)
         direction = -1;
     else
         return;
@@ -884,7 +824,7 @@ void sub_8136F74(struct Pokeblock *pokeblock, struct Pokemon *pokemon)
     }
 }
 
-bool8 sub_8137058(void)
+static bool8 sub_8137058(void)
 {
     struct Pokemon *pokemon = gPlayerParty;
     pokemon += gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].partyIdx;
@@ -893,7 +833,7 @@ bool8 sub_8137058(void)
     return FALSE;
 }
 
-u8 sub_81370A4(u8 a0)
+static u8 sub_81370A4(u8 a0)
 {
     u8 i;
     for (i=0; i<PARTY_SIZE; i++)
@@ -908,7 +848,7 @@ u8 sub_81370A4(u8 a0)
     return 0;
 }
 
-u8 sub_81370E4(u8 a0)
+static u8 sub_81370E4(u8 a0)
 {
     u8 ct;
     u8 i;
@@ -927,7 +867,7 @@ u8 sub_8137124(u8 a0)
     return sub_81370A4(a0);
 }
 
-void sub_8137138(void)
+static void sub_8137138(void)
 {
     u16 flavor;
     u8 spriteidx;
@@ -951,7 +891,7 @@ void sub_8137138(void)
     }
 }
 
-void sub_81371DC(struct Sprite *sprite)
+static void sub_81371DC(struct Sprite *sprite)
 {
     if (sprite->data0 <= 5)
         sprite->pos2.y -= 2;
diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c
index 96f47c067..7001c2eaa 100644
--- a/src/field/wild_encounter.c
+++ b/src/field/wild_encounter.c
@@ -3161,7 +3161,7 @@ static u8 PickWildMonNature(void)
             }
             for (i = 0; i < 25; i++)
             {
-                if (sub_810CAE4(natures[i], safariPokeblock) > 0)
+                if (PokeblockGetGain(natures[i], safariPokeblock) > 0)
                     return natures[i];
             }
         }