smrpgpatchbuilder 2.0.1__tar.gz → 3.0.0__tar.gz

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

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

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

{smrpgpatchbuilder-2.0.1 → 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-2.0.1 → 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)

{smrpgpatchbuilder-2.0.1 → smrpgpatchbuilder-3.0.0}/src/smrpgpatchbuilder/datatypes/overworld_scripts/event_scripts/commands/commands.py

@@ -59,6 +59,9 @@ from smrpgpatchbuilder.datatypes.overworld_scripts.arguments.types.direction imp
 from smrpgpatchbuilder.datatypes.overworld_scripts.arguments.types.intro_title_text import (
     IntroTitleText,
 )
+from smrpgpatchbuilder.datatypes.overworld_scripts.arguments.types.palette_row import (
+    PaletteRow,
+)
 from smrpgpatchbuilder.datatypes.overworld_scripts.arguments.types.palette_type import (
     PaletteType,
 )
@@ -86,7 +89,7 @@ from smrpgpatchbuilder.datatypes.items.classes import (
     Accessory,
 )
 
-from smrpgpatchbuilder.datatypes.numbers.classes import UInt4, UInt16, UInt8
+from smrpgpatchbuilder.datatypes.numbers.classes import UInt16, UInt8
 from smrpgpatchbuilder.datatypes.overworld_scripts.arguments.types.byte_var import (
     ByteVar,
 )
@@ -7136,7 +7139,13 @@ class MarioStopsGlowing(UsableEventScriptCommand, EventScriptCommandNoArgs):
 
 
 class PaletteSet(UsableEventScriptCommand, EventScriptCommand):
-    """(The inner workings of this command are unknown.)
+    """Write one or more consecutive event palettes into palette rows.
+
+    `palette_set_starts_at` is the index of the first event palette to read from.
+    `from_row` is the first palette row to write to. `to_row` is the last palette
+    row to write to (inclusive, defaults to `from_row`). The game copies
+    `(to_row - from_row + 1)` consecutive palettes starting at
+    `palette_set_starts_at` into rows `from_row` through `to_row`.
 
     ## Lazy Shell command
         `Palette set = ...`
@@ -7148,62 +7157,61 @@ class PaletteSet(UsableEventScriptCommand, EventScriptCommand):
         3 bytes
 
     Args:
-        palette_set (int): The palette set to apply to the NPCs in the current level (8 bit)
-        row (int): The palette row (lower 4 bits of arg byte, 1-16)
-        upper (int): Unknown upper 4 bits of arg byte (0-15)
+        palette_set_starts_at (int): The starting event palette index (0-255)
+        from_row (PaletteRow): The first palette row to write to (0-15)
+        to_row (PaletteRow | None): The last palette row to write to (inclusive, 0-15). Defaults to from_row.
         identifier (str | None): Give this command a label if you want another command to jump to it.
     """
 
     _opcode = 0x8A
     _size: int = 3
-    _palette_set: UInt8
-    _row: UInt8
-    _upper: UInt4
+    _palette_set_starts_at: UInt8
+    _from_row: PaletteRow
+    _to_row: PaletteRow
 
     @property
-    def palette_set(self) -> UInt8:
-        """The palette set to apply to the NPCs in the current level."""
-        return self._palette_set
+    def palette_set_starts_at(self) -> UInt8:
+        """The starting event palette index."""
+        return self._palette_set_starts_at
 
-    def set_palette_set(self, palette_set: int) -> None:
-        """Designate the palette set to apply to the NPCs in the current level."""
-        self._palette_set = UInt8(palette_set)
+    def set_palette_set_starts_at(self, palette_set_starts_at: int) -> None:
+        """Designate the starting event palette index."""
+        self._palette_set_starts_at = UInt8(palette_set_starts_at)
 
     @property
-    def row(self) -> UInt8:
-        """The palette row (lower 4 bits)."""
-        return self._row
+    def from_row(self) -> PaletteRow:
+        """The first palette row to write to."""
+        return self._from_row
 
-    def set_row(self, row: int) -> None:
-        """Designate the palette row for this command."""
-        assert 1 <= row <= 16
-        self._row = UInt8(row)
+    def set_from_row(self, from_row: PaletteRow | int) -> None:
+        """Designate the first palette row to write to."""
+        self._from_row = PaletteRow(from_row)
 
     @property
-    def upper(self) -> UInt4:
-        """Unknown upper 4 bits of the arg byte."""
-        return self._upper
+    def to_row(self) -> PaletteRow:
+        """The last palette row to write to (inclusive)."""
+        return self._to_row
 
-    def set_upper(self, upper: int) -> None:
-        """Set the unknown upper 4 bits of the arg byte."""
-        assert 0 <= upper <= 15
-        self._upper = UInt4(upper)
+    def set_to_row(self, to_row: PaletteRow | int) -> None:
+        """Designate the last palette row to write to (inclusive)."""
+        self._to_row = PaletteRow(to_row)
+        assert self._to_row >= self._from_row
 
     def __init__(
         self,
-        palette_set: int,
-        row: int,
-        upper: int = 0,
+        palette_set_starts_at: int,
+        from_row: PaletteRow | int,
+        to_row: PaletteRow | int | None = None,
         identifier: str | None = None,
     ) -> None:
         super().__init__(identifier)
-        self.set_palette_set(palette_set)
-        self.set_row(row)
-        self.set_upper(upper)
+        self.set_palette_set_starts_at(palette_set_starts_at)
+        self.set_from_row(from_row)
+        self.set_to_row(to_row if to_row is not None else from_row)
 
     def render(self, *args) -> bytearray:
-        arg_1 = UInt8((self.row - 1) + (self.upper << 4))
-        return super().render(arg_1, self.palette_set)
+        arg_1 = UInt8(self.from_row + ((self.to_row - self.from_row) << 4))
+        return super().render(arg_1, self.palette_set_starts_at)
 
 
 class PaletteSetMorphs(UsableEventScriptCommand, EventScriptCommand):
@@ -7222,7 +7230,7 @@ class PaletteSetMorphs(UsableEventScriptCommand, EventScriptCommand):
         palette_type (PaletteType): The effect to use in applying this palette
         palette_set (int): The palette set to apply to the NPCs in the current level
         duration (int): The number of frames over which this palette morph should occur
-        row (int): The row offset relative to the palette
+        row (PaletteRow): The palette row (0-15)
         identifier (str | None): Give this command a label if you want another command to jump to it.
     """
 
@@ -7231,7 +7239,7 @@ class PaletteSetMorphs(UsableEventScriptCommand, EventScriptCommand):
     _palette_type: PaletteType
     _palette_set: UInt8
     _duration: UInt8
-    _row: UInt8
+    _row: PaletteRow
 
     @property
     def palette_type(self) -> PaletteType:
@@ -7262,21 +7270,20 @@ class PaletteSetMorphs(UsableEventScriptCommand, EventScriptCommand):
         self._duration = UInt8(duration)
 
     @property
-    def row(self) -> UInt8:
-        """The row offset relative to the palette."""
+    def row(self) -> PaletteRow:
+        """The palette row."""
         return self._row
 
-    def set_row(self, row: int) -> None:
-        """Designate the row offset relative to palette for this command."""
-        assert 1 <= row <= 16
-        self._row = UInt8(row)
+    def set_row(self, row: PaletteRow | int) -> None:
+        """Designate the palette row for this command."""
+        self._row = PaletteRow(row)
 
     def __init__(
         self,
         palette_type: PaletteType,
         palette_set: int,
         duration: int,
-        row: int,
+        row: PaletteRow | int,
         identifier: str | None = None,
     ) -> None:
         super().__init__(identifier)

smrpgpatchbuilder-3.0.0/src/smrpgpatchbuilder/datatypes/sprites/ids/event_palettes.py

@@ -0,0 +1,272 @@
+"""Event palette ID constants for SMRPG event palettes.
+
+There are 256 event palettes starting at ROM address 0x37A000.
+Each palette is 30 bytes (15 colors x 2 bytes per color).
+"""
+
+from .misc import COLORS_PER_PALETTE, PALETTE_SIZE, TOTAL_EVENT_PALETTES
+
+__all__ = [
+    "COLORS_PER_PALETTE",
+    "PALETTE_SIZE",
+    "TOTAL_EVENT_PALETTES",
+] + [f"EPAL{i:04d}" for i in range(TOTAL_EVENT_PALETTES)]
+
+# fmt: off
+EPAL0000 = 0
+EPAL0001 = 1
+EPAL0002 = 2
+EPAL0003 = 3
+EPAL0004 = 4
+EPAL0005 = 5
+EPAL0006 = 6
+EPAL0007 = 7
+EPAL0008 = 8
+EPAL0009 = 9
+EPAL0010 = 10
+EPAL0011 = 11
+EPAL0012 = 12
+EPAL0013 = 13
+EPAL0014 = 14
+EPAL0015 = 15
+EPAL0016 = 16
+EPAL0017 = 17
+EPAL0018 = 18
+EPAL0019 = 19
+EPAL0020 = 20
+EPAL0021 = 21
+EPAL0022 = 22
+EPAL0023 = 23
+EPAL0024 = 24
+EPAL0025 = 25
+EPAL0026 = 26
+EPAL0027 = 27
+EPAL0028 = 28
+EPAL0029 = 29
+EPAL0030 = 30
+EPAL0031 = 31
+EPAL0032 = 32
+EPAL0033 = 33
+EPAL0034 = 34
+EPAL0035 = 35
+EPAL0036 = 36
+EPAL0037 = 37
+EPAL0038 = 38
+EPAL0039 = 39
+EPAL0040 = 40
+EPAL0041 = 41
+EPAL0042 = 42
+EPAL0043 = 43
+EPAL0044 = 44
+EPAL0045 = 45
+EPAL0046 = 46
+EPAL0047 = 47
+EPAL0048 = 48
+EPAL0049 = 49
+EPAL0050 = 50
+EPAL0051 = 51
+EPAL0052 = 52
+EPAL0053 = 53
+EPAL0054 = 54
+EPAL0055 = 55
+EPAL0056 = 56
+EPAL0057 = 57
+EPAL0058 = 58
+EPAL0059 = 59
+EPAL0060 = 60
+EPAL0061 = 61
+EPAL0062 = 62
+EPAL0063 = 63
+EPAL0064 = 64
+EPAL0065 = 65
+EPAL0066 = 66
+EPAL0067 = 67
+EPAL0068 = 68
+EPAL0069 = 69
+EPAL0070 = 70
+EPAL0071 = 71
+EPAL0072 = 72
+EPAL0073 = 73
+EPAL0074 = 74
+EPAL0075 = 75
+EPAL0076 = 76
+EPAL0077 = 77
+EPAL0078 = 78
+EPAL0079 = 79
+EPAL0080 = 80
+EPAL0081 = 81
+EPAL0082 = 82
+EPAL0083 = 83
+EPAL0084 = 84
+EPAL0085 = 85
+EPAL0086 = 86
+EPAL0087 = 87
+EPAL0088 = 88
+EPAL0089 = 89
+EPAL0090 = 90
+EPAL0091 = 91
+EPAL0092 = 92
+EPAL0093 = 93
+EPAL0094 = 94
+EPAL0095 = 95
+EPAL0096 = 96
+EPAL0097 = 97
+EPAL0098 = 98
+EPAL0099 = 99
+EPAL0100 = 100
+EPAL0101 = 101
+EPAL0102 = 102
+EPAL0103 = 103
+EPAL0104 = 104
+EPAL0105 = 105
+EPAL0106 = 106
+EPAL0107 = 107
+EPAL0108 = 108
+EPAL0109 = 109
+EPAL0110 = 110
+EPAL0111 = 111
+EPAL0112 = 112
+EPAL0113 = 113
+EPAL0114 = 114
+EPAL0115 = 115
+EPAL0116 = 116
+EPAL0117 = 117
+EPAL0118 = 118
+EPAL0119 = 119
+EPAL0120 = 120
+EPAL0121 = 121
+EPAL0122 = 122
+EPAL0123 = 123
+EPAL0124 = 124
+EPAL0125 = 125
+EPAL0126 = 126
+EPAL0127 = 127
+EPAL0128 = 128
+EPAL0129 = 129
+EPAL0130 = 130
+EPAL0131 = 131
+EPAL0132 = 132
+EPAL0133 = 133
+EPAL0134 = 134
+EPAL0135 = 135
+EPAL0136 = 136
+EPAL0137 = 137
+EPAL0138 = 138
+EPAL0139 = 139
+EPAL0140 = 140
+EPAL0141 = 141
+EPAL0142 = 142
+EPAL0143 = 143
+EPAL0144 = 144
+EPAL0145 = 145
+EPAL0146 = 146
+EPAL0147 = 147
+EPAL0148 = 148
+EPAL0149 = 149
+EPAL0150 = 150
+EPAL0151 = 151
+EPAL0152 = 152
+EPAL0153 = 153
+EPAL0154 = 154
+EPAL0155 = 155
+EPAL0156 = 156
+EPAL0157 = 157
+EPAL0158 = 158
+EPAL0159 = 159
+EPAL0160 = 160
+EPAL0161 = 161
+EPAL0162 = 162
+EPAL0163 = 163
+EPAL0164 = 164
+EPAL0165 = 165
+EPAL0166 = 166
+EPAL0167 = 167
+EPAL0168 = 168
+EPAL0169 = 169
+EPAL0170 = 170
+EPAL0171 = 171
+EPAL0172 = 172
+EPAL0173 = 173
+EPAL0174 = 174
+EPAL0175 = 175
+EPAL0176 = 176
+EPAL0177 = 177
+EPAL0178 = 178
+EPAL0179 = 179
+EPAL0180 = 180
+EPAL0181 = 181
+EPAL0182 = 182
+EPAL0183 = 183
+EPAL0184 = 184
+EPAL0185 = 185
+EPAL0186 = 186
+EPAL0187 = 187
+EPAL0188 = 188
+EPAL0189 = 189
+EPAL0190 = 190
+EPAL0191 = 191
+EPAL0192 = 192
+EPAL0193 = 193
+EPAL0194 = 194
+EPAL0195 = 195
+EPAL0196 = 196
+EPAL0197 = 197
+EPAL0198 = 198
+EPAL0199 = 199
+EPAL0200 = 200
+EPAL0201 = 201
+EPAL0202 = 202
+EPAL0203 = 203
+EPAL0204 = 204
+EPAL0205 = 205
+EPAL0206 = 206
+EPAL0207 = 207
+EPAL0208 = 208
+EPAL0209 = 209
+EPAL0210 = 210
+EPAL0211 = 211
+EPAL0212 = 212
+EPAL0213 = 213
+EPAL0214 = 214
+EPAL0215 = 215
+EPAL0216 = 216
+EPAL0217 = 217
+EPAL0218 = 218
+EPAL0219 = 219
+EPAL0220 = 220
+EPAL0221 = 221
+EPAL0222 = 222
+EPAL0223 = 223
+EPAL0224 = 224
+EPAL0225 = 225
+EPAL0226 = 226
+EPAL0227 = 227
+EPAL0228 = 228
+EPAL0229 = 229
+EPAL0230 = 230
+EPAL0231 = 231
+EPAL0232 = 232
+EPAL0233 = 233
+EPAL0234 = 234
+EPAL0235 = 235
+EPAL0236 = 236
+EPAL0237 = 237
+EPAL0238 = 238
+EPAL0239 = 239
+EPAL0240 = 240
+EPAL0241 = 241
+EPAL0242 = 242
+EPAL0243 = 243
+EPAL0244 = 244
+EPAL0245 = 245
+EPAL0246 = 246
+EPAL0247 = 247
+EPAL0248 = 248
+EPAL0249 = 249
+EPAL0250 = 250
+EPAL0251 = 251
+EPAL0252 = 252
+EPAL0253 = 253
+EPAL0254 = 254
+EPAL0255 = 255
+# fmt: on

{smrpgpatchbuilder-2.0.1 → smrpgpatchbuilder-3.0.0}/src/smrpgpatchbuilder/datatypes/sprites/ids/misc.py

@@ -32,10 +32,10 @@ SPRITE_PALETTE_OFFSET = 0x253000
 SPRITE_PALETTE_END = 0x259000  # 0x253000 + (819 * 30) = 0x258FE6, rounded up
 TOTAL_SPRITE_PALETTES = 819
 
-# Event palettes (0x37A000 - 0x37BFFF per ROM documentation)
+# Event palettes (starting at 0x37A000)
 EVENT_PALETTE_OFFSET = 0x37A000
-EVENT_PALETTE_END = 0x37C000
-TOTAL_EVENT_PALETTES = (EVENT_PALETTE_END - EVENT_PALETTE_OFFSET) // PALETTE_SIZE  # 273
+TOTAL_EVENT_PALETTES = 256
+EVENT_PALETTE_END = EVENT_PALETTE_OFFSET + TOTAL_EVENT_PALETTES * PALETTE_SIZE
 
 # Legacy aliases for backwards compatibility
 PALETTE_OFFSET = SPRITE_PALETTE_OFFSET

{smrpgpatchbuilder-2.0.1 → smrpgpatchbuilder-3.0.0}/src/smrpgpatchbuilder/management/commands/eventconverter.py

@@ -94,6 +94,25 @@ CONTROLLER_INPUTS = ["LEFT", "RIGHT", "DOWN", "UP", "X", "A", "Y", "B"]
 
 COLOURS = ["BLACK", "BLUE", "RED", "PINK", "GREEN", "AQUA", "YELLOW", "WHITE"]
 
+PALETTE_ROWS = [
+    "ROW_1",
+    "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",
+]
+
 PALETTE_TYPES = [
     "NOTHING",
     None,
@@ -817,16 +836,16 @@ class Command(BaseCommand):
                 args["shop_id"] = varnames["shops"][cmdargs[0]]
             elif cmd["command"] == "palette_set":
                 cls = "PaletteSet"
-                args["palette_set"] = str(cmdargs[0])
-                args["row"] = str(cmdargs[1])
-                if cmdargs[2] != 0:
-                    args["upper"] = str(cmdargs[2])
+                args["palette_set_starts_at"] = str(cmdargs[0])
+                args["from_row"] = PALETTE_ROWS[cmdargs[1]]
+                if cmdargs[2] != cmdargs[1]:
+                    args["to_row"] = PALETTE_ROWS[cmdargs[2]]
             elif cmd["command"] == "palette_set_morphs":
                 cls = "PaletteSetMorphs"
                 args["palette_type"] = PALETTE_TYPES[cmdargs[0]]
                 args["duration"] = str(cmdargs[1])
                 args["palette_set"] = str(cmdargs[2])
-                args["row"] = str(cmdargs[3])
+                args["row"] = PALETTE_ROWS[cmdargs[3]]
             elif cmd["command"] == "pause":
                 cls = "Pause"
                 include_argnames = False
@@ -2051,6 +2070,7 @@ class Command(BaseCommand):
             output += "\nfrom smrpgpatchbuilder.datatypes.overworld_scripts.arguments.directions import *"
             output += "\nfrom smrpgpatchbuilder.datatypes.overworld_scripts.arguments.intro_title_text import *"
             output += "\nfrom smrpgpatchbuilder.datatypes.overworld_scripts.arguments.layers import *"
+            output += "\nfrom smrpgpatchbuilder.datatypes.overworld_scripts.arguments.palette_rows import *"
             output += "\nfrom smrpgpatchbuilder.datatypes.overworld_scripts.arguments.palette_types import *"
             output += "\nfrom smrpgpatchbuilder.datatypes.overworld_scripts.arguments.scenes import *"
             output += "\nfrom smrpgpatchbuilder.datatypes.overworld_scripts.arguments.tutorials import *"

{smrpgpatchbuilder-2.0.1 → smrpgpatchbuilder-3.0.0}/src/smrpgpatchbuilder/management/commands/legacy/eventdisassembler.py

@@ -936,10 +936,11 @@ def modify_party(args):
 
 
 def palette_set(args):
-    palette_set = args[1]
-    row = (args[0] & 0x0F) + 1
-    upper = (args[0] >> 4) & 0x0F
-    return "palette_set", [palette_set, row, upper]
+    palette_set_starts_at = args[1]
+    from_row = args[0] & 0x0F
+    num_extra = (args[0] >> 4) & 0x0F
+    to_row = from_row + num_extra
+    return "palette_set", [palette_set_starts_at, from_row, to_row]
 
 
 def palette_set_morphs(args):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smrpgpatchbuilder
-Version: 2.0.1
+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-2.0.1 → smrpgpatchbuilder-3.0.0}/src/smrpgpatchbuilder.egg-info/SOURCES.txt

@@ -109,6 +109,7 @@ src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/coords.py
 src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/directions.py
 src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/intro_title_text.py
 src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/layers.py
+src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/palette_rows.py
 src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/palette_types.py
 src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/scenes.py
 src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/tutorials.py
@@ -124,6 +125,7 @@ src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/types/flag.py
 src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/types/intro_title_text.py
 src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/types/layer.py
 src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/types/packet.py
+src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/types/palette_row.py
 src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/types/palette_type.py
 src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/types/party_character.py
 src/smrpgpatchbuilder/datatypes/overworld_scripts/arguments/types/scene.py

{smrpgpatchbuilder-2.0.1 → smrpgpatchbuilder-3.0.0}/src/tests/overworld/test_eventscripts.py

@@ -913,8 +913,8 @@ test_cases = [
     Case(
         label="PaletteSet",
         commands_factory=lambda: [
-            PaletteSet(palette_set=110, row=12),
-            PaletteSet(palette_set=89, row=2, upper=6),
+            PaletteSet(palette_set_starts_at=110, from_row=11),
+            PaletteSet(palette_set_starts_at=89, from_row=1, to_row=7),
         ],
         expected_bytes=[0x8A, 0x0B, 0x6E, 0x8A, 0x61, 0x59],
     ),
@@ -1059,12 +1059,12 @@ test_cases = [
         commands_factory=lambda: [
             SpeedUpMusicTempoBy(duration=255, change=24),
         ],
-        expected_bytes=[0x97, 0xFF, 0xE8],
+        expected_bytes=[0x97, 0xFF, 0xE7],
     ),
     Case(
         label="ReduceMusicPitchBy",
         commands_factory=lambda: [ReduceMusicPitchBy(duration=8, change=5)],
-        expected_bytes=[0x98, 0x08, 0xFB],
+        expected_bytes=[0x98, 0x08, 0xFA],
     ),
     Case(
         label="IncreaseMusicPitchBy",