fix: rain state + activated flute

This commit is contained in:
aerinon
2025-01-08 09:19:38 -07:00
parent 9a8529100e
commit fe520626e9
4 changed files with 20 additions and 2 deletions

View File

@@ -53,6 +53,9 @@ class InitialSram:
def pre_open_pyramid_hole(self): def pre_open_pyramid_hole(self):
self._or_value(OVERWORLD_DATA+0x5B, 0x20) self._or_value(OVERWORLD_DATA+0x5B, 0x20)
def pre_set_overworld_flag(self, owid, bitmask):
self._or_value(OVERWORLD_DATA+owid, bitmask)
def pre_open_tr_bomb_doors(self): def pre_open_tr_bomb_doors(self):
self._or_value(ROOM_DATA+0x47, 0x80) self._or_value(ROOM_DATA+0x47, 0x80)
self._or_value(ROOM_DATA+0x01AB, 0x80) self._or_value(ROOM_DATA+0x01AB, 0x80)
@@ -111,6 +114,20 @@ class InitialSram:
equip[0x37B] = 1 equip[0x37B] = 1
starting_magic = 0x80 starting_magic = 0x80
if world.mode[player] == 'standard' and world.logic[player] not in ['noglitches', 'minorglitches']:
if startingstate.has('Ocarina (Activated)', player):
self.pre_set_overworld_flag(0x18, 0x20)
if startingstate.has('Return Old Man', player):
self._initial_sram_bytes[0x410] |= 0x01
if startingstate.has('Beat Agahnim 1', player):
self.pre_open_lumberjack()
if world.mode[player] == 'standard':
self.set_progress_indicator(0x80) # todo: probably missing some code rom side for this
else:
self.set_progress_indicator(0x03)
for item in world.precollected_items: for item in world.precollected_items:
if item.player != player: if item.player != player:
continue continue

View File

@@ -3,4 +3,5 @@
* 1.4.8 * 1.4.8
- New option: Mirror Scroll - to add the item to the starting inventory in non-doors modes (Thanks Telethar!) - New option: Mirror Scroll - to add the item to the starting inventory in non-doors modes (Thanks Telethar!)
- Fixed a key logic bug with decoupled doors when a big key door leads to a small key door (the small key door was missing appropriate logic) - Fixed a key logic bug with decoupled doors when a big key door leads to a small key door (the small key door was missing appropriate logic)
- Minor documentation fixes (thanks Codemann8!) - Fixed an issue with flute activation in rain mode. (thanks Codemann!)
- Minor documentation fixes (thanks Codemann!)

2
Rom.py
View File

@@ -42,7 +42,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '1cbe62592c0e9a7d224232c62292ecc9' RANDOMIZERBASEHASH = '403d349584246fd845c3a9c78a55b3d4'
class JsonRom(object): class JsonRom(object):

Binary file not shown.