diff --git a/Makefile b/Makefile index b1632bc..c0c2036 100644 --- a/Makefile +++ b/Makefile @@ -5,15 +5,14 @@ ifeq ($(strip $(DEVKITARM)),) $(error "Please set DEVKITARM in your environment. export DEVKITARM=devkitARM") endif -export TARGET := EZDS_P +export TARGET := EZFLASH_NEW export TOPDIR := $(CURDIR) -export HBMENU_MAJOR := 1 -export HBMENU_MINOR := 0 -export HBMENU_PATCH := 2 +# export HBMENU_MAJOR := 1 +# export HBMENU_MINOR := 3 -VERSION := $(HBMENU_MAJOR).$(HBMENU_MINOR).$(HBMENU_PATCH) +# VERSION := $(HBMENU_MAJOR).$(HBMENU_MINOR) # GMAE_ICON is the image used to create the game icon, leave blank to use default rule GAME_ICON := @@ -47,7 +46,6 @@ checkarm9: #--------------------------------------------------------------------------------- $(TARGET).nds : $(NITRO_FILES) arm7/$(TARGET).elf arm9/$(TARGET).elf ndstool -c $(TARGET).nds -7 arm7/$(TARGET).elf -9 arm9/$(TARGET).elf \ - -b $(CURDIR)/icon.bmp "hbmenu;$(VERSION);http://devkitpro.org" \ -g ABJJ 01 "EZFLASH NEW" -t banner.bin -d $(NITRO_FILES) dlditool ntro.dldi $(TARGET).nds diff --git a/NitroFS/Nitro.img b/NitroFS/Nitro.img index 9bc2e5d..9693176 100644 Binary files a/NitroFS/Nitro.img and b/NitroFS/Nitro.img differ diff --git a/arm9/gfx/hbmenu_banner.png b/arm9/gfx/hbmenu_banner.png index 585d9a2..047b598 100644 Binary files a/arm9/gfx/hbmenu_banner.png and b/arm9/gfx/hbmenu_banner.png differ diff --git a/arm9/source/iconTitle.cpp b/arm9/source/iconTitle.cpp index 6aed4b6..77fe693 100644 --- a/arm9/source/iconTitle.cpp +++ b/arm9/source/iconTitle.cpp @@ -30,18 +30,27 @@ #include "hbmenu_banner.h" #include "font6x8.h" -#define TITLE_POS_X (13*8) -#define TITLE_POS_Y (10*8) +#define TITLE_POS_X (13*8) +#define TITLE_POS_Y (2) +#define TITLE_POS_OFFSET_Y (10) #define ICON_POS_X 26 -#define ICON_POS_Y 79 +// #define ICON_POS_Y 79 +#define ICON_POS_Y 81 -#define TEXT_WIDTH ((22-4)*8/6) +#define TEXT_WIDTH ((22-4)*8/6) +#define TEXT_WIDTH_VERSTRING ((26-4)*8/6) + +#define VERSTRING_LENGTH 26 static int bg2, bg3; static u16 *sprite; static tNDSBanner banner; +static volatile u32 EZPHWVerBuffer[1] = { 0xFFFFFFFF }; +// static char EZPHardwareVersion[11] = { 'H', 'W', ' ', 'V', 'e', 'r', ':', ' ', '0', '0', '\0' }; +static char EZPHardwareVersion[VERSTRING_LENGTH]; + extern tNDSBanner hbNoIcon_bin; static inline void writecharRS (int row, int col, u16 car) { @@ -59,24 +68,37 @@ static inline void writecharRS (int row, int col, u16 car) { gfx[row*(512/8/2)+col/2] = oldval; } +// Modified to use TITLE_POS_OFFSET_Y as offset since ver string needs to be printed at 0 position outside of main text box. static inline void writeRow (int rownum, const char* text) { + int i, len, r = (rownum + TITLE_POS_OFFSET_Y), p = 0; + len=strlen(text); + + if (len>TEXT_WIDTH)len=TEXT_WIDTH; + + // clear left part + for (i=0;i<(TEXT_WIDTH-len)/2;i++)writecharRS (r, i, 0); + + // write centered text + for (i=(TEXT_WIDTH-len)/2;i<((TEXT_WIDTH-len)/2+len);i++)writecharRS (r, i, text[p++]-' '); + + // clear right part + for (i=((TEXT_WIDTH-len)/2+len);iTEXT_WIDTH) - len=TEXT_WIDTH; + if (len>TEXT_WIDTH_VERSTRING)len=TEXT_WIDTH_VERSTRING; // clear left part - for (i=0;i<(TEXT_WIDTH-len)/2;i++) - writecharRS (rownum, i, 0); + for (i=0;i<(TEXT_WIDTH_VERSTRING-len)/2;i++)writecharRS (0, i, 0); // write centered text - for (i=(TEXT_WIDTH-len)/2;i<((TEXT_WIDTH-len)/2+len);i++) - writecharRS (rownum, i, text[p++]-' '); + for (i=(TEXT_WIDTH_VERSTRING-len)/2;i<((TEXT_WIDTH_VERSTRING-len)/2+len);i++)writecharRS (0, i, text[p++]-' '); // clear right part - for (i=((TEXT_WIDTH-len)/2+len);i