[mupen64plus-rsp-hle] 99/167: Fix corrupted graphics in Zelda

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-rsp-hle.

commit 092be4eac481ef2cab91a9c47d0f4478c1826f44
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Apr 8 20:01:12 2012 +0200

    Fix corrupted graphics in Zelda
---
 debian/patches/pokemon_stadium_sound.patch | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/patches/pokemon_stadium_sound.patch b/debian/patches/pokemon_stadium_sound.patch
index f0d0fcd..9901582 100644
--- a/debian/patches/pokemon_stadium_sound.patch
+++ b/debian/patches/pokemon_stadium_sound.patch
@@ -3,8 +3,21 @@ Author: Bobby Smiles <bobby.smiles32 at gmail.com>
 Origin: backport, https://bitbucket.org/richard42/mupen64plus-rsp-hle/changeset/13894f74faa9 https://bitbucket.org/richard42/mupen64plus-rsp-hle/changeset/b8ab5963bad3
 
 ---
+diff --git a/src/jpeg.c b/src/jpeg.c
+index 67f5ef489d6a9f8009484eb29a0402afc792b0b8..c51e611200322cebf03d6c6ade8e0c94613bffd0 100644
+--- a/src/jpeg.c
++++ b/src/jpeg.c
+@@ -364,7 +364,7 @@ void ps_jpg_uncompress(OSTask_t *task)
+         }
+ 
+         // Texel Formatting (RGBA16)
+-        offset = ps_jpg_data.pMacroBlocks + oMBsize*mb;
++        offset = ps_jpg_data.pMacroBlocks + iMBsize*mb;
+         y_offset = 0;
+         u_offset = oMBsize/2;
+ 
 diff --git a/src/main.c b/src/main.c
-index 736310a9ac32c055a96e6599efe8e094fb4c6235..0142d781bdfd2069b71e3a786fc1a242c915c077 100644
+index 736310a9ac32c055a96e6599efe8e094fb4c6235..c72c3422233a9b6ce0785e0b35ac87b9e091eda8 100644
 --- a/src/main.c
 +++ b/src/main.c
 @@ -42,6 +42,53 @@ static int l_PluginInit = 0;
@@ -84,7 +97,7 @@ index 736310a9ac32c055a96e6599efe8e094fb4c6235..0142d781bdfd2069b71e3a786fc1a242
      for (i = 0; i < (task->data_size/4); i += 2)
      {
          inst1 = p_alist[i];
-@@ -193,140 +245,179 @@ EXPORT m64p_error CALL PluginGetVersion(m64p_plugin_type *PluginType, int *Plugi
+@@ -193,140 +245,182 @@ EXPORT m64p_error CALL PluginGetVersion(m64p_plugin_type *PluginType, int *Plugi
  
  EXPORT unsigned int CALL DoRspCycles(unsigned int Cycles)
  {
@@ -187,7 +200,10 @@ index 736310a9ac32c055a96e6599efe8e094fb4c6235..0142d781bdfd2069b71e3a786fc1a242
 +            {
 +                switch(sum)
 +                {
-+                case 0x2caa6: // Pokemon Stadium {1,2} jpg decompression
++                case 0x278: // Zelda OOT during boot
++                  taskdone();
++                  return Cycles;
++                case 0x2caa6: // Zelda OOT, Pokemon Stadium {1,2} jpg decompression
 +                    ps_jpg_uncompress(task);
 +                    taskdone();
 +                    return Cycles;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-rsp-hle.git