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

# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c

ld_script.txt

@@ -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);