diff options
| -rw-r--r-- | data/maps/AncientTomb/scripts.inc | 8 | ||||
| -rw-r--r-- | data/maps/AquaHideout_B1F/scripts.inc | 14 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_OutsideEast/scripts.inc | 8 | ||||
| -rw-r--r-- | data/maps/BirthIsland_Exterior/scripts.inc | 8 | ||||
| -rw-r--r-- | data/maps/DesertRuins/scripts.inc | 8 | ||||
| -rw-r--r-- | data/maps/FarawayIsland_Interior/scripts.inc | 18 | ||||
| -rw-r--r-- | data/maps/IslandCave/scripts.inc | 8 | ||||
| -rw-r--r-- | data/maps/MarineCave_End/scripts.inc | 8 | ||||
| -rw-r--r-- | data/maps/NavelRock_Bottom/scripts.inc | 8 | ||||
| -rw-r--r-- | data/maps/NavelRock_Top/scripts.inc | 8 | ||||
| -rw-r--r-- | data/maps/NewMauville_Inside/scripts.inc | 20 | ||||
| -rw-r--r-- | data/maps/Route119/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/SkyPillar_Top/scripts.inc | 8 | ||||
| -rw-r--r-- | data/maps/SouthernIsland_Interior/scripts.inc | 8 | ||||
| -rw-r--r-- | data/maps/TerraCave_End/scripts.inc | 8 |
15 files changed, 71 insertions, 71 deletions
diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 48962d957..322bd06b7 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -10,7 +10,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3 AncientTomb_EventScript_238FCD:: @ 8238FCD specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -72,11 +72,11 @@ AncientTomb_EventScript_23905A:: @ 823905A waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq AncientTomb_EventScript_2390A1 - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq AncientTomb_EventScript_2390AA - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq AncientTomb_EventScript_2390AA setflag FLAG_DEFEATED_REGISTEEL release diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 135926c77..83906c509 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -9,7 +9,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 AquaHideout_B1F_EventScript_2339BC:: @ 82339BC specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -39,11 +39,11 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq AquaHideout_B1F_EventScript_233A2F - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq AquaHideout_B1F_EventScript_233A2F - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq AquaHideout_B1F_EventScript_233A2F setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT release @@ -66,11 +66,11 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38 dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq AquaHideout_B1F_EventScript_233A7C - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq AquaHideout_B1F_EventScript_233A7C - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq AquaHideout_B1F_EventScript_233A7C setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT release diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 3873c5c01..5170716d7 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -133,11 +133,11 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 setflag FLAG_DEFEATED_SUDOWOODO release diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index b37d60a41..72469f519 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -34,7 +34,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject 2 return @@ -88,11 +88,11 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq BirthIsland_Exterior_EventScript_26803B - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq BirthIsland_Exterior_EventScript_268049 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq BirthIsland_Exterior_EventScript_268049 setflag FLAG_BATTLED_DEOXYS release diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 525bdff4a..dbadad2ab 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -10,7 +10,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B DesertRuins_EventScript_22D975:: @ 822D975 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -72,11 +72,11 @@ DesertRuins_EventScript_22DA02:: @ 822DA02 waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq DesertRuins_EventScript_22DA49 - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq DesertRuins_EventScript_22DA52 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq DesertRuins_EventScript_22DA52 setflag FLAG_DEFEATED_REGIROCK release diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index 133cc02f4..632240814 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -11,13 +11,13 @@ FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F FarawayIsland_Interior_EventScript_267D19:: @ 8267D19 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq FarawayIsland_Interior_EventScript_267D4B - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq FarawayIsland_Interior_EventScript_267D4B - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq FarawayIsland_Interior_EventScript_267D4B - compare VAR_RESULT, 10 + compare VAR_RESULT, B_OUTCOME_MON_TELEPORTED goto_if_eq FarawayIsland_Interior_EventScript_267D4B return @@ -32,7 +32,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -145,13 +145,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq FarawayIsland_Interior_EventScript_267E96 - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq FarawayIsland_Interior_EventScript_267EA4 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq FarawayIsland_Interior_EventScript_267EA4 - compare VAR_RESULT, 10 + compare VAR_RESULT, B_OUTCOME_MON_TELEPORTED goto_if_eq FarawayIsland_Interior_EventScript_267EA4 setflag FLAG_CAUGHT_MEW release diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 4664b7dcd..b0843667c 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -10,7 +10,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A IslandCave_EventScript_238E44:: @ 8238E44 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -101,11 +101,11 @@ IslandCave_EventScript_238F58:: @ 8238F58 waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq IslandCave_EventScript_238F9F - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq IslandCave_EventScript_238FA8 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq IslandCave_EventScript_238FA8 setflag FLAG_DEFEATED_REGICE release diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index 2fadf18ca..fd434804e 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -9,7 +9,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA MarineCave_End_EventScript_23AFF4:: @ 823AFF4 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject 1 return @@ -41,11 +41,11 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_TEMP_1, 0 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq MarineCave_End_EventScript_23B084 - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq MarineCave_End_EventScript_23B092 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq MarineCave_End_EventScript_23B092 setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_KYOGRE diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index 64b860fa7..a09b6ed13 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -23,7 +23,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284 NavelRock_Bottom_EventScript_26928E:: @ 826928E specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject 1 return @@ -61,11 +61,11 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq NavelRock_Bottom_EventScript_269336 - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq NavelRock_Bottom_EventScript_269344 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq NavelRock_Bottom_EventScript_269344 setflag FLAG_CAUGHT_LUGIA release diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index a3179e8a6..6734ef5f0 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -26,7 +26,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151 NavelRock_Top_EventScript_26915B:: @ 826915B specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject 1 return @@ -66,11 +66,11 @@ NavelRock_Top_EventScript_26916F:: @ 826916F clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq NavelRock_Top_EventScript_269217 - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq NavelRock_Top_EventScript_269225 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq NavelRock_Top_EventScript_269225 setflag FLAG_CAUGHT_HO_OH releaseall diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 427b0ed72..be4e846eb 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -14,7 +14,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7 NewMauville_Inside_EventScript_237407:: @ 8237407 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -190,11 +190,11 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq NewMauville_Inside_EventScript_2377F3 - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq NewMauville_Inside_EventScript_2377F3 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq NewMauville_Inside_EventScript_2377F3 setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE release @@ -217,11 +217,11 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq NewMauville_Inside_EventScript_237840 - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq NewMauville_Inside_EventScript_237840 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq NewMauville_Inside_EventScript_237840 setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE release @@ -244,11 +244,11 @@ NewMauville_Inside_EventScript_237849:: @ 8237849 dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq NewMauville_Inside_EventScript_23788D - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq NewMauville_Inside_EventScript_23788D - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq NewMauville_Inside_EventScript_23788D setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE release diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index ef2d0e0e2..ec1063c6d 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -9,7 +9,7 @@ Route119_MapScript1_1F442F: @ 81F442F Route119_EventScript_1F4439:: @ 81F4439 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 4ab5b3424..95f430cbd 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -10,7 +10,7 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8 SkyPillar_Top_EventScript_2396D2:: @ 82396D2 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -55,11 +55,11 @@ SkyPillar_Top_EventScript_239722:: @ 8239722 waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq SkyPillar_Top_EventScript_239768 - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq SkyPillar_Top_EventScript_239771 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq SkyPillar_Top_EventScript_239771 setflag FLAG_DEFEATED_RAYQUAZA releaseall diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 6283516b0..7f4a55f29 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -9,7 +9,7 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject 2 return @@ -86,11 +86,11 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq SouthernIsland_Interior_EventScript_242B81 - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq SouthernIsland_Interior_EventScript_242B8F - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq SouthernIsland_Interior_EventScript_242B8F setflag FLAG_CAUGHT_LATIAS_OR_LATIOS releaseall diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index df2e6f969..efab053aa 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -9,7 +9,7 @@ TerraCave_End_MapScript1_23B0BB: @ 823B0BB TerraCave_End_EventScript_23B0C5:: @ 823B0C5 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject 1 return @@ -41,11 +41,11 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_TEMP_1, 0 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq TerraCave_End_EventScript_23B155 - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq TerraCave_End_EventScript_23B163 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq TerraCave_End_EventScript_23B163 setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_GROUDON |