From 478231436173e079bd56a23edaafd766bdf3a5ec Mon Sep 17 00:00:00 2001 From: yoshida_teruhisa Date: Fri, 16 Nov 2007 03:57:57 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=90=E3=83=8A=E3=83=BC=E3=81=AE=E6=95=B4?= =?UTF-8?q?=E7=90=86=E3=80=81=E3=82=AB=E3=83=BC=E3=83=89=E3=81=8C=E7=84=A1?= =?UTF-8?q?=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AE=E3=83=90=E3=83=8A=E3=83=BC?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@193 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/systemMenu_RED/Launcher/ARM9/main.rsf | 2 +- .../Launcher/ARM9/src/launcher.c | 16 ++++++++++------ build/systemMenu_RED/data/DownloadBanner.bnr | Bin 2624 -> 0 bytes .../data/{CardBanner.bnr => NoCardBanner.bnr} | Bin 2624 -> 2624 bytes 4 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 build/systemMenu_RED/data/DownloadBanner.bnr rename build/systemMenu_RED/data/{CardBanner.bnr => NoCardBanner.bnr} (58%) diff --git a/build/systemMenu_RED/Launcher/ARM9/main.rsf b/build/systemMenu_RED/Launcher/ARM9/main.rsf index 9953fc78..ae7f0655 100644 --- a/build/systemMenu_RED/Launcher/ARM9/main.rsf +++ b/build/systemMenu_RED/Launcher/ARM9/main.rsf @@ -151,5 +151,5 @@ RomSpec Segment ALL HostRoot ../../data Root /data - File NTR_IPL_font_m.NFTR CardBanner.bnr DownloadBanner.bnr EmptyBanner.bnr NoBanner.bnr + File NTR_IPL_font_m.NFTR NoCardBanner.bnr EmptyBanner.bnr NoBanner.bnr } \ No newline at end of file diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c index 7f8fe60f..a75af645 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c @@ -66,8 +66,7 @@ static u64 old_titleIdArray[ LAUNCHER_TITLE_LIST_NUM ]; static NTRBannerFile *empty_banner; static NTRBannerFile *nobanner_banner; -static NTRBannerFile *card_banner; -static NTRBannerFile *download_banner; +static NTRBannerFile *no_card_banner; static u8 image_index_list[ LAUNCHER_TITLE_LIST_NUM ]; static const int MAX_SHOW_BANNER = 6; static GXOamAttr banner_oam_attr[MAX_SHOW_BANNER+10];// アフィンパラメータ埋める関係で少し大きめ @@ -82,9 +81,7 @@ static void LoadNTRBannerFiles() NNS_G2D_ASSERT( size > 0 ); size = CMN_LoadFile( (void **)&nobanner_banner, "data/NoBanner.bnr", &g_allocator); NNS_G2D_ASSERT( size > 0 ); - size = CMN_LoadFile( (void **)&card_banner, "data/CardBanner.bnr", &g_allocator); - NNS_G2D_ASSERT( size > 0 ); - size = CMN_LoadFile( (void **)&download_banner, "data/DownloadBanner.bnr", &g_allocator); + size = CMN_LoadFile( (void **)&no_card_banner, "data/NoCardBanner.bnr", &g_allocator); NNS_G2D_ASSERT( size > 0 ); } @@ -148,7 +145,14 @@ static void NTRBannerDraw(int cursor, int selected, TitleProperty *titleprop) { if(titleprop[l].titleID == 0) //IDがゼロの時はEmpty { - titleprop[l].pBanner = empty_banner; + if(l != 0) + { + titleprop[l].pBanner = empty_banner; + } + else + { + titleprop[l].pBanner = no_card_banner; + } } else if(titleprop[l].pBanner == NULL) //IDがゼロじゃないのにバナーがNULLならノーバナー { diff --git a/build/systemMenu_RED/data/DownloadBanner.bnr b/build/systemMenu_RED/data/DownloadBanner.bnr deleted file mode 100644 index f14caef20710f04b5e0de104af7171b1283006b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2624 zcmd^SO*(@adV|t1>BvgGBL&Jh)G7P zfKO7&%apRRP4gPvoaTO`8}COT91*pGZq)J{4>ymZ-HkrV^aI};1fDB=PgEfs!mp#o zwOWq>nsc?*vs(*2o71lrqXUDMEoX#bIF_M1)&)?~9ivoo^pZBy4O?C(_>dzyKD9fZ z5FJ-kpJE*erBq-+QHDXNg#-|rGit%I0cOjfh(mN;*EEP`AhBgxdT!@6N}4vK{RbXC z1DlZb<#Vqte!MhxWqxAw#@=*x>-`=7%JDDwW_ XA@>X2|02HeBJaOb@c-ZKLihg%8rDS= diff --git a/build/systemMenu_RED/data/CardBanner.bnr b/build/systemMenu_RED/data/NoCardBanner.bnr similarity index 58% rename from build/systemMenu_RED/data/CardBanner.bnr rename to build/systemMenu_RED/data/NoCardBanner.bnr index 3e87abc4614784ccfd77f8e01eda7f62ef614060..60afadeb1567396f755fac226c93980c6d213d2f 100644 GIT binary patch literal 2624 zcmZQ(Xm<5|wyc?fJivyoErBg90VEgz#pv>Ep#iMuV#s_~2OtlGLBIh_0*M5m9+0Up ztsol4W@89tNCWagm<^;3Xf+rE`3PNL9YCvDSp$IBfq^xE1uV~C0HMG%Ha6HEuw4m2 zJAsY>VUS~3L42_0G!O|A1p|=(Ko+n%gfcilErH1aX%=P!1``Hm5M*Iy5CGY00Kz~i z5N#~Lz#ss{f^cmhV?Y>-d2lsAy#~xmNL&o20+S%nWHbO0fr>IBEJP@(N#`YEW5V>TI6T^W-XYn|r*zAFFme~bK zWwVE*vzf!j#$u8*$p(eFT$Oa26O>fPteuT;zC9Ze@(*MOe)F;O&AyK}JM096!RL*M z4LECzMx&ov>+~c^(j@62DouKbYNkDPiuMR?t(1~VZObOdp-+!vA)eHaTsxIN^FZ1ZFh`ixwd7x_GP4Cx>lj!ngwHi5XOE# z*w5ho7IFGM=Y5Y?U*I_cA%x?BVhlwgHWol}u)d9!gW!xAxQ=3)reUBM78bT`+sy1N zqhJ{G#(&`E3uptpUc30=%E8si>x3{l~f(5ALy8klXfINTyyRee$ T{+Ho?uKRa${{Op^>;C@$S=}%|