aaaah

includes/PrgmCommands/PRGM.asm

@@ -3,10 +3,33 @@ prgmcmdPRGMo: .dw $0100
 prgmcmdPRGMm: .db "help", 0
 prgmcmdPRGMu: .db "PRGM", 0
 prgmcmdPRGMf:
+prgmcmdPRGMfCheckArgs: 
+ ld hl, FshCmdArgFlags
+ bit 0, (hl)
+ jr z, prgmcmdPRGMfArg0Get
+ bit 1, (hl)
+ jr z, prgmcmdPRGMfExe
+ ld hl, ErrUsageo
+ call ErrSet
+ call ErrCatch
+prgmcmdPRGMfArg0Get:
+ ld hl, prgmcmdPRGMfPrompt
+ call printprompt
+
+ ld hl, FshCmdArg0
+ ld de, 8
+ call inputstr
+ call _NewLine
+
+prgmcmdPRGMfExe:
+ ld hl, fshCmdArg0
+ ld de, prgmcmdPRGMSprgm + 1
+ call strcpy
 
  ld hl, prgmcmdPRGMSprgm
  call _Mov9ToOP1
 
  jp prgmrun
 
-prgmcmdPRGMSprgm: .db ProgObj, "EASE", 0
+prgmcmdPRGMSprgm: .db ProgObj, 0, 0, 0, 0, 0, 0, 0, 0, 0
+prgmcmdPRGMfPrompt: .db "Prgm=", 0

includes/lib/prgm/Prgm.asm

@@ -30,11 +30,13 @@ prgmloader:
  ;ld hl,(prgmNamePtr)
  ;call NamePtrToOP1 
  call prgm_to_usermem
- ld hl, userMem + 1
+ ld hl, userMem
+ inc hl
+ inc hl
  ld a, (hl)
- cp a,tAsm84CECmp
- jr nz,RunBasicProgram ; is it a basic program
- ld hl, prgmunloader
+ cp a,tExtTok
+ jr z, runBasicProgram ; is it a basic program
+ ld hl, prgmunloader;ErrCatchBASIC
  call _PushErrorHandler
  ld hl, prgmunloader
  push hl
@@ -62,7 +64,7 @@ GoodInRAM:
  ;ld bc,StopErrorEnd-StopError
  ;ldir
  set graphdraw,(iy+graphFlags)
- ld hl,prgmerrunloader;ErrCatchBASIC
+ ld hl,ErrCatchBASIC
  call _PushErrorHandler
  set progExecuting,(iy+newdispf)
  set allowProgTokens,(iy+newDispF)
@@ -73,6 +75,7 @@ GoodInRAM:
  sub a,a
  ld (kbdGetKy),a
  ei
+ halt
  jp _ParseInp ; run program
 
 
@@ -85,12 +88,15 @@ ErrCatchBASIC:
  ld (curRow),hl
  ld hl,QuitStr1
  call _PutS
- ld hl,QuitStr2
  res textInverse, (iy + textFlags)
+ ld hl,QuitStr2
  call _PutS
  call _GetKey
  jr +_
 
+QuitStr1: .db "1:",0
+QuitStr2: .db "Quit",0
+
 
 prgmunloader:
  call _PopErrorHandler
@@ -161,7 +167,15 @@ DeleteTempProgramGetName:
  call nc,_DelVarArc ; delete the temp prgm if it exists
  jp _PopOP1
 
+prgmattributes:
+
+
+
 tmpPrgmName: .db tempProgObj,"ZTGP",0
 prgmFsh:     .db ProgObj, "FSHA", 0
+prgmFlags:   .db $00 ;basic
+#define isasm   equ 0
+#define isbasic equ 1
+#define isice   equ 2
 prgmmov_end:
  endrelocate()