Update to v1.1.3 (Tanooki16)

- Updated to the latest Snes9x GX (git 3940616)
- Disabled game info message when "show frame rate" option is enabled
- Added option to turn on/off frame skipping in video settings (enabled by default)
  frame skipping is highly recommended with some games using special chips (especially SuperFX)
  Disable it for other games if you prefer optimal frame rate despite some potential slowdowns
- Added option to force SNES region (experimental) and create emulation settings in main settings
  When launching Snes9x TX just choose a region and then launch a game
  For another game it will be necessary to launch any game in automatic region
  then go back to emulation settings to choose the desired region or restart Snes9x TX
  Another constraint is that you must load a save state with the same region
  than the one with which it was made (otherwise the timing will not be correct)
- Added separate PAL audio sample rate for original render (fix audio hiccups in 50Hz video mode)
- Fixed the PAL games resolution (PAL 50Hz video mode is recommended for have a correct ratio)
- Added progressive PAL video mode (576p)
- Reorganized menu options
- Renamed turbo mode option to "fast forward" (turbo mode name is reminiscent of auto fire)
- Removed catalan and updated all other language files
- Fixed sound effects volume setting and replace enter.ogg audio file
- Updated UI PNG images
- Added DualShock 3 (wired) support based on SickSaxis lib by xerpi (thanks niuus and JabuPL!)
  How to use:
  1. Start up Snes9x TX
  2. Start a game with your Wiimote/GC Controller/etc
  3. Press the PS button on your DualShock 3 and connect it to your Wii with a USB cable
  4. It should connect, one led on the controller should light up
  5. Done, you can play now on a DualShock 3 Controller

README.txt

@@ -7,11 +7,41 @@ Snes9x TX is a fork of Snes9x GX: https://github.com/dborth/snes9xgx
 Update History
 --------------
 
+---Snes9x TX 1.1.3---
+---January 15 2023---
+
+- Updated to the latest Snes9x GX (git 3940616)
+- Disabled game info message when "show frame rate" option is enabled
+- Added option to turn on/off frame skipping in video settings (enabled by default)
+  frame skipping is highly recommended with some games using special chips (especially SuperFX)
+  Disable it for other games if you prefer optimal frame rate despite some potential slowdowns
+- Added option to force SNES region (experimental) and create emulation settings in main settings
+  When launching Snes9x TX just choose a region and then launch a game
+  For another game it will be necessary to launch any game in automatic region
+  then go back to emulation settings to choose the desired region or restart Snes9x TX
+  Another constraint is that you must load a save state with the same region
+  than the one with which it was made (otherwise the timing will not be correct)
+- Added separate PAL audio sample rate for original render (fix audio hiccups in 50Hz video mode)
+- Fixed the PAL games resolution (PAL 50Hz video mode is recommended for have a correct ratio)
+- Added progressive PAL video mode (576p)
+- Reorganized menu options
+- Renamed turbo mode option to "fast forward" (turbo mode name is reminiscent of auto fire)
+- Removed catalan and updated all other language files
+- Fixed sound effects volume setting and replace enter.ogg audio file
+- Updated UI PNG images
+- Added DualShock 3 (wired) support based on SickSaxis lib by xerpi (thanks niuus and JabuPL!)
+  How to use:
+  1. Start up Snes9x TX
+  2. Start a game with your Wiimote/GC Controller/etc
+  3. Press the PS button on your DualShock 3 and connect it to your Wii with a USB cable
+  4. It should connect, one led on the controller should light up
+  5. Done, you can play now on a DualShock 3 Controller
+
 ---Snes9x TX 1.1.2---
 ---September 26 2022---
 
-- Added new setting button to turn on/off start satellaview bios with bs games in menu settings
-- Added option to turn on/off mute game sound in audio settings
+- Added new setting button to turn on/off start Satellaview BIOS with BS games in menu settings
+- Added option to turn on/off game sound in audio settings
 - Updated french language file
 
 ---Snes9x TX 1.1.1---
@@ -34,7 +64,7 @@ Update History
 - Updated to the latest Snes9x GX 4.5.3
 - Disabled peripheral devices by default if not selected in controller settings
 - Added new options to turn it on/off sprite limit and hi-res mode in video settings
-  disable hi-res mode to keep video filtering active with games using this mode
+  Disable hi-res mode to keep video filtering active with games using this mode
 - Added credits button in main menu settings (thanks InfiniteBlue!)
 - Updated credits
 - Updated all language files
@@ -45,7 +75,7 @@ Update History
 ---May 20 2022---
 
 - Added option to turn it on/off stereo inversion in audio settings
-  enabled by default to fix Wii inverted L/R audio channels
+  Enabled by default to fix Wii inverted L/R audio channels
 - Updated all language files
 
 ---Snes9x TX 1.0.9b---
@@ -161,7 +191,7 @@ Update History
 - Added vWii Forwarder Channel for Wii U
 - Disabled Multitape by default
 - Added L+R+START trigger to go back to menu with Classic Controller
-  work with SNES Classic Mini controller
+  Work with SNES Classic Mini controller
 - Removed turbo mode on right joystick
 - Changed UI and Forwarder Channel colors
 - Based on the latest commit of Snes9x GX

hbc/meta.xml

@@ -2,8 +2,8 @@
 <app version="1">
   <name>Snes9x TX</name>
   <coder>Tanooki</coder>
-  <version>1.1.2</version>
-  <release_date>20220926</release_date>
+  <version>1.1.3</version>
+  <release_date>20230115</release_date>
   <short_description>Super Nintendo Emulator</short_description>
   <long_description>Snes9x TX is a fork of Snes9x GX on Wii.</long_description>
   <ahb_access />

source/cheatmgr.cpp

@@ -8,9 +8,9 @@
  * Cheat handling
  ***************************************************************************/
 
-
 #include "snes9x/port.h"
 #include "snes9x/cheats.h"
+#include "snes9x/bml.h"
 
 #include "snes9xtx.h"
 #include "fileop.h"
@@ -52,6 +52,7 @@ static bool LoadCheatFile (int length)
 	return true;
 }
 
+
 void ToggleCheat(uint32 num) {
 	if(Cheat.g[num].enabled) {
 		S9xDisableCheatGroup(num);
@@ -90,7 +91,25 @@ WiiSetupCheats()
 
 	// load cheat file if present
 	if(offset > 0)
-		LoadCheatFile (offset);
+	{
+		bml_node bml;
+		if (!bml.parse_file(filepath))
+		{
+			LoadCheatFile (offset);
+		}
+
+		bml_node *n = bml.find_subnode("cheat");
+		if (n)
+		{
+			S9xLoadCheatsFromBMLNode (&bml);
+		}
+
+		if (!n)
+		{
+			LoadCheatFile (offset);
+		}
+	}
+
 
 	FreeSaveBuffer ();
 }

source/filebrowser.cpp

@@ -485,9 +485,10 @@ int WiiFileLoader()
 		if(GCSettings.Satellaview)
 			sprintf (filepath, "%s%s/BS-X.bin", pathPrefix[GCSettings.LoadMethod], APPFOLDER);
 		else
-			sprintf (filepath, "%s%s/", pathPrefix[GCSettings.LoadMethod], APPFOLDER);
+			sprintf (filepath, 0);
 
-		if(LoadFile ((char *)Memory.BIOSROM, filepath, 0, 0x100000, SILENT) == 0) {
+		if(LoadFile ((char *)Memory.BIOSROM, filepath, 0, 0x100000, SILENT) == 0)
+		{
 			bsxBiosLoadFailed = true;
 		}
 	}

source/filelist.h

@@ -29,7 +29,6 @@
 #include "ko_lang.h"
 #include "pt_lang.h"
 #include "pt_br_lang.h"
-#include "ca_lang.h"
 #include "tr_lang.h"
 
 // Sounds
@@ -49,7 +48,6 @@
 #include "icon_home_png.h"
 #include "icon_game_settings_png.h"
 #include "icon_game_cheats_png.h"
-#include "icon_game_satellaview_png.h"
 #include "icon_game_controllers_png.h"
 #include "icon_game_load_png.h"
 #include "icon_game_save_png.h"
@@ -66,10 +64,11 @@
 #include "icon_settings_superscope_png.h"
 #include "icon_settings_justifier_png.h"
 #include "icon_settings_mouse_png.h"
-#include "icon_settings_turbo_png.h"
+#include "icon_settings_fastforward_png.h"
 #include "icon_settings_file_png.h"
 #include "icon_settings_mappings_png.h"
 #include "icon_settings_menu_png.h"
+#include "icon_settings_emulation_png.h"
 #include "icon_settings_credits_png.h"
 #include "icon_settings_video_png.h"
 #include "icon_settings_audio_png.h"

source/filter.cpp

@@ -2,7 +2,7 @@
  * Snes9x Nintendo Wii/GameCube Port
  *
  * Michniewski 2008
- * Tanooki 2019-2022
+ * Tanooki 2019-2023
  *
  * Scale2x filter
  * (c) Copyright 2001         Andrea Mazzoleni (amadvance@gmail.com)
@@ -75,7 +75,7 @@ int GetFilterScale(RenderFilter filterID)
 
 void SelectFilterMethod ()
 {
-	FilterMethod = FilterToMethod((RenderFilter)GCSettings.FilterMethod);
+	FilterMethod = FilterToMethod((RenderFilter)GCSettings.VideoFilter);
 }
 
 template<int GuiScale>

source/filter.h

@@ -2,7 +2,7 @@
  * Snes9x Nintendo Wii/GameCube Port
  *
  * Michniewski 2008
- * Tanooki 2019-2022
+ * Tanooki 2019-2023
  *
  * filter.h
  *

source/gui/gui.h

@@ -429,7 +429,7 @@ class GuiElement
 		//!Called constantly to redraw the element's tooltip
 		virtual void DrawTooltip();
 	protected:
-		GuiTrigger * trigger[3]; //!< GuiTriggers (input actions) that this element responds to
+		GuiTrigger * trigger[5]; //!< GuiTriggers (input actions) that this element responds to
 		UpdateCallback updateCB; //!< Callback function to call when this element is updated
 		GuiElement * parentElement; //!< Parent element
 		int focus; //!< Element focus (-1 = focus disabled, 0 = not focused, 1 = focused)

source/gui/gui_button.cpp

@@ -252,7 +252,7 @@ void GuiButton::Update(GuiTrigger * t)
 	if(this->IsClickable())
 	{
 		s32 wm_btns, wm_btns_trig, cc_btns, cc_btns_trig, wiidrc_btns, wiidrc_btns_trig;
-		for(int i=0; i<3; i++)
+		for(int i=0; i<5; i++)
 		{
 			if(trigger[i] && (trigger[i]->chan == -1 || trigger[i]->chan == t->chan))
 			{
@@ -307,7 +307,7 @@ void GuiButton::Update(GuiTrigger * t)
 		bool held = false;
 		s32 wm_btns, wm_btns_h, wm_btns_trig, cc_btns, cc_btns_h, cc_btns_trig, wiidrc_btns, wiidrc_btns_h, wiidrc_btns_trig;
 
-		for(int i=0; i<3; i++)
+		for(int i=0; i<5; i++)
 		{
 			if(trigger[i] && (trigger[i]->chan == -1 || trigger[i]->chan == t->chan))
 			{

source/gui/gui_element.cpp

@@ -31,6 +31,8 @@ GuiElement::GuiElement()
 	trigger[0] = NULL;
 	trigger[1] = NULL;
 	trigger[2] = NULL;
+	trigger[3] = NULL;
+	trigger[4] = NULL;
 	parentElement = NULL;
 	selectable = false;
 	clickable = false;
@@ -361,6 +363,10 @@ void GuiElement::SetTrigger(GuiTrigger * t)
 		trigger[1] = t;
 	else if(!trigger[2])
 		trigger[2] = t;
+	else if(!trigger[3])
+		trigger[3] = t;
+	else if(!trigger[4])
+		trigger[4] = t;
 	else // all were assigned, so we'll just overwrite the first one
 		trigger[0] = t;
 }

source/gui/gui_optionbrowser.cpp

@@ -81,6 +81,7 @@ GuiOptionBrowser::GuiOptionBrowser(int w, int h, OptionList * l)
 		optionTxt[i] = new GuiText(NULL, 20, (GXColor){0, 0, 0, 0xff});
 		optionTxt[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
 		optionTxt[i]->SetPosition(8,0);
+		optionTxt[i]->SetMaxWidth(235);
 
 		optionVal[i] = new GuiText(NULL, 20, (GXColor){0, 0, 0, 0xff});
 		optionVal[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
@@ -314,6 +315,11 @@ void GuiOptionBrowser::Update(GuiTrigger * t)
 
 		if(optionBtn[i]->GetState() == STATE_SELECTED)
 			selectedItem = i;
+
+		if(selectedItem == i)
+			optionTxt[i]->SetScroll(SCROLL_HORIZONTAL);
+		else
+			optionTxt[i]->SetScroll(SCROLL_NONE);
 	}
 
 	// pad/joystick navigation

source/gui/gui_trigger.cpp

@@ -133,6 +133,10 @@ s8 GuiTrigger::WPAD_Stick(u8 stick, int axis)
 			center = js->center.x;
 		}
 
+		if(min == max) {
+			return 0;
+		}
+
 		// some 3rd party controllers return invalid analog sticks calibration data
 		if ((min >= center) || (max <= center)) {
 			// force default calibration settings