Skip to content

Commit

Permalink
assets: Sync mupen64plus.ini with upstream (long overdue).
Browse files Browse the repository at this point in the history
  • Loading branch information
@littleguy77
littleguy77 committed Dec 31, 2014
1 parent 1222288 commit 3999a59
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 1 deletion.
104 changes: 104 additions & 0 deletions assets/mupen64plus_data/mupen64plus.ini
View file
Expand Up @@ -5950,6 +5950,12 @@ CRC=AF9DCC15 1A723D88
Players=1
SaveType=Eeprom 4KB
[6F417D30D772F4420C9384E9BBB7BC01]
GoodName=Indiana Jones and the Infernal Machine (E)
CRC=3A6F8C6B 2897BAEB
SaveType=Eeprom 4KB
Players=1
[A7781D441AF55C4FF8AFC68AB3A59313]
GoodName=Indy Racing 2000 (U) [!]
CRC=E436467A 82DE8F9B
Expand Down Expand Up @@ -6846,6 +6852,10 @@ SaveType=Flash RAM
Status=4
Rumble=Yes
Players=1
; Subscreen Delay Fix
Cheat0=801DB78B 0002
; End Credits Fix
Cheat1=D109A814 0320,8109A814 0000,D109A816 F809,8109A816 0000
[33FB7852C180B18EA0B9620B630F413F]
GoodName=Zelda no Densetsu - Toki no Ocarina GC (J) (GC) [!]
Expand All @@ -6854,6 +6864,10 @@ SaveType=Flash RAM
Status=4
Rumble=Yes
Players=1
; Subscreen Delay Fix
Cheat0=801DB78B 0002
; End Credits Fix
Cheat1=D109A834 0320,8109A834 0000,D109A836 F809,8109A836 0000
[69895C5C78442260F6EAFB2506DC482A]
GoodName=Zelda no Densetsu - Toki no Ocarina GC URA (J) (GC) [!]
Expand All @@ -6862,6 +6876,10 @@ SaveType=Flash RAM
Status=4
Rumble=Yes
Players=1
; Subscreen Delay Fix
Cheat0=801DB78B 0002
; End Credits Fix
Cheat1=D109A814 0320,8109A814 0000,D109A816 F809,8109A816 0000
[13FAB67E603B002CEAF0EEA84130E973]
GoodName=Legend of Zelda, The - Majora's Mask (E) (M4) (V1.0) [!]
Expand Down Expand Up @@ -6991,6 +7009,8 @@ SaveType=SRAM
Status=4
Rumble=Yes
Players=1
; Subscreen Delay Fix
Cheat0=801DA5CB 0002

[A04EBD753276C52E95E25AF7683DA32D]
GoodName=Zelda no Densetsu - Toki no Ocarina (J) (V1.0) [T+Chi.02_madcell]
Expand All @@ -7014,11 +7034,15 @@ SaveType=SRAM
Status=4
Rumble=Yes
Players=1
; Subscreen Delay Fix
Cheat0=801DA78B 0002

[2258052847BDD056C8406A9EF6427F13]
GoodName=Zelda no Densetsu - Toki no Ocarina (J) (V1.2) [!]
CRC=693BA2AE B7F14E9F
RefMD5=1BF5F42B98C3E97948F01155F12E2D88
; Subscreen Delay Fix
Cheat0=801DAE8B 0002

[E040DE91A74B61E3201DB0E2323F768A]
GoodName=Legend of Zelda, The - Ocarina of Time (E) (M3) (V1.0) [!]
Expand All @@ -7027,6 +7051,8 @@ Status=4
Players=1
SaveType=SRAM
Rumble=Yes
; Subscreen Delay Fix
Cheat0=801D860B 0002

[2B60EF777F759B4F0E19DDF3CB84D9AB]
GoodName=Legend of Zelda, The - Ocarina of Time (E) (M3) (V1.0) [b1]
Expand All @@ -7050,6 +7076,8 @@ Status=4
Players=1
SaveType=SRAM
Rumble=Yes
; Subscreen Delay Fix
Cheat0=801D864B 0002

[5BD1FE107BF8106B2AB6650ABECD54D6]
GoodName=Legend of Zelda, The - Ocarina of Time (U) (V1.0) [!]
Expand All @@ -7058,6 +7086,8 @@ Status=4
SaveType=SRAM
Players=1
Rumble=Yes
; Subscreen Delay Fix
Cheat0=801DA5CB 0002

[A43A350385FA814EC9793B7ACD9E18F4]
GoodName=Legend of Zelda, The - Ocarina of Time (U) (V1.0) (Room121 Hack)
Expand Down Expand Up @@ -7230,6 +7260,8 @@ Status=4
SaveType=SRAM
Players=1
Rumble=Yes
; Subscreen Delay Fix
Cheat0=801DA78B 0002

[92C842FC8CF706FF290044D40A64D346]
GoodName=Legend of Zelda, The - Ocarina of Time (U) (V1.1) [T+Ita100]
Expand Down Expand Up @@ -7276,6 +7308,8 @@ GoodName=Legend of Zelda, The - Ocarina of Time (U) (V1.2) [!]
CRC=693BA2AE B7F14E9F
Players=1
SaveType=SRAM
; Subscreen Delay Fix
Cheat0=801DAE8B 0002

[CD09029EDCFB7C097AC01986A0F83D3F]
GoodName=Legend of Zelda, The - Ocarina of Time (U) (GC) [!]
Expand All @@ -7284,6 +7318,10 @@ Status=4
Players=1
SaveType=SRAM
Rumble=Yes
; Subscreen Delay Fix
Cheat0=801DB78B 0002
; End Credits Fix
Cheat1=D109A814 0320,8109A814 0000,D109A816 F809,8109A816 0000

[2C27B4E000E85FD78DBCA551F1B1C965]
GoodName=Legend of Zelda, The - Ocarina of Time (E) (GC) [!]
Expand All @@ -7292,6 +7330,10 @@ Status=4
Players=1
SaveType=SRAM
Rumble=Yes
; Subscreen Delay Fix
Cheat0=801D8F8B 0002
; End Credits Fix
Cheat1=D109A8E4 0320,8109A8E4 0000,D109A8E6 F809,8109A8E6 0000

[77314FE3C3EDD472D0554C12FEDB38F4]
GoodName=Legend of Zelda, The - Ocarina of Time (E) (GC) [f1]
Expand All @@ -7305,6 +7347,10 @@ Status=4
Players=1
SaveType=SRAM
Rumble=Yes
; Subscreen Delay Fix
Cheat0=801D8F4B 0002
; End Credits Fix
Cheat1=D109A8C4 0320,8109A8C4 0000,D109A8C6 F809,8109A8C6 0000

[BC2ECBE96B04EDC56B08347DF7C7FECD]
GoodName=Legend of Zelda, The - Ocarina of Time - Master Quest (E) (GC) [T+Ita70%_Rulesless]
Expand Down Expand Up @@ -7333,6 +7379,10 @@ Status=4
Players=1
SaveType=SRAM
Rumble=Yes
; Subscreen Delay Fix
Cheat0=801DB74B 0002
; End Credits Fix
Cheat1=D109A7F4 0320,8109A7F4 0000,D109A7F6 F809,8109A7F6 0000

[26A1616667EEC82288534C47B6927D45]
GoodName=Legend of Zelda, The - Ocarina of Time - Master Quest (U) (Debug Version) [f1]
Expand Down Expand Up @@ -10623,6 +10673,12 @@ Players=1
Rumble=No
SaveType=Eeprom 4KB
CountPerOp=3
; Land Shadow Fix (disabled because can cause hangs when pressing Quit after landing)
;Cheat0=D0264361 0012,80264361 00FF,D0264BE1 0012,80264BE1 00FF,D0264DA1 0012,80264DA1 00FF,D02647E1 0012,802647E1 00FF,D02646A1 0012,802646A1 00FF,D0264661 0012,80264661 00FF,D02649A1 0012,802649A1 00FF
;Cheat1=D0264BA1 0012,80264BA1 00FF,D0264AA1 0012,80264AA1 00FF,D02641E1 0020,802641E1 00FF,D02648E1 0020,802648E1 00FF,D0264D61 0020,80264D61 00FF,D0264A21 0020,80264A21 00FF,D02645A1 0020,802645A1 00FF
;Cheat2=D02647A1 0020,802647A1 00FF,D02642A1 0029,802642A1 00FF,D0264921 0029,80264921 00FF,D0264621 0029,80264621 00FF,D0264A21 0029,80264A21 00FF,D0264C61 0029,80264C61 00FF,D02647A1 0029,802647A1 00FF
;Cheat3=D0264FE1 0029,80264FE1 00FF,D0265161 0029,80265161 00FF,D0264AA1 0029,80264AA1 00FF,D02641E1 003D,802641E1 00FF,D02649E1 003D,802649E1 00FF,D0264561 003D,80264561 00FF,D02646E1 003D,802646E1 00FF
;Cheat4=D0264721 003D,80264721 00FF

[F21E2A3A05ACF49586F32DCE5C449FE4]
GoodName=Pilotwings 64 (E) (M3) [b1]
Expand All @@ -10646,6 +10702,12 @@ Players=1
SaveType=Eeprom 4KB
Rumble=No
CountPerOp=3
; Land Shadow Fix (disabled because can cause hangs when pressing Quit after landing)
;Cheat0=D02639B1 0012,802639B1 00FF,D0264231 0012,80264231 00FF,D02643F1 0012,802643F1 00FF,D0263E31 0012,80263E31 00FF,D0263CF1 0012,80263CF1 00FF,D0263CB1 0012,80263CB1 00FF,D0263FF1 0012,80263FF1 00FF
;Cheat1=D02641F1 0012,802641F1 00FF,D02640F1 0012,802640F1 00FF,D0263831 0020,80263831 00FF,D0263F31 0020,80263F31 00FF,D02643B1 0020,802643B1 00FF,D0264071 0020,80264071 00FF,D0263BF1 0020,80263BF1 00FF
;Cheat2=D0263DF1 0020,80263DF1 00FF,D02638F1 0029,802638F1 00FF,D0263F71 0029,80263F71 00FF,D0263C71 0029,80263C71 00FF,D0264071 0029,80264071 00FF,D02642B1 0029,802642B1 00FF,D0263DF1 0029,80263DF1 00FF
;Cheat3=D0264631 0029,80264631 00FF,D02647B1 0029,802647B1 00FF,D02640F1 0029,802640F1 00FF,D0263831 003D,80263831 00FF,D0264031 003D,80264031 00FF,D0263BB1 003D,80263BB1 00FF,D0263D31 003D,80263D31 00FF
;Cheat4=D0263D71 003D,80263D71 00FF

[2740F1B89CE7D78A5D31CF60C97A0C11]
GoodName=Pilotwings 64 (J) [b1]
Expand All @@ -10659,6 +10721,12 @@ Players=1
SaveType=Eeprom 4KB
Rumble=No
CountPerOp=3
; Land Shadow Fix (disabled because can cause hangs when pressing Quit after landing)
;Cheat0=D0263B41 0012,80263B41 00FF,D02643C1 0012,802643C1 00FF,D0264581 0012,80264581 00FF,D0263FC1 0012,80263FC1 00FF,D0263E81 0012,80263E81 00FF,D0263E41 0012,80263E41 00FF,D0264181 0012,80264181 00FF
;Cheat1=D0264381 0012,80264381 00FF,D0264281 0012,80264281 00FF,D02639C1 0020,802639C1 00FF,D02640C1 0020,802640C1 00FF,D0264541 0020,80264541 00FF,D0264201 0020,80264201 00FF,D0263D81 0020,80263D81 00FF
;Cheat2=D0263F81 0020,80263F81 00FF,D0263A81 0029,80263A81 00FF,D0264101 0029,80264101 00FF,D0263E01 0029,80263E01 00FF,D0264201 0029,80264201 00FF,D0264441 0029,80264441 00FF,D0263F81 0029,80263F81 00FF
;Cheat3=D02647C1 0029,802647C1 00FF,D0264941 0029,80264941 00FF,D0264281 0029,80264281 00FF,D02639C1 003D,802639C1 00FF,D02641C1 003D,802641C1 00FF,D0263D41 003D,80263D41 00FF,D0263EC1 003D,80263EC1 00FF
;Cheat4=D0263F01 003D,80263F01 00FF

[E28F8F19E56CC6C7A0F3A3286AEB60C1]
GoodName=Pilotwings 64 (U) [h1C]
Expand Down Expand Up @@ -10768,6 +10836,10 @@ CRC=EC0F690D 32A7438C
Players=1
Rumble=Yes
SaveType=Flash RAM
; Pass 1st Level and Controller Fix
Cheat0=D136D22C 802A,8036D21F 0000
; Make Picture selectable
Cheat1=D11E1EC4 2881,811E1EC4 2001,D11E1EC6 0098,811E1EC6 0001

[42CC0FE1442B0A498DFD8F743179C51A]
GoodName=Pocket Monsters Snap (J) [b1]
Expand Down Expand Up @@ -10888,6 +10960,10 @@ CRC=7BB18D40 83138559
Players=1
SaveType=Flash RAM
Rumble=Yes
; Pass 1st Level and Controller Fix
Cheat0=D1382D1C 802C,80382D0F 0000
; Make Picture selectable
Cheat1=D11E3C44 2881,811E3C44 2001,D11E3C46 0098,811E3C46 0001

[A88FCF3FF00F21D3CEC44D2E0FAAAAD8]
GoodName=Pokemon Snap (A) [f1] (GameShark)
Expand All @@ -10900,13 +10976,21 @@ CRC=4FF5976F ACF559D8
Players=1
SaveType=Flash RAM
Rumble=Yes
; Pass 1st Level and Controller Fix
Cheat0=D1381BFC 802C,80381BEF 0000
; Make Picture selectable
Cheat1=D11E3824 2881,811E3824 2001,D11E3826 0098,811E3826 0001

[E9028F9CCC307806695DD81742D05D5D]
GoodName=Pokemon Snap (F) [!]
CRC=BA6C293A 9FAFA338
Players=1
SaveType=Flash RAM
Rumble=Yes
; Pass 1st Level and Controller Fix
Cheat0=D1381BFC 802C,80381BEF 0000
; Make Picture selectable
Cheat1=D11E3744 2881,811E3744 2001,D11E3746 0098,811E3746 0001

[5FA70A63E352EA804607999674381749]
GoodName=Pokemon Snap (F) [b1]
Expand All @@ -10919,27 +11003,43 @@ CRC=5753720D 2A8A884D
Players=1
SaveType=Flash RAM
Rumble=Yes
; Pass 1st Level and Controller Fix
Cheat0=D1381BDC 802C,80381BCF 0000
; Make Picture selectable
Cheat2=D11E3744 2881,811E3744 2001,D11E3746 0098,811E3746 0001

[D0453459095F69BE36D675D8F743069B]
GoodName=Pokemon Snap (I) [!]
CRC=C0C85046 61051B05
Players=1
SaveType=Flash RAM
Rumble=Yes
; Pass 1st Level and Controller Fix
Cheat0=D1381BFC 802C,80381BEF 0000
; Make Picture selectable
Cheat1=D11E3994 2881,811E3994 2001,D11E3996 0098,811E3996 0001

[A45D7115BE5A06FD1567F9F913C3BDF8]
GoodName=Pokemon Snap (S) [!]
CRC=817D286A EF417416
Players=1
SaveType=Flash RAM
Rumble=Yes
; Pass 1st Level and Controller Fix
Cheat0=D1381BFC 802C,80381BEF 0000
; Make Picture selectable
Cheat1=D11E38C4 2881,811E38C4 2001,D11E38C6 0098,811E38C6 0001

[FC3C9329B7CDD67CF7650ABF63B9A580]
GoodName=Pokemon Snap (U) [!]
CRC=CA12B547 71FA4EE4
Players=1
SaveType=Flash RAM
Rumble=Yes
; Pass 1st Level and Controller Fix
Cheat0=D1382D1C 802C,80382D0F 0000
; Make Picture selectable
Cheat1=D11E3184 2881,811E3184 2001,D11E3186 0098,811E3186 0001

[CCA6F7593302D46ADA66C991C976DA2D]
GoodName=Pokemon Snap (U) [T+Spa]
Expand Down Expand Up @@ -10971,6 +11071,10 @@ GoodName=Pokemon Snap Station (U) [!]
CRC=39119872 07722E9F
Players=1
Rumble=Yes
; Pass 1st Level and Controller Fix
Cheat0=D1382D1C 802C,80382D0F 0000
; Make Picture selectable
Cheat1=D11E30F4 2881,811E30F4 2001,D11E30F6 0098,811E30F6 0001

[B88F0EC125C54685FA516D233B564842]
GoodName=Pokemon Snap Station (U) [f1]
Expand Down
2 changes: 1 addition & 1 deletion src/paulscode/android/mupen64plusae/SplashActivity.java
View file
Expand Up @@ -58,7 +58,7 @@ public class SplashActivity extends Activity implements ExtractAssetsListener
* Asset version number, used to determine stale assets. Increment this number every time the
* assets are updated on disk.
*/
private static final int ASSET_VERSION = 48;
private static final int ASSET_VERSION = 49;

/** The total number of assets to be extracted (for computing progress %). */
private static final int TOTAL_ASSETS = 115;
Expand Down

2 comments on commit 3999a59

@littleguy77
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most of these changes were made upstream way back in January, and should have been merged a long time ago.

Note that this applies the subscreen delay hack-fix for LoZ OoT (i.e. fixes the delay when pressing the start button). The downside is that the background of the start screen is sometimes psychedelic when using glide and frameskip. (The same psychedelic effect as seen in gln64).

I went ahead and synced anyhow since this was the last diff with upstream core. We are now using vanilla mupen64plus-core.

@littleguy77
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@paulscode @xperia64 @Gillou68310

Please sign in to comment.