Merge branch 'master' into decomp_record_mixing

This commit is contained in:
DizzyEggg
2018-05-20 12:16:45 +02:00
161 changed files with 2902 additions and 4845 deletions
+1 -1
View File
@@ -673,7 +673,7 @@ static void Task_BardSong(u8 taskId)
void ScrSpecial_SetMauvilleOldManMapObjGfx(void)
{
VarSet(VAR_0x4010, MAP_OBJ_GFX_BARD);
VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_BARD);
}
// Language fixers?