Fix SyncBromaScript member importing and allow importing without syncing bindings

Author: hiimjasmine00

scripts/ghidra/Broma.java

@@ -399,15 +399,17 @@ private Matcher forkMatcher(Pattern regex, Matcher of, String group, boolean fin
         }
         return matcher;
     }
-    private void applyRegexes(Platform platform) {
+    private void applyRegexes(Platform platform, boolean importGlobals) {
         var matcher = Regexes.GRAB_CLASS.matcher(this.data);
         while (matcher.find()) {
             this.classes.add(new Class(this, platform, matcher));
         }
 
-        var funMatcher = Regexes.GRAB_GLOBAL_FUNCTION.matcher(this.data);
-        while (funMatcher.find()) {
-            this.functions.add(new Function(this, null, platform, funMatcher));
+        if (importGlobals) {
+            var funMatcher = Regexes.GRAB_GLOBAL_FUNCTION.matcher(this.data);
+            while (funMatcher.find()) {
+                this.functions.add(new Function(this, null, platform, funMatcher));
+            }
         }
     }
 
@@ -444,13 +446,13 @@ public static Type fakeType(String name) {
      * @param path Path to the Broma file
      * @throws IOException
      */
-    public Broma(Path path, Platform platform) throws IOException {
+    public Broma(Path path, Platform platform, boolean importGlobals) throws IOException {
         this.path = path;
         data = Files.readString(path);
         patches = new ArrayList<Patch>();
         classes = new ArrayList<Class>();
         functions = new ArrayList<Function>();
-        this.applyRegexes(platform);
+        this.applyRegexes(platform, importGlobals);
     }
 
     /**

scripts/ghidra/ScriptWrapper.java

@@ -661,6 +661,7 @@ void updateTypeDatabase(Platform platform) throws Exception {
             var stringDataUnion = new UnionDataType(cat, cat.getName());
             stringDataUnion.add(new PointerDataType(CharDataType.dataType), pointerSize, "ptr", "");
             stringDataUnion.add(new ArrayDataType(CharDataType.dataType, 0x10, 0x1), 0x10, "data", "SSO");
+            stringDataUnion.setPackingEnabled(true);
 
             cat = this.createCategoryAll(category.extend("gd", "string"));
             var string = new StructureDataType(cat, cat.getName(), 0x0);
@@ -696,11 +697,13 @@ else if (platform == Platform.MAC_ARM || platform == Platform.MAC_INTEL || platf
             if (platform != Platform.MAC_INTEL) {
                 stringShort.add(ByteDataType.dataType, 0x1, "size", "The size of the string data");
             }
+            stringShort.setPackingEnabled(true);
 
             cat = this.createCategoryAll(category.extend("gd", "string_data_union"));
             var stringDataUnion = new UnionDataType(cat, cat.getName());
             stringDataUnion.add(stringLong, pointerSize * 3, "long", "Long string data");
             stringDataUnion.add(stringShort, pointerSize * 3, "short", "Short string data");
+            stringDataUnion.setPackingEnabled(true);
 
             cat = this.createCategoryAll(category.extend("gd", "string"));
             var string = new StructureDataType(cat, cat.getName(), 0x0);
@@ -721,6 +724,7 @@ else if (platform == Platform.ANDROID32 || platform == Platform.ANDROID64) { //
             var stringDataUnion = new UnionDataType(cat, cat.getName());
             stringDataUnion.add(new PointerDataType(stringData), pointerSize, "data", "Pointer to the string information");
             stringDataUnion.add(new PointerDataType(CharDataType.dataType), pointerSize, "ptr", "Pointer to the string data");
+            stringDataUnion.setPackingEnabled(true);
 
             cat = this.createCategoryAll(category.extend("gd", "string"));
             var string = new StructureDataType(cat, cat.getName(), 0x0);
@@ -1070,6 +1074,14 @@ else if (platform == Platform.ANDROID32 || platform == Platform.ANDROID64) { //
         ccDictElement.setPackingEnabled(true);
         manager.addDataType(ccDictElement, DataTypeConflictHandler.REPLACE_HANDLER);
 
+        // cocos2d::cc_timeval
+        cat = this.createCategoryAll(category.extend("cocos2d", "cc_timeval"));
+        var ccTimeval = new StructureDataType(cat, cat.getName(), 0x0);
+        ccTimeval.add(LongDataType.dataType, LongDataType.dataType.getLength(), "tv_sec", "Seconds");
+        ccTimeval.add(IntegerDataType.dataType, 4, "tv_usec", "Microseconds");
+        ccTimeval.setPackingEnabled(true);
+        manager.addDataType(ccTimeval, DataTypeConflictHandler.REPLACE_HANDLER);
+
         // geode::SeedValueSRV etc.
 
         for (var x : new String[] { "SR", "RS", "VRS", "VSR", "RVS", "RSV", "SVR", "SRV" }) {