From 84cd86d19dfee4b08c0fa4b7e9d53027cd596cf1 Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 5 Dec 2007 06:28:59 +0000
Subject: [PATCH] =?UTF-8?q?misc=E3=81=AEInitAllocator=E3=81=A7=E3=83=92?=
 =?UTF-8?q?=E3=83=BC=E3=83=97=E9=A0=98=E5=9F=9F=E3=82=92=E3=82=BC=E3=83=AD?=
 =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=82=A2=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4?=
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@311 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/systemMenu_RED/Launcher/ARM9/src/launcher.c | 8 +++++---
 build/systemMenu_RED/misc/src/misc.c              | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
index 0f0b31c3..43b94f4e 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
@@ -185,7 +185,7 @@ static void SetDefaultBanner( TitleProperty *titleprop )
 				titleprop[l].pBanner = no_card_banner;
 			}
 		}
-		else if(titleprop[l].pBanner == NULL) //IDがゼロじゃないのにバナーがNULLならノーバナー
+		else if(titleprop[l].pBanner == NULL) //isValidフラグがTRUEでバナーがNULLならノーバナー
 		{
 			titleprop[l].pBanner = nobanner_banner;
 		}
@@ -587,7 +587,8 @@ static void DrawScrollBar( TitleProperty *pTitleList )
 	static int col_count_d = 1;
 	static const int COL_FLAME_MAX = 30;
 	static const int COL_NUM = 15;
-	static const int COL_DIV = COL_FLAME_MAX / COL_NUM;
+	static const int COL_DIV = (COL_FLAME_MAX / COL_NUM);
+	int colc_cold;
 	
 	col_count += col_count_d;
 	if(col_count < 0)
@@ -601,11 +602,12 @@ static void DrawScrollBar( TitleProperty *pTitleList )
 		col_count_d = -1;
 	}
 	
+	colc_cold = col_count/COL_DIV;
 	for(l=0; l<LAUNCHER_TITLE_LIST_NUM; l++)
 	{
 		PutStringUTF16( (int)(BAR_ZERO_X + l * (ITEM_SIZE + ITEM_INTERVAL)),
 						BAR_ZERO_Y,
-						(pTitleList[l].flags.isValid ? (TXT_UCOLOR_G0 + col_count/COL_DIV) : TXT_COLOR_BLACK),
+						(pTitleList[l].flags.isValid ? (TXT_UCOLOR_G0 + colc_cold) : TXT_COLOR_BLACK),
 						(const u16 *)L"・" );
 	}
 	for(l=0; l<4; l++)
diff --git a/build/systemMenu_RED/misc/src/misc.c b/build/systemMenu_RED/misc/src/misc.c
index 47c6ad4f..bc932388 100644
--- a/build/systemMenu_RED/misc/src/misc.c
+++ b/build/systemMenu_RED/misc/src/misc.c
@@ -162,6 +162,8 @@ void InitAllocator( void )
     void* heapMemory    = OS_AllocFromMainArenaLo( heapSize, 16 );
     NNSFndHeapHandle    heapHandle;
     SDK_NULL_ASSERT( pAllocator );
+    
+    MI_CpuClear16( (void *)arenaLow, heapSize);
 
     heapHandle = NNS_FndCreateExpHeap( heapMemory, heapSize );
     SDK_ASSERT( heapHandle != NNS_FND_HEAP_INVALID_HANDLE );