smrpgpatchbuilder 5.0.1__tar.gz → 5.0.3__tar.gz

{smrpgpatchbuilder-5.0.1/src/smrpgpatchbuilder.egg-info → smrpgpatchbuilder-5.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smrpgpatchbuilder
-Version: 5.0.1
+Version: 5.0.3
 Summary: Patchable base class support for some SMRPG concepts similar to their definitions in Lazy Shell
 Author-email: pidgezero_one <s.kischak@gmail.com>
 License-Expression: MIT

{smrpgpatchbuilder-5.0.1 → smrpgpatchbuilder-5.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "smrpgpatchbuilder"
-version = "5.0.1"
+version = "5.0.3"
 authors = [
   { name="pidgezero_one", email="s.kischak@gmail.com" },
 ]

{smrpgpatchbuilder-5.0.1 → smrpgpatchbuilder-5.0.3}/src/smrpgpatchbuilder/datatypes/levels/room_collection.py

@@ -335,7 +335,10 @@ class RoomCollection:
         # We need ALL signatures here because a signature might appear in a clone group in one room
         # but as a standalone object in another room
         global_fallback_mapping = {}
-        for sig in sorted(all_signatures, key=lambda t: tuple((0,) if x is None else (1, x) for x in t)):
+        for sig in sorted(
+            all_signatures,
+            key=lambda t: tuple((0,) if x is None else (1, x) for x in t),
+        ):
             # Check if this signature was placed via force_id
             if sig in sig_to_forced_index:
                 global_fallback_mapping[sig] = sig_to_forced_index[sig]
@@ -586,12 +589,6 @@ class RoomCollection:
         for idx, npc in enumerate(unique_npcs):
             offset = npc_start + (idx * 7)
             patches[offset] = self._render_npc(npc)
-            # Debug: find NPCs with dimensions 5/5/10 or 3/3/11
-            if (npc.acute_axis == 5 and npc.obtuse_axis == 5 and npc.height == 10) or \
-               (npc.acute_axis == 3 and npc.obtuse_axis == 3 and npc.height == 11):
-                import sys
-                print(f"DEBUG NPC table idx {idx}: sprite_id={npc.sprite_id}, dims={npc.acute_axis}/{npc.obtuse_axis}/{npc.height}")
-                sys.stdout.flush()
 
         # Fill remaining NPC slots with 0xFF
         # End address depends on whether we're using large partition table
@@ -837,20 +834,6 @@ class RoomCollection:
 
         npc_index = sig_to_index[obj_sig]
 
-        # Debug: trace room 325 NPC 3
-        if room_idx == 325 and obj_idx == 3:
-            import sys
-            print(f"DEBUG Room 325 NPC 3:")
-            print(f"  obj._npc sprite_id: {obj._npc.sprite_id}")
-            print(f"  obj._npc dimensions: {obj._npc.acute_axis}/{obj._npc.obtuse_axis}/{obj._npc.height}")
-            print(f"  room_obj override acute_axis: {obj.acute_axis}")
-            print(f"  room_obj override obtuse_axis: {obj.obtuse_axis}")
-            print(f"  room_obj override height: {obj.height}")
-            print(f"  signature (first 10 elements): {obj_sig[:10]}")
-            print(f"  signature override portion (elements 21-26): {obj_sig[21:27] if len(obj_sig) > 26 else 'N/A'}")
-            print(f"  npc_index from lookup: {npc_index}")
-            sys.stdout.flush()
-
         if isinstance(obj, Clone):
             # Clone: 4 bytes
             # Follows disassembler lines 744-784

{smrpgpatchbuilder-5.0.1 → smrpgpatchbuilder-5.0.3}/src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/types/packet.py

@@ -1,5 +1,3 @@
-
-
 from smrpgpatchbuilder.datatypes.numbers.classes import UInt8, UInt16
 
 # Constants to avoid circular imports
@@ -20,7 +18,7 @@ class Packet:
 
     Structure (5 bytes total at 0x1DB000 + packet_id * 5):
     - Byte 0: sprite (bits 0-5), b0 (bits 6-7)
-    - Byte 1: b1a (bits 0-2), b1b (bits 3-4), b1c (bits 5-7)
+    - Byte 1: vram_size (bits 0-2), sprite_priority (bits 3-4), layer_priority (bits 5-7)
     - Byte 2: bits 0-1 unused, b2b2 (bit 2), b2b3 (bit 3), b2b4 (bit 4), show_shadow (bit 5), b2 (bits 6-7)
     - Bytes 3-4: action_script_id (bits 0-9), b4 (byte 4 bits 4-7)
 
@@ -30,9 +28,9 @@ class Packet:
     _packet_id: UInt8 = UInt8(0)
     _sprite_id: UInt16 = UInt16(PACKET_SPRITE_BASE)  # Sprite ID (any valid sprite)
     _b0: UInt8 = UInt8(0)  # B0,b6-7: bits 6-7 of byte 0 (0-3)
-    _b1a: UInt8 = UInt8(0)  # B1,b0-2: bits 0-2 of byte 1 (0-7)
-    _b1b: UInt8 = UInt8(0)  # B1,b3-4: bits 3-4 of byte 1 (0-3)
-    _b1c: UInt8 = UInt8(0)  # B1,b5-7: bits 5-7 of byte 1 (0-7)
+    _vram_size: UInt8 = UInt8(0)  # B1,b0-2: bits 0-2 of byte 1 (0-7)
+    _sprite_priority: UInt8 = UInt8(0)  # B1,b3-4: bits 3-4 of byte 1 (0-3)
+    _layer_priority: UInt8 = UInt8(0)  # B1,b5-7: bits 5-7 of byte 1 (0-7)
     _b2b2: bool = False  # B2,b2: bit 2 of byte 2
     _b2b3: bool = False  # B2,b3: bit 3 of byte 2
     _b2b4: bool = False  # B2,b4: bit 4 of byte 2
@@ -55,8 +53,9 @@ class Packet:
         """Set the sprite ID for the packet.
         Any valid sprite ID (0-1023) is accepted. During render(), only the
         lower 6 bits are used, so sprites are effectively grouped in ranges of 64."""
-        assert 0 <= sprite_id < TOTAL_SPRITES, \
-            f"sprite_id must be 0-{TOTAL_SPRITES-1}, got {sprite_id}"
+        assert (
+            0 <= sprite_id < TOTAL_SPRITES
+        ), f"sprite_id must be 0-{TOTAL_SPRITES-1}, got {sprite_id}"
         self._sprite_id = UInt16(sprite_id)
 
     @property
@@ -70,34 +69,38 @@ class Packet:
         self._b0 = UInt8(b0)
 
     @property
-    def b1a(self) -> UInt8:
+    def vram_size(self) -> UInt8:
         """B1,b0-2: bits 0-2 of byte 1 (0-7)."""
-        return self._b1a
+        return self._vram_size
 
-    def _set_b1a(self, b1a: int) -> None:
+    def _set_vram_size(self, vram_size: int) -> None:
         """Set B1,b0-2 (0-7)."""
-        assert 0 <= b1a <= 7, f"b1a must be 0-7, got {b1a}"
-        self._b1a = UInt8(b1a)
+        assert 0 <= vram_size <= 7, f"vram_size must be 0-7, got {vram_size}"
+        self._vram_size = UInt8(vram_size)
 
     @property
-    def b1b(self) -> UInt8:
+    def sprite_priority(self) -> UInt8:
         """B1,b3-4: bits 3-4 of byte 1 (0-3)."""
-        return self._b1b
+        return self._sprite_priority
 
-    def _set_b1b(self, b1b: int) -> None:
+    def _set_sprite_priority(self, sprite_priority: int) -> None:
         """Set B1,b3-4 (0-3)."""
-        assert 0 <= b1b <= 3, f"b1b must be 0-3, got {b1b}"
-        self._b1b = UInt8(b1b)
+        assert (
+            0 <= sprite_priority <= 3
+        ), f"sprite_priority must be 0-3, got {sprite_priority}"
+        self._sprite_priority = UInt8(sprite_priority)
 
     @property
-    def b1c(self) -> UInt8:
+    def layer_priority(self) -> UInt8:
         """B1,b5-7: bits 5-7 of byte 1 (0-7)."""
-        return self._b1c
+        return self._layer_priority
 
-    def _set_b1c(self, b1c: int) -> None:
+    def _set_layer_priority(self, layer_priority: int) -> None:
         """Set B1,b5-7 (0-7)."""
-        assert 0 <= b1c <= 7, f"b1c must be 0-7, got {b1c}"
-        self._b1c = UInt8(b1c)
+        assert (
+            0 <= layer_priority <= 7
+        ), f"layer_priority must be 0-7, got {layer_priority}"
+        self._layer_priority = UInt8(layer_priority)
 
     @property
     def b2b2(self) -> bool:
@@ -153,8 +156,9 @@ class Packet:
     def _set_action_script_id(self, action_script_id: int) -> None:
         """Set the action script for this packet to run when spawned.
         It is recommended to use action script ID constant names for this."""
-        assert 0 <= action_script_id <= 1023, \
-            f"action_script_id must be 0-1023, got {action_script_id}"
+        assert (
+            0 <= action_script_id <= 1023
+        ), f"action_script_id must be 0-1023, got {action_script_id}"
         self._action_script_id = UInt16(action_script_id)
 
     @property
@@ -173,9 +177,9 @@ class Packet:
         sprite_id: int = PACKET_SPRITE_BASE,
         action_script_id: int = 0,
         b0: int = 0,
-        b1a: int = 0,
-        b1b: int = 0,
-        b1c: int = 0,
+        vram_size: int = 0,
+        sprite_priority: int = 0,
+        layer_priority: int = 0,
         b2b2: bool = False,
         b2b3: bool = False,
         b2b4: bool = False,
@@ -187,9 +191,9 @@ class Packet:
         self._set_sprite_id(sprite_id)
         self._set_action_script_id(action_script_id)
         self._set_b0(b0)
-        self._set_b1a(b1a)
-        self._set_b1b(b1b)
-        self._set_b1c(b1c)
+        self._set_vram_size(vram_size)
+        self._set_sprite_priority(sprite_priority)
+        self._set_layer_priority(layer_priority)
         self._set_b2b2(b2b2)
         self._set_b2b3(b2b3)
         self._set_b2b4(b2b4)
@@ -202,7 +206,7 @@ class Packet:
 
         Structure:
         - Byte 0: sprite offset (bits 0-5) | b0 (bits 6-7)
-        - Byte 1: b1a (bits 0-2) | b1b (bits 3-4) | b1c (bits 5-7)
+        - Byte 1: vram_size (bits 0-2) | sprite_priority (bits 3-4) | layer_priority (bits 5-7)
         - Byte 2: b2b2 (bit 2) | b2b3 (bit 3) | b2b4 (bit 4) | show_shadow (bit 5) | b2 (bits 6-7)
         - Byte 3: action_script_id low byte
         - Byte 4: action_script_id high bits (bits 0-1) | b4 (bits 4-7)
@@ -214,16 +218,20 @@ class Packet:
         sprite_offset = self.sprite_id & 0x3F
         output[0] = sprite_offset | (self.b0 << 6)
 
-        # Byte 1: b1a (bits 0-2), b1b (bits 3-4), b1c (bits 5-7)
-        output[1] = (self.b1a & 0x07) | ((self.b1b & 0x03) << 3) | ((self.b1c & 0x07) << 5)
+        # Byte 1: vram_size (bits 0-2), sprite_priority (bits 3-4), layer_priority (bits 5-7)
+        output[1] = (
+            (self.vram_size & 0x07)
+            | ((self.sprite_priority & 0x03) << 3)
+            | ((self.layer_priority & 0x07) << 5)
+        )
 
         # Byte 2: b2b2 (bit 2), b2b3 (bit 3), b2b4 (bit 4), show_shadow (bit 5), b2 (bits 6-7)
         output[2] = (
-            ((1 if self.b2b2 else 0) << 2) |
-            ((1 if self.b2b3 else 0) << 3) |
-            ((1 if self.b2b4 else 0) << 4) |
-            ((1 if self.show_shadow else 0) << 5) |
-            ((self.b2 & 0x03) << 6)
+            ((1 if self.b2b2 else 0) << 2)
+            | ((1 if self.b2b3 else 0) << 3)
+            | ((1 if self.b2b4 else 0) << 4)
+            | ((1 if self.show_shadow else 0) << 5)
+            | ((self.b2 & 0x03) << 6)
         )
 
         # Byte 3: action_script_id low 8 bits

{smrpgpatchbuilder-5.0.1 → smrpgpatchbuilder-5.0.3}/src/smrpgpatchbuilder/management/commands/animationdisassembler.py

@@ -1098,7 +1098,7 @@ class Command(BaseCommand):
                         cls = "SetAMEM8BitToConst"
                         args["value"] = str(shortify(cmd, 2))
                     elif byte2 == 0x10:
-                        cls = "SetAMEM8BitTo7E1x"
+                        cls = "SetAMEM8BitToAbsolute7E"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "SetAMEM8BitTo7F"
@@ -1134,7 +1134,7 @@ class Command(BaseCommand):
                         cls = "SetAMEM16BitToConst"
                         args["value"] = str(shortify(cmd, 2))
                     elif byte2 == 0x10:
-                        cls = "SetAMEM16BitTo7E1x"
+                        cls = "SetAMEM16BitToAbsolute7E"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "SetAMEM16BitTo7F"
@@ -1166,7 +1166,7 @@ class Command(BaseCommand):
                         raise Exception("invalid amem shift type: %r" % command)
                 elif opcode == 0x22:
                     if byte2 == 0x10:
-                        cls = "Set7E1xToAMEM8Bit"
+                        cls = "SetAbsolute7EToAMEM8Bit"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "Set7FToAMEM8Bit"
@@ -1199,7 +1199,7 @@ class Command(BaseCommand):
                     args["amem"] = f"0x{((cmd[1] & 0x0F) + 0x60):02X}"
                 elif opcode == 0x23:
                     if byte2 == 0x10:
-                        cls = "Set7E1xToAMEM16Bit"
+                        cls = "SetAbsolute7EToAMEM16Bit"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "Set7FToAMEM16Bit"
@@ -1236,7 +1236,7 @@ class Command(BaseCommand):
                         cls = "JmpIfAMEM8BitEqualsConst"
                         args["value"] = str(shortify(cmd, 2))
                     elif byte2 == 0x10:
-                        cls = "JmpIfAMEM8BitEquals7E1x"
+                        cls = "JmpIfAMEM8BitEqualsAbsolute7E"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "JmpIfAMEM8BitEquals7F"
@@ -1271,7 +1271,7 @@ class Command(BaseCommand):
                         cls = "JmpIfAMEM16BitEqualsConst"
                         args["value"] = str(shortify(cmd, 2))
                     elif byte2 == 0x10:
-                        cls = "JmpIfAMEM16BitEquals7E1x"
+                        cls = "JmpIfAMEM16BitEqualsAbsolute7E"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "JmpIfAMEM16BitEquals7F"
@@ -1308,7 +1308,7 @@ class Command(BaseCommand):
                         cls = "JmpIfAMEM8BitNotEqualsConst"
                         args["value"] = str(shortify(cmd, 2))
                     elif byte2 == 0x10:
-                        cls = "JmpIfAMEM8BitNotEquals7E1x"
+                        cls = "JmpIfAMEM8BitNotEqualsAbsolute7E"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "JmpIfAMEM8BitNotEquals7F"
@@ -1345,7 +1345,7 @@ class Command(BaseCommand):
                         cls = "JmpIfAMEM16BitNotEqualsConst"
                         args["value"] = str(shortify(cmd, 2))
                     elif byte2 == 0x10:
-                        cls = "JmpIfAMEM16BitNotEquals7E1x"
+                        cls = "JmpIfAMEM16BitNotEqualsAbsolute7E"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "JmpIfAMEM16BitNotEquals7F"
@@ -1382,7 +1382,7 @@ class Command(BaseCommand):
                         cls = "JmpIfAMEM8BitLessThanConst"
                         args["value"] = str(shortify(cmd, 2))
                     elif byte2 == 0x10:
-                        cls = "JmpIfAMEM8BitLessThan7E1x"
+                        cls = "JmpIfAMEM8BitLessThanAbsolute7E"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "JmpIfAMEM8BitLessThan7F"
@@ -1419,7 +1419,7 @@ class Command(BaseCommand):
                         cls = "JmpIfAMEM16BitLessThanConst"
                         args["value"] = str(shortify(cmd, 2))
                     elif byte2 == 0x10:
-                        cls = "JmpIfAMEM16BitLessThan7E1x"
+                        cls = "JmpIfAMEM16BitLessThanAbsolute7E"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "JmpIfAMEM16BitLessThan7F"
@@ -1456,7 +1456,7 @@ class Command(BaseCommand):
                         cls = "JmpIfAMEM8BitGreaterOrEqualThanConst"
                         args["value"] = str(shortify(cmd, 2))
                     elif byte2 == 0x10:
-                        cls = "JmpIfAMEM8BitGreaterOrEqualThan7E1x"
+                        cls = "JmpIfAMEM8BitGreaterOrEqualThanAbsolute7E"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "JmpIfAMEM8BitGreaterOrEqualThan7F"
@@ -1493,7 +1493,7 @@ class Command(BaseCommand):
                         cls = "JmpIfAMEM16BitGreaterOrEqualThanConst"
                         args["value"] = str(shortify(cmd, 2))
                     elif byte2 == 0x10:
-                        cls = "JmpIfAMEM16BitGreaterOrEqualThan7E1x"
+                        cls = "JmpIfAMEM16BitGreaterOrEqualThanAbsolute7E"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "JmpIfAMEM16BitGreaterOrEqualThan7F"
@@ -1530,7 +1530,7 @@ class Command(BaseCommand):
                         cls = "IncAMEM8BitByConst"
                         args["value"] = str(shortify(cmd, 2))
                     elif byte2 == 0x10:
-                        cls = "IncAMEM8BitBy7E1x"
+                        cls = "IncAMEM8BitByAbsolute7E"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "IncAMEM8BitBy7F"
@@ -1566,7 +1566,7 @@ class Command(BaseCommand):
                         cls = "IncAMEM16BitByConst"
                         args["value"] = str(shortify(cmd, 2))
                     elif byte2 == 0x10:
-                        cls = "IncAMEM16BitBy7E1x"
+                        cls = "IncAMEM16BitByAbsolute7E"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "IncAMEM16BitBy7F"
@@ -1602,7 +1602,7 @@ class Command(BaseCommand):
                         cls = "DecAMEM8BitByConst"
                         args["value"] = str(shortify(cmd, 2))
                     elif byte2 == 0x10:
-                        cls = "DecAMEM8BitBy7E1x"
+                        cls = "DecAMEM8BitByAbsolute7E"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "DecAMEM8BitBy7F"
@@ -1638,7 +1638,7 @@ class Command(BaseCommand):
                         cls = "DecAMEM16BitByConst"
                         args["value"] = str(shortify(cmd, 2))
                     elif byte2 == 0x10:
-                        cls = "DecAMEM16BitBy7E1x"
+                        cls = "DecAMEM16BitByAbsolute7E"
                         args["address"] = f"0x7E{shortify(cmd, 2):04X}"
                     elif byte2 == 0x20:
                         cls = "DecAMEM16BitBy7F"

{smrpgpatchbuilder-5.0.1 → smrpgpatchbuilder-5.0.3/src/smrpgpatchbuilder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smrpgpatchbuilder
-Version: 5.0.1
+Version: 5.0.3
 Summary: Patchable base class support for some SMRPG concepts similar to their definitions in Lazy Shell
 Author-email: pidgezero_one <s.kischak@gmail.com>
 License-Expression: MIT