summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2018-11-27 13:31:07 -0500
committergarak <garakmon@gmail.com>2018-11-27 13:31:07 -0500
commit50f00b0827a4952a12f90009bd992f23c80a56af (patch)
tree6a5f78b04b42c162ed95cfc66c91a8b24f4051b2 /data/scripts
parentf02cb667bbddf4f4a1152c86cbf9616468e7f0d2 (diff)
parentc909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff)
Merge remote-tracking branch 'upstream/master' into fldeff
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/contest_hall.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index afd2ca851..48c5d8d01 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -388,7 +388,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2
releaseall
addvar VAR_0x8006, 65535
playse SE_BOWA2
- special sub_80F8D28
+ special ShowContestEntryMonPic
call LinkContestRoom1_EventScript_27A217
return
@@ -517,7 +517,7 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F
LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5
setvar VAR_RESULT, 8
- special sub_80F8FE8
+ special ScriptRandom
compare VAR_RESULT, 0
call_if 1, LinkContestRoom1_EventScript_27A65A
compare VAR_RESULT, 1