Fix a few bugs

Author: mateoconlechuga

Cesium.8xp

@@ -52,7 +52,7 @@ To uninstall Cesium, just press [2ND],[+],[2],[1] and delete the following files
 * Cesium (AppVar)
 
 ### CREDITS ###
-(C) January 2017 Matt Waltz  
+(C) March 2017 Matt Waltz  
 "MateoConLechuga"  
 Licensed under BSD 3 Clause.
 

Cesium_French.8xp

@@ -58,7 +58,7 @@ CesiumIcon:								; Signifies a CesiumOS program (haha)
  .db 0FFh,0FFh,0FFh,0DEh,0FFh,0FFh,094h,0B5h,0B5h,06Bh,0FFh,0FFh,0DEh,0FFh,0FFh,0FFh
  .db 0FFh,0FFh,0FFh,0FFh,0FFh,0FFh,0B6h,08Ch,06Ch,0B5h,0FFh,0FFh,0FFh,0FFh,0FFh,0FFh
 VersionStr:
- .db "Cesium Version 2.1.1",0
+ .db "Cesium Version 2.2.0",0
 CesiumEnd:
 
  .echo "Reloader Size:\t\t",CesiumReLoader_End-CesiumReLoader_Start

readme.md

@@ -1,6 +1,6 @@
 @echo off
 color 0F
 :A
-tools\spasm -E -T Cesium.asm bin\CESIUM.8xp
+tools\spasm -E -T -L Cesium.asm bin\CESIUM.8xp
 pause
 goto A

src/Cesium.asm

@@ -2,16 +2,16 @@
 FullExit:
 	call	_boot_ClearVRAM
 	ld	a,$2D
-	ld	(mpLcdCtrl),a				; Set LCD to 16bpp
+	ld	(mpLcdCtrl),a                   ; Set LCD to 16bpp
 	set	graphdraw,(iy+graphFlags)
 	res	useTokensInString,(iy+clockFlags)
-	res	onInterrupt,(iy+onFlags)		; [ON] break error destroyed
-	ld	hl,CesiumPrgmName
+	res	onInterrupt,(iy+onFlags)        ; [ON] break error destroyed
+	ld	hl,CesiumPrgmNameExit
 	call	_Mov9ToOP1
 	call	_ChkFindSym
 	call	_ChkInRam
 	call	nz,_Arc_Unarc
-	call	_ClrTxtShd				; clear text shadow
+	call	_ClrTxtShd                      ; clear text shadow
 	call	_DrawStatusBar
 	ld	hl,pixelshadow
 	ld	bc,SaveSScreen-pixelShadow
@@ -20,42 +20,44 @@ FullExit:
 	xor	a,a
 	im	1
 	ei
-	ld	hl,stub
+	ld	hl,stub                          ; this should only be done if the setting is active!
 	ld	de,flashRAMCode
 	ld	bc,stubEnd-stub
 	ldir
 	jp	flashRAMCode
+
+CesiumPrgmNameExit:
+	.db	protProgObj,"CESIUM",0
+	
 stub:
 relocate(flashRAMCode)
 	ld	hl,userMem
 	ld	de,(asm_prgm_size)
 	call	_DelMem
 	res	apdWarmStart, (iy + apdFlags)
-	call	ClearOldBackup
+	ld	a,(AutoBackup)
+	or	a,a
+	call	nz,ClearOldBackup
 	ld	a,kClear
-	jp	_JForceCmd			; clear the screen like a boss
+	jp	_JForceCmd                       ; clear the screen like a boss
 
 ClearOldBackup:
-	di					; let's do some crazy flash things so that way we can save the RAM state...
+	di                                       ; let's do some crazy flash things so that way we can save the RAM state...
 	ld	a, $D1
 	ld	mb,a
 	ld.sis	sp,$987E
 	call.is	funlock - $D10000
 	
-	ld	a,$3C
-	call	EraseSectorBackup			; this is so we can store the new RAM data \o/
+	ld	b,0
+	ld	de,$3C0000
+	call	_WriteFlashByte                  ; this is so we can store the new RAM data \o/
 	
 	call.is	flock - $D10000
 	ld	a,$D0
 	ld	mb,a
 
 	ret
 
-EraseSectorBackup:
-	ld	bc,$0000F8			; apparently we can't erase sectors unless we call this routine from flash... Well, I called it from flash now :) (lol, what a secuity flaw)
-	push	bc
-	jp	_EraseFlashSector
-
 #include "routines/ramquit.asm"
 endrelocate()
-stubEnd:
+stubEnd:

src/build.bat

@@ -20,9 +20,9 @@ cesiumLoader:
 	jp	nz,RunBasicProgram
 	call	MovePgrmToUserMem		; the program is now stored at userMem -- Now we need to check and see what kind of file it is - C or assembly
 	push	hl
-	ld	hl,ReturnHere
+	ld	hl,ReturnHereIfError
 	call	_PushErrorHandler
-	ld	de,ReturnHere
+	ld	de,ReturnHereNoError
 	push	de
 	jp	UserMem				; simply call userMem to execute the program
 
@@ -66,10 +66,6 @@ GoodInRAM:
 	ld	(kbdGetKy),a
 	ei
 	jp	_ParseInp			; run program
-
-SaveRAMStateToFlash:
-	call	SaveRAMState
-	jp	ReturnHere
 	
 SaveRAMState:
 	ld	hl,ramsave_sectors_start

src/routines/exit.asm

@@ -16,12 +16,13 @@ ErrCatchBASIC:
 	res	textInverse, (iy + textFlags)
 	call	_PutS
 	call	_GetKey
-	jr	+_
+	jr	ReturnHereIfError
 
 ReturnHereBASIC:
-ReturnHere:					; handler for returning programs
+ReturnHereNoError:                          ; handler for returning programs
 	call	_PopErrorHandler
-_:	ld	hl,CesiumAppVarNameReloader
+ReturnHereIfError:                          ; handler for returning programs
+	ld	hl,CesiumAppVarNameReloader
 	call	_Mov9ToOP1
 	call	_ChkFindSym
 	call	_ChkInRam