Merge branch 'replicate_multiboot' into misc

2019-06-26 06:17:59 +08:00
parent 1f82c7cbd5 11a8a01654
commit 5f0e87bbb7
5 changed files with 425 additions and 931 deletions
@@ -61,7 +61,7 @@ SECTIONS {
        src/sprite.o(.text);
        src/string_util.o(.text);
        asm/link.o(.text);
-        asm/multiboot.o(.text);
+        src/multiboot.o(.text);
        asm/main_menu.o(.text);
        asm/battle_controllers.o(.text);
        asm/decompress.o(.text);