Document and index graphics/battle_anims and graphics/battle_interface

16 files changed, 16 insertions, 31 deletions

diff --git a/graphics/battle_anims/unk_83E44F4.png b/graphics/battle_anims/unk_83E44F4.png
new file mode 100644
index 000000000..d63b338d3
--- /dev/null
+++ b/graphics/battle_anims/unk_83E44F4.png
diff --git a/graphics/battle_anims/unk_83E4874.png b/graphics/battle_anims/unk_83E4874.png
deleted file mode 100644
index c4a27b929..000000000
--- a/graphics/battle_anims/unk_83E4874.png
+++ /dev/null
diff --git a/graphics/battle_interface/ball_display_unused_extra.png b/graphics/battle_interface/ball_display_unused_extra.png
index d75b86b54..d7c1958d4 100644
--- a/graphics/battle_interface/ball_display_unused_extra.png
+++ b/graphics/battle_interface/ball_display_unused_extra.png
diff --git a/graphics/battle_interface/unk_battlebox.pal b/graphics/battle_interface/unk_battlebox.pal
deleted file mode 100644
index 862165f3f..000000000
--- a/graphics/battle_interface/unk_battlebox.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 255 255
-255 255 255
-106 90 115
-0 0 0
-213 230 255
-189 205 238
-238 238 255
-106 172 197
-90 139 180
-123 197 205
-0 0 0
-0 0 0
-123 197 255
-0 0 139
-255 131 131
-164 0 0
diff --git a/graphics/battle_interface/unk_battlebox.png b/graphics/battle_interface/unk_battlebox.png
index 9f136c3af..9ccf3b26b 100644
--- a/graphics/battle_interface/unk_battlebox.png
+++ b/graphics/battle_interface/unk_battlebox.png
diff --git a/graphics/battle_interface/unk_826404C.png b/graphics/battle_interface/unused.png
index 8672ac614..8672ac614 100644
--- a/graphics/battle_interface/unk_826404C.png
+++ b/graphics/battle_interface/unused.png
diff --git a/graphics/battle_interface/unused_window2.png b/graphics/battle_interface/unused_window2.png
index 32f3da0b0..d381d3683 100644
--- a/graphics/battle_interface/unused_window2.png
+++ b/graphics/battle_interface/unused_window2.png
diff --git a/graphics/battle_interface/unused_window3.png b/graphics/battle_interface/unused_window3.png
index e93b2ff88..de2f046f9 100644
--- a/graphics/battle_interface/unused_window3.png
+++ b/graphics/battle_interface/unused_window3.png
diff --git a/graphics/battle_interface/unused_window4.png b/graphics/battle_interface/unused_window4.png
index 6c249c96d..39ea78e94 100644
--- a/graphics/battle_interface/unused_window4.png
+++ b/graphics/battle_interface/unused_window4.png
diff --git a/graphics/battle_interface/window.png b/graphics/battle_interface/window.png
index 5167ce2c5..a3f50feda 100644
--- a/graphics/battle_interface/window.png
+++ b/graphics/battle_interface/window.png
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 0b3fda217..3fc4b3b7b 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -148,7 +148,10 @@ $(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png
 
 $(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 5
-    
+
+$(BATINTGFXDIR)/unk_battlebox.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 36
+
 $(BATINTGFXDIR)/window.gbapal: $(BATINTGFXDIR)/window1.gbapal $(BATINTGFXDIR)/window2.gbapal
 	cat $^ > $@
 
diff --git a/include/graphics.h b/include/graphics.h
index 81b6b4ddf..3848bea86 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4861,7 +4861,7 @@ extern const u32 gFile_graphics_battle_interface_ball_status_bar_sheet[];
 extern const u8 gHealthboxElementsGfxTable[][32];
 extern const u16 gBattleInterface_BallStatusBarPal[];
 extern const u16 gBattleInterface_BallDisplayPal[];
-extern const u16 gUnknown_8D12404[];
+extern const u16 gBattleInterface_SummaryBallDisplayGfx[];
 
 // item_menu
 extern const u32 gUnknown_8E830CC[];
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 3744c34eb..32bab8803 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -342,7 +342,7 @@ static const struct SubspriteTable gUnknown_8260404[] = {
     {NELEMS(gUnknown_82603E4), gUnknown_82603E4}
 };
 
-static const u16 gUnknown_26040C[] = INCBIN_U16("graphics/battle_interface/unk_826404C.4bpp");
+static const u16 gBattleInterface_Unused[] = INCBIN_U16("graphics/battle_interface/unused.4bpp");
 
 static const struct CompressedSpriteSheet sStatusSummaryBarSpriteSheets[] = {
     {gFile_graphics_battle_interface_ball_status_bar_sheet, 0x0200, 55052},
@@ -360,8 +360,8 @@ static const struct SpritePalette sStatusSummaryBallsSpritePals[] = {
 };
 
 static const struct SpriteSheet sStatusSummaryBallsSpriteSheets[] = {
-    {gUnknown_8D12404, 0x0080, 55060},
-    {gUnknown_8D12404, 0x0080, 55061}
+    {gBattleInterface_SummaryBallDisplayGfx, 0x0080, 55060},
+    {gBattleInterface_SummaryBallDisplayGfx, 0x0080, 55061}
 };
 
 static const struct OamData gUnknown_82604AC = {
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 30b8bda88..c144833a1 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -703,8 +703,9 @@ static const struct WindowTemplate sUnusedWinTemplate =
     .baseBlock = 0x3F,
 };
 
-static const u16 gUnknown_82506D0[] = INCBIN_U16("graphics/battle_interface/unk_battlebox.gbapal");
-static const u32 gUnknown_82506F0[] = INCBIN_U32("graphics/battle_interface/unk_battlebox.4bpp.lz");
+// not used
+static const u16 sUnknownBattleboxPal[] = INCBIN_U16("graphics/battle_interface/unk_battlebox.gbapal");
+static const u32 sUnknownBattleboxGfx[] = INCBIN_U32("graphics/battle_interface/unk_battlebox.4bpp.lz");
 
 // not used
 static const u8 sRubyLevelUpStatBoxStats[] =
@@ -5593,8 +5594,8 @@ static void sub_8026480(void)
 {
     gBattle_BG2_Y = 0;
     gBattle_BG2_X = 0x1A0;
-    LoadPalette(gUnknown_82506D0, 0x60, 0x20);
-    CopyToWindowPixelBuffer(13, gUnknown_82506F0, 0, 0);
+    LoadPalette(sUnknownBattleboxPal, 0x60, 0x20);
+    CopyToWindowPixelBuffer(13, sUnknownBattleboxGfx, 0, 0);
     PutWindowTilemap(13);
     CopyWindowToVram(13, COPYWIN_BOTH);
     PutMonIconOnLvlUpBox();
diff --git a/src/graphics.c b/src/graphics.c
index c9fc09a1e..56faf0b60 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -366,10 +366,10 @@ const u8 gHealthboxElementsGfxTable_Misc[] = INCBIN_U8("graphics/battle_interfac
 const u8 gHealthboxElementsGfxTable_HpBarAnim[] = INCBIN_U8("graphics/battle_interface/hp_bar_anim.4bpp");
 const u8 gHealthboxElementsGfxTable_MiscFrameEnd[] = INCBIN_U8("graphics/battle_interface/misc_frame_end.4bpp");
 
-const u8 gUnknown_8D12404[] = INCBIN_U8("graphics/battle_interface/ball_display.4bpp");
+const u8 gBattleInterface_SummaryBallDisplayGfx[] = INCBIN_U8("graphics/battle_interface/ball_display.4bpp");
 
 //Originally an array?
-const u8 gUnknown_08C1249C[] = INCBIN_U8("graphics/battle_interface/ball_display_unused_extra.4bpp");
+const u8 gBattleInterface_UnusedSummaryBallDisplayGfx[] = INCBIN_U8("graphics/battle_interface/ball_display_unused_extra.4bpp");
 const u8 gBattleInterfaceGfx_Status2[] = INCBIN_U8("graphics/battle_interface/status2.4bpp"); // these three duplicate sets of graphics are for the opponent pokemon
 const u8 gBattleInterfaceGfx_Status3[] = INCBIN_U8("graphics/battle_interface/status3.4bpp"); // and are also for use in double battles. they use dynamic palettes so
 const u8 gBattleInterfaceGfx_Status4[] = INCBIN_U8("graphics/battle_interface/status4.4bpp"); // coloring them is an extreme headache and wont be done for now
diff --git a/src/water.c b/src/water.c
index 5f7fa4dc6..eb7c13c8f 100644
--- a/src/water.c
+++ b/src/water.c
@@ -56,7 +56,7 @@ static void CreateWaterSportDroplet(struct Task*);
 static void CreateWaterPulseRingBubbles(struct Sprite*, s32, s32);
 
 // Both unused? Comment copied from pokeemerald
-static const u8 gUnknown_83E44F4[] = INCBIN_U8("graphics/battle_anims/unk_83E4874.4bpp");
+static const u8 gUnknown_83E44F4[] = INCBIN_U8("graphics/battle_anims/unk_83E44F4.4bpp");
 static const u8 gUnknown_83E4874[] = INCBIN_U8("graphics/battle_anims/unk_83E4874.bin");
 
 static const union AnimCmd sAnim_RainDrop[] =