Merge branch 'master' into contest
This commit is contained in:
+1
-4
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user