fix for merge

This commit is contained in:
jiangzhengwenjz
2019-06-04 01:54:51 +08:00
2535 changed files with 59634 additions and 59721 deletions
+6 -6
View File
@@ -254,7 +254,7 @@ gUnknown_2023C30: @ 2023C30
gUnknown_2023C34: @ 2023C34
.space 0x110
gUnknown_2023D44: @ 2023D44
gBattlerSpriteIds: @ 2023D44
.space 0x4
gUnknown_2023D48: @ 2023D48
@@ -746,7 +746,7 @@ gUnknown_2037EE2: @ 2037EE2
gUnknown_2037EE3: @ 2037EE3
.space 0x1
gUnknown_2037EE4: @ 2037EE4
gAnimDisableStructPtr: @ 2037EE4
.space 0x4
gUnknown_2037EE8: @ 2037EE8
@@ -764,7 +764,7 @@ gUnknown_2037EFE: @ 2037EFE
gUnknown_2037F00: @ 2037F00
.space 0x2
gUnknown_2037F02: @ 2037F02
gBattleAnimArgs: @ 2037F02
.space 0x10
gUnknown_2037F12: @ 2037F12
@@ -773,7 +773,7 @@ gUnknown_2037F12: @ 2037F12
gUnknown_2037F14: @ 2037F14
.space 0x2
gUnknown_2037F16: @ 2037F16
gAnimMoveTurn: @ 2037F16
.space 0x1
gUnknown_2037F17: @ 2037F17
@@ -782,10 +782,10 @@ gUnknown_2037F17: @ 2037F17
gUnknown_2037F18: @ 2037F18
.space 0x2
gUnknown_2037F1A: @ 2037F1A
gBattleAnimAttacker: @ 2037F1A
.space 0x1
gUnknown_2037F1B: @ 2037F1B
gBattleAnimTarget: @ 2037F1B
.space 0x1
gUnknown_2037F1C: @ 2037F1C