From f126a262439df30c4a4081f9495a64c544da2166 Mon Sep 17 00:00:00 2001
From: Thorn Avery <ta@p7.co.nz>
Date: Wed, 20 Dec 2023 18:49:51 +1100
Subject: [PATCH] Battle Tent: working! (assuming union is ok)

---
 ram/wram.asm           | 7 ++++---
 scripts/BattleTent.asm | 8 +++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ram/wram.asm b/ram/wram.asm
index 39325ee3..a6db5305 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -2030,12 +2030,13 @@ UNION
 wViridianForestCurScript:: db
 wMuseum1FCurScript:: db
 wRoute13CurScript:: db
-NEXTU
-wBTWinnings:: ds 3
-ENDU
 wRoute14CurScript:: db
 wRoute17CurScript:: db
 wRoute19CurScript:: db
+NEXTU
+wBTWinnings:: ds 3
+wBTBattleReward:: ds 3
+ENDU
 wRoute21CurScript:: db
 wSafariZoneGateCurScript:: db
 wRockTunnelB1FCurScript:: db
diff --git a/scripts/BattleTent.asm b/scripts/BattleTent.asm
index a959afa6..a1b8e207 100644
--- a/scripts/BattleTent.asm
+++ b/scripts/BattleTent.asm
@@ -342,7 +342,7 @@ BattleTent_AfterBattle:
 	jr z, .max ; cap out at 255 wins
 	inc a
 	ld [wBTStreakCnt], a ; increment win counter
-	ld hl, BTBattleReward + 2
+	ld hl, wBTBattleReward + 2
 	ld de, wBTWinnings + 2
 	ld c, $3
 	predef AddBCDPredef ; for some reason this is maxing out the counter
@@ -588,6 +588,12 @@ BattleTentGuy:
 	ld [wBTWinnings], a
 	ld [wBTWinnings+1], a
 	ld [wBTWinnings+2], a
+	ld a, [BTBattleReward]
+	ld [wBTBattleReward], a
+	ld a, [BTBattleReward+1]
+	ld [wBTBattleReward+1], a
+	ld a, [BTBattleReward+2]
+	ld [wBTBattleReward+2], a
 	ld a, 1
 	ld [wBattleTentCurScript], a
 	jp TextScriptEnd