Merge remote-tracking branch 'pret/master'

src/battle_2.c

@@ -17,6 +17,7 @@
 #include "item.h"
 #include "constants/items.h"
 #include "constants/hold_effects.h"
+#include "constants/trainers.h"
 #include "link.h"
 #include "bg.h"
 #include "dma3.h"
@@ -38,7 +39,6 @@
 #include "pokedex.h"
 #include "constants/abilities.h"
 #include "constants/moves.h"
-#include "trainer_classes.h"
 #include "evolution_scene.h"
 #include "roamer.h"
 #include "tv.h"
@@ -152,7 +152,7 @@ extern u8 gUnknown_020241E9;
 extern u16 gChosenMove;
 
 extern const struct BattleMove gBattleMoves[];
-extern const u16 gUnknown_08C004E0[]; // battle textbox palette
+extern const u16 gBattleTextboxPalette[]; // battle textbox palette
 extern const struct BgTemplate gUnknown_0831AA08[];
 extern const struct WindowTemplate * const gUnknown_0831ABA0[];
 extern const u8 gUnknown_0831ACE0[];
@@ -185,7 +185,7 @@ extern void sub_80356D0(void);
 extern void GetFrontierTrainerName(u8* dst, u16 trainerId); // battle tower
 extern void sub_8166188(void); // battle tower, sets link battle mons level but why?
 extern void sub_8165B88(u8* dst, u16 trainerId); // battle tower, gets language
-extern void sub_81DB4DC(u8* dst, u8 arg2); //
+extern void PadNameString(u8* dst, u8 arg2); //
 extern void sub_81B9150(void);
 extern void sub_800AC34(void);
 extern void sub_80B3AF8(u8 taskId); // cable club
@@ -415,7 +415,7 @@ static void CB2_InitBattleInternal(void)
 
     gBattleTerrain = BattleSetup_GetTerrainId();
     if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
-        gBattleTerrain = BATTLE_TERRAIN_INSIDE;
+        gBattleTerrain = BATTLE_TERRAIN_BUILDING;
 
     sub_80356D0();
     LoadBattleTextboxAndBackground();
@@ -754,7 +754,7 @@ static void CB2_HandleStartBattle(void)
             ResetBlockReceivedFlags();
             sub_8036EB8(2, playerMultiplayerId);
             SetAllPlayersBerryData();
-            taskId = CreateTask(task00_0800F6FC, 0);
+            taskId = CreateTask(sub_8035D74, 0);
             gTasks[taskId].data[1] = 0x10E;
             gTasks[taskId].data[2] = 0x5A;
             gTasks[taskId].data[5] = 0;
@@ -956,7 +956,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
             ResetBlockReceivedFlags();
             sub_8036EB8(2, playerMultiplayerId);
             SetAllPlayersBerryData();
-            taskId = CreateTask(task00_0800F6FC, 0);
+            taskId = CreateTask(sub_8035D74, 0);
             gTasks[taskId].data[1] = 0x10E;
             gTasks[taskId].data[2] = 0x5A;
             gTasks[taskId].data[5] = 0;
@@ -1140,7 +1140,7 @@ static void sub_80379F8(u8 arrayIdPlus)
         gUnknown_02022FF8[i].gender      = GetMonGender(&gPlayerParty[arrayIdPlus + i]);
         StripExtCtrlCodes(gUnknown_02022FF8[i].nickname);
         if (GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_LANGUAGE) != LANGUAGE_JAPANESE)
-            sub_81DB4DC(gUnknown_02022FF8[i].nickname, 0);
+            PadNameString(gUnknown_02022FF8[i].nickname, CHAR_SPACE);
     }
     memcpy(gUnknown_02023058, gUnknown_02022FF8, sizeof(gUnknown_02022FF8));
 }
@@ -1342,7 +1342,7 @@ static void CB2_HandleStartMultiBattle(void)
             sub_8036EB8(4, playerMultiplayerId);
             SetAllPlayersBerryData();
             sub_8068AA4();
-            var = CreateTask(task00_0800F6FC, 0);
+            var = CreateTask(sub_8035D74, 0);
             gTasks[var].data[1] = 0x10E;
             gTasks[var].data[2] = 0x5A;
             gTasks[var].data[5] = 0;
@@ -1718,7 +1718,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir
             {
                 const struct TrainerMonNoItemDefaultMoves *partyData = gTrainers[trainerNum].party.NoItemDefaultMoves;
 
-                for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
 
                 personalityValue += nameHash << 8;
@@ -1726,11 +1726,11 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir
                 CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0);
                 break;
             }
-            case PARTY_FLAG_CUSTOM_MOVES:
+            case F_TRAINER_PARTY_CUSTOM_MOVESET:
             {
                 const struct TrainerMonNoItemCustomMoves *partyData = gTrainers[trainerNum].party.NoItemCustomMoves;
 
-                for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
 
                 personalityValue += nameHash << 8;
@@ -1744,11 +1744,11 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir
                 }
                 break;
             }
-            case PARTY_FLAG_HAS_ITEM:
+            case F_TRAINER_PARTY_HELD_ITEM:
             {
                 const struct TrainerMonItemDefaultMoves *partyData = gTrainers[trainerNum].party.ItemDefaultMoves;
 
-                for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
 
                 personalityValue += nameHash << 8;
@@ -1758,11 +1758,11 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir
                 SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem);
                 break;
             }
-            case PARTY_FLAG_CUSTOM_MOVES | PARTY_FLAG_HAS_ITEM:
+            case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM:
             {
                 const struct TrainerMonItemCustomMoves *partyData = gTrainers[trainerNum].party.ItemCustomMoves;
 
-                for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
 
                 personalityValue += nameHash << 8;
@@ -1978,7 +1978,7 @@ void sub_8038D64(void)
         gBattle_BG3_Y = 0;
 
         sub_80356D0();
-        LoadCompressedPalette(gUnknown_08C004E0, 0, 64);
+        LoadCompressedPalette(gBattleTextboxPalette, 0, 64);
         ApplyPlayerChosenFrameToBattleMenu();
         ResetSpriteData();
         ResetTasks();
@@ -1988,7 +1988,7 @@ void sub_8038D64(void)
         gReservedSpritePaletteCount = 4;
         SetVBlankCallback(VBlankCB_Battle);
 
-        taskId = CreateTask(task00_0800F6FC, 0);
+        taskId = CreateTask(sub_8035D74, 0);
         gTasks[taskId].data[1] = 0x10E;
         gTasks[taskId].data[2] = 0x5A;
         gTasks[taskId].data[5] = 1;
@@ -4749,19 +4749,19 @@ static void HandleEndTurn_BattleWon(void)
 
         switch (gTrainers[gTrainerBattleOpponent_A].trainerClass)
         {
-        case CLASS_ELITE_FOUR:
-        case CLASS_CHAMPION:
+        case TRAINER_CLASS_ELITE_FOUR:
+        case TRAINER_CLASS_CHAMPION:
             PlayBGM(BGM_KACHI5);
             break;
-        case CLASS_TEAM_AQUA:
-        case CLASS_TEAM_MAGMA:
-        case CLASS_AQUA_ADMIN:
-        case CLASS_AQUA_LEADER:
-        case CLASS_MAGMA_ADMIN:
-        case CLASS_MAGMA_LEADER:
+        case TRAINER_CLASS_TEAM_AQUA:
+        case TRAINER_CLASS_TEAM_MAGMA:
+        case TRAINER_CLASS_AQUA_ADMIN:
+        case TRAINER_CLASS_AQUA_LEADER:
+        case TRAINER_CLASS_MAGMA_ADMIN:
+        case TRAINER_CLASS_MAGMA_LEADER:
             PlayBGM(BGM_KACHI4);
             break;
-        case CLASS_LEADER:
+        case TRAINER_CLASS_LEADER:
             PlayBGM(BGM_KACHI3);
             break;
         default:

src/battle_bg.c

@@ -0,0 +1,754 @@
+#include "global.h"
+#include "battle.h"
+#include "sprite.h"
+#include "constants/trainers.h"
+#include "graphics.h"
+#include "decompress.h"
+#include "bg.h"
+#include "palette.h"
+#include "main.h"
+#include "gpu_regs.h"
+#include "link.h"
+#include "battle_message.h"
+#include "task.h"
+#include "trig.h"
+#include "sound.h"
+#include "songs.h"
+#include "strings.h"
+#include "window.h"
+#include "text_window.h"
+#include "new_menu_helpers.h"
+
+struct BattleBackground
+{
+    const void *tileset;
+    const void *tilemap;
+    const void *entryTileset;
+    const void *entryTilemap;
+    const void *palette;
+};
+
+extern const struct SpriteTemplate gUnknown_0831A9D0;
+extern const struct SpriteTemplate gUnknown_0831A9E8;
+extern const struct CompressedSpriteSheet gUnknown_0831AA00;
+extern const struct BgTemplate gUnknown_0831AA08[4];
+extern const struct WindowTemplate *gUnknown_0831ABA0[];
+extern const struct BattleBackground gBattleTerrainTable[];
+
+extern u8 gBattleTerrain;
+extern u16 gTrainerBattleOpponent_A;
+extern u16 gBattle_BG1_X;
+extern u16 gBattle_BG1_Y;
+extern u16 gBattle_BG2_X;
+extern u16 gBattle_BG2_Y;
+extern u16 gPartnerTrainerId;
+
+extern u8 GetCurrentMapBattleScene(void);
+
+void sub_8035658(void)
+{
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gUnknown_0831AA08, ARRAY_COUNT(gUnknown_0831AA08));
+
+    if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
+    {
+        gBattleScripting.field_24 = 1;
+        SetBgTilemapBuffer(1, gUnknown_02023060);
+        SetBgTilemapBuffer(2, gUnknown_02023060);
+    }
+    else
+    {
+        gBattleScripting.field_24 = 0;
+    }
+
+    InitWindows(gUnknown_0831ABA0[gBattleScripting.field_24]);
+    DeactivateAllTextPrinters();
+}
+
+void sub_80356D0(void)
+{
+    DisableInterrupts(INTR_FLAG_HBLANK);
+    EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL);
+    sub_8035658();
+    SetGpuReg(REG_OFFSET_BLDCNT, 0);
+    SetGpuReg(REG_OFFSET_BLDALPHA, 0);
+    SetGpuReg(REG_OFFSET_BLDY, 0);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJWIN_ON | DISPCNT_WIN0_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+}
+
+void ApplyPlayerChosenFrameToBattleMenu(void)
+{
+    sub_809882C(2, 0x12, 0x10);
+    sub_809882C(2, 0x22, 0x10);
+    LoadCompressedPalette(gUnknown_08D85600, 0x50, 0x20);
+
+    if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
+    {
+        sub_81978B0(0x70);
+        copy_textbox_border_tile_patterns_to_vram(0, 0x30, 0x70);
+        gPlttBufferUnfaded[0x76] = 0;
+        CpuCopy16(&gPlttBufferUnfaded[0x76], &gPlttBufferFaded[0x76], 2);
+    }
+}
+
+void DrawMainBattleBackground(void)
+{
+    if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_x2000000))
+    {
+        LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+        LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+        LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON)
+    {
+        LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(VRAM + 0x8000));
+        LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(VRAM + 0xD000));
+        LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60);
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE)
+    {
+        LZDecompressVram(gBattleTerrainTiles_Water, (void*)(VRAM + 0x8000));
+        LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(VRAM + 0xD000));
+        LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60);
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA)
+    {
+        LZDecompressVram(gBattleTerrainTiles_Rayquaza, (void*)(VRAM + 0x8000));
+        LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void*)(VRAM + 0xD000));
+        LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, 0x20, 0x60);
+    }
+    else
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+        {
+            u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
+            if (trainerClass == TRAINER_CLASS_LEADER)
+            {
+                LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+                LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+                LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60);
+                return;
+            }
+            else if (trainerClass == TRAINER_CLASS_CHAMPION)
+            {
+                LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60);
+                return;
+            }
+        }
+
+        switch (GetCurrentMapBattleScene())
+        {
+        default:
+        case MAP_BATTLE_SCENE_NORMAL:
+            LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_GYM:
+            LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_MAGMA:
+            LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_AQUA:
+            LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_SIDNEY:
+            LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_PHOEBE:
+            LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_GLACIA:
+            LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_DRAKE:
+            LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_FRONTIER:
+            LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
+            break;
+        }
+    }
+}
+
+void LoadBattleTextboxAndBackground(void)
+{
+    LZDecompressVram(gBattleTextboxTiles, (void*)(VRAM));
+    CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0);
+    CopyBgTilemapBufferToVram(0);
+    LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40);
+    ApplyPlayerChosenFrameToBattleMenu();
+
+    DrawMainBattleBackground();
+}
+
+static void sub_8035AE4(u8 taskId, u8 bank, u8 bgId, u8 destX, u8 destY)
+{
+    s32 i;
+    u16 var = 0;
+    u16 src[6];
+
+    if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
+    {
+        if (gTasks[taskId].data[5] != 0)
+        {
+            switch (bank)
+            {
+            case 0:
+                var = 0x3F & gTasks[taskId].data[3];
+                break;
+            case 1:
+                var = (0xFC0 & gTasks[taskId].data[4]) >> 6;
+                break;
+            case 2:
+                var = (0xFC0 & gTasks[taskId].data[3]) >> 6;
+                break;
+            case 3:
+                var = 0x3F & gTasks[taskId].data[4];
+                break;
+            }
+        }
+        else
+        {
+            switch (bank)
+            {
+            case 0:
+                var = 0x3F & gTasks[taskId].data[3];
+                break;
+            case 1:
+                var = 0x3F & gTasks[taskId].data[4];
+                break;
+            case 2:
+                var = (0xFC0 & gTasks[taskId].data[3]) >> 6;
+                break;
+            case 3:
+                var = (0xFC0 & gTasks[taskId].data[4]) >> 6;
+                break;
+            }
+        }
+
+        for (i = 0; i < 3; i++)
+        {
+            src[i] = ((var & (3 << (i * 2))) >> (i * 2)) + 0x6001;
+        }
+
+        CopyToBgTilemapBufferRect_ChangePalette(bgId, src, destX, destY, 3, 1, 0x11);
+        CopyBgTilemapBufferToVram(bgId);
+    }
+    else
+    {
+        if (bank == gBattleScripting.multiplayerId)
+            var = gTasks[taskId].data[3];
+        else
+            var = gTasks[taskId].data[4];
+
+        for (i = 0; i < 6; i++)
+        {
+            src[i] = ((var & (3 << (i * 2))) >> (i * 2)) + 0x6001;
+        }
+
+        CopyToBgTilemapBufferRect_ChangePalette(bgId, src, destX, destY, 6, 1, 0x11);
+        CopyBgTilemapBufferToVram(bgId);
+    }
+}
+
+static void sub_8035C4C(void)
+{
+    if (gBattleOutcome == BATTLE_DREW)
+    {
+        BattleHandleAddTextPrinter(gText_Draw, 0x15);
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
+    {
+        if (gBattleOutcome == BATTLE_WON)
+        {
+            switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18)
+            {
+            case 0:
+                BattleHandleAddTextPrinter(gText_Win, 0x16);
+                BattleHandleAddTextPrinter(gText_Loss, 0x17);
+                break;
+            case 1:
+                BattleHandleAddTextPrinter(gText_Win, 0x17);
+                BattleHandleAddTextPrinter(gText_Loss, 0x16);
+                break;
+            case 2:
+                BattleHandleAddTextPrinter(gText_Win, 0x16);
+                BattleHandleAddTextPrinter(gText_Loss, 0x17);
+                break;
+            case 3:
+                BattleHandleAddTextPrinter(gText_Win, 0x17);
+                BattleHandleAddTextPrinter(gText_Loss, 0x16);
+                break;
+            }
+        }
+        else
+        {
+            switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18)
+            {
+            case 0:
+                BattleHandleAddTextPrinter(gText_Win, 0x17);
+                BattleHandleAddTextPrinter(gText_Loss, 0x16);
+                break;
+            case 1:
+                BattleHandleAddTextPrinter(gText_Win, 0x16);
+                BattleHandleAddTextPrinter(gText_Loss, 0x17);
+                break;
+            case 2:
+                BattleHandleAddTextPrinter(gText_Win, 0x17);
+                BattleHandleAddTextPrinter(gText_Loss, 0x16);
+                break;
+            case 3:
+                BattleHandleAddTextPrinter(gText_Win, 0x16);
+                BattleHandleAddTextPrinter(gText_Loss, 0x17);
+                break;
+            }
+        }
+    }
+    else if (gBattleOutcome == BATTLE_WON)
+    {
+        if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0)
+        {
+            BattleHandleAddTextPrinter(gText_Win, 0x17);
+            BattleHandleAddTextPrinter(gText_Loss, 0x16);
+        }
+        else
+        {
+            BattleHandleAddTextPrinter(gText_Win, 0x16);
+            BattleHandleAddTextPrinter(gText_Loss, 0x17);
+        }
+    }
+    else
+    {
+        if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0)
+        {
+            BattleHandleAddTextPrinter(gText_Win, 0x16);
+            BattleHandleAddTextPrinter(gText_Loss, 0x17);
+        }
+        else
+        {
+            BattleHandleAddTextPrinter(gText_Win, 0x17);
+            BattleHandleAddTextPrinter(gText_Loss, 0x16);
+        }
+    }
+}
+
+void sub_8035D74(u8 taskId)
+{
+    struct LinkPlayer *linkPlayer;
+    u8 *name;
+    s32 i, palId;
+
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
+        {
+            for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+            {
+                name = gLinkPlayers[i].name;
+                linkPlayer = &gLinkPlayers[i];
+
+                switch (linkPlayer->lp_field_18)
+                {
+                case 0:
+                    BattleHandleAddTextPrinter(name, 0x11);
+                    sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 4);
+                    break;
+                case 1:
+                    BattleHandleAddTextPrinter(name, 0x12);
+                    sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 4);
+                    break;
+                case 2:
+                    BattleHandleAddTextPrinter(name, 0x13);
+                    sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 8);
+                    break;
+                case 3:
+                    BattleHandleAddTextPrinter(name, 0x14);
+                    sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 8);
+                    break;
+                }
+            }
+        }
+        else
+        {
+            u8 playerId = gBattleScripting.multiplayerId;
+            u8 opponentId = playerId ^ BIT_SIDE;
+            u8 opponentId_copy = opponentId;
+
+            if (gLinkPlayers[playerId].lp_field_18 != 0)
+                opponentId = playerId, playerId = opponentId_copy;
+
+            name = gLinkPlayers[playerId].name;
+            BattleHandleAddTextPrinter(name, 0xF);
+
+            name = gLinkPlayers[opponentId].name;
+            BattleHandleAddTextPrinter(name, 0x10);
+
+            sub_8035AE4(taskId, playerId, 1, 2, 7);
+            sub_8035AE4(taskId, opponentId, 2, 2, 7);
+        }
+        gTasks[taskId].data[0]++;
+        break;
+    case 1:
+        palId = AllocSpritePalette(0x2710);
+        gPlttBufferUnfaded[palId * 16 + 0x10F] = gPlttBufferFaded[palId * 16 + 0x10F] = 0x7FFF;
+        gBattleStruct->field_7D = CreateSprite(&gUnknown_0831A9D0, 111, 80, 0);
+        gBattleStruct->field_7E = CreateSprite(&gUnknown_0831A9E8, 129, 80, 0);
+        gSprites[gBattleStruct->field_7D].invisible = 1;
+        gSprites[gBattleStruct->field_7E].invisible = 1;
+        gTasks[taskId].data[0]++;
+        break;
+    case 2:
+        if (gTasks[taskId].data[5] != 0)
+        {
+            gBattle_BG1_X = -(20) - (Sin2(gTasks[taskId].data[1]) / 32);
+            gBattle_BG2_X = -(140) - (Sin2(gTasks[taskId].data[2]) / 32);
+            gBattle_BG1_Y = -36;
+            gBattle_BG2_Y = -36;
+        }
+        else
+        {
+            gBattle_BG1_X = -(20) - (Sin2(gTasks[taskId].data[1]) / 32);
+            gBattle_BG1_Y = (Cos2(gTasks[taskId].data[1]) / 32) - 164;
+            gBattle_BG2_X = -(140) - (Sin2(gTasks[taskId].data[2]) / 32);
+            gBattle_BG2_Y = (Cos2(gTasks[taskId].data[2]) / 32) - 164;
+        }
+
+        if (gTasks[taskId].data[2] != 0)
+        {
+            gTasks[taskId].data[2] -= 2;
+            gTasks[taskId].data[1] += 2;
+        }
+        else
+        {
+            if (gTasks[taskId].data[5] != 0)
+                sub_8035C4C();
+
+            PlaySE(SE_W231);
+            DestroyTask(taskId);
+            gSprites[gBattleStruct->field_7D].invisible = 0;
+            gSprites[gBattleStruct->field_7E].invisible = 0;
+            gSprites[gBattleStruct->field_7E].oam.tileNum += 0x40;
+            gSprites[gBattleStruct->field_7D].data[0] = 0;
+            gSprites[gBattleStruct->field_7E].data[0] = 1;
+            gSprites[gBattleStruct->field_7D].data[1] = gSprites[gBattleStruct->field_7D].pos1.x;
+            gSprites[gBattleStruct->field_7E].data[1] = gSprites[gBattleStruct->field_7E].pos1.x;
+            gSprites[gBattleStruct->field_7D].data[2] = 0;
+            gSprites[gBattleStruct->field_7E].data[2] = 0;
+        }
+        break;
+    }
+}
+
+void LoadBattleEntryBackground(void)
+{
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        LZDecompressVram(gUnknown_08D778F0, (void*)(VRAM + 0x4000));
+        LZDecompressVram(gUnknown_08D77B0C, (void*)(VRAM + 0x10000));
+        LoadCompressedPalette(gUnknown_08D77AE4, 0x60, 0x20);
+        SetBgAttribute(1, BG_CTRL_ATTR_MAPBASEINDEX, 1);
+        SetGpuReg(REG_OFFSET_BG1CNT, 0x5C04);
+        CopyToBgTilemapBuffer(1, gUnknown_08D779D8, 0, 0);
+        CopyToBgTilemapBuffer(2, gUnknown_08D779D8, 0, 0);
+        CopyBgTilemapBufferToVram(1);
+        CopyBgTilemapBufferToVram(2);
+        SetGpuReg(REG_OFFSET_WININ, 0x36);
+        SetGpuReg(REG_OFFSET_WINOUT, 0x36);
+        gBattle_BG1_Y = 0xFF5C;
+        gBattle_BG2_Y = 0xFF5C;
+        LoadCompressedObjectPicUsingHeap(&gUnknown_0831AA00);
+    }
+    else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER))
+    {
+        if (!(gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) || gPartnerTrainerId == STEVEN_PARTNER_ID)
+        {
+            LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000));
+            LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000));
+        }
+        else
+        {
+            SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 2);
+            SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 2);
+            CopyToBgTilemapBuffer(1, gUnknown_08D857A8, 0, 0);
+            CopyToBgTilemapBuffer(2, gUnknown_08D85A1C, 0, 0);
+            CopyBgTilemapBufferToVram(1);
+            CopyBgTilemapBufferToVram(2);
+        }
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON)
+    {
+        LZDecompressVram(gBattleTerrainAnimTiles_Cave, (void*)(VRAM + 0x4000));
+        LZDecompressVram(gBattleTerrainAnimTilemap_Cave, (void*)(VRAM + 0xE000));
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE)
+    {
+        LZDecompressVram(gBattleTerrainAnimTiles_Underwater, (void*)(VRAM + 0x4000));
+        LZDecompressVram(gBattleTerrainAnimTilemap_Underwater, (void*)(VRAM + 0xE000));
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA)
+    {
+        LZDecompressVram(gBattleTerrainAnimTiles_Rayquaza, (void*)(VRAM + 0x4000));
+        LZDecompressVram(gBattleTerrainAnimTilemap_Rayquaza, (void*)(VRAM + 0xE000));
+    }
+    else
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+        {
+            u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
+            if (trainerClass == TRAINER_CLASS_LEADER)
+            {
+                LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000));
+                LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000));
+                return;
+            }
+            else if (trainerClass == TRAINER_CLASS_CHAMPION)
+            {
+                LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000));
+                LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000));
+                return;
+            }
+        }
+
+        if (GetCurrentMapBattleScene() == MAP_BATTLE_SCENE_NORMAL)
+        {
+            LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTileset, (void*)(VRAM + 0x4000));
+            LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTilemap, (void*)(VRAM + 0xE000));
+        }
+        else
+        {
+            LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000));
+            LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000));
+        }
+    }
+}
+
+bool8 LoadChosenBattleElement(u8 caseId)
+{
+    bool8 ret = FALSE;
+
+    switch (caseId)
+    {
+    case 0:
+        LZDecompressVram(gBattleTextboxTiles, (void*)(VRAM));
+        break;
+    case 1:
+        CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0);
+        CopyBgTilemapBufferToVram(0);
+        break;
+    case 2:
+        LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40);
+        break;
+    case 3:
+        if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER))
+        {
+            LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+        }
+        else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON)
+        {
+            LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(VRAM + 0x8000));
+        }
+        else
+        {
+            if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+            {
+                u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
+                if (trainerClass == TRAINER_CLASS_LEADER)
+                {
+                    LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+                    break;
+                }
+                else if (trainerClass == TRAINER_CLASS_CHAMPION)
+                {
+                    LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                    break;
+                }
+            }
+
+            switch (GetCurrentMapBattleScene())
+            {
+            default:
+            case MAP_BATTLE_SCENE_NORMAL:
+                LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_GYM:
+                LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_MAGMA:
+                LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_AQUA:
+                LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_SIDNEY:
+                LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_PHOEBE:
+                LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_GLACIA:
+                LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_DRAKE:
+                LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_FRONTIER:
+                LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+                break;
+            }
+        }
+        break;
+    case 4:
+        if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER))
+        {
+            LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+        }
+        else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
+        {
+            if (gGameVersion == VERSION_RUBY)
+                LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(VRAM + 0xD000));
+            else
+                LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(VRAM + 0xD000));
+        }
+        else
+        {
+            if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+            {
+                u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
+                if (trainerClass == TRAINER_CLASS_LEADER)
+                {
+                    LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+                    break;
+                }
+                else if (trainerClass == TRAINER_CLASS_CHAMPION)
+                {
+                    LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                    break;
+                }
+            }
+
+            switch (GetCurrentMapBattleScene())
+            {
+            default:
+            case MAP_BATTLE_SCENE_NORMAL:
+                LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_GYM:
+                LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_MAGMA:
+                LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_AQUA:
+                LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_SIDNEY:
+                LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_PHOEBE:
+                LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_GLACIA:
+                LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_DRAKE:
+                LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_FRONTIER:
+                LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+                break;
+            }
+        }
+        break;
+    case 5:
+        if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER))
+        {
+            LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
+        }
+        else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
+        {
+            if (gGameVersion == VERSION_RUBY)
+                LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60);
+            else
+                LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60);
+        }
+        else
+        {
+            if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+            {
+                u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
+                if (trainerClass == TRAINER_CLASS_LEADER)
+                {
+                    LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60);
+                    break;
+                }
+                else if (trainerClass == TRAINER_CLASS_CHAMPION)
+                {
+                    LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60);
+                    break;
+                }
+            }
+
+            switch (GetCurrentMapBattleScene())
+            {
+            default:
+            case MAP_BATTLE_SCENE_NORMAL:
+                LoadCompressedPalette(gBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_GYM:
+                LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_MAGMA:
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_AQUA:
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_SIDNEY:
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_PHOEBE:
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_GLACIA:
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_DRAKE:
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_FRONTIER:
+                LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
+                break;
+            }
+        }
+        break;
+    case 6:
+        ApplyPlayerChosenFrameToBattleMenu();
+        break;
+    default:
+        ret = TRUE;
+        break;
+    }
+
+    return ret;
+}

src/battle_controller_player.c

@@ -234,7 +234,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
 static const u8 sTargetIdentities[] = {IDENTITY_PLAYER_MON1, IDENTITY_PLAYER_MON2, IDENTITY_OPPONENT_MON2, IDENTITY_OPPONENT_MON1};
 
 // unknown unused data
-static const u8 gUnknown_0831C5FC[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58};
+static const u8 sUnknown_0831C5FC[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58};
 
 void nullsub_21(void)
 {

src/battle_controller_player_partner.c

@@ -198,7 +198,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
 };
 
 // unknown unused data
-static const u8 gUnknown_08617254[] =
+static const u8 sUnknown_08617254[] =
 {
     0x83, 0x4d, 0xf3, 0x5f, 0x6f, 0x4f, 0xeb, 0x3e,
     0x67, 0x2e, 0x10, 0x46, 0x8c, 0x3d, 0x28, 0x35,

src/battle_controller_safari.c

@@ -19,6 +19,7 @@
 #include "reshow_battle_screen.h"
 #include "pokeball.h"
 #include "data2.h"
+#include "pokeblock.h"
 
 extern u32 gBattleExecBuffer;
 extern u8 gActiveBank;
@@ -291,13 +292,13 @@ static void CompleteOnSpecialAnimDone(void)
         SafariBufferExecCompleted();
 }
 
-static void OpenPokeblockCase(void)
+static void SafariOpenPokeblockCase(void)
 {
     if (!gPaletteFade.active)
     {
         gBattleBankFunc[gActiveBank] = CompleteWhenChosePokeblock;
         FreeAllWindowBuffers();
-        sub_81358F4();
+        OpenPokeblockCaseInBattle();
     }
 }
 
@@ -497,7 +498,7 @@ static void SafariHandleChooseItem(void)
     s32 i;
 
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-    gBattleBankFunc[gActiveBank] = OpenPokeblockCase;
+    gBattleBankFunc[gActiveBank] = SafariOpenPokeblockCase;
     gBankInMenu = gActiveBank;
 }
 

src/battle_interface.c

@@ -177,7 +177,6 @@ extern const u16 gBattleInterface_BallDisplayPal[];
 extern const u8 gHealthboxElementsGfxTable[][32];
 
 // functions
-extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, const u8 *str); // menu.h
 extern void LoadBattleBarGfx(u8 arg0);
 
 // this file's functions

src/battle_message.c

@@ -12,6 +12,7 @@
 #include "window.h"
 #include "palette.h"
 #include "battle_controllers.h"
+#include "battle_setup.h"
 
 extern u16 gLastUsedItem;
 extern u8 gLastUsedAbility;
@@ -54,8 +55,6 @@ extern void sub_81D5554(u8 *txtPtr, u16 trainerId); // pokenav
 extern void GetEreaderTrainerName(u8 *txtPtr);
 extern void sub_81A36D0(u8 arg0, u16 trainerId); // battle_frontier_2
 extern void sub_81D572C(u8 arg0, u16 trainerId); // pokenav
-extern const u8* GetTrainer1LoseText(void); // battle_setup
-extern const u8* GetTrainer2LoseText(void); // battle_setup
 extern void GetFrontierTrainerName(u8 *dst, u16 trainerId);
 extern s32 GetStringCenterAlignXOffsetWithLetterSpacing(u8 fontId, const u8 *str, s32 totalWidth, s16 letterSpacing);
 extern u8 GetTextSpeedInRecordedBattle(void);
@@ -1367,7 +1366,7 @@ static const u16 sUnknownMoveTable[] =
 
 static const u8 sDummyWeirdStatusString[] = {EOS, EOS, EOS, EOS, EOS, EOS, EOS, EOS, 0, 0};
 
-static const u8 gUnknown_085CD42C[] =
+static const u8 sUnknown_085CD42C[] =
 {
     0xFF, 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x1, 0xF, 0x6, 0x0, 0x0, 0xFF, 0x1,
     0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0xF, 0x6, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0,
@@ -1392,7 +1391,7 @@ static const u8 gUnknown_085CD42C[] =
     0x6, 0x0, 0x0, 0x0, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x6, 0x0, 0x0
 };
 
-static const u8 gUnknown_085CD54C[] =
+static const u8 sUnknown_085CD54C[] =
 {
     0xFF, 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x1, 0xF, 0x6, 0x0, 0x0, 0xFF, 0x1,
     0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0xF, 0x6, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0,
@@ -1419,7 +1418,7 @@ static const u8 gUnknown_085CD54C[] =
 
 static const u8 * const gUnknown_085CD660[] =
 {
-    gUnknown_085CD42C, gUnknown_085CD54C
+    sUnknown_085CD42C, sUnknown_085CD54C
 };
 
 static const u8 sRecordedBattleTextSpeeds[] = {8, 4, 1, 0};
@@ -2068,7 +2067,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 }
                 else
                 {
-                    toCpy = GetTrainer1LoseText();
+                    toCpy = GetTrainerALoseText();
                 }
                 break;
             case B_TXT_TRAINER1_WIN_TEXT: // trainerA win text
@@ -2165,7 +2164,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 }
                 else
                 {
-                    toCpy = GetTrainer2LoseText();
+                    toCpy = GetTrainerBLoseText();
                 }
                 break;
             case B_TXT_TRAINER2_WIN_TEXT:

src/battle_script_commands.c

@@ -17,6 +17,7 @@
 #include "battle_interface.h"
 #include "constants/species.h"
 #include "constants/songs.h"
+#include "constants/trainers.h"
 #include "text.h"
 #include "sound.h"
 #include "pokedex.h"
@@ -6236,19 +6237,19 @@ static u32 GetTrainerMoneyToGive(u16 trainerId)
                 lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl;
             }
             break;
-        case PARTY_FLAG_CUSTOM_MOVES:
+        case F_TRAINER_PARTY_CUSTOM_MOVESET:
             {
                 const struct TrainerMonNoItemCustomMoves *party = gTrainers[trainerId].party.NoItemCustomMoves;
                 lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl;
             }
             break;
-        case PARTY_FLAG_HAS_ITEM:
+        case F_TRAINER_PARTY_HELD_ITEM:
             {
                 const struct TrainerMonItemDefaultMoves *party = gTrainers[trainerId].party.ItemDefaultMoves;
                 lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl;
             }
             break;
-        case PARTY_FLAG_CUSTOM_MOVES | PARTY_FLAG_HAS_ITEM:
+        case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM:
             {
                 const struct TrainerMonItemCustomMoves *party = gTrainers[trainerId].party.ItemCustomMoves;
                 lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl;
@@ -10334,7 +10335,7 @@ static void atkE4_getsecretpowereffect(void)
     case BATTLE_TERRAIN_POND:
         gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_SPD_MINUS_1;
         break;
-    case BATTLE_TERRAIN_ROCK:
+    case BATTLE_TERRAIN_MOUNTAIN:
         gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_CONFUSION;
         break;
     case BATTLE_TERRAIN_CAVE:

src/berry_blender.c

@@ -134,8 +134,6 @@ extern u8 gInGameOpponentsNo;
 extern u8 gUnknown_020322D5;
 extern u8 gResultsWindowId;
 
-extern const u8 * const gPokeblockNames[];
-
 // graphics
 extern const u8 gBerryBlenderArrowTiles[];
 extern const u8 gBerryBlenderStartTiles[];
@@ -2444,7 +2442,7 @@ static void CB2_HandleBlenderEndGame(void)
         sBerryBlenderData->gameEndState++;
         break;
     case 10:
-        switch (sub_8198C58())
+        switch (ProcessMenuInputNoWrap_())
         {
         case 1:
         case -1:

src/berry_fix_program.c

@@ -35,9 +35,9 @@ static void berry_fix_bg_hide(void);
 
 // .rodata
 
-static const u8 gUnknown_08617E78[] = _("Berry Program Update");
-static const u8 gUnknown_08617E8D[] = _("Ruby/Sapphire");
-static const u8 gUnknown_08617E9B[] = _("Emerald");
+static const u8 sUnknown_08617E78[] = _("Berry Program Update");
+static const u8 sUnknown_08617E8D[] = _("Ruby/Sapphire");
+static const u8 sUnknown_08617E9B[] = _("Emerald");
 
 static const u8 Unknown_08617EA3[] = _("The Berry Program on your POKéMON\nRuby/Sapphire Game Pak will be updated.\n{COLOR RED}{SHADOW LIGHT_RED}Press the A Button.");
 static const u8 Unknown_08617F07[] = _("Please ensure the connection of your\nGame Boy Advance system matches this.\n{COLOR RED}{SHADOW LIGHT_RED}YES: Press the A Button.\nNO: Turn off the power and try again.");
@@ -62,15 +62,15 @@ static const struct WindowTemplate gUnknown_08618110[] = {
     {-1}
 };
 
-static const u16 gUnknown_08618138[] = {
+static const u16 sUnknown_08618138[] = {
     0x7fff, 0x7fff, 0x318c, 0x675a,
     0x043c, 0x3aff, 0x0664, 0x4bd2,
     0x6546, 0x7b14, 0x7fff, 0x318c,
     0x675a, 0x0000, 0x0000, 0x0000
 };
 
-static const u8 gUnknown_08618158[] = {10, 11, 12};
-static const u8 gUnknown_0861815B[] = { 0, 10, 13};
+static const u8 sUnknown_08618158[] = {10, 11, 12};
+static const u8 sUnknown_0861815B[] = { 0, 10, 13};
 
 static const u8 *const gUnknown_08618160[] = {
     Unknown_08617F07,
@@ -243,21 +243,21 @@ static void berry_fix_gpu_set(void)
     InitWindows(gUnknown_08618110);
     DeactivateAllTextPrinters();
 
-    DmaCopy32(3, gUnknown_08618138, BG_PLTT + 0x1E0, 0x20);
+    DmaCopy32(3, sUnknown_08618138, BG_PLTT + 0x1E0, 0x20);
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP);
     FillWindowPixelBuffer(2, 0);
     FillWindowPixelBuffer(3, 0);
     FillWindowPixelBuffer(0, 0xAA);
 
 // This block is a meme among memes
-    width = (0x78 - GetStringWidth(0, gUnknown_08617E9B, 0)) / 2;
-    box_print(2, 0, width, 3, gUnknown_0861815B, -1, gUnknown_08617E9B);
-    width = (s32)(0x78 - GetStringWidth(0, gUnknown_08617E9B, 0)) / 2 + 0x78;
-    box_print(2, 0, width, 3, gUnknown_0861815B, -1, gUnknown_08617E8D);
-    width = (0x70 - GetStringWidth(0, gUnknown_08617E8D, 0)) / 2;
-    box_print(3, 0, width, 0, gUnknown_0861815B, -1, gUnknown_08617E8D);
-    width = (0xd0 - GetStringWidth(1, gUnknown_08617E78, 0)) / 2;
-    box_print(0, 1, width, 2, gUnknown_08618158, -1, gUnknown_08617E78);
+    width = (0x78 - GetStringWidth(0, sUnknown_08617E9B, 0)) / 2;
+    box_print(2, 0, width, 3, sUnknown_0861815B, -1, sUnknown_08617E9B);
+    width = (s32)(0x78 - GetStringWidth(0, sUnknown_08617E9B, 0)) / 2 + 0x78;
+    box_print(2, 0, width, 3, sUnknown_0861815B, -1, sUnknown_08617E8D);
+    width = (0x70 - GetStringWidth(0, sUnknown_08617E8D, 0)) / 2;
+    box_print(3, 0, width, 0, sUnknown_0861815B, -1, sUnknown_08617E8D);
+    width = (0xd0 - GetStringWidth(1, sUnknown_08617E78, 0)) / 2;
+    box_print(0, 1, width, 2, sUnknown_08618158, -1, sUnknown_08617E78);
 
     CopyWindowToVram(2, 2);
     CopyWindowToVram(3, 2);
@@ -346,7 +346,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
         "\tldr r0, =gUnknown_08618110\n"
         "\tbl InitWindows\n"
         "\tbl DeactivateAllTextPrinters\n"
-        "\tldr r0, =gUnknown_08618138\n"
+        "\tldr r0, =sUnknown_08618138\n"
         "\tstr r0, [r4]\n"
         "\tldr r0, =0x050001e0\n"
         "\tstr r0, [r4, 0x4]\n"
@@ -365,7 +365,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
         "\tmovs r0, 0\n"
         "\tmovs r1, 0xAA\n"
         "\tbl FillWindowPixelBuffer\n"
-        "\tldr r5, =gUnknown_08617E9B\n"
+        "\tldr r5, =sUnknown_08617E9B\n"
         "\tmovs r0, 0\n"
         "\tadds r1, r5, 0\n"
         "\tmovs r2, 0\n"
@@ -378,7 +378,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
         "\tasrs r0, 1\n"
         "\tlsls r2, r0, 24\n"
         "\tlsrs r2, 24\n"
-        "\tldr r6, =gUnknown_0861815B\n"
+        "\tldr r6, =sUnknown_0861815B\n"
         "\tstr r6, [sp]\n"
         "\tmovs r0, 0x1\n"
         "\tnegs r0, r0\n"
@@ -389,7 +389,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
         "\tmovs r1, 0\n"
         "\tmovs r3, 0x3\n"
         "\tbl box_print\n"
-        "\tldr r5, =gUnknown_08617E8D\n"
+        "\tldr r5, =sUnknown_08617E8D\n"
         "\tmovs r0, 0\n"
         "\tadds r1, r5, 0\n"
         "\tmovs r2, 0\n"
@@ -431,7 +431,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
         "\tmovs r1, 0\n"
         "\tmovs r3, 0\n"
         "\tbl box_print\n"
-        "\tldr r4, =gUnknown_08617E78\n"
+        "\tldr r4, =sUnknown_08617E78\n"
         "\tmovs r0, 0x1\n"
         "\tadds r1, r4, 0\n"
         "\tmovs r2, 0\n"
@@ -444,7 +444,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
         "\tasrs r0, 1\n"
         "\tlsls r2, r0, 24\n"
         "\tlsrs r2, 24\n"
-        "\tldr r0, =gUnknown_08618158\n"
+        "\tldr r0, =sUnknown_08618158\n"
         "\tstr r0, [sp]\n"
         "\tmov r0, r8\n"
         "\tstr r0, [sp, 0x4]\n"
@@ -496,7 +496,7 @@ static void berry_fix_text_print(int scene)
 {
     FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32);
     FillWindowPixelBuffer(1, 0xAA);
-    box_print(1, 1, 0, 0, gUnknown_08618158, -1, gUnknown_08618160[scene]);
+    box_print(1, 1, 0, 0, sUnknown_08618158, -1, gUnknown_08618160[scene]);
     PutWindowTilemap(1);
     CopyWindowToVram(1, 2);
     switch (scene)

src/clear_save_data_screen.c

@@ -88,7 +88,7 @@ static void Task_DoClearSaveDataScreenYesNo(u8 taskId)
 
 static void Task_ClearSaveDataScreenYesNoChoice(u8 taskId)
 {
-    switch(sub_8198C58())
+    switch(ProcessMenuInputNoWrap_())
     {
         case 0:
             FillWindowPixelBuffer(0, 17);

src/clock.c

@@ -0,0 +1,93 @@
+#include "global.h"
+#include "rom6.h"
+#include "event_data.h"
+#include "rtc.h"
+#include "lottery_corner.h"
+#include "dewford_trend.h"
+#include "tv.h"
+#include "field_screen.h"
+#include "berry.h"
+#include "main.h"
+#include "overworld.h"
+#include "wallclock.h"
+
+// static types
+
+// static declarations
+
+static void UpdatePerDay(struct Time *localTime);
+static void UpdatePerMinute(struct Time *localTime);
+
+// rodata
+
+// text
+
+static void InitTimeBasedEvents(void)
+{
+    FlagSet(FLAG_SYS_CLOCK_SET);
+    RtcCalcLocalTime();
+    gSaveBlock2Ptr->lastBerryTreeUpdate = gLocalTime;
+    VarSet(VAR_DAYS, gLocalTime.days);
+}
+
+void DoTimeBasedEvents(void)
+{
+    if (FlagGet(FLAG_SYS_CLOCK_SET) && !sub_813B9C0())
+    {
+        RtcCalcLocalTime();
+        UpdatePerDay(&gLocalTime);
+        UpdatePerMinute(&gLocalTime);
+    }
+}
+
+static void UpdatePerDay(struct Time *localTime)
+{
+    u16 *days = GetVarPointer(VAR_DAYS);
+    u16 daysSince;
+
+    if (*days != localTime->days && *days <= localTime->days)
+    {
+        daysSince = localTime->days - *days;
+        ClearUpperFlags();
+        UpdateDewfordTrendPerDay(daysSince);
+        UpdateTVShowsPerDay(daysSince);
+        UpdateWeatherPerDay(daysSince);
+        UpdatePartyPokerusTime(daysSince);
+        UpdateMirageRnd(daysSince);
+        UpdateBirchState(daysSince);
+        UpdateFrontierManiac(daysSince);
+        UpdateFrontierGambler(daysSince);
+        SetShoalItemFlag(daysSince);
+        SetRandomLotteryNumber(daysSince);
+        *days = localTime->days;
+    }
+}
+
+static void UpdatePerMinute(struct Time *localTime)
+{
+    struct Time difference;
+    int minutes;
+
+    CalcTimeDifference(&difference, &gSaveBlock2Ptr->lastBerryTreeUpdate, localTime);
+    minutes = 24 * 60 * difference.days + 60 * difference.hours + difference.minutes;
+    if (minutes != 0)
+    {
+        if (minutes >= 0)
+        {
+            BerryTreeTimeUpdate(minutes);
+            gSaveBlock2Ptr->lastBerryTreeUpdate = *localTime;
+        }
+    }
+}
+
+static void ReturnFromStartWallClock(void)
+{
+    InitTimeBasedEvents();
+    SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+}
+
+void StartWallClock(void)
+{
+    SetMainCallback2(Cb2_StartWallClock);
+    gMain.savedCallback = ReturnFromStartWallClock;
+}

src/daycare.c

@@ -40,7 +40,7 @@ extern const u8 gDaycareText_PlayOther[];
 
 extern u8 GetCursorSelectionMonId(void);
 extern u16 ItemIdToBattleMoveId(u16);
-extern s32 ListMenuHandleInput(u8);
+extern s32 ListMenuHandleInputGetItemId(u8);
 extern void sub_81AE6C8(u8, u16*, u16*);
 extern void sub_819746C(u8, bool8);
 extern void sub_81973FC(u8, bool8);
@@ -75,7 +75,7 @@ static const struct ListMenuItem sLevelMenuItems[] =
 static const struct ListMenuTemplate sDaycareListMenuLevelTemplate =
 {
     .items = sLevelMenuItems,
-    .unk_04 = sub_81AF078,
+    .moveCursorFunc = sub_81AF078,
     .unk_08 = DaycarePrintMonInfo,
     .totalItems = 3,
     .maxShowed = 3,
@@ -90,7 +90,8 @@ static const struct ListMenuTemplate sDaycareListMenuLevelTemplate =
     .unk_16_0 = TRUE,
     .spaceBetweenItems = 0,
     .unk_16_7 = FALSE,
-    .unk_17_0 = 1
+    .unk_17_0 = 1,
+    .cursorKind = 0
 };
 
 static const u8 *const sCompatibilityMessages[] =
@@ -1256,7 +1257,7 @@ static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y)
 
 static void Task_HandleDaycareLevelMenuInput(u8 taskId)
 {
-    u32 var = ListMenuHandleInput(gTasks[taskId].tMenuListTaskId);
+    u32 var = ListMenuHandleInputGetItemId(gTasks[taskId].tMenuListTaskId);
 
     if (gMain.newKeys & A_BUTTON)
     {

src/decoration.c

@@ -792,17 +792,17 @@ void sub_8127330(u8 taskId)
     for (i = 0; i < sDecorPCBuffer->unk_520 - 1; i ++)
     {
         sub_8127454(sDecorPCBuffer->names[i], gCurDecorInventoryItems[i]);
-        sDecorPCBuffer->items[i].unk_00 = sDecorPCBuffer->names[i];
-        sDecorPCBuffer->items[i].unk_04 = i;
+        sDecorPCBuffer->items[i].name = sDecorPCBuffer->names[i];
+        sDecorPCBuffer->items[i].id = i;
     }
     StringCopy(sDecorPCBuffer->names[i], gText_Cancel);
-    sDecorPCBuffer->items[i].unk_00 = sDecorPCBuffer->names[i];
-    sDecorPCBuffer->items[i].unk_04 = -2;
-    gUnknown_03006310 = gUnknown_085A6BD0;
-    gUnknown_03006310.unk_10 = sDecorMenuWindowIndices[1];
-    gUnknown_03006310.totalItems = sDecorPCBuffer->unk_520;
-    gUnknown_03006310.items = sDecorPCBuffer->items;
-    gUnknown_03006310.maxShowed = sDecorPCBuffer->unk_521;
+    sDecorPCBuffer->items[i].name = sDecorPCBuffer->names[i];
+    sDecorPCBuffer->items[i].id = -2;
+    gMultiuseListMenuTemplate = gUnknown_085A6BD0;
+    gMultiuseListMenuTemplate.unk_10 = sDecorMenuWindowIndices[1];
+    gMultiuseListMenuTemplate.totalItems = sDecorPCBuffer->unk_520;
+    gMultiuseListMenuTemplate.items = sDecorPCBuffer->items;
+    gMultiuseListMenuTemplate.maxShowed = sDecorPCBuffer->unk_521;
 }
 
 void sub_8127454(u8 *dest, u16 decorId)
@@ -871,7 +871,7 @@ void sub_812759C(u8 taskId)
     sub_81272C8();
     sub_81272F8();
     sub_8127330(taskId);
-    data[13] = ListMenuInit(&gUnknown_03006310, sSecretBasePCSelectDecorPageNo, sSecretBasePCSelectDecorLineNo);
+    data[13] = ListMenuInit(&gMultiuseListMenuTemplate, sSecretBasePCSelectDecorPageNo, sSecretBasePCSelectDecorLineNo);
     sub_8127500();
 }
 
@@ -889,8 +889,8 @@ void sub_812764C(u8 taskId)
     data = gTasks[taskId].data;
     if (!gPaletteFade.active)
     {
-        input = ListMenuHandleInput(data[13]);
-        get_coro_args_x18_x1A(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
+        input = ListMenuHandleInputGetItemId(data[13]);
+        sub_81AE860(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
         switch (input)
         {
             case -1:

src/egg_hatch.c

@@ -48,9 +48,9 @@ extern struct SpriteTemplate gUnknown_0202499C;
 extern void (*gFieldCallback)(void);
 
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-extern const u8 gUnknown_08C00000[];
-extern const u8 gUnknown_08C00524[];
-extern const u8 gUnknown_08C004E0[];
+extern const u8 gBattleTextboxTiles[];
+extern const u8 gBattleTextboxTilemap[];
+extern const u8 gBattleTextboxPalette[];
 extern const u16 gUnknown_08DD7300[]; // palette, gameboy advance
 extern const u32 gUnknown_08DD7360[]; // tileset gameboy advance
 extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle
@@ -58,7 +58,7 @@ extern const u8 gText_HatchedFromEgg[];
 extern const u8 gText_NickHatchPrompt[];
 
 extern u8 sav1_map_get_name(void);
-extern s8 sub_8198C58(void);
+extern s8 ProcessMenuInputNoWrap_(void);
 extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8);
 extern void sub_806A068(u16, u8);
 extern void fade_screen(u8, u8);
@@ -91,7 +91,7 @@ static void CreateRandomEggShardSprite(void);
 static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 spriteAnimIndex);
 
 // IWRAM bss
-static IWRAM_DATA struct EggHatchData* sEggHatchData;
+static IWRAM_DATA struct EggHatchData *sEggHatchData;
 
 // rom data
 static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/palettes/egg_palette.gbapal");
@@ -522,9 +522,9 @@ static void CB2_EggHatch_0(void)
         gMain.state++;
         break;
     case 2:
-        copy_decompressed_tile_data_to_vram_autofree(0, gUnknown_08C00000, 0, 0, 0);
-        CopyToBgTilemapBuffer(0, gUnknown_08C00524, 0, 0);
-        LoadCompressedPalette(gUnknown_08C004E0, 0, 0x20);
+        copy_decompressed_tile_data_to_vram_autofree(0, gBattleTextboxTiles, 0, 0, 0);
+        CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0);
+        LoadCompressedPalette(gBattleTextboxPalette, 0, 0x20);
         gMain.state++;
         break;
     case 3:
@@ -669,7 +669,7 @@ static void CB2_EggHatch_1(void)
         }
         break;
     case 10:
-        switch (sub_8198C58())
+        switch (ProcessMenuInputNoWrap_())
         {
         case 0:
             GetMonNick(&gPlayerParty[sEggHatchData->eggPartyID], gStringVar3);

src/evolution_scene.c

@@ -1168,7 +1168,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             }
             break;
         case 4:
-            switch (sub_8198C58())
+            switch (ProcessMenuInputNoWrap_())
             {
             case 0:
                 sEvoCursorPos = 0;

src/field_map_obj.c

@@ -1174,11 +1174,11 @@ void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGr
     }
 }
 
-void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, u8 *localId, u8 *mapNum, u8 *mapGroup)
+void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup)
 {
-    *localId = mapObject->localId;
-    *mapNum = mapObject->mapNum;
-    *mapGroup = mapObject->mapGroup;
+    *(u8*)(localId) = mapObject->localId;
+    *(u8*)(mapNum) = mapObject->mapNum;
+    *(u8*)(mapGroup) = mapObject->mapGroup;
 }
 
 void sub_808E75C(s16 x, s16 y)
@@ -3426,7 +3426,7 @@ void FieldObjectCB_TreeDisguise(struct Sprite *sprite)
     mapObject = &gMapObjects[sprite->data[0]];
     if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data[7]))
     {
-        FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+        FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
         mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE);
         mapObject->mapobj_unk_21 = 1;
         sprite->data[7] ++;
@@ -3447,7 +3447,7 @@ void FieldObjectCB_MountainDisguise(struct Sprite *sprite)
     mapObject = &gMapObjects[sprite->data[0]];
     if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data[7]))
     {
-        FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+        FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
         mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
         mapObject->mapobj_unk_21 = 1;
         sprite->data[7] ++;
@@ -4694,7 +4694,7 @@ bool8 sub_80954CC(struct MapObject *mapObject, struct Sprite *sprite)
 
 bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
     sprite->data[2] = 1;
     return TRUE;
@@ -4702,7 +4702,7 @@ bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *s
 
 bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2);
     sprite->data[2] = 1;
     return TRUE;
@@ -4710,7 +4710,7 @@ bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *s
 
 bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_HEART_ICON);
     sprite->data[2] = 1;
     return TRUE;

src/hall_of_fame.c

@@ -187,9 +187,9 @@ static const struct BgTemplate sHof_BgTemplates[] =
 
 static const struct WindowTemplate sHof_WindowTemplate = {0, 2, 2, 0xE, 6, 0xE, 1};
 
-static const u8 gUnknown_085E5388[] = {0, 1, 2, 0};
+static const u8 sUnknown_085E5388[] = {0, 1, 2, 0};
 
-static const u8 gUnknown_085E538C[] = {0, 2, 3, 0, 4, 5, 0, 0};
+static const u8 sUnknown_085E538C[] = {0, 2, 3, 0, 4, 5, 0, 0};
 
 static const struct CompressedSpriteSheet sHallOfFame_ConfettiSpriteSheet =
 {
@@ -1137,7 +1137,7 @@ static void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2)
 {
     FillWindowPixelBuffer(0, 0);
     PutWindowTilemap(0);
-    box_print(0, 1, GetStringCenterAlignXOffset(1, gText_WelcomeToHOF, 0xD0), 1, gUnknown_085E5388, 0, gText_WelcomeToHOF);
+    box_print(0, 1, GetStringCenterAlignXOffset(1, gText_WelcomeToHOF, 0xD0), 1, sUnknown_085E5388, 0, gText_WelcomeToHOF);
     CopyWindowToVram(0, 3);
 }
 
@@ -1173,7 +1173,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
             *(stringPtr)++ = CHAR_QUESTION_MARK;
         }
         stringPtr[0] = EOS;
-        box_print(0, 1, 0x10, 1, gUnknown_085E5388, -1, text);
+        box_print(0, 1, 0x10, 1, sUnknown_085E5388, -1, text);
     }
 
     // nick, species names, gender and level
@@ -1182,13 +1182,13 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
     if (currMon->species == SPECIES_EGG)
     {
         width = GetStringCenterAlignXOffset(1, text, 0xD0);
-        box_print(0, 1, width, 1, gUnknown_085E5388, -1, text);
+        box_print(0, 1, width, 1, sUnknown_085E5388, -1, text);
         CopyWindowToVram(0, 3);
     }
     else
     {
         width = GetStringRightAlignXOffset(1, text, 0x80);
-        box_print(0, 1, width, 1, gUnknown_085E5388, -1, text);
+        box_print(0, 1, width, 1, sUnknown_085E5388, -1, text);
 
         text[0] = CHAR_SLASH;
         stringPtr = StringCopy(text + 1, gSpeciesNames[currMon->species]);
@@ -1209,15 +1209,15 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
         }
 
         stringPtr[0] = EOS;
-        box_print(0, 1, 0x80, 1, gUnknown_085E5388, -1, text);
+        box_print(0, 1, 0x80, 1, sUnknown_085E5388, -1, text);
 
         stringPtr = StringCopy(text, gText_Level);
         ConvertIntToDecimalStringN(stringPtr, currMon->lvl, STR_CONV_MODE_LEFT_ALIGN, 3);
-        box_print(0, 1, 0x24, 0x11, gUnknown_085E5388, -1, text);
+        box_print(0, 1, 0x24, 0x11, sUnknown_085E5388, -1, text);
 
         stringPtr = StringCopy(text, gText_IDNumber);
         ConvertIntToDecimalStringN(stringPtr, (u16)(currMon->tid), STR_CONV_MODE_LEADING_ZEROS, 5);
-        box_print(0, 1, 0x68, 0x11, gUnknown_085E5388, -1, text);
+        box_print(0, 1, 0x68, 0x11, sUnknown_085E5388, -1, text);
 
         CopyWindowToVram(0, 3);
     }
@@ -1232,13 +1232,13 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
     FillWindowPixelBuffer(1, 0x11);
     PutWindowTilemap(1);
     SetWindowBorderStyle(1, FALSE, 0x21D, 0xD);
-    box_print(1, 1, 0, 1, gUnknown_085E538C, -1, gText_Name);
+    box_print(1, 1, 0, 1, sUnknown_085E538C, -1, gText_Name);
 
     width = GetStringRightAlignXOffset(1, gSaveBlock2Ptr->playerName, 0x70);
-    box_print(1, 1, width, 1, gUnknown_085E538C, -1, gSaveBlock2Ptr->playerName);
+    box_print(1, 1, width, 1, sUnknown_085E538C, -1, gSaveBlock2Ptr->playerName);
 
     trainerId = (gSaveBlock2Ptr->playerTrainerId[0]) | (gSaveBlock2Ptr->playerTrainerId[1] << 8);
-    box_print(1, 1, 0, 0x11, gUnknown_085E538C, 0, gText_IDNumber);
+    box_print(1, 1, 0, 0x11, sUnknown_085E538C, 0, gText_IDNumber);
     text[0] = (trainerId % 100000) / 10000 + CHAR_0;
     text[1] = (trainerId % 10000) / 1000 + CHAR_0;
     text[2] = (trainerId % 1000) / 100 + CHAR_0;
@@ -1246,9 +1246,9 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
     text[4] = (trainerId % 10) / 1 + CHAR_0;
     text[5] = EOS;
     width = GetStringRightAlignXOffset(1, text, 0x70);
-    box_print(1, 1, width, 0x11, gUnknown_085E538C, -1, text);
+    box_print(1, 1, width, 0x11, sUnknown_085E538C, -1, text);
 
-    box_print(1, 1, 0, 0x21, gUnknown_085E538C, -1, gText_MainMenuTime);
+    box_print(1, 1, 0, 0x21, sUnknown_085E538C, -1, gText_MainMenuTime);
     text[0] = (gSaveBlock2Ptr->playTimeHours / 100) + CHAR_0;
     text[1] = (gSaveBlock2Ptr->playTimeHours % 100) / 10 + CHAR_0;
     text[2] = (gSaveBlock2Ptr->playTimeHours % 10) + CHAR_0;
@@ -1264,7 +1264,7 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
     text[6] = EOS;
 
     width = GetStringRightAlignXOffset(1, text, 0x70);
-    box_print(1, 1, width, 0x21, gUnknown_085E538C, -1, text);
+    box_print(1, 1, width, 0x21, sUnknown_085E538C, -1, text);
 
     CopyWindowToVram(1, 3);
 }

src/lilycove_lady.c

@@ -29,10 +29,10 @@ static u8 sub_818E258(const u8 *);
 
 extern const u8 gText_Lady2[];
 
-static const u16 gUnknown_0860B074[] = {
+static const u16 sUnknown_0860B074[] = {
         0x62, 0xcb, 0xdc, 0xcc, 0xd1
 };
-static const u16 gUnknown_0860B07E[] = {
+static const u16 sUnknown_0860B07E[] = {
         0x1a, 0x14, 0x0a
 };
 
@@ -119,11 +119,11 @@ static const u16 *const gUnknown_0860B1A4[] = {
         Unknown_0860B192
 };
 
-static const u16 gUnknown_0860B1E4[] = {
+static const u16 sUnknown_0860B1E4[] = {
         0x0210, 0x0400, 0x0212, 0x1a26, 0x0208, 0x045d, 0x040a, 0x0411, 0x0464, 0x020e, 0x1a25, 0x181b, 0x1a24, 0x0420, 0x0410, 0x0400
 };
 
-static const u16 gUnknown_0860B204[] = {
+static const u16 sUnknown_0860B204[] = {
         0x007b, 0x007f, 0x0081, 0x0023, 0x0023, 0x0023, 0x00a5, 0x00a7, 0x00a6, 0x000b, 0x012f, 0x006b, 0x006d, 0x0044, 0x0044, 0x000c
 };
 
@@ -176,7 +176,7 @@ static const u16 *const gUnknown_0860B2EC[] = {
         Unknown_0860B2D6
 };
 
-static const u16 gUnknown_0860B304[] = {
+static const u16 sUnknown_0860B304[] = {
         0x0b, 0x6e, 0x40, 0x6f, 0x44, 0x47
 };
 
@@ -218,7 +218,7 @@ static const u8 *const gUnknown_0860B338[] = {
         gUnknown_085EADE7
 };
 
-static const u16 gUnknown_0860B34C[] = {
+static const u16 sUnknown_0860B34C[] = {
         0x0120, 0x013b, 0x011e, 0x013d, 0x0019
 };
 
@@ -237,11 +237,11 @@ void sub_818D9C0(void)
 {
     LilycoveLady *lilycoveLady;
 
-    VarSet(VAR_0x4010, gUnknown_0860B07E[GetLilycoveLadyId()]);
+    VarSet(VAR_0x4010, sUnknown_0860B07E[GetLilycoveLadyId()]);
     if (GetLilycoveLadyId() == LILYCOVE_LADY_CONTEST)
     {
         lilycoveLady = &gSaveBlock1Ptr->lilycoveLady;
-        VarSet(VAR_0x4011, gUnknown_0860B074[lilycoveLady->contest.category]);
+        VarSet(VAR_0x4011, sUnknown_0860B074[lilycoveLady->contest.category]);
         gSpecialVar_Result = TRUE;
     }
     else
@@ -481,7 +481,7 @@ u16 sub_818DEA0(void)
     u16 itemId;
 
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
-    itemId = gUnknown_0860B304[gUnknown_0203CD64->unk_00c];
+    itemId = sUnknown_0860B304[gUnknown_0203CD64->unk_00c];
     sub_818DE88(itemId);
     gUnknown_0203CD64->phase = 2;
     return itemId;
@@ -508,8 +508,8 @@ static void sub_818DF00(void)
     {
         gUnknown_0203CD68->unk_002[i] = gUnknown_0860B1A4[v0][i];
     }
-    gUnknown_0203CD68->unk_014 = gUnknown_0860B1E4[v0];
-    gUnknown_0203CD68->itemId = gUnknown_0860B204[v0];
+    gUnknown_0203CD68->unk_014 = sUnknown_0860B1E4[v0];
+    gUnknown_0203CD68->itemId = sUnknown_0860B204[v0];
     gUnknown_0203CD68->unk_02b = v0;
     gUnknown_0203CD68->playerName[0] = EOS;
 }
@@ -581,13 +581,13 @@ u8 sub_818E06C(void)
             {
                 i = 0;
             }
-        } while (sub_811F8D8(gUnknown_0860B1E4[i]) == 0);
+        } while (sub_811F8D8(sUnknown_0860B1E4[i]) == 0);
         for (j = 0; j < 9; j ++)
         {
             quiz->unk_002[j] = gUnknown_0860B1A4[i][j];
         }
-        quiz->unk_014 = gUnknown_0860B1E4[i];
-        quiz->itemId = gUnknown_0860B204[i];
+        quiz->unk_014 = sUnknown_0860B1E4[i];
+        quiz->itemId = sUnknown_0860B204[i];
         quiz->unk_02b = i;
         quiz->playerName[0] = EOS;
     }
@@ -943,7 +943,7 @@ static void sub_818E6B0(u8 sheen)
     }
 }
 
-bool8 sub_818E704(struct Pokeblock *pokeblock)
+bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock)
 {
     u8 sheen;
     bool8 response;
@@ -1079,7 +1079,7 @@ void sub_818E914(void)
 
 void sub_818E92C(void)
 {
-    sub_81357FC(3, c2_exit_to_overworld_2_switch);
+    OpenPokeblockCase(3, c2_exit_to_overworld_2_switch);
 }
 
 void sub_818E940(void)
@@ -1091,7 +1091,7 @@ void sub_818E940(void)
 void sub_818E960(void)
 {
     gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
-    gSpecialVar_0x8005 = gUnknown_0860B34C[gUnknown_0203CD6C->category];
+    gSpecialVar_0x8005 = sUnknown_0860B34C[gUnknown_0203CD6C->category];
 }
 
 u8 sub_818E990(void)

src/load_save.c

@@ -1,4 +1,4 @@
-#include "global.h"    
+#include "global.h"
 #include "gba/flash_internal.h"
 #include "load_save.h"
 #include "main.h"
@@ -28,7 +28,7 @@ struct LoadedSaveData
  /*0x00F0*/ struct ItemSlot pokeBalls[16];
  /*0x0130*/ struct ItemSlot TMsHMs[64];
  /*0x0230*/ struct ItemSlot berries[46];
- /*0x02E8*/ struct MailStruct mail[16];
+ /*0x02E8*/ struct MailStruct mail[MAIL_COUNT];
 };
 
 EWRAM_DATA struct SaveBlock2 gSaveblock2 = {0};
@@ -330,7 +330,7 @@ void LoadSerializedGame(void)
 void copy_bags_and_unk_data_from_save_blocks(void)
 {
     int i;
-    
+
     // load player items.
     for (i = 0; i < 30; i++)
         gLoadedSaveData.items[i] = gSaveBlock1Ptr->bagPocket_Items[i];

src/mail.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "mail.h"
 #include "constants/items.h"
 #include "main.h"
 #include "overworld.h"
@@ -18,117 +19,6 @@
 #include "constants/species.h"
 #include "malloc.h"
 #include "easy_chat.h"
-#include "mail_data.h"
-#include "mail.h"
-
-// Static type declarations
-
-struct UnkMailStruct
-{
-    u32 numEasyChatWords:2;
-    u32 xOffset:6;
-    u32 lineHeight:8;
-};
-
-struct MailLayout
-{
-    u8 numSubStructs;
-    u8 signatureYPos;
-    u8 signatureWidth;
-    u8 wordsXPos;
-    u8 wordsYPos;
-    const struct UnkMailStruct *var8;
-};
-
-struct MailGraphics
-{
-    const u16 *palette;
-    const u8 *tiles;
-    const u8 *tileMap;
-    u16 var0C;
-    u16 var0E;
-    u16 color10;
-    u16 color12;
-};
-
-// Static RAM declarations
-
-static EWRAM_DATA struct
-{
-    /*0x0000*/ u8 strbuf[8][64];
-    /*0x0200*/ u8 playerName[12];
-    /*0x020C*/ MainCallback callback;
-    /*0x0210*/ MainCallback callback2;
-    /*0x0214*/ struct MailStruct *mail;
-    /*0x0218*/ bool8 flag;
-    /*0x0219*/ u8 signatureWidth;
-    /*0x021a*/ u8 mailType;
-    /*0x021b*/ u8 animsActive;
-    /*0x021c*/ u8 monIconSprite;
-    /*0x021d*/ u8 language;
-    /*0x021e*/ bool8 playerIsSender;
-    /*0x0220*/ void (*parserSingle)(u8 *dest, u16 word);
-    /*0x0224*/ void (*parserMultiple)(u8 *dest, const u16 *src, u16 length1, u16 length2);
-    /*0x0228*/ const struct MailLayout *layout;
-    /*0x022c*/ u8 bg1TilemapBuffer[0x1000];
-    /*0x122c*/ u8 bg2TilemapBuffer[0x1000];
-} *gUnknown_0203A134 = NULL;
-
-// Static ROM declarations
-
-void sub_81219F0(void);
-void sub_8121A1C(void);
-void sub_8121B1C(void);
-void sub_8121C50(void);
-void sub_8121C64(void);
-void sub_8121C98(void);
-void sub_8121CC0(void);
-void sub_8121D00(void);
-
-// .rodata
-
-const struct BgTemplate gUnknown_0859F290[] = {
-    {
-        .bg = 0,
-        .charBaseIndex = 2,
-        .mapBaseIndex = 31,
-        .priority = 0
-    }, {
-        .bg = 1,
-        .charBaseIndex = 0,
-        .mapBaseIndex = 30,
-        .priority = 1
-    }, {
-        .bg = 2,
-        .charBaseIndex = 0,
-        .mapBaseIndex = 29,
-        .priority = 2
-    }
-};
-
-const struct WindowTemplate gUnknown_0859F29C[] = {
-    {
-        .priority = 0,
-        .tilemapLeft = 2,
-        .tilemapTop = 3,
-        .width = 26,
-        .height = 15,
-        .paletteNum = 15,
-        .baseBlock = 1
-    },
-    DUMMY_WIN_TEMPLATE
-};
-
-const u8 gUnknown_0859F2AC[] = {
-     0,
-    10,
-    11
-};
-
-const u16 gUnknown_0859F2B0[][2] = {
-    { 0x6ACD, 0x51A5 },
-    { 0x45FC, 0x38D4 }
-};
 
 extern const u16 gUnknown_08DBE818[];
 extern const u16 gUnknown_08DBE838[];
@@ -167,7 +57,118 @@ extern const u8 gUnknown_08DC04E8[];
 extern const u8 gUnknown_08DBF904[];
 extern const u8 gUnknown_08DC0600[];
 
-const struct MailGraphics gUnknown_0859F2B8[] = {
+// Static type declarations
+
+struct UnkMailStruct
+{
+    u32 numEasyChatWords:2;
+    u32 xOffset:6;
+    u32 lineHeight:8;
+};
+
+struct MailLayout
+{
+    u8 numSubStructs;
+    u8 signatureYPos;
+    u8 signatureWidth;
+    u8 wordsXPos;
+    u8 wordsYPos;
+    const struct UnkMailStruct *var8;
+};
+
+struct MailGraphics
+{
+    const u16 *palette;
+    const u8 *tiles;
+    const u8 *tileMap;
+    u16 var0C;
+    u16 var0E;
+    u16 color10;
+    u16 color12;
+};
+
+struct MailRead
+{
+    /*0x0000*/ u8 strbuf[8][64];
+    /*0x0200*/ u8 playerName[12];
+    /*0x020C*/ MainCallback callback;
+    /*0x0210*/ MainCallback callback2;
+    /*0x0214*/ struct MailStruct *mail;
+    /*0x0218*/ bool8 flag;
+    /*0x0219*/ u8 signatureWidth;
+    /*0x021a*/ u8 mailType;
+    /*0x021b*/ u8 animsActive;
+    /*0x021c*/ u8 monIconSprite;
+    /*0x021d*/ u8 language;
+    /*0x021e*/ bool8 playerIsSender;
+    /*0x0220*/ void (*parserSingle)(u8 *dest, u16 word);
+    /*0x0224*/ void (*parserMultiple)(u8 *dest, const u16 *src, u16 length1, u16 length2);
+    /*0x0228*/ const struct MailLayout *layout;
+    /*0x022c*/ u8 bg1TilemapBuffer[0x1000];
+    /*0x122c*/ u8 bg2TilemapBuffer[0x1000];
+};
+
+// Static RAM declarations
+
+static EWRAM_DATA struct MailRead *sMailRead = NULL;
+
+// Static ROM declarations
+
+static void CB2_InitMailRead(void);
+static void sub_8121A1C(void);
+static void sub_8121B1C(void);
+static void VBlankCB_MailRead(void);
+static void CB2_MailRead(void);
+static void CB2_WaitForPaletteExitOnKeyPress(void);
+static void CB2_ExitOnKeyPress(void);
+static void CB2_ExitMailReadFreeVars(void);
+
+// .rodata
+
+static const struct BgTemplate sUnknown_0859F290[] = {
+    {
+        .bg = 0,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 31,
+        .priority = 0
+    }, {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 30,
+        .priority = 1
+    }, {
+        .bg = 2,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 29,
+        .priority = 2
+    }
+};
+
+static const struct WindowTemplate sUnknown_0859F29C[] = {
+    {
+        .priority = 0,
+        .tilemapLeft = 2,
+        .tilemapTop = 3,
+        .width = 26,
+        .height = 15,
+        .paletteNum = 15,
+        .baseBlock = 1
+    },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const u8 sUnknown_0859F2AC[] = {
+     0,
+    10,
+    11
+};
+
+static const u16 sUnknown_0859F2B0[][2] = {
+    { 0x6ACD, 0x51A5 },
+    { 0x45FC, 0x38D4 }
+};
+
+static const struct MailGraphics sUnknown_0859F2B8[] = {
     {
         gUnknown_08DBE818, gUnknown_08DBE998, gUnknown_08DBFBA4, 0x02c0, 0x0000, 0x294a, 0x6739
     }, {
@@ -195,13 +196,13 @@ const struct MailGraphics gUnknown_0859F2B8[] = {
     }
 };
 
-const struct UnkMailStruct Unknown_0859F3A8[] = {
+static const struct UnkMailStruct Unknown_0859F3A8[] = {
     { .numEasyChatWords = 3, .lineHeight = 16 },
     { .numEasyChatWords = 3, .lineHeight = 16 },
     { .numEasyChatWords = 3, .lineHeight = 16 }
 };
 
-const struct MailLayout gUnknown_0859F3B4[] = {
+static const struct MailLayout sUnknown_0859F3B4[] = {
     { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
     { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
     { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
@@ -216,7 +217,7 @@ const struct MailLayout gUnknown_0859F3B4[] = {
     { 0x03, 0x00, 0x00, 0x02, 0x00, Unknown_0859F3A8 }
 };
 
-const struct UnkMailStruct Unknown_0859F444[] = {
+static const struct UnkMailStruct Unknown_0859F444[] = {
     { .numEasyChatWords = 2, .lineHeight = 16 },
     { .numEasyChatWords = 2, .lineHeight = 16 },
     { .numEasyChatWords = 2, .lineHeight = 16 },
@@ -224,7 +225,7 @@ const struct UnkMailStruct Unknown_0859F444[] = {
     { .numEasyChatWords = 1, .lineHeight = 16 }
 };
 
-const struct MailLayout gUnknown_0859F458[] = {
+static const struct MailLayout sUnknown_0859F458[] = {
     { 0x05, 0x07, 0x58, 0x0b, 0x1e, Unknown_0859F444 },
     { 0x05, 0x0a, 0x60, 0x09, 0x1e, Unknown_0859F444 },
     { 0x05, 0x0c, 0x68, 0x05, 0x1e, Unknown_0859F444 },
@@ -241,23 +242,23 @@ const struct MailLayout gUnknown_0859F458[] = {
 
 // What the heck are these meant to be? Call them u16 for now.
 
-const u16 Unknown_0859F4E8[] = {
+static const u16 Unknown_0859F4E8[] = {
     0x00, 0x4000, 0x00, 0x00
 };
 
-const u16 Unknown_0859F4F0[] = {
+static const u16 Unknown_0859F4F0[] = {
     0x00, 0x00, -1, 0x00
 };
 
-const u16 Unknown_0859F4F8[] = {
+static const u16 Unknown_0859F4F8[] = {
     0x04, 0x00, -1, 0x00
 };
 
-const u16 Unknown_0859F500[] = {
+static const u16 Unknown_0859F500[] = {
     0x00, 0x40, -1, 0x00
 };
 
-const u16 *const gUnknown_0859F508[] = {
+static const u16 *const sUnknown_0859F508[] = {
     Unknown_0859F4F0,
     Unknown_0859F4F8,
     Unknown_0859F500
@@ -265,60 +266,62 @@ const u16 *const gUnknown_0859F508[] = {
 
 // .text
 
-void sub_8121478(struct MailStruct *mail, MainCallback callback, bool8 flag) {
+void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag)
+{
     u16 buffer[2];
     u16 species;
 
-    gUnknown_0203A134 = calloc(1, sizeof(*gUnknown_0203A134));
-    gUnknown_0203A134->language = LANGUAGE_ENGLISH;
-    gUnknown_0203A134->playerIsSender = TRUE;
-    gUnknown_0203A134->parserSingle = CopyEasyChatWord;
-    gUnknown_0203A134->parserMultiple = ConvertEasyChatWordsToString;
-    if (mail->itemId >= ITEM_ORANGE_MAIL && mail->itemId <= ITEM_RETRO_MAIL) {
-        gUnknown_0203A134->mailType = mail->itemId - ITEM_ORANGE_MAIL;
+    sMailRead = calloc(1, sizeof(*sMailRead));
+    sMailRead->language = LANGUAGE_ENGLISH;
+    sMailRead->playerIsSender = TRUE;
+    sMailRead->parserSingle = CopyEasyChatWord;
+    sMailRead->parserMultiple = ConvertEasyChatWordsToString;
+    if (IS_ITEM_MAIL(mail->itemId))
+    {
+        sMailRead->mailType = mail->itemId - ITEM_ORANGE_MAIL;
     }
     else
     {
-        gUnknown_0203A134->mailType = 0;
+        sMailRead->mailType = 0;
         flag = FALSE;
     }
-    switch (gUnknown_0203A134->playerIsSender)
+    switch (sMailRead->playerIsSender)
     {
         case FALSE:
         default:
-            gUnknown_0203A134->layout = &gUnknown_0859F3B4[gUnknown_0203A134->mailType];
+            sMailRead->layout = &sUnknown_0859F3B4[sMailRead->mailType];
             break;
         case TRUE:
-            gUnknown_0203A134->layout = &gUnknown_0859F458[gUnknown_0203A134->mailType];
+            sMailRead->layout = &sUnknown_0859F458[sMailRead->mailType];
             break;
     }
-    species = sub_80D45E8(mail->species, buffer);
+    species = MailSpeciesToSpecies(mail->species, buffer);
     if (species >= SPECIES_BULBASAUR && species < NUM_SPECIES)
     {
-        switch (gUnknown_0203A134->mailType)
+        switch (sMailRead->mailType)
         {
             default:
-                gUnknown_0203A134->animsActive = 0;
+                sMailRead->animsActive = 0;
                 break;
             case ITEM_BEAD_MAIL - ITEM_ORANGE_MAIL:
-                gUnknown_0203A134->animsActive = 1;
+                sMailRead->animsActive = 1;
                 break;
             case ITEM_DREAM_MAIL - ITEM_ORANGE_MAIL:
-                gUnknown_0203A134->animsActive = 2;
+                sMailRead->animsActive = 2;
                 break;
         }
     }
     else
     {
-        gUnknown_0203A134->animsActive = 0;
+        sMailRead->animsActive = 0;
     }
-    gUnknown_0203A134->mail = mail;
-    gUnknown_0203A134->callback = callback;
-    gUnknown_0203A134->flag = flag;
-    SetMainCallback2(sub_81219F0);
+    sMailRead->mail = mail;
+    sMailRead->callback = callback;
+    sMailRead->flag = flag;
+    SetMainCallback2(CB2_InitMailRead);
 }
 
-bool8 sub_81215EC(void)
+static bool8 MailReadBuildGraphics(void)
 {
     u16 icon;
 
@@ -352,21 +355,21 @@ bool8 sub_81215EC(void)
             SetGpuReg(REG_OFFSET_BG2HOFS, 0x0000);
             SetGpuReg(REG_OFFSET_BG3HOFS, 0x0000);
             SetGpuReg(REG_OFFSET_BG3VOFS, 0x0000);
-            SetGpuReg(REG_OFFSET_BLDCNT, 0x0000);
+            SetGpuReg(REG_OFFSET_BLDCNT,  0x0000);
             SetGpuReg(REG_OFFSET_BLDALPHA, 0x0000);
             break;
         case 6:
             ResetBgsAndClearDma3BusyFlags(0);
-            InitBgsFromTemplates(0, gUnknown_0859F290, 3);
-            SetBgTilemapBuffer(1, gUnknown_0203A134->bg1TilemapBuffer);
-            SetBgTilemapBuffer(2, gUnknown_0203A134->bg2TilemapBuffer);
+            InitBgsFromTemplates(0, sUnknown_0859F290, 3);
+            SetBgTilemapBuffer(1, sMailRead->bg1TilemapBuffer);
+            SetBgTilemapBuffer(2, sMailRead->bg2TilemapBuffer);
             break;
         case 7:
-            InitWindows(gUnknown_0859F29C);
+            InitWindows(sUnknown_0859F29C);
             DeactivateAllTextPrinters();
             break;
         case 8:
-            decompress_and_copy_tile_data_to_vram(1, gUnknown_0859F2B8[gUnknown_0203A134->mailType].tiles, 0, 0, 0);
+            decompress_and_copy_tile_data_to_vram(1, sUnknown_0859F2B8[sMailRead->mailType].tiles, 0, 0, 0);
             break;
         case 9:
             if (free_temp_tile_data_buffers_if_possible())
@@ -377,7 +380,7 @@ bool8 sub_81215EC(void)
         case 10:
             FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
             FillBgTilemapBufferRect_Palette0(2, 1, 0, 0, 30, 20);
-            CopyToBgTilemapBuffer(1, gUnknown_0859F2B8[gUnknown_0203A134->mailType].tileMap, 0, 0);
+            CopyToBgTilemapBuffer(1, sUnknown_0859F2B8[sMailRead->mailType].tileMap, 0, 0);
             break;
         case 11:
             CopyBgTilemapBufferToVram(0);
@@ -386,24 +389,24 @@ bool8 sub_81215EC(void)
             break;
         case 12:
             LoadPalette(GetOverworldTextboxPalettePtr(), 240, 32);
-            gPlttBufferUnfaded[250] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color10;
-            gPlttBufferFaded[250] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color10;
-            gPlttBufferUnfaded[251] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color12;
-            gPlttBufferFaded[251] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color12;
-            LoadPalette(gUnknown_0859F2B8[gUnknown_0203A134->mailType].palette, 0, 32);
-            gPlttBufferUnfaded[10] = gUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][0];
-            gPlttBufferFaded[10] = gUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][0];
-            gPlttBufferUnfaded[11] = gUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][1];
-            gPlttBufferFaded[11] = gUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][1];
+            gPlttBufferUnfaded[250] = sUnknown_0859F2B8[sMailRead->mailType].color10;
+            gPlttBufferFaded[250] = sUnknown_0859F2B8[sMailRead->mailType].color10;
+            gPlttBufferUnfaded[251] = sUnknown_0859F2B8[sMailRead->mailType].color12;
+            gPlttBufferFaded[251] = sUnknown_0859F2B8[sMailRead->mailType].color12;
+            LoadPalette(sUnknown_0859F2B8[sMailRead->mailType].palette, 0, 32);
+            gPlttBufferUnfaded[10] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][0];
+            gPlttBufferFaded[10] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][0];
+            gPlttBufferUnfaded[11] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][1];
+            gPlttBufferFaded[11] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][1];
             break;
         case 13:
-            if (gUnknown_0203A134->flag)
+            if (sMailRead->flag)
             {
                 sub_8121A1C();
             }
             break;
         case 14:
-            if (gUnknown_0203A134->flag)
+            if (sMailRead->flag)
             {
                 sub_8121B1C();
                 RunTextPrinters();
@@ -416,20 +419,20 @@ bool8 sub_81215EC(void)
             }
             break;
         case 16:
-            SetVBlankCallback(sub_8121C50);
+            SetVBlankCallback(VBlankCB_MailRead);
             gPaletteFade.bufferTransferDisabled = TRUE;
             break;
         case 17:
-            icon = sub_80D2E84(gUnknown_0203A134->mail->species);
-            switch (gUnknown_0203A134->animsActive)
+            icon = sub_80D2E84(sMailRead->mail->species);
+            switch (sMailRead->animsActive)
             {
                 case 1:
                     sub_80D2F68(icon);
-                    gUnknown_0203A134->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x60, 0x80, 0, 0);
+                    sMailRead->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x60, 0x80, 0, 0);
                     break;
                 case 2:
                     sub_80D2F68(icon);
-                    gUnknown_0203A134->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x28, 0x80, 0, 0);
+                    sMailRead->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x28, 0x80, 0, 0);
                     break;
             }
             break;
@@ -440,53 +443,53 @@ bool8 sub_81215EC(void)
             ShowBg(2);
             BeginNormalPaletteFade(-1, 0, 16, 0, 0);
             gPaletteFade.bufferTransferDisabled = FALSE;
-            gUnknown_0203A134->callback2 = sub_8121C98;
+            sMailRead->callback2 = CB2_WaitForPaletteExitOnKeyPress;
             return TRUE;
         default:
             return FALSE;
     }
-    gMain.state ++;
+    gMain.state++;
     return FALSE;
 }
 
-void sub_81219F0(void)
+static void CB2_InitMailRead(void)
 {
     do
     {
-        if (sub_81215EC() == TRUE)
+        if (MailReadBuildGraphics() == TRUE)
         {
-            SetMainCallback2(sub_8121C64);
+            SetMainCallback2(CB2_MailRead);
             break;
         }
     } while (sub_81221AC() != TRUE);
 }
 
-void sub_8121A1C(void)
+static void sub_8121A1C(void)
 {
     u16 i;
     u8 total;
     u8 *ptr;
 
     total = 0;
-    for (i = 0; i < gUnknown_0203A134->layout->numSubStructs; i ++)
+    for (i = 0; i < sMailRead->layout->numSubStructs; i ++)
     {
-        ConvertEasyChatWordsToString(gUnknown_0203A134->strbuf[i], &gUnknown_0203A134->mail->words[total], gUnknown_0203A134->layout->var8[i].numEasyChatWords, 1);
-        total += gUnknown_0203A134->layout->var8[i].numEasyChatWords;
+        ConvertEasyChatWordsToString(sMailRead->strbuf[i], &sMailRead->mail->words[total], sMailRead->layout->var8[i].numEasyChatWords, 1);
+        total += sMailRead->layout->var8[i].numEasyChatWords;
     }
-    ptr = StringCopy(gUnknown_0203A134->playerName, gUnknown_0203A134->mail->playerName);
-    if (!gUnknown_0203A134->playerIsSender)
+    ptr = StringCopy(sMailRead->playerName, sMailRead->mail->playerName);
+    if (!sMailRead->playerIsSender)
     {
         StringCopy(ptr, gText_FromSpace);
-        gUnknown_0203A134->signatureWidth = gUnknown_0203A134->layout->signatureWidth - (StringLength(gUnknown_0203A134->playerName) * 8 - 0x60);
+        sMailRead->signatureWidth = sMailRead->layout->signatureWidth - (StringLength(sMailRead->playerName) * 8 - 0x60);
     }
     else
     {
-        sub_81DB52C(gUnknown_0203A134->playerName);
-        gUnknown_0203A134->signatureWidth = gUnknown_0203A134->layout->signatureWidth;
+        sub_81DB52C(sMailRead->playerName);
+        sMailRead->signatureWidth = sMailRead->layout->signatureWidth;
     }
 }
 
-void sub_8121B1C(void)
+static void sub_8121B1C(void)
 {
     u16 i;
     u8 strbuf[0x20];
@@ -500,77 +503,76 @@ void sub_8121B1C(void)
     PutWindowTilemap(1);
     FillWindowPixelBuffer(0, 0);
     FillWindowPixelBuffer(1, 0);
-    for (i = 0; i < gUnknown_0203A134->layout->numSubStructs; i ++)
+    for (i = 0; i < sMailRead->layout->numSubStructs; i ++)
     {
-        if (gUnknown_0203A134->strbuf[i][0] == EOS || gUnknown_0203A134->strbuf[i][0] == CHAR_SPACE)
+        if (sMailRead->strbuf[i][0] == EOS || sMailRead->strbuf[i][0] == CHAR_SPACE)
         {
             continue;
         }
-        box_print(0, 1, gUnknown_0203A134->layout->var8[i].xOffset + gUnknown_0203A134->layout->wordsYPos, y + gUnknown_0203A134->layout->wordsXPos, gUnknown_0859F2AC, 0, gUnknown_0203A134->strbuf[i]);
-        y += gUnknown_0203A134->layout->var8[i].lineHeight;
+        box_print(0, 1, sMailRead->layout->var8[i].xOffset + sMailRead->layout->wordsYPos, y + sMailRead->layout->wordsXPos, sUnknown_0859F2AC, 0, sMailRead->strbuf[i]);
+        y += sMailRead->layout->var8[i].lineHeight;
     }
     bufptr = StringCopy(strbuf, gText_FromSpace);
-    StringCopy(bufptr, gUnknown_0203A134->playerName);
-    box_x = GetStringCenterAlignXOffset(1, strbuf, gUnknown_0203A134->signatureWidth) + 0x68;
-    box_y = gUnknown_0203A134->layout->signatureYPos + 0x58;
-    box_print(0, 1, box_x, box_y, gUnknown_0859F2AC, 0, strbuf);
+    StringCopy(bufptr, sMailRead->playerName);
+    box_x = GetStringCenterAlignXOffset(1, strbuf, sMailRead->signatureWidth) + 0x68;
+    box_y = sMailRead->layout->signatureYPos + 0x58;
+    box_print(0, 1, box_x, box_y, sUnknown_0859F2AC, 0, strbuf);
     CopyWindowToVram(0, 3);
     CopyWindowToVram(1, 3);
 }
 
-void sub_8121C50(void)
+static void VBlankCB_MailRead(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-void sub_8121C64(void)
+static void CB2_MailRead(void)
 {
-    if (gUnknown_0203A134->animsActive != 0)
+    if (sMailRead->animsActive != 0)
     {
         AnimateSprites();
         BuildOamBuffer();
     }
-    gUnknown_0203A134->callback2();
+    sMailRead->callback2();
 }
 
-void sub_8121C98(void)
+static void CB2_WaitForPaletteExitOnKeyPress(void)
 {
     if (!UpdatePaletteFade())
     {
-        gUnknown_0203A134->callback2 = sub_8121CC0;
+        sMailRead->callback2 = CB2_ExitOnKeyPress;
     }
 }
 
-void sub_8121CC0(void)
+static void CB2_ExitOnKeyPress(void)
 {
     if (gMain.newKeys & (A_BUTTON | B_BUTTON))
     {
         BeginNormalPaletteFade(-1, 0, 0, 16, 0);
-        gUnknown_0203A134->callback2 = sub_8121D00;
+        sMailRead->callback2 = CB2_ExitMailReadFreeVars;
     }
 }
 
-void sub_8121D00(void)
+static void CB2_ExitMailReadFreeVars(void)
 {
     if (!UpdatePaletteFade())
     {
-        SetMainCallback2(gUnknown_0203A134->callback);
-        switch (gUnknown_0203A134->animsActive)
+        SetMainCallback2(sMailRead->callback);
+        switch (sMailRead->animsActive)
         {
             case 1:
             case 2:
-                sub_80D2FF0(sub_80D2E84(gUnknown_0203A134->mail->species));
-                sub_80D2EF8(&gSprites[gUnknown_0203A134->monIconSprite]);
+                sub_80D2FF0(sub_80D2E84(sMailRead->mail->species));
+                sub_80D2EF8(&gSprites[sMailRead->monIconSprite]);
         }
-        memset(gUnknown_0203A134, 0, sizeof(*gUnknown_0203A134));
+        memset(sMailRead, 0, sizeof(*sMailRead));
         ResetPaletteFade();
         UnsetBgTilemapBuffer(0);
         UnsetBgTilemapBuffer(1);
         ResetBgsAndClearDma3BusyFlags(0);
         FreeAllWindowBuffers();
-        free(gUnknown_0203A134);
-        gUnknown_0203A134 = NULL;
+        FREE_AND_SET_NULL(sMailRead);
     }
 }

src/mail_data.c

@@ -0,0 +1,203 @@
+#include "global.h"
+#include "mail.h"
+#include "constants/items.h"
+#include "pokemon.h"
+#include "pokemon_icon.h"
+#include "constants/species.h"
+#include "text.h"
+#include "international_string_util.h"
+
+void ClearMailData(void)
+{
+    u8 i;
+
+    for (i = 0; i < MAIL_COUNT; i++)
+        ClearMailStruct(&gSaveBlock1Ptr->mail[i]);
+}
+
+void ClearMailStruct(struct MailStruct *mail)
+{
+    s32 i;
+
+    for (i = 0; i < MAIL_WORDS_COUNT; i++)
+        mail->words[i] = 0xFFFF;
+
+    for (i = 0; i < PLAYER_NAME_LENGTH; i++)
+        mail->playerName[i] = EOS;
+
+    for (i = 0; i < 4; i++)
+        mail->trainerId[i] = 0;
+
+    mail->species = SPECIES_BULBASAUR;
+    mail->itemId = ITEM_NONE;
+}
+
+bool8 MonHasMail(struct Pokemon *mon)
+{
+    u16 heldItem = GetMonData(mon, MON_DATA_HELD_ITEM);
+    if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != 0xFF)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+u8 GiveMailToMon(struct Pokemon *mon, u16 itemId)
+{
+    u8 heldItem[2];
+    u8 id, i;
+    u16 species;
+    u32 personality;
+
+    heldItem[0] = itemId;
+    heldItem[1] = itemId >> 8;
+
+    for (id = 0; id < PARTY_SIZE; id++)
+    {
+        if (gSaveBlock1Ptr->mail[id].itemId == 0)
+        {
+            for (i = 0; i < MAIL_WORDS_COUNT; i++)
+                gSaveBlock1Ptr->mail[id].words[i] = 0xFFFF;
+
+            for (i = 0; i < PLAYER_NAME_LENGTH - 1; i++)
+                gSaveBlock1Ptr->mail[id].playerName[i] = gSaveBlock2Ptr->playerName[i];
+            gSaveBlock1Ptr->mail[id].playerName[i] = EOS;
+            PadNameString(gSaveBlock1Ptr->mail[id].playerName, CHAR_SPACE);
+
+            for (i = 0; i < 4; i++)
+                gSaveBlock1Ptr->mail[id].trainerId[i] = gSaveBlock2Ptr->playerTrainerId[i];
+
+            species = GetBoxMonData(&mon->box, MON_DATA_SPECIES);
+            personality = GetBoxMonData(&mon->box, MON_DATA_PERSONALITY);
+            gSaveBlock1Ptr->mail[id].species = SpeciesToMailSpecies(species, personality);
+            gSaveBlock1Ptr->mail[id].itemId = itemId;
+            SetMonData(mon, MON_DATA_MAIL, &id);
+            SetMonData(mon, MON_DATA_HELD_ITEM, heldItem);
+            return id;
+        }
+    }
+
+    return 0xFF;
+}
+
+u16 SpeciesToMailSpecies(u16 species, u32 personality)
+{
+    if (species == SPECIES_UNOWN)
+    {
+        u32 species = GetUnownLetterByPersonality(personality) + 30000;
+        return species;
+    }
+
+    return species;
+}
+
+u16 MailSpeciesToSpecies(u16 mailSpecies, u16 *buffer)
+{
+    u16 result;
+
+    if (mailSpecies >= 30000 && mailSpecies < (30000 + UNOWN_FORM_COUNT))
+    {
+        result = SPECIES_UNOWN;
+        *buffer = mailSpecies - 30000;
+    }
+    else
+    {
+        result = mailSpecies;
+    }
+
+    return result;
+}
+
+u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail)
+{
+    u8 heldItem[2];
+    u16 itemId = mail->itemId;
+    u8 mailId = GiveMailToMon(mon, itemId);
+
+    if (mailId == 0xFF)
+        return 0xFF;
+
+    gSaveBlock1Ptr->mail[mailId] = *mail;
+
+    SetMonData(mon, MON_DATA_MAIL, &mailId);
+
+    heldItem[0] = itemId;
+    heldItem[1] = itemId >> 8;
+
+    SetMonData(mon, MON_DATA_HELD_ITEM, heldItem);
+
+    return mailId;
+}
+
+static bool32 DummyMailFunc(void)
+{
+    return FALSE;
+}
+
+void TakeMailFromMon(struct Pokemon *mon)
+{
+    u8 heldItem[2];
+    u8 mailId;
+
+    if (MonHasMail(mon))
+    {
+        mailId = GetMonData(mon, MON_DATA_MAIL);
+        gSaveBlock1Ptr->mail[mailId].itemId = ITEM_NONE;
+        mailId = 0xFF;
+        heldItem[0] = ITEM_NONE;
+        heldItem[1] = ITEM_NONE << 8;
+        SetMonData(mon, MON_DATA_MAIL, &mailId);
+        SetMonData(mon, MON_DATA_HELD_ITEM, heldItem);
+    }
+}
+
+void ClearMailItemId(u8 mailId)
+{
+    gSaveBlock1Ptr->mail[mailId].itemId = ITEM_NONE;
+}
+
+u8 TakeMailFromMon2(struct Pokemon *mon)
+{
+    u8 i;
+    u8 newHeldItem[2];
+    u8 newMailId;
+
+    newHeldItem[0] = ITEM_NONE;
+    newHeldItem[1] = ITEM_NONE << 8;
+    newMailId = 0xFF;
+
+    for (i = PARTY_SIZE; i < MAIL_COUNT; i++)
+    {
+        if (gSaveBlock1Ptr->mail[i].itemId == ITEM_NONE)
+        {
+            memcpy(&gSaveBlock1Ptr->mail[i], &gSaveBlock1Ptr->mail[GetMonData(mon, MON_DATA_MAIL)], sizeof(struct MailStruct));
+            gSaveBlock1Ptr->mail[GetMonData(mon, MON_DATA_MAIL)].itemId = ITEM_NONE;
+            SetMonData(mon, MON_DATA_MAIL, &newMailId);
+            SetMonData(mon, MON_DATA_HELD_ITEM, newHeldItem);
+            return i;
+        }
+    }
+
+    return 0xFF;
+}
+
+bool8 ItemIsMail(u16 itemId)
+{
+    switch (itemId)
+    {
+    case ITEM_ORANGE_MAIL:
+    case ITEM_HARBOR_MAIL:
+    case ITEM_GLITTER_MAIL:
+    case ITEM_MECH_MAIL:
+    case ITEM_WOOD_MAIL:
+    case ITEM_WAVE_MAIL:
+    case ITEM_BEAD_MAIL:
+    case ITEM_SHADOW_MAIL:
+    case ITEM_TROPIC_MAIL:
+    case ITEM_DREAM_MAIL:
+    case ITEM_FAB_MAIL:
+    case ITEM_RETRO_MAIL:
+        return TRUE;
+    default:
+        return FALSE;
+    }
+}

src/new_game.c

@@ -33,7 +33,6 @@ extern void Overworld_SetWarpDestination(s8 mapBank, s8 mapNo, s8 warpNo, s8 xPo
 extern void warp_in(void);
 extern void sub_80BB358(void);
 extern void ResetBagScrollPositions(void);
-extern void sub_813624C(void); // clears something pokeblock related
 extern void ResetPokedex(void);
 extern void sub_8084400(void);
 extern void ClearMailData(void);
@@ -148,7 +147,7 @@ void sub_808447C(void)
     ZeroPlayerPartyMons();
     ZeroEnemyPartyMons();
     ResetBagScrollPositions();
-    sub_813624C();
+    ResetPokeblockScrollPositions();
 }
 
 void NewGameInitData(void)

src/palette.c

@@ -850,13 +850,13 @@ void TintPalette_GrayScale(u16 *palette, u16 count)
         r = *palette & 0x1F;
         g = (*palette >> 5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
-        
+
         r = r * Q_8_8(0.2969);
         r += g * Q_8_8(0.5899);
         r += b * Q_8_8(0.1133);
-        
+
         gray = r >> 8;
-        
+
         *palette++ = gray << 10 | gray << 5 | gray;
     }
 }
@@ -874,18 +874,18 @@ void TintPalette_GrayScale2(u16 *palette, u16 count)
         r = *palette & 0x1F;
         g = (*palette >> 5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
-       
+
         r = r * Q_8_8(0.2969);
         r += g * Q_8_8(0.5899);
         r += b * Q_8_8(0.1133);
-        
+
         gray = r >> 8;
-        
+
         if (gray > 0x1F)
             gray = 0x1F;
-        
+
         gray = sRoundedDownGrayscaleMap[gray];
-        
+
         *palette++ = gray << 10 | gray << 5 | gray;
     }
 }
@@ -897,32 +897,35 @@ void TintPalette_SepiaTone(u16 *palette, u16 count)
     int green;
     int blue;
     u32 gray;
-    u8 r2;
-    u8 g2;
-    u8 b2;
-    
+    u32 sepia;
+    s8 r2;
+    s8 g2;
+    s8 b2;
+
     int i;
     for (i = 0; i < count; i++)
     {
-        red = *palette & 0x1F;
-        green = (*palette >> 5) & 0x1F;
-        blue = (*palette >> 10) & 0x1F;
-        
-        gray = red * Q_8_8(0.2969);
-        gray += green * Q_8_8(0.5899);
-        gray += blue * Q_8_8(0.1133);
-        
-        gray = gray / 256;
-        
-        r2 = (gray * 0x133) / 256;
-        
+        r = *palette & 0x1F;
+        g = (*palette >> 5) & 0x1F;
+        b = (*palette >> 10) & 0x1F;
+
+        r *= 0x4C;
+        r += g * 0x97;
+        r += b * 0x1D;
+
+        gray = (s32)(r >> 8);
+
+        sepia = (gray * 0x133);
+
+        r2 = (u16)sepia >> 8;
+
         g2 = gray;
-        
-        b2 = (gray * 0xF);
-        
+
+        b2 = (gray * 15);
+
         if (r2 > 0x1F)
             r2 = 0x1F;
-        
+
         *palette++ = b2 << 10 | g2 << 5 | r2;
     }
 }
@@ -1006,28 +1009,28 @@ void TintPalette_CustomTone(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5)
         r = *palette & 0x1F;
         g = (*palette >> 5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
-        
+
         r *= 0x4C;
         r += g * 0x97;
         r += b * 0x1D;
-        
+
         gray = r >> 8;
-        
+
         r2 = (u16)(gray * a3) >> 8;
-        
+
         g2 = (u16)(gray * a4) >> 8;
-        
+
         b2 = (u16)(gray * a5) >> 8;
-        
+
         if (r2 > 0x1F)
             r2 = 0x1F;
-        
+
         if (g2 > 0x1F)
             g2 = 0x1F;
-        
+
         if (b2 > 0x1F)
             b2 = 0x1F;
-        
+
         *palette++ = b2 << 10 | g2 << 5 | r2;
     }
     return;

src/pokemon_2.c

@@ -1155,7 +1155,7 @@ u8 GetMonsStateToDoubles_2(void)
     s32 aliveCount = 0;
     s32 i;
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
     {
         u32 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL);
         if (species != SPECIES_EGG && species != SPECIES_NONE

src/pokemon_3.c

@@ -11,8 +11,7 @@
 #include "link.h"
 #include "constants/hold_effects.h"
 #include "random.h"
-#include "trainer_classes.h"
-#include "trainer_ids.h"
+#include "constants/trainers.h"
 #include "constants/songs.h"
 #include "sound.h"
 #include "m4a.h"
@@ -22,6 +21,7 @@
 #include "constants/abilities.h"
 #include "pokemon_animation.h"
 #include "pokedex.h"
+#include "pokeblock.h"
 
 extern struct BattlePokemon gBattleMons[4];
 extern struct BattleEnigmaBerry gEnigmaBerries[4];
@@ -59,7 +59,6 @@ extern const u8 gText_PkmnsXPreventsSwitching[];
 extern const struct CompressedSpritePalette gMonPaletteTable[];
 extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
 extern const u16 gHMMoves[];
-extern const s8 gPokeblockFlavorCompatibilityTable[];
 extern const u8 gMonAnimationDelayTable[];
 extern const u8 gMonFrontAnimIdsTable[];
 
@@ -692,9 +691,9 @@ void AdjustFriendship(struct Pokemon *mon, u8 event)
         if ((event != 5 || !(Random() & 1))
          && (event != 3
           || ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
-           && (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_ELITE_FOUR
-            || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_LEADER
-            || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION))))
+           && (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR
+            || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_LEADER
+            || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION))))
         {
             s8 mod = gUnknown_08329ECE[event][friendshipLevel];
             if (mod > 0 && holdEffect == HOLD_EFFECT_HAPPINESS_UP)
@@ -1146,55 +1145,57 @@ void ClearBattleMonForms(void)
 u16 GetBattleBGM(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
-        return 0x1E0;
+        return BGM_BATTLE34;
     if (gBattleTypeFlags & BATTLE_TYPE_REGI)
-        return 0x1DF;
+        return BGM_BATTLE36;
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
-        return 0x1DC;
+        return BGM_BATTLE20;
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
         u8 trainerClass;
+
         if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
             trainerClass = GetFrontierOpponentClass(gTrainerBattleOpponent_A);
         else if (gBattleTypeFlags & BATTLE_TYPE_x4000000)
-            trainerClass = CLASS_EXPERT;
+            trainerClass = TRAINER_CLASS_EXPERT;
         else
             trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
+
         switch (trainerClass)
         {
-        case CLASS_AQUA_LEADER:
-        case CLASS_MAGMA_LEADER:
-            return 0x1E3;
-        case CLASS_TEAM_AQUA:
-        case CLASS_TEAM_MAGMA:
-        case CLASS_AQUA_ADMIN:
-        case CLASS_MAGMA_ADMIN:
-            return 0x1DB;
-        case CLASS_LEADER:
-            return 0x1DD;
-        case CLASS_CHAMPION:
-            return 0x1DE;
-        case CLASS_PKMN_TRAINER_RIVAL:
+        case TRAINER_CLASS_AQUA_LEADER:
+        case TRAINER_CLASS_MAGMA_LEADER:
+            return BGM_BATTLE30;
+        case TRAINER_CLASS_TEAM_AQUA:
+        case TRAINER_CLASS_TEAM_MAGMA:
+        case TRAINER_CLASS_AQUA_ADMIN:
+        case TRAINER_CLASS_MAGMA_ADMIN:
+            return BGM_BATTLE31;
+        case TRAINER_CLASS_LEADER:
+            return BGM_BATTLE32;
+        case TRAINER_CLASS_CHAMPION:
+            return BGM_BATTLE33;
+        case TRAINER_CLASS_PKMN_TRAINER_3:
             if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
-                return 0x1E1;
+                return BGM_BATTLE35;
             if (!StringCompare(gTrainers[gTrainerBattleOpponent_A].trainerName, gText_BattleWallyName))
-                return 0x1DC;
-            return 0x1E1;
-        case CLASS_ELITE_FOUR:
-            return 0x1E2;
-        case CLASS_SALON_MAIDEN:
-        case CLASS_DOME_ACE:
-        case CLASS_PALACE_MAVEN:
-        case CLASS_ARENA_TYCOON:
-        case CLASS_FACTORY_HEAD:
-        case CLASS_PIKE_QUEEN:
-        case CLASS_PYRAMID_KING:
-            return 0x1D7;
+                return BGM_BATTLE20;
+            return BGM_BATTLE35;
+        case TRAINER_CLASS_ELITE_FOUR:
+            return BGM_BATTLE38;
+        case TRAINER_CLASS_SALON_MAIDEN:
+        case TRAINER_CLASS_DOME_ACE:
+        case TRAINER_CLASS_PALACE_MAVEN:
+        case TRAINER_CLASS_ARENA_TYCOON:
+        case TRAINER_CLASS_FACTORY_HEAD:
+        case TRAINER_CLASS_PIKE_QUEEN:
+        case TRAINER_CLASS_PYRAMID_KING:
+            return BGM_BATTLE_FRONTIER_BRAIN;
         default:
-            return 0x1DC;
+            return BGM_BATTLE20;
         }
     }
-    return 0x1DA;
+    return BGM_BATTLE27;
 }
 
 void PlayBattleBGM(void)
@@ -1297,21 +1298,21 @@ bool8 IsPokeSpriteNotFlipped(u16 species)
     return gBaseStats[species].noFlip;
 }
 
-s8 GetMonFlavorRelation(struct Pokemon *mon, u8 a2)
+s8 GetMonFlavorRelation(struct Pokemon *mon, u8 flavor)
 {
     u8 nature = GetNature(mon);
-    return gPokeblockFlavorCompatibilityTable[nature * 5 + a2];
+    return gPokeblockFlavorCompatibilityTable[nature * 5 + flavor];
 }
 
-s8 GetFlavorRelationByPersonality(u32 personality, u8 a2)
+s8 GetFlavorRelationByPersonality(u32 personality, u8 flavor)
 {
     u8 nature = GetNatureFromPersonality(personality);
-    return gPokeblockFlavorCompatibilityTable[nature * 5 + a2];
+    return gPokeblockFlavorCompatibilityTable[nature * 5 + flavor];
 }
 
 bool8 IsTradedMon(struct Pokemon *mon)
 {
-    u8 otName[8];
+    u8 otName[OT_NAME_LENGTH + 1];
     u32 otId;
     GetMonData(mon, MON_DATA_OT_NAME, otName);
     otId = GetMonData(mon, MON_DATA_OT_ID, 0);
@@ -1396,7 +1397,7 @@ static s32 GetWildMonTableIdInAlteringCave(u16 species)
 
 void SetWildMonHeldItem(void)
 {
-    if (!(gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_TRAINER | BATTLE_TYPE_PYRAMID | BATTLE_TYPE_x100000)))
+    if (!(gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_TRAINER | BATTLE_TYPE_PYRAMID | BATTLE_TYPE_PIKE)))
     {
         u16 rnd = Random() % 100;
         u16 species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, 0);
@@ -1462,12 +1463,14 @@ bool8 IsShinyOtIdPersonality(u32 otId, u32 personality)
     return retVal;
 }
 
-const u8* GetTrainerPartnerName(void)
+const u8 *GetTrainerPartnerName(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
     {
         if (gPartnerTrainerId == STEVEN_PARTNER_ID)
-            return gTrainers[TRAINER_ID_STEVEN].trainerName;
+        {
+            return gTrainers[TRAINER_STEVEN].trainerName;
+        }
         else
         {
             GetFrontierTrainerName(gStringVar1, gPartnerTrainerId);
@@ -1682,14 +1685,14 @@ void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality)
     }
 }
 
-const u8* GetTrainerClassNameFromId(u16 trainerId)
+const u8 *GetTrainerClassNameFromId(u16 trainerId)
 {
     if (trainerId > NO_OF_TRAINERS)
         trainerId = 0;
     return gTrainerClassNames[gTrainers[trainerId].trainerClass];
 }
 
-const u8* GetTrainerNameFromId(u16 trainerId)
+const u8 *GetTrainerNameFromId(u16 trainerId)
 {
     if (trainerId > NO_OF_TRAINERS)
         trainerId = 0;

src/pokemon_summary_screen.c

@@ -73,7 +73,7 @@ extern void do_scheduled_bg_tilemap_copies_to_vram(void);
 extern u8 sub_81221EC();
 extern u8 sub_81221AC();
 extern void SetVBlankHBlankCallbacksToNull();
-extern void sub_8121DA0();
+extern void ResetVramOamAndBgCntRegs();
 extern void clear_scheduled_bg_copies_to_vram();
 extern void remove_some_task();
 extern void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable);
@@ -193,7 +193,7 @@ void sub_81C4A88();
 void sub_81C4280();
 void sub_81C0510(u8 taskId);
 void sub_81C171C(u8 taskId);
-void sub_8121E10();
+void ResetAllBgsCoordinates();
 u8 sub_81B205C(struct Pokemon* a);
 void sub_81C1DA4(u16 a, s16 b);
 void sub_81C1EFC(u16 a, s16 b, u16 c);
@@ -450,7 +450,7 @@ bool8 sub_81BFB10(void)
     {
     case 0:
         SetVBlankHBlankCallbacksToNull();
-        sub_8121DA0();
+        ResetVramOamAndBgCntRegs();
         clear_scheduled_bg_copies_to_vram();
         gMain.state++;
         break;
@@ -578,7 +578,7 @@ void sub_81BFE24()
     SetBgTilemapBuffer(1, &gUnknown_0203CF1C->unkTilemap2);
     SetBgTilemapBuffer(2, &gUnknown_0203CF1C->unkTilemap1);
     SetBgTilemapBuffer(3, &gUnknown_0203CF1C->unkTilemap0);
-    sub_8121E10();
+    ResetAllBgsCoordinates();
     schedule_bg_copy_tilemap_to_vram(1);
     schedule_bg_copy_tilemap_to_vram(2);
     schedule_bg_copy_tilemap_to_vram(3);

src/recorded_battle.c

@@ -19,7 +19,7 @@
                               | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_ROAMER | BATTLE_TYPE_EREADER_TRAINER   \
                               | BATTLE_TYPE_KYOGRE_GROUDON | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI           \
                               | BATTLE_TYPE_RECORDED | BATTLE_TYPE_x4000000 | BATTLE_TYPE_SECRET_BASE           \
-                              | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYORGE | BATTLE_TYPE_RAYQUAZA))
+                              | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYOGRE | BATTLE_TYPE_RAYQUAZA))
 
 extern u32 gBattleTypeFlags;
 extern u16 gTrainerBattleOpponent_A;

src/region_map.c

@@ -239,9 +239,9 @@ static const u8 sRegionMapFrameTilemapLZ[] = INCBIN_U8("graphics/pokenav/map_fra
 
 static const u16 Unknown_085A1D48[] = INCBIN_U16("graphics/pokenav/fly_target_icons.gbapal");
 
-static const u8 gUnknown_085A1D68[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz");
+static const u8 sUnknown_085A1D68[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz");
 
-static const u8 gUnknown_085A1E3C[][3] = {
+static const u8 sUnknown_085A1E3C[][3] = {
     {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 1},
     {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), 14},
     {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), 15},
@@ -326,7 +326,7 @@ static const struct SpritePalette gUnknown_085A1F10 = {
     Unknown_085A1D48, 2
 };
 
-static const u16 gUnknown_085A1F18[][2] = {
+static const u16 sUnknown_085A1F18[][2] = {
     {FLAG_UNLOCK_BATTLE_FRONTIER, MAPSEC_BATTLE_FRONTIER},
     {-1, MAPSEC_NONE}
 };
@@ -1738,7 +1738,7 @@ static void sub_8124A70(void)
 {
     struct SpriteSheet sheet;
 
-    LZ77UnCompWram(gUnknown_085A1D68, gUnknown_0203A148->unk_88c);
+    LZ77UnCompWram(sUnknown_085A1D68, gUnknown_0203A148->unk_88c);
     sheet.data = gUnknown_0203A148->unk_88c;
     sheet.size = 0x1c0;
     sheet.tag = 2;
@@ -1806,11 +1806,11 @@ static void sub_8124BE4(void)
     u16 mapSecId;
     u8 spriteId;
 
-    for (i = 0; gUnknown_085A1F18[i][1] != MAPSEC_NONE; i++)
+    for (i = 0; sUnknown_085A1F18[i][1] != MAPSEC_NONE; i++)
     {
-        if (FlagGet(gUnknown_085A1F18[i][0]))
+        if (FlagGet(sUnknown_085A1F18[i][0]))
         {
-            mapSecId = gUnknown_085A1F18[i][1];
+            mapSecId = sUnknown_085A1F18[i][1];
             sub_8124630(mapSecId, &x, &y, &width, &height);
             x = (x + MAPCURSOR_X_MIN) * 8;
             y = (y + MAPCURSOR_Y_MIN) * 8;
@@ -1919,13 +1919,13 @@ static void sub_8124E0C(void)
                             sub_8084CCC(FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && gUnknown_0203A148->regionMap.posWithinMapSec == 0 ? 0x14 : 0x0B);
                             break;
                         default:
-                            if (gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2] != 0)
+                            if (sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2] != 0)
                             {
-                                sub_8084CCC(gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2]);
+                                sub_8084CCC(sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2]);
                             }
                             else
                             {
-                                warp1_set_2(gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][0], gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][1], -1);
+                                warp1_set_2(sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][0], sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][1], -1);
                             }
                             break;
                     }

src/reshow_battle_screen.c

@@ -35,7 +35,7 @@ extern struct SpriteTemplate gUnknown_0202499C;
 extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[];
 
 extern void dp12_8087EA4(void);
-extern void trs_config(void);
+extern void sub_8035658(void);
 extern bool8 IsDoubleBattle(void);
 extern u8 GetSubstituteSpriteDefault_Y(u8 bank);
 extern u8 GetBankSpriteDefault_Y(u8 bank);
@@ -73,7 +73,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
     {
     case 0:
         dp12_8087EA4();
-        trs_config();
+        sub_8035658();
         SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0);
         SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0);
         ShowBg(0);

src/rom_8034C54.c

@@ -1,17 +1,5 @@
-
-// Includes
 #include "global.h"
 
-// Static type declarations
-
-// Static RAM declarations
-
 IWRAM_DATA u32 gUnknown_03000DD4;
 IWRAM_DATA u32 gUnknown_03000DD8;
 IWRAM_DATA u32 gUnknown_03000DDC;
-
-// Static ROM declarations
-
-// .rodata
-
-// .text

src/safari_zone.c

@@ -5,6 +5,7 @@
 #include "main.h"
 #include "battle.h"
 #include "string_util.h"
+#include "pokeblock.h"
 
 struct PokeblockFeeder
 {
@@ -24,7 +25,6 @@ extern u8 EventScript_2A4B8A[];
 extern u8 EventScript_2A4B6F[];
 extern u8 EventScript_2A4B4C[];
 extern u8 EventScript_2A4B9B[];
-extern const u8* const gPokeblockNames[];
 
 extern void sub_80EE44C(u8, u8);
 extern void IncrementGameStat(u8 index);
@@ -105,7 +105,7 @@ void SafariZoneRetirePrompt(void)
     ScriptContext1_SetupScript(EventScript_2A4B6F);
 }
 
-void sub_80FC190(void)
+void CB2_EndSafariBattle(void)
 {
     sSafariZoneFleedMons += gBattleResults.field_1F;
     if (gBattleOutcome == BATTLE_CAUGHT)

src/save_failed_screen.c

@@ -154,8 +154,8 @@ static const u8 sClockFrames[8][3] =
     { 5, 1, 0 },
 };
 
-static const u8 gSaveFailedClockPal[] = INCBIN_U8("graphics/misc/clock_small.gbapal");
-static const u8 gSaveFailedClockGfx[] = INCBIN_U8("graphics/misc/clock_small.4bpp.lz");
+static const u8 sSaveFailedClockPal[] = INCBIN_U8("graphics/misc/clock_small.gbapal");
+static const u8 sSaveFailedClockGfx[] = INCBIN_U8("graphics/misc/clock_small.4bpp.lz");
 
 static void CB2_SaveFailedScreen(void);
 static void CB2_WipeSave(void);
@@ -221,7 +221,7 @@ static void CB2_SaveFailedScreen(void)
             LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM);
             LZ77UnCompVram(gBirchBagTilemap, (void *)(VRAM + 0x7000));
             LZ77UnCompVram(gBirchGrassTilemap, (void *)(VRAM + 0x7800));
-            LZ77UnCompVram(gSaveFailedClockGfx, (void *)(VRAM + 0x10020));
+            LZ77UnCompVram(sSaveFailedClockGfx, (void *)(VRAM + 0x10020));
             ResetBgsAndClearDma3BusyFlags(0);
             InitBgsFromTemplates(0, gUnknown_085EFD88, 3);
             SetBgTilemapBuffer(0, (void *)&gDecompressionBuffer[0x2000]);
@@ -238,7 +238,7 @@ static void CB2_SaveFailedScreen(void)
             ResetTasks();
             ResetPaletteFade();
             LoadPalette(gBirchBagGrassPal, 0, 0x40);
-            LoadPalette(gSaveFailedClockPal, 0x100, 0x20);
+            LoadPalette(sSaveFailedClockPal, 0x100, 0x20);
             LoadPalette(gUnknown_0850FEFC, 0xE0, 0x20);
             LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
             SetWindowBorderStyle(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE);

src/scrcmd.c

@@ -656,7 +656,7 @@ bool8 ScrCmd_fadescreenspeed(struct ScriptContext *ctx)
 bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx)
 {
     u8 mode = ScriptReadByte(ctx);
-    
+
     switch (mode)
     {
         case 1:
@@ -1445,7 +1445,7 @@ bool8 ScrCmd_drawboxtext(struct ScriptContext *ctx)
     u8 top = ScriptReadByte(ctx);
     u8 multichoiceId = ScriptReadByte(ctx);
     u8 ignoreBPress = ScriptReadByte(ctx);
-    
+
     /*if (Multichoice(left, top, multichoiceId, ignoreBPress) == TRUE)
     {
         ScriptContext1_Stop();
@@ -1501,31 +1501,31 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx)
     u8 y;
 
     StringExpandPlaceholders(gStringVar4, ptr + 6);
-    
+
     width = GetStringWidth(6, gStringVar4, -1) / 8;
-    
+
     if (width > 0x1C)
         width = 0x1C;
-    
+
     for (i = 0, height = 4; gStringVar4[i] != 0xFF;)
     {
         if (gStringVar4[i++] == 0xFE)
             height += 3;
     }
-    
+
     if (height > 0x12)
         height = 0x12;
-    
+
     x = width + 2;
     temp1 = (0x1E - x) / 2;
     x = temp1 + 1;
     temp1 = ((x - temp1 - 1) * 8 + 3);
-    
+
     y = height + 2;
     temp2 = (0x14 - y) / 2;
     y = temp2 + 2;
     temp2 = ((y - temp2 - 1) * 8);
-    
+
     sub_8198A50(&template1, 0, x, y, width, height, 0xF, 0x1);
     template2 = template1;
     gUnknown_03000F30 = AddWindow(&template2);
@@ -1924,7 +1924,7 @@ bool8 ScrCmd_hidemoneybox(struct ScriptContext *ctx)
 {
     /*u8 x = ScriptReadByte(ctx);
     u8 y = ScriptReadByte(ctx);*/
-    
+
     HideMoneyBox();
     return FALSE;
 }
@@ -1979,13 +1979,13 @@ bool8 ScrCmd_dotrainerbattle(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_ontrainerbattleend(struct ScriptContext *ctx)
+bool8 ScrCmd_gotopostbattlescript(struct ScriptContext *ctx)
 {
     ctx->scriptPtr = BattleSetup_GetScriptAddrAfterBattle();
     return FALSE;
 }
 
-bool8 ScrCmd_ontrainerbattleendgoto(struct ScriptContext *ctx)
+bool8 ScrCmd_gotobeatenscript(struct ScriptContext *ctx)
 {
     ctx->scriptPtr = BattleSetup_GetTrainerPostBattleScript();
     return FALSE;
@@ -1995,7 +1995,7 @@ bool8 ScrCmd_checktrainerflag(struct ScriptContext *ctx)
 {
     u16 index = VarGet(ScriptReadHalfword(ctx));
 
-    ctx->comparisonResult = HasTrainerAlreadyBeenFought(index);
+    ctx->comparisonResult = HasTrainerBeenFought(index);
     return FALSE;
 }
 
@@ -2003,7 +2003,7 @@ bool8 ScrCmd_settrainerflag(struct ScriptContext *ctx)
 {
     u16 index = VarGet(ScriptReadHalfword(ctx));
 
-    trainer_flag_set(index);
+    SetTrainerFlag(index);
     return FALSE;
 }
 
@@ -2011,7 +2011,7 @@ bool8 ScrCmd_cleartrainerflag(struct ScriptContext *ctx)
 {
     u16 index = VarGet(ScriptReadHalfword(ctx));
 
-    trainer_flag_clear(index);
+    ClearTrainerFlag(index);
     return FALSE;
 }
 
@@ -2089,7 +2089,7 @@ bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_choosecontestpkmn(struct ScriptContext *ctx)
+bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx)
 {
     sub_81B9404();
     ScriptContext1_Stop();
@@ -2332,7 +2332,7 @@ bool8 ScrCmd_mossdeepgym4(struct ScriptContext *ctx)
 
 bool8 ScrCmd_cmdD8(struct ScriptContext *ctx)
 {
-    gSelectedMapObject = sub_80B47BC();
+    gSelectedMapObject = GetCurrentApproachingTrainerMapObjectId();
     return FALSE;
 }
 
@@ -2374,7 +2374,7 @@ bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx)
 bool8 ScrCmd_cmdCF(struct ScriptContext *ctx)
 {
     const u8* v1 = sub_8099244();
-    
+
     if (v1)
     {
         ((u8*)gUnknown_020375C0) = ctx->scriptPtr;

src/secret_base.c

@@ -1082,13 +1082,13 @@ void game_continue(u8 taskId)
         if (sub_80E9878(i))
         {
             sub_80E9780(gUnknown_0203A020->names[count], i);
-            gUnknown_0203A020->items[count].unk_00 = gUnknown_0203A020->names[count];
-            gUnknown_0203A020->items[count].unk_04 = i;
+            gUnknown_0203A020->items[count].name = gUnknown_0203A020->names[count];
+            gUnknown_0203A020->items[count].id = i;
             count ++;
         }
     }
-    gUnknown_0203A020->items[count].unk_00 = gText_Cancel;
-    gUnknown_0203A020->items[count].unk_04 = -2;
+    gUnknown_0203A020->items[count].name = gText_Cancel;
+    gUnknown_0203A020->items[count].id = -2;
     data[0] = count + 1;
     if (data[0] < 8)
     {
@@ -1098,11 +1098,11 @@ void game_continue(u8 taskId)
     {
         data[3] = 8;
     }
-    gUnknown_03006310 = gUnknown_0858D07C;
-    gUnknown_03006310.unk_10 = data[6];
-    gUnknown_03006310.totalItems = data[0];
-    gUnknown_03006310.items = gUnknown_0203A020->items;
-    gUnknown_03006310.maxShowed = data[3];
+    gMultiuseListMenuTemplate = gUnknown_0858D07C;
+    gMultiuseListMenuTemplate.unk_10 = data[6];
+    gMultiuseListMenuTemplate.totalItems = data[0];
+    gMultiuseListMenuTemplate.items = gUnknown_0203A020->items;
+    gMultiuseListMenuTemplate.maxShowed = data[3];
 }
 
 void sub_80E9DEC(u32 a0, bool8 flag, struct ListMenu *menu)
@@ -1119,7 +1119,7 @@ void sub_80E9E00(u8 taskId)
 
     data = gTasks[taskId].data;
     SetStandardWindowBorderStyle(data[6], 0);
-    data[5] = ListMenuInit(&gUnknown_03006310, data[2], data[1]);
+    data[5] = ListMenuInit(&gMultiuseListMenuTemplate, data[2], data[1]);
     sub_80E9E44(taskId);
     schedule_bg_copy_tilemap_to_vram(0);
 }
@@ -1138,8 +1138,8 @@ void sub_80E9E90(u8 taskId)
     s32 input;
 
     data = gTasks[taskId].data;
-    input = ListMenuHandleInput(data[5]);
-    get_coro_args_x18_x1A(data[5], &data[2], &data[1]);
+    input = ListMenuHandleInputGetItemId(data[5]);
+    sub_81AE860(data[5], &data[2], &data[1]);
     switch (input)
     {
         case -1:
@@ -1283,7 +1283,7 @@ u8 sub_80EA20C(u8 secretBaseRecordId)
     return (gSaveBlock1Ptr->secretBases[secretBaseRecordId].trainerId[0] % 5) + (gSaveBlock1Ptr->secretBases[secretBaseRecordId].gender * 5);
 }
 
-const u8 *sub_80EA250(void)
+const u8 *GetSecretBaseTrainerLoseText(void)
 {
     u8 param;
 

src/sprite.c

@@ -240,7 +240,7 @@ static const AffineAnimCmdFunc sAffineAnimCmdFuncs[] =
     AffineAnimCmd_frame,
 };
 
-static const s32 gUnknown_082EC6F4[24] =
+static const s32 sUnknown_082EC6F4[24] =
 {
     8,      8,      0x10,   0x10,   0x20,   0x20,
     0x40,   0x40,   0x10,   8,      0x20,   8,
@@ -1214,14 +1214,14 @@ void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2)
     u8 matrixNum = sprite->oam.matrixNum;
     if (a1 != 0x800)
     {
-        var0 = gUnknown_082EC6F4[sprite->oam.size * 8 + sprite->oam.shape * 32];
+        var0 = sUnknown_082EC6F4[sprite->oam.size * 8 + sprite->oam.shape * 32];
         var1 = var0 << 8;
         var2 = (var0 << 16) / gOamMatrices[matrixNum].a;
         sprite->pos2.x = sub_8007E28(var1, var2, a1);
     }
     if (a2 != 0x800)
     {
-        var0 = gUnknown_082EC6F4[4 + (sprite->oam.size * 8 + sprite->oam.shape * 32)];
+        var0 = sUnknown_082EC6F4[4 + (sprite->oam.size * 8 + sprite->oam.shape * 32)];
         var1 = var0 << 8;
         var2 = (var0 << 16) / gOamMatrices[matrixNum].d;
         sprite->pos2.y = sub_8007E28(var1, var2, a2);
@@ -1247,7 +1247,7 @@ void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2)
 	mov r9, r0\n\
 	cmp r6, r9\n\
 	beq _08007EA2\n\
-	ldr r2, =gUnknown_082EC6F4\n\
+	ldr r2, =sUnknown_082EC6F4\n\
 	lsrs r1, 6\n\
 	lsls r1, 3\n\
 	ldrb r0, [r5, 0x1]\n\
@@ -1272,7 +1272,7 @@ void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2)
 _08007EA2:\n\
 	cmp r8, r9\n\
 	beq _08007EDA\n\
-	ldr r2, =gUnknown_082EC6F4\n\
+	ldr r2, =sUnknown_082EC6F4\n\
 	ldrb r1, [r5, 0x3]\n\
 	lsrs r1, 6\n\
 	lsls r1, 3\n\

src/starter_choose.c

@@ -265,7 +265,7 @@ static void Task_StarterChoose5(u8 taskId)
 {
     u8 spriteId;
 
-    switch (sub_8198C58())
+    switch (ProcessMenuInputNoWrap_())
     {
     case 0:  // YES
         // Return the starter choice and exit.

src/trainer_see.c

@@ -0,0 +1,781 @@
+#include "global.h"
+#include "trainer_see.h"
+#include "battle_setup.h"
+#include "pokemon.h"
+#include "sprite.h"
+#include "field_effect.h"
+#include "field_map_obj.h"
+#include "field_player_avatar.h"
+#include "map_obj_8097404.h"
+#include "pokenav.h"
+#include "task.h"
+#include "util.h"
+#include "script.h"
+#include "event_data.h"
+#include "script_movement.h"
+
+extern bool8 InBattlePyramid(void);
+extern bool32 InTrainerHill(void);
+extern bool8 GetBattlePyramidTrainerFlag(u8 mapObjectId);
+extern bool8 GetTrainerHillTrainerFlag(u8 mapObjectId);
+extern void sub_809BE48(u16 npcId);
+
+// this file's functions
+static u8 CheckTrainer(u8 mapObjectId);
+static u8 GetTrainerApproachDistance(struct MapObject *trainerObj);
+static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction);
+static void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range);
+static void Task_RunTrainerSeeFuncList(u8 taskId);
+static void Task_DestroyTrainerApproachTask(u8 taskId);
+static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum);
+
+static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+
+static bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+
+static void SpriteCB_TrainerIcons(struct Sprite *sprite);
+
+// IWRAM common
+u16 gUnknown_03006080;
+u8 gUnknown_03006084[4];
+struct ApproachingTrainer gApproachingTrainers[2];
+u8 gNoOfApproachingTrainers;
+u8 gUnknown_030060AC;
+
+// EWRAM
+EWRAM_DATA u8 gApproachingTrainerId = 0;
+
+// const rom data
+static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/misc/emotion_exclamation.4bpp");
+static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp");
+static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/misc/emotion_heart.4bpp");
+
+static u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *trainerObj, s16 range, s16 x, s16 y) =
+{
+    GetTrainerApproachDistanceSouth,
+    GetTrainerApproachDistanceNorth,
+    GetTrainerApproachDistanceWest,
+    GetTrainerApproachDistanceEast,
+};
+
+static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) =
+{
+    sub_80B4178,
+	sub_80B417C,
+	sub_80B41C0,
+	sub_80B4200,
+	sub_80B425C,
+	sub_80B4318,
+	sub_80B435C,
+	sub_80B4390,
+	sub_80B43AC,
+	sub_80B43E0,
+	sub_80B4438,
+	sub_80B44AC
+};
+
+static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) =
+{
+    sub_80B43AC,
+    sub_80B43E0,
+    sub_80B4438,
+    sub_80B44AC,
+};
+
+static const struct OamData sOamData_Icons =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const struct SpriteFrameImage sSpriteImageTable_ExclamationQuestionMark[] =
+{
+    {sEmotion_ExclamationMarkGfx, 0x80},
+    {sEmotion_QuestionMarkGfx, 0x80}
+};
+
+static const struct SpriteFrameImage sSpriteImageTable_HeartIcon[] =
+{
+    {sEmotion_HeartGfx, 0x80}
+};
+
+static const union AnimCmd sSpriteAnim_Icons1[] =
+{
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_Icons2[] =
+{
+    ANIMCMD_FRAME(1, 60),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_Icons[] =
+{
+    sSpriteAnim_Icons1,
+    sSpriteAnim_Icons2
+};
+
+static const struct SpriteTemplate sSpriteTemplate_ExclamationQuestionMark =
+{
+    .tileTag = 0xffff,
+    .paletteTag = 0xffff,
+    .oam = &sOamData_Icons,
+    .anims = sSpriteAnimTable_Icons,
+    .images = sSpriteImageTable_ExclamationQuestionMark,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_TrainerIcons
+};
+
+static const struct SpriteTemplate sSpriteTemplate_HeartIcon =
+{
+    .tileTag = 0xffff,
+    .paletteTag = 0x1004,
+    .oam = &sOamData_Icons,
+    .anims = sSpriteAnimTable_Icons,
+    .images = sSpriteImageTable_HeartIcon,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_TrainerIcons
+};
+
+// code
+bool8 CheckForTrainersWantingBattle(void)
+{
+    u8 i;
+
+    gNoOfApproachingTrainers = 0;
+    gApproachingTrainerId = 0;
+
+    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
+    {
+        u8 retVal;
+
+        if (!gMapObjects[i].active)
+            continue;
+        if (gMapObjects[i].trainerType != 1 && gMapObjects[i].trainerType != 3)
+            continue;
+
+        retVal = CheckTrainer(i);
+        if (retVal == 2)
+            break; // two trainers have been found
+
+        if (retVal == 0) // no trainers
+            continue;
+
+        if (gNoOfApproachingTrainers > 1)
+            break;
+        if (GetMonsStateToDoubles_2() != 0) // one trainer found and cant have a double battle
+            break;
+    }
+
+    if (gNoOfApproachingTrainers == 1)
+    {
+        ResetTrainerOpponentIds();
+        ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].mapObjectId,
+                                          gApproachingTrainers[gNoOfApproachingTrainers - 1].trainerScriptPtr);
+        gUnknown_030060AC = 1;
+        return TRUE;
+    }
+    else if (gNoOfApproachingTrainers == 2)
+    {
+        ResetTrainerOpponentIds();
+        for (i = 0; i < gNoOfApproachingTrainers; i++, gApproachingTrainerId++)
+        {
+            ConfigureTwoTrainersBattle(gApproachingTrainers[i].mapObjectId,
+                                       gApproachingTrainers[i].trainerScriptPtr);
+        }
+        SetUpTwoTrainersBattle();
+        gApproachingTrainerId = 0;
+        gUnknown_030060AC = 1;
+        return TRUE;
+    }
+    else
+    {
+        gUnknown_030060AC = 0;
+        return FALSE;
+    }
+}
+
+static u8 CheckTrainer(u8 mapObjectId)
+{
+    const u8 *scriptPtr;
+    u8 ret = 1;
+    u8 approachDistance;
+
+    if (InTrainerHill() == TRUE)
+        scriptPtr = sub_81D62AC();
+    else
+        scriptPtr = GetFieldObjectScriptPointerByFieldObjectId(mapObjectId);
+
+    if (InBattlePyramid())
+    {
+        if (GetBattlePyramidTrainerFlag(mapObjectId))
+            return 0;
+    }
+    else if (InTrainerHill() == TRUE)
+    {
+        if (GetTrainerHillTrainerFlag(mapObjectId))
+            return 0;
+    }
+    else
+    {
+        if (GetTrainerFlagFromScriptPointer(scriptPtr))
+            return 0;
+    }
+
+    approachDistance = GetTrainerApproachDistance(&gMapObjects[mapObjectId]);
+
+    if (approachDistance != 0)
+    {
+        if (scriptPtr[1] == TRAINER_BATTLE_DOUBLE
+            || scriptPtr[1] == TRAINER_BATTLE_REMATCH_DOUBLE
+            || scriptPtr[1] == TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE)
+        {
+            if (GetMonsStateToDoubles_2() != 0)
+                return 0;
+
+            ret = 2;
+        }
+
+        gApproachingTrainers[gNoOfApproachingTrainers].mapObjectId = mapObjectId;
+        gApproachingTrainers[gNoOfApproachingTrainers].trainerScriptPtr = scriptPtr;
+        gApproachingTrainers[gNoOfApproachingTrainers].radius = approachDistance;
+        TrainerApproachPlayer(&gMapObjects[mapObjectId], approachDistance - 1);
+        gNoOfApproachingTrainers++;
+
+        return ret;
+    }
+
+    return 0;
+}
+
+static u8 GetTrainerApproachDistance(struct MapObject *trainerObj)
+{
+    s16 x, y;
+    u8 i;
+    u8 approachDistance;
+
+    PlayerGetDestCoords(&x, &y);
+    if (trainerObj->trainerType == 1)  // can only see in one direction
+    {
+        approachDistance = sDirectionalApproachDistanceFuncs[trainerObj->mapobj_unk_18 - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
+        return CheckPathBetweenTrainerAndPlayer(trainerObj, approachDistance, trainerObj->mapobj_unk_18);
+    }
+    else  // can see in all directions
+    {
+        for (i = 0; i < 4; i++)
+        {
+            approachDistance = sDirectionalApproachDistanceFuncs[i](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
+            if (CheckPathBetweenTrainerAndPlayer(trainerObj, approachDistance, i + 1)) // directions are 1-4 instead of 0-3. south north west east
+                return approachDistance;
+        }
+    }
+
+    return 0;
+}
+
+// Returns how far south the player is from trainer. 0 if out of trainer's sight.
+static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+{
+    if (trainerObj->coords2.x == x
+     && y > trainerObj->coords2.y
+     && y <= trainerObj->coords2.y + range)
+        return (y - trainerObj->coords2.y);
+    else
+        return 0;
+}
+
+// Returns how far north the player is from trainer. 0 if out of trainer's sight.
+static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+{
+    if (trainerObj->coords2.x == x
+     && y < trainerObj->coords2.y
+     && y >= trainerObj->coords2.y - range)
+        return (trainerObj->coords2.y - y);
+    else
+        return 0;
+}
+
+// Returns how far west the player is from trainer. 0 if out of trainer's sight.
+static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+{
+    if (trainerObj->coords2.y == y
+     && x < trainerObj->coords2.x
+     && x >= trainerObj->coords2.x - range)
+        return (trainerObj->coords2.x - x);
+    else
+        return 0;
+}
+
+// Returns how far east the player is from trainer. 0 if out of trainer's sight.
+static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+{
+    if (trainerObj->coords2.y == y
+     && x > trainerObj->coords2.x
+     && x <= trainerObj->coords2.x + range)
+        return (x - trainerObj->coords2.x);
+    else
+        return 0;
+}
+
+#define COLLISION_MASK (~1)
+
+static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction)
+{
+    s16 x, y;
+    u8 unk19_temp;
+    u8 unk19b_temp;
+    u8 i;
+    u8 collision;
+
+    if (approachDistance == 0)
+        return 0;
+
+    x = trainerObj->coords2.x;
+    y = trainerObj->coords2.y;
+
+    MoveCoords(direction, &x, &y);
+    for (i = 0; i < approachDistance - 1; i++, MoveCoords(direction, &x, &y))
+    {
+        collision = sub_8092C8C(trainerObj, x, y, direction);
+        if (collision != 0 && (collision & COLLISION_MASK))
+            return 0;
+    }
+
+    // preserve mapobj_unk_19 before clearing.
+    unk19_temp = trainerObj->range.as_nybbles.x;
+    unk19b_temp = trainerObj->range.as_nybbles.y;
+    trainerObj->range.as_nybbles.x = 0;
+    trainerObj->range.as_nybbles.y = 0;
+
+    collision = npc_block_way(trainerObj, x, y, direction);
+
+    trainerObj->range.as_nybbles.x = unk19_temp;
+    trainerObj->range.as_nybbles.y = unk19b_temp;
+    if (collision == 4)
+        return approachDistance;
+
+    return 0;
+}
+
+#define tFuncId             data[0]
+#define tTrainerRange       data[3]
+#define tOutOfAshSpriteId   data[4]
+#define tTrainerMapObjectId data[7]
+
+static void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range)
+{
+    struct Task *task;
+
+    gApproachingTrainers[gNoOfApproachingTrainers].taskId = CreateTask(Task_RunTrainerSeeFuncList, 0x50);
+    task = &gTasks[gApproachingTrainers[gNoOfApproachingTrainers].taskId];
+    task->tTrainerRange = range;
+    task->tTrainerMapObjectId = gApproachingTrainers[gNoOfApproachingTrainers].mapObjectId;
+}
+
+static void sub_80B40C8(TaskFunc followupFunc)
+{
+    u8 taskId;
+    TaskFunc taskFunc;
+
+    if (gApproachingTrainerId == 0)
+        taskId = gApproachingTrainers[0].taskId;
+    else
+        taskId = gApproachingTrainers[1].taskId;
+
+    taskFunc = Task_RunTrainerSeeFuncList;
+    SetTaskFuncWithFollowupFunc(taskId, taskFunc, followupFunc);
+    gTasks[taskId].tFuncId = 1;
+    taskFunc(taskId);
+}
+
+static void Task_RunTrainerSeeFuncList(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    struct MapObject *trainerObj = &gMapObjects[task->tTrainerMapObjectId];
+
+    if (!trainerObj->active)
+    {
+        SwitchTaskToFollowupFunc(taskId);
+    }
+    else
+    {
+        while (sTrainerSeeFuncList[task->tFuncId](taskId, task, trainerObj));
+    }
+}
+
+static bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    return FALSE;
+}
+
+static bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    u8 direction;
+
+    FieldObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
+    direction = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18);
+    FieldObjectSetSpecialAnim(trainerObj, direction);
+    task->tFuncId++;
+    return TRUE;
+}
+
+static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON_1))
+    {
+        return FALSE;
+    }
+    else
+    {
+        task->tFuncId++;
+        if (trainerObj->animPattern == 57 || trainerObj->animPattern == 58)
+            task->tFuncId = 6;
+        if (trainerObj->animPattern == 63)
+            task->tFuncId = 8;
+        return TRUE;
+    }
+}
+
+static bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (!(FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    {
+        if (task->tTrainerRange)
+        {
+            FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->mapobj_unk_18));
+            task->tTrainerRange--;
+        }
+        else
+        {
+            FieldObjectSetSpecialAnim(trainerObj, 0x3E);
+            task->tFuncId++;
+        }
+    }
+    return FALSE;
+}
+
+static bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    struct MapObject *playerObj;
+
+    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+        return FALSE;
+
+    npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18));
+    sub_808F23C(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18));
+    sub_808F208(trainerObj);
+
+    playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+        return FALSE;
+
+    sub_808BCE8();
+    FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18)));
+    task->tFuncId++;
+    return FALSE;
+}
+
+static bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj)
+     || FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+        SwitchTaskToFollowupFunc(taskId);
+    return FALSE;
+}
+
+static bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
+     || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    {
+        FieldObjectSetSpecialAnim(trainerObj, 0x59);
+        task->tFuncId++;
+    }
+    return FALSE;
+}
+
+static bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+        task->tFuncId = 3;
+
+    return FALSE;
+}
+
+static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
+     || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    {
+        FieldObjectSetSpecialAnim(trainerObj, 0x3E);
+        task->tFuncId++;
+    }
+    return FALSE;
+}
+
+static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj))
+    {
+        gFieldEffectArguments[0] = trainerObj->coords2.x;
+        gFieldEffectArguments[1] = trainerObj->coords2.y;
+        gFieldEffectArguments[2] = gSprites[trainerObj->spriteId].subpriority - 1;
+        gFieldEffectArguments[3] = 2;
+        task->tOutOfAshSpriteId = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
+        task->tFuncId++;
+    }
+    return FALSE;
+}
+
+static bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    struct Sprite *sprite;
+
+    if (gSprites[task->tOutOfAshSpriteId].animCmdIndex == 2)
+    {
+        trainerObj->mapobj_bit_26 = 0;
+        trainerObj->mapobj_bit_2 = 1;
+
+        sprite = &gSprites[trainerObj->spriteId];
+        sprite->oam.priority = 2;
+        FieldObjectClearAnimIfSpecialAnimFinished(trainerObj);
+        FieldObjectSetSpecialAnim(trainerObj, sub_80934BC(trainerObj->mapobj_unk_18));
+        task->tFuncId++;
+    }
+
+    return FALSE;
+}
+
+static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
+        task->tFuncId = 3;
+
+    return FALSE;
+}
+
+#undef tFuncId
+#undef tTrainerRange
+#undef tOutOfAshSpriteId
+#undef tTrainerMapObjectId
+
+static void sub_80B44C8(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    struct MapObject *mapObj;
+
+    // another mapObj loaded into by loadword?
+    LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&mapObj);
+    if (!task->data[7])
+    {
+        FieldObjectClearAnim(mapObj);
+        task->data[7]++;
+    }
+    sTrainerSeeFuncList2[task->data[0]](taskId, task, mapObj);
+    if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
+    {
+        npc_set_running_behaviour_etc(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18));
+        sub_808F23C(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18));
+        DestroyTask(taskId);
+    }
+    else
+    {
+        mapObj->mapobj_bit_7 = 0;
+    }
+}
+
+void sub_80B4578(struct MapObject *var)
+{
+    StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var);
+}
+
+void EndTrainerApproach(void)
+{
+    sub_80B40C8(Task_DestroyTrainerApproachTask);
+}
+
+static void Task_DestroyTrainerApproachTask(u8 taskId)
+{
+    DestroyTask(taskId);
+    EnableBothScriptContexts();
+}
+
+void sub_80B45D0(void)
+{
+    if (gNoOfApproachingTrainers == 2)
+    {
+        if (gApproachingTrainerId == 0)
+        {
+            gApproachingTrainerId++;
+            gSpecialVar_Result = 1;
+            UnfreezeMapObjects();
+            sub_80974D0(gApproachingTrainers[1].mapObjectId);
+        }
+        else
+        {
+            gApproachingTrainerId = 0;
+            gSpecialVar_Result = 0;
+        }
+    }
+    else
+    {
+        gSpecialVar_Result = 0;
+    }
+}
+
+#define sLocalId    data[0]
+#define sMapNum     data[1]
+#define sMapGroup   data[2]
+#define sData3      data[3]
+#define sData4      data[4]
+#define sFldEffId   data[7]
+
+u8 FldEff_ExclamationMarkIcon1(void)
+{
+    u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x53);
+
+    if (spriteId != MAX_SPRITES)
+        SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON_1, 0);
+
+    return 0;
+}
+
+u8 FldEff_ExclamationMarkIcon2(void)
+{
+    u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x52);
+
+    if (spriteId != MAX_SPRITES)
+        SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON_2, 1);
+
+    return 0;
+}
+
+u8 FldEff_HeartIcon(void)
+{
+    u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_HeartIcon, 0, 0, 0x52);
+
+    if (spriteId != MAX_SPRITES)
+    {
+        struct Sprite *sprite = &gSprites[spriteId];
+
+        SetIconSpriteData(sprite, FLDEFF_HEART_ICON, 0);
+        sprite->oam.paletteNum = 2;
+    }
+
+    return 0;
+}
+
+static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum)
+{
+    sprite->oam.priority = 1;
+    sprite->coordOffsetEnabled = 1;
+
+    sprite->sLocalId = gFieldEffectArguments[0];
+    sprite->sMapNum = gFieldEffectArguments[1];
+    sprite->sMapGroup = gFieldEffectArguments[2];
+    sprite->sData3 = -5;
+    sprite->sFldEffId = fldEffId;
+
+    StartSpriteAnim(sprite, spriteAnimNum);
+}
+
+static void SpriteCB_TrainerIcons(struct Sprite *sprite)
+{
+    u8 mapObjId;
+
+    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &mapObjId)
+     || sprite->animEnded)
+    {
+        FieldEffectStop(sprite, sprite->sFldEffId);
+    }
+    else
+    {
+        struct Sprite *mapObjSprite = &gSprites[gMapObjects[mapObjId].spriteId];
+        sprite->sData4 += sprite->sData3;
+        sprite->pos1.x = mapObjSprite->pos1.x;
+        sprite->pos1.y = mapObjSprite->pos1.y - 16;
+        sprite->pos2.x = mapObjSprite->pos2.x;
+        sprite->pos2.y = mapObjSprite->pos2.y + sprite->sData4;
+        if (sprite->sData4)
+            sprite->sData3++;
+        else
+            sprite->sData3 = 0;
+    }
+}
+
+#undef sLocalId
+#undef sMapNum
+#undef sMapGroup
+#undef sData3
+#undef sData4
+#undef sFldEffId
+
+u8 GetCurrentApproachingTrainerMapObjectId(void)
+{
+    if (gApproachingTrainerId == 0)
+        return gApproachingTrainers[0].mapObjectId;
+    else
+        return gApproachingTrainers[1].mapObjectId;
+}
+
+u8 GetChosenApproachingTrainerMapObjectId(u8 arrayId)
+{
+    if (arrayId >= ARRAY_COUNT(gApproachingTrainers))
+        return 0;
+    else if (arrayId == 0)
+        return gApproachingTrainers[0].mapObjectId;
+    else
+        return gApproachingTrainers[1].mapObjectId;
+}
+
+void sub_80B4808(void)
+{
+    struct MapObject *trainerObj;
+
+    if (gUnknown_030060AC == 1)
+    {
+        trainerObj = &gMapObjects[gApproachingTrainers[gUnknown_03006080].mapObjectId];
+        gUnknown_03006084[0] = GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18));
+        gUnknown_03006084[1] = 0xFE;
+        ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084);
+    }
+    else
+    {
+        trainerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+        gUnknown_03006084[0] = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18);
+        gUnknown_03006084[1] = 0xFE;
+        ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084);
+    }
+
+    sub_809BE48(0xFF);
+}

src/tv.c

@@ -1793,7 +1793,7 @@ void EndMassOutbreak(void)
     gSaveBlock1Ptr->outbreakDaysLeft = 0;
 }
 
-void sub_80ED888(u16 days)
+void UpdateTVShowsPerDay(u16 days)
 {
 
     sub_80ED8B4(days);

src/unk_text_util_2.c

@@ -4,8 +4,8 @@
 #include "text.h"
 #include "sound.h"
 
-static const u8 gUnknown_08616124[] = {1, 2, 4};
-static const u16 gFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont");
+static const u8 sUnknown_08616124[] = {1, 2, 4};
+static const u16 sFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont");
 
 static void DecompressGlyphFont6(u16);
 
@@ -13,7 +13,7 @@ u16 Font6Func(struct TextPrinter *textPrinter)
 {
     u16 char_;
     struct TextPrinterSubStruct *sub;
-    
+
     sub = &textPrinter->sub_union.sub;
     switch (textPrinter->state)
     {
@@ -163,15 +163,15 @@ u16 Font6Func(struct TextPrinter *textPrinter)
         case 4:
             if (textPrinter->scrollDistance)
             {
-                if (textPrinter->scrollDistance < gUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed])
+                if (textPrinter->scrollDistance < sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed])
                 {
                     ScrollWindow(textPrinter->subPrinter.windowId, 0, textPrinter->scrollDistance, textPrinter->subPrinter.bgColor | (textPrinter->subPrinter.bgColor << 4));
                     textPrinter->scrollDistance = 0;
                 }
                 else
                 {
-                    ScrollWindow(textPrinter->subPrinter.windowId, 0, gUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed], textPrinter->subPrinter.bgColor | (textPrinter->subPrinter.bgColor << 4));
-                    textPrinter->scrollDistance -= gUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed];
+                    ScrollWindow(textPrinter->subPrinter.windowId, 0, sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed], textPrinter->subPrinter.bgColor | (textPrinter->subPrinter.bgColor << 4));
+                    textPrinter->scrollDistance -= sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed];
                 }
                 CopyWindowToVram(textPrinter->subPrinter.windowId, 2);
             }
@@ -204,7 +204,7 @@ static void DecompressGlyphFont6(u16 glyph)
 {
     const u16 *glyphs;
 
-    glyphs = gFont6BrailleGlyphs + 0x100 * (glyph / 8) + 0x10 * (glyph % 8);
+    glyphs = sFont6BrailleGlyphs + 0x100 * (glyph / 8) + 0x10 * (glyph % 8);
     DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90);
     DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90 + 0x20));
     DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90 + 0x40));

src/use_pokeblock.c

@@ -0,0 +1,230 @@
+#include "global.h"
+#include "main.h"
+#include "pokeblock.h"
+#include "malloc.h"
+#include "palette.h"
+#include "pokenav.h"
+#include "unknown_task.h"
+#include "text.h"
+#include "bg.h"
+#include "window.h"
+#include "text_window.h"
+
+struct UsePokeblockSubStruct
+{
+    void (*field_0)(void);
+    void (*callback)(void);
+    struct Pokeblock *pokeblock;
+    struct Pokemon *pokemon;
+    u8 stringBuffer[0x40];
+    u8 field_50;
+    u8 field_51;
+    u8 field_52;
+    u8 field_53;
+    u8 field_54;
+    u8 field_55;
+    u8 field_56;
+    u8 field_57[5];
+    u8 field_5c[5];
+    u8 field_61[5];
+    s16 field_66[5];
+};
+
+struct UsePokeblockStruct
+{
+    u8 field_0[0x7C58];
+    u8 field_7C58[0x378];
+    struct UsePokeblockSubStruct info;
+};
+
+extern u16 gKeyRepeatStartDelay;
+
+// this file's functions
+void sub_816636C(void (*func)(void));
+void sub_8166380(void);
+void sub_816631C(void);
+void sub_81662C0(void);
+void sub_8166564(void);
+void sub_8166304(void);
+void sub_81668F8(void);
+void sub_8167420(void);
+void sub_8167760(void);
+u8 sub_81672E4(u8 arg0);
+bool8 sub_8168328(void);
+bool8 sub_8167930(void);
+void sub_8167608(u8 arg0);
+void sub_8167BA0(u16 arg0, u8 copyToVramMode);
+
+extern const struct BgTemplate gUnknown_085DFCCC[4];
+extern const struct WindowTemplate gUnknown_085DFCDC[];
+
+// ram variables
+EWRAM_DATA struct UsePokeblockSubStruct *gUnknown_0203BC90 = NULL;
+EWRAM_DATA void (*gUnknown_0203BC94)(void) = NULL;
+EWRAM_DATA struct Pokeblock *gUnknown_0203BC98 = NULL;
+EWRAM_DATA u8 gPokeblockMonId = 0;
+EWRAM_DATA s16 gPokeblockGain = 0;
+EWRAM_DATA void *gUnknown_0203BCA0 = NULL;
+EWRAM_DATA void *gUnknown_0203BCA4 = NULL;
+EWRAM_DATA void *gUnknown_0203BCA8 = NULL;
+EWRAM_DATA struct UsePokeblockStruct *gUnknown_0203BCAC = NULL;
+
+// const rom data
+// todo: make it static once the file is decompiled
+
+// code
+void ChooseMonToGivePokeblock(struct Pokeblock *pokeblock, void (*callback)(void))
+{
+    gUnknown_0203BCAC = AllocZeroed(0x806C);
+    gUnknown_0203BC90 = &gUnknown_0203BCAC->info;
+    gUnknown_0203BC90->pokeblock = pokeblock;
+    gUnknown_0203BC90->callback = callback;
+    sub_816636C(sub_8166380);
+    SetMainCallback2(sub_816631C);
+}
+
+void CB2_ReturnAndChooseMonToGivePokeblock(void)
+{
+    gUnknown_0203BCAC = AllocZeroed(0x806C);
+    gUnknown_0203BC90 = &gUnknown_0203BCAC->info;
+    gUnknown_0203BC90->pokeblock = gUnknown_0203BC98;
+    gUnknown_0203BC90->callback = gUnknown_0203BC94;
+    gPokeblockMonId = sub_81672E4(gPokeblockMonId);
+    gUnknown_0203BC90->field_56 = gPokeblockMonId < 4 ? 0 : 1;
+    sub_816636C(sub_8166380);
+    SetMainCallback2(sub_81662C0);
+}
+
+void sub_81662C0(void)
+{
+    gUnknown_0203BC90->field_0();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+    if (gUnknown_0203BC90->field_0 == sub_8166564)
+    {
+        gUnknown_0203BC90->field_50 = 0;
+        SetMainCallback2(sub_8166304);
+    }
+}
+
+void sub_8166304(void)
+{
+    sub_81668F8();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+void sub_816631C(void)
+{
+    gUnknown_0203BC90->field_0();
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+}
+
+void sub_8166340(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    sub_81D2108(gUnknown_0203BCAC->field_7C58);
+    sub_80BA0A8();
+}
+
+void sub_816636C(void (*func)(void))
+{
+    gUnknown_0203BC90->field_0 = func;
+    gUnknown_0203BC90->field_50 = 0;
+}
+
+void sub_8166380(void)
+{
+    switch (gUnknown_0203BC90->field_50)
+    {
+        case 0:
+            gUnknown_0203BCAC->field_0[0x7B10] = 0xFF;
+            sub_81D1ED4(gUnknown_0203BCAC->field_7C58);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 1:
+            ResetSpriteData();
+            FreeAllSpritePalettes();
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 2:
+            SetVBlankCallback(NULL);
+            CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 3:
+            ResetBgsAndClearDma3BusyFlags(0);
+            InitBgsFromTemplates(0, gUnknown_085DFCCC, ARRAY_COUNT(gUnknown_085DFCCC));
+            InitWindows(gUnknown_085DFCDC);
+            DeactivateAllTextPrinters();
+            sub_809882C(0, 0x97, 0xE0);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 4:
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 5:
+            if (!sub_8168328())
+            {
+                gUnknown_0203BC90->field_50++;
+            }
+            break;
+        case 6:
+            gKeyRepeatStartDelay = 20;
+            sub_8167420();
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 7:
+            if (!sub_8167930())
+            {
+                gUnknown_0203BC90->field_50++;
+            }
+            break;
+        case 8:
+            sub_8167608(0);
+            sub_8167760();
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 9:
+            if (!sub_81D312C(&gUnknown_0203BCAC->field_0[0x7B0E]))
+            {
+                gUnknown_0203BC90->field_50++;
+            }
+            break;
+        case 10:
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 11:
+            sub_81D2754(gUnknown_0203BCAC->field_7C58, &gUnknown_0203BCAC->field_0[0x7C6C]);
+            sub_81D20AC(gUnknown_0203BCAC->field_7C58);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 12:
+            if (!sub_81D20BC(gUnknown_0203BCAC->field_7C58))
+            {
+                sub_81D1F84(gUnknown_0203BCAC->field_7C58, &gUnknown_0203BCAC->field_7C58[0x14], &gUnknown_0203BCAC->field_7C58[0x14]);
+                gUnknown_0203BC90->field_50++;
+            }
+            break;
+        case 13:
+            sub_81D2230(gUnknown_0203BCAC->field_7C58);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 14:
+            PutWindowTilemap(0);
+            PutWindowTilemap(1);
+            sub_8167BA0(0, 1);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 15:
+            sub_816636C(sub_8166564);
+            break;
+    }
+}