Merge branch 'master' into contest

This commit is contained in:
PikalaxALT
2018-05-11 09:25:26 -04:00
51 changed files with 4132 additions and 9099 deletions
+1 -4
View File
@@ -285,10 +285,7 @@ gUnknown_02038BC6: @ 2038BC6
.include "src/battle_setup.o"
.include "src/trainer_see.o"
.include "src/wild_encounter.o"
gFieldEffectArguments: @ 2038C08
.space 0x20
.include "src/field_effect.o"
.include "src/scanline_effect.o"
.include "src/option_menu.o"