diff options
Diffstat (limited to 'data/maps/CinnabarIsland_Gym/scripts.inc')
| -rw-r--r-- | data/maps/CinnabarIsland_Gym/scripts.inc | 347 |
1 files changed, 156 insertions, 191 deletions
diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 9e67b156d..15496a023 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -1,22 +1,15 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B - map_script 1, CinnabarIsland_Gym_MapScript1_16D951 + map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_Gym_OnLoad .byte 0 -CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951 - checkflag FLAG_DEFEATED_BLAINE - goto_if TRUE, EventScript_16D991 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - call_if TRUE, EventScript_16D9B0 - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - call_if TRUE, EventScript_16D9B6 - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - call_if TRUE, EventScript_16D9BC - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - call_if TRUE, EventScript_16D9C2 - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - call_if TRUE, EventScript_16D9C8 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - call_if TRUE, EventScript_16D9CE +CinnabarIsland_Gym_OnLoad:: @ 816D951 + goto_if_set FLAG_DEFEATED_BLAINE, EventScript_16D991 + call_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16D9B0 + call_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16D9B6 + call_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16D9BC + call_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16D9C2 + call_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16D9C8 + call_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16D9CE end EventScript_16D991:: @ 816D991 @@ -54,9 +47,8 @@ EventScript_16D9CE:: @ 816D9CE CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4 famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06 - checkflag FLAG_GOT_TM38_FROM_BLAINE - goto_if FALSE, EventScript_16DA34 + trainerbattle_single TRAINER_LEADER_BLAINE, Text_199543, Text_1995FA, EventScript_16DA06, NO_MUSIC + goto_if_unset FLAG_GOT_TM38_FROM_BLAINE, EventScript_16DA34 msgbox gUnknown_819971D release end @@ -75,10 +67,9 @@ EventScript_16DA06:: @ 816DA06 EventScript_16DA34:: @ 816DA34 msgbox gUnknown_819969E checkitemspace ITEM_TM38, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16DA75 - additem ITEM_TM38, 1 - giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16DA75 + giveitem_msg gUnknown_81996FF, ITEM_TM38 setflag FLAG_GOT_TM38_FROM_BLAINE msgbox gUnknown_8199652 release @@ -90,18 +81,17 @@ EventScript_16DA75:: @ 816DA75 end CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SUPER_NERD_ERIK, 0, Text_1997A5, Text_1997D6 - msgbox gUnknown_81997EA, 6 + trainerbattle_single TRAINER_SUPER_NERD_ERIK, Text_1997A5, Text_1997D6 + msgbox gUnknown_81997EA, MSGBOX_AUTOCLOSE end CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_AVERY, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1 - msgbox gUnknown_8199911, 6 + trainerbattle_single TRAINER_SUPER_NERD_AVERY, Text_1998BD, Text_1998ED, EventScript_16DAB1 + msgbox gUnknown_8199911, MSGBOX_AUTOCLOSE end EventScript_16DAB1:: @ 816DAB1 - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - call_if FALSE, EventScript_16DABC + call_if_unset FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DABC release end @@ -110,14 +100,13 @@ EventScript_16DABC:: @ 816DABC return CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_DEREK, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA + trainerbattle_single TRAINER_SUPER_NERD_DEREK, Text_1999B7, Text_1999DB, EventScript_16DAEA famechecker FAMECHECKER_BLAINE, 2 - msgbox gUnknown_81999DF, 6 + msgbox gUnknown_81999DF, MSGBOX_AUTOCLOSE end EventScript_16DAEA:: @ 816DAEA - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - call_if FALSE, EventScript_16DAF5 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DAF5 release end @@ -126,13 +115,12 @@ EventScript_16DAF5:: @ 816DAF5 return CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SUPER_NERD_ZAC, 0, Text_199AFC, Text_199B16, EventScript_16DB16 - msgbox gUnknown_8199B27, 6 + trainerbattle_single TRAINER_SUPER_NERD_ZAC, Text_199AFC, Text_199B16, EventScript_16DB16 + msgbox gUnknown_8199B27, MSGBOX_AUTOCLOSE end EventScript_16DB16:: @ 816DB16 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - call_if FALSE, EventScript_16DB21 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DB21 release end @@ -141,13 +129,12 @@ EventScript_16DB21:: @ 816DB21 return CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_QUINN, 0, Text_19983F, Text_199870, EventScript_16DB42 - msgbox gUnknown_819987D, 6 + trainerbattle_single TRAINER_BURGLAR_QUINN, Text_19983F, Text_199870, EventScript_16DB42 + msgbox gUnknown_819987D, MSGBOX_AUTOCLOSE end EventScript_16DB42:: @ 816DB42 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - call_if FALSE, EventScript_16DB4D + call_if_unset FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DB4D release end @@ -156,13 +143,12 @@ EventScript_16DB4D:: @ 816DB4D return CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_RAMON, 0, Text_199948, Text_199973, EventScript_16DB6E - msgbox gUnknown_8199986, 6 + trainerbattle_single TRAINER_BURGLAR_RAMON, Text_199948, Text_199973, EventScript_16DB6E + msgbox gUnknown_8199986, MSGBOX_AUTOCLOSE end EventScript_16DB6E:: @ 816DB6E - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - call_if FALSE, EventScript_16DB79 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DB79 release end @@ -171,13 +157,12 @@ EventScript_16DB79:: @ 816DB79 return CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_BURGLAR_DUSTY, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A - msgbox gUnknown_8199AC9, 6 + trainerbattle_single TRAINER_BURGLAR_DUSTY, Text_199A7F, Text_199AB9, EventScript_16DB9A + msgbox gUnknown_8199AC9, MSGBOX_AUTOCLOSE end EventScript_16DB9A:: @ 816DB9A - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - call_if FALSE, EventScript_16DBA5 + call_if_unset FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DBA5 release end @@ -188,8 +173,7 @@ EventScript_16DBA5:: @ 816DBA5 CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB lock faceplayer - checkflag FLAG_DEFEATED_BLAINE - goto_if TRUE, EventScript_16DBC0 + goto_if_set FLAG_DEFEATED_BLAINE, EventScript_16DBC0 msgbox gUnknown_8199B81 release end @@ -201,8 +185,7 @@ EventScript_16DBC0:: @ 816DBC0 CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA lockall - checkflag FLAG_BADGE07_GET - goto_if TRUE, EventScript_16DBDE + goto_if_set FLAG_BADGE07_GET, EventScript_16DBDE msgbox gUnknown_8199C29 releaseall end @@ -214,23 +197,23 @@ EventScript_16DBDE:: @ 816DBDE CinnabarIsland_Gym_EventScript_16DBE8:: @ 816DBE8 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DC00 end CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DC00 end EventScript_16DC00:: @ 816DC00 msgbox gUnknown_8199C9F msgbox gUnknown_8199D5A, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16DC43 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16DC6A + compare VAR_RESULT, YES + goto_if_eq EventScript_16DC43 + compare VAR_RESULT, NO + goto_if_eq EventScript_16DC6A end EventScript_16DC27:: @ 816DC27 @@ -249,8 +232,7 @@ EventScript_16DC34:: @ 816DC34 EventScript_16DC43:: @ 816DC43 call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DC68 call EventScript_16DC58 releaseall end @@ -269,71 +251,68 @@ EventScript_16DC68:: @ 816DC68 EventScript_16DC6A:: @ 816DC6A call EventScript_16DC34 - checktrainerflag TRAINER_BURGLAR_QUINN - goto_if lt, EventScript_16DC7A + goto_if_undefeated TRAINER_BURGLAR_QUINN, EventScript_16DC7A releaseall end EventScript_16DC7A:: @ 816DC7A - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16DCB4 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16DCC6 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16DCB4 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16DCC6 textcolor 0 msgbox gUnknown_819983F - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_QUINN, 0, Text_199870 - checkflag FLAG_CINNABAR_GYM_QUIZ_1 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_BURGLAR_QUINN, Text_199870 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, EventScript_16DC68 call EventScript_16DC58 releaseall end EventScript_16DCB4:: @ 816DCB4 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 1, Movement_16DCD8 waitmovement 0 return EventScript_16DCC6:: @ 816DCC6 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 1, Movement_16DCDB waitmovement 0 return Movement_16DCD8:: @ 816DCD8 - step_12 - step_12 + walk_left + walk_left step_end Movement_16DCDB:: @ 816DCDB - step_12 + walk_left step_end CinnabarIsland_Gym_EventScript_16DCDD:: @ 816DCDD lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DCF5 end CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DCF5 end EventScript_16DCF5:: @ 816DCF5 msgbox gUnknown_8199C9F msgbox gUnknown_8199D79, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16DD41 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16DD1C + compare VAR_RESULT, YES + goto_if_eq EventScript_16DD41 + compare VAR_RESULT, NO + goto_if_eq EventScript_16DD1C end EventScript_16DD1C:: @ 816DD1C call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DC68 call EventScript_16DD31 releaseall end @@ -348,80 +327,77 @@ EventScript_16DD31:: @ 816DD31 EventScript_16DD41:: @ 816DD41 call EventScript_16DC34 - checktrainerflag TRAINER_SUPER_NERD_AVERY - goto_if lt, EventScript_16DD51 + goto_if_undefeated TRAINER_SUPER_NERD_AVERY, EventScript_16DD51 releaseall end EventScript_16DD51:: @ 816DD51 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16DD8B - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16DD9D + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16DD8B + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16DD9D textcolor 0 msgbox gUnknown_81998BD - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED - checkflag FLAG_CINNABAR_GYM_QUIZ_2 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_SUPER_NERD_AVERY, Text_1998ED + goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, EventScript_16DC68 call EventScript_16DD31 releaseall end EventScript_16DD8B:: @ 816DD8B - applymovement 255, Movement_16DDB7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16DDB7 applymovement 3, Movement_16DDAF waitmovement 0 return EventScript_16DD9D:: @ 816DD9D - applymovement 255, Movement_16DDB7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_16DDB7 applymovement 3, Movement_16DDB3 waitmovement 0 return Movement_16DDAF:: @ 816DDAF - step_11 - step_11 - step_12 + walk_up + walk_up + walk_left step_end Movement_16DDB3:: @ 816DDB3 - step_11 - step_11 - step_2f + walk_up + walk_up + walk_in_place_fastest_left step_end Movement_16DDB7:: @ 816DDB7 - step_1c - step_1c - step_30 + delay_16 + delay_16 + walk_in_place_fastest_right step_end CinnabarIsland_Gym_EventScript_16DDBB:: @ 816DDBB lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DDD3 end CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DDD3 end EventScript_16DDD3:: @ 816DDD3 msgbox gUnknown_8199C9F msgbox gUnknown_8199DA9, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16DE1F - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16DDFA + compare VAR_RESULT, YES + goto_if_eq EventScript_16DE1F + compare VAR_RESULT, NO + goto_if_eq EventScript_16DDFA end EventScript_16DDFA:: @ 816DDFA call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DC68 call EventScript_16DE0F releaseall end @@ -436,71 +412,68 @@ EventScript_16DE0F:: @ 816DE0F EventScript_16DE1F:: @ 816DE1F call EventScript_16DC34 - checktrainerflag TRAINER_BURGLAR_RAMON - goto_if lt, EventScript_16DE2F + goto_if_undefeated TRAINER_BURGLAR_RAMON, EventScript_16DE2F releaseall end EventScript_16DE2F:: @ 816DE2F - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16DE69 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16DE7B + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16DE69 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16DE7B textcolor 0 msgbox gUnknown_8199948 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_RAMON, 0, Text_199973 - checkflag FLAG_CINNABAR_GYM_QUIZ_3 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_BURGLAR_RAMON, Text_199973 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, EventScript_16DC68 call EventScript_16DE0F releaseall end EventScript_16DE69:: @ 816DE69 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 4, Movement_16DE8D waitmovement 0 return EventScript_16DE7B:: @ 816DE7B - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 4, Movement_16DE90 waitmovement 0 return Movement_16DE8D:: @ 816DE8D - step_12 - step_12 + walk_left + walk_left step_end Movement_16DE90:: @ 816DE90 - step_12 + walk_left step_end CinnabarIsland_Gym_EventScript_16DE92:: @ 816DE92 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DEAA end CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DEAA end EventScript_16DEAA:: @ 816DEAA msgbox gUnknown_8199C9F msgbox gUnknown_8199DC6, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16DEF6 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16DED1 + compare VAR_RESULT, YES + goto_if_eq EventScript_16DEF6 + compare VAR_RESULT, NO + goto_if_eq EventScript_16DED1 end EventScript_16DED1:: @ 816DED1 call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DC68 call EventScript_16DEE6 releaseall end @@ -515,71 +488,68 @@ EventScript_16DEE6:: @ 816DEE6 EventScript_16DEF6:: @ 816DEF6 call EventScript_16DC34 - checktrainerflag TRAINER_SUPER_NERD_DEREK - goto_if lt, EventScript_16DF06 + goto_if_undefeated TRAINER_SUPER_NERD_DEREK, EventScript_16DF06 releaseall end EventScript_16DF06:: @ 816DF06 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16DF40 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16DF52 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16DF40 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16DF52 textcolor 0 msgbox gUnknown_81999B7 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB - checkflag FLAG_CINNABAR_GYM_QUIZ_4 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_SUPER_NERD_DEREK, Text_1999DB + goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, EventScript_16DC68 call EventScript_16DEE6 releaseall end EventScript_16DF40:: @ 816DF40 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 5, Movement_16DF64 waitmovement 0 return EventScript_16DF52:: @ 816DF52 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 5, Movement_16DF67 waitmovement 0 return Movement_16DF64:: @ 816DF64 - step_12 - step_12 + walk_left + walk_left step_end Movement_16DF67:: @ 816DF67 - step_12 + walk_left step_end CinnabarIsland_Gym_EventScript_16DF69:: @ 816DF69 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16DF81 end CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16DF81 end EventScript_16DF81:: @ 816DF81 msgbox gUnknown_8199C9F msgbox gUnknown_8199E00, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16DFA8 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16DFCD + compare VAR_RESULT, YES + goto_if_eq EventScript_16DFA8 + compare VAR_RESULT, NO + goto_if_eq EventScript_16DFCD end EventScript_16DFA8:: @ 816DFA8 call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DC68 call EventScript_16DFBD releaseall end @@ -594,71 +564,68 @@ EventScript_16DFBD:: @ 816DFBD EventScript_16DFCD:: @ 816DFCD call EventScript_16DC34 - checktrainerflag TRAINER_BURGLAR_DUSTY - goto_if lt, EventScript_16DFDD + goto_if_undefeated TRAINER_BURGLAR_DUSTY, EventScript_16DFDD releaseall end EventScript_16DFDD:: @ 816DFDD - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16E017 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16E029 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16E017 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16E029 textcolor 0 msgbox gUnknown_8199A7F - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9 - checkflag FLAG_CINNABAR_GYM_QUIZ_5 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_BURGLAR_DUSTY, Text_199AB9 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, EventScript_16DC68 call EventScript_16DFBD releaseall end EventScript_16E017:: @ 816E017 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 6, Movement_16E03B waitmovement 0 return EventScript_16E029:: @ 816E029 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 6, Movement_16E03E waitmovement 0 return Movement_16E03B:: @ 816E03B - step_12 - step_12 + walk_left + walk_left step_end Movement_16E03E:: @ 816E03E - step_12 + walk_left step_end CinnabarIsland_Gym_EventScript_16E040:: @ 816E040 lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_16E058 end CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_16E058 end EventScript_16E058:: @ 816E058 msgbox gUnknown_8199C9F msgbox gUnknown_8199E36, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16E0A4 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16E07F + compare VAR_RESULT, YES + goto_if_eq EventScript_16E0A4 + compare VAR_RESULT, NO + goto_if_eq EventScript_16E07F end EventScript_16E07F:: @ 816E07F call EventScript_16DC27 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - goto_if TRUE, EventScript_16DC68 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DC68 call EventScript_16E094 releaseall end @@ -673,44 +640,42 @@ EventScript_16E094:: @ 816E094 EventScript_16E0A4:: @ 816E0A4 call EventScript_16DC34 - checktrainerflag TRAINER_SUPER_NERD_ZAC - goto_if lt, EventScript_16E0B4 + goto_if_undefeated TRAINER_SUPER_NERD_ZAC, EventScript_16E0B4 releaseall end EventScript_16E0B4:: @ 816E0B4 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16E0EE - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16E100 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16E0EE + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16E100 textcolor 0 msgbox gUnknown_8199AFC - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16 - checkflag FLAG_CINNABAR_GYM_QUIZ_6 - goto_if TRUE, EventScript_16DC68 + trainerbattle_no_intro TRAINER_SUPER_NERD_ZAC, Text_199B16 + goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, EventScript_16DC68 call EventScript_16E094 releaseall end EventScript_16E0EE:: @ 816E0EE - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 7, Movement_16E112 waitmovement 0 return EventScript_16E100:: @ 816E100 - applymovement 255, Movement_1A75EB + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement 7, Movement_16E115 waitmovement 0 return Movement_16E112:: @ 816E112 - step_12 - step_12 + walk_left + walk_left step_end Movement_16E115:: @ 816E115 - step_12 + walk_left step_end EventScript_16E117:: @ 816E117 |