alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed issue with ow sprite data pushing the uw sprite pointer table down to overlap the pot pointer table

Browse Source
This commit is contained in:
codemann8
2026-01-16 21:26:26 -06:00
parent a84b125bbd
commit 5a28f42454
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/rom/DataTables.py
View File

@@ -141,10 +141,11 @@ class DataTables:
bytes = sum(1+len(x)*3 for x in self.ow_enemy_table.values() if len(x) > 0)+1 bytes = sum(1+len(x)*3 for x in self.ow_enemy_table.values() if len(x) > 0)+1
self.pointer_addresses['ow_sprites'][1] = bytes self.pointer_addresses['ow_sprites'][1] = bytes
# ending_byte = 0x09CB3B + bytes # ending_byte = 0x09CB3B + bytes
max_per_state = {0: 0x40, 1: 0x90, 2: 0x90} max_per_state = {0: 0x40, 1: 0x90, 2: 0x81} # dropped max on state 2 to steal space for extra sprites (Murahdahla, extra tutorial guard)
pointer_address = snes_to_pc(self.pointer_addresses['ow_sprites'][2][0]) pointer_address = snes_to_pc(self.pointer_addresses['ow_sprites'][2][0])
data_pointer = snes_to_pc(self.pointer_addresses['ow_sprites'][0]) self.pointer_addresses['ow_sprites'][0] = pointer_address + ((max_per_state[0] + max_per_state[1] + max_per_state[2]) * 2)
data_pointer = self.pointer_addresses['ow_sprites'][0]
empty_pointer = pc_to_snes(data_pointer) & 0xFFFF empty_pointer = pc_to_snes(data_pointer) & 0xFFFF
rom.write_byte(data_pointer, 0xff) rom.write_byte(data_pointer, 0xff)
cached_dark_world = {} cached_dark_world = {}
@@ -177,6 +178,10 @@ class DataTables:
data_pointer += len(data) data_pointer += len(data)
rom.write_byte(data_pointer, 0xff) rom.write_byte(data_pointer, 0xff)
data_pointer += 1 data_pointer += 1
# Check if OW sprite data has overwritten the UW sprite pointer table
max_allowed_address = snes_to_pc(0x09D62E)
if data_pointer > max_allowed_address:
raise Exception(f'OW sprite data will cause the UW sprite pointer table to overwrite the pots pointer table. Data end: {hex(pc_to_snes(data_pointer))}, Max allowed: $09D62E')
special_health_table = { special_health_table = {