mirror
/
pokefirered
mirror of https://github.com/pret/pokefirered
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename the Move Relearner specials. (#684)

This commit is contained in:
Kevin 2025-01-19 14:14:55 -05:00 committed by GitHub
parent 2a3e92e10f
commit d844877218
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/maps/TwoIsland_House/scripts.inc
View File

@ -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

4
data/specials.inc
View File

@ -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

2
src/learn_move.c
View File

@ -364,7 +364,7 @@ static void VBlankCB_MoveRelearner(void)
TransferPlttBuffer();
}
void DisplayMoveTutorMenu(void)
void TeachMoveRelearnerMove(void)
{
LockPlayerFieldControls();
CreateTask(Task_InitMoveRelearnerMenu, 10);

2
src/party_menu_specials.c
View File

@ -21,7 +21,7 @@ void ChoosePartyMon(void)
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
}
void SelectMoveTutorMon(void)
void ChooseMonForMoveRelearner(void)
{
u8 taskId;