diff options
Diffstat (limited to 'data/maps/CeruleanCave_B1F/scripts.inc')
| -rw-r--r-- | data/maps/CeruleanCave_B1F/scripts.inc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index c12eaff5a..ad68f84bc 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -4,30 +4,30 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE .byte 0 CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9 - checkflag FLAG_0x807 - call_if 1, EventScript_1624D3 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_1624D3 end EventScript_1624D3:: @ 81624D3 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7 - checkflag FLAG_0x2BC - call_if 0, EventScript_1624F1 + checkflag FLAG_FOUGHT_MEWTWO + call_if FALSE, EventScript_1624F1 end EventScript_1624F1:: @ 81624F1 - clearflag FLAG_0x081 + clearflag FLAG_HIDE_MEWTWO return CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -40,23 +40,23 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 playbgm MUS_EXEYE, 0 waitbuttonpress setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_162558 - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_162561 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_162561 - setflag FLAG_0x2BC + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_162558 + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_162561 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_162561 + setflag FLAG_FOUGHT_MEWTWO release end EventScript_162558:: @ 8162558 - setflag FLAG_0x2BC + setflag FLAG_FOUGHT_MEWTWO goto EventScript_1A922D EventScript_162560:: @ 8162560 |