Disassemble lilycove lady data

5 files changed, 215 insertions, 37 deletions

diff --git a/data/data_emerald.s b/data/data_emerald.s
index 54bda4a0e..38c50a6c8 100644
--- a/data/data_emerald.s
+++ b/data/data_emerald.s
@@ -1,7 +1,11 @@
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
-	.section .rodata
+    @ This section was decompiled in battle_dome_cards.
+    @ On its merge, this section should be deleted.
+    @ This section contains three objects and accounts for 28 bytes.
+
+    .section .rodata.deleteme
 
 gUnknown_0860B058:: @ 860B058
 	.incbin "baserom.gba", 0x60b058, 0xc
@@ -12,41 +16,7 @@ gUnknown_0860B064:: @ 860B064
 gUnknown_0860B06C:: @ 860B06C
 	.incbin "baserom.gba", 0x60b06c, 0x8
 
-gUnknown_0860B074:: @ 860B074
-	.incbin "baserom.gba", 0x60b074, 0xa
-
-gUnknown_0860B07E:: @ 860B07E
-	.incbin "baserom.gba", 0x60b07e, 0x126
-
-gUnknown_0860B1A4:: @ 860B1A4
-	.incbin "baserom.gba", 0x60b1a4, 0x40
-
-gUnknown_0860B1E4:: @ 860B1E4
-	.incbin "baserom.gba", 0x60b1e4, 0x20
-
-gUnknown_0860B204:: @ 860B204
-	.incbin "baserom.gba", 0x60b204, 0x20
-
-gUnknown_0860B224:: @ 860B224
-	.incbin "baserom.gba", 0x60b224, 0xc8
-
-gUnknown_0860B2EC:: @ 860B2EC
-	.incbin "baserom.gba", 0x60b2ec, 0x18
-
-gUnknown_0860B304:: @ 860B304
-	.incbin "baserom.gba", 0x60b304, 0xc
-
-gUnknown_0860B310:: @ 860B310
-	.incbin "baserom.gba", 0x60b310, 0x14
-
-gUnknown_0860B324:: @ 860B324
-	.incbin "baserom.gba", 0x60b324, 0x14
-
-gUnknown_0860B338:: @ 860B338
-	.incbin "baserom.gba", 0x60b338, 0x14
-
-gUnknown_0860B34C:: @ 860B34C
-	.incbin "baserom.gba", 0x60b34c, 0xc
+	.section .rodata
 
 gUnknown_0860B358:: @ 860B358
 	.incbin "baserom.gba", 0x60b358, 0x1630
diff --git a/data/lilycove_lady.s b/data/lilycove_lady.s
new file mode 100644
index 000000000..9d076213c
--- /dev/null
+++ b/data/lilycove_lady.s
@@ -0,0 +1,163 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnknown_0860B074:: @ 860B074
+@ replacing .incbin "baserom.gba", 0x0060b074, 0xa
+    .2byte 0x0062, 0x00cb, 0x00dc, 0x00cc, 0x00d1
+
+gUnknown_0860B07E:: @ 860B07E
+@ replacing .incbin "baserom.gba", 0x0060b07e, 0x6
+    .2byte 0x001a, 0x0014, 0x000a
+
+Unknown_0860B084::
+	.2byte 0x101b, 0x1623, 0x1812, 0x102c, 0x020e, 0x0c03, 0x1a0b, 0x0210, 0x020d
+
+Unknown_0860B096::
+	.2byte 0x101b, 0x1013, 0x1020, 0x1a0f, 0x020c, 0x0c03, 0x0211, 0x0203, 0x0400
+
+Unknown_0860B0A8::
+	.2byte 0x0e0f, 0x1018, 0x020e, 0x0204, 0x0c03, 0xffff, 0x0212, 0x0451, 0x0463
+
+Unknown_0860B0BA::
+	.2byte 0x101b, 0x100b, 0x0e0d, 0x141a, 0x181d, 0x0c03, 0x141e, 0x1a26, 0x1823
+
+Unknown_0860B0CC::
+	.2byte 0x101b, 0x181d, 0x1018, 0x0a02, 0x2014, 0x0c03, 0x0208, 0x1824, 0x181c
+
+Unknown_0860B0DE::
+	.2byte 0x101b, 0x1000, 0x1c19, 0x265d, 0x0c03, 0xffff, 0x0447, 0x045d, 0x042c
+
+Unknown_0860B0F0::
+	.2byte 0x101b, 0x1034, 0x1e11, 0x100b, 0x1a08, 0x0c03, 0x044b, 0x0446, 0x040a
+
+Unknown_0860B102::
+	.2byte 0x101b, 0x1000, 0x274f, 0x0626, 0x0c03, 0xffff, 0x0442, 0x0411, 0x0450
+
+Unknown_0860B114::
+	.2byte 0x101b, 0x1000, 0x1c19, 0x043c, 0x0c03, 0xffff, 0x0421, 0x0464, 0x0435
+
+Unknown_0860B126::
+	.2byte 0x101b, 0x1203, 0x1030, 0x0207, 0x0c03, 0xffff, 0x0210, 0x020e, 0x020d
+
+Unknown_0860B138::
+	.2byte 0x101b, 0x1623, 0x0a05, 0x020e, 0x0c03, 0xffff, 0x1a25, 0x181a, 0x181b
+
+Unknown_0860B14A::
+	.2byte 0x101b, 0x1823, 0x1603, 0x0a02, 0x1812, 0x0c03, 0x1a15, 0x1a23, 0x181b
+
+Unknown_0860B15C::
+	.2byte 0x1020, 0x020e, 0x1010, 0x1043, 0x1e0f, 0x0c03, 0x181c, 0x1a24, 0x1816
+
+Unknown_0860B16E::
+	.2byte 0x0446, 0x100b, 0x0620, 0x061c, 0x101b, 0x0c03, 0x0420, 0x0426, 0xffff
+
+Unknown_0860B180::
+	.2byte 0x0400, 0x100b, 0x0639, 0x061c, 0x101b, 0x0c03, 0x040e, 0x0410, 0xffff
+
+Unknown_0860B192::
+	.2byte 0x041f, 0x100b, 0x0639, 0x061c, 0x101b, 0x0c03, 0x0445, 0x0400, 0xffff
+
+gUnknown_0860B1A4:: @ 860B1A4
+@ replacing .incbin "baserom.gba", 0x0060b1a4, 0x40
+    .4byte Unknown_0860B084
+    .4byte Unknown_0860B096
+    .4byte Unknown_0860B0A8
+    .4byte Unknown_0860B0BA
+    .4byte Unknown_0860B0CC
+    .4byte Unknown_0860B0DE
+    .4byte Unknown_0860B0F0
+    .4byte Unknown_0860B102
+    .4byte Unknown_0860B114
+    .4byte Unknown_0860B126
+    .4byte Unknown_0860B138
+    .4byte Unknown_0860B14A
+    .4byte Unknown_0860B15C
+    .4byte Unknown_0860B16E
+    .4byte Unknown_0860B180
+    .4byte Unknown_0860B192
+
+gUnknown_0860B1E4:: @ 860B1E4
+@ replacing .incbin "baserom.gba", 0x0060b1e4, 0x20
+    .2byte 0x0210, 0x0400, 0x0212, 0x1a26, 0x0208, 0x045d, 0x040a, 0x0411, 0x0464, 0x020e, 0x1a25, 0x181b, 0x1a24, 0x0420, 0x0410, 0x0400
+
+gUnknown_0860B204:: @ 860B204
+@ replacing .incbin "baserom.gba", 0x0060b204, 0x20
+    .2byte 0x007b, 0x007f, 0x0081, 0x0023, 0x0023, 0x0023, 0x00a5, 0x00a7, 0x00a6, 0x000b, 0x012f, 0x006b, 0x006d, 0x0044, 0x0044, 0x000c
+
+gUnknown_0860B224:: @ 860B224
+@ replacing .incbin "baserom.gba", 0x0060b224, 0xc8
+    .4byte gUnknown_085EEB83
+	.4byte gUnknown_085EEB8C
+	.4byte gUnknown_085EEB95
+	.4byte gUnknown_085EEB9E
+	.4byte gUnknown_085EEBA4
+	.4byte gUnknown_085EEBAB
+
+Unknown_0860B23C::
+@ replacing .incbin "baserom.gba", 0x0060b23c, 0x1a
+.2byte 0x0056, 0x0053, 0x0054, 0x000e, 0x0012, 0x000f, 0x00a7, 0x0011, 0x0010, 0x0018, 0x0019, 0x001e, 0x0000
+
+Unknown_0860B256::
+@ replacing .incbin "baserom.gba", 0x0060b256, 0x22
+.2byte 0x0051, 0x006a, 0x006b, 0x00cc, 0x00c2, 0x002f, 0x0067, 0x0068, 0x0087, 0x0089, 0x008b, 0x009d, 0x00a0, 0x00a5, 0x0004, 0x0002
+.2byte 0x0000
+
+Unknown_0860B278::
+@ replacing .incbin "baserom.gba", 0x0060b278, 0x1e
+.2byte 0x0021, 0x000d, 0x001a, 0x001b, 0x001c, 0x00cc, 0x00ca, 0x0026, 0x0086, 0x0096, 0x0097, 0x009a, 0x00a2, 0x00a6, 0x0000
+
+Unknown_0860B296::
+@ replacing .incbin "baserom.gba", 0x0060b296, 0x2a
+.2byte 0x0020, 0x004d, 0x004b, 0x004c, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x006e, 0x005d, 0x006c, 0x006d, 0x006a, 0x006b, 0x00d6
+.2byte 0x00bc, 0x00b3, 0x000b, 0x000c, 0x0000
+
+Unknown_0860B2C0::
+@ replacing .incbin "baserom.gba", 0x0060b2c0, 0x16
+.2byte 0x001f, 0x0013, 0x0014, 0x004a, 0x004e, 0x0049, 0x00a5, 0x00c8, 0x0067, 0x006f, 0x0000
+
+Unknown_0860B2D6::
+@ replacing .incbin "baserom.gba", 0x0060b2d6, 0x16
+.2byte 0x00b7, 0x00d3, 0x00d2, 0x00d8, 0x009e, 0x00a6, 0x00ab, 0x00aa, 0x006c, 0x006d, 0x0000
+
+gUnknown_0860B2EC:: @ 860B2EC
+@ replacing .incbin "baserom.gba", 0x0060b2ec, 0x18
+    .4byte Unknown_0860B23C
+    .4byte Unknown_0860B256
+    .4byte Unknown_0860B278
+    .4byte Unknown_0860B296
+    .4byte Unknown_0860B2C0
+    .4byte Unknown_0860B2D6
+
+gUnknown_0860B304:: @ 860B304
+@ replacing .incbin "baserom.gba", 0x0060b304, 0xc
+.2byte 0x000b, 0x006e, 0x0040, 0x006f, 0x0044, 0x0047
+
+gUnknown_0860B310:: @ 860B310
+@ replacing .incbin "baserom.gba", 0x0060b310, 0x14
+	.4byte gUnknown_085EEB2B
+	.4byte gUnknown_085EEB34
+	.4byte gUnknown_085EEB3A
+	.4byte gUnknown_085EEB41
+	.4byte gUnknown_085EEB4A
+
+gUnknown_0860B324:: @ 860B324
+@ replacing .incbin "baserom.gba", 0x0060b324, 0x14
+	.4byte gUnknown_085EEB51
+	.4byte gUnknown_085EEB5A
+	.4byte gUnknown_085EEB61
+	.4byte gUnknown_085EEB6A
+	.4byte gUnknown_085EEB74
+
+gUnknown_0860B338:: @ 860B338
+@ replacing .incbin "baserom.gba", 0x0060b338, 0x14
+	.4byte gUnknown_085EADA4
+	.4byte gUnknown_085EADB5
+	.4byte gUnknown_085EADC4
+	.4byte gUnknown_085EADD5
+	.4byte gUnknown_085EADE7
+
+gUnknown_0860B34C:: @ 860B34C
+@ replacing .incbin "baserom.gba", 0x0060b34c, 0xc
+    .2byte 0x0120, 0x013b, 0x011e, 0x013d, 0x0019
diff --git a/data/strings.s b/data/strings.s
index c8a1b7683..afdda0b29 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -1246,10 +1246,20 @@ gUnknown_085EAD30:: @ 85EAD30
 	.string "Types of CONTESTS$"
 	.string "Ranks$"
 	.string "Judging$"
+
+gUnknown_085EADA4::
 	.string "COOLNESS CONTEST$"
+
+gUnknown_085EADB5::
 	.string "BEAUTY CONTEST$"
+
+gUnknown_085EADC4::
 	.string "CUTENESS CONTEST$"
+
+gUnknown_085EADD5::
 	.string "SMARTNESS CONTEST$"
+
+gUnknown_085EADE7::
 	.string "TOUGHNESS CONTEST$"
 	.string "DECORATION$"
 	.string "PACK UP$"
@@ -2967,24 +2977,56 @@ gUnknown_085EEAF6:: @ 85EEAF6
 
 gUnknown_085EEB0B:: @ 85EEB0B
 	.string "A call can’t be made from here.$"
+
+gUnknown_085EEB2B::
 	.string "HANDSOME$"
+
+gUnknown_085EEB34::
 	.string "VINNY$"
+
+gUnknown_085EEB3A::
 	.string "MOREME$"
+
+gUnknown_085EEB41::
 	.string "IRONHARD$"
+
+gUnknown_085EEB4A::
 	.string "MUSCLE$"
+
+gUnknown_085EEB51::
 	.string "coolness$"
+
+gUnknown_085EEB5A::
 	.string "beauty$"
+
+gUnknown_085EEB61::
 	.string "cuteness$"
+
+gUnknown_085EEB6A::
 	.string "smartness$"
+
+gUnknown_085EEB74::
 	.string "toughness$"
 
 gUnknown_085EEB7E:: @ 85EEB7E
 	.string "Lady$"
+
+gUnknown_085EEB83::
 	.string "slippery$"
+
+gUnknown_085EEB8C::
 	.string "roundish$"
+
+gUnknown_085EEB95::
 	.string "wham-ish$"
+
+gUnknown_085EEB9E::
 	.string "shiny$"
+
+gUnknown_085EEBA4::
 	.string "sticky$"
+
+gUnknown_085EEBAB::
 	.string "pointy$"
 
 gUnknown_085EEBB2:: @ 85EEBB2
diff --git a/ld_script.txt b/ld_script.txt
index e8e44b718..51b7364cb 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -379,6 +379,8 @@ SECTIONS {
         data/data_860A4AC.o(.rodata);
         data/battle_controller_recorded_opponent.o(.rodata);
         data/battle_controller_recorded_player.o(.rodata);
+        data/data_emerald.o(.rodata.deleteme);
+        data/lilycove_lady.o(.rodata);
         data/data_emerald.o(.rodata);
         data/battle_controller_player_partner.o(.rodata);
         data/data_emerald2.o(.rodata);
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 4839571ae..6a0e0c2b9 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -27,7 +27,8 @@ static u8 sub_818E13C(void);
 static bool8 sub_818E1F4(void);
 static u8 sub_818E258(const u8 *);
 
-extern const u8 gUnknown_085EEB7E[8];
+extern const u8 gUnknown_085EEB7E[]; // Lady$
+
 extern const u16 gUnknown_0860B074[5];
 extern const u16 gUnknown_0860B07E[3];
 extern const u16 *const gUnknown_0860B1A4[16];