Merge branch 'master' into learn

2018-12-24 22:01:52 +01:00
parent 442b1826a2 370b1093cd
commit e230afd543
10 changed files with 1601 additions and 4407 deletions
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -165,12 +165,12 @@ SECTIONS {
        src/fight.o(.text);
        src/poison.o(.text);
        asm/flying.o(.text);
-        asm/psychic.o(.text);
+        src/psychic.o(.text);
        src/bug.o(.text);
        src/rock.o(.text);
        src/ghost.o(.text);
        src/dragon.o(.text);
-        asm/dark.o(.text);
+        src/dark.o(.text);
        src/ground.o(.text);
        src/normal.o(.text);
        src/battle_anim_utility_funcs.o(.text);