diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ewram.h | 2 | ||||
| -rw-r--r-- | include/menu.h | 8 | ||||
| -rw-r--r-- | include/move_tutor_menu.h (renamed from include/learn_move.h) | 4 | ||||
| -rw-r--r-- | include/pokemon.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 2 | ||||
| -rw-r--r-- | include/strings2.h | 4 | ||||
| -rw-r--r-- | include/text.h | 4 |
7 files changed, 14 insertions, 12 deletions
diff --git a/include/ewram.h b/include/ewram.h index 87af8dd53..f8a0d69f9 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -191,7 +191,7 @@ extern u8 gSharedMem[]; #define AI_ARRAY_160CC(i) (gSharedMem[0x160CC + i * 2]) #define ewram16800 (&gSharedMem[0x16800]) #define ewram17000 (&gSharedMem[0x17000]) -#define eLearnMoveStruct (struct LearnMoveStruct *)(gSharedMem + 0x17000) +#define eMoveTutorMenu (struct MoveTutorMenu *)(gSharedMem + 0x17000) #define eSecretBaseRecord ((struct SecretBaseRecord *)(gSharedMem + 0x17000)) #define eCableCar1 ((struct CableCarEwramStruct1 *)(gSharedMem + 0x17000)) #define ewram17002 (&gSharedMem[0x17002]) diff --git a/include/menu.h b/include/menu.h index 8f7b91346..8741649c8 100644 --- a/include/menu.h +++ b/include/menu.h @@ -71,10 +71,10 @@ int sub_8072AB0(const u8 *, u8, u16, u8, u8, u32); void MenuPrint_RightAligned(const u8 *, u8, u8); void sub_8072B80(const u8 *, u8, u8, const u8 *); void sub_8072BD8(const u8 *, u8, u8, u16); -u8 *sub_8072C14(u8 *, s32, u8, u8); -u8 *sub_8072C44(u8 *, s32, u8, u8); -u8 *sub_8072C74(u8 *, const u8 *, u8, u8); -u8 sub_8072CA4(const u8 *s); +u8 *AlignInt1InMenuWindow(u8 *, s32, u8, u8); +u8 *AlignInt2InMenuWindow(u8 *, s32, u8, u8); +u8 *AlignStringInMenuWindow(u8 *, const u8 *, u8, u8); +u8 GetStringWidthInMenuWindow(const u8 *s); u8 Menu_GetTextWindowPaletteNum(void); void Menu_GetTextColors(u8 *, u8 *, u8 *); u32 Menu_UpdateWindowTextOverrideLineLength(u8); diff --git a/include/learn_move.h b/include/move_tutor_menu.h index fca236ec9..9ca8f72de 100644 --- a/include/learn_move.h +++ b/include/move_tutor_menu.h @@ -1,6 +1,8 @@ #ifndef GUARD_LEARN_MOVE_H #define GUARD_LEARN_MOVE_H -void TeachMoveTutorMove(void); +#define MAX_MOVE_TUTOR_MOVES 20 + +void DisplayMoveTutorMenu(void); #endif // GUARD_LEARN_MOVE_H diff --git a/include/pokemon.h b/include/pokemon.h index 6bb44a227..783263aad 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -616,7 +616,7 @@ void AdjustFriendship(struct Pokemon *, u8); u8 CheckPartyHasHadPokerus(struct Pokemon *, u8); void UpdatePartyPokerusTime(u16); u32 CanMonLearnTMHM(struct Pokemon *, u8); -u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves); +u8 GetMoveTutorMoves(struct Pokemon *mon, u16 *moves); u8 sub_8040574(struct Pokemon *party); void ClearBattleMonForms(void); void sub_80408BC(); diff --git a/include/strings.h b/include/strings.h index 240e212ac..0232b03f4 100644 --- a/include/strings.h +++ b/include/strings.h @@ -150,7 +150,7 @@ extern const u8 OtherText_CheckTag[]; extern const u8 OtherText_Confirm[]; extern const u8 gOtherText_Walk[]; -extern const u8 gUnknownText_Exit[]; +extern const u8 gOtherText_Exit[]; extern const u8 gOtherText_CancelNoTerminator[]; extern const u8 gOtherText_CancelWithTerminator[]; diff --git a/include/strings2.h b/include/strings2.h index 8052c6c4a..50197ccde 100644 --- a/include/strings2.h +++ b/include/strings2.h @@ -186,7 +186,7 @@ extern const u8 gEggNickname[]; extern const u8 gOtherText_HatchedFromEgg[]; extern const u8 gOtherText_NickHatchPrompt[]; -// learn_move +// move_tutor_menu extern const u8 OtherText_Battle[]; extern const u8 OtherText_Contest[]; @@ -194,7 +194,7 @@ extern const u8 OtherText_Contest[]; extern const u8 OtherText_Type[]; extern const u8 OtherText_PP[]; -// learn_move +// move_tutor_menu extern const u8 OtherText_Power[]; extern const u8 OtherText_Accuracy[]; extern const u8 OtherText_Appeal[]; diff --git a/include/text.h b/include/text.h index 71afd1d00..ce63a2542 100644 --- a/include/text.h +++ b/include/text.h @@ -143,7 +143,7 @@ extern const struct WindowTemplate gWindowTemplate_81E6C74; extern const struct WindowTemplate gWindowTemplate_81E6C90; extern const struct WindowTemplate gWindowTemplate_81E6CAC; extern const struct WindowTemplate gWindowTemplate_81E6CC8; -extern const struct WindowTemplate gWindowTemplate_81E6CE4; +extern const struct WindowTemplate gMenuTextWindowTemplate; extern const struct WindowTemplate gWindowTemplate_81E6D00; extern const struct WindowTemplate gWindowTemplate_81E6D1C; extern const struct WindowTemplate gWindowTemplate_81E6D38; @@ -192,7 +192,7 @@ extern const struct WindowTemplate gWindowTemplate_81E71D0; extern const struct WindowTemplate gWindowTemplate_81E71EC; extern const struct WindowTemplate gWindowTemplate_81E7208; extern const struct WindowTemplate gWindowTemplate_81E7224; -extern const struct WindowTemplate gWindowTemplate_81E7240; +extern const struct WindowTemplate gMenuTextWindowTemplate; extern const struct WindowTemplate gWindowTemplate_81E725C; extern const struct WindowTemplate gWindowTemplate_81E7278; extern const struct WindowTemplate gWindowTemplate_81E7294; |