option menu fix conflicts
This commit is contained in:
commit
ad2ef517bd
734 files changed
+44889
-16751
No files matched your search
+1
-4
@@ -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
|
||||
|
||||
Reference in new issue
Block a user