diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 19:21:51 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 19:21:51 +0100 |
| commit | b0657350a43f3f91cd5e3ab8f910ab5ab78bb61c (patch) | |
| tree | 9568b4252f963e3210410880dad3b53dd3b5ab7d /constants/flags.inc | |
| parent | ad3a97e178b93c38b1d43f8120449b042ac23a0e (diff) | |
| parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) | |
berry blender fix merge conflicts
Diffstat (limited to 'constants/flags.inc')
| -rw-r--r-- | constants/flags.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/constants/flags.inc b/constants/flags.inc index 2e4b60d73..66663cb65 100644 --- a/constants/flags.inc +++ b/constants/flags.inc @@ -80,7 +80,7 @@ .equiv FLAG_0x050, 0x50 .equiv FLAG_0x051, 0x51 .equiv FLAG_0x052, 0x52 - .equiv FLAG_0x053, 0x53 + .equiv FLAG_LEGENDARIES_IN_SOOTOPOLIS, 0x53 .equiv FLAG_0x054, 0x54 .equiv FLAG_0x055, 0x55 .equiv FLAG_0x056, 0x56 |