From 7ca34093be1833ff209e84aca81e987860bc0114 Mon Sep 17 00:00:00 2001 From: Nebuleon Fumika Date: Sun, 20 Jan 2013 19:17:48 -0500 Subject: Remove GBAFILE from the icon list as it's never used. --- source/nds/draw.c | 79 +++++++++++++++++++++++++++-------------------------- source/nds/draw.h | 81 +++++++++++++++++++++++++++---------------------------- 2 files changed, 78 insertions(+), 82 deletions(-) (limited to 'source/nds') diff --git a/source/nds/draw.c b/source/nds/draw.c index cc1e0c1..f373aa3 100644 --- a/source/nds/draw.c +++ b/source/nds/draw.c @@ -66,49 +66,48 @@ char gui_picture[GUI_PIC_BUFSIZE]; struct gui_iconlist gui_icon_list[]= { //file system - /* 00 */ {"gbafile", 16, 15, NULL}, - /* 01 */ {"zipfile", 16, 16, NULL}, - /* 02 */ {"directory", 16, 16, NULL}, - /* 03 */ {"sfcfile", 16, 16, NULL}, + /* 00 */ {"zipfile", 16, 16, NULL}, + /* 01 */ {"directory", 16, 16, NULL}, + /* 02 */ {"sfcfile", 16, 16, NULL}, //title - /* 04 */ {"stitle", 256, 33, NULL}, + /* 03 */ {"stitle", 256, 33, NULL}, //main menu - /* 05 */ {"savo", 52, 52, NULL}, - /* 06 */ {"ssaveo", 52, 52, NULL}, - /* 07 */ {"stoolo", 52, 52, NULL}, - /* 08 */ {"scheato", 52, 52, NULL}, - /* 09 */ {"sother", 52, 52, NULL}, - /* 10 */ {"sexito", 52, 52, NULL}, - /* 11 */ {"smsel", 79, 15, NULL}, - /* 12 */ {"smnsel", 79, 15, NULL}, - - /* 13 */ {"snavo", 52, 52, NULL}, - /* 14 */ {"snsaveo", 52, 52, NULL}, - /* 15 */ {"sntoolo", 52, 52, NULL}, - /* 16 */ {"sncheato", 52, 52, NULL}, - /* 17 */ {"snother", 52, 52, NULL}, - /* 18 */ {"snexito", 52, 52, NULL}, - - /* 19 */ {"sunnof", 16, 16, NULL}, - /* 20 */ {"smaini", 85, 38, NULL}, - /* 21 */ {"snmaini", 85, 38, NULL}, - /* 22 */ {"smaybgo", 256, 192, NULL}, - - /* 23 */ {"sticon", 29, 13, NULL}, - /* 24 */ {"ssubbg", 256, 192, NULL}, - - /* 25 */ {"subsela", 245, 22, NULL}, - /* 27 */ {"sfullo", 12, 12, NULL}, - /* 28 */ {"snfullo", 12, 12, NULL}, - /* 29 */ {"semptyo", 12, 12, NULL}, - /* 30 */ {"snemptyo", 12, 12, NULL}, - /* 31 */ {"fdoto", 16, 16, NULL}, - /* 32 */ {"backo", 19, 13, NULL}, - /* 33 */ {"nbacko", 19, 13, NULL}, - /* 34 */ {"chtfile", 16, 15, NULL}, - /* 35 */ {"smsgfr", 193, 111, NULL}, - /* 36 */ {"sbutto", 76, 16, NULL} + /* 04 */ {"savo", 52, 52, NULL}, + /* 05 */ {"ssaveo", 52, 52, NULL}, + /* 06 */ {"stoolo", 52, 52, NULL}, + /* 07 */ {"scheato", 52, 52, NULL}, + /* 08 */ {"sother", 52, 52, NULL}, + /* 09 */ {"sexito", 52, 52, NULL}, + /* 10 */ {"smsel", 79, 15, NULL}, + /* 11 */ {"smnsel", 79, 15, NULL}, + + /* 12 */ {"snavo", 52, 52, NULL}, + /* 13 */ {"snsaveo", 52, 52, NULL}, + /* 14 */ {"sntoolo", 52, 52, NULL}, + /* 15 */ {"sncheato", 52, 52, NULL}, + /* 16 */ {"snother", 52, 52, NULL}, + /* 17 */ {"snexito", 52, 52, NULL}, + + /* 18 */ {"sunnof", 16, 16, NULL}, + /* 19 */ {"smaini", 85, 38, NULL}, + /* 20 */ {"snmaini", 85, 38, NULL}, + /* 21 */ {"smaybgo", 256, 192, NULL}, + + /* 22 */ {"sticon", 29, 13, NULL}, + /* 23 */ {"ssubbg", 256, 192, NULL}, + + /* 24 */ {"subsela", 245, 22, NULL}, + /* 25 */ {"sfullo", 12, 12, NULL}, + /* 26 */ {"snfullo", 12, 12, NULL}, + /* 27 */ {"semptyo", 12, 12, NULL}, + /* 28 */ {"snemptyo", 12, 12, NULL}, + /* 29 */ {"fdoto", 16, 16, NULL}, + /* 30 */ {"backo", 19, 13, NULL}, + /* 31 */ {"nbacko", 19, 13, NULL}, + /* 32 */ {"chtfile", 16, 15, NULL}, + /* 33 */ {"smsgfr", 193, 111, NULL}, + /* 34 */ {"sbutto", 76, 16, NULL} }; diff --git a/source/nds/draw.h b/source/nds/draw.h index 2879044..3bc26c1 100644 --- a/source/nds/draw.h +++ b/source/nds/draw.h @@ -104,48 +104,45 @@ struct gui_iconlist{ //extern struct background back_ground; extern struct gui_iconlist gui_icon_list[]; -#define ICON_GBAFILE gui_icon_list[0] -#define ICON_ZIPFILE gui_icon_list[1] -#define ICON_DIRECTORY gui_icon_list[2] -#define ICON_SFCFILE gui_icon_list[3] -//not use -#define ICON_TITLE gui_icon_list[4] - -#define ICON_AVO gui_icon_list[5] -#define ICON_SAVO gui_icon_list[6] -#define ICON_TOOL gui_icon_list[7] -#define ICON_CHEAT gui_icon_list[8] -#define ICON_OTHER gui_icon_list[9] -#define ICON_EXIT gui_icon_list[10] -#define ICON_MSEL gui_icon_list[11] -#define ICON_MNSEL gui_icon_list[12] -//not use -#define ICON_NAVO gui_icon_list[13] -#define ICON_NSAVO gui_icon_list[14] -#define ICON_NTOOL gui_icon_list[15] -#define ICON_NCHEAT gui_icon_list[16] -#define ICON_NOTHER gui_icon_list[17] -#define ICON_NEXIT gui_icon_list[18] - -#define ICON_UNKNOW gui_icon_list[19] -#define ICON_MAINITEM gui_icon_list[20] -#define ICON_NMAINITEM gui_icon_list[21] -#define ICON_MAINBG gui_icon_list[22] - -#define ICON_TITLEICON gui_icon_list[23] -#define ICON_SUBBG gui_icon_list[24] - -#define ICON_SUBSELA gui_icon_list[25] -#define ICON_STATEFULL gui_icon_list[26] -#define ICON_NSTATEFULL gui_icon_list[27] -#define ICON_STATEEMPTY gui_icon_list[28] -#define ICON_NSTATEEMPTY gui_icon_list[29] -#define ICON_DOTDIR gui_icon_list[30] -#define ICON_BACK gui_icon_list[31] -#define ICON_NBACK gui_icon_list[32] -#define ICON_CHTFILE gui_icon_list[33] -#define ICON_MSG gui_icon_list[34] -#define ICON_BUTTON gui_icon_list[35] +#define ICON_ZIPFILE gui_icon_list[0] +#define ICON_DIRECTORY gui_icon_list[1] +#define ICON_SFCFILE gui_icon_list[2] +#define ICON_TITLE gui_icon_list[3] + +#define ICON_AVO gui_icon_list[4] +#define ICON_SAVO gui_icon_list[5] +#define ICON_TOOL gui_icon_list[6] +#define ICON_CHEAT gui_icon_list[7] +#define ICON_OTHER gui_icon_list[8] +#define ICON_EXIT gui_icon_list[9] +#define ICON_MSEL gui_icon_list[10] +#define ICON_MNSEL gui_icon_list[11] +#define ICON_NAVO gui_icon_list[12] +#define ICON_NSAVO gui_icon_list[13] +#define ICON_NTOOL gui_icon_list[14] +#define ICON_NCHEAT gui_icon_list[15] +#define ICON_NOTHER gui_icon_list[16] +#define ICON_NEXIT gui_icon_list[17] + +#define ICON_UNKNOW gui_icon_list[18] +#define ICON_MAINITEM gui_icon_list[19] +#define ICON_NMAINITEM gui_icon_list[20] +#define ICON_MAINBG gui_icon_list[21] + +#define ICON_TITLEICON gui_icon_list[22] +#define ICON_SUBBG gui_icon_list[23] + +#define ICON_SUBSELA gui_icon_list[24] +#define ICON_STATEFULL gui_icon_list[25] +#define ICON_NSTATEFULL gui_icon_list[26] +#define ICON_STATEEMPTY gui_icon_list[27] +#define ICON_NSTATEEMPTY gui_icon_list[28] +#define ICON_DOTDIR gui_icon_list[29] +#define ICON_BACK gui_icon_list[30] +#define ICON_NBACK gui_icon_list[31] +#define ICON_CHTFILE gui_icon_list[32] +#define ICON_MSG gui_icon_list[33] +#define ICON_BUTTON gui_icon_list[34] /****************************************************************************** * -- cgit v1.2.3