smrpgpatchbuilder 1.5.9__tar.gz → 3.0.0__tar.gz

{smrpgpatchbuilder-1.5.9 → smrpgpatchbuilder-3.0.0}/MANIFEST.in

@@ -1,3 +1,3 @@
-global-exclude __pycache__
-global-exclude *.py[cod]
-prune src/disassembler_output
+global-exclude __pycache__
+global-exclude *.py[cod]
+prune src/disassembler_output

{smrpgpatchbuilder-1.5.9/src/smrpgpatchbuilder.egg-info → smrpgpatchbuilder-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smrpgpatchbuilder
-Version: 1.5.9
+Version: 3.0.0
 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-1.5.9 → smrpgpatchbuilder-3.0.0}/pyproject.toml

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

{smrpgpatchbuilder-1.5.9 → smrpgpatchbuilder-3.0.0}/src/smrpgpatchbuilder/datatypes/levels/room_collection.py

@@ -586,6 +586,12 @@ 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
@@ -824,6 +830,20 @@ 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-1.5.9 → smrpgpatchbuilder-3.0.0}/src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/__init__.py

@@ -5,6 +5,7 @@ from .coords import COORD_F, COORD_X, COORD_Y, COORD_Z
 from .directions import EAST, NORTH, NORTHEAST, NORTHWEST, SOUTH, SOUTHEAST, SOUTHWEST, WEST
 from .intro_title_text import GENO_TITLE, IN_TITLE, KING_BOWSER_TITLE, MALLOW_TITLE, PRINCESS_TOADSTOOL_TITLE, SUPER_MARIO_TITLE
 from .layers import BACKGROUND, HALF_INTENSITY, LAYER_L1, LAYER_L2, LAYER_L3, LAYER_L4, MINUS_SUB, NPC_SPRITES
+from .palette_rows import LEVEL_PALETTE_1, LEVEL_PALETTE_2, LEVEL_PALETTE_3, LEVEL_PALETTE_4, LEVEL_PALETTE_5, LEVEL_PALETTE_6, LEVEL_PALETTE_7, MARIO_PALETTE, NPC_PALETTE_ROW_1, NPC_PALETTE_ROW_2, NPC_PALETTE_ROW_3, NPC_PALETTE_ROW_4, NPC_PALETTE_ROW_5, NPC_PALETTE_ROW_6, NPC_PALETTE_ROW_7, ROW_1
 from .palette_types import FADE_TO, GLOW, NOTHING, SET_TO
 from .scenes import SC00_OPEN_GAME_SELECT_MENU, SC01_OPEN_OVERWORLD_MENU, SC02_OPEN_LOCATION, SC03_OPEN_SHOP_MENU, SC04_OPEN_SAVE_GAME_MENU, SC05_OPEN_ITEMS_MAXED_OUT_MENU, SC06_UNKNOWN, SC07_RUN_MENU_TUTORIAL, SC08_ADD_STAR_PIECE, SC09_RUN_MOLEVILLE_MOUNTAIN, SC10_UNKNOWN, SC11_RUN_MOLEVILLE_MOUNTAIN_INTRO, SC12_UNKNOWN, SC13_RUN_STAR_PIECE_END_SEQUENCE, SC14_RUN_GARDEN_INTRO_SEQUENCE, SC15_ENTER_GATE_TO_SMITHY_FACTORY, SC16_RUN_WORLD_MAP_EVENT_SEQUENCE
 from .tutorials import TU00_HOW_TO_EQUIP, TU01_HOW_TO_USE_ITEMS, TU02_HOW_TO_PLAY_BEETLEMANIA, TU02_HOW_TO_SWITCH

smrpgpatchbuilder-3.0.0/src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/palette_rows.py

@@ -0,0 +1,20 @@
+"""Int subclass instances representing palette row indices (0-15)."""
+
+from .types.palette_row import PaletteRow
+
+ROW_1 = PaletteRow(0)
+LEVEL_PALETTE_1 = PaletteRow(1)
+LEVEL_PALETTE_2 = PaletteRow(2)
+LEVEL_PALETTE_3 = PaletteRow(3)
+LEVEL_PALETTE_4 = PaletteRow(4)
+LEVEL_PALETTE_5 = PaletteRow(5)
+LEVEL_PALETTE_6 = PaletteRow(6)
+LEVEL_PALETTE_7 = PaletteRow(7)
+MARIO_PALETTE = PaletteRow(8)
+NPC_PALETTE_ROW_1 = PaletteRow(9)
+NPC_PALETTE_ROW_2 = PaletteRow(10)
+NPC_PALETTE_ROW_3 = PaletteRow(11)
+NPC_PALETTE_ROW_4 = PaletteRow(12)
+NPC_PALETTE_ROW_5 = PaletteRow(13)
+NPC_PALETTE_ROW_6 = PaletteRow(14)
+NPC_PALETTE_ROW_7 = PaletteRow(15)

{smrpgpatchbuilder-1.5.9 → smrpgpatchbuilder-3.0.0}/src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/types/__init__.py

@@ -9,6 +9,7 @@ from .flag import Flag
 from .intro_title_text import IntroTitleText
 from .layer import Layer
 from .packet import Packet, PacketCollection
+from .palette_row import PaletteRow
 from .palette_type import PaletteType
 from .party_character import PartyCharacter
 from .scene import Scene

smrpgpatchbuilder-3.0.0/src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/types/palette_row.py

@@ -0,0 +1,7 @@
+class PaletteRow(int):
+    """Base class representing a palette row index (0-15)."""
+
+    def __new__(cls, *args):
+        num = args[0]
+        assert 0 <= num <= 15
+        return super(PaletteRow, cls).__new__(cls, num)