Skip to content

Commit 1fb3463

Browse files
Add beta 1.1 source for 18 new commands
1 parent 8f0c510 commit 1fb3463

File tree

5 files changed

+2096
-326
lines changed

5 files changed

+2096
-326
lines changed

README.md

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,31 @@ You can view the online documentation [here](https://roccoloxprograms.github.io/
44

55
# Functions
66

7-
### Completed
7+
## Completed
88
* [Celtic 2 CSE](https://roccoloxprograms.github.io/CelticCE/csefunctions.html)
99
* [Doors CE 9](https://roccoloxprograms.github.io/CelticCE/dcefunctions.html)
10+
* [Graphics Functions](https://roccoloxprograms.github.io/CelticCE/graphicsfunctions.html)
11+
* [OS Utility Functions](https://roccoloxprograms.github.io/CelticCE/osutilityfunctions.html)
12+
* [Celtic III Functions](https://roccoloxprograms.github.io/CelticCE/celticiiifunctions.html)
1013

11-
### In Progress
12-
* ToggleSet - `det(16,"FN",f#) 0=Arc;1=Lk;2=PA;3=Hid;4=Del;5=Crt;6=PS;7=Stat`
13-
* GetListElem - `det(17,"LN",elem) out:lNAME(elem) -> Real/Cpx`
14-
* GetArgType - `det(18,argofanytype) filetype code`
15-
* ChkStats - `det(19,f#) 0=RAM 1=ARC 2=ID 3=OSVER`
16-
* FindProg - `det(20,["SEARCH"])`
17-
* UngroupFile - `det(21,"GFN")`
18-
* GetGroup - `det(22,"GFN")`
19-
* ExtGroup - `det(23,"GFN",item#)`
20-
* GroupMem - `det(24,"GFN",item#)`
21-
* BinRead - `det(25,"FN",bytestart,#ofbytes)`
22-
* BinWrite - `det(26,"HEX","FN",bytestart)`
23-
* BinDelete - `det(27,"FN",bytestart,del#ofbytes)`
24-
* HexToBin - `det(28,"HEXSTRING")`
25-
* BinToHex - `det(29,"BIN")`
26-
* FastCopy - `det(30)`
27-
* Edit1Byte - `det(31,Str?,StartByte,ReplaceWithThisByte)`
28-
* IndexFile - `det(32,"FILENAME","NEWINDEXNAME")`
29-
* LookupIndex - `det(33,"FILENAME","INDEXNAME",line#,[#oflines])`
30-
* ErrorHandle - `det(34,function,string)`
31-
* StringRead - `det(35,"binstring",start,readThisMany)`
32-
* HexToDec - `det(36,"HEXSTRING")`
33-
* DecToHex - `det(37,SomeRealNumber,[autoOverride])`
34-
* EditWord - `det(38,start_byte,replace_with_this_word)`
35-
* BitOperate - `det(39,value1,value2,logic)`
36-
* GetProgList - `det(40,"SEARCHSTRING",[type])`
37-
* GetCalcVer - `det(41) Returns calcversion`
14+
## In Progress
15+
* UngroupFile - `det(34,"GFN")`
16+
* GetGroup - `det(35,"GFN")`
17+
* ExtGroup - `det(36,"GFN",item#)`
18+
* GroupMem - `det(37,"GFN",item#)`
19+
* BinRead - `det(38,"FN",bytestart,#ofbytes)`
20+
* BinWrite - `det(39,"HEX","FN",bytestart)`
21+
* BinDelete - `det(40,"FN",bytestart,del#ofbytes)`
22+
* HexToBin - `det(41,"HEXSTRING")`
23+
* BinToHex - `det(42,"BIN")`
24+
* FastCopy - `det(43)`
25+
* Edit1Byte - `det(44,Str?,StartByte,ReplaceWithThisByte)`
26+
* IndexFile - `det(45,"FILENAME","NEWINDEXNAME")`
27+
* LookupIndex - `det(46,"FILENAME","INDEXNAME",line#,[#oflines])`
28+
* ErrorHandle - `det(47,function,string)`
29+
* StringRead - `det(48,"binstring",start,readThisMany)`
30+
* HexToDec - `det(49,"HEXSTRING")`
31+
* DecToHex - `det(50,SomeRealNumber,[autoOverride])`
32+
* EditWord - `det(51,start_byte,replace_with_this_word)`
33+
* BitOperate - `det(52,value1,value2,logic)`
34+
* GetProgList - `det(53,"SEARCHSTRING",[type])`

makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# By RoccoLox Programs and TIny_Hacker
55
# Copyright 2022
66
# License: BSD 3-Clause License
7-
# Last Built: September 17, 2022
7+
# Last Built: November 29, 2022
88
#
99
#--------------------------------------
1010

src/celtic.asm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
; By RoccoLox Programs and TIny_Hacker
55
; Copyright 2022
66
; License: BSD 3-Clause License
7-
; Last Built: September 17, 2022
7+
; Last Built: November 29, 2022
88
;
99
;--------------------------------------
1010

@@ -16,7 +16,6 @@ include 'installer.asm'
1616
app_start 'CelticCE', '(C) 2022 RoccoLox Programs'
1717

1818
include 'main.asm'
19-
include 'ports.asm'
2019

2120
app_data
2221

src/installer.asm

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,47 @@
44
; By RoccoLox Programs and TIny_Hacker
55
; Copyright 2022
66
; License: BSD 3-Clause License
7-
; Last Built: September 17, 2022
7+
; Last Built: November 29, 2022
88
;
99
;--------------------------------------
1010

11-
jp installApp
12-
db $01
11+
jp installApp
12+
db $01
1313
___icon:
14-
db $10, $10
15-
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
16-
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
17-
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
18-
db $FF, $FF, $FF, $FF, $FF, $FF, $07, $25, $25, $07, $FF, $FF, $FF, $FF, $FF, $FF
19-
db $FF, $FF, $FF, $FF, $FF, $07, $25, $8F, $8F, $25, $07, $FF, $FF, $FF, $FF, $FF
20-
db $FF, $FF, $FF, $FF, $FF, $25, $8F, $07, $25, $8F, $25, $FF, $FF, $FF, $FF, $FF
21-
db $FF, $FF, $FF, $FF, $FF, $25, $8F, $25, $8F, $8F, $25, $FF, $FF, $FF, $FF, $FF
22-
db $FF, $FF, $FF, $FF, $8F, $8F, $25, $8F, $25, $25, $07, $07, $FF, $FF, $FF, $FF
23-
db $FF, $FF, $FF, $8F, $25, $07, $25, $25, $25, $25, $25, $25, $8F, $FF, $FF, $FF
24-
db $FF, $FF, $07, $25, $8F, $25, $8F, $25, $25, $8F, $8F, $8F, $25, $07, $FF, $FF
25-
db $FF, $FF, $07, $25, $07, $25, $8F, $25, $25, $8F, $25, $07, $25, $07, $FF, $FF
26-
db $FF, $FF, $07, $25, $8F, $8F, $8F, $25, $8F, $8F, $25, $8F, $25, $07, $FF, $FF
27-
db $FF, $FF, $FF, $8F, $25, $25, $25, $8F, $FF, $8F, $07, $25, $8F, $FF, $FF, $FF
28-
db $FF, $FF, $FF, $FF, $07, $07, $07, $FF, $FF, $FF, $8F, $8F, $FF, $FF, $FF, $FF
29-
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
30-
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
14+
db $10, $10
15+
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
16+
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
17+
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
18+
db $FF, $FF, $FF, $FF, $FF, $FF, $07, $25, $25, $07, $FF, $FF, $FF, $FF, $FF, $FF
19+
db $FF, $FF, $FF, $FF, $FF, $07, $25, $8F, $8F, $25, $07, $FF, $FF, $FF, $FF, $FF
20+
db $FF, $FF, $FF, $FF, $FF, $25, $8F, $07, $25, $8F, $25, $FF, $FF, $FF, $FF, $FF
21+
db $FF, $FF, $FF, $FF, $FF, $25, $8F, $25, $8F, $8F, $25, $FF, $FF, $FF, $FF, $FF
22+
db $FF, $FF, $FF, $FF, $8F, $8F, $25, $8F, $25, $25, $07, $07, $FF, $FF, $FF, $FF
23+
db $FF, $FF, $FF, $8F, $25, $07, $25, $25, $25, $25, $25, $25, $8F, $FF, $FF, $FF
24+
db $FF, $FF, $07, $25, $8F, $25, $8F, $25, $25, $8F, $8F, $8F, $25, $07, $FF, $FF
25+
db $FF, $FF, $07, $25, $07, $25, $8F, $25, $25, $8F, $25, $07, $25, $07, $FF, $FF
26+
db $FF, $FF, $07, $25, $8F, $8F, $8F, $25, $8F, $8F, $25, $8F, $25, $07, $FF, $FF
27+
db $FF, $FF, $FF, $8F, $25, $25, $25, $8F, $FF, $8F, $07, $25, $8F, $FF, $FF, $FF
28+
db $FF, $FF, $FF, $FF, $07, $07, $07, $FF, $FF, $FF, $8F, $8F, $FF, $FF, $FF, $FF
29+
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
30+
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
3131
___description:
32-
db "Celtic CE Installer - BETA v1.0", 0
32+
db "Celtic CE Installer - BETA v1.1", 0
3333

3434
installApp:
35-
call .clearScreen
36-
37-
installer_ports.copy
38-
39-
call installer.port_setup
40-
or a, a
41-
ld hl, osInvalidStr
42-
jq nz, .printMessage
43-
44-
app_create
45-
46-
jr z, appInstalled
47-
ld hl, celticAppAlreadyExists
35+
call .clearScreen
36+
37+
installer_ports.copy
38+
39+
call installer.port_setup
40+
or a, a
41+
ld hl, osInvalidStr
42+
jp nz, .printMessage
43+
44+
app_create
45+
46+
jr z, appInstalled
47+
ld hl, celticAppAlreadyExists
4848
call ti.PutS
4949
call ti.NewLine
5050
call ti.PutS
@@ -56,18 +56,18 @@ installApp:
5656
call ti.GetCSC
5757
cp a, ti.skEnter
5858
jr nz, .getKey
59-
jp appInstalled.exit
59+
jp appInstalled.exit
6060

6161
.printMessage:
62-
call ti.PutS
63-
call ti.GetKey
62+
call ti.PutS
63+
call ti.GetKey
6464

6565
.clearScreen:
66-
call ti.ClrScrn
67-
jp ti.HomeUp
66+
call ti.ClrScrn
67+
jp ti.HomeUp
6868

6969
appInstalled:
70-
call ti.ClrScrn
70+
call ti.ClrScrn
7171
call ti.HomeUp
7272
ld hl, celticInstalledStr
7373
call ti.PutS
@@ -122,7 +122,7 @@ appInstalled:
122122

123123
.exit:
124124
call ti.ClrScrn
125-
jp ti.HomeUp
125+
jp ti.HomeUp
126126

127127
.leftPress:
128128
ld a, (ti.curCol)
@@ -155,6 +155,7 @@ appInstalled:
155155
ld a, 6
156156
ld (ti.curCol), a
157157
ld hl, optionYes
158+
set ti.textEraseBelow, (iy + ti.textFlags)
158159
call ti.PutS
159160
ld hl, $000000
160161
ld de, $00FFFF
@@ -174,16 +175,17 @@ appInstalled:
174175
ld a, 16
175176
ld (ti.curCol), a
176177
ld hl, optionNo
178+
set ti.textEraseBelow, (iy + ti.textFlags)
177179
call ti.PutS
178180
ld hl, $000000
179181
ld de, $00FFFF
180182
call ti.SetTextFGBGcolors_
181183
ld a, 16
182184
ld (ti.curCol), a
183-
ret
185+
ret
184186

185187
osInvalidStr:
186-
db "Cannot use this OS.", 0
188+
db "Cannot use this OS.", 0
187189

188190
celticInstalledStr:
189191
db " Celtic CE app installed.", 0
@@ -203,11 +205,11 @@ optionNo:
203205
db " No ", 0
204206

205207
celticName:
206-
db ti.ProgObj, "CELTICCE", 0
208+
db ti.ProgObj, "CELTICCE", 0
207209

208-
relocate installer_ports, ti.saveSScreen
210+
relocate installer_ports, ti.pixelShadow
209211
define installer
210212
namespace installer
211-
include 'ports.asm'
213+
include 'ports.asm'
212214
end namespace
213215
end relocate

0 commit comments

Comments
 (0)