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/FuchsiaCity_House2/scripts.inc
+3 -5
View File
@@ -6,8 +6,7 @@ FuchsiaCity_House2_EventScript_FishingGurusBrother::
faceplayer
goto_if_set FLAG_GOT_GOOD_ROD, FuchsiaCity_House2_EventScript_AlreadyGotGoodRod
msgbox FuchsiaCity_House2_Text_DoYouLikeToFish, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq FuchsiaCity_House2_EventScript_GiveGoodRod
goto_if_eq VAR_RESULT, YES, FuchsiaCity_House2_EventScript_GiveGoodRod
msgbox FuchsiaCity_House2_Text_OhThatsDisappointing
release
end
@@ -19,9 +18,8 @@ FuchsiaCity_House2_EventScript_AlreadyGotGoodRod::
FuchsiaCity_House2_EventScript_GiveGoodRod::
msgbox FuchsiaCity_House2_Text_LikeYourStyleTakeThis
checkitemspace ITEM_GOOD_ROD, 1
compare VAR_RESULT, FALSE
goto_if_eq FuchsiaCity_House2_EventScript_NoRoomForGoodRod
checkitemspace ITEM_GOOD_ROD
goto_if_eq VAR_RESULT, FALSE, FuchsiaCity_House2_EventScript_NoRoomForGoodRod
giveitem_msg FuchsiaCity_House2_Text_ReceivedGoodRod, ITEM_GOOD_ROD
msgbox FuchsiaCity_House2_Text_GoodRodCanCatchBetterMons
setflag FLAG_GOT_GOOD_ROD