diff options
| author | huderlem <huderlem@gmail.com> | 2020-01-13 19:33:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 19:33:47 -0600 |
| commit | 6d6c57f3832c14aadd07b9d39c658c838fcd42cf (patch) | |
| tree | eb87fc3634991f5ce401b25dfca9968ee5c36f69 /data/scripts/contest_hall.inc | |
| parent | fa5816915d2a089549bfae3851c36336eae35d43 (diff) | |
| parent | 96720db08319d8f69d7864e186722d13dc9ceb05 (diff) | |
Merge pull request #953 from GriffinRichards/sync-script
Port some macro/script fixes from pokefirered
Diffstat (limited to 'data/scripts/contest_hall.inc')
| -rw-r--r-- | data/scripts/contest_hall.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index cabf923b6..9775c40dc 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -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 |