diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-08 21:04:59 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-08 21:04:59 -0400 |
commit | 9e51b18b9fdc40cb12d6523a3e43058358f91cae (patch) | |
tree | 8ee11229ba247e8f1e625ad7922882ce8f29dd3a /src | |
parent | 2e0259fceb54edb68df7e7956418f3bbbe8c08da (diff) |
sub_810CE10
Diffstat (limited to 'src')
-rw-r--r-- | src/menews_jisan.c | 4 | ||||
-rw-r--r-- | src/vs_seeker.c | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/src/menews_jisan.c b/src/menews_jisan.c index 7dfcee939..450009318 100644 --- a/src/menews_jisan.c +++ b/src/menews_jisan.c @@ -89,12 +89,12 @@ void sub_8146C88(void) r5->unk_0_2 = 0; r5->unk_0_5 = 0; r5->unk_1 = 0; - VarSet(0x4028, 0); + VarSet(VAR_0x4028, 0); } void sub_8146CA4(void) { - u16 *r4 = sub_806E454(0x4028); + u16 *r4 = sub_806E454(VAR_0x4028); struct MysteryEventStruct *r2 = sub_8143D94(); struct MysteryEventStruct r0 = *r2; diff --git a/src/vs_seeker.c b/src/vs_seeker.c index f8dd673fe..92798684d 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -826,3 +826,26 @@ void sub_810CDE8(void) gSaveBlock1Ptr->trainerRematches[gUnknown_20370D2] = 0; sub_80803FC(); } + +int sub_810CE10(const struct UnkStruct_845318C * a0, u16 a1) +{ + u32 r1; + s32 r3; + + for (r1 = 0; r1 < 0xdd; r1++) + { + for (r3 = 0; r3 < 6; r3++) + { + u16 r0; + if (a0[r1].unk_0[r3] == 0) + break; + r0 = a0[r1].unk_0[r3]; + if (r0 == 0xFFFF) + continue; + if (r0 == a1) + return r1; + } + } + + return -1; +} |