bugfix

Veslyquix · Nov 23, 2024 · a22b8ec · a22b8ec
1 parent 6d2eab1
commit a22b8ec
Show file tree

Hide file tree

Showing 40 changed files with 273 additions and 232 deletions.
diff --git a/.FE6_Installer.event b/.FE6_Installer.event
@@ -2,7 +2,9 @@
 	#define callHackNew(offset) 		"BYTE $01 $4B $9E $46 $00 $F8 $01 $E0; POIN (offset|0x1)"
 #endif 
 
+#ifdef VeslyBuildfile 
 #include "TextFE6/repointedTextTable.event"
+#endif 
 // #define setText(textID, offset) "PUSH; ORG (TextTable+4*textID); POIN (offset); POP"
 #include "EAstdlib.event" 
 #include "Definitions.event" 
@@ -11,9 +13,26 @@
 #define PROC_CALL_ROUTINE_2(aprRoutine)              "SHORT 0x16 0; POIN aprRoutine"
 #endif 
 
-
-#include "gfx/Installer.event"
-#include "Tables/TableInstaller.event" 
+#ifndef gCharacterData 
+#define gCharacterData 0x86076D0
+#endif 
+#ifdef VeslyBuildfile 
+    #include "gfx/Installer.event"
+    #include "Tables/TableInstaller.event" 
+#else 
+#define gCharacterDataFE1 0x86076D0 
+#define gCharacterDataFE4 0x86076D0 
+#define gCharacterDataFE5 0x86076D0 
+#define gCharacterDataFE6 0x86076D0 
+#define gCharacterDataFE7 0x86076D0 
+#define gCharacterDataFE8 0x86076D0 
+#define gCharacterDataFE10 0x86076D0 
+#define gCharacterDataFE13 0x86076D0 
+#define gCharacterDataFE14 0x86076D0 
+#define gCharacterDataFE15 0x86076D0 
+#define gCharacterDataFE16 0x86076D0 
+#define gCharacterDataFE17 0x86076D0 
+#endif 
 #include "Patches/FE6.lyn.event" 
 #include "Patches/FE6_AsmHooks.lyn.event" 
 

diff --git a/.FE7_Installer.event b/.FE7_Installer.event
@@ -3,17 +3,36 @@
 #endif 
 //#define SKILLSYS_INSTALLED 
 //#define STRMAG_INSTALLED 
+#ifdef VeslyBuildfile 
 #include "Text/repointedTextTable.event"
+#endif 
 #include "EAstdlib.event" 
 #include "Definitions.event" 
 #include "Extensions/Hack Installation.txt" 
 #ifndef PROC_CALL_ROUTINE_2
 #define PROC_CALL_ROUTINE_2(aprRoutine)              "SHORT 0x16 0; POIN aprRoutine"
 #endif 
 
-
-#include "gfx/Installer.event"
-#include "Tables/TableInstaller.event" 
+#ifndef gCharacterData 
+#define gCharacterData 0x8BDCE4C 
+#endif 
+#ifdef VeslyBuildfile 
+    #include "gfx/Installer.event"
+    #include "Tables/TableInstaller.event" 
+#else 
+#define gCharacterDataFE1 0x8BDCE4C 
+#define gCharacterDataFE4 0x8BDCE4C 
+#define gCharacterDataFE5 0x8BDCE4C 
+#define gCharacterDataFE6 0x8BDCE4C 
+#define gCharacterDataFE7 0x8BDCE4C 
+#define gCharacterDataFE8 0x8BDCE4C 
+#define gCharacterDataFE10 0x8BDCE4C 
+#define gCharacterDataFE13 0x8BDCE4C 
+#define gCharacterDataFE14 0x8BDCE4C 
+#define gCharacterDataFE15 0x8BDCE4C 
+#define gCharacterDataFE16 0x8BDCE4C 
+#define gCharacterDataFE17 0x8BDCE4C 
+#endif 
 #include "Patches/FE7.lyn.event" 
 #include "Patches/FE7_AsmHooks.lyn.event" 
 

diff --git a/C_code.c b/C_code.c
@@ -2052,12 +2052,12 @@ int GetMaxItems(void)
     {
         return MaxItems_Link;
     }
-    if (*MaxItems)
+    if (*MaxItems > 1)
     {
         return *MaxItems;
     }
     const struct ItemData * table = GetItemData(1);
-    for (int i = 1; i <= 255; i++)
+    for (int i = 1; i <= 256; i++)
     {
         if (table->number != i)
         {
@@ -2084,12 +2084,12 @@ int GetMaxClasses(void)
     {
         return MaxClasses_Link;
     }
-    if (*MaxClasses)
+    if (*MaxClasses > 1)
     {
         return *MaxClasses;
     }
     const struct ClassData * table = GetClassData(1);
-    int c = 255;
+    int c = 256;
 #ifdef FE6
     if (!RecruitValues->newClasses)
     {