Fixes

3 files changed, 143 insertions, 139 deletions

diff --git a/gamepads.c b/gamepads.c
index b39f8b0..bf44661 100644
--- a/gamepads.c
+++ b/gamepads.c
@@ -238,6 +238,7 @@ static void dualshock_decode(uint8_t controller_number, struct dualshock_state*
 }

 #endif

 

+#ifdef N64_PORT

 static uint8_t get_nintendo64_gamepad(uint32_t* data, uint8_t controller_number)

 {

 	uint8_t b;

@@ -280,6 +281,7 @@ static uint8_t get_nintendo64_gamepad(uint32_t* data, uint8_t controller_number)
 	*data = n64_data;

 	return 1;

 }

+#endif

 

 void gamepads_query()

 {

diff --git a/main.c b/main.c
index 2122e09..b9ecc35 100644
--- a/main.c
+++ b/main.c
@@ -162,17 +162,21 @@ int main()
 		zl = n64_1.z || dualshock1.l2;

 		zr = dualshock1.r2;

 

-		up = n64_1.up || dualshock1.up;

-		down = n64_1.down || dualshock1.down;

-		left = n64_1.left || dualshock1.left;

-		right = n64_1.right || dualshock1.right;

+		uint8_t tmp_up = n64_1.up || dualshock1.up;

+		uint8_t tmp_down = n64_1.down || dualshock1.down;

+		uint8_t tmp_left = n64_1.left || dualshock1.left;

+		uint8_t tmp_right = n64_1.right || dualshock1.right;

 		if (dpad_mode == DPAD_MODE_BOTH || dpad_mode == DPAD_MODE_DPAD)

 		{

-			up |= nes1.up || nes2.up || nes3.up || snes1.up || smd1.up;

-			down |= nes1.down || nes2.down || nes3.down || snes1.down || smd1.down;

-			left |= nes1.left || nes2.left || nes3.left || snes1.left || smd1.left;

-			right |= nes1.right || nes2.right || nes3.right || snes1.right || smd1.right;

+			tmp_up |= nes1.up || nes2.up || nes3.up || snes1.up || smd1.up;

+			tmp_down |= nes1.down || nes2.down || nes3.down || snes1.down || smd1.down;

+			tmp_left |= nes1.left || nes2.left || nes3.left || snes1.left || smd1.left;

+			tmp_right |= nes1.right || nes2.right || nes3.right || snes1.right || smd1.right;

 		}

+		up = tmp_up;

+		down = tmp_down;

+		left = tmp_left;

+		right = tmp_right;

 

 		int temp_jx = 0;

 		int temp_jy = 0;

diff --git a/nes2wii.hex b/nes2wii.hex
index f5761bb..b7bba82 100644
--- a/nes2wii.hex
+++ b/nes2wii.hex
@@ -180,9 +180,9 @@
 :100B300072978FB71A6287380D67C7BE4F3E20760F

 :100B4000378F68B7A9263F2B10E3307E900E850AB9

 :100B500011241FBECFE5D4E0DEBFCDBF10E0A0E67C

-:100B6000B0E0E4EEF6E202C005900D92AE3AB107B5

+:100B6000B0E0E6ECF6E202C005900D92AE3AB107B5

 :100B7000D9F722E0AEEAB0E001C01D92A932B20777

-:100B8000E1F70E948B0F0C9470130C940000CF932C

+:100B8000E1F70E948B0F0C9461130C940000CF933B

 :100B9000DF93CDB7DEB728970FB6F894DEBF0FBE50

 :100BA000CDBFA8958091AF00823008F4A1C180919B

 :100BB000ED01813009F496C08091ED01833049F058

@@ -276,7 +276,7 @@
 :1011300001C0FF0F4A95EAF7F729F91B3F273F87C0

 :101140009E896927962F01C096952A95EAF701C0D6

 :10115000660F8A95EAF7692B6E1B5626588A46E079

-:1011600050E069ED70E0CD010E944E13892B09F427

+:1011600050E069ED70E0CD010E943F13892B09F436

 :101170005BC14FEFC41AD40A56E0850E911C87E07C

 :10118000C816D10409F040CF49E050E088E090E073

 :101190002091DD00982F8827FC01E20FF11DEA5D08

@@ -346,7 +346,7 @@
 :101590008E2F90E0FC01E056F109E936F10598F054

 :1015A00085E886BFFF91EF91BF91AF919F918F9199

 :1015B0007F916F915F914F913F912F910F900FBE4F

-:1015C0000F901F901895E65DFF4F0C943413809197

+:1015C0000F901F901895E65DFF4F0C9425138091A6

 :1015D000ED009091EE00883008F48AC01092C700A8

 :1015E0008091DF01E091ED00F091EE00E151FF4FBD

 :1015F0008A3A99F0808183B98091ED009091EE0054

@@ -496,135 +496,133 @@
 :101EF000CE01845A9F4F0E947E0B882309F459CE4D

 :101F000045E150E0B801C7010E947E0B882309F427

 :101F10009CCF8BA14CCF969897988E9A8F9A0E94BF

-:101F2000DA0B80E090E00E945B138093AE0080911A

+:101F2000DA0B80E090E00E944C138093AE00809129

 :101F3000AE00833010F01092AE0047EC55E060E642

 :101F400070E080E890E00E947C0A81E08093AF001E

 :101F50009FE088E10FB6F894A89581BD0FBE91BDB2

-:101F6000B3E06B2ECEE1CC2ED12C8091AF0082302D

-:101F700009F404C30E94360C8091EF0187FDD0C2A2

-:101F80009091F80197FDCCC29091140297FDC8C2C0

-:101F90003091FD0133FDC6C29091FF0194FDC2C294

-:101FA0009091FC0197FD48C32091170225FB44271F

-:101FB00040F94093BA0086FDBEC24091F80146FD4B

-:101FC000BAC24091140246FDB6C25091FE0153FDC3

-:101FD00027C34091FF0143FD23C396FD21C326FB88

-:101FE000442740F94093B90032FDACC24091FF0153

-:101FF00046FDA8C224FB442740F94093B80052FD97

-:10200000A6C24091FF0142FDA2C2422F441F4427B5

-:10201000441F4093B70031FD9FC24091FF0145FD31

-:102020009BC27090FB0175FCF9C222FB442740F96A

-:102030004093B30030FD97C24091FF0147FD93C22A

-:1020400074FC91C223FB442740F94093B20085FD04

-:1020500065C24091F80145FD61C24091140245FD01

-:102060005DC251FD5BC24091000241FD57C24091EB

-:10207000160241704093B60084FD83C14091F8017F

-:1020800044FD7FC14091140244FD7BC150FD79C1E4

-:102090004091000240FD75C194FD73C1409116024C

-:1020A00043FB442740F94093B50095FD6FC1422F93

-:1020B00041704093B100269521702093B00093FDAC

-:1020C0006EC120911602229521702093BC0092FDD2

-:1020D0006BC12091160226FB222720F92093BB001A

-:1020E00091FD67C120911602221F2227221F2093F3

-:1020F000BE0090FD63C19091160295FB992790F95F

-:102100009093BD009091AE00992309F45EC1909127

-:10211000AE00923009F459C19091AE00992309F4B0

-:10212000B0C19091AE00913009F4ABC1E0E0F0E0B5

-:10213000C0E0D0E000E010E0A12CB12C8091FA01C9

-:1021400040E5840290011124233E5FEF35070CF433

-:1021500037C2C901B6010E9420136C177D0744F0F5

-:10216000C901B6010E9420135B01EB0177FD5FC23C

-:102170008091F90190E5890290011124233E4FEFEF

-:1021800034070CF425C2C901B6010E9420136E1752

-:102190007F0744F0C901B6010E9420138B01FB01A7

-:1021A00077FD40C271FA222420F8312C61E8A101A8

-:1021B00064039001659F300D112470FA882480F823

-:1021C000912CA4015695542F442757954795CA0141

-:1021D00088199909A901480F591F73FA442440F836

-:1021E000512C92016203C001639F900D112472FA79

-:1021F000EE24E0F8F12C97013695322F22273795FF

-:1022000027952E193F09280F391F80911A02082E91

-:10221000000C990BBC0197FDF2C16C177D070CF403

-:10222000C50160911B02062E000C770BDB0177FDC8

-:10223000E1C1AE17BF070CF4B801E09118020E2EF1

-:10224000000CFF0BEA0157FDD0C1DF01F7FDC8C14B

-:10225000AC17BD070CF4FA0140911902042E000CD2

-:10226000550BE90137FDD5C1DA0157FDCDC1AC17DA

-:10227000BD070CF4A901803891050CF09FC181388D

-:102280002FEF92070CF481E8603871050CF094C1CF

-:1022900061383FEF73070CF461E8E0389FEFF9070E

-:1022A00009F4E1E840382FEF520709F441E8809340

-:1022B000C4006093C300E093C2004093C1008FE963

-:1022C0009FE00197F1F700C000008091B5008823DE

-:1022D00009F44BC18091BA00882309F446C180916A

-:1022E000B900882309F441C18091C5009091C600CE

-:1022F00001969093C6008093C500843F914008F4F6

-:1023000034CE8091AE0090E0019663E070E00E94D0

-:1023100020138093AE006091AE0080E090E00E94B8

-:10232000631396983FEF43ED50E3315040405040E7

-:10233000E1F700C000008091AE0080E0969A6FEF58

-:1023400093EC29E0615090402040E1F700C000008C

-:1023500096983FEF43EC59E0315040405040E1F750

-:1023600000C000008F5F9091AE00981738F79DE095

-:1023700088E10FB6F894A89581BD0FBE91BDF89481

-:10238000FFCF41E04093B50095FF91CE41E04093EF

-:10239000B100269521702093B00093FF92CE21E0EA

-:1023A0002093BC0092FF95CE21E02093BB0091FFCB

-:1023B00099CE21E02093BE0090FF9DCE91E09093B6

-:1023C000BD009091AE009111A2CE83FDF3C090911B

-:1023D000F80193FDEFC09091140293FDEBC037FD1F

-:1023E000E9C09091000292FB222720F99091BC0055

-:1023F000922B9093BC0082FDDBC09091F80192FD7E

-:10240000D7C09091140292FDD3C036FDD1C09091F7

-:10241000000293FB222720F99091BB00922B90930E

-:10242000BB0081FDC3C09091F80191FDBFC09091A8

-:10243000140291FDBBC035FDB9C09091000294FB20

-:10244000222720F99091BE00922B9093BE0080FD30

-:10245000ABC09091F80190FDA7C09091140290FD3F

-:10246000A3C034FDA1C09091000295FB222720F962

-:102470009091BD00922B9093BD009091AE00911170

-:1024800050CE83FD8EC09091F80193FD8AC090914B

-:10249000140293FD86C037FD84C09091000292FD26

-:1024A00080C000E010E082FD77C09091F80192FDBD

-:1024B00073C09091140292FD6FC036FD6DC0909173

-:1024C000000293FD69C0EE27FF27E01BF10B81FDA1

-:1024D0005EC09091F80191FD5AC09091140291FD57

-:1024E00056C035FD54C09091000294FD50C0A12CFF

-:1024F000B12C80FD46C08091F80180FD42C08091E2

-:10250000140280FD3EC034FD3CC08091000285FD78

-:1025100038C0CC27DD27CA19DB0910CE41E0AACD8F

-:102520003091FD019091FC0141E020911702409310

-:10253000BA0086FF42CD5091FE0141E04093B900C0

-:1025400032FF54CD41E04093B80052FF5ACD41E0F4

-:102550004093B70031FF61CD41E07090FB014093A3

-:10256000B30030FF69CD41E070CD1092C6001092EB

-:10257000C5008091AF00823009F0FCCC6092AF00C2

-:10258000F9CCCFE7D0E07FE7A72EB12CD7CDA1E8DB

-:10259000AA2EBB24BA94ADCFEFE7F0E00FE710E02E

-:1025A00096CF01E81FEF7FCF21E062CF21E04ACF35

-:1025B00021E032CF21E01ACF6FE76FCE8FE764CEF4

-:1025C00060EB8602C0011124B6010E942013C5CD24

-:1025D00050EB8502C0011124B6010E942013D7CD13

-:1025E000AA27BB27AE1BBF0B33CECC27DD27C41BCE

-:1025F000D50B2BCEAA27BB27A61BB70B1ACE662757

-:102600007727681B790B09CEAA27BB27A41BB50B1C

-:102610002ECECC27DD27C21BD30B26CE41E008CD22

-:1026200041E0E0CCEE27FF27E61BF70BBBCDCC2724

-:10263000DD27C61BD70B9CCD41E020911702B9CCFA

-:1026400097FB072E16F4009407D077FD09D00E945F

-:102650003A1307FC05D03EF4909581959F4F08955D

-:10266000709561957F4F0895EE0FFF1F0590F491CF

-:10267000E02D0994AA1BBB1B51E107C0AA1FBB1F79

-:10268000A617B70710F0A61BB70B881F991F5A95FE

-:10269000A9F780959095BC01CD010895FB01DC015F

-:1026A00004C08D910190801921F441505040C8F729

-:1026B000881B990B0895E199FECF9FBB8EBBE09AD2

-:1026C00099278DB30895262FE199FECF9FBB8EBB2E

-:1026D0002DBB0FB6F894E29AE19A0FBE01960895C9

-:0426E000F894FFCF9C

-:1026E40000000000000000000000000000000000E6

-:1026F40000000000000000000000000000000000D6

-:102704000000A42001010143000100014400010371

-:1027140000000000014D000001FFFFFFFF014F001A

-:0E272400FFFF0300000001430000FFFFFFFF66

+:101F6000D3E06D2E1EE1C12ED12C8091AF008230C6

+:101F700009F4A7C20E94360CA091EF01A7FD73C21D

+:101F80008091F80187FD6FC28091140287FD6BC2BA

+:101F9000B091FD01B3FD69C28091FF0184FD65C26E

+:101FA0008091FC0187FD39C39091170295FB222790

+:101FB00020F92093BA00A6FD61C22091F80126FD08

+:101FC0005DC22091140226FD59C23091FE0133FDFD

+:101FD00018C32091FF0123FD14C386FD12C396FB95

+:101FE000222720F92093B900B2FD4FC22091FF01B2

+:101FF00026FD4BC294FB222720F92093B80032FD26

+:1020000049C22091FF0122FD45C2292F221F22270C

+:10201000221F2093B700B1FD42C22091FF0125FD90

+:102020003EC27090FB0175FCEAC292FB222720F9A8

+:102030002093B300B0FD3AC22091FF0127FD36C2C4

+:1020400074FC34C293FB222720F92093B200A5FD33

+:1020500008C22091F80125FD04C22091140225FD3B

+:1020600000C231FDFEC12091000221FDFAC1209184

+:10207000160221702093B600A4FD87C12091F801BB

+:1020800024FD83C12091140224FD7FC130FD7DC158

+:102090002091000220FD79C184FD77C120911602B4

+:1020A00023FB222720F92093B50085FD73C1292F3A

+:1020B00021702093B100969591709093B00083FDAC

+:1020C00072C1D0911602D295D1706D2F82FD70C170

+:1020D000C0911602C6FBCC27C0F94C2F81FD6DC103

+:1020E000F0911602FF1FFF27FF1F2F2F80FD6AC1EF

+:1020F000E0911602E5FBEE27E0F98E2F1091AE007D

+:10210000112309F466C11091AE00123009F461C1C7

+:10211000D093BC00C093BB00F093BE00E093BD0021

+:102120008091AE00882309F4CFC18091AE00813048

+:1021300009F4CAC1E0E0F0E0C0E0D0E000E010E067

+:10214000A12CB12C8091FA0140E584029001112468

+:10215000233E5FEF35070CF424C2C901B6010E948B

+:1021600011136C177D0744F0C901B6010E941113C9

+:102170005B01EB0177FD4CC28091F90190E589028A

+:1021800090011124233E4FEF34070CF412C2C90111

+:10219000B6010E9411136E177F0744F0C901B60102

+:1021A0000E9411138B01FB0177FD2DC271FA2224CD

+:1021B00020F8312C61E8A10164039001659F300D86

+:1021C000112470FA882480F8912CA4015695542F7C

+:1021D000442757954795CA0188199909A901480FBD

+:1021E000591F73FA442440F8512C92016203C00134

+:1021F000639F900D112472FAEE24E0F8F12C970100

+:102200003695322F2227379527952E193F09280F0B

+:10221000391F80911A02082E000C990BBC0197FD02

+:10222000DFC16C177D070CF4C50160911B02062EFF

+:10223000000C770BDB0177FDCEC1AE17BF070CF4A6

+:10224000B801E09118020E2E000CFF0BEA0157FDB9

+:10225000BDC1DF01F7FDB5C1AC17BD070CF4FA0134

+:1022600040911902042E000C550BE90137FDC2C143

+:10227000DA0157FDBAC1AC17BD070CF4A9018038CB

+:1022800091050CF08CC181382FEF92070CF481E896

+:10229000603871050CF081C161383FEF73070CF4B1

+:1022A00061E8E0389FEFF90709F4E1E840382FEFE3

+:1022B000520709F441E88093C4006093C300E0939F

+:1022C000C2004093C1008FE99FE00197F1F700C081

+:1022D00000008091B500882309F4EAC08091BA001B

+:1022E000882309F4E5C08091B900882309F4E0C08F

+:1022F0008091C5009091C60001969093C60080938E

+:10230000C500843F914008F430CE8091AE0090E04B

+:10231000019663E070E00E9411138093AE0060911B

+:10232000AE0080E090E00E94541396983FEF43ED9A

+:1023300050E3315040405040E1F700C00000809130

+:10234000AE0080E0969A6FEF93EC29E061509040E8

+:102350002040E1F700C0000096983FEF43EC59E0C1

+:10236000315040405040E1F700C000008F5F909135

+:10237000AE00981738F79DE088E10FB6F894A8955D

+:1023800081BD0FBE91BDF894FFCF21E02093B50031

+:1023900085FF8DCE21E02093B100969591709093AA

+:1023A000B00083FF8ECED1E061E070E082FF90CE7E

+:1023B000C1E041E050E081FF93CEF1E021E030E068

+:1023C00080FF96CEE1E081E090E01091AE00111127

+:1023D0009ACEA3FDE0C0E091F801E3FDDCC0E091FE

+:1023E0001402E3FDD8C0B7FDD6C0D0910002D2FBE5

+:1023F000DD27D0F9D62BA2FDCCC06091F80162FD9B

+:10240000C8C06091140262FDC4C0B6FDC2C0C091D4

+:102410000002C3FBCC27C0F9C42BA1FDB8C040917A

+:10242000F80141FDB4C04091140241FDB0C0B5FDBA

+:10243000AEC0F0910002F295F170F22BA0FDA4C0A5

+:102440002091F80120FDA0C02091140220FD9CC025

+:10245000B4FD9AC0E0910002E5FBEE27E0F9E82B1D

+:1024600057CE21E007CEB091FD018091FC0121E023

+:10247000909117022093BA00A6FF9FCD3091FE01E4

+:1024800021E02093B900B2FFB1CD21E02093B80044

+:1024900032FFB7CD21E02093B700B1FFBECD21E0E0

+:1024A0007090FB012093B300B0FFC6CD21E0CDCDED

+:1024B0001092C6001092C5008091AF00823009F0E2

+:1024C00059CD6092AF0056CDA3FD5BC08091F8015D

+:1024D00083FD57C08091140283FD53C0B7FD51C0E6

+:1024E0008091000282FD4DC000E010E0A2FD44C0DA

+:1024F0008091F80182FD40C08091140282FD3CC0B1

+:10250000B6FD3AC08091000283FD36C0EE27FF275A

+:10251000E01BF10BA1FD2BC08091F80181FD27C0CC

+:102520008091140281FD23C0B5FD21C0809100027D

+:1025300084FD1DC0A12CB12CA0FD13C08091F80119

+:1025400080FD0FC08091140280FD0BC0B4FD09C056

+:102550008091000285FD05C0CC27DD27CA19DB0963

+:10256000F1CDCFE7D0E07FE7A72EB12CEBCDC1E8CE

+:10257000AC2EBB24BA94E0CFEFE7F0E00FE710E019

+:10258000C9CF01E81FEFB2CFE1E0E82BC1CDF1E008

+:1025900054CFC1E041CFD1E02DCF6FE782CE8FE79E

+:1025A00077CE60EB8602C0011124B6010E941113A0

+:1025B000D8CD50EB8502C0011124B6010E94111341

+:1025C000EACDAA27BB27AE1BBF0B46CECC27DD2703

+:1025D000C41BD50B3ECEAA27BB27A61BB70B2DCEFF

+:1025E00066277727681B790B1CCEAA27BB27A41B5D

+:1025F000B50B41CECC27DD27C21BD30B39CE21E052

+:1026000017CD21E0EFCCEE27FF27E61BF70BCECD51

+:10261000CC27DD27C61BD70BAFCD21E09091170249

+:10262000C8CC97FB072E16F4009407D077FD09D08D

+:102630000E942B1307FC05D03EF4909581959F4F87

+:102640000895709561957F4F0895EE0FFF1F0590D7

+:10265000F491E02D0994AA1BBB1B51E107C0AA1FEE

+:10266000BB1FA617B70710F0A61BB70B881F991F33

+:102670005A95A9F780959095BC01CD010895FB016D

+:10268000DC0104C08D910190801921F4415050402B

+:10269000C8F7881B990B0895E199FECF9FBB8EBBAD

+:1026A000E09A99278DB30895262FE199FECF9FBB1D

+:1026B0008EBB2DBB0FB6F894E29AE19A0FBE01963D

+:0626C0000895F894FFCF1D

+:1026C6000000000000000000000000000000000004

+:1026D60000000000000000000000000000000000F4

+:1026E6000000A42001010143000100014400010390

+:1026F60000000000014D000001FFFFFFFF014F0039

+:0E270600FFFF0300000001430000FFFFFFFF84

 :04000005008000B5C2

 :00000001FF