Merge branch 'master' into frontier

ld_script.txt

@@ -173,7 +173,7 @@ SECTIONS {
         asm/dark.o(.text);
         asm/ground.o(.text);
         asm/normal.o(.text);
-        asm/battle_anim_utility_funcs.o(.text);
+        src/battle_anim_utility_funcs.o(.text);
         asm/battle_intro.o(.text);
         src/bike.o(.text);
         src/easy_chat.o(.text);