From 37a02808bab6d4a2841a091da61bb1cfc5b5c8be Mon Sep 17 00:00:00 2001 From: Sharoy Veduchi <61427449+doodayev@users.noreply.github.com> Date: Thu, 24 Nov 2022 22:28:17 -0800 Subject: [PATCH 1/4] More vocabulary to ScriptConverter (feat. Anfintony) With Anfintony's permission I've taken these from his ZealAutoInstall and added them here so that the chance of a HolyC program being converted and run properly goes up. --- src/System/Utils/ConversionScript.ZC | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/System/Utils/ConversionScript.ZC b/src/System/Utils/ConversionScript.ZC index 38b95151..fc145ce5 100755 --- a/src/System/Utils/ConversionScript.ZC +++ b/src/System/Utils/ConversionScript.ZC @@ -67,6 +67,27 @@ U0 Cvt(U8 *ff_mask="*", U8 *fu_flags="+r+l-i+S") Find("GetStr", ff_mask, fu_flags, "StrGet"); Find("GetChar", ff_mask, fu_flags, "CharGet"); + //From Anfintony's Insecticide November 24 2022 + Find("GetMsg", ff_mask,fu_flags,"MessageGet"); + Find("GetMsg", ff_mask,fu_flags,"MessageGet"); + Find("DRV_SIGNATURE_VAL", ff_mask,fu_flags,"DRIVE_SIGNATURE_VAL"); + Find("dv_signature", ff_mask,fu_flags,"drive_signature"); + Find("DrvTextAttrGet", ff_mask,fu_flags,"DriveTextAttrGet"); + Find("DrvIsWritable", ff_mask,fu_flags,"DriveIsWritable"); + Find("gr_palette_std", ff_mask,fu_flags,"gr32_palette_std"); + Find("GetKey",ff_mask, fu_flags,"KeyGet"); + Find("STD_DISTRO_DVD_CFG", ff_mask,fu_flags,"STD_DISTRO_DVD_CONFIG"); + Find("CBGR48", ff_mask,fu_flags,"CBGR24"); + Find("CFreeLst", ff_mask,fu_flags,"CFreeList"); + Find("DrvLock", ff_mask,fu_flags,"DriveLock"); + Find("DrvUnlock", ff_mask,fu_flags,"DriveUnlock"); + Find("DrvChk", ff_mask,fu_flags,"DriveCheck"); + Find("AMAlloc", ff_mask,fu_flags,"SysMAlloc"); + Find("Let2Drv", ff_mask,fu_flags,"Letter2Drive"); + Find("Let2Let", ff_mask,fu_flags,"Letter2Letter"); + Find("Let2BlkDev", ff_mask,fu_flags,"Letter2BlkDev"); + Find("first_drv_let", ff_mask,fu_flags,"first_drive_let"); + "\n$$BK,1$$$$LTRED$$Might want to go over these$$FG$$$$BK,0$$\n"; Find("MemSet", ff_mask, fu_flags); } From fbc9139d942d0328628fe7581a33ddb0887bc60d Mon Sep 17 00:00:00 2001 From: Sharoy Veduchi <61427449+doodayev@users.noreply.github.com> Date: Fri, 25 Nov 2022 01:01:48 -0800 Subject: [PATCH 2/4] Three more things These additions got the TempleOS intro in the code scraps to work --- src/System/Utils/ConversionScript.ZC | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/System/Utils/ConversionScript.ZC b/src/System/Utils/ConversionScript.ZC index fc145ce5..006aa883 100755 --- a/src/System/Utils/ConversionScript.ZC +++ b/src/System/Utils/ConversionScript.ZC @@ -88,6 +88,10 @@ U0 Cvt(U8 *ff_mask="*", U8 *fu_flags="+r+l-i+S") Find("Let2BlkDev", ff_mask,fu_flags,"Letter2BlkDev"); Find("first_drv_let", ff_mask,fu_flags,"first_drive_let"); + //Discovered by Doodguy and Anfintony November 25 2022 + Find("ScanKey",ff_mask,fu_flags,"KeyScan"); + Find("ScanChar",ff_mask,fu_flags,"CharScan"); + Find("fp_final_scrn_update",ff_mask,fu_flags,"fp_final_screen_update"); "\n$$BK,1$$$$LTRED$$Might want to go over these$$FG$$$$BK,0$$\n"; Find("MemSet", ff_mask, fu_flags); } From 43f7974dcbc3cca1b280224880b29486f070d28b Mon Sep 17 00:00:00 2001 From: TomAwezome Date: Fri, 25 Nov 2022 19:55:25 -0500 Subject: [PATCH 3/4] Remove dup replacement from ConversionScript --- src/System/Utils/ConversionScript.ZC | 1 - 1 file changed, 1 deletion(-) diff --git a/src/System/Utils/ConversionScript.ZC b/src/System/Utils/ConversionScript.ZC index 006aa883..8502b998 100755 --- a/src/System/Utils/ConversionScript.ZC +++ b/src/System/Utils/ConversionScript.ZC @@ -69,7 +69,6 @@ U0 Cvt(U8 *ff_mask="*", U8 *fu_flags="+r+l-i+S") //From Anfintony's Insecticide November 24 2022 Find("GetMsg", ff_mask,fu_flags,"MessageGet"); - Find("GetMsg", ff_mask,fu_flags,"MessageGet"); Find("DRV_SIGNATURE_VAL", ff_mask,fu_flags,"DRIVE_SIGNATURE_VAL"); Find("dv_signature", ff_mask,fu_flags,"drive_signature"); Find("DrvTextAttrGet", ff_mask,fu_flags,"DriveTextAttrGet"); From 8ddff7d2a70e798c4dff56e645f855a8a9cca1f5 Mon Sep 17 00:00:00 2001 From: TomAwezome Date: Fri, 25 Nov 2022 20:00:53 -0500 Subject: [PATCH 4/4] Revise comment wording, add newline --- src/System/Utils/ConversionScript.ZC | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/System/Utils/ConversionScript.ZC b/src/System/Utils/ConversionScript.ZC index 8502b998..e3436b86 100755 --- a/src/System/Utils/ConversionScript.ZC +++ b/src/System/Utils/ConversionScript.ZC @@ -67,7 +67,7 @@ U0 Cvt(U8 *ff_mask="*", U8 *fu_flags="+r+l-i+S") Find("GetStr", ff_mask, fu_flags, "StrGet"); Find("GetChar", ff_mask, fu_flags, "CharGet"); - //From Anfintony's Insecticide November 24 2022 + //Added from Anfintony's Insecticide November 24 2022 Find("GetMsg", ff_mask,fu_flags,"MessageGet"); Find("DRV_SIGNATURE_VAL", ff_mask,fu_flags,"DRIVE_SIGNATURE_VAL"); Find("dv_signature", ff_mask,fu_flags,"drive_signature"); @@ -87,10 +87,11 @@ U0 Cvt(U8 *ff_mask="*", U8 *fu_flags="+r+l-i+S") Find("Let2BlkDev", ff_mask,fu_flags,"Letter2BlkDev"); Find("first_drv_let", ff_mask,fu_flags,"first_drive_let"); - //Discovered by Doodguy and Anfintony November 25 2022 + //Added by Doodguy and Anfintony November 25 2022 Find("ScanKey",ff_mask,fu_flags,"KeyScan"); Find("ScanChar",ff_mask,fu_flags,"CharScan"); Find("fp_final_scrn_update",ff_mask,fu_flags,"fp_final_screen_update"); + "\n$$BK,1$$$$LTRED$$Might want to go over these$$FG$$$$BK,0$$\n"; Find("MemSet", ff_mask, fu_flags); }