reset behavior changed, Puggsy detection added

[libpicofe.git] / psp / emu.c

diff --git a/psp/emu.c b/psp/emu.c
index 2ea2673..99d16da 100644 (file)
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -765,10 +765,10 @@ static void updateKeys(void)
                        pl = (acts >> 16) & 1;
                        if (kb_combo_keys & (1 << i))
                        {
-                               int u, acts_c = acts & kb_combo_acts;
+                               int u = i+1, acts_c = acts & kb_combo_acts;
                                // let's try to find the other one
                                if (acts_c) {
-                                       for (u = i + 1; u < 32; u++)
+                                       for (; u < 32; u++)
                                                if ( (keys & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) {
                                                        allActions[pl] |= acts_c & currentConfig.KeyBinds[u];
                                                        keys &= ~((1 << i) | (1 << u));
@@ -1022,7 +1022,7 @@ void emu_Loop(void)
 
 void emu_ResetGame(void)
 {
-       PicoReset(0);
+       PicoReset();
        reset_timing = 1;
 }