diff options
| author | scnorton <scnorton@biociphers.org> | 2017-09-19 17:07:36 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-09-19 17:07:36 -0400 |
| commit | 3b3423d1a751134ff7941b41bad72e0e75314647 (patch) | |
| tree | ec57aaaf92927234cf043318b7942ba53127fb69 | |
| parent | b8e733283e31c4863f774c6cf2bbb17ba369681f (diff) | |
sub_818DC60
| -rw-r--r-- | asm/lilycove_lady.s | 33 | ||||
| -rw-r--r-- | include/global.h | 3 | ||||
| -rw-r--r-- | src/lilycove_lady.c | 15 |
3 files changed, 15 insertions, 36 deletions
diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index c905b3e2a..75f9458a3 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,39 +5,6 @@ .text - thumb_func_start sub_818DC60 -sub_818DC60: @ 818DC60 - push {r4,r5,lr} - ldr r5, =gUnknown_0203CD64 - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r2, =0x00003b58 - adds r0, r1, r2 - str r0, [r5] - ldrb r0, [r0, 0x4] - cmp r0, 0xFF - bne _0818DC84 - movs r0, 0 - b _0818DC9C - .pool -_0818DC84: - ldr r4, =gStringVar3 - ldr r0, =0x00003b5c - adds r1, r0 - adds r0, r4, 0 - bl StringCopy7 - ldr r0, [r5] - ldrb r1, [r0, 0x12] - adds r0, r4, 0 - bl ConvertInternationalString - movs r0, 0x1 -_0818DC9C: - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_818DC60 - thumb_func_start sub_818DCAC sub_818DCAC: @ 818DCAC push {r4,lr} diff --git a/include/global.h b/include/global.h index 0fc860e68..42629cf48 100644 --- a/include/global.h +++ b/include/global.h @@ -675,8 +675,7 @@ typedef union // TODO /*0x001*/ u8 unk_001; /*0x002*/ u8 unk_002; /*0x003*/ u8 unk_003; - /*0x004*/ u8 unk_004; - /*0x005*/ u8 filler_005[7]; + /*0x004*/ u8 unk_004[8]; /*0x00c*/ u8 unk_00c; /*0x00d*/ u8 filler_00d; /*0x00e*/ u16 unk_00e; 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; +} |