From 7d9bcc9f77aae2a59f657c77ffa670fd43a4bf87 Mon Sep 17 00:00:00 2001 From: hjk321 Date: Mon, 29 Mar 2021 09:49:56 -0500 Subject: [PATCH] Document and index graphics/battle_anims and graphics/battle_interface --- graphics/battle_anims/unk_83E44F4.png | Bin 0 -> 339 bytes graphics/battle_anims/unk_83E4874.png | Bin 286 -> 0 bytes .../ball_display_unused_extra.png | Bin 102 -> 156 bytes graphics/battle_interface/unk_battlebox.pal | 19 ------------------ graphics/battle_interface/unk_battlebox.png | Bin 170 -> 218 bytes .../{unk_826404C.png => unused.png} | Bin graphics/battle_interface/unused_window2.png | Bin 445 -> 476 bytes graphics/battle_interface/unused_window3.png | Bin 235 -> 287 bytes graphics/battle_interface/unused_window4.png | Bin 362 -> 411 bytes graphics/battle_interface/window.png | Bin 455 -> 505 bytes graphics_file_rules.mk | 5 ++++- include/graphics.h | 2 +- src/battle_interface.c | 6 +++--- src/battle_script_commands.c | 9 +++++---- src/graphics.c | 4 ++-- src/water.c | 2 +- 16 files changed, 16 insertions(+), 31 deletions(-) create mode 100644 graphics/battle_anims/unk_83E44F4.png delete mode 100644 graphics/battle_anims/unk_83E4874.png delete mode 100644 graphics/battle_interface/unk_battlebox.pal rename graphics/battle_interface/{unk_826404C.png => unused.png} (100%) diff --git a/graphics/battle_anims/unk_83E44F4.png b/graphics/battle_anims/unk_83E44F4.png new file mode 100644 index 0000000000000000000000000000000000000000..d63b338d33b8a416798d0d0d5c0804ce784e2c6a GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^3P5bZ!VDzyEd-wjo zd-wm{xBox@A%RNZ;Oy1^XV3nB_U!)!?%Vr-qW3&q978lFo(;Ol)oj4ybCW-U<-ar2 zrvHME?$vt8u{XU;*Iz3ZHFrZhZyCRtt)AjN(Feg6?_XDU*9HseUV7onmM5<8^3B2E z`?)RhQ#LZHEUL(kvHo!B@Y#$;0hK8XypGyQ*4MsFb;$@>!+tbs%MwY|!WlE$ujx)* z5%6NA>N>^elJ^zU`rHfKnjOE}Y?I}2)d&*IY~Z6l?Re|G+y aUcsoG_|Nz6aa&Q4|2-!>2?AX$?zvx2b3Wuksgcg5(uM_(TY-a`YntIJ=^08G*C z6kXMlXVhRfvkYxp8d0Tymlj(CUuS#+e4NX#L6kXM&)CZmmX;h)hHTE-e}; zlPBR3&5x);A}xW)EOIwS0?-nR$*46J2krNOV07*qoM6N<$g2#?=+W-In diff --git a/graphics/battle_interface/ball_display_unused_extra.png b/graphics/battle_interface/ball_display_unused_extra.png index d75b86b54bf54caa3dce9cc77028366d047446a4..d7c1958d4956edb87eecae346952f5e2bec58fb0 100644 GIT binary patch delta 138 zcmYeB!#F{*o|%Dx!Ax=S4j^R^;1l8sq%AEi|NsAg_3Yl}=58;?sGzK<|5tbla=akR{064xe5&!@I delta 83 zcmbQkm^MMumjMV=rtpLTDP2z&#}JO0$v^m6c>ag4{eS+$>#A$@ZBL(OzLpGoAGdX0 k;@i2#uO;i|TCz@LWnfK_%-S8tB?mIV)78&qol`;+0QlG*+yDRo 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 9f136c3af267f3979e6e30133217625d8f4e39e3..9ccf3b26b90c58d2b8589215d6e4bc84796daf51 100644 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBI!VDz$Ja~8uNErn9gt-0(gRH1xpup8<|M#AK z_wL>QtTjiYy0=sxJqr{Bg6gCH85p|%H#aX~U})rKxepXd^>lFzvFJ@sFgwOC(Ubm& zooCwR(;u1Gy#IV^c4nNlo%e#N!Gg-$63&cL`)3xhrs=InU=Uf*oK~e#aFD<0q{ybCPmCPTxMkT7vu;}S3j3^ HP6Eak-(ffAtM$Q8UJS?Vb zPY6glY@XpG@U`uLvzXV!J)9CbJ4>HFd$5#QwEqdCLO|%r*)vn58NN)JXUMm4Pv$*e z{+{0wfzzk&-rkXCAK~z|U?Uqey!!Qs=O}ps2 z-ehef$T~C!NQ5V4} zrsIjizUx|!MEDpuitzWsvnEvgtI%89_tqzW+)Hdhu+|+Uwcjd0V$Xwcjf;bNV+}Z;c@Zpf=9JR_2ELCWYKE$q!s^D6?WIVr~G$+yIEV0f1vAxkdpCBsX9|ED;5q8>oPC0~Jti zV1%6}@bBfX3g%&9;iC?SxdB+88)k1(%nd-91@rg;QGerICdgi700000NkvXXu0mjf DJOjxQ delta 430 zcmV;f0a5FfgK6~)Fsp=$v|kj_$;^| zS+WP54Ojrl8-KtbByWIGEO`SAbLnU1^XGwSZlrq;fiDpNu{SV4>X--!6ULZ3os`%>JtBzjPnudn| z8U8=J_Y6qRsg^jq#!E9O%g{5;7N}>Hr;B5VMQ?J#0;UAt!|V;8E}#C$$kz73C_UMx zp)qmS|N5GS#;rW-|J1W>6LR9}%3S$iv5g|DP(6!i%^!~wES!J1Sf2j=_og8Gir(002SI&cXly0J2F$K~y-6)zhI4!Y~j9;PXrRoRf2VgM|VD z*(ofpNCW~&vOUDy9G;q^xZS$^SJMPeu3whkpTES)PzDG+8sbpz&=6njeFQ^XUkOgI z_?+Gc4IE1XGihK}fic=2W(;0agSTkg(mDJO2o^Q++ersY9aCG4pGBYZvVISUke=rZ zAeQzUK*VM@fC%3C6u=KC^oOjZSS(}43BR9)JK567ru Udaw=eWB>pF07*qoM6N<$f(0{O%K!iX diff --git a/graphics/battle_interface/unused_window4.png b/graphics/battle_interface/unused_window4.png index 6c249c96dfbb83420c985407380f70e94a2c0829..39ea78e94e42c8a59e142c967ea2a04b9941cccf 100644 GIT binary patch delta 396 zcmV;70dxN90-FPn8Gi!+002p^a#;WX05DKYR7C&)0RR90{{R3|Vw`G=z5oCJYFcyE z&DB9ldnqw7{{a8y-sb-R|D1am&8$i(Qfe_tW<3A^0VYXAK~z|U?bfXh!Y~vC;F{ra zb36hhkRTBVBr^m%vl=91OWy!DS;;HP+*Ciqc)#JZMyfPb=tgdNHK(ygSsy^MV! z0jHwtGNZ!STFl2p7?aD23JU~TuUKz~z_v}G1_*=@D1}xCY0w|!^e*=Mw*QB}0SbW- z0F?s(4@?e#Uf_joHe*z$$qE4d`5Vn3asZ#?0r+>cnYO>j9_v_+RmgT8@a$j7@k#G31;3G#KpwQt2Ag?6v7)LU7ENL8S z*E1XMlvtp?B@JQ(BJc>i{v+|9A5!1>AtmeG{7`lCLkB(q%^1~ge)tgl{rmtfcX<2z q1JBg9JZWiuco(4g!TwhLa{)D}W0U$w(!>A&002ovP6b4+LSTZc8M5C1 delta 346 zcmV-g0j2(%1L^{h8Gir(003JW-M0V$0WnELK~z|U?be|V!Y~j9;Chn2%v3#ww?IzL z@dgbGNK7$Uf*BHlK$1WLk1#ifr)G2nv99BOSThVgNBd>$miF#g34(n9w4#EQI-XL& z%C+2|iC|^CWn^ec@3Z?1fq9>R=Li%KaE_i((BPIQbQY6I-+$lXZvaQ20Dva|zyp&2 zP(1*r>0I}E9G4pa%=Nd5LDmASVjx?9RSe?H1@^+Kf6!R?8XOQ9dxL9pVTWEa24En~ zZ!M`x{jAkwu{YJeY8R0ZA`)-_rv@U=7#{f0Oz{bBg_vS!Qamhpt-~D s?+-k?UM=NQPxHgK0L>4Z4rwCr0H6eoP$1IRCjbBd07*qoM6N<$g0I1vhyVZp diff --git a/graphics/battle_interface/window.png b/graphics/battle_interface/window.png index 5167ce2c50d3cb1144cf2815c160b1ab2a32aa4f..a3f50fedab0e78b10bbca96e0afdcebcf5af2f03 100644 GIT binary patch literal 505 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?I3?vN&YJLDIg8-ipS0Mc#2pAZGlICP}?*%fm zqKdDcz3S*yt!ZfZpW*+rd(VL6oN9@)YrHgrvJ5@bY#A6BTRdGHLoyoQPP5HAY#`Dg zdg7kViAj6EFtwiJEO~X0xuo#ri>1qsf4HI`z};3s)uiFijGDuG+8Ya#=}AagW`%&_-6yZ9yA^<=O=gc3Zfyh_1M3r`)7& z?!+CoRV2sz0KZk-V?!qp2IAz=pR6A;=1~$G; z>G*l{?bc`i(t2-eJpI)i5URR4IQ6vmVKsp}rEib7IIw1ymF8K*{%A^y_LSq&Suyv( zvh05`5`Qwi9q+$qNnkzjrs*KF?ZKIE+e`PSWoc{lK3Kr|H)LbNHpAw`oiDEQl)QF} zJ+q9N{dBhtmtLIltJhpA68^GmsSAW(+-7;d?k1mHo!f*KmU_pA&b-%*_w_ioKRu{t zujsLVJx}Jr1$sQMk4$-RL*<4)*P&ekLT~N`I?irjQBh#z^l)gJFaBiewl|Mv#opV@ tFY(iT&V9S3z6Fy$8#xNFz|j9`{K^^sAB%1`>juUlgQu&X%Q~loCID25*Q)>k literal 455 zcmV;&0XY7NP)!Fm75O0wOHW#OK~X=?_VZAI~$NEsmf!H0V@iSg05z#190c| zyOR6c+{7Ms1!%6HYC#Qv5>O~mkz_#Km;?||T*v}^*Vkdw)LPYm%mB0~1)zqO2DJYw zJk%I)Ses(7-8HqKs;55&P?4y~MFZNwlg*m>Xma9O`ssBHKsJCOOO6I~FFhQz0xE$1 zayz-XI5nfbex%Ha`beLdj(8+A@K{C@Ji+xF#e@ $@ 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[] =