summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/lilycove_lady.s49
-rw-r--r--include/global.h66
-rw-r--r--src/lilycove_lady.c114
3 files changed, 106 insertions, 123 deletions
diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s
index b3588f8a8..e0f578eca 100644
--- a/asm/lilycove_lady.s
+++ b/asm/lilycove_lady.s
@@ -5,55 +5,6 @@
.text
- thumb_func_start sub_818DF00
-sub_818DF00: @ 818DF00
- push {r4-r7,lr}
- bl Random
- lsls r0, 16
- lsrs r4, r0, 16
- movs r0, 0xF
- ands r4, r0
- movs r3, 0
- ldr r5, =gUnknown_0203CD68
- ldr r1, =gUnknown_0860B1A4
- lsls r0, r4, 2
- adds r6, r0, r1
- adds r7, r5, 0
-_0818DF1A:
- ldr r2, [r5]
- lsls r1, r3, 1
- adds r2, 0x2
- adds r2, r1
- ldr r0, [r6]
- adds r1, r0
- ldrh r0, [r1]
- strh r0, [r2]
- adds r0, r3, 0x1
- lsls r0, 24
- lsrs r3, r0, 24
- cmp r3, 0x8
- bls _0818DF1A
- ldr r2, [r7]
- ldr r0, =gUnknown_0860B1E4
- lsls r1, r4, 1
- adds r0, r1, r0
- ldrh r0, [r0]
- strh r0, [r2, 0x14]
- ldr r0, =gUnknown_0860B204
- adds r1, r0
- ldrh r0, [r1]
- strh r0, [r2, 0x28]
- adds r2, 0x2B
- strb r4, [r2]
- ldr r1, [r7]
- movs r0, 0xFF
- strb r0, [r1, 0x18]
- pop {r4-r7}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_818DF00
-
thumb_func_start SetLilycoveQuizLady
SetLilycoveQuizLady: @ 818DF68
push {r4-r6,lr}
diff --git a/include/global.h b/include/global.h
index 8c2122b39..42fe0cfbb 100644
--- a/include/global.h
+++ b/include/global.h
@@ -667,39 +667,51 @@ enum {
LILYCOVE_LADY_CONTEST
};
-typedef union // TODO
+struct LilycoveLadyQuiz
{
- struct
- {
- /*0x000*/ u8 id;
- /*0x001*/ u8 language;
- } quiz;
+ /*0x000*/ u8 id;
+ /*0x001*/ u8 language;
+ /*0x002*/ u16 unk_002[9];
+ /*0x014*/ u16 unk_014;
+ /*0x016*/ u8 filler_016[2];
+ /*0x018*/ u8 unk_018;
+ /*0x019*/ u8 filler_019[15];
+ /*0x028*/ u16 unk_028;
+ /*0x02a*/ u8 filler_02a;
+ /*0x02b*/ u8 unk_02b;
+};
- struct
- {
- /*0x000*/ u8 id;
- /*0x001*/ u8 unk_001;
- /*0x002*/ u8 unk_002;
- /*0x003*/ u8 unk_003;
- /*0x004*/ u8 unk_004[8];
- /*0x00c*/ u8 unk_00c;
- /*0x00d*/ u8 filler_00d;
- /*0x00e*/ u16 itemId;
- /*0x010*/ u16 unk_010;
- /*0x012*/ u8 language;
- } favour;
+struct LilycoveLadyFavour
+{
+ /*0x000*/ u8 id;
+ /*0x001*/ u8 unk_001;
+ /*0x002*/ u8 unk_002;
+ /*0x003*/ u8 unk_003;
+ /*0x004*/ u8 unk_004[8];
+ /*0x00c*/ u8 unk_00c;
+ /*0x00d*/ u8 filler_00d;
+ /*0x00e*/ u16 itemId;
+ /*0x010*/ u16 unk_010;
+ /*0x012*/ u8 language;
+};
- struct
- {
- /*0x000*/ u8 id;
- /*0x001*/ u8 filler_001[12];
- /*0x00d*/ u8 category; // maybe?
- } contest;
+struct LilycoveLadyContest
+{
+ /*0x000*/ u8 id;
+ /*0x001*/ u8 filler_001[12];
+ /*0x00d*/ u8 category; // maybe?
+};
+
+typedef union // TODO
+{
+ struct LilycoveLadyQuiz quiz;
+ struct LilycoveLadyFavour favour;
+ struct LilycoveLadyContest contest;
struct
{
/*0x000*/ u8 id;
- /*0x001*/ u8 filler_001[535];
+ /*0x001*/ u8 filler_001[0x207];
} common;
} LilycoveLady;
@@ -786,7 +798,7 @@ struct SaveBlock1
/*0x3728*/ struct RamScript ramScript;
/*0x3B14*/ struct RecordMixingGift recordMixingGift;
/*0x3B24*/ u8 seen2[52];
- /*0x3B58*/ LilycoveLady lilycoveLady; // TODO: convert to a union
+ /*0x3B58*/ LilycoveLady lilycoveLady;
/*0x3D70*/ u8 babyPhrase[24]; // TODO: convert to a struct
// sizeof: 0x3D88
};
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;
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 18:01:55 +0000