diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-27 14:01:30 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-27 14:01:30 +0200 |
| commit | 4a195f5009a16955e37d5898ab8d8a6b385cd5cc (patch) | |
| tree | 80f61b597b86e4d9cf4b78c09a702266e48e6d1d /common_syms | |
| parent | d4a7bcf4808f94e6d961d7788330ce8842d7cf97 (diff) | |
| parent | 1a33ca381de71bb3b4b250a2f3b41b0c15ed5f21 (diff) | |
Merge branch 'master' into decompile_evolution_scene
Diffstat (limited to 'common_syms')
| -rw-r--r-- | common_syms/berry_blender.txt | 2 | ||||
| -rw-r--r-- | common_syms/pokeblock_feed.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common_syms/berry_blender.txt b/common_syms/berry_blender.txt index 36d14f986..524a31411 100644 --- a/common_syms/berry_blender.txt +++ b/common_syms/berry_blender.txt @@ -1,4 +1,4 @@ gUnknown_03004830 gInGameOpponentsNo gUnknown_03004840 -gBerryBlenderData
\ No newline at end of file +gBerryBlenderData diff --git a/common_syms/pokeblock_feed.txt b/common_syms/pokeblock_feed.txt index b4c1e0982..827e6526e 100644 --- a/common_syms/pokeblock_feed.txt +++ b/common_syms/pokeblock_feed.txt @@ -9,4 +9,4 @@ gUnknown_03005F3C gUnknown_03005F40 gPokeblockFeedPokeSpriteCopy gUnknown_03005F94 -gUnknown_03005FA0
\ No newline at end of file +gUnknown_03005FA0 |