From cb86156311b6b1aa30f7bd7370a5ef5fa2c4b8ba Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Sun, 28 Jul 2024 17:36:00 +0100
Subject: [PATCH] zeta bug fixes

oops
---
 data/collision/field_move_blocks.asm | 1 +
 maps/JackysHouse.asm                 | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/data/collision/field_move_blocks.asm b/data/collision/field_move_blocks.asm
index aebd007..50aac9e 100644
--- a/data/collision/field_move_blocks.asm
+++ b/data/collision/field_move_blocks.asm
@@ -49,6 +49,7 @@ CutTreeBlockPointers:
 ; facing block, replacement block, animation
 	db $03, $02, 1 ; grass
 	db $6d, $88, 0 ; tree
+	db $11, $10, 0 ; tree
 	db -1 ; end
 
 .oldCity:
diff --git a/maps/JackysHouse.asm b/maps/JackysHouse.asm
index 071cb8b..fbe6021 100644
--- a/maps/JackysHouse.asm
+++ b/maps/JackysHouse.asm
@@ -33,11 +33,11 @@ JackysHouseJackyScript:
 	closetext
 	; fallthrough
 .firstFight
+	opentext
 	yesorno
 	iffalse .No
 	sjump .Yes
 .No
-	opentext
 	writetext JackyNo
 	waitbutton
 	closetext
@@ -180,7 +180,7 @@ JackySNESText:
 	done
 
 JackyVirtualBoy:
-	jumptext JackyVirtualBoy
+	jumptext JackyVirtualBoyText
 
 JackyVirtualBoyText:
 	text "It's a VIRTUAL"
@@ -197,7 +197,7 @@ JackyVirtualBoyText:
 	done
 
 JackyTVFightersDestiny:
-	jumptext JackyTVFightersDestiny
+	jumptext JackyTVFightersDestinyText
 
 ; Virtua Fighter 3 never made it to the N64, but Fighters Destiny is basically the same thing.
 JackyTVFightersDestinyText:
@@ -210,7 +210,7 @@ JackyTVFightersDestinyText:
 	done
 
 JackyTVStreetFighterII:
-	jumptext JackyTVStreetFighterII
+	jumptext JackyTVStreetFighterIIText
 
 ; Jacky was a big Virtua Fighter nerd, so I imagine he'd have two fighting games running at once.
 JackyTVStreetFighterIIText: