Merge branch 'master' into fix-eventobj

2019-12-18 13:16:38 -05:00
parent db8a5c6c2b f8cef9a6a8
commit 949509aade
82 changed files with 3472 additions and 6562 deletions
@@ -72,7 +72,6 @@ SECTIONS {
        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);
        src/dodrio_berry_picking.o(.text);
        src/pokemon_jump.o(.text);