Merge branch 'master' into move-tutor

2019-03-08 02:27:20 -05:00
parent eac70acab6 bd157b301d
commit b93d923826
108 changed files with 2459 additions and 2574 deletions
@@ -165,7 +165,6 @@ SECTIONS {
        src/fight.o(.text);
        src/poison.o(.text);
        src/flying.o(.text);
-        asm/flying.o(.text);
        src/psychic.o(.text);
        src/bug.o(.text);
        src/rock.o(.text);