Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-28 03:34:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add two nonmatchings

Browse Source
This commit is contained in:
Kermalis
2023-08-05 10:43:51 -04:00
parent b472be2880
commit 95288e4593
2 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/kecleon_items_1.c
View File

@@ -59,7 +59,7 @@ s32 sub_801AE24(u32);
extern u8 sub_8019FB0(void);
extern void PlaySound(u16 songIndex);
extern void PlayMenuSoundEffect(u32);
extern struct UnkTextStruct2 gUnknown_80DB8CC;
@@ -68,16 +68,16 @@ extern struct UnkTextStruct2 gUnknown_80DB8FC;
extern struct UnkTextStruct2 gUnknown_80DB944;
extern struct UnkTextStruct2 gUnknown_80DB95C;
extern const struct UnkTextStruct2 gUnknown_80DB914;
extern void sub_801A430(void);
extern void sub_801A4A4(void);
extern u32 sub_80095E4(s16, u32);
extern void sub_801A064(void);
extern void sub_801A0D8(void);
extern u8 sub_801A37C(void);
extern void sub_801A430(void);
extern void sub_801A4A4(void);
extern void sub_801A010(void);
extern void sub_801A3DC(void);
extern void sub_801AD34(u32);
extern void PlaySound(u16 songIndex);
u32 CountKecleonItems(void);
@@ -658,6 +658,23 @@ void sub_801A010(void)
}
}
#if NONMATCHING // https://decomp.me/scratch/VjeuO
void sub_801A064(void)
{
s16 val;
gUnknown_203B214->unk9C[0] = gUnknown_203B214->input.unk20;
gUnknown_203B214->unk9C[1] = gUnknown_203B214->input.unk1E;
gUnknown_203B214->unk9C[2] = 10;
gUnknown_203B214->unk9C[3] = 0;
val = sub_80095E4(gUnknown_203B214->input.unk1A, 12) + 2;
gUnknown_203B214->unk3C[gUnknown_203B214->unk34].unkE = val;
gUnknown_203B214->unk3C[gUnknown_203B214->unk34].unk10 = val + 2;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B214->unk3C, 1, 1);
}
#else
NAKED
void sub_801A064(void)
{
@@ -717,6 +734,7 @@ void sub_801A064(void)
"\t.align 2, 0\n"
"_0801A0D4: .4byte gUnknown_203B214");
}
#endif // NONMATCHING
void sub_801A0D8(void)
{
@@ -849,6 +867,23 @@ void sub_801A3DC(void)
}
}
#if NONMATCHING // https://decomp.me/scratch/L78xC
void sub_801A430(void)
{
s16 val;
gUnknown_203B21C->unk9C[0] = gUnknown_203B21C->input.unk20;
gUnknown_203B21C->unk9C[1] = gUnknown_203B21C->input.unk1E;
gUnknown_203B21C->unk9C[2] = 10;
gUnknown_203B21C->unk9C[3] = 0;
val = sub_80095E4(gUnknown_203B21C->input.unk1A, 12) + 2;
gUnknown_203B21C->unk3C[gUnknown_203B21C->unk34].unkE = val;
gUnknown_203B21C->unk3C[gUnknown_203B21C->unk34].unk10 = val + 2;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B21C->unk3C, 1, 1);
}
#else
NAKED
void sub_801A430(void)
{
@@ -907,6 +942,7 @@ void sub_801A430(void)
"\t.align 2, 0\n"
"_0801A4A0: .4byte gUnknown_203B21C");
}
#endif // NONMATCHING
void sub_801A4A4(void)
{

2
src/makuhita_dojo.c
View File

@@ -462,7 +462,7 @@ void sub_8030480(void)
}
}
#ifdef NONMATCHING
#ifdef NONMATCHING // https://decomp.me/scratch/lM7lE
void sub_80304C8(void)
{
s16 test;