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

This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
1146 changed files with 40526 additions and 38156 deletions
@@ -1,7 +1,7 @@
SixIsland_WaterPath_House1_MapScripts:: @ 817206C
SixIsland_WaterPath_House1_MapScripts::
.byte 0
SixIsland_WaterPath_House1_EventScript_Beauty:: @ 817206D
SixIsland_WaterPath_House1_EventScript_Beauty::
lock
faceplayer
goto_if_questlog EventScript_ReleaseEnd
@@ -29,33 +29,33 @@ SixIsland_WaterPath_House1_EventScript_Beauty:: @ 817206D
release
end
SixIsland_WaterPath_House1_EventScript_NoHeracrossInParty:: @ 81720E5
SixIsland_WaterPath_House1_EventScript_NoHeracrossInParty::
msgbox SixIsland_WaterPath_House1_Text_LoveItNeedItHeracross
release
end
SixIsland_WaterPath_House1_EventScript_DontShowMon:: @ 81720EF
SixIsland_WaterPath_House1_EventScript_DontShowMon::
release
end
SixIsland_WaterPath_House1_EventScript_ShownNonHeracross:: @ 81720F1
SixIsland_WaterPath_House1_EventScript_ShownNonHeracross::
msgbox SixIsland_WaterPath_House1_Text_ThisWontDo
release
end
SixIsland_WaterPath_House1_EventScript_ShownSmallHeracross:: @ 81720FB
SixIsland_WaterPath_House1_EventScript_ShownSmallHeracross::
goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, SixIsland_WaterPath_House1_EventScript_ShownBigHeracross
msgbox SixIsland_WaterPath_House1_Text_ItsXInchesYInchesWasBiggest
release
end
SixIsland_WaterPath_House1_EventScript_ShownTiedHeracross:: @ 817210E
SixIsland_WaterPath_House1_EventScript_ShownTiedHeracross::
goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, SixIsland_WaterPath_House1_EventScript_ShownBigHeracross
msgbox SixIsland_WaterPath_House1_Text_ItsXInchesSameAsBefore
release
end
SixIsland_WaterPath_House1_EventScript_ShownBigHeracross:: @ 8172121
SixIsland_WaterPath_House1_EventScript_ShownBigHeracross::
setflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1
msgbox SixIsland_WaterPath_House1_Text_ItsXInchesDeserveReward
giveitem ITEM_NEST_BALL
@@ -65,19 +65,19 @@ SixIsland_WaterPath_House1_EventScript_ShownBigHeracross:: @ 8172121
release
end
SixIsland_WaterPath_House1_EventScript_NoRoomForNestBall:: @ 817214D
SixIsland_WaterPath_House1_EventScript_NoRoomForNestBall::
msgbox SixIsland_WaterPath_House1_Text_YourBagIsFull
release
end
SixIsland_WaterPath_House1_EventScript_SizeRecord:: @ 8172157
SixIsland_WaterPath_House1_EventScript_SizeRecord::
lockall
goto_if_set FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, SixIsland_WaterPath_House1_EventScript_SizeRecordNonEmpty
msgbox SixIsland_WaterPath_House1_Text_BlankChartOfSomeSort
releaseall
end
SixIsland_WaterPath_House1_EventScript_SizeRecordNonEmpty:: @ 817216B
SixIsland_WaterPath_House1_EventScript_SizeRecordNonEmpty::
special GetHeracrossSizeRecordInfo
msgbox SixIsland_WaterPath_House1_Text_BiggestHeracrossIsXInches
releaseall
+10 -10
View File
@@ -1,50 +1,50 @@
SixIsland_WaterPath_House1_Text_LoveItNeedItHeracross:: @ 81A49E9
SixIsland_WaterPath_House1_Text_LoveItNeedItHeracross::
.string "Hera, hera, HERACROSS!\n"
.string "Big and shiny, it's the bug boss!\l"
.string "Love it, need it, HERACROSS!$"
SixIsland_WaterPath_House1_Text_MayIMeasureHeracross:: @ 81A4A3F
SixIsland_WaterPath_House1_Text_MayIMeasureHeracross::
.string "Eeeeek!\n"
.string "That's a HERACROSS!\p"
.string "Please, please, may I measure how\n"
.string "big it is?$"
SixIsland_WaterPath_House1_Text_ItsXInchesDeserveReward:: @ 81A4A88
SixIsland_WaterPath_House1_Text_ItsXInchesDeserveReward::
.string "Eeeek, it's {STR_VAR_2} inches!\n"
.string "I've never seen anything like this!\l"
.string "You deserve a reward!$"
SixIsland_WaterPath_House1_Text_WantToSeeBiggerOne:: @ 81A4AD9
SixIsland_WaterPath_House1_Text_WantToSeeBiggerOne::
.string "I want to see a much, much bigger\n"
.string "HERACROSS than that one.\p"
.string "Oh, how I adore them, big\n"
.string "HERACROSS!$"
SixIsland_WaterPath_House1_Text_ItsXInchesSameAsBefore:: @ 81A4B39
SixIsland_WaterPath_House1_Text_ItsXInchesSameAsBefore::
.string "Huh? This {STR_VAR_2}-inch measurement…\n"
.string "Oh, boo! It's the same as before.$"
SixIsland_WaterPath_House1_Text_ItsXInchesYInchesWasBiggest:: @ 81A4B7A
SixIsland_WaterPath_House1_Text_ItsXInchesYInchesWasBiggest::
.string "Oh, it's just {STR_VAR_2} inches.\n"
.string "The HERACROSS before was bigger.\p"
.string "It was {STR_VAR_3} inches, the biggest\n"
.string "HERACROSS you've brought me.$"
SixIsland_WaterPath_House1_Text_ThisWontDo:: @ 81A4BEF
SixIsland_WaterPath_House1_Text_ThisWontDo::
.string "Oh, no! This won't do!\p"
.string "HERACROSS looks much more macho\n"
.string "and cool, and has a lovely horn!$"
SixIsland_WaterPath_House1_Text_YourBagIsFull:: @ 81A4C47
SixIsland_WaterPath_House1_Text_YourBagIsFull::
.string "Your BAG is full.\n"
.string "My reward won't fit.$"
SixIsland_WaterPath_House1_Text_BiggestHeracrossIsXInches:: @ 81A4C6E
SixIsland_WaterPath_House1_Text_BiggestHeracrossIsXInches::
.string "The biggest HERACROSS that I have\n"
.string "ever seen measured so far is:\p"
.string "{STR_VAR_3} inches!$"
SixIsland_WaterPath_House1_Text_BlankChartOfSomeSort:: @ 81A4CB9
SixIsland_WaterPath_House1_Text_BlankChartOfSomeSort::
.string "It's a blank chart of some sort.\p"
.string "It has spaces for writing in\n"
.string "records of some kind.$"