diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-08-26 21:24:02 -0400 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-08-26 21:24:02 -0400 |
commit | 47b9907ec58c55759a95aed1f31e92fb72031a5f (patch) | |
tree | 5a473edae75105a009135ded3d096f133c34d72b /common_syms | |
parent | 613fd1aa059d6894662566049840f3e1fd8cb02e (diff) | |
parent | 1a33ca381de71bb3b4b250a2f3b41b0c15ed5f21 (diff) |
merge
Diffstat (limited to 'common_syms')
-rw-r--r-- | common_syms/pokemon/pokeblock_feed.txt | 12 | ||||
-rw-r--r-- | common_syms/scene/berry_blender.txt | 4 | ||||
-rw-r--r-- | common_syms/scene/cute_sketch.txt | 0 | ||||
-rw-r--r-- | common_syms/scene/egg_hatch.txt | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/common_syms/pokemon/pokeblock_feed.txt b/common_syms/pokemon/pokeblock_feed.txt new file mode 100644 index 000000000..827e6526e --- /dev/null +++ b/common_syms/pokemon/pokeblock_feed.txt @@ -0,0 +1,12 @@ +gPokeblockFeedPokeSprite +gPokeblockFeedMonSpecies +gPokeblockMonNotFlipped +gPokeblockFeedMonSpriteID +gPokeblockFeedMonNature +gUnknown_03005F34 +gPokeblockFeedUnused0 +gUnknown_03005F3C +gUnknown_03005F40 +gPokeblockFeedPokeSpriteCopy +gUnknown_03005F94 +gUnknown_03005FA0 diff --git a/common_syms/scene/berry_blender.txt b/common_syms/scene/berry_blender.txt new file mode 100644 index 000000000..524a31411 --- /dev/null +++ b/common_syms/scene/berry_blender.txt @@ -0,0 +1,4 @@ +gUnknown_03004830 +gInGameOpponentsNo +gUnknown_03004840 +gBerryBlenderData diff --git a/common_syms/scene/cute_sketch.txt b/common_syms/scene/cute_sketch.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/common_syms/scene/cute_sketch.txt diff --git a/common_syms/scene/egg_hatch.txt b/common_syms/scene/egg_hatch.txt index f49202045..891ccc104 100644 --- a/common_syms/scene/egg_hatch.txt +++ b/common_syms/scene/egg_hatch.txt @@ -1 +1 @@ -gEggHatchData
\ No newline at end of file +gEggHatchData |