From 1893e24da978e0fa4fd8338a1060ed0272d25b22 Mon Sep 17 00:00:00 2001 From: mrdudz Date: Sun, 29 Nov 2015 01:24:01 +0100 Subject: [PATCH] updated --- include/gamate.h | 2 +- libsrc/gamate/conio.s | 1 - testcode/lib/gamate/audiotest.s | 10 +++++----- testcode/lib/gamate/ctest.c | 4 +++- testcode/lib/gamate/lcdtest.s | 10 ++++++---- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/include/gamate.h b/include/gamate.h index f89f5204e..7d5c02a9a 100644 --- a/include/gamate.h +++ b/include/gamate.h @@ -6,7 +6,7 @@ /* */ /* */ /* */ -/* (w) 2015 Groepaz/Hitmen (groepaz@gmx.net) */ +/* (w) 2015 Groepaz/Hitmen (groepaz@gmx.net) */ /* based on technical reference by PeT (mess@utanet.at) */ /* */ /* This software is provided 'as-is', without any expressed or implied */ diff --git a/libsrc/gamate/conio.s b/libsrc/gamate/conio.s index 4840b372c..a43eeb1a3 100644 --- a/libsrc/gamate/conio.s +++ b/libsrc/gamate/conio.s @@ -10,7 +10,6 @@ .segment "INIT" initconio: - ; FIXME lda #0 sta LCD_XPOS sta LCD_YPOS diff --git a/testcode/lib/gamate/audiotest.s b/testcode/lib/gamate/audiotest.s index 0375592f3..2fa38a500 100644 --- a/testcode/lib/gamate/audiotest.s +++ b/testcode/lib/gamate/audiotest.s @@ -1,11 +1,11 @@ -; .export reset, irq, nmi ; FIXME - .export _main +; original audiotest.s by PeT (mess@utanet.at) + .export _main .include "gamate.inc" -.zeropage -addr: .word 0 + .zeropage +addr: .word 0 psa: .word 0 .word 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0 ; get out of sensitiv area @@ -32,7 +32,7 @@ ypos: .byte 0 .code chars: -.incbin "cga2.chr" + .incbin "cga2.chr" hex2asc: .byte "0123456789abcdef" diff --git a/testcode/lib/gamate/ctest.c b/testcode/lib/gamate/ctest.c index a953e0e63..da81bf240 100644 --- a/testcode/lib/gamate/ctest.c +++ b/testcode/lib/gamate/ctest.c @@ -10,7 +10,7 @@ unsigned short n; int main(int argc, char *argv[]) { clrscr(); - gotoxy(0,0);cputs("abcdABCD"); + gotoxy(0,0);cputs("Gamate C-Test"); textcolor(0);gotoxy(0,5);cputs("abcdABCD 0"); textcolor(1);gotoxy(0,6);cputs("abcdABCD 1"); @@ -40,6 +40,8 @@ int main(int argc, char *argv[]) case 0xff ^ JOY_DATA_FIRE_A: break; } + if (y == 0xff) y = 0xc7; + if (y == 0xc8) y = 0; (*((unsigned char*)LCD_XPOS)) = x; (*((unsigned char*)LCD_YPOS)) = y; diff --git a/testcode/lib/gamate/lcdtest.s b/testcode/lib/gamate/lcdtest.s index 617f89959..41242a982 100644 --- a/testcode/lib/gamate/lcdtest.s +++ b/testcode/lib/gamate/lcdtest.s @@ -1,12 +1,14 @@ +; original lcdtest.s by PeT (mess@utanet.at) + .export _main -.include "gamate.inc" + .include "gamate.inc" -.zeropage -addr: .word 0 + .zeropage +addr: .word 0 psa: .word 0 -.data + .data temp_x: .byte 0 temp_y: .byte 0 temp_a: .byte 0 -- 2.39.5