From 54c8580d34b61dfd1db5dd91e301dfc788e564de Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 15 Sep 2017 22:12:45 -0400
Subject: rom_81700F8

---
 src/rom_81700F8.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 src/rom_81700F8.c

(limited to 'src')

diff --git a/src/rom_81700F8.c b/src/rom_81700F8.c
new file mode 100644
index 000000000..b786ff9f8
--- /dev/null
+++ b/src/rom_81700F8.c
@@ -0,0 +1,32 @@
+#include "global.h"
+#include "main.h"
+#include "gpu_regs.h"
+#include "m4a.h"
+#include "load_save.h"
+#include "save.h"
+#include "new_game.h"
+#include "rom4.h"
+#include "malloc.h"
+
+void sub_81700F8(void)
+{
+    u16 imeBackup;
+
+    imeBackup = REG_IME;
+    REG_IME = 0;
+    RegisterRamReset(0x00000001);
+    ClearGpuRegBits(REG_OFFSET_DISPCNT, 0x80);
+    REG_IME = imeBackup;
+    gMain.inBattle = FALSE;
+    SetSaveBlocksPointers(sub_815355C());
+    sub_808447C();
+    ResetSaveCounters();
+    sub_81534D0(0);
+    if (gSaveFileStatus == 0 || gSaveFileStatus == 2)
+    {
+        Sav2_ClearSetDefault();
+    }
+    SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound);
+    InitHeap(gHeap, 0x1c000);
+    SetMainCallback2(sub_8086230);
+}
-- 
cgit v1.2.3


From 16f2e40576b29fd85366305b4165da3aff4aef0e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 17 Sep 2017 23:42:44 -0400
Subject: Fix naming conflicts

---
 src/berry.c           |  6 +++---
 src/load_save.c       |  4 ----
 src/reset_save_heap.c | 32 ++++++++++++++++++++++++++++++++
 src/rom_81700F8.c     | 32 --------------------------------
 4 files changed, 35 insertions(+), 39 deletions(-)
 create mode 100644 src/reset_save_heap.c
 delete mode 100644 src/rom_81700F8.c

(limited to 'src')

diff --git a/src/berry.c b/src/berry.c
index b6eaa14a0..46b93d6ff 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -807,7 +807,7 @@ const struct Berry gBerries[] =
 // unused
 void ClearEnigmaBerries(void)
 {
-    CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, sizeof(gSaveBlock1Ptr->enigmaBerry));
+    CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/);
 }
 
 void SetEnigmaBerry(u8 *src)
@@ -815,7 +815,7 @@ void SetEnigmaBerry(u8 *src)
     u32 i;
     u8 *dest = (u8*)&gSaveBlock1Ptr->enigmaBerry;
 
-    for (i = 0; i < sizeof(gSaveBlock1Ptr->enigmaBerry); i++)
+    for (i = 0; i < 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/; i++)
         dest[i] = src[i];
 }
 
@@ -827,7 +827,7 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
 
     dest = (u8*)enigmaBerry;
     checksum = 0;
-    for (i = 0; i < sizeof(gSaveBlock1Ptr->enigmaBerry) - sizeof(gSaveBlock1Ptr->enigmaBerry.checksum); i++)
+    for (i = 0; i < 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/ - sizeof(gSaveBlock1Ptr->enigmaBerry.checksum); i++)
     {
         checksum += dest[i];
     }
diff --git a/src/load_save.c b/src/load_save.c
index 588387186..68d978e3d 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -6,15 +6,11 @@
 #include "rng.h"
 #include "malloc.h"
 
-extern u8 gPlayerPartyCount;
-extern struct PokemonStorage* gPokemonStoragePtr;
 extern void* gUnknown_0203CF5C;
-extern u8 gHeap[0x1C000];
 
 extern bool16 IdentifyFlash(void);
 extern void SetBagItemsPointers(void);
 extern void SetDecorationInventoriesPointers(void);
-extern void InitHeap(void *heapStart, u32 heapSize);
 
 void ApplyNewEncyprtionKeyToAllEncryptedData(u32 encryptionKey);
 
diff --git a/src/reset_save_heap.c b/src/reset_save_heap.c
new file mode 100644
index 000000000..b786ff9f8
--- /dev/null
+++ b/src/reset_save_heap.c
@@ -0,0 +1,32 @@
+#include "global.h"
+#include "main.h"
+#include "gpu_regs.h"
+#include "m4a.h"
+#include "load_save.h"
+#include "save.h"
+#include "new_game.h"
+#include "rom4.h"
+#include "malloc.h"
+
+void sub_81700F8(void)
+{
+    u16 imeBackup;
+
+    imeBackup = REG_IME;
+    REG_IME = 0;
+    RegisterRamReset(0x00000001);
+    ClearGpuRegBits(REG_OFFSET_DISPCNT, 0x80);
+    REG_IME = imeBackup;
+    gMain.inBattle = FALSE;
+    SetSaveBlocksPointers(sub_815355C());
+    sub_808447C();
+    ResetSaveCounters();
+    sub_81534D0(0);
+    if (gSaveFileStatus == 0 || gSaveFileStatus == 2)
+    {
+        Sav2_ClearSetDefault();
+    }
+    SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound);
+    InitHeap(gHeap, 0x1c000);
+    SetMainCallback2(sub_8086230);
+}
diff --git a/src/rom_81700F8.c b/src/rom_81700F8.c
deleted file mode 100644
index b786ff9f8..000000000
--- a/src/rom_81700F8.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "global.h"
-#include "main.h"
-#include "gpu_regs.h"
-#include "m4a.h"
-#include "load_save.h"
-#include "save.h"
-#include "new_game.h"
-#include "rom4.h"
-#include "malloc.h"
-
-void sub_81700F8(void)
-{
-    u16 imeBackup;
-
-    imeBackup = REG_IME;
-    REG_IME = 0;
-    RegisterRamReset(0x00000001);
-    ClearGpuRegBits(REG_OFFSET_DISPCNT, 0x80);
-    REG_IME = imeBackup;
-    gMain.inBattle = FALSE;
-    SetSaveBlocksPointers(sub_815355C());
-    sub_808447C();
-    ResetSaveCounters();
-    sub_81534D0(0);
-    if (gSaveFileStatus == 0 || gSaveFileStatus == 2)
-    {
-        Sav2_ClearSetDefault();
-    }
-    SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound);
-    InitHeap(gHeap, 0x1c000);
-    SetMainCallback2(sub_8086230);
-}
-- 
cgit v1.2.3


From 8604291b0f0e430b01f0099ea4e098171938505b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 18 Sep 2017 08:52:57 -0400
Subject: Start decomp

---
 src/berry_fix_program.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 src/berry_fix_program.c

(limited to 'src')

diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
new file mode 100644
index 000000000..bafefaf7a
--- /dev/null
+++ b/src/berry_fix_program.c
@@ -0,0 +1,123 @@
+
+// Includes
+#include "global.h"
+#include "multiboot.h"
+#include "gpu_regs.h"
+#include "main.h"
+#include "sprite.h"
+#include "task.h"
+#include "unknown_task.h"
+#include "malloc.h"
+#include "m4a.h"
+
+// Static type declarations
+
+typedef struct {
+    u8 state;
+    u8 unk1;
+    u16 unk2;
+    struct MultiBootParam mb;
+} berryfix_t;
+
+// Static RAM declarations
+
+extern berryfix_t *gUnknown_030012B8;
+
+// Static ROM declarations
+
+static void sub_81BF3DC(void);
+void sub_81BF5A4(void);
+u32 sub_81BF7A4(u8);
+
+// .rodata
+
+extern const u8 gUnknown_089A6550[0xC0];
+extern const u8 gMultiBootProgram_BerryGlitchFix_Script[0x3b34];
+extern const u8 gMultiBootProgram_BerryGlitchFix_Start[];
+extern const u8 gMultiBootProgram_BerryGlitchFix_End[];
+
+// .text
+
+void sub_81BF384(void)
+{
+    DisableInterrupts(0xFFFF);
+    EnableInterrupts(0x0001);
+    m4aSoundVSyncOff();
+    SetVBlankCallback(NULL);
+    ResetSpriteData();
+    ResetTasks();
+    remove_some_task();
+    SetGpuReg(REG_OFFSET_DISPCNT, 0x0000);
+    gUnknown_030012B8 = AllocZeroed(0x50);
+    gUnknown_030012B8->state = 0;
+    gUnknown_030012B8->unk1 = 6;
+    SetMainCallback2(sub_81BF3DC);
+}
+
+static void sub_81BF3DC(void)
+{
+    switch (gUnknown_030012B8->state)
+    {
+        case 0:
+            sub_81BF5A4();
+            gUnknown_030012B8->state = 1;
+            break;
+        case 1:
+            if (sub_81BF7A4(5) == 5 && (gMain.newKeys & A_BUTTON))
+            {
+                gUnknown_030012B8->state = 2;
+            }
+            break;
+        case 2:
+            if (sub_81BF7A4(0) == 0 && (gMain.newKeys & A_BUTTON))
+            {
+                gUnknown_030012B8->state = 3;
+            }
+            break;
+        case 3:
+            if (sub_81BF7A4(1) == 1)
+            {
+                gUnknown_030012B8->mb.masterp = gUnknown_089A6550;
+                gUnknown_030012B8->mb.server_type = 0;
+                MultiBootInit(&gUnknown_030012B8->mb);
+                gUnknown_030012B8->unk2 = 0;
+                gUnknown_030012B8->state = 4;
+            }
+            break;
+        case 4:
+            MultiBootMain(&gUnknown_030012B8->mb);
+            if (gUnknown_030012B8->mb.probe_count != 0 || (!(gUnknown_030012B8->mb.response_bit & 2) || !(gUnknown_030012B8->mb.client_bit & 2)))
+            {
+                gUnknown_030012B8->unk2 = 0;
+            }
+            else if (++ gUnknown_030012B8->unk2 > 180)
+            {
+                MultiBootStartMaster(&gUnknown_030012B8->mb, gMultiBootProgram_BerryGlitchFix_Start, (u32)(gMultiBootProgram_BerryGlitchFix_End - gMultiBootProgram_BerryGlitchFix_Start), 4, 1);
+                gUnknown_030012B8->state = 5;
+            }
+            break;
+        case 5:
+            if (sub_81BF7A4(2) == 2) {
+                MultiBootMain(&gUnknown_030012B8->mb);
+                if (MultiBootCheckComplete(&gUnknown_030012B8->mb)) {
+                    gUnknown_030012B8->state = 6;
+                }
+                else if (!(gUnknown_030012B8->mb.client_bit & 2)) {
+                    gUnknown_030012B8->state = 7;
+                }
+            }
+            break;
+        case 6:
+            if (sub_81BF7A4(3) == 3 && gMain.newKeys & A_BUTTON)
+            {
+                DoSoftReset();
+            }
+            break;
+        case 7:
+            if (sub_81BF7A4(4) == 4 && gMain.newKeys & A_BUTTON)
+            {
+                gUnknown_030012B8->state = 1;
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From c5dddf41f58446139b52d3b60cb8738052e4a084 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 18 Sep 2017 11:26:45 -0400
Subject: sub_81BF5A4

---
 src/berry_fix_program.c | 272 +++++++++++++++++++++++++++++++++++++++++++++++-
 src/bg.c                | 189 ++++++++++++++++-----------------
 src/multiboot.c         |   2 +-
 src/text.c              |   6 +-
 src/window.c            |   2 +-
 5 files changed, 364 insertions(+), 107 deletions(-)

(limited to 'src')

diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index bafefaf7a..58e50e509 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -1,13 +1,16 @@
 
 // Includes
 #include "global.h"
-#include "multiboot.h"
 #include "gpu_regs.h"
+#include "multiboot.h"
+#include "malloc.h"
+#include "bg.h"
 #include "main.h"
 #include "sprite.h"
 #include "task.h"
 #include "unknown_task.h"
-#include "malloc.h"
+#include "window.h"
+#include "menu.h"
 #include "m4a.h"
 
 // Static type declarations
@@ -26,7 +29,7 @@ extern berryfix_t *gUnknown_030012B8;
 // Static ROM declarations
 
 static void sub_81BF3DC(void);
-void sub_81BF5A4(void);
+static void sub_81BF5A4(void);
 u32 sub_81BF7A4(u8);
 
 // .rodata
@@ -35,6 +38,14 @@ extern const u8 gUnknown_089A6550[0xC0];
 extern const u8 gMultiBootProgram_BerryGlitchFix_Script[0x3b34];
 extern const u8 gMultiBootProgram_BerryGlitchFix_Start[];
 extern const u8 gMultiBootProgram_BerryGlitchFix_End[];
+extern const u8 gUnknown_08617E78[];
+extern const u8 gUnknown_08617E8D[];
+extern const u8 gUnknown_08617E9B[];
+extern const struct BgTemplate gUnknown_08618108[2];
+extern const struct WindowTemplate gUnknown_08618110[7];
+extern const u16 gUnknown_08618138[16];
+extern const u8 gUnknown_08618158[3];
+extern const u8 gUnknown_0861815B[3];
 
 // .text
 
@@ -121,3 +132,258 @@ static void sub_81BF3DC(void)
             break;
     }
 }
+
+#ifdef NONMATCHING
+static void sub_81BF5A4(void)
+{
+    s32 width;
+
+    SetGpuReg(REG_OFFSET_BG0CNT, 0x0000);
+    SetGpuReg(REG_OFFSET_BG1CNT, 0x0000);
+    SetGpuReg(REG_OFFSET_BG0HOFS, 0x0000);
+    SetGpuReg(REG_OFFSET_BG0VOFS, 0x0000);
+    SetGpuReg(REG_OFFSET_BG1HOFS, 0x0000);
+    SetGpuReg(REG_OFFSET_BG1VOFS, 0x0000);
+    SetGpuReg(REG_OFFSET_BLDCNT, 0x0000);
+
+    DmaFill32(3, 0, VRAM, VRAM_SIZE);
+    DmaFill32(3, 0, OAM, OAM_SIZE);
+    DmaFill32(3, 0, PLTT, PLTT_SIZE);
+    ResetBgsAndClearDma3BusyFlags(0);
+
+    InitBgsFromTemplates(0, gUnknown_08618108, ARRAY_COUNT(gUnknown_08618108));
+    ChangeBgX(0, 0, 0);
+    ChangeBgY(0, 0, 0);
+    ChangeBgX(1, 0, 0);
+    ChangeBgY(1, 0, 0);
+    InitWindows(gUnknown_08618110);
+    DeactivateAllTextPrinters();
+
+    DmaCopy32(3, gUnknown_08618138, BG_PLTT + 0x1E0, 0x20);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP);
+    FillWindowPixelBuffer(2, 0);
+    FillWindowPixelBuffer(3, 0);
+    FillWindowPixelBuffer(0, 0xAA);
+
+// This block is a meme among memes
+    width = (0x78 - GetStringWidth(0, gUnknown_08617E9B, 0)) / 2;
+    box_print(2, 0, width, 3, gUnknown_0861815B, -1, gUnknown_08617E9B);
+    width = (s32)(0x78 - GetStringWidth(0, gUnknown_08617E9B, 0)) / 2 + 0x78;
+    box_print(2, 0, width, 3, gUnknown_0861815B, -1, gUnknown_08617E8D);
+    width = (0x70 - GetStringWidth(0, gUnknown_08617E8D, 0)) / 2;
+    box_print(3, 0, width, 0, gUnknown_0861815B, -1, gUnknown_08617E8D);
+    width = (0xd0 - GetStringWidth(1, gUnknown_08617E78, 0)) / 2;
+    box_print(0, 1, width, 2, gUnknown_08618158, -1, gUnknown_08617E78);
+
+    CopyWindowToVram(2, 2);
+    CopyWindowToVram(3, 2);
+    CopyWindowToVram(0, 2);
+}
+#else
+__attribute__((naked)) static void sub_81BF5A4(void)
+{
+    asm(".syntax unified\n"
+        "\tpush {r4-r6,lr}\n"
+        "\tmov r6, r8\n"
+        "\tpush {r6}\n"
+        "\tsub sp, 0x10\n"
+        "\tmovs r0, 0x8\n"
+        "\tmovs r1, 0\n"
+        "\tbl SetGpuReg\n"
+        "\tmovs r0, 0xA\n"
+        "\tmovs r1, 0\n"
+        "\tbl SetGpuReg\n"
+        "\tmovs r0, 0x10\n"
+        "\tmovs r1, 0\n"
+        "\tbl SetGpuReg\n"
+        "\tmovs r0, 0x12\n"
+        "\tmovs r1, 0\n"
+        "\tbl SetGpuReg\n"
+        "\tmovs r0, 0x14\n"
+        "\tmovs r1, 0\n"
+        "\tbl SetGpuReg\n"
+        "\tmovs r0, 0x16\n"
+        "\tmovs r1, 0\n"
+        "\tbl SetGpuReg\n"
+        "\tmovs r0, 0x50\n"
+        "\tmovs r1, 0\n"
+        "\tbl SetGpuReg\n"
+        "\tmovs r1, 0\n"
+        "\tstr r1, [sp, 0xC]\n"
+        "\tldr r4, =0x040000d4\n"
+        "\tadd r0, sp, 0xC\n"
+        "\tstr r0, [r4]\n"
+        "\tmovs r0, 0xC0\n"
+        "\tlsls r0, 19\n"
+        "\tstr r0, [r4, 0x4]\n"
+        "\tldr r0, =0x85006000\n"
+        "\tstr r0, [r4, 0x8]\n"
+        "\tldr r0, [r4, 0x8]\n"
+        "\tstr r1, [sp, 0xC]\n"
+        "\tadd r0, sp, 0xC\n"
+        "\tstr r0, [r4]\n"
+        "\tmovs r0, 0xE0\n"
+        "\tlsls r0, 19\n"
+        "\tstr r0, [r4, 0x4]\n"
+        "\tldr r2, =0x85000100\n"
+        "\tstr r2, [r4, 0x8]\n"
+        "\tldr r0, [r4, 0x8]\n"
+        "\tstr r1, [sp, 0xC]\n"
+        "\tadd r0, sp, 0xC\n"
+        "\tstr r0, [r4]\n"
+        "\tmovs r0, 0xA0\n"
+        "\tlsls r0, 19\n"
+        "\tstr r0, [r4, 0x4]\n"
+        "\tstr r2, [r4, 0x8]\n"
+        "\tldr r0, [r4, 0x8]\n"
+        "\tmovs r0, 0\n"
+        "\tbl ResetBgsAndClearDma3BusyFlags\n"
+        "\tldr r1, =gUnknown_08618108\n"
+        "\tmovs r0, 0\n"
+        "\tmovs r2, 0x2\n"
+        "\tbl InitBgsFromTemplates\n"
+        "\tmovs r0, 0\n"
+        "\tmovs r1, 0\n"
+        "\tmovs r2, 0\n"
+        "\tbl ChangeBgX\n"
+        "\tmovs r0, 0\n"
+        "\tmovs r1, 0\n"
+        "\tmovs r2, 0\n"
+        "\tbl ChangeBgY\n"
+        "\tmovs r0, 0x1\n"
+        "\tmovs r1, 0\n"
+        "\tmovs r2, 0\n"
+        "\tbl ChangeBgX\n"
+        "\tmovs r0, 0x1\n"
+        "\tmovs r1, 0\n"
+        "\tmovs r2, 0\n"
+        "\tbl ChangeBgY\n"
+        "\tldr r0, =gUnknown_08618110\n"
+        "\tbl InitWindows\n"
+        "\tbl DeactivateAllTextPrinters\n"
+        "\tldr r0, =gUnknown_08618138\n"
+        "\tstr r0, [r4]\n"
+        "\tldr r0, =0x050001e0\n"
+        "\tstr r0, [r4, 0x4]\n"
+        "\tldr r0, =0x84000008\n"
+        "\tstr r0, [r4, 0x8]\n"
+        "\tldr r0, [r4, 0x8]\n"
+        "\tmovs r0, 0\n"
+        "\tmovs r1, 0x40\n"
+        "\tbl SetGpuReg\n"
+        "\tmovs r0, 0x2\n"
+        "\tmovs r1, 0\n"
+        "\tbl FillWindowPixelBuffer\n"
+        "\tmovs r0, 0x3\n"
+        "\tmovs r1, 0\n"
+        "\tbl FillWindowPixelBuffer\n"
+        "\tmovs r0, 0\n"
+        "\tmovs r1, 0xAA\n"
+        "\tbl FillWindowPixelBuffer\n"
+        "\tldr r5, =gUnknown_08617E9B\n"
+        "\tmovs r0, 0\n"
+        "\tadds r1, r5, 0\n"
+        "\tmovs r2, 0\n"
+        "\tbl GetStringWidth\n"
+        "\tadds r1, r0, 0\n"
+        "\tmovs r4, 0x78\n"
+        "\tsubs r0, r4, r1\n"
+        "\tlsrs r1, r0, 31\n"
+        "\tadds r0, r1\n"
+        "\tasrs r0, 1\n"
+        "\tlsls r2, r0, 24\n"
+        "\tlsrs r2, 24\n"
+        "\tldr r6, =gUnknown_0861815B\n"
+        "\tstr r6, [sp]\n"
+        "\tmovs r0, 0x1\n"
+        "\tnegs r0, r0\n"
+        "\tmov r8, r0\n"
+        "\tstr r0, [sp, 0x4]\n"
+        "\tstr r5, [sp, 0x8]\n"
+        "\tmovs r0, 0x2\n"
+        "\tmovs r1, 0\n"
+        "\tmovs r3, 0x3\n"
+        "\tbl box_print\n"
+        "\tldr r5, =gUnknown_08617E8D\n"
+        "\tmovs r0, 0\n"
+        "\tadds r1, r5, 0\n"
+        "\tmovs r2, 0\n"
+        "\tbl GetStringWidth\n"
+        "\tadds r1, r0, 0\n"
+        "\tsubs r4, r1\n"
+        "\tlsrs r0, r4, 31\n"
+        "\tadds r4, r0\n"
+        "\tasrs r4, 1\n"
+        "\tadds r0, r4, 0\n"
+        "\tadds r0, 0x78\n"
+        "\tlsls r2, r0, 24\n"
+        "\tlsrs r2, 24\n"
+        "\tstr r6, [sp]\n"
+        "\tmov r0, r8\n"
+        "\tstr r0, [sp, 0x4]\n"
+        "\tstr r5, [sp, 0x8]\n"
+        "\tmovs r0, 0x2\n"
+        "\tmovs r1, 0\n"
+        "\tmovs r3, 0x3\n"
+        "\tbl box_print\n"
+        "\tmovs r0, 0\n"
+        "\tadds r1, r5, 0\n"
+        "\tmovs r2, 0\n"
+        "\tbl GetStringWidth\n"
+        "\tadds r1, r0, 0\n"
+        "\tmovs r0, 0x70\n"
+        "\tsubs r0, r1\n"
+        "\tlsrs r1, r0, 31\n"
+        "\tadds r0, r1\n"
+        "\tasrs r0, 1\n"
+        "\tlsls r2, r0, 24\n"
+        "\tlsrs r2, 24\n"
+        "\tstr r6, [sp]\n"
+        "\tmov r0, r8\n"
+        "\tstr r0, [sp, 0x4]\n"
+        "\tstr r5, [sp, 0x8]\n"
+        "\tmovs r0, 0x3\n"
+        "\tmovs r1, 0\n"
+        "\tmovs r3, 0\n"
+        "\tbl box_print\n"
+        "\tldr r4, =gUnknown_08617E78\n"
+        "\tmovs r0, 0x1\n"
+        "\tadds r1, r4, 0\n"
+        "\tmovs r2, 0\n"
+        "\tbl GetStringWidth\n"
+        "\tadds r1, r0, 0\n"
+        "\tmovs r0, 0xD0\n"
+        "\tsubs r0, r1\n"
+        "\tlsrs r1, r0, 31\n"
+        "\tadds r0, r1\n"
+        "\tasrs r0, 1\n"
+        "\tlsls r2, r0, 24\n"
+        "\tlsrs r2, 24\n"
+        "\tldr r0, =gUnknown_08618158\n"
+        "\tstr r0, [sp]\n"
+        "\tmov r0, r8\n"
+        "\tstr r0, [sp, 0x4]\n"
+        "\tstr r4, [sp, 0x8]\n"
+        "\tmovs r0, 0\n"
+        "\tmovs r1, 0x1\n"
+        "\tmovs r3, 0x2\n"
+        "\tbl box_print\n"
+        "\tmovs r0, 0x2\n"
+        "\tmovs r1, 0x2\n"
+        "\tbl CopyWindowToVram\n"
+        "\tmovs r0, 0x3\n"
+        "\tmovs r1, 0x2\n"
+        "\tbl CopyWindowToVram\n"
+        "\tmovs r0, 0\n"
+        "\tmovs r1, 0x2\n"
+        "\tbl CopyWindowToVram\n"
+        "\tadd sp, 0x10\n"
+        "\tpop {r3}\n"
+        "\tmov r8, r3\n"
+        "\tpop {r4-r6}\n"
+        "\tpop {r0}\n"
+        "\tbx r0\n"
+        "\t.pool\n"
+        ".syntax divided");
+}
+#endif
diff --git a/src/bg.c b/src/bg.c
index 8979eaecd..390a99d50 100644
--- a/src/bg.c
+++ b/src/bg.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "dma3.h"
+#include "bg.h"
 
 #define DISPCNT_ALL_BG_AND_MODE_BITS    0x0F07
 
@@ -22,33 +23,23 @@ struct BgControl {
         u16 priority:2;
         u16 mosaic:1;
         u16 wraparound:1;
-        
+
         u16 charBaseIndex:2;
         u16 mapBaseIndex:5;
         u16 paletteMode:1;
-        
+
         u8 unknown_2;
         u8 unknown_3;
     } configs[4];
-    
-    u16 bgVisibilityAndMode;
-};
 
-struct BgTemplate {
-    u32 bg:2;
-    u32 charBaseIndex:2;
-    u32 mapBaseIndex:5;
-    u32 screenSize:2;
-    u32 paletteMode:1;
-    u32 priority:2;
-    u32 baseTile:10;
+    u16 bgVisibilityAndMode;
 };
 
 struct BgConfig2 {
     u32 baseTile:10;
     u32 basePalette:4;
     u32 unk_3:18;
-    
+
     void* tilemap;
     u32 bg_x;
     u32 bg_y;
@@ -103,7 +94,7 @@ void ResetBgControlStructs(void)
     struct BgConfig* bgConfigs = &gGpuBgConfigs.configs[0];
     struct BgConfig zeroedConfig = gZeroedBgControlStruct;
     int i;
-    
+
     for (i = 0; i < 4; i++)
     {
         bgConfigs[i] = zeroedConfig;
@@ -126,40 +117,40 @@ void SetBgControlAttributes(u8 bg, u8 charBaseIndex, u8 mapBaseIndex, u8 screenS
         {
             gGpuBgConfigs.configs[bg].charBaseIndex = charBaseIndex & 0x3;
         }
-        
+
         if (mapBaseIndex != 0xFF)
         {
             gGpuBgConfigs.configs[bg].mapBaseIndex = mapBaseIndex & 0x1F;
         }
-        
+
         if (screenSize != 0xFF)
         {
             gGpuBgConfigs.configs[bg].screenSize = screenSize & 0x3;
         }
-        
+
         if (paletteMode != 0xFF)
         {
             gGpuBgConfigs.configs[bg].paletteMode = paletteMode;
         }
-        
+
         if (priority != 0xFF)
         {
             gGpuBgConfigs.configs[bg].priority = priority & 0x3;
         }
-        
+
         if (mosaic != 0xFF)
         {
             gGpuBgConfigs.configs[bg].mosaic = mosaic & 0x1;
         }
-        
+
         if (wraparound != 0xFF)
         {
             gGpuBgConfigs.configs[bg].wraparound = wraparound;
         }
-        
+
         gGpuBgConfigs.configs[bg].unknown_2 = 0;
         gGpuBgConfigs.configs[bg].unknown_3 = 0;
-        
+
         gGpuBgConfigs.configs[bg].visible = 1;
     }
 }
@@ -188,7 +179,7 @@ u16 GetBgControlAttribute(u8 bg, u8 attributeId)
                 return gGpuBgConfigs.configs[bg].wraparound;
         }
     }
-    
+
     return 0xFF;
 }
 
@@ -196,7 +187,7 @@ u8 LoadBgVram(u8 bg, void *src, u16 size, u16 destOffset, u8 mode)
 {
     u16 offset;
     s8 cursor;
-    
+
     if (IsInvalidBg(bg) == FALSE && gGpuBgConfigs.configs[bg].visible != FALSE)
     {
         switch (mode)
@@ -211,11 +202,11 @@ u8 LoadBgVram(u8 bg, void *src, u16 size, u16 destOffset, u8 mode)
                 cursor = -1;
                 goto end;
         }
-        
+
         offset = destOffset + offset;
-        
+
         cursor = RequestDma3Copy(src, (void*)(offset + BG_VRAM), size, 0);
-        
+
         if (cursor == -1)
         {
             return -1;
@@ -225,7 +216,7 @@ u8 LoadBgVram(u8 bg, void *src, u16 size, u16 destOffset, u8 mode)
     {
        return -1;
     }
-    
+
 end:
     return cursor;
 }
@@ -242,9 +233,9 @@ void ShowBgInternal(u8 bg)
                 (gGpuBgConfigs.configs[bg].mapBaseIndex << 8) |
                 (gGpuBgConfigs.configs[bg].wraparound << 13) |
                 (gGpuBgConfigs.configs[bg].screenSize << 14);
-        
+
         SetGpuReg((bg << 1) + 0x8, value);
-        
+
         gGpuBgConfigs.bgVisibilityAndMode |= 1 << (bg + 8);
         gGpuBgConfigs.bgVisibilityAndMode &= DISPCNT_ALL_BG_AND_MODE_BITS;
     }
@@ -273,7 +264,7 @@ void SetBgAffineInternal(u8 bg, u32 srcCenterX, u32 srcCenterY, s16 dispCenterX,
 {
     struct BgAffineSrcData src;
     struct BgAffineDstData dest;
-    
+
     switch (gGpuBgConfigs.bgVisibilityAndMode & 0x7)
     {
         case 1:
@@ -288,7 +279,7 @@ void SetBgAffineInternal(u8 bg, u32 srcCenterX, u32 srcCenterY, s16 dispCenterX,
         default:
             return;
     }
-    
+
     src.texX = srcCenterX;
     src.texY = srcCenterY;
     src.scrX = dispCenterX;
@@ -296,7 +287,7 @@ void SetBgAffineInternal(u8 bg, u32 srcCenterX, u32 srcCenterY, s16 dispCenterX,
     src.sx = scaleX;
     src.sy = scaleY;
     src.alpha = rotationAngle;
-    
+
     BgAffineSet(&src, &dest, 1);
 
     SetGpuReg(REG_OFFSET_BG2PA, dest.pa);
@@ -326,20 +317,20 @@ void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable)
 {
     int i;
     ResetBgs();
-    
+
     for (i = 0; i < 4; i++)
     {
         gDmaBusyBitfield[i] = 0;
     }
-    
+
     gUnneededFireRedVariable = leftoverFireRedLeafGreenVariable;
 }
 
-void InitBgsFromTemplates(u8 bgMode, struct BgTemplate *templates, u8 numTemplates)
+void InitBgsFromTemplates(u8 bgMode, const struct BgTemplate *templates, u8 numTemplates)
 {
     int i;
     u8 bg;
-    
+
     SetBgModeInternal(bgMode);
     ResetBgControlStructs();
 
@@ -355,11 +346,11 @@ void InitBgsFromTemplates(u8 bgMode, struct BgTemplate *templates, u8 numTemplat
                                    templates[i].priority,
                                    0,
                                    0);
-            
+
             gGpuBgConfigs2[bg].baseTile = templates[i].baseTile;
             gGpuBgConfigs2[bg].basePalette = 0;
             gGpuBgConfigs2[bg].unk_3 = 0;
-            
+
             gGpuBgConfigs2[bg].tilemap = NULL;
             gGpuBgConfigs2[bg].bg_x = 0;
             gGpuBgConfigs2[bg].bg_y = 0;
@@ -367,10 +358,10 @@ void InitBgsFromTemplates(u8 bgMode, struct BgTemplate *templates, u8 numTemplat
     }
 }
 
-void InitBgFromTemplate(struct BgTemplate *template)
+void InitBgFromTemplate(const struct BgTemplate *template)
 {
     u8 bg = template->bg;
-    
+
     if (bg < 4)
     {
         SetBgControlAttributes(bg,
@@ -381,11 +372,11 @@ void InitBgFromTemplate(struct BgTemplate *template)
                                template->priority,
                                0,
                                0);
-        
+
         gGpuBgConfigs2[bg].baseTile = template->baseTile;
         gGpuBgConfigs2[bg].basePalette = 0;
         gGpuBgConfigs2[bg].unk_3 = 0;
-        
+
         gGpuBgConfigs2[bg].tilemap = NULL;
         gGpuBgConfigs2[bg].bg_x = 0;
         gGpuBgConfigs2[bg].bg_y = 0;
@@ -401,7 +392,7 @@ u16 LoadBgTiles(u8 bg, void* src, u16 size, u16 destOffset)
 {
     u16 tileOffset;
     u8 cursor;
-    
+
     if (GetBgControlAttribute(bg, BG_CTRL_ATTR_PALETTEMODE) == 0)
     {
         tileOffset = (gGpuBgConfigs2[bg].baseTile + destOffset) * 0x20;
@@ -410,37 +401,37 @@ u16 LoadBgTiles(u8 bg, void* src, u16 size, u16 destOffset)
     {
         tileOffset = (gGpuBgConfigs2[bg].baseTile + destOffset) * 0x40;
     }
-    
+
     cursor = LoadBgVram(bg, src, size, tileOffset, DISPCNT_MODE_1);
-    
+
     if (cursor == 0xFF)
     {
         return -1;
     }
-    
+
     gDmaBusyBitfield[cursor / 0x20] |= (1 << (cursor % 0x20));
-    
+
     if (gUnneededFireRedVariable == 1)
     {
         DummiedOutFireRedLeafGreenTileAllocFunc(bg, tileOffset / 0x20, size / 0x20, 1);
     }
-    
+
     return cursor;
 }
 
 u16 LoadBgTilemap(u8 bg, void *src, u16 size, u16 destOffset)
 {
     u8 cursor;
-    
+
     cursor = LoadBgVram(bg, src, size, destOffset * 2, DISPCNT_MODE_2);
-    
+
     if (cursor == 0xFF)
     {
         return -1;
     }
-    
+
     gDmaBusyBitfield[cursor / 0x20] |= (1 << (cursor % 0x20));
-    
+
     return cursor;
 }
 
@@ -448,12 +439,12 @@ u16 Unused_LoadBgPalette(u8 bg, void *src, u16 size, u16 destOffset)
 {
     u16 paletteOffset;
     s8 cursor;
-    
+
     if (IsInvalidBg32(bg) == FALSE)
     {
         paletteOffset = (gGpuBgConfigs2[bg].basePalette * 0x20) + (destOffset * 2);
         cursor = RequestDma3Copy(src, (void*)(paletteOffset + BG_PLTT), size, 0);
-        
+
         if (cursor == -1)
         {
             return -1;
@@ -475,14 +466,14 @@ bool8 IsDma3ManagerBusyWithBgCopy(void)
     u8 mod;
     u8 div;
     s8 reqSpace;
-    
+
     int i;
-    
+
     for (i = 0; i < 0x80; i++)
     {
         div = i / 0x20;
         mod = i % 0x20;
-        
+
         if ((gDmaBusyBitfield[div] & (1 << mod)) != FALSE)
         {
             reqSpace = CheckForSpaceForDma3Request(i);
@@ -490,7 +481,7 @@ bool8 IsDma3ManagerBusyWithBgCopy(void)
             {
                 return TRUE;
             }
-            
+
             gDmaBusyBitfield[div] &= ~(1 << mod);
         }
     }
@@ -634,12 +625,12 @@ u32 ChangeBgX(u8 bg, u32 value, u8 op)
     u8 mode;
     u16 temp1;
     u16 temp2;
-    
+
     if (IsInvalidBg32(bg) != FALSE || GetBgControlAttribute(bg, BG_CTRL_ATTR_VISIBLE) == 0)
     {
         return -1;
     }
-    
+
     switch (op)
     {
         case 0:
@@ -653,9 +644,9 @@ u32 ChangeBgX(u8 bg, u32 value, u8 op)
             gGpuBgConfigs2[bg].bg_x -= value;
             break;
     }
-    
+
     mode = GetBgMode();
-    
+
     switch (bg)
     {
         case 0:
@@ -695,7 +686,7 @@ u32 ChangeBgX(u8 bg, u32 value, u8 op)
             }
             break;
     }
-    
+
     return gGpuBgConfigs2[bg].bg_x;
 }
 
@@ -713,12 +704,12 @@ u32 ChangeBgY(u8 bg, u32 value, u8 op)
     u8 mode;
     u16 temp1;
     u16 temp2;
-    
+
     if (IsInvalidBg32(bg) != FALSE || GetBgControlAttribute(bg, BG_CTRL_ATTR_VISIBLE) == 0)
     {
         return -1;
     }
-    
+
     switch (op)
     {
         case 0:
@@ -732,9 +723,9 @@ u32 ChangeBgY(u8 bg, u32 value, u8 op)
             gGpuBgConfigs2[bg].bg_y -= value;
             break;
     }
-    
+
     mode = GetBgMode();
-    
+
     switch (bg)
     {
         case 0:
@@ -774,7 +765,7 @@ u32 ChangeBgY(u8 bg, u32 value, u8 op)
             }
             break;
     }
-    
+
     return gGpuBgConfigs2[bg].bg_y;
 }
 
@@ -783,12 +774,12 @@ u32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op)
     u8 mode;
     u16 temp1;
     u16 temp2;
-    
+
     if (IsInvalidBg32(bg) != FALSE || GetBgControlAttribute(bg, BG_CTRL_ATTR_VISIBLE) == 0)
     {
         return -1;
     }
-    
+
     switch (op)
     {
         case 0:
@@ -802,9 +793,9 @@ u32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op)
             gGpuBgConfigs2[bg].bg_y -= value;
             break;
     }
-    
+
     mode = GetBgMode();
-    
+
     switch (bg)
     {
         case 0:
@@ -820,7 +811,7 @@ u32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op)
             {
                 temp1 = gGpuBgConfigs2[2].bg_y >> 0x8;
                 SetGpuReg_ForcedBlank(REG_OFFSET_BG2VOFS, temp1);
-                
+
             }
             else
             {
@@ -845,7 +836,7 @@ u32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op)
             }
             break;
     }
-    
+
     return gGpuBgConfigs2[bg].bg_y;
 }
 
@@ -868,13 +859,13 @@ u8 Unused_AdjustBgMosaic(u8 a1, u8 a2)
     u16 result;
     s16 test1;
     s16 test2;
-    
+
     result = GetGpuReg(REG_OFFSET_MOSAIC);
-    
+
     test1 = result & 0xF;
     test2 = (result >> 4) & 0xF;
     result &= 0xFF00;
-    
+
     switch (a2)
     {
         case 0:
@@ -929,12 +920,12 @@ u8 Unused_AdjustBgMosaic(u8 a1, u8 a2)
             }
             break;
     }
-    
+
     result |= ((test2 << 0x4) & 0xF0);
     result |= (test1 & 0xF);
-    
+
     SetGpuReg(REG_OFFSET_MOSAIC, result);
-    
+
     return result;
 }
 
@@ -981,7 +972,7 @@ void CopyToBgTilemapBuffer(u8 bg, void *src, u16 mode, u16 destOffset)
 void CopyBgTilemapBufferToVram(u8 bg)
 {
     u16 sizeToLoad;
-    
+
     if (IsInvalidBg32(bg) == FALSE && IsTileMapOutsideWram(bg) == FALSE)
     {
         switch (GetBgType(bg))
@@ -1006,7 +997,7 @@ void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u
     u16 destX16;
     u16 destY16;
     u16 mode;
-    
+
     if (IsInvalidBg32(bg) == FALSE && IsTileMapOutsideWram(bg) == FALSE)
     {
         switch (GetBgType(bg))
@@ -1047,11 +1038,11 @@ void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWid
     u16 attribute;
     u16 mode;
     u16 mode2;
-    
+
     void* srcCopy;
     u16 destX16;
     u16 destY16;
-    
+
     if (IsInvalidBg32(bg) == FALSE && IsTileMapOutsideWram(bg) == FALSE)
     {
         attribute = GetBgControlAttribute(bg, BG_CTRL_ATTR_SCREENSIZE);
@@ -1336,7 +1327,7 @@ void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width,
     u16 x16;
     u16 y16;
     u16 mode;
-    
+
     if (IsInvalidBg32(bg) == FALSE && IsTileMapOutsideWram(bg) == FALSE)
     {
         switch (GetBgType(bg))
@@ -1375,10 +1366,10 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt
     u16 mode2;
     u16 attribute;
     u16 mode3;
-    
+
     u16 x16;
     u16 y16;
-    
+
     if (IsInvalidBg32(bg) == FALSE && IsTileMapOutsideWram(bg) == FALSE)
     {
         attribute = GetBgControlAttribute(bg, BG_CTRL_ATTR_SCREENSIZE);
@@ -1414,9 +1405,9 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt
 u16 GetBgMetricTextMode(u8 bg, u8 whichMetric)
 {
     u8 attribute;
-    
+
     attribute = GetBgControlAttribute(bg, BG_CTRL_ATTR_SCREENSIZE);
-    
+
     switch (whichMetric)
     {
         case 0:
@@ -1462,9 +1453,9 @@ u16 GetBgMetricTextMode(u8 bg, u8 whichMetric)
 u32 GetBgMetricAffineMode(u8 bg, u8 whichMetric)
 {
     u8 attribute;
-    
+
     attribute = GetBgControlAttribute(bg, BG_CTRL_ATTR_SCREENSIZE);
-    
+
     switch (whichMetric)
     {
         case 0:
@@ -1491,7 +1482,7 @@ u32 GetTileMapIndexFromCoords(s32 x, s32 y, s32 screenSize, u32 screenWidth, u32
 {
     x = x & (screenWidth - 1);
     y = y & (screenHeight - 1);
-    
+
     switch (screenSize)
     {
         case 0:
@@ -1526,7 +1517,7 @@ void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u32 tileOffset, u32 pal
             test = ((*dest & 0xFC00) + (palette2 << 12)) | ((*src + tileOffset) & 0x3FF);
             break;
     }
-    
+
     *dest = test;
 }
 #else
@@ -1586,10 +1577,10 @@ _08002B3C:\n\
 u32 GetBgType(u8 bg)
 {
     u8 mode;
-    
+
     mode = GetBgMode();
-    
-    
+
+
     switch (bg)
     {
         case 0:
@@ -1621,7 +1612,7 @@ u32 GetBgType(u8 bg)
             }
             break;
     }
-    
+
     return 0xFFFF;
 }
 
diff --git a/src/multiboot.c b/src/multiboot.c
index 80291ff46..7fd6df2d0 100644
--- a/src/multiboot.c
+++ b/src/multiboot.c
@@ -316,7 +316,7 @@ void MultiBootStartProbe(struct MultiBootParam *mp)
     mp->probe_count = 1;
 }
 
-void MultiBootStartMaster(struct MultiBootParam *mp, u8 *srcp, int length, u8 palette_color, s8 palette_speed)
+void MultiBootStartMaster(struct MultiBootParam *mp, const u8 *srcp, int length, u8 palette_color, s8 palette_speed)
 {
     int i = 0;
 
diff --git a/src/text.c b/src/text.c
index cad8326e3..aa4e201c0 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2779,7 +2779,7 @@ _08005D6E:\n\
 	bx r1");
 }
 
-u32 GetStringWidthFixedWidthFont(u8 *str, u8 fontId, u8 letterSpacing)
+u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing)
 {
     int i;
     u8 width;
@@ -2788,7 +2788,7 @@ u32 GetStringWidthFixedWidthFont(u8 *str, u8 fontId, u8 letterSpacing)
     u8 line;
     int strPos;
     u8 lineWidths[8];
-    u8 *strLocal;
+    const u8 *strLocal;
 
     for (i = 0; i < 8; i++)
     {
@@ -2883,7 +2883,7 @@ u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32)
     return 0;
 }
 
-s32 GetStringWidth(u8 fontId, u8 *str, s16 letterSpacing)
+u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
 {
     bool8 isJapanese;
     int minGlyphWidth;
diff --git a/src/window.c b/src/window.c
index 574b13aa0..164031bee 100644
--- a/src/window.c
+++ b/src/window.c
@@ -35,7 +35,7 @@ static void nullsub_8(void)
 
 }
 
-bool16 InitWindows(struct WindowTemplate *templates)
+bool16 InitWindows(const struct WindowTemplate *templates)
 {
     int i;
     void *bgTilemapBuffer;
-- 
cgit v1.2.3


From 097a38f054c8a858917049fdf8973cb16a26c771 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 18 Sep 2017 13:54:39 -0400
Subject: nonmatching sub_81BF7A4

---
 src/berry_fix_program.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index 58e50e509..b63bc12be 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -30,7 +30,9 @@ extern berryfix_t *gUnknown_030012B8;
 
 static void sub_81BF3DC(void);
 static void sub_81BF5A4(void);
-u32 sub_81BF7A4(u8);
+static int sub_81BF7A4(int);
+void sub_81BF7E8(int);
+void sub_81BF8D8(int);
 
 // .rodata
 
@@ -179,6 +181,32 @@ static void sub_81BF5A4(void)
     CopyWindowToVram(3, 2);
     CopyWindowToVram(0, 2);
 }
+
+static int sub_81BF7A4(int checkval)
+{
+    int retval;
+
+    retval = gUnknown_030012B8->unk1;
+    if (retval == checkval)
+    {
+        retval = checkval;
+    }
+    else
+    {
+        if (retval == 6)
+        {
+            sub_81BF7E8(checkval);
+            gUnknown_030012B8->unk1 = checkval;
+        }
+        else
+        {
+            sub_81BF8D8(gUnknown_030012B8->unk1);
+            gUnknown_030012B8->unk1 = 6;
+        }
+        retval = gUnknown_030012B8->unk1;
+    }
+    return retval;
+}
 #else
 __attribute__((naked)) static void sub_81BF5A4(void)
 {
@@ -386,4 +414,43 @@ __attribute__((naked)) static void sub_81BF5A4(void)
         "\t.pool\n"
         ".syntax divided");
 }
+
+__attribute__((naked)) static int sub_81BF7A4(int checkval)
+{
+    asm(".syntax unified\n"
+        "\tpush {r4,r5,lr}\n"
+        "\tadds r4, r0, 0\n"
+        "\tldr r5, =gUnknown_030012B8\n"
+        "\tldr r0, [r5]\n"
+        "\tldrb r0, [r0, 0x1]\n"
+        "\tcmp r0, r4\n"
+        "\tbne _081BF7BC\n"
+        "\tadds r0, r4, 0\n"
+        "\tb _081BF7DC\n"
+        "\t.pool\n"
+        "_081BF7BC:\n"
+        "\tcmp r0, 0x6\n"
+        "\tbne _081BF7CC\n"
+        "\tadds r0, r4, 0\n"
+        "\tbl sub_81BF7E8\n"
+        "\tldr r0, [r5]\n"
+        "\tstrb r4, [r0, 0x1]\n"
+        "\tb _081BF7D6\n"
+        "_081BF7CC:\n"
+        "\tbl sub_81BF8D8\n"
+        "\tldr r1, [r5]\n"
+        "\tmovs r0, 0x6\n"
+        "\tstrb r0, [r1, 0x1]\n"
+        "_081BF7D6:\n"
+        "\tldr r0, =gUnknown_030012B8\n"
+        "\tldr r0, [r0]\n"
+        "\tldrb r0, [r0, 0x1]\n"
+        "_081BF7DC:\n"
+        "\tpop {r4,r5}\n"
+        "\tpop {r1}\n"
+        "\tbx r1\n"
+        "\t.pool\n"
+        ".syntax divided");
+}
 #endif
+
-- 
cgit v1.2.3


From 39e6bdf094ac1b53109782c9b5b98c211bbe3149 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 18 Sep 2017 14:04:00 -0400
Subject: sub_81BF7E8

---
 src/berry_fix_program.c | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index b63bc12be..6f4c1c79e 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -31,7 +31,7 @@ extern berryfix_t *gUnknown_030012B8;
 static void sub_81BF3DC(void);
 static void sub_81BF5A4(void);
 static int sub_81BF7A4(int);
-void sub_81BF7E8(int);
+static void sub_81BF7E8(int);
 void sub_81BF8D8(int);
 
 // .rodata
@@ -48,6 +48,8 @@ extern const struct WindowTemplate gUnknown_08618110[7];
 extern const u16 gUnknown_08618138[16];
 extern const u8 gUnknown_08618158[3];
 extern const u8 gUnknown_0861815B[3];
+extern const u8 *const gUnknown_08618160[6];
+extern const u8 *const gUnknown_08618178[6][3];
 
 // .text
 
@@ -454,3 +456,32 @@ __attribute__((naked)) static int sub_81BF7A4(int checkval)
 }
 #endif
 
+static void sub_81BF7E8(int scene)
+{
+    FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32);
+    FillWindowPixelBuffer(1, 0xAA);
+    box_print(1, 1, 0, 0, gUnknown_08618158, -1, gUnknown_08618160[scene]);
+    PutWindowTilemap(1);
+    CopyWindowToVram(1, 2);
+    switch (scene)
+    {
+        case 0:
+        case 2:
+        case 3:
+        case 4:
+            PutWindowTilemap(2);
+            break;
+        case 1:
+            PutWindowTilemap(3);
+            break;
+        case 5:
+            PutWindowTilemap(0);
+            break;
+    }
+    CopyBgTilemapBufferToVram(0);
+    LZ77UnCompVram(gUnknown_08618178[scene][0], (void *)BG_CHAR_ADDR(1));
+    LZ77UnCompVram(gUnknown_08618178[scene][1], (void *)BG_SCREEN_ADDR(31));
+    CpuCopy32(gUnknown_08618178[scene][2], (void *)BG_PLTT, 0x100);
+    ShowBg(0);
+    ShowBg(1);
+}
-- 
cgit v1.2.3


From 0e2d84f24d22b6ec47e6adf32bc5f4d6b4c6289b Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 18 Sep 2017 14:07:34 -0400
Subject: Remaining functions

---
 src/berry_fix_program.c | 86 ++++++++++++++-----------------------------------
 1 file changed, 24 insertions(+), 62 deletions(-)

(limited to 'src')

diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index 6f4c1c79e..e4ec0d8c4 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -32,7 +32,7 @@ static void sub_81BF3DC(void);
 static void sub_81BF5A4(void);
 static int sub_81BF7A4(int);
 static void sub_81BF7E8(int);
-void sub_81BF8D8(int);
+static void sub_81BF8D8(void);
 
 // .rodata
 
@@ -184,31 +184,6 @@ static void sub_81BF5A4(void)
     CopyWindowToVram(0, 2);
 }
 
-static int sub_81BF7A4(int checkval)
-{
-    int retval;
-
-    retval = gUnknown_030012B8->unk1;
-    if (retval == checkval)
-    {
-        retval = checkval;
-    }
-    else
-    {
-        if (retval == 6)
-        {
-            sub_81BF7E8(checkval);
-            gUnknown_030012B8->unk1 = checkval;
-        }
-        else
-        {
-            sub_81BF8D8(gUnknown_030012B8->unk1);
-            gUnknown_030012B8->unk1 = 6;
-        }
-        retval = gUnknown_030012B8->unk1;
-    }
-    return retval;
-}
 #else
 __attribute__((naked)) static void sub_81BF5A4(void)
 {
@@ -416,45 +391,26 @@ __attribute__((naked)) static void sub_81BF5A4(void)
         "\t.pool\n"
         ".syntax divided");
 }
+#endif
 
-__attribute__((naked)) static int sub_81BF7A4(int checkval)
+static int sub_81BF7A4(int checkval)
 {
-    asm(".syntax unified\n"
-        "\tpush {r4,r5,lr}\n"
-        "\tadds r4, r0, 0\n"
-        "\tldr r5, =gUnknown_030012B8\n"
-        "\tldr r0, [r5]\n"
-        "\tldrb r0, [r0, 0x1]\n"
-        "\tcmp r0, r4\n"
-        "\tbne _081BF7BC\n"
-        "\tadds r0, r4, 0\n"
-        "\tb _081BF7DC\n"
-        "\t.pool\n"
-        "_081BF7BC:\n"
-        "\tcmp r0, 0x6\n"
-        "\tbne _081BF7CC\n"
-        "\tadds r0, r4, 0\n"
-        "\tbl sub_81BF7E8\n"
-        "\tldr r0, [r5]\n"
-        "\tstrb r4, [r0, 0x1]\n"
-        "\tb _081BF7D6\n"
-        "_081BF7CC:\n"
-        "\tbl sub_81BF8D8\n"
-        "\tldr r1, [r5]\n"
-        "\tmovs r0, 0x6\n"
-        "\tstrb r0, [r1, 0x1]\n"
-        "_081BF7D6:\n"
-        "\tldr r0, =gUnknown_030012B8\n"
-        "\tldr r0, [r0]\n"
-        "\tldrb r0, [r0, 0x1]\n"
-        "_081BF7DC:\n"
-        "\tpop {r4,r5}\n"
-        "\tpop {r1}\n"
-        "\tbx r1\n"
-        "\t.pool\n"
-        ".syntax divided");
+    if (gUnknown_030012B8->unk1 == checkval)
+    {
+        return checkval;
+    }
+    if (gUnknown_030012B8->unk1 == 6)
+    {
+        sub_81BF7E8(checkval);
+        gUnknown_030012B8->unk1 = checkval;
+    }
+    else
+    {
+        sub_81BF8D8();
+        gUnknown_030012B8->unk1 = 6;
+    }
+    return gUnknown_030012B8->unk1;
 }
-#endif
 
 static void sub_81BF7E8(int scene)
 {
@@ -485,3 +441,9 @@ static void sub_81BF7E8(int scene)
     ShowBg(0);
     ShowBg(1);
 }
+
+static void sub_81BF8D8()
+{
+    HideBg(0);
+    HideBg(1);
+}
-- 
cgit v1.2.3


From 810bfffd1242ebfd29fcc2db6fef19b34545ad0b Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 18 Sep 2017 15:10:25 -0400
Subject: data decomp

---
 src/berry_fix_program.c | 103 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 93 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index e4ec0d8c4..fa13c7e1e 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -36,20 +36,103 @@ static void sub_81BF8D8(void);
 
 // .rodata
 
+const u8 gUnknown_08617E78[] = _("Berry Program Update");
+const u8 gUnknown_08617E8D[] = _("Ruby/Sapphire");
+const u8 gUnknown_08617E9B[] = _("Emerald");
+
+const u8 Unknown_08617EA3[] = _("The Berry Program on your POKéMON\nRuby/Sapphire Game Pak will be updated.\n{COLOR RED}{SHADOW LIGHT_RED}Press the A Button.");
+const u8 Unknown_08617F07[] = _("Please ensure the connection of your\nGame Boy Advance system matches this.\n{COLOR RED}{SHADOW LIGHT_RED}YES: Press the A Button.\nNO: Turn off the power and try again.");
+const u8 Unknown_08617F97[] = _("Please turn on the power of POKéMON\nRuby/Sapphire while holding START and\nSELECT simultaneously. Then, ensure\nthe picture above appears.");
+const u8 Unknown_08618020[] = _("Transmitting. Please wait.\n{COLOR RED}{SHADOW LIGHT_RED}Please do not turn off the power or\nunplug the Game Boy Advance Game\nLink Cable.");
+const u8 Unknown_08618092[] = _("Please follow the instructions on your\nPOKéMON Ruby/Sapphire screen.");
+const u8 Unknown_086180D7[] = _("Transmission failure.\n{COLOR RED}{SHADOW LIGHT_RED}Please try again.");
+
+const struct BgTemplate gUnknown_08618108[] = {
+    {
+        0, 0, 30, 0, 0, 0
+    }, {
+        1, 1, 31, 0, 0, 1
+    }
+};
+
+const struct WindowTemplate gUnknown_08618110[] = {
+    {0, 2,  4, 26, 2, 15, 0x001},
+    {0, 1, 11, 28, 8, 15, 0x035},
+    {0, 0,  8, 30, 2, 15, 0x115},
+    {0, 8,  0, 14, 2, 15, 0x151},
+    {-1}
+};
+
+const u16 gUnknown_08618138[] = {
+    0x7fff, 0x7fff, 0x318c, 0x675a,
+    0x043c, 0x3aff, 0x0664, 0x4bd2,
+    0x6546, 0x7b14, 0x7fff, 0x318c,
+    0x675a, 0x0000, 0x0000, 0x0000
+};
+
+const u8 gUnknown_08618158[] = {10, 11, 12};
+const u8 gUnknown_0861815B[] = { 0, 10, 13};
+
+const u8 *const gUnknown_08618160[] = {
+    Unknown_08617F07,
+    Unknown_08617F97,
+    Unknown_08618020,
+    Unknown_08618092,
+    Unknown_086180D7,
+    Unknown_08617EA3
+};
+
+extern const u8 gUnknown_08DD87C0[];
+extern const u8 gUnknown_08DD8EE0[];
+extern const u8 gUnknown_08DD8780[];
+extern const u8 gUnknown_08DD90E0[];
+extern const u8 gUnknown_08DD9718[];
+extern const u8 gUnknown_08DD9080[];
+extern const u8 gUnknown_08DD98B4[];
+extern const u8 gUnknown_08DD9E58[];
+extern const u8 gUnknown_08DD9874[];
+extern const u8 gUnknown_08DDA02C[];
+extern const u8 gUnknown_08DDA63C[];
+extern const u8 gUnknown_08DD9FEC[];
+extern const u8 gUnknown_08DDA840[];
+extern const u8 gUnknown_08DDAE40[];
+extern const u8 gUnknown_08DDA800[];
+extern const u8 gUnknown_08DDB020[];
+extern const u8 gUnknown_08DDB2C4[];
+extern const u8 gUnknown_08DDAFE0[];
+
+const u8 *const gUnknown_08618178[][3] = {
+    {
+        gUnknown_08DD87C0,
+        gUnknown_08DD8EE0,
+        gUnknown_08DD8780
+    }, {
+        gUnknown_08DD90E0,
+        gUnknown_08DD9718,
+        gUnknown_08DD9080
+    }, {
+        gUnknown_08DD98B4,
+        gUnknown_08DD9E58,
+        gUnknown_08DD9874
+    }, {
+        gUnknown_08DDA02C,
+        gUnknown_08DDA63C,
+        gUnknown_08DD9FEC
+    }, {
+        gUnknown_08DDA840,
+        gUnknown_08DDAE40,
+        gUnknown_08DDA800
+    }, {
+        gUnknown_08DDB020,
+        gUnknown_08DDB2C4,
+        gUnknown_08DDAFE0
+    },
+};
+
 extern const u8 gUnknown_089A6550[0xC0];
 extern const u8 gMultiBootProgram_BerryGlitchFix_Script[0x3b34];
 extern const u8 gMultiBootProgram_BerryGlitchFix_Start[];
 extern const u8 gMultiBootProgram_BerryGlitchFix_End[];
-extern const u8 gUnknown_08617E78[];
-extern const u8 gUnknown_08617E8D[];
-extern const u8 gUnknown_08617E9B[];
-extern const struct BgTemplate gUnknown_08618108[2];
-extern const struct WindowTemplate gUnknown_08618110[7];
-extern const u16 gUnknown_08618138[16];
-extern const u8 gUnknown_08618158[3];
-extern const u8 gUnknown_0861815B[3];
-extern const u8 *const gUnknown_08618160[6];
-extern const u8 *const gUnknown_08618178[6][3];
 
 // .text
 
-- 
cgit v1.2.3


From d48c4ab7a95c0b3cc59e96ca2bf30fdbc7ff1581 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 18 Sep 2017 15:28:55 -0400
Subject: Slight cleanup and relabeling of functions

---
 src/berry_fix_program.c | 136 ++++++++++++++++++++++++------------------------
 1 file changed, 68 insertions(+), 68 deletions(-)

(limited to 'src')

diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index fa13c7e1e..931e92746 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -24,30 +24,30 @@ typedef struct {
 
 // Static RAM declarations
 
-extern berryfix_t *gUnknown_030012B8;
+static berryfix_t *berry_fix_mb_manager;
 
 // Static ROM declarations
 
-static void sub_81BF3DC(void);
-static void sub_81BF5A4(void);
-static int sub_81BF7A4(int);
-static void sub_81BF7E8(int);
-static void sub_81BF8D8(void);
+static void berry_fix_main(void);
+static void berry_fix_gpu_set(void);
+static int berry_fix_text_update(int);
+static void berry_fix_text_print(int);
+static void berry_fix_bg_hide(void);
 
 // .rodata
 
-const u8 gUnknown_08617E78[] = _("Berry Program Update");
-const u8 gUnknown_08617E8D[] = _("Ruby/Sapphire");
-const u8 gUnknown_08617E9B[] = _("Emerald");
+static const u8 gUnknown_08617E78[] = _("Berry Program Update");
+static const u8 gUnknown_08617E8D[] = _("Ruby/Sapphire");
+static const u8 gUnknown_08617E9B[] = _("Emerald");
 
-const u8 Unknown_08617EA3[] = _("The Berry Program on your POKéMON\nRuby/Sapphire Game Pak will be updated.\n{COLOR RED}{SHADOW LIGHT_RED}Press the A Button.");
-const u8 Unknown_08617F07[] = _("Please ensure the connection of your\nGame Boy Advance system matches this.\n{COLOR RED}{SHADOW LIGHT_RED}YES: Press the A Button.\nNO: Turn off the power and try again.");
-const u8 Unknown_08617F97[] = _("Please turn on the power of POKéMON\nRuby/Sapphire while holding START and\nSELECT simultaneously. Then, ensure\nthe picture above appears.");
-const u8 Unknown_08618020[] = _("Transmitting. Please wait.\n{COLOR RED}{SHADOW LIGHT_RED}Please do not turn off the power or\nunplug the Game Boy Advance Game\nLink Cable.");
-const u8 Unknown_08618092[] = _("Please follow the instructions on your\nPOKéMON Ruby/Sapphire screen.");
-const u8 Unknown_086180D7[] = _("Transmission failure.\n{COLOR RED}{SHADOW LIGHT_RED}Please try again.");
+static const u8 Unknown_08617EA3[] = _("The Berry Program on your POKéMON\nRuby/Sapphire Game Pak will be updated.\n{COLOR RED}{SHADOW LIGHT_RED}Press the A Button.");
+static const u8 Unknown_08617F07[] = _("Please ensure the connection of your\nGame Boy Advance system matches this.\n{COLOR RED}{SHADOW LIGHT_RED}YES: Press the A Button.\nNO: Turn off the power and try again.");
+static const u8 Unknown_08617F97[] = _("Please turn on the power of POKéMON\nRuby/Sapphire while holding START and\nSELECT simultaneously. Then, ensure\nthe picture above appears.");
+static const u8 Unknown_08618020[] = _("Transmitting. Please wait.\n{COLOR RED}{SHADOW LIGHT_RED}Please do not turn off the power or\nunplug the Game Boy Advance Game\nLink Cable.");
+static const u8 Unknown_08618092[] = _("Please follow the instructions on your\nPOKéMON Ruby/Sapphire screen.");
+static const u8 Unknown_086180D7[] = _("Transmission failure.\n{COLOR RED}{SHADOW LIGHT_RED}Please try again.");
 
-const struct BgTemplate gUnknown_08618108[] = {
+static const struct BgTemplate gUnknown_08618108[] = {
     {
         0, 0, 30, 0, 0, 0
     }, {
@@ -55,7 +55,7 @@ const struct BgTemplate gUnknown_08618108[] = {
     }
 };
 
-const struct WindowTemplate gUnknown_08618110[] = {
+static const struct WindowTemplate gUnknown_08618110[] = {
     {0, 2,  4, 26, 2, 15, 0x001},
     {0, 1, 11, 28, 8, 15, 0x035},
     {0, 0,  8, 30, 2, 15, 0x115},
@@ -63,17 +63,17 @@ const struct WindowTemplate gUnknown_08618110[] = {
     {-1}
 };
 
-const u16 gUnknown_08618138[] = {
+static const u16 gUnknown_08618138[] = {
     0x7fff, 0x7fff, 0x318c, 0x675a,
     0x043c, 0x3aff, 0x0664, 0x4bd2,
     0x6546, 0x7b14, 0x7fff, 0x318c,
     0x675a, 0x0000, 0x0000, 0x0000
 };
 
-const u8 gUnknown_08618158[] = {10, 11, 12};
-const u8 gUnknown_0861815B[] = { 0, 10, 13};
+static const u8 gUnknown_08618158[] = {10, 11, 12};
+static const u8 gUnknown_0861815B[] = { 0, 10, 13};
 
-const u8 *const gUnknown_08618160[] = {
+static const u8 *const gUnknown_08618160[] = {
     Unknown_08617F07,
     Unknown_08617F97,
     Unknown_08618020,
@@ -101,7 +101,7 @@ extern const u8 gUnknown_08DDB020[];
 extern const u8 gUnknown_08DDB2C4[];
 extern const u8 gUnknown_08DDAFE0[];
 
-const u8 *const gUnknown_08618178[][3] = {
+static const u8 *const gUnknown_08618178[][3] = {
     {
         gUnknown_08DD87C0,
         gUnknown_08DD8EE0,
@@ -136,7 +136,7 @@ extern const u8 gMultiBootProgram_BerryGlitchFix_End[];
 
 // .text
 
-void sub_81BF384(void)
+void InitBerryFixProgram(void)
 {
     DisableInterrupts(0xFFFF);
     EnableInterrupts(0x0001);
@@ -146,82 +146,82 @@ void sub_81BF384(void)
     ResetTasks();
     remove_some_task();
     SetGpuReg(REG_OFFSET_DISPCNT, 0x0000);
-    gUnknown_030012B8 = AllocZeroed(0x50);
-    gUnknown_030012B8->state = 0;
-    gUnknown_030012B8->unk1 = 6;
-    SetMainCallback2(sub_81BF3DC);
+    berry_fix_mb_manager = AllocZeroed(0x50);
+    berry_fix_mb_manager->state = 0;
+    berry_fix_mb_manager->unk1 = 6;
+    SetMainCallback2(berry_fix_main);
 }
 
-static void sub_81BF3DC(void)
+static void berry_fix_main(void)
 {
-    switch (gUnknown_030012B8->state)
+    switch (berry_fix_mb_manager->state)
     {
         case 0:
-            sub_81BF5A4();
-            gUnknown_030012B8->state = 1;
+            berry_fix_gpu_set();
+            berry_fix_mb_manager->state = 1;
             break;
         case 1:
-            if (sub_81BF7A4(5) == 5 && (gMain.newKeys & A_BUTTON))
+            if (berry_fix_text_update(5) == 5 && (gMain.newKeys & A_BUTTON))
             {
-                gUnknown_030012B8->state = 2;
+                berry_fix_mb_manager->state = 2;
             }
             break;
         case 2:
-            if (sub_81BF7A4(0) == 0 && (gMain.newKeys & A_BUTTON))
+            if (berry_fix_text_update(0) == 0 && (gMain.newKeys & A_BUTTON))
             {
-                gUnknown_030012B8->state = 3;
+                berry_fix_mb_manager->state = 3;
             }
             break;
         case 3:
-            if (sub_81BF7A4(1) == 1)
+            if (berry_fix_text_update(1) == 1)
             {
-                gUnknown_030012B8->mb.masterp = gUnknown_089A6550;
-                gUnknown_030012B8->mb.server_type = 0;
-                MultiBootInit(&gUnknown_030012B8->mb);
-                gUnknown_030012B8->unk2 = 0;
-                gUnknown_030012B8->state = 4;
+                berry_fix_mb_manager->mb.masterp = gUnknown_089A6550;
+                berry_fix_mb_manager->mb.server_type = 0;
+                MultiBootInit(&berry_fix_mb_manager->mb);
+                berry_fix_mb_manager->unk2 = 0;
+                berry_fix_mb_manager->state = 4;
             }
             break;
         case 4:
-            MultiBootMain(&gUnknown_030012B8->mb);
-            if (gUnknown_030012B8->mb.probe_count != 0 || (!(gUnknown_030012B8->mb.response_bit & 2) || !(gUnknown_030012B8->mb.client_bit & 2)))
+            MultiBootMain(&berry_fix_mb_manager->mb);
+            if (berry_fix_mb_manager->mb.probe_count != 0 || (!(berry_fix_mb_manager->mb.response_bit & 2) || !(berry_fix_mb_manager->mb.client_bit & 2)))
             {
-                gUnknown_030012B8->unk2 = 0;
+                berry_fix_mb_manager->unk2 = 0;
             }
-            else if (++ gUnknown_030012B8->unk2 > 180)
+            else if (++ berry_fix_mb_manager->unk2 > 180)
             {
-                MultiBootStartMaster(&gUnknown_030012B8->mb, gMultiBootProgram_BerryGlitchFix_Start, (u32)(gMultiBootProgram_BerryGlitchFix_End - gMultiBootProgram_BerryGlitchFix_Start), 4, 1);
-                gUnknown_030012B8->state = 5;
+                MultiBootStartMaster(&berry_fix_mb_manager->mb, gMultiBootProgram_BerryGlitchFix_Start, (u32)(gMultiBootProgram_BerryGlitchFix_End - gMultiBootProgram_BerryGlitchFix_Start), 4, 1);
+                berry_fix_mb_manager->state = 5;
             }
             break;
         case 5:
-            if (sub_81BF7A4(2) == 2) {
-                MultiBootMain(&gUnknown_030012B8->mb);
-                if (MultiBootCheckComplete(&gUnknown_030012B8->mb)) {
-                    gUnknown_030012B8->state = 6;
+            if (berry_fix_text_update(2) == 2) {
+                MultiBootMain(&berry_fix_mb_manager->mb);
+                if (MultiBootCheckComplete(&berry_fix_mb_manager->mb)) {
+                    berry_fix_mb_manager->state = 6;
                 }
-                else if (!(gUnknown_030012B8->mb.client_bit & 2)) {
-                    gUnknown_030012B8->state = 7;
+                else if (!(berry_fix_mb_manager->mb.client_bit & 2)) {
+                    berry_fix_mb_manager->state = 7;
                 }
             }
             break;
         case 6:
-            if (sub_81BF7A4(3) == 3 && gMain.newKeys & A_BUTTON)
+            if (berry_fix_text_update(3) == 3 && gMain.newKeys & A_BUTTON)
             {
                 DoSoftReset();
             }
             break;
         case 7:
-            if (sub_81BF7A4(4) == 4 && gMain.newKeys & A_BUTTON)
+            if (berry_fix_text_update(4) == 4 && gMain.newKeys & A_BUTTON)
             {
-                gUnknown_030012B8->state = 1;
+                berry_fix_mb_manager->state = 1;
             }
             break;
     }
 }
 
 #ifdef NONMATCHING
-static void sub_81BF5A4(void)
+static void berry_fix_gpu_set(void)
 {
     s32 width;
 
@@ -268,7 +268,7 @@ static void sub_81BF5A4(void)
 }
 
 #else
-__attribute__((naked)) static void sub_81BF5A4(void)
+__attribute__((naked)) static void berry_fix_gpu_set(void)
 {
     asm(".syntax unified\n"
         "\tpush {r4-r6,lr}\n"
@@ -476,26 +476,26 @@ __attribute__((naked)) static void sub_81BF5A4(void)
 }
 #endif
 
-static int sub_81BF7A4(int checkval)
+static int berry_fix_text_update(int checkval)
 {
-    if (gUnknown_030012B8->unk1 == checkval)
+    if (berry_fix_mb_manager->unk1 == checkval)
     {
         return checkval;
     }
-    if (gUnknown_030012B8->unk1 == 6)
+    if (berry_fix_mb_manager->unk1 == 6)
     {
-        sub_81BF7E8(checkval);
-        gUnknown_030012B8->unk1 = checkval;
+        berry_fix_text_print(checkval);
+        berry_fix_mb_manager->unk1 = checkval;
     }
     else
     {
-        sub_81BF8D8();
-        gUnknown_030012B8->unk1 = 6;
+        berry_fix_bg_hide();
+        berry_fix_mb_manager->unk1 = 6;
     }
-    return gUnknown_030012B8->unk1;
+    return berry_fix_mb_manager->unk1;
 }
 
-static void sub_81BF7E8(int scene)
+static void berry_fix_text_print(int scene)
 {
     FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32);
     FillWindowPixelBuffer(1, 0xAA);
@@ -525,7 +525,7 @@ static void sub_81BF7E8(int scene)
     ShowBg(1);
 }
 
-static void sub_81BF8D8()
+static void berry_fix_bg_hide()
 {
     HideBg(0);
     HideBg(1);
-- 
cgit v1.2.3


From 9e96bd540ad3ae258ce7b2e8184cd162caa63c48 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 18 Sep 2017 19:39:20 -0400
Subject: Battle Dome Cards BEGIN

---
 src/battle_dome_cards.c | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 src/battle_dome_cards.c

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
new file mode 100644
index 000000000..0afad23f6
--- /dev/null
+++ b/src/battle_dome_cards.c
@@ -0,0 +1,37 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+struct BattleDomeCard {
+    u8 unk_00[12];
+};
+
+// Static RAM declarations
+
+extern struct BattleDomeCard gUnknown_0203CD04[8];
+
+// Static ROM declarations
+
+// .rodata
+
+extern const struct BattleDomeCard gUnknown_0860B058;
+
+// .text
+
+void nullsub_122(void)
+{
+
+}
+
+bool8 dp13_810BB8C(void)
+{
+    int i;
+
+    for (i = 0; i < 8; i ++)
+    {
+        gUnknown_0203CD04[i] = gUnknown_0860B058;
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From e033c721219f4412a0cb2cbbdcbec583ec60c87a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 18 Sep 2017 20:00:46 -0400
Subject: load_pokemon_image_TODO

---
 src/battle_dome_cards.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index 0afad23f6..6ceb929ad 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -1,6 +1,15 @@
 
 // Includes
 #include "global.h"
+#include "sprite.h"
+#include "species.h"
+#include "pokemon.h"
+#include "decompress.h"
+
+extern const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES];
+extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES];
+extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
+extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
 
 // Static type declarations
 
@@ -20,7 +29,7 @@ extern const struct BattleDomeCard gUnknown_0860B058;
 
 // .text
 
-void nullsub_122(void)
+void nullsub_122(struct Sprite *sprite)
 {
 
 }
@@ -35,3 +44,44 @@ bool8 dp13_810BB8C(void)
     }
     return FALSE;
 }
+
+bool8 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, void *dest, bool8 isTrainer, bool8 ignoreDeoxys)
+{
+    if (!isTrainer)
+    {
+        if (isFrontPic)
+        {
+            if (!ignoreDeoxys)
+            {
+                LoadSpecialPokePic(&gMonFrontPicTable[species], dest, species, personality, isFrontPic);
+            }
+            else
+            {
+                LoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species], dest, species, personality, isFrontPic);
+            }
+        }
+        else
+        {
+            if (!ignoreDeoxys)
+            {
+                LoadSpecialPokePic(&gMonBackPicTable[species], dest, species, personality, isFrontPic);
+            }
+            else
+            {
+                LoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species], dest, species, personality, isFrontPic);
+            }
+        }
+    }
+    else
+    {
+        if (isFrontPic)
+        {
+            DecompressPicFromTable(&gTrainerFrontPicTable[species], dest, species);
+        }
+        else
+        {
+            DecompressPicFromTable(&gTrainerBackPicTable[species], dest, species);
+        }
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From 7de2140b868a77ea99e4965b06602af9d7de2926 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 18 Sep 2017 21:26:11 -0400
Subject: sub_818D0C4

---
 src/battle_dome_cards.c | 43 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index 6ceb929ad..085afeb0c 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -3,13 +3,14 @@
 #include "global.h"
 #include "sprite.h"
 #include "species.h"
-#include "pokemon.h"
+#include "palette.h"
 #include "decompress.h"
 
 extern const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES];
 extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES];
 extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
 extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
+extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 
 // Static type declarations
 
@@ -20,6 +21,7 @@ struct BattleDomeCard {
 // Static RAM declarations
 
 extern struct BattleDomeCard gUnknown_0203CD04[8];
+extern struct SpriteTemplate gUnknown_0203CCEC;
 
 // Static ROM declarations
 
@@ -34,7 +36,7 @@ void nullsub_122(struct Sprite *sprite)
 
 }
 
-bool8 dp13_810BB8C(void)
+bool16 dp13_810BB8C(void)
 {
     int i;
 
@@ -45,7 +47,7 @@ bool8 dp13_810BB8C(void)
     return FALSE;
 }
 
-bool8 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, void *dest, bool8 isTrainer, bool8 ignoreDeoxys)
+bool16 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, void *dest, bool8 isTrainer, bool8 ignoreDeoxys)
 {
     if (!isTrainer)
     {
@@ -85,3 +87,38 @@ bool8 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, vo
     }
     return FALSE;
 }
+
+bool16 sub_818D09C(u16 species, u32 personality, bool8 isFrontPic, void *dest, bool8 isTrainer)
+{
+    return load_pokemon_image_TODO(species, personality, isFrontPic, dest, isTrainer, FALSE);
+}
+
+void sub_818D0C4(u16 species, u32 otId, u32 personality, u8 paletteSlot, u16 paletteTag, bool8 isTrainer)
+{
+    if (!isTrainer)
+    {
+        if (paletteTag == 0xFFFF)
+        {
+            gUnknown_0203CCEC.paletteTag |= 0xFFFF;
+            LoadCompressedPalette(species_and_otid_get_pal(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20);
+        }
+        else
+        {
+            gUnknown_0203CCEC.paletteTag = paletteTag;
+            LoadCompressedObjectPalette(sub_806E7CC(species, otId, personality));
+        }
+    }
+    else
+    {
+        if (paletteTag == 0xFFFF)
+        {
+            gUnknown_0203CCEC.paletteTag |= 0xFFFF;
+            LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, 0x100 + paletteSlot * 0x10, 0x20);
+        }
+        else
+        {
+            gUnknown_0203CCEC.paletteTag = paletteTag;
+            LoadCompressedObjectPalette(&gTrainerFrontPicPaletteTable[species]);
+        }
+    }
+}
-- 
cgit v1.2.3


From 16b0b386be02390ab847a68b279f51aea54c3a95 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 18 Sep 2017 21:28:28 -0400
Subject: sub_818D180

---
 src/battle_dome_cards.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index 085afeb0c..810ee82eb 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -122,3 +122,15 @@ void sub_818D0C4(u16 species, u32 otId, u32 personality, u8 paletteSlot, u16 pal
         }
     }
 }
+
+void sub_818D180(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 isTrainer)
+{
+    if (!isTrainer)
+    {
+        LoadCompressedPalette(species_and_otid_get_pal(species, otId, personality), paletteSlot * 0x10, 0x20);
+    }
+    else
+    {
+        LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, paletteSlot * 0x10, 0x20);
+    }
+}
-- 
cgit v1.2.3


From 8aeb5ea3017dfb7ea9fd8b8f1ef6bc9d4a0fbba9 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 18 Sep 2017 21:31:28 -0400
Subject: uns_builder_assign_animtable1

---
 src/battle_dome_cards.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index 810ee82eb..e92773a1b 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -11,6 +11,8 @@ extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES];
 extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
 extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
+extern const union AnimCmd *const gUnknown_082FF70C[];
+extern const union AnimCmd *const *const gUnknown_0830536C[];
 
 // Static type declarations
 
@@ -134,3 +136,15 @@ void sub_818D180(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 i
         LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, paletteSlot * 0x10, 0x20);
     }
 }
+
+void uns_builder_assign_animtable1(bool8 isTrainer)
+{
+    if (!isTrainer)
+    {
+        gUnknown_0203CCEC.anims = gUnknown_082FF70C;
+    }
+    else
+    {
+        gUnknown_0203CCEC.anims = gUnknown_0830536C[0];
+    }
+}
-- 
cgit v1.2.3


From c593b51dc538961641d4f679a5b0366295179c5e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 18 Sep 2017 22:23:13 -0400
Subject: oamt_spawn_poke_or_trainer_picture

---
 src/battle_dome_cards.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index e92773a1b..764e3dfe4 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -2,6 +2,7 @@
 // Includes
 #include "global.h"
 #include "sprite.h"
+#include "malloc.h"
 #include "species.h"
 #include "palette.h"
 #include "decompress.h"
@@ -13,11 +14,16 @@ extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const union AnimCmd *const gUnknown_082FF70C[];
 extern const union AnimCmd *const *const gUnknown_0830536C[];
+extern const struct OamData gUnknown_0860B064;
 
 // Static type declarations
 
 struct BattleDomeCard {
-    u8 unk_00[12];
+    u8 *frames;
+    const struct SpriteFrameImage *images;
+    u16 paletteTag;
+    u8 spriteId;
+    u8 active;
 };
 
 // Static RAM declarations
@@ -148,3 +154,63 @@ void uns_builder_assign_animtable1(bool8 isTrainer)
         gUnknown_0203CCEC.anims = gUnknown_0830536C[0];
     }
 }
+
+u16 oamt_spawn_poke_or_trainer_picture(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer, bool8 ignoreDeoxys)
+{
+    u8 i;
+    u8 *framePics;
+    struct SpriteFrameImage *images;
+    int j;
+    u8 spriteId;
+
+    for (i = 0; i < 8; i ++)
+    {
+        if (!gUnknown_0203CD04[i].active)
+        {
+            break;
+        }
+    }
+    if (i == 8)
+    {
+        return 0xFFFF;
+    }
+    framePics = Alloc(4 * 0x800);
+    if (!framePics)
+    {
+        return 0xFFFF;
+    }
+    images = Alloc(4 * sizeof(struct SpriteFrameImage));
+    if (!images)
+    {
+        Free(framePics);
+        return 0xFFFF;
+    }
+    if (load_pokemon_image_TODO(species, personality, isFrontPic, framePics, isTrainer, ignoreDeoxys))
+    {
+        // debug trap?
+        return 0xFFFF;
+    }
+    for (j = 0; j < 4; j ++)
+    {
+        images[j].data = framePics + 0x800 * j;
+        images[j].size = 0x800;
+    }
+    gUnknown_0203CCEC.tileTag = 0xFFFF;
+    gUnknown_0203CCEC.oam = &gUnknown_0860B064;
+    uns_builder_assign_animtable1(isTrainer);
+    gUnknown_0203CCEC.images = images;
+    gUnknown_0203CCEC.affineAnims = gDummySpriteAffineAnimTable;
+    gUnknown_0203CCEC.callback = nullsub_122;
+    sub_818D0C4(species, otId, personality, paletteSlot, paletteTag, isTrainer);
+    spriteId = CreateSprite(&gUnknown_0203CCEC, x, y, 0);
+    if (paletteTag == 0xFFFF)
+    {
+        gSprites[spriteId].oam.paletteNum = paletteSlot;
+    }
+    gUnknown_0203CD04[i].frames = framePics;
+    gUnknown_0203CD04[i].images = images;
+    gUnknown_0203CD04[i].paletteTag = paletteTag;
+    gUnknown_0203CD04[i].spriteId = spriteId;
+    gUnknown_0203CD04[i].active = TRUE;
+    return spriteId;
+}
-- 
cgit v1.2.3


From 52dc68aa89a4e568673f1155542856504bd3da3f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 18 Sep 2017 22:41:54 -0400
Subject: sub_818D3E4

---
 src/battle_dome_cards.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index 764e3dfe4..7eee245ee 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -15,6 +15,10 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const union AnimCmd *const gUnknown_082FF70C[];
 extern const union AnimCmd *const *const gUnknown_0830536C[];
 extern const struct OamData gUnknown_0860B064;
+extern const struct OamData gUnknown_0860B06C;
+extern const union AnimCmd *const *const gUnknown_08309AAC[NUM_SPECIES];
+extern const union AffineAnimCmd *const gUnknown_082FF694[];
+extern const union AffineAnimCmd *const gUnknown_082FF618[];
 
 // Static type declarations
 
@@ -214,3 +218,91 @@ u16 oamt_spawn_poke_or_trainer_picture(u16 species, u32 otId, u32 personality, b
     gUnknown_0203CD04[i].active = TRUE;
     return spriteId;
 }
+
+u16 sub_818D384(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer)
+{
+    return oamt_spawn_poke_or_trainer_picture(species, otId, personality, isFrontPic, x, y, paletteSlot, paletteTag, isTrainer, FALSE);
+}
+
+u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y, u8 paletteSlot, u16 paletteTag)
+{
+    u8 *framePics;
+    struct SpriteFrameImage *images;
+    int j;
+    u8 i;
+    u8 spriteId;
+    u8 flags2;
+
+    for (i = 0; i < 8; i ++)
+    {
+        if (!gUnknown_0203CD04[i].active)
+        {
+            break;
+        }
+    }
+    if (i == 8)
+    {
+        return 0xFFFF;
+    }
+    framePics = Alloc(4 * 0x800);
+    if (!framePics)
+    {
+        return 0xFFFF;
+    }
+    if (flags & 0x80)
+    {
+        flags &= 0x7F;
+        flags2 = 3;
+    }
+    else
+    {
+        flags2 = flags;
+    }
+    images = Alloc(4 * sizeof(struct SpriteFrameImage));
+    if (!images)
+    {
+        Free(framePics);
+        return 0xFFFF;
+    }
+    if (load_pokemon_image_TODO(species, personality, flags, framePics, FALSE, FALSE))
+    {
+        // debug trap?
+        return 0xFFFF;
+    }
+    for (j = 0; j < 4; j ++)
+    {
+        images[j].data = framePics + 0x800 * j;
+        images[j].size = 0x800;
+    }
+    gUnknown_0203CCEC.tileTag = 0xFFFF;
+    gUnknown_0203CCEC.anims = gUnknown_08309AAC[species];
+    gUnknown_0203CCEC.images = images;
+    if (flags2 == 0x01)
+    {
+        gUnknown_0203CCEC.affineAnims = gUnknown_082FF694;
+        gUnknown_0203CCEC.oam = &gUnknown_0860B06C;
+    }
+    else if (flags2 == 0x00)
+    {
+        gUnknown_0203CCEC.affineAnims = gUnknown_082FF618;
+        gUnknown_0203CCEC.oam = &gUnknown_0860B06C;
+    }
+    else
+    {
+        gUnknown_0203CCEC.oam = &gUnknown_0860B064;
+        gUnknown_0203CCEC.affineAnims = gDummySpriteAffineAnimTable;
+    }
+    gUnknown_0203CCEC.callback = nullsub_122;
+    sub_818D0C4(species, otId, personality, paletteSlot, paletteTag, FALSE);
+    spriteId = CreateSprite(&gUnknown_0203CCEC, x, y, 0);
+    if (paletteTag == 0xFFFF)
+    {
+        gSprites[spriteId].oam.paletteNum = paletteSlot;
+    }
+    gUnknown_0203CD04[i].frames = framePics;
+    gUnknown_0203CD04[i].images = images;
+    gUnknown_0203CD04[i].paletteTag = paletteTag;
+    gUnknown_0203CD04[i].spriteId = spriteId;
+    gUnknown_0203CD04[i].active = TRUE;
+    return spriteId;
+}
-- 
cgit v1.2.3


From 7e157f202703f75933302d509f8b2bf26cf40655 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 18 Sep 2017 22:49:42 -0400
Subject: Decorate local EWRAM objects in battle_dome_cards.c as EWRAM

---
 src/battle_dome_cards.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index 7eee245ee..f27e1e4fa 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -12,13 +12,13 @@ extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES];
 extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
 extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
+extern const union AffineAnimCmd *const gUnknown_082FF618[];
+extern const union AffineAnimCmd *const gUnknown_082FF694[];
 extern const union AnimCmd *const gUnknown_082FF70C[];
+extern const union AnimCmd *const *const gUnknown_08309AAC[NUM_SPECIES];
 extern const union AnimCmd *const *const gUnknown_0830536C[];
 extern const struct OamData gUnknown_0860B064;
 extern const struct OamData gUnknown_0860B06C;
-extern const union AnimCmd *const *const gUnknown_08309AAC[NUM_SPECIES];
-extern const union AffineAnimCmd *const gUnknown_082FF694[];
-extern const union AffineAnimCmd *const gUnknown_082FF618[];
 
 // Static type declarations
 
@@ -32,8 +32,8 @@ struct BattleDomeCard {
 
 // Static RAM declarations
 
-extern struct BattleDomeCard gUnknown_0203CD04[8];
-extern struct SpriteTemplate gUnknown_0203CCEC;
+static EWRAM_DATA struct SpriteTemplate gUnknown_0203CCEC = {};
+EWRAM_DATA struct BattleDomeCard gUnknown_0203CD04[8] = {};
 
 // Static ROM declarations
 
-- 
cgit v1.2.3


From 6ef3f9dd50a0cb2d8695401d3740407fa73cde9c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Sep 2017 08:13:53 -0400
Subject: sub_818D5B0

---
 src/battle_dome_cards.c | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index f27e1e4fa..a01115a99 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -24,7 +24,7 @@ extern const struct OamData gUnknown_0860B06C;
 
 struct BattleDomeCard {
     u8 *frames;
-    const struct SpriteFrameImage *images;
+    struct SpriteFrameImage *images;
     u16 paletteTag;
     u8 spriteId;
     u8 active;
@@ -306,3 +306,33 @@ u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y,
     gUnknown_0203CD04[i].active = TRUE;
     return spriteId;
 }
+
+u16 sub_818D5B0(u16 spriteId)
+{
+    u8 i;
+    u8 *framePics;
+    struct SpriteFrameImage *images;
+
+    for (i = 0; i < 8; i ++)
+    {
+        if (gUnknown_0203CD04[i].spriteId == spriteId)
+        {
+            break;
+        }
+    }
+    if (i == 8)
+    {
+        return 0xFFFF;
+    }
+    framePics = gUnknown_0203CD04[i].frames;
+    images = gUnknown_0203CD04[i].images;
+    if (gUnknown_0203CD04[i].paletteTag != 0xFFFF)
+    {
+        FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum));
+    }
+    DestroySprite(&gSprites[spriteId]);
+    Free(framePics);
+    Free(images);
+    gUnknown_0203CD04[i] = gUnknown_0860B058;
+    return 0;
+}
-- 
cgit v1.2.3


From ee47fe93778f938ac99be89e24761a46b44b1816 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Sep 2017 08:22:43 -0400
Subject: sub_818D65C

---
 src/battle_dome_cards.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index a01115a99..b8f0c4ff8 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -2,6 +2,7 @@
 // Includes
 #include "global.h"
 #include "sprite.h"
+#include "window.h"
 #include "malloc.h"
 #include "species.h"
 #include "palette.h"
@@ -336,3 +337,13 @@ u16 sub_818D5B0(u16 spriteId)
     gUnknown_0203CD04[i] = gUnknown_0860B058;
     return 0;
 }
+
+u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId, bool8 isTrainer)
+{
+    if (sub_818D09C(species, personality, isFrontPic, (void *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE))
+    {
+        return 0xFFFF;
+    }
+    sub_818D180(species, otId, personality, paletteSlot, isTrainer);
+    return 0;
+}
-- 
cgit v1.2.3


From b2b6774efc5d6cd1bf9ca7f9c1c925dfd237428c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Sep 2017 08:32:49 -0400
Subject: sub_818D6CC

---
 src/battle_dome_cards.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index b8f0c4ff8..4b2e9f41c 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -60,7 +60,7 @@ bool16 dp13_810BB8C(void)
     return FALSE;
 }
 
-bool16 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, void *dest, bool8 isTrainer, bool8 ignoreDeoxys)
+bool16 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, u8 *dest, bool8 isTrainer, bool8 ignoreDeoxys)
 {
     if (!isTrainer)
     {
@@ -101,7 +101,7 @@ bool16 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, v
     return FALSE;
 }
 
-bool16 sub_818D09C(u16 species, u32 personality, bool8 isFrontPic, void *dest, bool8 isTrainer)
+bool16 sub_818D09C(u16 species, u32 personality, bool8 isFrontPic, u8 *dest, bool8 isTrainer)
 {
     return load_pokemon_image_TODO(species, personality, isFrontPic, dest, isTrainer, FALSE);
 }
@@ -340,10 +340,25 @@ u16 sub_818D5B0(u16 spriteId)
 
 u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId, bool8 isTrainer)
 {
-    if (sub_818D09C(species, personality, isFrontPic, (void *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE))
+    if (sub_818D09C(species, personality, isFrontPic, (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE))
     {
         return 0xFFFF;
     }
     sub_818D180(species, otId, personality, paletteSlot, isTrainer);
     return 0;
 }
+
+u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId, bool8 isTrainer)
+{
+    u8 *framePics;
+
+    framePics = Alloc(4 * 0x800);
+    if (framePics && !sub_818D09C(species, personality, isFrontPic, framePics, isTrainer))
+    {
+        BlitBitmapRectToWindow(windowId, framePics, 0, 0, 0x40, 0x40, destX, destY, 0x40, 0x40);
+        sub_818D180(species, otId, personality, paletteSlot, isTrainer);
+        Free(framePics);
+        return 0;
+    }
+    return 0xFFFF;
+}
-- 
cgit v1.2.3


From 8634f722905247646305824afd62ebec60810212 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Sep 2017 08:35:27 -0400
Subject: sub_818D778

---
 src/battle_dome_cards.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index 4b2e9f41c..1e6a98810 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -362,3 +362,8 @@ u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 de
     }
     return 0xFFFF;
 }
+
+u16 sub_818D778(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 ignoreDeoxys)
+{
+    return oamt_spawn_poke_or_trainer_picture(species, otId, personality, isFrontPic, x, y, paletteSlot, paletteTag, FALSE, ignoreDeoxys);
+}
-- 
cgit v1.2.3


From 057894f3c583f99b4c626181fc86cfc0744c2ea1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Sep 2017 08:36:45 -0400
Subject: sub_818D7D8

---
 src/battle_dome_cards.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index 1e6a98810..7df33e403 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -367,3 +367,8 @@ u16 sub_818D778(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x,
 {
     return oamt_spawn_poke_or_trainer_picture(species, otId, personality, isFrontPic, x, y, paletteSlot, paletteTag, FALSE, ignoreDeoxys);
 }
+
+u16 sub_818D7D8(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag)
+{
+    return sub_818D778(species, otId, personality, isFrontPic, x, y, paletteSlot, paletteTag, FALSE);
+}
-- 
cgit v1.2.3


From 63ff09e806b2f8bd38e50fec7aa7d63367060df4 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Sep 2017 08:53:31 -0400
Subject: Nearly finished with battle_dome_cards

---
 src/battle_dome_cards.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index 7df33e403..280eac163 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -20,6 +20,7 @@ extern const union AnimCmd *const *const gUnknown_08309AAC[NUM_SPECIES];
 extern const union AnimCmd *const *const gUnknown_0830536C[];
 extern const struct OamData gUnknown_0860B064;
 extern const struct OamData gUnknown_0860B06C;
+extern const u8 gUnknown_0831F578[];
 
 // Static type declarations
 
@@ -372,3 +373,52 @@ u16 sub_818D7D8(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x,
 {
     return sub_818D778(species, otId, personality, isFrontPic, x, y, paletteSlot, paletteTag, FALSE);
 }
+
+u16 sub_818D820(u16 spriteId)
+{
+    return sub_818D5B0(spriteId);
+}
+
+u16 sub_818D834(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId)
+{
+    return sub_818D65C(species, otId, personality, isFrontPic, paletteSlot, windowId, FALSE);
+}
+
+u16 sub_818D864(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId)
+{
+    return sub_818D6CC(species, otId, personality, isFrontPic, destX, destY, paletteSlot, windowId, FALSE);
+}
+
+u16 sub_818D8AC(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag)
+{
+    return sub_818D384(species, 0, 0, isFrontPic, x, y, paletteSlot, paletteTag, TRUE);
+}
+
+u16 sub_818D8F0(u16 spriteId)
+{
+    return sub_818D5B0(spriteId);
+}
+
+u16 sub_818D904(u16 species, bool8 isFrontPic, u8 paletteSlot, u8 windowId)
+{
+    return sub_818D65C(species, 0, 0, isFrontPic, paletteSlot, windowId, TRUE);
+}
+
+u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId)
+{
+    return sub_818D6CC(species, 0, 0, isFrontPic, destX, destY, paletteSlot, windowId, TRUE);
+}
+
+//u8 sub_818D97C(u8 a0, u8 a1)
+//{
+//    u8 id;
+//    if (a1 == 1 && a0)
+//    {
+//        id = gUnknown_0831F578[0x3F];
+//    }
+//    else
+//    {
+//        id = gUnknown_0831F578[0x3C];
+//    }
+//    return id;
+//}
-- 
cgit v1.2.3


From bff89725ec31f87c296ec45f107f81dfe3cd54d6 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 19 Sep 2017 09:46:17 -0400
Subject: Add battle_dome_cards header to expose symbols as needed

---
 src/battle_dome_cards.c | 64 +++++++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 29 deletions(-)

(limited to 'src')

diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index 280eac163..c0557ac70 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -7,6 +7,7 @@
 #include "species.h"
 #include "palette.h"
 #include "decompress.h"
+#include "battle_dome_cards.h"
 
 extern const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES];
 extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES];
@@ -18,8 +19,6 @@ extern const union AffineAnimCmd *const gUnknown_082FF694[];
 extern const union AnimCmd *const gUnknown_082FF70C[];
 extern const union AnimCmd *const *const gUnknown_08309AAC[NUM_SPECIES];
 extern const union AnimCmd *const *const gUnknown_0830536C[];
-extern const struct OamData gUnknown_0860B064;
-extern const struct OamData gUnknown_0860B06C;
 extern const u8 gUnknown_0831F578[];
 
 // Static type declarations
@@ -35,17 +34,23 @@ struct BattleDomeCard {
 // Static RAM declarations
 
 static EWRAM_DATA struct SpriteTemplate gUnknown_0203CCEC = {};
-EWRAM_DATA struct BattleDomeCard gUnknown_0203CD04[8] = {};
+static EWRAM_DATA struct BattleDomeCard gUnknown_0203CD04[8] = {};
 
 // Static ROM declarations
 
 // .rodata
 
-extern const struct BattleDomeCard gUnknown_0860B058;
+static const struct BattleDomeCard gUnknown_0860B058 = {};
+static const struct OamData gUnknown_0860B064 = {
+    .size = 3
+};
+static const struct OamData gUnknown_0860B06C = {
+    .affineMode = 1, .size = 3
+};
 
 // .text
 
-void nullsub_122(struct Sprite *sprite)
+static void nullsub_122(struct Sprite *sprite)
 {
 
 }
@@ -61,7 +66,7 @@ bool16 dp13_810BB8C(void)
     return FALSE;
 }
 
-bool16 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, u8 *dest, bool8 isTrainer, bool8 ignoreDeoxys)
+static bool16 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, u8 *dest, bool8 isTrainer, bool8 ignoreDeoxys)
 {
     if (!isTrainer)
     {
@@ -102,12 +107,12 @@ bool16 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, u
     return FALSE;
 }
 
-bool16 sub_818D09C(u16 species, u32 personality, bool8 isFrontPic, u8 *dest, bool8 isTrainer)
+static bool16 sub_818D09C(u16 species, u32 personality, bool8 isFrontPic, u8 *dest, bool8 isTrainer)
 {
     return load_pokemon_image_TODO(species, personality, isFrontPic, dest, isTrainer, FALSE);
 }
 
-void sub_818D0C4(u16 species, u32 otId, u32 personality, u8 paletteSlot, u16 paletteTag, bool8 isTrainer)
+static void sub_818D0C4(u16 species, u32 otId, u32 personality, u8 paletteSlot, u16 paletteTag, bool8 isTrainer)
 {
     if (!isTrainer)
     {
@@ -137,7 +142,7 @@ void sub_818D0C4(u16 species, u32 otId, u32 personality, u8 paletteSlot, u16 pal
     }
 }
 
-void sub_818D180(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 isTrainer)
+static void sub_818D180(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 isTrainer)
 {
     if (!isTrainer)
     {
@@ -149,7 +154,7 @@ void sub_818D180(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 i
     }
 }
 
-void uns_builder_assign_animtable1(bool8 isTrainer)
+static void uns_builder_assign_animtable1(bool8 isTrainer)
 {
     if (!isTrainer)
     {
@@ -161,7 +166,7 @@ void uns_builder_assign_animtable1(bool8 isTrainer)
     }
 }
 
-u16 oamt_spawn_poke_or_trainer_picture(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer, bool8 ignoreDeoxys)
+static u16 oamt_spawn_poke_or_trainer_picture(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer, bool8 ignoreDeoxys)
 {
     u8 i;
     u8 *framePics;
@@ -221,7 +226,7 @@ u16 oamt_spawn_poke_or_trainer_picture(u16 species, u32 otId, u32 personality, b
     return spriteId;
 }
 
-u16 sub_818D384(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer)
+static u16 sub_818D384(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer)
 {
     return oamt_spawn_poke_or_trainer_picture(species, otId, personality, isFrontPic, x, y, paletteSlot, paletteTag, isTrainer, FALSE);
 }
@@ -309,7 +314,7 @@ u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y,
     return spriteId;
 }
 
-u16 sub_818D5B0(u16 spriteId)
+static u16 sub_818D5B0(u16 spriteId)
 {
     u8 i;
     u8 *framePics;
@@ -339,7 +344,7 @@ u16 sub_818D5B0(u16 spriteId)
     return 0;
 }
 
-u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId, bool8 isTrainer)
+static u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId, bool8 isTrainer)
 {
     if (sub_818D09C(species, personality, isFrontPic, (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE))
     {
@@ -349,7 +354,7 @@ u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 pal
     return 0;
 }
 
-u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId, bool8 isTrainer)
+static u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId, bool8 isTrainer)
 {
     u8 *framePics;
 
@@ -364,7 +369,7 @@ u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 de
     return 0xFFFF;
 }
 
-u16 sub_818D778(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 ignoreDeoxys)
+static u16 sub_818D778(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 ignoreDeoxys)
 {
     return oamt_spawn_poke_or_trainer_picture(species, otId, personality, isFrontPic, x, y, paletteSlot, paletteTag, FALSE, ignoreDeoxys);
 }
@@ -409,16 +414,17 @@ u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteS
     return sub_818D6CC(species, 0, 0, isFrontPic, destX, destY, paletteSlot, windowId, TRUE);
 }
 
-//u8 sub_818D97C(u8 a0, u8 a1)
-//{
-//    u8 id;
-//    if (a1 == 1 && a0)
-//    {
-//        id = gUnknown_0831F578[0x3F];
-//    }
-//    else
-//    {
-//        id = gUnknown_0831F578[0x3C];
-//    }
-//    return id;
-//}
+u8 sub_818D97C(u8 a0, u8 a1)
+{
+    if (a1 == 1)
+    {
+        switch (a0)
+        {
+            default:
+                return gUnknown_0831F578[0x3F];
+            case 0:
+                return gUnknown_0831F578[0x3C];
+        }
+    }
+    return a0;
+}
-- 
cgit v1.2.3


From 3d32be86fcd40bf5979fff62a87d6390dd4171fe Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 19 Sep 2017 14:12:51 -0500
Subject: Continue baserom extraction

---
 src/pokemon_3.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 2d1dfb8b7..2c3e84de9 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -46,16 +46,16 @@ extern const struct SpindaSpot gSpindaSpotGraphics[];
 extern const u8* const gStatNamesTable[];
 extern const u8 gSpeciesNames[][11];
 extern const u8 gUnknown_08329EC8[];
-extern const u8 gUnknown_085CB38A[];
-extern const u8 gUnknown_085CB3AA[];
-extern const u8 gUnknown_085CA459[];
-extern const u8 gUnknown_085CA424[];
+extern const u8 gText_StatRose[];
+extern const u8 gText_PkmnsStatChanged2[];
+extern const u8 gText_PkmnGettingPumped[];
+extern const u8 gText_PkmnShroudedInMist[];
 extern const s8 gNatureStatTable[][5];
 extern const s8 gUnknown_08329ECE[][3];
 extern const u32 gBitTable[];
 extern const u32 gTMHMLearnsets[][2];
 extern const u8 BattleText_Wally[];
-extern const u8 BattleText_PreventedSwitch[];
+extern const u8 gText_PkmnsXPreventsSwitching[];
 extern const struct CompressedSpritePalette gMonPaletteTable[];
 extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
 extern const u16 gHMMoves[];
@@ -215,8 +215,8 @@ void sub_806CF24(s32 stat)
 {
     gBankTarget = gBankInMenu;
     StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_08329EC8[stat]]);
-    StringCopy(gBattleTextBuff2, gUnknown_085CB38A);
-    StrCpyDecodeToDisplayedStringBattle(gUnknown_085CB3AA);
+    StringCopy(gBattleTextBuff2, gText_StatRose);
+    StrCpyDecodeToDisplayedStringBattle(gText_PkmnsStatChanged2);
 }
 
 u8 *sub_806CF78(u16 itemId)
@@ -251,7 +251,7 @@ u8 *sub_806CF78(u16 itemId)
             else
             {
                 gBankAttacker = gBankInMenu;
-                StrCpyDecodeToDisplayedStringBattle(gUnknown_085CA459);
+                StrCpyDecodeToDisplayedStringBattle(gText_PkmnGettingPumped);
             }
         }
     }
@@ -259,7 +259,7 @@ u8 *sub_806CF78(u16 itemId)
     if (itemEffect[3] & 0x80)
     {
         gBankAttacker = gBankInMenu;
-        StrCpyDecodeToDisplayedStringBattle(gUnknown_085CA424);
+        StrCpyDecodeToDisplayedStringBattle(gText_PkmnShroudedInMist);
     }
 
     return gDisplayedStringBattle;
@@ -1374,7 +1374,7 @@ void sub_806E994(void)
     gBattleTextBuff2[2] = gBankInMenu;
     gBattleTextBuff2[3] = pokemon_order_func(gBattlePartyID[gBankInMenu]);
     gBattleTextBuff2[4] = EOS;
-    StrCpyDecodeBattle(BattleText_PreventedSwitch, gStringVar4);
+    StrCpyDecodeBattle(gText_PkmnsXPreventsSwitching, gStringVar4);
 }
 
 struct PokeItem
-- 
cgit v1.2.3


From e7e1938094081ba2e20232caca0239cb2290251f Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 19 Sep 2017 16:17:23 -0400
Subject: Start decompilation of lilycove_lady

---
 src/lilycove_lady.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 src/lilycove_lady.c

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
new file mode 100644
index 000000000..7f4c4824a
--- /dev/null
+++ b/src/lilycove_lady.c
@@ -0,0 +1,57 @@
+//
+// Created by Scott Norton on 9/19/17.
+//
+
+#include "global.h"
+#include "event_data.h"
+#include "lilycove_lady.h"
+
+void SetLilycoveQuizLady(void);
+void SetLilycoveFavourLady(void);
+void SetLilycoveContestLady(void);
+
+extern const u16 gUnknown_0860B074[];
+extern const u16 gUnknown_0860B07E[];
+
+u8 GetLilycoveLadyId(void)
+{
+    return gSaveBlock1Ptr->lilycoveLady.common.id;
+}
+
+void sub_818D9C0(void)
+{
+    LilycoveLady *lilycoveLady;
+
+    VarSet(VAR_0x4010, gUnknown_0860B07E[GetLilycoveLadyId()]);
+    if (GetLilycoveLadyId() == LILYCOVE_LADY_CONTEST)
+    {
+        lilycoveLady = &gSaveBlock1Ptr->lilycoveLady;
+        VarSet(VAR_0x4011, gUnknown_0860B074[lilycoveLady->contest.category]);
+        gScriptResult = TRUE;
+    }
+    else
+    {
+        gScriptResult = FALSE;
+    }
+}
+
+void SetLilycoveLady(void)
+{
+    u16 id;
+
+    id = ((gSaveBlock2Ptr->playerTrainerId[1] << 8) | gSaveBlock2Ptr->playerTrainerId[0]);
+    id %= 6;
+    id >>= 1;
+    switch (id)
+    {
+        case LILYCOVE_LADY_QUIZ:
+            SetLilycoveQuizLady();
+            break;
+        case LILYCOVE_LADY_FAVOUR:
+            SetLilycoveFavourLady();
+            break;
+        case LILYCOVE_LADY_CONTEST:
+            SetLilycoveContestLady();
+            break;
+    }
+}
-- 
cgit v1.2.3


From 99a7fcfdfa723390ecb25ec6819359b3521c8f34 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 19 Sep 2017 16:21:50 -0400
Subject: sub_818DA78, SetLilycoveLadyRandomly

---
 src/lilycove_lady.c | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 7f4c4824a..ab1c24914 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -4,11 +4,15 @@
 
 #include "global.h"
 #include "event_data.h"
+#include "rng.h"
 #include "lilycove_lady.h"
 
 void SetLilycoveQuizLady(void);
 void SetLilycoveFavourLady(void);
 void SetLilycoveContestLady(void);
+void sub_818E004(void);
+void sub_818DBC4(void);
+void sub_818E674(void);
 
 extern const u16 gUnknown_0860B074[];
 extern const u16 gUnknown_0860B07E[];
@@ -55,3 +59,38 @@ void SetLilycoveLady(void)
             break;
     }
 }
+
+void sub_818DA78(void)
+{
+    switch (GetLilycoveLadyId())
+    {
+        case LILYCOVE_LADY_QUIZ:
+            sub_818E004();
+            break;
+        case LILYCOVE_LADY_FAVOUR:
+            sub_818DBC4();
+            break;
+        case LILYCOVE_LADY_CONTEST:
+            sub_818E674();
+            break;
+    }
+}
+
+void SetLilycoveLadyRandomly(void)
+{
+    u8 id;
+
+    id = Random() % 3;
+    switch (id)
+    {
+        case LILYCOVE_LADY_QUIZ:
+            SetLilycoveQuizLady();
+            break;
+        case LILYCOVE_LADY_FAVOUR:
+            SetLilycoveFavourLady();
+            break;
+        case LILYCOVE_LADY_CONTEST:
+            SetLilycoveContestLady();
+            break;
+    }
+}
-- 
cgit v1.2.3


From 0d0532731f99036d09d6bb2788de0221b6886105 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 19 Sep 2017 16:24:42 -0400
Subject: sub_818DAEC, sub_818DB04

---
 src/lilycove_lady.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index ab1c24914..579eca5cb 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -94,3 +94,16 @@ void SetLilycoveLadyRandomly(void)
             break;
     }
 }
+
+void sub_818DAEC(void)
+{
+    gScriptResult = GetLilycoveLadyId();
+}
+
+u8 sub_818DB04(u16 *data)
+{
+    u8 len;
+
+    for (len = 0; *data != 0; len ++, data ++);
+    return len;
+}
-- 
cgit v1.2.3


From b26eb6713bb866f1173b4c7192ce231d894d19ea Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 19 Sep 2017 16:32:33 -0400
Subject: sub_818DB20

---
 src/lilycove_lady.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 579eca5cb..2e0d336dd 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -14,8 +14,11 @@ void sub_818E004(void);
 void sub_818DBC4(void);
 void sub_818E674(void);
 
-extern const u16 gUnknown_0860B074[];
-extern const u16 gUnknown_0860B07E[];
+extern const u16 gUnknown_0860B074[5];
+extern const u16 gUnknown_0860B07E[3];
+extern const u16 *const gUnknown_0860B2EC[6];
+
+EWRAM_DATA LilycoveLady *gUnknown_0203CD64 = NULL;
 
 u8 GetLilycoveLadyId(void)
 {
@@ -100,10 +103,21 @@ void sub_818DAEC(void)
     gScriptResult = GetLilycoveLadyId();
 }
 
-u8 sub_818DB04(u16 *data)
+u8 sub_818DB04(const u16 *data)
 {
     u8 len;
 
     for (len = 0; *data != 0; len ++, data ++);
     return len;
 }
+
+void sub_818DB20(void)
+{
+    u8 size;
+    u8 idx;
+
+    gUnknown_0203CD64->favour.unk_00c = Random() % 6;
+    size = sub_818DB04(gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c]);
+    idx = Random() % size;
+    gUnknown_0203CD64->favour.unk_010 = gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c][idx];
+}
-- 
cgit v1.2.3


From 4e8a2c6934c4f8a44ed8d350fe96996beda21d0e Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 19 Sep 2017 16:55:53 -0400
Subject: SetLilycoveFavourLady

---
 src/lilycove_lady.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 2e0d336dd..aec55a574 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -3,6 +3,7 @@
 //
 
 #include "global.h"
+#include "main.h"
 #include "event_data.h"
 #include "rng.h"
 #include "lilycove_lady.h"
@@ -121,3 +122,23 @@ void sub_818DB20(void)
     idx = Random() % size;
     gUnknown_0203CD64->favour.unk_010 = gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c][idx];
 }
+
+void SetLilycoveFavourLady(void)
+{
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
+    gUnknown_0203CD64->favour.id = LILYCOVE_LADY_FAVOUR;
+    gUnknown_0203CD64->favour.unk_001 = 0;
+    gUnknown_0203CD64->favour.unk_004 = 0xFF;
+    gUnknown_0203CD64->favour.unk_002 = 0;
+    gUnknown_0203CD64->favour.unk_003= 0;
+    gUnknown_0203CD64->favour.unk_00e = 0;
+    gUnknown_0203CD64->favour.language = gGameLanguage;
+    sub_818DB20();
+}
+
+void sub_818DBC4(void)
+{
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
+    gUnknown_0203CD64->favour.id = LILYCOVE_LADY_FAVOUR;
+    gUnknown_0203CD64->favour.unk_001 = 0;
+}
-- 
cgit v1.2.3


From b8e733283e31c4863f774c6cf2bbb17ba369681f Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 19 Sep 2017 17:04:17 -0400
Subject: Another handful of favour lady functions

---
 src/lilycove_lady.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index aec55a574..16461728c 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -6,6 +6,7 @@
 #include "main.h"
 #include "event_data.h"
 #include "rng.h"
+#include "string_util.h"
 #include "lilycove_lady.h"
 
 void SetLilycoveQuizLady(void);
@@ -17,6 +18,7 @@ void sub_818E674(void);
 
 extern const u16 gUnknown_0860B074[5];
 extern const u16 gUnknown_0860B07E[3];
+extern const u8 *const gUnknown_0860B224[];
 extern const u16 *const gUnknown_0860B2EC[6];
 
 EWRAM_DATA LilycoveLady *gUnknown_0203CD64 = NULL;
@@ -142,3 +144,31 @@ void sub_818DBC4(void)
     gUnknown_0203CD64->favour.id = LILYCOVE_LADY_FAVOUR;
     gUnknown_0203CD64->favour.unk_001 = 0;
 }
+
+u8 sub_818DBE8(void)
+{
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
+    if (gUnknown_0203CD64->favour.unk_001 == 2)
+    {
+        return 2;
+    }
+    else if (gUnknown_0203CD64->favour.unk_001 == 1)
+    {
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+const u8 *sub_818DC1C(u8 idx)
+{
+    return gUnknown_0860B224[idx];
+}
+
+void sub_818DC2C(void)
+{
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
+    StringCopy(gStringVar1, sub_818DC1C(gUnknown_0203CD64->favour.unk_00c));
+}
-- 
cgit v1.2.3


From 3b3423d1a751134ff7941b41bad72e0e75314647 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 19 Sep 2017 17:07:36 -0400
Subject: sub_818DC60

---
 src/lilycove_lady.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 16461728c..578280115 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -7,6 +7,7 @@
 #include "event_data.h"
 #include "rng.h"
 #include "string_util.h"
+#include "text.h"
 #include "lilycove_lady.h"
 
 void SetLilycoveQuizLady(void);
@@ -130,7 +131,7 @@ void SetLilycoveFavourLady(void)
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
     gUnknown_0203CD64->favour.id = LILYCOVE_LADY_FAVOUR;
     gUnknown_0203CD64->favour.unk_001 = 0;
-    gUnknown_0203CD64->favour.unk_004 = 0xFF;
+    gUnknown_0203CD64->favour.unk_004[0] = EOS;
     gUnknown_0203CD64->favour.unk_002 = 0;
     gUnknown_0203CD64->favour.unk_003= 0;
     gUnknown_0203CD64->favour.unk_00e = 0;
@@ -172,3 +173,15 @@ void sub_818DC2C(void)
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
     StringCopy(gStringVar1, sub_818DC1C(gUnknown_0203CD64->favour.unk_00c));
 }
+
+bool8 sub_818DC60(void)
+{
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
+    if (gUnknown_0203CD64->favour.unk_004[0] != EOS)
+    {
+        StringCopy7(gStringVar3, gSaveBlock1Ptr->lilycoveLady.favour.unk_004);
+        ConvertInternationalString(gStringVar3, gUnknown_0203CD64->favour.language);
+        return TRUE;
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From fcc94f9722609ffa67c045cf8a7539690a68b080 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 19 Sep 2017 19:31:53 -0500
Subject: Extract baseroms from battle_message and rename strings

---
 src/pokemon_2.c | 6 +++---
 src/pokemon_3.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 30e788874..cf073570d 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -31,7 +31,7 @@ extern const union AnimCmd* gUnknown_082FF70C[];
 extern const union AnimCmd* const * const gUnknown_08309AAC[];
 extern const union AnimCmd* const * const gUnknown_08305D0C[];
 extern const union AnimCmd* const * const gUnknown_0830536C[];
-extern const u8 gBadEggNickname[];
+extern const u8 gText_BadEgg[];
 extern const u8 gText_EggNickname[];
 
 extern u8 GetBankSide(u8 bank);
@@ -409,8 +409,8 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
         if (boxMon->isBadEgg)
         {
             for (retVal = 0;
-                retVal < POKEMON_NAME_LENGTH && gBadEggNickname[retVal] != EOS;
-                data[retVal] = gBadEggNickname[retVal], retVal++) {}
+                retVal < POKEMON_NAME_LENGTH && gText_BadEgg[retVal] != EOS;
+                data[retVal] = gText_BadEgg[retVal], retVal++) {}
 
             data[retVal] = EOS;
         }
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 2c3e84de9..569222e33 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -54,7 +54,7 @@ extern const s8 gNatureStatTable[][5];
 extern const s8 gUnknown_08329ECE[][3];
 extern const u32 gBitTable[];
 extern const u32 gTMHMLearnsets[][2];
-extern const u8 BattleText_Wally[];
+extern const u8 gText_BattleWallyName[];
 extern const u8 gText_PkmnsXPreventsSwitching[];
 extern const struct CompressedSpritePalette gMonPaletteTable[];
 extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
@@ -1177,7 +1177,7 @@ u16 GetBattleBGM(void)
         case CLASS_PKMN_TRAINER_RIVAL:
             if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
                 return 0x1E1;
-            if (!StringCompare(gTrainers[gTrainerBattleOpponent_A].trainerName, BattleText_Wally))
+            if (!StringCompare(gTrainers[gTrainerBattleOpponent_A].trainerName, gText_BattleWallyName))
                 return 0x1DC;
             return 0x1E1;
         case CLASS_ELITE_FOUR:
-- 
cgit v1.2.3


From 54bd2c17812bd399fa6e857332c3bdacc1df71b3 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Sep 2017 21:10:30 -0400
Subject: Address review by diego

---
 src/berry_fix_program.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index 931e92746..f04308ae8 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -130,8 +130,7 @@ static const u8 *const gUnknown_08618178[][3] = {
 };
 
 extern const u8 gUnknown_089A6550[0xC0];
-extern const u8 gMultiBootProgram_BerryGlitchFix_Script[0x3b34];
-extern const u8 gMultiBootProgram_BerryGlitchFix_Start[];
+extern const u8 gMultiBootProgram_BerryGlitchFix_Start[0x3b34];
 extern const u8 gMultiBootProgram_BerryGlitchFix_End[];
 
 // .text
-- 
cgit v1.2.3


From 316f9f4d83d118437c266526cc0e6da1dfc90461 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Sep 2017 21:28:01 -0400
Subject: through sub_818DD14

---
 src/lilycove_lady.c | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 578280115..c6b49e36f 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -7,6 +7,8 @@
 #include "event_data.h"
 #include "rng.h"
 #include "string_util.h"
+#include "item.h"
+#include "items.h"
 #include "text.h"
 #include "lilycove_lady.h"
 
@@ -134,7 +136,7 @@ void SetLilycoveFavourLady(void)
     gUnknown_0203CD64->favour.unk_004[0] = EOS;
     gUnknown_0203CD64->favour.unk_002 = 0;
     gUnknown_0203CD64->favour.unk_003= 0;
-    gUnknown_0203CD64->favour.unk_00e = 0;
+    gUnknown_0203CD64->favour.itemId = ITEM_NONE;
     gUnknown_0203CD64->favour.language = gGameLanguage;
     sub_818DB20();
 }
@@ -185,3 +187,27 @@ bool8 sub_818DC60(void)
     }
     return FALSE;
 }
+
+void sub_818DCAC(u8 *dest, u16 itemId)
+{
+    StringCopy(dest, ItemId_GetItem(itemId)->name);
+}
+
+void sub_818DCC8(void)
+{
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
+    sub_818DCAC(gStringVar2, gUnknown_0203CD64->favour.itemId);
+}
+
+void sub_818DCF4(const u8 *src, u8 *dest)
+{
+    memset(dest, 0xFF, 8);
+    StringCopy7(dest, src);
+}
+
+void sub_818DD14(void)
+{
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
+    sub_818DCF4(gSaveBlock1Ptr->lilycoveLady.favour.unk_004, gStringVar3);
+    ConvertInternationalString(gStringVar3, gUnknown_0203CD64->favour.language);
+}
-- 
cgit v1.2.3


From 534dd2c4b0259f87657b2e8795d96217e8bf12cc Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Sep 2017 21:47:15 -0400
Subject: sub_818DD84

---
 src/lilycove_lady.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index c6b49e36f..8a0851110 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -9,6 +9,7 @@
 #include "string_util.h"
 #include "item.h"
 #include "items.h"
+#include "item_menu.h"
 #include "text.h"
 #include "lilycove_lady.h"
 
@@ -211,3 +212,46 @@ void sub_818DD14(void)
     sub_818DCF4(gSaveBlock1Ptr->lilycoveLady.favour.unk_004, gStringVar3);
     ConvertInternationalString(gStringVar3, gUnknown_0203CD64->favour.language);
 }
+
+bool8 sub_818DD54(void)
+{
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
+    return gUnknown_0203CD64->favour.unk_002 ? TRUE : FALSE;
+}
+
+void sub_818DD78(void)
+{
+    sub_81AAC50();
+}
+
+bool8 sub_818DD84(u16 itemId)
+{
+    u8 len;
+    u8 i;
+    bool8 response;
+
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
+    len = sub_818DB04(gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c]);
+    gUnknown_0203CD64->favour.unk_001 = 1;
+    sub_818DCAC(gStringVar2, itemId);
+    gUnknown_0203CD64->favour.itemId = itemId;
+    sub_818DCF4(gSaveBlock2Ptr->playerName, gUnknown_0203CD64->favour.unk_004);
+    gUnknown_0203CD64->favour.language = gGameLanguage;
+    response = FALSE;
+    for (i = 0; i < len; i ++)
+    {
+        if (gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c][i] == itemId)
+        {
+            response = TRUE;
+            gUnknown_0203CD64->favour.unk_003 ++;
+            gUnknown_0203CD64->favour.unk_002 = 1;
+            if (gUnknown_0203CD64->favour.unk_010 == itemId)
+            {
+                gUnknown_0203CD64->favour.unk_003 = 5;
+            }
+            break;
+        }
+        gUnknown_0203CD64->favour.unk_002 = 0;
+    }
+    return response;
+}
-- 
cgit v1.2.3


From 83a420400c302d4c59eb204f8fa18943d69fc6d0 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Sep 2017 21:58:32 -0400
Subject: through sub_818DEF4

---
 src/lilycove_lady.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 8a0851110..10a0e7f45 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -5,6 +5,7 @@
 #include "global.h"
 #include "main.h"
 #include "event_data.h"
+#include "script.h"
 #include "rng.h"
 #include "string_util.h"
 #include "item.h"
@@ -24,8 +25,10 @@ extern const u16 gUnknown_0860B074[5];
 extern const u16 gUnknown_0860B07E[3];
 extern const u8 *const gUnknown_0860B224[];
 extern const u16 *const gUnknown_0860B2EC[6];
+extern const u16 gUnknown_0860B304[6];
 
 EWRAM_DATA LilycoveLady *gUnknown_0203CD64 = NULL;
+extern EWRAM_DATA u16 gScriptItemId;
 
 u8 GetLilycoveLadyId(void)
 {
@@ -255,3 +258,44 @@ bool8 sub_818DD84(u16 itemId)
     }
     return response;
 }
+
+bool8 sub_818DE44(void)
+{
+    return sub_818DD84(gScriptItemId);
+}
+
+bool8 sub_818DE5C(void)
+{
+    u8 checkval;
+
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
+    checkval = gUnknown_0203CD64->favour.unk_003;
+    return checkval < 5 ? FALSE : TRUE;
+}
+
+void sub_818DE88(u16 itemId)
+{
+    sub_818DCAC(gStringVar2, itemId);
+}
+
+u16 sub_818DEA0(void)
+{
+    u16 itemId;
+
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
+    itemId = gUnknown_0860B304[gUnknown_0203CD64->favour.unk_00c];
+    sub_818DE88(itemId);
+    gUnknown_0203CD64->favour.unk_001 = 2;
+    return itemId;
+}
+
+void sub_818DEDC(void)
+{
+    SetLilycoveFavourLady();
+    gUnknown_0203CD64->favour.unk_001 = 1;
+}
+
+void sub_818DEF4(void)
+{
+    EnableBothScriptContexts();
+}
-- 
cgit v1.2.3


From 73ee165ef6b05417dc42be721e625712c6538ed6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Sep 2017 22:25:31 -0400
Subject: sub_818DF00

---
 src/lilycove_lady.c | 114 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 67 insertions(+), 47 deletions(-)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 10a0e7f45..d64b0d3b3 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -26,8 +26,12 @@ extern const u16 gUnknown_0860B07E[3];
 extern const u8 *const gUnknown_0860B224[];
 extern const u16 *const gUnknown_0860B2EC[6];
 extern const u16 gUnknown_0860B304[6];
+extern const u16 *const gUnknown_0860B1A4[16];
+extern const u16 gUnknown_0860B1E4[16];
+extern const u16 gUnknown_0860B204[16];
 
-EWRAM_DATA LilycoveLady *gUnknown_0203CD64 = NULL;
+EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL;
+EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL;
 extern EWRAM_DATA u16 gScriptItemId;
 
 u8 GetLilycoveLadyId(void)
@@ -126,40 +130,40 @@ void sub_818DB20(void)
     u8 size;
     u8 idx;
 
-    gUnknown_0203CD64->favour.unk_00c = Random() % 6;
-    size = sub_818DB04(gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c]);
+    gUnknown_0203CD64->unk_00c = Random() % 6;
+    size = sub_818DB04(gUnknown_0860B2EC[gUnknown_0203CD64->unk_00c]);
     idx = Random() % size;
-    gUnknown_0203CD64->favour.unk_010 = gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c][idx];
+    gUnknown_0203CD64->unk_010 = gUnknown_0860B2EC[gUnknown_0203CD64->unk_00c][idx];
 }
 
 void SetLilycoveFavourLady(void)
 {
-    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
-    gUnknown_0203CD64->favour.id = LILYCOVE_LADY_FAVOUR;
-    gUnknown_0203CD64->favour.unk_001 = 0;
-    gUnknown_0203CD64->favour.unk_004[0] = EOS;
-    gUnknown_0203CD64->favour.unk_002 = 0;
-    gUnknown_0203CD64->favour.unk_003= 0;
-    gUnknown_0203CD64->favour.itemId = ITEM_NONE;
-    gUnknown_0203CD64->favour.language = gGameLanguage;
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
+    gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR;
+    gUnknown_0203CD64->unk_001 = 0;
+    gUnknown_0203CD64->unk_004[0] = EOS;
+    gUnknown_0203CD64->unk_002 = 0;
+    gUnknown_0203CD64->unk_003= 0;
+    gUnknown_0203CD64->itemId = ITEM_NONE;
+    gUnknown_0203CD64->language = gGameLanguage;
     sub_818DB20();
 }
 
 void sub_818DBC4(void)
 {
-    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
-    gUnknown_0203CD64->favour.id = LILYCOVE_LADY_FAVOUR;
-    gUnknown_0203CD64->favour.unk_001 = 0;
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
+    gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR;
+    gUnknown_0203CD64->unk_001 = 0;
 }
 
 u8 sub_818DBE8(void)
 {
-    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
-    if (gUnknown_0203CD64->favour.unk_001 == 2)
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
+    if (gUnknown_0203CD64->unk_001 == 2)
     {
         return 2;
     }
-    else if (gUnknown_0203CD64->favour.unk_001 == 1)
+    else if (gUnknown_0203CD64->unk_001 == 1)
     {
         return 1;
     }
@@ -176,17 +180,17 @@ const u8 *sub_818DC1C(u8 idx)
 
 void sub_818DC2C(void)
 {
-    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
-    StringCopy(gStringVar1, sub_818DC1C(gUnknown_0203CD64->favour.unk_00c));
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
+    StringCopy(gStringVar1, sub_818DC1C(gUnknown_0203CD64->unk_00c));
 }
 
 bool8 sub_818DC60(void)
 {
-    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
-    if (gUnknown_0203CD64->favour.unk_004[0] != EOS)
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
+    if (gUnknown_0203CD64->unk_004[0] != EOS)
     {
         StringCopy7(gStringVar3, gSaveBlock1Ptr->lilycoveLady.favour.unk_004);
-        ConvertInternationalString(gStringVar3, gUnknown_0203CD64->favour.language);
+        ConvertInternationalString(gStringVar3, gUnknown_0203CD64->language);
         return TRUE;
     }
     return FALSE;
@@ -199,8 +203,8 @@ void sub_818DCAC(u8 *dest, u16 itemId)
 
 void sub_818DCC8(void)
 {
-    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
-    sub_818DCAC(gStringVar2, gUnknown_0203CD64->favour.itemId);
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
+    sub_818DCAC(gStringVar2, gUnknown_0203CD64->itemId);
 }
 
 void sub_818DCF4(const u8 *src, u8 *dest)
@@ -211,15 +215,15 @@ void sub_818DCF4(const u8 *src, u8 *dest)
 
 void sub_818DD14(void)
 {
-    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
     sub_818DCF4(gSaveBlock1Ptr->lilycoveLady.favour.unk_004, gStringVar3);
-    ConvertInternationalString(gStringVar3, gUnknown_0203CD64->favour.language);
+    ConvertInternationalString(gStringVar3, gUnknown_0203CD64->language);
 }
 
 bool8 sub_818DD54(void)
 {
-    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
-    return gUnknown_0203CD64->favour.unk_002 ? TRUE : FALSE;
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
+    return gUnknown_0203CD64->unk_002 ? TRUE : FALSE;
 }
 
 void sub_818DD78(void)
@@ -233,28 +237,28 @@ bool8 sub_818DD84(u16 itemId)
     u8 i;
     bool8 response;
 
-    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
-    len = sub_818DB04(gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c]);
-    gUnknown_0203CD64->favour.unk_001 = 1;
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
+    len = sub_818DB04(gUnknown_0860B2EC[gUnknown_0203CD64->unk_00c]);
+    gUnknown_0203CD64->unk_001 = 1;
     sub_818DCAC(gStringVar2, itemId);
-    gUnknown_0203CD64->favour.itemId = itemId;
-    sub_818DCF4(gSaveBlock2Ptr->playerName, gUnknown_0203CD64->favour.unk_004);
-    gUnknown_0203CD64->favour.language = gGameLanguage;
+    gUnknown_0203CD64->itemId = itemId;
+    sub_818DCF4(gSaveBlock2Ptr->playerName, gUnknown_0203CD64->unk_004);
+    gUnknown_0203CD64->language = gGameLanguage;
     response = FALSE;
     for (i = 0; i < len; i ++)
     {
-        if (gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c][i] == itemId)
+        if (gUnknown_0860B2EC[gUnknown_0203CD64->unk_00c][i] == itemId)
         {
             response = TRUE;
-            gUnknown_0203CD64->favour.unk_003 ++;
-            gUnknown_0203CD64->favour.unk_002 = 1;
-            if (gUnknown_0203CD64->favour.unk_010 == itemId)
+            gUnknown_0203CD64->unk_003 ++;
+            gUnknown_0203CD64->unk_002 = 1;
+            if (gUnknown_0203CD64->unk_010 == itemId)
             {
-                gUnknown_0203CD64->favour.unk_003 = 5;
+                gUnknown_0203CD64->unk_003 = 5;
             }
             break;
         }
-        gUnknown_0203CD64->favour.unk_002 = 0;
+        gUnknown_0203CD64->unk_002 = 0;
     }
     return response;
 }
@@ -268,8 +272,8 @@ bool8 sub_818DE5C(void)
 {
     u8 checkval;
 
-    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
-    checkval = gUnknown_0203CD64->favour.unk_003;
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
+    checkval = gUnknown_0203CD64->unk_003;
     return checkval < 5 ? FALSE : TRUE;
 }
 
@@ -282,20 +286,36 @@ u16 sub_818DEA0(void)
 {
     u16 itemId;
 
-    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady;
-    itemId = gUnknown_0860B304[gUnknown_0203CD64->favour.unk_00c];
+    gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
+    itemId = gUnknown_0860B304[gUnknown_0203CD64->unk_00c];
     sub_818DE88(itemId);
-    gUnknown_0203CD64->favour.unk_001 = 2;
+    gUnknown_0203CD64->unk_001 = 2;
     return itemId;
 }
 
 void sub_818DEDC(void)
 {
     SetLilycoveFavourLady();
-    gUnknown_0203CD64->favour.unk_001 = 1;
+    gUnknown_0203CD64->unk_001 = 1;
 }
 
 void sub_818DEF4(void)
 {
     EnableBothScriptContexts();
 }
+
+void sub_818DF00(void)
+{
+    u8 v0;
+    u8 i;
+    
+    v0 = Random() % 16;
+    for (i = 0; i < 9; i ++)
+    {
+        gUnknown_0203CD68->unk_002[i] = gUnknown_0860B1A4[v0][i];
+    }
+    gUnknown_0203CD68->unk_014 = gUnknown_0860B1E4[v0];
+    gUnknown_0203CD68->unk_028 = gUnknown_0860B204[v0];
+    gUnknown_0203CD68->unk_02b = v0;
+    gUnknown_0203CD68->unk_018 = 0xFF;
+}
-- 
cgit v1.2.3


From 28d0fa33fef825dcb22d45db966ef814c461dd08 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Sep 2017 22:35:40 -0400
Subject: SetLilicoveQuizLady

---
 src/lilycove_lady.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index d64b0d3b3..901812ed6 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -319,3 +319,27 @@ void sub_818DF00(void)
     gUnknown_0203CD68->unk_02b = v0;
     gUnknown_0203CD68->unk_018 = 0xFF;
 }
+
+void SetLilycoveQuizLady(void)
+{
+    u8 i;
+
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    gUnknown_0203CD68->id = LILYCOVE_LADY_QUIZ;
+    gUnknown_0203CD68->unk_001 = 0;
+    for (i = 0; i < 9; i ++)
+    {
+        gUnknown_0203CD68->unk_002[i] = -1;
+    }
+    gUnknown_0203CD68->unk_014 = -1;
+    gUnknown_0203CD68->unk_016 = -1;
+    for (i = 0; i < 4; i ++)
+    {
+        gUnknown_0203CD68->unk_020[i] = 0;
+    }
+    gUnknown_0203CD68->unk_028 = 0;
+    gUnknown_0203CD68->unk_02a = 0;
+    gUnknown_0203CD68->unk_02c = 0x10;
+    gUnknown_0203CD68->language = gGameLanguage;
+    sub_818DF00();
+}
-- 
cgit v1.2.3


From 9b00767b55b70627aad81b67b87c06db9dca5742 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Sep 2017 22:57:22 -0400
Subject: sub_818E004; sanity

---
 src/lilycove_lady.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 901812ed6..c7a5ef68d 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -189,7 +189,7 @@ bool8 sub_818DC60(void)
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
     if (gUnknown_0203CD64->unk_004[0] != EOS)
     {
-        StringCopy7(gStringVar3, gSaveBlock1Ptr->lilycoveLady.favour.unk_004);
+        StringCopy7(gStringVar3, gUnknown_0203CD64->unk_004);
         ConvertInternationalString(gStringVar3, gUnknown_0203CD64->language);
         return TRUE;
     }
@@ -216,7 +216,7 @@ void sub_818DCF4(const u8 *src, u8 *dest)
 void sub_818DD14(void)
 {
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
-    sub_818DCF4(gSaveBlock1Ptr->lilycoveLady.favour.unk_004, gStringVar3);
+    sub_818DCF4(gUnknown_0203CD64->unk_004, gStringVar3);
     ConvertInternationalString(gStringVar3, gUnknown_0203CD64->language);
 }
 
@@ -343,3 +343,12 @@ void SetLilycoveQuizLady(void)
     gUnknown_0203CD68->language = gGameLanguage;
     sub_818DF00();
 }
+
+void sub_818E004(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    gUnknown_0203CD68->id = LILYCOVE_LADY_QUIZ;
+    gUnknown_0203CD68->unk_001 = 0;
+    gUnknown_0203CD68->unk_02a = 0;
+    gUnknown_0203CD68->unk_016 = -1;
+}
-- 
cgit v1.2.3


From c05f2d44732020ed43f5500a26130ec94e34d657 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Sep 2017 23:31:05 -0400
Subject: sub_818E06C

---
 src/lilycove_lady.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index c7a5ef68d..93c3cce67 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -20,6 +20,9 @@ void SetLilycoveContestLady(void);
 void sub_818E004(void);
 void sub_818DBC4(void);
 void sub_818E674(void);
+bool32 sub_811F8D8(u16);
+u8 sub_818E13C(void);
+bool8 sub_818E1F4(void);
 
 extern const u16 gUnknown_0860B074[5];
 extern const u16 gUnknown_0860B07E[3];
@@ -352,3 +355,62 @@ void sub_818E004(void)
     gUnknown_0203CD68->unk_02a = 0;
     gUnknown_0203CD68->unk_016 = -1;
 }
+
+u8 sub_818E038(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    if (gUnknown_0203CD68->unk_001 == 2)
+    {
+        return 2;
+    }
+    else if (gUnknown_0203CD68->unk_001 == 1)
+    {
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+u8 sub_818E06C(void)
+{
+    int i;
+    int j;
+    u8 rv;
+    struct LilycoveLadyQuiz *quiz;
+
+    quiz = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    if (sub_811F8D8(quiz->unk_014) == 0)
+   {
+        i = quiz->unk_02b;
+        do
+        {
+            if (++ i >= 16)
+            {
+                i = 0;
+            }
+        } while (sub_811F8D8(gUnknown_0860B1E4[i]) == 0);
+        for (j = 0; j < 9; j ++)
+        {
+            quiz->unk_002[j] = gUnknown_0860B1A4[i][j];
+        }
+        quiz->unk_014 = gUnknown_0860B1E4[i];
+        quiz->unk_028 = gUnknown_0860B204[i];
+        quiz->unk_02b = i;
+        quiz->unk_018 = 0xFF;
+    }
+    rv = sub_818E13C();
+    if (rv == 0)
+    {
+        return 2;
+    }
+    else if (rv == 2 || sub_818E1F4())
+    {
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+}
-- 
cgit v1.2.3


From 0b81c2920aa87aae3403efdf60e40b58445efbbf Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 20 Sep 2017 10:45:00 -0400
Subject: sub_818E1F4

---
 src/lilycove_lady.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 143 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 93c3cce67..196867369 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -23,6 +23,7 @@ void sub_818E674(void);
 bool32 sub_811F8D8(u16);
 u8 sub_818E13C(void);
 bool8 sub_818E1F4(void);
+u8 sub_818E258(const u8 *);
 
 extern const u16 gUnknown_0860B074[5];
 extern const u16 gUnknown_0860B07E[3];
@@ -32,6 +33,7 @@ extern const u16 gUnknown_0860B304[6];
 extern const u16 *const gUnknown_0860B1A4[16];
 extern const u16 gUnknown_0860B1E4[16];
 extern const u16 gUnknown_0860B204[16];
+extern const u8 gUnknown_085EEB7E[8];
 
 EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL;
 EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL;
@@ -144,7 +146,7 @@ void SetLilycoveFavourLady(void)
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
     gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR;
     gUnknown_0203CD64->unk_001 = 0;
-    gUnknown_0203CD64->unk_004[0] = EOS;
+    gUnknown_0203CD64->playerName[0] = EOS;
     gUnknown_0203CD64->unk_002 = 0;
     gUnknown_0203CD64->unk_003= 0;
     gUnknown_0203CD64->itemId = ITEM_NONE;
@@ -190,9 +192,9 @@ void sub_818DC2C(void)
 bool8 sub_818DC60(void)
 {
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
-    if (gUnknown_0203CD64->unk_004[0] != EOS)
+    if (gUnknown_0203CD64->playerName[0] != EOS)
     {
-        StringCopy7(gStringVar3, gUnknown_0203CD64->unk_004);
+        StringCopy7(gStringVar3, gUnknown_0203CD64->playerName);
         ConvertInternationalString(gStringVar3, gUnknown_0203CD64->language);
         return TRUE;
     }
@@ -219,7 +221,7 @@ void sub_818DCF4(const u8 *src, u8 *dest)
 void sub_818DD14(void)
 {
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
-    sub_818DCF4(gUnknown_0203CD64->unk_004, gStringVar3);
+    sub_818DCF4(gUnknown_0203CD64->playerName, gStringVar3);
     ConvertInternationalString(gStringVar3, gUnknown_0203CD64->language);
 }
 
@@ -245,7 +247,7 @@ bool8 sub_818DD84(u16 itemId)
     gUnknown_0203CD64->unk_001 = 1;
     sub_818DCAC(gStringVar2, itemId);
     gUnknown_0203CD64->itemId = itemId;
-    sub_818DCF4(gSaveBlock2Ptr->playerName, gUnknown_0203CD64->unk_004);
+    sub_818DCF4(gSaveBlock2Ptr->playerName, gUnknown_0203CD64->playerName);
     gUnknown_0203CD64->language = gGameLanguage;
     response = FALSE;
     for (i = 0; i < len; i ++)
@@ -311,7 +313,7 @@ void sub_818DF00(void)
 {
     u8 v0;
     u8 i;
-    
+
     v0 = Random() % 16;
     for (i = 0; i < 9; i ++)
     {
@@ -320,7 +322,7 @@ void sub_818DF00(void)
     gUnknown_0203CD68->unk_014 = gUnknown_0860B1E4[v0];
     gUnknown_0203CD68->unk_028 = gUnknown_0860B204[v0];
     gUnknown_0203CD68->unk_02b = v0;
-    gUnknown_0203CD68->unk_018 = 0xFF;
+    gUnknown_0203CD68->playerName[0] = EOS;
 }
 
 void SetLilycoveQuizLady(void)
@@ -338,7 +340,7 @@ void SetLilycoveQuizLady(void)
     gUnknown_0203CD68->unk_016 = -1;
     for (i = 0; i < 4; i ++)
     {
-        gUnknown_0203CD68->unk_020[i] = 0;
+        gUnknown_0203CD68->playerTrainerId[i] = 0;
     }
     gUnknown_0203CD68->unk_028 = 0;
     gUnknown_0203CD68->unk_02a = 0;
@@ -398,7 +400,7 @@ u8 sub_818E06C(void)
         quiz->unk_014 = gUnknown_0860B1E4[i];
         quiz->unk_028 = gUnknown_0860B204[i];
         quiz->unk_02b = i;
-        quiz->unk_018 = 0xFF;
+        quiz->playerName[0] = EOS;
     }
     rv = sub_818E13C();
     if (rv == 0)
@@ -414,3 +416,135 @@ u8 sub_818E06C(void)
         return 0;
     }
 }
+
+#ifdef NONMATCHING
+u8 sub_818E13C(void)
+{
+    u8 retval;
+    u8 len;
+    u8 i;
+
+    retval = 1;
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    if (gUnknown_0203CD68->playerName[0] == EOS)
+    {
+        StringCopy7(gStringVar1, gUnknown_085EEB7E);
+        retval = 0;
+    }
+    else
+    {
+        StringCopy7(gStringVar1, gUnknown_0203CD68->playerName);
+        ConvertInternationalString(gStringVar1, gUnknown_0203CD68->language);
+        len = sub_818E258(gUnknown_0203CD68->playerName);
+        if (len == sub_818E258(gSaveBlock2Ptr->playerName))
+        {
+            for (i = 0; i < len; i ++)
+            {
+                if (gUnknown_0203CD68->playerName[i] != gSaveBlock2Ptr->playerName[i])
+                {
+                    retval = 2;
+                    break;
+                }
+            }
+        }
+
+    }
+    return retval;
+}
+#else
+__attribute__((naked)) u8 sub_818E13C(void)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tmovs r7, 0x1\n"
+                    "\tldr r5, =gUnknown_0203CD68\n"
+                    "\tldr r0, =gSaveBlock1Ptr\n"
+                    "\tldr r1, [r0]\n"
+                    "\tldr r2, =0x00003b58\n"
+                    "\tadds r0, r1, r2\n"
+                    "\tstr r0, [r5]\n"
+                    "\tldrb r0, [r0, 0x18]\n"
+                    "\tcmp r0, 0xFF\n"
+                    "\tbne _0818E174\n"
+                    "\tldr r0, =gStringVar1\n"
+                    "\tldr r1, =gUnknown_085EEB7E\n"
+                    "\tbl StringCopy7\n"
+                    "\tmovs r7, 0\n"
+                    "\tb _0818E1DC\n"
+                    "\t.pool\n"
+                    "_0818E174:\n"
+                    "\tldr r4, =gStringVar1\n"
+                    "\tldr r0, =0x00003b70\n"
+                    "\tadds r1, r0\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tbl StringCopy7\n"
+                    "\tldr r0, [r5]\n"
+                    "\tadds r0, 0x2D\n"
+                    "\tldrb r1, [r0]\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tbl ConvertInternationalString\n"
+                    "\tldr r0, [r5]\n"
+                    "\tadds r0, 0x18\n"
+                    "\tbl sub_818E258\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r4, r0, 24\n"
+                    "\tldr r6, =gSaveBlock2Ptr\n"
+                    "\tldr r0, [r6]\n"
+                    "\tbl sub_818E258\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tcmp r4, r0\n"
+                    "\tbne _0818E1DC\n"
+                    "\tldr r0, [r5]\n"
+                    "\tmovs r2, 0\n"
+                    "\tcmp r2, r4\n"
+                    "\tbcs _0818E1DC\n"
+                    "\tldr r1, [r6]\n"
+                    "\tldrb r0, [r0, 0x18]\n"
+                    "\tldrb r1, [r1]\n"
+                    "\tcmp r0, r1\n"
+                    "\tbne _0818E1DA\n"
+                    "_0818E1BA:\n"
+                    "\tadds r0, r2, 0x1\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r2, r0, 24\n"
+                    "\tcmp r2, r4\n"
+                    "\tbcs _0818E1DC\n"
+                    "\tldr r0, =gUnknown_0203CD68\n"
+                    "\tldr r1, [r0]\n"
+                    "\tadds r1, 0x18\n"
+                    "\tadds r1, r2\n"
+                    "\tldr r0, =gSaveBlock2Ptr\n"
+                    "\tldr r0, [r0]\n"
+                    "\tadds r0, r2\n"
+                    "\tldrb r1, [r1]\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r1, r0\n"
+                    "\tbeq _0818E1BA\n"
+                    "_0818E1DA:\n"
+                    "\tmovs r7, 0x2\n"
+                    "_0818E1DC:\n"
+                    "\tadds r0, r7, 0\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r1}\n"
+                    "\tbx r1\n"
+                    "\t.pool");
+}
+#endif
+
+u8 sub_818E1F4(void)
+{
+    u8 response;
+    u8 i;
+
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    response = 0;
+    for (i = 0; i < 4; i ++)
+    {
+        if (gUnknown_0203CD68->playerTrainerId[i] != gSaveBlock2Ptr->playerTrainerId[i])
+        {
+            response = 1;
+            break;
+        }
+    }
+    return response;
+}
-- 
cgit v1.2.3


From 0895d8d861ca7db6d8fa2910f6275eb6b615340e Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 20 Sep 2017 11:25:46 -0400
Subject: sub_818E258

---
 src/lilycove_lady.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 196867369..564b089a6 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -548,3 +548,12 @@ u8 sub_818E1F4(void)
     }
     return response;
 }
+
+u8 sub_818E258(const u8 *str)
+{
+    u8 len;
+    const u8 *ptr;
+
+    for (len = 0, ptr = str; *ptr != EOS; len ++, ptr ++);
+    return len;
+}
-- 
cgit v1.2.3


From 8a31e58689af6e62c8c272c24397310c2a44f6f5 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 20 Sep 2017 11:30:09 -0400
Subject: sub_818E298

---
 src/lilycove_lady.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 564b089a6..976ed4d88 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -320,7 +320,7 @@ void sub_818DF00(void)
         gUnknown_0203CD68->unk_002[i] = gUnknown_0860B1A4[v0][i];
     }
     gUnknown_0203CD68->unk_014 = gUnknown_0860B1E4[v0];
-    gUnknown_0203CD68->unk_028 = gUnknown_0860B204[v0];
+    gUnknown_0203CD68->itemId = gUnknown_0860B204[v0];
     gUnknown_0203CD68->unk_02b = v0;
     gUnknown_0203CD68->playerName[0] = EOS;
 }
@@ -342,7 +342,7 @@ void SetLilycoveQuizLady(void)
     {
         gUnknown_0203CD68->playerTrainerId[i] = 0;
     }
-    gUnknown_0203CD68->unk_028 = 0;
+    gUnknown_0203CD68->itemId = ITEM_NONE;
     gUnknown_0203CD68->unk_02a = 0;
     gUnknown_0203CD68->unk_02c = 0x10;
     gUnknown_0203CD68->language = gGameLanguage;
@@ -398,7 +398,7 @@ u8 sub_818E06C(void)
             quiz->unk_002[j] = gUnknown_0860B1A4[i][j];
         }
         quiz->unk_014 = gUnknown_0860B1E4[i];
-        quiz->unk_028 = gUnknown_0860B204[i];
+        quiz->itemId = gUnknown_0860B204[i];
         quiz->unk_02b = i;
         quiz->playerName[0] = EOS;
     }
@@ -533,16 +533,16 @@ __attribute__((naked)) u8 sub_818E13C(void)
 
 u8 sub_818E1F4(void)
 {
-    u8 response;
+    bool8 response;
     u8 i;
 
     gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
-    response = 0;
+    response = FALSE;
     for (i = 0; i < 4; i ++)
     {
         if (gUnknown_0203CD68->playerTrainerId[i] != gSaveBlock2Ptr->playerTrainerId[i])
         {
-            response = 1;
+            response = TRUE;
             break;
         }
     }
@@ -557,3 +557,19 @@ u8 sub_818E258(const u8 *str)
     for (len = 0, ptr = str; *ptr != EOS; len ++, ptr ++);
     return len;
 }
+
+void sub_818E274(void)
+{
+    StringCopy(gStringVar1, ItemId_GetItem(gUnknown_0203CD68->itemId)->name);
+}
+
+bool8 sub_818E298(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    if (!sub_818E13C())
+    {
+        gUnknown_0203CD68->language = gGameLanguage;
+        return TRUE;
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From 213fef604247d31f6981bd83c703bb1d3e1bbd31 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 20 Sep 2017 11:44:20 -0400
Subject: through sub_818E308

---
 src/lilycove_lady.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 976ed4d88..485a0c9d4 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -12,6 +12,7 @@
 #include "items.h"
 #include "item_menu.h"
 #include "text.h"
+#include "easy_chat.h"
 #include "lilycove_lady.h"
 
 void SetLilycoveQuizLady(void);
@@ -573,3 +574,22 @@ bool8 sub_818E298(void)
     }
     return FALSE;
 }
+
+u8 sub_818E2D8(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    return gUnknown_0203CD68->unk_02a;
+}
+
+void sub_818E2FC(void)
+{
+    easy_chat_input_maybe();
+}
+
+bool8 sub_818E308(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    CopyEasyChatWord(gStringVar1, gUnknown_0203CD68->unk_014);
+    CopyEasyChatWord(gStringVar2, gUnknown_0203CD68->unk_016);
+    return StringCompare(gStringVar1, gStringVar2) ? FALSE : TRUE;
+}
-- 
cgit v1.2.3


From fdea92edffb4360db50cb0e7dcc044dc7242defe Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 20 Sep 2017 11:48:11 -0400
Subject: through sub_818E3E0

---
 src/lilycove_lady.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 485a0c9d4..c4a0b9c11 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -593,3 +593,32 @@ bool8 sub_818E308(void)
     CopyEasyChatWord(gStringVar2, gUnknown_0203CD68->unk_016);
     return StringCompare(gStringVar1, gStringVar2) ? FALSE : TRUE;
 }
+
+void sub_818E358(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    gSpecialVar_0x8005 = gUnknown_0203CD68->itemId;
+}
+
+void sub_818E37C(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    gUnknown_0203CD68->unk_001 = 1;
+}
+
+void sub_818E39C(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    gUnknown_0203CD68->unk_001 = 2;
+}
+
+void sub_818E3BC(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    gUnknown_0203CD68->unk_016 = -1;
+}
+
+void sub_818E3E0(void)
+{
+    sub_81AAC70();
+}
-- 
cgit v1.2.3


From 5fb39d5ef9f7c19ecff2b347cf7785ea8fc63ad9 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 20 Sep 2017 12:56:45 -0400
Subject: sub_818E3EC

---
 src/lilycove_lady.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index c4a0b9c11..65f6e2e10 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -622,3 +622,17 @@ void sub_818E3E0(void)
 {
     sub_81AAC70();
 }
+
+void sub_818E3EC(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    if (sub_818E298())
+    {
+        gUnknown_0203CD68->unk_02c = gUnknown_0203CD68->unk_02b;
+    }
+    else
+    {
+        gUnknown_0203CD68->unk_02c = 0x10;
+    }
+    sub_818DF00();
+}
-- 
cgit v1.2.3


From d22a9acc63b9f7c72e0d7ec81396b799af94e270 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Wed, 20 Sep 2017 16:12:18 -0400
Subject: through sub_818E490

---
 src/lilycove_lady.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 65f6e2e10..a0482a28f 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -636,3 +636,26 @@ void sub_818E3EC(void)
     }
     sub_818DF00();
 }
+
+void sub_818E430(void)
+{
+    u8 i;
+
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    for (i = 0; i < 9; i ++)
+    {
+        gUnknown_0203CD68->unk_002[i] = -1;
+    }
+    gUnknown_0203CD68->unk_014 = -1;
+}
+
+void sub_818E47C(void)
+{
+    gSpecialVar_0x8004 = 0x11;
+    easy_chat_input_maybe();
+}
+
+void sub_818E490(void)
+{
+    RemoveBagItem(gScriptItemId, 1);
+}
-- 
cgit v1.2.3


From 44e75e1f0303248638d3ab4b7115a1c7db24dbf0 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Wed, 20 Sep 2017 16:32:37 -0400
Subject: through sub_818E570

---
 src/lilycove_lady.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index a0482a28f..61b5488a1 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -38,6 +38,8 @@ extern const u8 gUnknown_085EEB7E[8];
 
 EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL;
 EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL;
+EWRAM_DATA struct LilycoveLadyContest *gUnknown_0203CD6C = NULL;
+
 extern EWRAM_DATA u16 gScriptItemId;
 
 u8 GetLilycoveLadyId(void)
@@ -659,3 +661,57 @@ void sub_818E490(void)
 {
     RemoveBagItem(gScriptItemId, 1);
 }
+
+void sub_818E4A4(void)
+{
+    u8 i;
+
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    gUnknown_0203CD68->itemId = gScriptItemId;
+    for (i = 0; i < 4; i ++)
+    {
+        gUnknown_0203CD68->playerTrainerId[i] = gSaveBlock2Ptr->playerTrainerId[i];
+    }
+    StringCopy7(gUnknown_0203CD68->playerName, gSaveBlock2Ptr->playerName);
+    gUnknown_0203CD68->language = gGameLanguage;
+}
+
+void sub_818E510(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    gUnknown_0203CD68->unk_02a = 1;
+}
+
+void sub_818E538(void)
+{
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    CopyEasyChatWord(gStringVar3, gUnknown_0203CD68->unk_014);
+}
+
+void sub_818E564(void)
+{
+    EnableBothScriptContexts();
+}
+
+void sub_818E570(const struct LilycoveLadyQuiz *quiz)
+{
+    u8 i;
+
+    gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
+    if (quiz->unk_02c < 16 && gUnknown_0203CD68->id == LILYCOVE_LADY_QUIZ)
+    {
+        for (i = 0; i < 4; i ++)
+        {
+            if (quiz->unk_02c != gUnknown_0203CD68->unk_02b)
+            {
+                break;
+            }
+            gUnknown_0203CD68->unk_02b = Random() % 16;
+        }
+        if (quiz->unk_02c == gUnknown_0203CD68->unk_02b)
+        {
+            gUnknown_0203CD68->unk_02b = (gUnknown_0203CD68->unk_02b + 1) % 16;
+        }
+        gUnknown_0203CD68->unk_02c = quiz->unk_02c;
+    }
+}
-- 
cgit v1.2.3


From 7c8cbc6b88d745da215fc45730f84b598869438f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Wed, 20 Sep 2017 16:49:22 -0400
Subject: SetLilycoveContestLady

---
 src/lilycove_lady.c | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 61b5488a1..f6471828b 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -44,7 +44,7 @@ extern EWRAM_DATA u16 gScriptItemId;
 
 u8 GetLilycoveLadyId(void)
 {
-    return gSaveBlock1Ptr->lilycoveLady.common.id;
+    return gSaveBlock1Ptr->lilycoveLady.id;
 }
 
 void sub_818D9C0(void)
@@ -148,7 +148,7 @@ void SetLilycoveFavourLady(void)
 {
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
     gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR;
-    gUnknown_0203CD64->unk_001 = 0;
+    gUnknown_0203CD64->phase = 0;
     gUnknown_0203CD64->playerName[0] = EOS;
     gUnknown_0203CD64->unk_002 = 0;
     gUnknown_0203CD64->unk_003= 0;
@@ -161,17 +161,17 @@ void sub_818DBC4(void)
 {
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
     gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR;
-    gUnknown_0203CD64->unk_001 = 0;
+    gUnknown_0203CD64->phase = 0;
 }
 
 u8 sub_818DBE8(void)
 {
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
-    if (gUnknown_0203CD64->unk_001 == 2)
+    if (gUnknown_0203CD64->phase == 2)
     {
         return 2;
     }
-    else if (gUnknown_0203CD64->unk_001 == 1)
+    else if (gUnknown_0203CD64->phase == 1)
     {
         return 1;
     }
@@ -247,7 +247,7 @@ bool8 sub_818DD84(u16 itemId)
 
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
     len = sub_818DB04(gUnknown_0860B2EC[gUnknown_0203CD64->unk_00c]);
-    gUnknown_0203CD64->unk_001 = 1;
+    gUnknown_0203CD64->phase = 1;
     sub_818DCAC(gStringVar2, itemId);
     gUnknown_0203CD64->itemId = itemId;
     sub_818DCF4(gSaveBlock2Ptr->playerName, gUnknown_0203CD64->playerName);
@@ -297,14 +297,14 @@ u16 sub_818DEA0(void)
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
     itemId = gUnknown_0860B304[gUnknown_0203CD64->unk_00c];
     sub_818DE88(itemId);
-    gUnknown_0203CD64->unk_001 = 2;
+    gUnknown_0203CD64->phase = 2;
     return itemId;
 }
 
 void sub_818DEDC(void)
 {
     SetLilycoveFavourLady();
-    gUnknown_0203CD64->unk_001 = 1;
+    gUnknown_0203CD64->phase = 1;
 }
 
 void sub_818DEF4(void)
@@ -334,7 +334,7 @@ void SetLilycoveQuizLady(void)
 
     gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
     gUnknown_0203CD68->id = LILYCOVE_LADY_QUIZ;
-    gUnknown_0203CD68->unk_001 = 0;
+    gUnknown_0203CD68->phase = 0;
     for (i = 0; i < 9; i ++)
     {
         gUnknown_0203CD68->unk_002[i] = -1;
@@ -356,7 +356,7 @@ void sub_818E004(void)
 {
     gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
     gUnknown_0203CD68->id = LILYCOVE_LADY_QUIZ;
-    gUnknown_0203CD68->unk_001 = 0;
+    gUnknown_0203CD68->phase = 0;
     gUnknown_0203CD68->unk_02a = 0;
     gUnknown_0203CD68->unk_016 = -1;
 }
@@ -364,11 +364,11 @@ void sub_818E004(void)
 u8 sub_818E038(void)
 {
     gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
-    if (gUnknown_0203CD68->unk_001 == 2)
+    if (gUnknown_0203CD68->phase == 2)
     {
         return 2;
     }
-    else if (gUnknown_0203CD68->unk_001 == 1)
+    else if (gUnknown_0203CD68->phase == 1)
     {
         return 1;
     }
@@ -605,13 +605,13 @@ void sub_818E358(void)
 void sub_818E37C(void)
 {
     gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
-    gUnknown_0203CD68->unk_001 = 1;
+    gUnknown_0203CD68->phase = 1;
 }
 
 void sub_818E39C(void)
 {
     gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
-    gUnknown_0203CD68->unk_001 = 2;
+    gUnknown_0203CD68->phase = 2;
 }
 
 void sub_818E3BC(void)
@@ -715,3 +715,21 @@ void sub_818E570(const struct LilycoveLadyQuiz *quiz)
         gUnknown_0203CD68->unk_02c = quiz->unk_02c;
     }
 }
+
+void sub_818E604(void)
+{
+    gUnknown_0203CD6C->playerName[0] = EOS;
+    gUnknown_0203CD6C->fave_pkblk = 0;
+    gUnknown_0203CD6C->other_pkblk = 0;
+    gUnknown_0203CD6C->max_sheen = 0;
+    gUnknown_0203CD6C->category = Random() % 5;
+}
+
+void SetLilycoveContestLady(void)
+{
+    gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
+    gUnknown_0203CD6C->id = LILYCOVE_LADY_CONTEST;
+    gUnknown_0203CD6C->phase = 0;
+    sub_818E604();
+    gUnknown_0203CD6C->language = gGameLanguage;
+}
-- 
cgit v1.2.3


From 9ed9f7de941d5b89a1c6d6241b3bbb5726aa99e8 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Wed, 20 Sep 2017 14:38:05 -0500
Subject: Finish renaming strings in strings.s

---
 src/item.c                | 12 ++++++------
 src/pokemon_size_record.c |  8 ++++----
 src/start_menu.c          |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/item.c b/src/item.c
index c85e2fe1f..0114676b6 100644
--- a/src/item.c
+++ b/src/item.c
@@ -8,9 +8,9 @@
 extern void ApplyNewEncyprtionKeyToHword(u16* hword, u32 newKey);
 extern bool8 InBattlePyramid(void);
 
-extern const u8 gOtherText_PokeBalls[];
-extern const u8 gOtherText_Berries[];
-extern const u8 gOtherText_Berry[];
+extern const u8 gText_PokeBalls[];
+extern const u8 gText_Berries[];
+extern const u8 gText_Berry[];
 extern const u8 gUnknown_085897E4[][28]; // not sure what this one is
 
 bool8 CheckPyramidBagHasItem(u16 itemId, u16 count);
@@ -92,7 +92,7 @@ void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity)
         if (quantity < 2)
             StringCopy(string, ItemId_GetItem(ITEM_POKE_BALL)->name);
         else
-            StringCopy(string, gOtherText_PokeBalls);
+            StringCopy(string, gText_PokeBalls);
     }
     else
     {
@@ -109,9 +109,9 @@ void GetBerryCountString(u8* dst, const u8* berryName, u32 quantity)
     u8* txtPtr;
 
     if (quantity < 2)
-        berryString = gOtherText_Berry;
+        berryString = gText_Berry;
     else
-        berryString = gOtherText_Berries;
+        berryString = gText_Berries;
     txtPtr = StringCopy(dst, berryName);
     *txtPtr = CHAR_SPACE;
     StringCopy(txtPtr + 1, berryString);
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index 804dbda74..12d98bfd8 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -45,8 +45,8 @@ static const u8 sGiftRibbonsMonDataIds[] =
     MON_DATA_GIFT_RIBBON_7
 };
 
-extern const u8 gOtherText_DecimalPoint[];
-extern const u8 gOtherText_Marco[];
+extern const u8 gText_DecimalPoint[];
+extern const u8 gText_Marco[];
 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
 
 #define CM_PER_INCH 2.54
@@ -103,7 +103,7 @@ static void FormatMonSizeRecord(u8 *string, u32 size)
 #endif
 
     string = ConvertIntToDecimalStringN(string, size / 10, 0, 8);
-    string = StringAppend(string, gOtherText_DecimalPoint);
+    string = StringAppend(string, gText_DecimalPoint);
     ConvertIntToDecimalStringN(string, size % 10, 0, 1);
 }
 
@@ -152,7 +152,7 @@ static void GetMonSizeRecordInfo(u16 species, u16 *sizeRecord)
     FormatMonSizeRecord(gStringVar3, size);
     StringCopy(gStringVar1, gSpeciesNames[species]);
     if (*sizeRecord == DEFAULT_MAX_SIZE)
-        StringCopy(gStringVar2, gOtherText_Marco);
+        StringCopy(gStringVar2, gText_Marco);
     else
         StringCopy(gStringVar2, gSaveBlock2Ptr->playerName);
 }
diff --git a/src/start_menu.c b/src/start_menu.c
index ffcab5220..ac393ce2e 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -151,7 +151,7 @@ static void BuildStartMenuActions_MultiBattleRoom(void)
 extern const struct WindowTemplate gSafariBallsWindowTemplate;
 extern const struct WindowTemplate gPyramidFloorWindowTemplate_1;
 extern const struct WindowTemplate gPyramidFloorWindowTemplate_2;
-extern const u8 gOtherText_SafariStock[];
+extern const u8 gText_SafariBallStock[];
 
 void DisplaySafariBallsWindow(void)
 {
@@ -159,13 +159,13 @@ void DisplaySafariBallsWindow(void)
     PutWindowTilemap(sSafariBallsWindowId);
     sub_81973FC(sSafariBallsWindowId, 0);
     ConvertIntToDecimalStringN(gStringVar1, gNumSafariBalls, STR_CONV_MODE_RIGHT_ALIGN, 2);
-    StringExpandPlaceholders(gStringVar4, gOtherText_SafariStock);
+    StringExpandPlaceholders(gStringVar4, gText_SafariBallStock);
     PrintTextOnWindow(sSafariBallsWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL);
     CopyWindowToVram(sSafariBallsWindowId, 2);
 }
 
 extern const u8* const gUnknown_08510510[];
-extern const u8 gOtherText_BattlePyramid_X[];
+extern const u8 gText_BattlePyramidFloor[];
 
 void DisplayPyramidFloorWindow(void)
 {
@@ -177,7 +177,7 @@ void DisplayPyramidFloorWindow(void)
     PutWindowTilemap(sBattlePyramidFloorWindowId);
     sub_81973FC(sBattlePyramidFloorWindowId, 0);
     StringCopy(gStringVar1, gUnknown_08510510[*(u16*)(&gSaveBlock2Ptr->field_CAA[8])]);
-    StringExpandPlaceholders(gStringVar4, gOtherText_BattlePyramid_X);
+    StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor);
     PrintTextOnWindow(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL);
     CopyWindowToVram(sBattlePyramidFloorWindowId, 2);
 }
-- 
cgit v1.2.3


From bf4319f25e52be0d77038de9fda8cc3a83930902 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Wed, 20 Sep 2017 20:08:05 -0400
Subject: sub_818E6B0

---
 src/lilycove_lady.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index f6471828b..52f910598 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -733,3 +733,26 @@ void SetLilycoveContestLady(void)
     sub_818E604();
     gUnknown_0203CD6C->language = gGameLanguage;
 }
+
+void sub_818E674(void)
+{
+    gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
+    gUnknown_0203CD6C->id = LILYCOVE_LADY_CONTEST;
+    gUnknown_0203CD6C->phase = 0;
+    if (gUnknown_0203CD6C->fave_pkblk == 5 || gUnknown_0203CD6C->other_pkblk == 5)
+    {
+        sub_818E604();
+    }
+}
+
+void sub_818E6B0(u8 sheen)
+{
+    gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
+    if (gUnknown_0203CD6C->max_sheen <= sheen)
+    {
+        gUnknown_0203CD6C->max_sheen = sheen;
+        memset(gUnknown_0203CD6C->playerName, EOS, sizeof(gUnknown_0203CD6C->playerName));
+        memcpy(gUnknown_0203CD6C->playerName, gSaveBlock2Ptr->playerName, sizeof(gUnknown_0203CD6C->playerName));
+        gUnknown_0203CD6C->language = gGameLanguage;
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 25ffdf734284db4bd418d6f2ff74a9d895cb4498 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Wed, 20 Sep 2017 20:16:11 -0400
Subject: sub_818E704

---
 src/lilycove_lady.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 52f910598..30b5d6b21 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -755,4 +755,62 @@ void sub_818E6B0(u8 sheen)
         memcpy(gUnknown_0203CD6C->playerName, gSaveBlock2Ptr->playerName, sizeof(gUnknown_0203CD6C->playerName));
         gUnknown_0203CD6C->language = gGameLanguage;
     }
-}
\ No newline at end of file
+}
+
+bool8 sub_818E704(struct Pokeblock *pokeblock)
+{
+    u8 sheen;
+    bool8 response;
+
+    sheen = 0;
+    response = FALSE;
+    gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
+    switch (gUnknown_0203CD6C->category)
+    {
+        case 0:
+            if (pokeblock->spicy != 0)
+            {
+                sheen = pokeblock->spicy;
+                response = TRUE;
+            }
+            break;
+        case 1:
+            if (pokeblock->dry != 0)
+            {
+                sheen = pokeblock->dry;
+                response = TRUE;
+            }
+            break;
+        case 2:
+            if (pokeblock->sweet != 0)
+            {
+                sheen = pokeblock->sweet;
+                response = TRUE;
+            }
+            break;
+        case 3:
+            if (pokeblock->bitter != 0)
+            {
+                sheen = pokeblock->bitter;
+                response = TRUE;
+            }
+            break;
+        case 4:
+            if (pokeblock->sour != 0)
+            {
+                sheen = pokeblock->sour;
+                response = TRUE;
+            }
+            break;
+    }
+    if (response == TRUE)
+    {
+        sub_818E6B0(sheen);
+        gUnknown_0203CD6C->fave_pkblk ++;
+    }
+    else
+    {
+        gUnknown_0203CD6C->other_pkblk ++;
+    }
+    return response;
+}
-- 
cgit v1.2.3


From c56b6fc9a46d92824b8eb6b61bc2dc1f525c0757 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Wed, 20 Sep 2017 20:24:22 -0400
Subject: sub_818E794

---
 src/lilycove_lady.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 30b5d6b21..efbc791e8 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -35,6 +35,8 @@ extern const u16 *const gUnknown_0860B1A4[16];
 extern const u16 gUnknown_0860B1E4[16];
 extern const u16 gUnknown_0860B204[16];
 extern const u8 gUnknown_085EEB7E[8];
+extern const u8 *const gUnknown_0860B324[5];
+extern const u8 *const gUnknown_0860B310[5];
 
 EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL;
 EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL;
@@ -814,3 +816,10 @@ bool8 sub_818E704(struct Pokeblock *pokeblock)
     }
     return response;
 }
+
+void sub_818E794(u8 *dest1, u8 *dest2)
+{
+    gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
+    StringCopy(dest1, gUnknown_0860B324[gUnknown_0203CD6C->category]);
+    StringCopy10(dest2, gUnknown_0860B310[gUnknown_0203CD6C->category]);
+}
-- 
cgit v1.2.3


From faf844f332e95d39660db3f76f78ed480d4845bf Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Wed, 20 Sep 2017 20:32:22 -0400
Subject: through sub_818E880

---
 src/lilycove_lady.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index efbc791e8..d142323c4 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -26,17 +26,18 @@ u8 sub_818E13C(void);
 bool8 sub_818E1F4(void);
 u8 sub_818E258(const u8 *);
 
+extern const u8 gUnknown_085EEB7E[8];
 extern const u16 gUnknown_0860B074[5];
 extern const u16 gUnknown_0860B07E[3];
-extern const u8 *const gUnknown_0860B224[];
-extern const u16 *const gUnknown_0860B2EC[6];
-extern const u16 gUnknown_0860B304[6];
 extern const u16 *const gUnknown_0860B1A4[16];
 extern const u16 gUnknown_0860B1E4[16];
 extern const u16 gUnknown_0860B204[16];
-extern const u8 gUnknown_085EEB7E[8];
-extern const u8 *const gUnknown_0860B324[5];
+extern const u8 *const gUnknown_0860B224[];
+extern const u16 *const gUnknown_0860B2EC[6];
+extern const u16 gUnknown_0860B304[6];
 extern const u8 *const gUnknown_0860B310[5];
+extern const u8 *const gUnknown_0860B324[5];
+extern const u8 *const gUnknown_0860B338[5];
 
 EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL;
 EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL;
@@ -823,3 +824,44 @@ void sub_818E794(u8 *dest1, u8 *dest2)
     StringCopy(dest1, gUnknown_0860B324[gUnknown_0203CD6C->category]);
     StringCopy10(dest2, gUnknown_0860B310[gUnknown_0203CD6C->category]);
 }
+
+void sub_818E7E0(u8 *dest1, u8 *dest2)
+{
+    gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
+    *dest1 = gUnknown_0203CD6C->category;
+    StringCopy(dest2, gUnknown_0860B310[gUnknown_0203CD6C->category]);
+}
+
+void sub_818E81C(u8 *dest)
+{
+    gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
+    StringCopy(dest, gUnknown_0203CD6C->playerName);
+}
+
+void sub_818E848(u8 *dest)
+{
+    gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
+    *dest = gUnknown_0203CD6C->language;
+}
+
+void sub_818E868(u8 *dest, u8 category)
+{
+    StringCopy(dest, gUnknown_0860B338[category]);
+}
+
+u8 sub_818E880(void)
+{
+    gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
+    if (gUnknown_0203CD6C->fave_pkblk >= 5)
+    {
+        return 1;
+    }
+    else if (gUnknown_0203CD6C->fave_pkblk == 0)
+    {
+        return 2;
+    }
+    else
+    {
+        return 0;
+    }
+}
-- 
cgit v1.2.3


From d263750f1903a89fc61b2496453ff1c5b4b9a58b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Wed, 20 Sep 2017 20:48:32 -0400
Subject: remaining lilycove lady functions

---
 src/lilycove_lady.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index d142323c4..41112e40b 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -4,6 +4,8 @@
 
 #include "global.h"
 #include "main.h"
+#include "rom4.h"
+#include "rom6.h"
 #include "event_data.h"
 #include "script.h"
 #include "rng.h"
@@ -38,6 +40,7 @@ extern const u16 gUnknown_0860B304[6];
 extern const u8 *const gUnknown_0860B310[5];
 extern const u8 *const gUnknown_0860B324[5];
 extern const u8 *const gUnknown_0860B338[5];
+extern const u16 gUnknown_0860B34C[5];
 
 EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL;
 EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL;
@@ -865,3 +868,54 @@ u8 sub_818E880(void)
         return 0;
     }
 }
+
+bool8 sub_818E8B4(void)
+{
+    gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
+    if (gUnknown_0203CD6C->phase == 1)
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 sub_818E8E0(void)
+{
+    bool8 response;
+
+    response = FALSE;
+    gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
+    if (gUnknown_0203CD6C->fave_pkblk >= 5 || gUnknown_0203CD6C->other_pkblk >= 5)
+    {
+        response = TRUE;
+    }
+    return response;
+}
+
+void sub_818E914(void)
+{
+    sub_818E794(gStringVar2, gStringVar1);
+}
+
+void sub_818E92C(void)
+{
+    sub_81357FC(3, c2_exit_to_overworld_2_switch);
+}
+
+void sub_818E940(void)
+{
+    gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
+    gUnknown_0203CD6C->phase = 1;
+}
+
+void sub_818E960(void)
+{
+    gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
+    gSpecialVar_0x8005 = gUnknown_0860B34C[gUnknown_0203CD6C->category];
+}
+
+u8 sub_818E990(void)
+{
+    gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
+    return gUnknown_0203CD6C->category;
+}
-- 
cgit v1.2.3


From 942fbe87d42ed1208217deac3cfa4f21908d446a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Wed, 20 Sep 2017 21:03:57 -0400
Subject: Populate header, label as static whatever won't break things

---
 src/lilycove_lady.c | 67 ++++++++++++++++++++++++++---------------------------
 1 file changed, 33 insertions(+), 34 deletions(-)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 41112e40b..4839571ae 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -17,16 +17,15 @@
 #include "easy_chat.h"
 #include "lilycove_lady.h"
 
-void SetLilycoveQuizLady(void);
-void SetLilycoveFavourLady(void);
-void SetLilycoveContestLady(void);
-void sub_818E004(void);
-void sub_818DBC4(void);
-void sub_818E674(void);
-bool32 sub_811F8D8(u16);
-u8 sub_818E13C(void);
-bool8 sub_818E1F4(void);
-u8 sub_818E258(const u8 *);
+static void SetLilycoveQuizLady(void);
+static void SetLilycoveFavourLady(void);
+static void SetLilycoveContestLady(void);
+static void sub_818E004(void);
+static void sub_818DBC4(void);
+static void sub_818E674(void);
+static u8 sub_818E13C(void);
+static bool8 sub_818E1F4(void);
+static u8 sub_818E258(const u8 *);
 
 extern const u8 gUnknown_085EEB7E[8];
 extern const u16 gUnknown_0860B074[5];
@@ -42,9 +41,9 @@ extern const u8 *const gUnknown_0860B324[5];
 extern const u8 *const gUnknown_0860B338[5];
 extern const u16 gUnknown_0860B34C[5];
 
-EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL;
-EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL;
-EWRAM_DATA struct LilycoveLadyContest *gUnknown_0203CD6C = NULL;
+static EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL;
+static EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL;
+static EWRAM_DATA struct LilycoveLadyContest *gUnknown_0203CD6C = NULL;
 
 extern EWRAM_DATA u16 gScriptItemId;
 
@@ -131,7 +130,7 @@ void sub_818DAEC(void)
     gScriptResult = GetLilycoveLadyId();
 }
 
-u8 sub_818DB04(const u16 *data)
+static u8 sub_818DB04(const u16 *data)
 {
     u8 len;
 
@@ -139,7 +138,7 @@ u8 sub_818DB04(const u16 *data)
     return len;
 }
 
-void sub_818DB20(void)
+static void sub_818DB20(void)
 {
     u8 size;
     u8 idx;
@@ -150,7 +149,7 @@ void sub_818DB20(void)
     gUnknown_0203CD64->unk_010 = gUnknown_0860B2EC[gUnknown_0203CD64->unk_00c][idx];
 }
 
-void SetLilycoveFavourLady(void)
+static void SetLilycoveFavourLady(void)
 {
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
     gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR;
@@ -163,7 +162,7 @@ void SetLilycoveFavourLady(void)
     sub_818DB20();
 }
 
-void sub_818DBC4(void)
+static void sub_818DBC4(void)
 {
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
     gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR;
@@ -187,7 +186,7 @@ u8 sub_818DBE8(void)
     }
 }
 
-const u8 *sub_818DC1C(u8 idx)
+static const u8 *sub_818DC1C(u8 idx)
 {
     return gUnknown_0860B224[idx];
 }
@@ -210,7 +209,7 @@ bool8 sub_818DC60(void)
     return FALSE;
 }
 
-void sub_818DCAC(u8 *dest, u16 itemId)
+static void sub_818DCAC(u8 *dest, u16 itemId)
 {
     StringCopy(dest, ItemId_GetItem(itemId)->name);
 }
@@ -221,7 +220,7 @@ void sub_818DCC8(void)
     sub_818DCAC(gStringVar2, gUnknown_0203CD64->itemId);
 }
 
-void sub_818DCF4(const u8 *src, u8 *dest)
+static void sub_818DCF4(const u8 *src, u8 *dest)
 {
     memset(dest, 0xFF, 8);
     StringCopy7(dest, src);
@@ -245,7 +244,7 @@ void sub_818DD78(void)
     sub_81AAC50();
 }
 
-bool8 sub_818DD84(u16 itemId)
+static bool8 sub_818DD84(u16 itemId)
 {
     u8 len;
     u8 i;
@@ -291,7 +290,7 @@ bool8 sub_818DE5C(void)
     return checkval < 5 ? FALSE : TRUE;
 }
 
-void sub_818DE88(u16 itemId)
+static void sub_818DE88(u16 itemId)
 {
     sub_818DCAC(gStringVar2, itemId);
 }
@@ -318,7 +317,7 @@ void sub_818DEF4(void)
     EnableBothScriptContexts();
 }
 
-void sub_818DF00(void)
+static void sub_818DF00(void)
 {
     u8 v0;
     u8 i;
@@ -334,7 +333,7 @@ void sub_818DF00(void)
     gUnknown_0203CD68->playerName[0] = EOS;
 }
 
-void SetLilycoveQuizLady(void)
+static void SetLilycoveQuizLady(void)
 {
     u8 i;
 
@@ -358,7 +357,7 @@ void SetLilycoveQuizLady(void)
     sub_818DF00();
 }
 
-void sub_818E004(void)
+static void sub_818E004(void)
 {
     gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
     gUnknown_0203CD68->id = LILYCOVE_LADY_QUIZ;
@@ -427,7 +426,7 @@ u8 sub_818E06C(void)
 }
 
 #ifdef NONMATCHING
-u8 sub_818E13C(void)
+static u8 sub_818E13C(void)
 {
     u8 retval;
     u8 len;
@@ -461,7 +460,7 @@ u8 sub_818E13C(void)
     return retval;
 }
 #else
-__attribute__((naked)) u8 sub_818E13C(void)
+__attribute__((naked)) static u8 sub_818E13C(void)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmovs r7, 0x1\n"
@@ -540,7 +539,7 @@ __attribute__((naked)) u8 sub_818E13C(void)
 }
 #endif
 
-u8 sub_818E1F4(void)
+static u8 sub_818E1F4(void)
 {
     bool8 response;
     u8 i;
@@ -558,7 +557,7 @@ u8 sub_818E1F4(void)
     return response;
 }
 
-u8 sub_818E258(const u8 *str)
+static u8 sub_818E258(const u8 *str)
 {
     u8 len;
     const u8 *ptr;
@@ -722,7 +721,7 @@ void sub_818E570(const struct LilycoveLadyQuiz *quiz)
     }
 }
 
-void sub_818E604(void)
+static void sub_818E604(void)
 {
     gUnknown_0203CD6C->playerName[0] = EOS;
     gUnknown_0203CD6C->fave_pkblk = 0;
@@ -731,7 +730,7 @@ void sub_818E604(void)
     gUnknown_0203CD6C->category = Random() % 5;
 }
 
-void SetLilycoveContestLady(void)
+static void SetLilycoveContestLady(void)
 {
     gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
     gUnknown_0203CD6C->id = LILYCOVE_LADY_CONTEST;
@@ -740,7 +739,7 @@ void SetLilycoveContestLady(void)
     gUnknown_0203CD6C->language = gGameLanguage;
 }
 
-void sub_818E674(void)
+static void sub_818E674(void)
 {
     gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
     gUnknown_0203CD6C->id = LILYCOVE_LADY_CONTEST;
@@ -751,7 +750,7 @@ void sub_818E674(void)
     }
 }
 
-void sub_818E6B0(u8 sheen)
+static void sub_818E6B0(u8 sheen)
 {
     gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
     if (gUnknown_0203CD6C->max_sheen <= sheen)
@@ -821,7 +820,7 @@ bool8 sub_818E704(struct Pokeblock *pokeblock)
     return response;
 }
 
-void sub_818E794(u8 *dest1, u8 *dest2)
+static void sub_818E794(u8 *dest1, u8 *dest2)
 {
     gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
     StringCopy(dest1, gUnknown_0860B324[gUnknown_0203CD6C->category]);
-- 
cgit v1.2.3


From 63a25a34a77a9e42901ccd13ae691b30130f9925 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Wed, 20 Sep 2017 21:42:14 -0400
Subject: Disassemble lilycove lady data

---
 src/lilycove_lady.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

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];
-- 
cgit v1.2.3


From 6f481cceb1b56c5d63ba045f7ca7f1ac7151332b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Wed, 20 Sep 2017 22:01:28 -0400
Subject: Decompile lilycove lady data

---
 src/lilycove_lady.c | 204 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 192 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 6a0e0c2b9..b476c6b2b 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -29,18 +29,198 @@ static u8 sub_818E258(const u8 *);
 
 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];
-extern const u16 gUnknown_0860B1E4[16];
-extern const u16 gUnknown_0860B204[16];
-extern const u8 *const gUnknown_0860B224[];
-extern const u16 *const gUnknown_0860B2EC[6];
-extern const u16 gUnknown_0860B304[6];
-extern const u8 *const gUnknown_0860B310[5];
-extern const u8 *const gUnknown_0860B324[5];
-extern const u8 *const gUnknown_0860B338[5];
-extern const u16 gUnknown_0860B34C[5];
+static const u16 gUnknown_0860B074[] = {
+        0x62, 0xcb, 0xdc, 0xcc, 0xd1
+};
+static const u16 gUnknown_0860B07E[] = {
+        0x1a, 0x14, 0x0a
+};
+
+static const u16 Unknown_0860B084[] = {
+        0x101b, 0x1623, 0x1812, 0x102c, 0x020e, 0x0c03, 0x1a0b, 0x0210, 0x020d
+};
+
+static const u16 Unknown_0860B096[] = {
+        0x101b, 0x1013, 0x1020, 0x1a0f, 0x020c, 0x0c03, 0x0211, 0x0203, 0x0400
+};
+
+static const u16 Unknown_0860B0A8[] = {
+        0x0e0f, 0x1018, 0x020e, 0x0204, 0x0c03, 0xffff, 0x0212, 0x0451, 0x0463
+};
+
+static const u16 Unknown_0860B0BA[] = {
+        0x101b, 0x100b, 0x0e0d, 0x141a, 0x181d, 0x0c03, 0x141e, 0x1a26, 0x1823
+};
+
+static const u16 Unknown_0860B0CC[] = {
+        0x101b, 0x181d, 0x1018, 0x0a02, 0x2014, 0x0c03, 0x0208, 0x1824, 0x181c
+};
+
+static const u16 Unknown_0860B0DE[] = {
+        0x101b, 0x1000, 0x1c19, 0x265d, 0x0c03, 0xffff, 0x0447, 0x045d, 0x042c
+};
+
+static const u16 Unknown_0860B0F0[] = {
+        0x101b, 0x1034, 0x1e11, 0x100b, 0x1a08, 0x0c03, 0x044b, 0x0446, 0x040a
+};
+
+static const u16 Unknown_0860B102[] = {
+        0x101b, 0x1000, 0x274f, 0x0626, 0x0c03, 0xffff, 0x0442, 0x0411, 0x0450
+};
+
+static const u16 Unknown_0860B114[] = {
+        0x101b, 0x1000, 0x1c19, 0x043c, 0x0c03, 0xffff, 0x0421, 0x0464, 0x0435
+};
+
+static const u16 Unknown_0860B126[] = {
+        0x101b, 0x1203, 0x1030, 0x0207, 0x0c03, 0xffff, 0x0210, 0x020e, 0x020d
+};
+
+static const u16 Unknown_0860B138[] = {
+        0x101b, 0x1623, 0x0a05, 0x020e, 0x0c03, 0xffff, 0x1a25, 0x181a, 0x181b
+};
+
+static const u16 Unknown_0860B14A[] = {
+        0x101b, 0x1823, 0x1603, 0x0a02, 0x1812, 0x0c03, 0x1a15, 0x1a23, 0x181b
+};
+
+static const u16 Unknown_0860B15C[] = {
+        0x1020, 0x020e, 0x1010, 0x1043, 0x1e0f, 0x0c03, 0x181c, 0x1a24, 0x1816
+};
+
+static const u16 Unknown_0860B16E[] = {
+        0x0446, 0x100b, 0x0620, 0x061c, 0x101b, 0x0c03, 0x0420, 0x0426, 0xffff
+};
+
+static const u16 Unknown_0860B180[] = {
+        0x0400, 0x100b, 0x0639, 0x061c, 0x101b, 0x0c03, 0x040e, 0x0410, 0xffff
+};
+
+static const u16 Unknown_0860B192[] = {
+        0x041f, 0x100b, 0x0639, 0x061c, 0x101b, 0x0c03, 0x0445, 0x0400, 0xffff
+};
+
+static const u16 *const gUnknown_0860B1A4[] = {
+        Unknown_0860B084,
+        Unknown_0860B096,
+        Unknown_0860B0A8,
+        Unknown_0860B0BA,
+        Unknown_0860B0CC,
+        Unknown_0860B0DE,
+        Unknown_0860B0F0,
+        Unknown_0860B102,
+        Unknown_0860B114,
+        Unknown_0860B126,
+        Unknown_0860B138,
+        Unknown_0860B14A,
+        Unknown_0860B15C,
+        Unknown_0860B16E,
+        Unknown_0860B180,
+        Unknown_0860B192
+};
+
+static const u16 gUnknown_0860B1E4[] = {
+        0x0210, 0x0400, 0x0212, 0x1a26, 0x0208, 0x045d, 0x040a, 0x0411, 0x0464, 0x020e, 0x1a25, 0x181b, 0x1a24, 0x0420, 0x0410, 0x0400
+};
+
+static const u16 gUnknown_0860B204[] = {
+        0x007b, 0x007f, 0x0081, 0x0023, 0x0023, 0x0023, 0x00a5, 0x00a7, 0x00a6, 0x000b, 0x012f, 0x006b, 0x006d, 0x0044, 0x0044, 0x000c
+};
+
+extern const u8 gUnknown_085EEB83[];
+extern const u8 gUnknown_085EEB8C[];
+extern const u8 gUnknown_085EEB95[];
+extern const u8 gUnknown_085EEB9E[];
+extern const u8 gUnknown_085EEBA4[];
+extern const u8 gUnknown_085EEBAB[];
+
+static const u8 *const gUnknown_0860B224[] = {
+        gUnknown_085EEB83,
+        gUnknown_085EEB8C,
+        gUnknown_085EEB95,
+        gUnknown_085EEB9E,
+        gUnknown_085EEBA4,
+        gUnknown_085EEBAB
+};
+
+static const u16 Unknown_0860B23C[] = {
+        0x0056, 0x0053, 0x0054, 0x000e, 0x0012, 0x000f, 0x00a7, 0x0011, 0x0010, 0x0018, 0x0019, 0x001e, 0x0000
+};
+
+static const u16 Unknown_0860B256[] = {
+        0x0051, 0x006a, 0x006b, 0x00cc, 0x00c2, 0x002f, 0x0067, 0x0068, 0x0087, 0x0089, 0x008b, 0x009d, 0x00a0, 0x00a5, 0x0004, 0x0002, 0x0000
+};
+
+static const u16 Unknown_0860B278[] = {
+        0x0021, 0x000d, 0x001a, 0x001b, 0x001c, 0x00cc, 0x00ca, 0x0026, 0x0086, 0x0096, 0x0097, 0x009a, 0x00a2, 0x00a6, 0x0000
+};
+
+static const u16 Unknown_0860B296[] = {
+        0x0020, 0x004d, 0x004b, 0x004c, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x006e, 0x005d, 0x006c, 0x006d, 0x006a, 0x006b, 0x00d6, 0x00bc, 0x00b3, 0x000b, 0x000c, 0x0000
+};
+
+static const u16 Unknown_0860B2C0[] = {
+        0x001f, 0x0013, 0x0014, 0x004a, 0x004e, 0x0049, 0x00a5, 0x00c8, 0x0067, 0x006f, 0x0000
+};
+
+static const u16 Unknown_0860B2D6[] = {
+        0x00b7, 0x00d3, 0x00d2, 0x00d8, 0x009e, 0x00a6, 0x00ab, 0x00aa, 0x006c, 0x006d, 0x0000
+};
+
+static const u16 *const gUnknown_0860B2EC[] = {
+        Unknown_0860B23C,
+        Unknown_0860B256,
+        Unknown_0860B278,
+        Unknown_0860B296,
+        Unknown_0860B2C0,
+        Unknown_0860B2D6
+};
+
+static const u16 gUnknown_0860B304[] = {
+        0x0b, 0x6e, 0x40, 0x6f, 0x44, 0x47
+};
+
+extern const u8 gUnknown_085EEB2B[];
+extern const u8 gUnknown_085EEB34[];
+extern const u8 gUnknown_085EEB3A[];
+extern const u8 gUnknown_085EEB41[];
+extern const u8 gUnknown_085EEB4A[];
+extern const u8 gUnknown_085EEB51[];
+extern const u8 gUnknown_085EEB5A[];
+extern const u8 gUnknown_085EEB61[];
+extern const u8 gUnknown_085EEB6A[];
+extern const u8 gUnknown_085EEB74[];
+extern const u8 gUnknown_085EADA4[];
+extern const u8 gUnknown_085EADB5[];
+extern const u8 gUnknown_085EADC4[];
+extern const u8 gUnknown_085EADD5[];
+extern const u8 gUnknown_085EADE7[];
+
+static const u8 *const gUnknown_0860B310[] = {
+        gUnknown_085EEB2B,
+        gUnknown_085EEB34,
+        gUnknown_085EEB3A,
+        gUnknown_085EEB41,
+        gUnknown_085EEB4A
+};
+static const u8 *const gUnknown_0860B324[] = {
+        gUnknown_085EEB51,
+        gUnknown_085EEB5A,
+        gUnknown_085EEB61,
+        gUnknown_085EEB6A,
+        gUnknown_085EEB74
+};
+static const u8 *const gUnknown_0860B338[] = {
+        gUnknown_085EADA4,
+        gUnknown_085EADB5,
+        gUnknown_085EADC4,
+        gUnknown_085EADD5,
+        gUnknown_085EADE7
+};
+
+static const u16 gUnknown_0860B34C[] = {
+        0x0120, 0x013b, 0x011e, 0x013d, 0x0019
+};
 
 static EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL;
 static EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL;
-- 
cgit v1.2.3