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
@@ -495,10 +495,10 @@ gBankInMenu: @ 20244B8
gDoingBattleAnim: @ 20244B9
.space 0x3
gUnknown_020244BC: @ 20244BC
gTransformedPersonalities: @ 20244BC
.space 0x10
gUnknown_020244CC: @ 20244CC
gPlayerDpadHoldFrames: @ 20244CC
.space 0x4
gBattleSpritesDataPtr: @ 20244D0