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

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/TwoIsland_House/scripts.inc
+11 -18
View File
@@ -21,12 +21,10 @@ TwoIsland_House_EventScript_MoveManiac::
end
TwoIsland_House_EventScript_CheckPlayerHasMushrooms::
checkitem ITEM_BIG_MUSHROOM, 1
compare VAR_RESULT, TRUE
call_if_eq TwoIsland_House_EventScript_SetHasBigMushroom
checkitem ITEM_BIG_MUSHROOM
call_if_eq VAR_RESULT, TRUE, TwoIsland_House_EventScript_SetHasBigMushroom
checkitem ITEM_TINY_MUSHROOM, 2
compare VAR_RESULT, TRUE
call_if_eq TwoIsland_House_EventScript_SetHasTinyMushrooms
call_if_eq VAR_RESULT, TRUE, TwoIsland_House_EventScript_SetHasTinyMushrooms
goto_if_set HAS_BIG_MUSHROOM, TwoIsland_House_EventScript_CheckAlsoHasTinyMushrooms
goto_if_set HAS_TINY_MUSHROOMS, TwoIsland_House_EventScript_CheckAlsoHasBigMushroom
goto TwoIsland_House_EventScript_EndTutorMove
@@ -44,8 +42,7 @@ TwoIsland_House_EventScript_CheckAlsoHasBigMushroom::
TwoIsland_House_EventScript_AskTutorMon::
msgbox TwoIsland_House_Text_WantMeToTeachMove, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq TwoIsland_House_EventScript_EndTutorMove
goto_if_eq VAR_RESULT, NO, TwoIsland_House_EventScript_EndTutorMove
goto TwoIsland_House_EventScript_ChooseMonToTutor
end
@@ -53,13 +50,10 @@ TwoIsland_House_EventScript_ChooseMonToTutor::
msgbox TwoIsland_House_Text_TutorWhichMon
special SelectMoveTutorMon
waitstate
compare VAR_0x8004, PARTY_SIZE
goto_if_ge TwoIsland_House_EventScript_EndTutorMove
goto_if_ge VAR_0x8004, PARTY_SIZE, TwoIsland_House_EventScript_EndTutorMove
special IsSelectedMonEgg
compare VAR_RESULT, TRUE
goto_if_eq TwoIsland_House_EventScript_CantTutorEgg
compare VAR_0x8005, 0
goto_if_eq TwoIsland_House_EventScript_NoMoveToTutorMon
goto_if_eq VAR_RESULT, TRUE, TwoIsland_House_EventScript_CantTutorEgg
goto_if_eq VAR_0x8005, 0, TwoIsland_House_EventScript_NoMoveToTutorMon
goto TwoIsland_House_EventScript_ChooseMoveToTeach
end
@@ -67,16 +61,15 @@ TwoIsland_House_EventScript_ChooseMoveToTeach::
msgbox TwoIsland_House_Text_TeachWhichMove
special DisplayMoveTutorMenu
waitstate
compare VAR_0x8004, 0
goto_if_eq TwoIsland_House_EventScript_ChooseMonToTutor
goto_if_eq VAR_0x8004, 0, TwoIsland_House_EventScript_ChooseMonToTutor
goto_if_set HAS_BOTH_MUSHROOMS, TwoIsland_House_EventScript_ChooseMushroom
goto_if_set HAS_BIG_MUSHROOM, TwoIsland_House_EventScript_GiveBigMushroom
goto_if_set HAS_TINY_MUSHROOMS, TwoIsland_House_EventScript_GiveTinyMushrooms
end
TwoIsland_House_EventScript_GiveBigMushroom::
removeitem ITEM_BIG_MUSHROOM, 1
textcolor 3
removeitem ITEM_BIG_MUSHROOM
textcolor NPC_TEXT_COLOR_NEUTRAL
msgbox TwoIsland_House_Text_HandedOverOneBigMushroom
call EventScript_RestorePrevTextColor
goto TwoIsland_House_EventScript_EndTutorMove
@@ -84,7 +77,7 @@ TwoIsland_House_EventScript_GiveBigMushroom::
TwoIsland_House_EventScript_GiveTinyMushrooms::
removeitem ITEM_TINY_MUSHROOM, 2
textcolor 3
textcolor NPC_TEXT_COLOR_NEUTRAL
msgbox TwoIsland_House_Text_HandedOverTwoTinyMushrooms
call EventScript_RestorePrevTextColor
goto TwoIsland_House_EventScript_EndTutorMove