diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:25:26 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:25:26 -0400 |
| commit | 4488bbe9e69a8551cb5bb34e70b8ffb9d8e554db (patch) | |
| tree | d9c5a70fd1c4f42dc29f43becd142cc89456f19d /common_syms | |
| parent | c15b50ac686632130512de37d01037bff6e10cd2 (diff) | |
| parent | 3e93615e38842643b8dd115c1fd2e0b4a0dbcd01 (diff) | |
Merge branch 'master' into contest
Diffstat (limited to 'common_syms')
| -rwxr-xr-x | common_syms/item_menu.txt | 1 | ||||
| -rw-r--r-- | common_syms/mauville_old_man.txt | 2 | ||||
| -rw-r--r-- | common_syms/overworld.txt | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/common_syms/item_menu.txt b/common_syms/item_menu.txt deleted file mode 100755 index 112b591aa..000000000 --- a/common_syms/item_menu.txt +++ /dev/null @@ -1 +0,0 @@ -gFieldCallback diff --git a/common_syms/mauville_old_man.txt b/common_syms/mauville_old_man.txt index edb40a31c..9d77b8692 100644 --- a/common_syms/mauville_old_man.txt +++ b/common_syms/mauville_old_man.txt @@ -1 +1 @@ -gBardSong
\ No newline at end of file +gBardSong diff --git a/common_syms/overworld.txt b/common_syms/overworld.txt new file mode 100644 index 000000000..687b67545 --- /dev/null +++ b/common_syms/overworld.txt @@ -0,0 +1,5 @@ +gUnknown_03005DA8 +gFieldCallback +gUnknown_03005DB0 +gUnknown_03005DB4 +gFieldLinkPlayerCount |