upstream ghidra changes

Author: sourcehold

src/OpenSHC/AI/AICState.func.hpp

@@ -140,7 +140,7 @@ namespace AI {
         aiShouldBuildQuarry;
 
         MACRO_FUNCTION_RESOLVER(
-            undefined4 (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004CB3A0, &AICState::aiRequiresExtraOxtethers)
+            BOOLEnum (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004CB3A0, &AICState::aiRequiresExtraOxtethers)
         aiRequiresExtraOxtethers;
 
         MACRO_FUNCTION_RESOLVER(
@@ -171,8 +171,8 @@ namespace AI {
             BOOLEnum (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004CB890, &AICState::shouldDestroyWoodCutterUnk)
         shouldDestroyWoodCutterUnk;
 
-        MACRO_FUNCTION_RESOLVER(undefined4 (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004CB940,
-            &AICState::destroyBuildingIfNoWorker)
+        MACRO_FUNCTION_RESOLVER(
+            BOOLEnum (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004CB940, &AICState::destroyBuildingIfNoWorker)
         destroyBuildingIfNoWorker;
 
         MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int, MappersEnum), false, Address::SHC_3BB0A8C1_0x004CB9F0,
@@ -690,7 +690,7 @@ namespace AI {
             &AICState::moveAttackingUnitsToNextRallyPoint)
         moveAttackingUnitsToNextRallyPoint;
 
-        MACRO_FUNCTION_RESOLVER(undefined4 (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004D30E0,
+        MACRO_FUNCTION_RESOLVER(BOOLEnum (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004D30E0,
             &AICState::sendUnitsToAttackBreachedCastle)
         sendUnitsToAttackBreachedCastle;
 

src/OpenSHC/AI/AICState.hpp

@@ -112,7 +112,7 @@ namespace AI {
 
         uint aiShouldBuildQuarry(int playerID);
 
-        undefined4 aiRequiresExtraOxtethers(int playerID);
+        BOOLEnum aiRequiresExtraOxtethers(int playerID);
 
         uint aiShouldBuildIronMine(int playerID);
 
@@ -128,7 +128,7 @@ namespace AI {
 
         BOOLEnum shouldDestroyWoodCutterUnk(int playerID);
 
-        undefined4 destroyBuildingIfNoWorker(int buildingID);
+        BOOLEnum destroyBuildingIfNoWorker(int buildingID);
 
         BOOLEnum shouldNotBuildMarketArmoryGranaryBarracksMercenarypost(int playerID, MappersEnum param_2);
 
@@ -390,7 +390,7 @@ namespace AI {
 
         void moveAttackingUnitsToNextRallyPoint(int playerID);
 
-        undefined4 sendUnitsToAttackBreachedCastle(int attackingPlayerIndex);
+        BOOLEnum sendUnitsToAttackBreachedCastle(int attackingPlayerIndex);
 
         void updateAIStrengthState(int playerID, int aiRecruitUnitChoicePreference);
 

src/OpenSHC/Globals/DWORD_00eb0b18.hpp …obals/TIME_LastThanksBikPlaybackTime.hppsrc/OpenSHC/Globals/DWORD_00eb0b18.hpp renamed to src/OpenSHC/Globals/TIME_LastThanksBikPlaybackTime.hpp src/OpenSHC/Globals/DWORD_00eb0b18.hpp renamed to src/OpenSHC/Globals/TIME_LastThanksBikPlaybackTime.hpp

@@ -3,7 +3,7 @@
   Communicate changes to the dev team (e.g. via a Pull Request).
   Changes get lost otherwise.
 
-  path: 'OpenSHC/Globals/DWORD_00eb0b18.hpp'
+  path: 'OpenSHC/Globals/TIME_LastThanksBikPlaybackTime.hpp'
 */
 
 #pragma once
@@ -15,7 +15,7 @@
 
 namespace OpenSHC {
 
-MACRO_STRUCT_RESOLVER(DWORD, false, Address::SHC_3BB0A8C1_0x00EB0B18) DWORD_00eb0b18;
+MACRO_STRUCT_RESOLVER(DWORD, false, Address::SHC_3BB0A8C1_0x00EB0B18) TIME_LastThanksBikPlaybackTime;
 } // namespace OpenSHC
 
 MACRO_STRUCT_INSTANCE(Address::SHC_3BB0A8C1_0x00EB0B18);

src/OpenSHC/Map/Navigation/PathFindingStatePartB.hpp

@@ -23,15 +23,15 @@ namespace Map {
         typedef struct PathFindingStatePartB {
 
             PathHelper12 destinationsArray[500]; // 0x00000000 length: 6000
-            undefined4 currentDistance; // 0x00001770 length: 4
-            undefined4 readIndex; // 0x00001774 length: 4
-            undefined4 previousReadIndex; // 0x00001778 length: 4
-            undefined4 writeIndex; // 0x0000177C length: 4
-            undefined4 nextWriteIndex; // 0x00001780 length: 4
+            int currentDistance; // 0x00001770 length: 4
+            int readIndex; // 0x00001774 length: 4
+            int previousReadIndex; // 0x00001778 length: 4
+            int writeIndex; // 0x0000177C length: 4
+            int nextWriteIndex; // 0x00001780 length: 4
             undefined1 padding_0x1784[12]; // 0x00001784 length: 12
             int depth; // 0x00001790 length: 4
             byte* ptrPathPlan; // 0x00001794 length: 4
-            undefined4 pathPlanIndex; // 0x00001798 length: 4
+            int pathPlanIndex; // 0x00001798 length: 4
             int tilesQueue[80400]; // 0x0000179C length: 321600
             short yQueue[80400]; // 0x0004FFDC length: 160800
             short xQueue[80400]; // 0x000773FC length: 160800

src/precomp/addresses-SHC-3BB0A8C1.hpp

@@ -97254,6 +97254,8 @@ enum {
     SHC_3BB0A8C1_0x00EB0AB0 = 0x00EB0AB0,
     // type: /int[9]
     SHC_3BB0A8C1_0x00EB0AF0 = 0x00EB0AF0,
+    // label: TIME_LastThanksBikPlaybackTime
+    // location:
     // type: WinDef/DWORD
     SHC_3BB0A8C1_0x00EB0B18 = 0x00EB0B18,
     // type: /undefined4

src/symbols/data.asm

@@ -863,6 +863,8 @@ PUBLIC ?instance@?$Extern@$$BY0PK@USkMasterDataEntry@IO@OpenSHC@@$0NPGCFA@@Struc
 
 PUBLIC ?instance@?$Extern@$$BY0EA@D$0OLAKLA@@StructResolver@@2PADA
 
+PUBLIC ?instance@?$Extern@K$0OLALBI@@StructResolver@@2KA
+
 PUBLIC ?instance@?$Extern@I$0OLAODM@@StructResolver@@2IA
 
 PUBLIC ?instance@?$Extern@$$BY1CB@EAA@D$0OLBCNI@@StructResolver@@2PAY0EAA@DA
@@ -1393,8 +1395,6 @@ PUBLIC ?instance@?$Extern@H$0NPFGFE@@StructResolver@@2HA
 
 PUBLIC ?instance@?$Extern@$$BY08H$0OLAKPA@@StructResolver@@2PAHA
 
-PUBLIC ?instance@?$Extern@K$0OLALBI@@StructResolver@@2KA
-
 PUBLIC ?instance@?$Extern@I$0OLALCA@@StructResolver@@2IA
 
 PUBLIC ?instance@?$Extern@I$0OLALCE@@StructResolver@@2IA
@@ -2524,6 +2524,8 @@ _TEXT SEGMENT
 
 ?instance@?$Extern@$$BY0EA@D$0OLAKLA@@StructResolver@@2PADA EQU 00EB0AB0h
 
+?instance@?$Extern@K$0OLALBI@@StructResolver@@2KA EQU 00EB0B18h
+
 ?instance@?$Extern@I$0OLAODM@@StructResolver@@2IA EQU 00EB0E3Ch
 
 ?instance@?$Extern@$$BY1CB@EAA@D$0OLBCNI@@StructResolver@@2PAY0EAA@DA EQU 00EB12D8h
@@ -3054,8 +3056,6 @@ _TEXT SEGMENT
 
 ?instance@?$Extern@$$BY08H$0OLAKPA@@StructResolver@@2PAHA EQU 00EB0AF0h
 
-?instance@?$Extern@K$0OLALBI@@StructResolver@@2KA EQU 00EB0B18h
-
 ?instance@?$Extern@I$0OLALCA@@StructResolver@@2IA EQU 00EB0B20h
 
 ?instance@?$Extern@I$0OLALCE@@StructResolver@@2IA EQU 00EB0B24h