morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

OoT: ASM modifications to allow for more than 255 players

Browse Source
This commit is contained in:
espeon65536
2021-11-07 08:09:21 -06:00
committed by Fabian Dill
parent db2731dfb7
commit d5934a88a7
3 changed files with 6504 additions and 6501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
worlds/oot/Patches.py
View File

@@ -3,6 +3,7 @@ import itertools
import re
import zlib
from collections import defaultdict
from functools import partial
from .LocationList import business_scrubs
from .Hints import writeGossipStoneHints, buildAltarHints, \
@@ -1804,7 +1805,7 @@ def write_rom_item(rom, item_id, item):
def get_override_table(world):
return list(filter(lambda val: val != None, map(get_override_entry, world.world.get_filled_locations(world.player))))
return list(filter(lambda val: val != None, map(partial(get_override_entry, world.player), world.world.get_filled_locations(world.player))))
override_struct = struct.Struct('>xBBBHBB') # match override_t in get_items.c
@@ -1812,10 +1813,10 @@ def get_override_table_bytes(override_table):
return b''.join(sorted(itertools.starmap(override_struct.pack, override_table)))
def get_override_entry(location):
def get_override_entry(player_id, location):
scene = location.scene
default = location.default
player_id = min(location.item.player, 255)
player_id = 0 if player_id == location.item.player else min(location.item.player, 255)
if location.item.game != 'Ocarina of Time':
# This is an AP sendable. It's guaranteed to not be None.
looks_like_item_id = 0