From f7faaea7f74956ab4aa788dd3c2ad4d972999bfe Mon Sep 17 00:00:00 2001
From: Kevin Cathcart <kevincathcart@gmail.com>
Date: Wed, 12 Sep 2018 09:17:42 -0400
Subject: [PATCH] Minor cleanup of pull requests

---
 hooks.asm    |  8 ++++++++
 inverted.asm | 17 +++++++----------
 sandbox.asm  |  8 --------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/hooks.asm b/hooks.asm
index f01323b..93a5d8d 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -254,6 +254,14 @@ org $07ff5f ; <- 3ff5f - Bank0E.asm : 5252 (LDA.w #$0E3F : STA $23BC)
 JSL.l Draw_PyramidOverlay
 RTS
 ;--------------------------------------------------------------------------------
+;Remove Electric Barrier Hook
+org $06891E ; <- sprite_prep.asm : 537 (LDA $7EF280, X : PLX : AND.b #$40 : BEQ .not_dead)
+JSL Electric_Barrier
+;--------------------------------------------------------------------------------
+org $08CDAE ; <- ancilla_break_tower_seal.asm : 117 (LDA.b #$05 : STA $04C6)
+JSL GanonTowerAnimation
+NOP #03
+;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Hash Key Display
diff --git a/inverted.asm b/inverted.asm
index fc16de6..292e379 100644
--- a/inverted.asm
+++ b/inverted.asm
@@ -130,16 +130,14 @@ db $02, $02, $02, $00, $08, $02, $02, $00, $00, $00, $00, $01, $00, $00, $20, $0
 db $02, $02, $02, $02, $02, $02, $02, $00, $00, $01, $01, $01, $02, $00, $08, $00
 
 Electric_Barrier:
-{
 	LDA InvertedMode : BEQ .done
-	LDA $7EF280, X : ORA #$40 : STA $7EF280, X ;set barrier dead
+		LDA $7EF280, X : ORA #$40 : STA $7EF280, X ;set barrier dead
 	.done
-	LDA $7EF280, X ;original code to check if that sprite get damaged by link
-	RTL
-}
+	LDA $7EF280, X ; what we wrote over
+RTL
+
 
 GanonTowerAnimation:
-{
 	LDA InvertedMode : BEQ .done
 		LDA.b #$1B : STA $012F
         STZ $04C6
@@ -157,7 +155,6 @@ GanonTowerAnimation:
         LDA.b #$09 : STA $012D
 		RTL
 	.done
-	    LDA.b #$05 : STA $04C6
-        STZ $B0
-	RTL
-}
+	    LDA.b #$05 : STA $04C6 ;what we wrote over
+        STZ $B0 ; (continued)
+RTL
diff --git a/sandbox.asm b/sandbox.asm
index d700985..663a796 100644
--- a/sandbox.asm
+++ b/sandbox.asm
@@ -353,11 +353,3 @@ org $02E169+$37+$37 : dw $0000
 ;org $02E849 ; Fly 1 to Sanctuary
 ;db #$13, #$00, #$16, #$00, #$18, #$00, #$2C, #$00, #$2F, #$00, #$30, #$00, #$3B, #$00, #$3F, #$00, #$5B, #$00, #$35, #$00, #$0F, #$00, #$15, #$00, #$33, #$00, #$12, #$00, #$3F, #$00, #$55, #$00, #$7F, #$00, #$1A, #$00, #$88, #$08, #$30, #$0B, #$88, #$05, #$98, #$07, #$80, #$18, #$9E, #$06, #$10, #$08, #$2E, #$00, #$42, #$12, #$80, #$06, #$12, #$01, #$9E, #$05, #$8E, #$04, #$80, #$02, #$12, #$01, #$80, #$02, #$00, #$04, #$16, #$05, #$59, #$07, #$B9, #$0A, #$FA, #$0A, #$1E, #$0F, #$DF, #$0E, #$05, #$0F, #$00, #$06, #$46, #$0E, #$C6, #$02, #$2A, #$04, #$BA, #$0C, #$9A, #$04, #$56, #$0E, #$2A, #$04, #$56, #$0E, #$D6, #$06, #$4E, #$0C, #$7E, #$01, #$40, #$08, #$B2, #$0E, #$00, #$00, #$F2, #$06, #$75, #$0E, #$78, #$07, #$0A, #$0C, #$06, #$0E, #$8A, #$0A, #$EA, #$06, #$62, #$04, #$00, #$0E, #$8A, #$0A, #$00, #$0E, #$68, #$04, #$78, #$05, #$B7, #$07, #$17, #$0B, #$58, #$0B, #$A8, #$0F, #$3D, #$0F, #$67, #$0F, #$5C, #$06, #$A8, #$0E, #$28, #$03, #$88, #$04, #$18, #$0D, #$F8, #$04, #$B8, #$0E, #$88, #$04, #$B8, #$0E, #$56, #$07, #$C8, #$0C, #$00, #$02, #$B8, #$08, #$30, #$0F, #$78, #$00, #$78, #$07, #$F3, #$0E, #$F0, #$07, #$90, #$0C, #$80, #$0E, #$10, #$0B, #$70, #$07, #$E8, #$04, #$68, #$0E, #$10, #$0B, #$68, #$0E, #$70, #$04, #$83, #$05, #$C6, #$07, #$26, #$0B, #$67, #$0B, #$8D, #$0F, #$4C, #$0F, #$72, #$0F, #$6D, #$06, #$B3, #$0E, #$33, #$03, #$97, #$04, #$27, #$0D, #$07, #$05, #$C3, #$0E, #$97, #$04, #$C3, #$0E, #$56, #$07, #$D3, #$0C, #$0B, #$02, #$BF, #$08, #$37, #$0F, #$8D, #$00, #$7F, #$07, #$FA, #$0E, #$F7, #$07, #$97, #$0C, #$8B, #$0E, #$17, #$0B, #$77, #$07, #$EF, #$04, #$85, #$0E, #$17, #$0B, #$85, #$0E, #$F6, #$FF, #$FA, #$FF, #$07, #$00, #$F7, #$FF, #$F6, #$FF, #$00, #$00, #$F1, #$FF, #$FB, #$FF, #$00, #$00, #$FA, #$FF, #$0A, #$00, #$F6, #$FF, #$F6, #$FF, #$F6, #$FF, #$FA, #$FF, #$F6, #$FF, #$FA, #$FF, #$F2, #$FF, #$F2, #$FF, #$02, #$00, #$00, #$00, #$0E, #$00, #$00, #$00, #$FE, #$FF, #$0B, #$00, #$F8, #$FF, #$06, #$00, #$FA, #$FF, #$FA, #$FF, #$06, #$00, #$0E, #$00, #$00, #$00, #$FA, #$FF, #$00, #$00
 ;
-
-;Remove Electric Barrier Hook
-org $06891E
-JSL Electric_Barrier
-
-org $08CDAE
-JSL GanonTowerAnimation
-NOP #03