diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-21 05:19:27 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-21 05:19:27 -0500 |
| commit | 68cdd7b1cb5a293b3de42185fe17d85b4067b3ad (patch) | |
| tree | 65b32493ea3eaef107ac73f804d23563da0f9ada /src/decoration.c | |
| parent | 949509aade2627ded031669c296453c3d0ea9e59 (diff) | |
| parent | 026e1108b26f4ce5cea362997135bd8efc7cb28a (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'src/decoration.c')
| -rw-r--r-- | src/decoration.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/decoration.c b/src/decoration.c index 2a5c2ccd7..8c14be8e1 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1332,7 +1332,7 @@ void sub_8128060(u8 taskId) ConfigureCameraObjectForPlacingDecoration(&sPlaceDecorationGraphicsDataBuffer, gCurDecorationItems[gCurDecorationIndex]); sub_812826C(taskId); SetUpPlacingDecorationPlayerAvatar(taskId, &sPlaceDecorationGraphicsDataBuffer); - pal_fill_black(); + FadeInFromBlack(); gPaletteFade.bufferTransferDisabled = FALSE; gTasks[taskId].data[2] = 2; break; @@ -1738,7 +1738,7 @@ void sub_8128CD4(void) u8 taskId; ScriptContext2_Enable(); - pal_fill_black(); + FadeInFromBlack(); taskId = CreateTask(sub_8128C64, 8); sub_8127580(taskId); gTasks[taskId].data[2] = 0; @@ -2215,7 +2215,7 @@ void sub_81298EC(u8 taskId) case 2: ScriptContext2_Enable(); IdentifyOwnedDecorationsCurrentlyInUseInternal(taskId); - pal_fill_black(); + FadeInFromBlack(); gTasks[taskId].data[2] = 3; break; case 3: @@ -2278,7 +2278,7 @@ void sub_8129ABC(u8 taskId) break; case 1: SetUpPuttingAwayDecorationPlayerAvatar(); - pal_fill_black(); + FadeInFromBlack(); data[2] = 2; break; case 2: @@ -2623,7 +2623,7 @@ void sub_812A334(void) { u8 taskId; - pal_fill_black(); + FadeInFromBlack(); DrawDialogueFrame(0, 1); InitDecorationActionsWindow(); taskId = CreateTask(sub_812A2C4, 8); |