Update to 1.0.8 (Tanooki16)

saulfabregwiivc · Nov 13, 2021 · 57f9321 · 57f9321
1 parent 35cbea6
commit 57f9321
Show file tree

Hide file tree

Showing 104 changed files with 271 additions and 565 deletions.
diff --git a/README.txt b/README.txt
@@ -7,14 +7,29 @@ Snes9x TX is based on original Snes9x GX: https://github.com/dborth/snes9xgx
 Update History
 --------------
 
+---Snes9x TX 1.0.8---
+---September 1 2021---
+
+- Updated to the latest Snes9x GX (git 5bff07b)
+- Added 128 KB SRAM support in sram
+- Reorganized menu video settings
+- Removed all old crosshairs (not used by Snes9x TX)
+- Added custom crosshairs for Super Scope/Justifier
+- Fixed not working option to disable crosshair
+- Removed rumble function from menu (your batteries will last longer)
+- Updated UI PNG images
+- Compiled with latest devkitPPC/libogc
+- Updated Forwarder Channel (1.3)
+
 ---Snes9x TX 1.0.7---
 ---April 22 2021---
 
 - Changed Filtering setting name to CRT Filter with On/Off option
-- Replaced Scanlines filter per CRT filter (lighter scanlines that do not darken image)
+- Replaced Scanlines filter by CRT filter (lighter scanlines that do not darken image)
 - Removed hq2x filters (these filters take too many resources for Wii)
 - Removed Soft and Sharp video filtering (not work with Snes9x GX)
-- 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.2)
 
 ---Snes9x TX 1.0.6---
 ---March 25 2021---

diff --git a/hbc/icon.png b/hbc/icon.png
diff --git a/hbc/meta.xml b/hbc/meta.xml
@@ -2,8 +2,8 @@
 <app version="1">
   <name>Snes9x TX</name>
   <coder>Tanooki</coder>
-  <version>1.0.7</version>
-  <release_date>20210422</release_date>
+  <version>1.0.8</version>
+  <release_date>20210901</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 />

diff --git a/source/fileop.cpp b/source/fileop.cpp
@@ -742,7 +742,7 @@ LoadSzFile(char * filepath, unsigned char * rbuffer)
 	HaltParseThread();
 
 	file = fopen (filepath, "rb");
-	if (file > 0)
+	if (file)
 	{
 		size = SzExtractFile(browserList[browser.selIndex].filenum, rbuffer);
 		fclose (file);

diff --git a/source/filter.cpp b/source/filter.cpp
@@ -32,15 +32,15 @@ static uint16 RGBtoBright[1<<NUMBITS];
 
 TFilterMethod FilterMethod;
 
-template<int GuiScale> void CRT (uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height);
+template<int GuiScale> void Scanlines (uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height);
 
 const char* GetFilterName (RenderFilter filterID)
 {
 	switch(filterID)
 	{
 		default: return "Unknown";
 		case FILTER_NONE: return "Off";
-		case FILTER_CRT: return "On";
+		case FILTER_SCANLINES: return "On";
 	}
 }
 
@@ -49,7 +49,7 @@ static TFilterMethod FilterToMethod (RenderFilter filterID)
 {
 	switch(filterID)
 	{
-		case FILTER_CRT:  return CRT<FILTER_CRT>;
+		case FILTER_SCANLINES:  return Scanlines<FILTER_SCANLINES>;
 		default: return 0;
 	}
 }
@@ -61,7 +61,7 @@ int GetFilterScale(RenderFilter filterID)
 		case FILTER_NONE:
 			return 1;
 		default:
-		case FILTER_CRT:
+		case FILTER_SCANLINES:
 			return 2;
 	}
 }
@@ -361,7 +361,7 @@ void InitLUTs(void)
 	case 255: if (Diff(RGBtoYUVtable[w4], RGBtoYUVtable[w2])) PIXEL00_0; else PIXEL00_100; if (Diff(RGBtoYUVtable[w2], RGBtoYUVtable[w6])) PIXEL01_0; else PIXEL01_100; if (Diff(RGBtoYUVtable[w8], RGBtoYUVtable[w4])) PIXEL10_0; else PIXEL10_100; if (Diff(RGBtoYUVtable[w6], RGBtoYUVtable[w8])) PIXEL11_0; else PIXEL11_100; break;
 
 template<int GuiScale>
-void CRT (uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height)
+void Scanlines (uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height)
 {
 	unsigned int nextlineSrc = srcPitch / sizeof(uint16);
 	uint16 *p = (uint16 *)srcPtr;

diff --git a/source/filter.h b/source/filter.h
@@ -23,7 +23,7 @@
 enum RenderFilter{
 	FILTER_NONE = 0,
 
-	FILTER_CRT,
+	FILTER_SCANLINES,
 
 	NUM_FILTERS
 };

diff --git a/source/gui/gui.h b/source/gui/gui.h
@@ -367,12 +367,6 @@ class GuiElement
 		//!\param i Index of trigger array to set
 		//!\param t Pointer to GuiTrigger
 		void SetTrigger(u8 i, GuiTrigger * t);
-		//!Checks whether rumble was requested by the element
-		//!\return true is rumble was requested, false otherwise
-		bool Rumble();
-		//!Sets whether or not the element is requesting a rumble event
-		//!\param r true if requesting rumble, false if not
-		void SetRumble(bool r);
 		//!Set an effect for the element
 		//!\param e Effect to enable
 		//!\param a Amount of the effect (usage varies on effect)
@@ -468,7 +462,6 @@ class GuiElement
 		bool clickable; //!< Whether or not this element is clickable (can change to CLICKED state)
 		bool holdable; //!< Whether or not this element is holdable (can change to HELD state)
 		bool visible; //!< Visibility of the element. If false, Draw() is skipped
-		bool rumble; //!< Wiimote rumble (on/off) - set to on when this element requests a rumble event
 };
 
 //!Allows GuiElements to be grouped together into a "window"

diff --git a/source/gui/gui_button.cpp b/source/gui/gui_button.cpp
@@ -220,9 +220,6 @@ void GuiButton::Update(GuiTrigger * t)
 			{
 				this->SetState(STATE_SELECTED, t->chan);
 
-				if(this->Rumble())
-					rumbleRequest[t->chan] = 1;
-
 				if(soundOver)
 					soundOver->Play();
 

diff --git a/source/gui/gui_element.cpp b/source/gui/gui_element.cpp
@@ -32,7 +32,6 @@ GuiElement::GuiElement()
 	trigger[1] = NULL;
 	trigger[2] = NULL;
 	parentElement = NULL;
-	rumble = true;
 	selectable = false;
 	clickable = false;
 	holdable = false;
@@ -371,16 +370,6 @@ void GuiElement::SetTrigger(u8 i, GuiTrigger * t)
 	trigger[i] = t;
 }
 
-bool GuiElement::Rumble()
-{
-	return rumble;
-}
-
-void GuiElement::SetRumble(bool r)
-{
-	rumble = r;
-}
-
 int GuiElement::GetEffect()
 {
 	return effects;

diff --git a/source/images/bg_game_selection.png b/source/images/bg_game_selection.png
diff --git a/source/images/bg_game_selection_entry.png b/source/images/bg_game_selection_entry.png
diff --git a/source/images/bg_options.png b/source/images/bg_options.png
diff --git a/source/images/bg_options_entry.png b/source/images/bg_options_entry.png
diff --git a/source/images/bg_preview.png b/source/images/bg_preview.png
diff --git a/source/images/button.png b/source/images/button.png
diff --git a/source/images/button_arrow_down.png b/source/images/button_arrow_down.png
diff --git a/source/images/button_arrow_down_over.png b/source/images/button_arrow_down_over.png
diff --git a/source/images/button_arrow_left.png b/source/images/button_arrow_left.png
diff --git a/source/images/button_arrow_left_over.png b/source/images/button_arrow_left_over.png
diff --git a/source/images/button_arrow_right.png b/source/images/button_arrow_right.png
diff --git a/source/images/button_arrow_right_over.png b/source/images/button_arrow_right_over.png
diff --git a/source/images/button_arrow_up.png b/source/images/button_arrow_up.png
diff --git a/source/images/button_arrow_up_over.png b/source/images/button_arrow_up_over.png
diff --git a/source/images/button_gamesave.png b/source/images/button_gamesave.png
diff --git a/source/images/button_gamesave_blank.png b/source/images/button_gamesave_blank.png
diff --git a/source/images/button_gamesave_over.png b/source/images/button_gamesave_over.png
diff --git a/source/images/button_large.png b/source/images/button_large.png
diff --git a/source/images/button_large_over.png b/source/images/button_large_over.png
diff --git a/source/images/button_long.png b/source/images/button_long.png
diff --git a/source/images/button_long_over.png b/source/images/button_long_over.png
diff --git a/source/images/button_over.png b/source/images/button_over.png
diff --git a/source/images/button_prompt.png b/source/images/button_prompt.png
diff --git a/source/images/button_prompt_over.png b/source/images/button_prompt_over.png
diff --git a/source/images/button_short.png b/source/images/button_short.png
diff --git a/source/images/button_short_over.png b/source/images/button_short_over.png
diff --git a/source/images/button_small.png b/source/images/button_small.png
diff --git a/source/images/button_small_over.png b/source/images/button_small_over.png
diff --git a/source/images/credits_box.png b/source/images/credits_box.png
diff --git a/source/images/dialogue_box.png b/source/images/dialogue_box.png
diff --git a/source/images/icon_game_cheats.png b/source/images/icon_game_cheats.png
diff --git a/source/images/icon_game_controllers.png b/source/images/icon_game_controllers.png
diff --git a/source/images/icon_game_delete.png b/source/images/icon_game_delete.png
diff --git a/source/images/icon_game_load.png b/source/images/icon_game_load.png
diff --git a/source/images/icon_game_reset.png b/source/images/icon_game_reset.png
diff --git a/source/images/icon_game_save.png b/source/images/icon_game_save.png
diff --git a/source/images/icon_game_settings.png b/source/images/icon_game_settings.png
diff --git a/source/images/icon_settings_audio.png b/source/images/icon_settings_audio.png
diff --git a/source/images/icon_settings_file.png b/source/images/icon_settings_file.png
diff --git a/source/images/icon_settings_justifier.png b/source/images/icon_settings_justifier.png
diff --git a/source/images/icon_settings_menu.png b/source/images/icon_settings_menu.png
diff --git a/source/images/icon_settings_screenshot.png b/source/images/icon_settings_screenshot.png
diff --git a/source/images/icon_settings_video.png b/source/images/icon_settings_video.png
diff --git a/source/images/keyboard_key.png b/source/images/keyboard_key.png
diff --git a/source/images/keyboard_key_over.png b/source/images/keyboard_key_over.png
diff --git a/source/images/keyboard_largekey.png b/source/images/keyboard_largekey.png
diff --git a/source/images/keyboard_largekey_over.png b/source/images/keyboard_largekey_over.png
diff --git a/source/images/keyboard_mediumkey.png b/source/images/keyboard_mediumkey.png
diff --git a/source/images/keyboard_mediumkey_over.png b/source/images/keyboard_mediumkey_over.png
diff --git a/source/images/keyboard_textbox.png b/source/images/keyboard_textbox.png
diff --git a/source/images/logo.png b/source/images/logo.png
diff --git a/source/images/logo_over.png b/source/images/logo_over.png
diff --git a/source/images/player1_grab.png b/source/images/player1_grab.png
diff --git a/source/images/player1_point.png b/source/images/player1_point.png
diff --git a/source/images/player2_grab.png b/source/images/player2_grab.png
diff --git a/source/images/player2_point.png b/source/images/player2_point.png
diff --git a/source/images/player3_grab.png b/source/images/player3_grab.png
diff --git a/source/images/player3_point.png b/source/images/player3_point.png
diff --git a/source/images/player4_grab.png b/source/images/player4_grab.png
diff --git a/source/images/player4_point.png b/source/images/player4_point.png
diff --git a/source/images/progressbar_outline.png b/source/images/progressbar_outline.png
diff --git a/source/images/screen_position.png b/source/images/screen_position.png
diff --git a/source/images/scrollbar.png b/source/images/scrollbar.png
diff --git a/source/images/scrollbar_arrowdown.png b/source/images/scrollbar_arrowdown.png
diff --git a/source/images/scrollbar_arrowdown_over.png b/source/images/scrollbar_arrowdown_over.png
diff --git a/source/images/scrollbar_arrowup.png b/source/images/scrollbar_arrowup.png
diff --git a/source/images/scrollbar_arrowup_over.png b/source/images/scrollbar_arrowup_over.png
diff --git a/source/images/scrollbar_box.png b/source/images/scrollbar_box.png
diff --git a/source/images/scrollbar_box_over.png b/source/images/scrollbar_box_over.png
diff --git a/source/images/throbber.png b/source/images/throbber.png
diff --git a/source/input.cpp b/source/input.cpp
@@ -42,14 +42,9 @@
 
 #define ANALOG_SENSITIVITY 30
 
-int rumbleRequest[4] = {0,0,0,0};
 int playerMapping[4] = {0,1,2,3};
 GuiTrigger userInput[4];
 
-#ifdef HW_RVL
-static int rumbleCount[4] = {0,0,0,0};
-#endif
-
 // hold superscope/mouse/justifier cursor positions
 static int cursor_x[5] = {0,0,0,0,0};
 static int cursor_y[5] = {0,0,0,0,0};
@@ -397,49 +392,6 @@ SetupPads()
 	}
 }
 
-#ifdef HW_RVL
-/****************************************************************************
- * ShutoffRumble
- ***************************************************************************/
-void ShutoffRumble()
-{
-	if(CONF_GetPadMotorMode() == 0)
-		return;
-
-	for(int i=0;i<4;i++)
-	{
-		WPAD_Rumble(i, 0);
-		rumbleCount[i] = 0;
-		rumbleRequest[i] = 0;
-	}
-}
-
-/****************************************************************************
- * DoRumble
- ***************************************************************************/
-void DoRumble(int i)
-{
-	if(CONF_GetPadMotorMode() == 0 || !GCSettings.Rumble) return;
-
-	if(rumbleRequest[i] && rumbleCount[i] < 3)
-	{
-		WPAD_Rumble(i, 1); // rumble on
-		rumbleCount[i]++;
-	}
-	else if(rumbleRequest[i])
-	{
-		rumbleCount[i] = 12;
-		rumbleRequest[i] = 0;
-	}
-	else
-	{
-		if(rumbleCount[i])
-			rumbleCount[i]--;
-		WPAD_Rumble(i, 0); // rumble off
-	}
-}
-#endif
-
 /****************************************************************************
  * UpdateCursorPosition
  *

diff --git a/source/input.h b/source/input.h
@@ -24,12 +24,9 @@
 #define MAXJP 			12 // # of mappable controller buttons
 
 extern u32 btnmap[4][6][12];
-extern int rumbleRequest[4];
 extern int playerMapping[4];
 
 void ResetControls(int cc = -1, int wc = -1);
-void ShutoffRumble();
-void DoRumble(int i);
 void ReportButtons ();
 void SetControllers ();
 void SetDefaultButtonMap ();

diff --git a/source/lang/ca.lang b/source/lang/ca.lang
@@ -457,14 +457,14 @@ msgstr "Nunchuk"
 msgid "Off"
 msgstr "Off"
 
-msgid "Official Site: http://code.google.com/p/fceugc/"
-msgstr "Lloc Oficial: http://code.google.com/p/fceugc/"
+msgid "Official Site: https://github.com/dborth/fceugx"
+msgstr "Lloc Oficial: https://github.com/dborth/fceugx"
 
-msgid "Official Site: http://code.google.com/p/snes9x-gx/"
-msgstr "Lloc Oficial: http://code.google.com/p/snes9x-gx/"
+msgid "Official Site: https://github.com/dborth/snes9xgx"
+msgstr "Lloc Oficial: https://github.com/dborth/snes9xgx"
 
-msgid "Official Site: http://code.google.com/p/vba-wii/"
-msgstr "Lloc Oficial: http://code.google.com/p/vba-wii/"
+msgid "Official Site: https://github.com/dborth/vbagx"
+msgstr "Lloc Oficial: https://github.com/dborth/vbagx"
 
 msgid "OK"
 msgstr "D'acord"
@@ -724,8 +724,8 @@ msgstr "Ratolí SNES - Comandament GameCube"
 msgid "SNES Mouse - Wiimote"
 msgstr "Ratolí SNES - Wiimote"
 
-msgid "Snes9x - Copyright (c) Snes9x Team 1996 - 2006"
-msgstr "Snes9x - Copyright (c) Snes9x Team 1996 - 2006"
+msgid "Snes9x - Copyright (c) Snes9x Team 1996 - 2021"
+msgstr "Snes9x - Copyright (c) Snes9x Team 1996 - 2021"
 
 msgid "Sound Effects Volume"
 msgstr "Volum d'efectes sonors"

diff --git a/source/lang/de.lang b/source/lang/de.lang
@@ -457,14 +457,14 @@ msgstr ""
 msgid "Off"
 msgstr "Aus"
 
-msgid "Official Site: http://code.google.com/p/fceugc/"
-msgstr "Offizielle Seite: http://code.google.com/p/fceugc/"
+msgid "Official Site: https://github.com/dborth/fceugx"
+msgstr "Offizielle Seite: https://github.com/dborth/fceugx"
 
-msgid "Official Site: http://code.google.com/p/snes9x-gx/"
-msgstr "Offizielle Seite: http://code.google.com/p/snes9x-gx/"
+msgid "Official Site: https://github.com/dborth/snes9xgx"
+msgstr "Offizielle Seite: https://github.com/dborth/snes9xgx"
 
-msgid "Official Site: http://code.google.com/p/vba-wii/"
-msgstr "Offizielle Seite: http://code.google.com/p/vba-wii/"
+msgid "Official Site: https://github.com/dborth/vbagx"
+msgstr "Offizielle Seite: https://github.com/dborth/vbagx"
 
 msgid "OK"
 msgstr ""
@@ -724,7 +724,7 @@ msgstr "SNES Maus - GameCube Controller"
 msgid "SNES Mouse - Wiimote"
 msgstr "SNES Maus - Wii-FB"
 
-msgid "Snes9x - Copyright (c) Snes9x Team 1996 - 2006"
+msgid "Snes9x - Copyright (c) Snes9x Team 1996 - 2021"
 msgstr ""
 
 msgid "Sound Effects Volume"

diff --git a/source/lang/es.lang b/source/lang/es.lang
@@ -787,8 +787,8 @@ msgstr "Controles de SNES (4)"
 msgid "SNES Mouse"
 msgstr "Mouse de SNES"
 
-msgid "Snes9x - Copyright (c) Snes9x Team 1996 - 2006"
-msgstr "Snes9x - Derechos de autor (c) Snes9x Team 1996 - 2006"
+msgid "Snes9x - Copyright (c) Snes9x Team 1996 - 2021"
+msgstr "Snes9x - Derechos de autor (c) Snes9x Team 1996 - 2021"
 
 msgid "SRAM"
 msgstr "SRAM"

diff --git a/source/lang/fr.lang b/source/lang/fr.lang
@@ -232,12 +232,6 @@ msgstr "Le fichier BIOS du FDS (Famicom Disk System) est introuvable !"
 msgid "Filtered"
 msgstr "Filtré"
 
-msgid "Filtered (Sharp)"
-msgstr "Filtré (net)"
-
-msgid "Filtered (Soft)"
-msgstr "Filtré (doux)"
-
 msgid "Fire"
 msgstr "Tirer"
 
@@ -541,9 +535,6 @@ msgstr "DROITE"
 msgid "Right Button"
 msgstr "Clic droit"
 
-msgid "Rumble"
-msgstr "Vibration"
-
 msgid "Save"
 msgstr "Sauver"
 
@@ -592,8 +583,8 @@ msgstr "Sauvegarde en cours..."
 msgid "Scaling"
 msgstr "Format"
 
-msgid "CRT filter"
-msgstr "Filtre CRT"
+msgid "Scanlines"
+msgstr "Ligne de balayage"
 
 msgid "Screen Position"
 msgstr "Position de l'écran"

diff --git a/source/lang/it.lang b/source/lang/it.lang
@@ -457,14 +457,14 @@ msgstr "Nunchuk"
 msgid "Off"
 msgstr "Off"
 
-msgid "Official Site: http://code.google.com/p/fceugc/"
-msgstr "Sito Ufficiale: http://code.google.com/p/fceugc/"
+msgid "Official Site: https://github.com/dborth/fceugx"
+msgstr "Sito Ufficiale: https://github.com/dborth/fceugx"
 
-msgid "Official Site: http://code.google.com/p/snes9x-gx/"
-msgstr "Sito Ufficiale: http://code.google.com/p/snes9x-gx/"
+msgid "Official Site: https://github.com/dborth/snes9xgx"
+msgstr "Sito Ufficiale: https://github.com/dborth/snes9xgx"
 
-msgid "Official Site: http://code.google.com/p/vba-wii/"
-msgstr "Sito Ufficiale: http://code.google.com/p/vba-wii/"
+msgid "Official Site: https://github.com/dborth/vbagx"
+msgstr "Sito Ufficiale: https://github.com/dborth/vbagx"
 
 msgid "OK"
 msgstr ""
@@ -724,7 +724,7 @@ msgstr ""
 msgid "SNES Mouse - Wiimote"
 msgstr ""
 
-msgid "Snes9x - Copyright (c) Snes9x Team 1996 - 2006"
+msgid "Snes9x - Copyright (c) Snes9x Team 1996 - 2021"
 msgstr ""
 
 msgid "Sound Effects Volume"