ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 12:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

sub_818E298

Browse Source
This commit is contained in:
scnorton 2017-09-20 11:30:09 -04:00
parent 0895d8d861
commit 8a31e58689
3 changed files with 23 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
asm/lilycove_lady.s
View File

@ -5,53 +5,6 @@
.text .text
thumb_func_start sub_818E274
sub_818E274: @ 818E274
push {r4,lr}
ldr r4, =gStringVar1
ldr r0, =gUnknown_0203CD68
ldr r0, [r0]
ldrh r0, [r0, 0x28]
bl ItemId_GetItem
adds r1, r0, 0
adds r0, r4, 0
bl StringCopy
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_818E274
thumb_func_start sub_818E298
sub_818E298: @ 818E298
push {r4,lr}
ldr r4, =gUnknown_0203CD68
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x00003b58
adds r0, r1
str r0, [r4]
bl sub_818E13C
lsls r0, 24
cmp r0, 0
beq _0818E2C0
movs r0, 0
b _0818E2CC
.pool
_0818E2C0:
ldr r0, [r4]
ldr r1, =gGameLanguage
ldrb r1, [r1]
adds r0, 0x2D
strb r1, [r0]
movs r0, 0x1
_0818E2CC:
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end sub_818E298
thumb_func_start sub_818E2D8 thumb_func_start sub_818E2D8
sub_818E2D8: @ 818E2D8 sub_818E2D8: @ 818E2D8
ldr r2, =gUnknown_0203CD68 ldr r2, =gUnknown_0203CD68

2
include/global.h
View File

@ -676,7 +676,7 @@ struct LilycoveLadyQuiz
/*0x016*/ u16 unk_016; /*0x016*/ u16 unk_016;
/*0x018*/ u8 playerName[8]; /*0x018*/ u8 playerName[8];
/*0x020*/ u16 playerTrainerId[4]; /*0x020*/ u16 playerTrainerId[4];
/*0x028*/ u16 unk_028; /*0x028*/ u16 itemId;
/*0x02a*/ u8 unk_02a; /*0x02a*/ u8 unk_02a;
/*0x02b*/ u8 unk_02b; /*0x02b*/ u8 unk_02b;
/*0x02c*/ u8 unk_02c; /*0x02c*/ u8 unk_02c;

28
src/lilycove_lady.c
View File

@ -320,7 +320,7 @@ void sub_818DF00(void)
gUnknown_0203CD68->unk_002[i] = gUnknown_0860B1A4[v0][i]; gUnknown_0203CD68->unk_002[i] = gUnknown_0860B1A4[v0][i];
} }
gUnknown_0203CD68->unk_014 = gUnknown_0860B1E4[v0]; 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->unk_02b = v0;
gUnknown_0203CD68->playerName[0] = EOS; gUnknown_0203CD68->playerName[0] = EOS;
} }
@ -342,7 +342,7 @@ void SetLilycoveQuizLady(void)
{ {
gUnknown_0203CD68->playerTrainerId[i] = 0; gUnknown_0203CD68->playerTrainerId[i] = 0;
} }
gUnknown_0203CD68->unk_028 = 0; gUnknown_0203CD68->itemId = ITEM_NONE;
gUnknown_0203CD68->unk_02a = 0; gUnknown_0203CD68->unk_02a = 0;
gUnknown_0203CD68->unk_02c = 0x10; gUnknown_0203CD68->unk_02c = 0x10;
gUnknown_0203CD68->language = gGameLanguage; gUnknown_0203CD68->language = gGameLanguage;
@ -398,7 +398,7 @@ u8 sub_818E06C(void)
quiz->unk_002[j] = gUnknown_0860B1A4[i][j]; quiz->unk_002[j] = gUnknown_0860B1A4[i][j];
} }
quiz->unk_014 = gUnknown_0860B1E4[i]; quiz->unk_014 = gUnknown_0860B1E4[i];
quiz->unk_028 = gUnknown_0860B204[i]; quiz->itemId = gUnknown_0860B204[i];
quiz->unk_02b = i; quiz->unk_02b = i;
quiz->playerName[0] = EOS; quiz->playerName[0] = EOS;
} }
@ -533,16 +533,16 @@ __attribute__((naked)) u8 sub_818E13C(void)
u8 sub_818E1F4(void) u8 sub_818E1F4(void)
{ {
u8 response; bool8 response;
u8 i; u8 i;
gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
response = 0; response = FALSE;
for (i = 0; i < 4; i ++) for (i = 0; i < 4; i ++)
{ {
if (gUnknown_0203CD68->playerTrainerId[i] != gSaveBlock2Ptr->playerTrainerId[i]) if (gUnknown_0203CD68->playerTrainerId[i] != gSaveBlock2Ptr->playerTrainerId[i])
{ {
response = 1; response = TRUE;
break; break;
} }
} }
@ -557,3 +557,19 @@ u8 sub_818E258(const u8 *str)
for (len = 0, ptr = str; *ptr != EOS; len ++, ptr ++); for (len = 0, ptr = str; *ptr != EOS; len ++, ptr ++);
return len; 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;
}