OSCLI fx fix

ivanizag · Aug 22, 2021 · e05e17d · e05e17d
1 parent c3627dd
commit e05e17d
Show file tree

Hide file tree

Showing 5 changed files with 271,746 additions and 5 deletions.
diff --git a/osByte.go b/osByte.go
@@ -281,8 +281,7 @@ func execOSBYTE(env *environment) {
 		env.mem.Poke(zpA, a)
 		env.mem.Poke(zpX, x)
 		env.mem.Poke(zpY, y)
-		cmd := uint8(serviceOSBYTE)
-		env.cpu.SetAXYP(cmd, x, y, p)
+		newA = uint8(serviceOSBYTE)
 		env.cpu.SetPC(procServiceRoms)
 		env.log(fmt.Sprintf("OSBYTE%02x_to_roms(X=0x%02x,Y=0x%02x)", a, x, y))
 		// procServiceRoms issues a 254-Bad command if the command is not handled by any ROM

diff --git a/osCLI.go b/osCLI.go
@@ -178,7 +178,7 @@ func execOSCLI(env *environment) {
 
 func execOSCLIfx(env *environment, argA uint8, params []string) {
 	argX := 0
-	if len(params) >= 2 {
+	if len(params) >= 1 {
 		var err error
 		argX, err = strconv.Atoi(strings.TrimSpace(params[0]))
 		if err != nil || (argX&0xff) != argX {
@@ -187,9 +187,9 @@ func execOSCLIfx(env *environment, argA uint8, params []string) {
 		}
 	}
 	argY := 0
-	if len(params) >= 3 {
+	if len(params) >= 2 {
 		var err error
-		argY, err = strconv.Atoi(strings.TrimSpace(params[2]))
+		argY, err = strconv.Atoi(strings.TrimSpace(params[1]))
 		if err != nil || (argY&0xff) != argY {
 			env.raiseError(254, "Bad Command")
 			return