merge overworld with master

2018-02-14 01:12:17 +01:00
parent 94b47c0686 bb8c53f898
commit 5dde701c81
46 changed files with 2827 additions and 7155 deletions
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -43,7 +43,8 @@ gUnknown_03005DA8: @ 3005DA8
 	.space 0x4

 gFieldCallback: @ 3005DAC
-	.space 0x4
+	
+    .include "item_menu.o"

 gUnknown_03005DB0: @ 3005DB0
 	.space 0x4