diff --git a/Rom.py b/Rom.py index 41ce2b06..42540d7d 100644 --- a/Rom.py +++ b/Rom.py @@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'f1979456c6fc9e3a3a826b94a8065c64' +RANDOMIZERBASEHASH = '516242b1897da709d9bad09e99d55819' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index eaa71206..16f98477 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ diff --git a/source/enemizer/Bossmizer.py b/source/enemizer/Bossmizer.py index 2ddcb7b4..7b10262e 100644 --- a/source/enemizer/Bossmizer.py +++ b/source/enemizer/Bossmizer.py @@ -148,8 +148,6 @@ def boss_writes(world, player, rom): rom.write_byte(snes_to_pc(0x368102), eye_number) # enemizer flag rom.write_byte(snes_to_pc(0x1DDBB3), eye_number) # loop variable data_tables = world.data_tables[player] - arrghus_can_swim = True - water_tiles_on = True for dungeon in world.get_dungeons(player): for level, boss in dungeon.bosses.items(): if not boss or boss.name in ['Agahnim', 'Agahnim2']: @@ -159,10 +157,6 @@ def boss_writes(world, player, rom): # room changes if boss.name == 'Arrghus' and (dungeon.name != 'Swamp Palace' or level is not None): rom.write_byte(snes_to_pc(0x0DB6BE), 0) # arrghus can stand on ground - arrghus_can_swim = False - if boss.name != 'Arrghus' and dungeon.name == 'Swamp Palace' and level is None: - remove_water_tiles(data_tables) - water_tiles_on = False if boss.name == 'Trinexx' and (dungeon.name != 'Turtle Rock' or level is not None): add_shell_to_boss_room(data_tables, dungeon.name, level, 0xFF2) data_tables.room_headers[room_id].byte_0 = 0x60 @@ -183,8 +177,6 @@ def boss_writes(world, player, rom): if not world.shuffle_followers[player]: # maiden is deleted del data_tables.uw_enemy_table.room_map[0x45][0] - if not arrghus_can_swim and water_tiles_on: - remove_water_tiles(data_tables) boss_defaults = {