[mupen64plus-core] 273/310: Use same precondition for all parts of the Mario64 Levitate cheat

Thu Nov 26 05:58:17 UTC 2015

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

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

commit 428f12f73b5493a5249c09d9946509c9913f5a94
Author: Sven Eckelmann <sven at narfation.org>
Date:   Wed Jan 29 22:16:12 2014 +0100

    Use same precondition for all parts of the Mario64 Levitate cheat
    
    The cheat code consists of three pairs of precondition and actual write. The
    original code used two different preconditions (one for the first write and two
    for the second/third write). This caused problems like the inability to finish
    a level. Using the same precondition everywhere seems to fix this problem.
---
 debian/changelog                      |  2 +
 debian/patches/mario64_levitate.patch | 80 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 83 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 219a676..3d51f05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ mupen64plus-core (2.0-5) UNRELEASED; urgency=medium
     - Add interpreter_cmd_link_unconditionally.patch, Save link information
       in *AL(L) instructions unconditionally
     - Add cheat_multiconditions.patch, Allow multiple preconditions per cheat
+    - Add mario64_levitate.patch, Use same precondition for all parts of the
+      Mario64 Levitate cheat
   * debian/watch:
     - Change upstream check from bitbucket to github
   * debian/copyright:
diff --git a/debian/patches/mario64_levitate.patch b/debian/patches/mario64_levitate.patch
new file mode 100644
index 0000000..80cfbec
--- /dev/null
+++ b/debian/patches/mario64_levitate.patch
@@ -0,0 +1,80 @@
+Description: Use same precondition for all parts of the Mario64 Levitate cheat
+ The cheat code consists of three pairs of precondition and actual write. The
+ original code used two different preconditions (one for the first write and
+ two for the second/third write). This caused problems like the inability to
+ finish a level. Using the same precondition everywhere seems to fix this
+ problem.
+Author: Suttiwit Sukpinit <ormie.suttiwit at gmail.com>
+
+---
+diff --git a/data/mupen64plus.cht b/data/mupen64plus.cht
+index 2f34bb12eb34e0176f7b8eb3b6b90f59ece9737f..d2ce808067b0523adc407b97d950b06b0a38f165 100644
+--- a/data/mupen64plus.cht
++++ b/data/mupen64plus.cht
+@@ -1111,7 +1111,7 @@ Cheat7="Don't Hurt Mario\Monsters",A0339E27 0001
+ Cheat8="Have\Debug Mode",8032C658 00??
+ Cheat8_O=$01 On,$00 Off
+ Cheat9="Press GS for 255 Coins",89339EA8 00FF
+-Cheat10="Press L To Levitate",D0339C31 0020,81339E4C 4220,D0339E4D 0020,81339E0C 0300,D0339E4D 0020,81339E0E 0880
++Cheat10="Press L To Levitate",D0339C31 0020,81339E4C 4220,D0339C31 0020,81339E0C 0300,D0339C31 0020,81339E0E 0880
+ Cheat10_N=Press L to levitate & Let go to land
+ Cheat11="Have All\175 Stars",80207B0B 00FF,50000D02 0000,81207B0C FFFF
+ Cheat11_N=I have Managed to put a Have 175 Stars Option in for you,once the Code is activated, you will see it as a new option in Save Slot A.
+@@ -8476,7 +8476,7 @@ Cheat9="Funny Mario Options\Mario's Cap\On & An Extra in His Hand",8033B177 00??
+ Cheat9_N=Here you can Choose Options with Mario with His Cap on & An Extra in His Hand,Do not use with any other Mario with/without Options,Use only one at a time
+ Cheat9_O=$30 Cap In Hand,$32 Invisible Mario Cap In Hand,$34 Metal Mario Cap In Hand,$36 Invisible Metal Mario Cap In Hand,$38 Flying Mario Cap In Hand
+ Cheat10="Don't Hurt Mario\Falling",8033B22C 00E8,8133B178 FFFF
+-Cheat11="Press L To Levitate",D033AFA1 0020,8133B1BC 4220,D033B1BD 0020,8133B17C 0300,D033B1BD 0020,8133B17E 0880
++Cheat11="Press L To Levitate",D033AFA1 0020,8133B1BC 4220,D033AFA1 0020,8133B17C 0300,D033AFA1 0020,8133B17E 0880
+ Cheat11_N=Press L to levitate & Let go to land
+ Cheat12="[Slot A Codes]\Have All 120 Stars",80207723 0001,8020770B 00C7,50001101 0000,8020770C 00FF
+ Cheat12_N=Have 120 Stars,once the Code is activated, you will see it as a new option in Save Slot A.This will have the Cannon open already to get upto Yoshi on the Roof. but make sure to save the game after collecting Red Coins and turn this code off before saving. you will now have it all saved to mempak
+@@ -13752,7 +13752,7 @@ Cheat9_N=Here you can Choose Options with Mario with His Cap on & An Extra in Hi
+ Cheat9_O=$30 Cap In Hand,$32 Invisible Mario Cap In Hand,$34 Metal Mario Cap In Hand,$36 Invisible Metal Mario Cap In Hand,$38 Flying Mario Cap In Hand
+ Cheat10="Don't Hurt Mario\Falling",8036CF6C 00E8,8136CEB8 FFFF
+ Cheat10_N=Press L to levitate & Let go to land
+-Cheat10="Press L To Levitate",D0309261 0020,8130947C 4220,D030947D 0020,8130943C 0300,D030947D 0020,8130943E 0880
++Cheat10="Press L To Levitate",D0309261 0020,8130947C 4220,D0309261 0020,8130943C 0300,D0309261 0020,8130943E 0880
+ Cheat11="[Slot A Codes]\Have All 120 Stars",80202F23 0001,80202F0B 00C7,50001101 0000,80202F0C 00FF
+ Cheat11_N=Have 120 Stars,once the Code is activated, you will see it as a new option in Save Slot A.This will have the Cannon open already to get upto Yoshi on the Roof. but make sure to save the game after collecting Red Coins and turn this code off before saving. you will now have it all saved to mempak
+ Cheat12="[Slot A Codes]\Have all key doors unlocked (and mote empty)",80202F0A 007E
+diff --git a/data/mupencheat.txt b/data/mupencheat.txt
+index ed1c792e997879fafb9c1cbd2fc17880bdbfb633..451d8f811a942e4dab9400716f246a2bb0d96e83 100644
+--- a/data/mupencheat.txt
++++ b/data/mupencheat.txt
+@@ -1697,9 +1697,9 @@ gn Super Mario 64 (J)
+   cd Press L to levitate & Let go to land
+   D0339C31 0020
+   81339E4C 4220
+-  D0339E4D 0020
++  D0339C31 0020
+   81339E0C 0300
+-  D0339E4D 0020
++  D0339C31 0020
+   81339E0E 0880
+  cn Have All\175 Stars
+   cd I have Managed to put a Have 175 Stars Option in for you,once the Code is activated, you will see it as a new option in Save Slot A.
+@@ -15619,9 +15619,9 @@ gn SUPER MARIO 64
+   cd Press L to levitate & Let go to land
+   D033AFA1 0020
+   8133B1BC 4220
+-  D033B1BD 0020
++  D033AFA1 0020
+   8133B17C 0300
+-  D033B1BD 0020
++  D033AFA1 0020
+   8133B17E 0880
+  cn [Slot A Codes]\Have All 120 Stars
+   cd Have 120 Stars,once the Code is activated, you will see it as a new option in Save Slot A.This will have the Cannon open already to get upto Yoshi on the Roof. but make sure to save the game after collecting Red Coins and turn this code off before saving. you will now have it all saved to mempak
+@@ -26223,9 +26223,9 @@ gn SUPER MARIO 64
+   cd Press L to levitate & Let go to land
+   D0309261 0020
+   8130947C 4220
+-  D030947D 0020
++  D0309261 0020
+   8130943C 0300
+-  D030947D 0020
++  D0309261 0020
+   8130943E 0880
+  cn [Slot A Codes]\Have All 120 Stars
+   cd Have 120 Stars,once the Code is activated, you will see it as a new option in Save Slot A.This will have the Cannon open already to get upto Yoshi on the Roof. but make sure to save the game after collecting Red Coins and turn this code off before saving. you will now have it all saved to mempak
diff --git a/debian/patches/series b/debian/patches/series
index 498c189..136c9dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ sdl2_no_surface.patch
 sdl2_destroywindow.patch
 interpreter_cmd_link_unconditionally.patch
 cheat_multiconditions.patch
+mario64_levitate.patch

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

