Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion

This commit is contained in:
ExpoSeed
2020-10-04 02:30:48 -05:00
604 changed files with 13773 additions and 1690 deletions

View File

@@ -127,7 +127,7 @@ Route115_EventScript_ItemPPUp:: @ 8290E6B
end
Route116_EventScript_ItemXSpecial:: @ 8290E78
finditem ITEM_X_SPECIAL
finditem ITEM_X_SP_ATK
end
Route116_EventScript_ItemEther:: @ 8290E85
@@ -315,7 +315,7 @@ MauvilleCity_EventScript_ItemXSpeed:: @ 82910CE
end
RustboroCity_EventScript_ItemXDefend:: @ 82910DB
finditem ITEM_X_DEFEND
finditem ITEM_X_DEFENSE
end
LilycoveCity_EventScript_ItemMaxRepel:: @ 82910E8