diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-23 15:48:11 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-23 15:48:11 -0400 |
| commit | 0352a72d2ef5f820d6e8c4ad1806f5a8128b6d2f (patch) | |
| tree | 1cda7283e7e7ac4678a14843a30d2519a37d3b34 /data/maps | |
| parent | e3993e2b34282933f149b85a4cfe7f45e051b504 (diff) | |
| parent | e4acfdf20b7d56b83cee6f4e49b257a2ecb92a95 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/BirthIsland_Exterior/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/NavelRock_Base/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/NavelRock_Summit/scripts.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 1d3fc4db6..f00cd73f2 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -90,7 +90,7 @@ EventScript_1652C0:: @ 81652C0 setvar VAR_0x8004, SPECIES_DEOXYS setvar VAR_0x8005, 30 setvar VAR_0x8006, 0 - special sub_8044838 + special CreateObedientEnemyMon setflag FLAG_0x807 special sub_807F9D8 waitstate diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 34cca4e9b..8818c1d01 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -63,7 +63,7 @@ NavelRock_Base_EventScript_165134:: @ 8165134 setvar VAR_0x8004, SPECIES_LUGIA setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 - special sub_8044838 + special CreateObedientEnemyMon setflag FLAG_0x807 special sub_807F9D8 waitstate diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index cb82149e8..d359d4d25 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -67,7 +67,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB setvar VAR_0x8004, SPECIES_HO_OH setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 - special sub_8044838 + special CreateObedientEnemyMon setflag FLAG_0x807 special sub_807F9D8 waitstate |