rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

ランチャータッチパッド一部対応

Browse Source 
及びデータ宣言ミス修正……

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@213 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yoshida_teruhisa 2007-11-19 07:18:42 +00:00
parent 1f6e9cc3e4
commit 5f7b702fef
5 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
build/systemMenu_RED/Launcher/ARM9/src/launcher.c
View File

@ -37,7 +37,7 @@
// extern data------------------------------------------
extern u32 bg_char_data[16 * 3];
extern u32 bg_char_data[16 * 5];
extern u16 bg_scr_data[32 * 32];
extern u16 bg_scr_data2[32 * 32];
@ -132,17 +132,6 @@ static void BannerDraw(int cursor, int selected, TitleProperty *titleprop)
int l;
MtxFx22 mtx;
/*
static int testcount=0;
testcount++;
if( (testcount/5)%2 ==1 ) titleprop[1].titleID = 0;//1secごとにTitlePropertyの2を変化させてみる活線挿抜擬似テスト
else
{
titleprop[1].titleID = 1;
titleprop[1].pBanner = download_banner;
}
*/
// TitleProperty弄り
for(l=0;l<LAUNCHER_TITLE_LIST_NUM;l++)
@ -327,9 +316,25 @@ void LauncherLoading( TitleProperty *pTitleList )
if(fadecount < 93) fadecount++;
}
// LauncherMainのSelectSomethingByTPで使うSelectSomethingFuncの実装
static BOOL SelectCenterFunc( u16 *csr, TPData *tgt )
{
// 単純な実装例
int x = 128-32-64-48+2*56;
int y = 96-16;
if(WithinRangeTP( x, y, x+64, y+64, tgt ))
{
*csr = (u16)1;
return TRUE;
}
return FALSE;
}
// ランチャーメイン
TitleProperty *LauncherMain( TitleProperty *pTitleList )
{
SelectSomethingFunc func[1]={SelectCenterFunc};
static BOOL up_bl_bak = FALSE;
static BOOL dw_bl_bak = FALSE;
BOOL up_bl_trg = FALSE;
@ -338,6 +343,7 @@ TitleProperty *LauncherMain( TitleProperty *pTitleList )
BOOL tp_select = FALSE;
TitleProperty *ret = NULL;
int brightness;
u16 dummy;
// RTC情報の取得＆表示
GetAndDrawRTCData( &g_rtcDraw, FALSE );
@ -389,12 +395,15 @@ TitleProperty *LauncherMain( TitleProperty *pTitleList )
if(s_csr%CURSOR_PER_SELECT == 0){
csr_v = 0;
selected = s_csr/CURSOR_PER_SELECT;
}
if( ( pad.trg & PAD_BUTTON_A ) || ( tp_select ) ) { // メニュー項目への分岐
if(pTitleList[selected].titleID != 0)
{
ret = &pTitleList[selected];
// このときだけ決定可能
tp_select = SelectSomethingByTP(&dummy, func, 1 );
if( ( pad.trg & PAD_BUTTON_A ) || ( tp_select ) ) { // メニュー項目への分岐
if(pTitleList[selected].titleID != 0)
{
ret = &pTitleList[selected];
}
}
}

2
build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c
View File

@ -37,7 +37,7 @@
// extern data------------------------------------------
extern u32 bg_char_data[16 * 3];
extern u32 bg_char_data[16 * 6];
extern u16 bg_scr_data[32 * 32];
// function's prototype declaration---------------------

4
build/systemMenu_RED/MachineSettings/ARM9/src/setOwnerInfo.c
View File

@ -73,7 +73,7 @@ typedef enum NameOrComment
// extern data----------------------------------
extern u32 bg_char_data[16 * 3];
extern u32 bg_char_data[16 * 6];
extern u16 bg_scr_data[32 * 32];
extern u16 bg_birth_scr_data[32 * 32];
@ -663,7 +663,7 @@ static void CheckDate( void )
// 誕生日編集メイン
static int SetBirthdayMain( void )
{
SelectSomethingFunc func[3]={SelectCancelFunc, SelectOKFunc};
SelectSomethingFunc func[2]={SelectCancelFunc, SelectOKFunc};
BOOL tp_touch = FALSE;
u16 temp_csr;
u16 temp_ok_cancel;

4
build/systemMenu_RED/data/BGData_Launcher.c
View File

@ -1,5 +1,5 @@
// BGキャラクタ
u32 bg_char_data[16 * 3] = {
u32 bg_char_data[16 * 5] = {
0x00000000, 0x00000000, 0x00000000, 0x00000000,// 0000h
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x11111111, 0x44444444, 0x77777777, 0x99999999,// 0001h
@ -12,6 +12,8 @@ u32 bg_char_data[16 * 3] = {
0x11111111, 0x11111111, 0x11111111, 0x11111111,
};
// BGスクリーンデータ1
u16 bg_scr_data[32 * 32]=
{

2
build/systemMenu_RED/data/BGData_MachineSettings.c
View File

@ -1,5 +1,5 @@
// BGキャラクタ
u32 bg_char_data[16 * 3] = {
u32 bg_char_data[16 * 6] = {
0x00000000, 0x00000000, 0x00000000, 0x00000000,// 0000h
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x11111111, 0x44444444, 0x77777777, 0x99999999,// 0001h