pmdsky-debug-py 10.0.49__py3-none-any.whl → 10.0.50__py3-none-any.whl

pmdsky_debug_py/jp.py

@@ -3662,8 +3662,8 @@ class JpArm9Functions:
     )
 
     CopyAndInterleaveWrapper = Symbol(
-        None,
-        None,
+        [0x1C048],
+        [0x201C048],
         None,
         "CopyAndInterleaveWrapper",
         "Calls CopyAndInterleave with the passed len divided by 2.\n\nr0: dst\nr1: src\nr2: len (in bytes, will be divided by 2 in the call to CopyAndInterleave)\nr3: val",
@@ -27987,8 +27987,8 @@ class JpOverlay29Functions:
     )
 
     LoadWeather3DFiles = Symbol(
-        None,
-        None,
+        [0x5C394],
+        [0x2339C74],
         None,
         "LoadWeather3DFiles",
         "Loads the 1001.wte, 1005.wte, and 1031.wte files in dungeon.bin, which are used for the 3D effects for the tileset weather as well as the Sandstorm/Fog weather conditions.\n\nNo params.",
@@ -27996,8 +27996,8 @@ class JpOverlay29Functions:
     )
 
     RenderWeather3D = Symbol(
-        None,
-        None,
+        [0x5C5A8],
+        [0x2339E88],
         None,
         "RenderWeather3D",
         "Renders the 3D effects for the tileset weather as well as the Sandstorm/Fog weather conditions.\n\nNo params.",
@@ -28023,8 +28023,8 @@ class JpOverlay29Functions:
     )
 
     FlashLeaderIcon = Symbol(
-        None,
-        None,
+        [0x5D508],
+        [0x233ADE8],
         None,
         "FlashLeaderIcon",
         "Seems to control flashing the leader's icon on the minimap when r0 = 0? Doesn't seem to ever be called when r0 = 1.\n\nr0: ?",
@@ -30149,6 +30149,15 @@ class JpOverlay29Data:
         "struct damage_negating_exclusive_eff_entry[28]",
     )
 
+    TWO_TURN_STATUSES = Symbol(
+        [0x76400],
+        [0x2353CE0],
+        0xB,
+        "TWO_TURN_STATUSES",
+        "Lists all status IDs that are for two-turn moves. The last entry is null.",
+        "struct status_two_turn_id_8[11]",
+    )
+
     TWO_TURN_MOVES_AND_STATUSES = Symbol(
         [0x7644C],
         [0x2353D2C],
@@ -31575,9 +31584,9 @@ class JpRamFunctions:
 class JpRamData:
 
     DEFAULT_MEMORY_ARENA_MEMORY = Symbol(
-        None,
-        None,
-        None,
+        [0xB6420],
+        [0x20B6420],
+        0x1E6400,
         "DEFAULT_MEMORY_ARENA_MEMORY",
         "The memory region for the default memory arena.\n\nThe length is defined by DEFAULT_MEMORY_ARENA_SIZE.\n\nOne mode that uses this region for heap allocations is dungeon mode.",
         "uint8_t[1991680]",
@@ -31674,18 +31683,18 @@ class JpRamData:
     )
 
     TOUCHSCREEN_STATUS = Symbol(
-        None,
-        None,
-        None,
+        [0x2A4E3C],
+        [0x22A4E3C],
+        0x104,
         "TOUCHSCREEN_STATUS",
         "Status of the touchscreen, including the coordinates of the currently pressed position in pixels.",
         "struct touchscreen_status",
     )
 
     BAG_ITEMS = Symbol(
-        None,
-        None,
-        None,
+        [0x2A5084],
+        [0x22A5084],
+        0x12C,
         "BAG_ITEMS",
         "Array of item structs within the player's bag.\n\nWhile the game only allows a maximum of 48 items during normal play, it seems to read up to 50 item slots if filled.\n\ntype: struct item[50]",
         "struct item[50]",
@@ -31786,18 +31795,36 @@ class JpRamData:
     )
 
     AUDIO_COMMANDS_BUFFER = Symbol(
-        None,
-        None,
-        None,
+        [0x2A64B0],
+        [0x22A64B0],
+        0x200,
         "AUDIO_COMMANDS_BUFFER",
         "Buffer used to store audio commands. 16 entries in total. Seems like entries are removed at some point (maybe after the commands are read or after they finish executing).",
         "struct audio_command[16]",
     )
 
-    CURSOR_16_SPRITE_ID = Symbol(
+    SOUND_MEMORY_ARENA_PTR = Symbol(
         None,
         None,
         None,
+        "SOUND_MEMORY_ARENA_PTR",
+        "Pointer to SOUND_MEMORY_ARENA.",
+        "struct mem_arena*",
+    )
+
+    WINDOW_LIST = Symbol(
+        [0x2AA0E8],
+        [0x22AA0E8],
+        0x1180,
+        "WINDOW_LIST",
+        "Array of all window structs. Newly created window structs are taken from slots in this array.\n\nNote that this array isn't strictly ordered in any way. A newly created window will occupy the first available slot. If a window in an early slot is destroyed, windows that are still active in later slots won't be shifted back unless destroyed and recreated.\n\ntype: struct window_list",
+        "struct window_list",
+    )
+
+    CURSOR_16_SPRITE_ID = Symbol(
+        [0x2AC470],
+        [0x22AC470],
+        0x2,
         "CURSOR_16_SPRITE_ID",
         "Id of the 'FONT/cursor_16.wan' sprite loaded in WAN_TABLE",
         "uint16_t",
@@ -31813,63 +31840,45 @@ class JpRamData:
     )
 
     CURSOR_ANIMATION_CONTROL = Symbol(
-        None,
-        None,
-        None,
+        [0x2AC48C],
+        [0x22AC48C],
+        0x7C,
         "CURSOR_ANIMATION_CONTROL",
         "animation_control of 'FONT/cursor.wan'",
         "struct animation_control*",
     )
 
     CURSOR_16_ANIMATION_CONTROL = Symbol(
-        None,
-        None,
-        None,
+        [0x2AC508],
+        [0x22AC508],
+        0x7C,
         "CURSOR_16_ANIMATION_CONTROL",
         "animation_control of 'FONT/cursor_16.wan'",
         "struct animation_control*",
     )
 
     ALERT_SPRITE_ID = Symbol(
-        None,
-        None,
-        None,
+        [0x2AC584],
+        [0x22AC584],
+        0x2,
         "ALERT_SPRITE_ID",
         "Id of the 'FONT/alert.wan' sprite loaded in WAN_TABLE",
         "uint16_t",
     )
 
     ALERT_ANIMATION_CONTROL = Symbol(
-        None,
-        None,
-        None,
+        [0x2AC588],
+        [0x22AC588],
+        0x7C,
         "ALERT_ANIMATION_CONTROL",
         "animation_control of 'FONT/alter.wan'",
         "struct animation_control*",
     )
 
-    SOUND_MEMORY_ARENA_PTR = Symbol(
-        None,
-        None,
-        None,
-        "SOUND_MEMORY_ARENA_PTR",
-        "Pointer to SOUND_MEMORY_ARENA.",
-        "struct mem_arena*",
-    )
-
-    WINDOW_LIST = Symbol(
-        None,
-        None,
-        None,
-        "WINDOW_LIST",
-        "Array of all window structs. Newly created window structs are taken from slots in this array.\n\nNote that this array isn't strictly ordered in any way. A newly created window will occupy the first available slot. If a window in an early slot is destroyed, windows that are still active in later slots won't be shifted back unless destroyed and recreated.\n\ntype: struct window_list",
-        "struct window_list",
-    )
-
     LAST_NEW_MOVE = Symbol(
-        None,
-        None,
-        None,
+        [0x2AC658],
+        [0x22AC658],
+        0x8,
         "LAST_NEW_MOVE",
         "Move struct of the last new move introduced when learning a new move. Persists even after the move selection is made in the menu.\n\ntype: struct move",
         "struct move",
@@ -31903,18 +31912,18 @@ class JpRamData:
     )
 
     KAOMADO_STREAM = Symbol(
-        None,
-        None,
-        None,
+        [0x2ACC6C],
+        [0x22ACC6C],
+        0x48,
         "KAOMADO_STREAM",
         "The file stream utilized for all Kaomado portrait loads.\n\ntype: struct file_stream",
         "struct file_stream",
     )
 
     PENDING_DUNGEON_ID = Symbol(
-        None,
-        None,
-        None,
+        [0x2ACCB8],
+        [0x22ACCB8],
+        0x1,
         "PENDING_DUNGEON_ID",
         "The ID of the selected dungeon when setting off from the overworld.\n\nControls the text and map location during the 'map cutscene' just before entering a dungeon, as well as the actual dungeon loaded afterwards.\n\nThis field is actually part of a larger struct that also contains PENDING_STARTING_FLOOR.\n\ntype: struct dungeon_id_8",
         "struct dungeon_id_8",
@@ -31930,9 +31939,9 @@ class JpRamData:
     )
 
     PLAY_TIME_SECONDS = Symbol(
-        None,
-        None,
-        None,
+        [0x2ACE50],
+        [0x22ACE50],
+        0x4,
         "PLAY_TIME_SECONDS",
         "The player's total play time in seconds.",
         "uint32_t",
@@ -31948,27 +31957,27 @@ class JpRamData:
     )
 
     TEAM_NAME = Symbol(
-        None,
-        None,
-        None,
+        [0x2AD0D4],
+        [0x22AD0D4],
+        0x5,
         "TEAM_NAME",
-        "The team name.\n\nA null-terminated string, with a maximum length of 10. Presumably encoded with the ANSI/Shift JIS encoding the game typically uses.\n\nThis is presumably part of a larger struct, together with other nearby data.",
-        "char[10]",
+        "The team name.\n\nA null-terminated string, with a maximum length of 10 (or 5 in JP). Presumably encoded with the ANSI/Shift JIS encoding the game typically uses.\n\nThis is presumably part of a larger struct, together with other nearby data.",
+        "",
     )
 
     LEVEL_UP_DATA_MONSTER_ID = Symbol(
-        None,
-        None,
-        None,
+        [0x2AD0E4],
+        [0x22AD0E4],
+        0x2,
         "LEVEL_UP_DATA_MONSTER_ID",
         "ID of the monster whose level-up data is currently stored in LEVEL_UP_DATA_DECOMPRESS_BUFFER.",
         "struct monster_id_16",
     )
 
     LEVEL_UP_DATA_DECOMPRESS_BUFFER = Symbol(
-        None,
-        None,
-        None,
+        [0x2AD0E8],
+        [0x22AD0E8],
+        0x4B0,
         "LEVEL_UP_DATA_DECOMPRESS_BUFFER",
         "Buffer used to stored a monster's decompressed level up data. Used by GetLvlUpEntry.\n\nExact size is a guess (100 levels * 12 bytes per entry = 1200 = 0x4B0).",
         "struct level_up_entry[100]",
@@ -32007,8 +32016,8 @@ class JpRamData:
     CLR_IMG = Symbol([0x2BAD7C], [0x22BAD7C], None, "CLR_IMG", "", "undefined4")
 
     THREAD_INFO_STRUCT = Symbol(
-        None,
-        None,
+        [0x2BAE00],
+        [0x22BAE00],
         None,
         "THREAD_INFO_STRUCT",
         "thread_info struct that contains global state about threads",
@@ -32043,18 +32052,18 @@ class JpRamData:
     )
 
     LOCK_NOTIFY_ARRAY = Symbol(
-        None,
-        None,
-        None,
+        [0x326414],
+        [0x2326414],
+        0x18,
         "LOCK_NOTIFY_ARRAY",
-        "Used to notify scripts waiting for a certain lock to unlock so they can resume their execution.\n\n1 byte per lock. Exact size isn't confirmed, it could potentially be longer.",
+        "Used to notify scripts waiting for a certain lock to unlock so they can resume their execution.\n\n1 byte per lock.",
         "bool[20]",
     )
 
     GROUND_MEMORY_ARENA_1 = Symbol(
-        None,
-        None,
-        None,
+        [0x326520],
+        [0x2326520],
+        0x1C,
         "GROUND_MEMORY_ARENA_1",
         "This is a top-level memory arena used for some things in ground mode.\n\nIt's used for user_flags 8, 15, and 16.\n\nIncluding the allocator metadata, this arena occupies 0x64000 bytes of space.\n\ntype: struct mem_arena",
         "struct mem_arena",
@@ -32092,117 +32101,117 @@ class JpRamData:
     )
 
     LOADED_ATTACK_SPRITE_DATA = Symbol(
-        None,
-        None,
-        None,
+        [0x37DC2C],
+        [0x237DC2C],
+        0x4,
         "LOADED_ATTACK_SPRITE_DATA",
         "[Runtime] Pointer to the dynamically allocated structure relating to the currently loaded attack sprite, in dungeon mode.\n\ntype: struct loaded_attack_sprite_data*",
         "struct loaded_attack_sprite_data*",
     )
 
     AI_THROWN_ITEM_DIRECTION_IS_USED = Symbol(
-        None,
-        None,
-        None,
+        [0x37DC50],
+        [0x237DC50],
+        0x8,
         "AI_THROWN_ITEM_DIRECTION_IS_USED",
         "[Runtime] Used in GetPossibleAiThrownItemDirections to indicate whether a certain direction enum value is already being used or not.",
         "bool[8]",
     )
 
-    AI_THROWN_ITEM_DIRECTIONS = Symbol(
-        None,
-        None,
-        None,
-        "AI_THROWN_ITEM_DIRECTIONS",
-        "[Runtime] Used to store the directions output by GetPossibleAiThrownItemDirections.",
-        "uint32_t[8]",
-    )
-
     AI_THROWN_ITEM_PROBABILITIES = Symbol(
-        None,
-        None,
-        None,
+        [0x37DC58],
+        [0x237DC58],
+        0x20,
         "AI_THROWN_ITEM_PROBABILITIES",
         "[Runtime] Used to store the probabilities matching the directions in THROWN_ITEM_DIRECTIONS.",
         "uint32_t[8]",
     )
 
+    AI_THROWN_ITEM_DIRECTIONS = Symbol(
+        [0x37DC78],
+        [0x237DC78],
+        0x20,
+        "AI_THROWN_ITEM_DIRECTIONS",
+        "[Runtime] Used to store the directions output by GetPossibleAiThrownItemDirections.",
+        "uint32_t[8]",
+    )
+
     ROLLOUT_ICE_BALL_MISSED = Symbol(
-        None,
-        None,
-        None,
+        [0x37DCE9],
+        [0x237DCE9],
+        0x1,
         "ROLLOUT_ICE_BALL_MISSED",
         "[Runtime] Appears to be set to true whenever a hit from Rollout or Ice Ball fails to deal damage.",
         "bool",
     )
 
     MULTIHIT_FATIGUE_MOVE_USED = Symbol(
-        None,
-        None,
-        None,
+        [0x37DCEA],
+        [0x237DCEA],
+        0x1,
         "MULTIHIT_FATIGUE_MOVE_USED",
         "[Runtime] Appears to be set to true whenever a multihit fatigue move deals damage.",
         "bool",
     )
 
     TWINEEDLE_HIT_TRACKER = Symbol(
-        None,
-        None,
-        None,
+        [0x37DCEB],
+        [0x237DCEB],
+        0x1,
         "TWINEEDLE_HIT_TRACKER",
         "[Runtime] Appears to be set to true whenever Twineedle hits and deals damage. So that even if the second attack misses, it will still try to poison the target.",
         "bool",
     )
 
     RAPID_SPIN_BINDING_REMOVAL = Symbol(
-        None,
-        None,
-        None,
+        [0x37DCED],
+        [0x237DCED],
+        0x1,
         "RAPID_SPIN_BINDING_REMOVAL",
         "[Runtime] Appears to be set to true when using Rapid Spin to later remove any binding effects and Leech Seed.",
         "bool",
     )
 
     ROLLOUT_ICE_BALL_SUCCESSIVE_HITS = Symbol(
-        None,
-        None,
-        None,
+        [0x37DCF0],
+        [0x237DCF0],
+        0x4,
         "ROLLOUT_ICE_BALL_SUCCESSIVE_HITS",
         "[Runtime] Seems to count the number of successive hits by Rollout or Ice Ball.",
         "int",
     )
 
     MULTIHIT_MOVE_SUCCESSIVE_HITS = Symbol(
-        None,
-        None,
-        None,
+        [0x37DCF8],
+        [0x237DCF8],
+        0x4,
         "MULTIHIT_MOVE_SUCCESSIVE_HITS",
         "[Runtime] Seems to count the number of successive hits for multihit moves. This is used by Twineedle to check to attempt to apply Poison after the second attack.",
         "int",
     )
 
     TRIPLE_KICK_SUCCESSIVE_HITS = Symbol(
-        None,
-        None,
-        None,
+        [0x37DCFC],
+        [0x237DCFC],
+        0x4,
         "TRIPLE_KICK_SUCCESSIVE_HITS",
         "[Runtime] Seems to count the number of successive hits by Triple Kick.",
         "int",
     )
 
     METRONOME_NEXT_INDEX = Symbol(
-        None,
-        None,
-        None,
+        [0x37DD08],
+        [0x237DD08],
+        0x4,
         "METRONOME_NEXT_INDEX",
         "[Runtime] The index into METRONOME_TABLE for the next usage of Metronome.",
         "int",
     )
 
     FLOOR_GENERATION_STATUS = Symbol(
-        None,
-        None,
-        None,
+        [0x37E23C],
+        [0x237E23C],
+        0x40,
         "FLOOR_GENERATION_STATUS",
         "[Runtime] Status data related to generation of the current floor in a dungeon.\n\nThis data is populated as the dungeon floor is generated.\n\ntype: struct floor_generation_status",
         "struct floor_generation_status",

pmdsky_debug_py/jp_itcm.py

@@ -29578,6 +29578,15 @@ class JpItcmOverlay29Data:
         "struct damage_negating_exclusive_eff_entry[28]",
     )
 
+    TWO_TURN_STATUSES = Symbol(
+        None,
+        None,
+        None,
+        "TWO_TURN_STATUSES",
+        "Lists all status IDs that are for two-turn moves. The last entry is null.",
+        "struct status_two_turn_id_8[11]",
+    )
+
     TWO_TURN_MOVES_AND_STATUSES = Symbol(
         None,
         None,
@@ -31188,6 +31197,24 @@ class JpItcmRamData:
         "struct audio_command[16]",
     )
 
+    SOUND_MEMORY_ARENA_PTR = Symbol(
+        None,
+        None,
+        None,
+        "SOUND_MEMORY_ARENA_PTR",
+        "Pointer to SOUND_MEMORY_ARENA.",
+        "struct mem_arena*",
+    )
+
+    WINDOW_LIST = Symbol(
+        None,
+        None,
+        None,
+        "WINDOW_LIST",
+        "Array of all window structs. Newly created window structs are taken from slots in this array.\n\nNote that this array isn't strictly ordered in any way. A newly created window will occupy the first available slot. If a window in an early slot is destroyed, windows that are still active in later slots won't be shifted back unless destroyed and recreated.\n\ntype: struct window_list",
+        "struct window_list",
+    )
+
     CURSOR_16_SPRITE_ID = Symbol(
         None,
         None,
@@ -31242,24 +31269,6 @@ class JpItcmRamData:
         "struct animation_control*",
     )
 
-    SOUND_MEMORY_ARENA_PTR = Symbol(
-        None,
-        None,
-        None,
-        "SOUND_MEMORY_ARENA_PTR",
-        "Pointer to SOUND_MEMORY_ARENA.",
-        "struct mem_arena*",
-    )
-
-    WINDOW_LIST = Symbol(
-        None,
-        None,
-        None,
-        "WINDOW_LIST",
-        "Array of all window structs. Newly created window structs are taken from slots in this array.\n\nNote that this array isn't strictly ordered in any way. A newly created window will occupy the first available slot. If a window in an early slot is destroyed, windows that are still active in later slots won't be shifted back unless destroyed and recreated.\n\ntype: struct window_list",
-        "struct window_list",
-    )
-
     LAST_NEW_MOVE = Symbol(
         None,
         None,
@@ -31346,8 +31355,8 @@ class JpItcmRamData:
         None,
         None,
         "TEAM_NAME",
-        "The team name.\n\nA null-terminated string, with a maximum length of 10. Presumably encoded with the ANSI/Shift JIS encoding the game typically uses.\n\nThis is presumably part of a larger struct, together with other nearby data.",
-        "char[10]",
+        "The team name.\n\nA null-terminated string, with a maximum length of 10 (or 5 in JP). Presumably encoded with the ANSI/Shift JIS encoding the game typically uses.\n\nThis is presumably part of a larger struct, together with other nearby data.",
+        "",
     )
 
     LEVEL_UP_DATA_MONSTER_ID = Symbol(
@@ -31437,7 +31446,7 @@ class JpItcmRamData:
         None,
         None,
         "LOCK_NOTIFY_ARRAY",
-        "Used to notify scripts waiting for a certain lock to unlock so they can resume their execution.\n\n1 byte per lock. Exact size isn't confirmed, it could potentially be longer.",
+        "Used to notify scripts waiting for a certain lock to unlock so they can resume their execution.\n\n1 byte per lock.",
         "bool[20]",
     )
 
@@ -31499,21 +31508,21 @@ class JpItcmRamData:
         "bool[8]",
     )
 
-    AI_THROWN_ITEM_DIRECTIONS = Symbol(
+    AI_THROWN_ITEM_PROBABILITIES = Symbol(
         None,
         None,
         None,
-        "AI_THROWN_ITEM_DIRECTIONS",
-        "[Runtime] Used to store the directions output by GetPossibleAiThrownItemDirections.",
+        "AI_THROWN_ITEM_PROBABILITIES",
+        "[Runtime] Used to store the probabilities matching the directions in THROWN_ITEM_DIRECTIONS.",
         "uint32_t[8]",
     )
 
-    AI_THROWN_ITEM_PROBABILITIES = Symbol(
+    AI_THROWN_ITEM_DIRECTIONS = Symbol(
         None,
         None,
         None,
-        "AI_THROWN_ITEM_PROBABILITIES",
-        "[Runtime] Used to store the probabilities matching the directions in THROWN_ITEM_DIRECTIONS.",
+        "AI_THROWN_ITEM_DIRECTIONS",
+        "[Runtime] Used to store the directions output by GetPossibleAiThrownItemDirections.",
         "uint32_t[8]",
     )