added support for 2nd and 3rd joystick button in cartridge mode

and another 2nd/3rd button fix :)