pmdsky-debug-py 10.2.19__py3-none-any.whl → 10.2.20__py3-none-any.whl

pmdsky_debug_py/_release.py

@@ -1 +1 @@
-RELEASE = "v0.10.2+1ddf7e71b8"
+RELEASE = "v0.10.2+0d42a2916f"

pmdsky_debug_py/eu.py

@@ -6447,7 +6447,70 @@ class EuArm9Functions:
         [0x204BFE4],
         None,
         "CalcScriptVariables",
-        "Performs a calculation on two loaded script variables.\n\nr0: script variable 1\nr1: script variable 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        "Performs a calculation on two loaded script variables.\n\nr0: script variable value 1\nr1: script variable value 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        None,
+    )
+
+    CompareScriptVariables = Symbol(
+        [0x4C0D0],
+        [0x204C0D0],
+        None,
+        "CompareScriptVariables",
+        "Compares two loaded script variables and returns the comparison result.\n\nr0: script variable value 1\nr1: script variable value 2\nr2: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    CalcScriptVariablesVeneer = Symbol(
+        [0x4C204],
+        [0x204C204],
+        None,
+        "CalcScriptVariablesVeneer",
+        "Likely a linker-generated veneer for CalcScriptVariables.\n\nSee https://developer.arm.com/documentation/dui0474/k/image-structure-and-generation/linker-generated-veneers/what-is-a-veneer-\n\nr0: script variable value 1\nr1: script variable value 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        None,
+    )
+
+    CalcAndUpdateScriptVarWithOtherValue = Symbol(
+        [0x4C210],
+        [0x204C210],
+        None,
+        "CalcAndUpdateScriptVarWithOtherValue",
+        "Runs a calculation on a script variable, then sets the script variable to the calculation result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other value to use in the calculation\nr3: calculation to perform on the script variables",
+        None,
+    )
+
+    CalcAndUpdateScriptVarWithOtherScriptVar = Symbol(
+        [0x4C248],
+        [0x204C248],
+        None,
+        "CalcAndUpdateScriptVarWithOtherScriptVar",
+        "Runs a calculation on a script variable, then sets the script variable to the calculation result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the calculation\nr3: calculation to perform on the script variables",
+        None,
+    )
+
+    CompareScriptVariablesVeneer = Symbol(
+        [0x4C294],
+        [0x204C294],
+        None,
+        "CompareScriptVariablesVeneer",
+        "Likely a linker-generated veneer for CompareScriptVariables.\n\nSee https://developer.arm.com/documentation/dui0474/k/image-structure-and-generation/linker-generated-veneers/what-is-a-veneer-\n\nr0: script variable value 1\nr1: script variable value 2\nr2: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    LoadAndCompareScriptVarAndValue = Symbol(
+        [0x4C2A0],
+        [0x204C2A0],
+        None,
+        "LoadAndCompareScriptVarAndValue",
+        "Runs a comparison on a script variable and another value, then returns the comparison result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the comparison\nr3: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    LoadAndCompareScriptVars = Symbol(
+        [0x4C2C0],
+        [0x204C2C0],
+        None,
+        "LoadAndCompareScriptVars",
+        "Runs a comparison on two script variables, then returns the comparison result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the comparison\nr3: comparison to perform on the script variables\nreturn: comparison result",
         None,
     )
 
@@ -10094,15 +10157,33 @@ class EuArm9Data:
         "struct partner_talk_kind_table_entry[11]",
     )
 
-    EVENT_FLAG_PROG_POS_INFO = Symbol(
+    EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES = Symbol(
         [0x9D430],
         [0x209D430],
         0x8,
-        "EVENT_FLAG_PROG_POS_INFO",
+        "EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES",
         "Debug information used to log an error with an unrecognized operation in CalcScriptVariables.",
         "struct prog_pos_info",
     )
 
+    EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES = Symbol(
+        [0x9D438],
+        [0x209D438],
+        0x8,
+        "EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES",
+        "Debug information used to log an error with an unrecognized operation in CompareScriptVariables.",
+        "struct prog_pos_info",
+    )
+
+    EVENT_FLAG_FILE_NAME = Symbol(
+        [0x9D440],
+        [0x209D440],
+        0x10,
+        "EVENT_FLAG_FILE_NAME",
+        "The file name 'event_flag.c', used for debug logging.",
+        "",
+    )
+
     SCRIPT_VARS_LOCALS = Symbol(
         [0x9D450],
         [0x209D450],
@@ -10112,15 +10193,24 @@ class EuArm9Data:
         "struct script_local_var_table",
     )
 
-    EVENT_FLAG_EXPANSION_ERROR = Symbol(
+    EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR = Symbol(
         [0x9D4AC],
         [0x209D4AC],
         0x20,
-        "EVENT_FLAG_EXPANSION_ERROR",
+        "EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR",
         "Error log message for an unrecognized operation in CalcScriptVariables.",
         "",
     )
 
+    EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR = Symbol(
+        [0x9D4CC],
+        [0x209D4CC],
+        0x1C,
+        "EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR",
+        "Error log message for an unrecognized operation in CompareScriptVariables.",
+        "",
+    )
+
     SCRIPT_VARS = Symbol(
         [0x9DDF4],
         [0x209DDF4],
@@ -11625,6 +11715,14 @@ class EuArm9Data:
         "EXCLUSIVE_ITEM_ATTACK_BOOSTS", EXCLUSIVE_ITEM_STAT_BOOST_DATA
     )
 
+    EVENT_FLAG_PROG_POS_INFO = _Deprecated(
+        "EVENT_FLAG_PROG_POS_INFO", EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES
+    )
+
+    EVENT_FLAG_EXPANSION_ERROR = _Deprecated(
+        "EVENT_FLAG_EXPANSION_ERROR", EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR
+    )
+
     DIRECTORY_FILES_EXTRACTED = _Deprecated(
         "DIRECTORY_FILES_EXTRACTED", PACK_FILES_OPENED
     )

pmdsky_debug_py/eu_itcm.py

@@ -6401,7 +6401,70 @@ class EuItcmArm9Functions:
         None,
         None,
         "CalcScriptVariables",
-        "Performs a calculation on two loaded script variables.\n\nr0: script variable 1\nr1: script variable 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        "Performs a calculation on two loaded script variables.\n\nr0: script variable value 1\nr1: script variable value 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        None,
+    )
+
+    CompareScriptVariables = Symbol(
+        None,
+        None,
+        None,
+        "CompareScriptVariables",
+        "Compares two loaded script variables and returns the comparison result.\n\nr0: script variable value 1\nr1: script variable value 2\nr2: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    CalcScriptVariablesVeneer = Symbol(
+        None,
+        None,
+        None,
+        "CalcScriptVariablesVeneer",
+        "Likely a linker-generated veneer for CalcScriptVariables.\n\nSee https://developer.arm.com/documentation/dui0474/k/image-structure-and-generation/linker-generated-veneers/what-is-a-veneer-\n\nr0: script variable value 1\nr1: script variable value 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        None,
+    )
+
+    CalcAndUpdateScriptVarWithOtherValue = Symbol(
+        None,
+        None,
+        None,
+        "CalcAndUpdateScriptVarWithOtherValue",
+        "Runs a calculation on a script variable, then sets the script variable to the calculation result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other value to use in the calculation\nr3: calculation to perform on the script variables",
+        None,
+    )
+
+    CalcAndUpdateScriptVarWithOtherScriptVar = Symbol(
+        None,
+        None,
+        None,
+        "CalcAndUpdateScriptVarWithOtherScriptVar",
+        "Runs a calculation on a script variable, then sets the script variable to the calculation result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the calculation\nr3: calculation to perform on the script variables",
+        None,
+    )
+
+    CompareScriptVariablesVeneer = Symbol(
+        None,
+        None,
+        None,
+        "CompareScriptVariablesVeneer",
+        "Likely a linker-generated veneer for CompareScriptVariables.\n\nSee https://developer.arm.com/documentation/dui0474/k/image-structure-and-generation/linker-generated-veneers/what-is-a-veneer-\n\nr0: script variable value 1\nr1: script variable value 2\nr2: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    LoadAndCompareScriptVarAndValue = Symbol(
+        None,
+        None,
+        None,
+        "LoadAndCompareScriptVarAndValue",
+        "Runs a comparison on a script variable and another value, then returns the comparison result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the comparison\nr3: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    LoadAndCompareScriptVars = Symbol(
+        None,
+        None,
+        None,
+        "LoadAndCompareScriptVars",
+        "Runs a comparison on two script variables, then returns the comparison result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the comparison\nr3: comparison to perform on the script variables\nreturn: comparison result",
         None,
     )
 
@@ -10039,15 +10102,33 @@ class EuItcmArm9Data:
         "struct partner_talk_kind_table_entry[11]",
     )
 
-    EVENT_FLAG_PROG_POS_INFO = Symbol(
+    EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES = Symbol(
         None,
         None,
         None,
-        "EVENT_FLAG_PROG_POS_INFO",
+        "EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES",
         "Debug information used to log an error with an unrecognized operation in CalcScriptVariables.",
         "struct prog_pos_info",
     )
 
+    EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES = Symbol(
+        None,
+        None,
+        None,
+        "EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES",
+        "Debug information used to log an error with an unrecognized operation in CompareScriptVariables.",
+        "struct prog_pos_info",
+    )
+
+    EVENT_FLAG_FILE_NAME = Symbol(
+        None,
+        None,
+        None,
+        "EVENT_FLAG_FILE_NAME",
+        "The file name 'event_flag.c', used for debug logging.",
+        "",
+    )
+
     SCRIPT_VARS_LOCALS = Symbol(
         None,
         None,
@@ -10057,15 +10138,24 @@ class EuItcmArm9Data:
         "struct script_local_var_table",
     )
 
-    EVENT_FLAG_EXPANSION_ERROR = Symbol(
+    EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR = Symbol(
         None,
         None,
         None,
-        "EVENT_FLAG_EXPANSION_ERROR",
+        "EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR",
         "Error log message for an unrecognized operation in CalcScriptVariables.",
         "",
     )
 
+    EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR = Symbol(
+        None,
+        None,
+        None,
+        "EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR",
+        "Error log message for an unrecognized operation in CompareScriptVariables.",
+        "",
+    )
+
     SCRIPT_VARS = Symbol(
         None,
         None,
@@ -11559,6 +11649,14 @@ class EuItcmArm9Data:
         "EXCLUSIVE_ITEM_ATTACK_BOOSTS", EXCLUSIVE_ITEM_STAT_BOOST_DATA
     )
 
+    EVENT_FLAG_PROG_POS_INFO = _Deprecated(
+        "EVENT_FLAG_PROG_POS_INFO", EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES
+    )
+
+    EVENT_FLAG_EXPANSION_ERROR = _Deprecated(
+        "EVENT_FLAG_EXPANSION_ERROR", EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR
+    )
+
     DIRECTORY_FILES_EXTRACTED = _Deprecated(
         "DIRECTORY_FILES_EXTRACTED", PACK_FILES_OPENED
     )

pmdsky_debug_py/jp.py

@@ -6447,7 +6447,70 @@ class JpArm9Functions:
         [0x204C00C],
         None,
         "CalcScriptVariables",
-        "Performs a calculation on two loaded script variables.\n\nr0: script variable 1\nr1: script variable 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        "Performs a calculation on two loaded script variables.\n\nr0: script variable value 1\nr1: script variable value 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        None,
+    )
+
+    CompareScriptVariables = Symbol(
+        [0x4C0F8],
+        [0x204C0F8],
+        None,
+        "CompareScriptVariables",
+        "Compares two loaded script variables and returns the comparison result.\n\nr0: script variable value 1\nr1: script variable value 2\nr2: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    CalcScriptVariablesVeneer = Symbol(
+        [0x4C22C],
+        [0x204C22C],
+        None,
+        "CalcScriptVariablesVeneer",
+        "Likely a linker-generated veneer for CalcScriptVariables.\n\nSee https://developer.arm.com/documentation/dui0474/k/image-structure-and-generation/linker-generated-veneers/what-is-a-veneer-\n\nr0: script variable value 1\nr1: script variable value 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        None,
+    )
+
+    CalcAndUpdateScriptVarWithOtherValue = Symbol(
+        [0x4C238],
+        [0x204C238],
+        None,
+        "CalcAndUpdateScriptVarWithOtherValue",
+        "Runs a calculation on a script variable, then sets the script variable to the calculation result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other value to use in the calculation\nr3: calculation to perform on the script variables",
+        None,
+    )
+
+    CalcAndUpdateScriptVarWithOtherScriptVar = Symbol(
+        [0x4C270],
+        [0x204C270],
+        None,
+        "CalcAndUpdateScriptVarWithOtherScriptVar",
+        "Runs a calculation on a script variable, then sets the script variable to the calculation result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the calculation\nr3: calculation to perform on the script variables",
+        None,
+    )
+
+    CompareScriptVariablesVeneer = Symbol(
+        [0x4C2BC],
+        [0x204C2BC],
+        None,
+        "CompareScriptVariablesVeneer",
+        "Likely a linker-generated veneer for CompareScriptVariables.\n\nSee https://developer.arm.com/documentation/dui0474/k/image-structure-and-generation/linker-generated-veneers/what-is-a-veneer-\n\nr0: script variable value 1\nr1: script variable value 2\nr2: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    LoadAndCompareScriptVarAndValue = Symbol(
+        [0x4C2C8],
+        [0x204C2C8],
+        None,
+        "LoadAndCompareScriptVarAndValue",
+        "Runs a comparison on a script variable and another value, then returns the comparison result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the comparison\nr3: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    LoadAndCompareScriptVars = Symbol(
+        [0x4C2E8],
+        [0x204C2E8],
+        None,
+        "LoadAndCompareScriptVars",
+        "Runs a comparison on two script variables, then returns the comparison result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the comparison\nr3: comparison to perform on the script variables\nreturn: comparison result",
         None,
     )
 
@@ -10089,15 +10152,33 @@ class JpArm9Data:
         "struct partner_talk_kind_table_entry[11]",
     )
 
-    EVENT_FLAG_PROG_POS_INFO = Symbol(
+    EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES = Symbol(
         [0x9E280],
         [0x209E280],
         0x8,
-        "EVENT_FLAG_PROG_POS_INFO",
+        "EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES",
         "Debug information used to log an error with an unrecognized operation in CalcScriptVariables.",
         "struct prog_pos_info",
     )
 
+    EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES = Symbol(
+        [0x9E288],
+        [0x209E288],
+        0x8,
+        "EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES",
+        "Debug information used to log an error with an unrecognized operation in CompareScriptVariables.",
+        "struct prog_pos_info",
+    )
+
+    EVENT_FLAG_FILE_NAME = Symbol(
+        [0x9E290],
+        [0x209E290],
+        0x10,
+        "EVENT_FLAG_FILE_NAME",
+        "The file name 'event_flag.c', used for debug logging.",
+        "",
+    )
+
     SCRIPT_VARS_LOCALS = Symbol(
         [0x9E2A0],
         [0x209E2A0],
@@ -10107,15 +10188,24 @@ class JpArm9Data:
         "struct script_local_var_table",
     )
 
-    EVENT_FLAG_EXPANSION_ERROR = Symbol(
+    EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR = Symbol(
         [0x9E2FC],
         [0x209E2FC],
         0x20,
-        "EVENT_FLAG_EXPANSION_ERROR",
+        "EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR",
         "Error log message for an unrecognized operation in CalcScriptVariables.",
         "",
     )
 
+    EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR = Symbol(
+        [0x9E31C],
+        [0x209E31C],
+        0x1C,
+        "EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR",
+        "Error log message for an unrecognized operation in CompareScriptVariables.",
+        "",
+    )
+
     SCRIPT_VARS = Symbol(
         [0x9EC44],
         [0x209EC44],
@@ -11620,6 +11710,14 @@ class JpArm9Data:
         "EXCLUSIVE_ITEM_ATTACK_BOOSTS", EXCLUSIVE_ITEM_STAT_BOOST_DATA
     )
 
+    EVENT_FLAG_PROG_POS_INFO = _Deprecated(
+        "EVENT_FLAG_PROG_POS_INFO", EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES
+    )
+
+    EVENT_FLAG_EXPANSION_ERROR = _Deprecated(
+        "EVENT_FLAG_EXPANSION_ERROR", EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR
+    )
+
     DIRECTORY_FILES_EXTRACTED = _Deprecated(
         "DIRECTORY_FILES_EXTRACTED", PACK_FILES_OPENED
     )

pmdsky_debug_py/jp_itcm.py

@@ -6401,7 +6401,70 @@ class JpItcmArm9Functions:
         None,
         None,
         "CalcScriptVariables",
-        "Performs a calculation on two loaded script variables.\n\nr0: script variable 1\nr1: script variable 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        "Performs a calculation on two loaded script variables.\n\nr0: script variable value 1\nr1: script variable value 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        None,
+    )
+
+    CompareScriptVariables = Symbol(
+        None,
+        None,
+        None,
+        "CompareScriptVariables",
+        "Compares two loaded script variables and returns the comparison result.\n\nr0: script variable value 1\nr1: script variable value 2\nr2: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    CalcScriptVariablesVeneer = Symbol(
+        None,
+        None,
+        None,
+        "CalcScriptVariablesVeneer",
+        "Likely a linker-generated veneer for CalcScriptVariables.\n\nSee https://developer.arm.com/documentation/dui0474/k/image-structure-and-generation/linker-generated-veneers/what-is-a-veneer-\n\nr0: script variable value 1\nr1: script variable value 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        None,
+    )
+
+    CalcAndUpdateScriptVarWithOtherValue = Symbol(
+        None,
+        None,
+        None,
+        "CalcAndUpdateScriptVarWithOtherValue",
+        "Runs a calculation on a script variable, then sets the script variable to the calculation result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other value to use in the calculation\nr3: calculation to perform on the script variables",
+        None,
+    )
+
+    CalcAndUpdateScriptVarWithOtherScriptVar = Symbol(
+        None,
+        None,
+        None,
+        "CalcAndUpdateScriptVarWithOtherScriptVar",
+        "Runs a calculation on a script variable, then sets the script variable to the calculation result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the calculation\nr3: calculation to perform on the script variables",
+        None,
+    )
+
+    CompareScriptVariablesVeneer = Symbol(
+        None,
+        None,
+        None,
+        "CompareScriptVariablesVeneer",
+        "Likely a linker-generated veneer for CompareScriptVariables.\n\nSee https://developer.arm.com/documentation/dui0474/k/image-structure-and-generation/linker-generated-veneers/what-is-a-veneer-\n\nr0: script variable value 1\nr1: script variable value 2\nr2: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    LoadAndCompareScriptVarAndValue = Symbol(
+        None,
+        None,
+        None,
+        "LoadAndCompareScriptVarAndValue",
+        "Runs a comparison on a script variable and another value, then returns the comparison result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the comparison\nr3: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    LoadAndCompareScriptVars = Symbol(
+        None,
+        None,
+        None,
+        "LoadAndCompareScriptVars",
+        "Runs a comparison on two script variables, then returns the comparison result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the comparison\nr3: comparison to perform on the script variables\nreturn: comparison result",
         None,
     )
 
@@ -10039,15 +10102,33 @@ class JpItcmArm9Data:
         "struct partner_talk_kind_table_entry[11]",
     )
 
-    EVENT_FLAG_PROG_POS_INFO = Symbol(
+    EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES = Symbol(
         None,
         None,
         None,
-        "EVENT_FLAG_PROG_POS_INFO",
+        "EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES",
         "Debug information used to log an error with an unrecognized operation in CalcScriptVariables.",
         "struct prog_pos_info",
     )
 
+    EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES = Symbol(
+        None,
+        None,
+        None,
+        "EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES",
+        "Debug information used to log an error with an unrecognized operation in CompareScriptVariables.",
+        "struct prog_pos_info",
+    )
+
+    EVENT_FLAG_FILE_NAME = Symbol(
+        None,
+        None,
+        None,
+        "EVENT_FLAG_FILE_NAME",
+        "The file name 'event_flag.c', used for debug logging.",
+        "",
+    )
+
     SCRIPT_VARS_LOCALS = Symbol(
         None,
         None,
@@ -10057,15 +10138,24 @@ class JpItcmArm9Data:
         "struct script_local_var_table",
     )
 
-    EVENT_FLAG_EXPANSION_ERROR = Symbol(
+    EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR = Symbol(
         None,
         None,
         None,
-        "EVENT_FLAG_EXPANSION_ERROR",
+        "EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR",
         "Error log message for an unrecognized operation in CalcScriptVariables.",
         "",
     )
 
+    EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR = Symbol(
+        None,
+        None,
+        None,
+        "EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR",
+        "Error log message for an unrecognized operation in CompareScriptVariables.",
+        "",
+    )
+
     SCRIPT_VARS = Symbol(
         None,
         None,
@@ -11559,6 +11649,14 @@ class JpItcmArm9Data:
         "EXCLUSIVE_ITEM_ATTACK_BOOSTS", EXCLUSIVE_ITEM_STAT_BOOST_DATA
     )
 
+    EVENT_FLAG_PROG_POS_INFO = _Deprecated(
+        "EVENT_FLAG_PROG_POS_INFO", EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES
+    )
+
+    EVENT_FLAG_EXPANSION_ERROR = _Deprecated(
+        "EVENT_FLAG_EXPANSION_ERROR", EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR
+    )
+
     DIRECTORY_FILES_EXTRACTED = _Deprecated(
         "DIRECTORY_FILES_EXTRACTED", PACK_FILES_OPENED
     )

pmdsky_debug_py/na.py

@@ -6447,7 +6447,70 @@ class NaArm9Functions:
         [0x204BCAC],
         None,
         "CalcScriptVariables",
-        "Performs a calculation on two loaded script variables.\n\nr0: script variable 1\nr1: script variable 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        "Performs a calculation on two loaded script variables.\n\nr0: script variable value 1\nr1: script variable value 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        None,
+    )
+
+    CompareScriptVariables = Symbol(
+        [0x4BD98],
+        [0x204BD98],
+        None,
+        "CompareScriptVariables",
+        "Compares two loaded script variables and returns the comparison result.\n\nr0: script variable value 1\nr1: script variable value 2\nr2: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    CalcScriptVariablesVeneer = Symbol(
+        [0x4BECC],
+        [0x204BECC],
+        None,
+        "CalcScriptVariablesVeneer",
+        "Likely a linker-generated veneer for CalcScriptVariables.\n\nSee https://developer.arm.com/documentation/dui0474/k/image-structure-and-generation/linker-generated-veneers/what-is-a-veneer-\n\nr0: script variable value 1\nr1: script variable value 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        None,
+    )
+
+    CalcAndUpdateScriptVarWithOtherValue = Symbol(
+        [0x4BED8],
+        [0x204BED8],
+        None,
+        "CalcAndUpdateScriptVarWithOtherValue",
+        "Runs a calculation on a script variable, then sets the script variable to the calculation result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other value to use in the calculation\nr3: calculation to perform on the script variables",
+        None,
+    )
+
+    CalcAndUpdateScriptVarWithOtherScriptVar = Symbol(
+        [0x4BF10],
+        [0x204BF10],
+        None,
+        "CalcAndUpdateScriptVarWithOtherScriptVar",
+        "Runs a calculation on a script variable, then sets the script variable to the calculation result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the calculation\nr3: calculation to perform on the script variables",
+        None,
+    )
+
+    CompareScriptVariablesVeneer = Symbol(
+        [0x4BF5C],
+        [0x204BF5C],
+        None,
+        "CompareScriptVariablesVeneer",
+        "Likely a linker-generated veneer for CompareScriptVariables.\n\nSee https://developer.arm.com/documentation/dui0474/k/image-structure-and-generation/linker-generated-veneers/what-is-a-veneer-\n\nr0: script variable value 1\nr1: script variable value 2\nr2: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    LoadAndCompareScriptVarAndValue = Symbol(
+        [0x4BF68],
+        [0x204BF68],
+        None,
+        "LoadAndCompareScriptVarAndValue",
+        "Runs a comparison on a script variable and another value, then returns the comparison result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the comparison\nr3: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    LoadAndCompareScriptVars = Symbol(
+        [0x4BF88],
+        [0x204BF88],
+        None,
+        "LoadAndCompareScriptVars",
+        "Runs a comparison on two script variables, then returns the comparison result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the comparison\nr3: comparison to perform on the script variables\nreturn: comparison result",
         None,
     )
 
@@ -10094,15 +10157,33 @@ class NaArm9Data:
         "struct partner_talk_kind_table_entry[11]",
     )
 
-    EVENT_FLAG_PROG_POS_INFO = Symbol(
+    EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES = Symbol(
         [0x9CEAC],
         [0x209CEAC],
         0x8,
-        "EVENT_FLAG_PROG_POS_INFO",
+        "EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES",
         "Debug information used to log an error with an unrecognized operation in CalcScriptVariables.",
         "struct prog_pos_info",
     )
 
+    EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES = Symbol(
+        [0x9CEB4],
+        [0x209CEB4],
+        0x8,
+        "EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES",
+        "Debug information used to log an error with an unrecognized operation in CompareScriptVariables.",
+        "struct prog_pos_info",
+    )
+
+    EVENT_FLAG_FILE_NAME = Symbol(
+        [0x9CEBC],
+        [0x209CEBC],
+        0x10,
+        "EVENT_FLAG_FILE_NAME",
+        "The file name 'event_flag.c', used for debug logging.",
+        "",
+    )
+
     SCRIPT_VARS_LOCALS = Symbol(
         [0x9CECC],
         [0x209CECC],
@@ -10112,15 +10193,24 @@ class NaArm9Data:
         "struct script_local_var_table",
     )
 
-    EVENT_FLAG_EXPANSION_ERROR = Symbol(
+    EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR = Symbol(
         [0x9CF28],
         [0x209CF28],
         0x20,
-        "EVENT_FLAG_EXPANSION_ERROR",
+        "EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR",
         "Error log message for an unrecognized operation in CalcScriptVariables.",
         "",
     )
 
+    EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR = Symbol(
+        [0x9CF48],
+        [0x209CF48],
+        0x1C,
+        "EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR",
+        "Error log message for an unrecognized operation in CompareScriptVariables.",
+        "",
+    )
+
     SCRIPT_VARS = Symbol(
         [0x9D870],
         [0x209D870],
@@ -11625,6 +11715,14 @@ class NaArm9Data:
         "EXCLUSIVE_ITEM_ATTACK_BOOSTS", EXCLUSIVE_ITEM_STAT_BOOST_DATA
     )
 
+    EVENT_FLAG_PROG_POS_INFO = _Deprecated(
+        "EVENT_FLAG_PROG_POS_INFO", EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES
+    )
+
+    EVENT_FLAG_EXPANSION_ERROR = _Deprecated(
+        "EVENT_FLAG_EXPANSION_ERROR", EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR
+    )
+
     DIRECTORY_FILES_EXTRACTED = _Deprecated(
         "DIRECTORY_FILES_EXTRACTED", PACK_FILES_OPENED
     )

pmdsky_debug_py/na_itcm.py

@@ -6401,7 +6401,70 @@ class NaItcmArm9Functions:
         None,
         None,
         "CalcScriptVariables",
-        "Performs a calculation on two loaded script variables.\n\nr0: script variable 1\nr1: script variable 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        "Performs a calculation on two loaded script variables.\n\nr0: script variable value 1\nr1: script variable value 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        None,
+    )
+
+    CompareScriptVariables = Symbol(
+        None,
+        None,
+        None,
+        "CompareScriptVariables",
+        "Compares two loaded script variables and returns the comparison result.\n\nr0: script variable value 1\nr1: script variable value 2\nr2: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    CalcScriptVariablesVeneer = Symbol(
+        None,
+        None,
+        None,
+        "CalcScriptVariablesVeneer",
+        "Likely a linker-generated veneer for CalcScriptVariables.\n\nSee https://developer.arm.com/documentation/dui0474/k/image-structure-and-generation/linker-generated-veneers/what-is-a-veneer-\n\nr0: script variable value 1\nr1: script variable value 2\nr2: calculation to perform on the script variables\nreturn: calculation result",
+        None,
+    )
+
+    CalcAndUpdateScriptVarWithOtherValue = Symbol(
+        None,
+        None,
+        None,
+        "CalcAndUpdateScriptVarWithOtherValue",
+        "Runs a calculation on a script variable, then sets the script variable to the calculation result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other value to use in the calculation\nr3: calculation to perform on the script variables",
+        None,
+    )
+
+    CalcAndUpdateScriptVarWithOtherScriptVar = Symbol(
+        None,
+        None,
+        None,
+        "CalcAndUpdateScriptVarWithOtherScriptVar",
+        "Runs a calculation on a script variable, then sets the script variable to the calculation result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the calculation\nr3: calculation to perform on the script variables",
+        None,
+    )
+
+    CompareScriptVariablesVeneer = Symbol(
+        None,
+        None,
+        None,
+        "CompareScriptVariablesVeneer",
+        "Likely a linker-generated veneer for CompareScriptVariables.\n\nSee https://developer.arm.com/documentation/dui0474/k/image-structure-and-generation/linker-generated-veneers/what-is-a-veneer-\n\nr0: script variable value 1\nr1: script variable value 2\nr2: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    LoadAndCompareScriptVarAndValue = Symbol(
+        None,
+        None,
+        None,
+        "LoadAndCompareScriptVarAndValue",
+        "Runs a comparison on a script variable and another value, then returns the comparison result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the comparison\nr3: comparison to perform on the script variables\nreturn: comparison result",
+        None,
+    )
+
+    LoadAndCompareScriptVars = Symbol(
+        None,
+        None,
+        None,
+        "LoadAndCompareScriptVars",
+        "Runs a comparison on two script variables, then returns the comparison result.\n\nr0: pointer to the local variable table\nr1: script variable ID\nr2: other script variable to use in the comparison\nr3: comparison to perform on the script variables\nreturn: comparison result",
         None,
     )
 
@@ -10039,15 +10102,33 @@ class NaItcmArm9Data:
         "struct partner_talk_kind_table_entry[11]",
     )
 
-    EVENT_FLAG_PROG_POS_INFO = Symbol(
+    EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES = Symbol(
         None,
         None,
         None,
-        "EVENT_FLAG_PROG_POS_INFO",
+        "EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES",
         "Debug information used to log an error with an unrecognized operation in CalcScriptVariables.",
         "struct prog_pos_info",
     )
 
+    EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES = Symbol(
+        None,
+        None,
+        None,
+        "EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES",
+        "Debug information used to log an error with an unrecognized operation in CompareScriptVariables.",
+        "struct prog_pos_info",
+    )
+
+    EVENT_FLAG_FILE_NAME = Symbol(
+        None,
+        None,
+        None,
+        "EVENT_FLAG_FILE_NAME",
+        "The file name 'event_flag.c', used for debug logging.",
+        "",
+    )
+
     SCRIPT_VARS_LOCALS = Symbol(
         None,
         None,
@@ -10057,15 +10138,24 @@ class NaItcmArm9Data:
         "struct script_local_var_table",
     )
 
-    EVENT_FLAG_EXPANSION_ERROR = Symbol(
+    EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR = Symbol(
         None,
         None,
         None,
-        "EVENT_FLAG_EXPANSION_ERROR",
+        "EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR",
         "Error log message for an unrecognized operation in CalcScriptVariables.",
         "",
     )
 
+    EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR = Symbol(
+        None,
+        None,
+        None,
+        "EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR",
+        "Error log message for an unrecognized operation in CompareScriptVariables.",
+        "",
+    )
+
     SCRIPT_VARS = Symbol(
         None,
         None,
@@ -11559,6 +11649,14 @@ class NaItcmArm9Data:
         "EXCLUSIVE_ITEM_ATTACK_BOOSTS", EXCLUSIVE_ITEM_STAT_BOOST_DATA
     )
 
+    EVENT_FLAG_PROG_POS_INFO = _Deprecated(
+        "EVENT_FLAG_PROG_POS_INFO", EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES
+    )
+
+    EVENT_FLAG_EXPANSION_ERROR = _Deprecated(
+        "EVENT_FLAG_EXPANSION_ERROR", EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR
+    )
+
     DIRECTORY_FILES_EXTRACTED = _Deprecated(
         "DIRECTORY_FILES_EXTRACTED", PACK_FILES_OPENED
     )

pmdsky_debug_py/protocol.py

@@ -3627,6 +3627,41 @@ class Arm9FunctionsProtocol(Protocol):
         None,
     ]
 
+    CompareScriptVariables: Symbol[
+        Optional[list[int]],
+        None,
+    ]
+
+    CalcScriptVariablesVeneer: Symbol[
+        Optional[list[int]],
+        None,
+    ]
+
+    CalcAndUpdateScriptVarWithOtherValue: Symbol[
+        Optional[list[int]],
+        None,
+    ]
+
+    CalcAndUpdateScriptVarWithOtherScriptVar: Symbol[
+        Optional[list[int]],
+        None,
+    ]
+
+    CompareScriptVariablesVeneer: Symbol[
+        Optional[list[int]],
+        None,
+    ]
+
+    LoadAndCompareScriptVarAndValue: Symbol[
+        Optional[list[int]],
+        None,
+    ]
+
+    LoadAndCompareScriptVars: Symbol[
+        Optional[list[int]],
+        None,
+    ]
+
     EventFlagResume: Symbol[
         Optional[list[int]],
         None,
@@ -5650,7 +5685,17 @@ class Arm9DataProtocol(Protocol):
         Optional[int],
     ]
 
-    EVENT_FLAG_PROG_POS_INFO: Symbol[
+    EVENT_FLAG_PROG_POS_INFO_CALC_SCRIPT_VARIABLES: Symbol[
+        Optional[list[int]],
+        Optional[int],
+    ]
+
+    EVENT_FLAG_PROG_POS_INFO_COMPARE_SCRIPT_VARIABLES: Symbol[
+        Optional[list[int]],
+        Optional[int],
+    ]
+
+    EVENT_FLAG_FILE_NAME: Symbol[
         Optional[list[int]],
         Optional[int],
     ]
@@ -5660,7 +5705,12 @@ class Arm9DataProtocol(Protocol):
         Optional[int],
     ]
 
-    EVENT_FLAG_EXPANSION_ERROR: Symbol[
+    EVENT_FLAG_CALC_SCRIPT_VARIABLES_ERROR: Symbol[
+        Optional[list[int]],
+        Optional[int],
+    ]
+
+    EVENT_FLAG_COMPARE_SCRIPT_VARIABLES_ERROR: Symbol[
         Optional[list[int]],
         Optional[int],
     ]

{pmdsky_debug_py-10.2.19.dist-info → pmdsky_debug_py-10.2.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pmdsky-debug-py
-Version: 10.2.19
+Version: 10.2.20
 Summary: pmdsky-debug symbols for Python.
 Author-email: Marco 'Capypara' Köpcke <hello@capypara.de>
 License: MIT

pmdsky_debug_py-10.2.20.dist-info/RECORD

@@ -0,0 +1,14 @@
+pmdsky_debug_py/__init__.py,sha256=xvXjdxEqeoQaaS6ssZYVI9jARzv5M4q6FNwA3Z6fOw4,1831
+pmdsky_debug_py/_release.py,sha256=5nHJZZsSb5S6AzxHCleJY6TjqcXCAkK7Z-ZAidmLchM,31
+pmdsky_debug_py/eu.py,sha256=TSdbaQyW-p6_yI850ukLvc8wOm-KB01x3KTVHXDTJY4,1247510
+pmdsky_debug_py/eu_itcm.py,sha256=CuyLWhD-uN3g2zGnzhRmh0tqfthHHLOBGh90lCdeqoI,1192637
+pmdsky_debug_py/jp.py,sha256=KfTpjm2PJNZtXrAnPb7b1W0ghEhUbLcnMMdqPOQ9s7E,1244203
+pmdsky_debug_py/jp_itcm.py,sha256=BAe0laYb4XCn--NBSdU_kdRJxdt8swajG-qzGAXHDGA,1192637
+pmdsky_debug_py/na.py,sha256=YNzWNc-zDeC8X7VWcIJFubXwQW95v14Uau13aKJxwgQ,1248432
+pmdsky_debug_py/na_itcm.py,sha256=95jeoi3nsExvyfMzVdWy4ThhHC-xsXVEkcmIlkDtf3I,1192637
+pmdsky_debug_py/protocol.py,sha256=IlWRA7sot55s1dbWE4E8pxLt3Gg_o0b6OtYMm-7m4B4,363279
+pmdsky_debug_py/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pmdsky_debug_py-10.2.20.dist-info/METADATA,sha256=jEMGatZDYOkxbniXpN2-humDmK__dqwPvqngjm9tqbw,1376
+pmdsky_debug_py-10.2.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pmdsky_debug_py-10.2.20.dist-info/top_level.txt,sha256=cqvpcJbud2s8IyBAc1MfCySwniko_6qO5LWSSxNIoXI,16
+pmdsky_debug_py-10.2.20.dist-info/RECORD,,

pmdsky_debug_py-10.2.19.dist-info/RECORD

@@ -1,14 +0,0 @@
-pmdsky_debug_py/__init__.py,sha256=xvXjdxEqeoQaaS6ssZYVI9jARzv5M4q6FNwA3Z6fOw4,1831
-pmdsky_debug_py/_release.py,sha256=mtMWl1sZmSqjx5kWhtU7rhC8JlGsmzdpsKvi_cImakc,31
-pmdsky_debug_py/eu.py,sha256=5d5LqVZQoZv2ikSxaWiOuA-1Qx-K2kJpXBBsAugynjM,1243199
-pmdsky_debug_py/eu_itcm.py,sha256=n52SkZIyDHE-8u-Fxme7W3M_O7NxJE9jK-hyXb2SIbo,1188445
-pmdsky_debug_py/jp.py,sha256=uyQ5vDiOj5tQUAsGdlglCbL30Jvwe5sLIOeNl6eBmZs,1239892
-pmdsky_debug_py/jp_itcm.py,sha256=6t-ulDkDP4BLV4SpXYhVhE7Kh7DPez3AQjaLRUILHUU,1188445
-pmdsky_debug_py/na.py,sha256=67roLcv_zCtV7ork-0ri4QKb8Qi37O5kkgf25-mB0Wk,1244121
-pmdsky_debug_py/na_itcm.py,sha256=avtS0EEurhGeLKFIZHZ_MQY4TfKDkdsKDh9PCTVpIzo,1188445
-pmdsky_debug_py/protocol.py,sha256=Hefzz8M6ctRl4wLA9JwVK0qf3Xd8TOP2R1UgiybfWXI,362262
-pmdsky_debug_py/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pmdsky_debug_py-10.2.19.dist-info/METADATA,sha256=lTv8jSPcOmx24v7m6YBk8hxjkqDyGKeW1wX4ySfdG8c,1376
-pmdsky_debug_py-10.2.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pmdsky_debug_py-10.2.19.dist-info/top_level.txt,sha256=cqvpcJbud2s8IyBAc1MfCySwniko_6qO5LWSSxNIoXI,16
-pmdsky_debug_py-10.2.19.dist-info/RECORD,,