dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
GriffinR
2025-05-14 11:52:22 -04:00
parent 7722e7a92c d61f959453
commit 82d2283108
15 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/TwoIsland_House/scripts.inc
+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
data/specials.inc
+2 -2
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