option menu fix conflicts

This commit is contained in:
DizzyEggg
2018-01-21 12:46:19 +01:00
734 changed files with 44889 additions and 16751 deletions
+1 -4
View File
@@ -1194,10 +1194,7 @@ gUnknown_0203AB98: @ 203AB98
.space 0x4
.include "src/coins.o"
.align 2
sTransitionStructPtr: @ 203ABA0
.space 0x4
.include "src/battle_transition.o"
gAbilitiesPerBank: @ 203ABA4
.space 0x4