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 authored and GitHub committed 2022-08-17 15:41:50 -04:00
2 parents 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 files changed
+12564 -12748
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/maps/VermilionCity_House1/scripts.inc
+3 -5
View File
@@ -6,8 +6,7 @@ VermilionCity_House1_EventScript_FishingGuru::
faceplayer
goto_if_set FLAG_GOT_OLD_ROD, VermilionCity_House1_EventScript_AlreadyGotOldRod
msgbox VermilionCity_House1_Text_ImFishingGuruDoYouLikeToFish, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq VermilionCity_House1_EventScript_GiveOldRod
goto_if_eq VAR_RESULT, YES, VermilionCity_House1_EventScript_GiveOldRod
msgbox VermilionCity_House1_Text_OhThatsSoDisappointing
release
end
@@ -18,9 +17,8 @@ VermilionCity_House1_EventScript_AlreadyGotOldRod::
end
VermilionCity_House1_EventScript_GiveOldRod::
checkitemspace ITEM_OLD_ROD, 1
compare VAR_RESULT, FALSE
goto_if_eq VermilionCity_House1_EventScript_NoRoomForOldRod
checkitemspace ITEM_OLD_ROD
goto_if_eq VAR_RESULT, FALSE, VermilionCity_House1_EventScript_NoRoomForOldRod
additem ITEM_OLD_ROD
msgbox VermilionCity_House1_Text_TakeThisAndFish
msgreceiveditem VermilionCity_House1_Text_ReceivedOldRodFromFishingGuru, ITEM_OLD_ROD