summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-09-29 12:48:11 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2019-09-29 12:48:11 -0400
commit3766ddcfda811cff3a7c38808c9efe294c33ed7c (patch)
tree8b166e3118cac3b98de79edc3ab05e26e6647b8a /data
parent01d42d07f849ea476bad3e80fb75c36806f39382 (diff)
berry pouch through sub_813DD74
Diffstat (limited to 'data')
-rw-r--r--data/berry_pouch.s17
-rw-r--r--data/strings.s2
2 files changed, 10 insertions, 9 deletions
diff --git a/data/berry_pouch.s b/data/berry_pouch.s
index 7c45b0383..19bf0c3df 100644
--- a/data/berry_pouch.s
+++ b/data/berry_pouch.s
@@ -3,9 +3,6 @@
.section .rodata
.align 2
-gUnknown_8464358:: @ 8464358
- .incbin "baserom.gba", 0x464358, 0x14
-
gUnknown_846436C:: @ 846436C
.incbin "baserom.gba", 0x46436C, 0x8
@@ -13,19 +10,23 @@ gUnknown_8464374:: @ 8464374
.incbin "baserom.gba", 0x464374, 0x8
gUnknown_846437C:: @ 846437C
- .incbin "baserom.gba", 0x46437C, 0x28
+ .4byte gOtherText_Use, sub_813DE0C
+ .4byte gOtherText_Toss, sub_813DEBC
+ .4byte gOtherText_Give, sub_813E200
+ .4byte gOtherText_Exit, sub_813E320
+ .4byte gString_Dummy, NULL
gUnknown_84643A4:: @ 84643A4
- .incbin "baserom.gba", 0x4643A4, 0x4
+ .byte 0, 2, 1, 3
gUnknown_84643A8:: @ 84643A8
- .incbin "baserom.gba", 0x4643A8, 0x4
+ .byte 2, 3, 4, 4
gUnknown_84643AC:: @ 84643AC
- .incbin "baserom.gba", 0x4643AC, 0x4
+ .byte 3, 4, 4, 4
gUnknown_84643B0:: @ 84643B0
- .incbin "baserom.gba", 0x4643B0, 0x4
+ .byte 0, 1, 3, 4
gUnknown_84643B4:: @ 84643B4
.string " $"
diff --git a/data/strings.s b/data/strings.s
index 603bce34f..bb12c0ad3 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::