Merge branch 'master' into battle_records

2019-07-14 11:29:23 -04:00
parent 31c26e862a 53b950019a
commit 939bd127bb
48 changed files with 1191 additions and 3782 deletions
@@ -805,9 +805,7 @@ gUnknown_8454000:: @ 8454000
 gUnknown_8454003:: @ 8454003
 	.incbin "baserom.gba", 0x454003, 0x2615

-gUnknown_8456618:: @ 8456618
-	.incbin "baserom.gba", 0x456618, 0x4
-
+	@ menu.o
 	@ quest_log.o
 	@ link_rfu_3.o
 	.section .rodata.8456C74