summaryrefslogtreecommitdiff
path: root/data/maps/RustboroCity_Gym/scripts.inc
diff options
context:
space:
mode:
authorTetrable <atifhuss386@gmail.com>2019-01-02 21:12:43 +0000
committerTetrable <atifhuss386@gmail.com>2019-01-02 21:12:43 +0000
commit1e3da62d24ad91e4d69ac6974476fd5ea47cae9b (patch)
tree806828b7a2be77e7afc2017b34cef7f5c35324d0 /data/maps/RustboroCity_Gym/scripts.inc
parent2dd706ca5410d98ad214ceff7026d6db276f4d5a (diff)
Finish off labelling flags
Diffstat (limited to 'data/maps/RustboroCity_Gym/scripts.inc')
-rw-r--r--data/maps/RustboroCity_Gym/scripts.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc
index 170ae4324..4581707ce 100644
--- a/data/maps/RustboroCity_Gym/scripts.inc
+++ b/data/maps/RustboroCity_Gym/scripts.inc
@@ -6,7 +6,7 @@ RustboroCity_Gym_EventScript_212F31:: @ 8212F31
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq RustboroCity_Gym_EventScript_212FC8
- goto_if_unset FLAG_0x0A5, RustboroCity_Gym_EventScript_212FA4
+ goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_212FA4
msgbox RustboroCity_Gym_Text_2139A7, MSGBOX_DEFAULT
release
end
@@ -16,7 +16,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66
waitmessage
call RustboroCity_Gym_EventScript_27207E
msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT
- setflag FLAG_0x4F0
+ setflag FLAG_DEFEATED_RUSTBORO_GYM
setflag FLAG_BADGE01_GET
setvar VAR_0x405A, 1
addvar VAR_0x4085, 1
@@ -31,7 +31,7 @@ RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4
giveitem_std ITEM_TM39
compare VAR_RESULT, 0
goto_if_eq RustboroCity_Gym_EventScript_272054
- setflag FLAG_0x0A5
+ setflag FLAG_RECEIVED_TM39
msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT
release
end
@@ -59,7 +59,7 @@ RustboroCity_Gym_EventScript_213011:: @ 8213011
RustboroCity_Gym_EventScript_213028:: @ 8213028
lock
faceplayer
- goto_if_set FLAG_0x4F0, RustboroCity_Gym_EventScript_21303D
+ goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_21303D
msgbox RustboroCity_Gym_Text_21309D, MSGBOX_DEFAULT
release
end
@@ -101,8 +101,8 @@ RustboroCity_Gym_EventScript_21307B:: @ 821307B
waitfanfare
closemessage
delay 30
- setflag FLAG_0x1D3
- clearflag FLAG_0x080
+ setflag FLAG_ENABLE_ROXANNE_MATCH_CALL
+ clearflag FLAG_ENABLE_ROXANNE_FIRST_CALL
releaseall
end