mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-05-29 08:12:52 -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:
@@ -8,9 +8,22 @@
|
||||
#include "f_pc/f_pc_node.h"
|
||||
#include "f_pc/f_pc_manager.h"
|
||||
#include "f_pc/f_pc_debug_sv.h"
|
||||
#include "SSystem/SComponent/c_phase.h"
|
||||
#include <dolphin/dolphin.h>
|
||||
#include <cstdio>
|
||||
|
||||
typedef struct standard_create_request_class {
|
||||
/* 0x00 */ create_request base;
|
||||
/* 0x48 */ request_of_phase_process_class phase_request;
|
||||
/* 0x50 */ s16 process_name;
|
||||
/* 0x54 */ void* process_append;
|
||||
/* 0x58 */ stdCreateFunc create_post_method;
|
||||
/* 0x5C */ void* unk_0x5C;
|
||||
#if DEBUG
|
||||
/* 0x60 */ int unk_0x60;
|
||||
#endif
|
||||
} standard_create_request_class;
|
||||
|
||||
int fpcSCtRq_phase_Load(standard_create_request_class* i_request) {
|
||||
int ret = fpcLd_Load(i_request->process_name);
|
||||
printf("[DIAG] fpcSCtRq_phase_Load: procName=%d ret=%d\n", i_request->process_name, ret); fflush(stdout);
|
||||
|
||||
Reference in New Issue
Block a user