diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-19 17:37:53 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-19 17:37:53 +0100 |
| commit | 75812185693793e97a16908fb8d7bc8063d438ee (patch) | |
| tree | aa34986f9b7c27ecd0162b24bf8bea573a4bcba8 /constants | |
| parent | eb8055eb07f4ed6e3dd1d04d61e66ad9fb0d08b8 (diff) | |
| parent | 6a674e1e83db097d7a31a3786d12e42987f09f70 (diff) | |
Merge branch 'master' into decompile_battle1
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_constants.inc | 4 |
1 files changed, 2 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 |