Merge remote-tracking branch 'upstream/master' into move-tutor

# Conflicts: # include/pokenav.h # src/battle_script_commands.c
2019-03-17 17:20:40 -05:00
parent c3feb9871f 4ae8a52473
commit e9a3cc6d51
3041 changed files with 6917 additions and 6419 deletions
@@ -185,7 +185,6 @@ SECTIONS {
        src/heal_location.o(.text);
        src/region_map.o(.text);
        src/contest_painting_effects.o(.text);
-        asm/contest_painting_effects.o(.text);
        src/decoration.o(.text);
        src/slot_machine.o(.text);
        src/contest_painting.o(.text);