From 884e8dbc538b3a07084531e5fca0e19af92a04c9 Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 31 Oct 2007 08:30:29 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=9E=9A=E7=9B=AE=E3=81=AE=E3=83=90?=
 =?UTF-8?q?=E3=83=8A=E3=83=BC=E8=A1=A8=E7=A4=BA=E5=8F=8A=E3=81=B3=E3=83=90?=
 =?UTF-8?q?=E3=83=8A=E3=83=BC=E7=A7=BB=E5=8B=95=E5=AE=9F=E9=A8=93?=
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@87 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/systemMenu_RED/Launcher/ARM9/main.rsf   |   2 +-
 .../Launcher/ARM9/src/launcher.c              |  27 ++++++++++++++++++
 build/systemMenu_RED/data/myGameBanner2.bnr   | Bin 0 -> 2624 bytes
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 build/systemMenu_RED/data/myGameBanner2.bnr

diff --git a/build/systemMenu_RED/Launcher/ARM9/main.rsf b/build/systemMenu_RED/Launcher/ARM9/main.rsf
index ee23a3a0..bec679d7 100644
--- a/build/systemMenu_RED/Launcher/ARM9/main.rsf
+++ b/build/systemMenu_RED/Launcher/ARM9/main.rsf
@@ -143,5 +143,5 @@ RomSpec
 	Segment		ALL
 	HostRoot	../../data
 	Root		/data
-	File		NTR_IPL_font_m.NFTR myGameBanner.bnr
+	File		NTR_IPL_font_m.NFTR myGameBanner.bnr myGameBanner2.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 3d8b5cd8..fdd3ed52 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
@@ -112,18 +112,26 @@ static const u16 *const str_backlight[] = {
 
 #define MAX_TITLE_PROPERTY 40
 static BannerFile *banner;
+static BannerFile *banner2;
 static TitleProperty tp[MAX_TITLE_PROPERTY];
 static GXOamAttr banner_oam_attr;
+static GXOamAttr banner_oam_attr2;
 
 // バナー画像のロード及びOBJ関係初期化
+// 実際には、受け取ったリストからイメージデータのアドレスを取得してVRAMにイメージデータをロードし、
+// 表示するぶんだけ毎フレームGXOamAttrにしてやる必要があるっぽい
+// VRAMに格納したデータへは、リストのインデックスからアクセス？
 static void BannerInit()
 {
 	int l;
 	u32 size = CMN_LoadFile( (void **)&banner, "data/myGameBanner.bnr", &g_allocator);
 	NNS_G2D_ASSERT( size > 0 );
+	size = CMN_LoadFile( (void **)&banner2, "data/myGameBanner2.bnr", &g_allocator);
+	NNS_G2D_ASSERT( size > 0 );
 	
     GX_SetVisiblePlane(GX_PLANEMASK_OBJ | GX_PLANEMASK_BG0);      // display only OBJ&BG0
     GX_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K);     // 2D mapping mode
+    
 	GX_LoadOBJPltt( banner->v1.pltt, 0, BNR_PLTT_SIZE );
 	GX_LoadOBJ(banner->v1.image, 0x20, BNR_IMAGE_SIZE);
 	G2_SetOBJAttr(  &banner_oam_attr,								// OAM pointer
@@ -139,6 +147,22 @@ static void BannerInit()
 					0,												// palette
 					0);												// affine
 	DC_FlushRange(&banner_oam_attr, sizeof(banner_oam_attr));
+	
+	GX_LoadOBJ(banner2->v1.image, 0x20+BNR_IMAGE_SIZE, BNR_IMAGE_SIZE);
+	G2_SetOBJAttr(  &banner_oam_attr2,								// OAM pointer
+					128,												// X position
+					128,												// Y position
+					0,												// Priority
+					GX_OAM_MODE_NORMAL,								// Bitmap mode
+					FALSE,											// mosaic off
+					GX_OAM_EFFECT_NONE,								// affine off
+					GX_OAM_SHAPE_32x32,								// 32x32 size
+					GX_OAM_COLOR_16,								// 16 color
+					17,												// charactor
+					0,												// palette
+					0);												// affine
+	DC_FlushRange(&banner_oam_attr2, sizeof(banner_oam_attr));
+	
 	for(l=0;l<MAX_TITLE_PROPERTY;l++)
 	{
 		tp[l].titleID = 0;
@@ -148,7 +172,10 @@ static void BannerInit()
 
 static void BannerDraw()
 {
+	banner_oam_attr.x++;
+	banner_oam_attr.y++;
 	GX_LoadOAM(&banner_oam_attr, 0, sizeof(banner_oam_attr));
+	GX_LoadOAM(&banner_oam_attr2,BNR_IMAGE_SIZE, sizeof(banner_oam_attr));
 }
 
 #endif //DBGBNR
diff --git a/build/systemMenu_RED/data/myGameBanner2.bnr b/build/systemMenu_RED/data/myGameBanner2.bnr
new file mode 100644
index 0000000000000000000000000000000000000000..8a361a66ed9ca12e741ddc0a63e640d63d38df81
GIT binary patch
literal 2624
zcmdT^Ply|36o0LUtV<6jDtL^^g2}=9$)trM9!$Pzu`E_&C$4SjvQ0bL*mM(;th20Q
zuSqQwq#h;+LQ#-ez0`x&=~k+y?O}GKhb;)En}Za*WCR!2-4@5+n`8}2*W<Phym|Az
z|L^zSHxJS5q0u*fT%pY#&+~rmcDwGacH3>Y7eJ2NUH~}-cfq+0wFh<AaU9!mF53ki
zPxn^)=oQ;Oa>ce-57)MBTMgT?OkLA79387+)-1DLgPPioGi25bwLW90s?4d*sID6O
zKznu7bqb5Fqie2ny9=^GcihW2ZP&gz2eJ;&&so~MWwk%+#rM31xsJf=jkR;@=D9zR
z#xN1MUNdrFI+zZo8>_|NjiRpQc4t(5w<dksrOFIwe3z8oh?ECL5|VQ)GtDhEmaQcd
zRQJhj)|SoY%)04$YxUE{T5Yvh8^q5bjb`W>E$5AEdS+bJJxyjbRce|{fF-~bRVvW~
zBT9<Ni$+sQG?G#t1%)E1XegA5go4TCdedmtzGKo`GcwUa?X8@iDFH{4QtAK{X;d(&
zAV5F90#yQpw-QB~2v{T%2?oJ}Q3O^LCBkaX5ef#A!G95qw?R$xc6P_dk6n9W=*j)@
zv(GN>ai4!Ancjasy?S&{?yaJC`hxgH+!Y;hL3|`W7r%)iFVK0|dry2Vz7<!+>*8H8
zDTe9kGmXQqiE)wCpG%*FZO>;^tbA}ryaTK4Vzc#o(B&~w=_QKOL7Jcvg{exDbOL;W
z3ZOEb!grpsRHP|<#VF8;`&LD~Ct>lXZ{716{)bluKGX0z4$BF|9mGBkp9-Sppk>Vo
z-=+%5DSYqTQpjSom(u9}WmKC-JzUK!YAw)He%~vQF&<oVPdY$`B^!v8{BFxM?Bf<D
z9i8QYAKNezQ+}K>PMv-n#(BDLkp-5VpHbOb1Y)!g8xW@?@|Ni?>gd(H(bp_$<Q;f{
zP6C@e=FJtd4evv5lEct$Y)b`F_Tf%*urd&H3Vm^hj4gW|0?*^LwUfU0TE*x^>^|>*
z5jAEpwZZIpYJBD{3;nrP{Eg4yl=pQTIF(?-)91OD|F)g>C(jbz1Ku3ot0K-Em-n6b
zrUESZ9!%T^L}K(Rc0W$iuZZs}&#j0$xudK<C%)^v!^ir4FdBouLJ?hW+z#$)a6kAo
zz=u&_33tqQs)y43-hoS{JFl$0|Ka&RGl9uKXNUL9!B5hB-u}P+qu+baH<OMw&wddm
z*{oh4YlSJ$k=Mf{ei&OETdIB)rje_U-#D@q#)N<RX4|LVH^apCRoHxaZT`}Yi$7o7
N`JcMYvOYNSzW`^1;2;11

literal 0
HcmV?d00001