diff --git a/src/main/fragment/mos6502-common/vbuaa=vbuaa_ror_6.asm b/src/main/fragment/mos6502-common/vbuaa=vbuaa_ror_6.asm index a920cddaa..93fb468f6 100644 --- a/src/main/fragment/mos6502-common/vbuaa=vbuaa_ror_6.asm +++ b/src/main/fragment/mos6502-common/vbuaa=vbuaa_ror_6.asm @@ -1,4 +1,4 @@ rol rol rol -and #$02 \ No newline at end of file +and #$03 \ No newline at end of file diff --git a/src/test/kc/complex/lazynes/lazymain.c b/src/test/kc/complex/lazynes/lazymain.c index f10fb5c83..41ef9aa89 100644 --- a/src/test/kc/complex/lazynes/lazymain.c +++ b/src/test/kc/complex/lazynes/lazymain.c @@ -40,8 +40,9 @@ interrupt(hardware_stack) void vblank() { // Tile Set (in CHR ROM) #pragma data_seg(Tiles) -export char TILES[] = kickasm(resource "example.chr") {{ +export char TILES[] = kickasm(resource "example.chr", resource "sprites.chr") {{ .import binary "example.chr" + .import binary "sprites.chr" }}; // Sprite Buffer (in GAME RAM) diff --git a/src/test/kc/complex/lazynes/lazynes.c b/src/test/kc/complex/lazynes/lazynes.c index 0569e9d6b..e66dcc9f2 100644 --- a/src/test/kc/complex/lazynes/lazynes.c +++ b/src/test/kc/complex/lazynes/lazynes.c @@ -86,9 +86,9 @@ void lnPush(uword o, ubyte a, void* s) { // port: Joypad port (1 or 2) // result: Set of joypad flags (see below) // -// TODO: ubyte lnGetPad(ubyte port); -// TODO: enum { lfU=8, lfD=4, lfL=2, lfR=1, lfA=128, lfB=64, lfStart=16, lfSelect=32 }; - +ubyte lnGetPad(ubyte port) { + return readJoy1(); +} // // advanced usage diff --git a/src/test/kc/complex/lazynes/lazynes.h b/src/test/kc/complex/lazynes/lazynes.h index 76ac9d504..093761a65 100644 --- a/src/test/kc/complex/lazynes/lazynes.h +++ b/src/test/kc/complex/lazynes/lazynes.h @@ -87,8 +87,8 @@ enum { // port: Joypad port (1 or 2) // result: Set of joypad flags (see below) // -// TODO: ubyte lnGetPad(ubyte port); -// TODO: enum { lfU=8, lfD=4, lfL=2, lfR=1, lfA=128, lfB=64, lfStart=16, lfSelect=32 }; +ubyte lnGetPad(ubyte port); +enum { lfU=8, lfD=4, lfL=2, lfR=1, lfA=128, lfB=64, lfStart=16, lfSelect=32 }; // // advanced usage