diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 010f0fa103..903e093c04 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -48,7 +48,7 @@ TwoIsland_House_EventScript_AskTutorMon:: TwoIsland_House_EventScript_ChooseMonToTutor:: msgbox TwoIsland_House_Text_TutorWhichMon - special SelectMoveTutorMon + special ChooseMonForMoveRelearner waitstate goto_if_ge VAR_0x8004, PARTY_SIZE, TwoIsland_House_EventScript_EndTutorMove special IsSelectedMonEgg @@ -59,7 +59,7 @@ TwoIsland_House_EventScript_ChooseMonToTutor:: TwoIsland_House_EventScript_ChooseMoveToTeach:: msgbox TwoIsland_House_Text_TeachWhichMove - special DisplayMoveTutorMenu + special TeachMoveRelearnerMove waitstate goto_if_eq VAR_0x8004, 0, TwoIsland_House_EventScript_ChooseMonToTutor goto_if_set HAS_BOTH_MUSHROOMS, TwoIsland_House_EventScript_ChooseMushroom diff --git a/data/specials.inc b/data/specials.inc index 059f290159..d880bf6b9d 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -227,12 +227,12 @@ gSpecials:: def_special GetElevatorFloor def_special NullFieldSpecial @ Lottery Corner specials def_special NullFieldSpecial - def_special SelectMoveTutorMon + def_special ChooseMonForMoveRelearner def_special SelectMoveDeleterMove def_special MoveDeleterForgetMove def_special BufferMoveDeleterNicknameAndMove def_special GetNumMovesSelectedMonHas - def_special DisplayMoveTutorMenu + def_special TeachMoveRelearnerMove def_special NullFieldSpecial @ Hoenn Cycling Road specials def_special NullFieldSpecial def_special GetPlayerAvatarBike diff --git a/src/learn_move.c b/src/learn_move.c index 2f7f04b018..0529644fa3 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -364,7 +364,7 @@ static void VBlankCB_MoveRelearner(void) TransferPlttBuffer(); } -void DisplayMoveTutorMenu(void) +void TeachMoveRelearnerMove(void) { LockPlayerFieldControls(); CreateTask(Task_InitMoveRelearnerMenu, 10); diff --git a/src/party_menu_specials.c b/src/party_menu_specials.c index 567f6b8605..d71c6a4957 100644 --- a/src/party_menu_specials.c +++ b/src/party_menu_specials.c @@ -21,7 +21,7 @@ void ChoosePartyMon(void) BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); } -void SelectMoveTutorMon(void) +void ChooseMonForMoveRelearner(void) { u8 taskId;