diff options
Diffstat (limited to 'src/berry_blender.c')
| -rw-r--r-- | src/berry_blender.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index 3a10bc849..951c68bd1 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -323,7 +323,7 @@ static const struct BgTemplate sBerryBlenderBgTemplates[3] = static const struct WindowTemplate sBerryBlender_WindowTemplates[] = { { - .priority = 0, + .bg = 0, .tilemapLeft = 1, .tilemapTop = 6, .width = 7, @@ -332,7 +332,7 @@ static const struct WindowTemplate sBerryBlender_WindowTemplates[] = .baseBlock = 0x28, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 22, .tilemapTop = 6, .width = 7, @@ -341,7 +341,7 @@ static const struct WindowTemplate sBerryBlender_WindowTemplates[] = .baseBlock = 0x36, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 1, .tilemapTop = 12, .width = 7, @@ -350,7 +350,7 @@ static const struct WindowTemplate sBerryBlender_WindowTemplates[] = .baseBlock = 0x44, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 22, .tilemapTop = 12, .width = 7, @@ -359,7 +359,7 @@ static const struct WindowTemplate sBerryBlender_WindowTemplates[] = .baseBlock = 0x52, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 2, .tilemapTop = 15, .width = 27, @@ -368,7 +368,7 @@ static const struct WindowTemplate sBerryBlender_WindowTemplates[] = .baseBlock = 0x60, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 5, .tilemapTop = 3, .width = 21, @@ -381,7 +381,7 @@ static const struct WindowTemplate sBerryBlender_WindowTemplates[] = static const struct WindowTemplate sBlender_YesNoWindowTemplate = { - .priority = 0, + .bg = 0, .tilemapLeft = 21, .tilemapTop = 9, .width = 5, @@ -846,7 +846,7 @@ static const u8 sUnknown_08339CD2[] = static const struct WindowTemplate sBlenderRecordWindowTemplate = { - .priority = 0, + .bg = 0, .tilemapLeft = 6, .tilemapTop = 4, .width = 18, @@ -1031,7 +1031,7 @@ static void sub_807FAC8(void) sBerryBlenderData->mainState++; break; case 4: - if (Blender_PrintText(&sBerryBlenderData->textState, sText_BerryBlenderStart, GetPlayerTextSpeed())) + if (Blender_PrintText(&sBerryBlenderData->textState, sText_BerryBlenderStart, GetPlayerTextSpeedDelay())) sBerryBlenderData->mainState++; break; case 5: @@ -2490,7 +2490,7 @@ static void CB2_HandleBlenderEndGame(void) } break; case 7: - if (Blender_PrintText(&sBerryBlenderData->textState, sText_WouldLikeToBlendAnotherBerry, GetPlayerTextSpeed())) + if (Blender_PrintText(&sBerryBlenderData->textState, sText_WouldLikeToBlendAnotherBerry, GetPlayerTextSpeedDelay())) sBerryBlenderData->gameEndState++; break; case 9: @@ -2572,7 +2572,7 @@ static void CB2_HandleBlenderEndGame(void) sBerryBlenderData->gameEndState++; break; case 13: - if (Blender_PrintText(&sBerryBlenderData->textState, sText_CommunicationStandby, GetPlayerTextSpeed())) + if (Blender_PrintText(&sBerryBlenderData->textState, sText_CommunicationStandby, GetPlayerTextSpeedDelay())) { SetMainCallback2(CB2_HandlePlayerLinkPlayAgainChoice); sBerryBlenderData->gameEndState = 0; @@ -2680,7 +2680,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void) StringAppend(gStringVar4, sText_HasNoBerriesToPut); break; case 3: - if (Blender_PrintText(&sBerryBlenderData->textState, gStringVar4, GetPlayerTextSpeed())) + if (Blender_PrintText(&sBerryBlenderData->textState, gStringVar4, GetPlayerTextSpeedDelay())) { sBerryBlenderData->framesToWait = 0; sBerryBlenderData->gameEndState++; @@ -2787,7 +2787,7 @@ static void CB2_HandlePlayerPlayAgainChoice(void) StringCopy(gStringVar4, sText_RunOutOfBerriesForBlending); break; case 3: - if (Blender_PrintText(&sBerryBlenderData->textState, gStringVar4, GetPlayerTextSpeed())) + if (Blender_PrintText(&sBerryBlenderData->textState, gStringVar4, GetPlayerTextSpeedDelay())) sBerryBlenderData->gameEndState = 9; break; case 9: @@ -3363,7 +3363,7 @@ static bool8 Blender_PrintBlendingResults(void) sBerryBlenderData->mainState++; break; case 6: - if (Blender_PrintText(&sBerryBlenderData->textState, sBerryBlenderData->stringVar, GetPlayerTextSpeed())) + if (Blender_PrintText(&sBerryBlenderData->textState, sBerryBlenderData->stringVar, GetPlayerTextSpeedDelay())) { TryUpdateBerryBlenderRecord(); return TRUE; |