Merge contests with master

2018-08-11 19:04:28 +02:00
parent 85ebd76cd0 6ae395a636
commit 537ebd36ac
26 changed files with 3407 additions and 7856 deletions
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -135,6 +135,7 @@ SECTIONS {
        src/item_menu_icons.o(.text);
        asm/battle_anim_80D51AC.o(.text);
        src/item.o(.text);
+        src/contest.o(.text);
        asm/contest.o(.text);
        asm/shop.o(.text);
        src/berry.o(.text);