Merge branch 'master' into quest_log

2018-10-12 20:18:48 -04:00
parent e143072f96 bd88c80379
commit 6c52f7ce04
88 changed files with 8986 additions and 17161 deletions
@@ -75,10 +75,7 @@ SECTIONS {
        asm/battle_controller_opponent.o(.text);
        asm/battle_ai_switch_items.o(.text);
        asm/battle_controller_link_opponent.o(.text);
-        asm/pokemon_1.o(.text);
-        asm/calculate_base_damage.o(.text);
-        asm/pokemon_2.o(.text);
-        asm/pokemon_item_effect.o(.text);
+        src/pokemon.o(.text);
        asm/pokemon_3.o(.text);
        asm/trig.o(.text);
        src/random.o(.text);