diff options
Diffstat (limited to 'data/maps/TrainerHill_Entrance/scripts.inc')
| -rw-r--r-- | data/maps/TrainerHill_Entrance/scripts.inc | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index d86caad9c..f62be2f1a 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -21,7 +21,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 setvar VAR_0x8004, 9 special sp194_trainer_tower compare VAR_RESULT, 0 - goto_eq TrainerHill_Entrance_EventScript_2680FF + goto_if_eq TrainerHill_Entrance_EventScript_2680FF setobjectxy 255, 9, 6 applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F end @@ -30,7 +30,7 @@ TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF setvar VAR_0x8004, 16 special sp194_trainer_tower compare VAR_RESULT, 1 - goto_eq TrainerHill_Entrance_EventScript_26811A + goto_if_eq TrainerHill_Entrance_EventScript_26811A applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F end @@ -46,7 +46,7 @@ TrainerHill_Entrance_MapScript1_26811B: @ 826811B TrainerHill_Entrance_MapScript1_268128: @ 8268128 compare VAR_TEMP_D, 17 - call_if 1, TrainerHill_Entrance_EventScript_268134 + call_if_eq TrainerHill_Entrance_EventScript_268134 end TrainerHill_Entrance_EventScript_268134:: @ 8268134 @@ -117,7 +117,7 @@ TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD setvar VAR_0x8004, 10 special sp194_trainer_tower compare VAR_RESULT, 0 - goto_eq TrainerHill_Entrance_EventScript_26821F + goto_if_eq TrainerHill_Entrance_EventScript_26821F msgbox TrainerHill_Entrance_Text_2686F4, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_268227 @@ -131,17 +131,16 @@ TrainerHill_Entrance_EventScript_268227:: @ 8268227 TrainerHill_Entrance_EventScript_268229:: @ 8268229 lockall applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, TrainerHill_Entrance_EventScript_26836A + goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_26836A msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT setvar VAR_0x8004, 13 special sp194_trainer_tower compare VAR_RESULT, 0 - call_if 1, TrainerHill_Entrance_EventScript_26832E + call_if_eq TrainerHill_Entrance_EventScript_26832E setvar VAR_0x8004, 8 special sp194_trainer_tower compare VAR_RESULT, 1 - goto_eq TrainerHill_Entrance_EventScript_268275 + goto_if_eq TrainerHill_Entrance_EventScript_268275 msgbox TrainerHill_Entrance_Text_268564, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_26827D @@ -197,7 +196,7 @@ TrainerHill_Entrance_EventScript_26832E:: @ 826832E setvar VAR_TEMP_5, 1 call TrainerHill_Entrance_EventScript_27134F compare VAR_RESULT, 0 - goto_eq TrainerHill_Entrance_EventScript_26835C + goto_if_eq TrainerHill_Entrance_EventScript_26835C setvar VAR_0x8004, 14 special sp194_trainer_tower return @@ -242,8 +241,7 @@ TrainerHill_Entrance_EventScript_268388:: @ 8268388 end TrainerHill_Entrance_EventScript_268391:: @ 8268391 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, TrainerHill_Entrance_EventScript_2683A3 + goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_2683A3 msgbox TrainerHill_Entrance_Text_268D5A, MSGBOX_NPC end @@ -252,8 +250,7 @@ TrainerHill_Entrance_EventScript_2683A3:: @ 82683A3 end TrainerHill_Entrance_EventScript_2683AC:: @ 82683AC - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, TrainerHill_Entrance_EventScript_2683BE + goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_2683BE msgbox TrainerHill_Entrance_Text_268E6A, MSGBOX_NPC end @@ -266,8 +263,7 @@ TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7 faceplayer message gUnknown_08272A21 waitmessage - checkflag FLAG_SYS_GAME_CLEAR - goto_eq TrainerHill_Entrance_EventScript_268402 + goto_if_set FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_268402 pokemart TrainerHill_Entrance_Pokemart_2683E8 msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release |