From 1986abf96a11737ac42c3bef7786ec3361f50aec Mon Sep 17 00:00:00 2001 From: Curtis F Kaylor Date: Mon, 27 Apr 2020 12:41:16 -0400 Subject: [PATCH] Fixed bugs, updated docs in Apple 2 module paddle --- include/apple2/paddle.a02 | 19 ++++++++++++++----- include/apple2/paddle.h02 | 9 +++++---- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/include/apple2/paddle.a02 b/include/apple2/paddle.a02 index 0189858..2259b90 100644 --- a/include/apple2/paddle.a02 +++ b/include/apple2/paddle.a02 @@ -1,19 +1,28 @@ ;Paddle Controller Constants and Functions for Apple II -PADDLS EQU #4 ;Maximum Numbers of Paddles +PADDLS EQU 4 ;Maximum Numbers of Paddles -;Read Paddle +;paddle(n) - Read Paddle n +;Args: A = Paddle Number (0-3) +;Returns: A, Y = Paddle Value (0-255) +; Carry Set if P PADDLE: LDY #0 ;Set Result to 0 CMP #PADDLS ;If Paddle# >= Max - BCS PADDLZ ; Return # of Paddles & Carry Set + BCS PADDLZ ; Return 0 & Carry Set TAX ;Copy Paddle# to X Register JSR $FB1E ;Execute Monitor PREAD Routine PADDLZ: TYA ;Copy Result to Accumulator RTS -BUTTNS EQU #2 ;Maximum Numbers of Buttons +BUTTNS EQU 2 ;Maximum Numbers of Buttons -;Read Paddle Button +;button(n) - Read Paddle Button n +;Args: A = Button Number (0-1) +;Returns: A, Y = Button State +; 0 = Not Pressed +; $FF = Pressed +; X = Button Number +; Carry Set if P BUTTON: LDY #0 ;Set Result to 0 CMP #BUTTNS ;If Button# >= Max BCS BUTTOZ ; Return Zero & Carry Set diff --git a/include/apple2/paddle.h02 b/include/apple2/paddle.h02 index 5bd7de1..c8dc725 100644 --- a/include/apple2/paddle.h02 +++ b/include/apple2/paddle.h02 @@ -3,10 +3,11 @@ #define PADDLS $04 //Number of Paddles #define BUTTNS $02 //Number of Paddle Buttons -/* Get Paddle Button Status * - * Args: p = Paddle Number * - * Returns: $FF if Button Pressed * - * $00 if Not Pressed */ +/* Get Paddle Button Status * + * Args: n = Button Number * + * Returns: char p = Button Status * + * $FF if Pressed * + * $00 if Not */ void button(); /* Get Paddle Status *