dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
GriffinR
2020-01-13 20:41:57 -05:00
parent 655910a16f 736f3bbbe0
commit e92cc7752b
118 changed files with 605 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
+2 -2
View File
@@ -17,7 +17,7 @@ ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8237175
ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4:: @ 8237176
lockall
goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_ReceivedShoalSalt
giveitem_std ITEM_SHOAL_SALT
giveitem ITEM_SHOAL_SALT
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Small, 0
@@ -36,7 +36,7 @@ ShoalCave_LowTideLowerRoom_EventScript_BlackBelt:: @ 82371B2
faceplayer
goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_ReceivedFocusBand
msgbox ShoalCave_LowTideLowerRoom_Text_CanOvercomeColdWithFocus, MSGBOX_DEFAULT
giveitem_std ITEM_FOCUS_BAND
giveitem ITEM_FOCUS_BAND
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_FOCUS_BAND