diff options
Diffstat (limited to 'data/maps/PokemonTower_6F/scripts.inc')
| -rw-r--r-- | data/maps/PokemonTower_6F/scripts.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 1f889c052..8f4500615 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -6,15 +6,15 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8 textcolor 2 msgbox gUnknown_817A2F8 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE special ScrSpecial_StartMarowakBattle waitstate special sub_8112364 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1634F5 - applymovement 255, Movement_163512 + compare VAR_RESULT, 0 + goto_if_eq EventScript_1634F5 + applymovement OBJ_EVENT_ID_PLAYER, Movement_163512 waitmovement 0 releaseall end @@ -32,20 +32,20 @@ EventScript_1634F5:: @ 81634F5 end Movement_163512:: @ 8163512 - step_11 + walk_up step_end PokemonTower_6F_EventScript_163514:: @ 8163514 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_ANGELICA, 0, Text_17A243, Text_17A253 - msgbox gUnknown_817A25A, 6 + trainerbattle_single TRAINER_CHANNELER_ANGELICA, Text_17A243, Text_17A253 + msgbox gUnknown_817A25A, MSGBOX_AUTOCLOSE end PokemonTower_6F_EventScript_16352B:: @ 816352B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_EMILIA, 0, Text_17A272, Text_17A27F - msgbox gUnknown_817A293, 6 + trainerbattle_single TRAINER_CHANNELER_EMILIA, Text_17A272, Text_17A27F + msgbox gUnknown_817A293, MSGBOX_AUTOCLOSE end PokemonTower_6F_EventScript_163542:: @ 8163542 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_JENNIFER, 0, Text_17A2C8, Text_17A2DC - msgbox gUnknown_817A2E2, 6 + trainerbattle_single TRAINER_CHANNELER_JENNIFER, Text_17A2C8, Text_17A2DC + msgbox gUnknown_817A2E2, MSGBOX_AUTOCLOSE end |