Merge branch 'master' into heal_location

ld_script.txt

@@ -191,7 +191,7 @@ SECTIONS {
         src/battle_controller_link_partner.o(.text);
         src/battle_message.o(.text);
         asm/cable_car.o(.text);
-        asm/math_util.o(.text);
+        src/math_util.o(.text);
         asm/roulette_util.o(.text);
         asm/cable_car_util.o(.text);
         src/save.o(.text);