Skip to content

Commit

Permalink
Update to 1.1.2 (Tanooki16)
Browse files Browse the repository at this point in the history
  • Loading branch information
saulfabregwiivc committed Nov 13, 2021
1 parent 7e0a452 commit 050ba94
Show file tree
Hide file tree
Showing 119 changed files with 653 additions and 548 deletions.
29 changes: 23 additions & 6 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,33 @@ FCEUX TX is based on original FCE Ultra GX: https://github.com/dborth/fceugx
Update History
--------------

---FCEUX TX 1.1.2---
---September 1 2021---

- Updated to the latest FCEUX 2.4.0 (git f45ba2f)
- Updated to the latest FCE Ultra GX (git d07dc9e)
- Removed Soft and Sharp video filtering (no difference with filtered and unfiltered)
- Reorganized color palettes order
- Removed Wavebeam color palette (Smooth V2 is similar)
- Added Digital Prime color palette by FBX and renamed Smootz to Smooth V2
- Replaced old PAL color palette by that of r57Shell (more accurate)
- Removed rumble function from menu (your batteries will last longer)
- Updated Korean translation (by DDinghoya)
- Updated UI PNG images
- Compiled with latest devkitPPC/libogc
- Updated Forwarder Channel (1.5)

---FCEUX TX 1.1.1---
---April 13 2021---

- Updated to the latest FCEUX (git 029cea5)
- Fixed inverted names of Soft and Sharp video filtering
- Optimized swap duty cycles setting code
- Added new FBX's Magnum/Smootz color palettes
- Added new Magnum/Smootz color palettes by FBX
Magnum is recommended for crt monitors and Smootz for digital displays
- Removed deprecated color palettes
- Removed "Auto" of name of saves and option to activate/disable it
- Removed "Auto" of name of saves and option to enable/disable it
- Updated Forwarder Channel (1.4)

---FCEUX TX 1.1.0---
---March 25 2021---
Expand All @@ -39,18 +56,18 @@ Update History
- Removed Retrode 2 and Hornet USB controller support (not really useful for Wii)
- Removed PocketNES interoperability
- Removed Dendy support (priority to PAL 576i/288p video mode which does not suit Dendy mode)
- Changed Game Timing name to Region
- Changed Game Timing setting name to Region
- Changed max game image dimensions to 640x512 to fix screenshots
- Changed UI stripes size
- Reorganized credits
- Reverted the app version in menu
- Reworked UI PNG images (improved colors, shadow effects and logo)
- Added setting to activate/disable swap duty cycles to simulate sound of Famiclones
- Added setting to enable/disable swap duty cycles to simulate sound of Famiclones
- Added audio settings in game menu (by Bladeoner)
- Removed menu music (use a bg_music.ogg file in root fceuxtx folder)
- Updated French translation
- Changed root folder name to fceuxtx
- Changed color palettes order
- Reorganized color palettes order
- Added original Virtual Console color palette
- Removed experimental Game Boy DMG color palette
- Compiled with latest devkitPPC/libogc
Expand Down Expand Up @@ -124,7 +141,7 @@ Update History

- Updated to the latest FCEUX (git 88d7f39)
- Added vWii Forwarder Channel for Wii U
- Updated PPU color palettes from FCEUmm (by libretro)
- Updated PPU color palettes from FCEUmm (libretro)
- Added A+B+START trigger to go back to menu with Classic Controller
work with NES/Snes Classic Mini controllers
- Fixed dialogue box text color to screen position and controller settings
Expand Down
Binary file modified hbc/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions hbc/meta.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<app version="1">
<name>FCEUX TX</name>
<coder>Tanooki</coder>
<version>1.1.1</version>
<release_date>20210413</release_date>
<version>1.1.2</version>
<release_date>20210901</release_date>
<short_description>NES/Famicom Emulator</short_description>
<long_description>FCEUX TX is a fork of FCE Ultra GX on Wii.</long_description>
<ahb_access />
Expand Down
4 changes: 0 additions & 4 deletions source/fceugx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@ static void ExitCleanup()

void ExitApp()
{
#ifdef HW_RVL
ShutoffRumble();
#endif

SavePrefs(SILENT);

if (romLoaded && !ConfigRequested && GCSettings.AutoSave == 1)
Expand Down
31 changes: 15 additions & 16 deletions source/fceugx.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "fceux/driver.h"

#define APPNAME "FCEUX TX"
#define APPVERSION "1.1.1"
#define APPVERSION "1.1.2"
#define APPFOLDER "fceuxtx"
#define PREF_FILE_NAME "settings.xml"

Expand Down Expand Up @@ -84,35 +84,34 @@ struct SGCSettings
int AutoSave;
int LoadMethod; // For ROMS: Auto, SD, DVD, USB
int SaveMethod; // For SRAM, Freeze, Prefs: Auto, SD, USB
char LoadFolder[MAXPATHLEN]; // Path to game files
char LastFileLoaded[MAXPATHLEN]; //Last file loaded filename
char SaveFolder[MAXPATHLEN]; // Path to save files
char CheatFolder[MAXPATHLEN]; // Path to cheat files
char ScreenshotsFolder[MAXPATHLEN]; // Path to screenshot files
char LoadFolder[MAXPATHLEN]; // Path to game files
char LastFileLoaded[MAXPATHLEN]; // Last file loaded filename
char SaveFolder[MAXPATHLEN]; // Path to save files
char CheatFolder[MAXPATHLEN]; // Path to cheat files
char ScreenshotsFolder[MAXPATHLEN]; // Path to screenshots files
char CoverFolder[MAXPATHLEN]; // Path to cover files
char ArtworkFolder[MAXPATHLEN]; // Path to artwork files
int AutoloadGame;

float zoomHor; // horizontal zoom amount
float zoomVert; // vertical zoom amount
int render; // 0 - original, 1 - filtered, 2 - unfiltered
int videomode; // 0 - automatic, 1 - NTSC (480i), 2 - progressive (480p), 3 - PAL (50Hz)
int widescreen;
int hideoverscan; // 0 = off, 1 = vertical, 2 = horizontal, 3 = both
int gamegenie;
int currpal;
int region;
int videomode; // 0 - Automatic, 1 - NTSC (480i), 2 - Progressive (480p), 3 - PAL (50Hz)
int render; // 0 - Original, 1 - Filtered, 2 - Unfiltered, 3 - Filtered (Soft), 4 - Filtered (Sharp)
int hideoverscan; // 0 = Off, 1 = Vertical, 2 = Horizontal, 3 = Both
int Controller;
int crosshair;
int spritelimit;
int widescreen; // 0 - 4:3 aspect, 1 - 16:9 aspect
int xshift; // video output shift
int yshift;
int swapduty;
int currpal;
int region;
int spritelimit;
int swapDuty;
int gamegenie;
int WiimoteOrientation;
int ExitAction;
int MusicVolume;
int SFXVolume;
int Rumble;
int language;
int PreviewImage;

Expand Down
2 changes: 1 addition & 1 deletion source/fceusupport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ int KillFCEUXonFrame = 0;
// Enable or disable swap duty cycles
void SetSwapDuty()
{
if(GCSettings.swapduty == 1) {
if(GCSettings.swapDuty == 1) {
swapDuty = 1;
}
else {
Expand Down
2 changes: 1 addition & 1 deletion source/fceux/asm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ int Assemble(unsigned char *output, int addr, char *str) {
output[0] = output[1] = output[2] = 0;
char astr[128],ins[4];
int len = strlen(str);
if ((!len) || (len > 0x127)) return 1;
if ((!len) || (len > 127)) return 1;

strcpy(astr,str);
str_ucase(astr);
Expand Down
35 changes: 26 additions & 9 deletions source/fceux/boards/coolboy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* CoolBoy 400-in-1 FK23C-mimic mapper 16Mb/32Mb PROM + 128K/256K CHR RAM, optional SRAM, optional battery
* only MMC3 mode
* SMD132 and SMD133 ASICs, MMC3 clones that can address up to 32 MiB of PRG-ROM, 256 KiB of CHR-RAM, and 8 KiB of WRAM.
*
* $6000
* COOLBOY cartridges use registers at address $6xxx
* MINDKIDS cartridges use a solder pad labelled "5/6K" to select between $5000 and $6000
*
* $xxx0
* 7 bit 0
* ---- ----
* ABCC DEEE
Expand All @@ -31,7 +33,7 @@
* |+--------- PRG mask (PRG A17 from 0: MMC3; 1: offset)
* +---------- CHR mask (CHR A17 from 0: MMC3; 1: alternate)
*
* $6001
* $xxx1
*
* 7 bit 0
* ---- ----
Expand All @@ -43,14 +45,14 @@
* |+--------- PRG mask (PRG A19 from 0: offset; 1: MMC3)
* +---------- PRG mask (PRG A18 from 0: MMC3; 1: offset)
*
* $6002
* $xxx2
* 7 bit 0
* ---- ----
* xxxx MMMM
* ||||
* ++++-- CHR offset for GNROM mode (CHR A16, A15, A14, A13)
*
* $6003
* $xxx3
* 7 bit 0
* ---- ----
* NPxP QQRx
Expand All @@ -63,9 +65,6 @@
* |+--------- "Weird MMC3 mode"
* +---------- Lockout (prevent further writes to these four registers, only works in MMC3 mode)
*
* There is also alternative version from MINDKIDS,
* the only difference is register addresses - 500x instead of 600x
*
* Also some new cartridges from MINDKIDS have /WE and /OE pins connected to mapper,
* which allows you to rewrite flash memory without soldering.
* This also allows console to write data to the cartridge.
Expand Down Expand Up @@ -177,6 +176,7 @@ static void MINDKIDSPower(void) {
SetWriteHandler(0x5000, 0x5fff, COOLBOYWrite);
}

// Registers at $6xxx
void COOLBOY_Init(CartInfo *info) {
GenMMC3_Init(info, 2048, 256, 8, 1);
pwrap = COOLBOYPW;
Expand All @@ -186,6 +186,7 @@ void COOLBOY_Init(CartInfo *info) {
AddExState(EXPREGS, 4, 0, "EXPR");
}

// Registers at $5xxx
void MINDKIDS_Init(CartInfo *info) {
GenMMC3_Init(info, 2048, 256, 8, 1);
pwrap = COOLBOYPW;
Expand All @@ -194,3 +195,19 @@ void MINDKIDS_Init(CartInfo *info) {
info->Reset = COOLBOYReset;
AddExState(EXPREGS, 4, 0, "EXPR");
}

// For NES 2.0 loader
void SMD132_SMD133_Init(CartInfo *info) {
switch (info->submapper)
{
case 0:
COOLBOY_Init(info);
break;
case 1:
MINDKIDS_Init(info);
break;
default:
FCEU_PrintError("Unknown submapper: #%d.", info->submapper);
break;
}
}
25 changes: 24 additions & 1 deletion source/fceux/cheat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,8 @@ void FCEU_CheatSetByte(uint32 A, uint8 V)
}

// disable all cheats
int FCEU_DisableAllCheats(){
int FCEU_DisableAllCheats(void)
{
int count = 0;
struct CHEATF *next = cheats;
while(next)
Expand All @@ -901,6 +902,28 @@ int FCEU_DisableAllCheats(){
return count;
}

// delete all cheats
int FCEU_DeleteAllCheats(void)
{
struct CHEATF *cur = cheats;
struct CHEATF *next = NULL;
while (cur)
{
next = cur->next;
if ( cur->name )
{
free(cur->name);
}
free(cur);
cur = next;
}
cheats = cheatsl = 0;
savecheats = 1;
RebuildSubCheats();

return 0;
}

int FCEUI_FindCheatMapByte(uint16 address)
{
return cheatMap[address / 8] >> (address % 8) & 1;
Expand Down
3 changes: 2 additions & 1 deletion source/fceux/cheat.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ extern int savecheats;
extern int globalCheatDisabled;
extern int disableAutoLSCheats;

int FCEU_DisableAllCheats();
int FCEU_DisableAllCheats(void);
int FCEU_DeleteAllCheats(void);

typedef struct {
uint16 addr;
Expand Down
3 changes: 3 additions & 0 deletions source/fceux/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ const char *FCEUI_GetAboutString(void)
"FCEU TAS - blip & nitsuja\n"
"FCEU TAS+ - Luke Gustafson\n"
"\n"
"Logo/icon:\n"
"Terwilf\n"
"\n"
"FCEUX is dedicated to the fallen heroes\n"
"of NES emulation. In Memoriam --\n"
"ugetab\n"
Expand Down
Loading

0 comments on commit 050ba94

Please sign in to comment.