From b686fbdb5837362675fe9de84b73794743afaddc Mon Sep 17 00:00:00 2001
From: ptitSeb <sebastien.chev@gmail.com>
Date: Fri, 20 Dec 2013 20:15:56 +0100
Subject: [PATCH] CORE: Rom DataBase with DelaySI & CountPerOp per rom settings

---
 source/mupen64plus-core/data/mupen64plus.ini | 194 +++++++++++++++++++
 1 file changed, 194 insertions(+)

diff --git a/source/mupen64plus-core/data/mupen64plus.ini b/source/mupen64plus-core/data/mupen64plus.ini
index 85b6826..244a0ac 100644
--- a/source/mupen64plus-core/data/mupen64plus.ini
+++ b/source/mupen64plus-core/data/mupen64plus.ini
@@ -206,6 +206,7 @@ Players=4
 SaveType=None
 Status=5
 Rumble=No
+CountPerOp=1
 
 [88763C3FD50E036BBB9CF504F77C0741]
 GoodName=64 Oozumou (J) [b1]
@@ -250,6 +251,7 @@ Rumble=Yes
 Players=4
 Status=2
 SaveType=Eeprom 4KB
+CountPerOp=1
 
 [11B20CFE8E3ECCC680AA8157A7906D6D]
 GoodName=64 de Hakken!! Tamagotchi Minna de Tamagotchi World (J) [b1]
@@ -568,6 +570,7 @@ Players=4
 SaveType=Controller Pack
 Status=4
 Rumble=Yes
+CountPerOp=1
 
 [DCFB92A4B106FE61E54579B1D3B7336E]
 GoodName=Airboarder 64 (E) [f1] (NTSC)
@@ -586,6 +589,7 @@ Players=4
 Status=4
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [F558165311C9CDCA73FB089E298F2056]
 GoodName=Airboarder 64 (J) [b1]
@@ -1265,11 +1269,13 @@ GoodName=Bass Hunter 64 (E) [!]
 CRC=B088FBB4 441E4B1D
 Players=1
 SaveType=Eeprom 4KB
+CountPerOp=1
 
 [2C618F6C69C3B4803F08762A03835139]
 GoodName=Bass Rush - ECOGEAR PowerWorm Championship (J) [!]
 CRC=D76333AC 0CB6219D
 Players=1
+CountPerOp=1
 
 [B1AB1D5B3B92B0ACA380D0291DA0689E]
 GoodName=Bass Rush - ECOGEAR PowerWorm Championship (J) [b1]
@@ -1286,6 +1292,7 @@ GoodName=Bassmasters 2000 (U) [!]
 CRC=BCFACCAA B814D8EF
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [D8903586B5E479E6C4937879650D0D2D]
 GoodName=Bassmasters 2000 (U) [b1]
@@ -1333,6 +1340,7 @@ GoodName=BattleTanx (U) [!]
 CRC=6AA4DDE7 E3E2F4E7
 SaveType=Controller Pack
 Players=4
+CountPerOp=3
 
 [94A7605A28861C43F636AE0FF7F25F2E]
 GoodName=BattleTanx (U) [b1]
@@ -1359,12 +1367,14 @@ GoodName=BattleTanx - Global Assault (E) (M3) [!]
 CRC=0CAD17E6 71A5B797
 Players=4
 SaveType=Controller Pack
+CountPerOp=3
 
 [654557C316F901A2CA6F7F4B43343147]
 GoodName=BattleTanx - Global Assault (U) [!]
 CRC=75A4E247 6008963D
 Players=4
 SaveType=Controller Pack
+CountPerOp=3
 
 [DC5AAE1CADF43DF43184D2935C32C26C]
 GoodName=BattleTanx - Global Assault (U) [f1] (Country Check)
@@ -1387,6 +1397,7 @@ GoodName=Beetle Adventure Racing! (E) (M3) [!]
 CRC=A1B64A61 D014940B
 Players=4
 SaveType=Controller Pack
+CountPerOp=3
 
 [9D5A1B779F8B43E63E8CE8427675A7EF]
 GoodName=Beetle Adventure Racing! (E) (M3) [h1C]
@@ -1403,6 +1414,7 @@ GoodName=Beetle Adventure Racing! (J) [!]
 CRC=9C7318D2 24AE0DC1
 Players=4
 SaveType=Controller Pack
+CountPerOp=3
 
 [E126B84FA242916289D04D68C0E20BFE]
 GoodName=Beetle Adventure Racing! (J) [b1]
@@ -1414,6 +1426,7 @@ GoodName=Beetle Adventure Racing! (U) (M3) [!]
 CRC=EDF419A8 BF1904CC
 SaveType=Controller Pack
 Players=4
+CountPerOp=3
 
 [D11BC38F26EA2835FBF017FE9BD404FE]
 GoodName=Beetle Adventure Racing! (U) (M3) [b1]
@@ -1540,6 +1553,7 @@ GoodName=Biohazard 2 (J) [!]
 CRC=7EAE2488 9D40A35A
 SaveType=SRAM
 Players=1
+CountPerOp=1
 
 [13D7834291A311077B84B9A2816AF6FC]
 GoodName=Birthday Demo for Steve by Nep (PD) [b1]
@@ -1630,17 +1644,23 @@ GoodName=Body Harvest (E) (M3) [!]
 CRC=0B58B8CD B7B291D2
 SaveType=Eeprom 4KB
 Players=1
+DelaySI=True
+CountPerOp=1
+
 
 [0EF2448C243F86C4C9F194F49CFD8352]
 GoodName=Body Harvest (E) (M3) [f1] (NTSC)
 CRC=6F66B92D 80B9E520
 RefMD5=B27FA5E9AD0CB47BB3A74FFAC7BC8EDF
 
+
 [3B8585ED03E8DDB89D7DE456317545E7]
 GoodName=Body Harvest (U) [!]
 CRC=5326696F FE9A99C3
 Players=1
 SaveType=Eeprom 4KB
+DelaySI=True
+CountPerOp=1
 
 [77554810629D4EF4D93519745FA6066B]
 GoodName=Body Harvest (U) [b1]
@@ -1921,6 +1941,7 @@ GoodName=Bug's Life, A (E) [!]
 CRC=8F12C096 45DC17E1
 Players=1
 SaveType=Controller Pack
+CountPerOp=1
 
 [5BF0F2351AEE577A8345D6E13D197E06]
 GoodName=Bug's Life, A (E) [f1] (NTSC)
@@ -1932,6 +1953,7 @@ GoodName=Bug's Life, A (F) [!]
 CRC=2B38AEC0 6350B810
 SaveType=Controller Pack
 Players=1
+CountPerOp=1
 
 [504C92A5978B7EAE7A3FD30645E06D39]
 GoodName=Bug's Life, A (F) [f1] (NTSC)
@@ -1943,6 +1965,7 @@ GoodName=Bug's Life, A (G) [!]
 CRC=DFF227D9 0D4D8169
 Players=1
 SaveType=Controller Pack
+CountPerOp=1
 
 [919E5D60A7F9A79D89AC179123D47EEE]
 GoodName=Bug's Life, A (G) [f1] (NTSC)
@@ -1954,18 +1977,21 @@ GoodName=Bug's Life, A (I) [!]
 CRC=F63B89CE 4582D57D
 Players=1
 SaveType=Controller Pack
+CountPerOp=1
 
 [7FD6BFFB80F920E01EF869829D485EA3]
 GoodName=Bug's Life, A (U) [!]
 CRC=82DC04FD CF2D82F4
 Players=1
 SaveType=Controller Pack
+CountPerOp=1
 
 [14ACC20454B0C2789C9F7EF7A556231A]
 GoodName=Bug's Life, A (U) [b1]
 CRC=82DC04FD CF2D82F4
 Players=1
 SaveType=Controller Pack
+CountPerOp=1
 
 [6472BD444D2025B1D883FFAE35D94FD4]
 GoodName=Bug's Life, A (U) [b1][f1] (PAL)
@@ -2181,6 +2207,7 @@ GoodName=California Speed (U) [!]
 CRC=AC16400E CF5D071A
 SaveType=Controller Pack
 Players=4
+CountPerOp=1
 
 [C95353C14C4AE3DC95D1D91D6566EF92]
 GoodName=California Speed (U) [f1] (Country Check)
@@ -2202,6 +2229,7 @@ GoodName=Carmageddon 64 (E) (M4) (Eng-Spa-Fre-Ger) [!]
 CRC=580162EC E3108BF1
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [A5DB496C328C36682EB770CEFE6C2064]
 GoodName=Carmageddon 64 (E) (M4) (Eng-Spa-Fre-Ger) [f1] (NTSC)
@@ -2213,11 +2241,13 @@ GoodName=Carmageddon 64 (E) (M4) (Eng-Spa-Fre-Ita) [!]
 CRC=E48E01F5 E6E51F9B
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [D5271DB3CBE6B24099DCC6878C137FF7]
 GoodName=Carmageddon 64 (E) (M4) (Eng-Spa-Fre-Ita) [b1]
 CRC=E48E01F5 E6E51F9B
 RefMD5=59EB5646FA079BCBD7A340D7A10196DD
+CountPerOp=1
 
 [BCD2A45C39128B7D7E29E351788E860E]
 GoodName=Carmageddon 64 (E) (M4) (Eng-Spa-Fre-Ita) [f1] (NTSC)
@@ -2234,6 +2264,7 @@ GoodName=Carmageddon 64 (U) [!]
 CRC=F00F2D4E 340FAAF4
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [57146B6CD8EE7D96B01A811F98A1AC61]
 GoodName=Castlevania (E) (M3) [!]
@@ -2500,6 +2531,7 @@ GoodName=Charlie Blast's Territory (E) [!]
 CRC=FB3C48D0 8D28F69F
 SaveType=None
 Players=4
+CountPerOp=1
 
 [A7C15E0C1E7D898C1B20276DF7A62660]
 GoodName=Charlie Blast's Territory (E) [o1]
@@ -2511,6 +2543,7 @@ GoodName=Charlie Blast's Territory (U) [!]
 CRC=1E0E96E8 4E28826B
 SaveType=None
 Players=4
+CountPerOp=1
 
 [7FFD84FC7D112EAB4EEF15CB10189A38]
 GoodName=Charlie Blast's Territory (U) [hIR]
@@ -2655,6 +2688,8 @@ GoodName=City-Tour GP - Zennihon GT Senshuken (J) [!]
 CRC=F8009DB0 6B291823
 Players=4
 SaveType=Eeprom 4KB
+DelaySI=True
+CountPerOp=1
 
 [4808E8129B22AC8B3185B37243113005]
 GoodName=City-Tour GP - Zennihon GT Senshuken (J) [b1]
@@ -2849,54 +2884,64 @@ GoodName=Cruis'n USA (E) [!]
 CRC=503EA760 E1300E96
 Players=2
 SaveType=Eeprom 4KB
+DelaySI=True
 
 [00A3E885F8D899646228A21D946B2102]
 GoodName=Cruis'n USA (U) (V1.0) [!]
 CRC=FF2F2FB4 D161149A
 Players=2
 SaveType=Eeprom 4KB
+DelaySI=True
 
 [190906A8A5F1C1D4909F6374A784ECA4]
 GoodName=Cruis'n USA (U) (V1.0) [T+Ita0.40]
 CRC=FF2F2FB4 D161149A
 RefMD5=00A3E885F8D899646228A21D946B2102
+DelaySI=True
 
 [635C94434922DC73C58965004E3F699D]
 GoodName=Cruis'n USA (U) (V1.0) [b1]
 CRC=FF2F2FB4 D161149A
 RefMD5=00A3E885F8D899646228A21D946B2102
+DelaySI=True
 
 [D37AB17D3E27ED333704C44DCFAA28E7]
 GoodName=Cruis'n USA (U) (V1.0) [b2]
 CRC=FF2F2FB4 D161149A
 RefMD5=00A3E885F8D899646228A21D946B2102
+DelaySI=True
 
 [1D4843F0C69E273A1099A4267BB9F526]
 GoodName=Cruis'n USA (U) (V1.0) [b3]
 CRC=FF2F2FB4 D161149A
 RefMD5=00A3E885F8D899646228A21D946B2102
+DelaySI=True
 
 [B0679C685A1FB4D2BA96E4BB941262DE]
 GoodName=Cruis'n USA (U) (V1.0) [b4]
 CRC=FF2F2FB4 D161149A
 RefMD5=00A3E885F8D899646228A21D946B2102
+DelaySI=True
 
 [A8D5B5F1902AFB1346D97A9D0D52B292]
 GoodName=Cruis'n USA (U) (V1.0) [b5]
 CRC=FF2F2FB4 D161149A
 RefMD5=00A3E885F8D899646228A21D946B2102
+DelaySI=True
 
 [45FC88E2BA6711F25F0DE988E719DF29]
 GoodName=Cruis'n USA (U) (V1.1) [!]
 CRC=5306CF45 CBC49250
 Players=2
 SaveType=Eeprom 4KB
+DelaySI=True
 
 [2838A9018AD2BCB8B7F6161C746A1B71]
 GoodName=Cruis'n USA (U) (V1.2) [!]
 CRC=B3402554 7340C004
 Players=2
 SaveType=Eeprom 4KB
+DelaySI=True
 
 [AF950A1B6C460D7FC3E78375D35047EF]
 GoodName=Cruis'n World (E) [!]
@@ -3096,12 +3141,14 @@ GoodName=Destruction Derby 64 (E) (M3) [!]
 CRC=630AA37D 896BD7DB
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [7FCCB47498EEC06E96AE9372247D1E90]
 GoodName=Destruction Derby 64 (U) [!]
 CRC=DEE584A2 0F161187
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [02EEF6ED11174664A548626337879E8C]
 GoodName=Destruction Derby 64 (U) [f1] (PAL)
@@ -3308,12 +3355,14 @@ GoodName=Disney's Donald Duck - Goin' Quackers (U) [!]
 CRC=C16C421B A21580F7
 Players=1
 SaveType=Eeprom 4KB
+CountPerOp=3
 
 [BD1DE2FC1CF31096423563A40ECBF933]
 GoodName=Disney's Tarzan (E) [!]
 CRC=D614E5BF A76DBCC1
 Players=1
 SaveType=Controller Pack
+CountPerOp=1
 
 [AF740B224E5DD0BD09F7254811559ADF]
 GoodName=Disney's Tarzan (E) [h1C]
@@ -3325,12 +3374,14 @@ GoodName=Disney's Tarzan (F) [!]
 CRC=001A3BD0 AFB3DE1A
 Players=1
 SaveType=Controller Pack
+CountPerOp=1
 
 [DF3CDD959E8C63B45F557FC197CE0E63]
 GoodName=Disney's Tarzan (G) [!]
 CRC=4C261323 4F295E1A
 Players=1
 SaveType=Controller Pack
+CountPerOp=1
 
 [A29E203DDB6293B7D105BF4A2EEEDD1E]
 GoodName=Disney's Tarzan (G) [h1C]
@@ -3342,6 +3393,7 @@ GoodName=Disney's Tarzan (U) [!]
 CRC=CBFE69C7 F2C0AB2A
 Players=1
 SaveType=Controller Pack
+CountPerOp=1
 
 [C56AD8ABD0FB5EFEF1FA0229F9A2EFF0]
 GoodName=Disney's Tarzan (U) [f1] (PAL)
@@ -3603,6 +3655,7 @@ GoodName=Donald Duck - Quack Attack (E) (M5) [!]
 CRC=3DF17480 193DED5A
 Players=1
 SaveType=Eeprom 4KB
+CountPerOp=3
 
 [07C4944DDAAD234F1F6B0B200BEA60B2]
 GoodName=Donald Duck - Quack Attack (E) (M5) [b1]
@@ -3620,6 +3673,7 @@ CRC=11936D8C 6F2C4B43
 SaveType=Eeprom 4KB
 Players=4
 Rumble=Yes
+CountPerOp=1
 
 [428067DC7DB42DFC977A775F0A6E55B1]
 GoodName=Donkey Kong 64 (E) [b1]
@@ -3641,11 +3695,13 @@ GoodName=Donkey Kong 64 (J) [!]
 CRC=053C89A7 A5064302
 SaveType=Eeprom 4KB
 Players=4
+CountPerOp=1
 
 [98A5836E3A5DA7BD0B5819E7498ACEA2]
 GoodName=Donkey Kong 64 (U) (Kiosk Demo) [!]
 CRC=0DD4ABAB B5A2A91E
 SaveType=Eeprom 4KB
+CountPerOp=1
 
 [843DB032839BF1AA74759F2E39A2ABDC]
 GoodName=Donkey Kong 64 (U) (Kiosk Demo) [b1]
@@ -3667,6 +3723,7 @@ GoodName=Donkey Kong 64 (U) [!]
 CRC=EC58EABF AD7C7169
 SaveType=Eeprom 4KB
 Players=4
+CountPerOp=1
 
 [6B4772AA1743FEAC1919618B3FC6B3E1]
 GoodName=Donkey Kong 64 (U) [b1]
@@ -3904,6 +3961,7 @@ RefMD5=923D65E69F51858C697E0E5759CD038B
 GoodName=Duck Dodgers Starring Daffy Duck (U) (M3) [!]
 CRC=FBB9F1FA 6BF88689
 Players=4
+CountPerOp=1
 
 [B5A5A71483679DCCACBDA770647A9DBF]
 GoodName=Duck Dodgers Starring Daffy Duck (U) (M3) [t1]
@@ -3915,6 +3973,7 @@ GoodName=Duke Nukem - ZER0 H0UR (E) [!]
 CRC=DC36626A 3F3770CB
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [51A1EEE441240229BEB2E6CD8FAB285C]
 GoodName=Duke Nukem - ZER0 H0UR (E) [f1] (NTSC)
@@ -3926,12 +3985,14 @@ GoodName=Duke Nukem - ZER0 H0UR (F) [!]
 CRC=32CA974B B2C29C50
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [026789D47DB5FE202A76F89797B33AC7]
 GoodName=Duke Nukem - ZER0 H0UR (U) [!]
 CRC=04DAF07F 0D18E688
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [69ED326664E48BAA9CE743E6E9C450DA]
 GoodName=Duke Nukem - ZER0 H0UR (U) [b1]
@@ -4171,23 +4232,27 @@ GoodName=Excitebike 64 (E) [!]
 CRC=202A8EE4 83F88B89
 SaveType=Eeprom 16KB
 Players=4
+CountPerOp=1
 
 [BF15A61AFF71C93BF5E05243F57BCA1D]
 GoodName=Excitebike 64 (J) [!]
 CRC=861C3519 F6091CE5
 SaveType=Eeprom 16KB
 Players=4
+CountPerOp=1
 
 [E0018C33346714B63A55C0E040F23DEA]
 GoodName=Excitebike 64 (U) (Kiosk Demo) [!]
 CRC=AF754F7B 1DD17381
 SaveType=Eeprom 16KB
+CountPerOp=1
 
 [7200D1C1CF489FAFFF767729F215E6E6]
 GoodName=Excitebike 64 (U) [!]
 CRC=07861842 A12EBC9F
 SaveType=Eeprom 16KB
 Players=4
+CountPerOp=1
 
 [496929EA74183198D121035EA808C480]
 GoodName=Excitebike 64 (U) [b1]
@@ -4720,12 +4785,14 @@ GoodName=Fighting Force 64 (E) [!]
 CRC=66CF0FFE AD697F9C
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [E7008D17FD71D9C2BDA1362C885388B2]
 GoodName=Fighting Force 64 (U) [!]
 CRC=32EFC7CB C3EA3F20
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [13962910EFD82C2A2333CF38EE1FCD96]
 GoodName=Fighting Force 64 (U) [T+Ita_Cattivik66]
@@ -4763,12 +4830,14 @@ GoodName=Flying Dragon (E) [!]
 CRC=22E9623F B60E52AD
 SaveType=Controller Pack
 Players=4
+CountPerOp=1
 
 [272B359D8F8AC48ACBF053C262F422E4]
 GoodName=Flying Dragon (U) [!]
 CRC=A92D52E5 1D26B655
 SaveType=Controller Pack
 Players=4
+CountPerOp=1
 
 [46E9A352AD6AFB83B0557EC659957B2E]
 GoodName=Flying Dragon (U) [b1]
@@ -4884,6 +4953,7 @@ CRC=E8E5B179 44AA30E8
 GoodName=Fushigi no Dungeon - Fuurai no Shiren 2 - Oni Shuurai! Shiren Jou! (J) [!]
 CRC=F774EAEE F0D8B13E
 Players=4
+CountPerOp=1
 
 [316C59DAE45C20250A0419A937E7D65B]
 GoodName=G.A.S.P!! Fighter's NEXTream (E) [!]
@@ -4923,6 +4993,8 @@ GoodName=GT 64 - Championship Edition (E) (M3) [!]
 CRC=EE4A0E33 8FD588C9
 SaveType=Eeprom 4KB
 Players=4
+DelaySI=True
+CountPerOp=1
 
 [15DB716942C36A0CB392226001536A2A]
 GoodName=GT 64 - Championship Edition (E) (M3) [b1]
@@ -4944,6 +5016,8 @@ GoodName=GT 64 - Championship Edition (U) [!]
 CRC=C49ADCA2 F1501B62
 Players=4
 SaveType=Eeprom 4KB
+DelaySI=True
+CountPerOp=1
 
 [4695A944B019F3829F2616591659A7CE]
 GoodName=GT 64 - Championship Edition (U) [b1]
@@ -5348,27 +5422,33 @@ CRC=BD1263E5 388C9BE7
 [7B38C3F7DA8D9778B41B0047A133590A]
 GoodName=HSV Adventure Racing (A) [b1]
 CRC=72611D7D 9919BDD2
+CountPerOp=3
 
 [8C7AF37A3CB7306EBCCAC4029EB5C57D]
 GoodName=HSV Adventure Racing (A) [f1] (NTSC)
 CRC=B20CC247 B879579A
+CountPerOp=3
 
 [26F7D8F4640EBDFA823F84E5F89D62BF]
 GoodName=HSV Adventure Racing (A)
 CRC=72611D7D 9919BDD2
+CountPerOp=3
 
 [3D4C7B11076BAFA4620BCC154C0EEEF3]
 GoodName=Hamster Monogatari 64 (J) [!]
 CRC=95A80114 E0B72A7F
 Players=1
+CountPerOp=1
 
 [617197EF2B6B51E58488C9F6B75F112E]
 GoodName=Hard Coded Demo by Silo and Fractal (PD) [a1]
 CRC=775AFA9C 0EB52EF6
+CountPerOp=1
 
 [FB8974C6130A6B8585EA98D6661553BC]
 GoodName=Hard Coded Demo by Silo and Fractal (PD)
 CRC=775AFA9C 0EB52EF6
+CountPerOp=1
 
 [193913BB063F3D945019E8F765F48F1C]
 GoodName=Hard Pom '99 Demo by TS_Garp (POM '99) (PD)
@@ -5399,6 +5479,7 @@ GoodName=Harvest Moon 64 (U) [!]
 CRC=98DF9DFC 6606C189
 Players=1
 SaveType=SRAM
+CountPerOp=1
 
 [3CDD87026EFEC9A03648D225F97858A5]
 GoodName=Harvest Moon 64 (U) [T+Pol001]
@@ -5462,12 +5543,14 @@ RefMD5=5E8539E037EEA88C5A2746F60E431C8D
 [1546877FD85C00A83515005727E5FDA5]
 GoodName=Hercules - The Legendary Journeys (E) (M6) [!]
 CRC=AE90DBEB 79B89123
+CountPerOp=1
 
 [6BBD8C42F6EF8F5B9541D6F4DB657DD7]
 GoodName=Hercules - The Legendary Journeys (U) [!]
 CRC=7F3CEB77 8981030A
 Players=1
 SaveType=Controller Pack
+CountPerOp=1
 
 [57D8E020643146B325A11612FEFACF74]
 GoodName=Hercules - The Legendary Journeys (U) [o1]
@@ -5494,6 +5577,7 @@ GoodName=Hexen (E) [!]
 CRC=95B2B30B 2B6415C1
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [E86A8BF46985B7CE8459AFBE5FC3DCC3]
 GoodName=Hexen (E) [h1C]
@@ -5505,12 +5589,14 @@ GoodName=Hexen (F) [!]
 CRC=5C1B5FBD 7E961634
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [08CBB141DEC604E4DAD2787F237D57A2]
 GoodName=Hexen (G) [!]
 CRC=9AB3B50A BC666105
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [35E9ECE11306EF7D8F5F09F65761D365]
 GoodName=Hexen (G) [h1C]
@@ -5522,12 +5608,14 @@ GoodName=Hexen (J) [!]
 CRC=66751A57 54A29D6E
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [EB98F1B8C6898AF7417F6882946DA9B3]
 GoodName=Hexen (U) [!]
 CRC=9CAB6AEA 87C61C00
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [B06625703DB3A03BAE3D02FD0F904541]
 GoodName=Hexen (U) [b1]
@@ -5563,18 +5651,22 @@ CRC=4072572D A23DB72C
 [73084495F3209C54900525436BBBC531]
 GoodName=Hiryuu no Ken Twin (J) [!]
 CRC=35FF8F1A 6E79E3BE
+CountPerOp=1
 
 [8976913EFBE98EFED3B0B32CBCAA8B49]
 GoodName=Hiryuu no Ken Twin (J) [h1C]
 CRC=35FF8F1A 6E79E3BE
+CountPerOp=1
 
 [E0C39E55DE1D588371D5F99056F3578C]
 GoodName=Hiryuu no Ken Twin (J) [h2C]
 CRC=35FF8F1A 6E79E3BE
+CountPerOp=1
 
 [EA9B6EA32CCEB8F7EFBB2FEA211B8E89]
 GoodName=Hiryuu no Ken Twin (J) [h3C]
 CRC=35FF8F1A 6E79E3BE
+CountPerOp=1
 
 [FA6A2E00BBFF236DAC91F08544AFFA40]
 GoodName=Holy Magic Century (E) [!]
@@ -5867,6 +5959,7 @@ GoodName=In-Fisherman Bass Hunter 64 (U) [!]
 CRC=8C138BE0 95700E46
 SaveType=Eeprom 4KB
 Players=1
+CountPerOp=1
 
 [1AF93922A67085AB2C777B1F08AF365B]
 GoodName=In-Fisherman Bass Hunter 64 (U) [f1] (PAL)
@@ -5930,6 +6023,7 @@ GoodName=International Superstar Soccer 64 (E) [!]
 CRC=E2D37CF0 F57E4EAE
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [7FCC22F4BF1FC82F886C455981D2A420]
 GoodName=International Superstar Soccer 64 (E) [b1]
@@ -5956,6 +6050,7 @@ GoodName=International Superstar Soccer 64 (U) [!]
 CRC=5F2763C4 62412AE5
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [C0969E1C141BE6E144E651CAB1AEA3D8]
 GoodName=International Superstar Soccer 64 (U) [b1]
@@ -6192,6 +6287,7 @@ RefMD5=772CC6EAB2620D2D3CDC17BBC26C4F68
 GoodName=Jikkyou G1 Stable (J) [!]
 CRC=AF19D9F5 B70223CC
 Players=4
+CountPerOp=1
 
 [4BBAF03594C6DCECB135AC8C57CB4CD7]
 GoodName=Jikkyou G1 Stable (J) [b1]
@@ -6247,6 +6343,7 @@ RefMD5=58153AC5C4030D1BFD3C15CF57FB02E7
 GoodName=Jikkyou Powerful Pro Yakyuu - Basic Han 2001 (J) [!]
 CRC=6EDD4766 A93E9BA8
 Players=4
+CountPerOp=3
 
 [23409668A6E6C4ECE7B5FB0B7D0E8F2C]
 GoodName=Jikkyou Powerful Pro Yakyuu 2000 (J) (V1.0) [!]
@@ -6347,6 +6444,7 @@ Players=4
 GoodName=Jikkyou World Soccer 3 (J) [!]
 CRC=E0A79F8C 32CC97FA
 Players=4
+CountPerOp=1
 
 [68230D510015FF6817EF898C0B8B636C]
 GoodName=Jinsei Game 64 (J) [!]
@@ -6698,18 +6796,21 @@ GoodName=LEGO Racers (E) (M10) [!]
 CRC=F478D8B3 9716DD6D
 SaveType=Controller Pack
 Players=2
+CountPerOp=3
 
 [97C4CAE584F427EC44266E9B98FBF7B6]
 GoodName=LEGO Racers (U) (M10) [b1]
 CRC=096A40EA 8ABE0A10
 SaveType=Controller Pack
 Players=2
+CountPerOp=3
 
 [26B5EAA13DC5B5E35307FE8C0CF5B6BA]
 GoodName=LEGO Racers (U) (M10) [!]
 CRC=096A40EA 8ABE0A10
 SaveType=Controller Pack
 Players=2
+CountPerOp=3
 
 [E74404ED5A7076855CDE3832474751B6]
 GoodName=LEGO Racers (U) (M10) [b1][f1] (PAL)
@@ -7678,24 +7779,28 @@ GoodName=Madden NFL 2000 (U) [!]
 CRC=0CB81686 5FD85A81
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [441FA65FAA5C12339F89A0BB7DB43C8F]
 GoodName=Madden NFL 2001 (U) [!]
 CRC=EB38F792 190EA246
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [AD0F2EC565D7575FB37512BC8DF8A092]
 GoodName=Madden NFL 2002 (U) [!]
 CRC=D7134F8D C11A00B5
 SaveType=Controller Pack
 Players=4
+CountPerOp=1
 
 [E7BF80861A0AB2A788959463D953B5D5]
 GoodName=Madden NFL 99 (E) [!]
 CRC=3925D625 8C83C75E
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [9CB5F5CD6AB141454D645C92FD9BF67C]
 GoodName=Madden NFL 99 (E) [h1C]
@@ -7707,6 +7812,7 @@ GoodName=Madden NFL 99 (U) [!]
 CRC=DEB78BBA 52F6BD9D
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [C049FCD4CB185A553D8122CFE6C30139]
 GoodName=Madden NFL 99 (U) [o1]
@@ -8166,6 +8272,7 @@ GoodName=Mario Party (E) (M3) [!]
 CRC=9C663069 80F24A80
 Players=4
 SaveType=Eeprom 4KB
+CountPerOp=1
 
 [2608A4D7A695D0B1A1BBC47695EACE0E]
 GoodName=Mario Party (E) (M3) [b1]
@@ -8182,12 +8289,14 @@ GoodName=Mario Party (J) [!]
 CRC=ADA815BE 6028622F
 Players=4
 SaveType=Eeprom 4KB
+CountPerOp=1
 
 [8BC2712139FBF0C56C8EA835802C52DC]
 GoodName=Mario Party (U) [!]
 CRC=2829657E A0621877
 Players=4
 SaveType=Eeprom 4KB
+CountPerOp=1
 
 [D072DDBCC5961AE85E6FA9BF50241370]
 GoodName=Mario Party (U) [f1] (PAL)
@@ -8199,18 +8308,21 @@ GoodName=Mario Party 2 (E) (M5) [!]
 CRC=82380387 DFC744D9
 Players=4
 SaveType=Eeprom 4KB
+CountPerOp=1
 
 [F23E4CD437465F3E725262253CF3EA59]
 GoodName=Mario Party 2 (J) [!]
 CRC=ED567D0F 38B08915
 Players=4
 SaveType=Eeprom 4KB
+CountPerOp=1
 
 [04840612A35ECE222AFDB2DFBF926409]
 GoodName=Mario Party 2 (U) [!]
 CRC=9EA95858 AF72B618
 Players=4
 SaveType=Eeprom 4KB
+CountPerOp=1
 
 [F253C5A0FB69AB56A1548D435AF84D0F]
 GoodName=Mario Party 2 (U) [f1] (PAL)
@@ -8227,18 +8339,21 @@ GoodName=Mario Party 3 (E) (M4) [!]
 CRC=C5674160 0F5F453C
 SaveType=Eeprom 16KB
 Players=4
+CountPerOp=1
 
 [ED99F330CE7A2638AB13351012EEB86B]
 GoodName=Mario Party 3 (J) [!]
 CRC=0B0AB4CD 7B158937
 SaveType=Eeprom 16KB
 Players=4
+CountPerOp=1
 
 [76A8BBC81BC2060EC99C9645867237CC]
 GoodName=Mario Party 3 (U) [!]
 CRC=7C3829D9 6E8247CE
 SaveType=Eeprom 16KB
 Players=4
+CountPerOp=1
 
 [BDD79F498F37D01B8958F56EC6FFA097]
 GoodName=Mario Party 3 (U) [f1]
@@ -8262,6 +8377,7 @@ Status=2
 Players=1
 SaveType=Flash RAM
 Rumble=Yes
+CountPerOp=1
 
 [FFF9B3E22ABB9B60215DAFB13AD5A4DE]
 GoodName=Mario Tennis (E) [!]
@@ -8690,6 +8806,7 @@ GoodName=Monopoly (U) [!]
 CRC=5AC383E1 D712E387
 Players=4
 SaveType=Eeprom 4KB
+CountPerOp=1
 
 [26C3654D20B8718A75B5FE8DA5B3284A]
 GoodName=Monopoly (U) [f1] (PAL)
@@ -8701,6 +8818,7 @@ GoodName=Monster Truck Madness 64 (E) (M5) [!]
 CRC=D3D806FC B43AA2A8
 Players=4
 SaveType=None
+CountPerOp=3
 
 [12534DAB32DBFC6CA4F66D05729102E6]
 GoodName=Monster Truck Madness 64 (E) (M5) [f1] (NTSC)
@@ -8712,6 +8830,7 @@ GoodName=Monster Truck Madness 64 (U) [!]
 CRC=B19AD999 7E585118
 Players=4
 SaveType=None
+CountPerOp=3
 
 [3C9F329D5E0C7FE57355B8DC68F79331]
 GoodName=Monster Truck Madness 64 (U) [t1]
@@ -9053,6 +9172,7 @@ CRC=7F9345D3 841ECADE
 Players=1
 SaveType=Controller Pack
 Rumble=No
+CountPerOp=1
 
 [75AD771425CBE2B1E8C7B4D94E67B1CA]
 GoodName=Mystical Ninja 2 Starring Goemon (E) (M3) [hI]
@@ -9070,6 +9190,7 @@ CRC=F5360FBE 2BF1691D
 Players=1
 SaveType=Controller Pack
 Rumble=No
+CountPerOp=1
 
 [DBD2BC43FCDADACD234AEFC8130A5413]
 GoodName=Mystical Ninja Starring Goemon (E) [b1]
@@ -9092,6 +9213,7 @@ CRC=FCBCCB21 72903C6B
 Players=1
 SaveType=Controller Pack
 Rumble=No
+CountPerOp=1
 
 [42E282A3F208C4BDE50A4A4301181B16]
 GoodName=Mystical Ninja Starring Goemon (U) [h1C]
@@ -9329,6 +9451,7 @@ CRC=A292524F 3D6C2A49
 Players=4
 SaveType=Controller Pack
 Rumble=Yes
+CountPerOp=1
 
 [F8F87AEB2C537C9CB2E9913050BFC928]
 GoodName=NBA In the Zone 2 (J) [!]
@@ -9477,6 +9600,7 @@ CRC=3FFE80F4 A7C15F7E
 Players=4
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [76DB89759121710C416ECFB1736B5E39]
 GoodName=NBA Showtime - NBA on NBC (U) [f1] (Country Check)
@@ -9949,6 +10073,8 @@ CRC=2857674D CC4337DA
 Players=1
 Rumble=Yes
 SaveType=Controller Pack
+DelaySI=True
+CountPerOp=1
 
 [60A2CFF1515D4C7902DDE32A6E01D411]
 GoodName=Nightmare Creatures (U) [b1]
@@ -9974,6 +10100,7 @@ RefMD5=4116CF435DB315A2481AF8D1E9352FEB
 GoodName=Nintama Rantarou 64 Game Gallery (J) [!]
 CRC=CD3C3CDF 317793FA
 Players=4
+CountPerOp=1
 
 [66DB457B130D31A286A23D6E4DD9726E]
 GoodName=Nintendo All-Star! Dairantou Smash Brothers (J) [!]
@@ -10052,6 +10179,7 @@ CRC=8A97A197 272DF6C1
 Players=1
 SaveType=Controller Pack
 Rumble=Yes
+CountPerOp=1
 
 [59C28E02BAF4065051C63EA51736892A]
 GoodName=Nuclear Strike 64 (E) (M2) [h1C]
@@ -10064,6 +10192,7 @@ CRC=8F50B845 D729D22F
 Players=1
 SaveType=Controller Pack
 Rumble=Yes
+CountPerOp=1
 
 [FFC584040D0D052FBAB4CB6C19245449]
 GoodName=Nuclear Strike 64 (U) [!]
@@ -10071,6 +10200,7 @@ CRC=4998DDBB F7B7AEBC
 Players=1
 SaveType=Controller Pack
 Rumble=Yes
+CountPerOp=1
 
 [76C8EFDD11F6D2E553055B801A022653]
 GoodName=Nuclear Strike 64 (U) [b1]
@@ -10091,6 +10221,7 @@ RefMD5=FFC584040D0D052FBAB4CB6C19245449
 GoodName=Nushi Tsuri 64 (J) [!]
 CRC=D83BB920 CC406416
 Players=1
+CountPerOp=1
 
 [7412417C50A42427637575A3CD2E652E]
 GoodName=Nushi Tsuri 64 (J) [b1]
@@ -10131,6 +10262,7 @@ RefMD5=EEB69597E42E2F5D2914070ACF161B4F
 GoodName=Nushi Tsuri 64 - Shiokaze ni Notte (J) [!]
 CRC=5B9B1618 1B43C649
 Players=1
+CountPerOp=1
 
 [E2FB4F16A039A0E302D28ACA94D5D928]
 GoodName=O.D.T. (E) (M5) [!]
@@ -10368,6 +10500,7 @@ Status=2
 Players=1
 SaveType=Flash RAM
 Rumble=Yes
+CountPerOp=1
 
 [A722F8161FF489943191330BF8416496]
 GoodName=Paper Mario (U) [!]
@@ -10376,6 +10509,7 @@ Status=2
 Players=1
 SaveType=Flash RAM
 Rumble=Yes
+CountPerOp=1
 
 [8595BA0A0D2EA73944228BDED4A969AD]
 GoodName=Paper Mario (U) [T+Chi]
@@ -10513,6 +10647,7 @@ CRC=1AA05AD5 46F52D80
 Players=1
 Rumble=No
 SaveType=Eeprom 4KB
+CountPerOp=3
 
 [F21E2A3A05ACF49586F32DCE5C449FE4]
 GoodName=Pilotwings 64 (E) (M3) [b1]
@@ -10535,6 +10670,7 @@ CRC=09CC4801 E42EE491
 Players=1
 SaveType=Eeprom 4KB
 Rumble=No
+CountPerOp=3
 
 [2740F1B89CE7D78A5D31CF60C97A0C11]
 GoodName=Pilotwings 64 (J) [b1]
@@ -10547,6 +10683,7 @@ CRC=C851961C 78FCAAFA
 Players=1
 SaveType=Eeprom 4KB
 Rumble=No
+CountPerOp=3
 
 [E28F8F19E56CC6C7A0F3A3286AEB60C1]
 GoodName=Pilotwings 64 (U) [h1C]
@@ -11119,6 +11256,7 @@ GoodName=Pro Mahjong Kiwame 64 (J) [!]
 CRC=9BA10C4E 0408ABD3
 Players=1
 Rumble=No
+CountPerOp=1
 
 [D1624977A3C25192671772623FA76438]
 GoodName=Pro Mahjong Kiwame 64 (J) [b1]
@@ -11135,6 +11273,7 @@ GoodName=Pro Mahjong Tsuwamono 64 - Jansou Battle ni Chousen (J) [!]
 CRC=1BDCB30F A132D876
 Players=1
 Rumble=No
+CountPerOp=1
 
 [4FA4DC582C23EEE81FEB39B7EEBD15D6]
 GoodName=Psychodelic Demo by Ste (POM '98) (PD) [b1]
@@ -11255,6 +11394,7 @@ CRC=7433D9D7 2C4322D0
 Players=4
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [55A789C553827114306E29D71E26E5DC]
 GoodName=Quake II (E) [h1C]
@@ -11267,6 +11407,7 @@ CRC=BDA8F143 B1AF2D62
 Players=4
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [920FAACCE1F8A80022433ACFD5CD2BC3]
 GoodName=Quake II (U) [f1] (PAL)
@@ -11574,6 +11715,7 @@ GoodName=Razor Freestyle Scooter (U) [!]
 CRC=3918834A 15B50C29
 Players=2
 Rumble=No
+CountPerOp=1
 
 [FAA64ABB0D222FCC0C6E2515D3805D9F]
 GoodName=Re-Volt (E) (M4) [!]
@@ -11610,6 +11752,7 @@ CRC=8BD4A334 1E138B05
 Players=2
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [70F73D01FEAF768758F31B23DE2C2620]
 GoodName=Ready 2 Rumble Boxing (E) (M3) [t1] (P1 Untouchable)
@@ -11622,6 +11765,7 @@ CRC=EAB7B429 BAC92C57
 Players=2
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [25620A9C9F372023A8BA862330E6373A]
 GoodName=Ready 2 Rumble Boxing (U) [f1] (PAL)
@@ -11639,6 +11783,7 @@ CRC=E9219533 13FBAFBD
 Players=2
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [CB97350D5CAB48EAB8B954D91C0E5DAC]
 GoodName=Ready 2 Rumble Boxing - Round 2 (U) [t1]
@@ -11651,6 +11796,7 @@ CRC=9B500E8E E90550B3
 Players=1
 Rumble=Yes
 SaveType=SRAM
+CountPerOp=1
 
 [1ADD2C0217662B307CDFD876B35FBF7A]
 GoodName=Resident Evil 2 (U) (V1.1) [!]
@@ -11658,6 +11804,7 @@ CRC=AA18B1A5 07DB6AEB
 Players=1
 Rumble=Yes
 SaveType=SRAM
+CountPerOp=1
 
 [AD922DAE446A301E1AAFE1DFBAD75A2E]
 GoodName=Road Rash 64 (E) [!]
@@ -11665,6 +11812,7 @@ CRC=02D8366A 6CABEF9C
 Players=4
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=3
 
 [5EB2B1892B68767EB1D310FF7507D34E]
 GoodName=Road Rash 64 (E) [h1C]
@@ -11677,6 +11825,7 @@ CRC=F050746C 247B820B
 Players=4
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=3
 
 [7966F17F36C43D3807C0949AAD45168A]
 GoodName=Road Rash 64 (U) [f1] (PAL)
@@ -11694,6 +11843,7 @@ CRC=74E87A70 6293AED4
 Players=4
 SaveType=Controller Pack
 Rumble=Yes
+CountPerOp=1
 
 [D3644B398C090528E0ED9EB3C140366E]
 GoodName=Roadsters Trophy (U) (M3) [!]
@@ -11701,6 +11851,7 @@ CRC=0B6B4DDB 9671E682
 Players=4
 SaveType=Controller Pack
 Rumble=Yes
+CountPerOp=1
 
 [AE705F25C57ACABBD0E8BAE5EC6E237F]
 GoodName=Roadsters Trophy (U) (M3) [f1] (PAL)
@@ -11885,6 +12036,7 @@ CRC=B7CF2136 FA0AA715
 Players=2
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [8A59477C29B4353FEAB85303C58B98F0]
 GoodName=Rush 2 - Extreme Racing USA (E) (M6) [h1I]
@@ -11902,6 +12054,7 @@ CRC=EDD6E031 68136013
 Players=2
 SaveType=Controller Pack
 Rumble=Yes
+CountPerOp=1
 
 [7ED3F10BC32CF76F172D8C31D15A2799]
 GoodName=S.C.A.R.S. (E) (M3) [!]
@@ -12120,6 +12273,7 @@ CRC=51D29418 D5B46AE3
 Players=4
 SaveType=Controller Pack
 Rumble=Yes
+CountPerOp=1
 
 [AF5BE0ADFF51A8E9C6D771282C295810]
 GoodName=San Francisco Rush 2049 (U) [!]
@@ -12127,6 +12281,7 @@ CRC=B9A9ECA2 17AAE48E
 Players=4
 SaveType=Controller Pack
 Rumble=Yes
+CountPerOp=1
 
 [1977D63B511A900628DB2A3A104160AC]
 GoodName=San Francisco Rush 2049 (U) [t1]
@@ -12153,6 +12308,7 @@ CRC=60C437E5 A2251EE3
 SaveType=Controller Pack
 Rumble=Yes
 Players=1
+CountPerOp=1
 
 [235511BBDB21AF5A767BDB7502A80F06]
 GoodName=Shadow Man (F) [!]
@@ -12160,6 +12316,7 @@ CRC=EA06F8C3 07C2DEED
 SaveType=Controller Pack
 Rumble=Yes
 Players=1
+CountPerOp=1
 
 [AF40EF12CE923FF1C26E76CC9D9B9ED9]
 GoodName=Shadow Man (G) [!]
@@ -12167,6 +12324,7 @@ CRC=84D5FD75 BBFD3CDF
 SaveType=Controller Pack
 Rumble=Yes
 Players=1
+CountPerOp=1
 
 [CFBDC1C5E419FF162DF02A0065D9BC1D]
 GoodName=Shadow Man (G) [b1]
@@ -12189,6 +12347,7 @@ CRC=3A4760B5 2D74D410
 SaveType=Controller Pack
 Rumble=Yes
 Players=1
+CountPerOp=1
 
 [474647AEDFA95AEF73229A2784897EDD]
 GoodName=Shadow Man (U) [b1]
@@ -12279,6 +12438,7 @@ GoodName=Shigesato Itoi's No. 1 Bass Fishing! Definitive Edition (J) [!]
 CRC=D137A2CA 62B65053
 Players=1
 Rumble=Yes
+CountPerOp=1
 
 [16EC788C8A4E7EEE268FDF9072A4F0D4]
 GoodName=Shigesato Itoi's No. 1 Bass Fishing! Definitive Edition (J) [b1]
@@ -12636,6 +12796,7 @@ CRC=A3A044B5 6DB1BF5E
 Players=4
 Status=3
 SaveType=None
+CountPerOp=1
 
 [3A6A249843DDEAFFFD334AB3C5931F8D]
 GoodName=Spacer by Memir (POM '99) (PD) [t1]
@@ -13835,6 +13996,7 @@ CRC=E0C4F72F 769E1506
 Players=1
 Rumble=No
 SaveType=Flash RAM
+CountPerOp=1
 
 [F8636514B5B0EDEBF376C3111D24417A]
 GoodName=Tigger's Honey Hunt (U) [!]
@@ -13842,6 +14004,7 @@ CRC=4EBFDD33 664C9D84
 Players=1
 Rumble=No
 SaveType=Flash RAM
+CountPerOp=1
 
 [7B41F28A920112F17401D633B368BA0C]
 GoodName=Tigger's Honey Hunt (U) [t1]
@@ -14167,6 +14330,7 @@ CRC=CCEB3858 26952D97
 Players=1
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [FA0F12C15B3655F9F56888C3249B1CED]
 GoodName=Toy Story 2 (F) [!]
@@ -14174,6 +14338,7 @@ CRC=CB93DB97 7F5C63D5
 Players=1
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [3F40F37B0464DD065067523FB21016DD]
 GoodName=Toy Story 2 (G) [!]
@@ -14181,6 +14346,7 @@ CRC=782A9075 E552631D
 Players=1
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [B44E9C2D9D2F2DE3AF4793B824CCF936]
 GoodName=Toy Story 2 (U) [!]
@@ -14188,6 +14354,7 @@ CRC=A150743E CF2522CD
 Players=1
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [9E4F62BD672E3601F1BBF9CDAB791F9F]
 GoodName=Toy Story 2 (U) [f1] (PAL)
@@ -14219,6 +14386,7 @@ CRC=FE4B6B43 081D29A7
 Players=2
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [25E03763FC8A388A33871C58DFEB7C0E]
 GoodName=Tristar and Lightforce Quake Intro by Ayatollah & Mike (PD)
@@ -14523,6 +14691,8 @@ CRC=95013CCC 73F7C072
 GoodName=Uchhannanchan no Hono no Challenger - Denryu IraIra Bou (J) [!]
 CRC=28D5562D E4D5AE50
 Players=4
+DelaySI=True
+CountPerOp=1
 
 [07B7A5CFDE9BC43F02A622387C5B5C58]
 GoodName=Uchhannanchan no Hono no Challenger - Denryu IraIra Bou (J) [h1C]
@@ -14684,6 +14854,7 @@ CRC=151F79F4 8EEDC8E5
 Players=4
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [637B9A40BED777FC96EB1BD07EA74783]
 GoodName=Vigilante 8 (E) [h1C]
@@ -14696,6 +14867,7 @@ CRC=E2BC82A2 591CD694
 Players=4
 SaveType=Controller Pack
 Rumble=Yes
+CountPerOp=1
 
 [B69B84083D1B4EC99A465B3067F74417]
 GoodName=Vigilante 8 (F) [b1]
@@ -14708,6 +14880,7 @@ CRC=6EDA5178 D396FEC1
 Players=4
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [D616ADF6441ACBBD0E6BEF023A8F6031]
 GoodName=Vigilante 8 (U) [!]
@@ -14715,6 +14888,7 @@ CRC=EA71056A E4214847
 Players=4
 SaveType=Controller Pack
 Rumble=Yes
+CountPerOp=1
 
 [9F42209E413A1A92C788BF7BC26BFB7B]
 GoodName=Vigilante 8 (U) [b1]
@@ -14747,6 +14921,7 @@ CRC=DD10BC7E F900B351
 Players=4
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [60CDF7445FAD2ABA05C958F46691501B]
 GoodName=Vigilante 8 - 2nd Offense (U) [!]
@@ -14754,6 +14929,7 @@ CRC=F5C5866D 052713D9
 Players=4
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [5E30D0208FC4CB810A464E5DEFFB29A3]
 GoodName=Vigilante 8 - 2nd Offense (U) [f1] (PAL)
@@ -14837,6 +15013,7 @@ CRC=98F9F2D0 03D9F09C
 Players=2
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [C4FD61C707977F1BF48DC15E31BD2FB1]
 GoodName=Virtual Pool 64 (E) [o1]
@@ -14849,6 +15026,7 @@ CRC=4E4A7643 A37439D7
 Players=2
 Rumble=Yes
 SaveType=Controller Pack
+CountPerOp=1
 
 [C6855DF00BD5BE8A41DCE809093EE40B]
 GoodName=Virtual Pool 64 (U) [o1]
@@ -14924,12 +15102,14 @@ GoodName=WCW Nitro (U) [!]
 CRC=D4C45A1A F425B25E
 Players=4
 SaveType=Controller Pack
+CountPerOp=3
 
 [EC097EB33BAD93A8AC6E15F7839762AB]
 GoodName=WCW Nitro (U) [b3]
 CRC=D4C45A1A F425B25E
 Players=4
 SaveType=Controller Pack
+CountPerOp=3
 
 [BC8BA67065FDBAA731DEFC866D25B8C2]
 GoodName=WCW Nitro (U) [b1]
@@ -14979,6 +15159,7 @@ GoodName=WCW-nWo Revenge (E) [!]
 CRC=68E8A875 0CE7A486
 SaveType=SRAM
 Players=4
+CountPerOp=1
 
 [07F0AD841350BD7CA1E6A99FB7E887E6]
 GoodName=WCW-nWo Revenge (E) [h1C]
@@ -14990,6 +15171,7 @@ GoodName=WCW-nWo Revenge (U) [!]
 CRC=DEE596AB AF3B7AE7
 Players=4
 SaveType=SRAM
+CountPerOp=1
 
 [B230D307428F4B69B3A80109AC905A44]
 GoodName=WCW-nWo Revenge (U) [b1]
@@ -15155,12 +15337,14 @@ GoodName=War Gods (E) [!]
 CRC=D715CC70 271CF5D6
 Players=2
 SaveType=None
+CountPerOp=1
 
 [9FF2BA3C8408DE9F0EDB6D764A97C197]
 GoodName=War Gods (U) [!]
 CRC=F7FE28F6 C3F2ACC3
 Players=2
 SaveType=None
+CountPerOp=1
 
 [D08D61E3C244A081C166C6A8D539A181]
 GoodName=War Gods (U) [o1]
@@ -15198,6 +15382,7 @@ CRC=650EFA96 30DDF9A7
 Players=4
 Rumble=No
 SaveType=Eeprom 4KB
+CountPerOp=3
 
 [A992E010BC3740C7C266D4F6E90226A1]
 GoodName=Wave Race 64 (E) (M2) [h1C]
@@ -15215,6 +15400,7 @@ CRC=5C9191D6 B30AC306
 Players=4
 Rumble=No
 SaveType=Eeprom 4KB
+CountPerOp=3
 
 [AE480013F39D4AEC86EEA1B4995600D1]
 GoodName=Wave Race 64 (U) (V1.0) [!]
@@ -15222,6 +15408,7 @@ CRC=7DE11F53 74872F9D
 Players=4
 Rumble=No
 SaveType=Eeprom 4KB
+CountPerOp=3
 
 [D653E6B050F63B5E1C1E9856319287E1]
 GoodName=Wave Race 64 (U) (V1.0) [t1]
@@ -15234,6 +15421,7 @@ CRC=492F4B61 04E5146A
 Players=4
 Rumble=No
 SaveType=Eeprom 4KB
+CountPerOp=3
 
 [FF67DF97476C210D158779AE6142F239]
 GoodName=Wave Race 64 - Shindou Edition (J) (V1.2) [!]
@@ -15241,6 +15429,7 @@ CRC=535DF3E2 609789F1
 Rumble=Yes
 Players=4
 SaveType=Eeprom 4KB
+CountPerOp=3
 
 [AFBC694A3BA5AE83D3CEEF906BF01839]
 GoodName=Wave Race 64 - Shindou Edition (J) (V1.2) [b1]
@@ -15366,6 +15555,7 @@ GoodName=Wetrix (E) (M6) [!]
 CRC=CEA8B54F 7F21D503
 Players=4
 SaveType=Controller Pack
+CountPerOp=3
 
 [15F425829D54DD290451D2F3EBAF953F]
 GoodName=Wetrix (E) (M6) [f1] (NTSC)
@@ -15382,6 +15572,7 @@ GoodName=Wetrix (J) [!]
 CRC=DCB6EAFA C6BBCFA3
 Players=4
 SaveType=Controller Pack
+CountPerOp=3
 
 [08826E96F3FB022A1C6351774198BA9D]
 GoodName=Wetrix (J) [o1]
@@ -15393,6 +15584,7 @@ GoodName=Wetrix (U) (M6) [!]
 CRC=CEA8B54F 7F21D503
 Players=4
 SaveType=Controller Pack
+CountPerOp=3
 
 [2ABE36754E866B9B6C4BDCFFC1D11ABF]
 GoodName=Wheel of Fortune (U) [!]
@@ -15491,12 +15683,14 @@ GoodName=Wipeout 64 (E) [!]
 CRC=54310E7D 6B5430D8
 Players=4
 SaveType=Controller Pack
+CountPerOp=1
 
 [73C6D87DBE50F73F3B44E0F237A546D7]
 GoodName=Wipeout 64 (U) [!]
 CRC=132D2732 C70E9118
 SaveType=Controller Pack
 Players=4
+CountPerOp=1
 
 [361F65D37F41536CDE98F83CAD456217]
 GoodName=Wipeout 64 (U) [o1]
-- 
2.39.5