Secondary left alley trigger.

2 files changed, 16 insertions, 12 deletions

diff --git a/main.asm b/main.asm
index 9a70fef..1c79ff9 100755
--- a/main.asm
+++ b/main.asm
@@ -21950,7 +21950,7 @@ Func_1535d: ; 0x1535d
     xor a
     ld [wRightAlleyTrigger], a
     ld [wLeftAlleyTrigger], a
-    ld [$d546], a
+    ld [wSecondaryLeftAlleyTrigger], a
     call Func_159c9
     ld a, $b
     ld [$ff8a], a
@@ -22378,11 +22378,11 @@ Func_158c0: ; 0x158c0
 Func_15904: ; 0x15904
     xor a
     ld [$d523], a
-    ld a, [$d546]
+    ld a, [wSecondaryLeftAlleyTrigger]
     and a
     ret z
     xor a
-    ld [$d546], a
+    ld [wSecondaryLeftAlleyTrigger], a
     ld a, $3
     ld [$ff8a], a
     ld a, Bank(Func_10000)
@@ -22395,7 +22395,7 @@ HandleLeftAlleyTriggerRedField: ; 0x1591e
     xor a
     ld [$d524], a
     ld [wRightAlleyTrigger], a
-    ld [$d546], a
+    ld [wSecondaryLeftAlleyTrigger], a
     ld a, $1
     ld [wLeftAlleyTrigger], a
     call Func_159c9
@@ -22407,7 +22407,7 @@ Func_15931: ; 0x15931
     ld [wRightAlleyTrigger], a
     ld [wLeftAlleyTrigger], a
     ld a, $1
-    ld [$d546], a
+    ld [wSecondaryLeftAlleyTrigger], a
     call Func_159c9
     ret
 
@@ -22447,7 +22447,7 @@ HandleRightAlleyTriggerRedField: ; 0x1597d
     xor a
     ld [$d527], a
     ld [wLeftAlleyTrigger], a
-    ld [$d546], a
+    ld [wSecondaryLeftAlleyTrigger], a
     ld a, $1
     ld [wRightAlleyTrigger], a
     call Func_159c9
@@ -23249,7 +23249,7 @@ Func_1652d: ; 0x1652d
     xor a
     ld [wRightAlleyTrigger], a
     ld [wLeftAlleyTrigger], a
-    ld [$d546], a
+    ld [wSecondaryLeftAlleyTrigger], a
     ld hl, wBallXVelocity
     ld [hli], a
     ld [hl], a
@@ -28877,7 +28877,7 @@ Func_1c7d7: ; 0x1c7d7
     xor a
     ld [wRightAlleyTrigger], a
     ld [wLeftAlleyTrigger], a
-    ld [$d546], a
+    ld [wSecondaryLeftAlleyTrigger], a
     ld hl, wBallXVelocity
     ld [hli], a
     ld [hl], a
@@ -29539,7 +29539,7 @@ HandleLeftAlleyTriggerBlueField: ; 0x1d080
     xor a
     ld [$d523], a
     ld [wRightAlleyTrigger], a
-    ld [$d546], a
+    ld [wSecondaryLeftAlleyTrigger], a
     ld a, $1
     ld [wLeftAlleyTrigger], a
     ret c
@@ -29550,7 +29550,7 @@ HandleRightAlleyTriggerBlueField: ; 0x1d091
     xor a
     ld [$d524], a
     ld [wLeftAlleyTrigger], a
-    ld [$d546], a
+    ld [wSecondaryLeftAlleyTrigger], a
     ld a, $1
     ld [wRightAlleyTrigger], a
     ret
@@ -30828,7 +30828,7 @@ Func_1e356: ; 0x1e356
     xor a
     ld [wRightAlleyTrigger], a
     ld [wLeftAlleyTrigger], a
-    ld [$d546], a
+    ld [wSecondaryLeftAlleyTrigger], a
     ld a, $b
     ld [$ff8a], a
     ld a, Bank(Func_10000)
diff --git a/wram.asm b/wram.asm
index 336990d..06a5ff7 100755
--- a/wram.asm
+++ b/wram.asm
@@ -173,8 +173,12 @@ wRightAlleyCount:: ; 0xd545
 ; When the count is 2, Catch 'Em Mode can be triggered.
 ; If the count is 3, the current map's rare pokemon will be used for Catch 'Em Mode.
     ds 1
+wSecondaryLeftAlleyTrigger:: ; 0xd546
+; Set to $1 when Ball passes over the bottom of the skinny alley between the left alley and Staryu button on the Red Field top screen.
+; It's used to determine if the Ball was hit up the Red Stage's secondary left-side alley.
+    ds 1
 
-    ds 4
+    ds 3
 
 wCurrentMap:: ; 0xd54a
 ; Current map during play. See map_constants.asm