From 72f13c0b510c55edde5764adea1e007b6455e5aa Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Fri, 30 Oct 2015 10:34:16 -0700
Subject: [PATCH] berry firmness strings

---
 asm/emerald.s                      |  2 +-
 data/data2.s                       | 13 ++++++++++---
 data/text/berry_firmness_strings.s | 14 ++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 data/text/berry_firmness_strings.s

diff --git a/asm/emerald.s b/asm/emerald.s
index 76045f4c6d..f4e1f692bd 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -725441,7 +725441,7 @@ itemid_copy_name: ; 8178250
 	ldrb r0, [r6, 0x7]
 	cmp r0, 0
 	beq @081782B0
-	ldr r0, =gUnknown_085EFD50
+	ldr r0, =gBerryFirmnessStringPointers
 	ldrb r1, [r6, 0x7]
 	subs r1, 0x1
 	lsls r1, 2
diff --git a/data/data2.s b/data/data2.s
index dfafefe0da..f1ec1a7bdd 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -7905,7 +7905,10 @@ gUnknown_085E922C: ; 85E922C
 	.incbin "base_emerald.gba", 0x5e922c, 0x7
 
 gUnknown_085E9233: ; 85E9233
-	.incbin "base_emerald.gba", 0x5e9233, 0x30
+	.incbin "base_emerald.gba", 0x5e9233, 0x7
+
+; 85E923A
+	.include "data/text/berry_firmness_strings.s"
 
 gUnknown_085E9263: ; 85E9263
 	.incbin "base_emerald.gba", 0x5e9263, 0x8
@@ -9767,8 +9770,12 @@ gUnknown_085EFD20: ; 85EFD20
 gUnknown_085EFD28: ; 85EFD28
 	.incbin "base_emerald.gba", 0x5efd28, 0x28
 
-gUnknown_085EFD50: ; 85EFD50
-	.incbin "base_emerald.gba", 0x5efd50, 0x14
+gBerryFirmnessStringPointers: ; 85EFD50
+	.4byte gBerryFirmnessString_VerySoft
+	.4byte gBerryFirmnessString_Soft
+	.4byte gBerryFirmnessString_Hard
+	.4byte gBerryFirmnessString_VeryHard
+	.4byte gBerryFirmnessString_SuperHard
 
 gUnknown_085EFD64: ; 85EFD64
 	.incbin "base_emerald.gba", 0x5efd64, 0x4
diff --git a/data/text/berry_firmness_strings.s b/data/text/berry_firmness_strings.s
new file mode 100644
index 0000000000..179350b44c
--- /dev/null
+++ b/data/text/berry_firmness_strings.s
@@ -0,0 +1,14 @@
+gBerryFirmnessString_VerySoft: ; 85E923A
+	.charmapstr "Very soft$"
+
+gBerryFirmnessString_Soft: ; 85E9244
+	.charmapstr "Soft$"
+
+gBerryFirmnessString_Hard: ; 85E9249
+	.charmapstr "Hard$"
+
+gBerryFirmnessString_VeryHard: ; 85E924E
+	.charmapstr "Very hard$"
+
+gBerryFirmnessString_SuperHard: ; 85E9258
+	.charmapstr "Super hard$"