diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
| commit | 5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch) | |
| tree | 6ef755064008dfae8ce2942dc2762670cdabe815 /data/maps/NavelRock_Bottom/scripts.inc | |
| parent | 5007d279fea5326b41b877703c74fcaa56223364 (diff) | |
| parent | 22931846d680de2bc585093678db3f5721aab891 (diff) | |
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'data/maps/NavelRock_Bottom/scripts.inc')
| -rw-r--r-- | data/maps/NavelRock_Bottom/scripts.inc | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index f3c244e3d..e43f6d513 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -1,83 +1,83 @@ NavelRock_Bottom_MapScripts:: @ 8269255 map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_OnTransition - map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_MapScript1_269284 + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_OnResume .byte 0 NavelRock_Bottom_OnTransition: @ 8269260 - call_if_set FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269273 - call_if_unset FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269277 + call_if_set FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_HideLugia + call_if_unset FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_TryShowLugia end -NavelRock_Bottom_EventScript_269273:: @ 8269273 +NavelRock_Bottom_EventScript_HideLugia:: @ 8269273 setflag FLAG_HIDE_LUGIA return -NavelRock_Bottom_EventScript_269277:: @ 8269277 +NavelRock_Bottom_EventScript_TryShowLugia:: @ 8269277 goto_if_set FLAG_DEFEATED_LUGIA, Common_EventScript_NopReturn clearflag FLAG_HIDE_LUGIA return -NavelRock_Bottom_MapScript1_269284: @ 8269284 - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Bottom_EventScript_26928E +NavelRock_Bottom_OnResume: @ 8269284 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Bottom_EventScript_TryRemoveLugia end -NavelRock_Bottom_EventScript_26928E:: @ 826928E +NavelRock_Bottom_EventScript_TryRemoveLugia:: @ 826928E specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject 1 return -NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 +NavelRock_Bottom_EventScript_Lugia:: @ 82692A2 lock faceplayer waitse delay 20 playse SE_T_AME_E - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 2 - special sub_8139560 + 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 ShakeCamera delay 30 playse SE_T_AME_E - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 2 - special sub_8139560 + 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 ShakeCamera delay 30 delay 50 waitse playmoncry SPECIES_LUGIA, 2 waitmoncry delay 20 - setvar VAR_0x8004, 249 - setvar VAR_0x8005, 70 - setvar VAR_0x8006, 0 + setvar VAR_0x8004, SPECIES_LUGIA + setvar VAR_0x8005, 70 @ level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq NavelRock_Bottom_EventScript_269336 - compare VAR_RESULT, 4 - goto_if_eq NavelRock_Bottom_EventScript_269344 - compare VAR_RESULT, 5 - goto_if_eq NavelRock_Bottom_EventScript_269344 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq NavelRock_Bottom_EventScript_DefeatedLugia + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq NavelRock_Bottom_EventScript_RanFromLugia + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq NavelRock_Bottom_EventScript_RanFromLugia setflag FLAG_CAUGHT_LUGIA release end -NavelRock_Bottom_EventScript_269336:: @ 8269336 +NavelRock_Bottom_EventScript_DefeatedLugia:: @ 8269336 setflag FLAG_DEFEATED_LUGIA - setvar VAR_0x8004, 249 - goto NavelRock_Bottom_EventScript_273776 + setvar VAR_0x8004, SPECIES_LUGIA + goto Common_EventScript_LegendaryFlewAway end -NavelRock_Bottom_EventScript_269344:: @ 8269344 - setvar VAR_0x8004, 249 - goto NavelRock_Bottom_EventScript_273776 +NavelRock_Bottom_EventScript_RanFromLugia:: @ 8269344 + setvar VAR_0x8004, SPECIES_LUGIA + goto Common_EventScript_LegendaryFlewAway end |