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
@@ -38,7 +38,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_SmallSeedot:: @ 8227286
SootopolisCity_LotadAndSeedotHouse_EventScript_BigSeedot:: @ 8227290
msgbox SootopolisCity_LotadAndSeedotHouse_Text_GoshMightBeBiggerThanLotad, MSGBOX_DEFAULT
giveitem_std ITEM_ELIXIR
giveitem ITEM_ELIXIR
compare VAR_RESULT, FALSE
goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir1
closemessage
@@ -87,7 +87,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_SmallLotad:: @ 8227317
SootopolisCity_LotadAndSeedotHouse_EventScript_BigLotad:: @ 8227321
msgbox SootopolisCity_LotadAndSeedotHouse_Text_WowMightBeBiggerThanSeedot, MSGBOX_DEFAULT
giveitem_std ITEM_ELIXIR
giveitem ITEM_ELIXIR
compare VAR_RESULT, FALSE
goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir2
closemessage