From 95cfdb9059f823b014c8ba45730b519332ab4929 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sat, 24 Feb 2024 09:55:50 -0500
Subject: [PATCH] add beta release macro to L+R all items

---
 Dungeons/house_tag.asm         | 5 +++--
 Dungeons/together_warp_tag.asm | 1 -
 Util/all_items.asm             | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Dungeons/house_tag.asm b/Dungeons/house_tag.asm
index 7103f18..198f4c7 100644
--- a/Dungeons/house_tag.asm
+++ b/Dungeons/house_tag.asm
@@ -10,7 +10,6 @@ org $01CC18 ; override routine 0x39 "Holes(7)"
 org $01CC5A 
   HouseTag_Return:
 
-; org $2F8000
 pullpc
 HouseTag:
 {
@@ -41,6 +40,8 @@ HouseTag_Main:
 
 HouseTag_TelepathicPlea:
 {
+  LDA #$06 : STA $7EE000 ; Set the time to 6:00am
+
   ; -------------------------------
   ; Set Link's coordinates to this specific position.
   LDA.b #$40 : STA $0FC2
@@ -63,7 +64,7 @@ HouseTag_WakeUpPlayer:
 {
   ; Lighten the screen gradually and then wake Link up partially
   LDA $1A : AND.b #$03 : BNE .delay
-  LDA $9C : CMP.b #$20 : BEQ .colorTargetReached
+  LDA $9C : CMP.b #$00 : BEQ .colorTargetReached
   
   DEC $9C : DEC $9D
 
diff --git a/Dungeons/together_warp_tag.asm b/Dungeons/together_warp_tag.asm
index f70a665..d6c6154 100644
--- a/Dungeons/together_warp_tag.asm
+++ b/Dungeons/together_warp_tag.asm
@@ -24,7 +24,6 @@ org $01CC5A
 
 ; ==============================================================================
 
-; org $338000
 pullpc ; Bank 0x2C
 print "Warp Tag", pc
 WarpTag:
diff --git a/Util/all_items.asm b/Util/all_items.asm
index e1dc41f..8e90e24 100644
--- a/Util/all_items.asm
+++ b/Util/all_items.asm
@@ -53,6 +53,8 @@ lorom
 !Crystals = $7EF37A
 !MagicUsage = $7EF37B
 
+!BetaRelease = $01
+
 org $068365
   JSL $3CA62A ; Overwrite JSL executed every frame
 
@@ -60,6 +62,7 @@ org $3CA62A ; Expanded space for our routine
 {
   LDA $F2 : CMP #$30 : BEQ $03 : JMP END ; Check L and R button
 
+if !BetaRelease = 0
   ; 0 - nothing. 1 - bow w/ no arrows. 2 - bow w/ arrows. 3 - silver arrows
   LDA #$02 : STA !Bow
 
@@ -133,8 +136,6 @@ org $3CA62A ; Expanded space for our routine
   LDA #$E7 : STA !Rupees
   LDA #$03 : STA !RupeesGoal
 
-
-
   ; Pendants: Bit 0 = Courage, Bit 1 = Wisdom, Bit 2 = Power
   LDA #$00 : STA !Pendants
 
@@ -162,6 +163,9 @@ org $3CA62A ; Expanded space for our routine
   ; health capacity (maximum number of hearts)
   LDA #$A0 : STA !HealthCapacity
 
+endif
+
+
   ; fill all hearts
   LDA #$A0 : STA !Hearts