Merge branch 'master' into mystery_gift

ld_script.txt

@@ -64,6 +64,7 @@ SECTIONS {
         asm/mevent_server_helpers.o(.text);
         src/mevent_news.o(.text);
         src/union_room_chat.o(.text);
+        src/berry_crush.o(.text);
         asm/berry_crush.o(.text);
         src/berry_powder.o(.text);
         asm/dodrio_berry_picking.o(.text);