From 5e2ea9394a5c84382a3d6d7dd65d3a161f0e996e Mon Sep 17 00:00:00 2001
From: OmniaX <syl4r39@gmail.com>
Date: Sun, 16 Jun 2024 05:17:04 +0200
Subject: [PATCH] Sync push

---
 CMakeLists.txt                 |   2 +-
 build.nr                       |   2 +-
 extra/dragon/disk1.dr          | Bin 4194304 -> 4194304 bytes
 extra/dss/bios_api.dss         |   2 +-
 extra/dss/drake/bootsector.dss |   7 ++-----
 extra/dss/drake/loader.dss     |   4 ++++
 extra/make_and_debug           |   2 +-
 extra/make_and_run             |   2 +-
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c1a393..8d183a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 cmake_minimum_required(VERSION 3.18)
 project(${PROJ_NAME} LANGUAGES C CXX)
 set(CMAKE_BUILD_TYPE Debug)
-set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD 20)
 file(STRINGS "./build.nr" BUILD_NUMBER)
 #-----------------------------------------------------------------------------------------
 
diff --git a/build.nr b/build.nr
index 7b222bc..00e37d6 100644
--- a/build.nr
+++ b/build.nr
@@ -1 +1 @@
-1593
+1596
diff --git a/extra/dragon/disk1.dr b/extra/dragon/disk1.dr
index d76708f99eb7aff0c1d007910169b2772503840e..41d685e1c8e7b0c75bc2a528f6d2425fee509325 100644
GIT binary patch
delta 265
zcmWm1SuR6i06^h;j~4$mwX|AuYo=<R$6A1dh(~W?6^-0@IL{h8Ah8UaumZ0ZQR?A*
z$w||cwA0Ib{pR7foy}*vucPR;@bnnP|C0-)Mk5rH@LfqlIV6{%S!y&3SFO)leBb)1
zXWpXd?zI|!JtMJn?2?RRrCWNWSArzcC;c)YgEAyJ$;+^eNI{A+DkUk)n2gJWOv;o@
z%ZyZ{Dzh>t^Rgg|vLws0BCAr9HL1(GY{;f;$+qmsuI$Oa9LS*@$+4Wsshr9A2N&%>
DFpNG7

delta 247
zcmWm1OD;oU06^jY9{1M!Q7%PMZN00gH$}}&Bw`0*WC<PIba2LPEJ0#DHenZ1YH+^f
zWLZWwsQXcDz5Mo*e3E+%;VFH44blI!3-|4`+54(R551py+zsLRy%B$RkVpm&Ni2!v
zWLQRIRK{dnCS+2kWLjn<FS9Zysm#lQ6l77BWLb)`BCE0{C0UoURHP~!vMF1#EjzL+
mds35qsmp;J%8@kWSWe_r&g5J!<WjEWTAFerw{rJMtN#a0lRJL^

diff --git a/extra/dss/bios_api.dss b/extra/dss/bios_api.dss
index a25f9a0..1db7612 100644
--- a/extra/dss/bios_api.dss
+++ b/extra/dss/bios_api.dss
@@ -1,5 +1,5 @@
 ## -- 
-## -- This file is automatically generated by the DragonAssembler (version 0.3.1592)
+## -- This file is automatically generated by the DragonAssembler (version 0.3.1595)
 ## -- Please do not modify this file in any way.
 ## -- 
 
diff --git a/extra/dss/drake/bootsector.dss b/extra/dss/drake/bootsector.dss
index a36494e..15ba6b5 100644
--- a/extra/dss/drake/bootsector.dss
+++ b/extra/dss/drake/bootsector.dss
@@ -1,8 +1,7 @@
-.load 0x0000
-
-@define S_REG_3 0x09
+.load [dynamic]
 
 .data
+	$string "Hello BOOTSECTOR!!"
 
 .code
 	mov R10, 0xE0
@@ -11,5 +10,3 @@
 	mov R9, $string
 	int 0x30
 
-.dynamic_data
-	$string "Hello BOOTSECTOR!!"
diff --git a/extra/dss/drake/loader.dss b/extra/dss/drake/loader.dss
index dcf32f6..e674d0f 100644
--- a/extra/dss/drake/loader.dss
+++ b/extra/dss/drake/loader.dss
@@ -2,6 +2,10 @@
 
 @include <../bios_api.dss>
 
+@define S_REG_1 0x07
+@define S_REG_2 0x08
+@define S_REG_3 0x09
+
 .data
 	$_drake_logo_line_1 "   ___  ___  ___   __ ______"
 	$_drake_logo_line_2 "  / _ \/ _ \/ _ | / //_/ __/"
diff --git a/extra/make_and_debug b/extra/make_and_debug
index 173f08d..6ee9871 100755
--- a/extra/make_and_debug
+++ b/extra/make_and_debug
@@ -14,7 +14,7 @@ printf "${green}\n==============================================================
 if [ $? -eq 0 ]; then
     cd scripts
     /bin/bash ./bios_flash
-    cp dss/bios_api.dss ../extra/dss/bios_api.dss
+    cp ../dss/bios_api.dss ../../extra/dss/bios_api.dss
     /bin/bash ./load_mbr
     cd ..
     printf "${green}Compiling Test Program...\n"
diff --git a/extra/make_and_run b/extra/make_and_run
index 1fc5120..4605bc7 100755
--- a/extra/make_and_run
+++ b/extra/make_and_run
@@ -14,7 +14,7 @@ printf "${green}\n==============================================================
 if [ $? -eq 0 ]; then
     cd scripts
     /bin/bash ./bios_flash
-    cp dss/bios_api.dss ../extra/dss/bios_api.dss
+    cp ../dss/bios_api.dss ../../extra/dss/bios_api.dss
     /bin/bash ./load_mbr
     cd ..
     printf "${green}Compiling Test Program...\n"