diff options
Diffstat (limited to 'src/berry_blender.c')
| -rw-r--r-- | src/berry_blender.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index 2edb14748..575d6b285 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -153,7 +153,7 @@ extern const u8 gText_234Players[]; extern void sub_800A418(void); extern u8 sub_800A9D8(void); -extern void sub_809882C(u8, u16, u8); +extern void LoadUserWindowBorderGfx(u8, u16, u8); extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8); extern void sub_81AABF0(void (*callback)(void)); extern void sub_800B4C0(void); @@ -927,7 +927,7 @@ static void sub_807FAC8(void) InitBgsFromTemplates(1, sBerryBlenderBgTemplates, ARRAY_COUNT(sBerryBlenderBgTemplates)); SetBgTilemapBuffer(1, sBerryBlenderData->tilemapBuffers[0]); SetBgTilemapBuffer(2, sBerryBlenderData->tilemapBuffers[1]); - sub_809882C(0, 1, 0xD0); + LoadUserWindowBorderGfx(0, 1, 0xD0); copy_textbox_border_tile_patterns_to_vram(0, 0x14, 0xF0); InitBerryBlenderWindows(); @@ -959,7 +959,7 @@ static void sub_807FAC8(void) } break; case 2: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); sub_8082D28(); sBerryBlenderData->mainState++; break; @@ -973,7 +973,7 @@ static void sub_807FAC8(void) sBerryBlenderData->mainState++; break; case 5: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); sBerryBlenderData->mainState++; break; case 6: @@ -1163,7 +1163,7 @@ static void sub_8080018(void) sBerryBlenderData->mainState++; break; case 3: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); sBerryBlenderData->mainState++; break; case 4: @@ -1331,7 +1331,7 @@ static void sub_8080588(void) SetBgTilemapBuffer(1, sBerryBlenderData->tilemapBuffers[0]); SetBgTilemapBuffer(2, sBerryBlenderData->tilemapBuffers[1]); - sub_809882C(0, 1, 0xD0); + LoadUserWindowBorderGfx(0, 1, 0xD0); copy_textbox_border_tile_patterns_to_vram(0, 0x14, 0xF0); InitBerryBlenderWindows(); @@ -1490,7 +1490,7 @@ static void sub_80808D4(void) sBerryBlenderData->mainState++; break; case 3: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); sBerryBlenderData->mainState++; sBerryBlenderData->framesToWait = 0; break; @@ -2656,7 +2656,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void) case 9: if (sub_800A520()) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); sBerryBlenderData->gameEndState++; } break; |