diff options
| author | Garak <thomastaps194@comcast.net> | 2018-07-17 09:24:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 09:24:30 -0400 |
| commit | 5e46a0fcc57d421879c1f65b40b4692bbe65a813 (patch) | |
| tree | 398b53f56158397a04e0e8de8159e00eeba9acc3 /src/region_map.c | |
| parent | e06b63efc9ea39875b17f00e5ff20c2e0fcb0415 (diff) | |
| parent | 06b3ce408f774c7192202308e783cc22bb8e7643 (diff) | |
Merge pull request #2 from pret/master
sync with source repo
Diffstat (limited to 'src/region_map.c')
| -rw-r--r-- | src/region_map.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/region_map.c b/src/region_map.c index 0dcccfdab..5176d4996 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1603,7 +1603,7 @@ void MCB2_FlyMap(void) gMain.state++; break; case 3: - sub_809882C(0, 0x65, 0xd0); + LoadUserWindowBorderGfx(0, 0x65, 0xd0); clear_scheduled_bg_copies_to_vram(); gMain.state++; break; @@ -1849,7 +1849,7 @@ static void sub_8124D14(void) switch (gUnknown_0203A148->unk_004) { case 0: - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); gUnknown_0203A148->unk_004++; break; case 1: @@ -1896,7 +1896,7 @@ static void sub_8124E0C(void) switch (gUnknown_0203A148->unk_004) { case 0: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); gUnknown_0203A148->unk_004++; break; case 1: |