Merge branch 'master' into battle

2019-10-25 09:22:50 +08:00
parent 6ca932e5e9 7579fc65c1
commit 2f87855072
136 changed files with 3963 additions and 6605 deletions
@@ -187,7 +187,7 @@ SECTIONS {
        asm/post_battle_event_funcs.o(.text);
        src/prof_pc.o(.text);
        src/hof_pc.o(.text);
-        asm/field_specials.o(.text);
+        src/field_specials.o(.text);
        src/battle_records.o(.text);
        asm/evolution_scene.o(.text);
        src/coins.o(.text);
@@ -448,6 +448,7 @@ SECTIONS {
        data/data_835B488.o(.rodata.83EEC98);
        src/battle_ai_script_commands.o(.rodata);
        data/data_83F5738.o(.rodata);
+        src/field_specials.o(.rodata);
        src/battle_records.o(.rodata);
        data/data_83F5738.o(.rodata.83F6C90);
        src/battle_transition.o(.rodata);