diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /constants | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_constants.inc | 4 | ||||
| -rw-r--r-- | constants/species_constants.inc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/constants/battle_constants.inc b/constants/battle_constants.inc index 34f16a8c9..7309d68cd 100644 --- a/constants/battle_constants.inc +++ b/constants/battle_constants.inc @@ -19,7 +19,7 @@ .set BATTLE_TYPE_PALACE, 0x20000 .set BATTLE_TYPE_ARENA, 0x40000 .set BATTLE_TYPE_FACTORY, 0x80000 - .set BATTLE_TYPE_x100000, 0x100000 + .set BATTLE_TYPE_PIKE, 0x100000 .set BATTLE_TYPE_PYRAMID, 0x200000 .set BATTLE_TYPE_INGAME_PARTNER, 0x400000 .set BATTLE_TYPE_x800000, 0x800000 @@ -28,7 +28,7 @@ .set BATTLE_TYPE_x4000000, 0x4000000 .set BATTLE_TYPE_SECRET_BASE, 0x8000000 .set BATTLE_TYPE_GROUDON, 0x10000000 - .set BATTLE_TYPE_KYORGE, 0x20000000 + .set BATTLE_TYPE_KYOGRE, 0x20000000 .set BATTLE_TYPE_RAYQUAZA, 0x40000000 .set BATTLE_TYPE_x80000000, 0x80000000 diff --git a/constants/species_constants.inc b/constants/species_constants.inc index 7ee94df61..64f1e19f7 100644 --- a/constants/species_constants.inc +++ b/constants/species_constants.inc @@ -384,3 +384,4 @@ .set SPECIES_JIRACHI, 0x199 .set SPECIES_DEOXYS, 0x19a .set SPECIES_CHIMECHO, 0x19b + .set SPECIES_EGG, 0x19c |