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

6
data/scripts/contest_hall.inc
View File

@@ -15,7 +15,7 @@ LilycoveCity_ContestLobby_EventScript_ReceptionWelcome:: @ 8279CEA
LilycoveCity_ContestLobby_EventScript_GivePokeblockCase:: @ 8279CF3
msgbox LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase, MSGBOX_DEFAULT
giveitem_std ITEM_POKEBLOCK_CASE
giveitem ITEM_POKEBLOCK_CASE
setflag FLAG_RECEIVED_POKEBLOCK_CASE
msgbox LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp, MSGBOX_DEFAULT
return
@@ -27,7 +27,7 @@ LilycoveCity_ContestLobby_EventScript_PickUpPrize:: @ 8279D13
end
LilycoveCity_ContestLobby_EventScript_GiveLuxuryBallAtCounter:: @ 8279D2C
giveitem_std ITEM_LUXURY_BALL
giveitem ITEM_LUXURY_BALL
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter
setvar VAR_CONTEST_PRIZE_PICKUP, 0
@@ -1236,7 +1236,7 @@ ContestHall_EventScript_NoRoomForLuxuryBall:: @ 827ACA8
return
ContestHall_EventScript_GiveLuxuryBall:: @ 827ACBD
giveitem_std ITEM_LUXURY_BALL
giveitem ITEM_LUXURY_BALL
compare VAR_RESULT, FALSE
goto_if_eq ContestHall_EventScript_NoRoomForLuxuryBall
lockall