From 8cf1ba9fc9575fafb53c720111b7ff98d6669aca Mon Sep 17 00:00:00 2001
From: Capucine Meyer <thibault.me@gmail.com>
Date: Sun, 9 Apr 2023 14:43:18 +0200
Subject: [PATCH] seems to have fixed the yujirou gym fight, now need to solve
 the warp issue once exiting the gym

---
 .gitignore                       |  2 ++
 engine/events/in_game_trades.asm |  2 +-
 scripts/ViridianPreGym.asm       | 24 +++++++++++++-----------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 53f35143..4520aed3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@
 *.sn*
 *.sa*
 *.sg1
+
+.vscode/*
diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm
index cfff4bd8..0276a466 100644
--- a/engine/events/in_game_trades.asm
+++ b/engine/events/in_game_trades.asm
@@ -277,7 +277,7 @@ InGameTradeTextPointers:
 	dw TradeTextPointers3
 	dw TradeTextPointers4
 	dw TradeTextPointers5
-	dw TradeTextPointers6
+	;dw TradeTextPointers6
 
 TradeTextPointers1:
 	dw WannaTrade1Text
diff --git a/scripts/ViridianPreGym.asm b/scripts/ViridianPreGym.asm
index 80dbfee8..bd0922a4 100644
--- a/scripts/ViridianPreGym.asm
+++ b/scripts/ViridianPreGym.asm
@@ -5,14 +5,13 @@
 ; Commit on 30-3-23 has a somewhat stable version of the fight.
 
 ViridianPreGym_Script:
-	call EnableAutoTextBoxDrawing
 	ld de, ViridianPreGym_ScriptPointers
 	ld a, [wViridianPreGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wViridianPreGymCurScript], a
 	ret
 
-LoadNames:
+.LoadNames:
 	ld hl, .CityName
 	ld de, .LeaderName
 	jp LoadGymLeaderAndCityName
@@ -31,12 +30,11 @@ ViridianPreGymResetScripts:
 	ret
 
 ViridianPreGym_ScriptPointers:
+	dw CheckFightingMapTrainers
+	dw DisplayEnemyTrainerTextAndStartBattle
+	dw EndTrainerBattle
 	dw ViridianGymYujirouPostBattle
 
-ViridianPreGym_TextPointers:
-	dw YujirouText
-	dw YujirouRematch
-
 ViridianGymYujirouPostBattle:
 	ld a, [wIsInBattle]
 	cp $ff
@@ -45,17 +43,19 @@ ViridianGymYujirouPostBattle:
 	ld [wJoyIgnore], a
 
 YujirouHasBeenBeaten:
-	;text_asm
-	;ld hl, YujirouAfterBattleText
-	;call PrintText
 	SetEvent EVENT_BEAT_YUJIROU
 	jp ViridianPreGymResetScripts
 
+ViridianPreGym_TextPointers:
+	dw YujirouText
+	dw YujirouHasBeenBeaten
+	dw YujirouRematch
+
 YujirouText:
 	text_asm
 	
 	CheckEvent EVENT_BEAT_YUJIROU
-	jr z, .YujirouBeaten
+	jr nz, .YujirouBeaten
 	
 	ld hl, YujirouIntro
 	call PrintText
@@ -76,7 +76,7 @@ YujirouText:
 	ld hl, YujirouLoseText
 	ld de, YujirouWinText
 	call SaveEndBattleTextPointers
-	ld a, $6
+	ld a, $3
 	ld [wViridianPreGymCurScript], a
 	ld [wCurMapScript], a
 	jr .done
@@ -88,6 +88,8 @@ YujirouText:
 	jp TextScriptEnd
 ; where the hell do i put SetEvent EVENT_BEAT_YUJIROU
 
+
+
 YujirouIntro::
 	text_far _YujirouIntro
 	text_end