Skip to content

Commit b0ce452

Browse files
committed
More Logic Macros
- Add logic macros for defeating gunboats and salvaging sunken treasure This is more consistent with other enemies' logic and more precisely specifies some requirements
1 parent 2c8a195 commit b0ce452

2 files changed

Lines changed: 64 additions & 64 deletions

File tree

logic/data/macros.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Can Play EGL: Earth_Gods_Lyric and Wind_Waker
1010
Can Play WGA: Wind_Gods_Aria and Wind_Waker
1111
Can Play SoP: Song_of_Passing and Wind_Waker
1212
Can Sail Away: (Can_Play_WR and Boats_Sail) or Swift_Sail
13+
Can Salvage Sunken Treasure: Grappling_Hook
1314
Can Fan With Deku Leaf: Deku_Leaf
1415
Can Fly With Deku Leaf Indoors: Deku_Leaf and Magic
1516
Can Fly With Deku Leaf Outdoors: Deku_Leaf and Magic and Can_Play_WR
@@ -115,6 +116,7 @@ Can Defeat Saltwater Octoroks: Heros_Bow or Hookshot or Boomerang
115116
Can Defeat Beamos: Nothing
116117
Can Defeat Gyorgs: Heros_Bow or Hookshot or Boomerang
117118
Can Defeat Seahats: Heros_Bow or Hookshot or Bombs or Boomerang
119+
Can Defeat Gunboats: Bombs
118120
Can Defeat Gohma: Grappling_Hook
119121
Can Defeat Kalle Demos: Boomerang
120122
Can Defeat Gohdan: Bombs and (Hookshot or Heros_Bow)

0 commit comments

Comments
 (0)