fixed more flaws found by greg :)

2015-09-19 15:37:39 +02:00
parent 088a25437d
commit 859604407b
14 changed files with 58 additions and 15 deletions
--- a/libsrc/pce/clock.s
+++ b/libsrc/pce/clock.s
@@ -3,6 +3,7 @@
 ;

        .include        "pce.inc"
+        .include        "extzp.inc"

        .export         _clock
        .importzp       sreg
--- a/libsrc/pce/clrscr.s
+++ b/libsrc/pce/clrscr.s
@@ -1,6 +1,8 @@

        .include        "pce.inc"
+        .include        "extzp.inc"

+        .import PLOT
        .export _clrscr
 _clrscr:

@@ -23,7 +25,11 @@ colloop:
        dey
        bne     rowloop

-        rts
+; Go to the home position.
+
+        stz     CURS_X
+        stz     CURS_Y
+        jmp     PLOT

 ;-------------------------------------------------------------------------------
 ; force the init constructor to be imported
--- a/libsrc/pce/color.s
+++ b/libsrc/pce/color.s
@@ -7,7 +7,8 @@

        .export     _textcolor, _bgcolor, _bordercolor

-        .include    "pce.inc"
+        .include        "pce.inc"
+        .include        "extzp.inc"

 _textcolor:
        ldx     CHARCOLOR       ; get old value
@@ -33,9 +34,10 @@ _bgcolor:

 _bordercolor:
        lda     #0
-        txa
+        tax
        rts

+        .rodata
        .export colors

 colors:
--- a/libsrc/pce/conio.s
+++ b/libsrc/pce/conio.s
@@ -1,4 +1,5 @@
        .include        "pce.inc"
+        .include        "extzp.inc"

        .import vce_init
        .import psg_init
--- a/libsrc/pce/cputc.s
+++ b/libsrc/pce/cputc.s
@@ -12,6 +12,7 @@
        .importzp       tmp3,tmp4

        .include        "pce.inc"
+        .include        "extzp.inc"

 _cputcxy:
        pha                     ; Save C
--- a/libsrc/pce/crt0.s
+++ b/libsrc/pce/crt0.s
@@ -26,6 +26,7 @@
        .import         __BSS_SIZE__

        .include        "pce.inc"
+        .include        "extzp.inc"

        .importzp       sp
        .importzp       ptr1,ptr2
@@ -77,7 +78,7 @@ start:
        tii     $2000, $2001, $1FFF

        ; Initialize hardware
-        stz     TIMER_COUNT     ; Timer off
+        stz     TIMER_CTRL      ; Timer off
        lda     #$07
        sta     IRQ_MASK        ; Interrupts off
        stz     IRQ_STATUS      ; Acknowledge timer
--- a/libsrc/pce/extzp.inc
+++ b/libsrc/pce/extzp.inc
@@ -0,0 +1,17 @@
+;
+; extzp.inc for the PC-Engine
+;
+; Groepaz/Hitmen, 2015-11-19
+;
+; Assembler include file that imports the runtime zero page locations used
+; by the PC-Engine runtime, ready for usage in asm code.
+;
+
+
+        .global         CURS_X: zp
+        .global         CURS_Y: zp
+        .global         SCREEN_PTR: zp
+        .global         CHARCOLOR: zp
+        .global         RVS: zp
+        .global         BGCOLOR: zp
+        .global         tickcount: zp
--- a/libsrc/pce/extzp.s
+++ b/libsrc/pce/extzp.s
@@ -0,0 +1,17 @@
+;
+; Groepaz/Hitmen, 2015-11-19
+;
+; zeropage locations for exclusive use by the library
+;
+
+        .include "extzp.inc"
+
+        .segment "EXTZP" : zeropage
+
+CURS_X:         .res 1
+CURS_Y:         .res 1
+SCREEN_PTR:     .res 2
+CHARCOLOR:      .res 1
+RVS:            .res 1
+BGCOLOR:        .res 1
+tickcount:      .res 4
--- a/libsrc/pce/gotoxy.s
+++ b/libsrc/pce/gotoxy.s
@@ -6,6 +6,7 @@
        .import         popa, plot

        .include        "pce.inc"
+        .include        "extzp.inc"

 _gotoxy:
        sta     CURS_Y          ; Set Y
--- a/libsrc/pce/kplot.s
+++ b/libsrc/pce/kplot.s
@@ -2,6 +2,7 @@
        .export         PLOT

        .include        "pce.inc"
+        .include        "extzp.inc"

 PLOT:
        bcs     @getpos
--- a/libsrc/pce/revers.s
+++ b/libsrc/pce/revers.s
@@ -1,5 +1,6 @@

-        .include "pce.inc"
+        .include        "pce.inc"
+        .include        "extzp.inc"

        .export _revers

--- a/libsrc/pce/waitvblank.s
+++ b/libsrc/pce/waitvblank.s
@@ -3,6 +3,7 @@
 ;

        .include        "pce.inc"
+        .include        "extzp.inc"

        .export         _waitvblank