Merge branch 'master' into link

2018-01-18 12:53:31 -05:00
parent 3c2b1731ee 24e0edee9f
commit c6ff1a6ce3
3620 changed files with 632656 additions and 52484 deletions
@@ -107,21 +107,7 @@ gUnknown_03005DF4: @ 3005DF4

    .include "sound.o"
 	.include "task.o"
-
-gUnknown_03006080: @ 3006080
-	.space 0x4
-
-gUnknown_03006084: @ 3006084
-	.space 0xC
-
-gUnknown_03006090: @ 3006090
-	.space 0x18
-
-gUnknown_030060A8: @ 30060A8
-	.space 0x4
-
-gUnknown_030060AC: @ 30060AC
-	.space 0x4
+	.include "trainer_see.o"

 gUnknown_030060B0: @ 30060B0
 	.space 0x4
@@ -231,7 +217,7 @@ gUnknown_030062F4: @ 30062F4
 gUnknown_03006300: @ 3006300
 	.space 0x10

-gUnknown_03006310: @ 3006310
+gMultiuseListMenuTemplate: @ 3006310
 	.space 0x18

 gUnknown_03006328: @ 3006328