Skip to content

Commit

Permalink
v2.13
Browse files Browse the repository at this point in the history
  • Loading branch information
@crystalct
crystalct committed Nov 19, 2020
1 parent 4f66cb6 commit 8fba7e6
Show file tree
Hide file tree
Showing 12 changed files with 120 additions and 104 deletions.
21 changes: 13 additions & 8 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ $(error "Please set PORTLIBS in your environment.")
endif

include $(PSL1GHT)/ppu_rules
RETROARCH_PATH := ../tmpwork/Retroarch

#---------------------------------------------------------------------------------
# TARGET is the name of the output
Expand All @@ -32,7 +33,7 @@ ICON0 := ICON0.PNG
ICON1 := ICON1.PAM
PIC1 := PIC1.PNG
SFOXML := sfo.xml
APP_VER := 2.10
APP_VER := 2.13

#---------------------------------------------------------------------------------
# options for code generation
Expand Down Expand Up @@ -131,7 +132,7 @@ $(BUILD):
#---------------------------------------------------------------------------------
clean:
@echo clean ...
@rm -fr $(BUILD) *.elf *.self *.pkg *~ */*~
@rm -fr $(BUILD) *.elf *.BIN *.SELF *.self *.pkg *~ */*~

#---------------------------------------------------------------------------------
run:
Expand All @@ -146,21 +147,25 @@ pkg: npdrm
$(VERB) $(PKG) --contentid $(CONTENTID) $(CURDIR)/../pkg/ $(TARGET)_$(APP_VER).pkg >> /dev/null
#---------------------------------------------------------------------------------

pkgsnes: npdrm
pkgsnes:
$(VERB) echo building SNES upgrade pkg ... $(notdir $@)
$(VERB) $(SFO) --title "$(TITLE)" --appid "$(APPID)" -f $(SFOXML) $(CURDIR)/../pkgSnes/PARAM.SFO
$(VERB) cp -f $(RETROARCH_PATH)/retroarch_ps3.elf $(CURDIR)/snes9x.elf
$(VERB) bin/make_self_wc.exe $(CURDIR)/snes9x.elf $(CURDIR)/../pkgMD/USRDIR/cores/snes9x.SELF
$(VERB) $(SFO) --title "$(TITLE)" --appid "$(APPID)"
$(VERB) $(PKG) --contentid $(CONTENTID) $(CURDIR)/../pkgSnes/ $(TARGET)_$(APP_VER)_snes_upgrade.pkg >> /dev/null
#---------------------------------------------------------------------------------

pkgmd: npdrm
pkgmd:
$(VERB) echo building Mega Drive upgrade pkg ... $(notdir $@)
$(VERB) $(SFO) --title "$(TITLE)" --appid "$(APPID)" -f $(SFOXML) $(CURDIR)/../pkgMD/PARAM.SFO
$(VERB) cp -f $(RETROARCH_PATH)/retroarch_ps3.elf $(CURDIR)/genesis_plus_gx.elf
$(VERB) bin/make_self_wc.exe $(CURDIR)/genesis_plus_gx.elf $(CURDIR)/../pkgMD/USRDIR/cores/genesis_plus_gx.SELF
$(VERB) $(SFO) --title "$(TITLE)" --appid "$(APPID)"
$(VERB) $(PKG) --contentid $(CONTENTID) $(CURDIR)/../pkgMD/ $(TARGET)_$(APP_VER)_megadrive_upgrade.pkg >> /dev/null
#---------------------------------------------------------------------------------

pkgAmiga: npdrm
pkgAmiga:
$(VERB) echo building Amiga upgrade pkg ... $(notdir $@)
$(VERB) $(SFO) --title "$(TITLE)" --appid "$(APPID)" -f $(SFOXML) $(CURDIR)/../pkgAmiga/PARAM.SFO
$(VERB) $(SFO) --title "$(TITLE)" --appid "$(APPID)"
$(VERB) $(PKG) --contentid $(CONTENTID) $(CURDIR)/../pkgAmiga/ $(TARGET)_$(APP_VER)_amiga_upgrade.pkg >> /dev/null
#---------------------------------------------------------------------------------

Expand Down
Binary file modified source/.vs/slnx.sqlite
View file
Binary file not shown.
Binary file modified source/.vs/source/v16/.suo
View file
Binary file not shown.
Binary file modified source/.vs/source/v16/Browse.VC.db
View file
Binary file not shown.
Binary file modified source/.vs/source/v16/ipch/AutoPCH/ea7a07ee097cceb7/FBA_RL_SECTION.ipch
View file
Binary file not shown.
28 changes: 14 additions & 14 deletions source/fba_rl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <rsx/rsx.h>

// --------------------------------------------------------------------
#define _APP_VER "2.12"
#define _APP_VER "2.13"
#define _APP_TITLE "\tFB NEO PLUS RETRO LOADER "_APP_VER" - by CaptainCPS-X [2013] CrystalCT [2020]"
// --------------------------------------------------------------------

Expand Down Expand Up @@ -122,30 +122,30 @@ void _ScanROMs(uint64_t);
#define MASKCUSTOM 32


#define MENU_OPT_AUTO_AR 0
#define MENU_OPT_AUTO_CFG 1
#define MENU_OPT_MUSIC 2
#define MENU_OPT_RETROARCH_MENU 3
#define MENU_OPT_DISP_CLONES 4
#define MENU_OPT_USE_UNIBIOS 5
#define MENU_OPT_DISP_MISS_GMS 6
#define MENU_OPT_FILTER_START (MENU_OPT_DISP_MISS_GMS+1)
#define MENU_OPT_AUTO_CFG 0
#define MENU_OPT_MUSIC 1
#define MENU_OPT_RETROARCH_MENU 2
#define MENU_OPT_DISP_CLONES 3
#define MENU_OPT_USE_UNIBIOS 4
#define MENU_OPT_DISP_MISS_GMS 5
#define MENU_OPT_MD_DEF_CORE 6
#define MENU_OPT_FILTER_START (MENU_OPT_MD_DEF_CORE+1)

#define RETROARCH_MENU_GLUI_S "glui"
#define RETROARCH_MENU_GLUI_S "GLUI"
#define RETROARCH_MENU_GLUI_N 0
#define RETROARCH_MENU_OZONE_S "ozone"
#define RETROARCH_MENU_OZONE_S "OZONE"
#define RETROARCH_MENU_OZONE_N 1
#define RETROARCH_MENU_RGUI_S "rgui"
#define RETROARCH_MENU_RGUI_S "RGUI"
#define RETROARCH_MENU_RGUI_N 2
#define RETROARCH_MENU_XMB_S "xmb"
#define RETROARCH_MENU_XMB_S "XMB"
#define RETROARCH_MENU_XMB_N 3


#define SAFE_FREE(x) if(x) { free(x); *&x = NULL; }
#define SAFE_DELETE(x) if(x) { delete x; *&x = NULL; }

#define MAX_GAMES 20000 // <-- should be enough xD
#define TOTAL_DRV_GAMES 16543
#define TOTAL_DRV_GAMES 16919

class c_game
{
Expand Down
20 changes: 12 additions & 8 deletions source/fba_rl_input.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,6 @@ void c_fbaRL::InputFrame()
{
int nMenuItem = options_menu->nSelectedItem;

// Auto Aspect ratio toggle
if(nMenuItem == MENU_OPT_AUTO_AR)
{
g_opt_bAutoAspectRatio = g_opt_bAutoAspectRatio ? false : true;
}

// Auto Input CFG create toggle
if(nMenuItem == MENU_OPT_AUTO_CFG)
{
Expand Down Expand Up @@ -298,6 +292,15 @@ void c_fbaRL::InputFrame()

}

// MegaDrive Default Core
if (nMenuItem == MENU_OPT_MD_DEF_CORE)
{
if (!fileExist("/dev_hdd0/game/FBNE00123/USRDIR/cores/genesis_plus_gx.SELF"))
g_opt_nMegaDriveDefaultCore = 0;
else
g_opt_nMegaDriveDefaultCore = g_opt_nMegaDriveDefaultCore ? 0 : 1;
}

// Display clones
if(nMenuItem == MENU_OPT_DISP_CLONES)
{
Expand Down Expand Up @@ -366,7 +369,8 @@ void c_fbaRL::InputFrame()
}
}
if (strcmp(fgames[nSelectedGame]->sysmask, "MASKMEGADRIVE") == 0){
sprintf(fba_core_path,"/dev_hdd0/game/FBNE00123/USRDIR/cores/genesis_plus_gx.SELF");
if (strcmp(fgames[nSelectedGame]->subsystem, "megacd") == 0 || g_opt_nMegaDriveDefaultCore == 1)
sprintf(fba_core_path,"/dev_hdd0/game/FBNE00123/USRDIR/cores/genesis_plus_gx.SELF");
if (!fileExist(fba_core_path)) {
nStatus = STATUS_MISSING_CORE_4;
break;
Expand Down Expand Up @@ -404,7 +408,7 @@ void c_fbaRL::InputFrame()
gamepath,
(char*)fba_rl_path,
(char*)(fileExist(g_opt_szInputCFG[nSysMask]) ? g_opt_szInputCFG[nSysMask] : "DUMMY_ARG"),
(char*)((g_opt_bAutoAspectRatio) ? aspect_ratio : "DUMMY_ARG"),
(char*)("DUMMY_ARG"),
//(char*)(g_opt_bUseAltMenuKeyCombo ? "yes" : "no"),
//(char*)(g_opt_bUseUNIBIOS ? "yes" : "no") //CRYSTAL
(char*)(games[fgames[nSelectedGame]->GameID]->subsystem), //SUBSYSTEM
Expand Down
4 changes: 2 additions & 2 deletions source/fba_rl_menu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ void c_fbaRL::EndMainMenu()

void c_fbaRL::InitOptionsMenu()
{
options_menu = new c_Menu(7);
options_menu = new c_Menu(7); // 7 -> num max of rows shown on screen

options_menu->AddItem((char*)"AUTO ASPECT RATIO");
options_menu->AddItem((char*)"AUTO CREATE ALL INPUT .CFG");
options_menu->AddItem((char*)"BACKGROUND MUSIC");
options_menu->AddItem((char*)"RETRO ARCH MENU");
options_menu->AddItem((char*)"DISPLAY CLONE GAMES");
options_menu->AddItem((char*)"USE NEO-GEO UNI-BIOS");
options_menu->AddItem((char*)"DISPLAY MISSING GAMES");
options_menu->AddItem((char*)"MEGADRIVE DEFAULT CORE");

options_menu->AddItem((char*)"FILTER [CAPCOM MISC]");
options_menu->AddItem((char*)"FILTER [CAVE]");
Expand Down
72 changes: 15 additions & 57 deletions source/fba_rl_section.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,71 +468,60 @@ void c_fbaRL::Options_Frame()
float y = 0.8900f;
//float size = nSmallSize2; // small text 2

////if(nFrameStep == 0) { y += nShadowXYpos2; x +=nShadowXYpos2; }

if(nMenuItem == MENU_OPT_AUTO_AR) {
snprintf(txt,sizeof(txt),"Auto set the proper aspect ratio on game launch.");
fnt_print_vram(&fontM, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(x * rsxbuffer->width),
(int)(y * rsxbuffer->height),
txt, nColor, 0x00000000, fontSize, fontSize);

////cellDbgFontPrintf(x, y, size, nColor, "Auto set the proper aspect ratio on game launch.");
}

if(nMenuItem == MENU_OPT_AUTO_CFG) {
snprintf(txt,sizeof(txt),"Auto create basic Input Preset CFG files for all systems.");
fnt_print_vram(&fontM, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(x * rsxbuffer->width),
(int)(y * rsxbuffer->height),
txt, nColor, 0x00000000, fontSize, fontSize);
////cellDbgFontPrintf(x, y, size, nColor, "Auto create basic Input Preset CFG files for all systems.");
}

if(nMenuItem == MENU_OPT_MUSIC) {
snprintf(txt,sizeof(txt),"Enable / Disable background MP3 music.");
fnt_print_vram(&fontM, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(x * rsxbuffer->width),
(int)(y * rsxbuffer->height),
txt, nColor, 0x00000000, fontSize, fontSize);
////cellDbgFontPrintf(x, y, size, nColor, "Use [SELECT] + [TRIANGLE] and [SELECT] + [SQUARE] to access RetroArch menu.");
}

if(nMenuItem == MENU_OPT_RETROARCH_MENU) {
snprintf(txt,sizeof(txt),"Change Retro Arch menu driver.");
fnt_print_vram(&fontM, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(x * rsxbuffer->width),
(int)(y * rsxbuffer->height),
txt, nColor, 0x00000000, fontSize, fontSize);
////cellDbgFontPrintf(x, y, size, nColor, "Change Retro Arch menu driver.");
}

if(nMenuItem == MENU_OPT_DISP_CLONES) {
snprintf(txt,sizeof(txt),"Enable / Disable display of clone games.");
fnt_print_vram(&fontM, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(x * rsxbuffer->width),
(int)(y * rsxbuffer->height),
txt, nColor, 0x00000000, fontSize, fontSize);
////cellDbgFontPrintf(x, y, size, nColor, "Enable / Disable display of clone games.");
}

if(nMenuItem == MENU_OPT_USE_UNIBIOS) {
snprintf(txt,sizeof(txt),"Use UNI-BIOS when playing Neo-Geo games.");
fnt_print_vram(&fontM, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(x * rsxbuffer->width),
(int)(y * rsxbuffer->height),
txt, nColor, 0x00000000, fontSize, fontSize);
////cellDbgFontPrintf(x, y, size, nColor, "Use UNI-BIOS when playing Neo-Geo games.");
}

if(nMenuItem == MENU_OPT_DISP_MISS_GMS) {
snprintf(txt,sizeof(txt),"Enable / Disable display of missing games.");
fnt_print_vram(&fontM, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(x * rsxbuffer->width),
(int)(y * rsxbuffer->height),
txt, nColor, 0x00000000, fontSize, fontSize);
////cellDbgFontPrintf(x, y, size, nColor, "Enable / Disable display of missing games.");
}

if (nMenuItem == MENU_OPT_MD_DEF_CORE) {
snprintf(txt, sizeof(txt), "Select default core for MegaDrive games.");
fnt_print_vram(&fontM, (u32*)rsxbuffer->ptr, rsxbuffer->width, (int)(x * rsxbuffer->width),
(int)(y * rsxbuffer->height),
txt, nColor, 0x00000000, fontSize, fontSize);
}

if(nMenuItem >= MENU_OPT_FILTER_START && nMenuItem <= MASKFAVORITE+MENU_OPT_FILTER_START) {
snprintf(txt,sizeof(txt),"Choose the emulated system(s) you want to be displayed / filtered.");
fnt_print_vram(&fontM, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(x * rsxbuffer->width),
(int)(y * rsxbuffer->height),
txt, nColor, 0x00000000, fontSize, fontSize);
////cellDbgFontPrintf(x, y, size, nColor, "Choose the emulated system(s) you want to be displayed / filtered.");
}

// Rom Paths (directories)
Expand All @@ -542,7 +531,6 @@ void c_fbaRL::Options_Frame()
fnt_print_vram(&fontM, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(x * rsxbuffer->width),
(int)(y * rsxbuffer->height),
txt, nColor, 0x00000000, fontSize, fontSize);
////cellDbgFontPrintf(x, y, size, nColor, "Current: %s", g_opt_szROMPaths[nRomPath]);
}

// Input Preset Paths (CFG)
Expand All @@ -552,37 +540,19 @@ void c_fbaRL::Options_Frame()
fnt_print_vram(&fontM, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(x * rsxbuffer->width),
(int)(y * rsxbuffer->height),
txt, nColor, 0x00000000, fontSize, fontSize);
////cellDbgFontPrintf(x, y, size, nColor, "Current: %s", g_opt_szInputCFG[nCfgPath]);
}

nColor = nSelectColor;

////if(nFrameStep == 0) { nColor = nShadowColor; } // Shadow color
}

if(nMenuItem == MENU_OPT_AUTO_AR) {
snprintf(txt,sizeof(txt),"%s: [%s]", options_menu->item[nMenuItem]->szMenuLabel,
g_opt_bAutoAspectRatio ? "ON" : "OFF");
fnt_print_vram(&fontL, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(xPos * rsxbuffer->width),
(int)(yPos * rsxbuffer->height),
txt, nColor, 0x00000000, 1, 1);

// cellDbgFontPrintf(xPos, yPos, nfontLize, nColor, "%s: [%s]",
// options_menu->item[nMenuItem]->szMenuLabel,
// g_opt_bAutoAspectRatio ? "ON" : "OFF"
// );
}

if(nMenuItem == MENU_OPT_AUTO_CFG) {
snprintf(txt,sizeof(txt),"%s: [%s]", options_menu->item[nMenuItem]->szMenuLabel,
g_opt_bAutoInputCfgCreate ? "ON" : "OFF");
fnt_print_vram(&fontL, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(xPos * rsxbuffer->width),
(int)(yPos * rsxbuffer->height),
txt, nColor, 0x00000000, 1, 1);
// cellDbgFontPrintf(xPos, yPos, nfontLize, nColor, "%s: [%s]",
// options_menu->item[nMenuItem]->szMenuLabel,
// g_opt_bAutoInputCfgCreate ? "ON" : "OFF"
// );
}

if(nMenuItem == MENU_OPT_MUSIC) {
Expand All @@ -592,10 +562,6 @@ void c_fbaRL::Options_Frame()
fnt_print_vram(&fontL, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(xPos * rsxbuffer->width),
(int)(yPos * rsxbuffer->height),
txt, nColor, 0x00000000, 1, 1);
// cellDbgFontPrintf(xPos, yPos, nfontLize, nColor, "%s: [%s]",
// options_menu->item[nMenuItem]->szMenuLabel,
// g_opt_bUseAltMenuKeyCombo ? "ON" : "OFF"
// );
}

if(nMenuItem == MENU_OPT_RETROARCH_MENU) {
Expand All @@ -604,10 +570,6 @@ void c_fbaRL::Options_Frame()
fnt_print_vram(&fontL, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(xPos * rsxbuffer->width),
(int)(yPos * rsxbuffer->height),
txt, nColor, 0x00000000, 1, 1);
// cellDbgFontPrintf(xPos, yPos, nfontLize, nColor, "%s: [%s]",
// options_menu->item[nMenuItem]->szMenuLabel,
// g_opt_sRetroArchMenu[g_opt_nRetroArchMenu]
// );
}

if(nMenuItem == MENU_OPT_DISP_CLONES) { //CRYSTAL
Expand All @@ -616,10 +578,6 @@ void c_fbaRL::Options_Frame()
fnt_print_vram(&fontL, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(xPos * rsxbuffer->width),
(int)(yPos * rsxbuffer->height),
txt, nColor, 0x00000000, 1, 1);
// cellDbgFontPrintf(xPos, yPos, nfontLize, nColor, "%s: [%s]",
// options_menu->item[nMenuItem]->szMenuLabel,
// g_opt_bDisplayCloneGames ? "ON" : "OFF"
// );
}

if(nMenuItem == MENU_OPT_USE_UNIBIOS) {
Expand All @@ -628,10 +586,6 @@ void c_fbaRL::Options_Frame()
fnt_print_vram(&fontL, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(xPos * rsxbuffer->width),
(int)(yPos * rsxbuffer->height),
txt, nColor, 0x00000000, 1, 1);
// cellDbgFontPrintf(xPos, yPos, nfontLize, nColor, "%s: [%s]",
// options_menu->item[nMenuItem]->szMenuLabel,
// g_opt_bUseUNIBIOS ? "ON" : "OFF"
// );
}

if(nMenuItem == MENU_OPT_DISP_MISS_GMS) {
Expand All @@ -640,10 +594,14 @@ void c_fbaRL::Options_Frame()
fnt_print_vram(&fontL, (u32 *)rsxbuffer->ptr, rsxbuffer->width, (int)(xPos * rsxbuffer->width),
(int)(yPos * rsxbuffer->height),
txt, nColor, 0x00000000, 1, 1);
// cellDbgFontPrintf(xPos, yPos, nfontLize, nColor, "%s: [%s]",
// options_menu->item[nMenuItem]->szMenuLabel,
// g_opt_bDisplayMissingGames ? "ON" : "OFF"
// );
}

if (nMenuItem == MENU_OPT_MD_DEF_CORE) {
snprintf(txt, sizeof(txt), "%s: [%s]", options_menu->item[nMenuItem]->szMenuLabel,
g_opt_sMegaDriveCores[g_opt_nMegaDriveDefaultCore]);
fnt_print_vram(&fontL, (u32*)rsxbuffer->ptr, rsxbuffer->width, (int)(xPos * rsxbuffer->width),
(int)(yPos * rsxbuffer->height),
txt, nColor, 0x00000000, 1, 1);
}

// Custom System Filters
Expand Down
Loading

0 comments on commit 8fba7e6

Please sign in to comment.