Merge pull request #106 from PikalaxALT/berry_pouch

Berry pouch

4 files changed, 27 insertions, 82 deletions

diff --git a/data/berry_pouch.s b/data/berry_pouch.s
deleted file mode 100644
index 172443b5e..000000000
--- a/data/berry_pouch.s
+++ /dev/null
@@ -1,59 +0,0 @@
-	.section .rodata
-	.align 2
-
-gUnknown_846434C:: @ 846434C
-	.incbin "baserom.gba", 0x46434C, 0xC
-
-gUnknown_8464358:: @ 8464358
-	.incbin "baserom.gba", 0x464358, 0x14
-
-gUnknown_846436C:: @ 846436C
-	.incbin "baserom.gba", 0x46436C, 0x8
-
-gUnknown_8464374:: @ 8464374
-	.incbin "baserom.gba", 0x464374, 0x8
-
-gUnknown_846437C:: @ 846437C
-	.incbin "baserom.gba", 0x46437C, 0x28
-
-gUnknown_84643A4:: @ 84643A4
-	.incbin "baserom.gba", 0x4643A4, 0x4
-
-gUnknown_84643A8:: @ 84643A8
-	.incbin "baserom.gba", 0x4643A8, 0x4
-
-gUnknown_84643AC:: @ 84643AC
-	.incbin "baserom.gba", 0x4643AC, 0x4
-
-gUnknown_84643B0:: @ 84643B0
-	.incbin "baserom.gba", 0x4643B0, 0x4
-
-gUnknown_84643B4:: @ 84643B4
-	.incbin "baserom.gba", 0x4643B4, 0x4
-
-gUnknown_84643B8:: @ 84643B8
-	.incbin "baserom.gba", 0x4643B8, 0x20
-
-gUnknown_84643D8:: @ 84643D8
-	.incbin "baserom.gba", 0x4643D8, 0x18
-
-gUnknown_84643F0:: @ 84643F0
-	.incbin "baserom.gba", 0x4643F0, 0x8
-
-gUnknown_84643F8:: @ 84643F8
-	.incbin "baserom.gba", 0x4643F8, 0x8
-
-gUnknown_8464400:: @ 8464400
-	.incbin "baserom.gba", 0x464400, 0x48
-
-gUnknown_8464448:: @ 8464448
-	.incbin "baserom.gba", 0x464448, 0x60
-
-gUnknown_84644A8:: @ 84644A8
-	.incbin "baserom.gba", 0x4644A8, 0x8
-
-gUnknown_84644B0:: @ 84644B0
-	.incbin "baserom.gba", 0x4644B0, 0x8
-
-gUnknown_84644B8:: @ 84644B8
-	.incbin "baserom.gba", 0x4644B8, 0x32C
diff --git a/data/graphics.s b/data/graphics.s
index 96ef720e9..9c5d1c3f9 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -13988,23 +13988,23 @@ gItemPcBgPals:: @ 8E85408
 gItemPcTilemap:: @ 8E85458
 	.incbin "graphics/item_pc/unk_8E85458.bin.lz"
 
-gUnknown_8E8560C:: @ 8E8560C
-	.incbin "baserom.gba", 0xE8560C, 0x3C4
+gBerryPouchSpriteTiles:: @ 8E8560C
+	.incbin "graphics/berry_pouch/unk_8E8560C.4bpp.lz"
 
-gUnknown_8E859D0:: @ 8E859D0
-	.incbin "baserom.gba", 0xE859D0, 0x1D4
+gBerryPouchBgGfx:: @ 8E859D0
+	.incbin "graphics/berry_pouch/unk_8E859D0.4bpp.lz"
 
-gUnknown_8E85BA4:: @ 8E85BA4
-	.incbin "baserom.gba", 0xE85BA4, 0x50
+gBerryPouchBgPals:: @ 8E85BA4
+	.incbin "graphics/berry_pouch/unk_8E85BA4.gbapal.lz"
 
-gUnknown_8E85BF4:: @ 8E85BF4
-	.incbin "baserom.gba", 0xE85BF4, 0x28
+gBerryPouchBgPal0FemaleOverride:: @ 8E85BF4
+	.incbin "graphics/berry_pouch/unk_8E85BF4.gbapal.lz"
 
-gUnknown_8E85C1C:: @ 8E85C1C
-	.incbin "baserom.gba", 0xE85C1C, 0x28
+gBerryPouchSpritePalette:: @ 8E85C1C
+	.incbin "graphics/berry_pouch/unk_8E85C1C.gbapal.lz"
 
-gUnknown_8E85C44:: @ 8E85C44
-	.incbin "baserom.gba", 0xE85C44, 0x184
+gBerryPouchBg1Tilemap:: @ 8E85C44
+	.incbin "graphics/berry_pouch/unk_8E85C44.bin.lz"
 
 gUnknown_8E85DC8:: @ 8E85DC8
 	.incbin "baserom.gba", 0xE85DC8, 0x134
diff --git a/data/itemfinder.s b/data/itemfinder.s
index 3a955deeb..88e9910f4 100644
--- a/data/itemfinder.s
+++ b/data/itemfinder.s
@@ -1,5 +1,9 @@
 	.section .rodata
 	.align 2
+
+gUnknown_84644D0:: @ 84644D0
+	.incbin "baserom.gba", 0x4644D0, 0x314
+
 gUnknown_84647E4:: @ 84647E4
 	.incbin "baserom.gba", 0x4647E4, 0x18
 
diff --git a/data/strings.s b/data/strings.s
index 603bce34f..05bd47c88 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -372,7 +372,7 @@ gUnknown_8416195::
 gOtherText_Use::
 	.string "USE$"
 
-gUnknown_84161A4::
+gOtherText_Toss::
 	.string "TOSS$"
 
 gUnknown_84161A9::
@@ -555,25 +555,25 @@ gOtherText_WhereShouldTheStrVar1BePlaced:: @ 841633F
 gText_ItemCantBeHeld:: @ 841635E
 	.string "The {STR_VAR_1} can't be held.$"
 
-gUnknown_8416374:: @ 8416374
+gText_TheStrVar1CantBeHeldHere:: @ 8416374
 	.string "The {STR_VAR_1} can't be held\nhere.$"
 
 gUnknown_841638F:: @ 841638F
-	.string "Deposit how many\n{STR_VAR_1}シsス?$"
+	.string "Deposit how many\n{STR_VAR_1}(s)?$"
 
 gUnknown_84163A7:: @ 84163A7
-	.string "Deposited {STR_VAR_2}\n{STR_VAR_1}シsス.$"
+	.string "Deposited {STR_VAR_2}\n{STR_VAR_1}(s).$"
 
 gUnknown_84163BB:: @ 84163BB
 	.string "There's no room to\nstore items.$"
 
-gUnknown_84163DB:: @ 84163DB
-	.string "Toss out how many\n{STR_VAR_1}シsス?$"
+gText_TossOutHowManyStrVar1s:: @ 84163DB
+	.string "Toss out how many\n{STR_VAR_1}(s)?$"
 
-gUnknown_84163F4:: @ 84163F4
-	.string "Threw away {STR_VAR_2}\n{STR_VAR_1}シsス.$"
+gText_ThrewAwayStrVar2StrVar1s:: @ 84163F4
+	.string "Threw away {STR_VAR_2}\n{STR_VAR_1}(s).$"
 
-gUnknown_8416409:: @ 8416409
+gText_ThrowAwayStrVar2OfThisItemQM:: @ 8416409
 	.string "Throw away {STR_VAR_2} of\nthis item?$"
 
 gUnknown_8416425:: @ 8416425
@@ -654,10 +654,10 @@ gText_FontSize2:: @ 8416703
 gUnknown_8416707:: @ 8416707
 	.string "  $"
 
-gUnknown_841670A:: @ 841670A
+gText_BerryPouch:: @ 841670A
 	.string "BERRY POUCH$"
 
-gUnknown_8416716:: @ 8416716
+gText_TheBerryPouchWillBePutAway:: @ 8416716
 	.string "The BERRY POUCH will be\nput away.$"
 
 gUnknown_8416738:: @ 0x8416738