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

View File

@@ -45,7 +45,7 @@ BerryTree_EventScript_ChooseBerryToPlant:: @ 8274393
waitstate
compare VAR_ITEM_ID, 0
goto_if_eq BerryTree_EventScript_CancelPlanting
takeitem VAR_ITEM_ID, 1
removeitem VAR_ITEM_ID
call BerryTree_EventScript_PlantBerry
BerryTree_EventScript_CancelPlanting:: @ 82743AF