Merge pull request #168 from PikalaxALT/dism_more_data

Dump data/berry_crush

asm/berry_crush_3.s

@@ -875,7 +875,7 @@ _0814DCD6:
 	asrs r0, 24
 	strh r0, [r2, 0x24]
 	ldr r2, [r3]
-	ldr r3, _0814DD38 @ =gUnknown_846F2D1
+	ldr r3, _0814DD38 @ =gUnknown_846F2D0 + 1
 	adds r1, r3
 	movs r0, 0
 	ldrsb r0, [r1, r0]
@@ -898,7 +898,7 @@ _0814DD2A:
 	ldrb r1, [r2]
 	b _0814DE18
 	.align 2, 0
-_0814DD38: .4byte gUnknown_846F2D1
+_0814DD38: .4byte gUnknown_846F2D0 + 1
 _0814DD3C:
 	ldrh r0, [r6, 0x28]
 	movs r1, 0x3
@@ -944,7 +944,7 @@ _0814DD64:
 	adds r0, 0x78
 	strh r0, [r2, 0x20]
 	ldr r2, [r7]
-	ldr r0, _0814DDD8 @ =gUnknown_846F2D7
+	ldr r0, _0814DDD8 @ =gUnknown_846F2D6 + 1
 	adds r1, r0
 	movs r6, 0
 	ldrsb r6, [r1, r6]
@@ -975,7 +975,7 @@ _0814DD64:
 	.align 2, 0
 _0814DDD0: .4byte sub_814F0D8
 _0814DDD4: .4byte gUnknown_846F2D6
-_0814DDD8: .4byte gUnknown_846F2D7
+_0814DDD8: .4byte gUnknown_846F2D6 + 1
 _0814DDDC:
 	ldr r0, [r7]
 	movs r1, 0
@@ -1161,7 +1161,7 @@ _0814DF22:
 	lsrs r2, r0, 24
 	cmp r2, 0x7
 	bls _0814DF0C
-	ldr r1, _0814DF40 @ =0x000f4240
+	ldr r1, _0814DF40 @ =1000000
 	adds r0, r7, 0
 	bl __udivsi3
 	strh r0, [r6, 0x8]
@@ -1170,7 +1170,7 @@ _0814DF22:
 	bx r0
 	.align 2, 0
 _0814DF3C: .4byte gUnknown_846E450
-_0814DF40: .4byte 0x000f4240
+_0814DF40: .4byte 1000000
 	thumb_func_end sub_814DEC0
 
 	thumb_func_start sub_814DF44
@@ -1468,7 +1468,7 @@ _0814E178:
 	cmp r2, 0x3
 	bls _0814E160
 	adds r0, r3, 0
-	ldr r1, _0814E1EC @ =0x000f4240
+	ldr r1, _0814E1EC @ =1000000
 	bl __udivsi3
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -1514,7 +1514,7 @@ _0814E178:
 	.align 2, 0
 _0814E1E4: .4byte gStringVar1
 _0814E1E8: .4byte gUnknown_846E450
-_0814E1EC: .4byte 0x000f4240
+_0814E1EC: .4byte 1000000
 _0814E1F0: .4byte gStringVar2
 _0814E1F4: .4byte gUnknown_846F4B8
 _0814E1F8: .4byte gStringVar4
@@ -1882,7 +1882,7 @@ _0814E4EA:
 	movs r3, 0x3
 	bl ConvertIntToDecimalStringN
 	ldr r4, _0814E570 @ =gStringVar2
-	ldr r1, _0814E590 @ =0x000f4240
+	ldr r1, _0814E590 @ =1000000
 	ldr r0, [sp, 0xC]
 	bl __udivsi3
 	adds r1, r0, 0
@@ -1934,7 +1934,7 @@ _0814E580: .4byte gUnknown_841D074
 _0814E584: .4byte gUnknown_841D058
 _0814E588: .4byte gUnknown_841D098
 _0814E58C: .4byte gUnknown_846E450
-_0814E590: .4byte 0x000f4240
+_0814E590: .4byte 1000000
 _0814E594: .4byte gUnknown_841D090
 _0814E598: .4byte gUnknown_846E3EB
 _0814E59C:
@@ -2052,7 +2052,7 @@ _0814E680:
 	bl sub_814EB04
 	ldrh r0, [r4, 0x12]
 	lsls r0, 3
-	ldr r2, _0814E6A8 @ =gUnknown_846E3D0
+	ldr r2, _0814E6A8 @ =gUnknown_846E3CC + 4
 	mov r1, sp
 	adds r0, r2
 	ldm r0!, {r2,r3}
@@ -2064,7 +2064,7 @@ _0814E680:
 	adds r0, 0x4
 	b _0814E6B2
 	.align 2, 0
-_0814E6A8: .4byte gUnknown_846E3D0
+_0814E6A8: .4byte gUnknown_846E3CC + 4
 _0814E6AC: .4byte gUnknown_846E448
 _0814E6B0:
 	ldr r0, _0814E6C8 @ =gUnknown_846E448
@@ -2424,7 +2424,7 @@ _0814E96E:
 	movs r3, 0x3
 	bl ConvertIntToDecimalStringN
 	mov r0, r10
-	ldr r1, _0814EA1C @ =0x000f4240
+	ldr r1, _0814EA1C @ =1000000
 	bl __udivsi3
 	adds r1, r0, 0
 	ldr r0, _0814EA20 @ =gStringVar2
@@ -2482,7 +2482,7 @@ _0814EA0C: .4byte gStringVar1
 _0814EA10: .4byte gUnknown_841D13C
 _0814EA14: .4byte gUnknown_846E3DC
 _0814EA18: .4byte gUnknown_846E450
-_0814EA1C: .4byte 0x000f4240
+_0814EA1C: .4byte 1000000
 _0814EA20: .4byte gStringVar2
 _0814EA24: .4byte gUnknown_841D090
 _0814EA28: .4byte gUnknown_841D098

data/berry_crush.s

@@ -2,119 +2,364 @@
 	.include "constants/constants.inc"
 
 	.section .rodata
+	.align 2
 gUnknown_846E2E0:: @ 846E2E0
-	.incbin "baserom.gba", 0x46E2E0, 0x8
+	.byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
 
 gUnknown_846E2E8:: @ 846E2E8
-	.incbin "baserom.gba", 0x46E2E8, 0x8
+	.byte 0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00
 
 gUnknown_846E2F0:: @ 846E2F0
-	.incbin "baserom.gba", 0x46E2F0, 0x24
+	.byte 0x04, 0x01, 0x00, 0xff
+	.byte 0x00, 0x00, 0x00, 0x04
+	.byte 0x02, 0x00, 0xff, 0x00
+	.byte 0x00, 0x00, 0x04, 0x02
+	.byte 0x00, 0xfe, 0x00, 0x00
+	.byte 0x00, 0x06, 0x03, 0x01
+	.byte 0xff, 0xfd, 0xff, 0x00
+	.byte 0x06, 0x04, 0x01, 0xfe
+	.byte 0xfc, 0xfe, 0x00, 0x00
 
 gUnknown_846E314:: @ 846E314
-	.incbin "baserom.gba", 0x46E314, 0x14
+	.byte 0x03, 0x02, 0x01, 0x00
+	.byte 0x03, 0x03, 0x01, 0x00
+	.byte 0x03, 0x03, 0x02, 0x00
+	.byte 0x03, 0x04, 0x02, 0x00
+	.byte 0x03, 0x05, 0x03, 0x00
 
 gUnknown_846E328:: @ 846E328
-	.incbin "baserom.gba", 0x46E328, 0x24
+	.4byte gUnknown_841CE3C
+	.4byte gUnknown_841CE78
+	.4byte gUnknown_841CEA8
+	.4byte gUnknown_841CF14
+	.4byte gUnknown_841CF50
+	.4byte gUnknown_841CF70
+	.4byte gUnknown_841CFA0
+	.4byte gUnknown_841CFD4
+	.4byte gUnknown_841D008
 
 gUnknown_846E34C:: @ 846E34C
-	.incbin "baserom.gba", 0x46E34C, 0x68
+	.4byte NULL
+	.4byte sub_814BBB8
+	.4byte sub_814BC10
+	.4byte sub_814BC74
+	.4byte sub_814BD7C
+	.4byte sub_814BD9C
+	.4byte sub_814BDBC
+	.4byte sub_814BE0C
+	.4byte sub_814BE64
+	.4byte sub_814BE7C
+	.4byte sub_814BFD0
+	.4byte sub_814C118
+	.4byte sub_814C24C
+	.4byte sub_814C850
+	.4byte sub_814C8F8
+	.4byte sub_814C990
+	.4byte sub_814CB20
+	.4byte sub_814CC0C
+	.4byte sub_814CFA8
+	.4byte sub_814D094
+	.4byte sub_814D188
+	.4byte sub_814D240
+	.4byte sub_814D31C
+	.4byte sub_814D3A4
+	.4byte sub_814D468
+	.4byte sub_814D4C8
 
 gUnknown_846E3B4:: @ 846E3B4
-	.incbin "baserom.gba", 0x46E3B4, 0x10
+	.byte 0x02, 0x04, 0x06, 0x07
+	.byte 0x03, 0x05, 0x08, 0x0b
+	.byte 0x03, 0x07, 0x0b, 0x0f
+	.byte 0x04, 0x08, 0x0c, 0x11
 
 gUnknown_846E3C4:: @ 846E3C4
-	.incbin "baserom.gba", 0x46E3C4, 0x4
+	.byte 0x05, 0x07, 0x09, 0x0c
 
 gUnknown_846E3C8:: @ 846E3C8
-	.incbin "baserom.gba", 0x46E3C8, 0x4
+	.byte 0x03, 0x07, 0x0f, 0x1f
 
 gUnknown_846E3CC:: @ 846E3CC
-	.incbin "baserom.gba", 0x46E3CC, 0x4
+	.4byte 0x000000f8
-
+	@ {
-gUnknown_846E3D0:: @ 846E3D0
+	@ 	.bg = 0,
-	.incbin "baserom.gba", 0x46E3D0, 0xC
+	@ 	.charBaseIndex = 2,
+	@ 	.mapBaseIndex = 15,
+	@ 	.screenSize = 0,
+	@ 	.paletteMode = 0,
+	@ 	.priority = 0,
+	@ 	.baseTile = 0x0000
+	@ }
+	.4byte 0x000014d1
+	@ {
+	@ 	.bg = 1,
+	@ 	.charBaseIndex = 0,
+	@ 	.mapBaseIndex = 13,
+	@ 	.screenSize = 2,
+	@ 	.paletteMode = 0,
+	@ 	.priority = 1,
+	@ 	.baseTile = 0x0000
+	@ }
+	.4byte 0x000020c2
+	@ {
+	@ 	.bg = 2,
+	@ 	.charBaseIndex = 0,
+	@ 	.mapBaseIndex = 12,
+	@ 	.screenSize = 0,
+	@ 	.paletteMode = 0,
+	@ 	.priority = 2,
+	@ 	.baseTile = 0x0000
+	@ }
+	.4byte 0x000030b3
+	@ {
+	@ 	.bg = 3,
+	@ 	.charBaseIndex = 0,
+	@ 	.mapBaseIndex = 11,
+	@ 	.screenSize = 0,
+	@ 	.paletteMode = 0,
+	@ 	.priority = 3,
+	@ 	.baseTile = 0x0000
+	@ }
 
 gUnknown_846E3DC:: @ 846E3DC
-	.incbin "baserom.gba", 0x46E3DC, 0x3
+	.byte 0x01, 0x02, 0x03
 
 gUnknown_846E3DF:: @ 846E3DF
-	.incbin "baserom.gba", 0x46E3DF, 0x3
+	.byte 0x00, 0x01, 0x02
 
 gUnknown_846E3E2:: @ 846E3E2
-	.incbin "baserom.gba", 0x46E3E2, 0x3
+	.byte 0x00, 0x03, 0x04
 
 gUnknown_846E3E5:: @ 846E3E5
-	.incbin "baserom.gba", 0x46E3E5, 0x6
+	.byte 0x01, 0x08, 0x09
+	.byte 0x01, 0x06, 0x07
 
 gUnknown_846E3EB:: @ 846E3EB
-	.incbin "baserom.gba", 0x46E3EB, 0x5
+	.byte 0x01, 0x04, 0x05
 
+	.align 2
 gUnknown_846E3F0:: @ 846E3F0
-	.incbin "baserom.gba", 0x46E3F0, 0x8
+	.byte 0, 3, 4, 24, 13, 15
+	.2byte 0x0001
 
 gUnknown_846E3F8:: @ 846E3F8
-	.incbin "baserom.gba", 0x46E3F8, 0x50
+	.byte 0, 0, 0, 9, 2, 8
+	.2byte 0x03ed
+	.byte 0, 0, 3, 9, 2, 8
+	.2byte 0x03db
+	.byte 0, 0, 6, 9, 2, 8
+	.2byte 0x03c9
+	.byte 0, 21, 3, 9, 2, 8
+	.2byte 0x03b7
+	.byte 0, 21, 6, 9, 2, 8
+	.2byte 0x03a5
+	.byte 255, 0, 0, 0, 0, 0
+	.2byte 0x0000
+	.byte 0, 4, 2, 22, 16, 15
+	.2byte 0x0001
+	.byte 0, 4, 2, 22, 16, 15
+	.2byte 0x0001
+	.byte 0, 3, 2, 24, 16, 15
+	.2byte 0x0001
+	.byte 255, 0, 0, 0, 0, 0
+	.2byte 0x0000
 
 gUnknown_846E448:: @ 846E448
-	.incbin "baserom.gba", 0x46E448, 0x8
+	.byte 0x06, 0x08, 0x09, 0x0b
+	.byte 0x0c, 0x0e, 0x0f, 0x10
 
 gUnknown_846E450:: @ 846E450
-	.incbin "baserom.gba", 0x46E450, 0x940
+	.4byte 50000000, 25000000, 12500000, 6250000, 3125000, 1562500, 781250, 390625
 
-gUnknown_846ED90:: @ 846ED90
+gUnknown_846E470:: @ 846E470 gbapal
-	.incbin "baserom.gba", 0x46ED90, 0x130
+	.incbin "graphics/link_games/unk_846E4D0.gbapal"
 
-gUnknown_846EEC0:: @ 846EEC0
+gUnknown_846E490:: @ 846E490 gbapal
-	.incbin "baserom.gba", 0x46EEC0, 0x198
+	.incbin "graphics/link_games/unk_846E7FC.gbapal"
 
-gUnknown_846F058:: @ 846F058
+gUnknown_846E4B0:: @ 846E4B0 gbapal
-	.incbin "baserom.gba", 0x46F058, 0x228
+	.incbin "graphics/link_games/unk_846ECC4.gbapal"
+
+gUnknown_846E4D0:: @ 846E4D0 4bpp.lz
+	.incbin "graphics/link_games/unk_846E4D0.4bpp.lz"
+
+gUnknown_846E7FC:: @ 846E7FC 4bpp.lz
+	.incbin "graphics/link_games/unk_846E7FC.4bpp.lz"
+
+gUnknown_846EB78:: @ 846EB78 4bpp.lz
+	.incbin "graphics/link_games/unk_846EB78.4bpp.lz"
+
+gUnknown_846ECC4:: @ 846ECC4 4bpp.lz
+	.incbin "graphics/link_games/unk_846ECC4.4bpp.lz"
+
+gUnknown_846ED90:: @ 846ED90 bin.lz
+	.incbin "graphics/link_games/unk_846ED90.bin.lz"
+
+gUnknown_846EEC0:: @ 846EEC0 bin.lz
+	.incbin "graphics/link_games/unk_846EEC0.bin.lz"
+
+gUnknown_846F058:: @ 846F058 bin.lz
+	.incbin "graphics/link_games/unk_846F058.bin.lz"
 
 gUnknown_846F280:: @ 846F280
-	.incbin "baserom.gba", 0x46F280, 0x14
+	.byte 0x01, 0x03, 0x00, 0x00, 0x00
+	.byte 0x00, 0x01, 0x03, 0x00, 0x00
+	.byte 0x01, 0x03, 0x02, 0x04, 0x00
+	.byte 0x00, 0x01, 0x03, 0x02, 0x04
 
 gUnknown_846F294:: @ 846F294
-	.incbin "baserom.gba", 0x46F294, 0x3C
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x00, 0x00, 0x00, 0x00
+	.byte 0x01, 0x00, 0x03, 0x00, 0xe4, 0xff, 0xfc, 0xff, 0xe8, 0xff, 0x10, 0x00
+	.byte 0x02, 0x00, 0x06, 0x00, 0xf0, 0xff, 0x14, 0x00, 0xf8, 0xff, 0x10, 0x00
+	.byte 0x03, 0x14, 0x03, 0x00, 0x1c, 0x00, 0xfc, 0xff, 0x20, 0x00, 0xf8, 0xff
+	.byte 0x04, 0x14, 0x06, 0x00, 0x10, 0x00, 0x14, 0x00, 0x10, 0x00, 0xf8, 0xff
 
 gUnknown_846F2D0:: @ 846F2D0
-	.incbin "baserom.gba", 0x46F2D0, 0x1
+	.byte 0x00, 0x00
-
+	.byte 0xff, 0x00
-gUnknown_846F2D1:: @ 846F2D1
+	.byte 0x01, 0x01
-	.incbin "baserom.gba", 0x46F2D1, 0x5
 
 gUnknown_846F2D6:: @ 846F2D6
-	.incbin "baserom.gba", 0x46F2D6, 0x1
+	.byte 0x00, 0x00
-
+	.byte 0xf0, 0xfc
-gUnknown_846F2D7:: @ 846F2D7
+	.byte 0x10, 0xfc
-	.incbin "baserom.gba", 0x46F2D7, 0x15
+	.byte 0xf8, 0xfe
+	.byte 0x08, 0xfe
+	.byte 0xe8, 0xf8
+	.byte 0x18, 0xf8
+	.byte 0xe0, 0xf4
+	.byte 0x20, 0xf4
+	.byte 0xd8, 0xf0
+	.byte 0x28, 0xf0
 
 gUnknown_846F2EC:: @ 846F2EC
-	.incbin "baserom.gba", 0x46F2EC, 0xC
+	.2byte 5, 6, 7, 8, 9
 
+	.align 2
 gUnknown_846F2F8:: @ 846F2F8
-	.incbin "baserom.gba", 0x46F2F8, 0x28
+	obj_tiles gUnknown_846E4D0, 0x0800, 1
+	obj_tiles gUnknown_846E7FC, 0x0e00, 2
+	obj_tiles gUnknown_846EB78, 0x0700, 3
+	obj_tiles gUnknown_846ECC4, 0x02c0, 4
+	obj_tiles NULL, 0x0000, 0
 
 gUnknown_846F320:: @ 846F320
-	.incbin "baserom.gba", 0x46F320, 0xF0
+	obj_pal gUnknown_846E470, 1
+	obj_pal gUnknown_846E490, 2
+	obj_pal gUnknown_846E4B0, 4
+	obj_pal NULL, 0
+
+gUnknown_846F340::
+	obj_image_anim_frame 0x0000, 0
+	obj_image_anim_end
+
+gUnknown_846F348::
+	obj_image_anim_frame 0x0000, 4
+	obj_image_anim_frame 0x0010, 4
+	obj_image_anim_frame 0x0020, 4
+	obj_image_anim_end
+
+gUnknown_846F358::
+	obj_image_anim_frame 0x0030, 2
+	obj_image_anim_frame 0x0040, 2
+	obj_image_anim_frame 0x0050, 2
+	obj_image_anim_frame 0x0060, 2
+	obj_image_anim_end
+
+gUnknown_846F36C::
+	obj_image_anim_frame 0x0000, 2
+	obj_image_anim_frame 0x0004, 2
+	obj_image_anim_frame 0x0008, 2
+	obj_image_anim_frame 0x000c, 2
+	obj_image_anim_frame 0x0010, 2
+	obj_image_anim_frame 0x0014, 2
+	obj_image_anim_jump 0
+
+gUnknown_846F388::
+	obj_image_anim_frame 0x0018, 4
+	obj_image_anim_frame 0x001c, 4
+	obj_image_anim_frame 0x0020, 4
+	obj_image_anim_frame 0x0024, 4
+	obj_image_anim_frame 0x0028, 4
+	obj_image_anim_frame 0x002c, 4
+	obj_image_anim_frame 0x0030, 4
+	obj_image_anim_frame 0x0034, 4
+	obj_image_anim_jump 0
+
+gUnknown_846F3AC::
+	obj_image_anim_frame 0x0014, 0
+	obj_image_anim_end
+
+gUnknown_846F3B4::
+	obj_image_anim_frame 0x0000, 0
+	obj_image_anim_end
+
+gUnknown_846F3BC::
+	obj_rot_scal_anim_frame 256, 256, 0, 0
+	obj_rot_scal_anim_frame 0, 0, 2, 1
+	obj_rot_scal_anim_jump 1
+
+gUnknown_846F3D4::
+	obj_rot_scal_anim_frame 256, 256, 0, 0
+	obj_rot_scal_anim_frame 0, 0, 254, 1
+	obj_rot_scal_anim_jump 1
+
+gUnknown_846F3EC::
+	.4byte gUnknown_846F340
+
+gUnknown_846F3F0::
+	.4byte gUnknown_846F348
+	.4byte gUnknown_846F358
+
+gUnknown_846F3F8::
+	.4byte gUnknown_846F36C
+	.4byte gUnknown_846F388
+
+gUnknown_846F400::
+	.4byte gUnknown_846F3AC
+
+gUnknown_846F404::
+	.4byte gUnknown_846F3B4
+
+gUnknown_846F408::
+	.4byte gUnknown_846F3BC
+	.4byte gUnknown_846F3D4
 
 gUnknown_846F410:: @ 846F410
-	.incbin "baserom.gba", 0x46F410, 0x18
+	spr_template 1, 1, gOamData_83AC9E0, gUnknown_846F3EC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_846F428:: @ 846F428
-	.incbin "baserom.gba", 0x46F428, 0x18
+	spr_template 2, 2, gOamData_83AC9D8, gUnknown_846F3F0, NULL, gDummySpriteAffineAnimTable, sub_814EFD0
 
 gUnknown_846F440:: @ 846F440
-	.incbin "baserom.gba", 0x46F440, 0x18
+	spr_template 3, 2, gOamData_83AC9D0, gUnknown_846F3F8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_846F458:: @ 846F458
-	.incbin "baserom.gba", 0x46F458, 0x18
+	spr_template 4, 4, gOamData_83ACA08, gUnknown_846F400, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_846F470:: @ 846F470
-	.incbin "baserom.gba", 0x46F470, 0x18
+	spr_template 5, 5, gOamData_83ACA98, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy
 
-gUnknown_846F488:: @ 846F488
+gUnknown_846F488:: @ 846F488 struct UnkStruct3? perhaps not
-	.incbin "baserom.gba", 0x46F488, 0x30
+	.byte 9, 2, 8
+	.align 2
+	.2byte 0x9c, 0x00
+	.4byte gUnknown_846F2F8 + 0x18
+	.4byte gUnknown_846F320 + 0x10
+	.byte 8, 2, 8
+	.align 2
+	.2byte 0xb4, 0x00
+	.4byte gUnknown_846F2F8 + 0x18
+	.4byte gUnknown_846F320 + 0x10
+	.byte 8, 2, 8
+	.align 2
+	.2byte 0xcc, 0x00
+	.4byte gUnknown_846F2F8 + 0x18
+	.4byte gUnknown_846F320 + 0x10
 
 gUnknown_846F4B8:: @ 846F4B8
-	.incbin "baserom.gba", 0x46F4B8, 0x18
+	.4byte gUnknown_841D034
+	.4byte gUnknown_841D03C
+	.4byte gUnknown_841D044
+	.4byte gUnknown_841D0D4
+	.4byte gUnknown_841D0E8
+	.4byte gUnknown_841D100

data/strings.s

@@ -3405,37 +3405,55 @@ gUnknown_841CE1C:: @ 841CE1C
 gUnknown_841CE24:: @ 841CE24
 	.string "Communication standby…$"
 
-	.string " Are you ready to BERRY-CRUSH?\n"
+	.align 2
+gUnknown_841CE3C:: @ 841CE3C
+	.string "Are you ready to BERRY-CRUSH?\n"
 	.string "Please pick a BERRY for use.\p"
 	.string "$"
 
+	.align 2
+gUnknown_841CE78:: @ 841CE78
 	.string "Please wait while each member\n"
 	.string "chooses a BERRY.$"
 
-	.string " {PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\n"
+	.align 2
+gUnknown_841CEA8:: @ 841CEA8
+	.string "{PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\n"
 	.string "silky-smooth BERRY POWDER.{RESUME_MUSIC}\p"
 	.string "Your total amount of BERRY POWDER\n"
 	.string "is {STR_VAR_2}.\p"
 	.string "$"
 
-	.string " Recording your game results in the\n"
+	.align 2
+gUnknown_841CF14:: @ 841CF14
+	.string "Recording your game results in the\n"
 	.string "save file.\n"
 	.string "Please wait.$"
 
-	.string " Want to play BERRY CRUSH again?$"
+	.align 2
+gUnknown_841CF50:: @ 841CF50
+	.string "Want to play BERRY CRUSH again?$"
 
+	.align 2
+gUnknown_841CF70:: @ 841CF70
 	.string "You have no BERRIES.\n"
 	.string "The game will be canceled.$"
 
+	.align 2
+gUnknown_841CFA0:: @ 841CFA0
 	.string "A member dropped out.\n"
 	.string "The game will be canceled.$"
 
-	.string "   Time's up.\p"
+	.align 2
+gUnknown_841CFD4:: @ 841CFD4
+	.string "Time's up.\p"
 	.string "Good BERRY POWDER could not be\n"
 	.string "made…\p"
 	.string "$"
 
-	.string "   Communication standby…$"
+	.align 2
+gUnknown_841D008:: @ 841D008
+	.string "Communication standby…$"
 
 	.align 2
 gUnknown_841D020:: @ 841D020
@@ -3444,14 +3462,17 @@ gUnknown_841D020:: @ 841D020
 gUnknown_841D02C:: @ 841D02C
 	.string "1. {DYNAMIC 0x00}$"
 
-gUnknown_841D032:: @ 0x841D032
+	.align 2
-	.string "   times$"
+gUnknown_841D034:: @ 0x841D034
+	.string " times$"
 
-gUnknown_841D03B:: @ 0x841D03B
+	.align 2
-	.string " {STR_VAR_1}.{STR_VAR_2}$"
+gUnknown_841D03C:: @ 0x841D03C
+	.string "{STR_VAR_1}.{STR_VAR_2}$"
 
-gUnknown_841D042:: @ 0x841D042
+	.align 2
-	.string "  {STR_VAR_1} BERRY$"
+gUnknown_841D044:: @ 0x841D044
+	.string "{STR_VAR_1} BERRY$"
 
 	.align 2
 gUnknown_841D050:: @ 841D050
@@ -3492,20 +3513,25 @@ gUnknown_841D098:: @ 841D098
 gUnknown_841D0A4:: @ 841D0A4
 	.string "{STR_VAR_1}サ$"
 
+	.align 2
 gUnknown_841D0A8:: @ 841D0A8
 	.string "No. of Presses Rankings$"
 
+	.align 2
 gUnknown_841D0C0:: @ 841D0C0
 	.string "Crushing Results$"
 
-gUnknown_841D0D1:: @ 0x841D0D1
+	.align 2
-	.string "   Neatness Rankings$"
+gUnknown_841D0D4:: @ 0x841D0D4
+	.string "Neatness Rankings$"
 
-gUnknown_841D0E6:: @ 0x841D0E6
+	.align 2
-	.string "  Cooperative Rankings$"
+gUnknown_841D0E8:: @ 0x841D0E8
+	.string "Cooperative Rankings$"
 
-gUnknown_841D0FD:: @ 0x841D0FD
+	.align 2
-	.string "   Pressing-Power Rankings$"
+gUnknown_841D100:: @ 0x841D100
+	.string "Pressing-Power Rankings$"
 
 gUnknown_841D118:: @ 841D118
 	.string "BERRY CRUSH$"