Merge branch 'master' into weather

sym_bss.txt

@@ -1,13 +1,13 @@
 	.include "src/main.o"
-	.include "src/malloc.o"
+	.include "src/alloc.o"
 	.include "src/dma3_manager.o"
 	.include "src/gpu_regs.o"
 	.include "src/bg.o"
 	.include "src/text.o"
 	.include "src/sprite.o"
-    .include "src/link.o"
-    .include "src/link_rfu.o"
-    .include "src/rom_8011DC0.o"
+	.include "src/link.o"
+	.include "src/link_rfu.o"
+	.include "src/rom_8011DC0.o"
 	.include "src/rtc.o"
 	.include "src/main_menu.o"
 	.include "src/rom_8034C54.o"