Port function/file names from pokeemerald

7 files changed, 49 insertions, 53 deletions

diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 705809a21..2d5b3c420 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -75,7 +75,7 @@ extern void sub_802BBD4();
 extern struct SpriteTemplate gUnknown_02024E8C;
 extern const u8 Str_821F7B8[];
 extern u8 gUnknown_02023A14_50;
-extern const u16 gUnknown_08D004E0[];
+extern const u16 gBattleTextboxPalette[];
 extern const struct MonCoords gCastformFrontSpriteCoords[];
 extern const u8 Str_821F7EA[];
 extern const u8 gUnknown_Debug_821F7F3[];
@@ -269,10 +269,10 @@ void InitBattle(void)
     Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowTemplate_81E71D0);
     Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowTemplate_81E71EC);
     sub_800D6D4();
-    sub_800DAB8();
+    LoadBattleTextboxAndBackground();
     ResetSpriteData();
     ResetTasks();
-    sub_800E23C();
+    LoadBattleEntryBackground();
     FreeAllSpritePalettes();
     gReservedSpritePaletteCount = 4;
     SetVBlankCallback(sub_800FCFC);
@@ -1307,11 +1307,11 @@ void c2_8011A1C(void)
     Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowTemplate_81E71D0);
     Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowTemplate_81E71EC);
     sub_800D6D4();
-    LoadCompressedPalette(gUnknown_08D004E0, 0, 64);
-    sub_800D74C();
+    LoadCompressedPalette(gBattleTextboxPalette, 0, 64);
+    ApplyPlayerChosenFrameToBattleMenu();
     ResetSpriteData();
     ResetTasks();
-    sub_800E23C();
+    LoadBattleEntryBackground();
     REG_WINOUT = 0x37;
     FreeAllSpritePalettes();
     gReservedSpritePaletteCount = 4;
@@ -2831,7 +2831,7 @@ void debug_sub_8012688(void)
 	gBattle_BG3_Y = 0;
 	gBattleTerrain = 9;
 	sub_800D6D4();
-	sub_800DAB8();
+	LoadBattleTextboxAndBackground();
 	ResetSpriteData();
 	ResetTasks();
 	FreeAllSpritePalettes();
diff --git a/src/rom_800D42C.c b/src/battle/battle_bg.c
index 6825a8c89..b1e2ea83b 100644
--- a/src/rom_800D42C.c
+++ b/src/battle/battle_bg.c
@@ -29,9 +29,9 @@ extern void sub_8032A38(void);
 //extern u8 GetCurrentMapBattleScene(void);
 
 extern const u8 gGameVersion;
-extern u8 gUnknown_08D00000[];
-extern u16 gUnknown_08D00524[];
-extern u16 gUnknown_08D004E0[];
+extern u8 gBattleTextboxTiles[];
+extern u16 gBattleTextboxTilemap[];
+extern u16 gBattleTextboxPalette[];
 extern u16 gBattleTypeFlags;
 extern struct Trainer gTrainers[];
 extern u16 gTrainerBattleOpponent;
@@ -86,7 +86,6 @@ extern u16 gBattle_BG2_Y;
 extern struct CompressedSpriteSheet gUnknown_081F95A4;
 
 extern u8 sav1_map_get_battletype(void);
-extern void sub_800D74C(void);
 
 struct LinkResultWindow {
     struct Window *window;
@@ -144,8 +143,7 @@ void sub_800D6D4(void)
     REG_DISPCNT = 0xbf40;
 }
 
-// ApplyPlayerChosenFrameToBattleMenu
-void sub_800D74C(void)
+void ApplyPlayerChosenFrameToBattleMenu(void)
 {
     TextWindow_SetBaseTileNum(0x12);
     TextWindow_LoadStdFrameGraphicsOverridePal(&gUnknown_03004210, 1);
@@ -254,14 +252,12 @@ void DrawMainBattleBackground(void)
     }
 }
 
-
-
-void sub_800DAB8(void)
+void LoadBattleTextboxAndBackground(void)
 {
-    LZDecompressVram(gUnknown_08D00000, (void *)0x6000000);
-    CpuSet(gUnknown_08D00524, (void *)0x600c000, 0x800);
-    LoadCompressedPalette(gUnknown_08D004E0, 0, 0x40);
-    sub_800D74C();
+    LZDecompressVram(gBattleTextboxTiles, (void*)(BG_VRAM));
+    CpuSet(gBattleTextboxTilemap, (void *)0x600c000, 0x800);
+    LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40);
+    ApplyPlayerChosenFrameToBattleMenu();
     DrawMainBattleBackground();
 }
 
@@ -526,7 +522,7 @@ void sub_800DE30(u8 taskId)
     }
 }
 
-void sub_800E23C(void) {
+void LoadBattleEntryBackground(void) {
     if (gBattleTypeFlags & BATTLE_TYPE_LINK) {
         LZDecompressVram(gVersusFrameGfx, (void *)0x6004000);
         LZDecompressVram(gVersusFrameTilemap, (void *)0x600e000);
@@ -574,17 +570,17 @@ void sub_800E23C(void) {
     LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void *)0x600e000);
 }
 
-int sub_800E414(u8 type) {
+int LoadChosenBattleElement(u8 type) {
     int ret = 0;
     switch (type) {
     case 0:
-        LZDecompressVram(&gUnknown_08D00000, (void *)0x6000000);
+        LZDecompressVram(&gBattleTextboxTiles, (void *)0x6000000);
         break;
     case 1:
-        CpuCopy16(gUnknown_08D00524, (void *)0x600c000, 0x1000);
+        CpuCopy16(gBattleTextboxTilemap, (void *)0x600c000, 0x1000);
         break;
     case 2:
-        LoadCompressedPalette(gUnknown_08D004E0, 0, 0x40);
+        LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40);
         break;
     case 3: // tiles
         if (!(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK))) {
@@ -748,7 +744,7 @@ int sub_800E414(u8 type) {
             break;
         }
     case 6:
-        sub_800D74C();
+        ApplyPlayerChosenFrameToBattleMenu();
         break;
     default:
         ret = 1;
diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c
index 0da29441e..85aa78ca0 100644
--- a/src/battle/reshow_battle_screen.c
+++ b/src/battle/reshow_battle_screen.c
@@ -29,7 +29,7 @@ extern u8 gBankSpriteIds[4];
 extern u8 gBattleMonForms[4];
 extern u8 gHealthboxIDs[4];
 
-bool8 sub_800E414(u8 a0);
+bool8 LoadChosenBattleElement(u8 a0);
 bool8 sub_8031C30(u8 a0);
 void sub_8031EE8(void);
 void sub_80327CC(void);
@@ -97,7 +97,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
         }
         break;
     case 2:
-        if (!sub_800E414(gHelperState))
+        if (!LoadChosenBattleElement(gHelperState))
         {
             gHelperState++;
             gReshowState--;
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 282ad31fb..5bba69f86 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -40,9 +40,9 @@ struct EggHatchData
 
 struct EggHatchData* gEggHatchData;
 
-extern const u32 gUnknown_08D00000[];
-extern const u32 gUnknown_08D00524[];
-extern const u16 gUnknown_08D004E0[]; //palette
+extern const u32 gBattleTextboxTiles[];
+extern const u32 gBattleTextboxTilemap[];
+extern const u16 gBattleTextboxPalette[]; //palette
 extern const struct SpriteSheet sUnknown_0820A3B0;
 extern const struct SpriteSheet sUnknown_0820A3B8;
 extern const struct SpritePalette sUnknown_0820A3C0;
@@ -478,10 +478,10 @@ static void CB2_EggHatch_0(void)
         gMain.state++;
         break;
     case 2:
-        LZDecompressVram(&gUnknown_08D00000, (void*)(VRAM));
-        CpuSet(&gUnknown_08D00524, ewram0_7, 0x800);
+        LZDecompressVram(&gBattleTextboxTiles, (void*)(VRAM));
+        CpuSet(&gBattleTextboxTilemap, ewram0_7, 0x800);
         DmaCopy16(3, ewram0_7, (void*)(VRAM + 0x2800), 0x500);
-        LoadCompressedPalette(&gUnknown_08D004E0, 0, 0x20);
+        LoadCompressedPalette(&gBattleTextboxPalette, 0, 0x20);
         gMain.state++;
         break;
     case 3:
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 3ba325574..a3a5dbcec 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -212,7 +212,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
     gBattleTerrain = BATTLE_TERRAIN_PLAIN;
 
     sub_800D6D4();
-    sub_800DAB8();
+    LoadBattleTextboxAndBackground();
     ResetSpriteData();
     ScanlineEffect_Stop();
     ResetTasks();
@@ -320,7 +320,7 @@ static void CB2_EvolutionSceneLoadGraphics(void)
     gBattleTerrain = BATTLE_TERRAIN_PLAIN;
 
     sub_800D6D4();
-    sub_800DAB8();
+    LoadBattleTextboxAndBackground();
     ResetSpriteData();
     FreeAllSpritePalettes();
     gReservedSpritePaletteCount = 4;
diff --git a/src/pokedex.c b/src/pokedex.c
index 711dc69fa..f7baced63 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -3922,8 +3922,8 @@ static void sub_8090B8C(u8 taskId)
         const u8 *lzPaletteData;
 
         REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
-        CpuCopy16(gUnknown_08D00524, (void *)(VRAM + 0xC000), 0x1000);
-        sub_800D74C();
+        CpuCopy16(gBattleTextboxTilemap, (void *)(VRAM + 0xC000), 0x1000);
+        ApplyPlayerChosenFrameToBattleMenu();
         species = NationalPokedexNumToSpecies(gTasks[taskId].data[1]);
         otId = ((u16)gTasks[taskId].data[13] << 16) | (u16)gTasks[taskId].data[12];
         personality = ((u16)gTasks[taskId].data[15] << 16) | (u16)gTasks[taskId].data[14];
diff --git a/src/trade.c b/src/trade.c
index 36e6fc757..a05bddee4 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -4018,10 +4018,10 @@ static void sub_804B41C(void)
             Menu_EraseScreen();
             gLinkType = 0x1144;
             gMain.state ++;
-            LZDecompressVram(gUnknown_08D00000, (void *)VRAM);
-            CpuCopy16(gUnknown_08D00524, ewram, 0x1000);
+            LZDecompressVram(gBattleTextboxTiles, (void *)VRAM);
+            CpuCopy16(gBattleTextboxTilemap, ewram, 0x1000);
             DmaCopy16Defvars(3, ewram, BG_SCREEN_ADDR(5), 0x500);
-            LoadCompressedPalette(gUnknown_08D004E0, 0, 32);
+            LoadCompressedPalette(gBattleTextboxPalette, 0, 32);
             gUnknown_03004828->unk_00b6 = 0;
             gUnknown_03004828->unk_00c4 = 0;
             gUnknown_03004828->isLinkTrade = TRUE;
@@ -4191,11 +4191,11 @@ static __attribute__((naked)) void sub_804B41C(void)
                     "\tldrb r0, [r1]\n"
                     "\tadds r0, 0x1\n"
                     "\tstrb r0, [r1]\n"
-                    "\tldr r0, _0804B590 @ =gUnknown_08D00000\n"
+                    "\tldr r0, _0804B590 @ =gBattleTextboxTiles\n"
                     "\tmovs r1, 0xC0\n"
                     "\tlsls r1, 19\n"
                     "\tbl LZDecompressVram\n"
-                    "\tldr r0, _0804B594 @ =gUnknown_08D00524\n"
+                    "\tldr r0, _0804B594 @ =gBattleTextboxTilemap\n"
                     "\tldr r1, _0804B598 @ =0xfffe1000\n"
                     "\tadds r5, r1\n"
                     "\tmovs r2, 0x80\n"
@@ -4209,7 +4209,7 @@ static __attribute__((naked)) void sub_804B41C(void)
                     "\tldr r1, _0804B5A4 @ =0x80000280\n"
                     "\tstr r1, [r0, 0x8]\n"
                     "\tldr r0, [r0, 0x8]\n"
-                    "\tldr r0, _0804B5A8 @ =gUnknown_08D004E0\n"
+                    "\tldr r0, _0804B5A8 @ =gBattleTextboxPalette\n"
                     "\tmovs r1, 0\n"
                     "\tmovs r2, 0x20\n"
                     "\tbl LoadCompressedPalette\n"
@@ -4267,13 +4267,13 @@ static __attribute__((naked)) void sub_804B41C(void)
                     "_0804B584: .4byte 0x00001144\n"
                     "_0804B588: .4byte gMain\n"
                     "_0804B58C: .4byte 0x0000043c\n"
-                    "_0804B590: .4byte gUnknown_08D00000\n"
-                    "_0804B594: .4byte gUnknown_08D00524\n"
+                    "_0804B590: .4byte gBattleTextboxTiles\n"
+                    "_0804B594: .4byte gBattleTextboxTilemap\n"
                     "_0804B598: .4byte 0xfffe1000\n"
                     "_0804B59C: .4byte 0x06002800\n"
                     "_0804B5A0: .4byte 0x040000d4\n"
                     "_0804B5A4: .4byte 0x80000280\n"
-                    "_0804B5A8: .4byte gUnknown_08D004E0\n"
+                    "_0804B5A8: .4byte gBattleTextboxPalette\n"
                     "_0804B5AC_case01:\n"
                     "\tbl OpenLink\n"
                     "\tldr r1, _0804B5C8 @ =gMain\n"
@@ -4709,9 +4709,9 @@ static void sub_804BBE8(u8 a0)
             gUnknown_03004828->bg1vofs = 0;
             gUnknown_03004828->bg1hofs = 0;
             REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(5);
-            LZDecompressVram(gUnknown_08D00000, BG_CHAR_ADDR(0));
-            CpuCopy16(gUnknown_08D00524, buffer = (u16 *)gSharedMem, 0x1000);
-            LoadCompressedPalette(gUnknown_08D004E0, 0x70, 0x20);
+            LZDecompressVram(gBattleTextboxTiles, BG_CHAR_ADDR(0));
+            CpuCopy16(gBattleTextboxTilemap, buffer = (u16 *)gSharedMem, 0x1000);
+            LoadCompressedPalette(gBattleTextboxPalette, 0x70, 0x20);
             FillPalette(0, 0, 2);
             for (i = 0; i < 0x280; i ++)
                 buffer[i] |= 0x7000;
@@ -5684,9 +5684,9 @@ static void sub_804E1DC(void)
 
 void sub_804E22C(void)
 {
-    LZDecompressVram(gUnknown_08D00000, (void *)VRAM);
-    CpuCopy16(gUnknown_08D00524, gSharedMem, 0x1000);
+    LZDecompressVram(gBattleTextboxTiles, (void *)VRAM);
+    CpuCopy16(gBattleTextboxTilemap, gSharedMem, 0x1000);
     DmaCopy16Defvars(3, gSharedMem, BG_SCREEN_ADDR(5), 0x500);
-    LoadCompressedPalette(gUnknown_08D004E0, 0, 32);
+    LoadCompressedPalette(gBattleTextboxPalette, 0, 32);
     REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(5);
 }