updating copy left. i am super fuckin busy with school, and trying to get life back...

[16.git] / src / lib / 16text.c

diff --git a/src/lib/16text.c b/src/lib/16text.c
old mode 100644 (file)
new mode 100755 (executable)
index fc7c775..03b7c61
--- a/src/lib/16text.c
+++ b/src/lib/16text.c
@@ -1,36 +1,38 @@
-/* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
- *
- * This file is part of Project 16.
- *
- * Project 16 is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Project 16 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
- * write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#include "16text.h"\r
+/* Project 16 Source Code~\r
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ *\r
+ * This file is part of Project 16.\r
+ *\r
+ * Project 16 is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Project 16 is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or\r
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,\r
+ * Fifth Floor, Boston, MA 02110-1301 USA.\r
+ *\r
+ */\r
+\r
+#include "src/lib/16text.h"\r
 \r
 /* this array holds the rom font descriptors */\r
 font_t romFonts[4];\r
-\r
+fontdata_t romFontsData;\r
 \r
 static void getRomFontAddr(char fontNum, int index) {\r
-    word fontSeg;\r
-    word fontOff;\r
+    word fontSeg=0;\r
+    word fontOff=0;\r
 \r
     __asm {\r
+               PUSH AX\r
+               PUSH BX\r
                PUSH BP\r
                MOV AX, 0x1130          ;I can haz font info plz?\r
                MOV BH, fontNum         ;  where ur fontNum\r
@@ -40,6 +42,8 @@ static void getRomFontAddr(char fontNum, int index) {
                POP BP                  ;u can haz ur frame back!\r
                MOV fontSeg, AX         ;Storage\r
                MOV fontOff, BX         ;Storage\r
+               POP BX\r
+               POP AX\r
     }\r
     romFonts[index].seg = fontSeg;\r
     romFonts[index].off = fontOff;\r
@@ -56,4 +60,5 @@ void textInit() {
     romFonts[ROM_FONT_8x8_LOW].charSize=8;\r
     romFonts[ROM_FONT_8x8_HIGH].charSize=8;\r
     romFonts[ROM_FONT_8x16].charSize=16;\r
+       //romFontsData\r
 }\r