diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-21 22:24:25 -0500 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-21 22:24:25 -0500 |
commit | 399d646e3fb24c8b4532267a4ab7aee4d2aaee92 (patch) | |
tree | 4805fda152bee21eb8bfb96f70f33e5f958c06b2 /common_syms | |
parent | 9e8a841bfa0271a603b5e4895be3067cfa26f8ab (diff) | |
parent | b105d20d1e0297d0c858fe99a0946e5c07da81c1 (diff) |
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'common_syms')
-rw-r--r-- | common_syms/pokedex.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common_syms/pokedex.txt b/common_syms/pokedex.txt index c982c9d3a..9aa48a74d 100644 --- a/common_syms/pokedex.txt +++ b/common_syms/pokedex.txt @@ -1,2 +1,2 @@ -gUnknown_030060B0 +gUnusedPokedexU8 gUnknown_030060B4 |