Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030

# Conflicts:
#	src/data/bard_music/moves.h
#	src/data/bard_music/pokemon.h

ld_script.txt

@@ -503,7 +503,7 @@ SECTIONS {
         src/berry_blender.o(.rodata);
         src/new_game.o(.rodata);
         src/overworld.o(.rodata);
-        data/tilesets.o(.rodata);
+        src/tilesets.o(.rodata);
         data/maps.o(.rodata);
         src/fieldmap.o(.rodata);
         src/metatile_behavior.o(.rodata);