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
@@ -18,7 +18,7 @@ FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite:: @ 8200F38
compare VAR_RESULT, NO
goto_if_eq FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite
msgbox FallarborTown_CozmosHouse_Text_PleaseUseThisTM, MSGBOX_DEFAULT
giveitem_std ITEM_TM27
giveitem ITEM_TM27
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
setvar VAR_0x8004, ITEM_METEORITE