From 0c9da85a519c7ec043a3aee7132364aebd9e75a4 Mon Sep 17 00:00:00 2001
From: May Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Wed, 31 Aug 2022 17:45:23 +0100
Subject: [PATCH] seems this is needed?

---
 data/maps/objects/DiglettsCave.asm |  2 +-
 scripts/DiglettsCave.asm           | 22 ++++++++++++++++++++++
 scripts/RockTunnelB1F.asm          | 22 ++++++++++++++++++++++
 text.asm                           |  1 +
 text/DiglettsCave.asm              |  3 +++
 text/RockTunnelB1F_2.asm           |  4 ++++
 6 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 text/DiglettsCave.asm

diff --git a/data/maps/objects/DiglettsCave.asm b/data/maps/objects/DiglettsCave.asm
index da9ec2d7..e587ba36 100644
--- a/data/maps/objects/DiglettsCave.asm
+++ b/data/maps/objects/DiglettsCave.asm
@@ -8,6 +8,6 @@ DiglettsCave_Object:
 	def_bg_events
 
 	def_object_events
-	object_event 30, 15, SPRITE_MONSTER, WALK, DOWN, 9, CROCKY, 40
+	object_event 30, 15, SPRITE_MONSTER, WALK, DOWN, 1, CROCKY, 40
 
 	def_warps_to DIGLETTS_CAVE
diff --git a/scripts/DiglettsCave.asm b/scripts/DiglettsCave.asm
index f9f2e590..c9f25272 100644
--- a/scripts/DiglettsCave.asm
+++ b/scripts/DiglettsCave.asm
@@ -4,3 +4,25 @@ DiglettsCave_Script:
 DiglettsCave_TextPointers:
 
 	text_end ; unused
+
+; Edited from Articuno - PvK
+	def_trainers 1
+CrockyTrainerHeader:
+	trainer EVENT_BEAT_CROCKY, 0, CrockyBattleText, CrockyBattleText, CrockyBattleText
+	db -1 ; end
+
+CrockyText:
+	text_asm
+	ld hl, CrockyTrainerHeader
+	call TalkToTrainer
+	ld a, $4
+	ld [wSeafoamIslandsB4FCurScript], a
+	jp TextScriptEnd
+
+CrockyBattleText:
+	text_far _CrockyBattleText
+	text_asm
+	ld a, CROCKY
+	call PlayCry
+	call WaitForSoundToFinish
+	jp TextScriptEnd
\ No newline at end of file
diff --git a/scripts/RockTunnelB1F.asm b/scripts/RockTunnelB1F.asm
index fa9cafda..6703cd6d 100644
--- a/scripts/RockTunnelB1F.asm
+++ b/scripts/RockTunnelB1F.asm
@@ -185,3 +185,25 @@ RockTunnel2EndBattleText9:
 RockTunnel2AfterBattleText9:
 	text_far _RockTunnel2AfterBattleText9
 	text_end
+
+; Edited from Articuno - PvK
+	def_trainers 9
+KabutopsTrainerHeader:
+	trainer EVENT_BEAT_KABUTOPS, 0, KabutopsBattleText, KabutopsBattleText, KabutopsBattleText
+	db -1 ; end
+
+KabutopsText:
+	text_asm
+	ld hl, KabutopsTrainerHeader
+	call TalkToTrainer
+	ld a, $4
+	ld [wSeafoamIslandsB4FCurScript], a
+	jp TextScriptEnd
+
+KabutopsBattleText:
+	text_far _KabutopsBattleText
+	text_asm
+	ld a, KABUTOPS
+	call PlayCry
+	call WaitForSoundToFinish
+	jp TextScriptEnd
\ No newline at end of file
diff --git a/text.asm b/text.asm
index c5020bba..47a39280 100644
--- a/text.asm
+++ b/text.asm
@@ -70,6 +70,7 @@ INCLUDE "text/SeafoamIslandsB4F.asm"
 INCLUDE "data/text/text_2.asm"
 
 INCLUDE "text/DiglettsCaveRoute2.asm"
+INCLUDE "text/DiglettsCave.asm"
 INCLUDE "text/ViridianForestNorthGate.asm"
 INCLUDE "text/Route2TradeHouse.asm"
 INCLUDE "text/Route2Gate.asm"
diff --git a/text/DiglettsCave.asm b/text/DiglettsCave.asm
new file mode 100644
index 00000000..523a7081
--- /dev/null
+++ b/text/DiglettsCave.asm
@@ -0,0 +1,3 @@
+_CrockyBattleText::
+	text "Graogh!"
+	text_end
diff --git a/text/RockTunnelB1F_2.asm b/text/RockTunnelB1F_2.asm
index e8e45a7f..ca4be66f 100644
--- a/text/RockTunnelB1F_2.asm
+++ b/text/RockTunnelB1F_2.asm
@@ -18,3 +18,7 @@ _RockTunnel2AfterBattleText9::
 	text "I'm an artist,"
 	line "not a fighter."
 	done
+
+_KabutopsBattleText::
+	text "Grr..."
+	text_end
\ No newline at end of file