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

This commit is contained in:
GriffinR committed 2020-01-13 20:41:57 -05:00
commit e92cc7752b
118 files changed
+605 -638

No files matched your search

@@ -258,8 +258,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard:: @ 8270EC0
end
Route124_DivingTreasureHuntersHouse_EventScript_TradeShard:: @ 8270F01
takeitem VAR_0x8008, 1
giveitem_std VAR_0x8009
removeitem VAR_0x8008
giveitem VAR_0x8009
msgbox Route124_DivingTreasureHuntersHouse_Text_ItsADeal, MSGBOX_DEFAULT
call Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards
compare VAR_TEMP_1, 0