mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 12:39:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge decomp/main into dusk

Browse Source 
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:
Luke Street
2026-02-28 13:28:42 -07:00
parent f38dcf3aef a290c2d52c
commit 3b8300d0d2
3803 changed files with 240344 additions and 16831 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/f_pc/f_pc_create_req.h
+5 -2
View File
@@ -2,7 +2,6 @@
#ifndef F_PC_CREATE_REQ_H_
#define F_PC_CREATE_REQ_H_
#include "SSystem/SComponent/c_phase.h"
#include "f_pc/f_pc_create_tag.h"
#include "f_pc/f_pc_method.h"
#include "f_pc/f_pc_method_tag.h"
@@ -11,8 +10,12 @@
typedef struct base_process_class base_process_class;
typedef struct layer_class layer_class;
// declare our own typedef instead of cPhs__Handler to avoid pulling in c_phase.h
// (which causes RTTI ordering issues in relation to cM3dGCyl)
typedef int (*fpcCtRq_phase_handler)(void*);
typedef struct create_request_method_class {
/* 0x0 */ cPhs__Handler phase_handler;
/* 0x0 */ fpcCtRq_phase_handler phase_handler;
/* 0x4 */ process_method_func cancel_method;
/* 0x8 */ process_method_func delete_method;
} create_request_method_class;
include/f_pc/f_pc_stdcreate_req.h
-20
View File
@@ -7,26 +7,6 @@ typedef struct layer_class layer_class;
typedef int (*stdCreateFunc)(void*, void*);
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_CreateProcess(standard_create_request_class* i_request);
int fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request);
int fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request);
int fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request);
int fpcSCtRq_phase_Done(standard_create_request_class* i_request);
int fpcSCtRq_Handler(standard_create_request_class* i_request);
int fpcSCtRq_Delete(standard_create_request_class* i_request);
int fpcSCtRq_Cancel(standard_create_request_class* i_request);
fpc_ProcID fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc,
void* param_4, void* i_append);