Updated 6502, fixed VSCode settings.

FluBBaOfWard · FluBBaOfWard · commit 9702aa536a6e · 2022-09-18T16:06:21.000+02:00
diff --git a/History.txt b/History.txt
@@ -2,7 +2,7 @@ RenegadeGBA revision history
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 
-V0.1.1 - 2022-08-23 (FluBBa)
+V0.1.1 - 2022-09-18 (FluBBa)
 	Cleaned up source.
 
 V0.1.0 - 2021-03-17 (FluBBa)
diff --git a/RenegadeGBA.code-workspace b/RenegadeGBA.code-workspace
@@ -4,5 +4,10 @@
 			"path": "."
 		}
 	],
-	"settings": {}
+	"settings": {
+		"terminal.integrated.env.osx": {
+			"DEVKITARM": "/opt/devkitPro/devkitARM",
+			"DEVKITPRO": "/opt/devkitPro"
+		}
+	}
 }
diff --git a/source/ARM6502 b/source/ARM6502
@@ -1 +1 @@
-Subproject commit 04cc6aaa498e36966cbe94b3dc0f400abce62ad4
+Subproject commit 99c0203b249daf1a1dcf7024a40957472fa9653d
diff --git a/source/GUI.c b/source/GUI.c
@@ -11,7 +11,7 @@
 #include "ARM6502/Version.h"
 #include "RenegadeVideo/Version.h"
 
-#define EMUVERSION "V0.1.1 2022-08-23"
+#define EMUVERSION "V0.1.1 2022-09-18"
 
 const fptr fnMain[] = {nullUI, subUI, subUI, subUI, subUI, subUI, subUI, subUI, subUI};
 
@@ -25,9 +25,9 @@ const fptr fnList6[] = {coinASet, coinBSet, difficultSet, livesSet, bonusSet, ca
 const fptr fnList7[] = {uiDummy};
 const fptr fnList8[] = {quickSelectGame, quickSelectGame, quickSelectGame, quickSelectGame};
 const fptr *const fnListX[] = {fnList0, fnList1, fnList2, fnList3, fnList4, fnList5, fnList6, fnList7, fnList8};
-const u8 menuXitems[] = {ARRSIZE(fnList0), ARRSIZE(fnList1), ARRSIZE(fnList2), ARRSIZE(fnList3), ARRSIZE(fnList4), ARRSIZE(fnList5), ARRSIZE(fnList6), ARRSIZE(fnList7), ARRSIZE(fnList8)};
-const fptr drawuiX[] = {uiNullNormal, uiMainMenu, uiFile, uiController, uiDisplay, uiSettings, uiDipswitches, uiAbout, uiLoadGame};
-const u8 menuXback[] = {0,0,1,1,1,1,1,1,2};
+const u8 menuXItems[] = {ARRSIZE(fnList0), ARRSIZE(fnList1), ARRSIZE(fnList2), ARRSIZE(fnList3), ARRSIZE(fnList4), ARRSIZE(fnList5), ARRSIZE(fnList6), ARRSIZE(fnList7), ARRSIZE(fnList8)};
+const fptr drawUIX[] = {uiNullNormal, uiMainMenu, uiFile, uiController, uiDisplay, uiSettings, uiDipswitches, uiAbout, uiLoadGame};
+const u8 menuXBack[] = {0,0,1,1,1,1,1,1,2};
 
 u8 gGammaValue;
 
diff --git a/source/Shared b/source/Shared
@@ -1 +1 @@
-Subproject commit b40dc9e35e5a3461d25d7d722e30b0c6f849bd98
+Subproject commit aeecbd68049b77eb9233b2d8a9e332cb09c167fc
diff --git a/source/cpu.s b/source/cpu.s
@@ -57,11 +57,12 @@ runStart:
 ;@----------------------------------------------------------------------------
 reFrameLoop:
 ;@----------------------------------------------------------------------------
+	mov r0,#CYCLE_PSL
+	bl m6502RunXCycles
 	ldr reptr,=reVideo_0
 	bl doScanline
 	cmp r0,#0
-	movne r0,#CYCLE_PSL
-	bne m6502RunXCycles
+	bne reFrameLoop
 	b reEnd
 ;@----------------------------------------------------------------------------
 
@@ -134,11 +135,7 @@ cpuReset:		;@ Called by loadCart/resetGame
 	adr r4,cpuMapData
 	bl mapM6502Memory
 
-	ldr r0,=reFrameLoop
-	str r0,[m6502optbl,#m6502NextTimeout]
-	str r0,[m6502optbl,#m6502NextTimeout_]
-
-	mov r0,#0
+	mov r0,m6502optbl
 	bl m6502Reset
 
 //	adr r0,bvcHack

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,10 @@`
`4`	`4`	`"path": "."`
`5`	`5`	`}`
`6`	`6`	`],`
`7`		`- "settings": {}`
	`7`	`+ "settings": {`
	`8`	`+ "terminal.integrated.env.osx": {`
	`9`	`+ "DEVKITARM": "/opt/devkitPro/devkitARM",`
	`10`	`+ "DEVKITPRO": "/opt/devkitPro"`
	`11`	`+ }`
	`12`	`+ }`
`8`	`13`	`}`