Skip to content

Update BrawlHeaders for soModelModuleBuilder #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mparisi20 merged 1 commit into from
May 31, 2026
+29 −5
Merged

Update BrawlHeaders for soModelModuleBuilder #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/RSBE01_02/rels/sora_melee/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ fn_27_77BC = .text:0x000077BC; // type:function size:0x8
fn_27_77C4 = .text:0x000077C4; // type:function size:0x8
fn_27_77CC = .text:0x000077CC; // type:function size:0x8
fn_27_77D4 = .text:0x000077D4; // type:function size:0x8
__ct__17soModelModuleImplFP16soModuleAccesserPvUlUlPvf = .text:0x000077DC; // type:function size:0x348
__ct__17soModelModuleImplFP16soModuleAccesserP27soArray<16soModelNodeSetUp>PvP29soArray<18soModelVirtualNode>P31soEventObserverRegistrationDescf = .text:0x000077DC; // type:function size:0x348
fn_27_7B24 = .text:0x00007B24; // type:function size:0x40
__dt__17soModelModuleImplFv = .text:0x00007B64; // type:function size:0x14C
constructInstance__17soModelModuleImplFQ211gfSceneRoot9LayerTypeUlbScQ34nw4r3g3d7ResFilePCcPCcsPvUci = .text:0x00007CB0; // type:function size:0x524
Expand Down Expand Up @@ -297,7 +297,7 @@ setMatrix__18soModelVirtualNodeFUlR6Matrix = .text:0x0000F0E8; // type:function
isNode__18soModelVirtualNodeCFUl = .text:0x0000F194; // type:function size:0x40
getOffset__18soModelVirtualNodeCFUlR5Vec3f = .text:0x0000F1D4; // type:function size:0x64
getNodeParent__18soModelVirtualNodeCFUlRUl = .text:0x0000F238; // type:function size:0x50
__ct__25soModelModuleImplVariableFP16soModuleAccesserPvUlUlPvf = .text:0x0000F288; // type:function size:0x5C
__ct__25soModelModuleImplVariableFP16soModuleAccesserP27soArray<16soModelNodeSetUp>PvP29soArray<18soModelVirtualNode>P31soEventObserverRegistrationDescf = .text:0x0000F288; // type:function size:0x5C
__dt__25soModelModuleImplVariableFv = .text:0x0000F2E4; // type:function size:0x58
getRealNodeId__25soModelModuleImplVariableCFUl = .text:0x0000F33C; // type:function size:0x44
setUpMtx__25soModelModuleImplVariableFPUll = .text:0x0000F380; // type:function size:0x84
Expand Down
2 changes: 1 addition & 1 deletion include/lib/BrawlHeaders
Open in desktop
Submodule BrawlHeaders updated 5 files
+29 −0 Brawl/Include/so/event/so_event_presenter.h
+13 −4 Brawl/Include/so/model/so_model_module_impl.h
+6 −0 Brawl/Include/so/model/so_model_virtual_node.h
+8 −2 Brawl/Include/so/so_array.h
+72 −2 Brawl/Include/so/so_module_accesser_builder.h
10 changes: 10 additions & 0 deletions src/mo_fighter/ft_purin/ft_purin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class soModuleAccesserBuilder : public utUnCopyable {
soHeapModuleBuilder<typename BC::HeapModuleBuildConfig> m_heapModuleBuilder;
soParamCustomizeModuleBuilder<typename BC::ParamCustomizeModuleBuildConfig> m_paramCustomizeModuleBuilder;
soResourceModuleBuilder<typename BC::ResourceModuleBuildConfig> m_resourceModuleBuilder;
soModelModuleBuilder<typename BC::ModelModuleBuildConfig> m_modelModuleBuilder;

// TODO: add remaining ModuleBuilders
// Add getModule() member functions for each Builder
Expand All @@ -67,6 +68,12 @@ class soModuleAccesserBuilder : public utUnCopyable {
fbd.getAnmResId(),
fbd.getResGroupNo(),
&m_moduleAccsr
),
m_modelModuleBuilder(
&m_moduleAccsr,
fbd.getModelExtendNodeTable(),
&g_soEventObserverRegistrationDescNull,
fbd.getModelScale()
) {
}

Expand Down Expand Up @@ -127,6 +134,8 @@ typedef soInsideEventManageModuleBuildConfig<
typedef soHeapModuleBuildConfig<soHeapModuleImpl> ftPurinHeapModuleBuildConfig;
typedef soParamCustomizeModuleBuildConfig<ftParamCustomizeModuleImpl> ftPurinParamCustomizeModuleBuildConfig;
typedef soResourceModuleBuildConfigDynamic<0, ftResourceIdAccesserImpl, soResourceModuleImpl> ftPurinResourceModuleBuildConfig;
typedef soModelModuleBuildConfig<8, 3, soModelModuleImpl> ftPurinModelModuleBuildConfig;

typedef ftAnimCmdModuleSubBuildConfig<288, 501> ftPurinAnimCmdModuleSubBuildConfig;

class ftPurinBuildConfig {
Expand All @@ -136,6 +145,7 @@ class ftPurinBuildConfig {
typedef ftPurinParamCustomizeModuleBuildConfig ParamCustomizeModuleBuildConfig;
typedef ftPurinResourceModuleBuildConfig ResourceModuleBuildConfig;
typedef ftPurinAnimCmdModuleSubBuildConfig AnimCmdModuleSubBuildConfig;
typedef ftPurinModelModuleBuildConfig ModelModuleBuildConfig;
};

class ftPurin : public ftFighterBuilder<ftPurinBuildConfig> {
Expand Down
18 changes: 16 additions & 2 deletions src/mo_melee/sora_melee/so/model/so_model_module_impl_variable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,22 @@
#include <so/so_module_accesser.h>
#include <types.h>

soModelModuleImplVariable::soModelModuleImplVariable(soModuleAccesser* p1, void* p2, u32 p3, u32 p4, void* p5, float f1)
: soModelModuleImpl(p1, p2, p3, p4, p5, f1), unkCC(0) { }
soModelModuleImplVariable::soModelModuleImplVariable(soModuleAccesser* acc,
soArray<soModelNodeSetUp>* nodeSetUps,
void* extendNodeTbl,
soArray<soModelVirtualNode>* virtualNodes,
soEventObserverRegistrationDesc* regDesc,
float f1) :
soModelModuleImpl(
acc,
nodeSetUps,
extendNodeTbl,
virtualNodes,
regDesc,
f1
),
unkCC(0) {
}

soModelModuleImplVariable::~soModelModuleImplVariable() { }

Expand Down
Loading