Merge branch 'master' of https://github.com/pret/pokeemerald

2018-05-10 18:38:24 -05:00
parent 416d67c832 7defc27b99
commit 2b6d2dfadd
26 changed files with 1515 additions and 2706 deletions
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -47,9 +47,7 @@ gUnknown_030060B8: @ 30060B8
 	.space 0x4

    .include "tv.o"
-
-gUnknown_03006130: @ 3006130
-	.space 0x34
+    .include "mauville_old_man.o"

 gUnknown_03006164: @ 3006164
 	.space 0x4