diff options
Diffstat (limited to 'data/maps/SeafoamIslands_B4F/scripts.inc')
| -rw-r--r-- | data/maps/SeafoamIslands_B4F/scripts.inc | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index c0bcc1196..3b618448c 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -7,38 +7,38 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E .byte 0 SeafoamIslands_B4F_MapScript2_163048:: @ 8163048 - checkflag FLAG_0x807 - call_if 1, EventScript_163052 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_163052 end EventScript_163052:: @ 8163052 - 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 SeafoamIslands_B4F_MapScript1_163066:: @ 8163066 - checkflag FLAG_0x2BE - call_if 0, EventScript_1630AD - checkflag FLAG_0x2D3 - call_if 0, EventScript_163082 - checkflag FLAG_0x2D3 - call_if 1, EventScript_1630A9 + checkflag FLAG_FOUGHT_ARTICUNO + call_if FALSE, EventScript_1630AD + checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT + call_if FALSE, EventScript_163082 + checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT + call_if TRUE, EventScript_1630A9 end EventScript_163082:: @ 8163082 setvar VAR_0x4002, 0 - checkflag FLAG_0x04C - call_if 0, EventScript_163169 - checkflag FLAG_0x04D - call_if 0, EventScript_163169 + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 + call_if FALSE, EventScript_163169 + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 + call_if FALSE, EventScript_163169 compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_1630A5 + call_if eq, EventScript_1630A5 return EventScript_1630A5:: @ 81630A5 - setflag FLAG_0x2D3 + setflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT return EventScript_1630A9:: @ 81630A9 @@ -46,17 +46,17 @@ EventScript_1630A9:: @ 81630A9 return EventScript_1630AD:: @ 81630AD - clearflag FLAG_0x082 + clearflag FLAG_HIDE_ARTICUNO return SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 setvar VAR_0x4002, 0 - checkflag FLAG_0x04C - call_if 0, EventScript_163169 - checkflag FLAG_0x04D - call_if 0, EventScript_163169 + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 + call_if FALSE, EventScript_163169 + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 + call_if FALSE, EventScript_163169 compare_var_to_value VAR_0x4002, 2 - goto_if_eq EventScript_1630D4 + goto_if eq, EventScript_1630D4 end EventScript_1630D4:: @ 81630D4 @@ -95,17 +95,17 @@ Movement_16311D:: @ 816311D EventScript_163121:: @ 8163121 lockall setvar VAR_0x4002, 0 - checkflag FLAG_0x04C - call_if 0, EventScript_163169 - checkflag FLAG_0x04D - call_if 0, EventScript_163169 + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 + call_if FALSE, EventScript_163169 + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 + call_if FALSE, EventScript_163169 compare_var_to_value VAR_0x4002, 2 - goto_if_eq EventScript_163185 + goto_if eq, EventScript_163185 getplayerxy VAR_0x8008, VAR_0x8009 compare_var_to_value VAR_0x8008, 9 - call_if 0, EventScript_16316F + call_if lt, EventScript_16316F compare_var_to_value VAR_0x8008, 9 - call_if 4, EventScript_16317A + call_if ge, EventScript_16317A special sub_805D1A8 setvar VAR_0x4001, 0 releaseall @@ -165,7 +165,7 @@ Movement_1631AA:: @ 81631AA SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC 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 @@ -178,23 +178,23 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC delay 10 playbgm MUS_EXEYE, 0 waitbuttonpress - 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_16320F - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_163218 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_163218 - setflag FLAG_0x2BE + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_16320F + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_163218 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_163218 + setflag FLAG_FOUGHT_ARTICUNO release end EventScript_16320F:: @ 816320F - setflag FLAG_0x2BE + setflag FLAG_FOUGHT_ARTICUNO goto EventScript_1A922D EventScript_163217:: @ 8163217 |