Update

jamesbrq · Sep 3, 2024 · 164a337 · 164a337
1 parent d9dd50c
commit 164a337
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/worlds/gl/GauntletLegendsClient.py b/worlds/gl/GauntletLegendsClient.py
@@ -320,14 +320,14 @@ async def obj_read(self, mode=0):
                 await self.socket.read(
                     message_format(
                         READ,
-                        f"0x{format(OBJ_ADDR + ((len(self.item_locations) + self.extra_items + self.extra_spawners + spawner_count) * 0x3C), 'x')} {(len(self.chest_locations) + 2) * 0x3C}",
+                        f"0x{format(OBJ_ADDR + ((len(self.item_locations) + self.extra_items + self.extra_spawners + spawner_count) * 0x3C), 'x')} {len(self.chest_locations) * 0x3C}",
                     ),
                 ),
             )
             b.iterate(0x3C)
         for arr in b.split:
             _obj += [ObjectEntry(arr)]
-        _obj = [obj for obj in _obj if obj.raw[0] != 0xFF and obj.raw[1] != 0xFF]
+        _obj = [obj for obj in _obj if obj.raw[1] != 0xFF]
         if mode == 1:
             self.chest_objects = _obj[:len(self.chest_locations)]
         else:

diff --git a/worlds/gl/Rom.py b/worlds/gl/Rom.py
@@ -151,24 +151,11 @@ def patch_items(caller: APProcedurePatch, rom: bytes):
                             slice_
                             + bytearray(
                                 [
-                                    0x0,
-                                    0x0,
-                                    0x26,
-                                    0x1,
-                                    0x0,
+                                    0x0, 0x0, 0x26, 0x1, 0x0,
                                     location_data[location_name].difficulty,
-                                    0x0,
-                                    0x0,
-                                    0x0,
+                                    0x0, 0x0, 0x0,
                                     item[0] - 77780054,
-                                    0x3F,
-                                    0x80,
-                                    0x0,
-                                    0x0,
-                                    0x0,
-                                    0x0,
-                                    0x0,
-                                    0x0,
+                                    0x3F, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
                                 ],
                             ),
                         ]