Fix conflicts

This commit is contained in:
DizzyEggg
2018-11-12 19:22:23 +01:00
41 changed files with 829 additions and 818 deletions
+1 -1
View File
@@ -210,7 +210,7 @@ gSpecials:: @ 81DBA64
def_special ShowLinkBattleRecords
def_special IsEnoughForCostInVar0x8005
def_special SubtractMoneyFromVar0x8005
def_special sub_80F972C
def_special ExecuteWhiteOut
def_special sp0C8_whiteout_maybe
def_special RotatingGate_InitPuzzle
def_special RotatingGate_InitPuzzleAndGraphics