diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_interface.c | 6 | ||||
| -rw-r--r-- | src/battle_script_commands.c | 9 | ||||
| -rw-r--r-- | src/graphics.c | 4 | ||||
| -rw-r--r-- | src/water.c | 2 |
4 files changed, 11 insertions, 10 deletions
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[] = |