Merge branch 'master' into link

2018-01-21 23:20:13 -05:00
parent d35cf06854 f57340b729
commit d4e8c20f84
1241 changed files with 5063 additions and 3232 deletions
@@ -682,8 +682,9 @@ gUnknown_02039B28: @ 2039B28
 gUnknown_02039B44: @ 2039B44
 	.space 0x4

-gUnknown_02039B48: @ 2039B48
-	.space 0x4
+    .include "src/option_menu.o"
+	
+	.align 2

 gUnknown_02039B4C: @ 2039B4C
 	.space 0x4
@@ -1168,8 +1169,7 @@ gUnknown_0203ABB8: @ 203ABB8
    
 .space 0x4 /*unused var?*/

-gUnknown_0203BBC0: @ 203BBC0
-	.space 0x74
+	.include "src/mystery_event_script.o"

 gUnknown_0203BC34: @ 203BC34
 	.space 0x4