From 117c8db279f9832e07e6dfa6071edb414729b127 Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Sat, 10 Apr 2021 09:43:46 -0500 Subject: [PATCH] Document and index contest and diploma gfx --- graphics/contest/{misc_2.pal => misc.pal} | 0 graphics/contest/misc.png | Bin 1961 -> 2014 bytes graphics/contest/misc_2.png | Bin 1565 -> 1610 bytes .../diploma/{unk_84154E8.bin => diploma.bin} | Bin .../diploma/{unk_8415954.pal => diploma.pal} | 0 graphics/diploma/diploma.png | Bin 0 -> 2924 bytes graphics/diploma/unk_84147C0.png | Bin 2863 -> 0 bytes src/diploma.c | 12 +++---- src/graphics.c | 32 +++++++++--------- 9 files changed, 22 insertions(+), 22 deletions(-) rename graphics/contest/{misc_2.pal => misc.pal} (100%) rename graphics/diploma/{unk_84154E8.bin => diploma.bin} (100%) rename graphics/diploma/{unk_8415954.pal => diploma.pal} (100%) create mode 100644 graphics/diploma/diploma.png delete mode 100644 graphics/diploma/unk_84147C0.png diff --git a/graphics/contest/misc_2.pal b/graphics/contest/misc.pal similarity index 100% rename from graphics/contest/misc_2.pal rename to graphics/contest/misc.pal diff --git a/graphics/contest/misc.png b/graphics/contest/misc.png index 73f8054db8cfa7ed258e39d8204104b184264f6a..a8fdb3e0f3bf5e7c46a585cf66fbf7893890074e 100644 GIT binary patch delta 2011 zcmV<12PF8Z58e-u8Gi!+001!%eE0wW05DKYR7C&)0RR90y}iYQgNtHfdqGNSDKT3A zYIFZNIn5vd_SFFYdt#ilTBMXYT55~5tWwHdD3JgF2Wd$}K~!jg?U>I?9A_BEhk`ew zyla)P)R5iAqXoO$%_+U?t}O*a-1;Uz$c*EDPe22r(>;;OG}A z%iqwntdm?~f=_k-Ol1ABRR_2MrQaNg2K=A_k+?6N00RmDmU;_vi9oWAfUk~7>Hs(P z&jU5-ZE0^%RH0g&S4pnq-*SauPl1`DW&7(fMLc^+I) zaN!6poE)=~56Bb1U4{$rWZ4HCQNh&!y`E)VQkK<+%IrU}gp+?L@(T}zgOlVc0G!Jv(E!s3(2~YF zfEb#YnSZf|W`=Crrb&BdXedx#$UB4Ry(Y2xe)U-&So|)pJYVAHo?Bq%pY9pI46FK^X8y zYk%QgIn1=k&3_6l^8I@P3~vb~1fB{Q2pR$~p?0*Mn%?mN^LqugSWr-;hNA$mEub2S ztI=(!tJv@sERd2J6T8#9plCp~fPZRUErLTsAE4A07(zq{5CdTQ%Ata`L{n1}1ej6) zC{>-W(u=|#5CF{Y1r{gM=<-h;V9_Zkhx++F^5(}HK=^>|_JE094L|@F8BlEjsCEFPU}AS-rw*Xn14b2@ z-V9JOs|c{$0ifb4KDw;|B91-+fZClR#`KN`WF)fS08m5#sYfIVMISJ_9aG!G3V$^K z!Y~LZq+JOErZQQ?PoX5HD2Kh_)&OG$ph`>o z_$igJBDrq?j06@$vJHT|20X<-{FI)!x^DyUV{lFSTcsLcNs$^U0zsoTfM9zyf{f^q z(12VV7Od?1fD+r%3aH=W`I8zTB?F$+0hab#0gdj|12_gN`=ri;#bcCNJ%HM*SVVF zh@?e@W10s*Z9-@5Re9~8tbceA0Q3np05nJVIEVkzAk4p2L{OW!n`~kP%&7qUntp`( z5u|n`clAHzk=o{J1s2d~?Ue!GEPbNB68aGalJDGO7JxUZqRPrE2NtXy1OQ)A_i3|x>j!+%*=rSP*0st(X8 zh=?Fr@|Lb%d9`*>Q3n82P6zlw^wTJHoxDZZVZs^^2C(|#ltMB=^b3h*H2_Xj4k`zp zx26!tgV3c+`iOy7Mj@=18| z+prq}iA2(TdrM?!TYt=-7wF>zcE@1=>2W(vgmiNJZjv?7$O77q5kiIuN?l{if)LgPV zK&m)<4}iJU;%t`y#{itrfJ6UX;wF3G7#EzmWC&#je0@j%G2p)QfP;A5c@!FON9sQV zc*JSEA0E(H2lt)DSrk&L*ge3Rn@yw;$Swh#0-Jxs0{;HY2&eJ7g^`V(1cphZ^oi{DA8cz&91{ t!vY$DST7*~wdZ}8fD5^h3%L-M{{cG)I(q4!2e1GD002ovPDHLkV1g2rk(dAg delta 1958 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 Wi0JUqLSpp*00009 zJ#X7+635xOIHVv_7{PWr7_0+AAkqtFeBIhG*rW_dAm_psC5~h}wFGxY3<%dBEF;}k z_X*BwQe2mhvpe&jd0t4_xd*$EMDh7?-e(>;`IA?zi)88BhT1&OEBA4@J`>ICZ4v-w z1SpC3=fx|4&vN5z2xuq*K!8^PCEdSsgaDuj(9oFx#?-wCp!R)wNcyD*umF`8Of|^! zmjMms@6+_1KFkA%_<=?>4H(cD{MhT4@;b!L4gj+|Kx2S$1Zcc|pDEQP;+76TA~fG} zY%*dMU4OrQyOiB;#SAP}Le$jtKvmiU$o{iJ<)bSBF0*Fb&;pnCws3mi{*(rU=6dBjwbL}&hfM$Q~ChZhJ>2jH6nSkT*c z34ox%yznN`uy9epCdfTNBA_NGse2xYN!#2DQ1k(ZOEE>_3?6LnZ|^j#{B;A|I{+fu z0gB=Nb7&V3+V+|W`1!zVj~s2AJ#YLu5)={o@ojE7r4RZ?D#4N&PbEH}%` zjc!lq>W~4=(0X#~j~!Vc&f(!RXrSeek|a4u4la`eks(dk(0fWif?VT(C7(i$!U_uM zR$ZLV&}rWW#094lgS9jrWl+RQQZT_K6sc(?gq{;v>XzL!V|Ye1Qh?+Fs-SYDZm=p0 zSgeI0y0(!Bxm4Y{nT}Y1QRbAa;xa9y%LIUx0E(U_?;Ri;F~GU17}R-HVf~$D;H3Lh zLHd^gdfB(sQ2$^=7J>mkcBVt&0Hw&!i_KuocE3|GV7Is?-g0_wTI-Kmh}cU1JGL_9}q30LXq$F$f~v%aIpK485Lh4(5Y^Vqbv-`k&Py0IX;pAVD*`0ij1hGGTJ|;{(dh)!}_ua68@bBa04v|0NMu} zI~9lt@CpEYN#=t_`bE&8Dh3)r2Mi;0&AYF=dpF|nR?G*Yg9n_SReOMJW`Onj?&+?R z-bet@8uLNJgvg4diQG4WMlBnF?ck;?q%&VarHO4Y%05*C9RO&a0O)d?vJ7zdh!QhD z3jof}0pJ(_2?F-JWXpzBg@3bJogYsBuqI1;QeP(lKgxeynr0Uvq=FKiTiWq)VV6d09Zt49O)w* zH#X@xfR^MU5`dftYz+q}bl8@3P{5%BRP4$gfSY3_ggL8cp&-o*0O=#^@9xN9lPaGD z_~kqRTCFLew`4Z6)U1HSjqKk@Ah|hOUfUiZrzj3HjI1?`$OYwTwZwUYbHSa@+CBh@ z6$orc)=4z@^2GIIHKMkN0XA=_8QmC$6UchYy;vmR>4arU+!=9iTo+uy^2e9-2xG?} zLcdHT3&-STj_#Iz%YeT}hS6bJ4`LJTw@JOFv4$b_=k0>j30dwUtQyV-I-$(GlH-0p zIVXx-5c9@v9BhJ%F#u zczX8oj~N0Gzp~SDTi9MvFOYqEf3}S~qFV*1Uq!^ypBph)w?*6-oCclW&+A#dpnh%m z2KEJJ#LB`q?`2~b1KhC%0A0i#2ClRSt9x^1HgF-)*ChE#=uEivQK)TUgnxvm`2ENH zxvu}|&P|t+OK&6>c>j}*ZB5Gr*>7`Tvoawvt;fx}Zf;Vp2*eghzG^mh++1a9<4z%F z!@O#9Aiw&$Av*Er`X){5FV|~6_PjwlCv=F z?=OML5neT)5*ByY0!aP_6CAjcD;j?{0AL<$lp}yGMgn~Uq645d$s|f2hUEDoQ43K2Zygn<{rS-1=)n3(XEUY;f$)4C$^CXyoms{FM&v5 zE_fH=2et^OM8pSX5U`*70vc@qWaL8Wb%1Nm+MU%0b9I0NXi&ZmP=dr(;$U=|c{gP0ieCX_8*-HA zM8Y-}!n;8MVvE-SZY5?x1iy1bW>R2?X=oy=4Dr_L^A_Su6h98zhOe6 zaY&~=m=z#C&7f@n+{Xa?n2QnT0+JJqKlK24tG{0cK$$-9zZ+L7zezqmCq9swfCv`A zDMCpn$pDya;0-I4t#nM8k(?D>C}q4 zkiqW;T2SV`CrLFEL5?I!06-*`#DORx(1QVX;srHgzpMGx)egXWHcQQh2~A7|{9y6H z01d@5=(@Eo#Bsu#Mf?*7C~whYS{Daa9_G4#iC77(UgUF<8)VbDK-iEQ_gz)7%sWwE zE1+Sh8glY4BA?GYVhwKnUp#m5eh@sMwl7X_#{=8KdMOO$|K@t(9OVM0^MFPH62!OS zjp)?V`@?k|1c2i`KyH12Wu9%9Eiq;UXnH|gx;T*aL%wpV`--MDF$VO~&i#g};w~qf zmk*8+fR;giejukz47X$AF9Fct#6^5b5db5|{{dVeSTtbEhauqA^%qdW_|)cA;x_;Q N002ovPDHLkV1fpYCB*;$ diff --git a/src/diploma.c b/src/diploma.c index c43eff105..a8ca579ba 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -29,9 +29,9 @@ static void Task_WaitForExit(u8); static void Task_DiplomaInit(u8); static void Task_DiplomaReturnToOverworld(u8); -static const u32 gUnknown_84147C0[] = INCBIN_U32("graphics/diploma/unk_84147C0.4bpp.lz"); -static const u32 gUnknown_84154E8[] = INCBIN_U32("graphics/diploma/unk_84154E8.bin.lz"); -static const u16 gUnknown_8415954[] = INCBIN_U16("graphics/diploma/unk_8415954.gbapal"); +static const u32 gDiplomaGfx[] = INCBIN_U32("graphics/diploma/diploma.4bpp.lz"); +static const u32 gDiplomaTilemap[] = INCBIN_U32("graphics/diploma/diploma.bin.lz"); +static const u16 gDiplomaPal[] = INCBIN_U16("graphics/diploma/diploma.gbapal"); static const u8 gUnknown_8415994[] = _("{HIGHLIGHT TRANSPARENT}プレイヤー"); static const u8 gUnknown_841599D[] = _("{HIGHLIGHT TRANSPARENT}さま"); @@ -118,7 +118,7 @@ static void Task_DiplomaInit(u8 taskId) } break; case 3: - CopyToBgTilemapBuffer(1, gUnknown_84154E8, 0, 0); + CopyToBgTilemapBuffer(1, gDiplomaTilemap, 0, 0); break; case 4: if (HasAllMons()) @@ -231,7 +231,7 @@ static u8 DiplomaLoadGfx(void) ResetTempTileDataBuffers(); break; case 1: - DecompressAndCopyTileDataToVram(1, gUnknown_84147C0, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, gDiplomaGfx, 0, 0, 0); break; case 2: if (!(FreeTempTileDataBuffersIfPossible() == 1)) @@ -240,7 +240,7 @@ static u8 DiplomaLoadGfx(void) } return 0; case 3: - LoadPalette(gUnknown_8415954, 0, 0x40); + LoadPalette(gDiplomaPal, 0, 0x40); default: return 1; } diff --git a/src/graphics.c b/src/graphics.c index 87c73b014..7769e576c 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -461,25 +461,25 @@ const u32 gFile_graphics_unknown_unknown_D17AB8_tilemap[] = INCBIN_U32("graphics const u32 gContestMiscGfx[] = INCBIN_U32("graphics/contest/misc.4bpp.lz"); -const u32 gFile_graphics_contest_audience_sheet[] = INCBIN_U32("graphics/contest/audience.4bpp.lz"); +const u32 gContestAudienceGfx[] = INCBIN_U32("graphics/contest/audience.4bpp.lz"); -const u32 gFile_graphics_contest_faces_sheet[] = INCBIN_U32("graphics/contest/faces.4bpp.lz"); +const u32 gContestFacesSheetGfx[] = INCBIN_U32("graphics/contest/faces.4bpp.lz"); -const u32 gFile_graphics_contest_judge_symbols_sheet[] = INCBIN_U32("graphics/contest/judge_symbols.4bpp.lz"); -const u32 gFile_graphics_contest_judge_symbols_palette[] = INCBIN_U32("graphics/contest/judge_symbols.gbapal.lz"); +const u32 gContestJudgeSymbolsGfx[] = INCBIN_U32("graphics/contest/judge_symbols.4bpp.lz"); +const u32 gContestJudgeSymbolsPal[] = INCBIN_U32("graphics/contest/judge_symbols.gbapal.lz"); -const u8 gFile_graphics_contest_heart[] = INCBIN_U8("graphics/contest/heart.4bpp"); +const u8 gContestHeartGfx[] = INCBIN_U8("graphics/contest/heart.4bpp"); const u32 gFile_graphics_unknown_unknown_D196E4_sheet[] = INCBIN_U32("graphics/unknown/unknown_D196E4.4bpp.lz"); const u32 gFile_graphics_unknown_unknown_D196E4_palette[] = INCBIN_U32("graphics/unknown/unknown_D196E4.gbapal.lz"); -const u32 gUnknown_8D197FC[] = INCBIN_U32("graphics/contest/misc_2.4bpp.lz"); +const u32 gContestMisc2Gfx[] = INCBIN_U32("graphics/contest/misc_2.4bpp.lz"); -const u32 gFile_graphics_contest_misc_2_tilemap_1_tilemap[] = INCBIN_U32("graphics/contest/misc_2_tilemap_1.bin.lz"); -const u32 gFile_graphics_contest_misc_2_tilemap_2_tilemap[] = INCBIN_U32("graphics/contest/misc_2_tilemap_2.bin.lz"); -const u32 gFile_graphics_contest_misc_2_tilemap_3_tilemap[] = INCBIN_U32("graphics/contest/misc_2_tilemap_3.bin.lz"); +const u32 gContestMiscTilemap1[] = INCBIN_U32("graphics/contest/misc_2_tilemap_1.bin.lz"); +const u32 gContestMiscTilemap2[] = INCBIN_U32("graphics/contest/misc_2_tilemap_2.bin.lz"); +const u32 gContestMiscTilemap3[] = INCBIN_U32("graphics/contest/misc_2_tilemap_3.bin.lz"); -const u32 gFile_graphics_contest_misc_2_palette[] = INCBIN_U32("graphics/contest/misc_2.gbapal.lz"); +const u32 gContestMiscPal[] = INCBIN_U32("graphics/contest/misc.gbapal.lz"); const u32 gBattleAnimSpriteGfx_Impact[] = INCBIN_U32("graphics/battle_anims/sprites/impact.4bpp.lz"); const u32 gBattleAnimSpritePal_Impact[] = INCBIN_U32("graphics/battle_anims/sprites/impact.gbapal.lz"); @@ -582,8 +582,8 @@ const u32 gBattleAnimSpritePal_BlackBall2[] = INCBIN_U32("graphics/battle_anims/ const u32 gBattleAnimSpritePal_PurpleGasCloud[] = INCBIN_U32("graphics/battle_anims/sprites/purple_gas_cloud.gbapal.lz"); -const u32 gFile_graphics_contest_judge_sheet[] = INCBIN_U32("graphics/contest/judge.4bpp.lz"); -const u32 gFile_graphics_contest_judge_palette[] = INCBIN_U32("graphics/contest/judge.gbapal.lz"); +const u32 gContestJudgeGfx[] = INCBIN_U32("graphics/contest/judge.4bpp.lz"); +const u32 gContestJudgePal[] = INCBIN_U32("graphics/contest/judge.gbapal.lz"); const u32 gBattleAnimSpriteGfx_Spark[] = INCBIN_U32("graphics/battle_anims/sprites/spark.4bpp.lz"); const u32 gBattleAnimSpritePal_Spark[] = INCBIN_U32("graphics/battle_anims/sprites/spark.gbapal.lz"); @@ -984,8 +984,8 @@ const u32 gBattleAnimSpriteGfx_IcicleSpear[] = INCBIN_U32("graphics/battle_anims const u32 gBattleAnimSpritePal_IcicleSpear[] = INCBIN_U32("graphics/battle_anims/sprites/icicle_spear.gbapal.lz"); const u32 gContestNextTurnGfx[] = INCBIN_U32("graphics/contest/next_turn.4bpp.lz"); -const u8 gFile_graphics_contest_nextturn_numbers[] = INCBIN_U8("graphics/contest/next_turn_numbers.4bpp"); -const u8 gFile_graphics_contest_nextturn_random[] = INCBIN_U8("graphics/contest/next_turn_random.4bpp"); +const u8 gContestNextTurnNumbersGfx[] = INCBIN_U8("graphics/contest/next_turn_numbers.4bpp"); +const u8 gContestNextTurnRandomGfx[] = INCBIN_U8("graphics/contest/next_turn_random.4bpp"); const u32 gBattleAnimSpriteGfx_GlowyRedOrb[] = INCBIN_U32("graphics/battle_anims/sprites/glowy_red_orb.4bpp.lz"); const u32 gBattleAnimSpritePal_GlowyRedOrb[] = INCBIN_U32("graphics/battle_anims/sprites/glowy_red_orb.gbapal.lz"); @@ -994,9 +994,9 @@ const u32 gBattleAnimSpritePal_SleepPowder[] = INCBIN_U32("graphics/battle_anims const u32 gBattleAnimSpritePal_StunSpore[] = INCBIN_U32("graphics/battle_anims/sprites/stun_spore.gbapal.lz"); const u32 gContestApplauseGfx[] = INCBIN_U32("graphics/contest/applause.4bpp.lz"); -const u8 gFile_graphics_contest_applause_meter[] = INCBIN_U8("graphics/contest/applause_meter.4bpp"); +const u8 gContestApplauseMeterGfx[] = INCBIN_U8("graphics/contest/applause_meter.4bpp"); -const u16 gFile_graphics_contest_nextturn[] = INCBIN_U16("graphics/contest/next_turn.gbapal"); +const u16 gContestNextTurnPal[] = INCBIN_U16("graphics/contest/next_turn.gbapal"); const u32 gBattleAnimSpriteGfx_Splash[] = INCBIN_U32("graphics/battle_anims/sprites/splash.4bpp.lz"); const u32 gBattleAnimSpritePal_Splash[] = INCBIN_U32("graphics/battle_anims/sprites/splash.gbapal.lz");