Merge branch 'master' into decompile_reshow_battle_screen

2017-10-13 12:18:32 +02:00
parent e382a73e9d 428dd0e0a8
commit b229a1c295
24 changed files with 1170 additions and 2964 deletions
@@ -64,7 +64,7 @@ SECTIONS {
        asm/battle_controller_player.o(.text);
        asm/battle_7.o(.text);
        asm/battle_controller_opponent.o(.text);
-        asm/battle_9.o(.text);
+        src/battle_ai_switch_items.o(.text);
        asm/battle_controller_linkopponent.o(.text);
        src/pokemon_1.o(.text);
        asm/pokemon_1.o(.text);