diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/apprentice.h | 4 | ||||
| -rw-r--r-- | include/constants/apprentice.h | 11 | ||||
| -rw-r--r-- | include/item_menu.h | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/include/apprentice.h b/include/apprentice.h index 98185e3c2..86c6250a0 100644 --- a/include/apprentice.h +++ b/include/apprentice.h @@ -7,11 +7,13 @@ struct ApprenticeTrainer { u8 name[6][PLAYER_NAME_LENGTH + 1]; // For all six languages. u16 otId; - u16 facilityClass; + u8 facilityClass; u16 species[APPRENTICE_SPECIES_COUNT]; u8 rest[14]; }; extern const struct ApprenticeTrainer gApprentices[]; +const u8 *GetApprenticeNameInLanguage(u32 apprenticeId, s32 language); + #endif // GUARD_APPRENTICE_H diff --git a/include/constants/apprentice.h b/include/constants/apprentice.h new file mode 100644 index 000000000..7fa78bfbe --- /dev/null +++ b/include/constants/apprentice.h @@ -0,0 +1,11 @@ +#ifndef GUARD_CONSTANTS_APPRENTICE_H +#define GUARD_CONSTANTS_APPRENTICE_H + +#define APPRENTICE_ASK_WHICH_LEVEL 0 +#define APPRENTICE_ASK_3SPECIES 1 +#define APPRENTICE_ASK_2SPECIES 2 +#define APPRENTICE_ASK_MOVES 3 +#define APPRENTICE_ASK_GIVE 4 +#define APPRENTICE_ASK_YES_NO 6 + +#endif // GUARD_CONSTANTS_APPRENTICE_H diff --git a/include/item_menu.h b/include/item_menu.h index 8a474bc0f..59316e948 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -54,6 +54,7 @@ extern u16 gSpecialVar_ItemId; void sub_81AAC14(void); void sub_81AAC50(void); void sub_81AAC70(void); +void sub_81AAC28(void); void bag_menu_mail_related(void); void CB2_BagMenuFromStartMenu(void); u8 sub_81ABB2C(u8 pocketId); |