Merge branch 'master' into contest

2018-05-11 09:25:26 -04:00
parent c15b50ac68 3e93615e38
commit 4488bbe9e6
51 changed files with 4132 additions and 9099 deletions
--- a/common_syms/item_menu.txt
+++ b/common_syms/item_menu.txt
@@ -1 +0,0 @@
-gFieldCallback
--- a/common_syms/mauville_old_man.txt
+++ b/common_syms/mauville_old_man.txt
@@ -1 +1 @@
-gBardSong
+gBardSong
--- a/common_syms/overworld.txt
+++ b/common_syms/overworld.txt
@@ -0,0 +1,5 @@
+gUnknown_03005DA8
+gFieldCallback
+gUnknown_03005DB0
+gUnknown_03005DB4
+gFieldLinkPlayerCount