Merge branch 'master' into contest

sym_ewram.txt

@@ -481,13 +481,7 @@ gUnknown_0203A120: @ 203A120
 	.include "src/mon_markings.o"
 	.include "src/mauville_old_man.o"
     .include "src/mail.o"
-
-gUnknown_0203A138: @ 203A138
-	.space 0x8
-
-gUnknown_0203A140: @ 203A140
-	.space 0x4
-
+    .include "src/menu_helpers.o"
 	.include "src/region_map.o"
     .include "src/decoration.o"
     .align 2
@@ -790,13 +784,7 @@ gUnknown_0203CE54: @ 203CE54
 	.align 2
     
     .include "src/item_menu.o"
-
-gUnknown_0203CE84: @ 203CE84
-	.space 0x8
-
-gUnknown_0203CE8C: @ 203CE8C
-	.space 0x10
-
+    .include "src/list_menu.o"
     .include "src/unk_text_util.o"
     .include "src/item_icon.o"