summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/data_8479668.s (renamed from data/data_8471F50.s)177
-rw-r--r--data/strings.s31
2 files changed, 20 insertions, 188 deletions
diff --git a/data/data_8471F50.s b/data/data_8479668.s
index 8a3a7ae77..8527b4f09 100644
--- a/data/data_8471F50.s
+++ b/data/data_8479668.s
@@ -14,183 +14,6 @@
.section .rodata
.align 2
-gUnknown_8471F50:: @ 8471F50
- .incbin "baserom.gba", 0x471F50, 0x113
-
-gUnknown_8472063:: @ 8472063
- .incbin "baserom.gba", 0x472063, 0x4B
-
-gUnknown_84720AE:: @ 84720AE
- .incbin "baserom.gba", 0x4720AE, 0x4E
-
-gUnknown_84720FC:: @ 84720FC
- .incbin "baserom.gba", 0x4720FC, 0x37
-
-gUnknown_8472133:: @ 8472133
- .incbin "baserom.gba", 0x472133, 0x3409
-
-gUnknown_847553C:: @ 847553C
- .incbin "baserom.gba", 0x47553C, 0xC
-
-gUnknown_8475548:: @ 8475548
- .incbin "baserom.gba", 0x475548, 0x8
-
-gUnknown_8475550:: @ 8475550
- .incbin "baserom.gba", 0x475550, 0x8
-
-gUnknown_8475558:: @ 8475558
- .incbin "baserom.gba", 0x475558, 0x20
-
-gUnknown_8475578:: @ 8475578
- .incbin "baserom.gba", 0x475578, 0x30
-
-gUnknown_84755A8:: @ 84755A8
- .incbin "baserom.gba", 0x4755A8, 0x30
-
-gUnknown_84755D8:: @ 84755D8
- .incbin "baserom.gba", 0x4755D8, 0x8
-
-gUnknown_84755E0:: @ 84755E0
- .incbin "baserom.gba", 0x4755E0, 0x8
-
-gUnknown_84755E8:: @ 84755E8
- .incbin "baserom.gba", 0x4755E8, 0x10
-
-gUnknown_84755F8:: @ 84755F8
- .incbin "baserom.gba", 0x4755F8, 0x4
-
-gUnknown_84755FC:: @ 84755FC
- .incbin "baserom.gba", 0x4755FC, 0x6
-
-gUnknown_8475602:: @ 8475602
- .incbin "baserom.gba", 0x475602, 0x6
-
-gUnknown_8475608:: @ 8475608
- .incbin "baserom.gba", 0x475608, 0x40
-
-gUnknown_8475648:: @ 8475648
- .incbin "baserom.gba", 0x475648, 0x14
-
-gUnknown_847565C:: @ 847565C
- .incbin "baserom.gba", 0x47565C, 0x18
-
-gUnknown_8475674:: @ 8475674
- .incbin "baserom.gba", 0x475674, 0x10
-
-gUnknown_8475684:: @ 8475684
- .incbin "baserom.gba", 0x475684, 0x8
-
-gUnknown_847568C:: @ 847568C
- .incbin "baserom.gba", 0x47568C, 0x10
-
-gUnknown_847569C:: @ 847569C
- .incbin "baserom.gba", 0x47569C, 0x8
-
-gUnknown_84756A4:: @ 84756A4
- .incbin "baserom.gba", 0x4756A4, 0x204
-
-gUnknown_84758A8:: @ 84758A8
- .incbin "baserom.gba", 0x4758A8, 0xC0
-
-gUnknown_8475968:: @ 8475968
- .incbin "baserom.gba", 0x475968, 0x1D4
-
-gUnknown_8475B3C:: @ 8475B3C
- .incbin "baserom.gba", 0x475B3C, 0x890
-
-gUnknown_84763CC:: @ 84763CC
- .incbin "baserom.gba", 0x4763CC, 0xDCC
-
-gUnknown_8477198:: @ 8477198
- .incbin "baserom.gba", 0x477198, 0x94
-
-gUnknown_847722C:: @ 847722C
- .incbin "baserom.gba", 0x47722C, 0x148
-
-gUnknown_8477374:: @ 8477374
- .incbin "baserom.gba", 0x477374, 0x121C
-
-gUnknown_8478590:: @ 8478590
- .incbin "baserom.gba", 0x478590, 0x26C
-
-gUnknown_84787FC:: @ 84787FC
- .incbin "baserom.gba", 0x4787FC, 0x250
-
-gUnknown_8478A4C:: @ 8478A4C
- .incbin "baserom.gba", 0x478A4C, 0x24C
-
-gUnknown_8478C98:: @ 8478C98
- .incbin "baserom.gba", 0x478C98, 0x48
-
-gUnknown_8478CE0:: @ 8478CE0
- .incbin "baserom.gba", 0x478CE0, 0xB0
-
-gUnknown_8478D90:: @ 8478D90
- .incbin "baserom.gba", 0x478D90, 0x8
-
-gUnknown_8478D98:: @ 8478D98
- .incbin "baserom.gba", 0x478D98, 0x8
-
-gUnknown_8478DA0:: @ 8478DA0
- .incbin "baserom.gba", 0x478DA0, 0x8
-
-gUnknown_8478DA8:: @ 8478DA8
- .incbin "baserom.gba", 0x478DA8, 0x24
-
-gUnknown_8478DCC:: @ 8478DCC
- .incbin "baserom.gba", 0x478DCC, 0x8
-
-gUnknown_8478DD4:: @ 8478DD4
- .incbin "baserom.gba", 0x478DD4, 0x8
-
-gUnknown_8478DDC:: @ 8478DDC
- .incbin "baserom.gba", 0x478DDC, 0x18
-
-gUnknown_8478DF4:: @ 8478DF4
- .incbin "baserom.gba", 0x478DF4, 0x18
-
-gUnknown_8478E0C:: @ 8478E0C
- .incbin "baserom.gba", 0x478E0C, 0x2
-
-gUnknown_8478E0E:: @ 8478E0E
- .incbin "baserom.gba", 0x478E0E, 0xA
-
-gUnknown_8478E18:: @ 8478E18
- .incbin "baserom.gba", 0x478E18, 0x8
-
-gUnknown_8478E20:: @ 8478E20
- .incbin "baserom.gba", 0x478E20, 0x18
-
-gUnknown_8478E38:: @ 8478E38
- .incbin "baserom.gba", 0x478E38, 0x3
-
-gUnknown_8478E3B:: @ 8478E3B
- .incbin "baserom.gba", 0x478E3B, 0x45
-
-gUnknown_8478E80:: @ 8478E80
- .incbin "baserom.gba", 0x478E80, 0x14
-
-gUnknown_8478E94:: @ 8478E94
- .incbin "baserom.gba", 0x478E94, 0x14
-
-gUnknown_8478EA8:: @ 8478EA8
- .incbin "baserom.gba", 0x478EA8, 0x8
-
-gUnknown_8478EB0:: @ 8478EB0
- .incbin "baserom.gba", 0x478EB0, 0xA
-
-gUnknown_8478EBA:: @ 8478EBA
- .incbin "baserom.gba", 0x478EBA, 0xA
-
-gUnknown_8478EC4:: @ 8478EC4
- .incbin "baserom.gba", 0x478EC4, 0x50
-
-gUnknown_8478F14:: @ 8478F14
- .incbin "baserom.gba", 0x478F14, 0x8
-
- .section .rodata.8479668
-
- .align 2
gUnknown_8479668:: @ 8479668
.incbin "graphics/misc/unk_8479688.gbapal"
diff --git a/data/strings.s b/data/strings.s
index ac7241354..27481f0a0 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -3351,58 +3351,67 @@ gUnknown_841CC64:: @ 841CC64
.string "SAVING...\n"
.string "DON'T TURN OFF THE POWER.$"
+gText_BerryPickingRecords::
.string "DODRIO BERRY-PICKING RECORDS$"
+gText_BerriesPicked::
.string "BERRIES picked:$"
+gText_BestScore::
.string "Best score:$"
+gText_BerriesInRowFivePlayers::
.string "BERRIES picked in a row with\n"
.string "five players:$"
-gUnknown_841CD03:: @ 841CD03
+gText_BerryPickingResults:: @ 841CD03
.string "Announcing BERRY-PICKING results!$"
-gUnknown_841CD25:: @ 841CD25
+gText_10P30P50P50P:: @ 841CD25
.string "10P 30P 50P {EXTRA 0xDD}50P$"
-gUnknown_841CD43:: @ 841CD43
+gText_AnnouncingRankings:: @ 841CD43
.string "Announcing rankings!$"
-gUnknown_841CD58:: @ 841CD58
+gText_AnnouncingPrizes:: @ 841CD58
.string "Announcing prizes!$"
+gText_1Colon::
.string "1:$"
+gText_2Colon::
.string "2:$"
+gText_3Colon::
.string "3:$"
+gText_4Colon::
.string "4:$"
+gText_5Colon::
.string "5:$"
-gUnknown_841CD7A:: @ 841CD7A
+gText_FirstPlacePrize:: @ 841CD7A
.string "The first-place winner gets\n"
.string "this {DYNAMIC 00}!$"
-gUnknown_841CD9F:: @ 841CD9F
+gText_CantHoldAnyMore:: @ 841CD9F
.string "You can't hold any more...$"
-gUnknown_841CDBA:: @ 841CDBA
+gText_FilledStorageSpace:: @ 841CDBA
.string "It filled its storage space.$"
-gUnknown_841CDD7:: @ 841CDD7
+gText_WantToPlayAgain:: @ 841CDD7
.string "Want to play again?$"
-gUnknown_841CDEB:: @ 841CDEB
+gText_SomeoneDroppedOut:: @ 841CDEB
.string "Somebody dropped out.\n"
.string "The link will be canceled.$"
-gUnknown_841CE1C:: @ 841CE1C
+gText_SpacePoints:: @ 841CE1C
.string " points$"
-gUnknown_841CE24:: @ 841CE24
+gText_CommunicationStandby3:: @ 841CE24
.string "Communication standby…$"
.align 2