diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 10:14:31 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 10:14:31 -0500 |
| commit | a5ee2c14fda450ca67985805b8bc71e66dfcf622 (patch) | |
| tree | 9f874dbe25d28bf81e9375da5731889b9b466b07 /include/menu_specialized.h | |
| parent | 91fa5faf4acf617db0625992b2caf116e64f0888 (diff) | |
| parent | e8add87bf3ccc3563a3d4fa94e109251f4a06eea (diff) | |
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
# include/menu_specialized.h
Diffstat (limited to 'include/menu_specialized.h')
| -rw-r--r-- | include/menu_specialized.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/menu_specialized.h b/include/menu_specialized.h index 2ad3bb8c8..51f54759d 100644 --- a/include/menu_specialized.h +++ b/include/menu_specialized.h @@ -17,8 +17,8 @@ struct UnknownStruct_81D1ED4 /*0x014*/ struct UnknownSubStruct_81D1ED4 unk14[4][5]; /*0x064*/ struct UnknownSubStruct_81D1ED4 unk64[10][5]; /*0x12C*/ struct UnknownSubStruct_81D1ED4 unk12C[5]; - /*0x13C*/ struct UnknownSubStruct_81D1ED4 unk13C[0x42]; - /*0x248*/ struct UnknownSubStruct_81D1ED4 unk248[0x42]; + /*0x140*/ u16 unk140[66][2]; + /*0x248*/ u16 unk248[66][2]; /*0x350*/ u16 unk350; /*0x352*/ u16 unk352; /*0x354*/ u8 unk354; @@ -40,8 +40,8 @@ void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D3464(void *arg0); void sub_81D3480(void *arg0, u8 arg1, u8 arg2); -void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); -void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]); +void sub_81D2754(u8 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); +void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1, struct UnknownSubStruct_81D1ED4 *arg2); void MoveRelearnerPrintText(u8 *str); bool16 MoveRelearnerRunTextPrinters(void); void MoveRelearnerCreateYesNoMenu(void); @@ -49,4 +49,4 @@ u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices); void InitMoveRelearnerWindows(bool8 useContextWindow); void GetMonLevelUpWindowStats(struct Pokemon* mon, void* statStoreLocation); -#endif // GUARD_MENU_SPECIALIZED_H
\ No newline at end of file +#endif // GUARD_MENU_SPECIALIZED_H |