Browse Source

merge feature/wildpokemon

Karathan 6 years ago
parent
commit
6c886a4353
3 changed files with 2 additions and 2 deletions
  1. 0
    0
      data/overworld/wild_pokemon_data.s.old
  2. 1
    1
      g3headers
  3. 1
    1
      sots-private

data/overworld/wild_pokemon_data.s → data/overworld/wild_pokemon_data.s.old View File


+ 1
- 1
g3headers

@@ -1 +1 @@
1
-Subproject commit c407f7e79467a4681f5327d549e4773751f13acb
1
+Subproject commit fb3beb81b982b00e7fe18509b321ea4b76642c30

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 95c5a553229b8fbe56f0cae8c5ad30f2dd233160
1
+Subproject commit f5d93d0d0b7ea51e7c76a1b661bbf52144839c1a