diff options
| author | itskobold <itskobold@users.noreply.github.com> | 2017-11-20 18:27:23 +0000 |
|---|---|---|
| committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-20 18:27:23 +0000 |
| commit | caf952e02eb29f56a0c8b8571a6c5c4f8d0d2ef2 (patch) | |
| tree | f0592fc84aeb433b0fb59d9ceabd025b5589f83b /constants | |
| parent | 625be4bf04c9f14c4e1ee2e1ab74e7a5a7964a33 (diff) | |
| parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/flags.inc | 2 | ||||
| -rw-r--r-- | constants/variables.inc | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/constants/variables.inc b/constants/variables.inc index e2719e10c..47748891b 100644 --- a/constants/variables.inc +++ b/constants/variables.inc @@ -60,7 +60,7 @@ .equiv VAR_0x403B, 0x403B .equiv VAR_0x403C, 0x403C .equiv VAR_0x403D, 0x403D - .equiv VAR_0x403E, 0x403E + .equiv VAR_ALTERING_CAVE_WILD_SET, 0x403E .equiv VAR_0x403F, 0x403F .equiv VAR_DAYS, 0x4040 .equiv VAR_0x4041, 0x4041 |