Merge branch 'master' into misc

2019-07-14 22:49:29 +08:00
parent 7a307c90cf be422beca6
commit c7c3d3b5ee
5 changed files with 2324 additions and 490 deletions
@@ -197,7 +197,7 @@ SECTIONS {
        asm/battle_message.o(.text);
        src/math_util.o(.text);
        src/roulette_util.o(.text);
-        asm/cable_car_util.o(.text);
+        src/cable_car_util.o(.text);
        src/save.o(.text);
        src/mystery_event_script.o(.text);
        asm/field_effect_helpers.o(.text);