Re-ran autogen

2023-05-03 01:01:36 -07:00 · 2023-05-03 01:01:36 -07:00 · 0a4dfd17a4
parent 5b108e50e6
commit 0a4dfd17a4
6 changed files with 32 additions and 36 deletions
--- a/autogen/lua_definitions/constants.lua
+++ b/autogen/lua_definitions/constants.lua
@ -2541,7 +2541,7 @@ SHAKE_SHOCK = 10
 SHAKE_SMALL_DAMAGE = 3

 --- @type integer
-PALETTE_PRESET_MAX = 32
+PALETTE_PRESET_MAX = 33

 --- @class CharacterSound

@ -11537,13 +11537,13 @@ SPTASK_STATE_FINISHED = 3
 SPTASK_STATE_FINISHED_DP = 4

 --- @type integer
-MAX_LOCAL_VERSION_LENGTH = 32
+MAX_LOCAL_VERSION_LENGTH = 36

 --- @type integer
-MAX_VERSION_LENGTH = 28
+MAX_VERSION_LENGTH = 32

 --- @type integer
-MINOR_VERSION_NUMBER = 0
+MINOR_VERSION_NUMBER = 1

 --- @type integer
 PATCH_VERSION_NUMBER = 0
@ -11551,5 +11551,17 @@ PATCH_VERSION_NUMBER = 0
 --- @type integer
 VERSION_NUMBER = 34

+--- @type string
+VERSION_REGION = "JP"
+
+--- @type string
+VERSION_REGION = "EU"
+
+--- @type string
+VERSION_REGION = "SH"
+
+--- @type string
+VERSION_REGION = "US"
+
 --- @type string
 VERSION_TEXT = "beta"
--- a/autogen/lua_definitions/structs.lua
+++ b/autogen/lua_definitions/structs.lua
@ -852,6 +852,7 @@
 --- @field public collidedObjInteractTypes integer
 --- @field public collisionData Pointer_Collision
 --- @field public coopFlags integer
+--- @field public ctx integer
 --- @field public curBhvCommand Pointer_BehaviorScript
 --- @field public globalPlayerIndex integer
 --- @field public header ObjectNode
--- a/docs/lua/constants.md
+++ b/docs/lua/constants.md
@ -4101,6 +4101,10 @@
 - MINOR_VERSION_NUMBER
 - PATCH_VERSION_NUMBER
 - VERSION_NUMBER
+- VERSION_REGION
+- VERSION_REGION
+- VERSION_REGION
+- VERSION_REGION
 - VERSION_TEXT

 [:arrow_up_small:](#)
--- a/docs/lua/structs.md
+++ b/docs/lua/structs.md
@ -1213,6 +1213,7 @@
 | collidedObjInteractTypes | `integer` |  |
 | collisionData | `Pointer` <`Collision`> |  |
 | coopFlags | `integer` | read-only |
+| ctx | `integer` |  |
 | curBhvCommand | `Pointer` <`BehaviorScript`> | read-only |
 | globalPlayerIndex | `integer` |  |
 | header | [ObjectNode](structs.md#ObjectNode) | read-only |
--- a/src/pc/lua/smlua_cobject_autogen.c
+++ b/src/pc/lua/smlua_cobject_autogen.c
@ -967,7 +967,7 @@ static struct LuaObjectField sNetworkPlayerFields[LUA_NETWORK_PLAYER_FIELD_COUNT
    { "type",                   LVT_U8,      offsetof(struct NetworkPlayer, type),                   true,  LOT_NONE          },
 };

-#define LUA_OBJECT_FIELD_COUNT 756
+#define LUA_OBJECT_FIELD_COUNT 757
 static struct LuaObjectField sObjectFields[LUA_OBJECT_FIELD_COUNT] = {
    { "activeFlags",                                LVT_S16,                 offsetof(struct Object, activeFlags),                                false, LOT_NONE         },
    { "areaTimer",                                  LVT_U32,                 offsetof(struct Object, areaTimer),                                  false, LOT_NONE         },
@ -982,6 +982,7 @@ static struct LuaObjectField sObjectFields[LUA_OBJECT_FIELD_COUNT] = {
 //  { "collidedObjs",                               LOT_???,                 offsetof(struct Object, collidedObjs),                               false, LOT_???          }, <--- UNIMPLEMENTED
    { "collisionData",                              LVT_COLLISION_P,         offsetof(struct Object, collisionData),                              false, LOT_POINTER      },
    { "coopFlags",                                  LVT_U8,                  offsetof(struct Object, coopFlags),                                  true,  LOT_NONE         },
+    { "ctx",                                        LVT_U8,                  offsetof(struct Object, ctx),                                        false, LOT_NONE         },
    { "curBhvCommand",                              LVT_BEHAVIORSCRIPT_P,    offsetof(struct Object, curBhvCommand),                              true,  LOT_POINTER      },
    { "globalPlayerIndex",                          LVT_U8,                  offsetof(struct Object, globalPlayerIndex),                          false, LOT_NONE         },
    { "header",                                     LVT_COBJECT,             offsetof(struct Object, header),                                     true,  LOT_OBJECTNODE   },
--- a/src/pc/lua/smlua_constants_autogen.c
+++ b/src/pc/lua/smlua_constants_autogen.c
@ -10,7 +10,6 @@ char gSmluaConstants[] = ""
 "        return a['_pointer'] == b['_pointer'] and a['_lot'] == b['_lot'] and a['_pointer'] ~= nil and a['_lot'] ~= nil\n"
 "    end\n"
 "}\n"
-"\n"
 "_CPointer = {\n"
 "    __index = function (t,k)\n"
 "        return nil\n"
@ -24,7 +23,6 @@ char gSmluaConstants[] = ""
 "        return a['_pointer'] == b['_pointer'] and a['_pointer'] ~= nil and a['_lvt'] ~= nil\n"
 "    end\n"
 "}\n"
-"\n"
 "_SyncTable = {\n"
 "    __index = function (t,k)\n"
 "        local _table = rawget(t, '_table')\n"
@ -36,7 +34,6 @@ char gSmluaConstants[] = ""
 "        _set_sync_table_field(t, k, v)\n"
 "    end\n"
 "}\n"
-"\n"
 "_ReadOnlyTable = {\n"
 "    __index = function (t,k)\n"
 "        local _table = rawget(t, '_table')\n"
@ -45,7 +42,6 @@ char gSmluaConstants[] = ""
 "    __newindex = function (t,k,v)\n"
 "    end\n"
 "}\n"
-"\n"
 "--- @param dest Vec3f\n"
 "--- @param src Vec3f\n"
 "--- @return Vec3f\n"
@ -55,7 +51,6 @@ char gSmluaConstants[] = ""
 "    dest.z = src.z\n"
 "    return dest\n"
 "end\n"
-"\n"
 "--- @param dest Vec3f\n"
 "--- @param x number\n"
 "--- @param y number\n"
@ -67,7 +62,6 @@ char gSmluaConstants[] = ""
 "    dest.z = z\n"
 "    return dest\n"
 "end\n"
-"\n"
 "--- @param dest Vec3f\n"
 "--- @param a Vec3f\n"
 "--- @return Vec3f\n"
@ -77,7 +71,6 @@ char gSmluaConstants[] = ""
 "    dest.z = dest.z + a.z\n"
 "    return dest\n"
 "end\n"
-"\n"
 "--- @param dest Vec3f\n"
 "--- @param a Vec3f\n"
 "--- @param b Vec3f\n"
@ -88,7 +81,6 @@ char gSmluaConstants[] = ""
 "    dest.z = a.z + b.z\n"
 "    return dest\n"
 "end\n"
-"\n"
 "--- @param dest Vec3f\n"
 "--- @param a number\n"
 "--- @return Vec3f\n"
@ -98,7 +90,6 @@ char gSmluaConstants[] = ""
 "    dest.z = dest.z * a\n"
 "    return dest\n"
 "end\n"
-"\n"
 "--- @param dest Vec3f\n"
 "--- @return Vec3f\n"
 "function vec3f_normalize(dest)\n"
@ -106,28 +97,23 @@ char gSmluaConstants[] = ""
 "    if divisor == 0 then\n"
 "        return dest\n"
 "    end\n"
-"\n"
 "    local invsqrt = 1.0 / divisor\n"
 "    dest.x = dest.x * invsqrt\n"
 "    dest.y = dest.y * invsqrt\n"
 "    dest.z = dest.z * invsqrt\n"
-"\n"
 "    return dest\n"
 "end\n"
-"\n"
 "--- @param a Vec3f\n"
 "--- @return number\n"
 "function vec3f_length(a)\n"
 "    return math.sqrt(a.x * a.x + a.y * a.y + a.z * a.z)\n"
 "end\n"
-"\n"
 "--- @param a Vec3f\n"
 "--- @param b Vec3f\n"
 "--- @return number\n"
 "function vec3f_dot(a, b)\n"
 "    return a.x * b.x + a.y * b.y + a.z * b.z\n"
 "end\n"
-"\n"
 "--- @param vec Vec3f\n"
 "--- @param onto Vec3f\n"
 "--- @return Vec3f\n"
@ -139,7 +125,6 @@ char gSmluaConstants[] = ""
 "  vec3f_mul(out, numerator / denominator)\n"
 "  return out\n"
 "end\n"
-"\n"
 "--- @param v1 Vec3f\n"
 "--- @param v2 Vec3f\n"
 "--- @return number\n"
@ -149,7 +134,6 @@ char gSmluaConstants[] = ""
 "    dz = v1.z - v2.z\n"
 "    return math.sqrt(dx * dx + dy * dy + dz * dz)\n"
 "end\n"
-"\n"
 "--- @param dest Vec3s\n"
 "--- @param src Vec3s\n"
 "--- @return Vec3s\n"
@ -159,7 +143,6 @@ char gSmluaConstants[] = ""
 "    dest.z = src.z\n"
 "    return dest\n"
 "end\n"
-"\n"
 "--- @param dest Vec3s\n"
 "--- @param x number\n"
 "--- @param y number\n"
@ -171,7 +154,6 @@ char gSmluaConstants[] = ""
 "    dest.z = z\n"
 "    return dest\n"
 "end\n"
-"\n"
 "--- @param dest Vec3s\n"
 "--- @param a Vec3s\n"
 "--- @return Vec3s\n"
@ -181,7 +163,6 @@ char gSmluaConstants[] = ""
 "    dest.z = dest.z + a.z\n"
 "    return dest\n"
 "end\n"
-"\n"
 "--- @param dest Vec3s\n"
 "--- @param a Vec3s\n"
 "--- @param b Vec3s\n"
@ -192,7 +173,6 @@ char gSmluaConstants[] = ""
 "    dest.z = a.z + b.z\n"
 "    return dest\n"
 "end\n"
-"\n"
 "--- @param dest Vec3s\n"
 "--- @param a number\n"
 "--- @return Vec3s\n"
@ -202,7 +182,6 @@ char gSmluaConstants[] = ""
 "    dest.z = dest.z * a\n"
 "    return dest\n"
 "end\n"
-"\n"
 "--- @param v1 Vec3s\n"
 "--- @param v2 Vec3s\n"
 "--- @return number\n"
@ -212,7 +191,6 @@ char gSmluaConstants[] = ""
 "    dz = v1.z - v2.z\n"
 "    return math.sqrt(dx * dx + dy * dy + dz * dz)\n"
 "end\n"
-"\n"
 "--- @param current number\n"
 "--- @param target number\n"
 "--- @param inc number\n"
@ -232,7 +210,6 @@ char gSmluaConstants[] = ""
 "    end\n"
 "    return current;\n"
 "end\n"
-"\n"
 "--- @param current number\n"
 "--- @param target number\n"
 "--- @param inc number\n"
@ -250,7 +227,6 @@ char gSmluaConstants[] = ""
 "            current = target\n"
 "        end\n"
 "    end\n"
-"\n"
 "    -- keep within 32 bits\n"
 "    if current > 2147483647 then\n"
 "        current = -2147483648 + (current - 2147483647)\n"
@ -259,7 +235,6 @@ char gSmluaConstants[] = ""
 "    end\n"
 "    return current;\n"
 "end\n"
-"\n"
 "--- @param bank number\n"
 "--- @param soundID number\n"
 "--- @param priority number\n"
@ -269,11 +244,9 @@ char gSmluaConstants[] = ""
 "    if flags == nil then flags = 0 end\n"
 "    return (bank << 28) | (soundID << 16) | (priority << 8) | flags | SOUND_STATUS_WAITING\n"
 "end\n"
-"\n"
 "-------------\n"
 "-- courses --\n"
 "-------------\n"
-"\n"
 "--- @type integer\n"
 "COURSE_NONE     = 0\n"
 "--- @type integer\n"
@ -1068,7 +1041,7 @@ char gSmluaConstants[] = ""
 "CAM_EVENT_START_ENDING = 11\n"
 "CAM_EVENT_START_END_WAVING = 12\n"
 "CAM_EVENT_START_CREDITS = 13\n"
-"PALETTE_PRESET_MAX = 32\n"
+"PALETTE_PRESET_MAX = 33\n"
 "PANTS = 0\n"
 "SHIRT = 1\n"
 "GLOVES = 2\n"
@ -4050,8 +4023,12 @@ char gSmluaConstants[] = ""
 "COOP_OBJ_FLAG_INITIALIZED = (1 << 3)\n"
 "VERSION_TEXT = 'beta'\n"
 "VERSION_NUMBER = 34\n"
-"MINOR_VERSION_NUMBER = 0\n"
+"MINOR_VERSION_NUMBER = 1\n"
 "PATCH_VERSION_NUMBER = 0\n"
-"MAX_VERSION_LENGTH = 28\n"
-"MAX_LOCAL_VERSION_LENGTH = 32\n"
+"VERSION_REGION = 'JP'\n"
+"VERSION_REGION = 'EU'\n"
+"VERSION_REGION = 'SH'\n"
+"VERSION_REGION = 'US'\n"
+"MAX_VERSION_LENGTH = 32\n"
+"MAX_LOCAL_VERSION_LENGTH = 36\n"
 ;