Merge branch 'master' into secret_base

2017-11-01 23:42:04 -04:00
parent 17fd3bccf7 c71f6baa8c
commit 8a4f0287da
3 changed files with 87 additions and 203 deletions
--- a/ld_script.txt
+++ b/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);