Merge contests with master

This commit is contained in:
DizzyEggg
2018-08-11 19:04:28 +02:00
26 changed files with 3407 additions and 7856 deletions
+1 -3
View File
@@ -43,9 +43,7 @@ gUnknown_030060B0: @ 30060B0
gUnknown_030060B4: @ 30060B4
.space 0x4
gUnknown_030060B8: @ 30060B8
.space 0x4
.include "contest.o"
.include "tv.o"
.include "mauville_old_man.o"