diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-12 14:00:47 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-12 14:00:47 -0500 |
| commit | 4ac064bbaf54966082a860e6b6723c5ec654c436 (patch) | |
| tree | b419b2bb1a7fe7d17c440d58e5000c21e832386c /data/scripts | |
| parent | f81c52b56e865d8ecc753a69a31a5148548320a6 (diff) | |
| parent | a4787bc06a323071d32d3e0705e9cd39d9221452 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/maps/BirthIsland_Exterior.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/FarawayIsland_Interior.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/NavelRock_Bottom.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/NavelRock_Top.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/SouthernIsland_Interior.inc | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc index afaf9a605..0435692f4 100644 --- a/data/scripts/maps/BirthIsland_Exterior.inc +++ b/data/scripts/maps/BirthIsland_Exterior.inc @@ -86,7 +86,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 setvar VAR_0x8004, 410 setvar VAR_0x8005, 30 setvar VAR_0x8006, 0 - special DoScriptedWildBattle + special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/scripts/maps/FarawayIsland_Interior.inc index d3132b202..23bdac560 100644 --- a/data/scripts/maps/FarawayIsland_Interior.inc +++ b/data/scripts/maps/FarawayIsland_Interior.inc @@ -143,7 +143,7 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 setvar VAR_0x8004, 151 setvar VAR_0x8005, 30 setvar VAR_0x8006, 0 - special DoScriptedWildBattle + special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate diff --git a/data/scripts/maps/NavelRock_Bottom.inc b/data/scripts/maps/NavelRock_Bottom.inc index dc99ec7f7..cce93e624 100644 --- a/data/scripts/maps/NavelRock_Bottom.inc +++ b/data/scripts/maps/NavelRock_Bottom.inc @@ -59,7 +59,7 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 setvar VAR_0x8004, 249 setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 - special DoScriptedWildBattle + special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc index af3586554..07a90e7b7 100644 --- a/data/scripts/maps/NavelRock_Top.inc +++ b/data/scripts/maps/NavelRock_Top.inc @@ -63,7 +63,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F setvar VAR_0x8004, 250 setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 - special DoScriptedWildBattle + special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 057c4581d..cbaaa905a 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -121,14 +121,14 @@ SouthernIsland_Interior_EventScript_242BA4:: @ 8242BA4 setvar VAR_0x8004, 408 setvar VAR_0x8005, 50 setvar VAR_0x8006, 191 - special DoScriptedWildBattle + special CreateObedientEnemyMon return SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7 setvar VAR_0x8004, 407 setvar VAR_0x8005, 50 setvar VAR_0x8006, 191 - special DoScriptedWildBattle + special CreateObedientEnemyMon return SouthernIsland_Interior_Movement_242BCA: @ 8242BCA |