summaryrefslogtreecommitdiff
path: root/data/maps/MtEmber_Summit
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-10-20 21:24:16 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2019-10-20 21:24:16 -0400
commit9aa5709329f4cbd497d0f21af10218f8a7547151 (patch)
treecfab322854a597cbbe794ed6260303d29d167f87 /data/maps/MtEmber_Summit
parent6b503e306d73c749794cf7b61126287e3941f12f (diff)
use TRUE and FALSE for flag conditionals; more story flags
Diffstat (limited to 'data/maps/MtEmber_Summit')
-rw-r--r--data/maps/MtEmber_Summit/scripts.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc
index 90816ad4a..2efadb01f 100644
--- a/data/maps/MtEmber_Summit/scripts.inc
+++ b/data/maps/MtEmber_Summit/scripts.inc
@@ -4,8 +4,8 @@ MtEmber_Summit_MapScripts:: @ 8163AFC
.byte 0
MtEmber_Summit_MapScript2_163B07:: @ 8163B07
- checkflag FLAG_0x807
- call_if eq, EventScript_163B11
+ checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
+ call_if TRUE, EventScript_163B11
end
EventScript_163B11:: @ 8163B11
@@ -17,7 +17,7 @@ EventScript_163B11:: @ 8163B11
MtEmber_Summit_MapScript1_163B25:: @ 8163B25
checkflag FLAG_0x2BD
- call_if lt, EventScript_163B2F
+ call_if FALSE, EventScript_163B2F
end
EventScript_163B2F:: @ 8163B2F
@@ -27,7 +27,7 @@ EventScript_163B2F:: @ 8163B2F
MtEmber_Summit_EventScript_163B33:: @ 8163B33
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
faceplayer
@@ -40,17 +40,17 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
delay 10
playbgm MUS_EXEYE, 0
waitbuttonpress
- setflag FLAG_0x807
+ setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_807F9D8
waitstate
- clearflag FLAG_0x807
+ clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 1
- goto_if_eq EventScript_163B96
+ goto_if eq, EventScript_163B96
compare_var_to_value VAR_RESULT, 4
- goto_if_eq EventScript_163B9F
+ goto_if eq, EventScript_163B9F
compare_var_to_value VAR_RESULT, 5
- goto_if_eq EventScript_163B9F
+ goto_if eq, EventScript_163B9F
setflag FLAG_0x2BD
release
end