Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6

This commit is contained in:
GriffinR
2025-05-14 11:52:22 -04:00
15 changed files with 37 additions and 37 deletions
+2 -2
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