From b8d16d0b47603b655887056b97a62f74c6d0367f Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Sat, 16 Jan 2021 23:08:25 +0100 Subject: [PATCH] hunt bugfix, does not fully work yet --- src/mon_m65/bsmon.s | 13 ++----------- src/mon_m65/mon_command_hunt.s | 2 +- src/mon_m65/mon_debug.s | 12 ++++++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/mon_m65/bsmon.s b/src/mon_m65/bsmon.s index 3c7b7a03..0a3c7259 100644 --- a/src/mon_m65/bsmon.s +++ b/src/mon_m65/bsmon.s @@ -1681,18 +1681,9 @@ Get_Char: LDX Buf_Index INC Buf_Index LDA BUF,X - CPX #1 PLX - BCC @regc - CMP #';' ; register - BEQ @return - CMP #'?' ; help - BEQ @return -@regc CMP #0 - BEQ @eof - CMP #':' - BEQ @eof - RTS + CMP #0 + BNE @return @eof PHP DEC Buf_Index PLP diff --git a/src/mon_m65/mon_command_hunt.s b/src/mon_m65/mon_command_hunt.s index fa679c1c..b8cd50f1 100644 --- a/src/mon_m65/mon_command_hunt.s +++ b/src/mon_m65/mon_command_hunt.s @@ -39,7 +39,7 @@ Mon_Hunt: lda Long_AC+1 ora Long_AC+2 ora Long_AC+3 - +beq Mon_Error ; value above $FF + +bne Mon_Error ; value above $FF cpy #32 ; max data length bne @lpbin diff --git a/src/mon_m65/mon_debug.s b/src/mon_m65/mon_debug.s index c148787d..4aacc2b4 100644 --- a/src/mon_m65/mon_debug.s +++ b/src/mon_m65/mon_debug.s @@ -28,7 +28,7 @@ DBG_print_Buf_Index: rts -DBG_print_long_pc: +DBG_print_long_ac: php pha @@ -37,15 +37,15 @@ DBG_print_long_pc: phz jsr PRIMM - !pet $0D, "long pc : ", 0 + !pet $0D, "long ac : ", 0 - lda Long_PC+3 + lda Long_AC+3 jsr Print_Hex - lda Long_PC+2 + lda Long_AC+2 jsr Print_Hex - lda Long_PC+1 + lda Long_AC+1 jsr Print_Hex - lda Long_PC+0 + lda Long_AC+0 jsr Print_Hex jsr PRIMM