Merge branch 'master' into pokemon

sym_ewram.txt

@@ -1079,7 +1079,7 @@ gUnknown_2039A34: @ 2039A34
 	.include "src/save.o"
 	.include "src/mystery_event_script.o"
 
-gPaletteDecompressionBuffer: @ 203AAB0
+gUnknown_203AAB0: @ 203AAB0
 	.space 0x4
 
 gUnknown_203AAB4: @ 203AAB4
@@ -1118,8 +1118,7 @@ gUnknown_203AB40: @ 203AB40
 gUnknown_203AB44: @ 203AB44
 	.space 0x4
 
-gUnknown_203AB48: @ 203AB48
-	.space 0x4
+	.include "src/diploma.o"
 
 gUnknown_203AB4C: @ 203AB4C
 	.space 0x4
@@ -1222,21 +1221,7 @@ gUnknown_203ADDC: @ 203ADDC
 gUnknown_203ADE0: @ 203ADE0
 	.space 0x4
 
-gUnknown_203ADE4: @ 203ADE4
-	.space 0xC
-
-gUnknown_203ADF0: @ 203ADF0
-	.space 0x2
-
-gUnknown_203ADF2: @ 203ADF2
-	.space 0x1
-
-gUnknown_203ADF3: @ 203ADF3
-	.space 0x1
-
-gUnknown_203ADF4: @ 203ADF4
-	.space 0x4
-
+	.include "src/menu.o"
 	.include "src/quest_log.o"
 
 gUnknown_203B04C: @ 203B04C