diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 15:18:53 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 15:36:35 -0500 |
| commit | 388c40575de92923b576e37a97729c27f292b67f (patch) | |
| tree | 9ec6265cbaa0ffd37f7d2574060be8a695fdb626 /data/maps/NavelRock_Base/scripts.inc | |
| parent | 91bf7665c623011fb63a7045689ba600b4b1eda7 (diff) | |
Sync Birth Island / Navel Rock scripts
Diffstat (limited to 'data/maps/NavelRock_Base/scripts.inc')
| -rw-r--r-- | data/maps/NavelRock_Base/scripts.inc | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index c7fcd191a..4a844fe12 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -4,31 +4,31 @@ NavelRock_Base_MapScripts:: @ 81650E7 .byte 0 NavelRock_Base_OnTransition:: @ 81650F2 - call_if_set FLAG_FOUGHT_LUGIA, EventScript_165105 - call_if_unset FLAG_FOUGHT_LUGIA, EventScript_165109 + call_if_set FLAG_FOUGHT_LUGIA, NavelRock_Base_EventScript_HideLugia + call_if_unset FLAG_FOUGHT_LUGIA, NavelRock_Base_EventScript_TryShowLugia end -EventScript_165105:: @ 8165105 +NavelRock_Base_EventScript_HideLugia:: @ 8165105 setflag FLAG_HIDE_LUGIA return -EventScript_165109:: @ 8165109 - goto_if_set FLAG_LUGIA_FLEW_AWAY, EventScript_1A77A9 +NavelRock_Base_EventScript_TryShowLugia:: @ 8165109 + goto_if_set FLAG_LUGIA_FLEW_AWAY, EventScript_Return clearflag FLAG_HIDE_LUGIA return NavelRock_Base_OnResume:: @ 8165116 - call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_165120 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, NavelRock_Base_EventScript_TryRemoveLugia end -EventScript_165120:: @ 8165120 +NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120 specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT - goto_if_ne EventScript_1A77A9 + goto_if_ne EventScript_Return removeobject 1 return -NavelRock_Base_EventScript_165134:: @ 8165134 +NavelRock_Base_EventScript_Lugia:: @ 8165134 special sub_8110AB4 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 @@ -38,17 +38,17 @@ NavelRock_Base_EventScript_165134:: @ 8165134 waitse delay 20 playse SE_T_AME_E - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 2 + setvar VAR_0x8004, 0 @ Vertical pan + setvar VAR_0x8005, 3 @ Horizontal pan + setvar VAR_0x8006, 4 @ Num shakes + setvar VAR_0x8007, 2 @ Shake delay special Special_ShakeScreen delay 30 playse SE_T_AME_E - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 2 + setvar VAR_0x8004, 0 @ Vertical pan + setvar VAR_0x8005, 3 @ Horizontal pan + setvar VAR_0x8006, 4 @ Num shakes + setvar VAR_0x8007, 2 @ Shake delay special Special_ShakeScreen delay 30 delay 50 @@ -57,8 +57,8 @@ NavelRock_Base_EventScript_165134:: @ 8165134 waitmoncry delay 20 setvar VAR_0x8004, SPECIES_LUGIA - setvar VAR_0x8005, 70 - setvar VAR_0x8006, 0 + setvar VAR_0x8005, 70 @ Level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE special Special_StartLegendaryBattle @@ -66,22 +66,22 @@ NavelRock_Base_EventScript_165134:: @ 8165134 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if_eq EventScript_1651D9 + goto_if_eq NavelRock_Base_EventScript_DefeatedLugia compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq EventScript_1651E7 + goto_if_eq NavelRock_Base_EventScript_RanFromLugia compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq EventScript_1651E7 + goto_if_eq NavelRock_Base_EventScript_RanFromLugia setflag FLAG_FOUGHT_LUGIA release end -EventScript_1651D9:: @ 81651D9 +NavelRock_Base_EventScript_DefeatedLugia:: @ 81651D9 setflag FLAG_LUGIA_FLEW_AWAY setvar VAR_0x8004, SPECIES_LUGIA goto EventScript_MonFlewAway end -EventScript_1651E7:: @ 81651E7 +NavelRock_Base_EventScript_RanFromLugia:: @ 81651E7 setvar VAR_0x8004, SPECIES_LUGIA goto EventScript_MonFlewAway end |