Resolve Littleroot merge conflict

This commit is contained in:
GriffinR
2019-11-08 03:07:19 -05:00
parent bef24a45f0
commit e19b9c9d46
7 changed files with 60 additions and 61 deletions

View File

@@ -131,7 +131,7 @@ void sub_81AFDA0(void)
gSaveBlock2Ptr->field_A8 |= 0x8;
}
void sub_81AFDD0(void)
void SetChampionSaveWarp(void)
{
gSaveBlock2Ptr->specialSaveWarpFlags |= 0x80;
}