From 91bee83de12b5617e724cb732bc8952150e766c7 Mon Sep 17 00:00:00 2001
From: LLCoolDave <llcooldave@gmail.com>
Date: Tue, 1 Aug 2017 17:25:08 +0200
Subject: [PATCH] Add Chests in Waterfall of Wishing.

---
 Main.py    | 12 ++++++------
 Regions.py |  4 +++-
 Rom.py     |  3 +++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Main.py b/Main.py
index f9cf8a88..d141c95f 100644
--- a/Main.py
+++ b/Main.py
@@ -416,8 +416,8 @@ def generate_itempool(world):
                                       'Ether', 'Fire Rod', 'Flippers', 'Ocarina', 'Hammer', 'Hookshot', 'Ice Rod', 'Lamp', 'Cape', 'Magic Powder',
                                       'Red Boomerang', 'Mushroom', 'Pegasus Boots', 'Quake', 'Shovel', 'Silver Arrows'] +
                                      ['Sanctuary Heart Container'] + ['Rupees (100)'] * 2 + ['Boss Heart Container'] * 12 + ['Piece of Heart'] * 16 +
-                                     ['Rupees (50)'] * 8 + ['Rupees (300)'] * 5 + ['Rupees (20)'] * 4 +
-                                     ['Arrows (10)'] * 2 + ['Bombs (3)'] * 10 + ['Red Clock'] * 10 + ['Blue Clock'] * 10 + ['Green Clock'] * 20)
+                                     ['Rupees (50)'] * 8 + ['Rupees (300)'] * 6 + ['Rupees (20)'] * 4 +
+                                     ['Arrows (10)'] * 3 + ['Bombs (3)'] * 10 + ['Red Clock'] * 10 + ['Blue Clock'] * 10 + ['Green Clock'] * 20)
         world.clock_mode = 'stopwatch' if world.difficulty == 'timed' else 'countdown'
     elif world.difficulty == 'timed-ohko':
         world.itempool = ItemFactory(['Arrow Upgrade (+5)'] * 6 + ['Bomb Upgrade (+5)'] * 6 + ['Arrow Upgrade (+10)', 'Bomb Upgrade (+10)'] +
@@ -427,8 +427,8 @@ def generate_itempool(world):
                                       'Ether', 'Fire Rod', 'Flippers', 'Ocarina', 'Hammer', 'Hookshot', 'Ice Rod', 'Lamp', 'Cape', 'Magic Powder',
                                       'Red Boomerang', 'Mushroom', 'Pegasus Boots', 'Quake', 'Shovel', 'Silver Arrows'] +
                                      ['Single Arrow', 'Sanctuary Heart Container'] + ['Rupees (100)'] * 3 + ['Boss Heart Container'] * 10 + ['Piece of Heart'] * 24 +
-                                     ['Rupees (50)'] * 7 + ['Rupees (300)'] * 6 + ['Rupees (20)'] * 5 +
-                                     ['Arrows (10)'] * 4 + ['Bombs (3)'] * 10 + ['Green Clock'] * 25)
+                                     ['Rupees (50)'] * 7 + ['Rupees (300)'] * 7 + ['Rupees (20)'] * 5 +
+                                     ['Arrows (10)'] * 5 + ['Bombs (3)'] * 10 + ['Green Clock'] * 25)
         world.clock_mode = 'ohko'
     else:
         world.itempool = ItemFactory(['Arrow Upgrade (+5)'] * 6 + ['Bomb Upgrade (+5)'] * 6 + ['Arrow Upgrade (+10)', 'Bomb Upgrade (+10)'] +
@@ -438,8 +438,8 @@ def generate_itempool(world):
                                       'Ether', 'Fire Rod', 'Flippers', 'Ocarina', 'Hammer', 'Hookshot', 'Ice Rod', 'Lamp', 'Cape', 'Magic Powder',
                                       'Red Boomerang', 'Mushroom', 'Pegasus Boots', 'Quake', 'Shovel', 'Silver Arrows'] +
                                      ['Single Arrow', 'Sanctuary Heart Container', 'Rupees (100)'] + ['Boss Heart Container'] * 10 + ['Piece of Heart'] * 24 +
-                                     ['Rupees (50)'] * 7 + ['Rupees (5)'] * 4 + ['Rupee (1)'] * 2 + ['Rupees (300)'] * 4 + ['Rupees (20)'] * 28 +
-                                     ['Arrows (10)'] * 4 + ['Bombs (3)'] * 10)
+                                     ['Rupees (50)'] * 7 + ['Rupees (5)'] * 4 + ['Rupee (1)'] * 2 + ['Rupees (300)'] * 5 + ['Rupees (20)'] * 28 +
+                                     ['Arrows (10)'] * 5 + ['Bombs (3)'] * 10)
 
     if world.mode == 'swordless':
         world.push_item('Ether Tablet', ItemFactory('Rupees (20)'), False)
diff --git a/Regions.py b/Regions.py
index 2d0d3bbc..55128277 100644
--- a/Regions.py
+++ b/Regions.py
@@ -22,7 +22,7 @@ def create_regions(world):
                                      "[cave-022-B1] Thiefs hut [bottom right chest]"]),
         create_region('Hyrule Castle Secret Entrance', ['Uncle', '[cave-034] Hyrule Castle Secret Entrance'], ['Hyrule Castle Secret Entrance Exit']),
         create_region('Zoras River', ['King Zora', 'Piece of Heart (Zoras River)']),
-        create_region('Waterfall of Wishing'),
+        create_region('Waterfall of Wishing', ['Waterfall Fairy - Left', 'Waterfall Fairy - Right']),
         create_region('Kings Grave', ['[cave-018] Graveyard - top right grave']),
         create_region('North Fairy Cave', None, ['North Fairy Cave Exit']),
         create_region('Dam', ['[cave-047] Dam']),
@@ -295,6 +295,8 @@ location_table = {'Mushroom': (0x180013, False, 'in the woods'),
                   '[cave-034] Hyrule Castle Secret Entrance': (0xE971, False, 'near your uncle'),
                   'King Zora': (0xEE1C3, False, 'at a high price'),
                   'Piece of Heart (Zoras River)': (0x180149, False, 'near Zora'),
+                  'Waterfall Fairy - Left': (0xE9B0, False, 'near a fairy'),
+                  'Waterfall Fairy - Right': (0xE9D1, False, 'near a fairy'),
                   '[cave-018] Graveyard - top right grave': (0xE97A, False, 'alone in a cave'),
                   '[cave-047] Dam': (0xE98C, False, 'in the dam'),
                   '[cave-040] Links House': (0xE9BC, False, 'in your home'),
diff --git a/Rom.py b/Rom.py
index 3baf1a59..bf144971 100644
--- a/Rom.py
+++ b/Rom.py
@@ -237,6 +237,9 @@ def patch_rom(world, rom, hashtable, quickswap=False, beep='normal', sprite=None
     # set Fat Fairy Bow/Sword prizes to be disappointing
     rom.write_byte(0x34914, 0x3A)  # Bow and Arrow
     rom.write_byte(0x180028, 0x49)  # Fighter Sword
+    # enable Waterfall fairy chests
+    rom.write_bytes(0xE9AE, [0x14, 0x01])
+    rom.write_bytes(0xE9CF, [0x14, 0x01])
 
     # set swordless mode settings
     rom.write_byte(0x18003F, 0x01 if world.mode == 'swordless' else 0x00)  # hammer can harm ganon