Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj

This commit is contained in:
GriffinR
2020-01-13 20:41:57 -05:00
118 changed files with 605 additions and 638 deletions
+2 -2
View File
@@ -88,7 +88,7 @@ PetalburgWoods_EventScript_DevonResearcherPostBattle:: @ 822E138
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox PetalburgWoods_Text_ThatWasAwfullyClose, MSGBOX_DEFAULT
giveitem_std ITEM_GREAT_BALL
giveitem ITEM_GREAT_BALL
compare VAR_RESULT, 0
goto_if_eq PetalburgWoods_EventScript_BagFull
goto PetalburgWoods_EventScript_DevonResearcherFinish
@@ -251,7 +251,7 @@ PetalburgWoods_EventScript_Girl:: @ 822E222
faceplayer
goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_ExplainMiracleSeed
msgbox PetalburgWoods_Text_TryUsingThisItem, MSGBOX_DEFAULT
giveitem_std ITEM_MIRACLE_SEED
giveitem ITEM_MIRACLE_SEED
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_MIRACLE_SEED