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/SixIsland_WaterPath_House1/scripts.inc
+7 -14
View File
@@ -8,24 +8,18 @@ SixIsland_WaterPath_House1_EventScript_Beauty::
special QuestLog_CutRecording
setvar VAR_0x8004, SPECIES_HERACROSS
specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
compare VAR_RESULT, FALSE
goto_if_eq SixIsland_WaterPath_House1_EventScript_NoHeracrossInParty
goto_if_eq VAR_RESULT, FALSE, SixIsland_WaterPath_House1_EventScript_NoHeracrossInParty
special GetHeracrossSizeRecordInfo
msgbox SixIsland_WaterPath_House1_Text_MayIMeasureHeracross
special ChoosePartyMon
waitstate
copyvar VAR_RESULT, VAR_0x8004
compare VAR_RESULT, PARTY_SIZE
goto_if_ge SixIsland_WaterPath_House1_EventScript_DontShowMon
goto_if_ge VAR_RESULT, PARTY_SIZE, SixIsland_WaterPath_House1_EventScript_DontShowMon
special CompareHeracrossSize
compare VAR_RESULT, 1
goto_if_eq SixIsland_WaterPath_House1_EventScript_ShownNonHeracross
compare VAR_RESULT, 2
goto_if_eq SixIsland_WaterPath_House1_EventScript_ShownSmallHeracross
compare VAR_RESULT, 3
goto_if_eq SixIsland_WaterPath_House1_EventScript_ShownBigHeracross
compare VAR_RESULT, 4
goto_if_eq SixIsland_WaterPath_House1_EventScript_ShownTiedHeracross
goto_if_eq VAR_RESULT, 1, SixIsland_WaterPath_House1_EventScript_ShownNonHeracross
goto_if_eq VAR_RESULT, 2, SixIsland_WaterPath_House1_EventScript_ShownSmallHeracross
goto_if_eq VAR_RESULT, 3, SixIsland_WaterPath_House1_EventScript_ShownBigHeracross
goto_if_eq VAR_RESULT, 4, SixIsland_WaterPath_House1_EventScript_ShownTiedHeracross
release
end
@@ -59,8 +53,7 @@ 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
compare VAR_RESULT, FALSE
goto_if_eq SixIsland_WaterPath_House1_EventScript_NoRoomForNestBall
goto_if_eq VAR_RESULT, FALSE, SixIsland_WaterPath_House1_EventScript_NoRoomForNestBall
msgbox SixIsland_WaterPath_House1_Text_WantToSeeBiggerOne
release
end