mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-18 04:48:21 -04:00
Merge decomp/main into dusk
Merges 44 upstream commits from zeldaret/tp decomp/main. Conflict resolutions: - .github/workflows/build.yml: keep deleted (not needed for PC port) - README.md: keep PC port README - J3DAnimation.h: keep OFFSET_PTR macro + add upstream forward decl - J3DModelLoader.h: keep BE(u32) mBlockNum + add field_0x1c - d_com_inf_game.h: keep PC port inlines + add upstream declarations - global.h: keep MULTI_CHAR macro + add FABSF macro - JUTConsole.cpp: keep uintptr_t cast for 64-bit - JUTDbPrint.cpp: keep PC enter_() helper + add cstring include - JUTResFont.cpp: take upstream loop/struct improvements with BE types - JUTCacheFont.cpp: take upstream decomp fix - float.h: use upstream !PLATFORM_GCN guard - d_a_npc_bouS/theB.cpp: keep MULTI_CHAR() for PC portability - d_a_npc_henna.cpp: keep uintptr_t + use upstream var name - d_demo.cpp: keep near_/far_ field renames for PC - d_resorce.cpp: keep uintptr_t + fix var name to res - d_s_room.cpp, m_Do_graphic.cpp: keep dusk includes + add cstring - m_Do_main.cpp: keep JHIComPortManager + use JAS_GLOBAL_INSTANCE_INIT - angle_utils.h: remove redundant types.h include
This commit is contained in:
@@ -20,6 +20,7 @@
|
||||
#include "d/actor/d_a_movie_player.h"
|
||||
#include "Z2AudioLib/Z2Instances.h"
|
||||
#include "f_op/f_op_overlap_mng.h"
|
||||
#include <cstring>
|
||||
|
||||
inline s32 daMP_NEXT_READ_SIZE(daMP_THPReadBuffer* readBuf) {
|
||||
return *(s32*)readBuf->ptr;
|
||||
@@ -689,17 +690,17 @@ static void __THPDecompressYUV(void* tileY, void* tileU, void* tileV) {
|
||||
if (__THPInfo->xPixelSize == 512 && targetY == 448) {
|
||||
while (currentY < targetY) {
|
||||
__THPDecompressiMCURow512x448();
|
||||
currentY += (u16)16;
|
||||
U16_ADD(currentY, 16);
|
||||
}
|
||||
} else if (__THPInfo->xPixelSize == 640 && targetY == 480) {
|
||||
while (currentY < targetY) {
|
||||
__THPDecompressiMCURow640x480();
|
||||
currentY += (u16)16;
|
||||
U16_ADD(currentY, 16);
|
||||
}
|
||||
} else {
|
||||
while (currentY < targetY) {
|
||||
__THPDecompressiMCURowNxN();
|
||||
currentY += (u16)16;
|
||||
U16_ADD(currentY, 16);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user