diff options
Diffstat (limited to 'src/frontier_pass.c')
| -rw-r--r-- | src/frontier_pass.c | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/src/frontier_pass.c b/src/frontier_pass.c index 42a518ed6..702f6c098 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -698,7 +698,7 @@ static bool32 InitFrontierPass(void) ResetSpriteData(); FreeAllSpritePalettes(); ResetPaletteFade(); - reset_temp_tile_data_buffers(); + ResetTempTileDataBuffers(); break; case 3: AllocateFrontierPassGfx(); @@ -719,11 +719,11 @@ static bool32 InitFrontierPass(void) sPassGfx->unk20 = malloc_and_decompress(gUnknown_085712F8, &sizeOut); sPassGfx->unk24 = malloc_and_decompress(gUnknown_08571060, &sizeOut); sPassGfx->unk28 = malloc_and_decompress(gUnknown_085712C0, &sizeOut); - decompress_and_copy_tile_data_to_vram(1, gUnknown_08DE08C8, 0, 0, 0); - decompress_and_copy_tile_data_to_vram(2, gUnknown_08DE2084, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, gUnknown_08DE08C8, 0, 0, 0); + DecompressAndCopyTileDataToVram(2, gUnknown_08DE2084, 0, 0, 0); break; case 7: - if (free_temp_tile_data_buffers_if_possible()) + if (FreeTempTileDataBuffersIfPossible()) return FALSE; FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20); FillBgTilemapBufferRect_Palette0(1, 0, 0, 0, 30, 20); @@ -735,7 +735,7 @@ static bool32 InitFrontierPass(void) case 8: LoadPalette(gUnknown_08DE07C8[0], 0, 0x1A0); LoadPalette(gUnknown_08DE07C8[1 + sPassData->trainerStars], 0x10, 0x20); - LoadPalette(stdpal_get(0), 0xF0, 0x20); + LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20); sub_80C629C(); sub_80C6104(sPassData->cursorArea, sPassData->previousCursorArea); if (sPassData->unkE == 1 || sPassData->unkE == 2) @@ -871,10 +871,10 @@ static void CB2_ReturnFromRecord(void) switch (InBattlePyramid()) { case 1: - PlayBGM(MUS_PYRAMID); + PlayBGM(MUS_B_PYRAMID); break; case 2: - PlayBGM(MUS_PYRAMID_TOP); + PlayBGM(MUS_B_PYRAMID_TOP); break; default: Overworld_PlaySpecialMapMusic(); @@ -1016,16 +1016,16 @@ static void Task_DoFadeEffect(u8 taskId) if (!data[0]) { sub_80C5F58(TRUE, FALSE); - data[1] = 0x100; - data[2] = 0x100; + data[1] = Q_8_8(1); + data[2] = Q_8_8(1); data[3] = 0x15; data[4] = 0x15; BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_WHITE); } else { - data[1] = 0x1FC; - data[2] = 0x1FC; + data[1] = Q_8_8(1.984375); // 1 and 63/64 + data[2] = Q_8_8(1.984375); data[3] = -0x15; data[4] = -0x15; SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); @@ -1038,23 +1038,23 @@ static void Task_DoFadeEffect(u8 taskId) BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_WHITE); } sPassGfx->setAffine = TRUE; - sPassGfx->unk2E = sub_8151624(data[1]); - sPassGfx->unk30 = sub_8151624(data[2]); + sPassGfx->unk2E = MathUtil_Inv16(data[1]); + sPassGfx->unk30 = MathUtil_Inv16(data[2]); break; case 1: UpdatePaletteFade(); data[1] += data[3]; data[2] += data[4]; - sPassGfx->unk2E = sub_8151624(data[1]); - sPassGfx->unk30 = sub_8151624(data[2]); + sPassGfx->unk2E = MathUtil_Inv16(data[1]); + sPassGfx->unk30 = MathUtil_Inv16(data[2]); if (!data[0]) { - if (data[1] <= 0x1FC) + if (data[1] <= Q_8_8(1.984375)) return; } else { - if (data[1] != 0x100) + if (data[1] != Q_8_8(1)) return; } break; @@ -1154,8 +1154,8 @@ static void sub_80C5F58(bool8 arg0, bool8 arg1) gUnknown_085713E0[sPassData->unkE - 1][1] << 8, gUnknown_085713E0[sPassData->unkE - 1][0], gUnknown_085713E0[sPassData->unkE - 1][1], - sub_8151624(0x1FC), - sub_8151624(0x1FC), + MathUtil_Inv16(Q_8_8(1.984375)), // 1 and 63/64 + MathUtil_Inv16(Q_8_8(1.984375)), 0); } else @@ -1165,8 +1165,8 @@ static void sub_80C5F58(bool8 arg0, bool8 arg1) gUnknown_085713E0[sPassData->unkE - 1][1] << 8, gUnknown_085713E0[sPassData->unkE - 1][0], gUnknown_085713E0[sPassData->unkE - 1][1], - sub_8151624(0x100), - sub_8151624(0x100), + MathUtil_Inv16(Q_8_8(1)), + MathUtil_Inv16(Q_8_8(1)), 0); } } @@ -1239,7 +1239,9 @@ static void sub_80C6104(u8 cursorArea, u8 previousCursorArea) if (!var) { - asm("":::"r4"); + #ifndef NONMATCHING + asm("":::"r4"); + #endif if (previousCursorArea == CURSOR_AREA_NOTHING || previousCursorArea > CURSOR_AREA_CANCEL) return; } @@ -1353,7 +1355,7 @@ static bool32 InitFrontierMap(void) ResetSpriteData(); FreeAllSpritePalettes(); ResetPaletteFade(); - reset_temp_tile_data_buffers(); + ResetTempTileDataBuffers(); break; case 3: ResetBgsAndClearDma3BusyFlags(0); @@ -1372,13 +1374,13 @@ static bool32 InitFrontierMap(void) InitWindows(sMapWindowTemplates); DeactivateAllTextPrinters(); PrintOnFrontierMap(); - decompress_and_copy_tile_data_to_vram(1, gUnknown_0856FBBC, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, gUnknown_0856FBBC, 0, 0, 0); break; case 5: - if (free_temp_tile_data_buffers_if_possible()) + if (FreeTempTileDataBuffersIfPossible()) return FALSE; LoadPalette(gUnknown_08DE07C8[0], 0, 0x1A0); - LoadPalette(stdpal_get(0), 0xF0, 0x20); + LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20); CopyToBgTilemapBuffer(2, gUnknown_08570E00, 0, 0); CopyBgTilemapBufferToVram(2); break; @@ -1705,5 +1707,5 @@ static void HandleFrontierMapCursorMove(u8 direction) CopyWindowToVram(i, 3); CopyBgTilemapBufferToVram(0); - PlaySE(SE_Z_SCROLL); + PlaySE(SE_DEX_SCROLL); } |