Merge remote-tracking branch 'upstream/master'

2018-12-09 00:01:45 +05:30
parent 2dfbe75b05 6babb97182
commit 1357449d73
9 changed files with 784 additions and 1442 deletions
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -214,7 +214,7 @@ SECTIONS {
        src/battle_message.o(.text);
        asm/cable_car.o(.text);
        src/math_util.o(.text);
-        asm/roulette_util.o(.text);
+        src/roulette_util.o(.text);
        src/rom_81520A8.o(.text);
        src/save.o(.text);
        src/mystery_event_script.o(.text);