Rename the Move Relearner specials. (#684)

Zeturic · web-flow · commit d84487721854 · 2025-01-19T14:14:55.000-05:00
diff --git 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
@@ -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
@@ -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
@@ -21,7 +21,7 @@ void ChoosePartyMon(void)
     BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
 }
 
-void SelectMoveTutorMon(void)
+void ChooseMonForMoveRelearner(void)
 {
     u8 taskId;
 

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ static void VBlankCB_MoveRelearner(void)`
`364`	`364`	`TransferPlttBuffer();`
`365`	`365`	`}`
`366`	`366`
`367`		`-void DisplayMoveTutorMenu(void)`
	`367`	`+void TeachMoveRelearnerMove(void)`
`368`	`368`	`{`
`369`	`369`	`LockPlayerFieldControls();`
`370`	`370`	`CreateTask(Task_InitMoveRelearnerMenu, 10);`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ void ChoosePartyMon(void)`
`21`	`21`	`BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);`
`22`	`22`	`}`
`23`	`23`
`24`		`-void SelectMoveTutorMon(void)`
	`24`	`+void ChooseMonForMoveRelearner(void)`
`25`	`25`	`{`
`26`	`26`	`u8 taskId;`
`27`	`27`