fix merge conflicts, evo scene

This commit is contained in:
DizzyEggg
2017-10-31 19:36:25 +01:00
76 changed files with 17762 additions and 55002 deletions
+2 -2
View File
@@ -221,10 +221,10 @@ gBattleBankFunc: @ 3005D60
gHealthBoxesIds: @ 3005D70
.space 0x4
gUnknown_03005D74: @ 3005D74
gMultiUsePlayerCursor: @ 3005D74
.space 0x4
gUnknown_03005D78: @ 3005D78
gNumberOfMovesToChoose: @ 3005D78
.space 0x4
gUnknown_03005D7C: @ 3005D7C