summaryrefslogtreecommitdiff
path: root/data/maps/RustboroCity_Gym
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-04-23 17:20:34 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-04-23 17:59:25 -0400
commit71094356313801bf20191f3db1efa0decd3c3dcb (patch)
tree18c501d04a21f88c5f4d59f764883e326710ca39 /data/maps/RustboroCity_Gym
parent3bd2094141da60be175f237fa34889469f77f187 (diff)
Sync event macros
Diffstat (limited to 'data/maps/RustboroCity_Gym')
-rw-r--r--data/maps/RustboroCity_Gym/scripts.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc
index f1eb9d171..7c7f8a316 100644
--- a/data/maps/RustboroCity_Gym/scripts.inc
+++ b/data/maps/RustboroCity_Gym/scripts.inc
@@ -2,7 +2,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8
.byte 0
RustboroCity_Gym_EventScript_1578D9:: @ 81578D9
- trainerbattle 1, TRAINER_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE
+ trainerbattle_single TRAINER_ROXANNE, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE, NO_MUSIC
goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_15793C
msgbox RustboroCity_Gym_Text_184252, 4
release
@@ -25,7 +25,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE
end
RustboroCity_Gym_EventScript_15793C:: @ 815793C
- giveitem_std ITEM_TM39_ROCK_TOMB
+ giveitem ITEM_TM39_ROCK_TOMB
compare VAR_RESULT, 0
goto_if_eq RustboroCity_Gym_EventScript_1A029B
setflag FLAG_RECEIVED_TM39
@@ -34,12 +34,12 @@ RustboroCity_Gym_EventScript_15793C:: @ 815793C
end
RustboroCity_Gym_EventScript_157960:: @ 8157960
- trainerbattle 0, TRAINER_JOSH, 0, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD
+ trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD
msgbox RustboroCity_Gym_Text_183DF9, 6
end
RustboroCity_Gym_EventScript_157977:: @ 8157977
- trainerbattle 0, TRAINER_TOMMY, 0, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78
+ trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78
msgbox RustboroCity_Gym_Text_183E98, 6
end