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

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/TwoIsland_House/scripts.inc
+17 -17
View File
@@ -3,10 +3,10 @@
.equ HAS_TINY_MUSHROOMS, FLAG_TEMP_3
.equ HAS_BOTH_MUSHROOMS, FLAG_TEMP_4
TwoIsland_House_MapScripts:: @ 8171618
TwoIsland_House_MapScripts::
.byte 0
TwoIsland_House_EventScript_MoveManiac:: @ 8171619
TwoIsland_House_EventScript_MoveManiac::
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_CutRecording
lock
@@ -20,7 +20,7 @@ TwoIsland_House_EventScript_MoveManiac:: @ 8171619
goto TwoIsland_House_EventScript_CheckPlayerHasMushrooms
end
TwoIsland_House_EventScript_CheckPlayerHasMushrooms:: @ 817164F
TwoIsland_House_EventScript_CheckPlayerHasMushrooms::
checkitem ITEM_BIG_MUSHROOM, 1
compare VAR_RESULT, TRUE
call_if_eq TwoIsland_House_EventScript_SetHasBigMushroom
@@ -32,24 +32,24 @@ TwoIsland_House_EventScript_CheckPlayerHasMushrooms:: @ 817164F
goto TwoIsland_House_EventScript_EndTutorMove
end
TwoIsland_House_EventScript_CheckAlsoHasTinyMushrooms:: @ 8171687
TwoIsland_House_EventScript_CheckAlsoHasTinyMushrooms::
call_if_set HAS_TINY_MUSHROOMS, TwoIsland_House_EventScript_SetHasBothMushrooms
goto TwoIsland_House_EventScript_AskTutorMon
end
TwoIsland_House_EventScript_CheckAlsoHasBigMushroom:: @ 8171696
TwoIsland_House_EventScript_CheckAlsoHasBigMushroom::
call_if_set HAS_BIG_MUSHROOM, TwoIsland_House_EventScript_SetHasBothMushrooms
goto TwoIsland_House_EventScript_AskTutorMon
end
TwoIsland_House_EventScript_AskTutorMon:: @ 81716A5
TwoIsland_House_EventScript_AskTutorMon::
msgbox TwoIsland_House_Text_WantMeToTeachMove, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq TwoIsland_House_EventScript_EndTutorMove
goto TwoIsland_House_EventScript_ChooseMonToTutor
end
TwoIsland_House_EventScript_ChooseMonToTutor:: @ 81716BE
TwoIsland_House_EventScript_ChooseMonToTutor::
msgbox TwoIsland_House_Text_TutorWhichMon
special SelectMoveTutorMon
waitstate
@@ -63,7 +63,7 @@ TwoIsland_House_EventScript_ChooseMonToTutor:: @ 81716BE
goto TwoIsland_House_EventScript_ChooseMoveToTeach
end
TwoIsland_House_EventScript_ChooseMoveToTeach:: @ 81716F4
TwoIsland_House_EventScript_ChooseMoveToTeach::
msgbox TwoIsland_House_Text_TeachWhichMove
special DisplayMoveTutorMenu
waitstate
@@ -74,7 +74,7 @@ TwoIsland_House_EventScript_ChooseMoveToTeach:: @ 81716F4
goto_if_set HAS_TINY_MUSHROOMS, TwoIsland_House_EventScript_GiveTinyMushrooms
end
TwoIsland_House_EventScript_GiveBigMushroom:: @ 8171727
TwoIsland_House_EventScript_GiveBigMushroom::
removeitem ITEM_BIG_MUSHROOM, 1
textcolor 3
msgbox TwoIsland_House_Text_HandedOverOneBigMushroom
@@ -82,7 +82,7 @@ TwoIsland_House_EventScript_GiveBigMushroom:: @ 8171727
goto TwoIsland_House_EventScript_EndTutorMove
end
TwoIsland_House_EventScript_GiveTinyMushrooms:: @ 8171741
TwoIsland_House_EventScript_GiveTinyMushrooms::
removeitem ITEM_TINY_MUSHROOM, 2
textcolor 3
msgbox TwoIsland_House_Text_HandedOverTwoTinyMushrooms
@@ -90,7 +90,7 @@ TwoIsland_House_EventScript_GiveTinyMushrooms:: @ 8171741
goto TwoIsland_House_EventScript_EndTutorMove
end
TwoIsland_House_EventScript_ChooseMushroom:: @ 817175B
TwoIsland_House_EventScript_ChooseMushroom::
message TwoIsland_House_Text_IllNeedMushroomOrTwo
waitmessage
multichoice 0, 0, MULTICHOICE_MUSHROOMS, TRUE
@@ -99,29 +99,29 @@ TwoIsland_House_EventScript_ChooseMushroom:: @ 817175B
case 1, TwoIsland_House_EventScript_GiveBigMushroom
end
TwoIsland_House_EventScript_NoMoveToTutorMon:: @ 8171782
TwoIsland_House_EventScript_NoMoveToTutorMon::
msgbox TwoIsland_House_Text_NoMoveICanTeachThatMon
goto TwoIsland_House_EventScript_ChooseMonToTutor
end
TwoIsland_House_EventScript_CantTutorEgg:: @ 8171790
TwoIsland_House_EventScript_CantTutorEgg::
msgbox TwoIsland_House_Text_CantTeachAnEgg
goto TwoIsland_House_EventScript_ChooseMonToTutor
end
TwoIsland_House_EventScript_EndTutorMove:: @ 817179E
TwoIsland_House_EventScript_EndTutorMove::
msgbox TwoIsland_House_Text_NeedMushroomOrTwoToLearnMove
release
end
TwoIsland_House_EventScript_SetHasBigMushroom:: @ 81717A8
TwoIsland_House_EventScript_SetHasBigMushroom::
setflag HAS_BIG_MUSHROOM
return
TwoIsland_House_EventScript_SetHasTinyMushrooms:: @ 81717AC
TwoIsland_House_EventScript_SetHasTinyMushrooms::
setflag HAS_TINY_MUSHROOMS
return
TwoIsland_House_EventScript_SetHasBothMushrooms:: @ 81717B0
TwoIsland_House_EventScript_SetHasBothMushrooms::
setflag HAS_BOTH_MUSHROOMS
return
data/maps/TwoIsland_House/text.inc
+10 -10
View File
@@ -1,4 +1,4 @@
TwoIsland_House_Text_TeachMonMoveForMushroom:: @ 81A2B88
TwoIsland_House_Text_TeachMonMoveForMushroom::
.string "I'm the POKéMON MOVE MANIAC.\p"
.string "I know every single move that\n"
.string "POKéMON learn growing up.\p"
@@ -8,40 +8,40 @@ TwoIsland_House_Text_TeachMonMoveForMushroom:: @ 81A2B88
.string "If you do that for me, I'll teach\n"
.string "a move to one POKéMON.$"
TwoIsland_House_Text_WantMeToTeachMove:: @ 81A2C63
TwoIsland_House_Text_WantMeToTeachMove::
.string "Sniff, sniff…\n"
.string "Hm! You smell of MUSHROOMS!\p"
.string "Do you want me to teach a move\n"
.string "to a POKéMON of yours?$"
TwoIsland_House_Text_TutorWhichMon:: @ 81A2CC3
TwoIsland_House_Text_TutorWhichMon::
.string "Which POKéMON needs tutoring?$"
TwoIsland_House_Text_TeachWhichMove:: @ 81A2CE1
TwoIsland_House_Text_TeachWhichMove::
.string "Which move should I teach?$"
TwoIsland_House_Text_NoMoveICanTeachThatMon:: @ 81A2CFC
TwoIsland_House_Text_NoMoveICanTeachThatMon::
.string "Sorry…\p"
.string "It doesn't appear as if I have a\n"
.string "move I can teach that POKéMON.$"
TwoIsland_House_Text_IllNeedMushroomOrTwo:: @ 81A2D43
TwoIsland_House_Text_IllNeedMushroomOrTwo::
.string "Then, I'll need a MUSHROOM or two.\n"
.string "What are you going to give me?$"
TwoIsland_House_Text_HandedOverTwoTinyMushrooms:: @ 81A2D85
TwoIsland_House_Text_HandedOverTwoTinyMushrooms::
.string "{PLAYER} handed over two\n"
.string "TINYMUSHROOMS in exchange.$"
TwoIsland_House_Text_HandedOverOneBigMushroom:: @ 81A2DB3
TwoIsland_House_Text_HandedOverOneBigMushroom::
.string "{PLAYER} handed over one\n"
.string "BIG MUSHROOM in exchange.$"
TwoIsland_House_Text_NeedMushroomOrTwoToLearnMove:: @ 81A2DE0
TwoIsland_House_Text_NeedMushroomOrTwoToLearnMove::
.string "If your POKéMON need to learn a\n"
.string "move, I need a MUSHROOM or two.$"
TwoIsland_House_Text_CantTeachAnEgg:: @ 81A2E20
TwoIsland_House_Text_CantTeachAnEgg::
.string "Hunh? There isn't a single move\n"
.string "that I can teach an EGG.$"